4015 files changed, 128544 insertions, 258617 deletions

diff --git a/main/7zip/7-zip-flags.patch b/main/7zip/7-zip-flags.patch
new file mode 100644
index 00000000000..dea4c07ec31
--- /dev/null
+++ b/main/7zip/7-zip-flags.patch
@@ -0,0 +1,49 @@
+diff --git a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak
+index a8eb6e3..7a16e9e 100755
+--- a/CPP/7zip/7zip_gcc.mak
++++ b/CPP/7zip/7zip_gcc.mak
+@@ -24,7 +24,7 @@ PROGPATH_STATIC = $(O)/$(PROG)s
+ 

+ 

+ ifneq ($(CC), xlc)

+-CFLAGS_WARN_WALL = -Werror -Wall -Wextra

++CFLAGS_WARN_WALL = -Wall -Wextra

+ endif

+ 

+ # for object file

+@@ -32,7 +32,7 @@ endif
+ # -save-temps

+ CFLAGS_BASE_LIST = -c

+ # CFLAGS_BASE_LIST = -S

+-CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \

++CFLAGS_BASE = $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \

+  -DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \

+  -fPIC

+ 

+@@ -149,7 +149,7 @@ endif
+ 

+ 

+ 

+-CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@

++CFLAGS += $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@

+ 

+ 

+ ifdef IS_MINGW

+@@ -208,7 +208,7 @@ $(O):
+ # -Wl,--print-gc-sections

+ 

+ ifneq ($(CC), $(CROSS_COMPILE)clang)

+-LFLAGS_STRIP = -s

++LFLAGS_STRIP =

+ endif

+ 

+ LFLAGS_ALL = $(LFLAGS_STRIP) $(MY_ARCH_2) $(LDFLAGS) $(FLAGS_FLTO) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)

+@@ -1285,7 +1285,7 @@ predef_cc:
+ 	$(CC) $(CFLAGS) -E $(SHOW_PREDEF)  ../../../../C/CpuArch.c > predef_cc_log

+ #	$(CC) $(CFLAGS) -E -dM -  < /dev/null

+ predef_cxx:

+-	$(CXX) $(CFLAGS) -E $(SHOW_PREDEF) ../../../Common/CrcReg.cpp  > predef_cxx_log

++	$(CXX) $(CXXFLAGS) -E $(SHOW_PREDEF) ../../../Common/CrcReg.cpp  > predef_cxx_log

+ 

+ predef: predef_cc predef_cxx

+ 

diff --git a/main/7zip/7-zip-musl.patch b/main/7zip/7-zip-musl.patch
new file mode 100644
index 00000000000..d184e4525ee
--- /dev/null
+++ b/main/7zip/7-zip-musl.patch
@@ -0,0 +1,63 @@
+diff -ru a/C/CpuArch.c b/C/CpuArch.c
+--- a/C/CpuArch.c	2021-07-13 05:10:00.000000000 -0400
++++ b/C/CpuArch.c	2022-03-05 11:08:23.363390656 -0500
+@@ -421,8 +421,6 @@
+ 

+ #ifdef USE_HWCAP

+ 

+-#include <asm/hwcap.h>

+-

+   #define MY_HWCAP_CHECK_FUNC_2(name1, name2) \

+   BoolInt CPU_IsSupported_ ## name1() { return (getauxval(AT_HWCAP)  & (HWCAP_  ## name2)) ? 1 : 0; }

+ 

+diff -ru a/C/Threads.c b/C/Threads.c
+--- a/C/Threads.c	2021-12-21 08:00:00.000000000 -0500
++++ b/C/Threads.c	2022-03-05 11:07:47.203504536 -0500
+@@ -257,7 +257,7 @@
+       */

+ 

+       // ret2 =

+-      pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);

++      //pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);

+       // if (ret2) ret = ret2;

+       #endif

+     }

+@@ -267,14 +267,12 @@
+     if (!ret)

+     {

+       p->_created = 1;

+-      /*

+       if (cpuSet)

+       {

+         // ret2 =

+         pthread_setaffinity_np(p->_tid, sizeof(*cpuSet), cpuSet);

+         // if (ret2) ret = ret2;

+       }

+-      */

+     }

+   }

+   // ret2 =

+diff -ru a/C/Threads.h b/C/Threads.h
+--- a/C/Threads.h	2021-12-21 08:00:00.000000000 -0500
++++ b/C/Threads.h	2022-03-05 11:07:47.203504536 -0500
+@@ -19,6 +19,7 @@
+ #endif

+ 

+ #include <pthread.h>

++#include <sched.h>

+ 

+ #endif

+ 

+diff -ru a/CPP/Windows/SystemInfo.cpp b/CPP/Windows/SystemInfo.cpp
+--- a/CPP/Windows/SystemInfo.cpp	2021-11-06 04:19:39.000000000 -0400
++++ b/CPP/Windows/SystemInfo.cpp	2022-03-05 11:26:27.178812388 -0500
+@@ -36,9 +36,6 @@
+ #endif

+ */

+ 

+-#ifdef MY_CPU_ARM_OR_ARM64

+-#include <asm/hwcap.h>

+-#endif

+ #endif

+ 

+ #ifdef __linux__

diff --git a/main/7zip/APKBUILD b/main/7zip/APKBUILD
new file mode 100644
index 00000000000..bdfebbfbe90
--- /dev/null
+++ b/main/7zip/APKBUILD
@@ -0,0 +1,55 @@
+# Maintainer: Alex Xu (Hello71) <alex_y_xu@yahoo.ca>
+pkgname=7zip
+pkgver=23.01
+_pkgver=${pkgver//./}
+pkgrel=0
+pkgdesc="File archiver with a high compression ratio"
+url="https://7-zip.org/"
+arch="all"
+license="LGPL-2.0-only"
+subpackages="$pkgname-doc"
+source="https://7-zip.org/a/7z$_pkgver-src.tar.xz
+	armv7.patch
+	7-zip-flags.patch
+	7-zip-musl.patch
+	"
+builddir="$srcdir"
+
+provides="7zip-virtual p7zip=$pkgver-r$pkgrel"
+replaces="p7zip"
+provider_priority=100
+
+build() {
+	cd CPP/7zip/Bundles/Alone2
+	mkdir -p b/g
+	# TODO: enable asm (requires jwasm or uasm)
+	# DISABLE_RAR: RAR codec is non-free
+	# -D_GNU_SOURCE: broken sched.h defines
+	make -f ../../cmpl_gcc.mak \
+		CC="${CC:-cc} $CFLAGS $LDFLAGS -D_GNU_SOURCE" \
+		CXX="${CXX:-c++} $CXXFLAGS $LDFLAGS -D_GNU_SOURCE" \
+		DISABLE_RAR=1
+}
+
+check() {
+	# no proper test suite so just try to compress and decompress some files
+	mkdir tmp
+	CPP/7zip/Bundles/Alone2/b/g/7zz a tmp/7z$_pkgver-src.7z Asm C CPP DOC
+	cd tmp
+	../CPP/7zip/Bundles/Alone2/b/g/7zz x 7z$_pkgver-src.7z
+	# TODO: check if extracted result is identical
+}
+
+package() {
+	install -Dm755 CPP/7zip/Bundles/Alone2/b/g/7zz "$pkgdir"/usr/bin/7zz
+	ln -s 7zz "$pkgdir"/usr/bin/7z
+
+	install -Dm644 "$builddir"/DOC/* -t "$pkgdir"/usr/share/doc/$pkgname/
+}
+
+sha512sums="
+e39f660c023aa65e55388be225b5591fe2a5c9138693f3c9107e2eb4ce97fafde118d3375e01ada99d29de9633f56221b5b3d640c982178884670cd84c8aa986  7z2301-src.tar.xz
+e52e542709a23ced76b651adf54609efae705801e940e74310ae4e67070bdb3841da5b801362aa0329b77993cdc3f6cd63ac2802240b16cde865f9d01bb1936d  armv7.patch
+dfecb69861d00ee47311d83930adf80321b3c95ae01ce325677bde7aee6aa880a1979b0aa2909d9acb7a88ff31f910ac545ac218a0b5fd9e1270df2276b46d44  7-zip-flags.patch
+c652a87ad95f61901820adb61f3d1ceacedcb8aeaf9e89b2b728b7372eff67d9669eb363d5b2d2fb848ff2d8c5a727134fe13cc77d1215df7b2d32fe87711ebf  7-zip-musl.patch
+"
diff --git a/main/7zip/armv7.patch b/main/7zip/armv7.patch
new file mode 100644
index 00000000000..a9f9fc47df9
--- /dev/null
+++ b/main/7zip/armv7.patch
@@ -0,0 +1,21 @@
+we don't have neon on armv7
+--
+diff --git a/C/SwapBytes.c b/C/SwapBytes.c
+index 0bfe95c..834fe4b 100755
+--- a/C/SwapBytes.c
++++ b/C/SwapBytes.c
+@@ -331,12 +331,12 @@ ShufBytes_256(void *items8, const void *lim8, const void *mask128_ptr)
+ 

+ // compile message "NEON intrinsics not available with the soft-float ABI"

+ #elif defined(MY_CPU_ARM_OR_ARM64) || \

+-    (defined(__ARM_ARCH) && (__ARM_ARCH >= 7))

++    (defined(__ARM_ARCH) && (__ARM_ARCH >= 8))

+ // #elif defined(MY_CPU_ARM64)

+ 

+   #if defined(__clang__) && (__clang_major__ >= 8) \

+     || defined(__GNUC__) && (__GNUC__ >= 8)

+-    #if (defined(__ARM_ARCH) && (__ARM_ARCH >= 7)) \

++    #if (defined(__ARM_ARCH) && (__ARM_ARCH >= 8)) \

+         || defined(MY_CPU_ARM64)

+       #define USE_SWAP_128

+     #endif

diff --git a/main/a52dec/APKBUILD b/main/a52dec/APKBUILD
deleted file mode 100644
index 78fb877a7fb..00000000000
--- a/main/a52dec/APKBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=a52dec
-pkgver=0.7.4
-pkgrel=7
-pkgdesc="A free library for decoding ATSC A/52 streams."
-url="http://liba52.sourceforge.net/"
-arch="all"
-license="GPL-2.0-or-later"
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="autoconf automake libtool linux-headers"
-source="http://liba52.sourceforge.net/files/$pkgname-$pkgver.tar.gz
-	automake.patch
-	fix-globals-test-x86-pie.patch
-	$pkgname-$pkgver-build.patch
-	"
-
-builddir="$srcdir/$pkgname-$pkgver"
-prepare() {
-	default_prepare
-	update_config_sub
-	libtoolize --force && \
-		aclocal && autoconf && automake --add-missing
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--enable-shared
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -m644 liba52/a52_internal.h "$pkgdir"/usr/include/a52dec/
-}
-
-sha512sums="4b26fe9492f218b775fb190b76ecf06edaeb656adfe6dcbd24d0a0f86871c3ba917edb88a398eb12dccedaa1605b6f0a0be06b09f9fddd9a46e457b7dd244848  a52dec-0.7.4.tar.gz
-4a832b7e13e19ba00b1fcf5ddbdcca416ee71818f2fd77f19114d7f98fb41dbd04f906eb78f403dc27324d7e8bd8ec4e0b670139a27b49a7acdb2e3cf88d8d12  automake.patch
-b8dbcdc817531bc737ee689a1a8fc76ba40462397ca95286fe834795a09df04cd68010ca6105c8e56392328bec00c838372ab28324c5428421d44824109ea6ec  fix-globals-test-x86-pie.patch
-eee40a2871c00fc704fa49d3192a41ceadc4cf7e80d7d7cf368aa2a3e7ebb786f39ef835bdffca5685bf054316a9bacf87556b9a0c90868dbf29e7269873806e  a52dec-0.7.4-build.patch"
diff --git a/main/a52dec/a52dec-0.7.4-build.patch b/main/a52dec/a52dec-0.7.4-build.patch
deleted file mode 100644
index f3a29f303ce..00000000000
--- a/main/a52dec/a52dec-0.7.4-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur a52dec-0.7.4.orig/liba52/Makefile.am a52dec-0.7.4/liba52/Makefile.am
---- a52dec-0.7.4.orig/liba52/Makefile.am	2002-01-27 20:36:48.000000000 -0800
-+++ a52dec-0.7.4/liba52/Makefile.am	2004-11-05 01:10:21.317401872 -0800
-@@ -1,4 +1,3 @@
--CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
- 
- lib_LTLIBRARIES = liba52.la
- 
-diff -Naur a52dec-0.7.4.orig/liba52/configure.incl a52dec-0.7.4/liba52/configure.incl
---- a52dec-0.7.4.orig/liba52/configure.incl	2002-01-27 20:36:48.000000000 -0800
-+++ a52dec-0.7.4/liba52/configure.incl	2004-11-05 01:11:38.172672216 -0800
-@@ -2,7 +2,6 @@
- AC_SUBST([LIBA52_LIBS])
- 
- dnl avoid -fPIC when possible
--LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
- 
- AC_ARG_ENABLE([double],
-     [  --enable-double         use double-precision samples])
-diff -Naur a52dec-0.7.4.orig/src/Makefile.am a52dec-0.7.4/src/Makefile.am
---- a52dec-0.7.4.orig/src/Makefile.am	2002-06-22 18:51:57.000000000 -0700
-+++ a52dec-0.7.4/src/Makefile.am	2004-11-05 01:10:21.320401375 -0800
-@@ -1,4 +1,3 @@
--CFLAGS = @A52DEC_CFLAGS@
- 
- bin_PROGRAMS = a52dec extract_a52
- a52dec_SOURCES = a52dec.c getopt.c gettimeofday.c
diff --git a/main/a52dec/automake.patch b/main/a52dec/automake.patch
deleted file mode 100644
index 42231e040b6..00000000000
--- a/main/a52dec/automake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.in.orig	2013-04-23 12:43:16.258733686 +0000
-+++ ./configure.in	2013-04-23 12:43:32.922233281 +0000
-@@ -6,7 +6,7 @@
- AC_CONFIG_FILES([Makefile autotools/Makefile include/Makefile test/Makefile
-     doc/Makefile src/Makefile liba52/Makefile libao/Makefile vc++/Makefile])
- AM_INIT_AUTOMAKE([a52dec],[0.7.4])
--AM_CONFIG_HEADER(include/config.h)
-+AC_CONFIG_HEADERS(include/config.h)
- AM_MAINTAINER_MODE
- AC_CANONICAL_HOST
- 
diff --git a/main/a52dec/fix-globals-test-x86-pie.patch b/main/a52dec/fix-globals-test-x86-pie.patch
deleted file mode 100644
index da227a13971..00000000000
--- a/main/a52dec/fix-globals-test-x86-pie.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a52dec-0.7.4.orig/test/globals
-+++ a52dec-0.7.4/test/globals
-@@ -13,7 +13,7 @@
- builddir=`cd $builddir;pwd`
- 
- bad_globals=`nm -g --defined-only $builddir/../liba52/*.o|\
--    awk '{if ($3) print $3}'|grep -v '^_\?a52_'`
-+    awk '{if ($3) print $3}'|grep -v '^_\?a52_'`|grep -v '^__x86.get_pc_thunk.'
- 
- if test x"$bad_globals" != x""; then
-     echo BAD GLOBAL SYMBOLS:
diff --git a/main/aaudit/APKBUILD b/main/aaudit/APKBUILD
index a7b44e9e95a..585ff1d8760 100644
--- a/main/aaudit/APKBUILD
+++ b/main/aaudit/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=aaudit
 pkgver=0.7.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Alpine Auditor"
 url="https://alpinelinux.org"
 arch="noarch"
@@ -19,6 +19,7 @@ source="aaudit-common.lua
 	aaudit-server.json
 	"
 _luaver="5.2"
+options="!check"
 
 package() {
 	mkdir -p "$pkgdir"/etc/aaudit \
diff --git a/main/abi-compliance-checker/APKBUILD b/main/abi-compliance-checker/APKBUILD
index cdb13ccc660..9b4b39d984a 100644
--- a/main/abi-compliance-checker/APKBUILD
+++ b/main/abi-compliance-checker/APKBUILD
@@ -2,29 +2,19 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=abi-compliance-checker
 pkgver=2.3
-pkgrel=0
+pkgrel=3
 pkgdesc="A tool for checking backward compatibility of a C/C++ library"
 url="https://github.com/lvc/abi-compliance-checker"
 arch="noarch"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 depends="perl build-base"
-depends_dev=""
-makedepends="$depends_dev perl-dev"
+makedepends="perl-dev"
 options="!check"
-install=""
-subpackages=""
 source="$pkgname-$pkgver.tar.gz::https://github.com/lvc/abi-compliance-checker/archive/$pkgver.tar.gz"
 
-builddir="${srcdir}"/$pkgname-$pkgver
-
-build() {
-	return 0
-}
-
 package() {
-	cd "$builddir"
 	mkdir -p "$pkgdir"/usr
-	perl Makefile.pl -install --prefix=/usr --destdir="$pkgdir"
+	perl Makefile.pl -install --destdir="$pkgdir"
 }
 
 sha512sums="dda5b65c36028da302ed2a8070de72f85fa0ecbc573bdc73d9a06fc6162f8850773b586c7bef8fd48b5ccb2918fbfdf8e70dd16de94cc5fa70617d35579edf2b  abi-compliance-checker-2.3.tar.gz"
diff --git a/main/abseil-cpp/0002-abseil.patch b/main/abseil-cpp/0002-abseil.patch
new file mode 100644
index 00000000000..5a8055a9b0e
--- /dev/null
+++ b/main/abseil-cpp/0002-abseil.patch
@@ -0,0 +1,58 @@
+Patch-Source: https://github.com/void-linux/void-packages/blob/master/srcpkgs/mozc/patches/abseil.patch
+
+Ported from grpc's patches
+
+An all-in-one patch that fixes several issues:
+
+1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
+2) powerpc stacktrace implementation only works on glibc (disabled on musl)
+4) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
+
+--- a/absl/debugging/internal/examine_stack.cc
++++ b/absl/debugging/internal/examine_stack.cc
+@@ -33,6 +33,10 @@
+ #include <csignal>
+ #include <cstdio>
+ 
++#if defined(__powerpc__)
++#include <asm/ptrace.h>
++#endif
++
+ #include "absl/base/attributes.h"
+ #include "absl/base/internal/raw_logging.h"
+ #include "absl/base/macros.h"
+@@ -174,8 +178,10 @@
+     return reinterpret_cast<void*>(context->uc_mcontext.pc);
+ #elif defined(__powerpc64__)
+     return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
++#elif defined(__powerpc__) && defined(__GLIBC__)
++    return reinterpret_cast<void*>(context->uc_mcontext.regs->nip);
+ #elif defined(__powerpc__)
+-    return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]);
++    return reinterpret_cast<void*>(((struct pt_regs *)context->uc_regs)->nip);
+ #elif defined(__riscv)
+     return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
+ #elif defined(__s390__) && !defined(__s390x__)
+--- a/absl/debugging/internal/stacktrace_config.h
++++ b/absl/debugging/internal/stacktrace_config.h
+@@ -60,7 +60,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- a/absl/base/internal/unscaledcycleclock_config.h
++++ b/absl/base/internal/unscaledcycleclock_config.h
+@@ -21,7 +21,8 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-    defined(__powerpc__) || defined(__ppc__) || defined(__riscv) ||     \
++    defined(__riscv) ||     \
++    ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+     defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
diff --git a/main/abseil-cpp/APKBUILD b/main/abseil-cpp/APKBUILD
new file mode 100644
index 00000000000..7a3628ce00f
--- /dev/null
+++ b/main/abseil-cpp/APKBUILD
@@ -0,0 +1,163 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
+pkgname=abseil-cpp
+pkgver=20230802.1
+pkgrel=0
+pkgdesc="Abseil Common Libraries (C++) "
+url="https://abseil.io/"
+arch="all"
+license="Apache-2.0"
+depends_dev="linux-headers"
+makedepends="
+	$depends_dev
+	cmake
+	gtest-dev
+	samurai
+	"
+checkdepends="tzdata"
+subpackages="$pkgname-dev"
+source="https://github.com/abseil/abseil-cpp/archive/$pkgver/abseil-cpp-$pkgver.tar.gz
+	0002-abseil.patch
+	"
+
+_libs="
+	atomic_hook_test_helper
+	bad_any_cast_impl
+	bad_optional_access
+	bad_variant_access
+	base
+	city
+	civil_time
+	cord
+	cord_internal
+	cordz_functions
+	cordz_handle
+	cordz_info
+	cordz_sample_token
+	crc32c
+	crc_cord_state
+	crc_cpu_detect
+	crc_internal
+	debugging_internal
+	demangle_internal
+	die_if_null
+	examine_stack
+	exception_safety_testing
+	exponential_biased
+	failure_signal_handler
+	flags
+	flags_commandlineflag
+	flags_commandlineflag_internal
+	flags_config
+	flags_internal
+	flags_marshalling
+	flags_parse
+	flags_private_handle_accessor
+	flags_program_name
+	flags_reflection
+	flags_usage
+	flags_usage_internal
+	graphcycles_internal
+	hash
+	hash_generator_testing
+	hashtablez_sampler
+	int128
+	kernel_timeout_internal
+	leak_check
+	log_entry
+	log_flags
+	log_globals
+	log_initialize
+	log_internal_check_op
+	log_internal_conditions
+	log_internal_format
+	log_internal_globals
+	log_internal_log_sink_set
+	log_internal_message
+	log_internal_nullguard
+	log_internal_proto
+	log_internal_test_actions
+	log_internal_test_helpers
+	log_internal_test_matchers
+	log_severity
+	log_sink
+	low_level_hash
+	malloc_internal
+	per_thread_sem_test_common
+	periodic_sampler
+	pow10_helper
+	random_distributions
+	random_internal_distribution_test_util
+	random_internal_platform
+	random_internal_pool_urbg
+	random_internal_randen
+	random_internal_randen_hwaes
+	random_internal_randen_hwaes_impl
+	random_internal_randen_slow
+	random_internal_seed_material
+	random_seed_gen_exception
+	random_seed_sequences
+	raw_hash_set
+	raw_logging_internal
+	scoped_mock_log
+	scoped_set_env
+	spinlock_test_common
+	spinlock_wait
+	stack_consumption
+	stacktrace
+	status
+	statusor
+	str_format_internal
+	strerror
+	string_view
+	strings
+	strings_internal
+	symbolize
+	synchronization
+	test_instance_tracker
+	throw_delegate
+	time
+	time_internal_test_util
+	time_zone
+	"
+
+for _lib in $_libs; do
+	subpackages="$subpackages $pkgname-${_lib//_/-}:abseillib"
+done
+
+build() {
+	cmake -B build -G Ninja \
+		-DCMAKE_CXX_STANDARD=17 \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=ON \
+		-DABSL_BUILD_TESTING=ON \
+		-DABSL_BUILD_TEST_HELPERS=ON \
+		-DABSL_USE_EXTERNAL_GOOGLETEST=ON \
+		-DABSL_PROPAGATE_CXX_STD=ON \
+		-DABSL_FIND_GOOGLETEST=ON
+	cmake --build build
+}
+
+# disable broken tests
+check() {
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest --test-dir build -E "absl_str_format_convert_test|absl_mutex_test\
+|absl_notification_test|absl_per_thread_sem_test|absl_sysinfo_test|absl_random_beta_distribution_test|absl_cord_rep_btree_navigator_test"
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+abseillib() {
+	pkgdesc="Abseil Common C++ library: $subpkgname"
+
+	local libname="${subpkgname#"$pkgname"-}"
+	amove usr/lib/libabsl_${libname//-/_}.so.*
+}
+
+sha512sums="
+14390380655c41483a98487e3b012110dd8d1743fdd68d8cde7e0d7c2730312d564b15726d8c9d2fff237d2fce3983bbbb5213f59612c7c6feaeb402dff9609f  abseil-cpp-20230802.1.tar.gz
+aca4f4d89c38ca9038fdeb5b9e92c68d7ce0dda79f83335238f5e8de08c1a4d1e1ddd00e9ad6da18f0ab4ee22b58d73039f5523dc9311c7dbe1998f0f59a0e58  0002-abseil.patch
+"
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index bce888f10d0..5082316bc54 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,71 +1,124 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=abuild
-pkgver=3.5.0
+pkgver=3.13.0
 _ver=${pkgver%_git*}
 pkgrel=0
 pkgdesc="Script to build Alpine Packages"
 url="https://git.alpinelinux.org/cgit/abuild/"
 arch="all"
-license="GPL-2.0"
-depends="fakeroot sudo pax-utils openssl apk-tools>=2.0.7-r1 libc-utils
-	attr tar pkgconf patch lzip"
-if [ "$CBUILD" = "$CHOST" ]; then
-	depends="$depends curl"
-fi
-makedepends_build="pkgconfig"
-makedepends_host="openssl-dev zlib-dev"
+license="GPL-2.0-only"
+depends="
+	apk-tools>=2.0.7-r1
+	attr
+	cmd:getcap
+	fakeroot
+	musl-utils
+	lzip
+	openssl>3
+	patch
+	pkgconf
+	scanelf
+	tar
+	"
+makedepends_build="pkgconfig scdoc"
+makedepends_host="openssl-dev>3 zlib-dev"
 makedepends="$makedepends_host $makedepends_build"
+checkdepends="cmd:setcap kyua git"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
-subpackages="apkbuild-cpan:cpan:noarch apkbuild-gem-resolver:gems:noarch
-             abuild-rootbld:_rootbld:noarch $pkgname-doc"
-options="suid !check"
+subpackages="
+	apkbuild-cpan:cpan:noarch
+	apkbuild-gem-resolver:gems:noarch
+	apkbuild-pypi:pypi:noarch
+	abuild-rootbld:_rootbld:noarch
+	abuild-sudo:_sudo
+	$pkgname-doc
+	"
+options="suid"
 pkggroups="abuild"
-source="https://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
+source="https://gitlab.alpinelinux.org/alpine/abuild/-/archive/$pkgver/abuild-$pkgver.tar.gz
 	"
-
-builddir="$srcdir/$pkgname-$_ver"
-
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	sed -i -e "/^CHOST=/s/=.*/=$CHOST/" abuild.conf
-}
+builddir="$srcdir"/abuild-$pkgver
 
 build() {
-	cd "$builddir"
 	make VERSION="$pkgver-r$pkgrel"
 }
 
-package() {
-	cd "$builddir"
+check() {
+	make check
+}
 
+package() {
 	make install VERSION="$pkgver-r$pkgrel" DESTDIR="$pkgdir"
 
 	install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
+
+	case "$CARCH" in
+	x86*|ppc64le)
+		# binutils only supports it here
+		cat >>"$pkgdir"/usr/share/abuild/default.conf <<-EOF
+
+		# binutils ld.bfd supports this on this architecture; default to it
+		export RUSTFLAGS="\$RUSTFLAGS -Clink-arg=-Wl,-z,pack-relative-relocs"
+		export LDFLAGS="\$LDFLAGS -Wl,-z,pack-relative-relocs"
+		EOF
+	esac
+
+	case "$CARCH" in
+	x86_64)
+		# https://lists.alpinelinux.org/~alpine/devel/%3C1628515011.zujvcn248v.none%40localhost%3E
+		# note that this is x86-exclusive. on other architectures, this is pretty much always bad
+		# https://github.com/rust-lang/rust/pull/106380
+		cat >>"$pkgdir"/usr/share/abuild/default.conf <<-EOF
+
+		# -fno-plt has very slight improvements to general code size and speed on x86-only,
+		# for the common system dynamic linking case
+		export CFLAGS="\$CFLAGS -fno-plt"
+		export CXXFLAGS="\$CXXFLAGS -fno-plt"
+		EOF
+		;;
+	esac
+
 	install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles
 }
 
 cpan() {
 	pkgdesc="Script to generate perl APKBUILD from CPAN"
-	depends="perl perl-libwww perl-json perl-module-build-tiny perl-lwp-protocol-https"
+	depends="perl perl-libwww perl-json perl-module-build perl-module-build-tiny
+		perl-lwp-protocol-https"
 
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/
+	amove usr/bin/apkbuild-cpan
 }
 
 gems() {
 	pkgdesc="APKBUILD dependency resolver for RubyGems"
 	depends="ruby ruby-augeas"
 
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/
+	amove usr/bin/apkbuild-gem-resolver
+}
+
+pypi() {
+	pkgdesc="Script to generate python3 APKBUILD from PYPI"
+	depends="perl perl-libwww perl-json perl-module-build-tiny perl-lwp-protocol-https
+	perl-ipc-system-simple"
+
+	amove usr/bin/apkbuild-pypi
 }
 
 _rootbld() {
 	pkgdesc="Build packages in chroot"
-	depends="abuild bubblewrap gettext git"
+	depends="abuild bubblewrap cmd:envsubst git"
 	mkdir -p "$subpkgdir"
 }
 
-sha512sums="30577da610c0677cdd60264d43ed6704e51bd652ed1d98a7bda90d836416c5c3d7ce02e27db9b2425c18a20177e9e6591315e4ab4ae21247288c3ac0eee12d38  abuild-3.5.0.tar.xz"
+_sudo() {
+	pkgdesc="Simple privilege elevation tools for building packages"
+	depends=""
+	install_if="$pkgname=$pkgver-r$pkgrel"
+
+	amove usr/bin/abuild-sudo usr/bin/abuild-apk usr/bin/abuild-adduser \
+		usr/bin/abuild-addgroup
+}
+
+sha512sums="
+9aa46693984bd65a1a940d4547239e0a10170e82f186ab231b0d3a26b09a75cf258fae0e16f936e79cf52353dce9fc8a18881e84042b7961f390aba3f34d88da  abuild-3.13.0.tar.gz
+"
diff --git a/main/acct/APKBUILD b/main/acct/APKBUILD
index 543c1ab953c..769a8545410 100644
--- a/main/acct/APKBUILD
+++ b/main/acct/APKBUILD
@@ -1,27 +1,39 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Contributor: Dermot Bradley <dermot_bradley@yahoo.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acct
 pkgver=6.6.4
-pkgrel=0
+pkgrel=2
 pkgdesc="The GNU Accounting Utilities"
 url="https://www.gnu.org/software/acct/"
 arch="all"
 license="GPL-3.0-or-later"
-depends=""
-makedepends="linux-headers"
-install=""
-subpackages="$pkgname-doc"
-source="https://ftp.gnu.org/gnu/acct/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$pkgname-$pkgver
+makedepends="
+	linux-headers
+	"
+options="!check" # compares build utils with host utils so may fail
+subpackages="
+	$pkgname-doc
+	$pkgname-openrc
+	"
+source="
+	https://ftp.gnu.org/gnu/acct/acct-$pkgver.tar.gz
+	initd
+	logrotate
+	"
 
 prepare() {
 	default_prepare
+	update_config_sub
 	sed -i -e '/gets is a/d' \
 		"$builddir"/lib/stdio.in.h
+
+	# correct the path to the wtmp file
+	sed -i -e 's|, WTMP_FILE|, "/var/log/wtmp"|' \
+		configure
 }
 
 build() {
-	cd "$builddir"
 	# seems like this makefile does not respect DESTDIR
 	./configure \
 		--build=$CBUILD \
@@ -34,8 +46,24 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make prefix="$pkgdir/usr" install
+
+	# last is provided by util-linux-login
+	rm "$pkgdir"/usr/bin/last "$pkgdir"/usr/share/man/man1/last.1
+
+	install -m755 \
+		-D \
+		"$srcdir"/initd \
+		"$pkgdir"/etc/init.d/acct
+
+	install -m644 \
+		-D \
+		"$srcdir"/logrotate \
+		"$pkgdir"/etc/logrotate.d/acct
 }
 
-sha512sums="413aa446caece8fd773c92e2995bbaa034f63dd0ced521815a676c49f118e02982862b9c0ab7e60be5212c87d1e82ba6325bda212cf4857392a068d359a1e2c2  acct-6.6.4.tar.gz"
+sha512sums="
+413aa446caece8fd773c92e2995bbaa034f63dd0ced521815a676c49f118e02982862b9c0ab7e60be5212c87d1e82ba6325bda212cf4857392a068d359a1e2c2  acct-6.6.4.tar.gz
+ccde27aeb9e21199c151fdd528dc195aefe4919d61996cdaf5321d488210e727f09a8d65a01b07e5d4cbd69bdc2ed4e8b75538dbcf4e6464474ed3fb5b62f9a4  initd
+4be87c186fc9898cc1d1096cfb37616954fd992cdb40f1dde8b5ddaf94794235015ea2bbd0fccd32f1f33798ea557186bb93d1da1c9105e8d328a6e2965d58fe  logrotate
+"
diff --git a/main/acct/initd b/main/acct/initd
new file mode 100644
index 00000000000..52cf08dff13
--- /dev/null
+++ b/main/acct/initd
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+
+description="Enables process accounting."
+
+depend() {
+	keyword -prefix -lxc -docker
+}
+
+: ${acct_dir:=${ACCTDIR:-/var/log/account}}
+: ${acct_file:=${ACCTFILE:-pacct}}
+
+
+start() {
+	if [ ! -d "$acct_dir" ]; then
+		mkdir -p $acct_dir
+		chmod 770 $acct_dir
+	fi
+	if [ ! -f "$acct_dir/$acct_file" ]; then
+		touch $acct_dir/$acct_file
+		chmod 770 $acct_dir/$acct_file
+	fi
+
+	ebegin "Enabling process accounting"
+	accton on >/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Disabling process accounting"
+	accton off
+	eend $?
+}
diff --git a/main/acct/logrotate b/main/acct/logrotate
new file mode 100644
index 00000000000..30fbf064a01
--- /dev/null
+++ b/main/acct/logrotate
@@ -0,0 +1,12 @@
+/var/log/account/pacct {
+	compress
+	create 0770 root root
+	daily
+	delaycompress
+	missingok
+	notifempty
+	postrotate
+		accton /var/log/account/pacct
+	endscript
+	rotate 14
+}
diff --git a/main/acf-alpine-baselayout/APKBUILD b/main/acf-alpine-baselayout/APKBUILD
index b47fc0c2172..5efd2a78ce1 100644
--- a/main/acf-alpine-baselayout/APKBUILD
+++ b/main/acf-alpine-baselayout/APKBUILD
@@ -1,19 +1,21 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-alpine-baselayout
-pkgver=0.13.3
+pkgver=0.13.4
 pkgrel=0
-pkgdesc="A web-based system administration interface for alpine-baselayout"
-url="https://git.alpinelinux.org/cgit/acf/acf-alpine-baselayout"
+pkgdesc="Web-based system administration interface for alpine-baselayout"
+url="https://gitlab.alpinelinux.org/acf/acf-alpine-baselayout"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core lua-json4 lua-posix"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
-options="!check"
+source="https://gitlab.alpinelinux.org/acf/acf-alpine-baselayout/-/archive/v$pkgver/acf-alpine-baselayout-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="fb8f398c22cba14ed823eaaeb35c80289667f6568e0d309c7172676069f0596330fc15777ad87622c085196412970ccea2fdc4d10fc67368786c253c5c017ef0  acf-alpine-baselayout-0.13.3.tar.xz"
+sha512sums="
+f1f888c6da169c6603892ec10beee15ba943c470ee78c76e24a27be6e50df963cc8f77624b181966a892309fb2a0d8ffa9176497e6d2e6d3eecb0231cd73652b  acf-alpine-baselayout-v0.13.4.tar.gz
+"
diff --git a/main/acf-alpine-conf/APKBUILD b/main/acf-alpine-conf/APKBUILD
index ab82012df52..8f38fd3f965 100644
--- a/main/acf-alpine-conf/APKBUILD
+++ b/main/acf-alpine-conf/APKBUILD
@@ -1,17 +1,21 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-alpine-conf
-pkgver=0.9.0
-pkgrel=4
-pkgdesc="A web-based system administration interface for alpine-conf"
-url="https://git.alpinelinux.org/cgit/acf/acf-alpine-conf"
+pkgver=0.9.1
+pkgrel=0
+pkgdesc="Web-based system administration interface for alpine-conf"
+url="https://gitlab.alpinelinux.org/acf/acf-alpine-conf"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core lua-posix openssl"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-alpine-conf/-/archive/v$pkgver/acf-alpine-conf-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="a018089b1ada43270ff2e10eecc83e0a56289e722de52344a3a0acac2b74914165a23aea4602ad48b1748af4873c36d2f61d5fbaae578f1d3749a82a41d5f03c  acf-alpine-conf-0.9.0.tar.xz"
+
+sha512sums="
+d94d4ed2d22f77917fb0ef55b17571aeac152203dfa098d0175f58e75f95a69bce71f4f2bb362e24c44d8c7f5d5bdc0e618bd0121534f3e3843a3f6781005818  acf-alpine-conf-v0.9.1.tar.gz
+"
diff --git a/main/acf-amavisd-new/APKBUILD b/main/acf-amavisd-new/APKBUILD
index 3f59f4bc4fb..d0adc42f7de 100644
--- a/main/acf-amavisd-new/APKBUILD
+++ b/main/acf-amavisd-new/APKBUILD
@@ -2,16 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-amavisd-new
 pkgver=0.4.0
-pkgrel=3
+pkgrel=5
 pkgdesc="ACF module for amavis"
-url="https://git.alpinelinux.org/cgit/acf/acf-amavisd-new"
-arch="noarch"
-license="GPL-2.0"
+url="https://gitlab.alpinelinux.org/acf/acf-amavisd-new"
+arch="noarch !x86" # amavis
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core amavis"
-source="https://dev.alpinelinux.org/archive/acf-amavisd-new/acf-amavisd-new-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-amavisd-new/-/archive/v$pkgver/acf-amavisd-new-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d3012f1622b27ca661a0c3c20b9611b5f793fcfc1e08f0c8edf30c048e89f27bed6e6f2268c4a723b3cdcf808db29b922b15c5ad870d4af0e87d8d0e65968666  acf-amavisd-new-0.4.0.tar.xz"
+sha512sums="
+d950e91680ce607df580d368a8ab7a9e451c4e5d02a9a28ccd60bdc6382187267980eecf175c893e6501b1ba665888f9cfe78571d032e310d2ae2430abdb3574  acf-amavisd-new-v0.4.0.tar.gz
+"
diff --git a/main/acf-apk-tools/APKBUILD b/main/acf-apk-tools/APKBUILD
index 27c9cd8527e..475ccb3bc63 100644
--- a/main/acf-apk-tools/APKBUILD
+++ b/main/acf-apk-tools/APKBUILD
@@ -2,17 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-apk-tools
 pkgver=0.11.0
-pkgrel=1
+pkgrel=3
 pkgdesc="ACF module for apk"
-url="https://git.alpinelinux.org/cgit/acf/acf-apk-tools"
+url="https://gitlab.alpinelinux.org/acf/acf-apk-tools"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core lua-posix apk-tools"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-apk-tools/-/archive/v$pkgver/acf-apk-tools-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f931d3aaa6e1275dd635b925d59a4d8c12cd2d0c6a0f1ed3df80bc477dadb8f305fdacb89be179e34a88342041e250d7cd1f3fd2706d2359d468f9432218f0ac  acf-apk-tools-0.11.0.tar.xz"
+sha512sums="
+33b10cdf418e951969c1dafce2027b4d1139901e0b57331b84a66c2863984f7a63b5002b38260b3bd9232fe6b28432d0613df19f00f70787bb29856cd04bc137  acf-apk-tools-v0.11.0.tar.gz
+"
diff --git a/main/acf-asterisk/APKBUILD b/main/acf-asterisk/APKBUILD
index 048c4fde501..05c9a585879 100644
--- a/main/acf-asterisk/APKBUILD
+++ b/main/acf-asterisk/APKBUILD
@@ -2,22 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-asterisk
 pkgver=0.7.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for asterisk"
-url="https://git.alpinelinux.org/cgit/acf/acf-asterisk"
+pkgrel=4
+pkgdesc="Web-based system administration interface for asterisk"
+url="https://gitlab.alpinelinux.org/acf/acf-asterisk"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core asterisk"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/acf-asterisk/acf-asterisk-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-asterisk/-/archive/v$pkgver/acf-asterisk-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="40542c60ea2fa3b3c96fd310bf710d754c98f7da511180e685d1861482adb0500d1f80fcdc23878383b6d528f969751f2c28b2cdac17eea000b314867bc3f1f2  acf-asterisk-0.7.0.tar.xz"
+sha512sums="
+3d70b64d2bcf43b36d9cbd77f584a8c3abd71f72e336afa5c42c17d9a7d06d9dcc56c7231d515c178f41e1af2e499f99be5c18c42add4a7bb5179ef4ce00de6d  acf-asterisk-v0.7.0.tar.gz
+"
diff --git a/main/acf-awall/APKBUILD b/main/acf-awall/APKBUILD
index ac823db13eb..d1a53e4d629 100644
--- a/main/acf-awall/APKBUILD
+++ b/main/acf-awall/APKBUILD
@@ -2,22 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-awall
 pkgver=0.4.1
-pkgrel=2
+pkgrel=4
 pkgdesc="ACF for Alpine Wall"
-url="https://git.alpinelinux.org/cgit/acf/acf-awall"
+url="https://gitlab.alpinelinux.org/acf/acf-awall"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core awall"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-awall/-/archive/v$pkgver/acf-awall-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="00797d1bf9874654856f22a44a431ded3a1d07a7d325b836844d071889f685a746b504b669c6bd1b00672ce77e910de2bd7aa5dc3142095d86665cb4953fa9ff  acf-awall-0.4.1.tar.xz"
+sha512sums="
+170132ccef18d0e71da6838f76ba1c40826574227b8adc748cd4c302eb74059c5bcc645d610f7dcb084590aa80dd52608ae111d7d9c8ebb9041bed9b1a50666d  acf-awall-v0.4.1.tar.gz
+"
diff --git a/main/acf-chrony/APKBUILD b/main/acf-chrony/APKBUILD
index d6a40e2f203..f241dc17945 100644
--- a/main/acf-chrony/APKBUILD
+++ b/main/acf-chrony/APKBUILD
@@ -1,17 +1,21 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-chrony
-pkgver=0.8.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for chrony"
-url="https://git.alpinelinux.org/cgit/acf/acf-chrony"
+pkgver=0.8.1
+pkgrel=0
+pkgdesc="Web-based system administration interface for chrony"
+url="https://gitlab.alpinelinux.org/acf/acf-chrony"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core lua-posix chrony"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-chrony/-/archive/v$pkgver/acf-chrony-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="eb317d9448b6d6eb41371d4805cfcd952dbd200d878016b5a3cabe7a4be5f74799241232edafd9b1a596d3efc583751a797a865e3e7e679d5783b2ec3ca674fc  acf-chrony-0.8.0.tar.xz"
+
+sha512sums="
+da76afb4225cc55d9beaf88230d844fccb86956832c1e036b084407d4fd4e6db4209fc60296d2c5c475dc61cad78bbbd0f28ffdb6324957c82d78a4b4a9a83bc  acf-chrony-v0.8.1.tar.gz
+"
diff --git a/main/acf-clamav/APKBUILD b/main/acf-clamav/APKBUILD
deleted file mode 100644
index 9c31dc3f215..00000000000
--- a/main/acf-clamav/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Contributor: Ted Trask <ttrask01@yahoo.com>
-# Maintainer: Ted Trask <ttrask01@yahoo.com>
-pkgname=acf-clamav
-pkgver=0.8.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for clamav"
-url="https://git.alpinelinux.org/cgit/acf/acf-clamav"
-arch="noarch"
-license="GPL-2.0"
-depends="acf-core clamav"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	make DESTDIR="$pkgdir" install
-
-}
-
-sha512sums="c397de4927ebd0347732d6ffd6246d45481a059cf2878851ee4fe06889fdae8792002f46e06dc6108eedede53108b5b0361a78168d6090237758064ecaad9fc6  acf-clamav-0.8.0.tar.xz"
diff --git a/main/acf-core/APKBUILD b/main/acf-core/APKBUILD
index 617296c9816..f7c0a9053f4 100644
--- a/main/acf-core/APKBUILD
+++ b/main/acf-core/APKBUILD
@@ -1,32 +1,36 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
-_luaversion="5.2"
+_luaversion="5.4"
 pkgname=acf-core
-pkgver=0.22.0
+pkgver=0.24.0
 pkgrel=0
-pkgdesc="A web-based system administration interface framework"
-url="https://git.alpinelinux.org/cgit/acf/acf-core"
+pkgdesc="Web-based system administration interface framework"
+url="https://gitlab.alpinelinux.org/acf/acf-core"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 install="$pkgname.post-upgrade"
 depends="acf-jquery acf-lib acf-skins haserl-lua$_luaversion lua$_luaversion
 	lua$_luaversion-posix lua$_luaversion-md5 lua-json4
 	lua$_luaversion-subprocess"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-core/-/archive/v$pkgver/acf-core-v$pkgver.tar.gz
+	"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	sed "s~luadir=.*~luadir=\${prefix}/share/lua/$_luaversion/acf~" -i config.mk \
-		|| return 1
+	sed "s~luadir=.*~luadir=\${prefix}/share/lua/$_luaversion/acf~" -i config.mk
 
 	# fix shebang
-	sed -i -e "1s:#!/usr/bin/haserl :#!/usr/bin/haserl-lua$_luaversion :" \
-		www/cgi-bin/acf || return 1
+	sed -i -e "1s:#!/usr/bin/haserl[^ ]* :#!/usr/bin/haserl-lua$_luaversion :" \
+		www/cgi-bin/acf
 
 	sed -i -e "1s:#!/usr/bin/lua.*:#!/usr/bin/lua$_luaversion:" \
-		bin/acf-cli || return 1
+		bin/acf-cli
 
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	mkdir -p "$pkgdir"/etc/acf/skins
 }
-sha512sums="34f92f36cd3ecf71f7ab5c94cd35cb54eec195e04997091ebd131c04820cb4a0b3566c7a085e5282c38c6ad80b6b1558db7252fcf47c096811070e278f27a92e  acf-core-0.22.0.tar.xz"
+
+sha512sums="
+66f184c156f1306f20fb2219f25447c757c883e8a05adbdd149c3c97e8f16b7613cbe44d4e211deaa74a34dd422e20f0b52c73c77f7b24931949a959d2cd234e  acf-core-v0.24.0.tar.gz
+"
diff --git a/main/acf-dansguardian/APKBUILD b/main/acf-dansguardian/APKBUILD
index 3eb9dfcb461..8acc6c6c2d1 100644
--- a/main/acf-dansguardian/APKBUILD
+++ b/main/acf-dansguardian/APKBUILD
@@ -2,22 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dansguardian
 pkgver=0.8.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for dansguardian"
-url="https://git.alpinelinux.org/cgit/acf/acf-dansguardian"
+pkgrel=4
+pkgdesc="Web-based system administration interface for dansguardian"
+url="https://gitlab.alpinelinux.org/acf/acf-dansguardian"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core dansguardian"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-dansguardian/-/archive/v$pkgver/acf-dansguardian-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="e6334e165ff224958ec4d9a80a8eb253e6b9e82d5faf7e68da0b12557ebfab41eef359f8679550afeea0e1bf18404bebffba99595a014c4899ad51d5ae0a99ec  acf-dansguardian-0.8.0.tar.xz"
+sha512sums="
+004ef7be6d72a45af5793d4f38ae093b13ab6f2e788096a7b5e31c1fbed0023b2362fbecabafb6f2a67db34ceab7682a5f412579c99d424425ac3ca85b962df5  acf-dansguardian-v0.8.0.tar.gz
+"
diff --git a/main/acf-db/APKBUILD b/main/acf-db/APKBUILD
index 08bb71e0833..8fb941eab71 100644
--- a/main/acf-db/APKBUILD
+++ b/main/acf-db/APKBUILD
@@ -2,31 +2,29 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-db
 pkgver=0.2.1
-pkgrel=2
-pkgdesc="A web-based system administration interface for databases"
-url="https://git.alpinelinux.org/cgit/acf/acf-db"
+pkgrel=4
+pkgdesc="Web-based system administration interface for databases"
+url="https://gitlab.alpinelinux.org/acf/acf-db"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core acf-db-lib"
-makedepends=""
-install=
 subpackages="$pkgname-lib"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-db/-/archive/v$pkgver/acf-db-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
 lib() {
 	pkgdesc="ACF database support library"
 	depends="acf-core lua acf-lib"
-	mkdir -p "$subpkgdir"/usr/share/acf/lib/ \
-		|| return 1
+	mkdir -p "$subpkgdir"/usr/share/acf/lib/
 	mv "$pkgdir"/usr/share/acf/lib/* \
-		"$subpkgdir"/usr/share/acf/lib/ || return 1
+		"$subpkgdir"/usr/share/acf/lib/
 }
 
-sha512sums="850a3c5a2b294bd6e0b718357f93a3aaa7668a852b4854f636541c3e40cddce3dc1805a291c5900808cd95fa7ccd718db481431069a98df2a775d0fab1b6f3c4  acf-db-0.2.1.tar.xz"
+sha512sums="
+71b1189dee362c8f5ccf8b374c83c8f3307c2d112bdb9a83823418a27a44dca59940d26fb3736e85dac7f1eafb6c66d318ed67013a9f9183e2c62d18c862d469  acf-db-v0.2.1.tar.gz
+"
diff --git a/main/acf-dhcp/APKBUILD b/main/acf-dhcp/APKBUILD
index cdd472d2888..a2383fdbc7d 100644
--- a/main/acf-dhcp/APKBUILD
+++ b/main/acf-dhcp/APKBUILD
@@ -2,22 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dhcp
 pkgver=0.9.1
-pkgrel=0
-pkgdesc="A web-based system administration interface for dhcp"
-url="https://git.alpinelinux.org/cgit/acf/acf-dhcp"
+pkgrel=2
+pkgdesc="Web-based system administration interface for dhcp"
+url="https://gitlab.alpinelinux.org/acf/acf-dhcp"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core dhcp"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-dhcp/-/archive/v$pkgver/acf-dhcp-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="f428416072fbae3cd88f5d135a7a0d2bc4cf68fd242b4d004f2547bbec2a530f7d4c3b112fc462994bd836889a0a44ab441d37a2ed4112b7f5f095a3f2b3ff24  acf-dhcp-0.9.1.tar.xz"
+sha512sums="
+59fe0496f8162d317a16f84bc6613a36cd8c50b090d5a7bf5bbfeb2e68f8b829959f6c0ed101984a69b344934cfdb4a32507f95251a6450e8028229f8eeb333c  acf-dhcp-v0.9.1.tar.gz
+"
diff --git a/main/acf-dnscache/APKBUILD b/main/acf-dnscache/APKBUILD
index 7a3cdecd5d3..13329c73e0e 100644
--- a/main/acf-dnscache/APKBUILD
+++ b/main/acf-dnscache/APKBUILD
@@ -2,16 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dnscache
 pkgver=0.6.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for dnscache"
-url="https://git.alpinelinux.org/cgit/acf/acf-dnscache"
+pkgrel=4
+pkgdesc="Web-based system administration interface for dnscache"
+url="https://gitlab.alpinelinux.org/acf/acf-dnscache"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core lua-posix dnscache"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-dnscache/-/archive/v$pkgver/acf-dnscache-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="64b6b43bd503fa410df8e6c471afbf5ad4091da6d84db462f1f933299ee65b22f45165f175d9a4cc96ca6b8efd5853b77c440b6fb5203bc14a75ba80182451ed  acf-dnscache-0.6.0.tar.xz"
+
+sha512sums="
+47176ce9451f1764083b3a8f8f1edbe518ebcce4e3027ec7ac9635393b88daf60ccace03acb64bb9bc9ef88698ee7d4ccb8bac2cd712d0a516a5d3d207f79712  acf-dnscache-v0.6.0.tar.gz
+"
diff --git a/main/acf-dnsmasq/APKBUILD b/main/acf-dnsmasq/APKBUILD
index f5783b01c14..30bd53f27f7 100644
--- a/main/acf-dnsmasq/APKBUILD
+++ b/main/acf-dnsmasq/APKBUILD
@@ -2,16 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dnsmasq
 pkgver=0.7.1
-pkgrel=0
-pkgdesc="A web-based system administration interface for dnsmasq"
-url="https://git.alpinelinux.org/cgit/acf/acf-dnsmasq"
+pkgrel=2
+pkgdesc="Web-based system administration interface for dnsmasq"
+url="https://gitlab.alpinelinux.org/acf/acf-dnsmasq"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core dnsmasq"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-dnsmasq/-/archive/v$pkgver/acf-dnsmasq-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="78703842c53c5d8bab7e304e2b81e0bdb175165b652bdb53a45ca5aa610c5f6ceffbf627bd940d6b8e5dc71cc2a8a6268672513ef235a74f35d0d91edb8080f2  acf-dnsmasq-0.7.1.tar.xz"
+
+sha512sums="
+dd42267de11afa3ef8da34d93e26d4fec74e996f22fc35637d9bf61abd70602d2a0a0837cffc9cd51f57d0526c0692db792bc71048671442a922e3562f121af0  acf-dnsmasq-v0.7.1.tar.gz
+"
diff --git a/main/acf-dovecot/APKBUILD b/main/acf-dovecot/APKBUILD
index 8080bc3e883..af48586d9a5 100644
--- a/main/acf-dovecot/APKBUILD
+++ b/main/acf-dovecot/APKBUILD
@@ -2,22 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-dovecot
 pkgver=0.6.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for dovecot"
-url="https://git.alpinelinux.org/cgit/acf/acf-dovecot"
+pkgrel=4
+pkgdesc="Web-based system administration interface for dovecot"
+url="https://gitlab.alpinelinux.org/acf/acf-dovecot"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core dovecot"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-dovecot/-/archive/v$pkgver/acf-dovecot-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="7838987e88505d1c8f929088e4e05e6f5161a01d55fe9892b0e10f4e9b850981423e2fff93053d21b18d3e4384bbdbe7912b7a155af0eae4afc4c61517a7abd8  acf-dovecot-0.6.0.tar.xz"
+sha512sums="
+902ff6e913e767f1debddc820aa9b4f325c20e130286153f2bf642d19348ce258802516bafebbf81a33077f50d981f4fc9ff9ad21eeb495d7967e7e54f01e054  acf-dovecot-v0.6.0.tar.gz
+"
diff --git a/main/acf-fetchmail/APKBUILD b/main/acf-fetchmail/APKBUILD
deleted file mode 100644
index 393211f6c7f..00000000000
--- a/main/acf-fetchmail/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Contributor: Ted Trask <ttrask01@yahoo.com>
-# Maintainer: Ted Trask <ttrask01@yahoo.com>
-pkgname=acf-fetchmail
-pkgver=0.9.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for fetchmail"
-url="https://git.alpinelinux.org/cgit/acf/acf-fetchmail"
-arch="noarch"
-license="GPL-2.0"
-depends="acf-core fetchmail"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	make DESTDIR="$pkgdir" install
-
-}
-
-sha512sums="7cf3fdb81305fcd29333051d5e199d31f7b0527bacf69ddb20dd301bedb3ac19b4b12374e24136a1c37626a2081d222e75f880c7c9fb8d0aa26e33191476a9ad  acf-fetchmail-0.9.0.tar.xz"
diff --git a/main/acf-freeradius3/APKBUILD b/main/acf-freeradius3/APKBUILD
index fe2a340d89e..21b0c9f1036 100644
--- a/main/acf-freeradius3/APKBUILD
+++ b/main/acf-freeradius3/APKBUILD
@@ -2,20 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-freeradius3
 pkgver=0.3.1
-pkgrel=0
+pkgrel=2
 pkgdesc="ACF for freeradius 3"
-url="https://git.alpinelinux.org/cgit/acf/acf-freeradius3"
+url="https://gitlab.alpinelinux.org/acf/acf-freeradius3"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core freeradius>3"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-freeradius3/-/archive/v$pkgver/acf-freeradius3-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="79a60ad1114c8e050431824b042b5799d39c96cfc2c101d0ec2c15569c5d4354565e0596bb7ef6471860d063df3f72e201e283b04ab9a50ffbf3e6bf7d31a9ee  acf-freeradius3-0.3.1.tar.xz"
+sha512sums="
+6ac56cd59e61258dcb639567d8820e7c2fb0c7b674ce49dd139b42917bfd24edeea08ca507c9b40e1a1a96decc63a279a569bd5a547e7835399a3f786899540a  acf-freeradius3-v0.3.1.tar.gz
+"
diff --git a/main/acf-freeswitch-vmail/APKBUILD b/main/acf-freeswitch-vmail/APKBUILD
index 524c168b459..f51963263c5 100644
--- a/main/acf-freeswitch-vmail/APKBUILD
+++ b/main/acf-freeswitch-vmail/APKBUILD
@@ -2,20 +2,21 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-freeswitch-vmail
 pkgver=0.6.2
-pkgrel=1
+pkgrel=5
 pkgdesc="ACF for a web interface for freeswitch voicemail"
-url="http://git.alpinelinux.org/cgit/acf/$pkgname"
-arch="all"
-license="GPL-2.0"
+url="https://gitlab.alpinelinux.org/acf/acf-freeswitch-vmail"
+arch="noarch"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core lua-sql-sqlite3 lua-socket freeswitch"
-makedepends=""
 install="$pkgname.post-upgrade"
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="$pkgname-$pkgver-2.tar.gz::https://gitlab.alpinelinux.org/acf/acf-freeswitch-vmail/-/archive/v$pkgver/acf-freeswitch-vmail-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9f5984dc8339162274d3b3efb4946e88bee715674b315ed4026de7e4bb0fc334641de09aad5244dc093fc2c2225a62bd424f09a78f0ae5994c80ca5ce3c3b79a  acf-freeswitch-vmail-0.6.2.tar.xz"
+sha512sums="
+5109b231f9c949b222240b42cee5dd82f9fb3dad2c1bc28443c969179ba420cd0b416e02d83b88d3530a98c0cc18f539a6645b7b5143465470f4b11cb9142efa  acf-freeswitch-vmail-0.6.2-2.tar.gz
+"
diff --git a/main/acf-freeswitch/APKBUILD b/main/acf-freeswitch/APKBUILD
index 72c74f5e57f..a0d7c490424 100644
--- a/main/acf-freeswitch/APKBUILD
+++ b/main/acf-freeswitch/APKBUILD
@@ -2,22 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-freeswitch
 pkgver=0.8.0
-pkgrel=3
+pkgrel=5
 pkgdesc="ACF for freeswitch"
-url="https://git.alpinelinux.org/cgit/acf/acf-freeswitch"
+url="https://gitlab.alpinelinux.org/acf/acf-freeswitch"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core freeswitch lua-luaxml"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-freeswitch/-/archive/v$pkgver/acf-freeswitch-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="c5df1ce9acdd98c160bbeff08be9891a1eefe4ed02fb4b2c720d2cf81444d34eea4f75dd8ff133e1e0837db708398e275b546a29d6669a5c874ec864d9f8f128  acf-freeswitch-0.8.0.tar.xz"
+sha512sums="
+84a85806fcdec8511ef9fb2d910e8d163dba3c5a4d1ec50abab377732b50b8eba55eb7f40240b656fbf4cfdfc93d3c591ad74e459d5c22e359198081cdd3cb3f  acf-freeswitch-v0.8.0.tar.gz
+"
diff --git a/main/acf-gross/APKBUILD b/main/acf-gross/APKBUILD
index 4ab68a47587..394ea092e63 100644
--- a/main/acf-gross/APKBUILD
+++ b/main/acf-gross/APKBUILD
@@ -2,16 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-gross
 pkgver=0.6.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for gross"
-url="https://git.alpinelinux.org/cgit/acf/acf-gross"
+pkgrel=4
+pkgdesc="Web-based system administration interface for gross"
+url="https://gitlab.alpinelinux.org/acf/acf-gross"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core gross"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-gross/-/archive/v$pkgver/acf-gross-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="2bbda9e68e20c154210f21125d8c8f061980a6542e3c5831d432a0a968067d1a285333dd15bc22f9414a72fa2ad48f7338a91ec9a3fd01f329c08b806934350c  acf-gross-0.6.0.tar.xz"
+
+sha512sums="
+56b5f98011d2a1d7e95cf19dc12058971013bf846b315befbedd96ab532458af19e8960a808ff14153413a49a3947877394a065ba4ee62121399e59a3fc3ce49  acf-gross-v0.6.0.tar.gz
+"
diff --git a/main/acf-heimdal/APKBUILD b/main/acf-heimdal/APKBUILD
index 3c032a12d61..1c277c8fdfa 100644
--- a/main/acf-heimdal/APKBUILD
+++ b/main/acf-heimdal/APKBUILD
@@ -2,22 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-heimdal
 pkgver=0.6.0
-pkgrel=2
+pkgrel=5
 pkgdesc="ACF module for heimdal"
-url="http://git.alpinelinux.org/cgit/acf/$pkgname"
+url="https://gitlab.alpinelinux.org/acf/acf-heimdal"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core heimdal"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-heimdal/-/archive/v$pkgver/acf-heimdal-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-        cd "$srcdir/$pkgname-$pkgver"
-
-        make DESTDIR="$pkgdir" install
-
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="8843c2f5b580f400c398826566bf4a5b3e8bd4d53f01ee8cf3c41972fc89d9bcf80fdc7e787c48fac25cbec2bc671821f63c5ab6453f9243d13b9674fd168af3  acf-heimdal-0.6.0.tar.xz"
+sha512sums="
+f5d2e376d68c2d04a2ae25437e0ca649a33405a6fa3d50114de6d1488bc0feb1f5e394c40ee990aa7585d39114b1b29a7ab1683518cbb0736ae03d66c579a54b  acf-heimdal-v0.6.0.tar.gz
+"
diff --git a/main/acf-iproute2-qos/APKBUILD b/main/acf-iproute2-qos/APKBUILD
index 5afac4577c9..ae006e46c91 100644
--- a/main/acf-iproute2-qos/APKBUILD
+++ b/main/acf-iproute2-qos/APKBUILD
@@ -2,17 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-iproute2-qos
 pkgver=0.4.0
-pkgrel=2
+pkgrel=5
 pkgdesc="ACF module for iproute2-qos"
-url="http://git.alpinelinux.org/cgit/acf/$pkgname"
+url="https://gitlab.alpinelinux.org/acf/acf-iproute2-qos"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core iproute2-qos acf-alpine-baselayout>=0.5.7"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-iproute2-qos/-/archive/v$pkgver/acf-iproute2-qos-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ff06d5e8e3f7f5bbcbdf5dbe9aa4fc82b15ea0b1626e36a5659064dcc01f5ea1d055f0ae99ce105398091057ed073f93c3fc7c8ecac469c6ccdd1dd10ad00596  acf-iproute2-qos-0.4.0.tar.xz"
+sha512sums="
+9d33941aaa67d57948dc3c09daa5105fd8d5cd90113d95645fcf5aaf885090bc09bbf36f9993c9c2e53e4397961729472fd61e48e203dac2ad66b5572bfb773e  acf-iproute2-qos-v0.4.0.tar.gz
+"
diff --git a/main/acf-ipsec-tools/APKBUILD b/main/acf-ipsec-tools/APKBUILD
deleted file mode 100644
index cd451584d67..00000000000
--- a/main/acf-ipsec-tools/APKBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Contributor: Ted Trask <ttrask01@yahoo.com>
-# Maintainer: Ted Trask <ttrask01@yahoo.com>
-pkgname=acf-ipsec-tools
-pkgver=0.12.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for ipsec-tools"
-url="https://git.alpinelinux.org/cgit/acf/acf-ipsec-tools"
-arch="noarch"
-license="GPL-2.0"
-depends="acf-core ipsec-tools"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="b224ff68d68fac8c3b4f9c27063ef2bf708a271860624724a3c09a98df51baf40af8f0d67feab1592b1ca0fbf27220fc57b17aaaa969df5b5c41374094b8e973  acf-ipsec-tools-0.12.0.tar.xz"
diff --git a/main/acf-iptables/APKBUILD b/main/acf-iptables/APKBUILD
index 6e25e026085..56807070039 100644
--- a/main/acf-iptables/APKBUILD
+++ b/main/acf-iptables/APKBUILD
@@ -2,22 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-iptables
 pkgver=0.7.1
-pkgrel=2
-pkgdesc="A web-based system administration interface for iptables"
-url="https://git.alpinelinux.org/cgit/acf/acf-iptables"
+pkgrel=4
+pkgdesc="Web-based system administration interface for iptables"
+url="https://gitlab.alpinelinux.org/acf/acf-iptables"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core iptables"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-iptables/-/archive/v$pkgver/acf-iptables-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="1def7240cbbceb06e810ac00463b8b7693e6fe7c7f70be91c0ee8b4fe3a25869bf583425f6b9f16057d41909f819b1875ed48cc9f3837a265e42986eb303f303  acf-iptables-0.7.1.tar.xz"
+sha512sums="
+5164e97c928d46d0690be4c0ad4ec238fd2f2190334912a0b55fa4317764212de84cb9e4535fc2f601ca70661dc30fccf06759b7aa0952037123c34fdaed953a  acf-iptables-v0.7.1.tar.gz
+"
diff --git a/main/acf-jquery/APKBUILD b/main/acf-jquery/APKBUILD
index be4e3e92310..46aac832886 100644
--- a/main/acf-jquery/APKBUILD
+++ b/main/acf-jquery/APKBUILD
@@ -2,17 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-jquery
 pkgver=0.4.3
-pkgrel=0
+pkgrel=2
 pkgdesc="jquery libraries for ACF"
-url="https://git.alpinelinux.org/cgit/acf/acf-jquery"
+url="https://gitlab.alpinelinux.org/acf/acf-jquery"
 arch="noarch"
-license="GPL-2.0"
-depends=""
+license="GPL-2.0-only"
+options="!check" # no test suite
 replaces="acf-core"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-jquery/-/archive/v$pkgver/acf-jquery-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="adec4facdd31cab95454095080091d32306511d1535b12c9a00788ba0d08a52abdfec1cedf1c7b024c8bafff0cbcdc01b12f23212e638162ead4363fef3e8c83  acf-jquery-0.4.3.tar.xz"
+
+sha512sums="
+7d95fb67659e0ad21be0a48ace6652cb56b59a76068391addcb134d524a6ca28a83209aa7cdb63f0d4a942e15d2f72c31696067fdfee954760f6fe2656ad8c71  acf-jquery-v0.4.3.tar.gz
+"
diff --git a/main/acf-kamailio/APKBUILD b/main/acf-kamailio/APKBUILD
index 53c9b32fc8b..a4a094ec773 100644
--- a/main/acf-kamailio/APKBUILD
+++ b/main/acf-kamailio/APKBUILD
@@ -2,22 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-kamailio
 pkgver=0.10.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for kamailio"
-url="https://git.alpinelinux.org/cgit/acf/acf-kamailio"
+pkgrel=4
+pkgdesc="Web-based system administration interface for kamailio"
+url="https://gitlab.alpinelinux.org/acf/acf-kamailio"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core kamailio acf-db-lib"
-makedepends="acf-db-lib"
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-kamailio/-/archive/v$pkgver/acf-kamailio-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="6f513c96b5a92ed3e538ebe4e8d13ef88685a0dd0354e8aa5ac8d737580ac7155fd6aab1bae485909d77c256b63c2acf27d023a67d283594ea9001f65f5a8424  acf-kamailio-0.10.0.tar.xz"
+sha512sums="
+7599a3e21159c41dbf1212dc94ae1239437daf4c63f8b1608e4b04425f82882c3a310d561bbd80f12f6b99fc0519f374129f2295fbc4a7a2f4e9fbd17b6ce316  acf-kamailio-v0.10.0.tar.gz
+"
diff --git a/main/acf-lib/APKBUILD b/main/acf-lib/APKBUILD
index 0a631031629..457ea511986 100644
--- a/main/acf-lib/APKBUILD
+++ b/main/acf-lib/APKBUILD
@@ -1,24 +1,24 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
-_luaversions="5.1 5.2"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=acf-lib
-pkgver=0.11.0
+pkgver=0.11.1
 pkgrel=0
 pkgdesc="Lua libraries for ACF"
-url="https://git.alpinelinux.org/cgit/acf/acf-lib"
+url="https://gitlab.alpinelinux.org/acf/acf-lib"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="lua-subprocess"
-subpackages=""
 for _i in $_luaversions; do
 	subpackages="$subpackages acf-lib-lua$_i:split_${_i/./_}"
 done
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-lib/-/archive/v$pkgver/acf-lib-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
 	mkdir -p "$pkgdir"
 	echo "package with pkgdir=$pkgdir"
-	cd "$srcdir/$pkgname-$pkgver"
 	for _i in $_luaversions; do
 		sed "s~luadir=.*~luadir=\${prefix}/share/lua/$_i/acf~" -i config.mk
 		make DESTDIR="$pkgdir-lua$_i" install
@@ -26,15 +26,17 @@ package() {
 }
 
 _split() {
-	local d= _ver=$1
+	local _ver=$1
 	pkgdesc="Lua $_ver libraries for ACF"
 	install_if="lua$_ver $pkgname=$pkgver-r$pkgrel"
 	replaces="$pkgname"
-	depends=
+	depends=""
 }
 
 for _i in $_luaversions; do
 	eval "split_${_i/./_}() { _split $_i; }"
 done
 
-sha512sums="0818e1b0e7f2076982bd402d9916b059d7b18e479d5b09b01d2c755ce44701bbf549a38dc139834c83230b6cd6bc9da9d12fc87314196405a67ecac52cb45705  acf-lib-0.11.0.tar.xz"
+sha512sums="
+7ad8cfe6475f7febaaf0ed8774d78d4e53a4ebfa0de9d65249b0c4c1ef316211c4d3e5339dc502f8c8d27906f6c8b3e54a74e3b5d00b8b5cf26e6b01861b2aef  acf-lib-v0.11.1.tar.gz
+"
diff --git a/main/acf-lighttpd/APKBUILD b/main/acf-lighttpd/APKBUILD
index f3d7d0edbde..8997a59d252 100644
--- a/main/acf-lighttpd/APKBUILD
+++ b/main/acf-lighttpd/APKBUILD
@@ -2,16 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-lighttpd
 pkgver=0.6.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for lighttpd"
-url="https://git.alpinelinux.org/cgit/acf/acf-lighttpd"
+pkgrel=4
+pkgdesc="Web-based system administration interface for lighttpd"
+url="https://gitlab.alpinelinux.org/acf/acf-lighttpd"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core lighttpd"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-lighttpd/-/archive/v$pkgver/acf-lighttpd-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="6916c981f371ccd230cd1b77d274a79933ea24b8bf2b9e6f1c56811bb8d22317fc2778c0380136f6df448dc3113bc8d44d680421ecf722a9f63da748dbecb6cb  acf-lighttpd-0.6.0.tar.xz"
+
+sha512sums="
+a6c0693f29894486c902512c670caf16d49e5082bba993de560b8c5f388ab174f4db366a9e591aede6523a1216adec8c64cbfa511cce2fa6f184913b238b6010  acf-lighttpd-v0.6.0.tar.gz
+"
diff --git a/main/acf-lvm2/APKBUILD b/main/acf-lvm2/APKBUILD
index 571faa49bb5..0c843ff8b12 100644
--- a/main/acf-lvm2/APKBUILD
+++ b/main/acf-lvm2/APKBUILD
@@ -2,22 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-lvm2
 pkgver=0.7.0
-pkgrel=2
+pkgrel=5
 pkgdesc="ACF module for lvm2"
-url="http://git.alpinelinux.org/cgit/acf/$pkgname"
+url="https://gitlab.alpinelinux.org/acf/acf-lvm2"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core lvm2"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-lvm2/-/archive/v$pkgver/acf-lvm2-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="0f5a5bf3c7dd814de690470d95e2d3644bfa4b0c6aa63fc9f3c768daf6eb9b853bc1bde7024ac5de23ebb8894c8f557a5e252d06db776d6d1d9bc6a5f7af06ee  acf-lvm2-0.7.0.tar.xz"
+sha512sums="
+a9c14fbe7936cc32399f94a6a38ac7c7c80bce22bd45edadd5991d6415330045224be3b59540f5e1eadb160cdfff41bc7180242ce66c950be27fb0a26d223ceb  acf-lvm2-v0.7.0.tar.gz
+"
diff --git a/main/acf-mariadb/APKBUILD b/main/acf-mariadb/APKBUILD
index 5092aa56f3c..4d0777a36d1 100644
--- a/main/acf-mariadb/APKBUILD
+++ b/main/acf-mariadb/APKBUILD
@@ -2,23 +2,21 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-mariadb
 pkgver=0.2.0
-pkgrel=2
+pkgrel=5
 pkgdesc="ACF module for mariadb"
-url="http://git.alpinelinux.org/cgit/acf/$pkgname"
+url="https://gitlab.alpinelinux.org/acf/acf-mariadb"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core mariadb mariadb-client lua-sql-mysql acf-db-lib"
-makedepends="acf-db-lib"
-install=
-subpackages=""
 replaces="acf-mysql"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-mariadb/-/archive/v$pkgver/acf-mariadb-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="7974ed3c59e1fc4d22dee3e4becda359b67c97bec30d254c7c0ce2569883667626326f9fd6b2c6ef7dd57fe013635b3fb7c239f0f873d86e6b244582da835995  acf-mariadb-0.2.0.tar.xz"
+sha512sums="
+b9159cf26749dda29b378d0b9ab06fd2ea026e8c1acb20f6fa4e1dbd3b180f295b75e508ed62cf6f6e465a272191c0015577280170a93d8bf68c21fa5449dee9  acf-mariadb-v0.2.0.tar.gz
+"
diff --git a/main/acf-mdadm/APKBUILD b/main/acf-mdadm/APKBUILD
index b080d2d1974..51d201354c0 100644
--- a/main/acf-mdadm/APKBUILD
+++ b/main/acf-mdadm/APKBUILD
@@ -2,22 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-mdadm
 pkgver=0.5.0
-pkgrel=2
+pkgrel=5
 pkgdesc="ACF module for mdadm"
-url="http://git.alpinelinux.org/cgit/acf/$pkgname"
+url="https://gitlab.alpinelinux.org/acf/acf-mdadm"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core mdadm"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-mdadm/-/archive/v$pkgver/acf-mdadm-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="7d21620a3bdc1f512f43685e89e6fd968920217764d22ceb98b15d33db653b5160a8f4f661ca58156896ba26e640ef7acf5db6bacfbd810160258433f8e3ba8e  acf-mdadm-0.5.0.tar.xz"
+sha512sums="
+adb54dbd81e5a2adc55876f147535e3898319ec802507c6e6c65b521dd91fb201733de4972d11d07f4732a9a2147dcbc3cff90e16fb955210d95a6abcd67a1aa  acf-mdadm-v0.5.0.tar.gz
+"
diff --git a/main/acf-nsd/APKBUILD b/main/acf-nsd/APKBUILD
index 5e9f0ae15c6..9461c8773f9 100644
--- a/main/acf-nsd/APKBUILD
+++ b/main/acf-nsd/APKBUILD
@@ -2,16 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-nsd
 pkgver=0.0.1
-pkgrel=0
-pkgdesc="A web-based system administration interface for nsd"
-url="https://git.alpinelinux.org/cgit/acf/acf-nsd"
+pkgrel=2
+pkgdesc="Web-based system administration interface for nsd"
+url="https://gitlab.alpinelinux.org/acf/acf-nsd"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core nsd"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-nsd/-/archive/v$pkgver/acf-nsd-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="a6df9f4eb856877a4866ceeb9f9f439b1b8dc8f048c6149f12753344bc07294068a867f1e6d9a8d8336c1929257595d19b2822fb8f4816fa1e7914dcbe380071  acf-nsd-0.0.1.tar.xz"
+
+sha512sums="
+1e41428870c1e14ec33ca1bc4c0f91fdf7b77ca01c436b6e8232ff3beada5964c72afdc56fa4acac6ace9ef78223785a320a44ec0e3b29f7e6752a2f3c454003  acf-nsd-v0.0.1.tar.gz
+"
diff --git a/main/acf-openldap/APKBUILD b/main/acf-openldap/APKBUILD
index d7748daee50..75215e0289d 100644
--- a/main/acf-openldap/APKBUILD
+++ b/main/acf-openldap/APKBUILD
@@ -2,20 +2,20 @@
 # Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
 pkgname=acf-openldap
 pkgver=1.0.1
-pkgrel=4
+pkgrel=8
 pkgdesc="ACF module for OpenLDAP"
-url="http://git.alpinelinux.org/cgit/user/alacerda/$pkgname/"
+url="https://gitlab.alpinelinux.org/acf/acf-openldap"
 arch="noarch"
-license="GPL-2.0"
-depends="acf-core openldap openldap-back-bdb"
-depends_dev=""
-makedepends="$depends_dev"
-install=""
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+license="GPL-2.0-only"
+options="!check" # no test suite
+depends="acf-core openldap openldap-back-mdb"
+source="https://gitlab.alpinelinux.org/acf/acf-openldap/-/archive/v$pkgver/acf-openldap-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-        make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
 }
-sha512sums="974974496904a8ca9c540bb4b6d72dbce9ea0f33806bd0334191bbc8f716b2ec9fdbe28600aa59b576c3ac6c179ba6470051ad4e5d68bde383a6ad506022729e  acf-openldap-1.0.1.tar.xz"
+
+sha512sums="
+832d64effaad9495bb842c449efdbbc8ebbc2da8288472865fb4b5e0dda974461f9556e445dd70e4072b9903131dfe66140e71c146eddb57383a5c5ec3f94952  acf-openldap-v1.0.1.tar.gz
+"
diff --git a/main/acf-opennhrp/APKBUILD b/main/acf-opennhrp/APKBUILD
index b6411431bf1..3d34495c4f5 100644
--- a/main/acf-opennhrp/APKBUILD
+++ b/main/acf-opennhrp/APKBUILD
@@ -1,17 +1,21 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-opennhrp
-pkgver=0.10.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for opennhrp"
-url="https://git.alpinelinux.org/cgit/acf/acf-opennhrp"
+pkgver=0.10.1
+pkgrel=0
+pkgdesc="Web-based system administration interface for opennhrp"
+url="https://gitlab.alpinelinux.org/acf/acf-opennhrp"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core lua-posix opennhrp"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-opennhrp/-/archive/v$pkgver/acf-opennhrp-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="5dbd1392da95e1cf16b56ca46d03f74a8724a2dfb839fb7289948b65ab98c186f23035128c5e99174496fb6c0d65b35abccdc64b669bd641944a04d0808c9c16  acf-opennhrp-0.10.0.tar.xz"
+
+sha512sums="
+e30974d8ef5da9239291ae4b8975eea3da657c7fcf06076991d00ca53b825c6fe424c11c1a181c40c12289a7de34e746828daeaca27e877db3643963772b709a  acf-opennhrp-v0.10.1.tar.gz
+"
diff --git a/main/acf-openntpd/APKBUILD b/main/acf-openntpd/APKBUILD
index 8758cc52863..6ea5e6e0fb6 100644
--- a/main/acf-openntpd/APKBUILD
+++ b/main/acf-openntpd/APKBUILD
@@ -1,23 +1,21 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-openntpd
-pkgver=0.9.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for openntpd"
-url="https://git.alpinelinux.org/cgit/acf/acf-openntpd"
+pkgver=0.9.1
+pkgrel=0
+pkgdesc="Web-based system administration interface for openntpd"
+url="https://gitlab.alpinelinux.org/acf/acf-openntpd"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core openntpd"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-openntpd/-/archive/v$pkgver/acf-openntpd-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="e30067fbd52e24d6cad462f916ef8798118346e8149e704bfd89a0e70e6170dba742af5fb5105ef2a48feaeaa4f8acb50a28fbdd0388b7574da63313bba39883  acf-openntpd-0.9.0.tar.xz"
+sha512sums="
+9141853d297bdbc4e115d15d1e7871306a7aeaa7acfacfabc462f8d63049b1e86bb05fa19661f98ac3e044ecb23f7266aff55efa575a19d992340899e767b32b  acf-openntpd-v0.9.1.tar.gz
+"
diff --git a/main/acf-openssh/APKBUILD b/main/acf-openssh/APKBUILD
index 93c73992b80..641202dd95b 100644
--- a/main/acf-openssh/APKBUILD
+++ b/main/acf-openssh/APKBUILD
@@ -2,16 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-openssh
 pkgver=0.11.2
-pkgrel=0
-pkgdesc="A web-based system administration interface for openssh"
-url="https://git.alpinelinux.org/cgit/acf/acf-openssh"
+pkgrel=2
+pkgdesc="Web-based system administration interface for openssh"
+url="https://gitlab.alpinelinux.org/acf/acf-openssh"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core openssh"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-openssh/-/archive/v$pkgver/acf-openssh-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="e89ba4980ac84f995df4e07915d6f263a8b74b2da9cc001ede00a3cf356311a207b08601d683e96d59b4cd61b858e5126aa79d61509535c2c24cc894e383d3f2  acf-openssh-0.11.2.tar.xz"
+
+sha512sums="
+0ac9738b4b3184712cd48f9b1d5865542579424591e10486bf7f0a78edab55192e1b375b35bdff5558f48e0cfdf7627dd750d9c181834d4ee7d2faa1f5bda5f7  acf-openssh-v0.11.2.tar.gz
+"
diff --git a/main/acf-openssl/APKBUILD b/main/acf-openssl/APKBUILD
index a7a84470e1e..e9793bf2185 100644
--- a/main/acf-openssl/APKBUILD
+++ b/main/acf-openssl/APKBUILD
@@ -1,23 +1,21 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-openssl
-pkgver=0.10.1
-pkgrel=4
-pkgdesc="A web-based system administration interface for open/librelssl"
-url="https://git.alpinelinux.org/cgit/acf/acf-openssl"
+pkgver=0.11.0
+pkgrel=0
+pkgdesc="Web-based system administration interface for open/libressl"
+url="https://gitlab.alpinelinux.org/acf/acf-openssl"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core openssl"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-openssl/-/archive/v$pkgver/acf-openssl-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="bf885b78caa7757df2f2560155bc04c960c0f421f751a972ecf5ed40c8179a8ce0e94363d259e05a5cadc33df1389db96e2985149b4b760b378d371385946fb2  acf-openssl-0.10.1.tar.xz"
+sha512sums="
+5808224bdc6607811ab063108be289b826f6a19233b073355c533a0164c74519d1ffd6b831add55b6259acff29be5a524d37ff516bedc7f055c03db0ec379bd0  acf-openssl-v0.11.0.tar.gz
+"
diff --git a/main/acf-openvpn/APKBUILD b/main/acf-openvpn/APKBUILD
index 1da008e5e6b..cd078e0bd68 100644
--- a/main/acf-openvpn/APKBUILD
+++ b/main/acf-openvpn/APKBUILD
@@ -1,23 +1,21 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-openvpn
-pkgver=0.11.1
-pkgrel=2
-pkgdesc="A web-based system administration interface for openvpn"
-url="https://git.alpinelinux.org/cgit/acf/acf-openvpn"
+pkgver=0.11.2
+pkgrel=0
+pkgdesc="Web-based system administration interface for openvpn"
+url="https://gitlab.alpinelinux.org/acf/acf-openvpn"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core openvpn"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-openvpn/-/archive/v$pkgver/acf-openvpn-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="4109e6ec2e4c46f273983a07e3fac810652b5b83a694526fbdb71a7d75171779dc7960642dc0c81f80ca02c43b6d6cf81f5c3a042681ad00270e5cfe1db3d4af  acf-openvpn-0.11.1.tar.xz"
+sha512sums="
+3587d0a54853de30cb6c1879ade29cdfcd8fec1d29304e44a36c2d5a7f164f454a61d19f8fb35c301a1152c9d75f7726b1961c14031d3bdfb29ff074c73691b2  acf-openvpn-v0.11.2.tar.gz
+"
diff --git a/main/acf-pingu/APKBUILD b/main/acf-pingu/APKBUILD
index bbb81271cf9..4fae29bce8e 100644
--- a/main/acf-pingu/APKBUILD
+++ b/main/acf-pingu/APKBUILD
@@ -2,22 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-pingu
 pkgver=0.4.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for pingu"
-url="https://git.alpinelinux.org/cgit/acf/acf-pingu"
+pkgrel=4
+pkgdesc="Web-based system administration interface for pingu"
+url="https://gitlab.alpinelinux.org/acf/acf-pingu"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core pingu"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-pingu/-/archive/v$pkgver/acf-pingu-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="33ffd2838b4ffe30c9cc314b922fe13d351256e8354b387abeb163abf8fa3c86986fabfde1df96e13f5346fb78bbe209053f0e6e6d780e9add5dbd0844192973  acf-pingu-0.4.0.tar.xz"
+sha512sums="
+6c9b59919528c748e17b43c9666f6b1c6ad79b3a34b51a01f763a75cd4058d82015d0d4e31f9607d14d92084b18097c67a6fa87f755042b110669567f6877d5b  acf-pingu-v0.4.0.tar.gz
+"
diff --git a/main/acf-postfix/APKBUILD b/main/acf-postfix/APKBUILD
index b399a325f90..5e9a218287d 100644
--- a/main/acf-postfix/APKBUILD
+++ b/main/acf-postfix/APKBUILD
@@ -2,22 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-postfix
 pkgver=0.10.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for postfix"
-url="https://git.alpinelinux.org/cgit/acf/acf-postfix"
+pkgrel=4
+pkgdesc="Web-based system administration interface for postfix"
+url="https://gitlab.alpinelinux.org/acf/acf-postfix"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core postfix"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-postfix/-/archive/v$pkgver/acf-postfix-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="022c9df2c8af416cf4df2ff96c17dd16a43147660e40a36558f0dfe64dcf310ceb8f73855797e3304e7ba736829663f83180962c5af9538b7e90219a0e65fe64  acf-postfix-0.10.0.tar.xz"
+sha512sums="
+1efad25b1488e6faf7c16e67ac08dd42fee45e461d1e8e0b2716776f2692a8113086e581d4d4aefa2d0219c51e456795ec26c048c9c66884b89617020ca0b052  acf-postfix-v0.10.0.tar.gz
+"
diff --git a/main/acf-postgresql/APKBUILD b/main/acf-postgresql/APKBUILD
index 26e14381173..b0afaa6c2fe 100644
--- a/main/acf-postgresql/APKBUILD
+++ b/main/acf-postgresql/APKBUILD
@@ -1,23 +1,21 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-postgresql
-pkgver=0.11.0
-pkgrel=2
+pkgver=0.12.0
+pkgrel=0
 pkgdesc="ACF module for postgresql"
-url="http://git.alpinelinux.org/cgit/acf/$pkgname"
+url="https://gitlab.alpinelinux.org/acf/acf-postgresql"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core postgresql acf-db-lib lua-sql-postgres"
-makedepends="acf-db-lib"
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-postgresql/-/archive/v$pkgver/acf-postgresql-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="50ecb0d5bee5ae674188f4c70f9bf30084c7e6b506819a89baf660e3af102e51b67d54dbe15a92e8b52162ddc666a2e2e8f09dbbb6f07734eb86073a2b6243fe  acf-postgresql-0.11.0.tar.xz"
+sha512sums="
+c1f399858fff853e53ce7f67a0192650e884361a5c3db1f0daf2622ddf0349dd20f10e74f295f516e5c3a41e0970448081985a036a1442a2fdc85ff01dbf4975  acf-postgresql-v0.12.0.tar.gz
+"
diff --git a/main/acf-ppp/APKBUILD b/main/acf-ppp/APKBUILD
index 916812b961d..d62009bb03f 100644
--- a/main/acf-ppp/APKBUILD
+++ b/main/acf-ppp/APKBUILD
@@ -2,16 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-ppp
 pkgver=0.5.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for ppp"
-url="https://git.alpinelinux.org/cgit/acf/acf-ppp"
+pkgrel=4
+pkgdesc="Web-based system administration interface for ppp"
+url="https://gitlab.alpinelinux.org/acf/acf-ppp"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core ppp"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-ppp/-/archive/v$pkgver/acf-ppp-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="970b6d13d33b583ca7e8224bc563b1b3ead83f2a51b449e4c68adabd8f2cc123661d83cd07899ebdf8221a3ae9cd9d62dddfeee1bb4b3c3863fdd1382085137e  acf-ppp-0.5.0.tar.xz"
+
+sha512sums="
+abe991941a641079f163225ee8ffcc8bd3376a059b6ffc18e4a7faaa389635a446bd6559c687a8cf5eaf9a871f875ceeba11cab7efc620a545f2f6f3d59c37dc  acf-ppp-v0.5.0.tar.gz
+"
diff --git a/main/acf-provisioning/APKBUILD b/main/acf-provisioning/APKBUILD
index 5202a22fa69..9c1fed936c7 100644
--- a/main/acf-provisioning/APKBUILD
+++ b/main/acf-provisioning/APKBUILD
@@ -3,25 +3,24 @@
 _luaversion=5.2
 pkgname=acf-provisioning
 pkgver=0.10.1
-pkgrel=1
+pkgrel=3
 pkgdesc="ACF for provisioning templated configs to devices"
-url="https://git.alpinelinux.org/cgit/acf/acf-provisioning"
+url="https://gitlab.alpinelinux.org/acf/acf-provisioning"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core lua-sql-postgres postgresql-client lua-posixtz lua-luaxml"
-makedepends=""
-install=""
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-provisioning/-/archive/v$pkgver/acf-provisioning-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-
 	# fix shebang
 	sed -i -e "1s:#!/usr/bin/haserl :#!/usr/bin/haserl-lua$_luaversion :" \
-		cgi-bin/provisioning.cgi || return 1
+		cgi-bin/provisioning.cgi
 
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3e5678cb94ce8cd6ccd011aa1941173dd4b77811928299f2db3415dac4aab4a428ffc4dfcfcc462383ade2bc859c755683e147ccae01ef44a7b39249b7e0aaca  acf-provisioning-0.10.1.tar.xz"
+sha512sums="
+78251cf03433fde66ffda4a03579a145aa2a08a4632f9e6bc9668d68d6e2f769ef66d69fe40f6b5938f28bbfcdc171147d4243f16a0f7d35b939da16f2f0cee7  acf-provisioning-v0.10.1.tar.gz
+"
diff --git a/main/acf-quagga/APKBUILD b/main/acf-quagga/APKBUILD
index 0556dc9e193..01532769d81 100644
--- a/main/acf-quagga/APKBUILD
+++ b/main/acf-quagga/APKBUILD
@@ -2,16 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-quagga
 pkgver=0.10.1
-pkgrel=1
-pkgdesc="A web-based system administration interface for quagga"
-url="https://git.alpinelinux.org/cgit/acf/acf-quagga"
+pkgrel=3
+pkgdesc="Web-based system administration interface for quagga"
+url="https://gitlab.alpinelinux.org/acf/acf-quagga"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core lua-socket quagga"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-quagga/-/archive/v$pkgver/acf-quagga-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="cf89a6caa4ba782725267eba99a9955db790845dd99f88c353f2d0dc930d75dee06b9c7d947540a79d72baf3721bcda5c7daf2c998c282f42a0620a3ba4eeee5  acf-quagga-0.10.1.tar.xz"
+
+sha512sums="
+14138765c1081d01ef814b5a05ac40eb981f706b083642500d8588ef9cbdee18dc94187339deea7043b297647758f1f6dbb3a87190deb616b3ff3c74aa82beec  acf-quagga-v0.10.1.tar.gz
+"
diff --git a/main/acf-samba/APKBUILD b/main/acf-samba/APKBUILD
index b223987466e..64ecb65f08a 100644
--- a/main/acf-samba/APKBUILD
+++ b/main/acf-samba/APKBUILD
@@ -1,23 +1,21 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-samba
-pkgver=0.10.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for samba"
-url="https://git.alpinelinux.org/cgit/acf/acf-samba"
+pkgver=0.10.1
+pkgrel=0
+pkgdesc="Web-based system administration interface for samba"
+url="https://gitlab.alpinelinux.org/acf/acf-samba"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core samba"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-samba/-/archive/v$pkgver/acf-samba-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="93d1771635d433b6bf4425061203e1e43715ff6db672cb7cb1c879c8e9a0d48db9c0361d5f7e247f35ad3da88379b4550f7022e6d088ac01de4a0b7eccdab1c6  acf-samba-0.10.0.tar.xz"
+sha512sums="
+d2a4a9da90bd9eaec47bc2595582b7231d444bca0b1b875a3fa62fc9c1172b2ac884d02171a0f4e7ab8a2d53327a79221e276f428b6c8a4bdf5e52bf8f6c5552  acf-samba-v0.10.1.tar.gz
+"
diff --git a/main/acf-skins/APKBUILD b/main/acf-skins/APKBUILD
index e264352ec80..b5ee4b3e43d 100644
--- a/main/acf-skins/APKBUILD
+++ b/main/acf-skins/APKBUILD
@@ -2,16 +2,19 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-skins
 pkgver=0.6.0
-pkgrel=1
+pkgrel=3
 pkgdesc="Skins for ACF"
-url="https://git.alpinelinux.org/cgit/acf/acf-skins"
+url="https://gitlab.alpinelinux.org/acf/acf-skins"
 arch="noarch"
-license="GPL-2.0"
-depends=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+license="GPL-2.0-only"
+options="!check" # no test suite
+source="https://gitlab.alpinelinux.org/acf/acf-skins/-/archive/v$pkgver/acf-skins-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="941b760086b6c214b4b4118dabc131b0699b66d52043e9014018e609179e96ec209c1b7667844b6771abc5b0c0c0e0d44798bf6bf4eb5ddb765a746fffccd9a9  acf-skins-0.6.0.tar.xz"
+
+sha512sums="
+8814b9c97cb2451c2dd16b8bcf652550a1b961dd741a6c2ff37b083bdeed1dfabdd4a7548a5fd291999aae9909c4eccc6ee3887bd1dc3cba5a06c9da41167360  acf-skins-v0.6.0.tar.gz
+"
diff --git a/main/acf-snort/APKBUILD b/main/acf-snort/APKBUILD
index 4676d7fbb29..c7a3f2cdf7b 100644
--- a/main/acf-snort/APKBUILD
+++ b/main/acf-snort/APKBUILD
@@ -1,23 +1,21 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-snort
-pkgver=0.8.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for snort"
-url="https://git.alpinelinux.org/cgit/acf/acf-snort"
-arch="noarch"
-license="GPL-2.0"
+pkgver=0.8.1
+pkgrel=0
+pkgdesc="Web-based system administration interface for snort"
+url="https://gitlab.alpinelinux.org/acf/acf-snort"
+arch="noarch !ppc64le !riscv64" # blocked by snort -> luajit
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core snort"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-snort/-/archive/v$pkgver/acf-snort-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="082dd5ac4f60530b0392c9e841452692dfbe8b317b0c219070e4087b01efbb7ac5d3f67037d0fd8718ecc6a5110764727b45fcd71f5b6568443dcbe9561b80b9  acf-snort-0.8.0.tar.xz"
+sha512sums="
+c174d03bcb1ac9e84bb396b4959b37c2915a79d9fcb646cfd2ed1df6e02bc8410672ce4c4968eebfadf984673949de0291b3b255b18ae769cd3e58cb3f76b6a5  acf-snort-v0.8.1.tar.gz
+"
diff --git a/main/acf-squid/APKBUILD b/main/acf-squid/APKBUILD
index 72962ff07be..02f3cd8d31c 100644
--- a/main/acf-squid/APKBUILD
+++ b/main/acf-squid/APKBUILD
@@ -2,22 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-squid
 pkgver=0.11.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for squid"
-url="https://git.alpinelinux.org/cgit/acf/acf-squid"
+pkgrel=4
+pkgdesc="Web-based system administration interface for squid"
+url="https://gitlab.alpinelinux.org/acf/acf-squid"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core squid"
-makedepends=""
-install=
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-squid/-/archive/v$pkgver/acf-squid-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
 	make DESTDIR="$pkgdir" install
-
 }
 
-sha512sums="6d3e0726da1159657516f99cc0730b4e452f4740973b436f48436bd96fe5f0ddf81a653c19b2732ff2664875382176dd4f13f952e4defdc3f227631fffc656f5  acf-squid-0.11.0.tar.xz"
+sha512sums="
+7c435766f958d6b7d723cf4a9c7cd2ab3a6092afc1b73b026125e83942e5780a6176a9f183896c7314507b9e6bf9ee97e15dc3bf40cb349402c0e4d41dd2e521  acf-squid-v0.11.0.tar.gz
+"
diff --git a/main/acf-tinydns/APKBUILD b/main/acf-tinydns/APKBUILD
index 6de61f25c5c..c19184052b0 100644
--- a/main/acf-tinydns/APKBUILD
+++ b/main/acf-tinydns/APKBUILD
@@ -1,17 +1,21 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-tinydns
-pkgver=0.11.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for tinydns"
-url="https://git.alpinelinux.org/cgit/acf/acf-tinydns"
+pkgver=0.11.1
+pkgrel=0
+pkgdesc="Web-based system administration interface for tinydns"
+url="https://gitlab.alpinelinux.org/acf/acf-tinydns"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core tinydns"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-tinydns/-/archive/v$pkgver/acf-tinydns-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="58d24b86d53a3f9d6b8415af20d193869150d865b9e5f31faa542199d0f4da506ad4ea54b2b68e48c0a9e9e3a6276114cffafd370d6b28fdfbdb20294500ec74  acf-tinydns-0.11.0.tar.xz"
+
+sha512sums="
+e97fd8bed947f103e0f90b0e5a49cff676ae496583c0e96c97935e0d8d3ac6b23816f42d4a1f210545e8c5970d3ae7bb66a0aa2f28d7b262087ae595e8033ac2  acf-tinydns-v0.11.1.tar.gz
+"
diff --git a/main/acf-unbound/APKBUILD b/main/acf-unbound/APKBUILD
index 85fa49a6ddc..bae5ebff509 100644
--- a/main/acf-unbound/APKBUILD
+++ b/main/acf-unbound/APKBUILD
@@ -2,17 +2,20 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-unbound
 pkgver=0.1.0
-pkgrel=2
-pkgdesc="A web-based system administration interface for unbound"
-url="http://git.alpinelinux.org/cgit/acf/$pkgname"
+pkgrel=5
+pkgdesc="Web-based system administration interface for unbound"
+url="https://gitlab.alpinelinux.org/acf/acf-unbound"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core unbound"
-replaces=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://gitlab.alpinelinux.org/acf/acf-unbound/-/archive/v$pkgver/acf-unbound-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="e42eeb5aa11405e9f68822503cd459076d0a185abdc077558da8d42d9a9643c2703a9db72f26e69161933fcd7a4fa76d4c82d4de4c8c6c373b21a9299c4f8a65  acf-unbound-0.1.0.tar.xz"
+
+sha512sums="
+9c9757e429e12baad780c2b96bf8013e5d73edb4ace5effeb9ec845c1481d155f2ff06a3a5d8a6f0ecdfe04b291db92b475700faf899e0c554ea079c88599469  acf-unbound-v0.1.0.tar.gz
+"
diff --git a/main/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD
index cdb404b520e..54cd77a92d5 100644
--- a/main/acf-weblog/APKBUILD
+++ b/main/acf-weblog/APKBUILD
@@ -2,24 +2,26 @@
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
 pkgname=acf-weblog
 pkgver=0.11.1
-pkgrel=1
+pkgrel=4
 pkgdesc="ACF for web proxy (squid and dansguardian) logfiles"
-url="https://git.alpinelinux.org/cgit/acf/acf-weblog"
+url="https://gitlab.alpinelinux.org/acf/acf-weblog"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no test suite
 depends="acf-core lua-sql-postgres wget postgresql-client lua-subprocess"
-makedepends=""
 install="$pkgname.post-upgrade"
-subpackages=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
-	acf-weblog-update-schema"
+source="$pkgname-$pkgver.tar.gz::https://gitlab.alpinelinux.org/acf/acf-weblog/-/archive/v$pkgver/acf-weblog-v$pkgver.tar.gz
+	acf-weblog-update-schema
+	"
+builddir="$srcdir/$pkgname-v$pkgver"
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm755 "$srcdir"/acf-weblog-update-schema \
 		"$pkgdir"/usr/sbin/acf-weblog-update-schema
 }
 
-sha512sums="396e0e3cbbd01f2c12f9e3b00ee1b8c0b9ec379af9c09b19ebf4b4571a265c040e9266dc3fe9012510136214a5ad49198020cdf861045ce19512d76afbc22dd1  acf-weblog-0.11.1.tar.xz
-98474adf2b60b30dbe060753db9b8c8d70696e063cfae810f7aab59cba229e45e15abe368609bd9ab3480c594fd6e9545c5c128fcdc81908df4463f86cb475e3  acf-weblog-update-schema"
+sha512sums="
+90f2b1c68e4afd849261410105a442ffb3b83cb1e3c70abaef24ede41773c602bd6d743bf5ef805b5b93619dc0ca3215638f8d1beaa071a408f15f2944b6cf51  acf-weblog-0.11.1.tar.gz
+98474adf2b60b30dbe060753db9b8c8d70696e063cfae810f7aab59cba229e45e15abe368609bd9ab3480c594fd6e9545c5c128fcdc81908df4463f86cb475e3  acf-weblog-update-schema
+"
diff --git a/main/ack/APKBUILD b/main/ack/APKBUILD
index 374c6241a5b..06a4aba7660 100644
--- a/main/ack/APKBUILD
+++ b/main/ack/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ack
-pkgver=3.3.1
-pkgrel=0
+pkgver=3.7.0
+pkgrel=1
 pkgdesc="A Perl-powered replacement for grep"
 url="https://beyondgrep.com/"
 arch="noarch"
@@ -11,7 +11,7 @@ depends="perl-file-next perl"
 makedepends="perl-dev"
 checkdepends="bash"
 subpackages="$pkgname-doc"
-source="https://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/ack-v$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/ack-v$pkgver.tar.gz"
 builddir="$srcdir/$pkgname-v$pkgver"
 
 build() {
@@ -28,4 +28,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="7f0a5cc55b331f69877d186699e2fab64a196b0ea0fd148699b7be5f9a7bb2850ecf9e45dc026325af8407a37f719faf3f3e314c43e48d575b3685087461addd  ack-v3.3.1.tar.gz"
+sha512sums="
+3d97309956ce65f972a7636d195b13031f4441981d5bdddf0b67e577c32c88972f7ed02ffafbbf73c4db9a22f200f95cce9c8eb2a6f47fd60143d93469038f57  ack-v3.7.0.tar.gz
+"
diff --git a/main/acl/APKBUILD b/main/acl/APKBUILD
index 50d750d514d..415e2aaefcb 100644
--- a/main/acl/APKBUILD
+++ b/main/acl/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acl
-pkgver=2.2.53
+pkgver=2.3.2
 pkgrel=0
 pkgdesc="Access control list utilities"
 url="https://savannah.nongnu.org/projects/acl"
@@ -16,7 +16,6 @@ options="!check"
 source="https://download.savannah.nongnu.org/releases/acl/acl-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,8 +26,11 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	DESTDIR="$pkgdir" make install
+
+	# fix install path of pkgconf files
+	mkdir -p "$pkgdir"/usr/lib/
+	mv "$pkgdir"/lib/pkgconfig "$pkgdir"/usr/lib/
 }
 
 libacl() {
@@ -37,4 +39,6 @@ libacl() {
 	mv "$pkgdir"/lib/libacl.so.* "$subpkgdir"/lib/
 }
 
-sha512sums="176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716  acl-2.2.53.tar.gz"
+sha512sums="
+31aeb39958d8af5d08933dd3a89333a41025c3eb49fc461fa3c291caca51dad575ec13faeb7deba9b3c2ebf7615be7d45e2b78e50d4f83d8ec933c95931a7682  acl-2.3.2.tar.gz
+"
diff --git a/main/aconf/APKBUILD b/main/aconf/APKBUILD
index 668b04a292f..0759a05cdfe 100644
--- a/main/aconf/APKBUILD
+++ b/main/aconf/APKBUILD
@@ -1,70 +1,50 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
 pkgname=aconf
-pkgver=0.7.1
-pkgrel=0
+pkgver=0.8.1
+pkgrel=2
 pkgdesc="Alpine Configurator"
-url="https://git.alpinelinux.org/cgit/user/kunkku/aconf/"
+url="https://gitlab.alpinelinux.org/kunkku/aconf/"
 arch="noarch"
-license="BSD"
-depends="lua5.3-augeas lua5.3-b64 lua5.3-cjson lua5.3-file-magic lua5.3-openrc
-         lua5.3-ossl lua5.3-posix lua5.3-stringy uwsgi uwsgi-lua"
+license="BSD-2-Clause"
+_luaver="5.3"
+_lua="lua$_luaver"
+depends="$_lua-augeas $_lua-b64 $_lua-cjson $_lua-file-magic $_lua-openrc
+	$_lua-ossl $_lua-posix $_lua-stringy uwsgi uwsgi-lua"
 makedepends="ldoc"
 source="https://dev.alpinelinux.org/archive/aconf/aconf-$pkgver.tar.xz
 	$pkgname.initd"
+options="!check"
 
-
-_modules="dnsmasq dns-zone network openssh"
+_modules="dnsmasq dns-zone network openssh strongswan"
 _escape() {
-	  echo ${1//-/_}
+	echo ${1//-/_}
 }
 
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
 for _m in $_modules; do
 	_e=$(_escape $_m)
 	subpackages="$subpackages $pkgname-mod-$_m:_$_e"
 	eval "_deps_$_e=$_m"
 done
 
-_deps_dns_zone=
-_deps_network=
-
-
-_builddir=$srcdir/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	return 0
-}
-
 package() {
-	cd "$_builddir"
-	make ROOT_DIR=$pkgdir install || return 1
-	install -m755 -D "$srcdir"/$pkgname.initd \
-		"$pkgdir"/etc/init.d/$pkgname || return 1
+	make LUA_VERSION=$_luaver ROOT_DIR=$pkgdir install
+	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
-
-_moddir=usr/share/lua/5.2/$pkgname/modules
+_moddir=usr/share/lua/$_luaver/$pkgname/modules
 _augdir=usr/share/$pkgname/augeas
 
 _module() {
 	local m=$(_escape $1)
 	eval "depends=\"$pkgname \$_deps_$m\""
-	mkdir -p "$subpkgdir/$_moddir" || return 1
-	mv "$pkgdir/$_moddir/$1.lua" "$subpkgdir/$_moddir" || return 1
+	mkdir -p "$subpkgdir/$_moddir"
+	mv "$pkgdir/$_moddir/$1.lua" "$subpkgdir/$_moddir"
 
 	local lens=$pkgdir/$_augdir/aconf_$m.aug
 	[ -f "$lens" ] || return 0
-	mkdir -p "$subpkgdir/$_augdir" || return 1
+	mkdir -p "$subpkgdir/$_augdir"
 	mv "$lens" "$subpkgdir/$_augdir"
 }
 
@@ -72,5 +52,5 @@ for _m in $_modules; do
 	eval "_$(_escape $_m)() { _module $_m; }"
 done
 
-sha512sums="cae459cc4303793a3d88759addf0cc4834554d2a5df6af8dde68215c23530c197771df5d3198e8f2ea445d3964cd674e66ef901e76906cb0572216c17ad36845  aconf-0.7.1.tar.xz
+sha512sums="68ae0f5b8c2f5d9c7085f5ebdd8ca6bffd0f83835a77cafdf4b782dcd27d81eec9f5d221e7be48cfaf184aa077ad5e9b0d7389e9eea0cbbf332f4d99330e5bc0  aconf-0.8.1.tar.xz
 2706ff356ee8ab72d5b0ac0b6f1bcb3996e7e66457ddc4dbf9745cc6d93a3d9051d141cf0dd28e6b73a422b2d67a0952ed1633471ef7c4bb7393e1ae17e3aa9d  aconf.initd"
diff --git a/main/acpi/APKBUILD b/main/acpi/APKBUILD
index 0b927197943..827c5d1223c 100644
--- a/main/acpi/APKBUILD
+++ b/main/acpi/APKBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Drew DeVault <sir@cmpwn.com>
+# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
 pkgname=acpi
 pkgver=1.7
-pkgrel=4
+pkgrel=7
 pkgdesc="ACPI client for battery, power, and thermal readings"
 url="https://sourceforge.net/projects/acpiclient/files/acpiclient/"
 arch="all"
diff --git a/main/acpica/APKBUILD b/main/acpica/APKBUILD
index 417dd5cd61b..22c92c96cf7 100644
--- a/main/acpica/APKBUILD
+++ b/main/acpica/APKBUILD
@@ -1,22 +1,23 @@
 # Contributor: Roger Pau Monne <roger.pau@entel.upc.edu>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acpica
-pkgver=20200326
+pkgver=20230628
 pkgrel=0
 pkgdesc="ACPI Component Architecture utilities"
 url="https://www.acpica.org"
-arch="all !mips64"
+arch="all"
 license="GPL-2.0-only OR BSD-3-Clause OR Intel-ACPI"
 makedepends="flex bison"
 subpackages="iasl"
 options="!check"
-source="https://acpica.org/sites/acpica/files/acpica-unix-$pkgver.tar.gz
-	disable-werror.patch
-	"
+source="acpica-unix-$pkgver.tar.gz::https://downloadmirror.intel.com/783549/acpica-unix-$pkgver.tar.gz"
 
 builddir="$srcdir"/acpica-unix-$pkgver
 build() {
-	make
+	# binutils 2.40 has a bug specifically on this code
+	# careful with the format here- in abuild.conf we append a new -Wl block for this
+	export LDFLAGS="${LDFLAGS/-Wl,-z,pack-relative-relocs}"
+	make NOWERROR=TRUE
 }
 
 package() {
@@ -29,5 +30,6 @@ iasl() {
 	mv "$pkgdir"/usr/bin/iasl "$subpkgdir"/usr/bin/
 }
 
-sha512sums="253ea7fc2bb540dd0cfa55552648c33562f39efb9a9b8cbab751ad7f4fea9bd3800eb241afb30313140e2008889b62b82b4427624e087a275353d81555403e76  acpica-unix-20200326.tar.gz
-1f5049568d612d4debf3690e0d918d8d56abbed14ade7b2e6282eba17b25934b695d1a9fe10f99469efe8d4382c4546481d0579afdf5cdb9695fcdc93559fbab  disable-werror.patch"
+sha512sums="
+d726e69ebd8b8110690e3aff8d1919b43b0a2185efdeb9131ea8d89d321ca3a318a89c721ea740ae366f31ed3d1c11c2906f8807ee8a190e6f67fe5b2023cea4  acpica-unix-20230628.tar.gz
+"
diff --git a/main/acpica/disable-werror.patch b/main/acpica/disable-werror.patch
deleted file mode 100644
index da0c7c8889b..00000000000
--- a/main/acpica/disable-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/generate/unix/Makefile.config b/generate/unix/Makefile.config
-index a1f0313..8c4e8e7 100644
---- a/generate/unix/Makefile.config
-+++ b/generate/unix/Makefile.config
-@@ -194,7 +194,7 @@ CWARNINGFLAGS = \
-     -Wall\
-     -Wbad-function-cast\
-     -Wdeclaration-after-statement\
--    -Werror\
-+    -Wno-pointer-to-int-cast\
-     -Wformat=2\
-     -Wmissing-declarations\
-     -Wmissing-prototypes\
diff --git a/main/acpid/APKBUILD b/main/acpid/APKBUILD
new file mode 100644
index 00000000000..8ce7c96fa45
--- /dev/null
+++ b/main/acpid/APKBUILD
@@ -0,0 +1,70 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=acpid
+pkgver=2.0.34
+pkgrel=3
+pkgdesc="The ACPI Daemon (acpid) With Netlink Support"
+url="https://sourceforge.net/projects/acpid2/"
+arch="all"
+license="GPL-2.0-or-later"
+makedepends="linux-headers"
+install="$pkgname.post-deinstall"
+subpackages="$pkgname-doc $pkgname-openrc"
+source="https://downloads.sourceforge.net/sourceforge/acpid2/acpid-$pkgver.tar.xz
+	handler.sh
+	power-supply-ac
+	lid-closed
+	suspend
+	anything
+	$pkgname.initd
+	$pkgname.confd
+
+	lfs64.patch
+	"
+options="!check"  # no tests provided
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/ \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--docdir=/usr/share/doc/acpid \
+		--localstatedir=/var
+	make
+}
+
+package() {
+	make install DESTDIR="$pkgdir"
+
+	cd "$pkgdir"
+
+	install -D -m 755 "$srcdir"/handler.sh -t etc/acpi/
+	install -D -m 644 "$srcdir"/anything -t etc/acpi/events/
+
+	install -D -m 755 -t usr/share/acpid/ \
+		"$srcdir"/lid-closed \
+		"$srcdir"/power-supply-ac \
+		"$srcdir"/suspend
+
+	install -D -m 755 "$srcdir"/$pkgname.initd etc/init.d/$pkgname
+	install -D -m 644 "$srcdir"/$pkgname.confd etc/conf.d/$pkgname
+}
+
+openrc() {
+	default_openrc
+	replaces="busybox-openrc"  # overwrites /etc/init.d/acpid
+}
+
+sha512sums="
+2bf92295b55bb44fe83074b3e0c1ae639f63edaeea84b2184ae95b38852be40f380d5413110b8c0fcb2efc2ec01bf4764e1dcb97022fc724bebbfc35c0b63c81  acpid-2.0.34.tar.xz
+050c81446ac563d5d4c5d63a3e0b41558d5934427589114dc8b3215b72a1bd5923e0b8812e6d2265a6f53b6b0bcf8d7cc84d8ea6f2993ceea49c3c864c89c42c  handler.sh
+daf2510f202377a4db9b52448e4805bc4468c66f507cd4e676dc589306b716043c653ff18b697a4c37e5a005123a64a0278f3e4980504d98dd42ac9e95a3443f  power-supply-ac
+f6df3e75198e779826c187038804ba80e7a445567342ac912ff4e5d894ce936fb9347146c302c7d7c9bbc8b3a0e47aeee9d23a4b297ee37e3938b7310a1b5ad9  lid-closed
+8ec95453c21c5801a0864a5a91fd1d714f29d10a50658e93f027a395dcff91cd0e1ea5047ece199131e6205a422ae6f1887b388068630a0579995e3069d6a3bd  suspend
+2e04e5c8a428bfc653b4d56f5a2ff4472169a094ed9eee4b02ea88c755848e4803a0edeb054e152516ee50cb67c8c2be2c43e2e9db9dc80b7fcf218b8907ef6c  anything
+c647112006486abb469fdb60c2a91699e6922dac8b09642fa70d4341c9029748f99539d5befc8951adf57a6b382cf5a65adfd208bc2f19cab39b680120504e61  acpid.initd
+b8f62dc7d5a2d1338936af79b3e7165cc1c652be0be9e7f8eb00d964c1c1ef91767f16e8662eaa77920d914b966ae208c8480e44cb2dca0de4bfed01f302a089  acpid.confd
+a2ba48439f94a079a5d9a4295306b1478a2e025ba32c6b45b46b1b718b209966c2cea2c46c08d17a7d627418e602c4de255f652721d4219bf0c3fff5a8607ad7  lfs64.patch
+"
diff --git a/main/acpid/acpid.confd b/main/acpid/acpid.confd
new file mode 100644
index 00000000000..2b3d30484fc
--- /dev/null
+++ b/main/acpid/acpid.confd
@@ -0,0 +1,7 @@
+# Configuration file for /etc/init.d/acpid (from acpid package)
+
+# Additional arguments to pass to acpid.
+command_args="--logevents"
+
+# Uncomment to use process supervisor.
+#supervisor="supervise-daemon"
diff --git a/main/acpid/acpid.initd b/main/acpid/acpid.initd
new file mode 100644
index 00000000000..c2d60f97a21
--- /dev/null
+++ b/main/acpid/acpid.initd
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+
+description="The ACPI Daemon"
+
+extra_started_commands="reload"
+description_reload="Reload configuration"
+
+command="/sbin/acpid"
+command_args="--foreground ${command_args:-}"
+command_background="yes"
+pidfile="/run/$RC_SVCNAME.pid"
+
+depend() {
+	need dev localmount
+	after hwdrivers modules
+	provide acpid
+	keyword -vserver -lxc
+}
+
+reload() {
+	ebegin "Reloading $RC_SVCNAME configuration"
+	if [ "$supervisor" ]; then
+		$supervisor "$RC_SVCNAME" --signal HUP
+	else
+		start-stop-daemon --pidfile "$pidfile" --signal HUP
+	fi
+	eend $?
+}
diff --git a/main/acpid/acpid.post-deinstall b/main/acpid/acpid.post-deinstall
new file mode 100644
index 00000000000..9403b477559
--- /dev/null
+++ b/main/acpid/acpid.post-deinstall
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+cat >&2 <<EOF
+*
+* Run the following command to reinstall /etc/init.d/acpid from busybox:
+* > apk fix busybox-openrc
+*
+EOF
+
+exit 0
diff --git a/main/acpid/anything b/main/acpid/anything
new file mode 100644
index 00000000000..d1828989b0c
--- /dev/null
+++ b/main/acpid/anything
@@ -0,0 +1,3 @@
+# Pass all events to our one handler script
+event=.*
+action=/etc/acpi/handler.sh %e
diff --git a/main/acpid/handler.sh b/main/acpid/handler.sh
new file mode 100644
index 00000000000..9a6cbafec06
--- /dev/null
+++ b/main/acpid/handler.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+# vim: set ts=4 sw=4:
+#
+# This is the default ACPI handler script that is configured in
+# /etc/acpi/events/anything to be called for every ACPI event.
+# You can edit it and add your own actions; treat it as a configuration file.
+#
+# lid-closed, power-supply-ac and suspend are scripts located in
+# /usr/share/acpid/.
+#
+PATH="/usr/share/acpid:$PATH"
+alias log='logger -t acpid'
+
+# <dev-class>:<dev-name>:<notif-value>:<sup-value>
+case "$1:$2:$3:$4" in
+
+button/power:PWRF:* | button/power:PBTN:*)
+	log 'Power button pressed'
+	# If we have a lid (notebook), suspend to RAM, otherwise power off.
+	if [ -e /proc/acpi/button/lid/LID ]; then
+		suspend
+	else
+		poweroff
+	fi
+;;
+button/sleep:SLPB:*)
+	log 'Sleep button pressed'
+	suspend
+;;
+button/lid:*:close:*)
+	log 'Lid closed'
+	# Suspend to RAM if AC adapter is not connected.
+	power-supply-ac || suspend
+;;
+ac_adapter:*:*:*0)
+	log 'AC adapter unplugged'
+	# Suspend to RAM if notebook's lid is closed.
+	lid-closed && suspend
+;;
+esac
+
+exit 0
diff --git a/main/acpid/lfs64.patch b/main/acpid/lfs64.patch
new file mode 100644
index 00000000000..31838b12d07
--- /dev/null
+++ b/main/acpid/lfs64.patch
@@ -0,0 +1,13 @@
+--- a/sock.c
++++ b/sock.c
+@@ -54,8 +54,8 @@
+ static int
+ isfdtype(int fd, int fdtype)
+ {
+-	struct stat64 st;
+-	if (fstat64(fd, &st) != 0)
++	struct stat st;
++	if (fstat(fd, &st) != 0)
+ 		return -1;
+ 	return ((st.st_mode & S_IFMT) == (mode_t)fdtype);
+ }
diff --git a/main/acpid/lid-closed b/main/acpid/lid-closed
new file mode 100644
index 00000000000..57ffb713bd5
--- /dev/null
+++ b/main/acpid/lid-closed
@@ -0,0 +1,21 @@
+#!/bin/sh
+# This script exits with status 0 if the latop's lid is closed, 1 if opened,
+# 10 if /proc/acpi/button/lid/LID/state does not exist or is not readable.
+set -u
+
+STATE_FILE='/proc/acpi/button/lid/LID/state'
+
+verbose=false
+[ "${1:-}" = '-v' ] && verbose=true
+
+if ! [ -r "$STATE_FILE" ]; then
+	$verbose && echo "$STATE_FILE does not exist or is not readable!" >&2
+	exit 10
+fi
+
+read -r _ state < "$STATE_FILE" || exit 10
+
+[ "$state" = 'closed' ]; rc=$?
+
+$verbose && echo $rc
+exit $rc
diff --git a/main/acpid/power-supply-ac b/main/acpid/power-supply-ac
new file mode 100644
index 00000000000..337aae21d22
--- /dev/null
+++ b/main/acpid/power-supply-ac
@@ -0,0 +1,25 @@
+#!/bin/sh
+# This script exits with status 0 when the computer is on AC power (or no AC
+# power supply found), 1 otherwise (i.e. running on battery).
+set -u
+
+verbose=false
+[ "${1:-}" = '-v' ] && verbose=true
+
+# If we do not have any power supplies, assume we are on AC.
+rc=0
+
+# Iterate through power supplies sysfs knows about.
+for ps in /sys/class/power_supply/*; do
+	[ -r $ps/online ] || continue
+	# We know we have an AC adaptor, our default return changes to failed.
+	rc=1
+
+	if [ "$(cat $ps/online)" -eq 1 ]; then
+		rc=0
+		break
+	fi
+done
+
+$verbose && echo $rc
+exit $rc
diff --git a/main/acpid/suspend b/main/acpid/suspend
new file mode 100644
index 00000000000..f787037da67
--- /dev/null
+++ b/main/acpid/suspend
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if command -v zzz >/dev/null; then
+	zzz "$@"
+else
+	echo 'mem' > /sys/power/state
+fi
diff --git a/main/ada/APKBUILD b/main/ada/APKBUILD
new file mode 100644
index 00000000000..1812539a50c
--- /dev/null
+++ b/main/ada/APKBUILD
@@ -0,0 +1,60 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ada
+# NOTE: The primary use of this library is for main/nodejs and community/nodejs-current.
+pkgver=2.7.7
+pkgrel=1
+pkgdesc="WHATWG-compliant and fast URL parser written in modern C++"
+url="https://ada-url.github.io/ada"
+arch="all"
+license="( Apache-2.0 OR MIT ) AND MPL-2.0"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+makedepends="
+	cmake
+	cxxopts-dev
+	fmt-dev
+	gtest-dev
+	samurai
+	"
+checkdepends="simdjson-dev"
+subpackages="$pkgname-static $pkgname-dev $pkgname-libs"
+source="https://github.com/ada-url/ada/archive/v$pkgver/ada-$pkgver.tar.gz
+	use-system-simdjson-cxxopts.patch
+	"
+
+build() {
+	local crossopts=
+	[ "$CBUILD" != "$CHOST" ] && crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+
+	local shared; for shared in OFF ON; do
+		cmake -G Ninja -B build \
+			-DCMAKE_BUILD_TYPE=MinSizeRel \
+			-DCMAKE_INSTALL_PREFIX=/usr \
+			-DCMAKE_INSTALL_LIBDIR=lib \
+			-DBUILD_SHARED_LIBS=$shared \
+			-DBUILD_TESTING="$(want_check && echo ON || echo OFF)" \
+			-DADA_BENCHMARKS=OFF \
+			$crossopts
+		cmake --build build
+	done
+}
+
+check() {
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+	install -m644 build/src/libada.a -t "$pkgdir"/usr/lib/
+}
+
+tools() {
+	pkgdesc="$pkgdesc (cli tools)"
+	amove usr/bin
+}
+
+sha512sums="
+987782dacee5115f061f5579257fddf3ed26cdb8654279ce47915bef03abe7ca9904f0f4082b774be23772a3400925e908db45d9da935c7683269aae0ac2186a  ada-2.7.7.tar.gz
+63b4585bb29df3d922f31eefd60e37029c10ef654aa0bd098bffae622f6d74520d9e47ae76cadb9347eb6cea5140386f8c794bf9236f8c1ad014007e5597c1db  use-system-simdjson-cxxopts.patch
+"
diff --git a/main/ada/use-system-simdjson-cxxopts.patch b/main/ada/use-system-simdjson-cxxopts.patch
new file mode 100644
index 00000000000..7d991171669
--- /dev/null
+++ b/main/ada/use-system-simdjson-cxxopts.patch
@@ -0,0 +1,63 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,29 +34,12 @@
+   # CPM requires git as an implicit dependency
+   find_package(Git QUIET)
+   # We use googletest in the tests
+-  if(Git_FOUND AND ADA_TESTING)
+-    CPMAddPackage(
+-      NAME GTest
+-      GITHUB_REPOSITORY google/googletest
+-      VERSION 1.14.0
+-      OPTIONS  "BUILD_GMOCK OFF" "INSTALL_GTEST OFF"
+-    )
++  if(ADA_TESTING)
++    find_package(GTest)
+   endif()
+-  # We use simdjson in both the benchmarks and tests
+-  if(Git_FOUND AND (ADA_TESTING OR ADA_BENCHMARKS))
+-    CPMAddPackage("gh:simdjson/simdjson@3.3.0")
+-  endif()
+   # We use Google Benchmark, but it does not build under several 32-bit systems.
+   if(Git_FOUND AND ADA_BENCHMARKS AND (CMAKE_SIZEOF_VOID_P EQUAL 8))
+-    CPMAddPackage(
+-      NAME benchmark
+-      GITHUB_REPOSITORY google/benchmark
+-      GIT_TAG f91b6b4
+-      OPTIONS "BENCHMARK_ENABLE_TESTING OFF"
+-              "BENCHMARK_ENABLE_INSTALL OFF"
+-              "BENCHMARK_ENABLE_WERROR OFF"
+-  
+-    )
++    find_package(benchmark)
+   endif()
+   
+   if (ADA_TESTING AND NOT EMSCRIPTEN)
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -1 +1,6 @@
+-add_subdirectory(cli)
+\ No newline at end of file
++add_subdirectory(cli)
++target_link_libraries(adaparse PRIVATE ada)
++target_include_directories(adaparse PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>")
++
++find_package(cxxopts)
++target_link_libraries(adaparse PRIVATE cxxopts::cxxopts)
+--- a/tools/cli/CMakeLists.txt
++++ b/tools/cli/CMakeLists.txt
+@@ -8,12 +8,8 @@
+         "$<TARGET_FILE:ada>"      # <--this is in-file
+         "$<TARGET_FILE_DIR:adaparse>")                 # <--this is out-file path
+ endif()
+-CPMAddPackage("gh:fmtlib/fmt#7.1.3")
+-CPMAddPackage(
+-  GITHUB_REPOSITORY jarro2783/cxxopts
+-  VERSION 3.1.1
+-  OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES"
+-)
++find_package(cxxopts)
++find_package(fmt)
+ target_link_libraries(adaparse PRIVATE cxxopts::cxxopts fmt::fmt)
+ 
+ if(MSVC OR MINGW)
diff --git a/main/akms/APKBUILD b/main/akms/APKBUILD
new file mode 100644
index 00000000000..b4608bf4593
--- /dev/null
+++ b/main/akms/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=akms
+pkgver=0.2.1
+pkgrel=0
+pkgdesc="Alpine Kernel Module Support"
+url="https://github.com/jirutka/akms"
+arch="noarch"
+license="MIT"
+depends="bubblewrap cmd:depmod kernel-hooks"
+makedepends="asciidoctor"
+triggers="$pkgname.trigger=/usr/src/*"
+install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-deinstall"
+subpackages="$pkgname-doc"
+source="https://github.com/jirutka/akms/archive/v$pkgver/akms-$pkgver.tar.gz
+	modules-load.conf
+	"
+options="!check"  # no tests provided
+
+build() {
+	make build
+}
+
+package() {
+	make install DESTDIR="$pkgdir" prefix=/usr
+
+	# See https://github.com/jirutka/akms/issues/5
+	install -Dm644 "$srcdir"/modules-load.conf "$pkgdir"/usr/lib/modules-load.d/$pkgname.conf
+}
+
+sha512sums="
+ed66ff111ba8c4c3ee1aa252781089c435b1bbd9ac6c5b38292640e317573713343b2175dcb1ab1c071e9f6caf378589f29f02ed0fd80d4a1f18471fd109c4ca  akms-0.2.1.tar.gz
+e61ebacae17e4e6b9ec39c0673d46c7764cba7f1378208341688f201c396a1599f8a518ce0849f36da0de2710391014f45d90ab09f6b36a579970d1672b0d71d  modules-load.conf
+"
diff --git a/main/akms/akms.post-install b/main/akms/akms.post-install
new file mode 100644
index 00000000000..c3c925fe4c8
--- /dev/null
+++ b/main/akms/akms.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+ln -s /usr/share/kernel-hooks.d/akms.hook /etc/kernel-hooks.d/20-akms.hook
+
+exit 0
diff --git a/main/akms/akms.pre-deinstall b/main/akms/akms.pre-deinstall
new file mode 100644
index 00000000000..83c5f600ab8
--- /dev/null
+++ b/main/akms/akms.pre-deinstall
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+HOOK_FILE='/usr/share/kernel-hooks.d/akms.hook'
+
+for link in /etc/kernel-hooks.d/*; do
+	if [ "$(readlink -f "$link")" = "$HOOK_FILE" ]; then
+		rm "$link"
+	fi
+done
+
+exit 0
diff --git a/main/akms/akms.pre-install b/main/akms/akms.pre-install
new file mode 100644
index 00000000000..a3d89eeea1f
--- /dev/null
+++ b/main/akms/akms.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+adduser -S -D -H -h /var/lib/akms -s /bin/sh -G nogroup -g 'added by package akms' akms 2>/dev/null
+
+exit 0
diff --git a/main/akms/akms.trigger b/main/akms/akms.trigger
new file mode 100644
index 00000000000..63ddb6d2039
--- /dev/null
+++ b/main/akms/akms.trigger
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+CFG_FILE='/etc/akms.conf'
+
+if ! [ -f "$CFG_FILE" ]; then
+	echo "$CFG_FILE does not exist, skipping akms trigger" >&2
+	exit 0
+fi
+
+. "$CFG_FILE"
+
+case "$disable_trigger" in
+	yes | true | 1) exit 0;;
+esac
+
+for srcdir in "$@"; do
+	[ -f "$srcdir"/AKMBUILD ] || continue
+	akms install "$srcdir"
+done
+
+# Triggers exiting with non-zero status cause headaches. APK marks the
+# corresponding package and the world as broken and starts exiting with
+# status 1 even after e.g. successful installation of a new package.
+exit 0
diff --git a/main/akms/modules-load.conf b/main/akms/modules-load.conf
new file mode 100644
index 00000000000..08047cf6e0d
--- /dev/null
+++ b/main/akms/modules-load.conf
@@ -0,0 +1 @@
+overlay
diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD
index a998b9a3d40..4f075d6c91a 100644
--- a/main/alpine-base/APKBUILD
+++ b/main/alpine-base/APKBUILD
@@ -1,28 +1,43 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-base
-pkgver=3.12_alpha20200319
+pkgver=3.20.0_alpha20240329
 pkgrel=0
 pkgdesc="Meta package for minimal alpine base"
 url="https://alpinelinux.org"
 arch="noarch"
 license="MIT"
-depends="alpine-baselayout alpine-conf apk-tools busybox busybox-suid busybox-initscripts
-	openrc libc-utils alpine-keys"
-makedepends=""
-install=""
-subpackages=""
+depends="
+	alpine-baselayout
+	alpine-conf
+	alpine-release
+	apk-tools
+	busybox
+	busybox-mdev-openrc
+	busybox-openrc
+	busybox-suid
+	musl-utils
+	openrc
+	"
+subpackages="alpine-release:release"
 replaces="alpine-baselayout"
-source=""
+options="!check"
 
 build() {
 	return 0
 }
 
 package() {
-	mkdir -p "$pkgdir"/etc
+	mkdir -p "$pkgdir"
+}
+
+release() {
+	depends="alpine-keys"
+	pkgdesc="Alpine release data"
+
+	mkdir -p "$subpkgdir"/etc
 	# create /etc/alpine-release
-	echo $pkgver > "$pkgdir"/etc/alpine-release
+	echo $pkgver > "$subpkgdir"/etc/alpine-release
 	local _ver="$(echo "$pkgver" | grep -E -o '^[0-9]+\.[0-9]+')"
 	local _rel="v$_ver"
 	case "$pkgver" in
@@ -33,19 +48,26 @@ package() {
 	esac
 
 	# create /etc/issue
-	cat >"$pkgdir"/etc/issue<<EOF
+	cat >"$subpkgdir"/etc/issue<<EOF
 Welcome to Alpine Linux $_ver
 Kernel \\r on an \\m (\\l)
 
 EOF
 
 	# create os-release
-	cat >"$pkgdir"/etc/os-release<<EOF
+	cat >"$subpkgdir"/etc/os-release<<EOF
 NAME="Alpine Linux"
 ID=alpine
 VERSION_ID=$pkgver
 PRETTY_NAME="Alpine Linux $_rel"
 HOME_URL="https://alpinelinux.org/"
-BUG_REPORT_URL="https://bugs.alpinelinux.org/"
+BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues"
+EOF
+
+	# create secfixes.d repository list
+	mkdir -p "$subpkgdir"/etc/secfixes.d
+	cat >"$subpkgdir"/etc/secfixes.d/alpine<<EOF
+https://secdb.alpinelinux.org/$_rel/main.json
+https://secdb.alpinelinux.org/$_rel/community.json
 EOF
 }
diff --git a/main/alpine-baselayout/20locale.sh b/main/alpine-baselayout/20locale.sh
new file mode 100644
index 00000000000..9b9fde51f51
--- /dev/null
+++ b/main/alpine-baselayout/20locale.sh
@@ -0,0 +1,3 @@
+export CHARSET=${CHARSET:-UTF-8}
+export LANG=${LANG:-C.UTF-8}
+export LC_COLLATE=${LC_COLLATE:-C}
diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index 3a53648d196..e89705e76f1 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -1,20 +1,23 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-baselayout
-pkgver=3.2.0
-pkgrel=5
+pkgver=3.6.4
+pkgrel=0
 pkgdesc="Alpine base dir structure and init scripts"
 url="https://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
-arch="all"
+arch="noarch"
 license="GPL-2.0-only"
 pkggroups="shadow"
-options="!fhs !check"
+replaces_priority=1000
+options="!fhs !check keepdirs"
+depends="$pkgname-data=$pkgver-r$pkgrel"
+subpackages="$pkgname-data"
 install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade
 	$pkgname.post-install"
-source="mkmntdirs.c
-	crontab
-	color_prompt
-	locale
+_nbver=6.4
+source="crontab
+	color_prompt.sh.disabled
+	20locale.sh
 
 	aliases.conf
 	blacklist.conf
@@ -25,19 +28,19 @@ source="mkmntdirs.c
 	inittab
 	passwd
 	profile
-	protocols
-	services
+	protocols-$_nbver::https://salsa.debian.org/md/netbase/-/raw/v$_nbver/etc/protocols
+	services-$_nbver::https://salsa.debian.org/md/netbase/-/raw/v$_nbver/etc/services
 	"
 builddir="$srcdir/build"
 
 prepare() {
+	default_prepare
 	mkdir -p "$builddir"
+	mv "$srcdir"/protocols-$_nbver "$srcdir"/protocols
+	mv "$srcdir"/services-$_nbver "$srcdir"/services
 }
 
 build() {
-	${CC:-${CROSS_COMPILE}gcc} $CPPFLAGS $CFLAGS $LDFLAGS \
-		"$srcdir"/mkmntdirs.c -o "$builddir"/mkmntdirs
-
 	# generate shadow
 	awk -F: '{
 		pw = ":!:"
@@ -46,6 +49,27 @@ build() {
 	}' "$srcdir"/passwd > shadow
 }
 
+data() {
+	replaces="alpine-baselayout"
+	depends=
+
+	amove etc/fstab
+	amove etc/group
+	amove etc/hostname
+	amove etc/hosts
+	amove etc/inittab
+	amove etc/nsswitch.conf
+	amove etc/modules
+	amove etc/mtab
+	amove etc/passwd
+	amove etc/profile
+	amove etc/protocols
+	amove etc/services
+	amove etc/shadow
+	amove etc/shells
+	amove etc/sysctl.conf
+}
+
 package() {
 	mkdir -p "$pkgdir"
 	cd "$pkgdir"
@@ -54,17 +78,16 @@ package() {
 		dev/pts \
 		dev/shm \
 		etc \
-		etc/apk \
-		etc/conf.d \
 		etc/crontabs \
-		etc/init.d \
 		etc/modprobe.d \
 		etc/modules-load.d \
+		etc/network \
 		etc/network/if-down.d \
 		etc/network/if-post-down.d \
 		etc/network/if-pre-up.d \
 		etc/network/if-up.d \
 		etc/opt \
+		etc/periodic \
 		etc/periodic/15min \
 		etc/periodic/daily \
 		etc/periodic/hourly \
@@ -73,10 +96,11 @@ package() {
 		etc/profile.d \
 		etc/sysctl.d \
 		home \
+		lib \
 		lib/firmware \
-		lib/mdev \
 		lib/modules-load.d \
 		lib/sysctl.d \
+		media \
 		media/cdrom \
 		media/floppy \
 		media/usb \
@@ -87,8 +111,11 @@ package() {
 		sbin \
 		srv \
 		sys \
+		usr \
 		usr/bin \
+		usr/lib \
 		usr/lib/modules-load.d \
+		usr/local \
 		usr/local/bin \
 		usr/local/lib \
 		usr/local/share \
@@ -96,11 +123,13 @@ package() {
 		usr/share \
 		usr/share/man \
 		usr/share/misc \
+		var \
 		var/cache \
 		var/cache/misc \
 		var/lib \
 		var/lib/misc \
 		var/local \
+		var/lock \
 		var/lock/subsys \
 		var/log \
 		var/opt \
@@ -112,12 +141,11 @@ package() {
 	install -d -m 0555 var/empty
 	install -d -m 0700 "$pkgdir"/root
 	install -d -m 1777 "$pkgdir"/tmp "$pkgdir"/var/tmp
-	install -m755 "$builddir"/mkmntdirs "$pkgdir"/sbin/mkmntdirs
 
 	install -m600 "$srcdir"/crontab "$pkgdir"/etc/crontabs/root
 	install -m644 \
-		"$srcdir"/color_prompt \
-		"$srcdir"/locale \
+		"$srcdir"/color_prompt.sh.disabled \
+		"$srcdir"/20locale.sh \
 		"$pkgdir"/etc/profile.d/
 	install -m644 \
 		"$srcdir"/aliases.conf \
@@ -145,7 +173,7 @@ package() {
 
 		The Alpine Wiki contains a large amount of how-to guides and general
 		information about administrating Alpine systems.
-		See <http://wiki.alpinelinux.org/>.
+		See <https://wiki.alpinelinux.org/>.
 
 		You can setup the system with the command: setup-alpine
 
@@ -201,6 +229,21 @@ package() {
 		/dev/cdrom	/media/cdrom	iso9660	noauto,ro 0 0
 		/dev/usbdisk	/media/usb	vfat	noauto,ro 0 0
 	EOF
+	cat > "$pkgdir"/etc/profile.d/README <<-EOF
+		This directory should contain shell scripts configuring system-wide
+		environment on users' shells.
+
+		Files with the .sh extension found in this directory are evaluated by
+		Bourne-compatible shells (like ash, bash or zsh) when started as a
+		login shell.
+	EOF
+	cat > "$pkgdir"/etc/nsswitch.conf <<-EOF
+		# musl itself does not support NSS, however some third-party DNS
+		# implementations use the nsswitch.conf file to determine what
+		# policy to follow.
+		# Editing this file is not recommended.
+		hosts: files dns
+	EOF
 
 	install -m644 \
 		"$srcdir"/group \
@@ -220,17 +263,18 @@ package() {
 	ln -s /var/mail "$pkgdir"/var/spool/mail
 }
 
-sha512sums="199a34716b1f029407b08679fed4fda58384a1ccefbbec9abe1c64f4a3f7ad2a89bc7c02fc19a7f791f7c6bb87f9f0c708cb3f18c027cb7f54f25976eba4b839  mkmntdirs.c
+sha512sums="
 6e169c0975a1ad1ad871a863e8ee83f053de9ad0b58d94952efa4c28a8c221445d9e9732ad8b52832a50919c2f39aa965a929b3d5b3f9e62f169e2b2e0813d82  crontab
-7fcb5df98b0f19e609cb9444b2e6ca5ee97f5f308eb407436acdd0115781623fd89768a9285e9816e36778e565b6f27055f2a586a58f19d6d880de5446d263c4  color_prompt
-ff94cd77c79a523b79f18ddb6df5d489bd78879e63f2916c0584bf5177cace702663986bd366cbdfdbd9da950a6f32fb21037cab8d43658e892818f02dfae297  locale
+558071efdce2fe92afe4277006235b1a6368b070337c7567e5632a1a3fe531f87ca692eb36f3dda498d4d29d1f834fc8f7139f2985669ae3400b6d103d6f4c5e  color_prompt.sh.disabled
+03361d912cf29c127608697ee14bfa5972f82a5c475e653378ca5f7670cbd8183efc7c8c339ff046ff6537944fe00c4a732bb6b552aecaecd1214ed3e11bdf90  20locale.sh
 bfe947bdd69e7d93b32c8cb4e2cabe5717cb6c1e1f49a74015ac2cfb13e96d1f12c4be23ae93a1d61aaa3760d33a032fa9bd99f227fb21223a76b5f5908acc65  aliases.conf
-0b93db8ba1b5d16b2c23f9b6daea27a3a76c059a1f5ea0369af526ea3f4ff92a6040face89e95c45cf7daaa7a663f229df0f6c1ba24073ef4b2f7b74b298fdae  blacklist.conf
+0a1e1afa580751e80bf26057b65fadffe269c0552e7a1903de498f94973ba3da8453b51f25e649968ca5f4841266f5ccf951700fa28465a8614b83d07344de60  blacklist.conf
 49109d434b577563849c43dd8141961ca798dada74d4d3f49003dac1911f522c43438b8241fa254e4faacdd90058f4d39a7d69b1f493f6d57422c1f706547c95  i386.conf
 9dda8c9d1896baf1217aa05ae2936e909300a22a98da9f4c3ba29136852477bf4764321b6a1abb15e93ee58f4a6e77ddfc42cbb12cbbb53cf0f431ace444f72f  kms.conf
-abb391a9b5c2b418ad9ea15dcc373a0a0946e5e438d371d00d4bd6c8c60fa81613429a3b8d4313970dcc7eae527793a874c31a9b5a62706f450ab9bb9e8db405  group
-fdab6f8fec2a556ab817d90a73635a927ea04dbc4e0470ed59ee6a62c87393f9534c9b746b09a776d938c25b8af9c9fb1686578e24f8307d1d074921ade1bdc7  inittab
-06d12a7b9ca14fe17e412d0f24814620b67d035ae859be7906cbf4782dd69e359a6a555dafb98060b7fb7e4714aaa676c88d9017cded36e6d8398e23369bb290  passwd
-424a3dc91b9ff056c55b49fbbf7100b1a3707603f91410c5846ab869bdf6fb72287481b1ee78ef07e7b9e20a35310118d5fdbcc96e1bbb2fc5e9b2e0583b8a1c  profile
-f1548a2b5a107479446f15905f0f2fbf8762815b2215188d49d905c803786d35de6d98005dc0828fb2486b04aaa356f1216a964befddf1e72cb169656e23b6ac  protocols
-cecfc06b1f455d65b0c54a5651e601298b455771333e39d0109eeffd7ebd8d81b7738738eb647e6d3076230b6f3707782b83662ea3764ec33dc5e0b3453d3965  services"
+b5eb01165c714861e860f17c0156911ff882a9010306b7fc4cdb22251acf8b1c91a3fa1d44cc41cb3d9b50892e2f98f43da57b002c5c33200c1bf49c3d2d587d  group
+37d7b8348e604b12c055d9d7e79afb568ededea7153ff552c9f383cffd537d9c78cfd9facd612d2a6753fc626ff608a6d22d62637585a33166aa28f59fabed22  inittab
+f0d12f365839e7e262ec91e151119de7f2f253e9d0443157de4d52e183f421fbbb9eb0a83b9267a9ee850bebe41bff3c3cef553f9bda6e70d59a754a955be57d  passwd
+4eb857ed59c2edb257636d2bf196989e514a273e9701e9f076c9ae8c1589b4898269180569960acf072c0981ec7ea54014fd230f014401d6bb92314285d1e6aa  profile
+3a00083bcdf5a9e884c9d07877d52311e3d99e79cbee656e236ba06e08ba0dddb7ba76494fdc9dd1a826c48e197a790a69e6bb458e9df64832d6b5e904e9fd15  protocols-6.4
+47b0f3ee73af2d259bd206a026204be0ea25531a895a0b035a904b38fe5407bc3dd2beab7f8fcb3d760587e6159702ebdb9cbc4f508942befdf7f10c10c87888  services-6.4
+"
diff --git a/main/alpine-baselayout/alpine-baselayout.post-install b/main/alpine-baselayout/alpine-baselayout.post-install
index 32b9bae1711..7cfe97d6357 100644
--- a/main/alpine-baselayout/alpine-baselayout.post-install
+++ b/main/alpine-baselayout/alpine-baselayout.post-install
@@ -1,39 +1,14 @@
 #!/bin/sh
 
-create_vserver_startstop() {
-	cat <<__EOF__
-#!/bin/sh
-
-# This file is for compatibility
-case \${0##*/} in
-rcL)
-	RUNLEVEL=1 /sbin/rc sysinit || exit 1
-	/sbin/rc boot || exit 1
-	/sbin/rc \${1:-default}
-	exit 0
-	;;
-rcK)
-	/sbin/rc shutdown
-	;;
+# update color_prompt.sh symlink (if exists) after we renamed color_prompt to
+# color_prompt.sh.disabled.
+case "$(readlink etc/profile.d/color_prompt.sh 2>/dev/null || true)" in
+	color_prompt) ln -sf color_prompt.sh.disabled etc/profile.d/color_prompt.sh;;
 esac
 
-__EOF__
-}
-
-# create compat start/stop scripts for vserver guests
-if [ -x /sbin/rc ] && [ "$( /sbin/rc --sys )" = "VSERVER" ]; then
-	# create rcL and rcK
-	if ! [ -e /etc/init.d/rcL ]; then
-		create_vserver_startstop > /etc/init.d/rcL
-		chmod +x /etc/init.d/rcL
-	fi
-	if ! [ -e /etc/init.d/rcK ]; then
-		ln -s rcL /etc/init.d/rcK
-	fi
-fi
-
-# force /etc/shadow to be owned by root and not be world readable
-chown root:shadow /etc/shadow
-chmod 640 /etc/shadow
+# the /etc/group file is created after /etc/shadow. Needed to apply the group
+# properly.
+chown root:shadow etc/shadow
+chown root:shadow etc/shadow-
 
 exit 0
diff --git a/main/alpine-baselayout/alpine-baselayout.pre-upgrade b/main/alpine-baselayout/alpine-baselayout.pre-upgrade
index 2fcbe179436..f876e443749 100644
--- a/main/alpine-baselayout/alpine-baselayout.pre-upgrade
+++ b/main/alpine-baselayout/alpine-baselayout.pre-upgrade
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # we need to have our modprobe.d files with .conf suffix
-for i in /etc/modprobe.d/*; do
+for i in etc/modprobe.d/*; do
 	# ignore files that does not exist (i.e if modprobe.d is empty)
 	[ -r "$i" ] || continue
 
@@ -15,18 +15,18 @@ for i in /etc/modprobe.d/*; do
 done
 
 # migrate /var/run directory to /run
-if [ -d /var/run ]; then
-	cp -a /var/run/* /run 2>/dev/null
-	rm -rf /var/run
-	ln -s ../run /var/run
+if [ -d var/run ] && [ ! -L var/run ]; then
+	cp -a var/run/* run 2>/dev/null
+	rm -rf var/run
+	ln -s ../run var/run
 fi
 
 # migrate /var/spool/mail directory to /var/mail
-if [ -d /var/spool/mail ]; then
-	mkdir -p /var/mail
-	cp -a /var/spool/mail/* /var/mail/ 2>/dev/null
-	rm -rf /var/spool/mail
-	ln -s ../mail /var/spool/mail
+if [ -d var/spool/mail ] && [ ! -L var/spool/mail ]; then
+	mkdir -p var/mail
+	cp -a var/spool/mail/* var/mail/ 2>/dev/null
+	rm -rf var/spool/mail
+	ln -s ../mail var/spool/mail
 fi
 addgroup -S -g 42 shadow 2>/dev/null
 
diff --git a/main/alpine-baselayout/blacklist.conf b/main/alpine-baselayout/blacklist.conf
index 76c3fb75cd6..1cf7e1aa245 100644
--- a/main/alpine-baselayout/blacklist.conf
+++ b/main/alpine-baselayout/blacklist.conf
@@ -78,3 +78,7 @@ blacklist hfcsusb
 blacklist e_powersaver
 
 blacklist microcode
+
+# needs init config, not compatible with acpid
+# https://gitlab.alpinelinux.org/alpine/aports/-/issues/12999
+blacklist tiny_power_button
diff --git a/main/alpine-baselayout/color_prompt b/main/alpine-baselayout/color_prompt
deleted file mode 100644
index eea81eca5c7..00000000000
--- a/main/alpine-baselayout/color_prompt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Setup a red prompt for root and a green one for users.
-# rename this file to color_prompt.sh to actually enable it
-NORMAL="\[\e[0m\]"
-RED="\[\e[1;31m\]"
-GREEN="\[\e[1;32m\]"
-if [ "$USER" = root ]; then
-	PS1="$RED\h [$NORMAL\w$RED]# $NORMAL"
-else
-	PS1="$GREEN\h [$NORMAL\w$GREEN]\$ $NORMAL"
-fi
diff --git a/main/alpine-baselayout/color_prompt.sh.disabled b/main/alpine-baselayout/color_prompt.sh.disabled
new file mode 100644
index 00000000000..96e47891b31
--- /dev/null
+++ b/main/alpine-baselayout/color_prompt.sh.disabled
@@ -0,0 +1,17 @@
+# Setup a red prompt for root and a green one for users.
+# Symlink this file to color_prompt.sh to actually enable it.
+
+_normal=$'\e[0m'
+if [ "$USER" = root ]; then
+	_color=$'\e[1;31m'
+	_symbol='#'
+else
+	_color=$'\e[1;32m'
+	_symbol='$'
+fi
+if [ -n "$ZSH_VERSION" ]; then
+	PS1="%{$_color%}%m [%{$_normal%}%~%{$_color%}]$_symbol %{$_normal%}"
+else
+	PS1="\[$_color\]\h [\[$_normal\]\w\[$_color\]]$_symbol \[$_normal\]"
+fi
+unset _normal _color _symbol
diff --git a/main/alpine-baselayout/group b/main/alpine-baselayout/group
index ae59fdd3f0f..4a0d2913666 100644
--- a/main/alpine-baselayout/group
+++ b/main/alpine-baselayout/group
@@ -1,45 +1,33 @@
 root:x:0:root
 bin:x:1:root,bin,daemon
 daemon:x:2:root,bin,daemon
-sys:x:3:root,bin,adm
-adm:x:4:root,adm,daemon
+sys:x:3:root,bin
+adm:x:4:root,daemon
 tty:x:5:
-disk:x:6:root,adm
+disk:x:6:root
 lp:x:7:lp
-mem:x:8:
 kmem:x:9:
 wheel:x:10:root
 floppy:x:11:root
 mail:x:12:mail
 news:x:13:news
 uucp:x:14:uucp
-man:x:15:man
 cron:x:16:cron
-console:x:17:
 audio:x:18:
 cdrom:x:19:
 dialout:x:20:root
 ftp:x:21:
 sshd:x:22:
 input:x:23:
-at:x:25:at
 tape:x:26:root
 video:x:27:root
 netdev:x:28:
-readproc:x:30:
-squid:x:31:squid
-xfs:x:33:xfs
 kvm:x:34:kvm
 games:x:35:
 shadow:x:42:
-cdrw:x:80:
-usb:x:85:
-vpopmail:x:89:
+www-data:x:82:
 users:x:100:games
 ntp:x:123:
-nofiles:x:200:
-smmsp:x:209:smmsp
-locate:x:245:
 abuild:x:300:
 utmp:x:406:
 ping:x:999:
diff --git a/main/alpine-baselayout/inittab b/main/alpine-baselayout/inittab
index 960aa40577e..5294b8f53b1 100644
--- a/main/alpine-baselayout/inittab
+++ b/main/alpine-baselayout/inittab
@@ -13,7 +13,7 @@ tty5::respawn:/sbin/getty 38400 tty5
 tty6::respawn:/sbin/getty 38400 tty6
 
 # Put a getty on the serial port
-#ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100
+#ttyS0::respawn:/sbin/getty -L 115200 ttyS0 vt100
 
 # Stuff to do for the 3-finger salute
 ::ctrlaltdel:/sbin/reboot
diff --git a/main/alpine-baselayout/locale b/main/alpine-baselayout/locale
deleted file mode 100644
index 0b295572772..00000000000
--- a/main/alpine-baselayout/locale
+++ /dev/null
@@ -1,3 +0,0 @@
-CHARSET=UTF-8
-LANG=C.UTF-8
-LC_COLLATE=C
diff --git a/main/alpine-baselayout/mkmntdirs.c b/main/alpine-baselayout/mkmntdirs.c
deleted file mode 100644
index eaeae7321ef..00000000000
--- a/main/alpine-baselayout/mkmntdirs.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Create mount directories in fstab
- *
- * Copyright(c) 2008 Natanael Copa <natanael.copa@gmail.com>
- * May be distributed under the terms of GPL-2
- *
- * usage: mkmntdirs [fstab]
- *
- */
-
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <err.h>
-#include <mntent.h>
-#include <stdio.h>
-#include <string.h>
-
-
-#ifdef DEBUG
-#define mkdir_recursive(p)	puts((p))
-#else
-static void mkdir_recursive(char *path)
-{
-	char *s = path;
-	while (1) {
-		int c = '\0';
-		while (*s) {
-			if (*s == '/') {
-				do {
-					++s;
-				} while (*s == '/');
-				c = *s; /* Save the current char */
-				*s = '\0'; /* and replace it with nul. */
-				break;
-			}
-			++s;
-		}
-		mkdir(path, 0755);
-		if (c == '\0')
-			return;
-		*s = c;
-	}
-}
-#endif
-
-int main(int argc, const char *argv[])
-{
-	const char *filename = "/etc/fstab";
-	FILE *f;
-	struct mntent *ent;
-	if (argc == 2)
-		filename = argv[1];
-
-	f = setmntent(filename, "r");
-	if (f == NULL)
-		err(1, "%s", filename);
-
-	while ((ent = getmntent(f)) != NULL) {
-		if (strcmp(ent->mnt_dir, "none") != 0)
-			mkdir_recursive(ent->mnt_dir);
-	}
-
-	endmntent(f);
-	return 0;
-}
-
diff --git a/main/alpine-baselayout/passwd b/main/alpine-baselayout/passwd
index cc124a93bd4..1130fa0b21c 100644
--- a/main/alpine-baselayout/passwd
+++ b/main/alpine-baselayout/passwd
@@ -1,7 +1,6 @@
-root:x:0:0:root:/root:/bin/ash
+root:x:0:0:root:/root:/bin/sh
 bin:x:1:1:bin:/bin:/sbin/nologin
 daemon:x:2:2:daemon:/sbin:/sbin/nologin
-adm:x:3:4:adm:/var/adm:/sbin/nologin
 lp:x:4:7:lp:/var/spool/lpd:/sbin/nologin
 sync:x:5:0:sync:/sbin:/bin/sync
 shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown
@@ -9,19 +8,10 @@ halt:x:7:0:halt:/sbin:/sbin/halt
 mail:x:8:12:mail:/var/mail:/sbin/nologin
 news:x:9:13:news:/usr/lib/news:/sbin/nologin
 uucp:x:10:14:uucp:/var/spool/uucppublic:/sbin/nologin
-operator:x:11:0:operator:/root:/sbin/nologin
-man:x:13:15:man:/usr/man:/sbin/nologin
-postmaster:x:14:12:postmaster:/var/mail:/sbin/nologin
 cron:x:16:16:cron:/var/spool/cron:/sbin/nologin
 ftp:x:21:21::/var/lib/ftp:/sbin/nologin
 sshd:x:22:22:sshd:/dev/null:/sbin/nologin
-at:x:25:25:at:/var/spool/cron/atjobs:/sbin/nologin
-squid:x:31:31:Squid:/var/cache/squid:/sbin/nologin
-xfs:x:33:33:X Font Server:/etc/X11/fs:/sbin/nologin
 games:x:35:35:games:/usr/games:/sbin/nologin
-cyrus:x:85:12::/usr/cyrus:/sbin/nologin
-vpopmail:x:89:89::/var/vpopmail:/sbin/nologin
 ntp:x:123:123:NTP:/var/empty:/sbin/nologin
-smmsp:x:209:209:smmsp:/var/spool/mqueue:/sbin/nologin
 guest:x:405:100:guest:/dev/null:/sbin/nologin
 nobody:x:65534:65534:nobody:/:/sbin/nologin
diff --git a/main/alpine-baselayout/profile b/main/alpine-baselayout/profile
index f76472ce239..fbc3ba0cd50 100644
--- a/main/alpine-baselayout/profile
+++ b/main/alpine-baselayout/profile
@@ -1,10 +1,24 @@
-export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+
 export PAGER=less
-export PS1='\h:\w\$ '
 umask 022
 
+# use nicer PS1 for bash and busybox ash
+if [ -n "$BASH_VERSION" -o "$BB_ASH_VERSION" ]; then
+	PS1='\h:\w\$ '
+# use nicer PS1 for zsh
+elif [ -n "$ZSH_VERSION" ]; then
+	PS1='%m:%~%# '
+# set up fallback default PS1
+else
+	: "${HOSTNAME:=$(hostname)}"
+	PS1='${HOSTNAME%%.*}:$PWD'
+	[ "$(id -u)" -eq 0 ] && PS1="${PS1}# " || PS1="${PS1}\$ "
+fi
+
 for script in /etc/profile.d/*.sh ; do
-        if [ -r $script ] ; then
-                . $script
-        fi
+	if [ -r "$script" ] ; then
+		. "$script"
+	fi
 done
+unset script
diff --git a/main/alpine-baselayout/protocols b/main/alpine-baselayout/protocols
deleted file mode 100644
index 03f049d0678..00000000000
--- a/main/alpine-baselayout/protocols
+++ /dev/null
@@ -1,45 +0,0 @@
-# /etc/protocols:
-# $Id: protocols,v 1.1 2004/02/04 03:32:40 pebenito Exp $
-# $Header: /home/cvsroot/gentoo-projects/embedded/baselayout-lite/protocols,v 1.1 2004/02/04 03:32:40 pebenito Exp $
-#
-# Internet (IP) protocols
-#
-#	from: @(#)protocols	5.1 (Berkeley) 4/17/89
-#
-# Updated for NetBSD based on RFC 1340, Assigned Numbers (July 1992).
-
-ip	0	IP		# internet protocol, pseudo protocol number
-icmp	1	ICMP		# internet control message protocol
-igmp	2	IGMP		# Internet Group Management
-ggp	3	GGP		# gateway-gateway protocol
-ipencap	4	IP-ENCAP	# IP encapsulated in IP (officially ``IP'')
-st	5	ST		# ST datagram mode
-tcp	6	TCP		# transmission control protocol
-egp	8	EGP		# exterior gateway protocol
-pup	12	PUP		# PARC universal packet protocol
-udp	17	UDP		# user datagram protocol
-hmp	20	HMP		# host monitoring protocol
-xns-idp	22	XNS-IDP		# Xerox NS IDP
-rdp	27	RDP		# "reliable datagram" protocol
-iso-tp4	29	ISO-TP4		# ISO Transport Protocol class 4
-xtp	36	XTP		# Xpress Tranfer Protocol
-ddp	37	DDP		# Datagram Delivery Protocol
-idpr-cmtp 38	IDPR-CMTP	# IDPR Control Message Transport
-ipv6	41	IPv6		# IPv6
-ipv6-route 43	IPv6-Route	# Routing Header for IPv6
-ipv6-frag 44	IPv6-Frag	# Fragment Header for IPv6
-idrp	45	IDRP		# Inter-Domain Routing Protocol
-rsvp	46	RSVP		# Reservation Protocol
-gre	47	GRE		# General Routing Encapsulation
-esp	50	ESP		# Encap Security Payload for IPv6
-ah	51	AH		# Authentication Header for IPv6
-skip	57	SKIP		# SKIP
-ipv6-icmp 58	IPv6-ICMP	# ICMP for IPv6
-ipv6-nonxt 59	IPv6-NoNxt	# No Next Header for IPv6
-ipv6-opts 60	IPv6-Opts	# Destination Options for IPv6
-rspf	73	RSPF		# Radio Shortest Path First.
-vmtp	81	VMTP		# Versatile Message Transport
-ospf	89	OSPFIGP		# Open Shortest Path First IGP
-ipip	94	IPIP		# IP-within-IP Encapsulation Protocol
-encap	98	ENCAP		# Yet Another IP encapsulation
-pim	103	PIM		# Protocol Independent Multicast
diff --git a/main/alpine-baselayout/services b/main/alpine-baselayout/services
deleted file mode 100644
index c16f0ccf9da..00000000000
--- a/main/alpine-baselayout/services
+++ /dev/null
@@ -1,1184 +0,0 @@
-# /etc/services
-#
-# Network services, Internet style
-#
-# Note that it is presently the policy of IANA to assign a single well-known
-# port number for both TCP and UDP; hence, most entries here have two entries
-# even if the protocol doesn't support UDP operations.
-#
-# Some References:
-# http://www.iana.org/assignments/port-numbers
-# http://www.freebsd.org/cgi/cvsweb.cgi/src/etc/services
-#
-# Each line describes one service, and is of the form:
-# service-name  port/protocol  [aliases ...]   [# comment]
-#
-# See services(5) for more info.
-#
-
-#
-# IANA Assignments [Well Known Ports]
-# The Well Known Ports are assigned by the IANA and on most systems can
-# only be used by system (or root) processes or by programs executed by
-# privileged users.
-# The range for assigned ports managed by the IANA is 0-1023.
-#
-tcpmux		1/tcp				# TCP port service multiplexer
-tcpmux		1/udp
-compressnet	2/tcp				# Management Utility
-compressnet	2/udp
-compressnet	3/tcp				# Compression Process
-compressnet	3/udp
-rje		5/tcp				# Remote Job Entry
-rje		5/udp
-echo		7/tcp				# Echo
-echo		7/udp
-discard		9/tcp		sink null	# Discard
-discard		9/udp		sink null
-systat		11/tcp		users		# Active Users
-systat		11/udp		users
-daytime		13/tcp				# Daytime (RFC 867)
-daytime		13/udp
-#netstat	15/tcp				# (was once asssigned, no more)
-qotd		17/tcp		quote		# Quote of the Day
-qotd		17/udp		quote
-msp		18/tcp				# Message Send Protocol
-msp		18/udp
-chargen		19/tcp		ttytst source	# Character Generator
-chargen		19/udp		ttytst source
-ftp-data	20/tcp				# File Transfer [Default Data]
-ftp-data	20/udp
-ftp		21/tcp				# File Transfer [Control]
-ftp		21/udp		fsp fspd
-ssh		22/tcp				# SSH Remote Login Protocol
-ssh		22/udp
-telnet		23/tcp				# Telnet
-telnet		23/udp
-# private	24/tcp				# any private mail system
-# private	24/udp
-smtp		25/tcp		mail		# Simple Mail Transfer
-smtp		25/udp
-nsw-fe		27/tcp				# NSW User System FE
-nsw-fe		27/udp
-msg-icp		29/tcp				# MSG ICP
-msg-icp		29/udp
-msg-auth	31/tcp				# MSG Authentication
-msg-auth	31/udp
-dsp		33/tcp				# Display Support Protocol
-dsp		33/udp
-# private	35/tcp				# any private printer server
-# private	35/udp
-time		37/tcp		timserver
-time		37/udp		timserver
-rap		38/tcp				# Route Access Protocol
-rap		38/udp
-rlp		39/tcp		resource	# Resource Location Protocol
-rlp		39/udp		resource
-graphics	41/tcp				# Graphics
-graphics	41/udp
-nameserver	42/tcp		name		# Host Name Server
-nameserver	42/udp		name
-nicname		43/tcp		whois		# Who Is
-nicname		43/udp		whois
-mpm-flags	44/tcp				# MPM FLAGS Protocol
-mpm-flags	44/udp
-mpm		45/tcp				# Message Processing Module [recv]
-mpm		45/udp
-mpm-snd		46/tcp				# MPM [default send]
-mpm-snd		46/udp
-ni-ftp		47/tcp				# NI FTP
-ni-ftp		47/udp
-auditd		48/tcp				# Digital Audit Daemon
-auditd		48/udp
-tacacs		49/tcp				# Login Host Protocol (TACACS)
-tacacs		49/udp
-re-mail-ck	50/tcp				# Remote Mail Checking Protocol
-re-mail-ck	50/udp
-domain		53/tcp				# Domain Name Server
-domain		53/udp
-xns-ch		54/tcp				# XNS Clearinghouse
-xns-ch		54/udp
-isi-gl		55/tcp				# ISI Graphics Language
-isi-gl		55/udp
-xns-auth	56/tcp				# XNS Authentication
-xns-auth	56/udp
-# private	57/tcp				# any private terminal access
-# private	57/udp
-xns-mail	58/tcp				# XNS Mail
-xns-mail	58/udp
-# private	59/tcp				# any private file service
-# private	59/udp
-ni-mail		61/tcp				# NI MAIL
-ni-mail		61/udp
-acas		62/tcp				# ACA Services
-acas		62/udp
-whois++		63/tcp				# whois++
-whois++		63/udp
-covia		64/tcp				# Communications Integrator (CI)
-covia		64/udp
-tacacs-ds	65/tcp				# TACACS-Database Service
-tacacs-ds	65/udp
-sql*net		66/tcp				# Oracle SQL*NET
-sql*net		66/udp
-bootps		67/tcp				# Bootstrap Protocol Server (BOOTP)
-bootps		67/udp
-bootpc		68/tcp				# Bootstrap Protocol Client (BOOTP)
-bootpc		68/udp
-tftp		69/tcp				# Trivial File Transfer
-tftp		69/udp
-gopher		70/tcp				# Gopher
-gopher		70/udp
-netrjs-1	71/tcp				# Remote Job Service
-netrjs-1	71/udp
-netrjs-2	72/tcp
-netrjs-2	72/udp
-netrjs-3	73/tcp
-netrjs-3	73/udp
-netrjs-4	74/tcp
-netrjs-4	74/udp
-# private	75/tcp				# any private dial out service
-# private	75/udp
-deos		76/tcp				# Distributed External Object Store
-deos		76/udp
-# private	77/tcp				# any private RJE service
-# private	77/udp
-vettcp		78/tcp				# vettcp
-vettcp		78/udp
-finger		79/tcp				# Finger
-finger		79/udp
-http		80/tcp		www www-http	# World Wide Web HTTP
-http		80/udp		www www-http
-hosts2-ns	81/tcp				# HOSTS2 Name Server
-hosts2-ns	81/udp
-xfer		82/tcp				# XFER Utility
-xfer		82/udp
-mit-ml-dev	83/tcp				# MIT ML Device
-mit-ml-dev	83/udp
-ctf		84/tcp				# Common Trace Facility
-ctf		84/udp
-mit-ml-dev	85/tcp				# MIT ML Device
-mit-ml-dev	85/udp
-mfcobol		86/tcp				# Micro Focus Cobol
-mfcobol		86/udp
-# private	87/tcp				# any private terminal link
-# private	87/udp
-kerberos	88/tcp		kerberos5 krb5	# Kerberos
-kerberos	88/udp		kerberos5 krb5
-su-mit-tg	89/tcp				# SU/MIT Telnet Gateway
-su-mit-tg	89/udp
-dnsix		90/tcp				# DNSIX Securit Attribute Token Map
-dnsix		90/udp
-mit-dov		91/tcp				# MIT Dover Spooler
-mit-dov		91/udp
-npp		92/tcp				# Network Printing Protocol
-npp		92/udp
-dcp		93/tcp				# Device Control Protocol
-dcp		93/udp
-objcall		94/tcp				# Tivoli Object Dispatcher
-objcall		94/udp
-supdup		95/tcp				# SUPDUP
-supdup		95/udp
-dixie		96/tcp				# DIXIE Protocol Specification
-dixie		96/udp
-swift-rvf	97/tcp				# Swift Remote Virtural File Protocol
-swift-rvf	97/udp
-tacnews		98/tcp		linuxconf	# TAC News
-tacnews		98/udp
-metagram	99/tcp				# Metagram Relay
-metagram	99/udp
-#newacct	100/tcp				# [unauthorized use]
-hostname	101/tcp		hostnames	# NIC Host Name Server
-hostname	101/udp		hostnames
-iso-tsap	102/tcp		tsap		# ISO-TSAP Class 0
-iso-tsap	102/udp		tsap
-gppitnp		103/tcp				# Genesis Point-to-Point Trans Net
-gppitnp		103/udp
-acr-nema	104/tcp				# ACR-NEMA Digital Imag. & Comm. 300
-acr-nema	104/udp
-cso		105/tcp		csnet-ns cso-ns	# CCSO name server protocol
-cso		105/udp		csnet-ns cso-ns
-3com-tsmux	106/tcp		poppassd	# 3COM-TSMUX
-3com-tsmux	106/udp		poppassd	# Eudora: Unauthorized use by insecure poppassd protocol
-rtelnet		107/tcp				# Remote Telnet Service
-rtelnet		107/udp
-snagas		108/tcp				# SNA Gateway Access Server
-snagas		108/udp
-pop2		109/tcp		pop-2 postoffice# Post Office Protocol - Version 2
-pop2		109/udp		pop-2
-pop3		110/tcp		pop-3		# Post Office Protocol - Version 3
-pop3		110/udp		pop-3
-sunrpc		111/tcp		portmapper rpcbind	# SUN Remote Procedure Call
-sunrpc		111/udp		portmapper rpcbind
-mcidas		112/tcp				# McIDAS Data Transmission Protocol
-mcidas		112/udp
-auth		113/tcp		authentication tap ident # Authentication Service
-auth		113/udp
-sftp		115/tcp				# Simple File Transfer Protocol
-sftp		115/udp
-ansanotify	116/tcp				# ANSA REX Notify
-ansanotify	116/udp
-uucp-path	117/tcp				# UUCP Path Service
-uucp-path	117/udp
-sqlserv		118/tcp				# SQL Services
-sqlserv		118/udp
-nntp		119/tcp		readnews untp	# Network News Transfer Protocol
-nntp		119/udp		readnews untp
-cfdptkt		120/tcp				# CFDPTKT
-cfdptkt		120/udp
-erpc		121/tcp				# Encore Expedited Remote Pro.Call
-erpc		121/udp
-smakynet	122/tcp				# SMAKYNET
-smakynet	122/udp
-ntp		123/tcp				# Network Time Protocol
-ntp		123/udp
-ansatrader	124/tcp				# ANSA REX Trader
-ansatrader	124/udp
-locus-map	125/tcp				# Locus PC-Interface Net Map Ser
-locus-map	125/udp
-nxedit		126/tcp		unitary		# NXEdit
-nxedit		126/udp		unitary		# Unisys Unitary Login
-locus-con	127/tcp				# Locus PC-Interface Conn Server
-locus-con	127/udp
-gss-xlicen	128/tcp				# GSS X License Verification
-gss-xlicen	128/udp
-pwdgen		129/tcp				# Password Generator Protocol
-pwdgen		129/udp
-cisco-fna	130/tcp				# cisco FNATIVE
-cisco-fna	130/udp
-cisco-tna	131/tcp				# cisco TNATIVE
-cisco-tna	131/udp
-cisco-sys	132/tcp				# cisco SYSMAINT
-cisco-sys	132/udp
-statsrv		133/tcp				# Statistics Service
-statsrv		133/udp
-ingres-net	134/tcp				# INGRES-NET Service
-ingres-net	134/udp
-epmap		135/tcp		loc-srv		# DCE endpoint resolution
-epmap		135/udp		loc-srv
-profile		136/tcp				# PROFILE Naming System
-profile		136/udp
-netbios-ns	137/tcp				# NETBIOS Name Service
-netbios-ns	137/udp
-netbios-dgm	138/tcp				# NETBIOS Datagram Service
-netbios-dgm	138/udp
-netbios-ssn	139/tcp				# NETBIOS Session Service
-netbios-ssn	139/udp
-emfis-data	140/tcp				# EMFIS Data Service
-emfis-data	140/udp
-emfis-cntl	141/tcp				# EMFIS Control Service
-emfis-cntl	141/udp
-imap		143/tcp		imap2		# Internet Message Access Protocol
-imap		143/udp		imap2
-uma		144/tcp				# Universal Management Architecture
-uma		144/udp
-uaac		145/tcp				# UAAC Protocol
-uaac		145/udp
-iso-tp0		146/tcp				# ISO-TP0
-iso-tp0		146/udp
-iso-ip		147/tcp				# ISO-IP
-iso-ip		147/udp
-jargon		148/tcp				# Jargon
-jargon		148/udp
-aed-512		149/tcp				# AED 512 Emulation Service
-aed-512		149/udp
-sql-net		150/tcp				# SQL-NET
-sql-net		150/udp
-hems		151/tcp				# HEMS
-hems		151/udp
-bftp		152/tcp				# Background File Transfer Program
-bftp		152/udp
-sgmp		153/tcp				# SGMP
-sgmp		153/udp
-netsc-prod	154/tcp				# NETSC
-netsc-prod	154/udp
-netsc-dev	155/tcp
-netsc-dev	155/udp
-sqlsrv		156/tcp				# SQL Service
-sqlsrv		156/udp
-knet-cmp	157/tcp				# KNET/VM Command/Message Protocol
-knet-cmp	157/udp
-pcmail-srv	158/tcp				# PCMail Server
-pcmail-srv	158/udp
-nss-routing	159/tcp				# NSS-Routing
-nss-routing	159/udp
-sgmp-traps	160/tcp				# SGMP-TRAPS
-sgmp-traps	160/udp
-snmp		161/tcp				# Simple Net Mgmt Proto
-snmp		161/udp
-snmptrap	162/tcp		snmp-trap	# Traps for SNMP
-snmptrap	162/udp		snmp-trap
-cmip-man	163/tcp				# CMIP/TCP Manager
-cmip-man	163/udp
-cmip-agent	164/tcp				# CMIP/TCP Agent
-cmip-agent	164/udp
-xns-courier	165/tcp				# Xerox
-xns-courier	165/udp
-s-net		166/tcp				# Sirius Systems
-s-net		166/udp
-namp		167/tcp				# NAMP
-namp		167/udp
-rsvd		168/tcp				# RSVD
-rsvd		168/udp
-send		169/tcp				# SEND
-send		169/udp
-print-srv	170/tcp				# Network PostScript
-print-srv	170/udp
-multiplex	171/tcp				# Network Innovations Multiplex
-multiplex	171/udp
-cl/1		172/tcp				# Network Innovations CL/1
-cl/1		172/udp
-xyplex-mux	173/tcp				# Xyplex
-xyplex-mux	173/udp
-mailq		174/tcp				# Mailer transport queue for Zmailer
-mailq		174/udp
-vmnet		175/tcp				# VMNET
-vmnet		175/udp
-genrad-mux	176/tcp				# GENRAD-MUX
-genrad-mux	176/udp
-xdmcp		177/tcp				# X Display Manager Control Protocol
-xdmcp		177/udp
-nextstep	178/tcp		NeXTStep NextStep# NextStep Window Server
-nextstep	178/udp		NeXTStep NextStep
-bgp		179/tcp				# Border Gateway Protocol
-bgp		179/udp
-ris		180/tcp				# Intergraph
-ris		180/udp
-unify		181/tcp				# Unify
-unify		181/udp
-audit		182/tcp				# Unisys Audit SITP
-audit		182/udp
-ocbinder	183/tcp				# OCBinder
-ocbinder	183/udp
-ocserver	184/tcp				# OCServer
-ocserver	184/udp
-remote-kis	185/tcp				# Remote-KIS
-remote-kis	185/udp
-kis		186/tcp				# KIS Protocol
-kis		186/udp
-aci		187/tcp				# Application Communication Interface
-aci		187/udp
-mumps		188/tcp				# Plus Five's MUMPS
-mumps		188/udp
-qft		189/tcp				# Queued File Transport
-qft		189/udp
-gacp		190/tcp				# Gateway Access Control Protocol
-gacp		190/udp
-prospero	191/tcp				# Prospero Directory Service
-prospero	191/udp
-osu-nms		192/tcp				# OSU Network Monitoring System
-osu-nms		192/udp
-srmp		193/tcp				# Spider Remote Monitoring Protocol
-srmp		193/udp
-irc		194/tcp				# Internet Relay Chat Protocol
-irc		194/udp
-dn6-nlm-aud	195/tcp				# DNSIX Network Level Module Audit
-dn6-nlm-aud	195/udp
-dn6-smm-red	196/tcp				# DNSIX Session Mgt Module Audit Redir
-dn6-smm-red	196/udp
-dls		197/tcp				# Directory Location Service
-dls		197/udp
-dls-mon		198/tcp				# Directory Location Service Monitor
-dls-mon		198/udp
-smux		199/tcp				# SNMP Unix Multiplexer
-smux		199/udp
-src		200/tcp				# IBM System Resource Controller
-src		200/udp
-at-rtmp		201/tcp				# AppleTalk Routing Maintenance
-at-rtmp		201/udp
-at-nbp		202/tcp				# AppleTalk Name Binding
-at-nbp		202/udp
-at-echo		204/tcp				# AppleTalk Echo
-at-echo		204/udp
-at-zis		206/tcp				# AppleTalk Zone Information
-at-zis		206/udp
-qmtp		209/tcp				# The Quick Mail Transfer Protocol
-qmtp		209/udp
-z39.50		210/tcp		wais z3950	# ANSI Z39.50
-z39.50		210/udp		wais z3950
-914c/g		211/tcp				# Texas Instruments 914C/G Terminal
-914c/g		211/udp
-anet		212/tcp				# ATEXSSTR
-anet		212/udp
-ipx		213/tcp				# IPX
-ipx		213/udp
-imap3		220/tcp				# Interactive Mail Access
-imap3		220/udp
-link		245/tcp				# ttylink
-link		245/udp
-pawserv		345/tcp				# Perf Analysis Workbench
-pawserv		345/udp
-zserv		346/tcp				# Zebra server
-zserv		346/udp
-fatserv		347/tcp				# Fatmen Server
-fatserv		347/udp
-scoi2odialog	360/tcp				# scoi2odialog
-scoi2odialog	360/udp
-semantix	361/tcp				# Semantix
-semantix	361/udp
-srssend		362/tcp				# SRS Send
-srssend		362/udp
-rsvp_tunnel	363/tcp				# RSVP Tunnel
-rsvp_tunnel	363/udp
-aurora-cmgr	364/tcp				# Aurora CMGR
-aurora-cmgr	364/udp
-dtk		365/tcp				# Deception Tool Kit
-dtk		365/udp
-odmr		366/tcp				# ODMR
-odmr		366/udp
-rpc2portmap	369/tcp				# Coda portmapper
-rpc2portmap	369/udp
-codaauth2	370/tcp				# Coda authentication server
-codaauth2	370/udp
-clearcase	371/tcp				# Clearcase
-clearcase	371/udp
-ulistproc	372/tcp		ulistserv	# UNIX Listserv
-ulistproc	372/udp		ulistserv
-ldap		389/tcp				# Lightweight Directory Access Protocol
-ldap		389/udp
-imsp		406/tcp				# Interactive Mail Support Protocol
-imsp		406/udp
-svrloc		427/tcp				# Server Location
-svrloc		427/udp
-mobileip-agent	434/tcp				# MobileIP-Agent
-mobileip-agent	434/udp
-mobilip-mn	435/tcp				# MobilIP-MN
-mobilip-mn	435/udp
-https		443/tcp				# MCom
-https		443/udp
-snpp		444/tcp				# Simple Network Paging Protocol
-snpp		444/udp
-microsoft-ds	445/tcp		Microsoft-DS
-microsoft-ds	445/udp		Microsoft-DS
-kpasswd		464/tcp		kpwd		# Kerberos "passwd"
-kpasswd		464/udp		kpwd
-urd		465/tcp		smtps ssmtp	# URL Rendesvous Directory for SSM / smtp protocol over TLS/SSL
-igmpv3lite	465/udp		smtps ssmtp	# IGMP over UDP for SSM
-photuris	468/tcp
-photuris	468/udp
-rcp		469/tcp				# Radio Control Protocol
-rcp		469/udp
-saft		487/tcp				# Simple Asynchronous File Transfer
-saft		487/udp
-gss-http	488/tcp
-gss-http	488/udp
-pim-rp-disc	496/tcp
-pim-rp-disc	496/udp
-isakmp		500/tcp				# IPsec - Internet Security Association and Key Management Protocol
-isakmp		500/udp
-exec		512/tcp				# remote process execution
-comsat		512/udp		biff		# notify users of new mail received
-login		513/tcp				# remote login a la telnet
-who		513/udp		whod		# who's logged in to machines
-shell		514/tcp		cmd		# no passwords used
-syslog		514/udp
-printer		515/tcp		spooler		# line printer spooler
-printer		515/udp		spooler
-videotex	516/tcp
-videotex	516/udp
-talk		517/tcp				# like tenex link
-talk		517/udp
-ntalk		518/tcp
-ntalk		518/udp
-utime		519/tcp		unixtime
-utime		519/udp		unixtime
-efs		520/tcp				# extended file name server
-router		520/udp		route routed	# local routing process
-ripng		521/tcp
-ripng		521/udp
-ulp		522/tcp
-ulp		522/udp
-ibm-db2		523/tcp
-ibm-db2		523/udp
-ncp		524/tcp
-ncp		524/udp
-timed		525/tcp		timeserver
-timed		525/udp		timeserver
-tempo		526/tcp		newdate
-tempo		526/udp		newdate
-courier		530/tcp		rpc
-courier		530/udp		rpc
-conference	531/tcp		chat
-conference	531/udp		chat
-netnews		532/tcp		readnews
-netnews		532/udp		readnews
-netwall		533/tcp				# -for emergency broadcasts
-netwall		533/udp
-mm-admin	534/tcp				# MegaMedia Admin
-mm-admin	534/udp
-iiop		535/tcp
-iiop		535/udp
-opalis-rdv	536/tcp
-opalis-rdv	536/udp
-nmsp		537/tcp				# Networked Media Streaming Protocol
-nmsp		537/udp
-gdomap		538/tcp				# GNUstep distributed objects
-gdomap		538/udp
-uucp		540/tcp		uucpd		# uucp daemon
-uucp		540/udp		uucpd
-klogin		543/tcp				# Kerberized `rlogin' (v5)
-klogin		543/udp
-kshell		544/tcp		krcmd		# Kerberized `rsh' (v5)
-kshell		544/udp		krcmd
-appleqtcsrvr	545/tcp
-appleqtcsrvr	545/udp
-dhcpv6-client	546/tcp				# DHCPv6 Client
-dhcpv6-client	546/udp
-dhcpv6-server	547/tcp				# DHCPv6 Server
-dhcpv6-server	547/udp
-afpovertcp	548/tcp				# AFP over TCP
-afpovertcp	548/udp
-rtsp		554/tcp				# Real Time Stream Control Protocol
-rtsp		554/udp
-dsf		555/tcp
-dsf		555/udp
-remotefs	556/tcp		rfs_server rfs	# Brunhoff remote filesystem
-remotefs	556/udp		rfs_server rfs
-nntps		563/tcp		snntp		# NNTP over SSL
-nntps		563/udp		snntp
-9pfs		564/tcp				# plan 9 file service
-9pfs		564/udp
-whoami		565/tcp
-whoami		565/udp
-submission	587/tcp				# mail message submission
-submission	587/udp
-http-alt	591/tcp				# FileMaker, Inc. - HTTP Alternate
-http-alt	591/udp
-nqs		607/tcp				# Network Queuing system
-nqs		607/udp
-npmp-local	610/tcp		dqs313_qmaster	# npmp-local / DQS
-npmp-local	610/udp		dqs313_qmaster
-npmp-gui	611/tcp		dqs313_execd	# npmp-gui / DQS
-npmp-gui	611/udp		dqs313_execd
-hmmp-ind	612/tcp		dqs313_intercell# HMMP Indication / DQS
-hmmp-ind	612/udp		dqs313_intercell
-cryptoadmin	624/tcp				# Crypto Admin
-cryptoadmin	624/udp
-dec_dlm		625/tcp				# DEC DLM
-dec_dlm		625/udp
-asia		626/tcp
-asia		626/udp
-passgo-tivoli	627/tcp				# PassGo Tivoli
-passgo-tivoli	627/udp
-qmqp		628/tcp				# Qmail QMQP
-qmqp		628/udp
-3com-amp3	629/tcp
-3com-amp3	629/udp
-rda		630/tcp
-rda		630/udp
-ipp		631/tcp				# Internet Printing Protocol
-ipp		631/udp
-ldaps		636/tcp				# LDAP over SSL
-ldaps		636/udp
-tinc		655/tcp				# TINC control port
-tinc		655/udp
-acap		674/tcp				# Application Configuration Access Protocol
-acap		674/udp
-asipregistry	687/tcp
-asipregistry	687/udp
-realm-rusd	688/tcp				# ApplianceWare managment protocol
-realm-rusd	688/udp
-nmap		689/tcp				# Opensource Network Mapper
-nmap		689/udp
-ha-cluster	694/tcp				# Heartbeat HA-cluster
-ha-cluster	694/udp
-epp		700/tcp				# Extensible Provisioning Protocol
-epp		700/udp
-iris-beep	702/tcp				# IRIS over BEEP
-iris-beep	702/udp
-silc		706/tcp				# SILC
-silc		706/udp
-kerberos-adm	749/tcp				# Kerberos `kadmin' (v5)
-kerberos-adm	749/udp
-kerberos-iv	750/tcp		kerberos4 kdc	# Kerberos (server)
-kerberos-iv	750/udp		kerberos4 kdc
-pump		751/tcp		kerberos_master
-pump		751/udp		kerberos_master	# Kerberos authentication
-qrh		752/tcp		passwd_server
-qrh		752/udp		passwd_server	# Kerberos passwd server
-rrh		753/tcp
-rrh		753/udp
-tell		754/tcp		send krb_prop krb5_prop	# Kerberos slave propagation
-tell		754/udp		send
-nlogin		758/tcp
-nlogin		758/udp
-con		759/tcp
-con		759/udp
-ns		760/tcp		krbupdate kreg	# Kerberos registration
-ns		760/udp
-webster		765/tcp				# Network dictionary
-webster		765/udp
-phonebook	767/tcp				# Network phonebook
-phonebook	767/udp
-rsync		873/tcp				# rsync
-rsync		873/udp
-ftps-data	989/tcp				# ftp protocol, data, over TLS/SSL
-ftps-data	989/udp
-ftps		990/tcp				# ftp protocol, control, over TLS/SSL
-ftps		990/udp
-nas		991/tcp				# Netnews Administration System
-nas		991/udp
-telnets		992/tcp				# telnet protocol over TLS/SSL
-telnets		992/udp
-imaps	 	993/tcp				# imap4 protocol over TLS/SSL
-imaps	 	993/udp
-ircs		994/tcp				# irc protocol over TLS/SSL
-ircs		994/udp
-pop3s		995/tcp				# pop3 protocol over TLS/SSL
-pop3s		995/udp
-
-#
-# IANA Assignments [Registered Ports]
-#
-# The Registered Ports are listed by the IANA and on most systems can be
-# used by ordinary user processes or programs executed by ordinary
-# users.
-# Ports are used in the TCP [RFC793] to name the ends of logical
-# connections which carry long term conversations.  For the purpose of
-# providing services to unknown callers, a service contact port is
-# defined.  This list specifies the port used by the server process as
-# its contact port.
-# The IANA registers uses of these ports as a convenience to the
-# community.
-# To the extent possible, these same port assignments are used with the
-# UDP [RFC768].
-# The Registered Ports are in the range 1024-49151.
-#
-imgames		1077/tcp
-imgames		1077/udp
-socks		1080/tcp			# socks proxy server
-socks		1080/udp
-rmiregistry	1099/tcp			# Java RMI Registry
-rmiregistry	1099/udp
-bnetgame	1119/tcp			# Battle.net Chat/Game Protocol
-bnetgame	1119/udp
-bnetfile	1120/tcp			# Battle.net File Transfer Protocol
-bnetfile	1120/udp
-hpvmmcontrol	1124/tcp			# HP VMM Control
-hpvmmcontrol	1124/udp
-hpvmmagent	1125/tcp			# HP VMM Agent
-hpvmmagent	1125/udp
-hpvmmdata	1126/tcp			# HP VMM Agent
-hpvmmdata	1126/udp
-resacommunity	1154/tcp			# Community Service
-resacommunity	1154/udp
-3comnetman	1181/tcp			# 3Com Net Management
-3comnetman	1181/udp
-mysql-cluster	1186/tcp			# MySQL Cluster Manager
-mysql-cluster	1186/udp
-alias		1187/tcp			# Alias Service
-alias		1187/udp
-openvpn		1194/tcp			# OpenVPN
-openvpn		1194/udp
-kazaa		1214/tcp			# KAZAA
-kazaa		1214/udp
-bvcontrol	1236/tcp	rmtcfg		# Gracilis Packeten remote config server
-bvcontrol	1236/udp	rmtcfg
-nessus		1241/tcp			# Nessus vulnerability assessment scanner
-nessus		1241/udp
-h323hostcallsc	1300/tcp			# H323 Host Call Secure
-h323hostcallsc	1300/udp
-lotusnote	1352/tcp			# Lotus Note
-lotusnote	1352/udp
-ms-sql-s	1433/tcp			# Microsoft-SQL-Server
-ms-sql-s	1433/udp
-ms-sql-m	1434/tcp			# Microsoft-SQL-Monitor
-ms-sql-m	1434/udp
-ica		1494/tcp			# Citrix ICA Client
-ica		1494/udp
-wins		1512/tcp			# Microsoft's Windows Internet Name Service
-wins		1512/udp
-ingreslock	1524/tcp
-ingreslock	1524/udp
-prospero-np	1525/tcp			# Prospero non-privileged
-prospero-np	1525/udp
-datametrics	1645/tcp	old-radius	# datametrics / old radius entry
-datametrics	1645/udp	old-radius
-sa-msg-port	1646/tcp	old-radacct	# sa-msg-port / old radacct entry
-sa-msg-port	1646/udp	old-radacct
-rsap		1647/tcp
-rsap		1647/udp
-concurrent-lm	1648/tcp
-concurrent-lm	1648/udp
-kermit		1649/tcp
-kermit		1649/udp
-l2tp		1701/tcp
-l2tp		1701/udp
-h323gatedisc	1718/tcp
-h323gatedisc	1718/udp
-h323gatestat	1719/tcp
-h323gatestat	1719/udp
-h323hostcall	1720/tcp
-h323hostcall	1720/udp
-iberiagames	1726/tcp
-iberiagames	1726/udp
-gamegen1	1738/tcp
-gamegen1	1738/udp
-tftp-mcast	1758/tcp
-tftp-mcast	1758/udp
-hello		1789/tcp
-hello		1789/udp
-radius		1812/tcp			# Radius
-radius		1812/udp
-radius-acct	1813/tcp	radacct		# Radius Accounting
-radius-acct	1813/udp	radacct
-mtp		1911/tcp			# Starlight Networks Multimedia Transport Protocol
-mtp		1911/udp
-egs		1926/tcp			# Evolution Game Server
-egs		1926/udp
-unix-status	1957/tcp			# remstats unix-status server
-unix-status	1957/udp
-hsrp		1985/tcp			# Hot Standby Router Protocol
-hsrp		1985/udp
-licensedaemon	1986/tcp			# cisco license management
-licensedaemon	1986/udp
-tr-rsrb-p1	1987/tcp			# cisco RSRB Priority 1 port
-tr-rsrb-p1	1987/udp
-tr-rsrb-p2	1988/tcp			# cisco RSRB Priority 2 port
-tr-rsrb-p2	1988/udp
-tr-rsrb-p3	1989/tcp			# cisco RSRB Priority 3 port
-tr-rsrb-p3	1989/udp
-stun-p1		1990/tcp			# cisco STUN Priority 1 port
-stun-p1		1990/udp
-stun-p2		1991/tcp			# cisco STUN Priority 2 port
-stun-p2		1991/udp
-stun-p3		1992/tcp			# cisco STUN Priority 3 port
-stun-p3		1992/udp
-snmp-tcp-port	1994/tcp			# cisco SNMP TCP port
-snmp-tcp-port	1994/udp
-stun-port	1995/tcp			# cisco serial tunnel port
-stun-port	1995/udp
-perf-port	1996/tcp			# cisco Remote SRB port
-perf-port	1996/udp
-gdp-port	1997/tcp			# cisco Gateway Discovery Protocol
-gdp-port	1997/udp
-x25-svc-port	1998/tcp			# cisco X.25 service (XOT)
-x25-svc-port	1998/udp
-tcp-id-port	1999/tcp			# cisco identification port
-tcp-id-port	1999/udp
-cisco-sccp	2000/tcp	sieve		# Cisco SCCP
-cisco-sccp	2000/udp	sieve
-nfs		2049/tcp			# Network File System
-nfs		2049/udp
-radsec		2083/tcp			# Secure Radius Service
-radsec		2083/udp
-gnunet		2086/tcp			# GNUnet
-gnunet		2086/udp
-rtcm-sc104	2101/tcp			# RTCM SC-104
-rtcm-sc104	2101/udp
-zephyr-srv	2102/tcp			# Zephyr server
-zephyr-srv	2102/udp
-zephyr-clt	2103/tcp			# Zephyr serv-hm connection
-zephyr-clt	2103/udp
-zephyr-hm	2104/tcp			# Zephyr hostmanager
-zephyr-hm	2104/udp
-eyetv		2170/tcp			# EyeTV Server Port
-eyetv		2170/udp
-msfw-storage	2171/tcp			# MS Firewall Storage
-msfw-storage	2171/udp
-msfw-s-storage	2172/tcp			# MS Firewall SecureStorage
-msfw-s-storage	2172/udp
-msfw-replica	2173/tcp			# MS Firewall Replication
-msfw-replica	2173/udp
-msfw-array	2174/tcp			# MS Firewall Intra Array
-msfw-array	2174/udp
-airsync		2175/tcp			# Microsoft Desktop AirSync Protocol
-airsync		2175/udp
-rapi		2176/tcp			# Microsoft ActiveSync Remote API
-rapi		2176/udp
-qwave		2177/tcp			# qWAVE Bandwidth Estimate
-qwave		2177/udp
-tivoconnect	2190/tcp			# TiVoConnect Beacon
-tivoconnect	2190/udp
-tvbus		2191/tcp			# TvBus Messaging
-tvbus		2191/udp
-mysql-im	2273/tcp			# MySQL Instance Manager
-mysql-im	2273/udp
-dict-lookup	2289/tcp			# Lookup dict server
-dict-lookup	2289/udp
-redstorm_join	2346/tcp			# Game Connection Port
-redstorm_join	2346/udp
-redstorm_find	2347/tcp			# Game Announcement and Location
-redstorm_find	2347/udp
-redstorm_info	2348/tcp			# Information to query for game status
-redstorm_info	2348/udp
-cvspserver	2401/tcp			# CVS client/server operations
-cvspserver	2401/udp
-venus		2430/tcp			# codacon port
-venus		2430/udp
-venus-se	2431/tcp			# tcp side effects
-venus-se	2431/udp
-codasrv		2432/tcp			# not used
-codasrv		2432/udp
-codasrv-se	2433/tcp			# tcp side effects
-codasrv-se	2433/udp
-netadmin	2450/tcp
-netadmin	2450/udp
-netchat		2451/tcp
-netchat		2451/udp
-snifferclient	2452/tcp
-snifferclient	2452/udp
-ppcontrol	2505/tcp			# PowerPlay Control
-ppcontrol	2505/udp
-lstp		2559/tcp			# 
-lstp		2559/udp
-mon		2583/tcp
-mon		2583/udp
-hpstgmgr	2600/tcp	zebrasrv
-hpstgmgr	2600/udp	zebrasrv
-discp-client	2601/tcp	zebra		# discp client
-discp-client	2601/udp	zebra
-discp-server	2602/tcp	ripd		# discp server
-discp-server	2602/udp	ripd
-servicemeter	2603/tcp	ripngd		# Service Meter
-servicemeter	2603/udp	ripngd
-nsc-ccs		2604/tcp	ospfd		# NSC CCS
-nsc-ccs		2604/udp	ospfd
-nsc-posa	2605/tcp	bgpd		# NSC POSA
-nsc-posa	2605/udp	bgpd
-netmon		2606/tcp	ospf6d		# Dell Netmon
-netmon		2606/udp	ospf6d
-connection	2607/tcp			# Dell Connection
-connection	2607/udp
-wag-service	2608/tcp			# Wag Service
-wag-service	2608/udp
-dict		2628/tcp			# Dictionary server
-dict		2628/udp
-exce		2769/tcp			# eXcE
-exce		2769/udp
-dvr-esm		2804/tcp			# March Networks Digital Video Recorders and Enterprise Service Manager products
-dvr-esm		2804/udp
-corbaloc	2809/tcp			# CORBA LOC
-corbaloc	2809/udp
-ndtp		2882/tcp			# Network Dictionary Transfer Protocol
-ndtp		2882/udp
-gamelobby	2914/tcp			# Game Lobby
-gamelobby	2914/udp
-gds_db		3050/tcp			# InterBase server
-gds_db		3050/udp
-xbox		3074/tcp			# Xbox game port
-xbox		3074/udp
-icpv2		3130/tcp	icp		# Internet Cache Protocol (Squid)
-icpv2		3130/udp	icp
-nm-game-admin	3148/tcp			# NetMike Game Administrator
-nm-game-admin	3148/udp
-nm-game-server	3149/tcp			# NetMike Game Server
-nm-game-server	3149/udp
-mysql		3306/tcp			# MySQL
-mysql		3306/udp
-sftu		3326/tcp
-sftu		3326/udp
-trnsprntproxy	3346/tcp			# Transparent Proxy
-trnsprntproxy	3346/udp
-ms-wbt-server	3389/tcp	rdp		# MS WBT Server
-ms-wbt-server	3389/udp	rdp		# Microsoft Remote Desktop Protocol
-prsvp		3455/tcp			# RSVP Port
-prsvp		3455/udp
-nut		3493/tcp			# Network UPS Tools
-nut		3493/udp
-ironstorm	3504/tcp			# IronStorm game server
-ironstorm	3504/udp
-cctv-port	3559/tcp			# CCTV control port
-cctv-port	3559/udp
-iw-mmogame	3596/tcp			# Illusion Wireless MMOG
-iw-mmogame	3596/udp
-distcc		3632/tcp			# Distributed Compiler
-distcc		3632/udp
-daap		3689/tcp			# Digital Audio Access Protocol
-daap		3689/udp
-svn		3690/tcp			# Subversion
-svn		3690/udp
-blizwow		3724/tcp			# World of Warcraft
-blizwow		3724/udp
-netboot-pxe	3928/tcp	pxe		# PXE NetBoot Manager
-netboot-pxe	3928/udp	pxe
-smauth-port	3929/tcp			# AMS Port
-smauth-port	3929/udp
-treehopper	3959/tcp			# Tree Hopper Networking
-treehopper	3959/udp
-cobraclient	3970/tcp			# Cobra Client
-cobraclient	3970/udp
-cobraserver	3971/tcp			# Cobra Server
-cobraserver	3971/udp
-pxc-spvr-ft	4002/tcp	pxc-spvr-ft
-pxc-spvr-ft	4002/udp	pxc-spvr-ft
-pxc-splr-ft	4003/tcp	pxc-splr-ft rquotad
-pxc-splr-ft	4003/udp	pxc-splr-ft rquotad
-pxc-roid	4004/tcp	pxc-roid
-pxc-roid	4004/udp	pxc-roid
-pxc-pin		4005/tcp	pxc-pin
-pxc-pin		4005/udp	pxc-pin
-pxc-spvr	4006/tcp	pxc-spvr
-pxc-spvr	4006/udp	pxc-spvr
-pxc-splr	4007/tcp	pxc-splr
-pxc-splr	4007/udp	pxc-splr
-xgrid		4111/tcp			# Mac OS X Server Xgrid
-xgrid		4111/udp
-bzr		4155/tcp			# Bazaar Version Control System
-bzr		4155/udp			# Bazaar version control system
-rwhois		4321/tcp			# Remote Who Is
-rwhois		4321/udp
-epmd		4369/tcp			# Erlang Port Mapper Daemon
-epmd		4369/udp
-krb524		4444/tcp
-krb524		4444/udp
-ipsec-nat-t	4500/tcp			# IPsec NAT-Traversal
-ipsec-nat-t	4500/udp
-hylafax		4559/tcp			# HylaFAX client-server protocol  (new)
-hylafax		4559/udp
-piranha1	4600/tcp
-piranha1	4600/udp
-playsta2-app	4658/tcp			# PlayStation2 App Port
-playsta2-app	4658/udp
-playsta2-lob	4659/tcp			# PlayStation2 Lobby Port
-playsta2-lob	4659/udp
-snap		4752/tcp			# Simple Network Audio Protocol
-snap		4752/udp
-radmin-port	4899/tcp			# RAdmin Port
-radmin-port	4899/udp
-rfe		5002/tcp			# Radio Free Ethernet
-rfe		5002/udp
-ita-agent	5051/tcp			# ITA Agent
-ita-agent	5051/udp
-sdl-ets		5081/tcp			# SDL - Ent Trans Server
-sdl-ets		5081/udp
-bzflag		5154/tcp			# BZFlag game server
-bzflag		5154/udp
-aol		5190/tcp			# America-Online
-aol		5190/udp
-xmpp-client	5222/tcp			# XMPP Client Connection
-xmpp-client	5222/udp
-caevms		5251/tcp			# CA eTrust VM Service
-caevms		5251/udp
-xmpp-server	5269/tcp			# XMPP Server Connection
-xmpp-server	5269/udp
-cfengine	5308/tcp			# CFengine
-cfengine	5308/udp
-nat-pmp		5351/tcp			# NAT Port Mapping Protocol
-nat-pmp		5351/udp
-dns-llq		5352/tcp			# DNS Long-Lived Queries
-dns-llq		5352/udp
-mdns		5353/tcp			# Multicast DNS
-mdns		5353/udp
-mdnsresponder	5354/tcp	noclog		# Multicast DNS Responder IPC
-mdnsresponder	5354/udp	noclog		# noclogd with TCP (nocol)
-llmnr		5355/tcp	hostmon		# Link-Local Multicast Name Resolution
-llmnr		5355/udp	hostmon		# hostmon uses TCP (nocol)
-dj-ice		5419/tcp
-dj-ice		5419/udp
-beyond-remote	5424/tcp			# Beyond Remote
-beyond-remote	5424/udp
-br-channel	5425/tcp			# Beyond Remote Command Channel
-br-channel	5425/udp
-postgresql	5432/tcp			# POSTGRES
-postgresql	5432/udp
-sgi-eventmond	5553/tcp			# SGI Eventmond Port
-sgi-eventmond	5553/udp
-sgi-esphttp	5554/tcp			# SGI ESP HTTP
-sgi-esphttp	5554/udp
-cvsup		5999/tcp			# CVSup
-cvsup		5999/udp
-x11		6000/tcp			# X Window System
-x11		6000/udp
-kftp-data	6620/tcp			# Kerberos V5 FTP Data
-kftp-data	6620/udp
-kftp		6621/tcp			# Kerberos V5 FTP Control
-kftp		6621/udp
-ktelnet		6623/tcp			# Kerberos V5 Telnet
-ktelnet		6623/udp
-gnutella-svc	6346/tcp
-gnutella-svc	6346/udp
-gnutella-rtr	6347/tcp
-gnutella-rtr	6347/udp
-sane-port	6566/tcp			# SANE Network Scanner Control Port
-sane-port	6566/udp
-parsec-game	6582/tcp			# Parsec Gameserver
-parsec-game	6582/udp
-afs3-fileserver 7000/tcp	bbs		# file server itself
-afs3-fileserver 7000/udp	bbs
-afs3-callback   7001/tcp			# callbacks to cache managers
-afs3-callback   7001/udp
-afs3-prserver   7002/tcp			# users & groups database
-afs3-prserver   7002/udp
-afs3-vlserver   7003/tcp			# volume location database
-afs3-vlserver   7003/udp
-afs3-kaserver   7004/tcp			# AFS/Kerberos authentication
-afs3-kaserver   7004/udp
-afs3-volser     7005/tcp			# volume managment server
-afs3-volser     7005/udp
-afs3-errors     7006/tcp			# error interpretation service
-afs3-errors     7006/udp
-afs3-bos        7007/tcp			# basic overseer process
-afs3-bos        7007/udp
-afs3-update     7008/tcp			# server-to-server updater
-afs3-update     7008/udp
-afs3-rmtsys     7009/tcp			# remote cache manager service
-afs3-rmtsys     7009/udp
-font-service	7100/tcp	xfs		# X Font Service
-font-service	7100/udp	xfs
-sncp		7560/tcp			# Sniffer Command Protocol
-sncp		7560/udp
-soap-http	7627/tcp			# SOAP Service Port
-soap-http	7627/udp
-http-alt	8008/tcp			# HTTP Alternate
-http-alt	8008/udp
-http-alt	8080/tcp	webcache	# HTTP Alternate
-http-alt	8080/udp	webcache	# WWW caching service
-sunproxyadmin	8081/tcp	tproxy		# Sun Proxy Admin Service
-sunproxyadmin	8081/udp	tproxy		# Transparent Proxy
-pichat		9009/tcp			# Pichat Server
-pichat		9009/udp
-bacula-dir	9101/tcp			# Bacula Director
-bacula-dir	9101/udp
-bacula-fd	9102/tcp			# Bacula File Daemon
-bacula-fd	9102/udp
-bacula-sd	9103/tcp			# Bacula Storage Daemon
-bacula-sd	9103/udp
-dddp		9131/tcp			# Dynamic Device Discovery
-dddp		9131/udp
-wap-wsp		9200/tcp			# WAP connectionless session service
-wap-wsp		9200/udp
-wap-wsp-wtp	9201/tcp			# WAP session service
-wap-wsp-wtp	9201/udp
-wap-wsp-s	9202/tcp			# WAP secure connectionless session service
-wap-wsp-s	9202/udp
-wap-wsp-wtp-s	9203/tcp			# WAP secure session service
-wap-wsp-wtp-s	9203/udp
-wap-vcard	9204/tcp			# WAP vCard
-wap-vcard	9204/udp
-wap-vcal	9205/tcp			# WAP vCal
-wap-vcal	9205/udp
-wap-vcard-s	9206/tcp			# WAP vCard Secure
-wap-vcard-s	9206/udp
-wap-vcal-s	9207/tcp			# WAP vCal Secure
-wap-vcal-s	9207/udp
-git		9418/tcp			# git pack transfer service
-git		9418/udp
-cba8		9593/tcp			# LANDesk Management Agent
-cba8		9593/udp
-davsrc		9800/tcp			# WebDav Source Port
-davsrc		9800/udp
-sqlexec		9088/tcp			# IBM Informix SQL Interface
-sqlexec		9088/udp
-sqlexec-ssl	9089/tcp			# IBM Informix SQL Interface - Encrypted
-sqlexec-ssl	9089/udp
-sd		9876/tcp			# Session Director
-sd		9876/udp
-cyborg-systems	9888/tcp			# CYBORG Systems
-cyborg-systems	9888/udp
-monkeycom	9898/tcp			# MonkeyCom
-monkeycom	9898/udp
-sctp-tunneling	9899/tcp			# SCTP TUNNELING
-sctp-tunneling	9899/udp
-domaintime	9909/tcp			# domaintime
-domaintime	9909/udp
-amanda		10080/tcp			# amanda backup services
-amanda		10080/udp
-vce		11111/tcp			# Viral Computing Environment (VCE)
-vce		11111/udp
-smsqp		11201/tcp			# Alamin SMS gateway
-smsqp		11201/udp
-hkp		11371/tcp			# OpenPGP HTTP Keyserver
-hkp		11371/udp
-h323callsigalt	11720/tcp			# h323 Call Signal Alternate
-h323callsigalt	11720/udp
-rets-ssl	12109/tcp			# RETS over SSL
-rets-ssl	12109/udp
-cawas		12168/tcp			# CA Web Access Service
-cawas		12168/udp
-bprd		13720/tcp			# BPRD Protocol (VERITAS NetBackup)
-bprd		13720/udp
-bpdbm		13721/tcp			# BPDBM Protocol (VERITAS NetBackup)
-bpdbm		13721/udp
-bpjava-msvc	13722/tcp			# BP Java MSVC Protocol
-bpjava-msvc	13722/udp
-vnetd		13724/tcp			# Veritas Network Utility
-vnetd		13724/udp
-bpcd		13782/tcp			# VERITAS NetBackup
-bpcd		13782/udp
-vopied		13783/tcp			# VOPIED Protocol
-vopied		13783/udp
-xpilot		15345/tcp			# XPilot Contact Port
-xpilot		15345/udp
-wnn6            22273/tcp			# wnn6
-wnn6            22273/udp
-binkp		24554/tcp			# Bink fidonet protocol
-binkp		24554/udp
-quake		26000/tcp			# Quake @!#
-quake		26000/udp
-wnn6-ds		26208/tcp
-wnn6-ds		26208/udp
-tetrinet	31457/tcp			# TetriNET Protocol
-tetrinet	31457/udp
-gamesmith-port	31765/tcp			# GameSmith Port
-gamesmith-port	31765/udp
-traceroute	33434/tcp			# traceroute use
-traceroute	33434/udp
-candp		42508/tcp			# Computer Associates network discovery protocol
-candp		42508/udp
-candrp		42509/tcp			# CA discovery response
-candrp		42509/udp
-caerpc		42510/tcp			# CA eTrust RPC
-caerpc		42510/udp
-
-#=========================================================================
-# The remaining port numbers are not as allocated by IANA.
-
-# Kerberos (Project Athena/MIT) services
-# Note that these are for Kerberos v4, and are unofficial
-kpop		1109/tcp			# Pop with Kerberos
-knetd		2053/tcp			# Kerberos de-multiplexor
-eklogin		2105/tcp			# Kerberos encrypted rlogin
-
-# CVSup support http://www.cvsup.org/
-supfilesrv	871/tcp				# SUP server
-supfiledbg	1127/tcp			# SUP debugging
-
-# Datagram Delivery Protocol services
-rtmp		1/ddp				# Routing Table Maintenance Protocol
-nbp		2/ddp				# Name Binding Protocol
-echo		4/ddp				# AppleTalk Echo Protocol
-zip		6/ddp				# Zone Information Protocol
-
-# Many services now accepted as 'standard'
-swat		901/tcp				# Samba configuration tool
-rndc		953/tcp				# rndc control sockets (BIND 9)
-rndc		953/udp
-skkserv		1178/tcp			# SKK Japanese input method
-xtel		1313/tcp			# french minitel
-support		1529/tcp			# GNATS
-cfinger		2003/tcp	lmtp		# GNU Finger
-ninstall	2150/tcp			# ninstall service
-ninstall	2150/udp
-afbackup	2988/tcp			# Afbackup system
-afbackup	2988/udp
-fax		4557/tcp			# FAX transmission service        (old)
-rplay		5555/tcp			# RPlay audio service
-rplay		5555/udp
-canna		5680/tcp			# Canna (Japanese Input)
-x11-ssh		6010/tcp	x11-ssh-offset
-x11-ssh		6010/udp	x11-ssh-offset
-ircd		6667/tcp			# Internet Relay Chat
-ircd		6667/udp
-jetdirect	9100/tcp			# HP JetDirect card
-jetdirect	9100/udp
-mandelspawn	9359/udp	mandelbrot	# network mandelbrot
-kamanda		10081/tcp			# amanda backup services (Kerberos)
-kamanda		10081/udp
-amandaidx	10082/tcp			# amanda backup services
-amidxtape	10083/tcp			# amanda backup services
-isdnlog		20011/tcp			# isdn logging system
-isdnlog		20011/udp
-vboxd		20012/tcp			# voice box system
-vboxd		20012/udp
-wnn4_Cn		22289/tcp	wnn6_Cn		# Wnn (Chinese input)
-wnn4_Kr		22305/tcp	wnn6_Kr		# Wnn (Korean input)
-wnn4_Tw		22321/tcp	wnn6_Tw		# Wnn (Taiwanse input)
-asp		27374/tcp			# Address Search Protocol
-asp		27374/udp
-tfido		60177/tcp			# Ifmail
-tfido		60177/udp
-fido		60179/tcp			# Ifmail
-fido		60179/udp
-
-# Local services
-
diff --git a/main/alpine-conf/0001-lbu-fix-wrong-cipher-match-in-check_openssl-for-lbu-.patch b/main/alpine-conf/0001-lbu-fix-wrong-cipher-match-in-check_openssl-for-lbu-.patch
deleted file mode 100644
index 7369c46d49a..00000000000
--- a/main/alpine-conf/0001-lbu-fix-wrong-cipher-match-in-check_openssl-for-lbu-.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ad9996810186cbed04ec0c185bd3c998622a0a4f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= <mps@arvanta.net>
-Date: Thu, 16 Jan 2020 11:09:28 +0100
-Subject: [PATCH] lbu: fix wrong cipher match in check_openssl for 'lbu commit
- -e'
-
-fixes #10451
----
- lbu.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lbu.in b/lbu.in
-index f439cf2..fb4fbe5 100644
---- a/lbu.in
-+++ b/lbu.in
-@@ -126,7 +126,7 @@ check_openssl() {
- 	[ -z "$ENCRYPTION" ] && return 0
- 	OPENSSL=$(which openssl 2>/dev/null) || die "openssl was not found"
- 
--	$OPENSSL enc -ciphers | grep "^$ENCRYPTION$" > /dev/null \
-+	$OPENSSL list -1 -cipher-commands | grep "^$ENCRYPTION$" > /dev/null \
- 		|| die "Cipher $ENCRYPTION is not supported"
- }
- 
--- 
-2.25.0
-
diff --git a/main/alpine-conf/0001-libalpine-make-vecho-and-qecho-return-success.patch b/main/alpine-conf/0001-libalpine-make-vecho-and-qecho-return-success.patch
deleted file mode 100644
index cbc91b2b8d5..00000000000
--- a/main/alpine-conf/0001-libalpine-make-vecho-and-qecho-return-success.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 5d90f33f62375f23367d3c5a7badd2d7f1031744 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 24 Jan 2020 11:49:04 +0000
-Subject: [PATCH] libalpine: make vecho and qecho return success
-
-vecho should return success even if $VERBOSE is empty. Similar, qecho
-should return success even if $QUIET is empty.
-
-fixes !4
----
- libalpine.sh.in | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/libalpine.sh.in b/libalpine.sh.in
-index d7b79fa..0f96b9f 100644
---- a/libalpine.sh.in
-+++ b/libalpine.sh.in
-@@ -26,12 +26,16 @@ echon () {
- 
- # echo if in verbose mode
- vecho() {
--	[ -n "$VERBOSE" ] && echo "$@"
-+	if [ -n "$VERBOSE" ]; then
-+		echo "$@"
-+	fi
- }
- 
- # echo unless quiet mode
- qecho() {
--	[ -z "$QUIET" ] && echo "$@"
-+	if [ -z "$QUIET" ]; then
-+		echo "$@"
-+	fi
- }
- 
- # echo to stderr
--- 
-2.25.0
-
diff --git a/main/alpine-conf/0001-libalpine-use-correct-exit-code-in-trap.patch b/main/alpine-conf/0001-libalpine-use-correct-exit-code-in-trap.patch
deleted file mode 100644
index 5426f620177..00000000000
--- a/main/alpine-conf/0001-libalpine-use-correct-exit-code-in-trap.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6bcb2c2b0860779dc44d8dd27259f9edc6c9e6e8 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 21 Nov 2019 16:29:52 +0100
-Subject: [PATCH] libalpine: use correct exit code in trap
-
-save exit state before cleaning up tempdir so we get the correct exit
-code.
-
-This fixes the problem where lbu exit with success on errors where disk
-is full or similar.
----
- libalpine.sh.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libalpine.sh.in b/libalpine.sh.in
-index f3857e2..d7b79fa 100644
---- a/libalpine.sh.in
-+++ b/libalpine.sh.in
-@@ -50,7 +50,7 @@ init_tmpdir() {
- 	local __tmpd="/tmp/$PROGRAM-${$}-$(date +%s)-$RANDOM"
- 	umask 077 || die "umask"
- 	mkdir -p "$__tmpd" || exit 1
--	trap "rm -fr \"$__tmpd\"; exit" 0
-+	trap "rc=\$?; rm -fr \"$__tmpd\"; exit \$rc" 0
- 	umask $omask
- 	eval "$1=\"$__tmpd\""
- }
--- 
-2.24.0
-
diff --git a/main/alpine-conf/0001-setup-apkrepos-use-cdn-as-default-answer.patch b/main/alpine-conf/0001-setup-apkrepos-use-cdn-as-default-answer.patch
deleted file mode 100644
index e37241230f5..00000000000
--- a/main/alpine-conf/0001-setup-apkrepos-use-cdn-as-default-answer.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5358f24b8ba5c359db504421d09fc16cf9e7f8cf Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 11 Dec 2019 18:01:26 +0000
-Subject: [PATCH] setup-apkrepos: use cdn as default answer
-
-use '1', which should be dl-cdn, as the default answer
----
- setup-apkrepos.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup-apkrepos.in b/setup-apkrepos.in
-index 81e768e..1b05978 100644
---- a/setup-apkrepos.in
-+++ b/setup-apkrepos.in
-@@ -175,7 +175,7 @@ if [ -r "$APKREPOS_PATH" ]; then
- fi
- 
- get_alpine_release
--default_answer=f
-+default_answer=1
- changed=false
- 
- if [ $# -gt 0 ]; then
--- 
-2.24.1
-
diff --git a/main/alpine-conf/0001-setup-disk-let-user-set-ROOT_SIZE.patch b/main/alpine-conf/0001-setup-disk-let-user-set-ROOT_SIZE.patch
deleted file mode 100644
index 49d42167a5c..00000000000
--- a/main/alpine-conf/0001-setup-disk-let-user-set-ROOT_SIZE.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 93ce697c0075aeb51db9b78c0d47e10213aa1885 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 6 Dec 2019 15:53:45 +0000
-Subject: [PATCH] setup-disk: let user set ROOT_SIZE
-
-allow user set rootfs size via ROOT_SIZE. For lvm it will be passed
-directly to lvmcreate. For the sfdisk partitions it will be a number in
-MiB.
----
- setup-disk.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup-disk.in b/setup-disk.in
-index 5eb8638..b309919 100644
---- a/setup-disk.in
-+++ b/setup-disk.in
-@@ -989,7 +989,7 @@ native_disk_install_lvm() {
- 
- 	setup_lvm_volume_group $vgname $@ || return 1
- 	setup_lvm_swap $vgname
--	lvcreate --quiet -n ${root_dev##*/} -l 100%FREE $vgname
-+	lvcreate --quiet -n ${root_dev##*/} -l ${ROOT_SIZE:-100%FREE} $vgname
- 	rc-update add lvm boot
- 	setup_root $root_dev $BOOT_DEV
- }
-@@ -1002,7 +1002,7 @@ native_disk_install() {
- 	local prep_size=8
- 	local boot_size=${BOOT_SIZE:-100}
- 	local swap_size=${SWAP_SIZE}
--	local root_size=
-+	local root_size=${ROOT_SIZE}
- 	local root_dev= boot_dev= swap_dev=
- 	init_progs $(select_bootloader) || return 1
- 	confirm_erase $@ || return 1
--- 
-2.24.0
-
diff --git a/main/alpine-conf/0001-update-kernel-fix-dtbs-dir.patch b/main/alpine-conf/0001-update-kernel-fix-dtbs-dir.patch
deleted file mode 100644
index a117698c5f5..00000000000
--- a/main/alpine-conf/0001-update-kernel-fix-dtbs-dir.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3fd2ce439dda613a56e3d130c192040a88817787 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 18 Dec 2019 15:23:10 +0000
-Subject: [PATCH] update-kernel: fix dtbs dir
-
----
- update-kernel.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/update-kernel.in b/update-kernel.in
-index 0079182..3d13d25 100644
---- a/update-kernel.in
-+++ b/update-kernel.in
-@@ -264,7 +264,7 @@ fi
- KVER_FLAVOR=
- [ "$FLAVOR" = vanilla ] || KVER_FLAVOR=-$FLAVOR
- KVER=$(basename $(ls -d $ROOT/lib/modules/*"$KVER_FLAVOR"))
--DTBDIR=$ROOT/usr/lib/linux-$KVER
-+DTBDIR=$ROOT/boot/dtbs-$FLAVOR
- depmod -b $ROOT "$KVER"
- 
- 
-@@ -341,8 +341,8 @@ if [ -d "$DTBDIR" ]; then
- 	_opwd=$PWD
- 	case "$MEDIA,$FLAVOR" in
- 	yes,rpi*) _dtb="$DESTDIR/" ;;
--	yes,*)    _dtb="$DESTDIR/boot/dtbs" ;;
--	*,*)      _dtb="$DESTDIR/dtbs" ;;
-+	yes,*)    _dtb="$DESTDIR/boot/dtbs-$FLAVOR" ;;
-+	*,*)      _dtb="$DESTDIR/dtbs/dtbs-$FLAVOR" ;;
- 	esac
- 	mkdir -p "$_dtb"
- 	_dtb=$(realpath "$_dtb")
--- 
-2.24.1
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index a448947c098..cf36c5d62e3 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,39 +1,33 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
-pkgver=3.8.3
-pkgrel=6
+pkgver=3.17.2
+pkgrel=0
 pkgdesc="Alpine configuration management scripts"
 url="https://git.alpinelinux.org/alpine-conf/about"
 arch="all"
 license="MIT"
 depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3"
-source="https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
-	0001-libalpine-use-correct-exit-code-in-trap.patch
-	0001-setup-disk-let-user-set-ROOT_SIZE.patch
-	0001-setup-apkrepos-use-cdn-as-default-answer.patch
-	0001-update-kernel-fix-dtbs-dir.patch
-	0001-lbu-fix-wrong-cipher-match-in-check_openssl-for-lbu-.patch
-	0001-libalpine-make-vecho-and-qecho-return-success.patch
+checkdepends="kyua"
+source="https://gitlab.alpinelinux.org/alpine/alpine-conf/-/archive/$pkgver/alpine-conf-$pkgver.tar.gz
+	setup-disk-add-loongarch64-support.patch
 	"
 
-builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$builddir"
 	make VERSION=$pkgver-r$pkgrel
 }
 
 package() {
-	cd "$builddir"
 	make install PREFIX= DESTDIR="$pkgdir"
 	for i in commit exclude include status update; do
 		ln -s lbu "$pkgdir"/sbin/lbu_$i
 	done
 }
 
-sha512sums="73bd999b552d266c994cc1535570b86ddd7a7379f3b9e244c4985722f5754b11323a4e677cdae91fa4f0098dadd388eba679a99d98e140354ab7681bb85f9dfa  alpine-conf-3.8.3.tar.xz
-b5a4ed4e1507a6dde503edca5bc71c9f26e81e3f85dd01aa3705b300d7e9b9f48b7005250dea3105bef89a688bbf70257290e921d49534f6e6dd8848bb5b2fdb  0001-libalpine-use-correct-exit-code-in-trap.patch
-bf59558e5477929a0692c9ba182b71f7913533b50abd53303be6c47897348c53ec587c27a20442c180564c552f84d90d3c7d700b5f6e2cb4bb0a6ac1a7dafd1d  0001-setup-disk-let-user-set-ROOT_SIZE.patch
-a11e69e18da2c86cb5a419b2fc9db144b7fef4676fb4cd7c33bfe6dbf638adb872f7dd43b5c86fba916e94bdcd2d3c352931c579ea3e3333736c1fc3e5cd22fa  0001-setup-apkrepos-use-cdn-as-default-answer.patch
-e6d7ef82f2c875866dba6c8d18c6b8d9909c0a56081252ff1a1b0bfba2a493a3550377e20fa2975e5b6aa4e52f2607730b7ed158dd419751fad2368d9fa0ece5  0001-update-kernel-fix-dtbs-dir.patch
-d2f961761f237240bb046d9a56c07927d2011b5b62c9d84542d45ac144a09aa08e186efe759d66929a2796e416442db8a339e4bdf9e88643c2bf15f4125fe280  0001-lbu-fix-wrong-cipher-match-in-check_openssl-for-lbu-.patch
-8f99efff4f6e3a77b10e4a806ea6cf1ebc81577773314af7d2d8e36b646856a2e5786afbd92841a84af07830e42c7a336c221b1ea97a004963d189767cd348f0  0001-libalpine-make-vecho-and-qecho-return-success.patch"
+check() {
+	make check
+}
+
+sha512sums="
+4459ba5004a9c4272e606af9f4c21119d3c8ab8f55543c79a7b3469f0574232cf286cbb5887f338f1371d013236522f630bdf3f096c62fb886ce226d4065f386  alpine-conf-3.17.2.tar.gz
+c8b2ff058e65e774de5254ee5f0b62360bf83e746790190c73f55cedcaf568f431902768d147310b4d6b1f1d80b87849cf09790384a38b650f6f889a36c8a6c1  setup-disk-add-loongarch64-support.patch
+"
diff --git a/main/alpine-conf/setup-disk-add-loongarch64-support.patch b/main/alpine-conf/setup-disk-add-loongarch64-support.patch
new file mode 100644
index 00000000000..a9f8120aeae
--- /dev/null
+++ b/main/alpine-conf/setup-disk-add-loongarch64-support.patch
@@ -0,0 +1,24 @@
+From 1512b22ae7cbd99f5f77a027fbd2b6acb3ec1615 Mon Sep 17 00:00:00 2001
+From: Jingyun Hua <huajingyun@loongson.cn>
+Date: Mon, 18 Mar 2024 10:48:17 +0800
+Subject: [PATCH] setup-disk: add loongarch64 support
+
+---
+ setup-disk.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup-disk.in b/setup-disk.in
+index 56f5152..7f01bfb 100755
+--- a/setup-disk.in
++++ b/setup-disk.in
+@@ -322,6 +322,7 @@ setup_grub() {
+ 			arm*)		target=arm-efi ; fwa=arm ;;
+ 			aarch64)	target=arm64-efi ; fwa=aa64 ;;
+ 			riscv64)	target=riscv64-efi ; fwa=riscv64 ;;
++			loongarch64)	target=loongarch64-efi ; fwa=loongarch64 ;;
+ 		esac
+ 
+ 		# currently disabling nvram so grub doesnt call efibootmgr
+-- 
+2.27.0
+
diff --git a/main/alpine-git-mirror-syncd/APKBUILD b/main/alpine-git-mirror-syncd/APKBUILD
index d465f2e7006..cc0325f4fd6 100644
--- a/main/alpine-git-mirror-syncd/APKBUILD
+++ b/main/alpine-git-mirror-syncd/APKBUILD
@@ -3,14 +3,14 @@
 pkgname=alpine-git-mirror-syncd
 _shortname=git-mirror-syncd
 pkgver=0.3.1
-pkgrel=0
+pkgrel=2
 pkgdesc="Lua script that listens on MQTT and synchronizes Git mirrors when notified about changes"
 url="https://github.com/jirutka/alpine-git-mirror-syncd"
 arch="noarch"
 license="MIT"
 depends="ca-certificates git lua5.1 lua5.1-cjson lua5.1-mosquitto"
-source="https://github.com/jirutka/$pkgname/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+subpackages="$pkgname-openrc"
+source="https://github.com/jirutka/alpine-git-mirror-syncd/archive/v$pkgver/alpine-git-mirror-syncd-$pkgver.tar.gz"
 options="!check"  # upstream does not provide any tests yet
 
 prepare() {
@@ -20,8 +20,6 @@ prepare() {
 }
 
 package() {
-	cd "$builddir"
-
 	install -D -m 755 $_shortname.lua "$pkgdir"/usr/bin/$_shortname
 	install -D -m 644 config.lua.example "$pkgdir"/etc/$_shortname/config.lua
 	install -D -m 755 etc/init.d/$_shortname "$pkgdir"/etc/init.d/$_shortname
diff --git a/main/alpine-ipxe/APKBUILD b/main/alpine-ipxe/APKBUILD
index 2f9c0bfcc8d..879730524d0 100644
--- a/main/alpine-ipxe/APKBUILD
+++ b/main/alpine-ipxe/APKBUILD
@@ -2,17 +2,16 @@
 # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=alpine-ipxe
 pkgver=1.20.1
-pkgrel=0
+pkgrel=1
 pkgdesc="iPXE build for Alpine Linux netboot"
 url="https://boot.alpinelinux.org"
-arch="x86 x86_64 aarch64"
+arch="x86 aarch64"
 license="GPL-2.0-or-later"
-depends=""
 makedepends="xz-dev perl coreutils bash syslinux xorriso"
 options="!strip !check !archcheck !tracedeps" # no tests
-install=""
-subpackages=""
 source="ipxe-$pkgver.tar.gz::https://github.com/ipxe/ipxe/archive/v$pkgver.tar.gz
+	gcc-10.patch
+	gcc-11.patch
 	DST_Root_CA_X3.pem
 	alpine-netboot-ca.crt
 	boot.ipxe
@@ -41,7 +40,6 @@ done
 prepare() {
 	default_prepare
 
-	cd "$builddir"
 	local general="DIGEST_CMD NET_PROTO_IPV6 DOWNLOAD_PROTO_HTTPS IMAGE_TRUST_CMD
 		NSLOOKUP_CMD PING_CMD REBOOT_CMD NTP_CMD PCI_CMD TIME_CMD VLAN_CMD"
 	mkdir -p config/local
@@ -53,11 +51,12 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	# DST_Root_CA_X3.pem is need for https (letsencrypt)
 	make EMBED="$srcdir/boot.ipxe" \
 		CERT="$srcdir"/alpine-netboot-ca.crt,"$srcdir"/DST_Root_CA_X3.pem \
 		TRUST="$srcdir"/alpine-netboot-ca.crt,"$srcdir"/DST_Root_CA_X3.pem \
+		EXTRA_CFLAGS="-fcommon" \
+		NO_WERROR=1 \
 		$_targets
 }
 
@@ -78,7 +77,11 @@ _split() {
 		"$subpkgdir"/usr/share/$pkgname
 }
 
-sha512sums="39142187c7b84e81ed95865b2c6ca6624fd10ee49350741bcf4beff47cd4ebdce91eca9d7b4d3d91e45b96bd50fa554fa6b71e8e3ea6bcc474b0a71f5d35e5cd  ipxe-1.20.1.tar.gz
+sha512sums="
+39142187c7b84e81ed95865b2c6ca6624fd10ee49350741bcf4beff47cd4ebdce91eca9d7b4d3d91e45b96bd50fa554fa6b71e8e3ea6bcc474b0a71f5d35e5cd  ipxe-1.20.1.tar.gz
+99d6dfbfe3a1a5c3792246c18976d7aab708301a4a1163978a22ae2c3052ca59c10fa5a418d131b783f2c230d78c05aad8f295e87cf82e48479dfb345d8793be  gcc-10.patch
+83469bf56d9bd344eb686dbd1cae85c731794c506ac7bbaecdd00d15f7a2497f512ef1364ecccf0f58099d6c4b9ed86eb8614fa0373c262f7a8b5a5bd3460d5a  gcc-11.patch
 1f52b62aa9e3ec0656ea3cb5c8e52eda924d58728e64bb03ca6c112858b91b13cf0a9328b105bb232973e240406b240ed14e72b5bd325e82e6fddf3126dbcc58  DST_Root_CA_X3.pem
 68030e3f30983ee45c7f740445a246ea0df225becdd0644e06ffdbd84682ac576934dab79fecceb31b70929d81ce85b40301a977862bf7beb042270be21e6d34  alpine-netboot-ca.crt
-5a4f1edd0178e696e919e93b90689091f669bffe77ebb9da10d4872d208205fe42b285551f541a07b2067054a2344639052e2b297a582a1f71d907797a77d719  boot.ipxe"
+5a4f1edd0178e696e919e93b90689091f669bffe77ebb9da10d4872d208205fe42b285551f541a07b2067054a2344639052e2b297a582a1f71d907797a77d719  boot.ipxe
+"
diff --git a/main/alpine-ipxe/gcc-10.patch b/main/alpine-ipxe/gcc-10.patch
new file mode 100644
index 00000000000..0462db67312
--- /dev/null
+++ b/main/alpine-ipxe/gcc-10.patch
@@ -0,0 +1,40 @@
+From 8a1d66c7aec020f3e90254ed2fa55ecd9494fcc3 Mon Sep 17 00:00:00 2001
+From: Michael Brown <mcb30@ipxe.org>
+Date: Sat, 27 Jun 2020 20:43:32 +0100
+Subject: [PATCH] [golan] Add explicit type casts for nodnic_queue_pair_type
+
+GCC 10 emits warnings for implicit conversions of enumerated types.
+
+The flexboot_nodnic code defines nodnic_queue_pair_type with values
+identical to those of ib_queue_pair_type, and implicitly casts between
+them.  Add an explicit cast to fix the warning.
+
+Signed-off-by: Michael Brown <mcb30@ipxe.org>
+---
+ drivers/infiniband/flexboot_nodnic.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/drivers/infiniband/flexboot_nodnic.c b/src/drivers/infiniband/flexboot_nodnic.c
+index 93bb05446..7d039fffc 100644
+--- a/drivers/infiniband/flexboot_nodnic.c
++++ b/drivers/infiniband/flexboot_nodnic.c
+@@ -365,7 +365,8 @@ static int flexboot_nodnic_create_qp ( struct ib_device *ibdev,
+ 		goto qp_alloc_err;
+ 	}
+ 
+-	status = nodnic_port_create_qp(&port->port_priv, qp->type,
++	status = nodnic_port_create_qp(&port->port_priv,
++			(nodnic_queue_pair_type) qp->type,
+ 			qp->send.num_wqes * sizeof(struct nodnic_send_wqbb),
+ 			qp->send.num_wqes,
+ 			qp->recv.num_wqes * sizeof(struct nodnic_recv_wqe),
+@@ -406,7 +407,8 @@ static void flexboot_nodnic_destroy_qp ( struct ib_device *ibdev,
+ 	struct flexboot_nodnic_port *port = &flexboot_nodnic->port[ibdev->port - 1];
+ 	struct flexboot_nodnic_queue_pair *flexboot_nodnic_qp = ib_qp_get_drvdata ( qp );
+ 
+-	nodnic_port_destroy_qp(&port->port_priv, qp->type,
++	nodnic_port_destroy_qp(&port->port_priv,
++			(nodnic_queue_pair_type) qp->type,
+ 			flexboot_nodnic_qp->nodnic_queue_pair);
+ 
+ 	free(flexboot_nodnic_qp);
diff --git a/main/alpine-ipxe/gcc-11.patch b/main/alpine-ipxe/gcc-11.patch
new file mode 100644
index 00000000000..a793cdb18e2
--- /dev/null
+++ b/main/alpine-ipxe/gcc-11.patch
@@ -0,0 +1,23 @@
+fixes maybe-used-uninitialised errors
+--- a/tests/bigint_test.c
++++ b/tests/bigint_test.c
+@@ -210,7 +210,7 @@
+ 	static const uint8_t addend_raw[] = addend;			\
+ 	static const uint8_t value_raw[] = value;			\
+ 	static const uint8_t expected_raw[] = expected;			\
+-	uint8_t result_raw[ sizeof ( expected_raw ) ];			\
++	uint8_t result_raw[ sizeof ( expected_raw ) ] = {0};		\
+ 	unsigned int size =						\
+ 		bigint_required_size ( sizeof ( value_raw ) );		\
+ 	bigint_t ( size ) addend_temp;					\
+--- a/drivers/net/ath/ath5k/ath5k_eeprom.c
++++ b/drivers/net/ath/ath5k/ath5k_eeprom.c
+@@ -410,7 +410,7 @@
+ {
+ 	struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
+ 	u32 o = *offset;
+-	u16 val;
++	u16 val = 0;
+ 	int ret;
+ 
+ 	if (ee->ee_version < AR5K_EEPROM_VERSION_5_0)
diff --git a/main/alpine-keys/APKBUILD b/main/alpine-keys/APKBUILD
index 1ca5e93b6fe..ecb2c7ffb1d 100644
--- a/main/alpine-keys/APKBUILD
+++ b/main/alpine-keys/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-keys
-pkgver=2.2
-pkgrel=0
+pkgver=2.4
+pkgrel=1
 pkgdesc="Public keys for Alpine Linux packages"
 url="https://alpinelinux.org"
 # we install arch specific keys to /etc so we cannot do arch=noarch
@@ -12,17 +12,27 @@ options="!check" # No testsuite
 
 _arch_keys="
 	aarch64:alpine-devel@lists.alpinelinux.org-58199dcc.rsa.pub
-	armhf:alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub
+	aarch64:alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
+	armhf,armv7:alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub
+	armv7:alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
+	armhf:alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub
 
 	x86:alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
+	x86:alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub
 	x86,x86_64:alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
 	x86_64:alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
+	x86_64:alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub
 
 	ppc64le:alpine-devel@lists.alpinelinux.org-58cbb476.rsa.pub
+	ppc64le:alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub
 
 	s390x:alpine-devel@lists.alpinelinux.org-58e4f17d.rsa.pub
+	s390x:alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub
 
 	mips64:alpine-devel@lists.alpinelinux.org-5e69ca50.rsa.pub
+
+	riscv64:alpine-devel@lists.alpinelinux.org-60ac2099.rsa.pub
+	riscv64:alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub
 	"
 
 for _i in $_arch_keys; do
@@ -64,6 +74,12 @@ _install_mips() {
 	esac
 }
 
+_install_riscv() {
+	case "$1" in
+	riscv*) _ins_key $1 $2 ;;
+	esac
+}
+
 package() {
 	# copy keys for repos
 	mkdir -p "$pkgdir"/etc/apk/keys
@@ -83,16 +99,28 @@ package() {
 			ppc*) _install_ppc $_arch $_key ;;
 			s390x) _install_s390x $_arch $_key ;;
 			mips*) _install_mips $_arch $_key ;;
+			riscv*) _install_riscv $_arch $_key ;;
 			esac
 		done
 	done
 }
 
-sha512sums="e4f9e314f8e506fba2cb3e599c6412a036ec37ce3a54990fc7d80a821d8728f40ee3b4aa8a15218d50341fa785d9ddf7c7471f45018c6a2065ab13664a1aa9e9  alpine-devel@lists.alpinelinux.org-58199dcc.rsa.pub
+sha512sums="
+e4f9e314f8e506fba2cb3e599c6412a036ec37ce3a54990fc7d80a821d8728f40ee3b4aa8a15218d50341fa785d9ddf7c7471f45018c6a2065ab13664a1aa9e9  alpine-devel@lists.alpinelinux.org-58199dcc.rsa.pub
+51a5ec21283fe218809b2325202e1f8c9b2551705db48254b9d48a04f4ed0075de51e9886c4704647ffb309fd32d9850d14013848a53038039e85011251fe1cc  alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
 698fda502f70365a852de3c10636eadfc4f70a7a00f096581119aef665e248b787004ceef63f4c8cb18c6f88d18b8b1bd6b3c5d260e79e6d73a3cc09537b196e  alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub
+a98095a626f2dcbda73ffd8873ba2d609ee1d881f5da13b0eb3469ddd58b06440b4b0b2f791b037c88073e9a17c6dfc62dc1a4c8491bed871524d772ef04ad24  alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
+7aa5526a88519ae91f997bf914a9bd3d230b21c011587f155ce22c4bb94b70181b28590027eb555d96d1122dffb8242c1fb044228e99b4e9b7650fcf6f5121c7  alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub
 e18e65ee911eb1f8ea869f758e8f2c94cf2ac254ee7ab90a3de1d47b94a547c2066214abf710da21910ebedc0153d05fd4fe579cc5ce24f46e0cfd29a02b1a68  alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
+b89d825e6af73687339848817791b294e2404162e2e069d9212d76d4ee53d6216eb75421a07b02f9778ef57dbb27962b2436247264eea1a1d882967ca0c18724  alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub
 2d4064cbe09ff958493ec86bcb925af9b7517825d1d9d8d00f2986201ad5952f986fea83d1e2c177e92130700bafa8c0bff61411b3cdb59a41e460ed719580a6  alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
 721134f289ab1e7dde9158359906017daee40983199fe55f28206c8cdc46b8fcf177a36f270ce374b0eba5dbe01f68cbb3e385ae78a54bb0a2ed1e83a4d820a5  alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
+8b9c2208c904c9f34d9d01d3d68b224208530e684265df214deb8c9e6b4b19633aa48a405e673249c9e93a8ee194a336e951cd82a4e27e5e66e85fdc5e0d495e  alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub
 bb5a3df8fac14a62d5936fb3722873fa6a121219b703cba955eb77de38c4384aeaf378fb9321a655e255f0be761e894e309b3789867279c1524dab6300cd8ef1  alpine-devel@lists.alpinelinux.org-58cbb476.rsa.pub
+bad4da65221150a5d4cc6f63981e4dd203d40844d32e82c17f346eee5350e460e32d28f0e231a2b78d326ec32b898eec597d3787dae47dcacc9a9776d19fb4a1  alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub
 0666389ca53121453578cd4bef5fd06e159e291164b3e3233e7d6521604f8bebd30caeef1663adcd5309e07278833402c8a92c33294ec0c5cada24dc47c8cc98  alpine-devel@lists.alpinelinux.org-58e4f17d.rsa.pub
-66ce9677e9c2a7961d5d7bc5b162ed3114a7aef6d01181073c1f42a9934966eecded2ec09deb210f5a389d434d1641ba35fe3abdd5246b2e97d5a5b26a945c5c  alpine-devel@lists.alpinelinux.org-5e69ca50.rsa.pub"
+83fc29066f6073418ecf01176ce24c1c0e788508f3083a97691706e2c78323e53448060fb0d2abb8118a759570f1f0db9d39953c63fe26fe06da2be05dff393c  alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub
+66ce9677e9c2a7961d5d7bc5b162ed3114a7aef6d01181073c1f42a9934966eecded2ec09deb210f5a389d434d1641ba35fe3abdd5246b2e97d5a5b26a945c5c  alpine-devel@lists.alpinelinux.org-5e69ca50.rsa.pub
+34514100e502f449dcabe0aa550232c3330ed2f0b789b977eb228d4ac86afc93479474ac005914992a3b47c18ee3eb32ca27ccd0d392700a8f11f47d64a78969  alpine-devel@lists.alpinelinux.org-60ac2099.rsa.pub
+7cea57204a50d72bddff201c509ccbf06773d87062a3ead0a206cc6e4a00e0960f52d21f7cee7aaec6a4abba7a697e2e2e7f630fa1ccef7ee2c33908fca18998  alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub
+"
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-60ac2099.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-60ac2099.rsa.pub
new file mode 100644
index 00000000000..2b8a4a93e06
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-60ac2099.rsa.pub
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwR4uJVtJOnOFGchnMW5Y
+j5/waBdG1u5BTMlH+iQMcV5+VgWhmpZHJCBz3ocD+0IGk2I68S5TDOHec/GSC0lv
+6R9o6F7h429GmgPgVKQsc8mPTPtbjJMuLLs4xKc+viCplXc0Nc0ZoHmCH4da6fCV
+tdpHQjVe6F9zjdquZ4RjV6R6JTiN9v924dGMAkbW/xXmamtz51FzondKC52Gh8Mo
+/oA0/T0KsCMCi7tb4QNQUYrf+Xcha9uus4ww1kWNZyfXJB87a2kORLiWMfs2IBBJ
+TmZ2Fnk0JnHDb8Oknxd9PvJPT0mvyT8DA+KIAPqNvOjUXP4bnjEHJcoCP9S5HkGC
+IQIDAQAB
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub
new file mode 100644
index 00000000000..f2165aebada
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAutQkua2CAig4VFSJ7v54
+ALyu/J1WB3oni7qwCZD3veURw7HxpNAj9hR+S5N/pNeZgubQvJWyaPuQDm7PTs1+
+tFGiYNfAsiibX6Rv0wci3M+z2XEVAeR9Vzg6v4qoofDyoTbovn2LztaNEjTkB+oK
+tlvpNhg1zhou0jDVYFniEXvzjckxswHVb8cT0OMTKHALyLPrPOJzVtM9C1ew2Nnc
+3848xLiApMu3NBk0JqfcS3Bo5Y2b1FRVBvdt+2gFoKZix1MnZdAEZ8xQzL/a0YS5
+Hd0wj5+EEKHfOd3A75uPa/WQmA+o0cBFfrzm69QDcSJSwGpzWrD1ScH3AK8nWvoj
+v7e9gukK/9yl1b4fQQ00vttwJPSgm9EnfPHLAtgXkRloI27H6/PuLoNvSAMQwuCD
+hQRlyGLPBETKkHeodfLoULjhDi1K2gKJTMhtbnUcAA7nEphkMhPWkBpgFdrH+5z4
+Lxy+3ek0cqcI7K68EtrffU8jtUj9LFTUC8dERaIBs7NgQ/LfDbDfGh9g6qVj1hZl
+k9aaIPTm/xsi8v3u+0qaq7KzIBc9s59JOoA8TlpOaYdVgSQhHHLBaahOuAigH+VI
+isbC9vmqsThF2QdDtQt37keuqoda2E6sL7PUvIyVXDRfwX7uMDjlzTxHTymvq2Ck
+htBqojBnThmjJQFgZXocHG8CAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub
new file mode 100644
index 00000000000..aa63d81d662
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlEyxkHggKCXC2Wf5Mzx4
+nZLFZvU2bgcA3exfNPO/g1YunKfQY+Jg4fr6tJUUTZ3XZUrhmLNWvpvSwDS19ZmC
+IXOu0+V94aNgnhMsk9rr59I8qcbsQGIBoHzuAl8NzZCgdbEXkiY90w1skUw8J57z
+qCsMBydAueMXuWqF5nGtYbi5vHwK42PffpiZ7G5Kjwn8nYMW5IZdL6ZnMEVJUWC9
+I4waeKg0yskczYDmZUEAtrn3laX9677ToCpiKrvmZYjlGl0BaGp3cxggP2xaDbUq
+qfFxWNgvUAb3pXD09JM6Mt6HSIJaFc9vQbrKB9KT515y763j5CC2KUsilszKi3mB
+HYe5PoebdjS7D1Oh+tRqfegU2IImzSwW3iwA7PJvefFuc/kNIijfS/gH/cAqAK6z
+bhdOtE/zc7TtqW2Wn5Y03jIZdtm12CxSxwgtCF1NPyEWyIxAQUX9ACb3M0FAZ61n
+fpPrvwTaIIxxZ01L3IzPLpbc44x/DhJIEU+iDt6IMTrHOphD9MCG4631eIdB0H1b
+6zbNX1CXTsafqHRFV9XmYYIeOMggmd90s3xIbEujA6HKNP/gwzO6CDJ+nHFDEqoF
+SkxRdTkEqjTjVKieURW7Swv7zpfu5PrsrrkyGnsRrBJJzXlm2FOOxnbI2iSL1B5F
+rO5kbUxFeZUIDq+7Yv4kLWcCAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub
new file mode 100644
index 00000000000..59c330e9f73
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnC+bR4bHf/L6QdU4puhQ
+gl1MHePszRC38bzvVFDUJsmCaMCL2suCs2A2yxAgGb9pu9AJYLAmxQC4mM3jNqhg
+/E7yuaBbek3O02zN/ctvflJ250wZCy+z0ZGIp1ak6pu1j14IwHokl9j36zNfGtfv
+ADVOcdpWITFFlPqwq1qt/H3UsKVmtiF3BNWWTeUEQwKvlU8ymxgS99yn0+4OPyNT
+L3EUeS+NQJtDS01unau0t7LnjUXn+XIneWny8bIYOQCuVR6s/gpIGuhBaUqwaJOw
+7jkJZYF2Ij7uPb4b5/R3vX2FfxxqEHqssFSg8FFUNTZz3qNZs0CRVyfA972g9WkJ
+hPfn31pQYil4QGRibCMIeU27YAEjXoqfJKEPh4UWMQsQLrEfdGfb8VgwrPbniGfU
+L3jKJR3VAafL9330iawzVQDlIlwGl6u77gEXMl9K0pfazunYhAp+BMP+9ot5ckK+
+osmrqj11qMESsAj083GeFdfV3pXEIwUytaB0AKEht9DbqUfiE/oeZ/LAXgySMtVC
+sbC4ESmgVeY2xSBIJdDyUap7FR49GGrw0W49NUv9gRgQtGGaNVQQO9oGL2PBC41P
+iWF9GLoX30HIz1P8PF/cZvicSSPkQf2Z6TV+t0ebdGNS5DjapdnCrq8m9Z0pyKsQ
+uxAL2a7zX8l5i1CZh1ycUGsCAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub
new file mode 100644
index 00000000000..915bc566b74
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0MfCDrhODRCIxR9Dep1s
+eXafh5CE5BrF4WbCgCsevyPIdvTeyIaW4vmO3bbG4VzhogDZju+R3IQYFuhoXP5v
+Y+zYJGnwrgz3r5wYAvPnLEs1+dtDKYOgJXQj+wLJBW1mzRDL8FoRXOe5iRmn1EFS
+wZ1DoUvyu7/J5r0itKicZp3QKED6YoilXed+1vnS4Sk0mzN4smuMR9eO1mMCqNp9
+9KTfRDHTbakIHwasECCXCp50uXdoW6ig/xUAFanpm9LtK6jctNDbXDhQmgvAaLXZ
+LvFqoaYJ/CvWkyYCgL6qxvMvVmPoRv7OPcyni4xR/WgWa0MSaEWjgPx3+yj9fiMA
+1S02pFWFDOr5OUF/O4YhFJvUCOtVsUPPfA/Lj6faL0h5QI9mQhy5Zb9TTaS9jB6p
+Lw7u0dJlrjFedk8KTJdFCcaGYHP6kNPnOxMylcB/5WcztXZVQD5WpCicGNBxCGMm
+W64SgrV7M07gQfL/32QLsdqPUf0i8hoVD8wfQ3EpbQzv6Fk1Cn90bZqZafg8XWGY
+wddhkXk7egrr23Djv37V2okjzdqoyLBYBxMz63qQzFoAVv5VoY2NDTbXYUYytOvG
+GJ1afYDRVWrExCech1mX5ZVUB1br6WM+psFLJFoBFl6mDmiYt0vMYBddKISsvwLl
+IJQkzDwtXzT2cSjoj3T5QekCAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub
new file mode 100644
index 00000000000..1e49d246902
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvaaoSLab+IluixwKV5Od
+0gib2YurjPatGIbn5Ov2DLUFYiebj2oJINXJSwUOO+4WcuHFEqiL/1rya+k5hLZt
+hnPL1tn6QD4rESznvGSasRCQNT2vS/oyZbTYJRyAtFkEYLlq0t3S3xBxxHWuvIf0
+qVxVNYpQWyM3N9RIeYBR/euXKJXileSHk/uq1I5wTC0XBIHWcthczGN0m9wBEiWS
+0m3cnPk4q0Ea8mUJ91Rqob19qETz6VbSPYYpZk3qOycjKosuwcuzoMpwU8KRiMFd
+5LHtX0Hx85ghGsWDVtS0c0+aJa4lOMGvJCAOvDfqvODv7gKlCXUpgumGpLdTmaZ8
+1RwqspAe3IqBcdKTqRD4m2mSg23nVx2FAY3cjFvZQtfooT7q1ItRV5RgH6FhQSl7
++6YIMJ1Bf8AAlLdRLpg+doOUGcEn+pkDiHFgI8ylH1LKyFKw+eXaAml/7DaWZk1d
+dqggwhXOhc/UUZFQuQQ8A8zpA13PcbC05XxN2hyP93tCEtyynMLVPtrRwDnHxFKa
+qKzs3rMDXPSXRn3ZZTdKH3069ApkEjQdpcwUh+EmJ1Ve/5cdtzT6kKWCjKBFZP/s
+91MlRrX2BTRdHaU5QJkUheUtakwxuHrdah2F94lRmsnQlpPr2YseJu6sIE+Dnx4M
+CfhdVbQL2w54R645nlnohu8CAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
new file mode 100644
index 00000000000..bb15efe96d7
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq0BFD1D4lIxQcsqEpQzU
+pNCYM3aP1V/fxxVdT4DWvSI53JHTwHQamKdMWtEXetWVbP5zSROniYKFXd/xrD9X
+0jiGHey3lEtylXRIPxe5s+wXoCmNLcJVnvTcDtwx/ne2NLHxp76lyc25At+6RgE6
+ADjLVuoD7M4IFDkAsd8UQ8zM0Dww9SylIk/wgV3ZkifecvgUQRagrNUdUjR56EBZ
+raQrev4hhzOgwelT0kXCu3snbUuNY/lU53CoTzfBJ5UfEJ5pMw1ij6X0r5S9IVsy
+KLWH1hiO0NzU2c8ViUYCly4Fe9xMTFc6u2dy/dxf6FwERfGzETQxqZvSfrRX+GLj
+/QZAXiPg5178hT/m0Y3z5IGenIC/80Z9NCi+byF1WuJlzKjDcF/TU72zk0+PNM/H
+Kuppf3JT4DyjiVzNC5YoWJT2QRMS9KLP5iKCSThwVceEEg5HfhQBRT9M6KIcFLSs
+mFjx9kNEEmc1E8hl5IR3+3Ry8G5/bTIIruz14jgeY9u5jhL8Vyyvo41jgt9sLHR1
+/J1TxKfkgksYev7PoX6/ZzJ1ksWKZY5NFoDXTNYUgzFUTOoEaOg3BAQKadb3Qbbq
+XIrxmPBdgrn9QI7NCgfnAY3Tb4EEjs3ON/BNyEhUENcXOH6I1NbcuBQ7g9P73kE4
+VORdoc8MdJ5eoKBpO8Ww8HECAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
new file mode 100644
index 00000000000..0ecbccc2e4a
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyduVzi1mWm+lYo2Tqt/0
+XkCIWrDNP1QBMVPrE0/ZlU2bCGSoo2Z9FHQKz/mTyMRlhNqTfhJ5qU3U9XlyGOPJ
+piM+b91g26pnpXJ2Q2kOypSgOMOPA4cQ42PkHBEqhuzssfj9t7x47ppS94bboh46
+xLSDRff/NAbtwTpvhStV3URYkxFG++cKGGa5MPXBrxIp+iZf9GnuxVdST5PGiVGP
+ODL/b69sPJQNbJHVquqUTOh5Ry8uuD2WZuXfKf7/C0jC/ie9m2+0CttNu9tMciGM
+EyKG1/Xhk5iIWO43m4SrrT2WkFlcZ1z2JSf9Pjm4C2+HovYpihwwdM/OdP8Xmsnr
+DzVB4YvQiW+IHBjStHVuyiZWc+JsgEPJzisNY0Wyc/kNyNtqVKpX6dRhMLanLmy+
+f53cCSI05KPQAcGj6tdL+D60uKDkt+FsDa0BTAobZ31OsFVid0vCXtsbplNhW1IF
+HwsGXBTVcfXg44RLyL8Lk/2dQxDHNHzAUslJXzPxaHBLmt++2COa2EI1iWlvtznk
+Ok9WP8SOAIj+xdqoiHcC4j72BOVVgiITIJNHrbppZCq6qPR+fgXmXa+sDcGh30m6
+9Wpbr28kLMSHiENCWTdsFij+NQTd5S47H7XTROHnalYDuF1RpS+DpQidT5tUimaT
+JZDr++FjKrnnijbyNF8b98UCAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub
new file mode 100644
index 00000000000..ceffa3ace9c
--- /dev/null
+++ b/main/alpine-keys/alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnpUpyWDWjlUk3smlWeA0
+lIMW+oJ38t92CRLHH3IqRhyECBRW0d0aRGtq7TY8PmxjjvBZrxTNDpJT6KUk4LRm
+a6A6IuAI7QnNK8SJqM0DLzlpygd7GJf8ZL9SoHSH+gFsYF67Cpooz/YDqWrlN7Vw
+tO00s0B+eXy+PCXYU7VSfuWFGK8TGEv6HfGMALLjhqMManyvfp8hz3ubN1rK3c8C
+US/ilRh1qckdbtPvoDPhSbTDmfU1g/EfRSIEXBrIMLg9ka/XB9PvWRrekrppnQzP
+hP9YE3x/wbFc5QqQWiRCYyQl/rgIMOXvIxhkfe8H5n1Et4VAorkpEAXdsfN8KSVv
+LSMazVlLp9GYq5SUpqYX3KnxdWBgN7BJoZ4sltsTpHQ/34SXWfu3UmyUveWj7wp0
+x9hwsPirVI00EEea9AbP7NM2rAyu6ukcm4m6ATd2DZJIViq2es6m60AE6SMCmrQF
+wmk4H/kdQgeAELVfGOm2VyJ3z69fQuywz7xu27S6zTKi05Qlnohxol4wVb6OB7qG
+LPRtK9ObgzRo/OPumyXqlzAi/Yvyd1ZQk8labZps3e16bQp8+pVPiumWioMFJDWV
+GZjCmyMSU8V6MB6njbgLHoyg2LCukCAeSjbPGGGYhnKLm1AKSoJh3IpZuqcKCk5C
+8CM1S15HxV78s9dFntEqIokCAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/main/alpine-make-rootfs/APKBUILD b/main/alpine-make-rootfs/APKBUILD
new file mode 100644
index 00000000000..8aa6ac4289b
--- /dev/null
+++ b/main/alpine-make-rootfs/APKBUILD
@@ -0,0 +1,20 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=alpine-make-rootfs
+pkgver=0.7.0
+pkgrel=0
+pkgdesc="Make customized Alpine Linux rootfs (base image) for containers"
+url="https://github.com/alpinelinux/alpine-make-rootfs"
+arch="noarch"
+license="MIT"
+depends="tar"
+source="$pkgname-$pkgver.tar.gz::https://github.com/alpinelinux/alpine-make-rootfs/archive/v$pkgver.tar.gz"
+options="!check"  # no suitable tests provided
+
+package() {
+	make install DESTDIR="$pkgdir" PREFIX=/usr
+}
+
+sha512sums="
+3c8fbe9b27a08e484b01848d1d836a65ef1a07535938b5767a643c92e37cf75ffaba525030da1fe4c9d50c363f8f10f5030b9403161579a3720e1e9b438cfa35  alpine-make-rootfs-0.7.0.tar.gz
+"
diff --git a/main/alpine-mirrors/APKBUILD b/main/alpine-mirrors/APKBUILD
deleted file mode 100644
index 787a95c4c31..00000000000
--- a/main/alpine-mirrors/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Matt Smith <mcs@darkregion.net>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=alpine-mirrors
-pkgver=3.5.10
-pkgrel=0
-pkgdesc="List of Alpine Linux Mirrors"
-url="https://alpinelinux.org/"
-arch="noarch"
-license="MIT"
-depends=""
-checkdepends="curl"
-install=""
-subpackages=""
-source="mirrors.yaml"
-
-build() {
-	cd "$srcdir"
-	awk '$1 == "-" && $2 ~ /^http:/ {print $2}' mirrors.yaml > MIRRORS.txt
-}
-
-check() {
-	cd "$srcdir"
-	local failed=""
-	for i in $(cat MIRRORS.txt); do
-		msg "testing $i"
-		curl --head --connect-timeout 10 $i >/dev/null \
-			|| failed="$failed $i"
-	done
-	if [ -n "$failed" ]; then
-		error "Following mirrors failed:"
-		for i in $failed; do
-			echo $i
-		done
-		return 1
-	fi
-}
-
-package() {
-	install -D -m644 "$srcdir"/mirrors.yaml \
-		"$pkgdir"/usr/share/alpine-mirrors/mirrors.yaml || return 1
-	install -D -m644 "$srcdir"/MIRRORS.txt \
-		"$pkgdir"/usr/share/alpine-mirrors/MIRRORS.txt || return 1
-}
-
-sha512sums="0117a788555557a3383f0a053ad473c91152b69247e68747ea6fb955b1b874b306280449b6dc2b2ea9f6e3e4da406adb63863b8da0ccca99800413d737eacc94  mirrors.yaml"
diff --git a/main/alpine-mirrors/mirrors.yaml b/main/alpine-mirrors/mirrors.yaml
deleted file mode 100644
index 9760b2f787e..00000000000
--- a/main/alpine-mirrors/mirrors.yaml
+++ /dev/null
@@ -1,143 +0,0 @@
----
-- name: dl-cdn.alpinelinux.org
-  location: GeoDNS
-  urls:
-  - http://dl-cdn.alpinelinux.org/alpine/
-- name: nl.alpinelinux.org
-  location: Europe, Netherlands
-  bandwidth: 100 Mbit/s
-  urls:
-  - http://nl.alpinelinux.org/alpine/
-- name: uk.alpinelinux.org
-  location: Maidenhead, United Kingdom
-  bandwidth: 1 Gbps
-  urls:
-  - http://uk.alpinelinux.org/alpine/
-  - https://uk.alpinelinux.org/alpine/
-- name: dl-2.alpinelinux.org
-  urls:
-  - http://dl-2.alpinelinux.org/alpine/
-- name: dl-3.alpinelinux.org
-  urls:
-  - http://dl-3.alpinelinux.org/alpine/
-- name: dl-4.alpinelinux.org
-  urls:
-  - http://dl-4.alpinelinux.org/alpine/
-- name: dl-5.alpinelinux.org
-  urls:
-  - http://dl-5.alpinelinux.org/alpine/
-- name: dl-8.alpinelinux.org
-  urls:
-  - http://dl-8.alpinelinux.org/alpine/
-- name: mirror.yandex.ru
-  urls:
-  - http://mirror.yandex.ru/mirrors/alpine/
-- name: mirrors.gigenet.com
-  urls:
-  - http://mirrors.gigenet.com/alpinelinux/
-- name: mirror1.hs-esslingen.de
-  urls:
-  - http://mirror1.hs-esslingen.de/pub/Mirrors/alpine/
-- name: leaseweb
-  location: GeoDNS
-  urls:
-  - http://mirror.leaseweb.com/alpine/
-  - rsync://mirror.leaseweb.com/alpine/
-- name: FIT CTU in Prague
-  location: Europe, Czech Republic
-  urls:
-  - https://mirror.fit.cvut.cz/alpine/
-  - http://mirror.fit.cvut.cz/alpine/
-- name: alpine.mirror.far.fi
-  location: Helsinki, Finland
-  urls:
-  - http://alpine.mirror.far.fi/
-- name: Triple
-  location: Amsterdam, The Netherlands
-  urls:
-  - http://alpine.mirror.wearetriple.com/
-  - https://alpine.mirror.wearetriple.com/
-  - rsync://alpine.mirror.wearetriple.com/alpine/
-  bandwidth: 10Gbit/s
-  contact: mirror@wearetriple.com
-- name: Clarkson Open Source Institute
-  location: Potsdam, NY, USA
-  urls:
-  - http://mirror.clarkson.edu/alpine/
-  bandwidth: 1Gbit/s
-  contact: lannonbr@clarkson.edu
-- name: Centro de Computação Eletrônica, Universidade de São Paulo
-  location: South America, Brazil, São Paulo
-  urls:
-  - http://linorg.usp.br/AlpineLinux/
-  - rsync://linorg.usp.br/AlpineLinux/
-  contact: linorg@usp.br
-- name: Department of Computer Science and Engineering, Yuan Ze University
-  location: Asia, Taiwan
-  urls:
-  - ftp://ftp.yzu.edu.tw/Linux/alpine/
-  - http://ftp.yzu.edu.tw/Linux/alpine/
-  - https://ftp.yzu.edu.tw/Linux/alpine/
-  - rsync://ftp.yzu.edu.tw/Linux/alpine/
-  bandwidth: 1Gbit/s
-  contact: hsu@peterdavehello.org
-- name: AARNet
-  location: Australia
-  urls:
-  - http://mirror.aarnet.edu.au/pub/alpine
-  contact: mirror@aarnet.edu.au
-- name: mirror.csclub.uwaterloo.ca
-  location: Waterloo, Ontario, Canada
-  bandwidth: 10Gbit/s
-  urls:
-  - ftp://mirror.csclub.uwaterloo.ca/alpine
-  - http://mirror.csclub.uwaterloo.ca/alpine
-  - https://mirror.csclub.uwaterloo.ca/alpine
-  - rsync://mirror.csclub.uwaterloo.ca/alpine
-- name: ftp.acc.umu.se
-  location: Umeå, Sweden
-  bandwidth: 20Gbit/s
-  urls:
-  - http://ftp.acc.umu.se/mirror/alpinelinux.org
-  - https://ftp.acc.umu.se/mirror/alpinelinux.org
-  - rsync://ftp.acc.umu.se/mirror/alpinelinux.org
-- name: ftp.halifax.rwth-aachen.de
-  location: Aachen, Germany
-  bandwidth: 20Gbit/s
-  urls:
-  - http://ftp.halifax.rwth-aachen.de/alpine
-  - https://ftp.halifax.rwth-aachen.de/alpine
-  - rsync://ftp.halifax.rwth-aachen.de/alpine
-- name: Síminn hf
-  location: Reykjavik, Iceland
-  country: is
-  urls:
-  - http://speglar.siminn.is/alpine
-  - https://speglar.siminn.is/alpine
-  - rsync://speglar.siminn.is/alpine
-- name: dotsrc at Aalborg University
-  location: Aalborg, Denmark
-  bandwidth: 10Gbit/s
-  urls:
-  - http://mirrors.dotsrc.org/alpine
-  - https://mirrors.dotsrc.org/alpine
-  - rsync://mirrors.dotsrc.org/alpine
-- name: WIDE Project Tsukuba NOC
-  location: Tsukuba, Japan
-  bandwidth: 1Gbit/s
-  urls:
-  - http://ftp.tsukuba.wide.ad.jp/Linux/alpine
-  - rsync://ftp.tsukuba.wide.ad.jp/alpine
-- name: RISE
-  location: Philippines
-  urls:
-  - http://mirror.rise.ph/alpine
-  - ftp://mirror.rise.ph/alpine
-- name: Neostrada B.V.
-  location: Europe, Netherlands
-  bandwidth: 100Mbit/s
-  urls:
-  - http://mirror.neostrada.nl/alpine/
-  - https://mirror.neostrada.nl/alpine/
-  - ftp://mirror.neostrada.nl/alpine/
-  - rsync://mirror.neostrada.nl/alpine/
diff --git a/main/alpine-sdk/APKBUILD b/main/alpine-sdk/APKBUILD
index 6329686c428..3163037ae9c 100644
--- a/main/alpine-sdk/APKBUILD
+++ b/main/alpine-sdk/APKBUILD
@@ -1,12 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-sdk
 pkgver=1.0
-pkgrel=0
-url=http://dev.alpinelinux.org/cgit
+pkgrel=1
+url="https://git.alpinelinux.org/"
 pkgdesc="Alpine Software Development Kit meta package"
 depends="abuild build-base git"
 arch="noarch"
 license="GPL-2.0"
+options="!check"
 
 build() {
 	# meta package
diff --git a/main/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD
index 72cd9829864..2ec22ccd222 100644
--- a/main/alsa-lib/APKBUILD
+++ b/main/alsa-lib/APKBUILD
@@ -1,15 +1,21 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alsa-lib
-pkgver=1.2.2
+pkgver=1.2.11
 pkgrel=0
 pkgdesc="Advanced Linux Sound Architecture (ALSA) library"
-url="http://www.alsa-project.org"
+url="https://alsa-project.org/"
 arch="all"
 license="LGPL-2.1-or-later"
-subpackages="$pkgname-dev $pkgname-dbg"
+subpackages="$pkgname-dbg $pkgname-dev"
 makedepends="linux-headers"
-source="ftp://ftp.alsa-project.org/pub/lib/alsa-lib-$pkgver.tar.bz2
-	remove-test.patch"
+source="https://alsa-project.org/files/pub/lib/alsa-lib-$pkgver.tar.bz2
+	remove-test.patch
+	fix-PATH_MAX-on-ppc64le.patch
+	"
+prepare() {
+	default_prepare
+	update_config_sub
+}
 
 build() {
 	./configure \
@@ -33,7 +39,11 @@ check() {
 
 package() {
 	make -j1 DESTDIR="$pkgdir" install
+	install -d -m755 "$pkgdir"/etc/alsa/conf.d
 }
 
-sha512sums="d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033  alsa-lib-1.2.2.tar.bz2
-e15318431fe2d5bd1e42ef793f223e3e5995890d7befe6daa3d7456ccf5cb2f51eb79171539cecae13032a9b8a798ea35e04c89b27c7ef9567e2c03fb8db4512  remove-test.patch"
+sha512sums="
+7bf2c541dff5262c0302a1c716ca10cdb5105f4e0ad48f3341c3c7e975b0c3ea835a298a05974c3e216a85912c368d8025ba3cdda3ff04a7683133ce5b2a286d  alsa-lib-1.2.11.tar.bz2
+e15318431fe2d5bd1e42ef793f223e3e5995890d7befe6daa3d7456ccf5cb2f51eb79171539cecae13032a9b8a798ea35e04c89b27c7ef9567e2c03fb8db4512  remove-test.patch
+f980d153c2f179e2f8fd90180d19250e5a5e12388f31d86a233d89be72ae7e96b944a8f435f0a11c6140378ac38eaa937175e1c100395ec4f635a9a6a4b1ae25  fix-PATH_MAX-on-ppc64le.patch
+"
diff --git a/main/alsa-lib/fix-PATH_MAX-on-ppc64le.patch b/main/alsa-lib/fix-PATH_MAX-on-ppc64le.patch
new file mode 100644
index 00000000000..96cc8a54168
--- /dev/null
+++ b/main/alsa-lib/fix-PATH_MAX-on-ppc64le.patch
@@ -0,0 +1,15 @@
+Author: Milan P. Stanić <mps@arvanta.net>
+Date:   Thu Jun 3 09:08:05 2021 +0000
+
+Fix missing PATH_MAX on ppc64le
+
+--- a/src/ucm/ucm_exec.c	2021-05-27 21:30:16.000000000 +0000
++++ b/src/ucm/ucm_exec.c	2021-06-03 11:37:52.626982547 +0000
+@@ -31,6 +31,7 @@
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <dirent.h>
++#include <limits.h>
+ 
+ static pthread_mutex_t fork_lock = PTHREAD_MUTEX_INITIALIZER;
+ 
diff --git a/main/alsa-ucm-conf/APKBUILD b/main/alsa-ucm-conf/APKBUILD
new file mode 100644
index 00000000000..2cb410359a2
--- /dev/null
+++ b/main/alsa-ucm-conf/APKBUILD
@@ -0,0 +1,24 @@
+# Contributor: Minecrell <minecrell@minecrell.net>
+# Maintainer: Minecrell <minecrell@minecrell.net>
+pkgname=alsa-ucm-conf
+pkgver=1.2.11
+pkgrel=1
+pkgdesc="ALSA Use Case Manager configuration"
+url="https://alsa-project.org"
+arch="noarch"
+license="BSD-3-Clause"
+source="https://alsa-project.org/files/pub/lib/alsa-ucm-conf-$pkgver.tar.bz2"
+options="!check" # no tests
+provider_priority=10
+# replaced files from downstream pmos
+replaces="device-purism-librem5"
+
+package() {
+	mkdir -p "$pkgdir"/usr/share/alsa
+	cp -r ucm2 "$pkgdir"/usr/share/alsa
+	find "$pkgdir"/usr/share/alsa \( -name '*.md' -o -name '.gitignore' \) -delete
+}
+
+sha512sums="
+b202e7410a579789be0005564b4868f70bca0fd8664c02add95fc9ff90ab64faebda978fbd3e83a3274c37242dccf8efbebd03f529e35ca3033daf55f425cb8d  alsa-ucm-conf-1.2.11.tar.bz2
+"
diff --git a/main/alsa-utils/APKBUILD b/main/alsa-utils/APKBUILD
index 57c7b1196aa..2182cb5e837 100644
--- a/main/alsa-utils/APKBUILD
+++ b/main/alsa-utils/APKBUILD
@@ -1,28 +1,35 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alsa-utils
-pkgver=1.2.2
-pkgrel=0
+pkgver=1.2.11
+pkgrel=1
 pkgdesc="Advanced Linux Sound Architecture (ALSA) utilities"
-url="http://www.alsa-project.org"
+url="https://alsa-project.org/"
 arch="all"
 options="!check"  # No test suite, applets use ncurses / don't have --version
 license="GPL-2.0-or-later"
 makedepends="alsa-lib-dev fftw-dev ncurses-dev pciutils-dev xmlto"
-depends="dialog"
-subpackages="$pkgname-doc alsaconf::noarch $pkgname-dbg $pkgname-openrc"
-source="ftp://ftp.alsa-project.org/pub/utils/alsa-utils-$pkgver.tar.bz2
+depends="dialog alsa-ucm-conf"
+subpackages="$pkgname-dbg alsaconf::noarch $pkgname-doc $pkgname-openrc"
+source="https://alsa-project.org/files/pub/utils/alsa-utils-$pkgver.tar.bz2
 	alsaconf.patch
 	alsa.initd
 	alsa.confd
+	musl-locale.patch
+	musl-types.patch
 	"
+prepare() {
+	default_prepare
+	update_config_sub
+}
 
 build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--disable-nls
+		--disable-nls \
+		--with-alsactl-lock-dir=/run/lock
 	make
 }
 
@@ -33,14 +40,16 @@ package() {
 }
 
 alsaconf() {
-	depends="alsa-utils bash"
-	cd "$builddir"
-	mkdir -p "$subpkgdir"/usr/sbin
-	mv "$pkgdir"/usr/sbin/alsaconf \
-		"$subpkgdir"/usr/sbin
+	depends="$pkgname=$pkgver-r$pkgrel bash"
+
+	amove usr/sbin/alsaconf
 }
 
-sha512sums="30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9  alsa-utils-1.2.2.tar.bz2
+sha512sums="
+5ce76807b53357584bfb4ace5acfdac4db9168ffaf5cdd1e499738eec046c36112bf84a99970f66368063a9baf73bad93af2d439630572f3eba5c9321071172d  alsa-utils-1.2.11.tar.bz2
 f04155e1e391c7f36d44422c8e769bf9370117f6bbea6c0664e9858f7a676cc958e4260e4b4d226e71d0716f6be4e6fdd60f1d07cb7e9922fff378ceec01c47d  alsaconf.patch
-65f3530df01a2157003df9df4cb5b2c7a258257e8121786383610eb2872ffb5e8c88d070792ad74133a21c5fa54bac5047af4dcccb1854b456d2eeb8f0689076  alsa.initd
-6e716e6230fd3d2c33e3cb2dbf572d632c9ac6452c1768388bea7d3ca22f7c72cf6bcd702580f45cb9089983582011c8b04cbdb4420d14fb988167b1391ea547  alsa.confd"
+c66959a4a1a24a727c9c91a455caa5fa093c523d17a563b56ec2449a02ff30c83683db555006954b1fe571446cf4a117cc41de8c8b869a6e875d386595b3cc1f  alsa.initd
+d7e212e9f624b09168117b46c66289204a23915adf0d1b0c9ae258049430397b8f2d86d3b5f7e3087151948a031c4eab863e8195a6c7b1276704e9cba9c2d2a7  alsa.confd
+4b4b4d6406d57f592ecec9a79b5e401d1e1025e4f0b0d51ba233a5d2fcd1ce27ef336fda0242e7ff7d229d00428b7030d1d5789c9c306f824938366530eff6d9  musl-locale.patch
+ee74137d5bf431090a2603c87c94f19063d9a62921b3c6bc1f19317e006a7ec278b66da9ccfb1b64fa5da46852f6a84ac2511b9ce74969799d0fca4cd9b2bc8d  musl-types.patch
+"
diff --git a/main/alsa-utils/alsa.confd b/main/alsa-utils/alsa.confd
index d47edb1243b..b7c5be8ce0b 100644
--- a/main/alsa-utils/alsa.confd
+++ b/main/alsa-utils/alsa.confd
@@ -13,3 +13,8 @@ RESTORE_ON_START="yes"
 # yes - Save state
 
 SAVE_ON_STOP="yes"
+
+# Additional options which should be passed to alsactl. Most notably,
+# if you get "UCM is not supported" messages on startup, you can pass
+# --no-ucm here.
+#alsactl_opts="--no-ucm"
diff --git a/main/alsa-utils/alsa.initd b/main/alsa-utils/alsa.initd
index 778e1f682e5..3dae726ae18 100644
--- a/main/alsa-utils/alsa.initd
+++ b/main/alsa-utils/alsa.initd
@@ -34,7 +34,7 @@ restore() {
 		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
 		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
 		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		alsactl -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \
+		alsactl ${alsactl_opts} -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \
 			|| ewarn "Errors while restoring defaults, ignoring"
 	done
 
@@ -57,7 +57,7 @@ save() {
 	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
 
 	mkdir -p "${alsastatedir}"
-	if ! alsactl -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then
+	if ! alsactl ${alsactl_opts} -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then
 		eerror "Error saving levels."
 		eend 1
 		return 1
diff --git a/main/alsa-utils/musl-locale.patch b/main/alsa-utils/musl-locale.patch
new file mode 100644
index 00000000000..84bc89ba04e
--- /dev/null
+++ b/main/alsa-utils/musl-locale.patch
@@ -0,0 +1,28 @@
+Patch-Source: https://github.com/alsa-project/alsa-utils/commit/8c229270f6bae83b705a03714c46067a7aa57b02.patch
+--
+From 8c229270f6bae83b705a03714c46067a7aa57b02 Mon Sep 17 00:00:00 2001
+From: Michael Opdenacker <michael.opdenacker@bootlin.com>
+Date: Tue, 19 Sep 2023 13:14:29 +0200
+Subject: [PATCH] topology: include locale.h
+
+This solves an issue compiling with the musl libc.
+
+Fixes: https://github.com/alsa-project/alsa-utils/issues/239
+Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ topology/topology.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/topology/topology.c b/topology/topology.c
+index 1840ffe6..5d03a8b1 100644
+--- a/topology/topology.c
++++ b/topology/topology.c
+@@ -32,6 +32,7 @@
+ #include <sys/stat.h>
+ #include <getopt.h>
+ #include <assert.h>
++#include <locale.h>
+ 
+ #include <alsa/asoundlib.h>
+ #include <alsa/topology.h>
diff --git a/main/alsa-utils/musl-types.patch b/main/alsa-utils/musl-types.patch
new file mode 100644
index 00000000000..7eaf00b79ca
--- /dev/null
+++ b/main/alsa-utils/musl-types.patch
@@ -0,0 +1,28 @@
+Patch-Source: https://github.com/alsa-project/alsa-utils/commit/0925ad7f09b2dc77015784f9ac2f5e34dd0dd5c3.patch
+--
+From 0925ad7f09b2dc77015784f9ac2f5e34dd0dd5c3 Mon Sep 17 00:00:00 2001
+From: Michael Opdenacker <michael.opdenacker@bootlin.com>
+Date: Tue, 19 Sep 2023 13:14:30 +0200
+Subject: [PATCH] nhlt-dmic-info.c: include sys/types.h
+
+This fixes an issue compiling with the musl libc.
+
+Fixes: https://github.com/alsa-project/alsa-utils/issues/238
+Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ nhlt/nhlt-dmic-info.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/nhlt/nhlt-dmic-info.c b/nhlt/nhlt-dmic-info.c
+index 3f6c64d9..331555a8 100644
+--- a/nhlt/nhlt-dmic-info.c
++++ b/nhlt/nhlt-dmic-info.c
+@@ -33,6 +33,7 @@
+ #include <fcntl.h>
+ #include <getopt.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
+ #include <arpa/inet.h>
+ 
+ int debug = 0;
diff --git a/main/altermime/APKBUILD b/main/altermime/APKBUILD
index b23ad947c6f..3db166af4dc 100644
--- a/main/altermime/APKBUILD
+++ b/main/altermime/APKBUILD
@@ -3,11 +3,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=altermime
 pkgver=0.3.11
-pkgrel=1
+pkgrel=4
 pkgdesc="alterMIME - MIME encoded email pack alteration tool"
 url="https://pldaniels.com/altermime"
 arch="all"
-license="custom:altermime"
+license="BSD-2-Clause"
 # no check provided by upstream
 options="!check"
 subpackages="$pkgname-doc"
@@ -20,8 +20,6 @@ build() {
 
 package() {
 	install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
-	install -Dm644 LICENCE \
-		"$pkgdir"/usr/share/licenses/$pkgname/LICENCE
 	install -Dm644 README \
 		"$pkgdir"/usr/share/doc/$pkgname/README
 }
diff --git a/main/amavis/APKBUILD b/main/amavis/APKBUILD
index f512a4e7355..e159254e7b0 100644
--- a/main/amavis/APKBUILD
+++ b/main/amavis/APKBUILD
@@ -1,69 +1,62 @@
-# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=amavis
-pkgver=2.12.0
-pkgrel=0
+pkgver=2.13.0
+pkgrel=1
 pkgdesc="High-performance interface between mailer (MTA) and content checkers"
 url="https://gitlab.com/amavis/amavis"
 arch="noarch"
-license="GPL-2.0-or-later BSD"
+license="GPL-2.0-or-later BSD-2-Clause-Views"
 provides="amavisd-new=$pkgver-r$pkgrel"
 depends="sed file perl perl-archive-zip perl-carp perl-convert-tnef
 	perl-compress-raw-zlib perl-convert-uulib perl-digest-md5 perl-io
-	perl-exporter perl-io-compress perl-io-stringy perl-mime-tools
+	perl-exporter perl-io-stringy perl-mime-tools
 	perl-mailtools perl-socket perl-net-libidn perl-net-server
-	perl-time-hires perl-unix-syslog perl-db perl-mail-dkim
-	perl-io-socket-inet6
+	perl-time-hires perl-unix-syslog perl-mail-dkim
+	perl-io-socket-inet6 perl-io-socket-ssl
 	perl-mail-spamassassin
 	"
-makedepends=""
 install="$pkgname.pre-install"
 options="!check"
 subpackages="$pkgname-openrc"
 source="https://gitlab.com/amavis/amavis/-/archive/v$pkgver/amavis-v$pkgver.tar.gz
 	amavisd.initd
 	amavisd.confd
+	amavisd-conf.patch
 	"
 pkgusers="amavis"
 pkggroups="amavis"
-
 builddir="$srcdir"/$pkgname-v$pkgver
 
 package() {
-	cd "$builddir"
-	(
-	HOME=/var/amavis
-	QUARANTINE=$HOME/quarantine
-	USER=amavis
-	GROUP=amavis
-	DIRS="$HOME $HOME/tmp $HOME/var $HOME/db $HOME/home $QUARANTINE"
-	CONFIG=/etc/amavisd.conf
+	_amavis_home=/var/amavis
+	_perl_vendorlib="$pkgdir"/usr/share/perl5/vendor_perl
 
-	for dir in $DIRS
-	do
-		mkdir -p ${pkgdir}$dir
+	for dir in $_amavis_home/tmp \
+			$_amavis_home/var \
+			$_amavis_home/db \
+			$_amavis_home/home \
+			$_amavis_home/quarantine \
+			; do
+		install -dm750 -o amavis -g amavis "${pkgdir}$dir"
 	done
 
-	install -m 755 -o root -D amavisd $pkgdir/usr/sbin/amavisd
-	install -m 755 -o root -D amavisd-nanny $pkgdir/usr/bin/amavisd-nanny
-	install -m 755 -o root -D amavisd-release $pkgdir/usr/bin/amavisd-release
-	sed -e "s:^.*\$MYHOME = .*$:\$MYHOME = '$HOME';:" \
-	 -e 's:^.*\$TEMPBASE = .*$:\$TEMPBASE = "\$MYHOME/tmp";:' \
-	 -e 's:^.*\$db_home  = .*$:\$db_home = "$MYHOME/db";:' \
-	 -e "s:^.*\$QUARANTINEDIR = .*$:\$QUARANTINEDIR = '$QUARANTINE';:" \
-	 -e "s:^.*\$daemon_user  = 'vscan';\(.*\)$:\$daemon_user  = 'amavis';\1:" \
-	 -e "s:^.*\$daemon_group = 'vscan';\(.*\)$:\$daemon_group  = 'amavis';\1:" < amavisd.conf > amavisd.conf.alpine
-	install -m 640 -o root -D amavisd.conf.alpine ${pkgdir}${CONFIG}
-	)
+	cd bin
+	for file in amavisd amavisd-nanny amavisd-release; do
+		install -Dm755 -o root -g amavis "$file" "$pkgdir/usr/sbin/$file"
+	done
+	cd ..
 
+	install -Dm640 -o root -g amavis conf/amavisd.conf "$pkgdir"/etc/amavisd.conf
 	install -Dm755 "$srcdir"/amavisd.initd "$pkgdir"/etc/init.d/amavisd
 	install -Dm644 "$srcdir"/amavisd.confd "$pkgdir"/etc/conf.d/amavisd
 
-	chown -R amavis:amavis "$pkgdir"/var/amavis
-	chmod -R 750 "$pkgdir"/var/amavis
-	chown root:amavis "$pkgdir"/etc/amavisd.conf
+	mkdir -p -m 0755 $_perl_vendorlib
+	cp -pr lib/* $_perl_vendorlib
 }
 
-sha512sums="310cf2391b23fcafc1e747b603a8f86ade08490ac9daab8213baf48eee7ba18bab36b2cd2b11a4235380d42f0e4ad173fe844983653666c5b1d8db622137cfe2  amavis-v2.12.0.tar.gz
+sha512sums="
+6e0a7d6914d1aa53efd2c5d525cea846e125907e1c9e25b89dcc6caab65296fb4998c6cae17124406a016e9bc60f5f0de30660f88f8543823dae9d4e1a198270  amavis-v2.13.0.tar.gz
 6a9dd16a6b52f3d1fbd16887f29ccceddc58e88a02e681f23c1fe54b7e24feea5089d52813f4f3e87d9242daf79d2b2ea1e7c451d83d7de943403e71dc61c4e5  amavisd.initd
-a5ce3583c34197f335372728cf92da23bae2cd7a9ae48daff6eaadbf66fbd5be6bb8b480b0fce1ea2b3a662b0a54d1d2f1f277d2f9a06d9630b57fa5d7ac2635  amavisd.confd"
+a5ce3583c34197f335372728cf92da23bae2cd7a9ae48daff6eaadbf66fbd5be6bb8b480b0fce1ea2b3a662b0a54d1d2f1f277d2f9a06d9630b57fa5d7ac2635  amavisd.confd
+aede1b93303492f06a16a0f9a862dfa64117ac80596ec420308e89cc1794be2e0be4adf66e312ecedac10e6fd7b981097fa0aadddb0bced334e6d32e7a73d217  amavisd-conf.patch
+"
diff --git a/main/amavis/amavisd-conf.patch b/main/amavis/amavisd-conf.patch
new file mode 100644
index 00000000000..3da8c1f0faa
--- /dev/null
+++ b/main/amavis/amavisd-conf.patch
@@ -0,0 +1,33 @@
+--- a/conf/amavisd.conf
++++ b/conf/amavisd.conf
+@@ -17,15 +17,15 @@
+                         # truncation in /proc/<pid>/stat and ps -e output
+ 
+ $max_servers = 2;            # num of pre-forked children (2..30 is common), -m
+-$daemon_user   = 'vscan';    # (no default;  customary: vscan or amavis), -u
+-@daemon_groups = 'vscan';    # (leave empty to use $daemon_user's supplementary groups), -g
++$daemon_user   = 'amavis';   # (no default;  customary: vscan or amavis), -u
++@daemon_groups  = 'amavis';  # (no default;  customary: vscan or amavis), -g
+ 
+ $mydomain = 'example.com';   # a convenient default for other settings
+ 
+-# $MYHOME = '/var/amavis';   # a convenient default for other settings, -H
+-$TEMPBASE = "$MYHOME/tmp";   # working directory, needs to exist, -T
++$MYHOME = '/var/amavis';
++$TEMPBASE = "$MYHOME/tmp";
+ $ENV{TMPDIR} = $TEMPBASE;    # environment variable TMPDIR, used by SA, etc.
+-$QUARANTINEDIR = '/var/virusmails';  # -Q
++$QUARANTINEDIR = '/var/amavis/quarantine';
+ # $quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
+ # $release_format = 'resend';     # 'attach', 'plain', 'resend'
+ # $report_format  = 'arf';        # 'attach', 'plain', 'resend', 'arf'
+@@ -44,7 +44,8 @@
+ $syslog_facility = 'mail';   # Syslog facility as a string
+            # e.g.: mail, daemon, user, local0, ... local7
+ 
+-$enable_db = 1;              # enable use of BerkeleyDB/libdb (SNMP and nanny)
++# BDB is no longer supported in Alpine
++$enable_db = 0;              # enable use of BerkeleyDB/libdb (SNMP and nanny)
+ # $enable_zmq = 1;           # enable use of ZeroMQ (SNMP and nanny)
+ $nanny_details_level = 2;    # nanny verbosity: 1: traditional, 2: detailed
+ $enable_dkim_verification = 1;  # enable DKIM signatures verification
diff --git a/main/amavisd-milter/APKBUILD b/main/amavisd-milter/APKBUILD
index b20c46fbe6e..93a5e589406 100644
--- a/main/amavisd-milter/APKBUILD
+++ b/main/amavisd-milter/APKBUILD
@@ -1,39 +1,42 @@
 # Contributor: Elias Werberich <elias@werberich.de>
-# Maintainer:
+# Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting>
 pkgname=amavisd-milter
-pkgver=1.6.1
-pkgrel=2
+pkgver=1.7.2
+pkgrel=0
 pkgdesc="sendmail milter for amavisd-new using the AM.PDP protocol"
-url="http://amavisd-milter.sourceforge.net/"
-arch="all"
-license="BSD"
-depends="amavis libmilter"
+url="https://github.com/prehor/amavisd-milter"
+arch="all !x86" #amavis isn't build for x86
+license="BSD-3-Clause"
+depends="amavis"
 makedepends="libmilter-dev"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
 source="
-	https://downloads.sourceforge.net/amavisd-milter/amavisd-milter/amavisd-milter-1.6.1/amavisd-milter-1.6.1.tar.gz
+	https://github.com/prehor/amavisd-milter/releases/download/$pkgver/amavisd-milter-$pkgver.tar.gz
 	amavisd-milter.initd
 	amavisd-milter.confd
 	"
-builddir="$srcdir/${pkgname}-${pkgver}"
+
+prepare() {
+	default_prepare
+
+	update_config_sub
+	chmod +x aclocal/install-sh
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--target="" \
-		--prefix=/usr
+		--prefix=/usr \
+		--disable-dependency-tracking
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
@@ -42,6 +45,8 @@ package() {
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="28f505a8e130e67decc6c6ff8526f82db24b1b27a11e69f1a112e3e6103f303d333743c2ceaf12bad86979c987cde64f41afb4794c1ca1222cf11a2c3b03c8a5  amavisd-milter-1.6.1.tar.gz
-3e45a8766f6b5bbb089bcb508efe99d17f107d544b2d50d12437a6b7103e2ce143eef9c6ecc0e2a9ced37b153d122e1eb8f171e4000e4e56a7f2a210587c2d68  amavisd-milter.initd
-f44ab528c65050e23a2e78dafd937dae5bc73bd83ff780d7a193d47744674f3991c9d1ae99c4fb8ce1762c50ed6ca5fb604eb2c4cf69fe2e27e8a4076b6f2eec  amavisd-milter.confd"
+sha512sums="
+639a5a4f92131f9b8d004255819e36dedd529ec95f8290663c6ea5860dbbce049a822ba0e68158228716778265009b93024e9102defdf9250d4e889157008181  amavisd-milter-1.7.2.tar.gz
+3f631248da7ecc36790123bad82b0d17a110947dd84aa03fc1e81c3ed99db43ae52d3cef10c048a9147d86973a8d730494b6c289f96195dbafab2804538191fd  amavisd-milter.initd
+f44ab528c65050e23a2e78dafd937dae5bc73bd83ff780d7a193d47744674f3991c9d1ae99c4fb8ce1762c50ed6ca5fb604eb2c4cf69fe2e27e8a4076b6f2eec  amavisd-milter.confd
+"
diff --git a/main/amavisd-milter/amavisd-milter.initd b/main/amavisd-milter/amavisd-milter.initd
index c76cd259ef9..c0daeb46a02 100644
--- a/main/amavisd-milter/amavisd-milter.initd
+++ b/main/amavisd-milter/amavisd-milter.initd
@@ -4,8 +4,7 @@ pidfile="/var/amavis/amavisd-milter.pid"
 
 name=amavisd-milter
 command="/usr/sbin/$name"
-command_args="-f -B -w $workdir -s $socket_milter -S $socket_amavis -m $connections"
-command_background="yes"
+command_args="-B -w $workdir -s $socket_milter -S $socket_amavis -m $connections"
 
 start_stop_daemon_args="--user $user:$group"
 
diff --git a/main/ansible/0001-new-module-lbu.patch b/main/ansible/0001-new-module-lbu.patch
deleted file mode 100644
index 9953946e4e6..00000000000
--- a/main/ansible/0001-new-module-lbu.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From a419a9539ddff10fa4d3fd7460b117a9f4dd2691 Mon Sep 17 00:00:00 2001
-From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Date: Thu, 19 Sep 2019 10:58:07 +0300
-Subject: [PATCH] new module: lbu
-
-Alpine Linux Local Backup Utility
----
- lib/ansible/modules/system/lbu.py | 131 ++++++++++++++++++++++++++++++
- 1 file changed, 131 insertions(+)
- create mode 100644 lib/ansible/modules/system/lbu.py
-
-diff --git a/lib/ansible/modules/system/lbu.py b/lib/ansible/modules/system/lbu.py
-new file mode 100644
-index 0000000000..9952ec29f1
---- /dev/null
-+++ b/lib/ansible/modules/system/lbu.py
-@@ -0,0 +1,131 @@
-+#!/usr/bin/python
-+
-+# Copyright: (c) 2019, Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-+
-+from __future__ import absolute_import, division, print_function
-+__metaclass__ = type
-+
-+ANSIBLE_METADATA = {
-+    'metadata_version': '1.1',
-+    'status': ['preview'],
-+    'supported_by': 'community'
-+}
-+
-+DOCUMENTATION = '''
-+---
-+module: lbu
-+
-+short_description: Local Backup Utility for Alpine Linux
-+
-+version_added: "2.10"
-+
-+description:
-+- Manage Local Backup Utility of Alpine Linux in run-from-RAM mode
-+
-+options:
-+  commit:
-+    description:
-+    - Control whether to commit changed files.
-+    type: bool
-+  exclude:
-+    description:
-+    - List of paths to exclude.
-+    type: list
-+  include:
-+    description:
-+    - List of paths to include.
-+    type: list
-+
-+author:
-+- Kaarle Ritvanen (@kunkku)
-+'''
-+
-+EXAMPLES = '''
-+# Commit changed files (if any)
-+- name: Commit
-+  lbu:
-+    commit: true
-+
-+# Exclude path and commit
-+- name: Exclude directory
-+  lbu:
-+    commit: true
-+    exclude:
-+    - /etc/opt
-+
-+# Include paths without committing
-+- name: Include file and directory
-+  lbu:
-+    include:
-+    - /root/.ssh/authorized_keys
-+    - /var/lib/misc
-+'''
-+
-+RETURN = '''
-+msg:
-+  description: Error message
-+  type: str
-+  returned: on failure
-+'''
-+
-+from ansible.module_utils.basic import AnsibleModule
-+
-+import os.path
-+
-+
-+def run_module():
-+    module = AnsibleModule(
-+        argument_spec={
-+            'commit': {'type': 'bool'},
-+            'exclude': {'type': 'list', 'elements': 'str'},
-+            'include': {'type': 'list', 'elements': 'str'}
-+        },
-+        supports_check_mode=True
-+    )
-+
-+    changed = False
-+
-+    def run_lbu(*args):
-+        code, stdout, stderr = module.run_command(
-+            [module.get_bin_path('lbu', required=True)] + list(args)
-+        )
-+        if code:
-+            module.fail_json(changed=changed, msg=stderr)
-+        return stdout
-+
-+    update = False
-+    commit = False
-+
-+    for param in ('include', 'exclude'):
-+        if module.params[param]:
-+            paths = run_lbu(param, '-l').split('\n')
-+            for path in module.params[param]:
-+                if os.path.normpath('/' + path)[1:] not in paths:
-+                    update = True
-+
-+    if module.params['commit']:
-+        commit = update or run_lbu('status') > ''
-+
-+    if module.check_mode:
-+        module.exit_json(changed=update or commit)
-+
-+    if update:
-+        for param in ('include', 'exclude'):
-+            if module.params[param]:
-+                run_lbu(param, *module.params[param])
-+                changed = True
-+
-+    if commit:
-+        run_lbu('commit')
-+        changed = True
-+
-+    module.exit_json(changed=changed)
-+
-+
-+def main():
-+    run_module()
-+
-+
-+if __name__ == '__main__':
-+    main()
--- 
-2.20.1
-
diff --git a/main/ansible/APKBUILD b/main/ansible/APKBUILD
deleted file mode 100644
index ca80eab3c9f..00000000000
--- a/main/ansible/APKBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Takuya Noguchi <takninnovationresearch@gmail.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=ansible
-pkgver=2.9.6
-pkgrel=0
-pkgdesc="A configuration-management, deployment, task-execution, and multinode orchestration framework"
-url="https://ansible.com/"
-arch="noarch"
-license="GPL-3.0-or-later"
-depends="python3 py3-yaml py3-paramiko py3-jinja2 py3-markupsafe py3-pycryptodome"
-makedepends="python3-dev py3-setuptools"
-subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://releases.ansible.com/ansible/ansible-$pkgver.tar.gz
-	add-lxc-container_shell-option.patch
-	0001-new-module-lbu.patch
-	"
-
-# secfixes:
-#   2.9.6-r0:
-#     - CVE-2020-1737
-#     - CVE-2020-1739
-#   2.9.3-r0:
-#     - CVE-2019-14904
-#     - CVE-2019-14905
-#   2.8.6-r0:
-#     - CVE-2019-14846
-#     - CVE-2019-14856
-#     - CVE-2019-14858
-#   2.8.4-r0:
-#     - CVE-2019-10206
-#     - CVE-2019-10217
-#   2.8.2-r0:
-#     - CVE-2019-10156
-#   2.7.9-r0:
-#     - CVE-2018-16876
-#   2.6.3-r0:
-#     - CVE-2018-10875
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 setup.py check
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-
-	mkdir -p "$pkgdir"/usr/share/man/man1
-	install -Dm644 "$builddir"/docs/man/man1/*.1 \
-		"$pkgdir"/usr/share/man/man1/
-
-	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/examples/
-	cp -r examples/* \
-		"$pkgdir"/usr/share/doc/$pkgname/examples/
-	install -m644 README.rst "$pkgdir"/usr/share/doc/$pkgname
-}
-
-sha512sums="7111fd72b4e029b2f661bfb849b4323b69ea796f8a069ad3120e8de390effa670180c69ca0fd5e0a1c2e444db6d574a52d530a2b0343c76cd81ba963b3c3a7cb  ansible-2.9.6.tar.gz
-f44f1492495abe092cd9f91669ccfee65748f43663571361de97c3b1c5c1219d355aa7236179decb73446376018fa81aace7eaeb8c10a83d3cf4e006508533dd  add-lxc-container_shell-option.patch
-d6aa6827acee61d857444a00364f9b057a216a0a6f5217f353e8b8e0118db7aee54b7578a3fb31cb43bfa8e0709db8d43dcdb819eb28a457a692359887dad115  0001-new-module-lbu.patch"
diff --git a/main/ansible/add-lxc-container_shell-option.patch b/main/ansible/add-lxc-container_shell-option.patch
deleted file mode 100644
index e7734101732..00000000000
--- a/main/ansible/add-lxc-container_shell-option.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From d9b11e63387aad25cf53b2de4e77e139b2102982 Mon Sep 17 00:00:00 2001
-From: lu1as <lukas.steiner@steinheilig.de>
-Date: Thu, 31 May 2018 01:25:09 +0200
-Subject: [PATCH] Add lxc `container_shell` option
-
----
- .../modules/cloud/lxc/lxc_container.py        | 29 ++++++++++++-------
- 1 file changed, 19 insertions(+), 10 deletions(-)
-
-diff --git a/lib/ansible/modules/cloud/lxc/lxc_container.py b/lib/ansible/modules/cloud/lxc/lxc_container.py
-index e0be3e4145db..21c7ad05610f 100644
---- a/lib/ansible/modules/cloud/lxc/lxc_container.py
-+++ b/lib/ansible/modules/cloud/lxc/lxc_container.py
-@@ -75,6 +75,11 @@
-     container_command:
-         description:
-           - Run a command within a container.
-+    container_shell:
-+        description:
-+          - Shell used for executing *container_command*.
-+        default: bash
-+        version_added: "2.7"
-     lxc_path:
-         description:
-           - Place container under PATH
-@@ -166,9 +171,10 @@
-     is "stopped" and the container does not exist it will be first created,
-     "started", the command executed, and then "stopped". If you use a "|"
-     in the variable you can use common script formatting within the variable
--    itself The "container_command" option will always execute as BASH.
--    When using "container_command" a log file is created in the /tmp/ directory
--    which contains both stdout and stderr of any command executed.
-+    itself. If your container doesn't have BASH installed, you can change
-+    the shell by specifying "container_shell". When using "container_command"
-+    a log file is created in the /tmp/ directory which contains both stdout
-+    and stderr of any command executed.
-   - If "archive" is **true** the system will attempt to create a compressed
-     tarball of the running container. The "archive" option supports LVM backed
-     containers and will create a snapshot of the running container when
-@@ -531,13 +537,12 @@
- # container without using SSH.  The template will attempt to work within the
- # home directory of the user that was attached to the container and source
- # that users environment variables by default.
--ATTACH_TEMPLATE = """#!/usr/bin/env bash
--pushd "$(getent passwd $(whoami)|cut -f6 -d':')"
-+ATTACH_TEMPLATE = """#!/usr/bin/env %(container_shell)s
-+cd $(getent passwd $(whoami)|cut -f6 -d':')
-     if [[ -f ".bashrc" ]];then
-         source .bashrc
-         unset HOSTNAME
-     fi
--popd
- 
- # User defined command
- %(container_command)s
-@@ -550,15 +555,15 @@ def create_script(command):
-     This method should be backward compatible with Python 2.4+ when executing
-     from within the container.
- 
--    :param command: command to run, this can be a script and can use spacing
-+    :param command: shell and command to run, this can be a script and can use spacing
-                     with newlines as separation.
--    :type command: ``str``
-+    :type command: ``list``
-     """
- 
-     (fd, script_file) = tempfile.mkstemp(prefix='lxc-attach-script')
-     f = os.fdopen(fd, 'wb')
-     try:
--        f.write(to_bytes(ATTACH_TEMPLATE % {'container_command': command}, errors='surrogate_or_strict'))
-+        f.write(to_bytes(ATTACH_TEMPLATE % {'container_shell': command[0], 'container_command': command[1]}, errors='surrogate_or_strict'))
-         f.flush()
-     finally:
-         f.close()
-@@ -940,7 +945,7 @@ def _execute_command(self):
-             elif container_state == 'stopped':
-                 self._container_startup()
- 
--            self.container.attach_wait(create_script, container_command)
-+            self.container.attach_wait(create_script, [self.module.params.get('container_shell'), container_command])
-             self.state_change = True
- 
-     def _container_startup(self, timeout=60):
-@@ -1703,6 +1708,10 @@ def main():
-             container_command=dict(
-                 type='str'
-             ),
-+            container_shell=dict(
-+                type='str',
-+                default='bash'
-+            ),
-             container_config=dict(
-                 type='str'
-             ),
diff --git a/main/antiword/APKBUILD b/main/antiword/APKBUILD
deleted file mode 100644
index c16627021fa..00000000000
--- a/main/antiword/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Michael Mason <ms13sp@gmail.com>
-pkgname=antiword
-pkgver=0.37
-pkgrel=3
-pkgdesc="A free MS Word reader"
-url="http://www.winfield.demon.nl"
-arch="all"
-license="GPL-2.0"
-depends=""
-makedepends=""
-install=""
-subpackages=""
-source="http://www.winfield.demon.nl/linux/$pkgname-$pkgver.tar.gz
-	CVE-2014-8123.patch
-	"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	install -m755 -D "$srcdir"/"$pkgname-$pkgver"/$pkgname "$pkgdir"/usr/bin/$pkgname
-	mkdir -p "$pkgdir"/usr/share/antiword
-	install -m644 -D "$srcdir"/"$pkgname-$pkgver"/Resources/* "$pkgdir"/usr/share/antiword/
-}
-
-sha512sums="6cd8fb9137238417544cf8754829a2d5296055d730ea62a8a025236baa79516190317d146401ff40cde73e1ee2c3c374a2ea01b2e5d24e149310bcabb8bfdce8  antiword-0.37.tar.gz
-4e0714dc7b21ebd8e232656be576d05f0252bc0d7a7c10ec1511e479ef405a3627d4d14a08aac2c4481573654185492577f3376d3bc5ebf755e661a29c32a37c  CVE-2014-8123.patch"
diff --git a/main/antiword/CVE-2014-8123.patch b/main/antiword/CVE-2014-8123.patch
deleted file mode 100644
index 48a752bb644..00000000000
--- a/main/antiword/CVE-2014-8123.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a17e48746d7203f91a2c3bb1cdcbe9023c8d37a0 Mon Sep 17 00:00:00 2001
-From: Fabian Keil <fk () fabiankeil de>
-Date: Tue, 25 Nov 2014 18:58:52 +0100
-Subject: [PATCH] bGetPPS(): Prevent overflow of atPPSlist[].szName[]
-
----
- wordole.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/wordole.c b/wordole.c
-index 8a95fb9..7797d1f 100644
---- a/wordole.c
-+++ b/wordole.c
-@@ -259,6 +259,11 @@ bGetPPS(FILE *pFile,
- 		}
- 		tNameSize = (size_t)usGetWord(0x40, aucBytes);
- 		tNameSize = (tNameSize + 1) / 2;
-+		if (tNameSize >= sizeof(atPPSlist[0].szName)) {
-+			werr(0, "PPS %d appears to be invalid.", iIndex);
-+			atPPSlist = xfree(atPPSlist);
-+			return FALSE;
-+		}
- 		vName2String(atPPSlist[iIndex].szName, aucBytes, tNameSize);
- 		atPPSlist[iIndex].ucType = ucGetByte(0x42, aucBytes);
- 		if (atPPSlist[iIndex].ucType == 5) {
--- 
-2.1.2
-
diff --git a/main/aoetools/APKBUILD b/main/aoetools/APKBUILD
deleted file mode 100644
index 6d8476077cb..00000000000
--- a/main/aoetools/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: 
-# Maintainer: 
-pkgname=aoetools
-pkgver=37
-pkgrel=0
-pkgdesc="tools for managing the linux AoE driver"
-url="https://github.com/OpenAoE/aoetools"
-arch="all"
-license="GPL-2.0"
-depends=""
-makedepends="linux-headers"
-subpackages="$pkgname-doc"
-source="https://github.com/OpenAoE/$pkgname/archive/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgname-$pkgver"
-
-build() {
-	cd "$builddir"
-	make || return 1
-}
-
-package() {
-	cd "$builddir"
-	make PREFIX="$pkgdir" install || return 1
-}
-
-sha512sums="4ff8f48f20d5ce8fb795373eff959f827b2c829d71c5ac5e63bcc2102aa7205d20991b70766330eed83b13b9731486fb6db777df13ba682f65823f455421632e  aoetools-37.tar.gz"
diff --git a/main/aom/APKBUILD b/main/aom/APKBUILD
new file mode 100644
index 00000000000..d6abef214a3
--- /dev/null
+++ b/main/aom/APKBUILD
@@ -0,0 +1,66 @@
+# Contributor: Oleg Titov <oleg.titov@gmail.com>
+# Maintainer: Oleg Titov <oleg.titov@gmail.com>
+pkgname=aom
+pkgver=3.8.2
+pkgrel=0
+pkgdesc="Alliance for Open Media (AOM) AV1 codec SDK"
+url="https://aomedia.org/"
+arch="all"
+license="BSD-2-Clause AND custom"
+options="!check" # tests run for 5+ hours
+makedepends="
+	cmake
+	linux-headers
+	nasm
+	perl
+	python3
+	samurai
+	"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
+source="https://storage.googleapis.com/aom-releases/libaom-$pkgver.tar.gz
+	posix-implicit.patch
+	"
+builddir="$srcdir/libaom-$pkgver"
+
+# secfixes:
+#   3.1.1-r0:
+#     - CVE-2021-30473
+#     - CVE-2021-30474
+#     - CVE-2021-30475
+
+build() {
+	local _neon_opt=
+	case "$CARCH" in
+		armhf) _neon_opt="-DENABLE_NEON=OFF" ;;
+		armv7) _neon_opt="-DAOM_NEON_INTRIN_FLAG=-mfpu=neon" ;;
+	esac
+
+	cmake -B build -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DENABLE_TESTS="$(want_check && echo ON || echo OFF)" \
+		$_neon_opt
+	cmake --build build
+}
+
+check() {
+	local _testdata="$builddir"/test_data
+	mkdir -p $_testdata
+	export LIBAOM_TEST_DATA_PATH=$_testdata
+	ninja -C build testdata
+	ninja -C build runtests
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+
+	install -Dm 644 -t "$pkgdir"/usr/share/doc/"$pkgname"/ \
+		README.md LICENSE PATENTS
+}
+
+sha512sums="
+539cb86645f1675e3f2d45c7c10d5d66ef7d36eaddf0c2d50f1a532287c70f780c8ce6dd8959f4bb112fd74e2b63501652e8e1eba5d18bf03a926ad158f6cfb0  libaom-3.8.2.tar.gz
+14e241f4bf8f181c323cc7db16ea791e3a5ccf6f7f82b854b468f167e7f7210ab66cfacd85806693ba604c58e91ff6a45a5c49dc17a200d5fd65eb3788d397b5  posix-implicit.patch
+"
diff --git a/main/aom/posix-implicit.patch b/main/aom/posix-implicit.patch
new file mode 100644
index 00000000000..b295f41e909
--- /dev/null
+++ b/main/aom/posix-implicit.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/869419
+
+POSIX_C_SOURCE is needed for ftello.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -269,6 +269,7 @@ add_library(aom_rtcd OBJECT ${AOM_RTCD_SOURCES})
+ add_dependencies(aom_rtcd aom_version)
+ 
+ if(ENABLE_EXAMPLES)
++  add_definitions(-D_POSIX_C_SOURCE=200112L)
+   add_library(aom_encoder_stats OBJECT ${AOM_ENCODER_STATS_SOURCES})
+   set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_encoder_stats)
+ endif()
diff --git a/main/apache-mod-auth-kerb/APKBUILD b/main/apache-mod-auth-kerb/APKBUILD
index 98563329507..98dd4dff282 100644
--- a/main/apache-mod-auth-kerb/APKBUILD
+++ b/main/apache-mod-auth-kerb/APKBUILD
@@ -1,9 +1,9 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=apache-mod-auth-kerb
 _pkgname=mod_auth_kerb
 pkgver=5.4
-pkgrel=6
+pkgrel=9
 pkgdesc="A Kerberos authentication module for the Apache Http Server"
 url="https://sourceforge.net/projects/modauthkerb/"
 arch="all"
@@ -14,6 +14,9 @@ makedepends="apache2-dev krb5-dev"
 source="https://downloads.sourceforge.net/project/modauthkerb/mod_auth_kerb/mod_auth_kerb-$pkgver/mod_auth_kerb-$pkgver.tar.gz
 	mod_auth_kerb-5.4-httpd24.patch
 	mod_auth_kerb_compile.patch
+	krb5-1.18-fix.patch
+	mod_auth_kerb-5.4-rcopshack.patch
+	mod_auth_kerb-5.4-fixes.patch
 	mod-auth-kerb.conf
 	"
 builddir="$srcdir"/$_pkgname-$pkgver
@@ -39,4 +42,7 @@ package() {
 sha512sums="93fdf0e43af1c24e8c8204d09240b708747068ef99dd8d21b45cb4d132d31e6d582d49ea5e23b905f55cb0d4a20b1ecb58de1bcbfdad1d016e536fc622b63214  mod_auth_kerb-5.4.tar.gz
 fb7c8b18adce99c1bd200a8c1dd7794d0ecee49aa6308180b03537be160ea4426150f1421be9e2462f036296fbd220aa823a2689023899c66817baea8416aad9  mod_auth_kerb-5.4-httpd24.patch
 f8fd9cce15593592995a53374a7dbbf6171c4f5e9e82d5bf59953fcfa6fa81cf6890ec4c9ddc2e0963060ea34e98b590f037b1f0274c284085350e6bc4792748  mod_auth_kerb_compile.patch
+f375dd027eb4b2094a39d321379dade5449a6daac0306eae9bc517344df4e5e65b59ba7b84617df328b00141740da5e515d3f20a448100ee1d95aab9f60e1152  krb5-1.18-fix.patch
+4da4e51baec036fdf035ee6f215453129b4b93a7733887834c08c0c5a7610ebe8e0981ad34a5cd5ed86af58c926bd65417fe09f64ce42d56b41e5051b96f6ca5  mod_auth_kerb-5.4-rcopshack.patch
+4881deb0accbd1ebff88a210036f2c66d443625727580ca25a8a403a96a8fa39edc2a01769584a474d1a1dbf028438a754319c3e318b2bef9114db754d542112  mod_auth_kerb-5.4-fixes.patch
 b6cfa12dbfd37f98de4d5b23f16462efbfa394d4e9dd6a15772aa18fbec0704c3d9f6e5d242d501a8f1c3091abf893de261115ee54ea31d9d9e0a4d1724473a4  mod-auth-kerb.conf"
diff --git a/main/apache-mod-auth-kerb/krb5-1.18-fix.patch b/main/apache-mod-auth-kerb/krb5-1.18-fix.patch
new file mode 100644
index 00000000000..304a35b90f4
--- /dev/null
+++ b/main/apache-mod-auth-kerb/krb5-1.18-fix.patch
@@ -0,0 +1,35 @@
+--- ./src/mod_auth_kerb.c.org	2020-08-10 17:36:11.563228638 +0200
++++ ./src/mod_auth_kerb.c	2020-08-10 17:53:14.641734908 +0200
+@@ -2070,12 +2070,11 @@
+    ret = krb5_init_context(&context);
+    if (ret)
+       return 0;
+-
+-   ret = krb5_rc_resolve_full(context, &id, "none:");
++extern krb5_error_code
++    k5_rc_resolve(krb5_context context, const char *name, krb5_rcache *rc_out);
++   ret = k5_rc_resolve(context, "none:", &id);
+    found = (ret == 0);
+ 
+-   if (ret == 0)
+-      krb5_rc_destroy(context, id);
+    krb5_free_context(context);
+ 
+    return found;
+
+diff -ruN mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c mod_auth_kerb-5.4/src/mod_auth_kerb.c
+--- mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c  2018-12-12 16:59:43.762013269 +0100
++++ mod_auth_kerb-5.4/src/mod_auth_kerb.c       2018-12-12 16:59:59.151945123 +0100
+@@ -799,11 +799,9 @@
+                    "failed to verify krb5 credentials: %s",
+                          krb5_get_err_text(context, ret));
+          krb5_kt_end_seq_get(context, keytab, &cursor);
+-         krb5_kt_close(context, keytab);
+          goto end;
+        }
+        krb5_kt_end_seq_get(context, keytab, &cursor);
+-       krb5_kt_close(context, keytab);
+      }
+      else {
+        if ((ret = verify_krb5_init_creds(r, context, &creds, server, keytab))) {
+
diff --git a/main/apache-mod-auth-kerb/mod_auth_kerb-5.4-fixes.patch b/main/apache-mod-auth-kerb/mod_auth_kerb-5.4-fixes.patch
new file mode 100644
index 00000000000..b86be697ae0
--- /dev/null
+++ b/main/apache-mod-auth-kerb/mod_auth_kerb-5.4-fixes.patch
@@ -0,0 +1,40 @@
+
+Compiler warning fixes.
+
+--- mod_auth_kerb-5.4/src/mod_auth_kerb.c.fixes
++++ mod_auth_kerb-5.4/src/mod_auth_kerb.c
+@@ -677,7 +677,8 @@ end:
+ static krb5_error_code
+ verify_krb5_user(request_rec *r, krb5_context context, krb5_principal principal,
+       		 const char *password, krb5_principal server,
+-		 krb5_keytab keytab, int krb_verify_kdc, char *krb_service_name, krb5_ccache *ccache)
++		 krb5_keytab keytab, int krb_verify_kdc, 
++                 const char *krb_service_name, krb5_ccache *ccache)
+ {
+    krb5_creds creds;
+    krb5_get_init_creds_opt options;
+@@ -1280,6 +1281,7 @@ get_gss_creds(request_rec *r,
+    return 0;
+ }
+ 
++#ifndef GSSAPI_SUPPORTS_SPNEGO
+ static int
+ cmp_gss_type(gss_buffer_t token, gss_OID oid)
+ {
+@@ -1306,6 +1308,7 @@ cmp_gss_type(gss_buffer_t token, gss_OID
+ 
+    return memcmp(p, oid->elements, oid->length);
+ }
++#endif
+ 
+ static int
+ authenticate_user_gss(request_rec *r, kerb_auth_config *conf,
+@@ -1722,7 +1725,7 @@ kerb_authenticate_user(request_rec *r)
+    return ret;
+ }
+ 
+-int
++static int
+ have_rcache_type(const char *type)
+ {
+    krb5_error_code ret;
diff --git a/main/apache-mod-auth-kerb/mod_auth_kerb-5.4-rcopshack.patch b/main/apache-mod-auth-kerb/mod_auth_kerb-5.4-rcopshack.patch
new file mode 100644
index 00000000000..abbf4dba47b
--- /dev/null
+++ b/main/apache-mod-auth-kerb/mod_auth_kerb-5.4-rcopshack.patch
@@ -0,0 +1,73 @@
+
+Remove the Krb5 1.3.x-specific hack which mucks about with
+libkrb5 internals, and shouldn't.
+
+--- mod_auth_kerb-5.4/src/mod_auth_kerb.c.rcopshack
++++ mod_auth_kerb-5.4/src/mod_auth_kerb.c
+@@ -285,34 +285,6 @@ mkstemp(char *template)
+ }
+ #endif
+ 
+-#if defined(KRB5) && !defined(HEIMDAL)
+-/* Needed to work around problems with replay caches */
+-#include "mit-internals.h"
+-
+-/* This is our replacement krb5_rc_store function */
+-static krb5_error_code KRB5_LIB_FUNCTION
+-mod_auth_kerb_rc_store(krb5_context context, krb5_rcache rcache,
+-                       krb5_donot_replay_internal *donot_replay)
+-{
+-   return 0;
+-}
+-
+-/* And this is the operations vector for our replay cache */
+-const krb5_rc_ops_internal mod_auth_kerb_rc_ops = {
+-  0,
+-  "dfl",
+-  krb5_rc_dfl_init,
+-  krb5_rc_dfl_recover,
+-  krb5_rc_dfl_destroy,
+-  krb5_rc_dfl_close,
+-  mod_auth_kerb_rc_store,
+-  krb5_rc_dfl_expunge,
+-  krb5_rc_dfl_get_span,
+-  krb5_rc_dfl_get_name,
+-  krb5_rc_dfl_resolve
+-};
+-#endif
+-
+ /*************************************************************************** 
+  Auth Configuration Initialization
+  ***************************************************************************/
+@@ -1252,31 +1224,6 @@ get_gss_creds(request_rec *r,
+       return HTTP_INTERNAL_SERVER_ERROR;
+    }
+ 
+-#ifndef HEIMDAL
+-   /*
+-    * With MIT Kerberos 5 1.3.x the gss_cred_id_t is the same as
+-    * krb5_gss_cred_id_t and krb5_gss_cred_id_rec contains a pointer to
+-    * the replay cache.
+-    * This allows us to override the replay cache function vector with
+-    * our own one.
+-    * Note that this is a dirty hack to get things working and there may
+-    * well be unknown side-effects.
+-    */
+-   {
+-      krb5_gss_cred_id_t gss_creds = (krb5_gss_cred_id_t) *server_creds;
+-
+-      /* First we try to verify we are linked with 1.3.x to prevent from
+-         crashing when linked with 1.4.x */
+-      if (gss_creds && (gss_creds->usage == GSS_C_ACCEPT)) {
+-	 if (gss_creds->rcache && gss_creds->rcache->ops &&
+-	     gss_creds->rcache->ops->type &&  
+-	     memcmp(gss_creds->rcache->ops->type, "dfl", 3) == 0)
+-          /* Override the rcache operations */
+-	 gss_creds->rcache->ops = &mod_auth_kerb_rc_ops;
+-      }
+-   }
+-#endif
+-   
+    return 0;
+ }
+ 
diff --git a/main/apache-mod-auth-ntlm-winbind/APKBUILD b/main/apache-mod-auth-ntlm-winbind/APKBUILD
index 8685a24c3a4..628443ee3db 100644
--- a/main/apache-mod-auth-ntlm-winbind/APKBUILD
+++ b/main/apache-mod-auth-ntlm-winbind/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Jeff Bilyk <jbilyk@gmail.com>
-# Maintainer: Natanael Copa <natanael.copa@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apache-mod-auth-ntlm-winbind
 pkgver=0.1
-pkgrel=6
+pkgrel=9
 pkgdesc="Authentication module for Apache using NTLM protocol with winbind helper"
 url="http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/"
 arch="all"
@@ -10,19 +10,20 @@ license="Apache-2.0"
 depends="apache2 samba samba-winbind"
 makedepends="autoconf apache2-dev apr-util-dev apr-dev"
 source="http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/mod_auth_ntlm_winbind.c
-http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/configure.in
-http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/Makefile.in
-mod-auth-ntlm-winbind.conf"
+	http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/configure.in
+	http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/Makefile.in
+	mod-auth-ntlm-winbind.conf
+	"
+builddir="$srcdir"
+options="!check"
 
 build() {
-	cd "$srcdir"
 	autoconf
 	./configure
-	make DESTDIR="$pkgdir" || return 1
+	make DESTDIR="$pkgdir"
 }
 
 package() {
-	cd "$srcdir"
 	mkdir -p "$pkgdir"/etc/apache2/conf.d
 	mkdir -p "$pkgdir"/usr/lib/apache2
 	install mod-auth-ntlm-winbind.conf "$pkgdir"/etc/apache2/conf.d/mod-auth-ntlm-winbind.conf
diff --git a/main/apache-mod-auth-radius/APKBUILD b/main/apache-mod-auth-radius/APKBUILD
index a0e2a4c6cb9..af40c456228 100644
--- a/main/apache-mod-auth-radius/APKBUILD
+++ b/main/apache-mod-auth-radius/APKBUILD
@@ -3,16 +3,15 @@
 pkgname=apache-mod-auth-radius
 _pkgname=mod_auth_radius
 pkgver=1.6.0
-pkgrel=0
+pkgrel=3
 pkgdesc="Apache authentication module to become RADIUS client for AAA requests"
 url="http://freeradius.org/mod_auth_radius/"
 arch="all"
-license="BSD"
+license="Apache-1.0"
 depends="apache2"
 makedepends="apache2-dev freeradius-dev"
-install=""
 options="!check"
-source="$pkgname_$pkgver.tar.gz::https://github.com/FreeRADIUS/mod_auth_radius/archive/v$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/FreeRADIUS/mod_auth_radius/archive/v$pkgver.tar.gz
 	mod-auth-radius.conf"
 builddir="$srcdir"/$_pkgname-$pkgver
 
@@ -28,5 +27,7 @@ package() {
 	install -D -m644 ../../mod-auth-radius.conf "$pkgdir"/etc/apache2/conf.d/mod-auth-radius.conf
 }
 
-sha512sums="e128855ab198b35030b798c16538fa33c1698f0f179fccb0d160c2d2cce08f1a7b2ecfaefdc19ae7f21802d38705b7a08414444ac52041b7365a5633e5e66159  1.6.0.tar.gz
-f5f8bb154e290c4f1d1af899b24ee2011d8fe88fbf31a3fd865e9dfd9927cc8e23cb022be996ec3c43ed79309814ad63efe7f3cd5b3ed670d23a572b3e561f54  mod-auth-radius.conf"
+sha512sums="
+e128855ab198b35030b798c16538fa33c1698f0f179fccb0d160c2d2cce08f1a7b2ecfaefdc19ae7f21802d38705b7a08414444ac52041b7365a5633e5e66159  apache-mod-auth-radius-1.6.0.tar.gz
+f5f8bb154e290c4f1d1af899b24ee2011d8fe88fbf31a3fd865e9dfd9927cc8e23cb022be996ec3c43ed79309814ad63efe7f3cd5b3ed670d23a572b3e561f54  mod-auth-radius.conf
+"
diff --git a/main/apache-mod-fcgid/APKBUILD b/main/apache-mod-fcgid/APKBUILD
index a1eaf4eb3d4..3433067e3d4 100644
--- a/main/apache-mod-fcgid/APKBUILD
+++ b/main/apache-mod-fcgid/APKBUILD
@@ -1,35 +1,35 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=apache-mod-fcgid
 _pkgreal=mod_fcgid
 pkgver=2.3.9
-pkgrel=2
+pkgrel=5
 pkgdesc="FastCGI module for Apache 2.x"
-url="http://httpd.apache.org/$_pkgreal/"
+url="https://httpd.apache.org/mod_fcgid/"
 arch="all"
 license="Apache-2.0"
 depends="apache2"
 makedepends="apache2-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://www.apache.org/dist/httpd/mod_fcgid/$_pkgreal-$pkgver.tar.gz
-        $_pkgreal.conf
-        "
+	$_pkgreal.conf
+	"
+builddir="$srcdir"/$_pkgreal-$pkgver
+options="!check"
 
-_builddir="$srcdir"/$_pkgreal-$pkgver
 build() {
-	cd "$_builddir"
-	./configure.apxs || return 1
-	make || return 1
+	./configure.apxs
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	install -d "$pkgdir"/var/www/localhost/fcgi-bin || return 1
+	make DESTDIR="$pkgdir" install
+	install -d "$pkgdir"/var/www/localhost/fcgi-bin
 	install -Dm644 "$srcdir"/$_pkgreal.conf "$pkgdir"/etc/apache2/conf.d/$_pkgreal.conf
 	rm -fr "$pkgdir"/etc/apache2/original
 }
 
-sha512sums="cae8bf8ad324512a51e6f34cb32468ea49a17deaabd481f8b581444891656f2516f10d198630f92ebc18db3d575f61dd7254153938a8206fb6c1441c7850be63  mod_fcgid-2.3.9.tar.gz
-e5d7d81905f7cd73b5dbd3baa39c1d84e3c96e3fc3fda41fc52ada1a4353ca5186e53f56d782273d86a858cc9215c72321f34d92643ac176d4232df638a05812  mod_fcgid.conf"
+sha512sums="
+cae8bf8ad324512a51e6f34cb32468ea49a17deaabd481f8b581444891656f2516f10d198630f92ebc18db3d575f61dd7254153938a8206fb6c1441c7850be63  mod_fcgid-2.3.9.tar.gz
+e5d7d81905f7cd73b5dbd3baa39c1d84e3c96e3fc3fda41fc52ada1a4353ca5186e53f56d782273d86a858cc9215c72321f34d92643ac176d4232df638a05812  mod_fcgid.conf
+"
diff --git a/main/apache2-mod-wsgi/APKBUILD b/main/apache2-mod-wsgi/APKBUILD
index 5f6fabb86e3..addb41c5371 100644
--- a/main/apache2-mod-wsgi/APKBUILD
+++ b/main/apache2-mod-wsgi/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=apache2-mod-wsgi
 _realname=mod_wsgi
-pkgver=4.7.1
-pkgrel=0
+pkgver=5.0.0
+pkgrel=1
 pkgdesc="Python WSGI Module for Apache2"
 url="https://github.com/GrahamDumpleton/mod_wsgi"
 arch="all"
@@ -32,5 +32,7 @@ package() {
 		"$pkgdir"/usr/share/doc/$pkgname/LICENSE
 }
 
-sha512sums="cbb5ec53d55e47a83f2b0630527c6a52b48ef21d5d2c18adcb875fc455795b39b3c93f4a86dfbf9738c0bd554d86cc4912cc9ff83c428af302ab94a61f66b5b4  apache2-mod-wsgi-4.7.1.tar.gz
-5b36a458bd3539e58ea61ec405c4f5c5e0001a644263b0e1f8421a5c7fc7884b6df1355674a9d9b610780b5e9db6ce66d0ae1bbc0e512ecb027c3757209152c8  apache2-mod-wsgi.apache2.conf"
+sha512sums="
+3ecc3ad2fd05164929915541be61201db8d35d1e27183ce26c67583b836bb404bd10c88a2ada94714a14140a7f885eb67256cf02bf47aa0dbd81aecd0894a984  apache2-mod-wsgi-5.0.0.tar.gz
+5b36a458bd3539e58ea61ec405c4f5c5e0001a644263b0e1f8421a5c7fc7884b6df1355674a9d9b610780b5e9db6ce66d0ae1bbc0e512ecb027c3757209152c8  apache2-mod-wsgi.apache2.conf
+"
diff --git a/main/apache2-mod-wsgi/apache2-mod-wsgi.post-install b/main/apache2-mod-wsgi/apache2-mod-wsgi.post-install
index 327b0156b9d..3f849f7e049 100644
--- a/main/apache2-mod-wsgi/apache2-mod-wsgi.post-install
+++ b/main/apache2-mod-wsgi/apache2-mod-wsgi.post-install
@@ -1,10 +1,12 @@
 #!/bin/sh
 
-echo "*" >&2
-echo "* To finish installing apache2-mod-wsgi:" >&2
-echo "*     1) See if you need to modify the apache2 config:" >&2
-echo "*            /etc/apache2/conf.d/wsgi-module.conf" >&2
-echo "*     2) Restart apache2 when done." >&2
-echo "*" >&2
+cat <<EOF >&2
+*
+* To finish installing apache2-mod-wsgi:
+*     1) See if you need to modify the apache2 config:
+*            /etc/apache2/conf.d/wsgi-module.conf
+*     2) Restart apache2 when done.
+*
+EOF
 
 exit 0
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index b067ad7fb90..5bec2c9ed4a 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -1,33 +1,46 @@
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 pkgname=apache2
 _pkgreal=httpd
-pkgver=2.4.41
+pkgver=2.4.59
 pkgrel=0
 pkgdesc="A high performance Unix-based HTTP server"
 url="https://httpd.apache.org/"
 arch="all"
 license="Apache-2.0"
-depends=""
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 pkgusers="apache"
 pkggroups="apache"
-makedepends="apr-dev apr-util-dev autoconf automake libxml2-dev lua-dev
-             nghttp2-dev openssl-dev pcre-dev sed zlib-dev"
+makedepends="
+	apr-dev
+	apr-util-dev
+	autoconf
+	automake
+	brotli-dev
+	libxml2-dev
+	lua-dev
+	nghttp2-dev
+	openssl-dev
+	pcre2-dev
+	sed
+	zlib-dev
+	"
 subpackages="$pkgname-ctl
-             $pkgname-dev
-             $pkgname-doc
-             $pkgname-error:_error:noarch
-             $pkgname-http2
-             $pkgname-icons::noarch
-             $pkgname-ldap
-             $pkgname-lua:_lua
-             $pkgname-proxy-html:proxy_html
-             $pkgname-proxy
-             $pkgname-ssl
-             $pkgname-utils
-             $pkgname-webdav"
-source="https://archive.apache.org/dist/$_pkgreal/$_pkgreal-$pkgver.tar.bz2
+	$pkgname-error:_error:noarch
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-openrc
+	$pkgname-brotli
+	$pkgname-http2
+	$pkgname-icons::noarch
+	$pkgname-ldap
+	$pkgname-lua:_lua
+	$pkgname-proxy-html:proxy_html
+	$pkgname-proxy
+	$pkgname-ssl
+	$pkgname-utils
+	$pkgname-webdav"
+source="https://dlcdn.apache.org/$_pkgreal/$_pkgreal-$pkgver.tar.bz2
 	apache2.confd
 	apache2.logrotate
 	apache2.initd
@@ -46,11 +59,70 @@ source="https://archive.apache.org/dist/$_pkgreal/$_pkgreal-$pkgver.tar.bz2
 	conf/0012-httpd.conf-MIMEMagicFile.patch
 	conf/0013-httpd-.conf-IfModule.patch
 	conf/0014-httpd-.conf-LoadModule.patch
+	fix-unknown-xmlChar-error.patch
 	"
-options="suid"
+options="suid !check"
 builddir="$srcdir"/$_pkgreal-$pkgver
 
 # secfixes:
+#   2.4.59-r0:
+#     - CVE-2023-38709
+#     - CVE-2024-24795
+#     - CVE-2024-27316
+#   2.4.58-r0:
+#     - CVE-2023-45802
+#     - CVE-2023-43622
+#     - CVE-2023-31122
+#   2.4.56-r0:
+#     - CVE-2023-25690
+#     - CVE-2023-27522
+#   2.4.55-r0:
+#     - CVE-2022-36760
+#     - CVE-2022-37436
+#   2.4.54-r0:
+#     - CVE-2022-26377
+#     - CVE-2022-28330
+#     - CVE-2022-28614
+#     - CVE-2022-28615
+#     - CVE-2022-29404
+#     - CVE-2022-30522
+#     - CVE-2022-30556
+#     - CVE-2022-31813
+#   2.4.53-r0:
+#     - CVE-2022-22719
+#     - CVE-2022-22720
+#     - CVE-2022-22721
+#     - CVE-2022-23943
+#   2.4.52-r0:
+#     - CVE-2021-44224
+#     - CVE-2021-44790
+#   2.4.51-r0:
+#     - CVE-2021-42013
+#   2.4.50-r0:
+#     - CVE-2021-41524
+#     - CVE-2021-41773
+#   2.4.49-r0:
+#     - CVE-2021-40438
+#     - CVE-2021-39275
+#     - CVE-2021-36160
+#     - CVE-2021-34798
+#     - CVE-2021-33193
+#   2.4.48-r0:
+#     - CVE-2019-17657
+#     - CVE-2020-13938
+#     - CVE-2020-13950
+#     - CVE-2020-35452
+#     - CVE-2021-26690
+#     - CVE-2021-26691
+#     - CVE-2021-30641
+#     - CVE-2021-31618
+#   2.4.46-r0:
+#     - CVE-2020-9490
+#     - CVE-2020-11984
+#     - CVE-2020-11993
+#   2.4.43-r0:
+#     - CVE-2020-1927
+#     - CVE-2020-1934
 #   2.4.41-r0:
 #     - CVE-2019-9517
 #     - CVE-2019-10081
@@ -92,19 +164,12 @@ builddir="$srcdir"/$_pkgreal-$pkgver
 #     - CVE-2017-7679
 
 prepare() {
-	cd "$builddir"
-
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$(basename $i);;
-		esac
-	done
+	default_prepare
 
 	cat "$srcdir/alpine.layout" >> config.layout
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--prefix=/usr \
 		--enable-layout=Alpine \
@@ -149,7 +214,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 
 	# config
@@ -158,7 +222,7 @@ package() {
 	mv "$pkgdir"/etc/apache2/extra "$pkgdir"/etc/apache2/conf.d
 	for file in "$pkgdir"/etc/apache2/conf.d/httpd-*; do
 		mv "$file" \
-			"$(dirname $file)/${file#$pkgdir/etc/apache2/conf.d/httpd-}"
+			"$(dirname $file)/${file#"$pkgdir"/etc/apache2/conf.d/httpd-}"
 	done
 	sed -Ei \
 		's:^(\t?#?LoadModule .+ )lib/apache2/:\1modules/:;ta;b;:a;s/^#?LoadModule (dav.*|lbmethod_.+|.*ldap|lua|proxy.*|ssl|xml2enc)_module //;tb;b;:b;d' \
@@ -204,7 +268,7 @@ _mv_conf() {
 _load_mod() {
 	_make_conf_dir
 	echo "LoadModule $1_module modules/mod_$1.so" >> \
-		"$_conf_dir"/${subpkgname#$pkgname-}.conf
+		"$_conf_dir"/${subpkgname#"$pkgname"-}.conf
 }
 
 _load_mods() {
@@ -227,7 +291,6 @@ dev() {
 	mv "$pkgdir"/usr/bin/apxs \
 		"$subpkgdir"/usr/bin/apxs
 
-
 	install -d "$subpkgdir"/usr/share/apache2
 	mv "$pkgdir"/usr/share/apache2/build \
 		"$subpkgdir"/usr/share/apache2/
@@ -245,8 +308,18 @@ _error() {
 	_mv_conf multilang-errordoc
 }
 
+brotli() {
+	pkgdesc="Brotli content compression for the Apache HTTP Server"
+	depends="apache2"
+	install -d "$subpkgdir"/usr/lib/apache2
+	mv "$pkgdir"/usr/lib/apache2/mod_brotli.so \
+		"$subpkgdir"/usr/lib/apache2
+	_load_mods
+}
+
 http2() {
 	pkgdesc="HTTP/2 transport layer for the Apache HTTP Server"
+	depends="apache2"
 	install -d "$subpkgdir"/usr/lib/apache2
 	mv "$pkgdir"/usr/lib/apache2/mod_http2.so \
 		"$subpkgdir"/usr/lib/apache2
@@ -282,7 +355,7 @@ ctl() {
 ssl() {
 	pkgdesc="SSL/TLS module for the Apache HTTP Server"
 	install="apache2-ssl.post-install"
-	depends="apache2 openssl"
+	depends="apache2 openssl>3"
 
 	install -d "$subpkgdir"/usr/lib/apache2
 	mv "$pkgdir"/usr/lib/apache2/mod_ssl.so \
@@ -344,7 +417,9 @@ _lua() {
 		"$subpkgdir"/usr/lib/apache2/
 	_load_mods
 }
-sha512sums="350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335  httpd-2.4.41.tar.bz2
+
+sha512sums="
+209da0bbac5e2564d4590302515b35495be6402273ff4024aa93e85e44554c95e053201d606383936425a41e1b5b97e6b40055dcbb385eb691a5029a6f3158c2  httpd-2.4.59.tar.bz2
 8e62b101f90c67babe864bcb74f711656180b011df3fd4b541dc766b980b72aa409e86debf3559a55be359471c1cad81b8779ef3a55add8d368229fc7e9544fc  apache2.confd
 18e8859c7d99c4483792a5fd20127873aad8fa396cafbdb6f2c4253451ffe7a1093a3859ce719375e0769739c93704c88897bd087c63e1ef585e26dcc1f5dd9b  apache2.logrotate
 81a2d2a297d8049ba1b021b879ec863767149e056d9bdb2ac8acf63572b254935ec96c2e1580eba86639ea56433eec5c41341e4f1501f9072745dccdb3602701  apache2.initd
@@ -362,4 +437,6 @@ a3936713f8ffcbf2bb633035873249b94fa8ace9fdb758405264f075f755fbcfec4d08794f79e469
 eb09b3bcbab70f6a48d5efe8fc4bd62cc2b3f46def97c09d8454b846a065c02d18bd846313c421897c8d13be728e4b2ca790e2a5c5c6add3821d9e572bacfab2  0011-httpd.conf-IncludeOptional.patch
 695742f569720d7bad9306acc40456de3a12ff2ff3a108499afc3fed2e8b13883027c6e14a3fac3efe387a70386b958605b5bbfd0147ec06bb87fad30f3b66fa  0012-httpd.conf-MIMEMagicFile.patch
 efbba3c3475bebe5c63ce8d6eaf153cf2c46188e282a65830571c8b7dbc1e657ab9ce160dc82e331097ac483fe632f5201fde6f3f5de32fe5c52dcc7dee66216  0013-httpd-.conf-IfModule.patch
-56e7bb9743d153416b15c32bb5435e4cf85d84204a02f28767c8dcba08eec1ac302521d57ce74154d3e9f7a3644ab3f8a9318150e21f8559eb67e387087a0821  0014-httpd-.conf-LoadModule.patch"
+223b0c3f141977fa4e249bcf09b3b2449d6cc9ebbad50621a6b2bd5d3b661fcf0369ece4e2055792bbcddac68f323a19f0f9dc893237676a244e03dc4260958e  0014-httpd-.conf-LoadModule.patch
+ca3165e5802a25c271cbc15569b3dcda71b141cce6d91b803d23ba08d99e957d6bd0782d40dfbc913ef714aefff1263ad420663bf2dc693b15e73c6ee8e70575  fix-unknown-xmlChar-error.patch
+"
diff --git a/main/apache2/conf/0014-httpd-.conf-LoadModule.patch b/main/apache2/conf/0014-httpd-.conf-LoadModule.patch
index 6d34deb5015..8ee0a53b010 100644
--- a/main/apache2/conf/0014-httpd-.conf-LoadModule.patch
+++ b/main/apache2/conf/0014-httpd-.conf-LoadModule.patch
@@ -48,7 +48,7 @@ index 683a091..0648e8e 100644
 -# LoadFile	/usr/lib/libxml2.so
 -# LoadModule	proxy_html_module	modules/mod_proxy_html.so
 -# LoadModule	xml2enc_module		modules/mod_xml2enc.so
-+LoadFile	/usr/lib/libxml2.so
++LoadFile	/usr/lib/libxml2.so.2
 +LoadModule	proxy_html_module	modules/mod_proxy_html.so
 +LoadModule	xml2enc_module		modules/mod_xml2enc.so
  #
diff --git a/main/apache2/fix-unknown-xmlChar-error.patch b/main/apache2/fix-unknown-xmlChar-error.patch
new file mode 100644
index 00000000000..cc9cf8a7109
--- /dev/null
+++ b/main/apache2/fix-unknown-xmlChar-error.patch
@@ -0,0 +1,13 @@
+diff --git a/modules/filters/mod_xml2enc.c b/modules/filters/mod_xml2enc.c
+index 76046b4..f5b3cc7 100644
+--- a/modules/filters/mod_xml2enc.c
++++ b/modules/filters/mod_xml2enc.c
+@@ -36,6 +36,7 @@
+ 
+ /* libxml2 */
+ #include <libxml/encoding.h>
++#include <libxml/xmlstring.h>
+ 
+ #if defined(__clang__)
+ #pragma clang diagnostic pop
+
diff --git a/main/apcupsd/APKBUILD b/main/apcupsd/APKBUILD
index b758c08be71..f79bd1493dc 100644
--- a/main/apcupsd/APKBUILD
+++ b/main/apcupsd/APKBUILD
@@ -1,31 +1,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apcupsd
 pkgver=3.14.14
-pkgrel=1
+pkgrel=6
 pkgdesc="A Daemon to control APC UPSes"
 subpackages="$pkgname-doc $pkgname-webif $pkgname-openrc"
 url="http://www.apcupsd.org"
 arch="all"
-license="GPL-2.0-only"
+license="GPL-2.0-or-later"
 depends="util-linux"
-makedepends="net-snmp-dev man linux-headers gd-dev libusb-compat-dev"
+makedepends="net-snmp-dev linux-headers gd-dev libusb-compat-dev"
 options="!check" # no test suite included
 source="https://sourceforge.net/projects/apcupsd/files/apcupsd%20-%20Stable/$pkgver/apcupsd-$pkgver.tar.gz
 	apcupsd.initd
+	apcupsd.powerfail.initd
 	apcupsd-alpine.patch
 	"
 
-_builddir="$srcdir/$pkgname-$pkgver"
-
 prepare() {
-	cd "$_builddir"
 	update_config_sub
 	default_prepare
 }
 
 build() {
-	cd "$_builddir"
-
 	export CHARSET="ISO8859-1"
 	export LANG="C"
 
@@ -43,17 +39,18 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR=$pkgdir install
 	install -D -m755 "$srcdir"/apcupsd.initd "$pkgdir"/etc/init.d/apcupsd
+	install -D -m755 "$srcdir"/apcupsd.powerfail.initd \
+		"$pkgdir"/etc/init.d/apcupsd.powerfail
 }
 
 webif() {
-	cd "$_builddir"
 	mkdir -p "$subpkgdir"/usr/share/webapps/apcupsd
 	mv "$pkgdir"/etc/apcupsd/*.cgi "$subpkgdir"/usr/share/webapps/apcupsd
 }
 
 sha512sums="c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f  apcupsd-3.14.14.tar.gz
-cd9cb3c812dfd72660007807965cac866dfb2ce4bd8200668f08e94fdcce874cce2ec87a0d832b8f37f254908d093aff0cc2db26e9403d5e613dc192072da617  apcupsd.initd
+82bff9001e86e2eb082e0bdebce69563458bb9e864f6f70622aa7d173d5134522f295b7f2496a9ef74aa6075e52026f714810c49a866026ee834acb8adbb3c70  apcupsd.initd
+8d1c266bd86cd1cdf4fccdd171a877957bf5e26e1bb8c20e4c9c6b362a63d8cc1b887a1661939e4e56228a8d23dfc81fe782806b5d1527423c2ef7872cbeb881  apcupsd.powerfail.initd
 4f0712519213c4ef14f41eeef681c5498fac7bf42f205de8a855938f8e834d9488d86820d7c883e89d0d305ee287e17e2d321dbbc98ae12f8487bf58aa0d4a6b  apcupsd-alpine.patch"
diff --git a/main/apcupsd/apcupsd.initd b/main/apcupsd/apcupsd.initd
index 67b1138de94..ab9595fa708 100644
--- a/main/apcupsd/apcupsd.initd
+++ b/main/apcupsd/apcupsd.initd
@@ -15,6 +15,7 @@ depend() {
 
 start() {
 	rm -f /etc/apcupsd/powerfail
+	rm -f /etc/nologin
 
 	export SERVICE="${SVCNAME}"
 
diff --git a/main/apcupsd/apcupsd.powerfail.initd b/main/apcupsd/apcupsd.powerfail.initd
new file mode 100644
index 00000000000..cd7a1e9210b
--- /dev/null
+++ b/main/apcupsd/apcupsd.powerfail.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description='Signal the UPS to kill power in a power failure condition'
+
+depend() {
+	need mount-ro
+}
+
+start() {
+	if [ "$RC_RUNLEVEL" = "shutdown" -a -f /etc/apcupsd/powerfail ] ; then
+		ebegin 'Signaling UPS to kill power'
+		/sbin/apcupsd --killpower
+		eend $?
+	fi
+}
diff --git a/main/apg/APKBUILD b/main/apg/APKBUILD
index 209509a2b76..6011e20a9e6 100644
--- a/main/apg/APKBUILD
+++ b/main/apg/APKBUILD
@@ -1,26 +1,25 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apg
 pkgver=2.2.3
-pkgrel=5
+pkgrel=7
 pkgdesc="Automated Password Generator."
 url="https://linux.die.net/man/1/apg" # Original homepage is dead
 arch="all"
 license="BSD-3-Clause"
 # no check provided by upstream
 options="!check"
-source="https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname}_${pkgver}.orig.tar.gz"
+subpackages="$pkgname-doc"
+source="https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname}_$pkgver.orig.tar.gz"
 
 build() {
-	cd "$builddir"
 	sed -i 's:^#\(CS_LIBS = -lnsl\)$:\1:' Makefile
 	make
 }
 
 package() {
-	cd "$builddir"
 	for i in apg apgbfm; do
 		install -D -m755 $i "$pkgdir"/usr/bin/$i
-		install -D -m644 doc/man/$i.1 "$pkgdir"/usr/man/man1/$i.1
+		install -D -m644 doc/man/$i.1 "$pkgdir"/usr/share/man/man1/$i.1
 	done
 }
 
diff --git a/main/api-sanity-checker/APKBUILD b/main/api-sanity-checker/APKBUILD
index dbdee62a9ca..33aea3a9ee9 100644
--- a/main/api-sanity-checker/APKBUILD
+++ b/main/api-sanity-checker/APKBUILD
@@ -2,18 +2,19 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=api-sanity-checker
 pkgver=1.98.7
-pkgrel=1
+pkgrel=4
 pkgdesc="A tool for creating automated test suites from any set of C sources"
 url="https://lvc.github.io/api-sanity-checker/"
 arch="noarch"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 depends="perl build-base"
 makedepends="perl-dev abi-compliance-checker"
 source="$pkgname-$pkgver.tar.gz::https://github.com/lvc/api-sanity-checker/archive/$pkgver.tar.gz"
+options="!check"
 
 package() {
 	mkdir -p "$pkgdir"/usr
-	perl Makefile.pl -install --prefix=/usr --destdir="$pkgdir"
+	perl Makefile.pl -install --destdir="$pkgdir"
 }
 
 sha512sums="fe88fa7c31b4914cc234efb5568b29a1dc0f21abf6cea7f3354b03e232c8ce205a7b86abc7613334cec60510154a75357363d7a6fc504a153f16a4ed2d59e019  api-sanity-checker-1.98.7.tar.gz"
diff --git a/main/apk-cron/APKBUILD b/main/apk-cron/APKBUILD
index abe3daea6d5..dfa933a8391 100644
--- a/main/apk-cron/APKBUILD
+++ b/main/apk-cron/APKBUILD
@@ -1,22 +1,22 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
 pkgname=apk-cron
 pkgver=1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Periodic software updates"
-url=https://git.alpinelinux.org/cgit/aports/tree/main/apk-cron
-arch=noarch
-license=GPL2
-depends=apk-tools
-source=apk
-options="!check"
+url="https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/main/apk-cron"
+arch="noarch"
+license="GPL-2.0-only"
+depends="apk-tools"
+source="apk"
+options="!check" # no test suite
 
 build() {
 	return
 }
 
 package() {
-	install -D -m 755 "$srcdir/apk" "$pkgdir/etc/periodic/daily/apk"
+	install -D -m 755 "$srcdir/apk" -t "$pkgdir"/etc/periodic/daily/
 }
 
-sha512sums="6efad227a5f7f3d4fc0f22496eb37e203e4090f348c9154e3e80ea385a0cfff8240fef1c72d401ae361d73c4bb11110363bfb9ce2c614a6f122989a690e5458b  apk"
+sha512sums="0d43c69b457f7c707aab91c7cbc00c9b6c61c78bcdb6c49a36f70b39c27da974d4906c86bbd8ae032ba80d7e1eb7d2dd9a2d57c9d89b2ea6cdbd4137856012f8  apk"
diff --git a/main/apk-cron/apk b/main/apk-cron/apk
index 83cf881b29f..117fcbff197 100644
--- a/main/apk-cron/apk
+++ b/main/apk-cron/apk
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# SPDX-License-Identifier: GPL-2.0-only
+#
 # cron job for automatic software updates
 # Copyright (c) 2014 Kaarle Ritvanen
 
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index db37f4721a6..8d91e7a456a 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,61 +1,72 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apk-tools
-pkgver=2.10.5
+pkgver=2.14.4
 pkgrel=0
 pkgdesc="Alpine Package Keeper - package manager for alpine"
-subpackages="$pkgname-static"
-makedepends_build="openssl"
+arch="all"
+url="https://gitlab.alpinelinux.org/alpine/apk-tools"
+license="GPL-2.0-only"
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-static $pkgname-doc $pkgname-zsh-completion"
+# Musl 1.2 introduced new ABI for time64 => upgrading apk-tools
+# while staying on musl <1.2 causes missing symbols
+# starting with musl 1.2.3_git (pre 1.2.3), we added DT_RELR
+# it is possible for old systems to upgrade, and apk-tools would upgrade first,
+# which would upgrade to a binary that cannot run until musl is upgraded.
+# forcing this constraint makes apk upgrade musl as part of the 'critical' transaction,
+# and update musl first.
+depends="musl>=1.2.3_git20230424"
+makedepends_build="openssl>3 lua5.3 lua5.3-lzlib scdoc"
 makedepends_host="zlib-dev openssl-dev zlib-static openssl-libs-static linux-headers"
 makedepends="$makedepends_build $makedepends_host"
+_lua="no"
 if [ "$CBUILD" = "$CHOST" ]; then
-	subpackages="$subpackages lua5.3-apk:luaapk"
-	makedepends="$makedepends lua5.3-dev"
+	_lua="lua5.3"
+	subpackages="$subpackages $_lua-apk:luaapk"
+	makedepends="$makedepends $_lua-dev"
+
+	# ca-certificates-bundle needed for https certificate validation
+	depends="$depends ca-certificates-bundle"
 fi
-source="https://dev.alpinelinux.org/archive/apk-tools/apk-tools-$pkgver.tar.xz
+source="https://gitlab.alpinelinux.org/alpine/apk-tools/-/archive/v$pkgver/apk-tools-v$pkgver.tar.gz
+	_apk
 	"
+builddir="$srcdir/$pkgname-v$pkgver"
 
-url="https://git.alpinelinux.org/cgit/apk-tools/"
-arch="all"
-license=GPL2
+# secfixes:
+#   2.12.6-r0:
+#     - CVE-2021-36159
+#   2.12.5-r0:
+#     - CVE-2021-30139
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 	sed -i -e 's:-Werror::' Make.rules
 	echo "FULL_VERSION=$pkgver-r$pkgrel" > config.mk
-	if [ "$CBUILD" = "$CHOST" ]; then
-		echo "LUAAPK=YesPlease" >> config.mk
-	else
-		echo "LUAAPK=" >> config.mk
-	fi
-	echo "export LUAAPK" >> config.mk
 }
 
 build() {
-	cd "$builddir"
-	make
-	make static
+	make LUA="$_lua"
+	make static LUA="$_lua"
 }
 
 check() {
-	cd "$builddir"
-	make check
+	make check LUA="$_lua"
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -d "$pkgdir"/var/lib/apk \
-		"$pkgdir"/var/cache/misc \
+	make DESTDIR="$pkgdir" LUA="$_lua" install
+	install -d "$pkgdir"/lib/apk/db \
+		"$pkgdir"/lib/apk/exec \
 		"$pkgdir"/etc/apk/keys \
 		"$pkgdir"/etc/apk/protected_paths.d
-	# the shipped README is empty
-	rm -r "$pkgdir"/usr/share/
+
+	install -Dm644 "$srcdir"/_apk "$pkgdir"/usr/share/zsh/site-functions/_apk
+	rm -r "$pkgdir"/usr/share/doc
 }
 
 static() {
 	pkgdesc="Alpine Package Keeper - static binary"
-	install -Dm755 "$srcdir"/$pkgname-$pkgver/src/apk.static \
+	install -Dm755 "$builddir"/src/apk.static \
 		"$subpkgdir"/sbin/apk.static
 
 	# lets sign the static binary so it can be vefified from distros
@@ -79,4 +90,7 @@ luaapk() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/
 }
 
-sha512sums="0f85ec7c734f2ffc671007fa029f3c96eacfb196c45e465e33aa65c32a6fbcd7523153b6441fdf826a5b4d2e66de02d338620474d333c28cb1ce0233f1120495  apk-tools-2.10.5.tar.xz"
+sha512sums="
+33aa67a1752e4188cd52a869df4bcf4e397bca082ce407e6ada3735621d56e17219c5c47e73ae90102bb0db2b6a479ff9da0466c5fd5e7dedfb903a74056592c  apk-tools-v2.14.4.tar.gz
+7870676720f5007eee9482786e02246f8e3474afb90e76c9c83aebe914747a8e007b5d2eed6441933f4922024b3f0664db270f21981ad6c2db877a110b0cd79e  _apk
+"
diff --git a/main/apk-tools/_apk b/main/apk-tools/_apk
new file mode 100644
index 00000000000..4b4a238fc61
--- /dev/null
+++ b/main/apk-tools/_apk
@@ -0,0 +1,268 @@
+#compdef apk
+
+function _apk {
+
+	local -a global_opts=(
+		"(-h --help)"{-h,--help}"[Print help information]"
+		"(-i --interactive)"{-i,--interactive}"[Ask confirmation before performing certain operations]"
+		"(-p --root)"{-p,--root}"[Manage file system at ROOT]"
+		"(-q --quiet)"{-q,--quiet}"[Print less information]"
+		"(-U --update-cache)"{-U,--update-cache}"[Alias for '--cache-max-age 1']"
+		"(-v --verbose)"{-v,--verbose}"[Print more information]"
+		"(-V --version)"{-V,--version}"[Print program version and exit]"
+		"(-X --repository)"{-X,--repository}"[Specify additional package repository]:repository:_host"
+		"--allow-untrusted[Install packages with untrusted signature or no signature]"
+		"--arch[Temporarily override architecture]:arch:(armhf mips64 s390x x86_64 x86 aarch64 ppc64le armv7 riscv64)"
+		"--cache-dir[Temporarily override the cache directory]:directory:_dir_list"
+		"--cache-max-age[Maximum age for index in cache before it's refreshed]:minutes"
+		"--force-binary-stdout[Continue even if binary data will be printed to the terminal]"
+		"--force-broken-world[Continue even if world cannot be satisfied]"
+		"--force-non-repository[Continue even if packages may be lost on reboot]"
+		"--force-old-apk[Continue even if packages use unsupported features]"
+		"--force-overwrite[Overwrite files in other packages]"
+		"--force-refresh[Do not use cached files]"
+		"--keys-dir[Override directory of trusted keys]:directory:_dir_list"
+		"--no-cache[Do not use any local cache path]"
+		"--no-network[Do not use the network]"
+		"--no-progress[Disable progress bar even for TTYs]"
+		"--print-arch[Print default arch and exit]"
+		"--progress[Show progress]"
+		"--progress-fd[Write progress to the specified file descriptor]:file descriptor"
+		"--purge[Delete modified configuration files or uninstalled packages from cache]"
+		"--repositories-file[Override system repositories]:repository file:_files"
+		"--wait[Wait to get an exclusive repository lock before failing]:seconds"
+	)
+
+	local -a commit_opts=(
+		"(-s --simulate)"{-s,--simulate}"[Simulate the requested operation without making any changes]"
+		"--clean-protected[Do not create .apk-new files in configuration directories]"
+		"--overlay-from-stdin[Read list of overlay files from stdin]"
+		"--no-scripts[Do not execute any scripts]"
+		"--no-commit-hooks[Skip pre/post hook scripts]"
+		"--initramfs-diskless-boot[Enables selected force options, disables commit hooks and more]"
+	)
+
+	local -a latest_opt=("(-l --latest)"{-l,--latest}"[Always choose the latest package by version]")
+	local -a upgrade_opt=("(-u --upgrade)"{-u,--upgrade}"[Upgrade packages and it's dependencies]")
+
+	local context state state_descr line
+	typeset -A opt_args
+	local curcontext="$curcontext"
+	local ret=1
+
+	function _ccache_apk_world { [[ "$1" -ot /etc/apk/world ]] }
+	function _ccache_apk_avail {
+		for i in /var/cache/apk/APKINDEX.*; do
+			[[ "$1" -ot "$i" ]] && return
+		done
+	}
+
+	function _apk_available_pkgs {
+		local -a _apk_available_packs
+		zstyle ":completion:${curcontext}:" cache-policy _ccache_apk_avail
+		local IFS=$'\n'
+		if _cache_invalid apk_index_packages_available || ! _retrieve_cache apk_index_packages_available; then
+			_apk_available_packs=(${${$(/sbin/apk list -a 2>/dev/null)%% *}%-*-r[[:digit:]]*})
+			_store_cache apk_index_packages_available _apk_available_packs
+		fi
+		_describe 'available packages' _apk_available_packs
+	}
+
+	function _apk_installed_pkgs {
+		local -a _apk_installed_packs
+		zstyle ":completion:${curcontext}:" cache-policy _ccache_apk_world
+		local IFS=$'\n'
+		if _cache_invalid apk_index_packages_installed || ! _retrieve_cache apk_index_packages_installed; then
+			_apk_installed_packs=(${${$(/sbin/apk list -I 2>/dev/null)%% *}%-*-r[[:digit:]]*})
+			_store_cache apk_index_packages_installed _apk_installed_packs
+		fi
+		_describe 'installed packages' _apk_installed_packs
+	}
+
+	function _apk_packages {
+		_alternative 'repo:available packages:_apk_available_pkgs' 'localpkgs:local packages:_files -g "*.apk"'
+	}
+
+	function _apk_cache {
+		local -a cache_subcmds=(
+			"clean:Remove package files which are no longer necessary"
+			"download:Fetch package files from the repositories and store them in the cache"
+			"sync:Clean and Download"
+		)
+		_describe 'subcommand' cache_subcmds
+	}
+
+	function _apk_subcmds {
+		local -a cmds=(
+			"add:Add packages to world and commit changes"
+			"del:Remove packages from world and commit changes"
+			"fix:Fix, reinstall or upgrade packages without modifying world"
+			"update:Update repository indexes"
+			"upgrade:Install upgrades available from repositories"
+			"cache:Manage the local package cache"
+			"info:Give detailed information about packages or repositories"
+			"list:List packages matching a pattern or other criteria"
+			"dot:Render dependencies as graphviz graphs"
+			"policy:Show repository policy for packages"
+			"search:Search for packages by name or description"
+			"index:Create repository index file from packages"
+			"fetch:Download packages from global repositories to a local directory"
+			"manifest:Show checksums of package contents"
+			"verify:Verify package integrity and signature"
+			"audit:Audit system for changes"
+			"stats:Show statistics about repositories and installations"
+			"version:Compare package versions or perform tests on version strings"
+		)
+		_describe 'subcommand' cmds
+	}
+
+	local -a completion_spec=($global_opts ':subcommand:_apk_subcmds')
+
+	case ${${words:#-*}[2]} in
+	(add)
+		completion_spec+=(
+			$commit_opts \
+			$latest_opt \
+			$upgrade_opt \
+			"--initdb[Initialize a new package database]" \
+			"(-t --virtual)"{-t,--virtual}"[Create virtual package with given dependencies]" \
+			"--no-chown[Do not change file owner or group]" \
+			"*:package:_apk_packages"
+		)
+	;;
+	(del)
+		completion_spec+=(
+			$commit_opts \
+			"(-r --rdepends)"{-r,--rdepends}"[Recursively delete all top-level reverse dependencies]" \
+			"*:installed package:_apk_installed_pkgs"
+		)
+	;;
+	(fix)
+		completion_spec+=(
+			$commit_opts \
+			"(-d --depends)"{-d,--depends}"[Fix dependencies of specified packages]" \
+			"(-r --reinstall)"{-r,--reinstall}"[Reinstall packages]" \
+			"(-u --upgrade)"{-u,--upgrade}"[Upgrade if an upgrade is available and does not break dependencies]" \
+			"(-x --xattr)"{-x,--xattr}"[Fix packages with broken xattrs]" \
+			"--directory-permissions[Reset all directory permissions]" \
+			"*:package:_apk_packages"
+		)
+	;;
+	(update) completion_spec+=($commit_opts);;
+	(upgrade)
+		completion_spec+=(
+			$commit_opts \
+			$latest_opt \
+			"(-a --available)"{-a,--available}"[Reset all packages to versions available from current repositories]" \
+			"--ignore[Upgrade all other packages than the ones listed]" \
+			"--no-self-upgrade[Do not do an early upgrade of the 'apk-tools' package]" \
+			"--prune[Remove packages which are no longer available from any configured repository]" \
+			"--self-upgrade-only[Only perform a self-upgrade of the 'apk-tools' package]" \
+			"*:package:_apk_packages"
+		)
+	;;
+	(cache)
+		completion_spec+=(
+			$latest_opt \
+			$upgrade_opt \
+			'2:subcommand:_apk_cache'
+		)
+	;;
+	(info)
+		completion_spec+=(
+			"(-a --all)"{-a,--all}"[List all information known about the package]" \
+			"(-d --description)"{-d,--descripton}"[Print the package description]" \
+			"(-e --installed)"{-e,--installed}"[Check package installed status]" \
+			"(-L --contents)"{-L,--contents}"[List files included in the package]" \
+			"(-P --provides)"{-P,--provides}"[List what the package provides]" \
+			"(-r --rdepends)"{-r,--rdepends}"[List reverse dependencies of the package]" \
+			"(-R --depends)"{-R,--depends}"[List the dependencies of the package]" \
+			"(-s --size)"{-s,--size}"[Print the package's installed size]" \
+			"(-w --webpage)"{-w,--webpage}"[Print the URL for the package's upstream webpage]" \
+			"(-W --who-owns)"{-W,--who-owns}"[Print the package which owns the specified file]:file:_files" \
+			"(-i --install-if)"{-i,--install-if}"[List the package's install_if rule]" \
+			"--license[Print the package SPDX license identifier]" \
+			"--replaces[List the other packages for which this package is marked as a replacement]" \
+			"(-I --rinstall-if)"{-I,--rinstall-if}"[List other packages whose install_if rules refer to this package]" \
+			"--triggers[Print active triggers for the package]" \
+			"*:package:_apk_packages"
+		)
+	;;
+	(list)
+		completion_spec+=(
+			"(-I --installed)"{-I,--installed}"[Consider only installed packages]" \
+			"(-O --orphaned)"{-O,--orphaned}"[Consider only orphaned packages]" \
+			"(-a --available)"{-a,--available}"[Consider only available packages]" \
+			"(-u --upgradable --upgradeable)"{-u,--upgradable,--upgradeable}"[Consider only upgradable packages]" \
+			"(-o --origin)"{-o,--origin}"[List packages by origin]" \
+			"(-d --depends)"{-d,--depends}"[List packages by dependency]" \
+			"(-P --providers)"{-P,--providers}"[List packages by provider]" \
+			"*:pattern"
+		)
+	;;
+	(dot)
+		completion_spec+=(
+			"--errors[Consider only packages with errors]" \
+			"--installed[Consider only installed packages]"
+		)
+	;;
+	(index)
+		completion_spec+=(
+			"(-d --description)"{-d,--description}"[Add a description to the index]:description" \
+			"(-o --output)"{-o,--output}"[Output generated index to file]:output:_files" \
+			"(-x --index)"{-x,--index}"[Read an existing index to speed up the creation of the new index]" \
+			"--no-warnings[Disable warnings about missing dependencies]" \
+			"--rewrite-arch[Set all package's architecture to arch]:arch:(armhf mips64 s390x x86_64 x86 aarch64 ppc64le armv7 riscv64)" \
+			"*:package:_apk_packages"
+		)
+	;;
+	(fetch)
+		completion_spec+=(
+			"(-l --link)"{-l,--link}"[Create hard links if possible]" \
+			"(-o --output)"{-o,--output}"[Where to write the downloaded files]:directory:_dir_list" \
+			"(-r --recursive)"{-r,--recursive}"[Fetch packages and all of their dependencies]" \
+			"(-s --stdout)"{-s,--stdout}"[Dump the .apk file(s) to stdout]" \
+			"--simulate[Simulate the requested operation without making any changes]" \
+			"--url[Print the full URL for downloaded packages]" \
+			"*:package:_apk_packages"
+		)
+	;;
+	(manifest) completion_spec+=("*:package:_apk_packages");;
+	(verify) completion_spec+=("*:package:_apk_packages");;
+	(audit)
+		completion_spec+=(
+			"--backup[Audit configuration files only (default)]" \
+			"--check-permissions[Check file permissions too]" \
+			"--packages[Print only the packages with changed files]" \
+			"--system[Audit all system files]" \
+			"(-r --recursive)"{-r,--recursive}"[Descent into directories and audit them as well]" \
+			"*:files:_files"
+		)
+	;;
+	(version)
+		completion_spec+=(
+			"(-a --all)"{-a,--all}"[Consider packages from all repository tags]" \
+			"(-c --check)"{-c,--check}"[Check versions for validity]:*: " \
+			"(-I --indexes)"{-I,--indexes}"[Print the version and description for each repository's index]:*: " \
+			"(-l --limit)"{-l,--limit}"[Limit to packages with output matching given operand]:operand:('>' '=' '<' '>=' '<=')" \
+			"(-t --test)"{-t,--test}"[Compare two version strings]:*: " \
+			"*:package:_apk_packages"
+		)
+	;;
+	(policy) completion_spec+=("*:package:_apk_packages");;
+	(search)
+		completion_spec+=(
+			"(-a --all)"{-a,--all}"[Print all matching package versions]" \
+			"(-d --description)"{-d,--description}"[Search in description as well]" \
+			"(-e -x --exact)"{-e,-x,--exact}"[Match package names exactly]" \
+			"--has-origin[Match by package origin]" \
+			"(-o --origin)"{-o,--origin}"[Print base package name]" \
+			"(-r --rdepends)"{-r,--rdepends}"[Print reverse dependencies]" \
+			"*:package:_apk_packages"
+		)
+	;;
+	esac
+
+	_arguments -C -s $completion_spec && ret=0
+	return ret
+}
diff --git a/main/aports-build/APKBUILD b/main/aports-build/APKBUILD
index 75fbfc9b0fb..7003ad374e1 100644
--- a/main/aports-build/APKBUILD
+++ b/main/aports-build/APKBUILD
@@ -1,33 +1,25 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=aports-build
-pkgver=1.5
-pkgrel=0
+pkgver=1.5.5
+pkgrel=4
 pkgdesc="MQTT based build-on-git-push scripts for Alpine Linux"
 url="https://alpinelinux.org"
 arch="noarch"
 license="GPL-2.0"
 options="!check"
-depends="abuild>2.20.0 mosquitto-clients openssh-client mqtt-exec rsync
-	lua-aports>1.0.0 lua5.2-cjson lua5.2-mqtt-publish pigz"
-depends_dev=""
+depends="abuild>2.20.0 build-base mosquitto-clients openssh-client mqtt-exec
+	rsync lua-aports>1.0.0 lua5.2-cjson lua5.2-mqtt-publish pigz git"
 makedepends="$depends_dev mosquitto-dev"
 install="$pkgname.pre-install"
-subpackages=""
-
+subpackages="$pkgname-openrc"
 source="aports-build
-	aports-build.initd
 	mqtt-exec.aports-build.confd
 	report-build-errors.lua
 	"
 
 builddir="$srcdir"
 
-build() {
-	cd "$builddir"
-}
-
 package() {
-	cd "$builddir"
 	install -Dm755 "$srcdir"/aports-build \
 		"$pkgdir"/usr/bin/aports-build
 	install -d "$pkgdir"/etc/init.d
@@ -40,13 +32,14 @@ package() {
 		"$pkgdir"/usr/share/buildrepo/plugins/report-build-errors.lua
 	install -d "$pkgdir"/etc/buildrepo
 	cat >"$pkgdir"/etc/buildrepo/config.lua <<-EOF
-	-- logurlprefix = "http://build.alpinelinux.org/buildlogs/"
+	-- logurlprefix = "https://build.alpinelinux.org/buildlogs/"
 	-- mqttbroker = "localhost"
 	-- logtarget = "distfiles.alpinelinux.org:/var/cache/distfiles/buildlogs/"
 	EOF
 }
 
-sha512sums="68504590f060be9c5c2fd7ce3e34f340eb7c07523d3395dd165dbf7068d8c7694b11c09c2727e17959120eb6697c9878ca1c32f6a335c56a044f6e1a8f8ea190  aports-build
-821035bda47152c341ec94bf960fa67e3377051826712ceb74f39103e6e422777b6e082231bfb87865653d2b93b7d3154cfc24abf65a52e3e66da69412dd7e41  aports-build.initd
-62ed5cb6d1fef03fa707512c8c99c572a91e64706ebcc2e7097108811818615618bab908292d0ba0ad2afe93a27333d9c91deb347d6c99703eb8983d1ee5f480  mqtt-exec.aports-build.confd
-cf0d8e65e517857ee781e451a1d3e6404cd72aeb5c7dba25017229ff79c4c43425712d2fcbbaad89af45a358e86f33467ac1df47e8fba0f30f81d84794e1206c  report-build-errors.lua"
+sha512sums="
+2a0f8649130b8f91a5949a2b12d5e97438ef87d2fb18877c5840df6abc1df3f97055322b56da69fbcce532e1faf498486fcb0d00641b759057ab35c628db8477  aports-build
+36bd362d66c4df04fe9da1d83f490e4f156f8c5ab2f2795cafb37a204c8ce772a9011172ac4f503faeaa861fdb00426d46346be8f233138cc2942681642916b8  mqtt-exec.aports-build.confd
+939ba54ab4159bc8fcd0cb08f16f67dac05d29c77005da6fca0463048ab991765665b35f2feb978bfd8409bd13fdbdf3d47a7652df842e76504d076ac040c337  report-build-errors.lua
+"
diff --git a/main/aports-build/aports-build b/main/aports-build/aports-build
index fbcc38d3dac..dcf7f626a82 100644
--- a/main/aports-build/aports-build
+++ b/main/aports-build/aports-build
@@ -32,7 +32,6 @@ fi
 arch=$(abuild -A)
 
 aports=${APORTS:-$HOME/aports}
-isodir=$HOME/alpine-iso
 packages=${REPOSDIR:-$HOME/packages}
 releasedir="$packages/releases/$arch"
 repos=${REPOS:-"main community testing"}
@@ -59,7 +58,7 @@ log() {
 create_release() {
 	local release="$1"
 	local release_deps="abuild apk-tools alpine-conf busybox fakeroot
-		xorriso rsync openssh-client squashfs-tools acct mkinitfs
+		xorriso rsync squashfs-tools acct mkinitfs
 		mtools"
 	case "$arch" in
 	aarch64|arm*) release_deps="$release_deps mtools grub-efi";;
@@ -68,8 +67,10 @@ create_release() {
 	s390x) release_deps="$release_deps s390-tools";;
 	esac
 
+	log "creating $release release"
 	cd "$aports"
 	abuild-apk add --virtual .alpine-release-deps $release_deps
+	(
 	if [ "$rel" = "edge" ]; then
 		sh scripts/mkimage.sh --repository $packages/main --yaml \
 			--tag "$release" --outdir $releasedir --profile "minirootfs netboot" \
@@ -80,13 +81,31 @@ create_release() {
 	fi
 
 	if $use_network; then
-		ssh $upload_host mkdir -p "${upload_iso#${upload_host}:}"
-		rsync -ruva $rsync_opts "$releasedir"/* "$upload_iso" || return 1
+		log "uploading $release release"
+		rsync --archive \
+			--update \
+			--verbose \
+			--mkpath \
+			$rsync_opts \
+			"$releasedir"/* "$upload_iso" || return 1
 	fi
+	)
+	local rc=$?
 	abuild-apk del .alpine-release-deps
+	return $rc
 }
 
 build() {
+	# before starting a build cycle, we might have some stale deps that weren't
+	# removed from the previous run. this happens if buildrepo/abuild crash for
+	# some reason, builders crash, network goes offline and a rare hang in buildrepo
+	# happens (and then it gets killed), ..
+	# clean up the environment before starting. this should always make it consistent, because:
+	# - abuild cleans up after each build
+	# - if it doesn't, that means it crashed, which means buildrepo failed too (unless keep-going is set, but it's not by default)
+	# - so, buildrepo is started again, and prunes the deps, ..
+	# hence, no build should have stale makedepends installed with just this deletion at the start.
+	abuild-apk del .makedepends\*
 	( $buildrepo "$@" || echo "FAIL" ) | while read line; do
 		case "$line" in
 		FAIL) return 1;;
@@ -135,6 +154,12 @@ while true; do
 		log "$_old_tag -> $_current_tag"
 		do_release=true
 	fi
+
+	# don't create release candidates on edge
+	if [ "$rel" = "edge" ] && [ "${_current_tag%_rc*}" != "$_current_tag" ]; then
+		do_release=false
+	fi
+
 	if [ "$_old" = "$_current" ] && [ -f /tmp/uploaded ] && [ -z "$force" ] && [ "$_current_tag" = "$_old_tag" ]; then
 		break
 	fi
@@ -179,7 +204,13 @@ while true; do
 
 		log "uploading packages to $repo"
 		$use_network && for i in $upload_pkg; do
-			rsync -rui --delete-delay --delay-updates $rsync_opts \
+			rsync --recursive \
+				--update \
+				--itemize-changes \
+				--delete-delay \
+				--delay-updates \
+				--mkpath \
+				$rsync_opts \
 				$repo/$arch $i/$repo/ > /tmp/upload-$repo
 			if [ $? -ne 0 ]; then
 				rc=1
diff --git a/main/aports-build/aports-build.initd b/main/aports-build/aports-build.initd
deleted file mode 100644
index 723bf175bcd..00000000000
--- a/main/aports-build/aports-build.initd
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-
-# this script is deprecated but kept for a migration period
-
-: ${mqtt_broker:="msg.alpinelinux.org"}
-: ${git_branch:=master}
-: ${mqtt_topic:="git/aports/$git_branch"}
-
-command=/usr/bin/mqtt-exec
-pidfile=/var/run/aports-build/mqtt-exec.pid
-command_args="-h ${mqtt_broker:-msg.alpinelinux.org} -t $mqtt_topic -- /usr/bin/aports-build"
-start_stop_daemon_args="--stdout /dev/null --stderr /dev/null --background --make-pid --user buildozer"
-
-depend() {
-	need net
-}
-
-start() {
-	eerror "Please migrate to mqtt-exec.aports-build"
-	return 1
-}
-
-stop_post() {
-	# remove build status
-	if [ -f /etc/aports-build.conf ]; then
-		. /etc/aports-build.conf
-	fi
-	: ${hostname:=$(hostname)}
-	: ${mqtthost:="msg.alpinelinux.org"}
-	: ${status_clear:="mosquitto_pub -h $mqtthost -t build/$hostname -r -n"}
-	$status_clear
-	return 0
-}
diff --git a/main/aports-build/mqtt-exec.aports-build.confd b/main/aports-build/mqtt-exec.aports-build.confd
index 75e3f12a7e0..3e670be10c6 100644
--- a/main/aports-build/mqtt-exec.aports-build.confd
+++ b/main/aports-build/mqtt-exec.aports-build.confd
@@ -15,4 +15,4 @@ mqtt_broker="msg.alpinelinux.org"
 mqtt_topics="git/aports/$git_branch git/aports/$git_branch/release"
 will_topic="build/$(hostname)"
 will_retain=yes
-
+supervisor=supervise-daemon
diff --git a/main/aports-build/report-build-errors.lua b/main/aports-build/report-build-errors.lua
index 275b213f863..3621765783a 100644
--- a/main/aports-build/report-build-errors.lua
+++ b/main/aports-build/report-build-errors.lua
@@ -6,6 +6,26 @@ local f = io.open("/proc/sys/kernel/hostname")
 hostname = f:read()
 f:close()
 
+local function read_mosquitto_conf()
+	local cfg = {}
+	local f = io.open((os.getenv("XDG_CONFIG_HOME") or "").."/mosquitto_pub") or io.open((os.getenv("HOME") or "").."/.config/mosquitto_pub")
+	if f == nil then
+		return cfg
+	end
+	for line in f:lines() do
+		key,value = line:match("^%-%-([^ ]+)%s+(.*)")
+		if key and value then
+			cfg[key] = value
+		end
+	end
+	f:close()
+	return cfg
+end
+local mcfg = read_mosquitto_conf()
+publish.hostname = mcfg.hostname or "localhost"
+publish.username = mcfg.username
+publish.password = mcfg.pw
+
 local m = {}
 
 function shell_escape(args)
diff --git a/main/apparmor/0001-Fix-linking-against-gettext-on-musl-libc.patch b/main/apparmor/0001-Fix-linking-against-gettext-on-musl-libc.patch
new file mode 100644
index 00000000000..4180cf65817
--- /dev/null
+++ b/main/apparmor/0001-Fix-linking-against-gettext-on-musl-libc.patch
@@ -0,0 +1,40 @@
+From 183849ec988c7326bcb9bf729d087e262d121b67 Mon Sep 17 00:00:00 2001
+From: allgdante <allan.garret@gmail.com>
+Date: Wed, 4 Jul 2018 16:57:19 +0200
+Subject: [PATCH 1/7] Fix linking against gettext on musl libc
+
+Both parser and binutils must be linked against gettext
+---
+ binutils/Makefile | 2 +-
+ parser/Makefile   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/binutils/Makefile b/binutils/Makefile
+index 7fb71813..52e55f70 100644
+--- a/binutils/Makefile
++++ b/binutils/Makefile
+@@ -52,7 +52,7 @@ SRCS = aa_enabled.c
+ HDRS =
+ TOOLS = aa-enabled aa-exec
+ 
+-AALIB = -Wl,-Bstatic -lapparmor  -Wl,-Bdynamic -lpthread
++AALIB = -Wl,-Bstatic -lapparmor  -Wl,-Bdynamic -lpthread -lintl
+ 
+ ifdef USE_SYSTEM
+   # Using the system libapparmor so Makefile dependencies can't be used
+diff --git a/parser/Makefile b/parser/Makefile
+index 5d799f6a..000540a3 100644
+--- a/parser/Makefile
++++ b/parser/Makefile
+@@ -90,7 +90,7 @@ AAREDIR= libapparmor_re
+ AAREOBJECT = ${AAREDIR}/libapparmor_re.a
+ AAREOBJECTS = $(AAREOBJECT)
+ AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L. $(LDFLAGS)
+-AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread
++AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread -lintl
+ 
+ ifdef USE_SYSTEM
+   # Using the system libapparmor so Makefile dependencies can't be used
+-- 
+2.20.1
+
diff --git a/main/apparmor/0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch b/main/apparmor/0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch
new file mode 100644
index 00000000000..14dddeae1e1
--- /dev/null
+++ b/main/apparmor/0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch
@@ -0,0 +1,28 @@
+From 72a3291fc94210401e5dac3b2fa328b2bb40998d Mon Sep 17 00:00:00 2001
+From: allgdante <allan.garret@gmail.com>
+Date: Thu, 5 Jul 2018 17:32:46 +0200
+Subject: [PATCH 6/7] utils: adjust rc functions for aa-remove-unknown
+
+Update the path to the rc.apparmor.functions file to the one we can find
+inside Alpine.
+No intended functional changes
+---
+ utils/aa-remove-unknown | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/aa-remove-unknown b/utils/aa-remove-unknown
+index d3bd9144..0b9ead7d 100644
+--- a/utils/aa-remove-unknown
++++ b/utils/aa-remove-unknown
+@@ -15,7 +15,7 @@
+ #    along with this program. If not, see <http://www.gnu.org/licenses/>.
+ # ----------------------------------------------------------------------
+ 
+-APPARMOR_FUNCTIONS=/lib/apparmor/rc.apparmor.functions
++APPARMOR_FUNCTIONS=/usr/libexec/apparmor/rc.apparmor.functions
+ APPARMORFS=/sys/kernel/security/apparmor
+ PROFILES="${APPARMORFS}/profiles"
+ REMOVE="${APPARMORFS}/.remove"
+-- 
+2.20.1
+
diff --git a/main/apparmor/APKBUILD b/main/apparmor/APKBUILD
new file mode 100644
index 00000000000..981d56e5f4a
--- /dev/null
+++ b/main/apparmor/APKBUILD
@@ -0,0 +1,206 @@
+# Contributor: Allan Garret <allan.garret@gmail.com>
+# Maintainer: Allan Garret <allan.garret@gmail.com>
+pkgname=apparmor
+pkgver=3.1.7
+pkgrel=1
+pkgdesc="Linux application security framework - mandatory access control for programs"
+url="https://gitlab.com/apparmor/apparmor/wikis/home"
+arch="all"
+license="GPL-2.0-or-later"
+makedepends="
+	autoconf
+	automake
+	bash
+	bison
+	flex
+	gettext-dev
+	libtool
+	linux-headers
+	linux-pam-dev
+	perl-dev
+	py3-setuptools
+	python3-dev
+	sed
+	swig
+	"
+checkdepends="
+	dejagnu
+	py3-notify2
+	py3-psutil
+	py3-pyflakes
+	"
+subpackages="
+	libapparmor:_libapparmor
+	libapparmor-dev
+	py3-$pkgname-pyc
+	py3-$pkgname:_py3_apparmor
+	perl-$pkgname:_perl_apparmor
+	$pkgname-utils:_apparmor_utils
+	$pkgname-utils-lang:_apparmor_utils_lang
+	$pkgname-profiles:_apparmor_profiles:noarch
+	$pkgname-pam:_apparmor_pam
+	$pkgname-vim:_apparmor_vim:noarch
+	$pkgname-openrc
+	$pkgname-doc
+	$pkgname-lang
+	"
+source="
+	https://launchpad.net/apparmor/${pkgver%.*}/$pkgver/+download/apparmor-$pkgver.tar.gz
+
+	apparmor.initd
+
+	0001-Fix-linking-against-gettext-on-musl-libc.patch
+	0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch
+	fix-dnsmasq-profile.patch
+	"
+options="!check" # checkdepends in community
+
+# test_entries_since_login fails
+[ "$CARCH" = "s390x" ] && options="!check"
+
+prepare() {
+	default_prepare
+
+	common/list_af_names.sh > parser/base_af_names.h
+}
+
+build() {
+	export PYTHON_VERSION=3
+	export PYTHON_VERSIONS=python3
+	export PYTHON=/usr/bin/python3
+
+	(
+		cd "$builddir"/libraries/libapparmor
+		msg "Building: libapparmor"
+		./configure \
+			--prefix=/usr \
+			--with-python \
+			--with-perl
+		make
+	)
+
+	msg "Building: apparmor parser"
+	make -C parser
+
+	msg "Building: apparmor-binutils"
+	make -C binutils
+
+	msg "Building: apparmor-utils"
+	make -C utils
+
+	msg "Building: apparmor-profiles"
+	make -C profiles
+
+	msg "Building: apparmor-pam"
+	make -C changehat/pam_apparmor
+
+	msg "Building: apparmor-vim"
+	make -C utils/vim
+}
+
+check() {
+	cd "$builddir"/libraries/libapparmor
+	make check
+
+	cd "$builddir"
+	make -C parser check
+	make -C binutils check
+	make -j1 -e PYFLAKES=pyflakes-3 -C utils check
+}
+
+package() {
+	make -C libraries/libapparmor install DESTDIR="$pkgdir"
+	make -C changehat/pam_apparmor install DESTDIR="$pkgdir"
+	make -C binutils install DESTDIR="$pkgdir" BINDIR="$pkgdir/usr/bin"
+	make -C parser install DESTDIR="$pkgdir" BINDIR="$pkgdir/usr/bin"
+	make -C profiles install DESTDIR="$pkgdir"
+	make -C utils install \
+		DESTDIR="$pkgdir" \
+		BINDIR="$pkgdir/usr/bin" \
+		VIM_INSTALL_PATH="$pkgdir/usr/share/vim/vimfiles/syntax"
+
+	mv "$pkgdir"/lib "$pkgdir"/usr/lib
+
+	mkdir -p "$pkgdir"/usr/libexec/apparmor "$pkgdir"/lib
+	mv "$pkgdir"/usr/lib/lib/apparmor/rc.apparmor.functions \
+		"$pkgdir"/usr/libexec/apparmor/
+	mv "$pkgdir"/usr/lib/lib/security "$pkgdir"/lib
+	rm -r "$pkgdir"/usr/lib/lib/
+
+	install -Dm755 "$srcdir"/apparmor.initd \
+		"$pkgdir"/etc/init.d/apparmor
+
+	install -Dm644 changehat/pam_apparmor/README \
+		"$pkgdir"/usr/share/doc/apparmor/README.pam_apparmor
+}
+
+_libapparmor() {
+	pkgdesc="AppArmor library"
+
+	amove usr/lib/libapparmor.so.*
+}
+
+_py3_apparmor() {
+	pkgdesc="Python3 module for apparmor"
+	depends="libapparmor=$pkgver-r$pkgrel python3"
+
+	amove usr/lib/python3*/site-packages/LibAppArmor*
+}
+
+_perl_apparmor() {
+	pkgdesc="Perl module for apparmor"
+	depends="libapparmor=$pkgver-r$pkgrel perl"
+
+	amove usr/lib/perl5
+}
+
+_apparmor_utils() {
+	pkgdesc="AppArmor userspace utilities"
+	depends="py3-apparmor libapparmor=$pkgver-r$pkgrel perl python3 bash"
+
+	amove etc/apparmor/easyprof.conf
+	amove etc/apparmor/logprof.conf
+	amove etc/apparmor/notify.conf
+	amove etc/apparmor/severity.db
+	amove usr/bin
+	amove usr/sbin
+	amove usr/lib/python3*/site-packages/apparmor*
+	amove usr/share/apparmor/easyprof
+}
+
+_apparmor_utils_lang() {
+	pkgdesc="Languages for package $subpkgname"
+	install_if="$pkgname-utils=$pkgver-r$pkgrel lang"
+
+	amove usr/share/locale/*/LC_MESSAGES/*utils.mo
+}
+
+_apparmor_profiles() {
+	pkgdesc="AppArmor sample pre-made profiles"
+	depends="apparmor"
+
+	amove etc/apparmor.d
+	amove usr/share/apparmor/extra-profiles
+}
+
+_apparmor_pam() {
+	pkgdesc="AppArmor PAM library"
+	depends="libapparmor=$pkgver-r$pkgrel linux-pam"
+
+	amove lib/security
+}
+
+_apparmor_vim() {
+	pkgdesc="AppArmor VIM support"
+	install_if="$pkgname-vim=$pkgver-r$pkgrel vim"
+
+	amove usr/share/vim
+}
+
+sha512sums="
+7984a3cfd251f82c08604eb3c584ea5a84600c5fbe3a25834ba550c7a1bebb8b1b0216092a9a497eac2ba32a3f880495d024acf641212bce0041698ac5ff8552  apparmor-3.1.7.tar.gz
+1a57cc577ba3aedfbe10ef6148c1e8f5d0bbf65c99e60eec80c52409c9dab59ae002024500c6e4fd0e01e8c7aeb0c85e3e6b41cacee08c17fdd869d31bca614e  apparmor.initd
+e94f44427ed3c6f64462170939ffc92ce9ac1a58c61c7c7c3483fe16fe8e1c419daade9d56cdd342132e4d823dcac1963a86ad889f10bf71fd52b7f54c4694ed  0001-Fix-linking-against-gettext-on-musl-libc.patch
+38ebb30a0185f8eabd9103925959da365f64ef485f66ffb10180ac596fc172f9c98df39baec0b035138e9ab32056148e69a066faba9faebf9e92bf7a09c150c0  0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch
+cbe6eb9dd46e3ace122d5bc386596d5106a301b82a9ac1681f31a967013d3db67a8d674d54605444f30c3a136677ff3b26fad80f78d0f02dbe18a9f10f64672a  fix-dnsmasq-profile.patch
+"
diff --git a/main/apparmor/apparmor.initd b/main/apparmor/apparmor.initd
new file mode 100644
index 00000000000..15058f28953
--- /dev/null
+++ b/main/apparmor/apparmor.initd
@@ -0,0 +1,91 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Load all configured profiles for the AppArmor security module."
+description_reload="Reload all profiles"
+
+extra_started_commands="reload"
+
+aa_action() {
+	local arg=$1
+	local return
+
+	shift
+	$*
+	return=$?
+
+	if [ ${return} -eq 0 ]; then
+		aa_log_success_msg $arg
+	else
+		aa_log_failure_msg arg
+	fi
+
+	return $return
+}
+
+aa_log_action_start() {
+	ebegin $1
+}
+
+aa_log_action_end() {
+	eend $1
+}
+
+aa_log_success_msg() {
+	einfo $1
+}
+
+aa_log_warning_msg() {
+	ewarn $1
+}
+
+aa_log_failure_msg() {
+	eerror $1
+}
+
+aa_log_skipped_msg() {
+	einfo $1
+}
+
+aa_log_daemon_msg() {
+	einfo $1
+}
+
+aa_log_end_msg() {
+	eend $1
+}
+
+. /usr/libexec/apparmor/rc.apparmor.functions
+
+start() {
+	ebegin "Starting AppArmor"
+	eindent
+
+	if ! is_apparmor_loaded ; then
+		load_module
+		if [ $? -ne 0 ]; then
+			eerror "AppArmor kernel support is not present"
+			eend 1
+			return 1
+		fi
+	fi
+
+	parse_profiles load
+
+	eoutdent
+}
+
+stop() {
+	ebegin "Stopping AppArmor"
+	eindent
+	apparmor_stop
+	eoutdent
+}
+
+reload() {
+	# todo: split out clean_profiles into its own function upstream
+	# so we can do parse_profiles reload && clean_profiles
+	# and do a proper reload instead of restart
+	apparmor_restart
+}
diff --git a/main/apparmor/fix-dnsmasq-profile.patch b/main/apparmor/fix-dnsmasq-profile.patch
new file mode 100644
index 00000000000..9a92065702a
--- /dev/null
+++ b/main/apparmor/fix-dnsmasq-profile.patch
@@ -0,0 +1,12 @@
+diff --git a/profiles/apparmor.d/usr.sbin.dnsmasq b/profiles/apparmor.d/usr.sbin.dnsmasq
+index 7ae9a14..0005b14 100644
+--- a/profiles/apparmor.d/usr.sbin.dnsmasq
++++ b/profiles/apparmor.d/usr.sbin.dnsmasq
+@@ -66,6 +66,7 @@ profile dnsmasq /usr/{bin,sbin}/dnsmasq flags=(attach_disconnected) {
+   /var/lib/misc/dnsmasq.leases rw, # Required only for DHCP server usage
+
+   /{,usr/}bin/{ba,da,}sh ix, # Required to execute --dhcp-script argument
++  /bin/busybox ix, # /bin/sh is a symlink of busybox on Alpine
+
+   # access to iface mtu needed for Router Advertisement messages in IPv6
+   # Neighbor Discovery protocol (RFC 2461)
diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD
index 6175754d037..8f24097ca52 100644
--- a/main/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
@@ -1,49 +1,58 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apr-util
-pkgver=1.6.1
-pkgrel=6
+pkgver=1.6.3
+pkgrel=1
 pkgdesc="The Apache Portable Runtime Utility Library"
-url="http://apr.apache.org/"
+url="https://apr.apache.org/"
 arch="all"
 license="Apache-2.0"
-depends=
-subpackages="$pkgname-dev $pkgname-dbm_db $pkgname-dbd_pgsql $pkgname-dbd_mysql
-	$pkgname-dbd_sqlite3 $pkgname-ldap"
-
-depends_dev="expat-dev apr-dev openldap-dev sqlite-dev postgresql-dev
-	db-dev openssl-dev mariadb-dev"
-makedepends="$depends_dev bash chrpath openssl"
-source="https://www.apache.org/dist/apr/$pkgname-$pkgver.tar.bz2
+subpackages="
+	$pkgname-dev
+	$pkgname-dbd_pgsql
+	$pkgname-dbd_mysql
+	$pkgname-dbd_sqlite3
+	$pkgname-ldap
+	"
+depends_dev="
+	expat-dev
+	gdbm-dev
+	libpq-dev
+	mariadb-dev
+	openldap-dev
+	openssl-dev>3
+	sqlite-dev
+	"
+makedepends="$depends_dev apr-dev bash chrpath openssl>3"
+source="https://www.apache.org/dist/apr/apr-util-$pkgver.tar.bz2
 	musl-fix-testsuite.patch"
-builddir="$srcdir/$pkgname-$pkgver"
+
+# secfixes:
+#   1.6.3-r0:
+#     - CVE-2022-25147
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-apr=/usr \
 		--with-ldap \
-		--with-dbm=db53 \
 		--with-pgsql \
 		--with-mysql \
 		--with-sqlite3 \
-		--with-berkeley-db \
 		--with-crypto \
 		--with-openssl \
 		--without-sqlite2 \
-		--without-gdbm
+		--with-dbm=ndbm \
+		--with-ndbm
 	make
 }
 
 check() {
-	cd "$builddir"
 	make -j1 check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	rm "$pkgdir"/usr/lib/*.exp
 	chrpath -d "$pkgdir"/usr/lib/*.so.*
@@ -52,16 +61,15 @@ package() {
 _mv_mod() {
 	pkgdesc="The Apache Portable Runtime Utility Library - $2 driver"
 	depends=
-	local _moddir="usr/lib/apr-util-1"
-	mkdir -p "$subpkgdir"/$_moddir
-	mv "$pkgdir"/$_moddir/apr_$1*.so "$subpkgdir"/$_moddir/
+	amove usr/lib/apr-util-1/apr_$1*.so
 }
 
-dbm_db() { _mv_mod dbm_db "Berkley DB"; }
 dbd_pgsql() { _mv_mod dbd_pgsql "PostgreSQL"; }
 dbd_mysql() { _mv_mod dbd_mysql "MySQL"; }
 dbd_sqlite3() { _mv_mod dbd_sqlite "SQLite3"; }
 ldap() { _mv_mod ldap "LDAP"; }
 
-sha512sums="40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d  apr-util-1.6.1.tar.bz2
-4672c55bbe78a401483dd21f29dd1f92d70887191f3d4945a616223c18e39e051609a3b52a5547a9dbcc54e315cf5866e5dfb5ef9507c3914e9d74a67e75a00e  musl-fix-testsuite.patch"
+sha512sums="
+8050a481eeda7532ef3751dbd8a5aa6c48354d52904a856ef9709484f4b0cc2e022661c49ddf55ec58253db22708ee0607dfa7705d9270e8fee117ae4f06a0fe  apr-util-1.6.3.tar.bz2
+4672c55bbe78a401483dd21f29dd1f92d70887191f3d4945a616223c18e39e051609a3b52a5547a9dbcc54e315cf5866e5dfb5ef9507c3914e9d74a67e75a00e  musl-fix-testsuite.patch
+"
diff --git a/main/apr/APKBUILD b/main/apr/APKBUILD
index c2a40dad1e9..b069a4d96db 100644
--- a/main/apr/APKBUILD
+++ b/main/apr/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apr
-pkgver=1.7.0
+pkgver=1.7.4
 pkgrel=0
 pkgdesc="The Apache Portable Runtime"
-url="http://apr.apache.org/"
+url="https://apr.apache.org/"
 arch="all"
 license="Apache-2.0"
-depends_dev="util-linux-dev bash"
+depends_dev="util-linux-dev"
 makedepends="$depends_dev"
 subpackages="$pkgname-dev"
 source="https://www.apache.org/dist/apr/apr-$pkgver.tar.bz2
@@ -14,40 +14,55 @@ source="https://www.apache.org/dist/apr/apr-$pkgver.tar.bz2
 	semtimedop-s390x.patch
 	"
 
+# secfixes:
+#   1.7.1-r0:
+#     - CVE-2022-24963
+#     - CVE-2022-25147
+#     - CVE-2022-28331
+#   1.7.0-r2:
+#     - CVE-2021-35940
+
 build() {
-	cd "$builddir"
+	case "$CARCH" in
+	x86)
+		# apr before 1.7.3 implicitly disabled these for i*86
+		# now that they're enabled, it seems to fail tests instead
+		local atomics=no
+		;;
+	*)
+		local atomics=yes
+		;;
+	esac
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--datadir=/usr/share \
-		--enable-nonportable-atomics \
+		--enable-nonportable-atomics=$atomics \
 		--with-devrandom=/dev/urandom
 	make
 }
 
 check() {
-	cd "$builddir"
 	make -j1 check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
 # basicly everything thats not a *.so* file belongs to the -dev package
 # we override the pre-defined func.
 dev() {
-	local i
-	depends="$pkgname $depends_dev"
+	depends="$pkgname=$pkgver-r$pkgrel $depends_dev"
 	mkdir -p "$subpkgdir"
 	mv "$pkgdir"/* "$subpkgdir"/
 	mkdir -p "$pkgdir"/usr/lib
 	mv "$subpkgdir"/usr/lib/*.so* "$pkgdir"/usr/lib/
-	return 0
 }
 
-sha512sums="3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148  apr-1.7.0.tar.bz2
+sha512sums="
+2342c997765ea2ca96eac158e5fd260232dba68fc41b90a79a7ba9b25c539fc217981867362090e0ebebe632289257c342275e3c5baedb698c474ef8f49a9dcd  apr-1.7.4.tar.bz2
 9fb931e45f30fbe68af56849dfca148c09cdf85e300af14fb259cbd43470113288680bdb21189d4cf13f5ce95f8d28666822535e017e64ace5324339ab50cbef  apr-1.6.2-dont-test-dlclose.patch
-5d1afa9419d0481e7c3369724e8b4c1e199cbfd5d031bd9d9fc4f46ee0d3819353ff03c3b2c508d5b939f66ef4549953bbf9cdae7ff934002b9a01d824c843e8  semtimedop-s390x.patch"
+5d1afa9419d0481e7c3369724e8b4c1e199cbfd5d031bd9d9fc4f46ee0d3819353ff03c3b2c508d5b939f66ef4549953bbf9cdae7ff934002b9a01d824c843e8  semtimedop-s390x.patch
+"
diff --git a/main/argon2/APKBUILD b/main/argon2/APKBUILD
index b3eb0b1e8a5..02726519e41 100644
--- a/main/argon2/APKBUILD
+++ b/main/argon2/APKBUILD
@@ -4,11 +4,11 @@
 pkgname=argon2
 _pkgname=phc-winner-argon2
 pkgver=20190702
-pkgrel=1
+pkgrel=5
 pkgdesc="The password hash Argon2, winner of PHC"
 url="https://github.com/P-H-C/phc-winner-argon2"
 arch="all"
-license="Apache-2.0 CC0-1.0"
+license="Apache-2.0 OR CC0-1.0"
 subpackages="$pkgname-static $pkgname-dev $pkgname-libs"
 source="$pkgname-$pkgver.tar.gz::https://github.com/P-H-C/$_pkgname/archive/$pkgver.tar.gz
 	"
diff --git a/main/argp-standalone/001-throw-in-funcdef.patch b/main/argp-standalone/001-throw-in-funcdef.patch
deleted file mode 100644
index 4a90751e1e6..00000000000
--- a/main/argp-standalone/001-throw-in-funcdef.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone
-# Copyright (C) 2006 The T2 SDE Project
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-
-No __THROW in function implementation.
-	--jsaw
-
---- argp-standalone-1.4-test2/argp.h.orig	2006-01-06 02:29:59.000000000 +0100
-+++ argp-standalone-1.4-test2/argp.h	2006-01-06 02:41:10.000000000 +0100
-@@ -560,17 +560,17 @@
- # endif
- 
- # ifndef ARGP_EI
--#  define ARGP_EI extern __inline__
-+#  define ARGP_EI extern inline
- # endif
- 
- ARGP_EI void
--__argp_usage (__const struct argp_state *__state) __THROW
-+__argp_usage (__const struct argp_state *__state)
- {
-   __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
- }
- 
- ARGP_EI int
--__option_is_short (__const struct argp_option *__opt) __THROW
-+__option_is_short (__const struct argp_option *__opt)
- {
-   if (__opt->flags & OPTION_DOC)
-     return 0;
-@@ -582,7 +582,7 @@
- }
- 
- ARGP_EI int
--__option_is_end (__const struct argp_option *__opt) __THROW
-+__option_is_end (__const struct argp_option *__opt)
- {
-   return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
- }
---- argp-standalone-1.4-test2/argp-parse.c.orig	2006-01-06 02:47:48.000000000 +0100
-+++ argp-standalone-1.4-test2/argp-parse.c	2006-01-06 02:48:16.000000000 +0100
-@@ -1290,13 +1290,13 @@
- /* Defined here, in case a user is not inlining the definitions in
-  * argp.h */
- void
--__argp_usage (__const struct argp_state *__state) __THROW
-+__argp_usage (__const struct argp_state *__state)
- {
-   __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
- }
- 
- int
--__option_is_short (__const struct argp_option *__opt) __THROW
-+__option_is_short (__const struct argp_option *__opt) 
- {
-   if (__opt->flags & OPTION_DOC)
-     return 0;
-@@ -1310,7 +1310,7 @@
- }
- 
- int
--__option_is_end (__const struct argp_option *__opt) __THROW
-+__option_is_end (__const struct argp_option *__opt) 
- {
-   return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
- }
diff --git a/main/argp-standalone/APKBUILD b/main/argp-standalone/APKBUILD
index 0870342f8f2..4dc43fae938 100644
--- a/main/argp-standalone/APKBUILD
+++ b/main/argp-standalone/APKBUILD
@@ -1,17 +1,15 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=argp-standalone
-pkgver=1.3
-pkgrel=4
+pkgver=1.5.0
+pkgrel=1
 pkgdesc="Hierarchial argument parsing library broken out from glibc"
 url="http://www.lysator.liu.se/~nisse/misc/"
 arch="all"
-license="GPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 makedepends="libtool automake autoconf"
-source="http://www.lysator.liu.se/~nisse/misc/argp-standalone-$pkgver.tar.gz
-	001-throw-in-funcdef.patch
-	gnu89-inline.patch
-	"
+source="$pkgname-$pkgver.tar.gz::https://github.com/argp-standalone/argp-standalone/archive/refs/tags/$pkgver.tar.gz
+	gnu89-inline.patch"
 
 prepare() {
 	default_prepare
@@ -39,6 +37,7 @@ package() {
 	install -D -m755 libargp.a "$pkgdir"/usr/lib/libargp.a
 }
 
-sha512sums="58c3feb8852b90248fff39e49b5019bd0dcf646790c3eaf70c3262eb81dda31a61dc0a45963c7b4a010e80fc14b37288dcb3b3ef48d02f2d33dd72c1c62e62d9  argp-standalone-1.3.tar.gz
-5e4cdeeb16e6a4fb46a00ab95f3da9276ee554eec00bb2a05da7467961234ba3f9a630aafa7ceb5feb429a84ece8bf03b869fa996b86468f4716935a914c79a4  001-throw-in-funcdef.patch
-69f1d8a4fcd542346f98bc1fb7151db748483fc2f331c8c35114e0891d867b41c603ddaa5f3130aaaf1c640e02c51ac71cee71b62c09301b146812e9059e9ade  gnu89-inline.patch"
+sha512sums="
+fa2eb61ea00f7a13385e5c1e579dd88471d6ba3a13b6353e924fe71914b90b40688b42a9f1789bc246e03417fee1788b1990753cda8c8d4a544e85f26b63f9e2  argp-standalone-1.5.0.tar.gz
+42b2072b68d9287cfde2f5023af0a6c24bc34a7af6df036a313d5c4fa2762688b12476c688caf010176c069184305325f3134756f0c4e19aa4b06278e3f233e0  gnu89-inline.patch
+"
diff --git a/main/argp-standalone/gnu89-inline.patch b/main/argp-standalone/gnu89-inline.patch
index 71978eba585..bcb15d8d550 100644
--- a/main/argp-standalone/gnu89-inline.patch
+++ b/main/argp-standalone/gnu89-inline.patch
@@ -1,12 +1,11 @@
 diff --git a/configure.ac b/configure.ac
-index 4658839..09f0267 100644
+index 932b9da..b4f85bb 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -79,16 +79,10 @@ AC_CHECK_DECLS([program_invocation_name, program_invocation_short_name],
- 
+@@ -80,15 +80,10 @@ AC_CHECK_DECLS([program_invocation_name, program_invocation_short_name],
  # Set these flags *last*, or else the test programs won't compile
  if test x$GCC = xyes ; then
--  # Using -ggdb3 makes (some versions of) Redhat's gcc-2.96 dump core
+   # Using -ggdb3 makes (some versions of) Redhat's gcc-2.96 dump core
 -  if "$CC" --version | grep '^2\.96$' 1>/dev/null 2>&1; then
 -    true
 -  else
diff --git a/main/arm-trusted-firmware/APKBUILD b/main/arm-trusted-firmware/APKBUILD
index f14da8262e3..9ea39c7d997 100644
--- a/main/arm-trusted-firmware/APKBUILD
+++ b/main/arm-trusted-firmware/APKBUILD
@@ -1,32 +1,84 @@
 # Contributor: Milan P. Stanić <mps@arvanta.net>
+# Contributor: Maxim Karasev <begs@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=arm-trusted-firmware
-pkgver=2.1
-pkgrel=0
+pkgver=2.8.14
+pkgrel=1
 pkgdesc="ARM Trusted Firmware-A (TF-A)"
 url="https://github.com/ARM-software/arm-trusted-firmware"
-arch="aarch64"
+# no lld on s390x, but it doesn't matter anyway as this is arm firmware
+arch="all !s390x"
 license="BSD-3-Clause"
-makedepends="dtc openssl-dev"
-options="!check" # no tests
-subpackages="$pkgname-sun50i"
-source="$pkgname-$pkgver.tar.gz::https://github.com/ARM-software/$pkgname/archive/v$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+makedepends="
+	clang
+	dtc
+	lld
+	llvm
+	openssl-dev
+	"
+subpackages="$pkgname-tools"
+source="$pkgname-$pkgver.tar.gz::https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags/lts-v$pkgver.tar.gz
+	key_t.patch
+	rk3399.patch
+	"
+options="!check" # No tests
+builddir="$srcdir/$pkgname-lts-v$pkgver"
+
+_plats="
+	imx8mq
+	rk3328
+	rk3399
+	sun50i_a64
+	sun50i_h6
+	"
 
 build() {
-	cd "$builddir"
-	LDFLAGS="" make PLAT=sun50i_a64 bl31
+	unset LDFLAGS
+	if [ "$CARCH" = "aarch64" ]; then
+		for plat in $_plats; do
+			case "$plat" in
+				sun50i_a64|sun50i_h6)
+					local opts="SUNXI_SETUP_REGULATORS=1 SUNXI_AMEND_DTB=1"
+					;;
+			esac
+
+			msg "Building ATF for $plat (opts='$opts')"
+			LDFLAGS="$LDFLAGS -no-warn-rwx-segment" make E=0 PLAT=$plat bl31 $opts
+		done
+	fi
+
+	make -C tools/fiptool
+	make -C tools/cert_create
 }
 
 package() {
-	cd "$builddir"
-	mkdir -p "$pkgdir"/usr/share/$pkgname
+	install -d "$pkgdir"/usr/share/$pkgname
+	if [ "$CARCH" = "aarch64" ]; then
+		for plat in $_plats; do
+			case $plat in
+			rk33*)
+				local path="$builddir"/build/$plat/release/bl31/bl31.elf
+				;;
+			*)
+				local path="$builddir"/build/$plat/release/bl31.bin
+				;;
+			esac
+			install -D $path -t "$pkgdir"/usr/share/$pkgname/$plat/
+		done
+	fi
+	install -Dm755 -t "$pkgdir"/usr/bin tools/fiptool/fiptool
+	install -Dm755 -t "$pkgdir"/usr/bin tools/cert_create/cert_create
 }
-sun50i() {
-	pkgdesc="ARM Trusted Firmware-A for sun50i"
-	cd "$builddir"
-	mkdir -p "$subpkgdir"/usr/share/$subpkgname
-	install "$builddir"/build/sun50i_a64/release/bl31.bin "$subpkgdir"/usr/share/$subpkgname/
+
+tools() {
+	pkgdesc="$pkgdesc (tools)"
+
+	amove usr/bin/fiptool
+	amove usr/bin/cert_create
 }
 
-sha512sums="9b557ce5f7dc272a0cc0b955ef77fe8f00c8ed01261a2cad29bb2efba3f278e81f1061c809096c97589c7075e5d39be1abd22c8c6a9cf8aaff157f640d36d22c  arm-trusted-firmware-2.1.tar.gz"
+sha512sums="
+3283c13ba442a8d6231049c69091872888ae1b6cfb2ab1aea0c0aab28e34bb7cc82b99ec26fdfd96cd8cd0019e30fe6244c71aee183e8127397639a6621c58d5  arm-trusted-firmware-2.8.14.tar.gz
+71f59abbb3c53d975afe0f20456e8bd943f005aeeb14633f609ad7b7617d51c479a505b54f9c49f77e02ecdea233bc8dffecd31b79b86a38d9ad39f6b0dc1129  key_t.patch
+4b26d06cc5f23cd73515927624c164745dd144a0255a717052d80d904a58e001cb7b334ce1fa20cf21ba18b6e0f024da011321cb2c53dfb44ddd52ee24e31a66  rk3399.patch
+"
diff --git a/main/arm-trusted-firmware/key_t.patch b/main/arm-trusted-firmware/key_t.patch
new file mode 100644
index 00000000000..07c6cf16b28
--- /dev/null
+++ b/main/arm-trusted-firmware/key_t.patch
@@ -0,0 +1,13 @@
+without it /usr/include/bits/alltypes.h defines key_t as int
+
+--- a/tools/cert_create/Makefile
++++ b/tools/cert_create/Makefile
+@@ -49,7 +49,7 @@ endif
+ # from setting the OPENSSL_DIR path.
+ $(eval $(call SELECT_OPENSSL_API_VERSION))
+ 
+-HOSTCCFLAGS := -Wall -std=c99
++HOSTCCFLAGS := -Wall -std=c99 -D__DEFINED_key_t=1
+ 
+ ifeq (${DEBUG},1)
+   HOSTCCFLAGS += -g -O0 -DDEBUG -DLOG_LEVEL=40
diff --git a/main/arm-trusted-firmware/rk3399.patch b/main/arm-trusted-firmware/rk3399.patch
new file mode 100644
index 00000000000..ffbb4755071
--- /dev/null
+++ b/main/arm-trusted-firmware/rk3399.patch
@@ -0,0 +1,53 @@
+
+
+
+diff --git a/plat/rockchip/rk3399/drivers/m0/Makefile b/plat/rockchip/rk3399/drivers/m0/Makefile
+index 79e09f0..5ab6d28 100644
+--- a/plat/rockchip/rk3399/drivers/m0/Makefile
++++ b/plat/rockchip/rk3399/drivers/m0/Makefile
+@@ -33,16 +33,16 @@ C_SOURCES		:= src/dram.c	\
+ C_SOURCES_PMU		:= src/suspend.c
+ 
+ # Flags definition
+-COMMON_FLAGS		:= -g -mcpu=$(ARCH) -mthumb -Wall -O3 -nostdlib -mfloat-abi=soft
++COMMON_FLAGS		:= -g -mcpu=$(ARCH) --target=arm-none-eabi -mthumb -Wall -O3 -nostdlib -mfloat-abi=soft
+ CFLAGS			:= -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-common
+ ASFLAGS			:= -Wa,--gdwarf-2
+ LDFLAGS			:= -Wl,--gc-sections -Wl,--build-id=none
+ 
+ # Cross tool
+-CC			:= ${M0_CROSS_COMPILE}gcc
++CC			:= clang
+ CPP			:= ${M0_CROSS_COMPILE}cpp
+ AR			:= ${M0_CROSS_COMPILE}ar
+-OC			:= ${M0_CROSS_COMPILE}objcopy
++OC			:= llvm-objcopy
+ OD			:= ${M0_CROSS_COMPILE}objdump
+ NM			:= ${M0_CROSS_COMPILE}nm
+
+
+Needed to stop linker errors with ldd:
+ld.lld: error: section .ARM.exidx virtual address range overlaps with .m0_bin
+489>>> .ARM.exidx range is [0x0, 0xF]
+490>>> .m0_bin range is [0x0, 0x267]
+491ld.lld: error: section .ARM.exidx load address range overlaps with .m0_bin
+492>>> .ARM.exidx range is [0x0, 0xF]
+493>>> .m0_bin range is [0x0, 0x267]
+494ld.lld: error: section .ARM.exidx virtual address range overlaps with .m0_bin
+495>>> .ARM.exidx range is [0x0, 0xF]
+496>>> .m0_bin range is [0x0, 0x347]
+497ld.lld: error: section .ARM.exidx load address range overlaps with .m0_bin
+498>>> .ARM.exidx range is [0x0, 0xF]
+499>>> .m0_bin range is [0x0, 0x347]
+ 
+diff --git a/plat/rockchip/rk3399/drivers/m0/src/rk3399m0.ld.S b/plat/rockchip/rk3399/drivers/m0/src/rk3399m0.ld.S
+index bfe054e..fedb012 100644
+--- a/plat/rockchip/rk3399/drivers/m0/src/rk3399m0.ld.S
++++ b/plat/rockchip/rk3399/drivers/m0/src/rk3399m0.ld.S
+@@ -22,5 +22,5 @@ SECTIONS {
+ 		*(.co_stack*)
+ 	}
+ 
+-	/DISCARD/ : { *(.comment) *(.note*) }
++	/DISCARD/ : { *(.comment) *(.note*) *(.ARM.exidx) }
+ }
diff --git a/main/arpon/APKBUILD b/main/arpon/APKBUILD
index b82ebc80de5..7b0ccc5d78a 100644
--- a/main/arpon/APKBUILD
+++ b/main/arpon/APKBUILD
@@ -3,12 +3,12 @@
 pkgname=arpon
 pkgver=3.0
 _realver=3.0-ng
-pkgrel=3
+pkgrel=8
 pkgdesc="Arp handler inspectiON is a handler daemon with tools to handle all ARP aspects"
-url="http://arpon.sourceforge.net/"
+url="https://arpon.sourceforge.io/"
 arch="all"
 license="BSD-2-Clause"
-makedepends="libdnet-dev libpcap-dev libnet-dev cmake"
+makedepends="libdnet-dev libpcap-dev libnet-dev cmake samurai"
 subpackages="$pkgname-doc $pkgname-openrc"
 source="https://downloads.sourceforge.net/project/arpon/arpon/ArpON-$_realver.tar.gz
 	fix-ppc64le-werror.patch
@@ -20,20 +20,30 @@ source="https://downloads.sourceforge.net/project/arpon/arpon/ArpON-$_realver.ta
 builddir="$srcdir"/ArpON-$_realver
 
 build() {
-	cmake -B build . \
+	cmake -B build -G Ninja \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_BUILD_TYPE=None
-	make -C build
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		.
+	cmake --build build
+}
+
+check() {
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	make -C build install DESTDIR="$pkgdir"
+	DESTDIR="$pkgdir" cmake --install build
+	# Pid file is created at runtime
+	rm -r "$pkgdir"/var/run
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
-sha512sums="e6338018d65f3f8300958e168a9eb6f6be85cba21ae0aee4b03e9838a29a06afbf2448c2f104367aa18389cc549e4489bcf8dad384ad46eadf2884a0908238af  ArpON-3.0-ng.tar.gz
+sha512sums="
+e6338018d65f3f8300958e168a9eb6f6be85cba21ae0aee4b03e9838a29a06afbf2448c2f104367aa18389cc549e4489bcf8dad384ad46eadf2884a0908238af  ArpON-3.0-ng.tar.gz
 d7ac9e46a43ac332926efe959373790ca2b5ae07e9a02186bff257014928ed5a101ff6d8b6224a7291f7bb25fe5555510cbf688a062d85afb7b7d9b3f6285ee9  fix-ppc64le-werror.patch
 eb4b9087a61c31fa99a7c4104e20172101b4ac3abcd448a41bdd31a81768a3dc996c9b220fd50b3c8906c050c4362c0cef300f5625cb02a7f51246783a915786  arpon-gcc8.patch
-9a7c862c3b07e31da091906b61339680b23af154c088eb259f2540916273d8e5f4dc6af5f883564d5b2ede6552b55376aa37b413270f837067ec5ce3d61a076f  arpon.initd
-c368acd8b0f9945a750e5c39a22fdad2a10f117270cd07f641333fbb9c22223cbf18809665d8675732408e820da5a806dac10c78ab0b9f2dae58cacbe58c61c1  arpon.confd"
+2fc675315b8d01563263dbca55310167be3656fa143ede9bad3a24edc3aa32e7b765cf2edb5164527942e4f2a4c74891f76ec737a9aac8a0770a2445af4a542f  arpon.initd
+c368acd8b0f9945a750e5c39a22fdad2a10f117270cd07f641333fbb9c22223cbf18809665d8675732408e820da5a806dac10c78ab0b9f2dae58cacbe58c61c1  arpon.confd
+"
diff --git a/main/arpon/arpon.initd b/main/arpon/arpon.initd
index 1c664bcf52e..89eaaa1b5cf 100644
--- a/main/arpon/arpon.initd
+++ b/main/arpon/arpon.initd
@@ -1,24 +1,14 @@
 #!/sbin/openrc-run
 
-NAME=arpon
-DAEMON=/usr/sbin/$NAME
+command=/usr/sbin/arpon
+command_args="-d $ARPON_OPTS"
+pidfile=/var/run/arpon.pid
 
 depend() {
 	need net
 	after firewall
 }
 
-start() {
-	ebegin "Starting ${NAME}"
-		start-stop-daemon --start --quiet \
-			--pidfile /var/run/${NAME}.pid \
-			--exec ${DAEMON} -- -d ${ARPON_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${NAME}"
-		start-stop-daemon --stop --quiet \
-			--pidfile /var/run/${NAME}.pid
-	eend $?
+start_pre() {
+	checkpath -f "$pidfile"
 }
diff --git a/main/arpwatch/01_all_arpwatch-2.1a15-manpages.patch b/main/arpwatch/01_all_arpwatch-2.1a15-manpages.patch
deleted file mode 100644
index 987f16e4628..00000000000
--- a/main/arpwatch/01_all_arpwatch-2.1a15-manpages.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Taken from tcpdump-3.8.2-14.FC4.src.rpm with some similar fixes for arpwatch.8
-and and fixes unescaped hyphen in arpwatch and arpsnmp man pages.
-
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.8 arpwatch-2.1a15/arpsnmp.8
---- arpwatch-2.1a15.orig/arpsnmp.8	2000-09-18 00:34:48.000000000 +0400
-+++ arpwatch-2.1a15/arpsnmp.8	2006-09-22 19:21:55.000000000 +0400
-@@ -22,7 +22,7 @@
- .TH ARPSNMP 8 "17 September 2000"
- .UC 4
- .SH NAME
--arpsnmp - keep track of ethernet/ip address pairings
-+arpsnmp \- keep track of ethernet/ip address pairings
- .SH SYNOPSIS
- .B arpsnmp
- [
-@@ -41,7 +41,7 @@
- and reports certain changes via email.
- .B Arpsnmp
- reads information from a file (usually generated by
--.BR snmpwalk (8)).
-+.BR snmpwalk (1)).
- .LP
- The
- .B -d
-@@ -62,9 +62,9 @@
- .LP
- .SH "REPORT MESSAGES"
- (See the
--.BR arpwatch (1)
-+.BR arpwatch (8)
- man page for details on the report messages generated by
--.BR arpsnmp (1).)
-+.BR arpsnmp (8).)
- .SH FILES
- .na
- .nh
-@@ -79,7 +79,7 @@
- .na
- .nh
- .BR arpwatch (8),
--.BR snmpwalk (8),
-+.BR snmpwalk (1),
- .BR arp (8)
- .ad
- .hy
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8	2000-10-09 00:31:28.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8	2006-09-22 19:22:07.000000000 +0400
-@@ -22,7 +22,7 @@
- .TH ARPWATCH 8 "8 October 2000"
- .UC 4
- .SH NAME
--arpwatch - keep track of ethernet/ip address pairings
-+arpwatch \- keep track of ethernet/ip address pairings
- .SH SYNOPSIS
- .na
- .B arpwatch
-@@ -101,9 +101,9 @@
- .LP
- .SH "REPORT MESSAGES"
- Here's a quick list of the report messages generated by
--.BR arpwatch (1)
-+.BR arpwatch (8)
- (and
--.BR arpsnmp (1)):
-+.BR arpsnmp (8)):
- .TP
- .B "new activity"
- This ethernet/ip address pair has been used for the first time six
diff --git a/main/arpwatch/02_all_arpwatch-2.1a15-srcdir.patch b/main/arpwatch/02_all_arpwatch-2.1a15-srcdir.patch
deleted file mode 100644
index 3ab59fcb2ae..00000000000
--- a/main/arpwatch/02_all_arpwatch-2.1a15-srcdir.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-Patch for aclocal, Makefile.in, configure.in to handle srcdir correctly.
-
-diff -Naru arpwatch-2.1a15.orig/aclocal.m4 arpwatch-2.1a15/aclocal.m4
---- arpwatch-2.1a15.orig/aclocal.m4	2006-03-28 11:55:40.000000000 +0400
-+++ arpwatch-2.1a15/aclocal.m4	2006-09-22 16:16:24.000000000 +0400
-@@ -50,7 +50,7 @@
-     $1="-O"
-     $2=""
-     if test "${srcdir}" != "." ; then
--	    $2="-I\$\(srcdir\)"
-+	    $2="-I\$(srcdir)"
-     fi
-     if test "${CFLAGS+set}" = set; then
- 	    LBL_CFLAGS="$CFLAGS"
-diff -Naru arpwatch-2.1a15.orig/configure.in arpwatch-2.1a15/configure.in
---- arpwatch-2.1a15.orig/configure.in	2006-06-22 00:34:29.000000000 +0400
-+++ arpwatch-2.1a15/configure.in	2006-09-22 16:16:24.000000000 +0400
-@@ -143,17 +143,17 @@
- 	AC_DEFINE(HAVE_DN_SKIPNAME)
- fi
- 
--if test -f .devel ; then
-+if test -f $srcdir/.devel ; then
- 	AC_DEFINE(LBL)
- fi
- 
--if test -r lbl/gnuc.h ; then
--	rm -f gnuc.h
--	ln -s lbl/gnuc.h gnuc.h
-+if test -r $srcdir/lbl/gnuc.h ; then
-+	rm -f $srcdir/gnuc.h
-+	ln -s lbl/gnuc.h $srcdir/gnuc.h 
- fi
- 
--if test ! -r addresses.h ; then
--	cp addresses.h.in addresses.h
-+if test ! -r $srcdir/addresses.h ; then
-+	cp $srcdir/addresses.h.in $srcdir/addresses.h
- fi
- 
- AC_SUBST(V_CCOPT)
-@@ -166,12 +166,12 @@
- 
- AC_OUTPUT(Makefile)
- 
--if test ! -f arp.dat ; then
-+if test ! -f $srcdir/arp.dat ; then
- 	echo 'creating empty arp.dat file'
--	touch arp.dat
-+	touch $srcdir/arp.dat
- fi
- 
--if test -f .devel ; then
-+if test -f $srcdir/.devel ; then
- 	make depend
- fi
- exit 0
-diff -Naru arpwatch-2.1a15.orig/configure.in.orig arpwatch-2.1a15/configure.in.orig
---- arpwatch-2.1a15.orig/configure.in.orig	1970-01-01 03:00:00.000000000 +0300
-+++ arpwatch-2.1a15/configure.in.orig	2006-06-22 00:34:29.000000000 +0400
-@@ -0,0 +1,177 @@
-+dnl @(#) $Header: /usr/src/local/sbin/arpwatch/RCS/configure.in,v 1.35 2006/06/21 20:34:27 leres Exp $ (LBL)
-+dnl
-+dnl Copyright (c) 1994, 1995, 1996, 1997, 1998, 2000, 2006
-+dnl	The Regents of the University of California.  All rights reserved.
-+dnl
-+dnl Process this file with autoconf to produce a configure script.
-+dnl
-+
-+AC_INIT(arpwatch.c)
-+
-+AC_CANONICAL_SYSTEM
-+
-+umask 002
-+
-+if test -z "$PWD" ; then
-+	PWD=`pwd`
-+fi
-+
-+AC_LBL_C_INIT(V_CCOPT, V_INCLS)
-+
-+AC_CHECK_HEADERS(fcntl.h memory.h)
-+AC_HEADER_TIME
-+
-+AC_REPLACE_FUNCS(bcopy strerror)
-+
-+dnl The following generates a warning from autoconf...
-+AC_C_BIGENDIAN
-+
-+AC_LBL_TYPE_SIGNAL
-+AC_LBL_UNION_WAIT
-+
-+AC_CHECK_LIB(resolv, res_query)
-+AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS)
-+
-+AC_PATH_PROG(V_SENDMAIL, sendmail, /usr/lib/sendmail,
-+    $PATH:/usr/sbin:/usr/lib:/usr/bin:/usr/ucblib:/usr/local/etc)
-+
-+case "$target_os" in
-+
-+linux*)
-+	V_INCLS="$V_INCLS -Ilinux-include"
-+	;;
-+
-+osf3*)
-+	# workaround around ip_hl vs. ip_vhl problem in netinet/ip.h
-+	AC_DEFINE(__STDC__,2)
-+	;;
-+esac
-+
-+AC_LBL_CHECK_TYPE
-+
-+AC_LBL_DEVEL(V_CCOPT)
-+
-+AC_MSG_CHECKING(if ether_header uses ether_addr structs)
-+AC_CACHE_VAL(ac_cv_ether_header_has_ea,
-+    LBL_SAVE_CFLAGS="$CFLAGS"
-+    CFLAGS="$CFLAGS $V_INCLS"
-+    AC_TRY_COMPILE([
-+#	include <sys/types.h>
-+#	if __STDC__
-+	/* osf3 has REALLY good prototyes */
-+	struct mbuf;
-+	struct rtentry;
-+#	endif
-+#	include <sys/socket.h>
-+#	include <net/if.h>
-+#	include <netinet/in.h>
-+#	include <netinet/if_ether.h>],
-+	[u_int i =
-+	    sizeof(((struct ether_header *)0)->ether_dhost.ether_addr_octet)],
-+	ac_cv_ether_header_has_ea=yes,
-+	ac_cv_ether_header_has_ea=no)
-+    CFLAGS="$LBL_SAVE_CFLAGS")
-+AC_MSG_RESULT($ac_cv_ether_header_has_ea)
-+if test $ac_cv_ether_header_has_ea = yes ; then
-+	AC_DEFINE(ETHER_HEADER_HAS_EA)
-+fi
-+
-+AC_MSG_CHECKING(if ether_arp uses ether_addr structs)
-+AC_CACHE_VAL(ac_cv_ether_arp_has_ea,
-+    LBL_SAVE_CFLAGS="$CFLAGS"
-+    CFLAGS="$CFLAGS $V_INCLS"
-+    AC_TRY_COMPILE([
-+#	include <sys/types.h>
-+#	if __STDC__
-+	/* osf3 has REALLY good prototyes */
-+	struct mbuf;
-+	struct rtentry;
-+#	endif
-+#	include <sys/socket.h>
-+#	include <net/if.h>
-+#	include <netinet/in.h>
-+#	include <netinet/if_ether.h>],
-+	[u_int i =
-+	    sizeof(((struct ether_arp *)0)->arp_sha.ether_addr_octet)],
-+	ac_cv_ether_arp_has_ea=yes,
-+	ac_cv_ether_arp_has_ea=no)
-+    CFLAGS="$LBL_SAVE_CFLAGS")
-+AC_MSG_RESULT($ac_cv_ether_arp_has_ea)
-+if test $ac_cv_ether_arp_has_ea = yes ; then
-+	AC_DEFINE(ETHER_ARP_HAS_EA)
-+fi
-+
-+AC_MSG_CHECKING(if ether_arp uses erp_xsha member)
-+AC_CACHE_VAL(ac_cv_struct_ether_arp_x,
-+    LBL_SAVE_CFLAGS="$CFLAGS"
-+    CFLAGS="$CFLAGS $V_INCLS"
-+    AC_TRY_COMPILE([
-+#	include <sys/types.h>
-+#	include <sys/socket.h>
-+#	if __STDC__
-+	/* osf3 has REALLY good prototyes */
-+	struct mbuf;
-+	struct rtentry;
-+#	endif
-+#	include <net/if.h>
-+#	include <netinet/in.h>
-+#	include <netinet/if_ether.h>],
-+	[u_int i = sizeof( ((struct ether_arp *)0)->arp_xsha)],
-+	ac_cv_struct_ether_arp_x=yes,
-+	ac_cv_struct_ether_arp_x=no)
-+    CFLAGS="$LBL_SAVE_CFLAGS")
-+AC_MSG_RESULT($ac_cv_struct_ether_arp_x)
-+if test $ac_cv_struct_ether_arp_x = yes ; then
-+	AC_DEFINE(ETHER_ARP_HAS_X)
-+fi
-+
-+dnl
-+dnl bind 8 does some routine name renaming so we must test specially
-+dnl
-+AC_MSG_CHECKING(for dn_skipname)
-+AC_CACHE_VAL(ac_cv_have_dn_skipname,
-+    AC_TRY_LINK([
-+#	include <sys/types.h>
-+#	include <netinet/in.h>
-+#	include <arpa/nameser.h>
-+#	include <resolv.h>],
-+	[(void)dn_skipname(0, 0);],
-+	ac_cv_have_dn_skipname=yes,
-+	ac_cv_have_dn_skipname=no))
-+AC_MSG_RESULT($ac_cv_have_dn_skipname)
-+if test $ac_cv_have_dn_skipname = yes ; then
-+	AC_DEFINE(HAVE_DN_SKIPNAME)
-+fi
-+
-+if test -f .devel ; then
-+	AC_DEFINE(LBL)
-+fi
-+
-+if test -r lbl/gnuc.h ; then
-+	rm -f gnuc.h
-+	ln -s lbl/gnuc.h gnuc.h
-+fi
-+
-+if test ! -r addresses.h ; then
-+	cp addresses.h.in addresses.h
-+fi
-+
-+AC_SUBST(V_CCOPT)
-+AC_SUBST(V_INCLS)
-+AC_SUBST(V_PCAPDEP)
-+AC_SUBST(V_SENDMAIL)
-+AC_SUBST(LBL_LIBS)
-+
-+AC_PROG_INSTALL
-+
-+AC_OUTPUT(Makefile)
-+
-+if test ! -f arp.dat ; then
-+	echo 'creating empty arp.dat file'
-+	touch arp.dat
-+fi
-+
-+if test -f .devel ; then
-+	make depend
-+fi
-+exit 0
-diff -Naru arpwatch-2.1a15.orig/Makefile.in arpwatch-2.1a15/Makefile.in
---- arpwatch-2.1a15.orig/Makefile.in	2000-06-15 04:39:55.000000000 +0400
-+++ arpwatch-2.1a15/Makefile.in	2006-09-22 16:16:24.000000000 +0400
-@@ -104,7 +104,7 @@
- version.o: version.c
- version.c: $(srcdir)/VERSION
- 	@rm -f $@
--	sed -e 's/.*/char version[] = "&";/' $(srcdir)/VERSION > $@
-+	sed -e 's/.*/char version[] = "&";/' $(srcdir)/VERSION > $(srcdir)/$@
- 
- zap: zap.o intoa.o
- 	$(CC) $(CFLAGS) -o $@ zap.o intoa.o -lutil
diff --git a/main/arpwatch/03_all_arpwatch-2.1a15-getopt.patch b/main/arpwatch/03_all_arpwatch-2.1a15-getopt.patch
deleted file mode 100644
index 269adc8ea62..00000000000
--- a/main/arpwatch/03_all_arpwatch-2.1a15-getopt.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-Patch from debian. Just reorders usage output and getopt options to ease adding new features.
-
-
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.8 arpwatch-2.1a15/arpsnmp.8
---- arpwatch-2.1a15.orig/arpsnmp.8	2006-09-22 17:18:02.000000000 +0400
-+++ arpwatch-2.1a15/arpsnmp.8	2006-09-22 18:17:44.000000000 +0400
-@@ -27,10 +27,15 @@
- .B arpsnmp
- [
- .B -d
--] [
-+]
-+.br
-+.ti +8
-+[
- .B -f
- .I datafile
- ]
-+.br
-+.ti +8
- .I file
- [
- .I ...
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.c arpwatch-2.1a15/arpsnmp.c
---- arpwatch-2.1a15.orig/arpsnmp.c	2004-01-23 01:25:17.000000000 +0300
-+++ arpwatch-2.1a15/arpsnmp.c	2006-09-22 18:17:15.000000000 +0400
-@@ -78,6 +78,10 @@
- 	register char *cp;
- 	register int op, i;
- 	char errbuf[256];
-+	char options[] =
-+		"d"
-+		"f:"
-+	;
- 
- 	if ((cp = strrchr(argv[0], '/')) != NULL)
- 		prog = cp + 1;
-@@ -90,7 +94,7 @@
- 	}
- 
- 	opterr = 0;
--	while ((op = getopt(argc, argv, "df:")) != EOF)
-+	while ((op = getopt(argc, argv, options)) != EOF)
- 		switch (op) {
- 
- 		case 'd':
-@@ -182,9 +186,14 @@
- usage(void)
- {
- 	extern char version[];
-+	char usage[] =
-+		"[-d] "
-+		"[-f datafile] "
-+		"file [...]\n"
-+	;
- 
- 	(void)fprintf(stderr, "Version %s\n", version);
- 	(void)fprintf(stderr,
--	    "usage: %s [-d] [-f datafile] file [...]\n", prog);
-+	    "usage: %s %s", prog, usage);
- 	exit(1);
- }
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8	2006-09-22 17:18:02.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8	2006-09-22 18:19:20.000000000 +0400
-@@ -28,10 +28,16 @@
- .B arpwatch
- [
- .B -dN
--] [
-+]
-+.br
-+.ti +8
-+[
- .B -f
- .I datafile
--] [
-+]
-+.br
-+.ti +8
-+[
- .B -i
- .I interface
- ]
-@@ -40,7 +46,10 @@
- [
- .B -n
- .IR net [/ width
--]] [
-+]]
-+.br
-+.ti +8
-+[
- .B -r
- .I file
- ]
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c	2004-01-23 01:18:20.000000000 +0300
-+++ arpwatch-2.1a15/arpwatch.c	2006-09-22 18:22:35.000000000 +0400
-@@ -153,6 +153,14 @@
- 	register char *interface, *rfilename;
- 	struct bpf_program code;
- 	char errbuf[PCAP_ERRBUF_SIZE];
-+	char options[] =
-+		"d"
-+		"f:"
-+		"i:"
-+		"n:"
-+		"N"
-+		"r:"
-+	;
- 
- 	if (argv[0] == NULL)
- 		prog = "arpwatch";
-@@ -170,7 +178,7 @@
- 	interface = NULL;
- 	rfilename = NULL;
- 	pd = NULL;
--	while ((op = getopt(argc, argv, "df:i:n:Nr:")) != EOF)
-+	while ((op = getopt(argc, argv, options)) != EOF)
- 		switch (op) {
- 
- 		case 'd':
-@@ -201,7 +209,6 @@
- 		case 'r':
- 			rfilename = optarg;
- 			break;
--
- 		default:
- 			usage();
- 		}
-@@ -748,9 +755,16 @@
- usage(void)
- {
- 	extern char version[];
-+	char usage[] =
-+		"[-dN] "
-+		"[-f datafile] "
-+		"[-i interface] "
-+		"[-n net[/width]] "
-+		"[-r file] "
-+		"\n"
-+	;
- 
- 	(void)fprintf(stderr, "Version %s\n", version);
--	(void)fprintf(stderr, "usage: %s [-dN] [-f datafile] [-i interface]"
--	    " [-n net[/width]] [-r file]\n", prog);
-+	(void)fprintf(stderr, "usage: %s %s", prog, usage);
- 	exit(1);
- }
diff --git a/main/arpwatch/04_all_arpwatch-2.1a15-sendmail-cmdline-opt.patch b/main/arpwatch/04_all_arpwatch-2.1a15-sendmail-cmdline-opt.patch
deleted file mode 100644
index 3b2ec7f4cd0..00000000000
--- a/main/arpwatch/04_all_arpwatch-2.1a15-sendmail-cmdline-opt.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-This patch from debian adds possibility to specify sendmail program.
-
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.8 arpwatch-2.1a15/arpsnmp.8
---- arpwatch-2.1a15.orig/arpsnmp.8	2006-09-22 19:26:53.000000000 +0400
-+++ arpwatch-2.1a15/arpsnmp.8	2006-09-22 19:31:59.000000000 +0400
-@@ -36,6 +36,12 @@
- ]
- .br
- .ti +8
-+[
-+.B -s
-+.I sendmail_path
-+]
-+.br
-+.ti +8
- .I file
- [
- .I ...
-@@ -60,6 +66,13 @@
- The default is
- .IR arp.dat .
- .LP
-+The
-+.B -s
-+flag is used to specify the path to the sendmail program. Any program that
-+takes the option -odi and then text from stdin can be substituted. This is
-+useful for redirecting reports to log files instead of mail. (This feature
-+comes from Debian).
-+.LP
- Note that an empty
- .I arp.dat
- file must be created before the first time you run
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.c arpwatch-2.1a15/arpsnmp.c
---- arpwatch-2.1a15.orig/arpsnmp.c	2006-09-22 19:26:53.000000000 +0400
-+++ arpwatch-2.1a15/arpsnmp.c	2006-09-22 19:26:23.000000000 +0400
-@@ -67,6 +67,7 @@
- __dead	void usage(void) __attribute__((volatile));
- 
- char *prog;
-+char *path_sendmail = PATH_SENDMAIL;
- 
- extern int optind;
- extern int opterr;
-@@ -81,6 +82,7 @@
- 	char options[] =
- 		"d"
- 		"f:"
-+		"s:"
- 	;
- 
- 	if ((cp = strrchr(argv[0], '/')) != NULL)
-@@ -109,6 +111,10 @@
- 			arpfile = optarg;
- 			break;
- 
-+		case 's':
-+			path_sendmail = optarg;
-+			break;
-+
- 		default:
- 			usage();
- 		}
-@@ -189,6 +195,7 @@
- 	char usage[] =
- 		"[-d] "
- 		"[-f datafile] "
-+		"[-s sendmail_path] "
- 		"file [...]\n"
- 	;
- 
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8	2006-09-22 19:26:53.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8	2006-09-22 19:28:02.000000000 +0400
-@@ -53,6 +53,12 @@
- .B -r
- .I file
- ]
-+.br
-+.ti +8
-+[
-+.B -s
-+.I sendmail_path
-+]
- .ad
- .SH DESCRIPTION
- .B Arpwatch
-@@ -103,6 +109,13 @@
- .B arpwatch
- does not fork.
- .LP
-+The
-+.B -s
-+flag is used to specify the path to the sendmail program. Any program that
-+takes the option -odi and then text from stdin can be substituted. This is
-+useful for redirecting reports to log files instead of mail. (This feature
-+comes from Debian).
-+.LP
- Note that an empty
- .I arp.dat
- file must be created before the first time you run
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c	2006-09-22 19:26:53.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c	2006-09-22 19:26:23.000000000 +0400
-@@ -106,6 +106,7 @@
- #endif
- 
- char *prog;
-+char *path_sendmail = PATH_SENDMAIL;
- 
- int can_checkpoint;
- int swapped;
-@@ -160,6 +161,7 @@
- 		"n:"
- 		"N"
- 		"r:"
-+		"s:"
- 	;
- 
- 	if (argv[0] == NULL)
-@@ -209,6 +211,11 @@
- 		case 'r':
- 			rfilename = optarg;
- 			break;
-+
-+		case 's':
-+			path_sendmail = optarg;
-+			break;
-+
- 		default:
- 			usage();
- 		}
-@@ -761,6 +768,7 @@
- 		"[-i interface] "
- 		"[-n net[/width]] "
- 		"[-r file] "
-+		"[-s sendmail_path] "
- 		"\n"
- 	;
- 
-diff -Naru arpwatch-2.1a15.orig/report.c arpwatch-2.1a15/report.c
---- arpwatch-2.1a15.orig/report.c	2000-10-01 03:41:10.000000000 +0400
-+++ arpwatch-2.1a15/report.c	2006-09-22 19:26:23.000000000 +0400
-@@ -235,6 +235,7 @@
- report(register char *title, register u_int32_t a, register u_char *e1,
-     register u_char *e2, register time_t *t1p, register time_t *t2p)
- {
-+	extern char *path_sendmail;
- 	register char *cp, *hn;
- 	register int fd, pid;
- 	register FILE *f;
-@@ -242,7 +243,7 @@
- 	char *fmt = "%20s: %s\n";
- 	char *watcher = WATCHER;
- 	char *watchee = WATCHEE;
--	char *sendmail = PATH_SENDMAIL;
-+	char *sendmail = path_sendmail;
- 	char *unknown = "<unknown>";
- 	char buf[132];
- 	static int init = 0;
diff --git a/main/arpwatch/05_all_arpwatch-2.1a15-promiscuous-mode.patch b/main/arpwatch/05_all_arpwatch-2.1a15-promiscuous-mode.patch
deleted file mode 100644
index 3f4c679dd64..00000000000
--- a/main/arpwatch/05_all_arpwatch-2.1a15-promiscuous-mode.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8	2006-09-22 19:33:49.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8	2006-09-22 19:34:52.000000000 +0400
-@@ -59,6 +59,11 @@
- .B -s
- .I sendmail_path
- ]
-+.br
-+.ti +8
-+[
-+.B -p
-+]
- .ad
- .SH DESCRIPTION
- .B Arpwatch
-@@ -116,6 +121,15 @@
- useful for redirecting reports to log files instead of mail. (This feature
- comes from Debian).
- .LP
-+The
-+.B -p
-+flag disables promiscuous operation. ARP broadcasts get through hubs without
-+having the interface in promiscuous mode, while saving considerable resources
-+that would be wasted on processing gigabytes of non-broadcast traffic. OTOH,
-+setting promiscuous mode does not mean getting 100% traffic that would concern
-+.B arpwatch.
-+YMMV. (This feature comes from Debian).
-+.LP
- Note that an empty
- .I arp.dat
- file must be created before the first time you run
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c	2006-09-22 19:33:49.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c	2006-09-22 19:34:07.000000000 +0400
-@@ -162,6 +162,7 @@
- 		"N"
- 		"r:"
- 		"s:"
-+		"p"
- 	;
- 
- 	if (argv[0] == NULL)
-@@ -216,6 +217,10 @@
- 			path_sendmail = optarg;
- 			break;
- 
-+		case 'p':
-+			++nopromisc;
-+			break;
-+
- 		default:
- 			usage();
- 		}
-@@ -283,7 +288,7 @@
- 		snaplen = max(sizeof(struct ether_header),
- 		    sizeof(struct fddi_header)) + sizeof(struct ether_arp);
- 		timeout = 1000;
--		pd = pcap_open_live(interface, snaplen, 1, timeout, errbuf);
-+		pd = pcap_open_live(interface, snaplen, !nopromisc, timeout, errbuf);
- 		if (pd == NULL) {
- 			syslog(LOG_ERR, "pcap open %s: %s", interface, errbuf);
- 			exit(1);
-@@ -769,6 +774,7 @@
- 		"[-n net[/width]] "
- 		"[-r file] "
- 		"[-s sendmail_path] "
-+		"[-p] "
- 		"\n"
- 	;
- 
-diff -Naru arpwatch-2.1a15.orig/util.c arpwatch-2.1a15/util.c
---- arpwatch-2.1a15.orig/util.c	2004-01-23 01:25:39.000000000 +0300
-+++ arpwatch-2.1a15/util.c	2006-09-22 19:35:15.000000000 +0400
-@@ -61,6 +61,7 @@
- 
- int debug = 0;
- int initializing = 1;			/* true if initializing */
-+int nopromisc = 0;			/* don't activate promisc mode by default */
- 
- /* syslog() helper routine */
- void
-diff -Naru arpwatch-2.1a15.orig/util.h arpwatch-2.1a15/util.h
---- arpwatch-2.1a15.orig/util.h	1996-10-06 14:22:14.000000000 +0400
-+++ arpwatch-2.1a15/util.h	2006-09-22 19:34:07.000000000 +0400
-@@ -17,3 +17,4 @@
- 
- extern int debug;
- extern int initializing;
-+extern int nopromisc;
diff --git a/main/arpwatch/06_all_arpwatch-2.1a15-bogons-report.patch b/main/arpwatch/06_all_arpwatch-2.1a15-bogons-report.patch
deleted file mode 100644
index a6bdaefd77e..00000000000
--- a/main/arpwatch/06_all_arpwatch-2.1a15-bogons-report.patch
+++ /dev/null
@@ -1,507 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.c arpwatch-2.1a15/arpsnmp.c
---- arpwatch-2.1a15.orig/arpsnmp.c	2006-09-22 19:44:44.000000000 +0400
-+++ arpwatch-2.1a15/arpsnmp.c	2006-09-22 19:41:19.000000000 +0400
-@@ -63,7 +63,7 @@
- /* Forwards */
- int	main(int, char **);
- int	readsnmp(char *);
--int	snmp_add(u_int32_t, u_char *, time_t, char *);
-+int	snmp_add(u_int32_t, u_char *, time_t, char *, char *);
- __dead	void usage(void) __attribute__((volatile));
- 
- char *prog;
-@@ -149,22 +149,24 @@
- static time_t now;
- 
- int
--snmp_add(register u_int32_t a, register u_char *e, time_t t, register char *h)
-+snmp_add(register u_int32_t a, register u_char *e, time_t t, register char *h,
-+	 char *interface)
- {
- 	/* Watch for ethernet broadcast */
- 	if (MEMCMP(e, zero, 6) == 0 || MEMCMP(e, allones, 6) == 0) {
--		dosyslog(LOG_INFO, "ethernet broadcast", a, e, NULL);
-+		dosyslog(LOG_INFO, "ethernet broadcast", a, e, NULL,
-+			 interface);
- 		return (1);
- 	}
- 
- 	/* Watch for some ip broadcast addresses */
- 	if (a == 0 || a == 1) {
--		dosyslog(LOG_INFO, "ip broadcast", a, e, NULL);
-+		dosyslog(LOG_INFO, "ip broadcast", a, e, NULL, interface);
- 		return (1);
- 	}
- 
- 	/* Use current time (although it would be nice to subtract idle time) */
--	return (ent_add(a, e, now, h));
-+	return (ent_add(a, e, now, h, interface));
- }
- 
- /* Process an snmp file */
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8	2006-09-22 19:44:53.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8	2006-09-22 19:41:19.000000000 +0400
-@@ -64,6 +64,11 @@
- [
- .B -p
- ]
-+.br
-+.ti +8
-+[
-+.B -a
-+]
- .ad
- .SH DESCRIPTION
- .B Arpwatch
-@@ -130,6 +135,17 @@
- .B arpwatch.
- YMMV. (This feature comes from Debian).
- .LP
-+The
-+.B -a
-+flag tells
-+.B arpwatch
-+to report bogons about every IP address. By default,
-+.B arpwatch
-+reports bogons for IP addresses that are in the same subnet with the first IP
-+address of the default interface (unless
-+.B -N
-+is given). (This feature comes from Debian).
-+.LP
- Note that an empty
- .I arp.dat
- file must be created before the first time you run
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c	2006-09-22 19:44:53.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c	2006-09-22 19:41:19.000000000 +0400
-@@ -142,6 +142,8 @@
- int	sanity_fddi(struct fddi_header *, struct ether_arp *, int);
- __dead	void usage(void) __attribute__((volatile));
- 
-+static char *interface;
-+
- int
- main(int argc, char **argv)
- {
-@@ -151,7 +153,7 @@
- 	register int fd;
- #endif
- 	register pcap_t *pd;
--	register char *interface, *rfilename;
-+	register char *rfilename;
- 	struct bpf_program code;
- 	char errbuf[PCAP_ERRBUF_SIZE];
- 	char options[] =
-@@ -163,6 +165,7 @@
- 		"r:"
- 		"s:"
- 		"p"
-+		"a"
- 	;
- 
- 	if (argv[0] == NULL)
-@@ -221,6 +224,10 @@
- 			++nopromisc;
- 			break;
- 
-+		case 'a':
-+			++allsubnets;
-+			break;
-+
- 		default:
- 			usage();
- 		}
-@@ -399,29 +406,31 @@
- 
- 	/* Watch for bogons */
- 	if (isbogon(sia)) {
--		dosyslog(LOG_INFO, "bogon", sia, sea, sha);
--		return;
-+		dosyslog(LOG_INFO, "bogon", sia, sea, sha, interface);
-+		if (!allsubnets) return;
- 	}
- 
- 	/* Watch for ethernet broadcast */
- 	if (MEMCMP(sea, zero, 6) == 0 || MEMCMP(sea, allones, 6) == 0 ||
- 	    MEMCMP(sha, zero, 6) == 0 || MEMCMP(sha, allones, 6) == 0) {
--		dosyslog(LOG_INFO, "ethernet broadcast", sia, sea, sha);
-+		dosyslog(LOG_INFO, "ethernet broadcast", sia, sea, sha,
-+			 interface);
- 		return;
- 	}
- 
- 	/* Double check ethernet addresses */
- 	if (MEMCMP(sea, sha, 6) != 0) {
--		dosyslog(LOG_INFO, "ethernet mismatch", sia, sea, sha);
-+		dosyslog(LOG_INFO, "ethernet mismatch", sia, sea, sha,
-+			 interface);
- 		return;
- 	}
- 
- 	/* Got a live one */
- 	t = h->ts.tv_sec;
- 	can_checkpoint = 0;
--	if (!ent_add(sia, sea, t, NULL))
--		syslog(LOG_ERR, "ent_add(%s, %s, %ld) failed",
--		    intoa(sia), e2str(sea), t);
-+	if (!ent_add(sia, sea, t, NULL, interface))
-+		syslog(LOG_ERR, "ent_add(%s, %s, %ld, %s) failed",
-+		    intoa(sia), e2str(sea), t, interface);
- 	can_checkpoint = 1;
- }
- 
-@@ -548,29 +557,31 @@
- 
- 	/* Watch for bogons */
- 	if (isbogon(sia)) {
--		dosyslog(LOG_INFO, "bogon", sia, sea, sha);
--		return;
-+		dosyslog(LOG_INFO, "bogon", sia, sea, sha, interface);
-+		if (!allsubnets) return;
- 	}
- 
- 	/* Watch for ethernet broadcast */
- 	if (MEMCMP(sea, zero, 6) == 0 || MEMCMP(sea, allones, 6) == 0 ||
- 	    MEMCMP(sha, zero, 6) == 0 || MEMCMP(sha, allones, 6) == 0) {
--		dosyslog(LOG_INFO, "ethernet broadcast", sia, sea, sha);
-+		dosyslog(LOG_INFO, "ethernet broadcast", sia, sea, sha,
-+			 interface);
- 		return;
- 	}
- 
- 	/* Double check ethernet addresses */
- 	if (MEMCMP(sea, sha, 6) != 0) {
--		dosyslog(LOG_INFO, "ethernet mismatch", sia, sea, sha);
-+		dosyslog(LOG_INFO, "ethernet mismatch", sia, sea, sha,
-+			 interface);
- 		return;
- 	}
- 
- 	/* Got a live one */
- 	t = h->ts.tv_sec;
- 	can_checkpoint = 0;
--	if (!ent_add(sia, sea, t, NULL))
--		syslog(LOG_ERR, "ent_add(%s, %s, %ld) failed",
--		    intoa(sia), e2str(sea), t);
-+	if (!ent_add(sia, sea, t, NULL, interface))
-+		syslog(LOG_ERR, "ent_add(%s, %s, %ld, %s) failed",
-+		    intoa(sia), e2str(sea), t, interface);
- 	can_checkpoint = 1;
- }
- 
-@@ -775,6 +786,7 @@
- 		"[-r file] "
- 		"[-s sendmail_path] "
- 		"[-p] "
-+		"[-a] "
- 		"\n"
- 	;
- 
-diff -Naru arpwatch-2.1a15.orig/db.c arpwatch-2.1a15/db.c
---- arpwatch-2.1a15.orig/db.c	2000-10-01 03:39:58.000000000 +0400
-+++ arpwatch-2.1a15/db.c	2006-09-22 19:43:35.000000000 +0400
-@@ -64,6 +64,7 @@
- 	u_char e[6];		/* ether address */
- 	char h[34];		/* simple hostname */
- 	time_t t;		/* timestamp */
-+	char i[16];		/* interface */
- };
- 
- /* Address info */
-@@ -80,13 +81,14 @@
- 
- static void alist_alloc(struct ainfo *);
- int cmpeinfo(const void *, const void *);
--static struct einfo *elist_alloc(u_int32_t, u_char *, time_t, char *);
-+static struct einfo *elist_alloc(u_int32_t, u_char *, time_t, char *, char *);
- static struct ainfo *ainfo_find(u_int32_t);
- static void check_hname(struct ainfo *);
- struct ainfo *newainfo(void);
- 
- int
--ent_add(register u_int32_t a, register u_char *e, time_t t, register char *h)
-+ent_add(register u_int32_t a, register u_char *e, time_t t, register char *h,
-+	char *interface)
- {
- 	register struct ainfo *ap;
- 	register struct einfo *ep;
-@@ -103,7 +105,8 @@
- 		ep = ap->elist[0];
- 		if (MEMCMP(e, ep->e, 6) == 0) {
- 			if (t - ep->t > NEWACTIVITY_DELTA) {
--				report("new activity", a, e, NULL, &t, &ep->t);
-+				report("new activity", a, e, NULL, &t, &ep->t,
-+					interface);
- 				check_hname(ap);
- 			}
- 			ep->t = t;
-@@ -114,8 +117,8 @@
- 	/* Check for a virgin ainfo record */
- 	if (ap->ecount == 0) {
- 		ap->ecount = 1;
--		ap->elist[0] = elist_alloc(a, e, t, h);
--		report("new station", a, e, NULL, &t, NULL);
-+		ap->elist[0] = elist_alloc(a, e, t, h, interface);
-+		report("new station", a, e, NULL, &t, NULL, interface);
- 		return (1);
- 	}
- 
-@@ -133,9 +136,11 @@
- 			if (t - t2 < FLIPFLIP_DELTA &&
- 			    (isdecnet(e) || isdecnet(e2)))
- 				dosyslog(LOG_INFO,
--				    "suppressed DECnet flip flop", a, e, e2);
-+				    "suppressed DECnet flip flop", a, e, e2,
-+				    interface);
- 			else
--				report("flip flop", a, e, e2, &t, &t2);
-+				report("flip flop", a, e, e2, &t, &t2,
-+					interface);
- 			ap->elist[1] = ap->elist[0];
- 			ap->elist[0] = ep;
- 			ep->t = t;
-@@ -151,7 +156,7 @@
- 			e2 = ap->elist[0]->e;
- 			t2 = ap->elist[0]->t;
- 			dosyslog(LOG_NOTICE, "reused old ethernet address",
--			    a, e, e2);
-+			    a, e, e2, interface);
- 			/* Shift entries down */
- 			len = i * sizeof(ap->elist[0]);
- 			BCOPY(&ap->elist[0], &ap->elist[1], len);
-@@ -165,12 +170,12 @@
- 	/* New ether address */
- 	e2 = ap->elist[0]->e;
- 	t2 = ap->elist[0]->t;
--	report("changed ethernet address", a, e, e2, &t, &t2);
-+	report("changed ethernet address", a, e, e2, &t, &t2, interface);
- 	/* Make room at head of list */
- 	alist_alloc(ap);
- 	len = ap->ecount * sizeof(ap->elist[0]);
- 	BCOPY(&ap->elist[0], &ap->elist[1], len);
--	ap->elist[0] = elist_alloc(a, e, t, h);
-+	ap->elist[0] = elist_alloc(a, e, t, h, interface);
- 	++ap->ecount;
- 	return (1);
- }
-@@ -227,7 +232,7 @@
- 		for (ap = &ainfo_table[i]; ap != NULL; ap = ap->next)
- 			for (j = 0; j < ap->ecount; ++j) {
- 				ep = ap->elist[j];
--				(*fn)(ap->a, ep->e, ep->t, ep->h);
-+				(*fn)(ap->a, ep->e, ep->t, ep->h, ep->i);
- 				++n;
- 			}
- 	return (n);
-@@ -259,7 +264,7 @@
- /* Allocate and initialize a elist struct */
- static struct einfo *
- elist_alloc(register u_int32_t a, register u_char *e, register time_t t,
--    register char *h)
-+    register char *h, char *interface)
- {
- 	register struct einfo *ep;
- 	register u_int size;
-@@ -286,6 +291,8 @@
- 	if (h != NULL && !isdigit((int)*h))
- 		strcpy(ep->h, h);
- 	ep->t = t;
-+	if (interface != NULL)
-+		strncpy(ep->i, interface, 16);
- 	return (ep);
- }
- 
-diff -Naru arpwatch-2.1a15.orig/db.h arpwatch-2.1a15/db.h
---- arpwatch-2.1a15.orig/db.h	1996-06-05 09:39:30.000000000 +0400
-+++ arpwatch-2.1a15/db.h	2006-09-22 19:41:19.000000000 +0400
-@@ -1,10 +1,10 @@
- /* @(#) $Header: db.h,v 1.8 96/06/04 22:39:29 leres Exp $ (LBL) */
- 
--typedef void (*ent_process)(u_int32_t, u_char *, time_t, char *);
-+typedef void (*ent_process)(u_int32_t, u_char *, time_t, char *, char *);
- 
- #ifdef	DEBUG
- void	debugdump(void);
- #endif
--int	ent_add(u_int32_t, u_char *, time_t, char *);
-+int	ent_add(u_int32_t, u_char *, time_t, char *, char *);
- int	ent_loop(ent_process);
- void	sorteinfo(void);
-diff -Naru arpwatch-2.1a15.orig/file.c arpwatch-2.1a15/file.c
---- arpwatch-2.1a15.orig/file.c	2000-10-14 02:29:43.000000000 +0400
-+++ arpwatch-2.1a15/file.c	2006-09-22 19:41:19.000000000 +0400
-@@ -69,6 +69,7 @@
- 	u_int32_t a;
- 	register time_t t;
- 	register struct hostent *hp;
-+	char *interface;
- 	char line[1024];
- 	u_char e[6];
- 
-@@ -117,6 +118,7 @@
- 		if (cp2 == NULL) {
- 			t = 0;
- 			h = NULL;
-+			interface = NULL;
- 		} else {
- 			t = atoi(cp2);
- 			h = strchr(cp2, '\t');
-@@ -126,11 +128,18 @@
- 				while (*cp2 != '\n' && *cp2 != '\t' &&
- 				    *cp2 != '\0')
- 					++cp2;
-+				if (*cp2 == '\t') {
-+				    *cp2++ = '\0';
-+				    while (*cp2 != '\n' && *cp2 != '\t' &&
-+					   *cp2 != '\0') ++cp2;
-+				} else {
-+				    interface = NULL;
-+				}
- 				*cp2 = '\0';
- 			}
- 		}
- 
--		if (!(*fn)(a, e, t, h))
-+		if (!(*fn)(a, e, t, h, interface))
- 			return(0);
- 	}
- 
-diff -Naru arpwatch-2.1a15.orig/file.h arpwatch-2.1a15/file.h
---- arpwatch-2.1a15.orig/file.h	1999-01-18 04:46:04.000000000 +0300
-+++ arpwatch-2.1a15/file.h	2006-09-22 19:41:19.000000000 +0400
-@@ -1,5 +1,5 @@
- /* @(#) $Header: file.h,v 1.4 99/01/17 17:46:03 leres Exp $ (LBL) */
- 
--typedef int (*file_process)(u_int32_t, u_char *, time_t, char *);
-+typedef int (*file_process)(u_int32_t, u_char *, time_t, char *, char *);
- 
- int file_loop(FILE *, file_process, const char *);
-diff -Naru arpwatch-2.1a15.orig/report.c arpwatch-2.1a15/report.c
---- arpwatch-2.1a15.orig/report.c	2006-09-22 19:44:44.000000000 +0400
-+++ arpwatch-2.1a15/report.c	2006-09-22 19:41:19.000000000 +0400
-@@ -233,7 +233,8 @@
- 
- void
- report(register char *title, register u_int32_t a, register u_char *e1,
--    register u_char *e2, register time_t *t1p, register time_t *t2p)
-+    register u_char *e2, register time_t *t1p, register time_t *t2p,
-+    char *interface)
- {
- 	extern char *path_sendmail;
- 	register char *cp, *hn;
-@@ -254,7 +255,7 @@
- 
- 	if (debug) {
- 		if (debug > 1) {
--			dosyslog(LOG_NOTICE, title, a, e1, e2);
-+			dosyslog(LOG_NOTICE, title, a, e1, e2, interface);
- 			return;
- 		}
- 		f = stdout;
-@@ -271,7 +272,7 @@
- 		}
- 
- 		/* Syslog this event too */
--		dosyslog(LOG_NOTICE, title, a, e1, e2);
-+		dosyslog(LOG_NOTICE, title, a, e1, e2, interface);
- 
- 		/* Update child depth */
- 		++cdepth;
-@@ -303,16 +304,19 @@
- 
- 	(void)fprintf(f, "From: %s\n", watchee);
- 	(void)fprintf(f, "To: %s\n", watcher);
-+	if (interface == NULL) interface = ""; /* shouldn't happen */
- 	hn = gethname(a);
- 	if (!isdigit(*hn))
--		(void)fprintf(f, "Subject: %s (%s)\n", title, hn);
-+		(void)fprintf(f, "Subject: %s (%s) %s\n", title, hn,
-+			      interface);
- 	else {
--		(void)fprintf(f, "Subject: %s\n", title);
-+		(void)fprintf(f, "Subject: %s %s\n", title, interface);
- 		hn = unknown;
- 	}
- 	(void)putc('\n', f);
- 	(void)fprintf(f, fmt, "hostname", hn);
- 	(void)fprintf(f, fmt, "ip address", intoa(a));
-+	(void)fprintf(f, fmt, "interface", interface);
- 	(void)fprintf(f, fmt, "ethernet address", e2str(e1));
- 	if ((cp = ec_find(e1)) == NULL)
- 		cp = unknown;
-diff -Naru arpwatch-2.1a15.orig/report.h arpwatch-2.1a15/report.h
---- arpwatch-2.1a15.orig/report.h	1996-06-05 09:40:54.000000000 +0400
-+++ arpwatch-2.1a15/report.h	2006-09-22 19:41:19.000000000 +0400
-@@ -1,3 +1,3 @@
- /* @(#) $Header: report.h,v 1.3 96/06/04 22:40:53 leres Exp $ (LBL) */
- 
--void report(char *, u_int32_t, u_char *, u_char *, time_t *, time_t *);
-+void report(char *, u_int32_t, u_char *, u_char *, time_t *, time_t *, char *);
-diff -Naru arpwatch-2.1a15.orig/util.c arpwatch-2.1a15/util.c
---- arpwatch-2.1a15.orig/util.c	2006-09-22 19:44:53.000000000 +0400
-+++ arpwatch-2.1a15/util.c	2006-09-22 19:41:19.000000000 +0400
-@@ -62,11 +62,12 @@
- int debug = 0;
- int initializing = 1;			/* true if initializing */
- int nopromisc = 0;			/* don't activate promisc mode by default */
-+int allsubnets = 0;			/* watch all attached subnets */
- 
- /* syslog() helper routine */
- void
- dosyslog(register int p, register char *s, register u_int32_t a,
--    register u_char *ea, register u_char *ha)
-+    register u_char *ea, register u_char *ha, char *interface)
- {
- 	char xbuf[64];
- 
-@@ -83,23 +84,21 @@
- 	}
- 
- 	if (debug)
--		fprintf(stderr, "%s: %s %s %s\n", prog, s, intoa(a), xbuf);
-+		fprintf(stderr, "%s: %s %s %s %s\n", prog, s, intoa(a),
-+			xbuf, interface);
- 	else
--		syslog(p, "%s %s %s", s, intoa(a), xbuf);
-+		syslog(p, "%s %s %s %s", s, intoa(a), xbuf, interface);
- }
- 
- static FILE *dumpf;
- 
- void
- dumpone(register u_int32_t a, register u_char *e, register time_t t,
--    register char *h)
-+    register char *h, char *interface)
- {
--	(void)fprintf(dumpf, "%s\t%s", e2str(e), intoa(a));
--	if (t != 0 || h != NULL)
--		(void)fprintf(dumpf, "\t%u", (u_int32_t)t);
--	if (h != NULL && *h != '\0')
--		(void)fprintf(dumpf, "\t%s", h);
--	(void)putc('\n', dumpf);
-+	(void)fprintf(dumpf, "%s\t%s\t%u\t%s\t%s\n", e2str(e), intoa(a),
-+		      (u_int32_t)t, ((h != NULL)?h:""),
-+		      ((interface != NULL)?interface:""));
- }
- 
- int
-diff -Naru arpwatch-2.1a15.orig/util.h arpwatch-2.1a15/util.h
---- arpwatch-2.1a15.orig/util.h	2006-09-22 19:44:53.000000000 +0400
-+++ arpwatch-2.1a15/util.h	2006-09-22 19:41:19.000000000 +0400
-@@ -1,8 +1,8 @@
- /* @(#) $Header: util.h,v 1.2 96/10/06 03:22:13 leres Exp $ (LBL) */
- 
--void	dosyslog(int, char *, u_int32_t, u_char *, u_char *);
-+void	dosyslog(int, char *, u_int32_t, u_char *, u_char *, char *);
- int	dump(void);
--void	dumpone(u_int32_t, u_char *, time_t, char *);
-+void	dumpone(u_int32_t, u_char *, time_t, char *, char *);
- int	readdata(void);
- char	*savestr(const char *);
- 
-@@ -18,3 +18,4 @@
- extern int debug;
- extern int initializing;
- extern int nopromisc;
-+extern int allsubnets;
diff --git a/main/arpwatch/07_all_arpwatch-2.1a15-specify-mail.patch b/main/arpwatch/07_all_arpwatch-2.1a15-specify-mail.patch
deleted file mode 100644
index b3b34b12461..00000000000
--- a/main/arpwatch/07_all_arpwatch-2.1a15-specify-mail.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.8 arpwatch-2.1a15/arpsnmp.8
---- arpwatch-2.1a15.orig/arpsnmp.8	2006-09-22 19:44:44.000000000 +0400
-+++ arpwatch-2.1a15/arpsnmp.8	2006-09-22 19:57:15.000000000 +0400
-@@ -42,6 +42,12 @@
- ]
- .br
- .ti +8
-+[
-+.B -m
-+.I addr
-+]
-+.br
-+.ti +8
- .I file
- [
- .I ...
-@@ -55,6 +61,13 @@
- .BR snmpwalk (1)).
- .LP
- The
-+.B -m
-+option is used to specify the e-mail address to which reports will be
-+sent. By default, reports are sent to
-+.I root
-+on the local machine. (This feature comes from Debian).
-+.LP
-+The
- .B -d
- flag is used enable debugging. This also inhibits mailing the reports.
- Instead, they are sent to
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.c arpwatch-2.1a15/arpsnmp.c
---- arpwatch-2.1a15.orig/arpsnmp.c	2006-09-22 19:46:34.000000000 +0400
-+++ arpwatch-2.1a15/arpsnmp.c	2006-09-22 19:57:55.000000000 +0400
-@@ -82,6 +82,7 @@
- 	char options[] =
- 		"d"
- 		"f:"
-+		"m:"
- 		"s:"
- 	;
- 
-@@ -111,6 +112,10 @@
- 			arpfile = optarg;
- 			break;
- 
-+		case 'm':
-+			mailaddress = optarg;
-+			break;
-+
- 		case 's':
- 			path_sendmail = optarg;
- 			break;
-@@ -197,6 +202,7 @@
- 	char usage[] =
- 		"[-d] "
- 		"[-f datafile] "
-+		"[-m e-mail ] "
- 		"[-s sendmail_path] "
- 		"file [...]\n"
- 	;
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8	2006-09-22 19:46:34.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8	2006-09-22 19:53:35.000000000 +0400
-@@ -46,7 +46,7 @@
- [
- .B -n
- .IR net [/ width
--]]
-+] ]
- .br
- .ti +8
- [
-@@ -56,6 +56,12 @@
- .br
- .ti +8
- [
-+.B -m
-+.I e-mail
-+]
-+.br
-+.ti +8
-+[
- .B -s
- .I sendmail_path
- ]
-@@ -120,6 +126,13 @@
- does not fork.
- .LP
- The
-+.B -m
-+option is used to specify the e-mail address to which reports will be
-+sent. By default, reports are sent to
-+.I root
-+on the local machine. (This feature comes from Debian).
-+.LP
-+The
- .B -s
- flag is used to specify the path to the sendmail program. Any program that
- takes the option -odi and then text from stdin can be substituted. This is
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c	2006-09-22 19:46:34.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c	2006-09-22 19:58:46.000000000 +0400
-@@ -163,6 +163,7 @@
- 		"n:"
- 		"N"
- 		"r:"
-+		"m:"
- 		"s:"
- 		"p"
- 		"a"
-@@ -216,6 +217,10 @@
- 			rfilename = optarg;
- 			break;
- 
-+		case 'm':
-+			mailaddress = optarg;
-+			break;
-+
- 		case 's':
- 			path_sendmail = optarg;
- 			break;
-@@ -784,6 +789,7 @@
- 		"[-i interface] "
- 		"[-n net[/width]] "
- 		"[-r file] "
-+		"[-m e-mail] "
- 		"[-s sendmail_path] "
- 		"[-p] "
- 		"[-a] "
-diff -Naru arpwatch-2.1a15.orig/report.c arpwatch-2.1a15/report.c
---- arpwatch-2.1a15.orig/report.c	2006-09-22 19:46:34.000000000 +0400
-+++ arpwatch-2.1a15/report.c	2006-09-22 19:59:18.000000000 +0400
-@@ -242,7 +242,7 @@
- 	register FILE *f;
- 	char tempfile[64], cpu[64], os[64];
- 	char *fmt = "%20s: %s\n";
--	char *watcher = WATCHER;
-+	char *watcher = mailaddress;
- 	char *watchee = WATCHEE;
- 	char *sendmail = path_sendmail;
- 	char *unknown = "<unknown>";
-diff -Naru arpwatch-2.1a15.orig/util.c arpwatch-2.1a15/util.c
---- arpwatch-2.1a15.orig/util.c	2006-09-22 19:46:34.000000000 +0400
-+++ arpwatch-2.1a15/util.c	2006-09-22 20:00:25.000000000 +0400
-@@ -50,6 +50,7 @@
- #include "ec.h"
- #include "file.h"
- #include "util.h"
-+#include "addresses.h"
- 
- char *arpdir = ARPDIR;
- char *arpfile = ARPFILE;
-@@ -63,6 +64,7 @@
- int initializing = 1;			/* true if initializing */
- int nopromisc = 0;			/* don't activate promisc mode by default */
- int allsubnets = 0;			/* watch all attached subnets */
-+char *mailaddress = WATCHER;
- 
- /* syslog() helper routine */
- void
-diff -Naru arpwatch-2.1a15.orig/util.h arpwatch-2.1a15/util.h
---- arpwatch-2.1a15.orig/util.h	2006-09-22 19:46:34.000000000 +0400
-+++ arpwatch-2.1a15/util.h	2006-09-22 20:00:39.000000000 +0400
-@@ -19,3 +19,4 @@
- extern int initializing;
- extern int nopromisc;
- extern int allsubnets;
-+extern char *mailaddress;
diff --git a/main/arpwatch/08_all_arpwatch-2.1a15-drop-priveleges.patch b/main/arpwatch/08_all_arpwatch-2.1a15-drop-priveleges.patch
deleted file mode 100644
index b0283e6a65c..00000000000
--- a/main/arpwatch/08_all_arpwatch-2.1a15-drop-priveleges.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8	2006-09-23 22:13:55.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8	2006-09-23 22:15:30.000000000 +0400
-@@ -75,6 +75,18 @@
- [
- .B -a
- ]
-+.br
-+.ti +8
-+[
-+.B -u
-+.I username
-+]
-+.br
-+.ti +8
-+[
-+.B -R
-+.I seconds
-+]
- .ad
- .SH DESCRIPTION
- .B Arpwatch
-@@ -159,6 +171,32 @@
- .B -N
- is given). (This feature comes from Debian).
- .LP
-+The
-+.B -u
-+flag instructs
-+.B arpwatch
-+to drop root privileges and change the UID to
-+.I username
-+and GID to the primary group of
-+.IR username .
-+This is recommended for security reasons, but
-+.I username
-+has to have write access to the default directory. (This feature comes from Debian).
-+.LP
-+The
-+.B -R
-+flag instructs
-+.B arpwatch
-+to restart in
-+.I seconds
-+seconds after the interface went down. By default, in such cases
-+arpwatch would print an error message and exit. This option is
-+ignored if either the
-+.B -r
-+or
-+.B -u
-+flags are used. (This feature comes from Debian).
-+.LP
- Note that an empty
- .I arp.dat
- file must be created before the first time you run
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c	2006-09-23 22:13:55.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c	2006-09-23 22:11:41.000000000 +0400
-@@ -62,7 +62,8 @@
- #include <string.h>
- #include <syslog.h>
- #include <unistd.h>
--
-+#include <pwd.h>
-+#include <grp.h>
- #include <pcap.h>
- 
- #include "gnuc.h"
-@@ -144,6 +145,24 @@
- 
- static char *interface;
- 
-+void dropprivileges(const char* user)
-+{
-+	struct passwd* pw;
-+	pw = getpwnam( user );
-+	if ( pw ) {
-+		if ( initgroups(pw->pw_name, 0) != 0 || setgid(pw->pw_gid) != 0 ||
-+			setuid(pw->pw_uid) != 0 ) {
-+			syslog(LOG_ERR, "Couldn't change to '%.32s' uid=%d gid=%d", user,pw->pw_uid, pw->pw_gid);
-+			exit(1);
-+		}
-+	}
-+	else {
-+		syslog(LOG_ERR, "Couldn't find user '%.32s' in /etc/passwd", user);
-+		exit(1);
-+	}
-+	syslog(LOG_INFO, "Running as uid=%d gid=%d", getuid(), getgid());
-+}
-+
- int
- main(int argc, char **argv)
- {
-@@ -156,6 +175,7 @@
- 	register char *rfilename;
- 	struct bpf_program code;
- 	char errbuf[PCAP_ERRBUF_SIZE];
-+	char* username = NULL;
- 	char options[] =
- 		"d"
- 		"f:"
-@@ -167,6 +187,7 @@
- 		"s:"
- 		"p"
- 		"a"
-+		"u:"
- 	;
- 
- 	if (argv[0] == NULL)
-@@ -233,6 +254,10 @@
- 			++allsubnets;
- 			break;
- 
-+		case 'u':
-+			username = optarg;
-+			break;
-+
- 		default:
- 			usage();
- 		}
-@@ -310,12 +335,16 @@
- #endif
- 	}
- 
-+	if ( username ) {
-+		dropprivileges( username );
-+	} else {
- 	/*
- 	 * Revert to non-privileged user after opening sockets
- 	 * (not needed on most systems).
- 	 */
--	setgid(getgid());
--	setuid(getuid());
-+		setgid(getgid());
-+		setuid(getuid());
-+	}
- 
- 	/* Must be ethernet or fddi */
- 	linktype = pcap_datalink(pd);
-@@ -793,6 +822,7 @@
- 		"[-s sendmail_path] "
- 		"[-p] "
- 		"[-a] "
-+		"[-u username] "
- 		"\n"
- 	;
- 
diff --git a/main/arpwatch/09_all_arpwatch-2.1a15-quite-mail.patch b/main/arpwatch/09_all_arpwatch-2.1a15-quite-mail.patch
deleted file mode 100644
index ce5c4b244b2..00000000000
--- a/main/arpwatch/09_all_arpwatch-2.1a15-quite-mail.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8	2006-09-23 22:16:05.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8	2006-09-23 22:17:15.000000000 +0400
-@@ -87,6 +87,11 @@
- .B -R
- .I seconds
- ]
-+.br
-+.ti +8
-+[
-+.B -Q
-+]
- .ad
- .SH DESCRIPTION
- .B Arpwatch
-@@ -197,6 +202,10 @@
- .B -u
- flags are used. (This feature comes from Debian).
- .LP
-+The
-+.B -Q
-+flags prevents arpwatch from sending reports by mail. (This feature comes from Debian).
-+.LP
- Note that an empty
- .I arp.dat
- file must be created before the first time you run
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c	2006-09-23 22:16:05.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c	2006-09-23 22:18:10.000000000 +0400
-@@ -188,6 +188,7 @@
- 		"p"
- 		"a"
- 		"u:"
-+		"Q"
- 	;
- 
- 	if (argv[0] == NULL)
-@@ -258,6 +259,11 @@
- 			username = optarg;
- 			break;
- 
-+		case 'Q':
-+			++quiet;
-+			break;
-+
-+
- 		default:
- 			usage();
- 		}
-@@ -823,6 +829,7 @@
- 		"[-p] "
- 		"[-a] "
- 		"[-u username] "
-+		"[-Q ] "
- 		"\n"
- 	;
- 
-diff -Naru arpwatch-2.1a15.orig/report.c arpwatch-2.1a15/report.c
---- arpwatch-2.1a15.orig/report.c	2006-09-23 22:13:55.000000000 +0400
-+++ arpwatch-2.1a15/report.c	2006-09-23 22:17:15.000000000 +0400
-@@ -274,6 +274,10 @@
- 		/* Syslog this event too */
- 		dosyslog(LOG_NOTICE, title, a, e1, e2, interface);
- 
-+		/* return if watcher is an empty string */
-+		if ( quiet )
-+			return;
-+
- 		/* Update child depth */
- 		++cdepth;
- 
-diff -Naru arpwatch-2.1a15.orig/util.c arpwatch-2.1a15/util.c
---- arpwatch-2.1a15.orig/util.c	2006-09-23 22:13:55.000000000 +0400
-+++ arpwatch-2.1a15/util.c	2006-09-23 22:17:15.000000000 +0400
-@@ -65,6 +65,7 @@
- int nopromisc = 0;			/* don't activate promisc mode by default */
- int allsubnets = 0;			/* watch all attached subnets */
- char *mailaddress = WATCHER;
-+int quiet = 0;				/* send mail by default */
- 
- /* syslog() helper routine */
- void
-diff -Naru arpwatch-2.1a15.orig/util.h arpwatch-2.1a15/util.h
---- arpwatch-2.1a15.orig/util.h	2006-09-23 22:13:55.000000000 +0400
-+++ arpwatch-2.1a15/util.h	2006-09-23 22:17:15.000000000 +0400
-@@ -20,3 +20,4 @@
- extern int nopromisc;
- extern int allsubnets;
- extern char *mailaddress;
-+extern int quiet;
diff --git a/main/arpwatch/10_all_arpwatch-2.1a15-ignore-net.patch b/main/arpwatch/10_all_arpwatch-2.1a15-ignore-net.patch
deleted file mode 100644
index 2b9405d81ed..00000000000
--- a/main/arpwatch/10_all_arpwatch-2.1a15-ignore-net.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8	2006-09-23 22:19:29.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8	2006-09-23 22:19:55.000000000 +0400
-@@ -92,6 +92,12 @@
- [
- .B -Q
- ]
-+.br
-+.ti +8
-+[
-+.B -z
-+.I ignorenet/ignoremask
-+]
- .ad
- .SH DESCRIPTION
- .B Arpwatch
-@@ -206,6 +212,11 @@
- .B -Q
- flags prevents arpwatch from sending reports by mail. (This feature comes from Debian).
- .LP
-+The
-+.B -z
-+flag is used to set a range of ip addresses to ignore (such as a DHCP
-+range). Netmask is specified as 255.255.128.0. (This feature comes from Debian).
-+.LP
- Note that an empty
- .I arp.dat
- file must be created before the first time you run
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c	2006-09-23 22:19:29.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c	2006-09-23 22:19:55.000000000 +0400
-@@ -125,6 +125,9 @@
- static int nets_ind;
- static int nets_size;
- 
-+static struct in_addr ignore_net;
-+static struct in_addr ignore_netmask;
-+
- extern int optind;
- extern int opterr;
- extern char *optarg;
-@@ -189,7 +192,9 @@
- 		"a"
- 		"u:"
- 		"Q"
-+		"z:"
- 	;
-+	char *tmpptr;
- 
- 	if (argv[0] == NULL)
- 		prog = "arpwatch";
-@@ -207,6 +212,9 @@
- 	interface = NULL;
- 	rfilename = NULL;
- 	pd = NULL;
-+	
-+	inet_aton("0.0.0.0", &ignore_netmask);
-+	inet_aton("255.255.255.255", &ignore_netmask);
- 	while ((op = getopt(argc, argv, options)) != EOF)
- 		switch (op) {
- 
-@@ -263,6 +271,12 @@
- 			++quiet;
- 			break;
- 
-+		case 'z':
-+			tmpptr = strtok(optarg, "/");
-+			inet_aton(tmpptr, &ignore_net);
-+			tmpptr = strtok(NULL, "/");
-+			inet_aton(tmpptr, &ignore_netmask);
-+			break;
- 
- 		default:
- 			usage();
-@@ -465,6 +479,14 @@
- 		return;
- 	}
- 
-+	/* Ignores the specified netmask/metwork */
-+	if ((sia & ignore_netmask.s_addr) == ignore_net.s_addr) {
-+		if (debug) {
-+			dosyslog(LOG_INFO, "ignored", sia, sea, sha, interface);
-+		}
-+		return;
-+	}
-+
- 	/* Got a live one */
- 	t = h->ts.tv_sec;
- 	can_checkpoint = 0;
-@@ -830,6 +852,7 @@
- 		"[-a] "
- 		"[-u username] "
- 		"[-Q ] "
-+		"[-z ignorenet/ignoremask] "
- 		"\n"
- 	;
- 
diff --git a/main/arpwatch/11_all_arpwatch-2.1a15-secure-tmp.patch b/main/arpwatch/11_all_arpwatch-2.1a15-secure-tmp.patch
deleted file mode 100644
index 4e9cd88b8ad..00000000000
--- a/main/arpwatch/11_all_arpwatch-2.1a15-secure-tmp.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/bihourly.sh arpwatch-2.1a15/bihourly.sh
---- arpwatch-2.1a15.orig/bihourly.sh	2006-07-28 22:19:45.000000000 +0400
-+++ arpwatch-2.1a15/bihourly.sh	2006-09-22 21:29:38.000000000 +0400
-@@ -10,8 +10,8 @@
- #
- list="`cat list`"
- cname="`cat cname`"
--temp1=/tmp/bihourly.1.$$
--temp2=/tmp/bihourly.2.$$
-+temp1=$(mktemp)
-+temp2=$(mktemp)
- d=/tmp/errs
- 
- # imperfect hack
-diff -Naru arpwatch-2.1a15.orig/mkdep arpwatch-2.1a15/mkdep
---- arpwatch-2.1a15.orig/mkdep	1996-06-23 13:25:24.000000000 +0400
-+++ arpwatch-2.1a15/mkdep	2006-09-22 21:30:04.000000000 +0400
-@@ -51,7 +51,7 @@
- 	exit 1
- fi
- 
--TMP=/tmp/mkdep$$
-+TMP=$(mktemp)
- 
- trap 'rm -f $TMP ; exit 1' 1 2 3 13 15
- 
diff --git a/main/arpwatch/12_all_arpwatch-2.1a15-defalt-dir-in-manpages.patch b/main/arpwatch/12_all_arpwatch-2.1a15-defalt-dir-in-manpages.patch
deleted file mode 100644
index de4db37b68e..00000000000
--- a/main/arpwatch/12_all_arpwatch-2.1a15-defalt-dir-in-manpages.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpsnmp.8 arpwatch-2.1a15/arpsnmp.8
---- arpwatch-2.1a15.orig/arpsnmp.8	2006-09-22 20:02:04.000000000 +0400
-+++ arpwatch-2.1a15/arpsnmp.8	2006-09-22 21:35:52.000000000 +0400
-@@ -100,7 +100,7 @@
- .na
- .nh
- .nf
--/usr/operator/arpwatch - default directory
-+/usr/lib/arpwatch - default directory
- arp.dat - ethernet/ip address database
- ethercodes.dat - vendor ethernet block list
- .ad
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8	2006-09-22 20:32:56.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8	2006-09-22 21:36:16.000000000 +0400
-@@ -275,7 +275,7 @@
- .na
- .nh
- .nf
--/usr/operator/arpwatch - default directory
-+/usr/lib/arpwatch - default directory
- arp.dat - ethernet/ip address database
- ethercodes.dat - vendor ethernet block list
- .ad
diff --git a/main/arpwatch/13_all_arpwatch-2.1a15-scripts-awk.patch b/main/arpwatch/13_all_arpwatch-2.1a15-scripts-awk.patch
deleted file mode 100644
index 227fd328de4..00000000000
--- a/main/arpwatch/13_all_arpwatch-2.1a15-scripts-awk.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arp2ethers arpwatch-2.1a15/arp2ethers
---- arpwatch-2.1a15.orig/arp2ethers	2002-01-05 22:40:48.000000000 +0300
-+++ arpwatch-2.1a15/arp2ethers	2006-09-23 22:47:02.000000000 +0400
-@@ -13,11 +13,10 @@
- #	- sort
- #
- 
--sort +2rn arp.dat | \
--    awk 'NF == 4 { print }' | \
-+export AWKPATH="$AWKPATH:/usr/share/arpwatch/awk"
-+
-+sort -k 3rn ${1:-/var/lib/arpwatch/arp.dat} | \
-     awk -f p.awk | \
--    egrep -v '\.[0-9][0-9]*$' | \
--    sed -e 's/	.*	/	/' | \
-     awk -f d.awk | \
-     awk -f e.awk | \
-     sort
-diff -Naru arpwatch-2.1a15.orig/massagevendor arpwatch-2.1a15/massagevendor
---- arpwatch-2.1a15.orig/massagevendor	2004-01-28 22:32:43.000000000 +0300
-+++ arpwatch-2.1a15/massagevendor	2006-09-23 22:49:42.000000000 +0400
-@@ -9,6 +9,9 @@
- #
- # - Deal with duplicates in oui.txt (concatenate company names)
- #
-+
-+export AWKPATH="$AWKPATH:/usr/share/arpwatch/awk"
-+
- (sed -n \
-     -e 's/^\([0-9A-F][0-9A-F]\)-\([0-9A-F][0-9A-F]\)-\([0-9A-F][0-9A-F]\)  *(hex)[ 	]*\(..*\)/\1\2\3	\4/p' \
-     $* | \
diff --git a/main/arpwatch/14_all_arpwatch-2.1a15-paths-fix.patch b/main/arpwatch/14_all_arpwatch-2.1a15-paths-fix.patch
deleted file mode 100644
index 6162aeebfc8..00000000000
--- a/main/arpwatch/14_all_arpwatch-2.1a15-paths-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpwatch.h arpwatch-2.1a15/arpwatch.h
---- arpwatch-2.1a15.orig/arpwatch.h	2000-10-01 03:40:55.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.h	2006-09-22 22:48:13.000000000 +0400
-@@ -1,7 +1,7 @@
- /* @(#) $Id: arpwatch.h,v 1.29 2000/09/30 23:40:49 leres Exp $ (LBL) */
- 
- #define ARPFILE "arp.dat"
--#define ETHERCODES "ethercodes.dat"
-+/*#define ETHERCODES "ethercodes.dat" */
- #define CHECKPOINT (15*60)		/* Checkpoint time in seconds */
- 
- #define MEMCMP(a, b, n) memcmp((char *)a, (char *)b, n)
-diff -Naru arpwatch-2.1a15.orig/Makefile.in arpwatch-2.1a15/Makefile.in
---- arpwatch-2.1a15.orig/Makefile.in	2006-09-22 22:48:59.000000000 +0400
-+++ arpwatch-2.1a15/Makefile.in	2006-09-22 22:49:23.000000000 +0400
-@@ -31,7 +31,8 @@
- # Pathname of directory to install the man page
- MANDEST = @mandir@
- # Pathname of directory to install database file
--ARPDIR = $(prefix)/arpwatch
-+ARPDIR = /var/lib/arpwatch
-+ETHERCODES = /usr/share/arpwatch/ethercodes.dat
- 
- # VPATH
- srcdir = @srcdir@
-@@ -45,7 +46,8 @@
- PROG = arpwatch
- CCOPT = @V_CCOPT@
- INCLS = -I. @V_INCLS@
--DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\"
-+DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\" \
-+       -DETHERCODES=\"$(ETHERCODES)\"
- 
- # Standard CFLAGS
- CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
diff --git a/main/arpwatch/15_all_arpwatch-2.1a15-fix-dead-lock.patch b/main/arpwatch/15_all_arpwatch-2.1a15-fix-dead-lock.patch
deleted file mode 100644
index 9e94c7dd0cf..00000000000
--- a/main/arpwatch/15_all_arpwatch-2.1a15-fix-dead-lock.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/report.c arpwatch-2.1a15/report.c
---- arpwatch-2.1a15.orig/report.c	2006-09-23 19:31:47.000000000 +0400
-+++ arpwatch-2.1a15/report.c	2006-09-23 19:38:54.000000000 +0400
-@@ -217,7 +217,12 @@
- 				continue;
- 			/* ECHILD means no one left */
- 			if (errno != ECHILD)
--				syslog(LOG_ERR, "reaper: %m");
-+				/* It is dangerous to call non reentrant */
-+				/* functions from callback (POSIX) */
-+				/* Next line effectively disables this as */
-+				/* we never get here in debug */
-+				if (debug)
-+					syslog(LOG_ERR, "reaper: %m");
- 			break;
- 		}
- 		/* Already got everyone who was done */
-@@ -225,8 +230,13 @@
- 			break;
- 		--cdepth;
- 		if (WEXITSTATUS(status))
-+			/* It is dangerous to call non-reentrant */
-+			/* functions from callback (POSIX) */
-+			/* Next line effectively disables this as */
-+			/* we never get here in debug */
-+			if (debug)
- 			syslog(LOG_DEBUG, "reaper: pid %d, exit status %d",
--			    pid, WEXITSTATUS(status));
-+				    pid, WEXITSTATUS(status));
- 	}
- 	return RETSIGVAL;
- }
diff --git a/main/arpwatch/16_all_arpwatch-2.1a15-additional-manpages-cleanups.patch b/main/arpwatch/16_all_arpwatch-2.1a15-additional-manpages-cleanups.patch
deleted file mode 100644
index c026fcfc48b..00000000000
--- a/main/arpwatch/16_all_arpwatch-2.1a15-additional-manpages-cleanups.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8	2006-09-23 22:23:03.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8	2006-09-23 22:22:15.000000000 +0400
-@@ -30,70 +30,70 @@
- .B -dN
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -f
- .I datafile
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -i
- .I interface
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -n
- .IR net [/ width
- ] ]
- .br
--.ti +8
-+.ti +9
- [
- .B -r
- .I file
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -m
- .I e-mail
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -s
- .I sendmail_path
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -p
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -a
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -u
- .I username
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -R
- .I seconds
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -Q
- ]
- .br
--.ti +8
-+.ti +9
- [
- .B -z
- .I ignorenet/ignoremask
-@@ -175,9 +175,9 @@
- .B -a
- flag tells
- .B arpwatch
--to report bogons about every IP address. By default,
-+to record bogons about every IP address. By default,
- .B arpwatch
--reports bogons for IP addresses that are in the same subnet with the first IP
-+records bogons for IP addresses that are in the same subnet with the first IP
- address of the default interface (unless
- .B -N
- is given). (This feature comes from Debian).
diff --git a/main/arpwatch/17_all_arpwatch-2.1a15-restart.patch b/main/arpwatch/17_all_arpwatch-2.1a15-restart.patch
deleted file mode 100644
index 9c7f119df4e..00000000000
--- a/main/arpwatch/17_all_arpwatch-2.1a15-restart.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c	2006-09-23 22:20:51.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c	2006-09-23 22:24:49.000000000 +0400
-@@ -179,6 +179,8 @@
- 	struct bpf_program code;
- 	char errbuf[PCAP_ERRBUF_SIZE];
- 	char* username = NULL;
-+	int restart = 0;
-+	int restarting_loop = 0;
- 	char options[] =
- 		"d"
- 		"f:"
-@@ -191,6 +193,7 @@
- 		"p"
- 		"a"
- 		"u:"
-+		"R:"
- 		"Q"
- 		"z:"
- 	;
-@@ -267,6 +270,10 @@
- 			username = optarg;
- 			break;
- 
-+		case 'R':
-+			restart = atoi(optarg);
-+			break;
-+
- 		case 'Q':
- 			++quiet;
- 			break;
-@@ -285,6 +292,12 @@
- 	if (optind != argc)
- 		usage();
- 
-+	if ( username && restart ) {
-+		syslog(LOG_ERR, "Please, specify either -u or -R");		
-+		(void)fprintf(stderr,"Please, specify either -u or -R. See arpwatch.8\n");
-+		exit(1);
-+	}
-+
- 	if (rfilename != NULL) {
- 		net = 0;
- 		netmask = 0;
-@@ -334,6 +347,7 @@
- 		syslog(LOG_ERR, "(using current working directory)");
- 	}
- 
-+label_restart:
- 	if (rfilename != NULL) {
- 		pd = pcap_open_offline(rfilename, errbuf);
- 		if (pd == NULL) {
-@@ -348,22 +362,30 @@
- 		pd = pcap_open_live(interface, snaplen, !nopromisc, timeout, errbuf);
- 		if (pd == NULL) {
- 			syslog(LOG_ERR, "pcap open %s: %s", interface, errbuf);
--			exit(1);
-+			if (restart) {
-+				syslog(LOG_ERR, "restart in %d secs", restart);
-+			} else {
-+				exit(1);
-+			}
-+			sleep(restart);
-+			goto label_restart;
- 		}
- #ifdef WORDS_BIGENDIAN
- 		swapped = 1;
- #endif
- 	}
- 
--	if ( username ) {
--		dropprivileges( username );
--	} else {
--	/*
--	 * Revert to non-privileged user after opening sockets
--	 * (not needed on most systems).
--	 */
--		setgid(getgid());
--		setuid(getuid());
-+	if (!restarting_loop) {
-+		if ( username && !restart ) {
-+			dropprivileges( username );
-+		} else {
-+			/*
-+			 * Revert to non-privileged user after opening sockets
-+			 * (not needed on most systems).
-+			 */
-+			setgid(getgid());
-+			setuid(getuid());
-+		}
- 	}
- 
- 	/* Must be ethernet or fddi */
-@@ -386,26 +408,30 @@
- 	if (rfilename == NULL)
- 		syslog(LOG_INFO, "listening on %s", interface);
- 
--	/* Read in database */
--	initializing = 1;
--	if (!readdata())
--		exit(1);
--	sorteinfo();
-+	if (!restarting_loop) {
-+		/* Read in database */
-+		initializing = 1;
-+		if (!readdata())
-+			exit(1);
-+		sorteinfo();
-+	}
- #ifdef DEBUG
- 	if (debug > 2) {
- 		debugdump();
- 		exit(0);
- 	}
- #endif
--	initializing = 0;
-+	if (!restarting_loop) {
-+		initializing = 0;
- 
--	(void)setsignal(SIGINT, die);
--	(void)setsignal(SIGTERM, die);
--	(void)setsignal(SIGHUP, die);
--	if (rfilename == NULL) {
--		(void)setsignal(SIGQUIT, checkpoint);
--		(void)setsignal(SIGALRM, checkpoint);
--		(void)alarm(CHECKPOINT);
-+		(void)setsignal(SIGINT, die);
-+		(void)setsignal(SIGTERM, die);
-+		(void)setsignal(SIGHUP, die);
-+		if (rfilename == NULL) {
-+			(void)setsignal(SIGQUIT, checkpoint);
-+			(void)setsignal(SIGALRM, checkpoint);
-+			(void)alarm(CHECKPOINT);
-+		}
- 	}
- 
- 	switch (linktype) {
-@@ -424,7 +450,15 @@
- 	}
- 	if (status < 0) {
- 		syslog(LOG_ERR, "pcap_loop: %s", pcap_geterr(pd));
--		exit(1);
-+		if (restart && rfilename == NULL) {
-+			syslog(LOG_ERR, "restart in %d secs", restart);
-+			++restarting_loop;
-+			pcap_close(pd);
-+		} else {
-+			exit(1);
-+		}
-+		sleep(restart);
-+		goto label_restart;
- 	}
- 	pcap_close(pd);
- 	if (!dump())
-@@ -851,6 +885,7 @@
- 		"[-p] "
- 		"[-a] "
- 		"[-u username] "
-+		"[-R seconds ] "
- 		"[-Q ] "
- 		"[-z ignorenet/ignoremask] "
- 		"\n"
diff --git a/main/arpwatch/18_all_arpwatch-2.1a15-nofork.patch b/main/arpwatch/18_all_arpwatch-2.1a15-nofork.patch
deleted file mode 100644
index 83447f794f9..00000000000
--- a/main/arpwatch/18_all_arpwatch-2.1a15-nofork.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Origianl idea comes from Matthias Andree.
-
-diff -Naru arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8	2006-09-24 09:34:36.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.8	2006-09-24 10:06:24.000000000 +0400
-@@ -27,7 +27,12 @@
- .na
- .B arpwatch
- [
--.B -dN
-+.B -d
-+]
-+.br
-+.ti +9
-+[
-+.B -F
- ]
- .br
- .ti +9
-@@ -50,6 +55,11 @@
- .br
- .ti +9
- [
-+.B -N
-+]
-+.br
-+.ti +9
-+[
- .B -r
- .I file
- ]
-@@ -115,6 +125,14 @@
- .IR stderr .
- .LP
- The
-+.B -F
-+flag is used to prevent 
-+.I arpwatch
-+from forking. This is allows to run
-+.I arpwatch
-+from daemon tools.
-+.LP
-+The
- .B -f
- flag is used to set the ethernet/ip address database filename.
- The default is
-diff -Naru arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c	2006-09-24 09:34:36.000000000 +0400
-+++ arpwatch-2.1a15/arpwatch.c	2006-09-24 10:10:17.000000000 +0400
-@@ -179,10 +179,12 @@
- 	struct bpf_program code;
- 	char errbuf[PCAP_ERRBUF_SIZE];
- 	char* username = NULL;
-+	int nofork = 0;
- 	int restart = 0;
- 	int restarting_loop = 0;
- 	char options[] =
- 		"d"
-+		"F"
- 		"f:"
- 		"i:"
- 		"n:"
-@@ -229,6 +231,10 @@
- #endif
- 			break;
- 
-+		case 'F':
-+			++nofork;
-+			break;
-+
- 		case 'f':
- 			arpfile = optarg;
- 			break;
-@@ -319,12 +325,14 @@
- 
- 		/* Drop into the background if not debugging */
- 		if (!debug) {
--			pid = fork();
--			if (pid < 0) {
--				syslog(LOG_ERR, "main fork(): %m");
--				exit(1);
--			} else if (pid != 0)
--				exit(0);
-+			if (!nofork) {
-+				pid = fork();
-+				if (pid < 0) {
-+					syslog(LOG_ERR, "main fork(): %m");
-+					exit(1);
-+				} else if (pid != 0)
-+					exit(0);
-+			}
- 			(void)close(fileno(stdin));
- 			(void)close(fileno(stdout));
- 			(void)close(fileno(stderr));
diff --git a/main/arpwatch/19_all_arpwatch-2.1a15-nonewstation.patch b/main/arpwatch/19_all_arpwatch-2.1a15-nonewstation.patch
deleted file mode 100644
index 521d31ae1bf..00000000000
--- a/main/arpwatch/19_all_arpwatch-2.1a15-nonewstation.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -Naur arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8	2006-12-11 12:56:18.000000000 +0300
-+++ arpwatch-2.1a15/arpwatch.8	2006-12-11 12:56:53.000000000 +0300
-@@ -60,6 +60,11 @@
- .br
- .ti +9
- [
-+.B -S
-+]
-+.br
-+.ti +9
-+[
- .B -r
- .I file
- ]
-@@ -155,6 +160,10 @@
- flag disables reporting any bogons.
- .LP
- The
-+.B -S
-+flag disables reporting of new stations.
-+.LP
-+The
- .B -r
- flag is used to specify a savefile
- (perhaps created by
-diff -Naur arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c	2006-12-11 12:56:18.000000000 +0300
-+++ arpwatch-2.1a15/arpwatch.c	2006-12-11 12:56:53.000000000 +0300
-@@ -189,6 +189,7 @@
- 		"i:"
- 		"n:"
- 		"N"
-+		"S"
- 		"r:"
- 		"m:"
- 		"s:"
-@@ -252,6 +253,10 @@
- 			++nobogons;
- 			break;
- 
-+		case 'S':
-+			++nonewstations;
-+			break;
-+
- 		case 'r':
- 			rfilename = optarg;
- 			break;
-@@ -883,7 +888,7 @@
- {
- 	extern char version[];
- 	char usage[] =
--		"[-dN] "
-+		"[-dNS] "
- 		"[-f datafile] "
- 		"[-i interface] "
- 		"[-n net[/width]] "
-@@ -894,7 +899,7 @@
- 		"[-a] "
- 		"[-u username] "
- 		"[-R seconds ] "
--		"[-Q ] "
-+		"[-Q] "
- 		"[-z ignorenet/ignoremask] "
- 		"\n"
- 	;
-diff -Naur arpwatch-2.1a15.orig/arpwatch.h arpwatch-2.1a15/arpwatch.h
---- arpwatch-2.1a15.orig/arpwatch.h	2006-12-11 12:56:18.000000000 +0300
-+++ arpwatch-2.1a15/arpwatch.h	2006-12-11 12:57:13.000000000 +0300
-@@ -16,6 +16,8 @@
- 
- extern char *prog;
- 
-+extern int nonewstations; /* Turns off new-station reporting. */
-+
- #ifdef ETHER_HEADER_HAS_EA
- #define ESRC(ep) ((ep)->ether_shost.ether_addr_octet)
- #define EDST(ep) ((ep)->ether_dhost.ether_addr_octet)
-diff -Naur arpwatch-2.1a15.orig/db.c arpwatch-2.1a15/db.c
---- arpwatch-2.1a15.orig/db.c	2006-12-11 12:56:18.000000000 +0300
-+++ arpwatch-2.1a15/db.c	2006-12-11 12:57:34.000000000 +0300
-@@ -86,6 +86,8 @@
- static void check_hname(struct ainfo *);
- struct ainfo *newainfo(void);
- 
-+int nonewstations = 0;
-+
- int
- ent_add(register u_int32_t a, register u_char *e, time_t t, register char *h,
- 	char *interface)
-@@ -118,7 +120,8 @@
- 	if (ap->ecount == 0) {
- 		ap->ecount = 1;
- 		ap->elist[0] = elist_alloc(a, e, t, h, interface);
--		report("new station", a, e, NULL, &t, NULL, interface);
-+		if (!nonewstations)
-+			report("new station", a, e, NULL, &t, NULL, interface);
- 		return (1);
- 	}
- 
diff --git a/main/arpwatch/20_all_arpwatch-2.1a15-noreversedns-resolve.patch b/main/arpwatch/20_all_arpwatch-2.1a15-noreversedns-resolve.patch
deleted file mode 100644
index b2d523d491c..00000000000
--- a/main/arpwatch/20_all_arpwatch-2.1a15-noreversedns-resolve.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -Naur arpwatch-2.1a15.orig/arpwatch.8 arpwatch-2.1a15/arpwatch.8
---- arpwatch-2.1a15.orig/arpwatch.8	2006-12-11 13:00:39.000000000 +0300
-+++ arpwatch-2.1a15/arpwatch.8	2006-12-11 13:00:55.000000000 +0300
-@@ -110,6 +110,11 @@
- .br
- .ti +9
- [
-+.B -D
-+]
-+.br
-+.ti +9
-+[
- .B -z
- .I ignorenet/ignoremask
- ]
-@@ -240,6 +245,10 @@
- flags prevents arpwatch from sending reports by mail. (This feature comes from Debian).
- .LP
- The
-+.B -D
-+flag turns off reverse-DNS queries. This can speed up operations significantly.
-+.LP
-+The
- .B -z
- flag is used to set a range of ip addresses to ignore (such as a DHCP
- range). Netmask is specified as 255.255.128.0. (This feature comes from Debian).
-diff -Naur arpwatch-2.1a15.orig/arpwatch.c arpwatch-2.1a15/arpwatch.c
---- arpwatch-2.1a15.orig/arpwatch.c	2006-12-11 13:00:39.000000000 +0300
-+++ arpwatch-2.1a15/arpwatch.c	2006-12-11 13:00:55.000000000 +0300
-@@ -198,6 +198,7 @@
- 		"u:"
- 		"R:"
- 		"Q"
-+		"D"
- 		"z:"
- 	;
- 	char *tmpptr;
-@@ -289,6 +290,10 @@
- 			++quiet;
- 			break;
- 
-+		case 'D':
-+			++noreversedns;
-+			break;
-+
- 		case 'z':
- 			tmpptr = strtok(optarg, "/");
- 			inet_aton(tmpptr, &ignore_net);
-@@ -900,6 +905,7 @@
- 		"[-u username] "
- 		"[-R seconds ] "
- 		"[-Q] "
-+		"[-D] "
- 		"[-z ignorenet/ignoremask] "
- 		"\n"
- 	;
-diff -Naur arpwatch-2.1a15.orig/arpwatch.h arpwatch-2.1a15/arpwatch.h
---- arpwatch-2.1a15.orig/arpwatch.h	2006-12-11 13:00:39.000000000 +0300
-+++ arpwatch-2.1a15/arpwatch.h	2006-12-11 13:00:55.000000000 +0300
-@@ -17,6 +17,7 @@
- extern char *prog;
- 
- extern int nonewstations; /* Turns off new-station reporting. */
-+extern int noreversedns; /* Turns off reverse-dns. */
- 
- #ifdef ETHER_HEADER_HAS_EA
- #define ESRC(ep) ((ep)->ether_shost.ether_addr_octet)
-diff -Naur arpwatch-2.1a15.orig/dns.c arpwatch-2.1a15/dns.c
---- arpwatch-2.1a15.orig/dns.c	2000-10-14 05:50:52.000000000 +0400
-+++ arpwatch-2.1a15/dns.c	2006-12-11 13:01:07.000000000 +0300
-@@ -71,6 +71,8 @@
- } querybuf;
- #endif
- 
-+int noreversedns = 0;
-+
- int
- gethinfo(register char *hostname, register char *cpu, register int cpulen,
-     register char *os, register int oslen)
-@@ -84,6 +86,9 @@
- 	register int type, class, buflen, ancount, qdcount;
- 	querybuf qbuf;
- 
-+	if (noreversedns)
-+		return (0);
-+
- 	qb = &qbuf;
- 	n = res_query(hostname, C_IN, T_HINFO, qb->buf, sizeof(qb->buf));
- 	if (n < 0)
-@@ -144,6 +149,9 @@
- 	register int32_t options;
- 	register struct hostent *hp;
- 
-+	if (noreversedns)
-+		return (intoa(a));
-+
- 	options = _res.options;
- 	_res.options |= RES_AAONLY;
- 	_res.options &= ~(RES_DEFNAMES | RES_DNSRCH);
diff --git a/main/arpwatch/21_all_arpwatch-2.1a15-pid-filename.patch b/main/arpwatch/21_all_arpwatch-2.1a15-pid-filename.patch
deleted file mode 100644
index af4d6ca51c7..00000000000
--- a/main/arpwatch/21_all_arpwatch-2.1a15-pid-filename.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- ./arpwatch.8.orig	2007-03-27 22:06:16.000000000 +0400
-+++ ./arpwatch.8	2007-03-27 22:08:41.000000000 +0400
-@@ -88,6 +88,12 @@
- .br
- .ti +9
- [
-+.B -P
-+.I pid_path
-+]
-+.br
-+.ti +9
-+[
- .B -a
- ]
- .br
-@@ -204,6 +210,10 @@
- YMMV. (This feature comes from Debian).
- .LP
- The
-+.B -P
-+flag is used to specify pid filename. Default is set to /var/run/arpwatch.pid.
-+.LP
-+The
- .B -a
- flag tells
- .B arpwatch
---- ./arpwatch.h.orig	2007-03-27 21:36:50.000000000 +0400
-+++ ./arpwatch.h	2007-03-27 21:37:17.000000000 +0400
-@@ -1,6 +1,7 @@
- /* @(#) $Id: arpwatch.h,v 1.29 2000/09/30 23:40:49 leres Exp $ (LBL) */
- 
- #define ARPFILE "arp.dat"
-+#define PIDFILENAME "/var/run/arpwatch.pid"
- /*#define ETHERCODES "ethercodes.dat" */
- #define CHECKPOINT (15*60)		/* Checkpoint time in seconds */
- 
---- ./arpwatch.c.orig	2007-03-27 21:31:18.000000000 +0400
-+++ ./arpwatch.c	2007-03-27 22:04:15.000000000 +0400
-@@ -108,6 +108,8 @@
- 
- char *prog;
- char *path_sendmail = PATH_SENDMAIL;
-+char *pidname = PIDFILENAME;
-+int nofork = 0;
- 
- int can_checkpoint;
- int swapped;
-@@ -179,7 +181,6 @@
- 	struct bpf_program code;
- 	char errbuf[PCAP_ERRBUF_SIZE];
- 	char* username = NULL;
--	int nofork = 0;
- 	int restart = 0;
- 	int restarting_loop = 0;
- 	char options[] =
-@@ -194,6 +195,7 @@
- 		"m:"
- 		"s:"
- 		"p"
-+		"P:"
- 		"a"
- 		"u:"
- 		"R:"
-@@ -202,6 +204,7 @@
- 		"z:"
- 	;
- 	char *tmpptr;
-+	FILE *pidfile;
- 
- 	if (argv[0] == NULL)
- 		prog = "arpwatch";
-@@ -274,6 +277,10 @@
- 			++nopromisc;
- 			break;
- 
-+		case 'P':
-+			pidname = optarg;
-+			break;
-+
- 		case 'a':
- 			++allsubnets;
- 			break;
-@@ -342,6 +349,15 @@
- 					exit(1);
- 				} else if (pid != 0)
- 					exit(0);
-+				pidfile = fopen(pidname, "w");
-+				if(pidfile) {
-+					int pid = (int)getpid();
-+					fprintf(pidfile, "%d\n", pid);
-+					fclose(pidfile);
-+					syslog(LOG_INFO, "Wrote pid %d to %s", pid, pidname);
-+				}
-+				else
-+					fprintf(stderr, "Couldn't write pid file\n");
- 			}
- 			(void)close(fileno(stdin));
- 			(void)close(fileno(stdout));
-@@ -870,6 +886,9 @@
- {
- 
- 	syslog(LOG_DEBUG, "exiting");
-+	if (!debug && !nofork)
-+		if(!unlink(pidname))
-+			syslog(LOG_DEBUG, "unable to remove pid file %s", pidname);
- 	checkpoint(0);
- 	exit(1);
- }
diff --git a/main/arpwatch/22_alpine_bihourly_script.patch b/main/arpwatch/22_alpine_bihourly_script.patch
index 729c2abd149..f449c7e41b4 100644
--- a/main/arpwatch/22_alpine_bihourly_script.patch
+++ b/main/arpwatch/22_alpine_bihourly_script.patch
@@ -1,16 +1,14 @@
-diff --git a/bihourly.sh b/bihourly.sh
-index 33e54db..810bf80 100755
 --- a/bihourly.sh
 +++ b/bihourly.sh
-@@ -3,11 +3,14 @@
+@@ -3,11 +3,13 @@
  #
  #  bihourly arpwatch job
  #
 -PATH=${PATH}:/usr/local/sbin
 -export PATH
 -#
--cd /usr/operator/arpwatch
- #
+-cd /usr/local/arpwatch
+-#
 +
 +. /etc/conf.d/arpwatch
 +
@@ -20,8 +18,8 @@ index 33e54db..810bf80 100755
 +
  list="`cat list`"
  cname="`cat cname`"
- temp1=$(mktemp)
-@@ -26,7 +29,7 @@ touch ${l}
+ temp1=/tmp/bihourly.1.$$
+@@ -26,7 +28,7 @@
  
  alist=""
  for r in ${list}; do \
@@ -30,7 +28,7 @@ index 33e54db..810bf80 100755
  	if [ -s ${temp1} ]; then
  		echo "arpfetch ${r} errors:"
  		xr=${d}/${r}.$$
-@@ -44,7 +47,7 @@ arpsnmp -d ${alist} > ${temp1} 2>&1
+@@ -44,7 +46,7 @@
  sed -e '/arpsnmp: suppressed DECnet flip flop/d' ${temp1} > ${temp2}
  if [ -s ${temp2} ]; then
  	mail -s "`hostname` arpwatch report" \
diff --git a/main/arpwatch/53_stop-using-_getshort.patch b/main/arpwatch/53_stop-using-_getshort.patch
new file mode 100644
index 00000000000..da83f4b438e
--- /dev/null
+++ b/main/arpwatch/53_stop-using-_getshort.patch
@@ -0,0 +1,25 @@
+Description: replace private function _getshort with ns_get16
+ _getshort is a private function, triggers a build log warning because it's
+ not present in any header file.  We switch to the functionally equivalent
+ ns_get16.
+Author: Lukas Schwaighofer <lukas@schwaighofer.name>
+
+---
+ dns.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/dns.c
++++ b/dns.c
+@@ -115,10 +115,10 @@
+ 		    (u_char *)cp, (char *)bp, buflen)) < 0)
+ 			break;
+ 		cp += n;
+-		type = _getshort(cp);
++		type = ns_get16(cp);
+ 		cp += sizeof(u_short);			/* class */
+ 		cp += sizeof(u_short) + sizeof(u_int32_t);
+-		n = _getshort(cp);
++		n = ns_get16(cp);
+ 		cp += sizeof(u_short);
+ 		if (type == T_HINFO) {
+ 			/* Unpack */
diff --git a/main/arpwatch/APKBUILD b/main/arpwatch/APKBUILD
index 4cdd89fe8bf..6c70670b97d 100644
--- a/main/arpwatch/APKBUILD
+++ b/main/arpwatch/APKBUILD
@@ -1,53 +1,30 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=arpwatch
-pkgver=2.1a15
-pkgrel=16
+pkgver=3.6
+pkgrel=0
 pkgdesc="Ethernet monitoring program"
-url="http://www-nrg.ee.lbl.gov/"
+url="https://www-nrg.ee.lbl.gov/"
 arch="all"
-license="BSD"
+license="BSD-3-Clause"
 pkgusers="arpwatch"
+depends="python3"
 makedepends="libpcap-dev"
-install="$pkgname.pre-install"
+install="$pkgname.pre-install $pkgname.post-install"
 options="!check"  # No test suite.
-subpackages="$pkgname-ethercodes"
-source="ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz
+subpackages="$pkgname-doc $pkgname-openrc"
+source="https://ee.lbl.gov/downloads/arpwatch/arpwatch-$pkgver.tar.gz
 	arpwatch.confd
 	arpwatch.initd
-	01_all_arpwatch-2.1a15-manpages.patch
-	02_all_arpwatch-2.1a15-srcdir.patch
-	03_all_arpwatch-2.1a15-getopt.patch
-	04_all_arpwatch-2.1a15-sendmail-cmdline-opt.patch
-	05_all_arpwatch-2.1a15-promiscuous-mode.patch
-	06_all_arpwatch-2.1a15-bogons-report.patch
-	07_all_arpwatch-2.1a15-specify-mail.patch
-	08_all_arpwatch-2.1a15-drop-priveleges.patch
-	09_all_arpwatch-2.1a15-quite-mail.patch
-	10_all_arpwatch-2.1a15-ignore-net.patch
-	11_all_arpwatch-2.1a15-secure-tmp.patch
-	12_all_arpwatch-2.1a15-defalt-dir-in-manpages.patch
-	13_all_arpwatch-2.1a15-scripts-awk.patch
-	14_all_arpwatch-2.1a15-paths-fix.patch
-	15_all_arpwatch-2.1a15-fix-dead-lock.patch
-	16_all_arpwatch-2.1a15-additional-manpages-cleanups.patch
-	17_all_arpwatch-2.1a15-restart.patch
-	18_all_arpwatch-2.1a15-nofork.patch
-	19_all_arpwatch-2.1a15-nonewstation.patch
-	20_all_arpwatch-2.1a15-noreversedns-resolve.patch
-	21_all_arpwatch-2.1a15-pid-filename.patch
 	22_alpine_bihourly_script.patch
+	53_stop-using-_getshort.patch
+	remove-freebsd-arpwatch.patch
+	fix-time-h.patch
 	"
 
-builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	default_prepare
-	update_config_sub
-}
-
 build() {
-	cd "$builddir"
+	export PYTHON=python3
+
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -55,59 +32,29 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
-	make -j1
+	make
 }
 
 package() {
-	cd "$builddir"
 	#make install command wouldn't create directory
 	mkdir -p "$pkgdir"/usr/sbin/
-	make -j1 DESTDIR="$pkgdir" install
+	mkdir -p "$pkgdir"/usr/share/man/man8
+	mkdir -p "$pkgdir"/usr/share/doc/$pkgname
+	make DESTDIR="$pkgdir" install
 	install -d -o arpwatch "$pkgdir"/var/lib/arpwatch
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-	for files in arp2ethers arpfetch massagevendor bihourly.sh; do
+	for files in arp2ethers arpfetch massagevendor.py bihourly.sh; do
 		install -m755 "$builddir"/$files "$pkgdir"/usr/sbin
 	done
 }
 
-ethercodes() {
-	cd "$builddir"
-	pkgdesc="$pkgname ethernet codes"
-	mkdir -p "$subpkgdir"/usr/share/$pkgname/awk
-	install -Dm644 "$builddir"/ethercodes.dat "$subpkgdir"/usr/share/$pkgname/ethercodes.dat
-
-	install -d "$subpkgdir"/usr/share/$pkgname/awk
-	for f in "$builddir"/*.awk; do
-		install -m644 $f "$subpkgdir"/usr/share/$pkgname/awk/
-	done
-}
-
-
-
-
-sha512sums="f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90  arpwatch-2.1a15.tar.gz
+sha512sums="
+5ba47b15f294396f79efa4b72743169b9eb36747d675144e8f456a23d3987dc0d719d9b97704e7eeec0795f03ee7ef7e8fe8a4ba1ee35d19ab8ec6b077d345e8  arpwatch-3.6.tar.gz
 854f6361bf02586516db4f50afdee729c047cd788985f72f475e592e0e744c24d7d765f0391d733dbf417048c26b6d43c00eb63c58e6798bdb2366b93cbfe03a  arpwatch.confd
-d60d8d07c5572ba645f037d2d8a9b028f8cd434d99e76a9f75a046d00959d6b4544ab6d866d3c88b4861175c5407d83ecd954b5f5dad0b2ec3894411e83e5e2f  arpwatch.initd
-969e956c4fd192d35ce4f23a1f1461eb94a28a8d1e18845d3b099f8833dece003105b415af0a51b4d50221ded4d7434a49bba0ef7f3cac71fda9317b5edeaac3  01_all_arpwatch-2.1a15-manpages.patch
-427a55b7599b8c897f1eae1b8f70b9eaa8e692636b666bf2a3a8703d8227c96e29cdcde8186ebcdcff63d902a919cde660ed6d02f9b5dc650ea9fe23afa44a5f  02_all_arpwatch-2.1a15-srcdir.patch
-04ab5ed5e1097901e80d70925936a2ecdb7e1d815b627cbfa246a15a4fb7cbca59b9be04840c694f71c0ff8e2f3201a6047b4fbbb9e62687e7d95ea29c5e6ae4  03_all_arpwatch-2.1a15-getopt.patch
-7b23ff5f15b98c7d4a2cca39597d2481d072a935f5021dea09be9735aaf54f9378957bf4548cbe004af13a340f0b0ee6c7db44d44cb3605b3d16fd3c08c06897  04_all_arpwatch-2.1a15-sendmail-cmdline-opt.patch
-b4b4ce55ec8b2dba7ce9f49eb77874d8ada26322174a9032176ce28f52edd11edf0fbf16f2a48d974b145fa3e8a10fbf7f1ae72169336d4ed219d41da18007eb  05_all_arpwatch-2.1a15-promiscuous-mode.patch
-3b637cbb8a969a43d737ce3a60c4213ed48db7c279cc4776632239d1bd70e150f88e3fee5f14367b1b9fc26a77f512fd5a6d361ce4303a9099ee3b2fb7cca28e  06_all_arpwatch-2.1a15-bogons-report.patch
-0a36a7dcb10870735065b50c5979933217f479c91c6749d4ebabacb666a6dd25c4a767094f215c72cbd9fffd5568a0d2dd16ab36446d2bb2d55595801854e0cd  07_all_arpwatch-2.1a15-specify-mail.patch
-254ac6d166014a49878bea82db26a61a944348633c81b361b2ab54cd959d7540695c2e96b97c666a2af654b0c30dc2eec56749da5cad8558be6d3cc813f76d31  08_all_arpwatch-2.1a15-drop-priveleges.patch
-87bac2fe654e51940d0a8f6ce4131aef8c2c5db10ec73c92c6a4384bb797666beb8d3180895712a2e602fa513daded362cb20f35815563da7ad9a4a6f053d19d  09_all_arpwatch-2.1a15-quite-mail.patch
-9f626f5d824c8706af7d5e53f0e5743a606c0ed0ef903f5f721457da6139a19bc39a3546d750d70f90f506d6f03ea7a37b1ff48aca35f49a9ffa702e16e8b6d3  10_all_arpwatch-2.1a15-ignore-net.patch
-1c9250346896353857904b43e867ffa5de21bfbe3aa03d8678b2844bb6ad8746ad587884c6b8abe479ddc0bc5fdcfee26c746932c947877862c08f532c1608ee  11_all_arpwatch-2.1a15-secure-tmp.patch
-5be13ab5b03ae5ffc1edc8b8657b6f903921c3ffe608ca9bd86a8b0c85f54e3114781bf2ef759b5bcf6e93a50cae55584c5054cb1f510423e7a9b052792829b2  12_all_arpwatch-2.1a15-defalt-dir-in-manpages.patch
-cc573ea3f4170be7ff711ad0d63d79802111828d7e913c2eca2e9276fc5f6958f55e2c39b61d885084558bf59f2d95a7c6e3f92f65ac0310ff66505ba4229a57  13_all_arpwatch-2.1a15-scripts-awk.patch
-456f3e42f64022cc9999efeaf4b8b7a759a9745e88ff059785ece43a85e2edc8bf56cee1b03c79f90fa9cbda6957cfec61eb40d1db4e03e214c03dcacf749103  14_all_arpwatch-2.1a15-paths-fix.patch
-e5145f3f8d7c921148af25844d354bdc83dc8a8fe2e392155147dea6c168000c2e30a69dce902002c82746d918757e107ac2a9389e52ef4b550fb4f26b285155  15_all_arpwatch-2.1a15-fix-dead-lock.patch
-e6f5571f8d4823c56f68ea13267f217cc60a9481cf08dfe632124593f8e3a49d3c7fb57c118490b126e2e37eed893470c6b92a079e680b0a03b6d0ffbb10e896  16_all_arpwatch-2.1a15-additional-manpages-cleanups.patch
-76c971bd8ce3aec9a6e72f6192ff7f77a5a4b054fad9db4ed29344b0a9b76e07b188ac78b3de654e82de7276ddc877a7f9bbd4f90dd74454a08fd7a5fd2f379c  17_all_arpwatch-2.1a15-restart.patch
-91f01db73b7979464db9e0616cfc2a19c950c65f1409342220e1c6e7b22716827b681cb03ede88644e67d81efc38af32a1fd372151474e9b917abb9e13cdafdd  18_all_arpwatch-2.1a15-nofork.patch
-5322d2ea02f300d2be2cd17fdf7154cfd6e775376d56c9ad4bdc520196b533060d6602ebb7a02bb1b4088afccb6c843ead3d01b9e0928125fadcdd4d1efadc88  19_all_arpwatch-2.1a15-nonewstation.patch
-fd7231744f8025dbcc0bec65ffc02933e0d14717a824187a955a55509316f8667b11bcc4efe847a5002519337b3cc8e778e216ebbb5ad2af504021ea61df4380  20_all_arpwatch-2.1a15-noreversedns-resolve.patch
-11da1ec9cce70f2f9fb0657e3bbc2ca9cbad68a292205dfb01effd15643f0aeb693f544f2f8d308b7c3a4901de0a0f91e33676e40cb39dda2314e11097c1eae3  21_all_arpwatch-2.1a15-pid-filename.patch
-6823fee4d2190fcd4003c4e0940b05725fb3c408b2ff1f4af39dd5ae29cee05e7211274dbcc06b78931e5cb36e9893a8a9de6e924a9d54a99410bcdf9e6591bb  22_alpine_bihourly_script.patch"
+83fc559aecd82cefd430104df23fc7680ac14d2c27f74d4543585382166e16a65563e00122281e886278993a9ca574daa5b2b2100884369c3a3146a66b68a0f7  arpwatch.initd
+b537220b7a19f7f28d1b60cfea6ef2e4d0c852ac83907fdd2515e467c3d16529b0c5a25ee653536e674c63d47a00709fc89fd6085efc5ba4a12f392df5ae5788  22_alpine_bihourly_script.patch
+6eae9b143deea1655b3adb45640329d1c6d15c0bf6172a229ed142bb59e6c53b73ad19dc38adc42fe547f0bae1310394b19c9f8efe1af3a7dbf889c3742008c1  53_stop-using-_getshort.patch
+68298d7967c281bbda6fe7d64f9af427eb39ac1a0011283b14ea1004396949595acc6947ddcabb385acdc83abe6255bf79ff92e5b8b1c33c67c26830b82ecd64  remove-freebsd-arpwatch.patch
+fdc05ac57e2c7007d6313fe1c38b25d999f347f218aeda6e9e59ec50791825549a5b73b70fb975d78803cbc0078341b6365379df3de02445e4af5e92e32685a8  fix-time-h.patch
+"
diff --git a/main/arpwatch/arpwatch.initd b/main/arpwatch/arpwatch.initd
index 437633effef..c6f2a18c51d 100644
--- a/main/arpwatch/arpwatch.initd
+++ b/main/arpwatch/arpwatch.initd
@@ -24,7 +24,7 @@ start() {
 		else
 			chown ${ARPUSER} ${DATAFILE}
 			start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch/arpwatch.${IFACE}.pid --exec \
-			/usr/sbin/arpwatch -- -i $IFACE -u ${ARPUSER} -f ${DATAFILE} -P /var/run/arpwatch/arpwatch.${IFACE}.pid ${OPTIONS}
+			/usr/sbin/arpwatch -- -i $IFACE -f ${DATAFILE} -P /var/run/arpwatch/arpwatch.${IFACE}.pid ${OPTIONS}
 		fi
 		eend $?
 	done
diff --git a/main/arpwatch/arpwatch.post-install b/main/arpwatch/arpwatch.post-install
new file mode 100644
index 00000000000..8157042820d
--- /dev/null
+++ b/main/arpwatch/arpwatch.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo 'Run bihourly.sh to update ethercodes.dat'
+
+exit 0
diff --git a/main/arpwatch/fix-time-h.patch b/main/arpwatch/fix-time-h.patch
new file mode 100644
index 00000000000..2d99092c152
--- /dev/null
+++ b/main/arpwatch/fix-time-h.patch
@@ -0,0 +1,33 @@
+diff --git a/report.c b/report.c
+index 9c77755..a4f0db1 100644
+--- a/report.c
++++ b/report.c
+@@ -37,7 +37,6 @@ static const char rcsid[] __attribute__((unused)) =
+ #include <sys/param.h>
+ #include <sys/types.h>				/* concession to AIX */
+ #include <sys/socket.h>
+-#include <sys/time.h>
+ #include <sys/wait.h>
+ 
+ #if __STDC__
+@@ -59,9 +58,18 @@ struct rtentry;
+ #include <stdlib.h>
+ #include <string.h>
+ #include <syslog.h>
+-#ifdef TIME_WITH_SYS_TIME
+-#include <time.h>
++
++#if TIME_WITH_SYS_TIME
++# include <sys/time.h>
++# include <time.h>
++#else
++# if HAVE_SYS_TIME_H
++# include <sys/time.h>
++# else
++# include <time.h>
++# endif
+ #endif
++
+ #include <unistd.h>
+ 
+ #include "gnuc.h"
diff --git a/main/arpwatch/remove-freebsd-arpwatch.patch b/main/arpwatch/remove-freebsd-arpwatch.patch
new file mode 100644
index 00000000000..d5355e63921
--- /dev/null
+++ b/main/arpwatch/remove-freebsd-arpwatch.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -131,7 +131,6 @@
+ 	    $(INSTALL) -v -m 444 $(srcdir)/$(PROG).8 $(DESTDIR)$(MANDEST)/man8
+ 	@diff $(srcdir)/arpsnmp.8 $(DESTDIR)$(MANDEST)/man8 >/dev/null 2>&1 || \
+ 	    $(INSTALL) -v -m 444 $(srcdir)/arpsnmp.8 $(DESTDIR)$(MANDEST)/man8
+-@HAVE_FREEBSD_TRUE@	@$(INSTALL) -v -m 555 arpwatch.sh $(DESTDIR)$(prefix)/etc/rc.d/arpwatch
+ 
+ clean:
+ 	rm -f $(CLEANFILES)
diff --git a/main/asciidoc/APKBUILD b/main/asciidoc/APKBUILD
index 5637fde52c4..e89ffe27a15 100644
--- a/main/asciidoc/APKBUILD
+++ b/main/asciidoc/APKBUILD
@@ -1,50 +1,36 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=asciidoc
-pkgver=8.6.10
-pkgrel=1
-_commit=986f99d743d0b6ddc2014bdc8dcfa991ab9b4863
+pkgver=10.2.0
+pkgrel=5
 pkgdesc="Text based documentation"
-url="http://asciidoc.org/"
+url="https://asciidoc.org/"
 arch="noarch"
-license="GPL-2.0-or-later and GPL-1.0-or-later"
+license="GPL-2.0-or-later AND MIT"
 depends="python3 libxml2-utils docbook-xsl"
-makedepends="autoconf automake"
-subpackages="$pkgname-doc $pkgname-vim::noarch"
-source="$pkgname-$_commit.tar.gz::https://github.com/asciidoc/asciidoc-py3/archive/$_commit/asciidoc-py3-$_commit.tar.gz
-	asciidoc-python3.patch
-	asciidoc-python3-a2x-decode-fix.patch
-	asciidoc-python3-deprecation-warning.patch
-	"
-builddir="$srcdir/asciidoc-py3-$_commit"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="py3-pytest py3-pytest-mock"
+subpackages="$pkgname-pyc $pkgname-doc"
+source="https://github.com/asciidoc-py/asciidoc-py/releases/download/$pkgver/asciidoc-$pkgver.tar.gz"
+options="!check" # py3-pytest-mock
 
-prepare() {
-	default_prepare
-	autoreconf -fi
-}
+replaces="$pkgname-vim"
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
 }
 
-package() {
-	make DESTDIR="$pkgdir" install
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }
 
-vim() {
-	pkgdesc="Vim syntax for $pkgname"
-	depends=""
-	install -Dm644 "$builddir"/vim/syntax/$pkgname.vim \
-		"$subpkgdir"/usr/share/vim/vimfiles/syntax/$pkgname.vim
+package() {
+	python3 -m installer -d "$pkgdir" .dist/*.whl
+	install -Dm644 doc/*.1 -t "$pkgdir"/usr/share/man/man1/
+	install -Dm644 asciidoc/api.py -t "$pkgdir"/usr/lib/python3*/site-packages/asciidoc/
 }
 
-sha512sums="758362cac485cbe4fd504224f7a8d24d20955464dd56af258e9a70deac8dc89d0f07f8e4567cfbbd3e1cbe6336704e9d12590bade662dd5bf228ea7e611676d1  asciidoc-986f99d743d0b6ddc2014bdc8dcfa991ab9b4863.tar.gz
-331d7c1a6e8ec6bdd11c2998c0d76285e282914ca12a0de79e04199926f7fd10a7b24a3602fd01d3cbdf7fb8f718000eb8d5063236354c894a9187ab54194aa6  asciidoc-python3.patch
-dfa4b288c894373aecebafbadf726aadcb51cf4578c0903433936c114a587b086695f85c97bf712140d94adc916c83d0c861c5af8cf15195a3364ca8e4e8414e  asciidoc-python3-a2x-decode-fix.patch
-de4687009f4c5dd4d3f7727634e6577d1e6df3f4c812dd4d4c9828a31d529b8e520ae43a53a63cb4c154664d51d5bad96728f05feb9e9ec0889849903cae739e  asciidoc-python3-deprecation-warning.patch"
+sha512sums="
+e8f97559a169504bd2b47a5a4108268d08dbeb98e304486e64761c2603963f4610a0f96c443fdbb8ea289586f015d066681c8ad2946610864662d6df5d7ba9d6  asciidoc-10.2.0.tar.gz
+"
diff --git a/main/asciidoc/asciidoc-python3-a2x-decode-fix.patch b/main/asciidoc/asciidoc-python3-a2x-decode-fix.patch
deleted file mode 100644
index 5525c7d6dca..00000000000
--- a/main/asciidoc/asciidoc-python3-a2x-decode-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from upstream PR#5 (https://github.com/asciidoc/asciidoc-py3/pull/5)
-
-6469317 Remove unnecessary decode in a2x (Matthew Peveler)
-684913e Fix decoding of file that specifies encoding in header tag in a2x (Matthew Peveler)
-8369a97 re-add --nonet option (Matthew Peveler)
-
-diff --git c/a2x.py w/a2x.py
-index 55eb57e..c015079 100755
---- c/a2x.py
-+++ w/a2x.py
-@@ -254,15 +254,11 @@ def find_resources(files, tagname, attrname, filter=None):
-         if OPTIONS.dry_run:
-             continue
-         parser = FindResources()
--        # HTMLParser has problems with non-ASCII strings.
--        # See http://bugs.python.org/issue3932
--        contents = read_file(filename)
--        mo = re.search(r'\A<\?xml.* encoding="(.*?)"', contents)
--        if mo:
--            encoding = mo.group(1)
--            parser.feed(contents.decode(encoding))
--        else:
--            parser.feed(contents)
-+        with open(filename, 'rb') as open_file:
-+            contents = open_file.read()
-+        mo = re.search(b'\A<\?xml.* encoding="(.*?)"', contents)
-+        contents = contents.decode(mo.group(1).decode('utf-8') if mo else 'utf-8')
-+        parser.feed(contents)
-         parser.close()
-     result = list(set(result))   # Drop duplicate values.
-     result.sort()
-@@ -337,7 +333,7 @@ def get_source_options(asciidoc_file):
-     result = []
-     if os.path.isfile(asciidoc_file):
-         options = ''
--        with open(asciidoc_file) as f:
-+        with open(asciidoc_file, encoding='utf-8') as f:
-             for line in f:
-                 mo = re.search(r'^//\s*a2x:', line)
-                 if mo:
-
diff --git a/main/asciidoc/asciidoc-python3-deprecation-warning.patch b/main/asciidoc/asciidoc-python3-deprecation-warning.patch
deleted file mode 100644
index 00b4f0e9db6..00000000000
--- a/main/asciidoc/asciidoc-python3-deprecation-warning.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-diff -urNp a/asciidoc.conf b/asciidoc.conf
---- a/asciidoc.conf	2018-12-03 13:06:23.377407390 +0100
-+++ b/asciidoc.conf	2018-12-03 13:07:08.142320548 +0100
-@@ -29,7 +29,7 @@ empty=
- sp=" "
- # Attribute and AttributeList element patterns.
- attributeentry-pattern=^:(?P<attrname>\w[^.]*?)(\.(?P<attrname2>.*?))?:(\s+(?P<attrvalue>.*))?$
--attributelist-pattern=(?u)(^\[\[(?P<id>[\w_:][\w_:.-]*)(,(?P<reftext>.*?))?\]\]$)|(^\[(?P<attrlist>.*)\]$)
-+attributelist-pattern=(^\[\[(?P<id>[\w_:][\w_:.-]*)(,(?P<reftext>.*?))?\]\]$)|(^\[(?P<attrlist>.*)\]$)
- # Substitution attributes for escaping AsciiDoc processing.
- amp=&
- lt=<
-@@ -288,10 +288,10 @@ endif::no-inline-literal[]
- # Block macros
- #-------------
- # Macros using default syntax.
--(?u)^(?P<name>image|unfloat|toc)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=#
-+^(?P<name>image|unfloat|toc)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=#
- 
- # Passthrough macros.
--(?u)^(?P<name>pass)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#
-+^(?P<name>pass)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#
- 
- ^'{3,}$=#ruler
- ^<{3,}$=#pagebreak
-diff -urNp a/asciidoc.py b/asciidoc.py
---- a/asciidoc.py	2018-12-03 13:06:23.378407388 +0100
-+++ b/asciidoc.py	2018-12-03 13:17:41.965990011 +0100
-@@ -30,7 +30,7 @@ SUBS_NORMAL = ('specialcharacters','quot
-     'specialwords','replacements','macros','replacements2')
- SUBS_VERBATIM = ('specialcharacters','callouts')
- 
--NAME_RE = r'(?u)[^\W\d][-\w]*'  # Valid section or attribute name.
-+NAME_RE = r'[^\W\d][-\w]*'  # Valid section or attribute name.
- OR, AND = ',', '+'              # Attribute list separators.
- 
- 
-@@ -463,7 +463,7 @@ def parse_options(options,allowed,errmsg
- 
- def symbolize(s):
-     """Drop non-symbol characters and convert to lowercase."""
--    return re.sub(r'(?u)[^\w\-_]', '', s).lower()
-+    return re.sub(r'[^\w\-_]', '', s).lower()
- 
- def is_name(s):
-     """Return True if s is valid attribute, macro or tag name
-@@ -1746,7 +1746,7 @@ class AttributeEntry:
-                 attr.name = attr.name[:-1]
-                 attr.value = None
-             # Strip white space and illegal name chars.
--            attr.name = re.sub(r'(?u)[^\w\-_]', '', attr.name).lower()
-+            attr.name = re.sub(r'[^\w\-_]', '', attr.name).lower()
-             # Don't override most command-line attributes.
-             if attr.name in config.cmd_attrs \
-                     and attr.name not in ('trace','numbered'):
-@@ -1946,7 +1946,7 @@ class Title:
-             if ul != s[:ul_len]: return False
-             # Don't be fooled by back-to-back delimited blocks, require at
-             # least one alphanumeric character in title.
--            if not re.search(r'(?u)\w',title): return False
-+            if not re.search(r'\w',title): return False
-             mo = re.match(Title.pattern, title)
-             if mo:
-                 Title.attributes = mo.groupdict()
-@@ -2104,7 +2104,7 @@ class Section:
-         """
-         # Replace non-alpha numeric characters in title with underscores and
-         # convert to lower case.
--        base_id = re.sub(r'(?u)\W+', '_', title).strip('_').lower()
-+        base_id = re.sub(r'\W+', '_', title).strip('_').lower()
-         if 'ascii-ids' in document.attributes:
-             # Replace non-ASCII characters with ASCII equivalents.
-             import unicodedata
-@@ -3602,7 +3602,7 @@ class Tables(AbstractBlocks):
- 
- class Macros:
-     # Default system macro syntax.
--    SYS_RE = r'(?u)^(?P<name>[\\]?\w(\w|-)*?)::(?P<target>\S*?)' + \
-+    SYS_RE = r'^(?P<name>[\\]?\w(\w|-)*?)::(?P<target>\S*?)' + \
-              r'(\[(?P<attrlist>.*?)\])$'
-     def __init__(self):
-         self.macros = []        # List of Macros.
-@@ -4478,7 +4478,7 @@ class Config:
-         rdr.open(fname)
-         message.linenos = None
-         self.fname = fname
--        reo = re.compile(r'(?u)^\[(?P<section>\+?[^\W\d][\w-]*)\]\s*$')
-+        reo = re.compile(r'^\[(?P<section>\+?[^\W\d][\w-]*)\]\s*$')
-         sections = OrderedDict()
-         section,contents = '',[]
-         while not rdr.eof():
-diff -urNp a/doc/asciidoc.conf b/doc/asciidoc.conf
---- a/doc/asciidoc.conf	2018-12-03 13:06:23.379407386 +0100
-+++ b/doc/asciidoc.conf	2018-12-03 13:07:32.374272984 +0100
-@@ -3,5 +3,5 @@
- #
- [specialwords]
- ifndef::doctype-manpage[]
--monospacedwords=(?u)\\?\basciidoc\(1\) (?u)\\?\ba2x\(1\)
-+monospacedwords=\\?\basciidoc\(1\) \\?\ba2x\(1\)
- endif::doctype-manpage[]
-diff -urNp a/docbook45.conf b/docbook45.conf
---- a/docbook45.conf	2018-12-03 13:06:23.383407378 +0100
-+++ b/docbook45.conf	2018-12-03 13:07:53.221231766 +0100
-@@ -47,7 +47,7 @@ latexmath-style=template="latexmathblock
- [macros]
- # math macros.
- (?su)[\\]?(?P<name>latexmath):(?P<subslist>\S*?)\[(?:\$\s*)?(?P<passtext>.*?)(?:\s*\$)?(?<!\\)\]=[]
--(?u)^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[]
-+^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[]
- 
- [latexmath-inlinemacro]
- <inlineequation>
-diff -urNp a/examples/website/layout1.conf b/examples/website/layout1.conf
---- a/examples/website/layout1.conf	2018-12-03 13:06:23.384407377 +0100
-+++ b/examples/website/layout1.conf	2018-12-03 13:08:17.989182454 +0100
-@@ -22,7 +22,7 @@
- #   xhtml11 backend stylesheets.
- 
- [specialwords]
--monospacedwords=(?u)\\?\basciidoc\(1\) (?u)\\?\ba2x\(1\)
-+monospacedwords=\\?\basciidoc\(1\) \\?\ba2x\(1\)
- 
- [header]
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-diff -urNp a/examples/website/layout2.conf b/examples/website/layout2.conf
---- a/examples/website/layout2.conf	2018-12-03 13:06:23.384407377 +0100
-+++ b/examples/website/layout2.conf	2018-12-03 13:08:35.614147145 +0100
-@@ -24,7 +24,7 @@
- #   xhtml11 backend stylesheets.
- 
- [specialwords]
--monospacedwords=(?u)\\?\basciidoc\(1\) (?u)\\?\ba2x\(1\)
-+monospacedwords=\\?\basciidoc\(1\) \\?\ba2x\(1\)
- 
- [header]
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-diff -urNp a/html5.conf b/html5.conf
---- a/html5.conf	2018-12-03 13:06:23.386407373 +0100
-+++ b/html5.conf	2018-12-03 13:08:59.231099559 +0100
-@@ -36,13 +36,13 @@ asciimath-style=template="asciimathblock
- latexmath-style=template="latexmathblock",subs=(),posattrs=(),filter="unwraplatex.py"
- 
- [macros]
--(?u)^(?P<name>audio|video)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=#
-+^(?P<name>audio|video)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=#
- # math macros.
- # Special characters are escaped in HTML math markup.
- (?su)[\\]?(?P<name>asciimath):(?P<subslist>\S*?)\[(?P<passtext>.*?)(?<!\\)\]=[specialcharacters]
--(?u)^(?P<name>asciimath)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[specialcharacters]
-+^(?P<name>asciimath)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[specialcharacters]
- (?su)[\\]?(?P<name>latexmath):(?P<subslist>\S*?)\[(?:\$\s*)?(?P<passtext>.*?)(?:\s*\$)?(?<!\\)\]=[specialcharacters]
--(?u)^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[specialcharacters]
-+^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[specialcharacters]
- 
- [asciimath-inlinemacro]
- `{passtext}`
-diff -urNp a/xhtml11.conf b/xhtml11.conf
---- a/xhtml11.conf	2018-12-03 13:06:23.395407355 +0100
-+++ b/xhtml11.conf	2018-12-03 13:09:18.358060798 +0100
-@@ -39,9 +39,9 @@ latexmath-style=template="latexmathblock
- # math macros.
- # Special characters are escaped in HTML math markup.
- (?su)[\\]?(?P<name>asciimath):(?P<subslist>\S*?)\[(?P<passtext>.*?)(?<!\\)\]=[specialcharacters]
--(?u)^(?P<name>asciimath)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[specialcharacters]
-+^(?P<name>asciimath)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[specialcharacters]
- (?su)[\\]?(?P<name>latexmath):(?P<subslist>\S*?)\[(?:\$\s*)?(?P<passtext>.*?)(?:\s*\$)?(?<!\\)\]=[specialcharacters]
--(?u)^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[specialcharacters]
-+^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[specialcharacters]
- 
- [asciimath-inlinemacro]
- `{passtext}`
-
diff --git a/main/asciidoc/asciidoc-python3.patch b/main/asciidoc/asciidoc-python3.patch
deleted file mode 100644
index 74c53d8f757..00000000000
--- a/main/asciidoc/asciidoc-python3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -urNp old/filters/latex/latex2img.py new/filters/latex/latex2img.py
---- old/filters/latex/latex2img.py	2018-06-05 15:27:44.153533130 +0200
-+++ new/filters/latex/latex2img.py	2018-06-05 15:28:43.542828463 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2
-+#!/usr/bin/env python3
- '''
- NAME
-     latex2img - Converts LaTeX source to PNG or SVG file
-diff -urNp old/filters/music/music2png.py new/filters/music/music2png.py
---- old/filters/music/music2png.py	2018-06-05 15:27:44.153533130 +0200
-+++ new/filters/music/music2png.py	2018-06-05 15:28:56.502882780 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2
-+#!/usr/bin/env python3
- '''
- NAME
-     music2png - Converts textual music notation to classically notated PNG file
-diff -urNp old/filters/unwraplatex.py new/filters/unwraplatex.py
---- old/filters/unwraplatex.py	2018-06-05 15:27:44.152533125 +0200
-+++ new/filters/unwraplatex.py	2018-06-05 15:28:29.956767744 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2
-+#!/usr/bin/env python3
- '''
- NAME
-     unwraplatex - Removes delimiters from LaTeX source text
-diff -urNp old/Makefile.in new/Makefile.in
---- old/Makefile.in	2018-06-05 15:27:44.144533079 +0200
-+++ new/Makefile.in	2018-06-05 15:27:56.328600132 +0200
-@@ -107,7 +107,7 @@ $(DATATARGETS): % : %dir
- 	$(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/
- 
- $(manp): %.1 : %.1.txt
--	python2 a2x.py -f manpage $<
-+	python3 a2x.py -f manpage $<
- 
- docs:
- 	$(INSTALL) -d $(DESTDIR)/$(docdir)
-
diff --git a/main/asciidoctor/APKBUILD b/main/asciidoctor/APKBUILD
index 39dd821b9c2..63827d49046 100644
--- a/main/asciidoctor/APKBUILD
+++ b/main/asciidoctor/APKBUILD
@@ -1,15 +1,15 @@
 # Contributor: Seung Soo Mun <hamletmun@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=asciidoctor
-pkgver=2.0.10
-pkgrel=1
+pkgver=2.0.22
+pkgrel=0
 pkgdesc="Converter for AsciiDoc to HTML5, DocBook 5 (or 4.5) and other formats"
-url="https://rubygems.org/gems/$pkgname"
+url="https://rubygems.org/gems/asciidoctor"
 arch="noarch"
 license="MIT"
 options="!check"
 depends="ruby"
-source="https://rubygems.org/downloads/$pkgname-$pkgver.gem"
+source="https://rubygems.org/downloads/asciidoctor-$pkgver.gem"
 
 package() {
 	local gemdir="$(ruby -e 'puts Gem.default_dir')"
@@ -33,4 +33,6 @@ package() {
 	done
 }
 
-sha512sums="41db1947da60be27079eaef99c76ae7a20797f0291313ac82582466774a569130e995c674f7ef884a05d3d3783d70df3d5ef83b42ded1c722dd9ab7b1a3357ab  asciidoctor-2.0.10.gem"
+sha512sums="
+1c9cd3bdbb7f4467b73e99b29ab655d521213d51c0151f6aee21cfd1d943c6456c1ef23bfdbf180057b70590341d92fcda2be0bf5e1c741e7068ff0901bd282c  asciidoctor-2.0.22.gem
+"
diff --git a/main/aspell-de/APKBUILD b/main/aspell-de/APKBUILD
index c43f2283f5e..78d4665e09d 100644
--- a/main/aspell-de/APKBUILD
+++ b/main/aspell-de/APKBUILD
@@ -1,28 +1,26 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=aspell-de
-pkgver=20030222
+pkgver=20161207
 pkgrel=1
 _lang=${pkgname##*-}
-_name=${pkgname%%-*}6-$_lang-$pkgver-1
+_name=${pkgname%%-*}6-$_lang-$pkgver-7-0
 pkgdesc="German dictionary for aspell"
 url="http://aspell.net/"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
 options="!check" # No test suite
 makedepends="aspell-dev"
 source="https://ftp.gnu.org/gnu/aspell/dict/$_lang/$_name.tar.bz2"
 builddir="$srcdir"/$_name
 
-build () {
-	cd "$builddir"
+build() {
 	./configure
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -D -m644 Copyright "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="2005b56938565b11b761ace31006c1accfd32d401685cc5676cc4d85406bedda81b1df062949359f1bd6972073d3713204d87c7f81d9535fa956cdf130dd8db6  aspell6-de-20030222-1.tar.bz2"
+sha512sums="ec29fa49d4e0303d6ceb78da3884ac54ddf34205895f30a95bce0db66f74472b423980200acf01efb1fa40380d6ea6351a58656400af35772266f8a54b1bbec8  aspell6-de-20161207-7-0.tar.bz2"
diff --git a/main/aspell-en/APKBUILD b/main/aspell-en/APKBUILD
index aa7e916de7c..81cd47f9e4b 100644
--- a/main/aspell-en/APKBUILD
+++ b/main/aspell-en/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=aspell-en
-pkgver=2019.10.06
+pkgver=2020.12.07
 pkgrel=0
 _lang=${pkgname##*-}
 _name=${pkgname%%-*}6-$_lang-$pkgver-0
@@ -15,15 +15,13 @@ source="https://ftp.gnu.org/gnu/aspell/dict/$_lang/$_name.tar.bz2"
 builddir="$srcdir"/$_name
 
 build() {
-	cd "$builddir"
 	./configure
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -D -m644 Copyright "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="e16c76bd2da4515af6f1e3dbbc1c5f26fc3be550e022cbb5b741b867be2acc1359a8902af1b359f6c8cff38de01b9aa43a02153a5a6bc618296e75bf86020a6e  aspell6-en-2019.10.06-0.tar.bz2"
+sha512sums="9ed4e64891242e5e5e7d6ac82a0d1fda3bdc5116bd9d926e787b8f381080b357915f0c9b39cae04c1da0f2ec6e47ffe30a584f7f3bf7d455a46e8518a7858547  aspell6-en-2020.12.07-0.tar.bz2"
diff --git a/main/aspell-fr/APKBUILD b/main/aspell-fr/APKBUILD
index 458c2065e10..ed1f42bc464 100644
--- a/main/aspell-fr/APKBUILD
+++ b/main/aspell-fr/APKBUILD
@@ -2,25 +2,23 @@
 pkgname=aspell-fr
 pkgver=0.50_p3
 _ver=${pkgver/_p/-}
-pkgrel=1
+pkgrel=3
 pkgdesc="French dictionary for aspell"
 url="http://aspell.net/"
 arch="noarch"
-license="GPL-2.0"
-depends=""
+license="GPL-2.0-or-later"
 makedepends="aspell-dev"
 source="https://ftp.gnu.org/gnu/aspell/dict/fr/aspell-fr-$_ver.tar.bz2"
+builddir="$srcdir"/aspell-fr-$_ver
+options="!check"
 
-_builddir="$srcdir"/aspell-fr-$_ver
-build () {
-	cd "$_builddir"
-	./configure || return 1
-	make || return 1
+build() {
+	./configure
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="bb5d1faada9283521096a19a8f5abada2a19cc02717f6dde57846ef46a4df253113b10a2bb72d2b0e32e4a3ab24b541a5acd9f4595b908d2f6cd2fc448d8bc3b  aspell-fr-0.50-3.tar.bz2"
diff --git a/main/aspell-ru/APKBUILD b/main/aspell-ru/APKBUILD
index d6e6636d436..90dd70cf860 100644
--- a/main/aspell-ru/APKBUILD
+++ b/main/aspell-ru/APKBUILD
@@ -1,29 +1,27 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=aspell-ru
-pkgver=0.99f7
-pkgrel=0
+pkgver=0.99_p7
+pkgrel=2
 _lang=${pkgname##*-}
-_name=${pkgname%%-*}6-$_lang-$pkgver-1
+_name=${pkgname%%-*}6-$_lang-${pkgver//_p/f}-1
 pkgdesc="Russian dictionary for aspell"
 url="http://aspell.net/"
 arch="noarch"
-license="GPL-2.0"
+license="custom"
 options="!check" # No test suite
 makedepends="aspell-dev"
 source="https://ftp.gnu.org/gnu/aspell/dict/$_lang/$_name.tar.bz2"
 builddir="$srcdir"/$_name
 
-build () {
-	cd "$builddir"
+build() {
 	./configure
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	install -D -m644 Copyright "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+	install -Dm644 Copyright "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 sha512sums="789fe15f5502b54008a41f2afb5635dcb7bb0a36e61b300ee48b2429c339793f5c4808d6063f13f1f8455ce251912433890e7d01ca59d8b0924ecd2987ceb430  aspell6-ru-0.99f7-1.tar.bz2"
diff --git a/main/aspell-uk/APKBUILD b/main/aspell-uk/APKBUILD
index 47552196133..06c887039df 100644
--- a/main/aspell-uk/APKBUILD
+++ b/main/aspell-uk/APKBUILD
@@ -1,28 +1,26 @@
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=aspell-uk
 pkgver=1.4.0
-pkgrel=1
+pkgrel=3
 _lang=${pkgname##*-}
 _name=${pkgname%%-*}6-$_lang-$pkgver-0
 pkgdesc="Ukrainian dictionary for aspell"
 url="http://aspell.net/"
 arch="noarch"
-license="GPL-2.0"
+license="LGPL-2.0-or-later"
 options="!check" # No test suite
 makedepends="aspell-dev"
 source="https://ftp.gnu.org/gnu/aspell/dict/$_lang/$_name.tar.bz2"
 builddir="$srcdir"/$_name
 
-build () {
-	cd "$builddir"
+build() {
 	./configure
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	install -D -m644 Copyright "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+	install -Dm644 Copyright "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 sha512sums="2e66465d17695dd3147241f13d611571f8a80a15886c69728d2f34019fb4834e56e4c0834d9e898927522b54d75f78a32dd3435b2c16eb86cf9cfa11070f0799  aspell6-uk-1.4.0-0.tar.bz2"
diff --git a/main/aspell/APKBUILD b/main/aspell/APKBUILD
index 76612044f1f..0fdc677e08e 100644
--- a/main/aspell/APKBUILD
+++ b/main/aspell/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 pkgname=aspell
-pkgver=0.60.8
+pkgver=0.60.8.1
 pkgrel=0
 pkgdesc="A spell checker designed to eventually replace Ispell"
 url="http://aspell.net/"
 arch="all"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 subpackages="$pkgname-compat::noarch $pkgname-utils $pkgname-dev $pkgname-doc
 	$pkgname-lang $pkgname-libs"
 depends_dev="$pkgname-utils"
@@ -14,12 +14,18 @@ makedepends="ncurses-dev perl gettext-dev"
 source="https://ftp.gnu.org/gnu/aspell/aspell-$pkgver.tar.gz"
 
 # secfixes:
+#   0.60.8-r1:
+#     - CVE-2019-25051
 #   0.60.8-r0:
 #     - CVE-2019-17544
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
-	cd "$builddir"
-	LDFLAGS="-lintl" \
+	LDFLAGS="$LDFLAGS -lintl" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,12 +38,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
@@ -63,4 +67,6 @@ libs() {
 	rm -fr "$pkgdir"/usr/lib
 }
 
-sha512sums="8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29  aspell-0.60.8.tar.gz"
+sha512sums="
+80fa9d7f5f4b8bf66388825ae28403713a2e3eda81fc31f2f452c3e2fe8349cd0fa8f0e4d0d3f8cffe215817229af25aa7be2dba358cb9cdc97e9d2834ba5ca7  aspell-0.60.8.1.tar.gz
+"
diff --git a/main/asterisk/10-musl-mutex-init.patch b/main/asterisk/10-musl-mutex-init.patch
new file mode 100644
index 00000000000..16b7fccbd97
--- /dev/null
+++ b/main/asterisk/10-musl-mutex-init.patch
@@ -0,0 +1,14 @@
+fix for compiling with musl
+
+diff -ru asterisk-12.4.0.orig/include/asterisk/lock.h asterisk-12.4.0/include/asterisk/lock.h
+--- asterisk-12.4.0.orig/include/asterisk/lock.h	2013-11-02 06:05:24.000000000 -0200
++++ asterisk-12.4.0/include/asterisk/lock.h	2014-08-04 16:00:29.811967599 -0300
+@@ -66,7 +66,7 @@
+ #define AST_PTHREADT_NULL (pthread_t) -1
+ #define AST_PTHREADT_STOP (pthread_t) -2
+ 
+-#if (defined(SOLARIS) || defined(BSD))
++#if (defined(SOLARIS) || defined(BSD) || !defined(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP))
+ #define AST_MUTEX_INIT_W_CONSTRUCTORS
+ #endif /* SOLARIS || BSD */
+ 
diff --git a/main/asterisk/20-musl-astmm-fix.patch b/main/asterisk/20-musl-astmm-fix.patch
new file mode 100644
index 00000000000..e6f9d150e62
--- /dev/null
+++ b/main/asterisk/20-musl-astmm-fix.patch
@@ -0,0 +1,14 @@
+Add include file needed when compiling with musl
+
+diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h
+index 8547283..476dc2a 100644
+--- a/include/asterisk/compat.h
++++ b/include/asterisk/compat.h
+@@ -30,6 +30,7 @@
+ #include <inttypes.h>
+ #include <limits.h>
+ #include <unistd.h>
++#include <pthread.h>
+ 
+ #ifdef HAVE_STDDEF_H
+ #include <stddef.h>
diff --git a/main/asterisk/40-asterisk-cdefs.patch b/main/asterisk/40-asterisk-cdefs.patch
new file mode 100644
index 00000000000..7cf22c84d81
--- /dev/null
+++ b/main/asterisk/40-asterisk-cdefs.patch
@@ -0,0 +1,22 @@
+include depreciated cdefs.h as needed for compilation with alpine
+
+--- a/main/ast_expr2.c
++++ b/main/ast_expr2.c
+@@ -95,6 +95,7 @@
+ #include "asterisk.h"
+ 
+ #include <sys/types.h>
++#include <sys/cdefs.h>
+ #include <stdio.h>
+ 
+ #if defined(STANDALONE) || defined(STANDALONE2)
+--- a/utils/db1-ast/include/db.h
++++ b/utils/db1-ast/include/db.h
+@@ -37,6 +37,7 @@
+ #define	_DB_H 1
+ 
+ #include <sys/types.h>
++#include <sys/cdefs.h>
+ 
+ #include <limits.h>
+ 
diff --git a/main/asterisk/41-asterisk-ALLPERMS.patch b/main/asterisk/41-asterisk-ALLPERMS.patch
new file mode 100644
index 00000000000..adc0cb07c2b
--- /dev/null
+++ b/main/asterisk/41-asterisk-ALLPERMS.patch
@@ -0,0 +1,15 @@
+taken from http://lists.busybox.net/pipermail/buildroot/2019-October/265032.html
+
+--- a/res/res_crypto.c
++++ b/res/res_crypto.c
+@@ -77,6 +77,10 @@
+  */
+ #define RSA_PKCS1_OAEP_PADDING_SIZE		(1 + 2 * SHA_DIGEST_LENGTH)
+ 
++#ifndef ALLPERMS
++#   define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)
++#endif
++
+ struct ast_key {
+ 	/*! Name of entity */
+ 	char name[80];
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 0a44a4af685..2a80ead90d0 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -1,45 +1,114 @@
+# Contributor: Duncan Bellamy <dunk@denkimushi.com>
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=asterisk
-pkgver=16.7.0
+pkgver=20.5.2
 pkgrel=0
-pkgdesc="Asterisk: A Module Open Source PBX System"
+pkgdesc="Modular Open Source PBX System"
 pkgusers="asterisk"
 pkggroups="asterisk"
-url="http://www.asterisk.org/"
+url="https://www.asterisk.org/"
 arch="all"
-license="GPL-2.0"
-depends=
+license="GPL-2.0-only WITH OpenSSL-Exception"
 options="!check"  # Test suite is separate, and require separate build
-makedepends="findutils tar wget bsd-compat-headers libtool
-	ncurses-dev popt-dev newt-dev zlib-dev libedit-dev tiff-dev curl-dev
-	openssl-dev lua-dev libcap-dev jansson-dev util-linux-dev
-	sqlite-dev postgresql-dev unixodbc-dev freetds-dev mariadb-connector-c-dev
-	alsa-lib-dev pjproject-dev dahdi-tools-dev libpri-dev libsrtp-dev
-	spandsp-dev libresample speex-dev speexdsp-dev libogg-dev
-	bluez-dev libxml2-dev imap-dev"
+makedepends="
+	alsa-lib-dev
+	bluez-dev
+	bsd-compat-headers
+	curl-dev
+	findutils
+	freetds-dev
+	imap-dev
+	jansson-dev
+	libcap-dev
+	libedit-dev
+	libogg-dev
+	libresample
+	libsrtp-dev
+	libtool
+	libxml2-dev
+	lua-dev
+	ncurses-dev
+	newt-dev
+	openssl-dev>3
+	opus-dev
+	opusfile-dev
+	pjproject-dev
+	popt-dev
+	libpq-dev
+	spandsp-dev
+	speexdsp-dev
+	speex-dev
+	sqlite-dev
+	tar
+	tiff-dev
+	unbound-dev
+	unixodbc-dev
+	util-linux-dev
+	zlib-dev
+	"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc
-	$pkgname-tds $pkgname-fax $pkgname-sample-config:sample:noarch
-	$pkgname-sounds-moh:sound_moh:noarch $pkgname-sounds-en:sound_en:noarch
-	$pkgname-mobile $pkgname-curl:_curl $pkgname-srtp $pkgname-dahdi
-	$pkgname-speex $pkgname-alsa $pkgname-cdr-mysql:cdr_mysql"
-
+subpackages="
+	$pkgname-dbg
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-pgsql
+	$pkgname-odbc
+	$pkgname-tds
+	$pkgname-fax
+	$pkgname-sample-config:config:noarch
+	$pkgname-sounds-moh:sound_moh:noarch
+	$pkgname-sounds-en:sound_en:noarch
+	$pkgname-mobile
+	$pkgname-curl:_curl
+	$pkgname-srtp
+	$pkgname-speex
+	$pkgname-opus
+	$pkgname-alsa
+	$pkgname-openrc
+	"
+# Using commit from https://github.com/traud/asterisk-opus/commits/asterisk-13.7
+_opus_commit=90e8780faccc79e68c07775c6ab2fe1ffaccfa08
 _download="https://downloads.asterisk.org/pub/telephony/asterisk/releases"
 source="$_download/asterisk-$pkgver.tar.gz
 	https://dev.alpinelinux.org/~tteras/asterisk-addon-mp3-r201.patch.gz
-	musl-mutex-init.patch
-	musl-astmm-fix.patch
-	asterisk-mariadb.patch
-
+	asterisk-13.7-$_opus_commit.tar.gz::https://github.com/traud/asterisk-opus/archive/$_opus_commit.tar.gz
+	10-musl-mutex-init.patch
+	20-musl-astmm-fix.patch
+	40-asterisk-cdefs.patch
+	41-asterisk-ALLPERMS.patch
+	gethostbyname_r.patch
 	asterisk.initd
 	asterisk.confd
-	asterisk.logrotate"
-
-builddir="$srcdir/$pkgname-${pkgver/_/-}"
+	asterisk.logrotate
+	"
 
 # secfixes:
+#   20.5.1-r0:
+#     - CVE-2023-37457
+#     - CVE-2023-49294
+#     - CVE-2023-49786
+#   18.15.1-r0:
+#     - CVE-2022-37325
+#     - CVE-2022-42706
+#     - CVE-2022-42705
+#   18.11.2-r0:
+#     - CVE-2022-26498
+#     - CVE-2022-26499
+#     - CVE-2022-26651
+#   18.2.2-r2:
+#     - CVE-2021-32558
+#   18.2.1-r0:
+#     - CVE-2021-26712
+#     - CVE-2021-26713
+#     - CVE-2021-26717
+#     - CVE-2021-26906
+#   18.1.1-r0:
+#     - CVE-2020-35652
+#     - CVE-2020-35776
+#   18.0.1-r0:
+#     - CVE-2020-28327
 #   16.6.2-r0:
 #     - CVE-2019-18610
 #     - CVE-2019-18790
@@ -55,14 +124,19 @@ builddir="$srcdir/$pkgname-${pkgver/_/-}"
 
 prepare() {
 	default_prepare
+	update_config_guess
+	update_config_sub
 
 	# asteriskssl does not have direct references to libssl, but looks up
 	# symbols from it using dlsym(RTLD_NEXT), so use --no-as-needed for it.
 	sed -i -e 's/ASTSSL_LIBS:=$(OPENSSL_LIB)/ASTSSL_LIBS:=-Wl,--no-as-needed $(OPENSSL_LIB) -Wl,--as-needed/g' main/Makefile
+
+	# copy codec_opus_open_source files
+	# res/* and include/asterisk/* are not needed as asterisk is new enough
+	cp --verbose ../asterisk-opus*/codecs/* codecs
 }
 
 build() {
-	cd "$builddir"
 	SHA1SUM="$PWD"/build_tools/sha1sum-sh ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -81,13 +155,13 @@ build() {
 		--with-unixodbc \
 		--with-postgres \
 		--with-tds \
-		--with-dahdi \
-		--with-pri \
-		--with-tonezone \
 		--with-resample \
 		--with-sqlite3 \
 		--with-speex \
 		--with-asound \
+		--without-dahdi \
+		--without-pri \
+		--without-tonezone \
 		--without-x11 \
 		--without-pjproject-bundled \
 		--with-spandsp \
@@ -95,7 +169,10 @@ build() {
 		--with-libcurl \
 		--with-libedit \
 		--with-srtp \
-		--with-imap=system
+		--with-imap=system \
+		--with-opus \
+		--with-opusfile \
+		CFLAGS="$CFLAGS -DENABLE_SRTP_AES_256"
 
 	# get default modules to build
 	rm -f menuselect.makeopts
@@ -103,20 +180,21 @@ build() {
 
 	# and add the non-default modules we need
 	./menuselect/menuselect \
+		--enable app_voicemail_imap \
 		--enable chan_mobile \
 		--enable app_meetme \
-		--enable cdr_mysql \
 		--disable BUILD_NATIVE \
-		--enable IMAP_STORAGE \
+		--enable codec_opus_open_source \
+		--enable chan_alsa \
 		menuselect.makeopts
 
 	# build
-	make ASTCFLAGS="$CFLAGS" ASTLDFLAGS="$LDFLAGS" LDCONFIG=
+	make LDCONFIG=
 }
 
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" LDCONFIG_FLAGS="-n" install
+	make DESTDIR="$pkgdir" LDCONFIG_FLAGS="-n" install
+	make DESTDIR="$pkgdir" install-headers
 
 	install -d "$pkgdir"/var/run/asterisk
 	install -d "$pkgdir"/var/lib/asterisk
@@ -131,30 +209,6 @@ package() {
 	chmod -R u=rwX,g=rX,o= "$pkgdir"/etc/asterisk
 }
 
-_move_dir() {
-	for DIR in "$@"; do
-		local dest=`dirname "$subpkgdir/$DIR"`
-		echo mkdir -p $dest
-		mkdir -p "$dest"
-		echo mv "$pkgdir"/$DIR $dest
-		mv "$pkgdir"/"$DIR" "$dest"
-	done
-}
-
-_find_and_move() {
-	local pattern="$1"
-	cd "$pkgdir"
-	find . -name "$pattern" -type f | while read f; do
-		local dest="$subpkgdir/${f%/*}"
-		mkdir -p "$dest"
-		mv "$f" "$dest"
-	done
-}
-
-doc() {
-	default_doc
-}
-
 dev() {
 	default_dev
 	depends="asterisk"
@@ -164,54 +218,18 @@ dev() {
 	mv "$subpkgdir"/usr/lib/libasteriskssl.so "$pkgdir"/usr/lib/libasteriskssl.so
 }
 
-pgsql() {
-	depends=
-	install=
-	_find_and_move '*_pgsql*'
-}
-
-odbc() {
-	depends=
-	install=
-	_find_and_move '*odbc*'
-}
-
-tds() {
-	depends=
-	install=
-	_find_and_move '*_tds*'
-}
-
-fax() {
-        depends=
-        install=
-        _find_and_move '*_fax*'
-}
-
-mobile() {
-        depends=
-        install=
-        _find_and_move '*_mobile*'
-}
-
-_curl() {
-	depends=
-	install=
-	_find_and_move '*_curl*'
-}
-
-cdr_mysql() {
-	depends=
-	install=
-	_find_and_move '*cdr_mysql*'
-}
-
-srtp() { _find_and_move '*_srtp*'; }
-dahdi() { _find_and_move '*_dahdi*'; }
-speex() { _find_and_move '*_speex*'; }
-alsa() { _find_and_move '*_alsa*'; }
-
-sample() {
+pgsql() { amove usr/lib/asterisk/modules/*_pgsql*; }
+odbc() { amove usr/lib/asterisk/modules/*_odbc*; }
+tds() { amove usr/lib/asterisk/modules/*_tds*; }
+fax() { amove usr/lib/asterisk/modules/*_fax*; }
+mobile() { amove usr/lib/asterisk/modules/*_mobile*; }
+_curl() { amove usr/lib/asterisk/modules/*_curl*; }
+srtp() { amove usr/lib/asterisk/modules/*_srtp*; }
+speex() { amove usr/lib/asterisk/modules/*_speex*; }
+opus() { amove usr/lib/asterisk/modules/codec_opus_open_source.so; }
+alsa() { amove usr/lib/asterisk/modules/*_alsa*; }
+
+config() {
 	pkgdesc="Sample configuration files for asterisk"
 	cd "$builddir"
 	mkdir -p "$subpkgdir"/var/lib/asterisk/phoneprov
@@ -225,24 +243,27 @@ sample() {
 sound_moh() {
 	pkgdesc="Default on-hold music files for asterisk"
 	depends=
-	install=
-	_move_dir var/lib/asterisk/moh
+	amove var/lib/asterisk/moh
 	chown -R asterisk:asterisk "$subpkgdir"/var/*/asterisk
 }
 
 sound_en() {
 	pkgdesc="English sound files for asterisk"
 	depends=
-	install=
-	_move_dir var/lib/asterisk/sounds/en
+	amove var/lib/asterisk/sounds/en
 	chown -R asterisk:asterisk "$subpkgdir"/var/*/asterisk
 }
 
-sha512sums="4b06b7879031abf072d8db5e5be32870be65e726d2e02ef38cce48fa4fd006fe8885c95c649ee6f79280c00dc8b0c2252894cb86cfe3011fcc92e2165f3d0213  asterisk-16.7.0.tar.gz
+sha512sums="
+ff2d6ddd5b6031b6e4fcb15c82149c3272031b617bf5bca87af1d085464fcd9af6bd373e9431077ce58a558b50c6b2c9cd4d94e739ecc312371cd605e4746a84  asterisk-20.5.2.tar.gz
 aacef3f4796fb1abd33266998b53909cb4b36e7cc5ad2f7bac68bdc43e9a9072d9a4e2e7e681bddfa31f3d04575eb248afe6ea95da780c67e4829c1e22adfe1b  asterisk-addon-mp3-r201.patch.gz
-f72c2e04de80d3ed9ce841308101383a1655e6da7a3c888ad31fffe63d1280993e08aefcf8e638316d439c68b38ee05362c87503fca1f36343976a01af9d6eb1  musl-mutex-init.patch
-fdac3868ed2ba566397e3a71314568787e4a84d37738f210a6e288c4285215879756c576e2fd064be9cf5169a7e08dbbfd341f50a87e4e6dbfae20e19bcc4d71  musl-astmm-fix.patch
-c76a882588194372d0c45a2bd1a9a946543f2dc07fde9240b3e600682e9737337c7602da35bfaeddb4d9fe568daa668016237c6f7986e7c44cf5a8dbba291e1f  asterisk-mariadb.patch
+69d82b878728f99b7bf7e862025cbc01aa5b6b9332a5372059ea89a788c66fd351f1103989b3573a7a4ba9ff533f3ee2ff5d88de938440e05d6246e41a882306  asterisk-13.7-90e8780faccc79e68c07775c6ab2fe1ffaccfa08.tar.gz
+771237ba6d42ab62d914f2702234b23fd0bc8c22f2aa33b0e745c9170163c8046f6d48ecb299faab3d6fb397f1aa046421083c3cc88510c9779861c522f357dd  10-musl-mutex-init.patch
+0fae11b42894ab3d405bc50e9275b9084712b482fbf9b4259ea938667fc5cbe413655f3ff83da0f607151bb2b6e49c2f741b5ada6944dbb478f076ef8d86380a  20-musl-astmm-fix.patch
+ba33f11169284f190b7dabab1da7d2751cb65d7976408db635a892fa17d7552e1660350017e7aada3464ecc7d9d6e99d6ad76d66c0036de062a386cffbc948e6  40-asterisk-cdefs.patch
+8c7dd38b7317642d3bbd7e90d8bd57f1e7b57ec57955634eebf71bb373c0d418ea3b42a2a248f625a3d3aaad3648f43e27903f5e5a92733c7a2f03de1a87f1d1  41-asterisk-ALLPERMS.patch
+90c8a777108f9d974917d57600aa1d154412415b1085b55ca2c0230aa3e566c35cdd82003e946a348c4f69229dbf9b120983bd4d4eaa4f65a491a0fc11ba84e8  gethostbyname_r.patch
 0044c5db468ec8f2385d18d476f89976f6d036448583a4ef8017ce7a6f8f72105337e6b20037ffe47f561d2877fc9c86720aef23ab037df89b36dc140a5924c4  asterisk.initd
 ab6b6f08ff43268cbb1abb7ed7d678949991ba495682a644bbaeb017d6adbff0a43297905fd73ae8db1786a28d5b5904f1bc253209a0e388c8a27f26c6ce14ed  asterisk.confd
-7591d2faf539d05d9ee4e431c78a5e20686721fd79221ad94dffeeaff9282220b09cb9aec214bd7a8d12affaec0276c9c91e6e21af8b6712c0a9502b60b02f2b  asterisk.logrotate"
+449b5808d90c813c23432274fba47e53227e3a924a55719d2f9e5a90fd2dfb33660a5c85c7e8f11fbb1cd93387e5c68329ed5583f7a64c2451fadad62a9f87dd  asterisk.logrotate
+"
diff --git a/main/asterisk/asterisk-mariadb.patch b/main/asterisk/asterisk-mariadb.patch
deleted file mode 100644
index dab4d988a75..00000000000
--- a/main/asterisk/asterisk-mariadb.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c
-index 00c75dd..bc405bb 100644
---- a/addons/cdr_mysql.c
-+++ b/addons/cdr_mysql.c
-@@ -43,6 +43,7 @@
- #include "asterisk.h"
- 
- #include <mysql/mysql.h>
-+#include <mysql/mariadb_version.h>
- #include <mysql/errmsg.h>
- 
- #include "asterisk/config.h"
-@@ -501,7 +502,7 @@ static int my_load_module(int reload)
- 	res |= my_load_config_string(cfg, "global", "ssl_cert", &ssl_cert, "");
- 	res |= my_load_config_string(cfg, "global", "ssl_key", &ssl_key, "");
- 
--	res |= my_load_config_number(cfg, "global", "port", &dbport, MYSQL_PORT);
-+	res |= my_load_config_number(cfg, "global", "port", &dbport, MARIADB_PORT);
- 	res |= my_load_config_number(cfg, "global", "timeout", &timeout, 0);
- 	res |= my_load_config_string(cfg, "global", "compat", &compat, "no");
- 	res |= my_load_config_string(cfg, "global", "cdrzone", &cdrzone, "");
-diff --git a/addons/res_config_mysql.c b/addons/res_config_mysql.c
-index ae43485..94d3b35 100644
---- a/addons/res_config_mysql.c
-+++ b/addons/res_config_mysql.c
-@@ -33,6 +33,7 @@
- #include <sys/stat.h>
- 
- #include <mysql/mysql.h>
-+#include <mysql/mariadb_version.h>
- #include <mysql/errmsg.h>
- 
- #include "asterisk/channel.h"
diff --git a/main/asterisk/asterisk.logrotate b/main/asterisk/asterisk.logrotate
index 30836c5c11d..a3cfdc6c05a 100644
--- a/main/asterisk/asterisk.logrotate
+++ b/main/asterisk/asterisk.logrotate
@@ -2,7 +2,7 @@
 	missingok
 	rotate 5
 	weekly
-	create 0640 asterisk asterisk
+	create 0644 asterisk asterisk
 	postrotate
 		/usr/sbin/asterisk -rx 'logger reload' > /dev/null 2> /dev/null
 	endscript
diff --git a/main/asterisk/gethostbyname_r.patch b/main/asterisk/gethostbyname_r.patch
new file mode 100644
index 00000000000..c8cd47335bb
--- /dev/null
+++ b/main/asterisk/gethostbyname_r.patch
@@ -0,0 +1,15 @@
+we do have this function- but the autoconf doesn't detect it properly. work
+around a static/non-static mixed declaration by making it match the headers
+diff --git a/main/utils.c b/main/utils.c
+index 6111b86..f989cca 100644
+--- a/main/utils.c
++++ b/main/utils.c
+@@ -96,7 +96,7 @@ AST_MUTEX_DEFINE_STATIC(__mutex);
+ routine is derived from code originally written and placed in the public
+ domain by Enzo Michelangeli <em@em.no-ip.com> */
+ 
+-static int gethostbyname_r (const char *name, struct hostent *ret, char *buf,
++int gethostbyname_r (const char *name, struct hostent *ret, char *buf,
+ 				size_t buflen, struct hostent **result,
+ 				int *h_errnop)
+ {
diff --git a/main/asterisk/musl-astmm-fix.patch b/main/asterisk/musl-astmm-fix.patch
deleted file mode 100644
index 86e3e297132..00000000000
--- a/main/asterisk/musl-astmm-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h
-index 8547283..476dc2a 100644
---- a/include/asterisk/compat.h
-+++ b/include/asterisk/compat.h
-@@ -30,6 +30,7 @@
- #include <inttypes.h>
- #include <limits.h>
- #include <unistd.h>
-+#include <pthread.h>
- 
- #ifdef HAVE_STDDEF_H
- #include <stddef.h>
diff --git a/main/asterisk/musl-mutex-init.patch b/main/asterisk/musl-mutex-init.patch
deleted file mode 100644
index 891d3fd10a2..00000000000
--- a/main/asterisk/musl-mutex-init.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru asterisk-12.4.0.orig/include/asterisk/lock.h asterisk-12.4.0/include/asterisk/lock.h
---- asterisk-12.4.0.orig/include/asterisk/lock.h	2013-11-02 06:05:24.000000000 -0200
-+++ asterisk-12.4.0/include/asterisk/lock.h	2014-08-04 16:00:29.811967599 -0300
-@@ -66,7 +66,7 @@
- #define AST_PTHREADT_NULL (pthread_t) -1
- #define AST_PTHREADT_STOP (pthread_t) -2
- 
--#if (defined(SOLARIS) || defined(BSD))
-+#if (defined(SOLARIS) || defined(BSD) || !defined(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP))
- #define AST_MUTEX_INIT_W_CONSTRUCTORS
- #endif /* SOLARIS || BSD */
- 
diff --git a/main/at-spi2-atk/APKBUILD b/main/at-spi2-atk/APKBUILD
deleted file mode 100644
index 90282967353..00000000000
--- a/main/at-spi2-atk/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
-pkgname=at-spi2-atk
-pkgver=2.34.2
-pkgrel=1
-pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
-url="https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/"
-arch="all"
-options="!check"  # Requires dbus daemon running.
-license="LGPL-2.0-or-later"
-depends_dev="atk-dev"
-makedepends="$depends_dev dbus-dev glib-dev at-spi2-core-dev meson libxml2-dev"
-checkdepends="dbus"
-subpackages="$pkgname-dev"
-source="https://download.gnome.org/sources/at-spi2-atk/${pkgver%.*}/at-spi2-atk-$pkgver.tar.xz"
-
-build() {
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--buildtype=plain \
-		. output
-	ninja -C output
-}
-
-check() {
-	ninja -C output test
-}
-
-package() {
-	DESTDIR="$pkgdir" ninja -C output install
-}
-
-sha512sums="59e7ad5c944748ca00af8b0a9df03c9ffbc6afae6e65c25a2566a9e2a30e66724c4492076be1730c2894c636f82c795c533669572584d8d5675f68b349ad16c4  at-spi2-atk-2.34.2.tar.xz"
diff --git a/main/at-spi2-core/APKBUILD b/main/at-spi2-core/APKBUILD
index c4e56654b18..01a49a7aa2e 100644
--- a/main/at-spi2-core/APKBUILD
+++ b/main/at-spi2-core/APKBUILD
@@ -1,32 +1,70 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=at-spi2-core
-pkgver=2.36.0
-pkgrel=1
+pkgver=2.52.0
+pkgrel=0
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 url="https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/"
 arch="all"
 options="!check"  # Requires running dbus daemon.
-license="LGPL-2.0-or-later"
-makedepends="libxtst-dev dbus-dev glib-dev gobject-introspection-dev gtk-doc meson"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-lang $pkgname-doc"
+license="LGPL-2.1-or-later"
+makedepends="
+	dbus-dev
+	glib-dev
+	gobject-introspection-dev
+	gtk-doc
+	libxml2-dev
+	libxtst-dev
+	meson
+	"
+subpackages="
+	$pkgname-dbg
+	$pkgname-dev
+	$pkgname-lang
+	libatk-1.0:libatk
+	libatk-bridge-2.0:libatk_bridge
+	"
 source="https://download.gnome.org/sources/at-spi2-core/${pkgver%.*}/at-spi2-core-$pkgver.tar.xz"
 
+# both were merged into this
+replaces="atk at-spi2-atk"
+
 build() {
-	meson \
-		--buildtype=plain \
-		--prefix=/usr \
-		-Dx11=yes \
-		-Dintrospection=yes \
-		-Ddocs=true \
+	abuild-meson \
+		-Db_lto=true \
+		-Dx11=enabled \
+		-Dintrospection=enabled \
+		-Ddocs=false \
 		-Ddbus_daemon=/usr/bin/dbus-daemon \
 		. build
-	ninja -C build
+	meson compile -C build
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C build install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C build
 	rm -rf "$pkgdir"/usr/lib/systemd
 }
 
-sha512sums="f45d7e68bfcd9b93cebc47e30febce1ae6a4d9df2fbc9d5bdc25babb123c922d0f9a229485770b2f6ed386178144c20486fa3e46195041ea65a54ab019b1cbb6  at-spi2-core-2.36.0.tar.xz"
+dev() {
+	default_dev
+	replaces="atk-dev at-spi2-atk-dev"
+}
+
+libatk() {
+	pkgdesc="ATK library accessibility interfaces (1.0)"
+	amove \
+		usr/lib/libatk-1.0* \
+		usr/lib/girepository-1.0/Atk-1.0.typelib
+}
+
+libatk_bridge() {
+	pkgdesc="GTK+2.0 module that bridges ATK to D-Bus at-spi"
+	amove \
+		usr/lib/gnome-settings-daemon-3.0 \
+		usr/lib/gtk-2.0 \
+		usr/lib/libatk-bridge-2.0*
+}
+
+sha512sums="
+0482cae97cf5e2295ab56f6ae83db9e1047813a1c3c2b6cd6012f95dfabec1f7a93d0045a1a7c3fabb7a389f71dc43f797b2ad9242e97ddf565cf63948ae146b  at-spi2-core-2.52.0.tar.xz
+"
diff --git a/main/atf/APKBUILD b/main/atf/APKBUILD
index ee6d71c3e9d..6dcc27901e3 100644
--- a/main/atf/APKBUILD
+++ b/main/atf/APKBUILD
@@ -1,17 +1,22 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer:
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=atf
 pkgver=0.21
-pkgrel=2
+pkgrel=7
 pkgdesc="libraries to write tests in C, C++ and shell"
-url="https://github.com/jmmv/atf"
+url="https://github.com/freebsd/atf"
 arch="all"
 license="BSD-2-Clause AND BSD-3-Clause"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="https://github.com/jmmv/atf/releases/download/atf-$pkgver/atf-$pkgver.tar.gz"
+source="https://github.com/freebsd/atf/releases/download/atf-$pkgver/atf-$pkgver.tar.gz"
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
 
 build() {
-	./configure \
+	ATF_SHELL=/bin/sh ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
diff --git a/main/atk/APKBUILD b/main/atk/APKBUILD
deleted file mode 100644
index e139a1648ed..00000000000
--- a/main/atk/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
-pkgname=atk
-pkgver=2.34.1
-pkgrel=2
-pkgdesc="A library providing a set of interfaces for accessibility"
-url="https://www.gtk.org/"
-arch="all"
-license="LGPL-2.0-or-later"
-makedepends="glib-dev gobject-introspection-dev musl-utils meson gtk-doc"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.gnome.org/sources/atk/${pkgver%.*}/atk-$pkgver.tar.xz"
-
-build() {
-	cd "$builddir"
-	meson \
-		--prefix=/usr \
-		--buildtype=plain \
-		--sysconfdir=/etc \
-		--buildtype=plain \
-		-Ddocs=true \
-		output .
-	ninja -C output
-}
-
-check() {
-	cd "$builddir"
-	ninja -C output test
-}
-
-package() {
-	cd "$builddir"
-	DESTDIR="$pkgdir" ninja -C output install
-}
-
-sha512sums="a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e  atk-2.34.1.tar.xz"
diff --git a/main/atop/APKBUILD b/main/atop/APKBUILD
index 717ccf9b58a..c2e6c242e08 100644
--- a/main/atop/APKBUILD
+++ b/main/atop/APKBUILD
@@ -1,52 +1,48 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=atop
-pkgver=2.5.0
+pkgver=2.10.0
 pkgrel=0
 pkgdesc="Resource-specific view of processes"
 url="https://www.atoptool.nl/"
 arch="all"
 license="GPL-2.0-or-later"
-makedepends="zlib-dev ncurses-dev linux-headers"
-subpackages="$pkgname-doc"
-source="https://www.atoptool.nl/download/atop-$pkgver.tar.gz
-	atop-bb-compat.patch
+makedepends="glib-dev linux-headers ncurses-dev zlib-dev"
+subpackages="$pkgname-doc $pkgname-openrc"
+source="$pkgname-$pkgver.tgz::https://www.atoptool.nl/download/atop-$pkgver.tar.gz
 	atop-daily-bb.patch
-	atop-include-macros.patch
+	make-cron-background.patch
+	gcc13.patch
 	atop.initd
-"
-options="suid"
+	"
+options="!check"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 
-	sed -i -e '/^CFLAGS/s: = -O : += :' \
-		-e '/DEFPATH/d' \
-		-e '/^LDFLAGS/s: = : += :' Makefile
+	sed -i -e '/DEFPATH/d' Makefile
 
 	cp "$srcdir"/atop.initd atop.init
 	chmod a+rx atop.init
 }
 
 build() {
-	cd "$builddir"
+	make
 }
 
 package() {
-	cd "$builddir"
-	mkdir -p "$pkgdir"/var/log/atop "$pkgdir"/var/run "$pkgdir"/usr/sbin
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		INIPATH=/etc/init.d \
 		SCRPATH=/etc/periodic/daily \
 		sysvinstall
 	rm -fr "$pkgdir"/etc/cron.d
 	mv "$pkgdir"/etc/periodic/daily/atop.daily \
 		"$pkgdir"/etc/periodic/daily/atop
-
 }
 
-sha512sums="675bbd902d8fe584b1ff47c275ee06d7bfe9127fadf79825ca64bbb6bcb6c34cab485e0686854d805bbdfaf69ebb40d790f7cc00c788544bff73b49c3d24dc08  atop-2.5.0.tar.gz
-165e5f17f1a752f8663a774d72476eac5693f93922b32fa198f09233ca6dfde2d6c63b10c31d0388ac9f10d210e7067787f30ef25e0ef9419a1520486f290b15  atop-bb-compat.patch
+sha512sums="
+72a9307ed0cfa9c0157c81e8acbb4850ae339b50481ce2e1b828cad4b3354bfc8f56866c9c4df72ea34941359719d088f7936182d1478a6ac8f4e1bdf4bee7f4  atop-2.10.0.tgz
 664225450074962aac0e13484c9b2feaf08620bbe1e0f9c5dc1b02f1ecd315224cd04df53134f2d107210fc9223a64d8885ae70d33d0663c2335fa6d46f6ddfd  atop-daily-bb.patch
-f30c9e6051332af8c8cafcd881f89a0e2d2a8e1d84eee8ac0c8c6b58f3ae3431fcf9c40dea6d03e271f8969802de449d33b4323c13045bdb38a539732c81a8b6  atop-include-macros.patch
-172c9d367b936427ccbbbd1140c7808ec8ffe3194b3557ba024820dac8fa68c9919f7dc34d332e91283fde64d731db7bdbfee3c2d6caad3cd291e0f1c227cb03  atop.initd"
+e563894eceadf63ff153714829218b8f78dd21a129b90817960bdb4452768f41ed884dc9967f94b979e42f04d6434fcbd423bcf1651976a5ad60c34b206ce7e9  make-cron-background.patch
+5727287f891ab9487a33b13754cd02468725aad5daef9e46aac507eef9871e8f9cfbfa546f47dbe25ee25e0924b773e5966f0d82a39947d0b8792e08260f1a7b  gcc13.patch
+efbf36d933a8be90ebf2fd54a188cd1c9bc9b8d87755625aba85831a83f3a087dbe6e953f7ce36b38d9909b9ab747e0e9186ad0e85382d5b4e8690c9cfdc0d40  atop.initd
+"
diff --git a/main/atop/atop-bb-compat.patch b/main/atop/atop-bb-compat.patch
deleted file mode 100644
index 015f06be6e5..00000000000
--- a/main/atop/atop-bb-compat.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/atop.daily b/atop.daily
-index c72214c..ac4b3b7 100755
---- a/atop.daily
-+++ b/atop.daily
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
diff --git a/main/atop/atop-include-macros.patch b/main/atop/atop-include-macros.patch
deleted file mode 100644
index d535d1065b6..00000000000
--- a/main/atop/atop-include-macros.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/photosyst.c
-+++ b/photosyst.c
-@@ -152,6 +152,7 @@
- static const char rcsid[] = "$Id: photosyst.c,v 1.38 2010/11/19 07:40:40 gerlof Exp $";
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
diff --git a/main/atop/atop.initd b/main/atop/atop.initd
index e86d79be913..33bf977e1bd 100644
--- a/main/atop/atop.initd
+++ b/main/atop/atop.initd
@@ -3,11 +3,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-process/atop/files/atop.rc,v 1.1 2005/06/14 23:01:10 vapier Exp $
 
+pidfile="/var/run/atop.pid"
+
 _daily=/etc/periodic/daily/atop
 start(){
 	ebegin "Starting atop"
 	if [ -f "$_daily" ] ; then
-		start-stop-daemon --start --quiet --exec "$_daily"
+		start-stop-daemon --start --quiet --pidfile "$pidfile" --exec "$_daily"
 		eend $?
 	else
 		eend 1 "/etc/cron.d/atop doesnt exist!"
@@ -16,6 +18,6 @@ start(){
 
 stop(){
 	ebegin "Stopping atop"
-	start-stop-daemon --stop --pidfile /var/run/atop.pid
+	start-stop-daemon --stop --pidfile "$pidfile"
 	eend $?
 }
diff --git a/main/atop/gcc13.patch b/main/atop/gcc13.patch
new file mode 100644
index 00000000000..4287ef279c9
--- /dev/null
+++ b/main/atop/gcc13.patch
@@ -0,0 +1,12 @@
+diff --git a/drawbar.c b/drawbar.c
+index 659ed6a..a5a1cc5 100644
+--- a/drawbar.c
++++ b/drawbar.c
+@@ -110,6 +110,7 @@
+ #include <unistd.h>
+ #include <regex.h>
+ #include <sys/utsname.h>
++#include <time.h>
+ 
+ #include "atop.h"
+ #include "showgeneric.h"
diff --git a/main/atop/make-cron-background.patch b/main/atop/make-cron-background.patch
new file mode 100644
index 00000000000..a710572cf7b
--- /dev/null
+++ b/main/atop/make-cron-background.patch
@@ -0,0 +1,28 @@
+From a2cd8d902a833e5bec024e81d6361684c1f84e4b Mon Sep 17 00:00:00 2001
+From: ptrcnull <git@ptrcnull.me>
+Date: Tue, 1 Mar 2022 15:33:05 +0100
+Subject: [PATCH] Make daily atop cron job run in the background
+
+---
+ atop.daily | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/atop.daily b/atop.daily
+index 55737fd..5e18650 100755
+--- a/atop.daily
++++ b/atop.daily
+@@ -57,8 +57,7 @@ fi
+ #
+ ( (sleep 3; find "$LOGPATH" -name 'atop_*' -mtime +"$LOGGENERATIONS" -exec rm {} \;)& )
+ 
+-# activate atop with an interval of S seconds (configurable),
+-# replacing the current shell
++# activate atop with an interval of S seconds (configurable)
+ #
+-echo $$ > $PIDFILE
+-exec $BINPATH/atop $LOGOPTS -w "$LOGPATH"/atop_"$CURDAY" "$LOGINTERVAL" > "$LOGPATH/daily.log" 2>&1
++$BINPATH/atop $LOGOPTS -w "$LOGPATH"/atop_"$CURDAY" "$LOGINTERVAL" > "$LOGPATH/daily.log" 2>&1 &
++echo $! > $PIDFILE
+-- 
+2.35.1
+
diff --git a/main/attr/APKBUILD b/main/attr/APKBUILD
index 996f6499fef..91cd96f17bb 100644
--- a/main/attr/APKBUILD
+++ b/main/attr/APKBUILD
@@ -1,27 +1,25 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=attr
-pkgver=2.4.48
+pkgver=2.5.2
 pkgrel=0
-pkgdesc="Utilities for managing filesystem extended attributes"
+pkgdesc="utilities for managing filesystem extended attributes"
 options="checkroot !check" # attr.test fails with no error message
 url="https://savannah.nongnu.org/projects/attr"
 arch="all"
-license="GPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 checkdepends="perl"
-subpackages="$pkgname-dev $pkgname-doc lib$pkgname:libs"
-source="https://download.savannah.nongnu.org/releases/attr/attr-$pkgver.tar.gz
-	fix-tests.patch
-	"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc lib$pkgname:libs"
+source="https://download.savannah.nongnu.org/releases/attr/attr-$pkgver.tar.gz"
 
 build() {
-	OPTIMIZER="${CFLAGS}" \
+	OPTIMIZER="$CFLAGS" \
 	DEBUG=-DNDEBUG \
 	INSTALL_USER=root \
 	INSTALL_GROUP=root \
 	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
+		--build="$CBUILD" \
+		--host="$CHOST" \
 		--prefix=/ \
 		--exec-prefix=/ \
 		--sbindir=/bin \
@@ -30,10 +28,9 @@ build() {
 		--libexecdir=/usr/lib \
 		--includedir=/usr/include \
 		--mandir=/usr/share/man \
-		--docdir=/usr/share/doc \
+		--docdir=/usr/share/doc/attr \
 		--datadir=/usr/share \
-		--disable-nls \
-		--disable-static
+		--disable-nls
 	make
 }
 
@@ -58,5 +55,6 @@ libs() {
 	default_libs
 }
 
-sha512sums="75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923  attr-2.4.48.tar.gz
-2ff96b8822c4344035eef6e2edc632e9b7381876cbc2c7e0931dfb43af3b9383c0066f9b9d125c53e030a6bf542dc5ae988610bda250a261a39ee211f6208cf2  fix-tests.patch"
+sha512sums="
+7b8f210ab2233d82d282d36c10ac2f4b10e1ba9bd0f02e1f4e69b8f610cb3266bfac9796349b51b2f92fa6ef2c66c62f1a9c4ae18e202b00af3e251e3b469a24  attr-2.5.2.tar.gz
+"
diff --git a/main/attr/fix-tests.patch b/main/attr/fix-tests.patch
deleted file mode 100644
index 54ca561a8f9..00000000000
--- a/main/attr/fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/test/run b/test/run
-index 4b1f8d0..07e916c 100755
---- a/test/run
-+++ b/test/run
-@@ -106,7 +106,7 @@ for (;;) {
-   if (defined $line) {
-     # Substitute %VAR and %{VAR} with environment variables.
-     $line =~ s[%(\w+)][$ENV{$1}]eg;
--    $line =~ s[%{(\w+)}][$ENV{$1}]eg;
-+    $line =~ s[%\{(\w+)}][$ENV{$1}]eg;
-   }
-   if (defined $line) {
-     if ($line =~ s/^\s*< ?//) {
-
diff --git a/main/audit/0002-auparse-remove-use-of-rawmemchr.patch b/main/audit/0002-auparse-remove-use-of-rawmemchr.patch
deleted file mode 100644
index 891a87bbc33..00000000000
--- a/main/audit/0002-auparse-remove-use-of-rawmemchr.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8f2a6788b78dd6b219545aacbd42e2f84df8c71a Mon Sep 17 00:00:00 2001
-From: Tycho Andersen <tycho@docker.com>
-Date: Mon, 13 Mar 2017 16:17:10 -0700
-Subject: [PATCH 2/4] auparse: remove use of rawmemchr
-
-just iterate over the string instead, it's much simpler and doesn't use a
-glibc extension.
-
-Signed-off-by: Tycho Andersen <tycho@docker.com>
----
- auparse/interpret.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/auparse/interpret.c b/auparse/interpret.c
-index ea17c41..75b7679 100644
---- a/auparse/interpret.c
-+++ b/auparse/interpret.c
-@@ -819,10 +819,9 @@ static const char *print_proctitle(const char *val)
- 		// Proctitle has arguments separated by NUL bytes
- 		// We need to write over the NUL bytes with a space
- 		// so that we can see the arguments
--		while ((ptr  = rawmemchr(ptr, '\0'))) {
--			if (ptr >= end)
--				break;
--			*ptr = ' ';
-+		while (ptr < end) {
-+			if (*ptr == '\0')
-+				*ptr = ' ';
- 			ptr++;
- 		}
- 	}
--- 
-2.13.1
-
diff --git a/main/audit/APKBUILD b/main/audit/APKBUILD
index 37f2ab2ba73..959f7006b6b 100644
--- a/main/audit/APKBUILD
+++ b/main/audit/APKBUILD
@@ -1,35 +1,33 @@
-# Maintainer: Tycho Andersen <tycho@docker.com>
+# Contributor: Dermot Bradley <dermot_bradley@yahoo.com>
+# Contributor: Tycho Andersen <tycho@docker.com>
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=audit
-pkgver=2.8.5
+pkgver=4.0.1
 pkgrel=0
-pkgdesc="User space tools for 2.6 kernel auditing"
-url="http://people.redhat.com/sgrubb/audit/"
+pkgdesc="User space tools for kernel auditing"
+url="https://people.redhat.com/sgrubb/audit/"
 arch="all"
-license="GPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 depends_dev="linux-headers"
 makedepends="$depends_dev swig libcap-ng-dev python3"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc"
+install="$pkgname.pre-install"
+subpackages="
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-libs
+	$pkgname-openrc
+	"
 source="https://people.redhat.com/sgrubb/audit/audit-$pkgver.tar.gz
-	0002-auparse-remove-use-of-rawmemchr.patch
 	0003-all-get-rid-of-strndupa.patch
+	usr-paths.patch
+	musl.patch
+	test-uid-42.patch
 	auditd.initd
-	auditd.confd"
-
-case "$CARCH" in
-mips*)
-	# mips builder does not have audit support enabled
-	options="$options !check"
-	;;
-esac
-
-builddir="$srcdir/audit-$pkgver"
+	auditd.confd
+	"
 
 build() {
-	if [ "$CARCH" = "ppc64le" ]; then
-		WITHOUT="--without-python3 --without-python"
-	fi
-
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -39,32 +37,40 @@ build() {
 		--localstatedir=/var \
 		--disable-zos-remote \
 		--enable-shared=audit \
-		$WITHOUT
+		--with-arm \
+		--with-aarch64
 	make
 }
 
 check() {
-	cd "$builddir"
-	make -j1 check
+	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	install -D -m644 "$srcdir"/auditd.confd \
-		"$pkgdir"/etc/conf.d/auditd
-	install -D -m755 "$srcdir"/auditd.initd \
-                "$pkgdir"/etc/init.d/auditd
+
+	install -Dm755 "$srcdir"/auditd.initd "$pkgdir"/etc/init.d/auditd
+	install -Dm644 "$srcdir"/auditd.confd "$pkgdir"/etc/conf.d/auditd
+
+	cd "$pkgdir"
+	rm -r usr/lib/systemd/system \
+		usr/libexec/initscripts/legacy-actions/auditd
+	rmdir -vp --ignore-fail-on-non-empty usr/lib/systemd \
+		usr/libexec/initscripts/legacy-actions
 }
 
 static() {
 	pkgdesc="Static libaudit libraries"
-	mkdir -p "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
+
+	amove usr/lib/*.a
 }
 
-sha512sums="7d416aaa21c1a167f8e911ca82aecbaba804424f3243f505066c43ecc4a62a34feb2c27555e99d3268608404793dccca0f828c63670e3aa816016fb493f8174a  audit-2.8.5.tar.gz
-b7851d4c3c6d7d35f2e822273c17ab530ac24301c414da7f0c7578b7a182692ecd01b51cb50ea04adba4b43987f27020f8f411aec23b3bda0af4d4b6e9fbae5d  0002-auparse-remove-use-of-rawmemchr.patch
+sha512sums="
+7fbc426d0ddea340a36ceab52ac090e8e3dfb3450ebf50b478324a097f19ab4bb2cf78a2532644acb17e6114b59b8fda718affda9da62fb84181e3abf76039df  audit-4.0.1.tar.gz
 f3f2c4ee745e99877c981d889c5cbb0379d073a9b7634c1480ae603a21a13045f9978b51f8cb53c8d0ba414d249bb859af7bca7e302c464b3fc3c6463ecca762  0003-all-get-rid-of-strndupa.patch
-1b48c248db5d34f148f9c79f8b2a6acbf61c729230341b861f5e331bbfb0c8356305a09eb2cc5c82c14c4fd9a13c7c13957e1ed493834b8b3b9ee38978e4c31f  auditd.initd
-69d8777772ded7a8c0db2bcf84961b121bb355fa0d4ba0e14e311f8a8bfe665cbd2b7ac632d73477f9dfa9a6eec357a7ed458fe9b3e7b5ede75b166f3f092ab7  auditd.confd"
+90c7d213a0b4ef27bf643e046dd2b3c5909706c62fba24ef34ecb32ff07b73fda13ed04c616a7cf8148115fc977aa1096b61e717abd5bd32f72f7bb4ac07999f  usr-paths.patch
+68e49b5056197b555dc95eeb7ee7f26b3fe9a7b2d38ad5c5d788c8bd90c5f410a2001ce8513ab3ebb663a58b0999a5fab00c9d754cb09bd0559852f14d90b722  musl.patch
+a8379c26553f524a4684ee660fe1e3422d720080f137ac9ebc17873cf90d13b6b81a5fde2d9b076ee32a2c1115240146bc12daca9a22ec53e7986c7454278794  test-uid-42.patch
+b3d7ceba02b6b4406222c3b142fcfdf2b612dc52eebc490cfd121d696e4ef7c6cc5e27813d67937c464ed4c3cd283de9ccfcb75e63405a447523fa4641e79da3  auditd.initd
+69d8777772ded7a8c0db2bcf84961b121bb355fa0d4ba0e14e311f8a8bfe665cbd2b7ac632d73477f9dfa9a6eec357a7ed458fe9b3e7b5ede75b166f3f092ab7  auditd.confd
+"
diff --git a/main/audit/audit.pre-install b/main/audit/audit.pre-install
new file mode 100644
index 00000000000..ab7d775ac31
--- /dev/null
+++ b/main/audit/audit.pre-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# auditd will not start if its log directory is missing
+mkdir -p /var/log/audit
+
+exit 0
diff --git a/main/audit/auditd.initd b/main/audit/auditd.initd
index c952554df2f..b9d9c47e710 100644
--- a/main/audit/auditd.initd
+++ b/main/audit/auditd.initd
@@ -10,7 +10,7 @@ description_reload_auditd='Reload daemon configuration'
 
 name='auditd'
 pidfile='/var/run/auditd.pid'
-command='/sbin/auditd'
+command='/usr/sbin/auditd'
 
 start_auditd() {
 	# Env handling taken from the upstream init script
@@ -49,7 +49,7 @@ loadfile() {
 	local rules="$1"
 	if [ -n "${rules}" -a -f "${rules}" ]; then
 		einfo "Loading audit rules from ${rules}"
-		/sbin/auditctl -R "${rules}" >/dev/null
+		/usr/sbin/auditctl -R "${rules}" >/dev/null
 		return $?
 	else
 		return 0
diff --git a/main/audit/musl.patch b/main/audit/musl.patch
new file mode 100644
index 00000000000..9db71cfa198
--- /dev/null
+++ b/main/audit/musl.patch
@@ -0,0 +1,46 @@
+--- a/auparse/auparse.h
++++ b/auparse/auparse.h
+@@ -55,7 +55,7 @@
+ void auparse_destroy(auparse_state_t *au);
+ void auparse_destroy_ext(auparse_state_t *au, auparse_destroy_what_t what);
+ auparse_state_t *auparse_init(ausource_t source, const void *b)
+-	__attribute_malloc__ __attr_dealloc (auparse_destroy, 1);
++	__attribute__((__malloc__)) __attr_dealloc (auparse_destroy, 1);
+ int auparse_new_buffer(auparse_state_t *au, const char *data, size_t data_len)
+ 	__attr_access ((__read_only__, 2, 3));
+ int auparse_feed(auparse_state_t *au, const char *data, size_t data_len)
+--- a/audisp/plugins/remote/queue.c
++++ b/audisp/plugins/remote/queue.c
+@@ -49,10 +49,8 @@
+ };
+ 
+ /* Local Declarations */
+-static int full_pread(int fd, void *buf, size_t size, off_t offset)
+-	__attr_access ((__write_only__, 2, 3));
+-static int full_pwrite(int fd, const void *buf, size_t size, off_t offset)
+-	__attr_access ((__read_only__, 2, 3));
++static int full_pread(int fd, void *buf, size_t size, off_t offset);
++static int full_pwrite(int fd, const void *buf, size_t size, off_t offset);
+ 
+ /* Compile-time expression verification */
+ #define verify(E) do {				\
+--- a/audisp/plugins/remote/queue.h
++++ b/audisp/plugins/remote/queue.h
+@@ -53,15 +53,14 @@
+  * On error, return NULL and set errno. */
+ struct queue *q_open(int q_flags, const char *path, size_t num_entries,
+ 		     size_t entry_size)
+-	__attribute_malloc__ __attr_dealloc (q_close, 1) __wur;
++	__attribute__((__malloc__));
+ 
+ /* Add DATA to tail of Q. Return 0 on success, -1 on error and set errno. */
+ int q_append(struct queue *q, const char *data);
+ 
+ /* Peek at head of Q, storing it into BUF of SIZE. Return 1 if an entry 
+  * exists, 0 if queue is empty. On error, return -1 and set errno. */
+-int q_peek(struct queue *q, char *buf, size_t size)
+-	__attr_access ((__write_only__, 2, 3));
++int q_peek(struct queue *q, char *buf, size_t size);
+ 
+ /* Drop head of Q and return 0. On error, return -1 and set errno. */
+ int q_drop_head(struct queue *q);
diff --git a/main/audit/test-uid-42.patch b/main/audit/test-uid-42.patch
new file mode 100644
index 00000000000..f1d096451ef
--- /dev/null
+++ b/main/audit/test-uid-42.patch
@@ -0,0 +1,76 @@
+uid 42 is not gdm on Alpine
+
+--- a/auparse/test/auparse_test.ref
++++ b/auparse/test/auparse_test.ref
+@@ -188,7 +188,7 @@
+         uid=0 (root)
+         subj=system_u:system_r:init_t:s0 (system_u:system_r:init_t:s0)
+         old-auid=4294967295 (unset)
+-        auid=42 (gdm)
++        auid=42 (unknown(42))
+         tty=(none) ((none))
+         old-ses=4294967295 (4294967295)
+         ses=1 (1)
+@@ -209,7 +209,7 @@
+         items=0 (0)
+         ppid=1 (1)
+         pid=2288 (2288)
+-        auid=42 (gdm)
++        auid=42 (unknown(42))
+         uid=0 (root)
+         gid=0 (root)
+         euid=0 (root)
+@@ -389,7 +389,7 @@
+         uid=0 (root)
+         subj=system_u:system_r:init_t:s0 (system_u:system_r:init_t:s0)
+         old-auid=4294967295 (unset)
+-        auid=42 (gdm)
++        auid=42 (unknown(42))
+         tty=(none) ((none))
+         old-ses=4294967295 (4294967295)
+         ses=1 (1)
+@@ -410,7 +410,7 @@
+         items=0 (0)
+         ppid=1 (1)
+         pid=2288 (2288)
+-        auid=42 (gdm)
++        auid=42 (unknown(42))
+         uid=0 (root)
+         gid=0 (root)
+         euid=0 (root)
+@@ -587,7 +587,7 @@
+         uid=0 (root)
+         subj=system_u:system_r:init_t:s0 (system_u:system_r:init_t:s0)
+         old-auid=4294967295 (unset)
+-        auid=42 (gdm)
++        auid=42 (unknown(42))
+         tty=(none) ((none))
+         old-ses=4294967295 (4294967295)
+         ses=1 (1)
+@@ -608,7 +608,7 @@
+         items=0 (0)
+         ppid=1 (1)
+         pid=2288 (2288)
+-        auid=42 (gdm)
++        auid=42 (unknown(42))
+         uid=0 (root)
+         gid=0 (root)
+         euid=0 (root)
+@@ -874,7 +874,7 @@
+         uid=0 (root)
+         subj=system_u:system_r:init_t:s0 (system_u:system_r:init_t:s0)
+         old-auid=4294967295 (unset)
+-        auid=42 (gdm)
++        auid=42 (unknown(42))
+         tty=(none) ((none))
+         old-ses=4294967295 (4294967295)
+         ses=1 (1)
+@@ -895,7 +895,7 @@
+         items=0 (0)
+         ppid=1 (1)
+         pid=2288 (2288)
+-        auid=42 (gdm)
++        auid=42 (unknown(42))
+         uid=0 (root)
+         gid=0 (root)
+         euid=0 (root)
diff --git a/main/audit/usr-paths.patch b/main/audit/usr-paths.patch
new file mode 100644
index 00000000000..8e1c2b67d97
--- /dev/null
+++ b/main/audit/usr-paths.patch
@@ -0,0 +1,28 @@
+From: Dermot Bradley <dermot_bradley@yahoo.com>
+Date: Fri, 29 May 2020 19:55:23 +0100
+Updated: Mon, 30 May 2022 23:42:39 +0000
+
+correct paths in plugins
+
+--- a/audisp/plugins/remote/au-remote.conf
++++ b/audisp/plugins/remote/au-remote.conf
+@@ -5,7 +5,7 @@
+ 
+ active = no
+ direction = out
+-path = /sbin/audisp-remote
++path = /usr/sbin/audisp-remote
+ type = always
+ #args =
+ format = string
+--- a/audisp/plugins/syslog/syslog.conf
++++ b/audisp/plugins/syslog/syslog.conf
+@@ -8,7 +8,7 @@
+ 
+ active = no
+ direction = out
+-path = /sbin/audisp-syslog
++path = /usr/sbin/audisp-syslog
+ type = always 
+ args = LOG_INFO
+ format = string
diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD
index 85803b78033..aae4701c32c 100644
--- a/main/augeas/APKBUILD
+++ b/main/augeas/APKBUILD
@@ -1,15 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=augeas
 pkgver=1.12.0
-pkgrel=0
+pkgrel=6
 pkgdesc="A configuration editing tool"
 url="http://augeas.net"
 arch="all"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 makedepends="autoconf automake libxml2-dev readline-dev libtool"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-tests::noarch $pkgname-libs"
 source="http://download.augeas.net/augeas-$pkgver.tar.gz
 	fix-test.patch
+	xsi-strerror.patch
 	acf.aug
 	awall.aug
 	"
@@ -75,7 +76,10 @@ static() {
 	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
 }
 
-sha512sums="4f61d4abbf338e915dfae212560d39792674bc757f05f500afa80c6170abc214ffb99cab2cf5bbd1c2338d11a6909e5fc3ff7112a2246fca69f7b39ac283da40  augeas-1.12.0.tar.gz
+sha512sums="
+4f61d4abbf338e915dfae212560d39792674bc757f05f500afa80c6170abc214ffb99cab2cf5bbd1c2338d11a6909e5fc3ff7112a2246fca69f7b39ac283da40  augeas-1.12.0.tar.gz
 9768878b2f8710436ef1eba7868c22b5eff1d2d549434bf76aced72ebdb4af4f769ea638dedf42ac9b617aaa53d1a767ed6b18868dd0bb3cf72cb3889f6d933a  fix-test.patch
+3d849cc223beb2a6e39f0082cb9fb8ca9f0683a91899e86c0e41672a7bc5691d156d1cb43cb55f4be29f56376ae0a54e48d61624c74d7a2d52beaffaa998c501  xsi-strerror.patch
 74d728abdf4d3eebdeb3823c1d2588c214fd52734c8855fe3ddbfb6465d31c88d093df356e42effdd3dbdff1a62c52894c7aa840bd6ea8df4995c4f3aa53e919  acf.aug
-fe83e70ddeced87fea4c4dbdfb90b7497bc5fd01b6b097f0f49c52894b4dc1d93cf217ae7aa98abeaba0a9f8e8e18a1d426b6c203b318afde9cd5164cbe604b1  awall.aug"
+fe83e70ddeced87fea4c4dbdfb90b7497bc5fd01b6b097f0f49c52894b4dc1d93cf217ae7aa98abeaba0a9f8e8e18a1d426b6c203b318afde9cd5164cbe604b1  awall.aug
+"
diff --git a/main/augeas/xsi-strerror.patch b/main/augeas/xsi-strerror.patch
new file mode 100644
index 00000000000..bea49b695b4
--- /dev/null
+++ b/main/augeas/xsi-strerror.patch
@@ -0,0 +1,16 @@
+use_gnu is set with gnu source and for other things,
+so force the xsi fallback
+--
+diff --git a/src/internal.c b/src/internal.c
+index ef83b71..5fae2e4 100644
+--- a/src/internal.c
++++ b/src/internal.c
+@@ -431,7 +431,7 @@ char *cleanpath(char *path) {
+ 
+ const char *xstrerror(int errnum, char *buf, size_t len) {
+ #ifdef HAVE_STRERROR_R
+-# ifdef __USE_GNU
++# if 0
+     /* Annoying linux specific API contract */
+     return strerror_r(errnum, buf, len);
+ # else
diff --git a/main/aumix/APKBUILD b/main/aumix/APKBUILD
index 3f81ff32a76..7579e7f38f4 100644
--- a/main/aumix/APKBUILD
+++ b/main/aumix/APKBUILD
@@ -1,43 +1,40 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=aumix
 pkgver=2.9.1
-pkgrel=6
-pkgdesc="A color text mode sound mixer"
-url="http://www.jpj.net/~trevor/aumix.html"
+pkgrel=10
+pkgdesc="color text mode sound mixer"
+url="https://sourceforge.net/projects/aumix/"
 arch="all"
 license="GPL-2.0-or-later"
-depends=""
 makedepends="ncurses-dev linux-headers"
-subpackages="$pkgname-doc"
-source="http://jpj.net/~trevor/aumix/releases/aumix-$pkgver.tar.bz2
+subpackages="$pkgname-doc $pkgname-openrc"
+source="https://downloads.sourceforge.net/aumix/$pkgver/aumix-$pkgver.tar.bz2
+	gcc-10.patch
 	aumix.initd
 	"
+options="!check"
 
-_builddir="$srcdir"/aumix-$pkgver
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
+	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
-		--without-gtk1 \
 		--without-gtk \
-		--disable-nls \
-		|| return 1
-	make || return 1
+		--disable-nls
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make -j1 DESTDIR="$pkgdir" install || return 1
+	make -j1 DESTDIR="$pkgdir" install
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/aumix
 }
 
 sha512sums="bd063dc9dab8455f467fbe9e4ea1baa5cef914923e66ab5a8fca1e6964cac7851e3755f054bfe41657371e221920fe9a52f9807457996244f4bcd5db4659b21d  aumix-2.9.1.tar.bz2
+248ed0bceb2b1030930c89a1d6eace9c43338be80dae5d023bcb131a1666be21984fa2bd814945f8e5683d6e31eeb10bc2cddc6820385ce44e3ae32fdb8da3e9  gcc-10.patch
 1b7acedcc35217e6ab5dfc2be6c4a684de16db62387da8b56d41a65094b9334384bb10307d39b6ef7030142caa30b0c0dac5be4d2986fc470a62806649fdf69f  aumix.initd"
diff --git a/main/aumix/gcc-10.patch b/main/aumix/gcc-10.patch
new file mode 100644
index 00000000000..f021cbda4d6
--- /dev/null
+++ b/main/aumix/gcc-10.patch
@@ -0,0 +1,132 @@
+--- a/src/common.h
++++ b/src/common.h
+@@ -129,8 +129,8 @@
+ extern int      ReadRecSrc(void);
+ extern int      WriteRecSrc(void);
+ int             ReadWriteMixer(int device, char *rw, int *left, int *right, char *rp);
+-int             ourlevel[SOUND_MIXER_NRDEVICES];
+-int             our_recplay[SOUND_MIXER_NRDEVICES];	/* Store record/play settings for updates. */
++extern int             ourlevel[SOUND_MIXER_NRDEVICES];
++extern int             our_recplay[SOUND_MIXER_NRDEVICES];	/* Store record/play settings for updates. */
+ int             LoadSettings(void);
+ int             SaveSettings(void);
+ int             dummy_ioctl(int fd, unsigned long req, int *arg);
+--- a/src/curses.c
++++ b/src/curses.c
+@@ -27,8 +27,9 @@
+ #include "mouse.h"
+ 
+ unsigned char  *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo, *lang;
+-int             current_dev, level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode, cols_saved, lines_saved;
++int             level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode, cols_saved, lines_saved;
+ int             in_keysbox = FALSE;
++int             (*Wgetch) (WINDOW * win);
+ static int	cursor_x, cursor_y;	/* keep track of cursor position */
+ 
+ void            InitScreenCurses(void)
+--- a/src/curses.h
++++ b/src/curses.h
+@@ -88,8 +88,8 @@
+ };
+ #define ARROW_WIDTH 1		/* width of selection arrow */
+ #define R_P_WIDTH 1		/* width of record/play indicator */
+-int             level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode;
+-int             (*Wgetch) (WINDOW * win);
++extern int             level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode;
++extern int             (*Wgetch) (WINDOW * win);
+ #define Getch() (*Wgetch)(stdscr)
+ void            WakeUpCurses(void);
+ void            InitScreenCurses(void);
+--- a/src/gtk.c
++++ b/src/gtk.c
+@@ -45,6 +45,24 @@
+ #include "interactive.h"
+ #include <signal.h>		/* SIGALRM */
+ 
++GdkBitmap      *rmask;
++GdkBitmap      *pmask;
++GtkWidget      *pixmapwid[SOUND_MIXER_NRDEVICES];
++GdkPixmap      *record_pixmap;
++GdkPixmap      *play_pixmap;
++GtkAdjustment  *adjustment[SOUND_MIXER_NRDEVICES];
++GtkAdjustment  *balance[SOUND_MIXER_NRDEVICES];
++GtkWidget      *baltracks[SOUND_MIXER_NRDEVICES];
++GtkWidget      *channellabel[SOUND_MIXER_NRDEVICES];
++GtkToggleButton *rpbuttons[SOUND_MIXER_NRDEVICES];
++GtkWidget      *levels[SOUND_MIXER_NRDEVICES];
++GtkWidget      *maintable;
++gint            balcallback[SOUND_MIXER_NRDEVICES];
++gint            lvlcallback[SOUND_MIXER_NRDEVICES];
++gint            rpcallback[SOUND_MIXER_NRDEVICES];
++gboolean        menuvisible, balancevisible, recplayvisible, valuesvisible, visible[SOUND_MIXER_NRDEVICES];
++GtkWidget      *labelrec, *labelzero, *labelcent, *labelleft, *labelright, *labelbalance;
++
+ void            SaveSettingsGTK(void)
+ {
+ 	(void) SaveSettings();
+--- a/src/gtk.h
++++ b/src/gtk.h
+@@ -7,23 +7,23 @@
+ #include <sys/mman.h>
+ #include <gtk/gtk.h>
+ 
+-GdkBitmap      *rmask;
+-GdkBitmap      *pmask;
+-GtkWidget      *pixmapwid[SOUND_MIXER_NRDEVICES];
+-GdkPixmap      *record_pixmap;
+-GdkPixmap      *play_pixmap;
+-GtkAdjustment  *adjustment[SOUND_MIXER_NRDEVICES];
+-GtkAdjustment  *balance[SOUND_MIXER_NRDEVICES];
+-GtkWidget      *baltracks[SOUND_MIXER_NRDEVICES];
+-GtkWidget      *channellabel[SOUND_MIXER_NRDEVICES];
+-GtkToggleButton *rpbuttons[SOUND_MIXER_NRDEVICES];
+-GtkWidget      *levels[SOUND_MIXER_NRDEVICES];
+-GtkWidget      *maintable;
+-gint            balcallback[SOUND_MIXER_NRDEVICES];
+-gint            lvlcallback[SOUND_MIXER_NRDEVICES];
+-gint            rpcallback[SOUND_MIXER_NRDEVICES];
+-gboolean        menuvisible, balancevisible, recplayvisible, valuesvisible, visible[SOUND_MIXER_NRDEVICES];
+-GtkWidget      *labelrec, *labelzero, *labelcent, *labelleft, *labelright, *labelbalance;
++extern GdkBitmap      *rmask;
++extern GdkBitmap      *pmask;
++extern GtkWidget      *pixmapwid[SOUND_MIXER_NRDEVICES];
++extern GdkPixmap      *record_pixmap;
++extern GdkPixmap      *play_pixmap;
++extern GtkAdjustment  *adjustment[SOUND_MIXER_NRDEVICES];
++extern GtkAdjustment  *balance[SOUND_MIXER_NRDEVICES];
++extern GtkWidget      *baltracks[SOUND_MIXER_NRDEVICES];
++extern GtkWidget      *channellabel[SOUND_MIXER_NRDEVICES];
++extern GtkToggleButton *rpbuttons[SOUND_MIXER_NRDEVICES];
++extern GtkWidget      *levels[SOUND_MIXER_NRDEVICES];
++extern GtkWidget      *maintable;
++extern gint            balcallback[SOUND_MIXER_NRDEVICES];
++extern gint            lvlcallback[SOUND_MIXER_NRDEVICES];
++extern gint            rpcallback[SOUND_MIXER_NRDEVICES];
++extern gboolean        menuvisible, balancevisible, recplayvisible, valuesvisible, visible[SOUND_MIXER_NRDEVICES];
++extern GtkWidget      *labelrec, *labelzero, *labelcent, *labelleft, *labelright, *labelbalance;
+ void            WakeUpGTK(void);
+ void            HideShowBalancesGTK(void);
+ void            HideShowNumbersGTK(void);
+--- a/src/interactive.c
++++ b/src/interactive.c
+@@ -28,6 +28,9 @@
+ #include "gtk.h"
+ #endif				/* HAVE_GTK */
+ 
++int ourlevel[SOUND_MIXER_NRDEVICES];
++int our_recplay[SOUND_MIXER_NRDEVICES];
++
+ void            AumixSignalHandler(int signal_number)
+ {
+ /* Handle SIGALRM. */
+--- a/src/interactive.h
++++ b/src/interactive.h
+@@ -7,7 +7,7 @@
+ #define MUTE_ONLY 2
+ #define        REFRESH_PERIOD 1	/* number of seconds between updates */
+ 
+-unsigned char  *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo;
++extern unsigned char  *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo;
+ void            AumixSignalHandler(int signal_number);
+ void            InitScreen(void);
+ void            KeysBox(void);
diff --git a/main/autoconf-archive/APKBUILD b/main/autoconf-archive/APKBUILD
index 0ac18c6e488..ea1f02b4f7a 100644
--- a/main/autoconf-archive/APKBUILD
+++ b/main/autoconf-archive/APKBUILD
@@ -1,7 +1,7 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com>
 pkgname=autoconf-archive
-pkgver=2019.01.06
+pkgver=2023.02.20
 pkgrel=0
 pkgdesc="Collection of re-usable GNU Autoconf macros"
 url="https://www.gnu.org/software/autoconf-archive"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
 depends="autoconf"
 subpackages="$pkgname-doc"
 options="!check" # no tests
-source="https://ftpmirror.gnu.org/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-$pkgver.tar.xz"
 
 build() {
 	./configure \
@@ -27,4 +27,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="14bf8d0bf8be4a4dc078677de1977e496d4d9cf095bc897c174e331311b722cd3a34054e74c2146fff4b5c84269463e6a6fc61907d77d1c51bb221c8fb124fcb  autoconf-archive-2019.01.06.tar.xz"
+sha512sums="
+a744f5aa0c1a813b81ad1528aebf7511bde7f470f34626d2057ed6664127120182e031fec5d22027d4a204544266135f202b8ef453bff70a3b0315c506c82528  autoconf-archive-2023.02.20.tar.xz
+"
diff --git a/main/autoconf/APKBUILD b/main/autoconf/APKBUILD
index 26f54d96012..0d0bc977c41 100644
--- a/main/autoconf/APKBUILD
+++ b/main/autoconf/APKBUILD
@@ -1,27 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=autoconf
-pkgver=2.69
-pkgrel=2
-pkgdesc="A GNU tool for automatically configuring source code"
+pkgver=2.72
+pkgrel=0
+pkgdesc="GNU tool for automatically configuring source code"
 arch="noarch"
-license="GPL-2.0-or-later"
+license="GPL-3.0-or-later WITH Autoconf-exception-3.0"
 url="https://www.gnu.org/software/autoconf"
 depends="m4 perl"
 subpackages="$pkgname-doc"
 options="!check"
-source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
-	autoconf-2.69-fix-perl-regex.patch
-        autoconf-2.69-backport-runstatedir.patch
-	"
-
-builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	update_config_sub
-	default_prepare
-}
+source="https://ftp.gnu.org/gnu/autoconf/autoconf-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	M4=/usr/bin/m4 ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,18 +20,16 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	rm -f "$pkgdir"/usr/share/info/dir
-	# conflict with bintuils
+	# conflict with binutils
 	rm -f "$pkgdir"/usr/share/info/standards.info
 }
 
-sha512sums="e34c7818bcde14d2cb13cdd293ed17d70740d4d1fd7c67a07b415491ef85d42f450d4fe5f8f80cc330bf75c40a62774c51a4336e06e8da07a4cbc49922d975ee  autoconf-2.69.tar.gz
-8b779ecec178091c899b75df4471fb72334a062d6b413502d414e8827fe0c9e2f335a8bef6878ae261e1af1568e3fe71fe82d6b5e53cb54e6585ffd91f069d8d  autoconf-2.69-fix-perl-regex.patch
-e040bf855011145d8edf3bc4886e7a11b6dad9c3c8698f07de2bfd6059a23eb90210cad8d9bc4fbcdd54cbd084e46bd6f9a48592948c8d02e7b99471fe9470a5  autoconf-2.69-backport-runstatedir.patch"
+sha512sums="
+3f71d459e2127ef2c98b37f11f5284f0c92318ad8d31c5b6034bed370adfe9f3d0f7a12f87e2efced06c11e2a159de4d4a292b751104e83daf11342f25ba9721  autoconf-2.72.tar.gz
+"
diff --git a/main/autoconf/autoconf-2.69-backport-runstatedir.patch b/main/autoconf/autoconf-2.69-backport-runstatedir.patch
deleted file mode 100644
index e796743b182..00000000000
--- a/main/autoconf/autoconf-2.69-backport-runstatedir.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Source: http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=patch;h=a197431414088a417b407b9b20583b2e8f7363bd
-
-diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
-index 70b0168..1ce9922 100644
---- a/lib/autoconf/general.m4
-+++ b/lib/autoconf/general.m4
-@@ -586,6 +586,7 @@ AC_SUBST([datadir],        ['${datarootdir}'])dnl
- AC_SUBST([sysconfdir],     ['${prefix}/etc'])dnl
- AC_SUBST([sharedstatedir], ['${prefix}/com'])dnl
- AC_SUBST([localstatedir],  ['${prefix}/var'])dnl
-+AC_SUBST([runstatedir],    ['${localstatedir}/run'])dnl
- AC_SUBST([includedir],     ['${prefix}/include'])dnl
- AC_SUBST([oldincludedir],  ['/usr/include'])dnl
- AC_SUBST([docdir],         [m4_ifset([AC_PACKAGE_TARNAME],
-@@ -812,6 +813,15 @@ do
-   | -silent | --silent | --silen | --sile | --sil)
-     silent=yes ;;
- 
-+  -runstatedir | --runstatedir | --runstatedi | --runstated \
-+  | --runstate | --runstat | --runsta | --runst | --runs \
-+  | --run | --ru | --r)
-+    ac_prev=runstatedir ;;
-+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-+  | --run=* | --ru=* | --r=*)
-+    runstatedir=$ac_optarg ;;
-+
-   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-     ac_prev=sbindir ;;
-   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-@@ -921,7 +931,7 @@ fi
- for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
- 		datadir sysconfdir sharedstatedir localstatedir includedir \
- 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
--		libdir localedir mandir
-+		libdir localedir mandir runstatedir
- do
-   eval ac_val=\$$ac_var
-   # Remove trailing slashes.
-@@ -1058,6 +1068,7 @@ Fine tuning of the installation directories:
-   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-   --libdir=DIR            object code libraries [EPREFIX/lib]
-   --includedir=DIR        C header files [PREFIX/include]
-   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
--- 
-1.9.1
-
diff --git a/main/autoconf/autoconf-2.69-fix-perl-regex.patch b/main/autoconf/autoconf-2.69-fix-perl-regex.patch
deleted file mode 100644
index 9cccf912b00..00000000000
--- a/main/autoconf/autoconf-2.69-fix-perl-regex.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- autoconf-2.69/bin/autoscan.in.old	2012-04-25 02:37:26.000000000 +0000
-+++ autoconf-2.69/bin/autoscan.in	2017-08-03 23:59:38.720214631 +0000
-@@ -358,7 +358,7 @@
-     {
-       # Strip out comments and variable references.
-       s/#.*//;
--      s/\${[^\}]*}//g;
-+      s/\$\{[^\}]*\}//g;
-       s/@[^@]*@//g;
- 
-       # Tokens in the code.
diff --git a/main/autoconf2.13/APKBUILD b/main/autoconf2.13/APKBUILD
deleted file mode 100644
index e52f0beffdc..00000000000
--- a/main/autoconf2.13/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer:
-pkgname=autoconf2.13
-pkgver=2.13
-pkgrel=1
-pkgdesc="A GNU tool for automatically configuring source code"
-arch="noarch"
-license="GPL-2.0"
-url="https://www.gnu.org/software/autoconf"
-depends="m4 perl"
-checkdepends="dejagnu flex gfortran"
-source="https://ftp.gnu.org/pub/gnu/autoconf/autoconf-${pkgver}.tar.gz
-	getloadavg.patch
-	"
-subpackages="$pkgname-doc"
-
-builddir="$srcdir"/autoconf-$pkgver
-prepare() {
-	default_prepare
-	update_config_sub  # Required for AC_F77_LIBRARY_LDFLAGS
-}
-
-build() {
-	cd "$builddir"
-	M4=/usr/bin/m4 ./configure --prefix=/usr --program-suffix=-2.13
-	make
-}
-
-check() {
-	cd "$builddir"
-	F77=gfortran make check
-}
-
-package() {
-	cd "$builddir"
-	make prefix="$pkgdir/usr" infodir="$pkgdir/usr/share/info" install
-
-	rm -f "$pkgdir"/usr/share/info/dir
-	rm -f "$pkgdir"/usr/share/info/standards.info
-}
-
-sha512sums="602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad  autoconf-2.13.tar.gz
-483d0ba23c90e41c746868ea57436033930906f306b86de5e23284a60da069f4203d478615d653b8acee7226d9b02427be42a9764ff82710019de485e5f26d1b  getloadavg.patch"
diff --git a/main/autoconf2.13/getloadavg.patch b/main/autoconf2.13/getloadavg.patch
deleted file mode 100644
index 46f26d692f0..00000000000
--- a/main/autoconf2.13/getloadavg.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From debian/patches/other-debian.patch.
-
-autoconf (2.13-24) unstable; urgency=low
-  * Fix test for getloadavg (Bug#84170).
- -- Ben Pfaff <blp@gnu.org>  Wed, 31 Jan 2001 19:12:03 -0500
-
---- autoconf-2.13/acspecific.m4
-+++ autoconf-2.13/acspecific.m4
-@@ -1477,14 +1477,19 @@ AC_SUBST(ALLOCA)dnl
- AC_DEFUN(AC_FUNC_GETLOADAVG,
- [ac_have_func=no # yes means we've found a way to get the load average.
- 
--# Some systems with -lutil have (and need) -lkvm as well, some do not.
--# On Solaris, -lkvm requires nlist from -lelf, so check that first
--# to get the right answer into the cache.
--AC_CHECK_LIB(elf, elf_begin, LIBS="-lelf $LIBS")
--AC_CHECK_LIB(kvm, kvm_open, LIBS="-lkvm $LIBS")
--# Check for the 4.4BSD definition of getloadavg.
--AC_CHECK_LIB(util, getloadavg,
--  [LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes])
-+# Some systems have getloadavg without any extra libraries.
-+AC_CHECK_FUNC(getloadavg, [ac_have_func=yes])
-+
-+if test $ac_have_func = no; then
-+  # Some systems with -lutil have (and need) -lkvm as well, some do not.
-+  # On Solaris, -lkvm requires nlist from -lelf, so check that first
-+  # to get the right answer into the cache.
-+  AC_CHECK_LIB(elf, elf_begin, LIBS="-lelf $LIBS")
-+  AC_CHECK_LIB(kvm, kvm_open, LIBS="-lkvm $LIBS")
-+  # Check for the 4.4BSD definition of getloadavg.
-+  AC_CHECK_LIB(util, getloadavg,
-+    [LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes])
-+fi
- 
- if test $ac_have_func = no; then
-   # There is a commonly available library for RS/6000 AIX.
diff --git a/main/automake/APKBUILD b/main/automake/APKBUILD
index ef74ec563e7..e12a3bccd4a 100644
--- a/main/automake/APKBUILD
+++ b/main/automake/APKBUILD
@@ -1,15 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=automake
-pkgver=1.16.2
-pkgrel=0
-pkgdesc="A GNU tool for automatically creating Makefiles"
+pkgver=1.16.5
+pkgrel=2
+pkgdesc="GNU tool for automatically creating Makefiles"
 url="https://www.gnu.org/software/automake"
 arch="noarch"
-license="GPL-2.0-or-later MIT Public-Domain"
+license="GPL-2.0-or-later"
 depends="perl"
 makedepends="autoconf"
 subpackages="$pkgname-doc"
-source="https://ftp.gnu.org/gnu/automake/automake-$pkgver.tar.gz"
+source="https://ftp.gnu.org/gnu/automake/automake-$pkgver.tar.xz
+	$pkgname-python3.10.patch::https://github.com/autotools-mirror/automake/commit/930a9a73f4bb776ec334eff4cf6e182802841daa.patch
+	"
 
 # many tests have bashisms
 options="!check"
@@ -30,4 +32,7 @@ package() {
 	make DESTDIR=$pkgdir install
 }
 
-sha512sums="8bd5b1d698eeb1d969ca0a32184ad46014b3ec334e3b8a0caf0e462ea5e100fe4ccaa7dcc2224c5db6c87e215d594593db0bf4431649186afb821b0a711c1a82  automake-1.16.2.tar.gz"
+sha512sums="
+3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88  automake-1.16.5.tar.xz
+cd22baa12751be72b35a926127c85d793d1ccf69c48d4d0911b2cbd2b9f1249d6eecae4f90be60847a7880861abf59cc10b8846367885e1c6aadc4dd2d0219a0  automake-python3.10.patch
+"
diff --git a/main/avahi-ui/APKBUILD b/main/avahi-ui/APKBUILD
index 7f6794b0f2f..365ff88fcc2 100644
--- a/main/avahi-ui/APKBUILD
+++ b/main/avahi-ui/APKBUILD
@@ -1,22 +1,22 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=avahi-ui
-pkgver=0.7
-pkgrel=2
+pkgver=0.8
+pkgrel=8
 pkgdesc="Gtk user interface library for Avahi"
-url="http://www.avahi.org/"
+url="https://www.avahi.org/"
 arch="all"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 depends_dev="gdbm-dev"
-makedepends="$depends_dev py3-gobject3-dev py3-dbus-dev intltool
+makedepends="$depends_dev py3-gobject3-dev py3-dbus-dev libevent-dev
 	gobject-introspection-dev expat-dev libdaemon-dev glib-dev dbus-dev
 	libcap-dev python3-dev autoconf automake libtool avahi-dev gtk+3.0-dev"
 subpackages="$pkgname-dev $pkgname-tools $pkgname-gtk3"
-source="http://www.avahi.org/download/avahi-$pkgver.tar.gz
+source="https://www.avahi.org/download/avahi-$pkgver.tar.gz
 	system-avahi.patch
 	gnome-nettool.png"
-
 _subdirs="avahi-ui avahi-python"
 builddir="$srcdir"/avahi-$pkgver
+
 prepare() {
 	default_prepare
 	autoreconf -vif
@@ -24,6 +24,7 @@ prepare() {
 
 build() {
 	# we dont build autoipd since dhcpcd does same job
+	LDFLAGS="$LDFLAGS -lintl" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,6 +34,7 @@ build() {
 		--disable-autoipd \
 		--disable-qt3 \
 		--disable-qt4 \
+		--disable-qt5 \
 		--disable-gtk \
 		--enable-gtk3 \
 		--disable-mono \
@@ -51,6 +53,10 @@ build() {
 	done
 }
 
+check() {
+	make check
+}
+
 package() {
 	make install-pkgconfigDATA DESTDIR="$pkgdir" \
 		pkgconfig_DATA="avahi-ui-gtk3.pc"
@@ -80,6 +86,8 @@ gtk3() {
 		"$subpkgdir"/usr/lib/
 }
 
-sha512sums="bae5a1e9204aca90b90e7fd223d19e809e3514d03ba5fa2da1e55bf1d72d3d3b98567f357900c36393613dc17dc98e15ff3ebf0f226f2f6b9766e592452a6ce7  avahi-0.7.tar.gz
+sha512sums="
+c6ba76feb6e92f70289f94b3bf12e5f5c66c11628ce0aeb3cadfb72c13a5d1a9bd56d71bdf3072627a76cd103b9b056d9131aa49ffe11fa334c24ab3b596c7de  avahi-0.8.tar.gz
 99723e66889601044ac5ca919e79aa328083cb377bb3d270f3e8d2baee27505f967949f72faa0424756e5f18b1359fd7f7fb30636861d47455ff7b92ed48bcfa  system-avahi.patch
-d8e92fcdd82759f8de536ebfa356fe208c27b2d998ce5bb51d585dffc163dc16228be4a7108644fe1a11defbe750244bc8105a430b1397297cdef4cb83ab0db5  gnome-nettool.png"
+261183cd4659b2c2fd4df53c109f310f62c726bbd590d158a270a0fe461167c6409460f811c5188435004a4da79b843505921465018a2e57c40c4bac84b3c096  gnome-nettool.png
+"
diff --git a/main/avahi-ui/gnome-nettool.png b/main/avahi-ui/gnome-nettool.png
index 227d0678a3a..1603bdafeef 100644
--- a/main/avahi-ui/gnome-nettool.png
+++ b/main/avahi-ui/gnome-nettool.png
diff --git a/main/avahi/APKBUILD b/main/avahi/APKBUILD
index 2651e43e267..513042c6f34 100644
--- a/main/avahi/APKBUILD
+++ b/main/avahi/APKBUILD
@@ -1,31 +1,80 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=avahi
 pkgver=0.8
-pkgrel=0
-pkgdesc="A multicast/unicast DNS-SD framework"
+pkgrel=17
+pkgdesc="multicast/unicast DNS-SD framework"
 url="https://www.avahi.org/"
 arch="all"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 pkgusers="avahi"
 pkggroups="avahi"
+depends_openrc="dbus"
 depends_dev="gdbm-dev"
-makedepends="$depends_dev
-	intltool gobject-introspection-dev expat-dev
-	libdaemon-dev glib-dev dbus-dev libcap-dev
-	gettext-dev autoconf automake libtool
-	libevent-dev"
+makedepends="
+	$depends_dev
+	autoconf
+	automake
+	dbus-dev
+	expat-dev
+	gettext-dev
+	glib-dev
+	gobject-introspection-dev
+	libcap-dev
+	libdaemon-dev
+	libevent-dev
+	libtool
+	py3-dbus
+	py3-gobject3-dev
+	py3-setuptools
+	python3-dev
+	python3-gdbm
+	xz
+	"
 install="$pkgname.pre-install"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-glib
-	$pkgname-libs $pkgname-compat-howl:howl
-	$pkgname-compat-libdns_sd:lidns_sd $pkgname-lang
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-tools
+	$pkgname-glib
+	$pkgname-libs
+	py3-avahi:py3
+	$pkgname-compat-howl:howl
+	$pkgname-compat-libdns_sd:lidns_sd
+	$pkgname-lang
+	$pkgname-openrc
 	"
 source="https://github.com/lathiat/avahi/releases/download/v$pkgver/avahi-$pkgver.tar.gz
+	CVE-2021-3468.patch
+	CVE-2021-3502.patch
+	CVE-2023-1981.patch
+	CVE-2023-38469.patch
+	CVE-2023-38470.patch
+	CVE-2023-38471.patch
+	CVE-2023-38472.patch
+	CVE-2023-38473.patch
+	Fetch-build-db-from-upstream-git.patch
+	build-db-Use-the-same-database-format-that-the-C-code-exp.patch
 	"
 
 # secfixes:
+#   0.8-r16:
+#     - CVE-2023-38470
+#   0.8-r15:
+#     - CVE-2023-38469
+#     - CVE-2023-38471
+#   0.8-r14:
+#     - CVE-2023-1981
+#     - CVE-2023-38472
+#     - CVE-2023-38473
+#   0.8-r5:
+#     - CVE-2021-3502
+#   0.8-r4:
+#     - CVE-2021-3468
 #   0.7-r2:
 #     - CVE-2017-6519
 #     - CVE-2018-1000845
+#   0:
+#     - CVE-2021-26720
 
 prepare() {
 	default_prepare
@@ -53,7 +102,8 @@ build() {
 		--disable-xmltoman \
 		--enable-compat-libdns_sd \
 		--enable-compat-howl \
-		--disable-python \
+		--enable-python \
+		--with-dbus-sys=/usr/share/dbus-1/system.d \
 		--with-distro="gentoo"
 	make
 }
@@ -70,50 +120,70 @@ package() {
 	ln -s avahi-compat-howl.pc "$pkgdir"/usr/lib/pkgconfig/howl.pc
 	ln -s avahi-compat-libdns_sd.pc "$pkgdir"/usr/lib/pkgconfig/libdns_sd.pc
 	ln -s avahi-compat-libdns_sd/dns_sd.h "$pkgdir"/usr/include/
+
+	# XXX these are added since the python support, but are broken
+	rm -v "$pkgdir"/usr/bin/avahi-bookmarks
+	rm -v "$pkgdir"/usr/bin/avahi-discover
+	rm -v "$pkgdir"/usr/share/applications/avahi-discover.desktop
+	rmdir -p "$pkgdir"/usr/share/applications/ || true
+
+	# can't install tmpfs
+	rm -r "$pkgdir"/var/run
 }
 
 tools() {
 	pkgdesc="Command line tools for mDNS browsing and publishing"
 
-	mkdir -p "$subpkgdir"/usr/bin
-	cd "$pkgdir"/usr/bin
-	mv avahi-browse* avahi-publish* avahi-resolve* avahi-set* \
-		"$subpkgdir"/usr/bin/
+	amove \
+		usr/bin/avahi-browse* \
+		usr/bin/avahi-publish* \
+		usr/bin/avahi-resolve* \
+		usr/bin/avahi-set*
 }
 
 glib() {
 	pkgdesc="Glib libraries and GObject wrapper for avahi"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libavahi-glib.so.* \
-		"$pkgdir"/usr/lib/libavahi-gobject.so.* \
-		"$subpkgdir"/usr/lib/
+	amove usr/lib/libavahi-glib.so.* \
+		usr/lib/libavahi-gobject.so.*
 }
 
 libs() {
 	pkgdesc="Libraries for avahi run-time use"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libavahi-common.so.* \
-		"$pkgdir"/usr/lib/libavahi-client.so.* \
-		"$subpkgdir"/usr/lib/
+	amove usr/lib/libavahi-common.so.* \
+		usr/lib/libavahi-client.so.*
 }
 
-
 howl() {
 	pkgdesc="Libraries for howl compatibility"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libhowl.so.* \
-		"$subpkgdir"/usr/lib/
+	amove usr/lib/libhowl.so.*
 }
 
 lidns_sd() {
 	pkgdesc="Libraries for Apple Bonjour mDNSResponder compatibility"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libdns_sd.so.* \
-		"$subpkgdir"/usr/lib/
+	amove usr/lib/libdns_sd.so.*
+}
+
+py3() {
+	pkgdesc="Python Avahi module"
+	depends="py3-dbus python3"
+
+	amove usr/lib/python*
 }
 
-sha512sums="c6ba76feb6e92f70289f94b3bf12e5f5c66c11628ce0aeb3cadfb72c13a5d1a9bd56d71bdf3072627a76cd103b9b056d9131aa49ffe11fa334c24ab3b596c7de  avahi-0.8.tar.gz"
+sha512sums="
+c6ba76feb6e92f70289f94b3bf12e5f5c66c11628ce0aeb3cadfb72c13a5d1a9bd56d71bdf3072627a76cd103b9b056d9131aa49ffe11fa334c24ab3b596c7de  avahi-0.8.tar.gz
+743430a532b8ec246672cd0997b7831efc15c461cbfe0461faac5d6525293297efb7c06f759b2bcd71d1842ba165464fd334508534e6c247211d613061c49da5  CVE-2021-3468.patch
+9e4688ffd8e512c0f614fd24fff2a2a1c66e009069229a6f81dcd382edfff5a8635e0551533c7f9271973a87e62e199fdb34a5560dab27c0a328f531c94f757d  CVE-2021-3502.patch
+6be9c7bdeb98828c55069b4570dd6ac87354ed59df6445683ed78a26e40fad194dbb745a5df32b0fc7abb9a393e655334a31833db996ccb39e71d8a801adea6a  CVE-2023-1981.patch
+7ebaa7220c72c8bc16d34fad54dc4dd173541e5e97f066b53b8c6e9af01a5e910eab1db998d34708af86a92329c65aa3a398f16279a7204117afd84362a3100c  CVE-2023-38469.patch
+ea593c570ea7ce133ef4e47a5557b4b1dccdd45bba87bd1e948409c7abdb394eeea2d2cda2bf2f5b720b2c3cf41aee2b6bb189b55b842077024aaf7947e1a3c6  CVE-2023-38470.patch
+b69d63a0490447e3aa2c9f0179d9b76d49fb5d9cce6b02459c1ef561379217c9157790938def9775527c1109e21e99970434eb56ca61337b2c3df1c5a79ab5a1  CVE-2023-38471.patch
+98e141a8f17303a235b926dda452f4b9671e11395ea70e4a7e2ea8c446fb52a84796de273fcc08c556c8b3895cf703b58e5ccc7dc15b3da4c28aa0f9ebaaa2b0  CVE-2023-38472.patch
+66f40c5ed8e771530c381c7c32ba47562b372b48a41af5aa3b972e350b77afac521934e2fc0d2122b1456f331920dd74bd9846d5efca39b9e3db7e47711e3695  CVE-2023-38473.patch
+302db5f4c8339b7f074aa4b2f2e8108e33e128db26f10a201a63bd09f9c2bde600929e586e00d7f7c448019eefbc3e97eb8b419079253f5f4fb60e477a577fa1  Fetch-build-db-from-upstream-git.patch
+e4e923dbaa0c729a8685b71f1487f337fd7c68b464b04643127a2f7a3a34b24f87869c9c185632229b25f350425ea979ddb329eda043548d55ae86f5c905dd11  build-db-Use-the-same-database-format-that-the-C-code-exp.patch
+"
diff --git a/main/avahi/CVE-2021-3468.patch b/main/avahi/CVE-2021-3468.patch
new file mode 100644
index 00000000000..3e0725a6024
--- /dev/null
+++ b/main/avahi/CVE-2021-3468.patch
@@ -0,0 +1,37 @@
+From 447affe29991ee99c6b9732fc5f2c1048a611d3b Mon Sep 17 00:00:00 2001
+From: Riccardo Schirone <sirmy15@gmail.com>
+Date: Fri, 26 Mar 2021 11:50:24 +0100
+Subject: [PATCH] Avoid infinite-loop in avahi-daemon by handling HUP event in
+ client_work
+
+If a client fills the input buffer, client_work() disables the
+AVAHI_WATCH_IN event, thus preventing the function from executing the
+`read` syscall the next times it is called. However, if the client then
+terminates the connection, the socket file descriptor receives a HUP
+event, which is not handled, thus the kernel keeps marking the HUP event
+as occurring. While iterating over the file descriptors that triggered
+an event, the client file descriptor will keep having the HUP event and
+the client_work() function is always called with AVAHI_WATCH_HUP but
+without nothing being done, thus entering an infinite loop.
+
+See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=984938
+---
+ avahi-daemon/simple-protocol.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/avahi-daemon/simple-protocol.c b/avahi-daemon/simple-protocol.c
+index 3e0ebb11..6c0274d6 100644
+--- a/avahi-daemon/simple-protocol.c
++++ b/avahi-daemon/simple-protocol.c
+@@ -424,6 +424,11 @@ static void client_work(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AvahiWatchEv
+         }
+     }
+ 
++    if (events & AVAHI_WATCH_HUP) {
++        client_free(c);
++        return;
++    }
++
+     c->server->poll_api->watch_update(
+         watch,
+         (c->outbuf_length > 0 ? AVAHI_WATCH_OUT : 0) |
diff --git a/main/avahi/CVE-2021-3502.patch b/main/avahi/CVE-2021-3502.patch
new file mode 100644
index 00000000000..7b0449a2e4e
--- /dev/null
+++ b/main/avahi/CVE-2021-3502.patch
@@ -0,0 +1,148 @@
+From 9d31939e55280a733d930b15ac9e4dda4497680c Mon Sep 17 00:00:00 2001
+From: Tommi Rantala <tommi.t.rantala@nokia.com>
+Date: Mon, 8 Feb 2021 11:04:43 +0200
+Subject: [PATCH] Fix NULL pointer crashes from #175
+
+avahi-daemon is crashing when running "ping .local".
+The crash is due to failing assertion from NULL pointer.
+Add missing NULL pointer checks to fix it.
+
+Introduced in #175 - merge commit 8f75a045709a780c8cf92a6a21e9d35b593bdecd
+---
+ avahi-core/browse-dns-server.c   | 5 ++++-
+ avahi-core/browse-domain.c       | 5 ++++-
+ avahi-core/browse-service-type.c | 3 +++
+ avahi-core/browse-service.c      | 3 +++
+ avahi-core/browse.c              | 3 +++
+ avahi-core/resolve-address.c     | 5 ++++-
+ avahi-core/resolve-host-name.c   | 5 ++++-
+ avahi-core/resolve-service.c     | 5 ++++-
+ 8 files changed, 29 insertions(+), 5 deletions(-)
+
+diff --git a/avahi-core/browse-dns-server.c b/avahi-core/browse-dns-server.c
+index 049752e9..c2d914fa 100644
+--- a/avahi-core/browse-dns-server.c
++++ b/avahi-core/browse-dns-server.c
+@@ -343,7 +343,10 @@ AvahiSDNSServerBrowser *avahi_s_dns_server_browser_new(
+         AvahiSDNSServerBrowser* b;
+ 
+         b = avahi_s_dns_server_browser_prepare(server, interface, protocol, domain, type, aprotocol, flags, callback, userdata);
++        if (!b)
++            return NULL;
++
+         avahi_s_dns_server_browser_start(b);
+ 
+         return b;
+-}
+\ No newline at end of file
++}
+diff --git a/avahi-core/browse-domain.c b/avahi-core/browse-domain.c
+index f145d56a..06fa70c0 100644
+--- a/avahi-core/browse-domain.c
++++ b/avahi-core/browse-domain.c
+@@ -253,7 +253,10 @@ AvahiSDomainBrowser *avahi_s_domain_browser_new(
+         AvahiSDomainBrowser *b;
+ 
+         b = avahi_s_domain_browser_prepare(server, interface, protocol, domain, type, flags, callback, userdata);
++        if (!b)
++            return NULL;
++
+         avahi_s_domain_browser_start(b);
+ 
+         return b;
+-}
+\ No newline at end of file
++}
+diff --git a/avahi-core/browse-service-type.c b/avahi-core/browse-service-type.c
+index fdd22dcd..b1fc7af8 100644
+--- a/avahi-core/browse-service-type.c
++++ b/avahi-core/browse-service-type.c
+@@ -171,6 +171,9 @@ AvahiSServiceTypeBrowser *avahi_s_service_type_browser_new(
+         AvahiSServiceTypeBrowser *b;
+ 
+         b = avahi_s_service_type_browser_prepare(server, interface, protocol, domain, flags, callback, userdata);
++        if (!b)
++            return NULL;
++
+         avahi_s_service_type_browser_start(b);
+ 
+         return b;
+diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c
+index 5531360c..63e0275a 100644
+--- a/avahi-core/browse-service.c
++++ b/avahi-core/browse-service.c
+@@ -184,6 +184,9 @@ AvahiSServiceBrowser *avahi_s_service_browser_new(
+         AvahiSServiceBrowser *b;
+ 
+         b = avahi_s_service_browser_prepare(server, interface, protocol, service_type, domain, flags, callback, userdata);
++        if (!b)
++            return NULL;
++
+         avahi_s_service_browser_start(b);
+ 
+         return b;
+diff --git a/avahi-core/browse.c b/avahi-core/browse.c
+index 2941e579..e8a915e9 100644
+--- a/avahi-core/browse.c
++++ b/avahi-core/browse.c
+@@ -634,6 +634,9 @@ AvahiSRecordBrowser *avahi_s_record_browser_new(
+         AvahiSRecordBrowser *b;
+ 
+         b = avahi_s_record_browser_prepare(server, interface, protocol, key, flags, callback, userdata);
++        if (!b)
++            return NULL;
++
+         avahi_s_record_browser_start_query(b);
+ 
+         return b;
+diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c
+index ac0b29b1..e61dd242 100644
+--- a/avahi-core/resolve-address.c
++++ b/avahi-core/resolve-address.c
+@@ -286,7 +286,10 @@ AvahiSAddressResolver *avahi_s_address_resolver_new(
+         AvahiSAddressResolver *b;
+ 
+         b = avahi_s_address_resolver_prepare(server, interface, protocol, address, flags, callback, userdata);
++        if (!b)
++            return NULL;
++
+         avahi_s_address_resolver_start(b);
+ 
+         return b;
+-}
+\ No newline at end of file
++}
+diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c
+index 808b0e72..4e8e5973 100644
+--- a/avahi-core/resolve-host-name.c
++++ b/avahi-core/resolve-host-name.c
+@@ -318,7 +318,10 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new(
+         AvahiSHostNameResolver *b;
+ 
+         b = avahi_s_host_name_resolver_prepare(server, interface, protocol, host_name, aprotocol, flags, callback, userdata);
++        if (!b)
++            return NULL;
++
+         avahi_s_host_name_resolver_start(b);
+ 
+         return b;
+-}
+\ No newline at end of file
++}
+diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c
+index 66bf3cae..43771763 100644
+--- a/avahi-core/resolve-service.c
++++ b/avahi-core/resolve-service.c
+@@ -519,7 +519,10 @@ AvahiSServiceResolver *avahi_s_service_resolver_new(
+         AvahiSServiceResolver *b;
+ 
+         b = avahi_s_service_resolver_prepare(server, interface, protocol, name, type, domain, aprotocol, flags, callback, userdata);
++        if (!b)
++            return NULL;
++
+         avahi_s_service_resolver_start(b);
+ 
+         return b;
+-}
+\ No newline at end of file
++}
diff --git a/main/avahi/CVE-2023-1981.patch b/main/avahi/CVE-2023-1981.patch
new file mode 100644
index 00000000000..64acceaf5f4
--- /dev/null
+++ b/main/avahi/CVE-2023-1981.patch
@@ -0,0 +1,56 @@
+From a2696da2f2c50ac43b6c4903f72290d5c3fa9f6f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
+Date: Thu, 17 Nov 2022 01:51:53 +0100
+Subject: [PATCH] Emit error if requested service is not found
+
+It currently just crashes instead of replying with error. Check return
+value and emit error instead of passing NULL pointer to reply.
+
+Fixes #375
+---
+ avahi-daemon/dbus-protocol.c | 20 ++++++++++++++------
+ 1 file changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
+index 70d7687..406d0b4 100644
+--- a/avahi-daemon/dbus-protocol.c
++++ b/avahi-daemon/dbus-protocol.c
+@@ -375,10 +375,14 @@ static DBusHandlerResult dbus_get_alternative_host_name(DBusConnection *c, DBusM
+     }
+ 
+     t = avahi_alternative_host_name(n);
+-    avahi_dbus_respond_string(c, m, t);
+-    avahi_free(t);
++    if (t) {
++        avahi_dbus_respond_string(c, m, t);
++        avahi_free(t);
+ 
+-    return DBUS_HANDLER_RESULT_HANDLED;
++        return DBUS_HANDLER_RESULT_HANDLED;
++    } else {
++        return avahi_dbus_respond_error(c, m, AVAHI_ERR_NOT_FOUND, "Hostname not found");
++    }
+ }
+ 
+ static DBusHandlerResult dbus_get_alternative_service_name(DBusConnection *c, DBusMessage *m, DBusError *error) {
+@@ -389,10 +393,14 @@ static DBusHandlerResult dbus_get_alternative_service_name(DBusConnection *c, DB
+     }
+ 
+     t = avahi_alternative_service_name(n);
+-    avahi_dbus_respond_string(c, m, t);
+-    avahi_free(t);
++    if (t) {
++        avahi_dbus_respond_string(c, m, t);
++        avahi_free(t);
+ 
+-    return DBUS_HANDLER_RESULT_HANDLED;
++        return DBUS_HANDLER_RESULT_HANDLED;
++    } else {
++        return avahi_dbus_respond_error(c, m, AVAHI_ERR_NOT_FOUND, "Service not found");
++    }
+ }
+ 
+ static DBusHandlerResult dbus_create_new_entry_group(DBusConnection *c, DBusMessage *m, DBusError *error) {
+-- 
+2.42.0
+
diff --git a/main/avahi/CVE-2023-38469.patch b/main/avahi/CVE-2023-38469.patch
new file mode 100644
index 00000000000..aba8b491f9b
--- /dev/null
+++ b/main/avahi/CVE-2023-38469.patch
@@ -0,0 +1,44 @@
+From a337a1ba7d15853fb56deef1f464529af6e3a1cf Mon Sep 17 00:00:00 2001
+From: Evgeny Vereshchagin <evvers@ya.ru>
+Date: Mon, 23 Oct 2023 20:29:31 +0000
+Subject: [PATCH 1/2] core: reject overly long TXT resource records
+
+Closes https://github.com/lathiat/avahi/issues/455
+
+CVE-2023-38469
+---
+ avahi-core/rr.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/avahi-core/rr.c b/avahi-core/rr.c
+index 2bb892445..9c04ebbdb 100644
+--- a/avahi-core/rr.c
++++ b/avahi-core/rr.c
+@@ -32,6 +32,7 @@
+ #include <avahi-common/malloc.h>
+ #include <avahi-common/defs.h>
+ 
++#include "dns.h"
+ #include "rr.h"
+ #include "log.h"
+ #include "util.h"
+@@ -689,11 +690,17 @@ int avahi_record_is_valid(AvahiRecord *r) {
+         case AVAHI_DNS_TYPE_TXT: {
+ 
+             AvahiStringList *strlst;
++            size_t used = 0;
+ 
+-            for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next)
++            for (strlst = r->data.txt.string_list; strlst; strlst = strlst->next) {
+                 if (strlst->size > 255 || strlst->size <= 0)
+                     return 0;
+ 
++                used += 1+strlst->size;
++                if (used > AVAHI_DNS_RDATA_MAX)
++                    return 0;
++            }
++
+             return 1;
+         }
+     }
+
diff --git a/main/avahi/CVE-2023-38470.patch b/main/avahi/CVE-2023-38470.patch
new file mode 100644
index 00000000000..577cb1c1944
--- /dev/null
+++ b/main/avahi/CVE-2023-38470.patch
@@ -0,0 +1,55 @@
+From 94cb6489114636940ac683515417990b55b5d66c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
+Date: Tue, 11 Apr 2023 15:29:59 +0200
+Subject: [PATCH] Ensure each label is at least one byte long
+
+The only allowed exception is single dot, where it should return empty
+string.
+
+Fixes #454.
+---
+ avahi-common/domain-test.c | 14 ++++++++++++++
+ avahi-common/domain.c      |  2 +-
+ 2 files changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/avahi-common/domain-test.c b/avahi-common/domain-test.c
+index cf763ec..3acc1c1 100644
+--- a/avahi-common/domain-test.c
++++ b/avahi-common/domain-test.c
+@@ -45,6 +45,20 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
+     printf("%s\n", s = avahi_normalize_name_strdup("fo\\\\o\\..f oo."));
+     avahi_free(s);
+ 
++    printf("%s\n", s = avahi_normalize_name_strdup("."));
++    avahi_free(s);
++
++    s = avahi_normalize_name_strdup(",.=.}.=.?-.}.=.?.?.}.}.?.?.?.z.?.?.}.}."
++		    "}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.}.}.}"
++		    ".?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.=.=.?.?.}.}.?.?.?.zM.?`"
++		    "?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}??.}.}.?.?."
++		    "?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM.?`?.}.}.}."
++		    "??.?.zM.?`?.}.}.}.?.?.?.r.=.?.}.=.?.?.}.?.?.?.}.=.?.?.}?"
++		    "?.}.}.?.?.?.z.?.?.}.}.}.?.?.?.r.=.=.}.=.?.}}.}.?.?.?.zM."
++		    "?`?.}.}.}.?.?.?.r.=.=.?.?`.?.?}.}.}.?.?.?.r.=.?.}.=.?.?."
++		    "}.?.?.?.}.=.?.?.}");
++    assert(s == NULL);
++
+     printf("%i\n", avahi_domain_equal("\\065aa bbb\\.\\046cc.cc\\\\.dee.fff.", "Aaa BBB\\.\\.cc.cc\\\\.dee.fff"));
+     printf("%i\n", avahi_domain_equal("A", "a"));
+ 
+diff --git a/avahi-common/domain.c b/avahi-common/domain.c
+index 3b1ab68..e66d241 100644
+--- a/avahi-common/domain.c
++++ b/avahi-common/domain.c
+@@ -201,7 +201,7 @@ char *avahi_normalize_name(const char *s, char *ret_s, size_t size) {
+         }
+ 
+         if (!empty) {
+-            if (size < 1)
++            if (size < 2)
+                 return NULL;
+ 
+             *(r++) = '.';
+-- 
+2.44.0
+
diff --git a/main/avahi/CVE-2023-38471.patch b/main/avahi/CVE-2023-38471.patch
new file mode 100644
index 00000000000..b7de51b4d91
--- /dev/null
+++ b/main/avahi/CVE-2023-38471.patch
@@ -0,0 +1,116 @@
+From d486bca7e7912c6a4b547a3c607db0d0d3124bbf Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Mon, 23 Oct 2023 13:38:35 +0200
+Subject: [PATCH] core: extract host name using avahi_unescape_label()
+
+Previously we could create invalid escape sequence when we split the
+string on dot. For example, from valid host name "foo\\.bar" we have
+created invalid name "foo\\" and tried to set that as the host name
+which crashed the daemon.
+
+Fixes #453
+
+CVE-2023-38471
+---
+ avahi-core/server.c | 27 +++++++++++++++++++++------
+ 1 file changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/avahi-core/server.c b/avahi-core/server.c
+index c32637af8..f6a21bb77 100644
+--- a/avahi-core/server.c
++++ b/avahi-core/server.c
+@@ -1295,7 +1295,11 @@ static void update_fqdn(AvahiServer *s) {
+ }
+ 
+ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) {
+-    char *hn = NULL;
++    char label_escaped[AVAHI_LABEL_MAX*4+1];
++    char label[AVAHI_LABEL_MAX];
++    char *hn = NULL, *h;
++    size_t len;
++
+     assert(s);
+ 
+     AVAHI_CHECK_VALIDITY(s, !host_name || avahi_is_valid_host_name(host_name), AVAHI_ERR_INVALID_HOST_NAME);
+@@ -1305,17 +1309,28 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) {
+     else
+         hn = avahi_normalize_name_strdup(host_name);
+ 
+-    hn[strcspn(hn, ".")] = 0;
++    h = hn;
++    if (!avahi_unescape_label((const char **)&hn, label, sizeof(label))) {
++        avahi_free(h);
++        return AVAHI_ERR_INVALID_HOST_NAME;
++    }
++
++    avahi_free(h);
++
++    h = label_escaped;
++    len = sizeof(label_escaped);
++    if (!avahi_escape_label(label, strlen(label), &h, &len))
++        return AVAHI_ERR_INVALID_HOST_NAME;
+ 
+-    if (avahi_domain_equal(s->host_name, hn) && s->state != AVAHI_SERVER_COLLISION) {
+-        avahi_free(hn);
++    if (avahi_domain_equal(s->host_name, label_escaped) && s->state != AVAHI_SERVER_COLLISION)
+         return avahi_server_set_errno(s, AVAHI_ERR_NO_CHANGE);
+-    }
+ 
+     withdraw_host_rrs(s);
+ 
+     avahi_free(s->host_name);
+-    s->host_name = hn;
++    s->host_name = avahi_strdup(label_escaped);
++    if (!s->host_name)
++        return AVAHI_ERR_NO_MEMORY;
+ 
+     update_fqdn(s);
+ 
+From b675f70739f404342f7f78635d6e2dcd85a13460 Mon Sep 17 00:00:00 2001
+From: Evgeny Vereshchagin <evvers@ya.ru>
+Date: Tue, 24 Oct 2023 22:04:51 +0000
+Subject: [PATCH 2/2] core: return errors from avahi_server_set_host_name
+ properly
+
+It's a follow-up to 894f085f402e023a98cbb6f5a3d117bd88d93b09
+---
+ avahi-core/server.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/avahi-core/server.c b/avahi-core/server.c
+index f6a21bb77..84df6b5de 100644
+--- a/avahi-core/server.c
++++ b/avahi-core/server.c
+@@ -1309,10 +1309,13 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) {
+     else
+         hn = avahi_normalize_name_strdup(host_name);
+ 
++    if (!hn)
++        return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY);
++
+     h = hn;
+     if (!avahi_unescape_label((const char **)&hn, label, sizeof(label))) {
+         avahi_free(h);
+-        return AVAHI_ERR_INVALID_HOST_NAME;
++        return avahi_server_set_errno(s, AVAHI_ERR_INVALID_HOST_NAME);
+     }
+ 
+     avahi_free(h);
+@@ -1320,7 +1323,7 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) {
+     h = label_escaped;
+     len = sizeof(label_escaped);
+     if (!avahi_escape_label(label, strlen(label), &h, &len))
+-        return AVAHI_ERR_INVALID_HOST_NAME;
++        return avahi_server_set_errno(s, AVAHI_ERR_INVALID_HOST_NAME);
+ 
+     if (avahi_domain_equal(s->host_name, label_escaped) && s->state != AVAHI_SERVER_COLLISION)
+         return avahi_server_set_errno(s, AVAHI_ERR_NO_CHANGE);
+@@ -1330,7 +1333,7 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) {
+     avahi_free(s->host_name);
+     s->host_name = avahi_strdup(label_escaped);
+     if (!s->host_name)
+-        return AVAHI_ERR_NO_MEMORY;
++        return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY);
+ 
+     update_fqdn(s);
+ 
diff --git a/main/avahi/CVE-2023-38472.patch b/main/avahi/CVE-2023-38472.patch
new file mode 100644
index 00000000000..775663c68c3
--- /dev/null
+++ b/main/avahi/CVE-2023-38472.patch
@@ -0,0 +1,43 @@
+From b024ae5749f4aeba03478e6391687c3c9c8dee40 Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Thu, 19 Oct 2023 17:36:44 +0200
+Subject: [PATCH] core: make sure there is rdata to process before parsing it
+
+Fixes #452
+
+CVE-2023-38472
+---
+ avahi-client/client-test.c      | 3 +++
+ avahi-daemon/dbus-entry-group.c | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/avahi-client/client-test.c b/avahi-client/client-test.c
+index b3366d8..ba97998 100644
+--- a/avahi-client/client-test.c
++++ b/avahi-client/client-test.c
+@@ -258,6 +258,9 @@ int main (AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
+     printf("%s\n", avahi_strerror(avahi_entry_group_add_service (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "Lathiat's Site", "_http._tcp", NULL, NULL, 80, "foo=bar", NULL)));
+     printf("add_record: %d\n", avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "\5booya", 6));
+ 
++    error = avahi_entry_group_add_record (group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, "TestX", 0x01, 0x10, 120, "", 0);
++    assert(error != AVAHI_OK);
++
+     avahi_entry_group_commit (group);
+ 
+     domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, 0, avahi_domain_browser_callback, (char*) "omghai3u");
+diff --git a/avahi-daemon/dbus-entry-group.c b/avahi-daemon/dbus-entry-group.c
+index 4e879a5..aa23d4b 100644
+--- a/avahi-daemon/dbus-entry-group.c
++++ b/avahi-daemon/dbus-entry-group.c
+@@ -340,7 +340,7 @@ DBusHandlerResult avahi_dbus_msg_entry_group_impl(DBusConnection *c, DBusMessage
+         if (!(r = avahi_record_new_full (name, clazz, type, ttl)))
+             return avahi_dbus_respond_error(c, m, AVAHI_ERR_NO_MEMORY, NULL);
+ 
+-        if (avahi_rdata_parse (r, rdata, size) < 0) {
++        if (!rdata || avahi_rdata_parse (r, rdata, size) < 0) {
+             avahi_record_unref (r);
+             return avahi_dbus_respond_error(c, m, AVAHI_ERR_INVALID_RDATA, NULL);
+         }
+-- 
+2.42.0
+
diff --git a/main/avahi/CVE-2023-38473.patch b/main/avahi/CVE-2023-38473.patch
new file mode 100644
index 00000000000..812da0b9450
--- /dev/null
+++ b/main/avahi/CVE-2023-38473.patch
@@ -0,0 +1,107 @@
+From b448c9f771bada14ae8de175695a9729f8646797 Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Wed, 11 Oct 2023 17:45:44 +0200
+Subject: [PATCH] common: derive alternative host name from its unescaped
+ version
+
+Normalization of input makes sure we don't have to deal with special
+cases like unescaped dot at the end of label.
+
+Fixes #451 #487
+CVE-2023-38473
+---
+ avahi-common/alternative-test.c |  3 +++
+ avahi-common/alternative.c      | 27 +++++++++++++++++++--------
+ 2 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/avahi-common/alternative-test.c b/avahi-common/alternative-test.c
+index 9255435..681fc15 100644
+--- a/avahi-common/alternative-test.c
++++ b/avahi-common/alternative-test.c
+@@ -31,6 +31,9 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
+     const char* const test_strings[] = {
+         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXüüüüüüü",
++        ").",
++        "\\.",
++        "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\\\",
+         "gurke",
+         "-",
+         " #",
+diff --git a/avahi-common/alternative.c b/avahi-common/alternative.c
+index b3d39f0..a094e6d 100644
+--- a/avahi-common/alternative.c
++++ b/avahi-common/alternative.c
+@@ -49,15 +49,20 @@ static void drop_incomplete_utf8(char *c) {
+ }
+ 
+ char *avahi_alternative_host_name(const char *s) {
++    char label[AVAHI_LABEL_MAX], alternative[AVAHI_LABEL_MAX*4+1];
++    char *alt, *r, *ret;
+     const char *e;
+-    char *r;
++    size_t len;
+ 
+     assert(s);
+ 
+     if (!avahi_is_valid_host_name(s))
+         return NULL;
+ 
+-    if ((e = strrchr(s, '-'))) {
++    if (!avahi_unescape_label(&s, label, sizeof(label)))
++        return NULL;
++
++    if ((e = strrchr(label, '-'))) {
+         const char *p;
+ 
+         e++;
+@@ -74,19 +79,18 @@ char *avahi_alternative_host_name(const char *s) {
+ 
+     if (e) {
+         char *c, *m;
+-        size_t l;
+         int n;
+ 
+         n = atoi(e)+1;
+         if (!(m = avahi_strdup_printf("%i", n)))
+             return NULL;
+ 
+-        l = e-s-1;
++        len = e-label-1;
+ 
+-        if (l >= AVAHI_LABEL_MAX-1-strlen(m)-1)
+-            l = AVAHI_LABEL_MAX-1-strlen(m)-1;
++        if (len >= AVAHI_LABEL_MAX-1-strlen(m)-1)
++            len = AVAHI_LABEL_MAX-1-strlen(m)-1;
+ 
+-        if (!(c = avahi_strndup(s, l))) {
++        if (!(c = avahi_strndup(label, len))) {
+             avahi_free(m);
+             return NULL;
+         }
+@@ -100,7 +104,7 @@ char *avahi_alternative_host_name(const char *s) {
+     } else {
+         char *c;
+ 
+-        if (!(c = avahi_strndup(s, AVAHI_LABEL_MAX-1-2)))
++        if (!(c = avahi_strndup(label, AVAHI_LABEL_MAX-1-2)))
+             return NULL;
+ 
+         drop_incomplete_utf8(c);
+@@ -109,6 +113,13 @@ char *avahi_alternative_host_name(const char *s) {
+         avahi_free(c);
+     }
+ 
++    alt = alternative;
++    len = sizeof(alternative);
++    ret = avahi_escape_label(r, strlen(r), &alt, &len);
++
++    avahi_free(r);
++    r = avahi_strdup(ret);
++
+     assert(avahi_is_valid_host_name(r));
+ 
+     return r;
+-- 
+2.42.0
+
diff --git a/main/avahi/Fetch-build-db-from-upstream-git.patch b/main/avahi/Fetch-build-db-from-upstream-git.patch
new file mode 100644
index 00000000000..613a20f53cc
--- /dev/null
+++ b/main/avahi/Fetch-build-db-from-upstream-git.patch
@@ -0,0 +1,74 @@
+Patch-Source: https://salsa.debian.org/utopia-team/avahi/-/blob/b1a3a539ac0b6d79a7a0b87dccbb99028e10ec63/debian/patches/Fetch-build-db-from-upstream-git.patch
+this is needed when building python
+--
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Sat, 26 Oct 2019 15:49:35 +0200
+Subject: Fetch build-db from upstream git
+
+Fetch the build-db file from:
+https://raw.githubusercontent.com/lathiat/avahi/master/service-type-database/build-db
+
+This file is missing dist tarball, likely caused by changes in:
+https://github.com/lathiat/avahi/pull/134
+
+Carry it as a patch for now.
+---
+ service-type-database/build-db | 49 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 49 insertions(+)
+ create mode 100755 service-type-database/build-db
+
+diff --git a/service-type-database/build-db b/service-type-database/build-db
+new file mode 100755
+index 0000000..78ee892
+--- /dev/null
++++ b/service-type-database/build-db
+@@ -0,0 +1,49 @@
++#!/usr/bin/env python
++# -*-python-*-
++# This file is part of avahi.
++#
++# avahi is free software; you can redistribute it and/or modify it
++# under the terms of the GNU Lesser General Public License as
++# published by the Free Software Foundation; either version 2 of the
++# License, or (at your option) any later version.
++#
++# avahi 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 Lesser General Public
++# License along with avahi; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
++# USA.
++
++try:
++    import anydbm as dbm
++except ImportError:
++    import dbm
++
++import sys
++
++if len(sys.argv) > 1:
++    infn = sys.argv[1]
++else:
++    infn = "service-types"
++
++if len(sys.argv) > 2:
++    outfn = sys.argv[2]
++else:
++    outfn = infn + ".db"
++
++db = dbm.open(outfn, "n")
++
++for ln in open(infn, "r"):
++    ln = ln.strip(" \r\n\t")
++    
++    if ln == "" or ln.startswith("#"):
++        continue
++
++    t, n = ln.split(":", 1)
++
++    db[t.strip()] = n.strip()
++
++db.close()
diff --git a/main/avahi/build-db-Use-the-same-database-format-that-the-C-code-exp.patch b/main/avahi/build-db-Use-the-same-database-format-that-the-C-code-exp.patch
new file mode 100644
index 00000000000..76211f4c89d
--- /dev/null
+++ b/main/avahi/build-db-Use-the-same-database-format-that-the-C-code-exp.patch
@@ -0,0 +1,109 @@
+Patch-Source: https://salsa.debian.org/utopia-team/avahi/-/blob/b1a3a539ac0b6d79a7a0b87dccbb99028e10ec63/debian/patches/build-db-Use-the-same-database-format-that-the-C-code-exp.patch
+this is needed to build the python module
+--
+From: Simon McVittie <smcv@debian.org>
+Date: Thu, 7 May 2020 12:13:56 +0100
+Subject: build-db: Use the same database format that the C code expects
+
+Otherwise, Python 2 anydbm will preferentially choose Berkeley DB format
+(dbhash/bsddb), which is neither GNU gdbm nor traditional Unix (n)dbm.
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+Fixes: https://github.com/lathiat/avahi/issues/260
+---
+ configure.ac                      | 11 ++++++++---
+ service-type-database/Makefile.am |  4 ++--
+ service-type-database/build-db    | 27 +++++++++++++++++++++------
+ 3 files changed, 31 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 58db8c7..5aea4e7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -871,9 +871,14 @@ if test "x$HAVE_PYTHON" = "xyes" ; then
+         fi
+ 
+         AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)])
+-        if test "x$HAVE_GDBM" = "xyes" || test "x$HAVE_DBM" = "xyes"; then
+-            AM_CHECK_PYMOD(anydbm,,,[
+-                AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)])
++        if test "x$HAVE_GDBM" = "xyes"; then
++            AM_CHECK_PYMOD([dbm.gnu], [], [], [
++                AM_CHECK_PYMOD([gdbm], [], [], [AC_MSG_ERROR(Could not find Python module dbm.gnu or gdbm)])
++            ])
++        fi
++        if test "x$HAVE_DBM" = "xyes"; then
++            AM_CHECK_PYMOD([dbm.ndbm], [], [], [
++                AM_CHECK_PYMOD([dbm], [], [], [AC_MSG_ERROR(Could not find Python module dbm.ndbm or dbm)])
+             ])
+         fi
+     fi
+diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am
+index f9fa082..0ead0f6 100644
+--- a/service-type-database/Makefile.am
++++ b/service-type-database/Makefile.am
+@@ -28,7 +28,7 @@ noinst_SCRIPTS=build-db
+ pkglibdata_DATA+=service-types.db
+ 
+ service-types.db: service-types
+-	$(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
++	$(AM_V_GEN)$(PYTHON) build-db --gnu $< $@.coming && \
+ 	mv $@.coming $@
+ 
+ CLEANFILES = service-types.db
+@@ -44,7 +44,7 @@ service-types.db.pag: service-types.db
+ service-types.db.dir: service-types.db
+ 	$(AM_V_GEN)mv service-types.db.coming.dir service-types.db.dir
+ service-types.db: service-types build-db
+-	$(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
++	$(AM_V_GEN)$(PYTHON) build-db --ndbm $< $@.coming && \
+ 	if test -f "$@.coming"; then mv $@.coming $@; fi
+ 
+ CLEANFILES = service-types.db*
+diff --git a/service-type-database/build-db b/service-type-database/build-db
+index 78ee892..6415d27 100755
+--- a/service-type-database/build-db
++++ b/service-type-database/build-db
+@@ -17,13 +17,28 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ # USA.
+ 
+-try:
+-    import anydbm as dbm
+-except ImportError:
+-    import dbm
+-
+ import sys
+ 
++if sys.argv[1] == '--gnu':
++    if sys.version_info >= (3,):
++        import dbm.gnu as chosen_dbm
++    else:
++        import gdbm as chosen_dbm
++
++    sys.argv[1:] = sys.argv[2:]
++elif sys.argv[1] == '--ndbm':
++    if sys.version_info >= (3,):
++        import dbm.ndbm as chosen_dbm
++    else:
++        import dbm as chosen_dbm
++
++    sys.argv[1:] = sys.argv[2:]
++else:
++    if sys.version_info >= (3,):
++        import dbm as chosen_dbm
++    else:
++        import anydbm as chosen_dbm
++
+ if len(sys.argv) > 1:
+     infn = sys.argv[1]
+ else:
+@@ -34,7 +49,7 @@ if len(sys.argv) > 2:
+ else:
+     outfn = infn + ".db"
+ 
+-db = dbm.open(outfn, "n")
++db = chosen_dbm.open(outfn, "n")
+ 
+ for ln in open(infn, "r"):
+     ln = ln.strip(" \r\n\t")
diff --git a/main/avfs/APKBUILD b/main/avfs/APKBUILD
deleted file mode 100644
index a84b931f8b0..00000000000
--- a/main/avfs/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Contributor: V.Krishn <vkrishn4@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=avfs
-pkgver=1.1.1
-pkgrel=0
-pkgdesc="A Virtual File System for looking into archives"
-url="http://avf.sourceforge.net/"
-arch="all"
-license="GPL-2.0-or-later"
-depends="bash"
-makedepends="zlib-dev bzip2-dev fuse-dev zstd-dev xz-dev"
-subpackages="$pkgname-dev"
-source="https://downloads.sourceforge.net/project/avf/avfs/$pkgver/avfs-$pkgver.tar.bz2"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--enable-fuse \
-		--enable-library \
-		--with-system-zlib \
-		--with-system-bzlib \
-		--with-xz \
-		--with-zstd \
-		--prefix=/usr \
-		--disable-static
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="0707f8e746d8d3633755b1a1efb944a400c095b517a7befd75de4d25e2fad1a1b5132b9cf94285b05ad1344bfc138ec75e9cb5f8a5d7775a69595b9b35266f92  avfs-1.1.1.tar.bz2"
diff --git a/main/awall/APKBUILD b/main/awall/APKBUILD
index c4e9d839354..089daa2389f 100644
--- a/main/awall/APKBUILD
+++ b/main/awall/APKBUILD
@@ -1,38 +1,34 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
 pkgname=awall
-pkgver=1.7.1
+pkgver=1.12.3
 pkgrel=0
 pkgdesc="Alpine Wall"
-url="https://git.alpinelinux.org/cgit/awall/"
-_luaver=5.2
+url="https://gitlab.alpinelinux.org/alpine/awall"
+_luaver=5.4
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
 replaces="awall-nat"
-depends="drill ip6tables ipset iptables lua$_luaver lua$_luaver-alt-getopt
-         lua$_luaver-cjson lua$_luaver-pc lua$_luaver-posix lua$_luaver-stringy
-         xtables-addons"
+depends="drill ipset iptables lua$_luaver lua$_luaver-alt-getopt
+	lua$_luaver-cjson lua$_luaver-pc lua$_luaver-posix lua-schema
+	lua$_luaver-stringy lua$_luaver-lyaml xtables-addons"
 subpackages="$pkgname-masquerade $pkgname-policies"
 triggers="$pkgname.trigger=/usr/share/awall"
-source="https://dev.alpinelinux.org/archive/awall/awall-$pkgver.tar.xz
+source="https://gitlab.alpinelinux.org/alpine/awall/-/archive/v$pkgver/awall-v$pkgver.tar.bz2
 	awall-init
 	setup-firewall
 	"
-
-builddir=$srcdir/awall-$pkgver
+builddir=$srcdir/awall-v$pkgver
 
 build() {
 	sed -i -e "1,1s:lua:lua$_luaver:" awall-cli
-	return 0
 }
 
 check() {
-	cd "$builddir"
-	make check
+	make LUA_VERSION=$_luaver check
 }
 
 package() {
-	cd "$builddir"
 	make "ROOT_DIR=$pkgdir" LUA_VERSION=$_luaver install
 	install -D "$srcdir"/awall-init "$pkgdir"/usr/libexec/awall-init
 }
@@ -54,6 +50,8 @@ policies() {
 	install -D "$srcdir"/setup-firewall "$subpkgdir"/usr/sbin/setup-firewall
 }
 
-sha512sums="20454ccb94da8c7fb5fa20ea434f0300fdb9806c404e3c5b32482e44fe076b636b74d9acc36ad923651b0d700eb33756682261848741e937b2f1d72d918f7029  awall-1.7.1.tar.xz
+sha512sums="
+2c2b3e5b6d6e67809e20a13861e50110dc3a021f1c9aff5c3cdb92dcd6998494ae56469334d78c833228022772ced4b05367bb92be7e8a3c7a437420cdba6074  awall-v1.12.3.tar.bz2
 e83ea3281c298092530e45fa5b62f6f85b9e5109b11e109799465ea832608294c7d9c4c3f5b0f321dfc0e82040daf3a17d066e9dea65cb0dbae2c453ea9e62cd  awall-init
-e3dd92377c13e88f5395d3c4ccf9bc3afbeb72a5601a17e98b186f8016734cc0ef51a657693f88891094f38f3cda61bb615fa618f29c43fbff7295bf2020dee8  setup-firewall"
+3a444b0bff5d36c504bc98e71687319778a037240b1170fa7f0bc534d19b3c41a3e4e871a3e3c27304a934e6c2d6b1cd589586a01250244394d014dc858606d9  setup-firewall
+"
diff --git a/main/awall/setup-firewall b/main/awall/setup-firewall
index 55bc1ad30a6..62605e1d1bb 100755
--- a/main/awall/setup-firewall
+++ b/main/awall/setup-firewall
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 # Firewall setup script for Alpine Linux
-# Copyright (C) 2018-2019 Kaarle Ritvanen
+# Copyright (C) 2018-2020 Kaarle Ritvanen
 
 . /lib/libalpine.sh
 
@@ -102,11 +102,12 @@ if [ "$DHCP_ZONES" ]; then
 	enable_policy dhcp
 fi
 
-egrep -q "^https?://" /etc/apk/repositories && enable_policy web-client
+grep -E -q "^https?://" /etc/apk/repositories && enable_policy web-client
 
 enable_if_running ntp-client chronyd ntpd openntpd
 enable_if_running ssh-server dropbear sshd
 
+enable_policy local-outbound
 enable_policy ping
 
 cat > /etc/awall/adp-config.json <<EOF
@@ -131,6 +132,6 @@ enable_service() {
 }
 
 enable_service iptables
-if ip -o address | egrep -q '^[0-9]+: [^ ]+ +inet6 '; then
+if ip -o address | grep -E -q '^[0-9]+: [^ ]+ +inet6 '; then
 	enable_service ip6tables
 fi
diff --git a/main/awstats/APKBUILD b/main/awstats/APKBUILD
index 71d001fc6b7..72a52043e1a 100644
--- a/main/awstats/APKBUILD
+++ b/main/awstats/APKBUILD
@@ -1,19 +1,22 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=awstats
-pkgver=7.7
+pkgver=7.9
 pkgrel=0
 pkgdesc="Free real-time logfile analyzer to get advanced statistics"
-url="http://awstats.sourceforge.net/"
+url="https://awstats.sourceforge.net/"
 arch="noarch"
 license="GPL-3.0-or-later"
 depends="perl perl-uri"
 subpackages="$pkgname-doc"
 options="!check" # no testsuite
-source="https://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://prdownloads.sourceforge.net/awstats/awstats-$pkgver.tar.gz"
 
 # secfixes:
+#   7.9-r0:
+#     - CVE-2022-46391
+#   7.8-r1:
+#     - CVE-2020-35176
 #   7.6-r2:
 #     - CVE-2017-1000501
 
@@ -21,19 +24,18 @@ prepare() {
 	local file
 	default_prepare
 	for file in tools/* wwwroot/cgi-bin/*; do
-		[ -f "${file}" ] || continue
+		[ -f "$file" ] || continue
 		sed -e "s:/usr/local/$pkgname/wwwroot:/usr/lib/$pkgname:g" \
 			-i "$file"
 	done
 	for file in wwwroot/cgi-bin/*; do
-		[ -f "${file}" ] || continue
+		[ -f "$file" ] || continue
 		sed -e "s:/usr/share/$pkgname:/usr/lib/$pkgname/cgi-bin:g" \
 			-i "$file"
 	done
 }
 
 package() {
-	cd "$builddir"
 	install -d "$pkgdir"/usr/share/doc/$pkgname \
 		"$pkgdir"/var/lib/$pkgname \
 		"$pkgdir"/usr/lib/$pkgname \
@@ -41,7 +43,7 @@ package() {
 		"$pkgdir"/usr/bin
 
 	# docs
-	cp -a docs tools/xslt "$pkgdir"/usr/share/doc/$pkgname || return 1
+	cp -a docs tools/xslt "$pkgdir"/usr/share/doc/$pkgname
 
 	# cgi-bin
 	cp -a wwwroot/* "$pkgdir"/usr/lib/$pkgname
@@ -51,7 +53,7 @@ package() {
 		"$pkgdir"/usr/lib/$pkgname/cgi-bin/$pkgname.model.conf
 
 	# tools
-	cp tools/*.pl "$pkgdir"/usr/bin/ || return 1
+	cp tools/*.pl "$pkgdir"/usr/bin/
 	ln -s /usr/lib/$pkgname/cgi-bin/$pkgname.pl "$pkgdir"/usr/bin/
 
 	# remove java sources and example plugin
@@ -59,4 +61,6 @@ package() {
 		"$pkgdir"/usr/lib/$pkgname/cgi-bin/plugins/example
 }
 
-sha512sums="8bf32b0650ef0cc900a16eead866da3847d81c2696e7a90fb49833679c958768833d781e5b4becd9b4f6748c7266e2887ff7ff33d98293ce3a0296a810fbe899  awstats-7.7.tar.gz"
+sha512sums="
+1270c7486a5558a54abc7b43cd92ffcea356ff4c00271bb824758ef4f5736eff559dd38eb7bc7bff8d45efa970a60ddcc5771762a3c3a32f003b0e39c55814d9  awstats-7.9.tar.gz
+"
diff --git a/main/axel/APKBUILD b/main/axel/APKBUILD
index 39eb859db98..6383b8a0ac3 100644
--- a/main/axel/APKBUILD
+++ b/main/axel/APKBUILD
@@ -1,16 +1,20 @@
 # Contributor:
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=axel
-pkgver=2.17.7
+pkgver=2.17.13
 pkgrel=0
 pkgdesc="A multiple-connection concurrent downloader"
 url="https://github.com/axel-download-accelerator/axel"
 arch="all"
 options="!check" # has no checks
-license="GPL-2.0-or-later"
-makedepends="openssl-dev"
+license="GPL-2.0-or-later WITH OpenSSL-Exception"
+makedepends="openssl-dev>3"
 subpackages="$pkgname-doc"
-source="$url/releases/download/v$pkgver/axel-$pkgver.tar.xz"
+source="https://github.com/axel-download-accelerator/axel/releases/download/v$pkgver/axel-$pkgver.tar.xz"
+
+# secfixes:
+#   2.17.8-r0:
+#     - CVE-2020-13614
 
 build() {
 	./configure \
@@ -28,4 +32,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ed1815199a7cc78897a820e1938a80dba72b83e1b40e6c1e81c6d3457aaa17faf20148a82383768524d61bbabda5b00cdcb2c15ff8ae5ed74e415da0b53be3aa  axel-2.17.7.tar.xz"
+sha512sums="
+e36129de893c3c56fe89f7ff3accba9803b4e6d3b5094ed4266c10b33639b973c2fdc41beaf0a80d4fb5e62339580383497a15b4b7caad7d70c8fc581c0c4fc2  axel-2.17.13.tar.xz
+"
diff --git a/main/b43-fwcutter/APKBUILD b/main/b43-fwcutter/APKBUILD
index 07cca21a000..1e9c7e26da3 100644
--- a/main/b43-fwcutter/APKBUILD
+++ b/main/b43-fwcutter/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=b43-fwcutter
 pkgver=019
-pkgrel=1
+pkgrel=3
 pkgdesc="Tool to extract firmware from Broadcom drivers"
 url="https://wireless.wiki.kernel.org/en/users/Drivers/b43"
 arch="all"
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index b2de02cd88b..6ab6a822874 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -1,41 +1,38 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=bacula
-pkgver=9.4.4
-pkgrel=3
+pkgver=13.0.3
+pkgrel=0
 pkgdesc="Enterprise ready, network based backup program"
-url="https://www.bacula.org"
+url="https://www.bacula.org/"
 arch="all"
-license="AGPL-3.0-or-later"
-makedepends="autoconf mariadb-connector-c-dev ncurses-dev openssl-dev postgresql-dev
-	sqlite-dev zlib-dev lzo-dev acl-dev postgresql"
+license="AGPL-3.0-or-later WITH OpenSSL-Exception"
+makedepends="autoconf automake libtool mariadb-connector-c-dev ncurses-dev openssl-dev>3 libpq-dev
+	sqlite-dev zlib-dev lzo-dev acl-dev"
 install="$pkgname.pre-install $pkgname.post-upgrade"
 subpackages="$pkgname-doc $pkgname-mysql $pkgname-pgsql $pkgname-sqlite
-	$pkgname-client $pkgname-libs"
+	$pkgname-client-openrc:client_openrc $pkgname-client $pkgname-libs
+	$pkgname-openrc"
 pkgusers="bacula"
 pkggroups="bacula"
 somask="libbaccats-$pkgver.so"
-source="https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
+source="https://downloads.sourceforge.net/project/bacula/bacula/$pkgver/bacula-$pkgver.tar.gz
 	bacula-dir.initd
 	bacula-sd.initd
 	bacula-fd.initd
 	bacula-7.4.0-path-mounted.patch
+	bacula-11.0.6-pthread-double-detach-fix.patch
 	"
 options="!check" #no test suite provided
-builddir="$srcdir/$pkgname-$pkgver"
 
 _bworkdir="/var/lib/$pkgname"
 
-prepare () {
-	default_prepare
-
-	cd "$builddir"/autoconf
-	autoconf && cp configure ../
+prepare() {
+ 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -43,7 +40,7 @@ build() {
 		--sysconfdir=/etc/$pkgname \
 		--localstatedir=/var \
 		--mandir=/usr/share/man \
-		--docdir=/usr/share/doc \
+		--docdir=/usr/share/doc/bacula \
 		--infodir=/usr/share/info \
 		--with-pid-dir=/run/$pkgname \
 		--with-subsys-dir=/run/lock/subsys \
@@ -70,13 +67,11 @@ build() {
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 
 	local daemon; for daemon in dir sd fd; do
-		install -Dm755 "$srcdir"/$pkgname-${daemon}.initd \
-			"$pkgdir"/etc/init.d/$pkgname-${daemon}
+		install -Dm755 "$srcdir"/$pkgname-$daemon.initd \
+			"$pkgdir"/etc/init.d/$pkgname-$daemon
 	done
 
 	install -Dm644 examples/sample-query.sql \
@@ -104,20 +99,24 @@ package() {
 	done
 
 	find "$pkgdir"/usr/lib -iname libbaccats* -type l -delete
+
+	# resolves conflict with community/bat
+	# this manpage is for a program that isn't built here
+	rm "$pkgdir"/usr/share/man/man1/bat.1*
 }
 
 _mv_backend() {
 	mkdir -p "$subpkgdir"/usr/lib
 	mkdir -p "$subpkgdir"/etc/$pkgname/scripts
 
-	mv "$pkgdir"/usr/lib/libbaccats-${1}-${pkgver}.so \
+	mv "$pkgdir"/usr/lib/libbaccats-$1-$pkgver.so \
 		"$subpkgdir"/usr/lib
 
-	ln -s libbaccats-${pkgver}.so "$subpkgdir"/usr/lib/libbaccats.so
-	ln -s libbaccats-${1}-${pkgver}.so \
-		"$subpkgdir"/usr/lib/libbaccats-${pkgver}.so
+	ln -s libbaccats-$pkgver.so "$subpkgdir"/usr/lib/libbaccats.so
+	ln -s libbaccats-$1-$pkgver.so \
+		"$subpkgdir"/usr/lib/libbaccats-$pkgver.so
 
-	mv "$pkgdir"/etc/$pkgname/scripts/*_${1}_* \
+	mv "$pkgdir"/etc/$pkgname/scripts/*_$1_* \
 		"$subpkgdir"/etc/$pkgname/scripts
 }
 
@@ -131,16 +130,8 @@ mysql() {
 pgsql() {
 	pkgdesc="Bacula PGSQL backend"
 	depends="$pkgname"
-	pkgusers="postgres"
 
 	_mv_backend postgresql
-
-	local file
-	for file in create_postgresql_database make_postgresql_tables \
-			grant_postgresql_privileges
-	do
-		chown postgres "$subpkgdir"/etc/$pkgname/scripts/$file
-	done
 }
 
 sqlite() {
@@ -156,21 +147,29 @@ libs() {
 	mv "$pkgdir"/usr/lib/* "$subpkgdir"/usr/lib
 }
 
+client_openrc() {
+	pkgdesc="Bacula client init script"
+	install_if="openrc $pkgname-client=$pkgver-r$pkgrel"
+	install -D -m755 "$pkgdir"/etc/init.d/$pkgname-fd \
+		"$subpkgdir"/etc/init.d/$pkgname-fd
+}
+
 client() {
 	pkgdesc="Bacula client"
 	mkdir -p "$subpkgdir"/usr/sbin \
-		"$subpkgdir"/etc/init.d \
 		"$subpkgdir"/etc/$pkgname
 	for bin in $pkgname $pkgname-fd bconsole btraceback; do
 		mv "$pkgdir"/usr/sbin/$bin "$subpkgdir"/usr/sbin
 	done
-	mv "$pkgdir"/etc/init.d/$pkgname-fd "$subpkgdir"/etc/init.d
 	mv "$pkgdir"/etc/$pkgname/$pkgname-fd.conf "$subpkgdir"/etc/$pkgname/
 	install -d -o $pkgname -g $pkgname "$subpkgdir"/$_bworkdir
 }
 
-sha512sums="f973c9ab8ee9867962645b1a1388b494fd402c990be8128b892e043e16361bff2fc08ec43e2c8c9bebeae9c94afd3fdbc04a610b35f99e7dd054ed1ad2c04b31  bacula-9.4.4.tar.gz
+sha512sums="
+59ec616535959bde26b5b03a60355f3f8d80ae7a719a079d354f41c0f103b0e467177b6f813ef3eb4d30866f73c393d766e8337e20bb97f19ffd7eba5e5c59c5  bacula-13.0.3.tar.gz
 bb954bb94bffa68ba80872046782a73012487291f019fb8d7ff77fc7f4325e25bee88612b3279b4db7d3c2002ac7448ffabcda62da7bab54642a7413904abc91  bacula-dir.initd
 0505b9a74520af6982d5df4390525976f8e009e641d0acfe8f24b2ec9f155166a65eecbabee9ff70ffe188d523effa64f958acd8f657410b1c002a6d736e8aee  bacula-sd.initd
 91a53cb566cfd91b42a319bd6ff9947047cae187c6ec198767853d1a0253667d6c2c58f0e72ed43a7b9f40b76e705cafde7a1d6ac86577fa0f64f44b031dec11  bacula-fd.initd
-2d3757236aacca421261a8866ff04b5b0151538e1462559bd1240119b1bece1d456acbba9fee86dbc6aaec7af2a52eb2c0b7490c5f371b7deb478731c74342ff  bacula-7.4.0-path-mounted.patch"
+2d3757236aacca421261a8866ff04b5b0151538e1462559bd1240119b1bece1d456acbba9fee86dbc6aaec7af2a52eb2c0b7490c5f371b7deb478731c74342ff  bacula-7.4.0-path-mounted.patch
+775ff4449ac7164cfc0f303c6aeb2be1b2d08f4197ac89db453795185c3251e94ccb6ef27068b7802453845d6bcf8474785a1ac7254227f027743baa2ab754bc  bacula-11.0.6-pthread-double-detach-fix.patch
+"
diff --git a/main/bacula/bacula-11.0.6-pthread-double-detach-fix.patch b/main/bacula/bacula-11.0.6-pthread-double-detach-fix.patch
new file mode 100644
index 00000000000..a8bcffefd09
--- /dev/null
+++ b/main/bacula/bacula-11.0.6-pthread-double-detach-fix.patch
@@ -0,0 +1,30 @@
+diff --git a/src/dird/ua_server.c b/src/dird/ua_server.c
+index 75342a3bfa..d8d767e81f 100644
+--- a/src/dird/ua_server.c
++++ b/src/dird/ua_server.c
+@@ -126,7 +126,9 @@ static void *handle_UA_client_request(void *arg)
+    JCR *jcr;
+    BSOCK *user = (BSOCK *)arg;
+ 
+-   pthread_detach(pthread_self());
++   // Alpine: We know the thread is already detached (src/lib/workq.c:74).
++   // Detaching it again would crash on musl, so we disable this call
++   // pthread_detach(pthread_self());
+ 
+    jcr = new_control_jcr("-Console-", JT_CONSOLE);
+
+diff --git a/src/dird/job.c b/src/dird/job.c
+index 7df6351..62452bd 100644
+--- a/src/dird/job.c
++++ b/src/dird/job.c
+@@ -408,7 +408,9 @@ static void *job_thread(void *arg)
+ {
+    JCR *jcr = (JCR *)arg;
+ 
+-   pthread_detach(pthread_self());
++   // Alpine: We know the thread is already detatched (src/lib/workq.c:74).
++   // Detatching it again would crash on musl, so we disable this call
++   // pthread_detach(pthread_self());
+    Dsm_check(100);
+ 
+    Dmsg0(200, "=====Start Job=========\n");
diff --git a/main/base64/0001-add-a-pkg-config-file.patch b/main/base64/0001-add-a-pkg-config-file.patch
new file mode 100644
index 00000000000..5f2127c4695
--- /dev/null
+++ b/main/base64/0001-add-a-pkg-config-file.patch
@@ -0,0 +1,57 @@
+Patch-Source: https://github.com/aklomp/base64/pull/128 (modified)
+From aac03091256296f73254c70966e561e273365364 Mon Sep 17 00:00:00 2001
+From: "lauren n. liberda" <lauren@selfisekai.rocks>
+Date: Sat, 16 Dec 2023 05:25:23 +0100
+Subject: [PATCH] add a pkg-config file
+
+---
+ CMakeLists.txt     |  8 ++++++++
+ cmake/base64.pc.in | 10 ++++++++++
+ 2 files changed, 18 insertions(+)
+ create mode 100644 cmake/base64.pc.in
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 56076e4..4d06310 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -235,6 +235,10 @@ if (BASE64_BUILD_TESTS)
+     add_subdirectory(test)
+ endif()
+ 
++########################################################################
++# pkg-config file
++configure_file("${CMAKE_CURRENT_LIST_DIR}/cmake/base64.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/base64.pc" @ONLY)
++
+ ########################################################################
+ # base64
+ if (BASE64_BUILD_CLI)
+@@ -276,6 +280,10 @@ install(FILES
+         "${CMAKE_CURRENT_BINARY_DIR}/base64-config-version.cmake"
+     DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
+ )
++install(FILES
++        "${CMAKE_CURRENT_BINARY_DIR}/base64.pc"
++    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
++)
+ 
+ install(EXPORT base64-targets
+     NAMESPACE aklomp::
+diff --git a/cmake/base64.pc.in b/cmake/base64.pc.in
+new file mode 100644
+index 0000000..fd97b49
+--- /dev/null
++++ b/cmake/base64.pc.in
+@@ -0,0 +1,10 @@
++prefix="@CMAKE_INSTALL_PREFIX@"
++exec_prefix="${prefix}"
++libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@"
++includedir="${prefix}/@CMAKE_INSTALL_INCLUDEDIR@"
++
++Name: @PROJECT_NAME@
++Description: Fast Base64 stream encoder/decoder in C99, with SIMD acceleration
++Version: @PROJECT_VERSION@
++Cflags: -I${includedir}
++Libs: -L${libdir} -lbase64
+-- 
+2.43.0
+
diff --git a/main/base64/APKBUILD b/main/base64/APKBUILD
new file mode 100644
index 00000000000..e53af1248e4
--- /dev/null
+++ b/main/base64/APKBUILD
@@ -0,0 +1,71 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=base64
+# NOTE: The primary use of this library is for main/nodejs.
+pkgver=0.5.2
+pkgrel=0
+pkgdesc="Fast Base64 stream encoder/decoder in C99, with SIMD acceleration"
+url="https://github.com/aklomp/base64"
+arch="all"
+license="BSD-2-Clause"
+makedepends="
+	clang
+	cmake
+	samurai
+	"
+subpackages="
+	$pkgname-dev
+	lib$pkgname
+	"
+source="
+	https://github.com/aklomp/base64/archive/v$pkgver/base64-$pkgver.tar.gz
+	0001-add-a-pkg-config-file.patch
+	"
+
+build() {
+	local crossopts=
+	[ "$CBUILD" != "$CHOST" ] \
+		&& crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+
+	export CFLAGS="$CFLAGS -Wno-unused-command-line-argument"
+	# Upstream recommends building with clang due to better support for NEON
+	# intrinsics.
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_C_COMPILER=clang \
+		-DCMAKE_CXX_COMPILER=clang++ \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_VERBOSE_MAKEFILE=ON \
+		-DBUILD_SHARED_LIBS=ON \
+		-DBASE64_BUILD_CLI=ON \
+		-DBASE64_BUILD_TESTS=$(want_check && echo ON || echo OFF) \
+		-DBASE64_WITH_OpenMP=OFF \
+		$crossopts
+	cmake --build build
+}
+
+check() {
+	# XXX: https://github.com/aklomp/base64/issues/124
+	#ctest --test-dir build --output-on-failure
+
+	./build/bin/base64 build/bin/libbase64.so > test.b64
+	./build/bin/base64 -d test.b64 > test.bin
+	cmp build/bin/libbase64.so test.bin
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+
+	cd "$pkgdir"
+	rm -f usr/bin/test_base64
+	rm -f usr/bin/benchmark
+}
+
+libbase64() {
+	default_libs
+}
+
+sha512sums="
+9f8ca8a6e9feb8ad98158d675ec3331e83c77401d2633de0e43b62e794682a9d63c03e1c2599981ad3cdb249e263964f6a79084dbdf2ca19a1e1eed6195a98f4  base64-0.5.2.tar.gz
+0f2e6b6258821861822d1077cd607000a4aafe5bdc6b670dc2e1c6faf77cfcee8c13a39fd876a26da3e2600072205a66e9f90ade1d2f37715cebf7000fcc805c  0001-add-a-pkg-config-file.patch
+"
diff --git a/main/bash-completion/APKBUILD b/main/bash-completion/APKBUILD
index 755e3fc95bb..aa9080cf276 100644
--- a/main/bash-completion/APKBUILD
+++ b/main/bash-completion/APKBUILD
@@ -1,23 +1,22 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Lucas Ramage <ramage.lucas@openmailbox.org>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Lucas Ramage <ramage.lucas@protonmail.com>
 pkgname=bash-completion
-pkgver=2.10
+pkgver=2.12.0
 pkgrel=0
 pkgdesc="Command-line tab-completion for bash"
-options="!check" # 7 Tests fail
 url="https://github.com/scop/bash-completion"
 arch="noarch"
 license="GPL-2.0-or-later"
 depends="bash"
 makedepends="autoconf automake bc grep iputils musl-utils procps psmisc sed usbutils"
 checkdepends="py3-pexpect py3-pytest"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-dev $pkgname-doc"
 source="https://github.com/scop/bash-completion/releases/download/$pkgver/bash-completion-$pkgver.tar.xz"
-builddir="$srcdir"/$pkgname-$pkgver
 
-# Provided with util-linux and networkmanager:
+# Provided by other packages
 _conflicting="
+	_adb
 	cal
 	chsh
 	dmesg
@@ -27,6 +26,7 @@ _conflicting="
 	hwclock
 	ionice
 	look
+	makepkg
 	ncal
 	newgrp
 	renice
@@ -39,7 +39,6 @@ _conflicting="
 	"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 
 	# ifup/down tests are still failing
@@ -51,7 +50,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -63,7 +61,6 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	mkdir ./bin
 	ln -sf "$(command -v pytest-3)" ./bin/pytest
 	export PATH="${PATH}:$PWD/bin"
@@ -71,17 +68,29 @@ check() {
 }
 
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
+
+	# /etc/profile sources profile.d, and this occurs only in login shells
+	# it should not then load completions or expect the bashrc to source the profile directory.
+	# so, we move the sourcing script to /etc/bash, and include it from the bashrc when present.
+	mkdir -p "$pkgdir"/etc/bash
+	mv "$pkgdir"/etc/profile.d/bash_completion.sh \
+		"$pkgdir"/etc/bash/
+	rmdir -p "$pkgdir"/etc/profile.d/ || true
 
 	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
-	install -m644 AUTHORS CHANGES CONTRIBUTING.md README.md \
+	install -m644 AUTHORS CHANGELOG.md CONTRIBUTING.md README.md \
 		"$pkgdir"/usr/share/doc/$pkgname/
 
 	cd "$pkgdir"/usr/share/bash-completion/completions
 	for c in $_conflicting; do
 		rm -f $c
 	done
+
+	mkdir -p "$pkgdir"/usr/lib
+	mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/pkgconfig
 }
 
-sha512sums="d434e0e48b25328e8c6b43ed64e58f56459186434754ee972795edd031ce1864038b53926b218fe06e5b3882682db4dec5101b3124362c0137101d3fa6d87cd7  bash-completion-2.10.tar.xz"
+sha512sums="
+f8a12f607c98021d37ade11da14118a282bd4afdf7b25029ee69679c0bc708afded83e47bdf2b81eeb708b8cbd53f2a13dae0641ac6a4dbcf45faeeb1cc7ec8a  bash-completion-2.12.0.tar.xz
+"
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index 84634521485..d102c470be0 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: TBK <alpine@jjtc.eu>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bash
-pkgver=5.0.16
+pkgver=5.2.26
 _patchlevel=${pkgver##*.}
 _myver=${pkgver%.*}
 _patchbase=${_myver/./}
@@ -12,12 +12,13 @@ url="https://www.gnu.org/software/bash/bash.html"
 arch="all"
 license="GPL-3.0-or-later"
 makedepends_build="bison flex"
-makedepends_host="readline-dev>8 ncurses-dev"
+makedepends_host="readline-dev>8 ncurses-dev musl-libintl"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
 subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc"
 source="https://ftp.gnu.org/gnu/bash/bash-$_myver.tar.gz
+	bashrc
 	bash-noinfo.patch
-	fix-jobs.patch
+	profile-bashrc.sh
 	"
 # generate url's to patches. note: no forks allowed!
 _i=1
@@ -26,7 +27,7 @@ while [ $_i -le $_patchlevel ]; do
 	[ $_i -ge 10 ] && _pad="0"
 	[ $_i -ge 100 ] && _pad=
 	source="$source https://ftp.gnu.org/gnu/bash/bash-$_myver-patches/bash$_patchbase-$_pad$_i"
-	_i=$(( $_i + 1))
+	_i=$(( _i + 1))
 done
 
 # secfixes:
@@ -35,6 +36,8 @@ done
 
 builddir="$srcdir/$pkgname-$_myver"
 
+export CFLAGS="$CFLAGS -DSYS_BASHRC='\"/etc/bash/bashrc\"'"
+
 prepare() {
 	# NOTE: This section is for applying the vendor patches, which are required to fix
 	# security holes.  `default_prepare` does *not* apply vendor patches in the format
@@ -79,8 +82,10 @@ check() {
 }
 
 package() {
+	mkdir -p "$pkgdir"/etc/bash
 	make DESTDIR="$pkgdir" install
-
+	install -Dm644  "$srcdir"/bashrc "$pkgdir"/etc/bash/bashrc
+	install -Dm644  "$srcdir"/profile-bashrc.sh "$pkgdir"/etc/profile.d/00-bashrc.sh
 	rm -rf "$pkgdir"/usr/share/locale
 }
 
@@ -91,22 +96,35 @@ dev() {
 	mv "$pkgdir"/usr/lib/$pkgname/Makefile* "$subpkgdir"/usr/lib/$pkgname
 }
 
-sha512sums="bb4519f06e278f271d08722b531e49d2e842cc3e0b02a6b3eee422e2efcb5b6226111af43f5e5eae56beb85ac8bfebcd6a4aacbabb8f609e529aa4d571890864  bash-5.0.tar.gz
+sha512sums="
+5647636223ba336bf33e0c65e516d8ebcf6932de8b44f37bc468eedb87579c628ad44213f78534beb10f47aebb9c6fa670cb0bed3b4e7717e5faf7e9a1ef81ae  bash-5.2.tar.gz
+a9ff38b7a11c7a4935726dddcdde320a0d9616f50bae390f149e23d47bdf07a4c6e09ade2eea2dd9fa8dc449f3d1992a327e19cd57af1b8aad77b39d681c7dff  bashrc
 9d8845491d0fe335bdd8e9a2bd98bda54bfed2ae3c35b2196c6d5a38bdf96c4d97572ba7d6b19ab605ef4e8f001f64cf3312f87dedebb9e37a95ad2c44e33cdb  bash-noinfo.patch
-79473c41e620d78d25139b56c37d18adac5c03dc28939f218729dfcd3558d8cbac5e83db814ffd27aa833cd3e55f81aad26aaf62af3688c927d8ac2a4172eaa4  fix-jobs.patch
-e3bf036287d3be1f3e91755678c04c9a8e1b4a98e34e181871dfaeb13987dda18c31a44db3f3829d91a185ba4414b9c0229f2a15f6e8a951cbc6c1054252bfdd  bash50-001
-59b1cfa1be1029ada53c63fe651d51451ead5523c50c115e0eada07e34e641c693ed728366986acb431f96fdc61818efd3f8cd168ce416001edc62602e5f28dd  bash50-002
-520b5cc0b7aeea6cd8b7471b553d8979996f3627a3e5c8889023562dadc82475be243aca2ec608217b78400a1dceb134b877d3ded926e581445234f1b69409e6  bash50-003
-cbf51bb242edf36289bd483b47c9451132c12f341f494212c0e5d969cd06a3c1c4d121295f3bacb1d7d5e56f789258ba9f54c4cfb5760ed3c70ec1f49f25c719  bash50-004
-4d3e6f337a76b9ff1887c4c6e4e4352885779504f3c975b8d6fa587962f01e8adbd843b5341c1fc1d11152cf465f2982eebd9dc6e1384f319157d29740d510da  bash50-005
-71df829a3a3927a363ad961de8af8db898ea8b0ccf604c5f1326fe4646d0d50b3c7038ee473c225fc10d26c2dc1f711d66b74d003bb0445d36a8a70c49e056e0  bash50-006
-467d377836c53d188cda39de550ce1e00b58895a6646c4da3535e74e599978558a92d8e7bf7c59c988159468fbce04f3a0dbf62cbded28472272f1b9811786e8  bash50-007
-110fef44c1a26819ad8926ce00bd5378e99275763db4b0e9cfd125ba1ab7eb9f93abf912efb9841fa2ac59c380995e477683afc8cf6bf00367a9af7ae371e7f4  bash50-008
-6b770dbd4ca1175f9b958931b1e725d96626a24fb270bac5414d1679dde05276c87654815e9957d6932c515e8792caf8a5f0e9f2dc108bdd041d8024cf75a833  bash50-009
-8ca2cea0264bc0401414207fd8752d4d6eda64be3bb10fdc22529fa2bcedb84e6ab257ba2badc7078ece7f2ae1e2964635926f227eea7aed58166e82871322c2  bash50-010
-05833d6c85f3795a9c100246335f39155c1b5d190e073bf382269c2bbceb13a2de3f85dbe1dd5d4c7824fcca481febe3bdbb4c555e1f2de86bec05fcf6f5871e  bash50-011
-24d67358eec07cc4cd0457ec0c296567558f20bf713b917fc8a8e5095a83f1c5db880bb863d483ca0c9e003972ac5f56596a2eb10c26c82bf6326d0475784e7e  bash50-012
-38fff9856c2259fbba607aacee027dd61e8733c6e5f476b7491bc43755fb5a63e82372f9f18663ec81e7480f0738b296271c948e1932e851f68f53cf3a1935b5  bash50-013
-e8f65be24b425ecaf66672eb4271e0efac2f495f882aeb559d60b52359a468b51852ed7aeeea0ab77cf648a48c9d37f2a00e263d06d29e9fa75b67a648399d91  bash50-014
-3a1a552d1f03dec9ed41be8d8c319fb3cbd01df9978ab25a7b37322913014beca6703980f342ea908250b666d72db95402d7b8219ffdd3df717acb36ed4b72b9  bash50-015
-dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa  bash50-016"
+9b44e2fc4a37fb97bdd75f1563a7b472c3f1260f2da5542f8f063b7647cf751006e70c683c573d0eea4c4bd64863b90997472f5fbc3f9c1ee775cd662b6eab31  profile-bashrc.sh
+d1e5d508a4a1888052434adff551732c4215372174adb19dce9514faa18c78ee690e1c0fd9858e15c76fbb910ccace7e62751c3c266f5db253dbffda8c882409  bash52-001
+2484262d6cb32303c761793af2c352062421054149fcf3f591a590e409bb21985683a1e50669547e396eea46f1081ae0821076c3975357dc6c850f94cdd527c1  bash52-002
+c8dac54c8b1805dc756efd06be3092a4de1c45bc1e97b574ca49bf4152515a545d154a84c1d9a82747c79d676b8330254856380bc929d8e835b10af743d66cbb  bash52-003
+64bab53225ab2f0b974988c9b1ad5d2d2bb256ce384bb9d4646d1e75411a8eefc7ce2a7ee470345bff276e71147e9b5149a5d9b25bd5308f7bad77b8f68b5c84  bash52-004
+9971ebef50d2a776226d68dbb11feaac85522f66824a0e54faa97b0a14cc242eb8daae2c4364ec59cea5413824be7cbc149c02d1452f211588c505f030b13ee0  bash52-005
+aa46d8a5523374a269ea3d1b4b75ae4e3d918ef4f6d89331bed5da24505bcfac321864071f29161e56487c611d35fe1351c2a2ea226ccaeecef55d01a5a5f2c7  bash52-006
+a2f5ce78c651ec220852989a8b2325d0f1a3739f6494796124324e5883290f74b7e360f91d540c339e1ca3030e54b91301241bb481e965f9fdf915d5fd5accd1  bash52-007
+1f317f3c2313ede7b67c4e396dfad453787f4a30ff77fc53aae482c7dbb752f60c1f33cb414dcc3055a55b77c8c80aeda9626e5b066a79af8a082c6e056340e2  bash52-008
+71fffb71e5876e7abea7e769f4438f2f8d3843d7dfec13f1ba7e79ead5b001d7543c92eb3a628b393f8652bf136e4768c1d1c7b55c155cafe83886b900396e68  bash52-009
+12d120e39593d3f23aa86e510b0eda514ec69ef42e910e5855e4c7510354e8504e5d6949770448f5632ce482c9ab468f4ba82a8a38b4a8237cdd7b54f742946a  bash52-010
+83a7584ca8ee512839183e329183476a2c8bcb995e3dc9d5188f04f11760bd3cb0f2d29d12bca2661b7ce8ab125d44d35d839f735992ca6c27f936d609ac4683  bash52-011
+8f969cb36ee81ac47a4c3c6ee7fbe62159192fa4f14cb48973eccd55c458e6a093adc3045ee1c379544d8183d77813977a43cad5d225322d8816540a1cb8893b  bash52-012
+5aaa82d88ec98382e241cbf1a4356a9e69888432301f1c974038b59fd8be08ad2a52b782f51ac673bad72bc4e07d1eb45b926595ebe6d53223dcb7f15f3883a7  bash52-013
+5b6e846b30691e398ee5628226278ffd9def64ef1edd8d77dd4bd681405c339fce39f820837cf8e09c0478b39ecb3a8db01c3e0afb88bdecb7bf362d797e4884  bash52-014
+eb1bd6b3bf8811d765f222cd48360eb7f3f0aaa4f29f1b6c1f17635b819e5e4734ec4e7fcfde551fd7a6299a7d67869ea0bc5cc86cc523bc4a64d30e433df493  bash52-015
+11c3197870570050767887a7497b52549caf2bf74e69c5a4eb95ff316942177da0a1150819f7051eb690841796b98d9a81f784204d18ad176cd2c29473e466d4  bash52-016
+1844d1f4fbce0ae1dd8f2b9c152decc7cc645b7c0c66e84ed129072251e990f2da2220917957e98dd8b1299d2d10fb2dd23e184e40457063c1d554bb132ef1e5  bash52-017
+b454ba8a311b0943f9669425891499fe8d4b5f1a90899bf6c4d0969699e21f8f8e08d0b0e23a7cf5c97aa6b21384ae907ed710254053e7edd43328aa6003780c  bash52-018
+d009b0a571a3e23ab723c6c6fd4b28c48db1a927d690b4c42d7ed2fa51052aaf662026a2de9e4ee3676087eac844f8b57adae567556228c4fd8fb4ed3c8a1b94  bash52-019
+a5a927e90ac3daead54e90f8ff99dbda0fd652c3df83b7bcde0adb136fc4ba8498810e5bfa1d7f0c143422bf1f4622a4669c96e505bccad7c9a271d7e0668187  bash52-020
+c3a61e975819919d7ba120f322fc5e9a420b21f03d7bf989a5e7b6a99bfe35372744277040e88361ee383ab53b05d607d52ff2000b401de038af67c91728b48f  bash52-021
+12a669f3b6ba936be31a85c50bfe52689f3deea02eedb31100ab113b1e74d8104934e615965b4bf7f3b1cf5ad71870211b0bd910bf0862e8ce603505b4b1db3f  bash52-022
+59a2e9e4ee4938ba868552eecdbed5f5d797e143bf6f69fde5c50a4e478c19ce36d562b9f51f65d7da5fe216050276bfe1eb430c151c845cffa77d3fdc9ce771  bash52-023
+ff77920ba4c8df7cb8841d94f483a5678a65ff2aab3f03b02b21eba7daaea15d05af26d2fc7f468509c2047f682908d78cd94254e0688496280e345d010aac24  bash52-024
+20e708ff483ae2ba655c069fbaccdef59d81f52ba787d97fd1b997522248e9e7e1d7773a35f3a6e44c4521a7a5be273ffa25c580533e6d1d1bfb5e49040530c3  bash52-025
+571993da2b8067ef5b7b705aee65dd414ee70b216ffbcb9fab7c08807b87a72465594c3f1576c795ae86bf951911cdde70ad1037e851b88ee379c4237ccff6fe  bash52-026
+"
diff --git a/main/bash/bashrc b/main/bash/bashrc
new file mode 100644
index 00000000000..c880a4ba850
--- /dev/null
+++ b/main/bash/bashrc
@@ -0,0 +1,14 @@
+if [[ $- != *i* ]] ; then
+	# Shell is non-interactive.  Be done now!
+	return
+fi
+
+# set fallback PS1; only if currently set to upstream bash default
+if [ "$PS1" = '\s-\v\$ ' ]; then
+	PS1='\h:\w\$ '
+fi
+
+for f in /etc/bash/*.sh; do
+	[ -r "$f" ] && . "$f"
+done
+unset f
diff --git a/main/bash/fix-jobs.patch b/main/bash/fix-jobs.patch
deleted file mode 100644
index ddb9d4659a5..00000000000
--- a/main/bash/fix-jobs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/jobs.c b/jobs.c
-index cef3c79..bf99266 100644
---- a/jobs.c
-+++ b/jobs.c
-@@ -4166,10 +4166,8 @@ initialize_job_control (force)
-   if (js.c_childmax < 0)
-     js.c_childmax = DEFAULT_CHILD_MAX;
- 
--#if 0
-   if (js.c_childmax > MAX_CHILD_MAX)
-     js.c_childmax = MAX_CHILD_MAX;
--#endif
- 
-   return job_control;
- }
-@@ -4547,10 +4545,8 @@ mark_dead_jobs_as_notified (force)
-   if (js.c_childmax < 0)
-     js.c_childmax = DEFAULT_CHILD_MAX;
- 
--#if 0
-   if (js.c_childmax > MAX_CHILD_MAX)
-     js.c_childmax = MAX_CHILD_MAX;
--#endif
- 
-   /* Don't do anything if the number of dead processes is less than CHILD_MAX
-      and we're not forcing a cleanup. */
diff --git a/main/bash/profile-bashrc.sh b/main/bash/profile-bashrc.sh
new file mode 100644
index 00000000000..f4bd6f76d59
--- /dev/null
+++ b/main/bash/profile-bashrc.sh
@@ -0,0 +1,8 @@
+if [ -n "$BASH_VERSION" ] && [ "$BASH" != "/bin/sh" ]; then
+	# if we're bash (and not /bin/sh bash), also source the bashrc
+	# by default, bash sources the bashrc for non-login,
+	# and only /etc/profile on login (-l). so, make it do both on login.
+	# this ensures that login-shell bash (e.g. -bash or bash -l) still sources the
+	# system bashrc, which e.g. loads bash-completion
+	. /etc/bash/bashrc
+fi
diff --git a/main/batctl/APKBUILD b/main/batctl/APKBUILD
new file mode 100644
index 00000000000..05465496909
--- /dev/null
+++ b/main/batctl/APKBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
+pkgname=batctl
+pkgver=2023.3
+pkgrel=0
+pkgdesc="B.A.T.M.A.N. advanced control and management tool"
+url="https://www.open-mesh.org/"
+arch="all"
+license="GPL-2.0-only AND MIT"
+makedepends="libnl3-dev linux-headers"
+subpackages="$pkgname-doc"
+source="https://downloads.open-mesh.org/batman/releases/batman-adv-$pkgver/batctl-$pkgver.tar.gz"
+options="!check" # No test suite.
+
+build() {
+	make PREFIX=/usr
+}
+
+package() {
+	make PREFIX=/usr DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+050a65269f48a1d362ec71fdaa0af18e16d542c1b280e84c0c35b2bf48e22dc77f34bc200f8535b51ba929c77ea005caae96b61400b6cadf6fdbb2f4ae8ae129  batctl-2023.3.tar.gz
+"
diff --git a/main/bats/APKBUILD b/main/bats/APKBUILD
index 68bb877d872..a8c6fa0e660 100644
--- a/main/bats/APKBUILD
+++ b/main/bats/APKBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Jose-Luis Rivas <ghostbar@riseup.net>
 pkgname=bats
-pkgver=1.1.0
-pkgrel=1
+pkgver=1.11.0
+pkgrel=0
 pkgdesc="Bash Automated Testing System"
+options="!check" # Test passes CI/locally, fails on builders
 url="https://github.com/bats-core/bats-core"
 arch="noarch"
 license="MIT"
@@ -12,12 +13,13 @@ source="$pkgname-$pkgver.zip::https://github.com/bats-core/bats-core/archive/v$p
 builddir="$srcdir/bats-core-$pkgver"
 
 check() {
-	cd "$builddir"
 	bash -c 'bin/bats --tap test'
 }
 
 package() {
-	cd "$builddir"
 	./install.sh "$pkgdir"/usr
 }
-sha512sums="accd83cfec0025a2be40982b3f9a314c2bbf72f5c85daffa9e9419611904a8d34e376919a5d53e378382e0f3794d2bd781046d810225e2a77812474e427bed9e  bats-1.1.0.zip"
+
+sha512sums="
+2d4219fda896114be3f346d5236d17d044c229c2019112bc93627979318c53d67c7c9172aa387e9051514fd359049016d8e4ae7c3cfd5863374dd83bfa8a7751  bats-1.11.0.zip
+"
diff --git a/main/bc/APKBUILD b/main/bc/APKBUILD
index 5de02503570..158f5b50cd2 100644
--- a/main/bc/APKBUILD
+++ b/main/bc/APKBUILD
@@ -2,18 +2,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bc
 pkgver=1.07.1
-pkgrel=1
+pkgrel=4
 pkgdesc="An arbitrary precision numeric processing language (calculator)"
 url="https://www.gnu.org/software/bc/bc.html"
 arch="all"
-license="GPL-2.0-or-later"
+license="GPL-3.0-or-later"
 makedepends="ed flex bison readline-dev texinfo"
 subpackages="$pkgname-doc"
-source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://ftp.gnu.org/gnu/bc/bc-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,16 +20,14 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--with-readline
-	make
+	make -j1
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/bcache-tools/APKBUILD b/main/bcache-tools/APKBUILD
index cf49d146d42..479096d4168 100644
--- a/main/bcache-tools/APKBUILD
+++ b/main/bcache-tools/APKBUILD
@@ -1,19 +1,17 @@
 # Maintainer:
 pkgname=bcache-tools
-pkgver=1.0.8
-pkgrel=2
+pkgver=1.1
+pkgrel=3
 pkgdesc="tools for managing bcache"
 url="https://bcache.evilpiepirate.org/"
 arch="all"
-license="GPL-2.0-only"
+license="GPL-2.0-or-later"
 makedepends="eudev-dev util-linux-dev linux-headers coreutils"
-subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/g2p/bcache-tools/archive/v$pkgver.tar.gz
-	gcc5.patch
-	"
+subpackages="$pkgname-dbg $pkgname-doc"
+source="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/snapshot/bcache-tools-$pkgver.tar.gz"
+options="!check"
 
 build() {
-	cd "$builddir"
 	make
 }
 
@@ -25,5 +23,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc  bcache-tools-1.0.8.tar.gz
-16928c4d78c00f8be73c3bfb4ccc63d1e3eeabcc2da87569f51c240ba018b2dd6b5d6b828601192e8b59cd82b4931b57318f7f0e2f9af169f41cc7b779ce26ab  gcc5.patch"
+sha512sums="
+4ccbef47255bf3644a50242a79951b1f3720e71a55eb1e07dc6b8486df0245da99a77bba751b50197d489b4c5d738e5284aabc014c2f7f44816ddf6a1bb807ca  bcache-tools-1.1.tar.gz
+"
diff --git a/main/bcache-tools/gcc5.patch b/main/bcache-tools/gcc5.patch
deleted file mode 100644
index 0a80f0d93fb..00000000000
--- a/main/bcache-tools/gcc5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./bcache.c.orig
-+++ ./bcache.c
-@@ -115,7 +115,7 @@
- 	0x9AFCE626CE85B507ULL
- };
- 
--inline uint64_t crc64(const void *_data, size_t len)
-+uint64_t crc64(const void *_data, size_t len)
- {
- 	uint64_t crc = 0xFFFFFFFFFFFFFFFFULL;
- 	const unsigned char *data = _data;
diff --git a/main/bctoolbox/APKBUILD b/main/bctoolbox/APKBUILD
index b9a5a5c0ce0..696fda93d7a 100644
--- a/main/bctoolbox/APKBUILD
+++ b/main/bctoolbox/APKBUILD
@@ -1,21 +1,22 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=bctoolbox
-pkgver=4.3.1
+pkgver=5.3.38
 pkgrel=0
 pkgdesc="Utilities library used by Belledonne Communications softwares like belle-sip, mediastreamer2 and linphone"
 url="https://github.com/BelledonneCommunications/bctoolbox"
 arch="all"
-license="GPL-2.0-or-later"
+license="GPL-3.0-or-later"
 options="!check" # bcunit not available
-makedepends="cmake mbedtls-dev"
+makedepends="cmake mbedtls-dev samurai"
 subpackages="$pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/BelledonneCommunications/bctoolbox/archive/$pkgver.tar.gz
-	cmake-bcunit-fix.patch"
+	fix-cmake-path.patch
+	"
 
 build() {
-	cmake \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_MODULE_PATH=/usr/lib/cmake \
 		-DCMAKE_INSTALL_LIBDIR=lib \
@@ -23,28 +24,21 @@ build() {
 		-DENABLE_MBEDTLS=YES \
 		-DENABLE_POLARSSL=NO \
 		-DENABLE_STATIC=NO \
+		-DENABLE_STRICT=NO \
 		-DENABLE_TESTS_COMPONENT=OFF \
-		-DENABLE_SHARED=YES .
-	make
+		-DBUILD_SHARED_LIBS=YES
+	cmake --build build
 }
 
 check() {
-	make check
+	ctest --test-dir build --output-on-failure
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
-dev() {
-	default_dev
-	mkdir -p "$subpkgdir"/usr/lib/cmake/bctoolbox
-	mv "$pkgdir"/usr/share/bctoolbox/cmake/* "$subpkgdir"/usr/lib/cmake/bctoolbox
-	# Remove empty dirs
-	rmdir "$pkgdir"/usr/share/bctoolbox/cmake
-	rmdir "$pkgdir"/usr/share/bctoolbox
-	rmdir "$pkgdir"/usr/share
-}
-
-sha512sums="89d4ead8f08fa6e20735e4cfb29666273e1cb47c23e8ed8c3992b53eae966188a57e68259a224b2857fdf8b1f829784c8ad661cac9fbee6f99b8e2493c067a72  bctoolbox-4.3.1.tar.gz
-466d2a7aa33952c8086c698030af0addc79373aa31104cbe6133d352682439ae5c30055ea4f162cc9b6b9fc54bf3dea0ddcff78e0042e7ce43833d82b9487116  cmake-bcunit-fix.patch"
+sha512sums="
+dbf95ff60b537b16596761a9e45f77e47baf9615813dd884694cd1a78decf447e25a4da629b8907f2caaef7a7f2b4e33241899b27f491acb1e18a5ed3b821a0e  bctoolbox-5.3.38.tar.gz
+78011cadf2602834a2f1eb819cdb302d59d0d00b296d99ce79fb8834c1a93611b73022727697ede07bfe0ec36797a7e71740264962d12995385fd09ae4f799bd  fix-cmake-path.patch
+"
diff --git a/main/bctoolbox/cmake-bcunit-fix.patch b/main/bctoolbox/cmake-bcunit-fix.patch
deleted file mode 100644
index af279ebe43f..00000000000
--- a/main/bctoolbox/cmake-bcunit-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6828b3f..b41262f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -106,14 +106,9 @@ if(POLARSSL_FOUND)
- endif()
- 
- if(ENABLE_TESTS_COMPONENT)
--  find_package(BcUnit CONFIG REQUIRED)
--  cmake_push_check_state(RESET)
--	list(APPEND CMAKE_REQUIRED_INCLUDES ${BCUNIT_INCLUDE_DIRS})
--	list(APPEND CMAKE_REQUIRED_LIBRARIES ${BCUNIT_LIBRARIES})
- 	check_symbol_exists("CU_get_suite" "BCUnit/BCUnit.h" HAVE_CU_GET_SUITE)
- 	check_symbol_exists("CU_curses_run_tests" "BCUnit/BCUnit.h" HAVE_CU_CURSES)
- 	check_symbol_exists("CU_set_trace_handler" "BCUnit/Util.h" HAVE_CU_SET_TRACE_HANDLER)
--	cmake_pop_check_state()
- 	set(TESTER_REQUIRES_PRIVATE "bcunit")
- endif()
- 
diff --git a/main/bctoolbox/fix-cmake-path.patch b/main/bctoolbox/fix-cmake-path.patch
new file mode 100644
index 00000000000..5a2d7594a92
--- /dev/null
+++ b/main/bctoolbox/fix-cmake-path.patch
@@ -0,0 +1,14 @@
+Adapted from https://github.com/OpenMandrivaAssociation/bctoolbox/blob/master/bctoolbox-5.3.6-cmake-fix_cmake_path.patch
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -167,7 +167,7 @@
+ endif()
+ 
+ include(CMakePackageConfigHelpers)
+-set(CMAKE_MODULES_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake")
++set(CMAKE_MODULES_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+ configure_package_config_file("cmake/${PROJECT_NAME}Config.cmake.in" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+ 	INSTALL_DESTINATION "${CMAKE_MODULES_INSTALL_DIR}"
+ 	PATH_VARS CMAKE_MODULES_INSTALL_DIR
+
diff --git a/main/bdftopcf/APKBUILD b/main/bdftopcf/APKBUILD
index 5bc70925800..4aa8c158253 100644
--- a/main/bdftopcf/APKBUILD
+++ b/main/bdftopcf/APKBUILD
@@ -1,20 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bdftopcf
-pkgver=1.1
-pkgrel=0
+pkgver=1.1.1
+pkgrel=5
 pkgdesc="X.Org font utility"
-url="http://xorg.freedesktop.org"
+url="https://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 options="!check" # No test suite.
-depends=""
-makedepends="libxfont-dev util-macros"
-install=""
+makedepends="util-macros xorgproto"
 subpackages="$pkgname-doc"
-source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/util/bdftopcf-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,8 +23,9 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec  bdftopcf-1.1.tar.bz2"
+sha512sums="
+257dc9ae29f2cf1496aad91ccba534348d87f881d75431aa6611a8154cb817d17588c464ab6c6c6bc51e6060baa8dcfcb9fd8c037cdaea8d18287651fa6b7ea9  bdftopcf-1.1.1.tar.xz
+"
diff --git a/main/bearssl/APKBUILD b/main/bearssl/APKBUILD
index 305432c088a..b394447ef3f 100644
--- a/main/bearssl/APKBUILD
+++ b/main/bearssl/APKBUILD
@@ -1,18 +1,23 @@
-# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 # Contributor: Laurent Bercot <ska-devel@skarnet.org>
+# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 pkgname=bearssl
-pkgver=0.6
+pkgver=0.6_git20230221
+_pkgcommit=79c060eea3eea1257797f15ea1608a9a9923aa6f
 pkgrel=0
 pkgdesc="The BearSSL implementation of the SSL/TLS protocol"
 url="https://bearssl.org/"
 arch="all"
 license="MIT"
-subpackages="$pkgname-dev"
-source="https://bearssl.org/$pkgname-$pkgver.tar.gz bearssl-brssl-dynamic.patch"
-builddir="$srcdir/$pkgname-$pkgver"
+subpackages="$pkgname-static $pkgname-dev $pkgname-libs"
+source="
+	bearssl-$pkgver.tar.gz::https://bearssl.org/gitweb/?p=BearSSL;a=snapshot;h=$_pkgcommit;sf=tgz
+	bearssl-brssl-dynamic.patch
+	libbearssl.pc
+"
+
+builddir=$PWD/src/BearSSL-${_pkgcommit:0:7}
 
 build() {
-	cd "$builddir"
 	make \
 	  CC="${CC:-gcc}" \
 	  CFLAGS="-W -Wall -fPIC $CFLAGS" \
@@ -24,13 +29,14 @@ build() {
 }
 
 package() {
-	mkdir -p -m 0755 -- "$pkgdir"/bin "$pkgdir"/lib "$pkgdir"/usr/include "$pkgdir"/usr/lib
+	mkdir -p "$pkgdir"/bin "$pkgdir"/lib "$pkgdir"/usr/include "$pkgdir"/usr/lib
 	cp -f "$builddir/build/brssl" "$pkgdir/bin/"
 	cp -f "$builddir"/inc/* "$pkgdir/usr/include/"
 	cp -f "$builddir/build/libbearssl.a" "$pkgdir/usr/lib/"
 	cp -f "$builddir/build/libbearssl.so.$pkgver" "$pkgdir/lib/"
 	ln -sf "libbearssl.so.$pkgver" "$pkgdir/lib/libbearssl.so.${pkgver%%.*}"
 	ln -sf "libbearssl.so.${pkgver%%.*}" "$pkgdir/lib/libbearssl.so"
+	install -D -m644 "$srcdir"/libbearssl.pc "$pkgdir"/usr/lib/pkgconfig/libbearssl.pc
 }
 
 check() {
@@ -39,5 +45,8 @@ check() {
 	./testcrypto all
 }
 
-sha512sums="f9ed25683cfc6c4abe7f1203a2b82ed101ee4c9e0f9ab60755b6a09c8d1e8e4f64d413624e7bb9c4b0033f909a2e4568a1d916cc6ce4736222900691e1f8359a  bearssl-0.6.tar.gz
-f5fe047862eb355a662ccb1b95c2ca4a870ac0f8d3f4cada5396d2f6a6635647db53fbeb038f9a7651b84d6cda32b6415ce0f69a8da92636d3b3b76578114d5c  bearssl-brssl-dynamic.patch"
+sha512sums="
+bffe5171f3ef27d8f141a43f5b485dcb659b20f1fc65d68c8f6e04f26dd99aadfc39a5943f5d6952f032533e2a709da9083c634f3dcc387b5c2ad64c1785bf6b  bearssl-0.6_git20230221.tar.gz
+f5fe047862eb355a662ccb1b95c2ca4a870ac0f8d3f4cada5396d2f6a6635647db53fbeb038f9a7651b84d6cda32b6415ce0f69a8da92636d3b3b76578114d5c  bearssl-brssl-dynamic.patch
+d9cb508709909522a19142a2d8fc988fcb1f33796ace4e21908070925ec402c73fd0778a170a50d3d89bab1263e40a40401a9e593cb4f2a8e314fc52f9965696  libbearssl.pc
+"
diff --git a/main/bearssl/libbearssl.pc b/main/bearssl/libbearssl.pc
new file mode 100644
index 00000000000..5a2849c55b3
--- /dev/null
+++ b/main/bearssl/libbearssl.pc
@@ -0,0 +1,9 @@
+prefix=/usr
+exec_prefix=${prefix}
+includedir=${prefix}/include
+libdir=${prefix}/lib
+Name: libbearssl
+Version: 0.6
+Description: The BearSSL implementation of the SSL/TLS protocol
+Cflags: -I${includedir}
+Libs: -L${libdir} -lbearssl
diff --git a/main/beep/0001-disable-gcc-ubsan.patch b/main/beep/0001-disable-gcc-ubsan.patch
new file mode 100644
index 00000000000..24cad5942e2
--- /dev/null
+++ b/main/beep/0001-disable-gcc-ubsan.patch
@@ -0,0 +1,25 @@
+From 30751070371ee32a3b58f8f416c07ddc1d3b5680 Mon Sep 17 00:00:00 2001
+From: Leonardo Arena <rnalrd@alpinelinux.org>
+Date: Tue, 1 Feb 2022 09:26:02 +0000
+Subject: [PATCH] disable gcc ubsan
+
+---
+ GNUmakefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/GNUmakefile b/GNUmakefile
+index a27b453..fbc3605 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -169,7 +169,7 @@ $(eval $(call CHECK_CFLAGS,CFLAGS,-fanalyzer))
+ $(eval $(call CHECK_CFLAGS,CFLAGS,-fstack-protector-strong))
+ $(eval $(call CHECK_CFLAGS,CFLAGS,-fstack-clash-protection))
+ $(eval $(call CHECK_CFLAGS,CFLAGS,-fcf-protection))
+-$(eval $(call CHECK_CFLAGS,CFLAGS,-fsanitize=undefined))
++$(eval $(call CHECK_CFLAGS,CFLAGS))
+ 
+ 
+ CFLAGS += -save-temps=obj
+-- 
+2.35.1
+
diff --git a/main/beep/0002-remove-option-werror.patch b/main/beep/0002-remove-option-werror.patch
new file mode 100644
index 00000000000..7f650bcfd78
--- /dev/null
+++ b/main/beep/0002-remove-option-werror.patch
@@ -0,0 +1,25 @@
+From b471c291766e0b6a3afaa1324fd1c79be7ab0dab Mon Sep 17 00:00:00 2001
+From: Leonardo Arena <rnalrd@alpinelinux.org>
+Date: Tue, 1 Feb 2022 09:30:53 +0000
+Subject: [PATCH 1/2] remove option werror
+
+---
+ GNUmakefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/GNUmakefile b/GNUmakefile
+index a27b453..9747798 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -155,7 +155,7 @@ $(eval $(call CHECK_CFLAGS,common_CFLAGS,-Werror=unknown-warning-option))
+ $(eval $(call CHECK_CFLAGS,common_CFLAGS,-Wall))
+ $(eval $(call CHECK_CFLAGS,common_CFLAGS,-Wextra))
+ $(eval $(call CHECK_CFLAGS,common_CFLAGS,-Weverything))
+-$(eval $(call CHECK_CFLAGS,common_CFLAGS,-Werror))
++$(eval $(call CHECK_CFLAGS,common_CFLAGS))
+ $(eval $(call CHECK_CFLAGS,common_CFLAGS,-Wno-padded))
+ $(eval $(call CHECK_CFLAGS,common_CFLAGS,-Werror=format-security))
+ $(eval $(call CHECK_CFLAGS,common_CFLAGS,-Wno-disabled-macro-expansion))
+-- 
+2.35.1
+
diff --git a/main/beep/0003-remove-option-werror.patch b/main/beep/0003-remove-option-werror.patch
new file mode 100644
index 00000000000..ec3046742e8
--- /dev/null
+++ b/main/beep/0003-remove-option-werror.patch
@@ -0,0 +1,25 @@
+From 648ebb687339269bfd056703f0aa5a62a9ba4f06 Mon Sep 17 00:00:00 2001
+From: Leonardo Arena <rnalrd@alpinelinux.org>
+Date: Tue, 1 Feb 2022 09:31:33 +0000
+Subject: [PATCH 2/2] remove O2 optimization
+
+---
+ GNUmakefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 9747798..d192bab 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -147,7 +147,7 @@ common_LIBS      =
+ 
+ common_CPPFLAGS += -DPACKAGE_TARNAME='"$(PACKAGE_TARNAME)"'
+ common_CPPFLAGS += -DPACKAGE_VERSION='"$(PACKAGE_VERSION)"'
+-common_CFLAGS   += -O2 -g
++common_CFLAGS   += -g
+ common_CFLAGS   += -std=gnu99
+ common_CFLAGS   += $(if $(filter %.o,$@),-Wa$(comma)-adhlns=$(@:.o=.lst))
+ common_CFLAGS   += -pedantic
+-- 
+2.35.1
+
diff --git a/main/beep/APKBUILD b/main/beep/APKBUILD
index 2b4047837ce..b5a50ce0209 100644
--- a/main/beep/APKBUILD
+++ b/main/beep/APKBUILD
@@ -1,22 +1,32 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=beep
-pkgver=1.4.7
-pkgrel=0
+pkgver=1.4.12
+pkgrel=1
 pkgdesc="A terminal bell"
 url="https://github.com/spkr-beep/beep"
 arch="all"
 license="GPL-2.0-or-later"
 makedepends="linux-headers"
+options="!check" # no test suite
 subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/spkr-beep/beep/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/spkr-beep/beep/archive/v$pkgver.tar.gz
+	0001-disable-gcc-ubsan.patch
+	0002-remove-option-werror.patch
+	0003-remove-option-werror.patch
+	"
 
 build() {
-	make
+	make prefix="/usr" DESTDIR="$pkgdir"
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	make prefix="/usr" DESTDIR="$pkgdir" install
 }
 
-sha512sums="a1482a16f971c56dc6a62047fa449c96519c897d2e8cb18dcc06178564943c1eb3b9d9106ca6b76054e0fa109e3b161fb8e9ec1966a02d0d739222b5434b71c7  beep-1.4.7.tar.gz"
+sha512sums="
+18fed77bc4820ecc84ac12e903d516d5228fa2038df1788cc68db76e40b3c47a271911cc45bc48ce94e3f215803c5c05cb6c08ebb47ae6d7fcf1e0bc1ac169cd  beep-1.4.12.tar.gz
+44d1871a1cd763468873242d77c21c9c9f8682c75a561592d61536ecb98917b108d61d1801d974cc05ffed5d009dfafe21cc9705f8494edcb6a01aa528b9cabd  0001-disable-gcc-ubsan.patch
+e04dff41163889b4ec263ceba3a0b5757e900863c8165b3b893af30b16894f1b08414d345b6195f229824811d9b737c3ff100c772fbf02de5f30442c9f3f64cf  0002-remove-option-werror.patch
+977b7e001c80af7086d388dc05add931e9aad985f163d511c873b350b7a001bc8faaa198e074b15d3b310d0a09413a7d9989b519be89bf73119d3d14a6cd4dd9  0003-remove-option-werror.patch
+"
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index 200775e2d8b..8afde48a57c 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -1,56 +1,58 @@
 # Contributor: Sergei Lukin <sergej.lukin@gmail.com>
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Contributor: ungleich <alpinelinux@ungleich.ch>
-# Maintainer:
+# Maintainer: Mike Crute <mike@crute.us>
 pkgname=bind
-pkgver=9.14.8
+pkgver=9.18.25
 _ver=${pkgver%_p*}
 _p=${pkgver#*_p}
 _major=${pkgver%%.*}
-[ "$_p" != "$pkgver" ] && _ver="${_ver}-P$_p"
-pkgrel=6
+[ "$_p" != "$pkgver" ] && _ver="$_ver-P$_p"
+pkgrel=1
 pkgdesc="The ISC DNS server"
-url="https://www.isc.org"
+url="https://www.isc.org/"
 arch="all"
 license="MPL-2.0"
+options="!check" # requires bind server
 pkgusers="named"
 pkggroups="named"
 depends="dns-root-hints bind-tools"
 depends_dev="$pkgname $pkgname-plugins $pkgname-tools"
-depends_libs=""
-depends_plugins="$pkgname"
+_depends_plugins="$pkgname"
 _root_keys_upstream="dnssec-root"
-depends_root_keys="$_root_keys_upstream"
-depends_tools=""
-_py3deps="py3-ply python3"
+_depends_root_keys="$_root_keys_upstream"
 makedepends="
 	bash
-	bsd-compat-headers
 	fstrm-dev
-	json-c-dev
 	krb5-dev
 	libcap-dev
+	libuv-dev
 	libxml2-dev
+	json-c-dev
 	linux-headers
+	nghttp2-dev
 	openldap-dev
-	openssl-dev
+	openssl-dev>3
 	perl
 	protobuf-c-dev
-	$_py3deps
-	python3-dev
+	$_depends_root_keys
 	"
 install="$pkgname.pre-install $pkgname.post-install"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc
-	${pkgname}-${_root_keys_upstream}:root_keys:noarch
-	py3-$pkgname:_py3 $pkgname-dnssec-tools:_dnssec_tools
-	$pkgname-plugins $pkgname-tools
+subpackages="
+	$pkgname-dbg
+	$pkgname-doc
+	$pkgname-dev
+	$pkgname-libs
+	$pkgname-openrc
+	$pkgname-${_root_keys_upstream}:root_keys:noarch
+	$pkgname-dnssec-tools:_dnssec_tools
+	$pkgname-plugins
+	$pkgname-tools
 	"
 source="
-	https://downloads.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz
-	bind.plugindir.patch
-	bind.so_bsdcompat.patch
+	https://downloads.isc.org/isc/bind$_major/$_ver/bind-$_ver.tar.xz
 	named.initd
 	named.confd
 	named.conf.authoritative
@@ -58,9 +60,55 @@ source="
 	127.zone
 	localhost.zone
 	"
-builddir="$srcdir/$pkgname-$_ver"
 
 # secfixes:
+#   9.18.24-r0:
+#     - CVE-2023-4408
+#     - CVE-2023-5517
+#     - CVE-2023-5679
+#     - CVE-2023-5680
+#     - CVE-2023-6516
+#     - CVE-2023-50387
+#     - CVE-2023-50868
+#   9.18.19-r0:
+#     - CVE-2023-3341
+#     - CVE-2023-4236
+#   9.18.11-r0:
+#     - CVE-2022-3094
+#     - CVE-2022-3736
+#     - CVE-2022-3924
+#   9.18.7-r0:
+#     - CVE-2022-2795
+#     - CVE-2022-2881
+#     - CVE-2022-2906
+#     - CVE-2022-3080
+#     - CVE-2022-38177
+#     - CVE-2022-38178
+#   9.16.27-r0:
+#     - CVE-2022-0396
+#     - CVE-2021-25220
+#   9.16.22-r0:
+#     - CVE-2021-25219
+#   9.16.20-r0:
+#     - CVE-2021-25218
+#   9.16.15-r0:
+#     - CVE-2021-25214
+#     - CVE-2021-25215
+#     - CVE-2021-25216
+#   9.16.11-r2:
+#     - CVE-2020-8625
+#   9.16.6-r0:
+#     - CVE-2020-8620
+#     - CVE-2020-8621
+#     - CVE-2020-8622
+#     - CVE-2020-8623
+#     - CVE-2020-8624
+#   9.16.4-r0:
+#     - CVE-2020-8618
+#     - CVE-2020-8619
+#   9.14.12-r0:
+#     - CVE-2020-8616
+#     - CVE-2020-8617
 #   9.14.8-r0:
 #     - CVE-2019-6477
 #   9.14.7-r0:
@@ -91,25 +139,23 @@ builddir="$srcdir/$pkgname-$_ver"
 #     - CVE-2016-9131
 #     - CVE-2016-9147
 #     - CVE-2016-9444
+#   0:
+#     - CVE-2019-6470
 
 prepare() {
 	default_prepare
-	cd "$builddir"
-
 	# Adjusting PATHs in manpages
-	for i in bin/named/named.8 bin/check/named-checkconf.8 bin/rndc/rndc.8; do
+	for i in bin/named/named.rst bin/check/named-checkconf.rst bin/rndc/rndc.rst; do
 		sed -i \
 			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
 			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
 			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}"
+			"$i"
 	done
 }
 
 build() {
-	cd "$builddir"
-
-	### http://bugs.gentoo.org/show_bug.cgi?id=227333
+	### https://bugs.gentoo.org/show_bug.cgi?id=227333
 	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
 
 	./configure \
@@ -120,33 +166,23 @@ build() {
 		--localstatedir=/var \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--with-dlopen=yes \
-		--with-dlz-filesystem=yes \
-		--with-dlz-ldap=yes \
-		--with-dlz-stub=yes \
-		--with-gssapi=/usr \
-		--with-libjson \
-		--with-libtool \
+		--with-gssapi=yes \
 		--with-libxml2 \
-		--with-openssl=/usr \
-		--with-python=python3 \
+		--with-json-c \
+		--with-openssl=yes \
 		--enable-dnstap \
 		--enable-largefile \
 		--enable-linux-caps \
 		--enable-shared \
-		--enable-static \
-		--disable-isc-spnego
+		--disable-static
 	make
 }
 
 check() {
-	cd "$builddir"
-
-	./bin/named/named -V
+	make test
 }
 
 package() {
-	cd "$builddir"
 	install -d -m0770 -g named -o root "$pkgdir"/var/bind \
 		"$pkgdir"/var/bind/sec \
 		"$pkgdir"/var/bind/dyn \
@@ -175,34 +211,18 @@ package() {
 	ln -s named.ca root.cache
 }
 
-dev() {
-	default_dev
-
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/isc-config.sh "$subpkgdir"/usr/bin/
-}
-
-_py3() {
-	pkgdesc="A module allowing rndc commands to be sent from Python programs"
-	depends="$_py3deps"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/
-}
-
 _dnssec_tools() {
 	pkgdesc="Utilities for DNSSEC keys and DNS zone files management"
-	depends="py3-$pkgname=$pkgver-r$pkgrel"
-	mkdir -p "$subpkgdir"/usr/sbin
+	mkdir -p "$subpkgdir"/usr/bin
 	mv  \
-		"$pkgdir"/usr/sbin/nsec3hash \
-		"$pkgdir"/usr/sbin/dnssec* \
-		"$subpkgdir"/usr/sbin/
+		"$pkgdir"/usr/bin/nsec3hash \
+		"$pkgdir"/usr/bin/dnssec* \
+		"$subpkgdir"/usr/bin/
 }
 
-
 plugins() {
 	pkgdesc="The ISC DNS server plugins"
-	depends="$depends_plugins"
+	depends="$_depends_plugins"
 
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/bind "$subpkgdir"/usr/lib/
@@ -210,16 +230,20 @@ plugins() {
 
 tools() {
 	pkgdesc="The ISC DNS tools"
-	depends="$depends_tools"
+	depends=""
 
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+	mkdir -p "$subpkgdir"/usr/bin
+	for i in "$pkgdir"/usr/bin/*; do
+		case "${i##*/}" in
+			named-checkconf) ;;
+			*) mv "$i" "$subpkgdir"/usr/bin ;;
+		esac
+	done
 
 	mkdir -p "$subpkgdir"/usr/sbin
 	for i in "$pkgdir"/usr/sbin/*; do
-		file "$i" | grep 'Python script' >/dev/null 2>&1 && continue || :
 		case "${i##*/}" in
-			named|named-checkconf|rndc) ;;
+			named|rndc) ;;
 			*) mv "$i" "$subpkgdir"/usr/sbin ;;
 		esac
 	done
@@ -227,41 +251,48 @@ tools() {
 
 root_keys() {
 	pkgdesc="ISC BIND DNSSEC Root Keys"
-	depends="$depends_root_keys"
+	depends=""
 
 	local _dir _file _link
-	_dir="usr/share/${_root_keys_upstream}"
-	_file="${pkgname}-${_root_keys_upstream}.keys"
-	_link="${pkgdir}/etc/bind/bind.keys"
+	_dir="usr/share/$_root_keys_upstream"
+	_file="$pkgname-$_root_keys_upstream.keys"
+	_link="$pkgdir/etc/bind/bind.keys"
 
-	mkdir -p "${subpkgdir}/${_dir}"
-	cd "${subpkgdir}/${_dir}"
+	mkdir -p "$subpkgdir/$_dir"
+	cd "$subpkgdir/$_dir"
 
 	mv "$_link" "$_file"
 	ln -s "$_file" bind.keys
 
-	ln -s "../../${_dir}/${_file}" "$_link"
+	ln -s "../../$_dir/$_file" "$_link"
 }
 
-# TODO: remove when abuild is sufficiently upgraded
+# The default_libs() in abuild uses the wrong pattern.
 libs() {
 	depends="$depends_libs"
-	default_libs
+	pkgdesc="$pkgdesc (libraries)"
+	local dir= file=
+	for dir in lib usr/lib; do
+		for file in "$pkgdir"/"$dir"/lib*.so; do
+			[ -f "$file" ] || continue
+			mkdir -p "$subpkgdir"/$dir
+			mv "$file" "$subpkgdir"/$dir/
+		done
+	done
 }
 
-
-gpg_signature_extensions="sha512.asc"
-gpgfingerprints="
+_gpg_signature_extensions="sha512.asc"
+_gpgfingerprints="
 	good:AE3F AC79 6711 EC59 FC00  7AA4 74BB 6B9A 4CBB 3D38
 	BE0E 9748 B718 253A 28BB  89FF F1B1 1BF0 5CF0 2E57
 	"
 
-sha512sums="eb52760982ebd246e6e1945684771193fc7364324a6d6a95a0cae33afa0a4fa24ffe8313b5f9094420c7c2ec932b1b1a9fb19f6e673ff3c5583ab5e3ff04eb6a  bind-9.14.8.tar.gz
-2b32d1e7f62cd1e01bb4fdd92d15460bc14761b933d5acc463a91f5ecd4773d7477c757c5dd2738e8e433693592cf3f623ffc142241861c91848f01aa84640d6  bind.plugindir.patch
-7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6  bind.so_bsdcompat.patch
-53db80f7ee4902f42fb1d0bc959242bcb6f20d95256bda99ce2c206af8b4703c7f72bb26d026c633f70451b84a37c3946b210951e34dd5d6620b181cd0183de4  named.initd
+sha512sums="
+af2b751b72121a6e98d762110bff183984ab5312d0e080b4ff091f3176437d8be570a8d849034ae4df5eee4e8795f32196d94859262e44f2ce55d8b3d895ba6e  bind-9.18.25.tar.xz
+3d1d3e954aaee5e125f6b6f3cb660b51fc91d803df4cad43c47dbe97f19789cef20b5ca2834624668f0d761a5b81ac72db8959745d6eb293ca1154a1b390a007  named.initd
 127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf  named.confd
 d2f61d02d7829af51faf14fbe2bafe8bc90087e6b6697c6275a269ebbddcaa14a234fff5c41da793e945e8ff1de3de0858a40334e0d24289eab98df4bb721ac5  named.conf.authoritative
 3aba9763cfaf0880a89fd01202f41406b465547296ce91373eb999ea7719040bc1ac4e47b0de025a8060f693d3d88774a20d09a43fa7ac6aa43989b58b5ee8fe  named.conf.recursive
 eed9886717539399518e011ae5eae6335aed4fae019e1def088c5be26bdc896c99c07adf84ee61babafa31d31ff3b028263d1c88d2eee17ecf4c95a9d77d524c  127.zone
-340e86472a2c2746fe585c0aa5f079d3a9b46e828c1f53d48026533a169b7f77ded7d0a13d291d6962607bb9481456e6fa69df1834603e7555332615fb998f0b  localhost.zone"
+340e86472a2c2746fe585c0aa5f079d3a9b46e828c1f53d48026533a169b7f77ded7d0a13d291d6962607bb9481456e6fa69df1834603e7555332615fb998f0b  localhost.zone
+"
diff --git a/main/bind/bind.plugindir.patch b/main/bind/bind.plugindir.patch
deleted file mode 100644
index bcef2dbdecc..00000000000
--- a/main/bind/bind.plugindir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/make/rules.in b/make/rules.in
-index 8039856..bd29891 100644
---- a/make/rules.in
-+++ b/make/rules.in
-@@ -28,7 +28,7 @@ localstatedir =	@localstatedir@
- mandir =	@mandir@
- datarootdir =   @datarootdir@
- 
--plugindir =	${libdir}/named
-+plugindir =	${libdir}/bind
- 
- DESTDIR =
- 
diff --git a/main/bind/bind.post-install b/main/bind/bind.post-install
index aa1b7a85e59..94c1424e798 100644
--- a/main/bind/bind.post-install
+++ b/main/bind/bind.post-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Generate key required for reload to work -> creates /etc/bind/rndc.key
-if ! [ -f /etc/bind/rndc.key ]; then
-	rndc-confgen -a
-	chown named:named /etc/bind/rndc.key
+if ! [ -f etc/bind/rndc.key ]; then
+	rndc-confgen -a -c etc/bind/rndc.key
+	chown named:named etc/bind/rndc.key
 fi
diff --git a/main/bind/bind.so_bsdcompat.patch b/main/bind/bind.so_bsdcompat.patch
deleted file mode 100644
index 69751e13b32..00000000000
--- a/main/bind/bind.so_bsdcompat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/isc/unix/socket.c.orig	2005-11-03 17:08:42.000000000 -0600
-+++ b/lib/isc/unix/socket.c	2006-02-18 13:09:15.000000000 -0600
-@@ -245,6 +245,8 @@
- 
- #define SOCK_DEAD(s)			((s)->references == 0)
- 
-+#undef SO_BSDCOMPAT
-+
- static void
- manager_log(isc_socketmgr_t *sockmgr,
- 	    isc_logcategory_t *category, isc_logmodule_t *module, int level,
diff --git a/main/bind/named.initd b/main/bind/named.initd
index cad932c68d2..c7a8bb1a873 100644
--- a/main/bind/named.initd
+++ b/main/bind/named.initd
@@ -13,7 +13,7 @@ depend() {
 
 _get_pidfile() {
 	[ -n "${PIDFILE}" ] || PIDFILE=$(\
-		/usr/sbin/named-checkconf -p ${NAMED_CONF} | grep 'pid-file' | cut -d\" -f2)
+		/usr/bin/named-checkconf -p ${NAMED_CONF} | grep 'pid-file' | cut -d\" -f2)
 	[ -z "${PIDFILE}" ] && PIDFILE=/var/run/named/named.pid
 }
 
@@ -25,7 +25,7 @@ checkconfig() {
 		return 1
 	fi
 
-	/usr/sbin/named-checkconf ${NAMED_CONF} || {
+	/usr/bin/named-checkconf ${NAMED_CONF} || {
 		eerror "named-checkconf failed! Please fix your config first."
 		return 1
 	}
@@ -35,7 +35,7 @@ checkconfig() {
 
 checkzones() {
 	ebegin "Checking named configuration and zones"
-	/usr/sbin/named-checkconf -z -j ${NAMED_CONF}
+	/usr/bin/named-checkconf -z -j ${NAMED_CONF}
 	eend $?
 }
 
diff --git a/main/binutils/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch b/main/binutils/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
new file mode 100644
index 00000000000..6e1fa7731c9
--- /dev/null
+++ b/main/binutils/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
@@ -0,0 +1,55 @@
+From bbf05b742fde518fb97c789b043fe0d3aaf549f0 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Tue, 21 Sep 2021 14:53:13 +0000
+Subject: [PATCH] Revert "PR25882, .gnu.attributes are not checked for shared
+ libraries"
+
+This revert is needed to avoid wrongly tagging objects with the incompatible
+IBM long double ABI, which is not supported by musl and will result in
+linking errors if used.
+
+This reverts commit a8acd6eeb6dc2cc5460ece90f90ebe36b56b20ba.
+---
+ bfd/elf32-tic6x.c |  3 ---
+ ld/ldlang.c       | 10 ++++------
+ 2 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
+index 5754f3cb860..3ad1d612749 100644
+--- a/bfd/elf32-tic6x.c
++++ b/bfd/elf32-tic6x.c
+@@ -3735,9 +3735,6 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
+ 
+ 	case Tag_ABI_PIC:
+ 	case Tag_ABI_PID:
+-	  /* Don't transfer these tags from dynamic objects.  */
+-	  if ((ibfd->flags & DYNAMIC) != 0)
+-	    continue;
+ 	  if (out_attr[i].i > in_attr[i].i)
+ 	    out_attr[i].i = in_attr[i].i;
+ 	  break;
+diff --git a/ld/ldlang.c b/ld/ldlang.c
+index 37b64c89ee1..f13beaef9d9 100644
+--- a/ld/ldlang.c
++++ b/ld/ldlang.c
+@@ -7071,13 +7071,11 @@ lang_check (void)
+ 		   bfd_printable_name (input_bfd), input_bfd,
+ 		   bfd_printable_name (link_info.output_bfd));
+ 	}
+-
+-      /* If the input bfd has no contents, it shouldn't set the
+-	 private data of the output bfd.  */
+-      else if (!file->flags.just_syms
+-	       && ((input_bfd->flags & DYNAMIC) != 0
+-		   || bfd_count_sections (input_bfd) != 0))
++      else if (bfd_count_sections (input_bfd))
+ 	{
++	  /* If the input bfd has no contents, it shouldn't set the
++	     private data of the output bfd.  */
++
+ 	  bfd_error_handler_type pfn = NULL;
+ 
+ 	  /* If we aren't supposed to warn about mismatched input
+-- 
+2.33.0
+
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index 58204445240..e0c32f5079d 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -1,21 +1,31 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=binutils
-pkgver=2.34
+pkgver=2.42
 pkgrel=0
 pkgdesc="Tools necessary to build programs"
 url="https://www.gnu.org/software/binutils/"
 makedepends_build="bison flex texinfo"
 makedepends_host="zlib-dev"
-makedepends="$makedepends_build $makedepends_host"
 arch="all"
-license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-gold"
-source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2
+license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
+	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 	binutils-ld-fix-static-linking.patch
-	gold-mips.patch
-	ld-bfd-mips.patch
+	LoongArch-Modify-inconsistent-behavior-of-ld-with-un.patch
 	"
 builddir="$srcdir/$pkgname-$pkgver"
+options="!check"
+
+if [ -z "$BOOTSTRAP" ]; then
+	makedepends_host="$makedepends_host jansson-dev zstd-dev"
+	_noboot_configure="--enable-jansson --with-zstd"
+fi
+
+if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ] && [ "$CTARGET_ARCH" != "loongarch64" ]; then
+	subpackages="$subpackages $pkgname-gold"
+fi
 
 if [ "$CHOST" != "$CTARGET" ]; then
 	pkgname="$pkgname-$CTARGET_ARCH"
@@ -24,34 +34,51 @@ if [ "$CHOST" != "$CTARGET" ]; then
 fi
 
 # secfixes:
+#   2.40-r10:
+#     - CVE-2023-1972
+#   2.40-r0:
+#     - CVE-2023-1579
+#   2.39-r2:
+#     - CVE-2022-38533
+#   2.39-r0:
+#     - CVE-2022-38126
+#   2.35.2-r1:
+#     - CVE-2021-3487
 #   2.32-r0:
-#   - CVE-2018-19931
-#   - CVE-2018-19932
-#   - CVE-2018-20002
-#   - CVE-2018-20712
+#     - CVE-2018-19931
+#     - CVE-2018-19932
+#     - CVE-2018-20002
+#     - CVE-2018-20712
 #   2.28-r1:
-#   - CVE-2017-7614
+#     - CVE-2017-7614
 
 build() {
 	local _sysroot=/
 	local _cross_configure="--enable-install-libiberty --enable-shared"
 	local _arch_configure=""
+	local _gold_configure="--disable-gold"
+	local _plugin_configure="--enable-plugins"
 
 	if [ "$CHOST" != "$CTARGET" ]; then
 		_sysroot="$CBUILDROOT"
 		_cross_configure="--disable-install-libiberty"
+		_plugin_configure="--disable-plugins"
+	fi
+
+	if [ "$CHOST" = "$CBUILD" ] && [ "$CBUILD" = "$CTARGET" ] && [ "$CTARGET_ARCH" != "riscv64" ] && [ "$CTARGET_ARCH" != "loongarch64" ]; then
+		_gold_configure="--enable-gold"
 	fi
 
 	if [ "$CTARGET_ARCH" = "x86_64" ]; then
 		_arch_configure="--enable-targets=x86_64-pep"
 	fi
 
-	case "$CTARGET_ARCH" in
-	mips*)  _hash_style_configure="--enable-default-hash-style=sysv" ;;
-	*)      _hash_style_configure="--enable-default-hash-style=gnu"	;;
-	esac
+	if [ "$CTARGET_ARCH" = "riscv64" ] || [ "$CTARGET_ARCH" = "loongarch64" ]; then
+		_gold_configure="--disable-gold"
+	fi
 
-	cd "$builddir"
+	CFLAGS="$CFLAGS -O2" \
+	CXXFLAGS="$CXXFLAGS -O2" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -61,26 +88,34 @@ build() {
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
+		--sysconfdir=/etc \
+		$_arch_configure \
+		$_cross_configure \
+		$_gold_configure \
+		$_plugin_configure \
+		$_noboot_configure \
+		--disable-gdb \
+		--disable-gprofng \
 		--disable-multilib \
-		--enable-ld=default \
-		--enable-gold=yes \
+		--disable-nls \
+		--disable-werror \
 		--enable-64-bit-bfd \
-		--enable-plugins \
-		--enable-relro \
+		--enable-colored-disassembly \
+		--enable-default-execstack=no \
+		--enable-default-hash-style=gnu \
 		--enable-deterministic-archives \
-		$_cross_configure \
-		$_arch_configure \
-		$_hash_style_configure \
-		--with-pic \
-		--disable-werror \
-		--disable-nls \
+		--enable-ld=default \
+		--enable-new-dtags \
+		--enable-relro \
+		--enable-threads \
+		--with-bugurl="https://gitlab.alpinelinux.org/alpine/aports/-/issues" \
 		--with-mmap \
+		--with-pic \
 		--with-system-zlib
 	make
 }
 
 package() {
-	cd "$builddir"
 	make install DESTDIR="$pkgdir"
 	if [ -d "$pkgdir"/usr/lib64 ]; then
 		mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib/
@@ -89,30 +124,24 @@ package() {
 	if [ "$CHOST" != "$CTARGET" ]; then
 		# creating cross tools: remove any files that would conflict
 		# with the native tools, or other cross tools
-		rm -r "$pkgdir"/usr/share
+		rm -r "${pkgdir:?}"/usr/share
 		rm -f "$pkgdir"/usr/lib/libiberty.a
+		rm -r "${pkgdir:?}"/usr/lib/bfd-plugins
 	fi
 }
 
-libs() {
-	pkgdesc="Runtime libraries from binutils - libbfd and libopcodes"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so "$subpkgdir"/usr/lib/
-}
-
 gold() {
 	pkgdesc="GNU binutils - gold linker"
 
 	if [ -e "$pkgdir"/usr/bin/ld.gold ]; then
-		mkdir -p "$subpkgdir"/usr/bin
-		mv "$pkgdir"/usr/bin/ld.gold "$subpkgdir"/usr/bin
+		amove usr/bin/ld.gold
 	fi
-	mkdir -p "$subpkgdir"/usr/$CTARGET/bin
-	mv "$pkgdir"/usr/$CTARGET/bin/ld.gold "$subpkgdir"/usr/$CTARGET/bin/ld.gold
+	amove usr/$CTARGET/bin/ld.gold
 }
 
-sha512sums="f47e7304e102c7bbc97958a08093e27796b9051d1567ce4fbb723d39ef3e29efa325ee14a1bdcc462a925a7f9bbbc9aee28294c6dc23850f371030f3835a8067  binutils-2.34.tar.bz2
+sha512sums="
+155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6  binutils-2.42.tar.xz
+70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
-f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488ea137f03e32d62efc878d95f018f836f8cec870bc448556f  gold-mips.patch
-314d2ef9071c89940aa6c8118e8a1e2f191a5d0a4bf596da1ad9cc84f884d8bc7dea8bd7b9fc3f8f1bddd3fd41c6eb017e1e804044b3bf084df1ed9e6e095e2d  ld-bfd-mips.patch"
+f901833707dbe38c6519df91f03c51886e7f11aabd0c2dbe869eb6ffedb38201c020a6d34b3fa8aaa7d195349a0dd934709ca41109047348a7f303d2a8bf4f75  LoongArch-Modify-inconsistent-behavior-of-ld-with-un.patch
+"
diff --git a/main/binutils/LoongArch-Modify-inconsistent-behavior-of-ld-with-un.patch b/main/binutils/LoongArch-Modify-inconsistent-behavior-of-ld-with-un.patch
new file mode 100644
index 00000000000..2b2d75ef435
--- /dev/null
+++ b/main/binutils/LoongArch-Modify-inconsistent-behavior-of-ld-with-un.patch
@@ -0,0 +1,60 @@
+From 268391acb9fa956bad24533e2cc0d1459dea1b3d Mon Sep 17 00:00:00 2001
+From: ticat_fp <fanpeng@loongson.cn>
+Date: Mon, 26 Feb 2024 11:11:35 +0800
+Subject: [PATCH] LoongArch: Modify inconsistent behavior of ld with
+ --unresolved-symbols=ignore-all
+
+Remove duplicated check when producing executable files that reference external symbols
+defined in other files. RELOC_FOR_GLOBAL_SYMBOL will check it.
+
+Testcase is:
+resolv.c:
+int main(int argc, char *argv[]) {
+    return argc;
+}
+
+t.c:
+
+extern const struct my_struct ms1;
+static const struct my_struct *ms = &ms1;
+
+t.h:
+typedef struct my_struct {
+    char *str;
+    int i;
+} my_struct;
+
+Compiling and linking command with:
+gcc t.c -c ; gcc resolv.c -c
+gcc resolv.o t.o -o resolv -Wl,--unresolved-symbols=ignore-all
+
+Got error as:
+~/install/usr/bin/ld: t.o:(.data.rel+0x0): undefined reference to `ms1'
+collect2: error: ld returned 1 exit status
+---
+ bfd/elfnn-loongarch.c | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c
+index 1b5009e13b2..e96e0f53608 100644
+--- a/bfd/elfnn-loongarch.c
++++ b/bfd/elfnn-loongarch.c
+@@ -2868,14 +2868,7 @@ loongarch_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
+ 	      else if (resolved_dynly)
+ 		{
+ 		  if (h->dynindx == -1)
+-		    {
+-		      if (h->root.type == bfd_link_hash_undefined)
+-			(*info->callbacks->undefined_symbol)
+-			  (info, name, input_bfd, input_section,
+-			   rel->r_offset, true);
+-
+-		      outrel.r_info = ELFNN_R_INFO (0, r_type);
+-		    }
++		    outrel.r_info = ELFNN_R_INFO (0, r_type);
+ 		  else
+ 		    outrel.r_info = ELFNN_R_INFO (h->dynindx, r_type);
+ 
+-- 
+2.27.0
+
diff --git a/main/binutils/gold-mips.patch b/main/binutils/gold-mips.patch
deleted file mode 100644
index 291a2aae6a0..00000000000
--- a/main/binutils/gold-mips.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-# DP: Fix gold on mips64 targets.
-
-gold/
-
-2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
-
- 
---- a/gold/configure.tgt
-+++ b/gold/configure.tgt
-@@ -153,6 +153,13 @@ aarch64*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*el*-*-*|mips*64*le*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS_RS3_LE
-+ targ_size=64
-+ targ_big_endian=false
-+ targ_extra_big_endian=true
-+ ;;
- mips*el*-*-*|mips*le*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS_RS3_LE
-@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
-  targ_big_endian=false
-  targ_extra_big_endian=true
-  ;;
-+mips*64*-*-*)
-+ targ_obj=mips
-+ targ_machine=EM_MIPS
-+ targ_size=64
-+ targ_big_endian=true
-+ targ_extra_big_endian=false
-+ ;;
- mips*-*-*)
-  targ_obj=mips
-  targ_machine=EM_MIPS
diff --git a/main/binutils/ld-bfd-mips.patch b/main/binutils/ld-bfd-mips.patch
deleted file mode 100644
index 2991c885712..00000000000
--- a/main/binutils/ld-bfd-mips.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./ld/configure.tgt.orig
-+++ ./ld/configure.tgt
-@@ -541,12 +541,12 @@
- 			;;
- mips*-*-windiss)	targ_emul=elf32mipswindiss
- 			;;
--mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
--			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
-+mips64*el-*-linux-*)	targ_emul=elf64ltsmip
-+			targ_extra_emuls="elf32ltsmipn32 elf32btsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
--mips64*-*-linux-*)	targ_emul=elf32btsmipn32
--			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
-+mips64*-*-linux-*)	targ_emul=elf64btsmip
-+			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
- mips*el-*-linux-*)	targ_emul=elf32ltsmip
diff --git a/main/bison/APKBUILD b/main/bison/APKBUILD
index c7e3e7cb3e5..f3424ec3fc1 100644
--- a/main/bison/APKBUILD
+++ b/main/bison/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bison
-pkgver=3.5.3
-pkgrel=0
+pkgver=3.8.2
+pkgrel=1
 pkgdesc="The GNU general-purpose parser generator"
 arch="all"
 license="GPL-3.0-or-later"
@@ -14,7 +14,16 @@ checkdepends="bison flex"
 source="https://ftp.gnu.org/gnu/bison/bison-$pkgver.tar.xz"
 subpackages="$pkgname-doc"
 
+# secfixes:
+#   3.7.2-r0:
+#     - CVE-2020-24240
+#     - CVE-2020-24979
+#     - CVE-2020-24980
+
 build() {
+	# work around temporary failure for armhf
+	CFLAGS="$CFLAGS -O2" \
+	CXXFLAGS="$CXXFLAGS -O2" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,11 +31,11 @@ build() {
 		--datadir=/usr/share \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man
-	make -j1
+	make
 }
 
 check() {
-	make -j1 check
+	make check
 }
 
 package() {
@@ -35,4 +44,6 @@ package() {
 	rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
 }
 
-sha512sums="888a1e8d4aeda3ff2d7d0a3a88b63bbfe89bdb718cc64d48c244e05fe6c6cd39526fd88143db379fef3071cf6c2dc2ab2fd69834c24acb23ed5f739584ff6308  bison-3.5.3.tar.xz"
+sha512sums="
+d4d23af6671406e97257892f90651b67f2ab95219831372be032190b7156c10a3435d457857e677445df8b2327aacccc15344acbbc3808a6f332a93cce23b444  bison-3.8.2.tar.xz
+"
diff --git a/main/bitlbee/APKBUILD b/main/bitlbee/APKBUILD
deleted file mode 100644
index ad8eab2455e..00000000000
--- a/main/bitlbee/APKBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Contributor: Peter Bui <pnutzh4x0r@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-pkgname=bitlbee
-pkgver=3.6
-pkgrel=0
-pkgdesc="An IRC to other chat networks gateway"
-url="https://www.bitlbee.org/"
-arch="all"
-license="GPL-2.0-or-later"
-makedepends="python3 glib-dev gnutls-dev libotr-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-otr $pkgname-openrc"
-source="http://get.bitlbee.org/src/bitlbee-$pkgver.tar.gz
-	$pkgname.initd
-	$pkgname.confd
-	"
-
-build() {
-	cd "$builddir"
-	PYTHON=python3 \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--otr=plugin \
-		--prefix=/usr \
-		--etcdir=/etc/bitlbee \
-		--ssl=gnutls # https://bugs.bitlbee.org/ticket/886
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install install-etc install-dev
-
-	install -m755 -D "$srcdir"/$pkgname.initd \
-		"$pkgdir"/etc/init.d/$pkgname
-	install -m644 -D "$srcdir"/$pkgname.confd \
-		"$pkgdir"/etc/conf.d/$pkgname
-	mkdir -p "$pkgdir"/var/lib/bitlbee
-	chown nobody:nobody "$pkgdir"/var/lib/bitlbee
-}
-
-otr() {
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/bitlbee "$subpkgdir"/usr/lib
-}
-
-sha512sums="ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d  bitlbee-3.6.tar.gz
-300c3445b9be6dac41bbd6d3a3ef5b871668743d4ea68dd779962d7af941cdaac61cb7c61e7ab2610bffac6dd9accc7ef9590593aef45e6930e2f49abaf9bf40  bitlbee.initd
-d86e85eecafe080d331034cfc0b1f38d8e5582772d1e1d7175d14b396e1ce3dfd1b94e8ee97ef54b85181b3eacf39bacd378a1da5014515ed909554708907991  bitlbee.confd"
diff --git a/main/bitlbee/bitlbee.confd b/main/bitlbee/bitlbee.confd
deleted file mode 100644
index 99f308cd97c..00000000000
--- a/main/bitlbee/bitlbee.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Sample conf.d file for alpine linux
-
-#
-# Specify daemon options here.
-#
-
-PORT="6667"
-OPTS="-F"
-
diff --git a/main/bitlbee/bitlbee.initd b/main/bitlbee/bitlbee.initd
deleted file mode 100644
index 79a439393d0..00000000000
--- a/main/bitlbee/bitlbee.initd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-
-name=bitlbee
-daemon=/usr/sbin/$name
-
-. /etc/conf.d/$name
-
-depend() {
-	need net
-	after firewall
-}
-
-start() {
-	ebegin "Starting ${name}"
-		start-stop-daemon --start --quiet \
-			--pidfile /var/run/${name}.pid \
-			--user nobody:nobody \
-			--exec ${daemon} -- ${PORT} ${OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${name}"
-		start-stop-daemon --stop --signal 9 --quiet \
-			--pidfile /var/run/$name.pid  \
-			--exec ${daemon}
-	eend $?
-}
-
diff --git a/main/bluez-firmware/APKBUILD b/main/bluez-firmware/APKBUILD
index d0e3d4a272d..b52cb5c15e8 100644
--- a/main/bluez-firmware/APKBUILD
+++ b/main/bluez-firmware/APKBUILD
@@ -1,27 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bluez-firmware
 pkgver=1.2
-pkgrel=0
+pkgrel=2
 pkgdesc="Firmware for Broadcom BCM203x Blutonium devices"
-url="http://www.bluez.org/"
+url="https://www.bluez.org/"
 arch="all"
-license="GPL-2.0"
-depends=""
-makedepends=""
-source="http://bluez.sf.net/download/$pkgname-$pkgver.tar.gz"
+license="GPL-2.0-or-later"
+source="https://distfiles.alpinelinux.org/distfiles/edge/bluez-firmware-$pkgver.tar.gz"
+options="!check"
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--libdir=/lib \
-		|| return 1
-	make || return 1
+		--libdir=/lib
+	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
-sha512sums="15db2f9d38a496882e4cc3754af1e58aa99e1b849f2066c541d76c66a8ffdc5532799fe1fd473cfc158bf5ea86a46687716cbcf83c6dcac0ce66d97d679648dd  bluez-firmware-1.2.tar.gz"
+
+sha512sums="
+15db2f9d38a496882e4cc3754af1e58aa99e1b849f2066c541d76c66a8ffdc5532799fe1fd473cfc158bf5ea86a46687716cbcf83c6dcac0ce66d97d679648dd  bluez-firmware-1.2.tar.gz
+"
diff --git a/main/bluez-headers/APKBUILD b/main/bluez-headers/APKBUILD
new file mode 100644
index 00000000000..1741f6517a9
--- /dev/null
+++ b/main/bluez-headers/APKBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=bluez-headers
+pkgver=5.73
+pkgrel=0
+pkgdesc="Bluez development headers"
+url="https://www.bluez.org/"
+arch="noarch"
+license="GPL-2.0-or-later"
+depends="!bluez-dev"
+source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz"
+builddir="$srcdir/bluez-$pkgver"
+options="!check" # just headers
+
+package() {
+	local headers="
+		bluetooth
+		bnep
+		cmtp
+		hci
+		hci_lib
+		hidp
+		l2cap
+		rfcomm
+		sco
+		sdp
+		sdp_lib
+		"
+	for header in $headers; do
+		install -Dm644 ./lib/$header.h -t "$pkgdir"/usr/include/bluetooth
+	done
+}
+
+sha512sums="
+20090da036d3d614706b14a757b02acf138859d8f0476aa7f68d57635dfb3632ce7d8bb3456320904d72333d1314a5fe14dcb8ece307e6d31ce6d2d516de25e8  bluez-5.73.tar.xz
+"
diff --git a/main/bluez/004-Move-the-43xx-firmware-into-lib-firmware.patch b/main/bluez/004-Move-the-43xx-firmware-into-lib-firmware.patch
index 80b052d5b72..67410c76f61 100644
--- a/main/bluez/004-Move-the-43xx-firmware-into-lib-firmware.patch
+++ b/main/bluez/004-Move-the-43xx-firmware-into-lib-firmware.patch
@@ -1,20 +1,13 @@
-From 76681284b0ea49852041fdb97a35175089a08781 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Tue, 23 Feb 2016 17:52:29 +0000
-Subject: [PATCH 4/4] Move the 43xx firmware into /lib/firmware
-
----
- tools/hciattach_bcm43xx.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/tools/hciattach_bcm43xx.c
-+++ b/tools/hciattach_bcm43xx.c
-@@ -43,7 +43,7 @@
- #include "hciattach.h"
+diff --git a/tools/hciattach.h b/tools/hciattach.h
+index dfa4c1e..c21dbda 100644
+--- a/tools/hciattach.h
++++ b/tools/hciattach.h
+@@ -41,7 +41,7 @@
+ #define HCI_UART_VND_DETECT	5
  
  #ifndef FIRMWARE_DIR
 -#define FIRMWARE_DIR "/etc/firmware"
-+#define FIRMWARE_DIR "/lib/firmware/brcm"
++#define FIRMWARE_DIR "/lib/firmware"
  #endif
  
- #define FW_EXT ".hcd"
+ int read_hci_event(int fd, unsigned char *buf, int size);
diff --git a/main/bluez/005-hostname-Use-phone-class-for-handhelds.patch b/main/bluez/005-hostname-Use-phone-class-for-handhelds.patch
new file mode 100644
index 00000000000..c5ad4bfbcb7
--- /dev/null
+++ b/main/bluez/005-hostname-Use-phone-class-for-handhelds.patch
@@ -0,0 +1,51 @@
+From 7960816020bbd94b1c2f0ff75f73b25927717875 Mon Sep 17 00:00:00 2001
+From: Dylan Van Assche <me@dylanvanassche.be>
+Date: Fri, 11 Jun 2021 20:18:44 +0200
+Subject: [PATCH] hostname: Use phone class for handhelds
+
+Advertise devices with chassis type 'handheld'
+as phone instead of computer.
+---
+ plugins/hostname.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/plugins/hostname.c b/plugins/hostname.c
+index 1a9513adb..85c342d36 100644
+--- a/plugins/hostname.c
++++ b/plugins/hostname.c
+@@ -31,6 +31,7 @@
+ 
+ #define MAJOR_CLASS_MISCELLANEOUS	0x00
+ #define MAJOR_CLASS_COMPUTER		0x01
++#define MAJOR_CLASS_PHONE		0x02
+ 
+ #define MINOR_CLASS_UNCATEGORIZED	0x00
+ #define MINOR_CLASS_DESKTOP		0x01
+@@ -40,6 +41,7 @@
+ #define MINOR_CLASS_PALM_SIZED		0x05
+ #define MINOR_CLASS_WEARABLE		0x06
+ #define MINOR_CLASS_TABLET		0x07
++#define MINOR_CLASS_SMARTPHONE		0x03
+ 
+ static uint8_t major_class = MAJOR_CLASS_MISCELLANEOUS;
+ static uint8_t minor_class = MINOR_CLASS_UNCATEGORIZED;
+@@ -106,11 +108,11 @@ static const struct {
+ 	uint8_t major_class;
+ 	uint8_t minor_class;
+ } chassis_table[] = {
+-	{ "desktop",  MAJOR_CLASS_COMPUTER, MINOR_CLASS_DESKTOP  },
+-	{ "server",   MAJOR_CLASS_COMPUTER, MINOR_CLASS_SERVER   },
+-	{ "laptop",   MAJOR_CLASS_COMPUTER, MINOR_CLASS_LAPTOP   },
+-	{ "handset",  MAJOR_CLASS_COMPUTER, MINOR_CLASS_HANDHELD },
+-	{ "tablet",   MAJOR_CLASS_COMPUTER, MINOR_CLASS_TABLET   },
++	{ "desktop",  MAJOR_CLASS_COMPUTER, MINOR_CLASS_DESKTOP    },
++	{ "server",   MAJOR_CLASS_COMPUTER, MINOR_CLASS_SERVER     },
++	{ "laptop",   MAJOR_CLASS_COMPUTER, MINOR_CLASS_LAPTOP     },
++	{ "handset",  MAJOR_CLASS_PHONE,    MINOR_CLASS_SMARTPHONE },
++	{ "tablet",   MAJOR_CLASS_COMPUTER, MINOR_CLASS_TABLET     },
+ 	{ }
+ };
+ 
+-- 
+2.31.1
+
diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD
index 6db09ff1da3..8c320b7747a 100644
--- a/main/bluez/APKBUILD
+++ b/main/bluez/APKBUILD
@@ -1,53 +1,66 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bluez
-pkgver=5.54
-pkgrel=1
+# Make sure to also update the obexd-enhanced package if updating bluez
+pkgver=5.73
+pkgrel=0
 pkgdesc="Tools for the Bluetooth protocol stack"
-url="http://www.bluez.org/"
+url="https://www.bluez.org/"
 arch="all"
-license="GPL-2.0-or-later"
-depends="consolekit2 dbus"
+license="GPL-2.0-or-later AND BSD-2-Clause AND MIT"
+depends="dbus"
 replaces="udev"
-makedepends="dbus-dev libusb-compat-dev eudev-dev json-c-dev
-	libical-dev readline-dev glib-dev linux-headers
-	autoconf automake libtool ell-dev"
+makedepends="
+	dbus-dev
+	ell-dev
+	eudev-dev
+	glib-dev
+	json-c-dev
+	libical-dev
+	libtool
+	linux-headers
+	py3-docutils
+	py3-pygments
+	readline-dev
+	"
 subpackages="
+	$pkgname-dbg
 	$pkgname-dev
 	$pkgname-doc
 	$pkgname-libs
-	$pkgname-bccmd
+	$pkgname-openrc
 	$pkgname-btmgmt
 	$pkgname-btmon
 	$pkgname-cups
 	$pkgname-deprecated
+	$pkgname-deprecated-openrc
 	$pkgname-hid2hci
 	$pkgname-meshctl
 	$pkgname-obexd
-	$pkgname-zsh-completion:zshcomp:noarch
+	$pkgname-zsh-completion
 	"
 source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz
 	bluetooth.initd
 	rfcomm.initd
 	rfcomm.confd
+	org.bluez.obex.service
+	mpris-proxy.desktop
 	001-bcm43xx-Add-bcm43xx-3wire-variant.patch
 	002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
 	003-Increase-firmware-load-timeout-to-30s.patch
 	004-Move-the-43xx-firmware-into-lib-firmware.patch
+	005-hostname-Use-phone-class-for-handhelds.patch
 	disable-lock-test.patch
 	fix-endianness.patch
-	musl.patch
+	test-mesh-crypto.patch
 	"
 
-case "$CARCH" in
-# crypto tests assume little-endian
-mips*)	options="!check";;
-esac
-
 # secfixes:
 #   5.54-r0:
 #     - CVE-2020-0556
 
 build() {
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -59,7 +72,10 @@ build() {
 		--disable-systemd \
 		--enable-library \
 		--enable-deprecated \
-		--enable-mesh
+		--enable-hid2hci \
+		--enable-mesh \
+		--enable-sixaxis \
+		--with-dbusconfdir=/usr/share
 	make
 }
 
@@ -68,88 +84,111 @@ check() {
 }
 
 package() {
-	make install DESTDIR="$pkgdir"
+	make DESTDIR="$pkgdir" install install-pluginLTLIBRARIES
+
 	install -D -m644 src/main.conf "$pkgdir"/etc/bluetooth/main.conf
 
 	install -Dm755 "$srcdir"/bluetooth.initd "$pkgdir"/etc/init.d/bluetooth
 	install -Dm755 "$srcdir"/rfcomm.initd "$pkgdir"/etc/init.d/rfcomm
 	install -Dm644 "$srcdir"/rfcomm.confd "$pkgdir"/etc/conf.d/rfcomm
+
 	install -Dm755 test/simple-agent "$pkgdir"/usr/bin/bluez-simple-agent
-}
+	install -Dm755 tools/btmgmt -t "$pkgdir"/usr/bin/
+	install -Dm755 attrib/gatttool -t "$pkgdir"/usr/bin/
+
+	install -Dm644 "$srcdir"/org.bluez.obex.service \
+		"$pkgdir"/usr/share/dbus-1/services/org.bluez.obex.service
 
-bccmd() {
-	pkgdesc="Bluez utility for the CSR BCCMD interface"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/bccmd "$subpkgdir"/usr/bin/
+	# Autostart mpris-proxy to pass through MPRIS control over BlueZ
+	install -Dm644 "$srcdir"/mpris-proxy.desktop -t "$pkgdir"/etc/xdg/autostart/
 }
 
 btmgmt() {
 	pkgdesc="Bluez tool for the Bluetooth Management API"
-	install -Dm755 "$builddir"/tools/btmgmt "$subpkgdir"/usr/bin/btmgmt
+	amove usr/bin/btmgmt
 }
 
 btmon() {
 	pkgdesc="Bluez bluetooth monitor"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/btmon "$subpkgdir"/usr/bin/
+	amove usr/bin/btmon
 }
 
 cups() {
 	pkgdesc="Bluez backend for CUPS"
-	mkdir -p "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/cups "$subpkgdir"/usr/lib/
+	amove usr/lib/cups
 }
 
 hid2hci() {
 	pkgdesc="Put HID proxying bluetooth HCI's into HCI mode"
 	replaces="bluez"
-	mkdir -p "$subpkgdir"
-	mv "$pkgdir"/lib "$subpkgdir"/
+	amove /lib
 }
 
 deprecated() {
 	pkgdesc="Deprecated bluetooth tools"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/ciptool \
-		"$builddir"/attrib/gatttool \
-		"$pkgdir"/usr/bin/hciattach \
-		"$pkgdir"/usr/bin/hciconfig \
-		"$pkgdir"/usr/bin/hcidump \
-		"$pkgdir"/usr/bin/hcitool \
-		"$pkgdir"/usr/bin/rfcomm \
-		"$pkgdir"/usr/bin/sdptool \
-		"$subpkgdir"/usr/bin/
+	amove \
+		usr/bin/ciptool \
+		usr/bin/gatttool \
+		usr/bin/hciattach \
+		usr/bin/hciconfig \
+		usr/bin/hcidump \
+		usr/bin/hcitool \
+		usr/bin/rfcomm \
+		usr/bin/sdptool
 }
 
 meshctl() {
 	pkgdesc="Bluez tool for interacting with bluetooth mesh networks"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/meshctl "$subpkgdir"/usr/bin/
+	amove usr/bin/meshctl
 }
 
 obexd() {
 	pkgdesc="Bluez OBEX daemon"
-	mkdir -p "$subpkgdir"/usr/lib/bluetooth
-	mv "$pkgdir"/usr/lib/bluetooth/obexd "$subpkgdir"/usr/lib/bluetooth
+	provides="obexd"
+	provider_priority=100
+	amove \
+		usr/lib/bluetooth/obexd \
+		usr/share/dbus-1/services/org.bluez.obex.service
 }
 
-zshcomp() {
-	depends=""
-	pkgdesc="Zsh compltions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel zsh"
-
-	install -Dm644 "$pkgdir"/usr/share/zsh/site-functions/_bluetoothctl \
-			"$subpkgdir"/usr/share/zsh/site-functions/_bluetoothctl
+openrc() {
+	case "$subpkgname" in
+		"$pkgname"-deprecated-openrc)
+			# Make this the same as deprecated()
+			# the default_openrc function will add
+			# the correct (OpenRC init scripts) suffix
+			pkgdesc="Deprecated bluez tools"
+			;;
+	esac
+
+	default_openrc
+
+	case "$subpkgname" in
+		"$pkgname"-openrc)
+			# Move the rfcomm .initd and .confd back to the
+			# mainpkg so the -deprecated-openrc subpackage
+			# can move them later
+			mkdir -p "$pkgdir"/etc/init.d "$pkgdir"/etc/conf.d
+			mv "$subpkgdir"/etc/init.d/rfcomm "$pkgdir"/etc/init.d
+			mv "$subpkgdir"/etc/conf.d/rfcomm "$pkgdir"/etc/conf.d
+			rmdir "$subpkgdir"/etc/conf.d # Only rfcomm was here
+			;;
+	esac
 }
 
-sha512sums="e19d15d3a478a7af47c1921c8827843492e38787b1182152155bd3d8ad9e1d8ee25c5fda1f24e38c54ebbf946b09fe75007dca9a24d1c35f73303558e558dcbe  bluez-5.54.tar.xz
-fc43c78ed248ea412529eed5ae8bb47bacca9bf5b3b10de121ddd4e792c85893561a88be4aa2c6318106e5d2146a721445152d44fa60ca257ca0b4eb87318c1e  bluetooth.initd
+sha512sums="
+20090da036d3d614706b14a757b02acf138859d8f0476aa7f68d57635dfb3632ce7d8bb3456320904d72333d1314a5fe14dcb8ece307e6d31ce6d2d516de25e8  bluez-5.73.tar.xz
+5442f4f489718e51c50611c143803f2cc99e540b55a72af20ea2921b256774a6c7c5e273f2bedb745753d8c67d3fb7c938750fb48feac7460b32bd1cca029a28  bluetooth.initd
 8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac  rfcomm.initd
 a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb  rfcomm.confd
+d6766a4992ed4141569d6d82a802a771a5cb4c08873bfb0fdbedeea4d738bf9b56d9e0452ec19b7635418b1af4ab9b1735692043d629cbed3ce0eda6f51e1c6f  org.bluez.obex.service
+72f9bc6cafe910ed7d105d4f3a537b16cd897622b2391ea545e6a302fcce2ed79e490e2841c6290aa1290489870a67638d71b0de5bc57f9d650e2248d9e4f0a4  mpris-proxy.desktop
 73202915fda01d420b2864da77b1c25af5a55c815e9be6546400a0940bfb6097d83322790bc22a80ec0fcd557144fdd1877e243a79285a7f040ff96ba3600b94  001-bcm43xx-Add-bcm43xx-3wire-variant.patch
 d5fd1c962bd846eaa6fff879bab85f753eb367d514f82d133b5d3242e1da989af5eddd942c60a87d5b67783e060f91bfa0f74fb1e8e6699cdee6e5bbe6a431ea  002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
 784e9644c8de4e2693e2eeed988a245608b8cb14e1fc0dff8795c60c527b2e8d0c87862cfbfd6b850b47ae80cdf993a5ed3f477078ea1068fd7374899c7a1a77  003-Increase-firmware-load-timeout-to-30s.patch
-42ac04044a8c66e07487598b3a75ef52efc32999ebce4e7c63f6198e2f603f4a1442e74600e43a0938cb4f52d4db0298aa99050b18144b84990cda71748e9de5  004-Move-the-43xx-firmware-into-lib-firmware.patch
+6d864d893aaf08d7a04f5cb27a6b2767c361cd41e479f27ed84d9fbbd2677298c15e31161a614af098df8faf3da54b71cf315fe8e9a9a2f671e4720c7b8b457b  004-Move-the-43xx-firmware-into-lib-firmware.patch
+ac635f9bca0e983835940572eb1b96ad70cf60fb84d5b0fde38c76ea6d1b13ef7d9adf81468b9fed779c890ab69dd5dfabf21970bff018466115c424668b82fb  005-hostname-Use-phone-class-for-handhelds.patch
 04c4889372c8e790bb338dde7ffa76dc32fcf7370025c71b9184fcf17fd01ade4a6613d84d648303af3bbc54043ad489f29fc0cd4679ec8c9029dcb846d7e026  disable-lock-test.patch
-118d55183860f395fc4bdc93efffb13902ebf7388cad722b9061cd2860d404333e500af521741c3d92c0f8a161f6810348fbeb6682e49c372383f417aed8c76a  fix-endianness.patch
-641e425333d269833eed624edec0e29cba04bb0ff6570f6afda178a164fc2bb77456fa88957fe49f36000d3601ac00bb7ba089400977c1577e9c226e74baa3d6  musl.patch"
+2f54da5e77893d1d8b7164ddac5561a9e536c2b93b1d33dcbd97e74c0fd45588f1f50dc1d9d8519297871e3a376948082a2e45e27d823ec81cdedecd8dba3f0c  fix-endianness.patch
+b5d6f7d2df755a9b8cffaeef13d232ba1bab27544bc59e2299bbd6a8017768cf7781f3ca65e430a149a26f0b30ae74b8510529ce161705bb6f41ae512cc2dbac  test-mesh-crypto.patch
+"
diff --git a/main/bluez/bluetooth.initd b/main/bluez/bluetooth.initd
index ee40153ec88..4fb1c0bfbb7 100644
--- a/main/bluez/bluetooth.initd
+++ b/main/bluez/bluetooth.initd
@@ -2,12 +2,11 @@
 
 name="Bluetooth"
 command="/usr/lib/bluetooth/bluetoothd"
-pidfile="/var/run/bluetoothd.pid"
-start_stop_daemon_args="--background --make-pidfile"
-
+pidfile="/run/bluetoothd.pid"
+command_background=true
 
 depend() {
-	after coldplug
+	after coldplug udev-postmount
 	need dbus localmount hostname
 }
 
diff --git a/main/bluez/fix-endianness.patch b/main/bluez/fix-endianness.patch
index ee0e0d1e3eb..44bbf44ddc5 100644
--- a/main/bluez/fix-endianness.patch
+++ b/main/bluez/fix-endianness.patch
@@ -1,10 +1,12 @@
---- bluez-5.47/src/shared/util.h.old	2016-09-26 07:29:00.000000000 -0500
-+++ bluez-5.47/src/shared/util.h	2017-12-27 22:49:50.538716424 -0600
-@@ -26,6 +26,7 @@
- #include <alloca.h>
- #include <byteswap.h>
+diff --git a/src/shared/util.h b/src/shared/util.h
+index ce57b53..da99a4c 100644
+--- a/src/shared/util.h
++++ b/src/shared/util.h
+@@ -17,6 +17,7 @@
  #include <string.h>
+ #include <sys/types.h>
+ #include <sys/uio.h>
 +#include <endian.h>
  
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- #define le16_to_cpu(val) (val)
+ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+ #define BIT(n)  (1 << (n))
diff --git a/main/bluez/mpris-proxy.desktop b/main/bluez/mpris-proxy.desktop
new file mode 100644
index 00000000000..4995eaa4318
--- /dev/null
+++ b/main/bluez/mpris-proxy.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=mpris-proxy
+Comment=Start mpris-proxy in daemon mode
+Exec=/usr/bin/mpris-proxy
+TryExec=/usr/bin/mpris-proxy
+Terminal=false
+X-KDE-autostart-phase=2
diff --git a/main/bluez/musl.patch b/main/bluez/musl.patch
deleted file mode 100644
index cd8f08568f4..00000000000
--- a/main/bluez/musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mesh/net.h b/mesh/net.h
-index 150240f..a3dec2b 100644
---- a/mesh/net.h
-+++ b/mesh/net.h
-@@ -21,6 +21,8 @@
- #define __packed __attribute__((packed))
- #endif
- 
-+#include <sys/time.h> /* for timeval */
-+
- struct mesh_io;
- struct mesh_node;
-
diff --git a/main/bluez/org.bluez.obex.service b/main/bluez/org.bluez.obex.service
new file mode 100644
index 00000000000..d1afc39d475
--- /dev/null
+++ b/main/bluez/org.bluez.obex.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.bluez.obex
+Exec=/usr/lib/bluetooth/obexd -n
diff --git a/main/bluez/test-mesh-crypto.patch b/main/bluez/test-mesh-crypto.patch
new file mode 100644
index 00000000000..ccaf8001e64
--- /dev/null
+++ b/main/bluez/test-mesh-crypto.patch
@@ -0,0 +1,61 @@
+Requires kernel option that might not be enabled on the builder
+https://bugzilla.kernel.org/show_bug.cgi?id=206815
+diff --git a/unit/test-mesh-crypto.c b/unit/test-mesh-crypto.c
+--- a/unit/test-mesh-crypto.c
++++ b/unit/test-mesh-crypto.c
+@@ -2137,55 +2137,5 @@
+ {
+ 	l_log_set_stderr();
+ 
+-	/* Section 8.1 Sample Data Tests */
+-	check_s1(&s8_1_1);
+-	check_k1(&s8_1_2);
+-	check_k2(&s8_1_3);
+-	check_k2(&s8_1_4);
+-	check_k3(&s8_1_5);
+-	check_k4(&s8_1_6);
+-
+-	/* Section 8.2 Sample Data Tests */
+-	check_k4(&s8_2_1);
+-	check_k2(&s8_2_2);
+-	check_k2(&s8_2_3);
+-	check_k3(&s8_2_4);
+-	check_k128(&s8_2_5);
+-	check_k128(&s8_2_6);
+-
+-	/* Section 8.3 Sample Data Tests */
+-	check_encrypt(&s8_3_1);
+-	check_decrypt(&s8_3_1);
+-	check_encrypt(&s8_3_2);
+-	check_decrypt(&s8_3_2);
+-	check_encrypt(&s8_3_3);
+-	check_decrypt(&s8_3_3);
+-	check_encrypt(&s8_3_4);
+-	check_decrypt(&s8_3_4);
+-	check_encrypt(&s8_3_5);
+-	check_decrypt(&s8_3_5);
+-	check_encrypt(&s8_3_6);
+-	check_decrypt(&s8_3_6);
+-	check_encrypt(&s8_3_7);
+-	check_decrypt(&s8_3_7);
+-	check_encrypt(&s8_3_8); /* Single segment tester unavailable */
+-	check_decrypt(&s8_3_8); /* Single segment tester unavailable */
+-	check_encrypt(&s8_3_9);
+-	check_decrypt(&s8_3_9);
+-	check_encrypt(&s8_3_10);
+-	check_decrypt(&s8_3_10);
+-	check_encrypt(&s8_3_11); /* Single segment tester unavailable */
+-	check_decrypt(&s8_3_11); /* Single segment tester unavailable */
+-	check_encrypt(&s8_3_22);
+-	check_decrypt(&s8_3_22);
+-
+-	/* Section 8.4 Beacon Sample Data */
+-	check_beacon(&s8_4_3);
+-	check_beacon(&s8_4_6_1);
+-	check_beacon(&s8_4_6_2);
+-
+-	/* Section 8.6 Mesh Proxy Service sample data */
+-	check_id_beacon(&s8_6_2);
+-
+ 	return 0;
+ }
diff --git a/main/bmd-tools/APKBUILD b/main/bmd-tools/APKBUILD
index 50364e3169b..83338f1f40c 100644
--- a/main/bmd-tools/APKBUILD
+++ b/main/bmd-tools/APKBUILD
@@ -1,39 +1,31 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=bmd-tools
 pkgver=1.0.2
-pkgrel=0
+pkgrel=5
 pkgdesc="Tools for Blackmagic USB video encoders"
 url="https://github.com/fabled/bmd-tools"
 arch="all"
-license="GPL-2.0"
-depends=""
+license="MIT"
 makedepends="libusb-dev"
-install=""
-subpackages=""
+subpackages="$pkgname-openrc"
 source="bmd-tools-$pkgver.tar.gz::https://github.com/fabled/bmd-tools/archive/v$pkgver.tar.gz
 	bmd-streamer.initd
 	bmd-streamer.confd
 	"
-
-builddir="$srcdir"/$pkgname-$pkgver
+options="!check"
 
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
-
 	mkdir -p "$pkgdir"/usr/bin
 
 	install -s -m755 bmd-streamer bmd-extractfw \
 		"$pkgdir"/usr/bin
 
-	install -m755 -D "$srcdir"/bmd-streamer.initd \
-		"$pkgdir"/etc/init.d/bmd-streamer
-	install -m755 -D "$srcdir"/bmd-streamer.confd \
-		"$pkgdir"/etc/conf.d/bmd-streamer
+	install -Dm755 "$srcdir"/bmd-streamer.initd "$pkgdir"/etc/init.d/bmd-streamer
+	install -Dm644 "$srcdir"/bmd-streamer.confd "$pkgdir"/etc/conf.d/bmd-streamer
 }
 
 sha512sums="bcd6375c23541ef65e8cdf9222c94c4d90bf43976524987c0464b8570533efad15f955eac83e60651bc7295493f5f6f4322ac7a326df747ca88b626ad7654265  bmd-tools-1.0.2.tar.gz
diff --git a/main/bonding/APKBUILD b/main/bonding/APKBUILD
index 4fcf23ce2ca..b2b3e8d8c57 100644
--- a/main/bonding/APKBUILD
+++ b/main/bonding/APKBUILD
@@ -5,12 +5,13 @@
 
 pkgname=bonding
 pkgver=2.6
-pkgrel=4
+pkgrel=5
 pkgdesc="Scripts for network interface bonding"
 url="https://wiki.alpinelinux.org/wiki/Bonding"
 arch="noarch"
 license="GPL-2.0-or-later"
 source="bonding.pre-up bonding.up bonding.post-down"
+options="!check"
 
 package() {
 	cd "$srcdir"
@@ -19,6 +20,6 @@ package() {
 	done
 }
 
-sha512sums="88d0566242b172c60b66bd62ce1b5c9f01e5d3b79a2caa7eea8f2ec0255158f449392a54348dd5c375d14f4d8fa6182333c2154582c7eab7f3e8f4a7adce900a  bonding.pre-up
+sha512sums="de37ddcd56b512f7adda2bddf9c84618796e95c8bc23df8948452c892cd48eff7043d4f0f5ee068bcd634c11907f6859a6216a72d50cb6a4d2473a7a641c71f5  bonding.pre-up
 5c81b2891c281df2df4c98a560f776b857e4b6b20ac733858683d87fb7b1ac57423f57003cfdcfac24c8257de31062c4596270e9482b8d35d517e29f2bac0951  bonding.up
 c6b6f06d1c0a7be1022feb18cdcc55780cad2200ac0121f276527442becb7d75a7850b809ae9c6d5b914a1a03f791bd65c088f1289ce0e28b5a02bd86e3868de  bonding.post-down"
diff --git a/main/bonding/bonding.pre-up b/main/bonding/bonding.pre-up
index 17f27070cc4..6d26740b1d8 100755
--- a/main/bonding/bonding.pre-up
+++ b/main/bonding/bonding.pre-up
@@ -120,7 +120,7 @@ setup_slaves()
 # Are there anything to do ?
 
 # Option slaves deprecated, replaced by bond-slaves, but still supported for backward compatibility.
-IF_BOND_SLAVES=${IF_BOND_SLAVES:-$IF_SLAVES}
+IF_BOND_SLAVES=${IF_BOND_MEMBERS:-${IF_BOND_SLAVES:-$IF_SLAVES}}
 
 if [ "$IF_BOND_MASTER" ] ; then
 	BOND_MASTER="$IF_BOND_MASTER"
diff --git a/main/boost/0001-revert-cease-dependence-on-range.patch b/main/boost/0001-revert-cease-dependence-on-range.patch
deleted file mode 100644
index a6002074ab9..00000000000
--- a/main/boost/0001-revert-cease-dependence-on-range.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001
-From: Oliver Kowalke <oliver.kowalke@gmail.com>
-Date: Sun, 1 Dec 2019 20:40:28 +0100
-Subject: [PATCH] Revert "Cease dependence on Range"
-
-This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db.
-
-see #44 (One test fails to compile after boostorg/coroutine submodule updated)
----
- boost/coroutine/asymmetric_coroutine.hpp | 12 +++---------
- 1 file changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp
-index ea96981..640896f 100644
---- a/boost/coroutine/asymmetric_coroutine.hpp
-+++ b/boost/coroutine/asymmetric_coroutine.hpp
-@@ -14,6 +14,7 @@
- #include <boost/assert.hpp>
- #include <boost/config.hpp>
- #include <boost/move/move.hpp>
-+#include <boost/range.hpp>
- #include <boost/throw_exception.hpp>
- #include <boost/utility/explicit_operator_bool.hpp>
- 
-@@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c)
- 
- }
- 
--// forward declaration of Boost.Range traits to break dependency on it
--template<typename C, typename Enabler>
--struct range_mutable_iterator;
--
--template<typename C, typename Enabler>
--struct range_const_iterator;
--
- template< typename Arg >
--struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void >
-+struct range_mutable_iterator< coroutines::push_coroutine< Arg > >
- { typedef typename coroutines::push_coroutine< Arg >::iterator type; };
- 
- template< typename R >
--struct range_mutable_iterator< coroutines::pull_coroutine< R >, void >
-+struct range_mutable_iterator< coroutines::pull_coroutine< R > >
- { typedef typename coroutines::pull_coroutine< R >::iterator type; };
- 
- }
--- 
-2.24.1
-
diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD
deleted file mode 100644
index f77a16a7243..00000000000
--- a/main/boost/APKBUILD
+++ /dev/null
@@ -1,183 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=boost
-pkgver=1.72.0
-_pkgver="${pkgver//./_}"
-pkgrel=5
-pkgdesc="Free peer-reviewed portable C++ source libraries"
-url="https://www.boost.org/"
-arch="all"
-license="custom"
-depends="$pkgname-libs"
-depends_dev="$pkgname linux-headers"
-makedepends="$depends_dev python3-dev>=3.8 flex bison bzip2-dev icu-dev xz-dev zlib-dev"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="https://dl.bintray.com/boostorg/release/$pkgver/source/boost_$_pkgver.tar.bz2
-	boost-1.57.0-python-abi_letters.patch
-	boost-1.57.0-python-libpython_dep.patch
-	0001-revert-cease-dependence-on-range.patch
-	boost-fiber-mips64-ftbfs.patch
-	"
-builddir="$srcdir/${pkgname}_$_pkgver"
-
-_enginedir="tools/build/src/engine"
-_bjam="$builddir"/$_enginedir/b2
-
-_libs="
-	atomic
-	chrono
-	container
-	context
-	contract
-	coroutine
-	date_time
-	fiber
-	filesystem
-	graph
-	iostreams
-	locale
-	log_setup
-	log
-	math
-	prg_exec_monitor
-	program_options
-	python3
-	random
-	regex
-	serialization
-	stacktrace_basic
-	stacktrace_noop
-	system
-	thread
-	timer
-	type_erasure
-	unit_test_framework
-	wave
-	wserialization
-	"
-for _lib in $_libs; do
-	subpackages="$subpackages $pkgname-${_lib}:_boostlib"
-done; unset -v _lib
-subpackages="$subpackages $pkgname-libs"
-
-_set_options() {
-	[ -n "$PY3_VERSION" ] || PY3_VERSION="$(_pyversion python3)"
-
-	local _options_python="${PY2_VERSION:+$PY2_VERSION,}$PY3_VERSION"
-	[ -z "$_options_python" ] || _options_python="python=$_options_python"
-
-	_options="
-		--user-config=\"$builddir/user-config.jam\"
-		--prefix=\"$pkgdir/usr\"
-		release
-		$_options_python
-		toolset=gcc
-		debug-symbols=off
-		threading=multi
-		runtime-link=shared
-		link=shared,static
-		cflags=-fno-strict-aliasing
-		--layout=system
-		-q
-		-j${JOBS:-2}
-		$_options_carch
-		"
-}
-
-prepare() {
-	default_prepare
-
-	_set_options
-	local abiflags="$(python3-config --abiflags)"
-
-	# create user-config.jam
-	cat > user-config.jam <<-__EOF__
-
-	using gcc : : $CC : <cxxflags>"$CXXFLAGS" <linkflags>"$LDFLAGS" ;
-	using python : ${PY3_VERSION:+$PY3_VERSION }: /usr/bin/python3 : ${PY3_VERSION:+/usr/include/python${PY3_VERSION}${abiflags} }: : : : ${abiflags:+$abiflags };
-
-	__EOF__
-}
-
-build() {
-	export BOOST_ROOT="$builddir"
-
-	msg "Building bjam"
-	cd "$builddir"/$_enginedir
-	CC= ./build.sh gcc
-
-	msg "Building bcp"
-	cd "$builddir"/tools/bcp
-	"$_bjam" -j${JOBS:-2}
-
-	msg "Building boost"
-	cd "$builddir"
-	_set_options
-	"$_bjam" $_options
-}
-
-check() {
-	cd "$builddir"/tools/build/test
-
-	PATH="${_bjam%/*}:$PATH" python3 test_all.py --default-bjam
-}
-
-package() {
-	export BOOST_ROOT="$builddir"
-	_set_options
-
-	install -Dm755 "$_bjam" \
-		"$pkgdir"/usr/bin/b2
-	ln -s b2 "$pkgdir"/usr/bin/bjam # old name for b2 binary
-
-	install -Dm755 dist/bin/bcp "$pkgdir"/usr/bin/bcp
-
-	install -Dm644 LICENSE_1_0.txt \
-		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE_1_0.txt
-
-	"$pkgdir"/usr/bin/bjam $_options \
-		--includedir="$pkgdir"/usr/include \
-		--libdir="$pkgdir"/usr/lib \
-		install
-}
-
-static() {
-	pkgdesc="Boost static libraries"
-	depends="$depends_static"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.a "$subpkgdir"/usr/lib/
-}
-
-_boostlib() {
-	local name="${subpkgname#$pkgname-}"
-	pkgdesc="Boost $name shared library"
-	depends="$depends__boostlib"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libboost_$name*.so.[0-9]* "$subpkgdir"/usr/lib/
-}
-
-libs() {
-	default_libs
-
-	pkgdesc="Boost shared libraries"
-	depends="$depends_libs"
-	local _pkg; for _pkg in $origsubpackages; do
-		case "$_pkg" in
-			*:_boostlib) depends="$depends ${_pkg%%:*}" ;;
-		esac
-	done
-
-	mkdir -p "$subpkgdir"
-	rmdir "$pkgdir"/usr/lib >/dev/null 2>&1 || :
-}
-
-_pyversion() {
-	"$1" -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))'
-}
-
-sha512sums="63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6  boost_1_72_0.tar.bz2
-d96d4d37394a31764ed817d0bc4a99cffa68a75ff1ecfd4417b9e1e5ae2c31a96ed24f948c6f2758ffdac01328d2402c4cf0d33a37107e4f5f721e636daebd66  boost-1.57.0-python-abi_letters.patch
-132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02  boost-1.57.0-python-libpython_dep.patch
-9b53d2fe2dddd592e43db03c26fadd6c07d4c45a980ae4c775b7a914346a3914f6e0c3ef42dad5e2ea4568afb86c9967e09444ff609cfba1e1d39f4980b22ad6  0001-revert-cease-dependence-on-range.patch
-054f475a3a89d550c374a0a80cda580adf5d12e75a44166c9cddf7247e603285c85b428c3c799f00cdd8e4af3fc690d9cef05320ac2fbf2a07dae9827d4bd647  boost-fiber-mips64-ftbfs.patch"
diff --git a/main/boost/boost-fiber-mips64-ftbfs.patch b/main/boost/boost-fiber-mips64-ftbfs.patch
deleted file mode 100644
index bde053ff7f9..00000000000
--- a/main/boost/boost-fiber-mips64-ftbfs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Roughly equivalent to upstream 5f7cda29add367c5381775a314ec9f90e311457a.
-
---- a/boost/fiber/detail/cpu_relax.hpp
-+++ b/boost/fiber/detail/cpu_relax.hpp
-@@ -47,7 +47,7 @@ namespace detail {
- # else
- #  define cpu_relax() asm volatile ("nop" ::: "memory");
- # endif
--#elif BOOST_ARCH_MIPS
-+#elif BOOST_ARCH_MIPS && (__mips_isa_rev > 1)
- # define cpu_relax() asm volatile ("pause" ::: "memory");
- #elif BOOST_ARCH_PPC
- // http://code.metager.de/source/xref/gnu/glibc/sysdeps/powerpc/sys/platform/ppc.h
diff --git a/main/boost1.82/APKBUILD b/main/boost1.82/APKBUILD
new file mode 100644
index 00000000000..3f2bcb65beb
--- /dev/null
+++ b/main/boost1.82/APKBUILD
@@ -0,0 +1,229 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=boost1.82
+pkgver=1.82.0
+_pkgver="${pkgver//./_}"
+pkgrel=5
+pkgdesc="Free peer-reviewed portable C++ source libraries"
+url="https://www.boost.org/"
+arch="all"
+license="BSL-1.0"
+depends="$pkgname-libs"
+depends_dev="$pkgname linux-headers bzip2-dev icu-dev xz-dev zlib-dev zstd-dev"
+makedepends="$depends_dev python3-dev>=3.8 flex bison"
+subpackages="
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-doc
+	boost-dev:_dev
+	"
+source="https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/boost_$_pkgver.tar.bz2
+	boost-fix-i386-stack-alignment.patch
+	boost-1.57.0-python-abi_letters.patch
+	boost-1.57.0-python-libpython_dep.patch
+	boost-phoenix-uarg.patch
+	"
+builddir="$srcdir/boost_$_pkgver"
+options="!check" # some tests fail now, figure it out later
+
+_libs="
+	atomic
+	chrono
+	container
+	context
+	contract
+	coroutine
+	date_time
+	fiber
+	filesystem
+	graph
+	iostreams
+	locale
+	log_setup
+	log
+	math
+	prg_exec_monitor
+	program_options
+	python3
+	random
+	regex
+	serialization
+	stacktrace_basic
+	stacktrace_noop
+	system
+	thread
+	timer
+	type_erasure
+	unit_test_framework
+	url
+	wave
+	wserialization
+	json
+	nowide
+	"
+for _lib in $_libs; do
+	subpackages="$subpackages $pkgname-${_lib}:_boostlib"
+done; unset -v _lib
+subpackages="$subpackages $pkgname-libs"
+
+# Claim the unversioned name, this must be removed once we switch our
+# boost to a new version
+_previousver=1.81
+provides="boost=$pkgver-r$pkgrel"
+replaces="boost$_previousver"
+
+_set_options() {
+	local _python="$(_pyversion python3)"
+	export PY3_VERSION="$_python"
+	export BOOST_ROOT="$builddir"
+
+	_options="
+		--user-config=\"$builddir/user-config.jam\"
+		--prefix=\"$pkgdir/usr\"
+		variant=release
+		python=$PY3_VERSION
+		toolset=gcc
+		debug-symbols=off
+		threading=multi
+		runtime-link=shared
+		link=shared,static
+		cflags=-fno-strict-aliasing
+		--layout=system
+		--without-graph_parallel
+		--without-mpi
+		-q
+		-j${JOBS:-2}
+		"
+}
+
+prepare() {
+	default_prepare
+	_set_options
+
+	local abiflags="$(python3-config --abiflags)"
+
+	# create user-config.jam
+	cat > user-config.jam <<-__EOF__
+
+	using gcc : : $CXX : <cflags>"$CFLAGS" <cxxflags>"$CXXFLAGS" <linkflags>"$LDFLAGS" ;
+	using python : $PY3_VERSION : /usr/bin/python3 : /usr/include/python${PY3_VERSION}$abiflags : : : : $abiflags ;
+
+	__EOF__
+}
+
+build() {
+	_set_options
+
+	msg "Building b2"
+	cd "$builddir"/tools/build
+	./bootstrap.sh --cxxflags="$CXXFLAGS $LDFLAGS"
+
+	msg "Building bcp"
+	cd "$builddir"/tools/bcp
+	../build/b2 -j${JOBS:-2}
+
+	msg "Building boost"
+	cd "$builddir"
+	./bootstrap.sh --with-toolset=gcc --with-icu --with-python=python3
+	./b2 $_options
+}
+
+check() {
+	cd "$builddir"/tools/build/test
+
+	PATH="$pkgdir/usr/bin:$PATH" python3 test_all.py --default-bjam
+}
+
+package() {
+	_set_options
+
+	install -Dm644 LICENSE_1_0.txt \
+		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE_1_0.txt
+
+	./b2 $_options \
+		--includedir="$pkgdir"/usr/include \
+		--libdir="$pkgdir"/usr/lib \
+		install
+
+	install -Dm755 dist/bin/bcp "$pkgdir"/usr/bin/bcp
+	install -Dm755 b2 "$pkgdir"/usr/bin/b2
+	ln -s b2 "$pkgdir"/usr/bin/bjam # old name for b2 binary
+}
+
+static() {
+	pkgdesc="Boost static libraries"
+	depends="$depends_static"
+
+	# Claim the unversioned name, this must be removed once we switch our
+	# boost to a new version
+	provides="boost-static=$pkgver-r$pkgrel"
+	replaces="boost$_previousver-static"
+
+	amove usr/lib/lib*.a
+}
+
+_boostlib() {
+	local name="${subpkgname#$pkgname-}"
+	pkgdesc="Boost $name shared library"
+	depends="$depends__boostlib"
+
+	# Claim the unversioned name, this must be removed once we switch our
+	# boost to a new version
+	provides="boost-$name=$pkgver-r$pkgrel"
+	replaces="boost$_previousver-$name"
+
+	amove usr/lib/libboost_$name*.so.[0-9]*
+}
+
+libs() {
+	default_libs
+
+	# Claim the unversioned name, this must be removed once we switch our
+	# boost to a new version
+	provides="boost-libs=$pkgver-r$pkgrel"
+
+	pkgdesc="Boost shared libraries"
+	depends="$depends_libs"
+	local _pkg; for _pkg in $origsubpackages; do
+		case "$_pkg" in
+			*:_boostlib) depends="$depends ${_pkg%%:*}" ;;
+		esac
+	done
+
+	mkdir -p "$subpkgdir"
+	rmdir "$pkgdir"/usr/lib >/dev/null 2>&1 || :
+}
+
+dev() {
+	# Claim the unversioned name, this must be removed once we switch our
+	# boost to a new version. Replace previous boost version for clean -dev
+	# upgrade
+	default_dev
+	replaces="boost$_previousver-dev"
+}
+
+_dev() {
+	# This makes boost-dev be a metapackage that depends on boostX.Y-dev
+	mkdir -p "$subpkgdir"
+	depends="$pkgname-dev=$pkgver-r$pkgrel"
+}
+
+doc() {
+	# Claim the unversioned name, this must be removed once we switch our
+	# boost to a new version
+	provides="boost-doc=$pkgver-r$pkgrel"
+	replaces="boost$_previousver-doc"
+
+	default_doc
+}
+
+_pyversion() {
+	"$1" -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))'
+}
+
+sha512sums="
+6fddc452ca67f99f5c181e21c73d96feb7346e10886477c91b4abc2cdf447750599e0d42f935ef591222200ef6c033de078a7ad2bb577c81fa56a249b17420cb  boost_1_82_0.tar.bz2
+f7a2f6945dc1203c5d6500180e77c532585ceb27e93465e3293b6c5b926da5039e3240b69953e1ddfc072e106db2d1bfb52c984384fd15749b74960c8b5b3200  boost-fix-i386-stack-alignment.patch
+d96d4d37394a31764ed817d0bc4a99cffa68a75ff1ecfd4417b9e1e5ae2c31a96ed24f948c6f2758ffdac01328d2402c4cf0d33a37107e4f5f721e636daebd66  boost-1.57.0-python-abi_letters.patch
+132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02  boost-1.57.0-python-libpython_dep.patch
+7fad4b81ae5df38f740148153bcb5b4b31c12061f1264404b96a324e0d2f06943530cbcf9002d17772fb4ad87dcf0ba8bf4ed397725ee448a4d310df5d0383ad  boost-phoenix-uarg.patch
+"
diff --git a/main/boost/boost-1.57.0-python-abi_letters.patch b/main/boost1.82/boost-1.57.0-python-abi_letters.patch
index 7df3ee7047d..7df3ee7047d 100644
--- a/main/boost/boost-1.57.0-python-abi_letters.patch
+++ b/main/boost1.82/boost-1.57.0-python-abi_letters.patch
diff --git a/main/boost/boost-1.57.0-python-libpython_dep.patch b/main/boost1.82/boost-1.57.0-python-libpython_dep.patch
index 57bfc26774e..57bfc26774e 100644
--- a/main/boost/boost-1.57.0-python-libpython_dep.patch
+++ b/main/boost1.82/boost-1.57.0-python-libpython_dep.patch
diff --git a/main/boost1.82/boost-fix-i386-stack-alignment.patch b/main/boost1.82/boost-fix-i386-stack-alignment.patch
new file mode 100644
index 00000000000..0b85b5b92fa
--- /dev/null
+++ b/main/boost1.82/boost-fix-i386-stack-alignment.patch
@@ -0,0 +1,48 @@
+From 2a5e11babb2a9e992fb96461a61d36f2b54b207b Mon Sep 17 00:00:00 2001
+From: Niels Dossche <niels.dossche@ugent.be>
+Date: Wed, 25 Jan 2023 09:05:19 +0100
+Subject: [PATCH] Make sure the i386 sysv stack is aligned
+
+SysV ABI requires a stack alignment of 16 bytes. Currently, for i386
+with SysV ABI, the trampoline function is entered with an unaligned
+stack. This causes problems for the context-function that is jumped to
+as its stack is also unaligned. This causes a crash for our use-case
+because the context function contains an SSE instruction which reads
+from the stack. The SSE instruction requires the correct alignment.
+Fix it by changing the 0x2c offset to 0x30, such that the stack remains
+aligned.
+---
+ src/asm/make_i386_sysv_elf_gas.S   | 4 ++--
+ src/asm/make_i386_sysv_macho_gas.S | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libs/context/src/asm/make_i386_sysv_elf_gas.S b/libs/context/src/asm/make_i386_sysv_elf_gas.S
+index 0b7ab81..9261e56 100644
+--- a/libs/context/src/asm/make_i386_sysv_elf_gas.S
++++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S
+@@ -40,8 +40,8 @@ make_fcontext:
+     /* shift address in EAX to lower 16 byte boundary */
+     andl  $-16, %eax
+ 
+-    /* reserve space for context-data on context-stack */
+-    leal  -0x2c(%eax), %eax
++    /* reserve space for context-data on context-stack, and align the stack */
++    leal  -0x34(%eax), %eax
+ 
+     /* third arg of make_fcontext() == address of context-function */
+     /* stored in EBX */
+diff --git a/libs/context/src/asm/make_i386_sysv_macho_gas.S b/libs/context/src/asm/make_i386_sysv_macho_gas.S
+index fdcdb7c..519e406 100644
+--- a/libs/context/src/asm/make_i386_sysv_macho_gas.S
++++ b/libs/context/src/asm/make_i386_sysv_macho_gas.S
+@@ -38,8 +38,8 @@ _make_fcontext:
+     /* shift address in EAX to lower 16 byte boundary */
+     andl  $-16, %eax
+ 
+-    /* reserve space for context-data on context-stack */
+-    leal  -0x2c(%eax), %eax
++    /* reserve space for context-data on context-stack, and align the stack */
++    leal  -0x34(%eax), %eax
+ 
+     /* third arg of make_fcontext() == address of context-function */
+     /* stored in EBX */
diff --git a/main/boost1.82/boost-phoenix-uarg.patch b/main/boost1.82/boost-phoenix-uarg.patch
new file mode 100644
index 00000000000..491f3722e6f
--- /dev/null
+++ b/main/boost1.82/boost-phoenix-uarg.patch
@@ -0,0 +1,11 @@
+diff --git a/boost/phoenix/stl.hpp b/boost/phoenix/stl.hpp
+index 254820a83..c1013bc97 100644
+--- a/boost/phoenix/stl.hpp
++++ b/boost/phoenix/stl.hpp
+@@ -11,6 +11,5 @@
+ 
+ #include <boost/phoenix/stl/algorithm.hpp>
+ #include <boost/phoenix/stl/container.hpp>
+-#include <boost/phoenix/stl/tuple.hpp>
+ 
+ #endif
diff --git a/main/botan/APKBUILD b/main/botan/APKBUILD
index 78ff2986f5a..7a79fb0eb0d 100644
--- a/main/botan/APKBUILD
+++ b/main/botan/APKBUILD
@@ -1,27 +1,35 @@
 # Contributor: tcely <tcely@users.noreply.github.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=botan
-pkgver=2.11.0
+pkgver=2.19.3
 pkgrel=5
 pkgdesc="Crypto and TLS for C++11"
 url="https://botan.randombit.net/"
 arch="all"
 license="BSD-2-Clause"
-depends_dev="boost-dev bzip2-dev openssl-dev sqlite-dev xz-dev zlib-dev"
+depends_dev="boost-dev bzip2-dev sqlite-dev xz-dev zlib-dev"
 makedepends="$depends_dev python3"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
 source="https://botan.randombit.net/releases/Botan-$pkgver.tar.xz"
 builddir="$srcdir/Botan-$pkgver"
 
 # secfixes:
+#   2.18.1-r3:
+#     - CVE-2021-40529
+#   2.17.3-r0:
+#     - CVE-2021-24115
 #   2.9.0-r0:
-#   - CVE-2018-20187
+#     - CVE-2018-20187
 #   2.7.0-r0:
-#   - CVE-2018-12435
+#     - CVE-2018-12435
 #   2.6.0-r0:
-#   - CVE-2018-9860
+#     - CVE-2018-9860
 #   2.5.0-r0:
-#   - CVE-2018-9127
+#     - CVE-2018-9127
+
+case $CARCH in
+	ppc64le|aarch64|armhf|armv7) options="$options !check" ;; # 3 tests timeout
+esac
 
 build() {
 	# botan benefits from -O3. Upstream is using it when testing.
@@ -33,7 +41,6 @@ build() {
 		--with-bzip2 \
 		--with-lzma \
 		--with-openmp \
-		--with-openssl \
 		--with-sqlite3 \
 		--with-zlib \
 		--with-os-feature=getrandom \
@@ -43,12 +50,16 @@ build() {
 }
 
 check() {
-	./botan-test
+	LD_LIBRARY_PATH="$builddir" ./botan-test
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
+	# botan3 keeps the main name
+	mv "$pkgdir"/usr/bin/botan "$pkgdir"/usr/bin/botan2
 	rm -rf "$pkgdir"/usr/lib/python*
 }
 
-sha512sums="a697a7f29788afc561cde35431e65e2f37e40fd45af89a6d060bf9988d28089905c6a1c005f9b23fb377547cd7a96a41f62c8d2f61a7f80d1ca1b9ccf857a2ce  Botan-2.11.0.tar.xz"
+sha512sums="
+80012397e2aa7cc88a9536340ac9b770d1195fddda53b9d4cfde82318dd05f9d4f925bbdff773aba99883a701f4d30581e9d5c97e915fa80c3ca2acfa5a92110  Botan-2.19.3.tar.xz
+"
diff --git a/main/botan3/APKBUILD b/main/botan3/APKBUILD
new file mode 100644
index 00000000000..28ef23d25e9
--- /dev/null
+++ b/main/botan3/APKBUILD
@@ -0,0 +1,62 @@
+# Contributor: tcely <tcely@users.noreply.github.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=botan3
+pkgver=3.2.0
+pkgrel=1
+pkgdesc="Crypto and TLS for C++11 (v3)"
+url="https://botan.randombit.net/"
+arch="all"
+license="BSD-2-Clause"
+depends_dev="
+	boost-dev
+	bzip2-dev
+	sqlite-dev
+	xz-dev
+	zlib-dev
+	"
+makedepends="
+	$depends_dev
+	python3
+	"
+subpackages="$pkgname-dev $pkgname-doc py3-$pkgname:py3 $pkgname-libs"
+source="https://botan.randombit.net/releases/Botan-$pkgver.tar.xz"
+builddir="$srcdir/Botan-$pkgver"
+
+build() {
+	# botan benefits from -O3. Upstream is using it when testing.
+	export CXXFLAGS="$CXXFLAGS -O3" CFLAGS="$CFLAGS -O3"
+
+	python3 ./configure.py \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--with-boost \
+		--with-bzip2 \
+		--with-lzma \
+		--with-sqlite3 \
+		--with-zlib \
+		--with-os-feature=getrandom \
+		--disable-static
+
+	make
+}
+
+check() {
+	LD_LIBRARY_PATH="$builddir" \
+		timeout 600 \
+		./botan-test
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+py3() {
+	pkgdesc="$pkgdesc (python module)"
+	depends="$pkgname-libs=$pkgver-r$pkgrel"
+
+	amove usr/lib/python*
+}
+
+sha512sums="
+526cf71144584fef6e73f14f6aa1e2a7b03a92a3e51436287764bb61e742a94e02926bcc2aab038f08ef2169cb511152c8ecd71d51e06deb4875dc676875c2d9  Botan-3.2.0.tar.xz
+"
diff --git a/main/bridge-utils/APKBUILD b/main/bridge-utils/APKBUILD
index 890bd41840d..198d418a7c8 100644
--- a/main/bridge-utils/APKBUILD
+++ b/main/bridge-utils/APKBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bridge-utils
-pkgver=1.6
-pkgrel=0
+pkgver=1.7.1
+pkgrel=2
 pkgdesc="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
-url="https://www.kernel.org/pub/linux/utils/net/bridge-utils/"
+url="https://wiki.linuxfoundation.org/networking/bridge/"
 arch="all"
 license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
-depends=""
 makedepends="autoconf linux-headers"
-source="https://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz"
-builddir="$srcdir"/$pkgname-$pkgver
+source="https://git.kernel.org/pub/scm/network/bridge/bridge-utils.git/snapshot/bridge-utils-$pkgver.tar.gz
+	fix-PATH_MAX-on-ppc64le.patch"
+options="!check"
 
 prepare() {
 	default_prepare
@@ -18,7 +18,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,12 +26,13 @@ build() {
 		--libdir=/usr/lib \
 		--includedir=/usr/include
 	make
-	test -x brctl/brctl
 }
 
 package() {
-	cd "$builddir"
 	make install DESTDIR="$pkgdir"
 }
 
-sha512sums="b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02  bridge-utils-1.6.tar.xz"
+sha512sums="
+18aed40d36a0c3f7b461f7865a60b35c647e1ff9b0a854e857c8a4e3772163c49c6f99c9130443bedb382abbdced7dcfd4e812d21645b78e91c06c98e5e89305  bridge-utils-1.7.1.tar.gz
+da0bf3d108d178f4b99863b2ae97a170b2dac589669ed209435cb0d2d5e88eec0ea9f11dbb70d9f3511c38535236e5c24a069383f1ba893533812a1c7860372d  fix-PATH_MAX-on-ppc64le.patch
+"
diff --git a/main/bridge-utils/fix-PATH_MAX-on-ppc64le.patch b/main/bridge-utils/fix-PATH_MAX-on-ppc64le.patch
new file mode 100644
index 00000000000..3fa75b97648
--- /dev/null
+++ b/main/bridge-utils/fix-PATH_MAX-on-ppc64le.patch
@@ -0,0 +1,26 @@
+Author: Milan P. Stanić <mps@arvanta.net>
+Date:   Sun May 30 07:40:11 2021 +0000
+
+Fix missing PATH_MAX on ppc64le
+
+--- a/libbridge/libbridge_devif.c	2021-05-30 07:59:46.533574878 +0000
++++ b/libbridge/libbridge_devif.c	2021-05-30 08:01:09.964036452 +0000
+@@ -24,6 +24,7 @@
+ #include <string.h>
+ #include <dirent.h>
+ #include <fcntl.h>
++#include <limits.h>
+ 
+ #include "libbridge.h"
+ #include "libbridge_private.h"
+
+--- a/libbridge/libbridge_init.c	2021-05-30 08:00:15.983737797 +0000
++++ b/libbridge/libbridge_init.c	2021-05-30 08:00:49.573923635 +0000
+@@ -24,6 +24,7 @@
+ #include <dirent.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <limits.h>
+ 
+ #include "libbridge.h"
+ #include "libbridge_private.h"
diff --git a/main/bridge/APKBUILD b/main/bridge/APKBUILD
index 950862e6f91..1718385fca8 100644
--- a/main/bridge/APKBUILD
+++ b/main/bridge/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bridge
 pkgver=1.5
-pkgrel=4
+pkgrel=5
 pkgdesc="Scripts for configuring network bridge interfaces"
 url="https://wiki.alpinelinux.org/wiki/Bridge"
 arch="noarch"
@@ -10,9 +10,17 @@ license="GPL-2.0-or-later"
 source="bridge.pre-up"
 
 builddir="$srcdir"
+options="!check"
+
+# secfixes:
+#   0:
+#     - CVE-2021-42533
+#     - CVE-2021-42719
+#     - CVE-2021-42720
+#     - CVE-2021-42722
+#     - CVE-2021-42725
 
 package() {
-	cd "$builddir"
 	install -Dm755 "$srcdir"/bridge.pre-up \
 		"$pkgdir"/etc/network/if-pre-up.d/bridge
 	install -d "$pkgdir"/etc/network/if-post-down.d
diff --git a/main/brotli/APKBUILD b/main/brotli/APKBUILD
new file mode 100644
index 00000000000..e0cb5bc03e6
--- /dev/null
+++ b/main/brotli/APKBUILD
@@ -0,0 +1,97 @@
+# Contributor: prspkt <prspkt@protonmail.com>
+# Maintainer: prspkt <prspkt@protonmail.com>
+pkgname=brotli
+pkgver=1.1.0
+pkgrel=2
+pkgdesc="Generic lossless compressor"
+url="https://github.com/google/brotli"
+arch="all"
+license="MIT"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+makedepends_build="cmake samurai"
+subpackages="
+	$pkgname-doc
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-libs
+	"
+if [ -z "$BOOTSTRAP" ]; then
+	makedepends_host="python3-dev py3-gpep517 py3-setuptools py3-wheel"
+	subpackages="$subpackages py3-$pkgname-pyc py3-$pkgname:py3"
+fi
+source="$pkgname-$pkgver.tar.gz::https://github.com/google/brotli/archive/refs/tags/v$pkgver.tar.gz
+	optimize-mips-s390x.patch
+	"
+
+# secfixes:
+#   1.0.9-r0:
+#     - CVE-2020-8927
+
+prepare() {
+	default_prepare
+	sed -i 's,/usr/bin/env bash,/bin/sh,' tests/*.sh
+}
+
+build() {
+	# -flto=auto does not work when cross-compiling
+	if [ "$CBUILD"  != "$CHOST" ]; then
+		export CFLAGS="$CFLAGS -O2"
+	else
+		export CFLAGS="$CFLAGS -flto=auto -O2"
+	fi
+
+	# static libs, see https://github.com/google/brotli/issues/795
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_SHARED_LIBS=OFF
+	cmake --build build
+
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_SHARED_LIBS=ON
+	cmake --build build
+
+	if [ -z "$BOOTSTRAP" ]; then
+		gpep517 build-wheel \
+			--wheel-dir .dist \
+			--output-fd 3 3>&1 >&2
+	fi
+}
+
+check() {
+	ctest --output-on-failure --test-dir build
+
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	cd python; ../.testenv/bin/python3 -m unittest discover -v -p '*_test.py'
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+
+	local file; for file in common dec enc; do
+		install -D -m 755 "$builddir"/build/libbrotli$file.a \
+			"$pkgdir"/usr/lib/
+	done
+
+	local man; for man in docs/*.?; do
+		install -D -m644 $man "$pkgdir"/usr/share/man/man${man##*.}/${man##*/}
+	done
+
+	if [ -z "$BOOTSTRAP" ]; then
+		python3 -m installer -d "$pkgdir" .dist/*.whl
+	fi
+}
+
+py3() {
+	pkgdesc="$pkgdesc (python bindings)"
+
+	amove usr/lib/python3*
+}
+
+sha512sums="
+6eb280d10d8e1b43d22d00fa535435923c22ce8448709419d676ff47d4a644102ea04f488fc65a179c6c09fee12380992e9335bad8dfebd5d1f20908d10849d9  brotli-1.1.0.tar.gz
+3f91155c76c27268b94515087d042b6669f790027cb394c694ec492bf2d5a9a98272fc501d179b4b3736a8be3e016189d2d996ee50ae3e07b52f21857cbfc391  optimize-mips-s390x.patch
+"
diff --git a/main/brotli/optimize-mips-s390x.patch b/main/brotli/optimize-mips-s390x.patch
new file mode 100644
index 00000000000..0619c7de45f
--- /dev/null
+++ b/main/brotli/optimize-mips-s390x.patch
@@ -0,0 +1,98 @@
+diff --git a/c/common/platform.h b/c/common/platform.h
+index 84c448c..853fa83 100755
+--- a/c/common/platform.h
++++ b/c/common/platform.h
+@@ -213,6 +213,14 @@
+ #define BROTLI_TARGET_LOONGARCH64
+ #endif
+ 
++#if defined(__s390x__)
++#define BROTLI_TARGET_S390X
++#endif
++
++#if defined(__mips64)
++#define BROTLI_TARGET_MIPS64
++#endif
++
+ #if defined(BROTLI_TARGET_X64) || defined(BROTLI_TARGET_ARMV8_64) || \
+     defined(BROTLI_TARGET_POWERPC64) || defined(BROTLI_TARGET_RISCV64) || \
+     defined(BROTLI_TARGET_LOONGARCH64)
+@@ -285,22 +293,42 @@
+ 
+ /* Portable unaligned memory access: read / write values via memcpy. */
+ static BROTLI_INLINE uint16_t BrotliUnalignedRead16(const void* p) {
++#if defined(__mips__) && (!defined(__mips_isa_rev) || __mips_isa_rev < 6)
++  const struct { uint16_t x; } __attribute__((__packed__)) *t = p;
++  return t->x;
++#else
+   uint16_t t;
+   memcpy(&t, p, sizeof t);
+   return t;
++#endif
+ }
+ static BROTLI_INLINE uint32_t BrotliUnalignedRead32(const void* p) {
++#if defined(__mips__) && (!defined(__mips_isa_rev) || __mips_isa_rev < 6)
++  const struct { uint32_t x; } __attribute__((__packed__)) *t = p;
++  return t->x;
++#else
+   uint32_t t;
+   memcpy(&t, p, sizeof t);
+   return t;
++#endif
+ }
+ static BROTLI_INLINE uint64_t BrotliUnalignedRead64(const void* p) {
++#if defined(__mips__) && (!defined(__mips_isa_rev) || __mips_isa_rev < 6)
++  const struct { uint64_t x; } __attribute__((__packed__)) *t = p;
++  return t->x;
++#else
+   uint64_t t;
+   memcpy(&t, p, sizeof t);
+   return t;
++#endif
+ }
+ static BROTLI_INLINE void BrotliUnalignedWrite64(void* p, uint64_t v) {
++#if defined(__mips__) && (!defined(__mips_isa_rev) || __mips_isa_rev < 6)
++  struct { uint64_t x; } __attribute__((__packed__)) *t = p;
++  t->x = v;
++#else
+   memcpy(p, &v, sizeof v);
++#endif
+ }
+ 
+ #if BROTLI_LITTLE_ENDIAN
+@@ -311,31 +339,20 @@
+ #define BROTLI_UNALIGNED_STORE64LE BrotliUnalignedWrite64
+ #elif BROTLI_BIG_ENDIAN  /* BROTLI_LITTLE_ENDIAN */
+ /* Explain compiler to byte-swap values. */
+-#define BROTLI_BSWAP16_(V) ((uint16_t)( \
+-  (((V) & 0xFFU) << 8) | \
+-  (((V) >> 8) & 0xFFU)))
+ static BROTLI_INLINE uint16_t BROTLI_UNALIGNED_LOAD16LE(const void* p) {
+   uint16_t value = BrotliUnalignedRead16(p);
+-  return BROTLI_BSWAP16_(value);
++  return __builtin_bswap16(value);
+ }
+-#define BROTLI_BSWAP32_(V) ( \
+-  (((V) & 0xFFU) << 24) | (((V) & 0xFF00U) << 8) | \
+-  (((V) >> 8) & 0xFF00U) | (((V) >> 24) & 0xFFU))
+ static BROTLI_INLINE uint32_t BROTLI_UNALIGNED_LOAD32LE(const void* p) {
+   uint32_t value = BrotliUnalignedRead32(p);
+-  return BROTLI_BSWAP32_(value);
++  return __builtin_bswap32(value);
+ }
+-#define BROTLI_BSWAP64_(V) ( \
+-  (((V) & 0xFFU) << 56) | (((V) & 0xFF00U) << 40) | \
+-  (((V) & 0xFF0000U) << 24) | (((V) & 0xFF000000U) << 8) | \
+-  (((V) >> 8) & 0xFF000000U) | (((V) >> 24) & 0xFF0000U) | \
+-  (((V) >> 40) & 0xFF00U) | (((V) >> 56) & 0xFFU))
+ static BROTLI_INLINE uint64_t BROTLI_UNALIGNED_LOAD64LE(const void* p) {
+   uint64_t value = BrotliUnalignedRead64(p);
+-  return BROTLI_BSWAP64_(value);
++  return __builtin_bswap64(value);
+ }
+ static BROTLI_INLINE void BROTLI_UNALIGNED_STORE64LE(void* p, uint64_t v) {
+-  uint64_t value = BROTLI_BSWAP64_(v);
++  uint64_t value = __builtin_bswap64(v);
+   BrotliUnalignedWrite64(p, value);
+ }
+ #else  /* BROTLI_LITTLE_ENDIAN */
diff --git a/main/bsd-compat-headers/APKBUILD b/main/bsd-compat-headers/APKBUILD
new file mode 100644
index 00000000000..01dfd4e3495
--- /dev/null
+++ b/main/bsd-compat-headers/APKBUILD
@@ -0,0 +1,27 @@
+# Contributor: Patrycja Rosa <alpine@ptrcnull.me>
+# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
+pkgname=bsd-compat-headers
+pkgver=0.7.2
+pkgrel=6
+pkgdesc="BSD compatibility headers (cdefs, queue, tree)"
+url="https://gitlab.alpinelinux.org/alpine/aports"
+arch="noarch"
+license="BSD-2-Clause AND BSD-3-Clause"
+source="
+	cdefs.h
+	queue.h
+	tree.h
+"
+builddir="$srcdir"
+options="!check" # just headers
+
+package() {
+	mkdir -p "$pkgdir"
+	install -Dm644 -t "$pkgdir"/usr/include/sys \
+		cdefs.h queue.h tree.h
+}
+sha512sums="
+37c8fc73c7aea7b490f7850927e2bb91d12137c9e59e22c084146d515696dbc7973b5de92f4c987ba080dd2502ba83127006442c3f019b6447a620c0cae73178  cdefs.h
+2f0d5e6e4dc3350285cf17009265dddcbe12431c111868eea39bc8cb038ab7c1f2acacbb21735c4e9d4a1fd106a8fc0f8611ea33987d4faba37dde5ce6da0750  queue.h
+d9ac210d81feb8ad2655bc80fb065d3fe20ae4417b32b4a1711e6738a4870140005c13373b5d1846ef3ce5ae6da45f2dacef2092881eded0a2e94f6a07752ef3  tree.h
+"
diff --git a/main/bsd-compat-headers/cdefs.h b/main/bsd-compat-headers/cdefs.h
new file mode 100644
index 00000000000..562dffef2db
--- /dev/null
+++ b/main/bsd-compat-headers/cdefs.h
@@ -0,0 +1,31 @@
+#ifndef _SYS_CDEFS_H_
+#define _SYS_CDEFS_H_
+
+#warning usage of non-standard #include <sys/cdefs.h> is deprecated
+
+#undef __P
+#undef __PMT
+
+#define __P(args)	args
+#define __PMT(args)	args
+
+#define __CONCAT(x,y)	x ## y
+#define __STRING(x)	#x
+
+#ifdef  __cplusplus
+# define __BEGIN_DECLS	extern "C" {
+# define __END_DECLS	}
+#else
+# define __BEGIN_DECLS
+# define __END_DECLS
+#endif
+
+#if defined(__GNUC__) && !defined(__cplusplus)
+# define __THROW	__attribute__ ((__nothrow__))
+# define __NTH(fct)	__attribute__ ((__nothrow__)) fct
+#else
+# define __THROW
+# define __NTH(fct)     fct
+#endif
+
+#endif /* _SYS_CDEFS_H_ */
diff --git a/main/libc-dev/sys-queue.h b/main/bsd-compat-headers/queue.h
index a38499a2673..a38499a2673 100644
--- a/main/libc-dev/sys-queue.h
+++ b/main/bsd-compat-headers/queue.h
diff --git a/main/bsd-compat-headers/tree.h b/main/bsd-compat-headers/tree.h
new file mode 100644
index 00000000000..e13d3c4da9b
--- /dev/null
+++ b/main/bsd-compat-headers/tree.h
@@ -0,0 +1,776 @@
+/*	$NetBSD: tree.h,v 1.20 2013/09/14 13:20:45 joerg Exp $	*/
+/*	$OpenBSD: tree.h,v 1.13 2011/07/09 00:19:45 pirofti Exp $	*/
+/*	Modified by Void Linux. */
+/*
+ * Copyright 2002 Niels Provos <provos@citi.umich.edu>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef	_SYS_TREE_H_
+#define	_SYS_TREE_H_
+
+#ifdef __GNUC__
+#define	__GNUC_PREREQ__(x, y)						\
+	((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) ||			\
+	 (__GNUC__ > (x)))
+#else
+#define	__GNUC_PREREQ__(x, y)	0
+#endif
+
+#if __GNUC_PREREQ__(2, 7) || defined(__lint__)
+#define	_sys_tree_h_unused	__attribute__((__unused__))
+#else
+#define	_sys_tree_h_unused	/* delete */
+#endif
+
+/*
+ * This file defines data structures for different types of trees:
+ * splay trees and red-black trees.
+ *
+ * A splay tree is a self-organizing data structure.  Every operation
+ * on the tree causes a splay to happen.  The splay moves the requested
+ * node to the root of the tree and partly rebalances it.
+ *
+ * This has the benefit that request locality causes faster lookups as
+ * the requested nodes move to the top of the tree.  On the other hand,
+ * every lookup causes memory writes.
+ *
+ * The Balance Theorem bounds the total access time for m operations
+ * and n inserts on an initially empty tree as O((m + n)lg n).  The
+ * amortized cost for a sequence of m accesses to a splay tree is O(lg n);
+ *
+ * A red-black tree is a binary search tree with the node color as an
+ * extra attribute.  It fulfills a set of conditions:
+ *	- every search path from the root to a leaf consists of the
+ *	  same number of black nodes,
+ *	- each red node (except for the root) has a black parent,
+ *	- each leaf node is black.
+ *
+ * Every operation on a red-black tree is bounded as O(lg n).
+ * The maximum height of a red-black tree is 2lg (n+1).
+ */
+
+#define SPLAY_HEAD(name, type)						\
+struct name {								\
+	struct type *sph_root; /* root of the tree */			\
+}
+
+#define SPLAY_INITIALIZER(root)						\
+	{ NULL }
+
+#define SPLAY_INIT(root) do {						\
+	(root)->sph_root = NULL;					\
+} while (/*CONSTCOND*/ 0)
+
+#define SPLAY_ENTRY(type)						\
+struct {								\
+	struct type *spe_left; /* left element */			\
+	struct type *spe_right; /* right element */			\
+}
+
+#define SPLAY_LEFT(elm, field)		(elm)->field.spe_left
+#define SPLAY_RIGHT(elm, field)		(elm)->field.spe_right
+#define SPLAY_ROOT(head)		(head)->sph_root
+#define SPLAY_EMPTY(head)		(SPLAY_ROOT(head) == NULL)
+
+/* SPLAY_ROTATE_{LEFT,RIGHT} expect that tmp hold SPLAY_{RIGHT,LEFT} */
+#define SPLAY_ROTATE_RIGHT(head, tmp, field) do {			\
+	SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(tmp, field);	\
+	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
+	(head)->sph_root = tmp;						\
+} while (/*CONSTCOND*/ 0)
+
+#define SPLAY_ROTATE_LEFT(head, tmp, field) do {			\
+	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field);	\
+	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
+	(head)->sph_root = tmp;						\
+} while (/*CONSTCOND*/ 0)
+
+#define SPLAY_LINKLEFT(head, tmp, field) do {				\
+	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
+	tmp = (head)->sph_root;						\
+	(head)->sph_root = SPLAY_LEFT((head)->sph_root, field);		\
+} while (/*CONSTCOND*/ 0)
+
+#define SPLAY_LINKRIGHT(head, tmp, field) do {				\
+	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
+	tmp = (head)->sph_root;						\
+	(head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);	\
+} while (/*CONSTCOND*/ 0)
+
+#define SPLAY_ASSEMBLE(head, node, left, right, field) do {		\
+	SPLAY_RIGHT(left, field) = SPLAY_LEFT((head)->sph_root, field);	\
+	SPLAY_LEFT(right, field) = SPLAY_RIGHT((head)->sph_root, field);\
+	SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(node, field);	\
+	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(node, field);	\
+} while (/*CONSTCOND*/ 0)
+
+/* Generates prototypes and inline functions */
+
+#define SPLAY_PROTOTYPE(name, type, field, cmp)				\
+void name##_SPLAY(struct name *, struct type *);			\
+void name##_SPLAY_MINMAX(struct name *, int);				\
+struct type *name##_SPLAY_INSERT(struct name *, struct type *);		\
+struct type *name##_SPLAY_REMOVE(struct name *, struct type *);		\
+									\
+/* Finds the node with the same key as elm */				\
+static __inline struct type *						\
+name##_SPLAY_FIND(struct name *head, struct type *elm)			\
+{									\
+	if (SPLAY_EMPTY(head))						\
+		return(NULL);						\
+	name##_SPLAY(head, elm);					\
+	if ((cmp)(elm, (head)->sph_root) == 0)				\
+		return (head->sph_root);				\
+	return (NULL);							\
+}									\
+									\
+static __inline _sys_tree_h_unused struct type *			\
+name##_SPLAY_NEXT(struct name *head, struct type *elm)			\
+{									\
+	name##_SPLAY(head, elm);					\
+	if (SPLAY_RIGHT(elm, field) != NULL) {				\
+		elm = SPLAY_RIGHT(elm, field);				\
+		while (SPLAY_LEFT(elm, field) != NULL) {		\
+			elm = SPLAY_LEFT(elm, field);			\
+		}							\
+	} else								\
+		elm = NULL;						\
+	return (elm);							\
+}									\
+									\
+static _sys_tree_h_unused __inline struct type *			\
+name##_SPLAY_MIN_MAX(struct name *head, int val)			\
+{									\
+	name##_SPLAY_MINMAX(head, val);					\
+        return (SPLAY_ROOT(head));					\
+}
+
+/* Main splay operation.
+ * Moves node close to the key of elm to top
+ */
+#define SPLAY_GENERATE(name, type, field, cmp)				\
+struct type *								\
+name##_SPLAY_INSERT(struct name *head, struct type *elm)		\
+{									\
+    if (SPLAY_EMPTY(head)) {						\
+	    SPLAY_LEFT(elm, field) = SPLAY_RIGHT(elm, field) = NULL;	\
+    } else {								\
+	    int __comp;							\
+	    name##_SPLAY(head, elm);					\
+	    __comp = (cmp)(elm, (head)->sph_root);			\
+	    if(__comp < 0) {						\
+		    SPLAY_LEFT(elm, field) = SPLAY_LEFT((head)->sph_root, field);\
+		    SPLAY_RIGHT(elm, field) = (head)->sph_root;		\
+		    SPLAY_LEFT((head)->sph_root, field) = NULL;		\
+	    } else if (__comp > 0) {					\
+		    SPLAY_RIGHT(elm, field) = SPLAY_RIGHT((head)->sph_root, field);\
+		    SPLAY_LEFT(elm, field) = (head)->sph_root;		\
+		    SPLAY_RIGHT((head)->sph_root, field) = NULL;	\
+	    } else							\
+		    return ((head)->sph_root);				\
+    }									\
+    (head)->sph_root = (elm);						\
+    return (NULL);							\
+}									\
+									\
+struct type *								\
+name##_SPLAY_REMOVE(struct name *head, struct type *elm)		\
+{									\
+	struct type *__tmp;						\
+	if (SPLAY_EMPTY(head))						\
+		return (NULL);						\
+	name##_SPLAY(head, elm);					\
+	if ((cmp)(elm, (head)->sph_root) == 0) {			\
+		if (SPLAY_LEFT((head)->sph_root, field) == NULL) {	\
+			(head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);\
+		} else {						\
+			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
+			(head)->sph_root = SPLAY_LEFT((head)->sph_root, field);\
+			name##_SPLAY(head, elm);			\
+			SPLAY_RIGHT((head)->sph_root, field) = __tmp;	\
+		}							\
+		return (elm);						\
+	}								\
+	return (NULL);							\
+}									\
+									\
+void									\
+name##_SPLAY(struct name *head, struct type *elm)			\
+{									\
+	struct type __node, *__left, *__right, *__tmp;			\
+	int __comp;							\
+\
+	SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\
+	__left = __right = &__node;					\
+\
+	while ((__comp = (cmp)(elm, (head)->sph_root)) != 0) {		\
+		if (__comp < 0) {					\
+			__tmp = SPLAY_LEFT((head)->sph_root, field);	\
+			if (__tmp == NULL)				\
+				break;					\
+			if ((cmp)(elm, __tmp) < 0){			\
+				SPLAY_ROTATE_RIGHT(head, __tmp, field);	\
+				if (SPLAY_LEFT((head)->sph_root, field) == NULL)\
+					break;				\
+			}						\
+			SPLAY_LINKLEFT(head, __right, field);		\
+		} else if (__comp > 0) {				\
+			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
+			if (__tmp == NULL)				\
+				break;					\
+			if ((cmp)(elm, __tmp) > 0){			\
+				SPLAY_ROTATE_LEFT(head, __tmp, field);	\
+				if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\
+					break;				\
+			}						\
+			SPLAY_LINKRIGHT(head, __left, field);		\
+		}							\
+	}								\
+	SPLAY_ASSEMBLE(head, &__node, __left, __right, field);		\
+}									\
+									\
+/* Splay with either the minimum or the maximum element			\
+ * Used to find minimum or maximum element in tree.			\
+ */									\
+void name##_SPLAY_MINMAX(struct name *head, int __comp) \
+{									\
+	struct type __node, *__left, *__right, *__tmp;			\
+\
+	SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\
+	__left = __right = &__node;					\
+\
+	while (1) {							\
+		if (__comp < 0) {					\
+			__tmp = SPLAY_LEFT((head)->sph_root, field);	\
+			if (__tmp == NULL)				\
+				break;					\
+			if (__comp < 0){				\
+				SPLAY_ROTATE_RIGHT(head, __tmp, field);	\
+				if (SPLAY_LEFT((head)->sph_root, field) == NULL)\
+					break;				\
+			}						\
+			SPLAY_LINKLEFT(head, __right, field);		\
+		} else if (__comp > 0) {				\
+			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
+			if (__tmp == NULL)				\
+				break;					\
+			if (__comp > 0) {				\
+				SPLAY_ROTATE_LEFT(head, __tmp, field);	\
+				if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\
+					break;				\
+			}						\
+			SPLAY_LINKRIGHT(head, __left, field);		\
+		}							\
+	}								\
+	SPLAY_ASSEMBLE(head, &__node, __left, __right, field);		\
+}
+
+#define SPLAY_NEGINF	-1
+#define SPLAY_INF	1
+
+#define SPLAY_INSERT(name, x, y)	name##_SPLAY_INSERT(x, y)
+#define SPLAY_REMOVE(name, x, y)	name##_SPLAY_REMOVE(x, y)
+#define SPLAY_FIND(name, x, y)		name##_SPLAY_FIND(x, y)
+#define SPLAY_NEXT(name, x, y)		name##_SPLAY_NEXT(x, y)
+#define SPLAY_MIN(name, x)		(SPLAY_EMPTY(x) ? NULL	\
+					: name##_SPLAY_MIN_MAX(x, SPLAY_NEGINF))
+#define SPLAY_MAX(name, x)		(SPLAY_EMPTY(x) ? NULL	\
+					: name##_SPLAY_MIN_MAX(x, SPLAY_INF))
+
+#define SPLAY_FOREACH(x, name, head)					\
+	for ((x) = SPLAY_MIN(name, head);				\
+	     (x) != NULL;						\
+	     (x) = SPLAY_NEXT(name, head, x))
+
+/* Macros that define a red-black tree */
+#define RB_HEAD(name, type)						\
+struct name {								\
+	struct type *rbh_root; /* root of the tree */			\
+}
+
+#define RB_INITIALIZER(root)						\
+	{ NULL }
+
+#define RB_INIT(root) do {						\
+	(root)->rbh_root = NULL;					\
+} while (/*CONSTCOND*/ 0)
+
+#define RB_BLACK	0
+#define RB_RED		1
+#define RB_ENTRY(type)							\
+struct {								\
+	struct type *rbe_left;		/* left element */		\
+	struct type *rbe_right;		/* right element */		\
+	struct type *rbe_parent;	/* parent element */		\
+	int rbe_color;			/* node color */		\
+}
+
+#define RB_LEFT(elm, field)		(elm)->field.rbe_left
+#define RB_RIGHT(elm, field)		(elm)->field.rbe_right
+#define RB_PARENT(elm, field)		(elm)->field.rbe_parent
+#define RB_COLOR(elm, field)		(elm)->field.rbe_color
+#define RB_ROOT(head)			(head)->rbh_root
+#define RB_EMPTY(head)			(RB_ROOT(head) == NULL)
+
+#define RB_SET(elm, parent, field) do {					\
+	RB_PARENT(elm, field) = parent;					\
+	RB_LEFT(elm, field) = RB_RIGHT(elm, field) = NULL;		\
+	RB_COLOR(elm, field) = RB_RED;					\
+} while (/*CONSTCOND*/ 0)
+
+#define RB_SET_BLACKRED(black, red, field) do {				\
+	RB_COLOR(black, field) = RB_BLACK;				\
+	RB_COLOR(red, field) = RB_RED;					\
+} while (/*CONSTCOND*/ 0)
+
+#ifndef RB_AUGMENT
+#define RB_AUGMENT(x)	do {} while (/*CONSTCOND*/ 0)
+#endif
+
+#define RB_ROTATE_LEFT(head, elm, tmp, field) do {			\
+	(tmp) = RB_RIGHT(elm, field);					\
+	if ((RB_RIGHT(elm, field) = RB_LEFT(tmp, field)) != NULL) {	\
+		RB_PARENT(RB_LEFT(tmp, field), field) = (elm);		\
+	}								\
+	RB_AUGMENT(elm);						\
+	if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field)) != NULL) {	\
+		if ((elm) == RB_LEFT(RB_PARENT(elm, field), field))	\
+			RB_LEFT(RB_PARENT(elm, field), field) = (tmp);	\
+		else							\
+			RB_RIGHT(RB_PARENT(elm, field), field) = (tmp);	\
+	} else								\
+		(head)->rbh_root = (tmp);				\
+	RB_LEFT(tmp, field) = (elm);					\
+	RB_PARENT(elm, field) = (tmp);					\
+	RB_AUGMENT(tmp);						\
+	if ((RB_PARENT(tmp, field)))					\
+		RB_AUGMENT(RB_PARENT(tmp, field));			\
+} while (/*CONSTCOND*/ 0)
+
+#define RB_ROTATE_RIGHT(head, elm, tmp, field) do {			\
+	(tmp) = RB_LEFT(elm, field);					\
+	if ((RB_LEFT(elm, field) = RB_RIGHT(tmp, field)) != NULL) {	\
+		RB_PARENT(RB_RIGHT(tmp, field), field) = (elm);		\
+	}								\
+	RB_AUGMENT(elm);						\
+	if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field)) != NULL) {	\
+		if ((elm) == RB_LEFT(RB_PARENT(elm, field), field))	\
+			RB_LEFT(RB_PARENT(elm, field), field) = (tmp);	\
+		else							\
+			RB_RIGHT(RB_PARENT(elm, field), field) = (tmp);	\
+	} else								\
+		(head)->rbh_root = (tmp);				\
+	RB_RIGHT(tmp, field) = (elm);					\
+	RB_PARENT(elm, field) = (tmp);					\
+	RB_AUGMENT(tmp);						\
+	if ((RB_PARENT(tmp, field)))					\
+		RB_AUGMENT(RB_PARENT(tmp, field));			\
+} while (/*CONSTCOND*/ 0)
+
+/* Generates prototypes and inline functions */
+#define RB_PROTOTYPE(name, type, field, cmp)				\
+	RB_PROTOTYPE_INTERNAL(name, type, field, cmp,)
+#define	RB_PROTOTYPE_STATIC(name, type, field, cmp)			\
+	RB_PROTOTYPE_INTERNAL(name, type, field, cmp, _sys_tree_h_unused static)
+#define RB_PROTOTYPE_INTERNAL(name, type, field, cmp, attr)		\
+attr void name##_RB_INSERT_COLOR(struct name *, struct type *);		\
+attr void name##_RB_REMOVE_COLOR(struct name *, struct type *, struct type *);\
+attr struct type *name##_RB_REMOVE(struct name *, struct type *);	\
+attr struct type *name##_RB_INSERT(struct name *, struct type *);	\
+attr struct type *name##_RB_FIND(struct name *, struct type *);		\
+attr struct type *name##_RB_NFIND(struct name *, struct type *);	\
+attr struct type *name##_RB_NEXT(struct type *);			\
+attr struct type *name##_RB_PREV(struct type *);			\
+attr struct type *name##_RB_MINMAX(struct name *, int);			\
+									\
+
+/* Main rb operation.
+ * Moves node close to the key of elm to top
+ */
+#define	RB_GENERATE(name, type, field, cmp)				\
+	RB_GENERATE_INTERNAL(name, type, field, cmp,)
+#define	RB_GENERATE_STATIC(name, type, field, cmp)			\
+	RB_GENERATE_INTERNAL(name, type, field, cmp, _sys_tree_h_unused static)
+#define RB_GENERATE_INTERNAL(name, type, field, cmp, attr)		\
+attr void								\
+name##_RB_INSERT_COLOR(struct name *head, struct type *elm)		\
+{									\
+	struct type *parent, *gparent, *tmp;				\
+	while ((parent = RB_PARENT(elm, field)) != NULL &&		\
+	    RB_COLOR(parent, field) == RB_RED) {			\
+		gparent = RB_PARENT(parent, field);			\
+		if (parent == RB_LEFT(gparent, field)) {		\
+			tmp = RB_RIGHT(gparent, field);			\
+			if (tmp && RB_COLOR(tmp, field) == RB_RED) {	\
+				RB_COLOR(tmp, field) = RB_BLACK;	\
+				RB_SET_BLACKRED(parent, gparent, field);\
+				elm = gparent;				\
+				continue;				\
+			}						\
+			if (RB_RIGHT(parent, field) == elm) {		\
+				RB_ROTATE_LEFT(head, parent, tmp, field);\
+				tmp = parent;				\
+				parent = elm;				\
+				elm = tmp;				\
+			}						\
+			RB_SET_BLACKRED(parent, gparent, field);	\
+			RB_ROTATE_RIGHT(head, gparent, tmp, field);	\
+		} else {						\
+			tmp = RB_LEFT(gparent, field);			\
+			if (tmp && RB_COLOR(tmp, field) == RB_RED) {	\
+				RB_COLOR(tmp, field) = RB_BLACK;	\
+				RB_SET_BLACKRED(parent, gparent, field);\
+				elm = gparent;				\
+				continue;				\
+			}						\
+			if (RB_LEFT(parent, field) == elm) {		\
+				RB_ROTATE_RIGHT(head, parent, tmp, field);\
+				tmp = parent;				\
+				parent = elm;				\
+				elm = tmp;				\
+			}						\
+			RB_SET_BLACKRED(parent, gparent, field);	\
+			RB_ROTATE_LEFT(head, gparent, tmp, field);	\
+		}							\
+	}								\
+	RB_COLOR(head->rbh_root, field) = RB_BLACK;			\
+}									\
+									\
+attr void								\
+name##_RB_REMOVE_COLOR(struct name *head, struct type *parent, struct type *elm) \
+{									\
+	struct type *tmp;						\
+	while ((elm == NULL || RB_COLOR(elm, field) == RB_BLACK) &&	\
+	    elm != RB_ROOT(head)) {					\
+		if (RB_LEFT(parent, field) == elm) {			\
+			tmp = RB_RIGHT(parent, field);			\
+			if (RB_COLOR(tmp, field) == RB_RED) {		\
+				RB_SET_BLACKRED(tmp, parent, field);	\
+				RB_ROTATE_LEFT(head, parent, tmp, field);\
+				tmp = RB_RIGHT(parent, field);		\
+			}						\
+			if ((RB_LEFT(tmp, field) == NULL ||		\
+			    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
+			    (RB_RIGHT(tmp, field) == NULL ||		\
+			    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
+				RB_COLOR(tmp, field) = RB_RED;		\
+				elm = parent;				\
+				parent = RB_PARENT(elm, field);		\
+			} else {					\
+				if (RB_RIGHT(tmp, field) == NULL ||	\
+				    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK) {\
+					struct type *oleft;		\
+					if ((oleft = RB_LEFT(tmp, field)) \
+					    != NULL)			\
+						RB_COLOR(oleft, field) = RB_BLACK;\
+					RB_COLOR(tmp, field) = RB_RED;	\
+					RB_ROTATE_RIGHT(head, tmp, oleft, field);\
+					tmp = RB_RIGHT(parent, field);	\
+				}					\
+				RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
+				RB_COLOR(parent, field) = RB_BLACK;	\
+				if (RB_RIGHT(tmp, field))		\
+					RB_COLOR(RB_RIGHT(tmp, field), field) = RB_BLACK;\
+				RB_ROTATE_LEFT(head, parent, tmp, field);\
+				elm = RB_ROOT(head);			\
+				break;					\
+			}						\
+		} else {						\
+			tmp = RB_LEFT(parent, field);			\
+			if (RB_COLOR(tmp, field) == RB_RED) {		\
+				RB_SET_BLACKRED(tmp, parent, field);	\
+				RB_ROTATE_RIGHT(head, parent, tmp, field);\
+				tmp = RB_LEFT(parent, field);		\
+			}						\
+			if ((RB_LEFT(tmp, field) == NULL ||		\
+			    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
+			    (RB_RIGHT(tmp, field) == NULL ||		\
+			    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
+				RB_COLOR(tmp, field) = RB_RED;		\
+				elm = parent;				\
+				parent = RB_PARENT(elm, field);		\
+			} else {					\
+				if (RB_LEFT(tmp, field) == NULL ||	\
+				    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) {\
+					struct type *oright;		\
+					if ((oright = RB_RIGHT(tmp, field)) \
+					    != NULL)			\
+						RB_COLOR(oright, field) = RB_BLACK;\
+					RB_COLOR(tmp, field) = RB_RED;	\
+					RB_ROTATE_LEFT(head, tmp, oright, field);\
+					tmp = RB_LEFT(parent, field);	\
+				}					\
+				RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
+				RB_COLOR(parent, field) = RB_BLACK;	\
+				if (RB_LEFT(tmp, field))		\
+					RB_COLOR(RB_LEFT(tmp, field), field) = RB_BLACK;\
+				RB_ROTATE_RIGHT(head, parent, tmp, field);\
+				elm = RB_ROOT(head);			\
+				break;					\
+			}						\
+		}							\
+	}								\
+	if (elm)							\
+		RB_COLOR(elm, field) = RB_BLACK;			\
+}									\
+									\
+attr struct type *							\
+name##_RB_REMOVE(struct name *head, struct type *elm)			\
+{									\
+	struct type *child, *parent, *old = elm;			\
+	int color;							\
+	if (RB_LEFT(elm, field) == NULL)				\
+		child = RB_RIGHT(elm, field);				\
+	else if (RB_RIGHT(elm, field) == NULL)				\
+		child = RB_LEFT(elm, field);				\
+	else {								\
+		struct type *left;					\
+		elm = RB_RIGHT(elm, field);				\
+		while ((left = RB_LEFT(elm, field)) != NULL)		\
+			elm = left;					\
+		child = RB_RIGHT(elm, field);				\
+		parent = RB_PARENT(elm, field);				\
+		color = RB_COLOR(elm, field);				\
+		if (child)						\
+			RB_PARENT(child, field) = parent;		\
+		if (parent) {						\
+			if (RB_LEFT(parent, field) == elm)		\
+				RB_LEFT(parent, field) = child;		\
+			else						\
+				RB_RIGHT(parent, field) = child;	\
+			RB_AUGMENT(parent);				\
+		} else							\
+			RB_ROOT(head) = child;				\
+		if (RB_PARENT(elm, field) == old)			\
+			parent = elm;					\
+		(elm)->field = (old)->field;				\
+		if (RB_PARENT(old, field)) {				\
+			if (RB_LEFT(RB_PARENT(old, field), field) == old)\
+				RB_LEFT(RB_PARENT(old, field), field) = elm;\
+			else						\
+				RB_RIGHT(RB_PARENT(old, field), field) = elm;\
+			RB_AUGMENT(RB_PARENT(old, field));		\
+		} else							\
+			RB_ROOT(head) = elm;				\
+		RB_PARENT(RB_LEFT(old, field), field) = elm;		\
+		if (RB_RIGHT(old, field))				\
+			RB_PARENT(RB_RIGHT(old, field), field) = elm;	\
+		if (parent) {						\
+			left = parent;					\
+			do {						\
+				RB_AUGMENT(left);			\
+			} while ((left = RB_PARENT(left, field)) != NULL); \
+		}							\
+		goto color;						\
+	}								\
+	parent = RB_PARENT(elm, field);					\
+	color = RB_COLOR(elm, field);					\
+	if (child)							\
+		RB_PARENT(child, field) = parent;			\
+	if (parent) {							\
+		if (RB_LEFT(parent, field) == elm)			\
+			RB_LEFT(parent, field) = child;			\
+		else							\
+			RB_RIGHT(parent, field) = child;		\
+		RB_AUGMENT(parent);					\
+	} else								\
+		RB_ROOT(head) = child;					\
+color:									\
+	if (color == RB_BLACK)						\
+		name##_RB_REMOVE_COLOR(head, parent, child);		\
+	return (old);							\
+}									\
+									\
+/* Inserts a node into the RB tree */					\
+attr struct type *							\
+name##_RB_INSERT(struct name *head, struct type *elm)			\
+{									\
+	struct type *tmp;						\
+	struct type *parent = NULL;					\
+	int comp = 0;							\
+	tmp = RB_ROOT(head);						\
+	while (tmp) {							\
+		parent = tmp;						\
+		comp = (cmp)(elm, parent);				\
+		if (comp < 0)						\
+			tmp = RB_LEFT(tmp, field);			\
+		else if (comp > 0)					\
+			tmp = RB_RIGHT(tmp, field);			\
+		else							\
+			return (tmp);					\
+	}								\
+	RB_SET(elm, parent, field);					\
+	if (parent != NULL) {						\
+		if (comp < 0)						\
+			RB_LEFT(parent, field) = elm;			\
+		else							\
+			RB_RIGHT(parent, field) = elm;			\
+		RB_AUGMENT(parent);					\
+	} else								\
+		RB_ROOT(head) = elm;					\
+	name##_RB_INSERT_COLOR(head, elm);				\
+	return (NULL);							\
+}									\
+									\
+/* Finds the node with the same key as elm */				\
+attr struct type *							\
+name##_RB_FIND(struct name *head, struct type *elm)			\
+{									\
+	struct type *tmp = RB_ROOT(head);				\
+	int comp;							\
+	while (tmp) {							\
+		comp = cmp(elm, tmp);					\
+		if (comp < 0)						\
+			tmp = RB_LEFT(tmp, field);			\
+		else if (comp > 0)					\
+			tmp = RB_RIGHT(tmp, field);			\
+		else							\
+			return (tmp);					\
+	}								\
+	return (NULL);							\
+}									\
+									\
+/* Finds the first node greater than or equal to the search key */	\
+attr struct type *							\
+name##_RB_NFIND(struct name *head, struct type *elm)			\
+{									\
+	struct type *tmp = RB_ROOT(head);				\
+	struct type *res = NULL;					\
+	int comp;							\
+	while (tmp) {							\
+		comp = cmp(elm, tmp);					\
+		if (comp < 0) {						\
+			res = tmp;					\
+			tmp = RB_LEFT(tmp, field);			\
+		}							\
+		else if (comp > 0)					\
+			tmp = RB_RIGHT(tmp, field);			\
+		else							\
+			return (tmp);					\
+	}								\
+	return (res);							\
+}									\
+									\
+/* ARGSUSED */								\
+attr struct type *							\
+name##_RB_NEXT(struct type *elm)					\
+{									\
+	if (RB_RIGHT(elm, field)) {					\
+		elm = RB_RIGHT(elm, field);				\
+		while (RB_LEFT(elm, field))				\
+			elm = RB_LEFT(elm, field);			\
+	} else {							\
+		if (RB_PARENT(elm, field) &&				\
+		    (elm == RB_LEFT(RB_PARENT(elm, field), field)))	\
+			elm = RB_PARENT(elm, field);			\
+		else {							\
+			while (RB_PARENT(elm, field) &&			\
+			    (elm == RB_RIGHT(RB_PARENT(elm, field), field)))\
+				elm = RB_PARENT(elm, field);		\
+			elm = RB_PARENT(elm, field);			\
+		}							\
+	}								\
+	return (elm);							\
+}									\
+									\
+/* ARGSUSED */								\
+attr struct type *							\
+name##_RB_PREV(struct type *elm)					\
+{									\
+	if (RB_LEFT(elm, field)) {					\
+		elm = RB_LEFT(elm, field);				\
+		while (RB_RIGHT(elm, field))				\
+			elm = RB_RIGHT(elm, field);			\
+	} else {							\
+		if (RB_PARENT(elm, field) &&				\
+		    (elm == RB_RIGHT(RB_PARENT(elm, field), field)))	\
+			elm = RB_PARENT(elm, field);			\
+		else {							\
+			while (RB_PARENT(elm, field) &&			\
+			    (elm == RB_LEFT(RB_PARENT(elm, field), field)))\
+				elm = RB_PARENT(elm, field);		\
+			elm = RB_PARENT(elm, field);			\
+		}							\
+	}								\
+	return (elm);							\
+}									\
+									\
+attr struct type *							\
+name##_RB_MINMAX(struct name *head, int val)				\
+{									\
+	struct type *tmp = RB_ROOT(head);				\
+	struct type *parent = NULL;					\
+	while (tmp) {							\
+		parent = tmp;						\
+		if (val < 0)						\
+			tmp = RB_LEFT(tmp, field);			\
+		else							\
+			tmp = RB_RIGHT(tmp, field);			\
+	}								\
+	return (parent);						\
+}
+
+#define RB_NEGINF	-1
+#define RB_INF	1
+
+#define RB_INSERT(name, x, y)	name##_RB_INSERT(x, y)
+#define RB_REMOVE(name, x, y)	name##_RB_REMOVE(x, y)
+#define RB_FIND(name, x, y)	name##_RB_FIND(x, y)
+#define RB_NFIND(name, x, y)	name##_RB_NFIND(x, y)
+#define RB_NEXT(name, x, y)	name##_RB_NEXT(y)
+#define RB_PREV(name, x, y)	name##_RB_PREV(y)
+#define RB_MIN(name, x)		name##_RB_MINMAX(x, RB_NEGINF)
+#define RB_MAX(name, x)		name##_RB_MINMAX(x, RB_INF)
+
+#define RB_FOREACH(x, name, head)					\
+	for ((x) = RB_MIN(name, head);					\
+	     (x) != NULL;						\
+	     (x) = name##_RB_NEXT(x))
+
+#define RB_FOREACH_FROM(x, name, y)					\
+	for ((x) = (y);							\
+	    ((x) != NULL) && ((y) = name##_RB_NEXT(x), (x) != NULL);	\
+	     (x) = (y))
+
+#define RB_FOREACH_SAFE(x, name, head, y)				\
+	for ((x) = RB_MIN(name, head);					\
+	    ((x) != NULL) && ((y) = name##_RB_NEXT(x), (x) != NULL);	\
+	     (x) = (y))
+
+#define RB_FOREACH_REVERSE(x, name, head)				\
+	for ((x) = RB_MAX(name, head);					\
+	     (x) != NULL;						\
+	     (x) = name##_RB_PREV(x))
+
+#define RB_FOREACH_REVERSE_FROM(x, name, y)				\
+	for ((x) = (y);							\
+	    ((x) != NULL) && ((y) = name##_RB_PREV(x), (x) != NULL);	\
+	     (x) = (y))
+
+#define RB_FOREACH_REVERSE_SAFE(x, name, head, y)			\
+	for ((x) = RB_MAX(name, head);					\
+	    ((x) != NULL) && ((y) = name##_RB_PREV(x), (x) != NULL);	\
+	     (x) = (y))
+
+#endif	/* _SYS_TREE_H_ */
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index b365430a935..b5c9d374d53 100644
--- a/main/btrfs-progs/APKBUILD
+++ b/main/btrfs-progs/APKBUILD
@@ -2,26 +2,53 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=btrfs-progs
-pkgver=5.4.1
+pkgver=6.8
 pkgrel=1
 pkgdesc="BTRFS filesystem utilities"
 url="https://btrfs.wiki.kernel.org"
 arch="all"
-license="GPL-2.0-or-later LGPL-3.0-or-later"
+license="GPL-2.0-or-later"
 depends_dev="linux-headers"
-makedepends="$depends_dev acl-dev asciidoc attr-dev autoconf automake
-	e2fsprogs-dev libtool lzo-dev py3-setuptools python3-dev util-linux-dev
-	xmlto zlib-dev zstd-dev"
-subpackages="$pkgname-doc $pkgname-static $pkgname-dev
-	$pkgname-bash-completion:bashcomp:noarch
-	py3-$pkgname:py3 $pkgname-libs $pkgname-extra"
-source="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar.xz"
+makedepends="$depends_dev
+	acl-dev
+	asciidoc
+	attr-dev
+	e2fsprogs-dev
+	eudev-dev
+	lzo-dev
+	py3-setuptools
+	py3-sphinx
+	python3-dev
+	util-linux-dev
+	xmlto
+	zlib-dev
+	zstd-dev
+	"
+checkdepends="
+	acl
+	coreutils
+	libaio-dev
+	liburing-dev
+	losetup
+	xz
+	"
+subpackages="
+	$pkgname-doc
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-bash-completion
+	py3-$pkgname:py3
+	$pkgname-libs
+	$pkgname-extra
+	$pkgname-openrc
+	"
+source="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar.xz
+	btrfs-scan.initd
+	remove-sphinx_rtd_theme.patch
+	"
 builddir="$srcdir/$pkgname-v$pkgver"
-
-prepare() {
-	default_prepare
-	./autogen.sh
-}
+# most pass, one fails to build (fsstress renameat2)
+options="!check"
 
 build() {
 	./configure \
@@ -35,8 +62,12 @@ build() {
 	make
 }
 
+check() {
+	make test
+}
+
 package() {
-	make -j1 DESTDIR="$pkgdir" install install_python
+	make DESTDIR="$pkgdir" install install_python
 
 	mkdir -p "$pkgdir"/usr/share/doc/$pkgname
 	install -m644 README.md CHANGES \
@@ -47,14 +78,11 @@ package() {
 		mv "$pkgdir"/usr/bin/$i "$pkgdir"/sbin/
 	done
 	mv "$pkgdir"/usr/bin "$pkgdir"/usr/sbin
-}
 
-bashcomp() {
-	pkgdesc="Bash completion script for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
+	install -Dm644 btrfs-completion \
+		"$pkgdir"/usr/share/bash-completion/completions/btrfs
 
-	install -D -m644 "$builddir"/btrfs-completion \
-		"$subpkgdir"/usr/share/bash-completion/completions/btrfs
+	install -Dm755 "$srcdir"/btrfs-scan.initd "$pkgdir"/etc/init.d/btrfs-scan
 }
 
 py3() {
@@ -62,17 +90,18 @@ py3() {
 	provides="py-btrfs-progs=$pkgver-r$pkgrel"  # for backward compatibility
 	replaces="py-btrfs-progs"  # for backward compatibility
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
+	amove usr/lib/python*
 }
 
 extra() {
 	depends="$pkgname"
 	pkgdesc="BTRFS filesystem extra utilities"
 
-	mkdir -p "$subpkgdir"
-	mv "$pkgdir"/usr "$subpkgdir"/
-	rmdir "$subpkgdir"/usr/lib
+	amove usr/sbin
 }
 
-sha512sums="56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f  btrfs-progs-v5.4.1.tar.xz"
+sha512sums="
+adce7c15ef5a19c4fc513f1743b4f65f2c72aa4490703d36c93230abb305c576bd69a32c4bcf19c2b58aee5b5755e0d54fb82fe649a5fe021366eb0d89af4261  btrfs-progs-v6.8.tar.xz
+8f8757e094e5cb3b2748e2b41ba3c50d4535e24c5ced3b31eea6457f61f9fe90894a51d512d306ec8ea20ace6bb8dfe00422d3cbea9734568b492a044d4b2018  btrfs-scan.initd
+c8354118cc4f17d19213a99580c2d8c0cf3173a91c5e42a62c8a7d3b2b66395419136b9761d70503ced0fc959cf8071ae2e2dc1667f000bf0ac86eddc9253bb3  remove-sphinx_rtd_theme.patch
+"
diff --git a/main/btrfs-progs/btrfs-scan.initd b/main/btrfs-progs/btrfs-scan.initd
new file mode 100644
index 00000000000..67a9771f6cf
--- /dev/null
+++ b/main/btrfs-progs/btrfs-scan.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+
+name="btrfs-scan"
+
+depend() {
+  before localmount
+}
+
+start() {
+  /sbin/modprobe btrfs
+  /sbin/btrfs device scan
+}
diff --git a/main/btrfs-progs/remove-sphinx_rtd_theme.patch b/main/btrfs-progs/remove-sphinx_rtd_theme.patch
new file mode 100644
index 00000000000..ef63dfb7860
--- /dev/null
+++ b/main/btrfs-progs/remove-sphinx_rtd_theme.patch
@@ -0,0 +1,28 @@
+With this patch, py3-sphinx_rtd_theme is not needed
+as makedepends and can remain in the community repo
+
+
+--- a/Documentation/conf.py
++++ b/Documentation/conf.py
+@@ -35,7 +35,7 @@
+ 
+ # The theme to use for HTML and HTML Help pages.  See the documentation for
+ # a list of builtin themes.
+-html_theme = 'sphinx_rtd_theme'
++html_theme = 'default'
+ 
+ # Add any paths that contain custom static files (such as style sheets) here,
+ # relative to this directory. They are copied after the builtin static files,
+@@ -75,8 +75,6 @@
+     ('mkfs.btrfs', 'mkfs.btrfs', 'create a btrfs filesystem', '', 8),
+     ('btrfs-man5', 'btrfs', 'topics about the BTRFS filesystem (mount options, supported file attributes and other)', '', 5),
+ ]
+-
+-extensions = [ 'sphinx_rtd_theme' ]
+ 
+ # Cross reference with document and label
+ # Syntax: :docref`Title <rawdocname:label>`
+--- a/Documentation/requirements.txt
++++ /dev/null
+@@ -1 +0,0 @@
+-sphinx_rtd_theme
diff --git a/main/bubblewrap/APKBUILD b/main/bubblewrap/APKBUILD
index 4fd6de402e9..781bfcf3d26 100644
--- a/main/bubblewrap/APKBUILD
+++ b/main/bubblewrap/APKBUILD
@@ -1,48 +1,32 @@
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=bubblewrap
-pkgver=0.4.1
+pkgver=0.9.0
 pkgrel=0
 pkgdesc="Unprivileged sandboxing tool"
 url="https://github.com/containers/bubblewrap"
 arch="all"
 license="LGPL-2.0-or-later"
-options="!check suid" # Testsuite with suid requires sudo binary and some socket operations fail
-makedepends="autoconf automake libcap-dev docbook-xsl"
-subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
-source="bubblewrap-$pkgver.tar.gz::https://github.com/containers/bubblewrap/archive/v$pkgver.tar.gz
-	realpath-workaround.patch
-	"
+options="!check" # Testsuite fails
+makedepends="bash meson libcap-dev docbook-xsl"
+subpackages="$pkgname-doc $pkgname-bash-completion $pkgname-zsh-completion"
+source="bubblewrap-$pkgver.tar.gz::https://github.com/containers/bubblewrap/archive/v$pkgver.tar.gz"
 
-prepare() {
-	NOCONFIGURE=1 ./autogen.sh
-	default_prepare
-}
+# secfixes:
+#   0.4.1-r0:
+#     - CVE-2020-5291
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--with-priv-mode=setuid
-	make
+	abuild-meson \
+		-Drequire_userns=true \
+		. output
+	meson compile -C output
 }
 
 package() {
-	make install DESTDIR="$pkgdir"
-}
-
-bashcomp() {
-	pkgdesc="Bash completions for $pkgname"
-	depends=""
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
-	mkdir -p "$subpkgdir"/usr/share/
-	mv "$pkgdir"/usr/share/bash-completion/ "$subpkgdir"/usr/share/
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-sha512sums="83e036e242503e1364b2d0052bba5127175891203c57bd22ba47a1b1e934fdca64ca620cd0e48c903fa2bc7cdcf92339b8a7fcb8716b54c2e28034b6d6f86adc  bubblewrap-0.4.1.tar.gz
-7e8395aa7801263056b0c072194240f0ae1ee1a3b0acd874baf112a7b7b5e53ac5f688ece9099067bfc1e28e52e81f107964a3288a615cc1eedb1af5f82bbd8e  realpath-workaround.patch"
+sha512sums="
+5197eeae5a6364c19421dc956861f14777831bc5f651a5ccf461c60499fbb4ff965c24afc31063f028f817236734c08031bcc087e3146798627fa421d6b09591  bubblewrap-0.9.0.tar.gz
+"
diff --git a/main/bubblewrap/realpath-workaround.patch b/main/bubblewrap/realpath-workaround.patch
deleted file mode 100644
index 8474faf358e..00000000000
--- a/main/bubblewrap/realpath-workaround.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Musl realpath() implementation currently depends on /proc which is
-not available when setting up pivot root. For the time being just
-fallback to a naive normalization algorithm originated from
-VoidLinux' xbps. If there was path that would have required advanced
-normalizing as provided by realpath() the following parse_mountinfo()
-will fail.
-
-
-diff --git bind-mount.c.orig bind-mount.c
-index 045fa0e..d05b540 100644
---- ./bind-mount.c.orig
-+++ ./bind-mount.c
-@@ -23,6 +23,28 @@
- #include "utils.h"
- #include "bind-mount.h"
- 
-+#ifndef __GLIBC__
-+static char *
-+normpath(char *path)
-+{
-+  char *seg = NULL, *p = NULL;
-+
-+  for (p = path, seg = NULL; *p; p++) {
-+    if (strncmp(p, "/../", 4) == 0 || strncmp(p, "/..", 4) == 0) {
-+      memmove(seg ? seg : p, p+3, strlen(p+3) + 1);
-+      return normpath(path);
-+    } else if (strncmp(p, "/./", 3) == 0 || strncmp(p, "/.", 3) == 0) {
-+      memmove(p, p+2, strlen(p+2) + 1);
-+    } else if (strncmp(p, "//", 2) == 0 || strncmp(p, "/", 2) == 0) {
-+      memmove(p, p+1, strlen(p+1) + 1);
-+    }
-+    if (*p == '/')
-+      seg = p;
-+  }
-+  return path;
-+}
-+#endif
-+
- static char *
- skip_token (char *line, bool eat_whitespace)
- {
-@@ -397,7 +419,11 @@ bind_mount (int           proc_fd,
-      path, so to find it in the mount table we need to do that too. */
-   resolved_dest = realpath (dest, NULL);
-   if (resolved_dest == NULL)
-+#ifdef __GLIBC__
-     return 2;
-+#else
-+    resolved_dest = normpath(strdup(dest));
-+#endif
- 
-   mount_tab = parse_mountinfo (proc_fd, resolved_dest);
-   if (mount_tab[0].mountpoint == NULL)
diff --git a/main/build-base/APKBUILD b/main/build-base/APKBUILD
index 01b89d94c24..709b5eec6bd 100644
--- a/main/build-base/APKBUILD
+++ b/main/build-base/APKBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=build-base
 pkgver=0.5
-pkgrel=1
+pkgrel=3
 url=http://dev.alpinelinux.org/cgit
 pkgdesc="Meta package for build base"
-depends="binutils file gcc g++ make libc-dev fortify-headers"
+depends="binutils file gcc g++ make libc-dev fortify-headers patch"
 if [ "$CHOST" != "$CTARGET" ]; then
 	pkgname="$pkgname-$CTARGET_ARCH"
 	pkgdesc="$pkgdesc ($CTARGET_ARCH)"
 	depends="binutils-$CTARGET_ARCH gcc-$CTARGET_ARCH g++-$CTARGET_ARCH $depends"
 fi
 arch="noarch"
-license=none
+license="MIT"
 options="!check"
 
 build() {
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
deleted file mode 100644
index 6e39de74173..00000000000
--- a/main/busybox-initscripts/APKBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=busybox-initscripts
-pkgver=3.2
-pkgrel=2
-pkgdesc="Init scripts for busybox daemons"
-url="https://git.alpinelinux.org/aports/tree/main/busybox-initscripts"
-arch="noarch"
-license="GPL-2.0-only"
-depends="busybox openrc>=0.24.1-r6"
-makedepends=""
-install="$pkgname.post-install $pkgname.post-upgrade"
-subpackages=""
-options="!check"
-replaces="alpine-baselayout openntpd"
-source="acpid.initd crond.initd dnsd.initd httpd.initd inetd.initd klogd.initd
-	mdev.initd ntpd.initd rdate.initd syslog.initd udhcpd.initd loadkmap.initd
-	watchdog.initd crond.confd klogd.confd ntpd.confd rdate.confd syslog.confd
-	watchdog.confd loadkmap.confd mdev.conf dvbdev ide_links usbdev usbdisk_link
-	xvd_links
-	"
-
-package() {
-	local i
-	cd "$srcdir"
-
-	mkdir -p "$pkgdir"/etc/conf.d "$pkgdir"/etc/init.d "$pkgdir"/lib/mdev\
-		"$pkgdir"/etc/acpi/PWRF
-	for i in *.initd; do
-		install -m755 "$srcdir"/$i "$pkgdir"/etc/init.d/${i%.*} || return 1
-	done
-	for i in *.confd; do
-		install -m644 "$srcdir"/$i "$pkgdir"/etc/conf.d/${i%.*} || return 1
-	done
-	install -m644 mdev.conf "$pkgdir"/etc
-	install -m755 dvbdev ide_links usbdev usbdisk_link xvd_links "$pkgdir"/lib/mdev/
-
-	# poweroff script for acpid
-	cat >"$pkgdir"/etc/acpi/PWRF/00000080 <<EOF
-#!/bin/sh
-poweroff
-EOF
-	chmod +x "$pkgdir"/etc/acpi/PWRF/00000080
-}
-
-sha512sums="dd548670114a92404b8e35fb915fdbe5994498b05b0a418583271c3dd72fb7800950e42c095c902a014eb198c046b8a346d43dccd8e7a158048ae33767c572ed  acpid.initd
-c9d0fb0f8cc27d661d3b4e58c56eb598ca368890576e18ffffd42efdf68ba35537656be9be319b2e2818aa0152d3ca8611bece2433512fbfcd4eed7988765549  crond.initd
-612a7ffb475fd23d33b2a7266b621537ca59b4abd8cb5a9ce03771800ec4f7622a8ff380320f8d768291e4d1a68adfff28f369776a80125940ee40b2e4a5db4d  dnsd.initd
-66bfd7d2a03f4e8a50f08b7057091bfef8e36001eb7c07574ec45da6d75db05a88ae37dbd51e3e3fc7b00a784bf69f8416682ce0454ca16cc072358abdf4d2ce  httpd.initd
-9f7c96a7af5e0f6450b6100b7f99e3fe52759f797dca3a92e8e4ad7c08e6acf384fba2496a4e1e8b77f60ba23195bf2bf58013b16aa03f649a16d6f8aad3f8a9  inetd.initd
-e8deb44d6a7c4cf7e1ced3436ad8c97ed86ff211d2db270cdd4a96e0cc4e6720909a821c35bc2830769da2304f9d6fc732051e205c8e22fe9a65d2798dfe3c42  klogd.initd
-1aed59fb048f0636ee8a095a089a20554a20eda84c70485a894ae60b0f97b792b7ce8e832557457258f59a2750735c4a25e247364ccf1180e9652b292a5f9e8d  mdev.initd
-c30d3936e045c01fdc9d1e9d1c0d2cd79b6dabb453400f067bc4eefa239a41c98bbe3fcd3ae53792e0e6d8fcf4aebc727e4524ec3ccd5741d5659a0a351c1c7e  ntpd.initd
-a95d03564712803fc58c48534f2fbbf23dd8418ffd3a6a06f840e969627892eea518b4fe17f059850665fc056cedf972c26aee52c309805987fb5c59a710bd30  rdate.initd
-acfd45bda4526ab551a30faec1742ad1569aa85e0d315959c3e3a3d6a693f94c74efeb57a00b8791524651e8a61d3f7ea3e3e08a4b0291ec46309f594ee8124c  syslog.initd
-1d4574ec7cc6d7e9952bb50b4fcb10a910868688da03a25aede492835313c686247bde1faa17f50243d61a93bfc1d8fa54cf821d7be908581e365b0f1b6a5588  udhcpd.initd
-1b61a0f1eb40f2ea14bf3ed3441996f343d70fd45858d443f21244f133dcdf1c64433c3deaef769eee4e3e698b405f25e1bbc185a25c351a88ce7d120d61cf00  loadkmap.initd
-0a4f989068f00dd8599433ea1fe0713c405ed871750b918e32db2d6bccefc8b870ea2e16864d1b7c3dd57d63e04b41aa0bf9c882c1a9e8108def141d12072e90  watchdog.initd
-34c6f3197064bb91619b899b28a201bd4d920b18bded3845440b2cb36dc6f16cabf447c96878349b16e46c30184cbe48bac00a01c5f7cf1be038c0b7136064c5  crond.confd
-f9bf43b72142bbb4c0665c1268a3d91586ef8a057dfe64c53b6923815d2db1f669b8080a38311ad89cda0b783a8628700fc5414d834a21d8e48515760bb910f7  klogd.confd
-b0ba67585f39d83320ed6de183d7463a0e163807b9f3dc6f0baa212236056f22aeb2c5399dfdcd54929eb5ae06a15714c2fed133b5888869ed9d9cf589cef843  ntpd.confd
-3d6c4d358e226e0c0462f2003bcf0b6787f91a53f4d6b6db5bfe7748bb0dd392d7cc454058ea8a9b649e8dd2629963a5ad1257c36af04367caeb1923f954daf7  rdate.confd
-bf8173ee33a5d2b61cbdbc1b070e599a17a21e5433a0d8aa9beef71e4ac831304076af8e7e58dc594cdee61562329793afdc57af91e5496bf5fffb9b734a3d9c  syslog.confd
-359af0a4a1841dd6557eaf3e71d39f0d7a2687bad6a8fc6ef436eccf72a40f85c6400a3b7880c7f64d8e460b6af8a0ff3dd5ffc3a4b1aa8eb0d8f7eaf99ee3e4  watchdog.confd
-acbba3385fb2c416362eb9176f24146b617a2e394ee0e00b9eff89350f82468a5ab8396f4f52b0aaf03d341ac6150c73182e808fa3f29a2dc71c69271cdfb811  loadkmap.confd
-cb269ed1ede0714dfc767d03cc0253aed3b30cec74a19d792bad42b844a942941c7e9f2c54e12c85ae2ceef0f173d38b91fe2376d91ffd55b3093f5cf4341fe4  mdev.conf
-ebd82f935da2ca89097234dd8a8f47e179a423652c151123a1f3343f3e1e7bfaba2b8800380e988d4e8f4294545d3a9ab6708ae2e77c5b108b5f091bbce8f94a  dvbdev
-0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec  ide_links
-b2dcf0ded9264334d79fbbb05dd12d649dc3119a060db5893f0e8aeca2141323961c3ba4c822a0ffb00dba848742d5cb374dc77e776b57cecde352a3e8e30f8a  usbdev
-392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8  usbdisk_link
-5db6fa8bbb2d891212187c598cd8703277b3fcb95b5dba6628f7128eb48cc7c1bf4c53885e9d870999c8c95d2fe9cd27609b523596dc553c31b6f72a452a0118  xvd_links"
diff --git a/main/busybox-initscripts/acpid.initd b/main/busybox-initscripts/acpid.initd
deleted file mode 100644
index 2e73b777bbb..00000000000
--- a/main/busybox-initscripts/acpid.initd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-
-name="busybox acpid"
-command="/sbin/acpid"
-command_args="$ACPID_OPTS"
-pidfile="/var/run/acpid.pid"
-start_stop_daemon_args="-g wheel -k 027"
-
-depend() {
-	need dev localmount
-	after hwdrivers modules
-	keyword -vserver -lxc
-}
-
diff --git a/main/busybox-initscripts/busybox-initscripts.post-install b/main/busybox-initscripts/busybox-initscripts.post-install
deleted file mode 100644
index c393627437f..00000000000
--- a/main/busybox-initscripts/busybox-initscripts.post-install
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# this is for upgraders
-addgroup -S -g 23 input 2>/dev/null
-
-# this is for upgraders
-if [ -L /etc/runlevels/boot/mdev ] && ! [ -L /etc/runlevels/sysinit/mdev ]; then
-	mkdir -p /etc/runlevels/sysinit
-	mv /etc/runlevels/boot/mdev /etc/runlevels/sysinit/ 2>/dev/null
-fi
-
-rename_service() {
-	oldname="$1"
-	newname="$2"
-
-	ret=1
-	for link in /run/openrc/*/${oldname} /etc/runlevels/*/${oldname}; do
-		newlink="${link%/*}/${newname}"
-		if [ -L "$link" ] && ! [ -L "$newlink" ]; then
-			target="$(readlink $link)"
-			ln -s "${target%/*}/$newname" "$newlink"
-			rm "$link"
-			ret=0
-			continue
-		fi
-		if [ -d "$link" ] && ! [ -d "$newlink" ]; then
-			mv "$link" "$newlink"
-			ret=0
-		fi
-	done
-
-	return $ret
-}
-
-# cron was renamed to crond
-rename_service cron crond
-
-# keymaps was renamed to loadkmap
-rename_service keymaps loadkmap && cat 1>&2 <<-EOF
-*
-* The OpenRC keymaps service was renamed to loadkmap. You might want
-* to rename your previous configuration file /etc/conf.d/keymaps to
-* /etc/conf.d/loadkmap. Also make sure that /etc/init.d/keymaps was
-* removed and remove it manually if it wasn't.
-*
-EOF
-
-exit 0
-
diff --git a/main/busybox-initscripts/busybox-initscripts.post-upgrade b/main/busybox-initscripts/busybox-initscripts.post-upgrade
deleted file mode 120000
index ef17c501472..00000000000
--- a/main/busybox-initscripts/busybox-initscripts.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-busybox-initscripts.post-install
\ No newline at end of file
diff --git a/main/busybox-initscripts/crond.initd b/main/busybox-initscripts/crond.initd
deleted file mode 100644
index afaf384acd8..00000000000
--- a/main/busybox-initscripts/crond.initd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-
-name="busybox $SVCNAME"
-command="/usr/sbin/$SVCNAME"
-pidfile="/var/run/$SVCNAME.pid"
-command_args="$CRON_OPTS"
-
-depend() {
-	need localmount
-	need logger
-}
diff --git a/main/busybox-initscripts/dnsd.initd b/main/busybox-initscripts/dnsd.initd
deleted file mode 100644
index dc6ddb730b0..00000000000
--- a/main/busybox-initscripts/dnsd.initd
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-
-name="busybox $SVCNAME"
-command="/usr/sbin/$SVCNAME"
-command_args="$DNSD_OPTS"
-pidfile="/var/run/$SVCNAME.pid"
-command_background=true
-
-depend() {
-	need net
-	after firewall
-}
-
diff --git a/main/busybox-initscripts/dvbdev b/main/busybox-initscripts/dvbdev
deleted file mode 100644
index f0186c176cd..00000000000
--- a/main/busybox-initscripts/dvbdev
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# MDEV=dvb0.demux1 -> ADAPTER=dvb0 -> N=0
-ADAPTER=${MDEV%.*}
-N=${ADAPTER#dvb}
-# MDEV=dvb0.demux1 -> DEVB_DEV=demux1
-DVB_DEV=${MDEV#*.}
-
-case "$ACTION" in
-	add|"")
-		mkdir -p dvb/adapter${N}
-		mv ${MDEV} dvb/adapter${N}/${DVB_DEV}
-		;;
-	remove)
-		rm -f dvb/adapter${N}/${DVB_DEV}
-		rmdir dvb/adapter${N} 2>/dev/null
-		rmdir dvb/ 2>/dev/null
-esac
diff --git a/main/busybox-initscripts/httpd.initd b/main/busybox-initscripts/httpd.initd
deleted file mode 100644
index 001aeb5a383..00000000000
--- a/main/busybox-initscripts/httpd.initd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-
-name="busybox $SVCNAME"
-command="/usr/sbin/$SVCNAME"
-command_args="$HTTPD_OPTS"
-
-depend() {
-	need net localmount
-	after firewall
-}
-
diff --git a/main/busybox-initscripts/ide_links b/main/busybox-initscripts/ide_links
deleted file mode 100644
index be0c95aa9c0..00000000000
--- a/main/busybox-initscripts/ide_links
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-[ -f /proc/ide/$MDEV/media ] || exit
-
-media=`cat /proc/ide/$MDEV/media`
-for i in $media $media[0-9]* ; do
-	if [ "`readlink $i 2>/dev/null`" = $MDEV ] ; then
-		LINK=$i
-		break
-	fi
-done
-
-# link exist, remove if necessary and exit
-if [ "$LINK" ] ; then
-	[ "$ACTION" = remove ] && rm $LINK
-	exit
-fi
-
-# create a link
-num=`ls $media[0-9]* 2>/dev/null | wc -l`
-ln -sf $MDEV "$media`echo $num`"
-[ -e "$media" ] || ln -sf $MDEV "$media"
-
diff --git a/main/busybox-initscripts/inetd.initd b/main/busybox-initscripts/inetd.initd
deleted file mode 100644
index 2f0c6fa3162..00000000000
--- a/main/busybox-initscripts/inetd.initd
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-
-name="busybox $SVCNAME"
-command="/usr/sbin/$SVCNAME"
-command_args="-f $INETD_OPTS"
-pidfile="/var/run/$SVCNAME.pid"
-command_background=true
-
-depend() {
-	need net localmount
-	after firewall
-}
-
diff --git a/main/busybox-initscripts/klogd.initd b/main/busybox-initscripts/klogd.initd
deleted file mode 100644
index 6f83ca1c302..00000000000
--- a/main/busybox-initscripts/klogd.initd
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/openrc-run
-
-name="busybox klogd"
-command="/sbin/klogd"
-command_args="${KLOGD_OPTS}"
-pidfile="/var/run/klogd.pid"
-
-depend() {
-	need clock hostname localmount syslog
-	before net
-	keyword -vserver -lxc
-}
diff --git a/main/busybox-initscripts/mdev.conf b/main/busybox-initscripts/mdev.conf
deleted file mode 100644
index 5285139b53d..00000000000
--- a/main/busybox-initscripts/mdev.conf
+++ /dev/null
@@ -1,126 +0,0 @@
-#
-# This is a sample mdev.conf.
-#
-
-# Devices:
-# Syntax: %s %d:%d %s
-# devices user:group mode
-
-$MODALIAS=.*	root:root	0660	@modprobe -q -b "$MODALIAS"
-
-# null does already exist; therefore ownership has to be changed with command
-null	root:root 0666	@chmod 666 $MDEV
-zero	root:root 0666
-grsec	root:root 0660
-full	root:root 0666
-
-random	root:root 0666
-urandom	root:root 0444
-hwrandom root:root 0660
-
-console root:tty 0600
-
-# load frambuffer console when first frambuffer is found
-fb0	root:video 0660 @modprobe -q -b fbcon
-vchiq	root:video 0660
-
-fd0	root:floppy 0660
-kmem	root:root 0640
-mem	root:root 0640
-port	root:root 0640
-ptmx	root:tty 0666
-
-# Kernel-based Virtual Machine.
-kvm		root:kvm 660
-
-# ram.*
-ram([0-9]*)	root:disk 0660 >rd/%1
-loop([0-9]+)	root:disk 0660 >loop/%1
-sd[a-z].*	root:disk 0660 */lib/mdev/usbdisk_link
-hd[a-z][0-9]*	root:disk 0660 */lib/mdev/ide_links
-md[0-9]		root:disk 0660
-
-tty		root:tty 0666
-tty[0-9]	root:root 0600
-tty[0-9][0-9]	root:tty 0660
-ttyS[0-9]*	root:uucp 0660
-pty.*		root:tty 0660
-vcs[0-9]*	root:tty 0660
-vcsa[0-9]*	root:tty 0660
-
-# rpi bluetooth
-#ttyAMA0         root:tty 660 @btattach -B /dev/$MDEV -P bcm -S 115200 -N &
-
-ttyUSB[0-9]	root:dialout 0660 @ln -sf $MDEV modem
-ttyLTM[0-9]	root:dialout 0660 @ln -sf $MDEV modem
-ttySHSF[0-9]	root:dialout 0660 @ln -sf $MDEV modem
-slamr		root:dialout 0660 @ln -sf $MDEV slamr0
-slusb		root:dialout 0660 @ln -sf $MDEV slusb0
-fuse		root:root  0666
-
-# dri device
-dri/.*		root:video 0660
-card[0-9]	root:video 0660 =dri/
-
-# alsa sound devices and audio stuff
-pcm.*		root:audio 0660	=snd/
-control.*	root:audio 0660	=snd/
-midi.*		root:audio 0660	=snd/
-seq		root:audio 0660	=snd/
-timer		root:audio 0660	=snd/
-
-adsp		root:audio 0660 >sound/
-audio		root:audio 0660 >sound/
-dsp		root:audio 0660 >sound/
-mixer		root:audio 0660 >sound/
-sequencer.*	root:audio 0660 >sound/
-
-SUBSYSTEM=sound;.*	root:audio 0660
-
-# misc stuff
-agpgart		root:root 0660  >misc/
-psaux		root:root 0660  >misc/
-rtc		root:root 0664  >misc/
-
-# input stuff
-event[0-9]+	root:input 0640 =input/
-mice		root:input 0640 =input/
-mouse[0-9]	root:input 0640 =input/
-js[0-9]		root:input 0640 =input/
-ts[0-9]		root:input 0600 =input/
-
-# v4l stuff
-vbi[0-9]	root:video 0660 >v4l/
-video[0-9]+	root:video 0660 >v4l/
-
-# dvb stuff
-dvb.*		root:video 0660 */lib/mdev/dvbdev
-
-# load drivers for usb devices
-usb[0-9]+	root:root 0660 */lib/mdev/usbdev
-
-# net devices
-# 666 is fine: https://www.kernel.org/doc/Documentation/networking/tuntap.txt
-net/tun[0-9]*	root:netdev 0666
-net/tap[0-9]*	root:netdev 0666
-
-# zaptel devices
-zap(.*)		root:dialout 0660 =zap/%1
-dahdi!(.*)	root:dialout 0660 =dahdi/%1
-dahdi/(.*)	root:dialout 0660 =dahdi/%1
-
-# raid controllers
-cciss!(.*)	root:disk 0660 =cciss/%1
-cciss/(.*)	root:disk 0660 =cciss/%1
-ida!(.*)	root:disk 0660 =ida/%1
-ida/(.*)	root:disk 0660 =ida/%1
-rd!(.*)		root:disk 0660 =rd/%1
-rd/(.*)		root:disk 0660 =rd/%1
-
-sr0		root:cdrom 0660 @ln -sf $MDEV cdrom
-
-# xen stuff
-xvd[a-z]	root:root 0660 */lib/mdev/xvd_links
-
-# fallback for any!device -> any/device
-(.*)!(.*)       root:root 0660 =%1/%2
diff --git a/main/busybox-initscripts/mdev.initd b/main/busybox-initscripts/mdev.initd
deleted file mode 100644
index 9dbb9948965..00000000000
--- a/main/busybox-initscripts/mdev.initd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	provide dev
-	need sysfs dev-mount
-	before checkfs fsck
-	keyword -vserver -lxc
-}
-
-start() {
-	# check if udev is specified on cmd line
-	if get_bootparam "udev"; then
-		ewarn "Skipping mdev as udev requested in kernel cmdline"
-		return 0
-	fi
-	
-	ebegin "Starting busybox mdev"
-	mkdir -p /dev
-
-	# use mdev for hotplug
-	echo "/sbin/mdev" > /proc/sys/kernel/hotplug
-	
-	# mdev -s will not create /dev/usb[1-9] devices with recent kernels
-	# so we trigger hotplug events for usb for now
-	for i in $(find /sys/devices -name 'usb[0-9]*'); do
-		[ -e $i/uevent ] && echo add > $i/uevent
-	done
-
-	# create devices
-	mdev -s
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping busybox mdev"
-	echo "" > /proc/sys/kernel/hotplug
-	eend 
-}
-
diff --git a/main/busybox-initscripts/ntpd.initd b/main/busybox-initscripts/ntpd.initd
deleted file mode 100755
index ad738057da4..00000000000
--- a/main/busybox-initscripts/ntpd.initd
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-
-name="busybox $SVCNAME"
-command="/usr/sbin/$SVCNAME"
-command_args="${NTPD_OPTS:--N -p pool.ntp.org}"
-pidfile="/var/run/$SVCNAME.pid"
-
-depend() {
-	need net
-	provide ntp-client
-	use dns
-}
-
diff --git a/main/busybox-initscripts/rdate.confd b/main/busybox-initscripts/rdate.confd
deleted file mode 100644
index 93c67861696..00000000000
--- a/main/busybox-initscripts/rdate.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# Set the ntp server here
-NTP_HOST=pool.net.org
diff --git a/main/busybox-initscripts/syslog.initd b/main/busybox-initscripts/syslog.initd
deleted file mode 100644
index 629d86843b2..00000000000
--- a/main/busybox-initscripts/syslog.initd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-
-description="Message logging system"
-
-name="busybox syslog"
-command="/sbin/syslogd"
-command_args="${SYSLOGD_OPTS}"
-pidfile="/var/run/syslogd.pid"
-start_stop_daemon_args="-g wheel -k 027"
-
-depend() {
-	need clock hostname localmount
-	provide logger
-}
diff --git a/main/busybox-initscripts/udhcpd.initd b/main/busybox-initscripts/udhcpd.initd
deleted file mode 100644
index 02c7620d275..00000000000
--- a/main/busybox-initscripts/udhcpd.initd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-
-name="busybox $SVCNAME"
-command="/usr/sbin/$SVCNAME"
-command_args="$UDHCPD_OPTS "
-pidfile="/var/run/$SVCNAME.pid"
-
-depend() {
-	need net
-	after firewall
-}
diff --git a/main/busybox-initscripts/usbdev b/main/busybox-initscripts/usbdev
deleted file mode 100755
index c811736ddae..00000000000
--- a/main/busybox-initscripts/usbdev
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# mdev -s will not set SUBSYSTEM or DEVNAME so we trigger a hotplug event
-if [ "$SUBSYSTEM" != "usb" ] || [ "$DEVTYPE" != "usb_device" ]; then
-	uev=/sys/bus/usb/devices/$MDEV/uevent
-	[ -e "$uev" ] && echo "add" > "$uev"
-	exit
-fi
-
-[ -n "$DEVNAME" ] || exit
-
-case "$ACTION" in
-add)
-	mkdir -p "${DEVNAME%/*}"
-	mv $MDEV $DEVNAME
-	# autoload driver
-	for i in /sys/$DEVPATH/*/modalias; do
-		[ -e "$i" ] && echo $i
-	done | xargs sort -u | xargs modprobe -a 2>/dev/null
-	;;
-remove)
-	rm $DEVNAME
-	;;
-esac
-
diff --git a/main/busybox-initscripts/usbdisk_link b/main/busybox-initscripts/usbdisk_link
deleted file mode 100644
index 750242bb5cf..00000000000
--- a/main/busybox-initscripts/usbdisk_link
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# NOTE: since mdev -s only provide $MDEV, don't depend on any hotplug vars.
-
-current=$(readlink usbdisk)
-
-if [ "$current" = "$MDEV" ] && [ "$ACTION" = "remove" ]; then
-	rm -f usbdisk usba1 
-fi
-[ -n "$current" ] && exit
-
-if [ -e /sys/block/$MDEV ]; then
-	SYSDEV=$(readlink -f /sys/block/$MDEV/device)
-	# if /sys device path contains '/usb[0-9]' then we assume its usb
-	# also, if its an usb without partitions we require FAT
-	if [ "${SYSDEV##*/usb[0-9]}" != "$SYSDEV" ]; then
-		# do not create link if there is not FAT
-		dd if=/dev/$MDEV bs=512 count=1 2>/dev/null | strings | grep FAT >/dev/null || exit 0
-
-		ln -sf $MDEV usbdisk
-		# keep this for compat. people have it in fstab
-		ln -sf $MDEV usba1
-	fi
-
-elif [ -e /sys/block/*/$MDEV ] ; then
-	PARENT=$(dirname /sys/block/*/$MDEV)
-	SYSDEV=$(readlink -f $PARENT/device)
-	if [ "${SYSDEV##*/usb[0-9]}" != "$SYSDEV" ]; then
-		ln -sf $MDEV usbdisk
-		# keep this for compat. people have it in fstab
-		ln -sf $MDEV usba1
-	fi
-fi
-
diff --git a/main/busybox-initscripts/watchdog.initd b/main/busybox-initscripts/watchdog.initd
deleted file mode 100644
index 5b0435c920a..00000000000
--- a/main/busybox-initscripts/watchdog.initd
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-
-name="busybox watchdog"
-command="/sbin/watchdog"
-command_args="${WATCHDOG_OPTS} ${WATCHDOG_DEV}"
-pidfile="/var/run/watchdog.pid"
-depend() {
-	need dev
-	after hwdrivers
-}
-
-start_pre() {
-	if ! [ -n "$WATCHDOG_DEV" ]; then
-		eerror "WATCHDOG_DEV is not set"
-		return 1
-	fi
-}
diff --git a/main/busybox-initscripts/xvd_links b/main/busybox-initscripts/xvd_links
deleted file mode 100644
index 8874d869169..00000000000
--- a/main/busybox-initscripts/xvd_links
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-[ -f /sys/block/$MDEV/capability ] || exit
-
-caps="0x`cat /sys/block/$MDEV/capability`"
-
-if [ $(($caps & 8)) -gt 0 ]; then
-	case $ACTION in
-	add|"")	ln -sf $MDEV cdrom ;;
-	remove) [ "`readlink cdrom 2>/dev/null`" = $MDEV ] && rm -f cdrom ;;
-	esac
-fi
diff --git a/main/busybox/0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch b/main/busybox/0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
deleted file mode 100644
index 47f9f9a6176..00000000000
--- a/main/busybox/0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From eceebc4fbf064ca04d0f0a639c8a7c600190170f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 13 Jan 2019 19:07:16 +0100
-Subject: [PATCH] adduser: default to /sbin/nologin as shell for system
- accounts
-
----
- loginutils/adduser.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/loginutils/adduser.c b/loginutils/adduser.c
-index b2b5be5b3..9326a9795 100644
---- a/loginutils/adduser.c
-+++ b/loginutils/adduser.c
-@@ -235,7 +235,7 @@ int adduser_main(int argc UNUSED_PARAM, char **argv)
- 			usegroup = "nogroup";
- 		}
- 		if (!(opts & OPT_SHELL)) {
--			pw.pw_shell = (char *) "/bin/false";
-+			pw.pw_shell = (char *) "/sbin/nologin";
- 		}
- 	}
- 	pw.pw_gid = usegroup ? xgroup2gid(usegroup) : -1; /* exits on failure */
diff --git a/main/busybox/0001-ln-no-target-directory-implies-no-dereference.patch b/main/busybox/0001-ln-no-target-directory-implies-no-dereference.patch
deleted file mode 100644
index e4f50718842..00000000000
--- a/main/busybox/0001-ln-no-target-directory-implies-no-dereference.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 71b268c7d962a819f88050c2567dced975aa249e Mon Sep 17 00:00:00 2001
-From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Date: Tue, 8 Oct 2019 14:07:50 +0200
-Subject: [PATCH] ln: --no-target-directory implies --no-dereference
-
-as in GNU coreutils
-
-Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- coreutils/ln.c | 25 +++++++++++++++++++++----
- 1 file changed, 21 insertions(+), 4 deletions(-)
-
-diff --git a/coreutils/ln.c b/coreutils/ln.c
-index ea2d10eab..5591e8335 100644
---- a/coreutils/ln.c
-+++ b/coreutils/ln.c
-@@ -41,7 +41,6 @@
- 
- /* This is a NOEXEC applet. Be very careful! */
- 
--
- #define LN_SYMLINK          (1 << 0)
- #define LN_FORCE            (1 << 1)
- #define LN_NODEREFERENCE    (1 << 2)
-@@ -63,7 +62,22 @@ int ln_main(int argc, char **argv)
- 	int (*link_func)(const char *, const char *);
- 
- 	opts = getopt32(argv, "^" "sfnbS:vT" "\0" "-1", &suffix);
--
-+/*
-+	-s, --symbolic		make symbolic links instead of hard links
-+	-f, --force		remove existing destination files
-+	-n, --no-dereference	treat LINK_NAME as a normal file if it is a symbolic link to a directory
-+	-b			like --backup but does not accept an argument
-+	--backup[=CONTROL]	make a backup of each existing destination file
-+	-S, --suffix=SUFFIX	override the usual backup suffix
-+	-v, --verbose
-+	-T, --no-target-directory
-+	-d, -F, --directory	allow the superuser to attempt to hard link directories
-+	-i, --interactive	prompt whether to remove destinations
-+	-L, --logical		dereference TARGETs that are symbolic links
-+	-P, --physical		make hard links directly to symbolic links
-+	-r, --relative		create symbolic links relative to link location
-+	-t, --target-directory=DIRECTORY	specify the DIRECTORY in which to create the links
-+ */
- 	last = argv[argc - 1];
- 	argv += optind;
- 	argc -= optind;
-@@ -86,8 +100,11 @@ int ln_main(int argc, char **argv)
- 		src = last;
- 
- 		if (is_directory(src,
--		                (opts & LN_NODEREFERENCE) ^ LN_NODEREFERENCE
--		                )
-+				/*followlinks:*/ !(opts & (LN_NODEREFERENCE|LN_LINKFILE))
-+				/* Why LN_LINKFILE does not follow links:
-+				 * -T/--no-target-directory implies -n/--no-dereference
-+				 */
-+				)
- 		) {
- 			if (opts & LN_LINKFILE) {
- 				bb_error_msg_and_die("'%s' is a directory", src);
--- 
-2.20.1
-
diff --git a/main/busybox/0001-modutils-check-ELF-header-before-calling-finit_modul.patch b/main/busybox/0001-modutils-check-ELF-header-before-calling-finit_modul.patch
new file mode 100644
index 00000000000..dd83a7605fe
--- /dev/null
+++ b/main/busybox/0001-modutils-check-ELF-header-before-calling-finit_modul.patch
@@ -0,0 +1,149 @@
+From e1a02faa656420a3c32fc8733e0566c2e430e6d6 Mon Sep 17 00:00:00 2001
+From: Qu Wenruo <wqu@suse.com>
+Date: Sun, 3 Jan 2021 16:00:14 +0000
+Subject: [PATCH] modutils: check ELF header before calling finit_module()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+finit_module() and init_module() system calls have clear specification
+to only accept valid ELF image.
+
+Although we try finit_module() on compressed modules to let the kernel
+determine if it's an ELF image, but it's not ideal, especially when
+newer kernel will complain when some invalid files/memory is passed in.
+
+Treat the kernel better by just doing a very basic ELF header check
+before calling finit_module().
+
+Signed-off-by: Qu Wenruo <wqu at suse.com>
+---
+ modutils/modprobe-small.c | 33 ++++++++++++++++++++++++++++++++-
+ modutils/modutils.c       | 37 ++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 68 insertions(+), 2 deletions(-)
+
+diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
+index b61651621..4763e0811 100644
+--- a/modutils/modprobe-small.c
++++ b/modutils/modprobe-small.c
+@@ -24,6 +24,7 @@
+ //kbuild:lib-$(CONFIG_MODPROBE_SMALL) += modprobe-small.o
+ 
+ #include "libbb.h"
++#include <elf.h> /* for ELF header magic */
+ /* After libbb.h, since it needs sys/types.h on some systems */
+ #include <sys/utsname.h> /* uname() */
+ #include <fnmatch.h>
+@@ -249,6 +250,33 @@ static const char *moderror(int err)
+ 	}
+ }
+ 
++#ifdef __NR_finit_module
++/*
++ * Return:
++ * 0 on success,
++ * <0 for error.
++ *
++ * finit_module()/init_module() only accepts ELF format.
++ * Do basic ELF check to avoid calling finit_module() with compressed module.
++ */
++static int check_elf_header(int fd)
++{
++	unsigned char buf[EI_NIDENT];
++	int ret;
++
++	ret = pread(fd, buf, sizeof(buf), 0);
++	if (ret < sizeof(buf))
++		return -EIO;
++	if (buf[EI_MAG0] != ELFMAG0 ||
++	    buf[EI_MAG1] != ELFMAG1 ||
++	    buf[EI_MAG2] != ELFMAG2 ||
++	    buf[EI_MAG3] != ELFMAG3)
++		return -EINVAL;
++	/* Other more comprehensive check will be done inside kernel */
++	return 0;
++}
++#endif
++
+ static int load_module(const char *fname, const char *options)
+ {
+ #if 1
+@@ -272,7 +300,10 @@ static int load_module(const char *fname, const char *options)
+ 	{
+ 		int fd = open(fname, O_RDONLY | O_CLOEXEC);
+ 		if (fd >= 0) {
+-			r = finit_module(fd, options, 0) != 0;
++			if (!check_elf_header(fd))
++				r = finit_module(fd, options, 0) != 0;
++			else
++				r = 1;
+ 			close(fd);
+ 		}
+ 	}
+diff --git a/modutils/modutils.c b/modutils/modutils.c
+index f7ad5e805..037d609e4 100644
+--- a/modutils/modutils.c
++++ b/modutils/modutils.c
+@@ -7,6 +7,7 @@
+  */
+ #include "modutils.h"
+ 
++#include <elf.h>
+ #include <sys/syscall.h>
+ 
+ #define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts)
+@@ -186,6 +187,33 @@ void* FAST_FUNC try_to_mmap_module(const char *filename, size_t *image_size_p)
+ }
+ #endif
+ 
++#ifdef __NR_finit_module
++/*
++ * Return:
++ * 0 on success,
++ * <0 for error.
++ *
++ * finit_module()/init_module() only accepts ELF format.
++ * Do basic ELF check to avoid calling finit_module() with compressed module.
++ */
++static int check_elf_header(int fd)
++{
++	unsigned char buf[EI_NIDENT];
++	int ret;
++
++	ret = pread(fd, buf, sizeof(buf), 0);
++	if (ret < sizeof(buf))
++		return -EIO;
++	if (buf[EI_MAG0] != ELFMAG0 ||
++	    buf[EI_MAG1] != ELFMAG1 ||
++	    buf[EI_MAG2] != ELFMAG2 ||
++	    buf[EI_MAG3] != ELFMAG3)
++		return -EINVAL;
++	/* Other more comprehensive check will be done inside kernel */
++	return 0;
++}
++#endif
++
+ /* Return:
+  * 0 on success,
+  * -errno on open/read error,
+@@ -212,12 +240,19 @@ int FAST_FUNC bb_init_module(const char *filename, const char *options)
+ 	 * to only allow loading of modules off of secure storage (like a read-
+ 	 * only rootfs) which needs the finit_module call.  If it fails, we fall
+ 	 * back to normal module loading to support compressed modules.
++	 *
++	 * Note that finit_module()/init_module() only accept ELF image, do
++	 * basic check before calling finit_module() to avoid kernel
++	 * complaining.
+ 	 */
+ # ifdef __NR_finit_module
+ 	{
+ 		int fd = open(filename, O_RDONLY | O_CLOEXEC);
+ 		if (fd >= 0) {
+-			rc = finit_module(fd, options, 0) != 0;
++			if (!check_elf_header(fd))
++				rc = finit_module(fd, options, 0) != 0;
++			else
++				rc = 1;
+ 			close(fd);
+ 			if (rc == 0)
+ 				return rc;
diff --git a/main/busybox/0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch b/main/busybox/0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
deleted file mode 100644
index 0cc4db95c91..00000000000
--- a/main/busybox/0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From fa5c4b2e60a98944863097b448960d0744916b1f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Wed, 13 Feb 2019 22:32:44 +0100
-Subject: [PATCH] nologin: Install applet to /sbin instead of /usr/sbin
-
-This is required to retain compatibility with our old custom nologin
-applet written in C which was also installed to /sbin.
-
-Compatibility with the old path is required because login shell paths
-are hardcoded in /etc/passwd.
----
- util-linux/nologin.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util-linux/nologin.c b/util-linux/nologin.c
-index 5e5e42305..b03470ac6 100644
---- a/util-linux/nologin.c
-+++ b/util-linux/nologin.c
-@@ -19,7 +19,7 @@
- //config:	If you know these will be available externally you can
- //config:	disable this option.
- 
--//applet:IF_NOLOGIN(APPLET_SCRIPTED(nologin, scripted, BB_DIR_USR_SBIN, BB_SUID_DROP, nologin))
-+//applet:IF_NOLOGIN(APPLET_SCRIPTED(nologin, scripted, BB_DIR_SBIN, BB_SUID_DROP, nologin))
- 
- //usage:#define nologin_trivial_usage
- //usage:	""
diff --git a/main/busybox/0001-properly-fix-wget-https-support.patch b/main/busybox/0001-properly-fix-wget-https-support.patch
deleted file mode 100644
index 81ac38e3504..00000000000
--- a/main/busybox/0001-properly-fix-wget-https-support.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 4fcea48c7a0c6b63a316764932f7ba4854e444f9 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 30 May 2018 09:52:20 +0000
-Subject: [PATCH] properly fix wget https support
-
-See: https://git.alpinelinux.org/cgit/aports/commit/?id=1d0560a9b6b5597b191e5aff69a31c2fe0aba273
----
- networking/wget.c | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/networking/wget.c b/networking/wget.c
-index 30683dfc0..1ad4e1769 100644
---- a/networking/wget.c
-+++ b/networking/wget.c
-@@ -51,7 +51,6 @@
- //it also enables FTPS support, but it's not well tested yet
- //config:	default y
- //config:	depends on WGET
--//config:	select TLS
- //config:	help
- //config:	wget will use internal TLS code to connect to https:// URLs.
- //config:	Note:
-@@ -717,10 +716,8 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
- 	int pid;
- 	char *servername, *p;
- 
--	if (!(option_mask32 & WGET_OPT_NO_CHECK_CERT)) {
--		option_mask32 |= WGET_OPT_NO_CHECK_CERT;
--		bb_error_msg("note: TLS certificate validation not implemented");
--	}
-+	if (ENABLE_SSL_CLIENT && !(option_mask32 & WGET_OPT_NO_CHECK_CERT))
-+		bb_error_msg_and_die("note: TLS certificate validation not implemented");
- 
- 	servername = xstrdup(host);
- 	p = strrchr(servername, ':');
-@@ -737,14 +734,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
- 		close(sp[0]);
- 		xmove_fd(sp[1], 0);
- 		xdup2(0, 1);
--		if (BB_MMU) {
-+		if (BB_MMU && ENABLE_TLS && (option_mask32 & WGET_OPT_NO_CHECK_CERT)) {
- 			tls_state_t *tls = new_tls_state();
- 			tls->ifd = tls->ofd = network_fd;
- 			tls_handshake(tls, servername);
- 			tls_run_copy_loop(tls, flags);
- 			exit(0);
- 		} else {
--			char *argv[6];
-+			char *argv[7], **a;
- 
- 			xmove_fd(network_fd, 3);
- 			argv[0] = (char*)"ssl_client";
-@@ -752,8 +749,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
- 			//TODO: if (!is_ip_address(servername))...
- 			argv[2] = (char*)"-n";
- 			argv[3] = servername;
--			argv[4] = (flags & TLSLOOP_EXIT_ON_LOCAL_EOF ? (char*)"-e" : NULL);
--			argv[5] = NULL;
-+
-+			a = &argv[4];
-+			if (flags & TLSLOOP_EXIT_ON_LOCAL_EOF)
-+				*a++ = (char*)"-e";
-+			if (!ENABLE_SSL_CLIENT && (option_mask32 & WGET_OPT_NO_CHECK_CERT))
-+				*a++= (char*)"-I";
-+			*a = NULL;
-+
- 			BB_EXECVP(argv[0], argv);
- 			bb_perror_msg_and_die("can't execute '%s'", argv[0]);
- 		}
diff --git a/main/busybox/0001-wget-add-header-Accept.patch b/main/busybox/0001-wget-add-header-Accept.patch
new file mode 100644
index 00000000000..20d8d3a65a4
--- /dev/null
+++ b/main/busybox/0001-wget-add-header-Accept.patch
@@ -0,0 +1,75 @@
+From fd46eb7e14fa6891a9e767409a7f9dab4f2c0dfb Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Mon, 11 Mar 2024 12:47:15 +0100
+Subject: [PATCH] wget: add header Accept: */*
+
+Some servers (like https://netfilter.org) returns failure if the Accept
+header is missing. Both GNU wget and curl adds this header, so make
+busybox do the same.
+
+fixes: https://bugs.busybox.net/show_bug.cgi?id=15982
+
+function                                             old     new   delta
+wget_main                                           3120    3144     +24
+.rodata                                            79296   79310     +14
+wget_user_headers                                     76      84      +8
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 3/0 up/down: 46/0)               Total: 46 bytes
+   text	   data	    bss	    dec	    hex	filename
+ 825278	  14260	   2008	 841546	  cd74a	busybox_old
+ 825324	  14260	   2008	 841592	  cd778	busybox_unstripped
+---
+ networking/wget.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/networking/wget.c b/networking/wget.c
+index 199ddd4da..48486fdee 100644
+--- a/networking/wget.c
++++ b/networking/wget.c
+@@ -212,14 +212,16 @@ enum {
+ 	HDR_USER_AGENT    = (1<<1),
+ 	HDR_RANGE         = (1<<2),
+ 	HDR_CONTENT_TYPE  = (1<<3),
+-	HDR_AUTH          = (1<<4) * ENABLE_FEATURE_WGET_AUTHENTICATION,
+-	HDR_PROXY_AUTH    = (1<<5) * ENABLE_FEATURE_WGET_AUTHENTICATION,
++	HDR_ACCEPT        = (1<<4),
++	HDR_AUTH          = (1<<5) * ENABLE_FEATURE_WGET_AUTHENTICATION,
++	HDR_PROXY_AUTH    = (1<<6) * ENABLE_FEATURE_WGET_AUTHENTICATION,
+ };
+ static const char wget_user_headers[] ALIGN1 =
+ 	"Host:\0"
+ 	"User-Agent:\0"
+ 	"Range:\0"
+ 	"Content-Type:\0"
++	"Accept:\0"
+ # if ENABLE_FEATURE_WGET_AUTHENTICATION
+ 	"Authorization:\0"
+ 	"Proxy-Authorization:\0"
+@@ -229,6 +231,7 @@ static const char wget_user_headers[] ALIGN1 =
+ # define USR_HEADER_USER_AGENT   (G.user_headers & HDR_USER_AGENT)
+ # define USR_HEADER_RANGE        (G.user_headers & HDR_RANGE)
+ # define USR_HEADER_CONTENT_TYPE (G.user_headers & HDR_CONTENT_TYPE)
++# define USR_HEADER_ACCEPT       (G.user_headers & HDR_ACCEPT)
+ # define USR_HEADER_AUTH         (G.user_headers & HDR_AUTH)
+ # define USR_HEADER_PROXY_AUTH   (G.user_headers & HDR_PROXY_AUTH)
+ #else /* No long options, no user-headers :( */
+@@ -236,6 +239,7 @@ static const char wget_user_headers[] ALIGN1 =
+ # define USR_HEADER_USER_AGENT   0
+ # define USR_HEADER_RANGE        0
+ # define USR_HEADER_CONTENT_TYPE 0
++# define USR_HEADER_ACCEPT       0
+ # define USR_HEADER_AUTH         0
+ # define USR_HEADER_PROXY_AUTH   0
+ #endif
+@@ -1232,6 +1236,8 @@ static void download_one_url(const char *url)
+ 			SENDFMT(sfp, "Host: %s\r\n", target.host);
+ 		if (!USR_HEADER_USER_AGENT)
+ 			SENDFMT(sfp, "User-Agent: %s\r\n", G.user_agent);
++		if (!USR_HEADER_ACCEPT)
++			SENDFMT(sfp, "Accept: */*\r\n");
+ 
+ 		/* Ask server to close the connection as soon as we are done
+ 		 * (IOW: we do not intend to send more requests)
+-- 
+2.44.0
+
diff --git a/main/busybox/0002-adduser-default-to-sbin-nologin-as-shell-for-system-.patch b/main/busybox/0002-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
new file mode 100644
index 00000000000..040db3b82ff
--- /dev/null
+++ b/main/busybox/0002-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
@@ -0,0 +1,26 @@
+From b99ef11a68832b2141926c229dd25ea600107ed1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Sun, 13 Jan 2019 19:07:16 +0100
+Subject: [PATCH] adduser: default to /sbin/nologin as shell for system
+ accounts
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ loginutils/adduser.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/loginutils/adduser.c b/loginutils/adduser.c
+index d3c795afa..7ce29fa04 100644
+--- a/loginutils/adduser.c
++++ b/loginutils/adduser.c
+@@ -235,7 +235,7 @@ int adduser_main(int argc UNUSED_PARAM, char **argv)
+ 			usegroup = "nogroup";
+ 		}
+ 		if (!(opts & OPT_SHELL)) {
+-			pw.pw_shell = (char *) "/bin/false";
++			pw.pw_shell = (char *) "/sbin/nologin";
+ 		}
+ 	}
+ 	pw.pw_gid = usegroup ? xgroup2gid(usegroup) : -1; /* exits on failure */
diff --git a/main/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch b/main/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
deleted file mode 100644
index fd2503e7b93..00000000000
--- a/main/busybox/0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2e673aac06d661038001286fd389d1b45c511c66 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 28 Nov 2017 13:23:17 +0100
-Subject: [PATCH] fsck: resolve LABEL=.../UUID=... spec to device
-
----
- e2fsprogs/fsck.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
-index f5aa3dbe4..e2edc9747 100644
---- a/e2fsprogs/fsck.c
-+++ b/e2fsprogs/fsck.c
-@@ -60,6 +60,7 @@
- //usage:     "\n	-t TYPE	List of filesystem types to check"
- 
- #include "libbb.h"
-+#include "volume_id.h"
- #include "common_bufsiz.h"
- 
- /* "progress indicator" code is somewhat buggy and ext[23] specific.
-@@ -524,12 +525,13 @@ static int wait_many(int flags)
-  * Execute a particular fsck program, and link it into the list of
-  * child processes we are waiting for.
-  */
--static void execute(const char *type, const char *device,
-+static void execute(const char *type, const char *spec,
- 		const char *mntpt /*, int interactive */)
- {
- 	int i;
- 	struct fsck_instance *inst;
- 	pid_t pid;
-+	char *device = (char *)spec;
- 
- 	G.args[0] = xasprintf("fsck.%s", type);
- 
-@@ -544,7 +546,8 @@ static void execute(const char *type, const char *device,
- 	}
- #endif
- 
--	G.args[G.num_args - 2] = (char*)device;
-+	resolve_mount_spec(&device);
-+	G.args[G.num_args - 2] = device;
- 	/* G.args[G.num_args - 1] = NULL; - already is */
- 
- 	if (G.verbose || G.noexecute) {
-@@ -973,9 +976,6 @@ int fsck_main(int argc UNUSED_PARAM, char **argv)
- 
- 		/* "/dev/blk" or "/path" or "UUID=xxx" or "LABEL=xxx" */
- 		if ((arg[0] == '/' && !opts_for_fsck) || strchr(arg, '=')) {
--// FIXME: must check that arg is a blkdev, or resolve
--// "/path", "UUID=xxx" or "LABEL=xxx" into block device name
--// ("UUID=xxx"/"LABEL=xxx" can probably shifted to fsck.auto duties)
- 			devices = xrealloc_vector(devices, 2, num_devices);
- 			devices[num_devices++] = arg;
- 			continue;
diff --git a/main/busybox/0003-ash-add-built-in-BB_ASH_VERSION-variable.patch b/main/busybox/0003-ash-add-built-in-BB_ASH_VERSION-variable.patch
new file mode 100644
index 00000000000..18031946898
--- /dev/null
+++ b/main/busybox/0003-ash-add-built-in-BB_ASH_VERSION-variable.patch
@@ -0,0 +1,85 @@
+From 53b13dbc8312dfa4326751f063437894c5e5a43d Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 10 Mar 2021 23:38:57 -0700
+Subject: [PATCH] ash: add built-in $BB_ASH_VERSION variable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is helpful for detecting if the shell is busybox ash or not,
+which is necessary for enabling ash-specific features in /etc/profile
+and Alpine's default $ENV.
+
+https://gitlab.alpinelinux.org/alpine/aports/-/issues/12398 outlines
+the rationale for detecting what shell is running in /etc/profile and
+similar.
+
+function                                             old     new   delta
+.rodata                                            77899   77925     +26
+varinit_data                                         360     384     +24
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 2/0 up/down: 50/0)               Total: 50 bytes
+
+Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
+---
+ shell/ash.c | 28 ++++++++++++++++++++--------
+ 1 file changed, 20 insertions(+), 8 deletions(-)
+
+diff --git a/shell/ash.c b/shell/ash.c
+index 18ccc1329..cb38582fc 100644
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -158,6 +158,14 @@
+ //config:	you to run the specified command or builtin,
+ //config:	even when there is a function with the same name.
+ //config:
++//config:config ASH_VERSION_VAR
++//config:	bool "declare $BB_ASH_VERSION variable"
++//config:	default y
++//config:	depends on SHELL_ASH
++//config:	help
++//config:	Enable support for declaring the $BB_ASH_VERSION variable,
++//config:	which is set as the busybox version.
++//config:
+ //config:endif # ash options
+ 
+ //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP))
+@@ -2142,6 +2150,9 @@ static const struct {
+ 	{ VSTRFIXED|VTEXTFIXED       , "PS1=$ "    , NULL            },
+ 	{ VSTRFIXED|VTEXTFIXED       , "PS2=> "    , NULL            },
+ 	{ VSTRFIXED|VTEXTFIXED       , "PS4=+ "    , NULL            },
++#if ENABLE_ASH_VERSION_VAR
++	{ VSTRFIXED|VTEXTFIXED       , "BB_ASH_VERSION=" BB_VER, NULL },
++#endif
+ #if ENABLE_ASH_GETOPTS
+ 	{ VSTRFIXED|VTEXTFIXED       , defoptindvar, getoptsreset    },
+ #endif
+@@ -2201,19 +2212,20 @@ extern struct globals_var *BB_GLOBAL_CONST ash_ptr_to_globals_var;
+ #define vps1      varinit[VAR_OFFSET1 + 2]
+ #define vps2      varinit[VAR_OFFSET1 + 3]
+ #define vps4      varinit[VAR_OFFSET1 + 4]
++#define VAR_OFFSET2 (VAR_OFFSET1 + ENABLE_ASH_VERSION_VAR)
+ #if ENABLE_ASH_GETOPTS
+-# define voptind  varinit[VAR_OFFSET1 + 5]
++# define voptind  varinit[VAR_OFFSET2 + 5]
+ #endif
+-#define VAR_OFFSET2 (VAR_OFFSET1 + ENABLE_ASH_GETOPTS)
+-#define vlineno   varinit[VAR_OFFSET2 + 5]
+-#define vfuncname varinit[VAR_OFFSET2 + 6]
++#define VAR_OFFSET3 (VAR_OFFSET2 + ENABLE_ASH_GETOPTS)
++#define vlineno   varinit[VAR_OFFSET3 + 5]
++#define vfuncname varinit[VAR_OFFSET3 + 6]
+ #if ENABLE_ASH_RANDOM_SUPPORT
+-# define vrandom  varinit[VAR_OFFSET2 + 7]
++# define vrandom  varinit[VAR_OFFSET3 + 7]
+ #endif
+-#define VAR_OFFSET3 (VAR_OFFSET2 + ENABLE_ASH_RANDOM_SUPPORT)
++#define VAR_OFFSET4 (VAR_OFFSET2 + ENABLE_ASH_RANDOM_SUPPORT)
+ #if BASH_EPOCH_VARS
+-# define vepochs  varinit[VAR_OFFSET3 + 7]
+-# define vepochr  varinit[VAR_OFFSET3 + 8]
++# define vepochs  varinit[VAR_OFFSET4 + 7]
++# define vepochr  varinit[VAR_OFFSET4 + 8]
+ #endif
+ #define INIT_G_var() do { \
+ 	unsigned i; \
diff --git a/main/busybox/0003-ash-exec-busybox.static.patch b/main/busybox/0003-ash-exec-busybox.static.patch
deleted file mode 100644
index 8247e357f8d..00000000000
--- a/main/busybox/0003-ash-exec-busybox.static.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d06a13f4cd81aeda9b02d4da90ef2b941899d6c5 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 4 Aug 2016 11:03:07 +0200
-Subject: [PATCH] ash: exec busybox.static
-
----
- shell/ash.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/shell/ash.c b/shell/ash.c
-index 051cc671f..73470eab2 100644
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -7991,6 +7991,8 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) const char *cmd, char **argv, c
- 		}
- 		/* re-exec ourselves with the new arguments */
- 		execve(bb_busybox_exec_path, argv, envp);
-+		execve("/bin/busybox.static",argv,envp);
-+		execve("/bin/busybox",argv,envp);
- 		/* If they called chroot or otherwise made the binary no longer
- 		 * executable, fall through */
- 	}
diff --git a/main/busybox/0004-Avoid-redefined-warnings-when-buiding-with-utmps.patch b/main/busybox/0004-Avoid-redefined-warnings-when-buiding-with-utmps.patch
new file mode 100644
index 00000000000..b0f2b45f5bb
--- /dev/null
+++ b/main/busybox/0004-Avoid-redefined-warnings-when-buiding-with-utmps.patch
@@ -0,0 +1,108 @@
+From a7f1a174c2f5fd4ee7e130e08dfc79abc65e8a5e Mon Sep 17 00:00:00 2001
+From: Laurent Bercot <ska-devel@skarnet.org>
+Date: Fri, 22 Jul 2022 08:34:50 +0200
+Subject: [PATCH] Avoid redefined warnings when buiding with utmps
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Do not use _PATH_UTMP or _PATH_WTMP, and do not touch
+the files directly.
+
+---
+ include/libbb.h         |  8 +++-----
+ libbb/messages.c        |  4 ++--
+ libbb/utmp.c            | 10 ++++++----
+ util-linux/last_fancy.c |  2 +-
+ 4 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/include/libbb.h b/include/libbb.h
+index cca33a177..2b72e7ac4 100644
+--- a/include/libbb.h
++++ b/include/libbb.h
+@@ -107,14 +107,12 @@
+ #  define _PATH_UTMPX _PATH_UTMP
+ # else
+ #  if !defined(__FreeBSD__)
+-#   include <utmp.h>
++#   include <utmpx.h>
++#   define _CORRECT_PATH_UTMPX "/run/utmps/utmp"
++#   define _CORRECT_PATH_WTMP "/var/log/wtmp"
+ #  else
+ #   define _PATH_UTMPX "/var/run/utx.active"
+ #  endif
+-#  include <utmpx.h>
+-#  if defined _PATH_UTMP && !defined _PATH_UTMPX
+-#   define _PATH_UTMPX _PATH_UTMP
+-#  endif
+ # endif
+ #endif
+ #if ENABLE_LOCALE_SUPPORT
+diff --git a/libbb/messages.c b/libbb/messages.c
+index 6914d5701..689dd0c6d 100644
+--- a/libbb/messages.c
++++ b/libbb/messages.c
+@@ -42,8 +42,8 @@ const int const_int_0 = 0;
+ #if ENABLE_FEATURE_WTMP
+ /* This is usually something like "/var/adm/wtmp" or "/var/log/wtmp" */
+ const char bb_path_wtmp_file[] ALIGN1 =
+-# if defined _PATH_WTMP
+-	_PATH_WTMP;
++# if defined _CORRECT_PATH_WTMP
++	_CORRECT_PATH_WTMP;
+ # elif defined WTMP_FILE
+ 	WTMP_FILE;
+ # else
+diff --git a/libbb/utmp.c b/libbb/utmp.c
+index bd07670db..0a2ef2c8e 100644
+--- a/libbb/utmp.c
++++ b/libbb/utmp.c
+@@ -8,11 +8,13 @@
+  */
+ #include "libbb.h"
+ 
++#if 0
+ static void touch(const char *filename)
+ {
+ 	if (access(filename, R_OK | W_OK) == -1)
+ 		close(open(filename, O_WRONLY | O_CREAT, 0664));
+ }
++#endif
+ 
+ void FAST_FUNC write_new_utmp(pid_t pid, int new_type, const char *tty_name, const char *username, const char *hostname)
+ {
+@@ -45,8 +47,8 @@ void FAST_FUNC write_new_utmp(pid_t pid, int new_type, const char *tty_name, con
+ 		tty_name += 3;
+ 	strncpy(id, tty_name, width);
+ 
+-	touch(_PATH_UTMPX);
+-	//utmpxname(_PATH_UTMPX);
++	//touch(_CORRECT_PATH_UTMPX);
++	//utmpxname(_CORRECT_PATH_UTMPX);
+ 	setutxent();
+ 	/* Append new one (hopefully, unless we collide on ut_id) */
+ 	pututxline(&utent);
+@@ -67,8 +69,8 @@ void FAST_FUNC update_utmp(pid_t pid, int new_type, const char *tty_name, const
+ 	struct utmpx utent;
+ 	struct utmpx *utp;
+ 
+-	touch(_PATH_UTMPX);
+-	//utmpxname(_PATH_UTMPX);
++	//touch(_CORRECT_PATH_UTMPX);
++	//utmpxname(_CORRECT_PATH_UTMPX);
+ 	setutxent();
+ 
+ 	/* Did init/getty/telnetd/sshd/... create an entry for us?
+diff --git a/util-linux/last_fancy.c b/util-linux/last_fancy.c
+index 648236229..aa7a62bbe 100644
+--- a/util-linux/last_fancy.c
++++ b/util-linux/last_fancy.c
+@@ -159,7 +159,7 @@ int last_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int last_main(int argc UNUSED_PARAM, char **argv)
+ {
+ 	struct utmpx ut;
+-	const char *filename = _PATH_WTMP;
++	const char *filename = _CORRECT_PATH_WTMP;
+ 	llist_t *zlist;
+ 	off_t pos;
+ 	time_t start_time;
diff --git a/main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch b/main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
deleted file mode 100644
index ca558f8afbc..00000000000
--- a/main/busybox/0004-app-location-for-cpio-vi-and-lspci.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From d4bc80ad7bf9b846b38c903a087c5ed318e848fb Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 27 Dec 2016 20:46:59 +0100
-Subject: [PATCH] app location for cpio, vi and lspci
-
-Adjust location to where alpine linux installs them
----
- archival/cpio.c    | 2 +-
- editors/vi.c       | 2 +-
- util-linux/lspci.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/archival/cpio.c b/archival/cpio.c
-index 221667112..a6d7630a4 100644
---- a/archival/cpio.c
-+++ b/archival/cpio.c
-@@ -39,7 +39,7 @@
- //config:	help
- //config:	Passthrough mode. Rarely used.
- 
--//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
-+//applet:IF_CPIO(APPLET(cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
- 
- //kbuild:lib-$(CONFIG_CPIO) += cpio.o
- 
-diff --git a/editors/vi.c b/editors/vi.c
-index f103e0dc0..89397710c 100644
---- a/editors/vi.c
-+++ b/editors/vi.c
-@@ -161,7 +161,7 @@
- //config:	Unless you want more (or less) frequent "undo points" while typing,
- //config:	you should probably leave this unchanged.
- 
--//applet:IF_VI(APPLET(vi, BB_DIR_BIN, BB_SUID_DROP))
-+//applet:IF_VI(APPLET(vi, BB_DIR_USR_BIN, BB_SUID_DROP))
- 
- //kbuild:lib-$(CONFIG_VI) += vi.o
- 
-diff --git a/util-linux/lspci.c b/util-linux/lspci.c
-index 0000fbfda..34189d2b5 100644
---- a/util-linux/lspci.c
-+++ b/util-linux/lspci.c
-@@ -16,7 +16,7 @@
- //config:
- //config:	This version uses sysfs (/sys/bus/pci/devices) only.
- 
--//applet:IF_LSPCI(APPLET_NOEXEC(lspci, lspci, BB_DIR_USR_BIN, BB_SUID_DROP, lspci))
-+//applet:IF_LSPCI(APPLET_NOEXEC(lspci, lspci, BB_DIR_USR_SBIN, BB_SUID_DROP, lspci))
- 
- //kbuild:lib-$(CONFIG_LSPCI) += lspci.o
- 
diff --git a/main/busybox/0005-libbb-sockaddr2str-ensure-only-printable-characters-.patch b/main/busybox/0005-libbb-sockaddr2str-ensure-only-printable-characters-.patch
new file mode 100644
index 00000000000..95616c793d3
--- /dev/null
+++ b/main/busybox/0005-libbb-sockaddr2str-ensure-only-printable-characters-.patch
@@ -0,0 +1,40 @@
+From 6a678ab440ec8c0d21843569182eeb452c289a58 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Sun, 3 Apr 2022 18:13:37 +0000
+Subject: [PATCH] libbb: sockaddr2str: ensure only printable characters are
+ returned for the hostname part
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+CVE: Pending
+Upstream-Status: Pending
+Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
+---
+ libbb/xconnect.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/libbb/xconnect.c b/libbb/xconnect.c
+index 0e0b247b8..02c061e67 100644
+--- a/libbb/xconnect.c
++++ b/libbb/xconnect.c
+@@ -497,8 +497,9 @@ static char* FAST_FUNC sockaddr2str(const struct sockaddr *sa, int flags)
+ 	);
+ 	if (rc)
+ 		return NULL;
++	/* ensure host contains only printable characters */
+ 	if (flags & IGNORE_PORT)
+-		return xstrdup(host);
++		return xstrdup(printable_string(host));
+ #if ENABLE_FEATURE_IPV6
+ 	if (sa->sa_family == AF_INET6) {
+ 		if (strchr(host, ':')) /* heh, it's not a resolved hostname */
+@@ -509,7 +510,7 @@ static char* FAST_FUNC sockaddr2str(const struct sockaddr *sa, int flags)
+ #endif
+ 	/* For now we don't support anything else, so it has to be INET */
+ 	/*if (sa->sa_family == AF_INET)*/
+-		return xasprintf("%s:%s", host, serv);
++		return xasprintf("%s:%s", printable_string(host), serv);
+ 	/*return xstrdup(host);*/
+ }
+ 
diff --git a/main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch b/main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch
deleted file mode 100644
index 303b5cd860c..00000000000
--- a/main/busybox/0005-udhcpc-set-default-discover-retries-to-5.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ed9d54e8920e6f90ddda8519c761217685c07044 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 4 Aug 2016 11:08:35 +0200
-Subject: [PATCH] udhcpc: set default discover retries to 5
-
-Some slower nics needs more attempts to get a lease
----
- networking/udhcp/dhcpc.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
-index c2805a009..0b14b0332 100644
---- a/networking/udhcp/dhcpc.c
-+++ b/networking/udhcp/dhcpc.c
-@@ -1197,7 +1197,7 @@ static void client_background(void)
- //usage:     "\n	-p FILE		Create pidfile"
- //usage:     "\n	-B		Request broadcast replies"
- //usage:     "\n	-t N		Send up to N discover packets (default 3)"
--//usage:     "\n	-T SEC		Pause between packets (default 3)"
-+//usage:     "\n	-T SEC		Pause between packets (default 5)"
- //usage:     "\n	-A SEC		Wait if lease is not obtained (default 20)"
- //usage:     "\n	-n		Exit if lease is not obtained"
- //usage:     "\n	-q		Exit after obtaining lease"
-@@ -1242,7 +1242,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
- 	llist_t *list_x = NULL;
- 	int tryagain_timeout = 20;
- 	int discover_timeout = 3;
--	int discover_retries = 3;
-+	int discover_retries = 5;
- 	uint32_t server_addr = server_addr; /* for compiler */
- 	uint32_t requested_ip = 0;
- 	uint32_t xid = xid; /* for compiler */
diff --git a/main/busybox/0006-modinfo-add-k-option-for-kernel-version.patch b/main/busybox/0006-modinfo-add-k-option-for-kernel-version.patch
new file mode 100644
index 00000000000..51144d4e1f0
--- /dev/null
+++ b/main/busybox/0006-modinfo-add-k-option-for-kernel-version.patch
@@ -0,0 +1,140 @@
+From 592cc544acebfb1179bf91083870a235f72f2f64 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 28 Apr 2022 23:04:01 +0200
+Subject: [PATCH] modinfo: add -k option for kernel version
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It is useful to be able to specify kernel version when generating
+initramfs and similar for a kernel version that might not be the running
+one.
+
+bloatcheck on x86_64:
+
+function                                             old     new   delta
+packed_usage                                       26193   26218     +25
+modinfo_main                                         391     414     +23
+.rodata                                            80296   80298      +2
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 3/0 up/down: 50/0)               Total: 50
+bytes
+   text    data     bss     dec     hex filename
+   834606   14124    2008  850738   cfb32 busybox_old
+   834657   14124    2008  850789   cfb65 busybox_unstripped
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ modutils/modinfo.c | 30 ++++++++++++++++++------------
+ 1 file changed, 18 insertions(+), 12 deletions(-)
+
+diff --git a/modutils/modinfo.c b/modutils/modinfo.c
+index 0a86c3296..53bc02880 100644
+--- a/modutils/modinfo.c
++++ b/modutils/modinfo.c
+@@ -38,17 +38,18 @@ static const char *const shortcuts[] ALIGN_PTR = {
+ 
+ enum {
+ 	OPT_0 = (1 << 0), /* \0 as separator */
+-	OPT_F = (1 << 1), /* field name */
++	OPT_k = (1 << 1), /* kernel version */
++	OPT_F = (1 << 2), /* field name */
+ 	/* first bits are for -nadlp options, the rest are for
+ 	 * fields not selectable with "shortcut" options
+ 	 */
+-	OPT_n = (1 << 2),
+-	OPT_TAGS = ((1 << ARRAY_SIZE(shortcuts)) - 1) << 2,
++	OPT_n = (1 << 3),
++	OPT_TAGS = ((1 << ARRAY_SIZE(shortcuts)) - 1) << 3,
+ };
+ 
+ static void display(const char *data, const char *pattern)
+ {
+-	int flag = option_mask32 >> 1; /* shift out -0 bit */
++	int flag = option_mask32 >> 2; /* shift out -0 and -k bits */
+ 	if (flag & (flag-1)) {
+ 		/* more than one field to show: print "FIELD:" pfx */
+ 		int n = printf("%s:", pattern);
+@@ -82,7 +83,8 @@ static void modinfo(const char *path, const char *version,
+ 		}
+ 	}
+ 
+-	for (j = 1; (1<<j) & (OPT_TAGS|OPT_F); j++) {
++	/* skip initial -0 and -k option bits */
++	for (j = 2; (1<<j) & (OPT_TAGS|OPT_F); j++) {
+ 		const char *pattern;
+ 
+ 		if (!((1<<j) & tags))
+@@ -90,7 +92,7 @@ static void modinfo(const char *path, const char *version,
+ 
+ 		pattern = field;
+ 		if ((1<<j) & OPT_TAGS)
+-			pattern = shortcuts[j-2];
++			pattern = shortcuts[j-3];
+ 
+ 		if (strcmp(pattern, shortcuts[0]) == 0) {
+ 			/* "-n" or "-F filename" */
+@@ -123,7 +125,7 @@ static void modinfo(const char *path, const char *version,
+ }
+ 
+ //usage:#define modinfo_trivial_usage
+-//usage:       "[-adlpn0] [-F keyword] MODULE"
++//usage:       "[-adlpn0] [-F keyword] [-k kernel] MODULE"
+ //usage:#define modinfo_full_usage "\n\n"
+ //usage:       "	-a		Shortcut for '-F author'"
+ //usage:     "\n	-d		Shortcut for '-F description'"
+@@ -131,6 +133,7 @@ static void modinfo(const char *path, const char *version,
+ //usage:     "\n	-p		Shortcut for '-F parm'"
+ ////usage:     "\n	-n		Shortcut for '-F filename'"
+ //usage:     "\n	-F keyword	Keyword to look for"
++//usage:     "\n	-k kernel	kernel version"
+ //usage:     "\n	-0		NUL terminated output"
+ //usage:#define modinfo_example_usage
+ //usage:       "$ modinfo -F vermagic loop\n"
+@@ -139,6 +142,7 @@ int modinfo_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int modinfo_main(int argc UNUSED_PARAM, char **argv)
+ {
+ 	const char *field;
++	const char *kernel;
+ 	char name[MODULE_NAME_LEN];
+ 	struct utsname uts;
+ 	parser_t *parser;
+@@ -147,15 +151,17 @@ int modinfo_main(int argc UNUSED_PARAM, char **argv)
+ 	unsigned i;
+ 
+ 	field = NULL;
+-	opts = getopt32(argv, "^" "0F:nadlp" "\0" "-1"/*minimum one arg*/, &field);
++	uname(&uts);
++	kernel = uts.release;
++	opts = getopt32(argv, "^" "0k:F:nadlp" "\0" "-1"/*minimum one arg*/, &kernel, &field);
+ 	/* If no field selected, show all */
+ 	if (!(opts & (OPT_TAGS|OPT_F)))
+ 		option_mask32 |= OPT_TAGS;
++
+ 	argv += optind;
+ 
+-	uname(&uts);
+ 	parser = config_open2(
+-		xasprintf("%s/%s/%s", CONFIG_DEFAULT_MODULES_DIR, uts.release, CONFIG_DEFAULT_DEPMOD_FILE),
++		xasprintf("%s/%s/%s", CONFIG_DEFAULT_MODULES_DIR, kernel, CONFIG_DEFAULT_DEPMOD_FILE),
+ 		xfopen_for_read
+ 	);
+ 
+@@ -167,7 +173,7 @@ int modinfo_main(int argc UNUSED_PARAM, char **argv)
+ 		filename2modname(bb_basename(tokens[0]), name);
+ 		for (i = 0; argv[i]; i++) {
+ 			if (fnmatch(argv[i], name, 0) == 0) {
+-				modinfo(tokens[0], uts.release, field);
++				modinfo(tokens[0], kernel, field);
+ 				argv[i] = (char *) "";
+ 			}
+ 		}
+@@ -177,7 +183,7 @@ int modinfo_main(int argc UNUSED_PARAM, char **argv)
+ 
+ 	for (i = 0; argv[i]; i++) {
+ 		if (argv[i][0]) {
+-			modinfo(argv[i], uts.release, field);
++			modinfo(argv[i], kernel, field);
+ 		}
+ 	}
+ 
diff --git a/main/busybox/0006-ping-make-ping-work-without-root-privileges.patch b/main/busybox/0006-ping-make-ping-work-without-root-privileges.patch
deleted file mode 100644
index 9bdeb7208de..00000000000
--- a/main/busybox/0006-ping-make-ping-work-without-root-privileges.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From 9513a2daae84660f2ddd7d60d39bb49cd678adbe Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 29 Mar 2016 18:59:22 +0200
-Subject: [PATCH] ping: make ping work without root privileges
-
----
- networking/ping.c | 103 +++++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 87 insertions(+), 16 deletions(-)
-
-diff --git a/networking/ping.c b/networking/ping.c
-index 8f85d3ec2..dc3f50968 100644
---- a/networking/ping.c
-+++ b/networking/ping.c
-@@ -165,6 +165,7 @@ enum {
- 	pingsock = 0,
- };
- 
-+static int using_dgram;
- static void
- #if ENABLE_PING6
- create_icmp_socket(len_and_sockaddr *lsa)
-@@ -181,9 +182,23 @@ create_icmp_socket(void)
- #endif
- 		sock = socket(AF_INET, SOCK_RAW, 1); /* 1 == ICMP */
- 	if (sock < 0) {
--		if (errno == EPERM)
--			bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
--		bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
-+		if (errno != EPERM)
-+			bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
-+#if defined(__linux__) || defined(__APPLE__)
-+		/* We don't have root privileges.  Try SOCK_DGRAM instead.
-+		 * Linux needs net.ipv4.ping_group_range for this to work.
-+		 * MacOSX allows ICMP_ECHO, ICMP_TSTAMP or ICMP_MASKREQ
-+		 */
-+#if ENABLE_PING6
-+		if (lsa->u.sa.sa_family == AF_INET6)
-+			sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_ICMPV6);
-+		else
-+#endif
-+			sock = socket(AF_INET, SOCK_DGRAM, 1); /* 1 == ICMP */
-+		if (sock < 0)
-+#endif
-+		bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
-+		using_dgram = 1;
- 	}
- 
- 	xmove_fd(sock, pingsock);
-@@ -236,10 +251,12 @@ static void ping4(len_and_sockaddr *lsa)
- 				bb_perror_msg("recvfrom");
- 			continue;
- 		}
--		if (c >= 76) {			/* ip + icmp */
--			struct iphdr *iphdr = (struct iphdr *) G.packet;
-+		if (c >= 76 || using_dgram && (c == 64)) {			/* ip + icmp */
-+			if(!using_dgram) {
-+				struct iphdr *iphdr = (struct iphdr *) G.packet;
- 
--			pkt = (struct icmp *) (G.packet + (iphdr->ihl << 2));	/* skip ip hdr */
-+				pkt = (struct icmp *) (G.packet + (iphdr->ihl << 2));	/* skip ip hdr */
-+			} else pkt = (struct icmp *) G.packet;
- 			if (pkt->icmp_id != G.myid)
- 				continue; /* not our ping */
- 			if (pkt->icmp_type == ICMP_ECHOREPLY)
-@@ -636,19 +653,21 @@ static void unpack_tail(int sz, uint32_t *tp,
- }
- static int unpack4(char *buf, int sz, struct sockaddr_in *from)
- {
--	struct icmp *icmppkt;
- 	struct iphdr *iphdr;
-+	struct icmp *icmppkt;
- 	int hlen;
- 
- 	/* discard if too short */
- 	if (sz < (datalen + ICMP_MINLEN))
- 		return 0;
-+	if(!using_dgram) {
-+		/* check IP header */
-+		iphdr = (struct iphdr *) buf;
-+		hlen = iphdr->ihl << 2;
-+		sz -= hlen;
-+		icmppkt = (struct icmp *) (buf + hlen);
-+	} else icmppkt = (struct icmp *) buf;
- 
--	/* check IP header */
--	iphdr = (struct iphdr *) buf;
--	hlen = iphdr->ihl << 2;
--	sz -= hlen;
--	icmppkt = (struct icmp *) (buf + hlen);
- 	if (icmppkt->icmp_id != myid)
- 		return 0;				/* not our ping */
- 
-@@ -660,7 +679,7 @@ static int unpack4(char *buf, int sz, struct sockaddr_in *from)
- 			tp = (uint32_t *) icmppkt->icmp_data;
- 		unpack_tail(sz, tp,
- 			inet_ntoa(*(struct in_addr *) &from->sin_addr.s_addr),
--			recv_seq, iphdr->ttl);
-+			recv_seq, using_dgram ? 42 : iphdr->ttl);
- 		return 1;
- 	}
- 	if (icmppkt->icmp_type != ICMP_ECHO) {
-@@ -710,11 +729,31 @@ static void ping4(len_and_sockaddr *lsa)
- 	int sockopt;
- 
- 	pingaddr.sin = lsa->u.sin;
--	if (source_lsa) {
-+	if (source_lsa && !using_dgram) {
- 		if (setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_IF,
- 				&source_lsa->u.sa, source_lsa->len))
- 			bb_error_msg_and_die("can't set multicast source interface");
- 		xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
-+	} else if(using_dgram) {
-+		struct sockaddr_in sa;
-+		socklen_t sl;
-+
-+		sa.sin_family = AF_INET;
-+		sa.sin_port = 0;
-+		sa.sin_addr.s_addr = source_lsa ?
-+			source_lsa->u.sin.sin_addr.s_addr : 0;
-+		sl = sizeof(sa);
-+
-+		if (bind(pingsock, (struct sockaddr *) &sa, sl) == -1) {
-+			perror("bind");
-+			exit(2);
-+		}
-+
-+		if (getsockname(pingsock, (struct sockaddr *) &sa, &sl) == -1) {
-+			perror("getsockname");
-+			exit(2);
-+		}
-+		myid = sa.sin_port;
- 	}
- 
- 	/* enable broadcast pings */
-@@ -731,6 +770,15 @@ static void ping4(len_and_sockaddr *lsa)
- 		setsockopt_int(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, opt_ttl);
- 	}
- 
-+	if(using_dgram) {
-+		int hold = 65536;
-+		if (setsockopt(pingsock, SOL_IP, IP_RECVTTL, (char *)&hold, sizeof(hold)))
-+			perror("WARNING: setsockopt(IP_RECVTTL)");
-+		if (setsockopt(pingsock, SOL_IP, IP_RETOPTS, (char *)&hold, sizeof(hold)))
-+			perror("WARNING: setsockopt(IP_RETOPTS)");
-+
-+	}
-+
- 	signal(SIGINT, print_stats_and_exit);
- 
- 	/* start the ping's going ... */
-@@ -768,10 +816,33 @@ static void ping6(len_and_sockaddr *lsa)
- 	char control_buf[CMSG_SPACE(36)];
- 
- 	pingaddr.sin6 = lsa->u.sin6;
--	if (source_lsa)
-+	if (source_lsa && !using_dgram)
- 		xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
-+	else if(using_dgram) {
-+		struct sockaddr_in6 sa = {0};
-+		socklen_t sl;
-+
-+		sa.sin6_family = AF_INET6;
-+		sa.sin6_port = 0;
-+		if(source_lsa) {
-+			memcpy(&sa.sin6_addr, &source_lsa->u.sin6.sin6_addr, sizeof(struct in6_addr));
-+		}
-+		sl = sizeof(sa);
-+
-+		if (bind(pingsock, (struct sockaddr *) &sa, sl) == -1) {
-+			perror("bind");
-+			exit(2);
-+		}
-+
-+		if (getsockname(pingsock, (struct sockaddr *) &sa, &sl) == -1) {
-+			perror("getsockname");
-+			exit(2);
-+		}
-+		myid = sa.sin6_port;
-+	}
- 
- #ifdef ICMP6_FILTER
-+	if(!using_dgram)
- 	{
- 		struct icmp6_filter filt;
- 		if (!(option_mask32 & OPT_VERBOSE)) {
-@@ -911,7 +982,7 @@ static int common_ping_main(int opt, char **argv)
- 		G.deadline_us = 1 | ((d * 1000000) + monotonic_us());
- 	}
- 
--	myid = (uint16_t) getpid();
-+	if (!using_dgram) myid = (uint16_t) getpid();
- 	hostname = argv[optind];
- #if ENABLE_PING6
- 	{
diff --git a/main/busybox/0007-fbsplash-support-console-switching.patch b/main/busybox/0007-fbsplash-support-console-switching.patch
deleted file mode 100644
index 8d1950587e1..00000000000
--- a/main/busybox/0007-fbsplash-support-console-switching.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From 8fb815ec846d9ac64c89ac21cededc17f0b804c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Mon, 24 Sep 2012 07:58:29 +0300
-Subject: [PATCH] fbsplash: support console switching
-
----
- miscutils/fbsplash.c | 82 ++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 75 insertions(+), 7 deletions(-)
-
-diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
-index bc3c61055..1c206ef53 100644
---- a/miscutils/fbsplash.c
-+++ b/miscutils/fbsplash.c
-@@ -47,7 +47,7 @@
- //kbuild:lib-$(CONFIG_FBSPLASH) += fbsplash.o
- 
- //usage:#define fbsplash_trivial_usage
--//usage:       "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD]"
-+//usage:       "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD] [-T tty]"
- //usage:#define fbsplash_full_usage "\n\n"
- //usage:       "	-s	Image"
- //usage:     "\n	-c	Hide cursor"
-@@ -57,11 +57,17 @@
- //usage:     "\n			BAR_R,BAR_G,BAR_B,IMG_LEFT,IMG_TOP"
- //usage:     "\n	-f	Control pipe (else exit after drawing image)"
- //usage:     "\n			commands: 'NN' (% for progress bar) or 'exit'"
-+//usage:     "\n	-T	Switch to TTY to hide all console messages"
- 
- #include "libbb.h"
- #include "common_bufsiz.h"
- #include <linux/fb.h>
- 
-+#include <sys/vt.h>
-+#include <sys/ioctl.h>
-+#include <linux/tiocl.h>
-+#include <linux/kd.h>
-+
- /* If you want logging messages on /tmp/fbsplash.log... */
- #define DEBUG 0
- 
-@@ -75,6 +81,8 @@ struct globals {
- 	unsigned char *addr;	// pointer to framebuffer memory
- 	unsigned ns[9];		// n-parameters
- 	const char *image_filename;
-+	int silent_tty, fd_tty_s;
-+	bool do_not_draw;
- 	struct fb_var_screeninfo scr_var;
- 	struct fb_fix_screeninfo scr_fix;
- 	unsigned bytes_per_pixel;
-@@ -488,6 +496,11 @@ static void init(const char *cfg_filename)
- 	config_close(parser);
- }
- 
-+static void sighandler(int sig)
-+{
-+	ioctl(G.fd_tty_s, VT_RELDISP, sig == SIGUSR1 ? 1 : 2);
-+	G.do_not_draw = (sig != SIGUSR2);
-+}
- 
- int fbsplash_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int fbsplash_main(int argc UNUSED_PARAM, char **argv)
-@@ -497,6 +510,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
- 	char *num_buf;
- 	unsigned num;
- 	bool bCursorOff;
-+	int fd_tty0, active_vt;
-+	struct vt_stat vtstat;
-+	struct vt_mode vt;
- 
- 	INIT_G();
- 
-@@ -504,8 +520,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
- 	fb_device = "/dev/fb0";
- 	cfg_filename = NULL;
- 	fifo_filename = NULL;
--	bCursorOff = 1 & getopt32(argv, "cs:d:i:f:",
--			&G.image_filename, &fb_device, &cfg_filename, &fifo_filename);
-+	bCursorOff = 1 & getopt32(argv, "cs:d:i:f:T:+",
-+			&G.image_filename, &fb_device, &cfg_filename, &fifo_filename,
-+			&G.silent_tty);
- 
- 	// parse configuration file
- 	if (cfg_filename)
-@@ -515,11 +532,43 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
- 	if (!G.image_filename)
- 		bb_show_usage();
- 
-+	fd_tty0 = get_console_fd_or_die();
-+	if (G.silent_tty) {
-+		char buf[16];
-+
-+		/* Initialize TTY */
-+		bb_signals((1LL << SIGUSR1) | (1LL << SIGUSR2), sighandler);
-+		snprintf(buf, sizeof(buf), "/dev/tty%d", G.silent_tty);
-+		G.fd_tty_s = xopen(buf, O_RDWR | O_NOCTTY);
-+
-+		/* Activate TTY */
-+		xioctl(fd_tty0, VT_GETSTATE, &vtstat);
-+		active_vt = vtstat.v_active;
-+		console_make_active(fd_tty0, G.silent_tty);
-+
-+		/* Get notifications on console changes */
-+		vt.mode   = VT_PROCESS;
-+		vt.waitv  = 0;
-+		vt.relsig = SIGUSR1;
-+		vt.acqsig = SIGUSR2;
-+		ioctl(G.fd_tty_s, VT_SETMODE, &vt);
-+
-+		/* Redirect all kernel messages to tty1 so that they don't get
-+		 * printed over our silent splash image. And clear it. */
-+		buf[0] = TIOCL_SETKMSGREDIRECT;
-+		buf[1] = 1;
-+		ioctl(G.fd_tty_s, TIOCLINUX, buf);
-+		full_write(G.fd_tty_s, "\e[H\e[2J" "\e[?17;0c", 7+8);
-+		ioctl(G.fd_tty_s, KDSETMODE, KD_GRAPHICS);
-+	} else {
-+		G.fd_tty_s = STDOUT_FILENO;
-+	}
-+
- 	fb_open(fb_device);
- 
- 	if (fifo_filename && bCursorOff) {
- 		// hide cursor (BEFORE any fb ops)
--		full_write(STDOUT_FILENO, ESC"[?25l", 6);
-+		full_write(G.fd_tty_s, ESC"[?25l", 6);
- 	}
- 
- 	fb_drawimage();
-@@ -527,6 +576,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
- 	if (!fifo_filename)
- 		return EXIT_SUCCESS;
- 
-+	sig_block(SIGUSR1);
- 	fp = xfopen_stdin(fifo_filename);
- 	if (fp != stdin) {
- 		// For named pipes, we want to support this:
-@@ -542,8 +592,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
- 		// and become an additional writer :)
- 		open(fifo_filename, O_WRONLY); // errors are ignored
- 	}
--
- 	fb_drawprogressbar(0);
-+	sig_unblock(SIGUSR1);
-+
- 	// Block on read, waiting for some input.
- 	// Use of <stdio.h> style I/O allows to correctly
- 	// handle a case when we have many buffered lines
-@@ -558,12 +609,29 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
- #if DEBUG
- 			DEBUG_MESSAGE(itoa(num));
- #endif
--			fb_drawprogressbar(num);
-+			sig_block(SIGUSR1);
-+			if (!G.do_not_draw)
-+				fb_drawprogressbar(num);
-+			sig_unblock(SIGUSR1);
- 		}
- 		free(num_buf);
- 	}
- 
--	if (bCursorOff) // restore cursor
-+	if (G.silent_tty) {
-+		usleep(100*1000);
-+
-+		ioctl(G.fd_tty_s, VT_RELDISP, 1);
-+		ioctl(G.fd_tty_s, KDSETMODE, KD_TEXT);
-+		vt.mode  = VT_AUTO;
-+		vt.waitv = 0;
-+		ioctl(G.fd_tty_s, VT_SETMODE, &vt);
-+		close(G.fd_tty_s);
-+
-+		xioctl(fd_tty0, VT_GETSTATE, &vtstat);
-+		if (vtstat.v_active == G.silent_tty)
-+			console_make_active(fd_tty0, active_vt);
-+		ioctl(fd_tty0, VT_DISALLOCATE, (void *)(ptrdiff_t)G.silent_tty);
-+	} else if (bCursorOff) // restore cursor
- 		full_write(STDOUT_FILENO, ESC"[?25h", 6);
- 
- 	return EXIT_SUCCESS;
diff --git a/main/busybox/0007-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch b/main/busybox/0007-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
new file mode 100644
index 00000000000..5fbcacc0d9d
--- /dev/null
+++ b/main/busybox/0007-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
@@ -0,0 +1,31 @@
+From 9d796b508575b2e1673512d4103e6049af189bc6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Wed, 13 Feb 2019 18:41:43 +0100
+Subject: [PATCH] nologin: Install applet to /sbin instead of /usr/sbin
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is required to retain compatibility with our old custom nologin
+applet written in C which was also installed to /sbin.
+
+Compatibility with the old path is required because login shell paths
+are hardcoded in /etc/passwd.
+
+---
+ util-linux/nologin.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util-linux/nologin.c b/util-linux/nologin.c
+index 5a8b047a5..d3b6fe77e 100644
+--- a/util-linux/nologin.c
++++ b/util-linux/nologin.c
+@@ -19,7 +19,7 @@
+ //config:	If you know these will be available externally you can
+ //config:	disable this option.
+ 
+-//applet:IF_NOLOGIN(APPLET_SCRIPTED(nologin, scripted, BB_DIR_USR_SBIN, BB_SUID_DROP, nologin))
++//applet:IF_NOLOGIN(APPLET_SCRIPTED(nologin, scripted, BB_DIR_SBIN, BB_SUID_DROP, nologin))
+ 
+ //usage:#define nologin_trivial_usage
+ //usage:	""
diff --git a/main/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch b/main/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch
deleted file mode 100644
index ab3421e22ad..00000000000
--- a/main/busybox/0008-fbsplash-support-image-and-bar-alignment-and-positio.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From cc005e48ebd831199789d9dfb1a9307e743ecdaa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Fri, 21 Nov 2014 16:06:34 +0200
-Subject: [PATCH] fbsplash: support image and bar alignment and positioning
-
-Needed to center a splash screen image in the initramfs.
----
- miscutils/fbsplash.c | 93 ++++++++++++++++++++++++++++++++------------
- 1 file changed, 69 insertions(+), 24 deletions(-)
-
-diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
-index 1c206ef53..500e04fcc 100644
---- a/miscutils/fbsplash.c
-+++ b/miscutils/fbsplash.c
-@@ -54,7 +54,7 @@
- //usage:     "\n	-d	Framebuffer device (default /dev/fb0)"
- //usage:     "\n	-i	Config file (var=value):"
- //usage:     "\n			BAR_LEFT,BAR_TOP,BAR_WIDTH,BAR_HEIGHT"
--//usage:     "\n			BAR_R,BAR_G,BAR_B,IMG_LEFT,IMG_TOP"
-+//usage:     "\n			BAR_R,BAR_G,BAR_B,IMG_LEFT,IMG_TOP,IMG_ALIGN"
- //usage:     "\n	-f	Control pipe (else exit after drawing image)"
- //usage:     "\n			commands: 'NN' (% for progress bar) or 'exit'"
- //usage:     "\n	-T	Switch to TTY to hide all console messages"
-@@ -73,13 +73,39 @@
- 
- #define ESC "\033"
- 
-+enum {
-+	bar_width,
-+	bar_height,
-+	bar_posx,
-+	bar_posy,
-+	bar_colr,
-+	bar_colg,
-+	bar_colb,
-+	nimg_posx,
-+	nimg_posy,
-+	nimg_align,
-+	num_ns_opts,
-+	debug = num_ns_opts,
-+};
-+
-+#define nbar_width	ns[bar_width]
-+#define nbar_height	ns[bar_height]
-+#define nbar_posx	ns[bar_posx]
-+#define nbar_posy	ns[bar_posy]
-+#define nbar_colr	ns[bar_colr]
-+#define nbar_colg	ns[bar_colg]
-+#define nbar_colb	ns[bar_colb]
-+#define img_posx	ns[nimg_posx]
-+#define img_posy	ns[nimg_posy]
-+#define img_align	ns[nimg_align]
-+
- struct globals {
- #if DEBUG
- 	bool bdebug_messages;	// enable/disable logging
- 	FILE *logfile_fd;	// log file
- #endif
- 	unsigned char *addr;	// pointer to framebuffer memory
--	unsigned ns[9];		// n-parameters
-+	unsigned ns[num_ns_opts];	// n-parameters
- 	const char *image_filename;
- 	int silent_tty, fd_tty_s;
- 	bool do_not_draw;
-@@ -96,16 +122,6 @@ struct globals {
- 	SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
- } while (0)
- 
--#define nbar_width	ns[0]	// progress bar width
--#define nbar_height	ns[1]	// progress bar height
--#define nbar_posx	ns[2]	// progress bar horizontal position
--#define nbar_posy	ns[3]	// progress bar vertical position
--#define nbar_colr	ns[4]	// progress bar color red component
--#define nbar_colg	ns[5]	// progress bar color green component
--#define nbar_colb	ns[6]	// progress bar color blue component
--#define img_posx	ns[7]	// image horizontal position
--#define img_posy	ns[8]	// image vertical position
--
- #if DEBUG
- #define DEBUG_MESSAGE(strMessage, args...) \
- 	if (G.bdebug_messages) { \
-@@ -386,7 +402,7 @@ static void fb_drawimage(void)
- 	FILE *theme_file;
- 	char *read_ptr;
- 	unsigned char *pixline;
--	unsigned i, j, width, height, line_size;
-+	int i, j, width, height, line_size, xoffs, yoffs, xstart;
- 
- 	if (LONE_DASH(G.image_filename)) {
- 		theme_file = stdin;
-@@ -436,18 +452,39 @@ static void fb_drawimage(void)
- 	line_size = width*3;
- 	pixline = xmalloc(line_size);
- 
--	if ((width + G.img_posx) > G.scr_var.xres)
--		width = G.scr_var.xres - G.img_posx;
--	if ((height + G.img_posy) > G.scr_var.yres)
--		height = G.scr_var.yres - G.img_posy;
--	for (j = 0; j < height; j++) {
-+	xoffs = G.img_posx;
-+	switch (G.img_align % 3) {
-+	case 1: xoffs += (G.scr_var.xres - width) / 2; break;
-+	case 2: xoffs += G.scr_var.xres - width; break;
-+	}
-+	xstart = 0;
-+	if (xoffs < 0) {
-+		xstart = -xoffs;
-+		xoffs = 0;
-+	}
-+	if ((width + xoffs) > G.scr_var.xres)
-+		width = G.scr_var.xres - xoffs;
-+
-+	yoffs = G.img_posy;
-+	switch (G.img_align / 3) {
-+	case 1: yoffs += (G.scr_var.yres - height) / 2; break;
-+	case 2: yoffs += G.scr_var.yres - height; break;
-+	}
-+	if ((height + yoffs) > G.scr_var.yres)
-+		height = G.scr_var.yres - yoffs;
-+
-+	for (j = 0; j < height; j++, yoffs++) {
- 		unsigned char *pixel;
- 		unsigned char *src;
- 
- 		if (fread(pixline, 1, line_size, theme_file) != line_size)
- 			bb_error_msg_and_die("bad PPM file '%s'", G.image_filename);
--		pixel = pixline;
--		src = G.addr + (G.img_posy + j) * G.scr_fix.line_length + G.img_posx * G.bytes_per_pixel;
-+
-+		if (yoffs < 0)
-+			continue;
-+
-+		pixel = pixline + xstart * 3;
-+		src = G.addr + yoffs * G.scr_fix.line_length + xoffs * G.bytes_per_pixel;
- 		for (i = 0; i < width; i++) {
- 			unsigned thispix = fb_pixel_value(pixel[0], pixel[1], pixel[2]);
- 			fb_write_pixel(src, thispix);
-@@ -466,11 +503,15 @@ static void fb_drawimage(void)
-  */
- static void init(const char *cfg_filename)
- {
-+	static const char align_names[] ALIGN1 =
-+		"LT\0" "CT\0" "RT\0"
-+		"LM\0" "CM\0" "RM\0"
-+		"LB\0" "CB\0" "RB\0";
- 	static const char param_names[] ALIGN1 =
- 		"BAR_WIDTH\0" "BAR_HEIGHT\0"
- 		"BAR_LEFT\0" "BAR_TOP\0"
- 		"BAR_R\0" "BAR_G\0" "BAR_B\0"
--		"IMG_LEFT\0" "IMG_TOP\0"
-+		"IMG_LEFT\0" "IMG_TOP\0" "IMG_ALIGN\0"
- #if DEBUG
- 		"DEBUG\0"
- #endif
-@@ -479,14 +520,18 @@ static void init(const char *cfg_filename)
- 	parser_t *parser = config_open2(cfg_filename, xfopen_stdin);
- 	while (config_read(parser, token, 2, 2, "#=",
- 				(PARSE_NORMAL | PARSE_MIN_DIE) & ~(PARSE_TRIM | PARSE_COLLAPSE))) {
--		unsigned val = xatoi_positive(token[1]);
-+		unsigned val;
- 		int i = index_in_strings(param_names, token[0]);
- 		if (i < 0)
- 			bb_error_msg_and_die("syntax error: %s", token[0]);
--		if (i >= 0 && i < 9)
-+		if (i == nimg_align)
-+			val = index_in_strings(align_names, token[1]);
-+		else
-+			val = xatoi_positive(token[1]);
-+		if (i < num_ns_opts)
- 			G.ns[i] = val;
- #if DEBUG
--		if (i == 9) {
-+		if (i == debug) {
- 			G.bdebug_messages = val;
- 			if (G.bdebug_messages)
- 				G.logfile_fd = xfopen_for_write("/tmp/fbsplash.log");
diff --git a/main/busybox/0008-pgrep-add-support-for-matching-against-UID-and-RUID.patch b/main/busybox/0008-pgrep-add-support-for-matching-against-UID-and-RUID.patch
new file mode 100644
index 00000000000..165504283c2
--- /dev/null
+++ b/main/busybox/0008-pgrep-add-support-for-matching-against-UID-and-RUID.patch
@@ -0,0 +1,138 @@
+From 513d186f420176c3a1be8843fee6a42cbd57cb35 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Mon, 22 Nov 2021 11:06:05 -0600
+Subject: [PATCH] pgrep: add support for matching against UID and RUID
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is standard functionality on every other pgrep implementation I
+found, namely the ones in Illumos, FreeBSD, Linux procps, and macOS.
+
+Additionally, real world scripts like pipewire-session are dependent
+on it being present.
+
+function                                             old     new   delta
+pgrep_main                                           818    1007    +189
+packed_usage                                       26001   26032     +31
+.rodata                                            78544   78548      +4
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 3/0 up/down: 224/0)             Total: 224 bytes
+
+Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
+---
+ procps/pgrep.c | 37 +++++++++++++++++++++++++++++++++----
+ 1 file changed, 33 insertions(+), 4 deletions(-)
+
+diff --git a/procps/pgrep.c b/procps/pgrep.c
+index 82e00322f..c1f7208f5 100644
+--- a/procps/pgrep.c
++++ b/procps/pgrep.c
+@@ -42,6 +42,8 @@
+ //usage:     "\n	-x	Match whole name (not substring)"
+ //usage:     "\n	-s	Match session ID (0 for current)"
+ //usage:     "\n	-P	Match parent process ID"
++//usage:     "\n	-u EUID Match against effective UID"
++//usage:     "\n	-U UID  Match against UID"
+ //usage:
+ //usage:#define pkill_trivial_usage
+ //usage:       "[-l|-SIGNAL] [-xfvnoe] [-s SID|-P PPID|PATTERN]"
+@@ -56,6 +58,8 @@
+ //usage:     "\n	-n	Signal the newest process only"
+ //usage:     "\n	-o	Signal the oldest process only"
+ //usage:     "\n	-e	Display name and PID of the process being killed"
++//usage:     "\n	-u EUID Match against effective UID"
++//usage:     "\n	-U UID  Match against UID"
+ 
+ #include "libbb.h"
+ #include "xregex.h"
+@@ -65,7 +69,7 @@
+ #define pkill (ENABLE_PKILL && (!ENABLE_PGREP || applet_name[1] == 'k'))
+ 
+ enum {
+-	/* "vlafxones:+P:+" */
++	/* "vlafxoneu:U:s:+P:+" */
+ 	OPTBIT_V = 0, /* must be first, we need OPT_INVERT = 0/1 */
+ 	OPTBIT_L,
+ 	OPTBIT_A,
+@@ -74,6 +78,8 @@ enum {
+ 	OPTBIT_O,
+ 	OPTBIT_N,
+ 	OPTBIT_E, /* should be pkill-only, do we care? */
++	OPTBIT_U,
++	OPTBIT_UL,
+ 	OPTBIT_S,
+ 	OPTBIT_P,
+ };
+@@ -88,6 +94,8 @@ enum {
+ #define OPT_ECHO	(opt & (1 << OPTBIT_E))
+ #define OPT_SID		(opt & (1 << OPTBIT_S))
+ #define OPT_PPID	(opt & (1 << OPTBIT_P))
++#define OPT_EUID	(opt & (1 << OPTBIT_UL))
++#define OPT_RUID	(opt & (1 << OPTBIT_U))
+ 
+ static void act(unsigned pid, char *cmd, int signo)
+ {
+@@ -112,7 +120,8 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
+ 	unsigned opt;
+ 	int scan_mask;
+ 	int matched_pid;
+-	int sid2match, ppid2match;
++	int sid2match, ppid2match, uid2match, euid2match;
++	char *uid_arg = NULL, *euid_arg = NULL;
+ 	char *cmd_last;
+ 	procps_status_t *proc;
+ 	/* These are initialized to 0 */
+@@ -138,7 +147,9 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
+ 	/* Parse remaining options */
+ 	ppid2match = -1;
+ 	sid2match = -1;
+-	opt = getopt32(argv, "vlafxones:+P:+", &sid2match, &ppid2match);
++	uid2match = -1;
++	euid2match = -1;
++	opt = getopt32(argv, "vlafxoneu:U:s:+P:+", &euid_arg, &uid_arg, &sid2match, &ppid2match);
+ 	argv += optind;
+ 
+ 	if (pkill && OPT_LIST) { /* -l: print the whole signal list */
+@@ -154,8 +165,18 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
+ 	if (OPT_FULL)
+ 		scan_mask |= PSSCAN_ARGVN;
+ 
++	if (euid_arg) {
++		scan_mask |= PSSCAN_UIDGID;
++		euid2match = get_ug_id(euid_arg, xuname2uid);
++	}
++
++	if (uid_arg) {
++		scan_mask |= PSSCAN_RUIDGID;
++		uid2match = get_ug_id(uid_arg, xuname2uid);
++	}
++
+ 	/* One pattern is required, if no -s and no -P */
+-	if ((sid2match & ppid2match) < 0 && (!argv[0] || argv[1]))
++	if ((sid2match & ppid2match) < 0 && uid2match < 0 && euid2match < 0 && (!argv[0] || argv[1]))
+ 		bb_show_usage();
+ 
+ 	if (argv[0])
+@@ -177,6 +198,10 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
+ 				continue;
+ 			if (sid2match >= 0 && sid2match != proc->sid)
+ 				continue;
++			if (euid2match >= 0 && euid2match != proc->uid)
++				continue;
++			if (uid2match >= 0 && uid2match != proc->ruid)
++				continue;
+ 		}
+ 
+ 		cmdlen = -1;
+@@ -209,6 +234,10 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv)
+ 				goto got_it;
+ 			if (sid2match >= 0 && sid2match != proc->sid)
+ 				goto got_it;
++			if (euid2match >= 0 && euid2match != proc->uid)
++				goto got_it;
++			if (uid2match >= 0 && uid2match != proc->ruid)
++				goto got_it;
+ 		}
+ 
+ 		match = !argv[0]; /* if no PATTERN, then it's a match, else... */
diff --git a/main/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch b/main/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch
deleted file mode 100644
index a0a56a006d9..00000000000
--- a/main/busybox/0009-depmod-support-generating-kmod-binary-index-files.patch
+++ /dev/null
@@ -1,507 +0,0 @@
-From 24f932672e826e8f93955d0c6dd6bca140f3fa98 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Sun, 25 Oct 2015 22:21:41 +0200
-Subject: [PATCH] depmod: support generating kmod binary index files
-
-This allows to use busybox depmod, and run daemons using libkmod (or
-even kmod modprobe if needed).
-
-About +1500 bytes when enabled. This patch merges some depmod code
-paths, so when this is disabled it shrinks the code size a little bit.
----
- modutils/Config.src |   9 ++
- modutils/depmod.c   | 281 ++++++++++++++++++++++++++++++++++++--------
- modutils/modprobe.c |  15 ---
- modutils/modutils.c |  31 +++++
- modutils/modutils.h |  16 +++
- 5 files changed, 286 insertions(+), 66 deletions(-)
-
-diff --git a/modutils/Config.src b/modutils/Config.src
-index 188296814..7a4c037ad 100644
---- a/modutils/Config.src
-+++ b/modutils/Config.src
-@@ -152,6 +152,15 @@ config FEATURE_MODUTILS_ALIAS
- 
- 	Say Y if unsure.
- 
-+config FEATURE_MODUTILS_BIN
-+	bool "Support for the kmod .bin file format"
-+	default n
-+	depends on DEPMOD && !MODPROBE_SMALL
-+	help
-+	  Generate kmod compatible binary index files for .dep, .alias,
-+	  .symbols and .builtin files. Allows mixing use of busybox
-+	  modutils and kmod (binaries and library).
-+
- config FEATURE_MODUTILS_SYMBOLS
- 	bool "Support module.symbols file"
- 	default y
-diff --git a/modutils/depmod.c b/modutils/depmod.c
-index 004c67a11..05c1a9bce 100644
---- a/modutils/depmod.c
-+++ b/modutils/depmod.c
-@@ -2,7 +2,7 @@
- /*
-  * depmod - generate modules.dep
-  * Copyright (c) 2008 Bernhard Reutner-Fischer
-- * Copyrihgt (c) 2008 Timo Teras <timo.teras@iki.fi>
-+ * Copyrihgt (c) 2008-2015 Timo Teras <timo.teras@iki.fi>
-  * Copyright (c) 2008 Vladimir Dronnikov
-  *
-  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
-@@ -26,6 +26,24 @@
- #include "modutils.h"
- #include <sys/utsname.h> /* uname() */
- 
-+#define INDEX_MINCHAR	32
-+#define INDEX_MAXCHAR	128
-+
-+typedef struct index_node {
-+	char *prefix;
-+	llist_t *values;
-+	struct index_node *children[INDEX_MAXCHAR-INDEX_MINCHAR];
-+} index_node;
-+
-+struct globals {
-+	module_db db;
-+	index_node *root_node;
-+} FIX_ALIASING;
-+#define G (*ptr_to_globals)
-+#define INIT_G() do { \
-+	SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
-+} while (0)
-+
- /*
-  * Theory of operation:
-  * - iterate over all modules and record their full path
-@@ -53,18 +71,12 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA
- 
- 	for (ptr = image; ptr < image + len - 10; ptr++) {
- 		if (is_prefixed_with(ptr, "depends=")) {
--			char *u;
--
- 			ptr += 8;
--			for (u = ptr; *u; u++)
--				if (*u == '-')
--					*u = '_';
--			ptr += string_to_llist(ptr, &e->deps, ",");
-+			string_to_llist(replace_underscores(ptr), &e->deps, ",");
- 		} else if (ENABLE_FEATURE_MODUTILS_ALIAS
- 		 && is_prefixed_with(ptr, "alias=")
- 		) {
--			llist_add_to(&e->aliases, xstrdup(ptr + 6));
--			ptr += strlen(ptr);
-+			llist_add_to(&e->aliases, replace_underscores(xstrdup(ptr + 6)));
- 		} else if (ENABLE_FEATURE_MODUTILS_SYMBOLS
- 		 && is_prefixed_with(ptr, "__ksymtab_")
- 		) {
-@@ -74,9 +86,10 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA
- 			) {
- 				continue;
- 			}
--			llist_add_to(&e->symbols, xstrdup(ptr));
--			ptr += strlen(ptr);
--		}
-+			llist_add_to(&e->symbols, xasprintf("symbol:%s", ptr));
-+		} else
-+			continue;
-+		ptr += strlen(ptr);
- 	}
- 	free(image);
- 
-@@ -108,12 +121,6 @@ static void order_dep_list(module_db *modules, module_entry *start, llist_t *add
- 	}
- }
- 
--static void xfreopen_write(const char *file, FILE *f)
--{
--	if (freopen(file, "w", f) == NULL)
--		bb_perror_msg_and_die("can't open '%s'", file);
--}
--
- //usage:#if !ENABLE_MODPROBE_SMALL
- //usage:#define depmod_trivial_usage "[-n] [-b BASE] [VERSION] [MODFILES]..."
- //usage:#define depmod_full_usage "\n\n"
-@@ -167,6 +174,169 @@ enum {
- 	OPT_C = (1 << 9), /* -C,--config etc_modules_conf: ignored */
- };
- 
-+/* Support for the mod binary index generation */
-+
-+static void index_init(const char *filename)
-+{
-+	if (ENABLE_FEATURE_MODUTILS_BIN) {
-+		index_node *n;
-+
-+		n = xzalloc(sizeof(index_node));
-+		n->prefix = xstrdup("");
-+		G.root_node = n;
-+	}
-+
-+	if (filename && !(option_mask32 & OPT_n)) {
-+		if (freopen(filename, "w", stdout) == NULL)
-+			bb_perror_msg_and_die("can't open '%s'", filename);
-+	}
-+}
-+
-+static void index_add(const char *key, char *value, const char *prefix)
-+{
-+	if (prefix && *prefix)
-+		printf("%s%s %s\n", prefix, key, value);
-+	else if (prefix)
-+		printf("%s\n", value);
-+
-+	if (ENABLE_FEATURE_MODUTILS_BIN) {
-+		index_node *cur = G.root_node, *n;
-+		unsigned i = 0, j, ch;
-+
-+		while (1) {
-+			/* Ensure node->prefix is a prefix of &str[i].
-+			 * If it is not already, then we must split node. */
-+			for (j = 0; cur->prefix[j]; j++) {
-+				ch = cur->prefix[j];
-+				if (ch != key[i+j]) {
-+					/* New child is copy of node with prefix[j+1..N] */
-+					n = xzalloc(sizeof(index_node));
-+					n->prefix = xstrdup(&cur->prefix[j+1]);
-+					n->values = cur->values;
-+					memcpy(n->children, cur->children, sizeof(n->children));
-+
-+					/* Parent has prefix[0..j], child at prefix[j] */
-+					cur->prefix[j] = '\0';
-+					cur->values = NULL;
-+					memset(cur->children, 0, sizeof(cur->children));
-+					cur->children[ch-INDEX_MINCHAR] = n;
-+					break;
-+				}
-+			}
-+			i += j;
-+
-+			ch = key[i];
-+			if (ch == 0)
-+				break;
-+
-+			if (ch < INDEX_MINCHAR || ch >= INDEX_MAXCHAR)
-+				bb_error_msg_and_die("bad module name");
-+
-+			ch -= INDEX_MINCHAR;
-+			if (!cur->children[ch]) {
-+				n = xzalloc(sizeof(index_node));
-+				cur->children[ch] = n;
-+				n->prefix = xstrdup(&key[i+1]);
-+				cur = n;
-+				break;
-+			}
-+
-+			/* Descend into child node and continue */
-+			cur = cur->children[ch];
-+			i++;
-+		}
-+
-+		llist_add_to(&cur->values, value);
-+	}
-+}
-+
-+static uint32_t index_write_node(FILE *out, index_node *n, void (*freeit)(void *data))
-+{
-+	uint32_t child_offs[INDEX_MAXCHAR-INDEX_MINCHAR];
-+	uint32_t offset;
-+	uint8_t first = 255, last = 0;
-+	unsigned i;
-+
-+	for (i = 0; i < INDEX_MAXCHAR-INDEX_MINCHAR; i++) {
-+		child_offs[i] = 0;
-+		if (!n->children[i])
-+			continue;
-+		child_offs[i] = index_write_node(out, n->children[i], freeit);
-+		if (first > INDEX_MAXCHAR)
-+			first = i;
-+		last = i;
-+	}
-+
-+	offset = ftell(out);
-+
-+	if (n->prefix[0]) {
-+		fputs(n->prefix, out);
-+		fputc('\0', out);
-+		offset |= INDEX_NODE_PREFIX;
-+	}
-+
-+	if (first < INDEX_MAXCHAR) {
-+		fputc(first + INDEX_MINCHAR, out);
-+		fputc(last + INDEX_MINCHAR, out);
-+		fwrite(child_offs + first, sizeof(uint32_t), last - first + 1, out);
-+		offset |= INDEX_NODE_CHILDS;
-+	}
-+
-+	if (n->values) {
-+		const llist_t *v;
-+		unsigned int cnt;
-+		uint32_t u;
-+
-+		n->values = llist_rev(n->values);
-+		for (v = n->values, cnt = 0; v != NULL; v = v->link, cnt++);
-+		u = htonl(cnt);
-+		fwrite(&u, sizeof(u), 1, out);
-+		for (v = n->values, cnt = 0; v != NULL; v = v->link, cnt++) {
-+			u = htonl(cnt);
-+			fwrite(&u, sizeof(u), 1, out);
-+			fputs(v->data, out);
-+			fputc('\0', out);
-+		}
-+		offset |= INDEX_NODE_VALUES;
-+	}
-+
-+	llist_free(n->values, freeit);
-+	free(n->prefix);
-+	free(n);
-+
-+	return htonl(offset);
-+}
-+
-+static void index_dump(const char *filename, int deps_file)
-+{
-+	if (ENABLE_FEATURE_MODUTILS_BIN) {
-+		FILE *out;
-+		uint32_t header[3] = {
-+			htonl(INDEX_MAGIC),
-+			htonl(INDEX_VERSION),
-+		};
-+
-+		if (option_mask32 & OPT_n)
-+			filename = "/dev/null";
-+		else
-+			filename = xasprintf("tmp.%s.bin", filename);
-+
-+		out = xfopen_for_write(filename);
-+		fwrite(header, sizeof(uint32_t), 3, out);
-+		header[2] = index_write_node(out, G.root_node, deps_file ? free : 0);
-+		rewind(out);
-+		G.root_node = NULL;
-+		fwrite(header, sizeof(uint32_t), 3, out);
-+		if (fclose(out)) {
-+			remove(filename);
-+			bb_error_msg_and_die(bb_msg_write_error);
-+		}
-+		/* .bin files are mmap'ed; not renaming it may crash
-+		 * long standing daemon using libkmod */
-+		rename_or_warn(filename, filename + 4);
-+	}
-+}
-+
- int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int depmod_main(int argc UNUSED_PARAM, char **argv)
- {
-@@ -178,6 +348,8 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
- 	unsigned i;
- 	int tmp;
- 
-+	INIT_G();
-+
- 	getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL, NULL);
- 	argv += optind;
- 
-@@ -210,53 +382,60 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
- 	}
- 
- 	/* Generate dependency and alias files */
--	if (!(option_mask32 & OPT_n))
--		xfreopen_write(CONFIG_DEFAULT_DEPMOD_FILE, stdout);
--
-+	index_init(CONFIG_DEFAULT_DEPMOD_FILE);
- 	moddb_foreach_module(&modules, m, i) {
--		printf("%s:", m->name);
--
-+		char *buf = xasprintf("%s:", m->name);
- 		order_dep_list(&modules, m, m->deps);
-+
- 		while (m->dnext != m) {
- 			dep = m->dnext;
--			printf(" %s", dep->name);
--
-+			buf = gather_options_str(buf, dep->name);
- 			/* unlink current entry */
- 			dep->dnext->dprev = dep->dprev;
- 			dep->dprev->dnext = dep->dnext;
- 			dep->dnext = dep->dprev = dep;
- 		}
--		bb_putchar('\n');
-+		index_add(m->modname, buf, "");
- 	}
--
--#if ENABLE_FEATURE_MODUTILS_ALIAS
--	if (!(option_mask32 & OPT_n))
--		xfreopen_write("modules.alias", stdout);
--	moddb_foreach_module(&modules, m, i) {
--		while (m->aliases) {
--			/*
--			 * Last word used to be a basename
--			 * (filename with path and .ko.* stripped)
--			 * at the time of module-init-tools 3.4.
--			 * kmod v.12 uses module name, i.e., s/-/_/g.
--			 */
--			printf("alias %s %s\n",
--				(char*)llist_pop(&m->aliases),
--				m->modname);
-+	index_dump(CONFIG_DEFAULT_DEPMOD_FILE, 1);
-+
-+	if (ENABLE_FEATURE_MODUTILS_ALIAS) {
-+		index_init("modules.alias");
-+		moddb_foreach_module(&modules, m, i) {
-+			while (m->aliases) {
-+				/*
-+				 * Last word used to be a basename
-+				 * (filename with path and .ko.* stripped)
-+				 * at the time of module-init-tools 3.4.
-+				 * kmod v.12 uses module name, i.e., s/-/_/g.
-+				 */
-+				index_add((char*)llist_pop(&m->aliases), m->modname, "alias ");
-+			}
- 		}
-+		index_dump("modules.alias", 0);
- 	}
--#endif
--#if ENABLE_FEATURE_MODUTILS_SYMBOLS
--	if (!(option_mask32 & OPT_n))
--		xfreopen_write("modules.symbols", stdout);
--	moddb_foreach_module(&modules, m, i) {
--		while (m->symbols) {
--			printf("alias symbol:%s %s\n",
--				(char*)llist_pop(&m->symbols),
--				m->modname);
-+	if (ENABLE_FEATURE_MODUTILS_SYMBOLS) {
-+		index_init("modules.symbols");
-+		moddb_foreach_module(&modules, m, i) {
-+			while (m->symbols) {
-+				index_add((char*)llist_pop(&m->symbols), m->modname, "alias ");
-+			}
-+		}
-+		index_dump("modules.symbols", 0);
-+	}
-+	if (ENABLE_FEATURE_MODUTILS_BIN) {
-+		char line[PATH_MAX], modname[MODULE_NAME_LEN];
-+		FILE *in;
-+
-+		index_init(NULL);
-+		in = xfopen_for_read("modules.builtin");
-+		while (fgets(line, sizeof(line), in) != NULL) {
-+			filename2modname(line, modname);
-+			index_add(modname, (char *) "", 0);
- 		}
-+		fclose(in);
-+		index_dump("modules.builtin", 0);
- 	}
--#endif
- 
- 	if (ENABLE_FEATURE_CLEAN_UP)
- 		moddb_free(&modules);
-diff --git a/modutils/modprobe.c b/modutils/modprobe.c
-index 59f6d54f3..0a398a60f 100644
---- a/modutils/modprobe.c
-+++ b/modutils/modprobe.c
-@@ -192,21 +192,6 @@ struct globals {
- 
- static int read_config(const char *path);
- 
--static char *gather_options_str(char *opts, const char *append)
--{
--	/* Speed-optimized. We call gather_options_str many times. */
--	if (append) {
--		if (opts == NULL) {
--			opts = xstrdup(append);
--		} else {
--			int optlen = strlen(opts);
--			opts = xrealloc(opts, optlen + strlen(append) + 2);
--			sprintf(opts + optlen, " %s", append);
--		}
--	}
--	return opts;
--}
--
- static struct module_entry *get_or_add_modentry(const char *module)
- {
- 	return moddb_get_or_create(&G.db, module);
-diff --git a/modutils/modutils.c b/modutils/modutils.c
-index 6f7cd9721..257089af4 100644
---- a/modutils/modutils.c
-+++ b/modutils/modutils.c
-@@ -66,6 +66,21 @@ void FAST_FUNC moddb_free(module_db *db)
- 	}
- }
- 
-+char * FAST_FUNC gather_options_str(char *opts, const char *append)
-+{
-+	/* Speed-optimized. We call gather_options_str many times. */
-+	if (append) {
-+		if (opts == NULL) {
-+			opts = xstrdup(append);
-+		} else {
-+			int optlen = strlen(opts);
-+			opts = xrealloc(opts, optlen + strlen(append) + 2);
-+			sprintf(opts + optlen, " %s", append);
-+		}
-+	}
-+	return opts;
-+}
-+
- void FAST_FUNC replace(char *s, char what, char with)
- {
- 	while (*s) {
-@@ -75,6 +90,22 @@ void FAST_FUNC replace(char *s, char what, char with)
- 	}
- }
- 
-+char* FAST_FUNC replace_underscores(char *s)
-+{
-+	int i;
-+	for (i = 0; s[i]; i++) {
-+		switch (s[i]) {
-+		case '-':
-+			s[i] = '_';
-+			break;
-+		case '[':
-+			i += strcspn(&s[i], "]");
-+			break;
-+		}
-+	}
-+	return s;
-+}
-+
- int FAST_FUNC string_to_llist(char *string, llist_t **llist, const char *delim)
- {
- 	char *tok;
-diff --git a/modutils/modutils.h b/modutils/modutils.h
-index 4a702e97c..73e816028 100644
---- a/modutils/modutils.h
-+++ b/modutils/modutils.h
-@@ -18,6 +18,20 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
- #define MODULE_NAME_LEN 256
- #define MODULE_HASH_SIZE 256
- 
-+/* .bin index format definitions */
-+#define INDEX_MAGIC 0xB007F457
-+#define INDEX_VERSION_MAJOR 0x0002
-+#define INDEX_VERSION_MINOR 0x0001
-+#define INDEX_VERSION ((INDEX_VERSION_MAJOR<<16)|INDEX_VERSION_MINOR)
-+
-+enum node_offset {
-+	INDEX_NODE_FLAGS	= 0xF0000000, /* Flags in high nibble */
-+	INDEX_NODE_PREFIX	= 0x80000000,
-+	INDEX_NODE_VALUES	= 0x40000000,
-+	INDEX_NODE_CHILDS	= 0x20000000,
-+	INDEX_NODE_MASK		= 0x0FFFFFFF, /* Offset value */
-+};
-+
- typedef struct module_entry {
- 	struct module_entry *next;
- 	char *name, *modname;
-@@ -47,7 +61,9 @@ module_entry *moddb_get(module_db *db, const char *s) FAST_FUNC;
- module_entry *moddb_get_or_create(module_db *db, const char *s) FAST_FUNC;
- void moddb_free(module_db *db) FAST_FUNC;
- 
-+char *gather_options_str(char *opts, const char *append) FAST_FUNC;
- void replace(char *s, char what, char with) FAST_FUNC;
-+char *replace_underscores(char *s) FAST_FUNC;
- int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC;
- char *filename2modname(const char *filename, char *modname) FAST_FUNC;
- #if ENABLE_FEATURE_CMDLINE_MODULE_OPTIONS
diff --git a/main/busybox/0009-properly-fix-wget-https-support.patch b/main/busybox/0009-properly-fix-wget-https-support.patch
new file mode 100644
index 00000000000..9feff7c104d
--- /dev/null
+++ b/main/busybox/0009-properly-fix-wget-https-support.patch
@@ -0,0 +1,72 @@
+From a93754ca66630221d10d1307b9cd165bed63d68e Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 30 May 2018 09:40:33 +0000
+Subject: [PATCH] properly fix wget https support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+See: https://git.alpinelinux.org/cgit/aports/commit/?id=1d0560a9b6b5597b191e5aff69a31c2fe0aba273
+---
+ networking/wget.c | 21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/networking/wget.c b/networking/wget.c
+index 9ec0e67b9..66959058c 100644
+--- a/networking/wget.c
++++ b/networking/wget.c
+@@ -57,7 +57,6 @@
+ //config:	bool "Support HTTPS using internal TLS code"
+ //config:	default y
+ //config:	depends on WGET
+-//config:	select TLS
+ //config:	help
+ //config:	wget will use internal TLS code to connect to https:// URLs.
+ //config:	It also enables FTPS support, but it's not well tested yet.
+@@ -772,10 +771,8 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
+ 	int pid;
+ 	char *servername, *p;
+ 
+-	if (!(option_mask32 & WGET_OPT_NO_CHECK_CERT)) {
+-		option_mask32 |= WGET_OPT_NO_CHECK_CERT;
+-		bb_simple_error_msg("note: TLS certificate validation not implemented");
+-	}
++	if (ENABLE_SSL_CLIENT && !(option_mask32 & WGET_OPT_NO_CHECK_CERT))
++		bb_simple_error_msg_and_die("note: TLS certificate validation not implemented");
+ 
+ 	servername = xstrdup(host);
+ 	p = strrchr(servername, ':');
+@@ -792,14 +789,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
+ 		close(sp[0]);
+ 		xmove_fd(sp[1], 0);
+ 		xdup2(0, 1);
+-		if (BB_MMU) {
++		if (BB_MMU && ENABLE_TLS && (option_mask32 & WGET_OPT_NO_CHECK_CERT)) {
+ 			tls_state_t *tls = new_tls_state();
+ 			tls->ifd = tls->ofd = network_fd;
+ 			tls_handshake(tls, servername);
+ 			tls_run_copy_loop(tls, flags);
+ 			exit(0);
+ 		} else {
+-			char *argv[6];
++			char *argv[7], **a;
+ 
+ 			xmove_fd(network_fd, 3);
+ 			argv[0] = (char*)"ssl_client";
+@@ -807,8 +804,14 @@ static void spawn_ssl_client(const char *host, int network_fd, int flags)
+ 			//TODO: if (!is_ip_address(servername))...
+ 			argv[2] = (char*)"-n";
+ 			argv[3] = servername;
+-			argv[4] = (flags & TLSLOOP_EXIT_ON_LOCAL_EOF ? (char*)"-e" : NULL);
+-			argv[5] = NULL;
++
++			a = &argv[4];
++			if (flags & TLSLOOP_EXIT_ON_LOCAL_EOF)
++				*a++ = (char*)"-e";
++			if (!ENABLE_SSL_CLIENT && (option_mask32 & WGET_OPT_NO_CHECK_CERT))
++				*a++= (char*)"-I";
++			*a = NULL;
++
+ 			BB_EXECVP(argv[0], argv);
+ 			bb_perror_msg_and_die("can't execute '%s'", argv[0]);
+ 		}
diff --git a/main/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch b/main/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch
deleted file mode 100644
index da69e06e189..00000000000
--- a/main/busybox/0010-Add-flag-for-not-following-symlinks-when-recursing.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 73318f344e6e57821464068364e30edef18e747d Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 25 Jul 2014 15:28:33 +0200
-Subject: [PATCH] Add flag for not following symlinks when recursing
-
-function                                             old     new   delta
-.rodata                                             7934    7967     +33
-diff_longopts                                        253     270     +17
-packed_usage                                        1704    1720     +16
-diff_main                                           1665    1662      -3
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 3/1 up/down: 66/-3)              Total: 63 bytes
----
- editors/diff.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/editors/diff.c b/editors/diff.c
-index 1462a9b18..2c899578e 100644
---- a/editors/diff.c
-+++ b/editors/diff.c
-@@ -113,6 +113,9 @@
- //usage:     "\n	-N	Treat absent files as empty"
- //usage:     "\n	-q	Output only whether files differ"
- //usage:     "\n	-r	Recurse"
-+//usage:        IF_LONG_OPTS(
-+//usage:     "\n        --no-dereference Don't follow symlinks"
-+//usage:        )
- //usage:     "\n	-S	Start with FILE when comparing directories"
- //usage:     "\n	-T	Make tabs line up by prefixing a tab when necessary"
- //usage:     "\n	-s	Report when two files are the same"
-@@ -154,6 +157,7 @@ enum {                  /* Commandline flags */
- 	FLAG_p,         /* not implemented */
- 	FLAG_B,
- 	FLAG_E,         /* not implemented */
-+	FLAG_no_deref,
- };
- #define FLAG(x) (1 << FLAG_##x)
- 
-@@ -867,7 +871,8 @@ static void diffdir(char *p[2], const char *s_start)
- 		 * Using list.len to specify its length,
- 		 * add_to_dirlist will remove it. */
- 		list[i].len = strlen(p[i]);
--		recursive_action(p[i], ACTION_RECURSE | ACTION_FOLLOWLINKS,
-+		recursive_action(p[i], ACTION_RECURSE |
-+			((option_mask32 & FLAG(no_deref)) ? 0 : ACTION_FOLLOWLINKS),
- 				add_to_dirlist, skip_dir, &list[i], 0);
- 		/* Sort dl alphabetically.
- 		 * GNU diff does this ignoring any number of trailing dots.
-@@ -964,6 +969,7 @@ static const char diff_longopts[] ALIGN1 =
- 	"report-identical-files\0"   No_argument       "s"
- 	"starting-file\0"            Required_argument "S"
- 	"minimal\0"                  No_argument       "d"
-+	"no-dereference\0"           No_argument       "\xff"
- 	;
- # define GETOPT32 getopt32long
- # define LONGOPTS ,diff_longopts
diff --git a/main/busybox/0010-sed-check-errors-writing-file-with-sed-i.patch b/main/busybox/0010-sed-check-errors-writing-file-with-sed-i.patch
new file mode 100644
index 00000000000..f1cc0a860dd
--- /dev/null
+++ b/main/busybox/0010-sed-check-errors-writing-file-with-sed-i.patch
@@ -0,0 +1,63 @@
+From 97e305025e987e77da488133ded31c1e81a0282b Mon Sep 17 00:00:00 2001
+From: Dominique Martinet <dominique.martinet@atmark-techno.com>
+Date: Wed, 16 Nov 2022 07:08:13 +0900
+Subject: [PATCH] sed: check errors writing file with sed -i
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+sed would currently not error if write failed when modifying a file.
+
+This can be reproduced with the following 'script':
+$ sudo mount -t tmpfs tmpfs -o size=1M /tmp/m
+$ sudo chmod 777 /tmp/m
+$ echo foo > /tmp/m/foo
+$ dd if=/dev/zero of=/tmp/m/fill bs=4k
+dd: error writing '/tmp/m/fill': No space left on device
+256+0 records in
+255+0 records out
+1044480 bytes (1.0 MB, 1020 KiB) copied, 0.00234567 s, 445 MB/s
+$ busybox sed -i -e 's/.*/bar/' /tmp/m/foo
+$ echo $?
+0
+$ cat /tmp/m/foo
+<empty>
+
+new behaviour:
+$ echo foo > /tmp/m/foo
+$ ./busybox sed -i -e 's/.*/bar/' /tmp/m/foo
+sed: write error
+$ echo $?
+4
+$ cat /tmp/m/foo
+foo
+
+function                                             old     new   delta
+sed_main                                             754     801     +47
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 1/0 up/down: 47/0)               Total: 47 bytes
+   text	   data	    bss	    dec	    hex	filename
+  66957	   2398	   1552	  70907	  114fb	busybox_old
+  67004	   2398	   1552	  70954	  1152a	busybox_unstripped
+
+Signed-off-by: Dominique Martinet <dominique.martinet@atmark-techno.com>
+---
+ editors/sed.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/editors/sed.c b/editors/sed.c
+index 00dde60be..6179c5e80 100644
+--- a/editors/sed.c
++++ b/editors/sed.c
+@@ -1648,6 +1648,11 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
+ 			fchown(nonstdoutfd, statbuf.st_uid, statbuf.st_gid);
+ 
+ 			process_files();
++			fflush(G.nonstdout);
++			if (ferror(G.nonstdout)) {
++				xfunc_error_retval = 4;  /* It's what gnu sed exits with... */
++				bb_simple_error_msg_and_die(bb_msg_write_error);
++			}
+ 			fclose(G.nonstdout);
+ 			G.nonstdout = stdout;
+ 
diff --git a/main/busybox/0011-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch b/main/busybox/0011-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
new file mode 100644
index 00000000000..fe1a0038f99
--- /dev/null
+++ b/main/busybox/0011-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
@@ -0,0 +1,59 @@
+From df153459261ed2683ebb7ab766eaee6b741426ae Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 28 Nov 2017 16:30:23 +0100
+Subject: [PATCH] fsck: resolve LABEL=.../UUID=... spec to device
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ e2fsprogs/fsck.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
+index 028f8a803..7a0921979 100644
+--- a/e2fsprogs/fsck.c
++++ b/e2fsprogs/fsck.c
+@@ -60,6 +60,7 @@
+ //usage:     "\n	-t TYPE	List of filesystem types to check"
+ 
+ #include "libbb.h"
++#include "volume_id.h"
+ #include "common_bufsiz.h"
+ 
+ /* "progress indicator" code is somewhat buggy and ext[23] specific.
+@@ -524,12 +525,13 @@ static int wait_many(int flags)
+  * Execute a particular fsck program, and link it into the list of
+  * child processes we are waiting for.
+  */
+-static void execute(const char *type, const char *device,
++static void execute(const char *type, const char *spec,
+ 		const char *mntpt /*, int interactive */)
+ {
+ 	int i;
+ 	struct fsck_instance *inst;
+ 	pid_t pid;
++	char *device = (char *)spec;
+ 
+ 	G.args[0] = xasprintf("fsck.%s", type);
+ 
+@@ -544,7 +546,8 @@ static void execute(const char *type, const char *device,
+ 	}
+ #endif
+ 
+-	G.args[G.num_args - 2] = (char*)device;
++	resolve_mount_spec(&device);
++	G.args[G.num_args - 2] = device;
+ 	/* G.args[G.num_args - 1] = NULL; - already is */
+ 
+ 	if (G.verbose || G.noexecute) {
+@@ -973,9 +976,6 @@ int fsck_main(int argc UNUSED_PARAM, char **argv)
+ 
+ 		/* "/dev/blk" or "/path" or "UUID=xxx" or "LABEL=xxx" */
+ 		if ((arg[0] == '/' && !opts_for_fsck) || strchr(arg, '=')) {
+-// FIXME: must check that arg is a blkdev, or resolve
+-// "/path", "UUID=xxx" or "LABEL=xxx" into block device name
+-// ("UUID=xxx"/"LABEL=xxx" can probably shifted to fsck.auto duties)
+ 			devices = xrealloc_vector(devices, 2, num_devices);
+ 			devices[num_devices++] = arg;
+ 			continue;
diff --git a/main/busybox/0012-nslookup-sanitize-all-printed-strings-with-printable.patch b/main/busybox/0012-nslookup-sanitize-all-printed-strings-with-printable.patch
new file mode 100644
index 00000000000..63d72fead06
--- /dev/null
+++ b/main/busybox/0012-nslookup-sanitize-all-printed-strings-with-printable.patch
@@ -0,0 +1,67 @@
+From 2365aa9b62dd703cd279b94ede25ebb274cfe723 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Sun, 3 Apr 2022 20:44:51 +0000
+Subject: [PATCH] nslookup: sanitize all printed strings with printable_string
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise, terminal sequences can be injected, which enables various terminal injection
+attacks from DNS results.
+
+CVE: Pending
+Upstream-Status: Pending
+Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
+---
+ networking/nslookup.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/networking/nslookup.c b/networking/nslookup.c
+index 6da97baf4..4bdcde1b8 100644
+--- a/networking/nslookup.c
++++ b/networking/nslookup.c
+@@ -407,7 +407,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len)
+ 				//printf("Unable to uncompress domain: %s\n", strerror(errno));
+ 				return -1;
+ 			}
+-			printf(format, ns_rr_name(rr), dname);
++			printf(format, ns_rr_name(rr), printable_string(dname));
+ 			break;
+ 
+ 		case ns_t_mx:
+@@ -422,7 +422,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len)
+ 				//printf("Cannot uncompress MX domain: %s\n", strerror(errno));
+ 				return -1;
+ 			}
+-			printf("%s\tmail exchanger = %d %s\n", ns_rr_name(rr), n, dname);
++			printf("%s\tmail exchanger = %d %s\n", ns_rr_name(rr), n, printable_string(dname));
+ 			break;
+ 
+ 		case ns_t_txt:
+@@ -434,7 +434,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len)
+ 			if (n > 0) {
+ 				memset(dname, 0, sizeof(dname));
+ 				memcpy(dname, ns_rr_rdata(rr) + 1, n);
+-				printf("%s\ttext = \"%s\"\n", ns_rr_name(rr), dname);
++				printf("%s\ttext = \"%s\"\n", ns_rr_name(rr), printable_string(dname));
+ 			}
+ 			break;
+ 
+@@ -454,7 +454,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len)
+ 			}
+ 
+ 			printf("%s\tservice = %u %u %u %s\n", ns_rr_name(rr),
+-				ns_get16(cp), ns_get16(cp + 2), ns_get16(cp + 4), dname);
++				ns_get16(cp), ns_get16(cp + 2), ns_get16(cp + 4), printable_string(dname));
+ 			break;
+ 
+ 		case ns_t_soa:
+@@ -483,7 +483,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len)
+ 				return -1;
+ 			}
+ 
+-			printf("\tmail addr = %s\n", dname);
++			printf("\tmail addr = %s\n", printable_string(dname));
+ 			cp += n;
+ 
+ 			printf("\tserial = %lu\n", ns_get32(cp));
diff --git a/main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch b/main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
deleted file mode 100644
index 82bd1222abd..00000000000
--- a/main/busybox/0012-udhcpc-Don-t-background-if-n-is-given.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 8e43e4ad948c5db6144d49d8968d30dbfb4b5afb Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 6 Jul 2017 13:39:15 +0200
-Subject: [PATCH] udhcpc: Don't background if -n is given
-
-we need add -b to our udhcpc options to prevent boot forever if there are no
-dhcp server. We also need a way for users to disable this behavior by making
-it possible to set -n option at runtime.
-
-Since busybox 1.31.0 -b takes precedence over -n [0]. However, since we
-enable -b instead of -n by default (through our busyboxconfig) this is
-not desired, this commit therefore also reverts the upstream patch
-introducing this change.
-
-See also: https://bugs.busybox.net/11691
-
-[0]: https://git.busybox.net/busybox/commit/?id=87e216294af9eec39c0c1d553555f8a98c15db38
----
- networking/udhcp/d6_dhcpc.c | 20 +++++++-------------
- networking/udhcp/dhcpc.c    | 20 +++++++-------------
- 2 files changed, 14 insertions(+), 26 deletions(-)
-
-diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
-index 422b88882..f09bdf617 100644
---- a/networking/udhcp/d6_dhcpc.c
-+++ b/networking/udhcp/d6_dhcpc.c
-@@ -1360,25 +1360,19 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
- 				}
-  leasefail:
- 				d6_run_script_no_option("leasefail");
-+				if (opt & OPT_n) { /* abort if no lease */
-+					bb_info_msg("no lease, failing");
-+					retval = 1;
-+					goto ret;
-+				}
- #if BB_MMU /* -b is not supported on NOMMU */
- 				if (opt & OPT_b) { /* background if no lease */
- 					bb_info_msg("no lease, forking to background");
- 					client_background();
- 					/* do not background again! */
--					opt = ((opt & ~(OPT_b|OPT_n)) | OPT_f);
--					/* ^^^ also disables -n (-b takes priority over -n):
--					 * ifup's default udhcpc options are -R -n,
--					 * and users want to be able to add -b
--					 * (in a config file) to make it background
--					 * _and not exit_.
--					 */
--				} else
--#endif
--				if (opt & OPT_n) { /* abort if no lease */
--					bb_info_msg("no lease, failing");
--					retval = 1;
--					goto ret;
-+					opt = ((opt & ~OPT_b) | OPT_f);
- 				}
-+#endif
- 				/* wait before trying again */
- 				timeout = tryagain_timeout;
- 				packet_num = 0;
-diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
-index 95058dbd8..6501a1ba3 100644
---- a/networking/udhcp/dhcpc.c
-+++ b/networking/udhcp/dhcpc.c
-@@ -1478,25 +1478,19 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
- 				}
-  leasefail:
- 				udhcp_run_script(NULL, "leasefail");
-+				if (opt & OPT_n) { /* abort if no lease */
-+					bb_error_msg("no lease, failing");
-+					retval = 1;
-+					goto ret;
-+				}
- #if BB_MMU /* -b is not supported on NOMMU */
- 				if (opt & OPT_b) { /* background if no lease */
- 					bb_info_msg("no lease, forking to background");
- 					client_background();
- 					/* do not background again! */
--					opt = ((opt & ~(OPT_b|OPT_n)) | OPT_f);
--					/* ^^^ also disables -n (-b takes priority over -n):
--					 * ifup's default udhcpc options are -R -n,
--					 * and users want to be able to add -b
--					 * (in a config file) to make it background
--					 * _and not exit_.
--					 */
--				} else
--#endif
--				if (opt & OPT_n) { /* abort if no lease */
--					bb_info_msg("no lease, failing");
--					retval = 1;
--					goto ret;
-+					opt = ((opt & ~OPT_b) | OPT_f);
- 				}
-+#endif
- 				/* wait before trying again */
- 				timeout = tryagain_timeout;
- 				packet_num = 0;
diff --git a/main/busybox/0013-ash-exec-busybox.static.patch b/main/busybox/0013-ash-exec-busybox.static.patch
new file mode 100644
index 00000000000..0458530deb6
--- /dev/null
+++ b/main/busybox/0013-ash-exec-busybox.static.patch
@@ -0,0 +1,25 @@
+From 69002bff6372fa6f7463271face3b3ead13aee4f Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 4 Aug 2016 02:09:48 +0200
+Subject: [PATCH] ash: exec busybox.static
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ shell/ash.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/shell/ash.c b/shell/ash.c
+index cb38582fc..55ee4f56a 100644
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -8278,6 +8278,8 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) const char *cmd, char **argv, c
+ 		}
+ 		/* re-exec ourselves with the new arguments */
+ 		execve(bb_busybox_exec_path, argv, envp);
++		execve("/bin/busybox.static",argv,envp);
++		execve("/bin/busybox",argv,envp);
+ 		/* If they called chroot or otherwise made the binary no longer
+ 		 * executable, fall through */
+ 	}
diff --git a/main/busybox/0013-testsuite-fix-cpio-tests.patch b/main/busybox/0013-testsuite-fix-cpio-tests.patch
deleted file mode 100644
index 3b9c79e5dd7..00000000000
--- a/main/busybox/0013-testsuite-fix-cpio-tests.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 69b954f128d397bbe44deb044313810c41cdcbbb Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 6 Jul 2017 13:41:32 +0200
-Subject: [PATCH] testsuite: fix cpio tests
-
-The cpio tests don't search for the right output line correctly,
-using a hardcoded tail offset. Instead, grep for the file entry
-just added.
-
-The reverse-hunk patch tests seem to get the output order wrong,
-and the tests pass when this is corrected.
----
- testsuite/cpio.tests  | 6 +++---
- testsuite/patch.tests | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests
-index 88ec086b6..40f72c363 100755
---- a/testsuite/cpio.tests
-+++ b/testsuite/cpio.tests
-@@ -129,7 +129,7 @@ SKIP=
- 
- optional FEATURE_CPIO_O
- testing "cpio uses by default uid/gid" \
--"echo $0 | cpio -o -H newc | cpio -tv 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
-+"echo $0 | cpio -o -H newc | cpio -tv 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \
- "\
- $user/$group
- 0
-@@ -138,7 +138,7 @@ SKIP=
- 
- optional FEATURE_CPIO_O
- testing "cpio -R with create" \
--"echo $0 | cpio -o -H newc -R 1234:5678 | cpio -tv 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
-+"echo $0 | cpio -o -H newc -R 1234:5678 | cpio -tv 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \
- "\
- 1234/5678
- 0
-@@ -147,7 +147,7 @@ SKIP=
- 
- optional FEATURE_CPIO_O
- testing "cpio -R with extract" \
--"echo $0 | cpio -o -H newc | cpio -tv -R 8765:4321 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
-+"echo $0 | cpio -o -H newc | cpio -tv -R 8765:4321 2>&1 | grep -F $(basename $0) | awk ' { print \$2 } '; echo \$?" \
- "\
- 8765/4321
- 0
-diff --git a/testsuite/patch.tests b/testsuite/patch.tests
-index 39205242c..1d48e90be 100755
---- a/testsuite/patch.tests
-+++ b/testsuite/patch.tests
-@@ -75,12 +75,12 @@ zxc
- testing "patch detects already applied hunk" \
- 	'patch 2>&1; echo $?; cat input' \
- "\
-+patching file input
- Possibly reversed hunk 1 at 4
- Hunk 1 FAILED 1/1.
-  abc
- +def
-  123
--patching file input
- 1
- abc
- def
-@@ -103,12 +103,12 @@ def
- testing "patch detects already applied hunk at the EOF" \
- 	'patch 2>&1; echo $?; cat input' \
- "\
-+patching file input
- Possibly reversed hunk 1 at 4
- Hunk 1 FAILED 1/1.
-  abc
-  123
- +456
--patching file input
- 1
- abc
- 123
diff --git a/main/busybox/0014-app-location-for-cpio-vi-and-lspci.patch b/main/busybox/0014-app-location-for-cpio-vi-and-lspci.patch
new file mode 100644
index 00000000000..768462fb44c
--- /dev/null
+++ b/main/busybox/0014-app-location-for-cpio-vi-and-lspci.patch
@@ -0,0 +1,55 @@
+From 42739bd6e55d90a9435ba76ea4bf7fbd49a68862 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 27 Dec 2016 19:38:39 +0100
+Subject: [PATCH] app location for cpio, vi and lspci
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Adjust location to where alpine linux installs them
+
+---
+ archival/cpio.c    | 2 +-
+ editors/vi.c       | 2 +-
+ util-linux/lspci.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/archival/cpio.c b/archival/cpio.c
+index 7149782d7..ee80efd9f 100644
+--- a/archival/cpio.c
++++ b/archival/cpio.c
+@@ -53,7 +53,7 @@
+ //config:	help
+ //config:	Optionally renumber inodes when creating archives.
+ 
+-//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
++//applet:IF_CPIO(APPLET(cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
+ 
+ //kbuild:lib-$(CONFIG_CPIO) += cpio.o
+ 
+diff --git a/editors/vi.c b/editors/vi.c
+index 2645afe87..70c594353 100644
+--- a/editors/vi.c
++++ b/editors/vi.c
+@@ -176,7 +176,7 @@
+ //config:	Enable more verbose reporting of the results of yank, change,
+ //config:	delete, undo and substitution commands.
+ 
+-//applet:IF_VI(APPLET(vi, BB_DIR_BIN, BB_SUID_DROP))
++//applet:IF_VI(APPLET(vi, BB_DIR_USR_BIN, BB_SUID_DROP))
+ 
+ //kbuild:lib-$(CONFIG_VI) += vi.o
+ 
+diff --git a/util-linux/lspci.c b/util-linux/lspci.c
+index c22cbcc1e..70a623650 100644
+--- a/util-linux/lspci.c
++++ b/util-linux/lspci.c
+@@ -15,7 +15,7 @@
+ //config:
+ //config:	This version uses sysfs (/sys/bus/pci/devices) only.
+ 
+-//applet:IF_LSPCI(APPLET_NOEXEC(lspci, lspci, BB_DIR_USR_BIN, BB_SUID_DROP, lspci))
++//applet:IF_LSPCI(APPLET_NOEXEC(lspci, lspci, BB_DIR_USR_SBIN, BB_SUID_DROP, lspci))
+ 
+ //kbuild:lib-$(CONFIG_LSPCI) += lspci.o
+ 
diff --git a/main/busybox/0015-udhcpc-set-default-discover-retries-to-5.patch b/main/busybox/0015-udhcpc-set-default-discover-retries-to-5.patch
new file mode 100644
index 00000000000..7dd08dd963f
--- /dev/null
+++ b/main/busybox/0015-udhcpc-set-default-discover-retries-to-5.patch
@@ -0,0 +1,59 @@
+From 050863f09d1ea42cedd8935580cf570032fed339 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 4 Aug 2016 13:17:00 +0200
+Subject: [PATCH] udhcpc: set default discover retries to 5
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some slower nics needs more attempts to get a lease
+
+---
+ networking/udhcp/d6_dhcpc.c | 4 ++--
+ networking/udhcp/dhcpc.c    | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
+index cdd06188e..3d0ec98f9 100644
+--- a/networking/udhcp/d6_dhcpc.c
++++ b/networking/udhcp/d6_dhcpc.c
+@@ -1137,7 +1137,7 @@ static void client_background(void)
+ //usage:     "\n	-s PROG		Run PROG at DHCP events (default "CONFIG_UDHCPC6_DEFAULT_SCRIPT")"
+ //usage:     "\n	-B		Request broadcast replies"
+ //usage:     "\n	-t N		Send up to N discover packets"
+-//usage:     "\n	-T SEC		Pause between packets (default 3)"
++//usage:     "\n	-T SEC		Pause between packets (default 5)"
+ //usage:     "\n	-A SEC		Wait if lease is not obtained (default 20)"
+ //usage:	USE_FOR_MMU(
+ //usage:     "\n	-b		Background if lease is not obtained"
+@@ -1182,7 +1182,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
+ 	llist_t *list_x = NULL;
+ 	int tryagain_timeout = 20;
+ 	int discover_timeout = 3;
+-	int discover_retries = 3;
++	int discover_retries = 5;
+ 	struct in6_addr srv6_buf;
+ 	struct in6_addr ipv6_buf;
+ 	struct in6_addr *requested_ipv6;
+diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
+index c757fb37c..424d6dade 100644
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
+@@ -1173,7 +1173,7 @@ static void client_background(void)
+ //usage:     "\n	-p FILE		Create pidfile"
+ //usage:     "\n	-B		Request broadcast replies"
+ //usage:     "\n	-t N		Send up to N discover packets (default 3)"
+-//usage:     "\n	-T SEC		Pause between packets (default 3)"
++//usage:     "\n	-T SEC		Pause between packets (default 5)"
+ //usage:     "\n	-A SEC		Wait if lease is not obtained (default 20)"
+ //usage:	USE_FOR_MMU(
+ //usage:     "\n	-b		Background if lease is not obtained"
+@@ -1217,7 +1217,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
+ 	llist_t *list_x = NULL;
+ 	int tryagain_timeout = 20;
+ 	int discover_timeout = 3;
+-	int discover_retries = 3;
++	int discover_retries = 5;
+ 	uint32_t server_id = server_id; /* for compiler */
+ 	uint32_t requested_ip = 0;
+ 	int packet_num;
diff --git a/main/busybox/0016-ping-make-ping-work-without-root-privileges.patch b/main/busybox/0016-ping-make-ping-work-without-root-privileges.patch
new file mode 100644
index 00000000000..661f0469a04
--- /dev/null
+++ b/main/busybox/0016-ping-make-ping-work-without-root-privileges.patch
@@ -0,0 +1,209 @@
+From 19c6c34fb6318605e58a9b209cf742d559c0d467 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 29 Mar 2016 09:23:08 +0200
+Subject: [PATCH] ping: make ping work without root privileges
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ networking/ping.c | 115 +++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 94 insertions(+), 21 deletions(-)
+
+diff --git a/networking/ping.c b/networking/ping.c
+index 9805695a1..5e4488abd 100644
+--- a/networking/ping.c
++++ b/networking/ping.c
+@@ -208,6 +208,7 @@ enum {
+ 	pingsock = 0,
+ };
+ 
++static int using_dgram;
+ static void
+ #if ENABLE_PING6
+ create_icmp_socket(len_and_sockaddr *lsa)
+@@ -224,9 +225,23 @@ create_icmp_socket(void)
+ #endif
+ 		sock = socket(AF_INET, SOCK_RAW, 1); /* 1 == ICMP */
+ 	if (sock < 0) {
+-		if (errno == EPERM)
+-			bb_simple_error_msg_and_die(bb_msg_perm_denied_are_you_root);
+-		bb_simple_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
++		if (errno != EPERM)
++			bb_simple_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
++#if defined(__linux__) || defined(__APPLE__)
++		/* We don't have root privileges.  Try SOCK_DGRAM instead.
++		 * Linux needs net.ipv4.ping_group_range for this to work.
++		 * MacOSX allows ICMP_ECHO, ICMP_TSTAMP or ICMP_MASKREQ
++		 */
++#if ENABLE_PING6
++		if (lsa->u.sa.sa_family == AF_INET6)
++			sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_ICMPV6);
++		else
++#endif
++			sock = socket(AF_INET, SOCK_DGRAM, 1); /* 1 == ICMP */
++		if (sock < 0)
++#endif
++		bb_simple_error_msg_and_die(bb_msg_perm_denied_are_you_root);
++		using_dgram = 1;
+ 	}
+ 
+ 	xmove_fd(sock, pingsock);
+@@ -279,10 +294,12 @@ static void ping4(len_and_sockaddr *lsa)
+ 				bb_simple_perror_msg("recvfrom");
+ 			continue;
+ 		}
+-		if (c >= 76) {			/* ip + icmp */
+-			struct iphdr *iphdr = (struct iphdr *) G.packet;
++		if (c >= 76 || using_dgram && (c == 64)) {			/* ip + icmp */
++			if(!using_dgram) {
++				struct iphdr *iphdr = (struct iphdr *) G.packet;
+ 
+-			pkt = (struct icmp *) (G.packet + (iphdr->ihl << 2));	/* skip ip hdr */
++				pkt = (struct icmp *) (G.packet + (iphdr->ihl << 2));	/* skip ip hdr */
++			} else pkt = (struct icmp *) G.packet;
+ 			if (pkt->icmp_id != G.myid)
+ 				continue; /* not our ping */
+ 			if (pkt->icmp_type == ICMP_ECHOREPLY)
+@@ -691,19 +708,21 @@ static void unpack_tail(int sz, uint32_t *tp,
+ }
+ static int unpack4(char *buf, int sz, struct sockaddr_in *from)
+ {
+-	struct icmp *icmppkt;
+ 	struct iphdr *iphdr;
++	struct icmp *icmppkt;
+ 	int hlen;
+ 
+ 	/* discard if too short */
+ 	if (sz < (datalen + ICMP_MINLEN))
+ 		return 0;
++	if(!using_dgram) {
++		/* check IP header */
++		iphdr = (struct iphdr *) buf;
++		hlen = iphdr->ihl << 2;
++		sz -= hlen;
++		icmppkt = (struct icmp *) (buf + hlen);
++	} else icmppkt = (struct icmp *) buf;
+ 
+-	/* check IP header */
+-	iphdr = (struct iphdr *) buf;
+-	hlen = iphdr->ihl << 2;
+-	sz -= hlen;
+-	icmppkt = (struct icmp *) (buf + hlen);
+ 	if (icmppkt->icmp_id != myid)
+ 		return 0;				/* not our ping */
+ 
+@@ -715,7 +734,7 @@ static int unpack4(char *buf, int sz, struct sockaddr_in *from)
+ 			tp = (uint32_t *) icmppkt->icmp_data;
+ 		unpack_tail(sz, tp,
+ 			inet_ntoa(*(struct in_addr *) &from->sin_addr.s_addr),
+-			recv_seq, iphdr->ttl);
++			recv_seq, using_dgram ? 42 : iphdr->ttl);
+ 		return 1;
+ 	}
+ 	if (icmppkt->icmp_type != ICMP_ECHO) {
+@@ -765,11 +784,31 @@ static void ping4(len_and_sockaddr *lsa)
+ 	int sockopt;
+ 
+ 	pingaddr.sin = lsa->u.sin;
+-	if (source_lsa) {
++	if (source_lsa && !using_dgram) {
+ 		if (setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_IF,
+ 				&source_lsa->u.sa, source_lsa->len))
+ 			bb_simple_error_msg_and_die("can't set multicast source interface");
+ 		xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
++	} else if(using_dgram) {
++		struct sockaddr_in sa;
++		socklen_t sl;
++
++		sa.sin_family = AF_INET;
++		sa.sin_port = 0;
++		sa.sin_addr.s_addr = source_lsa ?
++			source_lsa->u.sin.sin_addr.s_addr : 0;
++		sl = sizeof(sa);
++
++		if (bind(pingsock, (struct sockaddr *) &sa, sl) == -1) {
++			perror("bind");
++			exit(2);
++		}
++
++		if (getsockname(pingsock, (struct sockaddr *) &sa, &sl) == -1) {
++			perror("getsockname");
++			exit(2);
++		}
++		myid = sa.sin_port;
+ 	}
+ 
+ 	/* enable broadcast pings */
+@@ -786,6 +825,15 @@ static void ping4(len_and_sockaddr *lsa)
+ 		setsockopt_int(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, opt_ttl);
+ 	}
+ 
++	if(using_dgram) {
++		int hold = 65536;
++		if (setsockopt(pingsock, SOL_IP, IP_RECVTTL, (char *)&hold, sizeof(hold)))
++			perror("WARNING: setsockopt(IP_RECVTTL)");
++		if (setsockopt(pingsock, SOL_IP, IP_RETOPTS, (char *)&hold, sizeof(hold)))
++			perror("WARNING: setsockopt(IP_RETOPTS)");
++
++	}
++
+ 	signal(SIGINT, print_stats_and_exit);
+ 
+ 	/* start the ping's going ... */
+@@ -823,10 +871,33 @@ static void ping6(len_and_sockaddr *lsa)
+ 	char control_buf[CMSG_SPACE(36)];
+ 
+ 	pingaddr.sin6 = lsa->u.sin6;
+-	if (source_lsa)
++	if (source_lsa && !using_dgram)
+ 		xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
++	else if(using_dgram) {
++		struct sockaddr_in6 sa = {0};
++		socklen_t sl;
++
++		sa.sin6_family = AF_INET6;
++		sa.sin6_port = 0;
++		if(source_lsa) {
++			memcpy(&sa.sin6_addr, &source_lsa->u.sin6.sin6_addr, sizeof(struct in6_addr));
++		}
++		sl = sizeof(sa);
++
++		if (bind(pingsock, (struct sockaddr *) &sa, sl) == -1) {
++			perror("bind");
++			exit(2);
++		}
++
++		if (getsockname(pingsock, (struct sockaddr *) &sa, &sl) == -1) {
++			perror("getsockname");
++			exit(2);
++		}
++		myid = sa.sin6_port;
++	}
+ 
+ #ifdef ICMP6_FILTER
++	if(!using_dgram)
+ 	{
+ 		struct icmp6_filter filt;
+ 		if (!(option_mask32 & OPT_VERBOSE)) {
+@@ -972,12 +1043,14 @@ static int common_ping_main(int opt, char **argv)
+ 		interval = INT_MAX/1000000;
+ 	G.interval_us = interval * 1000000;
+ 
+-	myid = (uint16_t) getpid();
+-	/* we can use native-endian ident, but other Unix ping/traceroute
+-	 * utils use *big-endian pid*, and e.g. traceroute on our machine may be
+-	 * *not* from busybox, idents may collide. Follow the convention:
+-	 */
+-	myid = htons(myid);
++	if (!using_dgram) {
++		myid = (uint16_t) getpid();
++		/* we can use native-endian ident, but other Unix ping/traceroute
++		 * utils use *big-endian pid*, and e.g. traceroute on our machine may be
++		 * *not* from busybox, idents may collide. Follow the convention:
++		 */
++		myid = htons(myid);
++	}
+ 	hostname = argv[optind];
+ #if ENABLE_PING6
+ 	{
diff --git a/main/busybox/0017-fbsplash-support-console-switching.patch b/main/busybox/0017-fbsplash-support-console-switching.patch
new file mode 100644
index 00000000000..d5ec3f8b104
--- /dev/null
+++ b/main/busybox/0017-fbsplash-support-console-switching.patch
@@ -0,0 +1,182 @@
+From 7a5d2b057b1aad464500073f15fa7547d2738ecf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Mon, 24 Sep 2012 06:42:10 +0300
+Subject: [PATCH] fbsplash: support console switching
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ miscutils/fbsplash.c | 82 ++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 75 insertions(+), 7 deletions(-)
+
+diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
+index 2934d8eb7..ae257e8bc 100644
+--- a/miscutils/fbsplash.c
++++ b/miscutils/fbsplash.c
+@@ -46,7 +46,7 @@
+ //kbuild:lib-$(CONFIG_FBSPLASH) += fbsplash.o
+ 
+ //usage:#define fbsplash_trivial_usage
+-//usage:       "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD]"
++//usage:       "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD] [-T tty]"
+ //usage:#define fbsplash_full_usage "\n\n"
+ //usage:       "	-s	Image"
+ //usage:     "\n	-c	Hide cursor"
+@@ -56,11 +56,17 @@
+ //usage:     "\n			BAR_R,BAR_G,BAR_B,IMG_LEFT,IMG_TOP"
+ //usage:     "\n	-f	Control pipe (else exit after drawing image)"
+ //usage:     "\n			commands: 'NN' (% for progress bar) or 'exit'"
++//usage:     "\n	-T	Switch to TTY to hide all console messages"
+ 
+ #include "libbb.h"
+ #include "common_bufsiz.h"
+ #include <linux/fb.h>
+ 
++#include <sys/vt.h>
++#include <sys/ioctl.h>
++#include <linux/tiocl.h>
++#include <linux/kd.h>
++
+ /* If you want logging messages on /tmp/fbsplash.log... */
+ #define DEBUG 0
+ 
+@@ -74,6 +80,8 @@ struct globals {
+ 	unsigned char *addr;	// pointer to framebuffer memory
+ 	unsigned ns[9];		// n-parameters
+ 	const char *image_filename;
++	int silent_tty, fd_tty_s;
++	bool do_not_draw;
+ 	struct fb_var_screeninfo scr_var;
+ 	struct fb_fix_screeninfo scr_fix;
+ 	unsigned bytes_per_pixel;
+@@ -487,6 +495,11 @@ static void init(const char *cfg_filename)
+ 	config_close(parser);
+ }
+ 
++static void sighandler(int sig)
++{
++	ioctl(G.fd_tty_s, VT_RELDISP, sig == SIGUSR1 ? 1 : 2);
++	G.do_not_draw = (sig != SIGUSR2);
++}
+ 
+ int fbsplash_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
+@@ -496,6 +509,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
+ 	char *num_buf;
+ 	unsigned num;
+ 	bool bCursorOff;
++	int fd_tty0, active_vt;
++	struct vt_stat vtstat;
++	struct vt_mode vt;
+ 
+ 	INIT_G();
+ 
+@@ -503,8 +519,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
+ 	fb_device = "/dev/fb0";
+ 	cfg_filename = NULL;
+ 	fifo_filename = NULL;
+-	bCursorOff = 1 & getopt32(argv, "cs:d:i:f:",
+-			&G.image_filename, &fb_device, &cfg_filename, &fifo_filename);
++	bCursorOff = 1 & getopt32(argv, "cs:d:i:f:T:+",
++			&G.image_filename, &fb_device, &cfg_filename, &fifo_filename,
++			&G.silent_tty);
+ 
+ 	// parse configuration file
+ 	if (cfg_filename)
+@@ -514,11 +531,43 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
+ 	if (!G.image_filename)
+ 		bb_show_usage();
+ 
++	fd_tty0 = get_console_fd_or_die();
++	if (G.silent_tty) {
++		char buf[16];
++
++		/* Initialize TTY */
++		bb_signals((1LL << SIGUSR1) | (1LL << SIGUSR2), sighandler);
++		snprintf(buf, sizeof(buf), "/dev/tty%d", G.silent_tty);
++		G.fd_tty_s = xopen(buf, O_RDWR | O_NOCTTY);
++
++		/* Activate TTY */
++		xioctl(fd_tty0, VT_GETSTATE, &vtstat);
++		active_vt = vtstat.v_active;
++		console_make_active(fd_tty0, G.silent_tty);
++
++		/* Get notifications on console changes */
++		vt.mode   = VT_PROCESS;
++		vt.waitv  = 0;
++		vt.relsig = SIGUSR1;
++		vt.acqsig = SIGUSR2;
++		ioctl(G.fd_tty_s, VT_SETMODE, &vt);
++
++		/* Redirect all kernel messages to tty1 so that they don't get
++		 * printed over our silent splash image. And clear it. */
++		buf[0] = TIOCL_SETKMSGREDIRECT;
++		buf[1] = 1;
++		ioctl(G.fd_tty_s, TIOCLINUX, buf);
++		full_write(G.fd_tty_s, "\e[H\e[2J" "\e[?17;0c", 7+8);
++		ioctl(G.fd_tty_s, KDSETMODE, KD_GRAPHICS);
++	} else {
++		G.fd_tty_s = STDOUT_FILENO;
++	}
++
+ 	fb_open(fb_device);
+ 
+ 	if (fifo_filename && bCursorOff) {
+ 		// hide cursor (BEFORE any fb ops)
+-		full_write(STDOUT_FILENO, ESC"[?25l", 6);
++		full_write(G.fd_tty_s, ESC"[?25l", 6);
+ 	}
+ 
+ 	fb_drawimage();
+@@ -526,6 +575,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
+ 	if (!fifo_filename)
+ 		return EXIT_SUCCESS;
+ 
++	sig_block(SIGUSR1);
+ 	fp = xfopen_stdin(fifo_filename);
+ 	if (fp != stdin) {
+ 		// For named pipes, we want to support this:
+@@ -541,8 +591,9 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
+ 		// and become an additional writer :)
+ 		open(fifo_filename, O_WRONLY); // errors are ignored
+ 	}
+-
+ 	fb_drawprogressbar(0);
++	sig_unblock(SIGUSR1);
++
+ 	// Block on read, waiting for some input.
+ 	// Use of <stdio.h> style I/O allows to correctly
+ 	// handle a case when we have many buffered lines
+@@ -557,12 +608,29 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
+ #if DEBUG
+ 			DEBUG_MESSAGE(itoa(num));
+ #endif
+-			fb_drawprogressbar(num);
++			sig_block(SIGUSR1);
++			if (!G.do_not_draw)
++				fb_drawprogressbar(num);
++			sig_unblock(SIGUSR1);
+ 		}
+ 		free(num_buf);
+ 	}
+ 
+-	if (bCursorOff) // restore cursor
++	if (G.silent_tty) {
++		usleep(100*1000);
++
++		ioctl(G.fd_tty_s, VT_RELDISP, 1);
++		ioctl(G.fd_tty_s, KDSETMODE, KD_TEXT);
++		vt.mode  = VT_AUTO;
++		vt.waitv = 0;
++		ioctl(G.fd_tty_s, VT_SETMODE, &vt);
++		close(G.fd_tty_s);
++
++		xioctl(fd_tty0, VT_GETSTATE, &vtstat);
++		if (vtstat.v_active == G.silent_tty)
++			console_make_active(fd_tty0, active_vt);
++		ioctl(fd_tty0, VT_DISALLOCATE, (void *)(ptrdiff_t)G.silent_tty);
++	} else if (bCursorOff) // restore cursor
+ 		full_write(STDOUT_FILENO, ESC"[?25h", 6);
+ 
+ 	return EXIT_SUCCESS;
diff --git a/main/busybox/0018-fbsplash-support-image-and-bar-alignment-and-positio.patch b/main/busybox/0018-fbsplash-support-image-and-bar-alignment-and-positio.patch
new file mode 100644
index 00000000000..f91f5642f22
--- /dev/null
+++ b/main/busybox/0018-fbsplash-support-image-and-bar-alignment-and-positio.patch
@@ -0,0 +1,180 @@
+From 0a205b68300cea1a8905aa9c12926fe70d75eca8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Fri, 21 Nov 2014 15:15:43 +0200
+Subject: [PATCH] fbsplash: support image and bar alignment and positioning
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Needed to center a splash screen image in the initramfs.
+
+---
+ miscutils/fbsplash.c | 93 ++++++++++++++++++++++++++++++++------------
+ 1 file changed, 69 insertions(+), 24 deletions(-)
+
+diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
+index ae257e8bc..2c6413157 100644
+--- a/miscutils/fbsplash.c
++++ b/miscutils/fbsplash.c
+@@ -53,7 +53,7 @@
+ //usage:     "\n	-d	Framebuffer device (default /dev/fb0)"
+ //usage:     "\n	-i	Config file (var=value):"
+ //usage:     "\n			BAR_LEFT,BAR_TOP,BAR_WIDTH,BAR_HEIGHT"
+-//usage:     "\n			BAR_R,BAR_G,BAR_B,IMG_LEFT,IMG_TOP"
++//usage:     "\n			BAR_R,BAR_G,BAR_B,IMG_LEFT,IMG_TOP,IMG_ALIGN"
+ //usage:     "\n	-f	Control pipe (else exit after drawing image)"
+ //usage:     "\n			commands: 'NN' (% for progress bar) or 'exit'"
+ //usage:     "\n	-T	Switch to TTY to hide all console messages"
+@@ -72,13 +72,39 @@
+ 
+ #define ESC "\033"
+ 
++enum {
++	bar_width,
++	bar_height,
++	bar_posx,
++	bar_posy,
++	bar_colr,
++	bar_colg,
++	bar_colb,
++	nimg_posx,
++	nimg_posy,
++	nimg_align,
++	num_ns_opts,
++	debug = num_ns_opts,
++};
++
++#define nbar_width	ns[bar_width]
++#define nbar_height	ns[bar_height]
++#define nbar_posx	ns[bar_posx]
++#define nbar_posy	ns[bar_posy]
++#define nbar_colr	ns[bar_colr]
++#define nbar_colg	ns[bar_colg]
++#define nbar_colb	ns[bar_colb]
++#define img_posx	ns[nimg_posx]
++#define img_posy	ns[nimg_posy]
++#define img_align	ns[nimg_align]
++
+ struct globals {
+ #if DEBUG
+ 	bool bdebug_messages;	// enable/disable logging
+ 	FILE *logfile_fd;	// log file
+ #endif
+ 	unsigned char *addr;	// pointer to framebuffer memory
+-	unsigned ns[9];		// n-parameters
++	unsigned ns[num_ns_opts];	// n-parameters
+ 	const char *image_filename;
+ 	int silent_tty, fd_tty_s;
+ 	bool do_not_draw;
+@@ -95,16 +121,6 @@ struct globals {
+ 	SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+ } while (0)
+ 
+-#define nbar_width	ns[0]	// progress bar width
+-#define nbar_height	ns[1]	// progress bar height
+-#define nbar_posx	ns[2]	// progress bar horizontal position
+-#define nbar_posy	ns[3]	// progress bar vertical position
+-#define nbar_colr	ns[4]	// progress bar color red component
+-#define nbar_colg	ns[5]	// progress bar color green component
+-#define nbar_colb	ns[6]	// progress bar color blue component
+-#define img_posx	ns[7]	// image horizontal position
+-#define img_posy	ns[8]	// image vertical position
+-
+ #if DEBUG
+ #define DEBUG_MESSAGE(strMessage, args...) \
+ 	if (G.bdebug_messages) { \
+@@ -385,7 +401,7 @@ static void fb_drawimage(void)
+ 	FILE *theme_file;
+ 	char *read_ptr;
+ 	unsigned char *pixline;
+-	unsigned i, j, width, height, line_size;
++	int i, j, width, height, line_size, xoffs, yoffs, xstart;
+ 
+ 	if (LONE_DASH(G.image_filename)) {
+ 		theme_file = stdin;
+@@ -435,18 +451,39 @@ static void fb_drawimage(void)
+ 	line_size = width*3;
+ 	pixline = xmalloc(line_size);
+ 
+-	if ((width + G.img_posx) > G.scr_var.xres)
+-		width = G.scr_var.xres - G.img_posx;
+-	if ((height + G.img_posy) > G.scr_var.yres)
+-		height = G.scr_var.yres - G.img_posy;
+-	for (j = 0; j < height; j++) {
++	xoffs = G.img_posx;
++	switch (G.img_align % 3) {
++	case 1: xoffs += (G.scr_var.xres - width) / 2; break;
++	case 2: xoffs += G.scr_var.xres - width; break;
++	}
++	xstart = 0;
++	if (xoffs < 0) {
++		xstart = -xoffs;
++		xoffs = 0;
++	}
++	if ((width + xoffs) > G.scr_var.xres)
++		width = G.scr_var.xres - xoffs;
++
++	yoffs = G.img_posy;
++	switch (G.img_align / 3) {
++	case 1: yoffs += (G.scr_var.yres - height) / 2; break;
++	case 2: yoffs += G.scr_var.yres - height; break;
++	}
++	if ((height + yoffs) > G.scr_var.yres)
++		height = G.scr_var.yres - yoffs;
++
++	for (j = 0; j < height; j++, yoffs++) {
+ 		unsigned char *pixel;
+ 		unsigned char *src;
+ 
+ 		if (fread(pixline, 1, line_size, theme_file) != line_size)
+ 			bb_error_msg_and_die("bad PPM file '%s'", G.image_filename);
+-		pixel = pixline;
+-		src = G.addr + (G.img_posy + j) * G.scr_fix.line_length + G.img_posx * G.bytes_per_pixel;
++
++		if (yoffs < 0)
++			continue;
++
++		pixel = pixline + xstart * 3;
++		src = G.addr + yoffs * G.scr_fix.line_length + xoffs * G.bytes_per_pixel;
+ 		for (i = 0; i < width; i++) {
+ 			unsigned thispix = fb_pixel_value(pixel[0], pixel[1], pixel[2]);
+ 			fb_write_pixel(src, thispix);
+@@ -465,11 +502,15 @@ static void fb_drawimage(void)
+  */
+ static void init(const char *cfg_filename)
+ {
++	static const char align_names[] ALIGN1 =
++		"LT\0" "CT\0" "RT\0"
++		"LM\0" "CM\0" "RM\0"
++		"LB\0" "CB\0" "RB\0";
+ 	static const char param_names[] ALIGN1 =
+ 		"BAR_WIDTH\0" "BAR_HEIGHT\0"
+ 		"BAR_LEFT\0" "BAR_TOP\0"
+ 		"BAR_R\0" "BAR_G\0" "BAR_B\0"
+-		"IMG_LEFT\0" "IMG_TOP\0"
++		"IMG_LEFT\0" "IMG_TOP\0" "IMG_ALIGN\0"
+ #if DEBUG
+ 		"DEBUG\0"
+ #endif
+@@ -478,14 +519,18 @@ static void init(const char *cfg_filename)
+ 	parser_t *parser = config_open2(cfg_filename, xfopen_stdin);
+ 	while (config_read(parser, token, 2, 2, "#=",
+ 				(PARSE_NORMAL | PARSE_MIN_DIE) & ~(PARSE_TRIM | PARSE_COLLAPSE))) {
+-		unsigned val = xatoi_positive(token[1]);
++		unsigned val;
+ 		int i = index_in_strings(param_names, token[0]);
+ 		if (i < 0)
+ 			bb_error_msg_and_die("syntax error: %s", token[0]);
+-		if (i >= 0 && i < 9)
++		if (i == nimg_align)
++			val = index_in_strings(align_names, token[1]);
++		else
++			val = xatoi_positive(token[1]);
++		if (i < num_ns_opts)
+ 			G.ns[i] = val;
+ #if DEBUG
+-		if (i == 9) {
++		if (i == debug) {
+ 			G.bdebug_messages = val;
+ 			if (G.bdebug_messages)
+ 				G.logfile_fd = xfopen_for_write("/tmp/fbsplash.log");
diff --git a/main/busybox/0019-depmod-support-generating-kmod-binary-index-files.patch b/main/busybox/0019-depmod-support-generating-kmod-binary-index-files.patch
new file mode 100644
index 00000000000..62481f6f507
--- /dev/null
+++ b/main/busybox/0019-depmod-support-generating-kmod-binary-index-files.patch
@@ -0,0 +1,511 @@
+From 4eb6d6b1f36e9bf976549f3071beb1192e11c4ca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Sun, 25 Oct 2015 12:33:58 +0200
+Subject: [PATCH] depmod: support generating kmod binary index files
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This allows to use busybox depmod, and run daemons using libkmod (or
+even kmod modprobe if needed).
+
+About +1500 bytes when enabled. This patch merges some depmod code
+paths, so when this is disabled it shrinks the code size a little bit.
+
+---
+ modutils/Config.src |   9 ++
+ modutils/depmod.c   | 281 ++++++++++++++++++++++++++++++++++++--------
+ modutils/modprobe.c |  15 ---
+ modutils/modutils.c |  31 +++++
+ modutils/modutils.h |  16 +++
+ 5 files changed, 286 insertions(+), 66 deletions(-)
+
+diff --git a/modutils/Config.src b/modutils/Config.src
+index 188296814..7a4c037ad 100644
+--- a/modutils/Config.src
++++ b/modutils/Config.src
+@@ -152,6 +152,15 @@ config FEATURE_MODUTILS_ALIAS
+ 
+ 	Say Y if unsure.
+ 
++config FEATURE_MODUTILS_BIN
++	bool "Support for the kmod .bin file format"
++	default n
++	depends on DEPMOD && !MODPROBE_SMALL
++	help
++	  Generate kmod compatible binary index files for .dep, .alias,
++	  .symbols and .builtin files. Allows mixing use of busybox
++	  modutils and kmod (binaries and library).
++
+ config FEATURE_MODUTILS_SYMBOLS
+ 	bool "Support module.symbols file"
+ 	default y
+diff --git a/modutils/depmod.c b/modutils/depmod.c
+index bb42bbefe..9b034db0a 100644
+--- a/modutils/depmod.c
++++ b/modutils/depmod.c
+@@ -2,7 +2,7 @@
+ /*
+  * depmod - generate modules.dep
+  * Copyright (c) 2008 Bernhard Reutner-Fischer
+- * Copyrihgt (c) 2008 Timo Teras <timo.teras@iki.fi>
++ * Copyrihgt (c) 2008-2015 Timo Teras <timo.teras@iki.fi>
+  * Copyright (c) 2008 Vladimir Dronnikov
+  *
+  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+@@ -25,6 +25,24 @@
+ #include "modutils.h"
+ #include <sys/utsname.h> /* uname() */
+ 
++#define INDEX_MINCHAR	32
++#define INDEX_MAXCHAR	128
++
++typedef struct index_node {
++	char *prefix;
++	llist_t *values;
++	struct index_node *children[INDEX_MAXCHAR-INDEX_MINCHAR];
++} index_node;
++
++struct globals {
++	module_db db;
++	index_node *root_node;
++} FIX_ALIASING;
++#define G (*ptr_to_globals)
++#define INIT_G() do { \
++	SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
++} while (0)
++
+ /*
+  * Theory of operation:
+  * - iterate over all modules and record their full path
+@@ -53,18 +71,12 @@ static int FAST_FUNC parse_module(struct recursive_state *state,
+ 
+ 	for (ptr = image; ptr < image + len - 10; ptr++) {
+ 		if (is_prefixed_with(ptr, "depends=")) {
+-			char *u;
+-
+ 			ptr += 8;
+-			for (u = ptr; *u; u++)
+-				if (*u == '-')
+-					*u = '_';
+-			ptr += string_to_llist(ptr, &e->deps, ",");
++			string_to_llist(replace_underscores(ptr), &e->deps, ",");
+ 		} else if (ENABLE_FEATURE_MODUTILS_ALIAS
+ 		 && is_prefixed_with(ptr, "alias=")
+ 		) {
+-			llist_add_to(&e->aliases, xstrdup(ptr + 6));
+-			ptr += strlen(ptr);
++			llist_add_to(&e->aliases, replace_underscores(xstrdup(ptr + 6)));
+ 		} else if (ENABLE_FEATURE_MODUTILS_SYMBOLS
+ 		 && is_prefixed_with(ptr, "__ksymtab_")
+ 		) {
+@@ -74,9 +86,10 @@ static int FAST_FUNC parse_module(struct recursive_state *state,
+ 			) {
+ 				continue;
+ 			}
+-			llist_add_to(&e->symbols, xstrdup(ptr));
+-			ptr += strlen(ptr);
+-		}
++			llist_add_to(&e->symbols, xasprintf("symbol:%s", ptr));
++		} else
++			continue;
++		ptr += strlen(ptr);
+ 	}
+ 	free(image);
+ 
+@@ -108,12 +121,6 @@ static void order_dep_list(module_db *modules, module_entry *start, llist_t *add
+ 	}
+ }
+ 
+-static void xfreopen_write(const char *file, FILE *f)
+-{
+-	if (freopen(file, "w", f) == NULL)
+-		bb_perror_msg_and_die("can't open '%s'", file);
+-}
+-
+ //usage:#if !ENABLE_MODPROBE_SMALL
+ //usage:#define depmod_trivial_usage "[-n] [-b BASE] [VERSION] [MODFILES]..."
+ //usage:#define depmod_full_usage "\n\n"
+@@ -167,6 +174,169 @@ enum {
+ 	OPT_C = (1 << 9), /* -C,--config etc_modules_conf: ignored */
+ };
+ 
++/* Support for the mod binary index generation */
++
++static void index_init(const char *filename)
++{
++	if (ENABLE_FEATURE_MODUTILS_BIN) {
++		index_node *n;
++
++		n = xzalloc(sizeof(index_node));
++		n->prefix = xstrdup("");
++		G.root_node = n;
++	}
++
++	if (filename && !(option_mask32 & OPT_n)) {
++		if (freopen(filename, "w", stdout) == NULL)
++			bb_perror_msg_and_die("can't open '%s'", filename);
++	}
++}
++
++static void index_add(const char *key, char *value, const char *prefix)
++{
++	if (prefix && *prefix)
++		printf("%s%s %s\n", prefix, key, value);
++	else if (prefix)
++		printf("%s\n", value);
++
++	if (ENABLE_FEATURE_MODUTILS_BIN) {
++		index_node *cur = G.root_node, *n;
++		unsigned i = 0, j, ch;
++
++		while (1) {
++			/* Ensure node->prefix is a prefix of &str[i].
++			 * If it is not already, then we must split node. */
++			for (j = 0; cur->prefix[j]; j++) {
++				ch = cur->prefix[j];
++				if (ch != key[i+j]) {
++					/* New child is copy of node with prefix[j+1..N] */
++					n = xzalloc(sizeof(index_node));
++					n->prefix = xstrdup(&cur->prefix[j+1]);
++					n->values = cur->values;
++					memcpy(n->children, cur->children, sizeof(n->children));
++
++					/* Parent has prefix[0..j], child at prefix[j] */
++					cur->prefix[j] = '\0';
++					cur->values = NULL;
++					memset(cur->children, 0, sizeof(cur->children));
++					cur->children[ch-INDEX_MINCHAR] = n;
++					break;
++				}
++			}
++			i += j;
++
++			ch = key[i];
++			if (ch == 0)
++				break;
++
++			if (ch < INDEX_MINCHAR || ch >= INDEX_MAXCHAR)
++				bb_simple_error_msg_and_die("bad module name");
++
++			ch -= INDEX_MINCHAR;
++			if (!cur->children[ch]) {
++				n = xzalloc(sizeof(index_node));
++				cur->children[ch] = n;
++				n->prefix = xstrdup(&key[i+1]);
++				cur = n;
++				break;
++			}
++
++			/* Descend into child node and continue */
++			cur = cur->children[ch];
++			i++;
++		}
++
++		llist_add_to(&cur->values, value);
++	}
++}
++
++static uint32_t index_write_node(FILE *out, index_node *n, void (*freeit)(void *data))
++{
++	uint32_t child_offs[INDEX_MAXCHAR-INDEX_MINCHAR];
++	uint32_t offset;
++	uint8_t first = 255, last = 0;
++	unsigned i;
++
++	for (i = 0; i < INDEX_MAXCHAR-INDEX_MINCHAR; i++) {
++		child_offs[i] = 0;
++		if (!n->children[i])
++			continue;
++		child_offs[i] = index_write_node(out, n->children[i], freeit);
++		if (first > INDEX_MAXCHAR)
++			first = i;
++		last = i;
++	}
++
++	offset = ftell(out);
++
++	if (n->prefix[0]) {
++		fputs(n->prefix, out);
++		fputc('\0', out);
++		offset |= INDEX_NODE_PREFIX;
++	}
++
++	if (first < INDEX_MAXCHAR) {
++		fputc(first + INDEX_MINCHAR, out);
++		fputc(last + INDEX_MINCHAR, out);
++		fwrite(child_offs + first, sizeof(uint32_t), last - first + 1, out);
++		offset |= INDEX_NODE_CHILDS;
++	}
++
++	if (n->values) {
++		const llist_t *v;
++		unsigned int cnt;
++		uint32_t u;
++
++		n->values = llist_rev(n->values);
++		for (v = n->values, cnt = 0; v != NULL; v = v->link, cnt++);
++		u = htonl(cnt);
++		fwrite(&u, sizeof(u), 1, out);
++		for (v = n->values, cnt = 0; v != NULL; v = v->link, cnt++) {
++			u = htonl(cnt);
++			fwrite(&u, sizeof(u), 1, out);
++			fputs(v->data, out);
++			fputc('\0', out);
++		}
++		offset |= INDEX_NODE_VALUES;
++	}
++
++	llist_free(n->values, freeit);
++	free(n->prefix);
++	free(n);
++
++	return htonl(offset);
++}
++
++static void index_dump(const char *filename, int deps_file)
++{
++	if (ENABLE_FEATURE_MODUTILS_BIN) {
++		FILE *out;
++		uint32_t header[3] = {
++			htonl(INDEX_MAGIC),
++			htonl(INDEX_VERSION),
++		};
++
++		if (option_mask32 & OPT_n)
++			filename = "/dev/null";
++		else
++			filename = xasprintf("tmp.%s.bin", filename);
++
++		out = xfopen_for_write(filename);
++		fwrite(header, sizeof(uint32_t), 3, out);
++		header[2] = index_write_node(out, G.root_node, deps_file ? free : 0);
++		rewind(out);
++		G.root_node = NULL;
++		fwrite(header, sizeof(uint32_t), 3, out);
++		if (fclose(out)) {
++			remove(filename);
++			bb_simple_error_msg_and_die(bb_msg_write_error);
++		}
++		/* .bin files are mmap'ed; not renaming it may crash
++		 * long standing daemon using libkmod */
++		rename_or_warn(filename, filename + 4);
++	}
++}
++
+ int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int depmod_main(int argc UNUSED_PARAM, char **argv)
+ {
+@@ -178,6 +348,8 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
+ 	unsigned i;
+ 	int tmp;
+ 
++	INIT_G();
++
+ 	getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL, NULL);
+ 	argv += optind;
+ 
+@@ -211,53 +383,60 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
+ 	}
+ 
+ 	/* Generate dependency and alias files */
+-	if (!(option_mask32 & OPT_n))
+-		xfreopen_write(CONFIG_DEFAULT_DEPMOD_FILE, stdout);
+-
++	index_init(CONFIG_DEFAULT_DEPMOD_FILE);
+ 	moddb_foreach_module(&modules, m, i) {
+-		printf("%s:", m->name);
+-
++		char *buf = xasprintf("%s:", m->name);
+ 		order_dep_list(&modules, m, m->deps);
++
+ 		while (m->dnext != m) {
+ 			dep = m->dnext;
+-			printf(" %s", dep->name);
+-
++			buf = gather_options_str(buf, dep->name);
+ 			/* unlink current entry */
+ 			dep->dnext->dprev = dep->dprev;
+ 			dep->dprev->dnext = dep->dnext;
+ 			dep->dnext = dep->dprev = dep;
+ 		}
+-		bb_putchar('\n');
++		index_add(m->modname, buf, "");
+ 	}
+-
+-#if ENABLE_FEATURE_MODUTILS_ALIAS
+-	if (!(option_mask32 & OPT_n))
+-		xfreopen_write("modules.alias", stdout);
+-	moddb_foreach_module(&modules, m, i) {
+-		while (m->aliases) {
+-			/*
+-			 * Last word used to be a basename
+-			 * (filename with path and .ko.* stripped)
+-			 * at the time of module-init-tools 3.4.
+-			 * kmod v.12 uses module name, i.e., s/-/_/g.
+-			 */
+-			printf("alias %s %s\n",
+-				(char*)llist_pop(&m->aliases),
+-				m->modname);
++	index_dump(CONFIG_DEFAULT_DEPMOD_FILE, 1);
++
++	if (ENABLE_FEATURE_MODUTILS_ALIAS) {
++		index_init("modules.alias");
++		moddb_foreach_module(&modules, m, i) {
++			while (m->aliases) {
++				/*
++				 * Last word used to be a basename
++				 * (filename with path and .ko.* stripped)
++				 * at the time of module-init-tools 3.4.
++				 * kmod v.12 uses module name, i.e., s/-/_/g.
++				 */
++				index_add((char*)llist_pop(&m->aliases), m->modname, "alias ");
++			}
+ 		}
++		index_dump("modules.alias", 0);
+ 	}
+-#endif
+-#if ENABLE_FEATURE_MODUTILS_SYMBOLS
+-	if (!(option_mask32 & OPT_n))
+-		xfreopen_write("modules.symbols", stdout);
+-	moddb_foreach_module(&modules, m, i) {
+-		while (m->symbols) {
+-			printf("alias symbol:%s %s\n",
+-				(char*)llist_pop(&m->symbols),
+-				m->modname);
++	if (ENABLE_FEATURE_MODUTILS_SYMBOLS) {
++		index_init("modules.symbols");
++		moddb_foreach_module(&modules, m, i) {
++			while (m->symbols) {
++				index_add((char*)llist_pop(&m->symbols), m->modname, "alias ");
++			}
++		}
++		index_dump("modules.symbols", 0);
++	}
++	if (ENABLE_FEATURE_MODUTILS_BIN) {
++		char line[PATH_MAX], modname[MODULE_NAME_LEN];
++		FILE *in;
++
++		index_init(NULL);
++		in = xfopen_for_read("modules.builtin");
++		while (fgets(line, sizeof(line), in) != NULL) {
++			filename2modname(line, modname);
++			index_add(modname, (char *) "", 0);
+ 		}
++		fclose(in);
++		index_dump("modules.builtin", 0);
+ 	}
+-#endif
+ 
+ 	if (ENABLE_FEATURE_CLEAN_UP)
+ 		moddb_free(&modules);
+diff --git a/modutils/modprobe.c b/modutils/modprobe.c
+index 235706fd5..604d9e6b5 100644
+--- a/modutils/modprobe.c
++++ b/modutils/modprobe.c
+@@ -191,21 +191,6 @@ struct globals {
+ 
+ static int read_config(const char *path);
+ 
+-static char *gather_options_str(char *opts, const char *append)
+-{
+-	/* Speed-optimized. We call gather_options_str many times. */
+-	if (append) {
+-		if (opts == NULL) {
+-			opts = xstrdup(append);
+-		} else {
+-			int optlen = strlen(opts);
+-			opts = xrealloc(opts, optlen + strlen(append) + 2);
+-			sprintf(opts + optlen, " %s", append);
+-		}
+-	}
+-	return opts;
+-}
+-
+ static struct module_entry *get_or_add_modentry(const char *module)
+ {
+ 	return moddb_get_or_create(&G.db, module);
+diff --git a/modutils/modutils.c b/modutils/modutils.c
+index 037d609e4..502ad5422 100644
+--- a/modutils/modutils.c
++++ b/modutils/modutils.c
+@@ -67,6 +67,21 @@ void FAST_FUNC moddb_free(module_db *db)
+ 	}
+ }
+ 
++char * FAST_FUNC gather_options_str(char *opts, const char *append)
++{
++	/* Speed-optimized. We call gather_options_str many times. */
++	if (append) {
++		if (opts == NULL) {
++			opts = xstrdup(append);
++		} else {
++			int optlen = strlen(opts);
++			opts = xrealloc(opts, optlen + strlen(append) + 2);
++			sprintf(opts + optlen, " %s", append);
++		}
++	}
++	return opts;
++}
++
+ void FAST_FUNC replace(char *s, char what, char with)
+ {
+ 	while (*s) {
+@@ -76,6 +91,22 @@ void FAST_FUNC replace(char *s, char what, char with)
+ 	}
+ }
+ 
++char* FAST_FUNC replace_underscores(char *s)
++{
++	int i;
++	for (i = 0; s[i]; i++) {
++		switch (s[i]) {
++		case '-':
++			s[i] = '_';
++			break;
++		case '[':
++			i += strcspn(&s[i], "]");
++			break;
++		}
++	}
++	return s;
++}
++
+ int FAST_FUNC string_to_llist(char *string, llist_t **llist, const char *delim)
+ {
+ 	char *tok;
+diff --git a/modutils/modutils.h b/modutils/modutils.h
+index 4a702e97c..73e816028 100644
+--- a/modutils/modutils.h
++++ b/modutils/modutils.h
+@@ -18,6 +18,20 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
+ #define MODULE_NAME_LEN 256
+ #define MODULE_HASH_SIZE 256
+ 
++/* .bin index format definitions */
++#define INDEX_MAGIC 0xB007F457
++#define INDEX_VERSION_MAJOR 0x0002
++#define INDEX_VERSION_MINOR 0x0001
++#define INDEX_VERSION ((INDEX_VERSION_MAJOR<<16)|INDEX_VERSION_MINOR)
++
++enum node_offset {
++	INDEX_NODE_FLAGS	= 0xF0000000, /* Flags in high nibble */
++	INDEX_NODE_PREFIX	= 0x80000000,
++	INDEX_NODE_VALUES	= 0x40000000,
++	INDEX_NODE_CHILDS	= 0x20000000,
++	INDEX_NODE_MASK		= 0x0FFFFFFF, /* Offset value */
++};
++
+ typedef struct module_entry {
+ 	struct module_entry *next;
+ 	char *name, *modname;
+@@ -47,7 +61,9 @@ module_entry *moddb_get(module_db *db, const char *s) FAST_FUNC;
+ module_entry *moddb_get_or_create(module_db *db, const char *s) FAST_FUNC;
+ void moddb_free(module_db *db) FAST_FUNC;
+ 
++char *gather_options_str(char *opts, const char *append) FAST_FUNC;
+ void replace(char *s, char what, char with) FAST_FUNC;
++char *replace_underscores(char *s) FAST_FUNC;
+ int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC;
+ char *filename2modname(const char *filename, char *modname) FAST_FUNC;
+ #if ENABLE_FEATURE_CMDLINE_MODULE_OPTIONS
diff --git a/main/busybox/0020-Add-flag-for-not-following-symlinks-when-recursing.patch b/main/busybox/0020-Add-flag-for-not-following-symlinks-when-recursing.patch
new file mode 100644
index 00000000000..44a3492e5ec
--- /dev/null
+++ b/main/busybox/0020-Add-flag-for-not-following-symlinks-when-recursing.patch
@@ -0,0 +1,60 @@
+From 333b48438e3001cddbc902bd6f5fc7eb116997ca Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 25 Jul 2014 02:10:50 +0200
+Subject: [PATCH] Add flag for not following symlinks when recursing
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+function                                             old     new   delta
+.rodata                                             7934    7967     +33
+diff_longopts                                        253     270     +17
+packed_usage                                        1704    1720     +16
+diff_main                                           1665    1662      -3
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 3/1 up/down: 66/-3)              Total: 63 bytes
+
+---
+ editors/diff.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/editors/diff.c b/editors/diff.c
+index 1adc4cbc7..f7c0f5250 100644
+--- a/editors/diff.c
++++ b/editors/diff.c
+@@ -113,6 +113,9 @@
+ //usage:     "\n	-N	Treat absent files as empty"
+ //usage:     "\n	-q	Output only whether files differ"
+ //usage:     "\n	-r	Recurse"
++//usage:        IF_LONG_OPTS(
++//usage:     "\n        --no-dereference Don't follow symlinks"
++//usage:        )
+ //usage:     "\n	-S	Start with FILE when comparing directories"
+ //usage:     "\n	-T	Make tabs line up by prefixing a tab when necessary"
+ //usage:     "\n	-s	Report when two files are the same"
+@@ -154,6 +157,7 @@ enum {                  /* Commandline flags */
+ 	FLAG_p,         /* not implemented */
+ 	FLAG_B,
+ 	FLAG_E,         /* not implemented */
++	FLAG_no_deref,
+ };
+ #define FLAG(x) (1 << FLAG_##x)
+ 
+@@ -867,7 +871,8 @@ static void diffdir(char *p[2], const char *s_start)
+ 		 * Using list.len to specify its length,
+ 		 * add_to_dirlist will remove it. */
+ 		list[i].len = strlen(p[i]);
+-		recursive_action(p[i], ACTION_RECURSE | ACTION_FOLLOWLINKS,
++		recursive_action(p[i], ACTION_RECURSE |
++			((option_mask32 & FLAG(no_deref)) ? 0 : ACTION_FOLLOWLINKS),
+ 				add_to_dirlist, skip_dir, &list[i]);
+ 		/* Sort dl alphabetically.
+ 		 * GNU diff does this ignoring any number of trailing dots.
+@@ -964,6 +969,7 @@ static const char diff_longopts[] ALIGN1 =
+ 	"report-identical-files\0"   No_argument       "s"
+ 	"starting-file\0"            Required_argument "S"
+ 	"minimal\0"                  No_argument       "d"
++	"no-dereference\0"           No_argument       "\xff"
+ 	;
+ # define GETOPT32 getopt32long
+ # define LONGOPTS ,diff_longopts
diff --git a/main/busybox/0021-udhcpc-Don-t-background-if-n-is-given.patch b/main/busybox/0021-udhcpc-Don-t-background-if-n-is-given.patch
new file mode 100644
index 00000000000..9ce7adfac09
--- /dev/null
+++ b/main/busybox/0021-udhcpc-Don-t-background-if-n-is-given.patch
@@ -0,0 +1,100 @@
+From b6a7520ce7c77f14f61794e6a84c865042a31db3 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 6 Jul 2017 07:05:15 +0200
+Subject: [PATCH] udhcpc: Don't background if -n is given
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+we need add -b to our udhcpc options to prevent boot forever if there are no
+dhcp server. We also need a way for users to disable this behavior by making
+it possible to set -n option at runtime.
+
+Since busybox 1.31.0 -b takes precedence over -n [0]. However, since we
+enable -b instead of -n by default (through our busyboxconfig) this is
+not desired, this commit therefore also reverts the upstream patch
+introducing this change.
+
+See also: https://bugs.busybox.net/11691
+
+[0]: https://git.busybox.net/busybox/commit/?id=87e216294af9eec39c0c1d553555f8a98c15db38
+
+---
+ networking/udhcp/d6_dhcpc.c | 20 +++++++-------------
+ networking/udhcp/dhcpc.c    | 20 +++++++-------------
+ 2 files changed, 14 insertions(+), 26 deletions(-)
+
+diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
+index 3d0ec98f9..cc3afa921 100644
+--- a/networking/udhcp/d6_dhcpc.c
++++ b/networking/udhcp/d6_dhcpc.c
+@@ -1403,25 +1403,19 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
+  leasefail:
+ 				change_listen_mode(LISTEN_NONE);
+ 				d6_run_script_no_option("leasefail");
++				if (opt & OPT_n) { /* abort if no lease */
++					bb_simple_info_msg("no lease, failing");
++					retval = 1;
++					goto ret;
++				}
+ #if BB_MMU /* -b is not supported on NOMMU */
+ 				if (opt & OPT_b) { /* background if no lease */
+ 					bb_simple_info_msg("no lease, forking to background");
+ 					client_background();
+ 					/* do not background again! */
+-					opt = ((opt & ~(OPT_b|OPT_n)) | OPT_f);
+-					/* ^^^ also disables -n (-b takes priority over -n):
+-					 * ifup's default udhcpc options are -R -n,
+-					 * and users want to be able to add -b
+-					 * (in a config file) to make it background
+-					 * _and not exit_.
+-					 */
+-				} else
+-#endif
+-				if (opt & OPT_n) { /* abort if no lease */
+-					bb_simple_info_msg("no lease, failing");
+-					retval = 1;
+-					goto ret;
++					opt = ((opt & ~OPT_b) | OPT_f);
+ 				}
++#endif
+ 				/* Wait before trying again */
+ 				timeout = tryagain_timeout;
+ 				packet_num = 0;
+diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
+index 424d6dade..06ad59fe5 100644
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
+@@ -1456,25 +1456,19 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
+  leasefail:
+ 				change_listen_mode(LISTEN_NONE);
+ 				d4_run_script(NULL, "leasefail");
++				if (opt & OPT_n) { /* abort if no lease */
++					bb_simple_info_msg("no lease, failing");
++					retval = 1;
++					goto ret;
++				}
+ #if BB_MMU /* -b is not supported on NOMMU */
+ 				if (opt & OPT_b) { /* background if no lease */
+ 					bb_simple_info_msg("no lease, forking to background");
+ 					client_background();
+ 					/* do not background again! */
+-					opt = ((opt & ~(OPT_b|OPT_n)) | OPT_f);
+-					/* ^^^ also disables -n (-b takes priority over -n):
+-					 * ifup's default udhcpc options are -R -n,
+-					 * and users want to be able to add -b
+-					 * (in a config file) to make it background
+-					 * _and not exit_.
+-					 */
+-				} else
+-#endif
+-				if (opt & OPT_n) { /* abort if no lease */
+-					bb_simple_info_msg("no lease, failing");
+-					retval = 1;
+-					goto ret;
++					opt = ((opt & ~OPT_b) | OPT_f);
+ 				}
++#endif
+ 				/* Wait before trying again */
+ 				timeout = tryagain_timeout;
+ 				packet_num = 0;
diff --git a/main/busybox/0023-tests-fix-tarball-creation.patch b/main/busybox/0023-tests-fix-tarball-creation.patch
new file mode 100644
index 00000000000..e4221e779b8
--- /dev/null
+++ b/main/busybox/0023-tests-fix-tarball-creation.patch
@@ -0,0 +1,29 @@
+From 9448774028839a834a554384a7c64e89fd9c3486 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Wed, 4 Jan 2023 08:30:41 +0100
+Subject: [PATCH] tests: fix tarball creation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Without this patch, the chmod 644 invocation takes away the executable
+bit from the input_dir directory, thus preventing the chmod of the files
+within the input_dir directory (due to lack of x-bit).
+
+---
+ testsuite/tar.tests | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testsuite/tar.tests b/testsuite/tar.tests
+index 0f2e89112..18e571af3 100755
+--- a/testsuite/tar.tests
++++ b/testsuite/tar.tests
+@@ -67,7 +67,7 @@ testing "tar hardlinks and repeated files" '\
+ ln input_hard1 input_hard2
+ mkdir input_dir
+ >input_dir/file
+-chmod -R 644 *
++for f in *; do [ "$f" = "input_dir" ] || chmod -R 644 "$f"; done
+ chmod    755 input_dir
+ tar cf test.tar input input_dir/ input_hard1 input_hard2 input_hard1 input_dir/ input
+ tar tvf test.tar | sed "s/.*[0-9] input/input/"
diff --git a/main/busybox/0024-tests-musl-doesn-t-seem-to-recognize-UTC0-as-a-timez.patch b/main/busybox/0024-tests-musl-doesn-t-seem-to-recognize-UTC0-as-a-timez.patch
new file mode 100644
index 00000000000..de2cb3648e1
--- /dev/null
+++ b/main/busybox/0024-tests-musl-doesn-t-seem-to-recognize-UTC0-as-a-timez.patch
@@ -0,0 +1,40 @@
+From 707d69bf1e7a5f2e29309239d599933350cbfd59 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Wed, 4 Jan 2023 08:04:07 +0100
+Subject: [PATCH] tests: musl doesn't seem to recognize UTC0 as a timezone
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+UTC works though.
+
+TODO: Figure out if musl /should/ regonize UTC0.
+---
+ testsuite/date/date-timezone | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/testsuite/date/date-timezone b/testsuite/date/date-timezone
+index 8628aa1d7..720ce4f26 100644
+--- a/testsuite/date/date-timezone
++++ b/testsuite/date/date-timezone
+@@ -1,17 +1,17 @@
+ # FEATURE: CONFIG_FEATURE_TIMEZONE
+ 
+ # 'Z' is UTC
+-dt=$(TZ=UTC0 busybox date -d '1999-1-2 3:4:5Z')
++dt=$(TZ=UTC busybox date -d '1999-1-2 3:4:5Z')
+ dt=$(echo "$dt" | cut -b1-19)
+ test x"$dt" = x"Sat Jan  2 03:04:05"
+ 
+ # '+0600' is six hours ahead of UTC
+-dt=$(TZ=UTC0 busybox date -d '1999-1-2 3:4:5 +0600')
++dt=$(TZ=UTC busybox date -d '1999-1-2 3:4:5 +0600')
+ dt=$(echo "$dt" | cut -b1-19)
+ test x"$dt" = x"Fri Jan  1 21:04:05"
+ 
+ # '-0600' is six hours behind UTC
+-dt=$(TZ=UTC0 busybox date -d '1999-1-2 3:4:5 -0600')
++dt=$(TZ=UTC busybox date -d '1999-1-2 3:4:5 -0600')
+ dt=$(echo "$dt" | cut -b1-19)
+ test x"$dt" = x"Sat Jan  2 09:04:05"
+ 
diff --git a/main/busybox/0025-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch b/main/busybox/0025-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch
new file mode 100644
index 00000000000..a3030da2efd
--- /dev/null
+++ b/main/busybox/0025-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch
@@ -0,0 +1,46 @@
+From 3ead51e53687e94a51beb793661363df27b00814 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Thu, 5 Jan 2023 15:47:55 +0100
+Subject: [PATCH] Hackfix to disable HW acceleration for MD5/SHA1 on x86
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This causes a direct segfault with musl libc.
+
+See: http://lists.busybox.net/pipermail/busybox/2023-January/090078.html
+---
+ libbb/hash_md5_sha.c | 6 +++---
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
+index 880ffab01..a006422ab 100644
+--- a/libbb/hash_md5_sha.c
++++ b/libbb/hash_md5_sha.c
+@@ -14,7 +14,7 @@
+ #define NEED_SHA512 (ENABLE_SHA512SUM || ENABLE_USE_BB_CRYPT_SHA)
+ 
+ #if ENABLE_SHA1_HWACCEL || ENABLE_SHA256_HWACCEL
+-# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
++# if defined(__GNUC__) && defined(__x86_64__)
+ static void cpuid(unsigned *eax, unsigned *ebx, unsigned *ecx, unsigned *edx)
+ {
+ 	asm ("cpuid"
+@@ -1173,7 +1173,7 @@ void FAST_FUNC sha1_begin(sha1_ctx_t *ctx)
+ 	ctx->total64 = 0;
+ 	ctx->process_block = sha1_process_block64;
+ #if ENABLE_SHA1_HWACCEL
+-# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
++# if defined(__GNUC__) && defined(__x86_64__)
+ 	{
+ 		if (!shaNI) {
+ 			unsigned eax = 7, ebx = ebx, ecx = 0, edx = edx;
+@@ -1227,7 +1227,7 @@ void FAST_FUNC sha256_begin(sha256_ctx_t *ctx)
+ 	/*ctx->total64 = 0; - done by prepending two 32-bit zeros to init256 */
+ 	ctx->process_block = sha256_process_block64;
+ #if ENABLE_SHA256_HWACCEL
+-# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
++# if defined(__GNUC__) && defined(__x86_64__)
+ 	{
+ 		if (!shaNI) {
+ 			unsigned eax = 7, ebx = ebx, ecx = 0, edx = edx;
diff --git a/main/busybox/0026-lineedit-Handle-SIGWINCH-gracefully.patch b/main/busybox/0026-lineedit-Handle-SIGWINCH-gracefully.patch
new file mode 100644
index 00000000000..43f48b1228f
--- /dev/null
+++ b/main/busybox/0026-lineedit-Handle-SIGWINCH-gracefully.patch
@@ -0,0 +1,61 @@
+From 63bb934c9e48d3ba1dc7f8001d423ea84b9a00c2 Mon Sep 17 00:00:00 2001
+From: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
+Date: Thu, 19 Jan 2023 17:18:18 +0100
+Subject: [PATCH] lineedit: Handle SIGWINCH gracefully
+
+Since 1.16.0 a resize of the terminal emulator resulted in ash printing
+a new command line. This fixes the issue by retrying read_key() in
+lineedit_read_key() on SIGWINCH, rendering reception of SIGWINCH
+transparent to callers of read_line_input().
+
+Fixes https://bugs.busybox.net/show_bug.cgi?id=15256
+---
+ libbb/lineedit.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/libbb/lineedit.c b/libbb/lineedit.c
+index d6b2e76ff..a47d9e508 100644
+--- a/libbb/lineedit.c
++++ b/libbb/lineedit.c
+@@ -2149,7 +2149,7 @@ static void cmdedit_setwidth(void)
+ 	redraw((new_y >= cmdedit_y ? new_y : cmdedit_y), command_len - cursor);
+ }
+ 
+-static void win_changed(int nsig UNUSED_PARAM)
++static void win_changed(int nsig)
+ {
+ 	if (S.ok_to_redraw) {
+ 		/* We are in read_key(), safe to redraw immediately */
+@@ -2157,6 +2157,7 @@ static void win_changed(int nsig UNUSED_PARAM)
+ 		cmdedit_setwidth();
+ 		fflush_all();
+ 		errno = sv_errno;
++		bb_got_signal = nsig;
+ 	} else {
+ 		/* Signal main loop that redraw is necessary */
+ 		S.SIGWINCH_count++;
+@@ -2186,7 +2187,9 @@ static int lineedit_read_key(char *read_key_buffer, int timeout)
+ 		 * Note: read_key sets errno to 0 on success.
+ 		 */
+ 		for (;;) {
+-			if ((state->flags & LI_INTERRUPTIBLE) && bb_got_signal) {
++			if ((state->flags & LI_INTERRUPTIBLE) && bb_got_signal
++			 && (bb_got_signal != SIGWINCH)
++			) {
+ 				errno = EINTR;
+ 				return -1;
+ 			}
+@@ -2197,6 +2200,10 @@ static int lineedit_read_key(char *read_key_buffer, int timeout)
+ 			IF_FEATURE_EDITING_WINCH(S.ok_to_redraw = 0;)
+ 			if (errno != EINTR)
+ 				break;
++			if (bb_got_signal == SIGWINCH) {
++				bb_got_signal = 0;
++				continue;
++			}
+ 			if (state->flags & LI_INTERRUPTIBLE) {
+ 				/* LI_INTERRUPTIBLE bails out on EINTR,
+ 				 * but nothing really guarantees that bb_got_signal
+-- 
+2.39.1
+
diff --git a/main/busybox/0027-umount-Implement-O-option-to-unmount-by-mount-option.patch b/main/busybox/0027-umount-Implement-O-option-to-unmount-by-mount-option.patch
new file mode 100644
index 00000000000..2b330e527b3
--- /dev/null
+++ b/main/busybox/0027-umount-Implement-O-option-to-unmount-by-mount-option.patch
@@ -0,0 +1,195 @@
+From 7ea459b570760f8e836d05e58422dbd3a7d1b016 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Sun, 19 Jun 2022 17:49:41 +0200
+Subject: [PATCH] umount: Implement -O option to unmount by mount options
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This commit adds an implementation of the umount -O option, as provided
+by util-linux's mount(8) implementation, to BusyBox. Similar to -t, the
+option is intended to be used in conjunction with -a thereby allowing
+users to filter which file systems are unmounted by mount options.
+Multiple options can be specified with -O, all of which need to match.
+Each option can be prefixed with `no` to indicate that no action should
+be taken for a mount point with this mount option. The "no" prefix
+interpretation can be disabled using the "+" prefix.
+
+At Alpine, this feature is often requested by users as the OpenRC
+netmount service uses `umount -a -O _netdev` to amount all network
+file systems [1] [2].
+
+This implementation is functionally equivalent to the util-linux
+implementation with the exception that it implements no special handling
+for `key="value"` mount options to keep the implementation simple.
+Therefore, filesystems mounted with options like `foo="bar"` won't
+be matched by `umount -a -O foo`.
+
+[1]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/9923
+[2]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13789
+
+Signed-off-by: Sören Tempel <soeren@soeren-tempel.net>
+Signed-off-by: Sören Tempel <soeren+git@soeren-tempel.net>
+---
+ include/libbb.h      |  1 +
+ libbb/Kbuild.src     |  1 +
+ libbb/match_fsopts.c | 69 ++++++++++++++++++++++++++++++++++++++++++++
+ util-linux/umount.c  | 10 +++++--
+ 4 files changed, 78 insertions(+), 3 deletions(-)
+ create mode 100644 libbb/match_fsopts.c
+
+diff --git a/include/libbb.h b/include/libbb.h
+index cca33a177..ad41adec8 100644
+--- a/include/libbb.h
++++ b/include/libbb.h
+@@ -1586,6 +1586,7 @@ const struct hwtype *get_hwntype(int type) FAST_FUNC;
+ 
+ 
+ extern int fstype_matches(const char *fstype, const char *comma_list) FAST_FUNC;
++extern int fsopts_matches(const char *opts_list, const char *reqopts_list) FAST_FUNC;
+ #ifdef HAVE_MNTENT_H
+ extern struct mntent *find_mount_point(const char *name, int subdir_too) FAST_FUNC;
+ #endif
+diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
+index 653025e56..4bb8260b9 100644
+--- a/libbb/Kbuild.src
++++ b/libbb/Kbuild.src
+@@ -120,6 +120,7 @@ lib-y += xrealloc_vector.o
+ 
+ lib-$(CONFIG_MOUNT) += match_fstype.o
+ lib-$(CONFIG_UMOUNT) += match_fstype.o
++lib-$(CONFIG_UMOUNT) += match_fsopts.o
+ 
+ lib-$(CONFIG_FEATURE_UTMP) += utmp.o
+ 
+diff --git a/libbb/match_fsopts.c b/libbb/match_fsopts.c
+new file mode 100644
+index 000000000..b1cc85c3c
+--- /dev/null
++++ b/libbb/match_fsopts.c
+@@ -0,0 +1,69 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * Match fsopts for use in mount unmount -O.
++ *
++ * Returns 1 for a match, otherwise 0.
++ *
++ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
++ */
++
++#include "libbb.h"
++
++static int fsopt_matches(const char *opts_list, const char *opt, size_t optlen)
++{
++	int match = 1;
++
++	if (optlen >= 2 && opt[0] == 'n' && opt[1] == 'o') {
++		match--;
++		opt += 2; optlen -= 2;
++	}
++
++	/* The alone "no" is an error, all matching ends with False. */
++	if (optlen == 0)
++		return 0;
++
++	/* The "no" prefix interpretation can be disabled by the "+" prefix. */
++	if (match && optlen > 1 && *opt == '+') {
++		opt++; optlen--;
++	}
++
++	while (1) {
++		if (strncmp(opts_list, opt, optlen) == 0) {
++			const char *after_opt = opts_list + optlen;
++			if (*after_opt == '\0' || *after_opt == ',')
++				return match;
++		}
++
++		opts_list = strchr(opts_list, ',');
++		if (!opts_list)
++			break;
++		opts_list++;
++	}
++
++	return !match;
++}
++
++/* This function implements the mnt_match_options function from libmount. */
++int FAST_FUNC fsopts_matches(const char *opts_list, const char *reqopts_list)
++{
++	if (!reqopts_list)
++		return 1; /* no options requested, match anything */
++
++	while (1) {
++		size_t len;
++		const char *comma = strchr(reqopts_list, ',');
++		if (!comma)
++			len = strlen(reqopts_list);
++		else
++			len = comma - reqopts_list;
++
++		if (len && !fsopt_matches(opts_list, reqopts_list, len))
++			return 0;
++
++		if (!comma)
++			break;
++		reqopts_list = ++comma;
++	}
++
++	return 1;
++}
+diff --git a/util-linux/umount.c b/util-linux/umount.c
+index 23da32868..7a54cafb0 100644
+--- a/util-linux/umount.c
++++ b/util-linux/umount.c
+@@ -41,7 +41,7 @@
+ //kbuild:lib-$(CONFIG_UMOUNT) += umount.o
+ 
+ //usage:#define umount_trivial_usage
+-//usage:       "[-rlf"IF_FEATURE_MTAB_SUPPORT("m")IF_FEATURE_MOUNT_LOOP("d")IF_FEATURE_UMOUNT_ALL("a")"] [-t FSTYPE] FILESYSTEM|DIRECTORY"
++//usage:       "[-rlf"IF_FEATURE_MTAB_SUPPORT("m")IF_FEATURE_MOUNT_LOOP("d")IF_FEATURE_UMOUNT_ALL("a")"] [-t FSTYPE] [-O FSOPT] FILESYSTEM|DIRECTORY"
+ //usage:#define umount_full_usage "\n\n"
+ //usage:       "Unmount filesystems\n"
+ //usage:	IF_FEATURE_UMOUNT_ALL(
+@@ -57,6 +57,7 @@
+ //usage:     "\n	-d	Free loop device if it has been used"
+ //usage:	)
+ //usage:     "\n	-t FSTYPE[,...]	Unmount only these filesystem type(s)"
++//usage:     "\n	-O FSOPT[,...]	Unmount only filesystem mounted with the given options"
+ //usage:
+ //usage:#define umount_example_usage
+ //usage:       "$ umount /dev/hdc1\n"
+@@ -82,7 +83,7 @@ static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
+ #endif
+ 
+ /* ignored: -c -v -i */
+-#define OPTION_STRING           "fldnrat:" "cvi"
++#define OPTION_STRING           "fldnrat:O:" "cvi"
+ #define OPT_FORCE               (1 << 0) // Same as MNT_FORCE
+ #define OPT_LAZY                (1 << 1) // Same as MNT_DETACH
+ #define OPT_FREELOOP            (1 << 2)
+@@ -96,6 +97,7 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
+ 	int doForce;
+ 	struct mntent me;
+ 	FILE *fp;
++	char *opts = NULL;
+ 	char *fstype = NULL;
+ 	int status = EXIT_SUCCESS;
+ 	unsigned opt;
+@@ -105,7 +107,7 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
+ 		struct mtab_list *next;
+ 	} *mtl, *m;
+ 
+-	opt = getopt32(argv, OPTION_STRING, &fstype);
++	opt = getopt32(argv, OPTION_STRING, &fstype, &opts);
+ 	//argc -= optind;
+ 	argv += optind;
+ 
+@@ -133,6 +135,8 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
+ 			/* Match fstype (fstype==NULL matches always) */
+ 			if (!fstype_matches(me.mnt_type, fstype))
+ 				continue;
++			if (!fsopts_matches(me.mnt_opts, opts))
++				continue;
+ 			m = xzalloc(sizeof(*m));
+ 			m->next = mtl;
+ 			m->device = xstrdup(me.mnt_fsname);
diff --git a/main/busybox/0028-ash-use-after-free-in-bash-pattern-substitution.patch b/main/busybox/0028-ash-use-after-free-in-bash-pattern-substitution.patch
new file mode 100644
index 00000000000..a8c13e4a572
--- /dev/null
+++ b/main/busybox/0028-ash-use-after-free-in-bash-pattern-substitution.patch
@@ -0,0 +1,34 @@
+From 3e83699ce23400d75c7ddaa7ebfdec015177caa7 Mon Sep 17 00:00:00 2001
+From: Karsten Sperling <ksperling@apple.com>
+Date: Thu, 18 May 2023 16:47:49 +0200
+Subject: [PATCH] ash: use-after-free in bash pattern substitution
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit daa66ed6 fixed a number of use-after-free bugs in bash pattern
+substitution, however one "unguarded" STPUTC remained, which is fixed here.
+
+function                                             old     new   delta
+subevalvar                                          1564    1576     +12
+
+Signed-off-by: Karsten Sperling <ksperling@apple.com>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+Signed-off-by: Sören Tempel <soeren+git@soeren-tempel.net>
+---
+ shell/ash.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/shell/ash.c b/shell/ash.c
+index d2c5c5d50..51b627fcc 100644
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -7370,6 +7370,8 @@ subevalvar(char *start, char *str, int strloc,
+ 				char *restart_detect = stackblock();
+ 				if (quotes && *loc == '\\') {
+ 					STPUTC(CTLESC, expdest);
++					if (stackblock() != restart_detect)
++						goto restart;
+ 					len++;
+ 				}
+ 				STPUTC(*loc, expdest);
diff --git a/main/busybox/0029-awk-fix-use-after-realloc-CVE-2021-42380-closes-1560.patch b/main/busybox/0029-awk-fix-use-after-realloc-CVE-2021-42380-closes-1560.patch
new file mode 100644
index 00000000000..e49bff43992
--- /dev/null
+++ b/main/busybox/0029-awk-fix-use-after-realloc-CVE-2021-42380-closes-1560.patch
@@ -0,0 +1,82 @@
+From 5b1deb2b98a0513b101c600e856d64edd9d47a2e Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Fri, 26 May 2023 18:52:52 +0200
+Subject: [PATCH] awk: fix use-after-realloc (CVE-2021-42380), closes 15601
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ editors/awk.c       | 26 ++++++++++++++++-----
+ 2 files changed, 75 insertions(+), 6 deletions(-)
+
+diff --git a/editors/awk.c b/editors/awk.c
+index 728ee8685..2af823808 100644
+--- a/editors/awk.c
++++ b/editors/awk.c
+@@ -555,7 +555,7 @@ struct globals {
+ 	const char *g_progname;
+ 	int g_lineno;
+ 	int nfields;
+-	int maxfields; /* used in fsrealloc() only */
++	unsigned maxfields;
+ 	var *Fields;
+ 	char *g_pos;
+ 	char g_saved_ch;
+@@ -1931,9 +1931,9 @@ static void fsrealloc(int size)
+ {
+ 	int i, newsize;
+ 
+-	if (size >= maxfields) {
+-		/* Sanity cap, easier than catering for overflows */
+-		if (size > 0xffffff)
++	if ((unsigned)size >= maxfields) {
++		/* Sanity cap, easier than catering for over/underflows */
++		if ((unsigned)size > 0xffffff)
+ 			bb_die_memory_exhausted();
+ 
+ 		i = maxfields;
+@@ -2891,6 +2891,7 @@ static var *evaluate(node *op, var *res)
+ 		uint32_t opinfo;
+ 		int opn;
+ 		node *op1;
++		var *old_Fields_ptr;
+ 
+ 		opinfo = op->info;
+ 		opn = (opinfo & OPNMASK);
+@@ -2899,10 +2900,16 @@ static var *evaluate(node *op, var *res)
+ 		debug_printf_eval("opinfo:%08x opn:%08x\n", opinfo, opn);
+ 
+ 		/* execute inevitable things */
++		old_Fields_ptr = NULL;
+ 		if (opinfo & OF_RES1) {
+ 			if ((opinfo & OF_REQUIRED) && !op1)
+ 				syntax_error(EMSG_TOO_FEW_ARGS);
+ 			L.v = evaluate(op1, TMPVAR0);
++			/* Does L.v point to $n variable? */
++			if ((size_t)(L.v - Fields) < maxfields) {
++				/* yes, remember where Fields[] is */
++				old_Fields_ptr = Fields;
++			}
+ 			if (opinfo & OF_STR1) {
+ 				L.s = getvar_s(L.v);
+ 				debug_printf_eval("L.s:'%s'\n", L.s);
+@@ -2921,8 +2928,15 @@ static var *evaluate(node *op, var *res)
+ 		 */
+ 		if (opinfo & OF_RES2) {
+ 			R.v = evaluate(op->r.n, TMPVAR1);
+-			//TODO: L.v may be invalid now, set L.v to NULL to catch bugs?
+-			//L.v = NULL;
++			/* Seen in $5=$$5=$0:
++			 * Evaluation of R.v ($$5=$0 expression)
++			 * made L.v ($5) invalid. It's detected here.
++			 */
++			if (old_Fields_ptr) {
++				//if (old_Fields_ptr != Fields)
++				//	debug_printf_eval("L.v moved\n");
++				L.v += Fields - old_Fields_ptr;
++			}
+ 			if (opinfo & OF_STR2) {
+ 				R.s = getvar_s(R.v);
+ 				debug_printf_eval("R.s:'%s'\n", R.s);
diff --git a/main/busybox/0030-shell-avoid-segfault-on-0-0-0-09J-.-Closes-15216.patch b/main/busybox/0030-shell-avoid-segfault-on-0-0-0-09J-.-Closes-15216.patch
new file mode 100644
index 00000000000..4017548e9d0
--- /dev/null
+++ b/main/busybox/0030-shell-avoid-segfault-on-0-0-0-09J-.-Closes-15216.patch
@@ -0,0 +1,80 @@
+From f69ade3845f9c1cc8cf47251d5f3ba41aab2ce21 Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Mon, 12 Jun 2023 16:51:43 +0200
+Subject: [PATCH] shell: avoid segfault on ${0::0/0~09J}. Closes 15216
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+function                                             old     new   delta
+evaluate_string                                     1011    1053     +42
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ shell/math.c | 39 +++++++++++++++++++++++++++++++++++----
+ 1 file changed, 35 insertions(+), 4 deletions(-)
+
+diff --git a/shell/math.c b/shell/math.c
+index 76d22c9bd..727c29467 100644
+--- a/shell/math.c
++++ b/shell/math.c
+@@ -577,6 +577,28 @@ static arith_t strto_arith_t(const char *nptr, char **endptr)
+ # endif
+ #endif
+ 
++//TODO: much better estimation than expr_len/2? Such as:
++//static unsigned estimate_nums_and_names(const char *expr)
++//{
++//	unsigned count = 0;
++//	while (*(expr = skip_whitespace(expr)) != '\0') {
++//		const char *p;
++//		if (isdigit(*expr)) {
++//			while (isdigit(*++expr))
++//				continue;
++//			count++;
++//			continue;
++//		}
++//		p = endofname(expr);
++//		if (p != expr) {
++//			expr = p;
++//			count++;
++//			continue;
++//		}
++//	}
++//	return count;
++//}
++
+ static arith_t
+ evaluate_string(arith_state_t *math_state, const char *expr)
+ {
+@@ -584,10 +606,12 @@ evaluate_string(arith_state_t *math_state, const char *expr)
+ 	const char *errmsg;
+ 	const char *start_expr = expr = skip_whitespace(expr);
+ 	unsigned expr_len = strlen(expr) + 2;
+-	/* Stack of integers */
+-	/* The proof that there can be no more than strlen(startbuf)/2+1
+-	 * integers in any given correct or incorrect expression
+-	 * is left as an exercise to the reader. */
++	/* Stack of integers/names */
++	/* There can be no more than strlen(startbuf)/2+1
++	 * integers/names in any given correct or incorrect expression.
++	 * (modulo "09v09v09v09v09v" case,
++	 * but we have code to detect that early)
++	 */
+ 	var_or_num_t *const numstack = alloca((expr_len / 2) * sizeof(numstack[0]));
+ 	var_or_num_t *numstackptr = numstack;
+ 	/* Stack of operator tokens */
+@@ -652,6 +676,13 @@ evaluate_string(arith_state_t *math_state, const char *expr)
+ 			numstackptr->var = NULL;
+ 			errno = 0;
+ 			numstackptr->val = strto_arith_t(expr, (char**) &expr);
++			/* A number can't be followed by another number, or a variable name.
++			 * We'd catch this later anyway, but this would require numstack[]
++			 * to be twice as deep to handle strings where _every_ char is
++			 * a new number or name. Example: 09v09v09v09v09v09v09v09v09v
++			 */
++			if (isalnum(*expr) || *expr == '_')
++				goto err;
+ //bb_error_msg("val:%lld", numstackptr->val);
+ 			if (errno)
+ 				numstackptr->val = 0; /* bash compat */
diff --git a/main/busybox/0031-ash-initialize-basepf.buf-in-ash.patch b/main/busybox/0031-ash-initialize-basepf.buf-in-ash.patch
new file mode 100644
index 00000000000..51e5301954d
--- /dev/null
+++ b/main/busybox/0031-ash-initialize-basepf.buf-in-ash.patch
@@ -0,0 +1,58 @@
+From ed4a24dfd10539e144ed4b7de008f8791d09a551 Mon Sep 17 00:00:00 2001
+From: zhuyan <zhuyan34@huawei.com>
+Date: Tue, 29 Aug 2023 20:50:32 +0800
+Subject: [PATCH] ash: initialize basepf.buf in ash
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When I planned to print the command in read_line_input, I found that after
+the system started, the command printed for the first time was always
+garbled.
+
+After analysis, it is found that in the init() function of ash, the
+variable basepf.buf is not initialized after applying for memory, resulting
+in garbled initial data. Then assign it to the global variable
+g_parsefile->buf in ash.c, and then pass g_parsefile->buf to the parameter
+command of the function read_line_input in the function preadfd(), and
+finally cause it to be garbled when the command is printed by
+read_line_input.
+
+The call stack is as follows:
+ #0  read_line_input (st=0xb6fff220, prompt=0xb6ffc910 "\\[\\033[32m\\]\\h \\w\\[\\033[m\\] \\$ ", command=command@entry=0xb6ffc230 "P\325\377\266P\325\377\266", maxsize=maxsize@entry=1024) at libbb/lineedit.c:2461
+ #1  0x0043ef8c in preadfd () at shell/ash.c:10812
+ #2  preadbuffer () at shell/ash.c:10914
+ #3  pgetc () at shell/ash.c:10997
+ #4  0x00440c20 in pgetc_eatbnl () at shell/ash.c:11039
+ #5  0x00440cbc in xxreadtoken () at shell/ash.c:13157
+ #6  0x00440f40 in readtoken () at shell/ash.c:13268
+ #7  0x00441234 in list (nlflag=nlflag@entry=1) at shell/ash.c:11782
+ #8  0x004420e8 in parsecmd (interact=<optimized out>) at shell/ash.c:13344
+ #9  0x00442c34 in cmdloop (top=top@entry=1) at shell/ash.c:13549
+ #10 0x00444e4c in ash_main (argc=<optimized out>, argv=0x444e4c <ash_main+1328>) at shell/ash.c:14747
+ #11 0x00407954 in run_applet_no_and_exit (applet_no=9, name=<optimized out>, argv=0xbefffd34) at libbb/appletlib.c:1024
+ #12 0x00407b68 in run_applet_and_exit (name=0xbefffe56 "ash", argv=0x9) at libbb/appletlib.c:1047
+ #13 0x00407f88 in main (argc=<optimized out>, argv=0xbefffd34) at libbb/appletlib.c:1181
+
+Fixes: 82dd14a510ca ("ash: use CONFIG_FEATURE_EDITING_MAX_LEN")
+
+Signed-off-by: zhuyan <zhuyan34@huawei.com>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+Signed-off-by: Sören Tempel <soeren+git@soeren-tempel.net>
+---
+ shell/ash.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/shell/ash.c b/shell/ash.c
+index e1d93da73..771fc8bf9 100644
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -14484,7 +14484,7 @@ static NOINLINE void
+ init(void)
+ {
+ 	/* we will never free this */
+-	basepf.next_to_pgetc = basepf.buf = ckmalloc(IBUFSIZ);
++	basepf.next_to_pgetc = basepf.buf = ckzalloc(IBUFSIZ);
+ 	basepf.linno = 1;
+ 
+ 	sigmode[SIGCHLD - 1] = S_DFL; /* ensure we install handler even if it is SIG_IGNed */
diff --git a/main/busybox/0032-install-Fix-chown-resetting-suid-sgid-bits-from-chmo.patch b/main/busybox/0032-install-Fix-chown-resetting-suid-sgid-bits-from-chmo.patch
new file mode 100644
index 00000000000..795275fa760
--- /dev/null
+++ b/main/busybox/0032-install-Fix-chown-resetting-suid-sgid-bits-from-chmo.patch
@@ -0,0 +1,53 @@
+From 6d22c9abc29d43e919e819ff004fcd84a90de60b Mon Sep 17 00:00:00 2001
+From: Nero <nero@w1r3.net>
+Date: Sat, 23 Sep 2023 11:50:04 +0000
+Subject: [PATCH] install: Fix chown resetting suid/sgid bits from chmod
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Since Linux 2.2.13, chown(2) resets the suid/gid bits for all users.
+This patch changes the ordering so that chmod gets called after chown.
+
+This behavior follows GNU coreutils.
+
+Signed-off-by: Nero <nero@w1r3.net>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ coreutils/install.c | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/coreutils/install.c b/coreutils/install.c
+index c0f1c538a..00f8be87e 100644
+--- a/coreutils/install.c
++++ b/coreutils/install.c
+@@ -244,6 +244,15 @@ int install_main(int argc, char **argv)
+ 			}
+ 		}
+ 
++		/* Set the user and group id */
++		/* (must be before chmod, or else chown may clear suid/gid bits) */
++		if ((opts & (OPT_OWNER|OPT_GROUP))
++		 && lchown(dest, uid, gid) == -1
++		) {
++			bb_perror_msg("can't change %s of %s", "ownership", dest);
++			ret = EXIT_FAILURE;
++		}
++
+ 		/* Set the file mode (always, not only with -m).
+ 		 * GNU coreutils 6.10 is not affected by umask. */
+ 		if (chmod(dest, mode) == -1) {
+@@ -254,13 +263,6 @@ int install_main(int argc, char **argv)
+ 		if (use_default_selinux_context)
+ 			setdefaultfilecon(dest);
+ #endif
+-		/* Set the user and group id */
+-		if ((opts & (OPT_OWNER|OPT_GROUP))
+-		 && lchown(dest, uid, gid) == -1
+-		) {
+-			bb_perror_msg("can't change %s of %s", "ownership", dest);
+-			ret = EXIT_FAILURE;
+-		}
+  next:
+ 		if (ENABLE_FEATURE_CLEAN_UP && isdir)
+ 			free(dest);
diff --git a/main/busybox/0033-find-fix-xdev-depth-and-delete.patch b/main/busybox/0033-find-fix-xdev-depth-and-delete.patch
new file mode 100644
index 00000000000..4cd8d9bdcc8
--- /dev/null
+++ b/main/busybox/0033-find-fix-xdev-depth-and-delete.patch
@@ -0,0 +1,230 @@
+From e49db109bba7ff0b84fe7ba4f1f08405a6b72419 Mon Sep 17 00:00:00 2001
+From: Dominique Martinet <dominique.martinet@atmark-techno.com>
+Date: Fri, 27 Oct 2023 06:42:35 +0900
+Subject: [PATCH] find: fix -xdev -depth (and -delete)
+
+find -xdev with -depth would check for same_fs after the subdirectory
+has been processed (because the check is done in the file/dir action,
+which is evaluated too late in the -depth case)
+This renders `find -xdev -delete` useless, as reported in 2012 here:
+https://bugs.busybox.net/show_bug.cgi?id=5756
+
+The bug report suggested adding an extra hook, which would be required
+if we were to keep the current xdev approach that allows all filesystems
+given in argument, but GNU findutils and OpenBSD find actually stop on
+the first filesystem boundary e.g. for the following tree:
+
+$ find test -exec stat --format "%d %n"  {} +
+27 test
+27 test/file
+59 test/tmpfs
+27 test/tmpfs/bind
+27 test/tmpfs/bind/file
+59 test/tmpfs/file
+(Where 'test/tmpfs' is a tmpfs, and 'test/tmpfs/bind' is a bind mount
+to a neighboring directory in the same filesystem as 'test' -- also
+tested with a symlink and -follow for openbsd which has no bind mount)
+
+Then `find test test/tmpfs -xdev` does not print test/tmpfs/bind/file.
+
+This makes the implementation much simpler (although it's a bit ugly to
+carry the parent st_dev as an argument to the function) and smaller
+code, and would allow for easy addition of rm/cp --one-file-system if
+we want to do that later.
+
+Note: this also no longer stores the stat result in 'status' in
+recursive_action1 as that was not used and doing this saves 10 bytes
+
+function                                             old     new   delta
+recursive_action1                                    361     385     +24
+parse_params                                        1503    1510      +7
+recursive_action                                      63      65      +2
+fileAction                                           206     127     -79
+find_main                                            520     417    -103
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 3/2 up/down: 33/-182)          Total: -149 bytes
+   text	   data	    bss	    dec	    hex	filename
+  78267	   1582	   1552	  81401	  13df9	busybox_old
+  78118	   1582	   1552	  81252	  13d64	busybox_unstripped
+---
+ findutils/find.c         | 44 ++--------------------------------------
+ include/libbb.h          |  1 +
+ libbb/recursive_action.c | 19 ++++++++++-------
+ 3 files changed, 15 insertions(+), 49 deletions(-)
+
+diff --git a/findutils/find.c b/findutils/find.c
+index bb6ad31e5edc..e88fbd3ba3bf 100644
+--- a/findutils/find.c
++++ b/findutils/find.c
+@@ -488,7 +488,6 @@ struct globals {
+ #endif
+ 	action ***actions;
+ 	smallint need_print;
+-	smallint xdev_on;
+ 	smalluint exitstatus;
+ 	recurse_flags_t recurse_flags;
+ 	IF_FEATURE_FIND_EXEC_PLUS(unsigned max_argv_len;)
+@@ -988,26 +987,10 @@ static int FAST_FUNC fileAction(
+ 		struct stat *statbuf)
+ {
+ 	int r;
+-	int same_fs = 1;
+-
+-#if ENABLE_FEATURE_FIND_XDEV
+-	if (S_ISDIR(statbuf->st_mode) && G.xdev_count) {
+-		int i;
+-		for (i = 0; i < G.xdev_count; i++) {
+-			if (G.xdev_dev[i] == statbuf->st_dev)
+-				goto found;
+-		}
+-		//bb_error_msg("'%s': not same fs", fileName);
+-		same_fs = 0;
+- found: ;
+-	}
+-#endif
+ 
+ #if ENABLE_FEATURE_FIND_MAXDEPTH
+ 	if (state->depth < G.minmaxdepth[0]) {
+-		if (same_fs)
+-			return TRUE; /* skip this, continue recursing */
+-		return SKIP; /* stop recursing */
++		return TRUE; /* skip this, continue recursing */
+ 	}
+ 	if (state->depth > G.minmaxdepth[1])
+ 		return SKIP; /* stop recursing */
+@@ -1024,11 +1007,6 @@ static int FAST_FUNC fileAction(
+ 			return SKIP;
+ 	}
+ #endif
+-	/* -xdev stops on mountpoints, but AFTER mountpoit itself
+-	 * is processed as usual */
+-	if (!same_fs) {
+-		return SKIP;
+-	}
+ 
+ 	/* Cannot return 0: our caller, recursive_action(),
+ 	 * will perror() and skip dirs (if called on dir) */
+@@ -1266,7 +1244,7 @@ static action*** parse_params(char **argv)
+ #if ENABLE_FEATURE_FIND_XDEV
+ 		else if (parm == OPT_XDEV) {
+ 			dbg("%d", __LINE__);
+-			G.xdev_on = 1;
++			G.recurse_flags |= ACTION_XDEV;
+ 		}
+ #endif
+ #if ENABLE_FEATURE_FIND_MAXDEPTH
+@@ -1685,24 +1663,6 @@ int find_main(int argc UNUSED_PARAM, char **argv)
+ 	G.actions = parse_params(&argv[firstopt]);
+ 	argv[firstopt] = NULL;
+ 
+-#if ENABLE_FEATURE_FIND_XDEV
+-	if (G.xdev_on) {
+-		struct stat stbuf;
+-
+-		G.xdev_count = firstopt;
+-		G.xdev_dev = xzalloc(G.xdev_count * sizeof(G.xdev_dev[0]));
+-		for (i = 0; argv[i]; i++) {
+-			/* not xstat(): shouldn't bomb out on
+-			 * "find not_exist exist -xdev" */
+-			if (stat(argv[i], &stbuf) == 0)
+-				G.xdev_dev[i] = stbuf.st_dev;
+-			/* else G.xdev_dev[i] stays 0 and
+-			 * won't match any real device dev_t
+-			 */
+-		}
+-	}
+-#endif
+-
+ 	for (i = 0; argv[i]; i++) {
+ 		if (!recursive_action(argv[i],
+ 				G.recurse_flags,/* flags */
+diff --git a/include/libbb.h b/include/libbb.h
+index 5d0fe924eed1..d903330cccb0 100644
+--- a/include/libbb.h
++++ b/include/libbb.h
+@@ -512,6 +512,7 @@ enum {
+ 	ACTION_DEPTHFIRST     = (1 << 3),
+ 	ACTION_QUIET          = (1 << 4),
+ 	ACTION_DANGLING_OK    = (1 << 5),
++	ACTION_XDEV           = (1 << 6),
+ };
+ typedef uint8_t recurse_flags_t;
+ typedef struct recursive_state {
+diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c
+index b1c4bfad7ccf..d4b40afdead3 100644
+--- a/libbb/recursive_action.c
++++ b/libbb/recursive_action.c
+@@ -62,13 +62,15 @@ static int FAST_FUNC true_action(struct recursive_state *state UNUSED_PARAM,
+  * ACTION_FOLLOWLINKS mainly controls handling of links to dirs.
+  * 0: lstat(statbuf). Calls fileAction on link name even if points to dir.
+  * 1: stat(statbuf). Calls dirAction and optionally recurse on link to dir.
++ *
++ * If ACTION_XDEV, stop on different filesystem _after_ it has been processed
+  */
+ 
+-static int recursive_action1(recursive_state_t *state, const char *fileName)
++static int recursive_action1(recursive_state_t *state, const char *fileName, dev_t parentDev)
+ {
+ 	struct stat statbuf;
+ 	unsigned follow;
+-	int status;
++	int status = TRUE;
+ 	DIR *dir;
+ 	struct dirent *next;
+ 
+@@ -76,8 +78,7 @@ static int recursive_action1(recursive_state_t *state, const char *fileName)
+ 	if (state->depth == 0)
+ 		follow = ACTION_FOLLOWLINKS | ACTION_FOLLOWLINKS_L0;
+ 	follow &= state->flags;
+-	status = (follow ? stat : lstat)(fileName, &statbuf);
+-	if (status < 0) {
++	if ((follow ? stat : lstat)(fileName, &statbuf) < 0) {
+ #ifdef DEBUG_RECURS_ACTION
+ 		bb_error_msg("status=%d flags=%x", status, state->flags);
+ #endif
+@@ -114,6 +115,10 @@ static int recursive_action1(recursive_state_t *state, const char *fileName)
+ 			return TRUE;
+ 	}
+ 
++	/* skip cross devices -- we still need to process action */
++	if ((state->flags & ACTION_XDEV) && parentDev != 0 && statbuf.st_dev != parentDev)
++		goto skip_recurse;
++
+ 	dir = opendir(fileName);
+ 	if (!dir) {
+ 		/* findutils-4.1.20 reports this */
+@@ -121,7 +126,6 @@ static int recursive_action1(recursive_state_t *state, const char *fileName)
+ 		/* To trigger: "find -exec rm -rf {} \;" */
+ 		goto done_nak_warn;
+ 	}
+-	status = TRUE;
+ 	while ((next = readdir(dir)) != NULL) {
+ 		char *nextFile;
+ 		int s;
+@@ -132,7 +136,7 @@ static int recursive_action1(recursive_state_t *state, const char *fileName)
+ 
+ 		/* process every file (NB: ACTION_RECURSE is set in flags) */
+ 		state->depth++;
+-		s = recursive_action1(state, nextFile);
++		s = recursive_action1(state, nextFile, statbuf.st_dev);
+ 		if (s == FALSE)
+ 			status = FALSE;
+ 		free(nextFile);
+@@ -146,6 +150,7 @@ static int recursive_action1(recursive_state_t *state, const char *fileName)
+ 	}
+ 	closedir(dir);
+ 
++skip_recurse:
+ 	if (state->flags & ACTION_DEPTHFIRST) {
+ 		if (!state->dirAction(state, fileName, &statbuf))
+ 			goto done_nak_warn;
+@@ -177,5 +182,5 @@ int FAST_FUNC recursive_action(const char *fileName,
+ 	state.fileAction = fileAction ? fileAction : true_action;
+ 	state.dirAction  =  dirAction ?  dirAction : true_action;
+ 
+-	return recursive_action1(&state, fileName);
++	return recursive_action1(&state, fileName, 0);
+ }
+-- 
+2.39.2
+
diff --git a/main/busybox/0034-udhcp-Avoid-leaking-uninitialized-stale-data.patch b/main/busybox/0034-udhcp-Avoid-leaking-uninitialized-stale-data.patch
new file mode 100644
index 00000000000..d61c5fbfb93
--- /dev/null
+++ b/main/busybox/0034-udhcp-Avoid-leaking-uninitialized-stale-data.patch
@@ -0,0 +1,75 @@
+From e265c8d4c039729f2a68f3b1fb589c13c38d86f8 Mon Sep 17 00:00:00 2001
+From: Russ Dill <russ.dill@gmail.com>
+Date: Mon, 2 Oct 2023 12:34:50 -0700
+Subject: [PATCH] udhcp: Avoid leaking uninitialized/stale data
+
+I noticed a commit in connman:
+
+"gdhcp: Avoid leaking stack data via unitiialized variable" [1]
+
+Since gdhcp is just BusyBox udhcp with the serial numbers filed off, I
+checked if BusyBox udhcp has a related issue.
+
+The issue is that the get_option logic assumes any data within the
+memory area of the buffer is "valid". This reduces the complexity of the
+function at the cost of reading past the end of the actually received
+data in the case of specially crafted packets. This is not a problem
+for the udhcp_recv_kernel_packet data path as the entire memory
+area is zeroed. However, d4/d6_recv_raw_packet does not zero the
+memory.
+
+Note that a related commit [2] is not required as we are zeroing
+any data that can be read by the get_option function.
+
+[1] https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=a74524b3e3fad81b0fd1084ffdf9f2ea469cd9b1
+[2] https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=58d397ba74873384aee449690a9070bacd5676fa
+
+function                                             old     new   delta
+d4_recv_raw_packet                                   484     497     +13
+d6_recv_raw_packet                                   216     228     +12
+.rodata                                           105390  105381      -9
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 2/1 up/down: 25/-9)              Total: 16 bytes
+
+Signed-off-by: Russ Dill <russ.dill@gmail.com>
+Cc: Colin Wee <cwee@tesla.com>
+Cc: Denys Vlasenko <vda.linux@googlemail.com>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ networking/udhcp/d6_dhcpc.c | 1 +
+ networking/udhcp/dhcpc.c    | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
+index cdd06188e..a72fd31bd 100644
+--- a/networking/udhcp/d6_dhcpc.c
++++ b/networking/udhcp/d6_dhcpc.c
+@@ -961,6 +961,7 @@ static NOINLINE int d6_recv_raw_packet(struct in6_addr *peer_ipv6, struct d6_pac
+ 	d6_dump_packet(&packet.data);
+ 
+ 	bytes -= sizeof(packet.ip6) + sizeof(packet.udp);
++	memset(d6_pkt, 0, sizeof(*d6_pkt));
+ 	memcpy(d6_pkt, &packet.data, bytes);
+ 	return bytes;
+ }
+diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
+index 200a2fb8a..07e2eadfe 100644
+--- a/networking/udhcp/dhcpc.c
++++ b/networking/udhcp/dhcpc.c
+@@ -966,7 +966,7 @@ static NOINLINE int d4_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
+ 	check = packet.udp.check;
+ 	packet.udp.check = 0;
+ 	if (check && check != inet_cksum(&packet, bytes)) {
+-		log1s("packet with bad UDP checksum received, ignoring");
++		log1s("packet with bad UDP checksum, ignoring");
+ 		return -2;
+ 	}
+  skip_udp_sum_check:
+@@ -981,6 +981,7 @@ static NOINLINE int d4_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
+ 	udhcp_dump_packet(&packet.data);
+ 
+ 	bytes -= sizeof(packet.ip) + sizeof(packet.udp);
++	memset(dhcp_pkt, 0, sizeof(*dhcp_pkt));
+ 	memcpy(dhcp_pkt, &packet.data, bytes);
+ 	return bytes;
+ }
diff --git a/main/busybox/0035-ash-fix-handling-of-single-quoted-strings-in-pattern.patch b/main/busybox/0035-ash-fix-handling-of-single-quoted-strings-in-pattern.patch
new file mode 100644
index 00000000000..eace128fb9c
--- /dev/null
+++ b/main/busybox/0035-ash-fix-handling-of-single-quoted-strings-in-pattern.patch
@@ -0,0 +1,90 @@
+From c5a1be25ba6dd705382ce6c25d96a32f79974c04 Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Mon, 26 Feb 2024 16:26:15 +0100
+Subject: [PATCH] ash: fix handling of single-quoted strings in pattern
+ substitution
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+function                                             old     new   delta
+subevalvar                                          1576    1588     +12
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+Signed-off-by: Sören Tempel <soeren+git@soeren-tempel.net>
+---
+ shell/ash.c                                          | 5 +++++
+ shell/ash_test/ash-quoting/dollar_repl_bash2.right   | 4 ++++
+ shell/ash_test/ash-quoting/dollar_repl_bash2.tests   | 8 ++++++++
+ shell/hush_test/hush-quoting/dollar_repl_bash2.right | 4 ++++
+ shell/hush_test/hush-quoting/dollar_repl_bash2.tests | 8 ++++++++
+ 5 files changed, 29 insertions(+)
+ create mode 100644 shell/ash_test/ash-quoting/dollar_repl_bash2.right
+ create mode 100755 shell/ash_test/ash-quoting/dollar_repl_bash2.tests
+ create mode 100644 shell/hush_test/hush-quoting/dollar_repl_bash2.right
+ create mode 100755 shell/hush_test/hush-quoting/dollar_repl_bash2.tests
+
+diff --git a/shell/ash.c b/shell/ash.c
+index 771fc8bf9..4ca4c6c56 100644
+--- a/shell/ash.c
++++ b/shell/ash.c
+@@ -7073,6 +7073,11 @@ subevalvar(char *start, char *str, int strloc,
+ 				repl = NULL;
+ 				break;
+ 			}
++			/* Skip over quoted 'str'. Example: ${var/'/'} - second / is not a separator */
++			if ((unsigned char)*repl == CTLQUOTEMARK) {
++				while ((unsigned char)*++repl != CTLQUOTEMARK)
++					continue;
++			}
+ 			if (*repl == '/') {
+ 				*repl = '\0';
+ 				break;
+diff --git a/shell/ash_test/ash-quoting/dollar_repl_bash2.right b/shell/ash_test/ash-quoting/dollar_repl_bash2.right
+new file mode 100644
+index 000000000..e3fcd5807
+--- /dev/null
++++ b/shell/ash_test/ash-quoting/dollar_repl_bash2.right
+@@ -0,0 +1,4 @@
++axxb
++axxb
++axxb
++axxb
+diff --git a/shell/ash_test/ash-quoting/dollar_repl_bash2.tests b/shell/ash_test/ash-quoting/dollar_repl_bash2.tests
+new file mode 100755
+index 000000000..45c7a10e2
+--- /dev/null
++++ b/shell/ash_test/ash-quoting/dollar_repl_bash2.tests
+@@ -0,0 +1,8 @@
++v="x/x"
++# The second / is quoted, should not be treated as separator
++echo a${v/'/'}b
++# The second / is escaped, should not be treated as separator
++echo a${v/\/}b
++
++echo "a${v/'/'}b"
++echo "a${v/\/}b"
+diff --git a/shell/hush_test/hush-quoting/dollar_repl_bash2.right b/shell/hush_test/hush-quoting/dollar_repl_bash2.right
+new file mode 100644
+index 000000000..e3fcd5807
+--- /dev/null
++++ b/shell/hush_test/hush-quoting/dollar_repl_bash2.right
+@@ -0,0 +1,4 @@
++axxb
++axxb
++axxb
++axxb
+diff --git a/shell/hush_test/hush-quoting/dollar_repl_bash2.tests b/shell/hush_test/hush-quoting/dollar_repl_bash2.tests
+new file mode 100755
+index 000000000..45c7a10e2
+--- /dev/null
++++ b/shell/hush_test/hush-quoting/dollar_repl_bash2.tests
+@@ -0,0 +1,8 @@
++v="x/x"
++# The second / is quoted, should not be treated as separator
++echo a${v/'/'}b
++# The second / is escaped, should not be treated as separator
++echo a${v/\/}b
++
++echo "a${v/'/'}b"
++echo "a${v/\/}b"
diff --git a/main/busybox/0036-fix-dos-in-math.patch b/main/busybox/0036-fix-dos-in-math.patch
new file mode 100644
index 00000000000..0fb95fea741
--- /dev/null
+++ b/main/busybox/0036-fix-dos-in-math.patch
@@ -0,0 +1,31 @@
+From cc9543fed1f916f62a63cfbe9eaefba3df8e22cb Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Sun, 2 Jul 2023 19:32:12 +0200
+Subject: shell/math: avoid $((3**999999999999999999)) to take years
+
+diff --git a/shell/math.c b/shell/math.c
+index b06d1ae3c..e90a38f05 100644
+--- a/shell/math.c
++++ b/shell/math.c
+@@ -422,8 +422,19 @@ arith_apply(arith_state_t *math_state, operator op, var_or_num_t *numstack, var_
+ 			if (right_side_val < 0)
+ 				return "exponent less than 0";
+ 			c = 1;
+-			while (--right_side_val >= 0)
++			while (right_side_val != 0) {
++				if ((right_side_val & 1) == 0) {
++					/* this if() block is not necessary for correctness,
++					 * but otherwise echo $((3**999999999999999999))
++					 * takes a VERY LONG time
++					 * (and it's not interruptible by ^C)
++					 */
++					rez *= rez;
++					right_side_val >>= 1;
++				}
+ 				c *= rez;
++				right_side_val--;
++			}
+ 			rez = c;
+ 		}
+ 		else /*if (op == TOK_DIV || op == TOK_DIV_ASSIGN
+-- 
diff --git a/main/busybox/0037-awk.c-fix-CVE-2023-42366-bug-15874.patch b/main/busybox/0037-awk.c-fix-CVE-2023-42366-bug-15874.patch
new file mode 100644
index 00000000000..177e174b493
--- /dev/null
+++ b/main/busybox/0037-awk.c-fix-CVE-2023-42366-bug-15874.patch
@@ -0,0 +1,34 @@
+From 5cf8b332429a1dd9afef3337bae92aeddaeff993 Mon Sep 17 00:00:00 2001
+From: Valery Ushakov <uwe@stderr.spb.ru>
+Date: Wed, 24 Jan 2024 22:24:41 +0300
+Subject: [PATCH] awk.c: fix CVE-2023-42366 (bug #15874)
+
+Make sure we don't read past the end of the string in next_token()
+when backslash is the last character in an (invalid) regexp.
+
+https://bugs.busybox.net/show_bug.cgi?id=15874
+---
+ editors/awk.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/editors/awk.c b/editors/awk.c
+index 728ee8685..be48df7c7 100644
+--- a/editors/awk.c
++++ b/editors/awk.c
+@@ -1165,9 +1165,11 @@ static uint32_t next_token(uint32_t expected)
+ 					s[-1] = bb_process_escape_sequence((const char **)&pp);
+ 					if (*p == '\\')
+ 						*s++ = '\\';
+-					if (pp == p)
++					if (pp == p) {
++						if (*p == '\0')
++							syntax_error(EMSG_UNEXP_EOS);
+ 						*s++ = *p++;
+-					else
++					} else
+ 						p = pp;
+ 				}
+ 			}
+-- 
+2.34.1
+
diff --git a/main/busybox/0038-tsort-avoid-use-after-free.patch b/main/busybox/0038-tsort-avoid-use-after-free.patch
new file mode 100644
index 00000000000..8f23e37d6d7
--- /dev/null
+++ b/main/busybox/0038-tsort-avoid-use-after-free.patch
@@ -0,0 +1,80 @@
+From 2cc9d436e80632157b99e18d413a62b2d44d321a Mon Sep 17 00:00:00 2001
+From: Ron Yorston <rmy@pobox.com>
+Date: Tue, 22 Aug 2023 09:38:03 +0100
+Subject: tsort: avoid use-after-free
+
+When the input data contained a cycle it was possible for tsort to
+attempt to access freed nodes.  This sometimes resulted in the
+test case 'echo a b b a | tsort' crashing.
+
+Don't free nodes when they're removed from the graph.
+
+function                                             old     new   delta
+tsort_main                                           621     596     -25
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-25)             Total: -25 bytes
+
+Signed-off-by: Ron Yorston <rmy@pobox.com>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ coreutils/tsort.c | 20 +++++++++++++++++---
+ 1 file changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/coreutils/tsort.c b/coreutils/tsort.c
+index a451ed2ff..e1ee6bcd7 100644
+--- a/coreutils/tsort.c
++++ b/coreutils/tsort.c
+@@ -101,6 +101,10 @@ int tsort_main(int argc UNUSED_PARAM, char **argv)
+ 	ssize_t len;
+ 	struct node *a;
+ 	int cycles;
++	unsigned i;
++#if ENABLE_FEATURE_CLEAN_UP
++	unsigned max_len;
++#endif
+ 
+ 	INIT_G();
+ 
+@@ -152,9 +156,11 @@ int tsort_main(int argc UNUSED_PARAM, char **argv)
+ 	 *   - if any nodes are left, they form cycles.
+ 	 */
+ 	cycles = 0;
++#if ENABLE_FEATURE_CLEAN_UP
++	max_len = G.nodes_len;
++#endif
+ 	while (G.nodes_len) {
+ 		struct node *n;
+-		unsigned i;
+ 
+ 		/* Search for first node with no incoming edges */
+ 		for (i = 0; i < G.nodes_len; i++) {
+@@ -173,16 +179,24 @@ int tsort_main(int argc UNUSED_PARAM, char **argv)
+ 		/* Remove the node (need no longer maintain sort) */
+ 		n = G.nodes[i];
+ 		G.nodes[i] = G.nodes[--G.nodes_len];
++#if ENABLE_FEATURE_CLEAN_UP
++		/* Keep reference to removed node so it can be freed */
++		G.nodes[G.nodes_len] = n;
++#endif
+ 
+ 		/* And remove its outgoing edges */
+ 		for (i = 0; i < n->out_count; i++)
+ 			n->out[i]->in_count--;
+-		free(n->out);
+ 
+ 		puts(n->name);
+-		free(n);
++	}
++#if ENABLE_FEATURE_CLEAN_UP
++	for (i = 0; i < max_len; i++) {
++		free(G.nodes[i]->out);
++		free(G.nodes[i]);
+ 	}
+ 	free(G.nodes);
++#endif
+ 
+ 	fflush_stdout_and_exit(cycles ? 1 : 0);
+ }
+-- 
+cgit v1.2.3
+
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index f2c64abdf62..fb15152e280 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,41 +1,92 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Contributor: Oliver Smith <ollieparanoid@postmarketos.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Michal Artazov <michal@artazov.cz>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
 pkgname=busybox
-pkgver=1.31.1
-pkgrel=14
+pkgver=1.36.1
+pkgrel=25
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url="https://busybox.net/"
 arch="all"
 license="GPL-2.0-only"
-makedepends_host="linux-headers openssl-dev libtls-standalone-dev"
+makedepends_build="perl"
+makedepends_host="linux-headers openssl-dev>3"
+# Only build with utmps support if we are not bootstraping.
+# skalibs-static is needed for utmps-static
+[ -z "$BOOTSTRAP" ] && makedepends_host="$makedepends_host utmps-dev utmps-static skalibs-static"
 makedepends="$makedepends_build $makedepends_host"
 checkdepends="zip"
-provides="/bin/sh"
 install="$pkgname.post-install $pkgname.post-upgrade
 	$pkgname-extras.post-install $pkgname-extras.pre-deinstall"
-subpackages="$pkgname-static $pkgname-doc $pkgname-suid $pkgname-extras ssl_client"
-options="suid !check"
+subpackages="
+	$pkgname-static
+	$pkgname-doc
+	$pkgname-suid
+	ssl_client
+	$pkgname-ifupdown::noarch
+	$pkgname-binsh::noarch
+	$pkgname-openrc
+	$pkgname-mdev-openrc:mdev_openrc
+	$pkgname-extras
+	$pkgname-extras-openrc:extras_openrc
+	"
+options="suid net" # net needed for check()
 replaces="busybox-initscripts" # move of default.script
 triggers="busybox.trigger=/bin:/usr/bin:/sbin:/usr/sbin:/lib/modules/*"
+
+_openrc_files="acpid.initd
+	crond.confd crond.initd
+	klogd.confd klogd.initd
+	ntpd.confd ntpd.initd
+	rdate.confd rdate.initd
+	syslog.confd syslog.initd
+	loadkmap.confd loadkmap.initd
+	watchdog.confd watchdog.initd"
+_mdev_openrc_files="mdev.initd"
+_extras_openrc_files="dnsd.initd httpd.initd inetd.initd udhcpd.initd"
+
 source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
-	0001-ln-no-target-directory-implies-no-dereference.patch
-	0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
-	0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
-	0001-properly-fix-wget-https-support.patch
-	0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
-	0003-ash-exec-busybox.static.patch
-	0004-app-location-for-cpio-vi-and-lspci.patch
-	0005-udhcpc-set-default-discover-retries-to-5.patch
-	0006-ping-make-ping-work-without-root-privileges.patch
-	0007-fbsplash-support-console-switching.patch
-	0008-fbsplash-support-image-and-bar-alignment-and-positio.patch
-	0009-depmod-support-generating-kmod-binary-index-files.patch
-	0010-Add-flag-for-not-following-symlinks-when-recursing.patch
-	0012-udhcpc-Don-t-background-if-n-is-given.patch
-	0013-testsuite-fix-cpio-tests.patch
-	busybox-bc.patch
-	nslookup.patch
+	0001-modutils-check-ELF-header-before-calling-finit_modul.patch
+	0002-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
+	0003-ash-add-built-in-BB_ASH_VERSION-variable.patch
+	0004-Avoid-redefined-warnings-when-buiding-with-utmps.patch
+	0005-libbb-sockaddr2str-ensure-only-printable-characters-.patch
+	0006-modinfo-add-k-option-for-kernel-version.patch
+	0007-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
+	0008-pgrep-add-support-for-matching-against-UID-and-RUID.patch
+	0009-properly-fix-wget-https-support.patch
+	0010-sed-check-errors-writing-file-with-sed-i.patch
+	0011-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
+	0012-nslookup-sanitize-all-printed-strings-with-printable.patch
+	0013-ash-exec-busybox.static.patch
+	0014-app-location-for-cpio-vi-and-lspci.patch
+	0015-udhcpc-set-default-discover-retries-to-5.patch
+	0016-ping-make-ping-work-without-root-privileges.patch
+	0017-fbsplash-support-console-switching.patch
+	0018-fbsplash-support-image-and-bar-alignment-and-positio.patch
+	0019-depmod-support-generating-kmod-binary-index-files.patch
+	0020-Add-flag-for-not-following-symlinks-when-recursing.patch
+	0021-udhcpc-Don-t-background-if-n-is-given.patch
+
+	0023-tests-fix-tarball-creation.patch
+	0024-tests-musl-doesn-t-seem-to-recognize-UTC0-as-a-timez.patch
+	0025-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch
+	0026-lineedit-Handle-SIGWINCH-gracefully.patch
+	0027-umount-Implement-O-option-to-unmount-by-mount-option.patch
+	0028-ash-use-after-free-in-bash-pattern-substitution.patch
+	0029-awk-fix-use-after-realloc-CVE-2021-42380-closes-1560.patch
+	0030-shell-avoid-segfault-on-0-0-0-09J-.-Closes-15216.patch
+	0031-ash-initialize-basepf.buf-in-ash.patch
+	0032-install-Fix-chown-resetting-suid-sgid-bits-from-chmo.patch
+	0033-find-fix-xdev-depth-and-delete.patch
+	0034-udhcp-Avoid-leaking-uninitialized-stale-data.patch
+	0035-ash-fix-handling-of-single-quoted-strings-in-pattern.patch
+	0036-fix-dos-in-math.patch
+	0037-awk.c-fix-CVE-2023-42366-bug-15874.patch
+	0038-tsort-avoid-use-after-free.patch
+
+	0001-wget-add-header-Accept.patch
 
 	acpid.logrotate
 	busyboxconfig
@@ -44,19 +95,50 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
 	dad.if-up
 	ssl_client.c
 	default.script
-	"
+	udhcpc.conf
+	$_openrc_files
+	$_mdev_openrc_files
+	$_extras_openrc_files
+"
 
 # secfixes:
+#   1.36.1-r25:
+#     - CVE-2023-42366
+#   1.36.1-r2:
+#     - CVE-2022-48174
+#   1.35.0-r17:
+#     - CVE-2022-30065
+#   1.35.0-r7:
+#     - ALPINE-13661
+#     - CVE-2022-28391
+#   1.34.0-r0:
+#     - CVE-2021-42374
+#     - CVE-2021-42375
+#     - CVE-2021-42378
+#     - CVE-2021-42379
+#     - CVE-2021-42380
+#     - CVE-2021-42381
+#     - CVE-2021-42382
+#     - CVE-2021-42383
+#     - CVE-2021-42384
+#     - CVE-2021-42385
+#     - CVE-2021-42386
+#   1.33.0-r5:
+#     - CVE-2021-28831
 #   1.30.1-r2:
 #     - CVE-2019-5747
 #   1.29.3-r10:
 #     - CVE-2018-20679
-#     - CVE-2019-5747
+#   1.28.3-r2:
+#     - CVE-2018-1000500
 #   1.27.2-r4:
 #     - CVE-2017-16544
 #     - CVE-2017-15873
 #     - CVE-2017-15874
-
+#   0:
+#     - CVE-2021-42373
+#     - CVE-2021-42376
+#     - CVE-2021-42377
 
 _staticdir="$srcdir"/build-static
 _dyndir="$srcdir"/build-dynamic
@@ -65,24 +147,29 @@ _config="$srcdir"/busyboxconfig
 _config_extras="$srcdir"/busyboxconfig-extras
 
 prepare() {
+	# remove SGID if set as it confuses the busybox testsuite
+	chmod -R g-s "$builddir"
 	default_prepare
 
 	mkdir -p "$_staticdir" "$_dyndir" "$_dyndir_extras"
 }
 
 build() {
+	local _extra_cflags= _extra_libs=
+	if [ -z "$BOOTSTRAP" ] ; then
+		_extra_cflags="$(pkg-config --cflags --static utmps)"
+		_extra_libs="$(pkg-config --libs --static utmps)"
+	fi
+
 	# build bbsuid
 	msg "Building bbsuid"
-	${CC:-${CROSS_COMPILE}gcc} ${CPPFLAGS} ${CFLAGS} \
-		${LDFLAGS} "$srcdir"/bbsuid.c -o "$_dyndir"/bbsuid
+	${CC:-${CROSS_COMPILE}gcc} $CPPFLAGS $CFLAGS \
+		$LDFLAGS "$srcdir"/bbsuid.c -o "$_dyndir"/bbsuid
 
 	msg "Building ssl_client"
 	# shellcheck disable=SC2046  # Allow wordsplitting for pkg-config
-	${CC:-${CROSS_COMPILE}gcc} ${CPPFLAGS} ${CFLAGS} $(pkg-config --cflags libtls-standalone) \
-		"$srcdir"/ssl_client.c -o "$_dyndir"/ssl_client ${LDFLAGS} $(pkg-config --libs libtls-standalone)
-
-	# no timestamp in build
-	export KCONFIG_NOTIMESTAMP=1
+	${CC:-${CROSS_COMPILE}gcc} $CPPFLAGS $CFLAGS $(pkg-config --cflags libcrypto libssl) \
+		"$srcdir"/ssl_client.c -o "$_dyndir"/ssl_client $LDFLAGS $(pkg-config --libs libcrypto libssl)
 
 	# build dynamic
 	cd "$_dyndir"
@@ -93,7 +180,7 @@ build() {
 		-e "s/CONFIG_EXTRA_COMPAT=y/CONFIG_EXTRA_COMPAT=n/" \
 		.config
 	make -C "$builddir" O="$PWD" silentoldconfig
-	make
+	make CONFIG_EXTRA_CFLAGS="$_extra_cflags" CONFIG_EXTRA_LDLIBS="$_extra_libs"
 
 	# build dynamic (extras)
 	cd "$_dyndir_extras"
@@ -103,14 +190,17 @@ build() {
 		-e "s/CONFIG_EXTRA_COMPAT=y/CONFIG_EXTRA_COMPAT=n/" \
 		.config
 	make -C "$builddir" O="$PWD" silentoldconfig
-	make
+	make CONFIG_EXTRA_CFLAGS="$_extra_cflags" CONFIG_EXTRA_LDLIBS="$_extra_libs"
+	# Yes, the above command line is verbose, but it needs to be duplicated verbatim
+	# for every build. Because the busybox build system is extremely brittle and
+	# breaks on *any* attempt to factorize it.
 
 	# build static
 	cd "$_staticdir"
 	msg "Building static busybox"
 	# enable internal ssl_client for static build
 	sed -e "s/.*CONFIG_PIE.*/\# CONFIG_PIE is not set/" \
-		-e "s/.*CONFIG_STATIC.*/CONFIG_STATIC=y/" \
+		-e "s/.*CONFIG_STATIC\([A-Z_]*\).*/CONFIG_STATIC\1=y/" \
 		-e "s/.*CONFIG_SSL_CLIENT.*/CONFIG_SSL_CLIENT=y/" \
 		"$_config" > .config
 	# musl does not support GNU regex
@@ -118,28 +208,44 @@ build() {
 		-e "s/CONFIG_EXTRA_COMPAT=y/CONFIG_EXTRA_COMPAT=n/" \
 		.config
 	make -C "$builddir" O="$PWD" silentoldconfig
-	make
+	make CONFIG_EXTRA_CFLAGS="$_extra_cflags" CONFIG_EXTRA_LDLIBS="$_extra_libs"
 	mv busybox busybox.static
 }
 
 check() {
+	local _extra_cflags= _extra_libs=
+	if [ -z "$BOOTSTRAP" ] ; then
+		_extra_cflags="$(pkg-config --cflags --static utmps)"
+		_extra_libs="$(pkg-config --libs --static utmps)"
+	fi
+
+	# Set VERBOSE to see expected outcome of each test (runtest -v flag).
+	# Set DEBUG to enable command trace (see testsuite/testing.sh).
+
 	cd "$_dyndir"
-	SKIP_KNOWN_BUGS=1 make -C "$builddir" O="$PWD" V=1 check
+	SKIP_KNOWN_BUGS=1 make -C "$builddir" O="$PWD" V=1 check CONFIG_EXTRA_CFLAGS="$_extra_cflags" CONFIG_EXTRA_LDLIBS="$_extra_libs"
 
 	cd "$_dyndir_extras"
-	SKIP_KNOWN_BUGS=1 make -C "$builddir" O="$PWD" V=1 check
+	SKIP_KNOWN_BUGS=1 make -C "$builddir" O="$PWD" V=1 check CONFIG_EXTRA_CFLAGS="$_extra_cflags" CONFIG_EXTRA_LDLIBS="$_extra_libs"
 }
 
 package() {
-	cd "$_dyndir"
+	local file
 	mkdir -p "$pkgdir"/usr/sbin "$pkgdir"/usr/bin "$pkgdir"/tmp \
 		"$pkgdir"/var/cache/misc "$pkgdir"/bin "$pkgdir"/sbin \
-		"$pkgdir"/usr/share/man/man1
+		"$pkgdir"/usr/share/man/man1 \
+		"$pkgdir"/etc/conf.d "$pkgdir"/etc/init.d
 	chmod 1777 "$pkgdir"/tmp
-	install -m755 busybox "$pkgdir"/bin/busybox
-	# we need /bin/sh to be able to execute post-install
-	ln -s /bin/busybox "$pkgdir"/bin/sh
+	cd "$srcdir"
+	for file in *.confd ; do
+		install -D -m 0644 $file "$pkgdir"/etc/conf.d/${file%%\.confd}
+	done
+	for file in *.initd ; do
+		install -D -m 0755 $file "$pkgdir"/etc/init.d/${file%%\.initd}
+	done
 
+	cd "$_dyndir"
+	install -m755 busybox "$pkgdir"/bin/busybox
 	install -m 644 docs/busybox.1 "$pkgdir"/usr/share/man/man1/busybox.1
 
 	#ifupdown needs those dirs to be present
@@ -155,11 +261,10 @@ package() {
 	install -Dm644 "$srcdir"/acpid.logrotate \
 		"$pkgdir/etc/logrotate.d/acpid"
 
-	mkdir -p "$pkgdir"/var/lib/udhcpd
-	install -Dm644 "$builddir"/examples/udhcp/udhcpd.conf \
-		"$pkgdir"/etc/udhcpd.conf
+	install -Dm644 "$srcdir"/udhcpc.conf "$pkgdir"/etc/udhcpc/udhcpc.conf
 	cat >"$pkgdir"/etc/securetty <<EOF
 console
+tty0
 tty1
 tty2
 tty3
@@ -171,23 +276,56 @@ tty8
 tty9
 tty10
 tty11
+hvc0
+ttyS0
+ttyS1
+ttyS2
+ttyGS0
+ttyAMA0
+ttyAMA1
+ttyTCU0
+ttyTHS0
+ttyTHS1
+ttymxc0
+ttymxc2
 EOF
 
 	# script for udhcpc
 	install -Dm755 "$srcdir"/default.script \
 		"$pkgdir"/usr/share/udhcpc/default.script
 
+	# Install a list of symlinks installed by busybox.  This is useful for
+	# building and analyzing Alpine-based images which contain busybox, where
+	# you don't want to run busybox --list-path at analysis or build time.
+	if [ "$CHOST" = "$CBUILD" ]; then
+		mkdir -p "$pkgdir"/etc/busybox-paths.d
+		"$pkgdir"/bin/busybox --list-path > "$pkgdir"/etc/busybox-paths.d/busybox
+	fi
 }
 
 extras() {
 	pkgdesc="Additional binaries of Busybox"
-	depends="$pkgname"
+	depends="$pkgname=$pkgver-r$pkgrel"
 	install -Dm755 "$_dyndir_extras"/busybox "$subpkgdir"/bin/busybox-extras
+
+	# Install a list of symlinks installed by busybox-extras.  This is useful for
+	# building and analyzing Alpine-based images which contain busybox, where
+	# you don't want to run busybox --list-path at analysis or build time.
+	if [ "$CHOST" = "$CBUILD" ]; then
+		mkdir -p "$subpkgdir"/etc/busybox-paths.d
+		"$subpkgdir"/bin/busybox-extras --list-path > "$subpkgdir"/etc/busybox-paths.d/busybox-extras
+	fi
+
+	# Configuration file and lease directory used by udhcpd which
+	# is part of busybox-extras, hence the files are installed here.
+	mkdir -p "$subpkgdir"/var/lib/udhcpd
+	install -Dm644 "$builddir"/examples/udhcp/udhcpd.conf \
+		"$subpkgdir"/etc/udhcpd.conf
 }
 
 suid() {
 	pkgdesc="suid binaries of Busybox"
-	depends="$pkgname"
+	depends="$pkgname=$pkgver-r$pkgrel"
 
 	cd "$_dyndir"
 	mkdir -p "$subpkgdir"/bin
@@ -205,35 +343,130 @@ ssl_client() {
 	pkgdesc="EXternal ssl_client for busybox wget"
 	local _sslver=$(pkg-config --modversion libssl)
 	# automatically pull in if both busybox and libssl is installed
-	install_if="$pkgname=$pkgver-r$pkgrel libssl${_sslver%.*}"
+	install_if="$pkgname=$pkgver-r$pkgrel libssl${_sslver%%.*}"
 	mkdir -p "$subpkgdir"/usr/bin
 	install -m755 "$_dyndir"/ssl_client \
 		"$subpkgdir"/usr/bin/ssl_client
 }
 
+ifupdown() {
+	pkgdesc="placeholder package for busybox ifupdown"
+	provides="ifupdown-any"
+	provider_priority=200
+	mkdir -p "$subpkgdir"
+}
+
+binsh() {
+	pkgdesc="busybox ash /bin/sh"
+	provides="/bin/sh"
+	provider_priority=100
+
+	mkdir -p "$subpkgdir"/bin
+
+	ln -s /bin/busybox "$subpkgdir"/bin/sh
+}
+
+_helper_openrc() {
+	local file
+	for file ; do
+		if test ${file%%\.confd} != $file ; then
+			amove "etc/conf.d/${file%%\.confd}"
+		elif test ${file%%\.initd} != $file ; then
+			amove "etc/init.d/${file%%\.initd}"
+		fi
+	done
+}
+
+openrc() {
+	depends="openrc>=0.24.1-r6"
+	replaces="openntpd busybox-initscripts acpid-openrc"
+	_helper_openrc $_openrc_files
+	# poweroff script for acpid
+	mkdir -p "$subpkgdir"/etc/acpi/PWRF
+	{ echo '#!/bin/sh' ; echo poweroff ; } > "$subpkgdir"/etc/acpi/PWRF/00000080
+	chmod 0755 "$subpkgdir"/etc/acpi/PWRF/00000080
+}
+
+mdev_openrc() {
+	depends="openrc>=0.24.1-r6 mdev-conf"
+	replaces="busybox-initscripts"
+	provides="dev-openrc"
+	provider_priority=30
+	_helper_openrc $_mdev_openrc_files
+}
+
+extras_openrc() {
+	depends="openrc>=0.24.1-r6 busybox-extras"
+	replaces="busybox-initscripts"
+	_helper_openrc $_extras_openrc_files
+}
 
-sha512sums="0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf  busybox-1.31.1.tar.bz2
-07e79138c80a12fd3c8770c4a1beaba986465b099816511d2de744b34f7457f22351d991f510cce8665effd651cca34a85f685ed52747313b3980ebf25988958  0001-ln-no-target-directory-implies-no-dereference.patch
-ead3403578c071c2216de17ab0543984c1f1509c12c062f03af49141547c3ea21356f3e8f0f0695550f05a41a1379dd73fc3cc18dcd78addbb411f247351e353  0001-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
-a2787a3ecaf6746dadef62166e8ee6ecaa166147e5ad8b917c5838536057c875bab5f9cf40c3e05eba74d575484ac662929ac3799d58432d3a99ac46f364f302  0001-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
-78f4c602e518b01d600824cea246992e58961f2a65737741b1a2283c96900f11504b791423f2482eec79090a9f612b2088c66f6c9f22153daca08b7fe534cca5  0001-properly-fix-wget-https-support.patch
-d8694293edc8cd55cecafeb902f03c01af318e13966f399365cf792b840793891ac086bb67ef83e7a5a2e01b246497a6c6511cb6a856834f6672dee4bca76896  0002-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
-8c34dd5ce9a6e84279fa6494cbae0b254778976f341af1d0ccc2a3afb405fb22d374e9623ea83d1500da77c7463db2ed5218d2c9f49350a21114bd0bb17fd87d  0003-ash-exec-busybox.static.patch
-e4be12a1453a306a58c4ea59cd8a0bf1f261514ae090ea962ac6f7609dc1e9dab0d4d8d351d7adf4f76bf52d37db9ad0102116635e437945c131f762d5750d19  0004-app-location-for-cpio-vi-and-lspci.patch
-f96d66ce5a0295a2459a2c49c281b64e016de675ebd31a49af18cb06f3498fe27dfbc8667324b4391fdf8136aea8533dce643f1c740d10de811808985950bd15  0005-udhcpc-set-default-discover-retries-to-5.patch
-136e35be699b6953e1b624c65bcc41fd096cf98fb00de4409855d0eda8b8a1ee830eb6eb1f0d0dd7d47ee940321e056b3765fd77747bf6a90a07d9cf84a9626c  0006-ping-make-ping-work-without-root-privileges.patch
-7873b98c676a92faea61511d50c1efac1220354d20afd53de19e2c8f1472559cb333b9dd4e0d6432616d8c5f59885f1503c448c86a912e8031c9bfed628c2db1  0007-fbsplash-support-console-switching.patch
-2c56906dac70dea6276e4c573707cb06c4c8b53defcd33b1e5a28f928e7dafe905a52ce40571de430e4af7e00a75ecc0f249d2fec02da5f3d9edd4e904919a35  0008-fbsplash-support-image-and-bar-alignment-and-positio.patch
-907aef47c88f60e93bcd290eb43102721978ab6fc6eca52914172801ace7306ae8b11f38ed8b086452bbf46d75424740161e4f1e7840a485f0f78024455f902b  0009-depmod-support-generating-kmod-binary-index-files.patch
-3b13ba6bd9b697e48864cb5376849c1ac95b30650e3e27605cc05edf4fdc1ecbb4c4503d4fe9012a581bcd660f6bb44d644575cf437d30423614cb83ee92c22c  0010-Add-flag-for-not-following-symlinks-when-recursing.patch
-b0f956e98ed1b670dc27f835441407d32395d371599780cf87a5fb2eee43ad2f77c8c484d20f08b1ed5d2bdee039668ff1a0b02561fa8206832072ab3b89cc45  0012-udhcpc-Don-t-background-if-n-is-given.patch
-d8926f0e4ed7d2fe5af89ff2a944d781b45b109c9edf1ef2591e7bce2a8bbadd7c8ca814cb3c928ae09027d9603434fe70496f308d701f3d42260ebd1e9e9b29  0013-testsuite-fix-cpio-tests.patch
-9bb4d16ca418b6fd3c0b6dc867c92920e66ddb0c98040373d1166608284d2755b8d6eed0022bfddfcc07f5df93974fb7ed79402511a9728eb6c95ce05c37cfeb  busybox-bc.patch
-00d7f186bac8f228ebda3c486282df34c0021b58948946f4b2c7efe0cccf5f34a0e0430318359f1008ed51455747ffb525010f2feef450faf05fbc511d99d1d6  nslookup.patch
+sha512sums="
+8c0c754c9ae04b5e6b23596283a7d3a4ef96225fe179f92d6f6a99c69c0caa95b1aa56c267f52d7c807f6cc69e1f0b7dd29a8ac624098f601738f8c0c57980d4  busybox-1.36.1.tar.bz2
+17249174b24ba77b6138d640eee4eebcda567a86656623122d8b31044a762ea472096c406d70ba1a1f79450236fa259d4f46c363fa25db6cc4d44950e7a4b223  0001-modutils-check-ELF-header-before-calling-finit_modul.patch
+7ebb1ab462083564d2ace3e5719464326b91a40cfcf6117de4b393d3f01ed7acd37a583725323dce4220e255ba742428e0160072a90e4d566b4d7053d1f4a37f  0002-adduser-default-to-sbin-nologin-as-shell-for-system-.patch
+f7caad3ef18db7de6deff0fb7b7a7e82fff613d4245f334b56a11e982c40ebcfc6160c235e49d0b4fa7d39b58c0e4924e14473a3770a66d1ef7d4df379b6d858  0003-ash-add-built-in-BB_ASH_VERSION-variable.patch
+383cbc2f2f644dc34678d145ea27696a7fa7f46b8952a3448de78d516cb0452872abbc37cb3dcf2b6725c6f7675b972554404b462dec377a8e61c3b73c1cd890  0004-Avoid-redefined-warnings-when-buiding-with-utmps.patch
+ce30a642e6804827ef4f7e453d162747143a52dc905950998e996d84767d19548bbbd51bd25530575670c5942137f6926e3cb6f8668e7410569d695bb4165170  0005-libbb-sockaddr2str-ensure-only-printable-characters-.patch
+fa0c2f58e5bb8f646bc8451ce00375d860ded228fb7ec4ed61e3920e41990822be1fcdd8cdf9c0342318ba263516a71a837549a9bf52875b1ba652fbc7c54f92  0006-modinfo-add-k-option-for-kernel-version.patch
+7313809f283d68521308f7178f6d6e458ee5c826f4c50f40a4595c7a71042d0fe83d938ad2af08e95cbfbc7c0c690fb6c2b2578c2f3e41055bf06bc5cc22d2f2  0007-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
+24b57ec15205a006310096c63829c8e09820aa8a816a9652bbf9f90efc3e6d28893be1d917deac9793121cd9cca811773272776ead121cc30e9e77cbe904cbcd  0008-pgrep-add-support-for-matching-against-UID-and-RUID.patch
+63dae6bf0adb2def1436bed2bcd6ea889bbf666799a8282345e6a4bbf2b567732456fdb20439df870ead5bf242ce2b403170075429b951c5fdf53c134c9e9ef3  0009-properly-fix-wget-https-support.patch
+7fea95c4d686b4f5cc5d86b3f5e0df246767b2f86349d36a9596c05af10e7d616edaee2597bcbe96c73b8d307ca6286d276308dce52b881085e67eaaa2b23542  0010-sed-check-errors-writing-file-with-sed-i.patch
+2ddf584e1e960a45675e08f6bd4e61a80251bed0fe76ad968b79f4a15d0da89039a3ca62ee6f9605c56ca7e86d8c5696e8ec235acb90bed0998073fef1a4b2dd  0011-fsck-resolve-LABEL-.-UUID-.-spec-to-device.patch
+05b00a98c2d5a2cab89bb6b6b80a39cea5fc2f5ea27589d39232fb2f8b85e2fca78cef84f55de202702274c1c7f7802dd04497a212834ae931297767a9186dc9  0012-nslookup-sanitize-all-printed-strings-with-printable.patch
+85d85dcf1fc9c54ed7cbb7ffac36971b6d0a1024e7b6df7fcdccb7e3832bf6b1fa0b0d2e2b7990d0154b752af35a9e8b9b815e244226a9d190c56bf09e9094eb  0013-ash-exec-busybox.static.patch
+42a61fa7ad5eeb757f1985331d10ac3a9977aeed8add0eff16aba3da20be0b0e19ed4b9544b6efa75c31d481af5353d7a9707750f5dcb99975f40591bed49a03  0014-app-location-for-cpio-vi-and-lspci.patch
+a4a440645f1e8be9b1a92d8611190425e339049cf3e21e837f41b348796b3bb81c4369846d837359e7fbc74a32c34cea7e6924d77ca0865550c84f47fd73a1de  0015-udhcpc-set-default-discover-retries-to-5.patch
+c1c522487cde86f73efb4800f610d54674d3fa381a0266598cf6c1b002b2b18be9011014b26d5d5ab82c22f6a9eaa920f32cfbb956790880497ff4316c26a64d  0016-ping-make-ping-work-without-root-privileges.patch
+a9f7dd37b2722265089b39d24d47e9c4911ff1e31f9dd1c3d5ba49bca7656f3fd2b42dcfd2f837ba5ae6b850dd1b02bb6af9a97a3980fe098daf1c20fb2a4630  0017-fbsplash-support-console-switching.patch
+5653c818400c38966726adf1c99b603f6f760179a291c13b5320b79e0ef63d1ad9251b276d6eed68a6b8c95bfabd95eccce9d73edbc2ea888b994d6a02763050  0018-fbsplash-support-image-and-bar-alignment-and-positio.patch
+ce4316e44148562addc1f5839166ca9314ee6f26dae218617c287791a8d9239e374f993688a9299e24c9a237e4c21e481a0b35baa4e8b123ce9e2b23d065001c  0019-depmod-support-generating-kmod-binary-index-files.patch
+80c426dc2ea6cafa359a078a4a283735db0b3611a6c953ee7b7b2ec00c41a1263b61085c37447fcc50a01c229db93fa8fa675b8c995040eb31e9ed6f3723a0cf  0020-Add-flag-for-not-following-symlinks-when-recursing.patch
+22c1d3233b210b8a334f31101eb6ff15d276eaef009758cff57a642b660ebe38114d7f3c8055113f12d6620acc8a8f0a2fe51dbede9100cd3d0eb5cdd2d01e39  0021-udhcpc-Don-t-background-if-n-is-given.patch
+923c29b050f456210fbb06d72c77f53eff2179757e8595a8e9cd1ad3f1d4d300c525bec88de3170fa16dbe6a0ea498cdf01ab5a20a289af913ca05b27abab27d  0023-tests-fix-tarball-creation.patch
+192fe9b535b3ae4cfbd8455d642e9c73b134ddbdf9265b3ebd1a185122bbb1064cf2c1f01840a8cf35d0665969846ff7168c215fdce96b46b031d73c16f7622f  0024-tests-musl-doesn-t-seem-to-recognize-UTC0-as-a-timez.patch
+0a0e4c425879d8250b4dee925dc9feb2595ed68b1fdb5c22e78f3452e46dc17c882ea47f119c2308915f4105b69e5c6f38156131bee1fe9ba0ff684bfd10a049  0025-Hackfix-to-disable-HW-acceleration-for-MD5-SHA1-on-x.patch
+09358ed36d6c13a50119a9d96898fdc2d3e6ca089659780604425ae3d32960a17c3083de81a131b1cf9a9a2b449e40a8ed6af3a8b916247571ebc41765ab365b  0026-lineedit-Handle-SIGWINCH-gracefully.patch
+e3670ab567818a42593698546dcdabaa447c10682261c128901b4390eb2bf2dbea9e84f8f2dcdd6d67c82bf93bb1eed14406e5a8dd723b4670d1995b6100651f  0027-umount-Implement-O-option-to-unmount-by-mount-option.patch
+d3bd84c42487de573c0c5165a847fd233ddcd4d53a61b1e03c30a46b6dba3993e741f12daf167b8347fb7a420b188f4027582f16e92dc822eb3293804dfc62f8  0028-ash-use-after-free-in-bash-pattern-substitution.patch
+5f8c1a848f28aff2b28085950c561e1a51dfcea043da455e3daf9b960025dd8789ecfe43370553cb727d4ec239aa23c42e3ae5f6ef1cd5768d69c80c31b8f39e  0029-awk-fix-use-after-realloc-CVE-2021-42380-closes-1560.patch
+28748a431718f270b2d0023d09f059e6a32501afb9fd243c4b127fec28bc9312ffb7fdcc1563544a2cb29bed66383ecfea7957d557f7b21402ec3bdb6938004f  0030-shell-avoid-segfault-on-0-0-0-09J-.-Closes-15216.patch
+f12c2d5cdb3a6b81f109029b22a6b1064a32aee5a2c5ff0b0a290f9090d5eda060b35f62f2faba3315012e1a4366aad90afd84bf46d77c1a007e97f5cf21aca3  0031-ash-initialize-basepf.buf-in-ash.patch
+0d71e70ed3de87f11a8a94e00b26e74d437b7ae96292507f1d42c850f461a4ea9de28d19f4fbfee087042fa6b14362e7046618d5dd0833cfac96954002766a60  0032-install-Fix-chown-resetting-suid-sgid-bits-from-chmo.patch
+724cfa5dd9eba1b4de448d2e29762821492435e1687d5345b000309f8b38a20f735d57ee6e44c476add94ccb42dd01157d95b75c2da191d04e924dd6635992de  0033-find-fix-xdev-depth-and-delete.patch
+7e929e71b398502f91b429b29c43a93ac05d2281cd8b021a5398f4ecaedd8061c048833ecc8f012adade2a197de85f18cb12f9513867222ea17f0acb9e7d9161  0034-udhcp-Avoid-leaking-uninitialized-stale-data.patch
+5ae02b7e3d8f040bdf78f2465f918cca1683898574d018dfde0b6ab9270e39f58b6adad3936537ea9eab52fe9b78bf05443d99e1bfd72fa1466a0330bc640d77  0035-ash-fix-handling-of-single-quoted-strings-in-pattern.patch
+decfd9df491944775ab0a51db1b922b45b6437d4e02429bf4d15642674df541fcc76b247497050f2f279ed727c5460c10f3b88992d8c311ac6716eb20f0dc08e  0036-fix-dos-in-math.patch
+bff815bf9c8cd0856dde87eb90e2fe56f105dccb426e4f5da9425e30d449d7ee7ccc3b3324aee5136b276678e7be12afbcc368c7ca92d2c1bdcf22ed92ea1f4f  0037-awk.c-fix-CVE-2023-42366-bug-15874.patch
+525df8ef0f78c79b74a62619729e4746c265aa0598036f74b3d7bbf2bf54dbdcf789ebfe7b1e0f8b21751f7e7c06a0a6125c0f166a551763199acb634164af82  0038-tsort-avoid-use-after-free.patch
+bff27cf4a311bc7f5af857f431ba5cca9861e3875815e81384c90419fa817d5d00812acaf0045342ab8f5355003135e9c0340547c1045e0144f6b9d01465838e  0001-wget-add-header-Accept.patch
 aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f0362d5b9315dd63f60511878f0ea05e893f4fdfb4a54af3fb1  acpid.logrotate
-06468d73d2b3b3fd74edc26012cdcb2fcc7b92053b3ee06e7b09264c1c04f16e790906495b18382836ad434c01bce340a91b2cf0acb01cee2a6ee452160a892e  busyboxconfig
-5f9739b9d0c1ba5d77e3153c373593a1bcb813cf466f951b00a2a040262e5077fb13c1a7aa17d67d1533a473bfcacc1a22833b7f491b4dde9dcb5638ad585f9a  busyboxconfig-extras
+076f13b9d85ebf23aff8c0a2f313d3ca05f4d1c0d3ed06b0bc274d41deda3bd4808a8381f7c0411e8188b67315cc7ac8dced1b4473cda3c247773dbce2b71f55  busyboxconfig
+cfd96023125ca27c6eddb13af490a36e5e7d2fcfd0847363e48f1fa5ce237e93e6a9fe4577feeb35291d79d6240ae5e6a518b9258966e0fac27e30a43172b792  busyboxconfig-extras
 0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54  bbsuid.c
-b993ce589685d5d1f806153d0b7f71657f2d37556654ec60884130a40f09acc4944a13e0a4d02914000bedd779e5a35da08c760fed5f7ca5b601243aff7ba2c9  dad.if-up
-646ad9aefe3596d0170d92c8506ca1846e43b5b83cbef97ae565f15ffa7b14665a8c7061bc69c608c043f834c134c5d63f042509f8999031e89163508a868e46  ssl_client.c
-788e3525af419dadff5a46f672b9356a1d9f8a3360523e8e247b926a67180212a002adb2499293d3455cce67a95ed8e2c27f9327ae1a5271f6e7f320dc1c2b98  default.script"
+afc27da5f95bec3e3ccb5b1fcb5bd80a8317d8753e6c70cc0750d0875313e44bf2e487472c8499d7bbe5afba3e583c75548ccdcff4dcadc94bb791f53fb77ba3  dad.if-up
+26eac967d6cfe13b7dc973112de145543ac0bdda9e9dd3a69bbd8c133ae6a20387abe9377917efb770b191130d3a6385ff5738abc84a8216d7b86ae88b159260  ssl_client.c
+e56f9d74f7d471893ff9c3fde319b989e1854c9b12f06c1b6739694b07165ae256b5c555bc75c92986265df7f0a276001aba73853855c7a0fb3404a091a92c86  default.script
+5f9ff70f99a970e88460c0de81a6637d8a82252fba6715e259833f16ed8cbfc3440972b1fa454eb77dbbcd1e244774c96b4eef96f71a2b67a9039a0dd5e6fc1e  udhcpc.conf
+fcb532233fd7ba8cad302d037b88cff00ee8b96b37c90b34fc823479208cf7cdda48818c972ce2c4703b7283fd58e99ba8a724818f884f3b09eaa7e2d6ffad21  acpid.initd
+34c6f3197064bb91619b899b28a201bd4d920b18bded3845440b2cb36dc6f16cabf447c96878349b16e46c30184cbe48bac00a01c5f7cf1be038c0b7136064c5  crond.confd
+0e8266b1bf1d533de7531f32b27c815db00378df6e9ee98232ba3b9cb4f3e1770db65290d338ac0745aca52dd99c3c128dde3fa81ed110dd02c4a298a2f62b1b  crond.initd
+f9bf43b72142bbb4c0665c1268a3d91586ef8a057dfe64c53b6923815d2db1f669b8080a38311ad89cda0b783a8628700fc5414d834a21d8e48515760bb910f7  klogd.confd
+50b975ac94722e8584249a73b7f36134cb954ad19716b7f3437a6e2cde2a81465ef153b04a0b8e734fc7971320df71cd8c75e669bb4da86233c1991bc516260f  klogd.initd
+b0ba67585f39d83320ed6de183d7463a0e163807b9f3dc6f0baa212236056f22aeb2c5399dfdcd54929eb5ae06a15714c2fed133b5888869ed9d9cf589cef843  ntpd.confd
+9e0aedd8f0d546532ad99fb5d3043e222d3f85bfebe2a01609a47b1eef5339750e81753c12eeb79852cefc88e9ff28c54b8858be44702c871c32ca82390d71d2  ntpd.initd
+11b2a71c38c87d95cd19307481b5f05d9aa980f1ee8348a90b14d698a78b5d0109974fef782ae6538177bcf8bb9fc9cd6f8e4a368ff6b6266276745f1394c2e0  rdate.confd
+a95d03564712803fc58c48534f2fbbf23dd8418ffd3a6a06f840e969627892eea518b4fe17f059850665fc056cedf972c26aee52c309805987fb5c59a710bd30  rdate.initd
+bf8173ee33a5d2b61cbdbc1b070e599a17a21e5433a0d8aa9beef71e4ac831304076af8e7e58dc594cdee61562329793afdc57af91e5496bf5fffb9b734a3d9c  syslog.confd
+a13a6add6f7fb10a3a2563391b6f8b68161249147e9f50e6d857c5689123f6d974368ce4f13b8d93312fa38d05f604d67c4c976d8a7eef301af50a3a6ad50c23  syslog.initd
+acbba3385fb2c416362eb9176f24146b617a2e394ee0e00b9eff89350f82468a5ab8396f4f52b0aaf03d341ac6150c73182e808fa3f29a2dc71c69271cdfb811  loadkmap.confd
+1b61a0f1eb40f2ea14bf3ed3441996f343d70fd45858d443f21244f133dcdf1c64433c3deaef769eee4e3e698b405f25e1bbc185a25c351a88ce7d120d61cf00  loadkmap.initd
+359af0a4a1841dd6557eaf3e71d39f0d7a2687bad6a8fc6ef436eccf72a40f85c6400a3b7880c7f64d8e460b6af8a0ff3dd5ffc3a4b1aa8eb0d8f7eaf99ee3e4  watchdog.confd
+53d19009e571dcd3920890c88da815709bfadfffc6946e2dec347d80291622475381a61e9b5cccc15f69f15c0778c192c0112a9f70f379205490b1924ad44a20  watchdog.initd
+6ce0b2a8fe69cc7ea657c5b9076aba51c8f0beeaafa4a887d8673bcc9f9cf8ee40f4b07d2d901ec7a1a1e4f29c150c496559559e803595d0bd487dec56b530a2  mdev.initd
+8af4a5652c418274c3f9ea2698d5026ebea78cd6cbd78e7779125d039aa5807fe92a44e70062b53fe6b830c3fe479f0e6d6ee4a61f37cf4814e895cf1b6ea215  dnsd.initd
+b8ffad8394dee7c2613a047cc34d6b7d650b576c6c9c8427c1ecf9148ca57e4cb3ea9fbc13525f104dde8e30bc78fe3ad4747d534b55750f5c76e8f98368cd33  httpd.initd
+7b286eaba66a4c86366eec38cd94d8547a15bff72923456edf8c683d4e02bf55d85628adbdb7c1c44f3b16b545ea0ca238afa14a73fc1ade0c33ed7e9fcf2b49  inetd.initd
+4a8d1e924284fca730a262fedc3cb76b4f4689a6c650b0c5544b65eeab6cfd9e8eb91f448d9ebbba6efbb056695428c1b26e5eaeb7233bae090676d1789954cc  udhcpd.initd
+"
diff --git a/main/busybox/acpid.initd b/main/busybox/acpid.initd
new file mode 100644
index 00000000000..ec31833ad7f
--- /dev/null
+++ b/main/busybox/acpid.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+
+name="busybox acpid"
+command="/sbin/acpid"
+command_args="$ACPID_OPTS -f"
+pidfile="/run/acpid.pid"
+command_background=true
+start_stop_daemon_args="-g wheel -k 027"
+
+depend() {
+	need dev localmount
+	after hwdrivers modules
+	keyword -vserver -lxc
+}
+
diff --git a/main/busybox/busybox-bc.patch b/main/busybox/busybox-bc.patch
deleted file mode 100644
index 465e798405b..00000000000
--- a/main/busybox/busybox-bc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/miscutils/bc.c	2019-11-21 12:59:36.007348161 +0000
-+++ b/miscutils/bc.c	2019-11-21 17:05:22.192565550 +0000
-@@ -1465,7 +1465,7 @@
- 	b_int = BC_NUM_INT(b);
- 	a_int -= b_int;
- 
--	if (a_int != 0) return (ssize_t) a_int;
-+	if (a_int != 0) return neg ? - (ssize_t) a_int : (ssize_t) a_int;
- 
- 	a_max = (a->rdx > b->rdx);
- 	if (a_max) {
diff --git a/main/busybox/busybox-extras.post-install b/main/busybox/busybox-extras.post-install
index a0327a69107..dc663a554fd 100644
--- a/main/busybox/busybox-extras.post-install
+++ b/main/busybox/busybox-extras.post-install
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/busybox sh
 
 # Create all symlinks
 exec /bin/busybox-extras --install -s
diff --git a/main/busybox/busybox-extras.pre-deinstall b/main/busybox/busybox-extras.pre-deinstall
index 5ae91ccbc22..2634c6a31cb 100644
--- a/main/busybox/busybox-extras.pre-deinstall
+++ b/main/busybox/busybox-extras.pre-deinstall
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 # Remove all symlinks to busybox-extras
-cd /
 for link in $(busybox-extras --list-full); do
 	if [ -L "$link" ] && [ "$(readlink $link)" = "/bin/busybox-extras" ]; then
 		rm "$link"
diff --git a/main/busybox/busybox.post-install b/main/busybox/busybox.post-install
index 30c436115c5..f575396bb1a 100644
--- a/main/busybox/busybox.post-install
+++ b/main/busybox/busybox.post-install
@@ -1,5 +1,11 @@
-#!/bin/sh
+#!/bin/busybox sh
 
 # We need the symlinks early
 /bin/busybox mkdir -p "/bin" "/sbin" "/usr/bin" "/usr/sbin"
-exec /bin/busybox --install -s
+/bin/busybox --install -s || exit 1
+
+# can't be in pre-install since adduser/group may not available then
+addgroup -S klogd 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G klogd -g klogd klogd 2>/dev/null
+
+exit 0
diff --git a/main/busybox/busybox.post-upgrade b/main/busybox/busybox.post-upgrade
index 291ed7a6db2..66fd1c49325 100644
--- a/main/busybox/busybox.post-upgrade
+++ b/main/busybox/busybox.post-upgrade
@@ -1,26 +1,37 @@
-#!/bin/sh
+#!/bin/busybox sh
+
+# remove links that has been relocated or removed
+# - generate a list of all symlinks in bin dirs and a list with all busybox
+#   applets
+# - sort the list and print all lines that are unique. This is the list of
+#   symlinks that does not exist in the busybox applets list.
+# - use stat to find the target of those symlinks printed as:
+#     '/path/to/symlink' -> '/path/to/target'
+#   The "2>/dev/null" is used to stop "can't stat" warnings appearing on
+#   the console for each new command added by the new version of the
+#   busybox package.
+# - use awk to print the symlinks that points to '/bin/busybox'
+# - use sed to strip the leading and training ' chars
+# - finally pass the list to rm for removing the symlinks that points to
+#   busybox but does not exist in the `busybox --list-all` list
+( find bin sbin usr/bin usr/sbin -maxdepth 1 -type l; busybox --list-all) \
+	| sort | uniq -u \
+	| xargs -r stat -c "%N" 2>/dev/null \
+	| awk "\$3 == \"'/bin/busybox'\" {print \$1}" \
+	| sed "s/^'//; s/'$//" \
+	| xargs -r rm
 
-# remove links that has been relocated
-for link in /bin/install /bin/ip /bin/vi /usr/bin/lspci; do
-	if [ -L "$link" ] && [ "$(readlink $link)" = "/bin/busybox" ]; then
-		rm "$link"
-	fi
-done
 for link in /bin/ping /bin/ping6; do
 	if [ -L "$link" ] && [ "$(readlink $link)" = "/bin/bbsuid" ]; then
 		rm "$link"
 	fi
 done
 
-# remove links of programs moved to busybox-extras
-for link in /usr/bin/telnet /usr/sbin/httpd /usr/bin/ftpget /usr/bin/ftpput \
-	/usr/sbin/ftpd /usr/bin/tftp /usr/sbin/fakeidentd /usr/sbin/dnsd \
-	/usr/sbin/inetd /usr/sbin/udhcpd; do
-	if [ -L "$link" ] && [ "$(readlink $link)" = "/bin/busybox" ]; then
-		rm "$link"
-		echo "NOTE: $link has been moved to the package 'busybox-extras'"
-	fi
-done
-
 # We need the symlinks early
-exec /bin/busybox --install -s
+/bin/busybox --install -s || exit 1
+
+# can't be in pre-upgrade since adduser/group may not available then
+addgroup -S klogd 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G klogd -g klogd klogd 2>/dev/null
+
+exit 0
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index fe702046e3b..f6f2c943a85 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.31.1
-# Fri Mar 13 12:50:55 2020
+# Busybox version: 1.36.1
+# Sat Aug  5 10:51:22 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -19,10 +19,10 @@ CONFIG_FEATURE_COMPRESS_USAGE=y
 CONFIG_LFS=y
 # CONFIG_PAM is not set
 CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_UTMP is not set
-# CONFIG_FEATURE_WTMP is not set
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
 CONFIG_FEATURE_PIDFILE=y
-CONFIG_PID_FILE_PATH="/var/run"
+CONFIG_PID_FILE_PATH="/run"
 CONFIG_BUSYBOX=y
 # CONFIG_FEATURE_SHOW_SCRIPT is not set
 CONFIG_FEATURE_INSTALLER=y
@@ -36,7 +36,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
 # CONFIG_FEATURE_CLEAN_UP is not set
 CONFIG_FEATURE_SYSLOG_INFO=y
 CONFIG_FEATURE_SYSLOG=y
-CONFIG_PLATFORM_LINUX=y
 
 #
 # Build Options
@@ -54,7 +53,8 @@ CONFIG_EXTRA_CFLAGS=""
 CONFIG_EXTRA_LDFLAGS=""
 CONFIG_EXTRA_LDLIBS=""
 # CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_STACK_OPTIMIZATION_386=y
+# CONFIG_STACK_OPTIMIZATION_386 is not set
+# CONFIG_STATIC_LIBGCC is not set
 
 #
 # Installation Options ("make install" behavior)
@@ -76,6 +76,7 @@ CONFIG_PREFIX="/home/ncopa/aports/main/busybox/pkg/busybox"
 # CONFIG_DEBUG_SANITIZE is not set
 # CONFIG_UNIT_TEST is not set
 # CONFIG_WERROR is not set
+# CONFIG_WARN_SIMPLE_MSG is not set
 CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
@@ -92,12 +93,18 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=0
+CONFIG_SHA1_SMALL=0
+# CONFIG_SHA1_HWACCEL is not set
+# CONFIG_SHA256_HWACCEL is not set
 CONFIG_SHA3_SMALL=0
-CONFIG_FEATURE_FAST_TOP=y
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-# CONFIG_FEATURE_ETC_SERVICES is not set
+CONFIG_FEATURE_NON_POSIX_CP=y
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_USE_SENDFILE=y
+CONFIG_FEATURE_COPYBUF_KB=64
+CONFIG_MONOTONIC_SYSCALL=y
+# CONFIG_IOCTL_HEX2STR_ERROR is not set
 CONFIG_FEATURE_EDITING=y
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_MAX_LEN=2048
 CONFIG_FEATURE_EDITING_VI=y
 CONFIG_FEATURE_EDITING_HISTORY=8192
 CONFIG_FEATURE_EDITING_SAVEHISTORY=y
@@ -119,14 +126,9 @@ CONFIG_UNICODE_WIDE_WCHARS=y
 # CONFIG_UNICODE_BIDI_SUPPORT is not set
 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
 CONFIG_UNICODE_PRESERVE_BROKEN=y
-CONFIG_FEATURE_NON_POSIX_CP=y
-# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
-CONFIG_FEATURE_USE_SENDFILE=y
-CONFIG_FEATURE_COPYBUF_KB=16
-CONFIG_FEATURE_SKIP_ROOTFS=y
-CONFIG_MONOTONIC_SYSCALL=y
-# CONFIG_IOCTL_HEX2STR_ERROR is not set
-CONFIG_FEATURE_HWIB=y
+# CONFIG_LOOP_CONFIGURE is not set
+# CONFIG_NO_LOOP_CONFIGURE is not set
+CONFIG_TRY_LOOP_CONFIGURE=y
 
 #
 # Applets
@@ -154,17 +156,19 @@ CONFIG_LZCAT=y
 CONFIG_LZMA=y
 CONFIG_UNXZ=y
 CONFIG_XZCAT=y
-CONFIG_XZ=y
+# CONFIG_XZ is not set
 CONFIG_BZIP2=y
 CONFIG_BZIP2_SMALL=8
 CONFIG_FEATURE_BZIP2_DECOMPRESS=y
 CONFIG_CPIO=y
 CONFIG_FEATURE_CPIO_O=y
 CONFIG_FEATURE_CPIO_P=y
+CONFIG_FEATURE_CPIO_IGNORE_DEVNO=y
+CONFIG_FEATURE_CPIO_RENUMBER_INODES=y
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 CONFIG_GZIP=y
-# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
+CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
 CONFIG_GZIP_FAST=2
 CONFIG_FEATURE_GZIP_LEVELS=y
 CONFIG_FEATURE_GZIP_DECOMPRESS=y
@@ -196,6 +200,22 @@ CONFIG_FEATURE_LZMA_FAST=y
 #
 # Coreutils
 #
+CONFIG_FEATURE_VERBOSE=y
+
+#
+# Common options for date and touch
+#
+CONFIG_FEATURE_TIMEZONE=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
 CONFIG_BASENAME=y
 CONFIG_CAT=y
 CONFIG_FEATURE_CATN=y
@@ -206,22 +226,25 @@ CONFIG_CHOWN=y
 CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
 CONFIG_CHROOT=y
 CONFIG_CKSUM=y
+# CONFIG_CRC32 is not set
 CONFIG_COMM=y
 CONFIG_CP=y
 CONFIG_FEATURE_CP_LONG_OPTIONS=y
 CONFIG_FEATURE_CP_REFLINK=y
 CONFIG_CUT=y
+# CONFIG_FEATURE_CUT_REGEX is not set
 CONFIG_DATE=y
 CONFIG_FEATURE_DATE_ISOFMT=y
 # CONFIG_FEATURE_DATE_NANO is not set
 CONFIG_FEATURE_DATE_COMPAT=y
 CONFIG_DD=y
 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
+CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
 CONFIG_FEATURE_DD_IBS_OBS=y
 CONFIG_FEATURE_DD_STATUS=y
 CONFIG_DF=y
 CONFIG_FEATURE_DF_FANCY=y
+CONFIG_FEATURE_SKIP_ROOTFS=y
 CONFIG_DIRNAME=y
 CONFIG_DOS2UNIX=y
 CONFIG_UNIX2DOS=y
@@ -243,7 +266,7 @@ CONFIG_HOSTID=y
 CONFIG_ID=y
 CONFIG_GROUPS=y
 CONFIG_INSTALL=y
-# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
 CONFIG_LINK=y
 CONFIG_LN=y
 # CONFIG_LOGNAME is not set
@@ -315,13 +338,13 @@ CONFIG_TEST2=y
 CONFIG_FEATURE_TEST_64=y
 CONFIG_TIMEOUT=y
 CONFIG_TOUCH=y
-CONFIG_FEATURE_TOUCH_NODEREF=y
 CONFIG_FEATURE_TOUCH_SUSV3=y
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
 CONFIG_TRUE=y
 CONFIG_TRUNCATE=y
+# CONFIG_TSORT is not set
 CONFIG_TTY=y
 CONFIG_UNAME=y
 CONFIG_UNAME_OSNAME="Linux"
@@ -330,32 +353,18 @@ CONFIG_UNIQ=y
 CONFIG_UNLINK=y
 CONFIG_USLEEP=y
 CONFIG_UUDECODE=y
+# CONFIG_BASE32 is not set
 CONFIG_BASE64=y
 CONFIG_UUENCODE=y
 CONFIG_WC=y
 CONFIG_FEATURE_WC_LARGE=y
-# CONFIG_WHO is not set
+CONFIG_WHO=y
 # CONFIG_W is not set
 # CONFIG_USERS is not set
 CONFIG_WHOAMI=y
 CONFIG_YES=y
 
 #
-# Common options
-#
-CONFIG_FEATURE_VERBOSE=y
-
-#
-# Common options for cp and mv
-#
-CONFIG_FEATURE_PRESERVE_HARDLINKS=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
 # Console Utilities
 #
 CONFIG_CHVT=y
@@ -415,13 +424,14 @@ CONFIG_CMP=y
 CONFIG_DIFF=y
 CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
 CONFIG_FEATURE_DIFF_DIR=y
-CONFIG_ED=y
-CONFIG_PATCH=y
+# CONFIG_ED is not set
+# CONFIG_PATCH is not set
 CONFIG_SED=y
 CONFIG_VI=y
-CONFIG_FEATURE_VI_MAX_LEN=1024
+CONFIG_FEATURE_VI_MAX_LEN=4096
 CONFIG_FEATURE_VI_8BIT=y
 CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_COLON_EXPAND=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
 # CONFIG_FEATURE_VI_REGEX_SEARCH is not set
@@ -435,6 +445,7 @@ CONFIG_FEATURE_VI_ASK_TERMINAL=y
 CONFIG_FEATURE_VI_UNDO=y
 CONFIG_FEATURE_VI_UNDO_QUEUE=y
 CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
+# CONFIG_FEATURE_VI_VERBOSE_STATUS is not set
 CONFIG_FEATURE_ALLOW_EXEC=y
 
 #
@@ -443,7 +454,11 @@ CONFIG_FEATURE_ALLOW_EXEC=y
 CONFIG_FIND=y
 CONFIG_FEATURE_FIND_PRINT0=y
 CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_ATIME=y
+CONFIG_FEATURE_FIND_CTIME=y
 CONFIG_FEATURE_FIND_MMIN=y
+# CONFIG_FEATURE_FIND_AMIN is not set
+# CONFIG_FEATURE_FIND_CMIN is not set
 CONFIG_FEATURE_FIND_PERM=y
 CONFIG_FEATURE_FIND_TYPE=y
 CONFIG_FEATURE_FIND_EXECUTABLE=y
@@ -451,6 +466,7 @@ CONFIG_FEATURE_FIND_XDEV=y
 CONFIG_FEATURE_FIND_MAXDEPTH=y
 CONFIG_FEATURE_FIND_NEWER=y
 CONFIG_FEATURE_FIND_INUM=y
+# CONFIG_FEATURE_FIND_SAMEFILE is not set
 CONFIG_FEATURE_FIND_EXEC=y
 CONFIG_FEATURE_FIND_EXEC_PLUS=y
 CONFIG_FEATURE_FIND_USER=y
@@ -462,6 +478,7 @@ CONFIG_FEATURE_FIND_SIZE=y
 CONFIG_FEATURE_FIND_PRUNE=y
 CONFIG_FEATURE_FIND_QUIT=y
 CONFIG_FEATURE_FIND_DELETE=y
+CONFIG_FEATURE_FIND_EMPTY=y
 CONFIG_FEATURE_FIND_PATH=y
 CONFIG_FEATURE_FIND_REGEX=y
 # CONFIG_FEATURE_FIND_CONTEXT is not set
@@ -545,9 +562,9 @@ CONFIG_VLOCK=y
 #
 # Linux Ext2 FS Progs
 #
-# CONFIG_CHATTR is not set
+CONFIG_CHATTR=y
 CONFIG_FSCK=y
-# CONFIG_LSATTR is not set
+CONFIG_LSATTR=y
 # CONFIG_TUNE2FS is not set
 
 #
@@ -602,7 +619,7 @@ CONFIG_FATATTR=y
 CONFIG_FBSET=y
 CONFIG_FEATURE_FBSET_FANCY=y
 CONFIG_FEATURE_FBSET_READMODE=y
-CONFIG_FDFORMAT=y
+# CONFIG_FDFORMAT is not set
 CONFIG_FDISK=y
 # CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
 CONFIG_FEATURE_FDISK_WRITABLE=y
@@ -622,7 +639,6 @@ CONFIG_FSTRIM=y
 CONFIG_GETOPT=y
 CONFIG_FEATURE_GETOPT_LONG=y
 CONFIG_HEXDUMP=y
-CONFIG_FEATURE_HEXDUMP_REVERSE=y
 CONFIG_HD=y
 CONFIG_XXD=y
 CONFIG_HWCLOCK=y
@@ -630,10 +646,10 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
 CONFIG_IONICE=y
 CONFIG_IPCRM=y
 CONFIG_IPCS=y
-# CONFIG_LAST is not set
+CONFIG_LAST=y
 # CONFIG_FEATURE_LAST_FANCY is not set
 CONFIG_LOSETUP=y
-CONFIG_LSPCI=y
+# CONFIG_LSPCI is not set
 CONFIG_LSUSB=y
 CONFIG_MDEV=y
 CONFIG_FEATURE_MDEV_CONF=y
@@ -641,7 +657,7 @@ CONFIG_FEATURE_MDEV_RENAME=y
 CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
 CONFIG_FEATURE_MDEV_EXEC=y
 CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
-# CONFIG_FEATURE_MDEV_DAEMON is not set
+CONFIG_FEATURE_MDEV_DAEMON=y
 CONFIG_MESG=y
 CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
 # CONFIG_MKE2FS is not set
@@ -671,7 +687,7 @@ CONFIG_NSENTER=y
 CONFIG_PIVOT_ROOT=y
 CONFIG_RDATE=y
 CONFIG_RDEV=y
-CONFIG_READPROFILE=y
+# CONFIG_READPROFILE is not set
 CONFIG_RENICE=y
 CONFIG_REV=y
 # CONFIG_RTCWAKE is not set
@@ -693,6 +709,7 @@ CONFIG_FEATURE_SWAPONOFF_LABEL=y
 CONFIG_SWITCH_ROOT=y
 # CONFIG_TASKSET is not set
 # CONFIG_FEATURE_TASKSET_FANCY is not set
+# CONFIG_FEATURE_TASKSET_CPULIST is not set
 # CONFIG_UEVENT is not set
 CONFIG_UMOUNT=y
 CONFIG_FEATURE_UMOUNT_ALL=y
@@ -713,6 +730,7 @@ CONFIG_VOLUMEID=y
 CONFIG_FEATURE_VOLUMEID_BCACHE=y
 CONFIG_FEATURE_VOLUMEID_BTRFS=y
 CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_EROFS=y
 CONFIG_FEATURE_VOLUMEID_EXFAT=y
 CONFIG_FEATURE_VOLUMEID_EXT=y
 CONFIG_FEATURE_VOLUMEID_F2FS=y
@@ -740,6 +758,7 @@ CONFIG_FEATURE_VOLUMEID_XFS=y
 # Miscellaneous Utilities
 #
 CONFIG_ADJTIMEX=y
+# CONFIG_ASCII is not set
 CONFIG_BBCONFIG=y
 CONFIG_FEATURE_COMPRESS_BBCONFIG=y
 CONFIG_BC=y
@@ -759,7 +778,7 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=30
 # CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
 # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
 # CONFIG_FEATURE_CHAT_CLR_ABORT is not set
-CONFIG_CONSPY=y
+# CONFIG_CONSPY is not set
 CONFIG_CROND=y
 CONFIG_FEATURE_CROND_D=y
 CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
@@ -777,7 +796,7 @@ CONFIG_FBSPLASH=y
 # CONFIG_FLASH_LOCK is not set
 # CONFIG_FLASH_UNLOCK is not set
 # CONFIG_FLASHCP is not set
-CONFIG_HDPARM=y
+# CONFIG_HDPARM is not set
 # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
 # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
 # CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
@@ -810,6 +829,7 @@ CONFIG_FEATURE_LESS_ENV=y
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
 # CONFIG_MAN is not set
 CONFIG_MICROCOM=y
+# CONFIG_MIM is not set
 # CONFIG_MT is not set
 CONFIG_NANDWRITE=y
 CONFIG_NANDDUMP=y
@@ -819,10 +839,12 @@ CONFIG_READAHEAD=y
 CONFIG_RFKILL=y
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
+# CONFIG_SEEDRNG is not set
 # CONFIG_SETFATTR is not set
 CONFIG_SETSERIAL=y
 CONFIG_STRINGS=y
 CONFIG_TIME=y
+CONFIG_TREE=y
 # CONFIG_TS is not set
 CONFIG_TTYSIZE=y
 # CONFIG_UBIATTACH is not set
@@ -834,6 +856,7 @@ CONFIG_TTYSIZE=y
 # CONFIG_UBIRENAME is not set
 CONFIG_VOLNAME=y
 CONFIG_WATCHDOG=y
+CONFIG_FEATURE_WATCHDOG_OPEN_TWICE=y
 
 #
 # Networking Utilities
@@ -842,6 +865,9 @@ CONFIG_FEATURE_IPV6=y
 CONFIG_FEATURE_UNIX_LOCAL=y
 # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
 CONFIG_VERBOSE_RESOLUTION_ERRORS=y
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+# CONFIG_FEATURE_ETC_SERVICES is not set
+CONFIG_FEATURE_HWIB=y
 # CONFIG_FEATURE_TLS_SHA1 is not set
 CONFIG_ARP=y
 CONFIG_ARPING=y
@@ -860,6 +886,7 @@ CONFIG_ETHER_WAKE=y
 CONFIG_HOSTNAME=y
 CONFIG_DNSDOMAINNAME=y
 # CONFIG_HTTPD is not set
+CONFIG_FEATURE_HTTPD_PORT_DEFAULT=0
 # CONFIG_FEATURE_HTTPD_RANGES is not set
 # CONFIG_FEATURE_HTTPD_SETUID is not set
 # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
@@ -871,6 +898,10 @@ CONFIG_DNSDOMAINNAME=y
 # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
 # CONFIG_FEATURE_HTTPD_PROXY is not set
 # CONFIG_FEATURE_HTTPD_GZIP is not set
+# CONFIG_FEATURE_HTTPD_ETAG is not set
+# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set
+# CONFIG_FEATURE_HTTPD_DATE is not set
+# CONFIG_FEATURE_HTTPD_ACL_IP is not set
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
 CONFIG_FEATURE_IFCONFIG_SLIP=y
@@ -881,7 +912,7 @@ CONFIG_IFENSLAVE=y
 # CONFIG_IFPLUGD is not set
 CONFIG_IFUP=y
 CONFIG_IFDOWN=y
-CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+CONFIG_IFUPDOWN_IFSTATE_PATH="/run/ifstate"
 CONFIG_FEATURE_IFUPDOWN_IP=y
 CONFIG_FEATURE_IFUPDOWN_IPV4=y
 CONFIG_FEATURE_IFUPDOWN_IPV6=y
@@ -910,7 +941,7 @@ CONFIG_FEATURE_IP_RULE=y
 CONFIG_FEATURE_IP_NEIGH=y
 CONFIG_FEATURE_IP_RARE_PROTOCOLS=y
 CONFIG_IPCALC=y
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
 CONFIG_FEATURE_IPCALC_FANCY=y
 # CONFIG_FAKEIDENTD is not set
 CONFIG_NAMEIF=y
@@ -948,6 +979,7 @@ CONFIG_SLATTACH=y
 # CONFIG_FEATURE_TELNET_WIDTH is not set
 # CONFIG_TELNETD is not set
 # CONFIG_FEATURE_TELNETD_STANDALONE is not set
+CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0
 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
 # CONFIG_TFTP is not set
 # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
@@ -957,7 +989,7 @@ CONFIG_SLATTACH=y
 # CONFIG_FEATURE_TFTP_PUT is not set
 # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
 # CONFIG_TFTP_DEBUG is not set
-CONFIG_TLS=y
+# CONFIG_TLS is not set
 CONFIG_TRACEROUTE=y
 CONFIG_TRACEROUTE6=y
 CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
@@ -968,22 +1000,24 @@ CONFIG_VCONFIG=y
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_FTP=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 CONFIG_FEATURE_WGET_TIMEOUT=y
 CONFIG_FEATURE_WGET_HTTPS=y
 # CONFIG_FEATURE_WGET_OPENSSL is not set
 CONFIG_WHOIS=y
-# CONFIG_ZCIP is not set
+CONFIG_ZCIP=y
 # CONFIG_UDHCPD is not set
 # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
 # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
 CONFIG_DHCPD_LEASES_FILE=""
-CONFIG_DUMPLEASES=y
+# CONFIG_DUMPLEASES is not set
 # CONFIG_DHCPRELAY is not set
 CONFIG_UDHCPC=y
 CONFIG_FEATURE_UDHCPC_ARPING=y
 CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
 CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC6_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 CONFIG_UDHCPC6=y
 CONFIG_FEATURE_UDHCPC6_RFC3646=y
 CONFIG_FEATURE_UDHCPC6_RFC4704=y
@@ -993,6 +1027,7 @@ CONFIG_FEATURE_UDHCPC6_RFC5970=y
 #
 # Common options for DHCP applets
 #
+CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0"
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
@@ -1010,17 +1045,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R"
 #
 # Mail Utilities
 #
+CONFIG_FEATURE_MIME_CHARSET="us-ascii"
 CONFIG_MAKEMIME=y
 # CONFIG_POPMAILDIR is not set
 # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
 CONFIG_REFORMIME=y
 CONFIG_FEATURE_REFORMIME_COMPAT=y
 CONFIG_SENDMAIL=y
-CONFIG_FEATURE_MIME_CHARSET="us-ascii"
 
 #
 # Process Utilities
 #
+CONFIG_FEATURE_FAST_TOP=y
+CONFIG_FEATURE_SHOW_THREADS=y
 CONFIG_FREE=y
 CONFIG_FUSER=y
 CONFIG_IOSTAT=y
@@ -1036,8 +1073,8 @@ CONFIG_PIDOF=y
 CONFIG_FEATURE_PIDOF_SINGLE=y
 CONFIG_FEATURE_PIDOF_OMIT=y
 CONFIG_PMAP=y
-CONFIG_POWERTOP=y
-CONFIG_FEATURE_POWERTOP_INTERACTIVE=y
+# CONFIG_POWERTOP is not set
+# CONFIG_FEATURE_POWERTOP_INTERACTIVE is not set
 CONFIG_PS=y
 # CONFIG_FEATURE_PS_WIDE is not set
 # CONFIG_FEATURE_PS_LONG is not set
@@ -1046,7 +1083,7 @@ CONFIG_FEATURE_PS_TIME=y
 CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
 CONFIG_PSTREE=y
 CONFIG_PWDX=y
-CONFIG_SMEMCAP=y
+# CONFIG_SMEMCAP is not set
 CONFIG_BB_SYSCTL=y
 CONFIG_TOP=y
 CONFIG_FEATURE_TOP_INTERACTIVE=y
@@ -1057,9 +1094,8 @@ CONFIG_FEATURE_TOP_SMP_CPU=y
 CONFIG_FEATURE_TOP_SMP_PROCESS=y
 CONFIG_FEATURE_TOPMEM=y
 CONFIG_UPTIME=y
-# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
+CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y
 CONFIG_WATCH=y
-# CONFIG_FEATURE_SHOW_THREADS is not set
 
 #
 # Runit Utilities
@@ -1100,6 +1136,7 @@ CONFIG_SH_IS_ASH=y
 # CONFIG_BASH_IS_ASH is not set
 # CONFIG_BASH_IS_HUSH is not set
 CONFIG_BASH_IS_NONE=y
+CONFIG_SHELL_ASH=y
 CONFIG_ASH=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 CONFIG_ASH_INTERNAL_GLOB=y
@@ -1115,15 +1152,18 @@ CONFIG_ASH_MAIL=y
 CONFIG_ASH_ECHO=y
 CONFIG_ASH_PRINTF=y
 CONFIG_ASH_TEST=y
+# CONFIG_ASH_SLEEP is not set
 CONFIG_ASH_HELP=y
 CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_CMDCMD=y
+CONFIG_ASH_VERSION_VAR=y
 # CONFIG_CTTYHACK is not set
 # CONFIG_HUSH is not set
+# CONFIG_SHELL_HUSH is not set
 # CONFIG_HUSH_BASH_COMPAT is not set
 # CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_LINENO_VAR is not set
 # CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
+# CONFIG_HUSH_LINENO_VAR is not set
 # CONFIG_HUSH_INTERACTIVE is not set
 # CONFIG_HUSH_SAVEHISTORY is not set
 # CONFIG_HUSH_JOB is not set
@@ -1186,7 +1226,8 @@ CONFIG_FEATURE_ROTATE_LOGFILE=y
 CONFIG_FEATURE_REMOTE_LOG=y
 CONFIG_FEATURE_SYSLOGD_DUP=y
 CONFIG_FEATURE_SYSLOGD_CFG=y
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=512
+# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=2048
 CONFIG_FEATURE_IPC_SYSLOG=y
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
 CONFIG_FEATURE_KMSG_SYSLOG=y
diff --git a/main/busybox/busyboxconfig-extras b/main/busybox/busyboxconfig-extras
index 9c70c1f785f..acb8cd776eb 100644
--- a/main/busybox/busyboxconfig-extras
+++ b/main/busybox/busyboxconfig-extras
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.31.0
-# Tue Jul 23 12:14:13 2019
+# Busybox version: 1.36.1
+# Tue May 23 20:12:51 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -21,8 +21,8 @@ CONFIG_LFS=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_UTMP is not set
 # CONFIG_FEATURE_WTMP is not set
-# CONFIG_FEATURE_PIDFILE is not set
-CONFIG_PID_FILE_PATH=""
+CONFIG_FEATURE_PIDFILE=y
+CONFIG_PID_FILE_PATH="/run"
 CONFIG_BUSYBOX=y
 # CONFIG_FEATURE_SHOW_SCRIPT is not set
 CONFIG_FEATURE_INSTALLER=y
@@ -36,7 +36,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 # CONFIG_FEATURE_CLEAN_UP is not set
 CONFIG_FEATURE_SYSLOG_INFO=y
 CONFIG_FEATURE_SYSLOG=y
-CONFIG_PLATFORM_LINUX=y
 
 #
 # Build Options
@@ -54,7 +53,8 @@ CONFIG_EXTRA_CFLAGS=""
 CONFIG_EXTRA_LDFLAGS=""
 CONFIG_EXTRA_LDLIBS=""
 # CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_STACK_OPTIMIZATION_386=y
+# CONFIG_STACK_OPTIMIZATION_386 is not set
+# CONFIG_STATIC_LIBGCC is not set
 
 #
 # Installation Options ("make install" behavior)
@@ -76,6 +76,7 @@ CONFIG_PREFIX="./_install"
 # CONFIG_DEBUG_SANITIZE is not set
 # CONFIG_UNIT_TEST is not set
 # CONFIG_WERROR is not set
+# CONFIG_WARN_SIMPLE_MSG is not set
 CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
@@ -91,11 +92,17 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SMALL=1
-CONFIG_SHA3_SMALL=1
-# CONFIG_FEATURE_FAST_TOP is not set
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-# CONFIG_FEATURE_ETC_SERVICES is not set
+CONFIG_MD5_SMALL=0
+CONFIG_SHA1_SMALL=0
+# CONFIG_SHA1_HWACCEL is not set
+# CONFIG_SHA256_HWACCEL is not set
+CONFIG_SHA3_SMALL=0
+# CONFIG_FEATURE_NON_POSIX_CP is not set
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+# CONFIG_FEATURE_USE_SENDFILE is not set
+CONFIG_FEATURE_COPYBUF_KB=4
+# CONFIG_MONOTONIC_SYSCALL is not set
+# CONFIG_IOCTL_HEX2STR_ERROR is not set
 # CONFIG_FEATURE_EDITING is not set
 CONFIG_FEATURE_EDITING_MAX_LEN=0
 # CONFIG_FEATURE_EDITING_VI is not set
@@ -119,14 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=0
 # CONFIG_UNICODE_BIDI_SUPPORT is not set
 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
 # CONFIG_UNICODE_PRESERVE_BROKEN is not set
-# CONFIG_FEATURE_NON_POSIX_CP is not set
-# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
-# CONFIG_FEATURE_USE_SENDFILE is not set
-CONFIG_FEATURE_COPYBUF_KB=4
-# CONFIG_FEATURE_SKIP_ROOTFS is not set
-# CONFIG_MONOTONIC_SYSCALL is not set
-# CONFIG_IOCTL_HEX2STR_ERROR is not set
-# CONFIG_FEATURE_HWIB is not set
+# CONFIG_LOOP_CONFIGURE is not set
+# CONFIG_NO_LOOP_CONFIGURE is not set
+CONFIG_TRY_LOOP_CONFIGURE=y
 
 #
 # Applets
@@ -161,6 +163,8 @@ CONFIG_BZIP2_SMALL=0
 # CONFIG_CPIO is not set
 # CONFIG_FEATURE_CPIO_O is not set
 # CONFIG_FEATURE_CPIO_P is not set
+# CONFIG_FEATURE_CPIO_IGNORE_DEVNO is not set
+# CONFIG_FEATURE_CPIO_RENUMBER_INODES is not set
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 # CONFIG_GZIP is not set
@@ -196,6 +200,14 @@ CONFIG_GZIP_FAST=0
 #
 # Coreutils
 #
+# CONFIG_FEATURE_VERBOSE is not set
+
+#
+# Common options for date and touch
+#
+# CONFIG_FEATURE_TIMEZONE is not set
+# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
+# CONFIG_FEATURE_HUMAN_READABLE is not set
 # CONFIG_BASENAME is not set
 # CONFIG_CAT is not set
 # CONFIG_FEATURE_CATN is not set
@@ -206,11 +218,13 @@ CONFIG_GZIP_FAST=0
 # CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
 # CONFIG_CHROOT is not set
 # CONFIG_CKSUM is not set
+# CONFIG_CRC32 is not set
 # CONFIG_COMM is not set
 # CONFIG_CP is not set
 # CONFIG_FEATURE_CP_LONG_OPTIONS is not set
 # CONFIG_FEATURE_CP_REFLINK is not set
 # CONFIG_CUT is not set
+# CONFIG_FEATURE_CUT_REGEX is not set
 # CONFIG_DATE is not set
 # CONFIG_FEATURE_DATE_ISOFMT is not set
 # CONFIG_FEATURE_DATE_NANO is not set
@@ -222,6 +236,7 @@ CONFIG_GZIP_FAST=0
 # CONFIG_FEATURE_DD_STATUS is not set
 # CONFIG_DF is not set
 # CONFIG_FEATURE_DF_FANCY is not set
+# CONFIG_FEATURE_SKIP_ROOTFS is not set
 # CONFIG_DIRNAME is not set
 # CONFIG_DOS2UNIX is not set
 # CONFIG_UNIX2DOS is not set
@@ -311,13 +326,13 @@ CONFIG_GZIP_FAST=0
 # CONFIG_FEATURE_TEST_64 is not set
 # CONFIG_TIMEOUT is not set
 # CONFIG_TOUCH is not set
-# CONFIG_FEATURE_TOUCH_NODEREF is not set
 # CONFIG_FEATURE_TOUCH_SUSV3 is not set
 # CONFIG_TR is not set
 # CONFIG_FEATURE_TR_CLASSES is not set
 # CONFIG_FEATURE_TR_EQUIV is not set
 # CONFIG_TRUE is not set
 # CONFIG_TRUNCATE is not set
+# CONFIG_TSORT is not set
 # CONFIG_TTY is not set
 # CONFIG_UNAME is not set
 CONFIG_UNAME_OSNAME=""
@@ -326,6 +341,7 @@ CONFIG_BB_ARCH=y
 # CONFIG_UNLINK is not set
 # CONFIG_USLEEP is not set
 # CONFIG_UUDECODE is not set
+# CONFIG_BASE32 is not set
 # CONFIG_BASE64 is not set
 # CONFIG_UUENCODE is not set
 # CONFIG_WC is not set
@@ -337,13 +353,6 @@ CONFIG_BB_ARCH=y
 # CONFIG_YES is not set
 
 #
-# Common options
-#
-# CONFIG_FEATURE_VERBOSE is not set
-# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
-# CONFIG_FEATURE_HUMAN_READABLE is not set
-
-#
 # Console Utilities
 #
 # CONFIG_CHVT is not set
@@ -406,6 +415,7 @@ CONFIG_DEFAULT_SETFONT_DIR=""
 CONFIG_FEATURE_VI_MAX_LEN=0
 # CONFIG_FEATURE_VI_8BIT is not set
 # CONFIG_FEATURE_VI_COLON is not set
+# CONFIG_FEATURE_VI_COLON_EXPAND is not set
 # CONFIG_FEATURE_VI_YANKMARK is not set
 # CONFIG_FEATURE_VI_SEARCH is not set
 # CONFIG_FEATURE_VI_REGEX_SEARCH is not set
@@ -419,6 +429,7 @@ CONFIG_FEATURE_VI_MAX_LEN=0
 # CONFIG_FEATURE_VI_UNDO is not set
 # CONFIG_FEATURE_VI_UNDO_QUEUE is not set
 CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0
+# CONFIG_FEATURE_VI_VERBOSE_STATUS is not set
 # CONFIG_FEATURE_ALLOW_EXEC is not set
 
 #
@@ -427,7 +438,11 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0
 # CONFIG_FIND is not set
 # CONFIG_FEATURE_FIND_PRINT0 is not set
 # CONFIG_FEATURE_FIND_MTIME is not set
+# CONFIG_FEATURE_FIND_ATIME is not set
+# CONFIG_FEATURE_FIND_CTIME is not set
 # CONFIG_FEATURE_FIND_MMIN is not set
+# CONFIG_FEATURE_FIND_AMIN is not set
+# CONFIG_FEATURE_FIND_CMIN is not set
 # CONFIG_FEATURE_FIND_PERM is not set
 # CONFIG_FEATURE_FIND_TYPE is not set
 # CONFIG_FEATURE_FIND_EXECUTABLE is not set
@@ -435,6 +450,7 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0
 # CONFIG_FEATURE_FIND_MAXDEPTH is not set
 # CONFIG_FEATURE_FIND_NEWER is not set
 # CONFIG_FEATURE_FIND_INUM is not set
+# CONFIG_FEATURE_FIND_SAMEFILE is not set
 # CONFIG_FEATURE_FIND_EXEC is not set
 # CONFIG_FEATURE_FIND_EXEC_PLUS is not set
 # CONFIG_FEATURE_FIND_USER is not set
@@ -446,6 +462,7 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0
 # CONFIG_FEATURE_FIND_PRUNE is not set
 # CONFIG_FEATURE_FIND_QUIT is not set
 # CONFIG_FEATURE_FIND_DELETE is not set
+# CONFIG_FEATURE_FIND_EMPTY is not set
 # CONFIG_FEATURE_FIND_PATH is not set
 # CONFIG_FEATURE_FIND_REGEX is not set
 # CONFIG_FEATURE_FIND_CONTEXT is not set
@@ -606,7 +623,6 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
 # CONFIG_GETOPT is not set
 # CONFIG_FEATURE_GETOPT_LONG is not set
 # CONFIG_HEXDUMP is not set
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
 # CONFIG_HD is not set
 # CONFIG_XXD is not set
 # CONFIG_HWCLOCK is not set
@@ -677,6 +693,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
 # CONFIG_SWITCH_ROOT is not set
 # CONFIG_TASKSET is not set
 # CONFIG_FEATURE_TASKSET_FANCY is not set
+# CONFIG_FEATURE_TASKSET_CPULIST is not set
 # CONFIG_UEVENT is not set
 # CONFIG_UMOUNT is not set
 # CONFIG_FEATURE_UMOUNT_ALL is not set
@@ -689,6 +706,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
 # CONFIG_FEATURE_VOLUMEID_BCACHE is not set
 # CONFIG_FEATURE_VOLUMEID_BTRFS is not set
 # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_EROFS is not set
 # CONFIG_FEATURE_VOLUMEID_EXFAT is not set
 # CONFIG_FEATURE_VOLUMEID_EXT is not set
 # CONFIG_FEATURE_VOLUMEID_F2FS is not set
@@ -716,6 +734,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
 # Miscellaneous Utilities
 #
 # CONFIG_ADJTIMEX is not set
+# CONFIG_ASCII is not set
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
 # CONFIG_BC is not set
@@ -735,7 +754,7 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0
 # CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
 # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
 # CONFIG_FEATURE_CHAT_CLR_ABORT is not set
-# CONFIG_CONSPY is not set
+CONFIG_CONSPY=y
 # CONFIG_CROND is not set
 # CONFIG_FEATURE_CROND_D is not set
 # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
@@ -786,6 +805,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
 # CONFIG_MAN is not set
 # CONFIG_MICROCOM is not set
+# CONFIG_MIM is not set
 # CONFIG_MT is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
@@ -795,10 +815,12 @@ CONFIG_READAHEAD=y
 # CONFIG_RFKILL is not set
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
+# CONFIG_SEEDRNG is not set
 # CONFIG_SETFATTR is not set
 # CONFIG_SETSERIAL is not set
 # CONFIG_STRINGS is not set
 # CONFIG_TIME is not set
+# CONFIG_TREE is not set
 # CONFIG_TS is not set
 # CONFIG_TTYSIZE is not set
 # CONFIG_UBIATTACH is not set
@@ -810,6 +832,7 @@ CONFIG_READAHEAD=y
 # CONFIG_UBIRENAME is not set
 # CONFIG_VOLNAME is not set
 # CONFIG_WATCHDOG is not set
+# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set
 
 #
 # Networking Utilities
@@ -818,6 +841,9 @@ CONFIG_FEATURE_IPV6=y
 CONFIG_FEATURE_UNIX_LOCAL=y
 CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
 CONFIG_VERBOSE_RESOLUTION_ERRORS=y
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+# CONFIG_FEATURE_ETC_SERVICES is not set
+# CONFIG_FEATURE_HWIB is not set
 # CONFIG_FEATURE_TLS_SHA1 is not set
 # CONFIG_ARP is not set
 # CONFIG_ARPING is not set
@@ -836,6 +862,7 @@ CONFIG_FTPPUT=y
 # CONFIG_HOSTNAME is not set
 # CONFIG_DNSDOMAINNAME is not set
 CONFIG_HTTPD=y
+CONFIG_FEATURE_HTTPD_PORT_DEFAULT=80
 CONFIG_FEATURE_HTTPD_RANGES=y
 CONFIG_FEATURE_HTTPD_SETUID=y
 CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
@@ -847,6 +874,10 @@ CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
 CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
 CONFIG_FEATURE_HTTPD_PROXY=y
 CONFIG_FEATURE_HTTPD_GZIP=y
+CONFIG_FEATURE_HTTPD_ETAG=y
+CONFIG_FEATURE_HTTPD_LAST_MODIFIED=y
+CONFIG_FEATURE_HTTPD_DATE=y
+CONFIG_FEATURE_HTTPD_ACL_IP=y
 # CONFIG_IFCONFIG is not set
 # CONFIG_FEATURE_IFCONFIG_STATUS is not set
 # CONFIG_FEATURE_IFCONFIG_SLIP is not set
@@ -916,7 +947,7 @@ CONFIG_FAKEIDENTD=y
 # CONFIG_SSL_CLIENT is not set
 # CONFIG_TC is not set
 # CONFIG_FEATURE_TC_INGRESS is not set
-# CONFIG_TCPSVD is not set
+CONFIG_TCPSVD=y
 # CONFIG_UDPSVD is not set
 CONFIG_TELNET=y
 CONFIG_FEATURE_TELNET_TTYPE=y
@@ -924,6 +955,7 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y
 CONFIG_FEATURE_TELNET_WIDTH=y
 CONFIG_TELNETD=y
 CONFIG_FEATURE_TELNETD_STANDALONE=y
+CONFIG_FEATURE_TELNETD_PORT_DEFAULT=23
 CONFIG_FEATURE_TELNETD_INETD_WAIT=y
 CONFIG_TFTP=y
 CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
@@ -944,6 +976,7 @@ CONFIG_FEATURE_TFTP_BLOCKSIZE=y
 # CONFIG_WGET is not set
 # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
 # CONFIG_FEATURE_WGET_STATUSBAR is not set
+# CONFIG_FEATURE_WGET_FTP is not set
 # CONFIG_FEATURE_WGET_AUTHENTICATION is not set
 # CONFIG_FEATURE_WGET_TIMEOUT is not set
 # CONFIG_FEATURE_WGET_HTTPS is not set
@@ -954,12 +987,13 @@ CONFIG_UDHCPD=y
 CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y
 CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
 CONFIG_DHCPD_LEASES_FILE="/var/lib/udhcpd/udhcpd.leases"
-# CONFIG_DUMPLEASES is not set
+CONFIG_DUMPLEASES=y
 # CONFIG_DHCPRELAY is not set
 # CONFIG_UDHCPC is not set
 # CONFIG_FEATURE_UDHCPC_ARPING is not set
 # CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
 CONFIG_UDHCPC_DEFAULT_SCRIPT=""
+CONFIG_UDHCPC6_DEFAULT_SCRIPT=""
 # CONFIG_UDHCPC6 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
@@ -969,6 +1003,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 #
 # Common options for DHCP applets
 #
+CONFIG_UDHCPC_DEFAULT_INTERFACE=""
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
@@ -986,17 +1021,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
 #
 # Mail Utilities
 #
+CONFIG_FEATURE_MIME_CHARSET=""
 # CONFIG_MAKEMIME is not set
 # CONFIG_POPMAILDIR is not set
 # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
 # CONFIG_REFORMIME is not set
 # CONFIG_FEATURE_REFORMIME_COMPAT is not set
 # CONFIG_SENDMAIL is not set
-CONFIG_FEATURE_MIME_CHARSET=""
 
 #
 # Process Utilities
 #
+# CONFIG_FEATURE_FAST_TOP is not set
+# CONFIG_FEATURE_SHOW_THREADS is not set
 # CONFIG_FREE is not set
 # CONFIG_FUSER is not set
 # CONFIG_IOSTAT is not set
@@ -1035,7 +1072,6 @@ CONFIG_FEATURE_MIME_CHARSET=""
 # CONFIG_UPTIME is not set
 # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
 # CONFIG_WATCH is not set
-# CONFIG_FEATURE_SHOW_THREADS is not set
 
 #
 # Runit Utilities
@@ -1076,6 +1112,7 @@ CONFIG_SH_IS_NONE=y
 # CONFIG_BASH_IS_ASH is not set
 # CONFIG_BASH_IS_HUSH is not set
 CONFIG_BASH_IS_NONE=y
+# CONFIG_SHELL_ASH is not set
 # CONFIG_ASH is not set
 # CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_ASH_INTERNAL_GLOB is not set
@@ -1091,15 +1128,18 @@ CONFIG_BASH_IS_NONE=y
 # CONFIG_ASH_ECHO is not set
 # CONFIG_ASH_PRINTF is not set
 # CONFIG_ASH_TEST is not set
+# CONFIG_ASH_SLEEP is not set
 # CONFIG_ASH_HELP is not set
 # CONFIG_ASH_GETOPTS is not set
 # CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_VERSION_VAR is not set
 # CONFIG_CTTYHACK is not set
 # CONFIG_HUSH is not set
+# CONFIG_SHELL_HUSH is not set
 # CONFIG_HUSH_BASH_COMPAT is not set
 # CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_LINENO_VAR is not set
 # CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
+# CONFIG_HUSH_LINENO_VAR is not set
 # CONFIG_HUSH_INTERACTIVE is not set
 # CONFIG_HUSH_SAVEHISTORY is not set
 # CONFIG_HUSH_JOB is not set
@@ -1158,6 +1198,7 @@ CONFIG_BASH_IS_NONE=y
 # CONFIG_FEATURE_REMOTE_LOG is not set
 # CONFIG_FEATURE_SYSLOGD_DUP is not set
 # CONFIG_FEATURE_SYSLOGD_CFG is not set
+# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
 # CONFIG_FEATURE_IPC_SYSLOG is not set
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
diff --git a/main/busybox-initscripts/crond.confd b/main/busybox/crond.confd
index 542af1ed1d7..542af1ed1d7 100644
--- a/main/busybox-initscripts/crond.confd
+++ b/main/busybox/crond.confd
diff --git a/main/busybox/crond.initd b/main/busybox/crond.initd
new file mode 100644
index 00000000000..992037210b6
--- /dev/null
+++ b/main/busybox/crond.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+
+name="busybox $RC_SVCNAME"
+command="/usr/sbin/$SVCNAME"
+pidfile="/run/$RC_SVCNAME.pid"
+command_args="$CRON_OPTS -f"
+command_background=true
+
+depend() {
+	need localmount
+	need logger
+}
diff --git a/main/busybox/dad.if-up b/main/busybox/dad.if-up
index 98841da7c0c..7903822c8fd 100644
--- a/main/busybox/dad.if-up
+++ b/main/busybox/dad.if-up
@@ -4,9 +4,13 @@
 # Copyright (c) 2016-2018 Kaarle Ritvanen
 
 has_flag() {
-	ip address show dev $IFACE | grep -q " $1 "
+	ip address show dev $IFACE up | grep -q " $1 "
 }
 
-while has_flag tentative && ! has_flag dadfailed; do
+counter=100
+while [ "$counter" -gt 0 ] &&
+	has_flag tentative &&
+	! has_flag dadfailed; do
 	sleep 0.2
+	counter=$((counter - 1))
 done
diff --git a/main/busybox/default.script b/main/busybox/default.script
index 8c786f8740b..fd66e830c62 100644
--- a/main/busybox/default.script
+++ b/main/busybox/default.script
@@ -16,6 +16,7 @@ export interface
 export ip
 export mask
 export metric
+export staticroutes
 export router
 export subnet
 
@@ -56,35 +57,54 @@ calc_metric() {
 	echo $(( $base + $(if_index) ))
 }
 
+route_add() {
+	local to=$1 gw=$2 num=$3
+	# special case for /32 subnets:
+	# /32 instructs kernel to always use routing for all outgoing packets
+	# (they can never be sent to local subnet - there is no local subnet for /32).
+	# Used in datacenters, avoids the need for private ip-addresses between two hops.
+	if [ "$subnet" = "255.255.255.255" ]; then
+		ip -4 route add $gw dev $interface
+	fi
+	ip -4 route add $to via $gw dev $interface \
+		metric $(( $num + ${IF_METRIC:-$(calc_metric)} ))
+}
+
 routes() {
-	[ -z "$router" ] && return
+	[ -z "$router" ] && [ -z "$staticroutes" ] && return
 	for i in $NO_GATEWAY; do
 		[ "$i" = "$interface" ] && return
 	done
-	local gw= num=
 	while ip -4 route del default via dev $interface 2>/dev/null; do
 		:
 	done
-	num=0
-	for gw in $router; do
-		if [ "$subnet" = "255.255.255.255" ]; then
-		# special case for /32 subnets:
-		# /32 instructs kernel to always use routing for all outgoing packets
-		# (they can never be sent to local subnet - there is no local subnet for /32).
-		# Used in datacenters, avoids the need for private ip-addresses between two hops.
-			ip -4 route add $gw dev $interface
-		fi
-		ip -4 route add 0.0.0.0/0 via $gw dev $interface \
-			metric $(( $num + ${IF_METRIC:-$(calc_metric)} ))
-		num=$(( $num + 1 ))
-	done
+	local num=0
+	# RFC3442:
+	# If the DHCP server returns both a Classless Static Routes option
+	# and a Router option, the DHCP client MUST ignore the Router option.
+	if [ -n "$staticroutes" ]; then
+		# static routes format: dest1/mask gw1 ... destn/mask gwn
+		set -- $staticroutes
+		while [ -n "$1" ] && [ -n "$2" ]; do
+			local dest="$1" gw="$2"
+			if [ "$gw" != "0.0.0.0" ]; then
+				route_add $dest $gw $num && num=$(( $num + 1))
+			fi
+			shift 2
+		done
+	else
+		local gw=
+		for gw in $router; do
+			route_add 0.0.0.0/0 $gw $num && num=$(( $num + 1 ))
+		done
+	fi
 }
 
 resolvconf() {
 	local i
 	[ -n "$IF_PEER_DNS" ] && [ "$IF_PEER_DNS" != "yes" ] && return
 	if [ "$RESOLV_CONF" = "no" ] || [ "$RESOLV_CONF" = "NO" ] \
-			|| [ -z "$RESOLV_CONF" ]; then
+			|| [ -z "$RESOLV_CONF" ] || [ -z "$dns" ]; then
 		return
 	fi
 	for i in $NO_DNS; do
@@ -100,7 +120,7 @@ resolvconf() {
 		echo "nameserver $i" >> "$RESOLV_CONF.$$"
 	done
 	chmod a+r "$RESOLV_CONF.$$"
-	mv "$RESOLV_CONF.$$" "$RESOLV_CONF"
+	mv -f "$RESOLV_CONF.$$" "$RESOLV_CONF"
 }
 
 bound() {
diff --git a/main/busybox/dnsd.initd b/main/busybox/dnsd.initd
new file mode 100644
index 00000000000..42e4a34c13a
--- /dev/null
+++ b/main/busybox/dnsd.initd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+
+name="busybox $RC_SVCNAME"
+command="/usr/sbin/$RC_SVCNAME"
+command_args="$DNSD_OPTS"
+pidfile="/run/$SVCNAME.pid"
+command_background=true
+
+depend() {
+	need net
+	after firewall
+}
+
diff --git a/main/busybox/httpd.initd b/main/busybox/httpd.initd
new file mode 100644
index 00000000000..bf957305213
--- /dev/null
+++ b/main/busybox/httpd.initd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+
+name="busybox $SVCNAME"
+command="/usr/sbin/$SVCNAME"
+command_args="$HTTPD_OPTS -f"
+pidfile="/run/$RC_SVCNAME.pid"
+command_background=true
+
+depend() {
+	need net localmount
+	after firewall
+}
+
diff --git a/main/busybox/inetd.initd b/main/busybox/inetd.initd
new file mode 100644
index 00000000000..5ef7b395ff9
--- /dev/null
+++ b/main/busybox/inetd.initd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+
+name="busybox $RC_SVCNAME"
+command="/usr/sbin/$RC_SVCNAME"
+command_args="-f $INETD_OPTS"
+pidfile="/run/$RC_SVCNAME.pid"
+command_background=true
+
+depend() {
+	need net localmount
+	after firewall
+}
+
diff --git a/main/busybox-initscripts/klogd.confd b/main/busybox/klogd.confd
index 100deedaac5..100deedaac5 100644
--- a/main/busybox-initscripts/klogd.confd
+++ b/main/busybox/klogd.confd
diff --git a/main/busybox/klogd.initd b/main/busybox/klogd.initd
new file mode 100644
index 00000000000..274b7d96913
--- /dev/null
+++ b/main/busybox/klogd.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+
+name="busybox klogd"
+command="/sbin/klogd"
+command_args="${KLOGD_OPTS} -n"
+command_user="klogd"
+pidfile="/run/klogd.pid"
+command_background=true
+capabilities="^cap_syslog"
+
+depend() {
+	need clock hostname localmount logger
+	before net
+	keyword -vserver -lxc
+}
diff --git a/main/busybox-initscripts/loadkmap.confd b/main/busybox/loadkmap.confd
index 2bdbc0608c2..2bdbc0608c2 100644
--- a/main/busybox-initscripts/loadkmap.confd
+++ b/main/busybox/loadkmap.confd
diff --git a/main/busybox-initscripts/loadkmap.initd b/main/busybox/loadkmap.initd
index 7149dd729e0..7149dd729e0 100644
--- a/main/busybox-initscripts/loadkmap.initd
+++ b/main/busybox/loadkmap.initd
diff --git a/main/busybox/mdev.initd b/main/busybox/mdev.initd
new file mode 100644
index 00000000000..630d83777d6
--- /dev/null
+++ b/main/busybox/mdev.initd
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+
+description="the mdev device manager"
+
+depend() {
+	provide dev
+	need sysfs dev-mount
+	before checkfs fsck
+	keyword -containers -vserver -lxc
+}
+
+_start_service () {
+	ebegin "Starting busybox mdev"
+	mkdir -p /dev
+	echo "/sbin/mdev" > /proc/sys/kernel/hotplug
+	eend $?
+}
+
+_start_coldplug () {
+	ebegin "Scanning hardware for mdev"
+	# mdev -s will not create /dev/usb[1-9] devices with recent kernels
+	# so we manually trigger events for usb
+	for i in $(find /sys/devices -name 'usb[0-9]*'); do
+		[ -e $i/uevent ] && echo add > $i/uevent
+	done
+	# trigger the rest of the coldplug
+	mdev -s
+	eend $?
+}
+
+start() {
+	_start_service
+	_start_coldplug
+}
+
+stop() {
+	ebegin "Stopping busybox mdev"
+	echo > /proc/sys/kernel/hotplug
+	eend 
+}
diff --git a/main/busybox/nslookup.patch b/main/busybox/nslookup.patch
deleted file mode 100644
index 79498f91719..00000000000
--- a/main/busybox/nslookup.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From adf24e909cda1ae30767d8ca4902eac92781d932 Mon Sep 17 00:00:00 2001
-From: Jo-Philipp Wich <jo@mein.io>
-Date: Thu, 27 Jun 2019 17:27:28 +0200
-Subject: [PATCH 1/2] nslookup: handle replies without RRs
-
-Under some circumstances, a DNS reply might contain no resource records,
-e.g. when a valid domain is queried that does not have records of the
-requested type.
-
-Example with nslookup from BIND dnsutils:
-
-    $ nslookup -q=SRV example.org
-    Server:	10.11.12.13
-    Address:	10.11.12.13#53
-
-    Non-authoritative answer:
-    *** Can't find example.org: No answer
-
-Currently the busybox nslookup applet simply prints nothing after the
-"Non-authoritative answer:" line in the same situation.
-
-This change modifies nslookup to either print "Parse error" or "No answer"
-diagnostics, depending on the parse_reply() return value.
-
-function                                             old     new   delta
-send_queries                                        1676    1711     +35
-
-Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-(cherry picked from commit 8c3b520d4f937b1d1856898dec5f634b12d9cc36)
----
- networking/nslookup.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/networking/nslookup.c b/networking/nslookup.c
-index 24e09d4f0..f7fd1d377 100644
---- a/networking/nslookup.c
-+++ b/networking/nslookup.c
-@@ -615,9 +615,15 @@ static int send_queries(struct ns *ns)
- 					G.query[qn].name, rcodes[rcode]);
- 			G.exitcode = EXIT_FAILURE;
- 		} else {
--			if (parse_reply(reply, recvlen) < 0) {
-+			switch (parse_reply(reply, recvlen)) {
-+			case -1:
- 				printf("*** Can't find %s: Parse error\n", G.query[qn].name);
- 				G.exitcode = EXIT_FAILURE;
-+				break;
-+
-+			case 0:
-+				printf("*** Can't find %s: No answer\n", G.query[qn].name);
-+				break;
- 			}
- 		}
- 		bb_putchar('\n');
--- 
-2.25.0
-
-
-From 1fc999c00aa6649f17f0879b960427313dac64ae Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 4 Feb 2020 11:04:37 +0000
-Subject: [PATCH 2/2] nslookup: fix exitcode with search domains, closes 12541
-
-Return success if there are any valid answer rather than exit with error.
-
-bloatcheck on x86_64:
-
-function                                             old     new   delta
-nslookup_main                                        917     924      +7
-send_queries                                        2115    2121      +6
-.rodata                                           136606  136609      +3
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 3/0 up/down: 16/0)               Total: 16
-bytes
-   text    data     bss     dec     hex filename
- 839394   14660    2080  856134   d1046 busybox_old
- 839410   14660    2080  856150   d1056 busybox_unstripped
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- networking/nslookup.c | 34 ++++++++++++++++++----------------
- 1 file changed, 18 insertions(+), 16 deletions(-)
-
-diff --git a/networking/nslookup.c b/networking/nslookup.c
-index f7fd1d377..d66b13039 100644
---- a/networking/nslookup.c
-+++ b/networking/nslookup.c
-@@ -265,7 +265,7 @@ struct query {
- 	const char *name;
- 	unsigned qlen;
- //	unsigned latency;
--//	uint8_t rcode;
-+	uint8_t rcode;
- 	unsigned char query[512];
- //	unsigned char reply[512];
- };
-@@ -320,7 +320,7 @@ struct globals {
- 	struct query *query;
- 	char *search;
- 	smalluint have_search_directive;
--	smalluint exitcode;
-+	smallint answer;
- } FIX_ALIASING;
- #define G (*(struct globals*)bb_common_bufsiz1)
- #define INIT_G() do { \
-@@ -605,28 +605,31 @@ static int send_queries(struct ns *ns)
- 
- 		/* Process reply */
- 		G.query[qn].qlen = 0; /* flag: "reply received" */
-+		G.query[qn].rcode = rcode;
- 		tcur = monotonic_ms();
- #if 1
- 		if (option_mask32 & OPT_debug) {
- 			printf("Query #%d completed in %ums:\n", qn, tcur - tstart);
- 		}
- 		if (rcode != 0) {
--			printf("** server can't find %s: %s\n",
--					G.query[qn].name, rcodes[rcode]);
--			G.exitcode = EXIT_FAILURE;
-+			printf("** server can't find %s: %s\n\n",
-+				G.query[qn].name, rcodes[rcode]);
- 		} else {
- 			switch (parse_reply(reply, recvlen)) {
- 			case -1:
--				printf("*** Can't find %s: Parse error\n", G.query[qn].name);
--				G.exitcode = EXIT_FAILURE;
-+				printf("*** Can't find %s: Parse error\n\n", G.query[qn].name);
-+				G.query[qn].rcode = 0x10;
- 				break;
- 
- 			case 0:
--				printf("*** Can't find %s: No answer\n", G.query[qn].name);
-+				G.query[qn].rcode = 0x20;
-+				break;
-+			default:
-+				bb_putchar('\n');
-+				G.answer++;
- 				break;
- 			}
- 		}
--		bb_putchar('\n');
- 		n_replies++;
- 		if (n_replies >= G.query_count)
- 			goto ret;
-@@ -984,21 +987,20 @@ int nslookup_main(int argc UNUSED_PARAM, char **argv)
- 	}
- 
- 	err = 0;
--	for (rc = 0; rc < G.query_count; rc++) {
--		if (G.query[rc].qlen) {
--			printf("*** Can't find %s: No answer\n", G.query[rc].name);
--			err = 1;
-+	for (rc = 0; !G.answer && rc < G.query_count; rc++) {
-+		if (G.query[rc].qlen || G.query[rc].rcode == 0x20) {
-+			printf("*** Can't find %s: No answer\n\n", G.query[rc].name);
-+		} else if (G.query[rc].rcode != 0) {
-+			err = EXIT_FAILURE;
- 		}
- 	}
--	if (err) /* should this affect exicode too? */
--		bb_putchar('\n');
- 
- 	if (ENABLE_FEATURE_CLEAN_UP) {
- 		free(G.server);
- 		free(G.query);
- 	}
- 
--	return G.exitcode;
-+	return err;
- }
- 
- #endif
--- 
-2.25.0
-
diff --git a/main/busybox-initscripts/ntpd.confd b/main/busybox/ntpd.confd
index c5b4c1c1d43..c5b4c1c1d43 100644
--- a/main/busybox-initscripts/ntpd.confd
+++ b/main/busybox/ntpd.confd
diff --git a/main/busybox/ntpd.initd b/main/busybox/ntpd.initd
new file mode 100644
index 00000000000..9850b48800e
--- /dev/null
+++ b/main/busybox/ntpd.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+
+name="busybox $RC_SVCNAME"
+command="/usr/sbin/$RC_SVCNAME"
+command_args="${NTPD_OPTS:--N -p pool.ntp.org} -n"
+command_user="ntp"
+pidfile="/run/$SVCNAME.pid"
+command_background=true
+capabilities="^cap_sys_time"
+
+depend() {
+	need net
+	provide ntp-client
+	use dns
+}
diff --git a/main/busybox/rdate.confd b/main/busybox/rdate.confd
new file mode 100644
index 00000000000..03eadfdb1fb
--- /dev/null
+++ b/main/busybox/rdate.confd
@@ -0,0 +1,2 @@
+# Set the ntp server here
+NTP_HOST=pool.ntp.org
diff --git a/main/busybox-initscripts/rdate.initd b/main/busybox/rdate.initd
index 708429f17bb..708429f17bb 100644
--- a/main/busybox-initscripts/rdate.initd
+++ b/main/busybox/rdate.initd
diff --git a/main/busybox/ssl_client.c b/main/busybox/ssl_client.c
index df7b5f9bfbf..1be9e585b3b 100644
--- a/main/busybox/ssl_client.c
+++ b/main/busybox/ssl_client.c
@@ -5,7 +5,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <tls.h>
+#include <openssl/err.h>
+#include <openssl/ssl.h>
+#include <openssl/x509v3.h>
 
 #define BUFSIZE 16384
 
@@ -17,7 +19,13 @@
 # define dbg(...) ((void)0)
 #endif
 
-static void copy_from_stdin_to_tls(struct tls *ctx, int *fd)
+static void ssl_fatal(const char *msg)
+{
+	ERR_print_errors_fp(stderr);
+	errx(1, "%s", msg);
+}
+
+static void copy_from_stdin_to_tls(SSL *ssl, int *fd)
 {
 	static size_t buf[BUFSIZE];
 	ssize_t n;
@@ -34,17 +42,28 @@ static void copy_from_stdin_to_tls(struct tls *ctx, int *fd)
 	}
 
 	while (n > 0) {
-		ssize_t r = tls_write(ctx, &buf[i], n);
-		if (r == TLS_WANT_POLLIN || r == TLS_WANT_POLLOUT)
-			continue;
-		if (r < 0)
-			err(1, "tls_write: %s", tls_error(ctx));
+		ssize_t r = SSL_write(ssl, &buf[i], n);
+		if (r < 0) {
+			if (SSL_get_error(ssl, r) == SSL_ERROR_WANT_WRITE) {
+				ERR_clear_error();
+				continue;
+			}
+			ssl_fatal("SSL_write");
+		}
 		i += r;
 		n -= r;
 	}
 }
 
-static int copy_from_tls_to_stdout(struct tls *ctx)
+static int should_retry_read(SSL *ssl, int n)
+{
+	if (n >= 0 || SSL_get_error(ssl, n) != SSL_ERROR_WANT_READ)
+		return 0;
+	ERR_clear_error();
+	return 1;
+}
+
+static int copy_from_tls_to_stdout(SSL *ssl)
 {
 	static size_t buf[BUFSIZE];
 	ssize_t n,r;
@@ -52,10 +71,11 @@ static int copy_from_tls_to_stdout(struct tls *ctx)
 
 	dbg("DEBUG: data from TLS\n");
 	do {
-		n = tls_read(ctx, buf, sizeof(buf));
-	} while (n == TLS_WANT_POLLIN || r == TLS_WANT_POLLOUT);
+		n = SSL_read(ssl, buf, sizeof(buf));
+
+	} while (should_retry_read(ssl, n));
 	if (n < 0)
-		err(1, "tls read: %s", tls_error(ctx));
+		ssl_fatal("SSL_read");
 
 	if (n == 0)
 		return 1;
@@ -70,17 +90,15 @@ static int copy_from_tls_to_stdout(struct tls *ctx)
 	return 0;
 }
 
-int do_poll(struct pollfd *fds, int nfds)
+void do_poll(struct pollfd *fds, int nfds)
 {
-	int r;
-	while ((r = poll(fds, nfds, -1)) < 0) {
+	while (poll(fds, nfds, -1) < 0) {
 		if (errno != EINTR && errno != ENOMEM)
 			err(1, "poll");
 	}
-	return r;
 }
 
-static void copy_loop(struct tls *ctx, int sfd, int eofexit)
+static void copy_loop(SSL *ssl, int sfd)
 {
 	struct pollfd fds[2] = {
 		{ .fd = STDIN_FILENO,	.events = POLLIN },
@@ -88,20 +106,18 @@ static void copy_loop(struct tls *ctx, int sfd, int eofexit)
 	};
 
 	while (1) {
-		int r = do_poll(fds, 2);
+		do_poll(fds, 2);
 		if (fds[0].revents) {
-			copy_from_stdin_to_tls(ctx, &fds[0].fd);
-			if (eofexit && fds[0].fd == -1)
-				break;
+			copy_from_stdin_to_tls(ssl, &fds[0].fd);
 		}
 
-		if (fds[1].revents && copy_from_tls_to_stdout(ctx))
+		if (fds[1].revents && copy_from_tls_to_stdout(ssl))
 			break;
 	}
 }
 
 void usage(const char *prog, int ret) {
-	printf("usage: %s [-s FD] [-I] [-e] -n SNI\n", prog);
+	printf("usage: %s [-s FD] [-I] -n SNI\n", prog);
 	exit(ret);
 }
 
@@ -109,16 +125,12 @@ int main(int argc, char *argv[])
 {
 	int c, sfd = 1;;
 	const char *sni = NULL;
-	struct tls_config *tc;
-	struct tls *ctx;
 	int insecure = 0;
-	int localeofexit = 0;
+	SSL_CTX *ctx;
+	SSL *ssl = NULL;
 
-	while ((c = getopt(argc, argv, "ehs:n:I")) != -1) {
+	while ((c = getopt(argc, argv, "hs:n:I")) != -1) {
 		switch (c) {
-		case 'e':
-			localeofexit = 1;
-			break;
 		case 'h':
 			usage(argv[0], 0);
 			break;
@@ -136,30 +148,36 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	if (tls_init() == -1)
-		errx(1, "tls_init() failed");
-
-	if ((ctx = tls_client()) == NULL)
-		errx(1, "tls_client() failed");
-
-	if (insecure) {
-		if ((tc = tls_config_new()) == NULL)
-			errx(1, "tls_config_new() failed");
-		tls_config_insecure_noverifycert(tc);
-		tls_config_insecure_noverifyname(tc);
-		tls_config_insecure_noverifytime(tc);
-		if (tls_configure(ctx, tc) == -1)
-			err(1, "tls_configure: %s", tls_error(ctx));
-		tls_config_free(tc);
+	OPENSSL_init_ssl(0, NULL);
+
+	if ((ctx = SSL_CTX_new(TLS_client_method())) == NULL)
+		ssl_fatal("SSL_CTX_new");
+
+	SSL_CTX_set_default_verify_paths(ctx);
+
+	if ((ssl = SSL_new(ctx)) == NULL)
+		ssl_fatal("SSL_new");
+
+	SSL_set_fd(ssl, sfd);
+	SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY);
+	SSL_set_hostflags(ssl, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
+
+	if (SSL_set_tlsext_host_name(ssl, sni) != 1)
+		ssl_fatal("SSL_set_tlsext_host_name");
+
+	if (SSL_set1_host(ssl, sni) != 1)
+		ssl_fatal(sni);
+
+	if (!insecure) {
+		SSL_set_verify(ssl, SSL_VERIFY_PEER, NULL);
 	}
 
-	if (tls_connect_fds(ctx, sfd, sfd, sni) == -1)
-		errx(1, "%s: TLS connect failed", sni);
+	ERR_clear_error();
+	if (SSL_connect(ssl) != 1)
+		ssl_fatal("SSL_connect");
 
-	if (tls_handshake(ctx) == -1)
-		errx(1, "%s: %s", sni, tls_error(ctx));
+	copy_loop(ssl, sfd);
 
-	copy_loop(ctx, sfd, localeofexit);
-	tls_close(ctx);
+	SSL_CTX_free(ctx);
 	return 0;
 }
diff --git a/main/busybox-initscripts/syslog.confd b/main/busybox/syslog.confd
index 2f00667118c..2f00667118c 100644
--- a/main/busybox-initscripts/syslog.confd
+++ b/main/busybox/syslog.confd
diff --git a/main/busybox/syslog.initd b/main/busybox/syslog.initd
new file mode 100644
index 00000000000..3b20345d706
--- /dev/null
+++ b/main/busybox/syslog.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+
+description="Message logging system"
+
+name="busybox syslog"
+command="/sbin/syslogd"
+command_args="${SYSLOGD_OPTS} -n"
+pidfile="/run/syslogd.pid"
+command_background=true
+start_stop_daemon_args="-g wheel -k 027"
+
+depend() {
+	need clock hostname localmount
+	provide logger
+}
diff --git a/main/busybox/udhcpc.conf b/main/busybox/udhcpc.conf
new file mode 100644
index 00000000000..0407c553ffb
--- /dev/null
+++ b/main/busybox/udhcpc.conf
@@ -0,0 +1,11 @@
+# Do not overwrite /etc/resolv.conf
+#RESOLV_CONF="no"
+
+# Use alternative path for resolv.conf
+#RESOLV_CONF="/tmp/resolv.conf"
+
+# Prevent overwriting of resolv.conf on a per-interface basis
+#NO_DNS="eth1 wlan1"
+
+# List of interfaces where DHCP routes are ignored
+#NO_GATEWAY="eth1 wlan1"
diff --git a/main/busybox/udhcpd.initd b/main/busybox/udhcpd.initd
new file mode 100644
index 00000000000..e4dabd5b343
--- /dev/null
+++ b/main/busybox/udhcpd.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+
+name="busybox $RC_SVCNAME"
+command="/usr/sbin/$RC_SVCNAME"
+command_args="$UDHCPD_OPTS -f"
+pidfile="/run/$SVCNAME.pid"
+command_background=true
+
+depend() {
+	need net
+	after firewall
+}
diff --git a/main/busybox-initscripts/watchdog.confd b/main/busybox/watchdog.confd
index 5cfd2c2cc40..5cfd2c2cc40 100644
--- a/main/busybox-initscripts/watchdog.confd
+++ b/main/busybox/watchdog.confd
diff --git a/main/busybox/watchdog.initd b/main/busybox/watchdog.initd
new file mode 100644
index 00000000000..d87210044a0
--- /dev/null
+++ b/main/busybox/watchdog.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+
+name="busybox watchdog"
+command="/sbin/watchdog"
+command_args="${WATCHDOG_OPTS} -F ${WATCHDOG_DEV}"
+pidfile="/run/watchdog.pid"
+command_background=true
+
+depend() {
+	need dev
+	after hwdrivers
+}
+
+start_pre() {
+	if ! [ -n "$WATCHDOG_DEV" ]; then
+		eerror "WATCHDOG_DEV is not set"
+		return 1
+	fi
+}
diff --git a/main/bwm-ng/APKBUILD b/main/bwm-ng/APKBUILD
index aff59669946..ad50d1ac887 100644
--- a/main/bwm-ng/APKBUILD
+++ b/main/bwm-ng/APKBUILD
@@ -1,14 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bwm-ng
-pkgver=0.6.2
-pkgrel=0
+pkgver=0.6.3
+pkgrel=3
 pkgdesc="A small and simple console-based live bandwidth monitor"
 url="http://www.gropp.org/"
 arch="all"
 license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
 makedepends="ncurses-dev autoconf automake libtool"
-source="$pkgname-$pkgver.tgz::https://github.com/vgropp/bwm-ng/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tgz::https://github.com/vgropp/bwm-ng/archive/v$pkgver.tar.gz
+	format-security.patch
+	"
+options="!check"
 
 prepare() {
 	default_prepare
@@ -16,7 +19,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	CFLAGS="$CFLAGS -std=gnu89" \
 	./configure \
 		--build=$CBUILD \
@@ -30,8 +32,10 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
-sha512sums="4a7f141692f96dfab0c1729a7df36f5213a75ddb891b967b2cf951419daea7b84354c276705a0ee7c09f4ed26948ca068f65a04b8f9d18b2b8ed2df97b5e3b0a  bwm-ng-0.6.2.tgz"
+sha512sums="
+85ce29e6ffa9643b4e7c1d731f4e928ddca8cfdc71c86b65ec4e55058b951eb8da9ab80139145300518223589d5fece5bdc11ede91a1ea394d569993ccdb0ab8  bwm-ng-0.6.3.tgz
+e377d29ce10f8c8605412427bc05a2aeabe5e4bbb6813a2f9117e9f92b54c8a77e1dc03fe85fd997ae3f17edc146a0982d2e75a7acab2ea2532d9151138a9a37  format-security.patch
+"
diff --git a/main/bwm-ng/format-security.patch b/main/bwm-ng/format-security.patch
new file mode 100644
index 00000000000..f4022abb64d
--- /dev/null
+++ b/main/bwm-ng/format-security.patch
@@ -0,0 +1,13 @@
+diff --git a/src/output.c b/src/output.c
+index f5f01cd..b451832 100644
+--- a/src/output.c
++++ b/src/output.c
+@@ -151,7 +151,7 @@ int print_header(int option) {
+ 	        erase();
+ 		    mvwprintw(stdscr,1,2,"bwm-ng v" VERSION" (probing every %2.3fs), press 'h' for help",(float)delay/1000);
+             mvwprintw(stdscr,2,2,"input: %s type: %s",input2str(),output_type2str());
+-            wprintw(stdscr,show_all_if2str());
++            wprintw(stdscr, "%s", show_all_if2str());
+ 	        mvwprintw(stdscr,3,2,"%c         iface                   Rx                   Tx                Total",(char)IDLE_CHARS[option]);
+ 	        /* go to next char for next run */
+ 	        option++;
diff --git a/main/byacc/APKBUILD b/main/byacc/APKBUILD
index 29a8e7f2a22..8ed4cf89294 100644
--- a/main/byacc/APKBUILD
+++ b/main/byacc/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
 pkgname=byacc
-pkgver=20200330
+pkgver=20240109
 pkgrel=0
 pkgdesc="The Berkeley Yacc general-purpose parser generator"
 url="https://invisible-island.net/byacc/byacc.html"
@@ -27,6 +27,9 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
+	ln -sfv yacc "$pkgdir"/usr/bin/byacc
 }
 
-sha512sums="df8cc1aa550d633ab547a13a4f091d8c940a9a67b52dc5ecacad5b005fd54c3ceb1269593068c1a7949049e85b6e6eea20cffbbf4b408e049fde75c0ffe51f07  byacc-20200330.tgz"
+sha512sums="
+d1c50ede256a6c960243a16f4bfcafb5c78c19c82f10c567443b59a3ccacdcde37d09da491e22e0601b1b7864ba3f16068ca2eaf7c250d0bcb26449b735cb5b5  byacc-20240109.tgz
+"
diff --git a/main/byobu/APKBUILD b/main/byobu/APKBUILD
index fa3210e1f2d..a58e8c1a50d 100644
--- a/main/byobu/APKBUILD
+++ b/main/byobu/APKBUILD
@@ -1,15 +1,21 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=byobu
-pkgver=5.133
+pkgver=6.12
 pkgrel=0
 pkgdesc="An enhancement of the GNU Screen"
-url="https://launchpad.net/byobu"
+url="https://byobu.org"
 arch="noarch"
-license="GPL-3.0"
-depends="python3 tmux"
+license="GPL-3.0-or-later"
+depends="python3 tmux py3-newt"
+makedepends="automake autoconf libtool"
 subpackages="$pkgname-doc"
-source="https://launchpad.net/byobu/trunk/$pkgver/+download/byobu_$pkgver.orig.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/dustinkirkland/byobu/archive/refs/tags/$pkgver.tar.gz"
+
+prepare() {
+	sh autogen.sh
+	default_prepare
+}
 
 build() {
 	./configure \
@@ -26,4 +32,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4c0ef7a3b483e48c57f3e97dae1c7c77084797016efb677b201f2b56c6b9f4b771739d9a6d9a4fb612203a22e9fa460db80fde30c837b102ad830b1b2919db6c  byobu_5.133.orig.tar.gz"
+sha512sums="
+285c45ee333eb0be9fad797a28a5daf829b4575e19e9cee64a04f1dc4ccef1c505e6659c190d741c2f3aa5f546fe36fbfe75e36e79ce3cd1661a4738c40e221f  byobu-6.12.tar.gz
+"
diff --git a/main/bzip2/APKBUILD b/main/bzip2/APKBUILD
index 1ee379dd30c..6e5ba04a741 100644
--- a/main/bzip2/APKBUILD
+++ b/main/bzip2/APKBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bzip2
 pkgver=1.0.8
-pkgrel=1
+pkgrel=6
 pkgdesc="A high-quality data compression program"
-url="http://sources.redhat.com/bzip2"
+url="https://sourceware.org/bzip2/"
 arch="all"
 license="bzip2-1.0.6"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc libbz2"
@@ -13,13 +13,14 @@ source="https://sourceware.org/pub/bzip2/bzip2-$pkgver.tar.gz
 	bzip2-1.0.2-progress.patch
 	bzip2-1.0.3-no-test.patch
 	saneso.patch
+	bzip2.pc.in
 	"
 
 # secfixes:
 #   1.0.6-r7:
-#   - CVE-2019-12900
+#     - CVE-2019-12900
 #   1.0.6-r5:
-#   - CVE-2016-3189
+#     - CVE-2016-3189
 
 prepare() {
 	default_prepare
@@ -38,22 +39,23 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	make -f Makefile-libbz2_so all
 	make all
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make PREFIX="$pkgdir"/usr install
 	install -D libbz2.so.$pkgver "$pkgdir"/usr/lib/libbz2.so.$pkgver
 	ln -s libbz2.so.$pkgver "$pkgdir"/usr/lib/libbz2.so
 	ln -s libbz2.so.$pkgver "$pkgdir"/usr/lib/libbz2.so.${pkgver%%.*}
+
+	mkdir -p "$pkgdir"/usr/lib/pkgconfig/
+	sed "s|@VERSION@|$pkgver|" "$srcdir"/bzip2.pc.in \
+		> "$pkgdir"/usr/lib/pkgconfig/bzip2.pc
 }
 
 libbz2() {
@@ -62,9 +64,12 @@ libbz2() {
 	mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3  bzip2-1.0.8.tar.gz
-58cc37430555520b6e35db2740e699cf37eacdd82989c21a222a593e36288710a0defb003662d4238235c12b3764bfc89cd646e6be9d0a08d54bd2c9baa6ad15  bzip2-1.0.4-makefile-CFLAGS.patch
+sha512sums="
+083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3  bzip2-1.0.8.tar.gz
+d0430ae96d7a2d4e658a101c84262ba11048e3e3110ae9d7855b36792abc7827c0daba3cdcdec629130a9d3beb128052de458242e494a35962e903e50eddfe45  bzip2-1.0.4-makefile-CFLAGS.patch
 2d9a306bc0f552a58916ebc702d32350a225103c487e070d2082121a54e07f1813d3228f43293cc80a4bee62053fd597294c99a1751b1685cd678f4e5c6a2fe7  bzip2-1.0.4-man-links.patch
 b6810c73428f17245e0d7c2decd00c88986cd8ad1cfe4982defe34bdab808d53870ed92cb513b2d00c15301747ceb6ca958fb0e0458d0663b7d8f7c524f7ba4e  bzip2-1.0.2-progress.patch
 aefcafaaadc7f19b20fe023e0bd161127b9f32e0cd364621f6e5c03e95fb976e7e69e354ec46673a554392519532a3bfe56d982a5cde608c10e0b18c3847a030  bzip2-1.0.3-no-test.patch
-dd624110ce06426d2990ad1de96f5b6a2790c599030fb8848e26b64aa847cf956806f7a539fe61c6005d99bfc135920fc704f274862d2557ab1861adb7391d45  saneso.patch"
+dd624110ce06426d2990ad1de96f5b6a2790c599030fb8848e26b64aa847cf956806f7a539fe61c6005d99bfc135920fc704f274862d2557ab1861adb7391d45  saneso.patch
+e17c6f8f88a89d38667a68cd1397c863663c7996a9f18481f3f6ed35902044220c01e5fe19f114159fceac068a4dd32c2ddc903f0d0901cdf722c841dd9f2b93  bzip2.pc.in
+"
diff --git a/main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch b/main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
index cf146188c3b..6acdc28a10d 100644
--- a/main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
+++ b/main/bzip2/bzip2-1.0.4-makefile-CFLAGS.patch
@@ -8,7 +8,7 @@
  
  BIGFILES=-D_FILE_OFFSET_BITS=64
 -CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
-+CFLAGS+=-Wall -Winline $(BIGFILES) $(CPPFLAGS)
++CFLAGS+=-Wall -Winline $(BIGFILES) $(CPPFLAGS) -O2
  
  # Where you want it installed when you do 'make install'
  PREFIX=/usr/local
@@ -19,7 +19,7 @@
  CC=gcc
  BIGFILES=-D_FILE_OFFSET_BITS=64
 -CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
-+CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) $(CPPFLAGS)
++CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) $(CPPFLAGS) -O2
  
  OBJS= blocksort.o  \
        huffman.o    \
diff --git a/main/bzip2/bzip2.pc.in b/main/bzip2/bzip2.pc.in
new file mode 100644
index 00000000000..a4dd68259ce
--- /dev/null
+++ b/main/bzip2/bzip2.pc.in
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=/usr
+bindir=${exec_prefix}/bin
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: bzip2
+Description: A file compression library
+Version: @VERSION@
+Libs: -L${libdir} -lbz2
+Cflags: -I${includedir}
diff --git a/main/c-ares/APKBUILD b/main/c-ares/APKBUILD
index 93d4347b656..0919f690620 100644
--- a/main/c-ares/APKBUILD
+++ b/main/c-ares/APKBUILD
@@ -1,16 +1,22 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=c-ares
-pkgver=1.16.0
+pkgver=1.28.1
 pkgrel=0
-pkgdesc="An asynchronously DNS/names resolver library"
-url="https://c-ares.haxx.se/"
+pkgdesc="Asynchronous DNS/names resolver library"
+url="https://c-ares.org/"
 arch="all"
-options="!check"
 license="MIT"
-subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
+makedepends="gtest-dev"
+subpackages="$pkgname-doc $pkgname-static $pkgname-dev $pkgname-utils::noarch"
 source="https://c-ares.haxx.se/download/c-ares-$pkgver.tar.gz"
 
+# secfixes:
+#   1.27.0-r0:
+#     - CVE-2024-25629
+#   1.17.2-r0:
+#     - CVE-2021-3672
+
 build() {
 	./configure \
 		--build=$CBUILD \
@@ -23,17 +29,20 @@ build() {
 }
 
 check() {
-	# This is only needed for < 1.14.0, where the .sh file was not
-	# distributed properly - see https://da.gd/carestest
-	echo "#!/bin/true" > test/fuzzcheck.sh
-	chmod a+x test/fuzzcheck.sh
-
-	make -C test check
+	test/arestest --gtest_filter=-*.Live*
 }
 
-
 package() {
-	make -j1 DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
+	cd src/tools
+	install -Dm755 -t "$pkgdir"/usr/bin \
+		adig ahost
+}
+
+utils() {
+	amove usr/bin
 }
 
-sha512sums="9f5def3206d61682e66c2173b18a8dd76138e6eb53bfe06a5830408cce9a70895d2148be23064ff18e0fd25b4f4b2c3cfe77e040744cc80dcce6ffec3ea534a9  c-ares-1.16.0.tar.gz"
+sha512sums="
+9a24f40002b661d97c9b49a617d2e6b12bad1c9f22e872611252d051ec650f886c010207939fac6992610b3cd5a87588f802d7dfa1310ced7c6621ea2f99dd90  c-ares-1.28.1.tar.gz
+"
diff --git a/main/ca-certificates/0001-update-ca-fix-compiler-warning.patch b/main/ca-certificates/0001-update-ca-fix-compiler-warning.patch
deleted file mode 100644
index 9630cf7fd6c..00000000000
--- a/main/ca-certificates/0001-update-ca-fix-compiler-warning.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3184fe80e403b9dc6d5fe3b7ebcd9d375363e2e4 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 5 Feb 2020 14:42:38 +0100
-Subject: [PATCH 1/3] update-ca: fix compiler warning
-
----
- update-ca.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/update-ca.c b/update-ca.c
-index 7bb4f1b..2b3195b 100644
---- a/update-ca.c
-+++ b/update-ca.c
-@@ -330,7 +330,7 @@ int main(int a, char **v)
- 	free(tmpfile);
- 
- 	/* Execute run-parts */
--	static const char *run_parts_args[] = { "run-parts", RUNPARTSDIR, 0 };
-+	static char *const run_parts_args[] = { "run-parts", RUNPARTSDIR, 0 };
- 	execve("/usr/bin/run-parts", run_parts_args, NULL);
- 	execve("/bin/run-parts", run_parts_args, NULL);
- 	perror("run-parts");
--- 
-2.25.0
-
diff --git a/main/ca-certificates/0002-replace-python-script-with-perl-script.patch b/main/ca-certificates/0002-replace-python-script-with-perl-script.patch
deleted file mode 100644
index fe7e3d98b9f..00000000000
--- a/main/ca-certificates/0002-replace-python-script-with-perl-script.patch
+++ /dev/null
@@ -1,874 +0,0 @@
-From 6674063331cc37a6a496e44577d9be434cbfc9a2 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 5 Feb 2020 15:58:32 +0100
-Subject: [PATCH 2/3] replace python script with perl script
-
-we need ca-certificates when bootstrapping new architectures. Avoid use
-of python to reduce number of dependencies when bootstrapping.
-
-So use mk-ca-bundle.pl script from curl, and add a small shell script
-that splits the bundle to separate .crt files, similar way that the
-python script did.
----
- .gitignore         |   1 +
- Makefile           |  11 +-
- certdata2pem.py    | 155 ------------
- mk-ca-bundle.pl    | 604 +++++++++++++++++++++++++++++++++++++++++++++
- split-ca-bundle.sh |  30 +++
- 5 files changed, 642 insertions(+), 159 deletions(-)
- delete mode 100644 certdata2pem.py
- create mode 100644 mk-ca-bundle.pl
- create mode 100644 split-ca-bundle.sh
-
-diff --git a/.gitignore b/.gitignore
-index 8878f38..6f5e9fe 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -2,3 +2,4 @@ update-ca-certificates
- c_rehash
- certdata.stamp
- *.crt
-+*.pem
-diff --git a/Makefile b/Makefile
-index 3eb6672..c688d73 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,4 @@
--PYTHON := python3
-+PERL := perl
- 
- all: update-ca-certificates c_rehash certdata.stamp
- 
-@@ -8,8 +8,11 @@ update-ca-certificates: update-ca.c
- c_rehash: c_rehash.c
- 	${CC} ${CFLAGS} -o $@ c_rehash.c -lcrypto ${LDFLAGS}
- 
--certdata.stamp:
--	${PYTHON} certdata2pem.py
-+cert.pem: mk-ca-bundle.pl
-+	${PERL} mk-ca-bundle.pl -n -w 64 $@
-+
-+certdata.stamp: cert.pem split-ca-bundle.sh
-+	${SHELL} split-ca-bundle.sh < cert.pem
- 	touch $@
- 
- install: all
-@@ -29,7 +32,7 @@ install: all
- 	install -m755 c_rehash ${DESTDIR}/usr/bin
- 
- clean:
--	rm -rf update-ca-certificates c_rehash certdata.stamp *.crt
-+	rm -rf update-ca-certificates c_rehash certdata.stamp *.crt cert.pem
- 
- # https://hg.mozilla.org/mozilla-central/file/tip/security/nss/lib/ckfw/builtins/certdata.txt
- update:
-diff --git a/certdata2pem.py b/certdata2pem.py
-deleted file mode 100644
-index f91422b..0000000
---- a/certdata2pem.py
-+++ /dev/null
-@@ -1,155 +0,0 @@
--#!/usr/bin/python
--# vim:set et sw=4:
--#
--# certdata2pem.py - splits certdata.txt into multiple files
--#
--# Copyright (C) 2009 Philipp Kern <pkern@debian.org>
--#
--# This program 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 of the License, or
--# (at your option) any later version.
--#
--# This program 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
--# USA.
--
--import base64
--import os.path
--import re
--import sys
--import textwrap
--import io
--
--objects = []
--
--# Dirty file parser.
--in_data, in_multiline, in_obj = False, False, False
--field, type, value, obj = None, None, None, dict()
--
--# Python 3 will not let us decode non-ascii characters if we
--# have not specified an encoding, but Python 2's open does not
--# have an option to set the encoding. Python 3's open is io.open
--# and io.open has been backported to Python 2.6 and 2.7, so use io.open.
--for line in io.open('certdata.txt', 'rt', encoding='utf8'):
--    # Ignore the file header.
--    if not in_data:
--        if line.startswith('BEGINDATA'):
--            in_data = True
--        continue
--    # Ignore comment lines.
--    if line.startswith('#'):
--        continue
--    # Empty lines are significant if we are inside an object.
--    if in_obj and len(line.strip()) == 0:
--        objects.append(obj)
--        obj = dict()
--        in_obj = False
--        continue
--    if len(line.strip()) == 0:
--        continue
--    if in_multiline:
--        if not line.startswith('END'):
--            if type == 'MULTILINE_OCTAL':
--                line = line.strip()
--                for i in re.finditer(r'\\([0-3][0-7][0-7])', line):
--                    value.append(int(i.group(1), 8))
--            else:
--                value += line
--            continue
--        obj[field] = value
--        in_multiline = False
--        continue
--    if line.startswith('CKA_CLASS'):
--        in_obj = True
--    line_parts = line.strip().split(' ', 2)
--    if len(line_parts) > 2:
--        field, type = line_parts[0:2]
--        value = ' '.join(line_parts[2:])
--    elif len(line_parts) == 2:
--        field, type = line_parts
--        value = None
--    else:
--        raise NotImplementedError('line_parts < 2 not supported.')
--    if type == 'MULTILINE_OCTAL':
--        in_multiline = True
--        value = bytearray()
--        continue
--    obj[field] = value
--if len(obj) > 0:
--    objects.append(obj)
--
--# Read blacklist.
--blacklist = []
--if os.path.exists('blacklist.txt'):
--    for line in open('blacklist.txt', 'r'):
--        line = line.strip()
--        if line.startswith('#') or len(line) == 0:
--            continue
--        item = line.split('#', 1)[0].strip()
--        blacklist.append(item)
--
--# Build up trust database.
--trust = dict()
--for obj in objects:
--    if obj['CKA_CLASS'] != 'CKO_NSS_TRUST':
--        continue
--    if obj['CKA_LABEL'] in blacklist:
--        print("Certificate %s blacklisted, ignoring." % obj['CKA_LABEL'])
--    elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_TRUSTED_DELEGATOR':
--        trust[obj['CKA_LABEL']] = True
--    elif obj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_TRUSTED_DELEGATOR':
--        trust[obj['CKA_LABEL']] = True
--    elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_NOT_TRUSTED':
--        print('!'*74)
--        print("UNTRUSTED BUT NOT BLACKLISTED CERTIFICATE FOUND: %s" % obj['CKA_LABEL'])
--        print('!'*74)
--    else:
--        print("Ignoring certificate %s.  SAUTH=%s, EPROT=%s" % \
--              (obj['CKA_LABEL'], obj['CKA_TRUST_SERVER_AUTH'],
--               obj['CKA_TRUST_EMAIL_PROTECTION']))
--
--for obj in objects:
--    if obj['CKA_CLASS'] == 'CKO_CERTIFICATE':
--        if not obj['CKA_LABEL'] in trust or not trust[obj['CKA_LABEL']]:
--            continue
--        bname = obj['CKA_LABEL'][1:-1].replace('/', '_')\
--                                      .replace(' ', '_')\
--                                      .replace('(', '=')\
--                                      .replace(')', '=')\
--                                      .replace(',', '_')
--
--        # this is the only way to decode the way NSS stores multi-byte UTF-8
--        # and we need an escaped string for checking existence of things
--        # otherwise we're dependant on the user's current locale.
--        if bytes != str:
--            # We're in python 3, convert the utf-8 string to a
--            # sequence of bytes that represents this utf-8 string
--            # then encode the byte-sequence as an escaped string that
--            # can be passed to open() and os.path.exists()
--            bname = bname.encode('utf-8').decode('unicode_escape').encode('latin-1')
--        else:
--            # Python 2
--            # Convert the unicode string back to its original byte form
--            # (contents of files returned by io.open are returned as
--            #  unicode strings)
--            # then to an escaped string that can be passed to open()
--            # and os.path.exists()
--            bname = bname.encode('utf-8').decode('string_escape')
--
--        fname = bname + b'.crt'
--        if os.path.exists(fname):
--            print("Found duplicate certificate name %s, renaming." % bname)
--            fname = bname + b'_2.crt'
--        f = open(fname, 'w')
--        f.write("-----BEGIN CERTIFICATE-----\n")
--        encoded = base64.b64encode(obj['CKA_VALUE']).decode('utf-8')
--        f.write("\n".join(textwrap.wrap(encoded, 64)))
--        f.write("\n-----END CERTIFICATE-----\n")
--
-diff --git a/mk-ca-bundle.pl b/mk-ca-bundle.pl
-new file mode 100644
-index 0000000..09e8e5b
---- /dev/null
-+++ b/mk-ca-bundle.pl
-@@ -0,0 +1,604 @@
-+#!/usr/bin/env perl
-+# ***************************************************************************
-+# *                                  _   _ ____  _
-+# *  Project                     ___| | | |  _ \| |
-+# *                             / __| | | | |_) | |
-+# *                            | (__| |_| |  _ <| |___
-+# *                             \___|\___/|_| \_\_____|
-+# *
-+# * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
-+# *
-+# * This software is licensed as described in the file COPYING, which
-+# * you should have received as part of this distribution. The terms
-+# * are also available at https://curl.haxx.se/docs/copyright.html.
-+# *
-+# * You may opt to use, copy, modify, merge, publish, distribute and/or sell
-+# * copies of the Software, and permit persons to whom the Software is
-+# * furnished to do so, under the terms of the COPYING file.
-+# *
-+# * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-+# * KIND, either express or implied.
-+# *
-+# ***************************************************************************
-+# This Perl script creates a fresh ca-bundle.crt file for use with libcurl.
-+# It downloads certdata.txt from Mozilla's source tree (see URL below),
-+# then parses certdata.txt and extracts CA Root Certificates into PEM format.
-+# These are then processed with the OpenSSL commandline tool to produce the
-+# final ca-bundle.crt file.
-+# The script is based on the parse-certs script written by Roland Krikava.
-+# This Perl script works on almost any platform since its only external
-+# dependency is the OpenSSL commandline tool for optional text listing.
-+# Hacked by Guenter Knauf.
-+#
-+use Encode;
-+use Getopt::Std;
-+use MIME::Base64;
-+use strict;
-+use warnings;
-+use vars qw($opt_b $opt_d $opt_f $opt_h $opt_i $opt_k $opt_l $opt_m $opt_n $opt_p $opt_q $opt_s $opt_t $opt_u $opt_v $opt_w);
-+use List::Util;
-+use Text::Wrap;
-+use Time::Local;
-+my $MOD_SHA = "Digest::SHA";
-+eval "require $MOD_SHA";
-+if ($@) {
-+  $MOD_SHA = "Digest::SHA::PurePerl";
-+  eval "require $MOD_SHA";
-+}
-+eval "require LWP::UserAgent";
-+
-+my %urls = (
-+  'nss' =>
-+    'https://hg.mozilla.org/projects/nss/raw-file/default/lib/ckfw/builtins/certdata.txt',
-+  'central' =>
-+    'https://hg.mozilla.org/mozilla-central/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt',
-+  'beta' =>
-+    'https://hg.mozilla.org/releases/mozilla-beta/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt',
-+  'release' =>
-+    'https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt',
-+);
-+
-+$opt_d = 'release';
-+
-+# If the OpenSSL commandline is not in search path you can configure it here!
-+my $openssl = 'openssl';
-+
-+my $version = '1.27';
-+
-+$opt_w = 76; # default base64 encoded lines length
-+
-+# default cert types to include in the output (default is to include CAs which may issue SSL server certs)
-+my $default_mozilla_trust_purposes = "SERVER_AUTH";
-+my $default_mozilla_trust_levels = "TRUSTED_DELEGATOR";
-+$opt_p = $default_mozilla_trust_purposes . ":" . $default_mozilla_trust_levels;
-+
-+my @valid_mozilla_trust_purposes = (
-+  "DIGITAL_SIGNATURE",
-+  "NON_REPUDIATION",
-+  "KEY_ENCIPHERMENT",
-+  "DATA_ENCIPHERMENT",
-+  "KEY_AGREEMENT",
-+  "KEY_CERT_SIGN",
-+  "CRL_SIGN",
-+  "SERVER_AUTH",
-+  "CLIENT_AUTH",
-+  "CODE_SIGNING",
-+  "EMAIL_PROTECTION",
-+  "IPSEC_END_SYSTEM",
-+  "IPSEC_TUNNEL",
-+  "IPSEC_USER",
-+  "TIME_STAMPING",
-+  "STEP_UP_APPROVED"
-+);
-+
-+my @valid_mozilla_trust_levels = (
-+  "TRUSTED_DELEGATOR",    # CAs
-+  "NOT_TRUSTED",          # Don't trust these certs.
-+  "MUST_VERIFY_TRUST",    # This explicitly tells us that it ISN'T a CA but is otherwise ok. In other words, this should tell the app to ignore any other sources that claim this is a CA.
-+  "TRUSTED"               # This cert is trusted, but only for itself and not for delegates (i.e. it is not a CA).
-+);
-+
-+my $default_signature_algorithms = $opt_s = "MD5";
-+
-+my @valid_signature_algorithms = (
-+  "MD5",
-+  "SHA1",
-+  "SHA256",
-+  "SHA384",
-+  "SHA512"
-+);
-+
-+$0 =~ s@.*(/|\\)@@;
-+$Getopt::Std::STANDARD_HELP_VERSION = 1;
-+getopts('bd:fhiklmnp:qs:tuvw:');
-+
-+if(!defined($opt_d)) {
-+    # to make plain "-d" use not cause warnings, and actually still work
-+    $opt_d = 'release';
-+}
-+
-+# Use predefined URL or else custom URL specified on command line.
-+my $url;
-+if(defined($urls{$opt_d})) {
-+  $url = $urls{$opt_d};
-+  if(!$opt_k && $url !~ /^https:\/\//i) {
-+    die "The URL for '$opt_d' is not HTTPS. Use -k to override (insecure).\n";
-+  }
-+}
-+else {
-+  $url = $opt_d;
-+}
-+
-+my $curl = `curl -V`;
-+
-+if ($opt_i) {
-+  print ("=" x 78 . "\n");
-+  print "Script Version                   : $version\n";
-+  print "Perl Version                     : $]\n";
-+  print "Operating System Name            : $^O\n";
-+  print "Getopt::Std.pm Version           : ${Getopt::Std::VERSION}\n";
-+  print "Encode::Encoding.pm Version      : ${Encode::Encoding::VERSION}\n";
-+  print "MIME::Base64.pm Version          : ${MIME::Base64::VERSION}\n";
-+  print "LWP::UserAgent.pm Version        : ${LWP::UserAgent::VERSION}\n" if($LWP::UserAgent::VERSION);
-+  print "LWP.pm Version                   : ${LWP::VERSION}\n" if($LWP::VERSION);
-+  print "Digest::SHA.pm Version           : ${Digest::SHA::VERSION}\n" if ($Digest::SHA::VERSION);
-+  print "Digest::SHA::PurePerl.pm Version : ${Digest::SHA::PurePerl::VERSION}\n" if ($Digest::SHA::PurePerl::VERSION);
-+  print ("=" x 78 . "\n");
-+}
-+
-+sub warning_message() {
-+  if ( $opt_d =~ m/^risk$/i ) { # Long Form Warning and Exit
-+    print "Warning: Use of this script may pose some risk:\n";
-+    print "\n";
-+    print "  1) If you use HTTP URLs they are subject to a man in the middle attack\n";
-+    print "  2) Default to 'release', but more recent updates may be found in other trees\n";
-+    print "  3) certdata.txt file format may change, lag time to update this script\n";
-+    print "  4) Generally unwise to blindly trust CAs without manual review & verification\n";
-+    print "  5) Mozilla apps use additional security checks aren't represented in certdata\n";
-+    print "  6) Use of this script will make a security engineer grind his teeth and\n";
-+    print "     swear at you.  ;)\n";
-+    exit;
-+  } else { # Short Form Warning
-+    print "Warning: Use of this script may pose some risk, -d risk for more details.\n";
-+  }
-+}
-+
-+sub HELP_MESSAGE() {
-+  print "Usage:\t${0} [-b] [-d<certdata>] [-f] [-i] [-k] [-l] [-n] [-p<purposes:levels>] [-q] [-s<algorithms>] [-t] [-u] [-v] [-w<l>] [<outputfile>]\n";
-+  print "\t-b\tbackup an existing version of ca-bundle.crt\n";
-+  print "\t-d\tspecify Mozilla tree to pull certdata.txt or custom URL\n";
-+  print "\t\t  Valid names are:\n";
-+  print "\t\t    ", join( ", ", map { ( $_ =~ m/$opt_d/ ) ? "$_ (default)" : "$_" } sort keys %urls ), "\n";
-+  print "\t-f\tforce rebuild even if certdata.txt is current\n";
-+  print "\t-i\tprint version info about used modules\n";
-+  print "\t-k\tallow URLs other than HTTPS, enable HTTP fallback (insecure)\n";
-+  print "\t-l\tprint license info about certdata.txt\n";
-+  print "\t-m\tinclude meta data in output\n";
-+  print "\t-n\tno download of certdata.txt (to use existing)\n";
-+  print wrap("\t","\t\t", "-p\tlist of Mozilla trust purposes and levels for certificates to include in output. Takes the form of a comma separated list of purposes, a colon, and a comma separated list of levels. (default: $default_mozilla_trust_purposes:$default_mozilla_trust_levels)"), "\n";
-+  print "\t\t  Valid purposes are:\n";
-+  print wrap("\t\t    ","\t\t    ", join( ", ", "ALL", @valid_mozilla_trust_purposes ) ), "\n";
-+  print "\t\t  Valid levels are:\n";
-+  print wrap("\t\t    ","\t\t    ", join( ", ", "ALL", @valid_mozilla_trust_levels ) ), "\n";
-+  print "\t-q\tbe really quiet (no progress output at all)\n";
-+  print wrap("\t","\t\t", "-s\tcomma separated list of certificate signatures/hashes to output in plain text mode. (default: $default_signature_algorithms)\n");
-+  print "\t\t  Valid signature algorithms are:\n";
-+  print wrap("\t\t    ","\t\t    ", join( ", ", "ALL", @valid_signature_algorithms ) ), "\n";
-+  print "\t-t\tinclude plain text listing of certificates\n";
-+  print "\t-u\tunlink (remove) certdata.txt after processing\n";
-+  print "\t-v\tbe verbose and print out processed CAs\n";
-+  print "\t-w <l>\twrap base64 output lines after <l> chars (default: ${opt_w})\n";
-+  exit;
-+}
-+
-+sub VERSION_MESSAGE() {
-+  print "${0} version ${version} running Perl ${]} on ${^O}\n";
-+}
-+
-+warning_message() unless ($opt_q || $url =~ m/^(ht|f)tps:/i );
-+HELP_MESSAGE() if ($opt_h);
-+
-+sub report($@) {
-+  my $output = shift;
-+
-+  print STDERR $output . "\n" unless $opt_q;
-+}
-+
-+sub is_in_list($@) {
-+  my $target = shift;
-+
-+  return defined(List::Util::first { $target eq $_ } @_);
-+}
-+
-+# Parses $param_string as a case insensitive comma separated list with optional whitespace
-+# validates that only allowed parameters are supplied
-+sub parse_csv_param($$@) {
-+  my $description = shift;
-+  my $param_string = shift;
-+  my @valid_values = @_;
-+
-+  my @values = map {
-+    s/^\s+//;  # strip leading spaces
-+    s/\s+$//;  # strip trailing spaces
-+    uc $_      # return the modified string as upper case
-+  } split( ',', $param_string );
-+
-+  # Find all values which are not in the list of valid values or "ALL"
-+  my @invalid = grep { !is_in_list($_,"ALL",@valid_values) } @values;
-+
-+  if ( scalar(@invalid) > 0 ) {
-+    # Tell the user which parameters were invalid and print the standard help message which will exit
-+    print "Error: Invalid ", $description, scalar(@invalid) == 1 ? ": " : "s: ", join( ", ", map { "\"$_\"" } @invalid ), "\n";
-+    HELP_MESSAGE();
-+  }
-+
-+  @values = @valid_values if ( is_in_list("ALL",@values) );
-+
-+  return @values;
-+}
-+
-+sub sha256 {
-+  my $result;
-+  if ($Digest::SHA::VERSION || $Digest::SHA::PurePerl::VERSION) {
-+    open(FILE, $_[0]) or die "Can't open '$_[0]': $!";
-+    binmode(FILE);
-+    $result = $MOD_SHA->new(256)->addfile(*FILE)->hexdigest;
-+    close(FILE);
-+  } else {
-+    # Use OpenSSL command if Perl Digest::SHA modules not available
-+    $result = `"$openssl" dgst -r -sha256 "$_[0]"`;
-+    $result =~ s/^([0-9a-f]{64}) .+/$1/is;
-+  }
-+  return $result;
-+}
-+
-+
-+sub oldhash {
-+  my $hash = "";
-+  open(C, "<$_[0]") || return 0;
-+  while(<C>) {
-+    chomp;
-+    if($_ =~ /^\#\# SHA256: (.*)/) {
-+      $hash = $1;
-+      last;
-+    }
-+  }
-+  close(C);
-+  return $hash;
-+}
-+
-+if ( $opt_p !~ m/:/ ) {
-+  print "Error: Mozilla trust identifier list must include both purposes and levels\n";
-+  HELP_MESSAGE();
-+}
-+
-+(my $included_mozilla_trust_purposes_string, my $included_mozilla_trust_levels_string) = split( ':', $opt_p );
-+my @included_mozilla_trust_purposes = parse_csv_param( "trust purpose", $included_mozilla_trust_purposes_string, @valid_mozilla_trust_purposes );
-+my @included_mozilla_trust_levels = parse_csv_param( "trust level", $included_mozilla_trust_levels_string, @valid_mozilla_trust_levels );
-+
-+my @included_signature_algorithms = parse_csv_param( "signature algorithm", $opt_s, @valid_signature_algorithms );
-+
-+sub should_output_cert(%) {
-+  my %trust_purposes_by_level = @_;
-+
-+  foreach my $level (@included_mozilla_trust_levels) {
-+    # for each level we want to output, see if any of our desired purposes are included
-+    return 1 if ( defined( List::Util::first { is_in_list( $_, @included_mozilla_trust_purposes ) } @{$trust_purposes_by_level{$level}} ) );
-+  }
-+
-+  return 0;
-+}
-+
-+my $crt = $ARGV[0] || 'ca-bundle.crt';
-+(my $txt = $url) =~ s@(.*/|\?.*)@@g;
-+
-+my $stdout = $crt eq '-';
-+my $resp;
-+my $fetched;
-+
-+my $oldhash = oldhash($crt);
-+
-+report "SHA256 of old file: $oldhash";
-+
-+if(!$opt_n) {
-+  report "Downloading $txt ...";
-+
-+  # If we have an HTTPS URL then use curl
-+  if($url =~ /^https:\/\//i) {
-+    if($curl) {
-+      if($curl =~ /^Protocols:.* https( |$)/m) {
-+        report "Get certdata with curl!";
-+        my $proto = !$opt_k ? "--proto =https" : "";
-+        my $quiet = $opt_q ? "-s" : "";
-+        my @out = `curl -w %{response_code} $proto $quiet -o "$txt" "$url"`;
-+        if(!$? && @out && $out[0] == 200) {
-+          $fetched = 1;
-+          report "Downloaded $txt";
-+        }
-+        else {
-+          report "Failed downloading via HTTPS with curl";
-+          if(-e $txt && !unlink($txt)) {
-+            report "Failed to remove '$txt': $!";
-+          }
-+        }
-+      }
-+      else {
-+        report "curl lacks https support";
-+      }
-+    }
-+    else {
-+      report "curl not found";
-+    }
-+  }
-+
-+  # If nothing was fetched then use LWP
-+  if(!$fetched) {
-+    if($url =~ /^https:\/\//i) {
-+      report "Falling back to HTTP";
-+      $url =~ s/^https:\/\//http:\/\//i;
-+    }
-+    if(!$opt_k) {
-+      report "URLs other than HTTPS are disabled by default, to enable use -k";
-+      exit 1;
-+    }
-+    report "Get certdata with LWP!";
-+    if(!defined(${LWP::UserAgent::VERSION})) {
-+      report "LWP is not available (LWP::UserAgent not found)";
-+      exit 1;
-+    }
-+    my $ua  = new LWP::UserAgent(agent => "$0/$version");
-+    $ua->env_proxy();
-+    $resp = $ua->mirror($url, $txt);
-+    if($resp && $resp->code eq '304') {
-+      report "Not modified";
-+      exit 0 if -e $crt && !$opt_f;
-+    }
-+    else {
-+      $fetched = 1;
-+      report "Downloaded $txt";
-+    }
-+    if(!$resp || $resp->code !~ /^(?:200|304)$/) {
-+      report "Unable to download latest data: "
-+        . ($resp? $resp->code . ' - ' . $resp->message : "LWP failed");
-+      exit 1 if -e $crt || ! -r $txt;
-+    }
-+  }
-+}
-+
-+my $filedate = $resp ? $resp->last_modified : (stat($txt))[9];
-+my $datesrc = "as of";
-+if(!$filedate) {
-+    # mxr.mozilla.org gave us a time, hg.mozilla.org does not!
-+    $filedate = time();
-+    $datesrc="downloaded on";
-+}
-+
-+# get the hash from the download file
-+my $newhash= sha256($txt);
-+
-+if(!$opt_f && $oldhash eq $newhash) {
-+    report "Downloaded file identical to previous run\'s source file. Exiting";
-+    if($opt_u && -e $txt && !unlink($txt)) {
-+        report "Failed to remove $txt: $!\n";
-+    }
-+    exit;
-+}
-+
-+report "SHA256 of new file: $newhash";
-+
-+my $currentdate = scalar gmtime($filedate);
-+
-+my $format = $opt_t ? "plain text and " : "";
-+if( $stdout ) {
-+    open(CRT, '> -') or die "Couldn't open STDOUT: $!\n";
-+} else {
-+    open(CRT,">$crt.~") or die "Couldn't open $crt.~: $!\n";
-+}
-+print CRT <<EOT;
-+##
-+## Bundle of CA Root Certificates
-+##
-+## Certificate data from Mozilla ${datesrc}: ${currentdate} GMT
-+##
-+## This is a bundle of X.509 certificates of public Certificate Authorities
-+## (CA). These were automatically extracted from Mozilla's root certificates
-+## file (certdata.txt).  This file can be found in the mozilla source tree:
-+## ${url}
-+##
-+## It contains the certificates in ${format}PEM format and therefore
-+## can be directly used with curl / libcurl / php_curl, or with
-+## an Apache+mod_ssl webserver for SSL client authentication.
-+## Just configure this file as the SSLCACertificateFile.
-+##
-+## Conversion done with mk-ca-bundle.pl version $version.
-+## SHA256: $newhash
-+##
-+
-+EOT
-+
-+report "Processing  '$txt' ...";
-+my $caname;
-+my $certnum = 0;
-+my $skipnum = 0;
-+my $start_of_cert = 0;
-+my @precert;
-+my $cka_value;
-+my $valid = 1;
-+
-+open(TXT,"$txt") or die "Couldn't open $txt: $!\n";
-+while (<TXT>) {
-+  if (/\*\*\*\*\* BEGIN LICENSE BLOCK \*\*\*\*\*/) {
-+    print CRT;
-+    print if ($opt_l);
-+    while (<TXT>) {
-+      print CRT;
-+      print if ($opt_l);
-+      last if (/\*\*\*\*\* END LICENSE BLOCK \*\*\*\*\*/);
-+    }
-+  }
-+  elsif(/^# (Issuer|Serial Number|Subject|Not Valid Before|Not Valid After |Fingerprint \(MD5\)|Fingerprint \(SHA1\)):/) {
-+      push @precert, $_;
-+      $valid = 1;
-+      next;
-+  }
-+  elsif(/^#|^\s*$/) {
-+      undef @precert;
-+      next;
-+  }
-+  chomp;
-+
-+  # Example:
-+  # CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL
-+  # \062\060\060\066\061\067\060\060\060\060\060\060\132
-+  # END
-+
-+  if (/^CKA_NSS_SERVER_DISTRUST_AFTER (CK_BBOOL CK_FALSE|MULTILINE_OCTAL)/) {
-+      if($1 eq "MULTILINE_OCTAL") {
-+          my @timestamp;
-+          while (<TXT>) {
-+              last if (/^END/);
-+              chomp;
-+              my @octets = split(/\\/);
-+              shift @octets;
-+              for (@octets) {
-+                  push @timestamp, chr(oct);
-+              }
-+          }
-+          # A trailing Z in the timestamp signifies UTC
-+          if($timestamp[12] ne "Z") {
-+              report "distrust date stamp is not using UTC";
-+          }
-+          # Example date: 200617000000Z
-+          # Means 2020-06-17 00:00:00 UTC
-+          my $distrustat =
-+            timegm($timestamp[10] . $timestamp[11], # second
-+                   $timestamp[8] . $timestamp[9],   # minute
-+                   $timestamp[6] . $timestamp[7],   # hour
-+                   $timestamp[4] . $timestamp[5],   # day
-+                   ($timestamp[2] . $timestamp[3]) - 1, # month
-+                   "20" . $timestamp[0] . $timestamp[1]); # year
-+          if(time >= $distrustat) {
-+              # not trusted anymore
-+              $skipnum++;
-+              report "Skipping: $caname is not trusted anymore" if ($opt_v);
-+              $valid = 0;
-+          }
-+          else {
-+              # still trusted
-+          }
-+      }
-+      next;
-+  }
-+
-+  # this is a match for the start of a certificate
-+  if (/^CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE/) {
-+    $start_of_cert = 1
-+  }
-+  if ($start_of_cert && /^CKA_LABEL UTF8 \"(.*)\"/) {
-+    $caname = $1;
-+  }
-+  my %trust_purposes_by_level;
-+  if ($start_of_cert && /^CKA_VALUE MULTILINE_OCTAL/) {
-+    $cka_value="";
-+    while (<TXT>) {
-+      last if (/^END/);
-+      chomp;
-+      my @octets = split(/\\/);
-+      shift @octets;
-+      for (@octets) {
-+        $cka_value .= chr(oct);
-+      }
-+    }
-+  }
-+  if(/^CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST/ && $valid) {
-+    # now scan the trust part to determine how we should trust this cert
-+    while (<TXT>) {
-+      last if (/^#/);
-+      if (/^CKA_TRUST_([A-Z_]+)\s+CK_TRUST\s+CKT_NSS_([A-Z_]+)\s*$/) {
-+        if ( !is_in_list($1,@valid_mozilla_trust_purposes) ) {
-+          report "Warning: Unrecognized trust purpose for cert: $caname. Trust purpose: $1. Trust Level: $2";
-+        } elsif ( !is_in_list($2,@valid_mozilla_trust_levels) ) {
-+          report "Warning: Unrecognized trust level for cert: $caname. Trust purpose: $1. Trust Level: $2";
-+        } else {
-+          push @{$trust_purposes_by_level{$2}}, $1;
-+        }
-+      }
-+    }
-+
-+    if ( !should_output_cert(%trust_purposes_by_level) ) {
-+      $skipnum ++;
-+      report "Skipping: $caname" if ($opt_v);
-+    } else {
-+      my $data = $cka_value;
-+      $cka_value = "";
-+      my $encoded = MIME::Base64::encode_base64($data, '');
-+      $encoded =~ s/(.{1,${opt_w}})/$1\n/g;
-+      my $pem = "-----BEGIN CERTIFICATE-----\n"
-+              . $encoded
-+              . "-----END CERTIFICATE-----\n";
-+      print CRT "\n$caname\n";
-+      print CRT @precert if($opt_m);
-+      my $maxStringLength = length(decode('UTF-8', $caname, Encode::FB_CROAK | Encode::LEAVE_SRC));
-+      if ($opt_t) {
-+        foreach my $key (keys %trust_purposes_by_level) {
-+           my $string = $key . ": " . join(", ", @{$trust_purposes_by_level{$key}});
-+           $maxStringLength = List::Util::max( length($string), $maxStringLength );
-+           print CRT $string . "\n";
-+        }
-+      }
-+      print CRT ("=" x $maxStringLength . "\n");
-+      if (!$opt_t) {
-+        print CRT $pem;
-+      } else {
-+        my $pipe = "";
-+        foreach my $hash (@included_signature_algorithms) {
-+          $pipe = "|$openssl x509 -" . $hash . " -fingerprint -noout -inform PEM";
-+          if (!$stdout) {
-+            $pipe .= " >> $crt.~";
-+            close(CRT) or die "Couldn't close $crt.~: $!";
-+          }
-+          open(TMP, $pipe) or die "Couldn't open openssl pipe: $!";
-+          print TMP $pem;
-+          close(TMP) or die "Couldn't close openssl pipe: $!";
-+          if (!$stdout) {
-+            open(CRT, ">>$crt.~") or die "Couldn't open $crt.~: $!";
-+          }
-+        }
-+        $pipe = "|$openssl x509 -text -inform PEM";
-+        if (!$stdout) {
-+          $pipe .= " >> $crt.~";
-+          close(CRT) or die "Couldn't close $crt.~: $!";
-+        }
-+        open(TMP, $pipe) or die "Couldn't open openssl pipe: $!";
-+        print TMP $pem;
-+        close(TMP) or die "Couldn't close openssl pipe: $!";
-+        if (!$stdout) {
-+          open(CRT, ">>$crt.~") or die "Couldn't open $crt.~: $!";
-+        }
-+      }
-+      report "Parsing: $caname" if ($opt_v);
-+      $certnum ++;
-+      $start_of_cert = 0;
-+    }
-+    undef @precert;
-+  }
-+
-+}
-+close(TXT) or die "Couldn't close $txt: $!\n";
-+close(CRT) or die "Couldn't close $crt.~: $!\n";
-+unless( $stdout ) {
-+    if ($opt_b && -e $crt) {
-+        my $bk = 1;
-+        while (-e "$crt.~${bk}~") {
-+            $bk++;
-+        }
-+        rename $crt, "$crt.~${bk}~" or die "Failed to create backup $crt.~$bk}~: $!\n";
-+    } elsif( -e $crt ) {
-+        unlink( $crt ) or die "Failed to remove $crt: $!\n";
-+    }
-+    rename "$crt.~", $crt or die "Failed to rename $crt.~ to $crt: $!\n";
-+}
-+if($opt_u && -e $txt && !unlink($txt)) {
-+  report "Failed to remove $txt: $!\n";
-+}
-+report "Done ($certnum CA certs processed, $skipnum skipped).";
-diff --git a/split-ca-bundle.sh b/split-ca-bundle.sh
-new file mode 100644
-index 0000000..d0f39a8
---- /dev/null
-+++ b/split-ca-bundle.sh
-@@ -0,0 +1,30 @@
-+#!/bin/sh
-+
-+mkcert() {
-+	local name="$1"
-+	local line
-+	rm -f "$name"
-+	while read line; do
-+		printf "%s\n" "$line" >> "$name"
-+		if [ "$line" = "-----END CERTIFICATE-----" ]; then
-+			break;
-+		fi
-+	done
-+}
-+
-+prev=
-+while read line; do
-+	case "$line" in
-+	=*=)
-+		fname="$(printf "%s" "$prev" | tr '/ (),' '__==_').crt"
-+		while read cline; do
-+			printf "%s\n" "$cline"
-+			if [ "$cline" = "-----END CERTIFICATE-----" ]; then
-+				break;
-+			fi
-+		done > "$fname"
-+		;;
-+	esac
-+	prev="$line"
-+done
-+
--- 
-2.25.0
-
diff --git a/main/ca-certificates/0003-update-ca-insert-newline-between-certs.patch b/main/ca-certificates/0003-update-ca-insert-newline-between-certs.patch
deleted file mode 100644
index 4a945a076ba..00000000000
--- a/main/ca-certificates/0003-update-ca-insert-newline-between-certs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From fd399b2416191bd7f3b0f267bdb530ed829de271 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 5 Feb 2020 17:40:57 +0100
-Subject: [PATCH 3/3] update-ca: insert newline between certs
-
-There may be certificates that lack a trailing newline, which is allowed
-in the certificate format. We work around that by inject a newline after
-each cert.
-
-see https://gitlab.alpinelinux.org/alpine/aports/issues/8379
----
- update-ca.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/update-ca.c b/update-ca.c
-index 2b3195b..0260f83 100644
---- a/update-ca.c
-+++ b/update-ca.c
-@@ -191,6 +191,7 @@ static void proc_localglobaldir(const char *fullpath, struct hash *h, int tmpfil
- 		fprintf(stderr, "Warning! Cannot hash: %s\n", fullpath);
- 	if (!copyfile(fullpath, tmpfile_fd))
- 		fprintf(stderr, "Warning! Cannot copy to bundle: %s\n", fullpath);
-+	write(tmpfile_fd, "\n", 1);
- 	free(actual_file);
- }
- 
-@@ -260,7 +261,7 @@ static bool dir_readfiles(struct hash* d, const char* path,
- 	DIR *dp = opendir(path);
- 	if (!dp)
- 		return false;
-- 
-+
- 	struct dirent *dirp;
- 	while ((dirp = readdir(dp)) != NULL) {
- 		if (str_begins(dirp->d_name, "."))
--- 
-2.25.0
-
diff --git a/main/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD
index 81ecb9b6e22..15de66d5d8c 100644
--- a/main/ca-certificates/APKBUILD
+++ b/main/ca-certificates/APKBUILD
@@ -1,25 +1,21 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ca-certificates
-pkgver=20191127
-pkgrel=2
+pkgver=20240226
+pkgrel=0
 pkgdesc="Common CA certificates PEM files from Mozilla"
 url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/"
 arch="all"
-license="MPL-2.0 GPL-2.0-or-later"
+# There is a GPL-2.0-or-later script inside the source but it is not shipped
+license="MPL-2.0 AND MIT"
 makedepends_build="perl"
-makedepends_host="openssl-dev"
-subpackages="$pkgname-doc $pkgname-bundle"
-# c_rehash is either in libcrypto1.0 or openssl depending on package, grr.  replace both of them
-replaces="libcrypto1.0 openssl openssl1.0"
+makedepends_host="openssl-dev>3"
+subpackages="$pkgname-doc $pkgname-bundle::noarch"
+replaces="openssl"
 options="!fhs !check"
 triggers="ca-certificates.trigger=/usr/share/ca-certificates:/usr/local/share/ca-certificates:/etc/ssl/certs:/etc/ca-certificates/update.d"
 install="$pkgname.post-deinstall"
-source="https://git.alpinelinux.org/ca-certificates/snapshot/ca-certificates-$pkgver.tar.xz
-	0001-update-ca-fix-compiler-warning.patch
-	0002-replace-python-script-with-perl-script.patch
-	0003-update-ca-insert-newline-between-certs.patch
-	"
+source="https://gitlab.alpinelinux.org/alpine/ca-certificates/-/archive/$pkgver/ca-certificates-$pkgver.tar.bz2"
 
 build() {
 	make
@@ -29,15 +25,15 @@ package() {
 	make install DESTDIR="$pkgdir"
 
 	(
-		echo "# Automatically generated by $pkgname-$pkgver-$pkgrel"
+		echo "# Automatically generated by $pkgname-$pkgver-r$pkgrel"
 		echo "# $(date -u)"
-		echo "# Do not edit."
+		echo "#"
 		cd "$pkgdir"/usr/share/ca-certificates
 		find . -name '*.crt' | sort | cut -b3-
 	) > "$pkgdir"/etc/ca-certificates.conf
 
 	# generate the bundle in similar way as update-ca-certificates would do
-	for i in $(ls *.crt | sort); do
+	find -- *.crt | sort | while read -r i; do
 		cat "$i"
 		printf "\n"
 	done > "$pkgdir"/etc/ssl/certs/ca-certificates.crt
@@ -58,16 +54,20 @@ package() {
 
 bundle() {
 	pkgdesc="Pre generated bundle of Mozilla certificates"
-	replaces="libressl2.7-libcrypto"
+	replaces="libressl2.7-libcrypto libcrypto1.1"
 	provides="$pkgname-cacert=$pkgver-r$pkgrel"
 	mkdir -p "$subpkgdir"/etc/ssl/certs
 	mv "$pkgdir"/etc/ssl/certs/ca-certificates.crt \
 		"$subpkgdir"/etc/ssl/certs/
 	ln -s certs/ca-certificates.crt \
 		"$subpkgdir"/etc/ssl/cert.pem
+
+	# Symlinks for OpenSSL 1.1 compatibility
+	mkdir -p "$subpkgdir"/etc/ssl1.1/
+	ln -s /etc/ssl/certs "$subpkgdir"/etc/ssl1.1/
+	ln -s /etc/ssl/cert.pem "$subpkgdir"/etc/ssl1.1/
 }
 
-sha512sums="68a879680a5e20764b8a4ee3019e9a008193c578a687b0d29694355a679c04cbfa94d4049beb3c52a899d593f46254c94d67db833f39e91325a4476963b9ef18  ca-certificates-20191127.tar.xz
-aafe6d9047380fc403792fbf27146dc9c0532ef401e6eb9bd8b533c110f902cad0a66701cf3563ad625d07ae54619e9f2f3091ec14772b92e178dbed142ecd97  0001-update-ca-fix-compiler-warning.patch
-4d9c71b9ea0596f5efaa188f244b7ab587f96c218bb6fed01f11e34c553909f65bbe660156f8300be9511ae50614661c5dcd3b493ac146a8e888f62fc52bd9d4  0002-replace-python-script-with-perl-script.patch
-051b5d78916ee7389dfbd4e8871aab720415bd6e9ee0313dba770fc40ee7c68ac67d7918f2503458a3218e3bfc10691b5e379b65269106fde02c7e7a36eb7595  0003-update-ca-insert-newline-between-certs.patch"
+sha512sums="
+48a872010eab178dc64aa09ee7d977403b73416e870d0cd2a2dcf004fb86f1468547c116ef82413c3603ac1b9bc20ea70fd169a9426ae756b234ea9fa0287dca  ca-certificates-20240226.tar.bz2
+"
diff --git a/main/ca-certificates/ca-certificates.post-deinstall b/main/ca-certificates/ca-certificates.post-deinstall
index ead634716c2..10d219f03f5 100644
--- a/main/ca-certificates/ca-certificates.post-deinstall
+++ b/main/ca-certificates/ca-certificates.post-deinstall
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# clean up broken symlinks and ca-certificates.crt store
-find -L /etc/ssl/certs -maxdepth 1 \( -type l -o -name ca-certificates.crt \) \
-	-delete
+# clean up broken symlinks store
+find -L /etc/ssl/certs -maxdepth 1 -type l -delete
 rmdir /etc/ssl/certs 2>/dev/null || true
 
diff --git a/main/ca-certificates/ca-certificates.trigger b/main/ca-certificates/ca-certificates.trigger
index eff198163eb..a68e9c7d928 100644
--- a/main/ca-certificates/ca-certificates.trigger
+++ b/main/ca-certificates/ca-certificates.trigger
@@ -1,3 +1,3 @@
 #!/bin/sh
-/usr/sbin/update-ca-certificates --fresh  &> /dev/null
+/usr/sbin/update-ca-certificates &> /dev/null
 exit 0
diff --git a/main/cairo/APKBUILD b/main/cairo/APKBUILD
index d15bd16726b..b5c8cd8947a 100644
--- a/main/cairo/APKBUILD
+++ b/main/cairo/APKBUILD
@@ -1,73 +1,82 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cairo
-pkgver=1.16.0
-pkgrel=2
+pkgver=1.18.0
+pkgrel=0
 pkgdesc="A vector graphics library"
 url="https://cairographics.org/"
 arch="all"
 options="!check"  # Recursive dependency on gtk+2.0 for check.
-license="LGPL-2.0-or-later MPL-1.1"
-depends=
-depends_dev="fontconfig-dev freetype-dev libxrender-dev pixman-dev
-	xcb-util-dev libxext-dev $pkgname-tools"
-makedepends="$depends_dev zlib-dev expat-dev glib-dev libpng-dev autoconf automake libtool"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-gobject $pkgname-tools $pkgname-dbg"
-source="https://cairographics.org/releases/cairo-$pkgver.tar.xz
+license="LGPL-2.1-or-later OR MPL-1.1"
+depends_dev="
+	$pkgname-tools=$pkgver-r$pkgrel
+	fontconfig-dev
+	freetype-dev
+	libxext-dev
+	libxrender-dev
+	pixman-dev
+	xcb-util-dev
+	"
+makedepends="
+	$depends_dev
+	expat-dev
+	glib-dev
+	gtk-doc
+	libpng-dev
+	meson
+	zlib-dev
+	"
+subpackages="
+	$pkgname-dbg
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-gobject
+	$pkgname-tools
+	"
+source="https://gitlab.freedesktop.org/cairo/cairo/-/archive/$pkgver/cairo-$pkgver.tar.bz2
 	musl-stacksize.patch
-	CVE-2018-19876.patch
-	pdf-flush.patch
 	"
-builddir="$srcdir/$pkgname-$pkgver"
 
 # secfixes:
+#   1.17.4-r1:
+#     - CVE-2019-6462
+#   1.16.0-r2:
+#     - CVE-2020-35492
 #   1.16.0-r1:
 #     - CVE-2018-19876
 
 build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-ft \
-		--enable-gobject \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		--enable-svg \
-		--enable-tee \
-		--enable-x \
-		--enable-xcb \
-		--enable-xcb-shm \
-		--enable-xlib \
-		--enable-xlib-xrender \
-		--disable-xlib-xcb \
-		--disable-static
-	make
+	abuild-meson \
+		-Db_lto=true \
+		-Ddefault_library=both \
+		-Dgtk_doc=true \
+		-Dtests="$(want_check && echo enabled || echo disabled)" \
+		. output
+	meson compile -C output
+}
+
+check() {
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
 gobject() {
 	pkgdesc="$pkgdesc (gobject bindings)"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libcairo-gobject.so.* "$subpkgdir"/usr/lib/
+
+	amove usr/lib/libcairo-gobject.so.*
 }
 
 tools() {
 	pkgdesc="$pkgdesc (development tools)"
-	mkdir -p "$subpkgdir"/usr/lib/cairo
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/lib/cairo/libcairo-trace.* \
-		"$subpkgdir"/usr/lib/cairo/
+
+	amove usr/bin
+	amove usr/lib/cairo/libcairo-trace.*
 }
 
-sha512sums="9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f  cairo-1.16.0.tar.xz
+sha512sums="
+bd702f3b64061f8add954c243c9b59f5d44271adfa76d997941ddab629ff8018c2a1d3368edf2362573e0018c342c61483de58240c63e15e1e6035d2511d3e40  cairo-1.18.0.tar.bz2
 86f26fe41deb5e14f553c999090d1ec1d92a534fa7984112c9a7f1d6c6a8f1b7bb735947e8ec3f26e817f56410efe8cc46c5e682f6a278d49b40a683513740e0  musl-stacksize.patch
-8f13cdcae0f134e04778cf5915f858fb8d5357a7e0a454791c93d1566935b985ec66dfe1683cd0b74a1cb44a130923d7a27cf006f3fc70b9bee93abd58a55aa3  CVE-2018-19876.patch
-533ea878dc7f917af92e2694bd3f535a09cde77f0ecd0cc00881fbc9ec1ea86f60026eacc76129705f525f6672929ad8d15d8cfe1bfa61e9962e805a7fbded81  pdf-flush.patch"
+"
diff --git a/main/cairo/CVE-2018-19876.patch b/main/cairo/CVE-2018-19876.patch
deleted file mode 100644
index c9cd71f4ae9..00000000000
--- a/main/cairo/CVE-2018-19876.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <cgarcia@igalia.com>
-Date: Mon, 19 Nov 2018 12:33:07 +0100
-Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in
- cairo_ft_apply_variations
-
-Fixes a crash when using freetype >= 2.9
----
- src/cairo-ft-font.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
-index 325dd61b4..981973f78 100644
---- a/src/cairo-ft-font.c
-+++ b/src/cairo-ft-font.c
-@@ -2393,7 +2393,11 @@ skip:
- done:
-         free (coords);
-         free (current_coords);
-+#if HAVE_FT_DONE_MM_VAR
-+        FT_Done_MM_Var (face->glyph->library, ft_mm_var);
-+#else
-         free (ft_mm_var);
-+#endif
-     }
- }
- 
--- 
-2.18.1
-
diff --git a/main/cairo/pdf-flush.patch b/main/cairo/pdf-flush.patch
deleted file mode 100644
index c6e2251a511..00000000000
--- a/main/cairo/pdf-flush.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From https://cgit.freedesktop.org/cairo/commit/?id=4c8813f0eaacc32c27126ad2296951a626300b89
-
-Fixes https://gitlab.freedesktop.org/cairo/cairo/issues/342
-
-From 4c8813f0eaacc32c27126ad2296951a626300b89 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Thu, 25 Oct 2018 18:46:17 +1030
-Subject: pdf: add missing flush
-
-Issue #342
----
- src/cairo-pdf-surface.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
-index 7eb61aa..939b2d2 100644
---- a/src/cairo-pdf-surface.c
-+++ b/src/cairo-pdf-surface.c
-@@ -7711,6 +7711,11 @@ _cairo_pdf_surface_mask (void			*abstract_surface,
-      * and most common, case to handle. */
-     if (_cairo_pattern_is_constant_alpha (mask, &extents.bounded, &alpha) &&
- 	_can_paint_pattern (source)) {
-+
-+	status = _cairo_pdf_operators_flush (&surface->pdf_operators);
-+	if (unlikely (status))
-+	    goto cleanup;
-+
- 	_cairo_output_stream_printf (surface->output, "q\n");
- 	status = _cairo_pdf_surface_paint_pattern (surface,
- 						   op,
--- 
-cgit v1.1
-
diff --git a/main/cargo-auditable/0001-Fix-tests-on-Rust-1.77.patch b/main/cargo-auditable/0001-Fix-tests-on-Rust-1.77.patch
new file mode 100644
index 00000000000..cffcc1d4a93
--- /dev/null
+++ b/main/cargo-auditable/0001-Fix-tests-on-Rust-1.77.patch
@@ -0,0 +1,46 @@
+From 5317a27244fc428335c4e7a1d066ae0f65f0d496 Mon Sep 17 00:00:00 2001
+From: "Sergey \"Shnatsel\" Davidoff" <shnatsel@gmail.com>
+Date: Mon, 25 Mar 2024 21:58:58 +0000
+Subject: [PATCH] Fix tests on Rust 1.77
+
+---
+ cargo-auditable/tests/it.rs | 19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/cargo-auditable/tests/it.rs b/cargo-auditable/tests/it.rs
+index 24e58e2..84231aa 100644
+--- a/cargo-auditable/tests/it.rs
++++ b/cargo-auditable/tests/it.rs
+@@ -110,11 +110,28 @@ where
+             binaries
+         })
+         .for_each(|(package, binary)| {
+-            bins.entry(package).or_insert(Vec::new()).push(binary);
++            bins.entry(pkgid_to_bin_name(&package))
++                .or_insert(Vec::new())
++                .push(binary);
+         });
+     bins
+ }
+ 
++fn pkgid_to_bin_name(pkgid: &str) -> String {
++    // the input is string in the format such as
++    // "path+file:///home/shnatsel/Code/cargo-auditable/cargo-auditable/tests/fixtures/lib_and_bin_crate#0.1.0"
++    // (for full docs see `cargo pkgid`)
++    // and we need just the crate name, e.g. "lib_and_bin_crate"
++    pkgid
++        .rsplit_once(std::path::MAIN_SEPARATOR)
++        .unwrap()
++        .1
++        .split_once('#')
++        .unwrap()
++        .0
++        .to_owned()
++}
++
+ fn ensure_build_succeeded(output: &Output) {
+     if !output.status.success() {
+         let stderr = std::io::stderr();
+-- 
+2.44.0
+
diff --git a/main/cargo-auditable/APKBUILD b/main/cargo-auditable/APKBUILD
new file mode 100644
index 00000000000..9d6d8f6b251
--- /dev/null
+++ b/main/cargo-auditable/APKBUILD
@@ -0,0 +1,42 @@
+# Maintainer: team/rust <alpine@ptrcnull.me>
+pkgname=cargo-auditable
+pkgver=0.6.2
+pkgrel=0
+pkgdesc="Cargo wrapper for embedding auditing data"
+url="https://github.com/rust-secure-code/cargo-auditable"
+arch="all"
+license="MIT OR Apache-2.0"
+depends="cmd:cargo"
+subpackages="$pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/v$pkgver.tar.gz
+	0001-Fix-tests-on-Rust-1.77.patch
+	"
+options="net"
+
+prepare() {
+	default_prepare
+
+	cargo fetch --target="$CTARGET" --locked
+}
+
+build() {
+	msg "building cargo auditable"
+	cargo build --release --frozen
+	msg "rebuilding with cargo-auditable itself"
+	PATH="$PATH:$PWD/target/release" \
+		cargo auditable build --release --frozen
+}
+
+check() {
+	cargo test --frozen
+}
+
+package() {
+	install -Dm755 target/release/cargo-auditable -t "$pkgdir"/usr/bin/
+	install -Dm644 cargo-auditable/cargo-auditable.1 -t "$pkgdir"/usr/share/man/man1/
+}
+
+sha512sums="
+3656f124d8e43fbb4518d9aa3ad9e40a7cae61c56fa4718e9ff886934b2fcb5b2f116551c63ca17712c203ac93daf2b28a22efe41e556013189dec0ad9248f1f  cargo-auditable-0.6.2.tar.gz
+b5a871ea32bbfba1c6cda46c97ed5793f5dafeb237fc7da2462408d7125ac75519cad9ba6af159a4ce8abe6285b19c65048ba37c3e4a3c05f81625482d575235  0001-Fix-tests-on-Rust-1.77.patch
+"
diff --git a/main/ccache/APKBUILD b/main/ccache/APKBUILD
index 40d68133c16..a6142afaf90 100644
--- a/main/ccache/APKBUILD
+++ b/main/ccache/APKBUILD
@@ -1,49 +1,55 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ccache
-pkgver=3.7.9
-_pkgver=$pkgver
+pkgver=4.9.1
 pkgrel=0
-pkgdesc="A fast C/C++ compiler cache"
+pkgdesc="fast C/C++ compiler cache"
 url="https://ccache.dev/"
 arch="all"
 license="GPL-3.0-or-later"
-makedepends="zlib-dev"
-checkdepends="bash perl"
+makedepends="
+	asciidoctor
+	cmake
+	hiredis-dev
+	linux-headers
+	perl
+	samurai
+	xxhash-dev
+	zstd-dev
+	"
+checkdepends="bash util-linux-misc python3 redis"
 subpackages="$pkgname-doc"
-source="https://github.com/ccache/ccache/releases/download/v$pkgver/ccache-$pkgver.tar.xz"
-
-prepare() {
-	default_prepare
-	update_config_sub
-}
+source="https://github.com/ccache/ccache/releases/download/v$pkgver/ccache-$pkgver.tar.xz
+	ioctl.patch
+	system-xxhash.patch
+	"
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
+	cmake -B build -G Ninja \
+		-DCCACHE_DEV_MODE=OFF \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	cmake --build build
 }
 
 check() {
-	make test
+	ctest --output-on-failure --test-dir build
 }
 
 package() {
-	install -Dm 755 ccache "$pkgdir"/usr/bin/ccache
-	install -Dm 644 doc/ccache.1 "$pkgdir"/usr/share/man/man1/ccache.1
+	DESTDIR="$pkgdir" cmake --install build
 
 	local link=
 	mkdir -p "$pkgdir"/usr/lib/ccache/bin
 
 	for link in cc gcc g++ cpp c++ $CHOST-cc $CHOST-gcc \
-			$CHOST-g++ $CHOST-cpp $CHOST-c++; do
-		ln -sf /usr/bin/ccache "$pkgdir"/usr/lib/ccache/bin/$link
+		$CHOST-g++ $CHOST-c++ c89 c99; do
+		ln -sf ../../../bin/ccache "$pkgdir"/usr/lib/ccache/bin/$link
 	done
 }
 
-sha512sums="5d39baeb66265451b0e9cef250f6d9c5f6869cd87e27c108c9a50bef80050122ed4280ff662a81bba8d1d1311f2004bcaf9ada6b783a42eedc67ca01ebc48bb4  ccache-3.7.9.tar.xz"
+sha512sums="
+5ae4537a7e546b779c80f5adadce1349a84da3a47b255bda06cb2678ee5403307f013c08c8541a21f6f1fb36a0b64bdbcf785fbd2fcfe3009150117250e75b0b  ccache-4.9.1.tar.xz
+231b016e9f80442d679a5d5b58deae94c633882be6a8e87f70b33f436762bc5cbb370888763a003032115960aa987011fbfda5deb089d946cfd1878872ad3be3  ioctl.patch
+4c117b78ed95c7e3b573e31ca11aa3b82a9007b49170bab563b96bab3f1342ee0d33cb31def0bd5ca9fdd00737cdef53f4e9e41613ea1b48e26ae0106fd3540e  system-xxhash.patch
+"
diff --git a/main/ccache/ioctl.patch b/main/ccache/ioctl.patch
new file mode 100644
index 00000000000..1abfc45ae22
--- /dev/null
+++ b/main/ccache/ioctl.patch
@@ -0,0 +1,18 @@
+musl uses an `int` instead of a `unsigend long` for the ioctl function
+prototype, contrary to glibc, since POSIX mandates the former. This
+causes a spurious error on ppc64le which can be silenced by casting to
+int explicitly.
+
+See https://www.openwall.com/lists/musl/2020/01/20/2
+
+--- a/src/storage/local/LocalStorage.cpp
++++ b/src/storage/local/LocalStorage.cpp
+@@ -263,7 +263,7 @@
+     }
+   }
+ 
+-  if (ioctl(*dest_fd, FICLONE, *src_fd) != 0) {
++  if (ioctl(*dest_fd, (int)FICLONE, *src_fd) != 0) {
+     throw core::Error(strerror(errno));
+   }
+ 
diff --git a/main/ccache/system-xxhash.patch b/main/ccache/system-xxhash.patch
new file mode 100644
index 00000000000..9fe511081f4
--- /dev/null
+++ b/main/ccache/system-xxhash.patch
@@ -0,0 +1,77 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 55cfaa4..47d849f 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,3 +1,6 @@
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(xxhash REQUIRED libxxhash)
++
+ set(
+   source_files
+   Args.cpp
+@@ -48,10 +51,10 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
+ find_package(Threads REQUIRED)
+ target_link_libraries(
+   ccache_framework
+-  PRIVATE standard_settings standard_warnings ZSTD::ZSTD Threads::Threads third_party
++  PRIVATE standard_settings standard_warnings ZSTD::ZSTD Threads::Threads third_party ${xxhash_LIBRARIES}
+ )
+ 
+-target_include_directories(ccache_framework PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
++target_include_directories(ccache_framework PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${xxhash_INCLUDE_DIRS})
+ 
+ if(REDIS_STORAGE_BACKEND)
+   target_compile_definitions(ccache_framework PUBLIC -DHAVE_REDIS_STORAGE_BACKEND)
+diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt
+index 0d6ffb3..f05a102 100644
+--- a/src/third_party/CMakeLists.txt
++++ b/src/third_party/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_library(third_party STATIC format.cpp httplib.cpp url.cpp xxhash.c)
++add_library(third_party STATIC format.cpp httplib.cpp url.cpp)
+ if(NOT MSVC)
+   target_sources(third_party PRIVATE getopt_long.c)
+ else()
+@@ -29,16 +29,6 @@ int main()
+ 
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c" "${xxhdispatchtest}")
+ 
+-try_compile(USE_XXH_DISPATCH ${CMAKE_CURRENT_BINARY_DIR}
+-  "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c"
+-  CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${CMAKE_CURRENT_SOURCE_DIR}"
+-  COMPILE_DEFINITIONS "-DXXH_STATIC_LINKING_ONLY")
+-
+-target_compile_definitions(third_party INTERFACE "-DXXH_STATIC_LINKING_ONLY")
+-if(USE_XXH_DISPATCH)
+-  target_sources(third_party PRIVATE xxh_x86dispatch.c)
+-  target_compile_definitions(third_party INTERFACE "-DUSE_XXH_DISPATCH")
+-endif()
+ 
+ # Treat third party headers as system files (no warning for those headers).
+ target_include_directories(
+diff --git a/src/util/XXH3_128.hpp b/src/util/XXH3_128.hpp
+index 309ac7c..f9865a6 100644
+--- a/src/util/XXH3_128.hpp
++++ b/src/util/XXH3_128.hpp
+@@ -25,7 +25,7 @@
+ #ifdef USE_XXH_DISPATCH
+ #  include <third_party/xxh_x86dispatch.h>
+ #else
+-#  include <third_party/xxhash.h>
++#  include <xxhash.h>
+ #endif
+ 
+ #include <cstdint>
+diff --git a/src/util/XXH3_64.hpp b/src/util/XXH3_64.hpp
+index 61f0fab..11b416b 100644
+--- a/src/util/XXH3_64.hpp
++++ b/src/util/XXH3_64.hpp
+@@ -21,7 +21,7 @@
+ #ifdef USE_XXH_DISPATCH
+ #  include "third_party/xxh_x86dispatch.h"
+ #else
+-#  include "third_party/xxhash.h"
++#  include <xxhash.h>
+ #endif
+ 
+ #include <cstdint>
diff --git a/main/cciss_vol_status/APKBUILD b/main/cciss_vol_status/APKBUILD
index c3400946e8b..5e7ddc08105 100644
--- a/main/cciss_vol_status/APKBUILD
+++ b/main/cciss_vol_status/APKBUILD
@@ -1,19 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cciss_vol_status
-pkgver=1.12
-pkgrel=0
+pkgver=1.12a
+pkgrel=2
 pkgdesc="Drivers for the HP (previously Compaq) Smart Array controllers which provide hardware RAID capability"
-url="http://cciss.sourceforge.net/"
+url="https://cciss.sourceforge.net/"
 arch="all"
 license="GPL-2.0-or-later"
 makedepends="linux-headers"
 subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/cciss/$pkgname-$pkgver.tar.gz"
-
-builddir="$srcdir"/$pkgname-$pkgver
+source="https://downloads.sourceforge.net/cciss/cciss_vol_status-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,9 +21,12 @@ build() {
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f9fa8b98bd42810932f03f514b4b8c6cea690378f065a6c9788ddb78612c7ca2aa9a7fefa8a40634cfe247600fb6d3f11f0b687fba77d1423087a2b319773d69  cciss_vol_status-1.12.tar.gz"
+sha512sums="c6aeae0d1fd66aabcd4a82f69b12433770fab2dde726bca67d97a09636e39f2eb596a0695afdb7e3e1a35c3d6882a9804a8263caa9b0dad97da8256afea778be  cciss_vol_status-1.12a.tar.gz"
diff --git a/main/cdparanoia/APKBUILD b/main/cdparanoia/APKBUILD
index 919b9720b65..7c0b721efe8 100644
--- a/main/cdparanoia/APKBUILD
+++ b/main/cdparanoia/APKBUILD
@@ -2,18 +2,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cdparanoia
 pkgver=10.2
-pkgrel=8
+pkgrel=14
 pkgdesc="An audio CD extraction application"
-url="http://www.xiph.org/paranoia"
+url="https://www.xiph.org/paranoia"
 arch="all"
 options="!check"  # Build system has test suite commented out.
-license="LGPL-2.0-or-later"
+license="GPL-2.0-or-later"
 makedepends="libtool autoconf automake linux-headers"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-source="http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz
+source="https://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz
+	format-security.patch
 	gcc.patch
-	fix-includes.patch
-	no-cuserid.patch"
+	fix-includes.patch"
 builddir="$srcdir/$pkgname-III-$pkgver"
 
 prepare() {
@@ -43,12 +43,15 @@ package() {
 
 libs() {
 	pkgdesc="Libraries for libcdda_paranoia (Paranoia III)"
+	license="LGPL-2.1-or-later"
 	replaces="cdparanoia"
 	install -d "$subpkgdir"/usr
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
 }
 
-sha512sums="4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7  cdparanoia-III-10.2.src.tgz
+sha512sums="
+4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7  cdparanoia-III-10.2.src.tgz
+be88cbe9fb611e56eb180de15422b31436226728246397f8460ea56444ea59537efdcde39ffee170ea8d6cf1784ec71df98c1a65c436f7e59a1057e952384a1c  format-security.patch
 27bf216e8b5b9d6971e3999166544025f166587df06065b89657dac62d0d53c01b76f53146c1e9a400dd71460567fadb8fd4ce00576836f972914d69e8855909  gcc.patch
 e8a5ef0f5bcdba697d2d49e31346832bfa2460e6f6cac9256420f57c74a5da2945bdc664368c91365a880ba76e638f58773468d8e8bd16e7afcaff955a1a82ce  fix-includes.patch
-52882bdc689e1a34bc0f3961aa649f400232a3fe769526a01fcbff4ba0d5183c1ad0737265b69668b857b0887b4e4e3f2c78bad913329cc7b621b14d47e873f9  no-cuserid.patch"
+"
diff --git a/main/cdparanoia/format-security.patch b/main/cdparanoia/format-security.patch
new file mode 100644
index 00000000000..16527551a4a
--- /dev/null
+++ b/main/cdparanoia/format-security.patch
@@ -0,0 +1,17 @@
+diff --git a/main.c b/main.c
+index 664acac..d568fb1 100644
+--- a/main.c
++++ b/main.c
+@@ -588,10 +588,10 @@ static void callback(long inpos, int function){
+ 	    buffer[aheadposition+19]='>';
+ 	}
+    
+-	fprintf(stderr,buffer);
++	fprintf(stderr, "%s", buffer);
+        
+ 	if (logfile != NULL && function==-1) {
+-	  fprintf(logfile,buffer+1);
++	  fprintf(logfile, "%s", buffer+1);
+ 	  fprintf(logfile,"\n\n");
+ 	  fflush(logfile);
+ 	}
diff --git a/main/cdparanoia/no-cuserid.patch b/main/cdparanoia/no-cuserid.patch
deleted file mode 100644
index dd6417f8367..00000000000
--- a/main/cdparanoia/no-cuserid.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Since IEEE 1003.1-1988 cuserid is not standardized anymore. The musl
-libc, used by Alpine Linux, currently does not supporting using it with
-a NULL pointer argument [1]. Doing so causes a segmentation fault, to
-fix this remove use of cuserid entirely. This is currently achieved by
-not including the user name in the error message, while it would be
-possible to achieve the same output using getpwuid(geteuid()) this
-requires error handling and would make the patch more complicated.
-
-[1]: https://www.openwall.com/lists/musl/2020/01/29/2
-
-diff -upr cdparanoia-III-10.2.orig/interface/scan_devices.c cdparanoia-III-10.2/interface/scan_devices.c
---- cdparanoia-III-10.2.orig/interface/scan_devices.c	2020-02-12 20:29:46.232958848 +0100
-+++ cdparanoia-III-10.2/interface/scan_devices.c	2020-02-12 20:30:06.336297868 +0100
-@@ -6,8 +6,6 @@
-  * 
-  ******************************************************************/
- 
--#define _GNU_SOURCE /* get cuserid */
--#define _USE_XOPEN /* get cuserid */
- #include <limits.h>
- #include <stdio.h>
- #include <unistd.h>
-@@ -93,8 +91,7 @@ cdrom_drive *cdda_find_a_cdrom(int messa
-     i++;
-   }
-   idmessage(messagedest,messages,
--	    "\n\nNo cdrom drives accessible to %s found.\n",
--	    cuserid(NULL));
-+	    "\n\nNo cdrom drives accessible to current user found.\n", NULL);
-   return(NULL);
- }
- 
diff --git a/main/cdrkit/APKBUILD b/main/cdrkit/APKBUILD
deleted file mode 100644
index 2815925003c..00000000000
--- a/main/cdrkit/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=cdrkit
-pkgver=1.1.11
-pkgrel=2
-pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction"
-url="http://cdrkit.org/"
-arch="all"
-options="!check"  # No test suite.
-license="GPL-2.0"
-depends="file bzip2"
-makedepends="cmake libcap-dev bzip2-dev zlib-dev"
-subpackages="$pkgname-doc"
-source="https://dev.alpinelinux.org/archive/cdrkit/$pkgname-$pkgver.tar.gz"
-
-prepare() {
-	cd "$builddir"
-	# disable rcmd, it is security risk and not implemented in musl
-	sed -i include/xconfig.h.in -e "s/#define HAVE_RCMD 1/#undef HAVE_RCMD/g"
-	default_prepare
-}
-
-build() {
-	cd "$builddir"
-	case "$CLIBC" in
-	musl) export CFLAGS="$CFLAGS -D__THROW=''" ;;
-	esac
-	make
-}
-
-package() {
-	cd "$builddir"
-	make PREFIX="$pkgdir/usr" install
-	cd "$pkgdir/usr/bin"
-	ln -s wodim cdrecord
-	ln -s readom readcd
-	ln -s genisoimage mkisofs
-	ln -s genisoimage mkhybrid
-	ln -s icedax cdda2wav
-	cd "$pkgdir/usr/share/man/man1"
-	ln -s wodim.1 cdrecord.1
-	ln -s readom.1 readcd.1
-	ln -s genisoimage.1 mkisofs.1
-	ln -s genisoimage.1 mkhybrid.1
-	ln -s icedax.1 cdda2wav.1
-}
-
-sha512sums="e5afcd2cb68d39aeff680a0d5b0a7877f94cf6de111b3cb7388261c665fbd3209ce98a20a01911875af7d6b832a156801b1fa46a4481f7c8ba60b22eac0a5b05  cdrkit-1.1.11.tar.gz"
diff --git a/main/cdw/APKBUILD b/main/cdw/APKBUILD
deleted file mode 100644
index 8ece6d86615..00000000000
--- a/main/cdw/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
-# Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
-pkgname=cdw
-pkgver=0.8.1
-pkgrel=2
-pkgdesc="cdw is a front-end for cd recoding tools"
-url="http://cdw.sf.net"
-arch="all"
-license="GPL-2.0"
-depends="cdrkit"
-depends_dev=""
-makedepends="ncurses-dev libcdio-dev libburn-dev bison gettext-dev linux-headers"
-install=""
-subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	cdw_colors.c.patch"
-
-_builddir="${srcdir}/${pkgname}-${pkgver}"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-        export LIBS="-lintl" && ./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "$_builddir"
-	chmod +x ${srcdir}/${pkgname}-${pkgver}/install-sh
-        make DESTDIR="$pkgdir" install || return 1
-}
-
-sha512sums="08f6bac823f534987835f434190601d0a72df2246ff78bfe1af98fd30dda25edb8cf2e09161b3a0bc55e9efefbc453b409cc95fd3c117d447f07e49f79072e33  cdw-0.8.1.tar.gz
-60f882f246ca3739e207d91c95ddf41b03f306012fa771ecf5f9a62497756b8e4d615c2bbc71bfa02cab3cd77b6f6ecf7367a9ef92319f46764f89412b1e2cff  cdw_colors.c.patch"
diff --git a/main/cdw/cdw_colors.c.patch b/main/cdw/cdw_colors.c.patch
deleted file mode 100644
index 87bff5b052b..00000000000
--- a/main/cdw/cdw_colors.c.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cdw-0.8.0/src/user_interface/cdw_colors.c
-+++ cdw-0.8.0/src/user_interface/cdw_colors.c.changed
-@@ -22,6 +22,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <limits.h>
- // #include <dirent.h> /* PATH_MAX */
- 
- #include "cdw_ncurses.h"
diff --git a/main/cgdb/APKBUILD b/main/cgdb/APKBUILD
index 70fa7dc2698..f3d6b5edfcd 100644
--- a/main/cgdb/APKBUILD
+++ b/main/cgdb/APKBUILD
@@ -1,19 +1,23 @@
 # Contributor: Harry
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cgdb
-pkgver=0.7.1
-pkgrel=0
+pkgver=0.8.0
+pkgrel=2
 pkgdesc="The Curses Debugger"
 arch="all"
-license="GPL-2.0"
-url="http://cgdb.sourceforge.net/"
+license="GPL-2.0-or-later"
+url="https://cgdb.github.io/"
 depends="gdb"
 makedepends="flex bison texinfo help2man ncurses-dev readline-dev"
 source="http://cgdb.me/files/cgdb-$pkgver.tar.gz"
 subpackages="$pkgname-doc"
 
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
+
 build() {
-	cd "$builddir"
 	CFLAGS="$CFLAGS -std=c11" \
 	CXXFLAGS="$CXXFLAGS -std=c++11" \
 	./configure \
@@ -25,12 +29,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make install \
 		pkgconfigdir="/usr/lib/pkgconfig" \
 		DESTDIR="$pkgdir"
@@ -38,4 +40,6 @@ package() {
 	mv "$pkgdir"/usr/share/cgdb "$pkgdir"/usr/share/doc/
 }
 
-sha512sums="34f1fa53cfc9fbf7a2603db169e8338c0bf32200ed7a63e9944951f446e295e49f4ff3c5d0998a4c70bc872376263e1469d7e518becc13b4959f66495d5b9521  cgdb-0.7.1.tar.gz"
+sha512sums="
+0f53798707f20508a8ea564d5ed3f82e223edf4b246468c9a99c929c043b2b2eb333e96395b66672a38da1e517efb7c7dec011a29ea774d873ddf81fb56e4d9a  cgdb-0.8.0.tar.gz
+"
diff --git a/main/cgit/APKBUILD b/main/cgit/APKBUILD
index 51b2c319be7..9bccf905f5a 100644
--- a/main/cgit/APKBUILD
+++ b/main/cgit/APKBUILD
@@ -2,17 +2,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cgit
 pkgver=1.2.3
-pkgrel=0
+pkgrel=5
 _gitver=2.25.1
 pkgdesc="A fast webinterface for git"
 url="https://git.zx2c4.com/cgit/"
 arch="all"
-license="GPL-2.0-only"
-makedepends="openssl-dev zlib-dev lua5.3-dev asciidoc"
+license="GPL-2.0-or-later"
+makedepends="openssl-dev>3 zlib-dev lua5.3-dev asciidoc"
 subpackages="$pkgname-doc"
 source="http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz
 	https://www.kernel.org/pub/software/scm/git/git-$_gitver.tar.gz
 	"
+options="!check"
 
 _makeopts="NO_ICONV=YesPlease
 	NO_GETTEXT=YesPlease
diff --git a/main/charybdis/APKBUILD b/main/charybdis/APKBUILD
deleted file mode 100644
index 987b242da2e..00000000000
--- a/main/charybdis/APKBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# Contributor: Francesco Colista <fcolista@alpinelinux.org>
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname=charybdis
-pkgver=4.1.2
-pkgrel=2
-pkgdesc="A highly-scalable IRCv3-compliant IRC daemon"
-url="https://github.com/charybdis-ircd/charybdis"
-arch="all"
-license="GPL-2.0-or-later"
-pkgusers="ircd"
-makedepends="automake autoconf libtool
-	bison flex openssl-dev zlib-dev file
-	sqlite-dev libltdl"
-install="$pkgname.pre-install"
-subpackages="$pkgname-openrc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/charybdis-ircd/charybdis/archive/charybdis-$pkgver.tar.gz
-	$pkgname.initd
-	$pkgname.confd
-	"
-builddir="$srcdir"/$pkgname-$pkgname-$pkgver
-
-prepare() {
-	default_prepare
-	./autogen.sh
-}
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc/charybdis \
-		--localstatedir=/var/lib \
-		--libexecdir=/usr/lib \
-		--libdir=/usr/lib/charybdis \
-		--enable-epoll \
-		--with-custom-branding=alpinelinux \
-		--enable-openssl \
-		--enable-ipv6 \
-		--with-shared-sqlite \
-		--with-rundir=/var/run/charybdis \
-		--with-logdir=/var/log/charybdis \
-		--with-moduledir=/usr/lib/charybdis/modules \
-		--with-program-prefix=charybdis-
-	make -j1
-}
-
-check() {
-	make check
-}
-
-package() {
-	make -j1 DESTDIR="$pkgdir" install
-	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/charybdis-ircd
-	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/charybdis-ircd
-	install -d -o ircd "$pkgdir"/var/run/charybdis
-	install -d -o ircd "$pkgdir"/var/lib/charybdis
-	install -d -o ircd "$pkgdir"/var/log/charybdis
-}
-
-sha512sums="409d64f1e6660c667699013436f434e419c5a8fb49acc9db0f2f707d0aee55d93df58c81beb60fb736cf8bd64499a64519a32d15b384aa628801eb2f20620545  charybdis-4.1.2.tar.gz
-7c5288f5a1f070a534ecfb306b233802515fff916411e7eb7837398f0f126f38b9338a046d5e4fc211f6f8328404b1f2db71aac2b8ef968173a700b09faa5f7a  charybdis.initd
-1886b312b0ea40945de45db7a379bff2a3af426155fb77676e03f21f8d1d733e057fb5c3cb65fb72bb56008c4c92f3d2d0010563f871fd0802446de443ddfd5e  charybdis.confd"
diff --git a/main/charybdis/charybdis.confd b/main/charybdis/charybdis.confd
deleted file mode 100644
index b91c0d9276a..00000000000
--- a/main/charybdis/charybdis.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-CHARYBDIS_USER="ircd"
-CHARYBDIS_PID="/var/run/charybdis/ircd.pid"
-CHARYBDIS_CONF="/etc/charybdis/ircd.conf"
diff --git a/main/charybdis/charybdis.initd b/main/charybdis/charybdis.initd
deleted file mode 100644
index 779d6425dc8..00000000000
--- a/main/charybdis/charybdis.initd
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/sbin/openrc-run
-
-command="/usr/bin/charybdis"
-command_user="${CHARYBDIS_USER:-ircd}"
-
-depend() {
-	use net
-	provide ircd
-}
diff --git a/main/charybdis/charybdis.pre-install b/main/charybdis/charybdis.pre-install
deleted file mode 100644
index 8675cb94138..00000000000
--- a/main/charybdis/charybdis.pre-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-adduser -S -D -h /var/run/charybdis -s /sbin/nologin -g ircd ircd 2>/dev/null
-
-exit 0
diff --git a/main/check/APKBUILD b/main/check/APKBUILD
index 123db2c85cf..7cb794b82f3 100644
--- a/main/check/APKBUILD
+++ b/main/check/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=check
-pkgver=0.14.0
-pkgrel=0
+pkgver=0.15.2
+pkgrel=5
 pkgdesc="A unit test framework for C"
 url="https://libcheck.github.io/check/"
 arch="all"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 makedepends="pkgconfig texinfo autoconf automake libtool"
 checkdepends="diffutils gawk"
 subpackages="$pkgname-doc $pkgname-dev"
@@ -25,6 +25,7 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
+		--disable-static \
 		--enable-build-docs
 	make
 }
@@ -37,4 +38,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="07fc85b5eecffeb407f554c0cb737126ed6d68ba0db3d74c14697505f2b410496ff72311f08bbf43d7af1c971f0475e776966e320bfb3fe00cde1ecbe1d6f367  check-0.14.0.tar.gz"
+sha512sums="
+77fb34348bc1b1517801865afee5064121a245c10685e6bb6b8f743552646a0643cfdf9fd3dfbf9b2297d9430dfdd49616cf7daf41298d2dbd699f10d654a025  check-0.15.2.tar.gz
+"
diff --git a/main/checkbashisms/APKBUILD b/main/checkbashisms/APKBUILD
deleted file mode 100644
index 8a3cdd18d1e..00000000000
--- a/main/checkbashisms/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=checkbashisms
-pkgver=2.20.2
-pkgrel=0
-pkgdesc="Check shell scripts for POXIX compliance"
-url="https://tracker.debian.org/pkg/devscripts"
-arch="noarch"
-license="GPL-2.0-or-later"
-depends="perl"
-subpackages="$pkgname-doc"
-source="http://cdn.debian.net/debian/pool/main/d/devscripts/devscripts_$pkgver.tar.xz"
-builddir="$srcdir/devscripts-$pkgver/scripts"
-
-check() {
-	printf '#!/bin/sh\necho "hello world"\n' > ./testfile
-	perl ./checkbashisms --version
-	perl ./checkbashisms ./testfile
-}
-
-prepare() {
-	default_prepare
-	mv "$pkgname".pl "$pkgname"
-	sed -i "s/###VERSION###/$pkgver/" "$pkgname"
-}
-
-package() {
-	install -D -m755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
-	install -D -m755 "$pkgname".1 "$pkgdir/usr/share/man/man1/$pkgname".1
-}
-
-sha512sums="d9147604a718582a19c036a040c62612427163146048dbf9e3665545072e8132d08f51dccfd3f0a01453c0405a0326dad8f83afd10270eec5c69fa0612cb8510  devscripts_2.20.2.tar.xz"
diff --git a/main/chrony/APKBUILD b/main/chrony/APKBUILD
index 47d20303799..488d57f84f8 100644
--- a/main/chrony/APKBUILD
+++ b/main/chrony/APKBUILD
@@ -2,22 +2,19 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=chrony
-pkgver=3.5
-pkgrel=2
-_ver=${pkgver/_/-}
+pkgver=4.5
+pkgrel=0
 pkgdesc="NTP client and server programs"
-options="!check" # line 82 of test/unit/util.c fails on all arches
-url="https://chrony.tuxfamily.org"
+url="https://chrony-project.org/"
 pkgusers="$pkgname"
 pkggroups="$pkgname"
 arch="all"
-license="GPL-2.0-only"
+license="GPL-2.0-or-later"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
-makedepends="asciidoctor libcap-dev texinfo"
+makedepends="asciidoctor libcap-dev texinfo nettle-dev gnutls-dev libseccomp-dev"
 checkdepends="bash"
-subpackages="$pkgname-doc $pkgname-openrc"
-source="https://download.tuxfamily.org/chrony/chrony-$_ver.tar.gz
-	fix-tests.patch
+subpackages="$pkgname-dbg $pkgname-doc $pkgname-openrc"
+source="https://chrony-project.org/releases/chrony-$pkgver.tar.gz
 	max_resolve_interval.patch
 
 	chronyd.confd
@@ -25,6 +22,11 @@ source="https://download.tuxfamily.org/chrony/chrony-$_ver.tar.gz
 	chrony.conf
 	timepps.h
 	"
+
+# secfixes:
+#   3.5.1-r0:
+#     - CVE-2020-14367
+
 prepare() {
 	default_prepare
 
@@ -36,15 +38,18 @@ prepare() {
 }
 
 build() {
-	CPPFLAGS="$CPPFLAGS -I./pps-tools/" ./configure \
+	CPPFLAGS="$CPPFLAGS -I./pps-tools/" \
+	CFLAGS="$CFLAGS -flto=auto" \
+	./configure \
 		--prefix=/usr \
-		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc/$pkgname \
+		--chronyrundir=/run/chrony \
 		--disable-readline \
 		--with-user=$pkgname \
 		--with-sendmail=/usr/sbin/sendmail \
-		--enable-ntp-signd
+		--enable-ntp-signd \
+		--enable-scfilter
 	make all docs
 }
 
@@ -77,10 +82,11 @@ package() {
 	touch "$pkgdir"/var/lib/chrony/chrony.drift
 }
 
-sha512sums="c4f6376a44d71b6ac2b6d86e3d6fb4348642faeef7f3f3a4d6431627b5645efcc868b005cc398c8292bc3b63a1161fbd1a042c6ac2a0595843f908fe32eed90c  chrony-3.5.tar.gz
-067d47224a8c075ec8f63ffc58e65b030fdf228a72c4f03d50a2f2c17414da65bb5d27c7c2e4ba99e909f452041db83eaebe3c9e34c0c8fce18e05ebb489735e  fix-tests.patch
-b26581ed32680585edea5b8163a0062a87f648394c0f363c77a7d01a36608fcf4d005d9e6ab179ed2827b8a08f598f7bad4801bb5e135cad5107eb77fb19b247  max_resolve_interval.patch
-0490770cc214b4ccf76470420e0b33e6c41ad16344d6503973a28346b002e2cee441e9ae982be1a8f21696da26f436f2ce36a5201e9628becb83bad3487d9170  chronyd.confd
-5c1a36a4a5f3d7b76c0042c70ff066664a0e2926fff66ce6c0fdcefbc4b70a8b23f660fec59eea45d3c90628bd9a1db7c5d34bbf2b5786d4c6cd9311538b8b6c  chronyd.initd
+sha512sums="
+58a449e23186da799064b16ab16f799c1673296984b152b43e87c620d86e272c55365e83439d410fc89e4e0ba0befd7d5c625eac78a6665813b7ea75444f71b5  chrony-4.5.tar.gz
+f6f2056d1e70785f66b0fbec6e3ec9b0184785eac262e28e2a2c4d5a49762bf780ed7c2c7990a93f6ef063c167cea01fb8828705be558d0b8ff8c07d6962239f  max_resolve_interval.patch
+c1ce577ed1af9f3d88a6a2880a4834ae0c6a7f45870d9396d2aacd7716eb8de346ce458e1a45fdd48b1e8b8f5cd3afcba9534ac47fedb517604c9d910a342fac  chronyd.confd
+cc19b01a2a2cc26738f52c2c15d88db47240dcd00987ce5e75ba69fae8385b83a2643946f390d7ce0b73826b8de878989788b36ae5e43b2daac4477cbf9752f6  chronyd.initd
 663c6316bcca762de119d88e4bb6536bfe0fea19939fe1b673900847619e7f1d6783b789b38ebba97b5dc3778dedf798bafd65f00f8bd7e312bfed7df0caaf71  chrony.conf
-eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048  timepps.h"
+eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048  timepps.h
+"
diff --git a/main/chrony/chronyd.confd b/main/chrony/chronyd.confd
index 1d13bf64aeb..02856d1d486 100644
--- a/main/chrony/chronyd.confd
+++ b/main/chrony/chronyd.confd
@@ -15,3 +15,6 @@ FAST_STARTUP=no
 # the gain or loss rate across system reboots and shutdowns.
 
 ARGS=""
+
+# vrf e.g 'vrf-mgmt'
+#vrf=""
diff --git a/main/chrony/chronyd.initd b/main/chrony/chronyd.initd
index 1b8b9a42af2..08b4d31a121 100644
--- a/main/chrony/chronyd.initd
+++ b/main/chrony/chronyd.initd
@@ -1,11 +1,10 @@
 #!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chronyd.rc,v 1.8 2007/03/22 14:32:09 tove Exp $
 
 command="/usr/sbin/chronyd"
 description="NTP daemon"
-pidfile="/var/run/chrony/chronyd.pid"
+pidfile="/run/chrony/chronyd.pid"
+required_files="$CFGFILE"
+command_args="-f $CFGFILE $ARGS"
 
 depend() {
 	need net
@@ -14,65 +13,20 @@ depend() {
 	use dns
 }
 
-checkconfig() {
-	# Note that /etc/chrony/chrony.keys is *NOT* checked. This
-	# is because the user may have specified another key
-	# file, and we don't want to force the user to use that
-	# exact name for the key file.
-	if [ ! -f "${CFGFILE}" ] ; then
-		eerror "Please create ${CFGFILE} and the"
-		eerror "chrony key file (usually /etc/chrony/chrony.keys)"
-		eerror "by using the"
-		eerror ""
-		eerror "        chrony.conf.example"
-		eerror "        chrony.keys.example"
-		eerror ""
-		eerror "files (from the documentation directory)"
-		eerror "as templates."
-		return 1
-	else
-		# Actually, I tried it, and chrony seems to ignore the pidfile
-		# option. I'm going to leave it here anyway, since you never
-		# know if it might be handy
-		_cfg_pidfile=`awk '/^ *pidfile/{print $2}' "${CFGFILE}"`
-		if [ -n "$_cfg_pidfile" ] ; then
-			pidfile="$_cfg_pidfile"
-		fi
-	fi
-	return 0
-}
-
-setxtrarg() {
+start() {
 	if [ -c /dev/rtc ]; then
-		grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s"
+		grep -q '^rtcfile' "${CFGFILE}" && command_args="$command_args -s"
 	fi
-	grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r"
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-	setxtrarg
-
-	local daemon_args=
+	grep -q '^dumponexit$' "${CFGFILE}" && command_args="$command_args -r"
 	if yesno "$FAST_STARTUP"; then
-		ARGS="${ARGS} -n"
-		daemon_args="--background"
+		# this option makes it stay in foreground and let openrc do the tracking,
+		# so we have to set pidfile to a dir that exists earlier.
+		# the reason this is not the default is because there is no 'readiness',
+		# self-backgrounding chrony waits for time to sync before continuing,
+		# and this form does not.
+		command_args="$command_args -n"
+		command_background=true
+		pidfile=/run/chronyd.pid
 	fi
-
-	ebegin "Starting chronyd"
-	start-stop-daemon $daemon_args --start --quiet \
-		--exec "${command}" \
-		--pidfile "${pidfile}" \
-		-- -f "${CFGFILE}" ${ARGS}
-	eend $? "Failed to start chronyd"
-}
-
-stop() {
-	checkconfig || return $?
-
-	ebegin "Stopping chronyd"
-	start-stop-daemon --stop --quiet \
-		--pidfile "${pidfile}"
-	eend $? "Failed to stop chronyd"
+	default_start
 }
diff --git a/main/chrony/fix-tests.patch b/main/chrony/fix-tests.patch
deleted file mode 100644
index 6291fb0469e..00000000000
--- a/main/chrony/fix-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr chrony-3.2.orig/test/unit/test.c chrony-3.2/test/unit/test.c
---- chrony-3.2.orig/test/unit/test.c	2017-11-29 11:32:23.610059580 +0100
-+++ chrony-3.2/test/unit/test.c	2017-11-29 11:32:51.213742887 +0100
-@@ -23,6 +23,8 @@
- #include <logging.h>
- #include <localp.h>
- 
-+#include <sys/param.h>
-+
- #include "test.h"
- 
- void
diff --git a/main/chrony/max_resolve_interval.patch b/main/chrony/max_resolve_interval.patch
index 6343d912235..d6a5f373e9f 100644
--- a/main/chrony/max_resolve_interval.patch
+++ b/main/chrony/max_resolve_interval.patch
@@ -2,12 +2,12 @@ Try fix behaviour when network is not available at bootup
 
 --- ./ntp_sources.c.orig
 +++ ./ntp_sources.c
-@@ -87,7 +85,7 @@
+@@ -109,7 +109,7 @@
  
  #define RESOLVE_INTERVAL_UNIT 7
  #define MIN_RESOLVE_INTERVAL 2
 -#define MAX_RESOLVE_INTERVAL 9
 +#define MAX_RESOLVE_INTERVAL 6
- #define MIN_REPLACEMENT_INTERVAL 8
+ #define MAX_REPLACEMENT_INTERVAL 9
  
  static struct UnresolvedSource *unresolved_sources = NULL;
diff --git a/main/chrpath/APKBUILD b/main/chrpath/APKBUILD
index 023e26e180e..089a7c79a6c 100644
--- a/main/chrpath/APKBUILD
+++ b/main/chrpath/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=chrpath
 pkgver=0.16
-pkgrel=2
+pkgrel=4
 pkgdesc="Modify rpath of compiled programs"
 url="https://tracker.debian.org/pkg/chrpath"
 arch="all"
@@ -9,8 +9,12 @@ license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
 source="https://alioth-archive.debian.org/releases/chrpath/chrpath/$pkgver/chrpath-$pkgver.tar.gz"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,12 +27,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" docdir=/usr/share/doc/$pkgname-$pkgver \
 		install
 }
diff --git a/main/cifs-utils/APKBUILD b/main/cifs-utils/APKBUILD
index df7ee1e8046..b4cbeb796aa 100644
--- a/main/cifs-utils/APKBUILD
+++ b/main/cifs-utils/APKBUILD
@@ -1,23 +1,35 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=cifs-utils
-pkgver=6.10
-pkgrel=1
+pkgver=7.0
+pkgrel=3
 pkgdesc="CIFS filesystem user-space tools"
 url="https://wiki.samba.org/index.php/LinuxCIFS_utils"
 arch="all"
-license="GPL-2.0-or-later"
+license="GPL-3.0-or-later"
 makedepends="libcap-dev keyutils-dev krb5-dev talloc-dev
 	autoconf automake samba-dev py3-docutils"
 subpackages="$pkgname-doc $pkgname-dev"
 source="https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-$pkgver.tar.bz2
 	musl-fix-includes.patch
 	xattr_size_max.patch
-	path-install.patch"
+	cifs.upcall.request-key.conf
+	"
 options="suid"
 
+# secfixes:
+#   6.15-r0:
+#     - CVE-2022-27239
+#     - CVE-2022-29869
+#   6.13-r0:
+#     - CVE-2021-20208
+#   0:
+#     - CVE-2020-14342 # requires --with-systemd
+
 prepare() {
 	default_prepare
+	update_config_sub
+
 	autoreconf -i
 }
 
@@ -35,12 +47,16 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
-	rm -r $pkgdir/usr/bin
-	# set mount.cifs uid, to enable none root mounting form fstab
+	rm -r "$pkgdir"/usr/bin
+	# set mount.cifs uid, to enable non-root mounting from fstab
 	chmod +s $pkgdir/sbin/mount.cifs
+	mkdir -p "$pkgdir"/etc/request-key.d
+	install -Dm644 "$srcdir"/cifs.upcall.request-key.conf "$pkgdir"/etc/request-key.d/
 }
 
-sha512sums="e19ca69b7948f01c1fd6a4ed069e00511588b903a5b8b0dc35ac1e00743170b9ca180b747c47d56cfacf273b296da21df60e1957404f26ebf2ba80bfa7e275cc  cifs-utils-6.10.tar.bz2
+sha512sums="
+4c57741af0c4567a78f352c73caca998881666a5ed36536275cfa775efd66ff1a44ebe539a8ed96c409c5b08a1378266964ce667a27e9fc7f2d43999c63dd0eb  cifs-utils-7.0.tar.bz2
 99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe  musl-fix-includes.patch
 2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98  xattr_size_max.patch
-2c44eab140eec13f4e6c36c1fd3d0961af01baa867b16011fb2241718eb1c785660bd874dc845213161e058341cee6fd5fdb7487b7f7731cf1886fd73597924d  path-install.patch"
+4b5f32e6b80858858713ffa918bf592e39deeebe03e2d05cff965e13fde8ca8c20a7b5283bce89c0a0cb0d9447044f71807698274ed9d5fd8c71f450fdc29512  cifs.upcall.request-key.conf
+"
diff --git a/main/cifs-utils/cifs.upcall.request-key.conf b/main/cifs-utils/cifs.upcall.request-key.conf
new file mode 100644
index 00000000000..1a6e1b7d52a
--- /dev/null
+++ b/main/cifs-utils/cifs.upcall.request-key.conf
@@ -0,0 +1,2 @@
+#OP	TYPE		DESCRIPTION	CALLOUT INFO	PROGRAM ARG1 ARG2 ARG3 ...
+create	cifs.spnego	*		*		/usr/sbin/cifs.upcall %k
diff --git a/main/cifs-utils/path-install.patch b/main/cifs-utils/path-install.patch
deleted file mode 100644
index 02a464073dd..00000000000
--- a/main/cifs-utils/path-install.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index fe9cd34..6ab4b01 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -119,10 +119,10 @@ endif
- SUBDIRS = contrib
- 
- install-exec-hook:
--	(cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3)
-+	(cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3)
- 
- install-data-hook:
--	(cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8)
-+	(cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8)
- 
- uninstall-hook:
- 	(cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3)
diff --git a/main/ciwiki/APKBUILD b/main/ciwiki/APKBUILD
deleted file mode 100644
index 42f730d066d..00000000000
--- a/main/ciwiki/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
-# Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
-pkgname=ciwiki
-pkgver=2.0.5
-pkgrel=1
-pkgdesc="A personal lightweight wiki written in C"
-url="http://ciwiki.sourceforge.net/"
-arch="all"
-license="GPL-3.0"
-options="!check"
-subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-
-builddir="${srcdir}/${pkgname}-${pkgver}"
-
-build() {
-	cd "$builddir"
-        ./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--libexecdir=/usr/lib/ciwiki
-        make
-}
-
-package() {
-	cd "$builddir"
-	make install DESTDIR="$pkgdir"
-
-}
-
-sha512sums="ce4aefb8fa7cc0630b1d1841260452d50f762a8c8b3e8da1fb0c878cada9ccfc1824d1e20004db8bc8f9c77a0658879e3fa97c4914e73618b404937fb5ea1c29  ciwiki-2.0.5.tar.gz"
diff --git a/main/cjdns/APKBUILD b/main/cjdns/APKBUILD
deleted file mode 100644
index 2c83c907067..00000000000
--- a/main/cjdns/APKBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Maintainer: kpcyrd <git@rxv.cc>
-# Contributor: kpcyrd <git@rxv.cc>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
-
-pkgname=cjdns
-pkgver=20.5
-pkgrel=0
-pkgdesc="A routing engine designed for security, scalability, speed and ease of use"
-url="https://github.com/cjdelisle/cjdns"
-arch="all !x86 !s390x !mips64"
-license="GPL-3.0-or-later"
-makedepends="nodejs python3 linux-headers libseccomp-dev"
-install="$pkgname.post-install"
-subpackages="$pkgname-doc $pkgname-openrc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/cjdelisle/cjdns/archive/cjdns-v$pkgver.tar.gz
-	no-march-flag.patch"
-
-builddir="$srcdir/$pkgname-$pkgname-v$pkgver"
-
-build() {
-	cd "$builddir"
-	export CJDNS_RELEASE_VERSION="$pkgver"
-	node ./node_build/make.js
-}
-
-check() {
-	cd "$builddir"
-	./cjdroute --help >/dev/null
-}
-
-package() {
-	cd "$builddir"
-	install -Dm755 cjdroute "$pkgdir/usr/sbin/cjdroute"
-	install -Dm755 contrib/openrc/cjdns "$pkgdir/etc/init.d/cjdns"
-	install -Dm644 doc/man/cjdroute.conf.5 \
-		"$pkgdir/usr/share/man/man5/cjdroute.conf.5"
-	install -Dm 644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
-	install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname" \
-		doc/admin-api.md \
-		doc/configure.md \
-		doc/djc_layer_model.md \
-		doc/nat-gateway.md \
-		doc/network-services.md \
-		doc/non-root-user.md \
-		doc/security_specification.md \
-		doc/shorewall_and_vpn_gateway_howto.md \
-		doc/tunnel.md
-}
-
-sha512sums="36ae20182b9e9601ae64630cb0fa96caccbe5279be48520ea8b457a15437da5c9b48a5ae5588bd76ef819efe696b5a582a906a50e4dbe7760bb96fa7d1d63ea3  cjdns-20.5.tar.gz
-0c487a46609b75408d83cee954fc49f47997f0e9ee2bb8f64c3edc7e67273e5e90b4b2028847e09faa4bd1310b82f1a86fa7d0d0c42f18510cc9dcd4bccb8808  no-march-flag.patch"
diff --git a/main/cjdns/cjdns.post-install b/main/cjdns/cjdns.post-install
deleted file mode 100644
index 0e091e941c1..00000000000
--- a/main/cjdns/cjdns.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-umask 007
-[ ! -f /etc/cjdroute.conf ] && \
-	cjdroute --genconf > /etc/cjdroute.conf
diff --git a/main/cjdns/no-march-flag.patch b/main/cjdns/no-march-flag.patch
deleted file mode 100644
index aaec16c2edb..00000000000
--- a/main/cjdns/no-march-flag.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/node_build/make.js b/node_build/make.js
-index b3ae15d..b86e07f 100644
---- a/node_build/make.js
-+++ b/node_build/make.js
-@@ -29,7 +29,7 @@ var GCC = process.env['CC'];
- var CFLAGS = process.env['CFLAGS'];
- var LDFLAGS = process.env['LDFLAGS'];
- 
--var NO_MARCH_FLAG = ['arm', 'ppc', 'ppc64'];
-+var NO_MARCH_FLAG = ['arm', 'arm64', 'mips', 'mips64', 'mips64el', 'mipsel', 'ppc', 'ppc64'];
- 
- if (GCC) {
-     // Already specified.
diff --git a/main/cjson/APKBUILD b/main/cjson/APKBUILD
new file mode 100644
index 00000000000..06ea4c62d15
--- /dev/null
+++ b/main/cjson/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=cjson
+pkgver=1.7.17
+pkgrel=0
+pkgdesc="Lighweight JSON parser in C"
+url="https://github.com/DaveGamble/cJSON"
+arch="all"
+license="MIT"
+makedepends="cmake samurai"
+subpackages="$pkgname-dev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/DaveGamble/cJSON/archive/v$pkgver.tar.gz"
+builddir="$srcdir/cJSON-$pkgver"
+
+# secfixes:
+#   1.7.17-r0:
+#     - CVE-2023-50472
+#     - CVE-2023-50471
+
+build() {
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake -B build -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_AND_STATIC_LIBS=True \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		$CMAKE_CROSSOPTS
+	cmake --build build
+}
+
+check() {
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --build build --target install
+}
+
+sha512sums="
+4feebafa5225297fa3e6a7bf23f8d31b5c3e172f437078c5a07528522ad58ca2e9c72dd9e8611241d2b8321e9aa0a1a9af7743689d1c2001d1d9cb624aae6fa8  cjson-1.7.17.tar.gz
+"
diff --git a/main/ckbcomp/APKBUILD b/main/ckbcomp/APKBUILD
index 7b2080a5f69..aa990809f26 100644
--- a/main/ckbcomp/APKBUILD
+++ b/main/ckbcomp/APKBUILD
@@ -1,20 +1,22 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ckbcomp
-pkgver=1.195
+pkgver=1.226
 pkgrel=0
 pkgdesc="Compile a XKB keyboard description to a keymap"
-url="http://anonscm.debian.org/cgit/d-i/console-setup.git"
+url="https://salsa.debian.org/installer-team/console-setup"
 arch="noarch"
 license="GPL-2.0-or-later"
 depends="perl"
 options="!check"
 subpackages="$pkgname-doc"
-source="http://ftp.debian.org/debian/pool/main/c/console-setup/console-setup_$pkgver.tar.xz"
-builddir="$srcdir"/console-setup
+source="https://salsa.debian.org/installer-team/console-setup/-/archive/$pkgver/console-setup-$pkgver.tar.gz"
+builddir="$srcdir"/console-setup-$pkgver
 
 package() {
 	install -D -m755 Keyboard/$pkgname $pkgdir/usr/bin/$pkgname
 	install -D -m644 man/$pkgname.1 $pkgdir/usr/share/man/man1/$pkgname.1
 }
 
-sha512sums="f9ee8df45cfb78dea12b1ba3020e32f245dd940bc1d22801849f673f4448853c0ebadb6944a92b462e3e56c59ee13fd6d2130c260a1a406e1bb1c72e9902c04d  console-setup_1.195.tar.xz"
+sha512sums="
+419cd3d09a10e36586c325d939b80e6e096963890e88294635599a9122e7964a420dccaa9c682574cb73b816fafe893e97f8f56ad100b8e0e2a073730542f5c8  console-setup-1.226.tar.gz
+"
diff --git a/main/cksfv/APKBUILD b/main/cksfv/APKBUILD
index 35e3bbe29e8..7b11cb48570 100644
--- a/main/cksfv/APKBUILD
+++ b/main/cksfv/APKBUILD
@@ -1,19 +1,17 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=cksfv
-pkgver=1.3.14
-pkgrel=4
+pkgver=1.3.15
+pkgrel=3
 pkgdesc="Simple File Verification"
 url="http://zakalwe.fi/~shd/foss/cksfv"
 arch="all"
+checkdepends="bash"
 license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
-source="http://zakalwe.fi/~shd/foss/cksfv/files/$pkgname-$pkgver.tar.bz2"
-
-builddir="$srcdir/$pkgname-$pkgver"
+source="http://zakalwe.fi/~shd/foss/cksfv/files/cksfv-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,14 +20,12 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	install -cD src/cksfv "$pkgdir"/usr/bin/cksfv
 	install -cD cksfv.1 "$pkgdir"/usr/share/man/man1/cksfv.1
 }
 
-sha512sums="016c2f61632980678957fe4b5bc9ecb30360efd548ff09bfbb7a31cc6fc36f6fe7936d3d819fe468a6208c71f8b625662aa3ae0abd668435d7273e149d7e4519  cksfv-1.3.14.tar.bz2"
+sha512sums="a0b5286e0dce610e8b482a55cf8af38f8f8256e175435b6f2518c6566ea844c3cf2981f96c7600c7eb9b23b35cf19f1b55f540ba0f73f1267e4593e744858d43  cksfv-1.3.15.tar.bz2"
diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
deleted file mode 100644
index 95e99450cde..00000000000
--- a/main/clamav/APKBUILD
+++ /dev/null
@@ -1,249 +0,0 @@
-# Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
-pkgname=clamav
-pkgver=0.102.2
-pkgrel=0
-pkgusers="clamav"
-pkggroups="clamav"
-pkgdesc="An anti-virus toolkit for UNIX eis-ng backport"
-url="https://www.clamav.net/"
-arch="all"
-license="GPL-2.0"
-depends="$pkgname-scanner $pkgname-daemon"
-depends_dev="openssl-dev"
-install="freshclam.pre-install
-	clamav-daemon.pre-install clamav-daemon.pre-upgrade"
-makedepends="ncurses-dev zlib-dev bzip2-dev pcre-dev linux-headers $depends_dev
-	libmilter-dev fts-dev curl-dev autoconf automake libtool"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-libunrar $pkgname-libs
-	$pkgname-daemon $pkgname-scanner $pkgname-db::noarch freshclam
-	$pkgname-daemon-openrc:daemon_rc:noarch freshclam-openrc:freshclam_rc:noarch
-	$pkgname-milter"
-source="https://www.clamav.net/downloads/production/clamav-$pkgver.tar.gz
-	clamd.initd
-	clamd.confd
-	freshclam.initd
-	freshclam.confd
-	clamd.logrotate
-	freshclam.logrotate
-	"
-
-
-# secfixes:
-#   0.102.1-r0:
-#     - CVE-2020-3123
-#   0.102.0-r0:
-#     - CVE-2019-15961
-#   0.101.4-r0:
-#     - CVE-2019-12625
-#   0.100.3-r0:
-#     - CVE-2019-1787
-#     - CVE-2019-1788
-#     - CVE-2019-1789
-#   0.99.4-r0:
-#     - CVE-2012-6706
-#     - CVE-2017-6419
-#     - CVE-2017-11423
-#     - CVE-2018-0202
-#     - CVE-2018-1000085
-#   0.99.3-r0:
-#     - CVE-2017-12374
-#     - CVE-2017-12375
-#     - CVE-2017-12376
-#     - CVE-2017-12377
-#     - CVE-2017-12378
-#     - CVE-2017-12379
-#     - CVE-2017-12380
-#   0.100.1-r0:
-#     - CVE-2017-16932
-#     - CVE-2018-0360
-#     - CVE-2018-0361
-#   0.100.2-r0:
-#     - CVE-2018-15378
-#     - CVE-2018-14680
-#     - CVE-2018-14681
-#     - CVE-2018-14682
-
-prepare() {
-	update_config_sub
-	default_prepare
-	autoreconf -ifv
-}
-
-build() {
-	LIBS=-lfts ./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--libdir=/usr/lib \
-		--sysconfdir=/etc/clamav \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--without-iconv \
-		--disable-llvm \
-		--with-user=clamav \
-		--with-group=clamav \
-		--with-dbdir=/var/lib/clamav \
-		--enable-clamdtop \
-		--enable-bigstack \
-		--with-pcre \
-		--enable-milter \
-		--enable-clamonacc
-	make
-}
-
-check() {
-	make check
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-
-	# set proper defaults
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamav/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"$pkgdir"/etc/clamav/freshclam.conf.sample
-
-	# set proper defaults
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 /run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1 yes:" \
-	       -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"$pkgdir"/etc/clamav/clamd.conf.sample
-}
-
-check() {
-	make check
-}
-
-libunrar() {
-	pkgdesc="ClamAV unrar libraries"
-	replaces="clamav"
-	depends=
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libclamunrar* \
-		"$subpkgdir"/usr/lib/
-}
-
-freshclam() {
-	pkgdesc="Auto-updater for the Clam Antivirus scanner data-files"
-	replaces="clamav clamav-db"
-	depends=
-	mkdir -p "$subpkgdir"/usr/bin \
-		"$subpkgdir"/etc/clamav
-
-	mv "$pkgdir"/usr/bin/freshclam "$subpkgdir"/usr/bin
-	mv "$pkgdir"/etc/clamav/freshclam.conf.sample \
-		"$subpkgdir"/etc/clamav/freshclam.conf
-
-	install -d -m755 -o clamav -g clamav \
-		"$subpkgdir"/var/log/clamav \
-		"$subpkgdir"/var/lib/clamav
-
-	install -m644 -D "$srcdir"/freshclam.logrotate \
-		"$subpkgdir"/etc/logrotate.d/freshclam
-}
-
-freshclam_rc() {
-	pkgdesc="Auto-updater for the Clam Antivirus scanner data-files (OpenRC init scripts)"
-	install_if="freshclam=$pkgver-r$pkgrel openrc"
-	replaces="clamav freshclam"
-	depends=
-	mkdir -p "$subpkgdir"/etc/init.d \
-		"$subpkgdir"/etc/conf.d
-
-	install -m755 -D "$srcdir"/freshclam.initd \
-		"$subpkgdir"/etc/init.d/freshclam
-	install -m644 -D "$srcdir"/freshclam.confd \
-		"$subpkgdir"/etc/conf.d/freshclam
-}
-
-db() {
-	pkgdesc="ClamAV dummy package for compatibility"
-	replaces="clamav"
-	depends="freshclam"
-	mkdir -p "$subpkgdir"/var/lib/ \
-		"$subpkgdir"/usr/bin \
-		"$subpkgdir"/etc/clamav
-	install -d -m755 -o clamav -g clamav \
-		"$subpkgdir"/var/log/clamav \
-		"$subpkgdir"/var/lib/clamav
-}
-
-scanner() {
-	pkgdesc="ClamAV command-line scanner and utils"
-	replaces="clamav"
-	depends="freshclam"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/clamscan \
-		"$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/bin/sigtool \
-		"$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/bin/clambc \
-		"$subpkgdir"/usr/bin/
-}
-
-daemon() {
-	pkgdesc="ClamAV daemon scanner"
-	replaces="clamav"
-	depends="freshclam"
-	mkdir -p "$subpkgdir"/usr/bin \
-		"$subpkgdir"/usr/sbin \
-		"$subpkgdir"/etc/clamav
-	install -d -m 755 -o clamav -g clamav \
-		"$subpkgdir"/var/log/clamav \
-		"$subpkgdir"/var/lib/clamav
-	mv "$pkgdir"/usr/bin/clamconf \
-		"$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/sbin/clamd \
-		"$subpkgdir"/usr/sbin/
-	mv "$pkgdir"/usr/bin/clamdtop \
-		"$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/bin/clamdscan \
-		"$subpkgdir"/usr/bin/
-	mv "$pkgdir"/etc/clamav/clamd.conf.sample \
-		"$subpkgdir"/etc/clamav/clamd.conf
-	install -m644 -D "$srcdir"/clamd.logrotate \
-		"$subpkgdir"/etc/logrotate.d/clamd
-}
-
-daemon_rc() {
-	pkgdesc="ClamAV anti-virus scanner daemon (OpenRC init scripts)"
-	replaces="clamav"
-	depends="freshclam-openrc"
-	install_if="$pkgname-daemon=$pkgver-r$pkgrel openrc"
-
-	install -m755 -D "$srcdir"/clamd.initd \
-		"$subpkgdir"/etc/init.d/clamd
-	install -m644 -D "$srcdir"/clamd.confd \
-		"$subpkgdir"/etc/conf.d/clamd
-}
-
-milter() {
-	pkgdesc="ClamAV milter"
-	depends=
-	mkdir -p "$subpkgdir"/usr/sbin \
-		"$subpkgdir"/etc/clamav
-	mv "$pkgdir"/usr/sbin/clamav-milter \
-		"$subpkgdir"/usr/sbin/
-	mv "$pkgdir"/etc/clamav/clamav-milter.conf.sample \
-		"$subpkgdir"/etc/clamav/clamav-milter.conf
-}
-
-sha512sums="7db53e0e2b4d6b0e4cf5048d3c9dfbcabcffd680c3a2b718c763b9599b0c1c14e56bae70c54c251ee9e8fd1acd3134657196dbaad2d23a16bad76a088c6fc41f  clamav-0.102.2.tar.gz
-ed81be79bf9a25eec071312252121cc76c96838407377b75077bf94922055f1de99f327982ac4dccd5be85003baa95385e5d002fabab32bb851bb30178475edd  clamd.initd
-59c561b3dcb0b616b647cd8e4ebc46a2cc5e7144c8c7ea0054cc1c3021d1da8f67e4dad5c083c3fe712ed887aaabfca91b538f4759537e7c4c9ab71ba4fd5794  clamd.confd
-00daed8afb67a6e4a29893340246c8840cce970dd9103d26557ecdd26ef60b12551d2291c214fc657faaaa339484052079347411b0cad65e3a33ece56d57cf16  freshclam.initd
-ba181fe1abaac7b898ccb40b0713455aa3c9d5e25ad21d687b6cac09b0105b9e376526e7c776a44636234d8db819709d8d6a6cc76119bc3e98b637b1a3f26c08  freshclam.confd
-3ae493dd1610a819402c015f6b8c0f080f926b72dc43d2bded60030bf6a55040e4b88e0f64d3aae299dc1133d7e1b89855e7346b4665a64e8b82592f7b75cf6a  clamd.logrotate
-30cff378bc28c76b795e00c92ae5ee623f3abe4a19bed61dd8403c96e72658bb02b7f040d26a6258104af754464d25ea7d9646918c4b47d2ba9a8cbf4687056c  freshclam.logrotate"
diff --git a/main/clamav/clamav-daemon.pre-install b/main/clamav/clamav-daemon.pre-install
deleted file mode 100644
index a5da8290319..00000000000
--- a/main/clamav/clamav-daemon.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S clamav 2>/dev/null
-adduser -S -D -H -h /var/lib/clamav -s /sbin/nologin -G clamav -g clamav clamav 2>/dev/null
-
-exit 0
diff --git a/main/clamav/clamav-daemon.pre-upgrade b/main/clamav/clamav-daemon.pre-upgrade
deleted file mode 100644
index c8f82dacd40..00000000000
--- a/main/clamav/clamav-daemon.pre-upgrade
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# make sure we don't lose our config
-mkdir -p /etc/clamav
-if [ -f /etc/clamav.conf ]; then
-	mv /etc/clamav.conf /etc/clamav/
-	ln -s clamav/clamav.conf /etc/clamav.conf
-fi
-
-exit 0
-
diff --git a/main/clamav/clamav-db.pre-install b/main/clamav/clamav-db.pre-install
deleted file mode 100644
index fdb83a0904a..00000000000
--- a/main/clamav/clamav-db.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S clamav 2>/dev/null
-adduser -S -D -H -s /sbin/nologin -G clamav -g clamav clamav 2>/dev/null
-
-exit 0
diff --git a/main/clamav/clamav-db.pre-upgrade b/main/clamav/clamav-db.pre-upgrade
deleted file mode 100644
index 47230e16b2d..00000000000
--- a/main/clamav/clamav-db.pre-upgrade
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# make sure we don't lose our config
-mkdir -p /etc/clamav
-if [ -f /etc/freshclam.conf ]; then
-	mv /etc/freshclam.conf /etc/clamav/
-	ln -s clamav/freshclam.conf /etc/freshclam.conf
-fi
-
-exit 0
-
diff --git a/main/clamav/clamd.confd b/main/clamav/clamd.confd
deleted file mode 100644
index bdf73b0fb4e..00000000000
--- a/main/clamav/clamd.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-
-CLAMD_NICELEVEL=0
-
-# make sure we also start freshclam
-# comment out if you dont want start freshclam
-rc_need="freshclam"
-
-# timeout for the database download
-FRESHCLAM_TIMEOUT=120
diff --git a/main/clamav/clamd.initd b/main/clamav/clamd.initd
deleted file mode 100755
index 5511a5666d1..00000000000
--- a/main/clamav/clamd.initd
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/sbin/openrc-run
-
-NAME=clamd
-CONF=/etc/clamav/clamd.conf
-
-pidfile=/run/clamav/clamd.pid
-command=/usr/sbin/clamd
-extra_started_commands="reload"
-extra_commands="logfix"
-required_files=$CONF
-
-depend() {
-	need net
-	after firewall
-	provide antivirus
-}
-
-start_pre() {
-	# fix clamd run permissions
-	local pid=`awk '$1 == "PidFile" { print $2 }' $CONF`
-	[ "x$pid" != "x" ] && pidfile=$pid
-	local socket=`awk '$1 == "LocalSocket" { print $2 }' $CONF`
-	local socketdir=${socket%/*}
-	local clamav_user=`awk '$1 == "User" { print $2 }' $CONF`
-	checkpath --directory --owner ${clamav_user:-clamav} \
-		--mode 750 ${pidfile%/*}
-	checkpath --directory --owner ${clamav_user:-clamav} \
-		--mode 755 ${socketdir:-/run/clamav}
-}
-
-start() {
-	local clamd_socket=$(awk '$1 == "LocalSocket" { print $2 }' $CONF)
-
-	logfix
-
-	if [ -S "${clamd_socket:=/tmp/clamd}" ]; then
-		rm -f ${clamd_socket}
-	fi
-
-	local dbdir=$(awk '$1 == "DatabaseDirectory" { print $2 }' $CONF)
-	local timeout=${FRESHCLAM_TIMEOUT:-120}
-	local cvd="${dbdir:-/var/lib/clamav}"/main.cvd
-	local cld="${dbdir:-/var/lib/clamav}"/main.cld
-
-	if ! [ -e "$cld" ]; then
-		if ! [ -e "$cvd" ]; then
-			ebegin "Waiting for clamav database download"
-			while ! [ -e "$cvd" ]; do
-				timeout=$(( $timeout - 1 ))
-				if [ $timeout -eq 0 ]; then
-					eend 1 "Timed out"
-					return 1
-				fi
-				sleep 1
-			done
-			eend 0
-		fi
-	fi
-	ebegin "Starting ${NAME}"
-	start-stop-daemon --start --quiet \
-		--nicelevel ${CLAMD_NICELEVEL:-0} \
-		--exec $command
-	eend $? "Failed to start ${NAME}"
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --pidfile $pidfile --name $SVCNAME
-	eend $?
-}
-
-logfix() {
-	# fix clamd log permissions
-	# (might be clobbered by logrotate or something)
-	local logfile=`awk '$1 == "LogFile" { print $2 }' $CONF`
-	local clamav_user=`awk '$1 == "User" { print $2 }' $CONF`
-	if [ -n "${logfile}" ] && [ -n "${clamav_user}" ]; then
-		if [ ! -f "${logfile}" ]; then
-			touch ${logfile}
-		fi
-		chown ${clamav_user} ${logfile}
-		chmod 640 ${logfile}
-	fi
-}
diff --git a/main/clamav/clamd.logrotate b/main/clamav/clamd.logrotate
deleted file mode 100644
index dc0f5ca38e5..00000000000
--- a/main/clamav/clamd.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/clamav/clamd.log {
-	missingok
-	postrotate
-		/etc/init.d/clamd --quiet logfix
-		/etc/init.d/clamd --quiet --ifstarted reload
-	endscript
-}
diff --git a/main/clamav/freshclam.confd b/main/clamav/freshclam.confd
deleted file mode 100644
index 17559037dac..00000000000
--- a/main/clamav/freshclam.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-
-FRESHCLAM_NICELEVEL=0
-
diff --git a/main/clamav/freshclam.initd b/main/clamav/freshclam.initd
deleted file mode 100644
index 279b5290666..00000000000
--- a/main/clamav/freshclam.initd
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/openrc-run
-
-CONF=/etc/clamav/freshclam.conf
-
-pidfile=/run/clamav/freshclam.pid
-command=/usr/bin/freshclam
-extra_started_commands="reload"
-extra_commands="logfix"
-required_files=$CONF
-
-depend() {
-	need net
-	after firewall
-}
-
-start_pre() {
-	local pid=`awk '$1 == "PidFile" { print $2 }' $CONF`
-	local owner=`awk '$1 == "DatabaseOwner" { print $2 }' $CONF`
-	[ "x$pid" != "x" ] && pidfile=$pid
-	checkpath --directory --owner ${owner:-clamav} \
-		--mode 750 ${pidfile%/*}
-}
-
-start() {
-	ebegin "Starting freshclam"
-	start-stop-daemon --start --quiet \
-		--nicelevel ${FRESHCLAM_NICELEVEL:-0} \
-		--exec $command \
-		-- \
-		--daemon \
-		--pid=$pidfile
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --pidfile $pidfile --name $SVCNAME
-	eend $?
-}
-
-logfix() {
-	# fix freshclam log permissions
-	# (might be clobbered by logrotate or something)
-	logfile=$(awk '$1 == "UpdateLogFile" { print $2 }' $CONF)
-	local freshclam_user=$(awk '$1 == "DatabaseOwner" { print $2 }' $CONF)
-	if [ -n "${logfile}" -a -n "${clamav_user}" ]; then
-		if [ ! -f "${logfile}" ]; then
-			touch ${logfile}
-		fi	
-		chown ${freshclam_user} ${logfile}
-		chmod 640 ${logfile}
-	fi
-}
diff --git a/main/clamav/freshclam.logrotate b/main/clamav/freshclam.logrotate
deleted file mode 100644
index 18117eeb2a3..00000000000
--- a/main/clamav/freshclam.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/clamav/freshclam.log {
-	missingok
-	postrotate
-		/etc/init.d/freshclam --quiet logfix
-		/etc/init.d/freshclam --quiet --ifstarted reload
-	endscript
-}
diff --git a/main/clamav/freshclam.pre-install b/main/clamav/freshclam.pre-install
deleted file mode 100644
index a5da8290319..00000000000
--- a/main/clamav/freshclam.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S clamav 2>/dev/null
-adduser -S -D -H -h /var/lib/clamav -s /sbin/nologin -G clamav -g clamav clamav 2>/dev/null
-
-exit 0
diff --git a/main/clang/10-add-musl-triples.patch b/main/clang/10-add-musl-triples.patch
deleted file mode 100644
index 171467470bf..00000000000
--- a/main/clang/10-add-musl-triples.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/lib/Driver/ToolChains/Gnu.cpp
-+++ b/lib/Driver/ToolChains/Gnu.cpp
-@@ -1871,6 +1871,7 @@
-   static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
-   static const char *const AArch64Triples[] = {
-       "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
-+      "aarch64-linux-musl",
-       "aarch64-suse-linux", "aarch64-linux-android"};
-   static const char *const AArch64beLibDirs[] = {"/lib"};
-   static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
-@@ -1898,6 +1899,7 @@
-       "x86_64-redhat-linux",    "x86_64-suse-linux",
-       "x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
-       "x86_64-slackware-linux", "x86_64-unknown-linux",
-+      "x86_64-linux-musl",
-       "x86_64-amazon-linux",    "x86_64-linux-android"};
-   static const char *const X32LibDirs[] = {"/libx32"};
-   static const char *const X86LibDirs[] = {"/lib32", "/lib"};
-@@ -1907,6 +1909,7 @@
-       "i586-redhat-linux",    "i386-redhat-linux",     "i586-suse-linux",
-       "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu",
-       "i686-linux-android",   "i386-gnu",              "i486-gnu",
-+      "i686-linux-musl",
-       "i586-gnu",             "i686-gnu"};
- 
-   static const char *const MIPSLibDirs[] = {"/lib"};
diff --git a/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch b/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
deleted file mode 100644
index b8bd2e15fd1..00000000000
--- a/main/clang/20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Based on original patchset from Jakub Jirutka <jakub@jirutka.cz>
-Updated by Eric Molitor <eric@molitor.org>
-Updated by Natanael Copa <ncopa@alpinelinux.org>
-
-diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp
-index f8f3623..9c8c748 100644
---- a/lib/Driver/ToolChains/Linux.cpp
-+++ b/lib/Driver/ToolChains/Linux.cpp
-@@ -907,6 +907,13 @@ bool Linux::isPIEDefault() const {
-           getTriple().isMusl() || getSanitizerArgs().requiresPIE();
- }
- 
-+unsigned Linux::GetDefaultStackProtectorLevel(bool KernelOrKext) const {
-+  StringRef VendorName = Linux::getTriple().getVendorName();
-+  if (VendorName.compare("alpine") == 0)
-+    return 2;
-+  return Generic_ELF::GetDefaultStackProtectorLevel(KernelOrKext);
-+}
-+
- SanitizerMask Linux::getSupportedSanitizers() const {
-   const bool IsX86 = getTriple().getArch() == llvm::Triple::x86;
-   const bool IsX86_64 = getTriple().getArch() == llvm::Triple::x86_64;
-diff --git a/lib/Driver/ToolChains/Linux.h b/lib/Driver/ToolChains/Linux.h
-index 22dbbec..ba0d558 100644
---- a/lib/Driver/ToolChains/Linux.h
-+++ b/lib/Driver/ToolChains/Linux.h
-@@ -39,6 +39,7 @@
-   CXXStdlibType GetDefaultCXXStdlibType() const override;
-   bool isPIEDefault() const override;
-   bool isNoExecStackDefault() const override;
-+  unsigned GetDefaultStackProtectorLevel(bool KernelOrKext) const override;
-   bool IsMathErrnoDefault() const override;
-   SanitizerMask getSupportedSanitizers() const override;
-   void addProfileRTLibs(const llvm::opt::ArgList &Args,
-diff --git a/test/Driver/fsanitize.c b/test/Driver/fsanitize.c
-index 304e759..29ead22 100644
---- a/test/Driver/fsanitize.c
-+++ b/test/Driver/fsanitize.c
-@@ -585,18 +585,17 @@
- // RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
- // NOSP-NOT: "-fsanitize=safe-stack"
- 
--// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
-+// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
- // RUN: %clang -target x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN
- // RUN: %clang -target x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
- // RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP
--// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
--// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
-+// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
-+// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
- // RUN: %clang -target i386-contiki-unknown -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
- // NO-SP-NOT: stack-protector
- // NO-SP: "-fsanitize=safe-stack"
- // SP-ASAN: error: invalid argument '-fsanitize=safe-stack' not allowed with '-fsanitize=address'
- // SP: "-fsanitize=safe-stack"
--// SP: -stack-protector
- // NO-SP-NOT: stack-protector
- 
- // RUN: %clang -target powerpc64-unknown-linux-gnu -fsanitize=memory %s -### 2>&1 | FileCheck %s -check-prefix=CHECK-SANM
-diff --git a/test/Driver/stack-protector.c b/test/Driver/stack-protector.c
-index a3e40b5..60ec2a8 100644
---- a/test/Driver/stack-protector.c
-+++ b/test/Driver/stack-protector.c
-@@ -24,6 +24,20 @@
- // SSP-ALL: "-stack-protector" "3"
- // SSP-ALL-NOT: "-stack-protector-buffer-size" 
- 
-+// RUN: %clang -target x86_64-alpine-linux-musl -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE
-+// ALPINE: "-stack-protector" "2"
-+
-+// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_SPS
-+// ALPINE_SPS: "-stack-protector" "2"
-+
-+// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_ALL
-+// ALPINE_ALL: "-stack-protector" "3"
-+// ALPINE_ALL-NOT: "-stack-protector-buffer-size"
-+
-+// RUN: %clang -target x86_64-alpine-linux-musl -fno-stack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_NOSSP
-+// ALPINE_NOSSP-NOT: "-stack-protector"
-+// ALPINE_NOSSP-NOT: "-stack-protector-buffer-size"
-+
- // RUN: %clang -target x86_64-scei-ps4 -### %s 2>&1 | FileCheck %s -check-prefix=SSP-PS4
- // RUN: %clang -target x86_64-scei-ps4 -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=SSP-PS4
- // SSP-PS4: "-stack-protector" "2"
diff --git a/main/clang/30-fix-python-shebangs.patch b/main/clang/30-fix-python-shebangs.patch
deleted file mode 100644
index 41bee374248..00000000000
--- a/main/clang/30-fix-python-shebangs.patch
+++ /dev/null
@@ -1,391 +0,0 @@
-diff --git a/bindings/python/examples/cindex/cindex-dump.py b/bindings/python/examples/cindex/cindex-dump.py
-index 46073b28..fc513c7e 100644
---- a/bindings/python/examples/cindex/cindex-dump.py
-+++ b/bindings/python/examples/cindex/cindex-dump.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- #===- cindex-dump.py - cindex/Python Source Dump -------------*- python -*--===#
- #
-diff --git a/bindings/python/examples/cindex/cindex-includes.py b/bindings/python/examples/cindex/cindex-includes.py
-index ec1fbc0c..be600342 100644
---- a/bindings/python/examples/cindex/cindex-includes.py
-+++ b/bindings/python/examples/cindex/cindex-includes.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- #===- cindex-includes.py - cindex/Python Inclusion Graph -----*- python -*--===#
- #
-diff --git a/docs/tools/dump_ast_matchers.py b/docs/tools/dump_ast_matchers.py
-index c96c1ca2..26cf4156 100755
---- a/docs/tools/dump_ast_matchers.py
-+++ b/docs/tools/dump_ast_matchers.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # A tool to parse ASTMatchers.h and update the documentation in
- # ../LibASTMatchersReference.html automatically. Run from the
- # directory in which this file is located to update the docs.
-diff --git a/docs/tools/dump_format_style.py b/docs/tools/dump_format_style.py
-index 5feb793a..e18a2ffb 100755
---- a/docs/tools/dump_format_style.py
-+++ b/docs/tools/dump_format_style.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # A tool to parse the FormatStyle struct from Format.h and update the
- # documentation in ../ClangFormatStyleOptions.rst automatically.
- # Run from the directory in which this file is located to update the docs.
-diff --git a/test/AST/gen_ast_dump_json_test.py b/test/AST/gen_ast_dump_json_test.py
-index 975039ea..9a6ee94c 100644
---- a/test/AST/gen_ast_dump_json_test.py
-+++ b/test/AST/gen_ast_dump_json_test.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- from collections import OrderedDict
- from sets import Set
-diff --git a/tools/clang-format/clang-format-diff.py b/tools/clang-format/clang-format-diff.py
-index 3ba0abef..6b0425a7 100755
---- a/tools/clang-format/clang-format-diff.py
-+++ b/tools/clang-format/clang-format-diff.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- #===- clang-format-diff.py - ClangFormat Diff Reformatter ----*- python -*--===#
- #
-diff --git a/tools/clang-format/git-clang-format b/tools/clang-format/git-clang-format
-index ef7f22d0..4ea4521f 100755
---- a/tools/clang-format/git-clang-format
-+++ b/tools/clang-format/git-clang-format
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- #===- git-clang-format - ClangFormat Git Integration ---------*- python -*--===#
- #
-diff --git a/tools/scan-build-py/bin/analyze-build b/tools/scan-build-py/bin/analyze-build
-index 6c285874..5b270d54 100755
---- a/tools/scan-build-py/bin/analyze-build
-+++ b/tools/scan-build-py/bin/analyze-build
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
- # See https://llvm.org/LICENSE.txt for license information.
-diff --git a/tools/scan-build-py/bin/analyze-c++ b/tools/scan-build-py/bin/analyze-c++
-index 564e2abf..b2b60a44 100755
---- a/tools/scan-build-py/bin/analyze-c++
-+++ b/tools/scan-build-py/bin/analyze-c++
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
- # See https://llvm.org/LICENSE.txt for license information.
-diff --git a/tools/scan-build-py/bin/analyze-cc b/tools/scan-build-py/bin/analyze-cc
-index 564e2abf..b2b60a44 100755
---- a/tools/scan-build-py/bin/analyze-cc
-+++ b/tools/scan-build-py/bin/analyze-cc
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
- # See https://llvm.org/LICENSE.txt for license information.
-diff --git a/tools/scan-build-py/bin/intercept-build b/tools/scan-build-py/bin/intercept-build
-index 23f51047..fe45c545 100755
---- a/tools/scan-build-py/bin/intercept-build
-+++ b/tools/scan-build-py/bin/intercept-build
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
- # See https://llvm.org/LICENSE.txt for license information.
-diff --git a/tools/scan-build-py/bin/intercept-c++ b/tools/scan-build-py/bin/intercept-c++
-index 4230c803..0cba3a3c 100755
---- a/tools/scan-build-py/bin/intercept-c++
-+++ b/tools/scan-build-py/bin/intercept-c++
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
- # See https://llvm.org/LICENSE.txt for license information.
-diff --git a/tools/scan-build-py/bin/intercept-cc b/tools/scan-build-py/bin/intercept-cc
-index 4230c803..0cba3a3c 100755
---- a/tools/scan-build-py/bin/intercept-cc
-+++ b/tools/scan-build-py/bin/intercept-cc
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
- # See https://llvm.org/LICENSE.txt for license information.
-diff --git a/tools/scan-build-py/bin/scan-build b/tools/scan-build-py/bin/scan-build
-index 156da064..4fa08175 100755
---- a/tools/scan-build-py/bin/scan-build
-+++ b/tools/scan-build-py/bin/scan-build
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
- # See https://llvm.org/LICENSE.txt for license information.
-diff --git a/tools/scan-view/bin/scan-view b/tools/scan-view/bin/scan-view
-index 6165432e..07effbca 100755
---- a/tools/scan-view/bin/scan-view
-+++ b/tools/scan-view/bin/scan-view
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- from __future__ import print_function
- 
-diff --git a/tools/scan-view/share/Reporter.py b/tools/scan-view/share/Reporter.py
-index b1ff1614..d6300e78 100644
---- a/tools/scan-view/share/Reporter.py
-+++ b/tools/scan-view/share/Reporter.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- """Methods for reporting bugs."""
-diff --git a/tools/scan-view/share/startfile.py b/tools/scan-view/share/startfile.py
-index 9eb548bc..cdf3db27 100644
---- a/tools/scan-view/share/startfile.py
-+++ b/tools/scan-view/share/startfile.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- """Utility for opening a file using the default application in a cross-platform
-diff --git a/utils/ABITest/ABITestGen.py b/utils/ABITest/ABITestGen.py
-index 93a6de93..efb35fa7 100755
---- a/utils/ABITest/ABITestGen.py
-+++ b/utils/ABITest/ABITestGen.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- from __future__ import absolute_import, division, print_function
- from pprint import pprint
-diff --git a/utils/CIndex/completion_logger_server.py b/utils/CIndex/completion_logger_server.py
-index 20166711..02d7cd6f 100755
---- a/utils/CIndex/completion_logger_server.py
-+++ b/utils/CIndex/completion_logger_server.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- from __future__ import absolute_import, division, print_function
- import sys
- from socket import *
-diff --git a/utils/CaptureCmd b/utils/CaptureCmd
-index 705585c3..5ffdfe56 100755
---- a/utils/CaptureCmd
-+++ b/utils/CaptureCmd
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- """CaptureCmd - A generic tool for capturing information about the
- invocations of another program.
-diff --git a/utils/CmpDriver b/utils/CmpDriver
-index 12ce7a32..c2b6ab5e 100755
---- a/utils/CmpDriver
-+++ b/utils/CmpDriver
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- """
- A simple utility that compares tool invocations and exit codes issued by
-diff --git a/utils/FindSpecRefs b/utils/FindSpecRefs
-index 9097f93f..3ad581b3 100755
---- a/utils/FindSpecRefs
-+++ b/utils/FindSpecRefs
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- import os
- import re
-diff --git a/utils/FuzzTest b/utils/FuzzTest
-index 0e043df7..c4c956b6 100755
---- a/utils/FuzzTest
-+++ b/utils/FuzzTest
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- """
- This is a generic fuzz testing tool, see --help for more information.
-diff --git a/utils/TestUtils/deep-stack.py b/utils/TestUtils/deep-stack.py
-index 10bf47ac..5fb8d0df 100755
---- a/utils/TestUtils/deep-stack.py
-+++ b/utils/TestUtils/deep-stack.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- from __future__ import absolute_import, division, print_function
- def pcall(f, N):
-diff --git a/utils/analyzer/CmpRuns.py b/utils/analyzer/CmpRuns.py
-index 3fab6ef5..9baa7a48 100755
---- a/utils/analyzer/CmpRuns.py
-+++ b/utils/analyzer/CmpRuns.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- """
- CmpRuns - A simple tool for comparing two static analyzer runs to determine
-diff --git a/utils/analyzer/SATestAdd.py b/utils/analyzer/SATestAdd.py
-index 52089f4e..d087a90b 100755
---- a/utils/analyzer/SATestAdd.py
-+++ b/utils/analyzer/SATestAdd.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- """
- Static Analyzer qualification infrastructure: adding a new project to
-diff --git a/utils/analyzer/SATestBuild.py b/utils/analyzer/SATestBuild.py
-index 691ded80..b17b3db1 100755
---- a/utils/analyzer/SATestBuild.py
-+++ b/utils/analyzer/SATestBuild.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- """
- Static Analyzer qualification infrastructure.
-diff --git a/utils/analyzer/SATestUpdateDiffs.py b/utils/analyzer/SATestUpdateDiffs.py
-index ea3c08cc..08e3f82f 100755
---- a/utils/analyzer/SATestUpdateDiffs.py
-+++ b/utils/analyzer/SATestUpdateDiffs.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- """
- Update reference results for static analyzer.
-diff --git a/utils/analyzer/SumTimerInfo.py b/utils/analyzer/SumTimerInfo.py
-index 36e519ad..d1934f19 100644
---- a/utils/analyzer/SumTimerInfo.py
-+++ b/utils/analyzer/SumTimerInfo.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- """
- Script to Summarize statistics in the scan-build output.
-diff --git a/utils/analyzer/exploded-graph-rewriter.py b/utils/analyzer/exploded-graph-rewriter.py
-index 5ce56d61..808f21c9 100755
---- a/utils/analyzer/exploded-graph-rewriter.py
-+++ b/utils/analyzer/exploded-graph-rewriter.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- #===- exploded-graph-rewriter.py - ExplodedGraph dump tool -----*- python -*--#
- #
-diff --git a/utils/check_cfc/check_cfc.py b/utils/check_cfc/check_cfc.py
-index 311f502f..0bbbc088 100755
---- a/utils/check_cfc/check_cfc.py
-+++ b/utils/check_cfc/check_cfc.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- """Check CFC - Check Compile Flow Consistency
- 
-diff --git a/utils/check_cfc/obj_diff.py b/utils/check_cfc/obj_diff.py
-index a0951c5b..b3866948 100755
---- a/utils/check_cfc/obj_diff.py
-+++ b/utils/check_cfc/obj_diff.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- from __future__ import absolute_import, division, print_function
- 
-diff --git a/utils/check_cfc/test_check_cfc.py b/utils/check_cfc/test_check_cfc.py
-index 0808252a..6f149ebc 100755
---- a/utils/check_cfc/test_check_cfc.py
-+++ b/utils/check_cfc/test_check_cfc.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- """Test internal functions within check_cfc.py."""
- 
-diff --git a/utils/creduce-clang-crash.py b/utils/creduce-clang-crash.py
-index be16211c..e56f3697 100755
---- a/utils/creduce-clang-crash.py
-+++ b/utils/creduce-clang-crash.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- """Calls C-Reduce to create a minimal reproducer for clang crashes.
- 
- Output files:
-diff --git a/utils/hmaptool/hmaptool b/utils/hmaptool/hmaptool
-index 58baab2f..00296f11 100755
---- a/utils/hmaptool/hmaptool
-+++ b/utils/hmaptool/hmaptool
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- from __future__ import absolute_import, division, print_function
- 
- import json
-diff --git a/utils/modfuzz.py b/utils/modfuzz.py
-index 61ca3272..19a9807b 100644
---- a/utils/modfuzz.py
-+++ b/utils/modfuzz.py
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python3
- 
- # To use:
- #  1) Update the 'decls' list below with your fuzzing configuration.
-diff --git a/utils/token-delta.py b/utils/token-delta.py
-index 62b4eb3c..022fb2f8 100755
---- a/utils/token-delta.py
-+++ b/utils/token-delta.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- from __future__ import absolute_import, division, print_function
- import os
-diff --git a/www/builtins.py b/www/builtins.py
-index f0bcf196..54901487 100755
---- a/www/builtins.py
-+++ b/www/builtins.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- import sys, fileinput
- 
-diff --git a/www/make_cxx_dr_status b/www/make_cxx_dr_status
-index 2d7c1f32..bc24cd12 100755
---- a/www/make_cxx_dr_status
-+++ b/www/make_cxx_dr_status
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python3
- import sys, os, re
- 
- index = 'cwg_index.html'
-
diff --git a/main/clang/APKBUILD b/main/clang/APKBUILD
deleted file mode 100644
index 924b1324758..00000000000
--- a/main/clang/APKBUILD
+++ /dev/null
@@ -1,148 +0,0 @@
-# Contributor Eric Molitor <eric@molitor.org>
-# Contributor Travis Tilley <ttilley@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=clang
-# Note: Update together with llvm.
-pkgver=10.0.0
-pkgrel=0
-_llvmver=${pkgver%%.*}
-pkgdesc="A C language family front-end for LLVM"
-arch="all"
-url="https://llvm.org/"
-license="Apache-2.0"
-options="!check" # some 170 failing tests...
-makedepends="
-	cmake
-	isl-dev
-	libedit-dev
-	libexecinfo-dev
-	libxml2-dev
-	libxml2-utils
-	llvm$_llvmver-dev
-	llvm$_llvmver-static
-	llvm$_llvmver-test-utils
-	samurai
-	python3
-	py3-sphinx
-	"
-checkdepends="diffutils bash"
-depends_dev="$pkgname=$pkgver-r$pkgrel $pkgname-extra-tools=$pkgver-r$pkgrel"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs
-	$pkgname-analyzer::noarch
-	$pkgname-extra-tools:extra"
-source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-$pkgver.src.tar.xz
-	https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-tools-extra-$pkgver.src.tar.xz
-	10-add-musl-triples.patch
-	20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
-	30-fix-python-shebangs.patch
-	"
-
-builddir="$srcdir/clang-$pkgver.src"
-
-prepare() {
-	mv "$srcdir/clang-tools-extra-$pkgver.src" "$builddir/tools/extra"
-	default_prepare
-}
-
-build() {
-	mkdir -p "$builddir"/build
-	cd "$builddir"/build
-
-	cmake .. -G Ninja -Wno-dev \
-		-DCMAKE_BUILD_TYPE=MinSizeRel \
-		-DCMAKE_C_FLAGS_MINSIZEREL_INIT="$CFLAGS" \
-		-DCMAKE_CXX_FLAGS_MINSIZEREL_INIT="$CXXFLAGS" \
-		-DCMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT="$LDFLAGS -Wl,-z,stack-size=2097152" \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_VERBOSE_MAKEFILE=OFF \
-		-DCLANG_VENDOR=Alpine \
-		-DCLANG_BUILD_EXAMPLES=OFF \
-		-DCLANG_INCLUDE_DOCS=ON \
-		-DLLVM_BUILD_DOCS=ON \
-		-DLLVM_ENABLE_SPHINX=ON \
-		-DSPHINX_WARNINGS_AS_ERRORS=OFF \
-		-DCLANG_INCLUDE_TESTS=ON \
-		-DCLANG_PLUGIN_SUPPORT=ON \
-		-DLIBCLANG_BUILD_STATIC=ON \
-		-DLLVM_ENABLE_EH=ON \
-		-DLLVM_ENABLE_RTTI=ON
-
-	ninja clang-tblgen
-	ninja
-}
-
-check() {
-	cd "$builddir"/build
-
-	case "$CARCH" in
-	armhf) return;; # FIXME: tests fails on armhf
-	esac
-	lit -sv --param clang_site_config=$builddir/build/test/lib.site.cfg $builddir/build/test
-}
-
-package() {
-	cd "$builddir"/build
-
-	DESTDIR="$pkgdir" ninja install
-	install -m 644 lib/libclang.a "$pkgdir"/usr/lib
-}
-
-static() {
-	pkgdesc="Static libraries for clang"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
-}
-
-dev() {
-	default_dev
-
-	# move back usr/lib/clang/x.y.z/include with files such as altivec.h, msa.h etc
-	# these are needed to build programs *with* clang, not *against* it.
-	mv "$subpkgdir"/usr/lib/clang "$pkgdir"/usr/lib/
-}
-
-analyzer() {
-	pkgdesc="Clang source code analysis framework"
-	depends="$pkgname=$pkgver-r$pkgrel perl python3"
-
-	cd "$pkgdir"
-
-	mkdir -p "$subpkgdir"/usr/bin \
-		"$subpkgdir"/usr/libexec \
-		"$subpkgdir"/usr/share/
-	mv usr/bin/scan-* "$subpkgdir"/usr/bin/
-	mv usr/libexec/*-analyzer "$subpkgdir"/usr/libexec/
-	mv usr/share/scan-* "$subpkgdir"/usr/share/
-}
-
-extra() {
-	pkgdesc="Extra tools built using Clang’s tooling APIs"
-
-	cd "$pkgdir"
-
-	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/share/clang
-
-	mv usr/bin/clang-apply-replacements "$subpkgdir"/usr/bin/
-	mv usr/bin/clang-reorder-fields "$subpkgdir"/usr/bin/
-	mv usr/bin/modularize "$subpkgdir"/usr/bin/
-	mv usr/bin/clang-tidy "$subpkgdir"/usr/bin/
-	mv usr/share/clang/*clang-tidy* "$subpkgdir"/usr/share/clang
-	mv usr/bin/clang-change-namespace "$subpkgdir"/usr/bin/
-	mv usr/bin/clang-doc "$subpkgdir"/usr/bin/
-	mv usr/bin/clang-include-fixer "$subpkgdir"/usr/bin/
-	#mv usr/bin/clang-move "$subpkgdir"/usr/bin/
-	mv usr/bin/find-all-symbols "$subpkgdir"/usr/bin/
-	mv usr/share/clang/clang-include-fixer* "$subpkgdir"/usr/share/clang
-	mv usr/share/clang/run-find-all-symbols.py "$subpkgdir"/usr/share/clang
-	mv usr/bin/clang-query "$subpkgdir"/usr/bin/
-	mv usr/bin/clangd* "$subpkgdir"/usr/bin/
-	#mv usr/bin/pp-trace "$subpkgdir"/usr/bin/
-	#mv usr/bin/tool-template "$subpkgdir"/usr/bin/
-}
-
-sha512sums="b1cccc13c46abcda3d689f51d486fa613ecec40c581c72d8b15951715100a2b8fb24370161601e6716cdba5a784337439e99ec2f0766f988e9cce92de6d775da  clang-10.0.0.src.tar.xz
-33b6019e64e9ac94bd7c000b77a4a927602a2705baa9b370e392a56b53fe09c8dad1ff7d583892729e9eb291440433ad7d71df768a96d927e4dbc1988fc01d99  clang-tools-extra-10.0.0.src.tar.xz
-367dcd43b42570b5688c4bb41daf2498447e9fa4384896e2b91782017a8ce15b1e6e15cb3a465595d69e681420fce170a6f9a57ea5268e21f0dec7d4605e4c4c  10-add-musl-triples.patch
-a8557c5a26774bf98548b9fe77cd54a1b0591bc75beffcb5fbd070986ba954d82255dddbcfcc884c07c3f433b1428c2a6ce649c3a158f4352f30e7057872335b  20-Enable-stack-protector-by-default-for-Alpine-Linux.patch
-c7f34b425b0dcea9752eeb7ff3d3a33af9cc45740fd3e77d52e4d610c5fd3daaa4d59138a255b057ef886915615a77ec1e6a447f3818b4b2724129c0ba354932  30-fix-python-shebangs.patch"
diff --git a/main/clang14/10-add-musl-triples.patch b/main/clang14/10-add-musl-triples.patch
new file mode 100644
index 00000000000..0ed9c81675f
--- /dev/null
+++ b/main/clang14/10-add-musl-triples.patch
@@ -0,0 +1,39 @@
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -2073,7 +2073,7 @@
+   static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
+   static const char *const AArch64Triples[] = {
+       "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
+-      "aarch64-suse-linux"};
++      "aarch64-suse-linux", "aarch64-linux-musl"};
+   static const char *const AArch64beLibDirs[] = {"/lib"};
+   static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
+                                                  "aarch64_be-linux-gnu"};
+@@ -2085,7 +2085,9 @@
+                                              "armv7l-linux-musleabihf",
+                                              "armv7hl-redhat-linux-gnueabi",
+                                              "armv6hl-suse-linux-gnueabi",
+-                                             "armv7hl-suse-linux-gnueabi"};
++                                             "armv7hl-suse-linux-gnueabi",
++                                             "arm-linux-musleabihf",
++                                             "armv7l-linux-musleabihf"};
+   static const char *const ARMebLibDirs[] = {"/lib"};
+   static const char *const ARMebTriples[] = {"armeb-linux-gnueabi"};
+   static const char *const ARMebHFTriples[] = {
+@@ -2101,7 +2103,7 @@
+       "x86_64-redhat-linux",    "x86_64-suse-linux",
+       "x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
+       "x86_64-slackware-linux", "x86_64-unknown-linux",
+-      "x86_64-amazon-linux"};
++      "x86_64-amazon-linux", "x86_64-linux-musl"};
+   static const char *const X32Triples[] = {"x86_64-linux-gnux32",
+                                            "x86_64-pc-linux-gnux32"};
+   static const char *const X32LibDirs[] = {"/libx32", "/lib"};
+@@ -2110,6 +2112,7 @@
+       "i586-linux-gnu",      "i686-linux-gnu",        "i686-pc-linux-gnu",
+       "i386-redhat-linux6E", "i686-redhat-linux",     "i386-redhat-linux",
+       "i586-suse-linux",     "i686-montavista-linux", "i686-gnu",
++      "i686-linux-musl",
+   };
+ 
+   static const char *const M68kLibDirs[] = {"/lib"};
diff --git a/main/clang14/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch b/main/clang14/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
new file mode 100644
index 00000000000..bae4532c16a
--- /dev/null
+++ b/main/clang14/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
@@ -0,0 +1,82 @@
+--- a/lib/Driver/ToolChains/Linux.h
++++ b/lib/Driver/ToolChains/Linux.h
+@@ -11,6 +11,7 @@
+ 
+ #include "Gnu.h"
+ #include "clang/Driver/ToolChain.h"
++#include "clang/Basic/LangOptions.h"
+ 
+ namespace clang {
+ namespace driver {
+@@ -60,6 +61,15 @@
+   llvm::DenormalMode getDefaultDenormalModeForType(
+       const llvm::opt::ArgList &DriverArgs, const JobAction &JA,
+       const llvm::fltSemantics *FPType = nullptr) const override;
++
++  LangOptions::StackProtectorMode
++  GetDefaultStackProtectorLevel(bool KernelOrKext) const override {
++    StringRef VendorName = Linux::getTriple().getVendorName();
++    if (VendorName.compare("alpine") == 0)
++      return LangOptions::SSPStrong;
++
++    return LangOptions::SSPOff;
++  }
+ 
+ protected:
+   Tool *buildAssembler() const override;
+--- a/test/Driver/fsanitize.c
++++ b/test/Driver/fsanitize.c
+@@ -666,12 +666,12 @@
+ // RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
+ // NOSP-NOT: "-fsanitize=safe-stack"
+ 
+-// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
++// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang -target x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN
+ // RUN: %clang -target x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP
+-// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
+-// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
++// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
++// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang -target i386-contiki-unknown -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
+ // NO-SP-NOT: stack-protector
+ // NO-SP: "-fsanitize=safe-stack"
+--- a/test/Driver/stack-protector.c
++++ b/test/Driver/stack-protector.c
+@@ -33,6 +33,22 @@
+ // SSP-PS4-BUF: "-stack-protector" "2"
+ // SSP-PS4-BUF: "-stack-protector-buffer-size" "16"
+ 
++// Test default stack protector values for Alpine
++
++// RUN: %clang -target x86_64-alpine-linux-musl -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE
++// ALPINE: "-stack-protector" "2"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_SPS
++// ALPINE_SPS: "-stack-protector" "2"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_ALL
++// ALPINE_ALL: "-stack-protector" "3"
++// ALPINE_ALL-NOT: "-stack-protector-buffer-size"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fno-stack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_NOSSP
++// ALPINE_NOSSP-NOT: "-stack-protector"
++// ALPINE_NOSSP-NOT: "-stack-protector-buffer-size"
++
+ // Test default stack protector values for Darwin platforms
+ 
+ // RUN: %clang -target armv7k-apple-watchos2.0 -### %s 2>&1 | FileCheck %s -check-prefix=SSP_WATCHOS
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -563,6 +563,10 @@
+   // The profile runtime also needs access to system libraries.
+   getToolChain().addProfileRTLibs(Args, CmdArgs);
+ 
++  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles, options::OPT_nodefaultlibs)) {
++    CmdArgs.push_back("-lssp_nonshared");
++  }
++
+   if (D.CCCIsCXX() &&
+       !Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs,
+                    options::OPT_r)) {
diff --git a/main/clang14/APKBUILD b/main/clang14/APKBUILD
new file mode 100644
index 00000000000..8f52a1fd8ee
--- /dev/null
+++ b/main/clang14/APKBUILD
@@ -0,0 +1,341 @@
+# Contributor Eric Molitor <eric@molitor.org>
+# Contributor Patrick Gansterer <paroga@paroga.com>
+# Contributor Travis Tilley <ttilley@gmail.com>
+# Contributor omni <omni+alpine@hack.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=clang14
+pkgver=14.0.6
+pkgrel=8
+_llvmver=${pkgver%%.*}
+pkgdesc="A C language family front-end for LLVM"
+arch="all !loongarch64 !riscv64"
+url="https://llvm.org/"
+license="Apache-2.0 WITH LLVM-exception"
+options="!check" # fail to build
+makedepends="
+	cmake
+	help2man
+	libxml2-dev
+	llvm$_llvmver-dev
+	llvm$_llvmver-static
+	llvm$_llvmver-test-utils
+	samurai
+	python3
+	"
+checkdepends="diffutils bash gtest-dev"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+subpackages="
+	$pkgname-static
+	$pkgname-libclang
+	$pkgname-libs
+	$pkgname-dev
+	"
+source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-$pkgver.src.tar.xz
+	10-add-musl-triples.patch
+	30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+	"
+builddir="$srcdir/clang-$pkgver.src"
+
+# Whether is this package the default (latest) clang version.
+_default_clang="no"
+
+if [ "$_default_clang" = yes ]; then
+	provides="clang=$pkgver-r$pkgrel"
+	replaces="clang"
+	depends_dev="$depends_dev $pkgname-extra-tools=$pkgver-r$pkgrel"
+fi
+
+build() {
+	local python_version=$(python3 -V | sed 's/.*\([0-9]\{1,\}\.[0-9]\{1,\}\)\..*/\1/')
+
+	if [ $_default_clang = yes ]; then
+		local extras=ON
+		local onlymain=OFF
+	else
+		local extras=OFF
+		local onlymain=ON
+	fi
+
+	cmake -B build -G Ninja -Wno-dev \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm$_llvmver \
+		-DCMAKE_MODULE_PATH="$srcdir/cmake-$pkgver.src/Modules" \
+		-DCLANG_BUILT_STANDALONE=ON \
+		-DCLANG_ENABLE_ARCMT=$extras \
+		-DCLANG_ENABLE_STATIC_ANALYZER=$extras \
+		-DCLANG_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DCLANG_LINK_CLANG_DYLIB=ON \
+		-DCLANG_PLUGIN_SUPPORT=ON \
+		-DCLANG_PYTHON_BINDINGS_VERSIONS="$python_version" \
+		-DCLANG_VENDOR=Alpine \
+		-DENABLE_LINKER_BUILD_ID=ON \
+		-DLIBCLANG_BUILD_STATIC=ON \
+		-DLLVM_INSTALL_TOOLCHAIN_ONLY=$onlymain
+
+	ninja -C build clang-tblgen
+	ninja -C build
+
+	if [ "$_default_clang" = yes ]; then
+		help2man --no-info \
+			--source "Alpine" \
+			--name "Alpine Clang $pkgver-r$pkgrel" \
+			--version-string "$pkgver-r$pkgrel" \
+			--help-option "--help-hidden" \
+			./build/bin/clang > clang.1
+	fi
+}
+
+check() {
+	ninja -C build check-all
+}
+
+package() {
+	# the libraries should always exactly match, not just by soname
+	depends="$pkgname-libs=$pkgver-r$pkgrel gcc libstdc++-dev"
+
+	DESTDIR="$pkgdir" cmake --install build
+	mkdir -p "$pkgdir"/usr/bin
+
+	install -Dm644 build/lib/libclang.a -t "$pkgdir"/usr/lib/llvm$_llvmver/lib/
+
+	if [ $_default_clang = "yes" ]; then
+		rm "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-format-bbedit.applescript \
+			"$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-doc-default-stylesheet.css \
+			"$pkgdir"/usr/lib/llvm$_llvmver/share/clang/index.js
+
+		mkdir -p "$pkgdir"/usr/share/bash-completion/completions
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/bash-autocomplete.sh \
+			"$pkgdir"/usr/share/bash-completion/completions/clang
+
+		mkdir -p "$pkgdir"/usr/share/emacs/site-lisp
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-*.el \
+			"$pkgdir"/usr/share/emacs/site-lisp
+		rmdir -p usr/lib/llvm$_llvmver/share/emacs/clang || true
+
+		local sitedir=$(python3 -c "import site; print(site.getsitepackages()[0])")
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/lib/python3* "$pkgdir"/usr/lib
+		mkdir -p "$pkgdir"/"$sitedir"
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/lib/libscanbuild "$pkgdir"/"$sitedir"
+
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/share/* "$pkgdir"/usr/share/
+
+		# symlink everything in the bin dir,
+		# into /usr/bin.
+		local clangexes="
+			analyze-build
+			c-index-test
+			clang
+			clang-cl
+			clang-cpp
+			clang-linker-wrapper
+			clang-nvlink-wrapper
+			clang-pseudo
+			clang++
+			clang-$_llvmver
+			clang-apply-replacements
+			clang-change-namespace
+			clang-check
+			clang-doc
+			clang-extdef-mapping
+			clang-format
+			clang-include-fixer
+			clang-move
+			clang-offload-bundler
+			clang-offload-packager
+			clang-offload-wrapper
+			clang-query
+			clang-refactor
+			clang-rename
+			clang-reorder-fields
+			clang-repl
+			clang-scan-deps
+			clang-tidy
+			clangd
+			diagtool
+			find-all-symbols
+			git-clang-format
+			hmaptool
+			intercept-build
+			modularize
+			pp-trace
+			run-clang-tidy
+			scan-build
+			scan-build-py
+			scan-view
+			"
+		for clangexe in $clangexes; do
+			ln -sfv ../lib/llvm$_llvmver/bin/$clangexe "$pkgdir"/usr/bin/$clangexe
+		done
+
+		install -Dm644 "$builddir"/clang.1 -t "$pkgdir"/usr/share/man/man1/
+	else
+		# only has things we want to put in the main version
+		rm -rf "$pkgdir"/usr/lib/llvm$_llvmver/share
+		rm -rf "$pkgdir"/usr/lib/llvm$_llvmver/lib/python*
+
+		# provide only a versioned link, so you can add more than one clang version at once,
+		# and they don't conflict as this is the only thing in the global bin.
+		# we also add clang++-$_llvmver which is not normally present.
+		ln -sfv ../lib/llvm$_llvmver/bin/clang-$_llvmver "$pkgdir"/usr/bin/clang-$_llvmver
+		ln -sfv ../lib/llvm$_llvmver/bin/clang-$_llvmver "$pkgdir"/usr/bin/clang++-$_llvmver
+	fi
+
+	# hack- 14 had weird naming.
+	local libs="
+		libclang-cpp.so
+		libclang-cpp.so.$_llvmver
+		libclang.so
+		libclang.so.13
+		libclang.so.$pkgver
+		"
+	for lib in $libs; do
+		ln -sfv ../lib/llvm$_llvmver/lib/$lib "$pkgdir"/usr/lib/$lib
+	done
+
+	# compat symlink back to fix clang with -no-canonical-prefixes
+	mkdir -p "$pkgdir"/usr/lib/clang
+	ln -sfv ../../lib/llvm$_llvmver/lib/clang/$pkgver "$pkgdir"/usr/lib/clang/$pkgver
+}
+
+dev() {
+	default_dev
+	_default_replace
+
+	# move back usr/lib/llvm*/lib/clang/x.y.z/include with files such as altivec.h, msa.h etc
+	# these are needed to build programs *with* clang, not *against* it.
+	mv "$subpkgdir"/usr/lib/llvm$_llvmver/lib/clang "$pkgdir"/usr/lib/llvm$_llvmver/lib/
+}
+
+static() {
+	default_static
+	_default_replace
+}
+
+bash() {
+	default_bashcomp
+	_default_replace
+}
+
+libs() {
+	default_libs
+	# this can fail depending on the symlinks and is already moved
+	amove usr/lib/libclang-cpp.so.* || true
+	amove usr/lib/llvm$_llvmver/lib/libclang-cpp.so.*
+	_default_replace
+}
+
+libclang() {
+	_default_replace
+	replaces="$replaces clang-libs"
+
+	# we add an extra subpackage for this so things that link to libclang don't
+	# have to pull libclang-cpp too (separate)
+	amove usr/lib/libclang.so.*
+	amove usr/lib/llvm$_llvmver/lib/libclang.so.*
+}
+
+analyzer() {
+	pkgdesc="Clang source code analysis framework"
+	depends="$pkgname=$pkgver-r$pkgrel py3-$pkgname=$pkgver-r$pkgrel perl python3"
+	_default_replace
+
+	amove \
+		usr/bin/scan* \
+		usr/bin/analyze-build* \
+		usr/bin/intercept-build* \
+		usr/lib/llvm$_llvmver/bin/scan* \
+		usr/lib/llvm$_llvmver/bin/analyze-build* \
+		usr/lib/llvm$_llvmver/bin/intercept-build* \
+		usr/lib/llvm$_llvmver/libexec/*-analyzer* \
+		usr/lib/llvm$_llvmver/libexec/analyze-* \
+		usr/lib/llvm$_llvmver/libexec/intercept-* \
+		usr/lib/llvm$_llvmver/lib/libear* \
+		usr/share/scan-*
+}
+
+extra() {
+	pkgdesc="Extra tools built using Clang’s tooling APIs"
+	_default_replace
+
+	amove \
+		usr/bin/clang-apply-replacements* \
+		usr/bin/clang-change-namespace* \
+		usr/bin/clang-check* \
+		usr/bin/clang-doc* \
+		usr/bin/clang-extdef-mapping* \
+		usr/bin/clang-format* \
+		usr/bin/clang-include-fixer* \
+		usr/bin/clang-move* \
+		usr/bin/clang-offload-bundler* \
+		usr/bin/clang-offload-wrapper* \
+		usr/bin/clang-query* \
+		usr/bin/clang-refactor* \
+		usr/bin/clang-rename* \
+		usr/bin/clang-reorder-fields* \
+		usr/bin/clang-repl* \
+		usr/bin/clang-scan-deps* \
+		usr/bin/clang-tidy* \
+		usr/bin/clangd* \
+		usr/bin/c-index-test* \
+		usr/bin/diagtool* \
+		usr/bin/find-all-symbols* \
+		usr/bin/git-clang-format* \
+		usr/bin/hmaptool* \
+		usr/bin/modularize* \
+		usr/bin/pp-trace* \
+		usr/bin/run-clang-tidy* \
+		usr/lib/llvm$_llvmver/bin/clang-apply-replacements* \
+		usr/lib/llvm$_llvmver/bin/clang-change-namespace* \
+		usr/lib/llvm$_llvmver/bin/clang-check* \
+		usr/lib/llvm$_llvmver/bin/clang-doc* \
+		usr/lib/llvm$_llvmver/bin/clang-extdef-mapping* \
+		usr/lib/llvm$_llvmver/bin/clang-format* \
+		usr/lib/llvm$_llvmver/bin/clang-include-fixer* \
+		usr/lib/llvm$_llvmver/bin/clang-move* \
+		usr/lib/llvm$_llvmver/bin/clang-offload-bundler* \
+		usr/lib/llvm$_llvmver/bin/clang-offload-wrapper* \
+		usr/lib/llvm$_llvmver/bin/clang-query* \
+		usr/lib/llvm$_llvmver/bin/clang-refactor* \
+		usr/lib/llvm$_llvmver/bin/clang-rename* \
+		usr/lib/llvm$_llvmver/bin/clang-reorder-fields* \
+		usr/lib/llvm$_llvmver/bin/clang-repl* \
+		usr/lib/llvm$_llvmver/bin/clang-scan-deps* \
+		usr/lib/llvm$_llvmver/bin/clang-tidy* \
+		usr/lib/llvm$_llvmver/bin/clangd* \
+		usr/lib/llvm$_llvmver/bin/c-index-test* \
+		usr/lib/llvm$_llvmver/bin/diagtool* \
+		usr/lib/llvm$_llvmver/bin/find-all-symbols* \
+		usr/lib/llvm$_llvmver/bin/git-clang-format* \
+		usr/lib/llvm$_llvmver/bin/hmaptool* \
+		usr/lib/llvm$_llvmver/bin/modularize* \
+		usr/lib/llvm$_llvmver/bin/pp-trace* \
+		usr/lib/llvm$_llvmver/bin/run-clang-tidy* \
+		usr/share/clang/clang-include-fixer* \
+		usr/share/clang/clang-format*.py \
+		usr/share/clang/*clang-tidy* \
+		usr/share/clang/run-find-all-symbols.py \
+		usr/share/emacs
+}
+
+python() {
+	pkgdesc="Clang Python Bindings"
+	depends="$pkgname-libs=$pkgver-r$pkgrel python3"
+	provides="py3-clang=$pkgver-r$pkgrel"
+	replaces="py3-clang"
+
+	amove usr/lib/python*
+	amove usr/share/clang/clang-rename.py
+}
+
+_default_replace() {
+	if [ "$_default_clang" = yes ]; then
+		replaces="clang${subpkgname#"$pkgname"}"
+		provides="$replaces=$pkgver-r$pkgrel"
+	fi
+}
+
+sha512sums="
+5f5497b57dd116225e90f321902f1015beb50c0b1bb90d0fc6c026f13aa748feabe44f98eb75e86f98f3b1785ad5e850210732f3eae75b942ecd520527dcd30b  clang-14.0.6.src.tar.xz
+5809d931656cac13b91bc91aac63df072b0403708ac718bf01546d9d520ff2c4163ee11411439dce5bb683a3bfa044b62443b6f66a1419c9086d20e79a018071  10-add-musl-triples.patch
+b9b5529bcf460767796ddbc6f7d8c479b62d63c74d39297b3c7c79a2f6898272ac52a2f2d1ea2bd601e869cecf23c0cd69fbcd613b8c6299b14a1be8203fd089  30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+"
diff --git a/main/clang15/10-add-musl-triples.patch b/main/clang15/10-add-musl-triples.patch
new file mode 100644
index 00000000000..0ed9c81675f
--- /dev/null
+++ b/main/clang15/10-add-musl-triples.patch
@@ -0,0 +1,39 @@
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -2073,7 +2073,7 @@
+   static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
+   static const char *const AArch64Triples[] = {
+       "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
+-      "aarch64-suse-linux"};
++      "aarch64-suse-linux", "aarch64-linux-musl"};
+   static const char *const AArch64beLibDirs[] = {"/lib"};
+   static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
+                                                  "aarch64_be-linux-gnu"};
+@@ -2085,7 +2085,9 @@
+                                              "armv7l-linux-musleabihf",
+                                              "armv7hl-redhat-linux-gnueabi",
+                                              "armv6hl-suse-linux-gnueabi",
+-                                             "armv7hl-suse-linux-gnueabi"};
++                                             "armv7hl-suse-linux-gnueabi",
++                                             "arm-linux-musleabihf",
++                                             "armv7l-linux-musleabihf"};
+   static const char *const ARMebLibDirs[] = {"/lib"};
+   static const char *const ARMebTriples[] = {"armeb-linux-gnueabi"};
+   static const char *const ARMebHFTriples[] = {
+@@ -2101,7 +2103,7 @@
+       "x86_64-redhat-linux",    "x86_64-suse-linux",
+       "x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
+       "x86_64-slackware-linux", "x86_64-unknown-linux",
+-      "x86_64-amazon-linux"};
++      "x86_64-amazon-linux", "x86_64-linux-musl"};
+   static const char *const X32Triples[] = {"x86_64-linux-gnux32",
+                                            "x86_64-pc-linux-gnux32"};
+   static const char *const X32LibDirs[] = {"/libx32", "/lib"};
+@@ -2110,6 +2112,7 @@
+       "i586-linux-gnu",      "i686-linux-gnu",        "i686-pc-linux-gnu",
+       "i386-redhat-linux6E", "i686-redhat-linux",     "i386-redhat-linux",
+       "i586-suse-linux",     "i686-montavista-linux", "i686-gnu",
++      "i686-linux-musl",
+   };
+ 
+   static const char *const M68kLibDirs[] = {"/lib"};
diff --git a/main/clang15/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch b/main/clang15/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
new file mode 100644
index 00000000000..bae4532c16a
--- /dev/null
+++ b/main/clang15/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
@@ -0,0 +1,82 @@
+--- a/lib/Driver/ToolChains/Linux.h
++++ b/lib/Driver/ToolChains/Linux.h
+@@ -11,6 +11,7 @@
+ 
+ #include "Gnu.h"
+ #include "clang/Driver/ToolChain.h"
++#include "clang/Basic/LangOptions.h"
+ 
+ namespace clang {
+ namespace driver {
+@@ -60,6 +61,15 @@
+   llvm::DenormalMode getDefaultDenormalModeForType(
+       const llvm::opt::ArgList &DriverArgs, const JobAction &JA,
+       const llvm::fltSemantics *FPType = nullptr) const override;
++
++  LangOptions::StackProtectorMode
++  GetDefaultStackProtectorLevel(bool KernelOrKext) const override {
++    StringRef VendorName = Linux::getTriple().getVendorName();
++    if (VendorName.compare("alpine") == 0)
++      return LangOptions::SSPStrong;
++
++    return LangOptions::SSPOff;
++  }
+ 
+ protected:
+   Tool *buildAssembler() const override;
+--- a/test/Driver/fsanitize.c
++++ b/test/Driver/fsanitize.c
+@@ -666,12 +666,12 @@
+ // RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
+ // NOSP-NOT: "-fsanitize=safe-stack"
+ 
+-// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
++// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang -target x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN
+ // RUN: %clang -target x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP
+-// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
+-// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
++// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
++// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang -target i386-contiki-unknown -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
+ // NO-SP-NOT: stack-protector
+ // NO-SP: "-fsanitize=safe-stack"
+--- a/test/Driver/stack-protector.c
++++ b/test/Driver/stack-protector.c
+@@ -33,6 +33,22 @@
+ // SSP-PS4-BUF: "-stack-protector" "2"
+ // SSP-PS4-BUF: "-stack-protector-buffer-size" "16"
+ 
++// Test default stack protector values for Alpine
++
++// RUN: %clang -target x86_64-alpine-linux-musl -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE
++// ALPINE: "-stack-protector" "2"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_SPS
++// ALPINE_SPS: "-stack-protector" "2"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_ALL
++// ALPINE_ALL: "-stack-protector" "3"
++// ALPINE_ALL-NOT: "-stack-protector-buffer-size"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fno-stack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_NOSSP
++// ALPINE_NOSSP-NOT: "-stack-protector"
++// ALPINE_NOSSP-NOT: "-stack-protector-buffer-size"
++
+ // Test default stack protector values for Darwin platforms
+ 
+ // RUN: %clang -target armv7k-apple-watchos2.0 -### %s 2>&1 | FileCheck %s -check-prefix=SSP_WATCHOS
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -563,6 +563,10 @@
+   // The profile runtime also needs access to system libraries.
+   getToolChain().addProfileRTLibs(Args, CmdArgs);
+ 
++  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles, options::OPT_nodefaultlibs)) {
++    CmdArgs.push_back("-lssp_nonshared");
++  }
++
+   if (D.CCCIsCXX() &&
+       !Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs,
+                    options::OPT_r)) {
diff --git a/main/clang15/APKBUILD b/main/clang15/APKBUILD
new file mode 100644
index 00000000000..cb5cba6274b
--- /dev/null
+++ b/main/clang15/APKBUILD
@@ -0,0 +1,397 @@
+# Contributor Eric Molitor <eric@molitor.org>
+# Contributor Patrick Gansterer <paroga@paroga.com>
+# Contributor Travis Tilley <ttilley@gmail.com>
+# Contributor omni <omni+alpine@hack.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=clang15
+pkgver=15.0.7
+pkgrel=19
+_llvmver=${pkgver%%.*}
+pkgdesc="C language family front-end for LLVM"
+arch="all"
+url="https://llvm.org/"
+license="Apache-2.0 WITH LLVM-exception"
+options="!check" # fail to build
+makedepends="
+	cmake
+	help2man
+	libxml2-dev
+	llvm$_llvmver-dev
+	llvm$_llvmver-static
+	llvm$_llvmver-test-utils
+	samurai
+	python3
+	"
+checkdepends="diffutils bash gtest-dev"
+depends="fortify-headers>=1.1-r2"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+subpackages="
+	$pkgname-static
+	$pkgname-headers
+	$pkgname-libclang
+	$pkgname-libs
+	$pkgname-dev
+	$pkgname-ccache
+	$pkgname-extra-tools:extra
+	"
+source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-$pkgver.src.tar.xz
+	https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-tools-extra-$pkgver.src.tar.xz
+	https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/cmake-$pkgver.src.tar.xz
+	10-add-musl-triples.patch
+	30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+
+	clang-default-fno-semantic-interposition.patch
+	clang-001-fortify-include.patch
+	clang-002-fortify-enable.patch
+	clang-003-as-needed.patch
+	"
+builddir="$srcdir/clang-$pkgver.src"
+
+prepare() {
+	mv "$srcdir/clang-tools-extra-$pkgver.src" "$builddir/tools/extra"
+	default_prepare
+}
+
+# Whether is this package the default (latest) clang version.
+_default_clang="no"
+
+if [ "$_default_clang" = yes ]; then
+	subpackages="
+		$subpackages
+		$pkgname-doc
+		$pkgname-analyzer::noarch
+		$pkgname-bash-completion:bash:noarch
+		$pkgname-emacs::noarch
+		py3-$pkgname:python:noarch
+		"
+	provides="clang=$pkgver-r$pkgrel"
+	replaces="clang"
+	depends_dev="$depends_dev $pkgname-extra-tools=$pkgver-r$pkgrel"
+fi
+
+build() {
+	local python_version=$(python3 -V | sed 's/.*\([0-9]\{1,\}\.[0-9]\{1,\}\)\..*/\1/')
+
+	if [ $_default_clang = yes ]; then
+		local extras=ON
+	else
+		local extras=OFF
+	fi
+
+	cmake -B build -G Ninja -Wno-dev \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm$_llvmver \
+		-DCMAKE_MODULE_PATH="$srcdir/cmake-$pkgver.src/Modules" \
+		-DCLANG_BUILT_STANDALONE=ON \
+		-DCLANG_ENABLE_ARCMT=$extras \
+		-DCLANG_ENABLE_STATIC_ANALYZER=$extras \
+		-DCLANG_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DCLANG_LINK_CLANG_DYLIB=ON \
+		-DCLANG_PLUGIN_SUPPORT=ON \
+		-DCLANG_PYTHON_BINDINGS_VERSIONS="$python_version" \
+		-DCLANG_VENDOR=Alpine \
+		-DENABLE_LINKER_BUILD_ID=ON \
+		-DLIBCLANG_BUILD_STATIC=ON
+
+	ninja -C build clang-tblgen
+	ninja -C build
+
+	if [ "$_default_clang" = yes ]; then
+		help2man --no-info \
+			--source "Alpine" \
+			--name "Alpine Clang $pkgver-r$pkgrel" \
+			--version-string "$pkgver-r$pkgrel" \
+			--help-option "--help-hidden" \
+			./build/bin/clang > clang.1
+	fi
+}
+
+check() {
+	ninja -C build check-all
+}
+
+package() {
+	# the libraries should always exactly match, not just by soname
+	depends="
+		$pkgname-headers=$pkgver-r$pkgrel
+		$pkgname-libs=$pkgver-r$pkgrel
+		gcc
+		libstdc++-dev
+		"
+
+	DESTDIR="$pkgdir" cmake --install build
+	mkdir -p "$pkgdir"/usr/bin
+
+	install -Dm644 build/lib/libclang.a -t "$pkgdir"/usr/lib/llvm$_llvmver/lib/
+
+	if [ $_default_clang = "yes" ]; then
+		rm "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-format-bbedit.applescript \
+			"$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-doc-default-stylesheet.css \
+			"$pkgdir"/usr/lib/llvm$_llvmver/share/clang/index.js
+
+		mkdir -p "$pkgdir"/usr/share/bash-completion/completions
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/bash-autocomplete.sh \
+			"$pkgdir"/usr/share/bash-completion/completions/clang
+
+		mkdir -p "$pkgdir"/usr/share/emacs/site-lisp
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-*.el \
+			"$pkgdir"/usr/share/emacs/site-lisp
+		rmdir -p usr/lib/llvm$_llvmver/share/emacs || true
+
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/share/man "$pkgdir"/usr/share/
+		# XXX: scan-build specifically needs to stay in llvm path, but scan-view has to not be
+		# everything uses different path lookup logic..
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/share/scan-view "$pkgdir"/usr/share/
+
+		local sitedir=$(python3 -c "import site; print(site.getsitepackages()[0])")
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/lib/python3* "$pkgdir"/usr/lib
+		mkdir -p "$pkgdir"/"$sitedir"
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/lib/libscanbuild "$pkgdir"/"$sitedir"
+
+		# symlink everything in the bin dir,
+		# into /usr/bin.
+		local clangexes="
+			analyze-build
+			c-index-test
+			clang
+			clang-cl
+			clang-cpp
+			clang-linker-wrapper
+			clang-nvlink-wrapper
+			clang-pseudo
+			clang++
+			clang-$_llvmver
+			clang-apply-replacements
+			clang-change-namespace
+			clang-check
+			clang-doc
+			clang-extdef-mapping
+			clang-format
+			clang-include-fixer
+			clang-move
+			clang-offload-bundler
+			clang-offload-packager
+			clang-offload-wrapper
+			clang-query
+			clang-refactor
+			clang-rename
+			clang-reorder-fields
+			clang-repl
+			clang-scan-deps
+			clang-tidy
+			clangd
+			diagtool
+			find-all-symbols
+			git-clang-format
+			hmaptool
+			intercept-build
+			modularize
+			pp-trace
+			run-clang-tidy
+			scan-build
+			scan-build-py
+			scan-view
+			"
+		for clangexe in $clangexes; do
+			ln -sfv ../lib/llvm$_llvmver/bin/$clangexe "$pkgdir"/usr/bin/$clangexe
+		done
+		ln -sfv ../lib/llvm$_llvmver/bin/clang-$_llvmver "$pkgdir"/usr/bin/clang++-$_llvmver
+
+		install -Dm644 "$builddir"/clang.1 -t "$pkgdir"/usr/share/man/man1/
+	else
+		ln -sfv ../lib/llvm$_llvmver/bin/clang-$_llvmver "$pkgdir"/usr/bin/clang-$_llvmver
+		ln -sfv ../lib/llvm$_llvmver/bin/clang-$_llvmver "$pkgdir"/usr/bin/clang++-$_llvmver
+
+		# delete things we don't want non-latest of
+		rm -r "$pkgdir"/usr/lib/llvm$_llvmver/share
+		rm -r "$pkgdir"/usr/lib/llvm$_llvmver/lib/python3*
+	fi
+
+	local libs="
+		libclang-cpp.so
+		libclang-cpp.so.$_llvmver
+		libclang.so
+		libclang.so.$_llvmver
+		libclang.so.$pkgver
+		"
+	for lib in $libs; do
+		ln -sfv ../lib/llvm$_llvmver/lib/$lib "$pkgdir"/usr/lib/$lib
+	done
+
+	# compat symlink back to fix clang with -no-canonical-prefixes
+	mkdir -p "$pkgdir"/usr/lib/clang
+	ln -sfv ../../lib/llvm$_llvmver/lib/clang/$pkgver "$pkgdir"/usr/lib/clang/$pkgver
+}
+
+dev() {
+	default_dev
+	_default_replace
+
+	# move cmake to -dev
+	amove usr/lib/llvm$_llvmver/lib/cmake/clang
+
+	# create cmakedir symlinks, so find_package works
+	# llvm does the same thing- versioned, plus unversioned default.
+	mkdir -p "$subpkgdir"/usr/lib/cmake
+	ln -sfv ../llvm$_llvmver/lib/cmake/clang "$subpkgdir"/usr/lib/cmake/clang$_llvmver
+	if [ $_default_clang = yes ]; then
+		ln -sfv clang$_llvmver "$subpkgdir"/usr/lib/cmake/clang
+	fi
+}
+
+static() {
+	default_static
+	_default_replace
+}
+
+bash() {
+	default_bashcomp
+	_default_replace
+}
+
+libs() {
+	default_libs
+	# this can fail depending on the symlinks and is already moved
+	amove usr/lib/libclang-cpp.so.* || true
+	amove usr/lib/llvm$_llvmver/lib/libclang-cpp.so.*
+	_default_replace
+}
+
+libclang() {
+	_default_replace
+	replaces="$replaces clang-libs"
+	depends="$pkgname-headers=$pkgver-r$pkgrel"
+
+	# we add an extra subpackage for this so things that link to libclang don't
+	# have to pull libclang-cpp too (separate)
+	amove usr/lib/libclang.so.*
+	amove usr/lib/llvm$_llvmver/lib/libclang.so.*
+}
+
+analyzer() {
+	pkgdesc="Clang source code analysis framework"
+	depends="$pkgname=$pkgver-r$pkgrel py3-$pkgname=$pkgver-r$pkgrel perl python3"
+	_default_replace
+
+	amove \
+		usr/bin/scan* \
+		usr/bin/analyze-build* \
+		usr/bin/intercept-build* \
+		usr/lib/llvm$_llvmver/bin/scan* \
+		usr/lib/llvm$_llvmver/bin/analyze-build* \
+		usr/lib/llvm$_llvmver/bin/intercept-build* \
+		usr/lib/llvm$_llvmver/libexec/*-analyzer* \
+		usr/lib/llvm$_llvmver/libexec/analyze-* \
+		usr/lib/llvm$_llvmver/libexec/intercept-* \
+		usr/lib/llvm$_llvmver/lib/libear* \
+		usr/lib/llvm$_llvmver/share/scan-build \
+		usr/share/scan-view
+}
+
+headers() {
+	_default_replace
+	amove usr/lib/llvm$_llvmver/lib/clang/$pkgver/include
+}
+
+extra() {
+	pkgdesc="Extra tools built using Clang’s tooling APIs"
+	_default_replace
+
+	if [ "$_default_clang" = "yes" ]; then
+		amove \
+			usr/bin/amdgpu-arch \
+			usr/bin/clang-apply-replacements* \
+			usr/bin/clang-change-namespace* \
+			usr/bin/clang-check* \
+			usr/bin/clang-doc* \
+			usr/bin/clang-include-fixer* \
+			usr/bin/clang-move* \
+			usr/bin/clang-offload-bundler* \
+			usr/bin/clang-pseudo* \
+			usr/bin/clang-query* \
+			usr/bin/clang-refactor* \
+			usr/bin/clang-rename* \
+			usr/bin/clang-reorder-fields* \
+			usr/bin/clang-repl* \
+			usr/bin/clang-scan-deps* \
+			usr/bin/clang-tidy* \
+			usr/bin/clangd* \
+			usr/bin/c-index-test* \
+			usr/bin/diagtool* \
+			usr/bin/find-all-symbols* \
+			usr/bin/hmaptool* \
+			usr/bin/modularize* \
+			usr/bin/nvptx-arch \
+			usr/bin/pp-trace* \
+			usr/bin/run-clang-tidy*
+	fi
+
+	amove \
+		usr/lib/llvm$_llvmver/bin/clang-apply-replacements* \
+		usr/lib/llvm$_llvmver/bin/clang-change-namespace* \
+		usr/lib/llvm$_llvmver/bin/clang-doc* \
+		usr/lib/llvm$_llvmver/bin/clang-format* \
+		usr/lib/llvm$_llvmver/bin/clang-include-fixer* \
+		usr/lib/llvm$_llvmver/bin/clang-move* \
+		usr/lib/llvm$_llvmver/bin/clang-offload-bundler* \
+		usr/lib/llvm$_llvmver/bin/clang-pseudo* \
+		usr/lib/llvm$_llvmver/bin/clang-query* \
+		usr/lib/llvm$_llvmver/bin/clang-refactor* \
+		usr/lib/llvm$_llvmver/bin/clang-rename* \
+		usr/lib/llvm$_llvmver/bin/clang-reorder-fields* \
+		usr/lib/llvm$_llvmver/bin/clang-repl* \
+		usr/lib/llvm$_llvmver/bin/clang-scan-deps* \
+		usr/lib/llvm$_llvmver/bin/clang-tidy* \
+		usr/lib/llvm$_llvmver/bin/clangd* \
+		usr/lib/llvm$_llvmver/bin/diagtool* \
+		usr/lib/llvm$_llvmver/bin/find-all-symbols* \
+		usr/lib/llvm$_llvmver/bin/git-clang-format* \
+		usr/lib/llvm$_llvmver/bin/hmaptool* \
+		usr/lib/llvm$_llvmver/bin/modularize* \
+		usr/lib/llvm$_llvmver/bin/pp-trace* \
+		usr/lib/llvm$_llvmver/bin/run-clang-tidy*
+}
+
+emacs() {
+	pkgdesc="clang plugin for emacs"
+	install_if="$pkgname-extra-tools=$pkgver-r$pkgrel emacs"
+
+	amove	usr/share/emacs
+}
+
+python() {
+	pkgdesc="Clang Python Bindings"
+	depends="$pkgname-libs=$pkgver-r$pkgrel python3"
+	provides="py3-clang=$pkgver-r$pkgrel"
+	replaces="py3-clang"
+
+	amove usr/lib/python*
+}
+
+ccache() {
+	pkgdesc="$pkgdesc (ccache symlinks)"
+	install_if="$pkgname=$pkgver-r$pkgrel ccache"
+
+	mkdir -p "$subpkgdir"/usr/lib/ccache/bin
+	ln -sfv /usr/bin/ccache "$subpkgdir"/usr/lib/ccache/bin/clang-$_llvmver
+	ln -sfv /usr/bin/ccache "$subpkgdir"/usr/lib/ccache/bin/clang++-$_llvmver
+}
+
+_default_replace() {
+	if [ "$_default_clang" = yes ]; then
+		replaces="clang${subpkgname#"$pkgname"}"
+		provides="$replaces=$pkgver-r$pkgrel"
+	fi
+}
+
+sha512sums="
+9fd2736a9f5993ddbb5b3c507fe497234a6def64f6f418f379d1ca56c9c361ad1ae9a5445ab938230fbc1671ec00b4f802a412b048569023863c20dc6bb46a1f  clang-15.0.7.src.tar.xz
+dd95d261d3a1618967b698e97ac0b41204d872d7479c0c832fcf5a91fe447af6a97fa794de07b3e271285867b30b905688f090e98f516b9df4cdfb3bad9defc6  clang-tools-extra-15.0.7.src.tar.xz
+85097a6eaee0df004567905f7e5ce8ca02e3b46c6fc66fa552fe99734642e6ee61685de4e5e6e8b505963334d7b91d98ecd9c5870e6bdd3f0018ee5b963ffa96  cmake-15.0.7.src.tar.xz
+5809d931656cac13b91bc91aac63df072b0403708ac718bf01546d9d520ff2c4163ee11411439dce5bb683a3bfa044b62443b6f66a1419c9086d20e79a018071  10-add-musl-triples.patch
+b9b5529bcf460767796ddbc6f7d8c479b62d63c74d39297b3c7c79a2f6898272ac52a2f2d1ea2bd601e869cecf23c0cd69fbcd613b8c6299b14a1be8203fd089  30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+6896d6c5358b8b83c97c7cb31f60042f33a1326cfad093a0f23dcacd10ef418f845964f6de948a5873494dae5180e51a4b2b0cec937aa5597765362779da6f35  clang-default-fno-semantic-interposition.patch
+aa2dff990278e0258763934eaa528827baa1733eeb7dc36cc7f1500a4919b8d11870a0522f20f210d454322e3faf5945e9afaeffc9f3a3c4fd422b706370a663  clang-001-fortify-include.patch
+751f8acef2bfd1b50c065dea2ad0c3a20cadd4ff4c842ae519b5085c48372127b49a75d3fd0bd32291f5a69119340e5568a9fba6d94e6f354b14233986f61328  clang-002-fortify-enable.patch
+5f98f147d7d66315e9a56ae6fee602a053d40e57a8b1ee4f2ef1764203bb6fdb9082c8e825c535a9388213a38b49d2702b1e936fcf56560c4a2a56b7e6dd232c  clang-003-as-needed.patch
+"
diff --git a/main/clang15/clang-001-fortify-include.patch b/main/clang15/clang-001-fortify-include.patch
new file mode 100644
index 00000000000..968c26e5131
--- /dev/null
+++ b/main/clang15/clang-001-fortify-include.patch
@@ -0,0 +1,36 @@
+From eca9994181dc355cfba61e726c038832d5ff6975 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun, 23 Oct 2022 00:47:57 +0200
+Subject: [PATCH 1/4] clang: add fortify include paths for musl triplets
+
+When we have fortify headers this lets them get included.
+---
+ lib/Driver/ToolChains/Linux.cpp | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp
+index 7fcdcf125..d5df4a240 100644
+--- a/lib/Driver/ToolChains/Linux.cpp
++++ b/lib/Driver/ToolChains/Linux.cpp
+@@ -622,10 +622,14 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
+   if (getTriple().getOS() == llvm::Triple::RTEMS)
+     return;
+ 
+-  // Add an include of '/include' directly. This isn't provided by default by
+-  // system GCCs, but is often used with cross-compiling GCCs, and harmless to
+-  // add even when Clang is acting as-if it were a system compiler.
+-  addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/include"));
++  if (getTriple().isMusl()) {
++    addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/usr/include/fortify"));
++  } else {
++    // Preserve original clang behavior for non-musl triples, but for musl
++    // this just gets in the way and none of our crosstoolchains are ever
++    // actually built this way (and we'd have to figure out fortify for it)
++    addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/include"));
++  }
+ 
+   addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/usr/include"));
+ 
+-- 
+2.38.0
+
diff --git a/main/clang15/clang-002-fortify-enable.patch b/main/clang15/clang-002-fortify-enable.patch
new file mode 100644
index 00000000000..30100c9cba4
--- /dev/null
+++ b/main/clang15/clang-002-fortify-enable.patch
@@ -0,0 +1,29 @@
+From 0a876ce2825f1e54bec7059a387e43a2e0386665 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun, 23 Oct 2022 01:02:35 +0200
+Subject: [PATCH 2/4] clang: enable fortify by default on optimizing musl
+ targets
+
+---
+ lib/Frontend/InitPreprocessor.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/lib/Frontend/InitPreprocessor.cpp b/lib/Frontend/InitPreprocessor.cpp
+index 20bfbf144..9095c0f2f 100644
+--- a/lib/Frontend/InitPreprocessor.cpp
++++ b/lib/Frontend/InitPreprocessor.cpp
+@@ -1288,6 +1288,11 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
+     Builder.defineMacro("__GLIBCXX_BITSIZE_INT_N_0", "128");
+   }
+ 
++  // Enable fortify by default on musl when optimizing, but not with asan
++  if (TI.getTriple().isMusl() && LangOpts.Optimize &&
++      !LangOpts.Sanitize.has(SanitizerKind::Address))
++    Builder.defineMacro("_FORTIFY_SOURCE", "2");
++
+   // Get other target #defines.
+   TI.getTargetDefines(LangOpts, Builder);
+ }
+-- 
+2.38.0
+
diff --git a/main/clang15/clang-003-as-needed.patch b/main/clang15/clang-003-as-needed.patch
new file mode 100644
index 00000000000..a92836fe07a
--- /dev/null
+++ b/main/clang15/clang-003-as-needed.patch
@@ -0,0 +1,31 @@
+forces as-needed regardless of ldflags
+From f59f126a9344f265e3766003766d7a66b6a638e3 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun, 23 Oct 2022 01:26:37 +0200
+Subject: [PATCH 3/4] clang: use --as-needed by default
+
+---
+ clang/lib/Driver/ToolChains/Gnu.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
+index f203cae1d..9e181a79a 100644
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -560,6 +560,13 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+   bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs);
+   bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs);
+   addLinkerCompressDebugSectionsOption(ToolChain, Args, CmdArgs);
++
++  // Use --as-needed by default for all explicit linker inputs on Linux
++  // We don't reset it afterwards because explicit argument does not
++  // get reset either (and that is permitted, so it should be fine)
++  if (Triple.isOSLinux())
++    CmdArgs.push_back("--as-needed");
++
+   AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
+ 
+   addHIPRuntimeLibArgs(ToolChain, Args, CmdArgs);
+-- 
+2.38.0
+
diff --git a/main/clang15/clang-default-fno-semantic-interposition.patch b/main/clang15/clang-default-fno-semantic-interposition.patch
new file mode 100644
index 00000000000..01022aff209
--- /dev/null
+++ b/main/clang15/clang-default-fno-semantic-interposition.patch
@@ -0,0 +1,39 @@
+Patch-Source: https://github.com/chimera-linux/cports/commit/77fdf96a59bddfca32b6737335f01afaf64ff380
+reference: https://maskray.me/blog/2021-05-09-fno-semantic-interposition
+
+in general, this is not '100% safe'.
+however:
+- we only use clang in a few places
+- chimera has had good success with this flag and not seen issues
+so, it should be fine to default in our clang too. it should bring some
+noticable performance gains paired with pic.
+
+--
+From 73b8ed17fed2145b29bde40a0c658712e34d48c3 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Tue, 28 Feb 2023 01:59:26 +0100
+Subject: [PATCH] clang: default to -fno-semantic-interposition on supported
+ targets
+
+---
+ clang/lib/Driver/ToolChains/Clang.cpp | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
+index 3704ed85..d3d67a22 100644
+--- a/lib/Driver/ToolChains/Clang.cpp
++++ b/lib/Driver/ToolChains/Clang.cpp
+@@ -5072,9 +5072,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
+       // The supported targets need to call AsmPrinter::getSymbolPreferLocal.
+       bool SupportsLocalAlias =
+           Triple.isAArch64() || Triple.isRISCV() || Triple.isX86();
+-      if (!A)
+-        CmdArgs.push_back("-fhalf-no-semantic-interposition");
+-      else if (A->getOption().matches(options::OPT_fsemantic_interposition))
++      if (A && A->getOption().matches(options::OPT_fsemantic_interposition))
+         A->render(Args, CmdArgs);
+       else if (!SupportsLocalAlias)
+         CmdArgs.push_back("-fhalf-no-semantic-interposition");
+-- 
+2.39.0
+
diff --git a/main/clang16/10-add-musl-triples.patch b/main/clang16/10-add-musl-triples.patch
new file mode 100644
index 00000000000..0ed9c81675f
--- /dev/null
+++ b/main/clang16/10-add-musl-triples.patch
@@ -0,0 +1,39 @@
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -2073,7 +2073,7 @@
+   static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
+   static const char *const AArch64Triples[] = {
+       "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
+-      "aarch64-suse-linux"};
++      "aarch64-suse-linux", "aarch64-linux-musl"};
+   static const char *const AArch64beLibDirs[] = {"/lib"};
+   static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
+                                                  "aarch64_be-linux-gnu"};
+@@ -2085,7 +2085,9 @@
+                                              "armv7l-linux-musleabihf",
+                                              "armv7hl-redhat-linux-gnueabi",
+                                              "armv6hl-suse-linux-gnueabi",
+-                                             "armv7hl-suse-linux-gnueabi"};
++                                             "armv7hl-suse-linux-gnueabi",
++                                             "arm-linux-musleabihf",
++                                             "armv7l-linux-musleabihf"};
+   static const char *const ARMebLibDirs[] = {"/lib"};
+   static const char *const ARMebTriples[] = {"armeb-linux-gnueabi"};
+   static const char *const ARMebHFTriples[] = {
+@@ -2101,7 +2103,7 @@
+       "x86_64-redhat-linux",    "x86_64-suse-linux",
+       "x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
+       "x86_64-slackware-linux", "x86_64-unknown-linux",
+-      "x86_64-amazon-linux"};
++      "x86_64-amazon-linux", "x86_64-linux-musl"};
+   static const char *const X32Triples[] = {"x86_64-linux-gnux32",
+                                            "x86_64-pc-linux-gnux32"};
+   static const char *const X32LibDirs[] = {"/libx32", "/lib"};
+@@ -2110,6 +2112,7 @@
+       "i586-linux-gnu",      "i686-linux-gnu",        "i686-pc-linux-gnu",
+       "i386-redhat-linux6E", "i686-redhat-linux",     "i386-redhat-linux",
+       "i586-suse-linux",     "i686-montavista-linux", "i686-gnu",
++      "i686-linux-musl",
+   };
+ 
+   static const char *const M68kLibDirs[] = {"/lib"};
diff --git a/main/clang16/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch b/main/clang16/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
new file mode 100644
index 00000000000..9e8a976b68f
--- /dev/null
+++ b/main/clang16/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
@@ -0,0 +1,90 @@
+diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
+index 4f23403..da6883e 100644
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -588,6 +588,10 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+     CmdArgs.push_back("-lm");
+   }
+ 
++  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles, options::OPT_nodefaultlibs)) {
++    CmdArgs.push_back("-lssp_nonshared");
++  }
++
+   // Silence warnings when linking C code with a C++ '-stdlib' argument.
+   Args.ClaimAllArgs(options::OPT_stdlib_EQ);
+
+diff --git a/lib/Driver/ToolChains/Linux.h b/lib/Driver/ToolChains/Linux.h
+index 52439174..d754b543 100644
+--- a/lib/Driver/ToolChains/Linux.h
++++ b/lib/Driver/ToolChains/Linux.h
+@@ -11,6 +11,7 @@
+ 
+ #include "Gnu.h"
+ #include "clang/Driver/ToolChain.h"
++#include "clang/Basic/LangOptions.h"
+ 
+ namespace clang {
+ namespace driver {
+@@ -63,7 +64,15 @@ public:
+       const llvm::opt::ArgList &DriverArgs, const JobAction &JA,
+       const llvm::fltSemantics *FPType = nullptr) const override;
+ 
+   const char *getDefaultLinker() const override;
++  LangOptions::StackProtectorMode
++  GetDefaultStackProtectorLevel(bool KernelOrKext) const override {
++    StringRef VendorName = Linux::getTriple().getVendorName();
++    if (VendorName.compare("alpine") == 0)
++      return LangOptions::SSPStrong;
++
++    return LangOptions::SSPOff;
++  }
+ 
+ protected:
+   Tool *buildAssembler() const override;
+diff --git a/test/Driver/fsanitize.c b/test/Driver/fsanitize.c
+index 8ad6dc25..1619b59a 100644
+--- a/test/Driver/fsanitize.c
++++ b/test/Driver/fsanitize.c
+@@ -695,12 +695,12 @@
+ // RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
+ // NOSP-NOT: "-fsanitize=safe-stack"
+ 
+-// RUN: %clang --target=x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
++// RUN: %clang --target=x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang --target=x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN
+ // RUN: %clang --target=x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang --target=x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP
+-// RUN: %clang --target=arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
+-// RUN: %clang --target=aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
++// RUN: %clang --target=arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
++// RUN: %clang --target=aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang --target=i386-contiki-unknown -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
+ // NO-SP-NOT: stack-protector
+ // NO-SP: "-fsanitize=safe-stack"
+diff --git a/test/Driver/stack-protector.c b/test/Driver/stack-protector.c
+index 16937691..80987f67 100644
+--- a/test/Driver/stack-protector.c
++++ b/test/Driver/stack-protector.c
+@@ -33,6 +33,22 @@
+ // SSP-PS4-BUF: "-stack-protector" "2"
+ // SSP-PS4-BUF: "-stack-protector-buffer-size" "16"
+ 
++// Test default stack protector values for Alpine
++
++// RUN: %clang -target x86_64-alpine-linux-musl -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE
++// ALPINE: "-stack-protector" "2"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_SPS
++// ALPINE_SPS: "-stack-protector" "2"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_ALL
++// ALPINE_ALL: "-stack-protector" "3"
++// ALPINE_ALL-NOT: "-stack-protector-buffer-size"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fno-stack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_NOSSP
++// ALPINE_NOSSP-NOT: "-stack-protector"
++// ALPINE_NOSSP-NOT: "-stack-protector-buffer-size"
++
+ // Test default stack protector values for Darwin platforms
+ 
+ // RUN: %clang -target armv7k-apple-watchos2.0 -### %s 2>&1 | FileCheck %s -check-prefix=SSP_WATCHOS
diff --git a/main/clang16/9008-Clang-Support-more-stdio-builtins.patch b/main/clang16/9008-Clang-Support-more-stdio-builtins.patch
new file mode 100644
index 00000000000..22e72cd350b
--- /dev/null
+++ b/main/clang16/9008-Clang-Support-more-stdio-builtins.patch
@@ -0,0 +1,196 @@
+From d67f31b2fdf74d999b8a0b298361daee3503c2f5 Mon Sep 17 00:00:00 2001
+From: Qiu Chaofan <qiucofan@cn.ibm.com>
+Date: Tue, 23 May 2023 16:22:32 +0800
+Subject: [PATCH 08/10] [Clang] Support more stdio builtins
+
+Add more builtins for stdio functions as in GCC, along with their
+mutations under IEEE float128 ABI.
+
+Reviewed By: tuliom
+
+Differential Revision: https://reviews.llvm.org/D150087
+
+Gentoo-Component: clang
+---
+ clang/include/clang/Basic/Builtins.def        | 36 +++++++-----
+ clang/lib/CodeGen/CGBuiltin.cpp               | 24 ++++++--
+ .../CodeGen/PowerPC/ppc64-f128-builtins.c     | 57 +++++++++++++++++++
+ 3 files changed, 99 insertions(+), 18 deletions(-)
+
+diff --git a/clang/include/clang/Basic/Builtins.def b/clang/include/clang/Basic/Builtins.def
+index 41f124556446..e6a89da1912c 100644
+--- a/include/clang/Basic/Builtins.def
++++ b/include/clang/Basic/Builtins.def
+@@ -551,7 +551,6 @@ BUILTIN(__builtin_assume_aligned, "v*vC*z.", "nctE")
+ BUILTIN(__builtin_bcmp, "ivC*vC*z", "FnE")
+ BUILTIN(__builtin_bcopy, "vv*v*z", "n")
+ BUILTIN(__builtin_bzero, "vv*z", "nF")
+-BUILTIN(__builtin_fprintf, "iP*cC*.", "Fp:1:")
+ BUILTIN(__builtin_free, "vv*", "nF")
+ BUILTIN(__builtin_malloc, "v*z", "nF")
+ BUILTIN(__builtin_memchr, "v*vC*iz", "nFE")
+@@ -562,7 +561,6 @@ BUILTIN(__builtin_memmove, "v*v*vC*z", "nFE")
+ BUILTIN(__builtin_mempcpy, "v*v*vC*z", "nF")
+ BUILTIN(__builtin_memset, "v*v*iz", "nF")
+ BUILTIN(__builtin_memset_inline, "vv*iIz", "n")
+-BUILTIN(__builtin_printf, "icC*.", "Fp:0:")
+ BUILTIN(__builtin_stpcpy, "c*c*cC*", "nF")
+ BUILTIN(__builtin_stpncpy, "c*c*cC*z", "nF")
+ BUILTIN(__builtin_strcasecmp, "icC*cC*", "nF")
+@@ -599,10 +597,20 @@ BUILTIN(__builtin_setjmp, "iv**", "j")
+ BUILTIN(__builtin_longjmp, "vv**i", "r")
+ BUILTIN(__builtin_unwind_init, "v", "")
+ BUILTIN(__builtin_eh_return_data_regno, "iIi", "ncE")
+-BUILTIN(__builtin_snprintf, "ic*zcC*.", "nFp:2:")
+-BUILTIN(__builtin_sprintf, "ic*cC*.", "nFP:1:")
+-BUILTIN(__builtin_vsnprintf, "ic*zcC*a", "nFP:2:")
+-BUILTIN(__builtin_vsprintf, "ic*cC*a", "nFP:1:")
++BUILTIN(__builtin_fprintf, "iP*RcC*R.", "nFp:1:")
++BUILTIN(__builtin_printf, "icC*R.", "nFp:0:")
++BUILTIN(__builtin_sprintf, "ic*RcC*R.", "nFp:1:")
++BUILTIN(__builtin_snprintf, "ic*RzcC*R.", "nFp:2:")
++BUILTIN(__builtin_vprintf, "icC*Ra", "nFP:0:")
++BUILTIN(__builtin_vfprintf, "iP*RcC*Ra", "nFP:1:")
++BUILTIN(__builtin_vsprintf, "ic*RcC*Ra", "nFP:1:")
++BUILTIN(__builtin_vsnprintf, "ic*RzcC*Ra", "nFP:2:")
++BUILTIN(__builtin_fscanf, "iP*RcC*R.", "Fs:1:")
++BUILTIN(__builtin_scanf, "icC*R.", "Fs:0:")
++BUILTIN(__builtin_sscanf, "icC*RcC*R.", "Fs:1:")
++BUILTIN(__builtin_vfscanf, "iP*RcC*Ra", "FS:1:")
++BUILTIN(__builtin_vscanf, "icC*Ra", "FS:0:")
++BUILTIN(__builtin_vsscanf, "icC*RcC*Ra", "FS:1:")
+ BUILTIN(__builtin_thread_pointer, "v*", "nc")
+ BUILTIN(__builtin_launder, "v*v*", "ntE")
+ LANGBUILTIN(__builtin_is_constant_evaluated, "b", "nE", CXX_LANG)
+@@ -631,14 +639,14 @@ BUILTIN(__builtin___strlcpy_chk, "zc*cC*zz", "nF")
+ BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF")
+ BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF")
+ BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF")
+-BUILTIN(__builtin___snprintf_chk, "ic*zizcC*.", "Fp:4:")
+-BUILTIN(__builtin___sprintf_chk, "ic*izcC*.", "Fp:3:")
+-BUILTIN(__builtin___vsnprintf_chk, "ic*zizcC*a", "FP:4:")
+-BUILTIN(__builtin___vsprintf_chk, "ic*izcC*a", "FP:3:")
+-BUILTIN(__builtin___fprintf_chk, "iP*icC*.", "Fp:2:")
+-BUILTIN(__builtin___printf_chk, "iicC*.", "Fp:1:")
+-BUILTIN(__builtin___vfprintf_chk, "iP*icC*a", "FP:2:")
+-BUILTIN(__builtin___vprintf_chk, "iicC*a", "FP:1:")
++BUILTIN(__builtin___snprintf_chk, "ic*RzizcC*R.", "Fp:4:")
++BUILTIN(__builtin___sprintf_chk, "ic*RizcC*R.", "Fp:3:")
++BUILTIN(__builtin___vsnprintf_chk, "ic*RzizcC*Ra", "FP:4:")
++BUILTIN(__builtin___vsprintf_chk, "ic*RizcC*Ra", "FP:3:")
++BUILTIN(__builtin___fprintf_chk, "iP*RicC*R.", "Fp:2:")
++BUILTIN(__builtin___printf_chk, "iicC*R.", "Fp:1:")
++BUILTIN(__builtin___vfprintf_chk, "iP*RicC*Ra", "FP:2:")
++BUILTIN(__builtin___vprintf_chk, "iicC*Ra", "FP:1:")
+ 
+ BUILTIN(__builtin_unpredictable, "LiLi"   , "nc")
+ BUILTIN(__builtin_expect, "LiLiLi"   , "ncE")
+diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp
+index f72e04a425d9..cc3c5cc5028a 100644
+--- a/lib/CodeGen/CGBuiltin.cpp
++++ b/lib/CodeGen/CGBuiltin.cpp
+@@ -98,13 +98,29 @@ llvm::Constant *CodeGenModule::getBuiltinLibFunction(const FunctionDecl *FD,
+ 
+   // TODO: This list should be expanded or refactored after all GCC-compatible
+   // std libcall builtins are implemented.
+-  static SmallDenseMap<unsigned, StringRef, 8> F128Builtins{
++  static SmallDenseMap<unsigned, StringRef, 64> F128Builtins{
++      {Builtin::BI__builtin___fprintf_chk, "__fprintf_chkieee128"},
++      {Builtin::BI__builtin___printf_chk, "__printf_chkieee128"},
++      {Builtin::BI__builtin___snprintf_chk, "__snprintf_chkieee128"},
++      {Builtin::BI__builtin___sprintf_chk, "__sprintf_chkieee128"},
++      {Builtin::BI__builtin___vfprintf_chk, "__vfprintf_chkieee128"},
++      {Builtin::BI__builtin___vprintf_chk, "__vprintf_chkieee128"},
++      {Builtin::BI__builtin___vsnprintf_chk, "__vsnprintf_chkieee128"},
++      {Builtin::BI__builtin___vsprintf_chk, "__vsprintf_chkieee128"},
++      {Builtin::BI__builtin_fprintf, "__fprintfieee128"},
+       {Builtin::BI__builtin_printf, "__printfieee128"},
++      {Builtin::BI__builtin_snprintf, "__snprintfieee128"},
++      {Builtin::BI__builtin_sprintf, "__sprintfieee128"},
++      {Builtin::BI__builtin_vfprintf, "__vfprintfieee128"},
++      {Builtin::BI__builtin_vprintf, "__vprintfieee128"},
+       {Builtin::BI__builtin_vsnprintf, "__vsnprintfieee128"},
+       {Builtin::BI__builtin_vsprintf, "__vsprintfieee128"},
+-      {Builtin::BI__builtin_sprintf, "__sprintfieee128"},
+-      {Builtin::BI__builtin_snprintf, "__snprintfieee128"},
+-      {Builtin::BI__builtin_fprintf, "__fprintfieee128"},
++      {Builtin::BI__builtin_fscanf, "__fscanfieee128"},
++      {Builtin::BI__builtin_scanf, "__scanfieee128"},
++      {Builtin::BI__builtin_sscanf, "__sscanfieee128"},
++      {Builtin::BI__builtin_vfscanf, "__vfscanfieee128"},
++      {Builtin::BI__builtin_vscanf, "__vscanfieee128"},
++      {Builtin::BI__builtin_vsscanf, "__vsscanfieee128"},
+       {Builtin::BI__builtin_nexttowardf128, "__nexttowardieee128"},
+   };
+ 
+diff --git a/clang/test/CodeGen/PowerPC/ppc64-f128-builtins.c b/clang/test/CodeGen/PowerPC/ppc64-f128-builtins.c
+index 635e7fadbbf0..b7e6cc9a2eb4 100644
+--- a/test/CodeGen/PowerPC/ppc64-f128-builtins.c
++++ b/test/CodeGen/PowerPC/ppc64-f128-builtins.c
+@@ -52,6 +52,63 @@ void test_snprintf(void) {
+   __builtin_snprintf(buf, 20, "%.Lf", x);
+ }
+ 
++// IEEE128-LABEL: define dso_local void @test_scanf
++// IEEE128: call signext i32 (ptr, ...) @__scanfieee128
++// PPC128-LABEL: define dso_local void @test_scanf
++// PPC128: call signext i32 (ptr, ...) @scanf
++void test_scanf(int *x) {
++  __builtin_scanf("%d", x);
++}
++
++// IEEE128-LABEL: define dso_local void @test_sscanf
++// IEEE128: call signext i32 (ptr, ptr, ...) @__sscanfieee128
++// PPC128-LABEL: define dso_local void @test_sscanf
++// PPC128: call signext i32 (ptr, ptr, ...) @sscanf
++void test_sscanf(int *x) {
++  __builtin_sscanf(buf, "%d", x);
++}
++
++// IEEE128-LABEL: define dso_local void @test_vprintf
++// IEEE128: call signext i32 @__vprintfieee128
++// PPC128-LABEL: define dso_local void @test_vprintf
++// PPC128: call signext i32 @vprintf
++void test_vprintf(const char *fmt, ...) {
++  __builtin_va_list args;
++  __builtin_va_start(args, fmt);
++  __builtin_vprintf(fmt, args);
++  __builtin_va_end(args);
++}
++
++// IEEE128-LABEL: define dso_local void @test_vscanf
++// IEEE128: call signext i32 @__vscanfieee128
++// PPC128-LABEL: define dso_local void @test_vscanf
++// PPC128: call signext i32 @vscanf
++void test_vscanf(const char *fmt, ...) {
++  __builtin_va_list args;
++  __builtin_va_start(args, fmt);
++  __builtin_vscanf(fmt, args);
++  __builtin_va_end(args);
++}
++
++// IEEE128-LABEL: define dso_local void @test_vsscanf
++// IEEE128: call signext i32 @__vsscanfieee128
++// PPC128-LABEL: define dso_local void @test_vsscanf
++// PPC128: call signext i32 @vsscanf
++void test_vsscanf(const char *fmt, ...) {
++  __builtin_va_list args;
++  __builtin_va_start(args, fmt);
++  __builtin_vsscanf(buf, fmt, args);
++  __builtin_va_end(args);
++}
++
++// IEEE128-LABEL: define dso_local void @test_snprintf_chk
++// IEEE128: call signext i32 (ptr, i64, i32, i64, ptr, ...) @__snprintf_chkieee128
++// PPC128-LABEL: define dso_local void @test_snprintf_chk
++// PPC128: call signext i32 (ptr, i64, i32, i64, ptr, ...) @__snprintf_chk
++void test_snprintf_chk(long double x) {
++  __builtin___snprintf_chk(buf, 20, 1, 20, "%.Lf", x);
++}
++
+ // GLIBC has special handling of 'nexttoward'
+ 
+ // IEEE128-LABEL: define dso_local fp128 @test_nexttoward
+-- 
+2.41.0
+
diff --git a/main/clang16/9012-Call-printName-to-get-name-of-Decl.patch b/main/clang16/9012-Call-printName-to-get-name-of-Decl.patch
new file mode 100644
index 00000000000..cd41ac579cd
--- /dev/null
+++ b/main/clang16/9012-Call-printName-to-get-name-of-Decl.patch
@@ -0,0 +1,72 @@
+From 91daf2a98bf10c6974c79305eca4ac13b76b19d1 Mon Sep 17 00:00:00 2001
+From: Dan McGregor <danismostlikely@gmail.com>
+Date: Tue, 2 May 2023 11:53:48 -0400
+Subject: [PATCH] Call printName to get name of Decl
+
+Rather than sending a name directly to the stream, use printName
+to preserve any PrintingPolicy. This ensures that names are properly
+affected by path remapping.
+
+Fixes: https://github.com/llvm/llvm-project/issues/62192
+Differential Revision: https://reviews.llvm.org/D149272
+
+(cherry picked from commit ea6ecdbfe09d4318f2d616af794e2930f996e393)
+---
+ clang/docs/ReleaseNotes.rst             |  2 ++
+ clang/lib/AST/Decl.cpp                  |  4 ++--
+ clang/lib/AST/DeclarationName.cpp       |  4 ++--
+ clang/test/CodeGen/debug-prefix-map.cpp | 11 +++++++++++
+ 4 files changed, 17 insertions(+), 4 deletions(-)
+ create mode 100644 clang/test/CodeGen/debug-prefix-map.cpp
+
+diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp
+index e60cc28f6e0f..24de6156c0f5 100644
+--- a/lib/AST/Decl.cpp
++++ b/lib/AST/Decl.cpp
+@@ -1626,8 +1626,8 @@ Module *Decl::getOwningModuleForLinkage(bool IgnoreLinkage) const {
+   llvm_unreachable("unknown module kind");
+ }
+ 
+-void NamedDecl::printName(raw_ostream &OS, const PrintingPolicy&) const {
+-  OS << Name;
++void NamedDecl::printName(raw_ostream &OS, const PrintingPolicy &Policy) const {
++  Name.print(OS, Policy);
+ }
+ 
+ void NamedDecl::printName(raw_ostream &OS) const {
+diff --git a/clang/lib/AST/DeclarationName.cpp b/clang/lib/AST/DeclarationName.cpp
+index c1219041a466..da8b3886c340 100644
+--- a/lib/AST/DeclarationName.cpp
++++ b/lib/AST/DeclarationName.cpp
+@@ -117,12 +117,12 @@ static void printCXXConstructorDestructorName(QualType ClassType,
+   Policy.adjustForCPlusPlus();
+ 
+   if (const RecordType *ClassRec = ClassType->getAs<RecordType>()) {
+-    OS << *ClassRec->getDecl();
++    ClassRec->getDecl()->printName(OS, Policy);
+     return;
+   }
+   if (Policy.SuppressTemplateArgsInCXXConstructors) {
+     if (auto *InjTy = ClassType->getAs<InjectedClassNameType>()) {
+-      OS << *InjTy->getDecl();
++      InjTy->getDecl()->printName(OS, Policy);
+       return;
+     }
+   }
+diff --git a/clang/test/CodeGen/debug-prefix-map.cpp b/clang/test/CodeGen/debug-prefix-map.cpp
+new file mode 100644
+index 000000000000..5e90aedd8ed7
+--- /dev/null
++++ b/test/CodeGen/debug-prefix-map.cpp
+@@ -0,0 +1,11 @@
++// RUN: %clang_cc1 -debug-info-kind=standalone -fdebug-prefix-map=%p=./UNLIKELY_PATH/empty -S %s -emit-llvm -o - | FileCheck %s
++
++struct alignas(64) an {
++  struct {
++    unsigned char x{0};
++  } arr[64];
++};
++
++struct an *pan = new an;
++
++// CHECK: !DISubprogram(name: "(unnamed struct at ./UNLIKELY_PATH/empty{{/|\\\\}}{{.*}}",
diff --git a/main/clang16/APKBUILD b/main/clang16/APKBUILD
new file mode 100644
index 00000000000..ad06a8df029
--- /dev/null
+++ b/main/clang16/APKBUILD
@@ -0,0 +1,494 @@
+# Contributor Eric Molitor <eric@molitor.org>
+# Contributor Patrick Gansterer <paroga@paroga.com>
+# Contributor Travis Tilley <ttilley@gmail.com>
+# Contributor omni <omni+alpine@hack.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=clang16
+pkgver=16.0.6
+pkgrel=5
+_llvmver=${pkgver%%.*}
+pkgdesc="C language family front-end for LLVM"
+arch="all"
+url="https://llvm.org/"
+license="Apache-2.0 WITH LLVM-exception"
+options="!check" # fail to build
+install="$pkgname.pre-upgrade"
+makedepends="
+	cmake
+	help2man
+	libxml2-dev
+	llvm$_llvmver-dev
+	llvm$_llvmver-static
+	llvm$_llvmver-test-utils
+	samurai
+	python3
+	"
+checkdepends="diffutils bash gtest-dev"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+subpackages="
+	$pkgname-static
+	$pkgname-headers
+	$pkgname-libclang
+	$pkgname-libs
+	$pkgname-dev
+	$pkgname-ccache
+	$pkgname-extra-tools:extra
+	"
+source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-$pkgver.src.tar.xz
+	https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-tools-extra-$pkgver.src.tar.xz
+	https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/cmake-$pkgver.src.tar.xz
+	10-add-musl-triples.patch
+	30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+
+	clang-default-fno-semantic-interposition.patch
+	clang-001-fortify-include.patch
+	clang-002-fortify-enable.patch
+	clang-003-as-needed.patch
+	9008-Clang-Support-more-stdio-builtins.patch
+	9012-Call-printName-to-get-name-of-Decl.patch
+	"
+builddir="$srcdir/clang-$pkgver.src"
+
+prepare() {
+	mv "$srcdir/clang-tools-extra-$pkgver.src" "$builddir/tools/extra"
+	default_prepare
+	mv "$srcdir"/cmake-${pkgver//_/}.src "$srcdir"/cmake
+}
+
+# Whether is this package the default (latest) clang version.
+_default_clang="no"
+
+if [ "$_default_clang" = yes ]; then
+	subpackages="
+		$subpackages
+		$pkgname-doc
+		$pkgname-analyzer::noarch
+		$pkgname-bash-completion:bash:noarch
+		$pkgname-emacs::noarch
+		py3-$pkgname:python:noarch
+		"
+	provides="clang=$pkgver-r$pkgrel"
+	replaces="clang"
+	depends_dev="$depends_dev $pkgname-extra-tools=$pkgver-r$pkgrel"
+fi
+
+build() {
+	local python_version=$(python3 -V | sed 's/.*\([0-9]\{1,\}\.[0-9]\{1,\}\)\..*/\1/')
+
+	if [ $_default_clang = yes ]; then
+		local extras=ON
+	else
+		local extras=OFF
+	fi
+
+	cmake -B build -G Ninja -Wno-dev \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm$_llvmver \
+		-DCMAKE_MODULE_PATH="$srcdir/cmake-$pkgver.src/Modules" \
+		-DCLANG_BUILT_STANDALONE=ON \
+		-DCLANG_CONFIG_FILE_SYSTEM_DIR=/etc/clang$_llvmver \
+		-DCLANG_ENABLE_ARCMT=$extras \
+		-DCLANG_ENABLE_STATIC_ANALYZER=$extras \
+		-DCLANG_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DCMAKE_INSTALL_RPATH=/usr/lib/llvm$_llvmver/lib \
+		-DCLANG_LINK_CLANG_DYLIB=ON \
+		-DCLANG_PLUGIN_SUPPORT=ON \
+		-DCLANG_PYTHON_BINDINGS_VERSIONS="$python_version" \
+		-DCLANG_SYSTEMZ_DEFAULT_ARCH=z196 \
+		-DCLANG_VENDOR=Alpine \
+		-DENABLE_LINKER_BUILD_ID=ON \
+		-DLIBCLANG_BUILD_STATIC=ON
+
+	ninja -C build clang-tblgen
+	ninja -C build
+
+	if [ "$_default_clang" = yes ]; then
+		help2man --no-info \
+			--source "Alpine" \
+			--name "Alpine Clang $pkgver-r$pkgrel" \
+			--version-string "$pkgver-r$pkgrel" \
+			--help-option "--help-hidden" \
+			./build/bin/clang > clang.1
+	fi
+}
+
+check() {
+	ninja -C build check-all
+}
+
+package() {
+	# the libraries should always exactly match, not just by soname
+	# gcc is for libgcc-dev which we don't have split
+	depends="
+		$pkgname-headers=$pkgver-r$pkgrel
+		$pkgname-libs=$pkgver-r$pkgrel
+		fortify-headers>=1.1-r2
+		gcc
+		libstdc++-dev
+		llvm$_llvmver-linker-tools
+		musl-dev
+		"
+
+	# create system config
+	# clang doesn't really have a way to set default -march abi options, so use the system config dir
+	# see the clang UsersManual for how this config directory is parsed / fallback order.
+	# this is set based on our gcc baseline. see the --with arguments in main/gcc.
+	mkdir -p "$pkgdir"/etc/clang$_llvmver
+	case "$CARCH" in
+	x86_64)
+		# unsurprisingly, this is the same as gcc
+		touch config.cfg
+		;;
+	x86)
+		# clang defaults to pentium4 on i*86- triples.
+		# see https://github.com/llvm/llvm-project/issues/61347
+		cat > config.cfg <<-EOF
+		-march=pentium-m -mfpmath=sse
+		EOF
+		;;
+	armhf)
+		# clang defaults to 'armv6' for armhf, i.e. no -zk.
+		# -zk is also a deprecated name for -kz.
+		cat > config.cfg <<-EOF
+		-march=armv6kz
+		-mfpu=vfp
+		-mtune=arm1176jzf-s
+		EOF
+		;;
+	armv7)
+		# clang defaults to neon fpu and non-thumb.
+		# XXX: but seemingly changing it from this makes it not really work on armv7
+		# cat > config.cfg <<-EOF
+		# -mfpu=vfpv3-d16
+		# -mthumb
+		# EOF
+		touch config.cfg
+		;;
+	s390x)
+		# this is correct, as this is the one thing that we have a build-time -D for.
+		# see -DCLANG_SYSTEMZ_DEFAULT_ARCH.
+		touch config.cfg
+		;;
+	ppc64le)
+		# this is seemingly correct, clang defaults to secureplt for musl and elfv2.
+		touch config.cfg
+		;;
+	riscv64)
+		# this is correct, as clang defaults to rvXLENimafdc (-gc) for non-unknown.
+		# this is our target already.
+		touch config.cfg
+		;;
+	aarch64)
+		# XXX: this defaults to
+		# CmdArgs.push_back("-mfpu=crypto-neon-fp-armv8");
+		# is that correct? armv8 is always neon, but the others are unclear.
+		# the output still runs on an rpi4 that normally doesn't have "crypto", so maybe that is misleading
+		# (Gnu.cpp)
+		touch config.cfg
+		;;
+	loongarch64)
+		touch config.cfg
+		;;
+	esac
+	# the target triple being built for
+	# in LLVM, we set -DLLVM_DEFAULT_TARGET_TRIPLE to the same thing,
+	# so that is the default triple, and one of the checked files.
+	# it's possible to do CBUILD-clang.cfg and similar to make it per-tool
+	mv config.cfg "$pkgdir"/etc/clang$_llvmver/$CBUILD.cfg
+
+	DESTDIR="$pkgdir" cmake --install build
+	mkdir -p "$pkgdir"/usr/bin
+
+	install -Dm644 build/lib/libclang.a -t "$pkgdir"/usr/lib/llvm$_llvmver/lib/
+
+	if [ $_default_clang = "yes" ]; then
+		rm "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-format-bbedit.applescript \
+			"$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-doc-default-stylesheet.css \
+			"$pkgdir"/usr/lib/llvm$_llvmver/share/clang/index.js
+
+		mkdir -p "$pkgdir"/usr/share/bash-completion/completions
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/bash-autocomplete.sh \
+			"$pkgdir"/usr/share/bash-completion/completions/clang
+
+		mkdir -p "$pkgdir"/usr/share/emacs/site-lisp
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-*.el \
+			"$pkgdir"/usr/share/emacs/site-lisp
+		rmdir -p usr/lib/llvm$_llvmver/share/emacs || true
+
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/share/man "$pkgdir"/usr/share/
+		# XXX: scan-build specifically needs to stay in llvm path, but scan-view has to not be
+		# everything uses different path lookup logic..
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/share/scan-view "$pkgdir"/usr/share/
+
+		local sitedir=$(python3 -c "import site; print(site.getsitepackages()[0])")
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/lib/python3* "$pkgdir"/usr/lib
+		mkdir -p "$pkgdir"/"$sitedir"
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/lib/libscanbuild "$pkgdir"/"$sitedir"
+
+		# symlink everything in the bin dir,
+		# into /usr/bin.
+		local clangexes="
+			analyze-build
+			amdgpu-arch
+			c-index-test
+			clang
+			clang-cl
+			clang-cpp
+			clang-include-cleaner
+			clang-linker-wrapper
+			clang-pseudo
+			clang++
+			clang-$_llvmver
+			clang-apply-replacements
+			clang-change-namespace
+			clang-check
+			clang-doc
+			clang-extdef-mapping
+			clang-format
+			clang-include-fixer
+			clang-move
+			clang-offload-bundler
+			clang-offload-packager
+			clang-query
+			clang-refactor
+			clang-rename
+			clang-reorder-fields
+			clang-repl
+			clang-scan-deps
+			clang-tidy
+			clangd
+			diagtool
+			find-all-symbols
+			git-clang-format
+			hmaptool
+			intercept-build
+			modularize
+			nvptx-arch
+			pp-trace
+			run-clang-tidy
+			scan-build
+			scan-build-py
+			scan-view
+			"
+		for clangexe in $clangexes; do
+			ln -sfv ../lib/llvm$_llvmver/bin/$clangexe "$pkgdir"/usr/bin/$clangexe
+		done
+		ln -sfv ../lib/llvm$_llvmver/bin/clang-$_llvmver "$pkgdir"/usr/bin/clang++-$_llvmver
+
+		install -Dm644 "$builddir"/clang.1 -t "$pkgdir"/usr/share/man/man1/
+	else
+		ln -sfv ../lib/llvm$_llvmver/bin/clang-$_llvmver "$pkgdir"/usr/bin/clang-$_llvmver
+		ln -sfv ../lib/llvm$_llvmver/bin/clang-$_llvmver "$pkgdir"/usr/bin/clang++-$_llvmver
+
+		# delete things we don't want non-latest of
+		rm -r "$pkgdir"/usr/lib/llvm$_llvmver/share
+		rm -r "$pkgdir"/usr/lib/llvm$_llvmver/lib/python3*
+	fi
+
+	local libs="
+		libclang-cpp.so
+		libclang-cpp.so.$_llvmver
+		libclang.so
+		libclang.so.$_llvmver
+		libclang.so.$pkgver
+		"
+	for lib in $libs; do
+		ln -sfv ../lib/llvm$_llvmver/lib/$lib "$pkgdir"/usr/lib/$lib
+	done
+
+	# compat symlink back to fix clang with -no-canonical-prefixes
+	mkdir -p "$pkgdir"/usr/lib/clang/
+	ln -sfv ../llvm$_llvmver/lib/clang/$_llvmver "$pkgdir"/usr/lib/clang/$_llvmver
+}
+
+dev() {
+	default_dev
+	_default_replace
+
+	# move cmake to -dev
+	amove usr/lib/llvm$_llvmver/lib/cmake/clang
+
+	# create cmakedir symlinks, so find_package works
+	# llvm does the same thing- versioned, plus unversioned default.
+	mkdir -p "$subpkgdir"/usr/lib/cmake
+	ln -sfv ../llvm$_llvmver/lib/cmake/clang "$subpkgdir"/usr/lib/cmake/clang$_llvmver
+	if [ $_default_clang = yes ]; then
+		ln -sfv clang$_llvmver "$subpkgdir"/usr/lib/cmake/clang
+	fi
+}
+
+static() {
+	default_static
+	_default_replace
+}
+
+bash() {
+	default_bashcomp
+	_default_replace
+}
+
+libs() {
+	default_libs
+	# this can fail depending on the symlinks and is already moved
+	amove usr/lib/libclang-cpp.so.* || true
+	amove usr/lib/llvm$_llvmver/lib/libclang-cpp.so*
+	_default_replace
+}
+
+libclang() {
+	_default_replace
+	replaces="$replaces clang-libs"
+	depends="$pkgname-headers=$pkgver-r$pkgrel"
+
+	# we add an extra subpackage for this so things that link to libclang don't
+	# have to pull libclang-cpp too (separate)
+	amove usr/lib/libclang.so.*
+	amove usr/lib/llvm$_llvmver/lib/libclang.so*
+}
+
+analyzer() {
+	pkgdesc="Clang source code analysis framework"
+	depends="$pkgname=$pkgver-r$pkgrel py3-$pkgname=$pkgver-r$pkgrel perl python3"
+	_default_replace
+
+	amove \
+		usr/bin/scan* \
+		usr/bin/analyze-build* \
+		usr/bin/intercept-build* \
+		usr/lib/llvm$_llvmver/bin/scan* \
+		usr/lib/llvm$_llvmver/bin/analyze-build* \
+		usr/lib/llvm$_llvmver/bin/intercept-build* \
+		usr/lib/llvm$_llvmver/libexec/*-analyzer* \
+		usr/lib/llvm$_llvmver/libexec/analyze-* \
+		usr/lib/llvm$_llvmver/libexec/intercept-* \
+		usr/lib/llvm$_llvmver/lib/libear* \
+		usr/lib/llvm$_llvmver/share/scan-build \
+		usr/share/scan-view
+}
+
+headers() {
+	_default_replace
+	amove usr/lib/llvm$_llvmver/lib/clang/$_llvmver/include
+}
+
+extra() {
+	pkgdesc="Extra tools built using Clang's tooling APIs"
+	_default_replace
+
+	if [ "$_default_clang" = "yes" ]; then
+		amove \
+			usr/bin/amdgpu-arch \
+			usr/bin/clang-apply-replacements* \
+			usr/bin/clang-change-namespace* \
+			usr/bin/clang-check* \
+			usr/bin/clang-doc* \
+			usr/bin/clang-extdef-mapping* \
+			usr/bin/clang-format* \
+			usr/bin/clang-include-cleaner* \
+			usr/bin/clang-include-fixer* \
+			usr/bin/clang-move* \
+			usr/bin/clang-offload-bundler* \
+			usr/bin/clang-pseudo* \
+			usr/bin/clang-query* \
+			usr/bin/clang-refactor* \
+			usr/bin/clang-rename* \
+			usr/bin/clang-reorder-fields* \
+			usr/bin/clang-repl* \
+			usr/bin/clang-scan-deps* \
+			usr/bin/clang-tidy* \
+			usr/bin/clangd* \
+			usr/bin/c-index-test* \
+			usr/bin/diagtool* \
+			usr/bin/find-all-symbols* \
+			usr/bin/git-clang-format* \
+			usr/bin/hmaptool* \
+			usr/bin/modularize* \
+			usr/bin/nvptx-arch \
+			usr/bin/pp-trace* \
+			usr/bin/run-clang-tidy* \
+			usr/lib/llvm$_llvmver/bin/clang-check* \
+			usr/lib/llvm$_llvmver/bin/clang-extdef-mapping* \
+			usr/lib/llvm$_llvmver/share/clang/clang* \
+			usr/lib/llvm$_llvmver/share/clang/run-find-all-symbols.py
+	fi
+
+	amove \
+		usr/lib/llvm$_llvmver/bin/clang-apply-replacements* \
+		usr/lib/llvm$_llvmver/bin/clang-change-namespace* \
+		usr/lib/llvm$_llvmver/bin/clang-doc* \
+		usr/lib/llvm$_llvmver/bin/clang-format* \
+		usr/lib/llvm$_llvmver/bin/clang-include-cleaner* \
+		usr/lib/llvm$_llvmver/bin/clang-include-fixer* \
+		usr/lib/llvm$_llvmver/bin/clang-move* \
+		usr/lib/llvm$_llvmver/bin/clang-offload-bundler* \
+		usr/lib/llvm$_llvmver/bin/clang-pseudo* \
+		usr/lib/llvm$_llvmver/bin/clang-query* \
+		usr/lib/llvm$_llvmver/bin/clang-refactor* \
+		usr/lib/llvm$_llvmver/bin/clang-rename* \
+		usr/lib/llvm$_llvmver/bin/clang-reorder-fields* \
+		usr/lib/llvm$_llvmver/bin/clang-repl* \
+		usr/lib/llvm$_llvmver/bin/clang-scan-deps* \
+		usr/lib/llvm$_llvmver/bin/clang-tidy* \
+		usr/lib/llvm$_llvmver/bin/clangd* \
+		usr/lib/llvm$_llvmver/bin/c-index-test* \
+		usr/lib/llvm$_llvmver/bin/diagtool* \
+		usr/lib/llvm$_llvmver/bin/find-all-symbols* \
+		usr/lib/llvm$_llvmver/bin/git-clang-format* \
+		usr/lib/llvm$_llvmver/bin/hmaptool* \
+		usr/lib/llvm$_llvmver/bin/modularize* \
+		usr/lib/llvm$_llvmver/bin/pp-trace* \
+		usr/lib/llvm$_llvmver/bin/run-clang-tidy*
+}
+
+emacs() {
+	_default_replace
+	pkgdesc="clang plugin for emacs"
+	install_if="$pkgname-extra-tools=$pkgver-r$pkgrel emacs"
+
+	amove	usr/share/emacs
+}
+
+python() {
+	pkgdesc="Clang Python Bindings"
+	depends="$pkgname-libs=$pkgver-r$pkgrel python3"
+	provides="py3-clang=$pkgver-r$pkgrel"
+	replaces="py3-clang"
+
+	amove usr/lib/python*
+}
+
+ccache() {
+	_default_replace
+	pkgdesc="$pkgdesc (ccache symlinks)"
+	install_if="$pkgname=$pkgver-r$pkgrel ccache"
+	replaces="$replaces ccache"
+
+	mkdir -p "$subpkgdir"/usr/lib/ccache/bin
+	ln -sfv ../../../bin/ccache "$subpkgdir"/usr/lib/ccache/bin/clang-$_llvmver
+	ln -sfv ../../../bin/ccache "$subpkgdir"/usr/lib/ccache/bin/clang++-$_llvmver
+	if [ "$_default_clang" = yes ]; then
+		ln -sfv ../../../bin/ccache "$subpkgdir"/usr/lib/ccache/bin/clang++
+		ln -sfv ../../../bin/ccache "$subpkgdir"/usr/lib/ccache/bin/clang
+	fi
+}
+
+_default_replace() {
+	if [ "$_default_clang" = yes ]; then
+		replaces="clang${subpkgname#"$pkgname"} clang15${subpkgname#"$pkgname"}"
+		provides="clang${subpkgname#"$pkgname"}=$pkgver-r$pkgrel"
+	fi
+}
+
+sha512sums="
+92c65b882e1504f4a9b8a3f6b8a24061505987aaacc8bb835115b4e4d74ac3a8c98343a308567b07c6b42bb99877c300bce3c4a5a25ada77abe65606aa25188d  clang-16.0.6.src.tar.xz
+ec1a0834f223e393d24c11586b744167a41cea6c39d1bb18c433d2fb736501950fdff42f1eb0caa13c75bcb8ef9ac309eb0687644307698ec0420ff8a769c710  clang-tools-extra-16.0.6.src.tar.xz
+52ecd941d2d85a5b668caa5d0d40480cb6a97b3bf1174e634c2a93e9ef6d03670ca7e96abb0a60cb33ba537b93d5788754dab1f2f45c1f623f788162717d088b  cmake-16.0.6.src.tar.xz
+5809d931656cac13b91bc91aac63df072b0403708ac718bf01546d9d520ff2c4163ee11411439dce5bb683a3bfa044b62443b6f66a1419c9086d20e79a018071  10-add-musl-triples.patch
+dcb67bf472ddb0404403c5cd1cea89e32c8bf63557fcf304b4d129cfc037e8e229348d44846c69917196b4777f7d659ac4407328a30de2513d91a490b968661e  30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+6896d6c5358b8b83c97c7cb31f60042f33a1326cfad093a0f23dcacd10ef418f845964f6de948a5873494dae5180e51a4b2b0cec937aa5597765362779da6f35  clang-default-fno-semantic-interposition.patch
+aa2dff990278e0258763934eaa528827baa1733eeb7dc36cc7f1500a4919b8d11870a0522f20f210d454322e3faf5945e9afaeffc9f3a3c4fd422b706370a663  clang-001-fortify-include.patch
+751f8acef2bfd1b50c065dea2ad0c3a20cadd4ff4c842ae519b5085c48372127b49a75d3fd0bd32291f5a69119340e5568a9fba6d94e6f354b14233986f61328  clang-002-fortify-enable.patch
+5f98f147d7d66315e9a56ae6fee602a053d40e57a8b1ee4f2ef1764203bb6fdb9082c8e825c535a9388213a38b49d2702b1e936fcf56560c4a2a56b7e6dd232c  clang-003-as-needed.patch
+0928f379068e0bf819074f9cefad6247705c2571a08e995036e8432becdae0daf81dbc02548097fb544bb0c3fe02cac4039eb7d0dfcd51d03c3952ec3524b727  9008-Clang-Support-more-stdio-builtins.patch
+1d6d1dd5719ff1e93e55c8fd0fde115a0145d0d27c53e9a60bcf32a2e55afceac0dc28c41e1e2b1d2e5c1b8a16350c080b6c34b72595381f433e01130b52d162  9012-Call-printName-to-get-name-of-Decl.patch
+"
diff --git a/main/clang16/clang-001-fortify-include.patch b/main/clang16/clang-001-fortify-include.patch
new file mode 100644
index 00000000000..968c26e5131
--- /dev/null
+++ b/main/clang16/clang-001-fortify-include.patch
@@ -0,0 +1,36 @@
+From eca9994181dc355cfba61e726c038832d5ff6975 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun, 23 Oct 2022 00:47:57 +0200
+Subject: [PATCH 1/4] clang: add fortify include paths for musl triplets
+
+When we have fortify headers this lets them get included.
+---
+ lib/Driver/ToolChains/Linux.cpp | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp
+index 7fcdcf125..d5df4a240 100644
+--- a/lib/Driver/ToolChains/Linux.cpp
++++ b/lib/Driver/ToolChains/Linux.cpp
+@@ -622,10 +622,14 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
+   if (getTriple().getOS() == llvm::Triple::RTEMS)
+     return;
+ 
+-  // Add an include of '/include' directly. This isn't provided by default by
+-  // system GCCs, but is often used with cross-compiling GCCs, and harmless to
+-  // add even when Clang is acting as-if it were a system compiler.
+-  addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/include"));
++  if (getTriple().isMusl()) {
++    addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/usr/include/fortify"));
++  } else {
++    // Preserve original clang behavior for non-musl triples, but for musl
++    // this just gets in the way and none of our crosstoolchains are ever
++    // actually built this way (and we'd have to figure out fortify for it)
++    addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/include"));
++  }
+ 
+   addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/usr/include"));
+ 
+-- 
+2.38.0
+
diff --git a/main/clang16/clang-002-fortify-enable.patch b/main/clang16/clang-002-fortify-enable.patch
new file mode 100644
index 00000000000..30100c9cba4
--- /dev/null
+++ b/main/clang16/clang-002-fortify-enable.patch
@@ -0,0 +1,29 @@
+From 0a876ce2825f1e54bec7059a387e43a2e0386665 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun, 23 Oct 2022 01:02:35 +0200
+Subject: [PATCH 2/4] clang: enable fortify by default on optimizing musl
+ targets
+
+---
+ lib/Frontend/InitPreprocessor.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/lib/Frontend/InitPreprocessor.cpp b/lib/Frontend/InitPreprocessor.cpp
+index 20bfbf144..9095c0f2f 100644
+--- a/lib/Frontend/InitPreprocessor.cpp
++++ b/lib/Frontend/InitPreprocessor.cpp
+@@ -1288,6 +1288,11 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
+     Builder.defineMacro("__GLIBCXX_BITSIZE_INT_N_0", "128");
+   }
+ 
++  // Enable fortify by default on musl when optimizing, but not with asan
++  if (TI.getTriple().isMusl() && LangOpts.Optimize &&
++      !LangOpts.Sanitize.has(SanitizerKind::Address))
++    Builder.defineMacro("_FORTIFY_SOURCE", "2");
++
+   // Get other target #defines.
+   TI.getTargetDefines(LangOpts, Builder);
+ }
+-- 
+2.38.0
+
diff --git a/main/clang16/clang-003-as-needed.patch b/main/clang16/clang-003-as-needed.patch
new file mode 100644
index 00000000000..a92836fe07a
--- /dev/null
+++ b/main/clang16/clang-003-as-needed.patch
@@ -0,0 +1,31 @@
+forces as-needed regardless of ldflags
+From f59f126a9344f265e3766003766d7a66b6a638e3 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun, 23 Oct 2022 01:26:37 +0200
+Subject: [PATCH 3/4] clang: use --as-needed by default
+
+---
+ clang/lib/Driver/ToolChains/Gnu.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
+index f203cae1d..9e181a79a 100644
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -560,6 +560,13 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+   bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs);
+   bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs);
+   addLinkerCompressDebugSectionsOption(ToolChain, Args, CmdArgs);
++
++  // Use --as-needed by default for all explicit linker inputs on Linux
++  // We don't reset it afterwards because explicit argument does not
++  // get reset either (and that is permitted, so it should be fine)
++  if (Triple.isOSLinux())
++    CmdArgs.push_back("--as-needed");
++
+   AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
+ 
+   addHIPRuntimeLibArgs(ToolChain, Args, CmdArgs);
+-- 
+2.38.0
+
diff --git a/main/clang16/clang-default-fno-semantic-interposition.patch b/main/clang16/clang-default-fno-semantic-interposition.patch
new file mode 100644
index 00000000000..01022aff209
--- /dev/null
+++ b/main/clang16/clang-default-fno-semantic-interposition.patch
@@ -0,0 +1,39 @@
+Patch-Source: https://github.com/chimera-linux/cports/commit/77fdf96a59bddfca32b6737335f01afaf64ff380
+reference: https://maskray.me/blog/2021-05-09-fno-semantic-interposition
+
+in general, this is not '100% safe'.
+however:
+- we only use clang in a few places
+- chimera has had good success with this flag and not seen issues
+so, it should be fine to default in our clang too. it should bring some
+noticable performance gains paired with pic.
+
+--
+From 73b8ed17fed2145b29bde40a0c658712e34d48c3 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Tue, 28 Feb 2023 01:59:26 +0100
+Subject: [PATCH] clang: default to -fno-semantic-interposition on supported
+ targets
+
+---
+ clang/lib/Driver/ToolChains/Clang.cpp | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
+index 3704ed85..d3d67a22 100644
+--- a/lib/Driver/ToolChains/Clang.cpp
++++ b/lib/Driver/ToolChains/Clang.cpp
+@@ -5072,9 +5072,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
+       // The supported targets need to call AsmPrinter::getSymbolPreferLocal.
+       bool SupportsLocalAlias =
+           Triple.isAArch64() || Triple.isRISCV() || Triple.isX86();
+-      if (!A)
+-        CmdArgs.push_back("-fhalf-no-semantic-interposition");
+-      else if (A->getOption().matches(options::OPT_fsemantic_interposition))
++      if (A && A->getOption().matches(options::OPT_fsemantic_interposition))
+         A->render(Args, CmdArgs);
+       else if (!SupportsLocalAlias)
+         CmdArgs.push_back("-fhalf-no-semantic-interposition");
+-- 
+2.39.0
+
diff --git a/main/clang16/clang16.pre-upgrade b/main/clang16/clang16.pre-upgrade
new file mode 100644
index 00000000000..2aebb754d8a
--- /dev/null
+++ b/main/clang16/clang16.pre-upgrade
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+ver_old=$2
+
+if [ "$(apk version -t "$ver_old" '16.0.0-r8')" = '<' ]; then
+	# in -r7 we changed this directory containing a symlink, to a symlink itself
+	# in -r8 we added the pre-upgrade, so check for < -r8
+	if [ -d /usr/lib/clang/16 ]; then
+		rm -r /usr/lib/clang/16
+	fi
+fi
+
+exit 0
diff --git a/main/clang17/10-add-musl-triples.patch b/main/clang17/10-add-musl-triples.patch
new file mode 100644
index 00000000000..0ed9c81675f
--- /dev/null
+++ b/main/clang17/10-add-musl-triples.patch
@@ -0,0 +1,39 @@
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -2073,7 +2073,7 @@
+   static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
+   static const char *const AArch64Triples[] = {
+       "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
+-      "aarch64-suse-linux"};
++      "aarch64-suse-linux", "aarch64-linux-musl"};
+   static const char *const AArch64beLibDirs[] = {"/lib"};
+   static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
+                                                  "aarch64_be-linux-gnu"};
+@@ -2085,7 +2085,9 @@
+                                              "armv7l-linux-musleabihf",
+                                              "armv7hl-redhat-linux-gnueabi",
+                                              "armv6hl-suse-linux-gnueabi",
+-                                             "armv7hl-suse-linux-gnueabi"};
++                                             "armv7hl-suse-linux-gnueabi",
++                                             "arm-linux-musleabihf",
++                                             "armv7l-linux-musleabihf"};
+   static const char *const ARMebLibDirs[] = {"/lib"};
+   static const char *const ARMebTriples[] = {"armeb-linux-gnueabi"};
+   static const char *const ARMebHFTriples[] = {
+@@ -2101,7 +2103,7 @@
+       "x86_64-redhat-linux",    "x86_64-suse-linux",
+       "x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
+       "x86_64-slackware-linux", "x86_64-unknown-linux",
+-      "x86_64-amazon-linux"};
++      "x86_64-amazon-linux", "x86_64-linux-musl"};
+   static const char *const X32Triples[] = {"x86_64-linux-gnux32",
+                                            "x86_64-pc-linux-gnux32"};
+   static const char *const X32LibDirs[] = {"/libx32", "/lib"};
+@@ -2110,6 +2112,7 @@
+       "i586-linux-gnu",      "i686-linux-gnu",        "i686-pc-linux-gnu",
+       "i386-redhat-linux6E", "i686-redhat-linux",     "i386-redhat-linux",
+       "i586-suse-linux",     "i686-montavista-linux", "i686-gnu",
++      "i686-linux-musl",
+   };
+ 
+   static const char *const M68kLibDirs[] = {"/lib"};
diff --git a/main/clang17/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch b/main/clang17/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
new file mode 100644
index 00000000000..9e8a976b68f
--- /dev/null
+++ b/main/clang17/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
@@ -0,0 +1,90 @@
+diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
+index 4f23403..da6883e 100644
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -588,6 +588,10 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+     CmdArgs.push_back("-lm");
+   }
+ 
++  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles, options::OPT_nodefaultlibs)) {
++    CmdArgs.push_back("-lssp_nonshared");
++  }
++
+   // Silence warnings when linking C code with a C++ '-stdlib' argument.
+   Args.ClaimAllArgs(options::OPT_stdlib_EQ);
+
+diff --git a/lib/Driver/ToolChains/Linux.h b/lib/Driver/ToolChains/Linux.h
+index 52439174..d754b543 100644
+--- a/lib/Driver/ToolChains/Linux.h
++++ b/lib/Driver/ToolChains/Linux.h
+@@ -11,6 +11,7 @@
+ 
+ #include "Gnu.h"
+ #include "clang/Driver/ToolChain.h"
++#include "clang/Basic/LangOptions.h"
+ 
+ namespace clang {
+ namespace driver {
+@@ -63,7 +64,15 @@ public:
+       const llvm::opt::ArgList &DriverArgs, const JobAction &JA,
+       const llvm::fltSemantics *FPType = nullptr) const override;
+ 
+   const char *getDefaultLinker() const override;
++  LangOptions::StackProtectorMode
++  GetDefaultStackProtectorLevel(bool KernelOrKext) const override {
++    StringRef VendorName = Linux::getTriple().getVendorName();
++    if (VendorName.compare("alpine") == 0)
++      return LangOptions::SSPStrong;
++
++    return LangOptions::SSPOff;
++  }
+ 
+ protected:
+   Tool *buildAssembler() const override;
+diff --git a/test/Driver/fsanitize.c b/test/Driver/fsanitize.c
+index 8ad6dc25..1619b59a 100644
+--- a/test/Driver/fsanitize.c
++++ b/test/Driver/fsanitize.c
+@@ -695,12 +695,12 @@
+ // RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
+ // NOSP-NOT: "-fsanitize=safe-stack"
+ 
+-// RUN: %clang --target=x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
++// RUN: %clang --target=x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang --target=x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN
+ // RUN: %clang --target=x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang --target=x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP
+-// RUN: %clang --target=arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
+-// RUN: %clang --target=aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
++// RUN: %clang --target=arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
++// RUN: %clang --target=aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP
+ // RUN: %clang --target=i386-contiki-unknown -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP
+ // NO-SP-NOT: stack-protector
+ // NO-SP: "-fsanitize=safe-stack"
+diff --git a/test/Driver/stack-protector.c b/test/Driver/stack-protector.c
+index 16937691..80987f67 100644
+--- a/test/Driver/stack-protector.c
++++ b/test/Driver/stack-protector.c
+@@ -33,6 +33,22 @@
+ // SSP-PS4-BUF: "-stack-protector" "2"
+ // SSP-PS4-BUF: "-stack-protector-buffer-size" "16"
+ 
++// Test default stack protector values for Alpine
++
++// RUN: %clang -target x86_64-alpine-linux-musl -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE
++// ALPINE: "-stack-protector" "2"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_SPS
++// ALPINE_SPS: "-stack-protector" "2"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_ALL
++// ALPINE_ALL: "-stack-protector" "3"
++// ALPINE_ALL-NOT: "-stack-protector-buffer-size"
++
++// RUN: %clang -target x86_64-alpine-linux-musl -fno-stack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_NOSSP
++// ALPINE_NOSSP-NOT: "-stack-protector"
++// ALPINE_NOSSP-NOT: "-stack-protector-buffer-size"
++
+ // Test default stack protector values for Darwin platforms
+ 
+ // RUN: %clang -target armv7k-apple-watchos2.0 -### %s 2>&1 | FileCheck %s -check-prefix=SSP_WATCHOS
diff --git a/main/clang17/APKBUILD b/main/clang17/APKBUILD
new file mode 100644
index 00000000000..f892903a235
--- /dev/null
+++ b/main/clang17/APKBUILD
@@ -0,0 +1,500 @@
+# Contributor Eric Molitor <eric@molitor.org>
+# Contributor Patrick Gansterer <paroga@paroga.com>
+# Contributor Travis Tilley <ttilley@gmail.com>
+# Contributor omni <omni+alpine@hack.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=clang17
+pkgver=17.0.6
+pkgrel=1
+_llvmver=${pkgver%%.*}
+pkgdesc="C language family front-end for LLVM"
+arch="all"
+url="https://llvm.org/"
+license="Apache-2.0 WITH LLVM-exception"
+options="!check" # fail to build
+makedepends="
+	cmake
+	help2man
+	libxml2-dev
+	llvm$_llvmver-dev
+	llvm$_llvmver-gtest
+	llvm$_llvmver-static
+	llvm$_llvmver-test-utils
+	samurai
+	python3
+	"
+checkdepends="diffutils bash gtest-dev"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+subpackages="
+	$pkgname-static
+	$pkgname-headers
+	$pkgname-libclang
+	$pkgname-libs
+	$pkgname-dev
+	$pkgname-ccache
+	$pkgname-extra-tools:extra
+	"
+source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-$pkgver.src.tar.xz
+	https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/clang-tools-extra-$pkgver.src.tar.xz
+	https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/cmake-$pkgver.src.tar.xz
+	https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz
+	https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/third-party-$pkgver.src.tar.xz
+	10-add-musl-triples.patch
+	30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+
+	clang-001-fortify-include.patch
+	clang-002-fortify-enable.patch
+	clang-003-as-needed.patch
+	"
+builddir="$srcdir/clang-$pkgver.src"
+
+prepare() {
+	mv "$srcdir/clang-tools-extra-$pkgver.src" "$builddir/tools/extra"
+	default_prepare
+	mv "$srcdir"/cmake-${pkgver//_/}.src "$srcdir"/cmake
+	mv "$srcdir"/third-party-${pkgver//_/}.src "$srcdir"/thirtd-party
+}
+
+# Whether is this package the default (latest) clang version.
+_default_clang="yes"
+
+if [ "$_default_clang" = yes ]; then
+	subpackages="
+		$subpackages
+		$pkgname-doc
+		$pkgname-analyzer::noarch
+		$pkgname-bash-completion:bash:noarch
+		$pkgname-emacs::noarch
+		py3-$pkgname:python:noarch
+		"
+	provides="clang=$pkgver-r$pkgrel"
+	replaces="clang"
+	depends_dev="$depends_dev $pkgname-extra-tools=$pkgver-r$pkgrel"
+fi
+
+build() {
+	local python_version=$(python3 -V | sed 's/.*\([0-9]\{1,\}\.[0-9]\{1,\}\)\..*/\1/')
+
+	if [ $_default_clang = yes ]; then
+		local extras=ON
+	else
+		local extras=OFF
+	fi
+
+	cmake -B build -G Ninja -Wno-dev \
+		-DCLANG_BUILT_STANDALONE=ON \
+		-DCLANG_CONFIG_FILE_SYSTEM_DIR=/etc/clang$_llvmver \
+		-DCLANG_DEFAULT_PIE_ON_LINUX=ON \
+		-DCLANG_ENABLE_ARCMT=$extras \
+		-DCLANG_ENABLE_STATIC_ANALYZER=$extras \
+		-DCLANG_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DCLANG_LINK_CLANG_DYLIB=ON \
+		-DCLANG_PLUGIN_SUPPORT=ON \
+		-DCLANG_PYTHON_BINDINGS_VERSIONS="$python_version" \
+		-DCLANG_SYSTEMZ_DEFAULT_ARCH=z196 \
+		-DCLANG_VENDOR=Alpine \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm$_llvmver \
+		-DCMAKE_INSTALL_RPATH=/usr/lib/llvm$_llvmver/lib \
+		-DCMAKE_MODULE_PATH="$srcdir/cmake-$pkgver.src/Modules" \
+		-DENABLE_LINKER_BUILD_ID=ON \
+		-DLIBCLANG_BUILD_STATIC=ON \
+		-DLLVM_INCLUDE_TESTS=OFF \
+		-DLLVM_EXTERNAL_LIT=/usr/bin/lit \
+		-DLLVM_BUILD_TESTS=ON \
+		-DLLVM_ENABLE_RTTI=ON \
+		-DLLVM_LINK_LLVM_DYLIB=ON \
+		-DLLVM_MAIN_SRC_DIR="$srcdir/llvm-$pkgver.src"
+
+	ninja -C build clang-tblgen
+	ninja -C build
+
+	if [ "$_default_clang" = yes ]; then
+		help2man --no-info \
+			--source "Alpine" \
+			--name "Alpine Clang $pkgver-r$pkgrel" \
+			--version-string "$pkgver-r$pkgrel" \
+			--help-option "--help-hidden" \
+			./build/bin/clang > clang.1
+	fi
+}
+
+check() {
+	ninja -C build check-all
+}
+
+package() {
+	# the libraries should always exactly match, not just by soname
+	# gcc is for libgcc-dev which we don't have split
+	depends="
+		$pkgname-headers=$pkgver-r$pkgrel
+		$pkgname-libs=$pkgver-r$pkgrel
+		fortify-headers>=1.1-r2
+		gcc
+		libstdc++-dev
+		llvm$_llvmver-linker-tools
+		musl-dev
+		"
+
+	# create system config
+	# clang doesn't really have a way to set default -march abi options, so use the system config dir
+	# see the clang UsersManual for how this config directory is parsed / fallback order.
+	# this is set based on our gcc baseline. see the --with arguments in main/gcc.
+	mkdir -p "$pkgdir"/etc/clang$_llvmver
+	case "$CARCH" in
+	x86_64)
+		# unsurprisingly, this is the same as gcc
+		touch config.cfg
+		;;
+	x86)
+		# clang defaults to pentium4 on i*86- triples.
+		# see https://github.com/llvm/llvm-project/issues/61347
+		cat > config.cfg <<-EOF
+		-march=pentium-m -mfpmath=sse
+		EOF
+		;;
+	armhf)
+		# clang defaults to 'armv6' for armhf, i.e. no -zk.
+		# -zk is also a deprecated name for -kz.
+		cat > config.cfg <<-EOF
+		-march=armv6kz
+		-mfpu=vfp
+		-mtune=arm1176jzf-s
+		EOF
+		;;
+	armv7)
+		# clang defaults to neon fpu and non-thumb.
+		# XXX: but seemingly changing it from this makes it not really work on armv7
+		# cat > config.cfg <<-EOF
+		# -mfpu=vfpv3-d16
+		# -mthumb
+		# EOF
+		touch config.cfg
+		;;
+	s390x)
+		# this is correct, as this is the one thing that we have a build-time -D for.
+		# see -DCLANG_SYSTEMZ_DEFAULT_ARCH.
+		touch config.cfg
+		;;
+	ppc64le)
+		# this is seemingly correct, clang defaults to secureplt for musl and elfv2.
+		touch config.cfg
+		;;
+	riscv64)
+		# this is correct, as clang defaults to rvXLENimafdc (-gc) for non-unknown.
+		# this is our target already.
+		touch config.cfg
+		;;
+	aarch64)
+		# XXX: this defaults to
+		# CmdArgs.push_back("-mfpu=crypto-neon-fp-armv8");
+		# is that correct? armv8 is always neon, but the others are unclear.
+		# the output still runs on an rpi4 that normally doesn't have "crypto", so maybe that is misleading
+		# (Gnu.cpp)
+		touch config.cfg
+		;;
+	loongarch64)
+		touch config.cfg
+		;;
+	esac
+	# the target triple being built for
+	# in LLVM, we set -DLLVM_DEFAULT_TARGET_TRIPLE to the same thing,
+	# so that is the default triple, and one of the checked files.
+	# it's possible to do CBUILD-clang.cfg and similar to make it per-tool
+	mv config.cfg "$pkgdir"/etc/clang$_llvmver/$CBUILD.cfg
+
+	DESTDIR="$pkgdir" cmake --install build
+	mkdir -p "$pkgdir"/usr/bin
+
+	install -Dm644 build/lib/libclang.a -t "$pkgdir"/usr/lib/llvm$_llvmver/lib/
+
+	if [ $_default_clang = "yes" ]; then
+		rm "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-format-bbedit.applescript \
+			"$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-doc-default-stylesheet.css \
+			"$pkgdir"/usr/lib/llvm$_llvmver/share/clang/index.js
+
+		mkdir -p "$pkgdir"/usr/share/bash-completion/completions
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/bash-autocomplete.sh \
+			"$pkgdir"/usr/share/bash-completion/completions/clang
+
+		mkdir -p "$pkgdir"/usr/share/emacs/site-lisp
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/share/clang/clang-*.el \
+			"$pkgdir"/usr/share/emacs/site-lisp
+		rmdir -p usr/lib/llvm$_llvmver/share/emacs || true
+
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/share/man "$pkgdir"/usr/share/
+		# XXX: scan-build specifically needs to stay in llvm path, but scan-view has to not be
+		# everything uses different path lookup logic..
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/share/scan-view "$pkgdir"/usr/share/
+
+		local sitedir=$(python3 -c "import site; print(site.getsitepackages()[0])")
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/lib/python3* "$pkgdir"/usr/lib
+		mkdir -p "$pkgdir"/"$sitedir"
+		mv "$pkgdir"/usr/lib/llvm$_llvmver/lib/libscanbuild "$pkgdir"/"$sitedir"
+
+		# symlink everything in the bin dir,
+		# into /usr/bin.
+		local clangexes="
+			analyze-build
+			amdgpu-arch
+			c-index-test
+			clang
+			clang-cl
+			clang-cpp
+			clang-include-cleaner
+			clang-linker-wrapper
+			clang-pseudo
+			clang++
+			clang-$_llvmver
+			clang-apply-replacements
+			clang-change-namespace
+			clang-check
+			clang-doc
+			clang-extdef-mapping
+			clang-format
+			clang-include-fixer
+			clang-move
+			clang-offload-bundler
+			clang-offload-packager
+			clang-query
+			clang-refactor
+			clang-rename
+			clang-reorder-fields
+			clang-repl
+			clang-scan-deps
+			clang-tidy
+			clangd
+			diagtool
+			find-all-symbols
+			git-clang-format
+			hmaptool
+			intercept-build
+			modularize
+			nvptx-arch
+			pp-trace
+			run-clang-tidy
+			scan-build
+			scan-build-py
+			scan-view
+			"
+		for clangexe in $clangexes; do
+			ln -sfv ../lib/llvm$_llvmver/bin/$clangexe "$pkgdir"/usr/bin/$clangexe
+		done
+		ln -sfv ../lib/llvm$_llvmver/bin/clang-$_llvmver "$pkgdir"/usr/bin/clang++-$_llvmver
+
+		install -Dm644 "$builddir"/clang.1 -t "$pkgdir"/usr/share/man/man1/
+	else
+		ln -sfv ../lib/llvm$_llvmver/bin/clang-$_llvmver "$pkgdir"/usr/bin/clang-$_llvmver
+		ln -sfv ../lib/llvm$_llvmver/bin/clang-$_llvmver "$pkgdir"/usr/bin/clang++-$_llvmver
+
+		# delete things we don't want non-latest of
+		rm -r "$pkgdir"/usr/lib/llvm$_llvmver/share
+		rm -r "$pkgdir"/usr/lib/llvm$_llvmver/lib/python3*
+	fi
+
+	local libs="
+		libclang-cpp.so
+		libclang-cpp.so.$_llvmver
+		libclang.so
+		libclang.so.$_llvmver
+		libclang.so.$pkgver
+		"
+	for lib in $libs; do
+		ln -sfv ../lib/llvm$_llvmver/lib/$lib "$pkgdir"/usr/lib/$lib
+	done
+
+	# compat symlink back to fix clang with -no-canonical-prefixes
+	mkdir -p "$pkgdir"/usr/lib/clang/
+	ln -sfv ../llvm$_llvmver/lib/clang/$_llvmver "$pkgdir"/usr/lib/clang/$_llvmver
+}
+
+dev() {
+	default_dev
+	_default_replace
+
+	# move cmake to -dev
+	amove usr/lib/llvm$_llvmver/lib/cmake/clang
+
+	# create cmakedir symlinks, so find_package works
+	# llvm does the same thing- versioned, plus unversioned default.
+	mkdir -p "$subpkgdir"/usr/lib/cmake
+	ln -sfv ../llvm$_llvmver/lib/cmake/clang "$subpkgdir"/usr/lib/cmake/clang$_llvmver
+	if [ $_default_clang = yes ]; then
+		ln -sfv clang$_llvmver "$subpkgdir"/usr/lib/cmake/clang
+	fi
+}
+
+static() {
+	default_static
+	_default_replace
+}
+
+bash() {
+	default_bashcomp
+	_default_replace
+}
+
+libs() {
+	default_libs
+	# this can fail depending on the symlinks and is already moved
+	amove usr/lib/libclang-cpp.so.* || true
+	amove usr/lib/llvm$_llvmver/lib/libclang-cpp.so*
+	_default_replace
+}
+
+libclang() {
+	_default_replace
+	replaces="$replaces clang-libs"
+	depends="$pkgname-headers=$pkgver-r$pkgrel"
+
+	# we add an extra subpackage for this so things that link to libclang don't
+	# have to pull libclang-cpp too (separate)
+	amove usr/lib/libclang.so.*
+	amove usr/lib/llvm$_llvmver/lib/libclang.so*
+}
+
+analyzer() {
+	pkgdesc="Clang source code analysis framework"
+	depends="$pkgname=$pkgver-r$pkgrel py3-$pkgname=$pkgver-r$pkgrel perl python3"
+	_default_replace
+
+	amove \
+		usr/bin/scan* \
+		usr/bin/analyze-build* \
+		usr/bin/intercept-build* \
+		usr/lib/llvm$_llvmver/bin/scan* \
+		usr/lib/llvm$_llvmver/bin/analyze-build* \
+		usr/lib/llvm$_llvmver/bin/intercept-build* \
+		usr/lib/llvm$_llvmver/libexec/*-analyzer* \
+		usr/lib/llvm$_llvmver/libexec/analyze-* \
+		usr/lib/llvm$_llvmver/libexec/intercept-* \
+		usr/lib/llvm$_llvmver/lib/libear* \
+		usr/lib/llvm$_llvmver/share/scan-build \
+		usr/share/scan-view
+}
+
+headers() {
+	_default_replace
+	amove usr/lib/llvm$_llvmver/lib/clang/$_llvmver/include
+}
+
+extra() {
+	pkgdesc="Extra tools built using Clang's tooling APIs"
+	_default_replace
+
+	if [ "$_default_clang" = "yes" ]; then
+		amove \
+			usr/bin/amdgpu-arch \
+			usr/bin/clang-apply-replacements* \
+			usr/bin/clang-change-namespace* \
+			usr/bin/clang-check* \
+			usr/bin/clang-doc* \
+			usr/bin/clang-extdef-mapping* \
+			usr/bin/clang-format* \
+			usr/bin/clang-include-cleaner* \
+			usr/bin/clang-include-fixer* \
+			usr/bin/clang-move* \
+			usr/bin/clang-offload-bundler* \
+			usr/bin/clang-pseudo* \
+			usr/bin/clang-query* \
+			usr/bin/clang-refactor* \
+			usr/bin/clang-rename* \
+			usr/bin/clang-reorder-fields* \
+			usr/bin/clang-repl* \
+			usr/bin/clang-scan-deps* \
+			usr/bin/clang-tidy* \
+			usr/bin/clangd* \
+			usr/bin/c-index-test* \
+			usr/bin/diagtool* \
+			usr/bin/find-all-symbols* \
+			usr/bin/git-clang-format* \
+			usr/bin/hmaptool* \
+			usr/bin/modularize* \
+			usr/bin/nvptx-arch \
+			usr/bin/pp-trace* \
+			usr/bin/run-clang-tidy*
+	fi
+
+	amove \
+		usr/lib/llvm$_llvmver/bin/clang-apply-replacements* \
+		usr/lib/llvm$_llvmver/bin/clang-change-namespace* \
+		usr/lib/llvm$_llvmver/bin/clang-check* \
+		usr/lib/llvm$_llvmver/bin/clang-doc* \
+		usr/lib/llvm$_llvmver/bin/clang-extdef-mapping* \
+		usr/lib/llvm$_llvmver/bin/clang-format* \
+		usr/lib/llvm$_llvmver/bin/clang-include-cleaner* \
+		usr/lib/llvm$_llvmver/bin/clang-include-fixer* \
+		usr/lib/llvm$_llvmver/bin/clang-move* \
+		usr/lib/llvm$_llvmver/bin/clang-offload-bundler* \
+		usr/lib/llvm$_llvmver/bin/clang-pseudo* \
+		usr/lib/llvm$_llvmver/bin/clang-query* \
+		usr/lib/llvm$_llvmver/bin/clang-refactor* \
+		usr/lib/llvm$_llvmver/bin/clang-rename* \
+		usr/lib/llvm$_llvmver/bin/clang-reorder-fields* \
+		usr/lib/llvm$_llvmver/bin/clang-repl* \
+		usr/lib/llvm$_llvmver/bin/clang-scan-deps* \
+		usr/lib/llvm$_llvmver/bin/clang-tidy* \
+		usr/lib/llvm$_llvmver/bin/clangd* \
+		usr/lib/llvm$_llvmver/bin/c-index-test* \
+		usr/lib/llvm$_llvmver/bin/diagtool* \
+		usr/lib/llvm$_llvmver/bin/find-all-symbols* \
+		usr/lib/llvm$_llvmver/bin/git-clang-format* \
+		usr/lib/llvm$_llvmver/bin/hmaptool* \
+		usr/lib/llvm$_llvmver/bin/modularize* \
+		usr/lib/llvm$_llvmver/bin/pp-trace* \
+		usr/lib/llvm$_llvmver/bin/run-clang-tidy* \
+		usr/lib/llvm$_llvmver/share/clang/clang* \
+		usr/lib/llvm$_llvmver/share/clang/run-find-all-symbols.py
+}
+
+emacs() {
+	_default_replace
+	pkgdesc="clang plugin for emacs"
+	install_if="$pkgname-extra-tools=$pkgver-r$pkgrel emacs"
+
+	amove	usr/share/emacs
+}
+
+python() {
+	pkgdesc="Clang Python Bindings"
+	depends="$pkgname-libs=$pkgver-r$pkgrel python3"
+	provides="py3-clang=$pkgver-r$pkgrel"
+	replaces="py3-clang"
+
+	amove usr/lib/python*
+}
+
+ccache() {
+	_default_replace
+	pkgdesc="$pkgdesc (ccache symlinks)"
+	install_if="$pkgname=$pkgver-r$pkgrel ccache"
+	replaces="$replaces ccache"
+
+	mkdir -p "$subpkgdir"/usr/lib/ccache/bin
+	ln -sfv ../../../bin/ccache "$subpkgdir"/usr/lib/ccache/bin/clang-$_llvmver
+	ln -sfv ../../../bin/ccache "$subpkgdir"/usr/lib/ccache/bin/clang++-$_llvmver
+	if [ "$_default_clang" = yes ]; then
+		ln -sfv ../../../bin/ccache "$subpkgdir"/usr/lib/ccache/bin/clang++
+		ln -sfv ../../../bin/ccache "$subpkgdir"/usr/lib/ccache/bin/clang
+	fi
+}
+
+_default_replace() {
+	if [ "$_default_clang" = yes ]; then
+		replaces="clang${subpkgname#"$pkgname"} clang16${subpkgname#"$pkgname"}"
+		provides="clang${subpkgname#"$pkgname"}=$pkgver-r$pkgrel"
+	fi
+}
+
+sha512sums="
+da6f670a52d60c46bbe6bfa2870106f6a6714c9566fab293b8c624a555308104a1a05cd065643091d7006ef4533a9a722dff1fccaf26f348a0c0a5c7b9331439  clang-17.0.6.src.tar.xz
+5110dd36ee1c966d22760000f0c28cf070fd00b05445d418d264dbd3b48426a203f934e402d408fab2602dbf39a29d66898cc7c69c1a52b5e0e6e7097f9db877  clang-tools-extra-17.0.6.src.tar.xz
+b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a  cmake-17.0.6.src.tar.xz
+bf9b04d0d45c67168b195c550cd8326e3a01176f92776705846aad3956a494bcb7a053b0b0bde19abd68dc0068e5c97ef99dee7eadfdb727bc0d758b2684f3bd  llvm-17.0.6.src.tar.xz
+242dada4800c5e558f5f243e6aa0905d90ca3f82cc81baf14c60de543a7e737d4c2f3471122f2c641dc4f0724e4ebf5cf137761a231b34aab2a12f1cfc902c53  third-party-17.0.6.src.tar.xz
+5809d931656cac13b91bc91aac63df072b0403708ac718bf01546d9d520ff2c4163ee11411439dce5bb683a3bfa044b62443b6f66a1419c9086d20e79a018071  10-add-musl-triples.patch
+dcb67bf472ddb0404403c5cd1cea89e32c8bf63557fcf304b4d129cfc037e8e229348d44846c69917196b4777f7d659ac4407328a30de2513d91a490b968661e  30-Enable-stack-protector-by-default-for-Alpine-Linux.patch
+aa2dff990278e0258763934eaa528827baa1733eeb7dc36cc7f1500a4919b8d11870a0522f20f210d454322e3faf5945e9afaeffc9f3a3c4fd422b706370a663  clang-001-fortify-include.patch
+751f8acef2bfd1b50c065dea2ad0c3a20cadd4ff4c842ae519b5085c48372127b49a75d3fd0bd32291f5a69119340e5568a9fba6d94e6f354b14233986f61328  clang-002-fortify-enable.patch
+5f98f147d7d66315e9a56ae6fee602a053d40e57a8b1ee4f2ef1764203bb6fdb9082c8e825c535a9388213a38b49d2702b1e936fcf56560c4a2a56b7e6dd232c  clang-003-as-needed.patch
+"
diff --git a/main/clang17/clang-001-fortify-include.patch b/main/clang17/clang-001-fortify-include.patch
new file mode 100644
index 00000000000..968c26e5131
--- /dev/null
+++ b/main/clang17/clang-001-fortify-include.patch
@@ -0,0 +1,36 @@
+From eca9994181dc355cfba61e726c038832d5ff6975 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun, 23 Oct 2022 00:47:57 +0200
+Subject: [PATCH 1/4] clang: add fortify include paths for musl triplets
+
+When we have fortify headers this lets them get included.
+---
+ lib/Driver/ToolChains/Linux.cpp | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp
+index 7fcdcf125..d5df4a240 100644
+--- a/lib/Driver/ToolChains/Linux.cpp
++++ b/lib/Driver/ToolChains/Linux.cpp
+@@ -622,10 +622,14 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
+   if (getTriple().getOS() == llvm::Triple::RTEMS)
+     return;
+ 
+-  // Add an include of '/include' directly. This isn't provided by default by
+-  // system GCCs, but is often used with cross-compiling GCCs, and harmless to
+-  // add even when Clang is acting as-if it were a system compiler.
+-  addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/include"));
++  if (getTriple().isMusl()) {
++    addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/usr/include/fortify"));
++  } else {
++    // Preserve original clang behavior for non-musl triples, but for musl
++    // this just gets in the way and none of our crosstoolchains are ever
++    // actually built this way (and we'd have to figure out fortify for it)
++    addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/include"));
++  }
+ 
+   addExternCSystemInclude(DriverArgs, CC1Args, concat(SysRoot, "/usr/include"));
+ 
+-- 
+2.38.0
+
diff --git a/main/clang17/clang-002-fortify-enable.patch b/main/clang17/clang-002-fortify-enable.patch
new file mode 100644
index 00000000000..30100c9cba4
--- /dev/null
+++ b/main/clang17/clang-002-fortify-enable.patch
@@ -0,0 +1,29 @@
+From 0a876ce2825f1e54bec7059a387e43a2e0386665 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun, 23 Oct 2022 01:02:35 +0200
+Subject: [PATCH 2/4] clang: enable fortify by default on optimizing musl
+ targets
+
+---
+ lib/Frontend/InitPreprocessor.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/lib/Frontend/InitPreprocessor.cpp b/lib/Frontend/InitPreprocessor.cpp
+index 20bfbf144..9095c0f2f 100644
+--- a/lib/Frontend/InitPreprocessor.cpp
++++ b/lib/Frontend/InitPreprocessor.cpp
+@@ -1288,6 +1288,11 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
+     Builder.defineMacro("__GLIBCXX_BITSIZE_INT_N_0", "128");
+   }
+ 
++  // Enable fortify by default on musl when optimizing, but not with asan
++  if (TI.getTriple().isMusl() && LangOpts.Optimize &&
++      !LangOpts.Sanitize.has(SanitizerKind::Address))
++    Builder.defineMacro("_FORTIFY_SOURCE", "2");
++
+   // Get other target #defines.
+   TI.getTargetDefines(LangOpts, Builder);
+ }
+-- 
+2.38.0
+
diff --git a/main/clang17/clang-003-as-needed.patch b/main/clang17/clang-003-as-needed.patch
new file mode 100644
index 00000000000..a92836fe07a
--- /dev/null
+++ b/main/clang17/clang-003-as-needed.patch
@@ -0,0 +1,31 @@
+forces as-needed regardless of ldflags
+From f59f126a9344f265e3766003766d7a66b6a638e3 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Sun, 23 Oct 2022 01:26:37 +0200
+Subject: [PATCH 3/4] clang: use --as-needed by default
+
+---
+ clang/lib/Driver/ToolChains/Gnu.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
+index f203cae1d..9e181a79a 100644
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -560,6 +560,13 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+   bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs);
+   bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs);
+   addLinkerCompressDebugSectionsOption(ToolChain, Args, CmdArgs);
++
++  // Use --as-needed by default for all explicit linker inputs on Linux
++  // We don't reset it afterwards because explicit argument does not
++  // get reset either (and that is permitted, so it should be fine)
++  if (Triple.isOSLinux())
++    CmdArgs.push_back("--as-needed");
++
+   AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
+ 
+   addHIPRuntimeLibArgs(ToolChain, Args, CmdArgs);
+-- 
+2.38.0
+
diff --git a/main/cloog/APKBUILD b/main/cloog/APKBUILD
deleted file mode 100644
index 6181176dcf8..00000000000
--- a/main/cloog/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=cloog
-pkgver=0.20.0
-pkgrel=0
-pkgdesc="The Chunky Loop Generator"
-url="http://www.cloog.org/"
-arch="all"
-license="GPL-2.0-or-later"
-depends_dev="gmp-dev isl-dev"
-makedepends_host="$depends_dev"
-makedepends="$makedepends_host"
-subpackages="$pkgname-dev"
-source="https://github.com/periscop/cloog/releases/download/cloog-$pkgver/cloog-$pkgver.tar.gz"
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--with-sysroot=${CBUILDROOT} \
-		--with-isl=system
-	make
-}
-
-check() {
-	make -j1 check
-}
-
-package() {
-	make DESTDIR="$pkgdir" INSTALL="install -D" install
-}
-
-sha512sums="d00cbefd348b45d9d482320a088f7ae736440046b99469cbdfbb177a38dcef182c3305f0a567a1f5699c23b7108db6fd5ad6dfbc071d63ccca1d6bfc1b198565  cloog-0.20.0.tar.gz"
diff --git a/main/clucene/APKBUILD b/main/clucene/APKBUILD
index 991bb4d85a7..ad9f8b0047a 100644
--- a/main/clucene/APKBUILD
+++ b/main/clucene/APKBUILD
@@ -2,46 +2,40 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=clucene
 pkgver=2.3.3.4
-pkgrel=7
+pkgrel=21
 pkgdesc="A C++ port of Lucene"
-url="http://www.sourceforge.net/projects/clucene"
+url="https://www.sourceforge.net/projects/clucene/"
 arch="all"
-license="LGPL-2.0-or-later or Apache-2.0"
-depends=""
+license="LGPL-2.0-or-later OR Apache-2.0"
+options="!check" # fixme: build cl_test
 depends_dev="zlib-dev boost-dev"
-makedepends="cmake $depends_dev"
-install=""
+makedepends="cmake $depends_dev samurai"
 subpackages="$pkgname-dev $pkgname-contribs"
 source="https://downloads.sourceforge.net/clucene/clucene-core-$pkgver.tar.gz
 	clucene-core-2.3.3.4-pkgconfig.patch
 	clucene-core-2.3.3.4-install_contribs_lib.patch
+	clucene-pthread.patch
 	"
-
-_builddir="$srcdir"/clucene-core-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir/$pkgname-core-$pkgver"
 
 build() {
-	cd "$_builddir"
-	cmake . -DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DBUILD_CONTRIBS_LIB=BOOL:ON \
-		-DLIB_DESTINATION:PATH=/usr/lib \
-		-DLUCENE_SYS_INCLUDES:PATH=/usr/lib \
-		|| return 1
-	make
+		-DBUILD_CONTRIBS_LIB=ON \
+		-DLIB_DESTINATION=/usr/lib \
+		-DLUCENE_SYS_INCLUDES=/usr/lib \
+		.
+	cmake --build build
+}
+
+check() {
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$_builddir"
-	make install/fast DESTDIR="$pkgdir" || return 1
+	DESTDIR="$pkgdir" cmake --install build
 	rm -r "$pkgdir"/usr/lib/CLuceneConfig.cmake
 }
 
@@ -51,12 +45,14 @@ contribs() {
 	mv "$pkgdir"/usr/lib/libclucene-contribs*.so.* "$subpkgdir"/usr/lib/
 }
 
-dev()  {
+dev() {
 	default_dev
-	mv "$pkgdir"/usr/lib/CLucene/*.cmake "$subpkgdir"/usr/lib/CLucene/ \
-		|| return 1
+	mv "$pkgdir"/usr/lib/CLucene/*.cmake "$subpkgdir"/usr/lib/CLucene/
 }
 
-sha512sums="1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4  clucene-core-2.3.3.4.tar.gz
+sha512sums="
+1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4  clucene-core-2.3.3.4.tar.gz
 b357cb5a1c5d66219f3168724a71af3ebf5c45c752a612d3a69c170b739acc065dc17c261c3a730298ea6c637fe820637a100f73ab03d931734f80bb598fbf55  clucene-core-2.3.3.4-pkgconfig.patch
-0aa92635949089196e4e7c579e78761e8751987ef5036320a161a4aaa67da3c63756398c903419c76ea0fbdc8a949e871fcb65be98179a9853a24a5a4cacfde3  clucene-core-2.3.3.4-install_contribs_lib.patch"
+0aa92635949089196e4e7c579e78761e8751987ef5036320a161a4aaa67da3c63756398c903419c76ea0fbdc8a949e871fcb65be98179a9853a24a5a4cacfde3  clucene-core-2.3.3.4-install_contribs_lib.patch
+bc8f50fda6ccc5baf1783ae138c8e83aa9d0273373a2e4a0ce40797fb2c814defa5105da4586079bdeeb3dff8642e98e4bc7700368c34448ac22085002d2e56f  clucene-pthread.patch
+"
diff --git a/main/clucene/clucene-pthread.patch b/main/clucene/clucene-pthread.patch
new file mode 100644
index 00000000000..7aed18cce89
--- /dev/null
+++ b/main/clucene/clucene-pthread.patch
@@ -0,0 +1,12 @@
+diff --git a/src/shared/CLucene/LuceneThreads.h b/src/shared/CLucene/LuceneThreads.h
+index 97072ee..4ee241e 100644
+--- a/src/shared/CLucene/LuceneThreads.h
++++ b/src/shared/CLucene/LuceneThreads.h
+@@ -7,6 +7,7 @@
+ #ifndef _LuceneThreads_h
+ #define  _LuceneThreads_h
+ 
++#include <pthread.h>
+ 
+ CL_NS_DEF(util)
+ class CLuceneThreadIdCompare;
diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD
index 3b9145d3f6d..cbf26b67f7d 100644
--- a/main/cmake/APKBUILD
+++ b/main/cmake/APKBUILD
@@ -1,50 +1,66 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cmake
-pkgver=3.17.0
+pkgver=3.29.2
 pkgrel=0
 pkgdesc="Cross-platform, open-source make system"
 url="https://www.cmake.org/"
 arch="all"
 license="BSD-3-Clause"
-makedepends="bzip2-dev curl-dev expat-dev libarchive-dev linux-headers
-	libuv-dev ncurses-dev rhash-dev xz-dev zlib-dev"
-options="!check"
-checkdepends="file musl-utils"
-subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch
+makedepends="
+	bzip2-dev
+	expat-dev
+	libarchive-dev
+	libuv-dev
+	linux-headers
+	ncurses-dev
+	nghttp2-dev
+	py3-sphinx
+	rhash-dev
+	samurai
+	xz-dev
+	zlib-dev
+	"
+checkdepends="file"
+subpackages="
+	ccmake
+	$pkgname-doc
+	$pkgname-bash-completion
+	$pkgname-emacs::noarch
+	$pkgname-vim::noarch
 	"
 case $pkgver in
 *.*.*.*) _v=v${pkgver%.*.*};;
 *.*.*) _v=v${pkgver%.*};;
 esac
-
-source="https://www.cmake.org/files/$_v/cmake-$pkgver.tar.gz
-	"
-
-_parallel_opt() {
-	local i n
-	for i in $MAKEOPTS; do
-		case "$i" in
-			-j*) n=${i#-j};;
-		esac;
-	done
-	[ -n "$n" ] && echo "--parallel $n"
-}
+source="https://www.cmake.org/files/$_v/cmake-$pkgver.tar.gz"
+options="!check"
 
 build() {
-	# jsoncpp needs cmake to build so to avoid recursive build
-	# dependency, we use the bundled version of jsoncpp.
-	# Do NOT remove --no-system-jsoncpp unless you consulted
-	# maintainer
+	# jsoncpp/cppdap/curl needs cmake to build so to avoid recursive build
+	# dependency, we use the bundled version.
+	# Do NOT remove --no-system-jsoncpp, --no-system-cppdap or --no-system-curl
+
 	./bootstrap \
 		--prefix=/usr \
 		--mandir=/share/man \
 		--datadir=/share/$pkgname \
 		--docdir=/share/doc/$pkgname \
-		--system-libs \
+		--sphinx-man \
+		--no-system-cppdap \
+		--no-system-curl \
 		--no-system-jsoncpp \
-		$(_parallel_opt)
-	make
+		--system-bzip2 \
+		--system-expat \
+		--system-libarchive \
+		--system-liblzma \
+		--system-librhash \
+		--system-libuv \
+		--system-nghttp2 \
+		--system-zlib \
+		--generator=Ninja \
+		--parallel="${JOBS:-2}"
+	ninja
 }
 
 check() {
@@ -52,18 +68,29 @@ check() {
 }
 
 package() {
-	cd $startdir/src/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" ninja install
+}
+
+ccmake() {
+	pkgdesc="$pkgdesc (ccmake configurator)"
+
+	amove usr/bin/ccmake
+}
+
+emacs() {
+	pkgdesc="$pkgdesc (emacs mode)"
+	install_if="$pkgname=$pkgver-r$pkgrel emacs"
+
+	amove usr/share/emacs
 }
 
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash"
+vim() {
+	pkgdesc="$pkgdesc (vim files)"
+	install_if="$pkgname=$pkgver-r$pkgrel vim"
 
-	mkdir -p "$subpkgdir"/usr/share/bash-completion
-	mv "$pkgdir"/usr/share/cmake/completions \
-		"$subpkgdir"/usr/share/bash-completion/
+	amove usr/share/vim
 }
 
-sha512sums="f09440681e0c414f5ca669f3aeba6666d09e0642f30a2e12c3199e7fb3da95a7dd17994fc54475c49638c37f0502ea0a2d8da0f9098805f11088ba7b299bf72a  cmake-3.17.0.tar.gz"
+sha512sums="
+0dad9e0e3ad9c1178d337cd3a14e9ce145e011175e9d9fce4961d12b8fe37091f9fdf05f4303cdd846408955b11bac3cfe5064f852833b99e31f5a7b82a9d1eb  cmake-3.29.2.tar.gz
+"
diff --git a/main/cmocka/APKBUILD b/main/cmocka/APKBUILD
index 575f24d5747..77bab67d354 100644
--- a/main/cmocka/APKBUILD
+++ b/main/cmocka/APKBUILD
@@ -1,54 +1,40 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=cmocka
-pkgver=1.1.5
-pkgrel=1
+pkgver=1.1.7
+pkgrel=2
 pkgdesc="An elegant unit testing framework for C with support for mock objects"
 url="https://cmocka.org/"
 arch="all"
 license="Apache-2.0"
-depends=""
-makedepends="cmake"
+makedepends="cmake samurai"
 subpackages="$pkgname-dev"
-source="https://cmocka.org/files/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+source="https://cmocka.org/files/${pkgver%.*}/cmocka-$pkgver.tar.xz
 	wordsize.patch
-	musl_uintptr.patch"
-builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	default_prepare
-
-	# Just one single test (customer_database_test) is breaking on ppc64le.
-	if [ "$CARCH" = "ppc64le" ]; then
-		sed -i '/customer_database_test/d' "$builddir"/example/CMakeLists.txt
-	fi
-}
+	"
 
 build() {
-	mkdir -p "$builddir"/build
-	cd "$builddir"/build
-
-	cmake .. \
+	cmake -B build -G Ninja \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_SHARED_LIBS=True \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DUNIT_TESTING=ON
-	make
+	cmake --build build
 }
 
 check() {
 	cd "$builddir"/build
 
 	# If some tests fail, run them again in verbose mode.
-	make test || ctest --rerun-failed --extra-verbose
+	ninja test || ctest --rerun-failed --extra-verbose
 }
 
 package() {
-	make -C "$builddir"/build DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
-sha512sums="cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd  cmocka-1.1.5.tar.xz
-773b8675f38eda0ca4df919c23646f029390892dd8f8675ce67c2f736f112d243d4e03aff4f013983bbefc2657cfa6c7563416b7b6dd15dd7aa4015228bb6ad1  wordsize.patch
-b20b5c0d172a9df756ec093a3df4bf5bdf2a0c06a3d3ad39ec001248ccb86e6fd3dcedfc9ce42e8309cc01ea34fadffd4ebcc0fb3af9f5e795e7fe40c461ac60  musl_uintptr.patch"
+sha512sums="
+fe451893474dce1270e12af707a9a8fe1f0217e1782b4e1a67d25dadf56ff4a5e7dbc9ba4431f774aedffa46a40a28a6a0488df24feefb2f93e90fd2369c2c88  cmocka-1.1.7.tar.xz
+060595aba90467b4d552cae7f0228d73ead2af32cd6a501ddfd5c5cdfd23d3ba397c795c7678bfa1d1e52ab54bebdcfb49ee5c7dd6adab48b41d392db6f3fef1  wordsize.patch
+"
diff --git a/main/cmocka/musl_uintptr.patch b/main/cmocka/musl_uintptr.patch
deleted file mode 100644
index 9c9ca5735e7..00000000000
--- a/main/cmocka/musl_uintptr.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit f81e5b71ce78f33250347914dacc75c8463bf102
-Author: Breno Leitao <breno.leitao@gmail.com>
-Date:   Wed Mar 29 15:22:38 2017 -0300
-
-    include: Check for previous declaration of uintptr_t
-    
-    Adding a extra check before declaring uintptr_t. Currently musl uses
-    macro __DEFINED_uintptr_t once it defines uintptr_t type. Checking
-    this macro before defining it, and, defining it when uintptr_t is
-    defined.
-    
-    Signed-off-by: Breno Leitao <breno.leitao@gmail.com>
-
-diff --git a/include/cmocka.h b/include/cmocka.h
-index 303d0ae..a2bfc40 100644
---- a/include/cmocka.h
-+++ b/include/cmocka.h
-@@ -110,7 +110,7 @@
-     ((LargestIntegralType)(value))
- 
- /* Smallest integral type capable of holding a pointer. */
--#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
-+#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(__DEFINED_uintptr_t)
- # if defined(_WIN32)
-     /* WIN32 is an ILP32 platform */
-     typedef unsigned int uintptr_t;
-@@ -136,6 +136,8 @@
- 
- # define _UINTPTR_T
- # define _UINTPTR_T_DEFINED
-+# define __DEFINED_uintptr_t
-+
- #endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */
- 
- /* Perform an unsigned cast to uintptr_t. */
diff --git a/main/cmocka/wordsize.patch b/main/cmocka/wordsize.patch
index 816dc3fda00..f849b41ff4b 100644
--- a/main/cmocka/wordsize.patch
+++ b/main/cmocka/wordsize.patch
@@ -1,17 +1,1282 @@
---- cmocka-1.1.5/include/cmocka.h.orig
-+++ cmocka-1.1.5/include/cmocka.h
-@@ -57,12 +57,9 @@
+Patch-Source: https://gitlab.com/cmocka/cmocka/-/commit/0e70150002ab7bcb626109b287f23c62ecf97565
+--
+From 0e70150002ab7bcb626109b287f23c62ecf97565 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Mon, 5 Oct 2020 13:28:11 +0200
+Subject: [PATCH] cmocka: Replace LargestIntegralType with uintmax_t
+
+This requires #include <stdint.h>
+
+Fixes #38
+Fixes #49
+---
+ example/allocate_module_test.c            |   1 +
+ example/assert_macro_test.c               |   1 +
+ example/assert_module_test.c              |   1 +
+ example/calculator_test.c                 |   1 +
+ example/mock/chef_wrap/chef.c             |   1 +
+ example/mock/chef_wrap/waiter_test_wrap.c |   1 +
+ include/cmocka.h                          | 162 ++++++++--------------
+ src/cmocka.c                              | 148 ++++++++++----------
+ tests/test_alloc.c                        |   1 +
+ tests/test_assert_macros.c                |   1 +
+ tests/test_assert_macros_fail.c           |   1 +
+ tests/test_basics.c                       |   1 +
+ tests/test_cmockery.c                     |   1 +
+ tests/test_double_macros.c                |   1 +
+ tests/test_exception_handler.c            |   1 +
+ tests/test_fixtures.c                     |   1 +
+ tests/test_float_macros.c                 |   1 +
+ tests/test_group_fixtures.c               |   1 +
+ tests/test_group_setup_assert.c           |   1 +
+ tests/test_group_setup_fail.c             |   1 +
+ tests/test_groups.c                       |   1 +
+ tests/test_ordering.c                     |   1 +
+ tests/test_ordering_fail.c                |   1 +
+ tests/test_returns.c                      |   1 +
+ tests/test_returns_fail.c                 |   1 +
+ tests/test_setup_fail.c                   |   1 +
+ tests/test_skip.c                         |   1 +
+ tests/test_skip_filter.c                  |   1 +
+ tests/test_strmatch.c                     |   1 +
+ tests/test_wildcard.c                     |   1 +
+ 30 files changed, 156 insertions(+), 182 deletions(-)
+
+diff --git a/example/allocate_module_test.c b/example/allocate_module_test.c
+index 562aea2..eb3602f 100644
+--- a/example/allocate_module_test.c
++++ b/example/allocate_module_test.c
+@@ -16,6 +16,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ 
+ extern void leak_memory(void);
+diff --git a/example/assert_macro_test.c b/example/assert_macro_test.c
+index 2cd355c..093a884 100644
+--- a/example/assert_macro_test.c
++++ b/example/assert_macro_test.c
+@@ -16,6 +16,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ 
+ #include "assert_macro.h"
+diff --git a/example/assert_module_test.c b/example/assert_module_test.c
+index f387754..41b5a75 100644
+--- a/example/assert_module_test.c
++++ b/example/assert_module_test.c
+@@ -16,6 +16,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ 
+ #include "assert_module.h"
+diff --git a/example/calculator_test.c b/example/calculator_test.c
+index ab8cad8..a3d862a 100644
+--- a/example/calculator_test.c
++++ b/example/calculator_test.c
+@@ -16,6 +16,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include "cmocka.h"
+ #include <stdio.h>
+ 
+diff --git a/example/mock/chef_wrap/chef.c b/example/mock/chef_wrap/chef.c
+index 1429cde..1c74125 100644
+--- a/example/mock/chef_wrap/chef.c
++++ b/example/mock/chef_wrap/chef.c
+@@ -18,6 +18,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ #include <stdio.h>
+ #include <errno.h>
+diff --git a/example/mock/chef_wrap/waiter_test_wrap.c b/example/mock/chef_wrap/waiter_test_wrap.c
+index 4146818..04fe721 100644
+--- a/example/mock/chef_wrap/waiter_test_wrap.c
++++ b/example/mock/chef_wrap/waiter_test_wrap.c
+@@ -24,6 +24,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ 
+ #include "waiter_test_wrap.h"
+diff --git a/include/cmocka.h b/include/cmocka.h
+index a21d965..6f56520 100644
+--- a/include/cmocka.h
++++ b/include/cmocka.h
+@@ -57,32 +57,13 @@ int __stdcall IsDebuggerPresent();
+  * @{
   */
  
- /* If __WORDSIZE is not set, try to figure it out and default to 32 bit. */
-+#include <bits/reg.h>
- #ifndef __WORDSIZE
+-/* If __WORDSIZE is not set, try to figure it out and default to 32 bit. */
+-#ifndef __WORDSIZE
 -# if (defined(__x86_64__) && !defined(__ILP32__)) || defined(__sparc_v9__) || defined(__sparcv9)
 -#  define __WORDSIZE 64
 -# else
 -#  define __WORDSIZE 32
 -# endif
-+#error __WORDSIZE not defined
+-#endif
++/* XXX: stdint.h is a new requirement to include, but things haven't adapted
++   to it yet, so include it here too.
++   since it's a requirement to use the header at all, there's no harm in
++   including it? */
++#include <stdint.h>
+ 
+-#ifdef DOXYGEN
+-/**
+- * Largest integral type.  This type should be large enough to hold any
+- * pointer or integer supported by the compiler.
+- */
+-typedef uintmax_t LargestIntegralType;
+-#else /* DOXGEN */
+-#ifndef LargestIntegralType
+-# if __WORDSIZE == 64 && !defined(_WIN64)
+-#  define LargestIntegralType unsigned long int
+-# else
+-#  define LargestIntegralType unsigned long long int
+-# endif
+-#endif /* LargestIntegralType */
+-#endif /* DOXYGEN */
+-
+-/* Printf format used to display LargestIntegralType as a hexidecimal. */
++/* Printf format used to display uintmax_t as a hexidecimal. */
+ #ifndef LargestIntegralTypePrintfFormat
+ # ifdef _WIN32
+ #  define LargestIntegralTypePrintfFormat "0x%I64x"
+@@ -95,7 +76,7 @@ typedef uintmax_t LargestIntegralType;
+ # endif /* _WIN32 */
+ #endif /* LargestIntegralTypePrintfFormat */
+ 
+-/* Printf format used to display LargestIntegralType as a decimal. */
++/* Printf format used to display uintmax_t as a decimal. */
+ #ifndef LargestIntegralTypePrintfFormatDecimal
+ # ifdef _WIN32
+ #  define LargestIntegralTypePrintfFormatDecimal "%I64u"
+@@ -116,44 +97,15 @@ typedef uintmax_t LargestIntegralType;
+ # define DoublePrintfFormat "%f"
+ #endif /* DoublePrintfFormat */
+ 
+-/* Perform an unsigned cast to LargestIntegralType. */
++/* Perform an unsigned cast to uintmax_t. */
+ #define cast_to_largest_integral_type(value) \
+-    ((LargestIntegralType)(value))
+-
+-/* Smallest integral type capable of holding a pointer. */
+-#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(HAVE_UINTPTR_T)
+-# if defined(_WIN32)
+-    /* WIN32 is an ILP32 platform */
+-    typedef unsigned int uintptr_t;
+-# elif defined(_WIN64)
+-    typedef unsigned long int uintptr_t;
+-# else /* _WIN32 */
+-
+-/* ILP32 and LP64 platforms */
+-#  ifdef __WORDSIZE /* glibc */
+-#   if __WORDSIZE == 64
+-      typedef unsigned long int uintptr_t;
+-#   else
+-      typedef unsigned int uintptr_t;
+-#   endif /* __WORDSIZE == 64 */
+-#  else /* __WORDSIZE */
+-#   if defined(_LP64) || defined(_I32LPx)
+-      typedef unsigned long int uintptr_t;
+-#   else
+-      typedef unsigned int uintptr_t;
+-#   endif
+-#  endif /* __WORDSIZE */
+-# endif /* _WIN32 */
+-
+-# define _UINTPTR_T
+-# define _UINTPTR_T_DEFINED
+-#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */
++    ((uintmax_t)(value))
+ 
+ /* Perform an unsigned cast to uintptr_t. */
+ #define cast_to_pointer_integral_type(value) \
+-    ((uintptr_t)((size_t)(value)))
++    ((uintptr_t)(value))
+ 
+-/* Perform a cast of a pointer to LargestIntegralType */
++/* Perform a cast of a pointer to uintmax_t */
+ #define cast_ptr_to_largest_integral_type(value) \
+ cast_to_largest_integral_type(cast_to_pointer_integral_type(value))
+ 
+@@ -240,7 +192,7 @@ cast_to_largest_integral_type(cast_to_pointer_integral_type(value))
+  *
+  * @see will_return()
+  */
+-LargestIntegralType mock(void);
++uintmax_t mock(void);
+ #else
+ #define mock() _mock(__func__, __FILE__, __LINE__)
  #endif
+@@ -324,7 +276,7 @@ type mock_ptr_type(#type);
+  * @see mock()
+  * @see will_return_count()
+  */
+-void will_return(#function, LargestIntegralType value);
++void will_return(#function, uintmax_t value);
+ #else
+ #define will_return(function, value) \
+     _will_return(#function, __FILE__, __LINE__, \
+@@ -347,7 +299,7 @@ void will_return(#function, LargestIntegralType value);
+  *
+  * @see mock()
+  */
+-void will_return_count(#function, LargestIntegralType value, int count);
++void will_return_count(#function, uintmax_t value, int count);
+ #else
+ #define will_return_count(function, value, count) \
+     _will_return(#function, __FILE__, __LINE__, \
+@@ -370,7 +322,7 @@ void will_return_count(#function, LargestIntegralType value, int count);
+  * @see will_return_count()
+  * @see mock()
+  */
+-void will_return_always(#function, LargestIntegralType value);
++void will_return_always(#function, uintmax_t value);
+ #else
+ #define will_return_always(function, value) \
+     will_return_count(function, (value), WILL_RETURN_ALWAYS)
+@@ -398,7 +350,7 @@ void will_return_always(#function, LargestIntegralType value);
+  * @see will_return_count()
+  * @see mock()
+  */
+-void will_return_maybe(#function, LargestIntegralType value);
++void will_return_maybe(#function, uintmax_t value);
+ #else
+ #define will_return_maybe(function, value) \
+     will_return_count(function, (value), WILL_RETURN_ONCE)
+@@ -494,7 +446,7 @@ void expect_check(#function, #parameter, #check_function, const void *check_data
+  *
+  * @see check_expected().
+  */
+-void expect_in_set(#function, #parameter, LargestIntegralType value_array[]);
++void expect_in_set(#function, #parameter, uintmax_t value_array[]);
+ #else
+ #define expect_in_set(function, parameter, value_array) \
+     expect_in_set_count(function, parameter, value_array, 1)
+@@ -519,7 +471,7 @@ void expect_in_set(#function, #parameter, LargestIntegralType value_array[]);
+  *
+  * @see check_expected().
+  */
+-void expect_in_set_count(#function, #parameter, LargestIntegralType value_array[], size_t count);
++void expect_in_set_count(#function, #parameter, uintmax_t value_array[], size_t count);
+ #else
+ #define expect_in_set_count(function, parameter, value_array, count) \
+     _expect_in_set(#function, #parameter, __FILE__, __LINE__, value_array, \
+@@ -541,7 +493,7 @@ void expect_in_set_count(#function, #parameter, LargestIntegralType value_array[
+  *
+  * @see check_expected().
+  */
+-void expect_not_in_set(#function, #parameter, LargestIntegralType value_array[]);
++void expect_not_in_set(#function, #parameter, uintmax_t value_array[]);
+ #else
+ #define expect_not_in_set(function, parameter, value_array) \
+     expect_not_in_set_count(function, parameter, value_array, 1)
+@@ -566,7 +518,7 @@ void expect_not_in_set(#function, #parameter, LargestIntegralType value_array[])
+  *
+  * @see check_expected().
+  */
+-void expect_not_in_set_count(#function, #parameter, LargestIntegralType value_array[], size_t count);
++void expect_not_in_set_count(#function, #parameter, uintmax_t value_array[], size_t count);
+ #else
+ #define expect_not_in_set_count(function, parameter, value_array, count) \
+     _expect_not_in_set( \
+@@ -592,7 +544,7 @@ void expect_not_in_set_count(#function, #parameter, LargestIntegralType value_ar
+  *
+  * @see check_expected().
+  */
+-void expect_in_range(#function, #parameter, LargestIntegralType minimum, LargestIntegralType maximum);
++void expect_in_range(#function, #parameter, uintmax_t minimum, uintmax_t maximum);
+ #else
+ #define expect_in_range(function, parameter, minimum, maximum) \
+     expect_in_range_count(function, parameter, minimum, maximum, 1)
+@@ -619,7 +571,7 @@ void expect_in_range(#function, #parameter, LargestIntegralType minimum, Largest
+  *
+  * @see check_expected().
+  */
+-void expect_in_range_count(#function, #parameter, LargestIntegralType minimum, LargestIntegralType maximum, size_t count);
++void expect_in_range_count(#function, #parameter, uintmax_t minimum, uintmax_t maximum, size_t count);
+ #else
+ #define expect_in_range_count(function, parameter, minimum, maximum, count) \
+     _expect_in_range(#function, #parameter, __FILE__, __LINE__, minimum, \
+@@ -643,7 +595,7 @@ void expect_in_range_count(#function, #parameter, LargestIntegralType minimum, L
+  *
+  * @see check_expected().
+  */
+-void expect_not_in_range(#function, #parameter, LargestIntegralType minimum, LargestIntegralType maximum);
++void expect_not_in_range(#function, #parameter, uintmax_t minimum, uintmax_t maximum);
+ #else
+ #define expect_not_in_range(function, parameter, minimum, maximum) \
+     expect_not_in_range_count(function, parameter, minimum, maximum, 1)
+@@ -670,7 +622,7 @@ void expect_not_in_range(#function, #parameter, LargestIntegralType minimum, Lar
+  *
+  * @see check_expected().
+  */
+-void expect_not_in_range_count(#function, #parameter, LargestIntegralType minimum, LargestIntegralType maximum, size_t count);
++void expect_not_in_range_count(#function, #parameter, uintmax_t minimum, uintmax_t maximum, size_t count);
+ #else
+ #define expect_not_in_range_count(function, parameter, minimum, maximum, \
+                                   count) \
+@@ -695,7 +647,7 @@ void expect_not_in_range_count(#function, #parameter, LargestIntegralType minimu
+  * @see expect_memory()
+  * @see expect_any()
+  */
+-void expect_value(#function, #parameter, LargestIntegralType value);
++void expect_value(#function, #parameter, uintmax_t value);
+ #else
+ #define expect_value(function, parameter, value) \
+     expect_value_count(function, parameter, value, 1)
+@@ -722,7 +674,7 @@ void expect_value(#function, #parameter, LargestIntegralType value);
+  * @see expect_not_string()
+  * @see expect_not_memory()
+  */
+-void expect_value_count(#function, #parameter, LargestIntegralType value, size_t count);
++void expect_value_count(#function, #parameter, uintmax_t value, size_t count);
+ #else
+ #define expect_value_count(function, parameter, value, count) \
+     _expect_value(#function, #parameter, __FILE__, __LINE__, \
+@@ -743,7 +695,7 @@ void expect_value_count(#function, #parameter, LargestIntegralType value, size_t
+  *
+  * @see check_expected().
+  */
+-void expect_not_value(#function, #parameter, LargestIntegralType value);
++void expect_not_value(#function, #parameter, uintmax_t value);
+ #else
+ #define expect_not_value(function, parameter, value) \
+     expect_not_value_count(function, parameter, value, 1)
+@@ -767,7 +719,7 @@ void expect_not_value(#function, #parameter, LargestIntegralType value);
+  *
+  * @see check_expected().
+  */
+-void expect_not_value_count(#function, #parameter, LargestIntegralType value, size_t count);
++void expect_not_value_count(#function, #parameter, uintmax_t value, size_t count);
+ #else
+ #define expect_not_value_count(function, parameter, value, count) \
+     _expect_not_value(#function, #parameter, __FILE__, __LINE__, \
+@@ -1438,7 +1390,7 @@ void assert_memory_not_equal(const void *a, const void *b, size_t size);
+  *
+  * @param[in]  maximum  The maximum value allowed.
+  */
+-void assert_in_range(LargestIntegralType value, LargestIntegralType minimum, LargestIntegralType maximum);
++void assert_in_range(uintmax_t value, uintmax_t minimum, uintmax_t maximum);
+ #else
+ #define assert_in_range(value, minimum, maximum) \
+     _assert_in_range( \
+@@ -1461,7 +1413,7 @@ void assert_in_range(LargestIntegralType value, LargestIntegralType minimum, Lar
+  *
+  * @param[in]  maximum  The maximum value to compare.
+  */
+-void assert_not_in_range(LargestIntegralType value, LargestIntegralType minimum, LargestIntegralType maximum);
++void assert_not_in_range(uintmax_t value, uintmax_t minimum, uintmax_t maximum);
+ #else
+ #define assert_not_in_range(value, minimum, maximum) \
+     _assert_not_in_range( \
+@@ -1483,7 +1435,7 @@ void assert_not_in_range(LargestIntegralType value, LargestIntegralType minimum,
+  *
+  * @param[in]  count  The size of the values array.
+  */
+-void assert_in_set(LargestIntegralType value, LargestIntegralType values[], size_t count);
++void assert_in_set(uintmax_t value, uintmax_t values[], size_t count);
+ #else
+ #define assert_in_set(value, values, number_of_values) \
+     _assert_in_set(value, values, number_of_values, __FILE__, __LINE__)
+@@ -1502,7 +1454,7 @@ void assert_in_set(LargestIntegralType value, LargestIntegralType values[], size
+  *
+  * @param[in]  count  The size of the values array.
+  */
+-void assert_not_in_set(LargestIntegralType value, LargestIntegralType values[], size_t count);
++void assert_not_in_set(uintmax_t value, uintmax_t values[], size_t count);
+ #else
+ #define assert_not_in_set(value, values, number_of_values) \
+     _assert_not_in_set(value, values, number_of_values, __FILE__, __LINE__)
+@@ -2181,8 +2133,8 @@ void expect_assert_failure(function fn_call);
+ typedef void (*UnitTestFunction)(void **state);
+ 
+ /* Function that determines whether a function parameter value is correct. */
+-typedef int (*CheckParameterValue)(const LargestIntegralType value,
+-                                   const LargestIntegralType check_value_data);
++typedef int (*CheckParameterValue)(const uintmax_t value,
++                                   const uintmax_t check_value_data);
+ 
+ /* Type of the unit test function. */
+ typedef enum UnitTestFunctionType {
+@@ -2236,7 +2188,7 @@ typedef struct CheckParameterEvent {
+     SourceLocation location;
+     const char *parameter_name;
+     CheckParameterValue check_value;
+-    LargestIntegralType check_value_data;
++    uintmax_t check_value_data;
+ } CheckParameterEvent;
+ 
+ /* Used by expect_assert_failure() and mock_assert(). */
+@@ -2245,7 +2197,7 @@ extern jmp_buf global_expect_assert_env;
+ extern const char * global_last_failed_assert;
+ 
+ /* Retrieves a value for the given function, as set by "will_return". */
+-LargestIntegralType _mock(const char * const function, const char* const file,
++uintmax_t _mock(const char * const function, const char* const file,
+                           const int line);
+ 
+ void _expect_function_call(
+@@ -2261,36 +2213,36 @@ void _expect_check(
+     const char* const function, const char* const parameter,
+     const char* const file, const int line,
+     const CheckParameterValue check_function,
+-    const LargestIntegralType check_data, CheckParameterEvent * const event,
++    const uintmax_t check_data, CheckParameterEvent * const event,
+     const int count);
+ 
+ void _expect_in_set(
+     const char* const function, const char* const parameter,
+-    const char* const file, const int line, const LargestIntegralType values[],
++    const char* const file, const int line, const uintmax_t values[],
+     const size_t number_of_values, const int count);
+ void _expect_not_in_set(
+     const char* const function, const char* const parameter,
+-    const char* const file, const int line, const LargestIntegralType values[],
++    const char* const file, const int line, const uintmax_t values[],
+     const size_t number_of_values, const int count);
+ 
+ void _expect_in_range(
+     const char* const function, const char* const parameter,
+     const char* const file, const int line,
+-    const LargestIntegralType minimum,
+-    const LargestIntegralType maximum, const int count);
++    const uintmax_t minimum,
++    const uintmax_t maximum, const int count);
+ void _expect_not_in_range(
+     const char* const function, const char* const parameter,
+     const char* const file, const int line,
+-    const LargestIntegralType minimum,
+-    const LargestIntegralType maximum, const int count);
++    const uintmax_t minimum,
++    const uintmax_t maximum, const int count);
+ 
+ void _expect_value(
+     const char* const function, const char* const parameter,
+-    const char* const file, const int line, const LargestIntegralType value,
++    const char* const file, const int line, const uintmax_t value,
+     const int count);
+ void _expect_not_value(
+     const char* const function, const char* const parameter,
+-    const char* const file, const int line, const LargestIntegralType value,
++    const char* const file, const int line, const uintmax_t value,
+     const int count);
+ 
+ void _expect_string(
+@@ -2317,17 +2269,17 @@ void _expect_any(
+ 
+ void _check_expected(
+     const char * const function_name, const char * const parameter_name,
+-    const char* file, const int line, const LargestIntegralType value);
++    const char* file, const int line, const uintmax_t value);
+ 
+ void _will_return(const char * const function_name, const char * const file,
+-                  const int line, const LargestIntegralType value,
++                  const int line, const uintmax_t value,
+                   const int count);
+-void _assert_true(const LargestIntegralType result,
++void _assert_true(const uintmax_t result,
+                   const char* const expression,
+                   const char * const file, const int line);
+-void _assert_return_code(const LargestIntegralType result,
++void _assert_return_code(const uintmax_t result,
+                          size_t rlen,
+-                         const LargestIntegralType error,
++                         const uintmax_t error,
+                          const char * const expression,
+                          const char * const file,
+                          const int line);
+@@ -2344,10 +2296,10 @@ void _assert_double_not_equal(const double a, const double n,
+ 		const double epsilon, const char* const file,
+ 		const int line);
+ void _assert_int_equal(
+-    const LargestIntegralType a, const LargestIntegralType b,
++    const uintmax_t a, const uintmax_t b,
+     const char * const file, const int line);
+ void _assert_int_not_equal(
+-    const LargestIntegralType a, const LargestIntegralType b,
++    const uintmax_t a, const uintmax_t b,
+     const char * const file, const int line);
+ void _assert_string_equal(const char * const a, const char * const b,
+                           const char * const file, const int line);
+@@ -2360,16 +2312,16 @@ void _assert_memory_not_equal(const void * const a, const void * const b,
+                               const size_t size, const char* const file,
+                               const int line);
+ void _assert_in_range(
+-    const LargestIntegralType value, const LargestIntegralType minimum,
+-    const LargestIntegralType maximum, const char* const file, const int line);
++    const uintmax_t value, const uintmax_t minimum,
++    const uintmax_t maximum, const char* const file, const int line);
+ void _assert_not_in_range(
+-    const LargestIntegralType value, const LargestIntegralType minimum,
+-    const LargestIntegralType maximum, const char* const file, const int line);
++    const uintmax_t value, const uintmax_t minimum,
++    const uintmax_t maximum, const char* const file, const int line);
+ void _assert_in_set(
+-    const LargestIntegralType value, const LargestIntegralType values[],
++    const uintmax_t value, const uintmax_t values[],
+     const size_t number_of_values, const char* const file, const int line);
+ void _assert_not_in_set(
+-    const LargestIntegralType value, const LargestIntegralType values[],
++    const uintmax_t value, const uintmax_t values[],
+     const size_t number_of_values, const char* const file, const int line);
+ 
+ void* _test_malloc(const size_t size, const char* file, const int line);
+diff --git a/src/cmocka.c b/src/cmocka.c
+index 52897e1..62d4284 100644
+--- a/src/cmocka.c
++++ b/src/cmocka.c
+@@ -1,6 +1,6 @@
+ /*
+  * Copyright 2008 Google Inc.
+- * Copyright 2014-2018 Andreas Schneider <asn@cryptomilk.org>
++ * Copyright 2014-2020 Andreas Schneider <asn@cryptomilk.org>
+  * Copyright 2015      Jakub Hrozek <jakub.hrozek@posteo.se>
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License");
+@@ -111,14 +111,14 @@
+ 
+ 
+ /*
+- * Declare and initialize a LargestIntegralType variable name
++ * Declare and initialize a uintmax_t variable name
+  * with value the conversion of ptr.
+  */
+ #define declare_initialize_value_pointer_pointer(name, ptr) \
+-    LargestIntegralType name ; \
+-    name = (LargestIntegralType) (uintptr_t) ptr
++    uintmax_t name ; \
++    name = (uintmax_t)((uintptr_t)(ptr))
+ 
+-/* Cast a LargestIntegralType to pointer_type. */
++/* Cast a uintmax_t to pointer_type. */
+ #define cast_largest_integral_type_to_pointer( \
+     pointer_type, largest_integral_type) \
+     ((pointer_type)(uintptr_t)(largest_integral_type))
+@@ -158,7 +158,7 @@ typedef int (*EqualityFunction)(const void *left, const void *right);
+ /* Value of a symbol and the place it was declared. */
+ typedef struct SymbolValue {
+     SourceLocation location;
+-    LargestIntegralType value;
++    uintmax_t value;
+ } SymbolValue;
+ 
+ /*
+@@ -183,14 +183,14 @@ typedef void (*CleanupListValue)(const void *value, void *cleanup_value_data);
+ /* Structure used to check the range of integer types.a */
+ typedef struct CheckIntegerRange {
+     CheckParameterEvent event;
+-    LargestIntegralType minimum;
+-    LargestIntegralType maximum;
++    uintmax_t minimum;
++    uintmax_t maximum;
+ } CheckIntegerRange;
+ 
+ /* Structure used to check whether an integer value is in a set. */
+ typedef struct CheckIntegerSet {
+     CheckParameterEvent event;
+-    const LargestIntegralType *set;
++    const uintmax_t *set;
+     size_t size_of_set;
+ } CheckIntegerSet;
+ 
+@@ -702,7 +702,7 @@ static void free_value(const void *value, void *cleanup_value_data) {
+ static void free_symbol_map_value(const void *value,
+                                   void *cleanup_value_data) {
+     SymbolMapValue * const map_value = (SymbolMapValue*)value;
+-    const LargestIntegralType children = cast_ptr_to_largest_integral_type(cleanup_value_data);
++    const uintmax_t children = cast_ptr_to_largest_integral_type(cleanup_value_data);
+     assert_non_null(value);
+     if (children == 0) {
+         list_free(&map_value->symbol_values_list_head,
+@@ -947,14 +947,14 @@ static size_t check_for_leftover_values(
+ 
+ 
+ /* Get the next return value for the specified mock function. */
+-LargestIntegralType _mock(const char * const function, const char* const file,
++uintmax_t _mock(const char * const function, const char* const file,
+                           const int line) {
+     void *result;
+     const int rc = get_symbol_value(&global_function_result_map_head,
+                                     &function, 1, &result);
+     if (rc) {
+         SymbolValue * const symbol = (SymbolValue*)result;
+-        const LargestIntegralType value = symbol->value;
++        const uintmax_t value = symbol->value;
+         global_last_mock_value_location = symbol->location;
+         if (rc == 1) {
+             free(symbol);
+@@ -1055,7 +1055,7 @@ void _function_called(const char *const function,
+ 
+ /* Add a return value for the specified mock function name. */
+ void _will_return(const char * const function_name, const char * const file,
+-                  const int line, const LargestIntegralType value,
++                  const int line, const uintmax_t value,
+                   const int count) {
+     SymbolValue * const return_value =
+         (SymbolValue*)malloc(sizeof(*return_value));
+@@ -1077,7 +1077,7 @@ void _expect_check(
+         const char* const function, const char* const parameter,
+         const char* const file, const int line,
+         const CheckParameterValue check_function,
+-        const LargestIntegralType check_data,
++        const uintmax_t check_data,
+         CheckParameterEvent * const event, const int count) {
+     CheckParameterEvent * const check =
+         event ? event : (CheckParameterEvent*)malloc(sizeof(*check));
+@@ -1241,8 +1241,8 @@ static int double_values_not_equal_display_error(const double left,
+ 
+ /* Returns 1 if the specified values are equal.  If the values are not equal
+  * an error is displayed and 0 is returned. */
+-static int values_equal_display_error(const LargestIntegralType left,
+-                                      const LargestIntegralType right) {
++static int values_equal_display_error(const uintmax_t left,
++                                      const uintmax_t right) {
+     const int equal = left == right;
+     if (!equal) {
+         cm_print_error(LargestIntegralTypePrintfFormat " != "
+@@ -1254,8 +1254,8 @@ static int values_equal_display_error(const LargestIntegralType left,
+ /*
+  * Returns 1 if the specified values are not equal.  If the values are equal
+  * an error is displayed and 0 is returned. */
+-static int values_not_equal_display_error(const LargestIntegralType left,
+-                                          const LargestIntegralType right) {
++static int values_not_equal_display_error(const uintmax_t left,
++                                          const uintmax_t right) {
+     const int not_equal = left != right;
+     if (!not_equal) {
+         cm_print_error(LargestIntegralTypePrintfFormat " == "
+@@ -1273,12 +1273,12 @@ static int values_not_equal_display_error(const LargestIntegralType left,
+  * displayed.
+  */
+ static int value_in_set_display_error(
+-        const LargestIntegralType value,
++        const uintmax_t value,
+         const CheckIntegerSet * const check_integer_set, const int invert) {
+     int succeeded = invert;
+     assert_non_null(check_integer_set);
+     {
+-        const LargestIntegralType * const set = check_integer_set->set;
++        const uintmax_t * const set = check_integer_set->set;
+         const size_t size_of_set = check_integer_set->size_of_set;
+         size_t i;
+         for (i = 0; i < size_of_set; i++) {
+@@ -1310,8 +1310,8 @@ static int value_in_set_display_error(
+  * specified range an error is displayed and 0 is returned.
+  */
+ static int integer_in_range_display_error(
+-        const LargestIntegralType value, const LargestIntegralType range_min,
+-        const LargestIntegralType range_max) {
++        const uintmax_t value, const uintmax_t range_min,
++        const uintmax_t range_max) {
+     if (value >= range_min && value <= range_max) {
+         return 1;
+     }
+@@ -1330,8 +1330,8 @@ static int integer_in_range_display_error(
+  * specified range an error is displayed and zero is returned.
+  */
+ static int integer_not_in_range_display_error(
+-        const LargestIntegralType value, const LargestIntegralType range_min,
+-        const LargestIntegralType range_max) {
++        const uintmax_t value, const uintmax_t range_min,
++        const uintmax_t range_max) {
+     if (value < range_min || value > range_max) {
+         return 1;
+     }
+@@ -1431,8 +1431,8 @@ static int memory_not_equal_display_error(
+ 
+ 
+ /* CheckParameterValue callback to check whether a value is within a set. */
+-static int check_in_set(const LargestIntegralType value,
+-                        const LargestIntegralType check_value_data) {
++static int check_in_set(const uintmax_t value,
++                        const uintmax_t check_value_data) {
+     return value_in_set_display_error(value,
+         cast_largest_integral_type_to_pointer(CheckIntegerSet*,
+                                               check_value_data), 0);
+@@ -1440,8 +1440,8 @@ static int check_in_set(const LargestIntegralType value,
+ 
+ 
+ /* CheckParameterValue callback to check whether a value isn't within a set. */
+-static int check_not_in_set(const LargestIntegralType value,
+-                            const LargestIntegralType check_value_data) {
++static int check_not_in_set(const uintmax_t value,
++                            const uintmax_t check_value_data) {
+     return value_in_set_display_error(value,
+         cast_largest_integral_type_to_pointer(CheckIntegerSet*,
+                                               check_value_data), 1);
+@@ -1453,12 +1453,12 @@ static int check_not_in_set(const LargestIntegralType value,
+ static void expect_set(
+         const char* const function, const char* const parameter,
+         const char* const file, const int line,
+-        const LargestIntegralType values[], const size_t number_of_values,
++        const uintmax_t values[], const size_t number_of_values,
+         const CheckParameterValue check_function, const int count) {
+     CheckIntegerSet * const check_integer_set =
+         (CheckIntegerSet*)malloc(sizeof(*check_integer_set) +
+                (sizeof(values[0]) * number_of_values));
+-    LargestIntegralType * const set = (LargestIntegralType*)(
++    uintmax_t * const set = (uintmax_t*)(
+         check_integer_set + 1);
+     declare_initialize_value_pointer_pointer(check_data, check_integer_set);
+     assert_non_null(values);
+@@ -1476,7 +1476,7 @@ static void expect_set(
+ void _expect_in_set(
+         const char* const function, const char* const parameter,
+         const char* const file, const int line,
+-        const LargestIntegralType values[], const size_t number_of_values,
++        const uintmax_t values[], const size_t number_of_values,
+         const int count) {
+     expect_set(function, parameter, file, line, values, number_of_values,
+                check_in_set, count);
+@@ -1487,7 +1487,7 @@ void _expect_in_set(
+ void _expect_not_in_set(
+         const char* const function, const char* const parameter,
+         const char* const file, const int line,
+-        const LargestIntegralType values[], const size_t number_of_values,
++        const uintmax_t values[], const size_t number_of_values,
+         const int count) {
+     expect_set(function, parameter, file, line, values, number_of_values,
+                check_not_in_set, count);
+@@ -1495,8 +1495,8 @@ void _expect_not_in_set(
+ 
+ 
+ /* CheckParameterValue callback to check whether a value is within a range. */
+-static int check_in_range(const LargestIntegralType value,
+-                          const LargestIntegralType check_value_data) {
++static int check_in_range(const uintmax_t value,
++                          const uintmax_t check_value_data) {
+     CheckIntegerRange * const check_integer_range =
+         cast_largest_integral_type_to_pointer(CheckIntegerRange*,
+                                               check_value_data);
+@@ -1507,8 +1507,8 @@ static int check_in_range(const LargestIntegralType value,
+ 
+ 
+ /* CheckParameterValue callback to check whether a value is not within a range. */
+-static int check_not_in_range(const LargestIntegralType value,
+-                              const LargestIntegralType check_value_data) {
++static int check_not_in_range(const uintmax_t value,
++                              const uintmax_t check_value_data) {
+     CheckIntegerRange * const check_integer_range =
+         cast_largest_integral_type_to_pointer(CheckIntegerRange*,
+                                               check_value_data);
+@@ -1523,7 +1523,7 @@ static int check_not_in_range(const LargestIntegralType value,
+ static void expect_range(
+         const char* const function, const char* const parameter,
+         const char* const file, const int line,
+-        const LargestIntegralType minimum, const LargestIntegralType maximum,
++        const uintmax_t minimum, const uintmax_t maximum,
+         const CheckParameterValue check_function, const int count) {
+     CheckIntegerRange * const check_integer_range =
+         (CheckIntegerRange*)malloc(sizeof(*check_integer_range));
+@@ -1539,7 +1539,7 @@ static void expect_range(
+ void _expect_in_range(
+         const char* const function, const char* const parameter,
+         const char* const file, const int line,
+-        const LargestIntegralType minimum, const LargestIntegralType maximum,
++        const uintmax_t minimum, const uintmax_t maximum,
+         const int count) {
+     expect_range(function, parameter, file, line, minimum, maximum,
+                  check_in_range, count);
+@@ -1550,7 +1550,7 @@ void _expect_in_range(
+ void _expect_not_in_range(
+         const char* const function, const char* const parameter,
+         const char* const file, const int line,
+-        const LargestIntegralType minimum, const LargestIntegralType maximum,
++        const uintmax_t minimum, const uintmax_t maximum,
+         const int count) {
+     expect_range(function, parameter, file, line, minimum, maximum,
+                  check_not_in_range, count);
+@@ -1559,8 +1559,8 @@ void _expect_not_in_range(
+ 
+ /* CheckParameterValue callback to check whether a value is equal to an
+  * expected value. */
+-static int check_value(const LargestIntegralType value,
+-                       const LargestIntegralType check_value_data) {
++static int check_value(const uintmax_t value,
++                       const uintmax_t check_value_data) {
+     return values_equal_display_error(value, check_value_data);
+ }
+ 
+@@ -1569,7 +1569,7 @@ static int check_value(const LargestIntegralType value,
+ void _expect_value(
+         const char* const function, const char* const parameter,
+         const char* const file, const int line,
+-        const LargestIntegralType value, const int count) {
++        const uintmax_t value, const int count) {
+     _expect_check(function, parameter, file, line, check_value, value, NULL,
+                   count);
+ }
+@@ -1577,8 +1577,8 @@ void _expect_value(
+ 
+ /* CheckParameterValue callback to check whether a value is not equal to an
+  * expected value. */
+-static int check_not_value(const LargestIntegralType value,
+-                           const LargestIntegralType check_value_data) {
++static int check_not_value(const uintmax_t value,
++                           const uintmax_t check_value_data) {
+     return values_not_equal_display_error(value, check_value_data);
+ }
+ 
+@@ -1587,15 +1587,15 @@ static int check_not_value(const LargestIntegralType value,
+ void _expect_not_value(
+         const char* const function, const char* const parameter,
+         const char* const file, const int line,
+-        const LargestIntegralType value, const int count) {
++        const uintmax_t value, const int count) {
+     _expect_check(function, parameter, file, line, check_not_value, value,
+                   NULL, count);
+ }
+ 
+ 
+ /* CheckParameterValue callback to check whether a parameter equals a string. */
+-static int check_string(const LargestIntegralType value,
+-                        const LargestIntegralType check_value_data) {
++static int check_string(const uintmax_t value,
++                        const uintmax_t check_value_data) {
+     return string_equal_display_error(
+         cast_largest_integral_type_to_pointer(char*, value),
+         cast_largest_integral_type_to_pointer(char*, check_value_data));
+@@ -1616,8 +1616,8 @@ void _expect_string(
+ 
+ /* CheckParameterValue callback to check whether a parameter is not equals to
+  * a string. */
+-static int check_not_string(const LargestIntegralType value,
+-                            const LargestIntegralType check_value_data) {
++static int check_not_string(const uintmax_t value,
++                            const uintmax_t check_value_data) {
+     return string_not_equal_display_error(
+         cast_largest_integral_type_to_pointer(char*, value),
+         cast_largest_integral_type_to_pointer(char*, check_value_data));
+@@ -1637,8 +1637,8 @@ void _expect_not_string(
+ 
+ /* CheckParameterValue callback to check whether a parameter equals an area of
+  * memory. */
+-static int check_memory(const LargestIntegralType value,
+-                        const LargestIntegralType check_value_data) {
++static int check_memory(const uintmax_t value,
++                        const uintmax_t check_value_data) {
+     CheckMemoryData * const check = cast_largest_integral_type_to_pointer(
+         CheckMemoryData*, check_value_data);
+     assert_non_null(check);
+@@ -1681,8 +1681,8 @@ void _expect_memory(
+ 
+ /* CheckParameterValue callback to check whether a parameter is not equal to
+  * an area of memory. */
+-static int check_not_memory(const LargestIntegralType value,
+-                            const LargestIntegralType check_value_data) {
++static int check_not_memory(const uintmax_t value,
++                            const uintmax_t check_value_data) {
+     CheckMemoryData * const check = cast_largest_integral_type_to_pointer(
+         CheckMemoryData*, check_value_data);
+     assert_non_null(check);
+@@ -1704,8 +1704,8 @@ void _expect_not_memory(
+ 
+ 
+ /* CheckParameterValue callback that always returns 1. */
+-static int check_any(const LargestIntegralType value,
+-                     const LargestIntegralType check_value_data) {
++static int check_any(const uintmax_t value,
++                     const uintmax_t check_value_data) {
+     (void)value;
+     (void)check_value_data;
+     return 1;
+@@ -1723,7 +1723,7 @@ void _expect_any(
+ 
+ void _check_expected(
+         const char * const function_name, const char * const parameter_name,
+-        const char* file, const int line, const LargestIntegralType value) {
++        const char* file, const int line, const uintmax_t value) {
+     void *result = NULL;
+     const char* symbols[] = {function_name, parameter_name};
+     const int rc = get_symbol_value(&global_function_parameter_map_head,
+@@ -1780,7 +1780,7 @@ void mock_assert(const int result, const char* const expression,
+ }
+ 
+ 
+-void _assert_true(const LargestIntegralType result,
++void _assert_true(const uintmax_t result,
+                   const char * const expression,
+                   const char * const file, const int line) {
+     if (!result) {
+@@ -1789,14 +1789,14 @@ void _assert_true(const LargestIntegralType result,
+     }
+ }
+ 
+-void _assert_return_code(const LargestIntegralType result,
++void _assert_return_code(const uintmax_t result,
+                          size_t rlen,
+-                         const LargestIntegralType error,
++                         const uintmax_t error,
+                          const char * const expression,
+                          const char * const file,
+                          const int line)
+ {
+-    LargestIntegralType valmax;
++    uintmax_t valmax;
+ 
+ 
+     switch (rlen) {
+@@ -1872,7 +1872,7 @@ void _assert_double_not_equal(const double a,
+ }
+ 
+ void _assert_int_equal(
+-        const LargestIntegralType a, const LargestIntegralType b,
++        const uintmax_t a, const uintmax_t b,
+         const char * const file, const int line) {
+     if (!values_equal_display_error(a, b)) {
+         _fail(file, line);
+@@ -1881,7 +1881,7 @@ void _assert_int_equal(
+ 
+ 
+ void _assert_int_not_equal(
+-        const LargestIntegralType a, const LargestIntegralType b,
++        const uintmax_t a, const uintmax_t b,
+         const char * const file, const int line) {
+     if (!values_not_equal_display_error(a, b)) {
+         _fail(file, line);
+@@ -1925,8 +1925,8 @@ void _assert_memory_not_equal(const void * const a, const void * const b,
+ 
+ 
+ void _assert_in_range(
+-        const LargestIntegralType value, const LargestIntegralType minimum,
+-        const LargestIntegralType maximum, const char* const file,
++        const uintmax_t value, const uintmax_t minimum,
++        const uintmax_t maximum, const char* const file,
+         const int line) {
+     if (!integer_in_range_display_error(value, minimum, maximum)) {
+         _fail(file, line);
+@@ -1934,16 +1934,16 @@ void _assert_in_range(
+ }
+ 
+ void _assert_not_in_range(
+-        const LargestIntegralType value, const LargestIntegralType minimum,
+-        const LargestIntegralType maximum, const char* const file,
++        const uintmax_t value, const uintmax_t minimum,
++        const uintmax_t maximum, const char* const file,
+         const int line) {
+     if (!integer_not_in_range_display_error(value, minimum, maximum)) {
+         _fail(file, line);
+     }
+ }
+ 
+-void _assert_in_set(const LargestIntegralType value,
+-                    const LargestIntegralType values[],
++void _assert_in_set(const uintmax_t value,
++                    const uintmax_t values[],
+                     const size_t number_of_values, const char* const file,
+                     const int line) {
+     CheckIntegerSet check_integer_set;
+@@ -1954,8 +1954,8 @@ void _assert_in_set(const LargestIntegralType value,
+     }
+ }
+ 
+-void _assert_not_in_set(const LargestIntegralType value,
+-                        const LargestIntegralType values[],
++void _assert_not_in_set(const uintmax_t value,
++                        const uintmax_t values[],
+                         const size_t number_of_values, const char* const file,
+                         const int line) {
+     CheckIntegerSet check_integer_set;
+@@ -3079,8 +3079,8 @@ int _cmocka_run_group_tests(const char *group_name,
+     size_t i;
+     int rc;
+ 
+-    /* Make sure LargestIntegralType is at least the size of a pointer. */
+-    assert_true(sizeof(LargestIntegralType) >= sizeof(void*));
++    /* Make sure uintmax_t is at least the size of a pointer. */
++    assert_true(sizeof(uintmax_t) >= sizeof(void*));
+ 
+     cm_tests = libc_calloc(1, sizeof(struct CMUnitTestState) * num_tests);
+     if (cm_tests == NULL) {
+@@ -3370,8 +3370,8 @@ int _run_tests(const UnitTest * const tests, const size_t number_of_tests) {
+     print_message("[==========] Running %"PRIdS " test(s).\n",
+                   number_of_tests - setups - teardowns);
+ 
+-    /* Make sure LargestIntegralType is at least the size of a pointer. */
+-    assert_true(sizeof(LargestIntegralType) >= sizeof(void*));
++    /* Make sure uintmax_t is at least the size of a pointer. */
++    assert_true(sizeof(uintmax_t) >= sizeof(void*));
+ 
+     while (current_test < number_of_tests) {
+         const ListNode *test_check_point = NULL;
+diff --git a/tests/test_alloc.c b/tests/test_alloc.c
+index 966814a..3948084 100644
+--- a/tests/test_alloc.c
++++ b/tests/test_alloc.c
+@@ -3,6 +3,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ #include <cmocka_private.h>
+ 
+diff --git a/tests/test_assert_macros.c b/tests/test_assert_macros.c
+index 1a00880..3a7a0fe 100644
+--- a/tests/test_assert_macros.c
++++ b/tests/test_assert_macros.c
+@@ -3,6 +3,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ #include <cmocka_private.h>
+ 
+diff --git a/tests/test_assert_macros_fail.c b/tests/test_assert_macros_fail.c
+index aea919a..fc354d4 100644
+--- a/tests/test_assert_macros_fail.c
++++ b/tests/test_assert_macros_fail.c
+@@ -3,6 +3,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ #include <cmocka_private.h>
+ 
+diff --git a/tests/test_basics.c b/tests/test_basics.c
+index 1bb493f..9866d81 100644
+--- a/tests/test_basics.c
++++ b/tests/test_basics.c
+@@ -20,6 +20,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ 
+ static int setup(void **state) {
+diff --git a/tests/test_cmockery.c b/tests/test_cmockery.c
+index 83a7451..027b1ac 100644
+--- a/tests/test_cmockery.c
++++ b/tests/test_cmockery.c
+@@ -17,6 +17,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmockery/cmockery.h>
+ 
+ /* A test case that does nothing and succeeds. */
+diff --git a/tests/test_double_macros.c b/tests/test_double_macros.c
+index 138c579..b892272 100644
+--- a/tests/test_double_macros.c
++++ b/tests/test_double_macros.c
+@@ -20,6 +20,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ 
+ /* A test case that does check if double is equal. */
+diff --git a/tests/test_exception_handler.c b/tests/test_exception_handler.c
+index 23c19cd..769eed8 100644
+--- a/tests/test_exception_handler.c
++++ b/tests/test_exception_handler.c
+@@ -1,6 +1,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ 
+ #include <signal.h>
+diff --git a/tests/test_fixtures.c b/tests/test_fixtures.c
+index 6d39487..e6d05d1 100644
+--- a/tests/test_fixtures.c
++++ b/tests/test_fixtures.c
+@@ -1,6 +1,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ 
+ #include <stdlib.h>
+diff --git a/tests/test_float_macros.c b/tests/test_float_macros.c
+index a9c7251..6ce8906 100644
+--- a/tests/test_float_macros.c
++++ b/tests/test_float_macros.c
+@@ -20,6 +20,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ 
+ /* A test case that does check if float is equal. */
+diff --git a/tests/test_group_fixtures.c b/tests/test_group_fixtures.c
+index 64f0ab7..e9b4ad3 100644
+--- a/tests/test_group_fixtures.c
++++ b/tests/test_group_fixtures.c
+@@ -4,6 +4,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ 
+ static int group_setup(void **state)
+diff --git a/tests/test_group_setup_assert.c b/tests/test_group_setup_assert.c
+index eef61f8..92f88b6 100644
+--- a/tests/test_group_setup_assert.c
++++ b/tests/test_group_setup_assert.c
+@@ -4,6 +4,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ 
+ static int group_setup_failing(void **state)
+diff --git a/tests/test_group_setup_fail.c b/tests/test_group_setup_fail.c
+index 7815c03..1f2e701 100644
+--- a/tests/test_group_setup_fail.c
++++ b/tests/test_group_setup_fail.c
+@@ -4,6 +4,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ 
+ static int group_setup_failing(void **state)
+diff --git a/tests/test_groups.c b/tests/test_groups.c
+index af9e2b8..ea936c0 100644
+--- a/tests/test_groups.c
++++ b/tests/test_groups.c
+@@ -20,6 +20,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ 
+ static int setup(void **state) {
+diff --git a/tests/test_ordering.c b/tests/test_ordering.c
+index 817c0ba..fab2568 100644
+--- a/tests/test_ordering.c
++++ b/tests/test_ordering.c
+@@ -3,6 +3,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ #include <cmocka_private.h>
+ 
+diff --git a/tests/test_ordering_fail.c b/tests/test_ordering_fail.c
+index 652f5ad..88b4e29 100644
+--- a/tests/test_ordering_fail.c
++++ b/tests/test_ordering_fail.c
+@@ -3,6 +3,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ #include <cmocka_private.h>
+ 
+diff --git a/tests/test_returns.c b/tests/test_returns.c
+index b9370c9..574fa00 100644
+--- a/tests/test_returns.c
++++ b/tests/test_returns.c
+@@ -3,6 +3,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ #include <cmocka_private.h>
+ 
+diff --git a/tests/test_returns_fail.c b/tests/test_returns_fail.c
+index 81197d3..fa7f291 100644
+--- a/tests/test_returns_fail.c
++++ b/tests/test_returns_fail.c
+@@ -3,6 +3,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ #include <cmocka_private.h>
+ 
+diff --git a/tests/test_setup_fail.c b/tests/test_setup_fail.c
+index e3f8df8..9affaa6 100644
+--- a/tests/test_setup_fail.c
++++ b/tests/test_setup_fail.c
+@@ -3,6 +3,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ 
+ static int setup_fail(void **state) {
+diff --git a/tests/test_skip.c b/tests/test_skip.c
+index 127161a..0a6953d 100644
+--- a/tests/test_skip.c
++++ b/tests/test_skip.c
+@@ -17,6 +17,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ 
+ /* A test case that does check if an int is equal. */
+diff --git a/tests/test_skip_filter.c b/tests/test_skip_filter.c
+index e40209e..56dc262 100644
+--- a/tests/test_skip_filter.c
++++ b/tests/test_skip_filter.c
+@@ -19,6 +19,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ 
+ static void test_skip1(void **state)
+diff --git a/tests/test_strmatch.c b/tests/test_strmatch.c
+index f2d966b..f8d088c 100644
+--- a/tests/test_strmatch.c
++++ b/tests/test_strmatch.c
+@@ -19,6 +19,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
+ 
+ #include "../src/cmocka.c"
+diff --git a/tests/test_wildcard.c b/tests/test_wildcard.c
+index 10ee195..3b85bb3 100644
+--- a/tests/test_wildcard.c
++++ b/tests/test_wildcard.c
+@@ -17,6 +17,7 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <setjmp.h>
++#include <stdint.h>
+ #include <cmocka.h>
  
- #ifdef DOXYGEN
+ static void test_ok1(void **state)
diff --git a/main/cmph/APKBUILD b/main/cmph/APKBUILD
index 74a20752f7f..f51d564c8ba 100644
--- a/main/cmph/APKBUILD
+++ b/main/cmph/APKBUILD
@@ -1,16 +1,20 @@
-# Maintainer:  Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=cmph
 pkgver=2.0.2
-pkgrel=0
+pkgrel=5
 pkgdesc="A minimal hash C library - utility application"
-url="http://cmph.sourceforge.net/"
+url="https://cmph.sourceforge.net/"
 arch="all"
-license="LGPL-2.0-or-later MPL-1.1"
+license="LGPL-2.0-or-later AND MPL-1.1"
 subpackages="$pkgname-dev $pkgname-doc libcmph:lib"
 source="https://downloads.sourceforge.net/cmph/cmph-$pkgver.tar.gz"
 
+prepare() {
+ 	default_prepare
+ 	update_config_sub
+}
+
 build() {
-	cd "$builddir"
 	./configure \
 		--disable-static \
 		--build=$CBUILD \
@@ -23,12 +27,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/cogl/17.patch b/main/cogl/17.patch
deleted file mode 100644
index e683ae442fb..00000000000
--- a/main/cogl/17.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Upstream: Yes, https://gitlab.gnome.org/GNOME/cogl/-/merge_requests/17
-
-From 9c4764224aded552fb855b1c2b85b26d2b894adf Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Tue, 29 Oct 2019 18:17:51 +0300
-Subject: [PATCH] Fix building against libglvnd-provided EGL headers
-
-Add missing EGL/eglmesaext.h include. When building against mesa-provided
-headers, this header is included indirectly via EGL/eglext.h.
-
-Also fix typo COGL_EGL_INCLUDE -> COGL_EGL_INCLUDES
----
- configure.ac | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index da188edd..b0b0c94d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -670,10 +670,15 @@ AS_IF([test "x$enable_gles1" = "xyes"],
-             AC_SUBST([COGL_EGL_INCLUDES])
- 
-             AC_CHECK_HEADERS([EGL/eglext.h],
--                             [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE
-+                             [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
- #include <EGL/eglext.h>"],
-                              [],
-                              [$COGL_EGL_INCLUDES])
-+            AC_CHECK_HEADERS([EGL/eglmesaext.h],
-+                             [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
-+#include <EGL/eglmesaext.h>"],
-+                             [],
-+                             [$COGL_EGL_INCLUDES])
- 
-             # Check for a GLES 1.x Common Profile library with/without EGL.
-             #
-@@ -1178,6 +1183,12 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
-               [],
-               [AC_MSG_ERROR([Unable to locate required EGL headers])],
-               [#include <EGL/egl.h>])
-+            AC_CHECK_HEADERS(
-+              [EGL/eglmesaext.h],
-+              [],
-+              [AC_MSG_ERROR([Unable to locate required EGL headers])],
-+              [#include <EGL/egl.h>
-+#include <EGL/eglext.h>])
- 
-             AC_CHECK_LIB(EGL, [eglInitialize],
-               [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"],
-@@ -1188,7 +1199,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
-           )
- 
-         COGL_EGL_INCLUDES="#include <EGL/egl.h>
--#include <EGL/eglext.h>"
-+#include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>"
-         AC_SUBST([COGL_EGL_INCLUDES])
-       ])
- 
--- 
-2.24.1
-
diff --git a/main/cogl/APKBUILD b/main/cogl/APKBUILD
deleted file mode 100644
index 8245fe3385d..00000000000
--- a/main/cogl/APKBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# Contributor: Rasmus Thomsen <oss@cogitri.dev>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
-pkgname=cogl
-pkgver=1.22.6
-pkgrel=0
-pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
-options="!check" # All tests fail for unknown reasons
-url="https://gitlab.gnome.org/GNOME/cogl"
-arch="all"
-license="MIT"
-makedepends="
-	automake
-	autoconf
-	libtool
-	libxcomposite-dev
-	libxrandr-dev
-	mesa-dev
-	gdk-pixbuf-dev
-	wayland-dev
-	pango-dev
-	cairo-dev
-	gobject-introspection-dev
-	gtk-doc
-	"
-#	gstreamer-dev
-#	gst-plugins-base-dev
-#	"
-subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.gnome.org/sources/cogl/${pkgver%.*}/cogl-$pkgver.tar.xz
-	17.patch"
-
-prepare() {
-	default_prepare
-
-	autoreconf -fi
-}
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--enable-gles2 \
-		--disable-gles1 \
-		--enable-kms-egl-platform \
-		--enable-gl \
-		--enable-gdk-pixbuf \
-		--enable-introspection \
-		--enable-cairo \
-		--enable-wayland-egl-platform \
-		--enable-wayland-egl-server
-	make -j1 # fails to link cogl-gst into itself otherwise...
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="b3475fa4fff3b6725f643b0d17d2de242fce1503cd83bd18031d98495501917bf5173152fb1aba7f2614fcf6553029fbb6f26bda5a497f5f12e2849ed301a483  cogl-1.22.6.tar.xz
-5320cfe16eaa419aac155d86f77826076b3dfe3a018d7173220c35ba2f1a4f15254bab7336229349aa25e708f0792132572d166de5745992a4e98f662b6df0fc  17.patch"
diff --git a/main/command-not-found/APKBUILD b/main/command-not-found/APKBUILD
index 137947fdc51..da8e136add6 100644
--- a/main/command-not-found/APKBUILD
+++ b/main/command-not-found/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ariadne Conill <ariadne@dereferenced.org>
 pkgname=command-not-found
 pkgver=0.3
-pkgrel=0
+pkgrel=1
 pkgdesc="friendly command not found handling"
 url="https://github.com/kaniini/command-not-found"
 arch="noarch"
diff --git a/main/compat-pvgrub/APKBUILD b/main/compat-pvgrub/APKBUILD
index 0b46906f38e..01ec5c75465 100644
--- a/main/compat-pvgrub/APKBUILD
+++ b/main/compat-pvgrub/APKBUILD
@@ -1,25 +1,19 @@
-# Contributor: 
-# Maintainer: 
+# Contributor:
+# Maintainer:
 pkgname=compat-pvgrub
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="compatibility support for PV-GRUB 1.x"
 url="https://www.alpinelinux.org/"
 arch="noarch"
 license="ISC"
-depends=""
-depends_dev=""
 makedepends="$depends_dev"
 triggers="compat-pvgrub.trigger=/boot"
-install=""
-subpackages=""
 source="update-pvgrub"
-
-_builddir="$srcdir"
+builddir="$srcdir"
+options="!check"
 
 package() {
-	cd "$_builddir"
-
 	mkdir -p "$pkgdir"/boot/grub "$pkgdir"/sbin
 	touch "$pkgdir"/boot/grub/.keep-compat-pvgrub
 
diff --git a/main/compiler-rt/APKBUILD b/main/compiler-rt/APKBUILD
deleted file mode 100644
index c5e69fa6562..00000000000
--- a/main/compiler-rt/APKBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# Contributor Eric Molitor <eric@molitor.org>
-# Contributor Travis Tilley <ttilley@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=compiler-rt
-# Note: Update together with llvm.
-pkgver=10.0.0
-pkgrel=0
-_llvmver=${pkgver%%.*}
-pkgdesc="LLVM compiler-rt runtime libraries"
-arch="aarch64 armv7 x86 x86_64"
-url="https://llvm.org/"
-license="Apache-2.0"
-makedepends="
-	cmake
-	linux-headers
-	clang
-	llvm-dev>=$_llvmver
-	llvm-static>=$_llvmver
-	ninja
-	python3
-	"
-checkdepends="gtest-dev llvm-test-utils>=$_llvmver"
-subpackages="$pkgname-static"
-options="!check" # Doesn't seem to work with linux ld: /lib/ld-musl-x86_64.so.1: cannot load --version: No such file or directory
-source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/compiler-rt-$pkgver.src.tar.xz
-	https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz"
-builddir="$srcdir/$pkgname-$pkgver.src"
-
-build() {
-	mkdir -p "$builddir"/build
-	cd "$builddir"/build
-
-	# compiler-rt uses llvm intrinsic types for testing
-	# and therefore requires clang
-	# It also needs LLVM source for testing purposes
-	cmake .. \
-		-DCMAKE_C_COMPILER=clang \
-		-DCMAKE_CXX_COMPILER=clang++ \
-		-DCMAKE_BUILD_TYPE=MinSizeRel \
-		-DCMAKE_C_FLAGS_MINSIZEREL_INIT="$CFLAGS" \
-		-DCMAKE_CXX_FLAGS_MINSIZEREL_INIT="$CXXFLAGS" \
-		-DCMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT="$LDFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCOMPILER_RT_INCLUDE_TESTS=ON \
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF \
-		-DCOMPILER_RT_BUILD_XRAY=OFF \
-		-DLLVM_EXTERNAL_LIT="/usr/bin/lit" \
-		-DLLVM_MAIN_SRC_DIR="$srcdir/llvm-$pkgver.src" \
-		-G Ninja
-	ninja
-}
-
-check() {
-	cd "$builddir"/build
-	# remove test that does not work with PaX kernel
-	rm ../test/builtins/Unit/enable_execute_stack_test.c \
-		../test/builtins/Unit/clear_cache_test.c
-	ninja check-compiler-rt
-}
-
-package() {
-	cd "$builddir"/build
-
-	DESTDIR="$pkgdir" ninja install
-
-	cd "$pkgdir"
-
-	mkdir -p usr/lib/clang/$pkgver/lib
-	case "$CARCH" in
-		ppc64le | s390x) ;;
-		*) mv usr/lib/linux usr/lib/clang/$pkgver/lib;;
-	esac
-}
-
-sha512sums="c4a25d1e922a051c78255aec9fd525acbbcaa62cc53161ed6979b21a0d91301d3c2c07ca1b6460f1c4d6656c29373ff0c20d5496955ed0a0b26d7eebbf159ec4  compiler-rt-10.0.0.src.tar.xz
-7dc961aacee3a01ecc002ff2b688a2ef50661856d2abd5ecc90566ffcad7566e4976736cd339ea96592e452cd5a17aaceba9712b2effec805661cca8ff020ee7  llvm-10.0.0.src.tar.xz"
diff --git a/main/confuse/APKBUILD b/main/confuse/APKBUILD
index 05cfeeddf87..7e2d3e8ad31 100644
--- a/main/confuse/APKBUILD
+++ b/main/confuse/APKBUILD
@@ -1,42 +1,41 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=confuse
-pkgver=3.2.2
-pkgrel=0
+pkgver=3.3
+pkgrel=4
 pkgdesc="C library for parsing configuration files"
-url="https://github.com/martinh/libconfuse"
+url="https://github.com/libconfuse/libconfuse"
 arch="all"
-license="BSD"
+license="ISC"
 makedepends="flex bison"
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://github.com/martinh/libconfuse/releases/download/v$pkgver/confuse-$pkgver.tar.xz"
-
-builddir="$srcdir/$pkgname-$pkgver"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
+source="https://github.com/libconfuse/libconfuse/releases/download/v$pkgver/confuse-$pkgver.tar.xz"
 
 # secfixes:
 #   3.2.2-r0:
-#   - CVE-2018-14447
+#     - CVE-2018-14447
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--enable-shared \
+		--enable-static \
 		--disable-nls
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
-
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	install -D -m644 libconfuse.pc "$pkgdir"/usr/lib/pkgconfig/libconfuse.pc
 }
 
-sha512sums="c6baea65e064fe7f2d1bde187c6dcbb7f03c31f5d777cb04576f9cc2d94e9c96b7ee202e030e9a2c7eb619deb240d9e76fb12b3528ae5aa0d3abe231354d12c9  confuse-3.2.2.tar.xz"
+sha512sums="93cc62d98166199315f65a2f6f540a9c0d33592b69a2c6a57fd17f132aecc6ece39b9813b96c9a49ae2b66a99b7eba1188a9ce9e360e1c5fb4b973619e7088a0  confuse-3.3.tar.xz"
diff --git a/main/conky/APKBUILD b/main/conky/APKBUILD
index 11635a1bf20..cae7441b5b1 100644
--- a/main/conky/APKBUILD
+++ b/main/conky/APKBUILD
@@ -1,44 +1,61 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=conky
-pkgver=1.11.5
-pkgrel=1
-pkgdesc="An advanced, highly configurable system monitor for X based on torsmo"
-url="http://conky.sourceforge.net/"
+pkgver=1.19.8
+pkgrel=0
+pkgdesc="Advanced, highly configurable system monitor for X based on torsmo"
+url="https://github.com/brndnmtthws/conky"
 arch="all"
-license="custom"
-makedepends="alsa-lib-dev libxml2-dev curl-dev wireless-tools-dev
-	libxft-dev glib-dev libxdamage-dev libxext-dev imlib2-dev lua5.3-dev
-	cairo-dev tolua++ ncurses-dev linux-headers cmake gawk  libxinerama-dev"
+license="GPL-3.0-or-later"
+makedepends="
+	alsa-lib-dev
+	cairo-dev
+	cmake
+	curl-dev
+	gawk
+	glib-dev
+	imlib2-dev
+	libxdamage-dev
+	libxext-dev
+	libxft-dev
+	libxinerama-dev
+	libxml2-dev
+	linux-headers
+	lua5.4-dev
+	ncurses-dev
+	pango-dev
+	samurai
+	tolua++
+	wayland-dev
+	libxi-dev
+	wayland-protocols
+	wireless-tools-dev
+	"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/brndnmtthws/conky/archive/v$pkgver.tar.gz"
-
-prepare() {
-	cd "$builddir"
-	sed -i -e '32 iinclude(CheckIncludeFile)' CMakeLists.txt
-	default_prepare
-}
+options="!check"
 
 build() {
-	cd "$builddir"
-	cmake . \
+	cmake -B build -G Ninja \
 		-DRELEASE=ON \
-		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DBUILD_CURL=ON \
 		-DBUILD_XDBE=ON \
 		-DBUILD_IMLIB2=ON \
 		-DBUILD_RSS=ON \
-		-DBUILD_WEATHER_METAR=ON \
-		-DBUILD_WEATHER_XOAP=ON \
 		-DBUILD_WLAN=ON \
-		-DBUILD_I18N=OFF
-	make
+		-DBUILD_I18N=OFF \
+		-DBUILD_LUA_CAIRO=ON \
+		-DBUILD_WAYLAND=ON \
+		-DLUA_LIBRARIES="/usr/lib/lua5.4/liblua.so"
+	cmake --build build
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 	install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="71ba02acc879dad3c240ed9a38635cb2d30e3c9ac849012ff3db53f8143c28d6cc9e502816834b0a073f7486bded7cea002b58c3bb8e189e542afb1070bb84be  conky-1.11.5.tar.gz"
+sha512sums="
+bdc5b29bea3a3050f4fe4ce76fc642134d93a91362e491203dc10cdde1d9c1bde8a106cd8388aab1893e4b1def058abf1f35c1fd022c26ac773071ddd44abbc4  conky-1.19.8.tar.gz
+"
diff --git a/main/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD
index e94a8dcf372..530da858444 100644
--- a/main/conntrack-tools/APKBUILD
+++ b/main/conntrack-tools/APKBUILD
@@ -1,22 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=conntrack-tools
-pkgver=1.4.5
+pkgver=1.4.8
 pkgrel=0
 pkgdesc="Connection tracking userspace tools"
-url="http://conntrack-tools.netfilter.org"
+url="https://www.netfilter.org/projects/conntrack-tools/"
 arch="all"
 license="GPL-2.0-or-later"
 subpackages="$pkgname-doc $pkgname-openrc"
-makedepends="linux-headers libnfnetlink-dev libnetfilter_conntrack-dev bison flex
-	libmnl-dev libnetfilter_cttimeout-dev libnetfilter_cthelper-dev
-	libnetfilter_queue-dev libtirpc-dev"
-source="https://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-$pkgver.tar.bz2
+makedepends="
+	bison
+	flex
+	libmnl-dev
+	libnetfilter_conntrack-dev
+	libnetfilter_cthelper-dev
+	libnetfilter_cttimeout-dev
+	libnetfilter_queue-dev
+	libnfnetlink-dev
+	libtirpc-dev
+	linux-headers
+	"
+source="https://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-$pkgver.tar.xz
 	conntrackd.initd
 	conntrackd.confd
+	conntrackd.logrotate
 	"
+options="!check"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	export CFLAGS="$CFLAGS -D_GNU_SOURCE $(pkgconf --cflags libtirpc)"
 	export LDFLAGS="$LDFLAGS $(pkgconf --libs libtirpc)"
 
@@ -28,15 +43,19 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
-	install -Dm755 ../conntrackd.initd "$pkgdir"/etc/init.d/conntrackd
-	install -Dm644 ../conntrackd.confd "$pkgdir"/etc/conf.d/conntrackd
+	install -Dm755 "$srcdir"/conntrackd.initd "$pkgdir"/etc/init.d/conntrackd
+	install -Dm644 "$srcdir"/conntrackd.confd "$pkgdir"/etc/conf.d/conntrackd
 	install -Dm644 doc/stats/conntrackd.conf \
 		"$pkgdir"/etc/conntrackd/conntrackd.conf
+	install -Dm644 "$srcdir"/conntrackd.logrotate \
+		"$pkgdir"/etc/logrotate.d/conntrackd
 }
 
-sha512sums="480fe2cc4420bc8477a2ba67b3d052bcb39c6b3ec000cff27fc12db70b42ec94fa3b5fe12ee35d439e88d9a631a33cd12ae470b69dde6d371d4e53af62a2eed1  conntrack-tools-1.4.5.tar.bz2
-1d8e6d6eec79233b276d12e78c5d184d356df85ede299bfa9f6967ace30987f3b2f8c8077a1e2f9123a817f2805fdb9bf8fa9ec441882a112d83cabf84932e16  conntrackd.initd
-fd8cfab207867844db6671a8395efadca792d6085c3436381e574dc52f3b4e41d9526b3db6114dd98e534a5419ca19f291d21c091f8cf0426024d73d18133e6f  conntrackd.confd"
+sha512sums="
+95d8f6f068c1342ad7e767537e722272a4f5bd8b46b952713ade053a1043aa9ababbe5ce658ede9c77b6de5221b97ad8833777caffd69b67dd70a99f2b45afdf  conntrack-tools-1.4.8.tar.xz
+f1d96a8107ff1f95b626d592121b59104a3a013970cad8112fde237db2db514d1383e520adf46bf1384831d8d91ec943838a9391b32c3d1ce2bf6aa83c86e18d  conntrackd.initd
+fd8cfab207867844db6671a8395efadca792d6085c3436381e574dc52f3b4e41d9526b3db6114dd98e534a5419ca19f291d21c091f8cf0426024d73d18133e6f  conntrackd.confd
+1e4e6414bbf4210fab83d1a8cd7198bf11f2638d378abd674b1b66bd6ab6bdc048fc4052c3e263bd02dfc8085d007f3092f24e818f8579a940aa3b5af19c1766  conntrackd.logrotate
+"
diff --git a/main/conntrack-tools/conntrackd.initd b/main/conntrack-tools/conntrackd.initd
index ba4d0a680cd..fae89c6d8de 100644
--- a/main/conntrack-tools/conntrackd.initd
+++ b/main/conntrack-tools/conntrackd.initd
@@ -2,10 +2,15 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-CONNTRACKD_BIN="/usr/sbin/conntrackd"
 CONNTRACKD_CFG=${CONNTRACKD_CFG:-/etc/conntrackd/conntrackd.conf}
 CONNTRACKD_LOCK=${CONNTRACKD_LOCK:-/var/lock/conntrack.lock}
 
+command="/usr/sbin/conntrackd"
+command_args="-C ${CONNTRACKD_CFG} ${CONNTRACKD_OPTS}"
+command_background="yes"
+pidfile="/run/$RC_SVCNAME.pid"
+required_files="$CONNTRACKD_CFG"
+
 depend() {
 	use logger
 	need net
@@ -61,13 +66,11 @@ checkconfig() {
 		eerror
 		return 1
 	fi
-	# check for config file
-	if [ ! -e "${CONNTRACKD_CFG}" ]; then
-		eerror
-		eerror "The conntrackd config file (${CONNTRACKD_CFG})"
-		eerror "is missing!"
-		eerror
-		return 1
+}
+
+start_pre() {
+	if [ "${RC_CMD}" != "restart" ] ; then
+		checkconfig || return $?
 	fi
 	# check for leftover lockfile
 	if [ -f "${CONNTRACKD_LOCK}" ]; then
@@ -85,16 +88,8 @@ checkconfig() {
 	fi
 }
 
-start() {
-	checkconfig || return 1
-	ebegin "Starting conntrackd"
-	start-stop-daemon --start --exec "${CONNTRACKD_BIN}" \
-		-- -d -C "${CONNTRACKD_CFG}" ${CONNTRACKD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping conntrackd"
-	start-stop-daemon --stop --exec "${CONNTRACKD_BIN}"
-	eend $?
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ] ; then
+		checkconfig || return $?
+	fi
 }
diff --git a/main/conntrack-tools/conntrackd.logrotate b/main/conntrack-tools/conntrackd.logrotate
new file mode 100644
index 00000000000..8f5f1de2f9a
--- /dev/null
+++ b/main/conntrack-tools/conntrackd.logrotate
@@ -0,0 +1,14 @@
+/var/log/conntrackd-stats.log {
+	compress
+	dateext
+	notifempty
+	missingok
+	nocreate
+	weekly
+	rotate 2
+	copytruncate
+
+	postrotate
+		/etc/init.d/conntrackd --quiet --ifstarted restart || true
+	endscript
+}
diff --git a/main/consolekit2/0001-busybox-reboot-and-poweroff-support.patch b/main/consolekit2/0001-busybox-reboot-and-poweroff-support.patch
deleted file mode 100644
index 2db9f032bd4..00000000000
--- a/main/consolekit2/0001-busybox-reboot-and-poweroff-support.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5e557dd212657f7e75a0c4bd70d11ca06ccb3f84 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 4 Apr 2011 18:46:25 +0000
-Subject: [PATCH] busybox reboot and poweroff support
-
----
- tools/linux/ck-system-restart |    3 +++
- tools/linux/ck-system-stop    |    3 +++
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/tools/linux/ck-system-restart b/tools/linux/ck-system-restart
-index 8e0664e..5cabb3d 100755
---- a/tools/linux/ck-system-restart
-+++ b/tools/linux/ck-system-restart
-@@ -7,6 +7,9 @@ if [ -x "/sbin/shutdown" ] ; then
- elif [ -x "/usr/sbin/shutdown" ] ; then
- 	/usr/sbin/shutdown -r now
- 	exit $?
-+elif [ -x "/sbin/reboot" ]; then
-+	/sbin/reboot
-+	exit $?
- else
- 	exit 1
- fi
-diff --git a/tools/linux/ck-system-stop b/tools/linux/ck-system-stop
-index e26bca3..a0be3ac 100755
---- a/tools/linux/ck-system-stop
-+++ b/tools/linux/ck-system-stop
-@@ -7,6 +7,9 @@ if [ -x "/sbin/shutdown" ] ; then
- elif [ -x "/usr/sbin/shutdown" ] ; then
- 	/usr/sbin/shutdown -h now
- 	exit $?
-+elif [ -x "/sbin/poweroff" ] ; then
-+	/sbin/poweroff
-+	exit $?
- else
- 	exit 1
- fi
--- 
-1.7.4.2
diff --git a/main/consolekit2/APKBUILD b/main/consolekit2/APKBUILD
deleted file mode 100644
index 9dfbc55fbb8..00000000000
--- a/main/consolekit2/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Bart Ribbers <bribbers@disroot.org>
-# Maintainer: Bart Ribbers <bribbers@disroot.org>
-pkgbase=ConsoleKit2
-pkgname=consolekit2
-pkgver=1.2.1
-pkgrel=1
-pkgdesc="A framework for defining and tracking users, login sessions, and seats"
-provides="consolekit=$pkgver"
-replaces=consolekit
-arch=all
-url="https://consolekit2.github.io/ConsoleKit2"
-license=GPL2
-depends="polkit eudev"
-makedepends="git automake autoconf gettext-dev glib-dev zlib-dev libxslt-dev
-	polkit-dev eudev-dev libdrm-dev libnih-dev libtool xorg-server-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz
-		0001-busybox-reboot-and-poweroff-support.patch
-		pam-foreground-compat.ck"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-builddir="$srcdir"/$pkgbase-$pkgver
-options="!check" #no testsuite provided
-
-prepare() {
-	default_prepare
-	NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-	cd "$builddir"
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-		--disable-static
-	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -m 755 "$srcdir"/pam-foreground-compat.ck \
-		"$pkgdir"/usr/lib/ConsoleKit/run-session.d/
-}
-sha512sums="b62a43b2748b9302b86847a3c4c84f931d7df9fef028dffbad091dd7b176c57109adec65e49f9f8a3c5e5e03a5d9b29f8b96e3328f9b9bfb32fd767fceecde81  consolekit2-1.2.1.tar.gz
-ec0c88e640afac0561c84131d63fa8c9e2e29611b789ae5c163cd11465b22017602d88dc853866624f57bce2ee466ab63af075d083a9ba6e87327ad8d0a0769f  0001-busybox-reboot-and-poweroff-support.patch
-3b114fbbe74cfba0bfd4dad0eb1b85d08b4979a998980c1cbcd7f44b8a16b0ceca224680d4f4a1644cd24698f8817e5e8bdfcdc4ead87a122d0e323142f47910  pam-foreground-compat.ck"
diff --git a/main/consolekit2/pam-foreground-compat.ck b/main/consolekit2/pam-foreground-compat.ck
deleted file mode 100644
index c9255503c47..00000000000
--- a/main/consolekit2/pam-foreground-compat.ck
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-TAGDIR=/var/run/console
-
-[ -n "$CK_SESSION_USER_UID" ] || exit 1
-[ "$CK_SESSION_IS_LOCAL" = "true" ] || exit 0
-
-TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`"
-
-if [ "$1" = "session_added" ]; then
-	mkdir -p "$TAGDIR"
-	echo "$CK_SESSION_ID" >> "$TAGFILE"
-fi
-
-if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then
-	sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE"
-	[ -s "$TAGFILE" ] || rm -f "$TAGFILE"
-fi
diff --git a/main/coova-chilli/APKBUILD b/main/coova-chilli/APKBUILD
deleted file mode 100644
index bb5d2854f82..00000000000
--- a/main/coova-chilli/APKBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# Contributor: grharry
-# Maintainer:
-pkgname=coova-chilli
-pkgver=1.4
-pkgrel=2
-pkgdesc="CoovaChilli is an open source access controller for wireless LAN"
-url="http://www.coova.org/"
-arch="all"
-license="GPL-3.0-or-later"
-makedepends="perl openssl-dev autoconf automake libtool curl-dev
-	linux-headers gengetopt-dev"
-install="$pkgname.pre-install"
-pkgusers="chilli"
-pkggroups="chilli"
-subpackages="$pkgname-doc $pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/coova/coova-chilli/archive/$pkgver.tar.gz
-	chilli.initd
-	chilli.confd
-	posix-regex.patch
-	system.patch
-	des.patch
-	"
-options="suid"
-
-prepare() {
-	default_prepare
-	sed -i 's/-Werror//g' src/Makefile.am
-	sed -i 's%(localstatedir)/run%(localstatedir)%' src/Makefile.am
-	libtoolize --force \
-		&& autoreconf -vif
-}
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var/run/chilli \
-		--libdir=/usr/lib \
-		--sysconfdir=/etc \
-		--with-openssl \
-		--with-poll \
-		--enable-binstatusfile \
-		--enable-statusfile \
-		--enable-chillixml \
-		--enable-ipwhitelist \
-		--enable-redirinject \
-		--enable-redirdnsreq \
-		--enable-redirinject \
-		--enable-debug \
-		--enable-debug2 \
-		--enable-miniportal \
-		--enable-sessgarden \
-		--enable-shared \
-		--enable-chilliredir \
-		--enable-chilliscript \
-		--enable-layer3 \
-		--enable-dhcpopt \
-		--enable-largelimits
-	export CFLAGS="$CFLAGS -Wno-error=unused-but-set-variable"
-	make -j1
-}
-
-check() {
-	make check
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-	install -D -m755 "$srcdir"/chilli.initd $pkgdir/etc/init.d/chilli
-	install -D -m755 "$srcdir"/chilli.confd $pkgdir/etc/conf.d/chilli
-	mkdir -p $pkgdir/var/run/chilli
-	chown -R $pkgusers:$pkggroups $pkgdir/var/run/chilli
-}
-
-sha512sums="2ee31731c59af0f4282255a76ef045e9f37dc85da6d18a374154ae5cc690dc485acae2d83372bf48d9326db53292603d69b0093e845b4d08b26d2586455590c5  coova-chilli-1.4.tar.gz
-eb0feda33f74256cedd4987d22427c1575f4de08636ff02c16cb4f6710a54dce0d23410d56e961727d4e78f5f4fb0a7848505215e5c91518301d1e81b589ecde  chilli.initd
-840712709974d5a3567e0a14cb05d7e394bf73ac06c0ea865c00351d916f794ec3e70bfbc9255afd419aeceaae3f4b0cbf7e770ccd23af1e677e15821c1690cf  chilli.confd
-d47d176d01eda436b04700bb4404fe2a3c17e00bd8c2e4ed08149841c3e692435fee4f7dc22135d07b95556dd2f2d08b540a345bb7d5bdff3266bfcc46dcda76  posix-regex.patch
-7dbfa571f5eb7065a3a6c2f7c14e2d33cec52771e0236f29837d28cc216ca5a12eb31e1f3d3a780964c8e0f65eb057a9c040b14c65d84cd8483858f757240d6b  system.patch
-b2dce18c72808e58dd97a235191e9b843f0bfa06805b12c39488bf4464d055c0734248c89c571cc8069e0f06856f7fcf8458aac84f895da4ed2b0ceb7cbd6f82  des.patch"
diff --git a/main/coova-chilli/chilli.confd b/main/coova-chilli/chilli.confd
deleted file mode 100644
index 8133a04c584..00000000000
--- a/main/coova-chilli/chilli.confd
+++ /dev/null
@@ -1 +0,0 @@
-CHILLI_OPTS="--name chilli --group chilli"
diff --git a/main/coova-chilli/chilli.initd b/main/coova-chilli/chilli.initd
deleted file mode 100644
index 3e75949f6e4..00000000000
--- a/main/coova-chilli/chilli.initd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	use net
-	after firewall
-	provide chilli
-}
-
-checkconfig() {
-	if [ -f /etc/chilli.conf ]; then
-		return 0;
-	else
-		eerror "Error starting CoovaChilli. Please create /etc/chilli.conf before."
-		return 1;
-	fi
-
-}
-
-start() {
-        checkconfig || return 1
-        ebegin "Starting CoovaChilli Captive Portal"
-	
-	echo 1 > /proc/sys/net/ipv4/ip_forward
-	lsmod | grep tun >& /dev/null
-
-	if [ $? -ne 0 ]; then
-		modprobe tun >& /dev/null
-	fi
-
-        start-stop-daemon --start --pidfile /var/run/chilli/chilli.pid --quiet \
-                --exec /usr/sbin/chilli ${CHILLI_OPTS} -- --pidfile=/var/run/chilli/chilli.pid 
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping CoovaChilli Captive Portal"
-        start-stop-daemon --stop --pidfile /var/run/chilli.pid --quiet
-        eend $?
-}
diff --git a/main/coova-chilli/coova-chilli.post-install b/main/coova-chilli/coova-chilli.post-install
deleted file mode 100644
index 10dfc9576a9..00000000000
--- a/main/coova-chilli/coova-chilli.post-install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-chown -R chilli:chilli /var/run/chilli
diff --git a/main/coova-chilli/coova-chilli.pre-install b/main/coova-chilli/coova-chilli.pre-install
deleted file mode 100644
index 342778dcd69..00000000000
--- a/main/coova-chilli/coova-chilli.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S chilli 2>/dev/null
-adduser -S -D -H -s /sbin/nologin -G chilli -g chilli chilli 2>/dev/null
-
-exit 0
diff --git a/main/coova-chilli/des.patch b/main/coova-chilli/des.patch
deleted file mode 100644
index ae647d5970d..00000000000
--- a/main/coova-chilli/des.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 1a809062ecab70de13e299487fdd635434bc86d8 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 4 Oct 2016 20:31:54 +0200
-Subject: [PATCH] Replace deprecated des_ with DES_
-
-The des_* fuctions were renamed to DES_ with openssl 0.9.7 (2002). This
-fixes building with libressl and probably openssl 1.1.0 too.
----
- src/ms_chap.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/ms_chap.c b/src/ms_chap.c
-index 2c236d2..8ad8327 100644
---- a/src/ms_chap.c
-+++ b/src/ms_chap.c
-@@ -96,18 +96,18 @@ MakeKey(u_char *key, u_char *des_key)
-   des_key[6] = Get7Bits(key, 42);
-   des_key[7] = Get7Bits(key, 49);
- 
--  des_set_odd_parity((des_cblock *)des_key);
-+  DES_set_odd_parity((DES_cblock *)des_key);
- }
- 
- static void /* IN 8 octets IN 7 octest OUT 8 octets */
- DesEncrypt(u_char *clear, u_char *key, u_char *cipher)
- {
--  des_cblock		des_key;
--  des_key_schedule	key_schedule;
-+  DES_cblock		des_key;
-+  DES_key_schedule	key_schedule;
- 
-   MakeKey(key, des_key);
--  des_set_key(&des_key, key_schedule);
--  des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher, key_schedule, 1);
-+  DES_set_key(&des_key, &key_schedule);
-+  DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher, &key_schedule, 1);
- }
- 
- #define LENGTH 20
--- 
-2.10.0
-
diff --git a/main/coova-chilli/posix-regex.patch b/main/coova-chilli/posix-regex.patch
deleted file mode 100644
index 12ce4427d80..00000000000
--- a/main/coova-chilli/posix-regex.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 60031538ecbf9004ae195114cc5e4ea40cca7d06 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 4 Oct 2016 20:01:49 +0200
-Subject: [PATCH] Improve portability for regex
-
-Do not depend on internal, platform dependant field in regex_t to detect
-if the regex was compiled or not. Instead, use a flag that we set for
-that.
-
-This fixes build with musl libc.
----
- src/garden.h     | 11 ++++++++---
- src/main-redir.c | 26 +++++++++++---------------
- src/options.c    | 27 +++++++++++++++------------
- 3 files changed, 34 insertions(+), 30 deletions(-)
-
-diff --git a/src/garden.h b/src/garden.h
-index 1b07a23..84563e9 100644
---- a/src/garden.h
-+++ b/src/garden.h
-@@ -39,13 +39,18 @@ typedef struct pass_through_t {
-     (a)->port        == (b)->port)
- 
- #ifdef ENABLE_CHILLIREDIR
-+struct chilli_regex {
-+  regex_t re;
-+  char allocated:1;
-+};
-+
- typedef struct regex_pass_through_t {
-   char regex_host[512];
-   char regex_path[512];
-   char regex_qs[512];
--  regex_t re_host;
--  regex_t re_path;
--  regex_t re_qs;
-+  struct chilli_regex re_host;
-+  struct chilli_regex re_path;
-+  struct chilli_regex re_qs;
-   uint8_t inuse:1;
-   uint8_t neg_host:1;
-   uint8_t neg_path:1;
-diff --git a/src/main-redir.c b/src/main-redir.c
-index c7b0f07..001f882 100644
---- a/src/main-redir.c
-+++ b/src/main-redir.c
-@@ -501,29 +501,25 @@ static int redir_conn_read(struct conn_t *conn, void *ctx) {
- }
- 
- static int
--check_regex(regex_t *re, char *regex, char *s) {
-+check_regex(struct chilli_regex *re, char *regex, char *s) {
-   int ret;
- 
- #if(_debug_)
-   syslog(LOG_DEBUG, "Checking %s =~ %s", s, regex);
- #endif
- 
--#if defined (__FreeBSD__) || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__)
--  if (!re->re_g)
--#else
--    if (!re->allocated)
--#endif
--    {
--      if ((ret = regcomp(re, regex, REG_EXTENDED | REG_NOSUB)) != 0) {
--        char error[512];
--        regerror(ret, re, error, sizeof(error));
--        syslog(LOG_ERR, "regcomp(%s) failed (%s)", regex, error);
--        regex[0] = 0;
--        return -1;
--      }
-+  if (!re->allocated) {
-+    if ((ret = regcomp(&re->re, regex, REG_EXTENDED | REG_NOSUB)) != 0) {
-+      char error[512];
-+      regerror(ret, &re->re, error, sizeof(error));
-+      syslog(LOG_ERR, "regcomp(%s) failed (%s)", regex, error);
-+      regex[0] = 0;
-+      return -1;
-     }
-+    re->allocated = 1;
-+  }
- 
--  if ((ret = regexec(re, s, 0, 0, 0)) == 0) {
-+  if ((ret = regexec(&re->re, s, 0, 0, 0)) == 0) {
- 
-     syslog(LOG_DEBUG, "Matched regex %s", regex);
-     return 0;
-diff --git a/src/options.c b/src/options.c
-index 28f1b35..d6be8d0 100644
---- a/src/options.c
-+++ b/src/options.c
-@@ -219,6 +219,16 @@ int options_mkdir(char *path) {
-   return 0;
- }
- 
-+#ifdef ENABLE_CHILLIREDIR
-+static void chilli_regfree(struct chilli_regex *re)
-+{
-+  if (!re->allocated)
-+    return;
-+  regfree(&re->re);
-+  re->allocated = 0;
-+}
-+#endif
-+
- int options_fromfd(int fd, bstring bt) {
-   uint8_t cksum[16], cksum_check[16];
-   struct options_t o;
-@@ -380,18 +390,11 @@ int options_fromfd(int fd, bstring bt) {
- 
- #ifdef ENABLE_CHILLIREDIR
-   for (i = 0; i < MAX_REGEX_PASS_THROUGHS; i++) {
--#if defined (__FreeBSD__) || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__)
--    regfree(&_options.regex_pass_throughs[i].re_host);
--    regfree(&_options.regex_pass_throughs[i].re_path);
--    regfree(&_options.regex_pass_throughs[i].re_qs);
--#else
--    if (_options.regex_pass_throughs[i].re_host.allocated)
--      regfree(&_options.regex_pass_throughs[i].re_host);
--    if (_options.regex_pass_throughs[i].re_path.allocated)
--      regfree(&_options.regex_pass_throughs[i].re_path);
--    if (_options.regex_pass_throughs[i].re_qs.allocated)
--      regfree(&_options.regex_pass_throughs[i].re_qs);
--#endif
-+    if (_options.regex_pass_throughs[i].re_host.allocated) {
-+      chilli_regfree(&_options.regex_pass_throughs[i].re_host);
-+      chilli_regfree(&_options.regex_pass_throughs[i].re_path);
-+      chilli_regfree(&_options.regex_pass_throughs[i].re_qs);
-+    }
-   }
- #endif
- 
--- 
-2.10.0
-
diff --git a/main/coova-chilli/system.patch b/main/coova-chilli/system.patch
deleted file mode 100644
index 17d3ba3bb72..00000000000
--- a/main/coova-chilli/system.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/src/system.h b/src/system.h
-index 6ddf98c..3efef6a 100644
---- a/src/system.h
-+++ b/src/system.h
-@@ -117,27 +117,6 @@
- #include <inttypes.h>
- #endif
- 
--#if defined(__linux__)
--#include <asm/types.h>
--#include <linux/if.h>
--#include <linux/if_packet.h>
--#include <linux/if_ether.h>
--#include <linux/if_tun.h>
--#include <linux/netlink.h>
--#include <linux/rtnetlink.h>
--#ifndef HAVE_SYS_UN_H
--#include <linux/un.h>
--#endif
--
--#ifdef HAVE_SYS_SYSINFO_H
--#include <sys/sysinfo.h>
--#else
--#ifdef HAVE_LINUX_SYSINFO_H
--#define _LINUX_KERNEL_H
--#include <linux/sysinfo.h>
--#endif
--#endif
--
- #elif defined (__FreeBSD__)  || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__)
- #include <net/if.h>
- #include <net/bpf.h>
-@@ -244,6 +223,27 @@
- #include <unistd.h>
- #include <errno.h>
- 
-+#if defined(__linux__)
-+#include <asm/types.h>
-+#include <linux/if.h>
-+#include <linux/if_packet.h>
-+#include <linux/if_ether.h>
-+#include <linux/if_tun.h>
-+#include <linux/netlink.h>
-+#include <linux/rtnetlink.h>
-+#ifndef HAVE_SYS_UN_H
-+#include <linux/un.h>
-+#endif
-+
-+#ifdef HAVE_SYS_SYSINFO_H
-+#include <sys/sysinfo.h>
-+#else
-+#ifdef HAVE_LINUX_SYSINFO_H
-+#define _LINUX_KERNEL_H
-+#include <linux/sysinfo.h>
-+#endif
-+#endif
-+
- int safe_accept(int fd, struct sockaddr *sa, socklen_t *lenptr);
- int safe_select(int nfds, fd_set *readfds, fd_set *writefds,
- 		fd_set *exceptfds, struct timeval *timeout);
diff --git a/main/coreutils/APKBUILD b/main/coreutils/APKBUILD
index 8b06f974ed3..f3256864483 100644
--- a/main/coreutils/APKBUILD
+++ b/main/coreutils/APKBUILD
@@ -2,26 +2,28 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=coreutils
-pkgver=8.32
+pkgver=9.5
 pkgrel=0
 pkgdesc="The basic file, shell and text manipulation utilities"
 url="https://www.gnu.org/software/coreutils/"
 arch="all"
 license="GPL-3.0-or-later"
-makedepends="bash acl-dev attr-dev perl"
-subpackages="$pkgname-doc"
+makedepends="acl-dev attr-dev utmps-dev perl openssl-dev"
+subpackages="$pkgname-doc $pkgname-env $pkgname-fmt $pkgname-sha512sum:_sha512sum"
 install="$pkgname.post-deinstall"
-source="https://ftp.gnu.org/gnu/coreutils/coreutils-$pkgver.tar.xz
-	ls.patch
-	"
-options="!check"
+source="https://ftp.gnu.org/gnu/coreutils/coreutils-$pkgver.tar.xz"
+options="!check" # FAIL: tests/cp/reflink-auto
 
 # secfixes:
+#   9.4-r2:
+#     - CVE-2024-0684
 #   8.30-r0:
 #     - CVE-2017-18018
 
 build() {
-	LIBS="-lrt" ./configure \
+	CFLAGS="$CFLAGS -I/usr/include/utmps -flto=auto" \
+	LIBS="-lutmps -lskarnet" \
+	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -29,13 +31,24 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--disable-nls \
-		--without-gmp \
 		--enable-no-install-program=hostname,su,kill,uptime \
-		--enable-single-binary=symlinks
+		--enable-single-binary=symlinks \
+		--enable-single-binary-exceptions=env,fmt,sha512sum \
+		--with-openssl
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
+	# we put this separately
+	depends="
+		coreutils-env=$pkgver-r$pkgrel
+		coreutils-fmt=$pkgver-r$pkgrel
+		coreutils-sha512sum=$pkgver-r$pkgrel
+		"
 	make DESTDIR="$pkgdir" install
 
 	rm -rf "$pkgdir"/usr/lib/charset.alias
@@ -57,12 +70,23 @@ package() {
 	# chroot lives in /usr/sbin with busybox
 	rm "$pkgdir"/usr/bin/chroot
 	ln -s ../bin/coreutils "$pkgdir"/usr/sbin/chroot
+
+	# resolve conflict between shadow and coreutils for cmd:groups
+	rm "$pkgdir"/usr/bin/groups
 }
 
-# XXX - some gnulib tests broken, find a way to patch out gnulib tests
-check() {
-	make check
+env() {
+	amove usr/bin/env
+}
+
+fmt() {
+	amove usr/bin/fmt
+}
+
+_sha512sum() {
+	amove usr/bin/sha512sum
 }
 
-sha512sums="1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145  coreutils-8.32.tar.xz
-2742d74c45bdb52c524d415fb0787ed63164aec2c22980a1c46b40b7db2f0911008161b1219d5b571cc25de274bacc20c8be3f651906967a032a3ac9859cffce  ls.patch"
+sha512sums="
+2ca0deac4dc10a80fd0c6fd131252e99d457fd03b7bd626a6bc74fe5a0529c0a3d48ce1f5da1d3b3a7a150a1ce44f0fbb6b68a6ac543dfd5baa3e71f5d65401c  coreutils-9.5.tar.xz
+"
diff --git a/main/coreutils/ls.patch b/main/coreutils/ls.patch
deleted file mode 100644
index 0e2057caec4..00000000000
--- a/main/coreutils/ls.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-../src/ls.c: In function 'print_dir':
-	
-../src/ls.c:3026:24: error: 'SYS_getdents' undeclared (first use in this function); did you mean 'SYS_getdents64'?
-	
- 3026 |           if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1
-	
-      |                        ^~~~~~~~~~~~
-	
-      |                        SYS_getdents64
-	
-../src/ls.c:3026:24: note: each undeclared identifier is reported only once for each function it appears in
-
-diff --git a/src/ls.c b/src/ls.c
-index 24b9832..64ecf40 100644
---- a/src/ls.c
-+++ b/src/ls.c
-@@ -3018,7 +3018,7 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
-           if (errno != EOVERFLOW)
-             break;
-         }
--#ifdef __linux__
-+#if defined(__linux__) && defined(__x86_64__)
-       else if (! found_any_entries)
-         {
-           /* If readdir finds no directory entries at all, not even "." or
diff --git a/main/cppunit/APKBUILD b/main/cppunit/APKBUILD
index d5e483ac4cf..5106cc70e98 100644
--- a/main/cppunit/APKBUILD
+++ b/main/cppunit/APKBUILD
@@ -1,14 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cppunit
 pkgver=1.15.1
-pkgrel=0
+pkgrel=4
 pkgdesc="C++ unit testing framework"
-url="http://www.freedesktop.org/wiki/Software/cppunit/"
+url="https://www.freedesktop.org/wiki/Software/cppunit/"
 arch="all"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://dev-www.libreoffice.org/src/cppunit-$pkgver.tar.gz"
 
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
+
 build() {
 	LIBS="-ldl" ./configure \
 		--build=$CBUILD \
diff --git a/main/cpufrequtils/0001-Only-x86-has-cpuid-instruction.patch b/main/cpufrequtils/0001-Only-x86-has-cpuid-instruction.patch
deleted file mode 100644
index d3bc14d51bc..00000000000
--- a/main/cpufrequtils/0001-Only-x86-has-cpuid-instruction.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f1b6bccf08f53295b2f7f448f28bbd37533c14a2 Mon Sep 17 00:00:00 2001
-From: Zhang Le <r0bertz@gentoo.org>
-Date: Sun, 18 Jul 2010 02:05:28 +0800
-Subject: [PATCH 1/8] Only x86 has cpuid instruction
-
-Signed-off-by: Zhang Le <r0bertz@gentoo.org>
-Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
----
- utils/aperf.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/utils/aperf.c b/utils/aperf.c
-index 627fb17..1c64501 100644
---- a/utils/aperf.c
-+++ b/utils/aperf.c
-@@ -68,11 +68,15 @@ struct avg_perf_cpu_info
- 
- static int cpu_has_effective_freq()
- {
-+#if defined(__i386__) || defined(__x86_64__)
- 	/* largest base level */
- 	if (cpuid_eax(0) < 6)
- 		return 0;
- 
- 	return cpuid_ecx(6) & 0x1;
-+#else
-+	return 0;
-+#endif
- }
- 
- /*
--- 
-1.7.10
-
diff --git a/main/cpufrequtils/0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch b/main/cpufrequtils/0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch
deleted file mode 100644
index b2ae5334064..00000000000
--- a/main/cpufrequtils/0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch
+++ /dev/null
@@ -1,1511 +0,0 @@
-From adb7e044755aa06b12212d05c4acbcccb023d2cd Mon Sep 17 00:00:00 2001
-From: Thomas Renninger <trenn@suse.de>
-Date: Wed, 1 Sep 2010 02:18:00 +0200
-Subject: [PATCH 2/8] cpufrequtils: Remove proc compile option and interfaces
-
-proc cpufreq kernel support is deprecated since the beginning of 2.6?)
-If someone still likes to have support for the 2.4 cpufreq proc
-interface one has to pick out an old cpufrequtils version
-from now on...
-
-Signed-off-by: Thomas Renninger <trenn@suse.de>
-Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
----
- Makefile         |   29 +-------
- lib/cpufreq.c    |   99 +++++--------------------
- lib/interfaces.h |   76 -------------------
- lib/proc.c       |  216 ------------------------------------------------------
- lib/sysfs.h      |   18 +++++
- po/cs.po         |  186 +++++++++++++++++++++++++++-------------------
- po/de.po         |    2 +-
- po/fr.po         |  187 +++++++++++++++++++++++++++-------------------
- po/it.po         |    2 +-
- po/pt.po         |    2 +-
- 10 files changed, 264 insertions(+), 553 deletions(-)
- delete mode 100644 lib/interfaces.h
- delete mode 100644 lib/proc.c
- create mode 100644 lib/sysfs.h
-
-diff --git a/Makefile b/Makefile
-index 3ef2af7..e23c644 100644
---- a/Makefile
-+++ b/Makefile
-@@ -37,13 +37,6 @@ NLS ?=		true
- # cpufreq-bench benchmarking tool
- CPUFRQ_BENCH ?= false
- 
--# Use the sysfs-based interface which is included in all 2.6 kernels
--# built with cpufreq support
--SYSFS ?=	true
--
--# Use the proc-based interface which is used in the 2.4 patch for cpufreq
--PROC ?=		true
--
- # Prefix to the directories we're installing to
- DESTDIR ?=	
- 
-@@ -119,24 +112,12 @@ CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \
- 		-DPACKAGE_BUGREPORT=\"$(PACKAGE_BUGREPORT)\" -D_GNU_SOURCE
- 
- UTIL_SRC = 	utils/info.c utils/set.c utils/aperf.c utils/cpuid.h
--LIB_HEADERS = 	lib/cpufreq.h lib/interfaces.h
--LIB_SRC = 	lib/cpufreq.c
--LIB_OBJS = 	lib/cpufreq.o
-+LIB_HEADERS = 	lib/cpufreq.h lib/sysfs.h
-+LIB_SRC = 	lib/cpufreq.c lib/sysfs.c
-+LIB_OBJS = 	lib/cpufreq.o lib/sysfs.o
- 
- CFLAGS +=	-pipe
- 
--ifeq ($(strip $(PROC)),true)
--	LIB_OBJS += lib/proc.o
--	LIB_SRC += lib/proc.c
--	CPPFLAGS += -DINTERFACE_PROC
--endif
--
--ifeq ($(strip $(SYSFS)),true)
--	LIB_OBJS += lib/sysfs.o
--	LIB_SRC += lib/sysfs.c
--	CPPFLAGS += -DINTERFACE_SYSFS
--endif
--
- ifeq ($(strip $(NLS)),true)
- 	INSTALL_NLS += install-gmo
- 	COMPILE_NLS += update-gmo
-@@ -183,10 +164,6 @@ lib/%.o: $(LIB_SRC) $(LIB_HEADERS) build/ccdv
- 	$(QUIET) $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ -c lib/$*.c
- 
- libcpufreq.so.$(LIB_MAJ): $(LIB_OBJS)
--	@if [ $(strip $(SYSFS)) != true -a $(strip $(PROC)) != true ]; then \
--		echo '*** At least one of /sys support or /proc support MUST be enabled ***'; \
--		exit -1; \
--	fi;
- 	$(QUIET) $(CC) -shared $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
- 		-Wl,-soname,libcpufreq.so.$(LIB_MIN) $(LIB_OBJS)
- 	@ln -sf $@ libcpufreq.so
-diff --git a/lib/cpufreq.c b/lib/cpufreq.c
-index 0c9f28e..603dbf8 100644
---- a/lib/cpufreq.c
-+++ b/lib/cpufreq.c
-@@ -11,60 +11,39 @@
- #include <string.h>
- 
- #include "cpufreq.h"
--#include "interfaces.h"
-+#include "sysfs.h"
- 
- int cpufreq_cpu_exists(unsigned int cpu)
- {
--	int ret = sysfs_cpu_exists(cpu);
--	if (ret == -ENOSYS)
--		ret = proc_cpu_exists(cpu);
--	return (ret);
-+	return sysfs_cpu_exists(cpu);
- }
- 
- unsigned long cpufreq_get_freq_kernel(unsigned int cpu)
- {
--	unsigned long ret = sysfs_get_freq_kernel(cpu);
--	if (!ret)
--		ret = proc_get_freq_kernel(cpu);
--	return (ret);
-+	return sysfs_get_freq_kernel(cpu);
- }
- 
- unsigned long cpufreq_get_freq_hardware(unsigned int cpu)
- {
--	unsigned long ret = sysfs_get_freq_hardware(cpu);
--	if (!ret)
--		ret = proc_get_freq_hardware(cpu);
--	return (ret);
-+	return sysfs_get_freq_hardware(cpu);
- }
- 
- unsigned long cpufreq_get_transition_latency(unsigned int cpu)
- {
--	unsigned long ret = sysfs_get_transition_latency(cpu);
--	if (!ret)
--		ret = proc_get_transition_latency(cpu);
--	return (ret);
-+	return sysfs_get_transition_latency(cpu);
- }
- 
- int cpufreq_get_hardware_limits(unsigned int cpu,
- 				unsigned long *min,
- 				unsigned long *max)
- {
--	int ret;
- 	if ((!min) || (!max))
- 		return -EINVAL;
--	ret = sysfs_get_hardware_limits(cpu, min, max);
--	if (ret)
--		ret = proc_get_hardware_limits(cpu, min, max);
--	return (ret);
-+	return sysfs_get_hardware_limits(cpu, min, max);
- }
- 
- char * cpufreq_get_driver(unsigned int cpu) {
--	char * ret;
--	ret = sysfs_get_driver(cpu);
--	if (!ret) {
--		ret = proc_get_driver(cpu);
--	}
--	return (ret);
-+	return sysfs_get_driver(cpu);
- }
- 
- void cpufreq_put_driver(char * ptr) {
-@@ -74,11 +53,7 @@ void cpufreq_put_driver(char * ptr) {
- }
- 
- struct cpufreq_policy * cpufreq_get_policy(unsigned int cpu) {
--	struct cpufreq_policy * ret;
--	ret = sysfs_get_policy(cpu);
--	if (!ret)
--		ret = proc_get_policy(cpu);
--	return (ret);
-+	return sysfs_get_policy(cpu);
- }
- 
- void cpufreq_put_policy(struct cpufreq_policy *policy) {
-@@ -91,11 +66,7 @@ void cpufreq_put_policy(struct cpufreq_policy *policy) {
- }
- 
- struct cpufreq_available_governors * cpufreq_get_available_governors(unsigned int cpu) {
--	struct cpufreq_available_governors *ret;
--	ret = sysfs_get_available_governors(cpu);
--	if (!ret)
--		ret = proc_get_available_governors(cpu);
--	return (ret);
-+	return sysfs_get_available_governors(cpu);
- }
- 
- void cpufreq_put_available_governors(struct cpufreq_available_governors *any) {
-@@ -116,11 +87,7 @@ void cpufreq_put_available_governors(struct cpufreq_available_governors *any) {
- 
- 
- struct cpufreq_available_frequencies * cpufreq_get_available_frequencies(unsigned int cpu) {
--	struct cpufreq_available_frequencies * ret;
--	ret = sysfs_get_available_frequencies(cpu);
--	if (!ret)
--		ret = proc_get_available_frequencies(cpu);
--	return (ret);
-+	return sysfs_get_available_frequencies(cpu);
- }
- 
- void cpufreq_put_available_frequencies(struct cpufreq_available_frequencies *any) {
-@@ -139,11 +106,7 @@ void cpufreq_put_available_frequencies(struct cpufreq_available_frequencies *any
- 
- 
- struct cpufreq_affected_cpus * cpufreq_get_affected_cpus(unsigned int cpu) {
--	struct cpufreq_affected_cpus * ret;
--	ret = sysfs_get_affected_cpus(cpu);
--	if (!ret)
--		ret = proc_get_affected_cpus(cpu);
--	return (ret);
-+	return sysfs_get_affected_cpus(cpu);
- }
- 
- void cpufreq_put_affected_cpus(struct cpufreq_affected_cpus *any) {
-@@ -162,11 +125,7 @@ void cpufreq_put_affected_cpus(struct cpufreq_affected_cpus *any) {
- 
- 
- struct cpufreq_affected_cpus * cpufreq_get_related_cpus(unsigned int cpu) {
--	struct cpufreq_affected_cpus * ret;
--	ret = sysfs_get_related_cpus(cpu);
--	if (!ret)
--		ret = proc_get_related_cpus(cpu);
--	return (ret);
-+	return sysfs_get_related_cpus(cpu);
- }
- 
- void cpufreq_put_related_cpus(struct cpufreq_affected_cpus *any) {
-@@ -175,56 +134,32 @@ void cpufreq_put_related_cpus(struct cpufreq_affected_cpus *any) {
- 
- 
- int cpufreq_set_policy(unsigned int cpu, struct cpufreq_policy *policy) {
--	int ret;
- 	if (!policy || !(policy->governor))
- 		return -EINVAL;
- 
--	ret = sysfs_set_policy(cpu, policy);
--	if (ret)
--		ret = proc_set_policy(cpu, policy);
--	return (ret);
-+	return sysfs_set_policy(cpu, policy);
- }
- 
- 
- int cpufreq_modify_policy_min(unsigned int cpu, unsigned long min_freq) {
--	int ret;
--
--	ret = sysfs_modify_policy_min(cpu, min_freq);
--	if (ret)
--		ret = proc_modify_policy_min(cpu, min_freq);
--	return (ret);
-+	return sysfs_modify_policy_min(cpu, min_freq);
- }
- 
- 
- int cpufreq_modify_policy_max(unsigned int cpu, unsigned long max_freq) {
--	int ret;
--
--	ret = sysfs_modify_policy_max(cpu, max_freq);
--	if (ret)
--		ret = proc_modify_policy_max(cpu, max_freq);
--	return (ret);
-+	return sysfs_modify_policy_max(cpu, max_freq);
- }
- 
- 
- int cpufreq_modify_policy_governor(unsigned int cpu, char *governor) {
--	int ret;
--
- 	if ((!governor) || (strlen(governor) > 19))
- 		return -EINVAL;
- 
--	ret = sysfs_modify_policy_governor(cpu, governor);
--	if (ret)
--		ret = proc_modify_policy_governor(cpu, governor);
--	return (ret);
-+	return sysfs_modify_policy_governor(cpu, governor);
- }
- 
- int cpufreq_set_frequency(unsigned int cpu, unsigned long target_frequency) {
--	int ret;
--
--	ret = sysfs_set_frequency(cpu, target_frequency);
--	if (ret)
--		ret = proc_set_frequency(cpu, target_frequency);
--	return (ret);
-+	return sysfs_set_frequency(cpu, target_frequency);
- }
- 
- struct cpufreq_stats * cpufreq_get_stats(unsigned int cpu, unsigned long long *total_time) {
-diff --git a/lib/interfaces.h b/lib/interfaces.h
-deleted file mode 100644
-index 67ee131..0000000
---- a/lib/interfaces.h
-+++ /dev/null
-@@ -1,76 +0,0 @@
--#ifdef INTERFACE_SYSFS
--
--extern unsigned int sysfs_cpu_exists(unsigned int cpu);
--extern unsigned long sysfs_get_freq_kernel(unsigned int cpu);
--extern unsigned long sysfs_get_freq_hardware(unsigned int cpu);
--extern unsigned long sysfs_get_transition_latency(unsigned int cpu);
--extern int sysfs_get_hardware_limits(unsigned int cpu, unsigned long *min, unsigned long *max);
--extern char * sysfs_get_driver(unsigned int cpu);
--extern struct cpufreq_policy * sysfs_get_policy(unsigned int cpu);
--extern struct cpufreq_available_governors * sysfs_get_available_governors(unsigned int cpu);
--extern struct cpufreq_available_frequencies * sysfs_get_available_frequencies(unsigned int cpu);
--extern struct cpufreq_affected_cpus * sysfs_get_affected_cpus(unsigned int cpu);
--extern struct cpufreq_affected_cpus * sysfs_get_related_cpus(unsigned int cpu);
--extern struct cpufreq_stats * sysfs_get_stats(unsigned int cpu, unsigned long long *total_time);
--extern unsigned long sysfs_get_transitions(unsigned int cpu);
--extern int sysfs_set_policy(unsigned int cpu, struct cpufreq_policy *policy);
--extern int sysfs_modify_policy_min(unsigned int cpu, unsigned long min_freq);
--extern int sysfs_modify_policy_max(unsigned int cpu, unsigned long max_freq);
--extern int sysfs_modify_policy_governor(unsigned int cpu, char *governor);
--extern int sysfs_set_frequency(unsigned int cpu, unsigned long target_frequency);
--
--#else
--
--static inline unsigned int sysfs_cpu_exists(unsigned int cpu) { return -ENOSYS; }
--static inline unsigned long sysfs_get_freq_kernel(unsigned int cpu) { return 0; }
--static inline unsigned long sysfs_get_freq_hardware(unsigned int cpu) { return 0; }
--static inline unsigned long sysfs_get_transition_latency(unsigned int cpu) { return 0; }
--static inline int sysfs_get_hardware_limits(unsigned int cpu, unsigned long *min, unsigned long *max)  { return -ENOSYS; }
--static inline char * sysfs_get_driver(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_policy * sysfs_get_policy(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_available_governors * sysfs_get_available_governors(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_available_frequencies * sysfs_get_available_frequencies(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_affected_cpus * sysfs_get_affected_cpus(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_related_cpus * sysfs_get_affected_cpus(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_stats * sysfs_get_stats(unsigned int cpu, unsigned long long *total_time) { return NULL; }
--static inline unsigned long sysfs_get_transitions(unsigned int cpu) { return 0; }
--static inline int sysfs_set_policy(unsigned int cpu, struct cpufreq_policy *policy) { return -ENOSYS; }
--static inline int sysfs_modify_policy_min(unsigned int cpu, unsigned long min_freq) { return -ENOSYS; }
--static inline int sysfs_modify_policy_max(unsigned int cpu, unsigned long max_freq) { return -ENOSYS; }
--static inline int sysfs_modify_policy_governor(unsigned int cpu, char *governor) { return -ENOSYS; }
--static inline int sysfs_set_frequency(unsigned int cpu, unsigned long target_frequency) { return -ENOSYS; }
--
--#endif
--
--
--#ifdef INTERFACE_PROC
--
--extern int proc_cpu_exists(unsigned int cpu);
--extern unsigned long proc_get_freq_kernel(unsigned int cpu);
--extern struct cpufreq_policy * proc_get_policy(unsigned int cpu);
--extern int proc_set_policy(unsigned int cpu, struct cpufreq_policy *policy);
--extern int proc_set_frequency(unsigned int cpu, unsigned long target_frequency);
--#else
--
--static inline int proc_cpu_exists(unsigned int cpu) {return -ENOSYS; }
--static inline unsigned long proc_get_freq_kernel(unsigned int cpu) { return 0; }
--static inline struct cpufreq_policy * proc_get_policy(unsigned int cpu) { return NULL; }
--static inline int proc_set_policy(unsigned int cpu, struct cpufreq_policy *policy) { return -ENOSYS; }
--static inline int proc_set_frequency(unsigned int cpu, unsigned long target_frequency) { return -ENOSYS; }
--
--#endif
--
--/* these aren't implemented in /proc, and probably never will...*/
--
--static inline unsigned long proc_get_freq_hardware(unsigned int cpu) { return 0; }
--static inline unsigned long proc_get_transition_latency(unsigned int cpu) { return -ENOSYS; }
--static inline int proc_get_hardware_limits(unsigned int cpu, unsigned long *min, unsigned long *max)  { return -ENOSYS; }
--static inline char * proc_get_driver(unsigned int cpu) {return NULL; }
--static inline struct cpufreq_available_governors * proc_get_available_governors(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_available_frequencies * proc_get_available_frequencies(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_affected_cpus * proc_get_affected_cpus(unsigned int cpu) { return NULL; }
--static inline struct cpufreq_affected_cpus * proc_get_related_cpus(unsigned int cpu) { return NULL; }
--static inline int proc_modify_policy_min(unsigned int cpu, unsigned long min_freq) { return -ENOSYS; }
--static inline int proc_modify_policy_max(unsigned int cpu, unsigned long max_freq) { return -ENOSYS; }
--static inline int proc_modify_policy_governor(unsigned int cpu, char *governor) { return -ENOSYS; }
--
-diff --git a/lib/proc.c b/lib/proc.c
-deleted file mode 100644
-index 38d8483..0000000
---- a/lib/proc.c
-+++ /dev/null
-@@ -1,216 +0,0 @@
--/*
-- *  (C) 2004  Dominik Brodowski <linux@dominikbrodowski.de>
-- *
-- *  Licensed under the terms of the GNU GPL License version 2.
-- */
--
--#include <stdio.h>
--#include <errno.h>
--#include <stdlib.h>
--#include <string.h>
--
--#include "cpufreq.h"
--
--#define MAX_LINE_LEN 255
--
--static int readout_proc_cpufreq(unsigned int cpu, unsigned long *min, unsigned long *max, char **governor)
--{
--	FILE *fp;
--	char value[MAX_LINE_LEN];
--	char gov_value[MAX_LINE_LEN];
--	int ret = -ENODEV;
--	unsigned int cpu_read;
--	unsigned int tmp1, tmp2;
--
--	if ((!min) || (!max) || (!governor))
--		return -EINVAL;
--
--	fp = fopen("/proc/cpufreq","r");
--	if (!fp)
--		return -ENODEV;
--
--
--	if (!fgets(value, MAX_LINE_LEN, fp)) {
--		ret = -EIO;
--		goto error;
--	}
--
--	if (strlen(value) > (MAX_LINE_LEN - 10)) {
--		ret = -EIO;
--		goto error;
--	}
--
--	while(!feof(fp)) {
--		if (!fgets(value, MAX_LINE_LEN, fp)) {
--			ret = -EIO;
--			goto error;
--		}
--
--		if (strlen(value) > (MAX_LINE_LEN - 10)) {
--			ret = -EIO;
--			goto error;
--		}
--
--		ret = sscanf(value, "CPU%3d    %9lu kHz (%3d %%)  -  %9lu kHz (%3d %%)  -  %s",
--			     &cpu_read , min, &tmp1, max, &tmp2, gov_value);
--		if (ret != 6) {
--			ret = -EIO;
--			goto error;
--		}
--
--		if (cpu_read != cpu)
--			continue;
--
--		if ((tmp2 < tmp1) || (tmp2 > 100) || (*max < *min)) {
--			ret = -ENOSYS;
--			goto error;
--		}
--
--		tmp1 = strlen(gov_value);
--		if (tmp1 > 20) {
--			ret = -ENOSYS;
--			goto error;
--		}
--
--		*governor = malloc(sizeof(char) * (tmp1 + 2));
--		if (!*governor) {
--			ret = -ENOMEM;
--			goto error;
--		}
--
--		strncpy(*governor, gov_value, tmp1);
--		(*governor)[tmp1] = '\0';
--
--		ret = 0;
--
--		break;
--	}
--
-- error:
--	fclose(fp);
--	return (ret);
--}
--
--int proc_cpu_exists(unsigned int cpu) {
--	unsigned long tmp1, tmp2;
--	char *tmp3;
--	int ret;
--
--	ret = readout_proc_cpufreq(cpu, &tmp1, &tmp2, &tmp3);
--	if (ret)
--		return -ENODEV;
--
--	free(tmp3);
--	return 0;
--}
--
--struct cpufreq_policy * proc_get_policy(unsigned int cpu) {
--	struct cpufreq_policy tmp;
--	struct cpufreq_policy *ret;
--	int err;
--
--	err = readout_proc_cpufreq(cpu, &tmp.min, &tmp.max, &tmp.governor);
--	if (err)
--		return NULL;
--
--	ret = malloc(sizeof(struct cpufreq_policy));
--	if (!ret)
--		return NULL;
--
--	ret->min = tmp.min;
--	ret->max = tmp.max;
--	ret->governor = tmp.governor;
--
--	return (ret);
--}
--
--unsigned long proc_get_freq_kernel(unsigned int cpu) {
--	FILE *fp;
--	char value[MAX_LINE_LEN];
--	char file[MAX_LINE_LEN];
--	unsigned long value2;
--
--	snprintf(file, MAX_LINE_LEN, "/proc/sys/cpu/%u/speed", cpu);
--
--	fp = fopen(file,"r");
--	if (!fp)
--		return 0;
--
--	if (!fgets(value, MAX_LINE_LEN, fp)) {
--		fclose(fp);
--		return 0;
--	}
--
--	fclose(fp);
--
--	if (strlen(value) > (MAX_LINE_LEN - 10)) {
--		return 0;
--	}
--
--	if (sscanf(value, "%lu", &value2) != 1)
--		return 0;
--
--	return value2;
--}
--
--int proc_set_policy(unsigned int cpu, struct cpufreq_policy *policy) {
--	FILE *fp;
--	char value[MAX_LINE_LEN];
--	int ret = -ENODEV;
--
--	if ((!policy) || (!policy->governor) || (strlen(policy->governor) > 15))
--		return -EINVAL;
--
--	snprintf(value, MAX_LINE_LEN, "%d:%lu:%lu:%s", cpu, policy->min, policy->max, policy->governor);
--
--	value[MAX_LINE_LEN - 1]='\0';
--
--	fp = fopen("/proc/cpufreq","r+");
--	if (!fp)
--		return -ENODEV;
--	ret = fputs(value, fp);
--	fclose(fp);
--
--	if (ret < 0)
--		return (ret);
--
--	return 0;
--}
--
--int proc_set_frequency(unsigned int cpu, unsigned long target_frequency) {
--	struct cpufreq_policy *pol = proc_get_policy(cpu);
--	struct cpufreq_policy new_pol;
--	char userspace_gov[] = "userspace";
--	FILE *fp;
--	char value[MAX_LINE_LEN];
--	char file[MAX_LINE_LEN];
--	int ret = 0;
--
--	if (!pol)
--		return -ENODEV;
--
--	if (strncmp(pol->governor, userspace_gov, 9) != 0) {
--		cpufreq_put_policy(pol);
--		new_pol.min = pol->min;
--		new_pol.max = pol->max;
--		new_pol.governor = userspace_gov;
--		ret = proc_set_policy(cpu, &new_pol);
--		if (ret)
--			return (ret);
--	}
--
--
--	snprintf(file, MAX_LINE_LEN, "/proc/sys/cpu/%u/speed", cpu);
--	snprintf(value, MAX_LINE_LEN, "%lu", target_frequency);
--
--	fp = fopen(file,"r+");
--	if (!fp)
--		return -EINVAL;
--	ret = fputs(value, fp);
--	fclose(fp);
--
--	if (ret < 0)
--		return (ret);
--
--	return 0;
--}
-diff --git a/lib/sysfs.h b/lib/sysfs.h
-new file mode 100644
-index 0000000..99619d5
---- /dev/null
-+++ b/lib/sysfs.h
-@@ -0,0 +1,18 @@
-+extern unsigned int sysfs_cpu_exists(unsigned int cpu);
-+extern unsigned long sysfs_get_freq_kernel(unsigned int cpu);
-+extern unsigned long sysfs_get_freq_hardware(unsigned int cpu);
-+extern unsigned long sysfs_get_transition_latency(unsigned int cpu);
-+extern int sysfs_get_hardware_limits(unsigned int cpu, unsigned long *min, unsigned long *max);
-+extern char * sysfs_get_driver(unsigned int cpu);
-+extern struct cpufreq_policy * sysfs_get_policy(unsigned int cpu);
-+extern struct cpufreq_available_governors * sysfs_get_available_governors(unsigned int cpu);
-+extern struct cpufreq_available_frequencies * sysfs_get_available_frequencies(unsigned int cpu);
-+extern struct cpufreq_affected_cpus * sysfs_get_affected_cpus(unsigned int cpu);
-+extern struct cpufreq_affected_cpus * sysfs_get_related_cpus(unsigned int cpu);
-+extern struct cpufreq_stats * sysfs_get_stats(unsigned int cpu, unsigned long long *total_time);
-+extern unsigned long sysfs_get_transitions(unsigned int cpu);
-+extern int sysfs_set_policy(unsigned int cpu, struct cpufreq_policy *policy);
-+extern int sysfs_modify_policy_min(unsigned int cpu, unsigned long min_freq);
-+extern int sysfs_modify_policy_max(unsigned int cpu, unsigned long max_freq);
-+extern int sysfs_modify_policy_governor(unsigned int cpu, char *governor);
-+extern int sysfs_set_frequency(unsigned int cpu, unsigned long target_frequency);
-diff --git a/po/cs.po b/po/cs.po
-index a4c14a7..4fdfffb 100644
---- a/po/cs.po
-+++ b/po/cs.po
-@@ -9,7 +9,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: cs\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2008-07-17 11:29+0200\n"
-+"POT-Creation-Date: 2010-09-01 01:20+0200\n"
- "PO-Revision-Date: 2008-06-11 16:26+0200\n"
- "Last-Translator: Karel Volný <kavol@seznam.cz>\n"
- "Language-Team: Czech <diskuze@lists.l10n.cz>\n"
-@@ -24,64 +24,74 @@ msgstr ""
- msgid "Couldn't count the number of CPUs (%s: %s), assuming 1\n"
- msgstr "Nelze zjistit počet CPU (%s: %s), předpokládá se 1.\n"
- 
--#: utils/info.c:67
-+#: utils/info.c:68
- #, c-format
- msgid ""
- "          minimum CPU frequency  -  maximum CPU frequency  -  governor\n"
- msgstr ""
- "         minimální frekvence CPU - maximální frekvence CPU -  regulátor\n"
- 
--#: utils/info.c:128
-+#: utils/info.c:156
- #, c-format
- msgid "couldn't analyze CPU %d as it doesn't seem to be present\n"
- msgstr "nelze analyzovat CPU %d, vypadá to, že není přítomen\n"
- 
--#: utils/info.c:132
-+#: utils/info.c:160
- #, c-format
- msgid "analyzing CPU %d:\n"
- msgstr "analyzuji CPU %d:\n"
- 
--#: utils/info.c:139
-+#: utils/info.c:167
- #, c-format
- msgid "  no or unknown cpufreq driver is active on this CPU\n"
- msgstr "  pro tento CPU není aktivní žádný známý ovladač cpufreq\n"
- 
--#: utils/info.c:141
-+#: utils/info.c:169
- #, c-format
- msgid "  driver: %s\n"
- msgstr "  ovladač: %s\n"
- 
--#: utils/info.c:147
--#, c-format
--msgid "  CPUs which need to switch frequency at the same time: "
-+#: utils/info.c:175
-+#, fuzzy, c-format
-+msgid "  CPUs which run at the same hardware frequency: "
-+msgstr "  CPU, které musí měnit frekvenci zároveň: "
-+
-+#: utils/info.c:186
-+#, fuzzy, c-format
-+msgid "  CPUs which need to have their frequency coordinated by software: "
- msgstr "  CPU, které musí měnit frekvenci zároveň: "
- 
--#: utils/info.c:157
-+#: utils/info.c:197
-+#, c-format
-+msgid "  maximum transition latency: "
-+msgstr ""
-+
-+#: utils/info.c:203
- #, c-format
- msgid "  hardware limits: "
- msgstr "  hardwarové meze: "
- 
--#: utils/info.c:166
-+#: utils/info.c:212
- #, c-format
- msgid "  available frequency steps: "
- msgstr "  dostupné frekvence: "
- 
--#: utils/info.c:179
-+#: utils/info.c:225
- #, c-format
- msgid "  available cpufreq governors: "
- msgstr "  dostupné regulátory: "
- 
--#: utils/info.c:190
-+#: utils/info.c:236
- #, c-format
- msgid "  current policy: frequency should be within "
- msgstr "  současná taktika: frekvence by měla být mezi "
- 
--#: utils/info.c:192
-+#: utils/info.c:238
- #, c-format
- msgid " and "
- msgstr " a "
- 
--#: utils/info.c:196
-+#: utils/info.c:242
- #, c-format
- msgid ""
- "The governor \"%s\" may decide which speed to use\n"
-@@ -90,51 +100,51 @@ msgstr ""
- "  Regulátor \"%s\" může rozhodnout jakou frekvenci použít\n"
- "                    v těchto mezích.\n"
- 
--#: utils/info.c:203
-+#: utils/info.c:249
- #, c-format
- msgid "  current CPU frequency is "
- msgstr "  současná frekvence CPU je "
- 
--#: utils/info.c:206
-+#: utils/info.c:252
- #, c-format
- msgid " (asserted by call to hardware)"
- msgstr "  (zjištěno hardwarovým voláním)"
- 
--#: utils/info.c:214
-+#: utils/info.c:260
- #, c-format
- msgid "  cpufreq stats: "
- msgstr "  statistika cpufreq: "
- 
--#: utils/info.c:361 utils/set.c:30
-+#: utils/info.c:440 utils/set.c:31
- #, c-format
- msgid "Report errors and bugs to %s, please.\n"
- msgstr ""
- "Chyby v programu prosím hlaste na %s (anglicky).\n"
- "Chyby v překladu prosím hlaste na kavol@seznam.cz (česky ;-)\n"
- 
--#: utils/info.c:365
-+#: utils/info.c:444
- #, c-format
- msgid "Usage: cpufreq-info [options]\n"
- msgstr "Užití: cpufreq-info [přepínače]\n"
- 
--#: utils/info.c:366 utils/set.c:35
-+#: utils/info.c:445 utils/set.c:37
- #, c-format
- msgid "Options:\n"
- msgstr "Přepínače:\n"
- 
--#: utils/info.c:367
-+#: utils/info.c:446
- #, c-format
- msgid ""
- "  -c CPU, --cpu CPU    CPU number which information shall be determined "
- "about\n"
- msgstr "  -c CPU, --cpu CPU    Číslo CPU, o kterém se mají zjistit informace\n"
- 
--#: utils/info.c:368
-+#: utils/info.c:447
- #, c-format
- msgid "  -e, --debug          Prints out debug information\n"
- msgstr "  -e, --debug          Vypíše ladicí informace\n"
- 
--#: utils/info.c:369
-+#: utils/info.c:448
- #, c-format
- msgid ""
- "  -f, --freq           Get frequency the CPU currently runs at, according\n"
-@@ -143,7 +153,7 @@ msgstr ""
- "  -f, --freq           Zjistí aktuální frekvenci, na které CPU běží\n"
- "                       podle cpufreq *\n"
- 
--#: utils/info.c:371
-+#: utils/info.c:450
- #, c-format
- msgid ""
- "  -w, --hwfreq         Get frequency the CPU currently runs at, by reading\n"
-@@ -152,7 +162,7 @@ msgstr ""
- "  -w, --hwfreq         Zjistí aktuální frekvenci, na které CPU běží\n"
- "                       z hardware (dostupné jen uživateli root) *\n"
- 
--#: utils/info.c:373
-+#: utils/info.c:452
- #, c-format
- msgid ""
- "  -l, --hwlimits       Determine the minimum and maximum CPU frequency "
-@@ -161,36 +171,52 @@ msgstr ""
- "  -l, --hwlimits       Zjistí minimální a maximální dostupnou frekvenci CPU "
- "*\n"
- 
--#: utils/info.c:374
-+#: utils/info.c:453
- #, c-format
- msgid "  -d, --driver         Determines the used cpufreq kernel driver *\n"
- msgstr "  -d, --driver         Zjistí aktivní ovladač cpufreq *\n"
- 
--#: utils/info.c:375
-+#: utils/info.c:454
- #, c-format
- msgid "  -p, --policy         Gets the currently used cpufreq policy *\n"
- msgstr "  -p, --policy         Zjistí aktuální taktiku cpufreq *\n"
- 
--#: utils/info.c:376
-+#: utils/info.c:455
- #, c-format
- msgid "  -g, --governors      Determines available cpufreq governors *\n"
- msgstr "  -g, --governors      Zjistí dostupné regulátory cpufreq *\n"
- 
--#: utils/info.c:377
--#, c-format
-+#: utils/info.c:456
-+#, fuzzy, c-format
- msgid ""
--"  -a, --affected-cpus  Determines which CPUs can only switch frequency at "
--"the\n"
--"                       same time *\n"
-+"  -r, --related-cpus   Determines which CPUs run at the same hardware "
-+"frequency *\n"
- msgstr ""
- "  -a, --affected-cpus  Zjistí, které CPU musí měnit frekvenci zároveň *\n"
- 
--#: utils/info.c:379
-+#: utils/info.c:457
-+#, fuzzy, c-format
-+msgid ""
-+"  -a, --affected-cpus  Determines which CPUs need to have their frequency\n"
-+"                       coordinated by software *\n"
-+msgstr ""
-+"  -a, --affected-cpus  Zjistí, které CPU musí měnit frekvenci zároveň *\n"
-+
-+#: utils/info.c:459
- #, c-format
- msgid "  -s, --stats          Shows cpufreq statistics if available\n"
- msgstr "  -s, --stats          Zobrazí statistiku cpufreq, je-li dostupná\n"
- 
--#: utils/info.c:380
-+#: utils/info.c:460
-+#, fuzzy, c-format
-+msgid ""
-+"  -y, --latency        Determines the maximum latency on CPU frequency "
-+"changes *\n"
-+msgstr ""
-+"  -l, --hwlimits       Zjistí minimální a maximální dostupnou frekvenci CPU "
-+"*\n"
-+
-+#: utils/info.c:461
- #, c-format
- msgid ""
- "  -o, --proc           Prints out information like provided by the /proc/"
-@@ -200,21 +226,21 @@ msgstr ""
- "  -o, --proc           Vypíše informace ve formátu, jaký používalo rozhraní\n"
- "                       /proc/cpufreq v kernelech řady 2.4 a časné 2.6\n"
- 
--#: utils/info.c:382
--#, c-format
-+#: utils/info.c:463
-+#, fuzzy, c-format
- msgid ""
--"  -m, --human          human-readable output for the -f, -w and -s "
-+"  -m, --human          human-readable output for the -f, -w, -s and -y "
- "parameters\n"
- msgstr ""
- "  -m, --human          Výstup parametrů -f, -w a -s v „lidmi čitelném“ "
- "formátu\n"
- 
--#: utils/info.c:383 utils/set.c:42
-+#: utils/info.c:464
- #, c-format
- msgid "  -h, --help           Prints out this screen\n"
- msgstr "  -h, --help           Vypíše tuto nápovědu\n"
- 
--#: utils/info.c:386
-+#: utils/info.c:467
- #, c-format
- msgid ""
- "If no argument or only the -c, --cpu parameter is given, debug output about\n"
-@@ -224,7 +250,7 @@ msgstr ""
- "jsou\n"
- "vypsány ladicí informace, což může být užitečné například při hlášení chyb.\n"
- 
--#: utils/info.c:388
-+#: utils/info.c:469
- #, c-format
- msgid ""
- "For the arguments marked with *, omitting the -c or --cpu argument is\n"
-@@ -233,14 +259,14 @@ msgstr ""
- "Není-li při použití přepínačů označených * zadán parametr -c nebo --cpu,\n"
- "předpokládá se jeho hodnota 0.\n"
- 
--#: utils/info.c:478
-+#: utils/info.c:563
- #, c-format
- msgid ""
- "The argument passed to this tool can't be combined with passing a --cpu "
- "argument\n"
- msgstr "Zadaný parametr nemůže být použit zároveň s přepínačem -c nebo --cpu\n"
- 
--#: utils/info.c:491
-+#: utils/info.c:576
- #, c-format
- msgid ""
- "You can't specify more than one --cpu parameter and/or\n"
-@@ -249,17 +275,17 @@ msgstr ""
- "Nelze zadat více než jeden parametr -c nebo --cpu\n"
- "anebo více než jeden parametr určující výstup\n"
- 
--#: utils/info.c:497 utils/set.c:79
-+#: utils/info.c:582 utils/set.c:95
- #, c-format
- msgid "invalid or unknown argument\n"
- msgstr "neplatný nebo neznámý parametr\n"
- 
--#: utils/set.c:34
-+#: utils/set.c:36
- #, c-format
- msgid "Usage: cpufreq-set [options]\n"
- msgstr "Užití: cpufreq-set [přepínače]\n"
- 
--#: utils/set.c:36
-+#: utils/set.c:38
- #, c-format
- msgid ""
- "  -c CPU, --cpu CPU        number of CPU where cpufreq settings shall be "
-@@ -268,7 +294,7 @@ msgstr ""
- "  -c CPU, --cpu CPU        Číslo CPU pro který se má provést nastavení "
- "cpufreq\n"
- 
--#: utils/set.c:37
-+#: utils/set.c:39
- #, c-format
- msgid ""
- "  -d FREQ, --min FREQ      new minimum CPU frequency the governor may "
-@@ -277,7 +303,7 @@ msgstr ""
- "  -d FREQ, --min FREQ      Nová nejnižší frekvence, kterou může regulátor "
- "vybrat\n"
- 
--#: utils/set.c:38
-+#: utils/set.c:40
- #, c-format
- msgid ""
- "  -u FREQ, --max FREQ      new maximum CPU frequency the governor may "
-@@ -286,12 +312,12 @@ msgstr ""
- "  -u FREQ, --max FREQ      Nová nejvyšší frekvence, kterou může regulátor "
- "zvolit\n"
- 
--#: utils/set.c:39
-+#: utils/set.c:41
- #, c-format
- msgid "  -g GOV, --governor GOV   new cpufreq governor\n"
- msgstr "  -g GOV, --governors GOV  Nový regulátor cpufreq\n"
- 
--#: utils/set.c:40
-+#: utils/set.c:42
- #, c-format
- msgid ""
- "  -f FREQ, --freq FREQ     specific frequency to be set. Requires userspace\n"
-@@ -303,6 +329,16 @@ msgstr ""
- 
- #: utils/set.c:44
- #, c-format
-+msgid "  -r, --related            Switches all hardware-related CPUs\n"
-+msgstr ""
-+
-+#: utils/set.c:45
-+#, fuzzy, c-format
-+msgid "  -h, --help               Prints out this screen\n"
-+msgstr "  -h, --help           Vypíše tuto nápovědu\n"
-+
-+#: utils/set.c:47
-+#, c-format
- msgid ""
- "Notes:\n"
- "1. Omitting the -c or --cpu argument is equivalent to setting it to zero\n"
-@@ -322,30 +358,7 @@ msgstr ""
- "   připojením názvu jednotky bez mezery mezi číslem a jednotkou\n"
- "   (FREQ v kHz =^ Hz * 0,001 = ^ MHz * 1000 =^ GHz * 1000000)\n"
- 
--#: utils/set.c:251
--#, c-format
--msgid ""
--"the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n"
--"-g/--governor parameters\n"
--msgstr ""
--"přepínač -f/--freq nemůže být použit zároveň\n"
--"s přepínačem -d/--min, -u/--max nebo -g/--governor\n"
--
--#: utils/set.c:262
--#, c-format
--msgid ""
--"At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n"
--"-g/--governor must be passed\n"
--msgstr ""
--"Musí být zadán alespoň jeden přepínač\n"
--"-f/--freq, -d/--min, -u/--max nebo -g/--governor\n"
--
--#: utils/set.c:282
--#, c-format
--msgid "wrong, unknown or unhandled CPU?\n"
--msgstr "neznámý nebo nepodporovaný CPU?\n"
--
--#: utils/set.c:306
-+#: utils/set.c:69
- #, c-format
- msgid ""
- "Error setting new values. Common errors:\n"
-@@ -365,3 +378,26 @@ msgstr ""
- "- Snažíte se nastavit určitou frekvenci, ale není dostupný\n"
- "  regulátor ‚userspace‘, například protože není nahrán v jádře,\n"
- "  nebo nelze na tomto hardware nastavit určitou frekvenci?\n"
-+
-+#: utils/set.c:183
-+#, c-format
-+msgid "wrong, unknown or unhandled CPU?\n"
-+msgstr "neznámý nebo nepodporovaný CPU?\n"
-+
-+#: utils/set.c:336
-+#, c-format
-+msgid ""
-+"the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n"
-+"-g/--governor parameters\n"
-+msgstr ""
-+"přepínač -f/--freq nemůže být použit zároveň\n"
-+"s přepínačem -d/--min, -u/--max nebo -g/--governor\n"
-+
-+#: utils/set.c:342
-+#, c-format
-+msgid ""
-+"At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n"
-+"-g/--governor must be passed\n"
-+msgstr ""
-+"Musí být zadán alespoň jeden přepínač\n"
-+"-f/--freq, -d/--min, -u/--max nebo -g/--governor\n"
-diff --git a/po/de.po b/po/de.po
-index 4c3a2bb..a5970ae 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -7,7 +7,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: cpufrequtils 006\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2009-08-09 11:53+0200\n"
-+"POT-Creation-Date: 2010-09-01 01:20+0200\n"
- "PO-Revision-Date: 2009-08-08 17:18+0100\n"
- "Last-Translator:  <linux@dominikbrodowski.net>\n"
- "Language-Team: NONE\n"
-diff --git a/po/fr.po b/po/fr.po
-index fffdb42..4ebb40b 100644
---- a/po/fr.po
-+++ b/po/fr.po
-@@ -8,7 +8,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: cpufrequtils 0.1-pre2\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2008-07-17 11:29+0200\n"
-+"POT-Creation-Date: 2010-09-01 01:20+0200\n"
- "PO-Revision-Date: 2004-11-17 15:53+1000\n"
- "Last-Translator: Bruno Ducrot <ducrot@poupinou.org>\n"
- "Language-Team: NONE\n"
-@@ -21,64 +21,74 @@ msgstr ""
- msgid "Couldn't count the number of CPUs (%s: %s), assuming 1\n"
- msgstr "D�termination du nombre de CPUs (%s : %s) impossible.  Assume 1\n"
- 
--#: utils/info.c:67
-+#: utils/info.c:68
- #, c-format
- msgid ""
- "          minimum CPU frequency  -  maximum CPU frequency  -  governor\n"
- msgstr ""
- "         Fr�quence CPU minimale - Fr�quence CPU maximale  - r�gulateur\n"
- 
--#: utils/info.c:128
-+#: utils/info.c:156
- #, c-format
- msgid "couldn't analyze CPU %d as it doesn't seem to be present\n"
- msgstr "analyse du CPU %d impossible puisqu'il ne semble pas �tre pr�sent\n"
- 
--#: utils/info.c:132
-+#: utils/info.c:160
- #, c-format
- msgid "analyzing CPU %d:\n"
- msgstr "analyse du CPU %d :\n"
- 
--#: utils/info.c:139
-+#: utils/info.c:167
- #, c-format
- msgid "  no or unknown cpufreq driver is active on this CPU\n"
- msgstr "  pas de pilotes cpufreq reconnu pour ce CPU\n"
- 
--#: utils/info.c:141
-+#: utils/info.c:169
- #, c-format
- msgid "  driver: %s\n"
- msgstr "  pilote : %s\n"
- 
--#: utils/info.c:147
--#, c-format
--msgid "  CPUs which need to switch frequency at the same time: "
-+#: utils/info.c:175
-+#, fuzzy, c-format
-+msgid "  CPUs which run at the same hardware frequency: "
-+msgstr "  CPUs qui doivent changer de fr�quences en m�me temps : "
-+
-+#: utils/info.c:186
-+#, fuzzy, c-format
-+msgid "  CPUs which need to have their frequency coordinated by software: "
- msgstr "  CPUs qui doivent changer de fr�quences en m�me temps : "
- 
--#: utils/info.c:157
-+#: utils/info.c:197
-+#, c-format
-+msgid "  maximum transition latency: "
-+msgstr ""
-+
-+#: utils/info.c:203
- #, c-format
- msgid "  hardware limits: "
- msgstr "  limitation mat�rielle : "
- 
--#: utils/info.c:166
-+#: utils/info.c:212
- #, c-format
- msgid "  available frequency steps: "
- msgstr "  plage de fr�quence : "
- 
--#: utils/info.c:179
-+#: utils/info.c:225
- #, c-format
- msgid "  available cpufreq governors: "
- msgstr "  r�gulateurs disponibles : "
- 
--#: utils/info.c:190
-+#: utils/info.c:236
- #, c-format
- msgid "  current policy: frequency should be within "
- msgstr "  tactique actuelle : la fr�quence doit �tre comprise entre "
- 
--#: utils/info.c:192
-+#: utils/info.c:238
- #, c-format
- msgid " and "
- msgstr " et "
- 
--#: utils/info.c:196
-+#: utils/info.c:242
- #, c-format
- msgid ""
- "The governor \"%s\" may decide which speed to use\n"
-@@ -87,37 +97,37 @@ msgstr ""
- "Le r�gulateur \"%s\" est libre de choisir la vitesse\n"
- "                  dans cette plage de fr�quences.\n"
- 
--#: utils/info.c:203
-+#: utils/info.c:249
- #, c-format
- msgid "  current CPU frequency is "
- msgstr "  la fr�quence actuelle de ce CPU est "
- 
--#: utils/info.c:206
-+#: utils/info.c:252
- #, c-format
- msgid " (asserted by call to hardware)"
- msgstr " (v�rifi� par un appel direct du mat�riel)"
- 
--#: utils/info.c:214
-+#: utils/info.c:260
- #, c-format
- msgid "  cpufreq stats: "
- msgstr "  des statistique concernant cpufreq:"
- 
--#: utils/info.c:361 utils/set.c:30
-+#: utils/info.c:440 utils/set.c:31
- #, c-format
- msgid "Report errors and bugs to %s, please.\n"
- msgstr "Veuillez rapportez les erreurs et les bogues � %s, s'il vous plait.\n"
- 
--#: utils/info.c:365
-+#: utils/info.c:444
- #, c-format
- msgid "Usage: cpufreq-info [options]\n"
- msgstr "Usage : cpufreq-info [options]\n"
- 
--#: utils/info.c:366 utils/set.c:35
-+#: utils/info.c:445 utils/set.c:37
- #, c-format
- msgid "Options:\n"
- msgstr "Options :\n"
- 
--#: utils/info.c:367
-+#: utils/info.c:446
- #, c-format
- msgid ""
- "  -c CPU, --cpu CPU    CPU number which information shall be determined "
-@@ -126,12 +136,12 @@ msgstr ""
- "  -c CPU, --cpu CPU    Num�ro du CPU pour lequel l'information sera "
- "affich�e\n"
- 
--#: utils/info.c:368
-+#: utils/info.c:447
- #, c-format
- msgid "  -e, --debug          Prints out debug information\n"
- msgstr "  -e, --debug          Afficher les informations de d�boguage\n"
- 
--#: utils/info.c:369
-+#: utils/info.c:448
- #, c-format
- msgid ""
- "  -f, --freq           Get frequency the CPU currently runs at, according\n"
-@@ -140,7 +150,7 @@ msgstr ""
- "  -f, --freq           Obtenir la fr�quence actuelle du CPU selon le point\n"
- "                       de vue du coeur du syst�me de cpufreq *\n"
- 
--#: utils/info.c:371
-+#: utils/info.c:450
- #, c-format
- msgid ""
- "  -w, --hwfreq         Get frequency the CPU currently runs at, by reading\n"
-@@ -149,7 +159,7 @@ msgstr ""
- "  -w, --hwfreq         Obtenir la fr�quence actuelle du CPU directement par\n"
- "                       le mat�riel (doit �tre root) *\n"
- 
--#: utils/info.c:373
-+#: utils/info.c:452
- #, c-format
- msgid ""
- "  -l, --hwlimits       Determine the minimum and maximum CPU frequency "
-@@ -158,40 +168,57 @@ msgstr ""
- "  -l, --hwlimits       Affiche les fr�quences minimales et maximales du CPU "
- "*\n"
- 
--#: utils/info.c:374
-+#: utils/info.c:453
- #, c-format
- msgid "  -d, --driver         Determines the used cpufreq kernel driver *\n"
- msgstr "  -d, --driver         Affiche le pilote cpufreq utilis� *\n"
- 
--#: utils/info.c:375
-+#: utils/info.c:454
- #, c-format
- msgid "  -p, --policy         Gets the currently used cpufreq policy *\n"
- msgstr "  -p, --policy         Affiche la tactique actuelle de cpufreq *\n"
- 
--#: utils/info.c:376
-+#: utils/info.c:455
- #, c-format
- msgid "  -g, --governors      Determines available cpufreq governors *\n"
- msgstr ""
- "  -g, --governors      Affiche les r�gulateurs disponibles de cpufreq *\n"
- 
--#: utils/info.c:377
--#, c-format
-+#: utils/info.c:456
-+#, fuzzy, c-format
- msgid ""
--"  -a, --affected-cpus  Determines which CPUs can only switch frequency at "
--"the\n"
--"                       same time *\n"
-+"  -r, --related-cpus   Determines which CPUs run at the same hardware "
-+"frequency *\n"
- msgstr ""
- "  -a, --affected-cpus   Affiche quels sont les CPUs qui doivent changer de\n"
- "                        fr�quences en m�me temps *\n"
- 
--#: utils/info.c:379
-+#: utils/info.c:457
-+#, fuzzy, c-format
-+msgid ""
-+"  -a, --affected-cpus  Determines which CPUs need to have their frequency\n"
-+"                       coordinated by software *\n"
-+msgstr ""
-+"  -a, --affected-cpus   Affiche quels sont les CPUs qui doivent changer de\n"
-+"                        fr�quences en m�me temps *\n"
-+
-+#: utils/info.c:459
- #, c-format
- msgid "  -s, --stats          Shows cpufreq statistics if available\n"
- msgstr ""
- "  -s, --stats          Indique des statistiques concernant cpufreq, si\n"
- "                       disponibles\n"
- 
--#: utils/info.c:380
-+#: utils/info.c:460
-+#, fuzzy, c-format
-+msgid ""
-+"  -y, --latency        Determines the maximum latency on CPU frequency "
-+"changes *\n"
-+msgstr ""
-+"  -l, --hwlimits       Affiche les fr�quences minimales et maximales du CPU "
-+"*\n"
-+
-+#: utils/info.c:461
- #, c-format
- msgid ""
- "  -o, --proc           Prints out information like provided by the /proc/"
-@@ -203,21 +230,21 @@ msgstr ""
- "versions\n"
- "                       2.4 et les anciennes versions 2.6 du noyau\n"
- 
--#: utils/info.c:382
--#, c-format
-+#: utils/info.c:463
-+#, fuzzy, c-format
- msgid ""
--"  -m, --human          human-readable output for the -f, -w and -s "
-+"  -m, --human          human-readable output for the -f, -w, -s and -y "
- "parameters\n"
- msgstr ""
- "  -m, --human           affiche dans un format lisible pour un humain\n"
- "                        pour les options -f, -w et -s (MHz, GHz)\n"
- 
--#: utils/info.c:383 utils/set.c:42
-+#: utils/info.c:464
- #, c-format
- msgid "  -h, --help           Prints out this screen\n"
- msgstr "  -h, --help           affiche l'aide-m�moire\n"
- 
--#: utils/info.c:386
-+#: utils/info.c:467
- #, c-format
- msgid ""
- "If no argument or only the -c, --cpu parameter is given, debug output about\n"
-@@ -227,21 +254,21 @@ msgstr ""
- "argument, ou bien si seulement l'argument -c (--cpu) est donn�, afin de\n"
- "faciliter les rapports de bogues par exemple\n"
- 
--#: utils/info.c:388
-+#: utils/info.c:469
- #, c-format
- msgid ""
- "For the arguments marked with *, omitting the -c or --cpu argument is\n"
- "equivalent to setting it to zero\n"
- msgstr "Les arguments avec un * utiliseront le CPU 0 si -c (--cpu) est omis\n"
- 
--#: utils/info.c:478
-+#: utils/info.c:563
- #, c-format
- msgid ""
- "The argument passed to this tool can't be combined with passing a --cpu "
- "argument\n"
- msgstr "Cette option est incompatible avec --cpu\n"
- 
--#: utils/info.c:491
-+#: utils/info.c:576
- #, c-format
- msgid ""
- "You can't specify more than one --cpu parameter and/or\n"
-@@ -250,17 +277,17 @@ msgstr ""
- "On ne peut indiquer plus d'un param�tre --cpu, tout comme l'on ne peut\n"
- "sp�cifier plus d'un argument de formatage\n"
- 
--#: utils/info.c:497 utils/set.c:79
-+#: utils/info.c:582 utils/set.c:95
- #, c-format
- msgid "invalid or unknown argument\n"
- msgstr "option invalide\n"
- 
--#: utils/set.c:34
-+#: utils/set.c:36
- #, c-format
- msgid "Usage: cpufreq-set [options]\n"
- msgstr "Usage : cpufreq-set [options]\n"
- 
--#: utils/set.c:36
-+#: utils/set.c:38
- #, c-format
- msgid ""
- "  -c CPU, --cpu CPU        number of CPU where cpufreq settings shall be "
-@@ -269,7 +296,7 @@ msgstr ""
- "  -c CPU, --cpu CPU        num�ro du CPU � prendre en compte pour les\n"
- "                           changements\n"
- 
--#: utils/set.c:37
-+#: utils/set.c:39
- #, c-format
- msgid ""
- "  -d FREQ, --min FREQ      new minimum CPU frequency the governor may "
-@@ -278,7 +305,7 @@ msgstr ""
- "  -d FREQ, --min FREQ       nouvelle fr�quence minimale du CPU � utiliser\n"
- "                            par le r�gulateur\n"
- 
--#: utils/set.c:38
-+#: utils/set.c:40
- #, c-format
- msgid ""
- "  -u FREQ, --max FREQ      new maximum CPU frequency the governor may "
-@@ -287,12 +314,12 @@ msgstr ""
- "  -u FREQ, --max FREQ       nouvelle fr�quence maximale du CPU � utiliser\n"
- "                            par le r�gulateur\n"
- 
--#: utils/set.c:39
-+#: utils/set.c:41
- #, c-format
- msgid "  -g GOV, --governor GOV   new cpufreq governor\n"
- msgstr "  -g GOV, --governor GOV   active le r�gulateur GOV\n"
- 
--#: utils/set.c:40
-+#: utils/set.c:42
- #, c-format
- msgid ""
- "  -f FREQ, --freq FREQ     specific frequency to be set. Requires userspace\n"
-@@ -304,6 +331,16 @@ msgstr ""
- 
- #: utils/set.c:44
- #, c-format
-+msgid "  -r, --related            Switches all hardware-related CPUs\n"
-+msgstr ""
-+
-+#: utils/set.c:45
-+#, fuzzy, c-format
-+msgid "  -h, --help               Prints out this screen\n"
-+msgstr "  -h, --help           affiche l'aide-m�moire\n"
-+
-+#: utils/set.c:47
-+#, c-format
- msgid ""
- "Notes:\n"
- "1. Omitting the -c or --cpu argument is equivalent to setting it to zero\n"
-@@ -322,30 +359,7 @@ msgstr ""
- "   les valeurs par hz, kHz (par d�faut), MHz, GHz ou THz\n"
- "   (kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000).\n"
- 
--#: utils/set.c:251
--#, c-format
--msgid ""
--"the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n"
--"-g/--governor parameters\n"
--msgstr ""
--"l'option -f/--freq est incompatible avec les options -d/--min, -u/--max et\n"
--"-g/--governor\n"
--
--#: utils/set.c:262
--#, c-format
--msgid ""
--"At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n"
--"-g/--governor must be passed\n"
--msgstr ""
--"L'un de ces param�tres est obligatoire : -f/--freq, -d/--min, -u/--max et\n"
--"-g/--governor\n"
--
--#: utils/set.c:282
--#, c-format
--msgid "wrong, unknown or unhandled CPU?\n"
--msgstr "CPU inconnu ou non support� ?\n"
--
--#: utils/set.c:306
-+#: utils/set.c:69
- #, c-format
- msgid ""
- "Error setting new values. Common errors:\n"
-@@ -368,3 +382,26 @@ msgstr ""
- "- vous voulez utiliser l'option -f/--freq, mais le r�gulateur � userspace �\n"
- "  n'est pas disponible, par exemple parce que le mat�riel ne le supporte\n"
- "  pas, ou bien n'est tout simplement pas charg�.\n"
-+
-+#: utils/set.c:183
-+#, c-format
-+msgid "wrong, unknown or unhandled CPU?\n"
-+msgstr "CPU inconnu ou non support� ?\n"
-+
-+#: utils/set.c:336
-+#, c-format
-+msgid ""
-+"the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n"
-+"-g/--governor parameters\n"
-+msgstr ""
-+"l'option -f/--freq est incompatible avec les options -d/--min, -u/--max et\n"
-+"-g/--governor\n"
-+
-+#: utils/set.c:342
-+#, c-format
-+msgid ""
-+"At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n"
-+"-g/--governor must be passed\n"
-+msgstr ""
-+"L'un de ces param�tres est obligatoire : -f/--freq, -d/--min, -u/--max et\n"
-+"-g/--governor\n"
-diff --git a/po/it.po b/po/it.po
-index 36f09ed..4e9aa83 100644
---- a/po/it.po
-+++ b/po/it.po
-@@ -8,7 +8,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: cpufrequtils 0.3\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2009-08-09 11:53+0200\n"
-+"POT-Creation-Date: 2010-09-01 01:20+0200\n"
- "PO-Revision-Date: 2009-08-15 12:00+0900\n"
- "Last-Translator: Mattia Dongili <malattia@gmail.com>\n"
- "Language-Team: NONE\n"
-diff --git a/po/pt.po b/po/pt.po
-index 75cca0d..2baf1d5 100644
---- a/po/pt.po
-+++ b/po/pt.po
-@@ -8,7 +8,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: cpufrequtils 004\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2009-08-09 11:53+0200\n"
-+"POT-Creation-Date: 2010-09-01 01:20+0200\n"
- "PO-Revision-Date: 2008-06-14 22:16-0400\n"
- "Last-Translator: Claudio Eduardo <claudioeddy@gmail.com>\n"
- "MIME-Version: 1.0\n"
--- 
-1.7.10
-
diff --git a/main/cpufrequtils/0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch b/main/cpufrequtils/0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch
deleted file mode 100644
index 308e73a5b6a..00000000000
--- a/main/cpufrequtils/0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d4490efed068a552e8b67d52a0726458a224c9a0 Mon Sep 17 00:00:00 2001
-From: Frank Arnold <frank.arnold@amd.com>
-Date: Wed, 8 Dec 2010 17:39:14 +0100
-Subject: [PATCH 3/8] cpufrequtils aperf: Fix MSR read on 32-bit
-
-The cpufreq-aperf command does not work on 32-bit systems. The reason
-for that is a wrong count argument passed to the read() call. Instead
-of the buffer size, the size of the pointer to the buffer is used. On
-64-bit systems this just happened to work, because we need to read an
-8 byte value and a pointer has a size of 8 bytes on 64-bit. On 32-bit
-systems only 4 bytes are read, which then triggers the error path.
-
-Signed-off-by: Frank Arnold <frank.arnold@amd.com>
-Reviewed-by: Thomas Renninger <trenn@suse.de>
-Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
----
- utils/aperf.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utils/aperf.c b/utils/aperf.c
-index 1c64501..6302f5a 100644
---- a/utils/aperf.c
-+++ b/utils/aperf.c
-@@ -100,7 +100,7 @@ static int read_msr(int cpu, unsigned int idx, unsigned long long *val)
- 		return -1;
- 	if (lseek(fd, idx, SEEK_CUR) == -1)
- 		goto err;
--	if (read(fd, val, sizeof val) != sizeof *val)
-+	if (read(fd, val, sizeof *val) != sizeof *val)
- 		goto err;
- 	close(fd);
- 	return 0;
--- 
-1.7.10
-
diff --git a/main/cpufrequtils/0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch b/main/cpufrequtils/0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch
deleted file mode 100644
index 94088300f92..00000000000
--- a/main/cpufrequtils/0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9f2efa7bc6969c10562ac2c720d50ff77083e5c2 Mon Sep 17 00:00:00 2001
-From: Roman Vasiyarov <rvasiyarov@gmail.com>
-Date: Mon, 25 Apr 2011 21:34:23 +0400
-Subject: [PATCH 5/8] cpufrequtils sysfs: increase MAX_LINE_LEN
-
-larger sysfs data (>255 bytes) was truncated and thus used improperly
-
-Signed-off-by: Roman Vasiyarov <rvasiyarov@gmail.com>
-Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
----
- lib/sysfs.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/sysfs.c b/lib/sysfs.c
-index 4e0edab..24dd563 100644
---- a/lib/sysfs.c
-+++ b/lib/sysfs.c
-@@ -18,7 +18,7 @@
- #include "cpufreq.h"
- 
- #define PATH_TO_CPU "/sys/devices/system/cpu/"
--#define MAX_LINE_LEN 255
-+#define MAX_LINE_LEN 4096
- #define SYSFS_PATH_MAX 255
- 
- /* helper function to read file from /sys into given buffer */
--- 
-1.7.10
-
diff --git a/main/cpufrequtils/0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch b/main/cpufrequtils/0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch
deleted file mode 100644
index ee3adff75a4..00000000000
--- a/main/cpufrequtils/0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 9085ce6f615d9d2e0182d3ce029b882835bd0a6b Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 26 Jul 2011 19:28:31 -0400
-Subject: [PATCH 6/8] aperf: fix compilation on x86-32 with -fPIC
-
-ebx is used to store the GOT pointer when compiled with -fPIC, so it's
-not usable by inline assembly.
-
-https://bugs.gentoo.org/375967
-
-Signed-off-by: Matt Turner <mattst88@gmail.com>
-Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
----
- utils/cpuid.h |   14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/utils/cpuid.h b/utils/cpuid.h
-index 2bac69a..53da789 100644
---- a/utils/cpuid.h
-+++ b/utils/cpuid.h
-@@ -5,9 +5,21 @@ static inline void __cpuid(unsigned int *eax, unsigned int *ebx,
- 				unsigned int *ecx, unsigned int *edx)
- {
- 	/* ecx is often an input as well as an output. */
--	asm volatile("cpuid"
-+	asm volatile(
-+#if defined(__i386__) && defined(__PIC__)
-+	    "push %%ebx\n"
-+	    "cpuid\n"
-+	    "movl %%ebx, %1\n"
-+	    "pop %%ebx\n"
-+#else
-+	    "cpuid\n"
-+#endif
- 	    : "=a" (*eax),
-+#if defined(__i386__) && defined(__PIC__)
-+	      "=r" (*ebx),
-+#else
- 	      "=b" (*ebx),
-+#endif
- 	      "=c" (*ecx),
- 	      "=d" (*edx)
- 	    : "0" (*eax), "2" (*ecx));
--- 
-1.7.10
-
diff --git a/main/cpufrequtils/0007-po-add-missing-word-in-DE.patch b/main/cpufrequtils/0007-po-add-missing-word-in-DE.patch
deleted file mode 100644
index d116791b14f..00000000000
--- a/main/cpufrequtils/0007-po-add-missing-word-in-DE.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 26ce99ab92ae9f1f367a58b7858a96f4e1e6814c Mon Sep 17 00:00:00 2001
-From: Dominik Brodowski <linux@dominikbrodowski.net>
-Date: Fri, 29 Jul 2011 19:40:46 +0200
-Subject: [PATCH 7/8] po: add missing word in DE
-
-Reported-by: Michael Basse
-Reported-by: <tkranz@zedat.fu-berlin.de>
-Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
----
- po/de.po |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/po/de.po b/po/de.po
-index 1da1f2b..ee793f5 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -304,7 +304,7 @@ msgid ""
- "modified\n"
- msgstr ""
- "  -c CPU, --cpu CPU        Nummer der CPU, deren Taktfrequenz-Einstellung\n"
--"                           werden soll\n"
-+"                           ver�ndert werden soll\n"
- 
- #: utils/set.c:39
- #, c-format
--- 
-1.7.10
-
diff --git a/main/cpufrequtils/0008-cpufrequtils-make-NLS-optional.patch b/main/cpufrequtils/0008-cpufrequtils-make-NLS-optional.patch
deleted file mode 100644
index 03724f1ef05..00000000000
--- a/main/cpufrequtils/0008-cpufrequtils-make-NLS-optional.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From a2f0c39d5f21596bb9f5223e895c0ff210b265d0 Mon Sep 17 00:00:00 2001
-From: Sergey Dryabzhinsky <sergey.dryabzhinsky@gmail.com>
-Date: Sat, 13 Aug 2011 23:02:20 -0400
-Subject: [PATCH 8/8] cpufrequtils: make NLS optional
-
-https://bugs.gentoo.org/205576
-
-Signed-off-by: Matt Turner <mattst88@gmail.com>
-Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
----
- Makefile     |    1 +
- utils/info.c |   10 +++++++++-
- utils/set.c  |   10 +++++++++-
- 3 files changed, 19 insertions(+), 2 deletions(-)
-
-Index: cpufrequtils/Makefile
-===================================================================
---- cpufrequtils.orig/Makefile	2012-05-06 13:30:41.865796974 +0900
-+++ cpufrequtils/Makefile	2012-05-06 13:35:13.994099919 +0900
-@@ -140,6 +140,7 @@
- ifeq ($(strip $(NLS)),true)
- 	INSTALL_NLS += install-gmo
- 	COMPILE_NLS += update-gmo
-+	CPPFLAGS += -DNLS
- endif
- 
- ifeq ($(strip $(CPUFRQ_BENCH)),true)
-Index: cpufrequtils/utils/info.c
-===================================================================
---- cpufrequtils.orig/utils/info.c	2012-05-06 11:56:20.287842838 +0900
-+++ cpufrequtils/utils/info.c	2012-05-06 13:35:13.994099919 +0900
-@@ -10,7 +10,6 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
--#include <libintl.h>
- #include <locale.h>
- 
- #include <getopt.h>
-@@ -18,9 +17,18 @@
- #include "cpufreq.h"
- 
- 
-+#ifdef NLS
-+#include <libintl.h>
- #define _(String) gettext (String)
- #define gettext_noop(String) String
- #define N_(String) gettext_noop (String)
-+#else
-+#define gettext_noop(String) String
-+#define _(String) gettext_noop (String)
-+#define gettext(String) gettext_noop (String)
-+#define N_(String) gettext_noop (String)
-+#define textdomain(String)
-+#endif
- 
- #define LINE_LEN 10
- 
-Index: cpufrequtils/utils/set.c
-===================================================================
---- cpufrequtils.orig/utils/set.c	2012-05-06 11:56:20.287842838 +0900
-+++ cpufrequtils/utils/set.c	2012-05-06 13:35:13.994099919 +0900
-@@ -12,16 +12,24 @@
- #include <limits.h>
- #include <string.h>
- #include <ctype.h>
--#include <libintl.h>
- #include <locale.h>
- 
- #include <getopt.h>
- 
- #include "cpufreq.h"
- 
-+#ifdef NLS
-+#include <libintl.h>
- #define _(String) gettext(String)
- #define gettext_noop(String) String
- #define N_(String) gettext_noop(String)
-+#else
-+#define gettext_noop(String) String
-+#define _(String) gettext_noop (String)
-+#define gettext(String) gettext_noop (String)
-+#define N_(String) gettext_noop (String)
-+#define textdomain(String)
-+#endif
- 
- #define NORM_FREQ_LEN 32
- 
diff --git a/main/cpufrequtils/APKBUILD b/main/cpufrequtils/APKBUILD
deleted file mode 100644
index 028bf74e993..00000000000
--- a/main/cpufrequtils/APKBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=cpufrequtils
-pkgver=008
-pkgrel=4
-pkgdesc="Userspace tools for the kernel cpufreq subsystem"
-url="https://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"
-arch="all"
-license="GPL-2.0"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="sysfsutils"
-makedepends="sysfsutils-dev libtool"
-source="https://sources.archlinux.org/other/cpufrequtils/cpufrequtils-$pkgver.tar.bz2
-	0001-Only-x86-has-cpuid-instruction.patch
-	0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch
-	0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch
-	0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch
-	0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch
-	0007-po-add-missing-word-in-DE.patch
-	0008-cpufrequtils-make-NLS-optional.patch
-	$pkgname.initd
-	$pkgname.confd"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	for i in ../*.patch; do
-		msg "Applying $i..."
-		patch -p1 < $i || return 1
-	done
-}
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	# distcc and ccache makes libtool confused about the tag.
-	# we save 4k by disabling the 2.4 kernel support (PROC=false)
-	make -j1 LIBTOOL_OPT="--tag=CC --silent" \
-		NLS=false \
-		PROC=false \
-		|| return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make mandir=/usr/share/man \
-		NLS=false \
-		INSTALL=install \
-		DESTDIR="$pkgdir" \
-		install || return 1
-	install -D -m755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -D -m644 ../$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-}
-
-sha512sums="d25dcc4fbf15bdca65a3fab6ee33d6cf4b7ab7ed291aea42ed7970b707535ddfcd27fd0189aa48affc2792abf72539f1388cc544019e6fc06353a2f9c5a49d17  cpufrequtils-008.tar.bz2
-4d841bdf2b829518932505747e68d661219337259c1321cdd6671faf2eb72ff6d7f437e42b98f093f9d6564d2bb7be1d4ab645f08b0fbd58ce43339a12be37da  0001-Only-x86-has-cpuid-instruction.patch
-6d8c6beb98d680d4d47c5cc0a067545b1683f259b7d2474a61876b5e97987be30b8d212017122157236ae91bd415793e5f5a0d22214bfc3f2ec72cf626d28832  0002-cpufrequtils-Remove-proc-compile-option-and-interfac.patch
-41082f5ed4cc2962927b12b8dcf4b0dadf6fb227b66b8f383931c7ae0416fa5f73e765664376b50e07948e48060770a7d32bc7422b144c0cb82166515e197f9b  0003-cpufrequtils-aperf-Fix-MSR-read-on-32-bit.patch
-00fb946b1f0b42038297b9cf63740a4123a4aafa5292400225803ef8cd6f1e89b387509c2f74fa6223b3b2b3032b6e0edcbfc3b6bf15aab73bb480c0208330b9  0005-cpufrequtils-sysfs-increase-MAX_LINE_LEN.patch
-7e924424fe3381fd804edfcb0c0c98e73b67e4da7972c7cfe0bc9cfb5febd2ec660f4e84b6bebe2b0b6d2dc5e60279ebe85d1892905b1112ee43d60b46bcdef5  0006-aperf-fix-compilation-on-x86-32-with-fPIC.patch
-69343ab9c9b795523bcd09359f4acdb279510a95c6aa13f70be1d0e2e89ed59952a34f979969f6a3ac3498ad7196ee1c810677fe2d04c5f02207682b820b97bb  0007-po-add-missing-word-in-DE.patch
-5d5eab9815d77b8ae9c6c9d122f52da7501068b9a6fe7766e74a8f59d1296c0bcb6e5a61a643e371e2e1433912d48205c8f522207144bb02a3c9961043eb968b  0008-cpufrequtils-make-NLS-optional.patch
-c9b867a2b49b2ab3c2b7540de7e48443b155a6eb329ec7bd9cfa077993fad66d9168d9009e869191a73e6a4c15448b39294e1eb4cedb364173955209b0b708f9  cpufrequtils.initd
-81adc035c781c2c6f94fdb9a69dfb5d867830ab0685f2badce055b9f8095881456522fc0cd5386140d920fd1d9b96c82d8dcecd9962e3e6ef5f9be926153802b  cpufrequtils.confd"
diff --git a/main/cpufrequtils/cpufrequtils.confd b/main/cpufrequtils/cpufrequtils.confd
deleted file mode 100644
index 68f5b7594c6..00000000000
--- a/main/cpufrequtils/cpufrequtils.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/conf.d/cpufrequtils: config file for /etc/init.d/cpufrequtils
-
-# Options when starting cpufreq (given to the `cpufreq-set` program)
-START_OPTS="--governor ondemand"
-
-# Options when stopping cpufreq (given to the `cpufreq-set` program)
-STOP_OPTS="--governor performance"
diff --git a/main/cpufrequtils/cpufrequtils.initd b/main/cpufrequtils/cpufrequtils.initd
deleted file mode 100644
index 6e032424de5..00000000000
--- a/main/cpufrequtils/cpufrequtils.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-init.d-005,v 1.2 2008/10/21 21:20:59 vapier Exp $
-
-affect_change() {
-	local c ret=0
-	ebegin "Running cpufreq-set $*"
-	for c in $(cpufreq-info -o | awk '$1 == "CPU" { print $2 }') ; do
-		cpufreq-set -c ${c} $*
-		: $((ret+=$?))
-	done
-	eend ${ret}
-}
-
-start() {
-	affect_change ${START_OPTS}
-}
-
-stop() {
-	affect_change ${STOP_OPTS}
-}
diff --git a/main/cracklib-words/APKBUILD b/main/cracklib-words/APKBUILD
deleted file mode 100644
index 0530b17d35c..00000000000
--- a/main/cracklib-words/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=cracklib-words
-pkgver=20080507
-pkgrel=3
-pkgdesc="Large list of words for crack/craclib"
-options="!check" # No testsuite
-url="https://sourceforge.net/projects/cracklib"
-arch="noarch"
-license="LGPL-2.0-or-later"
-source="$pkgname-$pkgver.gz::https://downloads.sourceforge.net/cracklib/cracklib-words-$pkgver.gz"
-builddir="$srcdir"
-
-unpack() {
-	gunzip "$srcdir"/"$pkgname-$pkgver.gz"
-}
-
-package() {
-	install -m644 -D "$pkgname-$pkgver" "$pkgdir"/usr/share/dict/$pkgname
-}
-
-sha512sums="d21055d6439a2b92b23ab6fd31222d9330315a0b44f53fae308ce5749a9fcb33b7df982f85ca8e2d6d2f9cc4c7264dfc3ed454edbccecd76289713df09fd633e  cracklib-words-20080507.gz"
diff --git a/main/cracklib/APKBUILD b/main/cracklib/APKBUILD
index f677e4c2e60..6b89634f77b 100644
--- a/main/cracklib/APKBUILD
+++ b/main/cracklib/APKBUILD
@@ -1,43 +1,72 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=cracklib
-pkgver=2.9.7
-pkgrel=0
-pkgdesc="A library used to enforce strong passwords"
+pkgver=2.9.11
+pkgrel=7
+pkgdesc="Library used to enforce strong passwords"
 url="https://github.com/cracklib/cracklib"
 arch="all"
-license="LGPL-2.0-or-later"
-subpackages="$pkgname-dev"
-source="https://github.com/cracklib/cracklib/releases/download/v$pkgver/cracklib-$pkgver.tar.bz2"
-builddir="$srcdir"/$pkgname-$pkgver
+license="LGPL-2.1-or-later"
+triggers="$pkgname.trigger=/usr/share/cracklib"
+makedepends="autoconf automake libtool gettext-dev python3-dev zlib-dev"
+subpackages="py3-$pkgname-pyc py3-$pkgname:py $pkgname-doc $pkgname-dev $pkgname-words::noarch"
+source="https://github.com/cracklib/cracklib/releases/download/v$pkgver/cracklib-$pkgver.tar.xz
+	https://github.com/cracklib/cracklib/releases/download/v$pkgver/cracklib-words-$pkgver.gz
+	"
 
 # secfixes:
 #   2.9.7-r0:
 #     - CVE-2016-6318
 
+prepare() {
+	default_prepare
+	update_config_sub
+
+	# need to reconf for py>=3.10
+	autoreconf -fvi
+}
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--without-python \
 		--disable-nls \
-		--with-default-dict
-	make -j1 all
+		--disable-static
+	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
+	for x in "$pkgdir"/usr/share/cracklib/*; do
+		gzip -9 -c "$x" > "$x".gz
+		rm "$x"
+	done
+
+	install -Dm644 "$srcdir"/cracklib-words-$pkgver.gz "$pkgdir"/usr/share/cracklib/cracklib-words.gz
+
+	find "$pkgdir"/usr/lib/python* -name "*.opt-1.pyc" -delete
+	find "$pkgdir"/usr/lib/python* -name "test_cracklib*" -delete
+}
+
+py() {
+	pkgdesc="$pkgdesc (python module)"
+	amove usr/lib/python*
+}
+
+words() {
+	pkgdesc="Large list of words for crack/cracklib"
+	license="Public-Domain"
+	depends=""
+
+	amove usr/share/cracklib/cracklib-words.gz
 }
 
-sha512sums="f6bf65ac092ba46ff78ddbc115692260fb76dc71219cd679d2ea935ebfb9e709fbb30259a7406743ed00dbdc415335b3ac9d9fcba1d204ea36d5eb96bf1333a2  cracklib-2.9.7.tar.bz2"
+sha512sums="
+c32e509f757344a1f0b7032ad3b6dc47a8759852a94e511c92073d85bce55f45d48c389d9eb34c993e1d61ad5c1542150672f3e8bc147148ebbb04d3319a2409  cracklib-2.9.11.tar.xz
+d1983e8e8fcb9abee4701581d66008eda2d7ad6ee8d017b7fed225b71bd333fa6199338f37fd120c1c6bf1c8a75025692f4118d97e8c384e578000bed59c6aed  cracklib-words-2.9.11.gz
+"
diff --git a/main/cracklib/cracklib.trigger b/main/cracklib/cracklib.trigger
new file mode 100644
index 00000000000..0ac0d3840ac
--- /dev/null
+++ b/main/cracklib/cracklib.trigger
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+create-cracklib-dict /usr/share/cracklib/*.gz >/dev/null
diff --git a/main/cramfs/APKBUILD b/main/cramfs/APKBUILD
index 854df0ecf03..00f20674201 100644
--- a/main/cramfs/APKBUILD
+++ b/main/cramfs/APKBUILD
@@ -1,25 +1,22 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cramfs
 pkgver=1.1
-pkgrel=3
+pkgrel=6
 pkgdesc="Linux filesystem designed to be simple, small, and to compress things well"
 arch="all"
 url="https://sourceforge.net/projects/cramfs/"
-license='GPL'
-depends=
+license="GPL-2.0-or-later"
 makedepends="zlib-dev linux-headers"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+source="https://downloads.sourceforge.net/cramfs/cramfs-$pkgver.tar.gz
 	mkcramfs-include-sysmacros.patch"
+options="!check"
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make CFLAGS="$CFLAGS -D_GNU_SOURCE" || return 1
+	make CFLAGS="$CFLAGS -D_GNU_SOURCE"
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	install -d "$pkgdir"/sbin
-	install mkcramfs cramfsck "$pkgdir"/sbin
+	install -Dm755 -t "$pkgdir"/sbin mkcramfs cramfsck
 }
 
 sha512sums="6c18dbe32df57f7d132fb2a59a917ad381156ca1f720c1ad0997ca81c62e82fd43ebb0339c5a66d5b144a72ce5c7ae93596522fe2698259f2b68c31db26e3b63  cramfs-1.1.tar.gz
diff --git a/main/crconf/APKBUILD b/main/crconf/APKBUILD
index 7332669bf35..7ff1546293e 100644
--- a/main/crconf/APKBUILD
+++ b/main/crconf/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=crconf
 pkgver=0_pre2
 _realver=pre2
-pkgrel=1
+pkgrel=3
 pkgdesc="Linux crypto layer configuration tool"
 url="https://sourceforge.net/projects/crconf/"
 arch="all"
@@ -11,6 +11,7 @@ makedepends="linux-headers"
 source="https://downloads.sourceforge.net/project/crconf/crconf-$_realver.tar.gz"
 
 builddir="$srcdir"/$pkgname-$_realver
+options="!check"
 
 build() {
 	make
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index e78d5dfd7a8..3ffefa0c066 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -1,24 +1,41 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cryptsetup
-pkgver=2.3.1
+pkgver=2.7.2
 pkgrel=0
 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
 url="https://gitlab.com/cryptsetup/cryptsetup"
 arch="all"
-license="GPL-2.0-or-later"
-makedepends_host="lvm2-dev openssl-dev popt-dev util-linux-dev
-	json-c-dev argon2-dev"
+license="GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception"
+makedepends_build="asciidoctor bash coreutils"
+makedepends_host="
+	argon2-dev
+	json-c-dev
+	lvm2-dev
+	openssl-dev>3
+	popt-dev
+	util-linux-dev
+	"
 makedepends="$makedepends_build $makedepends_host"
-checkdepends="device-mapper sharutils which bash"
+checkdepends="device-mapper which sharutils"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc"
 source="https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/cryptsetup-$pkgver.tar.gz
-	flush-stdout.patch
-	dmcrypt.confd
 	dmcrypt.initd
+	dmcrypt.confd
 	"
 
+# secfixes:
+#   2.4.3-r0:
+#     - CVE-2021-4122
+#   2.3.4-r0:
+#     - CVE-2020-14382
+
 build() {
+	# Disable support for external tokens since it requires
+	# dlvsym(3) which is a GNU extension and not available in musl.
+	if [ -z "$BOOTSTRAP" ]; then
+		export CFLAGS="$CFLAGS -flto=auto"
+	fi
 	./configure \
 		--build="$CBUILD" \
 		--host="$CHOST" \
@@ -27,7 +44,9 @@ build() {
 		--sbindir=/sbin \
 		--disable-static \
 		--enable-libargon2 \
-		--with-crypto_backend=openssl
+		--with-crypto_backend=openssl \
+		--disable-external-tokens \
+		--disable-ssh-token
 	make
 }
 
@@ -45,17 +64,27 @@ package() {
 	install -Dm755 "$srcdir"/dmcrypt.initd "$pkgdir"/etc/init.d/dmcrypt
 
 	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
-	install -m644 README TODO FAQ NEWS docs/v$pkgver-ReleaseNotes \
-		"$pkgdir"/usr/share/doc/$pkgname/
+	install -m644 README.md FAQ.md docs/v$pkgver-ReleaseNotes \
+		-t "$pkgdir"/usr/share/doc/$pkgname/
+
+	# mandoc does not support the .so directive which replace the
+	# content of a man page with that of another. cryptsetup uses
+	# several man pages which just contain an .so directive. Replace
+	# these with symlinks to make them work by default in mandoc.
+	#
+	# See https://inbox.vuxu.org/mandoc-tech/20101024194129.GJ20876@iris.usta.de/#r
+	grep -l -R '^\.so ' "$pkgdir"/usr/share/man | \
+		xargs awk '/^\.so/ { system("ln -fs " $2 " " FILENAME) }'
 }
 
 libs() {
 	pkgdesc="Cryptsetup shared library"
-	mkdir -p "$subpkgdir"
-	mv "$pkgdir"/lib "$subpkgdir"/
+
+	amove /lib
 }
 
-sha512sums="33e5adc7699da34bc021f4e1472628f7b61fe3dff34ee135088a3ced390b09302731429198c9ab1d7c2df1ed90413c082d4d6e8ea78a799f26e61451e5aafc99  cryptsetup-2.3.1.tar.gz
-dc896fdb7697d01443a168819f01af02db00a9de75589f062a1ebbfc0bc185b6d2109b18352309c41b818e3ad89609dcea3660d6f3cda890de825f053f94de97  flush-stdout.patch
+sha512sums="
+ba8f4aeda997242372e3e2eb4527babfd0ebf31fd28a2e894d7648d37b9a7a1845fb286f2769b3b3741340d68cdd7877d2f9be743bb3e4db9c053accf4640093  cryptsetup-2.7.2.tar.gz
+2a7abe572809d070579ceaeeeb25f050d32408756c1086ddf0e16f41bde239cfb1b8b95e1009362188faccd8060926cbf48a04714e8ddbb09ae3c903f6a490c8  dmcrypt.initd
 74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733  dmcrypt.confd
-81dad61cdecf1dc529b26eb3cdc15979a582c876b01268f88e7a71c8fae6911137c03bfa63fee64e064e5fb31f673610be27ecab9fc432229f13e7040698bd5c  dmcrypt.initd"
+"
diff --git a/main/cryptsetup/dmcrypt.initd b/main/cryptsetup/dmcrypt.initd
index 340b579b75f..62111c2dae2 100644
--- a/main/cryptsetup/dmcrypt.initd
+++ b/main/cryptsetup/dmcrypt.initd
@@ -57,7 +57,7 @@ dm_crypt_execute() {
 		target=${swap}
 		# swap contents do not need to be preserved between boots, luks not required.
 		# suspend2 users should have initramfs's init handling their swap partition either way.
-		: ${options:='-c aes -h sha1 -d /dev/urandom'}
+		: ${options:='-s 256 -c aes -d /dev/urandom'}
 		: ${pre_mount:='mkswap ${dev}'}
 	fi
 
@@ -76,12 +76,25 @@ dm_crypt_execute() {
 		arg2="${source}"
 		arg3="${target}"
 	fi
+	# This hack works around the lack of isLuks equivalents for alternative types
+	# Required feature request: https://gitlab.com/cryptsetup/cryptsetup/-/issues/824
+	# tcrypt can't work this way since tcryptDump requires a password
+	if cryptsetup bitlkDump ${source} >/dev/null 2>&1 ; then
+		arg1="open --type bitlk"
+		arg2="${source}"
+		arg3="${target}"
+	fi
+	if cryptsetup fvault2Dump ${source} >/dev/null 2>&1 ; then
+		arg1="open --type fvault2"
+		arg2="${source}"
+		arg3="${target}"
+	fi
 
 	# Older versions reported:
 	#	${target} is active:
 	# Newer versions report:
 	#	${target} is active[ and is in use.]
-	if cryptsetup status ${target} | egrep -q ' is active' ; then
+	if cryptsetup status ${target} | grep -qE ' is active' ; then
 		einfo "dm-crypt mapping ${target} is already configured"
 		return
 	fi
@@ -191,7 +204,7 @@ dm_crypt_execute() {
 		else
 			ewarn "${source} will not be decrypted ..."
 			einfo "Reason: cannot find gpg application."
-			einfo "You have to install app-crypt/gnupg first."
+			einfo "You have to install gnupg first."
 			einfo "If you have /usr on its own partition, try copying gpg to /bin ."
 		fi
 	else
@@ -220,6 +233,12 @@ dm_crypt_execute() {
 			eval "${pre_mount}" > /dev/null
 			ewend $? || cryptfs_status=1
 		fi
+		if [ -n "${post_mount}" ] ; then
+			dev="/dev/mapper/${target}"
+			eval ebegin \""    post_mount: ${post_mount}"\"
+			eval "${post_mount}" > /dev/null
+			ewend $? || cryptfs_status=1
+		fi
 	fi
 }
 
@@ -301,7 +320,7 @@ stop() {
 
 	# Break down all mappings
 	header=true
-	egrep "^(target|swap)=" ${conf_file} | \
+	grep -E "^(target|swap)=" ${conf_file} | \
 	while read line ; do
 		${header} && einfo "Removing dm-crypt mappings"
 		header=false
diff --git a/main/cryptsetup/flush-stdout.patch b/main/cryptsetup/flush-stdout.patch
deleted file mode 100644
index a39aec54742..00000000000
--- a/main/cryptsetup/flush-stdout.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -upr cryptsetup-2.1.0.orig/src/utils_tools.c cryptsetup-2.1.0/src/utils_tools.c
---- cryptsetup-2.1.0.orig/src/utils_tools.c	2019-01-31 21:37:12.000000000 +0100
-+++ cryptsetup-2.1.0/src/utils_tools.c	2019-03-16 16:33:13.000000000 +0100
-@@ -105,10 +105,13 @@ void tool_log(int level, const char *msg
- 
- 	case CRYPT_LOG_NORMAL:
- 		fprintf(stdout, "%s", msg);
-+		fflush(stdout);
- 		break;
- 	case CRYPT_LOG_VERBOSE:
--		if (opt_verbose)
-+		if (opt_verbose) {
- 			fprintf(stdout, "%s", msg);
-+			fflush(stdout);
-+		}
- 		break;
- 	case CRYPT_LOG_ERROR:
- 		fprintf(stderr, "%s", msg);
diff --git a/main/cryptsetup1/APKBUILD b/main/cryptsetup1/APKBUILD
deleted file mode 100644
index db66d3d00c7..00000000000
--- a/main/cryptsetup1/APKBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=cryptsetup1
-pkgver=1.7.5
-pkgrel=4
-pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
-url="https://gitlab.com/cryptsetup/cryptsetup"
-arch="all"
-license="GPL-2.0-or-later"
-depends=""
-conflicts="cryptsetup"
-replaces="cryptsetup"
-makedepends_build=""
-makedepends_host="lvm2-dev openssl-dev popt-dev util-linux-dev"
-makedepends="$makedepends_build $makedepends_host"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-source="https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/cryptsetup-$pkgver.tar.gz
-	flush-stdout.patch
-	libressl-2.7.patch
-	"
-builddir="$srcdir"/cryptsetup-$pkgver
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--libdir=/lib \
-		--sbindir=/sbin \
-		--disable-static \
-		--with-crypto_backend=openssl
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR=$pkgdir install
-
-	mkdir -p "$pkgdir"/usr/lib
-	mv "$pkgdir"/lib/pkgconfig "$pkgdir"/usr/lib/
-
-	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
-	install -m644 README TODO FAQ "$pkgdir"/usr/share/doc/$pkgname/
-}
-
-libs() {
-	pkgdesc="Cryptsetup shared library"
-	mkdir -p "$subpkgdir"
-	mv "$pkgdir"/lib "$subpkgdir"/
-}
-
-sha512sums="be4cf2815390f415edc3e1013222c9fe735b83c37278484e680cf7e0f6bdb850242bf057020d4c0d9f0e66106dbbc5b57abe34b351c99951d4aebb809e3c0473  cryptsetup-1.7.5.tar.gz
-301e3e3da5a899e0a6f01f44fbf37bb6a3f5b6a4fb41243bae6d3b7aea747276e784626cd1b19721cc264652c10ae8c560c4d20094e33bb82fb2fae0160682c0  flush-stdout.patch
-04686ed9407c69a68f608a1d8fb1e49e99476eea9adab789a3d78578ec01d352337529165abd5615416b1173ef0357dd35f977f8335ecb2f5610b8be998b7314  libressl-2.7.patch"
diff --git a/main/cryptsetup1/flush-stdout.patch b/main/cryptsetup1/flush-stdout.patch
deleted file mode 100644
index ae21a235f5a..00000000000
--- a/main/cryptsetup1/flush-stdout.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./src/utils_tools.c.orig	2014-10-24 12:58:35.151717616 -0200
-+++ ./src/utils_tools.c	2014-10-24 13:00:42.716855265 -0200
-@@ -105,10 +105,13 @@
- 
- 	case CRYPT_LOG_NORMAL:
- 		fputs(msg, stdout);
-+		fflush(stdout);
- 		break;
- 	case CRYPT_LOG_VERBOSE:
--		if (opt_verbose)
-+		if (opt_verbose) {
- 			fputs(msg, stdout);
-+			fflush(stdout);
-+		}
- 		break;
- 	case CRYPT_LOG_ERROR:
- 		fputs(msg, stderr);
diff --git a/main/cryptsetup1/libressl-2.7.patch b/main/cryptsetup1/libressl-2.7.patch
deleted file mode 100644
index 1d88c51a12e..00000000000
--- a/main/cryptsetup1/libressl-2.7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/crypto_backend/crypto_openssl.c b/lib/crypto_backend/crypto_openssl.c
-index 21aee76..b0a6aeb 100644
---- a/lib/crypto_backend/crypto_openssl.c
-+++ b/lib/crypto_backend/crypto_openssl.c
-@@ -52,7 +52,7 @@ struct crypt_hmac {
- /*
-  * Compatible wrappers for OpenSSL < 1.1.0
-  */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- static void openssl_backend_init(void)
- {
- 	OpenSSL_add_all_algorithms();
diff --git a/main/ctags/APKBUILD b/main/ctags/APKBUILD
deleted file mode 100644
index 81d0d197e3d..00000000000
--- a/main/ctags/APKBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=ctags
-pkgver=0_git20200205
-_commit=0d0ef5f0ce5914f809bb25781c51b6fd3136108a
-pkgrel=0
-pkgdesc="Generator of tags for all types of C/C++ languages"
-url="https://ctags.io/"
-arch="all"
-license="GPL-2.0-or-later"
-checkdepends="diffutils python"
-makedepends="autoconf automake pkgconf py3-docutils"
-subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/universal-ctags/ctags/archive/$_commit.tar.gz"
-builddir="$srcdir"/$pkgname-$_commit
-
-# secfixes:
-#   5.8-r5:
-#     - CVE-2014-7204
-
-prepare() {
-	default_prepare
-	cd "$builddir"
-	./autogen.sh
-
-	# Fail, likely due to compatibility issues with musl's iconv.
-	# Alternative solution: Build ctags with --disable-iconv.
-	rm -r Tmain/input-encoding-option.d \
-		Tmain/output-encoding-option.d
-}
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--disable-external-sort
-	make
-}
-
-check() {
-	make check
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="eac10b0cbaf78ed3cf41ee9182b57e6ef1636ffe08820683df412a57556069c62ec9b17be04b47cc3565cc954ca81dbad48a793b550c5501deb2783879d2cb50  ctags-0_git20200205.tar.gz"
diff --git a/main/cunit/APKBUILD b/main/cunit/APKBUILD
index 259cd4e24b6..39f5e5c4d98 100644
--- a/main/cunit/APKBUILD
+++ b/main/cunit/APKBUILD
@@ -4,31 +4,32 @@ pkgname=cunit
 _pkgname=CUnit
 pkgver=2.1.3
 _pkgver=${pkgver%.*}-${pkgver##*.}
-pkgrel=2
+pkgrel=7
 pkgdesc="Automated testing framework for C"
-url="http://cunit.sourceforge.net/"
+url="https://cunit.sourceforge.net/"
 arch="all"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
 makedepends="automake autoconf libtool bash"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://downloads.sourceforge.net/project/$pkgname/$_pkgname/$_pkgver/$_pkgname-$_pkgver.tar.bz2
+source="https://downloads.sourceforge.net/project/cunit/$_pkgname/$_pkgver/$_pkgname-$_pkgver.tar.bz2
 	path-makefile.patch"
 builddir="$srcdir/$_pkgname-$_pkgver"
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 	libtoolize --force --copy
 	aclocal
 	autoheader
 	automake --add-missing --include-deps --copy
 	autoconf
 	sed -i "s/@VERSION@-@RELEASE@/$pkgver/" cunit.pc.in
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--includedir=/usr/include \
 		--datarootdir=/usr/share \
@@ -43,12 +44,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index c720f358b76..8f043d71a37 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -1,28 +1,54 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cups
-pkgver=2.2.12
-pkgrel=2
+pkgver=2.4.7
+pkgrel=3
 pkgdesc="The CUPS Printing System"
-url="https://www.cups.org/"
+url="https://github.com/OpenPrinting/cups/"
 arch="all"
-license="GPL-2.0-only"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs ipptool $pkgname-client
-	$pkgname-lang $pkgname-openrc $pkgname-dbg"
+license="Apache-2.0"
 depends_dev="libgcrypt-dev gnutls-dev zlib-dev"
-makedepends="$depends_dev libpaper-dev dbus-dev libjpeg-turbo-dev avahi-dev
-	linux-headers libusb-dev"
+makedepends="
+	$depends_dev
+	avahi-dev
+	dbus-dev
+	libjpeg-turbo-dev
+	libpaper-dev
+	libusb-dev
+	linux-headers
+	"
 depends="cups-client poppler-utils openssl dbus"
 install="cups.pre-install"
 pkggroups="lp lpadmin"
 pkgusers="lp"
-source="https://github.com/apple/cups/releases/download/v$pkgver/cups-$pkgver-source.tar.gz
+subpackages="
+	$pkgname-dbg
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-libs
+	ipptool
+	$pkgname-client
+	$pkgname-lang
+	$pkgname-openrc
+	"
+source="$pkgname-$pkgver.tar.gz::https://github.com/OpenPrinting/cups/archive/v$pkgver.tar.gz
 	$pkgname.logrotate
 	cupsd.initd
 	cups-no-export-ssllibs.patch
+	cups-nostrip.patch
 	default-config-no-gssapi.patch
 	"
+options="!check"
 
 # secfixes:
+#   2.4.7-r0:
+#     - CVE-2023-4504
+#   2.4.2-r7:
+#     - CVE-2023-32324
+#   2.4.2-r0:
+#     - CVE-2022-26691
+#   2.3.3-r0:
+#     - CVE-2020-3898
+#     - CVE-2019-8842
 #   2.2.12-r0:
 #     - CVE-2019-8696
 #     - CVE-2019-8675
@@ -30,8 +56,6 @@ source="https://github.com/apple/cups/releases/download/v$pkgver/cups-$pkgver-so
 #     - CVE-2018-4700
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -55,18 +79,16 @@ build() {
 		--disable-pam \
 		--enable-raw-printing \
 		--enable-dbus \
-		--with-dbusdir=/etc/dbus-1 \
+		--with-dbusdir=/usr/share/dbus-1 \
 		--enable-libpaper \
 		--enable-ssl=yes \
 		--enable-gnutls \
 		--disable-launchd \
-		--with-optim="$CFLAGS"
+		--with-optim="$CFLAGS -flto=auto"
 	make
 }
 
 package() {
-	cd "$builddir"
-
 	make BUILDROOT="$pkgdir" install
 
 	cd "$pkgdir"
@@ -82,7 +104,17 @@ package() {
 		sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' \
 			usr/share/applications/cups.desktop
 	fi
-	find usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
+	find usr/share/cups/model \( -name "*.ppd" -a ! -name "*.gz" \) \
+		-exec gzip -n9f {} \+
+}
+
+dev() {
+	default_dev
+
+	# needed for main cups operation
+	mv "$subpkgdir"/usr/share/cups/ppdc/* \
+		"$pkgdir"/usr/share/cups/ppdc
+	rmdir "$subpkgdir"/usr/share/cups/ppdc
 }
 
 libs() {
@@ -90,8 +122,7 @@ libs() {
 	depends=""
 	replaces="libcups"
 
-	cd "$pkgdir"
-	_mv usr/lib/*.so*
+	amove 'usr/lib/*.so*'
 	install -d "$pkgdir"/etc/cups
 }
 
@@ -99,8 +130,7 @@ ipptool() {
 	pkgdesc="Perform internet printing protocol requests"
 	depends=""
 
-	cd "$pkgdir"
-	_mv usr/bin/ipptool \
+	amove usr/bin/ipptool \
 		usr/share/cups/ipptool
 }
 
@@ -108,30 +138,28 @@ client() {
 	pkgdesc="CUPS command-line client programs"
 	depends=""
 
-	cd "$pkgdir"
-	_mv usr/bin \
-		usr/sbin/accept \
+	amove usr/bin \
 		usr/sbin/cupsaccept \
-		usr/sbin/cupsaddsmb \
 		usr/sbin/cupsctl \
 		usr/sbin/cupsdisable \
 		usr/sbin/cupsenable \
 		usr/sbin/lpadmin \
 		usr/sbin/lpc \
 		usr/sbin/lpinfo \
-		usr/sbin/lpmove \
-		usr/sbin/reject
+		usr/sbin/lpmove
 }
 
-_mv() {
-	local i; for i in "$@"; do
-		mkdir -p "$subpkgdir"/${i%/*}
-		mv "$pkgdir"/$i "$subpkgdir"/${i%/*}/
-	done
+doc() {
+	default_doc
+
+	amove usr/share/cups/help
 }
 
-sha512sums="b8e7be512938ad388d469d093ad0c882ab42ea1408c27a91340f8424aa0e79e588df3d59795624973b89074a2af650fa9b5b6ed5224138b17e4c6dbbcbf0a2e6  cups-2.2.12-source.tar.gz
+sha512sums="
+27ca505a2868aa7bc248bac892aafe2a837633e73b6059d3ab4812264e3b0e786ef075751e8cc4300ce6bc43ef095e3d77dd3fce88ce8e72ca69b65093427bca  cups-2.4.7.tar.gz
 cf64211da59e79285f99d437c02fdd7db462855fb2920ec9563ba47bd8a9e5cbd10555094940ceedeb41ac805c4f0ddb9147481470112a11a76220d0298aef79  cups.logrotate
 2c2683f755a220166b3a1653fdd1a6daa9718c8f0bbdff2e2d5e61d1133306260d63a83d3ff41619b5cf84c4913fae5822b79553e2822858f38fa3613f4c7082  cupsd.initd
-7a8cd9ac33b0dd4627c72df4275db8ccd7cf8e201bce3833719b42f532f526bb347b842e3ea1ef0d61855b5c6e1088b5d20b68942f2c2c0acf504d8d9728efd3  cups-no-export-ssllibs.patch
-98bb97f4af69ea286fc3d398b8e57c32440e6b2d49fb7f79b418a4fe7f13441f3a610f65d3433d10d971ade808233c0b29b4d66160623ccaae919179384be918  default-config-no-gssapi.patch"
+148eb01f0861e1cd0861a174a5c5262c49b079b27b972b4e90656b9b9357ec710e861604c30e897818f550e9c1cdcefcd8c8bc955ba4a333902a74cdd8dfb5a6  cups-no-export-ssllibs.patch
+7b2f1212b009d4e005eaf4fc288413bde57aff4ca664173202163e8f18be1ddc72c26ec84576a4850d63b08c6ce5948d57c77e81c4f4c85032d7ef7530b1eb81  cups-nostrip.patch
+c492f5e20a1bb73cf6bed86d0343659e839df4003aa1409bf608dd3ff05694d1e06ba26fd3786385d2c96dd668485dcef6cfee7f908416a2b125a8e30e82e670  default-config-no-gssapi.patch
+"
diff --git a/main/cups/cups-no-export-ssllibs.patch b/main/cups/cups-no-export-ssllibs.patch
index e227bd18239..652fd6ad36b 100644
--- a/main/cups/cups-no-export-ssllibs.patch
+++ b/main/cups/cups-no-export-ssllibs.patch
@@ -1,12 +1,10 @@
-diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4
---- cups-1.6.2/config-scripts/cups-ssl.m4.no-export-ssllibs	2011-05-11 02:52:08.000000000 +0200
-+++ cups-1.6.2/config-scripts/cups-ssl.m4	2011-05-23 17:47:27.000000000 +0200
-@@ -180,7 +180,7 @@
- AC_SUBST(SSLFLAGS)
- AC_SUBST(SSLLIBS)
+diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-tls.m4
+--- cups-1.6.2/config-scripts/cups-tls.m4.no-export-ssllibs	2011-05-11 02:52:08.000000000 +0200
++++ cups-1.6.2/config-scripts/cups-tls.m4	2011-05-23 17:47:27.000000000 +0200
+@@ -107,5 +107,5 @@
+ AC_SUBST([TLSFLAGS])
+ AC_SUBST([TLSLIBS])
  
--EXPORT_SSLLIBS="$SSLLIBS"
-+EXPORT_SSLLIBS=""
- AC_SUBST(EXPORT_SSLLIBS)
- 
- dnl
+-EXPORT_TLSLIBS="$TLSLIBS"
++EXPORT_TLSLIBS=""
+ AC_SUBST([EXPORT_TLSLIBS])
diff --git a/main/cups/cups-nostrip.patch b/main/cups/cups-nostrip.patch
new file mode 100644
index 00000000000..f689368e770
--- /dev/null
+++ b/main/cups/cups-nostrip.patch
@@ -0,0 +1,68 @@
+diff -ru a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
+--- a/config-scripts/cups-compiler.m4	2020-04-27 14:04:29.000000000 -0400
++++ b/config-scripts/cups-compiler.m4	2021-08-06 20:53:29.316010169 -0400
+@@ -11,9 +11,6 @@
+ 
+ dnl Clear the debugging and non-shared library options unless the user asks
+ dnl for them...
+-INSTALL_STRIP=""
+-AC_SUBST(INSTALL_STRIP)
+-
+ AC_ARG_WITH([optim], AS_HELP_STRING([--with-optim], [set optimization flags]), [
+     OPTIM="$withval"
+ ], [
+@@ -31,7 +28,6 @@
+ AS_IF([test x$enable_debug = xyes -a "x$OPTIM" = x], [
+     OPTIM="-g"
+ ], [
+-    INSTALL_STRIP="-s"
+ ])
+ 
+ dnl Debug printfs can slow things down, so provide a separate option for that
+diff -ru a/configure b/configure
+--- a/configure	2020-04-27 14:04:29.000000000 -0400
++++ b/configure	2021-08-06 20:54:01.585892266 -0400
+@@ -726,7 +726,6 @@
+ ARCHFLAGS
+ UNITTESTS
+ OPTIM
+-INSTALL_STRIP
+ LIBTOOL_INSTALL
+ LIBTOOL_CXX
+ LIBTOOL_CC
+@@ -7902,7 +7901,6 @@
+ 
+ 
+ 
+-INSTALL_STRIP=""
+ 
+ 
+ 
+@@ -7956,10 +7954,6 @@
+ 
+     OPTIM="-g"
+ 
+-else $as_nop
+-
+-    INSTALL_STRIP="-s"
+-
+ fi
+ 
+ if test x$enable_debug_printfs = xyes
+diff -ru a/Makedefs.in b/Makedefs.in
+--- a/Makedefs.in	2020-04-27 14:04:29.000000000 -0400
++++ b/Makedefs.in	2021-08-06 20:53:42.565961754 -0400
+@@ -46,12 +46,12 @@
+ # Installation programs...
+ #
+ 
+-INSTALL_BIN	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
++INSTALL_BIN	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
+ INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
+ INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+ INSTALL_DATA	=	$(INSTALL) -c -m 444
+ INSTALL_DIR	=	$(INSTALL) -d
+-INSTALL_LIB	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
++INSTALL_LIB	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
+ INSTALL_MAN	=	$(INSTALL) -c -m 444
+ INSTALL_SCRIPT	=	$(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
diff --git a/main/cups/cups.pre-install b/main/cups/cups.pre-install
index cdb75cac568..96486eb25e9 100644
--- a/main/cups/cups.pre-install
+++ b/main/cups/cups.pre-install
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 addgroup -S lpadmin 2>/dev/null
-addgroup -S lp 2>/dev/null
-adduser -S -G lp -g lp lp 2>/dev/null
+addgroup -S -g 7 lp 2>/dev/null
+adduser -S -G lp -g lp -u 4 lp 2>/dev/null
 addgroup lp lp 2>/dev/null
 
 exit 0
diff --git a/main/cups/default-config-no-gssapi.patch b/main/cups/default-config-no-gssapi.patch
index b12c55ddf81..54c75bce203 100644
--- a/main/cups/default-config-no-gssapi.patch
+++ b/main/cups/default-config-no-gssapi.patch
@@ -1,6 +1,9 @@
+Upstream: Not applicable (local configuration)
+Reason: Sets config defaults for Alpine
+
 --- a/conf/cupsd.conf.in
 +++ b/conf/cupsd.conf.in
-@@ -145,12 +145,12 @@
+@@ -154,12 +154,12 @@
  
    # Job-related operations must be done by the owner or an administrator...
    <Limit Create-Job Print-Job Print-URI Validate-Job>
@@ -15,7 +18,7 @@
      Require user @OWNER @SYSTEM
      Order deny,allow
    </Limit>
-@@ -171,7 +171,7 @@
+@@ -180,7 +180,7 @@
  
    # Only the owner or an administrator can cancel or authenticate a job...
    <Limit Cancel-Job CUPS-Authenticate-Job>
diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD
index 7e402e63780..b434ea1ec7e 100644
--- a/main/curl/APKBUILD
+++ b/main/curl/APKBUILD
@@ -2,21 +2,121 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+
+# RESTRICTED: Do NOT enable the rustls or hyper backends, as they depend on Rust
+# and Rust is not yet available on all architectures.  Any commit which changes
+# this aport from arch=all WILL be reverted.
+
 pkgname=curl
-pkgver=7.69.1
+pkgver=8.7.1
 pkgrel=0
 pkgdesc="URL retrival utility and library"
-url="https://curl.haxx.se/"
+url="https://curl.se/"
 arch="all"
-license="MIT"
+license="curl"
 depends="ca-certificates"
-depends_dev="openssl-dev nghttp2-dev zlib-dev"
-checkdepends="python3"
-makedepends="$depends_dev autoconf automake groff libtool perl"
+depends_dev="
+	brotli-dev
+	c-ares-dev
+	libidn2-dev
+	libpsl-dev
+	nghttp2-dev
+	openssl-dev>3
+	zlib-dev
+	zstd-dev
+	"
+checkdepends="nghttp2 python3"
+makedepends_host="$depends_dev"
+makedepends_build="groff perl"
 subpackages="$pkgname-dbg $pkgname-static $pkgname-doc $pkgname-dev libcurl"
-source="https://curl.haxx.se/download/curl-$pkgver.tar.xz"
+[ -z "$BOOTSTRAP" ] && subpackages="$subpackages $pkgname-zsh-completion $pkgname-fish-completion"
+source="https://curl.se/download/curl-$pkgver.tar.xz"
+options="net" # Required for running tests
+[ -n "$BOOTSTRAP" ] && options="$options !check" # remove python3 dependency
 
 # secfixes:
+#   8.7.1-r0:
+#     - CVE-2024-2004
+#     - CVE-2024-2379
+#     - CVE-2024-2398
+#     - CVE-2024-2466
+#   8.6.0-r0:
+#     - CVE-2024-0853
+#   8.5.0-r0:
+#     - CVE-2023-46218
+#     - CVE-2023-46219
+#   8.4.0-r0:
+#     - CVE-2023-38545
+#     - CVE-2023-38546
+#   8.3.0-r0:
+#     - CVE-2023-38039
+#   8.1.0-r0:
+#     - CVE-2023-28319
+#     - CVE-2023-28320
+#     - CVE-2023-28321
+#     - CVE-2023-28322
+#   8.0.0-r0:
+#     - CVE-2023-27533
+#     - CVE-2023-27534
+#     - CVE-2023-27535
+#     - CVE-2023-27536
+#     - CVE-2023-27537
+#     - CVE-2023-27538
+#   7.88.0-r0:
+#     - CVE-2023-23914
+#     - CVE-2023-23915
+#     - CVE-2023-23916
+#   7.87.0-r0:
+#     - CVE-2022-43551
+#     - CVE-2022-43552
+#   7.86.0-r0:
+#     - CVE-2022-32221
+#     - CVE-2022-35260
+#     - CVE-2022-42915
+#     - CVE-2022-42916
+#   7.85.0-r0:
+#     - CVE-2022-35252
+#   7.84.0-r0:
+#     - CVE-2022-32205
+#     - CVE-2022-32206
+#     - CVE-2022-32207
+#     - CVE-2022-32208
+#   7.83.1-r0:
+#     - CVE-2022-27778
+#     - CVE-2022-27779
+#     - CVE-2022-27780
+#     - CVE-2022-27781
+#     - CVE-2022-27782
+#     - CVE-2022-30115
+#   7.83.0-r0:
+#     - CVE-2022-22576
+#     - CVE-2022-27774
+#     - CVE-2022-27775
+#     - CVE-2022-27776
+#   7.79.0-r0:
+#     - CVE-2021-22945
+#     - CVE-2021-22946
+#     - CVE-2021-22947
+#   7.78.0-r0:
+#     - CVE-2021-22922
+#     - CVE-2021-22923
+#     - CVE-2021-22924
+#     - CVE-2021-22925
+#   7.77.0-r0:
+#     - CVE-2021-22898
+#     - CVE-2021-22901
+#   7.76.0-r0:
+#     - CVE-2021-22876
+#     - CVE-2021-22890
+#   7.74.0-r0:
+#     - CVE-2020-8284
+#     - CVE-2020-8285
+#     - CVE-2020-8286
+#   7.72.0-r0:
+#     - CVE-2020-8231
+#   7.71.0-r0:
+#     - CVE-2020-8169
+#     - CVE-2020-8177
 #   7.66.0-r0:
 #     - CVE-2019-5481
 #     - CVE-2019-5482
@@ -83,49 +183,59 @@ source="https://curl.haxx.se/download/curl-$pkgver.tar.xz"
 #   7.36.0-r0:
 #     - CVE-2014-0138
 #     - CVE-2014-0139
-
-prepare() {
-	default_prepare
-	autoreconf -vfi
-}
+#   0:
+#     - CVE-2021-22897
 
 build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
+		--enable-ares \
 		--enable-ipv6 \
 		--enable-unix-sockets \
 		--enable-static \
-		--without-libidn \
-		--without-libidn2 \
+		--with-libidn2 \
 		--with-nghttp2 \
+		--with-openssl \
+		--with-zsh-functions-dir \
+		--with-fish-functions-dir \
 		--disable-ldap \
 		--with-pic \
+		--enable-websockets \
 		--without-libssh2 # https://bugs.alpinelinux.org/issues/10222
 	make
+
+	# generation of completions is not supported when cross-compiling.
+	if [ -z "$BOOTSTRAP" ]; then
+		make -C scripts/
+	fi
 }
 
 check() {
-	make -C tests nonflaky-test
+	make -C tests
+	make -j1 -C tests TFLAGS="-j$JOBS" nonflaky-test
 }
 
 package() {
+	# depends on exactly the same build of libcurl
+	depends="libcurl=$pkgver-r$pkgrel"
+
 	make install DESTDIR="$pkgdir"
+	if [ -z "$BOOTSTRAP" ]; then
+		install -Dm644 scripts/_curl -t \
+			"$pkgdir"/usr/share/zsh/site-functions/
+		install -Dm644 scripts/curl.fish -t \
+			"$pkgdir"/usr/share/fish/vendor_completions.d/
+	fi
 }
 
 libcurl() {
 	pkgdesc="The multiprotocol file transfer library"
 
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr
-}
-
-static() {
-	pkgdesc="$pkgdesc (static library)"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
+	amove usr/lib
 }
 
-sha512sums="dcb917ce9a6f34b30adae10e2e635d7a8c67781d69789cc5617ab2b49e898394ecfeee546453b14ab168d4b3b52baf974b2ec07e7a4b199addbc1ba57274d8fa  curl-7.69.1.tar.xz"
+sha512sums="
+5bbde9d5648e9226f5490fa951690aaf159149345f3a315df2ba58b2468f3e59ca32e8a49734338afc861803a4f81caac6d642a4699b72c6310ebfb1f618aad2  curl-8.7.1.tar.xz
+"
diff --git a/main/cutter/APKBUILD b/main/cutter/APKBUILD
index 8d2a310b4e3..71380dd9e24 100644
--- a/main/cutter/APKBUILD
+++ b/main/cutter/APKBUILD
@@ -2,27 +2,25 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=cutter
 pkgver=1.04
-pkgrel=1
+pkgrel=5
 pkgdesc="A program that allows firewall administrators to abort TCP/IP connections"
 url="http://www.digitage.co.uk/digitage/software/linux-security/cutter"
 arch="all"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
 makedepends="linux-headers"
 options="!check"
-source="http://www.digitage.co.uk/digitage/files/cutter/$pkgname-$pkgver.tgz
+source="http://dev.alpinelinux.org/archive/cutter/cutter-$pkgver.tgz
 	musl-fix.patch"
 
-builddir="$srcdir/$pkgname-$pkgver"
-
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
 	install -m755 -D $pkgname "$pkgdir"/usr/sbin/$pkgname
 }
 
-sha512sums="79c17ec8c17e696a79aa8b11fda347f2e6929eb35f9a37da450acf6aff7ab9471e13eaef24708f90f3f0c2791fade2eb944443b98df3d3ae4eef0c408abc7b3a  cutter-1.04.tgz
-815ffcfbae6865443b49390f1c5dc583243009150271804468aad00102b136ac2e6abe565efa18d15f4411690444ca6fdd1184a8b31e61f5a62115f87f6d53dc  musl-fix.patch"
+sha512sums="
+79c17ec8c17e696a79aa8b11fda347f2e6929eb35f9a37da450acf6aff7ab9471e13eaef24708f90f3f0c2791fade2eb944443b98df3d3ae4eef0c408abc7b3a  cutter-1.04.tgz
+fca7cabce0b142c31bcbbede138f20c7389e58d8ad9d82480526b5ab90165ce6493d54c3a3e9270f02bccc08ae248a7b4d62b34bb26c117e6f4b18106c37106d  musl-fix.patch
+"
diff --git a/main/cutter/musl-fix.patch b/main/cutter/musl-fix.patch
index e8ff6de41d9..16f4e189d0a 100644
--- a/main/cutter/musl-fix.patch
+++ b/main/cutter/musl-fix.patch
@@ -1,6 +1,19 @@
---- ./cutter.c.orig
-+++ ./cutter.c
-@@ -47,7 +47,6 @@
+diff --git a/Makefile b/Makefile
+index 1f11226..d347768 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+ cutter: cutter.c
+-	cc cutter.c -o cutter
++	cc $(CFLAGS) cutter.c -o cutter $(LDFLAGS)
+ 
+ clean:
+ 	rm -f cutter.o cutter
+diff --git a/cutter.c b/cutter.c
+index 1c639c9..0d0466b 100644
+--- a/cutter.c
++++ b/cutter.c
+@@ -44,7 +44,6 @@
  #include <linux/socket.h>
  #include <linux/ip.h>
  #include <linux/tcp.h>
@@ -8,3 +21,20 @@
  #include <fcntl.h>
  #include <netpacket/packet.h>
  #include <net/ethernet.h>     /* the L2 protocols */
+@@ -54,6 +53,7 @@
+ #include <arpa/inet.h>
+ #include <net/if.h>
+ #include <errno.h>
++#include <time.h>
+ 
+ #define ETHHDR	 sizeof(struct ethhdr)
+ #define TCPHDR	 sizeof(struct tcphdr)
+@@ -129,7 +129,7 @@ int getnexthop(in_addr_t ip, char *intf, in_addr_t *gateway)
+ 		dest_ip = gateway_ip = flags = refcnt = use
+ 			= metric = mask = mtu = window = irtt = -1;
+ 
+-		if (sscanf(buff, "%s %8lx %8lx %4x %d %d %d %8lx %d %d %d",
++		if (sscanf(buff, "%s %8x %8x %4x %d %d %d %8x %d %d %d",
+ 			iface, &dest_ip, &gateway_ip, &flags, &refcnt,
+ 			&use, &metric, &mask, &mtu, &window, &irtt
+ 		) == 11) {
diff --git a/main/cvechecker/APKBUILD b/main/cvechecker/APKBUILD
index 328a549333a..80a351ed825 100644
--- a/main/cvechecker/APKBUILD
+++ b/main/cvechecker/APKBUILD
@@ -2,24 +2,23 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=cvechecker
-pkgver=3.9
-pkgrel=2
+pkgver=4.0
+pkgrel=4
 pkgdesc="A local CVE checker tool"
 url="https://github.com/sjvermeu/cvechecker/wiki"
 arch="all"
-license="GPL-3.0"
-depends="gawk wget libxslt"
+license="GPL-3.0-or-later"
+depends="gawk wget libxslt jq"
 makedepends="libconfig-dev sqlite-dev mariadb-connector-c-dev
-	argp-standalone autoconf automake"
+	argp-standalone autoconf automake libbsd-dev"
 install="$pkgname.pre-install $pkgname.post-install"
 subpackages="$pkgname-doc"
 pkggroups="$pkgname"
-source="$pkgname-$pkgver.tar.gz::https://github.com/sjvermeu/$pkgname/archive/v$pkgver.tar.gz"
-builddir="$srcdir"/$pkgname-$pkgver
+source="$pkgname-$pkgver.zip::https://github.com/sjvermeu/cvechecker/archive/cvechecker-$pkgver.zip"
+builddir="$srcdir"/$pkgname-$pkgname-$pkgver
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 	aclocal && \
 	autoheader && \
 	automake -ac && \
@@ -27,7 +26,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	export LIBS="-largp"
 	./configure \
 		--build=$CBUILD \
@@ -41,16 +39,14 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	mkdir -p "$pkgdir"/var/cvechecker &>/dev/null
 	chgrp -R $pkggroups "$pkgdir"/var/cvechecker/* &>/dev/null
 	chmod -R g+w "$pkgdir"/var/cvechecker &>/dev/null
 }
 
-sha512sums="35fc8501bb56ebe8ef0f38bc8ea91f9446c06901c83ba16488acaa0c71ed446d3337637f1f44bc82c01e1b3f255630f33b13d25e04d85fca5df3a7a5bcf66606  cvechecker-3.9.tar.gz"
+sha512sums="f2c4e8ca5cbeed00b543b64e9173c64bd7d423e4cdda0731e7e79a85b81468f066bbd9903c630b58342c24e19c11b8a6b9f4c7fafe109c129d6b0baadb65aeb2  cvechecker-4.0.zip"
diff --git a/main/cvs/APKBUILD b/main/cvs/APKBUILD
deleted file mode 100644
index 3ba97bb296f..00000000000
--- a/main/cvs/APKBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=cvs
-pkgver=1.12.12
-pkgrel=0
-pkgdesc="Concurrent Versions System"
-url="https://www.nongnu.org/cvs/"
-arch="all"
-license="GPL-2.0-or-later"
-options="!check" # Tests fail - src/lib/test-getdate.sh
-makedepends="zlib-dev"
-subpackages="$pkgname-doc"
-source="https://ftp.gnu.org/non-gnu/cvs/source/feature/$pkgver/cvs-$pkgver.tar.gz
-	cvs-1.12.12-cvsbug-tmpfix.patch
-	cvs-1.12.12-openat.patch
-	cvs-1.12.12-block-requests.patch
-	cvs-1.12.12-install-sh.patch
-	cvs-1.12.12-hash-nameclash.patch
-	cvs-1.12.12-getdelim.patch
-	cvs-1.12.12-rcs2log-coreutils.patch
-	cvs-1.12.12-mktime-x32.patch
-	cvs-1.12.12-fix-massive-leak.patch
-	cvs-1.12.12-mktime-configure.patch
-	cvs-1.12.12-CVE-2012-0804.patch
-	cvs-1.12.12-format-security.patch
-	cvs-1.12.12-musl.patch
-	CVE-2017-12836.patch
-	"
-
-# secfixes:
-#   1.12.12-r0:
-#     - CVE-2010-3846
-#     - CVE-2012-0804	
-#     - CVE-2017-12836
-prepare() {
-	default_prepare
-	update_config_sub
-}
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--with-external-zlib \
-		--with-tmpdir=/tmp
-	make
-}
-
-check() {
-	make check
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="36cae30bbd075773d260fd8d0170335d37ba4b6dd09056465290df5c14cd7c39a18931d70761d98e2bd989798b013e372603e94c252b4062c56c3ab53251a1fb  cvs-1.12.12.tar.gz
-29014631f5595dbf51a47032a19a23e545190dd8d40d77a71d363cee07a9ae38263b67db52a512436a9a7b37a7f5ff4daafa4a0a9f3c29bcfeb71ecff74408b7  cvs-1.12.12-cvsbug-tmpfix.patch
-b0a7abc785169705d2f0668a8af706f93ee3eba3d050d555689577962283e54f6bd186e662b64c65f926cf72dff76a37259181338707d641ee0f20591ba62805  cvs-1.12.12-openat.patch
-541545ffc64c4f2303b7e8f6cae2cdff0437452e4bcf94b2149d51e43710096e17f024c1a8ed32433560ea51ecef2aba2f3e6bfaef8fa9e4ad2f2436649884d1  cvs-1.12.12-block-requests.patch
-7e468d41c1eb23c0a62b605e6e48cffc004e8f386a87a9696dd73b36702c74aad529f5cba7280dee1100027b6e1e907adad257cc446ca3ad734fa40d47e4ff72  cvs-1.12.12-install-sh.patch
-dcd612dcc4b008c0fbabd74bcc179e69ebaed31a9f6622127061194a8ed99549502fbc0bffc75cc87aed26f7fe46215da81438c3a797e2179ed3da8e0b5ebdbb  cvs-1.12.12-hash-nameclash.patch
-181b5daa6e103218e3fc1629a0b5f74daad613cdbe530655eff32479e4b9f32d067e60a82107efdbb129f917ee0626d274fb65555c66d907c997bf01fa262bdb  cvs-1.12.12-getdelim.patch
-73c3506fa670b00ac52363efa2a2fa34203108d3dc112400e52f78eb7d83967cf49b11280d6c27a461f79a9c38317b41b26dd1f67d10229dbcb6c2ad9d43b521  cvs-1.12.12-rcs2log-coreutils.patch
-4a58c0f94de8e19c2de1930b7e5e04816e79a86885c89b792616a4c43f6e12aef271005ae59ae0d5788a910ba97735ccdf35f0ef5faafc2e3c50a9858b8f6216  cvs-1.12.12-mktime-x32.patch
-c4c9026e971f3da49cefce102b57bc681427a708ec8caa185df1234fd2a95090c8dc8cbf84374a762fdef7002d658cd4b52450429664cb3a1bfbda63d31c78a7  cvs-1.12.12-fix-massive-leak.patch
-10b29450d5d0a6a02d92812b919edbba2b86f2217aa54896b44358edb2eb8d8d6111b5c5db39faa50ef1f9a86ed1ee190332629f33402ad8cd8082b77547f486  cvs-1.12.12-mktime-configure.patch
-4f86f75f59caf4ef7e83964ec2d9c93575ccdcb031b1a6a1774a2a80ab7d6f278b3d27c4ab9270b91edf457a0195d702e3bd20da17c167b3f204fd9d8980b720  cvs-1.12.12-CVE-2012-0804.patch
-34f16defa5ab03ca2efcdea27269a37e27510d235bc4efd7a91871c2ae32fe9b922a51f3b87bcfec988964f8ae50d4649d7876937e25352836d5274ce88eea13  cvs-1.12.12-format-security.patch
-1c14b89dccee3130cc4ff881b7204f01dd8e14d1767e21d30b879df17a368a0f6bc7d3945872f8a6adcf47e34c3e48b9f2c0c0c90cccbf10fa935690a57f5e20  cvs-1.12.12-musl.patch
-1daf3d26acabe5e1f46331595f95f62a3bc7ffd28dfb063cfc8c9eec3f13f67ad32ba236ea4ff5f3180a10996ac5c902473d4a34226f9706f3b008b0c55491ea  CVE-2017-12836.patch"
diff --git a/main/cvs/CVE-2017-12836.patch b/main/cvs/CVE-2017-12836.patch
deleted file mode 100644
index b20a88b6672..00000000000
--- a/main/cvs/CVE-2017-12836.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Subject: [PATCH] Fix CVE-2017-12836
-From: Thorsten Glaser <tg@mirbsd.de>
-
---- a/src/rsh-client.c
-+++ b/src/rsh-client.c
-@@ -53,9 +53,10 @@
-     char *cvs_server = (root->cvs_server != NULL
- 			? root->cvs_server : getenv ("CVS_SERVER"));
-     int i = 0;
--    /* This needs to fit "rsh", "-b", "-l", "USER", "host",
--       "cmd (w/ args)", and NULL.  We leave some room to grow. */
--    char *rsh_argv[10];
-+    /* This needs to fit "rsh", "-b", "-l", "USER", "-p", port,
-+       "--", "host", "cvs", "-R", "server", and NULL.
-+       We leave some room to grow. */
-+    char *rsh_argv[16];
- 
-     if (!cvs_rsh)
- 	/* People sometimes suggest or assume that this should default
-@@ -97,6 +98,9 @@
- 	rsh_argv[i++] = root->username;
-     }
- 
-+    /* Only non-option arguments from here. (CVE-2017-12836) */
-+    rsh_argv[i++] = "--";
-+
-     rsh_argv[i++] = root->hostname;
-     rsh_argv[i++] = cvs_server;
-     rsh_argv[i++] = "server";
-@@ -171,6 +175,8 @@
- 	    *p++ = root->username;
- 	}
- 
-+	*p++ = "--";
-+
- 	*p++ = root->hostname;
- 	*p++ = command;
- 	*p++ = NULL;
diff --git a/main/cvs/cvs-1.12.12-CVE-2012-0804.patch b/main/cvs/cvs-1.12.12-CVE-2012-0804.patch
deleted file mode 100644
index 107c3ea1220..00000000000
--- a/main/cvs/cvs-1.12.12-CVE-2012-0804.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-[CVE-2012-0804] Fix proxy response parser
-
-If proxy sends overlong HTTP vesion string, the string will be copied
-to unallocatd space (write_buf) causing heap overflow.
-
-This patch fixes it by ignoring the HTTP version string and checking
-the response line has been parsed correctly.
-
-See <https://bugzilla.redhat.com/show_bug.cgi?id=773699> for more
-details.
-
-Index: src/client.c
-===================================================================
-RCS file: /sources/cvs/ccvs/src/client.c,v
-retrieving revision 1.483
-diff -u -r1.483 client.c
---- a/src/client.c	18 Nov 2008 22:59:02 -0000	1.483
-+++ b/src/client.c	26 Jan 2012 16:32:25 -0000
-@@ -4339,9 +4339,9 @@
-          * code.
-          */
- 	read_line_via (from_server, to_server, &read_buf);
--	sscanf (read_buf, "%s %d", write_buf, &codenum);
-+	count = sscanf (read_buf, "%*s %d", &codenum);
- 
--	if ((codenum / 100) != 2)
-+	if (count != 1 || (codenum / 100) != 2)
- 	    error (1, 0, "proxy server %s:%d does not support http tunnelling",
- 		   root->proxy_hostname, proxy_port_number);
- 	free (read_buf);
diff --git a/main/cvs/cvs-1.12.12-block-requests.patch b/main/cvs/cvs-1.12.12-block-requests.patch
deleted file mode 100644
index 9c9b49db8f6..00000000000
--- a/main/cvs/cvs-1.12.12-block-requests.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-Author: Robin H. Johnson <robbat2@gentoo.org>
-Date: 2006-08-09
-
-This patch allows a CVS server to deny usage of specific commands, based on
-input in the environment.
-
-Just set the CVS_BLOCK_REQUESTS env var with all of the commands you want,
-seperated by spaces. Eg:
-CVS_BLOCK_REQUESTS="Gzip-stream gzip-file-contents"
-would block ALL usage of compression.
-
-Please see the array 'struct request requests[]' in src/server.c for a full
-list of commands.
-
-Please note that if you block any commands marked as RQ_ESSENTIAL, CVS clients
-may fail! (This includes 'ci'!).
-
-See the companion cvs-custom.c for a wrapper that can enforce the environment variable for pserver setups.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' -U 10 cvs-1.12.12.orig/src/server.c cvs-1.12.12/src/server.c
---- cvs-1.12.12.orig/src/server.c	2005-04-14 14:13:29.000000000 +0000
-+++ cvs-1.12.12/src/server.c	2006-08-09 01:40:44.000000000 +0000
-@@ -5836,43 +5836,90 @@
- #undef REQ_LINE
- };
- #endif /* SERVER_SUPPORT or CLIENT_SUPPORT */
- 
- 
- 
- #ifdef SERVER_SUPPORT
- /*
-  * This server request is not ignored by the secondary.
-  */
-+
-+/* Hack by Robin H. Johnson <robbat2@gentoo.org>.
-+ * Allow the server ENV to specify what request types are to be ignored.
-+ */
-+
-+static char blocked_requests[BUFSIZ] = " ";
-+
-+static void build_blocked_requests() {
-+	char *tmp = getenv("CVS_BLOCK_REQUESTS");
-+
-+	if (tmp != NULL && strlen(tmp) > 0) {
-+		// move to our custom buffer
-+		strncat(blocked_requests, tmp, sizeof(blocked_requests)-strlen(blocked_requests));
-+		//add a space on the end as well for searching
-+		strncat(blocked_requests, " ", sizeof(blocked_requests)-strlen(blocked_requests));
-+	}
-+
-+	// now blocked_requests contains the list of every request that we do not
-+	// want to serve
-+}
-+
-+// returns 0 if we should serve this request
-+// use as if(checker(FOO)) continue;
-+static int serve_valid_requests_checker(char *reqname) {
-+	char needle[BUFSIZ] = " ";
-+	char *tmp;
-+
-+	if(!blocked_requests || strlen(blocked_requests) < 2)
-+		return 0;
-+
-+	// we want to look for ' 'reqname' '
-+	snprintf(needle, sizeof(needle), " %s ", reqname);
-+
-+	// now do the search
-+	tmp = strstr(blocked_requests, needle);
-+
-+	if (tmp != NULL)
-+		return 1;
-+
-+	return 0;
-+	
-+}
-+
- static void
- serve_valid_requests (char *arg)
- {
-     struct request *rq;
- 
-     /* Since this is processed in the first pass, don't reprocess it in the
-      * second.
-      *
-      * We still print errors since new errors could have been generated in the
-      * second pass.
-      */
-     if (print_pending_error ()
- #ifdef PROXY_SUPPORT
- 	|| reprocessing
- #endif /* PROXY_SUPPORT */
-        )
- 	return;
-+	
-+    build_blocked_requests();
- 
-     buf_output0 (buf_to_net, "Valid-requests");
-     for (rq = requests; rq->name != NULL; rq++)
-     {
- 	if (rq->func != NULL)
- 	{
-+		if(serve_valid_requests_checker(rq->name)) 
-+			continue;
- 	    buf_append_char (buf_to_net, ' ');
- 	    buf_output0 (buf_to_net, rq->name);
- 	}
-     }
-     buf_output0 (buf_to_net, "\nok\n");
- 
-     /* The client is waiting for the list of valid requests, so we
-        must send the output now.  */
-     buf_flush (buf_to_net, 1);
- }
-@@ -6353,20 +6400,24 @@
- 		    cmd += len;
- 		else if (cmd[len] == ' ')
- 		    cmd += len + 1;
- 		else
- 		    /*
- 		     * The first len characters match, but it's a different
- 		     * command.  e.g. the command is "cooperate" but we matched
- 		     * "co".
- 		     */
- 		    continue;
-+		// Ignore commands that we are supposed to ignore.
-+		if(serve_valid_requests_checker(rq->name))
-+				continue;
-+
- 
- 		if (!(rq->flags & RQ_ROOTLESS)
- 		    && current_parsed_root == NULL)
- 		{
- 		    /* For commands which change the way in which data
- 		       is sent and received, for example Gzip-stream,
- 		       this does the wrong thing.  Since the client
- 		       assumes that everything is being compressed,
- 		       unconditionally, there is no way to give this
- 		       error to the client without turning on
diff --git a/main/cvs/cvs-1.12.12-cvsbug-tmpfix.patch b/main/cvs/cvs-1.12.12-cvsbug-tmpfix.patch
deleted file mode 100644
index fcd4431e877..00000000000
--- a/main/cvs/cvs-1.12.12-cvsbug-tmpfix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: cvs-1.12.12/src/cvsbug.in
-===================================================================
---- cvs-1.12.12.orig/src/cvsbug.in
-+++ cvs-1.12.12/src/cvsbug.in
-@@ -109,14 +109,14 @@ elif [ -f /bin/domainname ]; then
-     /usr/bin/ypcat passwd 2>/dev/null | cat - /etc/passwd | grep "^$LOGNAME:" |
-       cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
-     ORIGINATOR="`cat $TEMP`"
--    rm -f $TEMP
-+    > $TEMP
-   fi
- fi
-
- if [ "$ORIGINATOR" = "" ]; then
-   grep "^$LOGNAME:" /etc/passwd | cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
-   ORIGINATOR="`cat $TEMP`"
--  rm -f $TEMP
-+  > $TEMP
- fi
-
- if [ -n "$ORGANIZATION" ]; then
-
diff --git a/main/cvs/cvs-1.12.12-fix-massive-leak.patch b/main/cvs/cvs-1.12.12-fix-massive-leak.patch
deleted file mode 100644
index 5366f50855f..00000000000
--- a/main/cvs/cvs-1.12.12-fix-massive-leak.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-buf_free_data must free data independently
-of send or reseived bytes over network.
-
-Moreover, when buffer is usually freed
-buffer _is_ empty, but has one clean mapped page.
-
-I've observed massive 'cvs server' leaks
-when importing large gentoo-x86 repo with 'cvsps'.
-Leak ate all my 32GBs of RAM and killed process.
-(Leaked around 3 pages per client request).
-
-valgrind found the leak easily:
-
-$ valgrind \
-    cvsps \
-           --root :local:$HOME/portage/gentoo-x86.rsync \
-           --fast-export \
-           gentoo-x86/dev-vcs/git-annex 2>l |
-    git fast-import
-
-    ==13504== 1,248 bytes in 52 blocks are still reachable in loss record 41 of 47
-    ==13504==    at 0x4C2C19B: malloc (vg_replace_malloc.c:270)
-    ==13504==    by 0x48A556: xnmalloc_inline (xmalloc.c:40)
-    ==13504==    by 0x48A5B5: xmalloc (xmalloc.c:56)
-    ==13504==    by 0x4855F5: new_memnode (pagealign_alloc.c:91)
-    ==13504==    by 0x48571B: pagealign_alloc (pagealign_alloc.c:151)
-    ==13504==    by 0x485739: pagealign_xalloc (pagealign_alloc.c:182)
-    ==13504==    by 0x408DD7: get_buffer_data (buffer.c:98)
-    ==13504==    by 0x409C0C: buf_input_data (buffer.c:738)
-    ==13504==    by 0x45BB63: do_cvs_command (server.c:3847)
-    ==13504==    by 0x45D39E: serve_co (server.c:4809)
-    ==13504==    by 0x45F845: server (server.c:6438)
-    ==13504==    by 0x438784: main (main.c:1066)
-
-And now it takes constant space (less, than 18MB)
-for 'cvs server' process to convert all gentoo-x86
-by serving more, than 5 000 000 client requests.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-diff --git a/src/buffer.c b/src/buffer.c
-index 3f12513..9a7a559 100644
---- a/src/buffer.c
-+++ b/src/buffer.c
-@@ -526,7 +526,7 @@ buf_copy_data (struct buffer *buf, struct buffer_data *data,
- void
- buf_free_data (struct buffer *buffer)
- {
--    if (buf_empty_p (buffer)) return;
-+    if (! buffer->data) return;
-     buf_free_datas (buffer->data, buffer->last);
-     buffer->data = buffer->last = NULL;
- }
diff --git a/main/cvs/cvs-1.12.12-format-security.patch b/main/cvs/cvs-1.12.12-format-security.patch
deleted file mode 100644
index d710a902073..00000000000
--- a/main/cvs/cvs-1.12.12-format-security.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/diff/diff3.c
-+++ b/diff/diff3.c
-@@ -1503,7 +1503,7 @@
- 	      line = 0;
- 	      do
- 		{
--		  printf_output (line_prefix);
-+		  printf_output ("%s", line_prefix);
- 		  cp = D_RELNUM (ptr, realfile, line);
- 		  length = D_RELLEN (ptr, realfile, line);
- 		  write_output (cp, length);
---- a/src/main.c
-+++ b/src/main.c
-@@ -1375,7 +1375,7 @@
- {
-     (void) fprintf (stderr, *cpp++, program_name, cvs_cmd_name);
-     for (; *cpp; cpp++)
--	(void) fprintf (stderr, *cpp);
-+	(void) fprintf (stderr, "%s", *cpp);
-     exit (EXIT_FAILURE);
- }
- 
diff --git a/main/cvs/cvs-1.12.12-getdelim.patch b/main/cvs/cvs-1.12.12-getdelim.patch
deleted file mode 100644
index 837d4408ab1..00000000000
--- a/main/cvs/cvs-1.12.12-getdelim.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-The function getdelim() behaves slightly different on FreeBSD,
-only appending to the *line buffer if line_size is 0.
-
-See: 
-https://savannah.nongnu.org/bugs/?29466
-http://bugs.gentoo.org/314791
-
-Already comitted upstream:
-http://cvs.savannah.gnu.org/viewvc/ccvs/src/myndbm.c?root=cvs&r1=1.38&r2=1.39
-
---- a/src/myndbm.c.orig
-+++ b/src/myndbm.c
-@@ -213,7 +213,7 @@
- mydbm_load_file (FILE *fp, List *list, char *filename)
- {
-     char *line = NULL;
--    size_t line_size;
-+    size_t line_size = 0;
-     char *value;
-     size_t value_allocated;
-     char *cp, *vp;
diff --git a/main/cvs/cvs-1.12.12-hash-nameclash.patch b/main/cvs/cvs-1.12.12-hash-nameclash.patch
deleted file mode 100644
index 95fd61e0a51..00000000000
--- a/main/cvs/cvs-1.12.12-hash-nameclash.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/src/hash.h?r1=1.14.6.2&r2=1.14.6.3&pathrev=cvs1-11-x-branch
-fixed in cvs-1.11.23, cvs-HEAD after cvs-1.12.13a
-
---- a/src/hash.h.orig	2005-02-01 22:56:48 +0100
-+++ b/src/hash.h	2010-03-10 19:00:11 +0100
-@@ -27,26 +27,26 @@
- };
- typedef enum ntype Ntype;
- 
--struct node
-+struct hashnode
- {
-     Ntype type;
--    struct node *next;
--    struct node *prev;
--    struct node *hashnext;
--    struct node *hashprev;
-+    struct hashnode *next;
-+    struct hashnode *prev;
-+    struct hashnode *hashnext;
-+    struct hashnode *hashprev;
-     char *key;
-     void *data;
--    void (*delproc) (struct node *);
-+    void (*delproc) (struct hashnode *);
- };
--typedef struct node Node;
-+typedef struct hashnode Node;
- 
--struct list
-+struct hashlist
- {
-     Node *list;
-     Node *hasharray[HASHSIZE];
--    struct list *next;
-+    struct hashlist *next;
- };
--typedef struct list List;
-+typedef struct hashlist List;
- 
- List *getlist (void);
- Node *findnode (List * list, const char *key);
diff --git a/main/cvs/cvs-1.12.12-install-sh.patch b/main/cvs/cvs-1.12.12-install-sh.patch
deleted file mode 100644
index 825c0ee6f1c..00000000000
--- a/main/cvs/cvs-1.12.12-install-sh.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/build-aux/install-sh b/build-aux/install-sh
---- a/build-aux/install-sh	2006-03-25 20:04:46 +0000
-+++ b/build-aux/install-sh	2007-09-14 10:53:29 +0100
-@@ -246,7 +246,7 @@
-   fi
- 
-   if test -n "$dir_arg"; then
--    $doit $mkdircmd "$dst" \
-+    { test -d "$dst" || $doit $mkdircmd -p "$dst"; } \
-       && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-       && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-       && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
diff --git a/main/cvs/cvs-1.12.12-mktime-configure.patch b/main/cvs/cvs-1.12.12-mktime-configure.patch
deleted file mode 100644
index 03d7f35601e..00000000000
--- a/main/cvs/cvs-1.12.12-mktime-configure.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-https://bugs.gentoo.org/220040
-https://bugs.gentoo.org/570208
-
-update mktime check to latest autoconf version which is less buggy
-
---- a/configure
-+++ b/configure
-@@ -5299,26 +6059,25 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- /* Test program from Paul Eggert and Tony Leneis.  */
--#if TIME_WITH_SYS_TIME
-+#ifdef TIME_WITH_SYS_TIME
- # include <sys/time.h>
- # include <time.h>
- #else
--# if HAVE_SYS_TIME_H
-+# ifdef HAVE_SYS_TIME_H
- #  include <sys/time.h>
- # else
- #  include <time.h>
- # endif
- #endif
- 
--#if HAVE_STDLIB_H
--# include <stdlib.h>
--#endif
-+#include <limits.h>
-+#include <stdlib.h>
- 
--#if HAVE_UNISTD_H
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif
- 
--#if !HAVE_ALARM
-+#ifndef HAVE_ALARM
- # define alarm(X) /* empty */
- #endif
- 
-@@ -5335,9 +6094,9 @@
- };
- #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
- 
--/* Fail if mktime fails to convert a date in the spring-forward gap.
-+/* Return 0 if mktime fails to convert a date in the spring-forward gap.
-    Based on a problem report from Andreas Jaeger.  */
--static void
-+static int
- spring_forward_gap ()
- {
-   /* glibc (up to about 1998-10-07) failed this test. */
-@@ -5356,29 +6115,27 @@
-   tm.tm_min = 0;
-   tm.tm_sec = 0;
-   tm.tm_isdst = -1;
--  if (mktime (&tm) == (time_t)-1)
--    exit (1);
-+  return mktime (&tm) != (time_t) -1;
- }
- 
--static void
-+static int
- mktime_test1 (now)
-      time_t now;
- {
-   struct tm *lt;
--  if ((lt = localtime (&now)) && mktime (lt) != now)
--    exit (1);
-+  return ! (lt = localtime (&now)) || mktime (lt) == now;
- }
- 
--static void
-+static int
- mktime_test (now)
-      time_t now;
- {
--  mktime_test1 (now);
--  mktime_test1 ((time_t) (time_t_max - now));
--  mktime_test1 ((time_t) (time_t_min + now));
-+  return (mktime_test1 (now)
-+	  && mktime_test1 ((time_t) (time_t_max - now))
-+	  && mktime_test1 ((time_t) (time_t_min + now)));
- }
- 
--static void
-+static int
- irix_6_4_bug ()
- {
-   /* Based on code from Ariel Faigon.  */
-@@ -5391,11 +6148,10 @@
-   tm.tm_sec = 0;
-   tm.tm_isdst = -1;
-   mktime (&tm);
--  if (tm.tm_mon != 2 || tm.tm_mday != 31)
--    exit (1);
-+  return tm.tm_mon == 2 && tm.tm_mday == 31;
- }
- 
--static void
-+static int
- bigtime_test (j)
-      int j;
- {
-@@ -5417,8 +6173,39 @@
- 	     && lt->tm_wday == tm.tm_wday
- 	     && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
- 		  == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
--	exit (1);
-+	return 0;
-     }
-+  return 1;
-+}
-+
-+static int
-+year_2050_test ()
-+{
-+  /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
-+     ignoring leap seconds.  */
-+  unsigned long int answer = 2527315200UL;
-+
-+  struct tm tm;
-+  time_t t;
-+  tm.tm_year = 2050 - 1900;
-+  tm.tm_mon = 2 - 1;
-+  tm.tm_mday = 1;
-+  tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
-+  tm.tm_isdst = -1;
-+
-+  /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
-+     instead of "TZ=America/Vancouver" in order to detect the bug even
-+     on systems that don't support the Olson extension, or don't have the
-+     full zoneinfo tables installed.  */
-+  putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
-+
-+  t = mktime (&tm);
-+
-+  /* Check that the result is either a failure, or close enough
-+     to the correct answer that we can assume the discrepancy is
-+     due to leap seconds.  */
-+  return (t == (time_t) -1
-+	  || (0 < t && answer - 120 <= t && t <= answer + 120));
- }
- 
- int
-@@ -5432,12 +6219,15 @@
-      isn't worth using anyway.  */
-   alarm (60);
- 
--  for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
--    continue;
--  time_t_max--;
--  if ((time_t) -1 < 0)
--    for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2)
--      continue;
-+  for (;;)
-+    {
-+      t = (time_t_max << 1) + 1;
-+      if (t <= time_t_max)
-+	break;
-+      time_t_max = t;
-+    }
-+  time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
-+
-   delta = time_t_max / 997; /* a suitable prime number */
-   for (i = 0; i < N_STRINGS; i++)
-     {
-@@ -5445,18 +6235,22 @@
- 	putenv (tz_strings[i]);
- 
-       for (t = 0; t <= time_t_max - delta; t += delta)
--	mktime_test (t);
--      mktime_test ((time_t) 1);
--      mktime_test ((time_t) (60 * 60));
--      mktime_test ((time_t) (60 * 60 * 24));
--
--      for (j = 1; 0 < j; j *= 2)
--	bigtime_test (j);
--      bigtime_test (j - 1);
-+	if (! mktime_test (t))
-+	  return 1;
-+      if (! (mktime_test ((time_t) 1)
-+	     && mktime_test ((time_t) (60 * 60))
-+	     && mktime_test ((time_t) (60 * 60 * 24))))
-+	return 1;
-+
-+      for (j = 1; ; j <<= 1)
-+	if (! bigtime_test (j))
-+	  return 1;
-+	else if (INT_MAX / 2 < j)
-+	  break;
-+      if (! bigtime_test (INT_MAX))
-+	return 1;
-     }
--  irix_6_4_bug ();
--  spring_forward_gap ();
--  exit (0);
-+  return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
- }
- _ACEOF
- rm -f conftest$ac_exeext
diff --git a/main/cvs/cvs-1.12.12-mktime-x32.patch b/main/cvs/cvs-1.12.12-mktime-x32.patch
deleted file mode 100644
index 948fa4d7144..00000000000
--- a/main/cvs/cvs-1.12.12-mktime-x32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-back port changes from upstream gnulib to make this work on x32
-
-https://bugs.gentoo.org/395641
-
---- cvs-1.12.12/lib/mktime.c
-+++ cvs-1.12.12/lib/mktime.c
-@@ -115,6 +115,13 @@
- #define TM_YEAR_BASE 1900
- verify (base_year_is_a_multiple_of_100, TM_YEAR_BASE % 100 == 0);
- 
-+#if INT_MAX <= LONG_MAX / 2
-+typedef long int long_int;
-+#else
-+typedef long long int long_int;
-+#endif
-+verify (long_int_is_wide_enough, INT_MAX == INT_MAX * (long_int) 2 / 2);
-+
- /* Return 1 if YEAR + TM_YEAR_BASE is a leap year.  */
- static inline int
- leapyear (long int year)
-@@ -167,8 +174,6 @@
- 	    int year0, int yday0, int hour0, int min0, int sec0)
- {
-   verify (C99_integer_division, -1 / 2 == 0);
--  verify (long_int_year_and_yday_are_wide_enough,
--	  INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX);
- 
-   /* Compute intervening leap days correctly even if year is negative.
-      Take care to avoid integer overflow here.  */
diff --git a/main/cvs/cvs-1.12.12-musl.patch b/main/cvs/cvs-1.12.12-musl.patch
deleted file mode 100644
index e426cf55fcc..00000000000
--- a/main/cvs/cvs-1.12.12-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://gcc.gnu.org/ml/gcc/2003-04/msg00518.html
-
---- a/lib/regex.c
-+++ b/lib/regex.c
-@@ -8184,7 +8184,7 @@
-       if (msg_size > errbuf_size)
-         {
- #if defined HAVE_MEMPCPY || defined _LIBC
--	  *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
-+	  *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
- #else
-           memcpy (errbuf, msg, errbuf_size - 1);
-           errbuf[errbuf_size - 1] = 0;
diff --git a/main/cvs/cvs-1.12.12-openat.patch b/main/cvs/cvs-1.12.12-openat.patch
deleted file mode 100644
index fdb406a45e4..00000000000
--- a/main/cvs/cvs-1.12.12-openat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: cvs-1.12.12/lib/openat.c
-===================================================================
---- cvs-1.12.12.orig/lib/openat.c
-+++ cvs-1.12.12/lib/openat.c
-@@ -55,9 +55,13 @@ rpl_openat (int fd, char const *filename
-       va_list arg;
-       va_start (arg, flags);
- 
--      /* Assume that mode_t is passed compatibly with mode_t's type
--	 after argument promotion.  */
--      mode = va_arg (arg, mode_t);
-+      /* If mode_t is narrower than int, use the promoted type (int),
-+         not mode_t.  Use sizeof to guess whether mode_t is nerrower;
-+         we don't know of any practical counterexamples.  */
-+      if (sizeof (mode_t) < sizeof (int))
-+	mode = va_arg (arg, int);
-+      else
-+	mode = va_arg (arg, mode_t);
- 
-       va_end (arg);
-     }
diff --git a/main/cvs/cvs-1.12.12-rcs2log-coreutils.patch b/main/cvs/cvs-1.12.12-rcs2log-coreutils.patch
deleted file mode 100644
index 7dda3f0f172..00000000000
--- a/main/cvs/cvs-1.12.12-rcs2log-coreutils.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-X-Gentoo-bug: 144114
-
-diff -Nuar cvs-1.12.12.orig/contrib/rcs2log.sh cvs-1.12.12/contrib/rcs2log.sh
---- cvs-1.12.12.orig/contrib/rcs2log.sh	2003-02-25 21:32:51.000000000 +0000
-+++ cvs-1.12.12/contrib/rcs2log.sh	2010-12-06 21:14:33.831532212 +0000
-@@ -620,7 +620,7 @@
- # Sort the log entries, first by date+time (in reverse order),
- # then by author, then by log entry, and finally by file name and revision
- # (just in case).
--sort -t"$SOH" +2 -4r +4 +0 |
-+sort -t"$SOH" -k 3,4r -k 5 -k 1,2 |
- 
- # Finally, reformat the sorted log entries.
- $AWK -F"$SOH" '
diff --git a/main/cxxopts/APKBUILD b/main/cxxopts/APKBUILD
new file mode 100644
index 00000000000..ca1733d2a71
--- /dev/null
+++ b/main/cxxopts/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=cxxopts
+pkgver=3.2.1
+pkgrel=0
+pkgdesc="Lightweight C++ command line option parser as a header only library"
+url="https://github.com/jarro2783/cxxopts"
+arch="noarch"
+license="MIT"
+makedepends="cmake ninja"
+subpackages="$pkgname-dev"
+source="https://github.com/jarro2783/cxxopts/archive/v$pkgver/cxxopts-$pkgver.tar.gz"
+
+build() {
+	cmake -G Ninja -B build \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCXXOPTS_BUILD_TESTS=ON
+	cmake --build build
+}
+
+check() {
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+7841fb3e6c3c2a057917c962e29fc0090e6ed06f5515aaa5e2a868fef59071a9a99b74d81c32cf613ecf10a68a4d96d6ad07805f48c7c3951ded096a2317dc3d  cxxopts-3.2.1.tar.gz
+"
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 28c3dc9a9a9..9fe8ab791c0 100644
--- a/main/cyrus-sasl/APKBUILD
+++ b/main/cyrus-sasl/APKBUILD
@@ -1,14 +1,15 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cyrus-sasl
-pkgver=2.1.27
-pkgrel=5
+pkgver=2.1.28
+pkgrel=6
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
-url="https://cyrusimap.org/"
+url="https://www.cyrusimap.org/sasl/"
 arch="all"
-license="custom"
+license="BSD-3-Clause-Attribution AND BSD-4-Clause"
 options="!check"  # No test suite.
 subpackages="
+	$pkgname-static
 	$pkgname-dev
 	$pkgname-doc
 	$pkgname-openrc
@@ -19,40 +20,42 @@ subpackages="
 	$pkgname-ntlm:_plugin
 	$pkgname-crammd5:_plugin
 	$pkgname-digestmd5:_plugin
-	$pkgname-plain:_plugin
 	$pkgname-login:_plugin
+	$pkgname-sql:_plugin
 	"
 # use heimdal to avoid circular dep: cyrus-sasl -> krb5 -> openldap -> cyrus-sasl
 makedepends="
-	db-dev
-	openssl-dev
+	gdbm-dev
+	openssl-dev>3
 	heimdal-dev
 	py3-sphinx
+	sqlite-dev
 
 	automake
 	autoconf
 	libtool
 	"
 source="https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-$pkgver/cyrus-sasl-$pkgver.tar.gz
-	cyrus-sasl-2.1.27-as_needed.patch
-	cyrus-sasl-2.1.27-autotools_fixes.patch
-	cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
-	cyrus-sasl-2.1.27-doc_build_fix.patch
-	cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
-	CVE-2019-19906.patch
 	saslauthd.initd
 	"
 
 # secfixes:
+#   2.1.28-r0:
+#     - CVE-2022-24407
 #   2.1.27-r5:
-#   - CVE-2019-19906
+#     - CVE-2019-19906
 #   2.1.26-r7:
-#   - CVE-2013-4122
+#     - CVE-2013-4122
+#   0:
+#     - CVE-2020-8032
 
-builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	default_prepare
+	aclocal --install
+	autoreconf -vfi -Wno-portability
+}
 
 build() {
-	autoreconf -vif
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -62,7 +65,6 @@ build() {
 		--mandir=/usr/share/man \
 		--enable-static \
 		--enable-shared \
-		--disable-java \
 		--with-plugindir=/usr/lib/sasl2 \
 		--with-configdir=/etc/sasl2 \
 		--with-dbpath=/etc/sasl2/sasldb2 \
@@ -70,13 +72,19 @@ build() {
 		--with-gss_impl=heimdal \
 		--enable-gssapi \
 		--with-rc4 \
-		--with-dblib=berkeley \
+		--with-dblib=gdbm \
 		--with-saslauthd=/run/saslauthd \
 		--without-pwcheck \
 		--with-devrandom=/dev/urandom \
+		--enable-sql \
+		--without-mysql \
+		--without-pgsql \
+		--without-sqlite \
+		--with-sqlite3=/usr/lib \
 		--enable-anon \
 		--enable-cram \
 		--enable-digest \
+		--enable-httpform \
 		--enable-ntlm \
 		--enable-plain \
 		--enable-login \
@@ -87,44 +95,32 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
-	mkdir -p "$pkgdir"/etc/sasl2
 	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 	install -Dm755 "$srcdir"/saslauthd.initd "$pkgdir"/etc/init.d/saslauthd
 }
 
-static() {
-	pkgdesc="Static libraires for $pkgname"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
-}
-
 _plugin() {
 	depends=
 	local plugin=${subpkgname/$pkgname-/}
 	replaces="libsasl"
 	pkgdesc="Cyrus SASL plugin for $plugin"
-	mkdir -p "$subpkgdir"/usr/lib/sasl2
-	mv "$pkgdir"/usr/lib/sasl2/lib${plugin}.so* "$subpkgdir"/usr/lib/sasl2/
+	amove usr/lib/sasl2/lib$plugin.so*
 }
 
 libsasl() {
 	depends=
 	pkgdesc="Cyrus Simple Authentication and Security Layer (SASL) library"
-	mkdir -p "$subpkgdir"/usr/lib/sasl2 "$subpkgdir"/etc/sasl2
+	replaces="cyrus-sasl-plain"
+
 	local lib=
-	for lib in anonymous sasldb; do
-		mv "$pkgdir"/usr/lib/sasl2/*${lib}*.so* "$subpkgdir"/usr/lib/sasl2/
+	for lib in anonymous sasldb plain; do
+		amove usr/lib/sasl2/*$lib*.so*
 	done
-	mv "$pkgdir"/usr/lib/libsasl*.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libsasl*.so.*
 }
 
-sha512sums="d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b  cyrus-sasl-2.1.27.tar.gz
-9eefa6d45e3dd9157a5672909acdd88f0ae35e76d64c3723890a474bbb05b22499cfadb0c077924d27f34da3710b2b700094dd7d5704050138c08dabcefdde94  cyrus-sasl-2.1.27-as_needed.patch
-0d99ca049e76c11500769079d94f3bdb634bddb4c8d45a83b383e9bb9777edda66b17566800acbd450e1f4842d070ec3fbc236e7f0ef8759c36e6dd5ea8e3c64  cyrus-sasl-2.1.27-autotools_fixes.patch
-4ca601839b023ef790e48dae567ffbbd57c632384c980946639ec7437ad23874961451718569455e6e25afaeff1728ecbc71a8686f6b43246f83465f95a2c904  cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
-6d723e7ec2c431b45c011b887187b6a670dbe646aa4c39d38171047ab23db529c30c433f8d4dd624181917c5ce4e5271f86e35e2644ede1c40dfb09cb67dccde  cyrus-sasl-2.1.27-doc_build_fix.patch
-fca4f2b7e427c7613f71daa4a31772c33c8c0fe9d7f85b57b85da71bc5a88a18fc52f7caea463188b4addd31cd041d5349af689d5face2cc45fb50c700a8afd7  cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
-c39efd87dc9c883d3b07474197f6835fbd32f23baa1f5cd04b25a0473639f847321c40f232e390d4dc9d9ee189dbd177c05d3d1461af4d28a48a4827abc5d9b8  CVE-2019-19906.patch
-f76bfb61567172428cdbc1ed900d5e0b6e66afc38118db6ba0e2fd8ba01956ad896e56463b2249bdc46d8725384f1b975a2af3601c0735327d3f8bc26ce1ed75  saslauthd.initd"
+sha512sums="
+db15af9079758a9f385457a79390c8a7cd7ea666573dace8bf4fb01bb4b49037538d67285727d6a70ad799d2e2318f265c9372e2427de9371d626a1959dd6f78  cyrus-sasl-2.1.28.tar.gz
+f76bfb61567172428cdbc1ed900d5e0b6e66afc38118db6ba0e2fd8ba01956ad896e56463b2249bdc46d8725384f1b975a2af3601c0735327d3f8bc26ce1ed75  saslauthd.initd
+"
diff --git a/main/cyrus-sasl/CVE-2019-19906.patch b/main/cyrus-sasl/CVE-2019-19906.patch
deleted file mode 100644
index f7edb521e89..00000000000
--- a/main/cyrus-sasl/CVE-2019-19906.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/cyrusimap/cyrus-sasl/issues/587
-
-diff --git a/lib/common.c b/lib/common.c
-index bc3bf1df..9969d6aa 100644
---- a/lib/common.c
-+++ b/lib/common.c
-@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t *alloclen,
-
-   if (add==NULL) add = "(null)";
-
--  addlen=strlen(add); /* only compute once */
-+  addlen=strlen(add)+1; /* only compute once */
-   if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK)
-     return SASL_NOMEM;
-
diff --git a/main/cyrus-sasl/cyrus-sasl-2.1.27-as_needed.patch b/main/cyrus-sasl/cyrus-sasl-2.1.27-as_needed.patch
deleted file mode 100644
index 7cd9e151fbb..00000000000
--- a/main/cyrus-sasl/cyrus-sasl-2.1.27-as_needed.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: Matthias Klose <doko@ubuntu.com>
-Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
-it.
---- cyrus-sasl-2.1.27/saslauthd/Makefile.am
-+++ cyrus-sasl-2.1.27/saslauthd/Makefile.am
-@@ -25,7 +25,7 @@
- saslauthd_DEPENDENCIES = saslauthd-main.o $(LTLIBOBJS_FULL)
- saslauthd_LDADD	= @SASL_KRB_LIB@ \
- 		  @GSSAPIBASE_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
--		  @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS)
-+		  @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS)
- 
- testsaslauthd_SOURCES = testsaslauthd.c utils.c
- testsaslauthd_LDADD = @LIB_SOCKET@
---- cyrus-sasl-2.1.27/sasldb/Makefile.am
-+++ cyrus-sasl-2.1.27/sasldb/Makefile.am
-@@ -54,6 +54,6 @@
- 
- libsasldb_la_SOURCES = allockey.c sasldb.h
- EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
--libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
--libsasldb_la_LIBADD = $(SASL_DB_BACKEND)
-+libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
-+libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
- libsasldb_la_LDFLAGS = -no-undefined
diff --git a/main/cyrus-sasl/cyrus-sasl-2.1.27-autotools_fixes.patch b/main/cyrus-sasl/cyrus-sasl-2.1.27-autotools_fixes.patch
deleted file mode 100644
index 2ce971efc5b..00000000000
--- a/main/cyrus-sasl/cyrus-sasl-2.1.27-autotools_fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- cyrus-sasl-2.1.27/configure.ac
-+++ cyrus-sasl-2.1.27/configure.ac
-@@ -44,6 +44,8 @@
- 
- AC_PREREQ(2.63)
- 
-+AC_CONFIG_MACRO_DIR([config])
-+
- dnl
- dnl REMINDER: When changing the version number here, please also update
- dnl the values in win32/include/config.h and include/sasl.h as well.
---- cyrus-sasl-2.1.27/Makefile.am
-+++ cyrus-sasl-2.1.27/Makefile.am
-@@ -44,6 +44,8 @@
- #
- ################################################################
- 
-+ACLOCAL_AMFLAGS = -I config
-+
- if SASLAUTHD
- SAD = saslauthd
- else
---- cyrus-sasl-2.1.27/saslauthd/Makefile.am
-+++ cyrus-sasl-2.1.27/saslauthd/Makefile.am
-@@ -1,4 +1,6 @@
- AUTOMAKE_OPTIONS = 1.7
-+ACLOCAL_AMFLAGS = -I ../config
-+
- sbin_PROGRAMS	= saslauthd testsaslauthd
- EXTRA_PROGRAMS  = saslcache
- 
diff --git a/main/cyrus-sasl/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch b/main/cyrus-sasl/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
deleted file mode 100644
index c331039e2f1..00000000000
--- a/main/cyrus-sasl/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Fabian Fagerholm <fabbe@debian.org>
-Description: This patch makes sure the non-PIC version of libsasldb.a, which
-is created out of non-PIC objects, is not going to overwrite the PIC version,
-which is created out of PIC objects. The PIC version is placed in .libs, and
-the non-PIC version in the current directory.  This ensures that both non-PIC
-and PIC versions are available in the correct locations.
---- cyrus-sasl-2.1.27/lib/Makefile.am
-+++ cyrus-sasl-2.1.27/lib/Makefile.am
-@@ -98,7 +98,7 @@
- 
- libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
- 	@echo adding static plugins and dependencies
--	$(AR) cru .libs/$@ $(SASL_STATIC_OBJS)
-+	$(AR) cru $@ $(SASL_STATIC_OBJS)
- 	@for i in ./libsasl2.la ../common/libplugin_common.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \
- 	if test ! -f $$i; then continue; fi; . $$i; \
- 	for j in $$dependency_libs foo; do \
diff --git a/main/cyrus-sasl/cyrus-sasl-2.1.27-doc_build_fix.patch b/main/cyrus-sasl/cyrus-sasl-2.1.27-doc_build_fix.patch
deleted file mode 100644
index bdd02f77966..00000000000
--- a/main/cyrus-sasl/cyrus-sasl-2.1.27-doc_build_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cyrus-sasl-2.1.27/docsrc/exts/sphinxlocal/writers/manpage.py
-+++ cyrus-sasl-2.1.27/docsrc/exts/sphinxlocal/writers/manpage.py
-@@ -23,7 +23,7 @@
- from sphinx import addnodes
- from sphinx.locale import admonitionlabels, _
- from sphinx.util.osutil import ustrftime
--from sphinx.util.compat import docutils_version
-+#from sphinx.util.compat import docutils_version
- 
- class CyrusManualPageWriter(ManualPageWriter):
- 
diff --git a/main/cyrus-sasl/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch b/main/cyrus-sasl/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
deleted file mode 100644
index c585cb158e1..00000000000
--- a/main/cyrus-sasl/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Gentoo bug #389349
---- cyrus-sasl-2.1.27/m4/sasl2.m4
-+++ cyrus-sasl-2.1.27/m4/sasl2.m4
-@@ -220,7 +220,11 @@
-                  [AC_WARN([Cybersafe define not found])])
- 
-   elif test "$ac_cv_header_gssapi_h" = "yes"; then
--    AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h,
-+    AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
-+                 [#include <gssapi.h>
-+                  #ifdef GSS_C_NT_HOSTBASED_SERVICE
-+                    hostbased_service_gss_nt_yes
-+                  #endif],
-                     [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-                                [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])])
-   elif test "$ac_cv_header_gssapi_gssapi_h"; then
diff --git a/main/cython/APKBUILD b/main/cython/APKBUILD
index 658a2f4a6fa..52d6808e055 100644
--- a/main/cython/APKBUILD
+++ b/main/cython/APKBUILD
@@ -2,34 +2,34 @@
 # Contributor: Oleg Titov <oleg.titov@gmail.com>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=cython
-pkgver=0.29.16
+pkgver=3.0.10
 pkgrel=0
 pkgdesc="Cython is an optimising static compiler for both the Python & the extended Cython programming languages."
-url="https://cython.org"
+url="https://cython.org/"
 arch="all"
 license="Apache-2.0"
-options="!check" # several tests fail
-makedepends="py3-setuptools python3-dev"
-subpackages="cython-doc"
+makedepends="py3-gpep517 py3-setuptools py3-wheel python3-dev"
+depends="python3"
+subpackages="cython-pyc cython-doc"
 source="cython-$pkgver.tar.gz::https://github.com/cython/cython/archive/$pkgver.tar.gz"
 
-# compatible fix for removing dev subpkg from apkbuild
-# cython is not a library but a compiler and does not need a dev subpackage
-provides=cython-dev
-
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
 }
 
 check() {
-	make test
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 runtests.py -j${JOBS:-$(nproc)}
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 
 	install -Dm 644 LICENSE.txt "$pkgdir/usr/share/licenses/cython/license"
 	install -Dm 644 README.rst "$pkgdir/usr/share/doc/cython/readme.rst"
 }
 
-sha512sums="8f7a05ad86d557d774b2de5ec77fa9bc2600500555b607482899ade2b8abb2ebb60fc1b944f355b37663e30de09d53bcaa925f888b4128f4b0345a1cad9e2923  cython-0.29.16.tar.gz"
+sha512sums="
+97aa831cea96c1f3c51653c51fadb0aea8bdfdb076a2c898862637f52b826bcb9162d1b7aade3304c5650d0b894cb1083052f036365d79cd3d390e0486b33ac5  cython-3.0.10.tar.gz
+"
diff --git a/main/czmq/APKBUILD b/main/czmq/APKBUILD
index 13f5b42dfb7..7ee9be01846 100644
--- a/main/czmq/APKBUILD
+++ b/main/czmq/APKBUILD
@@ -1,38 +1,45 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=czmq
-pkgver=4.2.0
-pkgrel=1
+pkgver=4.2.1
+pkgrel=4
 pkgdesc="High-level C binding for ZeroMQ"
 url="http://czmq.zeromq.org/"
 arch="all !s390x"  # zproxy test timeouts on s390x
 license="MPL-2.0"
-depends_dev="util-linux-dev zeromq-dev"
-makedepends="$depends_dev cmake"
-subpackages="$pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/zeromq/$pkgname/archive/v$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+makedepends="util-linux-dev zeromq-dev cmake samurai"
+subpackages="$pkgname-static $pkgname-dev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/zeromq/czmq/archive/v$pkgver.tar.gz"
 
 case "$CARCH" in
 # crypto tests assume MIPS is little-endian
-mips*)	options="!check";;
+	mips*)	options="!check";;
 esac
 
 build() {
-	# Note: One test segfaults when built with MinSizeRel (-Os).
-	cmake \
-		-DCMAKE_BUILD_TYPE=None \
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-	make
+		-DCMAKE_VERBOSE_MAKEFILE=ON \
+		$CMAKE_CROSSOPTS .
+	cmake --build build
 }
 
 check() {
-	make test
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(zbeacon|zsock)'
 }
 
 package() {
-	make install DESTDIR="$pkgdir"
+	DESTDIR="$pkgdir" cmake --install build
+
+	mkdir -p "$pkgdir"/usr/lib
+	mv "$pkgdir"/usr/share/cmake "$pkgdir"/usr/lib
 }
 
-sha512sums="d6b6356c07095579e6780386e6c5ead6f87c1f3a80d15afbfaea24a9c108ef13ab750e7dcffbcc4d8528fb5b14b0b28f08008d513b2cf85f2df10b7cf5903212  czmq-4.2.0.tar.gz"
+sha512sums="
+65a21f7bd5935b119e1b24ce3b2ce8462031ab7c9a4ba587bb99fe618c9f8cb672cfa202993ddd79e0fb0f154ada06560b79a1b4f762fcce8f88f2f450ecee01  czmq-4.2.1.tar.gz
+"
diff --git a/main/d-feet/APKBUILD b/main/d-feet/APKBUILD
index b4281ffdbc9..4ff51f0b0e9 100644
--- a/main/d-feet/APKBUILD
+++ b/main/d-feet/APKBUILD
@@ -1,15 +1,15 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=d-feet
-pkgver=0.3.15
+pkgver=0.3.16
 _v=${pkgver%.*}
-pkgrel=2
-pkgdesc="A powerful D-Bus Debugger"
+pkgrel=3
+pkgdesc="powerful D-Bus Debugger"
 options="!check" # Testsuite loops infinitely
 url="https://wiki.gnome.org/action/show/Apps/DFeet"
 arch="noarch"
 license="GPL-2.0-or-later"
-depends="python3 py3-gobject3"
+depends="python3 py3-gobject3 gtk+3.0"
 makedepends="
 	meson
 	itstool
@@ -17,29 +17,29 @@ makedepends="
 	gtk+3.0-dev
 	gobject-introspection-dev
 	"
-source="https://download.gnome.org/sources/d-feet/$_v/d-feet-$pkgver.tar.xz"
+source="https://download.gnome.org/sources/d-feet/$_v/d-feet-$pkgver.tar.xz
+	meson-0.60.patch
+	"
 
 build() {
-	cd "$builddir"
-	meson \
-		--prefix=/usr \
-		--buildtype=plain \
+	abuild-meson \
 		-Dtests=false \
 		output
-	ninja -C output
+	meson compile -C output
 }
 
 check() {
-	cd "$builddir"
-	ninja -C output test
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	cd "$builddir"
-	DESTDIR="$pkgdir" ninja -C output install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 
 	# Fix on musl
 	sed -i 's|locale.textdomain("d-feet")||' "$pkgdir"/usr/bin/d-feet
 }
 
-sha512sums="c8ac20b91dfa5fea2282099a772c3668ebe75b0e4977b08adc3ee9591e00e391398835af5486b32d8d65e558c58f55cc26523b0e4a3ff1745b722ee90000de87  d-feet-0.3.15.tar.xz"
+sha512sums="
+ff4db968cbd679e2065c614d538187fe3c56118b44638771ec9f7472bdba4a798dc682565f520a8680a8001ea39ce88555b07cda172e60f88eb6bdf1e00b5a6d  d-feet-0.3.16.tar.xz
+536da02d8b8742818e81ab9e82b06b75a5ec55ad056793aeb3ca2c8f358a22040afb91c2217953ef1807b5ddaef2bdccab82edb89740e5d325b4a862ed80bc78  meson-0.60.patch
+"
diff --git a/main/d-feet/meson-0.60.patch b/main/d-feet/meson-0.60.patch
new file mode 100644
index 00000000000..316d1ca286b
--- /dev/null
+++ b/main/d-feet/meson-0.60.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -13,7 +13,6 @@
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: '@BASENAME@',
+@@ -24,7 +24,6 @@
+ appdata = df_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
diff --git a/main/dahdi-linux-lts/APKBUILD b/main/dahdi-linux-lts/APKBUILD
deleted file mode 100644
index da2a149335b..00000000000
--- a/main/dahdi-linux-lts/APKBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# Contributor: Timo Teras <timo.teras@iki.fi>
-# Contributor: wener <wenermail@gmail.com>
-# Maintainer: wener <wenermail@gmail.com>
-
-# when changing _ver we *must* bump _rel
-_name=dahdi-linux
-_ver=3.1.0
-_rel=0
-
-_flavor=${FLAVOR:-lts}
-_kpkg=linux-$_flavor
-_kver=5.4.28
-_krel=0
-
-_kpkgver="$_kver-r$_krel"
-_kabi="$_kver-$_krel-$_flavor"
-
-pkgname=$_name-$_flavor
-pkgver=$_kver
-pkgrel=$(( $_krel + $_rel ))
-
-pkgdesc="Digium Asterisk Hardware Device Interface drivers"
-url="http://www.asterisk.org"
-arch="x86_64"
-license="GPL-2.0-or-later"
-depends="dahdi-linux $_kpkg=$_kpkgver"
-# we need wget and tar because make install downloads firmware and uses fancy
-# options for tar and wget.
-makedepends="$_kpkg-dev=$_kpkgver wget tar perl"
-subpackages="$pkgname-dev"
-source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_name}-$_ver.tar.gz
-	dahdi-depmod.patch
-	dahdi-bri_dchan.patch
-	kernel-compat-5.0.patch
-	kernel-compat-5.4.patch
-	"
-
-builddir="$srcdir/$_name-$_ver"
-
-prepare() {
-	default_prepare
-	# verify the kernel version
-	local _kapkbuild=../../main/linux-$_flavor/APKBUILD
-	if [ -f $_kapkbuild ]; then
-		(	. $_kapkbuild
-			pkgname=$_name-$_flavor
-			[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
-			[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
-			return 0
-		)
-	fi
-}
-
-build() {
-	cd "$srcdir/$_name-$_ver"
-	make KVERS="${_kabi}" DYNFS="yes"
-}
-
-package() {
-	cd "$srcdir/$_name-$_ver"
-	make KVERS="${_kabi}" DYNFS="yes" \
-		DESTDIR="$pkgdir" install-modules
-	rm -rf "$pkgdir"/lib/firmware "$pkgdir"/usr/lib/hotplug/firmware \
-		"$pkgdir"/usr/include || true
-}
-
-# since we sourced the APKBUILD above we got the dev() function there to
-# so we override it again.
-depends_dev="dahdi-linux-dev"
-dev() {
-	default_dev
-	local dir="$subpkgdir"/usr/src/dahdi-headers-${_kabi}
-	install -D "$srcdir"/$_name-$_ver/drivers/dahdi/Module.symvers \
-		"$dir"/drivers/dahdi/Module.symvers
-	ln -s /usr/include "$dir"/include
-}
-
-sha512sums="440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4  dahdi-linux-3.1.0.tar.gz
-aba01eb90d9db1c595ff22078c76aadb20900486b5794d38b7ee61fa30d2fb51be318a4d059246017640447aee03fb09bb5514c818e3caa1cd98e331ec065173  dahdi-depmod.patch
-fa2fa9e96eefc0f31a1a4a8f8f44e77936f6da0d7b74fe3c3d1f0de085621744ae4367932ac97a10b7f96b7d0954843b0bfe07a251b85434079cc6da29e243ba  dahdi-bri_dchan.patch
-342f2467aae3ef00440d613a0bb4e8bd06cd1df2d4c9878ba8cf4af0eaa5b9cd7455c14e10c66c462f29812560622187bfb12b35b7b6cb466475a365dd998f40  kernel-compat-5.0.patch
-a03fde27c801bd7a9f5267505072a50dc738dcac9cafb08539bbd38eb78f3bb688f067bbbcbe05521a6f38fe28d4e8bfee68c30acea24647a4ea0d28a05bd987  kernel-compat-5.4.patch"
diff --git a/main/dahdi-linux-lts/dahdi-bri_dchan.patch b/main/dahdi-linux-lts/dahdi-bri_dchan.patch
deleted file mode 100644
index 8d2ba97fd1e..00000000000
--- a/main/dahdi-linux-lts/dahdi-bri_dchan.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-# Translate the D channels to a standard channel data.
-# The HFC chipset provides us the D channel as data, but
-# Zaptel expects it as a standard channel with 1000 samples
-# per second.
-
-Index: dahdi-linux-2.5.0/include/dahdi/kernel.h
-===================================================================
---- dahdi-linux-2.5.0.orig/include/dahdi/kernel.h	2011-06-29 18:32:40.000000000 +0300
-+++ dahdi-linux-2.5.0/include/dahdi/kernel.h	2011-08-15 14:14:26.000000000 +0300
-@@ -413,6 +413,13 @@
- 	int statcount;
- 	int lastnumbufs;
- #endif
-+#ifdef CONFIG_DAHDI_BRI_DCHANS
-+	int bytes2receive;
-+	int maxbytes2transmit; /* size of the tx buffer in the card driver */
-+	int bytes2transmit;
-+	int eofrx;
-+	int eoftx;
-+#endif
- 	spinlock_t lock;
- 	char name[40];
- 	/* Specified by DAHDI */
-@@ -723,6 +730,9 @@
- 	DAHDI_FLAGBIT_TXUNDERRUN = 22,	/*!< Transmit underrun condition */
- 	DAHDI_FLAGBIT_RXOVERRUN = 23,	/*!< Receive overrun condition */
- 	DAHDI_FLAGBIT_DEVFILE	= 25,	/*!< Channel has a sysfs dev file */
-+#if defined(CONFIG_DAHDI_BRI_DCHANS)
-+	DAHDI_FLAGBIT_BRIDCHAN   = 26,	/*!< hardhdlc-like handling of the D channel */
-+#endif
- };
- 
- #ifdef CONFIG_DAHDI_NET
-@@ -789,6 +799,7 @@
- #define DAHDI_FLAG_BUFEVENTS	DAHDI_FLAG(BUFEVENTS)
- #define DAHDI_FLAG_TXUNDERRUN	DAHDI_FLAG(TXUNDERRUN)
- #define DAHDI_FLAG_RXOVERRUN	DAHDI_FLAG(RXOVERRUN)
-+#define DAHDI_FLAG_BRIDCHAN	DAHDI_FLAG(BRIDCHAN)
- 
- struct file;
- 
-Index: dahdi-linux-2.5.0/include/dahdi/dahdi_config.h
-===================================================================
---- dahdi-linux-2.5.0.orig/include/dahdi/dahdi_config.h	2011-01-05 17:52:03.000000000 +0200
-+++ dahdi-linux-2.5.0/include/dahdi/dahdi_config.h	2011-08-15 14:13:01.000000000 +0300
-@@ -195,4 +195,10 @@
-  */
- /* #define CONFIG_DAHDI_MIRROR */
- 
-+/*
-+ * Uncomment the following for BRI D channels
-+ *
-+ */
-+#define CONFIG_DAHDI_BRI_DCHANS
-+
- #endif
-Index: dahdi-linux-2.5.0/drivers/dahdi/dahdi-base.c
-===================================================================
---- dahdi-linux-2.5.0.orig/drivers/dahdi/dahdi-base.c	2011-07-21 19:26:31.000000000 +0300
-+++ dahdi-linux-2.5.0/drivers/dahdi/dahdi-base.c	2011-08-15 14:13:01.000000000 +0300
-@@ -7224,11 +7224,40 @@
- 					*(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
- 				}
- 				bytes -= left;
-+#ifdef CONFIG_DAHDI_BRI_DCHANS
-+			} else if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
-+			    /*
-+			     * Let's get this right, we want to transmit complete frames only.
-+			     * The card driver will do the dirty HDLC work for us.
-+			     * txb (transmit buffer) is supposed to be big enough to store one frame
-+			     * we will make this as big as the D fifo (1KB or 2KB)
-+			     */
-+
-+			    /* there are 'left' bytes in the user buffer left to transmit */
-+			    left = ms->writen[ms->outwritebuf] - ms->writeidx[ms->outwritebuf] - 2;
-+			    if (left > ms->maxbytes2transmit) {
-+				memcpy(txb, buf + ms->writeidx[ms->outwritebuf], ms->maxbytes2transmit);
-+				ms->writeidx[ms->outwritebuf] += ms->maxbytes2transmit;
-+				txb += ms->maxbytes2transmit;
-+				ms->bytes2transmit = ms->maxbytes2transmit;
-+				ms->eoftx = 0;
-+			    } else {
-+				memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
-+				ms->writeidx[ms->outwritebuf] += left + 2;
-+				txb += left + 2;
-+				ms->bytes2transmit = left;
-+				ms->eoftx = 1;
-+			    }
-+			    bytes = 0;
-+#endif
- 			} else {
- 				memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
- 				ms->writeidx[ms->outwritebuf]+=left;
- 				txb += left;
- 				bytes -= left;
-+#if defined(CONFIG_DAHDI_BRI_DCHANS)	
-+				ms->bytes2transmit=DAHDI_CHUNKSIZE;
-+#endif
- 			}
- 			/* Check buffer status */
- 			if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) {
-@@ -7285,6 +7314,17 @@
- 				/* Transmit a flag if this is an HDLC channel */
- 				if (ms->flags & DAHDI_FLAG_HDLC)
- 					fasthdlc_tx_frame_nocheck(&ms->txhdlc);
-+#if defined(CONFIG_DAHDI_BRI_DCHANS)	
-+				if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
-+			//	    if (ms->bytes2transmit > 0) {
-+					// txb += 2;
-+					// ms->bytes2transmit -= 2;
-+					bytes=0;
-+					ms->eoftx = 1;
-+//					printk(KERN_CRIT "zaptel EOF(%d) bytes2transmit %d\n",ms->eoftx,ms->bytes2transmit);
-+			//	    }
-+				}
-+#endif
- #ifdef CONFIG_DAHDI_NET
- 				if (dahdi_have_netdev(ms))
- 					netif_wake_queue(chan_to_netdev(ms));
-@@ -7346,6 +7386,12 @@
- 			}
- 			needtxunderrun += bytes;
- 			bytes = 0;
-+#if defined(CONFIG_DAHDI_BRI_DCHANS)	
-+		} else if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
-+		    ms->bytes2transmit = 0;
-+		    ms->eoftx = 0;
-+		    bytes = 0;
-+#endif
- 		} else {
- 			memset(txb, DAHDI_LIN2X(0, ms), bytes);	/* Lastly we use silence on telephony channels */
- 			needtxunderrun += bytes;
-@@ -8267,6 +8313,14 @@
- 	int res;
- 	int left, x;
- 
-+#if defined(CONFIG_DAHDI_BRI_DCHANS)	
-+	if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
-+	    bytes = ms->bytes2receive;
-+	    if (bytes < 1) return;
-+//	    printk(KERN_CRIT "bytes2receive %d\n",ms->bytes2receive);
-+	}
-+#endif
-+
- 	while(bytes) {
- #if defined(CONFIG_DAHDI_NET)  || defined(CONFIG_DAHDI_PPP)
- 		skb = NULL;
-@@ -8324,6 +8378,19 @@
- 						}
- 					}
- 				}
-+#ifdef CONFIG_DAHDI_BRI_DCHANS
-+			} else if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
-+			    memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-+			    rxb += left;
-+			    ms->readidx[ms->inreadbuf] += left;
-+			    bytes -= left;
-+			    if (ms->eofrx == 1) {
-+				eof=1;
-+			    }
-+//			    printk(KERN_CRIT "receiving %d bytes\n",ms->bytes2receive);
-+			    ms->bytes2receive = 0;
-+			    ms->eofrx = 0;
-+#endif
- 			} else {
- 				/* Not HDLC */
- 				memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
diff --git a/main/dahdi-linux-lts/dahdi-depmod.patch b/main/dahdi-linux-lts/dahdi-depmod.patch
deleted file mode 100644
index 289aad403b3..00000000000
--- a/main/dahdi-linux-lts/dahdi-depmod.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: dahdi-linux-2.0.0-rc4/Makefile
-===================================================================
---- dahdi-linux-2.0.0-rc4.orig/Makefile	2008-09-09 14:07:23.000000000 +0300
-+++ dahdi-linux-2.0.0-rc4/Makefile	2008-09-09 14:12:31.000000000 +0300
-@@ -190,7 +190,7 @@
- 	build_tools/uninstall-modules dahdi $(KVERS)
- endif
- 	$(KMAKE) INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=dahdi modules_install
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
-+	[ -z "$(DESTDIR)" -a `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- 
- uninstall-modules:
- ifdef DESTDIR
-@@ -203,7 +203,7 @@
- 		rm -rf /lib/modules/$(KVERS)/dahdi; \
- 		echo "done."; \
- 	fi
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
-+	[ -z "$(DESTDIR)" -a `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- endif
- 
- update:
diff --git a/main/dahdi-linux-lts/kernel-compat-5.0.patch b/main/dahdi-linux-lts/kernel-compat-5.0.patch
deleted file mode 100644
index 3729db3c0cd..00000000000
--- a/main/dahdi-linux-lts/kernel-compat-5.0.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/include/dahdi/kernel.h
-+++ b/include/dahdi/kernel.h
-@@ -1695,4 +1695,15 @@
- 
- #endif /* DAHDI_PRINK_MACROS_USE_debug */
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
-+static inline void do_gettimeofday(struct timeval *tv)
-+{
-+	struct timespec64 now;
-+
-+	ktime_get_real_ts64(&now);
-+	tv->tv_sec = now.tv_sec;
-+	tv->tv_usec = now.tv_nsec/1000;
-+}
-+#endif
-+
- #endif /* _DAHDI_KERNEL_H */
-
diff --git a/main/dahdi-linux-lts/kernel-compat-5.4.patch b/main/dahdi-linux-lts/kernel-compat-5.4.patch
deleted file mode 100644
index 0e835eddab6..00000000000
--- a/main/dahdi-linux-lts/kernel-compat-5.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/dahdi/kernel.h
-+++ b/include/dahdi/kernel.h.new
-@@ -59,7 +59,7 @@
- #include <linux/poll.h>
- 
- #ifdef CONFIG_PCI
--#include <linux/pci-aspm.h>
-+#include <linux/pci.h>
- #endif
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
diff --git a/main/dahdi-linux/APKBUILD b/main/dahdi-linux/APKBUILD
deleted file mode 100644
index b6dcefd37d4..00000000000
--- a/main/dahdi-linux/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor: Timo Teras <timo.teras@iki.fi>
-# Maintainer: Timo Teras <timo.teras@iki.fi>
-pkgname=dahdi-linux
-pkgver=3.1.0
-pkgrel=0
-pkgdesc="Firmware for Digium Asterisk Hardware Device Interface drivers"
-url="https://www.asterisk.org"
-arch="noarch"
-license="GPL-2.0-only"
-makedepends="wget tar"
-subpackages="$pkgname-dev"
-source="https://downloads.digium.com/pub/telephony/dahdi-linux/releases/dahdi-linux-$pkgver.tar.gz"
-
-# We online install the firmwares in this package since those are common for all
-# kernel flavors. We also install the headers for the -dev package.
-#
-# The kernel drivers themselves are built from separate build recipe.
-
-package() {
-	make -j1 DESTDIR="$pkgdir" HOTPLUG_FIRMWARE=yes \
-		install-include install-firmware
-}
-
-sha512sums="440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4  dahdi-linux-3.1.0.tar.gz"
diff --git a/main/dahdi-tools/APKBUILD b/main/dahdi-tools/APKBUILD
deleted file mode 100644
index 06460c990a4..00000000000
--- a/main/dahdi-tools/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Contributor: Timo Teras <timo.teras@iki.fi>
-# Maintainer: Timo Teras <timo.teras@iki.fi>
-pkgname=dahdi-tools
-pkgver=3.1.0
-pkgrel=1
-pkgdesc="Digium Asterisk Hardware Device Interface management utilities"
-url="https://www.asterisk.org"
-arch="all"
-license="GPL-2.0-or-later"
-depends_dev="bsd-compat-headers linux-headers dahdi-linux-dev newt-dev"
-makedepends="perl file autoconf automake libtool $depends_dev"
-subpackages="$pkgname-doc $pkgname-dev"
-source="http://downloads.digium.com/pub/telephony/dahdi-tools/releases/dahdi-tools-$pkgver.tar.gz
-	fix-musl.patch
-	$pkgname.initd
-	"
-
-prepare() {
-	default_prepare
-	autoreconf -fi
-}
-
-
-build() {
-	eval local $(perl -V:vendorlib)
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/infoa \
-		--with-perllib="$vendorlib"
-	sed -i -e 's/$(CC) $(LDFLAGS) -o $@ $^/$(CC) $^ $(LDFLAGS) -o $@/' \
-		Makefile
-	make
-}
-
-package() {
-	make -j1 DESTDIR="$pkgdir" install
-	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/dahdi
-	rm -rf "$pkgdir"/usr/lib/dracut # We use mkinitfs, not dracut
-}
-
-sha512sums="e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694  dahdi-tools-3.1.0.tar.gz
-45955caf04368ff30d60db0b3e892d940c9ac0422b337186ed251108ce25ab305d4590efff452f53f160a53fcd26a273f21d6d093307b426a3a2a6df53584daa  fix-musl.patch
-3850ab9e323ec31d676d311c97d0cde70b809379b6c01c8ff6d5a01a860eb43bf3f18f2de53e952365d17f40638c7cb0481682d96cea5b7fdb1423d3e762e2f3  dahdi-tools.initd"
diff --git a/main/dahdi-tools/dahdi-tools.initd b/main/dahdi-tools/dahdi-tools.initd
deleted file mode 100644
index 42092c7375b..00000000000
--- a/main/dahdi-tools/dahdi-tools.initd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-
-conf=/etc/dahdi/system.conf
-
-depend() {
-	before asterisk
-	after hwdrivers modules
-	keyword novserver
-}
-
-start() {
-	ebegin "Starting dahdi"
-	/usr/sbin/dahdi_cfg
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping dahdi"
-	/usr/sbin/dahdi_cfg -s
-	eend $?
-}
diff --git a/main/dahdi-tools/fix-musl.patch b/main/dahdi-tools/fix-musl.patch
deleted file mode 100644
index 01a0a302bf1..00000000000
--- a/main/dahdi-tools/fix-musl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ru dahdi-tools-2.11.1.orig/xpp/hexfile.h dahdi-tools-2.11.1/xpp/hexfile.h
---- dahdi-tools-2.11.1.orig/xpp/hexfile.h	2016-03-02 00:04:19.000000000 +0200
-+++ dahdi-tools-2.11.1/xpp/hexfile.h	2017-05-29 09:30:50.034438806 +0300
-@@ -26,6 +26,7 @@
- #include <stdarg.h>
- #include <stdio.h>
- #include <stdint.h>
-+#include <sys/cdefs.h>
- #include <sys/param.h>
- #include <syslog.h>
- #define	PACKED	__attribute__((packed))
-diff -ru dahdi-tools-2.11.1.orig/xpp/xtalk/debug.c dahdi-tools-2.11.1/xpp/xtalk/debug.c
---- dahdi-tools-2.11.1.orig/xpp/xtalk/debug.c	2016-03-02 00:04:19.000000000 +0200
-+++ dahdi-tools-2.11.1/xpp/xtalk/debug.c	2017-05-29 09:30:02.193881232 +0300
-@@ -26,7 +26,6 @@
- #include <stdlib.h>
- #include <stdarg.h>
- #include <syslog.h>
--#include <execinfo.h>
- #include <xtalk/debug.h>
- #include <autoconfig.h>
- 
-@@ -61,6 +60,7 @@
- /* from glibc info(1) */
- void print_backtrace(FILE *fp)
- {
-+#if 0
- 	void	*array[10];
- 	size_t	size;
- 	char	**strings;
-@@ -71,4 +71,5 @@
- 	for (i = 0; i < size; i++)
- 		fprintf(fp, "%s\n", strings[i]);
- 	free(strings);
-+#endif
- }
diff --git a/main/dansguardian/APKBUILD b/main/dansguardian/APKBUILD
index 4613196c5e2..ddba765699a 100644
--- a/main/dansguardian/APKBUILD
+++ b/main/dansguardian/APKBUILD
@@ -2,15 +2,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dansguardian
 pkgver=2.12.0.3
-pkgrel=4
+pkgrel=8
 pkgdesc="Web content filter"
 url="http://dansguardian.org"
 arch="all"
-license="GPL"
+license="GPL-2.0-only"
 depends="logrotate"
 makedepends="zlib-dev pcre-dev"
 install="$pkgname.pre-install"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
 pkgusers="dansguar"
 pkggroups="dansguar"
 source="https://downloads.sourceforge.net/project/dansguardian/dansguardian-$pkgver.tar.bz2
@@ -19,28 +19,24 @@ source="https://downloads.sourceforge.net/project/dansguardian/dansguardian-$pkg
 	ftp-credential.patch
 	dansguardian-2.10.1.1-pcre830.patch
 	fix-includes.patch
+	cstring.patch
 	"
+options="!check"
 
-_builddir="$srcdir"/dansguardian-$pkgver
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
+	update_config_sub
+
 	# do not block "microsoft...clustimg=..." and similar
-	sed -i -e 's:\.\*:.{1,10}:g' configs/lists/bannedregexpurllist \
-		|| return 1
+	sed -i -e 's:\.\*:.{1,10}:g' configs/lists/bannedregexpurllist
 
 	# bind to 127.0.0.1 by default
 	sed -i -e 's:^filterip =.*:filterip = 127.0.0.1:' \
-		configs/dansguardian.conf.in || return 1
+		configs/dansguardian.conf.in
 }
 
 build() {
-	cd "$_builddir"
+	CXXFLAGS="$CXXFLAGS -std=gnu++11" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -52,24 +48,25 @@ build() {
 		--with-proxygroup=dansguar \
 		--with-logdir=/var/log/dansguardian \
 		--with-piddir=/var/run/ \
-		--enable-ntlm \
-		|| return 1
-	make || return 1
+		--enable-ntlm
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	install -D -m 755 "$srcdir"/dansguardian.initd \
-		"$pkgdir"/etc/init.d/dansguardian || return 1
-	install -D -m 644 "$srcdir"/dansguardian.logrotate \
-		"$pkgdir"/etc/logrotate.d/dansguardian || return 1
+	make DESTDIR="$pkgdir" install
+	install -Dm755 "$srcdir"/dansguardian.initd \
+		"$pkgdir"/etc/init.d/dansguardian
+	install -Dm644 "$srcdir"/dansguardian.logrotate \
+		"$pkgdir"/etc/logrotate.d/dansguardian
 	install -d -o dansguar -g dansguar "$pkgdir"/var/log/dansguardian
 }
 
-sha512sums="37155ef4f1a6dd6bdd87f79c7199b77de49746e4bff0631c239a569c21bf26240cbc9eae5a2436653bfc3d170a664710af9d80c4cfac3082a0620caeaac6740b  dansguardian-2.12.0.3.tar.bz2
+sha512sums="
+37155ef4f1a6dd6bdd87f79c7199b77de49746e4bff0631c239a569c21bf26240cbc9eae5a2436653bfc3d170a664710af9d80c4cfac3082a0620caeaac6740b  dansguardian-2.12.0.3.tar.bz2
 b4e7d052171ae2ff85aebcdba093f4abb244df5046bb8787b3f2f6771ced506be4038fb12d35bb8db64b9248a4148f437a519b01f99cf8cde7144dec0038db00  dansguardian.initd
 cc23178755365a3cceff08d9eb5c26dd440648b22af15377a30d2032f71cf0bd8ed3ab59c8a671f2cc3f4cdcaebff5d6c9e412f2271b00ac6ce1be5178a32087  dansguardian.logrotate
 07b62441363534f39a1400389c702bbd5a53317526a18b3fc929f00bd854706c56b891d7fecb4151e200448f8ba012729e712e9cfdbbd683a3d2634fdc095bd1  ftp-credential.patch
 d3d9af038ff5a91d1f9dc6cf4175b0da2a791386ca624f4a639338ed189a274eba720e9771986e7ded517e2623185e8b61ef3689414197c47a6ae3220be99d57  dansguardian-2.10.1.1-pcre830.patch
-2eb17ef01a0b7d626f50197e0ddd160ae4ed17a813af00ceb9f6c54610d84b03b5c819bc2d8799f683e68dc16a65cbac5a8e36f0c43737d8ea82c7354e852d78  fix-includes.patch"
+2eb17ef01a0b7d626f50197e0ddd160ae4ed17a813af00ceb9f6c54610d84b03b5c819bc2d8799f683e68dc16a65cbac5a8e36f0c43737d8ea82c7354e852d78  fix-includes.patch
+77257cd290bfa91a6af7aaf6e58a4280e75a1a7ea5dc7e89fd418cd7509263533e4133f447f02f77410da1533502c9011921288d05b5d4cf33aac1e66467eaa6  cstring.patch
+"
diff --git a/main/dansguardian/cstring.patch b/main/dansguardian/cstring.patch
new file mode 100644
index 00000000000..53c48fcd700
--- /dev/null
+++ b/main/dansguardian/cstring.patch
@@ -0,0 +1,12 @@
+diff --git a/src/UDSocket.cpp b/src/UDSocket.cpp
+index 3d33ff6..db4de8c 100644
+--- a/src/UDSocket.cpp
++++ b/src/UDSocket.cpp
+@@ -13,6 +13,7 @@
+ #include "UDSocket.hpp"
+ 
+ #include <syslog.h>
++#include <cstring>
+ #include <csignal>
+ #include <fcntl.h>
+ #include <sys/time.h>
diff --git a/main/daq/APKBUILD b/main/daq/APKBUILD
index 73108a86381..90c6e3bcccd 100644
--- a/main/daq/APKBUILD
+++ b/main/daq/APKBUILD
@@ -1,21 +1,37 @@
 # Contributor: Karim Kanso <kaz.kanso@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=daq
-pkgver=2.0.6
-pkgrel=4
+pkgver=3.0.14
+pkgrel=0
 pkgdesc="Data Acquisition library - packet I/O library"
 url="https://www.snort.org/"
 arch="all"
 license="GPL-2.0-only"
-makedepends="libpcap-dev flex bison linux-headers libnetfilter_queue-dev
-	libnfnetlink-dev libdnet-dev"
-subpackages="$pkgname-static $pkgname-sfbpf $pkgname-dev"
-source="https://www.snort.org/downloads/snort/daq-$pkgver.tar.gz
-	fix-includes.patch
+makedepends="
+	autoconf
+	automake
+	bison
+	flex
+	libdnet-dev
+	libmnl-dev
+	libnetfilter_queue-dev
+	libnfnetlink-dev
+	libpcap-dev
+	libtool
+	linux-headers
 	"
+checkdepends="cmocka-dev"
+subpackages="$pkgname-static $pkgname-dev"
+source="https://www.snort.org/downloads/snortplus/libdaq-$pkgver.tar.gz"
+builddir="$srcdir/libdaq-$pkgver"
+options="!check" # requires a wrap for some glibc __functions
+
+prepare() {
+	default_prepare
+	./bootstrap
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,26 +40,19 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var
-	# work around parallel build issue
-	make -C sfbpf tokdefs.h
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	cd "$pkgdir"
+	rm -v usr/bin/daqtest*
 }
 
-sfbpf() {
-	pkgdesc="snort's berkley packet filter shared lib"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libsfbpf.so* "$subpkgdir"/usr/lib/
-}
-
-sha512sums="61dd5408c587e57999445b9549ac539ffc5bb16ddc179601de1065fc5e251c1893536d8aa2251096e34b54093529d3578e7b5d97e3514cb2bbf4de113639b08c  daq-2.0.6.tar.gz
-ea769608e4b6ebfd186a5e637a1dbf16f300c5c40501655b891fdc0095879f65927d90872d4953a4a4e32ccc40306b19a1a1e7ae4dd8b3f7572db97aea48390e  fix-includes.patch"
+sha512sums="
+3c50efbc96ff5865a7b57799b65d4be70f6dbd29e0d12fc7b46d9c523eefb9b968a4a8294dc2ec424c93d5265c97d1266ca0942ac3684cdf1f06a742c2c3b404  libdaq-3.0.14.tar.gz
+"
diff --git a/main/daq/fix-includes.patch b/main/daq/fix-includes.patch
deleted file mode 100644
index 924f49c533b..00000000000
--- a/main/daq/fix-includes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- daq-2.0.1.orig/os-daq-modules/daq_ipfw.c
-+++ daq-2.0.1/os-daq-modules/daq_ipfw.c
-@@ -26,7 +26,7 @@
- 
- #include <sys/types.h>
- #include <sys/time.h>
--#include <sys/unistd.h>
-+#include <unistd.h>
- 
- #include <netinet/in.h>
- #include <sys/socket.h>
---- daq-2.0.1.orig/os-daq-modules/daq_ipq.c
-+++ daq-2.0.1/os-daq-modules/daq_ipq.c
-@@ -27,7 +27,7 @@
- 
- #include <sys/types.h>
- #include <sys/time.h>
--#include <sys/unistd.h>
-+#include <unistd.h>
- 
- #include <netinet/ip.h>
- 
---- daq-2.0.1.orig/os-daq-modules/daq_nfq.c
-+++ daq-2.0.1/os-daq-modules/daq_nfq.c
-@@ -27,7 +27,7 @@
- 
- #include <sys/types.h>
- #include <sys/time.h>
--#include <sys/unistd.h>
-+#include <unistd.h>
- 
- #include <netinet/ip.h>
- 
diff --git a/main/darkhttpd/0001-Add-svg-support-to-default-mimetypes.patch b/main/darkhttpd/0001-Add-svg-support-to-default-mimetypes.patch
deleted file mode 100644
index b81c7e42479..00000000000
--- a/main/darkhttpd/0001-Add-svg-support-to-default-mimetypes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c5412405c3a697d4bb8ecae96442a9d1c050983a Mon Sep 17 00:00:00 2001
-From: Carlo Landmeter <clandmeter@alpinelinux.org>
-Date: Mon, 14 May 2018 09:01:32 +0000
-Subject: [PATCH] Add svg support to default mimetypes
-
----
- darkhttpd.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/darkhttpd.c b/darkhttpd.c
-index 1c5eff5..6b81bf8 100644
---- a/darkhttpd.c
-+++ b/darkhttpd.c
-@@ -317,6 +317,7 @@ static const char *default_extension_map[] = {
-     "image/gif"            " gif",
-     "image/jpeg"           " jpeg jpe jpg",
-     "image/png"            " png",
-+    "image/svg+xml"        " svg svgz",
-     "text/css"             " css",
-     "text/html"            " html htm",
-     "text/javascript"      " js",
--- 
-2.17.0
-
diff --git a/main/darkhttpd/APKBUILD b/main/darkhttpd/APKBUILD
index 7c5269e5207..6194d9e1658 100644
--- a/main/darkhttpd/APKBUILD
+++ b/main/darkhttpd/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Alan Lacerda <alacerda@alpinelinux.org>
 # Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
 pkgname=darkhttpd
-pkgver=1.12
-pkgrel=4
+pkgver=1.16
+pkgrel=0
 pkgdesc="A simple, single-threaded, static content webserver"
 url="https://unix4lyfe.org/darkhttpd/"
 arch="all"
@@ -10,26 +10,35 @@ license="ISC"
 options="!check" # no tests
 install="$pkgname.pre-install"
 subpackages="$pkgname-openrc"
-source="https://unix4lyfe.org/darkhttpd/darkhttpd-$pkgver.tar.bz2
+source="darkhttpd-$pkgver.tar.gz::https://github.com/emikulic/darkhttpd/archive/v$pkgver.tar.gz
 	darkhttpd.logrotate
 	darkhttpd.initd
-
-	0001-Add-svg-support-to-default-mimetypes.patch
+	darkhttpd.confd
 	"
 
+# secfixes:
+#   1.15-r0:
+#     - CVE-2024-23771
+#     - CVE-2024-23770
+#   1.14-r0:
+#     - CVE-2020-25691
+
 build() {
 	make
 }
 
 package() {
-	install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
+	install -Dm755 darkhttpd "$pkgdir"/usr/bin/darkhttpd
 	install -d "$pkgdir"/var/www/localhost/htdocs \
 		"$pkgdir"/var/log/darkhttpd
 
-	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	install -Dm755 "$srcdir"/darkhttpd.initd "$pkgdir"/etc/init.d/darkhttpd
+	install -Dm644 "$srcdir"/darkhttpd.confd "$pkgdir"/etc/conf.d/darkhttpd
 }
 
-sha512sums="e977ba0401b24a122733f8d5084fcdea4a3e2664dd5c127b26b822bfdbe458124104b1d5c673a8689af988b5713ce2e902945238b815b82104f286f577eea8bd  darkhttpd-1.12.tar.bz2
+sha512sums="
+05abf8144d5a14ff455e2878eed4fddaca54d3fa6576b6a01d6547bcca94a0222d02742b80532519aba5202dd7df2d816e1dd057816506005894b42f570a4fe3  darkhttpd-1.16.tar.gz
 bb95277a9f8f227aeec8bfe6ef54f52a2f034ed0dd25258b996c17f9ce9dd4ad220366b10490246b25bb6b18ccde7bda0d52eeb88667941cf2fdab15c940dbbc  darkhttpd.logrotate
-4f7a720f05642b26bc2e2254098033e943856986a7da4a607fe8633fcf9d9c763c3e35de98ceb16fe8d88c2e288a54d62a1bd643009a119a77f4d48b95254ebb  darkhttpd.initd
-71a35551e2e34e8ced60e2c836c7d22f9b543b79fda2e273b41eaed7aefc22895d9c0b2e6f86dc7d0f916ed244b9ea42e2236f796eab07e7e0ba83faa4ba5762  0001-Add-svg-support-to-default-mimetypes.patch"
+dd792892588e03cef4a36bb8e81297990884298d8a2bc1c14ae2d8986a0a17af8d15bf3fb4e1830d22b154dc00591d884e20da915f51fd8ecf3b05b6c92dc7d4  darkhttpd.initd
+79ecdbc751e8b5497a1afee294cf0addb4261f041a58a382e7fb51dd698dd99625a369173542c905e1e4eac7c68dfa1d8d778f4777ebe74d5031817a6ec437ad  darkhttpd.confd
+"
diff --git a/main/darkhttpd/darkhttpd.confd b/main/darkhttpd/darkhttpd.confd
new file mode 100644
index 00000000000..1c947b5326c
--- /dev/null
+++ b/main/darkhttpd/darkhttpd.confd
@@ -0,0 +1,12 @@
+# darkhttpd web server config
+#
+# document_root="/var/www/localhost/htdocs"
+logdir="/var/log/$SVCNAME"
+# addr=127.0.0.1
+# port=8080
+run_as_user=darkhttpd
+run_as_group=www-data
+run_in_chroot=yes
+
+# extra arguments
+# darkhttpd_args=""
diff --git a/main/darkhttpd/darkhttpd.initd b/main/darkhttpd/darkhttpd.initd
index 93154234d85..2b3e099e07a 100644
--- a/main/darkhttpd/darkhttpd.initd
+++ b/main/darkhttpd/darkhttpd.initd
@@ -6,7 +6,7 @@ name="darkhttpd web server"
 description="Simple, single-threaded, static content webserver"
 
 command="/usr/bin/darkhttpd"
-command_args="${document_root:-/var/www/localhost/htdocs} --chroot --uid darkhttpd --gid www-data $darkhttpd_args"
+command_args="${document_root:-/var/www/localhost/htdocs} ${darkhttpd_args}"
 
 optional_arg() {
 	if [ -n "$2" ]; then
@@ -15,10 +15,17 @@ optional_arg() {
 }
 
 start_pre() {
-	checkpath --directory --owner darkhttpd "${logdir:-/var/log/$SVCNAME}"
-	optional_arg --log "${logdir:-/var/log/$SVCNAME}"/access.log
+	if [ -n "$logdir" ]; then
+		checkpath --directory --owner darkhttpd "${logdir}"
+		command_args="$command_args --log ${logdir}/access.log"
+	fi
 	optional_arg --addr "$addr"
 	optional_arg --port "$port"
+	optional_arg --uid "$run_as_user"
+	optional_arg --gid "$run_as_group"
 	optional_arg --mimetypes "$mimetypes"
+	if yesno "${run_in_chroot:-no}"; then
+		command_args="${command_args} --chroot"
+	fi
 }
 
diff --git a/main/dash/APKBUILD b/main/dash/APKBUILD
new file mode 100644
index 00000000000..dfeec0d8e45
--- /dev/null
+++ b/main/dash/APKBUILD
@@ -0,0 +1,45 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=dash
+pkgver=0.5.12
+pkgrel=2
+pkgdesc="Small and fast POSIX-compliant shell"
+url="http://gondor.apana.org.au/~herbert/dash/"
+arch="all"
+license="BSD-3-Clause AND GPL-2.0-or-later"
+# needs 'nl' utility from coreutils
+makedepends="coreutils"
+install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
+subpackages="$pkgname-doc $pkgname-binsh"
+source="http://gondor.apana.org.au/~herbert/dash/files/dash-$pkgver.tar.gz"
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	./src/dash -c 'echo ok'
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+binsh() {
+	pkgdesc="dash as /bin/sh"
+	provides="/bin/sh"
+	provider_priority=60  # lower (other provider is busybox-binsh, yash-binsh)
+
+	mkdir -p "$subpkgdir"/bin
+	ln -s /usr/bin/dash "$subpkgdir"/bin/sh
+}
+
+sha512sums="
+13bd262be0089260cbd13530a9cf34690c0abeb2f1920eb5e61be7951b716f9f335b86279d425dbfae56cbd49231a8fdffdff70601a5177da3d543be6fc5eb17  dash-0.5.12.tar.gz
+"
diff --git a/main/dash/dash.post-install b/main/dash/dash.post-install
new file mode 100644
index 00000000000..0619dc848b8
--- /dev/null
+++ b/main/dash/dash.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+add-shell '/usr/bin/dash'
+exit 0
diff --git a/main/dash/dash.post-upgrade b/main/dash/dash.post-upgrade
new file mode 120000
index 00000000000..3514e3b3c14
--- /dev/null
+++ b/main/dash/dash.post-upgrade
@@ -0,0 +1 @@
+dash.post-install
\ No newline at end of file
diff --git a/main/dash/dash.pre-deinstall b/main/dash/dash.pre-deinstall
new file mode 100644
index 00000000000..8a92b75a411
--- /dev/null
+++ b/main/dash/dash.pre-deinstall
@@ -0,0 +1,3 @@
+#!/bin/sh
+remove-shell '/usr/bin/dash'
+exit 0
diff --git a/main/datefudge/APKBUILD b/main/datefudge/APKBUILD
index 3db36e62a47..c137da45e23 100644
--- a/main/datefudge/APKBUILD
+++ b/main/datefudge/APKBUILD
@@ -1,18 +1,16 @@
 # Contributor: Simon Frankenberger <simon-alpine@fraho.eu>
 # Maintainer: Simon Frankenberger <simon-alpine@fraho.eu>
 pkgname=datefudge
-pkgver=1.23
-pkgrel=0
+pkgver=1.24
+pkgrel=3
 pkgdesc="Tool to fake the system date"
 url="https://packages.debian.org/sid/datefudge"
 arch="all"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
 depends="coreutils"
 checkdepends="perl"
 subpackages="$pkgname-doc"
-source="http://deb.debian.org/debian/pool/main/d/datefudge/datefudge_$pkgver.tar.xz
-	musl.patch
-	"
+source="https://deb.debian.org/debian/pool/main/d/datefudge/datefudge_$pkgver.tar.xz"
 
 build() {
 	# fix Makefile, set the version number directly as dpkg-parsechangelog is not available
@@ -29,5 +27,4 @@ package() {
 		-C "$builddir" install
 }
 
-sha512sums="9b5d5f531b3f1a5ece96fbc421726c0b7edad5709ab46cb2deb201f9f6eeed2e33b7590e221e33473edb6dbdaaf46cbef0bd4be4fbd592e8efec18a343503f71  datefudge_1.23.tar.xz
-e8b004957276f1162f9d686f03593cdd64455a35764e34aeac72d419b6ac071fb044405c73999283fcb9abff312225f81039553801cfaa1165bbbfc80705d44b  musl.patch"
+sha512sums="cd548a7e8ff10189e101fa339b2845cdd19a59354e43b02cf47e466855ec192dc2084951f7663a94da56a580dd24524047651d8bcb41aa478fe94b24dffaedeb  datefudge_1.24.tar.xz"
diff --git a/main/datefudge/musl.patch b/main/datefudge/musl.patch
deleted file mode 100644
index 95b8d07540a..00000000000
--- a/main/datefudge/musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- old/datefudge.c
-+++ new/datefudge.c
-@@ -78,7 +78,7 @@
-     return 0;
- }
- 
--int gettimeofday(struct timeval *x, struct timezone *y) {
-+int gettimeofday(struct timeval *__restrict x, void *__restrict y) {
-     return __gettimeofday(x,y);
- }
- 
diff --git a/main/dav1d/APKBUILD b/main/dav1d/APKBUILD
new file mode 100644
index 00000000000..96b90c86903
--- /dev/null
+++ b/main/dav1d/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=dav1d
+pkgver=1.4.1
+pkgrel=0
+pkgdesc="small and fast AV1 Decoder"
+url="https://code.videolan.org/videolan/dav1d"
+arch="all"
+license="BSD-2-Clause"
+makedepends="nasm meson"
+subpackages="$pkgname-dev lib$pkgname:libs"
+source="https://code.videolan.org/videolan/dav1d/-/archive/$pkgver/dav1d-$pkgver.tar.bz2
+	fix-rv64.patch"
+
+build() {
+	case "$CARCH" in
+		armhf*) meson_opts="-Denable_asm=false" ;;
+		*) meson_opts="-Denable_asm=true" ;;
+	esac
+
+	CFLAGS="$CFLAGS -O2" \
+	CXXFLAGS="$CXXFLAGS -O2" \
+	abuild-meson \
+		-Db_lto=true \
+		-Denable_tests=true \
+		-Denable_tools=true \
+		-Dfuzzing_engine=none \
+		-Dtestdata_tests=false \
+		$meson_opts \
+		build
+	meson compile -C build
+}
+
+check() {
+	meson test --no-rebuild --print-errorlogs -C build
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C build
+}
+
+sha512sums="
+b2dcdeeb3d6c37788b4c697b497b9282738b758927ffbdbe72b05b1b26a61aa967dfba0ce05828b5bd5bcac93eb3394b0eafbb57e325d037867cf720d64ba099  dav1d-1.4.1.tar.bz2
+1677b906a37d05d7ec692ce484b85ce2fca62f1ca4062d2dbed863748d2e453bc45fbb31a0327e6c920ccfe4b22e7204b0b12e8ee82a9e2c5c670e2c4433f22d  fix-rv64.patch
+"
diff --git a/main/dav1d/fix-rv64.patch b/main/dav1d/fix-rv64.patch
new file mode 100644
index 00000000000..034e8ceb4ae
--- /dev/null
+++ b/main/dav1d/fix-rv64.patch
@@ -0,0 +1,91 @@
+Patch-Source: https://code.videolan.org/videolan/dav1d/-/merge_requests/1629
+From 6c51565174f08baf7441e22ea9f84a25c716c5da Mon Sep 17 00:00:00 2001
+From: "Nathan E. Egge" <unlord@xiph.org>
+Date: Sat, 16 Mar 2024 10:12:09 -0400
+Subject: [PATCH] riscv: Check for standards compliant RVV 1.0+
+
+---
+ src/meson.build |  1 +
+ src/riscv/cpu.S | 38 ++++++++++++++++++++++++++++++++++++++
+ src/riscv/cpu.c |  4 +++-
+ 3 files changed, 42 insertions(+), 1 deletion(-)
+ create mode 100644 src/riscv/cpu.S
+
+diff --git a/src/meson.build b/src/meson.build
+index dc4be5fd..f3d7bcaf 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -256,6 +256,7 @@ if is_asm_enabled
+     elif host_machine.cpu_family().startswith('riscv')
+         libdav1d_sources += files(
+             'riscv/cpu.c',
++            'riscv/cpu.S',
+         )
+         if host_machine.cpu_family() == 'riscv64'
+             libdav1d_sources += files(
+diff --git a/src/riscv/cpu.S b/src/riscv/cpu.S
+new file mode 100644
+index 00000000..ca103a9a
+--- /dev/null
++++ b/src/riscv/cpu.S
+@@ -0,0 +1,38 @@
++/******************************************************************************
++ * Copyright © 2018, VideoLAN and dav1d authors
++ * Copyright © 2024, Nathan Egge
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright notice, this
++ *    list of conditions and the following disclaimer.
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright notice,
++ *    this list of conditions and the following disclaimer in the documentation
++ *    and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
++ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
++ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
++ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
++ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ *****************************************************************************/
++
++#include "src/riscv/asm.S"
++
++function has_compliant_rvv, export=1, ext=v
++  vsetvli zero, zero, e8, m1, ta, ma
++  csrr a1, vtype
++  li a0, 0
++  blt a1, x0, no_rvv10
++  li a0, 1
++no_rvv10:
++  ret
++endfunc
+diff --git a/src/riscv/cpu.c b/src/riscv/cpu.c
+index 16377109..30e13543 100644
+--- a/src/riscv/cpu.c
++++ b/src/riscv/cpu.c
+@@ -38,11 +38,13 @@
+ 
+ #endif
+ 
++int dav1d_has_compliant_rvv(void);
++
+ COLD unsigned dav1d_get_cpu_flags_riscv(void) {
+     unsigned flags = 0;
+ #if defined(HAVE_GETAUXVAL)
+     unsigned long hw_cap = getauxval(AT_HWCAP);
+-    flags |= (hw_cap & HWCAP_RVV) ? DAV1D_RISCV_CPU_FLAG_V : 0;
++    flags |= (hw_cap & HWCAP_RVV) && dav1d_has_compliant_rvv() ? DAV1D_RISCV_CPU_FLAG_V : 0;
+ #endif
+ 
+     return flags;
+-- 
+GitLab
+
diff --git a/main/db/APKBUILD b/main/db/APKBUILD
index ce746403ad4..8e19d0eebec 100644
--- a/main/db/APKBUILD
+++ b/main/db/APKBUILD
@@ -1,29 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=db
 pkgver=5.3.28
-_ver=${pkgver}
-pkgrel=1
+pkgrel=5
 pkgdesc="The Berkeley DB embedded database system"
 url="https://www.oracle.com/technology/software/products/berkeley-db/index.html"
 arch="all"
-license="custom"
+license="BSD-3-Clause"
 options="!check"  # "check target not available"
-depends=
-makedepends=
 subpackages="$pkgname-dev $pkgname-doc $pkgname-utils $pkgname-c++:cxx"
 source="https://download.oracle.com/berkeley-db/db-$pkgver.tar.gz
 	atomic.patch
 	"
 
-builddir="$srcdir/db-$_ver"
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
-build () {
-	cd "$builddir"
+build() {
 	cd build_unix
 	../dist/configure \
 		--build=$CBUILD \
@@ -38,13 +32,12 @@ build () {
 }
 
 package() {
-	cd "$builddir"/build_unix
-	make DESTDIR="$pkgdir" install
+	make -C build_unix DESTDIR="$pkgdir" install
 
 	mkdir -p "$pkgdir"/usr/share/doc
 	mv "$pkgdir"/usr/docs "$pkgdir"/usr/share/doc/$pkgname
 
-	install -D -m644 "$srcdir"/db-$_ver/LICENSE \
+	install -Dm644 LICENSE \
 		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
@@ -61,5 +54,7 @@ cxx() {
 	mv "$pkgdir"/usr/lib/libdb_cxx*.so "$subpkgdir"/usr/lib/
 }
 
-sha512sums="e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090  db-5.3.28.tar.gz
-e9fedc5b870b95fe772a8121fca8b3642327d960441fe40a1090375efd37eec397a508e6e9100c2817c02bb4380421eb8ea400aeb060fe46a8bdac83a1abfbeb  atomic.patch"
+sha512sums="
+e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090  db-5.3.28.tar.gz
+e9fedc5b870b95fe772a8121fca8b3642327d960441fe40a1090375efd37eec397a508e6e9100c2817c02bb4380421eb8ea400aeb060fe46a8bdac83a1abfbeb  atomic.patch
+"
diff --git a/main/dbus-glib/APKBUILD b/main/dbus-glib/APKBUILD
index 6b68200beca..2e6bb4452b7 100644
--- a/main/dbus-glib/APKBUILD
+++ b/main/dbus-glib/APKBUILD
@@ -1,18 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dbus-glib
-pkgver=0.110
-pkgrel=0
+pkgver=0.112
+pkgrel=6
 pkgdesc="GLib bindings for DBUS"
-url="http://www.freedesktop.org/wiki/Software/DBusBindings"
+options="!check" # FIXME: tests fails
+url="https://www.freedesktop.org/wiki/Software/DBusBindings"
 arch="all"
-license="GPL-2.0-or-later"
+license="AFL-2.1 OR GPL-2.0-or-later"
 subpackages="$pkgname-dev $pkgname-doc"
 makedepends="dbus-dev glib-dev gettext-dev expat-dev"
-source="https://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
-options="!check" # FIXME: tests fails
+source="https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-$pkgver.tar.gz"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,13 +30,19 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54  dbus-glib-0.110.tar.gz"
+dev() {
+	default_dev
+
+	amove usr/bin/dbus-binding-tool
+}
+
+sha512sums="
+7c9f393f065dfb3d698f35e6554caf15fe539f5dd52d2b2bb6ed1770e130f5dab8e45379232520301455bae9bb77e25a109faf175153fcd4b9dd11d7de4a546e  dbus-glib-0.112.tar.gz
+"
diff --git a/main/dbus/0001-_dbus_generate_random_bytes-use-getrandom-2.patch b/main/dbus/0001-_dbus_generate_random_bytes-use-getrandom-2.patch
deleted file mode 100644
index f900f057f7f..00000000000
--- a/main/dbus/0001-_dbus_generate_random_bytes-use-getrandom-2.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 7faabbeb1d735069a2fd1e24e20b2543306a0e28 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 24 Mar 2020 11:31:41 +0100
-Subject: [PATCH] _dbus_generate_random_bytes: use getrandom(2)
-
-Use getrandom(2) and fall back to /dev/urandom if it is missing or if it
-fails some any reason.
-
-This solves problem where dbus-uuidgen is called from a chroot which
-lacks /dev/urandom.
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- cmake/ConfigureChecks.cmake |  2 ++
- cmake/config.h.cmake        |  2 ++
- configure.ac                |  3 ++-
- dbus/dbus-sysdeps-unix.c    | 23 ++++++++++++++++++++---
- 4 files changed, 26 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
-index a9a5fc90..f920c75f 100644
---- a/cmake/ConfigureChecks.cmake
-+++ b/cmake/ConfigureChecks.cmake
-@@ -26,6 +26,7 @@ check_include_file(strings.h     HAVE_STRINGS_H)
- check_include_file(syslog.h     HAVE_SYSLOG_H)
- check_include_files("stdint.h;sys/types.h;sys/event.h" HAVE_SYS_EVENT_H)
- check_include_file(sys/inotify.h     HAVE_SYS_INOTIFY_H)
-+check_include_file(sys/random.h     HAVE_SYS_RANDOM_H)
- check_include_file(sys/resource.h     HAVE_SYS_RESOURCE_H)
- check_include_file(sys/stat.h     HAVE_SYS_STAT_H)
- check_include_file(sys/types.h     HAVE_SYS_TYPES_H)
-@@ -62,6 +63,7 @@ check_symbol_exists(inotify_init1 "sys/inotify.h"           HAVE_INOTIFY_INIT1)
- check_symbol_exists(SCM_RIGHTS    "sys/types.h;sys/socket.h;sys/un.h" HAVE_UNIX_FD_PASSING)
- check_symbol_exists(prctl        "sys/prctl.h"              HAVE_PRCTL)
- check_symbol_exists(raise        "signal.h"                 HAVE_RAISE)
-+check_symbol_exists(getrandom    "sys/random.h"             HAVE_GETRANDOM)
- check_symbol_exists(getrlimit    "sys/resource.h;sys/time.h" HAVE_GETRLIMIT)
- check_symbol_exists(prlimit      "sys/resource.h;sys/time.h" HAVE_PRLIMIT)
- check_symbol_exists(setrlimit    "sys/resource.h;sys/time.h" HAVE_SETRLIMIT)
-diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
-index 11191821..10388fce 100644
---- a/cmake/config.h.cmake
-+++ b/cmake/config.h.cmake
-@@ -128,6 +128,7 @@
- #cmakedefine HAVE_SYS_EVENTS_H
- #cmakedefine HAVE_SYS_INOTIFY_H
- #cmakedefine HAVE_SYS_PRCTL_H
-+#cmakedefine HAVE_SYS_RANDOM_H 1
- #cmakedefine HAVE_SYS_RESOURCE_H
- #cmakedefine HAVE_SYS_STAT_H
- 
-@@ -205,6 +206,7 @@
- #cmakedefine HAVE_ACCEPT4 1
- #cmakedefine HAVE_DIRFD 1
- #cmakedefine HAVE_INOTIFY_INIT1 1
-+#cmakedefine HAVE_GETRANDOM 1
- #cmakedefine HAVE_GETRLIMIT 1
- #cmakedefine HAVE_PRLIMIT 1
- #cmakedefine HAVE_SETRLIMIT 1
-diff --git a/configure.ac b/configure.ac
-index a1ba877a..c9f50b0f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -619,7 +619,7 @@ AC_DEFINE_UNQUOTED([DBUS_USE_SYNC], [$have_sync], [Use the gcc __sync extension]
- AC_SEARCH_LIBS(socket,[socket network])
- AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
- 
--AC_CHECK_FUNCS([vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll setlocale localeconv strtoll strtoull issetugid getresuid setresuid getrlimit prlimit])
-+AC_CHECK_FUNCS([vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll setlocale localeconv strtoll strtoull issetugid getresuid setresuid getrlimit getrandom prlimit])
- 
- AC_CHECK_HEADERS([syslog.h])
- if test "x$ac_cv_header_syslog_h" = "xyes"; then
-@@ -667,6 +667,7 @@ fi
- 
- AC_CHECK_HEADERS(sys/resource.h)
- AC_CHECK_HEADERS([sys/time.h])
-+AC_CHECK_HEADERS([sys/random.h])
- 
- AC_CHECK_HEADERS(dirent.h)
- 
-diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
-index e8cd5b33..44f7711e 100644
---- a/dbus/dbus-sysdeps-unix.c
-+++ b/dbus/dbus-sysdeps-unix.c
-@@ -80,6 +80,9 @@
- #ifdef HAVE_ALLOCA_H
- #include <alloca.h>
- #endif
-+#ifdef HAVE_SYS_RANDOM_H
-+#include <sys/random.h>
-+#endif
- 
- #ifdef HAVE_ADT
- #include <bsm/adt.h>
-@@ -3158,12 +3161,26 @@ _dbus_generate_random_bytes (DBusString *str,
-                              int         n_bytes,
-                              DBusError  *error)
- {
--  int old_len;
-+  int old_len = _dbus_string_get_length (str);
-   int fd;
-   int result;
-+#ifdef HAVE_GETRANDOM
-+  char *buffer;
-+
-+  if (!_dbus_string_lengthen (str, n_bytes))
-+    {
-+      _DBUS_SET_OOM (error);
-+      return FALSE;
-+    }
-+
-+  buffer = _dbus_string_get_data_len (str, old_len, n_bytes);
-+  result = getrandom (buffer, n_bytes, GRND_NONBLOCK);
- 
--  old_len = _dbus_string_get_length (str);
--  fd = -1;
-+  if (result == n_bytes)
-+    return TRUE;
-+
-+  _dbus_string_set_length (str, old_len);
-+#endif
- 
-   /* note, urandom on linux will fall back to pseudorandom */
-   fd = open ("/dev/urandom", O_RDONLY);
--- 
-2.26.0
-
diff --git a/main/dbus/APKBUILD b/main/dbus/APKBUILD
index 440df172d76..cb3d5977f05 100644
--- a/main/dbus/APKBUILD
+++ b/main/dbus/APKBUILD
@@ -1,90 +1,99 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dbus
-pkgver=1.12.16
-pkgrel=4
+pkgver=1.14.10
+pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
-options="!check" # Introduces circular dependency with xorg-server (xvfb-run -> xvfb)
 url="https://www.freedesktop.org/Software/dbus"
-pkggroups="messagebus"
 arch="all"
 license="AFL-2.1 OR GPL-2.0-or-later"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-x11 $pkgname-openrc"
-triggers="$pkgname.trigger=/etc/dbus-1/system.d"
 depends_dev="util-linux-dev"
-makedepends="$depends_dev
-	autoconf automake libtool autoconf-archive
+makedepends="
+	$depends_dev
 	expat-dev
 	glib-dev
 	libsm-dev
 	libx11-dev
+	meson
 	xmlto
 	"
-checkdepends="xvfb-run"
+pkggroups="messagebus"
 install="$pkgname.pre-install $pkgname.post-install"
-source="https://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz
-	0001-_dbus_generate_random_bytes-use-getrandom-2.patch
+triggers="$pkgname.trigger=/usr/share/dbus-1/system.d"
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-libs
+	$pkgname-x11
+	$pkgname-openrc
+	$pkgname-daemon-launch-helper:launchhelper
+	"
+source="https://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.xz
 	$pkgname.initd
+	$pkgname.confd
 	"
+options="!check" # fail on 1.14
 
 # secfixes:
+#   1.14.4-r0:
+#     - CVE-2022-42010
+#     - CVE-2022-42011
+#     - CVE-2022-42012
+#   1.12.18-r0:
+#     - CVE-2020-12049
 #   1.12.16-r0:
-#   - CVE-2019-12749
-
-prepare() {
-	default_prepare
-	autoreconf -vif
-}
+#     - CVE-2019-12749
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--with-xml=expat \
-		--with-dbus-user=messagebus \
-		--with-system-pid-file=/var/run/dbus.pid \
-		--disable-verbose-mode \
-		--disable-static \
-		--enable-inotify \
-		--disable-dnotify \
-		--enable-modular-tests=yes \
-		--disable-asserts \
-		--enable-user-session \
-		--enable-xml-docs \
-		--with-session-socket-dir=/tmp \
-		--with-x
+		--sysconfdir=/etc \
+		--with-system-pid-file=/run/dbus/dbus.pid \
+		--enable-checks \
+		--disable-assertions
 	make
 }
 
 check() {
-	cd "$builddir"
-	xvfb-run make check
+	make check
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
+
 	install -Dm755 "$srcdir"/dbus.initd "$pkgdir"/etc/init.d/dbus
-	rm -rf "$pkgdir"/usr/lib/systemd
+	install -Dm644 "$srcdir"/dbus.confd "$pkgdir"/etc/conf.d/dbus
+
+	# can't  install tmpfs
+	rm -r "$pkgdir"/var/run
 }
 
 libs() {
 	pkgdesc="D-BUS access libraries"
 	replaces="dbus"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/
+
+	amove usr/lib/lib*.so.*
 }
 
 x11() {
 	pkgdesc="X11 add-ons for D-BUS"
 	depends="dbus=$pkgver-r$pkgrel"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/dbus-launch "$subpkgdir"/usr/bin/
+
+	amove usr/bin/dbus-launch
+}
+
+launchhelper() {
+	pkgdesc="DBus SUID launch helper for autospawning"
+	install_if="$pkgname=$pkgver-r$pkgrel"
+
+	amove usr/libexec/dbus-daemon-launch-helper
 }
 
-sha512sums="27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb  dbus-1.12.16.tar.gz
-3db35499361e84d8e2469b88b033f49813b179188ac25f1841a989988c352af398a56dfd94383813626c6dfd032194f7a9fcdba001ccc3e005e7cd22dae7a7ed  0001-_dbus_generate_random_bytes-use-getrandom-2.patch
-4c6beba2382416e60a3adfa85ef843d90d93ca5f38c23f573e058ffca6d4fc3850d11d40938c74383bba61599569b7fdfb1fcf3b9d2f1463e6b2e2cc81097c84  dbus.initd"
+sha512sums="
+775b708326059692937acb69d4ce1a89e69878501166655b5d1b1628ac31b50dd53d979d93c84e57f95e90b15e25aa33893e51a7421d3537e9c2f02b1b91bfae  dbus-1.14.10.tar.xz
+b0c17503fd18ae7f9a4df46aaf5811dddb63b9868b47d20fb5b9b49843ee159b1634fb7f27f9f7784bf26f751ab49302ea3053ae5d1acf875a0885286430e653  dbus.initd
+ea5df31eab4635da8af241c29878ca59927479f7bef71252416806d1504023da3c951a61bd6150fab0e1dbdde5ccfd91616db6043875b7babdf2bada873450dc  dbus.confd
+"
diff --git a/main/dbus/dbus.confd b/main/dbus/dbus.confd
new file mode 100644
index 00000000000..fb6445562c5
--- /dev/null
+++ b/main/dbus/dbus.confd
@@ -0,0 +1,10 @@
+# Configuration for /etc/init.d/dbus
+
+# Additional arguments to pass to dbus-daemon.
+#command_args=
+
+# Uncomment to use process supervisor.
+#supervisor=supervise-daemon
+
+# Move machine-id generated by dbus-uuidgen
+#machine_id=/etc/machine-id
diff --git a/main/dbus/dbus.initd b/main/dbus/dbus.initd
index 2fbd3e54643..915522142a9 100644
--- a/main/dbus/dbus.initd
+++ b/main/dbus/dbus.initd
@@ -1,32 +1,27 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-supervisor=supervise-daemon
-
 name="System Message Bus"
 description="D-Bus System Message Bus"
 
-command="/usr/bin/dbus-daemon"
-command_args="--system"
-command_args_foreground="--nofork"
-
 extra_started_commands="reload"
 
+command="/usr/bin/dbus-daemon"
+command_args="--system --nofork --nopidfile --syslog-only ${command_args:-}"
+command_background="yes"
+pidfile="/run/$RC_SVCNAME.pid"
+
 depend() {
 	need localmount
 	after bootmisc
 }
 
 start_pre() {
-	/usr/bin/dbus-uuidgen --ensure=/etc/machine-id
+	checkpath -d -m755 -o root:messagebus /run/dbus || return 1
 
-	# We need to test if /var/run/dbus exists, since script will fail if it does not
-	[ -e /var/run/dbus ] || mkdir /var/run/dbus
+	/usr/bin/dbus-uuidgen --ensure="${machine_id:-/etc/machine-id}"
 }
 
 stop_post() {
-	[ ! -S /var/run/dbus/system_bus_socket ] || rm -f /var/run/dbus/system_bus_socket
+	[ ! -S /run/dbus/system_bus_socket ] || rm -f /run/dbus/system_bus_socket
 }
 
 reload() {
diff --git a/main/dconf/APKBUILD b/main/dconf/APKBUILD
deleted file mode 100644
index f6a25624291..00000000000
--- a/main/dconf/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
-pkgname=dconf
-pkgver=0.36.0
-pkgrel=0
-pkgdesc="A low-level configuration system."
-url="https://wiki.gnome.org/Projects/dconf"
-arch="all"
-license="LGPL-2.1-or-later"
-makedepends="glib-dev dbus-dev docbook-xsl vala gtk+3.0-dev libxml2-dev meson
-	py3-setuptools bash-completion"
-checkdepends="dbus"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
-source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz"
-
-build() {
-	meson \
-		--prefix=/usr \
-		--localstatedir=/var \
-		--buildtype=plain \
-		. output
-	ninja -C output
-}
-
-check() {
-	meson test -C output -t 100
-}
-
-package() {
-	DESTDIR="$pkgdir" ninja -C output install
-}
-
-bashcomp() {
-	pkgdesc="Bash completions for $pkgname"
-	install_if="$pkgname-$pkgver-r$pkgrel bash-completion"
-
-	mkdir -p "$subpkgdir"/usr/share
-	mv "$pkgdir"/usr/share/bash-completion "$subpkgdir"/usr/share
-}
-
-sha512sums="fed0b4ac13dfeff3bbe428a5c25408a0f13610219e561841a3af75cf18f9c630c385989b700c081b79ab53c00bdecf43c7c94979312c047faefbda4b2653d40d  dconf-0.36.0.tar.xz"
diff --git a/main/ddate/APKBUILD b/main/ddate/APKBUILD
index 20541104b6e..7d4d9eacbda 100644
--- a/main/ddate/APKBUILD
+++ b/main/ddate/APKBUILD
@@ -1,25 +1,28 @@
 # Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr>
-# Maintainer: Johannes Matheis <jomat+alpinebuild@jmt.gr>
+# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
 pkgname=ddate
 pkgver=0.2.2
-pkgrel=1
+pkgrel=5
 pkgdesc="Convert Gregorian dates to Discordian dates"
 url="https://github.com/bo0ts/ddate"
 arch="all"
 license="Public-Domain"
-makedepends="cmake"
+options="!check" # no testsuite
+makedepends="cmake samurai"
 subpackages="$pkgname-doc"
-source="ddate-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+source="ddate-$pkgver.tar.gz::https://github.com/bo0ts/ddate/archive/v$pkgver.tar.gz"
 
 build() {
-	cmake -B build . \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr
-	make -C build
+	cmake --build build
 }
 
 package() {
-	make -C build DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
-sha512sums="5d148e030bee392eb93c5ae519061af0736f2f75eaae916e3efaf927d9f4de8cc72afc4a5121b6fbc0264b73e9f580330a38b97bb78837d447d0b4c1fc29ec06  ddate-0.2.2.tar.gz"
+sha512sums="
+5d148e030bee392eb93c5ae519061af0736f2f75eaae916e3efaf927d9f4de8cc72afc4a5121b6fbc0264b73e9f580330a38b97bb78837d447d0b4c1fc29ec06  ddate-0.2.2.tar.gz
+"
diff --git a/main/debian-archive-keyring/APKBUILD b/main/debian-archive-keyring/APKBUILD
index 13523b6c50d..73e51d88fe1 100644
--- a/main/debian-archive-keyring/APKBUILD
+++ b/main/debian-archive-keyring/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
 pkgname=debian-archive-keyring
-pkgver=2019.1
-pkgrel=1
+pkgver=2023.4
+pkgrel=0
 pkgdesc="GnuPG archive keys of the Debian archive"
 url="https://packages.debian.org/sid/debian-archive-keyring"
 arch="noarch"
@@ -28,7 +28,9 @@ build() {
 
 package() {
 	mkdir -p "$pkgdir"
-	tar -xf "$srcdir"/data.tar.xz -C "$pkgdir"/
+	unxz -c "$srcdir"/data.tar.xz | tar -x -C "$pkgdir"/
 }
 
-sha512sums="051b8507c9deba0d13dc0137ff43ae9db27b20b78c3437ca680046ae9b1c81ac505dc0a4460d4a83c4b256a04a2e57d1280eb2e8a3afb2a58f150ca6c37d0d63  debian-archive-keyring_2019.1_all.deb"
+sha512sums="
+43360871728355eab0d5bbb5eee7fbb0adfdde97eb828972b0eebbb3f3b23369ac5825b232e444f0a212e00e47863dcd9d260db4f04394c9e1b7dfd282e44904  debian-archive-keyring_2023.4_all.deb
+"
diff --git a/main/debian-devscripts/APKBUILD b/main/debian-devscripts/APKBUILD
new file mode 100644
index 00000000000..ba1ee96f20a
--- /dev/null
+++ b/main/debian-devscripts/APKBUILD
@@ -0,0 +1,68 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=debian-devscripts
+pkgver=2.23.7
+pkgrel=0
+pkgdesc="debian developer scripts"
+url="https://tracker.debian.org/pkg/devscripts"
+arch="noarch"
+license="GPL-2.0-or-later"
+checkdepends="perl"
+# checkbashisms is the common accepted name, but prefix for rest
+subpackages="
+	$pkgname-doc
+	$pkgname-bash-completion
+	checkbashisms
+	$pkgname-hardening-check:harden
+	"
+source="https://ftp.debian.org/debian/pool/main/d/devscripts/devscripts_$pkgver.tar.xz"
+builddir="$srcdir/devscripts/scripts"
+
+prepare() {
+	default_prepare
+
+	sed -i "s/###VERSION###/$pkgver/" checkbashisms.pl
+
+	mv checkbashisms.pl checkbashisms
+	mv hardening-check.pl hardening-check
+}
+
+check() {
+	printf '#!/bin/sh\necho "hello world"\n' > ./testfile
+	perl ./checkbashisms --version
+	perl ./checkbashisms ./testfile
+}
+
+package() {
+	depends="
+		checkbashisms=$pkgver-r$pkgrel
+		$pkgname-hardening-check=$pkgver-r$pkgrel
+		"
+
+	# only these useful for now
+	install -Dm755 -t "$pkgdir"/usr/bin/ \
+		checkbashisms \
+		hardening-check
+
+	install -Dm644 checkbashisms.1 \
+		-t "$pkgdir"/usr/share/man/man1/
+	install -Dm644 checkbashisms.bash_completion \
+		$pkgdir/usr/share/bash-completion/completions/checkbashisms
+}
+
+checkbashisms() {
+	pkgdesc="$pkgdesc (checkbashisms)"
+	depends="perl"
+
+	amove usr/bin/checkbashisms
+}
+
+harden() {
+	pkgdesc="$pkgdesc (hardening-check)"
+	depends="perl"
+
+	amove usr/bin/hardening-check
+}
+
+sha512sums="
+d1cb527bc842f3f82413edb0f10dd90c3a7b362daeeca900cd998732989fe976abc04dd62760bfeda459bfc26eac0c038f59a8382759ae6c82b3cc745c20800f  devscripts_2.23.7.tar.xz
+"
diff --git a/main/debootstrap/APKBUILD b/main/debootstrap/APKBUILD
index 193323a9de7..981c32ddeae 100644
--- a/main/debootstrap/APKBUILD
+++ b/main/debootstrap/APKBUILD
@@ -1,17 +1,17 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=debootstrap
-pkgver=1.0.123
+pkgver=1.0.134
 pkgrel=0
 pkgdesc="Debian/Ubuntu bootstrap scripts"
 url="https://packages.qa.debian.org/d/debootstrap.html"
 arch="noarch"
 license="MIT"
 options="!check" # upstream doesn't have a test suite
-depends="debian-archive-keyring dpkg tar"
+depends="debian-archive-keyring dpkg perl tar"
 subpackages="$pkgname-doc"
-source="http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_$pkgver.tar.gz"
-builddir="$srcdir/debootstrap"
+source="https://salsa.debian.org/installer-team/debootstrap/-/archive/$pkgver/debootstrap-$pkgver.tar.bz2
+	auto-detect-arch.patch"
 
 package() {
 	make DESTDIR="$pkgdir" install
@@ -19,4 +19,7 @@ package() {
 		"$pkgdir"/usr/share/man/man8/$pkgname.8
 }
 
-sha512sums="3b23f61528d4993750ba22b8765c10cfb9695793177017d9e4faf546da076be6660c5d6e0d1bf30bafe14f6d70f886190d3ec42a0057b895f40e860475eea794  debootstrap_1.0.123.tar.gz"
+sha512sums="
+e7b9726632d3816975c8cbd0020882f69db6d2a84f6c2d086a4e002c58afa61f8b08a8a35b40dd6a284e2cdb584817292462e5dc354fb83d177d50a56aa8cda6  debootstrap-1.0.134.tar.bz2
+a349d9d8f5fe9e4ccb67d7206d5e87174722c0e0ee07405557662e94fb3c330a922f9cfe12bbd096103cbbe2146262ea300d9e1854f7fef77f4f1949984f5591  auto-detect-arch.patch
+"
diff --git a/main/debootstrap/auto-detect-arch.patch b/main/debootstrap/auto-detect-arch.patch
new file mode 100644
index 00000000000..ca8d4f5793a
--- /dev/null
+++ b/main/debootstrap/auto-detect-arch.patch
@@ -0,0 +1,26 @@
+Without this patch debootstrap(8) is incapable of autodetecting the
+architecture to install since the $(dpkg --print-architecture) prints
+a musl-linux-${arch} which is not suitable for HOST_ARCH.
+
+diff -upr debootstrap-1.0.126.orig/debootstrap debootstrap-1.0.126/debootstrap
+--- debootstrap-1.0.126.orig/debootstrap	2021-11-08 15:41:32.000000000 +0100
++++ debootstrap-1.0.126/debootstrap	2022-01-29 15:26:42.023298234 +0100
+@@ -535,7 +535,17 @@ fi
+ 
+ ###########################################################################
+ 
+-if in_path dpkg && \
++if [ -e /etc/apk/arch ]; then
++	read CARCH < /etc/apk/arch
++	case "$CARCH" in
++		x86)     HOST_ARCH=i386     ;;
++		x86_64)  HOST_ARCH=amd64    ;;
++		arm*)    HOST_ARCH=armhf    ;;
++		aarch64) HOST_ARCH=arm64    ;;
++		ppc64le) HOST_ARCH=ppc64el  ;;
++		*)       HOST_ARCH="$CARCH" ;;
++	esac
++elif in_path dpkg && \
+      dpkg --print-architecture >/dev/null 2>&1; then
+ 	HOST_ARCH=$(/usr/bin/dpkg --print-architecture)
+ elif in_path udpkg && \
diff --git a/main/dejagnu/APKBUILD b/main/dejagnu/APKBUILD
index b974176acb6..dda782dfb80 100644
--- a/main/dejagnu/APKBUILD
+++ b/main/dejagnu/APKBUILD
@@ -1,8 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Maintainer:
-
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=dejagnu
-pkgver=1.6.2
+pkgver=1.6.3
 pkgrel=0
 pkgdesc="A framework for testing other programs"
 url="https://www.gnu.org/software/dejagnu/"
@@ -10,11 +9,11 @@ arch="noarch"
 license="GPL-3.0-or-later"
 depends="expect"
 makedepends="tcl>=8.5"
+checkdepends="gawk"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
+source="https://ftp.gnu.org/pub/gnu/dejagnu/dejagnu-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,13 +25,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042  dejagnu-1.6.2.tar.gz"
+sha512sums="
+1a737132bd912cb527e7f2fcbe70ffff8ccc8604a0ffdecff87ba2a16aeeefd800f5792aeffdbe79be6daa35cedb1c60e41002ca4aabb5370a460028191b76c4  dejagnu-1.6.3.tar.gz
+"
diff --git a/main/desktop-file-utils/APKBUILD b/main/desktop-file-utils/APKBUILD
deleted file mode 100644
index 7ebdd485efe..00000000000
--- a/main/desktop-file-utils/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=desktop-file-utils
-pkgver=0.24
-pkgrel=0
-pkgdesc="Command line utilities for working with desktop entries"
-url="http://www.freedesktop.org/wiki/Software/desktop-file-utils"
-arch="all"
-license="GPL-2.0-or-later"
-makedepends="glib-dev gettext-dev"
-subpackages="$pkgname-doc"
-triggers="$pkgname.trigger=/usr/share/applications"
-source="https://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.xz"
-
-build() {
-	cd "$builddir"
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0  desktop-file-utils-0.24.tar.xz"
diff --git a/main/desktop-file-utils/desktop-file-utils.trigger b/main/desktop-file-utils/desktop-file-utils.trigger
deleted file mode 100644
index 0400e9a2b90..00000000000
--- a/main/desktop-file-utils/desktop-file-utils.trigger
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-update-desktop-database -q
diff --git a/main/dev86/APKBUILD b/main/dev86/APKBUILD
index 09907dfe7de..28299a29850 100644
--- a/main/dev86/APKBUILD
+++ b/main/dev86/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dev86
 pkgver=0.16.21
-pkgrel=1
+pkgrel=3
 pkgdesc="A real mode 80x86 assembler and linker"
 url="https://github.com/lkundrak/dev86/"
 arch="all"
@@ -19,7 +19,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/lkundrak/dev86/archive/v$pkg
 prepare() {
 	default_prepare
 	# use our CFLAGS
-	sed -i -e "s/-O2 -g/${CFLAGS}/" \
+	sed -i -e "s/-O2 -g/$CFLAGS/" \
 		makefile.in
 #	if [ "$CARCH" = x86_64 ]; then
 		sed -i \
@@ -28,7 +28,7 @@ prepare() {
 			makefile.in
 #	fi
 	sed -i \
-		-e "s:-O2 -g:${CFLAGS}:" \
+		-e "s:-O2 -g:$CFLAGS:" \
 		-e '/INEXE=/s:-s::' \
 		makefile.in
 	# no stripping
diff --git a/main/devicemaster-linux/APKBUILD b/main/devicemaster-linux/APKBUILD
index 925586b4cb6..467786e4280 100644
--- a/main/devicemaster-linux/APKBUILD
+++ b/main/devicemaster-linux/APKBUILD
@@ -1,27 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=devicemaster-linux
 pkgver=7.34
-pkgrel=0
+pkgrel=3
 pkgdesc="Userspace tools for NS-Link Device Drivers"
-url="http://www.comtrol.com/resources/product-resources-white-papers/ns-link-device-drivers"
+url="https://www.comtrol.com/resources/product-resources-white-papers/ns-link-device-drivers"
 arch="all"
-license="GPL"
+license="GPL-2.0-or-later"
 makedepends="linux-headers"
-subpackages="$pkgname-doc"
-source="https://dev.alpinelinux.org/archive/devicemaster-linux/devicemaster-linux-$pkgver.tar.gz
+options="!check" # no testsuite
+subpackages="$pkgname-doc $pkgname-openrc"
+source="https://files.comtrol.com/dev_mstr/rts/drivers/linux/devicemaster-linux-$pkgver.tar.gz
 	makefile.patch
 	nslink.initd
 	"
-_srcurl="ftp://ftp.comtrol.com/dev_mstr/rts/drivers/linux/devicemaster-linux-$pkgver.tar.gz"
-_disturl="dev.alpinelinux.org:/archive/$pkgname/"
-
-snapshot() {
-	mkdir -p "$srcdir"/tmp
-	cd "$srcdir"/tmp
-	curl -ss -o "$pkgname-$pkgver.tar.gz" "$_srcurl"
-	rsync --progress -La $pkgname-$pkgver.tar.gz \
-		$_disturl
-}
 
 build() {
 	make nslinkd nslinkadmin nslinkrelease nslinktool
@@ -41,6 +32,9 @@ package() {
 	install -m644 *.8 "$pkgdir"/usr/share/man/man8
 	install -m644 *.5 "$pkgdir"/usr/share/man/man5
 }
-sha512sums="a7af54fde5812256b4a04f13d41c064dcb7f702cac18e4929d1a9669c49294eb62fc6e55e7b873bae63a795c3148dbca74ab39f337e26962bdee021f5fb2119c  devicemaster-linux-7.34.tar.gz
+
+sha512sums="
+a7af54fde5812256b4a04f13d41c064dcb7f702cac18e4929d1a9669c49294eb62fc6e55e7b873bae63a795c3148dbca74ab39f337e26962bdee021f5fb2119c  devicemaster-linux-7.34.tar.gz
 adadb7b6502b0b6fd2d72a1a453dcea2ff8800d08258b80c5df751bd9fc8de5e88760560c2ab1e911e994999db58882555b5ab6e72f466ed26a47b327f6a668a  makefile.patch
-6e67a184ec73d5909d67b7d606d4789cad0e0b4134bb52bfd4019fd7f65b928c15c241dfe6f8a1c6e0854f4d509d7bb150beb9d41ae2a2315ebc040c240abc22  nslink.initd"
+6e67a184ec73d5909d67b7d606d4789cad0e0b4134bb52bfd4019fd7f65b928c15c241dfe6f8a1c6e0854f4d509d7bb150beb9d41ae2a2315ebc040c240abc22  nslink.initd
+"
diff --git a/main/dhcp/01-dhclient-script-fix-bare-ip.patch b/main/dhcp/01-dhclient-script-fix-bare-ip.patch
deleted file mode 100644
index 7b3165d8750..00000000000
--- a/main/dhcp/01-dhclient-script-fix-bare-ip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 0c42969..3cd2a75 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -394,7 +394,7 @@ case "$reason" in
-             make_resolv_conf
-         else
-             # flush all IPs from interface
--            ip -4 addr flush dev ${interface}
-+            ${ip} -4 addr flush dev ${interface}
-             exit_with_hooks 2
-         fi
- 
diff --git a/main/dhcp/02-dhclient-script-remove-bashisms.patch b/main/dhcp/02-dhclient-script-remove-bashisms.patch
deleted file mode 100644
index afa10484f9c..00000000000
--- a/main/dhcp/02-dhclient-script-remove-bashisms.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/client/scripts/linux b/client/scripts/linux
-index 0c42969..2e7274b 100755
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # dhclient-script for Linux. Dan Halbert, March, 1997.
- # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
- # No guarantees about this. I'm a novice at the details of Linux
-@@ -428,7 +428,7 @@ case "$reason" in
-             # Check if any IPv6 address on this interface is marked as
-             # tentative.
-             ${ip} addr show ${interface} | grep inet6 | grep tentative \
--                &> /dev/null
-+                > /dev/null 2>&1
-             if [ $? -eq 0 ]; then
-                 # Wait for duplicate address detection to complete or for
-                 # the timeout specified as --dad-wait-time.
-@@ -437,7 +437,7 @@ case "$reason" in
-                     # We're going to poll for the tentative flag every second.
-                     sleep 1
-                     ${ip} addr show ${interface} | grep inet6 | grep tentative \
--                        &> /dev/null
-+                        > /dev/null 2>&1
-                     if [ $? -ne 0 ]; then
-                         break;
-                     fi
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 669706aee23..5ce964d49e1 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -1,38 +1,45 @@
-# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer:
 pkgname=dhcp
-pkgver=4.4.2
-_realver=${pkgver/_p/-P}
-pkgrel=1
+pkgver=4.4.3_p1
+_projver=${pkgver/_p/-P}
+pkgrel=4
 pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
 url="https://www.isc.org/"
 arch="all"
 license="MPL-2.0"
-_depends_server_ldap="!$pkgname-server-vanilla $pkgname"
-_depends_server_vanilla="!$pkgname-server-ldap $pkgname"
-depends_static="$pkgname-dev"
+depends_static="$pkgname-dev=$pkgver-r$pkgrel"
 # busybox utils are not sufficient
-_depends_dhclient="coreutils iproute2 run-parts"
-_depends_dhcrelay=""  # do not inherit depends from $pkgname
+_depends_dhclient="
+	coreutils
+	iproute2
+	run-parts
+	"
+makedepends="
+	krb5-dev
+	linux-headers
+	openldap-dev
+	perl
+	$_depends_dhclient
+	"
 pkgusers="dhcp"
 pkggroups="dhcp"
-makedepends="krb5-dev linux-headers openldap-dev perl"
 install="$pkgname.pre-install"
 subpackages="
+	$pkgname-dbg
 	$pkgname-doc
 	$pkgname-openrc
 	$pkgname-libs-static
-	$pkgname-dbg
 	$pkgname-dev
-	dhclient
+	$pkgname-server-vanilla:_server_vanilla
+	$pkgname-server-ldap:_server_ldap
 	dhcrelay
 	dhcrelay-openrc
-	$pkgname-server-vanilla:server_vanilla
-	$pkgname-server-ldap:server_ldap
+	dhclient
+	keama
 	"
-source="
-	http://downloads.isc.org/isc/$pkgname/$_realver/$pkgname-$_realver.tar.gz
-	01-dhclient-script-fix-bare-ip.patch
-	02-dhclient-script-remove-bashisms.patch
+source="https://downloads.isc.org/isc/dhcp/$_projver/dhcp-$_projver.tar.gz
+	fix-unwind-import.patch
 	dhcp-3.0-fix-perms.patch
 	dhclient-script-alpine
 	dhcrelay.initd
@@ -40,11 +47,16 @@ source="
 	dhcpd.confd
 	dhcpd.initd
 	"
-
-makedepends="$makedepends $_depends_dhclient $_depends_server_ldap $_depends_server_vanilla"
+builddir="$srcdir/$pkgname-$_projver"
 
 # secfixes:
+#   4.4.3_p1-r0:
+#     - CVE-2022-2928
+#     - CVE-2022-2929
+#   4.4.2_p1-r0:
+#     - CVE-2021-25217
 #   4.4.1-r0:
+#     - CVE-2019-6470
 #     - CVE-2018-5732
 #     - CVE-2018-5733
 
@@ -75,14 +87,28 @@ _configure() {
 		--enable-paranoia \
 		--enable-log-pid \
 		"$@"
+}
+
+prepare() {
+	# Normally the upstream build system unpacks this before building the
+	# library but we need to patch it for segfualt-fix.patch. If we unpack
+	# it early then the build system will just use what we've already
+	# unpacked and patched.
+	tar -C "$builddir"/bind/ -xzf "$builddir"/bind/bind.tar.gz
 
+	default_prepare
+
+	update_config_guess
+	update_config_sub
+	cp config.guess config.sub bind/bind-*/
+
+	cp -ar "$builddir" "$builddir-ldap"
 }
 
 build() {
-	cp -a "$builddir" "$builddir-ldap"
-
 	_configure
 	make -j1 -C bind && make
+	make -C keama
 
 	cd "$builddir-ldap"
 	_configure \
@@ -101,11 +127,10 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C keama install
 
-	#install -m751 -D "$builddir"/client/scripts/linux "$pkgdir"/sbin/dhclient-script
 	install -m751 -D "$srcdir"/dhclient-script-alpine "$pkgdir"/sbin/dhclient-script
-	install -d "$pkgdir"/var/lib/dhcp
-	install -d "$pkgdir"/run/dhcp
+	install -d -o dhcp -g dhcp "$pkgdir"/var/lib/dhcp
 }
 
 openrc() {
@@ -118,58 +143,56 @@ openrc() {
 	default_openrc
 }
 
-server_ldap() {
-	pkgdesc="ISC dhcpd server with LDAP support"
-	depends="$_depends_server_ldap"
-	provides="dhcp-server"
-	provider_priority=100
+static() {
+	depends="$depends_static"
+	default_static || mkdir -p "$subpkgdir"
+}
+
+_server_vanilla() {
+	pkgdesc="ISC DHCP server"
+	depends="$pkgname=$pkgver-r$pkgrel"
+	install_if="$pkgname=$pkgver-r$pkgrel"
+	provides="dhcp-server=$pkgver-r$pkgrel"
+	provider_priority=100  # highest
+
+	amove usr/sbin/dhcpd
+}
+
+_server_ldap() {
+	pkgdesc="ISC DHCP server with LDAP support"
+	depends="$pkgname=$pkgver-r$pkgrel"
+	provides="dhcp-server=$pkgver-r$pkgrel"
+	provider_priority=10  # lowest
 
 	install -d "$subpkgdir"
 	make DESTDIR="$subpkgdir" -C "$builddir-ldap/server" install-sbinPROGRAMS
 }
 
-server_vanilla() {
-	pkgdesc="ISC dhcpd server"
-	depends="$_depends_server_vanilla"
-	install_if="$pkgname=$pkgver-r$pkgrel"
-	provides="dhcp-server"
-	provider_priority=200
+dhcrelay() {
+	pkgdesc="ISC DHCP relay agent"
+	depends=""
+	install="$subpkgname.pre-install"
 
-	install -d "$subpkgdir"/usr/sbin
-	mv "$pkgdir/usr/sbin/dhcpd" "$subpkgdir/usr/sbin/"
-	rmdir "$pkgdir/usr/sbin" || :
+	amove usr/sbin/dhcrelay
 }
 
 dhclient() {
-	pkgdesc="ISC dhcp client"
+	pkgdesc="ISC DHCP client"
 	depends="$_depends_dhclient"
 
-	install -d -o dhcp -g dhcp "$subpkgdir"/var/lib/dhcp
-	install -d -o dhcp -g dhcp "$subpkgdir"/run/dhcp
-	install -d "$subpkgdir"/usr/sbin
-	install -d "$subpkgdir"/sbin
-	install -d "$subpkgdir"/etc/dhcp
-	mv "$pkgdir"/usr/sbin/dhclient "$subpkgdir"/usr/sbin/
-	mv "$pkgdir"/sbin/dhclient-script "$subpkgdir"/sbin/
+	amove etc/dhcp/dhclient.conf*
+	amove usr/sbin/dhclient
+	amove sbin/dhclient-script
 	ln -s ../sbin/dhclient-script "$subpkgdir"/etc/dhclient-script
-	mv "$pkgdir"/etc/dhcp/dhclient.conf* "$subpkgdir"/etc/dhcp/
-}
 
-dhcrelay() {
-	pkgdesc="ISC dhcp relay server"
-	depends="$_depends_dhcrelay"
-	replaces="dhcp"
-
-	install -d "$subpkgdir"/run/dhcp \
-		"$subpkgdir"/usr/sbin
-	mv "$pkgdir"/usr/sbin/dhcrelay "$subpkgdir"/usr/sbin/
+	install -d -o dhcp -g dhcp "$subpkgdir"/var/lib/dhcp
 }
 
-static() {
-	depends="$depends_static"
-	default_static || mkdir -p "$subpkgdir"
-}
+keama() {
+	pkgdesc="KEA Migration Assistant to translate ISC DHCP configurations to Kea"
 
+	amove usr/sbin/keama
+}
 
 # gpg_signature_extensions="sha512.asc"
 # gpgfingerprints="
@@ -177,12 +200,13 @@ static() {
 # 	BE0E 9748 B718 253A 28BB  89FF F1B1 1BF0 5CF0 2E57
 # 	"
 
-sha512sums="c3dee2cf6e4b43d519d4bc89e9b8b12a6e3747d8c4edc0f83d4a88355a483b91a5f7d2353a3c0a2f37f88704fd2f64478ac5161ca72b10c42cebcb92907afa40  dhcp-4.4.2.tar.gz
-17e2b9588ee5d1bd9acb9c2e30f7a28308d29c9e797c2be14c1feff52e6e231ce8a94535f18badff1342aff4ae4003aab986e0f0473f0cd280292fdab044b148  01-dhclient-script-fix-bare-ip.patch
-a70e4a7e80ee65c8ced6b61db80f7ccd0f35015b5cccf2e7c51705ae129230aa49ba9926bb88f7418018e7a112c2a40451f24b88e04464b590ff20091e8d8709  02-dhclient-script-remove-bashisms.patch
+sha512sums="
+d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154  dhcp-4.4.3-P1.tar.gz
+23ab581d85ba97a37fd6a0a612e0aa977b24bbaf83d58a93d1a87f9f24ea9a098aa549e77a6e1d78f721681c152464b15fd1d402d0673edf4dac6aa196df1fe9  fix-unwind-import.patch
 d5697a56fbbff25199962608986e7ffb533ed4afd3e344e3c79d2010dda73cc0b088f06c454e9f0c69eb054e09a374455fa71d3f73306e0c98fa76df4dd321b7  dhcp-3.0-fix-perms.patch
 d1dce58875793316761f168e29feddc1d3454d1d917d063d43ae102b7b6aab256c3cb420478335c57ebcdb2b7c804afa4d8a1f9ab06a29a4dd23bc5d87db8df2  dhclient-script-alpine
-ce62693cb483616844bb6774f9046af6a1a210e35cfaa59ab3bd12f68d50176714a324e92538b35139110b78191866f65b30d6979d8a45f7b68e572e7a1e8427  dhcrelay.initd
-fd15dbaa4c61c3c26f407bf13dde859470a1adba134da064b653ccc152ce42635ee8de2fe113ae21ba8470e97e3caad8c1a47b69eb25e5e92b40e26790b96f6d  dhcrelay.confd
+e672ec030137e870afb817ec0fe4e01a7553f331181e481cba1f032f1e18798dd153bf30105ca8361284e6e11f80435ef7c960b0a11c32c5766c30a0c960550c  dhcrelay.initd
+970ee381dd6a7e0e30d71e28597d17074421ac167b233f597a129ed9b977cba1026375a020dff2613c3f4d458b71ed9fe4447abfcf5edf27b395e6f2b00f0982  dhcrelay.confd
 7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d  dhcpd.confd
-1f78c4f64a891012b4de029c50934b284ad80313959e06b0f29416f33a9e4f0deca8b61e9224a683a92faf8a08e8b7c075bc6e833ab73b6305c0d6d9712d0baf  dhcpd.initd"
+1f78c4f64a891012b4de029c50934b284ad80313959e06b0f29416f33a9e4f0deca8b61e9224a683a92faf8a08e8b7c075bc6e833ab73b6305c0d6d9712d0baf  dhcpd.initd
+"
diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install
index 6aa3de03be6..674cc7ef719 100644
--- a/main/dhcp/dhcp.pre-install
+++ b/main/dhcp/dhcp.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S dhcp 2>/dev/null
-adduser -S -D -h /var/lib/dhcp -s /sbin/nologin -G dhcp -g dhcp dhcp 2>/dev/null
+adduser -S -D -H -h /var/lib/dhcp -s /sbin/nologin -G dhcp -g dhcp dhcp 2>/dev/null
 
 exit 0
diff --git a/main/dhcp/dhcrelay.confd b/main/dhcp/dhcrelay.confd
index 1102d3a41bc..5eccb704a00 100644
--- a/main/dhcp/dhcrelay.confd
+++ b/main/dhcp/dhcrelay.confd
@@ -11,3 +11,6 @@
 
 # Space separated list of IPs to forward BOOTP/DHCP packets to.
 DHCRELAY_SERVERS=""
+
+# vrf e.g 'vrf-int'
+#vrf=""
diff --git a/main/dhcp/dhcrelay.initd b/main/dhcp/dhcrelay.initd
index 2dc6b56cf16..b612008fba6 100644
--- a/main/dhcp/dhcrelay.initd
+++ b/main/dhcp/dhcrelay.initd
@@ -15,6 +15,12 @@ start() {
 		return 1
 	fi
 
+	# If we are configured to run in a VRF, provide a hint for that
+	RC_VRF_EXEC=""
+	if [ -n "$vrf" ]; then
+		RC_VRF_EXEC="/sbin/ip vrf exec $vrf"
+	fi
+
 	local IFACES= i=
 	for i in ${IFACE} ; do
 		IFACES="${IFACES} -i ${i}"
@@ -23,7 +29,7 @@ start() {
 	checkpath --directory --owner dhcp:dhcp /run/dhcp
 
 	ebegin "Starting dhcrelay"
-	start-stop-daemon --start --exec /usr/sbin/dhcrelay \
+	${RC_VRF_EXEC} start-stop-daemon --start --exec /usr/sbin/dhcrelay \
 		-- -q ${IFACES} ${DHCRELAY_OPTS} ${DHCRELAY_SERVERS}
 	eend $?
 }
diff --git a/main/dhcp/dhcrelay.pre-install b/main/dhcp/dhcrelay.pre-install
new file mode 100644
index 00000000000..674cc7ef719
--- /dev/null
+++ b/main/dhcp/dhcrelay.pre-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+addgroup -S dhcp 2>/dev/null
+adduser -S -D -H -h /var/lib/dhcp -s /sbin/nologin -G dhcp -g dhcp dhcp 2>/dev/null
+
+exit 0
diff --git a/main/dhcp/fix-unwind-import.patch b/main/dhcp/fix-unwind-import.patch
new file mode 100644
index 00000000000..8b87fdbd3e3
--- /dev/null
+++ b/main/dhcp/fix-unwind-import.patch
@@ -0,0 +1,16 @@
+bind assumes _Unwind_GetIP is a function which is not necessarily
+true. In some implementations of libunwind it's a macro.
+This fixes the build on Alpine on armhf and armv7.
+
+--- a/bind/bind-9.11.36/lib/isc/backtrace.c
++++ b/bind/bind-9.11.36/lib/isc/backtrace.c
+@@ -81,8 +81,7 @@ isc_backtrace_gettrace(void **addrs, int
+ 	return (ISC_R_SUCCESS);
+ }
+ #elif defined(BACKTRACE_GCC)
+-extern int _Unwind_Backtrace(void* fn, void* a);
+-extern void* _Unwind_GetIP(void* ctx);
++#include <unwind.h>
+ 
+ typedef struct {
+ 	void **result;
diff --git a/main/dhcpcd-dbus/APKBUILD b/main/dhcpcd-dbus/APKBUILD
deleted file mode 100644
index 7536c0f8f07..00000000000
--- a/main/dhcpcd-dbus/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-# Contributor: Valery Kartel <valery.kartel@gmail.com>
-pkgname=dhcpcd-dbus
-pkgver=0.6.1
-pkgrel=4
-pkgdesc="DBUS binding to dhcpcd"
-url="https://roy.marples.name/projects/dhcpcd"
-arch="all"
-license="BSD-2-Clause"
-depends="dbus"
-makedepends="dbus-dev"
-source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2
-	fix-dhcpcd.patch"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--rundir=/run \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib/$pkgname
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="ec110654115afedead094c6766877e7b3f5facbfec6778590d8aa3ceef777b183754fc077a10cf5c16b39c03e42d5948abd7c21e1d8a2d7fa376ec229bd75e6a  dhcpcd-dbus-0.6.1.tar.bz2
-89667704e357efc904ad16e2485bc35e7d99b1c978407db6363a207ade5d0bc68f7165d7a2a352bbba4e53812b3584c23fe6e5b0f981aa6333ec4eae27748d73  fix-dhcpcd.patch"
diff --git a/main/dhcpcd-dbus/fix-dhcpcd.patch b/main/dhcpcd-dbus/fix-dhcpcd.patch
deleted file mode 100644
index 13e4f511617..00000000000
--- a/main/dhcpcd-dbus/fix-dhcpcd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/dhcpcd.c
-+++ b/dhcpcd.c
-@@ -664,7 +664,7 @@
- 	return list;
- }
- 
--#ifndef __GLIBC__
-+#ifndef _GNU_SOURCE
- /* Good enough for our needs */
- static int
- strverscmp(const char *s1, const char *s2)
---- a/dhcpcd.h
-+++ b/dhcpcd.h
-@@ -28,6 +28,8 @@
- #ifndef DHCPCD_H
- #define DHCPCD_H
- 
-+#include <sys/types.h>
-+
- extern char *dhcpcd_version;
- extern const char *dhcpcd_status;
- 
diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index 0982ae810e4..38d7d6ef8b5 100644
--- a/main/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
@@ -2,23 +2,22 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dhcpcd
-pkgver=8.1.6
+pkgver=10.0.6
 pkgrel=0
 pkgdesc="RFC2131 compliant DHCP client"
 url="https://roy.marples.name/projects/dhcpcd"
 arch="all"
 license="BSD-2-Clause"
-makedepends="linux-headers bsd-compat-headers dbus-dev"
-install="$pkgname.post-upgrade"
+makedepends="linux-headers bsd-compat-headers"
+install="$pkgname.post-upgrade $pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-openrc"
-source="https://roy.marples.name/downloads/dhcpcd/dhcpcd-$pkgver.tar.xz
+source="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v$pkgver/dhcpcd-$pkgver.tar.xz
 	busybox-logger.patch
 	fix-chrony-conf-location.patch
 	dhcpcd.initd
-	musl.patch
 	"
+
 build() {
-	CFLAGS="$CFLAGS -D_GNU_SOURCE -DHAVE_PRINTF_M"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,8 +26,11 @@ build() {
 		--localstatedir=/var \
 		--libexecdir=/usr/lib/$pkgname \
 		--dbdir=/var/lib/$pkgname \
-		--rundir=/run \
+		--rundir=/run/dhcpcd \
+		--runstatedir=/run/dhcpcd \
 		--enable-ipv6 \
+		--enable-privsep \
+		--enable-seccomp \
 		--without-dev \
 		--without-udev
 	make
@@ -44,8 +46,9 @@ package() {
 		"$pkgdir"/etc/init.d/dhcpcd
 }
 
-sha512sums="f4d7ea5f4c139a2735e795e13be68f6edac89d86d97589c2cdd67f89b890a093675dcc207c681332e2163b1094da8ce75bda2ee614c19bafd01410d9fadf19df  dhcpcd-8.1.6.tar.xz
-692b2c8c75166fabd512a7cc69c650f9391e0f682ce9cbe1771bfa44e82dcf09e322c46493c45ca75000f479d3cddde306754ba31d28a798a15e2b79a56045f0  busybox-logger.patch
+sha512sums="
+403d612080c6f1397003dc6a16f59bb5d1d3d3479e3656c598acde4c4aafe1cfa374725c5ae3dddb4972c0f23ffd55d04c3703b97bed5b7060855b61b7738004  dhcpcd-10.0.6.tar.xz
+b6bdaac9fc0d5d2d7e8c5e30d1a45db1cff2284d01f92f8821b2f03aaff4e0dbd8cbfbced96d8d9d934dc11f22b792a8345d634d8e4e3b84f43016b7e866e302  busybox-logger.patch
 1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5  fix-chrony-conf-location.patch
-d4610be2b694ae3c7ba2defc4273635b87579c51ae5a74cc4c3ecce66dfc7cb32c4713655ac0324781445c5271fcfdc14b20584b332a2c1e2dbbeaf7ff17b44b  dhcpcd.initd
-082aa80798476917e2a86003cb95136212cbb9b8da986e7d8186d7f3d857e81a4cb03af56296484e035e5006d36c695ef57f571ea9c1fd18b4200a9cf745a6b4  musl.patch"
+7fb44b82a6fa25ee6249fc4835853a4c1fc7d327653efabd9fde303b1f306b3aa6956b2621b55a24fc007ec7ad878ce50e7418ebff0b17fece76e2fdd9e5190d  dhcpcd.initd
+"
diff --git a/main/dhcpcd/busybox-logger.patch b/main/dhcpcd/busybox-logger.patch
index f1b913931b0..220b914bcb9 100644
--- a/main/dhcpcd/busybox-logger.patch
+++ b/main/dhcpcd/busybox-logger.patch
@@ -1,9 +1,11 @@
+diff --git a/hooks/dhcpcd-run-hooks.in b/hooks/dhcpcd-run-hooks.in
+index 91df64b..c6fb8c6 100644
 --- a/hooks/dhcpcd-run-hooks.in
 +++ b/hooks/dhcpcd-run-hooks.in
-@@ -179,7 +179,7 @@
+@@ -179,7 +179,7 @@ syslog()
  	*)		echo "$interface: $*";;
  	esac
- 	if type logger >/dev/null 2>&1; then
+ 	if command -v logger >/dev/null 2>&1; then
 -		logger -i -p daemon."$lvl" -t dhcpcd-run-hooks "$interface: $*"
 +		logger -p daemon."$lvl" -t dhcpcd-run-hooks "$interface: $*"
  	fi
diff --git a/main/dhcpcd/dhcpcd.initd b/main/dhcpcd/dhcpcd.initd
index 58c405c65de..bcefb601d6c 100644
--- a/main/dhcpcd/dhcpcd.initd
+++ b/main/dhcpcd/dhcpcd.initd
@@ -1,13 +1,11 @@
 #!/sbin/openrc-run
 
-supervisor=supervise-daemon
-
-name="DHCP Client Daemon"
 description="DHCP Client Daemon"
 
-command=/sbin/dhcpcd
-command_args_foreground="-B"
-command_args="-q ${command_args:-}"
+command="/sbin/dhcpcd"
+command_args="-q -B ${command_args:-}"
+command_background="true"
+pidfile="/run/dhcpcd/pid"
 
 depend() {
 	provide net
@@ -16,3 +14,7 @@ depend() {
 	after bootmisc modules
 	before dns
 }
+
+start_pre() {
+	checkpath -d /run/dhcpcd
+}
diff --git a/main/dhcpcd/dhcpcd.pre-install b/main/dhcpcd/dhcpcd.pre-install
new file mode 100644
index 00000000000..e69b5e9bd92
--- /dev/null
+++ b/main/dhcpcd/dhcpcd.pre-install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+user=dhcpcd
+group=dhcpcd
+
+addgroup -S $group 2>/dev/null
+adduser -S -D -h /var/lib/$user -s /sbin/nologin -G $group -g $user $user 2>/dev/null
+
+exit 0
diff --git a/main/dhcpcd/musl.patch b/main/dhcpcd/musl.patch
deleted file mode 100644
index 9de5163db70..00000000000
--- a/main/dhcpcd/musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Include linux/if_tun.h after netinet/if_tun.h to avoid redefinition of struct ethhdr
-
-diff --git a/src/if-linux.c b/src/if-linux.c
-index fd47278..cca4e36 100644
---- a/src/if-linux.c
-+++ b/src/if-linux.c
-@@ -37,7 +37,6 @@
- #include <linux/if_addr.h>
- #include <linux/if_link.h>
- #include <linux/if_packet.h>
--#include <linux/if_tun.h>
- #include <linux/if_vlan.h>
- #include <linux/filter.h>
- #include <linux/netlink.h>
-@@ -51,6 +50,8 @@
- #include <netinet/in.h>
- #include <net/route.h>
- 
-+#include <linux/if_tun.h>
-+
- #include <errno.h>
- #include <fcntl.h>
- #include <ctype.h>
-
diff --git a/main/dialog/APKBUILD b/main/dialog/APKBUILD
index dce859f9936..90a8ee6e3b9 100644
--- a/main/dialog/APKBUILD
+++ b/main/dialog/APKBUILD
@@ -1,13 +1,12 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dialog
-pkgver=1.3.20200327
+pkgver=1.3.20240307
 _pkgver=${pkgver%.*}-${pkgver##*.}
 pkgrel=0
 pkgdesc="Script interpreter providing curses widgets"
 url="https://invisible-island.net/dialog/dialog.html"
 arch="all"
-options="!check"  # No test suite.
 license="LGPL-2.1-only"
 makedepends="ncurses-dev"
 subpackages="$pkgname-doc $pkgname-static"
@@ -26,16 +25,14 @@ build() {
 	make
 }
 
-package() {
-	make DESTDIR="$pkgdir" install
+check() {
+	make check
 }
 
-static() {
-	pkgdesc="$pkgdesc (static library)"
-	depends=""
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
+package() {
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c8c7ccd86fa189a2b6739320f59f127512e53f908ed257280099f8c45754da98d2095835d0c14090cd071af0ed6e8ff95f9938f5ca8027b0b7001c7fd746fe59  dialog-1.3-20200327.tgz"
+sha512sums="
+a3d3c4c2a9fb45f1a06ca1789e92913072c5401af9d90b362cbaaf5d35bff97f16186da20de32a7c8eec24638be15983916978615db06c1b33abd34a180ea461  dialog-1.3-20240307.tgz
+"
diff --git a/main/diffutils/APKBUILD b/main/diffutils/APKBUILD
index 0b9d0c1a93f..756124081c6 100644
--- a/main/diffutils/APKBUILD
+++ b/main/diffutils/APKBUILD
@@ -1,29 +1,18 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=diffutils
-pkgver=3.7
+pkgver=3.10
 pkgrel=0
 pkgdesc="Show differences among files"
 subpackages="$pkgname-doc"
 url="https://www.gnu.org/software/diffutils/"
 arch="all"
 license="GPL-3.0-or-later"
-source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz
-	disable-mbrtowc-test.patch
-	"
-builddir=$srcdir/$pkgname-$pkgver
-options="!check"	# fails on hardened kernels
-
-prepare() {
-	cd "$builddir"
-	default_prepare
-
-	# fix eglibc-2.16 build issue
-	sed -i -e '/gets is a/d' \
-		lib/stdio.in.h
-}
+checkdepends="perl"
+source="https://ftp.gnu.org/pub/gnu/diffutils/diffutils-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
+	CFLAGS="$CFLAGS -flto=auto" \
+	CXXFLAGS="$CXXFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -35,17 +24,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make install DESTDIR=$pkgdir
-
-	rm -rf "$pkgdir"/usr/lib/charset.alias
-	rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
 }
 
-sha512sums="7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c  diffutils-3.7.tar.xz
-2602dabf0ac52a273b84160032416613da7ad111541fe25466cf9d4ce1eb2630f0ba0cb0b3013967965d8359a11a5f390f0486b4526b35516d9de1c8975f720d  disable-mbrtowc-test.patch"
+sha512sums="
+219d2c815a120690c6589846271e43aee5c96c61a7ee4abbef97dfcdb3d6416652ed494b417de0ab6688c4322540d48be63b5e617beb6d20530b5d55d723ccbb  diffutils-3.10.tar.xz
+"
diff --git a/main/diffutils/disable-mbrtowc-test.patch b/main/diffutils/disable-mbrtowc-test.patch
deleted file mode 100644
index 1461a409398..00000000000
--- a/main/diffutils/disable-mbrtowc-test.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- diffutils-3.6/gnulib-tests/test-mbrtowc5.sh.old	2016-12-31 13:54:43.000000000 +0000
-+++ diffutils-3.6/gnulib-tests/test-mbrtowc5.sh	2017-07-30 17:29:50.879924130 +0000
-@@ -1,6 +1,2 @@
- #!/bin/sh
--# Test whether the POSIX locale has encoding errors.
--LC_ALL=C \
--./test-mbrtowc${EXEEXT} 5 || exit
--LC_ALL=POSIX \
--./test-mbrtowc${EXEEXT} 5
-+exit 77
diff --git a/main/directfb/0001-directfb-fix-musl-compile.patch b/main/directfb/0001-directfb-fix-musl-compile.patch
deleted file mode 100644
index b5de895e7f1..00000000000
--- a/main/directfb/0001-directfb-fix-musl-compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/direct/os/linux/glibc/system.c
-+++ b/lib/direct/os/linux/glibc/system.c
-@@ -111,7 +111,7 @@ direct_tgkill( int tgid, int tid, int sig )
- void
- direct_trap( const char *domain, int sig )
- {
--     sigval_t val;
-+     union sigval val;
-
-      if (direct_config->delay_trap_ms) {
-           D_LOG( Direct_Trap, VERBOSE, "NOT RAISING signal %d from %s, waiting for %dms... attach gdb --pid=%d\n", sig, domain, direct_config->delay_trap_ms, getpid() );
diff --git a/main/directfb/0002-Fix-musl-PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP-comp.patch b/main/directfb/0002-Fix-musl-PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP-comp.patch
deleted file mode 100644
index 03b087fc2c1..00000000000
--- a/main/directfb/0002-Fix-musl-PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP-comp.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/lib/direct/os/linux/glibc/mutex.h
-+++ b/lib/direct/os/linux/glibc/mutex.h
-@@ -46,7 +46,6 @@ struct __D_DirectMutex {
- /**********************************************************************************************************************/
-
- #define DIRECT_MUTEX_INITIALIZER(name)            { PTHREAD_MUTEX_INITIALIZER }
--#define DIRECT_RECURSIVE_MUTEX_INITIALIZER(name)  { PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP }
-
- #endif
-
---- a/lib/direct/trace.c
-+++ b/lib/direct/trace.c
-@@ -89,7 +89,7 @@ struct __D_DirectTraceBuffer {
- /**************************************************************************************************/
-
- static DirectLink  *buffers;
--static DirectMutex  buffers_lock = DIRECT_RECURSIVE_MUTEX_INITIALIZER(buffers_lock);
-+static DirectMutex  buffers_lock = DIRECT_MUTEX_INITIALIZER(buffers_lock);
-
- /**************************************************************************************************/
-
---- a/src/directfb.c
-+++ b/src/directfb.c
-@@ -163,6 +163,15 @@ DirectFBSetOption( const char *name, const char *value )
-      return DFB_OK;
- }
-
-+
-+static pthread_once_t lock_init_once = PTHREAD_ONCE_INIT;
-+static DirectMutex lock;
-+
-+static void lock_init(void)
-+{
-+    direct_recursive_mutex_init(&lock);
-+}
-+
- /*
-  * Programs have to call this to get the super interface
-  * which is needed to access other functions
-@@ -215,7 +224,7 @@ DirectFBCreate( IDirectFB **interface_ptr )
-      if (dfb_config->remote.host)
-           return CreateRemote( dfb_config->remote.host, dfb_config->remote.port, interface_ptr );
-
--     static DirectMutex lock = DIRECT_RECURSIVE_MUTEX_INITIALIZER(lock);
-+     pthread_once(&lock_init_once, lock_init);
-
-      direct_mutex_lock( &lock );
diff --git a/main/directfb/0003-remove-set-gamma-ramp.patch b/main/directfb/0003-remove-set-gamma-ramp.patch
deleted file mode 100644
index 652c5a16835..00000000000
--- a/main/directfb/0003-remove-set-gamma-ramp.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/systems/fbdev/fbdev.c
-+++ b/systems/fbdev/fbdev.c
-@@ -2327,14 +2327,18 @@ dfb_fbdev_set_gamma_ramp( DFBSurfacePixelFormat format )
-           for (i = 0; i < blue_size; i++)
-                cmap->blue[i] |= cmap->blue[i] << 8;
-      }
--
-+     /*
-+      * Commenting out section setting gamma ramp
-+      * per: http://directfb-users.directfb.narkive.com/fUkXSRmm/hello
-+      */
-+     /*
-      if (FBDEV_IOCTL( FBIOPUTCMAP, cmap ) < 0) {
-           D_PERROR( "DirectFB/FBDev: "
-                      "Could not set gamma ramp" );
- 
-           return errno2result(errno);
-      }
--
-+     */
-      return DFB_OK;
- }
- 
diff --git a/main/directfb/0004-disable-fusion_dispatch.patch b/main/directfb/0004-disable-fusion_dispatch.patch
deleted file mode 100644
index 900f9bbb934..00000000000
--- a/main/directfb/0004-disable-fusion_dispatch.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/core/core.c b/src/core/core.c
-index 6676bee..933f0fc 100644
---- a/src/core/core.c
-+++ b/src/core/core.c
-@@ -1737,7 +1737,7 @@ dfb_core_shutdown( CoreDFB *core, bool emergency )
-      dfb_gfx_cleanup();
- 
-      while (loops--) {
--          fusion_dispatch( core->world, 16384 );
-+          //fusion_dispatch( core->world, 16384 );
- 
-           ret = dfb_core_wait_all( core, 10000 );
-           if (ret == DFB_OK)
diff --git a/main/directfb/0005-fix-tslib-configure.patch b/main/directfb/0005-fix-tslib-configure.patch
deleted file mode 100644
index d612ee93c81..00000000000
--- a/main/directfb/0005-fix-tslib-configure.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -2459,9 +2459,9 @@
- 
- enable_tslib=no
- if test "$checkfor_tslib" = "yes"; then
--  PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0.0], [enable_tslib=yes], [enable_tslib=no])
-+  PKG_CHECK_MODULES([TSLIB], [tslib >= 1.0.0], [enable_tslib=yes], [enable_tslib=no])
-   if test "$enable_tslib" = "no"; then
--     PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no
-+     PKG_CHECK_MODULES([TSLIB], [tslib], [enable_tslib=yes], [enable_tslib=no
-        AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])])
-   fi
- fi
diff --git a/main/directfb/0006-fix-client-gfx_state-initialisation.patch b/main/directfb/0006-fix-client-gfx_state-initialisation.patch
deleted file mode 100644
index 5b7a202ca3c..00000000000
--- a/main/directfb/0006-fix-client-gfx_state-initialisation.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8e53c0b9cedb62b82e2b7680d793d433b647ae20 Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <armccurdy@gmail.com>
-Date: Mon, 13 Jun 2016 13:32:44 -0700
-Subject: [PATCH] fix client->gfx_state initialisation
-
-Shortly before the DirectFB 1.7.7 release, an optimisation was added
-to CoreGraphicsStateClient_Init() to avoid creating an extended
-Graphics State object if it will not later be required:
-
-  4d422fb Client: Create extended Graphics State object when needed for later usage
-
-Unfortunately the client->gfx_state variable used to track the
-extended Graphics State object is not initialised, which can lead to
-crashes etc due to creation of the Graphics State object erroneously
-being skipped.
-
-Upstream-Status: Pending
-
-Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
-Signed-off-by: Philippe Reynes <philippe.reynes@sagemcom.com>
----
- src/core/CoreGraphicsStateClient.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/core/CoreGraphicsStateClient.cpp b/src/core/CoreGraphicsStateClient.cpp
-index 5d46f0e..5007755 100644
---- a/src/core/CoreGraphicsStateClient.cpp
-+++ b/src/core/CoreGraphicsStateClient.cpp
-@@ -364,6 +364,7 @@ CoreGraphicsStateClient_Init( CoreGraphicsStateClient *client,
-      client->renderer  = NULL;
-      client->requestor = NULL;
-      client->throttle  = NULL;
-+     client->gfx_state = NULL;
- 
-      if (dfb_config->task_manager) {
-           if (dfb_config->call_nodirect) {
--- 
-1.9.1
-
diff --git a/main/directfb/0007-tslib-Automatically-detect-touchscreens-using-ts_setup.patch b/main/directfb/0007-tslib-Automatically-detect-touchscreens-using-ts_setup.patch
deleted file mode 100644
index d84cc93e06b..00000000000
--- a/main/directfb/0007-tslib-Automatically-detect-touchscreens-using-ts_setup.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/inputdrivers/tslib/tslib.c b/inputdrivers/tslib/tslib.c
-index a06cd68c6..8d355a804 100644
---- a/inputdrivers/tslib/tslib.c
-+++ b/inputdrivers/tslib/tslib.c
-@@ -152,6 +152,7 @@ driver_get_available(void)
- {
-      int   i;
-      char *tsdev;
-+     struct tsdev *ts;
- 
-      /* Use the devices specified in the configuration. */
-      if (fusion_vector_has_elements( &dfb_config->tslib_devices )) {
-@@ -168,10 +169,15 @@ driver_get_available(void)
-           return num_devices;
-      }
- 
--     /* Check for environment variable. */
--     tsdev = getenv( "TSLIB_TSDEVICE" );
--     if (tsdev && check_device( tsdev ))
-+     /* Ask tslib for a device (TSLIB_TSDEVICE is checked in ts_setup) */
-+     ts = ts_setup( NULL, 0 );
-+     if (ts) {
-+          /* No need to check_device() - already done by tslib */
-+          tsdev = ts_get_eventpath( ts );
-+          D_INFO( "DirectFB/tslib: Found touchscreen: '%s'\n", tsdev );
-           device_names[num_devices++] = D_STRDUP( tsdev );
-+          ts_close( ts );
-+     }
- 
-      /* Try to guess some (more) devices. */
-      for (i = 0; i < MAX_TSLIB_DEVICES; i++) {
diff --git a/main/directfb/APKBUILD b/main/directfb/APKBUILD
deleted file mode 100644
index 3b069d25d7f..00000000000
--- a/main/directfb/APKBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# Contributor: Clayton Craft <clayton@craftyguy.net>
-# Maintainer: Clayton Craft <clayton@craftyguy.net>
-pkgname=directfb
-pkgver=1.7.7
-pkgrel=2
-pkgdesc="Library for hw graphics acceleration, input dev, windowing system on top of the Linux fb device"
-arch="all"
-url="https://github.com/DirectFB/directfb"
-license="LGPL-2.0-or-later"
-makedepends="zlib-dev freetype-dev libdrm-dev libpng-dev perl tslib tslib-dev autoconf automake libtool"
-subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
-builddir="$srcdir/DirectFB-$pkgver"
-source="
-	http://sources.webos-ports.org/DirectFB-$pkgver.tar.gz
-	0001-directfb-fix-musl-compile.patch
-	0002-Fix-musl-PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP-comp.patch
-	0003-remove-set-gamma-ramp.patch
-	0004-disable-fusion_dispatch.patch
-	0005-fix-tslib-configure.patch
-	0006-fix-client-gfx_state-initialisation.patch
-	0007-tslib-Automatically-detect-touchscreens-using-ts_setup.patch
-	"
-
-prepare() {
-	default_prepare
-	autoconf
-}
-
-build() {
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--enable-static \
-		--disable-zlib \
-		--disable-x11 \
-		--enable-fbdev \
-		--disable-vnc \
-		--disable-osx \
-		--disable-mesa \
-		--enable-drmkms \
-		--enable-freetype \
-		--with-inputdrivers=input_hub,keyboard,linuxinput,ps2mouse,serialmouse,tslib \
-		--with-gfxdrivers=omap
-	make
-}
-
-check() {
-	make check
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="c9ce8ffe7d7d17b0351da6a031db7345f31fb7112545f9352834ad33225a93e6284ef0e576ef5fc595bc9060c1756051322fa20f7b5b3444b68d7f05bd1ba494  DirectFB-1.7.7.tar.gz
-d9325c228a534d2d2b93b4dacf896fc12c703b9e08adf1ae8f5baea2a0ed5c4d07d56b8bc63dc605362f093624eab40686b43028ef15a78a01bc10e5f41c16bc  0001-directfb-fix-musl-compile.patch
-ed3bf9bf76616174aca6ae92fd9873c9452951b8a2acb60e1ccbbea0c4a7c9766e510899bc8f58c24dd5888c1e7e1f0a0d4a823f0bd9e03a4c9d2a54fb714221  0002-Fix-musl-PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP-comp.patch
-bd1d0738c48411e8e065b8a250c1b31334ac65b26a8f6c91d5ad167a4d8fdac1de862c05940567e48fc740dd45fbecf906ebdfbff63420d4f86bee7a3a0746ee  0003-remove-set-gamma-ramp.patch
-d68002702f3521a71405bb403b874dced5b123a2de037c9eb05667123a578c0e9a9f13a822fd8d77e31a83f1e1cc8df1d8511f7d2f427688d5ef6ae0fff448c5  0004-disable-fusion_dispatch.patch
-c768ca7a4dae7fc0cd7d4fa559ab74adb6b5f21245e0f9b5d56af15b20effc04e6739e86d52d65c902c5e76ad72e966cd9db68f57a9bad11a004525825d443a4  0005-fix-tslib-configure.patch
-6b118928c2ebe58654e1bf32433b084f4dc150526eec1b53f9eb4b856aee25733bd8d6114fde973fcb64416e4146f458cdb75e5836d7507cf802b84e44544462  0006-fix-client-gfx_state-initialisation.patch
-43000c629eb24bd6b88d284dc010ea5a2a3facbf9498ab752127c25a890fd52b9a29a09d46264befea9fef19dcfe6f24d6cefa103a68d4c2ab185b6142a5c1b9  0007-tslib-Automatically-detect-touchscreens-using-ts_setup.patch"
diff --git a/main/distcc/APKBUILD b/main/distcc/APKBUILD
index 1c9e4515c10..110950fb09c 100644
--- a/main/distcc/APKBUILD
+++ b/main/distcc/APKBUILD
@@ -1,25 +1,29 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=distcc
-pkgver=3.3.3
-pkgrel=0
+pkgver=3.4
+pkgrel=9
 pkgdesc="Ddistributed C, C++, Obj C compiler"
 url="https://github.com/distcc/distcc"
 arch="all"
-license="GPL-2.0"
-makedepends="autoconf automake popt-dev python3-dev"
+license="GPL-2.0-or-later"
+_pump_deps="python3 py3-setuptools"
+makedepends="autoconf automake popt-dev python3-dev $_pump_deps"
 checkdepends="gdb procps"
 options="!check" # tests are failing
 install="$pkgname.pre-install"
-subpackages="$pkgname-doc $pkgname-pump"
+subpackages="$pkgname-doc $pkgname-pump-pyc $pkgname-pump $pkgname-openrc"
 source="https://github.com/distcc/distcc/releases/download/v$pkgver/distcc-$pkgver.tar.gz
 	distcc-hardened.patch
+	gcc-10.patch
+	dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
 	distccd.initd
 	distccd.confd
 	"
 
 prepare() {
 	default_prepare
+	update_config_sub
 
 	./autogen.sh
 }
@@ -58,12 +62,17 @@ package() {
 
 pump() {
 	pkgdesc="pump mode for distcc a distributed compiler client and server"
+	depends="$_pump_deps distcc=$pkgver-r$pkgrel"
 	mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/pump "$subpkgdir"/usr/bin/
 	mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="d5e7fc67f49ee640cef753038b5c0ebcbbac61c6ac29f20ee4736b045a89979ced765717c46383a4fadc50a4fe34e94e58e307509144414a9ca19eb4cc68a135  distcc-3.3.3.tar.gz
-d1150dc83bf89c332f8c0bd01e15f52f95d71868733bd2e5430a5377f1a4aaa2b5b6e0cd488d33d9b94ce18b0eeeadf4af719db536b001b50e4d482b35c7e057  distcc-hardened.patch
-3c58be08242de09f76876b20a0c6643a3a76a088c356484cb091253b7e4dddb20008d071d8e5d1a66acbc5bfe4d8a59284a6d7f225ca2006e8a8b3c698e71026  distccd.initd
-fbb12522e489243475c735e055a72a19b176f1ad736dc810e1f085d8d9d79460ac7590a92bb9563f8b316437f67f6ca729330253f007d06011144a66fede5465  distccd.confd"
+sha512sums="
+de09329fdfa25e08a9b9529190ddaa9ceccb34c8655692edb86f367a8db4a71b750c6e928cb8e5a670f51fbbc02fd1c8524f72e01b3ebaacc1106dc676d18eef  distcc-3.4.tar.gz
+b53a0d6038504917fd41f549da4f5addaff6ebd198a5d9d3ee8d4654f843aab375da4017b40efe24b9d4c9881719030485e4f56724690ba271fb52dc48249a44  distcc-hardened.patch
+4e55e0acda58e6f273c74e9d617de1a121debf820e915cf8aeb4d80907d427a058466bb2fd9126602aea7f861fd5fa1c2bede15e2a512923bc61e3ef163430d4  gcc-10.patch
+9bc411107021d5f621304a73b0bfdec387d1b33121a325503cf4c9c4046924338ee1b4ef093b517249c3df31cf69cd9f19377df2edd6e81be1dac50a5bd0f3d5  dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
+32d6669955754b004db8716c321703fcb50da31d8dfc1288b021834fe968e5f7c9eb40d8af34eba9b59becc07e315f65127d711bb0bc49df41c6b4b973864855  distccd.initd
+fbb12522e489243475c735e055a72a19b176f1ad736dc810e1f085d8d9d79460ac7590a92bb9563f8b316437f67f6ca729330253f007d06011144a66fede5465  distccd.confd
+"
diff --git a/main/distcc/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch b/main/distcc/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
new file mode 100644
index 00000000000..5d0a86d2f1a
--- /dev/null
+++ b/main/distcc/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
@@ -0,0 +1,65 @@
+commit 879b71d6e95673e58d33f6c3c341a893ee307161
+Author: Alexey Sheplyakov <asheplyakov@yandex.ru>
+Date:   Sat Jul 10 22:18:14 2021 +0400
+
+    dcc_gcc_rewrite_fqn: avoid heap corruption
+    
+    On ALT Linux I've run into the following bug:
+    
+    distcc gcc -Wall -std=gnu89 -I. -O2 -o hello.o -c hello.c
+    free(): invalid next size (fast)
+    Aborted (core dumped)
+    
+    Apparently dcc_gcc_rewrite writes beyond the allocated memory:
+    
+    valgrind --leak-check=full -v ./distcc gcc -Wall -std=gnu89 -I. -O2 -o hello.o -c hello.c
+    
+    ==11382== ERROR SUMMARY: 53 errors from 5 contexts (suppressed: 0 from 0)
+    ==11382==
+    ==11382== 1 errors in context 1 of 5:
+    ==11382== Invalid write of size 1
+    ==11382==    at 0x4C349D8: strcat (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+    ==11382==    by 0x10D165: dcc_gcc_rewrite_fqn (compile.c:611)
+    ==11382==    by 0x10D4B4: dcc_build_somewhere (compile.c:725)
+    ==11382==    by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014)
+    ==11382==    by 0x10E380: main (distcc.c:352)
+    ==11382==  Address 0x544e828 is 1 bytes after a block of size 23 alloc'd
+    ==11382==    at 0x4C31B0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+    ==11382==    by 0x10D087: dcc_gcc_rewrite_fqn (compile.c:588)
+    ==11382==    by 0x10D4B4: dcc_build_somewhere (compile.c:725)
+    ==11382==    by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014)
+    ==11382==    by 0x10E380: main (distcc.c:352)
+    ==11382==
+    ==11382==
+    ==11382== 1 errors in context 2 of 5:
+    ==11382== Invalid write of size 1
+    ==11382==    at 0x4C349C8: strcat (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+    ==11382==    by 0x10D165: dcc_gcc_rewrite_fqn (compile.c:611)
+    ==11382==    by 0x10D4B4: dcc_build_somewhere (compile.c:725)
+    ==11382==    by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014)
+    ==11382==    by 0x10E380: main (distcc.c:352)
+    ==11382==  Address 0x544e827 is 0 bytes after a block of size 23 alloc'd
+    ==11382==    at 0x4C31B0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+    ==11382==    by 0x10D087: dcc_gcc_rewrite_fqn (compile.c:588)
+    ==11382==    by 0x10D4B4: dcc_build_somewhere (compile.c:725)
+    ==11382==    by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014)
+    ==11382==    by 0x10E380: main (distcc.c:352)
+    
+    and ALT Linux' hardened glibc does not quite like that.
+    Correctly compute the `newcmd_len` to avoid the problem.
+    
+    ALTBUG: #40425
+
+diff --git a/src/compile.c b/src/compile.c
+index 34964566fdd6..26d7d1821501 100644
+--- a/src/compile.c
++++ b/src/compile.c
+@@ -584,7 +584,7 @@ static int dcc_gcc_rewrite_fqn(char **argv)
+         return -ENOENT;
+ 
+ 
+-    newcmd_len = strlen(target_with_vendor) + 1 + strlen(argv[0] + 1);
++    newcmd_len = strlen(target_with_vendor) + 1 + strlen(argv[0]) + 1;
+     newcmd = malloc(newcmd_len);
+     if (!newcmd)
+         return -ENOMEM;
diff --git a/main/distcc/distcc-hardened.patch b/main/distcc/distcc-hardened.patch
index 69b3a651693..c50b15d7664 100644
--- a/main/distcc/distcc-hardened.patch
+++ b/main/distcc/distcc-hardened.patch
@@ -10,7 +10,7 @@ the distccd host applies all kinds of flags that it shouldn't.
 
 --- distcc-2.18.3/src/strip.c
 +++ distcc-2.18.3-hardened/src/strip.c
-@@ -73,7 +73,10 @@ int dcc_strip_local_args(char **from, ch
+@@ -79,7 +79,10 @@ int dcc_strip_local_args(char **from, ch
      /* skip through argv, copying all arguments but skipping ones that
       * ought to be omitted */
      for (from_i = to_i = 0; from[from_i]; from_i++) {
diff --git a/main/distcc/distccd.initd b/main/distcc/distccd.initd
index d8a18435f1d..c6d8ca13c31 100644
--- a/main/distcc/distccd.initd
+++ b/main/distcc/distccd.initd
@@ -20,6 +20,7 @@ start() {
 #endif
 	
 	ebegin "Starting distccd"
+	checkpath -d /var/run/distccd -m 644 -o distcc
 	chown distcc `dirname ${DISTCCD_PIDFILE}` >/dev/null 2>&1
 	TMPDIR="${TMPDIR}" \
 	/sbin/start-stop-daemon --start --quiet --exec ${DISTCCD_EXEC} \
diff --git a/main/distcc/gcc-10.patch b/main/distcc/gcc-10.patch
new file mode 100644
index 00000000000..599de51e0d9
--- /dev/null
+++ b/main/distcc/gcc-10.patch
@@ -0,0 +1,15 @@
+Upstream: Should be
+Reason: Fixes compilation under gcc-10 which has -fno-common
+
+diff --git a/src/stats.c b/src/stats.c
+index 35dbf7d..76bfbee 100644
+--- a/src/stats.c
++++ b/src/stats.c
+@@ -82,7 +82,7 @@ struct statsdata {
+     char compiler[MAX_FILENAME_LEN];
+ };
+ 
+-const char *stats_text[20] = { "TCP_ACCEPT", "REJ_BAD_REQ", "REJ_OVERLOAD",
++extern const char *stats_text[20] = { "TCP_ACCEPT", "REJ_BAD_REQ", "REJ_OVERLOAD",
+     "COMPILE_OK", "COMPILE_ERROR", "COMPILE_TIMEOUT", "CLI_DISCONN",
+     "OTHER" };
diff --git a/main/djbdns/APKBUILD b/main/djbdns/APKBUILD
index e0ee5b26184..325f7035fed 100644
--- a/main/djbdns/APKBUILD
+++ b/main/djbdns/APKBUILD
@@ -1,18 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=djbdns
 pkgver=1.05
-pkgrel=47
+pkgrel=53
 pkgdesc="Excellent high-performance DNS services"
 url="http://cr.yp.to/djbdns.html"
 arch="all"
 license="Public-Domain"
-subpackages="djbdns-common tinydns dnscache $pkgname-doc"
-source="https://cr.yp.to/djbdns/$pkgname-$pkgver.tar.gz
+subpackages="djbdns-common tinydns tinydns-openrc:tinydns_openrc dnscache
+	dnscache-openrc:dnscache_openrc $pkgname-doc"
+source="https://cr.yp.to/djbdns/djbdns-$pkgver.tar.gz
 https://www.fefe.de/dns/djbdns-1.05-test25.diff.bz2
 	headtail.patch
 	dnsroots.patch
 	dnstracesort.patch
 	djbdns-1.05-jumbo-josb.patch
+	implicit.patch
 	$pkgver-errno.patch
 	$pkgver-response.patch
 	tinydns.pre-install
@@ -22,33 +24,30 @@ https://www.fefe.de/dns/djbdns-1.05-test25.diff.bz2
 	dnscache.confd
 	dnscache.monthly
 	"
+options="!check"
 
-builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	default_prepare
-	cd "$builddir"
 	# remove all the generated headers. they came with the jumbo patch and should
 	# never have been there...
 	sed -n 's/^\([a-z0-9]\+\.h\):.*/\1/gp' Makefile Makefile.sig | xargs rm -f
 }
 
 build() {
-	cd "$builddir"
-	echo "${CC:-"gcc"} ${CFLAGS}" > conf-cc
-	echo "${CC:-"gcc"} ${LDFLAGS}" > conf-ld
+	# sigsetmask
+	export CFLAGS="$CFLAGS -DHASSIGPROCMASK"
+	echo "${CC:-"gcc"} $CFLAGS" > conf-cc
+	echo "${CC:-"gcc"} $LDFLAGS" > conf-ld
 	echo "/usr" > conf-home
 	make -j1
 }
 
 package() {
-	cd "$builddir"
-	mkdir -p "$pkgdir"/etc/
-	cp dnsroots.global "$pkgdir"/etc/
-	mkdir -p "$pkgdir"/usr/bin
-	cp *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
+	install -Dm644 dnsroots.global -t "$pkgdir"/etc/
+	install -Dm755 *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
 		*-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
 		dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort \
-		"$pkgdir"/usr/bin/
+		-t "$pkgdir"/usr/bin/
 	mkdir -p "$pkgdir"/usr/share/doc/djbdns
 }
 
@@ -56,18 +55,23 @@ common() {
 	pkgdesc="Base utilities of djbdns"
 	replaces="djbdns"
 
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/dnsqr "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/dnsip "$subpkgdir"/usr/bin
+	amove usr/bin/dnsqr usr/bin/dnsip
 }
 
 tinydns() {
 	pkgdesc="A small and secure DNS server"
 	install=tinydns.pre-install
 
-	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/etc/tinydns \
+	amove usr/bin/tinydns*
+	mkdir -p "$subpkgdir"/etc/tinydns \
 		"$subpkgdir"/var/cache/tinydns
-	mv "$pkgdir"/usr/bin/tinydns* "$subpkgdir"/usr/bin
+}
+
+tinydns_openrc() {
+	depends=
+	pkgdesc="A small and secure DNS server (OpenRC init scripts)"
+	install_if="openrc ${subpkgname%-openrc}=$pkgver-r$pkgrel"
+
 	install -D -m755 "$srcdir"/tinydns.initd \
 		"$subpkgdir"/etc/init.d/tinydns
 	install -D -m644 "$srcdir"/tinydns.confd \
@@ -87,20 +91,29 @@ dnscache() {
 	touch "$subpkgdir"/etc/dnscache/ip/127
 
 	mv "$pkgdir"/usr/bin/dnscache* "$subpkgdir"/usr/bin
+	install -D -m755 "$srcdir"/dnscache.monthly \
+		"$subpkgdir"/etc/periodic/monthly/dnscache-hints-refresh
+}
+
+dnscache_openrc() {
+	depends=
+	pkgdesc="A recursive resolver (OpenRC init scripts)"
+	install_if="openrc ${subpkgname%-openrc}=$pkgver-r$pkgrel"
+
 	install -D -m755 "$srcdir"/dnscache.initd \
 		"$subpkgdir"/etc/init.d/dnscache
 	install -D -m644 "$srcdir"/dnscache.confd \
 		"$subpkgdir"/etc/conf.d/dnscache
-	install -D -m755 "$srcdir"/dnscache.monthly \
-		"$subpkgdir"/etc/periodic/monthly/dnscache-hints-refresh
 }
 
-sha512sums="20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9  djbdns-1.05.tar.gz
+sha512sums="
+20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9  djbdns-1.05.tar.gz
 41cca597dba971010b9844071e0349d3a4b25cc4b144e12721b0bc8250589fb374e40ece8908f1081762597048179b1177e88b9a5f97be0b47b63e3183e654bb  djbdns-1.05-test25.diff.bz2
 be4c9aea40c737364a56f188ad2276d90deac0dffb73ba4b659490836c0fe92ffb65ccf23c6724b913b2d6354336727004be0cf5b43ebc47abe7004700dfe1e8  headtail.patch
 0cd97d833e0aaee2b82ed27b56ce183e9ab9806ff1e77bc61b7f38ae3168aa7310b12d2ed330713c4da97e60881ee339f6af449142cc29823865d87270733211  dnsroots.patch
 ae9cd51f24041aed135b5ba88d1efd0310b8095bccd6fb60a986756b460a4f98a93e163c3ddae7c146d56a9d41778d17449f772b91fdc58d9e69523cf6c2a6e9  dnstracesort.patch
-af7c0a0a2f519ec16ac2a937664b7984aafeb19d04fbd6e0fd0afa5482f3cb0b4ac5cf6a846d574a8591f3cec725b4f828cca95344c3c774cb77ee5630ff6617  djbdns-1.05-jumbo-josb.patch
+7612e79638617806425bf6e601dd797f79a0106c47a31c73c88e2504b14e8f0238bad7dc8af1fbc5b1609bfa38578c556dcba2ce9034673bd07c9bc95789ee04  djbdns-1.05-jumbo-josb.patch
+b8778f8086edc5703fc0f447ad108bda2e029e612f80c39925833566ff8fa12687bb5300b1f0ee738c7180d4f8269ff88c965bef8879dc6eeea8228a598c10ce  implicit.patch
 086d02600034d486f084fd2500aba9041dfa02110781594cdc3781a3ad7823f61f11c54c053c8c1241f58660527abe536906aba0e7f6c49ed3b8dbd74ba8f2b7  1.05-errno.patch
 407207f8387e2344fdebe68ab2213adbd9f1e6034e343b4359c8c1fa6ce36b0878a8367e4ee05cb4a44c199d4956aef0c6c8e84ab4f5556178547346ab88b82d  1.05-response.patch
 20dd227e4f1362136070d914d5ee41082b5f16ee8602ad591e52b02f03ff0531d0589fff4352fc6799a8c192b69a99af1b013f87ee4ddbdffa03715d33e2f5af  tinydns.pre-install
@@ -108,4 +121,5 @@ af7c0a0a2f519ec16ac2a937664b7984aafeb19d04fbd6e0fd0afa5482f3cb0b4ac5cf6a846d574a
 31b52bd4dd0f78ff63e105ff3937fb9bf582628fe7a04bfcba91195d4fc4b55b60869f993a42ef55a228892647af07ed7ea22cfff72812430c7b8207debdd8f1  tinydns.confd
 31bf58ed6a049e02210ce1cbbea00b62e2fe92339cd861eb3ee35f16186a3904e85fcd2f056e2d788b8a284068d83a3767cef01519a6d0152f1958be8e418956  dnscache.initd
 1b281a4892c1c9ad39a15c95d0fbd14b0ada69b31723250e33d96946bd19f3edc4b36ec90fb9b6b884d7907b7e86cc3980f116f16fe35fb7496feffd728b1ffa  dnscache.confd
-70d3431db407d02f145cb1521d563559b536e89a6a88f50cf853036b2833d78b594398df30cc33c17debea23aa6a7112614741e13f8ec5d1429fad075273a9f6  dnscache.monthly"
+19dcd0880a4e43657d05916b96c1ce075e4ba0a9dc0f7085408e92e087e5a9386ff760e76f81c509fe7402aa6fd9580817f590d5a062dca6bf813d73e0e1b95c  dnscache.monthly
+"
diff --git a/main/djbdns/djbdns-1.05-jumbo-josb.patch b/main/djbdns/djbdns-1.05-jumbo-josb.patch
index c1a685aef4f..6db071889ee 100644
--- a/main/djbdns/djbdns-1.05-jumbo-josb.patch
+++ b/main/djbdns/djbdns-1.05-jumbo-josb.patch
@@ -308,11 +308,11 @@ diff -ruN djbdns-1.05-dist/cache.c djbdns-1.05/cache.c
 +#ifdef DUMPCACHE
 +#include <stdio.h>
 +#include <unistd.h>
-+#include "env.h"
 +#include "error.h"
 +#include "open.h"
 +#include "openreadclose.h"
 +#endif
++#include "env.h"
  #include "alloc.h"
  #include "byte.h"
  #include "uint32.h"
diff --git a/main/djbdns/dnscache.monthly b/main/djbdns/dnscache.monthly
index 574d56f01dc..1c8d1edd1d2 100755
--- a/main/djbdns/dnscache.monthly
+++ b/main/djbdns/dnscache.monthly
@@ -28,7 +28,7 @@ for ZONEFILE in $ZONES; do
 	
 		# Refresh zone info
 		dnsqr ns $ZONE | awk '/^answer: ./ { print $5 }' | sort -u | xargs dnsip > $TMPF
-		if egrep -q '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' $TMPF; then
+		if grep -E -q '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' $TMPF; then
 			cmp -s $ZONEFILE $TMPF
 			if [ "$?" != 0 ]; then
 				NEEDRESTART=yes
diff --git a/main/djbdns/implicit.patch b/main/djbdns/implicit.patch
new file mode 100644
index 00000000000..f638cc992db
--- /dev/null
+++ b/main/djbdns/implicit.patch
@@ -0,0 +1,35 @@
+diff --git a/dnsq.c b/dnsq.c
+index 533e6af..c2c998d 100644
+--- a/dnsq.c
++++ b/dnsq.c
+@@ -10,6 +10,7 @@
+ #include "printpacket.h"
+ #include "parsetype.h"
+ #include "dns.h"
++#include <unistd.h>
+ 
+ #define FATAL "dnsq: fatal: "
+ 
+diff --git a/dnsqr.c b/dnsqr.c
+index ff8ea6e..77418b2 100644
+--- a/dnsqr.c
++++ b/dnsqr.c
+@@ -9,6 +9,7 @@
+ #include "printpacket.h"
+ #include "parsetype.h"
+ #include "dns.h"
++#include <unistd.h>
+ 
+ #define FATAL "dnsqr: fatal: "
+ 
+diff --git a/utime.c b/utime.c
+index 4b7984f..be6c936 100644
+--- a/utime.c
++++ b/utime.c
+@@ -1,5 +1,6 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
++#include <utime.h>
+ #include "scan.h"
+ #include "exit.h"
+ 
diff --git a/main/dkimproxy/APKBUILD b/main/dkimproxy/APKBUILD
index dbec8b06a15..ea4c6f18bda 100644
--- a/main/dkimproxy/APKBUILD
+++ b/main/dkimproxy/APKBUILD
@@ -2,26 +2,24 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=dkimproxy
 pkgver=1.4.1
-pkgrel=5
+pkgrel=9
 pkgdesc="SMTP-proxy that signs and/or verifies emails, using the Mail::DKIM module"
-url="http://dkimproxy.sourceforge.net/"
+url="https://dkimproxy.sourceforge.net/"
 arch="noarch"
-license="GPL"
+license="GPL-2.0-or-later"
+options="!check" # no testsuite
 depends="perl-mail-dkim perl-net-server perl-error"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
 install="$pkgname.pre-install"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+source="https://downloads.sourceforge.net/dkimproxy/dkimproxy-$pkgver.tar.gz
 	dkimproxy_out.conf.patch
 	dkimproxy.in.initd
 	dkimproxy.out.initd
 	dkimproxy.in.confd
 	dkimproxy.out.confd
 	"
-builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
-
 	local vendorlib=$(perl -V:vendorlib | sed -En "s|vendorlib='([^']+)';|\1|p")
 
 	perllibdir="$vendorlib" ./configure --prefix=/usr \
@@ -33,8 +31,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 
 	cd "$pkgdir"
diff --git a/main/dmidecode/APKBUILD b/main/dmidecode/APKBUILD
index a5c6d2711b6..5c9fbfe9c54 100644
--- a/main/dmidecode/APKBUILD
+++ b/main/dmidecode/APKBUILD
@@ -1,30 +1,28 @@
 # Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
 pkgname=dmidecode
-pkgver=3.2
-pkgrel=0
+pkgver=3.5
+pkgrel=1
 pkgdesc="A utility for reporting system hardware as described by BIOS"
-url="http://www.nongnu.org/dmidecode"
+url="https://nongnu.org/dmidecode"
 arch="all"
-license="GPL"
-options="!check"
+license="GPL-2.0-or-later"
+options="!check" # No testsuite
 subpackages="$pkgname-doc"
 source="https://download.savannah.gnu.org/releases/dmidecode/dmidecode-$pkgver.tar.xz"
 
-builddir="$srcdir"/$pkgname-$pkgver
-
 prepare() {
 	default_prepare
-	sed -e '/^PROGRAMS !=/d' -e 's/-O2/-Os/' -i Makefile || return 1
+	sed -e '/^PROGRAMS !=/d' -i Makefile
 }
 
 build() {
-	cd "$builddir"
 	make prefix=/usr
 }
 
 package() {
-	cd "$builddir"
-	make prefix=/usr DESTDIR="${pkgdir}" install
+	make prefix=/usr DESTDIR="$pkgdir" install
 }
 
-sha512sums="b080c73fbda756109f0f29935c641e0b32ea9ffe90f0a8254164c9c1ff5617d042347298e6bac31e5463e94fa56efe2b2743238156d878254fc77120e6dc1a18  dmidecode-3.2.tar.xz"
+sha512sums="
+690c9bea391f6bbfc8cd48e8db408a61d5b551a07a2823c29d03a09607fc2043cc1bea44ee9fd27fd0e7bc0b287bf9de9f22a1a66053f5b1e63d77c03d93e1ae  dmidecode-3.5.tar.xz
+"
diff --git a/main/dmraid/APKBUILD b/main/dmraid/APKBUILD
index 4246f632ea7..0f6ea5cd8c6 100644
--- a/main/dmraid/APKBUILD
+++ b/main/dmraid/APKBUILD
@@ -1,25 +1,27 @@
 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dmraid
 pkgver=1.0.0_rc16
 _distver=3
-pkgrel=0
+pkgrel=6
 pkgdesc="Device mapper RAID interface"
-url="http://people.redhat.com/~heinzm/sw/dmraid/"
+url="https://people.redhat.com/~heinzm/sw/dmraid/"
 arch="all"
-license="GPL-2.0-only LGPL-2.1-only"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 makedepends="lvm2-dev"
 options="!check" # No tests to run
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${pkgver/_/.}-${_distver}.tar.bz2
+source="https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${pkgver/_/.}-$_distver.tar.bz2
 	001-do_not_use_p_for_partition.patch
 	002-support_virtio_devices.patch
 	003-isw-probe-hpa.patch
 	004-activate_multiple_raid_sets.patch
 	005-fix_isw_sectors_calculation.patch
 	006-musl-libc.patch
-	007-fix-loff_t-musl.patch"
-builddir="$srcdir/dmraid/${pkgver/_/.}-${_distver}/dmraid"
+	007-fix-loff_t-musl.patch
+	lfs64.patch
+	"
+builddir="$srcdir/dmraid/${pkgver/_/.}-$_distver/dmraid"
 
 prepare() {
 	default_prepare
@@ -46,11 +48,14 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e  dmraid-1.0.0.rc16-3.tar.bz2
+sha512sums="
+7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e  dmraid-1.0.0.rc16-3.tar.bz2
 df1e285f404da61f9d15c9be3fae905599fb5d03203d3cd0551421b89913361d36524f9d2ee899eac9088c35daad9e8d6280a621c6a5832eec1a9be21bd05b12  001-do_not_use_p_for_partition.patch
 1486aa76066e959d800506030f37392560e4953eb23fbcb65899ce76ef8e646639d5bd7abed8d9328e9a7f8dcc005fac4312528a8afcc806d228828a5d9b3fb9  002-support_virtio_devices.patch
 b679ef5ff2671a8c8aa1a12feb54cfdfa6a40cbb0aef23e49b1ea5a8f97563061f9b207eeaf06da9fbb33837d9d04a4972869adc87eb89eb459aeb1c1e7bc5ee  003-isw-probe-hpa.patch
 ce120d7313f7f1b563e95fd9b81e4eb5353edf416a521d2955b0bd7a0c08ec4c0a5da4402aa1690f65d2b4464d1f5fc534ec7819b07ee8791046b25f0209a21b  004-activate_multiple_raid_sets.patch
 702cb4cf0edf79dbde9185cada12462681b52bffd5f8c4eab1b594ef754c964fb6c7f711ce77e4074167d920755fe0466d284f94fb272d60ea2314f2a45ef366  005-fix_isw_sectors_calculation.patch
 1335297528df24faa292e4d80a57e23e3f910b669a92370e57a97bd4df443092323a91489c2cc1f17e3b280a3a7f0386bb7fed3a157cdab7ab55686e9d5e1ae4  006-musl-libc.patch
-3fe66677b7bb3a314cabcab32d35192ddd5ec70e50398a37916197eb2818debf919fe48337fe9befb3a7d7ab727cbeed976413db89585f66fed7375cf9b36ac8  007-fix-loff_t-musl.patch"
+3fe66677b7bb3a314cabcab32d35192ddd5ec70e50398a37916197eb2818debf919fe48337fe9befb3a7d7ab727cbeed976413db89585f66fed7375cf9b36ac8  007-fix-loff_t-musl.patch
+c33d8876951233d86f9cc900f1df0edfa1cf2ea9d970c877ffa3072ec1af04c20cceb00a0b11bac97b9d2ea6244cc91470949ca4693d3fd6a2c83636ecccc2f0  lfs64.patch
+"
diff --git a/main/dmraid/lfs64.patch b/main/dmraid/lfs64.patch
new file mode 100644
index 00000000000..6caf16c0a85
--- /dev/null
+++ b/main/dmraid/lfs64.patch
@@ -0,0 +1,15 @@
+needed since https://github.com/bminor/musl/commit/25e6fee27f4a293728dd15b659170e7b9c7db9bc
+--
+diff --git a/lib/misc/file.c b/lib/misc/file.c
+index 7c663cb..7da9622 100644
+--- a/lib/misc/file.c
++++ b/lib/misc/file.c
+@@ -71,7 +71,7 @@ rw_file(struct lib_context *lc, const char *who, int flags,
+ #ifdef __KLIBC__
+ #define	DMRAID_LSEEK	lseek
+ #else
+-#define	DMRAID_LSEEK	lseek64
++#define	DMRAID_LSEEK	lseek
+ #endif
+ 	if (offset && (o = DMRAID_LSEEK(fd, offset, SEEK_SET)) == (loff_t) - 1)
+ 		log_err(lc, "%s: seeking device \"%s\" to %" PRIu64,
diff --git a/main/dmvpn/APKBUILD b/main/dmvpn/APKBUILD
index 101e605f014..2bc63d66343 100644
--- a/main/dmvpn/APKBUILD
+++ b/main/dmvpn/APKBUILD
@@ -1,26 +1,26 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
 pkgname=dmvpn
-pkgver=1.3.0
-pkgrel=0
+pkgver=1.4.0
+pkgrel=3
 pkgdesc="Dynamic Multipoint VPN"
 url="https://git.alpinelinux.org/cgit/dmvpn-tools/"
 arch="noarch"
 license="MIT"
+_lua_dmvpn_deps="lua-asn1"
+_dp_deps="lighttpd"
+_ca_deps="lua5.2 lua5.2-lyaml lua5.2-ossl lua5.2-posix lua5.2-sql-sqlite3
+	lua5.2-stringy lua-asn1"
+makedepends="$_lua_dmvpn_deps $_dp_deps $_ca_deps"
 depends="augeas bind-tools lua5.2 lua5.2-cqueues lua5.2-lyaml lua5.2-ossl
-         lua5.2-posix lua5.2-struct lua-dmvpn quagga strongswan tunnel"
-subpackages="dmvpn-ca dmvpn-crl-dp lua-dmvpn"
+	lua5.2-posix lua5.2-struct lua-dmvpn quagga strongswan tunnel"
+subpackages="dmvpn-ca dmvpn-crl-dp lua-dmvpn $pkgname-openrc"
 options="!check"
-source="$url/snapshot/dmvpn-tools-$pkgver.tar.bz2"
-builddir="$srcdir/dmvpn-tools-$pkgver"
-
-build() {
-	:
-}
+source="$pkgname-$pkgver.tar.bz2::https://gitlab.alpinelinux.org/alpine/dmvpn-tools/-/archive/v1.4.0/dmvpn-tools-v1.4.0.tar.bz2
+	dmvpn-ca.insync"
+builddir="$srcdir/dmvpn-tools-v$pkgver"
 
 package() {
-	cd "$builddir"
-
 	install -D -m 644 dmvpn.awall "$pkgdir"/usr/share/awall/optional/dmvpn.json
 	install -D -m 644 dmvpn-hub.awall "$pkgdir"/usr/share/awall/optional/dmvpn-hub.json
 	install -D dmvpn-pfx-decode "$pkgdir"/usr/libexec/dmvpn-pfx-decode
@@ -32,17 +32,16 @@ package() {
 }
 
 ca() {
-	depends="lua5.2 lua5.2-lyaml lua5.2-ossl lua5.2-posix lua5.2-sql-sqlite3
-	         lua5.2-stringy lua-asn1 lua-dmvpn"
-
+	depends="$_ca_deps lua-dmvpn"
 	cd "$builddir"
 
 	install -D dmvpn-ca "$subpkgdir"/usr/bin/dmvpn-ca
 	install -D -m 644 dmvpn-ca.conf "$subpkgdir"/etc/dmvpn-ca.conf
+	install -D -m 644 "$srcdir"/dmvpn-ca.insync "$subpkgdir"/etc/in-sync.d/dmvpn-ca
 }
 
 dp() {
-	depends=lighttpd
+	depends="$_dp_deps"
 
 	local bin=/usr/bin/dmvpn-crl-update
 	install -D "$builddir"/dmvpn-crl-update "$subpkgdir$bin"
@@ -53,10 +52,13 @@ dp() {
 }
 
 dmvpn() {
-	depends=lua-asn1
+	depends="$_lua_dmvpn_deps"
 
 	cd "$builddir"
 	install -D -m 644 dmvpn.lua "$subpkgdir"/usr/share/lua/5.2/dmvpn.lua
 }
 
-sha512sums="100838ab69b5475bd3885a229bcb31fc054248bfd56b026e8aa978d9907795a152ec00bad1f85597ba5b70e84c14123b35f81a955d2335073be9de181e2a862a  dmvpn-tools-1.3.0.tar.bz2"
+sha512sums="
+9e930ce9adf3270263d2bdad3270e657e5b7cf2c4261a8f2086f2bdf61aa68ba070153247ba31d83080ae3599741ea41ee0724576c9fc68a2ba34f19bca4a543  dmvpn-1.4.0.tar.bz2
+a2160b97ead95c0269005e6973b25315ec7f1eada9da70cda42a13e34c800eea836b8ef7723553ff0e751796ec0ae27efadbac6b9c66e7db944984d9ff387072  dmvpn-ca.insync
+"
diff --git a/main/dmvpn/dmvpn-ca.insync b/main/dmvpn/dmvpn-ca.insync
new file mode 100644
index 00000000000..56cbd57ca0b
--- /dev/null
+++ b/main/dmvpn/dmvpn-ca.insync
@@ -0,0 +1,2 @@
+/etc/dmvpn-ca.conf
+/var/lib/misc/dmvpn-ca.sqlite3
diff --git a/main/dns-root-hints/APKBUILD b/main/dns-root-hints/APKBUILD
index 1995a1a84bd..69571eb3e2c 100644
--- a/main/dns-root-hints/APKBUILD
+++ b/main/dns-root-hints/APKBUILD
@@ -1,45 +1,47 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=dns-root-hints
-pkgver=2019073000
-pkgrel=2
+pkgver=2024021501
+pkgrel=0
 pkgdesc="The DNS root hint(s)"
 url="https://www.internic.net/domain"
 arch="noarch"
 license="Public-Domain"
-depends="curl gnupg"
-makedepends="curl"
-options="net"
-source="verisign-grs-nstld-key.asc named.root named.root.sig
+depends="curl gpgv"
+makedepends="gpg"
+source="verisign-grs-nstld-key.asc
+	named.root
+	named.root.sig
 	update-$pkgname
 	$pkgname.crond
 	"
+builddir="$srcdir"
 
-build() {
-	mkdir -p "$builddir"
+prepare() {
+	default_prepare
+
+	# Convert the key to the GPG keyring that can be used with gpgv.
+	gpg --dearmor -o verisign-grs-nstld-key.gpg verisign-grs-nstld-key.asc
 }
 
 package() {
-	cd "$builddir"
-	install -D -m 644 -o root -g root "$srcdir"/named.root \
-		"$pkgdir"/usr/share/$pkgname/named.root
-	install -D -m 644 -o root -g root "$srcdir"/named.root.sig \
-		"$pkgdir"/usr/share/$pkgname/named.root.sig
-	install -D -m 644 -o root -g root "$srcdir"/verisign-grs-nstld-key.asc \
-		"$pkgdir"/usr/share/$pkgname/verisign-grs-nstld-key.asc
-	install -D -m 755 -o root -g root "$srcdir"/update-$pkgname \
-		"$pkgdir"/usr/bin/update-$pkgname
-	install -D -m 755 -o root -g root "$srcdir"/$pkgname.crond \
-		"$pkgdir"/etc/periodic/monthly/$pkgname
+	install -D -m 644 -t "$pkgdir"/usr/share/$pkgname \
+		named.root \
+		named.root.sig \
+		verisign-grs-nstld-key.asc \
+		verisign-grs-nstld-key.gpg
+
+	install -D -m 755 -t "$pkgdir"/usr/bin/ update-$pkgname
+
+	install -D -m 755 $pkgname.crond "$pkgdir"/etc/periodic/monthly/$pkgname
 
 	# compatibility links
-	cd "$pkgdir/usr/share/$pkgname"
+	cd "$pkgdir"/usr/share/$pkgname
 	ln -s named.root named.cache
 	ln -s named.root db.cache
 }
 
 check() {
-	cd "$builddir"
-	local _awkprog='
+	local awkprog='
 		/related version of root zone:/ {
 			rootver=$NF;
 			if (pkgver != rootver) {
@@ -50,44 +52,34 @@ check() {
 			printf "OK: %s\n", rootver;
 			quit;
 		}'
-	awk -v pkgver="$pkgver" "$_awkprog" "$srcdir"/named.root
+	awk -v pkgver="$pkgver" "$awkprog" "$srcdir"/named.root
 }
 
 # check new versions of root hints and commit
 snapshot() {
-	# use a temporary dir for new files
-	export _tmp=$(mktemp -d -p .)
-	for file in named.root named.root.sig; do
-		curl -sLR "${url}/${file}" -o "${_tmp}/${file}"
-	done
+	local new_ver
 
-	# compare new and current versions
-	local _drh_new_ver=$(grep "related version of root zone:" ${_tmp}/named.root | egrep -o '[0-9]{10}')
-	local _drh_current_ver=$(grep "related version of root zone:" named.root | egrep -o '[0-9]{10}')
-
-	# commit if new version is found
-	if [ "$_drh_new_ver" != "$_drh_current_ver" ]; then
-		_check_sig
-		mv ${_tmp}/named.root named.root
-		mv ${_tmp}/named.root.sig named.root.sig
-		git add named.root named.root.sig
-		abump $pkgname-$_drh_new_ver
+	if ! [ -f "$srcdir"/verisign-grs-nstld-key.gpg ]; then
+		abuild unpack
+		abuild prepare
 	fi
 
-	# cleanup
-	rm "${_tmp}"/* 2>/dev/null || true
-	rmdir "${_tmp}"
-}
+	DNS_ROOT_HINTS_DIR="$srcdir" ./update-dns-root-hints
+
+	# commit if new version was found
+	if ! cmp -s named.root "$srcdir"/named.root; then
+		cp "$srcdir"/named.root* .
+		git add named.root named.root.sig
 
-_check_sig() {
-	local GNUPGHOME="$builddir/.gpg"
-	install -d -m 0700 "$GNUPGHOME"
-	gpg --import < verisign-grs-nstld-key.asc
-	gpg --verify "${_tmp}/named.root.sig" "${_tmp}/named.root"
+		new_ver=$(sed -En 's/.*related version of root zone:\s*([0-9]{10}).*/\1/p' named.root)
+		abump $pkgname-$new_ver
+	fi
 }
 
-sha512sums="3ecf5d66e506526ad98ea0b371202f0763b987322bd4407b40fcd95415202bddb18fd06c82eb397566b393e214dc88cb17ec94f3908328e8a55f5f68cc730993  verisign-grs-nstld-key.asc
-0491784a0d0722113120bae4dd42c7671cb05b4b76d4dd4773718ee4c7777d7fb7b039f76b8a30179d5dfa8f3142182bf0b0d809f9d6e1ef581d08482e06d250  named.root
-b1d76a8040c534f2a5ffc54b92aa3a465ddd01b345e2a7eade258359017c623d5a847a270b259cd58ba3d8550a3519b0921f9f62dc6e98a0acdd3873b2556359  named.root.sig
-7e640e997dd0eae47fb1e609f73d5206e09684eada15d3b6043fc23e639859af743b99cbd868e98269c2af25e7c3eeea307f52f2fb7d4a6f3e00f8b14a289322  update-dns-root-hints
-67a7ef07ee9086ce584a8b316b15cd05214968f89bbc363fb2d5932ebf47ed962c0862fe254082e68f27574acb62f3672137dd23c40d7d2047c969ee449827f8  dns-root-hints.crond"
+sha512sums="
+3ecf5d66e506526ad98ea0b371202f0763b987322bd4407b40fcd95415202bddb18fd06c82eb397566b393e214dc88cb17ec94f3908328e8a55f5f68cc730993  verisign-grs-nstld-key.asc
+6cec5f5cfa1018f39d4f320938595a1a56cdeb359980cc530e79c9f7134b71c3f11c0f7d6f6c002a76ee41deb98d52e41c1c12e8e1c9865e95efde66dd6506b8  named.root
+08f3d9e8ac84f3cc4a67994be9efdae086c86c8fa253ed46339add79b52c25744ab4c0706c16f8fb1852a4c4899fb4fda32f9aea872dadf561afd41ce31fff25  named.root.sig
+ba5663675e5b4cb0f670c570a4cef1fde8282185c5cc505af8beb7f32756a41ff511024f45c57c7204d03a88b8d2cc86ed31943ed19b71d30cee040d634a8208  update-dns-root-hints
+68a743ee7b0f60eeb21cecbb916c3d7051ebbb86143621aafe5ef654df0953a274a2ffa2f3fe42fb3c143fd7b29ab4c5b17407c73b560a1c19afa1584fc43d8a  dns-root-hints.crond
+"
diff --git a/main/dns-root-hints/dns-root-hints.crond b/main/dns-root-hints/dns-root-hints.crond
index bf3882476cb..833334a9a0e 100644
--- a/main/dns-root-hints/dns-root-hints.crond
+++ b/main/dns-root-hints/dns-root-hints.crond
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/bin/update-dns-root-hints &>/dev/null
+/usr/bin/update-dns-root-hints >/dev/null 2>&1
diff --git a/main/dns-root-hints/named.root b/main/dns-root-hints/named.root
index dba9ed9eaed..364d85a5d3f 100644
--- a/main/dns-root-hints/named.root
+++ b/main/dns-root-hints/named.root
@@ -8,9 +8,9 @@
 ;           file                /domain/named.cache 
 ;           on server           FTP.INTERNIC.NET
 ;       -OR-                    RS.INTERNIC.NET
-; 
-;       last update:     July 30, 2019 
-;       related version of root zone:     2019073000
+;
+;       last update:     February 15, 2024
+;       related version of root zone:     2024021501
 ; 
 ; FORMERLY NS.INTERNIC.NET 
 ;
@@ -21,8 +21,8 @@ A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:ba3e::2:30
 ; FORMERLY NS1.ISI.EDU 
 ;
 .                        3600000      NS    B.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET.      3600000      A     199.9.14.201
-B.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:200::b
+B.ROOT-SERVERS.NET.      3600000      A     170.247.170.2
+B.ROOT-SERVERS.NET.      3600000      AAAA  2801:1b8:10::b
 ; 
 ; FORMERLY C.PSI.NET 
 ;
diff --git a/main/dns-root-hints/named.root.sig b/main/dns-root-hints/named.root.sig
index a030b225a02..fea81633a83 100644
--- a/main/dns-root-hints/named.root.sig
+++ b/main/dns-root-hints/named.root.sig
diff --git a/main/dns-root-hints/update-dns-root-hints b/main/dns-root-hints/update-dns-root-hints
index 55f3dc77f96..0ec6db4c462 100755
--- a/main/dns-root-hints/update-dns-root-hints
+++ b/main/dns-root-hints/update-dns-root-hints
@@ -1,43 +1,45 @@
 #!/bin/sh
+set -eu
 
-url=https://www.internic.net/domain
-base_dir=/usr/share/dns-root-hints
-_tmp=$(mktemp -d -p .)
+BASE_URL='https://www.internic.net/domain'
+destdir=${DNS_ROOT_HINTS_DIR:-"/usr/share/dns-root-hints"}
 
-if [ $(id -u) != "0" ]; then
-	echo "Needs to run as root."
+if ! [ -w "$destdir" ]; then
+	echo 'Needs to run as root.' >&2
 	exit 1
 fi
 
-_check_sig() {
-	local GNUPGHOME="$HOME/.gpg"
-	install -d -m 0700 "$GNUPGHOME"
-	gpg --import < $base_dir/verisign-grs-nstld-key.asc
-	gpg --verify "${_tmp}/named.root.sig" "${_tmp}/named.root"
+tmpdir=$(mktemp -d)
+
+cleanup() {
+	rm "$tmpdir"/* 2>/dev/null || true
+	rmdir "$tmpdir" || true
 }
+trap cleanup EXIT HUP INT TERM
 
-for file in named.root named.root.sig; do
-	curl -sLR ${url}/${file} -o "${_tmp}/${file}" || exit 1
+for f in named.root named.root.sig; do
+	curl -sLR "$BASE_URL/$f" -o "$tmpdir/$f"
 done
 
+read_version() {
+	sed -En 's/.*related version of root zone:\s*([0-9]{10}).*/\1/p' "$1"
+}
 # compare new and current versions
-_drh_new_ver=$(grep "related version of root zone:" ${_tmp}/named.root | egrep -o '[0-9]{10}')
-_drh_current_ver=$(grep "related version of root zone:" $base_dir/named.root | egrep -o '[0-9]{10}')
+new_ver=$(read_version "$tmpdir"/named.root)
+cur_ver=$(read_version "$destdir"/named.root)
+
+echo "Version $cur_ver <- Installed"
+echo "Version $new_ver <- Downloaded"
 
 # update to new version if needed
-echo "Version $_drh_current_ver <- Installed"
-echo "Version $_drh_new_ver <- Downloaded"
-
-if [ "$_drh_new_ver" != "$_drh_current_ver" ]; then
-	_check_sig || exit 1
-	mv ${_tmp}/named.root $base_dir/named.root || exit 1
-	mv ${_tmp}/named.root.sig $base_dir/named.root.sig || exit 1
-	echo -e "\nZone file updated.\n"
-else
-	echo -e "\nZone file already up-to-date.\n"
-fi
+if [ "$new_ver" != "$cur_ver" ]; then
+	gpgv --keyring "$destdir"/verisign-grs-nstld-key.gpg \
+		"$tmpdir"/named.root.sig "$tmpdir"/named.root || exit 10
 
-# cleanup
-rm "${_tmp}"/* 2>/dev/null || true
-rmdir "${_tmp}" 2>/dev/null || true
+	mv "$tmpdir"/named.root "$destdir"/named.root
+	mv "$tmpdir"/named.root.sig "$destdir"/named.root.sig
 
+	printf '\nZone file updated.\n\n'
+else
+	printf '\nZone file already up-to-date.\n\n'
+fi
diff --git a/main/dnsmasq/0000-underflow.patch b/main/dnsmasq/0000-underflow.patch
new file mode 100644
index 00000000000..44ef53c5517
--- /dev/null
+++ b/main/dnsmasq/0000-underflow.patch
@@ -0,0 +1,47 @@
+Patch-Source: https://src.fedoraproject.org/rpms/dnsmasq/raw/rawhide/f/dnsmasq-2.77-underflow.patch
+--
+From 46b9670a418419d9e04bbe9a0d6c5a85f3c63265 Mon Sep 17 00:00:00 2001
+From: Doran Moppert <dmoppert@redhat.com>
+Date: Tue, 26 Sep 2017 14:48:20 +0930
+Subject: [PATCH] google patch hand-applied
+
+---
+ src/edns0.c   | 10 +++++-----
+ src/rfc1035.c |  3 +++
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/src/edns0.c b/src/edns0.c
+index c498eb1..0eb3873 100644
+--- a/src/edns0.c
++++ b/src/edns0.c
+@@ -212,11 +212,11 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l
+       /* Copy back any options */
+       if (buff)
+ 	{
+-          if (p + rdlen > limit)
+-          {
+-            free(buff);
+-            return plen; /* Too big */
+-          }
++	  if (p + rdlen > limit)
++	  {
++	    free(buff);
++	    return plen; /* Too big */
++	  }
+ 	  memcpy(p, buff, rdlen);
+ 	  free(buff);
+ 	  p += rdlen;
+diff --git a/src/rfc1035.c b/src/rfc1035.c
+index 5c0df56..04abd5f 100644
+--- a/src/rfc1035.c
++++ b/src/rfc1035.c
+@@ -1428,6 +1428,9 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
+   if (stale)
+     *stale = 0;
+   
++  // Make sure we do not underflow here too.
++  if (qlen > (limit - ((char *)header))) return 0;
++
+   /* never answer queries with RD unset, to avoid cache snooping. */
+   if (ntohs(header->ancount) != 0 ||
+       ntohs(header->nscount) != 0 ||
diff --git a/main/dnsmasq/0001-Fix-infinite-loop-when-invoking-SetFilterA-dbus-meth.patch b/main/dnsmasq/0001-Fix-infinite-loop-when-invoking-SetFilterA-dbus-meth.patch
new file mode 100644
index 00000000000..19a0942310e
--- /dev/null
+++ b/main/dnsmasq/0001-Fix-infinite-loop-when-invoking-SetFilterA-dbus-meth.patch
@@ -0,0 +1,38 @@
+From 1c26b534bfd9fe5b4092903806473ee3eca16af9 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Mon, 19 Feb 2024 23:21:58 +0000
+Subject: [PATCH] Fix infinite loop when invoking SetFilterA dbus method more
+ than once.
+
+Fix infinite loop when invoking SetFilterA dbus method more than once.
+
+Also applies to SetFilterAAAA.
+
+Thanks to Clayton Craft for spotting the issue.
+---
+ src/dbus.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/dbus.c b/src/dbus.c
+index ad6a4f3..84a8d97 100644
+--- a/src/dbus.c
++++ b/src/dbus.c
+@@ -833,6 +833,7 @@ DBusHandlerResult message_handler(DBusConnection *connection,
+ 
+       if (!done)
+ 	{
++	  done = 1;
+ 	  list.next = daemon->filter_rr;
+ 	  daemon->filter_rr = &list;
+ 	}
+@@ -844,6 +845,7 @@ DBusHandlerResult message_handler(DBusConnection *connection,
+ 
+       if (!done)
+ 	{
++	  done = 1;
+ 	  list.next = daemon->filter_rr;
+ 	  daemon->filter_rr = &list;
+ 	}
+-- 
+2.43.1
+
diff --git a/main/dnsmasq/0002-Fix-breakage-in-DBus-FilterA-and-FilterAAAA-methods.patch b/main/dnsmasq/0002-Fix-breakage-in-DBus-FilterA-and-FilterAAAA-methods.patch
new file mode 100644
index 00000000000..98f00b75751
--- /dev/null
+++ b/main/dnsmasq/0002-Fix-breakage-in-DBus-FilterA-and-FilterAAAA-methods.patch
@@ -0,0 +1,133 @@
+From 4c590320ec5442d431c5e059c890077ec6d67575 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Tue, 20 Feb 2024 23:38:26 +0000
+Subject: [PATCH] Fix breakage in DBus FilterA and FilterAAAA methods.
+
+In generalising the RR filter code, the Dbus methods
+controlling filtering A and AAAA records
+got severely broken. This, and the previous commit,
+fixes things.
+---
+ src/dbus.c | 67 +++++++++++++++++++++++++++++++++++-------------------
+ src/util.c |  2 +-
+ 2 files changed, 45 insertions(+), 24 deletions(-)
+
+diff --git a/src/dbus.c b/src/dbus.c
+index 84a8d97..87c4b80 100644
+--- a/src/dbus.c
++++ b/src/dbus.c
+@@ -485,28 +485,37 @@ static DBusMessage* dbus_read_servers_ex(DBusMessage *message, int strings)
+   return error;
+ }
+ 
+-static DBusMessage *dbus_set_bool(DBusMessage *message, int flag, char *name)
++static DBusMessage *dbus_get_bool(DBusMessage *message, dbus_bool_t *enabled, char *name)
+ {
+   DBusMessageIter iter;
+-  dbus_bool_t enabled;
+ 
+   if (!dbus_message_iter_init(message, &iter) || dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_BOOLEAN)
+     return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, "Expected boolean argument");
+   
+-  dbus_message_iter_get_basic(&iter, &enabled);
+-
+-  if (enabled)
+-    { 
+-      my_syslog(LOG_INFO, _("Enabling --%s option from D-Bus"), name);
+-      set_option_bool(flag);
+-    }
++  dbus_message_iter_get_basic(&iter, enabled);
++  
++  if (*enabled)
++    my_syslog(LOG_INFO, _("Enabling --%s option from D-Bus"), name);
+   else
++    my_syslog(LOG_INFO, _("Disabling --%s option from D-Bus"), name);
++  
++  return NULL;
++}
++
++static DBusMessage *dbus_set_bool(DBusMessage *message, int flag, char *name)
++{
++  dbus_bool_t val;
++  DBusMessage *reply = dbus_get_bool(message, &val, name);
++  
++  if (!reply)
+     {
+-      my_syslog(LOG_INFO, _("Disabling --%s option from D-Bus"), name);
+-      reset_option_bool(flag);
++      if (val)
++	set_option_bool(flag);
++      else
++	reset_option_bool(flag);
+     }
+ 
+-  return NULL;
++  return reply;
+ }
+ 
+ #ifdef HAVE_DHCP
+@@ -829,25 +838,37 @@ DBusHandlerResult message_handler(DBusConnection *connection,
+   else if (strcmp(method, "SetFilterA") == 0)
+     {
+       static int done = 0;
+-      static struct rrlist list = { T_A, NULL };
++      static struct rrlist list = { 0, NULL };
++      dbus_bool_t enabled;
+ 
+-      if (!done)
++      if (!(reply = dbus_get_bool(message, &enabled, "filter-A")))
+ 	{
+-	  done = 1;
+-	  list.next = daemon->filter_rr;
+-	  daemon->filter_rr = &list;
++	  if (!done)
++	    {
++	      done = 1;
++	      list.next = daemon->filter_rr;
++	      daemon->filter_rr = &list;
++	    }
++
++	  list.rr = enabled ? T_A : 0;
+ 	}
+     }
+   else if (strcmp(method, "SetFilterAAAA") == 0)
+     {
+       static int done = 0;
+-      static struct rrlist list = { T_AAAA, NULL };
+-
+-      if (!done)
++      static struct rrlist list = { 0, NULL };
++      dbus_bool_t enabled;
++      
++      if (!(reply = dbus_get_bool(message, &enabled, "filter-AAAA")))
+ 	{
+-	  done = 1;
+-	  list.next = daemon->filter_rr;
+-	  daemon->filter_rr = &list;
++	  if (!done)
++	    {
++	      done = 1;
++	      list.next = daemon->filter_rr;
++	      daemon->filter_rr = &list;
++	    }
++	  
++	  list.rr = enabled ? T_AAAA : 0;
+ 	}
+     }
+   else if (strcmp(method, "SetLocaliseQueriesOption") == 0)
+diff --git a/src/util.c b/src/util.c
+index 0c7de44..c527381 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -119,7 +119,7 @@ int rr_on_list(struct rrlist *list, unsigned short rr)
+ {
+   while (list)
+     {
+-      if (list->rr == rr)
++      if (list->rr != 0 && list->rr == rr)
+ 	return 1;
+ 
+       list = list->next;
+-- 
+2.43.2
+
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index 3e950291464..38a1a1dfeed 100644
--- a/main/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
@@ -1,7 +1,65 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
-#
+pkgname=dnsmasq
+pkgver=2.90
+pkgrel=2
+pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server"
+url="https://www.thekelleys.org.uk/dnsmasq/"
+arch="all"
+license="GPL-2.0-or-later"
+depends="$pkgname-common=$pkgver-r$pkgrel"
+makedepends="
+	coreutils
+	dbus-dev
+	linux-headers
+	nettle-dev
+	"
+install="
+	$pkgname.pre-install
+	$pkgname.pre-upgrade
+	$pkgname-dnssec.pre-install
+	$pkgname-dnssec.pre-upgrade
+	$pkgname-dnssec-dbus.pre-install
+	$pkgname-dnssec-dbus.pre-upgrade
+	"
+subpackages="
+	$pkgname-doc
+	$pkgname-dnssec
+	$pkgname-dnssec-dbus
+	$pkgname-openrc
+	$pkgname-common::noarch
+	$pkgname-utils
+	$pkgname-utils-doc:utils_doc:noarch
+	"
+source="https://www.thekelleys.org.uk/dnsmasq/dnsmasq-$pkgver.tar.xz
+	0000-underflow.patch
+	0001-Fix-infinite-loop-when-invoking-SetFilterA-dbus-meth.patch
+	0002-Fix-breakage-in-DBus-FilterA-and-FilterAAAA-methods.patch
+
+	config.h.patch
+	dnsmasq.conf.patch
+	$pkgname.initd
+	$pkgname.confd
+	"
+
 # secfixes:
+#   2.90-r0:
+#     - CVE-2023-50387
+#     - CVE-2023-50868
+#   2.89-r3:
+#     - CVE-2023-28450
+#   2.86-r1:
+#     - CVE-2022-0934
+#   2.85-r0:
+#     - CVE-2021-3448
+#   2.83-r0:
+#     - CVE-2020-25681
+#     - CVE-2020-25682
+#     - CVE-2020-25683
+#     - CVE-2020-25684
+#     - CVE-2020-25685
+#     - CVE-2020-25686
+#     - CVE-2020-25687
 #   2.80-r5:
 #     - CVE-2019-14834
 #   2.79-r0:
@@ -14,72 +72,103 @@
 #     - CVE-2017-14494
 #     - CVE-2017-14495
 #     - CVE-2017-14496
-#
-pkgname=dnsmasq
-pkgver=2.80
-pkgrel=5
-pkgdesc="A lightweight DNS, DHCP, RA, TFTP and PXE server"
-url="http://www.thekelleys.org.uk/dnsmasq/"
-arch="all"
-license="GPL-2.0"
-depends="!$pkgname-dnssec"
-makedepends="linux-headers nettle-dev"
-install="$pkgname.pre-install $pkgname.pre-upgrade
-	$pkgname-dnssec.pre-install $pkgname-dnssec.pre-upgrade"
-subpackages="$pkgname-doc $pkgname-dnssec"
-source="http://www.thekelleys.org.uk/dnsmasq/$pkgname-$pkgver.tar.gz
-	nettle-3.5.patch
-	$pkgname.initd
-	$pkgname.confd
-	uncomment-conf-dir.patch
-	CVE-2019-14834.patch
-	"
-builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
-
-	make CFLAGS="$CFLAGS" COPTS="-DHAVE_DNSSEC" all
+	export CFLAGS="$CFLAGS -flto=auto"
+	make LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" COPTS="-DHAVE_DNSSEC" all
 	mv src/dnsmasq src/dnsmasq~dnssec
 
-	make CFLAGS="$CFLAGS" clean all
+	make LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" COPTS="-DHAVE_DNSSEC -DHAVE_DBUS" all
+	mv src/dnsmasq src/dnsmasq~dbus
+
+	make LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" clean all
+
+	cd contrib/lease-tools/
+	make LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" clean all
 }
 
 # dnsmasq doesn't provide any test suite (shame on them!), so just check that
 # the binary isn't totally broken...
 check() {
-	cd "$builddir"
 	./src/dnsmasq --help >/dev/null
 }
 
 package() {
-	cd "$builddir"
+	provider_priority=100  # highest (other providers are dnsmasq-dnssec, dnsmasq-dnssec-dbus)
 
 	make PREFIX=/usr DESTDIR="$pkgdir" install
 
 	install -D -m755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-
-	install -m644 dnsmasq.conf.example "$pkgdir"/etc/dnsmasq.conf
-	install -d -m755 "$pkgdir"/etc/dnsmasq.d
 }
 
 dnssec() {
 	pkgdesc="$pkgdesc with DNSSEC support"
-	depends="!$pkgname"
+	provides="$pkgname=$pkgver-r$pkgrel"
+	provider_priority=20  # middle (other providers are dnsmasq, dnsmasq-dnssec-dbus)
+
+	install -D -m 755 "$builddir"/src/dnsmasq~dnssec "$subpkgdir"/usr/sbin/dnsmasq
+}
+
+dbus() {
+	pkgdesc="$pkgdesc with DNSSEC and D-Bus support"
+	provides="
+		$pkgname=$pkgver-r$pkgrel
+		$pkgname-dbus=$pkgver-r$pkgrel
+		$pkgname-dnssec=$pkgver-r$pkgrel
+		"
+	provider_priority=10  # lowest (other providers are dnsmasq, dnsmasq-dnssec)
 
 	cd "$builddir"
+	install -D -m755 src/dnsmasq~dbus "$subpkgdir"/usr/sbin/dnsmasq
+	install -D -m644 dbus/dnsmasq.conf -t "$subpkgdir"/usr/share/dbus-1/system.d/
+}
 
-	install -D -m 755 src/dnsmasq~dnssec "$subpkgdir"/usr/sbin/dnsmasq
-	install -D -m 644 trust-anchors.conf \
+common() {
+	pkgdesc="$pkgdesc (common files)"
+	depends=""
+	replaces="$pkgname<2.86-r1 $pkgname-dnssec<2.86-r3"
+
+	install -D -m644 "$builddir"/dnsmasq.conf.example "$subpkgdir"/etc/dnsmasq.conf
+	install -d -m755 "$subpkgdir"/etc/dnsmasq.d
+
+	install -D -m644 "$builddir"/trust-anchors.conf \
 		"$subpkgdir"/usr/share/$pkgname/trust-anchors.conf
+}
+
+openrc() {
+	default_openrc
+	install_if="openrc $pkgname-common=$pkgver-r$pkgrel"
+}
+
+utils() {
+	pkgdesc="$pkgdesc - contrib utilities"
+	depends="$pkgname=$pkgver-r$pkgrel"
+
+	install -Dm755 -t "$subpkgdir"/usr/bin/ \
+		"$builddir"/contrib/lease-tools/dhcp_release \
+		"$builddir"/contrib/lease-tools/dhcp_release6 \
+		"$builddir"/contrib/lease-tools/dhcp_lease_time
+}
+
+utils_doc() {
+	pkgdesc="$pkgdesc - contrib utilities (documentation)"
+	install_if="$pkgname-utils=$pkgver-r$pkgrel docs"
 
-	cp -r "$pkgdir"/etc "$subpkgdir"/etc
+	install -Dm644 -t "$subpkgdir"/usr/share/man/man1/ \
+		"$builddir"/contrib/lease-tools/dhcp_release.1 \
+		"$builddir"/contrib/lease-tools/dhcp_release6.1 \
+		"$builddir"/contrib/lease-tools/dhcp_lease_time.1
+	gzip -9 "$subpkgdir"/usr/share/man/man1/*.1
 }
 
-sha512sums="da50030ac96617fbb7d54d5ef02d2ed1e14ec1ebe0df49bc23a1509381bc1644cf6fb95ff72ed15e0ad1e9bd6aa11ec6e4dcabec8ebb152da0d84f9a4408565b  dnsmasq-2.80.tar.gz
-df64088b22f996ff228fce18dd05b329d9fdf7b02290bc3992546004394e662be7bc416dc718ea866341403234eb20efd5bbf1eec96df1cb6ab099ebfd3fdee4  nettle-3.5.patch
-a7d64a838d10f4f69e0f2178cf66f0b3725901696e30df9e8e3e09f2afd7c86e9d95af64d2b63ef66f18b8a637397b7015573938df9ad961e2b36c391c3ac579  dnsmasq.initd
-9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8  dnsmasq.confd
-01e9e235e667abda07675009fb1947547863e0bb0256393c5a415978e2a49c1007585c7f0b51e8decce79c05e6f2ced3f400b11343feaa4de9b2e524f74a1ee3  uncomment-conf-dir.patch
-d4d11945578430da629d7a38b00eb552cd95b1c438a0b85b63ba637ed19b4283623e39692f48146132b7cb5d453eaa3c07680f1514017d8d458e347153215a9b  CVE-2019-14834.patch"
+sha512sums="
+e169de1892f935e219b0f49d90107f95cba42b40bca20bd3c973313c2cd4df58b929af6628cd988419051d81c3b4ccf8e9f816274df7d0840e79f5bf49602442  dnsmasq-2.90.tar.xz
+5083bbe7150276d2226ba4b5bab73c513fe7baf4843b85d83d1ab16cb50e2dcc1dbd9ed04a89e2f9ea61796b12ea36206cc49a2574ce75abb37cb46279bd9aeb  0000-underflow.patch
+b4ced1017f7157f4b363e642d84b3e100ae1a4927f2de39f5d165bcb4df85b1c562f9e47ec66123703134c15adf90695e8b08baaa791d32889f6933ade22357a  0001-Fix-infinite-loop-when-invoking-SetFilterA-dbus-meth.patch
+e8f75c903d97898bf5d42cbd8712eac355922b80809a410ac5b295c70d5c5642a4108a3ae3d665b18e492470badbe29b2676735d1554dc79439d909cfd9a4be5  0002-Fix-breakage-in-DBus-FilterA-and-FilterAAAA-methods.patch
+d0274417019af84911f3f4a850e785797bdc77732fd93504fe21db7317a874d2ab54bf7a211d000a751cdc43e225a30be4c1a315ab2383fc3fcc619e436aed97  config.h.patch
+41679e0e889607896dcf7fdeb179b9b7a79095c9f86aebda131ac09c12e3ef2a94cece0018ab33ea08d3e6f6bbae44379e9d6fb8987fae29e68ecad952ccdd45  dnsmasq.conf.patch
+0c609a55ca0140d8f31f8f6eb4cb96eca7bc76385d48739998bea926b409f3d72cbfdffc30ad3f9e3a62db4ea3280f7fe6a60a12fc091164814a7cdf6a14b307  dnsmasq.initd
+c6ecec498f07916cd3c5ff183ff2a2ec478cf95ee43c0082d164b548d72b13fc9ba7cfbca9fb50e919e146708b5ce7f3b3a6565b36223c4efe1481172214ad93  dnsmasq.confd
+"
diff --git a/main/dnsmasq/CVE-2019-14834.patch b/main/dnsmasq/CVE-2019-14834.patch
deleted file mode 100644
index 5f60f5f1d97..00000000000
--- a/main/dnsmasq/CVE-2019-14834.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 69bc94779c2f035a9fffdb5327a54c3aeca73ed5 Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Wed, 14 Aug 2019 20:44:50 +0100
-Subject: [PATCH] Fix memory leak in helper.c
-
-Thanks to Xu Mingjie <xumingjie1995@outlook.com> for spotting this.
----
- src/helper.c |   12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/helper.c b/src/helper.c
-index 33ba120..c392eec 100644
---- a/src/helper.c
-+++ b/src/helper.c
-@@ -80,7 +80,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
-   pid_t pid;
-   int i, pipefd[2];
-   struct sigaction sigact;
--
-+  unsigned char *alloc_buff = NULL;
-+  
-   /* create the pipe through which the main program sends us commands,
-      then fork our process. */
-   if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1)
-@@ -186,11 +187,16 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
-       struct script_data data;
-       char *p, *action_str, *hostname = NULL, *domain = NULL;
-       unsigned char *buf = (unsigned char *)daemon->namebuff;
--      unsigned char *end, *extradata, *alloc_buff = NULL;
-+      unsigned char *end, *extradata;
-       int is6, err = 0;
-       int pipeout[2];
- 
--      free(alloc_buff);
-+      /* Free rarely-allocated memory from previous iteration. */
-+      if (alloc_buff)
-+	{
-+	  free(alloc_buff);
-+	  alloc_buff = NULL;
-+	}
-       
-       /* we read zero bytes when pipe closed: this is our signal to exit */ 
-       if (!read_write(pipefd[0], (unsigned char *)&data, sizeof(data), 1))
--- 
-1.7.10.4
-
diff --git a/main/dnsmasq/config.h.patch b/main/dnsmasq/config.h.patch
new file mode 100644
index 00000000000..7847696dbca
--- /dev/null
+++ b/main/dnsmasq/config.h.patch
@@ -0,0 +1,12 @@
+Adjust defaults.
+
+--- a/src/config.h
++++ b/src/config.h
+@@ -47,2 +47,2 @@
+-#define CHUSER "nobody"
+-#define CHGRP "dip"
++#define CHUSER "dnsmasq"
++#define CHGRP "dnsmasq"
+@@ -231 +231 @@
+-#      define RUNFILE "/var/run/dnsmasq.pid"
++#      define RUNFILE "/run/dnsmasq.pid"
diff --git a/main/dnsmasq/dnsmasq-dnssec-dbus.pre-install b/main/dnsmasq/dnsmasq-dnssec-dbus.pre-install
new file mode 120000
index 00000000000..b456897a9ad
--- /dev/null
+++ b/main/dnsmasq/dnsmasq-dnssec-dbus.pre-install
@@ -0,0 +1 @@
+dnsmasq.pre-install
\ No newline at end of file
diff --git a/main/dnsmasq/dnsmasq-dnssec-dbus.pre-upgrade b/main/dnsmasq/dnsmasq-dnssec-dbus.pre-upgrade
new file mode 120000
index 00000000000..b456897a9ad
--- /dev/null
+++ b/main/dnsmasq/dnsmasq-dnssec-dbus.pre-upgrade
@@ -0,0 +1 @@
+dnsmasq.pre-install
\ No newline at end of file
diff --git a/main/dnsmasq/dnsmasq.conf.patch b/main/dnsmasq/dnsmasq.conf.patch
new file mode 100644
index 00000000000..e3d7df42adf
--- /dev/null
+++ b/main/dnsmasq/dnsmasq.conf.patch
@@ -0,0 +1,38 @@
+--- a/dnsmasq.conf.example
++++ b/dnsmasq.conf.example
+@@ -21,8 +21,8 @@
+ #bogus-priv
+ 
+ # Uncomment these to enable DNSSEC validation and caching:
+-# (Requires dnsmasq to be built with DNSSEC option.)
+-#conf-file=%%PREFIX%%/share/dnsmasq/trust-anchors.conf
++# (Requires dnsmasq-dnssec package to be installed)
++#conf-file=/usr/share/dnsmasq/trust-anchors.conf
+ #dnssec
+ 
+ # Replies which are not DNSSEC signed may be legitimate, because the domain
+@@ -96,9 +96,13 @@
+ 
+ # If you want dnsmasq to change uid and gid to something other
+ # than the default, edit the following lines.
+-#user=
+-#group=
++#user=dnsmasq
++#group=dnsmasq
+ 
++# Serve DNS and DHCP only to networks directly connected to this machine.
++# Any interface= line will override it.
++local-service
++
+ # If you want dnsmasq to listen for DHCP and DNS requests only on
+ # specified interfaces (and the loopback) give the name of the
+ # interface (eg eth0) here.
+@@ -671,7 +675,7 @@
+ #conf-dir=/etc/dnsmasq.d,.bak
+ 
+ # Include all files in a directory which end in .conf
+-#conf-dir=/etc/dnsmasq.d/,*.conf
++conf-dir=/etc/dnsmasq.d/,*.conf
+ 
+ # If a DHCP client claims that its name is "wpad", ignore that.
+ # This fixes a security hole. see CERT Vulnerability VU#598349
diff --git a/main/dnsmasq/dnsmasq.confd b/main/dnsmasq/dnsmasq.confd
index 0e94463074c..7a6d43bae09 100644
--- a/main/dnsmasq/dnsmasq.confd
+++ b/main/dnsmasq/dnsmasq.confd
@@ -1,4 +1,27 @@
-# /etc/conf.d/dnsmasq: config file for /etc/init.d/dnsmasq
+# Configuration for /etc/init.d/dnsmasq
 
-# See the dnsmasq(8) man page for possible options to put here.
-DNSMASQ_OPTS="--user=dnsmasq --group=dnsmasq"
+# Path to the dnsmasq configuration file.
+#cfgfile="/etc/dnsmasq.conf"
+
+# Location where to store DHCP leases (sets --dhcp-leasefile).
+#leasefile="/var/lib/misc/$RC_SVCNAME.leases"
+
+# Whether to automatically set up a network bridge when the init script is
+# a symlink with suffix (e.g. /etc/init.d/dnsmasq.br0).
+#setup_bridge=yes
+
+# Additional setup command (runs before starting dnsmasq)
+# This can be an external command or a function defined here.
+# Service will not start if this command fails.
+#setup_command=
+
+# User and group to change to after startup.
+#user="dnsmasq"
+#group="dnsmasq"
+
+# Additional options to pass to the dnsmasq.
+# See the dnsmasq(8) man page for more information.
+#command_args=
+
+# Uncomment to run with process supervisor.
+# supervisor=supervise-daemon
diff --git a/main/dnsmasq/dnsmasq.initd b/main/dnsmasq/dnsmasq.initd
index c7e753fd4b9..85a3b42db82 100644
--- a/main/dnsmasq/dnsmasq.initd
+++ b/main/dnsmasq/dnsmasq.initd
@@ -8,16 +8,22 @@ description_checkconfig="Check configuration syntax"
 extra_started_commands="reload"
 description_reload="Clear cache and reload hosts files"
 
-: ${DNSMASQ_CONFFILE:=/etc/dnsmasq.conf}
+# DNSMASQ_CONFFILE is here for backward compatibility (Alpine <3.16).
+: ${cfgfile:=${DNSMASQ_CONFFILE:-"/etc/dnsmasq.conf"}}
+: ${leasefile:="/var/lib/misc/$RC_SVCNAME.leases"}
+: ${user:="dnsmasq"}
+: ${group:="dnsmasq"}
+: ${setup_bridge:="yes"}
+: ${setup_command:=""}
 
 command="/usr/sbin/dnsmasq"
 # Tell dnsmasq to not create pidfile, that's responsibility of init system.
-command_args="-k --pid-file= $DNSMASQ_OPTS --conf-file=$DNSMASQ_CONFFILE"
+# DNSMASQ_OPTS is here for backward compatibility (Alpine <3.16).
+command_args="--keep-in-foreground --pid-file= $DNSMASQ_OPTS $command_args --conf-file=$cfgfile"
 command_background="yes"
-pidfile="/run/${RC_SVCNAME}.pid"
-leasefile=/var/lib/misc/$RC_SVCNAME.leases
+pidfile="/run/$RC_SVCNAME.pid"
 
-if [ "${RC_SVCNAME#*.}" != "$RC_SVCNAME" ]; then
+if [ "${RC_SVCNAME#*.}" != "$RC_SVCNAME" ] && yesno "$setup_bridge"; then
 	BRIDGE="${RC_SVCNAME#*.}"
 	: ${BRIDGE_ADDR:="10.0.3.1"}
 	: ${BRIDGE_NETMASK:="255.255.255.0"}
@@ -27,108 +33,124 @@ if [ "${RC_SVCNAME#*.}" != "$RC_SVCNAME" ]; then
 	: ${BRIDGE_MAC:="00:16:3e:00:00:00" }
 	: ${DNSMASQ_LISTEN_BRIDGE_ADDR:=yes}
 fi
-.
 
 depend() {
 	provide dns
 	need localmount net
-	after bootmisc
+	after bootmisc dbus
 	use logger
 }
 
 setup_firewall() {
 	local ins=$1 add=$2
-	iptables -w $ins INPUT -i ${BRIDGE} -p udp --dport 67 -j ACCEPT
-	iptables -w $ins INPUT -i ${BRIDGE} -p tcp --dport 67 -j ACCEPT
-	iptables -w $ins INPUT -i ${BRIDGE} -p udp --dport 53 -j ACCEPT
-	iptables -w $ins INPUT -i ${BRIDGE} -p tcp --dport 53 -j ACCEPT
-	iptables -w $ins FORWARD -i ${BRIDGE} -j ACCEPT
-	iptables -w $ins FORWARD -o ${BRIDGE} -j ACCEPT
-	iptables -w -t nat $add POSTROUTING -s ${BRIDGE_NETWORK} ! -d ${BRIDGE_NETWORK} -j MASQUERADE
-	iptables -w -t mangle $add POSTROUTING -o ${BRIDGE} -p udp -m udp --dport 68 -j CHECKSUM --checksum-fill
+
+	iptables -w $ins INPUT -i "$BRIDGE" -p udp --dport 67 -j ACCEPT
+	iptables -w $ins INPUT -i "$BRIDGE" -p tcp --dport 67 -j ACCEPT
+	iptables -w $ins INPUT -i "$BRIDGE" -p udp --dport 53 -j ACCEPT
+	iptables -w $ins INPUT -i "$BRIDGE" -p tcp --dport 53 -j ACCEPT
+	iptables -w $ins FORWARD -i "$BRIDGE" -j ACCEPT
+	iptables -w $ins FORWARD -o "$BRIDGE" -j ACCEPT
+	iptables -w -t nat $add POSTROUTING -s "$BRIDGE_NETWORK" ! -d "$BRIDGE_NETWORK" -j MASQUERADE
+	iptables -w -t mangle $add POSTROUTING -o "$BRIDGE" -p udp -m udp --dport 68 -j CHECKSUM --checksum-fill
+
+	if yesno "$BRIDGE_IPV6_NAT" && [ -n "$BRIDGE_IPV6_NETWORK" ]; then
+		ip6tables -w -t nat $add POSTROUTING -s "$BRIDGE_IPV6_NETWORK" ! -d "$BRIDGE_IPV6_NETWORK" -j MASQUERADE
+	fi
 }
 
 setup_bridge() {
-	if ! [ -d /sys/class/net/$BRIDGE ]; then
-		ip link add dev $BRIDGE type bridge
+	einfo "Creating bridge $BRIDGE"
+
+	if ! [ -d "/sys/class/net/$BRIDGE" ]; then
+		ip link add dev "$BRIDGE" type bridge
 	fi
 
-	ip link set dev $BRIDGE address ${BRIDGE_MAC} && \
-		for ADDR in $BRIDGE_ADDR $BRIDGE_ADDR_EXTRA; do
-			case "$ADDR" in
-			*/*) ip addr add ${ADDR} dev $BRIDGE;;
-			*) ip addr add ${ADDR}/${BRIDGE_NETMASK} dev $BRIDGE;;
+	local addr
+	ip link set dev "$BRIDGE" address "$BRIDGE_MAC" \
+		&& for addr in $BRIDGE_ADDR $BRIDGE_ADDR_EXTRA; do
+			case "$addr" in
+				*/*) ip addr add "$addr" dev "$BRIDGE";;
+				*) ip addr add "$addr/$BRIDGE_NETMASK" dev "$BRIDGE";;
 			esac
-		done && ip link set dev $BRIDGE up
+		done \
+		&& ip link set dev "$BRIDGE" up
 
 	 echo 1 > /proc/sys/net/ipv4/ip_forward
-	 echo 0 > /proc/sys/net/ipv6/conf/${BRIDGE}/accept_dad || true
+	 echo 0 > "/proc/sys/net/ipv6/conf/$BRIDGE/accept_dad" || true
 
 	if [ -n "$BRIDGE_IPV6_ADDR" ] && [ -n "$BRIDGE_IPV6_MASK" ] && [ "$BRIDGE_IPV6_NETWORK" ]; then
 		echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
-		echo 0 > /proc/sys/net/ipv6/conf/${BRIDGE}/autoconf
-		ip -6 addr add dev ${BRIDGE} ${BRIDGE_IPV6_ADDR}/${BRIDGE_IPV6_MASK}
-		if [ "$BRIDGE_IPV6_NAT" = "true" ]; then
-			ip6tables -w -t nat -A POSTROUTING -s ${BRIDGE_IPV6_NETWORK} ! -d ${BRIDGE_IPV6_NETWORK} -j MASQUERADE
-		fi
-		command_args="$command_args --dhcp-range=${BRIDGE_IPV6_ADDR},ra-only --listen-address ${BRIDGE_IPV6_ADDR}"
+		echo 0 > "/proc/sys/net/ipv6/conf/$BRIDGE/autoconf"
+
+		ip -6 addr add dev "$BRIDGE" "$BRIDGE_IPV6_ADDR/$BRIDGE_IPV6_MASK"
+
+		command_args="$command_args --dhcp-range=$BRIDGE_IPV6_ADDR,ra-only --listen-address $BRIDGE_IPV6_ADDR"
 	fi
 
 }
 
 start_pre() {
-	$command --test --conf-file=$DNSMASQ_CONFFILE >/dev/null 2>&1 \
-		|| $command --test || return 1
-	checkpath -m 0644 -o dnsmasq:dnsmasq -f $leasefile || return 1
+	$command --test --conf-file="$cfgfile" >/dev/null 2>&1 \
+		|| $command --test \
+		|| return 1
 
-	if [ -n "$DNSMASQ_CONFFILE" ]; then
-		command_args="$command_args --conf-file=$DNSMASQ_CONFFILE"
-	fi
-	if [ -z "$BRIDGE" ]; then
-		return 0
-	fi
+	checkpath -m 0644 -o "$user:$group" -f "$leasefile" || return 1
 
-	setup_bridge
-	if [ -z "$DISABLE_IPTABLES" ]; then
-		setup_firewall -I -A
+	if [ -n "$BRIDGE" ]; then
+		setup_bridge
+		if ! yesno "$DISABLE_IPTABLES"; then
+			setup_firewall -I -A
+		fi
+		if yesno "$DNSMASQ_LISTEN_BRIDGE_ADDR"; then
+			local addr; for addr in $BRIDGE_ADDR; do
+				command_args="$command_args --listen-address ${addr%/*}"
+			done
+		fi
+		command_args="$command_args --strict-order --bind-interfaces --except-interface=lo --interface=$BRIDGE"
+		command_args="$command_args --dhcp-range $BRIDGE_DHCP_RANGE --dhcp-lease-max=$BRIDGE_DHCP_MAX --dhcp-no-override --dhcp-leasefile=$leasefile --dhcp-authoritative"
 	fi
-	if yesno "$DNSMASQ_LISTEN_BRIDGE_ADDR"; then
-		local addr
-		for addr in $BRIDGE_ADDR; do
-			command_args="$command_args --listen-address ${addr%/*}"
-		done
+
+	if command -v "$setup_command" >/dev/null; then
+		$setup_command || return 1
 	fi
-	command_args="$command_args --strict-order --bind-interfaces --except-interface=lo --interface=$BRIDGE --dhcp-range $BRIDGE_DHCP_RANGE --dhcp-lease-max=$BRIDGE_DHCP_MAX --dhcp-no-override --dhcp-leasefile=$leasefile --dhcp-authoritative"
 }
 
 stop_post() {
 	if [ -n "$BRIDGE" ]; then
-		local addr
-		for addr in $BRIDGE_ADDR $BRIDGE_ADDR_EXTRA; do
+		local addr; for addr in $BRIDGE_ADDR $BRIDGE_ADDR_EXTRA; do
 			case "$addr" in
-			*/*) ip addr del $addr dev $BRIDGE;;
-			*) ip addr del $addr/${BRIDGE_NETMASK} dev $BRIDGE;;
+				*/*) ip addr del "$addr" dev "$BRIDGE";;
+				*) ip addr del "$addr/$BRIDGE_NETMASK" dev "$BRIDGE";;
 			esac
 		done
-		ip link set dev $BRIDGE down
-		if [ -z "$DISABLE_IPTABLES" ]; then
+		ip link set dev "$BRIDGE" down
+		if ! yesno "$DISABLE_IPTABLES"; then
 			setup_firewall -D -D
 		fi
 		# dont destroy if there are attached interfaces
-		ls /sys/class/net/${BRIDGE}/brif/* > /dev/null 2>&1 || ip link delete ${BRIDGE}
+		ls /sys/class/net/"$BRIDGE"/brif/* > /dev/null 2>&1 || ip link delete "$BRIDGE"
 	fi
 }
 
 reload() {
 	ebegin "Reloading $RC_SVCNAME"
-	$command --test --conf-file=$DNSMASQ_CONFFILE >/dev/null 2>&1 \
-		|| $command --test || return 1
-	start-stop-daemon --signal HUP --pidfile "$pidfile"
+
+	$command --test --conf-file="$cfgfile" >/dev/null 2>&1 \
+		|| $command --test \
+		|| return 1
+
+	if [ "$supervisor" ]; then
+		$supervisor "$RC_SVCNAME" --signal HUP
+	else
+		start-stop-daemon --signal HUP --pidfile "$pidfile"
+	fi
 	eend $?
 }
 
 checkconfig() {
 	ebegin "Checking $RC_SVCNAME configuration"
-	$command --test --conf-file=$DNSMASQ_CONFFILE
+
+	$command --test --conf-file="$cfgfile"
+
 	eend $?
 }
diff --git a/main/dnsmasq/nettle-3.5.patch b/main/dnsmasq/nettle-3.5.patch
deleted file mode 100644
index 7d77a21de7c..00000000000
--- a/main/dnsmasq/nettle-3.5.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 6fd9aba7abe1e084123bc5002959350897774ace Mon Sep 17 00:00:00 2001
-From: Vladislav Grishenko <themiron@mail.ru>
-Date: Wed, 26 Jun 2019 20:27:11 +0500
-Subject: [PATCH] Fix build with libnettle 3.5
-
----
- src/crypto.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/crypto.c b/src/crypto.c
-index 1f1c12b..9cfe371 100644
---- a/src/crypto.c
-+++ b/src/crypto.c
-@@ -296,6 +296,10 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
-   static struct ecc_point *key_256 = NULL, *key_384 = NULL;
-   static mpz_t x, y;
-   static struct dsa_signature *sig_struct;
-+#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR < 4
-+#define nettle_get_secp_256r1() (&nettle_secp_256r1)
-+#define nettle_get_secp_384r1() (&nettle_secp_384r1)
-+#endif
-   
-   if (!sig_struct)
-     {
-@@ -315,7 +319,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
- 	  if (!(key_256 = whine_malloc(sizeof(struct ecc_point))))
- 	    return 0;
- 	  
--	  nettle_ecc_point_init(key_256, &nettle_secp_256r1);
-+	  nettle_ecc_point_init(key_256, nettle_get_secp_256r1());
- 	}
-       
-       key = key_256;
-@@ -328,7 +332,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
- 	  if (!(key_384 = whine_malloc(sizeof(struct ecc_point))))
- 	    return 0;
- 	  
--	  nettle_ecc_point_init(key_384, &nettle_secp_384r1);
-+	  nettle_ecc_point_init(key_384, nettle_get_secp_384r1());
- 	}
-       
-       key = key_384;
diff --git a/main/dnsmasq/uncomment-conf-dir.patch b/main/dnsmasq/uncomment-conf-dir.patch
deleted file mode 100644
index 9b64427db2a..00000000000
--- a/main/dnsmasq/uncomment-conf-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/dnsmasq.conf.example	2016-08-02 11:30:24.207034952 +0200
-+++ b/dnsmasq.conf.example	2016-08-02 11:30:34.094695721 +0200
-@@ -671,7 +671,7 @@
- #conf-dir=/etc/dnsmasq.d,.bak
- 
- # Include all files in a directory which end in .conf
--#conf-dir=/etc/dnsmasq.d/,*.conf
-+conf-dir=/etc/dnsmasq.d/,*.conf
- 
- # If a DHCP client claims that its name is "wpad", ignore that.
- # This fixes a security hole. see CERT Vulnerability VU#598349
diff --git a/main/dnssec-root/APKBUILD b/main/dnssec-root/APKBUILD
index f6bd8293c31..a9d4f889a3a 100644
--- a/main/dnssec-root/APKBUILD
+++ b/main/dnssec-root/APKBUILD
@@ -3,21 +3,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dnssec-root
 pkgver=20190225
-pkgrel=0
+pkgrel=2
 _commit=67c11662510f5e2db6e6517228e80b794950c43f
 pkgdesc="The DNSSEC root key(s)"
 url="https://www.iana.org/dnssec/"
 arch="noarch"
 license="Public-Domain"
-depends=""
 makedepends="python3 openssl"
-install=""
-subpackages=""
-options="net"
 source="$pkgname-$pkgver.tar.gz::https://github.com/iana-org/get-trust-anchor/archive/$_commit.tar.gz
 	trusted-key.key
 	"
-builddir="$srcdir"/get-trust-anchor-$_commit
+options="!check" # No tests
+builddir="$srcdir/get-trust-anchor-$_commit"
 
 snapshot() {
 	unpack
@@ -28,7 +25,6 @@ snapshot() {
 }
 
 package() {
-	cd "$builddir"
 	install -Dm644 "$srcdir"/trusted-key.key \
 		"$pkgdir"/usr/share/$pkgname/trusted-key.key
 }
diff --git a/main/dnstop/APKBUILD b/main/dnstop/APKBUILD
index 5c4c9278f63..534abe6e2e8 100644
--- a/main/dnstop/APKBUILD
+++ b/main/dnstop/APKBUILD
@@ -1,48 +1,34 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=dnstop
 pkgver=20140915
-pkgrel=3
+pkgrel=7
 pkgdesc="A DNS traffic capture utility"
 url="http://dns.measurement-factory.com/tools/dnstop/"
 arch="all"
-license="BSD"
-depends=""
-depends_dev=""
+license="BSD-3-Clause"
 makedepends="libpcap-dev ncurses-dev"
-install=""
 subpackages="$pkgname-doc"
-source="http://dns.measurement-factory.com/tools/dnstop/src/$pkgname-$pkgver.tar.gz
+source="http://dns.measurement-factory.com/tools/dnstop/src/dnstop-$pkgver.tar.gz
 	musl-fix.patch
 	"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+options="!check"
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--mandir=/usr/share/man \
-		|| return 1
-	make || return 1
+		--mandir=/usr/share/man
+	make
 }
 
 package() {
-	cd "$_builddir"
 	mkdir -p "$pkgdir"/usr/bin "$pkgdir"/usr/share/man/man8
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="902cf96f7366983cae4bf684e44fbe12f6e982cee8ff489329e25e1a13de60870d356906a99fee56c6da2258c4a39074a504389549c6c2e239a4ea94d8b9a65d  dnstop-20140915.tar.gz
-8b1bcfb73f7acf8ab264f44a9fb3bb5bdc7b6beec3ea87ecf9d82898e83c5bd6e43bb12f6d72a9fe362c21210c4c2461c32bb23de03a938f20e2d7f0629f3a3d  musl-fix.patch"
+sha512sums="
+902cf96f7366983cae4bf684e44fbe12f6e982cee8ff489329e25e1a13de60870d356906a99fee56c6da2258c4a39074a504389549c6c2e239a4ea94d8b9a65d  dnstop-20140915.tar.gz
+8b1bcfb73f7acf8ab264f44a9fb3bb5bdc7b6beec3ea87ecf9d82898e83c5bd6e43bb12f6d72a9fe362c21210c4c2461c32bb23de03a938f20e2d7f0629f3a3d  musl-fix.patch
+"
diff --git a/main/doas-sudo-shim/APKBUILD b/main/doas-sudo-shim/APKBUILD
new file mode 100644
index 00000000000..a616497ac72
--- /dev/null
+++ b/main/doas-sudo-shim/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=doas-sudo-shim
+# Note: This should be always lower than pkgver of the real sudo!
+pkgver=0.1.1
+pkgrel=1
+pkgdesc="A shim for the sudo command that utilizes doas"
+url="https://github.com/jirutka/doas-sudo-shim"
+arch="noarch"
+license="ISC"
+depends="cmd:doas"
+makedepends="asciidoctor doas"
+subpackages="$pkgname-doc"
+source="https://github.com/jirutka/doas-sudo-shim/archive/v$pkgver/doas-sudo-shim-$pkgver.tar.gz
+	help-alpine.patch
+	"
+options="!check"  # no tests provided
+
+build() {
+	make man
+}
+
+package() {
+	depends="$depends !sudo"  # this must not be defined on top-level
+	provides="sudo-virt"
+	provider_priority=1
+
+	make install DESTDIR="$pkgdir" PREFIX=/usr
+}
+
+sha512sums="
+f97654e4328a5d632b35a80772ab385c461614c771aafe89440240e6e733ac9572db1b6669b7146a1db0463b70cd34f3f8693df3b2a7bd07912e6a3d6a15e8ae  doas-sudo-shim-0.1.1.tar.gz
+86e2d7e7ac3bb855ce2677e2f86092facb6da2f8d4e6fc24149b9bf836590be17f340fba54b74fd24d280b79be6ed97d405f7ce2e972f2bb5d12cf6bfe0bc9f7  help-alpine.patch
+"
diff --git a/main/doas-sudo-shim/help-alpine.patch b/main/doas-sudo-shim/help-alpine.patch
new file mode 100644
index 00000000000..be170993ded
--- /dev/null
+++ b/main/doas-sudo-shim/help-alpine.patch
@@ -0,0 +1,12 @@
+--- a/sudo
++++ b/sudo
+@@ -14,6 +14,9 @@
+ 	a subset of the sudo options (both short and long) that have an equivalent in
+ 	doas, plus option -i (--login). Refer to sudo(1) for more information.
+ 
++	If you need some sudo features that are not supported in doas, replace
++	package 'doas-sudo-shim' with 'sudo': apk add sudo !doas-sudo-shim.
++
+ 	Please report bugs at <https://github.com/jirutka/doas-sudo-shim/issues>.
+ 	EOF
+ }
diff --git a/main/doas/APKBUILD b/main/doas/APKBUILD
index 6c490d841c5..a1b232f486c 100644
--- a/main/doas/APKBUILD
+++ b/main/doas/APKBUILD
@@ -1,22 +1,33 @@
-# Maintainer: Drew DeVault <sir@cmpwn.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=doas
-pkgver=6.6.1
-pkgrel=0
+pkgver=6.8.2
+pkgrel=6
 pkgdesc="OpenBSD's temporary privilege escalation tool"
 url="https://github.com/Duncaen/OpenDoas"
 arch="all"
-license="BSD"
+license="ISC"
 makedepends="bison"
 subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/Duncaen/OpenDoas/archive/v$pkgver.tar.gz"
+install="$pkgname.post-upgrade"
+source="$pkgname-$pkgver.tar.gz::https://github.com/Duncaen/OpenDoas/archive/v$pkgver.tar.gz
+	configuration-directory.patch
+	manpage-example-path.patch
+	change-PATH.patch
+	doas.conf
+	"
 builddir="$srcdir/OpenDoas-$pkgver"
 options="$options suid"
 
+# secfixes:
+#   6.8-r1:
+#     - CVE-2019-25016
+
 build() {
 	./configure \
 		--prefix=/usr \
 		--without-pam \
-		--with-timestamp
+		--with-timestamp \
+		--with-doas-confdir
 	make
 }
 
@@ -27,14 +38,17 @@ check() {
 
 package() {
 	make install DESTDIR="$pkgdir"
-	install -d "$pkgdir"/etc
-	cat > "$pkgdir"/etc/doas.conf <<-EOF
-	# see doas.conf(5) for configuration details
 
-	# Uncomment to allow group "wheel" to become root
-	# permit persist :wheel
-	EOF
-	chmod 440 "$pkgdir"/etc/doas.conf
+	install -d -m 750 "$pkgdir"/etc/doas.d
+	install -m 640 "$srcdir"/doas.conf -t "$pkgdir"/etc/
+
+	install -D -m 644 "$srcdir"/doas.conf "$pkgdir"/usr/share/doc/$pkgname/doas.conf.example
 }
 
-sha512sums="390e0e139a2641be22c4493c3ed755d9cb4091f4ab8d590123b7c8c4f2f116cea3b3500926ff191fb98d92192ca9e92118cbcbeb463a7833763e00c65603e678  doas-6.6.1.tar.gz"
+sha512sums="
+4a93ff477413c859ba2702e688fa4f83248fff85e61e12336838a1e9aa1a8d9963a9782e4bc5e58e8d04b86c2c8ceb6b235ae9d3b32b3e548a2514a43653137d  doas-6.8.2.tar.gz
+efad2866d9d3e26266bdb37555453a436aa88ff4b8877b2ba01f7446ea095d998313aa566cafba30d426c79968d3d4a610dfbaa2e33735ab60f1283c9d9fa4ef  configuration-directory.patch
+60efd196595bda2c4f036cd0080a8825a85fedcc7524c917304b342373863213b3c557b4336f1dab760f167fd8cc2a59b2e744d8a47ff8a8acebbe74b1328f4f  manpage-example-path.patch
+31a87aced097ea1189c2162172788cd27b82af318db3476e1c143d3c87d99e2aa6350f63b81361d0a54482ba8dd0cfd10928ff6074a4c66248a1ec815a274f68  change-PATH.patch
+b52a9cfe5cea9068db0f2ff09d2c2520a09603bd5cc5586031fcb2496a11b87c0b5ffc5bac2bfa9a9daafd04d9d3c8b3c93cf413a7b835c36a7a12bd60844598  doas.conf
+"
diff --git a/main/doas/change-PATH.patch b/main/doas/change-PATH.patch
new file mode 100644
index 00000000000..c0fb7a51ba3
--- /dev/null
+++ b/main/doas/change-PATH.patch
@@ -0,0 +1,19 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Tue, 28 Jun 2022 22:36:16 +0200
+Subject: [PATCH] Change default PATH to the Alpine's default
+
+Use the same PATH as in openssh, sudo and our /etc/profile.
+
+--- a/doas.c
++++ b/doas.c
+@@ -238,8 +238,8 @@
+ int
+ main(int argc, char **argv)
+ {
+-	const char *safepath = "/bin:/sbin:/usr/bin:/usr/sbin:"
+-	    "/usr/local/bin:/usr/local/sbin";
++	const char *safepath = "/usr/local/sbin:/usr/local/bin:"
++	    "/usr/sbin:/usr/bin:/sbin:/bin";
+ 	const char *confpath = NULL;
+ 	char *shargv[] = { NULL, NULL };
+ 	char *sh;
diff --git a/main/doas/configuration-directory.patch b/main/doas/configuration-directory.patch
new file mode 100644
index 00000000000..1ab9b968d1e
--- /dev/null
+++ b/main/doas/configuration-directory.patch
@@ -0,0 +1,447 @@
+Patch-Source: https://github.com/Duncaen/OpenDoas/pull/71 (rebased + one extra commit)
+--
+From a6aa77d9f4b9ad4556e478d6779dbebd4143a98a Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 4 Aug 2021 04:47:04 -0600
+Subject: [PATCH] add --with-confdir feature
+
+This adds support for an /etc/doas.d configuration directory as discussed in #61. It is disabled by default.
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 9470202..22be971 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -27,6 +27,7 @@ install: ${PROG} ${PAM_DOAS} ${MAN}
+ 	[ -n "${PAM_DOAS}" ] && chmod 0644 ${DESTDIR}${PAMDIR}/doas || true
+ 	cp -f doas.1 ${DESTDIR}${MANDIR}/man1
+ 	cp -f doas.conf.5 ${DESTDIR}${MANDIR}/man5
++	cp -f doas.d.5 ${DESTDIR}${MANDIR}/man5
+ 
+ uninstall:
+ 	rm -f ${DESTDIR}${BINDIR}/${PROG}
+diff --git a/README.md b/README.md
+index 20ef9f2..92acded 100644
+--- a/README.md
++++ b/README.md
+@@ -43,3 +43,12 @@ similar to sudo.
+ 
+ See the comment block in `timestamp.c` for an in-depth description on how
+ timestamps are created and checked to be as safe as possible.
++
++### `--with-doas-confdir`
++
++An optional feature can be enabled which will result in `doas` reading configuration
++snippets from `/etc/doas.d`.  These configuration snippets have the same requirements
++as `/etc/doas.conf` (owned by root, not world-writable).
++
++If this feature is enabled, only the `/etc/doas.d` directory is read, and the historical
++`/etc/doas.conf` file is ignored.
+\ No newline at end of file
+diff --git a/configure b/configure
+index 1c5d989..22a078e 100755
+--- a/configure
++++ b/configure
+@@ -28,6 +28,7 @@ usage: configure [options]
+   --without-shadow       disable shadow support
+ 
+   --with-timestamp       enable timestamp support
++  --with-doas-confdir    enable configuration directory support
+ 
+   --uid-max=NUM          set UID_MAX (default 65535)
+   --gid-max=NUM          set GID_MAX (default 65535)
+@@ -39,6 +40,7 @@ EOF
+ 
+ # defaults
+ WITHOUT_TIMESTAMP=yes
++WITHOUT_CONFDIR=yes
+ UID_MAX=65535
+ GID_MAX=65535
+ 
+@@ -58,6 +60,8 @@ for x; do
+ 	--target) TARGET=$var ;;
+ 	--enable-debug) DEBUG=yes ;;
+ 	--enable-static) BUILD_STATIC=yes ;;
++	--with-doas-confdir) WITHOUT_CONFDIR= ;;
++	--without-doas-confdir) WITHOUT_CONFDIR=yes ;;
+ 	--with-pam) WITHOUT_PAM=; WITHOUT_SHADOW=yes ;;
+ 	--with-shadow) WITHOUT_SHADOW=; WITHOUT_PAM=yes ;;
+ 	--without-pam) WITHOUT_PAM=yes ;;
+@@ -565,4 +569,8 @@ fi
+ 
+ printf '#define DOAS_CONF "%s/doas.conf"\n' "${SYSCONFDIR}" >>$CONFIG_H
+ 
++if [ -z "$WITHOUT_CONFDIR" ]; then
++	printf '#define DOAS_CONFDIR "%s/doas.d"\n' "${SYSCONFDIR}" >>$CONFIG_H
++fi
++
+ printf '\n#endif /* CONFIG_H */\n' >>$CONFIG_H
+diff --git a/doas.c b/doas.c
+index ac3a42a..d77186b 100644
+--- a/doas.c
++++ b/doas.c
+@@ -35,6 +35,7 @@
+ #include <syslog.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <dirent.h>
+ 
+ #include "openbsd.h"
+ #include "doas.h"
+@@ -155,6 +156,7 @@ permit(uid_t uid, gid_t *groups, int ngroups, const struct rule **lastr,
+ static void
+ parseconfig(const char *filename, int checkperms)
+ {
++	extern const char *yyfn;
+ 	extern FILE *yyfp;
+ 	extern int yyparse(void);
+ 	struct stat sb;
+@@ -164,6 +166,8 @@ parseconfig(const char *filename, int checkperms)
+ 		err(1, checkperms ? "doas is not enabled, %s" :
+ 		    "could not open config file %s", filename);
+ 
++	yyfn = filename;
++
+ 	if (checkperms) {
+ 		if (fstat(fileno(yyfp), &sb) != 0)
+ 			err(1, "fstat(\"%s\")", filename);
+@@ -174,11 +178,82 @@ parseconfig(const char *filename, int checkperms)
+ 	}
+ 
+ 	yyparse();
++	yyfn = NULL;
++
+ 	fclose(yyfp);
+ 	if (parse_errors)
+ 		exit(1);
+ }
+ 
++#ifdef DOAS_CONFDIR
++static int
++isconfdir(const char *dirpath)
++{
++	struct stat sb;
++
++	if (lstat(dirpath, &sb) != 0) {
++		if (errno != ENOENT)
++			err(1, "lstat(\"%s\")", dirpath);
++
++		errno = ENOTDIR;
++		return 0;
++	}
++
++	if ((sb.st_mode & (S_IFMT)) == S_IFDIR)
++		return 1;
++
++	errno = ENOTDIR;
++	return 0;
++}
++
++static void
++parseconfdir(const char *dirpath, int checkperms)
++{
++	struct dirent **dirent_table;
++	int i, m, dirent_count;
++	char pathbuf[PATH_MAX];
++
++	if (!isconfdir(dirpath))
++		err(1, checkperms ? "doas is not enabled, %s" :
++		    "could not open config directory %s", dirpath);
++
++	dirent_count = scandir(dirpath, &dirent_table, NULL, alphasort);
++	if (dirent_count < 0)
++		err(1, checkperms ? "doas is not enabled, %s" :
++		    "could not open config directory %s", dirpath);
++
++	for (i = 0, m = 0; i < dirent_count; i++)
++	{
++		struct stat sb;
++		size_t pathlen;
++
++		pathlen = snprintf(pathbuf, sizeof pathbuf, "%s/%s", dirpath, dirent_table[i]->d_name);
++		free(dirent_table[i]);
++
++		/* make sure path ends in .conf */
++		if (pathlen < 6)
++			continue;
++
++		if (strcmp(pathbuf + (pathlen - 5), ".conf"))
++			continue;
++
++		if (stat(pathbuf, &sb) != 0)
++			err(1, "stat(\"%s\")", pathbuf);
++
++		if ((sb.st_mode & (S_IFMT)) != S_IFREG)
++			continue;
++
++		parseconfig(pathbuf, checkperms);
++		m++;
++	}
++
++	free(dirent_table);
++
++	if (!m)
++		errx(1, "doas is not enabled, %s: no matching configuration files found\n", dirpath);
++}
++#endif
++
+ static void __dead
+ checkconfig(const char *confpath, int argc, char **argv,
+     uid_t uid, gid_t *groups, int ngroups, uid_t target)
+@@ -188,6 +263,11 @@ checkconfig(const char *confpath, int argc, char **argv,
+ 	if (setresuid(uid, uid, uid) != 0)
+ 		err(1, "setresuid");
+ 
++#ifdef DOAS_CONFDIR
++	if (isconfdir(confpath))
++		parseconfdir(confpath, 0);
++	else
++#endif
+ 	parseconfig(confpath, 0);
+ 	if (!argc)
+ 		exit(0);
+@@ -330,6 +410,11 @@ main(int argc, char **argv)
+ 	if (geteuid())
+ 		errx(1, "not installed setuid");
+ 
++#ifdef DOAS_CONFDIR
++	if (isconfdir(DOAS_CONFDIR))
++		parseconfdir(DOAS_CONFDIR, 1);
++	else
++#endif
+ 	parseconfig(DOAS_CONF, 1);
+ 
+ 	/* cmdline is used only for logging, no need to abort on truncate */
+diff --git a/doas.conf.5 b/doas.conf.5
+index e98bfbe..e90d512 100644
+--- a/doas.conf.5
++++ b/doas.conf.5
+@@ -143,6 +143,7 @@ permit nopass keepenv setenv { PATH } root as root
+ .Ed
+ .Sh SEE ALSO
+ .Xr doas 1 ,
++.Xr doas.d 5 ,
+ .Xr syslogd 8
+ .Sh HISTORY
+ The
+diff --git a/doas.d.5 b/doas.d.5
+new file mode 100644
+index 0000000..c5eaa72
+--- /dev/null
++++ b/doas.d.5
+@@ -0,0 +1,50 @@
++.\"Copyright (c) 2021 Ariadne Conill <ariadne@dereferenced.org>
++.\"
++.\"Permission to use, copy, modify, and distribute this software for any
++.\"purpose with or without fee is hereby granted, provided that the above
++.\"copyright notice and this permission notice appear in all copies.
++.\"
++.\"THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++.\"WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++.\"MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++.\"ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++.\"WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++.\"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++.\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++.Dd $Mdocdate: October 9 2020 $
++.Dt DOAS.D 5
++.Os
++.Sh NAME
++.Nm doas.d
++.Nd doas configuration directory
++.Sh DESCRIPTION
++The
++.Xr doas 1
++utility executes commands as other users according to the rules
++configured in either the configuration file or, optionally, the
++configuration directory.  The preference to use the configuration
++file or configuration directory is determined at compile time,
++.Xr doas 1
++will only consult one or the other.
++.Pp
++Configuration snippets stored in the configuration directory
++follow the same rules as the classic
++.Xr doas 1
++configuration file, documented in
++.Xr doas.conf 5 .
++They must end with the .conf extension, or they will be ignored.
++.Pp
++These snippets are read in alphabetical order and thus can be
++ordered in the same way as other configuration directories.
++.Sh FILES
++.Bl -tag -width /etc/doas.d -compact
++.It Pa /etc/doas.d
++.Xr doas 1
++configuration directory.
++.Sh SEE ALSO
++.Xr doas 1 ,
++.Xr doas.conf 5
++.Sh HISTORY
++The
++.Nm
++configuration directory first appeared in OpenDoas.
+diff --git a/parse.y b/parse.y
+index 388c2a5..c6d7ebf 100644
+--- a/parse.y
++++ b/parse.y
+@@ -49,6 +49,7 @@ typedef struct {
+ } yystype;
+ #define YYSTYPE yystype
+ 
++const char *yyfn;
+ FILE *yyfp;
+ 
+ struct rule **rules;
+@@ -203,7 +204,7 @@ yyerror(const char *fmt, ...)
+ 	va_start(va, fmt);
+ 	vfprintf(stderr, fmt, va);
+ 	va_end(va);
+-	fprintf(stderr, " at line %d\n", yylval.lineno + 1);
++	fprintf(stderr, " at %s, line %d\n", yyfn, yylval.lineno + 1);
+ 	parse_errors++;
+ }
+ 
+--
+From c871cf723cc4cc1045ffc7de380f5271b4c29acf Mon Sep 17 00:00:00 2001
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sat, 13 May 2023 22:38:23 +0200
+Subject: [PATCH 9/9] read both /etc/doas.conf and /etc/doas.d/*.conf if
+ confdir is enabled
+
+The current behaviour of the configuration directory was required by the
+upstream, but it doesn't conform to established conventions used by
+virtually all programs on Linux that support modular configuration, and
+what the users naturally expect. Also, when someone used to vanilla
+OpenDoas or doas on BSD comes to Alpine, the way they're used to
+configuring it (via /etc/doas.conf) will no work without notice! It
+has already caused some problems and confusion.
+
+The current behaviour is: if /etc/doas.d exists, there must be at least one
+*.conf file and /etc/doas.conf is *ignored*.
+
+Since it doesn't look like the upstream will ever merge this, better to
+fix this patch to work as it should from the beginning...
+
+This new behaviour: /etc/doas.conf must always exist (as in unpatched
+OpenDoas) and will be read first; if /etc/doas.d exists and there are any
+*.conf files, they will be loaded as well.
+---
+ README.md |  7 +++----
+ doas.c    | 22 +++++-----------------
+ doas.d.5  | 14 +++++---------
+ 3 files changed, 13 insertions(+), 30 deletions(-)
+
+diff --git a/README.md b/README.md
+index 92acded..d5b2e72 100644
+--- a/README.md
++++ b/README.md
+@@ -48,7 +48,6 @@ timestamps are created and checked to be as safe as possible.
+ 
+ An optional feature can be enabled which will result in `doas` reading configuration
+ snippets from `/etc/doas.d`.  These configuration snippets have the same requirements
+-as `/etc/doas.conf` (owned by root, not world-writable).
+-
+-If this feature is enabled, only the `/etc/doas.d` directory is read, and the historical
+-`/etc/doas.conf` file is ignored.
+\ No newline at end of file
++as `/etc/doas.conf` (owned by root, not world-writable).  The main configuration file
++`/etc/doas.conf` is still required to exist and it is read before `/etc/doas.d`.  It is
++not an error if `/etc/doas.d` does not exist or no matching files are found there.
+diff --git a/doas.c b/doas.c
+index d77186b..affbe39 100644
+--- a/doas.c
++++ b/doas.c
+@@ -210,19 +210,14 @@ static void
+ parseconfdir(const char *dirpath, int checkperms)
+ {
+ 	struct dirent **dirent_table;
+-	int i, m, dirent_count;
++	int i, dirent_count;
+ 	char pathbuf[PATH_MAX];
+ 
+-	if (!isconfdir(dirpath))
+-		err(1, checkperms ? "doas is not enabled, %s" :
+-		    "could not open config directory %s", dirpath);
+-
+ 	dirent_count = scandir(dirpath, &dirent_table, NULL, alphasort);
+ 	if (dirent_count < 0)
+-		err(1, checkperms ? "doas is not enabled, %s" :
+-		    "could not open config directory %s", dirpath);
++		return;
+ 
+-	for (i = 0, m = 0; i < dirent_count; i++)
++	for (i = 0; i < dirent_count; i++)
+ 	{
+ 		struct stat sb;
+ 		size_t pathlen;
+@@ -244,13 +239,9 @@ parseconfdir(const char *dirpath, int checkperms)
+ 			continue;
+ 
+ 		parseconfig(pathbuf, checkperms);
+-		m++;
+ 	}
+ 
+ 	free(dirent_table);
+-
+-	if (!m)
+-		errx(1, "doas is not enabled, %s: no matching configuration files found\n", dirpath);
+ }
+ #endif
+ 
+@@ -263,12 +254,11 @@ checkconfig(const char *confpath, int argc, char **argv,
+ 	if (setresuid(uid, uid, uid) != 0)
+ 		err(1, "setresuid");
+ 
++	parseconfig(confpath, 0);
+ #ifdef DOAS_CONFDIR
+ 	if (isconfdir(confpath))
+ 		parseconfdir(confpath, 0);
+-	else
+ #endif
+-	parseconfig(confpath, 0);
+ 	if (!argc)
+ 		exit(0);
+ 
+@@ -410,13 +400,11 @@ main(int argc, char **argv)
+ 	if (geteuid())
+ 		errx(1, "not installed setuid");
+ 
++	parseconfig(DOAS_CONF, 1);
+ #ifdef DOAS_CONFDIR
+ 	if (isconfdir(DOAS_CONFDIR))
+ 		parseconfdir(DOAS_CONFDIR, 1);
+-	else
+ #endif
+-	parseconfig(DOAS_CONF, 1);
+-
+ 	/* cmdline is used only for logging, no need to abort on truncate */
+ 	(void)strlcpy(cmdline, argv[0], sizeof(cmdline));
+ 	for (i = 1; i < argc; i++) {
+diff --git a/doas.d.5 b/doas.d.5
+index c5eaa72..5911a12 100644
+--- a/doas.d.5
++++ b/doas.d.5
+@@ -21,14 +21,9 @@
+ The
+ .Xr doas 1
+ utility executes commands as other users according to the rules
+-configured in either the configuration file or, optionally, the
+-configuration directory.  The preference to use the configuration
+-file or configuration directory is determined at compile time,
+-.Xr doas 1
+-will only consult one or the other.
+-.Pp
+-Configuration snippets stored in the configuration directory
+-follow the same rules as the classic
++configured in the configuration file and, optionally, the
++configuration directory.  Configuration snippets stored in the
++configuration directory follow the same rules as the classic
+ .Xr doas 1
+ configuration file, documented in
+ .Xr doas.conf 5 .
+@@ -47,4 +42,5 @@ configuration directory.
+ .Sh HISTORY
+ The
+ .Nm
+-configuration directory first appeared in OpenDoas.
++configuration directory first appeared as a patch for doas on
++Alpine Linux and it is not supported in upstream OpenDoas.
diff --git a/main/doas/doas.conf b/main/doas/doas.conf
new file mode 100644
index 00000000000..98594f757bb
--- /dev/null
+++ b/main/doas/doas.conf
@@ -0,0 +1,4 @@
+# See doas.conf(5) and doas.d(5) for configuration details.
+
+# Uncomment to allow group "wheel" to become root.
+# permit persist :wheel
diff --git a/main/doas/doas.post-upgrade b/main/doas/doas.post-upgrade
new file mode 100644
index 00000000000..113f801d39f
--- /dev/null
+++ b/main/doas/doas.post-upgrade
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+ver_old="$2"
+
+if [ "$(apk version -t "$ver_old" '6.8.1-r6')" = '<' ]; then
+	if [ "$(stat -c "%a" /etc/doas.d)" = "755" ]; then
+		chmod 0750 /etc/doas.d
+	fi
+fi
+
+if [ "$(apk version -t "$ver_old" '6.8.1-r4')" = '<' ]; then
+	:  # do nothing, this is prior renaming /etc/doas.conf to /etc/doas.d/doas.conf
+
+# Undo what was done by the previous post-{install,upgrade} script.
+elif [ "$(apk version -t "$ver_old" '6.8.2-r5')" = '<' ]; then
+	cat >&2 <<-EOF
+	*
+	* Since 6.8.2-r5, doas reads both /etc/doas.conf and /etc/doas.d/*.conf
+	* (if exists), in this order, and /etc/doas.conf is required to exist.
+	*
+	EOF
+	if [ -L /etc/doas.conf ] && [ "$(readlink -f /etc/doas.conf)" = '/etc/doas.d/doas.conf' ]; then
+		cat >&2 <<-EOF
+		* Removing /etc/doas.conf symlink and moving /etc/doas.d/doas.conf
+		* to /etc/doas.conf.
+		*
+		EOF
+		rm /etc/doas.conf  # symlink
+		mv /etc/doas.d/doas.conf /etc/doas.conf  # user's config
+
+		# Remove outdated comment added by the previous post-upgrade script.
+		# Note: /etc/doas.conf.apk-new has been created by the upgrade,
+		#  so it already has correct perms.
+		cat /etc/doas.conf \
+			| tr '\n' '\f' \
+			| sed 's|# This file is actually located at /etc/doas.d/doas.conf, and reflects\f# the system doas configuration.  It may have been migrated from its\f# previous location, /etc/doas.conf, automatically.\f||' \
+			| tr '\f' '\n' \
+			> /etc/doas.conf.apk-new
+
+	# Note: If /etc/doas.conf existed, the package upgrade has created
+	# doas.conf.apk-new.
+	elif [ -f /etc/doas.conf ] && [ -f /etc/doas.conf.apk-new ] && [ "$(ls /etc/doas.d/*.conf 2>/dev/null)" ]; then
+		bakfile='/etc/doas.conf.bak'
+		[ -e "$bakfile" ] && bakfile="$bakfile$(date +%s)"
+
+		cat >&2 <<-EOF
+		*! CAUTION: /etc/doas.conf already exists and /etc/doas.d is not empty,
+		*! so it's been ignored until now! Renaming it to $bakfile.
+		*! It's strongly recommended that you check your configuration!
+		*
+		EOF
+		mv /etc/doas.conf "$bakfile"  # user's config
+		mv /etc/doas.conf.apk-new /etc/doas.conf  # new config
+
+	elif [ -f /etc/doas.d/doas.conf ]; then
+		cat >&2 <<-EOF
+		* Moving /etc/doas.d/doas.conf to /etc/doas.conf.
+		*
+		EOF
+		mv /etc/doas.conf /etc/doas.conf.apk-new  # new config
+		mv /etc/doas.d/doas.conf /etc/doas.conf  # user's config
+	fi
+fi
+
+exit 0
diff --git a/main/doas/manpage-example-path.patch b/main/doas/manpage-example-path.patch
new file mode 100644
index 00000000000..31048c70d6f
--- /dev/null
+++ b/main/doas/manpage-example-path.patch
@@ -0,0 +1,16 @@
+--- OpenDoas-6.8.1.orig/doas.conf.5
++++ OpenDoas-6.8.1/doas.conf.5
+@@ -114,11 +114,11 @@
+ it is not considered a keyword.
+ .El
+ .Sh FILES
+-.Bl -tag -width /etc/examples/doas.conf -compact
++.Bl -tag -width /usr/share/doc/doas/doas.conf.example -compact
+ .It Pa /etc/doas.conf
+ .Xr doas 1
+ configuration file.
+-.It Pa /etc/examples/doas.conf
++.It Pa /usr/share/doc/doas/doas.conf.example
+ Example configuration file.
+ .El
+ .Sh EXAMPLES
diff --git a/main/docbook-xml/APKBUILD b/main/docbook-xml/APKBUILD
index 5ece603158c..9b95fda9c55 100644
--- a/main/docbook-xml/APKBUILD
+++ b/main/docbook-xml/APKBUILD
@@ -1,19 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=docbook-xml
 pkgver=4.5
-pkgrel=6
+pkgrel=9
 pkgdesc="A widely used XML scheme for writing documentation and help"
-url="http://scrollkeeper.sourceforge.net/docbook.shtml"
+url="https://scrollkeeper.sourceforge.net/docbook.shtml"
 arch="noarch"
 license="MIT"
 depends="libxml2-utils"
-makedepends=
 options="!check"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-source="https://www.docbook.org/xml/$pkgver/$pkgname-$pkgver.zip
-	https://www.docbook.org/xml/4.4/$pkgname-4.4.zip
-	https://www.docbook.org/xml/4.3/$pkgname-4.3.zip
-	https://www.docbook.org/xml/4.2/$pkgname-4.2.zip
+install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
+source="https://www.docbook.org/xml/$pkgver/docbook-xml-$pkgver.zip
+	https://www.docbook.org/xml/4.4/docbook-xml-4.4.zip
+	https://www.docbook.org/xml/4.3/docbook-xml-4.3.zip
+	https://www.docbook.org/xml/4.2/docbook-xml-4.2.zip
 	https://www.docbook.org/xml/4.1.2/docbkx412.zip
 	"
 
@@ -25,19 +24,19 @@ unpack() {
 			4.1.2) _filename=docbkx412.zip;;
 			*) _filename=docbook-xml-$ver.zip;;
 		esac
-		mkdir -p "$srcdir"/docbook-xml-${ver}
-		cd "$srcdir"/docbook-xml-${ver}
-		msg "extracting ${_filename}"
+		mkdir -p "$srcdir"/docbook-xml-$ver
+		cd "$srcdir"/docbook-xml-$ver
+		msg "extracting $_filename"
 		unzip "$srcdir"/$_filename
 	done
 }
 
-package () {
+package() {
 	local ver
 	for ver in $_versions; do
-		cd "$srcdir"/docbook-xml-${ver}
-		mkdir -p "$pkgdir"/usr/share/xml/docbook/xml-dtd-${ver}
-		cp -af docbook.cat *.dtd ent/ *.mod "$pkgdir"/usr/share/xml/docbook/xml-dtd-${ver}/
+		cd "$srcdir"/docbook-xml-$ver
+		mkdir -p "$pkgdir"/usr/share/xml/docbook/xml-dtd-$ver
+		cp -af docbook.cat *.dtd ent/ *.mod "$pkgdir"/usr/share/xml/docbook/xml-dtd-$ver/
 	done
 
 	chmod 755 "$pkgdir"/usr/share/xml/docbook/xml-dtd-*/ent
diff --git a/main/docbook-xml/docbook-xml.post-deinstall b/main/docbook-xml/docbook-xml.pre-deinstall
index ed0157da7a6..ed0157da7a6 100644
--- a/main/docbook-xml/docbook-xml.post-deinstall
+++ b/main/docbook-xml/docbook-xml.pre-deinstall
diff --git a/main/docbook-xsl/APKBUILD b/main/docbook-xsl/APKBUILD
index e5b8be5d90c..d1046cb399a 100644
--- a/main/docbook-xsl/APKBUILD
+++ b/main/docbook-xsl/APKBUILD
@@ -1,30 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=docbook-xsl
 pkgver=1.79.2
-pkgrel=2
+pkgrel=9
 pkgdesc="XML stylesheets for Docbook-xml transformations."
-url="https://docbook.org"
+url="https://docbook.org/"
 arch="noarch"
 license="custom"
 depends="libxml2-utils libxslt docbook-xml"
-makedepends=""
 options="!check"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
+install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
 source="https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F$pkgver/docbook-xsl-$pkgver.tar.gz
 	765567_non-recursive_string_subst.patch
+	f6c5eefbca775e312afebf576a6990344a0b1b69.patch
 	"
 
-build() {
-	return 0
-}
-
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	local _dest dir f
 	_dest="$pkgdir"/usr/share/xml/docbook/xsl-stylesheets-$pkgver
 
 	install -dm755 "$_dest"
-	install -m644 VERSION VERSION.xsl "$_dest"/ || return 1
+	install -m644 VERSION VERSION.xsl "$_dest"/
+	ln -s xsl-stylesheets-$pkgver "${_dest%/*}/xsl-stylesheets"
 
 	for dir in assembly common eclipse epub epub3 fo highlighting html \
 		htmlhelp javahelp lib manpages params profiling roundtrip \
@@ -33,15 +29,18 @@ package() {
 		install -dm755 $_dest/$dir
 		for f in $dir/*.xml $dir/*.xsl $dir/*.dtd $dir/*.ent; do
 			[ -e "$f" ] || continue
-			install -m644 $f $_dest/$dir || return 1
+			install -m644 $f $_dest/$dir
 		done
 	done
 
-	install -dm755 "$pkgdir"/etc/xml || return 1
+	install -dm755 "$pkgdir"/etc/xml
 
 	install -m644 -D COPYING \
 		"$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="cd375e7a2339bcd9d24936b370c4371b351cab7c8a79044e785d0300dab75bed5a5c9b9076d4fba32d39b22535edfc6f449a7b1086139ad8bf54eab844b9434e  docbook-xsl-1.79.2.tar.gz
-3199de6b5a61ed25defa50a55fa3d138b60e1f5e4c2e3b9a14e169099189794adc3ac079fa3f62debc682f4840c6dadff40f8bd5a07fdba34fe1016ce885b9e2  765567_non-recursive_string_subst.patch"
+sha512sums="
+cd375e7a2339bcd9d24936b370c4371b351cab7c8a79044e785d0300dab75bed5a5c9b9076d4fba32d39b22535edfc6f449a7b1086139ad8bf54eab844b9434e  docbook-xsl-1.79.2.tar.gz
+3199de6b5a61ed25defa50a55fa3d138b60e1f5e4c2e3b9a14e169099189794adc3ac079fa3f62debc682f4840c6dadff40f8bd5a07fdba34fe1016ce885b9e2  765567_non-recursive_string_subst.patch
+ba7b6fef55673c4d6efd6f956cc82172f44476a87b5dc0a82348ab4f1b55e043503843f31c21ca74254724d77d28696c427bc64e59e8aafebb7961420ad5fd9f  f6c5eefbca775e312afebf576a6990344a0b1b69.patch
+"
diff --git a/main/docbook-xsl/docbook-xsl.post-deinstall b/main/docbook-xsl/docbook-xsl.post-deinstall
deleted file mode 100644
index 2b9f0d4a15e..00000000000
--- a/main/docbook-xsl/docbook-xsl.post-deinstall
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-_OLD=${1%-r[0-9]*}
-
-if which xmlcatalog > /dev/null; then
-	xmlcatalog --noout --del \
-		"/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" \
-		etc/xml/catalog
-fi
-
diff --git a/main/docbook-xsl/docbook-xsl.post-install b/main/docbook-xsl/docbook-xsl.post-install
index 6afae6abe62..3832543dcd5 100644..120000
--- a/main/docbook-xsl/docbook-xsl.post-install
+++ b/main/docbook-xsl/docbook-xsl.post-install
@@ -1,29 +1 @@
-#!/bin/sh
-
-if [ ! -f /etc/xml/catalog ]; then
-    xmlcatalog --noout --create /etc/xml/catalog
-fi
-
-
-_NEW=${1%-r[0-9]*}
-
-xmlcatalog --noout --add "rewriteSystem" \
-    "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
-    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
-    etc/xml/catalog
-
-xmlcatalog --noout --add "rewriteURI" \
-    "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
-    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
-    etc/xml/catalog &&
-
-xmlcatalog --noout --add "rewriteSystem" \
-    "http://docbook.sourceforge.net/release/xsl/current" \
-    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
-    etc/xml/catalog &&
-
-xmlcatalog --noout --add "rewriteURI" \
-    "http://docbook.sourceforge.net/release/xsl/current" \
-    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
-    etc/xml/catalog
-
+docbook-xsl.post-upgrade
\ No newline at end of file
diff --git a/main/docbook-xsl/docbook-xsl.post-upgrade b/main/docbook-xsl/docbook-xsl.post-upgrade
index d481480fc23..fbac4a49f40 100644
--- a/main/docbook-xsl/docbook-xsl.post-upgrade
+++ b/main/docbook-xsl/docbook-xsl.post-upgrade
@@ -1,33 +1,32 @@
 #!/bin/sh
 
 if [ ! -f /etc/xml/catalog ]; then
-    xmlcatalog --noout --create /etc/xml/catalog
+	xmlcatalog --noout --create /etc/xml/catalog
 fi
 
-_NEW=${1%-r[0-9]*}
-_OLD=${2%-r[0-9]*}
+newver=${1%-r[0-9]*}
+oldver=${2%-r[0-9]*}
 
-xmlcatalog --noout --del \
-	"/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" \
-	etc/xml/catalog
+docbookdir=/usr/share/xml/docbook
 
-xmlcatalog --noout --add "rewriteSystem" \
-    "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
-    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
-    etc/xml/catalog
-
-xmlcatalog --noout --add "rewriteURI" \
-    "http://docbook.sourceforge.net/release/xsl/${_NEW}" \
-    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
-    etc/xml/catalog
-
-xmlcatalog --noout --add "rewriteSystem" \
-    "http://docbook.sourceforge.net/release/xsl/current" \
-    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
-    etc/xml/catalog
-
-xmlcatalog --noout --add "rewriteURI" \
-    "http://docbook.sourceforge.net/release/xsl/current" \
-    "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \
-    etc/xml/catalog
+if [ -n "$oldver" ]; then # upgrade
+	xmlcatalog --noout --del \
+		"file://$docbookdir/xsl-stylesheets-$oldver" \
+		etc/xml/catalog
+fi
 
+urls="
+	http://cdn.docbook.org/release/xsl-nons
+	http://docbook.sourceforge.net/release/xsl
+"
+
+for url in $urls; do
+	for rewrite in rewriteSystem rewriteURI; do
+		for version in $newver current; do
+			xmlcatalog --noout --add "$rewrite" \
+				"$url/$version" \
+				"file://$docbookdir/xsl-stylesheets-$newver" \
+				etc/xml/catalog
+		done
+	done
+done
diff --git a/main/docbook-xsl/docbook-xsl.pre-deinstall b/main/docbook-xsl/docbook-xsl.pre-deinstall
new file mode 100644
index 00000000000..ccfc304fd75
--- /dev/null
+++ b/main/docbook-xsl/docbook-xsl.pre-deinstall
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+_OLD=${1%-r[0-9]*}
+
+if which xmlcatalog > /dev/null; then
+	xmlcatalog --noout --del \
+		"file:///usr/share/xml/docbook/xsl-stylesheets-${_OLD}" \
+		etc/xml/catalog
+fi
diff --git a/main/docbook-xsl/f6c5eefbca775e312afebf576a6990344a0b1b69.patch b/main/docbook-xsl/f6c5eefbca775e312afebf576a6990344a0b1b69.patch
new file mode 100644
index 00000000000..f39e8150bb5
--- /dev/null
+++ b/main/docbook-xsl/f6c5eefbca775e312afebf576a6990344a0b1b69.patch
@@ -0,0 +1,56 @@
+--- a/common/common.xsl
++++ b/common/common.xsl
+@@ -68,7 +68,6 @@ d:subjectset d:substeps d:synopfragment d:table d:tbody d:textobject d:tfoot d:t
+ d:thead d:tip d:toc d:tocchap d:toclevel1 d:toclevel2 d:toclevel3 d:toclevel4
+ d:toclevel5 d:tocpart d:topic d:varargs d:variablelist d:varlistentry d:videodata
+ d:videoobject d:void d:warning d:subjectset
+-
+ d:classsynopsis
+ d:constructorsynopsis
+ d:destructorsynopsis
+@@ -81,6 +80,45 @@ d:oointerface
+ d:simplemsgentry
+ d:manvolnum
+ "/>
++<xsl:strip-space elements="
++abstract affiliation anchor answer appendix area areaset areaspec
++artheader article audiodata audioobject author authorblurb authorgroup
++beginpage bibliodiv biblioentry bibliography biblioset blockquote book
++bookinfo callout calloutlist caption caution chapter
++citerefentry cmdsynopsis co collab colophon colspec confgroup
++copyright dedication docinfo editor entrytbl epigraph equation
++example figure footnote footnoteref formalpara funcprototype
++funcsynopsis glossary glossdef glossdiv glossentry glosslist graphicco
++group highlights imagedata imageobject imageobjectco important index
++indexdiv indexentry indexterm info informalequation informalexample
++informalfigure informaltable inlineequation inlinemediaobject
++itemizedlist itermset keycombo keywordset legalnotice listitem lot
++mediaobject mediaobjectco menuchoice msg msgentry msgexplan msginfo
++msgmain msgrel msgset msgsub msgtext note objectinfo
++orderedlist othercredit part partintro preface printhistory procedure
++programlistingco publisher qandadiv qandaentry qandaset question
++refentry reference refmeta refnamediv refsection refsect1 refsect1info refsect2
++refsect2info refsect3 refsect3info refsynopsisdiv refsynopsisdivinfo
++revhistory revision row sbr screenco screenshot sect1 sect1info sect2
++sect2info sect3 sect3info sect4 sect4info sect5 sect5info section
++sectioninfo seglistitem segmentedlist seriesinfo set setindex setinfo
++shortcut sidebar simplelist simplesect spanspec step subject
++subjectset substeps synopfragment table tbody textobject tfoot tgroup
++thead tip toc tocchap toclevel1 toclevel2 toclevel3 toclevel4
++toclevel5 tocpart topic varargs variablelist varlistentry videodata
++videoobject void warning subjectset
++classsynopsis
++constructorsynopsis
++destructorsynopsis
++fieldsynopsis
++methodparam
++methodsynopsis
++ooclass
++ooexception
++oointerface
++simplemsgentry
++manvolnum
++"/>
+ <!-- ====================================================================== -->
+ 
+ <doc:template name="is.component" xmlns="">
diff --git a/main/docbook2x/APKBUILD b/main/docbook2x/APKBUILD
index e0024ccc309..b9fd180be2a 100644
--- a/main/docbook2x/APKBUILD
+++ b/main/docbook2x/APKBUILD
@@ -1,18 +1,17 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Maintainer:
 pkgname=docbook2x
 pkgver=0.8.8
-pkgrel=6
+pkgrel=10
 pkgdesc="DocBook converter to UNIX manpage and GNU Texinfo format"
-url="http://docbook2x.sourceforge.net"
+url="https://docbook2x.sourceforge.net/"
 arch="all"
 license="MIT"
+options="!check" # no testsuite
 depends="texinfo openjade docbook-xml docbook-xsl perl-xml-sax libxslt"
-depends_dev=""
 makedepends="autoconf automake"
-install=""
 subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/$pkgname/docbook2X-$pkgver.tar.gz
+source="https://downloads.sourceforge.net/docbook2x/docbook2X-$pkgver.tar.gz
 	01_fix_static_datadir_evaluation.patch
 	02_fix_418703_dont_use_abbreviated_sfnet_address.patch
 	03_fix_420153_filename_whitespace_handling.patch
@@ -20,19 +19,9 @@ source="https://downloads.sourceforge.net/$pkgname/docbook2X-$pkgver.tar.gz
 	05_fix_439214_error_on_missing_refentry.patch
 	06_fix_man_typo.patch"
 
-_builddir="$srcdir"/docbook2X-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1 ;;
-		esac
-	done
-}
+builddir="$srcdir"/docbook2X-$pkgver
 
 build() {
-	cd "$_builddir"
 	autoreconf --install
 	./configure \
 		--build=$CBUILD \
@@ -42,20 +31,20 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--program-transform-name 's/docbook2/docbook2x-/' \
-		|| return 1
-	make || return 1
+		--program-transform-name 's/docbook2/docbook2x-/'
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c  docbook2X-0.8.8.tar.gz
+sha512sums="
+cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c  docbook2X-0.8.8.tar.gz
 fc7fd3383caaf091bfc6fe313c6679b1d8858fe6e3049dce3c27afe4b974180dd51ebb2d8154288de1b26343653305a890105614355efdca514d67e0ae42bff9  01_fix_static_datadir_evaluation.patch
 060ca4c2fbcd71b620f182ffe9c999a296236779605d110e578cacf2cbb4c6c551cf8d95901546ef455a402a4747e607e8ea7b54f1109fc3ccabc43cc4a8aad2  02_fix_418703_dont_use_abbreviated_sfnet_address.patch
 3a72979c03a1b5135662ad5cedefd0d508001994e727a0820d628ff5ad2476c09befeb921b9562230fdec3db547e5eec4b301aa08430dd6c2ce2632624a1c375  03_fix_420153_filename_whitespace_handling.patch
 af88626ca61847a25ef8c4cf8a09ea27cd1dce6510952e9629b704d3637097b10d85b9727e502dd7eecea1d2152a71cd26bf6abf4a8370eb8647258faa30be45  04_fix_442782_preprocessor_declaration_syntax.patch
 ea9ed94190edb2ac2055694bb927457f94eeadf0eff340b9f5fdba6fad5b1dc0b9617829ce3470914cbe0ba0be145dfb000218d57f22ee767ebb8082d6c06bfb  05_fix_439214_error_on_missing_refentry.patch
-a563b46e7eaa8052dc2daea6ad8b0f3b12780ef063fafd37a6345ae663f6229ccb0b52be5e7b1fd6584d31e56de89af391efb856bbabfed164353578b39fb458  06_fix_man_typo.patch"
+a563b46e7eaa8052dc2daea6ad8b0f3b12780ef063fafd37a6345ae663f6229ccb0b52be5e7b1fd6584d31e56de89af391efb856bbabfed164353578b39fb458  06_fix_man_typo.patch
+"
diff --git a/main/docs/APKBUILD b/main/docs/APKBUILD
index e3adb1240c1..18552743cec 100644
--- a/main/docs/APKBUILD
+++ b/main/docs/APKBUILD
@@ -1,12 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=docs
 pkgver=0.2
-pkgrel=1
+pkgrel=6
 pkgdesc="Meta package for pulling in all documentation"
 url="https://alpinelinux.org"
-arch="all"
+arch="noarch"
 license="MIT"
-depends="man"
+depends="doc-provider man-pages"
+options="!check"
 
 package() {
 	mkdir -p "$pkgdir"
diff --git a/main/dosfstools/APKBUILD b/main/dosfstools/APKBUILD
index 35e184f3741..c58b5f54944 100644
--- a/main/dosfstools/APKBUILD
+++ b/main/dosfstools/APKBUILD
@@ -1,46 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dosfstools
-pkgver=4.1
-pkgrel=1
+pkgver=4.2
+pkgrel=2
 pkgdesc="DOS filesystem utilities"
 url="https://github.com/dosfstools/dosfstools"
 arch="all"
 license="GPL-3.0-or-later"
-depends=""
 makedepends="linux-headers autoconf automake libtool"
 subpackages="$pkgname-doc"
-source="https://github.com/dosfstools/dosfstools/releases/download/v$pkgver/dosfstools-$pkgver.tar.xz
-	"
+source="https://github.com/dosfstools/dosfstools/releases/download/v$pkgver/dosfstools-$pkgver.tar.gz"
+options="!check"
 
-_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	autoreconf -vif
+	default_prepare
+	./autogen.sh
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
+		--sbindir=/sbin \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
 		--disable-nls \
-		--enable-compat-symlinks \
-		|| return 1
-	make || return 1
+		--enable-compat-symlinks
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install  || return 1
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78  dosfstools-4.1.tar.xz"
+sha512sums="3cc0808edb4432428df8a67da4bb314fd1f27adc4a05754c1a492091741a7b6875ebd9f6a509cc4c5ad85643fc40395b6e0cadee548b25cc439cc9b725980156  dosfstools-4.2.tar.gz"
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 65d23ede18a..c04dbf497b0 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -2,19 +2,22 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Contributor: Martin Uddén <martin.udden@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dovecot
-pkgver=2.3.10
-_pkgvermajor=2.3
-pkgrel=0
-_pigeonholever=0.5.9
-_pigeonholevermajor=${_pigeonholever%.*}
+pkgver=2.3.21
+# rebuild community/dovecot-fts-xapian on version changes
+case "$pkgver" in
+	*.*.*.*) _pkgverminor=${pkgver%.*.*};;
+	*.*.*) _pkgverminor=${pkgver%.*};;
+esac
+pkgrel=17
+_pigeonholever=0.5.19
 pkgdesc="IMAP and POP3 server"
 url="https://www.dovecot.org/"
 arch="all"
-options="libtool"
-license="LGPL-2.0-or-later"
-depends="openssl"
+license="MIT AND LGPL-2.1-or-later"
+depends="openssl>3"
 pkgusers="dovecot dovenull"
 pkggroups="dovecot dovenull"
 makedepends="
@@ -23,17 +26,23 @@ makedepends="
 	bzip2-dev
 	clucene-dev
 	expat-dev
+	gettext-dev
 	heimdal-dev
+	icu-dev
 	libcap-dev
-	openssl-dev
+	libpq-dev
+	libsodium-dev
+	libstemmer-dev
 	libtool
 	linux-headers
+	lua5.3-dev
+	lz4-dev
 	mariadb-connector-c-dev
 	openldap-dev
-	postgresql-dev
+	openssl-dev>3
 	sqlite-dev
 	zlib-dev
-	libsodium-dev
+	zstd-dev
 	"
 install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade"
 subpackages="
@@ -51,20 +60,45 @@ subpackages="
 	$pkgname-sqlite
 	$pkgname-gssapi
 	$pkgname-ldap
+	$pkgname-lua
 	$pkgname-fts-solr:_fts_solr
 	$pkgname-fts-lucene:_fts_lucene
 	"
-source="https://www.dovecot.org/releases/$_pkgvermajor/dovecot-$pkgver.tar.gz
-	https://pigeonhole.dovecot.org/releases/$_pkgvermajor/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever.tar.gz
+source="https://www.dovecot.org/releases/$_pkgverminor/dovecot-$pkgver.tar.gz
+	$pkgname-pigeonhole-$_pigeonholever.tar.gz::https://pigeonhole.dovecot.org/releases/$_pkgverminor/dovecot-$_pkgverminor-pigeonhole-$_pigeonholever.tar.gz
+	CVE-2022-30550.patch
 	skip-iconv-check.patch
 	split-protocols.patch
 	default-config.patch
+	fix-out-of-memory-test.patch
+	fix-libssl_iostream_openssl.patch
+	fix-test-file-cache.patch
+	test-imap-client-hibernate.patch
+	submission-proxy-Add-IPV6-prefix-to-IPv6-addresses.patch
+	Support-openssl-3.0.patch
 	dovecot.logrotate
 	dovecot.initd
 	"
-_builddir_pigeonhole="$srcdir/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever"
+_builddir_pigeonhole="$srcdir/$pkgname-$_pkgverminor-pigeonhole-$_pigeonholever"
+options="!check" # tests being weird
 
 # secfixes:
+#   2.3.19.1-r5:
+#     - CVE-2022-30550
+#   2.3.15-r0:
+#     - CVE-2021-29157
+#     - CVE-2021-33515
+#   2.3.13-r0:
+#     - CVE-2020-24386
+#     - CVE-2020-25275
+#   2.3.11.3-r0:
+#     - CVE-2020-12100
+#     - CVE-2020-12673
+#     - CVE-2020-12674
+#   2.3.10.1-r0:
+#     - CVE-2020-10957
+#     - CVE-2020-10958
+#     - CVE-2020-10967
 #   2.3.9.3-r0:
 #     - CVE-2020-7046
 #     - CVE-2020-7957
@@ -85,6 +119,16 @@ _builddir_pigeonhole="$srcdir/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever"
 #     - CVE-2017-14461
 #     - CVE-2017-15132
 
+prepare() {
+	default_prepare
+	update_config_sub
+
+	autoreconf -vi
+
+	cd "$_builddir_pigeonhole"
+	update_config_sub
+}
+
 _configure() {
 	./configure \
 		--build=$CBUILD \
@@ -103,11 +147,20 @@ build() {
 		--with-gssapi=plugin \
 		--with-ldap=plugin \
 		--with-sql=plugin \
+		--with-lua=plugin \
 		--with-mysql \
 		--with-sqlite \
 		--with-pgsql \
 		--with-solr \
 		--with-lucene \
+		--with-bzlib \
+		--with-icu \
+		--with-lz4 \
+		--with-lzma \
+		--with-sodium \
+		--with-stemmer \
+		--with-zlib \
+		--with-zstd \
 		--with-ssl=openssl \
 		--with-ssldir=/etc/ssl/dovecot \
 		--with-rundir=/run/dovecot
@@ -154,7 +207,6 @@ package() {
 		-e 's,#!include auth-passwdfile.conf.ext,#!include auth-system.conf.ext,' \
 		./etc/dovecot/conf.d/10-auth.conf
 
-
 	# Installing pigeonhole plugin.
 	cd "$_builddir_pigeonhole"
 	make install DESTDIR="$pkgdir"
@@ -164,7 +216,7 @@ package() {
 		"$pkgdir"/etc/dovecot/conf.d
 
 	# Remove libtool archives.
-	find "$pkgdir" -name '*.la' | xargs rm -f
+	find "$pkgdir" -name '*.la' -exec rm -f {} +
 }
 
 dev() {
@@ -196,8 +248,8 @@ _protocol() {
 	local protocolsd="$subpkgdir/usr/share/dovecot/protocols.d"
 
 	cd "$pkgdir"
-	_submv usr/libexec/dovecot/$name*
-	_submv etc/dovecot/conf.d/*-$name.conf
+	_submv usr/libexec/dovecot/"$name"*
+	_submv etc/dovecot/conf.d/*-"$name".conf
 
 	mkdir -p "$protocolsd"
 	echo "protocols = \$protocols $name" \
@@ -209,11 +261,13 @@ _sieve() {
 	depends="$pkgname=$pkgver-r$pkgrel"
 
 	cd "$pkgdir"
-	_submv $(find usr/ -name '*sieve_extprograms*')
-	_submv $(find usr/ -name '*sieve_imapsieve*')
-	_submv $(find usr/ -name '*sieve*')
-	_submv $(find usr/ -name '*pigeonhole*')
-	_submv $(find etc/dovecot/ -name '*sieve*')
+	_find usr/lib/dovecot sieve_extprograms
+	_find usr/lib/dovecot sieve_imapsieve
+	_find usr/bin sieve
+	_find usr/lib/dovecot sieve
+	_find usr/lib/dovecot pigeonhole
+	_find usr/libexec/dovecot managesieve
+	_find etc/dovecot/ sieve
 }
 
 _sieve_ldap() {
@@ -221,7 +275,7 @@ _sieve_ldap() {
 	depends="$pkgname-pigeonhole-plugin=$pkgver-r$pkgrel $pkgname-ldap=$pkgver-r$pkgrel"
 
 	cd "$pkgdir"
-	_submv $(find usr/ -name '*_sieve_storage_ldap_*')
+	_find  usr/lib/dovecot _sieve_storage_ldap_
 }
 
 pgsql() {
@@ -229,7 +283,15 @@ pgsql() {
 	depends="$pkgname-sql=$pkgver-r$pkgrel"
 
 	cd "$pkgdir"
-	_submv $(find usr/ -name '*_pgsql*')
+	_find usr/lib/dovecot _pgsql
+}
+
+lua() {
+	pkgdesc="Lua plugins for Dovecot"
+	depends="$pkgname=$pkgver-r$pkgrel"
+
+	cd "$pkgdir"
+	_find usr/lib/dovecot lua
 }
 
 mysql() {
@@ -237,7 +299,7 @@ mysql() {
 	depends="$pkgname-sql=$pkgver-r$pkgrel"
 
 	cd "$pkgdir"
-	_submv $(find usr/ -name '*_mysql*')
+	_find usr/lib/dovecot _mysql
 }
 
 sqlite() {
@@ -245,7 +307,7 @@ sqlite() {
 	depends="$pkgname-sql=$pkgver-r$pkgrel"
 
 	cd "$pkgdir"
-	_submv $(find usr/ -name '*_sqlite*')
+	_find usr/lib/dovecot _sqlite
 }
 
 gssapi() {
@@ -253,7 +315,7 @@ gssapi() {
 	depends="$pkgname=$pkgver-r$pkgrel"
 
 	cd "$pkgdir"
-	_submv $(find usr/ -name '*_gssapi*')
+	_find usr/lib/dovecot _gssapi
 }
 
 ldap() {
@@ -261,8 +323,8 @@ ldap() {
 	depends="$pkgname=$pkgver-r$pkgrel"
 
 	cd "$pkgdir"
-	_submv $(find usr/ -name '*[_-]ldap*')
-	_submv $(find etc/dovecot/ -name '*-ldap.conf*')
+	_find usr/lib/dovecot ldap.so
+	_find etc/dovecot -ldap.conf
 }
 
 sql() {
@@ -270,8 +332,8 @@ sql() {
 	depends="$pkgname=$pkgver-r$pkgrel"
 
 	cd "$pkgdir"
-	_submv $(find usr/ -name '*-sql.*')
-	_submv $(find etc/dovecot/ -name '*-sql.conf*')
+	_find usr/lib/dovecot -sql.
+	_find etc/dovecot -sql.conf
 }
 
 _fts_solr() {
@@ -279,7 +341,7 @@ _fts_solr() {
 	depends="$pkgname=$pkgver-r$pkgrel"
 
 	cd "$pkgdir"
-	_submv $(find usr/ -name '*fts*solr*')
+	_find usr/lib/dovecot fts\*solr
 }
 
 _fts_lucene() {
@@ -287,24 +349,38 @@ _fts_lucene() {
 	depends="$pkgname=$pkgver-r$pkgrel"
 
 	cd "$pkgdir"
-	_submv $(find usr/ -name '*fts*lucene*')
+	_find usr/lib/dovecot fts\*lucene
 }
 
-_submv() {
-	local dir
-	while [ $# -gt 0 ]; do
-		dir=${1%/*}
-		mkdir -p "$subpkgdir"/$dir
-		mv "$pkgdir/$1" "$subpkgdir/$dir/"
-		[ "$(ls -A $pkgdir/$dir)" ] || rmdir "$pkgdir"/$dir
-		shift
+_find() {
+	local _f
+	local _ff="$(find "$1" -name \*"$2"\*)"
+	for _f in $_ff
+	do
+		_submv "$_f"
 	done
 }
 
-sha512sums="73e10d7d1e616d6599eb53f2d2d1ac0f0f2e6e84019faac5cd525e833da44839a7e483635b61d432e3254a9e5f6f90915bec8940c584210341085241949dffa2  dovecot-2.3.10.tar.gz
-1b8d2ac8d3985dde035fc45df519788a924ba971f3e39717f5196ea56a982d4156226586d0a964473525d086967883ea52f2e624e81f7035cb0952b76f2414d8  dovecot-2.3-pigeonhole-0.5.9.tar.gz
+_submv() {
+	local dir="$(dirname $1)"
+	mkdir -p "$subpkgdir"/"$dir"
+	mv "$pkgdir/$1" "$subpkgdir/$dir/"
+	[ "$(ls -A "$pkgdir/$dir")" ] || rmdir "$pkgdir"/"$dir"
+}
+
+sha512sums="
+2d463c38639c3fd3d617ee5b1a4e4d0c11362339c4d4d62a5a90164a8b10bc58919545679bbf379139bdb743fdb013033abfddc1fc6401eb8099463cdc2401ca  dovecot-2.3.21.tar.gz
+07e6a0e638508dddaa3822703ce5c08f479c4e721c0fe7a544776d9a037d557c16bad000fc422a1e83f53781058d3575e67d5264dd04cae763750b0dc40e6c51  dovecot-pigeonhole-0.5.19.tar.gz
+b2ff67fd8b6c5cea93877651a1168ef1a5d399cc5f1a61d1cce407c7624f5b6d758996084c6a5714b6880de0ce11ce5eac74a1e02918758cb6983caedb651c58  CVE-2022-30550.patch
 fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a  skip-iconv-check.patch
 794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5  split-protocols.patch
 0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07  default-config.patch
+733cdbfb7f6b2608470bd30a0f9190ec86099d4c8e48b7fb92d7b595be665bf749976889033e1ad438edd3f99f2e0d496dd0d667291915c80df82f7e62483f59  fix-out-of-memory-test.patch
+0fb56eb9c7fae8d8b1d794928ce2ba58d03c102cd7c3f959799c62c5d838ff535ecccb64bc1970d960f67d49388c880773e9eac5aed3bcf92e6efed3b56cc837  fix-libssl_iostream_openssl.patch
+bfa8f18cce438bbf55cfaa2164358424f04393365aa98ebc342dc2677b48bf8fb16bdb1803aba18ad74fe8494bb7d2091569c430086ed2b47d13100ae5e9ffab  fix-test-file-cache.patch
+33c6eefaaca755c7766c74cb1afdc54fa9241b3d75b1db6b1167615061b5d79b85d759746c2d1793f4a3669d493489236e89ca4278dd38dd681f537c83e81a20  test-imap-client-hibernate.patch
+6a8d2f6d36218a73766c0b8df64b0b6ec98e010d0d2e06de48144f701cfc2a36413c4a3dce0a33eafd5f022d8b796d5a80116097adf2ad1a9f34fecdeaf07da5  submission-proxy-Add-IPV6-prefix-to-IPv6-addresses.patch
+b24db39cce6c388ab85eab7a9c161eb10ee871f5d78c7778e40a43acc3711486b4259dbbaef40c54efce55d3c8ca7cc8841adbe8528d75c6e8d60ba08b75df79  Support-openssl-3.0.patch
 9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0  dovecot.logrotate
-d91951b81150d7a3ef6a674c0dc7b012f538164dac4b9d27a6801d31da6813b764995a438f69b6a680463e1b60a3b4f2959654f68e565fe116ea60312d5e5e70  dovecot.initd"
+d91951b81150d7a3ef6a674c0dc7b012f538164dac4b9d27a6801d31da6813b764995a438f69b6a680463e1b60a3b4f2959654f68e565fe116ea60312d5e5e70  dovecot.initd
+"
diff --git a/main/dovecot/CVE-2022-30550.patch b/main/dovecot/CVE-2022-30550.patch
new file mode 100644
index 00000000000..d7da1316f76
--- /dev/null
+++ b/main/dovecot/CVE-2022-30550.patch
@@ -0,0 +1,155 @@
+From 7bad6a24160e34bce8f10e73dbbf9e5fbbcd1904 Mon Sep 17 00:00:00 2001
+From: Timo Sirainen <timo.sirainen@open-xchange.com>
+Date: Mon, 9 May 2022 15:23:33 +0300
+Subject: [PATCH 1/2] auth: Fix handling passdbs with identical driver/args but
+ different mechanisms/username_filter
+
+The passdb was wrongly deduplicated in this situation, causing wrong
+mechanisms or username_filter setting to be used. This would be a rather
+unlikely configuration though.
+
+Fixed by moving mechanisms and username_filter from struct passdb_module
+to struct auth_passdb, which is where they should have been in the first
+place.
+---
+ src/auth/auth-request.c |  6 +++---
+ src/auth/auth.c         | 18 ++++++++++++++++++
+ src/auth/auth.h         |  5 +++++
+ src/auth/passdb.c       | 15 ++-------------
+ src/auth/passdb.h       |  4 ----
+ 5 files changed, 28 insertions(+), 20 deletions(-)
+
+diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
+index cd08b1fa02..0ca29f3674 100644
+--- a/src/auth/auth-request.c
++++ b/src/auth/auth-request.c
+@@ -534,8 +534,8 @@ auth_request_want_skip_passdb(struct auth_request *request,
+ 			      struct auth_passdb *passdb)
+ {
+ 	/* if mechanism is not supported, skip */
+-	const char *const *mechs = passdb->passdb->mechanisms;
+-	const char *const *username_filter = passdb->passdb->username_filter;
++	const char *const *mechs = passdb->mechanisms;
++	const char *const *username_filter = passdb->username_filter;
+ 	const char *username;
+ 
+ 	username = request->fields.user;
+@@ -548,7 +548,7 @@ auth_request_want_skip_passdb(struct auth_request *request,
+ 		return TRUE;
+ 	}
+ 
+-	if (passdb->passdb->username_filter != NULL &&
++	if (passdb->username_filter != NULL &&
+ 	    !auth_request_username_accepted(username_filter, username)) {
+ 		auth_request_log_debug(request,
+ 				       request->mech != NULL ? AUTH_SUBSYS_MECH
+diff --git a/src/auth/auth.c b/src/auth/auth.c
+index f2f3fda20c..9f6c4ba60c 100644
+--- a/src/auth/auth.c
++++ b/src/auth/auth.c
+@@ -99,6 +99,24 @@ auth_passdb_preinit(struct auth *auth, const struct auth_passdb_settings *set,
+ 	auth_passdb->override_fields_tmpl =
+ 		passdb_template_build(auth->pool, set->override_fields);
+ 
++	if (*set->mechanisms == '\0') {
++		auth_passdb->mechanisms = NULL;
++	} else if (strcasecmp(set->mechanisms, "none") == 0) {
++		auth_passdb->mechanisms = (const char *const[]){ NULL };
++	} else {
++		auth_passdb->mechanisms =
++			(const char *const *)p_strsplit_spaces(auth->pool,
++				set->mechanisms, " ,");
++	}
++
++	if (*set->username_filter == '\0') {
++		auth_passdb->username_filter = NULL;
++	} else {
++		auth_passdb->username_filter =
++			(const char *const *)p_strsplit_spaces(auth->pool,
++				set->username_filter, " ,");
++	}
++
+ 	/* for backwards compatibility: */
+ 	if (set->pass)
+ 		auth_passdb->result_success = AUTH_DB_RULE_CONTINUE;
+diff --git a/src/auth/auth.h b/src/auth/auth.h
+index f700e29d5c..460a179765 100644
+--- a/src/auth/auth.h
++++ b/src/auth/auth.h
+@@ -41,6 +41,11 @@ struct auth_passdb {
+ 	struct passdb_template *default_fields_tmpl;
+ 	struct passdb_template *override_fields_tmpl;
+ 
++	/* Supported authentication mechanisms, NULL is all, {NULL} is none */
++	const char *const *mechanisms;
++	/* Username filter, NULL is no filter */
++	const char *const *username_filter;
++
+ 	enum auth_passdb_skip skip;
+ 	enum auth_db_rule result_success;
+ 	enum auth_db_rule result_failure;
+diff --git a/src/auth/passdb.c b/src/auth/passdb.c
+index eb4ac8ae82..f5eed1af4f 100644
+--- a/src/auth/passdb.c
++++ b/src/auth/passdb.c
+@@ -224,19 +224,8 @@ passdb_preinit(pool_t pool, const struct auth_passdb_settings *set)
+ 	passdb->id = ++auth_passdb_id;
+ 	passdb->iface = *iface;
+ 	passdb->args = p_strdup(pool, set->args);
+-	if (*set->mechanisms == '\0') {
+-		passdb->mechanisms = NULL;
+-	} else if (strcasecmp(set->mechanisms, "none") == 0) {
+-		passdb->mechanisms = (const char *const[]){NULL};
+-	} else {
+-		passdb->mechanisms = (const char* const*)p_strsplit_spaces(pool, set->mechanisms, " ,");
+-	}
+-
+-	if (*set->username_filter == '\0') {
+-		passdb->username_filter = NULL;
+-	} else {
+-		passdb->username_filter = (const char* const*)p_strsplit_spaces(pool, set->username_filter, " ,");
+-	}
++	/* NOTE: if anything else than driver & args are added here,
++	   passdb_find() also needs to be updated. */
+ 	array_push_back(&passdb_modules, &passdb);
+ 	return passdb;
+ }
+diff --git a/src/auth/passdb.h b/src/auth/passdb.h
+index 2e95328e5c..e466a9fdb6 100644
+--- a/src/auth/passdb.h
++++ b/src/auth/passdb.h
+@@ -63,10 +63,6 @@ struct passdb_module {
+ 	/* Default password scheme for this module.
+ 	   If default_cache_key is set, must not be NULL. */
+ 	const char *default_pass_scheme;
+-	/* Supported authentication mechanisms, NULL is all, [NULL] is none*/
+-	const char *const *mechanisms;
+-	/* Username filter, NULL is no filter */
+-	const char *const *username_filter;
+ 
+ 	/* If blocking is set to TRUE, use child processes to access
+ 	   this passdb. */
+
+From a1022072e2ce36f853873d910287f466165b184b Mon Sep 17 00:00:00 2001
+From: Timo Sirainen <timo.sirainen@open-xchange.com>
+Date: Mon, 16 May 2022 14:58:45 +0200
+Subject: [PATCH 2/2] auth: Add a comment about updating userdb_find()
+
+---
+ src/auth/userdb.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/auth/userdb.c b/src/auth/userdb.c
+index 0849659102..830bc2dd64 100644
+--- a/src/auth/userdb.c
++++ b/src/auth/userdb.c
+@@ -158,7 +158,8 @@ userdb_preinit(pool_t pool, const struct auth_userdb_settings *set)
+ 	userdb->id = ++auth_userdb_id;
+ 	userdb->iface = iface;
+ 	userdb->args = p_strdup(pool, set->args);
+-
++	/* NOTE: if anything else than driver & args are added here,
++	   userdb_find() also needs to be updated. */
+ 	array_push_back(&userdb_modules, &userdb);
+ 	return userdb;
+ }
diff --git a/main/dovecot/Support-openssl-3.0.patch b/main/dovecot/Support-openssl-3.0.patch
new file mode 100644
index 00000000000..8f39a7ddfe2
--- /dev/null
+++ b/main/dovecot/Support-openssl-3.0.patch
@@ -0,0 +1,45 @@
+From: =?utf-8?q?Christian_G=C3=B6ttsche?= <cgzones@googlemail.com>
+Date: Wed, 11 May 2022 20:27:53 +0200
+Author: Michal Hlavinka
+Origin: https://bugzilla.redhat.com/show_bug.cgi?id=1962035
+Subject: Support openssl 3.0
+
+---
+ src/lib-dcrypt/dcrypt-openssl.c | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/src/lib-dcrypt/dcrypt-openssl.c b/src/lib-dcrypt/dcrypt-openssl.c
+index 1cbe352..5570d62 100644
+--- a/src/lib-dcrypt/dcrypt-openssl.c
++++ b/src/lib-dcrypt/dcrypt-openssl.c
+@@ -73,10 +73,30 @@
+   2<tab>key algo oid<tab>1<tab>symmetric algo name<tab>salt<tab>hash algo<tab>rounds<tab>E(RSA = i2d_PrivateKey, EC=Private Point)<tab>key id
+ **/
+ 
++#if OPENSSL_VERSION_MAJOR == 3
++static EC_KEY *EVP_PKEY_get0_EC_KEYv3(EVP_PKEY *key)
++{
++  EC_KEY *eck = EVP_PKEY_get1_EC_KEY(key);
++  EVP_PKEY_set1_EC_KEY(key, eck);
++  EC_KEY_free(eck);
++  return eck;
++}
++
++static EC_KEY *EVP_PKEY_get1_EC_KEYv3(EVP_PKEY *key)
++{
++  EC_KEY *eck = EVP_PKEY_get1_EC_KEY(key);
++  EVP_PKEY_set1_EC_KEY(key, eck);
++  return eck;
++}
++
++#define EVP_PKEY_get0_EC_KEY EVP_PKEY_get0_EC_KEYv3 
++#define EVP_PKEY_get1_EC_KEY EVP_PKEY_get1_EC_KEYv3
++#else
+ #ifndef HAVE_EVP_PKEY_get0
+ #define EVP_PKEY_get0_EC_KEY(x) x->pkey.ec
+ #define EVP_PKEY_get0_RSA(x) x->pkey.rsa
+ #endif
++#endif
+ 
+ #ifndef HAVE_OBJ_LENGTH
+ #define OBJ_length(o) ((o)->length)
diff --git a/main/dovecot/fix-libssl_iostream_openssl.patch b/main/dovecot/fix-libssl_iostream_openssl.patch
new file mode 100644
index 00000000000..5c4cbb6263a
--- /dev/null
+++ b/main/dovecot/fix-libssl_iostream_openssl.patch
@@ -0,0 +1,14 @@
+diff --git a/src/lib-dcrypt/Makefile.am b/src/lib-dcrypt/Makefile.am
+index e9e5116953..718d451c4f 100644
+--- a/src/lib-dcrypt/Makefile.am
++++ b/src/lib-dcrypt/Makefile.am
+@@ -20,7 +20,8 @@ libdcrypt_la_CFLAGS = $(AM_CPPFLAGS) \
+ if BUILD_DCRYPT_OPENSSL
+ pkglib_LTLIBRARIES += libdcrypt_openssl.la
+ libdcrypt_openssl_la_SOURCES = dcrypt-openssl.c
+-libdcrypt_openssl_la_LDFLAGS = -module -avoid-version ../lib-ssl-iostream/libssl_iostream_openssl.la
++libdcrypt_openssl_la_LDFLAGS = -module -avoid-version ../lib-ssl-iostream/libssl_iostream.la \
++	../lib-ssl-iostream/libssl_iostream_openssl.la
+ libdcrypt_openssl_la_LIBADD = $(SSL_LIBS)
+ libdcrypt_openssl_la_DEPENDENCIES = ../lib-ssl-iostream/libssl_iostream_openssl.la
+ libdcrypt_openssl_la_CFLAGS = $(AM_CPPFLAGS) \
diff --git a/main/dovecot/fix-out-of-memory-test.patch b/main/dovecot/fix-out-of-memory-test.patch
new file mode 100644
index 00000000000..09df953d5c2
--- /dev/null
+++ b/main/dovecot/fix-out-of-memory-test.patch
@@ -0,0 +1,22 @@
+fixes test in src/lib/test-file-cache.c for musl
+
+--- a/src/lib/test-file-cache.c	2021-01-04 17:55:39.550032767 +0000
++++ b/src/lib/test-file-cache.c	2021-01-04 17:54:31.439645416 +0000
+@@ -263,7 +263,7 @@
+ 	};
+ 	const char *errstr =
+ 		t_strdup_printf("mmap_anon(.test_file_cache, %zu) failed: "
+-				"Cannot allocate memory", page_size);
++				"Out of memory", page_size);
+ 	test_assert(setrlimit(RLIMIT_AS, &rl_new) == 0);
+ 	test_expect_error_string(errstr);
+ 	test_assert(file_cache_set_size(cache, 1024) == -1);
+@@ -271,7 +271,7 @@
+ 
+ 	/* same for mremap */
+ 	errstr = t_strdup_printf("mremap_anon(.test_file_cache, %zu) failed: "
+-				 "Cannot allocate memory", page_size*2);
++				 "Out of memory", page_size*2);
+ 	test_assert(file_cache_set_size(cache, 1) == 0);
+ 	test_assert(setrlimit(RLIMIT_AS, &rl_new) == 0);
+ 	test_expect_error_string(errstr);
diff --git a/main/dovecot/fix-test-file-cache.patch b/main/dovecot/fix-test-file-cache.patch
new file mode 100644
index 00000000000..c4a9630aa89
--- /dev/null
+++ b/main/dovecot/fix-test-file-cache.patch
@@ -0,0 +1,22 @@
+posted over IRC to me by Aki Tuomi
+
+diff --git a/src/lib/test-file-cache.c b/src/lib/test-file-cache.c
+index 6bac9abfe7..a402d38a58 100644
+--- a/src/lib/test-file-cache.c
++++ b/src/lib/test-file-cache.c
+@@ -251,6 +251,7 @@ static void test_file_cache_errors(void)
+ 	test_assert(size == 0);
+ 	test_assert(map == NULL);
+ 
++#if 0
+ 	/* temporarily set a small memory limit to make mmap attempt fail */
+ 	struct rlimit rl_cur;
+ 	test_assert(getrlimit(RLIMIT_AS, &rl_cur) == 0);
+@@ -274,6 +275,7 @@ static void test_file_cache_errors(void)
+ 	test_expect_error_string(errstr);
+ 	test_assert(file_cache_set_size(cache, page_size*2) == -1);
+ 	test_assert(setrlimit(RLIMIT_AS, &rl_cur) == 0);
++#endif
+ 
+ 	file_cache_free(&cache);
+ 	i_close_fd(&fd);
diff --git a/main/dovecot/submission-proxy-Add-IPV6-prefix-to-IPv6-addresses.patch b/main/dovecot/submission-proxy-Add-IPV6-prefix-to-IPv6-addresses.patch
new file mode 100644
index 00000000000..c698f7c4fb1
--- /dev/null
+++ b/main/dovecot/submission-proxy-Add-IPV6-prefix-to-IPv6-addresses.patch
@@ -0,0 +1,27 @@
+From 88751f93d04816313f0fbcafe3a7fc018f5b9328 Mon Sep 17 00:00:00 2001
+From: Aki Tuomi <aki.tuomi@open-xchange.com>
+Date: Tue, 5 Apr 2022 14:33:48 +0300
+Subject: [PATCH] submission-proxy: Add IPV6: prefix to IPv6 addresses
+
+This is required by the Postfix XCLIENT protocol.
+---
+ src/submission-login/submission-proxy.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/submission-login/submission-proxy.c b/src/submission-login/submission-proxy.c
+index 4965ca4612..b6b6b61b12 100644
+--- a/src/submission-login/submission-proxy.c
++++ b/src/submission-login/submission-proxy.c
+@@ -177,8 +177,10 @@ proxy_send_xclient(struct submission_client *client, struct ostream *output)
+ 			t_strdup_printf("%u", client->common.remote_port));
+ 	}
+ 	if (str_array_icase_find(client->proxy_xclient, "ADDR")) {
+-		proxy_send_xclient_more(client, output, str, "ADDR",
+-					net_ip2addr(&client->common.ip));
++		const char *addr = net_ip2addr(&client->common.ip);
++		if (client->common.ip.family == AF_INET6)
++			addr = t_strconcat("IPV6:", addr, NULL);
++		proxy_send_xclient_more(client, output, str, "ADDR", addr);
+ 	}
+ 	if (str_array_icase_find(client->proxy_xclient, "SESSION")) {
+ 		proxy_send_xclient_more(client, output, str, "SESSION",
diff --git a/main/dovecot/test-imap-client-hibernate.patch b/main/dovecot/test-imap-client-hibernate.patch
new file mode 100644
index 00000000000..ce6584c0324
--- /dev/null
+++ b/main/dovecot/test-imap-client-hibernate.patch
@@ -0,0 +1,14 @@
+submitted as https://github.com/dovecot/core/pull/159
+reduce filename length
+
+--- a/src/imap/test-imap-client-hibernate.c
++++ b/src/imap/test-imap-client-hibernate.c
+@@ -19,7 +19,7 @@
+ 
+ #include <sys/stat.h>
+ 
+-#define TEMP_DIRNAME ".test-imap-client-hibernate"
++#define TEMP_DIRNAME ".test-ich"
+ 
+ #define EVILSTR "\t\r\n\001"
+ 
diff --git a/main/doxygen/0001-issue-7464-1.8.17-test-suite-is-failing.patch b/main/doxygen/0001-issue-7464-1.8.17-test-suite-is-failing.patch
deleted file mode 100644
index 9a895255bce..00000000000
--- a/main/doxygen/0001-issue-7464-1.8.17-test-suite-is-failing.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From cd9dee013dc749a10bbe019c350e0e62b6635795 Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests@gmail.com>
-Date: Wed, 1 Jan 2020 17:51:53 +0100
-Subject: [PATCH] issue #7464 1.8.17: test suite is failing
-
-On Windows the syntax with the command and arguments in one string worked but on *nix (and Cygwin) it didn't.
-- changed calls to Popen to split command (see also: https://docs.python.org/3/library/subprocess.html).
-- explicitly specify files to check for xhtml
-- changed call to xmllint for xhtml and docbook (due to stdout overflow in some cases, we are not really interested in the, formatted, output of xmllint).
-- in the update part a `read` was left, should have been removed.
----
- testing/runtests.py | 19 ++++++++++++-------
- 1 file changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/testing/runtests.py b/testing/runtests.py
-index a4118b86..10fe5021 100755
---- a/testing/runtests.py
-+++ b/testing/runtests.py
-@@ -3,6 +3,7 @@
- from __future__ import print_function
- import argparse, glob, itertools, re, shutil, os, sys
- import subprocess
-+import shlex
- 
- config_reg = re.compile('.*\/\/\s*(?P<name>\S+):\s*(?P<value>.*)$')
- 
-@@ -28,10 +29,10 @@ def xpopen(cmd, cmd1="",encoding='utf-8-sig', getStderr=False):
- 		return os.popen(cmd).read() # Python 2 without encoding
- 	else:
- 		if (getStderr):
--			proc = subprocess.run(cmd1,encoding=encoding,capture_output=True) # Python 3 with encoding
--			return proc.stderr
-+			proc = subprocess.Popen(shlex.split(cmd1),stdout=subprocess.PIPE,stderr=subprocess.PIPE,encoding=encoding) # Python 3 with encoding
-+			return proc.stderr.read()
- 		else:
--			proc = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE,encoding=encoding) # Python 3 with encoding
-+			proc = subprocess.Popen(shlex.split(cmd),stdout=subprocess.PIPE,stderr=subprocess.PIPE,encoding=encoding) # Python 3 with encoding
- 			return proc.stdout.read()
- 
- class Tester:
-@@ -137,7 +138,7 @@ class Tester:
- 				print('GENERATE_DOCBOOK=NO', file=f)
- 			if (self.args.xhtml):
- 				print('GENERATE_HTML=YES', file=f)
--			# HTML_OUTPUT can also be set locally
-+			# HTML_OUTPUT can also have been set locally
- 			print('HTML_OUTPUT=%s/html' % self.test_out, file=f)
- 			print('HTML_FILE_EXTENSION=.xhtml', file=f)
- 			if (self.args.pdf):
-@@ -184,7 +185,7 @@ class Tester:
- 					print('Non-existing file %s after \'check:\' statement' % check_file)
- 					return
- 				# convert output to canonical form
--				data = xpopen('%s --format --noblanks --nowarning %s' % (self.args.xmllint,check_file)).read()
-+				data = xpopen('%s --format --noblanks --nowarning %s' % (self.args.xmllint,check_file))
- 				if data:
- 					# strip version
- 					data = re.sub(r'xsd" version="[0-9.-]+"','xsd" version=""',data).rstrip('\n')
-@@ -326,7 +327,7 @@ class Tester:
- 			tests.append(glob.glob('%s/*.xml' % (docbook_output)))
- 			tests.append(glob.glob('%s/*/*/*.xml' % (docbook_output)))
- 			tests = ' '.join(list(itertools.chain.from_iterable(tests))).replace(self.args.outputdir +'/','').replace('\\','/')
--			exe_string = '%s --nonet --postvalid %s' % (self.args.xmllint,tests)
-+			exe_string = '%s --noout --nonet --postvalid %s' % (self.args.xmllint,tests)
- 			exe_string1 = exe_string
- 			exe_string += ' %s' % (redirx)
- 			exe_string += ' %s more "%s/temp"' % (separ,docbook_output)
-@@ -346,7 +347,11 @@ class Tester:
- 				redirx=' 2> %s/temp >nul:'%html_output
- 			else:
- 				redirx='2>%s/temp >/dev/null'%html_output
--			exe_string = '%s --path dtd --nonet --postvalid %s/*xhtml' % (self.args.xmllint,html_output)
-+			check_file = []
-+			check_file.append(glob.glob('%s/*.xhtml' % (html_output)))
-+			check_file.append(glob.glob('%s/*/*/*.xhtml' % (html_output)))
-+			check_file = ' '.join(list(itertools.chain.from_iterable(check_file))).replace(self.args.outputdir +'/','').replace('\\','/')
-+			exe_string = '%s --noout --path dtd --nonet --postvalid %s' % (self.args.xmllint,check_file)
- 			exe_string1 = exe_string
- 			exe_string += ' %s' % (redirx)
- 			exe_string += ' %s more "%s/temp"' % (separ,html_output)
diff --git a/main/doxygen/APKBUILD b/main/doxygen/APKBUILD
index c02dc799f96..9635cf20e11 100644
--- a/main/doxygen/APKBUILD
+++ b/main/doxygen/APKBUILD
@@ -1,40 +1,38 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=doxygen
-pkgver=1.8.17
-pkgrel=1
-pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
-url="http://www.doxygen.nl/"
+pkgver=1.10.0
+pkgrel=0
+pkgdesc="Documentation system for C++, C, Java, IDL and PHP"
+url="https://www.doxygen.nl/"
 arch="all"
 license="GPL-2.0-or-later"
 checkdepends="libxml2-utils"
-makedepends="flex bison coreutils perl python3 cmake"
-source="http://doxygen.nl/files/doxygen-$pkgver.src.tar.gz
-	doxygen-1.8.14-install.patch
-	0001-issue-7464-1.8.17-test-suite-is-failing.patch
+makedepends="flex bison coreutils perl python3 cmake samurai"
+source="https://doxygen.nl/files/doxygen-$pkgver.src.tar.gz
+	remove-usage-of-fstat64.patch
 	"
 
 build() {
-	cd "$builddir"
-	cmake .\
+	cmake -B build -G Ninja \
 		-DGIT_EXECUTABLE=/bin/false \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-Dbuild_xmlparser=ON
-	make
+	cmake --build build
 }
 
 check() {
-	cd "$builddir"
 	# Remove test that use bibtex
 	rm -f ./testing/012_cite.dox
-	make test
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 061
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
-sha512sums="2fd087d127e301ea48355ea52c9af4f2091df06551cf64da80df81f0758194b296efb1e8d3962867a6a6d2da5a3fc323842f7766a445748005b30097ded30a75  doxygen-1.8.17.src.tar.gz
-a11ece43c640ffed707240f726b2005e103294e0351d7c3b6dd46ecc9bc0341b56c4bfb4e4daead3683129a1f332f283c578258aa1f611ec5a57c4da3bff8a21  doxygen-1.8.14-install.patch
-5b2dc0bc3dfa9b11c0ecf28e1d502f2c1112e67b47d191aa2cf294f74e41580881e02cf009c7de06dc75b0b0c0306d5c03eeca37b0f82c65e5a51cd68738e4c3  0001-issue-7464-1.8.17-test-suite-is-failing.patch"
+sha512sums="
+885de36fa0b4364cdd1eddd5e02517e08da7a52274c6fda2c22cbe85f0840e2ddf7358f613c018dc39b4a6dfce2ddd627e9318e73b903f954bbad1a39d03a416  doxygen-1.10.0.src.tar.gz
+590d3ca57a0c7cc492118f386c0f90ebbc94aa7557a7095f2ac6de67fe405480d7237fa452ea6c5881fff2f4d7482080cba3bea7513ac0e10cdc458ad345fee9  remove-usage-of-fstat64.patch
+"
diff --git a/main/doxygen/doxygen-1.8.14-install.patch b/main/doxygen/doxygen-1.8.14-install.patch
deleted file mode 100644
index 748b0be77fe..00000000000
--- a/main/doxygen/doxygen-1.8.14-install.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -upr doxygen-1.8.17.orig/doc/CMakeLists.txt doxygen-1.8.17/doc/CMakeLists.txt
---- doxygen-1.8.17.orig/doc/CMakeLists.txt	2020-01-05 16:37:34.415645891 +0100
-+++ doxygen-1.8.17/doc/CMakeLists.txt	2020-01-05 16:38:10.395666071 +0100
-@@ -209,22 +209,22 @@ install(FILES
-         "${PROJECT_BINARY_DIR}/man/doxywizard.1"
-         "${PROJECT_BINARY_DIR}/man/doxysearch.1"
-         "${PROJECT_BINARY_DIR}/man/doxyindexer.1"
--        DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
-+        DESTINATION ${CMAKE_INSTALL_MANDIR}
- )
- 
- install(FILES
-         "${PROJECT_BINARY_DIR}/latex/doxygen_manual.pdf"
--        DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+        DESTINATION "${DOC_INSTALL_DIR}"
- )
- 
- if (build_doc_chm)
- install(FILES
-         "${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm"
--        DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+        DESTINATION "${DOC_INSTALL_DIR}"
- )
- endif ()
- 
- install(DIRECTORY
-         "${PROJECT_BINARY_DIR}/html"
--        DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+        DESTINATION "${DOC_INSTALL_DIR}"
- )
diff --git a/main/doxygen/remove-usage-of-fstat64.patch b/main/doxygen/remove-usage-of-fstat64.patch
new file mode 100644
index 00000000000..97d5f1df516
--- /dev/null
+++ b/main/doxygen/remove-usage-of-fstat64.patch
@@ -0,0 +1,23 @@
+--- a/deps/spdlog/include/spdlog/details/os-inl.h
++++ b/deps/spdlog/include/spdlog/details/os-inl.h
+@@ -236,20 +236,11 @@
+ #    else
+     int fd = ::fileno(f);
+ #    endif
+-// 64 bits(but not in osx or cygwin, where fstat64 is deprecated)
+-#    if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
+-    struct stat64 st;
+-    if (::fstat64(fd, &st) == 0)
+-    {
+-        return static_cast<size_t>(st.st_size);
+-    }
+-#    else // other unix or linux 32 bits or cygwin
+     struct stat st;
+     if (::fstat(fd, &st) == 0)
+     {
+         return static_cast<size_t>(st.st_size);
+     }
+-#    endif
+ #endif
+     throw_spdlog_ex("Failed getting file size from fd", errno);
+     return 0; // will not be reached.
diff --git a/main/dpkg/APKBUILD b/main/dpkg/APKBUILD
index b535e0fba62..c3900fe9996 100644
--- a/main/dpkg/APKBUILD
+++ b/main/dpkg/APKBUILD
@@ -1,17 +1,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dpkg
-pkgver=1.20.0
-pkgrel=0
+pkgver=1.22.6
+pkgrel=1
 pkgdesc="The Debian Package Manager"
-url="https://packages.debian.org/dpkg"
+url="https://wiki.debian.org/Teams/Dpkg"
 arch="all"
-license="GPL-2.0-or-later BSD-2-Clause"
-depends="tar"
-options="!check"
-makedepends="bzip2-dev linux-headers perl zlib-dev"
-subpackages="$pkgname-doc $pkgname-dev"
+license="GPL-2.0-or-later AND BSD-2-Clause"
+depends="tar xz"
+checkdepends="gzip"
+makedepends="bzip2-dev linux-headers perl zlib-dev po4a libmd-dev"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-zsh-completion"
 source="https://deb.debian.org/debian/pool/main/d/dpkg/dpkg_$pkgver.tar.xz"
 
+# secfixes:
+#   1.21.8-r0:
+#     - CVE-2022-1664
+
+prepare() {
+	default_prepare
+
+	# On the builders /home/buildozer has S_ISGID set this is
+	# inherited in $srcdir and causes some dpkg test to end up with
+	# a permission mismatch. To fix this remove the S_ISGID from
+	# $srcdir.
+	chmod -R g-s "$srcdir"
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
@@ -25,16 +39,18 @@ build() {
 		--disable-dselect \
 		--disable-start-stop-daemon \
 		--disable-nls \
-		--disable-static
+		--disable-static \
+		--with-zshcompletionsdir=/usr/share/zsh/site-functions
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
 	make DESTDIR="$pkgdir" install
 
-	# Add missing dir & files
-	install -d "$pkgdir/var/$pkgname"/updates/
-
 	touch "$pkgdir/var/lib/$pkgname"/status
 	touch "$pkgdir/var/lib/$pkgname"/available
 }
@@ -43,7 +59,7 @@ dev() {
 	default_dev
 	pkgdesc="Debian package development tools"
 	depends="perl"
-	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/share \
+	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/share/dpkg \
 		"$subpkgdir"/usr/lib/dpkg
 
 	mv "$pkgdir"/usr/bin/dpkg-architecture \
@@ -61,9 +77,16 @@ dev() {
 		"$pkgdir"/usr/bin/dpkg-shlibdeps \
 		"$pkgdir"/usr/bin/dpkg-source \
 		"$pkgdir"/usr/bin/dpkg-vendor \
+		"$pkgdir"/usr/bin/dpkg-buildflags \
+		"$pkgdir"/usr/bin/dpkg-genbuildinfo \
+		"$pkgdir"/usr/bin/dpkg-buildapi \
 		"$subpkgdir"/usr/bin/
 
 	mv "$pkgdir"/usr/share/perl* "$subpkgdir"/usr/share/
+	mv "$pkgdir"/usr/share/dpkg/*.mk \
+		"$subpkgdir"/usr/share/dpkg
 }
 
-sha512sums="5dd7961bde19ccc891fd5b77ca0085f7fc0308c20380e20b393397ff92e50d1c0f54e7b57676c05876021b44aa3788af8258c21ff2b672110ac92c7ce0b408f9  dpkg_1.20.0.tar.xz"
+sha512sums="
+a7a1c42ee69c9b90842ac98140978331ad311b49db23151c796218052ad673bc99c456ad568a4b71bb48f59930adc22ad60f78900ee2a6f04c5fca3096da5983  dpkg_1.22.6.tar.xz
+"
diff --git a/main/drbd-lts/APKBUILD b/main/drbd-lts/APKBUILD
deleted file mode 100644
index 095dc616cdd..00000000000
--- a/main/drbd-lts/APKBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Contributor: Roland Kammerer <roland.kammerer@linbit.com>
-# Maintainer: Roland Kammerer <roland.kammerer@linbit.com>
-
-# when changing _ver we *must* bump _rel
-_name=drbd
-_ver=9.0.21-1
-_rel=0
-
-_flavor=${FLAVOR:-lts}
-_kpkg=linux-$_flavor
-_kver=5.4.28
-_krel=0
-_kabi="$_kver-$_krel-$_flavor"
-_kpkgver="$_kver-r$_krel"
-
-pkgname=$_name-$_flavor
-pkgver=$_kver
-pkgrel=$(( $_krel + $_rel ))
-
-pkgdesc="Network-based RAID 1 version 9"
-url="https://www.linbit.com/en/drbd-community/drbd-download/"
-arch="all !armhf"
-license="GPL-2.0-or-later"
-depends="$_kpkg=$_kpkgver"
-makedepends="$_kpkg-dev=$_kpkgver bash coreutils"
-source="http://www.linbit.com/downloads/drbd/${_ver%.*}/drbd-$_ver.tar.gz"
-
-builddir=$srcdir/$_name-$_ver
-
-prepare() {
-	default_prepare
-	# verify the kernel version
-	local _kapkbuild=../../main/linux-$_flavor/APKBUILD
-	if [ -f $_kapkbuild ]; then
-		(	. $_kapkbuild
-			pkgname=$_name-$_flavor
-			[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
-			[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
-			return 0
-		)
-	fi
-}
-
-build() {
-	cd "$builddir"
-	unset LDFLAGS
-	make KVER=$_kabi
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="2911122bcf893e524a4de134f978e298f363521813b7db2bfe12fbcca086d6108037bfc9bce9f102995270254c7f350e0af4441ee39ccd7d9182240fd5432f85  drbd-9.0.21-1.tar.gz"
diff --git a/main/drbd-utils/APKBUILD b/main/drbd-utils/APKBUILD
index 26fa4f0831a..c754fc0b2a1 100644
--- a/main/drbd-utils/APKBUILD
+++ b/main/drbd-utils/APKBUILD
@@ -1,25 +1,44 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=drbd-utils
-pkgver=9.12.1
+pkgver=9.27.0
 pkgrel=0
 pkgdesc="Network-based RAID 1"
-url="http://www.drbd.org"
+url="https://www.drbd.org"
 arch="all"
 license="GPL-2.0-or-later"
 depends="bash"
-makedepends="bison docbook-xsl flex libxslt linux-headers po4a"
+makedepends="
+	asciidoctor
+	bison
+	docbook-xsl
+	flex
+	keyutils-dev
+	libxslt
+	linux-headers
+	po4a
+	"
 options="!check"  # no tests provided
 provides="drbd=$pkgver-r$pkgrel"
-subpackages="$pkgname-doc $pkgname-pacemaker::noarch
-	$pkgname-bash-completion:bashcomp:noarch $pkgname-openrc"
-source="http://www.linbit.com/downloads/drbd/utils/drbd-utils-$pkgver.tar.gz
+subpackages="
+	$pkgname-bash-completion
+	$pkgname-doc
+	$pkgname-openrc
+	$pkgname-pacemaker::noarch
+	"
+source="https://pkg.linbit.com/downloads/drbd/utils/drbd-utils-$pkgver.tar.gz
 	drbdsetup-permissions.patch
 	drbd.initd
 	"
 
 build() {
-	./configure --prefix=/usr \
+	CFLAGS="$CFLAGS -flto=auto" \
+	CXXFLAGS="$CXXFLAGS -flto=auto" \
+	./configure \
+		--host=$CHOST \
+		--build=$CBUILD \
+		--disable-dependency-tracking \
+		--prefix=/usr \
 		--sbindir=/sbin \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
@@ -40,25 +59,20 @@ package() {
 	make DESTDIR="$pkgdir" install
 
 	install -m755 -D "$srcdir/drbd.initd" "$pkgdir/etc/init.d/drbd"
+
+	mkdir -p "$pkgdir"/usr/share/bash-completion
+	mv "$pkgdir"/etc/bash_completion.d \
+		"$pkgdir"/usr/share/bash-completion/completions
 }
 
 pacemaker() {
 	depends="$pkgname=$pkgver-r$pkgrel"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/ocf "$subpkgdir"/usr/lib
-}
-
-bashcomp() {
-	pkgdesc="Bash completions for $pkgname"
-	depends=""
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
-	mkdir -p "$subpkgdir"/usr/share/bash-completion
-	mv "$pkgdir"/etc/bash_completion.d \
-		"$subpkgdir"/usr/share/bash-completion/completions
+	amove usr/lib/ocf
 }
 
-sha512sums="29e9b739c6eace0cfe1f91fc3ea6a55ad7710efffe0e60f9273337d4961ad99cd852bf0484b663157fe3c961d69c25453f3004502c1f6080a33c73b532c4f728  drbd-utils-9.12.1.tar.gz
-562ae8eee03148666fb6e6e700c1eb9086f6901e176ea6cd007e3ac4e39d1cdaf967064de74dc1ad620155996dc7011bd0e2abd1c9595ff9bf5f4413673726f3  drbdsetup-permissions.patch
-f61a833dc5eea79000a7dd85e83ae10e284109c76b5d59974ed69f92dbab6c389d6d20f7ea374b7c066519c6d1d816ed27b48dbaee6b91fb9754974acf52f46e  drbd.initd"
+sha512sums="
+066849e77bac04515682f497398e3840eecdf16c866a0d67df4e8978e9278dee120d9a216ba7dcf16e1dc2cfdd7271ff775e5bee9ccd0cead8360b7e33e08f5d  drbd-utils-9.27.0.tar.gz
+39a64a59577a28f8dc5f968bcfd35ab04b010ec1b9390dcaedefa609b8999ec4aabf2cfaf2db7dfd8348d8d09aca5720839de51b3bfb093960b3c61f92ebe4f0  drbdsetup-permissions.patch
+f61a833dc5eea79000a7dd85e83ae10e284109c76b5d59974ed69f92dbab6c389d6d20f7ea374b7c066519c6d1d816ed27b48dbaee6b91fb9754974acf52f46e  drbd.initd
+"
diff --git a/main/drbd-utils/drbdsetup-permissions.patch b/main/drbd-utils/drbdsetup-permissions.patch
index ca0a3642aca..52a74394740 100644
--- a/main/drbd-utils/drbdsetup-permissions.patch
+++ b/main/drbd-utils/drbdsetup-permissions.patch
@@ -1,9 +1,9 @@
 --- ./user/v9/Makefile.in.orig
 +++ ./user/v9/Makefile.in
-@@ -109,15 +109,9 @@
- 	install -d $(DESTDIR)$(sbindir)
- 	install -d $(DESTDIR)$(localstatedir)/lib/drbd
- 	install -d $(DESTDIR)$(localstatedir)/lock
+@@ -145,15 +144,9 @@
+	install -m 0755 -d $(DESTDIR)$(localstatedir)/lib/drbd
+	install -m 0755 -d $(DESTDIR)$(localstatedir)/run/drbd
+	install -m 0700 -d $(DESTDIR)$(localstatedir)/run/drbd/lock
 -	if getent group haclient > /dev/null 2> /dev/null ; then	\
 -		install -g haclient -m 4750 drbdsetup $(DESTDIR)$(sbindir) ;	\
 -		install -g haclient -m 4750 drbdmeta $(DESTDIR)$(sbindir) ;	\
diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD
index 46669578959..310bb0a6c3d 100644
--- a/main/dropbear/APKBUILD
+++ b/main/dropbear/APKBUILD
@@ -1,36 +1,47 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dropbear
-pkgver=2019.78
+pkgver=2024.84
 pkgrel=0
 pkgdesc="small SSH 2 client/server designed for small memory environments"
-url="http://matt.ucc.asn.au/dropbear/dropbear.html"
+url="https://matt.ucc.asn.au/dropbear/dropbear.html"
 arch="all"
 license="MIT"
 options="!check"
-makedepends="zlib-dev linux-headers"
+makedepends="zlib-dev linux-headers utmps-dev utmps-static autoconf automake"
 subpackages="$pkgname-doc
 	$pkgname-openrc
 	$pkgname-convert:_convert
 	$pkgname-dbclient:_dbclient
 	$pkgname-ssh:_ssh:noarch
 	$pkgname-scp:_scp"
-source="https://matt.ucc.asn.au/dropbear/releases/${pkgname}-${pkgver}.tar.bz2
+source="https://matt.ucc.asn.au/dropbear/releases/dropbear-$pkgver.tar.bz2
 	dropbear.initd
 	dropbear.confd
-	dropbear-0.53.1-static_build_fix.patch
 	dropbear-options_sftp-server_path.patch
+	dropbear-fix-utmp.patch
+	new-config.h-location.patch
 	"
 
 # secfixes:
+#   2022.83-r4:
+#     - CVE-2023-48795
+#   2020.79-r0:
+#     - CVE-2018-20685
 #   2018.76-r2:
 #     - CVE-2018-15599
 
 _progs="dropbear dropbearkey dbclient dropbearconvert scp"
 
+prepare() {
+	default_prepare
+	autoreconf -fvi
+}
+
 build() {
-	cd "$builddir"
+	CFLAGS="$CFLAGS $(pkg-config --cflags --static utmps)" \
+	LIBS="$LDLIBS $(pkg-config --libs --static utmps)" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -39,15 +50,17 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
+		--disable-utmp \
 		--disable-wtmp \
+		--disable-pututline \
 		--disable-lastlog
 	make PROGRAMS="$_progs"
 }
 
 package() {
-	make PROGRAMS="$_progs" DESTDIR="$pkgdir" \
-		-C "$builddir" install
+	make PROGRAMS="$_progs" DESTDIR="$pkgdir" install
 
+	install -dm755 "$pkgdir"/etc/dropbear
 	install -D -m755 "$srcdir"/dropbear.initd \
 		"$pkgdir"/etc/init.d/dropbear
 	install -D -m644 "$srcdir"/dropbear.confd \
@@ -82,8 +95,11 @@ _ssh() {
 	ln -s /usr/bin/dbclient "$subpkgdir"/usr/bin/ssh
 }
 
-sha512sums="f667ba8dae17ea89c118642b566f2c134c71bfd0b8bacea5cf7ec87d75ac79bd7cd1864a8788367a89d30ee35427d389ef6416375adff6e83caae30ff3e0549f  dropbear-2019.78.tar.bz2
-9c55ab3d8b61955cde1ccc1b8acbd3d2ef123feb9489e92737304c35315d07b7f85fad8a12ac7b0ec2c1dcee3d76b8bc4aa18518f4ddd963917805db33e48826  dropbear.initd
+sha512sums="
+254daea819c5aeaa65bb43449386fb964f4aa13e3b3037fe11064120205c6e265925e7ef2d84f7ebe66c6a00cf0a22e6010314c065ed49a3815f47137b7aca44  dropbear-2024.84.tar.bz2
+78bd4142f9ad05b40520de6dbe71cd64fb2b3bf2d346f7710aa2ab2313162ea17be13fa27e8f8c645307c9d32f640e05ec1d92d303936e60feb8e95cc4369f5c  dropbear.initd
 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f  dropbear.confd
-413cef467db35ddc430a773af943ff650d51bdb6fb262dcabc625eb6c9f4170b5711998df5577dd05c60e21e0a9771bff022adc8273083b85a18f4d5659ffd50  dropbear-0.53.1-static_build_fix.patch
-9b078548c6850c9b45e9b68a8ebd746a4a0648607c8ad0cf4106f09f7a63768c83a3e4e4fbec38b665ae283503fd3cdd054775aa3c9afe02567be3e775aef50b  dropbear-options_sftp-server_path.patch"
+09e73041ecb55d5d97106b3b8f4256df9e6d84c7aceeaaccdb148a9243ccd4defaccb320c45bf76620f5b004264dd775dbfc207db4a045ee1c7b7db2dedb2d79  dropbear-options_sftp-server_path.patch
+5c0d118944481237611cdbe9239bd26548859dc2ab04f2e81854388de9c34c99e083843e925312b4f90ce8b22037bef3c61858fc19d843e5b6db5f3006448304  dropbear-fix-utmp.patch
+b773b90e92f451a99b6f0e98c85b7fd614ed9a3c1562e086c4e2db1accd1cfec1129b24f3e0731411c3f09014902bc6e9493ebbc2fafc2438e51cfc450e25f15  new-config.h-location.patch
+"
diff --git a/main/dropbear/dropbear-0.53.1-static_build_fix.patch b/main/dropbear/dropbear-0.53.1-static_build_fix.patch
deleted file mode 100644
index 6f13101bbef..00000000000
--- a/main/dropbear/dropbear-0.53.1-static_build_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-dropbear: fix static build
-
-the -lcrypt is missing during the link
-
-svr-authpasswd.o: In function `svr_auth_password':
-svr-authpasswd.c:(.text+0xfc): undefined reference to `crypt'
-collect2: ld returned 1 exit status
-
-Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
----
- Makefile.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -99,7 +99,7 @@ STRIP=@STRIP@
- INSTALL=@INSTALL@
- CPPFLAGS=@CPPFLAGS@
- CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
--LIBS+=@LIBS@
-+LIBS+=@CRYPTLIB@ @LIBS@
- LDFLAGS=@LDFLAGS@
- 
- EXEEXT=@EXEEXT@
diff --git a/main/dropbear/dropbear-fix-utmp.patch b/main/dropbear/dropbear-fix-utmp.patch
new file mode 100644
index 00000000000..b06b8a41666
--- /dev/null
+++ b/main/dropbear/dropbear-fix-utmp.patch
@@ -0,0 +1,157 @@
+diff --git a/loginrec.c b/loginrec.c
+index af10d95..9e5c3aa 100644
+--- a/src/loginrec.c
++++ b/src/loginrec.c
+@@ -239,6 +239,13 @@ logininfo *login_alloc_entry(int pid, const char *username,
+ 
+ 	newli = (struct logininfo *) m_malloc (sizeof(*newli));
+ 	(void)login_init_entry(newli, pid, username, hostname, line);
++#ifdef HAVE_STRUCT_SOCKADDR_IN6
++	if (inet_pton(AF_INET6, hostname, newli->hostaddr.sa_in6.sin6_addr.s6_addr) > 0)
++		newli->hostaddr.sa_in6.sin6_family = AF_INET6;
++	else
++#endif
++	if (inet_pton(AF_INET, hostname, &newli->hostaddr.sa_in.sin_addr.s_addr) > 0)
++		newli->hostaddr.sa_in.sin_family = AF_INET;
+ 	return newli;
+ }
+ 
+@@ -473,9 +480,6 @@ void
+ construct_utmp(struct logininfo *li,
+ 		    struct utmp *ut)
+ {
+-# ifdef HAVE_ADDR_V6_IN_UTMP
+-	struct sockaddr_in6 *sa6;
+-#  endif
+ 	memset(ut, '\0', sizeof(*ut));
+ 
+ 	/* First fill out fields used for both logins and logouts */
+@@ -528,12 +532,11 @@ construct_utmp(struct logininfo *li,
+ 	if (li->hostaddr.sa.sa_family == AF_INET)
+ 		ut->ut_addr = li->hostaddr.sa_in.sin_addr.s_addr;
+ # endif
+-# ifdef HAVE_ADDR_V6_IN_UTMP
++# if defined(HAVE_STRUCT_UTMP_UT_ADDR_V6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
+ 	/* this is just a 128-bit IPv6 address */
+ 	if (li->hostaddr.sa.sa_family == AF_INET6) {
+-		sa6 = ((struct sockaddr_in6 *)&li->hostaddr.sa);
+-		memcpy(ut->ut_addr_v6, sa6->sin6_addr.s6_addr, 16);
+-		if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr)) {
++		memcpy(ut->ut_addr_v6, li->hostaddr.sa_in6.sin6_addr.s6_addr, 16);
++		if (IN6_IS_ADDR_V4MAPPED(&li->hostaddr.sa_in6.sin6_addr)) {
+ 			ut->ut_addr_v6[0] = ut->ut_addr_v6[3];
+ 			ut->ut_addr_v6[1] = 0;
+ 			ut->ut_addr_v6[2] = 0;
+@@ -569,9 +572,6 @@ set_utmpx_time(struct logininfo *li, struct utmpx *utx)
+ void
+ construct_utmpx(struct logininfo *li, struct utmpx *utx)
+ {
+-# ifdef HAVE_ADDR_V6_IN_UTMP
+-	struct sockaddr_in6 *sa6;
+-#  endif
+ 	memset(utx, '\0', sizeof(*utx));
+ # ifdef HAVE_STRUCT_UTMPX_UT_ID
+ 	line_abbrevname(utx->ut_id, li->line, sizeof(utx->ut_id));
+@@ -589,8 +589,6 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx)
+ 	line_stripname(utx->ut_line, li->line, sizeof(utx->ut_line));
+ 	set_utmpx_time(li, utx);
+ 	utx->ut_pid = li->pid;
+-	/* strncpy(): Don't necessarily want null termination */
+-	strncpy(utx->ut_name, li->username, MIN_SIZEOF(utx->ut_name, li->username));
+ 
+ 	if (li->type == LTYPE_LOGOUT)
+ 		return;
+@@ -600,6 +598,9 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx)
+ 	 * for logouts.
+ 	 */
+ 
++	/* strncpy(): Don't necessarily want null termination */
++	strncpy(utx->ut_name, li->username, MIN_SIZEOF(utx->ut_name, li->username));
++
+ # ifdef HAVE_STRUCT_UTMPX_UT_HOST
+ 	strncpy(utx->ut_host, li->hostname, MIN_SIZEOF(utx->ut_host, li->hostname));
+ # endif
+@@ -608,16 +609,15 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx)
+ 	if (li->hostaddr.sa.sa_family == AF_INET)
+ 		utx->ut_addr = li->hostaddr.sa_in.sin_addr.s_addr;
+ # endif
+-# ifdef HAVE_ADDR_V6_IN_UTMP
++# if defined(HAVE_STRUCT_UTMPX_UT_ADDR_V6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
+ 	/* this is just a 128-bit IPv6 address */
+ 	if (li->hostaddr.sa.sa_family == AF_INET6) {
+-		sa6 = ((struct sockaddr_in6 *)&li->hostaddr.sa);
+-		memcpy(ut->ut_addr_v6, sa6->sin6_addr.s6_addr, 16);
+-		if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr)) {
+-			ut->ut_addr_v6[0] = ut->ut_addr_v6[3];
+-			ut->ut_addr_v6[1] = 0;
+-			ut->ut_addr_v6[2] = 0;
+-			ut->ut_addr_v6[3] = 0;
++		memcpy(utx->ut_addr_v6, li->hostaddr.sa_in6.sin6_addr.s6_addr, 16);
++		if (IN6_IS_ADDR_V4MAPPED(&li->hostaddr.sa_in6.sin6_addr)) {
++			utx->ut_addr_v6[0] = utx->ut_addr_v6[3];
++			utx->ut_addr_v6[1] = 0;
++			utx->ut_addr_v6[2] = 0;
++			utx->ut_addr_v6[3] = 0;
+ 		}
+ 	}
+ # endif
+@@ -1047,30 +1047,12 @@ wtmp_get_entry(struct logininfo *li)
+  **/
+ 
+ #ifdef USE_WTMPX
+-/* write a wtmpx entry direct to the end of the file */
+-/* This is a slight modification of code in OpenBSD's logwtmp.c */
++/* write a wtmpx entry via updwtmpx() */
+ static int
+ wtmpx_write(struct logininfo *li, struct utmpx *utx)
+ {
+-	struct stat buf;
+-	int fd, ret = 1;
+-
+-	if ((fd = open(WTMPX_FILE, O_WRONLY|O_APPEND, 0)) < 0) {
+-		dropbear_log(LOG_WARNING, "wtmpx_write: problem opening %s: %s",
+-		    WTMPX_FILE, strerror(errno));
+-		return 0;
+-	}
+-
+-	if (fstat(fd, &buf) == 0)
+-		if (atomicio(vwrite, fd, utx, sizeof(*utx)) != sizeof(*utx)) {
+-			ftruncate(fd, buf.st_size);
+-			dropbear_log(LOG_WARNING, "wtmpx_write: problem writing %s: %s",
+-			    WTMPX_FILE, strerror(errno));
+-			ret = 0;
+-		}
+-	(void)close(fd);
+-
+-	return ret;
++	updwtmpx(WTMPX_FILE, utx);
++	return 1;
+ }
+ 
+ 
+diff --git a/loginrec.h b/loginrec.h
+index b2e3778..f594ad7 100644
+--- a/src/loginrec.h
++++ b/src/loginrec.h
+@@ -105,6 +105,9 @@
+ union login_netinfo {
+ 	struct sockaddr sa;
+ 	struct sockaddr_in sa_in;
++#ifdef HAVE_STRUCT_SOCKADDR_IN6
++	struct sockaddr_in6 sa_in6;
++#endif
+ #ifdef HAVE_STRUCT_SOCKADDR_STORAGE
+ 	struct sockaddr_storage sa_storage;
+ #endif
+diff --git a/svr-chansession.c b/svr-chansession.c
+index 656a968..bb4536c 100644
+--- a/src/svr-chansession.c
++++ b/src/svr-chansession.c
+@@ -850,6 +850,7 @@ static int ptycommand(struct Channel *channel, struct ChanSess *chansess) {
+ 		 * terminal used for stdout with the dup2 above, otherwise
+ 		 * the wtmp login will not be recorded */
+ 		li = chansess_login_alloc(chansess);
++		li->pid = getpid();
+ 		login_login(li);
+ 		login_free_entry(li);
+ 
diff --git a/main/dropbear/dropbear-options_sftp-server_path.patch b/main/dropbear/dropbear-options_sftp-server_path.patch
index c16466e3e8f..7799d80fcba 100644
--- a/main/dropbear/dropbear-options_sftp-server_path.patch
+++ b/main/dropbear/dropbear-options_sftp-server_path.patch
@@ -1,6 +1,6 @@
---- a/default_options.h
-+++ b/default_options.h
-@@ -255,7 +255,7 @@
+--- a/src/default_options.h
++++ b/src/default_options.h
+@@ -296,7 +296,7 @@
   * OpenSSH), set the path below and set DROPBEAR_SFTPSERVER. 
   * The sftp-server program is not provided by Dropbear itself */
  #define DROPBEAR_SFTPSERVER 1
diff --git a/main/dropbear/dropbear.initd b/main/dropbear/dropbear.initd
index 633cede4d3e..4120f9af14b 100644
--- a/main/dropbear/dropbear.initd
+++ b/main/dropbear/dropbear.initd
@@ -10,9 +10,6 @@ depend() {
 }
 
 check_config() {
-	if [ ! -e /etc/dropbear/ ] ; then
-		mkdir /etc/dropbear/
-	fi
 	if [ ! -e /etc/dropbear/dropbear_dss_host_key ] ; then
 		einfo "Generating DSS-Hostkey..."
 		/usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key
@@ -25,6 +22,10 @@ check_config() {
 		einfo "Generating ECDSA-Hostkey..."
 		/usr/bin/dropbearkey -t ecdsa -f /etc/dropbear/dropbear_ecdsa_host_key
 	fi
+	if [ ! -e /etc/dropbear/dropbear_ed25519_host_key ] ; then
+		einfo "Generating ED25519-Hostkey..."
+		/usr/bin/dropbearkey -t ed25519 -f /etc/dropbear/dropbear_ed25519_host_key
+	fi
 }
 
 start() {
diff --git a/main/dropbear/new-config.h-location.patch b/main/dropbear/new-config.h-location.patch
new file mode 100644
index 00000000000..13e2f15fa0a
--- /dev/null
+++ b/main/dropbear/new-config.h-location.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -890,7 +890,7 @@
+ 
+ AC_CONFIG_AUX_DIR([src])
+ 
+-AC_CONFIG_HEADERS([config.h:src/config.h.in])
++AC_CONFIG_HEADERS([src/config.h:src/config.h.in])
+ AC_CONFIG_FILES(Makefile $LIBTOM_FILES test/Makefile)
+ AC_OUTPUT
+ 
diff --git a/main/dtach/APKBUILD b/main/dtach/APKBUILD
index 2a7bebf71f2..5cb2e7edfd8 100644
--- a/main/dtach/APKBUILD
+++ b/main/dtach/APKBUILD
@@ -1,18 +1,15 @@
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=dtach
 pkgver=0.9
-pkgrel=1
+pkgrel=5
 pkgdesc="A program that emulates the detach feature of screen"
-url="http://dtach.sourceforge.net"
+url="https://dtach.sourceforge.net/"
 arch="all"
-license="GPL"
-source="https://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+license="GPL-2.0-or-later"
+source="https://downloads.sourceforge.net/project/dtach/dtach/$pkgver/dtach-$pkgver.tar.gz"
 subpackages="$pkgname-doc"
 
-builddir="$srcdir/$pkgname-$pkgver"
-
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -21,12 +18,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	./dtach --help > /dev/null
 }
 
 package() {
-	cd "$builddir"
 	install -Dm755 dtach "$pkgdir"/usr/bin/dtach
 	install -Dm644 dtach.1 "$pkgdir"/usr/share/man/man1/dtach.1
 	install -Dm644 README "$pkgdir"/usr/share/doc/dtach/README
diff --git a/main/dtc/APKBUILD b/main/dtc/APKBUILD
index d1ec6ef883a..ff2655fb99c 100644
--- a/main/dtc/APKBUILD
+++ b/main/dtc/APKBUILD
@@ -1,24 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dtc
-pkgver=1.6.0
-pkgrel=0
+pkgver=1.7.0
+pkgrel=2
 pkgdesc="Device Tree Compiler"
 url="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/"
 arch="all"
 license="GPL-2.0-or-later"
-makedepends="$depends_dev bison flex"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+makedepends="
+	bison
+	flex
+	py3-setuptools
+	python3-dev
+	swig
+	"
 checkdepends="coreutils"
-subpackages="$pkgname-dev libfdt"
+subpackages="$pkgname-dev libfdt py3-libfdt-pyc py3-libfdt:py3_libfdt"
 source="https://kernel.org/pub/software/utils/dtc/dtc-$pkgver.tar.xz
+	install-pylibfdt-to-destdir.patch
+	pyscm.patch
+	fix-tests-for-Python3.12.patch
 	"
 
 prepare() {
 	default_prepare
 	sed -i s:-Werror::g "$builddir"/Makefile
+	sed -i "s|@VERSION@|$pkgver|" setup.py
 }
 
 build() {
-	make
+	make -j1
 }
 
 check() {
@@ -32,8 +43,19 @@ package() {
 
 libfdt() {
 	pkgdesc="Device tree library"
-	mkdir -p "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/libfdt* "$subpkgdir"/usr/lib/
+	license="GPL-2.0-or-later OR BSD-2-Clause"
+	amove usr/lib/libfdt*
+}
+
+py3_libfdt() {
+	pkgdesc="Device tree library for Python 3"
+	depends="python3"
+	amove usr/lib/python3*
 }
 
-sha512sums="15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3  dtc-1.6.0.tar.xz"
+sha512sums="
+d3ba6902a9a2f2cdbaff55f12fca3cfe4a1ec5779074a38e3d8b88097c7abc981835957e8ce72971e10c131e05fde0b1b961768e888ff96d89e42c75edb53afb  dtc-1.7.0.tar.xz
+1c43dfae8d15861c4f0170f0df9ba63d197ab3be50e39fe5748e547074c52dc7b042ca5e9c64d3d4bb0a8e8cde8df7e71660cde93e9512923405c38debcaa01c  install-pylibfdt-to-destdir.patch
+e74768f6bcbe0ba8060c7b0b449e533b2fbbf3ddc1c869b98cf3f78a858c63ba1d7d57b5163eb5be048c6f0be023360f709d621e2f88d4332a7ef8e8d125cc09  pyscm.patch
+2fc10469b4c1f5016cdccd1a1e24d1f0984267c88efe88d268d52d9a49c441d832f53bf004a5223810c82e0f10cf5b515d6a6ddb56e49ca5bb86b55724634f0b  fix-tests-for-Python3.12.patch
+"
diff --git a/main/dtc/fix-tests-for-Python3.12.patch b/main/dtc/fix-tests-for-Python3.12.patch
new file mode 100644
index 00000000000..7a08648f383
--- /dev/null
+++ b/main/dtc/fix-tests-for-Python3.12.patch
@@ -0,0 +1,43 @@
+Description: Python3.12 causes breakage for get_mem_rsv in pylibfdt.
+ 
+ Author: Héctor Orón Martínez <zumbi@debian.org>
+
+---
+
+Bug: https://github.com/dgibson/dtc/issues/123
+Bug-Debian: https://bugs.debian.org/1061318
+Bug-Ubuntu: https://launchpad.net/bugs/2051399
+Last-Update: 2024-01-30
+
+--- device-tree-compiler-1.7.0.orig/tests/pylibfdt_tests.py
++++ device-tree-compiler-1.7.0/tests/pylibfdt_tests.py
+@@ -418,9 +418,14 @@ class PyLibfdtBasicTests(unittest.TestCa
+     def testReserveMap(self):
+         """Test that we can access the memory reserve map"""
+         self.assertEqual(2, self.fdt.num_mem_rsv())
+-        self.assertEqual([ 0xdeadbeef00000000, 0x100000],
+-                          self.fdt.get_mem_rsv(0))
+-        self.assertEqual([123456789, 0o10000], self.fdt.get_mem_rsv(1))
++        if sys.version_info.major >= 3 and sys.version_info.minor >= 12:
++            self.assertEqual([0, 0xdeadbeef00000000, 0x100000],
++                             self.fdt.get_mem_rsv(0))
++            self.assertEqual([0, 123456789, 0o10000], self.fdt.get_mem_rsv(1))
++        else:
++            self.assertEqual([0xdeadbeef00000000, 0x100000],
++                             self.fdt.get_mem_rsv(0))
++            self.assertEqual([123456789, 0o10000], self.fdt.get_mem_rsv(1))
+ 
+     def testEmpty(self):
+         """Test that we can create an empty tree"""
+@@ -615,7 +620,10 @@ class PyLibfdtSwTests(unittest.TestCase)
+ 
+         fdt = sw.as_fdt()
+         self.assertEqual(2, fdt.num_mem_rsv())
+-        self.assertEqual([TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
++        if sys.version_info.major >= 3 and sys.version_info.minor >= 12:
++            self.assertEqual([0, TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
++        else:
++            self.assertEqual([TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
+ 
+         # Make sure we can add a few more things
+         with sw.add_node('another'):
diff --git a/main/dtc/install-pylibfdt-to-destdir.patch b/main/dtc/install-pylibfdt-to-destdir.patch
new file mode 100644
index 00000000000..31c7a6b4804
--- /dev/null
+++ b/main/dtc/install-pylibfdt-to-destdir.patch
@@ -0,0 +1,13 @@
+diff --git a/pylibfdt/Makefile.pylibfdt b/pylibfdt/Makefile.pylibfdt
+index 6866a0b..6363840 100644
+--- a/pylibfdt/Makefile.pylibfdt
++++ b/pylibfdt/Makefile.pylibfdt
+@@ -22,7 +22,7 @@ $(PYMODULE): $(PYLIBFDT_srcs) $(LIBFDT_archive) $(SETUP) $(VERSION_FILE)
+ 
+ install_pylibfdt: $(PYMODULE)
+ 	@$(VECHO) INSTALL-PYLIB
+-	$(PYTHON) $(SETUP) $(SETUPFLAGS) install --prefix=$(PREFIX)
++	$(PYTHON) $(SETUP) $(SETUPFLAGS) install --prefix=$(PREFIX) --root=$(DESTDIR)
+ 
+ pylibfdt_clean:
+ 	@$(VECHO) CLEAN "(pylibfdt)"
diff --git a/main/dtc/pyscm.patch b/main/dtc/pyscm.patch
new file mode 100644
index 00000000000..62157aad584
--- /dev/null
+++ b/main/dtc/pyscm.patch
@@ -0,0 +1,19 @@
+no setuptools_scm in main
+--
+diff --git a/setup.py b/setup.py
+index e82a832..da01efd 100755
+--- a/setup.py
++++ b/setup.py
+@@ -49,11 +49,8 @@ class build_py(_build_py):
+ 
+ setup(
+     name='libfdt',
+-    use_scm_version={
+-        "root": srcdir,
+-    },
+     cmdclass = {'build_py' : build_py},
+-    setup_requires = ['setuptools_scm'],
++    version="@VERSION@",
+     author='Simon Glass',
+     author_email='sjg@chromium.org',
+     description='Python binding for libfdt',
diff --git a/main/duplicity/APKBUILD b/main/duplicity/APKBUILD
deleted file mode 100644
index 1525a69f8d8..00000000000
--- a/main/duplicity/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Matt Smith <mcs@darkregion.net>
-# Maintainer:  Matt Smith <mcs@darkregion.net>
-pkgname=duplicity
-pkgver=0.8.08
-pkgrel=0
-pkgdesc="Encrypted bandwidth-efficient backup using the rsync algorithm"
-url="http://duplicity.nongnu.org/"
-arch="all"
-license="GPL-2.0-or-later"
-depends="python3 py3-boto gnupg ncftp py3-fasteners py3-future"
-makedepends="python3-dev py3-future py3-setuptools librsync-dev"
-subpackages="$pkgname-doc $pkgname-lang"
-source="https://code.launchpad.net/duplicity/${pkgver:0:3}-series/$pkgver/+download/duplicity-$pkgver.tar.gz"
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 compilec.py
-	# Run a simple smoke-test
-	PYTHONPATH="$PWD" python3 bin/duplicity -V | grep -q duplicity
-}
-
-package() {
-	python3 setup.py install --root "$pkgdir"
-}
-
-sha512sums="968ba458b896874ba1af41753927a01446649ea1864128f3a8ac62e31416656e36844ae62a3408e3d82588da3c23929c714bbdb01b6472a80c2f695801985a15  duplicity-0.8.08.tar.gz"
diff --git a/main/duply/APKBUILD b/main/duply/APKBUILD
deleted file mode 100644
index 7a27f88ed5e..00000000000
--- a/main/duply/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname=duply
-pkgver=2.2.2
-pkgrel=1
-pkgdesc="Wrapper for duplicity"
-url="https://duply.net"
-arch="noarch"
-license="GPL-2.0-or-later"
-depends="duplicity bash"
-# no test provided upstream
-options="!check"
-makedepends="txt2man"
-subpackages="$pkgname-doc"
-source="https://netix.dl.sourceforge.net/project/ftplicity/duply%20(simple%20duplicity)/2.2.x/duply_$pkgver.tgz"
-builddir="$srcdir"/duply_$pkgver
-
-package() {
-	install -Dm755 duply \
-		"$pkgdir"/usr/bin/duply
-	mkdir -p "$pkgdir"/usr/share/man/man1
-	"$pkgdir"/usr/bin/duply txt2man > \
-		"$pkgdir"/usr/share/man/man1/duply.1
-	install -Dm644 gpl-2.0.txt \
-		"$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="2c072f3812989d2d20f9698b5a59eebe5ca8d45eda25622b9e9903748c8fa18374f8d64e0897b7587f62a6a292b277302d15c6785c6b4dd96e127162a5dae358  duply_2.2.2.tgz"
diff --git a/main/dvgrab/APKBUILD b/main/dvgrab/APKBUILD
deleted file mode 100644
index f8af684dd8e..00000000000
--- a/main/dvgrab/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=dvgrab
-pkgver=3.5
-pkgrel=3
-pkgdesc="Utility to capture video from a DV camera"
-url="http://www.kinodv.org/"
-arch="all"
-license="GPL-2.0-or-later"
-depends=
-makedepends="libraw1394-dev libavc1394-dev libdv-dev libiec61883-dev
-	libjpeg-turbo-dev"
-install=""
-subpackages="$pkgname-doc"
-source="https://prdownloads.sourceforge.net/kino/dvgrab-$pkgver.tar.gz
-	musl-fixes.patch
-	fix-narrowing.patch
-	"
-
-builddir="$srcdir"/dvgrab-$pkgver
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-sha512sums="7d9cae1661d27dbef1d0dcdf18966a0ab386d936803ff7d071a18e0303fca45631c9b27187a413adfa4391c395e5909e3b8dc5c543d529e7805550f1a3ee6735  dvgrab-3.5.tar.gz
-c69220fa133812063fc6e237a1c15215b7163845d8f9b0e0aba589a86b875f194d2a6899f44449c3e209415ea94d14a13eeff23014ddda0e8a496a6973a0e21b  musl-fixes.patch
-9c54e630efcbf2992e785a837b24abc62d064e5538156f4d8a4b16edea1d55a7a2a70163564b3139f29c33c8887166fea0a253da0a4e6bb540142bf5054c551d  fix-narrowing.patch"
diff --git a/main/dvgrab/fix-narrowing.patch b/main/dvgrab/fix-narrowing.patch
deleted file mode 100644
index 169f8a3c140..00000000000
--- a/main/dvgrab/fix-narrowing.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8dd729f2cf4cc5b99ad2e3961419cf71d2dfb843 Mon Sep 17 00:00:00 2001
-From: Aaro Koskinen <aaro.koskinen@iki.fi>
-Date: Sun, 15 May 2016 22:44:23 +0300
-Subject: [PATCH] iec13818-1.h: fix build with GCC 6.1.0
-
-Fix the following build issue with GCC 6.1.0:
-
-iec13818-1.h:45:75: error: narrowing conversion of '255' from 'int' to 'char' inside { } [-Wnarrowing]
- static char bitmask[8] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };
-                                                                           ^
----
- iec13818-1.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/iec13818-1.h b/iec13818-1.h
-index 56a4aa0..e964288 100644
---- a/iec13818-1.h
-+++ b/iec13818-1.h
-@@ -42,7 +42,7 @@
- #define BCD(c) ( ((((c) >> 4) & 0x0f) * 10) + ((c) & 0x0f) )
- 
- #define TOBYTES( n ) ( ( n + 7 ) / 8 )
--static char bitmask[8] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };
-+static unsigned char bitmask[8] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };
- #define GETBITS( offset, len ) do { \
- 	unsigned long value = 0; \
- 	while ( len > 0 ) \
diff --git a/main/dvgrab/musl-fixes.patch b/main/dvgrab/musl-fixes.patch
deleted file mode 100644
index 795530836ca..00000000000
--- a/main/dvgrab/musl-fixes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./error.h.orig	2014-04-02 14:09:23.163839471 +0000
-+++ ./error.h	2014-04-02 14:14:07.630616871 +0000
-@@ -22,6 +22,10 @@
- 
- #include <stdarg.h>
- 
-+#if !defined(__ASSERT_FUNCTION)
-+#define __ASSERT_FUNCTION __func__
-+#endif
-+
- #ifdef __cplusplus
- extern "C"
- {
---- ./io.c.orig	2014-04-02 14:14:29.104210187 +0000
-+++ ./io.c	2014-04-02 14:14:59.264575341 +0000
-@@ -31,6 +31,8 @@
- #include <termios.h>
- #include <unistd.h>
- 
-+#include <sys/time.h>
-+
- /* Application header files */
- #include "io.h"
- 
diff --git a/main/e2fsprogs/APKBUILD b/main/e2fsprogs/APKBUILD
index 9c2ef662935..c0ea044bf6d 100644
--- a/main/e2fsprogs/APKBUILD
+++ b/main/e2fsprogs/APKBUILD
@@ -1,25 +1,48 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=e2fsprogs
-pkgver=1.45.6
-pkgrel=0
+pkgver=1.47.0
+pkgrel=5
 pkgdesc="Standard Ext2/3/4 filesystem utilities"
-url="http://e2fsprogs.sourceforge.net"
+url="https://e2fsprogs.sourceforge.net/"
 arch="all"
 license="GPL-2.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND MIT"
-depends_dev="util-linux-dev"
-makedepends="$depends_dev linux-headers"
-checkdepends="diffutils perl"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc libcom_err $pkgname-libs $pkgname-extra"
-source="$pkgname-$pkgver.tar.gz::https://github.com/tytso/e2fsprogs/archive/v$pkgver.tar.gz"
+depends_dev="util-linux-dev gawk"
+# XXX: build hack to upgrade live on builders
+makedepends="$depends_dev musl>1.2.3_git20230322-r2 linux-headers fuse-dev"
+checkdepends="diffutils perl coreutils"
+subpackages="
+	$pkgname-static
+	$pkgname-dev
+	libcom_err
+	fuse2fs
+	fuse2fs-doc:fuse2fs_doc:noarch
+	$pkgname-doc
+	$pkgname-libs
+	$pkgname-extra
+	"
+source="$pkgname-$pkgver.tar.gz::https://github.com/tytso/e2fsprogs/archive/v$pkgver.tar.gz
+	lfs64.patch
+	"
+
+case $CHOST in
+	riscv64*)
+		# j_recover_fast_commit appears to be a false negative due to a compiler
+		# bug or hardware bug
+		#
+		# https://marc.info/?l=linux-ext4&m=161307702015761&w=2
+		options="!check"
+		;;
+esac
 
 # secfixes:
-#   - 1.45.5-r0:
+#   1.45.5-r0:
 #     - CVE-2019-5188
-#   - 1.45.4-r0:
+#   1.45.4-r0:
 #     - CVE-2019-5094
 
 build() {
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -51,7 +74,7 @@ check() {
 }
 
 package() {
-	make -j1 MKDIR_P="install -d"  DESTDIR="$pkgdir" install install-libs
+	make -j1 DESTDIR="$pkgdir" install install-libs
 	mv "$pkgdir"/sbin/* "$pkgdir"/usr/sbin/
 	local i; for i in e2fsck mke2fs mkfs.* fsck.*; do
 		mv "$pkgdir"/usr/sbin/$i "$pkgdir"/sbin/
@@ -60,33 +83,43 @@ package() {
 
 dev() {
 	default_dev
-	mkdir -p "$subpkgdir"/usr/bin
-	mkdir -p "$subpkgdir"/usr/share
-	mv "$pkgdir"/usr/bin/compile_et "$pkgdir"/usr/bin/mk_cmds \
-		"$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/share/et "$pkgdir"/usr/share/ss \
-		"$subpkgdir"/usr/share
+
+	amove \
+		usr/bin/compile_et \
+		usr/bin/mk_cmds \
+		usr/share/et \
+		usr/share/ss
 }
 
 libcom_err() {
 	pkgdesc="Common error description library"
-	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/
+
+	amove lib/libcom_err*
+}
+
+fuse2fs() {
+	pkgdesc="Ext2/3/4 filesystem driver for FUSE"
+	amove usr/bin/fuse2fs
+}
+
+fuse2fs_doc() {
+	pkgdesc="Ext2/3/4 filesystem driver for FUSE (documentation)"
+	install_if="fuse2fs=$pkgver-r$pkgrel docs"
+
+	amove usr/share/man/man1/fuse2fs.1
+	gzip -9 "$subpkgdir"/usr/share/man/man1/fuse2fs.1
 }
 
 extra() {
-	depends="$pkgname"
+	depends="$pkgname=$pkgver-r$pkgrel"
 	pkgdesc="Ext2/3/4 filesystem extra utilities"
-	mkdir -p "$subpkgdir"
-	rmdir "$pkgdir"/lib
-	mv "$pkgdir"/usr "$subpkgdir"/
-}
 
-static() {
-	depends=""
-	pkgdesc="$pkgdesc (static libraries)"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
+	mkdir -p "$subpkgdir"
+	amove usr
+	rmdir "$pkgdir"/lib || true
 }
 
-sha512sums="0de9ee4df69d6be79f0c23baebf32266f0c0fb15190181edf9ebc78d486458b34229c18466646221566d16bc75a011cbe311fd34a72da53340e8de340f064cf9  e2fsprogs-1.45.6.tar.gz"
+sha512sums="
+9cb895f7deed8ee513595b7c232db8345cb7e54e6cbb33e6eeab31c860c892cbc9d721756ac1429e6731e219e1c6aacc25075d517e979397c66bf764bc8bc9fa  e2fsprogs-1.47.0.tar.gz
+9b97f91529844ad04a613d61ef762951859640d2677b4e37648ecc7cfbfc0b4831e8f3e49ad952fc16267d53e6e7c6cf588350a3e36edc2e22779f43d9ef17cf  lfs64.patch
+"
diff --git a/main/e2fsprogs/lfs64.patch b/main/e2fsprogs/lfs64.patch
new file mode 100644
index 00000000000..055c72f1a7a
--- /dev/null
+++ b/main/e2fsprogs/lfs64.patch
@@ -0,0 +1,42 @@
+From 92f8226c3cf7d84a4937766420a411e68771dfc2 Mon Sep 17 00:00:00 2001
+From: Mike Cui <cuicui@gmail.com>
+Date: Sun, 7 May 2023 02:46:47 -0700
+Subject: [PATCH] ext2fs: Use 64-bit lseek when SIZEOF_OFF_T is 64bits
+
+musl-1.2.4 no longer defines lseek64, and since off_t is always 64-bits,
+autoconf decides to not pass in -D_FILE_OFFSET_BITS=64 when compiling,
+and this results in a compilation failure.
+
+Instead of checking _FILE_OFFSET_BITS=64, let's just check if
+SIZEOF_OFF_T is SIZEOF_LONG_LONG. Also, SIZEOF_LONG is irrelevant.
+---
+ lib/blkid/llseek.c  | 2 +-
+ lib/ext2fs/llseek.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/blkid/llseek.c b/lib/blkid/llseek.c
+index 59298646f..f24e40b1f 100644
+--- a/lib/blkid/llseek.c
++++ b/lib/blkid/llseek.c
+@@ -50,7 +50,7 @@ extern long long llseek(int fd, long long offset, int origin);
+ 
+ #else	/* ! HAVE_LLSEEK */
+ 
+-#if SIZEOF_LONG == SIZEOF_LONG_LONG
++#if SIZEOF_OFF_T == SIZEOF_LONG_LONG
+ 
+ #define llseek lseek
+ 
+diff --git a/lib/ext2fs/llseek.c b/lib/ext2fs/llseek.c
+index 45f21d09d..713312aa8 100644
+--- a/lib/ext2fs/llseek.c
++++ b/lib/ext2fs/llseek.c
+@@ -51,7 +51,7 @@ extern long long llseek (int fd, long long offset, int origin);
+ 
+ #else	/* ! HAVE_LLSEEK */
+ 
+-#if SIZEOF_LONG == SIZEOF_LONG_LONG || _FILE_OFFSET_BITS+0 == 64
++#if SIZEOF_OFF_T == SIZEOF_LONG_LONG
+ 
+ #define my_llseek lseek
+ 
diff --git a/main/ed/APKBUILD b/main/ed/APKBUILD
index f492e2a74be..429a9475110 100644
--- a/main/ed/APKBUILD
+++ b/main/ed/APKBUILD
@@ -1,18 +1,18 @@
-# Maintainer: Breno Leitao <breno.leitao@gmail.com>
+# Contributor: Breno Leitao <breno.leitao@gmail.com>
+# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
 pkgname=ed
-pkgver=1.16
+pkgver=1.20
 pkgrel=0
-pkgdesc="GNU ed is a line-oriented text editor. It is used to create, display, modify and otherwise manipulate text files"
+pkgdesc="Line-oriented text editor used to create, display, modify and otherwise manipulate text files"
 url="https://www.gnu.org/software/ed/"
 arch="all"
-license="GPL-3.0-only"
+license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
 source="https://ftp.gnu.org/gnu/ed/ed-$pkgver.tar.lz"
 
-
 build() {
 	# bindir needs correspond with busybox location
-	./configure \
+	./configure CC="${CC:-cc}" CFLAGS+="$CFLAGS" LDFLAGS="$LDFLAGS" \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -29,4 +29,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="1ca999edd7007c56bf9aa91436997a813e665910dda19a3307fa5b85adc05667eb120cb54cb6544b919f1c7f631baf3ee03079abe1171b875fb9653f535fa7bd  ed-1.16.tar.lz"
+sha512sums="
+90c0f24b1d0b7abd18d34345bc37de0e67a0bb96375a4531a742a89b53d4858c30781911c22d81aa0387d0cf4d2153e0b4286fd3483b05e4c35d5e02c0991c53  ed-1.20.tar.lz
+"
diff --git a/main/efi-mkkeys/APKBUILD b/main/efi-mkkeys/APKBUILD
new file mode 100644
index 00000000000..a10d5cdc34a
--- /dev/null
+++ b/main/efi-mkkeys/APKBUILD
@@ -0,0 +1,20 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=efi-mkkeys
+pkgver=0.1.0
+pkgrel=0
+pkgdesc="Script to easily generate self-signed UEFI keys for Secure Boot"
+url="https://github.com/jirutka/efi-mkkeys"
+arch="noarch !armhf !s390x !ppc64le !mips !mips64 !riscv64"  # limited by efitools
+license="MIT"
+depends="efitools cmd:openssl cmd:uuidgen"
+source="https://github.com/jirutka/efi-mkkeys/archive/v$pkgver/efi-mkkeys-$pkgver.tar.gz"
+options="!check"  # no tests provided
+
+package() {
+	make install DESTDIR="$pkgdir" prefix=/usr
+}
+
+sha512sums="
+81ef5751b3f8deaa5b702bfc3fb6240fb32d8e91dbf02cf501187d30effbcd2159629a952a0eb024b1049c231cc2bfcc1ab41addc671d97d8542dd583808eb68  efi-mkkeys-0.1.0.tar.gz
+"
diff --git a/main/efi-mkuki/APKBUILD b/main/efi-mkuki/APKBUILD
new file mode 100644
index 00000000000..3866be10175
--- /dev/null
+++ b/main/efi-mkuki/APKBUILD
@@ -0,0 +1,28 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=efi-mkuki
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="EFI Unified Kernel Image Maker"
+url="https://github.com/jirutka/efi-mkuki"
+arch="noarch"
+license="MIT"
+depends="cmd:objcopy"
+source="https://github.com/jirutka/efi-mkuki/archive/v$pkgver/efi-mkuki-$pkgver.tar.gz"
+options="!check"  # no tests provided
+
+case "$CARCH" in
+	# Gummiboot is currently not available for other architectures.
+	# The user has to obtain EFI stubs themselves.
+	x86*)	depends="$depends efistub"
+		makedepends="gummiboot-efistub"
+		;;
+esac
+
+package() {
+	make install DESTDIR="$pkgdir" prefix=/usr
+}
+
+sha512sums="
+a6745832bb0b8e1af18c70431f26d778ebd097aab14a17e87ccef4fc95170229238fed308bdc4bea4bf3589bebd8e5d21933912704c33afa9fdaf03c13a84bd3  efi-mkuki-0.1.0.tar.gz
+"
diff --git a/main/efibootmgr/APKBUILD b/main/efibootmgr/APKBUILD
new file mode 100644
index 00000000000..b4899b1aecb
--- /dev/null
+++ b/main/efibootmgr/APKBUILD
@@ -0,0 +1,31 @@
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Lucas Ramage <ramage.lucas@protonmail.com>
+pkgname=efibootmgr
+pkgver=18
+pkgrel=2
+pkgdesc="Linux user-space application to modify the Intel Extensible Firmware Interface"
+url="https://github.com/rhboot/efibootmgr"
+arch="x86 x86_64 armhf armv7 aarch64 riscv64"
+license="GPL-2.0-or-later"
+makedepends="efivar-dev linux-headers popt-dev gettext-dev"
+subpackages="$pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/rhboot/efibootmgr/archive/$pkgver.tar.gz
+	musl-gettext.patch"
+
+build() {
+	PCDIR=/usr/lib/pkgconfig EFIDIR="/boot/efi" make
+}
+
+package() {
+	EFIDIR="/boot/efi" make DESTDIR="$pkgdir" install
+}
+
+check() {
+	"$builddir"/src/efibootdump --help > /dev/null
+	"$builddir"/src/efibootmgr --help > /dev/null
+}
+
+sha512sums="
+04e40a705cb82440fd823043b598ef9fd1acc2ceda3e8d043a93e49d43ea9481b7386cad0f46de9862beff19b8a5480d79e7d6522ae584aff6655472f967764d  efibootmgr-18.tar.gz
+3ed49c6d267e6f14bf43207fecb55ebc984f6fbd15d77cd1b8f466c8d0a4c3ab9bb276e8ed183b5ab0129fde5c06ffcd0450ffb7dad0edfa18b4c472e481373b  musl-gettext.patch
+"
diff --git a/main/efibootmgr/musl-gettext.patch b/main/efibootmgr/musl-gettext.patch
new file mode 100644
index 00000000000..c14db8278f5
--- /dev/null
+++ b/main/efibootmgr/musl-gettext.patch
@@ -0,0 +1,11 @@
+--- ./Make.defaults.orig
++++ ./Make.defaults
+@@ -49,7 +49,7 @@
+ 	$(call pkg-config-ccldflags)
+ CPPFLAGS?=
+ SOFLAGS=-shared
+-LDLIBS=$(foreach lib,$(LIBS),-l$(lib)) $(call pkg-config-ldlibs)
++LDLIBS=$(foreach lib,$(LIBS),-l$(lib)) $(call pkg-config-ldlibs) -lintl
+ 
+ .PHONY: check_efidir_error
+ check_efidir_error : ; $(EFIDIR_ERROR) $(info Building with EFIDIR as $(EFIDIR))
diff --git a/main/efitools/005-riscv64.patch b/main/efitools/005-riscv64.patch
new file mode 100644
index 00000000000..b98c138c10d
--- /dev/null
+++ b/main/efitools/005-riscv64.patch
@@ -0,0 +1,45 @@
+We can use just the same flags as for aarch64.
+
+Signed-off-by: Heinrich Schuchardt <xypron.glpk@xxxxxx>
+---
+RISC-V patches for gnu-efi are not yet accepted in upstream. Cf.
+
+[Gnu-efi-discuss] [PATCH 1/1] Initial support for RISCV64
+https://sourceforge.net/p/gnu-efi/mailman/gnu-efi-discuss/thread/20210401153553.103286-1-xypron.glpk%40gmx.de/#msg37253360
+[Gnu-efi-discuss] [PATCH 1/1] Undefined Status in LibGetVariableAndSize()
+https://sourceforge.net/p/gnu-efi/mailman/gnu-efi-discuss/thread/20210319162557.334645-1-xypron.glpk%40gmx.de/#msg37243995
+
+You can use
+https://github.com/xypron/gnu-efi/releases/tag/riscv64-2021-04-01 for
+building sbsigntools and efitools.
+---
+ Make.rules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/Make.rules b/Make.rules
+index 903a5a4..69bd3bd 100644
+--- a/Make.rules
++++ b/Make.rules
+@@ -10,6 +10,8 @@ else ifeq ($(ARCH),aarch64)
+ ARCH3264 =
+ else ifeq ($(ARCH),arm)
+ ARCH3264 =
++else ifeq ($(ARCH),riscv64)
++ARCH3264 =
+ else
+ $(error unknown architecture $(ARCH))
+ endif
+@@ -56,6 +58,11 @@ ifeq ($(ARCH),aarch64)
+   FORMAT = -O binary
+ endif
+
++ifeq ($(ARCH),riscv64)
++  LDFLAGS += --defsym=EFI_SUBSYSTEM=0x0a
++  FORMAT = -O binary
++endif
++
+ %.efi: %.so
+ 	$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym \
+ 		   -j .rel -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \
+--
+2.30.2
diff --git a/main/efitools/APKBUILD b/main/efitools/APKBUILD
index aa3fa70d604..bcff10e04e1 100644
--- a/main/efitools/APKBUILD
+++ b/main/efitools/APKBUILD
@@ -3,23 +3,29 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=efitools
 pkgver=1.9.2
-pkgrel=1
+pkgrel=9
 pkgdesc="EFI tools"
 url="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"
-arch="x86_64"
-license="GPL-2.0-only and LGPL-2.1-or-later"
-makedepends="gnu-efi-dev openssl-dev perl-file-slurp help2man sbsigntool"
+# riscv64: fails to build
+# others: limited by sbsigntool
+arch="all !armhf !s390x !ppc64le !mips !mips64 !riscv64"
+license="(GPL-2.0-only AND LGPL-2.1-or-later) WITH OpenSSL-Exception"
+options="!check" # no testsuite
+# efi-readvar requires mount(8) with -l option
+depends="mount"
+makedepends="gnu-efi-dev<3.0.17 gnu-efi<3.0.17 openssl-dev>3 perl-file-slurp help2man sbsigntool"
 subpackages="$pkgname-doc"
 source="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/efitools-$pkgver.tar.gz
 	001-datatypes.patch
 	002-fix-parallel-make.patch
 	003-fix-wchar_t.patch
 	004-typo.patch
+	005-riscv64.patch
 	"
 
 prepare() {
 	default_prepare
-	sed -i "s/-O2/${CFLAGS} -Wno-pointer-sign -O2/" Make.rules
+	sed -i "s/-O2/$CFLAGS -Wno-pointer-sign -O2/" Make.rules
 }
 
 build() {
@@ -31,8 +37,11 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="77e0ad7e865814ed388ff6daabe0f4b49ba51672bf2cbb98b7905e209cbd28f9ede2f73213ce45af8a978c1e67dba24ec88a1188661317cc22317b47e575cde8  efitools-1.9.2.tar.gz
+sha512sums="
+77e0ad7e865814ed388ff6daabe0f4b49ba51672bf2cbb98b7905e209cbd28f9ede2f73213ce45af8a978c1e67dba24ec88a1188661317cc22317b47e575cde8  efitools-1.9.2.tar.gz
 cd72161a99b26472909a8da834c08a1f88b54d35291a6646562b03a6616fa5fb61e49d4fb3c780861689d23823c101709890dd245dd8aa9f51dca40ac1b2d369  001-datatypes.patch
 7afe87e9b44ed3e10200770d3079e4e14b6d39c54c05538031e93d021631427fed47781b016b46f58b8fe6d21f1f3c78667b2b502aa20b99516aa980303aa2ad  002-fix-parallel-make.patch
 bd31e51c6d80ab3fdfe0e7abea1cd6f982d63a96a345c0e75f438f6a219bf64b1510f0dabdcc49d24cc788c06ff4ccfbccde0c1aead9c00b65eaf2977e87e742  003-fix-wchar_t.patch
-e34d4d8f420a29cfc50a9f98dcbb048016f2fc535ddb3e39482e58f44b37db672410ffab24392751818d72b1e914d77644cae8f7a92bb9af7fe2a9f726a230e9  004-typo.patch"
+e34d4d8f420a29cfc50a9f98dcbb048016f2fc535ddb3e39482e58f44b37db672410ffab24392751818d72b1e914d77644cae8f7a92bb9af7fe2a9f726a230e9  004-typo.patch
+630587b00bee4e65e9258f56d0e66677e36063c83659f394c5fcb766683d704f63e8e2acf72f69f6bfef77dd84471c28ab21ef15f10389d8c2151fa2e46229c4  005-riscv64.patch
+"
diff --git a/main/efivar/APKBUILD b/main/efivar/APKBUILD
new file mode 100644
index 00000000000..c2a422500eb
--- /dev/null
+++ b/main/efivar/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Lucas Ramage <ramage.lucas@protonmail.com>
+pkgname=efivar
+pkgver=39
+pkgrel=0
+pkgdesc="Tools and library to manipulate EFI variables"
+url="https://github.com/rhboot/efivar"
+arch="all !s390x"
+license="LGPL-2.1-only"
+makedepends="popt-dev linux-headers mandoc"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
+source="$pkgname-$pkgver.tar.gz::https://github.com/rhboot/efivar/archive/refs/tags/$pkgver.tar.gz
+	ppc64le-compat.patch
+	"
+
+prepare() {
+	default_prepare
+	sed -i 's/#include <sys\/cdefs.h>//g' "$builddir/src/compiler.h"
+}
+
+build() {
+	libdir="/usr/lib" make
+}
+
+package() {
+	libdir="/usr/lib" make DESTDIR="$pkgdir" install
+}
+
+check() {
+	LD_LIBRARY_PATH="$builddir"/src \
+		"$builddir"/src/efivar --help > /dev/null
+}
+
+sha512sums="
+04493c30efbfc2773abac9a3dd93aa13403c05e29e3bfc72877d2054930811fae99119aadcb1729b6ca85abf5a24db786ea0c27c16d5458ef1b19e74696f5ff7  efivar-39.tar.gz
+6a1210b51c647fe6b24d05e1e39518531c3ec2cdd781f0627ec878ec11515949c38021c27e8f8b0138e53e9aafb5a4b266b7b8588d5bcdfd57f45d6316d4ccb0  ppc64le-compat.patch
+"
diff --git a/main/efivar/ppc64le-compat.patch b/main/efivar/ppc64le-compat.patch
new file mode 100644
index 00000000000..85660a4d01d
--- /dev/null
+++ b/main/efivar/ppc64le-compat.patch
@@ -0,0 +1,22 @@
+diff --git a/src/include/defaults.mk b/src/include/defaults.mk
+index 4da0cde..ccfadf2 100644
+--- a/src/include/defaults.mk
++++ b/src/include/defaults.mk
+@@ -73,6 +73,7 @@ override SOFLAGS = $(_SOFLAGS) \
+ 
+ HOST_ARCH=$(shell uname -m)
+ ifneq ($(HOST_ARCH),ia64)
++ifneq ($(HOST_ARCH),ppc64le)
+ ifneq ($(HOST_ARCH),riscv64)
+ 	HOST_MARCH=-march=native
+ else
+@@ -81,6 +82,9 @@ endif
+ else
+ 	HOST_MARCH=
+ endif
++else
++	HOST_MARCH=
++endif
+ HOST_CPPFLAGS ?= $(CPPFLAGS)
+ override _HOST_CPPFLAGS := $(HOST_CPPFLAGS)
+ override HOST_CPPFLAGS = $(_HOST_CPPFLAGS) \
diff --git a/main/eggdrop/APKBUILD b/main/eggdrop/APKBUILD
index f342c824287..6608ef4473f 100644
--- a/main/eggdrop/APKBUILD
+++ b/main/eggdrop/APKBUILD
@@ -1,21 +1,22 @@
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=eggdrop
-pkgver=1.8.4
-pkgrel=0
+pkgver=1.9.5
+pkgrel=1
 pkgdesc="World's most popular Open Source IRC bot"
 url="https://eggheads.org/"
 arch="all"
 license='GPL-2.0-or-later'
 options="!check" # No test suite
-depends="tcl"
-makedepends="openssl-dev tcl-dev !bind-libs"
-subpackages="$pkgname-doc $pkgname-logs2html $pkgname-gseen"
-source="$pkgname-$pkgver.tar.gz::https://github.com/eggheads/eggdrop/archive/v$pkgver.tar.gz
+makedepends="openssl-dev>3 tcl-dev"
+subpackages="$pkgname-doc"
+source="https://github.com/eggheads/eggdrop/releases/download/v$pkgver/eggdrop-$pkgver.tar.gz
 	eggdrop-langdir.patch
-	logs2html.mod.patch
-	gseen.mod.patch
 	utf8.patch
 	"
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
 	./configure \
@@ -31,7 +32,6 @@ build() {
 package() {
 	# workaround for borked Makefile
 	mkdir -p "$pkgdir"/usr/share/eggdrop/doc \
-		"$pkgdir"/usr/share/eggdrop/scripts \
 		"$pkgdir"/usr/share/eggdrop/help/set/
 
 	make DEST="$pkgdir"/usr/share/eggdrop install
@@ -52,7 +52,6 @@ package() {
 	mv "$pkgdir"/usr/share/eggdrop/modules-* \
 		"$pkgdir"/usr/lib/eggdrop
 
-
 	# Fix paths of example eggdrop.conf
 	sed -i -e '2d' -e '1s@^.*@#!/usr/bin/eggdrop@' \
 		-e 's@scripts/@/usr/share/eggdrop/scripts/@g' \
@@ -62,52 +61,16 @@ package() {
 
 	mkdir -p "$pkgdir"/usr/share/doc/eggdrop
 	cp -a \
-		COPYING FEATURES NEWS README doc/Changes1.8 eggdrop.conf \
+		COPYING FEATURES NEWS README doc/Changes1.9 eggdrop.conf \
 		doc/ABOUT doc/BANS doc/BOTNET doc/BUG-REPORT doc/FIRST-SCRIPT \
-		doc/MODULES doc/PARTYLINE doc/TEXT-SUBSTITUTIONS doc/TRICKS \
-		doc/USERS doc/WEIRD-MESSAGES doc/tcl-commands.doc doc/settings \
+		doc/MODULES doc/PARTYLINE doc/TRICKS \
+		doc/USERS doc/tcl-commands.doc doc/settings \
 		doc/html \
 		"$pkgdir"/usr/share/doc/eggdrop
 }
 
-logs2html() {
-	pkgdesc="logs2html module for eggdrop"
-	install=""
-	cd "$builddir"
-
-	for dir in language help; do
-		mkdir -p "$subpkgdir"/usr/share/eggdrop/$dir
-		mv "$pkgdir"/usr/share/eggdrop/$dir/logs2html.* "$subpkgdir"/usr/share/eggdrop/$dir/
-	done
-
-	mkdir -p "$subpkgdir"/usr/lib/eggdrop
-	mv "$pkgdir"/usr/lib/eggdrop/logs2html.so \
-		"$subpkgdir"/usr/lib/eggdrop/
-
-	mkdir -p "$subpkgdir"/usr/share/eggdrop/log2html
-
-	for files in logs2html.conf user.css readme.txt; do
-		cp src/mod/logs2html.mod/$files "$subpkgdir"/usr/share/eggdrop/log2html/
-	done
-}
-
-gseen() {
-	pkgdesc="gseen module for eggdrop"
-	install=""
-	cd "$builddir"
-	mkdir -p "$subpkgdir"/usr/share/eggdrop/language
-	mv "$pkgdir"/usr/share/eggdrop/language/gseen.* \
-		"$subpkgdir"/usr/share/eggdrop/language/
-	mkdir -p "$subpkgdir"/usr/lib/eggdrop
-	mv "$pkgdir"/usr/lib/eggdrop/gseen.so \
-		"$subpkgdir"/usr/lib/eggdrop/
-	mkdir -p "$subpkgdir"/usr/share/eggdrop/gseen
-	cp src/mod/gseen.mod/gseen.conf "$subpkgdir"/usr/share/eggdrop/gseen/
-	cp src/mod/gseen.mod/README "$subpkgdir"/usr/share/eggdrop/gseen/
-}
-
-sha512sums="80239a015f518cadc251bfc5edcf08715b9200a70eb0df7edf0efc113f320a7e407ab1fee96322fc6ec923781aa94f5a947c458e935e8a3714fb86cbcc02cb04  eggdrop-1.8.4.tar.gz
+sha512sums="
+863e6f94a92ac02e135c306000379ce516d9c9381eb5ca249e7656f4f0f504a159ddf1f658016d05e422d8036e808664101ab4f8944a42438c273f71b676189b  eggdrop-1.9.5.tar.gz
 d8e8655fed028030bc3cfe28207a289d0efbc412c7e01170a4d0bb31200f7ea93df310f19e83b485013ca5d4264694b4956252663cb3a63c3d5e4cc31346e0fe  eggdrop-langdir.patch
-be173d94a953c4dc5b178950d06ce894deda60c3ddb8195c836797d45fbbcc9fba3bc3d3f34c96226464fdd327093a5d15bbc2b7924d18f845738c1a4dd64a3b  logs2html.mod.patch
-7879b998880deb1943c41569e243f9f1a50df23982d82d942af6c111e7fac0fb8a8444c84980645ba15b71dd69c8db2dab6f90bcb7a4292306011c7bcfc03d0d  gseen.mod.patch
-7966d4d42994e44a0e571b89f1c66cb41f672d75e6ced7051d1ece23d8c209059c3565b41de950bf9c907701ce7a5e33a215b637587075ed300a002a58eda503  utf8.patch"
+7966d4d42994e44a0e571b89f1c66cb41f672d75e6ced7051d1ece23d8c209059c3565b41de950bf9c907701ce7a5e33a215b637587075ed300a002a58eda503  utf8.patch
+"
diff --git a/main/eggdrop/eggdrop.post-install b/main/eggdrop/eggdrop.post-install
deleted file mode 100644
index 44b43cf34ef..00000000000
--- a/main/eggdrop/eggdrop.post-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-echo "*"
-echo "* Please run /usr/bin/eggdrop-installer to install your eggdrop bot."
-echo "*"
-exit 0
-
diff --git a/main/eggdrop/gseen.mod.patch b/main/eggdrop/gseen.mod.patch
deleted file mode 100644
index dd49248c650..00000000000
--- a/main/eggdrop/gseen.mod.patch
+++ /dev/null
@@ -1,5133 +0,0 @@
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/addons/gseen.selectlang.1.0.0.tcl src/eggdrop-1.8.4/src/mod/gseen.mod/addons/gseen.selectlang.1.0.0.tcl
---- ./src/mod/gseen.mod/addons/gseen.selectlang.1.0.0.tcl	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/addons/gseen.selectlang.1.0.0.tcl	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,80 @@
-+#####################################################################
-+#
-+# gseen.selectlang v1.0.0
-+#
-+# This is a simple script which selects a language based on the 
-+# user's host.
-+#
-+# It only works for /msg commands.
-+#
-+# If the user is in a channel which has a language defined, gseen's
-+# internal functions will override this selection and use the language
-+# of the channel instead.
-+#
-+#####################################################################
-+
-+
-+# Here you can define which language to use for which host.
-+# The first part is the mask for the host, and the second part
-+# is the language which should be used for this host.
-+
-+set tld-langs {
-+  {"*.de"		"de"}
-+  {"*.at"		"de"}
-+  {"*.ch"		"de"}
-+  {"*.t-dialin.net"	"de"}
-+  {"*.t-ipconnect.net"	"de"}
-+  {"*.pl"		"pl"}
-+  {"*.jp"		"ja"}
-+}
-+
-+#################################################
-+
-+
-+proc selectlang:getlang {uhost} {
-+  global tld-langs
-+  
-+  foreach tld ${tld-langs} {
-+    if {[string match [lindex $tld 0] $uhost]} {
-+      return [lindex $tld 1]
-+    }
-+  }
-+  return ""
-+}
-+
-+proc sl:rebind {oldtarget newtarget} {
-+  foreach binding [binds msg] {
-+    if {[lindex $binding 4] == $oldtarget} {
-+      unbind [lindex $binding 0] [lindex $binding 1] [lindex $binding 2] [lindex $binding 4]
-+      bind [lindex $binding 0] [lindex $binding 1] [lindex $binding 2] $newtarget
-+    }
-+  }
-+}
-+
-+proc sl:msg:trigger {nick uhost hand rest target} {
-+  global default-slang
-+  
-+  set lang [selectlang:getlang $uhost]
-+  set old-slang ${default-slang}
-+  if {$lang != ""} {
-+    set default-slang $lang
-+    putlog "using '$lang'..."
-+  }
-+  $target $nick $uhost $hand $rest
-+  set default-slang ${old-slang}
-+}
-+
-+sl:rebind *msg:seen sl:msg:seen
-+proc sl:msg:seen {nick uhost hand rest} {
-+  sl:msg:trigger $nick $uhost $hand $rest *msg:seen
-+}
-+
-+sl:rebind *msg:seenstats sl:msg:seenstats
-+proc sl:msg:seenstats {nick uhost hand rest} {
-+  sl:msg:trigger $nick $uhost $hand $rest *msg:seenstats
-+}
-+
-+sl:rebind *msg:seennick sl:msg:seennick
-+proc sl:msg:seennick {nick uhost hand rest} {
-+  sl:msg:trigger $nick $uhost $hand $rest *msg:seennick
-+}
-\ No newline at end of file
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/ai.c src/eggdrop-1.8.4/src/mod/gseen.mod/ai.c
---- ./src/mod/gseen.mod/ai.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/ai.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,151 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+static int quietaiseens(char *chan)
-+{
-+  char buf[121], *b;
-+
-+  Context;
-+  strncpy(buf, quiet_ai_seen, 120);
-+  buf[120] = 0;
-+  b = buf;
-+  while (b[0])
-+    if (!strcasecmp(chan, newsplit(&b)))
-+      return 1;
-+#if EGG_IS_MIN_VER(10503)
-+  if (ngetudef("quietaiseens", chan))
-+    return 1;
-+#endif
-+  return 0;
-+}
-+
-+static int tcl_pubmseen STDVAR
-+{
-+  char *nick, *uhost, *hand, *chan, *text;
-+  char buf[1024];
-+  char *words, *word;
-+  seendat *l;
-+  int i;
-+
-+  Context;
-+  BADARGS(6, 6, " nick uhost hand chan text");
-+  nick = argv[1];
-+  uhost = argv[2];
-+  hand = argv[3];
-+  chan = argv[4];
-+  text = argv[5];
-+  reset_global_vars();
-+  glob_slang = slang_find(coreslangs, slang_chanlang_get(chanlangs, chan));
-+  glob_nick = nick;
-+  for (i = 0; i < strlen(text); i++)
-+    if (strchr("!?.,\"", text[i]))
-+      text[i] = ' ';
-+  strncpy(buf, ignore_words, 1023);
-+  buf[1023] = 0;
-+  words = buf;
-+  while (words[0])
-+    add_ignoredword(newsplit(&words));
-+  strncpy(buf, text, 1023);
-+  buf[1023] = 0;
-+  words = buf;
-+  while (words[0]) {
-+    word = newsplit(&words);
-+    if (word_is_ignored(word))
-+      continue;
-+    l = findseen(word);
-+    if (l) {
-+      if (quietaiseens(chan)) {
-+	set_prefix(SLNOTPREFIX);
-+        dprintf(DP_HELP, "NOTICE %s :%s%s\n", nick, reply_prefix,
-+        	do_seen(word, nick, uhost, chan, 0));
-+      } else {
-+	set_prefix(SLPUBPREFIX);
-+        dprintf(DP_HELP, "PRIVMSG %s :%s%s\n", chan, reply_prefix,
-+        	do_seen(word, nick, uhost, chan, 0));
-+      }
-+      add_seenreq(word, nick, uhost, chan, now);
-+      free_ignoredwords();
-+      Tcl_AppendResult(irp, "1", NULL);
-+      return TCL_OK;
-+    }
-+  }
-+  free_ignoredwords();
-+  Tcl_AppendResult(irp, "0", NULL);
-+  return TCL_OK;
-+}
-+
-+static tcl_cmds mytcls[] =
-+{
-+  {"*pubm:seen", tcl_pubmseen},
-+  {"*chjn:gseen", gseen_chjn},
-+  {"*chpt:gseen", gseen_chpt},
-+  {0, 0}
-+};
-+
-+static void add_ignoredword(char *word)
-+{
-+  ignoredword *l, *nl;
-+
-+  l = ignoredwords;
-+  while (l && l->next)
-+    l = l->next;
-+  nl = nmalloc(sizeof(ignoredword));
-+  nl->word = nmalloc(strlen(word) + 1);
-+  strcpy(nl->word, word);
-+  nl->next = NULL;
-+  if (ignoredwords)
-+    l->next = nl;
-+  else
-+    ignoredwords = nl;
-+}
-+
-+static void free_ignoredwords()
-+{
-+  ignoredword *l, *ll;
-+
-+  l = ignoredwords;
-+  while (l) {
-+    ll = l->next;
-+    nfree(l->word);
-+    nfree(l);
-+    l = ll;
-+  }
-+  ignoredwords = NULL;
-+}
-+
-+static int expmem_ignoredwords()
-+{
-+  ignoredword *l;
-+  int size = 0;
-+
-+  for (l = ignoredwords; l; l = l->next) {
-+    size += sizeof(ignoredword);
-+    size += strlen(l->word) + 1;
-+  }
-+  return size;
-+}
-+
-+static int word_is_ignored(char *word)
-+{
-+  ignoredword *l;
-+
-+  for (l = ignoredwords; l; l = l->next)
-+    if (!strcasecmp(l->word, word))
-+      return 1;
-+  return 0;
-+}
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/datahandling.c src/eggdrop-1.8.4/src/mod/gseen.mod/datahandling.c
---- ./src/mod/gseen.mod/datahandling.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/datahandling.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,151 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+
-+static void write_seens()
-+{
-+  seenreq *r;
-+  seenreq_by *b;
-+  FILE *f;
-+  char s[125];
-+
-+  Context;
-+  /* putlog(LOG_MISC, "*", "Saving seen data..."); */
-+  if (!gseenfile[0])
-+    return;
-+  sprintf(s, "%s~new", gseenfile);
-+  f = fopen(s, "w");
-+  chmod(s, 0600);
-+  if (f == NULL) {
-+    putlog(LOG_MISC, "*", "ERROR writing gseen file.");
-+    return;
-+  }
-+  fprintf(f, "# gseen data file v1.\n");
-+  write_seen_tree_target = f;
-+  btree_getall(&seentree, write_seen_tree);
-+  for (r = requests; r; r = r->next)
-+    for (b = r->by; b; b = b->next)
-+      /* @ nick by host chan when */
-+      fprintf(f, "@ %s %s %s %s %lu\n", r->nick, b->who, b->host, b->chan,
-+              b->when);
-+  fclose(f);
-+  unlink(gseenfile);
-+  movefile(s, gseenfile);
-+  /* putlog(LOG_MISC, "*", "Done."); */
-+  return;
-+}
-+
-+static void read_seens()
-+{
-+  FILE *f;
-+  char buf[512], *s, *type, *nick, *host, *chan, *msg, *by;
-+  time_t when;
-+  int spent, iType, i;
-+
-+  Context;
-+  f = fopen(gseenfile, "r");
-+  if (f == NULL) {
-+    putlog(LOG_MISC, "*", "Can't open gseen file, creating new database...");
-+    return;
-+  }
-+  while (!feof(f)) {
-+    buf[0] = 0;
-+    s = buf;
-+    fgets(s, 511, f);
-+    i = strlen(buf);
-+    if (buf[i - 1] == '\n')
-+      buf[i - 1] = 0;
-+    if ((buf[0] == 0) || (buf[0] == '#'))
-+      continue;
-+    type = newsplit(&s);
-+    if (!strcmp(type, "!")) {
-+      nick = newsplit(&s);
-+      host = newsplit(&s);
-+      chan = newsplit(&s);
-+      iType = atoi(newsplit(&s));
-+      when = (time_t) atoi(newsplit(&s));
-+      spent = atoi(newsplit(&s));
-+      msg = s;
-+      add_seen(iType, nick, host, chan, msg, when, spent);
-+    } else if (!strcmp(type, "@")) {
-+      nick = newsplit(&s);
-+      by = newsplit(&s);
-+      host = newsplit(&s);
-+      chan = newsplit(&s);
-+      when = (time_t) atoi(newsplit(&s));
-+      add_seenreq(nick, by, host, chan, when);
-+    }
-+  }
-+  fclose(f);
-+  Context;
-+  return;
-+}
-+
-+static void purge_seens()
-+{
-+  seenreq *r, *rr;
-+  seenreq_by *b, *bb;
-+
-+  Context;
-+  if (!expire_seens)
-+    return;
-+  btree_getall_expanded(&seentree, purge_seen_tree);
-+  debug0("purge done");
-+  r = requests;
-+  rr = NULL;
-+  while (r) {
-+    b = r->by;
-+    bb = NULL;
-+    while (b) {
-+      if ((now - b->when) > (expire_seens * 86400)) {
-+        debug2("request for %s from %s has expired.", r->nick, b->who);
-+        nfree(b->who);
-+        nfree(b->host);
-+        nfree(b->chan);
-+        if (bb) {
-+          bb->next = b->next;
-+          nfree(b);
-+          b = bb->next;
-+        } else {
-+          r->by = b->next;
-+          nfree(b);
-+          b = r->by;
-+        }
-+      } else {
-+        bb = b;
-+        b = b->next;
-+      }
-+    }
-+    if (!r->by) {
-+      debug1("no further seen requests for %s, deleting", r->nick);
-+      nfree(r->nick);
-+      if (rr) {
-+        rr->next = r->next;
-+        nfree(r);
-+        r = rr->next;
-+      } else {
-+        requests = r->next;
-+        nfree(r);
-+        r = requests;
-+      }
-+    } else {
-+      rr = r;
-+      r = r->next;
-+    }
-+  }
-+}
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/do_seen.c src/eggdrop-1.8.4/src/mod/gseen.mod/do_seen.c
---- ./src/mod/gseen.mod/do_seen.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/do_seen.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,840 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+/* do_seen(): Checks if someone matches the mask, and returns the reply
-+ * mask : first paramater (e.g. "G`Quann", "G`Quann", "*!*@*.isp.de", ...)
-+ * nick : nick of the one, who triggered the command
-+ * uhost: user@host of nick
-+ * chan : chan, where the command was triggered
-+ * bns  :
-+ *        1 : do a botnet-seen if no matches are found
-+ *        0 : don't do a botnet-seen
-+ *       -1 : return NULL instead of text, if no matches were found
-+ *            (necessary for botnet seen)
-+ */
-+static char *do_seen(char *mask, char *nick, char *uhost, char *chan, int bns)
-+{
-+  char hostbuf[UHOSTLEN + 1], *host, *newhost, *tmp, *dur;
-+  seendat *l;
-+  gseenres *r;
-+  int wild, nr;
-+  char bnquery[256];
-+  struct userrec *u;
-+  struct laston_info *li;
-+  struct chanset_t *ch;
-+
-+  Context;
-+  start_seentime_calc();
-+  if (seen_reply) {
-+    nfree(seen_reply);
-+    seen_reply = NULL;
-+  }
-+  l = NULL;
-+  li = NULL;
-+  host = hostbuf;
-+  newhost = NULL;
-+  mask = newsplit(&mask);
-+  glob_query = mask;
-+  while (mask[0] == ' ')
-+    mask++;
-+  if (!mask[0]) {
-+    return SLNOPARAM;
-+  }
-+  if (strchr(mask, '?') || strchr(mask, '*')) {
-+    // if wildcard-searches ares not allowed, then either return
-+    // NULL (for botnet-seen), or a appropriate warning
-+    if (!wildcard_search) {
-+      if (bns == -1)
-+        return NULL;
-+      else
-+        return SLNOWILDCARDS;
-+    } else
-+      wild = 1;
-+  } else {
-+    if (strlen(mask) > seen_nick_len) // don't process if requested nick is too long
-+      return SLTOOLONGNICK;      // (e.g. stop stupid jokes)
-+    if (!strcasecmp(mask, nick)) {
-+      return SLMIRROR;
-+    }
-+    // check if the nick is on the current channel
-+    if (onchan(mask, chan))
-+      return SLONCHAN;
-+    if ((glob_othernick = handonchan(mask, chan)))
-+      return SLHANDONCHAN;
-+    // check if it is on any other channel
-+    if ((ch = onanychan(mask))) {
-+#if EGG_IS_MIN_VER(10500)
-+      if (!secretchan(ch->dname)) {
-+	glob_otherchan = ch->dname;
-+        return SLONOTHERCHAN;
-+      }
-+#else
-+      if (!secretchan(ch->name)) {
-+	glob_otherchan = ch->name;
-+        return SLONOTHERCHAN;
-+      }
-+#endif
-+    }
-+    // check if the user who uses this handle is on the channel under
-+    // a different nick
-+    if ((ch = handonanychan(mask))) {
-+#if EGG_IS_MIN_VER(10500)
-+      if (!secretchan(ch->dname)) {
-+        glob_otherchan = ch->dname;
-+        return SLONOTHERCHAN;
-+      }
-+#else
-+      if (!secretchan(ch->name)) {
-+        glob_otherchan = ch->name;
-+        return SLONOTHERCHAN;
-+      }
-+#endif
-+    }
-+    add_seenreq(mask, nick, uhost, chan, now);
-+    wild = 0;
-+    l = findseen(mask);
-+    // if there's a result, and if we don't want to search for the same user
-+    // under a different nick, just make a do_seennick on the result
-+    if (l && !fuzzy_search) {
-+      tmp = do_seennick(l);
-+      end_seentime_calc();
-+      return tmp;
-+    }
-+    if (!l) {
-+      u = get_user_by_handle(userlist, mask);
-+      if (u) {
-+        li = get_user(&USERENTRY_LASTON, u);
-+      }
-+      if (!u || !li) {
-+        if (bns == -1) {       // if bns is 0, then do_seen() was triggered by
-+          end_seentime_calc(); // a botnet seen function, which needs a clear
-+          return NULL;         // NULL to detect if there was a result or not
-+        }
-+        tmp = SLNOTSEEN;
-+        if (bns && ((strlen(mask) + strlen(nick) + strlen(uhost)
-+            + strlen(chan) + 20) < 255)) {
-+          debug0("trying botnet seen");
-+          if (bnsnick)
-+            nfree(bnsnick);
-+          if (bnschan)
-+            nfree(bnschan);
-+          bnsnick = nmalloc(strlen(nick) + 1);
-+          strcpy(bnsnick, nick);
-+          bnschan = nmalloc(strlen(chan) + 1);
-+          strcpy(bnschan, chan);
-+          sprintf(bnquery, "gseen_req %s %s %s %s", mask, nick, uhost, chan);
-+          botnet_send_zapf_broad(-1, botnetnick, NULL, bnquery);
-+        }
-+      } else {
-+        // we have a matching handle, no seen-entry, but a laston entry
-+        // in the userbase, so let's just return that one.
-+        dur = gseen_duration(now - li->laston);
-+        glob_laston = dur;
-+        tmp = SLPOORSEEN;
-+        seen_reply = nmalloc(strlen(tmp) + 1);
-+        strcpy(seen_reply, tmp);
-+        end_seentime_calc();
-+        return seen_reply;
-+      }
-+      end_seentime_calc();
-+      return tmp;
-+    }
-+    // now prepare the host for fuzzy-search
-+    if (strlen(l->host) < UHOSTLEN) {
-+      maskstricthost(l->host, host);
-+      host = strchr(host, '!') + 1; // strip nick from host for faster search
-+    } else {
-+      end_seentime_calc();
-+      return "error, too long host";
-+    }
-+  }
-+  if (l && (l->type == SEEN_CHPT)) {
-+    tmp = do_seennick(l);
-+    end_seentime_calc();
-+    return tmp;
-+  }
-+  numresults = 0;
-+  // wildmatch_seens uses a global var to store hosts in it
-+  // (to prevent massive nmalloc/nfree-usage), so don't forget
-+  // to initialize and free it
-+  temp_wildmatch_host = my_malloc(1);
-+  wildmatch_seens(host, mask, wild);
-+  my_free(temp_wildmatch_host);
-+  temp_wildmatch_host = NULL;
-+  if (!results) {
-+    end_seentime_calc();
-+    if (bns == -1)
-+      return NULL; // let the botnet seen function know, that seen failed
-+    return SLNOMATCH;
-+  }
-+  if (numresults >= max_matches) {
-+    end_seentime_calc();
-+    free_seenresults();
-+    return SLTOOMANYMATCHES;
-+  }
-+  sortresults();
-+  if (strcasecmp(results->seen->nick, mask)) {
-+    // if the user's latest nick is not the nick for which we were searching,
-+    // say that there were multiple matches and display the latest one
-+    if (numresults == 1)
-+      tmp = SLONEMATCH;
-+    else if (numresults <= 5)
-+      tmp = SLLITTLEMATCHES;
-+    else
-+      tmp = SLMANYMATCHES;
-+    seen_reply = nmalloc(strlen(tmp) + 1);
-+    strcpy(seen_reply, tmp);
-+    nr = 0;
-+    for (r = results; (r && (nr < 5)); r = r->next) {
-+      nr++;
-+      if (nr > 1) {
-+        seen_reply = nrealloc(seen_reply, 1 + strlen(seen_reply) + 1 + strlen(r->seen->nick) + 1);
-+        strcat(seen_reply, ", ");
-+      } else {
-+	seen_reply = nrealloc(seen_reply, 1 + strlen(seen_reply) + strlen(r->seen->nick) + 1);
-+        strcat(seen_reply, " ");
-+      }
-+      strcat(seen_reply, r->seen->nick);
-+    }
-+    tmp = do_seennick(results->seen);
-+    seen_reply = nrealloc(seen_reply, 2 + strlen(seen_reply) + strlen(tmp) + 1);
-+    sprintf(seen_reply, "%s. %s", seen_reply, tmp);
-+  } else { // first result is the nick which we were searching for
-+    // just return the info for this nick and don't care about other results
-+    tmp = do_seennick(results->seen);
-+    seen_reply = nmalloc(strlen(tmp) + 1);
-+    strcpy(seen_reply, tmp);
-+  }
-+  free_seenresults();
-+  end_seentime_calc();
-+  return seen_reply;
-+}
-+
-+/* do_seennick():
-+ * takes a seen-dataset and produces the corresponding reply basically
-+ * by referencing to the lang entry with the same number as the seen-type.
-+ */
-+static char *do_seennick(seendat *l)
-+{
-+//  char buf[256], *msg;
-+  int stype;
-+
-+  Context;
-+  if (!l) {
-+    debug0("ERROR! Tryed to do a seennick on a NULL pointer!");
-+    return "ERROR! seendat == NULL!!!";
-+  }
-+  glob_seendat = l;
-+  // l->type is the basic language-entry-number
-+  stype = l->type + 100;
-+  // in some cases, we might need a special reply, so modify the
-+  // number if neccessary
-+  switch (l->type) {
-+    case SEEN_JOIN:
-+      if (!onchan(l->nick, l->chan))
-+        stype += 20;
-+      break;
-+    case SEEN_PART:
-+      /* nothing to do here */
-+      break;
-+    case SEEN_SIGN:
-+      /* nothing again */
-+      break;
-+    case SEEN_NICK:
-+      if (!onchan(l->msg, l->chan))
-+        stype += 20;
-+      break;
-+    case SEEN_NCKF:
-+      if (!onchan(l->nick, l->chan))
-+        stype += 20;
-+      break;
-+    case SEEN_KICK:
-+/*      msg = buf;
-+      strncpy(buf, l->msg, 255);
-+      msg[255] = 0;
-+      sglobpunisher = newsplit(&msg);
-+      sglobreason = msg; */
-+      break;
-+    case SEEN_SPLT:
-+      /* nothing to do here */
-+      break;
-+    case SEEN_REJN:
-+      if (!onchan(l->nick, l->chan))
-+        stype += 20;
-+      break;
-+    case SEEN_CHJN:
-+    case SEEN_CHPT:
-+      if (!strcmp(l->chan, "0"))
-+        stype += 20;
-+      break;
-+    default:
-+      stype = 140;
-+  }
-+  return getslang(stype);
-+}
-+
-+/* findseens():
-+ * interface for webseen.mod
-+ * find all results for a query and return a pointer to this list
-+ * (basically the core of do_seen())
-+ */
-+static gseenres *findseens(char *mask, int *ret, int fuzzy)
-+{
-+  char hostbuf[UHOSTLEN + 1], *host, *newhost;
-+  seendat *l;
-+  int wild;
-+
-+  Context;
-+  start_seentime_calc();
-+  *ret = WS_OK;
-+  l = NULL;
-+  host = hostbuf;
-+  newhost = NULL;
-+  mask = newsplit(&mask);
-+  while (mask[0] == ' ')
-+    mask++;
-+  if (!mask[0]) {
-+    *ret = WS_NOPARAM;
-+    return NULL;
-+  }
-+  if (strchr(mask, '?') || strchr(mask, '*')) {
-+    // if wildcard-searches ares not allowed, then either return
-+    // NULL (for botnet-seen), or a appropriate warning
-+    if (!wildcard_search) {
-+      *ret = WS_NOWILDCARDS;
-+      return NULL;
-+    }
-+    wild = 1;
-+  } else {
-+    if (strlen(mask) > seen_nick_len) { // don't process if requested nick is too long
-+      *ret = WS_TOOLONGNICK;       // (e.g. stop stupid jokes)
-+      return NULL;
-+    }
-+    add_seenreq(mask, "www-user", "unknown_host", "webinterface", now);
-+    wild = 0;
-+    l = findseen(mask);
-+    // if there's a result, and if we don't want to search for the same user
-+    // under a different nick, just return this result
-+    if (l && (!fuzzy_search || !fuzzy)) {
-+      numresults = 1;
-+      add_seenresult(l);
-+      end_seentime_calc();
-+      return results;
-+    }
-+    if (!l) {
-+      // no matching user was found :(
-+      *ret = WS_NORESULT;
-+      end_seentime_calc();
-+      return NULL;
-+    }
-+    // now prepare the host for fuzzy-search
-+    if (strlen(l->host) < UHOSTLEN) {
-+      maskstricthost(l->host, host);
-+      host = strchr(host, '!') + 1; // strip nick from host for faster search
-+    } else {
-+      *ret = WS_TOOLONGHOST;
-+      end_seentime_calc();
-+      return NULL;
-+    }
-+  }
-+  if (l && (l->type == SEEN_CHPT)) {
-+    numresults = 1;
-+    add_seenresult(l);
-+    end_seentime_calc();
-+    return results;
-+  }
-+  numresults = 0;
-+  // wildmatch_seens uses a global var to store hosts in it
-+  // (to prevent massive nmalloc/nfree-usage), so don't forget
-+  // to initialize and free it
-+  temp_wildmatch_host = my_malloc(1);
-+  wildmatch_seens(host, mask, wild);
-+  my_free(temp_wildmatch_host);
-+  temp_wildmatch_host = NULL;
-+  if (!results) {
-+    // no match :(
-+    *ret = WS_NORESULT;
-+    end_seentime_calc();
-+    return NULL;
-+  }
-+  if (numresults >= max_matches) {
-+    free_seenresults();
-+    *ret = WS_TOOMANYMATCHES;
-+    end_seentime_calc();
-+    return NULL;
-+  }
-+  sortresults();
-+  *ret = 0;
-+  end_seentime_calc();
-+  return results;
-+}
-+
-+
-+char seenstats_reply[512];
-+static char *do_seenstats()
-+{
-+  glob_totalnicks = count_seens();
-+  glob_totalbytes = gseen_expmem();
-+  sprintf(seenstats_reply, "%s", SLSEENSTATS);
-+  return seenstats_reply;
-+}
-+
-+// add an seen result (to the top of the list)
-+static void add_seenresult(seendat *seen)
-+{
-+  gseenres *nl;
-+
-+  numresults++;
-+  if (numresults > max_matches)
-+    return;
-+  nl = nmalloc(sizeof(gseenres));
-+  nl->seen = seen;
-+  nl->next = results;
-+  results = nl;
-+}
-+
-+static int expmem_seenresults()
-+{
-+  int bytes = 0;
-+  gseenres *l;
-+
-+  for (l = results; l; l = l->next)
-+    bytes += sizeof(gseenres);
-+  return bytes;
-+}
-+
-+static void free_seenresults()
-+{
-+  gseenres *l, *ll;
-+
-+  l = results;
-+  while (l) {
-+    ll = l->next;
-+    nfree(l);
-+    l = ll;
-+  }
-+  results = NULL;
-+}
-+
-+static void sortresults()
-+{
-+  int again = 1;
-+  gseenres *last, *p, *c, *n;
-+  int a, b;
-+
-+  Context;
-+  again = 1;
-+  last = NULL;
-+  while ((results != last) && (again)) {
-+    p = NULL;
-+    c = results;
-+    n = c->next;
-+    again = 0;
-+    while (n != last) {
-+      if (!c || !n)
-+        a = b = 0;
-+      else
-+        a = c->seen->when;
-+        b = n->seen->when;
-+      if (a < b) {
-+  again = 1;
-+  c->next = n->next;
-+  n->next = c;
-+  if (p == NULL)
-+    results = n;
-+  else
-+    p->next = n;
-+      }
-+      p = c;
-+      c = n;
-+      n = n->next;
-+    }
-+    last = c;
-+  }
-+  Context;
-+  return;
-+}
-+
-+static void sortrequests(seenreq *l)
-+{
-+  int again = 1;
-+  seenreq_by *last, *p, *c, *n;
-+  int a, b;
-+
-+  Context;
-+  again = 1;
-+  last = NULL;
-+  while ((l->by != last) && (again)) {
-+    p = NULL;
-+    c = l->by;
-+    n = c->next;
-+    again = 0;
-+    while (n != last) {
-+      if (!c || !n)
-+        a = b = 0;
-+      else
-+        a = c->when;
-+        b = n->when;
-+      if (a < b) {
-+  again = 1;
-+  c->next = n->next;
-+  n->next = c;
-+  if (p == NULL)
-+    l->by = n;
-+  else
-+    p->next = n;
-+      }
-+      p = c;
-+      c = n;
-+      n = n->next;
-+    }
-+    last = c;
-+  }
-+  Context;
-+  return;
-+}
-+
-+/* stolen from tcl_duration in tclmisc.c */
-+char gs_duration_temp[256];
-+static char *gseen_duration(int seconds)
-+{
-+  char s[256];
-+  time_t sec;
-+
-+  sec = seconds;
-+  s[0] = 0;
-+  if (sec < 1) {
-+    snprintf(gs_duration_temp, sizeof(gs_duration_temp), "%s", SLSOMETIME);
-+    return gs_duration_temp;
-+  }
-+  if (sec < 60) {
-+    sprintf(gs_duration_temp, "%d %s", (int) (sec / 1),
-+            ((int) (sec / 1) > 1) ? SLSECONDS : SLSECOND);
-+    return gs_duration_temp;
-+  }
-+  if (sec >= 31536000) {
-+    sprintf(s, "%d %s ", (int) (sec / 31536000),
-+            ((int) (sec / 31536000) > 1) ? SLYEARS : SLYEAR);
-+    sec -= (((int) (sec / 31536000)) * 31536000);
-+  }
-+  if (sec >= 604800) {
-+    sprintf(&s[strlen(s)], "%d %s ", (int) (sec / 604800),
-+            ((int) (sec / 604800) > 1) ? SLWEEKS : SLWEEK);
-+    sec -= (((int) (sec / 604800)) * 604800);
-+  }
-+  if (sec >= 86400) {
-+    sprintf(&s[strlen(s)], "%d %s ", (int) (sec / 86400),
-+            ((int) (sec / 86400) > 1) ? SLDAYS : SLDAY);
-+    sec -= (((int) (sec / 86400)) * 86400);
-+  }
-+  if (sec >= 3600) {
-+    sprintf(&s[strlen(s)], "%d %s ", (int) (sec / 3600),
-+            ((int) (sec / 3600) > 1) ? SLHOURS : SLHOUR);
-+    sec -= (((int) (sec / 3600)) * 3600);
-+  }
-+  if (sec >= 60) {
-+    sprintf(&s[strlen(s)], "%d %s ", (int) (sec / 60),
-+            ((int) (sec / 60) > 1) ? SLMINUTES : SLMINUTE);
-+    sec -= (((int) (sec / 60)) * 60);
-+  }
-+  strcpy(gs_duration_temp, s);
-+  if (gs_duration_temp[strlen(gs_duration_temp) - 1] == ' ')
-+    gs_duration_temp[strlen(gs_duration_temp) - 1] = 0;
-+  return gs_duration_temp;
-+}
-+
-+static int onchan(char *nick, char *chan)
-+{
-+  struct chanset_t *ch;
-+  memberlist *m;
-+
-+  ch = findchan_by_dname(chan);
-+  if (!ch)
-+    return 0;
-+  m = ismember(ch, nick);
-+  if (!m)
-+    return 0;
-+  else if (chan_issplit(m))
-+    return 0;
-+  else
-+    return 1;
-+}
-+
-+/* handonchan():
-+ * checks if the given user is on the channel and returns its nick
-+ */
-+static char *handonchan(char *hand, char *chan)
-+{
-+  struct chanset_t *ch;
-+  memberlist *m;
-+
-+  ch = findchan_by_dname(chan);
-+  if (!ch)
-+    return 0;
-+  if (ch->channel.members > 0) {
-+    for (m = ch->channel.member; m; m = m->next) {
-+      if (m->user) {
-+        if (m->user->handle && !rfc_casecmp(m->user->handle, hand))
-+          return m->nick;
-+      }
-+    }
-+  }
-+  return NULL;
-+}
-+
-+/* onanychan():
-+ * checks if the given nickname is on any of the bot's chans.
-+ */
-+static struct chanset_t *onanychan(char *nick)
-+{
-+  struct chanset_t *ch;
-+  memberlist *m;
-+
-+  for (ch = chanset; ch; ch = ch->next) {
-+    m = ismember(ch, nick);
-+    if (m && !chan_issplit(m))
-+      return ch;
-+  }
-+  return NULL;
-+}
-+
-+/* handonanychan():
-+ * checks if the given user is on any channel (no matter under which nick)
-+ */
-+static struct chanset_t *handonanychan(char *hand)
-+{
-+  struct chanset_t *ch;
-+  memberlist *m;
-+
-+  for (ch = chanset; ch; ch = ch->next) {
-+    if (ch->channel.members > 0) {
-+      for (m = ch->channel.member; m; m = m->next) {
-+        if (m->user) {
-+          if (m->user->handle && !rfc_casecmp(m->user->handle, hand))
-+            return ch;
-+        }
-+      }
-+    }
-+  }
-+  return NULL;
-+}
-+
-+static void add_seenreq(char *nick, char *from, char *host, char *chan,
-+			time_t when)
-+{
-+  seenreq *l, *nl;
-+  seenreq_by *b, *nb;
-+  char buf[10] = "[secret]";
-+
-+  Context;
-+  if (!tell_seens)
-+    return;
-+  if (strcmp(chan, "[partyline]") && secretchan(chan))
-+    chan = buf;
-+  for (l = requests; l; l = l->next) {
-+    if (!strcasecmp(nick, l->nick)) {
-+      for (b = l->by; b; b = b->next) {
-+	if (!strcasecmp(from, b->who)) {
-+	  nfree(b->chan);
-+	  b->chan = nmalloc(strlen(chan) + 1);
-+	  strcpy(b->chan, chan);
-+	  b->when = when;
-+	  return;
-+	}
-+      }
-+      b = l->by;
-+      while (b && b->next)
-+        b = b->next;
-+      nb = nmalloc(sizeof(seenreq_by));
-+      nb->who = nmalloc(strlen(from) + 1);
-+      strcpy(nb->who, from);
-+      nb->host = nmalloc(strlen(host) + 1);
-+      strcpy(nb->host, host);
-+      nb->chan = nmalloc(strlen(chan) + 1);
-+      strcpy(nb->chan, chan);
-+      nb->when = when;
-+      nb->next = NULL;
-+      if (l->by)
-+        b->next = nb;
-+      else
-+        l->by = nb;
-+      return;
-+    }
-+  }
-+  nb = nmalloc(sizeof(seenreq_by));
-+  nb->who = nmalloc(strlen(from) + 1);
-+  strcpy(nb->who, from);
-+  nb->host = nmalloc(strlen(host) + 1);
-+  strcpy(nb->host, host);
-+  nb->chan = nmalloc(strlen(chan) + 1);
-+  strcpy(nb->chan, chan);
-+  nb->when = when;
-+  nb->next = NULL;
-+  l = requests;
-+  while (l && l->next)
-+    l = l->next;
-+  nl = nmalloc(sizeof(seenreq));
-+  nl->nick = nmalloc(strlen(nick) + 1);
-+  strcpy(nl->nick, nick);
-+  nl->by = nb;
-+  nl->next = NULL;
-+  if (requests)
-+    l->next = nl;
-+  else
-+    requests = nl;
-+}
-+
-+static int expmem_seenreq()
-+{
-+  seenreq *l;
-+  seenreq_by *b;
-+  int size;
-+
-+  size = 0;
-+  for (l = requests; l; l = l->next) {
-+    size += sizeof(seenreq);
-+    size += strlen(l->nick) + 1;
-+    for (b = l->by; b; b = b->next) {
-+      size += sizeof(seenreq_by);
-+      size += strlen(b->who) + 1;
-+      size += strlen(b->host) + 1;
-+      size += strlen(b->chan) + 1;
-+    }
-+  }
-+  return size;
-+}
-+
-+static int count_seenreq(seenreq_by *b)
-+{
-+  seenreq_by *l;
-+  int nr;
-+
-+  nr = 0;
-+  for (l = b; l; l = l->next)
-+    nr++;
-+  return nr;
-+}
-+
-+static void free_seenreq()
-+{
-+  seenreq *l, *ll;
-+  seenreq_by *b, *bb;
-+
-+  Context;
-+  l = requests;
-+  while (l) {
-+    b = l->by;
-+    while (b) {
-+      bb = b->next;
-+      nfree(b->who);
-+      nfree(b->host);
-+      nfree(b->chan);
-+      nfree(b);
-+      b = bb;
-+    }
-+    ll = l->next;
-+    nfree(l->nick);
-+    nfree(l);
-+    l = ll;
-+  }
-+  requests = NULL;
-+}
-+
-+static void report_seenreq(char *channel, char *nick)
-+{
-+  seenreq *l, *ll;
-+  seenreq_by *b, *bb;
-+  char *reply, *tmp;
-+  int nr;
-+
-+  if (!tell_seens)
-+    return;
-+  ll = NULL;
-+  l = requests;
-+  reply = NULL;
-+  while (l) {
-+    if (!strcasecmp(l->nick, nick)) {
-+      reset_global_vars();
-+      glob_slang = slang_find(coreslangs, slang_chanlang_get(chanlangs, channel));
-+      glob_nick = nick;
-+      nr = count_seenreq(l->by);
-+      if (nr == 1) {
-+        glob_seenrequest = l;
-+        dprintf(DP_HELP, "NOTICE %s :%s\n", l->nick, SLONELOOK);
-+      } else {
-+        sortrequests(l);
-+        glob_seenrequest = l;
-+        glob_seenrequests = nr;
-+        tmp = SLMORELOOKS;
-+        reply = nmalloc(strlen(tmp) + 1);
-+	    strcpy(reply, tmp);
-+	    nr = 0;
-+        for (b = l->by; b; b = b->next) {
-+          nr++;
-+          reply = nrealloc(reply, strlen(reply) + ((nr == 1) ? 1 : 2) + strlen(b->who) + 1);
-+          sprintf(reply, "%s%s%s", reply, (nr == 1) ? " " : ", ", b->who);
-+	    }
-+        tmp = SLLASTLOOK;
-+        reply = nrealloc(reply, strlen(reply) + 2 + strlen(tmp) + 1);
-+        sprintf(reply, "%s. %s", reply, tmp);
-+	    dprintf(DP_HELP, "NOTICE %s :%s\n", l->nick, reply);
-+        nfree(reply);
-+      }
-+      b = l->by;
-+      while (b) {
-+        bb = b->next;
-+        nfree(b->who);
-+        nfree(b->host);
-+        nfree(b->chan);
-+        nfree(b);
-+        b = bb;
-+      }
-+      nfree(l->nick);
-+      if (ll)
-+        ll->next = l->next;
-+      else
-+        requests = l->next;
-+      nfree(l);
-+      if (ll)
-+        l = ll->next;
-+      else
-+        l = requests;
-+    } else {
-+      ll = l;
-+      l = l->next;
-+    }
-+  }
-+}
-+
-+static void start_seentime_calc()
-+{
-+  struct timeval t;
-+
-+  gettimeofday(&t, NULL);
-+  glob_presearch = (float) t.tv_sec + (((float) t.tv_usec) / 1000000);
-+}
-+
-+static void end_seentime_calc()
-+{
-+  struct timeval t;
-+
-+  gettimeofday(&t, NULL);
-+  glob_aftersearch = (float) t.tv_sec + (((float) t.tv_usec) / 1000000);
-+  glob_total_searchtime += glob_aftersearch - glob_presearch;
-+  glob_total_queries++;
-+}
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/generic_binary_tree.c src/eggdrop-1.8.4/src/mod/gseen.mod/generic_binary_tree.c
---- ./src/mod/gseen.mod/generic_binary_tree.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/generic_binary_tree.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,311 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+#define GENERIC_BINARY_TREE 1
-+
-+struct generic_binary_tree {
-+  void *root;
-+  int (*comparedata) (void *data1, void *data2);
-+  int (*expmemdata) (void *data);
-+  void (*freedata) (void *data);
-+};
-+
-+struct generic_binary_tree_node {
-+  void *data;
-+  void *left;
-+  void *right;
-+};
-+
-+static void btree_add(struct generic_binary_tree *, void *);
-+static int btree_expmem(struct generic_binary_tree *);
-+static int btree_recursive_expmem(struct generic_binary_tree *, struct generic_binary_tree_node *);
-+static void *btree_get(struct generic_binary_tree *, void *t);
-+static void btree_freetree(struct generic_binary_tree *);
-+static void btree_recursive_free(struct generic_binary_tree *,
-+                                 struct generic_binary_tree_node *);
-+static void btree_getall(struct generic_binary_tree *, void (*) (void *));
-+static void btree_recursive_getall(struct generic_binary_tree_node *,
-+                                   void (*) (void *));
-+static void btree_getall_expanded(struct generic_binary_tree *tree, void (*) (void *));
-+static void btree_recursive_getall_expanded(struct generic_binary_tree_node *,
-+                                            void (*) (void *));
-+static void btree_remove(struct generic_binary_tree *, void *);
-+
-+static void btree_add(struct generic_binary_tree *tree, void *data)
-+{
-+  struct generic_binary_tree_node *node, *lastnode;
-+  int cmp, lastcmp;
-+
-+  Assert(tree);
-+  Assert(data);
-+  cmp = lastcmp = 0;
-+  node = tree->root;
-+  lastnode = NULL;
-+  while (node) {
-+    cmp = tree->comparedata(node->data, data);
-+    if (!cmp) {
-+      // item is identical -> free old data and insert new
-+      tree->freedata(node->data);
-+      node->data = data;
-+      return;
-+    }
-+    lastnode = node;
-+    lastcmp = cmp;
-+    if (cmp < 0)
-+      node = node->left;
-+    else
-+      node = node->right;
-+  }
-+  node = nmalloc(sizeof(struct generic_binary_tree_node));
-+  node->left = NULL;
-+  node->right = NULL;
-+  node->data = data;
-+  if (!lastnode)
-+    tree->root = node;
-+  else {
-+    Assert(lastcmp);
-+    if (lastcmp < 0) {
-+      Assert(!lastnode->left);
-+      lastnode->left = node;
-+    } else {
-+      Assert(!lastnode->right);
-+      lastnode->right = node;
-+    }
-+  }
-+}
-+
-+static int btree_expmem(struct generic_binary_tree *tree)
-+{
-+  int size = 0;
-+
-+  Assert(tree);
-+  size += btree_recursive_expmem(tree, tree->root);
-+  return size;
-+}
-+
-+static int btree_recursive_expmem(struct generic_binary_tree *tree, struct generic_binary_tree_node *node)
-+{
-+  int size = 0;
-+
-+  if (!node)
-+    return 0;
-+  size += sizeof(struct generic_binary_tree_node);
-+  size += tree->expmemdata(node->data);
-+  size += btree_recursive_expmem(tree, node->left);
-+  size += btree_recursive_expmem(tree, node->right);
-+  return size;
-+}
-+
-+static void *btree_get(struct generic_binary_tree *tree, void *what)
-+{
-+  struct generic_binary_tree_node *node;
-+  int cmp;
-+
-+  node = tree->root;
-+  while (node) {
-+    cmp = tree->comparedata(node->data, what);
-+    if (!cmp)
-+      return node->data;
-+    if (cmp < 0)
-+      node = node->left;
-+    else
-+      node = node->right;
-+  }
-+  return NULL;
-+}
-+
-+static void btree_freetree(struct generic_binary_tree *tree)
-+{
-+  btree_recursive_free(tree, tree->root);
-+}
-+
-+static void btree_recursive_free(struct generic_binary_tree *tree,
-+                                 struct generic_binary_tree_node *node)
-+{
-+  if (!node)
-+    return;
-+  btree_recursive_free(tree, node->left);
-+  btree_recursive_free(tree, node->right);
-+  tree->freedata(node->data);
-+  nfree(node);
-+}
-+
-+/* btree_getall():
-+ * calls the specified function for each item in the tree.
-+ * NOTE: getall() calls the proc _before_ it proceeds into recursion. This way,
-+ *       one can savely store the tree into a file without mixing up its form.
-+ *       But if you delete an item from the called prcedure, this function
-+ *       WILL crash. Use btree_getall() expanded instead.
-+ */
-+static void btree_getall(struct generic_binary_tree *tree, void (*func) (void *))
-+{
-+  Assert(tree);
-+  btree_recursive_getall(tree->root, func);
-+}
-+
-+static void btree_recursive_getall(struct generic_binary_tree_node *node,
-+                                   void (*func) (void *))
-+{
-+  if (!node)
-+    return;
-+  // first call the function, then proceed into recursion
-+  // this way, the tree keeps in form if its saved to a file, for example
-+  Assert(func);
-+  func(node->data);
-+
-+  btree_recursive_getall(node->left, func);
-+  btree_recursive_getall(node->right, func);
-+}
-+
-+/* btree_getall_expanded():
-+ * the same as btree_getall(), but calls the function after the greatest level of recursion
-+ * has been reached. The node-pointers won't be accessed anymore when the first function
-+ * gets called. You can savely use this to free items.
-+ */
-+static void btree_getall_expanded(struct generic_binary_tree *tree, void (*func) (void *))
-+{
-+  Assert(tree);
-+  btree_recursive_getall_expanded(tree->root, func);
-+}
-+
-+static void btree_recursive_getall_expanded(struct generic_binary_tree_node *node,
-+                                            void (*func) (void *))
-+{
-+  if (!node)
-+    return;
-+  btree_recursive_getall_expanded(node->left, func);
-+  btree_recursive_getall_expanded(node->right, func);
-+
-+  Assert(func);
-+  func(node->data);
-+}
-+
-+static void btree_remove(struct generic_binary_tree *tree, void *data)
-+{
-+  struct generic_binary_tree_node *node, *last, *largenode, *lastlarge;
-+  int ret, lastret;
-+
-+  Assert(tree);
-+  Assert(data);
-+  last = NULL;
-+  lastret = 0;
-+  node = tree->root;
-+  while (node) {
-+    ret = tree->comparedata(node->data, data);
-+    if (ret == 0)
-+      break;
-+    last = node;
-+    lastret = ret;
-+    if (ret < 0)
-+      node = node->left;
-+    else
-+      node = node->right;
-+  }
-+  if (!node)  // oops, item not found
-+    return;
-+  if (!node->left && !node->right) {
-+    // *freu* no sub-branches! We can easily delete this item.
-+    if (last) {
-+      if (lastret < 0)
-+        last->left = NULL;
-+      else
-+        last->right = NULL;
-+    } else
-+      tree->root = NULL;
-+  } else if (!node->left) {
-+    // also pretty easy. Just connect the child to the parent.
-+    if (last) {
-+      if (lastret < 0)
-+        last->left = node->right;
-+      else
-+        last->right = node->right;
-+    } else
-+      tree->root = node->right;
-+  } else if (!node->right) {
-+    // same as above, but mirrored
-+    if (last) {
-+      if (lastret < 0)
-+        last->left = node->left;
-+      else
-+        last->right = node->left;
-+    } else
-+      tree->root = node->left;
-+  } else {
-+    // aaargh... two sub-trees! The world is not fair... *sigh*
-+    debug0("argl... worst case, two subtrees. :( Let's pray...");
-+    // now we take the largest item from the left subtree and replace the
-+    // doomed node with it.
-+    // since it is the largest val, the tree remains valid and doesn't
-+    // get deformed too much.
-+
-+    // at first, we have to find this node and cut it from the tree
-+    largenode = node->left;
-+    lastlarge = NULL;
-+    while (largenode && largenode->right) {
-+      lastlarge = largenode;
-+      largenode = largenode->right;
-+    }
-+
-+    // only set largenode->left to node->left if largenode exists.
-+    // otherwise node->left points to largenode, which would result
-+    // in a nice short-circuit
-+    // If it does not exist, just leave largenode->left as it is because we just
-+    // move largenode one level up, so it can keep its left subtree.
-+    if (lastlarge) {
-+      lastlarge->right = largenode->left;
-+      largenode->left = node->left;
-+    }
-+
-+    // now connect node's subtrees to it
-+    largenode->right = node->right;
-+
-+    // and finally replace node with largenode
-+    if (last) {
-+      if (lastret < 0)
-+        last->left = largenode;
-+      else
-+        last->right = largenode;
-+    } else
-+      tree->root = largenode;
-+  }
-+  // finally kill the node... we shouldn't need it anymore
-+  tree->freedata(node->data);
-+  nfree(node);
-+  node = NULL;
-+}
-+
-+#ifdef BTREE_WITHOPTIMIZE
-+static void btree_optimize(struct generic_binary_tree *tree,
-+                           struct generic_binary_tree_node *node,
-+                           struct generic_binary_tree_node *last,
-+                           int limit)
-+{
-+/*  int leftdepth, rightdepth;
-+
-+  if (!node)
-+    return;
-+  btree_optimize(tree, node->left, node, last, limit);
-+  btree_optimize(tree, node->right, node, last, limit);
-+  leftdepth = btree_depth(node->left);
-+  rightdepth = btree_depth(node->right);
-+  if ((leftdepth - rightdepth) > limit) {
-+
-+  }
-+*/
-+}
-+#endif
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/global_vars.c src/eggdrop-1.8.4/src/mod/gseen.mod/global_vars.c
---- ./src/mod/gseen.mod/global_vars.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/global_vars.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,34 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+static char *glob_query, *glob_laston, *glob_otherchan, *glob_othernick;
-+static char *glob_remotebot, *glob_nick;
-+static struct slang_header *glob_slang;
-+static seendat *glob_seendat;
-+static seenreq *glob_seenrequest;
-+static int glob_seenrequests, glob_totalnicks, glob_totalbytes;
-+
-+static void reset_global_vars()
-+{
-+  glob_query = glob_laston = glob_otherchan = glob_othernick = NULL;
-+  glob_remotebot = glob_nick = NULL;
-+  glob_seendat = NULL;
-+  glob_slang = NULL;
-+  glob_seenrequest = NULL;
-+  glob_seenrequests = glob_totalnicks = glob_totalbytes = 0;
-+}
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/gseen.c src/eggdrop-1.8.4/src/mod/gseen.mod/gseen.c
---- ./src/mod/gseen.mod/gseen.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/gseen.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,330 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+#define MAKING_GSEEN
-+#define MODULE_NAME "gseen"
-+#define MODULE_VERSION "1.1.2"
-+#define MODULE_NUMVERSION 10100
-+#include "../module.h"
-+#include "../irc.mod/irc.h"
-+#include "../server.mod/server.h"
-+#include "../channels.mod/channels.h"
-+#include <stdlib.h>
-+#include <sys/stat.h>
-+#include <time.h> /* for time_t */
-+
-+#undef global
-+static Function *global = NULL, *irc_funcs = NULL, *server_funcs = NULL, *channels_funcs = NULL;
-+
-+#ifndef EGG_IS_MIN_VER
-+#define EGG_IS_MIN_VER(ver)             ((ver) <= 10400)
-+#endif
-+
-+#ifndef EGG_IS_MAX_VER
-+#define EGG_IS_MAX_VER(ver)		((ver) >= 10400)
-+#endif
-+
-+#ifndef Context
-+#define Context context
-+#endif
-+
-+#ifndef findchan_by_dname
-+#define findchan_by_dname findchan
-+#endif
-+
-+#include "gseen.h"
-+#include "seenlang.h"
-+
-+static struct slang_header *coreslangs = NULL;
-+static gseenres *results = NULL;
-+static seenreq *requests = NULL;
-+static ignoredword *ignoredwords = NULL;
-+static char *bnsnick = NULL;
-+static char *bnschan = NULL;
-+static char *seen_reply = NULL;
-+static char *temp_wildmatch_host;
-+static int numresults = 0;
-+static double glob_presearch, glob_aftersearch;
-+int numseens, glob_total_queries;
-+double glob_total_searchtime;
-+
-+static char gseenfile[121] = "gseen.dat";
-+static char no_pub[121];
-+static char quiet_seen[121];
-+static char quiet_ai_seen[121];
-+static char no_log[121];
-+static char ignore_words[1024];
-+static char default_slang[21] = "eng";
-+static int gseen_numversion = MODULE_NUMVERSION;
-+static int save_seens = 60;
-+static int save_seens_temp = 1;
-+static int expire_seens = 60;
-+static int maxseen_thr = 0;
-+static int maxseen_time = 0;
-+static int seenflood_thr = 0;
-+static time_t seenflood_time = 0;
-+static int use_handles = 0;
-+static int tell_seens = 1;
-+static int botnet_seen = 1;
-+int fuzzy_search = 1;          // search for the same user under a differnt nick
-+static int wildcard_search = 1;// allow wildcard seaching? ("*!*@*.isp.de")
-+static int max_matches = 500;  // break if there are more than X matches
-+static int hide_secret_chans = 1;	// #chan (+secret) => [secret]
-+static int seen_nick_len = 9;
-+
-+#include "global_vars.c"
-+#define SLANG_NOTYPES 1
-+#define SLANG_NOFACTS 1
-+#define SLANG_NOGETALL 1
-+#define SLANG_NOVALIDATE 1
-+#include "slang.c"
-+#include "slang_gseen_commands.c"
-+#include "generic_binary_tree.c"
-+#include "seentree.c"
-+#include "datahandling.c"
-+#include "sensors.c"
-+#include "do_seen.c"
-+#include "gseencmds.c"
-+#include "ai.c"
-+#include "misc.c"
-+#include "tclcmds.c"
-+
-+static int gseen_expmem()
-+{
-+  int size = 0;
-+
-+  size += seentree_expmem();
-+  size += expmem_seenresults();
-+  size += expmem_seenreq();
-+  size += expmem_ignoredwords();
-+  size += slang_expmem(coreslangs);
-+  size += slang_glob_expmem();
-+  size += slang_chanlang_expmem(chanlangs);
-+  if (bnsnick)
-+    size += strlen(bnsnick) + 1;
-+  if (bnschan)
-+    size += strlen(bnschan) + 1;
-+  if (seen_reply) {
-+    size += strlen(seen_reply) + 1;
-+  }
-+  return size;
-+}
-+
-+static void free_gseen()
-+{
-+  seentree_free();
-+  slang_free(coreslangs);
-+  slang_chanlang_free(chanlangs);
-+  if (seen_reply)
-+    nfree(seen_reply);
-+  return;
-+}
-+
-+/* a report on the module status */
-+static void gseen_report(int idx, int details)
-+{
-+  int size = 0;
-+
-+  Context;
-+  if (details) {
-+    size = gseen_expmem();
-+    dprintf(idx, "    using %d bytes\n", size);
-+  }
-+}
-+
-+static void gseen_minutely ()
-+{
-+  if (save_seens_temp >= save_seens) {
-+    write_seens();
-+    save_seens_temp = 1;
-+  } else
-+    save_seens_temp++;
-+}
-+
-+static void gseen_daily ()
-+{
-+  Context;
-+  purge_seens();
-+}
-+
-+static tcl_strings my_tcl_strings[] =
-+{
-+  {"gseenfile", gseenfile, 121, 0},
-+  {"ai-seen-ignore", ignore_words, 1024, 0},
-+  {"no-pub-seens", no_pub, 121, 0},
-+  {"quiet-seens", quiet_seen, 121, 0},
-+  {"quiet-ai-seens", quiet_ai_seen, 121, 0},
-+  {"no-log", no_log, 121, 0},
-+  {"no-seendata", no_log, 121, 0},
-+  {"default-slang", default_slang, 20, 0},
-+  {0, 0, 0, 0}
-+};
-+
-+static tcl_ints my_tcl_ints[] =
-+{
-+  {"save-seens", &save_seens, 0},
-+  {"expire-seens", &expire_seens, 0},
-+  {"use-handles", &use_handles, 0},
-+  {"tell-seens", &tell_seens, 0},
-+  {"botnet-seens", &botnet_seen, 0},
-+  {"max-matches", &max_matches, 0},
-+  {"fuzzy-search", &fuzzy_search, 0},
-+  {"wildcard-search", &wildcard_search, 0},
-+  {"hide-secret-chans", &hide_secret_chans, 0},
-+  {"seen-nick-len", &seen_nick_len, 0},
-+  {0, 0, 0}
-+};
-+
-+static tcl_coups my_tcl_coups[] =
-+{
-+  {"max-seens", &maxseen_thr, &maxseen_time},
-+  {0, 0, 0},
-+};
-+
-+static char *gseen_close()
-+{
-+  Context;
-+  write_seens();
-+  slang_glob_free();
-+  free_gseen();
-+  free_seenreq();
-+  free_seenresults();
-+  free_ignoredwords();
-+  if (bnsnick)
-+    nfree(bnsnick);
-+  if (bnschan)
-+    nfree(bnschan);
-+  rem_tcl_strings(my_tcl_strings);
-+  rem_tcl_ints(my_tcl_ints);
-+  rem_tcl_coups(my_tcl_coups);
-+  rem_tcl_commands(mytcls);
-+  rem_tcl_commands(gseentcls);
-+  rem_tcl_commands(seendebugtcls);
-+  rem_tcl_commands(gseentcls);
-+  rem_builtins(H_dcc, mydcc);
-+  rem_builtins(H_join, seen_join);
-+  rem_builtins(H_kick, seen_kick);
-+  rem_builtins(H_nick, seen_nick);
-+  rem_builtins(H_part, seen_part);
-+  rem_builtins(H_sign, seen_sign);
-+  rem_builtins(H_splt, seen_splt);
-+  rem_builtins(H_rejn, seen_rejn);
-+  rem_builtins(H_pub, seen_pub);
-+  rem_builtins(H_msg, seen_msg);
-+  rem_builtins(H_bot, seen_bot);
-+  del_hook(HOOK_MINUTELY, (Function) gseen_minutely);
-+  del_hook(HOOK_DAILY, (Function) gseen_daily);
-+  module_undepend(MODULE_NAME);
-+  return NULL;
-+}
-+
-+char *gseen_start();
-+
-+static Function gseen_table[] =
-+{
-+  (Function) gseen_start,
-+  (Function) gseen_close,
-+  (Function) gseen_expmem,
-+  (Function) gseen_report,
-+  /* 4 - 7 */
-+  (Function) findseens,
-+  (Function) free_seenresults,
-+  (Function) gseen_duration,
-+  (Function) & glob_seendat,
-+  (Function) & numresults,
-+  (Function) & fuzzy_search,
-+  (Function) & numseens,
-+  (Function) & glob_total_queries,
-+  (Function) & glob_total_searchtime,
-+  (Function) & gseen_numversion,
-+};
-+
-+char *gseen_start(Function * global_funcs)
-+{
-+  global = global_funcs;
-+  Context;
-+  module_register(MODULE_NAME, gseen_table, 1, 1);
-+  if (!(irc_funcs = module_depend(MODULE_NAME, "irc", 1, 0)))
-+    return "You need the irc module to use the gseen module.";
-+  if (!(server_funcs = module_depend(MODULE_NAME, "server", 1, 0)))
-+    return "You need the server module to use the gseen module.";
-+  if (!(channels_funcs = module_depend(MODULE_NAME, "channels", 1, 0)))
-+    return "You need the channels module to use the gseen module.";
-+  if (!module_depend(MODULE_NAME, "eggdrop", 108, 0)) {
-+    if (!module_depend(MODULE_NAME, "eggdrop", 107, 0)) {
-+      if (!module_depend(MODULE_NAME, "eggdrop", 106, 0)) {
-+        if (!module_depend(MODULE_NAME, "eggdrop", 105, 0)) {
-+          if (!module_depend(MODULE_NAME, "eggdrop", 104, 0)) {
-+            module_undepend(MODULE_NAME);
-+            return "This module requires eggdrop1.4.0 or later";
-+          }
-+        }
-+      }
-+    }
-+  }
-+  chanlangs = NULL;
-+  coreslangs = NULL;
-+  slang_glob_init();
-+
-+  results = NULL;
-+  requests = NULL;
-+  ignoredwords = NULL;
-+  bnsnick = NULL;
-+  bnschan = NULL;
-+  seen_reply = NULL;
-+
-+  numresults = 0;
-+  numseens = 0;
-+  glob_total_queries = 0;
-+  glob_total_searchtime = 0.0;
-+  ignore_words[0] = 0;
-+  no_pub[0] = 0;
-+  quiet_seen[0] = 0;
-+  no_log[0] = 0;
-+  seentree_init();
-+  add_tcl_strings(my_tcl_strings);
-+  add_tcl_ints(my_tcl_ints);
-+  add_tcl_coups(my_tcl_coups);
-+  add_tcl_commands(mytcls);
-+  add_tcl_commands(seendebugtcls);
-+  add_tcl_commands(gseentcls);
-+  add_builtins(H_dcc, mydcc);
-+  add_builtins(H_join, seen_join);
-+  add_builtins(H_kick, seen_kick);
-+  add_builtins(H_nick, seen_nick);
-+  add_builtins(H_part, seen_part);
-+  add_builtins(H_sign, seen_sign);
-+  add_builtins(H_sign, seen_sign);
-+  add_builtins(H_splt, seen_splt);
-+  add_builtins(H_rejn, seen_rejn);
-+  add_builtins(H_pub, seen_pub);
-+  add_builtins(H_msg, seen_msg);
-+  add_builtins(H_bot, seen_bot);
-+  read_seens();
-+  add_hook(HOOK_MINUTELY, (Function) gseen_minutely);
-+  add_hook(HOOK_DAILY, (Function) gseen_daily);
-+#if EGG_IS_MIN_VER(10503)
-+  initudef(1, "noseendata", 1);
-+  initudef(1, "quietseens", 1);
-+  initudef(1, "quietaiseens", 1);
-+  initudef(1, "nopubseens", 1);
-+#endif
-+  glob_slang_cmd_list = slang_commands_list_add(glob_slang_cmd_list, slang_text_gseen_command_table);
-+  putlog(LOG_MISC, "*", "gseen.mod v%s loaded.", MODULE_VERSION);
-+  return NULL;
-+}
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/gseencmds.c src/eggdrop-1.8.4/src/mod/gseen.mod/gseencmds.c
---- ./src/mod/gseen.mod/gseencmds.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/gseencmds.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,420 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+#define PREFIX_LENGTH 20
-+
-+static char reply_prefix[PREFIX_LENGTH + 1];
-+#define set_prefix(x) strncpy(reply_prefix, x, PREFIX_LENGTH); \
-+	reply_prefix[PREFIX_LENGTH] = 0;
-+
-+static int seenflood()
-+{
-+  if (!maxseen_thr || !maxseen_time)
-+    return 0;
-+  if ((now - seenflood_time) > maxseen_time) {
-+    seenflood_time = now;
-+    seenflood_thr = 0;
-+  }
-+  seenflood_thr++;
-+  if (seenflood_thr > maxseen_thr)
-+    return 1;
-+  else
-+    return 0;
-+}
-+
-+static int nopub(char *chan)
-+{
-+  char buf[121], *b;
-+
-+  Context;
-+  strncpy(buf, no_pub, 120);
-+  buf[120] = 0;
-+  b = buf;
-+  while (b[0])
-+    if (!strcasecmp(chan, newsplit(&b)))
-+      return 1;
-+#if EGG_IS_MIN_VER(10503)
-+  if (ngetudef("nopubseens", chan))
-+    return 1;
-+#endif
-+  return 0;
-+}
-+
-+static int quietseen(char *chan)
-+{
-+  char buf[121], *b;
-+
-+  Context;
-+  strncpy(buf, quiet_seen, 120);
-+  buf[120] = 0;
-+  b = buf;
-+  while (b[0])
-+    if (!strcasecmp(chan, newsplit(&b)))
-+      return 1;
-+#if EGG_IS_MIN_VER(10503)
-+  if (ngetudef("quietseens", chan))
-+    return 1;
-+#endif
-+  return 0;
-+}
-+
-+static int cmd_seen(struct userrec *u, int idx, char *par)
-+{
-+  char *query;
-+  
-+  Context;
-+  if (seenflood())
-+    return 0;
-+  reset_global_vars();
-+  glob_slang = slang_find(coreslangs, default_slang);
-+  glob_nick = dcc[idx].nick;
-+  query = newsplit(&par);
-+  glob_query = query;
-+  set_prefix(SLDCCPREFIX);
-+  putlog(LOG_CMDS, "*", "#%s# seen %s", dcc[idx].nick, par);
-+  dprintf(idx, "%s%s\n", reply_prefix, do_seen(query, dcc[idx].nick,
-+  	  dcc[idx].host, "[partyline]", botnet_seen));
-+  return 0;
-+}
-+
-+static int cmd_seenstats(struct userrec *u, int idx, char *par)
-+{
-+  Context;
-+  if (seenflood())
-+    return 0;
-+  reset_global_vars();
-+  glob_slang = slang_find(coreslangs, default_slang);
-+  glob_nick = dcc[idx].nick;
-+  set_prefix(SLDCCPREFIX);
-+  putlog(LOG_CMDS, "*", "#%s# seenstats", dcc[idx].nick);
-+  dprintf(idx, "%s%s\n", reply_prefix, do_seenstats());
-+  return 0;
-+}
-+
-+static int cmd_purgeseens(struct userrec *u, int idx, char *par)
-+{
-+  Context;
-+  purge_seens();
-+  putlog(LOG_CMDS, "*", "#%s# purgeseens", dcc[idx].nick);
-+  return 0;
-+}
-+
-+static int pub_seen(char *nick, char *host, char *hand,
-+        char *channel, char *text)
-+{
-+  char *dest;
-+#if EGG_IS_MIN_VER(10500)
-+  struct chanset_t *chan;
-+#endif
-+
-+  Context;
-+  if (seenflood() || nopub(channel))
-+    return 0;
-+  reset_global_vars();
-+  glob_slang = slang_find(coreslangs, slang_chanlang_get(chanlangs, channel));
-+  glob_nick = nick;
-+  putlog(LOG_CMDS, "*", "<<%s>> !%s! seen %s", nick, hand, text);
-+  if (quietseen(channel)) {
-+    set_prefix(SLNOTPREFIX);
-+    dprintf(DP_HELP, "NOTICE %s :%s%s\n", nick, reply_prefix,
-+           do_seen(newsplit(&text), nick, host, channel, botnet_seen));
-+    return 0;
-+  }
-+#if EGG_IS_MIN_VER(10500)
-+  chan = findchan_by_dname(channel);
-+  if (chan)
-+    dest = chan->name;
-+  else
-+    dest = channel;
-+#else
-+  dest = channel;
-+#endif
-+  set_prefix(SLPUBPREFIX);
-+  dprintf(DP_HELP, "PRIVMSG %s :%s%s\n", dest, reply_prefix,
-+  	  do_seen(newsplit(&text), nick, host, channel, botnet_seen));
-+  return 0;
-+}
-+
-+static int pub_seenstats(char *nick, char *host, char *hand,
-+        char *channel, char *text)
-+{
-+  char *dest;
-+#if EGG_IS_MIN_VER(10500)
-+  struct chanset_t *chan;
-+#endif
-+
-+  Context;
-+  if (seenflood())
-+    return 0;
-+  if (nopub(channel))
-+    return 0;
-+  reset_global_vars();
-+  glob_slang = slang_find(coreslangs, slang_chanlang_get(chanlangs, channel));
-+  glob_nick = nick;
-+  putlog(LOG_CMDS, "*", "<<%s>> !%s! seenstats", nick, hand);
-+  if (quietseen(channel)) {
-+    set_prefix(SLNOTPREFIX);
-+    dprintf(DP_HELP, "NOTICE %s :%s%s\n", nick, reply_prefix, do_seenstats());
-+    return 0;
-+  }
-+#if EGG_IS_MIN_VER(10500)
-+  chan = findchan_by_dname(channel);
-+  if (chan)
-+    dest = chan->name;
-+  else
-+    dest = channel;
-+#else
-+  dest = channel;
-+#endif
-+  set_prefix(SLPUBPREFIX);
-+  dprintf(DP_HELP, "PRIVMSG %s :%s%s\n", dest, reply_prefix, do_seenstats());
-+  return 1;
-+}
-+
-+static int msg_seen(char *nick, char *uhost, struct userrec *u, char *text)
-+{
-+  Context;
-+  if (seenflood())
-+    return 0;
-+  reset_global_vars();
-+  glob_slang = slang_getbynick(coreslangs, nick);
-+  glob_nick = nick;
-+  putlog(LOG_CMDS, "*", "(%s!%s) !%s! seen %s", nick, uhost, u ? u->handle : "*", text);
-+  set_prefix(SLMSGPREFIX);
-+  dprintf(DP_HELP, "PRIVMSG %s :%s%s\n", nick, reply_prefix,
-+  	  do_seen(newsplit(&text), nick, uhost, "[/msg]", botnet_seen));
-+  return 1;
-+}
-+
-+static int pub_seennick(char *nick, char *host, char *hand,
-+        char *channel, char *text)
-+{
-+  seendat *l;
-+  char *dest;
-+#if EGG_IS_MIN_VER(10500)
-+  struct chanset_t *chan;
-+#endif
-+
-+  Context;
-+  if (seenflood())
-+    return 0;
-+  if (nopub(channel))
-+    return 0;
-+  putlog(LOG_CMDS, "*", "<<%s>> !%s! seennick %s", nick, hand, text);
-+  reset_global_vars();
-+  glob_slang = slang_find(coreslangs, slang_chanlang_get(chanlangs, channel));
-+  glob_nick = nick;
-+#if EGG_IS_MIN_VER(10500)
-+  chan = findchan_by_dname(channel);
-+  if (chan)
-+    dest = chan->name;
-+  else
-+    dest = channel;
-+#else
-+  dest = channel;
-+#endif
-+  text = newsplit(&text);
-+  l = findseen(text);
-+  if (!l) {
-+    glob_query = text;
-+    if (quietseen(channel)) {
-+      set_prefix(SLNOTPREFIX);
-+      dprintf(DP_HELP, "NOTICE %s :%s%s\n", nick, reply_prefix, SLNOTSEEN);
-+    } else {
-+      set_prefix(SLPUBPREFIX);
-+      dprintf(DP_HELP, "PRIVMSG %s :%s%s\n", dest, reply_prefix, SLNOTSEEN);
-+    }
-+    return 0;
-+  }
-+  if (quietseen(channel)) {
-+    set_prefix(SLNOTPREFIX);
-+    dprintf(DP_HELP, "NOTICE %s :%s%s\n", nick, reply_prefix, do_seennick(l));
-+  } else {
-+    set_prefix(SLPUBPREFIX);
-+    dprintf(DP_HELP, "PRIVMSG %s :%s%s\n", dest, reply_prefix, do_seennick(l));
-+  }
-+  return 0;
-+}
-+
-+static int msg_seennick(char *nick, char *uhost, struct userrec *u, char *text)
-+{
-+  seendat *l;
-+
-+  Context;
-+  if (seenflood())
-+    return 0;
-+  putlog(LOG_CMDS, "*", "(%s!%s) !%s! seennick %s", nick, uhost, u ? u->handle : "*", text);
-+  reset_global_vars();
-+  glob_slang = slang_getbynick(coreslangs, nick);
-+  glob_nick = nick;
-+  set_prefix(SLMSGPREFIX);
-+  text = newsplit(&text);
-+  l = findseen(text);
-+  if (!l) {
-+    glob_query = text;
-+    dprintf(DP_HELP, "PRIVMSG %s :%s%s\n", nick, reply_prefix, SLNOTSEEN);
-+    return 0;
-+  }
-+  dprintf(DP_HELP, "PRIVMSG %s :%s%s\n", nick, reply_prefix, do_seennick(l));
-+  return 0;
-+}
-+
-+static int cmd_seennick(struct userrec *u, int idx, char *text)
-+{
-+  seendat *l;
-+
-+  Context;
-+  if (seenflood())
-+    return 0;
-+  putlog(LOG_CMDS, "*", "#%s# seennick %s", dcc[idx].nick, text);
-+  reset_global_vars();
-+  glob_slang = slang_find(coreslangs, default_slang);
-+  glob_nick = dcc[idx].nick;
-+  set_prefix(SLMSGPREFIX);
-+  text = newsplit(&text);
-+  l = findseen(text);
-+  if (!l) {
-+    glob_query = text;
-+    dprintf(idx, "%s%s\n", reply_prefix, SLNOTSEEN);
-+    return 0;
-+  }
-+  dprintf(idx, "%s%s\n", reply_prefix, do_seennick(l));
-+  return 0;
-+}
-+
-+static int bot_gseen_req(char *bot, char *code, char *par)
-+{
-+  char *mask, *nick, *uhost, *chan, *reply;
-+  char tosend[256];
-+  int i;
-+
-+  Context;
-+  if (seenflood())
-+    return 0;
-+  i = nextbot(bot);
-+  if (i < 0) {
-+    debug1("Couldn't answer botnet-seen-request from %s: no such bot", bot);
-+    return 0;
-+  }
-+  mask = newsplit(&par);
-+  nick = newsplit(&par);
-+  uhost = newsplit(&par);
-+  chan = newsplit(&par);
-+  reset_global_vars();
-+  glob_slang = slang_find(coreslangs, slang_chanlang_get(chanlangs, chan));
-+  glob_nick = nick;
-+  reply = do_seen(mask, nick, uhost, chan, -1);
-+  if (!reply)
-+    return 0;
-+  if ((strlen(nick) + strlen(chan) + strlen(reply)) < 255) {
-+    sprintf(tosend, "gseen_rep %s %s %s", nick, chan, reply);
-+    botnet_send_zapf(i, botnetnick, bot, tosend);
-+  }
-+  return 0;
-+}
-+
-+static int bot_gseen_rep(char *bot, char *code, char *par)
-+{
-+  char *nick, *chan, *reply;
-+  int i;
-+
-+  Context;
-+  if (seenflood())
-+    return 0;
-+  if (!bnsnick || !bnschan) {
-+    if (bnsnick)
-+      nfree(bnsnick);
-+    if (bnschan)
-+      nfree(bnschan);
-+    bnsnick = bnschan = NULL;
-+    return 0;
-+  }
-+  nick = newsplit(&par);
-+  chan = newsplit(&par);
-+  reset_global_vars();
-+  glob_remotebot = bot;
-+  glob_slang = slang_find(coreslangs, slang_chanlang_get(chanlangs, chan));
-+  glob_nick = nick;
-+  reply = par;
-+  if (strcmp(nick, bnsnick) || strcmp(chan, bnschan))
-+    return 0; /* unwanted reply */
-+  if (findchan(chan)) {
-+    if (nopub(chan)) {
-+      nfree(bnsnick);
-+      nfree(bnschan);
-+      bnsnick = bnschan = NULL;
-+      debug1("%s is nopub, bns-reply dropped", chan);
-+      return 0;
-+    }
-+    if (quietseen(chan)) {
-+      set_prefix(SLNOTPREFIX);
-+      dprintf(DP_HELP, "NOTICE %s :%s%s%s\n", nick, reply_prefix, SLRBOTSAYS, reply);
-+    } else {
-+      set_prefix(SLPUBPREFIX);
-+      dprintf(DP_HELP, "PRIVMSG %s :%s%s%s\n", chan, reply_prefix, SLRBOTSAYS, reply);
-+    }
-+  } else if (!strcmp(chan, "[/msg]")) {
-+    set_prefix(SLMSGPREFIX);
-+    dprintf(DP_HELP, "PRIVMSG %s :%s%s%s\n", nick, reply_prefix, SLRBOTSAYS, reply);
-+  } else if (!strcmp(chan, "[partyline]")) {
-+    for (i = 0; i < dcc_total; i++) {
-+      if ((!strcasecmp(nick, dcc[i].nick)) &&
-+         (dcc[i].type->flags & DCT_SIMUL)) {
-+	set_prefix(SLDCCPREFIX);
-+        dprintf(i, "%s%s%s\n", reply_prefix, SLRBOTSAYS, reply);
-+        break;
-+      }
-+    }
-+  } else
-+    debug1("Couldn't send received bns answer, no such chan %s", chan);
-+  nfree(bnsnick);
-+  nfree(bnschan);
-+  bnsnick = bnschan = NULL;
-+  return 0;
-+}
-+
-+static cmd_t mydcc[] =
-+{
-+  {"seen", "-|-", cmd_seen, NULL},
-+  {"seenstats", "-|-", cmd_seenstats, NULL},
-+  {"purgeseens", "m", cmd_purgeseens, NULL},
-+  {"seennick", "-|-", cmd_seennick, NULL},
-+  {0, 0, 0, 0}
-+};
-+
-+static cmd_t seen_pub[] =
-+{
-+  {"!seen", "", pub_seen, 0},
-+  {"!seenstats", "", pub_seenstats, 0},
-+  {"!seennick", "", pub_seennick, 0},
-+  {0, 0, 0, 0}
-+};
-+
-+static cmd_t seen_msg[] =
-+{
-+  {"seen", "", msg_seen, 0},
-+  {"seennick", "", msg_seennick, 0},
-+  {0, 0, 0, 0}
-+};
-+
-+static cmd_t seen_bot[] =
-+{
-+  {"gseen_req", "", bot_gseen_req, 0},
-+  {"gseen_rep", "", bot_gseen_rep, 0},
-+  {0, 0, 0, 0}
-+};
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/gseen.conf src/eggdrop-1.8.4/src/mod/gseen.mod/gseen.conf
---- ./src/mod/gseen.mod/gseen.conf	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/gseen.conf	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,151 @@
-+
-+######
-+#####
-+###   General Settings
-+#####
-+######
-+
-+# the file where the seen data will be backuped.
-+# WARNING: set this _before_ the module is loaded.
-+set gseenfile "gseen.dat"
-+
-+# now load the module
-+loadmodule gseen
-+
-+# load the English language file
-+loadseenslang "en" "English" language/gseen.en.lang
-+
-+# load the German language file
-+loadseenslang "de" "Deutsch" language/gseen.de.lang
-+
-+# set the default language to english...
-+set default-slang "en"
-+
-+# ... but let #xwp use the german langfile
-+setchanseenlang #xwp "de"
-+
-+# the char that marks public commands (!seen, etc...)
-+# "" is a valid option
-+set cmdchar "!"
-+
-+# delete data sets that are older than x days
-+set expire-seens 60
-+
-+# only answer x seen requests in y seconds to prevent flooding
-+set max-seens 7:60
-+
-+# tell users if someone was !seen'ing for them
-+set tell-seens 1
-+
-+# check if the user was online under a different nick
-+set fuzzy-search 1
-+
-+# allow user to include wildcards in the search?
-+set wildcard-search 1
-+
-+# break search if there are more than x matches
-+set max-matches 250
-+
-+# forward a request to other bots, if a !seen returned no result?
-+set botnet-seens 1
-+
-+# store channels, which are +secret on the bot as [secret]?
-+set hide-secret-chans 1
-+
-+# backup the seen data every x minutes
-+set save-seens 60
-+
-+######
-+#####
-+###   AI Settings
-+#####
-+######
-+
-+# this setting configures on which sentences your bot should
-+# attempt to do an ai-seen. Each of them is a simple wildcard
-+# mask. Set this to "" if you want to deactivate ai-seens or
-+# create more precise masks if the bots reacts too often.
-+set ai-seen-binds {
-+  "${nick}*seen*"
-+  "${botnet-nick}*seen*"
-+  "${nick}*gesehen*"
-+  "${botnet-nick}*gesehen*"
-+}
-+
-+# this is just the same as above, but if triggered it will
-+# not do an ai-seen, but display its seen-stats.
-+set ai-seenstats-binds {
-+  "${nick}*seenstats*"
-+  "${botnet-nick}*seenstats*"
-+}
-+
-+# when doing an AI seen, ignore the following words (otherwise
-+# the bot might give weird answers like "<bot> nick, bot was last seen..." :)
-+set ai-seen-ignore "$nick ${botnet-nick} seen"
-+
-+######
-+#####
-+###   special stuff (can be ignored in most cases)
-+#####
-+######
-+
-+# Maximum length of requested nick that will still be processed.
-+# (by default this is eggdrop's configured nick-length)
-+set seen-nick-len ${nick-len}
-+
-+# if the user is known by the bot, log their handle instead of the nick
-+# (not recommended, might cause confusion by the users)
-+set use-handles 0
-+
-+######
-+#####
-+###   outdated settings (only important for eggdropv1.4 users)
-+#####
-+######
-+
-+# channels where you do not want your bot to reply to public queries
-+set no-pub-seens ""
-+
-+# channels where you want your bot to send replies via notice to the user and
-+# not to the channel
-+set quiet-seens ""
-+
-+# same as quiet-seens but for AI seen
-+set quiet-ai-seens ""
-+
-+# channels where you do not want your bot to log seen data
-+set no-seendata ""
-+
-+
-+###############################################################################
-+# end of configuration
-+# just ignore everything below ^_^
-+###############################################################################
-+
-+bind chjn - * *chjn:gseen
-+bind chpt - * *chpt:gseen
-+
-+catch "unbind pub - !seen *pub:!seen"
-+catch "unbind pub - !seennick *pub:!seennick"
-+catch "unbind pub - !seenstats *pub:!seenstats"
-+bind pub - ${cmdchar}seen *pub:!seen
-+bind pub - ${cmdchar}seennick *pub:!seennick
-+bind pub - ${cmdchar}seenstats *pub:!seenstats
-+
-+foreach bnd [binds pubm] {
-+  if {([lindex $bnd 2] == "*pubm:seen") || ([lindex $bnd 2] == "*pub:!seenstats")} {
-+    unbind [lindex $bnd 0] [lindex $bnd 1] [lindex $bnd 2] [lindex $bnd 4]
-+  }
-+}
-+
-+if {${ai-seen-binds} != ""} {
-+  foreach mask ${ai-seen-binds} {
-+    bind pubm -|- "% [subst $mask]" *pubm:seen
-+  }
-+}
-+
-+if {${ai-seenstats-binds} != ""} {
-+  foreach mask ${ai-seenstats-binds} {
-+    bind pubm -|- "% [subst $mask]" *pub:!seenstats
-+  }
-+}
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/gseen.de.lang src/eggdrop-1.8.4/src/mod/gseen.mod/gseen.de.lang
---- ./src/mod/gseen.mod/language/gseen.de.lang	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/language/gseen.de.lang	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,131 @@
-+#####################################################################
-+#
-+# Deutsche Sprachdatei f�r GSeen.Mod v1.1.0
-+#
-+# Der Text in dieser Datei kann nach belieben ver�ndert werden. Du
-+# kannst Tags hinzuf�gen oder entfernen, wie es Dir gef�llt. Die Tags
-+# m�ssen nicht in einer bestimmten Reihenfolge oder Anzahl vorkommen.
-+#
-+# Wenn Du mehr als eine Zeile pro ID angibst, dann wird bei der
-+# Antwort per Zufall eine daraus ausgew�hlt. (das funktioniert nicht
-+# bei den Zeiteinheiten)
-+#
-+# Falls Du denkst, da� hier noch ein paar wichtige Tags fehlen, dann
-+# schick mir einfach eine email. Vielleicht f�ge ich sie dann in der
-+# n�chsten Version hinzu.
-+#
-+# Eine komplette Liste der Verf�gbaren Tags befindet sich am Ende von
-+# slang_gseen_commands.c (leider ohne Erkl�hrungen)
-+#
-+#####################################################################
-+
-+#
-+## Zeiteinheiten
-+#
-+# jeweils in Singular und Plural
-+#
-+D 0 Jahr
-+D 1 Jahre
-+D 2 Woche
-+D 3 Wochen
-+D 4 Tag
-+D 5 Tage
-+D 6 Stunde
-+D 7 Stunden
-+D 8 Minute
-+D 9 Minuten
-+D 10 Sekunde
-+D 11 Sekunden
-+# falls ein �ng�ltiger Zeitwert angegeben war, dann wird dieser Text ausgegeben:
-+D 12 einiger Zeit
-+
-+
-+#
-+## Pr�fixe
-+#
-+# Dieses Fragment wird jeweils vor eine Antwort gesetzt. Dadurch
-+# ist beispielsweise bei �ffentlichen Anfragen ersichtlich, f�r
-+# wen die Antwort ist.
-+# Achtung: Die Nummer muss auf jeden Fall definiert werden. Sie muss
-+#	   zwar keinen Text beinhalten, aber wenn sie nicht vorhanden
-+#	   ist, dann gibt es eine Fehlermeldung
-+
-+# f�r Antworten, die in den Channel geschrieben werden:
-+10 <?nick/?>, 
-+# f�r Antworten, die per NOTICE an den User geschickt werden:
-+11
-+# f�r Antworten auf Anfragen, die per "/msg <bot> seen" erfolgt sind:
-+12
-+# und f�r Antworten auf der Partyline:
-+13
-+
-+#
-+## Fehlermeldungen
-+#
-+54 wei�t Du was ein Parameter ist? ^_^
-+54 ich w�rde Dir ja gerne helfen, aber solange Du nicht sagst, nach wem Du suchst, kann ich nicht viel tun.
-+54 meinst Du nicht, es w�re geschickter zu sagen, nach wem Du �berhaupt suchst?
-+54 42.
-+55 sehe ich etwa wie ein Spiegel aus? ^_^
-+55 Spieglein, Spieglein an der Wand...
-+55 leidest Du etwa unter multiplen Pers�nlichkeiten? *eg*
-+56 also wenn Du <?query/?> jetzt hier nicht sehen kannst, dann brauchst Du sicherlich eine neue Brille ^_^
-+56 ich muss mir unbedingt mal die Tarnkappe von <?query/?> ausleihen. Scheint ja prima zu funktioneren.
-+56 schau Dir bitte nochmal ganz genau an, wer grade alles im Channel ist.
-+57 Tut mir leid, aber Wildcards ('?', oder '*') sind bei der Suche nicht erlaubt.
-+58 �hm... naja... etwas arg lang, dieser Nick... :)
-+
-+#
-+## Kein Ergebnis
-+#
-+65 Ich kann mich nicht daran erinnern, <?query/?> gesehen zu haben...
-+65 <?query/?>? Hmm... ich bin mir nicht sicher... vielleicht... eventuell... nein, kenne ich nicht.
-+65 der Name sagt mir nichts. Hast Du Dich vielleicht vertippt?
-+66 Ich hab' <?query/?> seit <?laston/?> nicht mehr gesehen.
-+67 Sorry, aber zu deiner Anfrage passt nichts in meiner Datenbank :(
-+68 Autschi, das gab viel zu viele Ergebnisse. Bitte formuliere deine Suche etwas genauer.
-+
-+73 <?query/?> ist grade unter dem Nick "<?othernick/?>" in diesem Channel zu finden.
-+74 <?query/?> ist gerade in <?otherchan/?>.
-+75 Deine Anfrage f�hrte zu genau einem Ergebnis:
-+76 Immerhin <?numresults/?> Treffer ergab deine Anfrage:
-+77 Wow, auf deine Anfrage passen sogar <?numresults/?> Eintr�ge in meiner Datenbank! Dies sind die 5 aktuellsten:
-+
-+#
-+## falls ein anderer Bot etwas gefunden hat:
-+#
-+85 <?remotebot/?> sagt: 
-+
-+#
-+## die eigentliche Information
-+#
-+101 Ich habe <?snick/?> (<?shost/?>) zuletzt <?schan/?> vor <?swhen/?> betreten sehen (<?stime/?>). <?snick/?> ist noch immer da.
-+121 Ich habe <?snick/?> (<?shost/?>) zuletzt <?schan/?> vor <?swhen/?> betreten sehen (<?stime/?>), aber <?snick/?> verschwand mysteri�serweise.
-+102 Ich habe <?snick/?> (<?shost/?>) zuletzt <?schan/?> vor <?swhen/?> nach <?spent/?> verchatteter Zeit verlassen sehen (<?stime/?>)
-+103 Ich habe <?snick/?> (<?shost/?>) zuletzt in <?schan/?> gesehen, als er/sie vor <?swhen/?> (<?stime/?>) nach <?spent/?> das IRC verlie� ("<?smsg/?>").
-+104 Zuletzt habe ich <?snick/?> (<?shost/?>) vor <?swhen/?> in <?schan/?> gesehen, den Nick zu <?snick2/?> wechselnd. <?snick2/?> ist noch immer dort.
-+124 <?snick/?> (<?shost/?>) was last seen changing his/her nick to <?snick2/?> on <?schan/?> <?swhen/?> ago (<?stime/?>), but <?snick2/?> mysteriously dematerialized.
-+105 Zuletzt habe ich <?snick/?> (<?shost/?>) vor <?swhen/?> in <?schan/?> gesehen, den Nick von <?snick2/?> wechselnd. <?snick/?> ist noch immer dort.
-+125 <?snick/?> (<?shost/?>) was last seen changing his/her nick from <?snick2/?> on <?schan/?> <?swhen/?> ago (<?stime/?>), but <?snick/?> mysteriously dematerialized.
-+106 Zuletzt habe ich <?snick/?> (<?shost/?>) gesehen, als er vor <?swhen/?> (<?stime/?>) von <?punisher/?> aus <?schan/?> gejagt wurde. (<?kickreason/?>)
-+107 <?snick/?> (<?shost/?>) habe ich zuletzt vor <?swhen/?> gesehen, als er/sie von <?schan/?> aus in einem Netsplit verschwand.
-+108 <?snick/?> (<?shost/?>) habe ich zuletzt vor <?swhen/?> gesehen, als er/sie nach einem Netsplit in <?schan/?> zur�ck kam. <?snick/?> ist noch immer dort.
-+128 <?snick/?> (<?shost/?>) habe ich zuletzt vor <?swhen/?> gesehen, als er/sie nach einem Netsplit in <?schan/?> zur�ck kam. Allerdings konnte <?snick/?> dem Gott der Netsplits nicht endg�ltig entkommen und ist wieder verschollen...
-+109 <?snick/?> was last seen joining the botnet channel <?schan/?> on <?bnbot/?> <?swhen/?> ago (<?stime/?>).
-+129 <?snick/?> was last seen joining the partyline on <?bnbot/?> <?swhen/?> ago (<?stime/?>).
-+110 <?snick/?> was last seen leaving the botnet channel <?schan/?> from <?bnbot/?> <?swhen/?> ago (<?stime/?>).
-+130 <?snick/?> was last seen leaving the partyline from <?bnbot/?> <?swhen/?> ago (<?stime/?>).
-+140 <?snick/?> (<?shost/?>) was last seen on <?schan/?> <?swhen/?> ago (<?stime/?>).
-+
-+#
-+## Seen-Mitteilungen
-+#
-+170 <?rnick/?> (<?rhost/?>) scheint vor <?rwhen/?> (<?rtime/?>) in <?rchan/?> auf der Suche nach Dir gewesen zu sein.
-+171 <?requests/?> Leute haben sich nach Dir erkundigt:
-+172 Der/die letzte war <?rnick/?> (<?rhost/?>) in <?rchan/?> vor <?rwhen/?> (<?rtime/?>).
-+
-+#
-+## Statistiken
-+#
-+180 Momentan sind <?totalnicks/?> Nicks in meiner Datenbank. Gesamter Speicherverbrauch: <?totalbytes/?> Bytes
-+180 In meiner Datenbank befinden sich <?totalnicks/?> Nicks und verbrauchen <?totalbytes/?> Bytes Speicher.
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/gseen.en.lang src/eggdrop-1.8.4/src/mod/gseen.mod/gseen.en.lang
---- ./src/mod/gseen.mod/language/gseen.en.lang	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/language/gseen.en.lang	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,131 @@
-+#####################################################################
-+#
-+# Default English langfile for GSeen.Mod v1.1.0
-+#
-+# Just edit the text below to fit your needs. You can add or remove
-+# any tag just like you want, they do not need to appear in a special
-+# order (or number).
-+#
-+# If you enter more than one line per ID, then a random one will be
-+# chosen for each reply. (this does not work for the time strings)
-+#
-+# If you think you need more tags, just email me and maybe I'll add
-+# them in the next release.
-+#
-+# A complete list of available Tags can be found at the end of the
-+# file slang_gseen_commands.c (unfortunately, it does not contain any
-+# descriptions for the tags)
-+#
-+#####################################################################
-+
-+#
-+## time string
-+#
-+# each time string in singular and plural
-+#
-+D 0 year
-+D 1 years
-+D 2 week
-+D 3 weeks
-+D 4 day
-+D 5 days
-+D 6 hour
-+D 7 hours
-+D 8 minute
-+D 9 minutes
-+D 10 second
-+D 11 seconds
-+# if an invalid time value was supplied, output the following string
-+D 12 some time
-+
-+#
-+## Prefixes
-+#
-+# These are the prefixes of the replies. By default, there's only
-+# a prefix for public requests (so you know for whom the answer is),
-+# but you can also define prefixes for other requests.
-+
-+# for replies in the channel:
-+10 <?nick/?>, 
-+# for replies via notice:
-+11
-+# for replies via PRIVMSG
-+12
-+# for replies on the partyline
-+13
-+
-+#
-+## error messages
-+#
-+54 do you know what a parameter is?
-+54 don't you think it would be more reasonable to say for whom you are searching?
-+54 42.
-+55 do I look like a mirror? ^_^
-+55 mirror mirror on the wall...
-+55 do you have a split personality? *eg*
-+56 if you can't see <?query/?> here right now, you probably need new glasses. ^_^
-+56 please look a bit closer at the memberlist of this channel.
-+57 I'm sorry, but wildcards ('?' or '*') are not allowed in a search.
-+58 Hum... don't you think this nick is a bit long? ^_^
-+58 you know that the length of nicks is limited, don't you?
-+
-+#
-+## no result
-+#
-+65 I don't remember seeing <?query/?>.
-+65 <?query/?>? hmm... I'm trying to remember... maybe... I'm not sure... no. I don't remember <?query/?>.
-+66 I haven't seen <?query/?> for <?laston/?>.
-+67 I found no matches to your query.
-+67 I'm sorry, but your search didn't return any results.
-+68 Ouch, your search returned way too many matches. Please refine it.
-+
-+#
-+## victim is online
-+#
-+73 <?query/?> is <?othernick/?>, who is on this channel right now.
-+74 <?query/?> is on <?otherchan/?> right now.
-+
-+#
-+## results found
-+#
-+75 I found one match to your query:
-+76 I found <?numresults/?> matches to your query:
-+77 I found <?numresults/?> matches to your query. These are the 5 most recent ones:
-+
-+#
-+## results found by another bot in the botnet
-+#
-+85 <?remotebot/?> says: 
-+
-+#
-+## the core info
-+#
-+101 <?snick/?> (<?shost/?>) was last seen joining <?schan/?> <?swhen/?> ago (<?stime/?>). <?snick/?> is still there.
-+121 <?snick/?> (<?shost/?>) was last seen joining <?schan/?> <?swhen/?> ago (<?stime/?>), but <?snick/?> mysteriously dematerialized.
-+102 <?snick/?> (<?shost/?>) was last seen parting <?schan/?> <?swhen/?> ago (<?stime/?>), after spending <?spent/?> there.
-+103 <?snick/?> (<?shost/?>) was last seen quitting <?schan/?> <?swhen/?> ago (<?stime/?>) stating "<?smsg/?>" after spending <?spent/?> there.
-+104 <?snick/?> (<?shost/?>) was last seen changing his/her nick to <?snick2/?> on <?schan/?> <?swhen/?> ago (<?stime/?>). <?snick2/?> is still there.
-+124 <?snick/?> (<?shost/?>) was last seen changing his/her nick to <?snick2/?> on <?schan/?> <?swhen/?> ago (<?stime/?>), but <?snick2/?> mysteriously dematerialized.
-+105 <?snick/?> (<?shost/?>) was last seen changing his/her nick from <?snick2/?> on <?schan/?> <?swhen/?> ago (<?stime/?>). <?snick/?> is still there.
-+125 <?snick/?> (<?shost/?>) was last seen changing his/her nick from <?snick2/?> on <?schan/?> <?swhen/?> ago (<?stime/?>), but <?snick/?> mysteriously dematerialized.
-+106 <?snick/?> (<?shost/?>) was last seen being kicked from <?schan/?> by <?punisher/?> (<?kickreason/?>) <?swhen/?> ago (<?stime/?>), after spending <?spent/?> there.
-+107 <?snick/?> (<?shost/?>) was last seen splitting from <?schan/?> <?swhen/?> ago (<?stime/?>), after spending <?spent/?> there.
-+108 <?snick/?> (<?shost/?>) was last seen rejoining <?schan/?> from a netsplit <?swhen/?> ago (<?stime/?>) <?snick/?> is still there.
-+128 <?snick/?> (<?shost/?>) was last seen rejoining <?schan/?> from a netsplit <?swhen/?> ago (<?stime/?>), but the god of netsplits didn't let him escape, so he's not here now.
-+109 <?snick/?> was last seen joining the botnet channel <?schan/?> on <?bnbot/?> <?swhen/?> ago (<?stime/?>).
-+129 <?snick/?> was last seen joining the partyline on <?bnbot/?> <?swhen/?> ago (<?stime/?>).
-+110 <?snick/?> was last seen leaving the botnet channel <?schan/?> from <?bnbot/?> <?swhen/?> ago (<?stime/?>).
-+130 <?snick/?> was last seen leaving the partyline from <?bnbot/?> <?swhen/?> ago (<?stime/?>).
-+140 <?snick/?> (<?shost/?>) was last seen on <?schan/?> <?swhen/?> ago (<?stime/?>).
-+
-+#
-+## seen notification
-+#
-+170 <?rnick/?> (<?rhost/?>) was looking for you on <?rchan/?> <?rwhen/?> ago (<?rtime/?>).
-+171 There have been <?requests/?> users looking for you:
-+172 The last one was <?rnick/?> (<?rhost/?>) on <?rchan/?> <?rwhen/?> ago (<?rtime/?>).
-+
-+#
-+## seen stats
-+#
-+180 I'm currently tracking <?totalnicks/?> nicks using <?totalbytes/?> bytes.
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/gseen.h src/eggdrop-1.8.4/src/mod/gseen.mod/gseen.h
---- ./src/mod/gseen.mod/gseen.h	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/gseen.h	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,157 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+/* #define USE_MEMDEBUG 1 */
-+
-+#define SEEN_JOIN 1
-+#define SEEN_PART 2
-+#define SEEN_SIGN 3
-+#define SEEN_NICK 4
-+#define SEEN_NCKF 5
-+#define SEEN_KICK 6
-+#define SEEN_SPLT 7
-+#define SEEN_REJN 8
-+#define SEEN_CHPT 9
-+#define SEEN_CHJN 10
-+
-+typedef struct gseen_data {
-+  int type;
-+  char *nick;
-+  char *host;
-+  char *chan;
-+  char *msg;
-+  time_t when;
-+  int spent;
-+} seendat;
-+
-+typedef struct gseen_result {
-+  struct gseen_result *next;
-+  seendat *seen;
-+} gseenres;
-+
-+typedef struct gseen_requests {
-+  struct gseen_requests *next;
-+  char *who;
-+  char *host;
-+  char *chan;
-+  time_t when;
-+} seenreq_by;
-+
-+typedef struct gseen_request {
-+  struct gseen_request *next;
-+  char *nick;
-+  struct gseen_requests *by;
-+} seenreq;
-+
-+typedef struct gseen_ignorewords {
-+  struct gseen_ignorewords *next;
-+  char *word;
-+} ignoredword;
-+
-+#ifdef MAKING_GSEEN
-+static int gseen_expmem();
-+static void free_gseen();
-+static int get_spent(char *, char *);
-+static void write_seens();
-+static void read_seens();
-+static char *do_seen(char *, char *, char *, char *, int);
-+static void add_seenresult(seendat *);
-+static int expmem_seenresults();
-+static void free_seenresults();
-+static void sortresults();
-+static char *do_seennick(seendat *);
-+static int onchan(char *, char *);
-+static char *handonchan(char *, char *);
-+static struct chanset_t *onanychan(char *);
-+static struct chanset_t *handonanychan(char *);
-+static char *do_seenstats();
-+static void add_seenreq(char *, char *, char *, char *, time_t);
-+static int expmem_seenreq();
-+static void free_seenreq();
-+static void sortrequests(seenreq *);
-+static void report_seenreq(char *, char *);
-+static int count_seenreq(seenreq_by *b);
-+static int expmem_ignoredwords();
-+static void free_ignoredwords();
-+static void add_ignoredword(char *word);
-+static int word_is_ignored(char *word);
-+static void purge_seens();
-+static int seenflood();
-+static int secretchan(char *);
-+static int nopub(char *);
-+static int quietseen(char *);
-+static int quietaiseens(char *);
-+static int nolog(char *);
-+static void start_seentime_calc();
-+static void end_seentime_calc();
-+#endif
-+
-+
-+#ifdef MAKING_GSEEN
-+
-+// tree stuff
-+static void maskstricthost(const char *, char *);
-+#endif
-+
-+// interface for webseen
-+#define WS_OK 0
-+#define WS_NORESULT 1
-+#define WS_NOPARAM 2
-+#define WS_NOWILDCARDS 3
-+#define WS_TOOLONGNICK 4
-+#define WS_TOOMANYMATCHES 5
-+#define WS_TOOLONGHOST 6
-+
-+#ifndef MAKING_GSEEN
-+#define findseens ((gseenres *(*)(char *, int *, int))gseen_funcs[4])
-+#define free_seenresults ((void (*)())gseen_funcs[5])
-+#define gseen_duration ((char *(*)(int))gseen_funcs[6])
-+#define numresults (*(int *)(gseen_funcs[12]))
-+#define fuzzy_search (*(int *)(gseen_funcs[13]))
-+#define numseens (*(int *)(gseen_funcs[15]))
-+#define glob_total_queries (*(int *)(gseen_funcs[16]))
-+#define glob_total_searchtime (*(double *)(gseen_funcs[17]))
-+#define gseen_numversion (*(int *)(gseen_funcs[19]))
-+#else
-+static gseenres *findseens(char *, int *, int);
-+static char *gseen_duration(int);
-+#endif
-+
-+#ifdef MAKING_GSEEN
-+
-+#ifdef malloc
-+#undef malloc
-+#endif
-+#ifdef free
-+#undef free
-+#endif
-+#ifdef realloc
-+#undef realloc
-+#endif
-+
-+#ifdef USE_MEMDEBUG
-+#define my_malloc nmalloc
-+#define my_free nfree
-+#define my_realloc nrealloc
-+#else
-+#define my_malloc malloc
-+#define my_free free
-+#define my_realloc realloc
-+#endif
-+
-+#endif
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/Makefile src/eggdrop-1.8.4/src/mod/gseen.mod/Makefile
---- ./src/mod/gseen.mod/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/Makefile	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,28 @@
-+# Makefile for src/mod/gseen.mod/
-+
-+doofus:
-+	@echo ""
-+	@echo "Let's try this from the right directory..."
-+	@echo ""
-+	@cd ../../../; make
-+
-+clean:
-+	@rm -f *.o *.$(MOD_EXT) *~
-+
-+static: ../gseen.o
-+
-+modules: ../../../gseen.$(MOD_EXT)
-+
-+../gseen.o: ../module.h ../modvals.h ../../eggdrop.h datahandling.c \
-+ gseen.c sensors.c gseencmds.c gseencmds.c do_seen.c ai.c tclcmds.c \
-+ misc.c seentree.c generic_binary_tree.c slang_gseen_commands.c \
-+ slang.c slang_text.c slang_ids.c slang_chanlang.c seenlang.h \
-+ slang_multitext.c gseen.h
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c gseen.c
-+	rm -f ../gseen.o
-+	mv gseen.o ../
-+
-+../../../gseen.$(MOD_EXT): ../gseen.o
-+	$(LD) -o ../../../gseen.$(MOD_EXT) ../gseen.o $(XLIBS)
-+
-+#safety hash
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/misc.c src/eggdrop-1.8.4/src/mod/gseen.mod/misc.c
---- ./src/mod/gseen.mod/misc.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/misc.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,116 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+/* maskstricthost():
-+ * basically the same as maskhost() from src/misc.c, but _never_ stripts
-+ * "~+-^=" off the host
-+ * maskhost() version: * $Id: misc.c,v 1.1 2005/04/14 10:55:00 Administrator Exp $
-+ */
-+static void maskstricthost(const char *s, char *nw)
-+{
-+  register const char *p, *q, *e, *f;
-+  int i;
-+
-+  *nw++ = '*';
-+  *nw++ = '!';
-+  p = (q = strchr(s, '!')) ? q + 1 : s;
-+  /* Strip of any nick, if a username is found, use last 8 chars */
-+  if ((q = strchr(p, '@'))) {
-+    int fl = 0;
-+
-+    if ((q - p) > 9) {
-+      nw[0] = '*';
-+      p = q - 7;
-+      i = 1;
-+    } else
-+      i = 0;
-+    while (*p != '@') {
-+      if (!fl && strchr("~+-^=", *p)) {
-+//        if (strict_host)
-+      nw[i] = '?';
-+//    else
-+//      i--;
-+      } else
-+    nw[i] = *p;
-+      fl++;
-+      p++;
-+      i++;
-+    }
-+    nw[i++] = '@';
-+    q++;
-+  } else {
-+    nw[0] = '*';
-+    nw[1] = '@';
-+    i = 2;
-+    q = s;
-+  }
-+  nw += i;
-+  e = NULL;
-+  /* Now q points to the hostname, i point to where to put the mask */
-+  if ((!(p = strchr(q, '.')) || !(e = strchr(p + 1, '.'))) && !strchr(q, ':'))
-+    /* TLD or 2 part host */
-+    strcpy(nw, q);
-+  else {
-+    if (e == NULL) {        /* IPv6 address?        */
-+      const char *mask_str;
-+
-+      f = strrchr(q, ':');
-+      if (strchr(f, '.')) { /* IPv4 wrapped in an IPv6? */
-+    f = strrchr(f, '.');
-+    mask_str = ".*";
-+      } else            /* ... no, true IPv6.       */
-+    mask_str = ":*";
-+      strncpy(nw, q, f - q);
-+      /* No need to nw[f-q] = 0 here, as the strcpy below will
-+       * terminate the string for us.
-+       */
-+      nw += (f - q);
-+      strcpy(nw, mask_str);
-+    } else {
-+      for (f = e; *f; f++);
-+      f--;
-+      if (*f >= '0' && *f <= '9') { /* Numeric IP address */
-+    while (*f != '.')
-+      f--;
-+    strncpy(nw, q, f - q);
-+    /* No need to nw[f-q] = 0 here, as the strcpy below will
-+     * terminate the string for us.
-+     */
-+    nw += (f - q);
-+    strcpy(nw, ".*");
-+      } else {              /* Normal host >= 3 parts */
-+    /*    a.b.c  -> *.b.c
-+     *    a.b.c.d ->  *.b.c.d if tld is a country (2 chars)
-+     *             OR   *.c.d if tld is com/edu/etc (3 chars)
-+     *    a.b.c.d.e -> *.c.d.e   etc
-+     */
-+    const char *x = strchr(e + 1, '.');
-+
-+    if (!x)
-+      x = p;
-+    else if (strchr(x + 1, '.'))
-+      x = e;
-+    else if (strlen(x) == 3)
-+      x = p;
-+    else
-+      x = e;
-+    sprintf(nw, "*%s", x);
-+      }
-+    }
-+  }
-+}
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/README src/eggdrop-1.8.4/src/mod/gseen.mod/README
---- ./src/mod/gseen.mod/README	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/README	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,139 @@
-+Description:
-+------------
-+
-+gseen.mod is a seen module for eggdrop that tracks not only the users in the
-+bot's userfile, but everyone who enters one of the bots channels.
-+It does pretty much the same as the popular script bseen and has a few
-+additional features like AI-seen and seen-notification.
-+It's also way faster than any corresponding script because scripts are always
-+much slower than modules. Especially scripts that deal with large amount of
-+data often become incredible slow.
-+
-+Installation:
-+-------------
-+
-+gseen.mod is written for eggdrop1.6, but it should also work with eggdrop 1.4.
-+It has been reported to work with eggdrop 1.8, but I did not test it
-+myself on that version.
-+
-+You need the eggdrop source to compile the module.
-+
-+The following instructions assume, ~/eggdrop1.6.2/ is the directory
-+where you installed your eggdrop from. (of course, other source dirs
-+will work as well)
-+
-+Put gseen.mod.1.1.2.tar.gz in ~/eggdrop1.6.2/src/mod/,
-+and unpack it (tar xfz gseen.mod.1.1.2.tar.gz). Change directory
-+back to ~/eggdrop1.6.2/.
-+
-+Now just do what you've done when you compiled your bot:
-+"./configure"
-+"make config" (you can skip this command on eggdrop 1.4)
-+"make"
-+"make install"
-+
-+Don't forget to copy the langfiles from eggdrop1.6.2/src/mod/gseen.mod/ to
-+eggdrop/language.
-+
-+All settings can be found in ~/eggdrop1.6.2/src/mod/gseen.mod/gseen.conf
-+Copy it to your eggdrop directory, edit it to fit your needs and put
-+"source gseen.conf" at the end of your eggdrop config file. The last thing
-+to do is to .rehash your bot.
-+
-+
-+Public commands:
-+----------------
-+
-+!seen <nick>
-+  I think this command doesn't need an explanation. ^_^
-+!seen <mask>
-+  Searches the database for entries that match <mask>
-+  for example "!seen *!user@dialin-*.isp.com"
-+!seennick <nick>
-+  !seen also checks if a user was online later with a
-+  different nick. !seennick only seens for <nick>
-+!seenstats
-+  just a little report on how many nicks are tracked
-+
-+All commands are also accessible via /msg.
-+("/msg <bot> seen <nick>", for example)
-+
-+
-+AI seen:
-+--------
-+
-+This module has a simple built in AI routine.
-+A short example:
-+
-+<G`Quann> Argo: have you seen Fabian recently?
-+<|Argo|> G`Quann, fabian (~fabian@dns.gifs.de) was last seen quitting
-+from #eggdev 1 week 4 days 9 hours 40 minutes 56 seconds ago
-+(20.02. 01:39) stating ".....zzzzZZZzzZZZzZZZZZZZZZZzzz..".
-+
-+Well, it's not a very intelligent AI, it's rather brute-force. So don't
-+forget to use the ai-seen-ignore setting.
-+I know that's not coded very elegant, but if you configure it correctly,
-+the failure-rate is way lower than with other AI scripts...
-+
-+DCC commands:
-+-------------
-+
-+.seen
-+.seennick
-+.seenstats
-+  just the same as the public versions
-+.purgeseens
-+  deletes expired data (this also happens automatically once a day)
-+  (m)
-+
-+Channel Settings:
-+-----------------
-+
-+  +noseendata
-+	don't log any seen data in this channel
-+  +quietseens
-+	send answers directly via notice to the person who asked and
-+	don't bother the rest of the channel with the reply
-+  +quietaiseens
-+	same as +quietseens, but for AI seens
-+  +nopubseens
-+	ignore every seen-command in this channel
-+
-+TCL commands:
-+-------------
-+
-+There are no special tcl commands, only the usual bind procs.
-+
-+The only one that should be mentioned is:
-+
-+*pubm:seen <nick> <uhost> <hand> <chan> <text>
-+  triggers the AI seen
-+  returns: 1 if a reply was sent, 0 otherwise
-+
-+So if you're using another AI script on your bot, you can modify it to
-+use this proc and avoid doubled replies this way.
-+
-+Other:
-+------
-+
-+There is absolutely NO WARRANTY on this module. I do my best to make it
-+work properly, but if anything gets screwed up, I'm not responsible. Use
-+this module at your own risk.
-+
-+Homepage:
-+---------
-+
-+The newest gseen version can always be found at:
-+http://www.kreativrauschen.com/gseen.mod/
-+
-+Thanks to:
-+----------
-+
-+- Fabian for teaching me plenty of things
-+- everyone who tested the many buggy development versions :)
-+- the eggdev team for developing eggdrop
-+
-+Most of all, I would like to thank Bass for writing bseen.tcl because alot
-+of the ideas for this module came from using that tcl script. It's still the
-+most powerful seen script, so if you want something that's easier to use than
-+a module, get a copy of bseen.tcl.
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/seenlang.h src/eggdrop-1.8.4/src/mod/gseen.mod/seenlang.h
---- ./src/mod/gseen.mod/seenlang.h	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/seenlang.h	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,61 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+#define SLPUBPREFIX	getslang(10)
-+#define SLNOTPREFIX	getslang(11)
-+#define SLMSGPREFIX	getslang(12)
-+#define SLDCCPREFIX	getslang(13)
-+
-+#define SLNOPARAM       getslang(54)
-+#define SLMIRROR        getslang(55)
-+#define SLONCHAN        getslang(56)
-+#define SLNOWILDCARDS   getslang(57)
-+#define SLTOOLONGNICK   getslang(58)
-+
-+#define SLNOTSEEN       getslang(65)
-+#define SLPOORSEEN      getslang(66)
-+#define SLNOMATCH       getslang(67)
-+#define SLTOOMANYMATCHES getslang(68)
-+
-+#define SLHANDONCHAN    getslang(73)
-+#define SLONOTHERCHAN   getslang(74)
-+#define SLONEMATCH      getslang(75)
-+#define SLLITTLEMATCHES getslang(76)
-+#define SLMANYMATCHES   getslang(77)
-+
-+#define SLRBOTSAYS      getslang(85)
-+
-+#define SLYEAR          getdur(0)
-+#define SLYEARS         getdur(1)
-+#define SLWEEK          getdur(2)
-+#define SLWEEKS         getdur(3)
-+#define SLDAY           getdur(4)
-+#define SLDAYS          getdur(5)
-+#define SLHOUR          getdur(6)
-+#define SLHOURS         getdur(7)
-+#define SLMINUTE        getdur(8)
-+#define SLMINUTES       getdur(9)
-+#define SLSECOND        getdur(10)
-+#define SLSECONDS       getdur(11)
-+#define SLSOMETIME      getdur(12)
-+
-+#define SLONELOOK       getslang(170)
-+#define SLMORELOOKS     getslang(171)
-+#define SLLASTLOOK      getslang(172)
-+
-+#define SLSEENSTATS     getslang(180)
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/seentree.c src/eggdrop-1.8.4/src/mod/gseen.mod/seentree.c
---- ./src/mod/gseen.mod/seentree.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/seentree.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,213 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+static struct generic_binary_tree seentree;
-+
-+static void seentree_init();
-+static int seentree_expmem();
-+static void seentree_free();
-+static int compareseens(void *, void *);
-+static int expmemseen(void *);
-+static void add_seen(int, char *, char *, char *, char *,
-+                     time_t, int);
-+static void freeseen(void *);
-+static seendat *findseen(char *);
-+static void wildmatch_seens(char *, char *, int);
-+static void process_wildmatch_seens(void *);
-+static void write_seen_tree(void *);
-+static void purge_seen_tree(void *);
-+static int count_seens();
-+static void _count_seens(void *);
-+
-+
-+static void seentree_init()
-+{
-+  seentree.root = NULL;
-+  seentree.comparedata = compareseens;
-+  seentree.expmemdata = expmemseen;
-+  seentree.freedata = freeseen;
-+}
-+
-+static int seentree_expmem()
-+{
-+  return btree_expmem(&seentree);
-+}
-+
-+static void seentree_free()
-+{
-+  btree_freetree(&seentree);
-+  seentree.root = NULL;
-+}
-+
-+static int compareseens(void *first, void *second)
-+{
-+  return rfc_casecmp(((seendat *) first)->nick, ((seendat *) second)->nick);
-+}
-+
-+// add another entry to the tree
-+static void add_seen(int type, char *nick, char *host, char *chan, char *msg,
-+                     time_t when, int spent)
-+{
-+  seendat *newseen;
-+
-+  newseen = nmalloc(sizeof(seendat));
-+  newseen->type = type;
-+  newseen->nick = nmalloc(strlen(nick) + 1);
-+  strcpy(newseen->nick, nick);
-+  newseen->host = nmalloc(strlen(host) + 1);
-+  strcpy(newseen->host, host);
-+  newseen->chan = nmalloc(strlen(chan) + 1);
-+  strcpy(newseen->chan, chan);
-+  newseen->msg = nmalloc(strlen(msg) + 1);
-+  strcpy(newseen->msg, msg);
-+  newseen->when = when;
-+  newseen->spent = spent;
-+  btree_add(&seentree, newseen);
-+}
-+
-+static void freeseen(void *what)
-+{
-+  seendat *s = (seendat *) what;
-+  
-+  Assert(s);
-+  Assert(s->nick);
-+  Assert(s->host);
-+  Assert(s->chan);
-+  Assert(s->msg);
-+
-+  nfree(s->nick);
-+  nfree(s->host);
-+  nfree(s->chan);
-+  nfree(s->msg);
-+  nfree(s);
-+}
-+
-+static int expmemseen(void *what)
-+{
-+  int size = 0;
-+  seendat *d = (seendat *) what;
-+  
-+  size += sizeof(seendat);
-+  size += strlen(d->nick) + 1;
-+  size += strlen(d->host) + 1;
-+  size += strlen(d->chan) + 1;
-+  size += strlen(d->msg) + 1;
-+  return size;
-+}
-+
-+// finds a seen entry in the tree
-+seendat findseen_temp;
-+static seendat *findseen(char *nick)
-+{
-+  findseen_temp.nick = nick;
-+  return btree_get(&seentree, &findseen_temp);
-+}
-+
-+// function to find all nicks that match a host
-+// (calls btree_getall() which calls a target function for each item)
-+// host: user's hostmask (used if search query doesn't contain any wildcards)
-+// mask: search mask
-+// wild: defines if we want to use the mask, or host for the search
-+static char *wildmatch_host, *wildmatch_mask;
-+int wildmatch_wild;
-+static void wildmatch_seens(char *host, char *mask, int wild)
-+{
-+  wildmatch_host = host;
-+  wildmatch_mask = mask;
-+  wildmatch_wild = wild;
-+  btree_getall(&seentree, process_wildmatch_seens);
-+}
-+
-+/* process_wildmatch_seens():
-+ * gets called from the binary tree for each existing item.
-+ */
-+static void process_wildmatch_seens(void *data)
-+{
-+  seendat *s = (seendat *) data;
-+  
-+  if ((numresults > max_matches) && (max_matches > 0)) // Don't return too many
-+    return;                                            // matches...
-+  if (!wildmatch_wild) {
-+    if (wild_match(wildmatch_host, s->host))
-+      add_seenresult(s);
-+  } else {
-+    temp_wildmatch_host = my_realloc(temp_wildmatch_host, strlen(s->nick) + 1 + strlen(s->host) + 1);
-+    strcpy(temp_wildmatch_host, s->nick);
-+    strcat(temp_wildmatch_host, "!");
-+    strcat(temp_wildmatch_host, s->host);
-+    if (wild_match(wildmatch_mask, s->nick) || wild_match(wildmatch_mask, temp_wildmatch_host))
-+      add_seenresult(s);
-+  }
-+}
-+
-+// write seendata in the datafile
-+FILE *write_seen_tree_target;
-+static void write_seen_tree(void *data)
-+{
-+  seendat *node = (seendat *) data;
-+  
-+  /* format: "! nick host chan type when spent msg" */
-+  fprintf(write_seen_tree_target, "! %s %s %s %d %lu %d %s\n", node->nick,
-+          node->host, node->chan, node->type, node->when, node->spent,
-+          node->msg);
-+}
-+
-+// recursive function to remove old data
-+// QUESTION: What happens if one of the nodes get moved by killseen()?
-+//           Possible bug/crash?
-+//           I think it should not be a problem. When killseen() is called the
-+//           first time, recursion already reached its end and no pointers
-+//           are accessed anymore. But I'm not sure... maybe I'm wrong.
-+static void purge_seen_tree(void *data)
-+{
-+  seendat *node = (seendat *) data;
-+  
-+  if ((now - node->when) > (expire_seens * 86400)) {
-+    debug1("seen data for %s has expired.", node->nick);
-+    btree_remove(&seentree, node);
-+  }
-+}
-+
-+// counts the number of nicks in the database
-+static int count_seens_temp;
-+static int count_seens()
-+{
-+  count_seens_temp = 0;
-+  btree_getall(&seentree, _count_seens);
-+  return count_seens_temp;
-+}
-+
-+static void _count_seens(void *node)
-+{
-+  count_seens_temp++;
-+}
-+
-+static int tcl_killseen STDVAR
-+{
-+  Context;
-+  BADARGS(2, 2, " nick");
-+  findseen_temp.nick = argv[1];
-+  btree_remove(&seentree, &findseen_temp);
-+  return TCL_OK;
-+}
-+
-+static tcl_cmds seendebugtcls[] =
-+{
-+  {"killseen", tcl_killseen},
-+  {0, 0}
-+};
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/sensors.c src/eggdrop-1.8.4/src/mod/gseen.mod/sensors.c
---- ./src/mod/gseen.mod/sensors.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/sensors.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,273 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+static int get_spent(char *nick, char *chan)
-+{
-+  struct chanset_t *ch = NULL;
-+  memberlist *m = NULL;
-+
-+  int spent;
-+  ch = findchan_by_dname(chan);
-+  if (ch)
-+    m = ismember(ch, nick);
-+  if (m && m->joined)
-+    spent = now - m->joined;
-+  else
-+    spent = -1;
-+  return spent;
-+}
-+
-+static int secretchan(char *chan)
-+{
-+  struct chanset_t *ch;
-+
-+  ch = findchan_by_dname(chan);
-+  if (!ch)
-+    return 0;
-+  if (ch->status & CHAN_SECRET)
-+    return 1;
-+  return 0;
-+}
-+
-+static int nolog(char *chan)
-+{
-+  char buf[121], *b;
-+
-+  Context;
-+  strncpy(buf, no_log, 120);
-+  buf[120] = 0;
-+  b = buf;
-+  while (b[0])
-+    if (!strcasecmp(chan, newsplit(&b)))
-+      return 1;
-+#if EGG_IS_MIN_VER(10503)
-+  if (ngetudef("noseendata", chan))
-+    return 1;
-+#endif
-+  return 0;
-+}
-+
-+static int gseen_join(char *nick, char *uhost, char *hand, char *chan)
-+{
-+  char buf[10] = "[secret]";
-+
-+  Context;
-+  if (nolog(chan))
-+    return 0;
-+  if (use_handles && (hand[0] != '*'))
-+    nick = hand;
-+  if (secretchan(chan))
-+    chan = buf;
-+  add_seen(SEEN_JOIN, nick, uhost, chan, "", now, get_spent(nick, chan));
-+  report_seenreq(chan, nick);
-+  if ((hand[0] == '*') && strcasecmp(nick, hand))
-+    report_seenreq(chan, hand);
-+  return 0;
-+}
-+
-+static int gseen_kick(char *nick, char *uhost, char *hand, char *chan,
-+		       char *victim, char *reason)
-+{
-+  struct chanset_t *ch = NULL;
-+  memberlist *m = NULL;
-+  char msg[1024], *s;
-+  char buf[10] = "[secret]";
-+
-+  Context;
-+  if (nolog(chan))
-+    return 0;
-+  if (use_handles && (hand[0] != '*'))
-+    nick = hand;
-+  ch = findchan_by_dname(chan);
-+  if (!ch) {
-+    debug2("Unable to seen %s getting kicked from %s", victim, chan);
-+    return 0;
-+  }
-+  if (secretchan(chan))
-+    chan = buf;
-+  s = msg;
-+  s[0] = 0;
-+  m = ismember(ch, victim);
-+  if (!m) {
-+    debug2("Unable to seen %s getting kicked from %s", victim, chan);
-+    return 0;
-+  }
-+  if ((strlen(nick) + strlen(reason) + 2) < 1024)
-+    sprintf(s, "%s %s", nick, reason);
-+  add_seen(SEEN_KICK, victim, m->userhost, chan, s, now,
-+  	   get_spent(victim, chan));
-+  return 0;
-+}
-+
-+static int gseen_nick(char *nick, char *uhost, char *hand, char *chan,
-+		       char *newnick)
-+{
-+  char buf[10] = "[secret]";
-+
-+  Context;
-+  if (nolog(chan))
-+    return 0;
-+  if (use_handles && (hand[0] != '*'))
-+    nick = hand;
-+  if (secretchan(chan))
-+    chan = buf;
-+  add_seen(SEEN_NICK, nick, uhost, chan, newnick, now, get_spent(nick, chan));
-+  if (!(use_handles && (hand[0] != '*')))
-+    add_seen(SEEN_NCKF, newnick, uhost, chan, nick, now, get_spent(nick, chan));
-+  report_seenreq(chan, newnick);
-+  if ((hand[0] != '*') && strcasecmp(newnick, hand))
-+    report_seenreq(chan, hand);
-+  return 0;
-+}
-+
-+#if EGG_IS_MIN_VER(10502)
-+static int gseen_part(char *nick, char *uhost, char *hand, char *chan,
-+		       char *reason)
-+{
-+  char buf[10] = "[secret]";
-+
-+  Context;
-+  if (nolog(chan))
-+    return 0;
-+  if (use_handles && (hand[0] != '*'))
-+    nick = hand;
-+  if (secretchan(chan))
-+    chan = buf;
-+  add_seen(SEEN_PART, nick, uhost, chan, reason, now, get_spent(nick, chan));
-+  return 0;
-+}
-+#else
-+static int gseen_part(char *nick, char *uhost, char *hand, char *chan)
-+{
-+  char buf[10] = "[secret]";
-+
-+  Context;
-+  if (nolog(chan))
-+    return 0;
-+  if (use_handles && (hand[0] != '*'))
-+    nick = hand;
-+  if (secretchan(chan))
-+    chan = buf;
-+  add_seen(SEEN_PART, nick, uhost, chan, "", now, get_spent(nick, chan));
-+  return 0;
-+}
-+#endif
-+
-+static int gseen_sign(char *nick, char *uhost, char *hand, char *chan,
-+		       char *reason)
-+{
-+  char buf[10] = "[secret]";
-+
-+  Context;
-+  if (nolog(chan))
-+    return 0;
-+  if (use_handles && (hand[0] != '*'))
-+    nick = hand;
-+  if (secretchan(chan))
-+    chan = buf;
-+  add_seen(SEEN_SIGN, nick, uhost, chan, reason, now, get_spent(nick, chan));
-+  return 0;
-+}
-+
-+static int gseen_splt(char *nick, char *uhost, char *hand, char *chan)
-+{
-+  char buf[10] = "[secret]";
-+
-+  Context;
-+  if (nolog(chan))
-+    return 0;
-+  if (use_handles && (hand[0] != '*'))
-+    nick = hand;
-+  if (secretchan(chan))
-+    chan = buf;
-+  add_seen(SEEN_SPLT, nick, uhost, chan, "", now, get_spent(nick, chan));
-+  return 0;
-+}
-+
-+static int gseen_rejn(char *nick, char *uhost, char *hand, char *chan)
-+{
-+  char buf[10] = "[secret]";
-+
-+  Context;
-+  if (nolog(chan))
-+    return 0;
-+  if (use_handles && (hand[0] != '*'))
-+    nick = hand;
-+  if (secretchan(chan))
-+    chan = buf;
-+  add_seen(SEEN_REJN, nick, uhost, chan, "", now, get_spent(nick, chan));
-+  return 0;
-+}
-+
-+static int gseen_chjn STDVAR
-+{
-+  Context;
-+  BADARGS(7, 7, " bot hand chan flag idx host");
-+  add_seen(SEEN_CHJN, argv[2], argv[6], argv[3], argv[1], now, -1);
-+  return 0;
-+}
-+
-+static int gseen_chpt STDVAR
-+{
-+  Context;
-+  BADARGS(5, 5, " bot hand idx chan");
-+  add_seen(SEEN_CHPT, argv[2], "unknown", argv[4], argv[1], now, -1);
-+  return 0;
-+}
-+
-+static cmd_t seen_kick[] =
-+{
-+  {"*", "", (Function) gseen_kick, "gseen"},
-+  {0, 0, 0, 0}
-+};
-+
-+static cmd_t seen_nick[] =
-+{
-+  {"*", "", (Function) gseen_nick, "gseen"},
-+  {0, 0, 0, 0}
-+};
-+
-+static cmd_t seen_join[] =
-+{
-+  {"*", "", (Function) gseen_join, "gseen"},
-+  {0, 0, 0, 0}
-+};
-+
-+static cmd_t seen_part[] =
-+{
-+  {"*", "", (Function) gseen_part, "gseen"},
-+  {0, 0, 0, 0}
-+};
-+
-+static cmd_t seen_sign[] =
-+{
-+  {"*", "", (Function) gseen_sign, "gseen"},
-+  {0, 0, 0, 0}
-+};
-+
-+static cmd_t seen_splt[] =
-+{
-+  {"*", "", (Function) gseen_splt, "gseen"},
-+  {0, 0, 0, 0}
-+};
-+
-+static cmd_t seen_rejn[] =
-+{
-+  {"*", "", (Function) gseen_rejn, "gseen"},
-+  {0, 0, 0, 0}
-+};
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/slang.c src/eggdrop-1.8.4/src/mod/gseen.mod/slang.c
---- ./src/mod/gseen.mod/slang.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/slang.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,309 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+static struct slang_header *slang_find(struct slang_header *, char *);
-+
-+#include "slang_text.c"
-+#include "slang_multitext.c"
-+#include "slang_ids.c"
-+#ifndef SLANG_NOTYPES
-+#include "slang_types.c"
-+#endif
-+#include "slang_duration.c"
-+#ifndef SLANG_NOFACTS
-+#include "slang_facts_places.c"
-+#include "slang_facts.c"
-+#endif
-+#include "slang_chanlang.c"
-+
-+
-+struct slang_header {
-+  struct slang_header *next;
-+  char *lang;
-+  char *desc;
-+  struct slang_id *ids;
-+#ifndef SLANG_NOTYPES
-+  struct slang_type *types;
-+#endif
-+  struct slang_duration *durations;
-+};
-+
-+static void slang_glob_init()
-+{
-+  glob_slang_cmd_list = NULL;
-+}
-+
-+static int slang_glob_expmem()
-+{
-+  return slang_commands_list_expmem(glob_slang_cmd_list);
-+}
-+
-+static void slang_glob_free()
-+{
-+  slang_commands_list_free(glob_slang_cmd_list);
-+  glob_slang_cmd_list = NULL;
-+}
-+
-+static struct slang_header *slang_create(struct slang_header *list, char *lang, char *desc)
-+{
-+  struct slang_header *nslang, *l;
-+
-+  Assert(lang);
-+  debug2("Creating language '%s' starting by %d", lang, (int) list);
-+  for (nslang = list; nslang; nslang = nslang->next)
-+    if (!strcasecmp(nslang->lang, lang))
-+      return list;
-+  nslang = nmalloc(sizeof(struct slang_header));
-+  nslang->next = NULL;
-+  nslang->desc = NULL;
-+  nslang->lang = nmalloc(strlen(lang) + 1);
-+  strcpy(nslang->lang, lang);
-+  nslang->desc = nmalloc(strlen(desc) + 1);
-+  strcpy(nslang->desc, desc);
-+  nslang->ids = NULL;
-+#ifndef SLANG_NOTYPES
-+  nslang->types = NULL;
-+#endif
-+  nslang->durations = NULL;
-+  for (l = list; l && l->next; l = l->next);
-+  if (l)
-+    l->next = nslang;
-+  else {
-+    Assert(!list);
-+    list = nslang;
-+  }
-+  return list;
-+}
-+
-+static int slang_expmem(struct slang_header *what)
-+{
-+  int size = 0;
-+
-+  while (what) {
-+    size += sizeof(struct slang_header);
-+    size += strlen(what->lang) + 1;
-+    size += strlen(what->desc) + 1;
-+    size += slang_id_expmem(what->ids);
-+#ifndef SLANG_NOTYPES
-+    size += slang_type_expmem(what->types);
-+#endif
-+    size += slang_duration_expmem(what->durations);
-+    what = what->next;
-+  }
-+  return size;
-+}
-+
-+static void slang_free(struct slang_header *what)
-+{
-+  struct slang_header *next;
-+
-+  while (what) {
-+    next = what->next;
-+    slang_id_free(what->ids);
-+#ifndef SLANG_NOTYPES
-+    slang_type_free(what->types);
-+#endif
-+    slang_duration_free(what->durations);
-+    nfree(what->lang);
-+    nfree(what->desc);
-+    nfree(what);
-+    what = next;
-+  }
-+}
-+
-+static int slang_load(struct slang_header *slang, char *filename)
-+{
-+  FILE *f;
-+  char *buffer, *s;
-+  char *cmd, *sid, *strtol_ret;
-+#ifndef SLANG_NOTYPES
-+  char *type;
-+#endif
-+  int line, id;
-+
-+  Assert(slang);
-+  putlog(LOG_MISC, "*", "Loading language \"%s\" from %s...", slang->lang, filename);
-+  f = fopen(filename, "r");
-+  if (!f) {
-+    putlog(LOG_MISC, "*", "Couldn't open slangfile \"%s\"!", filename);
-+    return 0;
-+  }
-+  buffer = nmalloc(2000);
-+  line = 0;
-+  while (!feof(f)) {
-+    s = buffer;
-+    if (fgets(s, 2000, f)) {
-+      line++;
-+      // at first, kill those stupid line feeds and carriage returns...
-+      if (s[strlen(s) - 1] == '\n')
-+        s[strlen(s) - 1] = 0;
-+      if (s[strlen(s) - 1] == '\r')
-+        s[strlen(s) - 1] = 0;
-+      if (!s[0])
-+        continue;
-+      cmd = newsplit(&s);
-+
-+      if (!strcasecmp(cmd, "T")) {
-+#ifndef SLANG_NOTYPES
-+        type = newsplit(&s);
-+        slang->types = slang_type_add(slang->types, type, s);
-+#endif
-+      } else if (!strcasecmp(cmd, "D")) {
-+        sid = newsplit(&s);
-+        id = strtol(sid, &strtol_ret, 10);
-+        if (strtol_ret == sid) {
-+          putlog(LOG_MISC, "*", "ERROR in slangfile \"%s\", line %d: %s is not a valid "
-+                 "duration index!", filename, line, sid);
-+          continue;
-+        }
-+        slang->durations = slang_duration_add(slang->durations, id, s);
-+      } else {
-+        id = strtol(cmd, &strtol_ret, 10);
-+        if (strtol_ret == cmd)
-+          continue;
-+        slang->ids = slang_id_add(slang->ids, id, s);
-+      }
-+    }
-+  }
-+  fclose(f);
-+  nfree(buffer);
-+  return 1;
-+}
-+
-+static struct slang_header *slang_find(struct slang_header *where, char *language)
-+{
-+  struct slang_header *slang = NULL;
-+
-+  // at first, search for the specified language
-+  for (slang = where; slang; slang = slang->next)
-+    if (!strcasecmp(slang->lang, language))
-+      return slang;
-+  // oops... language seems to be invalid. Let's find the default.
-+  Assert(default_slang);
-+  for (slang = where; slang; slang = slang->next)
-+    if (!strcasecmp(slang->lang, default_slang))
-+      return slang;
-+  // default_slang wasn't found either? *sigh*
-+  // Let's return the first known language then.
-+  return where;
-+}
-+
-+#ifndef SLANG_NOVALIDATE
-+/* slang_valid():
-+ * check if the given language is a valid one
-+ */
-+static int slang_valid(struct slang_header *where, char *language)
-+{
-+  struct slang_header *slang = NULL;
-+
-+  for (slang = where; slang; slang = slang->next)
-+    if (!strcasecmp(slang->lang, language))
-+      return 1;
-+  return 0;
-+}
-+#endif
-+
-+static char getslang_error[12];
-+static char *getslang(int id)
-+{
-+  char *text;
-+
-+  if (!glob_slang) {
-+    putlog(LOG_MISC, "*", "WARNING! No language selected! (getslang())");
-+    return "NOLANG";
-+  }
-+  text = slang_id_get(glob_slang->ids, id);
-+  if (!text) {
-+    snprintf(getslang_error, sizeof(getslang_error), "SLANG%d", id);
-+    return getslang_error;
-+  }
-+  return text;
-+}
-+
-+static char *getdur(int idx)
-+{
-+  char *text;
-+
-+  Assert((idx >= 0) && (idx < DURATIONS));
-+  if (!glob_slang) {
-+    putlog(LOG_MISC, "*", "WARNING! No language selected! (getdur())");
-+    return "NOLANG";
-+  }
-+  text = slang_duration_get(glob_slang->durations, idx);
-+  if (!text) {
-+    snprintf(getslang_error, sizeof(getslang_error), "DUR%d", idx);
-+    return getslang_error;
-+  }
-+  return text;
-+}
-+
-+#ifndef SLANG_NOTYPES
-+static char *getslangtype(char *type)
-+{
-+  char *stype;
-+
-+  if (!glob_slang) {
-+    putlog(LOG_MISC, "*", "WARNING! No language selected! (getslangtype())");
-+    return "NOLANG";
-+  }
-+  stype = slang_type_get(glob_slang->types, type);
-+  if (stype)
-+    return stype;
-+  else
-+    return type;
-+}
-+
-+static int slangtypetoi(char *slangtype)
-+{
-+  char *type;
-+
-+  if (!glob_slang) {
-+    putlog(LOG_MISC, "*", "WARNING! No language selected! (slangtypetoi())");
-+    return T_ERROR;
-+  }
-+  type = slang_type_slang2type(glob_slang->types, slangtype);
-+  if (type) {
-+    debug1("type: %s", type);
-+    return typetoi(type);
-+  } else
-+    return typetoi(slangtype);
-+}
-+#endif
-+
-+#ifndef SLANG_NOGETALL
-+static char *getslang_first(int id)
-+{
-+  char *text;
-+
-+  if (!glob_slang) {
-+    putlog(LOG_MISC, "*", "WARNING! No language selected! (getslang())");
-+    return "NOLANG";
-+  }
-+  text = slang_id_get_first(glob_slang->ids, id);
-+  if (!text) {
-+    snprintf(getslang_error, sizeof(getslang_error), "SLANG%d", id);
-+    return getslang_error;
-+  }
-+  return text;
-+}
-+
-+static char *getslang_next()
-+{
-+  return slang_id_get_next();
-+}
-+#endif
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/slang_chanlang.c src/eggdrop-1.8.4/src/mod/gseen.mod/slang_chanlang.c
---- ./src/mod/gseen.mod/slang_chanlang.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/slang_chanlang.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,113 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+struct slang_chanlang {
-+  struct slang_chanlang *next;
-+  char *chan;
-+  char *lang;
-+};
-+
-+static struct slang_chanlang *chanlangs = NULL;
-+
-+static struct slang_chanlang *slang_chanlang_add(struct slang_chanlang *, char *, char *);
-+static int slang_chanlang_expmem(struct slang_chanlang *);
-+static void slang_chanlang_free(struct slang_chanlang *);
-+static char *slang_chanlang_get(struct slang_chanlang *, char *);
-+
-+static struct slang_chanlang *slang_chanlang_add(struct slang_chanlang *where, char *chan, char *lang)
-+{
-+  struct slang_chanlang *item;
-+
-+  for (item = where; item; item = item->next)
-+    if (!rfc_casecmp(item->chan, chan))
-+      break;
-+  if (!item) {
-+    item = nmalloc(sizeof(struct slang_chanlang));
-+    item->chan = nmalloc(strlen(chan) + 1);
-+    strcpy(item->chan, chan);
-+    item->lang = nmalloc(strlen(lang) + 1);
-+    strcpy(item->lang, lang);
-+    item->next = where;
-+    where = item;
-+  } else {
-+    Assert(item->lang);
-+    item->lang = nrealloc(item->lang, strlen(lang) + 1);
-+    strcpy(item->lang, lang);
-+  }
-+  return where;
-+}
-+
-+static int slang_chanlang_expmem(struct slang_chanlang *what)
-+{
-+  int size = 0;
-+
-+  while (what) {
-+    Assert(what);
-+    Assert(what->chan);
-+    Assert(what->lang);
-+    size += sizeof(struct slang_chanlang);
-+    size += strlen(what->chan) + 1;
-+    size += strlen(what->lang) + 1;
-+    what = what->next;
-+  }
-+  return size;
-+}
-+
-+static void slang_chanlang_free(struct slang_chanlang *what)
-+{
-+  struct slang_chanlang *next;
-+
-+  while (what) {
-+    Assert(what);
-+    Assert(what->chan);
-+    Assert(what->lang);
-+    next = what->next;
-+    nfree(what->chan);
-+    nfree(what->lang);
-+    nfree(what);
-+    what = next;
-+  }
-+}
-+
-+static char *slang_chanlang_get(struct slang_chanlang *where, char *chan)
-+{
-+  while (where) {
-+    if (!rfc_casecmp(where->chan, chan))
-+      return where->lang;
-+    where = where->next;
-+  }
-+  return default_slang;
-+}
-+
-+/* slang_getbynick():
-+ * tries to find an appropriate language for nick by searching
-+ * him on a channel and using the language of this channel.
-+ */
-+static struct slang_header *slang_getbynick(struct slang_header *where, char *nick)
-+{
-+  struct chanset_t *chan;
-+
-+  for (chan = chanset; chan; chan = chan->next)
-+    if (ismember(chan, nick))
-+#if EGG_IS_MIN_VER(10500)
-+      return slang_find(where, slang_chanlang_get(chanlangs, chan->dname));
-+#else
-+      return slang_find(where, slang_chanlang_get(chanlangs, chan->name));
-+#endif
-+  return slang_find(where, default_slang);
-+}
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/slang_duration.c src/eggdrop-1.8.4/src/mod/gseen.mod/slang_duration.c
---- ./src/mod/gseen.mod/slang_duration.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/slang_duration.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,82 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+#define DURATIONS 13
-+
-+struct slang_duration {
-+  char *durs[DURATIONS];
-+};
-+
-+static struct slang_duration *slang_duration_add(struct slang_duration *where, int idx, char *text)
-+{
-+  int i;
-+
-+  if ((idx < 0) || (idx >= DURATIONS)) {
-+    putlog(LOG_MISC, "*", "Warning: Invalid duration index \"%d\".", idx);
-+    return where;
-+  }
-+  debug2("Adding duration[%d]: %s", idx, text);
-+  if (!where) {
-+    where = nmalloc(sizeof(struct slang_duration));
-+    for (i = 0; i < DURATIONS; i++)
-+      where->durs[i] = NULL;
-+  }
-+  if (where->durs[idx])
-+    nfree(where->durs[idx]);
-+  where->durs[idx] = nmalloc(strlen(text) + 1);
-+  strcpy(where->durs[idx], text);
-+  return where;
-+}
-+
-+static int slang_duration_expmem(struct slang_duration *what)
-+{
-+  int i, size = 0;
-+
-+  if (!what)
-+    return 0;
-+  size += sizeof(struct slang_duration);
-+  for (i = 0; i < DURATIONS; i++)
-+    if (what->durs[i])
-+      size += strlen(what->durs[i]) + 1;
-+  return size;
-+}
-+
-+static void slang_duration_free(struct slang_duration *what)
-+{
-+  int i;
-+
-+  if (what) {
-+    for (i = 0; i < DURATIONS; i++)
-+      if (what->durs[i])
-+        nfree(what->durs[i]);
-+    nfree(what);
-+  }
-+}
-+
-+static char *slang_duration_get(struct slang_duration *where, int idx)
-+{
-+  if (!where) {
-+    debug0("no where");
-+    return NULL;
-+  }
-+  if ((idx < 0) || (idx >= DURATIONS)) {
-+    debug1("invalid duration index: %d", idx);
-+    return NULL;
-+  }
-+  return where->durs[idx];
-+}
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/slang_gseen_commands.c src/eggdrop-1.8.4/src/mod/gseen.mod/slang_gseen_commands.c
---- ./src/mod/gseen.mod/slang_gseen_commands.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/slang_gseen_commands.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,235 @@
-+static void slang_send_botnick()
-+{
-+  strncat(slang_text_buf, botname, sizeof(slang_text_buf));
-+}
-+
-+static void slang_send_query()
-+{
-+  if (glob_query)
-+    strncat(slang_text_buf, glob_query, sizeof(slang_text_buf));
-+}
-+
-+static void slang_send_laston()
-+{
-+  if (glob_laston)
-+    strncat(slang_text_buf, glob_laston, sizeof(slang_text_buf));
-+}
-+
-+static void slang_send_otherchan()
-+{
-+  if (glob_otherchan)
-+    strncat(slang_text_buf, glob_otherchan, sizeof(slang_text_buf));
-+}
-+
-+static void slang_send_othernick()
-+{
-+  if (glob_othernick)
-+    strncat(slang_text_buf, glob_othernick, sizeof(slang_text_buf));
-+}
-+
-+static void slang_send_remotebot()
-+{
-+  if (glob_remotebot)
-+    strncat(slang_text_buf, glob_remotebot, sizeof(slang_text_buf));
-+}
-+
-+static void slang_send_snick()
-+{
-+  if (glob_seendat)
-+    strncat(slang_text_buf, glob_seendat->nick, sizeof(slang_text_buf));
-+}
-+
-+static void slang_send_shost()
-+{
-+  if (glob_seendat)
-+    strncat(slang_text_buf, glob_seendat->host, sizeof(slang_text_buf));
-+}
-+
-+static void slang_send_schan()
-+{
-+  if (glob_seendat)
-+    strncat(slang_text_buf, glob_seendat->chan, sizeof(slang_text_buf));
-+}
-+
-+static void slang_send_swhen()
-+{
-+  char *dur;
-+
-+  if (glob_seendat) {
-+    dur = gseen_duration(now - glob_seendat->when);
-+    strncat(slang_text_buf, dur, sizeof(slang_text_buf));
-+  }
-+}
-+
-+static void slang_send_stime()
-+{
-+  time_t tt;
-+  char t[20];
-+  
-+  if (glob_seendat) {
-+    tt = glob_seendat->when;
-+    strftime(t, 19, "%d.%m. %H:%M", localtime(&tt));
-+    strncat(slang_text_buf, t, sizeof(slang_text_buf));
-+  }
-+}
-+
-+static void slang_send_spent()
-+{
-+  char *dur;
-+
-+  if (glob_seendat) {
-+    dur = gseen_duration(glob_seendat->spent);
-+    strncat(slang_text_buf, dur, sizeof(slang_text_buf));
-+  }
-+}
-+
-+static void slang_send_smsg()
-+{
-+  if (glob_seendat)
-+    strncat(slang_text_buf, glob_seendat->msg, sizeof(slang_text_buf));
-+}
-+
-+static void slang_send_numresults()
-+{
-+  char buf[7];
-+  
-+  snprintf(buf, sizeof(buf), "%d", numresults);
-+  strncat(slang_text_buf, buf, sizeof(slang_text_buf));
-+}
-+
-+static void slang_send_punisher()
-+{
-+  char *reason;
-+  int len;
-+  
-+  if (glob_seendat) {
-+    reason = strchr(glob_seendat->msg, ' ');
-+    if (!reason)
-+      strncat(slang_text_buf, glob_seendat->msg, sizeof(slang_text_buf));
-+    else {
-+      len = (int) reason - (int) glob_seendat->msg;
-+      strncat(slang_text_buf, glob_seendat->msg, (sizeof(slang_text_buf) < len) ? sizeof(slang_text_buf) : len);
-+    }
-+  }
-+}
-+
-+static void slang_send_kickreason()
-+{
-+  char *reason;
-+  
-+  if (glob_seendat) {
-+    reason = strchr(glob_seendat->msg, ' ');
-+    if (reason)
-+      strncat(slang_text_buf, reason, sizeof(slang_text_buf));
-+  }
-+}
-+
-+static void slang_send_rnick()
-+{
-+  if (glob_seenrequest) {
-+    Assert(glob_seenrequest->by);
-+    Assert(glob_seenrequest->by->who);
-+    strncat(slang_text_buf, glob_seenrequest->by->who, sizeof(slang_text_buf));
-+  }
-+}
-+
-+static void slang_send_rchan()
-+{
-+  if (glob_seenrequest) {
-+    Assert(glob_seenrequest->by);
-+    Assert(glob_seenrequest->by->chan);
-+    strncat(slang_text_buf, glob_seenrequest->by->chan, sizeof(slang_text_buf));
-+  }
-+}
-+
-+static void slang_send_rhost()
-+{
-+  if (glob_seenrequest) {
-+    Assert(glob_seenrequest->by);
-+    Assert(glob_seenrequest->by->host);
-+    strncat(slang_text_buf, glob_seenrequest->by->host, sizeof(slang_text_buf));
-+  }
-+}
-+
-+static void slang_send_rtime()
-+{
-+  time_t tt;
-+  char t[20];
-+  
-+  if (glob_seenrequest) {
-+    Assert(glob_seenrequest->by);
-+    tt = glob_seenrequest->by->when;
-+    strftime(t, sizeof(t), "%d.%m. %H:%M", localtime(&tt));
-+    strncat(slang_text_buf, t, sizeof(slang_text_buf));
-+  }
-+}
-+
-+static void slang_send_rwhen()
-+{
-+  if (glob_seenrequest) {
-+    Assert(glob_seenrequest->by);
-+    strncat(slang_text_buf, gseen_duration(now - glob_seenrequest->by->when), sizeof(slang_text_buf));
-+  }
-+}
-+
-+static void slang_send_requests()
-+{
-+  char buf[7];
-+  
-+  snprintf(buf, sizeof(buf), "%d", glob_seenrequests);
-+  strncat(slang_text_buf, buf, sizeof(slang_text_buf));
-+}
-+
-+static void slang_send_totalnicks()
-+{
-+  char buf[7];
-+  
-+  snprintf(buf, sizeof(buf), "%d", glob_totalnicks);
-+  strncat(slang_text_buf, buf, sizeof(slang_text_buf));
-+}
-+
-+static void slang_send_totalbytes()
-+{
-+  char buf[20];
-+  
-+  snprintf(buf, sizeof(buf), "%d", glob_totalbytes);
-+  strncat(slang_text_buf, buf, sizeof(slang_text_buf));
-+}
-+
-+static void slang_send_nick()
-+{
-+  if (glob_nick)
-+    strncat(slang_text_buf, glob_nick, sizeof(slang_text_buf));
-+}
-+
-+struct slang_text_commands slang_text_gseen_command_table[] =
-+{
-+  {"botnick", slang_send_botnick},
-+  {"query", slang_send_query},
-+  {"laston", slang_send_laston},
-+  {"otherchan", slang_send_otherchan},
-+  {"othernick", slang_send_othernick},
-+  {"remotebot", slang_send_remotebot},
-+  {"snick", slang_send_snick},
-+  {"swhen", slang_send_swhen},
-+  {"stime", slang_send_stime},
-+  {"shost", slang_send_shost},
-+  {"schan", slang_send_schan},
-+  {"spent", slang_send_spent},
-+  {"smsg", slang_send_smsg},
-+  {"numresults", slang_send_numresults},
-+  {"snick2", slang_send_smsg},
-+  {"bnbot", slang_send_smsg},
-+  {"punisher", slang_send_punisher},
-+  {"kickreason", slang_send_kickreason},
-+  {"rnick", slang_send_rnick},
-+  {"rchan", slang_send_rchan},
-+  {"rhost", slang_send_rhost},
-+  {"rtime", slang_send_rtime},
-+  {"rwhen", slang_send_rwhen},
-+  {"requests", slang_send_requests},
-+  {"totalnicks", slang_send_totalnicks},
-+  {"totalbytes", slang_send_totalbytes},
-+  {"nick", slang_send_nick},
-+  {0, 0}
-+};
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/slang_ids.c src/eggdrop-1.8.4/src/mod/gseen.mod/slang_ids.c
---- ./src/mod/gseen.mod/slang_ids.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/slang_ids.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,104 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+struct slang_id {
-+  struct slang_id *next;
-+  int id;
-+  struct slang_multitext *mtext;
-+};
-+
-+static struct slang_id* slang_id_add(struct slang_id *, int, char *);
-+static int slang_id_expmem(struct slang_id *);
-+static void slang_id_free(struct slang_id *);
-+static char *slang_id_get(struct slang_id *, int);
-+
-+static struct slang_id* slang_id_add(struct slang_id *where, int id, char *text)
-+{
-+  struct slang_id *newitem;
-+
-+  newitem = NULL;
-+  if (where) {
-+    for (newitem = where; newitem; newitem = newitem->next)
-+      if (newitem->id == id)
-+        break;
-+  }
-+  if (!newitem) {
-+    newitem = nmalloc(sizeof(struct slang_id));
-+    newitem->next = NULL;
-+    newitem->id = id;
-+    newitem->mtext = NULL;
-+    if (where)
-+      newitem->next = where;
-+    else
-+      newitem->next = NULL;
-+    where = newitem;
-+  }
-+  newitem->mtext = slang_mtext_add(newitem->mtext, text);
-+  return where;
-+}
-+
-+static int slang_id_expmem(struct slang_id *what)
-+{
-+  int size = 0;
-+
-+  for (; what; what = what->next) {
-+    size += sizeof(struct slang_id);
-+    size += slang_multitext_expmem(what->mtext);
-+  }
-+  return size;
-+}
-+
-+static void slang_id_free(struct slang_id *what)
-+{
-+  struct slang_id *next;
-+
-+  while (what) {
-+    next = what->next;
-+    slang_multitext_free(what->mtext);
-+    nfree(what);
-+    what = next;
-+  }
-+}
-+
-+static char *slang_id_get(struct slang_id *where, int i)
-+{
-+  while (where) {
-+    if (where->id == i)
-+      return slang_multitext_getrandomtext(where->mtext);
-+    where = where->next;
-+  }
-+  return NULL;
-+}
-+
-+#ifndef SLANG_NOGETALL
-+static char *slang_id_get_first(struct slang_id *where, int id)
-+{
-+  while (where) {
-+    if (where->id == id) {
-+      return slang_multitext_get_first(where->mtext);
-+    }
-+    where = where->next;
-+  }
-+  return NULL;
-+}
-+
-+static char *slang_id_get_next()
-+{
-+  return slang_multitext_get_next();
-+}
-+#endif
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/slang_multitext.c src/eggdrop-1.8.4/src/mod/gseen.mod/slang_multitext.c
---- ./src/mod/gseen.mod/slang_multitext.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/slang_multitext.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,151 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+struct slang_mt_content {
-+  struct slang_mt_content *next;
-+  struct slang_text *text;
-+};
-+
-+struct slang_multitext {
-+  int nr;
-+  struct slang_mt_content *contents;
-+};
-+
-+static struct slang_multitext *slang_mtext_add(struct slang_multitext *, char *);
-+static int slang_multitext_expmem(struct slang_multitext *);
-+static void slang_multitext_free(struct slang_multitext *);
-+static char *slang_multitext_getrandomtext(struct slang_multitext *);
-+#ifndef SLANG_NOTYPES
-+static struct slang_text *slang_multitext_find(struct slang_multitext *, char *);
-+#endif
-+#ifndef SLANG_NOGETALL
-+static char *slang_multitext_get_first(struct slang_multitext *);
-+static char *slang_multitext_get_next();
-+#endif
-+
-+static struct slang_multitext *slang_mtext_add(struct slang_multitext *where, char *text)
-+{
-+  struct slang_mt_content *oc, *nc;
-+
-+  if (!where) {
-+    where = nmalloc(sizeof(struct slang_multitext));
-+    where->nr = 0;
-+    where->contents = NULL;
-+  }
-+  nc = nmalloc(sizeof(struct slang_mt_content));
-+  nc->next = NULL;
-+  nc->text = slang_text_parse(text);
-+  for (oc = where->contents; oc && oc->next; oc = oc->next);
-+  if (oc) {
-+    Assert(!oc->next);
-+    oc->next = nc;
-+  } else
-+    where->contents = nc;
-+  where->nr++;
-+  return where;
-+}
-+
-+static int slang_multitext_expmem(struct slang_multitext *what)
-+{
-+  struct slang_mt_content *content;
-+  int size = 0;
-+
-+  if (!what) {
-+    debug0("WARNING! slang_multitext_expmem() called with NULL pointer!");
-+    return 0;
-+  }
-+  size += sizeof(struct slang_multitext);
-+  for (content = what->contents; content; content = content->next) {
-+    size += sizeof(struct slang_mt_content);
-+    size += slang_text_expmem(content->text);
-+  }
-+  return size;
-+}
-+
-+static void slang_multitext_free(struct slang_multitext *what)
-+{
-+  struct slang_mt_content *content, *next;
-+
-+  if (!what) {
-+    debug0("WARNING! slang_multitext_free() called with NULL pointer!");
-+    return;
-+  }
-+  content = what->contents;
-+  while (content) {
-+    next = content->next;
-+    slang_text_free(content->text);
-+    nfree(content);
-+    content = next;
-+  }
-+  nfree(what);
-+}
-+
-+static char *slang_multitext_getrandomtext(struct slang_multitext *where)
-+{
-+  struct slang_mt_content *content;
-+  unsigned long x;
-+
-+  if (!where)
-+    return NULL;
-+  x = random() % where->nr;
-+  for (content = where->contents; content; content = content->next)
-+    if (!x)
-+      return slang_text_get(content->text);
-+    else
-+      x--;
-+  // we should never reach this part
-+  debug0("warning: getrandomtext didn't find anything!");
-+  return NULL;
-+}
-+
-+#ifndef SLANG_NOTYPES
-+static struct slang_text *slang_multitext_find(struct slang_multitext *where, char *what)
-+{
-+  struct slang_mt_content *content;
-+
-+  Assert(where);
-+  for (content = where->contents; content; content = content->next) {
-+    Assert(content->text);
-+    if (!slang_text_strcasecmp(content->text, what))
-+      return content->text;
-+  }
-+  return NULL;
-+}
-+#endif
-+
-+#ifndef SLANG_NOGETALL
-+static struct slang_mt_content *glob_mtext_content;
-+static char *slang_multitext_get_first(struct slang_multitext *where)
-+{
-+  Assert(where);
-+  glob_mtext_content = where->contents;
-+  if (glob_mtext_content)
-+    return slang_text_get(glob_mtext_content->text);
-+  else
-+    return NULL;
-+}
-+
-+static char *slang_multitext_get_next()
-+{
-+  glob_mtext_content = glob_mtext_content->next;
-+  if (glob_mtext_content)
-+    return slang_text_get(glob_mtext_content->text);
-+  else
-+    return NULL;
-+}
-+#endif
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/slang_text.c src/eggdrop-1.8.4/src/mod/gseen.mod/slang_text.c
---- ./src/mod/gseen.mod/slang_text.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/slang_text.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,200 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+struct slang_text {
-+  struct slang_text *next;
-+  char *string;
-+  void (*command) ();
-+};
-+
-+struct slang_text_commands {
-+  char *command;
-+  void (*targetfunc) ();
-+};
-+
-+struct slang_command_list {
-+  struct slang_command_list *next;
-+  struct slang_text_commands *commands;
-+};
-+
-+static struct slang_text *slang_text_parse(char *);
-+static struct slang_text *slang_text_create(struct slang_text *);
-+static void slang_text_add_string(struct slang_text *, char *);
-+static void slang_text_add_command(struct slang_text *, char *);
-+static void slang_text_free(struct slang_text *);
-+static int slang_text_expmem(struct slang_text *);
-+static char *slang_text_get(struct slang_text *);
-+#ifndef SLANG_NOTYPES
-+static int slang_text_strcasecmp(struct slang_text *, char *);
-+#endif
-+
-+static struct slang_text *slang_text_parse(char *text)
-+{
-+  char *cmdstart, *cmdend;
-+  struct slang_text *firstitem, *item;
-+
-+  firstitem = slang_text_create(NULL);
-+  item = firstitem;
-+  while ((cmdstart = strstr(text, "<?"))) {
-+    cmdstart[0] = 0;
-+    slang_text_add_string(item, text);
-+    item = slang_text_create(item);
-+    text += 2;
-+    cmdstart += 2;
-+    cmdend = strstr(cmdstart, "/?>");
-+    if (!cmdend) {
-+      putlog(LOG_MISC, "*", "ERROR parsing slang text: unterminated command \"%s\"!", cmdstart);
-+      break;
-+    }
-+    cmdend[0] = 0;
-+    slang_text_add_command(item, cmdstart);
-+    item = slang_text_create(item);
-+    text = cmdend + 3;
-+  }
-+  slang_text_add_string(item, text);
-+  return firstitem;
-+}
-+
-+static struct slang_text *slang_text_create(struct slang_text *where)
-+{
-+  struct slang_text *newpart;
-+
-+  newpart = nmalloc(sizeof(struct slang_text));
-+  newpart->next = NULL;
-+  newpart->string = NULL;
-+  newpart->command = NULL;
-+  while (where && where->next)
-+    where = where->next;
-+  if (where)
-+    where->next = newpart;
-+  return newpart;
-+}
-+
-+static void slang_text_add_string(struct slang_text *item, char *s)
-+{
-+  Assert(item);
-+  Assert(!item->string);
-+  item->string = nmalloc(strlen(s) + 1);
-+  strcpy(item->string, s);
-+}
-+
-+static void slang_text_free(struct slang_text *item)
-+{
-+  if (!item)
-+    return;
-+  slang_text_free(item->next);
-+  if (item->string)
-+    nfree(item->string);
-+  nfree(item);
-+}
-+
-+static int slang_text_expmem(struct slang_text *item)
-+{
-+  int size = 0;
-+
-+  while (item) {
-+    size += sizeof(struct slang_text);
-+    if (item->string)
-+      size += strlen(item->string) + 1;
-+    item = item->next;
-+  }
-+  return size;
-+}
-+
-+#ifndef SLANG_NOTYPES
-+static int slang_text_strcasecmp(struct slang_text *item, char *text)
-+{
-+  Assert(item);
-+  debug2("s_t_sc: '%s', '%s'", text, item->string);
-+  if (item->command || item->next)
-+    return 1;
-+  return strcasecmp(item->string, text);
-+}
-+#endif
-+
-+static char slang_text_buf[500];
-+static char *slang_text_get(struct slang_text *item)
-+{
-+  slang_text_buf[0] = 0;
-+  while (item) {
-+    if (item->string)
-+      strncat(slang_text_buf, item->string, sizeof(slang_text_buf));
-+    else if (item->command)
-+      item->command();
-+    item = item->next;
-+  }
-+  return slang_text_buf;
-+}
-+
-+/*****************************************************/
-+
-+
-+static struct slang_command_list *glob_slang_cmd_list;
-+
-+static struct slang_command_list *slang_commands_list_add(struct slang_command_list *where, struct slang_text_commands *what)
-+{
-+  struct slang_command_list *newcommandlist;
-+
-+  newcommandlist = nmalloc(sizeof(struct slang_command_list));
-+  newcommandlist->commands = what;
-+  newcommandlist->next = where;
-+  return newcommandlist;
-+}
-+
-+static int slang_commands_list_expmem(struct slang_command_list *what)
-+{
-+  int size = 0;
-+
-+  while (what) {
-+    size += sizeof(struct slang_command_list);
-+    what = what->next;
-+  }
-+  return size;
-+}
-+
-+static void slang_commands_list_free(struct slang_command_list *what)
-+{
-+  struct slang_command_list *next;
-+
-+  while (what) {
-+    next = what->next;
-+    nfree(what);
-+    what = next;
-+  }
-+}
-+
-+static void slang_text_add_command(struct slang_text *item, char *s)
-+{
-+  struct slang_command_list *cmdlist;
-+  char *cmd;
-+  int i;
-+
-+  cmd = newsplit(&s);
-+  i = 0;
-+  for (cmdlist = glob_slang_cmd_list; cmdlist; cmdlist = cmdlist->next) {
-+    for (i = 0; 1; i++) {
-+      if (!cmdlist->commands[i].command)
-+        break;
-+      if (!strcasecmp(cmdlist->commands[i].command, cmd)) {
-+        item->command = cmdlist->commands[i].targetfunc;
-+        return;
-+      }
-+    }
-+  }
-+  putlog(LOG_MISC, "*", "ERROR! Unknown slang-command: '%s'", cmd);
-+}
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/tclcmds.c src/eggdrop-1.8.4/src/mod/gseen.mod/tclcmds.c
---- ./src/mod/gseen.mod/tclcmds.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/tclcmds.c	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,53 @@
-+/*
-+ * Copyright (C) 2000,2001  Florian Sander
-+ *
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+static int tcl_setchanseenlang STDVAR
-+{
-+  Context;
-+  BADARGS(3, 3, " channel language");
-+  chanlangs = slang_chanlang_add(chanlangs, argv[1], argv[2]);
-+  return TCL_OK;
-+}
-+
-+static int tcl_loadseenslang STDVAR
-+{
-+//  int ret = 0;
-+  char *shortname, *longname, *filename;
-+  struct slang_header *slang;
-+
-+  Context;
-+  BADARGS(4, 4, " language description langfile");
-+  shortname = argv[1];
-+  longname = argv[2];
-+  filename = argv[3];
-+  coreslangs = slang_create(coreslangs, shortname, longname);
-+  slang = slang_find(coreslangs, shortname);
-+  Assert(slang);
-+  if (!slang_load(slang, filename)) {
-+    Tcl_AppendResult(irp, "Couldn't open seenslang file!!!", NULL);
-+    return TCL_ERROR;
-+  }
-+  return TCL_OK;
-+}
-+
-+static tcl_cmds gseentcls[] =
-+{
-+  {"loadseenslang", tcl_loadseenslang},
-+  {"setchanseenlang", tcl_setchanseenlang},
-+  {0, 0}
-+};
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/gseen.mod/UPDATES src/eggdrop-1.8.4/src/mod/gseen.mod/UPDATES
---- ./src/mod/gseen.mod/UPDATES	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/gseen.mod/UPDATES	2017-01-02 22:30:47.000000000 +0100
-@@ -0,0 +1,60 @@
-+Changes in gseen.mod: (since v1.0.0)
-+--------------------
-+
-+1.1.2 (2017-01-02)
-+- compatibility to eggdrop 1.8
-+
-+
-+1.1.1
-+- fixed "no newline" compilation warnings that appeared on some systems.
-+- fixed uninitialized "li" variable in do_seen()
-+- fixed lacking compatibility to eggdrop1.4 (confirmation anyone?)
-+- new option: hide-secret-chans
-+- new option: seen-nick-len
-+
-+1.1.0	(15.6.2001)
-+- added multilang support
-+- removed static buffers
-+- organized data in a binary search tree (much faster)
-+- optimized a few other things
-+- added settings:
-+    - fuzzy-search
-+    - max-matches
-+    - wildcard-search
-+
-+1.0.8
-+- quiet-seens wasn't working for !seennick
-+- added quiet-ai-seens
-+- renamed nopub to nopubseens and nolog to noseendata and
-+  quietseen to quietseens
-+
-+1.0.7
-+- added compatibility to !channels
-+- fixed a bug relating strict-host 0 had some strange effects on
-+  !seen requests for users with ~ in their ident
-+
-+1.0.6
-+- fixed a very evil bug that allowed anyone to crash the bot, sorry
-+
-+1.0.5
-+- quietseens wasn't working correctly
-+- added support for egg1.5's udef chansets
-+
-+1.0.4
-+- added GPL stuff
-+- changed error msg that appears if no gseen file exists
-+
-+1.0.3
-+- readme updates
-+- fixed a grammatical error in do_seen
-+
-+1.0.2
-+- bot wanted to free a NULL pointer sometimes
-+
-+1.0.1
-+- !seen without parameter returned stupid results :)
-+- fixed little typo in .purgeseens
-+- "I found 1 matches..." -> "I found 1 match..."
-+
-+1.0.0
-+- release :)
diff --git a/main/eggdrop/logs2html.mod.patch b/main/eggdrop/logs2html.mod.patch
deleted file mode 100644
index 36ed2361dcf..00000000000
--- a/main/eggdrop/logs2html.mod.patch
+++ /dev/null
@@ -1,3417 +0,0 @@
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/fileoperations.c src/eggdrop-1.8.4/src/mod/logs2html.mod/fileoperations.c
---- ./src/mod/logs2html.mod/fileoperations.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/fileoperations.c	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,134 @@
-+/*
-+ * fileoperations.c -- part of logs2html.mod
-+ *
-+ * Written by Fedotov Alexander aka Shmupsik aka shurikvz <shurikvz@mail.ru>
-+ *
-+ * 2004-2009 year
-+ */
-+/*
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+#include <stdarg.h>
-+
-+/****************************************************************************/
-+/*
-+ * function FILE *openfile(char *newfilename, const char *mode, bool silent)
-+ *
-+ * Input:
-+ *   newfilename	-	имя файла, который необходимо создать
-+ *   mode					-	режим открытия файла
-+ *
-+ * Output:
-+ *   указатель на файл
-+ *
-+ * Discription:
-+ *   функция осуществляет создание и открытие файла в указанном режиме
-+ *   и возвращает указатель на созданный файл
-+ */
-+static FILE *openfile(char *filename, const char *mode, bool silent) {
-+	FILE *file;
-+
-+	if (filename == NULL) {
-+		putlog(LOG_MISC, "*", "logs2html: ERROR! Can't allocate enough space for filename.");
-+		return NULL;
-+	}
-+
-+	file = fopen(filename, mode);
-+	if ((file == NULL) && (!silent)) {
-+		putlog(LOG_MISC, "*", "logs2html: Warning! Can't open file \"%s\".", filename);
-+	}
-+
-+	return file;
-+} /* openfile() */
-+/****************************************************************************/
-+
-+
-+/****************************************************************************/
-+/*
-+ * function void writefromexfile(FILE *dst_file, char *exfilename)
-+ *
-+ * Input:
-+ *
-+ *
-+ *
-+ *
-+ * Output:
-+ *
-+ *
-+ * Discription:
-+ *
-+ *
-+ */
-+static void writefromexfile(FILE *dst_file, char *exfilename) {
-+	FILE *addfile;
-+	char buffer[512];
-+	size_t n;
-+
-+	if (strlen(exfilename) > 0) {
-+		if ((addfile = openfile(exfilename, "r", false)) != NULL) {
-+			while(!feof(addfile)) {
-+				n = fread(buffer, sizeof(char), sizeof buffer, addfile);
-+				fwrite(buffer, sizeof(char), n, dst_file);
-+			}
-+			fclose(addfile);
-+		}
-+	}
-+
-+	return;
-+} /* writefromexfile() */
-+/****************************************************************************/
-+
-+
-+/****************************************************************************/
-+/*
-+ * function void str_write(FILE *file, char *fmt, ... )
-+ *
-+ * Input:
-+ *   file -	файл в который пишем данные
-+ *   fmt -	строка для записи со спецификаторами формата
-+ *   ... -	данные для записи в строку
-+ *
-+ * Output:
-+ *   ничего
-+ *
-+ * Discription:
-+ *   функция осуществляет запись переданной строки в указанный файл,
-+ *   производя соответствующее ее форматирование
-+ */
-+static void str_write(FILE *file, char *fstr, ... ) {
-+	va_list ap;
-+	int nchars;
-+	int size = 256;
-+	static char *buffer = NULL;
-+
-+	buffer = (char *)nmalloc(size);
-+
-+	while (true) {
-+		va_start(ap, fstr);
-+		nchars = egg_vsnprintf(buffer, size, fstr, ap);
-+		va_end(ap);
-+		if (nchars < size) break;
-+		size *= 2;
-+		buffer = (char *)nrealloc(buffer, size);
-+	}
-+
-+	fwrite(buffer, sizeof(char), strlen(buffer), file);
-+	nfree(buffer); buffer = NULL;
-+
-+	return;
-+} /* str_write() */
-+/****************************************************************************/
-+
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/help/logs2html.help src/eggdrop-1.8.4/src/mod/logs2html.mod/help/logs2html.help
---- ./src/mod/logs2html.mod/help/logs2html.help	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/help/logs2html.help	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,37 @@
-+%{help=convertalllogs}%{+n}
-+###  %bconvertalllogs%b
-+   Reconverts all your logs.
-+
-+See also: convertlogs, makemainpage
-+%{help=convertlogs}%{+n}
-+###  %bconvertlogs [year [month [day]]]%b
-+   %byear%b the year to reconvert logs
-+   %bmonth%b the month to reconvert logs
-+   %bmonth%b the day to reconvert logs
-+   If year equals %ball%b the command reconverts all your logs (same as %b.convertalllogs%b).
-+   If you do not specify a parameter, the command will convert the logs for the current day.
-+   
-+See also: convertalllogs, makemainpage
-+%{help=makemainpage}%{+n}
-+###  %bmakemainpage%b
-+   Redraws your mainpages. (same as %b.makeindexpage%b)
-+
-+See also: makeindexpage
-+%{help=makeindexpage}%{+n}
-+###  %bmakeindexpage%b
-+   Redraws your mainpages. (same as %b.makemainpage%b)
-+
-+See also: makemainpage
-+%{help=logs2html module}%{+n}
-+###  %blogs2html module%b
-+   This module convert all log files of your eggdrop in html format.
-+
-+   The following commands are provided by the logs2html module:
-+%{+n}
-+     %bconvertalllogs       makemainpage%b
-+     %bconvertlogs          makeindexpage%b
-+%{help=all}%{+n}
-+###  %blogs2html module%b commands
-+%{+n}
-+     %bconvertalllogs       makemainpage%b
-+     %bconvertlogs          makeindexpage%b
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/htmloperations.c src/eggdrop-1.8.4/src/mod/logs2html.mod/htmloperations.c
---- ./src/mod/logs2html.mod/htmloperations.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/htmloperations.c	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,349 @@
-+/*
-+ * htmloperations.c -- part of logs2html.mod
-+ *
-+ * Written by Fedotov Alexander aka Shmupsik aka shurikvz <shurikvz@mail.ru>
-+ *
-+ * 2004-2009 year
-+ */
-+/*
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+/****************************************************************************/
-+/*
-+* function void writecss
-+*
-+* Input:
-+*
-+*
-+*
-+*
-+* Output:
-+*
-+*
-+* Discription:
-+*
-+*
-+*/
-+static void WriteCSSFile(FILE *dst_file)
-+{
-+	str_write(dst_file, "@charset \"utf-8\";\n");
-+	str_write(dst_file, "/* CSS Document */\n\n");
-+
-+	str_write(dst_file, "<!--\n");
-+	str_write(dst_file, "body  {\n");
-+	str_write(dst_file, "font-family:\"Times New Roman\", Times, serif;\n");
-+	str_write(dst_file, "background: #666666;\n");
-+	str_write(dst_file, "margin: 0;\n");
-+	str_write(dst_file, "padding: 0;\n");
-+	str_write(dst_file, "text-align: center;\n");
-+	str_write(dst_file, "color: #000000;\n");
-+	str_write(dst_file, "}\n\n");
-+
-+	str_write(dst_file, "/* mainpage styles */\n");
-+	str_write(dst_file, ".l2hMainPage #container {\n");
-+	str_write(dst_file, "width: 99%%;\n");
-+	str_write(dst_file, "background:#FFFF99;\n");
-+	str_write(dst_file, "margin: 0 auto;\n");
-+	str_write(dst_file, "border: 1px solid #000000;\n");
-+	str_write(dst_file, "text-align: left;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hMainPage #container #monthtable tr {\n");
-+	str_write(dst_file, "background: Orange;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hMainPage #container .monthblock .monthname {\n");
-+	str_write(dst_file, "font-family:\"Comic Sans MS\", \"Brush Script Std\", Verdana, Arial, Helvetica, sans-serif;\n");
-+	str_write(dst_file, "font-size: 1.3em;\n");
-+	str_write(dst_file, "height: 1.8em;\n");
-+	str_write(dst_file, "background:#FF6600;\n");
-+	str_write(dst_file, "text-align: center;\n");
-+	str_write(dst_file, "color: white;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hMainPage #container #monthtable .monthblock .dayname {\n");
-+	str_write(dst_file, "font-weight:bold;\n");
-+	str_write(dst_file, "height: 1.8em;\n");
-+	str_write(dst_file, "background: Silver;\n");
-+	str_write(dst_file, "text-align: left;\n");
-+	str_write(dst_file, "padding: 0 5px;\n");
-+	str_write(dst_file, "color:#333333;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hMainPage #container #monthtable .monthblock .weekend {\n");
-+	str_write(dst_file, "font-weight:bold;\n");
-+	str_write(dst_file, "height: 1.8em;\n");
-+	str_write(dst_file, "background: #FF6633;\n");
-+	str_write(dst_file, "text-align: left;\n");
-+	str_write(dst_file, "padding: 0 5px;\n");
-+	str_write(dst_file, "color:#333333;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hMainPage #container #monthtable .monthblock .emptycell {\n");
-+	str_write(dst_file, "height: 1.8em;\n");
-+	str_write(dst_file, "background:#DDDDDD;\n");
-+	str_write(dst_file, "text-align: center;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hMainPage #container #monthtable .monthblock .day {\n");
-+	str_write(dst_file, "font-family:\"Courier New\", Courier, monospace;\n");
-+	str_write(dst_file, "font-weight:bold;\n");
-+	str_write(dst_file, "height: 1.8em;\n");
-+	str_write(dst_file, "background:#FFCC00;\n");
-+	str_write(dst_file, "text-align: center;\n");
-+	str_write(dst_file, "color:#FF0000;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hMainPage #header {\n");
-+	str_write(dst_file, "background: #DDDDDD;\n");
-+	str_write(dst_file, "padding: 0 10px;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hMainPage #header h2 {\n");
-+	str_write(dst_file, "font-style:italic;\n");
-+	str_write(dst_file, "margin: 0;\n");
-+	str_write(dst_file, "padding: 10px 0;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hMainPage #mp_top {\n");
-+	str_write(dst_file, "background: #DDDDDD;\n");
-+	str_write(dst_file, "padding: 0 10px;\n");
-+	str_write(dst_file, "text-align: center;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hMainPage #mp_bottom {\n");
-+	str_write(dst_file, "background: #DDDDDD;\n");
-+	str_write(dst_file, "padding: 0 10px;\n");
-+	str_write(dst_file, "text-align: center;\n");
-+	str_write(dst_file, "}\n\n");
-+
-+	str_write(dst_file, "/* leftsidebar styles */\n");
-+	str_write(dst_file, ".l2hMainPage #leftsidebar {\n");
-+	str_write(dst_file, "float: left;\n");
-+	str_write(dst_file, "width: 7em;\n");
-+	str_write(dst_file, "background: #EBEBEB;\n");
-+	str_write(dst_file, "padding: 10px 0;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hMainPage #leftsidebar div.indexlink {\n");
-+	str_write(dst_file, "background-color: #EBEBEB;\n");
-+	str_write(dst_file, "margin-left: 5px;\n");
-+	str_write(dst_file, "margin-right: 5px;\n");
-+	str_write(dst_file, "text-align:center;\n");
-+	str_write(dst_file, "border-bottom-width: thin;\n");
-+	str_write(dst_file, "border-bottom-style: dotted;\n");
-+	str_write(dst_file, "border-bottom-color: #CCCCCC;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hMainPage #leftsidebar div.indexlink a {\n");
-+	str_write(dst_file, "display:block;\n");
-+	str_write(dst_file, "letter-spacing:.1em;\n");
-+	str_write(dst_file, "line-height:1.5em;\n");
-+	str_write(dst_file, "text-decoration: none;\n");
-+	str_write(dst_file, "vertical-align:baseline;\n");
-+	str_write(dst_file, "color:#333333;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hMainPage #leftsidebar div.indexlink a:hover {\n");
-+	str_write(dst_file, "background:#FF6600;\n");
-+	str_write(dst_file, "letter-spacing:.3em;\n");
-+	str_write(dst_file, "line-height:1.5em;\n");
-+	str_write(dst_file, "color:#FFFFFF;\n");
-+	str_write(dst_file, "font-weight:bold;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hMainPage #mainblock {\n");
-+	str_write(dst_file, "margin: 0 20px 0 8em;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hMainPage #footer {\n");
-+	str_write(dst_file, "padding: 0 10px;\n");
-+	str_write(dst_file, "background:#DDDDDD;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hMainPage #footer p {\n");
-+	str_write(dst_file, "margin: 0;\n");
-+	str_write(dst_file, "padding: 10px 0;\n");
-+	str_write(dst_file, "font-size: 0.9em;\n");
-+	str_write(dst_file, "font-weight:bold;\n");
-+	str_write(dst_file, "color: #333333;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #lp_top {\n");
-+	str_write(dst_file, "background: #DDDDDD;\n");
-+	str_write(dst_file, "padding: 0 10px;\n");
-+	str_write(dst_file, "text-align: center;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #lp_bottom {\n");
-+	str_write(dst_file, "background: #DDDDDD;\n");
-+	str_write(dst_file, "padding: 0 10px;\n");
-+	str_write(dst_file, "text-align: center;\n");
-+	str_write(dst_file, "}\n\n");
-+
-+	str_write(dst_file, "/* Log Page styles */\n");
-+	str_write(dst_file, ".l2hLogPage #header {\n");
-+	str_write(dst_file, "background: #DDDDDD;\n");
-+	str_write(dst_file, "padding: 0 10px;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #container {\n");
-+	str_write(dst_file, "width: 99%%;\n");
-+	str_write(dst_file, "background: #FFFF99;\n");
-+	str_write(dst_file, "margin: 0 auto;\n");
-+	str_write(dst_file, "border: 1px solid #000000;\n");
-+	str_write(dst_file, "text-align: left;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #container #navtop {\n");
-+	str_write(dst_file, "text-align: center;\n");
-+	str_write(dst_file, "border-bottom: 1px solid Orange;\n");
-+	str_write(dst_file, "margin-bottom: 10px;\n");
-+	str_write(dst_file, "padding: 10px 0;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #container #navtop a {\n");
-+	str_write(dst_file, "color:#FF0000;\n");
-+	str_write(dst_file, "font-weight:bold;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #container #totoplink {\n");
-+	str_write(dst_file, "color:#FF0000;\n");
-+	str_write(dst_file, "text-align: center;\n");
-+	str_write(dst_file, "border-top: 1px solid Orange;\n");
-+	str_write(dst_file, "margin-top: 10px;\n");
-+	str_write(dst_file, "padding: 10px 0;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #container #totoplink a {\n");
-+	str_write(dst_file, "color:#FF0000;\n");
-+	str_write(dst_file, "font-weight:bold;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #container #navbottom {\n");
-+	str_write(dst_file, "color:#FF0000;\n");
-+	str_write(dst_file, "text-align: center;\n");
-+	str_write(dst_file, "padding: 10px;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #container #navbottom span {\n");
-+	str_write(dst_file, "padding-left:5px;\n");
-+	str_write(dst_file, "padding-right:5px;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #container #navbottom #navbottom_currentpg {\n");
-+	str_write(dst_file, "font-size:1.1em;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #footer {\n");
-+	str_write(dst_file, "padding: 0 10px;\n");
-+	str_write(dst_file, "background:#DDDDDD;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #footer p {\n");
-+	str_write(dst_file, "margin: 0;\n");
-+	str_write(dst_file, "padding: 10px 0;\n");
-+	str_write(dst_file, "font-size: 0.9em;\n");
-+	str_write(dst_file, "font-weight:bold;\n");
-+	str_write(dst_file, "color: #333333;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #mainblock div {\n");
-+	str_write(dst_file, "white-space: pre-wrap; /* css-3 */\n");
-+	str_write(dst_file, "white-space: pre-line; /* css-3, css-2.1 */\n");
-+	str_write(dst_file, "white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */\n");
-+	str_write(dst_file, "white-space: -hp-pre-wrap; /* HP printers */\n");
-+	str_write(dst_file, "white-space: -pre-wrap; /* Opera 4-6 */\n");
-+	str_write(dst_file, "white-space: -o-pre-wrap; /* Opera 7 */\n");
-+	str_write(dst_file, "word-wrap: break-word; /* Internet Explorer 5.5+ */\n");
-+	str_write(dst_file, "overflow:hidden;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #mainblock span.time {\n");
-+	str_write(dst_file, "color: #D0D0D0;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #mainblock span.nick {\n");
-+	str_write(dst_file, "color: #0040C0;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #mainblock span.text {\n");
-+	str_write(dst_file, "color: #111111;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #mainblock span.else_j {\n");
-+	str_write(dst_file, "color: #99CC00;\n");
-+	str_write(dst_file, "font-size: 0.8em;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #mainblock span.else_li {\n");
-+	str_write(dst_file, "color: #99CC00;\n");
-+	str_write(dst_file, "font-size: 0.8em;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #mainblock span.else_l {\n");
-+	str_write(dst_file, "color: #99CC00;\n");
-+	str_write(dst_file, "font-size: 0.8em;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #mainblock span.else_n {\n");
-+	str_write(dst_file, "color: #FF6666;\n");
-+	str_write(dst_file, "font-size: 0.8em;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #mainblock span.else_m {\n");
-+	str_write(dst_file, "color: #00CCFF;\n");
-+	str_write(dst_file, "font-size: 0.8em;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #mainblock span.else_k {\n");
-+	str_write(dst_file, "color: #FF0066;\n");
-+	str_write(dst_file, "font-size: 0.8em;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #mainblock span.else {\n");
-+	str_write(dst_file, "color: #40C000;\n");
-+	str_write(dst_file, "font-size: 0.8em;\n");
-+	str_write(dst_file, "}\n");
-+	str_write(dst_file, ".l2hLogPage #mainblock span.action {\n");
-+	str_write(dst_file, "color: #FF99FF;\n");
-+	str_write(dst_file, "}\n\n");
-+
-+	str_write(dst_file, "/* mirc colors */\n");
-+	str_write(dst_file, ".l2hLogPage span.c0000, .l2hLogPage span.c0100, .l2hLogPage span.c0200, .l2hLogPage span.c0300, .l2hLogPage span.c0400, .l2hLogPage span.c0500, .l2hLogPage span.c0600, .l2hLogPage span.c0700, .l2hLogPage span.c0800, .l2hLogPage span.c0900, .l2hLogPage span.c1000, .l2hLogPage span.c1100, .l2hLogPage span.c1200, .l2hLogPage span.c1300, .l2hLogPage span.c1400, .l2hLogPage span.c1500 {background-color: white;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0001, .l2hLogPage span.c0101, .l2hLogPage span.c0201, .l2hLogPage span.c0301, .l2hLogPage span.c0401, .l2hLogPage span.c0501, .l2hLogPage span.c0601, .l2hLogPage span.c0701, .l2hLogPage span.c0801, .l2hLogPage span.c0901, .l2hLogPage span.c1001, .l2hLogPage span.c1101, .l2hLogPage span.c1201, .l2hLogPage span.c1301, .l2hLogPage span.c1401, .l2hLogPage span.c1501 {background-color: black;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0002, .l2hLogPage span.c0102, .l2hLogPage span.c0202, .l2hLogPage span.c0302, .l2hLogPage span.c0402, .l2hLogPage span.c0502, .l2hLogPage span.c0602, .l2hLogPage span.c0702, .l2hLogPage span.c0802, .l2hLogPage span.c0902, .l2hLogPage span.c1002, .l2hLogPage span.c1102, .l2hLogPage span.c1202, .l2hLogPage span.c1302, .l2hLogPage span.c1402, .l2hLogPage span.c1502 {background-color: navy;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0003, .l2hLogPage span.c0103, .l2hLogPage span.c0203, .l2hLogPage span.c0303, .l2hLogPage span.c0403, .l2hLogPage span.c0503, .l2hLogPage span.c0603, .l2hLogPage span.c0703, .l2hLogPage span.c0803, .l2hLogPage span.c0903, .l2hLogPage span.c1003, .l2hLogPage span.c1103, .l2hLogPage span.c1203, .l2hLogPage span.c1303, .l2hLogPage span.c1403, .l2hLogPage span.c1503 {background-color: green;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0004, .l2hLogPage span.c0104, .l2hLogPage span.c0204, .l2hLogPage span.c0304, .l2hLogPage span.c0404, .l2hLogPage span.c0504, .l2hLogPage span.c0604, .l2hLogPage span.c0704, .l2hLogPage span.c0804, .l2hLogPage span.c0904, .l2hLogPage span.c1004, .l2hLogPage span.c1104, .l2hLogPage span.c1204, .l2hLogPage span.c1304, .l2hLogPage span.c1404, .l2hLogPage span.c1504 {background-color: red;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0005, .l2hLogPage span.c0105, .l2hLogPage span.c0205, .l2hLogPage span.c0305, .l2hLogPage span.c0405, .l2hLogPage span.c0505, .l2hLogPage span.c0605, .l2hLogPage span.c0705, .l2hLogPage span.c0805, .l2hLogPage span.c0905, .l2hLogPage span.c1005, .l2hLogPage span.c1105, .l2hLogPage span.c1205, .l2hLogPage span.c1305, .l2hLogPage span.c1405, .l2hLogPage span.c1505 {background-color: maroon;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0006, .l2hLogPage span.c0106, .l2hLogPage span.c0206, .l2hLogPage span.c0306, .l2hLogPage span.c0406, .l2hLogPage span.c0506, .l2hLogPage span.c0606, .l2hLogPage span.c0706, .l2hLogPage span.c0806, .l2hLogPage span.c0906, .l2hLogPage span.c1006, .l2hLogPage span.c1106, .l2hLogPage span.c1206, .l2hLogPage span.c1306, .l2hLogPage span.c1406, .l2hLogPage span.c1506 {background-color: purple;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0007, .l2hLogPage span.c0107, .l2hLogPage span.c0207, .l2hLogPage span.c0307, .l2hLogPage span.c0407, .l2hLogPage span.c0507, .l2hLogPage span.c0607, .l2hLogPage span.c0707, .l2hLogPage span.c0807, .l2hLogPage span.c0907, .l2hLogPage span.c1007, .l2hLogPage span.c1107, .l2hLogPage span.c1207, .l2hLogPage span.c1307, .l2hLogPage span.c1407, .l2hLogPage span.c1507 {background-color: orange;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0008, .l2hLogPage span.c0108, .l2hLogPage span.c0208, .l2hLogPage span.c0308, .l2hLogPage span.c0408, .l2hLogPage span.c0508, .l2hLogPage span.c0608, .l2hLogPage span.c0708, .l2hLogPage span.c0808, .l2hLogPage span.c0908, .l2hLogPage span.c1008, .l2hLogPage span.c1108, .l2hLogPage span.c1208, .l2hLogPage span.c1308, .l2hLogPage span.c1408, .l2hLogPage span.c1508 {background-color: yellow;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0009, .l2hLogPage span.c0109, .l2hLogPage span.c0209, .l2hLogPage span.c0309, .l2hLogPage span.c0409, .l2hLogPage span.c0509, .l2hLogPage span.c0609, .l2hLogPage span.c0709, .l2hLogPage span.c0809, .l2hLogPage span.c0909, .l2hLogPage span.c1009, .l2hLogPage span.c1109, .l2hLogPage span.c1209, .l2hLogPage span.c1309, .l2hLogPage span.c1409, .l2hLogPage span.c1509 {background-color: lime;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0010, .l2hLogPage span.c0110, .l2hLogPage span.c0210, .l2hLogPage span.c0310, .l2hLogPage span.c0410, .l2hLogPage span.c0510, .l2hLogPage span.c0610, .l2hLogPage span.c0710, .l2hLogPage span.c0810, .l2hLogPage span.c0910, .l2hLogPage span.c1010, .l2hLogPage span.c1110, .l2hLogPage span.c1210, .l2hLogPage span.c1310, .l2hLogPage span.c1410, .l2hLogPage span.c1510 {background-color: teal;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0011, .l2hLogPage span.c0111, .l2hLogPage span.c0211, .l2hLogPage span.c0311, .l2hLogPage span.c0411, .l2hLogPage span.c0511, .l2hLogPage span.c0611, .l2hLogPage span.c0711, .l2hLogPage span.c0811, .l2hLogPage span.c0911, .l2hLogPage span.c1011, .l2hLogPage span.c1111, .l2hLogPage span.c1211, .l2hLogPage span.c1311, .l2hLogPage span.c1411, .l2hLogPage span.c1511 {background-color: aqua;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0012, .l2hLogPage span.c0112, .l2hLogPage span.c0212, .l2hLogPage span.c0312, .l2hLogPage span.c0412, .l2hLogPage span.c0512, .l2hLogPage span.c0612, .l2hLogPage span.c0712, .l2hLogPage span.c0812, .l2hLogPage span.c0912, .l2hLogPage span.c1012, .l2hLogPage span.c1112, .l2hLogPage span.c1212, .l2hLogPage span.c1312, .l2hLogPage span.c1412, .l2hLogPage span.c1512 {background-color: blue;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0013, .l2hLogPage span.c0113, .l2hLogPage span.c0213, .l2hLogPage span.c0313, .l2hLogPage span.c0413, .l2hLogPage span.c0513, .l2hLogPage span.c0613, .l2hLogPage span.c0713, .l2hLogPage span.c0813, .l2hLogPage span.c0913, .l2hLogPage span.c1013, .l2hLogPage span.c1113, .l2hLogPage span.c1213, .l2hLogPage span.c1313, .l2hLogPage span.c1413, .l2hLogPage span.c1513 {background-color: fuchsia;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0014, .l2hLogPage span.c0114, .l2hLogPage span.c0214, .l2hLogPage span.c0314, .l2hLogPage span.c0414, .l2hLogPage span.c0514, .l2hLogPage span.c0614, .l2hLogPage span.c0714, .l2hLogPage span.c0814, .l2hLogPage span.c0914, .l2hLogPage span.c1014, .l2hLogPage span.c1114, .l2hLogPage span.c1214, .l2hLogPage span.c1314, .l2hLogPage span.c1414, .l2hLogPage span.c1514 {background-color: silver;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0015, .l2hLogPage span.c0115, .l2hLogPage span.c0215, .l2hLogPage span.c0315, .l2hLogPage span.c0415, .l2hLogPage span.c0515, .l2hLogPage span.c0615, .l2hLogPage span.c0715, .l2hLogPage span.c0815, .l2hLogPage span.c0915, .l2hLogPage span.c1015, .l2hLogPage span.c1114, .l2hLogPage span.c1215, .l2hLogPage span.c1315, .l2hLogPage span.c1415, .l2hLogPage span.c1515 {background-color: gray;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0000, .l2hLogPage span.c0001, .l2hLogPage span.c0002, .l2hLogPage span.c0003, .l2hLogPage span.c0004, .l2hLogPage span.c0005, .l2hLogPage span.c0006, .l2hLogPage span.c0007, .l2hLogPage span.c0008, .l2hLogPage span.c0009, .l2hLogPage span.c0010, .l2hLogPage span.c0011, .l2hLogPage span.c0012, .l2hLogPage span.c0013, .l2hLogPage span.c0014, .l2hLogPage span.c0015 {color: white;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0100, .l2hLogPage span.c0101, .l2hLogPage span.c0102, .l2hLogPage span.c0103, .l2hLogPage span.c0104, .l2hLogPage span.c0105, .l2hLogPage span.c0106, .l2hLogPage span.c0107, .l2hLogPage span.c0108, .l2hLogPage span.c0109, .l2hLogPage span.c0110, .l2hLogPage span.c0111, .l2hLogPage span.c0112, .l2hLogPage span.c0113, .l2hLogPage span.c0114, .l2hLogPage span.c0115 {color: black;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0200, .l2hLogPage span.c0201, .l2hLogPage span.c0202, .l2hLogPage span.c0203, .l2hLogPage span.c0204, .l2hLogPage span.c0205, .l2hLogPage span.c0206, .l2hLogPage span.c0207, .l2hLogPage span.c0208, .l2hLogPage span.c0209, .l2hLogPage span.c0210, .l2hLogPage span.c0211, .l2hLogPage span.c0212, .l2hLogPage span.c0213, .l2hLogPage span.c0214, .l2hLogPage span.c0215 {color: navy;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0300, .l2hLogPage span.c0301, .l2hLogPage span.c0302, .l2hLogPage span.c0303, .l2hLogPage span.c0304, .l2hLogPage span.c0305, .l2hLogPage span.c0306, .l2hLogPage span.c0307, .l2hLogPage span.c0308, .l2hLogPage span.c0309, .l2hLogPage span.c0310, .l2hLogPage span.c0311, .l2hLogPage span.c0312, .l2hLogPage span.c0313, .l2hLogPage span.c0314, .l2hLogPage span.c0315 {color: green;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0400, .l2hLogPage span.c0401, .l2hLogPage span.c0402, .l2hLogPage span.c0403, .l2hLogPage span.c0404, .l2hLogPage span.c0405, .l2hLogPage span.c0406, .l2hLogPage span.c0407, .l2hLogPage span.c0408, .l2hLogPage span.c0409, .l2hLogPage span.c0410, .l2hLogPage span.c0411, .l2hLogPage span.c0412, .l2hLogPage span.c0413, .l2hLogPage span.c0414, .l2hLogPage span.c0415 {color: red;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0500, .l2hLogPage span.c0501, .l2hLogPage span.c0502, .l2hLogPage span.c0503, .l2hLogPage span.c0504, .l2hLogPage span.c0505, .l2hLogPage span.c0506, .l2hLogPage span.c0507, .l2hLogPage span.c0508, .l2hLogPage span.c0509, .l2hLogPage span.c0510, .l2hLogPage span.c0511, .l2hLogPage span.c0512, .l2hLogPage span.c0513, .l2hLogPage span.c0514, .l2hLogPage span.c0515 {color: maroon;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0600, .l2hLogPage span.c0601, .l2hLogPage span.c0602, .l2hLogPage span.c0603, .l2hLogPage span.c0604, .l2hLogPage span.c0605, .l2hLogPage span.c0606, .l2hLogPage span.c0607, .l2hLogPage span.c0608, .l2hLogPage span.c0609, .l2hLogPage span.c0610, .l2hLogPage span.c0611, .l2hLogPage span.c0612, .l2hLogPage span.c0613, .l2hLogPage span.c0614, .l2hLogPage span.c0615 {color: purple;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0700, .l2hLogPage span.c0701, .l2hLogPage span.c0702, .l2hLogPage span.c0703, .l2hLogPage span.c0704, .l2hLogPage span.c0705, .l2hLogPage span.c0706, .l2hLogPage span.c0707, .l2hLogPage span.c0708, .l2hLogPage span.c0709, .l2hLogPage span.c0710, .l2hLogPage span.c0711, .l2hLogPage span.c0712, .l2hLogPage span.c0713, .l2hLogPage span.c0714, .l2hLogPage span.c0715 {color: orange;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0800, .l2hLogPage span.c0801, .l2hLogPage span.c0802, .l2hLogPage span.c0803, .l2hLogPage span.c0804, .l2hLogPage span.c0805, .l2hLogPage span.c0806, .l2hLogPage span.c0807, .l2hLogPage span.c0808, .l2hLogPage span.c0809, .l2hLogPage span.c0810, .l2hLogPage span.c0811, .l2hLogPage span.c0812, .l2hLogPage span.c0813, .l2hLogPage span.c0814, .l2hLogPage span.c0815 {color: yellow;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c0900, .l2hLogPage span.c0901, .l2hLogPage span.c0902, .l2hLogPage span.c0903, .l2hLogPage span.c0904, .l2hLogPage span.c0905, .l2hLogPage span.c0906, .l2hLogPage span.c0907, .l2hLogPage span.c0908, .l2hLogPage span.c0909, .l2hLogPage span.c0910, .l2hLogPage span.c0911, .l2hLogPage span.c0912, .l2hLogPage span.c0913, .l2hLogPage span.c0914, .l2hLogPage span.c0915 {color: lime;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c1000, .l2hLogPage span.c1001, .l2hLogPage span.c1002, .l2hLogPage span.c1003, .l2hLogPage span.c1004, .l2hLogPage span.c1005, .l2hLogPage span.c1006, .l2hLogPage span.c1007, .l2hLogPage span.c1008, .l2hLogPage span.c1009, .l2hLogPage span.c1010, .l2hLogPage span.c1011, .l2hLogPage span.c1012, .l2hLogPage span.c1013, .l2hLogPage span.c1014, .l2hLogPage span.c1015 {color: teal;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c1100, .l2hLogPage span.c1101, .l2hLogPage span.c1102, .l2hLogPage span.c1103, .l2hLogPage span.c1104, .l2hLogPage span.c1105, .l2hLogPage span.c1106, .l2hLogPage span.c1107, .l2hLogPage span.c1108, .l2hLogPage span.c1109, .l2hLogPage span.c1110, .l2hLogPage span.c1111, .l2hLogPage span.c1112, .l2hLogPage span.c1113, .l2hLogPage span.c1114, .l2hLogPage span.c1115 {color: aqua;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c1200, .l2hLogPage span.c1201, .l2hLogPage span.c1202, .l2hLogPage span.c1203, .l2hLogPage span.c1204, .l2hLogPage span.c1205, .l2hLogPage span.c1206, .l2hLogPage span.c1207, .l2hLogPage span.c1208, .l2hLogPage span.c1209, .l2hLogPage span.c1210, .l2hLogPage span.c1211, .l2hLogPage span.c1212, .l2hLogPage span.c1213, .l2hLogPage span.c1214, .l2hLogPage span.c1215 {color: blue;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c1300, .l2hLogPage span.c1301, .l2hLogPage span.c1302, .l2hLogPage span.c1303, .l2hLogPage span.c1304, .l2hLogPage span.c1305, .l2hLogPage span.c1306, .l2hLogPage span.c1307, .l2hLogPage span.c1308, .l2hLogPage span.c1309, .l2hLogPage span.c1310, .l2hLogPage span.c1311, .l2hLogPage span.c1312, .l2hLogPage span.c1313, .l2hLogPage span.c1314, .l2hLogPage span.c1315 {color: fuchsia;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c1400, .l2hLogPage span.c1401, .l2hLogPage span.c1402, .l2hLogPage span.c1403, .l2hLogPage span.c1404, .l2hLogPage span.c1405, .l2hLogPage span.c1406, .l2hLogPage span.c1407, .l2hLogPage span.c1408, .l2hLogPage span.c1409, .l2hLogPage span.c1410, .l2hLogPage span.c1411, .l2hLogPage span.c1412, .l2hLogPage span.c1413, .l2hLogPage span.c1414, .l2hLogPage span.c1415 {color: silver;}\n");
-+	str_write(dst_file, ".l2hLogPage span.c1500, .l2hLogPage span.c1501, .l2hLogPage span.c1502, .l2hLogPage span.c1503, .l2hLogPage span.c1504, .l2hLogPage span.c1505, .l2hLogPage span.c1506, .l2hLogPage span.c1507, .l2hLogPage span.c1508, .l2hLogPage span.c1509, .l2hLogPage span.c1510, .l2hLogPage span.c1511, .l2hLogPage span.c1512, .l2hLogPage span.c1513, .l2hLogPage span.c1514, .l2hLogPage span.c1515 {color: gray;}\n");
-+	str_write(dst_file, ".l2hLogPage span.f00 {color: white;}\n");
-+	str_write(dst_file, ".l2hLogPage span.f01 {color: black;}\n");
-+	str_write(dst_file, ".l2hLogPage span.f02 {color: navy;}\n");
-+	str_write(dst_file, ".l2hLogPage span.f03 {color: green;}\n");
-+	str_write(dst_file, ".l2hLogPage span.f04 {color: red;}\n");
-+	str_write(dst_file, ".l2hLogPage span.f05 {color: maroon;}\n");
-+	str_write(dst_file, ".l2hLogPage span.f06 {color: purple;}\n");
-+	str_write(dst_file, ".l2hLogPage span.f07 {color: orange;}\n");
-+	str_write(dst_file, ".l2hLogPage span.f08 {color: yellow;}\n");
-+	str_write(dst_file, ".l2hLogPage span.f09 {color: lime;}\n");
-+	str_write(dst_file, ".l2hLogPage span.f10 {color: teal;}\n");
-+	str_write(dst_file, ".l2hLogPage span.f11 {color: aqua;}\n");
-+	str_write(dst_file, ".l2hLogPage span.f12 {color: blue;}\n");
-+	str_write(dst_file, ".l2hLogPage span.f13 {color: fuchsia;}\n");
-+	str_write(dst_file, ".l2hLogPage span.f14 {color: silver;}\n");
-+	str_write(dst_file, ".l2hLogPage span.f15 {color: gray;}\n\n");
-+
-+	str_write(dst_file, "/* Miscellaneous classes for reuse */\n");
-+	str_write(dst_file, ".clearfloat {\n");
-+	str_write(dst_file, "/* this class should be placed on a div or break element and should be the final element before\n");
-+	str_write(dst_file, "the close of a container that should fully contain a float */\n");
-+	str_write(dst_file, "clear:both;\n");
-+	str_write(dst_file, "height:0;\n");
-+	str_write(dst_file, "font-size: 1px;\n");
-+	str_write(dst_file, "line-height: 0px;\n");
-+	str_write(dst_file, "}\n\n");
-+
-+	str_write(dst_file, "--> \n\n");
-+
-+	return;
-+}
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/language/logs2html.danish.lang src/eggdrop-1.8.4/src/mod/logs2html.mod/language/logs2html.danish.lang
---- ./src/mod/logs2html.mod/language/logs2html.danish.lang	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/language/logs2html.danish.lang	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,38 @@
-+# logs2html.danish.lang
-+# language messages for the logs2html module
-+
-+# Year
-+0xe000,�r
-+
-+# Back to mainpage link
-+0xe001,Hjem
-+
-+# Up link
-+0xe002,top
-+
-+# Backward, forward link
-+0xe003,forrige
-+0xe004,n�ste
-+
-+# Month names
-+0xe005,Januar
-+0xe006,Februar
-+0xe007,Marts
-+0xe008,April
-+0xe009,M�
-+0xe010,Juni
-+0xe011,Juli
-+0xe012,August
-+0xe013,September
-+0xe014,Oktober
-+0xe015,November
-+0xe016,December
-+
-+# Days of week names
-+0xe017,S�n.
-+0xe018,Man.
-+0xe019,Tir.
-+0xe020,Ons.
-+0xe021,Tor.
-+0xe022,Fre.
-+0xe023,L�r.
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/language/logs2html.english.lang src/eggdrop-1.8.4/src/mod/logs2html.mod/language/logs2html.english.lang
---- ./src/mod/logs2html.mod/language/logs2html.english.lang	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/language/logs2html.english.lang	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,38 @@
-+# logs2html.english.lang
-+# language messages for the logs2html module
-+
-+# Year
-+0xe000,year
-+
-+# Back to mainpage link
-+0xe001,Main page
-+
-+# Up link
-+0xe002,up
-+
-+# Backward, forward link
-+0xe003,back
-+0xe004,next
-+
-+# Month names
-+0xe005,January
-+0xe006,February
-+0xe007,March
-+0xe008,April
-+0xe009,May
-+0xe010,June
-+0xe011,July
-+0xe012,August
-+0xe013,September
-+0xe014,October
-+0xe015,November
-+0xe016,December
-+
-+# Days of week names
-+0xe017,Su
-+0xe018,Mo
-+0xe019,Tu
-+0xe020,Wn
-+0xe021,Th
-+0xe022,Fr
-+0xe023,St
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/language/logs2html.finnish.lang src/eggdrop-1.8.4/src/mod/logs2html.mod/language/logs2html.finnish.lang
---- ./src/mod/logs2html.mod/language/logs2html.finnish.lang	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/language/logs2html.finnish.lang	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,38 @@
-+# logs2html.finnish.lang
-+# language messages for the logs2html module
-+
-+# Year
-+0xe000,vuosi
-+
-+# Back to mainpage link
-+0xe001,Koti
-+
-+# Up link
-+0xe002,yl�s
-+
-+# Backward, forward link
-+0xe003,edellinen
-+0xe004,seuraava
-+
-+# Month names
-+0xe005,Tammikuu
-+0xe006,Helmikuu
-+0xe007,Maaliskuu
-+0xe008,Huhtikuu
-+0xe009,Toukokuu
-+0xe010,Kes�kuu
-+0xe011,Hein�kuu
-+0xe012,Elokuu
-+0xe013,Syyskuu
-+0xe014,Lokakuu
-+0xe015,Marraskuu
-+0xe016,Joulukuu
-+
-+# Days of week names
-+0xe017,Su
-+0xe018,Ma
-+0xe019,Ti
-+0xe020,Ke
-+0xe021,To
-+0xe022,Pe
-+0xe023,La
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/language/logs2html.french.lang src/eggdrop-1.8.4/src/mod/logs2html.mod/language/logs2html.french.lang
---- ./src/mod/logs2html.mod/language/logs2html.french.lang	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/language/logs2html.french.lang	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,40 @@
-+# logs2html.french.lang
-+# language messages for the logs2html module
-+#
-+# Thanks to skiidoo patch (2007)
-+
-+# Year
-+0xe000,Ann�e
-+
-+# Back to mainpage link
-+0xe001,Page principale
-+
-+# Up link
-+0xe002,haut
-+
-+# Backward, forward link
-+0xe003,Pr�c�dente
-+0xe004,Suivante
-+
-+# Month names
-+0xe005,Janvier
-+0xe006,F�vrier
-+0xe007,Mars
-+0xe008,Avril
-+0xe009,Mai
-+0xe010,Juin
-+0xe011,Juillet
-+0xe012,Ao�t
-+0xe013,Septembre
-+0xe014,Octobre
-+0xe015,Novembre
-+0xe016,D�cembre
-+
-+# Days of week names
-+0xe017,Di
-+0xe018,Lu
-+0xe019,Ma
-+0xe020,Me
-+0xe021,Je
-+0xe022,Ve
-+0xe023,Sa
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/language/logs2html.german.lang src/eggdrop-1.8.4/src/mod/logs2html.mod/language/logs2html.german.lang
---- ./src/mod/logs2html.mod/language/logs2html.german.lang	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/language/logs2html.german.lang	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,38 @@
-+# logs2html.german.lang
-+# language messages for the logs2html module
-+
-+# Year
-+0xe000,jahr
-+
-+# Back to mainpage link
-+0xe001,Heim
-+
-+# Up link
-+0xe002,Spitze
-+
-+# Backward, forward link
-+0xe003,zur�ck
-+0xe004,n�chster
-+
-+# Month names
-+0xe005,Januar
-+0xe006,Februar
-+0xe007,M�rz
-+0xe008,April
-+0xe009,D�rfen
-+0xe010,Juni
-+0xe011,Juli
-+0xe012,August
-+0xe013,September
-+0xe014,Oktober
-+0xe015,November
-+0xe016,Dezember
-+
-+# Days of week names
-+0xe017,So
-+0xe018,Mo
-+0xe019,Di
-+0xe020,Mi
-+0xe021,Do
-+0xe022,Fr
-+0xe023,Sa
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/language/logs2html.russian.lang src/eggdrop-1.8.4/src/mod/logs2html.mod/language/logs2html.russian.lang
---- ./src/mod/logs2html.mod/language/logs2html.russian.lang	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/language/logs2html.russian.lang	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,38 @@
-+# logs2html.ru.lang
-+# language messages for the logs2html module
-+
-+# Year
-+0xe000,���
-+
-+# Back to mainpage link
-+0xe001,�� ������� ��������
-+
-+# Up link
-+0xe002,������
-+
-+# Backward, forward link
-+0xe003,����������
-+0xe004,���������
-+
-+# Month names
-+0xe005,������
-+0xe006,�������
-+0xe007,����
-+0xe008,������
-+0xe009,���
-+0xe010,����
-+0xe011,����
-+0xe012,������
-+0xe013,��������
-+0xe014,�������
-+0xe015,������
-+0xe016,�������
-+
-+# Days of week names
-+0xe017,��
-+0xe018,��
-+0xe019,��
-+0xe020,��
-+0xe021,��
-+0xe022,��
-+0xe023,��
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/language.h src/eggdrop-1.8.4/src/mod/logs2html.mod/language.h
---- ./src/mod/logs2html.mod/language.h	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/language.h	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,53 @@
-+/*
-+ * language.h -- part of logs2html.mod
-+ *
-+ * Written by Fedotov Alexander aka Gray_Angel aka Shmupsik <shurikvz@mail.ru>
-+ *
-+ * 2004-2005 year
-+ */
-+/*
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+#ifndef _EGG_MOD_LOGS2HTML_LANGUAGE_H
-+#define _EGG_MOD_LOGS2HTML_LANGUAGE_H
-+
-+#define LOGS2HTML_YEAR			get_language(0xe000)
-+#define LOGS2HTML_MAINPAGE		get_language(0xe001)
-+#define LOGS2HTML_UP			get_language(0xe002)
-+#define LOGS2HTML_BACK			get_language(0xe003)
-+#define LOGS2HTML_NEXT			get_language(0xe004)
-+
-+#define LOGS2HTML_JANUARY		get_language(0xe005)
-+#define LOGS2HTML_FEBRIARY		get_language(0xe006)
-+#define LOGS2HTML_MARCH			get_language(0xe007)
-+#define LOGS2HTML_APRIL			get_language(0xe008)
-+#define LOGS2HTML_MAY			get_language(0xe009)
-+#define LOGS2HTML_JUNE			get_language(0xe010)
-+#define LOGS2HTML_JULY			get_language(0xe011)
-+#define LOGS2HTML_AUGUST		get_language(0xe012)
-+#define LOGS2HTML_SEPTEMBER		get_language(0xe013)
-+#define LOGS2HTML_OCTOBER		get_language(0xe014)
-+#define LOGS2HTML_NOVEMBER		get_language(0xe015)
-+#define LOGS2HTML_DECEMBER		get_language(0xe016)
-+
-+#define LOGS2HTML_SUNDAY		get_language(0xe017)
-+#define LOGS2HTML_MONDAY		get_language(0xe018)
-+#define LOGS2HTML_TUESDAY		get_language(0xe019)
-+#define LOGS2HTML_WEDNESDAY		get_language(0xe020)
-+#define LOGS2HTML_THURSDAY		get_language(0xe021)
-+#define LOGS2HTML_FRIDAY		get_language(0xe022)
-+#define LOGS2HTML_SATURDAY		get_language(0xe023)
-+
-+#endif
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/logs2html.c src/eggdrop-1.8.4/src/mod/logs2html.mod/logs2html.c
---- ./src/mod/logs2html.mod/logs2html.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/logs2html.c	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,1679 @@
-+/*
-+ * logs2html.c -- part of logs2html.mod
-+ *
-+ * Written by Fedotov Alexander aka Shmupsik aka shurikvz <shurikvz@mail.ru>
-+ *
-+ * 2004-2009 year
-+ *
-+ * Patch and some changes to v.2.3.4 by skiidoo (2007)
-+ *
-+ */
-+/*
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+
-+#define MODULE_NAME "logs2html"
-+#define MAKING_LOGS2HTML
-+#include "src/mod/module.h"
-+
-+#include <stdlib.h>
-+#include <stdbool.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <time.h>
-+#include <ctype.h>
-+#include <sys/types.h>
-+#include <math.h>
-+#include <regex.h>
-+#include "logs2html.h"
-+#include "language.h"
-+
-+#undef global
-+
-+#define MODULE_MAJOR 2
-+#define MODULE_MINOR 4
-+#define MODULE_SUBMINOR 3
-+#define MODULE_BUILD "(ac100-ru fork)"
-+
-+static Function *global = NULL;
-+
-+static int shtime;
-+static int keep_all_logs;
-+static char logfile_suffix[21];
-+
-+static int lines_per_page;
-+static int start_year;
-+static int month_block_orientation;
-+static int dont_print_time;
-+static int dont_print_join;
-+static int dont_print_left;
-+static int dont_print_modechange;
-+static int dont_print_nickchange;
-+static int dont_print_kick;
-+static int dont_print_else;
-+
-+static int month_cols_count = 3;
-+static int month_rows_count = 4;
-+
-+static char mainpage_top_filename[257]		= "\0";
-+static char mainpage_bottom_filename[257]	= "\0";
-+static char logspage_top_filename[257]		= "\0";
-+static char logspage_bottom_filename[257]	= "\0";
-+static char userstyle_filename[257]			= "\0";
-+static char encoding_string[31]				= "\0";
-+
-+static l2hchan_t *logs2htmlchanlist = NULL;		// Here we keep list of our logs
-+
-+/* for language file */
-+static char month_names[12][MAX_MONTH_LENGTH];
-+static char days_names[7][MAX_DAY_LENGTH];
-+
-+static regex_t re_uri, re_uritrunc, re_email;
-+
-+static void logs2html_hook_5minutely(void);
-+static void logs2html_hook_hourly(void);
-+static void logs2html_hook_rehash(void);
-+static void logs2html_hook_pre_rehash(void);
-+static void event_addlogs2htmlchan(void);
-+
-+#ifndef _strlcpy
-+#include "strlcpy.c"
-+#endif
-+#include "fileoperations.c"
-+#include "htmloperations.c"
-+#include "tcllogs2html.c"
-+
-+
-+/*
-+ * Code starts here
-+ */
-+
-+/*
-+ * getdayofweek()
-+ * Input:
-+ *  year	- год
-+ *  month	- месяц
-+ *  day		- день
-+ *
-+ * Output:
-+ *  0 - Понедельник, 1 - Вторник, 2 - Среда и.т.д.
-+ *
-+ * Description:
-+ *  Функция вычисляет на какой день недели приходится переданная дата
-+ */
-+static int getdayofweek(int year, int month, int day)
-+{
-+	long int d1, d2, d3;
-+
-+	long int tdays = year * 12 + month - 3;
-+	month = tdays % 12;
-+	year = (tdays - month) / 12;
-+
-+	d1 = ((146097 * (year - (year % 100)) / 100) - ((146097 * (year - (year % 100)) / 100) % 4)) / 4;
-+	d2 = ((1461 * (year % 100)) - ((1461 * (year % 100)) % 4)) / 4;
-+	d3 = ((153 * month + 2) - ((153 * month + 2) % 5)) / 5 + day + 1721119;
-+
-+	return (d1 + d2 + d3) % 7;
-+} /* getdayofweek() */
-+/****************************************************************************/
-+
-+
-+/****************************************************************************/
-+static void makeindexpage(l2hchan_t *ch, int year) {
-+	/* Compute how many rows we need */
-+	if (month_cols_count < 0) { month_cols_count = 3; }
-+	if (month_cols_count > 12) { month_cols_count = 12; }
-+	month_rows_count = (int)ceil(12.0 / (double)month_cols_count);
-+
-+	time_t t = time(NULL);
-+	struct tm tblock = *localtime(&t);
-+
-+	FILE *file;
-+	// calculate maximum possible filenamelength
-+	int filenamelength = strlen(ch->outputpath) + strlen(SEP) + MAX(strlen(ch->mainpagename), strlen(ch->logspagename) + strlen("00") + strlen("00") + strlen("_pg000000")) + strlen("0000") + strlen(".html") + 1;
-+	char *filename = nmalloc(filenamelength);
-+
-+	egg_snprintf(filename, filenamelength, "%s%sdefault.css", ch->outputpath, SEP);
-+	if ((file = openfile(filename, "wb", false)) == NULL) {
-+		nfree(filename);
-+		return;
-+	}
-+	WriteCSSFile(file);
-+	fclose(file);
-+
-+	if (tblock.tm_year + 1900 == year) {
-+		egg_snprintf(filename, filenamelength, "%s%s%s.html", ch->outputpath, SEP, ch->mainpagename);
-+	} else {
-+		egg_snprintf(filename, filenamelength, "%s%s%s%d.html", ch->outputpath, SEP, ch->mainpagename, year);
-+	}
-+	if ((file = openfile(filename, "wb", false)) == NULL) {
-+		nfree(filename);
-+		return;
-+	}
-+
-+	str_write(file, "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n");
-+	str_write(file, "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n");
-+	str_write(file, "<head>\n");
-+	if (strlen(encoding_string) > 0) {str_write(file, "\t<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\" />\n", encoding_string); }
-+	str_write(file, "\t<meta name=\"title\" content=\"%s\" />\n", ch->mainpagetitle);
-+	str_write(file, "\t<meta name=\"description\" content=\"%s\" />\n", ch->mainpagetitle);
-+	str_write(file, "\t<meta name=\"generator\" content=\"logs2html module for Eggdrop v.%d.%d.%d%s\" />\n", MODULE_MAJOR, MODULE_MINOR, MODULE_SUBMINOR, MODULE_BUILD);
-+	str_write(file, "\t<meta name=\"author\" content=\"Fedotov Alexander aka shurikvz aka shmupsik\" />\n");
-+	str_write(file, "\t<meta name=\"keywords\" content=\"logs2html, logs, logging, channel, irc, bot, eggdrop, windrop, mirc, module, convert\" />\n");
-+	str_write(file, "\t<meta name=\"robots\" content= \"index,all\" />\n");
-+	str_write(file, "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"default.css\" />\n");
-+	if (strlen(userstyle_filename) > 0) str_write(file, "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"user.css\" />\n");
-+	str_write(file, "\t<title>%s %d %s</title>\n", ch->mainpagetitle, year, LOGS2HTML_YEAR);
-+	str_write(file, "\t<!--[if IE]>\n\t<style type=\"text/css\">\n\t.l2hMainPage #leftsidebar { padding-top: 30px; }\n\t.l2hMainPage #mainblock { zoom: 1; padding-top: 15px; }\n\t/* the above proprietary zoom property gives IE the hasLayout it may need to avoid several bugs */\n\t</style>\n\t<![endif]-->\n");
-+	str_write(file, "</head>\n\n");
-+
-+	str_write(file, "<body class=\"l2hMainPage\">\n");
-+	str_write(file, "\t<div id=\"container\">\n");
-+
-+	if (strlen(mainpage_top_filename) > 0) {
-+		str_write(file, "\t\t<div id=\"mp_top\">\n");
-+		writefromexfile(file, mainpage_top_filename);
-+		str_write(file, "\n\t\t</div>\n");
-+	}
-+
-+	str_write(file, "\t\t<div id=\"header\">\n<h2>%s<br />%d %s</h2>\n\t\t</div>\n", ch->mainpagetitle, year, LOGS2HTML_YEAR);
-+	str_write(file, "\t\t<div id=\"leftsidebar\">\n");
-+
-+	int loopyear;
-+	for(loopyear = start_year; loopyear <= tblock.tm_year + 1900; loopyear++) {
-+		str_write(file, "\t\t\t<div class=\"indexlink\">");
-+		if (loopyear == year) {
-+			str_write(file, "<a href=\"JavaScript:void(0);\">%d</a>", loopyear);
-+		} else {
-+			if (tblock.tm_year + 1900 == loopyear) {
-+				egg_snprintf(filename, filenamelength, "%s.html", ch->mainpagename);
-+			} else {
-+				egg_snprintf(filename, filenamelength, "%s%d.html", ch->mainpagename, loopyear);
-+			}
-+			str_write(file, "<a href=\"%s\">%d</a>", filename, loopyear);
-+		}
-+		str_write(file, "</div>\n");
-+	}
-+	str_write(file, "\t\t</div>\n\n");
-+	str_write(file, "\t\t<div id=\"mainblock\">\n");
-+	str_write(file, "\t\t\t<table id=\"monthtable\" width=\"100%%\" border=\"0\">\n");
-+
-+	int i, j, k;
-+	str_write(file, "\t\t\t\t<colgroup>\n");
-+	for(k = 0; k < month_cols_count; k++) {
-+		str_write(file, "\t\t\t\t\t<col width=\"%d%%\" />\n", (int)(100 / month_cols_count));
-+	}
-+	str_write(file, "\t\t\t\t</colgroup>\n");
-+
-+	for(i = 0; i < month_rows_count; i++) {
-+		str_write(file, "\t\t\t\t<tr>\n");
-+		for(j = 0; j < month_cols_count; j++) {
-+			int month = i * month_cols_count + j;
-+			int row, col;
-+
-+			str_write(file, "\t\t\t\t\t<td>\n\t\t\t\t\t\t<table class=\"monthblock\" width=\"100%%\">\n");
-+			str_write(file, "\t\t\t\t\t\t\t<colgroup>\n");
-+			for(k = 0; k < 7; k++) {
-+				str_write(file, "\t\t\t\t\t\t\t\t<col width=\"%d%%\" />\n", (int)(100 / 7));
-+			}
-+			str_write(file, "\t\t\t\t\t\t\t</colgroup>\n");
-+
-+			if ((month >= 0) && (month <= 11)) {
-+
-+				if (month_block_orientation != 0) {
-+					/*
-+					 * Horisontal block orientation
-+					 * Each table has: 1 row: month name, 1 row: day of week names, 6 rows: days of month
-+					 *                 7 columns: days of month.
-+					 * Total we must create 8x7 table
-+					 */
-+					str_write(file, "\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<th class=\"monthname\" colspan=\"7\">%s</th>\n\t\t\t\t\t\t\t</tr>\n", month_names[month]);
-+					str_write(file, "\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td class=\"dayname\">%s</td>\n\t\t\t\t\t\t\t\t<td class=\"dayname\">%s</td>\n\t\t\t\t\t\t\t\t<td class=\"dayname\">%s</td>\n\t\t\t\t\t\t\t\t<td class=\"dayname\">%s</td>\n\t\t\t\t\t\t\t\t<td class=\"dayname\">%s</td>\n\t\t\t\t\t\t\t\t<td class=\"dayname\">%s</td>\n\t\t\t\t\t\t\t\t<td class=\"weekend\">%s</td>\n\t\t\t\t\t\t\t</tr>\n",
-+							 days_names[0], days_names[1], days_names[2], days_names[3], days_names[4], days_names[5], days_names[6]);
-+					for(row = 0; row < 6; row++) {
-+						str_write(file, "\t\t\t\t\t\t\t<tr class=\"%s\">\n", (row % 2 == 0) ? "odd" : "even");
-+						for(col = 0; col < 7; col++) {
-+							int day = row * 7 + (col + 1) - getdayofweek(year, month + 1, 1);
-+							if ((day >= 1) && (day <= DAYS_IN_MONTH(year, month))) {
-+								egg_snprintf(filename, filenamelength, "%s%s%s%d%02d%02d_pg%d.html", ch->outputpath, SEP, ch->logspagename, year, month + 1, day, 1);
-+								//Lets check if file exist and we can paste link to it. If not exist we try to make it.
-+								if (!file_readable(filename)) {
-+									convertfile(ch, year, month + 1, day);
-+								}
-+								if (file_readable(filename)) {
-+									/* let write withount full path */
-+									egg_snprintf(filename, filenamelength, "%s%d%02d%02d_pg%d.html", ch->logspagename, year, month + 1, day, 1);
-+									str_write(file, "\t\t\t\t\t\t\t\t<td class=\"day\"><a href=\"%s\">%d</a></td>\n", filename, day);
-+								} else {
-+									str_write(file, "\t\t\t\t\t\t\t\t<td class=\"day\">%d</td>\n", day);
-+								}
-+							} else {
-+								str_write(file, "\t\t\t\t\t\t\t\t<td class=\"emptycell\">&nbsp;</td>\n");
-+							}
-+						}
-+						str_write(file, "\t\t\t\t\t\t\t</tr>\n");
-+					}
-+				} else {
-+					/*
-+					 * Vertical block orientation
-+					 * Each table has: 1 row: month name, 7 rows: (day of week + days of month) names,
-+					 *                 1 column: day of week names, 6 columns: days of month.
-+					 * Total we must create 8x7 table
-+					 */
-+					str_write(file, "\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<th class=\"monthname\" colspan=\"7\">%s</th>\n\t\t\t\t\t\t\t</tr>\n", month_names[month]);
-+					for(row = 0; row < 7; row++) {
-+						str_write(file, "\t\t\t\t\t\t\t<tr class=\"%s\">\n", (row % 2 == 0) ? "odd" : "even");
-+						for(col = 0; col < 7; col++) {
-+							/* First column - day names. */
-+							if (col == 0) {
-+								if (row == 6) {
-+									str_write(file, "\t\t\t\t\t\t\t\t<td class=\"weekend\">%s</td>\n", days_names[row]);
-+								} else {
-+									str_write(file, "\t\t\t\t\t\t\t\t<td class=\"dayname\">%s</td>\n", days_names[row]);
-+								}
-+								continue;
-+							}
-+							int day = (col - 1) * 7 + (row + 1) - getdayofweek(year, month + 1, 1);
-+							if ((day >= 1) && (day <= DAYS_IN_MONTH(year, month))) {
-+								egg_snprintf(filename, filenamelength, "%s%s%s%d%02d%02d_pg%d.html", ch->outputpath, SEP, ch->logspagename, year, month + 1, day, 1);
-+								//Lets check if file exist and we can paste link to it. If not exist we try to make it.
-+								if (!file_readable(filename)) {
-+									convertfile(ch, year, month + 1, day);
-+								}
-+								if (file_readable(filename)) {
-+									/* let write withount full path */
-+									egg_snprintf(filename, filenamelength, "%s%d%02d%02d_pg%d.html", ch->logspagename, year, month + 1, day, 1);
-+									str_write(file, "\t\t\t\t\t\t\t\t<td class=\"day\"><a href=\"%s\">%d</a></td>\n", filename, day);
-+								} else {
-+									str_write(file, "\t\t\t\t\t\t\t\t<td class=\"day\">%d</td>\n", day);
-+								}
-+							} else {
-+								str_write(file, "\t\t\t\t\t\t\t\t<td class=\"emptycell\">&nbsp;</td>\n");
-+							}
-+						}
-+						str_write(file, "\t\t\t\t\t\t\t</tr>\n");
-+					}
-+				}
-+			} else {
-+				/* No more months :) Write empty month block */
-+				for(row = 0; row < 8; row++) {
-+					str_write(file, "\t\t\t\t\t\t\t<tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
-+				}
-+			}
-+			str_write(file, "\t\t\t\t\t\t</table>\n\t\t\t\t\t</td>\n");
-+		}
-+		str_write(file, "\t\t\t\t</tr>\n");
-+	}
-+
-+	str_write(file, "\t\t\t</table>\n");
-+	str_write(file, "\t\t</div>\n\n");
-+
-+	str_write(file, "\t\t<br class=\"clearfloat\" />\n");
-+	str_write(file, "\t\t<div id=\"footer\">\n<p>Generated by logs2html module for eggdrop v.%d.%d.%d%s<br />", MODULE_MAJOR, MODULE_MINOR, MODULE_SUBMINOR, MODULE_BUILD);
-+	str_write(file, "Find latest version at <a href=\"http://sourceforge.net/projects/logs2html\">http://sourceforge.net/projects/logs2html</a> or <a href=\"http://www.halftone.ru/projects\">http://www.halftone.ru</a><br />");
-+	str_write(file, "Fork at <a href=\"https://github.com/ac100-ru/logs2html.mod\">https://github.com/ac100-ru/logs2html.mod</a></p>\n\t\t</div>\n");
-+
-+	if (strlen(mainpage_bottom_filename) > 0) {
-+		str_write(file, "\t\t<div id=\"mp_bottom\">\n");
-+		writefromexfile(file, mainpage_bottom_filename);
-+		str_write(file, "\n\t\t</div>\n");
-+	}
-+
-+	str_write(file, "\t</div>\n");
-+	str_write(file, "</body>\n");
-+	str_write(file, "</html>\n");
-+
-+	fclose(file);
-+	nfree(filename);
-+
-+	return;
-+} /* makeindexpage() */
-+/****************************************************************************/
-+
-+
-+/****************************************************************************/
-+/*
-+ * function void convertfile(l2hchan_t *ch, int year, int month, int day)
-+ *
-+ * Input:
-+ *
-+ *
-+ *
-+ * Output:
-+ *
-+ *
-+ * Discription:
-+ *   переводит файлы из текстового вида в формат HTML
-+ */
-+static void convertfile(l2hchan_t *ch, int year, int month, int day) {
-+
-+	FILE *file, *src_file;
-+	char buffer[LOGLINELEN], data[LOGLINELEN], ct[81], stamp[33];
-+	char *buf_ptr;
-+
-+	struct tm tblock;
-+	tblock.tm_year	= year - 1900;
-+	tblock.tm_mon	= month - 1;
-+	tblock.tm_mday	= day;
-+	tblock.tm_wday	= getdayofweek(year, month, day);
-+	tblock.tm_hour	= 0;
-+	tblock.tm_min	= 0;
-+	tblock.tm_sec	= 1;
-+	if (!logfile_suffix[0])
-+		egg_strftime(ct, 12, ".%d%b%Y", &tblock);
-+	else
-+		egg_strftime(ct, 80, logfile_suffix, &tblock);
-+	ct[80] = '\0';
-+
-+	// calculate maximum possible filenamelength
-+	int	filenamelength = MAX(strlen(ch->outputpath), strlen(ch->inputpath)) + MAX(strlen(SEP) + strlen(ch->logspagename) + strlen("0000") + strlen("00") + strlen("00") + strlen("_pg000000") + strlen(".html"), strlen(ct)) + 1;
-+	char *filename = nmalloc(filenamelength);
-+	egg_snprintf(filename, filenamelength, "%s%s", ch->inputpath, ct);
-+	if ((src_file = openfile(filename, "r", true)) == NULL) {
-+		nfree(filename);
-+		return;
-+	}
-+
-+	if (lines_per_page < 0) lines_per_page = 0;
-+
-+	int lines_count, tsl;
-+	int pages_count = 0;
-+	while(!feof(src_file)) {
-+		lines_count = lines_per_page;
-+		pages_count++;
-+
-+		egg_snprintf(filename, filenamelength, "%s%s%s%d%02d%02d_pg%d.html", ch->outputpath, SEP, ch->logspagename, year, month, day, pages_count);
-+		if ((file = openfile(filename, "wb", false)) == NULL) {
-+			fclose(src_file);
-+			putlog(LOG_MISC, "*", "logs2html: Error occured on converting %d page of file \"%s\"!", pages_count, filename);
-+			nfree(filename);
-+			return;
-+		}
-+
-+		str_write(file, "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n");
-+		str_write(file, "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n");
-+		str_write(file, "<head>\n");
-+		if (strlen(encoding_string) > 0) {str_write(file, "\t<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\" />\n", encoding_string); }
-+		str_write(file, "\t<meta name=\"title\" content=\"%s\" />\n", ch->logspagetitle);
-+		str_write(file, "\t<meta name=\"description\" content=\"%s\" />\n", ch->logspagetitle);
-+		str_write(file, "\t<meta name=\"generator\" content=\"logs2html module for Eggdrop v.%d.%d.%d%s\" />\n", MODULE_MAJOR, MODULE_MINOR, MODULE_SUBMINOR, MODULE_BUILD);
-+		str_write(file, "\t<meta name=\"author\" content=\"Fedotov Alexander aka shurikvz aka shmupsik\" />\n");
-+		str_write(file, "\t<meta name=\"keywords\" content=\"logs2html, logs, logging, channel, irc, bot, eggdrop, windrop, mirc, module, convert\" />\n");
-+		str_write(file, "\t<meta name=\"robots\" content= \"index,all\" />\n");
-+		str_write(file, "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"default.css\" />\n");
-+		if (strlen(userstyle_filename) > 0) str_write(file, "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"user.css\" />\n");
-+		str_write(file, "\t<title>%s. %d/%d/%d.</title>\n", ch->logspagetitle, day, month, year);
-+		str_write(file, "\t<!--[if IE]>\n\t<style type=\"text/css\">\n\t.l2hLogPage #mainblock { zoom: 1; padding-top: 15px; }\n\t/* the above proprietary zoom property gives IE the hasLayout it may need to avoid several bugs */\n\t</style>\n\t<![endif]-->\n");
-+		str_write(file, "</head>\n\n");
-+
-+		str_write(file, "<body class=\"l2hLogPage\">\n");
-+		str_write(file, "\t<div id=\"container\">\n");
-+
-+		if (strlen(logspage_top_filename) > 0) {
-+			str_write(file, "\t\t<div id=\"lp_top\">\n");
-+			writefromexfile(file, logspage_top_filename);
-+			str_write(file, "\n\t\t</div>\n");
-+		}
-+
-+		str_write(file, "\t\t<div id=\"header\">\n", ch->mainpagetitle, year, LOGS2HTML_YEAR);
-+		str_write(file, "\t\t\t<a name=\"top\" id=\"top\"></a>\n");
-+
-+		str_write(file, "\t\t</div>\n");
-+		str_write(file, "\t\t<div id=\"mainblock\">\n");
-+
-+		time_t t = time(NULL);
-+		tblock = *localtime(&t);
-+		if (tblock.tm_year + 1900 == year) {
-+			str_write(file, "\t\t\t<div id=\"navtop\"><a href=\"%s.html\">%s</a></div>\n", ch->mainpagename, LOGS2HTML_MAINPAGE);
-+		} else {
-+			str_write(file, "\t\t\t<div id=\"navtop\"><a href=\"%s%d.html\">%s</a></div>\n", ch->mainpagename, year, LOGS2HTML_MAINPAGE);
-+		}
-+
-+		while ((lines_count > 0) || (lines_per_page == 0)) {
-+
-+			buf_ptr = fgets(buffer, sizeof buffer, src_file);
-+			if (buf_ptr == NULL) break;
-+
-+			remove_crlf(&buf_ptr);
-+			if (!buf_ptr[0]) continue;
-+
-+			/* if timestamp exist cut time from string */
-+			data[0] = '\0';
-+			strcat(data, "\t\t\t<div>&nbsp;");
-+			if (shtime) {
-+				egg_strftime(stamp, sizeof(stamp) - 1, LOG_TS, &tblock); /* Print dummy time */
-+				tsl = strlen(stamp);
-+				if (dont_print_time == 0) {
-+					strcat(data, "<span class=\"time\">");
-+					strncat(data, buf_ptr, tsl);
-+					strcat(data, "</span>&nbsp;");
-+				}
-+				buf_ptr += (++tsl);
-+			}
-+			if (strncmp(buf_ptr, "--- ", 4) == 0) {  /* we don't really need this string I think */
-+				continue;
-+			}
-+
-+			bool IsElseClass = false;
-+			if (strncmp(buf_ptr, "Action: ", 8) == 0) {  /* command: /me */
-+				str_write(file, "%s", data);
-+				buf_ptr += 7;
-+				str_write(file, "<span class=\"action\">&nbsp;***");
-+			} else { /* nick */
-+				char *p = strstr(buf_ptr, "> ");
-+				if ((p != NULL) && (strncmp(buf_ptr, "<", 1) == 0)) {
-+					str_write(file, "%s", data);
-+					buf_ptr++;
-+					data[0] = '\0';
-+					strncat(data, buf_ptr, p - buf_ptr);
-+					str_write(file, "<span class=\"nick\">&lt;%s&gt;</span><span class=\"text\">&nbsp;", data);
-+					buf_ptr += (p - buf_ptr + 1);
-+				} else {
-+					IsElseClass = true;
-+					if (strstr(buf_ptr, " joined ") != NULL) {
-+						if (dont_print_join != 0) {continue; }
-+						str_write(file, "%s", data);
-+						str_write(file, "<span class=\"else_j\">&nbsp;");
-+					} else if (strstr(buf_ptr, " left irc: ") != NULL) {
-+						if (dont_print_left != 0) {continue; }
-+						str_write(file, "%s", data);
-+						str_write(file, "<span class=\"else_li\">&nbsp;");
-+					} else if (strstr(buf_ptr, " left ") != NULL) {
-+						if (dont_print_left != 0) {continue; }
-+						str_write(file, "%s", data);
-+						str_write(file, "<span class=\"else_l\">&nbsp;");
-+					} else if (strstr(buf_ptr, "Nick change: ") != NULL) {
-+						if (dont_print_nickchange != 0) {continue; }
-+						str_write(file, "%s", data);
-+						str_write(file, "<span class=\"else_n\">&nbsp;");
-+					} else if (strstr(buf_ptr, ": mode change '") != NULL) {
-+						if (dont_print_modechange != 0) {continue; }
-+						str_write(file, "%s", data);
-+						str_write(file, "<span class=\"else_m\">&nbsp;");
-+					} else if (strstr(buf_ptr, " kicked from ") != NULL) {
-+						if (dont_print_kick != 0) {continue; }
-+						str_write(file, "%s", data);
-+						str_write(file, "<span class=\"else_k\">&nbsp;");
-+					} else {
-+						if (dont_print_else != 0) {continue; }
-+						str_write(file, "%s", data);
-+						str_write(file, "<span class=\"else\">&nbsp;");
-+					}
-+				}
-+			}
-+
-+			lines_count--;
-+
-+			char *realloc_buf = NULL;
-+			replace_chars(buf_ptr, &realloc_buf);
-+			// We have special chars that we replaced. Now point buf_ptr to the realloc_buf,
-+			// strip_codes() will now work not with 'buffer' but with 'realloc_buf'
-+			if (realloc_buf != NULL) {
-+				buf_ptr = realloc_buf;
-+			}
-+
-+			l2hnode_t *tree = NULL;
-+			strip_codes(buf_ptr, &tree);
-+			l2hnode_t *ptree, *qtree; ptree = qtree = tree;
-+
-+			data[0] = '\0';
-+			int last_tag = 0;
-+			while (tree != NULL) {
-+				if (tree->node_so != last_tag) {
-+					data[0] = '\0';
-+					strncat(data, buf_ptr + last_tag, tree->node_so - last_tag); last_tag = tree->node_so;
-+					str_write(file, "%s", data);
-+				}
-+
-+				switch (tree->node_type) {
-+					case NODE_MIRCCOLOR:
-+						{
-+							if (tree->node_close) {
-+								str_write(file, "</span>");
-+							}
-+							if (tree->node_data != NULL) {
-+								str_write(file, "<span class=\"%s\">",  tree->node_data);
-+							}
-+						}
-+						break;
-+					case NODE_FONTSTYLE:
-+						{
-+							if (tree->node_close) {
-+								str_write(file, "</span>");
-+							} else {
-+								str_write(file, "<span style=\"%s\">", tree->node_data);
-+							}
-+						}
-+						break;
-+					case NODE_EMAIL:
-+						{
-+							if (!IsElseClass) { //Don't print emails on join/left, bans etc. Because client mask is look like email.
-+								if (tree->node_close) {
-+									str_write(file, "</a>");
-+								} else {
-+									str_write(file, "<a href=\"mailto:%s\">", tree->node_data);
-+								}
-+							}
-+						}
-+						break;
-+					case NODE_URI:
-+						{
-+							if (tree->node_close) {
-+								str_write(file, "</a>");
-+							} else {
-+								str_write(file, "<a href=\"%s\">", tree->node_data);
-+							}
-+						}
-+						break;
-+					case NODE_SPECIAL:
-+						{
-+							str_write(file, "%s", tree->node_data);
-+						}
-+						break;
-+				}
-+
-+				tree = tree->next;
-+			}
-+			str_write(file, "%s</span>", buf_ptr + last_tag);
-+
-+			str_write(file, "</div>\n");
-+
-+			// clear memory
-+			while (qtree != NULL) {
-+				qtree = ptree->next;
-+				if (ptree->node_data != NULL) { nfree(ptree->node_data); }
-+				nfree(ptree);
-+				ptree = qtree;
-+			}
-+			if (realloc_buf != NULL)  {
-+				nfree(realloc_buf);
-+			}
-+		}
-+		fclose(file);
-+	}
-+	fclose(src_file);
-+
-+	/*
-+	 * Now, if log is splited to some number of lines (lines_per_page) we write links to other pages, and also final close tags for html files.
-+	 */
-+	int i, j;
-+	for (i = 1; i <= pages_count; i++) {
-+		egg_snprintf(filename, filenamelength, "%s%s%s%d%02d%02d_pg%d.html", ch->outputpath, SEP, ch->logspagename, year, month, day, i);
-+		if ((file = openfile(filename, "ab", false)) == NULL) {
-+			putlog(LOG_MISC, "*", "logs2html: Error occured on converting %d page of file \"%s\"!", i, filename);
-+			nfree(filename);
-+			return;
-+		}
-+
-+		str_write(file, "\t\t</div>\n");
-+		if (pages_count > 1) {
-+			str_write(file, "\t\t<div id=\"navbottom\">");
-+			if (i == 1)	{
-+				str_write(file, LOGS2HTML_BACK);
-+			} else {
-+				egg_snprintf(filename, filenamelength, "%s%d%02d%02d_pg%d.html", ch->logspagename, year, month, day, i-1);
-+				str_write(file, "<span>&larr;</span>&nbsp;<a href=\"%s\">%s</a>", filename, LOGS2HTML_BACK);
-+			}
-+			str_write(file, "&nbsp;");
-+			if (i == pages_count)	{
-+				str_write(file, LOGS2HTML_NEXT);
-+			} else {
-+				egg_snprintf(filename, filenamelength, "%s%d%02d%02d_pg%d.html", ch->logspagename, year, month, day, i+1);
-+				str_write(file, "<a href=\"%s\">%s</a>&nbsp;<span>&rarr;</span>", filename, LOGS2HTML_NEXT);
-+			}
-+			str_write(file, "<br />");
-+			for (j = 1; j <= pages_count; j++) {
-+				egg_snprintf(filename, filenamelength, "%s%d%02d%02d_pg%d.html", ch->logspagename, year, month, day, j);
-+				if (j != i)	{
-+					str_write(file, "<span><a href=\"%s\">%d</a></span>", filename, j);
-+				} else {
-+					str_write(file, "<span id=\"navbottom_currentpg\">%d</span>", j);
-+				}
-+			}
-+			str_write(file, "</div>\n");
-+		}
-+		str_write(file, "\t\t<div id=\"totoplink\"><a href=\"#top\">%s</a></div>\n", LOGS2HTML_UP);
-+
-+		str_write(file, "\t\t<br class=\"clearfloat\" />\n");
-+		str_write(file, "\t\t<div id=\"footer\">\n<p>Generated by logs2html module for eggdrop v.%d.%d.%d%s<br />", MODULE_MAJOR, MODULE_MINOR, MODULE_SUBMINOR, MODULE_BUILD);
-+		str_write(file, "Find latest version at <a href=\"http://sourceforge.net/projects/logs2html\">http://sourceforge.net/projects/logs2html</a> or <a href=\"http://www.halftone.ru/projects\">http://www.halftone.ru</a><br />");
-+		str_write(file, "Fork at <a href=\"http://github.com/ac100-ru/logs2html.mod\">http://github.com/ac100-ru/logs2html.mod</a></p>\n\t\t</div>\n");
-+
-+		if (strlen(logspage_bottom_filename) > 0) {
-+			str_write(file, "\t\t<div id=\"lp_bottom\">\n");
-+			writefromexfile(file, logspage_bottom_filename);
-+			str_write(file, "\n\t\t</div>\n");
-+		}
-+
-+		str_write(file, "\t</div>\n");
-+		str_write(file, "</body>\n");
-+		str_write(file, "</html>\n");
-+
-+		fclose(file);
-+	}
-+
-+	nfree(filename);
-+
-+	return;
-+} /* convertfile() */
-+/****************************************************************************/
-+
-+
-+/****************************************************************************/
-+static void strip_codes(char *buf_ptr_copy, l2hnode_t **string_tree) {
-+			/*
-+			 * void strip_mirc_codes(int flags, char *text)
-+			 * copied from src/dcc.c and modified
-+			 *
-+			 * Copyright (C) 1997 Robey Pointer
-+			 * Copyright (C) 1999 - 2006 Eggheads Development Team
-+			 */
-+			char *dd = buf_ptr_copy;
-+			char *start = buf_ptr_copy;
-+			bool t_0x02_opened, t_0x03_opened, t_0x07_opened, t_0x1f_opened;
-+			t_0x02_opened = t_0x03_opened = t_0x07_opened = t_0x1f_opened = false;
-+
-+			l2hnode_t *temp_tree = NULL;
-+			l2hnode_t *newnode;
-+
-+			char fg_color[3], bg_color[3];
-+			bg_color[0] = '\0';
-+			while (*buf_ptr_copy) {
-+				switch (*buf_ptr_copy) {
-+					case 0xf:                  /* close all open tags */
-+						{
-+							buf_ptr_copy++;
-+							if (t_0x02_opened) {
-+								newnode = nmalloc(sizeof(struct l2hnode_struct));
-+								newnode->next		= NULL;
-+								newnode->node_type	= NODE_FONTSTYLE;
-+								newnode->node_so	= dd - start;
-+								newnode->node_close	= true;
-+								newnode->node_data = NULL;
-+								node_append(&temp_tree, newnode);
-+								t_0x02_opened = false;
-+							}
-+							if (t_0x07_opened) {
-+								newnode = nmalloc(sizeof(struct l2hnode_struct));
-+								newnode->next		= NULL;
-+								newnode->node_type	= NODE_FONTSTYLE;
-+								newnode->node_so	= dd - start;
-+								newnode->node_close	= true;
-+								newnode->node_data = NULL;
-+								node_append(&temp_tree, newnode);
-+								t_0x07_opened = false;
-+							}
-+							if (t_0x1f_opened) {
-+								newnode = nmalloc(sizeof(struct l2hnode_struct));
-+								newnode->next		= NULL;
-+								newnode->node_type	= NODE_FONTSTYLE;
-+								newnode->node_so	= dd - start;
-+								newnode->node_close	= true;
-+								newnode->node_data = NULL;
-+								node_append(&temp_tree, newnode);
-+								t_0x1f_opened = false;
-+							}
-+							if (t_0x03_opened) {
-+								newnode = nmalloc(sizeof(struct l2hnode_struct));
-+								newnode->next = NULL;
-+								newnode->node_type	= NODE_MIRCCOLOR;
-+								newnode->node_so	= dd - start;
-+								newnode->node_data	= NULL;
-+								newnode->node_close	= true;
-+								node_append(&temp_tree, newnode);
-+								t_0x03_opened = false;
-+								bg_color[0] = '\0';
-+							}
-+							continue;
-+						}
-+						break;
-+					case 3:                    /* mIRC colors? */
-+						{
-+							buf_ptr_copy++;           /* Skip over the ^C */
-+							fg_color[0] = '\0';
-+							if (egg_isdigit(*buf_ptr_copy)) { /* Is the first char a number? */
-+								fg_color[0] = *buf_ptr_copy;
-+								fg_color[1] = '\0';
-+								buf_ptr_copy ++;            /* Skip over the first digit */
-+								if (egg_isdigit(*buf_ptr_copy)) {     /* Is this a double digit number? */
-+										fg_color[1] = *buf_ptr_copy;
-+										fg_color[2] = '\0';
-+										buf_ptr_copy++;
-+								}
-+								// Even if we don't have background color in bg_color we have previous background, and we'll use it
-+								if (*buf_ptr_copy == ',') {   /* Do we have a background color next? */
-+									buf_ptr_copy++;           /* Skip over the , */
-+									if (egg_isdigit(*buf_ptr_copy)) {
-+										bg_color[0] = *buf_ptr_copy;
-+										bg_color[1] = '\0';
-+										buf_ptr_copy ++;            /* Skip over the first digit */
-+									}
-+									if (egg_isdigit(*buf_ptr_copy)) {     /* Is this a double digit number? */
-+										bg_color[1] = *buf_ptr_copy;
-+										bg_color[2] = '\0';
-+										buf_ptr_copy++;            /* Is it a double digit? */
-+									}
-+								}
-+
-+								if ((strlen(fg_color) > 0) && ((atoi(fg_color) < 0) || (atoi(fg_color) > 15)))	{
-+									fg_color[0] = '\0';
-+								}
-+								if (((strlen(bg_color) > 0) && ((atoi(bg_color) < 0) || (atoi(bg_color) > 15))) || (strlen(fg_color) == 0)) {
-+									bg_color[0] = '\0';
-+								}
-+
-+								if (strlen(fg_color) > 0) {
-+									newnode = nmalloc(sizeof(struct l2hnode_struct));
-+									newnode->next		= NULL;
-+									newnode->node_type	= NODE_MIRCCOLOR;
-+									newnode->node_so	= dd - start;
-+									newnode->node_close	= t_0x03_opened;
-+									if (strlen(bg_color) > 0) {
-+										newnode->node_data = nmalloc(6);
-+										egg_snprintf(newnode->node_data, 6, "c%02.2d%02.2d", atoi(fg_color), atoi(bg_color));
-+									} else {
-+										newnode->node_data = nmalloc(4);
-+										egg_snprintf(newnode->node_data, 4, "f%02.2d", atoi(fg_color));
-+									}
-+									node_append(&temp_tree, newnode);
-+									t_0x03_opened = true;
-+								}
-+							} else { /* Single ^C char - it was a close tag */
-+								newnode = nmalloc(sizeof(struct l2hnode_struct));
-+								newnode->next = NULL;
-+								newnode->node_type	= NODE_MIRCCOLOR;
-+								newnode->node_so	= dd - start;
-+								newnode->node_data	= NULL;
-+								newnode->node_close	= t_0x03_opened;
-+								node_append(&temp_tree, newnode);
-+								t_0x03_opened = false;
-+								bg_color[0] = '\0';
-+							}
-+							continue;
-+						}
-+						break;
-+					case 2:                    /* Bold text */
-+						{
-+							buf_ptr_copy++;
-+							newnode = nmalloc(sizeof(struct l2hnode_struct));
-+							newnode->next		= NULL;
-+							newnode->node_type	= NODE_FONTSTYLE;
-+							newnode->node_so	= dd - start;
-+							newnode->node_close	= t_0x02_opened;
-+							if (t_0x02_opened) {
-+								newnode->node_data = NULL;
-+							} else {
-+								newnode->node_data = nmalloc(strlen("font-weight:bold") + 1);
-+								strlcpy(newnode->node_data, "font-weight:bold", strlen("font-weight:bold") + 1);
-+							}
-+							t_0x02_opened = !t_0x02_opened;
-+							node_append(&temp_tree, newnode);
-+							continue;
-+						}
-+						break;
-+					case 7:					/* Italic text */
-+						{
-+							buf_ptr_copy++;
-+							newnode = nmalloc(sizeof(struct l2hnode_struct));
-+							newnode->next		= NULL;
-+							newnode->node_type	= NODE_FONTSTYLE;
-+							newnode->node_so	= dd - start;
-+							newnode->node_close	= t_0x07_opened;
-+							if (t_0x07_opened) {
-+								newnode->node_data = NULL;
-+							} else {
-+								newnode->node_data = nmalloc(strlen("font-style:italic") + 1);
-+								strlcpy(newnode->node_data, "font-style:italic", strlen("font-style:italic") + 1);
-+							}
-+							t_0x07_opened = !t_0x07_opened;
-+							node_append(&temp_tree, newnode);
-+							continue;
-+						}
-+						break;
-+					case 0x16:                 /* Reverse video */
-+						{
-+							buf_ptr_copy++;
-+							continue;
-+						}
-+						break;
-+					case 0x1f:                 /* Underlined text */
-+						{
-+							buf_ptr_copy++;
-+							newnode = nmalloc(sizeof(struct l2hnode_struct));
-+							newnode->next		= NULL;
-+							newnode->node_type	= NODE_FONTSTYLE;
-+							newnode->node_so	= dd - start;
-+							newnode->node_close	= t_0x1f_opened;
-+							if (t_0x1f_opened) {
-+								newnode->node_data = NULL;
-+							} else {
-+								newnode->node_data = nmalloc(strlen("text-decoration:underline") + 1);
-+								strlcpy(newnode->node_data, "text-decoration:underline", strlen("text-decoration:underline") + 1);
-+							}
-+							t_0x1f_opened = !t_0x1f_opened;
-+							node_append(&temp_tree, newnode);
-+							continue;
-+						}
-+						break;
-+					case 033:
-+						{
-+							buf_ptr_copy++;
-+							if (*buf_ptr_copy == '[') {
-+								buf_ptr_copy++;
-+								while ((*buf_ptr_copy == ';') || egg_isdigit(*buf_ptr_copy)) {
-+									buf_ptr_copy++;
-+								}
-+								if (*buf_ptr_copy) {
-+									buf_ptr_copy++;             /* also kill the following char */
-+								}
-+							}
-+							continue;
-+						}
-+						break;
-+				}
-+				*dd++ = *buf_ptr_copy++;            /* Move on to the next char */
-+			}
-+			*dd = 0;
-+			/*
-+			 * strip_mirc_codes() ends here.
-+			 */
-+
-+			//At that point we have temp_tree which points to the linked list of mirc codes and special chars (bold, italic) positions.
-+			// Now close any unclose tag
-+
-+			if (t_0x02_opened) {
-+				newnode = nmalloc(sizeof(struct l2hnode_struct));
-+				newnode->next		= NULL;
-+				newnode->node_type	= NODE_FONTSTYLE;
-+				newnode->node_so	= dd - start;
-+				newnode->node_close	= true;
-+				newnode->node_data = NULL;
-+				node_append(&temp_tree, newnode);
-+				t_0x02_opened = false;
-+			}
-+			if (t_0x07_opened) {
-+				newnode = nmalloc(sizeof(struct l2hnode_struct));
-+				newnode->next		= NULL;
-+				newnode->node_type	= NODE_FONTSTYLE;
-+				newnode->node_so	= dd - start;
-+				newnode->node_close	= true;
-+				newnode->node_data = NULL;
-+				node_append(&temp_tree, newnode);
-+				t_0x07_opened = false;
-+			}
-+			if (t_0x1f_opened) {
-+				newnode = nmalloc(sizeof(struct l2hnode_struct));
-+				newnode->next		= NULL;
-+				newnode->node_type	= NODE_FONTSTYLE;
-+				newnode->node_so	= dd - start;
-+				newnode->node_close	= true;
-+				newnode->node_data = NULL;
-+				node_append(&temp_tree, newnode);
-+				t_0x1f_opened = false;
-+			}
-+			if (t_0x03_opened) {
-+				newnode = nmalloc(sizeof(struct l2hnode_struct));
-+				newnode->next = NULL;
-+				newnode->node_type	= NODE_MIRCCOLOR;
-+				newnode->node_so	= dd - start;
-+				newnode->node_data	= NULL;
-+				newnode->node_close	= true;
-+				node_append(&temp_tree, newnode);
-+				t_0x03_opened = false;
-+				bg_color[0] = '\0';
-+			}
-+
-+
-+			// rewind to the start of the string
-+			dd = start;
-+
-+			int status_uri, status_email;
-+			regmatch_t pmatch_uri, pmatch_email;
-+
-+			do {
-+				status_uri = regexec(&re_uri, dd, (size_t) 1, &pmatch_uri, 0);
-+				status_email = regexec(&re_email, dd, (size_t) 1, &pmatch_email, 0);
-+
-+				int method;
-+				if ((status_email == 0) && (status_uri == 0)) { // We have uri & email in string
-+					if (pmatch_uri.rm_so == pmatch_email.rm_so) { // I think that it never must be so, but if it is - better lets write it as simple text
-+						method = 3;
-+					} else	if (pmatch_uri.rm_so > pmatch_email.rm_so) {
-+						method = 1;
-+					} else {
-+						method = 2;
-+					}
-+				} else if ((status_email == 0) && (status_uri != 0)) { // We have only email in string
-+					method = 1;
-+				} else if ((status_email != 0) && (status_uri == 0)) { // We have only uri in string
-+					method = 2;
-+				} else { // No uri or email in string, simply assign temp_tree to result
-+					method = 3;
-+				}
-+
-+				l2hnode_t *temp;
-+				if (method == 1) {
-+					while ((temp_tree != NULL) && (temp_tree->node_so < pmatch_email.rm_so + (dd - start))) {
-+						temp = temp_tree;
-+						temp_tree = temp_tree->next;
-+						temp->next = NULL;
-+						node_append(string_tree, temp);
-+					}
-+
-+					newnode = nmalloc(sizeof(struct l2hnode_struct));
-+					newnode->next = NULL;
-+					newnode->node_type = NODE_EMAIL;
-+					newnode->node_so = pmatch_email.rm_so + (dd - start);
-+					newnode->node_data = nmalloc(pmatch_email.rm_eo - pmatch_email.rm_so + 1);
-+					newnode->node_data[0] = '\0';
-+					strncat(newnode->node_data, dd + pmatch_email.rm_so, pmatch_email.rm_eo - pmatch_email.rm_so);
-+					newnode->node_close = false;
-+					node_append(string_tree, newnode);
-+
-+					while ((temp_tree != NULL) && ((temp_tree->node_so < pmatch_email.rm_eo + (dd - start)) || ((temp_tree->node_so == pmatch_email.rm_eo + (dd - start)) && (temp_tree->node_close == true)))) {
-+						temp = temp_tree;
-+						temp_tree = temp_tree->next;
-+						temp->next = NULL;
-+						node_append(string_tree, temp);
-+					}
-+
-+					newnode = nmalloc(sizeof(struct l2hnode_struct));
-+					newnode->next = NULL;
-+					newnode->node_type = NODE_EMAIL;
-+					newnode->node_so = pmatch_email.rm_eo + (dd - start);
-+					newnode->node_data = NULL;
-+					newnode->node_close = true;
-+					node_append(string_tree, newnode);
-+					dd += pmatch_email.rm_eo;
-+					continue;
-+				} else if (method == 2) {
-+					while ((temp_tree != NULL) && (temp_tree->node_so < pmatch_uri.rm_so + (dd - start))) {
-+						temp = temp_tree;
-+						temp_tree = temp_tree->next;
-+						temp->next = NULL;
-+						node_append(string_tree, temp);
-+					}
-+
-+					newnode = nmalloc(sizeof(struct l2hnode_struct));
-+					newnode->next = NULL;
-+					newnode->node_type = NODE_URI;
-+					newnode->node_so = pmatch_uri.rm_so + (dd - start);
-+					// if uri begins with protocol name - simply output our uri, else we must add protocol name to our uri
-+					if (regexec(&re_uritrunc, dd + pmatch_uri.rm_so, (size_t) 0, NULL, 0) == 0) {
-+						newnode->node_data = nmalloc(pmatch_uri.rm_eo - pmatch_uri.rm_so + 1);
-+						newnode->node_data[0] = '\0';
-+					} else {
-+						// if uri look like 'ftp.eggheads.org' we add 'ftp://' protocol, else let it be 'http://'
-+						if (strncmp(dd + pmatch_uri.rm_so, "ftp.", 4) == 0) {
-+							newnode->node_data = nmalloc(strlen("ftp://") + pmatch_uri.rm_eo - pmatch_uri.rm_so + 1);
-+							newnode->node_data[0] = '\0';
-+							strncat(newnode->node_data, "ftp://", strlen("ftp://"));
-+						} else {
-+							newnode->node_data = nmalloc(strlen("http://") + pmatch_uri.rm_eo - pmatch_uri.rm_so + 1);
-+							newnode->node_data[0] = '\0';
-+							strncat(newnode->node_data, "http://", strlen("http://"));
-+						}
-+					}
-+					strncat(newnode->node_data, dd + pmatch_uri.rm_so, pmatch_uri.rm_eo - pmatch_uri.rm_so);
-+					newnode->node_close = false;
-+					node_append(string_tree, newnode);
-+
-+					while ((temp_tree != NULL) && ((temp_tree->node_so < pmatch_uri.rm_eo + (dd - start)) || ((temp_tree->node_so == pmatch_uri.rm_eo + (dd - start)) && (temp_tree->node_close == true)))) {
-+						temp = temp_tree;
-+						temp_tree = temp_tree->next;
-+						temp->next = NULL;
-+						node_append(string_tree, temp);
-+					}
-+
-+					newnode = nmalloc(sizeof(struct l2hnode_struct));
-+					newnode->next = NULL;
-+					newnode->node_type = NODE_URI;
-+					newnode->node_so = pmatch_uri.rm_eo + (dd - start);
-+					newnode->node_data = NULL;
-+					newnode->node_close = true;
-+					node_append(string_tree, newnode);
-+					dd += pmatch_uri.rm_eo;
-+					continue;
-+				} else if (method == 3) {
-+					while (temp_tree != NULL) {
-+						temp = temp_tree;
-+						temp_tree = temp_tree->next;
-+						temp->next = NULL;
-+						node_append(string_tree, temp);
-+					}
-+					break;
-+				}
-+
-+			} while ((status_email == 0) || (status_uri == 0));
-+
-+
-+	return;
-+}
-+/****************************************************************************/
-+
-+
-+/*
-+ * int list_append(struct list_type **h, struct list_type *i)
-+ * copied from src/userent.c and modified
-+ *
-+ * Copyright (C) 1997 Robey Pointer
-+ * Copyright (C) 1999 - 2006 Eggheads Development Team
-+ */
-+static void node_append(struct l2hnode_struct **h, struct l2hnode_struct *i)
-+{
-+  for (; *h; h = &((*h)->next));
-+  *h = i;
-+  return;
-+}
-+/*
-+ * list_append() ends here.
-+ */
-+
-+
-+/****************************************************************************/
-+static void replace_chars(char *buf_ptr_copy, char **realloc_buf)
-+{
-+	// Loop through string if there are chars, which we can safely replace with their xhtml analog,
-+	// if there are - count number of bytes we need our string to grow
-+	int realloc_size = 0;
-+	char *dd = buf_ptr_copy;
-+
-+	while (*dd) {
-+		switch (*dd) {
-+			case 0x3c:		/* < */
-+				{
-+					realloc_size += strlen("&lt;") - strlen("<");
-+				}
-+				break;
-+			case 0x3e:		/* > */
-+				{
-+					realloc_size += strlen("&gt;") - strlen(">");
-+				}
-+				break;
-+			case 0x22:		/* " */
-+				{
-+					realloc_size += strlen("&quot;") - strlen("""");
-+				}
-+				break;
-+			case 0x26:		/* & */
-+				{
-+					realloc_size += strlen("&amp;") - strlen("&");
-+				}
-+				break;
-+		}
-+		dd++;            /* Move on to the next char */
-+	}
-+
-+	if (realloc_size > 0) {
-+		(*realloc_buf) = nmalloc(strlen(buf_ptr_copy) + realloc_size + 1);
-+		dd = (*realloc_buf); *dd = '\0';
-+
-+		while (*buf_ptr_copy) {
-+			switch (*buf_ptr_copy) {
-+				case 0x3c:		/* < */
-+					{
-+						strncat(dd, "&lt;", strlen("&lt;"));
-+						buf_ptr_copy++; dd += strlen("&lt;");
-+						continue;
-+					}
-+					break;
-+				case 0x3e:		/* > */
-+					{
-+						strncat(dd, "&gt;", strlen("&gt;"));
-+						buf_ptr_copy++; dd += strlen("&gt;");
-+						continue;
-+					}
-+					break;
-+				case 0x22:		/* " */
-+					{
-+						strncat(dd, "&quot;", strlen("&quot;"));
-+						buf_ptr_copy++; dd += strlen("&quot;");
-+						continue;
-+					}
-+					break;
-+				case 0x26:		/* & */
-+					{
-+						strncat(dd, "&amp;", strlen("&amp;"));
-+						buf_ptr_copy++; dd += strlen("&amp;");
-+						continue;
-+					}
-+					break;
-+			}
-+			*dd++ = *buf_ptr_copy++;            /* Move on to the next char */
-+			*dd = '\0';                         /* for strncat(), cause string must be null terminated or we'll get buffer overflow */
-+		}
-+		*dd = 0;
-+	}
-+
-+	return;
-+}
-+/****************************************************************************/
-+
-+
-+/****************************************************************************/
-+/*
-+ * function int cmd_makemainpage(struct userrec *u, int idx, char *par)
-+ *
-+ * Input:
-+ *
-+ *
-+ *
-+ * Output:
-+ *
-+ *
-+ * Discription:
-+ *
-+ */
-+static int cmd_makemainpage(struct userrec *u, int idx, char *par) {
-+
-+	time_t start, finish;
-+	time(&start);
-+	putlog(LOG_CMDS, "*", "#%s# begin creation of index pages.", dcc[idx].nick);
-+
-+	time_t t = time(NULL);
-+	struct tm tblock = *localtime(&t);
-+
-+	l2hchan_t *p = logs2htmlchanlist;
-+	while (p != NULL) {
-+		int i;
-+
-+		start_year = MIN(MAX(start_year, 2000), tblock.tm_year + 1900);
-+
-+		for (i = start_year; i <= tblock.tm_year + 1900; i++) {
-+			dprintf(idx, " Creating index page for channel '%s' for %d year.\n", p->channame, i);
-+			makeindexpage(p, i);
-+		}
-+		p = p->next;
-+	}
-+
-+	putlog(LOG_CMDS, "*", "#%s# creation of index pages finished.", dcc[idx].nick);
-+	time(&finish);
-+	double elapsed_time = difftime(finish, start);
-+	if (elapsed_time == 0.0) {
-+		putlog(LOG_CMDS, "*", "#%s# It takes < 1 second.", dcc[idx].nick);
-+	}
-+	else {
-+		putlog(LOG_CMDS, "*", "#%s# It takes %f second%s.", dcc[idx].nick, elapsed_time, (elapsed_time != 1.0) ? "s" : "");
-+	}
-+
-+	return 0;
-+} /* cmd_makemainpage() */
-+/****************************************************************************/
-+
-+
-+/****************************************************************************/
-+/*
-+ * function int convertalllogs(struct userrec *u, int idx, char *par)
-+ *
-+ * Input:
-+ *
-+ *
-+ *
-+ * Output:
-+ *
-+ *
-+ * Discription:
-+ *
-+ */
-+static int cmd_convertalllogs(struct userrec *u, int idx, char *par) {
-+
-+	return cmd_convertlogs(u, idx, "all");
-+} /* convertalllogs() */
-+/****************************************************************************/
-+
-+
-+/****************************************************************************/
-+static int cmd_convertlogs(struct userrec *u, int idx, char *par) {
-+
-+	time_t start, finish;
-+	time(&start);
-+	putlog(LOG_CMDS, "*", "#%s# begin creation of logfiles.", dcc[idx].nick);
-+
-+	time_t t = time(NULL);
-+	struct tm tblock = *localtime(&t);
-+
-+	l2hchan_t *p = logs2htmlchanlist;
-+
-+	if (!par[0]) {
-+
-+		//no parameter. Convert log for all channels for current day.
-+		while (p != NULL) {
-+			dprintf(idx, " Converting log for channel '%s' for current day.\n", p->channame);
-+			convertfile(p, tblock.tm_year + 1900, tblock.tm_mon + 1, tblock.tm_mday);
-+			dprintf(idx, " Creating index page for channel '%s' for %d year.\n", p->channame, tblock.tm_year + 1900);
-+			makeindexpage(p, tblock.tm_year + 1900);
-+			p = p->next;
-+		}
-+
-+	} else {
-+
-+		int i, j, k;
-+		start_year = MIN(MAX(start_year, 2000), tblock.tm_year + 1900);
-+		char *part;
-+
-+		part = newsplit(&par);
-+		if (!egg_strncasecmp(part, "all", 3)) { // "all". Convert logs for all channels for all years.
-+
-+			while (p != NULL) {
-+				for (i = start_year; i <= tblock.tm_year + 1900; i++) {
-+					dprintf(idx, " Creating logs for channel '%s' for %d year.\n", p->channame, i);
-+					for (j = 0; j < 12; j++) {
-+						for (k = 1; k <= DAYS_IN_MONTH(i, j); k++) {
-+							convertfile(p, i, j + 1, k);
-+						}
-+					}
-+					dprintf(idx, " Creating index page for channel '%s' for %d year.\n", p->channame, i);
-+					makeindexpage(p, i);
-+				}
-+				p = p->next;
-+			}
-+		} else { // Check for year, month, day
-+
-+			int year, month, day;
-+			year = atoi(part);
-+			if ((year < start_year) || (year > tblock.tm_year + 1900)) { // Check if parameter is valid year
-+				dprintf(idx, " Invalid parameter. 'year' must be between %d and %d.\n", start_year, tblock.tm_year + 1900);
-+				return 1;
-+			}
-+			part = newsplit(&par);
-+			if (!part[0]) { // Is there second parameter?
-+
-+				while (p != NULL) {
-+					dprintf(idx, " Creating logs for channel '%s' for %d year.\n", p->channame, year);
-+					for (j = 0; j < 12; j++) {
-+						for (k = 1; k <= DAYS_IN_MONTH(year, j); k++) {
-+							convertfile(p, year, j + 1, k);
-+						}
-+					}
-+					dprintf(idx, " Creating index page for channel '%s' for %d year.\n", p->channame, year);
-+					makeindexpage(p, year);
-+					p = p->next;
-+				}
-+
-+			} else { // No second parameter. We have only year
-+
-+				month = atoi(part);
-+				if ((month < 1) || (month > 12)) { // Check if parameter is valid month
-+					dprintf(idx, " Invalid parameter. 'month' must be between %d and %d.\n", 1, 12);
-+					return 1;
-+				}
-+				part = newsplit(&par);
-+				if (!part[0]) { // Is there third parameter?
-+
-+					while (p != NULL) {
-+						dprintf(idx, " Creating logs for channel '%s' for %d year, for %d month.\n", p->channame, year, month);
-+						for (k = 1; k <= DAYS_IN_MONTH(year, month - 1); k++) {
-+							convertfile(p, year, month, k);
-+						}
-+						dprintf(idx, " Creating index page for channel '%s' for %d year.\n", p->channame, year);
-+						makeindexpage(p, year);
-+						p = p->next;
-+					}
-+
-+				} else { // No third parameter, we have year and month
-+
-+					day = atoi(part);
-+					if ((day < 1) || (day > DAYS_IN_MONTH(year, month - 1))) { // Check if parameter is valid day
-+						dprintf(idx, " Invalid parameter. 'day' must be between %d and %d.\n", 1, DAYS_IN_MONTH(year, month - 1));
-+						return 1;
-+					}
-+
-+					while (p != NULL) {
-+						dprintf(idx, " Creating log for channel '%s' for %d year, for %d month, for %d day.\n", p->channame, year, month, day);
-+						convertfile(p, year, month, day);
-+						dprintf(idx, " Creating index page for channel '%s' for %d year.\n", p->channame, year);
-+						makeindexpage(p, year);
-+						p = p->next;
-+					}
-+
-+				}
-+
-+			}
-+		}
-+
-+	}
-+
-+	putlog(LOG_CMDS, "*", "#%s# creation of logfiles finished.", dcc[idx].nick);
-+	time(&finish);
-+	double elapsed_time = difftime(finish, start);
-+	if (elapsed_time == 0.0) {
-+		putlog(LOG_CMDS, "*", "#%s# It takes < 1 second.", dcc[idx].nick);
-+	}
-+	else {
-+		putlog(LOG_CMDS, "*", "#%s# It takes %f second%s.", dcc[idx].nick, elapsed_time, (elapsed_time != 1.0) ? "s" : "");
-+	}
-+	return 0;
-+} /* convertlogs() */
-+/****************************************************************************/
-+
-+
-+/****************************************************************************/
-+static void initialize(void)
-+{
-+	strlcpy(month_names[0],	LOGS2HTML_JANUARY,		MAX_MONTH_LENGTH);
-+	strlcpy(month_names[1],	LOGS2HTML_FEBRIARY,		MAX_MONTH_LENGTH);
-+	strlcpy(month_names[2],	LOGS2HTML_MARCH,		MAX_MONTH_LENGTH);
-+	strlcpy(month_names[3],	LOGS2HTML_APRIL,		MAX_MONTH_LENGTH);
-+	strlcpy(month_names[4],	LOGS2HTML_MAY,			MAX_MONTH_LENGTH);
-+	strlcpy(month_names[5],	LOGS2HTML_JUNE,			MAX_MONTH_LENGTH);
-+	strlcpy(month_names[6],	LOGS2HTML_JULY,			MAX_MONTH_LENGTH);
-+	strlcpy(month_names[7],	LOGS2HTML_AUGUST,		MAX_MONTH_LENGTH);
-+	strlcpy(month_names[8],	LOGS2HTML_SEPTEMBER,	MAX_MONTH_LENGTH);
-+	strlcpy(month_names[9],	LOGS2HTML_OCTOBER,		MAX_MONTH_LENGTH);
-+	strlcpy(month_names[10],LOGS2HTML_NOVEMBER,		MAX_MONTH_LENGTH);
-+	strlcpy(month_names[11],LOGS2HTML_DECEMBER,		MAX_MONTH_LENGTH);
-+	strlcpy(days_names[0],	LOGS2HTML_MONDAY,		MAX_DAY_LENGTH);
-+	strlcpy(days_names[1],	LOGS2HTML_TUESDAY,		MAX_DAY_LENGTH);
-+	strlcpy(days_names[2],	LOGS2HTML_WEDNESDAY,	MAX_DAY_LENGTH);
-+	strlcpy(days_names[3],	LOGS2HTML_THURSDAY,		MAX_DAY_LENGTH);
-+	strlcpy(days_names[4],	LOGS2HTML_FRIDAY,		MAX_DAY_LENGTH);
-+	strlcpy(days_names[5],	LOGS2HTML_SATURDAY,		MAX_DAY_LENGTH);
-+	strlcpy(days_names[6],	LOGS2HTML_SUNDAY,		MAX_DAY_LENGTH);
-+
-+	// Precompile our regular expressions
-+    if (regcomp(&re_uri, "((file|gopher|news|nntp|telnet|http|ftp|https|ftps|sftp)://|www\\.|ftp\\.)+(([a-zA-Z0-9\\._-]+\\.[a-zA-Z]{2,6})|([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}))(/(([a-zA-Z0-9%_#:\\./=?-]|\\&amp;)*([a-zA-Z0-9%_#:\\/=?-]|\\&amp;))*)?", REG_EXTENDED|REG_ICASE) != 0) {
-+		putlog(LOG_CMDS, "*", "logs2html: Error while making regular expression for uri.");
-+    }
-+    if (regcomp(&re_uritrunc, "^((file|gopher|news|nntp|telnet|http|ftp|https|ftps|sftp)://){1}", REG_EXTENDED|REG_ICASE|REG_NOSUB) != 0) {
-+		putlog(LOG_CMDS, "*", "logs2html: Error while making regular expression for truncate uri.");
-+    }
-+	if (regcomp(&re_email, "([a-zA-Z]([a-zA-Z0-9_\\-\\.]*[a-zA-Z0-9])*)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)", REG_EXTENDED|REG_ICASE) != 0) {
-+		putlog(LOG_CMDS, "*", "logs2html: Error while making regular expression for email.");
-+    }
-+
-+	return;
-+}
-+/****************************************************************************/
-+
-+
-+/****************************************************************************/
-+static void finalize(void)
-+{
-+	l2hchan_t *p, *q;
-+
-+	p = q = logs2htmlchanlist;
-+	while (q != NULL) {
-+		q = p->next;
-+		if (p->channame != NULL)		nfree(p->channame);
-+		if (p->inputpath != NULL)		nfree(p->inputpath);
-+		if (p->outputpath != NULL)		nfree(p->outputpath);
-+		if (p->mainpagename != NULL)	nfree(p->mainpagename);
-+		if (p->mainpagetitle != NULL)	nfree(p->mainpagetitle);
-+		if (p->logspagename != NULL)	nfree(p->logspagename);
-+		if (p->logspagetitle != NULL)	nfree(p->logspagetitle);
-+		nfree(p);
-+		p = q;
-+	}
-+	logs2htmlchanlist = p = q = NULL;
-+
-+	regfree(&re_email);
-+	regfree(&re_uritrunc);
-+	regfree(&re_uri);
-+
-+	return;
-+}
-+/****************************************************************************/
-+
-+
-+/****************************************************************************/
-+static void logs2html_hook_5minutely(void)
-+{
-+	time_t t = time(NULL);
-+	struct tm tblock = *localtime(&t);
-+	tblock.tm_hour	= 0;
-+	tblock.tm_min	= 0;
-+	tblock.tm_sec	= 1;
-+
-+	l2hchan_t *p = logs2htmlchanlist;
-+	while (p != NULL) {
-+		convertfile(p, tblock.tm_year + 1900, tblock.tm_mon + 1, tblock.tm_mday);
-+		makeindexpage(p, tblock.tm_year + 1900);
-+		p = p->next;
-+	}
-+
-+	return;
-+}
-+/****************************************************************************/
-+
-+
-+/****************************************************************************/
-+static void logs2html_hook_hourly(void)
-+{
-+	time_t t = time(NULL);
-+
-+	struct tm tnow = *localtime(&t);
-+
-+	t -= (time_t)(60);
-+
-+	struct tm tblock = *localtime(&t);
-+	tblock.tm_hour	= 0;
-+	tblock.tm_min	= 0;
-+	tblock.tm_sec	= 1;
-+
-+	//Let's convert log for previous day, because last 5 minutes of that log was not converted
-+	//by logs2html_hook_5minutely(void) procedure.
-+	if (tnow.tm_mday != tblock.tm_mday) {
-+		l2hchan_t *p = logs2htmlchanlist;
-+		while (p != NULL) {
-+			convertfile(p, tblock.tm_year + 1900, tblock.tm_mon + 1, tblock.tm_mday);
-+			makeindexpage(p, tblock.tm_year + 1900);
-+			p = p->next;
-+		}
-+	}
-+
-+	//Let's convert logs for previous year, because name of the index page change from prefix.html to prefixPASTYEAR.html
-+	if (tnow.tm_year != tblock.tm_year) {
-+		int j, k;
-+
-+		l2hchan_t *p = logs2htmlchanlist;
-+		while (p != NULL) {
-+			for (j = 0; j < 12; j++) {
-+				for (k = 1; k <= DAYS_IN_MONTH(tblock.tm_year + 1900, j); k++) {
-+					convertfile(p, tblock.tm_year + 1900, j + 1, k);
-+				}
-+			}
-+			makeindexpage(p, tblock.tm_year + 1900);
-+			p = p->next;
-+		}
-+	}
-+
-+	return;
-+}
-+/****************************************************************************/
-+
-+
-+/****************************************************************************/
-+static void logs2html_hook_pre_rehash(void)
-+{
-+	finalize();
-+
-+	return;
-+}
-+/****************************************************************************/
-+
-+
-+/****************************************************************************/
-+static void logs2html_hook_rehash(void)
-+{
-+	initialize();
-+
-+	return;
-+}
-+/****************************************************************************/
-+
-+
-+static void event_addlogs2htmlchan(void)
-+{
-+	check_tcl_event("addlogs2htmlchan");
-+
-+	return;
-+}
-+
-+
-+/*
-+ * Calculate the memory we keep allocated.
-+ */
-+static int logs2html_expmem()
-+{
-+	int size = 0;
-+	l2hchan_t *p = logs2htmlchanlist;
-+	while (p != NULL) {
-+		size += sizeof(struct l2hchan_struct);
-+		if (p->channame != NULL)		size += strlen(p->channame) + 1;
-+		if (p->inputpath != NULL)		size += strlen(p->inputpath) + 1;
-+		if (p->outputpath != NULL)		size += strlen(p->outputpath) + 1;
-+		if (p->mainpagename != NULL)	size += strlen(p->mainpagename) + 1;
-+		if (p->mainpagetitle != NULL)	size += strlen(p->mainpagetitle) + 1;
-+		if (p->logspagename != NULL)	size += strlen(p->logspagename) + 1;
-+		if (p->logspagetitle != NULL)	size += strlen(p->logspagetitle) + 1;
-+		p = p->next;
-+	}
-+
-+	size += MAX_MONTH_LENGTH * 12;
-+	size += MAX_DAY_LENGTH * 7;
-+
-+	return size;
-+}
-+
-+/* A report on the module status.
-+ *
-+ * details is either 0 or 1:
-+ *    0 - `.status'
-+ *    1 - `.status all'  or  `.module logs2html'
-+ */
-+static void logs2html_report(int idx, int details)
-+{
-+	if (logs2htmlchanlist != NULL) {
-+		l2hchan_t *p = logs2htmlchanlist;
-+
-+		dprintf(idx, "    logs2html channels list:\n");
-+		while (p != NULL) {
-+			dprintf(idx, "     Channel: '%s'.\n", p->channame);
-+			dprintf(idx, "      path to logfiles: '%s'\n", p->inputpath);
-+			dprintf(idx, "      path to generated html pages: '%s'.\n", p->outputpath);
-+			p = p->next;
-+		}
-+	}
-+
-+	if (details) {
-+		int size = logs2html_expmem();
-+		dprintf(idx, "    Using %d byte%s of memory\n", size, (size != 1) ? "s" : "");
-+	}
-+
-+	return;
-+}
-+
-+static cmd_t mydcc[] = {
-+	{"convertalllogs",	"n",	cmd_convertalllogs,	NULL},
-+	{"makemainpage",	"n",	cmd_makemainpage,	NULL},
-+	{"makeindexpage",	"n",	cmd_makemainpage,	NULL},
-+	{"convertlogs",		"n",	cmd_convertlogs,	NULL},
-+	{NULL,				NULL,	NULL,				NULL}	/* Mark end. */
-+};
-+
-+static tcl_strings my_tcl_strings[] = {
-+	{"logfile-suffix",		logfile_suffix,				20,		0},
-+	{"mainpage-top",		mainpage_top_filename,		256,	0},
-+	{"mainpage-bottom",		mainpage_bottom_filename,	256,	0},
-+	{"logspage-top",		logspage_top_filename,		256,	0},
-+	{"logspage-bottom",		logspage_bottom_filename,	256,	0},
-+	{"user-style",			userstyle_filename,			256,	0},
-+	{"insert-encoding-str",	encoding_string,			30,		0},
-+	{NULL,					NULL,						0,		0}	/* Mark end. */
-+};
-+
-+static tcl_ints my_tcl_ints[] = {
-+	{"col-count",				&month_cols_count,			0},
-+	{"lines-per-page",			&lines_per_page,			0},
-+	{"start-year",				&start_year,				0},
-+	{"month-block-orientation",	&month_block_orientation,	0},
-+	{"dont-print-time",			&dont_print_time,			0},
-+	{"dont-print-join",			&dont_print_join,			0},
-+	{"dont-print-left",			&dont_print_left,			0},
-+	{"dont-print-modechange",	&dont_print_modechange,		0},
-+	{"dont-print-nickchange",	&dont_print_nickchange,		0},
-+	{"dont-print-kick",			&dont_print_kick,			0},
-+	{"dont-print-else",			&dont_print_else,			0},
-+	{"log-time",				&shtime,					1},
-+	{"keep-all-logs",			&keep_all_logs,				1},
-+	{NULL,						NULL,						0}	/* Mark end. */
-+};
-+
-+
-+static char *logs2html_close()
-+{
-+
-+	del_hook(HOOK_LOADED, (Function) event_addlogs2htmlchan);
-+	del_hook(HOOK_REHASH, (Function) event_addlogs2htmlchan);
-+	del_hook(HOOK_REHASH, (Function) logs2html_hook_rehash);
-+	del_hook(HOOK_PRE_REHASH, (Function) logs2html_hook_pre_rehash);
-+	del_hook(HOOK_HOURLY, (Function) logs2html_hook_hourly);
-+	del_hook(HOOK_5MINUTELY, (Function) logs2html_hook_5minutely);
-+
-+	finalize();
-+
-+    rem_help_reference(MODULE_NAME".help");
-+	del_lang_section(MODULE_NAME);
-+	rem_builtins(H_dcc, mydcc);
-+    rem_tcl_commands(my_tcl_cmds);
-+	rem_tcl_strings(my_tcl_strings);
-+	rem_tcl_ints(my_tcl_ints);
-+
-+	module_undepend(MODULE_NAME);
-+
-+	return NULL;
-+}
-+
-+EXPORT_SCOPE char *logs2html_start();
-+
-+static Function logs2html_table[] = {
-+  (Function) logs2html_start,
-+  (Function) logs2html_close,
-+  (Function) logs2html_expmem,
-+  (Function) logs2html_report,
-+};
-+
-+char *logs2html_start(Function *global_funcs)
-+{
-+	global = global_funcs;
-+
-+	/* Register the module. */
-+	module_register(MODULE_NAME, logs2html_table, MODULE_MAJOR, MODULE_MINOR);
-+
-+	if (!module_depend(MODULE_NAME, "eggdrop", 108, 0)) {
-+		module_undepend(MODULE_NAME);
-+		return "This module requires Eggdrop 1.6.18 or later.";
-+	}
-+
-+	add_tcl_ints(my_tcl_ints);
-+	add_tcl_strings(my_tcl_strings);
-+	add_tcl_commands(my_tcl_cmds);
-+	add_builtins(H_dcc, mydcc);
-+	add_lang_section(MODULE_NAME);
-+	add_help_reference(MODULE_NAME".help");
-+
-+	initialize();
-+
-+	add_hook(HOOK_5MINUTELY, (Function) logs2html_hook_5minutely);
-+	add_hook(HOOK_HOURLY, (Function) logs2html_hook_hourly);
-+	add_hook(HOOK_PRE_REHASH, (Function) logs2html_hook_pre_rehash);
-+	add_hook(HOOK_REHASH, (Function) logs2html_hook_rehash);
-+	add_hook(HOOK_REHASH, (Function) event_addlogs2htmlchan);
-+	add_hook(HOOK_LOADED, (Function) event_addlogs2htmlchan);
-+
-+	return NULL;
-+}
-+
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/logs2html.conf src/eggdrop-1.8.4/src/mod/logs2html.mod/logs2html.conf
---- ./src/mod/logs2html.mod/logs2html.conf	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/logs2html.conf	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,105 @@
-+######
-+#####
-+###   General Settings
-+#####
-+######
-+
-+#  number of rows the month'll put out
-+set col-count 3
-+
-+
-+#  set how many lines there'll be on the one page of created html page. If it
-+#  set to 0 then all lines will be in one html page
-+set lines-per-page 200
-+
-+
-+#  Uncomment line if you want specify file with your own css settings for
-+#  generated pages
-+#set user-style user.css
-+
-+
-+#  This setting allows you to insert meta tag
-+#  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=..."> in your
-+#  html files. You can comment next line, that will mean that this tag'll not
-+#  be insert in the resulting page.
-+set insert-encoding-str "windows-1251"
-+
-+
-+#  The start year, from which logs will be converted. The minimum is 2000 year.
-+#  (I think that should be enought)
-+set start-year 2003
-+
-+
-+#  set it to 1 not to print time in the html page, even if eggdrop's logfile has it
-+set dont-print-time 0
-+
-+
-+#  set it to 1 not to print join messages in the html page
-+set dont-print-join 0
-+
-+
-+#  set it to 1 not to print left messages in the html page
-+set dont-print-left 0
-+
-+
-+#  set it to 1 not to print mode changed messages in the html page
-+set dont-print-modechange 0
-+
-+
-+#  set it to 1 not to print nick change messages in the html page
-+set dont-print-nickchange 0
-+
-+
-+#  set it to 1 not to print kick messages in the html page
-+set dont-print-kick 0
-+
-+
-+#  set it to 1 not to print other irc messages in the html page
-+set dont-print-else 0
-+
-+
-+#  Orientation of the month blocks on index page. 0 - vertical, 1 - horizontal
-+#  Chose one you like more.
-+set month-block-orientation 0
-+
-+
-+#  Here you can specify path to files which content will be put to converted
-+#  logfile (or mainpage). For example you can add code for your counter
-+#  or banner. Uncomment the line you need and put there filename with path,
-+#  for example: set mainpage-top "mycounter.tpl"
-+#  Note: the content of specified file puts to the resulting file "as is",
-+#  without any transformation
-+#set mainpage-top ""
-+#set mainpage-bottom ""
-+#set logspage-top ""
-+#set logspage-bottom ""
-+
-+
-+# now load the module
-+loadmodule logs2html
-+
-+
-+#  Add your channels here. The format is:
-+#   addlogs2htmlchan channel output-path main-page-name main-page-title logs-page-prefix logs-page-title
-+#    channel		- your channel which logs you want to convert
-+#    output-path	- your ftp path, where converted files will be put
-+#			  (don't forget to check settings to be sure bot have
-+#			  permision write to the path you specify)
-+#    main-page-name	- name of your mainpage (i.e. page with calendar) for
-+#			  this channel. The "Main page" for current year name will be
-+#			  "main-page-name.html", for the past years it will look like
-+#			  "main-page-nameYY.html". For example if we set main-page-name
-+#			  to "index", then main page for current year'll be "index.html",
-+#			  and for 2008 year it will look like "index2008.html"
-+#    main-page-title	- your mainpage title for this channel (will be shown
-+#			  as the caption of the web page in your browser and as
-+#			  the title of calendar)
-+#    logs-page-prefix	- your logs page name (prefix) for this channel.
-+#			  Resulting name will  be "logs-page-prefixYYmmdd_pgN.html".
-+#			  For example if we set "logs-page-prefix" to "mychan", then the
-+#			  first page of logfile for the 1st january 2009 will look
-+#			  like "mychan20090101_pg1.html"
-+#    logs-page-title	- your logs page title for this channel (will be shown
-+#			  as the caption of the web page in your browser)
-+#  Example:
-+#    addlogs2htmlchan #MyChannel "/home/www/logs" index "Logs of MyChannel" mychan "Log of MyChannel"
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/logs2html.h src/eggdrop-1.8.4/src/mod/logs2html.mod/logs2html.h
---- ./src/mod/logs2html.mod/logs2html.h	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/logs2html.h	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,92 @@
-+/*
-+ * logs2html.h -- part of logs2html.mod
-+ *
-+ * Written by Fedotov Alexander aka Gray_Angel aka Shmupsik <shurikvz@mail.ru>
-+ *
-+ * 2004-2009 year
-+ */
-+/*
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+#ifndef _EGG_MOD_LOGS2HTML_LOGS2HTML_H
-+#define _EGG_MOD_LOGS2HTML_LOGS2HTML_H
-+
-+#include "src/lang.h"
-+
-+#define SEP "/"
-+
-+#ifndef MAX
-+#define MAX(a,b) \
-+	({ typeof (a) _a = (a); \
-+	   typeof (b) _b = (b); \
-+	   _a > _b ? _a : _b; })
-+#endif
-+
-+#ifndef MIN
-+#define MIN(a,b) \
-+	({ typeof (a) _a = (a); \
-+	   typeof (b) _b = (b); \
-+	   _a < _b ? _a : _b; })
-+#endif
-+
-+
-+typedef struct l2hchan_struct {
-+	struct l2hchan_struct *next;
-+	char *channame;			/* Имя канала для которого конвертировать логи */
-+	char *inputpath;		/* Имя (префикс) данного канала (вычисляется из выражения logfile в конфиге бота) */
-+	char *outputpath;		/* Куда выводить конвертированные логи */
-+	char *mainpagename;		/* Имя главной страницы */
-+	char *mainpagetitle;	/* Заголовок на главной странице */
-+	char *logspagename;		/* Имя (префикс) страницы переконвертированного логфайла */
-+	char *logspagetitle;	/* Заголовок страницы логфайла */
-+} l2hchan_t;
-+
-+typedef enum {NODE_MIRCCOLOR, NODE_FONTSTYLE, NODE_EMAIL, NODE_URI, NODE_SPECIAL} l2h_node;
-+
-+typedef struct l2hnode_struct {
-+	struct l2hnode_struct *next;
-+	l2h_node node_type;
-+	int node_so;			// Start of special char
-+	char *node_data;		// Class fo mirc colors
-+	bool node_close;
-+} l2hnode_t;
-+
-+/*
-+ * For language files. Lets define max number of chars in month and days of week names
-+ */
-+#define MAX_MONTH_LENGTH 15
-+#define MAX_DAY_LENGTH 6
-+
-+static int days_in_month[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-+
-+#define DAYS_IN_MONTH(year, month) (days_in_month[month] + (((month == 1) && ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))) ? 1 : 0))
-+
-+
-+static int cmd_convertalllogs(struct userrec *u, int idx, char *par);
-+static int cmd_makemainpage(struct userrec *u, int idx, char *par);
-+static int cmd_convertlogs(struct userrec *u, int idx, char *par);
-+static int getdayofweek(int year, int month, int day);
-+static FILE *openfile(char *newfilename, const char *mode, bool silent);
-+static void str_write(FILE *file, char *fstr, ... );
-+static void writefromexfile(FILE *dst_file, char *exfilename);
-+static void makeindexpage(l2hchan_t *ch, int year);
-+static void convertfile(l2hchan_t *ch, int year, int month, int day);
-+static void strip_codes(char *buf_ptr_copy, l2hnode_t **tree);
-+static void node_append(struct l2hnode_struct **h, struct l2hnode_struct *i);
-+static void replace_chars(char *buf_ptr_copy, char **realloc_buf);
-+
-+
-+#endif /* _EGG_MOD_LOGS2HTML_LOGS2HTML_H */
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/logs2html.mod.desc src/eggdrop-1.8.4/src/mod/logs2html.mod/logs2html.mod.desc
---- ./src/mod/logs2html.mod/logs2html.mod.desc	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/logs2html.mod.desc	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1 @@
-+This module converts the log files of your eggdrop to the html format. It also creates a page-calendar with links to that created files.
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/Makefile src/eggdrop-1.8.4/src/mod/logs2html.mod/Makefile
---- ./src/mod/logs2html.mod/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/Makefile	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,44 @@
-+# Makefile for src/mod/logs2html.mod/
-+
-+srcdir = .
-+
-+
-+doofus:
-+	@echo ""
-+	@echo "Let's try this from the right directory..."
-+	@echo ""
-+	@cd ../../../ && make
-+
-+static: ../logs2html.o
-+
-+modules: ../../../logs2html.$(MOD_EXT)
-+
-+../logs2html.o:
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c $(srcdir)/logs2html.c
-+	@rm -f ../logs2html.o
-+	mv logs2html.o ../
-+
-+../../../logs2html.$(MOD_EXT): ../logs2html.o
-+	$(LD) -o ../../../logs2html.$(MOD_EXT) ../logs2html.o $(XLIBS) $(MODULE_XLIBS) 
-+	$(STRIP) ../../../logs2html.$(MOD_EXT)
-+
-+depend:
-+	$(CC) $(CFLAGS) -MM $(srcdir)/logs2html.c -MT ../logs2html.o > .depend
-+
-+clean:
-+	@rm -f .depend *.o *.$(MOD_EXT) *~
-+distclean: clean
-+
-+#safety hash
-+../logs2html.o: .././logs2html.mod/logs2html.c \
-+ ../../../src/mod/module.h ../../../src/main.h ../../../src/lang.h \
-+ ../../../src/eggdrop.h ../../../src/flags.h ../../../src/proto.h \
-+ ../../../lush.h ../../../src/misc_file.h ../../../src/cmdt.h \
-+ ../../../src/tclegg.h ../../../src/tclhash.h ../../../src/chan.h \
-+ ../../../src/users.h ../../../src/compat/compat.h \
-+ ../../../src/compat/inet_aton.h \
-+ ../../../src/compat/snprintf.h \
-+ ../../../src/compat/strcasecmp.h \
-+ ../../../src/compat/strftime.h ../../../src/mod/modvals.h \
-+ .././logs2html.mod/language.h .././logs2html.mod/tcllogs2html.c \
-+ .././logs2html.mod/htmloperations.c .././logs2html.mod/fileoperations.c 
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/modinfo src/eggdrop-1.8.4/src/mod/logs2html.mod/modinfo
---- ./src/mod/logs2html.mod/modinfo	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/modinfo	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,3 @@
-+DESC:This module converts the log files of your eggdrop 
-+DESC:to the html format. It also creates a page-calendar 
-+DESC:with links to that created files.
-diff -urpN "src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.18/Contents" "src/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.18/Contents"
---- "src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.18/Contents"	1970-01-01 01:00:00.000000000 +0100
-+++ "src/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.18/Contents"	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1 @@
-+Precompiled on CYGWIN_NT-5.1 1.5.25(0.156/4/2) for eggdrop 1.6.18
-Binary files src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.18/logs2html.dll and src/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.18/logs2html.dll differ
-diff -urpN "src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.19/Contents" "src/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.19/Contents"
---- "src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.19/Contents"	1970-01-01 01:00:00.000000000 +0100
-+++ "src/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.19/Contents"	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1 @@
-+Precompiled on CYGWIN_NT-5.1 1.5.25(0.156/4/2) for eggdrop 1.6.19
-Binary files src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.19/logs2html.dll and src/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.19/logs2html.dll differ
-diff -urpN "src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.19 Suzi/Contents" "src/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.19 Suzi/Contents"
---- "src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.19 Suzi/Contents"	1970-01-01 01:00:00.000000000 +0100
-+++ "src/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.19 Suzi/Contents"	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1 @@
-+Precompiled on CYGWIN_NT-5.1 1.5.25(0.156/4/2) for eggdrop 1.6.19 with Suzi patch sp.0009
-Binary files src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.19 Suzi/logs2html.dll and src/eggdrop-1.8.4/src/mod/logs2html.mod/precompiled/windrop 1.6.19 Suzi/logs2html.dll differ
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/readme.txt src/eggdrop-1.8.4/src/mod/logs2html.mod/readme.txt
---- ./src/mod/logs2html.mod/readme.txt	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/readme.txt	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,105 @@
-+logs2html.mod v.2.4.3 by Alexander Fedotov aka Shmupsik aka shurikvz
-+e-mail: shurikvz@mail.ru
-+
-+This module converts the log files of your eggdrop to the html format. It also creates a page-calendar with links to that created files.
-+
-+*******************************************************************************
-+To install this module:
-+ - edit and copy logs2html.conf file to your eggdrop directory
-+ - for (*nix) copy logs2html.mod to the source directory of your eggdrop (src/mod), then as usual: make iconfig && make && make install)
-+ - for windows:
-+	- copy the contents of "language" directory to your windrop "language" directory
-+	- copy the contents of "help" directory to your windrop "help" directory
-+	- copy *.dll (/precompiled) to windrop "modules" directory
-+ - if you decide to use your own style for pages edit and copy user.css file to your logs output directory
-+ - put string "source logs2html.conf" into your eggdrop config file and restart your bot
-+
-+Module has 4 commands, which you can use from dcc chat:
-+ - convertalllogs			- reconverts all your logs
-+ - convertlogs [year [month [day]]]	- reconverts your logs
-+ - makemainpage				- redraws mainpages
-+ - makeindexpage			- same as ".makemainpage"
-+*******************************************************************************
-+
-+
-+
-+*******************************************************************************
-+You can try to find latest version on http://sourceforge.net/projects/logs2html or http://www.halftone.ru/projects
-+*******************************************************************************
-+
-+
-+
-+*******************************************************************************
-+Version history:
-+28.05.09 - version 2.4.3
-+  - now correctly output '"' and '&' char to html
-+  - improved search of uri and email
-+  - added css classes for join/left, mode change, nick change and kick events
-+  - added an option to not display these events in the resulting html file
-+
-+
-+12.05.09 - version 2.4.2
-+  - fixed error with compilation on eggdrop 1.6.19 with Suzi-patch sp.0009
-+  - now automaticly reconvert logs for previous year, when the year changed (i.e. on december, 31)
-+
-+
-+08.05.09 - version 2.4.1
-+  - fixed display bug with firefox browser
-+
-+
-+24.04.09 - version 2.4.0
-+  - now module can convert and show logs for several years (new command added, see '.help logs2html module')
-+  - the output pages is now in xhtml format (see "known problems" for details)
-+  - added dont-print-time parameter
-+  - added month-block-orientation parameter
-+  - some color-names fixed in default css file
-+
-+
-+15.10.05 - version 2.3.4
-+  - added setting in config file, which allow to change value of meta tag <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=..."> in generated HTML files.
-+
-+
-+04.10.05 - version 2.3.3
-+  - fixed bug with broken e-mail (strings with broken e-mails were truncated)
-+
-+
-+ 24.09.05 - version 2.3.2
-+  - added support for <B> and <U> tags
-+  - fixed bug with [%H:%M:%S] timestamp (I hope.. :-))
-+
-+
-+ 26.07.05 - version 2.3.1
-+  - bug fixed
-+
-+
-+ 24.07.05 - version 2.3.0
-+  - page style discriptions moved to CSS file
-+  - no need for tcl now
-+  - small bugs fixed
-+
-+
-+ 25.04.05 - version 2.1.0
-+  - added support for http links and e-mail.
-+
-+
-+ 27.02.05 - version 2.0
-+  - converting logs for multiply channels
-+  - possibility to change colors of HTML pages
-+  - now you can aim number of lines on the one generated HTML page
-+
-+
-+ 16.12.04 - version 1.0
-+  - initial realise
-+*******************************************************************************
-+
-+
-+
-+*******************************************************************************
-+KNOWN PROBLEMS
-+
-+
-+*******************************************************************************
-+
-+
-+
-+P.S. Sorry for my bad english
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/strlcpy.c src/eggdrop-1.8.4/src/mod/logs2html.mod/strlcpy.c
---- ./src/mod/logs2html.mod/strlcpy.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/strlcpy.c	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,51 @@
-+/*	$OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $	*/
-+
-+/*
-+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include <sys/types.h>
-+#include <string.h>
-+
-+/*
-+ * Copy src to string dst of size siz.  At most siz-1 characters
-+ * will be copied.  Always NUL terminates (unless siz == 0).
-+ * Returns strlen(src); if retval >= siz, truncation occurred.
-+ */
-+size_t
-+strlcpy(char *dst, const char *src, size_t siz)
-+{
-+	char *d = dst;
-+	const char *s = src;
-+	size_t n = siz;
-+
-+	/* Copy as many bytes as will fit */
-+	if (n != 0) {
-+		while (--n != 0) {
-+			if ((*d++ = *s++) == '\0')
-+				break;
-+		}
-+	}
-+
-+	/* Not enough room in dst, add NUL and traverse rest of src */
-+	if (n == 0) {
-+		if (siz != 0)
-+			*d = '\0';		/* NUL-terminate dst */
-+		while (*s++)
-+			;
-+	}
-+
-+	return(s - src - 1);	/* count does not include NUL */
-+}
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/tcllogs2html.c src/eggdrop-1.8.4/src/mod/logs2html.mod/tcllogs2html.c
---- ./src/mod/logs2html.mod/tcllogs2html.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/tcllogs2html.c	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,130 @@
-+/*
-+ * tcllogs2html.c -- part of logs2html.mod
-+ *
-+ * Written by Fedotov Alexander aka Shmupsik aka shurikvz <shurikvz@mail.ru>
-+ *
-+ * 2004-2009 year
-+ */
-+/*
-+ * This program 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
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+ */
-+
-+static void get_log_path(char *channel, char **inputpath) {
-+	if (Tcl_VarEval(interp, "logfile", (char *)NULL) != TCL_OK || !Tcl_GetStringResult(interp)[0]) {
-+		putlog(LOG_MISC, "*", "Error finding logfiles! Please check settings in your config file to be sure statement \"logfile\" present.");
-+		return;
-+	}
-+
-+	int len = strlen(Tcl_GetStringResult(interp)) + 1;
-+	char *logslist = nmalloc(len);
-+	strlcpy(logslist, Tcl_GetStringResult(interp), len);
-+
-+	char *p = logslist, *q, *r;
-+	while ((q = strchr(p, '{')) != NULL) {
-+		p = strchr(++q, '}');
-+		(*p) = '\0';
-+		p++; // now points to next chan in list
-+		r = newsplit(&q);
-+		// r = channel modes, check if it has +p flag
-+		if (logmodes(r) & LOG_PUBLIC) {
-+			r = newsplit(&q);
-+			// r = channel name, is it our channel?
-+			if ((*r == '*') || (!rfc_casecmp(channel, r))) {
-+				r = newsplit(&q);
-+				// r = log file name
-+				int len = strlen(r) + 1;
-+				(*inputpath) = nmalloc(len);
-+				strlcpy((*inputpath), r, len);
-+				break;
-+			}
-+		}
-+	}
-+
-+	nfree(logslist);
-+	return;
-+}
-+
-+
-+static int tcl_addlogs2htmlchan STDVAR
-+{
-+	BADARGS(7, 7, " channel output-path main-page-name main-page-title logs-page-prefix logs-page-title");
-+
-+	l2hchan_t *newchan = nmalloc(sizeof(struct l2hchan_struct));
-+	if (newchan == NULL) {
-+		putlog(LOG_MISC, "*", "Can't allocate enough space to add new channel!");
-+	    Tcl_AppendResult(irp, "Can't allocate enough space to add new channel!", NULL);
-+		return TCL_ERROR;
-+	}
-+
-+	int len;
-+	newchan->next = NULL;
-+
-+	newchan->inputpath = NULL;
-+	get_log_path(argv[1], &(newchan->inputpath));
-+	if (newchan->inputpath == NULL) {
-+		putlog(LOG_MISC, "*", "Can't find expression \"logfile\" for channel \'%s\' with mode \'+p\'.", argv[1]);
-+		Tcl_AppendResult(irp, "Can't find expression \"logfile\" for channel \'", argv[1], "\' with mode \'+p\'.", NULL);
-+		nfree(newchan);
-+		return TCL_OK; //Silently ignore this
-+	}
-+
-+	len = strlen(argv[1]) + 1;
-+	newchan->channame = nmalloc(len);
-+	strlcpy(newchan->channame, argv[1], len);
-+
-+	len = strlen(argv[2]) + 1;
-+	newchan->outputpath = nmalloc(len);
-+	strlcpy(newchan->outputpath, argv[2], len);
-+
-+	len = strlen(argv[3]) + 1;
-+	newchan->mainpagename = nmalloc(len);
-+	strlcpy(newchan->mainpagename, argv[3], len);
-+
-+	len = strlen(argv[4]) + 1;
-+	newchan->mainpagetitle = nmalloc(len);
-+	strlcpy(newchan->mainpagetitle, argv[4], len);
-+
-+	len = strlen(argv[5]) + 1;
-+	newchan->logspagename = nmalloc(len);
-+	strlcpy(newchan->logspagename, argv[5], len);
-+
-+	len = strlen(argv[6]) + 1;
-+	newchan->logspagetitle = nmalloc(len);
-+	strlcpy(newchan->logspagetitle, argv[6], len);
-+
-+	int count = 0;
-+	l2hchan_t *chan = logs2htmlchanlist;
-+	if (chan == NULL) {
-+		logs2htmlchanlist = newchan;
-+	} else {
-+		count++;
-+		while (chan->next != NULL) {
-+			chan = chan->next;
-+			count++;
-+		}
-+		chan->next = newchan;
-+	}
-+	count++;
-+
-+	putlog(LOG_MISC, "*", "  logs2html module: added channel '%s'. Total channels added: %d.", newchan->channame, count);
-+	Tcl_AppendResult(irp, "Channel added: ", argv[1], ".", NULL);
-+
-+	return TCL_OK;
-+}
-+
-+static tcl_cmds my_tcl_cmds[] = {
-+	{"addlogs2htmlchan",	tcl_addlogs2htmlchan},
-+	{NULL,					NULL}	/* Mark end. */
-+};
-diff -urpN src-orig/eggdrop-1.8.4/src/mod/logs2html.mod/user.css src/eggdrop-1.8.4/src/mod/logs2html.mod/user.css
---- ./src/mod/logs2html.mod/user.css	1970-01-01 01:00:00.000000000 +0100
-+++ ./src/mod/logs2html.mod/user.css	2018-07-29 03:18:35.000000000 +0200
-@@ -0,0 +1,306 @@
-+@charset "utf-8";
-+/* CSS Document */
-+
-+<!--
-+body  {
-+font-family:"Times New Roman", Times, serif;
-+background: #666666;
-+margin: 0;
-+padding: 0;
-+text-align: center;
-+color: #000000;
-+}
-+
-+/* mainpage styles */
-+.l2hMainPage #container {
-+width: 99%;
-+background:#FFFF99;
-+margin: 0 auto;
-+border: 1px solid #000000;
-+text-align: left;
-+}
-+.l2hMainPage #container #monthtable tr {
-+background: Orange;
-+}
-+.l2hMainPage #container .monthblock .monthname {
-+font-family:"Comic Sans MS", "Brush Script Std", Verdana, Arial, Helvetica, sans-serif;
-+font-size: 1.3em;
-+height: 1.8em;
-+background:#FF6600;
-+text-align: center;
-+color: white;
-+}
-+.l2hMainPage #container #monthtable .monthblock .dayname {
-+font-weight:bold;
-+height: 1.8em;
-+background: Silver;
-+text-align: left;
-+padding: 0 5px;
-+color:#333333;
-+}
-+.l2hMainPage #container #monthtable .monthblock .weekend {
-+font-weight:bold;
-+height: 1.8em;
-+background: #FF6633;
-+text-align: left;
-+padding: 0 5px;
-+color:#333333;
-+}
-+.l2hMainPage #container #monthtable .monthblock .emptycell {
-+height: 1.8em;
-+background:#DDDDDD;
-+text-align: center;
-+}
-+.l2hMainPage #container #monthtable .monthblock .day {
-+font-family:"Courier New", Courier, monospace;
-+font-weight:bold;
-+height: 1.8em;
-+background:#FFCC00;
-+text-align: center;
-+color:#FF0000;
-+}
-+.l2hMainPage #header {
-+background: #DDDDDD;
-+padding: 0 10px;
-+}
-+.l2hMainPage #header h2 {
-+font-style:italic;
-+margin: 0;
-+padding: 10px 0;
-+}
-+.l2hMainPage #mp_top {
-+background: #DDDDDD;
-+padding: 0 10px;
-+text-align: center;
-+}
-+.l2hMainPage #mp_bottom {
-+background: #DDDDDD;
-+padding: 0 10px;
-+text-align: center;
-+}
-+
-+/* leftsidebar styles */
-+.l2hMainPage #leftsidebar {
-+float: left;
-+width: 7em;
-+background: #EBEBEB;
-+padding: 10px 0;
-+}
-+.l2hMainPage #leftsidebar div.indexlink {
-+background-color: #EBEBEB;
-+margin-left: 5px;
-+margin-right: 5px;
-+text-align:center;
-+border-bottom-width: thin;
-+border-bottom-style: dotted;
-+border-bottom-color: #CCCCCC;
-+}
-+.l2hMainPage #leftsidebar div.indexlink a {
-+display:block;
-+letter-spacing:.1em;
-+line-height:1.5em;
-+text-decoration: none;
-+vertical-align:baseline;
-+color:#333333;
-+}
-+.l2hMainPage #leftsidebar div.indexlink a:hover {
-+background:#FF6600;
-+letter-spacing:.3em;
-+line-height:1.5em;
-+color:#FFFFFF;
-+font-weight:bold;
-+}
-+.l2hMainPage #mainblock {
-+margin: 0 20px 0 8em;
-+}
-+.l2hMainPage #footer {
-+padding: 0 10px;
-+background:#DDDDDD;
-+}
-+.l2hMainPage #footer p {
-+margin: 0;
-+padding: 10px 0;
-+font-size: 0.9em;
-+font-weight:bold;
-+color: #333333;
-+}
-+.l2hLogPage #lp_top {
-+background: #DDDDDD;
-+padding: 0 10px;
-+text-align: center;
-+}
-+.l2hLogPage #lp_bottom {
-+background: #DDDDDD;
-+padding: 0 10px;
-+text-align: center;
-+}
-+
-+/* Log Page styles */
-+.l2hLogPage #header {
-+background: #DDDDDD;
-+padding: 0 10px;
-+}
-+.l2hLogPage #container {
-+width: 99%;
-+background: #FFFF99;
-+margin: 0 auto;
-+border: 1px solid #000000;
-+text-align: left;
-+}
-+.l2hLogPage #container #navtop {
-+text-align: center;
-+border-bottom: 1px solid Orange;
-+margin-bottom: 10px;
-+padding: 10px 0;
-+}
-+.l2hLogPage #container #navtop a {
-+color:#FF0000;
-+font-weight:bold;
-+}
-+.l2hLogPage #container #totoplink {
-+color:#FF0000;
-+text-align: center;
-+border-top: 1px solid Orange;
-+margin-top: 10px;
-+padding: 10px 0;
-+}
-+.l2hLogPage #container #totoplink a {
-+color:#FF0000;
-+font-weight:bold;
-+}
-+.l2hLogPage #container #navbottom {
-+color:#FF0000;
-+text-align: center;
-+padding: 10px;
-+}
-+.l2hLogPage #container #navbottom span {
-+padding-left:5px;
-+padding-right:5px;
-+}
-+.l2hLogPage #container #navbottom #navbottom_currentpg {
-+font-size:1.1em;
-+}
-+.l2hLogPage #footer {
-+padding: 0 10px;
-+background:#DDDDDD;
-+}
-+.l2hLogPage #footer p {
-+margin: 0;
-+padding: 10px 0;
-+font-size: 0.9em;
-+font-weight:bold;
-+color: #333333;
-+}
-+.l2hLogPage #mainblock div {
-+white-space: pre-wrap; /* css-3 */
-+white-space: pre-line; /* css-3, css-2.1 */
-+white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */
-+white-space: -hp-pre-wrap; /* HP printers */
-+white-space: -pre-wrap; /* Opera 4-6 */
-+white-space: -o-pre-wrap; /* Opera 7 */
-+word-wrap: break-word; /* Internet Explorer 5.5+ */
-+overflow:hidden;
-+}
-+.l2hLogPage #mainblock span.time {
-+color: #D0D0D0;
-+}
-+.l2hLogPage #mainblock span.nick {
-+color: #0040C0;
-+}
-+.l2hLogPage #mainblock span.text {
-+color: #111111;
-+}
-+.l2hLogPage #mainblock span.else_j {
-+color: #99CC00;
-+font-size: 0.8em;
-+}
-+.l2hLogPage #mainblock span.else_li {
-+color: #99CC00;
-+font-size: 0.8em;
-+}
-+.l2hLogPage #mainblock span.else_l {
-+color: #99CC00;
-+font-size: 0.8em;
-+}
-+.l2hLogPage #mainblock span.else_n {
-+color: #FF6666;
-+font-size: 0.8em;
-+}
-+.l2hLogPage #mainblock span.else_m {
-+color: #00CCFF;
-+font-size: 0.8em;
-+}
-+.l2hLogPage #mainblock span.else_k {
-+color: #FF0066;
-+font-size: 0.8em;
-+}
-+.l2hLogPage #mainblock span.else {
-+color: #40C000;
-+font-size: 0.8em;
-+}
-+.l2hLogPage #mainblock span.action {
-+color: #FF99FF;
-+}
-+
-+/* mirc colors */
-+.l2hLogPage span.c0000, .l2hLogPage span.c0100, .l2hLogPage span.c0200, .l2hLogPage span.c0300, .l2hLogPage span.c0400, .l2hLogPage span.c0500, .l2hLogPage span.c0600, .l2hLogPage span.c0700, .l2hLogPage span.c0800, .l2hLogPage span.c0900, .l2hLogPage span.c1000, .l2hLogPage span.c1100, .l2hLogPage span.c1200, .l2hLogPage span.c1300, .l2hLogPage span.c1400, .l2hLogPage span.c1500 {background-color: white;}
-+.l2hLogPage span.c0001, .l2hLogPage span.c0101, .l2hLogPage span.c0201, .l2hLogPage span.c0301, .l2hLogPage span.c0401, .l2hLogPage span.c0501, .l2hLogPage span.c0601, .l2hLogPage span.c0701, .l2hLogPage span.c0801, .l2hLogPage span.c0901, .l2hLogPage span.c1001, .l2hLogPage span.c1101, .l2hLogPage span.c1201, .l2hLogPage span.c1301, .l2hLogPage span.c1401, .l2hLogPage span.c1501 {background-color: black;}
-+.l2hLogPage span.c0002, .l2hLogPage span.c0102, .l2hLogPage span.c0202, .l2hLogPage span.c0302, .l2hLogPage span.c0402, .l2hLogPage span.c0502, .l2hLogPage span.c0602, .l2hLogPage span.c0702, .l2hLogPage span.c0802, .l2hLogPage span.c0902, .l2hLogPage span.c1002, .l2hLogPage span.c1102, .l2hLogPage span.c1202, .l2hLogPage span.c1302, .l2hLogPage span.c1402, .l2hLogPage span.c1502 {background-color: navy;}
-+.l2hLogPage span.c0003, .l2hLogPage span.c0103, .l2hLogPage span.c0203, .l2hLogPage span.c0303, .l2hLogPage span.c0403, .l2hLogPage span.c0503, .l2hLogPage span.c0603, .l2hLogPage span.c0703, .l2hLogPage span.c0803, .l2hLogPage span.c0903, .l2hLogPage span.c1003, .l2hLogPage span.c1103, .l2hLogPage span.c1203, .l2hLogPage span.c1303, .l2hLogPage span.c1403, .l2hLogPage span.c1503 {background-color: green;}
-+.l2hLogPage span.c0004, .l2hLogPage span.c0104, .l2hLogPage span.c0204, .l2hLogPage span.c0304, .l2hLogPage span.c0404, .l2hLogPage span.c0504, .l2hLogPage span.c0604, .l2hLogPage span.c0704, .l2hLogPage span.c0804, .l2hLogPage span.c0904, .l2hLogPage span.c1004, .l2hLogPage span.c1104, .l2hLogPage span.c1204, .l2hLogPage span.c1304, .l2hLogPage span.c1404, .l2hLogPage span.c1504 {background-color: red;}
-+.l2hLogPage span.c0005, .l2hLogPage span.c0105, .l2hLogPage span.c0205, .l2hLogPage span.c0305, .l2hLogPage span.c0405, .l2hLogPage span.c0505, .l2hLogPage span.c0605, .l2hLogPage span.c0705, .l2hLogPage span.c0805, .l2hLogPage span.c0905, .l2hLogPage span.c1005, .l2hLogPage span.c1105, .l2hLogPage span.c1205, .l2hLogPage span.c1305, .l2hLogPage span.c1405, .l2hLogPage span.c1505 {background-color: maroon;}
-+.l2hLogPage span.c0006, .l2hLogPage span.c0106, .l2hLogPage span.c0206, .l2hLogPage span.c0306, .l2hLogPage span.c0406, .l2hLogPage span.c0506, .l2hLogPage span.c0606, .l2hLogPage span.c0706, .l2hLogPage span.c0806, .l2hLogPage span.c0906, .l2hLogPage span.c1006, .l2hLogPage span.c1106, .l2hLogPage span.c1206, .l2hLogPage span.c1306, .l2hLogPage span.c1406, .l2hLogPage span.c1506 {background-color: purple;}
-+.l2hLogPage span.c0007, .l2hLogPage span.c0107, .l2hLogPage span.c0207, .l2hLogPage span.c0307, .l2hLogPage span.c0407, .l2hLogPage span.c0507, .l2hLogPage span.c0607, .l2hLogPage span.c0707, .l2hLogPage span.c0807, .l2hLogPage span.c0907, .l2hLogPage span.c1007, .l2hLogPage span.c1107, .l2hLogPage span.c1207, .l2hLogPage span.c1307, .l2hLogPage span.c1407, .l2hLogPage span.c1507 {background-color: orange;}
-+.l2hLogPage span.c0008, .l2hLogPage span.c0108, .l2hLogPage span.c0208, .l2hLogPage span.c0308, .l2hLogPage span.c0408, .l2hLogPage span.c0508, .l2hLogPage span.c0608, .l2hLogPage span.c0708, .l2hLogPage span.c0808, .l2hLogPage span.c0908, .l2hLogPage span.c1008, .l2hLogPage span.c1108, .l2hLogPage span.c1208, .l2hLogPage span.c1308, .l2hLogPage span.c1408, .l2hLogPage span.c1508 {background-color: yellow;}
-+.l2hLogPage span.c0009, .l2hLogPage span.c0109, .l2hLogPage span.c0209, .l2hLogPage span.c0309, .l2hLogPage span.c0409, .l2hLogPage span.c0509, .l2hLogPage span.c0609, .l2hLogPage span.c0709, .l2hLogPage span.c0809, .l2hLogPage span.c0909, .l2hLogPage span.c1009, .l2hLogPage span.c1109, .l2hLogPage span.c1209, .l2hLogPage span.c1309, .l2hLogPage span.c1409, .l2hLogPage span.c1509 {background-color: lime;}
-+.l2hLogPage span.c0010, .l2hLogPage span.c0110, .l2hLogPage span.c0210, .l2hLogPage span.c0310, .l2hLogPage span.c0410, .l2hLogPage span.c0510, .l2hLogPage span.c0610, .l2hLogPage span.c0710, .l2hLogPage span.c0810, .l2hLogPage span.c0910, .l2hLogPage span.c1010, .l2hLogPage span.c1110, .l2hLogPage span.c1210, .l2hLogPage span.c1310, .l2hLogPage span.c1410, .l2hLogPage span.c1510 {background-color: teal;}
-+.l2hLogPage span.c0011, .l2hLogPage span.c0111, .l2hLogPage span.c0211, .l2hLogPage span.c0311, .l2hLogPage span.c0411, .l2hLogPage span.c0511, .l2hLogPage span.c0611, .l2hLogPage span.c0711, .l2hLogPage span.c0811, .l2hLogPage span.c0911, .l2hLogPage span.c1011, .l2hLogPage span.c1111, .l2hLogPage span.c1211, .l2hLogPage span.c1311, .l2hLogPage span.c1411, .l2hLogPage span.c1511 {background-color: aqua;}
-+.l2hLogPage span.c0012, .l2hLogPage span.c0112, .l2hLogPage span.c0212, .l2hLogPage span.c0312, .l2hLogPage span.c0412, .l2hLogPage span.c0512, .l2hLogPage span.c0612, .l2hLogPage span.c0712, .l2hLogPage span.c0812, .l2hLogPage span.c0912, .l2hLogPage span.c1012, .l2hLogPage span.c1112, .l2hLogPage span.c1212, .l2hLogPage span.c1312, .l2hLogPage span.c1412, .l2hLogPage span.c1512 {background-color: blue;}
-+.l2hLogPage span.c0013, .l2hLogPage span.c0113, .l2hLogPage span.c0213, .l2hLogPage span.c0313, .l2hLogPage span.c0413, .l2hLogPage span.c0513, .l2hLogPage span.c0613, .l2hLogPage span.c0713, .l2hLogPage span.c0813, .l2hLogPage span.c0913, .l2hLogPage span.c1013, .l2hLogPage span.c1113, .l2hLogPage span.c1213, .l2hLogPage span.c1313, .l2hLogPage span.c1413, .l2hLogPage span.c1513 {background-color: fuchsia;}
-+.l2hLogPage span.c0014, .l2hLogPage span.c0114, .l2hLogPage span.c0214, .l2hLogPage span.c0314, .l2hLogPage span.c0414, .l2hLogPage span.c0514, .l2hLogPage span.c0614, .l2hLogPage span.c0714, .l2hLogPage span.c0814, .l2hLogPage span.c0914, .l2hLogPage span.c1014, .l2hLogPage span.c1114, .l2hLogPage span.c1214, .l2hLogPage span.c1314, .l2hLogPage span.c1414, .l2hLogPage span.c1514 {background-color: silver;}
-+.l2hLogPage span.c0015, .l2hLogPage span.c0115, .l2hLogPage span.c0215, .l2hLogPage span.c0315, .l2hLogPage span.c0415, .l2hLogPage span.c0515, .l2hLogPage span.c0615, .l2hLogPage span.c0715, .l2hLogPage span.c0815, .l2hLogPage span.c0915, .l2hLogPage span.c1015, .l2hLogPage span.c1114, .l2hLogPage span.c1215, .l2hLogPage span.c1315, .l2hLogPage span.c1415, .l2hLogPage span.c1515 {background-color: gray;}
-+.l2hLogPage span.c0000, .l2hLogPage span.c0001, .l2hLogPage span.c0002, .l2hLogPage span.c0003, .l2hLogPage span.c0004, .l2hLogPage span.c0005, .l2hLogPage span.c0006, .l2hLogPage span.c0007, .l2hLogPage span.c0008, .l2hLogPage span.c0009, .l2hLogPage span.c0010, .l2hLogPage span.c0011, .l2hLogPage span.c0012, .l2hLogPage span.c0013, .l2hLogPage span.c0014, .l2hLogPage span.c0015 {color: white;}
-+.l2hLogPage span.c0100, .l2hLogPage span.c0101, .l2hLogPage span.c0102, .l2hLogPage span.c0103, .l2hLogPage span.c0104, .l2hLogPage span.c0105, .l2hLogPage span.c0106, .l2hLogPage span.c0107, .l2hLogPage span.c0108, .l2hLogPage span.c0109, .l2hLogPage span.c0110, .l2hLogPage span.c0111, .l2hLogPage span.c0112, .l2hLogPage span.c0113, .l2hLogPage span.c0114, .l2hLogPage span.c0115 {color: black;}
-+.l2hLogPage span.c0200, .l2hLogPage span.c0201, .l2hLogPage span.c0202, .l2hLogPage span.c0203, .l2hLogPage span.c0204, .l2hLogPage span.c0205, .l2hLogPage span.c0206, .l2hLogPage span.c0207, .l2hLogPage span.c0208, .l2hLogPage span.c0209, .l2hLogPage span.c0210, .l2hLogPage span.c0211, .l2hLogPage span.c0212, .l2hLogPage span.c0213, .l2hLogPage span.c0214, .l2hLogPage span.c0215 {color: navy;}
-+.l2hLogPage span.c0300, .l2hLogPage span.c0301, .l2hLogPage span.c0302, .l2hLogPage span.c0303, .l2hLogPage span.c0304, .l2hLogPage span.c0305, .l2hLogPage span.c0306, .l2hLogPage span.c0307, .l2hLogPage span.c0308, .l2hLogPage span.c0309, .l2hLogPage span.c0310, .l2hLogPage span.c0311, .l2hLogPage span.c0312, .l2hLogPage span.c0313, .l2hLogPage span.c0314, .l2hLogPage span.c0315 {color: green;}
-+.l2hLogPage span.c0400, .l2hLogPage span.c0401, .l2hLogPage span.c0402, .l2hLogPage span.c0403, .l2hLogPage span.c0404, .l2hLogPage span.c0405, .l2hLogPage span.c0406, .l2hLogPage span.c0407, .l2hLogPage span.c0408, .l2hLogPage span.c0409, .l2hLogPage span.c0410, .l2hLogPage span.c0411, .l2hLogPage span.c0412, .l2hLogPage span.c0413, .l2hLogPage span.c0414, .l2hLogPage span.c0415 {color: red;}
-+.l2hLogPage span.c0500, .l2hLogPage span.c0501, .l2hLogPage span.c0502, .l2hLogPage span.c0503, .l2hLogPage span.c0504, .l2hLogPage span.c0505, .l2hLogPage span.c0506, .l2hLogPage span.c0507, .l2hLogPage span.c0508, .l2hLogPage span.c0509, .l2hLogPage span.c0510, .l2hLogPage span.c0511, .l2hLogPage span.c0512, .l2hLogPage span.c0513, .l2hLogPage span.c0514, .l2hLogPage span.c0515 {color: maroon;}
-+.l2hLogPage span.c0600, .l2hLogPage span.c0601, .l2hLogPage span.c0602, .l2hLogPage span.c0603, .l2hLogPage span.c0604, .l2hLogPage span.c0605, .l2hLogPage span.c0606, .l2hLogPage span.c0607, .l2hLogPage span.c0608, .l2hLogPage span.c0609, .l2hLogPage span.c0610, .l2hLogPage span.c0611, .l2hLogPage span.c0612, .l2hLogPage span.c0613, .l2hLogPage span.c0614, .l2hLogPage span.c0615 {color: purple;}
-+.l2hLogPage span.c0700, .l2hLogPage span.c0701, .l2hLogPage span.c0702, .l2hLogPage span.c0703, .l2hLogPage span.c0704, .l2hLogPage span.c0705, .l2hLogPage span.c0706, .l2hLogPage span.c0707, .l2hLogPage span.c0708, .l2hLogPage span.c0709, .l2hLogPage span.c0710, .l2hLogPage span.c0711, .l2hLogPage span.c0712, .l2hLogPage span.c0713, .l2hLogPage span.c0714, .l2hLogPage span.c0715 {color: orange;}
-+.l2hLogPage span.c0800, .l2hLogPage span.c0801, .l2hLogPage span.c0802, .l2hLogPage span.c0803, .l2hLogPage span.c0804, .l2hLogPage span.c0805, .l2hLogPage span.c0806, .l2hLogPage span.c0807, .l2hLogPage span.c0808, .l2hLogPage span.c0809, .l2hLogPage span.c0810, .l2hLogPage span.c0811, .l2hLogPage span.c0812, .l2hLogPage span.c0813, .l2hLogPage span.c0814, .l2hLogPage span.c0815 {color: yellow;}
-+.l2hLogPage span.c0900, .l2hLogPage span.c0901, .l2hLogPage span.c0902, .l2hLogPage span.c0903, .l2hLogPage span.c0904, .l2hLogPage span.c0905, .l2hLogPage span.c0906, .l2hLogPage span.c0907, .l2hLogPage span.c0908, .l2hLogPage span.c0909, .l2hLogPage span.c0910, .l2hLogPage span.c0911, .l2hLogPage span.c0912, .l2hLogPage span.c0913, .l2hLogPage span.c0914, .l2hLogPage span.c0915 {color: lime;}
-+.l2hLogPage span.c1000, .l2hLogPage span.c1001, .l2hLogPage span.c1002, .l2hLogPage span.c1003, .l2hLogPage span.c1004, .l2hLogPage span.c1005, .l2hLogPage span.c1006, .l2hLogPage span.c1007, .l2hLogPage span.c1008, .l2hLogPage span.c1009, .l2hLogPage span.c1010, .l2hLogPage span.c1011, .l2hLogPage span.c1012, .l2hLogPage span.c1013, .l2hLogPage span.c1014, .l2hLogPage span.c1015 {color: teal;}
-+.l2hLogPage span.c1100, .l2hLogPage span.c1101, .l2hLogPage span.c1102, .l2hLogPage span.c1103, .l2hLogPage span.c1104, .l2hLogPage span.c1105, .l2hLogPage span.c1106, .l2hLogPage span.c1107, .l2hLogPage span.c1108, .l2hLogPage span.c1109, .l2hLogPage span.c1110, .l2hLogPage span.c1111, .l2hLogPage span.c1112, .l2hLogPage span.c1113, .l2hLogPage span.c1114, .l2hLogPage span.c1115 {color: aqua;}
-+.l2hLogPage span.c1200, .l2hLogPage span.c1201, .l2hLogPage span.c1202, .l2hLogPage span.c1203, .l2hLogPage span.c1204, .l2hLogPage span.c1205, .l2hLogPage span.c1206, .l2hLogPage span.c1207, .l2hLogPage span.c1208, .l2hLogPage span.c1209, .l2hLogPage span.c1210, .l2hLogPage span.c1211, .l2hLogPage span.c1212, .l2hLogPage span.c1213, .l2hLogPage span.c1214, .l2hLogPage span.c1215 {color: blue;}
-+.l2hLogPage span.c1300, .l2hLogPage span.c1301, .l2hLogPage span.c1302, .l2hLogPage span.c1303, .l2hLogPage span.c1304, .l2hLogPage span.c1305, .l2hLogPage span.c1306, .l2hLogPage span.c1307, .l2hLogPage span.c1308, .l2hLogPage span.c1309, .l2hLogPage span.c1310, .l2hLogPage span.c1311, .l2hLogPage span.c1312, .l2hLogPage span.c1313, .l2hLogPage span.c1314, .l2hLogPage span.c1315 {color: fuchsia;}
-+.l2hLogPage span.c1400, .l2hLogPage span.c1401, .l2hLogPage span.c1402, .l2hLogPage span.c1403, .l2hLogPage span.c1404, .l2hLogPage span.c1405, .l2hLogPage span.c1406, .l2hLogPage span.c1407, .l2hLogPage span.c1408, .l2hLogPage span.c1409, .l2hLogPage span.c1410, .l2hLogPage span.c1411, .l2hLogPage span.c1412, .l2hLogPage span.c1413, .l2hLogPage span.c1414, .l2hLogPage span.c1415 {color: silver;}
-+.l2hLogPage span.c1500, .l2hLogPage span.c1501, .l2hLogPage span.c1502, .l2hLogPage span.c1503, .l2hLogPage span.c1504, .l2hLogPage span.c1505, .l2hLogPage span.c1506, .l2hLogPage span.c1507, .l2hLogPage span.c1508, .l2hLogPage span.c1509, .l2hLogPage span.c1510, .l2hLogPage span.c1511, .l2hLogPage span.c1512, .l2hLogPage span.c1513, .l2hLogPage span.c1514, .l2hLogPage span.c1515 {color: gray;}
-+.l2hLogPage span.f00 {color: white;}
-+.l2hLogPage span.f01 {color: black;}
-+.l2hLogPage span.f02 {color: navy;}
-+.l2hLogPage span.f03 {color: green;}
-+.l2hLogPage span.f04 {color: red;}
-+.l2hLogPage span.f05 {color: maroon;}
-+.l2hLogPage span.f06 {color: purple;}
-+.l2hLogPage span.f07 {color: orange;}
-+.l2hLogPage span.f08 {color: yellow;}
-+.l2hLogPage span.f09 {color: lime;}
-+.l2hLogPage span.f10 {color: teal;}
-+.l2hLogPage span.f11 {color: aqua;}
-+.l2hLogPage span.f12 {color: blue;}
-+.l2hLogPage span.f13 {color: fuchsia;}
-+.l2hLogPage span.f14 {color: silver;}
-+.l2hLogPage span.f15 {color: gray;}
-+
-+/* Miscellaneous classes for reuse */
-+.clearfloat {
-+/* this class should be placed on a div or break element and should be the final element before
-+the close of a container that should fully contain a float */
-+clear:both;
-+height:0;
-+font-size: 1px;
-+line-height: 0px;
-+}
-+
-+--> 
-+
diff --git a/main/elfutils/APKBUILD b/main/elfutils/APKBUILD
index aba9183bae5..a310c8d5064 100644
--- a/main/elfutils/APKBUILD
+++ b/main/elfutils/APKBUILD
@@ -1,27 +1,46 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=elfutils
-pkgver=0.179
+pkgver=0.191
 pkgrel=0
-pkgdesc="A collection of utilities and DSOs to handle ELF files and DWARF data"
-url="http://elfutils.org/"
+pkgdesc="Utilities and DSOs to handle ELF files and DWARF data"
+url="https://sourceware.org/elfutils/"
 arch="all"
-license="GPL-3.0-or-later and (GPL-2.0-or-later or LGPL-3.0-or-later)"
-makedepends="bison flex-dev zlib-dev bzip2-dev xz-dev argp-standalone
-	bsd-compat-headers autoconf automake libtool fts-dev musl-obstack-dev
-	linux-headers"
-subpackages="libelf libelf-static $pkgname-dev $pkgname-doc"
+license="GPL-3.0-or-later AND ( GPL-2.0-or-later OR LGPL-3.0-or-later )"
+depends="
+	libasm=$pkgver-r$pkgrel
+	libdw=$pkgver-r$pkgrel
+	libelf=$pkgver-r$pkgrel
+	"
+makedepends="
+	argp-standalone
+	bison
+	bsd-compat-headers
+	bzip2-dev
+	flex-dev
+	libtool
+	linux-headers
+	musl-fts-dev
+	musl-libintl
+	musl-legacy-error
+	musl-obstack-dev
+	xz-dev
+	zlib-dev
+	zstd-dev
+	"
+subpackages="
+	libasm
+	libdw
+	libelf
+	$pkgname-dev
+	$pkgname-doc
+	"
 source="https://sourceware.org/elfutils/ftp/$pkgver/elfutils-$pkgver.tar.bz2
-	error.h
 	fix-aarch64_fregs.patch
 	fix-uninitialized.patch
-	musl-cdefs.patch
-	musl-fts-obstack.patch
 	musl-macros.patch
-	musl-qsort_r.patch
-	musl-strerror_r.patch
-	musl-strndupa.patch
 	musl-asm-ptrace-h.patch
 	"
+options="!check"
 
 # secfixes:
 #   0.176-r0:
@@ -43,23 +62,8 @@ source="https://sourceware.org/elfutils/ftp/$pkgver/elfutils-$pkgver.tar.bz2
 #     - CVE-2017-7607
 #     - CVE-2017-7608
 
-prepare() {
-	default_prepare
-	autoreconf -vif
-
-	cp "$srcdir"/error.h "$builddir"/lib
-	cp "$srcdir"/error.h "$builddir"/src
-
-	cat > lib/libintl.h <<-EOF
-		#ifndef LIBINTL_H
-		#define LIBINTL_H
-		#define _(x) (x)
-		#endif
-	EOF
-}
-
 build() {
-	CFLAGS="$CFLAGS -Wno-error -Wno-null-dereference" \
+	CFLAGS="$CFLAGS -D_GNU_SOURCE -Wno-error -Wno-null-dereference" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -71,8 +75,9 @@ build() {
 		--program-prefix=eu- \
 		--enable-deterministic-archives \
 		--disable-nls \
-		--disable-debuginfod
-	# for now we only build libelf
+		--disable-libdebuginfod \
+		--disable-debuginfod \
+		--with-zstd
 	make
 }
 
@@ -80,24 +85,42 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
+libasm() {
+	pkgdesc="Library to assemble and disassamble instructions"
+	# Depend on exact version, not just SONAME, just in case.
+	depends="libdw=$pkgver-r$pkgrel libelf=$pkgver-r$pkgrel"
+
+	amove usr/lib/libasm-*.so
+	amove usr/lib/libasm.so.*
+}
+
+libdw() {
+	pkgdesc="Library to read DWARF, find separate debuginfo, symbols and inspect process state"
+	# Depend on exact version, not just SONAME, just in case.
+	depends="libelf=$pkgver-r$pkgrel"
+
+	amove usr/lib/libdw-*.so
+	amove usr/lib/libdw.so.*
+}
+
 libelf() {
-	replaces="$pkgname-libelf"
-	provides="$pkgname-libelf=$pkgver-r$pkgrel"
+	pkgdesc="Library to read, modify and create ELF files"
+	depends=""
+	provides="$pkgname-libelf=$pkgver-r$pkgrel"  # for backward compatibility (Alpine <3.11)
+
+	amove usr/lib/libelf-*.so
+	amove usr/lib/libelf.so.*
+}
 
-	pkgdesc="$pkgdesc - runtime libraries"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/*-*.so "$subpkgdir"/usr/lib/
+dev() {
+	default_dev
+	provides="libelf-static=$pkgver-r$pkgrel"  # for backward compatibility (Alpine <3.19)
 }
 
-sha512sums="ff2d96ad1db08e3a2ddaa60bd5a05e9b61ffa71d646f889cebb6bef51322e874930809c6dd0a257ced8c6e8de4b59ecf13ca6741dc68f9400293208278a0c052  elfutils-0.179.tar.bz2
-8b650bc78cea66f30f0ff66357005890ac8a1b04a8dcc50209cb10a4b4c5ede849505cb68463beca8316ace0fbd53bbc484cfb597805b55616f3b3fc2b864e9a  error.h
+sha512sums="
+e22d85f25317a79b36d370347e50284c9120c86f9830f08791b7b6a7b4ad89b9bf4c7c71129133b8d193a0edffb2a2c17987b7e48428b9670aff5ce918777e04  elfutils-0.191.tar.bz2
 c3676b0b8b40d6e437f5d88c0d658dc0829ec97d1955e4bbf96f4cff9ee9001b8f2f06174450ae7aa5858b91c7905bdbd49073b561c346416132338a9c94731b  fix-aarch64_fregs.patch
 b9ba55e1b56a8abf694b6d02f022d9a3a0ae6ab53a8c4a71e49552e32411ef410d3a7512fbd1a729696bc2046ac11586829816f0fa3b8226ee77c9dc4b741e58  fix-uninitialized.patch
-0198194976782ab13bba59491d2d6bbe6189cba1edab174ca61cc7b942564f03b5d61feb6b787c5d09e66b3b493f08a330a8612e04de02d261b72b7996cc50c3  musl-cdefs.patch
-3b9fb4ebb5b33d4c7fb1e1f7e476a3ea4eba796bd9c89b9c920ef8c879638fb70abb1d83a0039b5b95558ba9597fb9cdb0fd6983498a11bb8dbdd50738c925c8  musl-fts-obstack.patch
-952109b1e0a2ccf435f5a7825ca3514d526161dae32e3d734f93d76b5693c469a889a488cb05cf423a006e9df550e7aae68697cc09d2c48fee1acd38163e5750  musl-macros.patch
-ce1a25387865ff96ecc5104810acc225dd64c28571ee5473ab732f7b63b927e4a260ebe74f17d3d8ba0c917cce233b9f902dd35c149d6d8317eecbc71f8d2da6  musl-qsort_r.patch
-a0d986100c8ff2ef0595645ec1b2eeb1d517b7442aef5f349ebf27fcb66c76e51fadeda25bed5f04b4bb16a61aa23ac6e86a1f34a0087d2136acf0f64c3fa4d1  musl-strerror_r.patch
-1728376b8408e9ae97f048d54bc6faae889bca197cc0500a952e64683835dfca66465aa4bce8e57d1ce7a81dcba0bbeeb4bd1e1026d3c4bd196ef4ffe536a509  musl-strndupa.patch
-7c529f88dc248f657a8d690044560c20a222c5b37d0d7dcb057bf2eea8938c406cccd6129bce19542088511a026b233234c9a83933a525c4691810be9ca712bf  musl-asm-ptrace-h.patch"
+792be4a38b55d20a320605ab340357ad55dc295ab241af86cd3edf4ec84b0122e91ebcf78d8d6a0f926104b5eb22306be1356b0892f71ee3ba27ae38e9130aab  musl-macros.patch
+7c529f88dc248f657a8d690044560c20a222c5b37d0d7dcb057bf2eea8938c406cccd6129bce19542088511a026b233234c9a83933a525c4691810be9ca712bf  musl-asm-ptrace-h.patch
+"
diff --git a/main/elfutils/error.h b/main/elfutils/error.h
deleted file mode 100644
index ef06827a0ba..00000000000
--- a/main/elfutils/error.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _ERROR_H_
-#define _ERROR_H_
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-static unsigned int error_message_count = 0;
-
-static inline void error(int status, int errnum, const char* format, ...)
-{
-	va_list ap;
-	fprintf(stderr, "%s: ", program_invocation_name);
-	va_start(ap, format);
-	vfprintf(stderr, format, ap);
-	va_end(ap);
-	if (errnum)
-		fprintf(stderr, ": %s", strerror(errnum));
-	fprintf(stderr, "\n");
-	error_message_count++;
-	if (status)
-		exit(status);
-}
-
-#endif	/* _ERROR_H_ */
diff --git a/main/elfutils/musl-cdefs.patch b/main/elfutils/musl-cdefs.patch
deleted file mode 100644
index 8497188515f..00000000000
--- a/main/elfutils/musl-cdefs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/libelf/elf.h	2015-08-21 14:22:37.000000000 +0200
-+++ b/libelf/elf.h	2015-11-20 04:54:33.948081321 +0100
-@@ -21,6 +21,17 @@
- 
- #include <features.h>
- 
-+#if !defined(__GLIBC__)
-+/* C++ needs to know that types and declarations are C, not C++.  */
-+#ifdef  __cplusplus
-+# define __BEGIN_DECLS  extern "C" {
-+# define __END_DECLS    }
-+#else
-+# define __BEGIN_DECLS
-+# define __END_DECLS
-+#endif
-+#endif
-+
- __BEGIN_DECLS
- 
- /* Standard ELF types.  */
diff --git a/main/elfutils/musl-fts-obstack.patch b/main/elfutils/musl-fts-obstack.patch
deleted file mode 100644
index 8d45854e66b..00000000000
--- a/main/elfutils/musl-fts-obstack.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- a/configure.ac	2015-10-15 15:16:57.000000000 +0200
-+++ b/configure.ac	2015-11-20 05:32:57.723901582 +0100
-@@ -305,6 +305,62 @@
- fi
- AC_SUBST([argp_LDADD])
- 
-+dnl Check if we have fts available from our libc
-+AC_LINK_IFELSE(
-+	[AC_LANG_PROGRAM(
-+		[#if !defined(__x86_64__)
-+		#undef  _FILE_OFFSET_BITS
-+		#define _FILE_OFFSET_BITS 32
-+		#endif
-+		#include <fts.h>],
-+		[FTS* fts = 0; return fts_close(fts); return 0;]
-+		)],
-+	[libc_has_fts="true"],
-+	[libc_has_fts="false"]
-+)
-+
-+dnl If our libc doesn't provide fts, then test for libfts
-+if test "$libc_has_fts" = "false" ; then
-+	AC_MSG_WARN("libc does not have fts")
-+	AC_CHECK_LIB([fts], [fts_close], [have_fts="true"], [have_fts="false"])
-+
-+	if test "$have_fts" = "false"; then
-+		AC_MSG_ERROR("no libfts found")
-+	else
-+		fts_LDADD="-lfts"
-+	fi
-+else
-+	fts_LDADD=""
-+fi
-+AC_SUBST([fts_LDADD])
-+
-+dnl Check if we have obstack available from our libc
-+AC_LINK_IFELSE(
-+	[AC_LANG_PROGRAM(
-+		[#include <obstack.h>],
-+		[_obstack_begin(0, 0, 0, NULL, NULL); return 0;]
-+		)],
-+	[libc_has_obstack="true"],
-+	[libc_has_obstack="false"]
-+)
-+
-+dnl If our libc doesn't provide obstack, then test for libobstack
-+if test "$libc_has_obstack" = "false" ; then
-+	AC_MSG_WARN("libc does not have obstack")
-+	AC_CHECK_LIB([obstack], [_obstack_begin], [have_obstack="true"], [have_obstack="false"])
-+
-+	if test "$have_obstack" = "false"; then
-+		AC_MSG_ERROR("no libobstack found")
-+	else
-+		obstack_LDADD="-lobstack"
-+	fi
-+else
-+	obstack_LDADD=""
-+fi
-+AC_SUBST([obstack_LDADD])
-+
-+dnl The directories with content.
-+
- dnl The directories with content.
- 
- dnl Documentation.
---- a/src/Makefile.am.orig
-+++ b/src/Makefile.am
-@@ -46,7 +46,7 @@
- else
- libasm = ../libasm/libasm.so
- libdw = ../libdw/libdw.so
--libelf = ../libelf/libelf.so
-+libelf = ../libelf/libelf.so $(fts_LDADD) $(obstack_LDADD)
- endif
- libebl = ../libebl/libebl.a
- libeu = ../lib/libeu.a
---- a/libdw/Makefile.am.orig
-+++ b/libdw/Makefile.am
-@@ -109,7 +109,7 @@
- 		../libcpu/libcpu_pic.a libdw_pic.a ../libdwelf/libdwelf_pic.a \
- 		../libdwfl/libdwfl_pic.a
- libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so
--libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) -pthread
-+libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) $(zip_LIBS) -pthread
- libdw_so_SOURCES =
- libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS)
- 	$(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \
diff --git a/main/elfutils/musl-macros.patch b/main/elfutils/musl-macros.patch
index 0d7ec4155ee..d1bf92eb665 100644
--- a/main/elfutils/musl-macros.patch
+++ b/main/elfutils/musl-macros.patch
@@ -1,5 +1,28 @@
---- a/src/arlib.h	2015-08-21 14:22:37.000000000 +0200
-+++ b/src/arlib.h	2015-11-20 08:02:55.153199611 +0100
+diff -ur elfutils-0.187.orig/lib/libeu.h elfutils-0.187/lib/libeu.h
+--- elfutils-0.187.orig/lib/libeu.h	2022-06-16 18:48:12.916472948 +0200
++++ elfutils-0.187/lib/libeu.h	2022-06-16 18:48:54.219839323 +0200
+@@ -31,6 +31,18 @@
+ 
+ #include <stddef.h>
+ #include <stdint.h>
++#include <unistd.h>
++#include <alloca.h>
++#include <string.h>
++
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression) \
++  (__extension__                                                              \
++   ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; }))
++#endif
+ 
+ extern void *xmalloc (size_t) __attribute__ ((__malloc__));
+ extern void *xcalloc (size_t, size_t) __attribute__ ((__malloc__));
+diff -ur elfutils-0.187.orig/src/arlib.h elfutils-0.187/src/arlib.h
+--- elfutils-0.187.orig/src/arlib.h	2022-06-16 18:48:12.919806284 +0200
++++ elfutils-0.187/src/arlib.h	2022-06-16 18:48:18.879811052 +0200
 @@ -29,6 +29,16 @@
  #include <stdint.h>
  #include <sys/types.h>
@@ -17,11 +40,12 @@
  
  /* State of -D/-U flags.  */
  extern bool arlib_deterministic_output;
---- a/src/elfcompress.c.orig	2016-04-02 12:51:26.903848894 +0200
-+++ b/src/elfcompress.c	2016-04-02 12:55:15.076996338 +0200
-@@ -35,6 +35,14 @@
- #include <gelf.h>
- #include "system.h"
+diff -ur elfutils-0.187.orig/src/elfcompress.c elfutils-0.187/src/elfcompress.c
+--- elfutils-0.187.orig/src/elfcompress.c	2022-06-16 18:48:12.919806284 +0200
++++ elfutils-0.187/src/elfcompress.c	2022-06-16 18:48:18.879811052 +0200
+@@ -37,6 +37,14 @@
+ #include "libeu.h"
+ #include "printversion.h"
  
 +#if !defined(FNM_EXTMATCH)
 +# define FNM_EXTMATCH 0
@@ -32,44 +56,11 @@
 +#endif
 +
  /* Name and version of program.  */
- static void print_version (FILE *stream, struct argp_state *state);
  ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
-diff --git a/lib/libeu.h b/lib/libeu.h
-index 69fe3d7..e5c99b8 100644
---- a/lib/libeu.h
-+++ b/lib/libeu.h
-@@ -31,6 +31,27 @@
  
- #include <stddef.h>
- #include <stdint.h>
-+#include <unistd.h>
-+#include <alloca.h>
-+#include <string.h>
-+
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+   ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
-+
-+#ifndef strndupa
-+#define strndupa(s, n) \
-+       (__extension__ ({const char *__in = (s); \
-+                        size_t __len = strnlen (__in, (n)) + 1; \
-+                        char *__out = (char *) alloca (__len); \
-+                        __out[__len-1] = '\0'; \
-+                        (char *) memcpy (__out, __in, __len-1);}))
-+#endif
- 
- extern void *xmalloc (size_t) __attribute__ ((__malloc__));
- extern void *xcalloc (size_t, size_t) __attribute__ ((__malloc__));
-diff --git a/src/strip.c b/src/strip.c
-index 48792a7..d2f0c60 100644
---- a/src/strip.c
-+++ b/src/strip.c
+diff -ur elfutils-0.187.orig/src/strip.c elfutils-0.187/src/strip.c
+--- elfutils-0.187.orig/src/strip.c	2022-06-16 18:48:12.919806284 +0200
++++ elfutils-0.187/src/strip.c	2022-06-16 18:48:18.879811052 +0200
 @@ -46,6 +46,14 @@
  #include <system.h>
  #include <printversion.h>
diff --git a/main/elfutils/musl-qsort_r.patch b/main/elfutils/musl-qsort_r.patch
deleted file mode 100644
index 0843aec6485..00000000000
--- a/main/elfutils/musl-qsort_r.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/src/readelf.c b/src/readelf.c
-index cbb519d..dea513b 100644
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -4829,10 +4829,11 @@ listptr_base (struct listptr *p)
-   return cudie_base (&cu);
- }
- 
-+static const char *listptr_name;
-+
- static int
--compare_listptr (const void *a, const void *b, void *arg)
-+compare_listptr (const void *a, const void *b)
- {
--  const char *name = arg;
-   struct listptr *p1 = (void *) a;
-   struct listptr *p2 = (void *) b;
- 
-@@ -4848,21 +4849,21 @@ compare_listptr (const void *a, const void *b, void *arg)
- 	  p1->warned = p2->warned = true;
- 	  error (0, 0,
- 		 gettext ("%s %#" PRIx64 " used with different address sizes"),
--		 name, (uint64_t) p1->offset);
-+		 listptr_name, (uint64_t) p1->offset);
- 	}
-       if (p1->dwarf64 != p2->dwarf64)
- 	{
- 	  p1->warned = p2->warned = true;
- 	  error (0, 0,
- 		 gettext ("%s %#" PRIx64 " used with different offset sizes"),
--		 name, (uint64_t) p1->offset);
-+		 listptr_name, (uint64_t) p1->offset);
- 	}
-       if (listptr_base (p1) != listptr_base (p2))
- 	{
- 	  p1->warned = p2->warned = true;
- 	  error (0, 0,
- 		 gettext ("%s %#" PRIx64 " used with different base addresses"),
--		 name, (uint64_t) p1->offset);
-+		 listptr_name, (uint64_t) p1->offset);
- 	}
-       if (p1->attr != p2 ->attr)
- 	{
-@@ -4870,7 +4871,7 @@ compare_listptr (const void *a, const void *b, void *arg)
- 	  error (0, 0,
- 		 gettext ("%s %#" PRIx64
- 			  " used with different attribute %s and %s"),
--		 name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr),
-+		 listptr_name, (uint64_t) p1->offset, dwarf_attr_name (p2->attr),
- 		 dwarf_attr_name (p2->attr));
- 	}
-     }
-@@ -4941,9 +4942,11 @@ notice_listptr (enum section_e section, struct listptr_table *table,
- static void
- sort_listptr (struct listptr_table *table, const char *name)
- {
--  if (table->n > 0)
--    qsort_r (table->table, table->n, sizeof table->table[0],
--	     &compare_listptr, (void *) name);
-+  if (table->n > 0) {
-+    listptr_name = name;
-+    qsort (table->table, table->n, sizeof table->table[0],
-+	     &compare_listptr);
-+  }
- }
- 
- static bool
diff --git a/main/elfutils/musl-strerror_r.patch b/main/elfutils/musl-strerror_r.patch
deleted file mode 100644
index 72977951d54..00000000000
--- a/main/elfutils/musl-strerror_r.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/libdwfl/dwfl_error.c	2015-09-29 17:18:51.000000000 +0200
-+++ b/libdwfl/dwfl_error.c	2015-11-20 05:11:29.889002058 +0100
-@@ -154,7 +154,16 @@
-   switch (error &~ 0xffff)
-     {
-     case OTHER_ERROR (ERRNO):
-+#if defined(__GLIBC__)
-       return strerror_r (error & 0xffff, "bad", 0);
-+#else
-+      {
-+        static __thread char buf[128] = "";
-+        if (0 == strerror_r(error & 0xffff, buf, sizeof(buf)))
-+          return buf;
-+      }
-+      return "strerror_r() failed";
-+#endif
-     case OTHER_ERROR (LIBELF):
-       return elf_errmsg (error & 0xffff);
-     case OTHER_ERROR (LIBDW):
diff --git a/main/elfutils/musl-strndupa.patch b/main/elfutils/musl-strndupa.patch
deleted file mode 100644
index a5206885d13..00000000000
--- a/main/elfutils/musl-strndupa.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/unstrip.c.orig	2017-04-27 14:26:26.000000000 +0000
-+++ b/src/unstrip.c	2017-05-05 15:51:33.515154220 +0000
-@@ -56,6 +56,15 @@
- # define _(str) gettext (str)
- #endif
- 
-+#ifndef strndupa
-+#define strndupa(s, n) \
-+       (__extension__ ({const char *__in = (s);                    \
-+                        size_t __len = strnlen (__in, (n)) + 1;    \
-+                        char *__out = (char *) alloca (__len);     \
-+                        __out[__len-1] = '\0';                     \
-+                        (char *) memcpy (__out, __in, __len-1);}))
-+#endif
-+
- /* Name and version of program.  */
- ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
- 
diff --git a/main/elinks/APKBUILD b/main/elinks/APKBUILD
index 76cb1f1ce26..588b4fb9018 100644
--- a/main/elinks/APKBUILD
+++ b/main/elinks/APKBUILD
@@ -1,53 +1,50 @@
+# Contributor: Dmitry Zakharchenko <dmitz@disroot.org>
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=elinks
-pkgver=0.13
-_ver=${pkgver/_/}
-pkgrel=6
-pkgdesc="a text mode web browser"
-url="http://elinks.or.cz/"
+pkgver=0.17.0
+pkgrel=0
+pkgdesc="Advanced and well-established feature-rich text mode web browser"
+url="https://github.com/rkd77/elinks/"
 arch="all"
-license="GPL"
-depends=
-makedepends="bzip2-dev zlib-dev openssl-dev expat-dev gettext-dev"
-install=
-subpackages="$pkgname-doc $pkgname-lang"
-source="https://dev.alpinelinux.org/archive/elinks/elinks-$pkgver.tar.bz2
-	musl-va_copy.patch
-	ssl-Make-RAND_egd-optional.patch
-	elinks-0.12pre6-openssl11.patch
+license="GPL-2.0-or-later AND GPL-3.0-or-later AND MIT AND MPL-1.1"
+makedepends="
+	bsd-compat-headers
+	bzip2-dev
+	curl-dev
+	expat-dev
+	gettext-dev
+	gpm-dev
+	libidn2-dev
+	linux-headers
+	meson
+	openssl-dev>3
+	xmlto
+	zlib-dev
 	"
-
-builddir="$srcdir"/elinks-0.13-20150624
-
-prepare() {
-	default_prepare
-	update_config_sub
-}
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://github.com/rkd77/elinks/releases/download/v$pkgver/elinks-$pkgver.tar.xz"
+options="!check"
 
 build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--without-included-gettext
-	make
+	LDFLAGS="$LDFLAGS -lintl" \
+	abuild-meson \
+		-Db_lto=true \
+		-Dgettext=true \
+		-Dhtml-highlight=true \
+		-Dbacktrace=false \
+		-D256-colors=true \
+		-Dtrue-color=true \
+		-Dtre=false \
+		-Dlibcss=false \
+		. output
+	meson compile -C output
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	rm -rf "$pkgdir"/usr/lib/charset.alias
-	rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
-	#fix conflict with gettext
-	rm "$pkgdir"/usr/share/locale/locale.alias
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-sha512sums="9dd7fb674ab914fccaf64b889f6fe3431f95abe1ae76f1df6155fbc89623ec921a4de5f30e896e94c77161c4b4638a29ec19b8e1fe4cbdebdc4666be024f8ed9  elinks-0.13.tar.bz2
-56378b4744783e8a07c5e92f3f75cdb7edf7b26881eb033789d71612c3971b3a3c5ada5f02ec422391242cbceb64ff31a2be68298608ed6448c37056d6dedf40  musl-va_copy.patch
-df3254ff429540cca66849e03cd6245bd3e82897225ba3bfea9a41ab222c0041e60c61784a9fd6f819b360b6168b6375a5455a97786ab656b24a8e1b4b96bda3  ssl-Make-RAND_egd-optional.patch
-85e7a4e560a87ba641a04e3fce918cd0a2b52bd13b162f15950e4bb7d19a511f984d0891e3df1784cc8bb77a53f6c7ed6ffe56d7707d6b32a6676e21725893b9  elinks-0.12pre6-openssl11.patch"
+sha512sums="
+276c648174d067cdd92cbbf25e8a353a3a482a65a4f1080ff42f932cdc0239e5110a51653f5136188a0b9135be2928f2bd1a92f37fa83ce14d8fc1267b87cf56  elinks-0.17.0.tar.xz
+"
diff --git a/main/elinks/elinks-0.12pre6-openssl11.patch b/main/elinks/elinks-0.12pre6-openssl11.patch
deleted file mode 100644
index 29c4ef6bcb1..00000000000
--- a/main/elinks/elinks-0.12pre6-openssl11.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From d83c0edf4c6ae42359ff856d7a879ecba5769595 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Fri, 17 Feb 2017 16:51:41 +0100
-Subject: [PATCH 1/2] fix compatibility with OpenSSL 1.1
-
----
- src/network/ssl/socket.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/network/ssl/socket.c b/src/network/ssl/socket.c
-index c9e2be4..467fc48 100644
---- a/src/network/ssl/socket.c
-+++ b/src/network/ssl/socket.c
-@@ -83,7 +83,7 @@ static void
- ssl_set_no_tls(struct socket *socket)
- {
- #ifdef CONFIG_OPENSSL
--	((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1;
-+	SSL_set_options((ssl_t *) socket->ssl, SSL_OP_NO_TLSv1);
- #elif defined(CONFIG_GNUTLS)
- 	{
- 		/* GnuTLS does not support SSLv2 because it is "insecure".
-@@ -419,7 +419,7 @@ ssl_connect(struct socket *socket)
- 					(SSL *) socket->ssl,
- 					client_cert);
- #else
--			SSL_CTX *ctx = ((SSL *) socket->ssl)->ctx;
-+			SSL_CTX *ctx = SSL_get_SSL_CTX((SSL *) socket->ssl);
- 
- 			SSL_CTX_use_certificate_chain_file(ctx, client_cert);
- 			SSL_CTX_use_PrivateKey_file(ctx, client_cert,
--- 
-2.7.4
-
-
-From ec952cc5b79973bee73fcfc813159d40c22b7228 Mon Sep 17 00:00:00 2001
-From: Tomas Mraz <tmraz@fedoraproject.org>
-Date: Fri, 17 Feb 2017 16:44:11 +0100
-Subject: [PATCH 2/2] drop disablement of TLS1.0 on second attempt to connect
-
-It would not work correctly anyway and the code does not build
-with OpenSSL-1.1.0.
----
- src/network/ssl/socket.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/network/ssl/socket.c b/src/network/ssl/socket.c
-index 467fc48..b981c1e 100644
---- a/src/network/ssl/socket.c
-+++ b/src/network/ssl/socket.c
-@@ -82,6 +82,11 @@
- static void
- ssl_set_no_tls(struct socket *socket)
- {
-+#if 0
-+/* This implements the insecure renegotiation, which should not be used.
-+ * The code also would not work on current Fedora (>= Fedora 23) anyway,
-+ * because it would just switch off TLS 1.0 keeping TLS 1.1 and 1.2 enabled.
-+ */
- #ifdef CONFIG_OPENSSL
- 	SSL_set_options((ssl_t *) socket->ssl, SSL_OP_NO_TLSv1);
- #elif defined(CONFIG_GNUTLS)
-@@ -96,6 +101,7 @@ ssl_set_no_tls(struct socket *socket)
- 		gnutls_protocol_set_priority(*(ssl_t *) socket->ssl, protocol_priority);
- 	}
- #endif
-+#endif
- }
- 
- #ifdef USE_OPENSSL
--- 
-2.7.4
-
diff --git a/main/elinks/musl-va_copy.patch b/main/elinks/musl-va_copy.patch
deleted file mode 100644
index 5074d1e2033..00000000000
--- a/main/elinks/musl-va_copy.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./src/util/snprintf.h.orig
-+++ ./src/util/snprintf.h
-@@ -12,10 +12,14 @@
- /* XXX: This is not quite the best place for it, perhaps. But do we have
-  * a better one now? --pasky */
- #ifndef VA_COPY
-+#ifdef va_copy
-+#define VA_COPY va_copy
-+#else
- #ifdef HAVE_VA_COPY
- #define VA_COPY(dest, src) __va_copy(dest, src)
- #else
- #define VA_COPY(dest, src) (dest) = (src)
-+#endif
- #endif
- #endif
- 
-
diff --git a/main/elinks/ssl-Make-RAND_egd-optional.patch b/main/elinks/ssl-Make-RAND_egd-optional.patch
deleted file mode 100644
index aa56928fe7a..00000000000
--- a/main/elinks/ssl-Make-RAND_egd-optional.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4357901b04ed582df55873532c6c22e671512af3 Mon Sep 17 00:00:00 2001
-From: Kylie McClain <somasis@exherbo.org>
-Date: Tue, 29 Dec 2015 15:11:52 -0500
-Subject: [PATCH] ssl: Make RAND_egd optional
-
-Fixes compilation with LibreSSL.
----
- src/network/ssl/ssl.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/network/ssl/ssl.c b/src/network/ssl/ssl.c
-index 693ac37..5ed5754 100644
---- a/src/network/ssl/ssl.c
-+++ b/src/network/ssl/ssl.c
-@@ -84,11 +84,16 @@ init_openssl(struct module *module)
- 	 * cannot initialize the PRNG and so every attempt to use SSL fails.
- 	 * It's actually an OpenSSL FAQ, and according to them, it's up to the
- 	 * application coders to seed the RNG. -- William Yodlowsky */
--	if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) {
-+	RAND_file_name(f_randfile, sizeof(f_randfile));
-+#ifdef HAVE_RAND_EGD
-+	if (RAND_egd(f_randfile) < 0) {
- 		/* Not an EGD, so read and write to it */
-+#endif
- 		if (RAND_load_file(f_randfile, -1))
- 			RAND_write_file(f_randfile);
-+#ifdef HAVE_RAND_EGD
- 	}
-+#endif
- 
- 	SSLeay_add_ssl_algorithms();
- 	context = SSL_CTX_new(SSLv23_client_method());
--- 
-2.6.4
-
diff --git a/main/ell/APKBUILD b/main/ell/APKBUILD
index 5ce4345666c..e7b321cabfd 100644
--- a/main/ell/APKBUILD
+++ b/main/ell/APKBUILD
@@ -1,16 +1,22 @@
 # Contributor: Milan P. Stanić <mps@arvanta.net>
 # Maintainer: Milan P. Stanić <mps@arvanta.net>
 pkgname=ell
-pkgver=0.30
+pkgver=0.64
 pkgrel=0
 pkgdesc="Linux library for embedded development"
 url="https://01.org/ell"
 arch="all"
-license="GPL-2.0-only"
+license="LGPL-2.1-or-later"
 makedepends="glib-dev linux-headers"
 checkdepends="dbus"
-subpackages="$pkgname-dev"
-source="https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-$pkgver.tar.gz"
+subpackages="$pkgname-dbg $pkgname-dev"
+source="https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-$pkgver.tar.gz
+	use-libgen-basename.patch
+	"
+
+case "$CARCH" in
+aarch64|arm*) options="!check" ;;
+esac
 
 build() {
 	./configure \
@@ -32,4 +38,7 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a47d383598e294ff4ad73a8ae11fc62f21d6423508ca487cd05633d6149a6a01ee710440e5c00f4b238ba19d3ea2b222fa90c387cef34c7e64dc0a7f4d2c5c46  ell-0.30.tar.gz"
+sha512sums="
+970a488c6ccdcedf6ea0b35b2b7d80613410acdddef75217d7d23cf77bfbb898a803149767bb156966445786f759e635d81aeb4d80ef4bcc686e057a17379758  ell-0.64.tar.gz
+0762cc5c0471afbcdd17ecbd599f3ae6b0725ed79a845435f5f48c020990b973307c490362ead7550bfe7b61a36e6b663464a038808256f1a1ae7241f0851d1c  use-libgen-basename.patch
+"
diff --git a/main/ell/use-libgen-basename.patch b/main/ell/use-libgen-basename.patch
new file mode 100644
index 00000000000..3fa7eb322ac
--- /dev/null
+++ b/main/ell/use-libgen-basename.patch
@@ -0,0 +1,10 @@
+--- a/unit/test-path.c	2023-09-27 09:03:04.000000000 +0000
++++ b/unit/test-path.c	2024-02-16 17:25:32.680410706 +0000
+@@ -15,6 +15,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
++#include <libgen.h>
+ 
+ #include <ell/ell.h>
+ 
diff --git a/main/email/APKBUILD b/main/email/APKBUILD
index 7b7c3008a98..168d3dd695c 100644
--- a/main/email/APKBUILD
+++ b/main/email/APKBUILD
@@ -1,24 +1,26 @@
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=email
 pkgver=3.1.4
-pkgrel=7
-pkgdesc="A command line SMTP client that's simple"
+pkgrel=13
+pkgdesc="command line SMTP client that's simple"
+options="!check" # No testsuite
 url="http://www.cleancode.org/projects/email"
 arch="all"
-license="GPL"
-depends="openssl"
-makedepends="openssl-dev"
-source="https://dev.alpinelinux.org/archive/email/email-$pkgver.tar.gz"
-
+license="GPL-2.0-or-later"
+depends="openssl>3"
+makedepends="openssl-dev>3"
 subpackages="$pkgname-doc"
+source="https://dev.alpinelinux.org/archive/email/email-$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-3.1.3" # Release was made with the wrong tarball name
 
 prepare() {
-	cd "$srcdir"/$pkgname-*
+	default_prepare
 	sed -i -e 's/^\(VCARD.*\)/\# \1/' email.conf
 }
 
 build() {
-	cd "$srcdir"/$pkgname-*
+	# Required under gcc-10
+	CFLAGS="$CFLAGS -fcommon" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,12 +31,10 @@ build() {
 }
 
 check() {
-	cd "$srcdir"/$pkgname-*
 	./src/email -h
 }
 
 package() {
-	cd "$srcdir"/$pkgname-*
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/email2trac/APKBUILD b/main/email2trac/APKBUILD
deleted file mode 100644
index fdd87073529..00000000000
--- a/main/email2trac/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=email2trac
-pkgver=2.12.2
-pkgrel=1
-pkgdesc="Utilities for converting emails to trac tickets"
-url="https://oss.trac.surfsara.nl/email2trac"
-arch="all"
-license="GPL-2.0-or-later"
-depends="trac"
-makedepends="python3"
-source="https://ftp.sara.nl/pub/outgoing/email2trac-$pkgver.tar.gz"
-options="!check suid" # no testsuite
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--with-trac_user=tracd \
-		PYTHON=python3
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="15b14d436f28092f0a9c3ecc0be0197d54085710b6cd651505168e14bf3c002ce4e218bdf2725a09c7caa2a1f72c83b24daf193eddc52658c8510e25c65a7c1b  email2trac-2.12.2.tar.gz"
diff --git a/main/enca/APKBUILD b/main/enca/APKBUILD
deleted file mode 100644
index f580ffce9d9..00000000000
--- a/main/enca/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: Carlo Landmeter
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=enca
-pkgver=1.19
-pkgrel=1
-pkgdesc="Charset analyser and converter"
-url="http://freshmeat.net/projects/enca/"
-arch="all"
-license="GPL"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://dl.cihar.com/${pkgname}/${pkgname}-${pkgver}.tar.xz"
-
-builddir="$srcdir/$pkgname-$pkgver"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--libexecdir=/usr/lib \
-		--enable-external
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="6678639992685180457bbef7b0da6e475071ec6935dfd672188fc242ef80b906e75eff9a206e07989893d0ef4ae5eb500f1d0bbd6b4d58146c94bb143b5fb296  enca-1.19.tar.xz"
diff --git a/main/encfs/APKBUILD b/main/encfs/APKBUILD
deleted file mode 100644
index 04053c3b7dd..00000000000
--- a/main/encfs/APKBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=encfs
-pkgver=1.9.5
-_ver=${pkgver/_/-}
-pkgrel=6
-pkgdesc="EncFS provides an encrypted filesystem in user-space"
-url="https://vgough.github.io/encfs/"
-arch="all"
-license="GPL-3.0-only"
-makedepends="rlog-dev openssl-dev fuse-dev boost-dev
-	libtool gettext-dev cmake tinyxml2-dev perl"
-subpackages="$pkgname-doc $pkgname-lang $pkgname-libs"
-source="$pkgname-$_ver.tar.gz::https://github.com/vgough/encfs/archive/v$_ver.tar.gz"
-options="!check" # No test suite
-
-build() {
-	if [ "$CBUILD" != "$CHOST" ]; then
-		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
-	fi
-
-	mkdir build
-	cd build
-
-	cmake .. \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DUSE_INTERNAL_TINYXML=OFF \
-		-DINSTALL_LIBENCFS=ON \
-		-DBUILD_SHARED_LIBS=ON \
-		-DBUILD_SHARED_LIBS=True \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		$CMAKE_CROSSOPTS
-	make
-}
-
-package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir" install
-}
-
-libs() {
-	license="LGPL-3.0-only"
-	default_libs
-}
-
-sha512sums="036e08ca9bc13b44742aebdee49bf7029d0c6b7e59cd6dedc9a09da2af99482859f6a79eddf07e3db296edaf45aafc48fe08488840e765682e9b192dd6ae4c46  encfs-1.9.5.tar.gz"
diff --git a/main/enchant/APKBUILD b/main/enchant/APKBUILD
deleted file mode 100644
index 9b6183d77c6..00000000000
--- a/main/enchant/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=enchant
-pkgver=1.6.0
-pkgrel=14
-pkgdesc="A wrapper library for generic spell checking"
-url="http://www.abisource.com/enchant/"
-arch="all"
-license="LGPL-2.0-or-later"
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="aspell-dev glib-dev dbus-glib-dev hunspell-dev gettext-dev file
-	bash"
-source="http://www.abisource.com/downloads/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
-	hunspell-build-fix.patch"
-
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--disable-static
-	make
-}
-
-check() {
-	cd "$builddir"/tests
-	./test-enchant
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="0ca1634bb783df51512df4abecc89abdadee6baf7330d6e5f90cc15d10779896a3521a1c079ecc07e4df4f7a018ce398cca9d0125a7845a314a059840ebc9137  enchant-1.6.0.tar.gz
-c0b7fd8fd00a81ea2c08ea7ce2bdffa826b5a3a0c06eacb818681f0f977d8e76c69f7938c10cdf71571cd1cbbf0e576d36fc74a41755fb570e047525195aeb99  hunspell-build-fix.patch"
diff --git a/main/enchant/hunspell-build-fix.patch b/main/enchant/hunspell-build-fix.patch
deleted file mode 100644
index 0ecdb24b30c..00000000000
--- a/main/enchant/hunspell-build-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru enchant-1.6.0-orig/src/myspell/myspell_checker.cpp enchant-1.6.0/src/myspell/myspell_checker.cpp
---- enchant-1.6.0-orig/src/myspell/myspell_checker.cpp	2016-04-18 12:25:00.094614256 +0100
-+++ enchant-1.6.0/src/myspell/myspell_checker.cpp	2016-04-18 12:26:09.108569576 +0100
-@@ -148,6 +148,10 @@
- 		g_iconv_close(m_translate_out);
- }
- 
-+#ifndef MAXWORDLEN
-+#   define MAXWORDLEN 100
-+#endif
-+
- bool
- MySpellChecker::checkWord(const char *utf8Word, size_t len)
- {
diff --git a/main/encodings/APKBUILD b/main/encodings/APKBUILD
index 4746f5a791c..b7e5b2f1f82 100644
--- a/main/encodings/APKBUILD
+++ b/main/encodings/APKBUILD
@@ -1,17 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=encodings
-pkgver=1.0.5
-pkgrel=0
+pkgver=1.0.7
+pkgrel=1
 pkgdesc="X.org font encoding files"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="noarch"
-license="custom"
+license="Public Domain"
 options="!check"  # No test suite.
 makedepends="mkfontscale util-macros"
-source="https://www.x.org/releases/individual/font/encodings-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/font/encodings-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -21,7 +20,9 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="920e49f0b3545f181a1574ca3280ac9adef1e68fe27566c195dd7013f728d355c0d759132789357fcf8fa7391fcbe1e17edf2bd85aa5611df5a4d99740011008  encodings-1.0.5.tar.bz2"
+
+sha512sums="
+dc72982b14e5d89fe1eff1ab11f308796c89255a06337d8cd6bf65757f11dd0a5478b41d844793213db8fe9638389734f148abe9df9fb05027ea563dacde6ba8  encodings-1.0.7.tar.xz
+"
diff --git a/main/esh/APKBUILD b/main/esh/APKBUILD
index 9fc55984958..e1891c65925 100644
--- a/main/esh/APKBUILD
+++ b/main/esh/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=esh
-pkgver=0.3.0
+pkgver=0.3.2
 pkgrel=0
 pkgdesc="Simple template system based on shell"
 url="https://github.com/jirutka/esh"
@@ -9,17 +9,16 @@ arch="noarch"
 license="MIT"
 makedepends="asciidoctor"
 subpackages="$pkgname-doc"
-source="https://github.com/jirutka/$pkgname/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://github.com/jirutka/esh/archive/v$pkgver/esh-$pkgver.tar.gz"
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" prefix=/usr install
 }
 
-sha512sums="6c1a55a9301af37272223b1155b69000667bb86fb95e5533ee08ecafbaaafb3d93a63e538b8511e33268dfc04a9cbb767308bc5795e019b90c72e8ce687d55b6  esh-0.3.0.tar.gz"
+sha512sums="
+f93835f0c28b75fa4b4ab2fdccd860050e4dde25634074065b182f289dd36d05074c7a5762f6cd35f409ae2ef239de5e0799af70ec6a96ba63df50fc8c123784  esh-0.3.2.tar.gz
+"
diff --git a/main/espeak/APKBUILD b/main/espeak/APKBUILD
index 4929ad128a1..eccda38e2c1 100644
--- a/main/espeak/APKBUILD
+++ b/main/espeak/APKBUILD
@@ -1,28 +1,29 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=espeak
 pkgver=1.48.04
-pkgrel=1
+pkgrel=5
 pkgdesc="Speech synthesizer for English and other languages"
-url="http://espeak.sourceforge.net/"
+url="https://espeak.sourceforge.net/"
 arch="all"
-license="GPL-3.0"
+license="GPL-3.0-or-later"
 subpackages="$pkgname-dev"
-depends=
-makedepends=
+makedepends="portaudio-dev"
 source="https://downloads.sourceforge.net/project/espeak/espeak/espeak-${pkgver%.*}/espeak-$pkgver-source.zip
 	fix-narrowing.patch
 	"
 
 builddir="$srcdir"/$pkgname-$pkgver-source
+options="!check"
 
 build() {
 	cd "$builddir"/src
-	make AUDIO=none || return 1
+	cp portaudio19.h portaudio.h
+	make
 }
 
 package() {
 	cd "$builddir"/src
-	make AUDIO=none DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="f0759e6ace2604c8cbb19e8c3fd4b106edf4dcece247a6677f6b734af7746c35a367126edfbe585396c98f6c54f07e25d64bfab35e258e64f09bd2c0833247fa  espeak-1.48.04-source.zip
diff --git a/main/etckeeper/APKBUILD b/main/etckeeper/APKBUILD
index 7e58d192d2e..48470dd7ce9 100644
--- a/main/etckeeper/APKBUILD
+++ b/main/etckeeper/APKBUILD
@@ -1,22 +1,23 @@
 # Contributor: Henrik Riomar <henrik.riomar@gmail.com>
 # Maintainer: Henrik Riomar <henrik.riomar@gmail.com>
 pkgname=etckeeper
-pkgver=1.18.14
-pkgrel=0
+pkgver=1.18.21
+pkgrel=1
 pkgdesc="Store /etc in git."
-url="http://etckeeper.branchable.com"
+url="https://etckeeper.branchable.com/"
 arch="noarch"
 license="GPL-2.0-or-later"
 checkdepends="bats fakeroot"
 depends="findutils git"
 subpackages="
 	$pkgname-doc
-	$pkgname-bash-completion:bashcomp:noarch
-	$pkgname-zsh-completion:zshcomp:noarch
+	$pkgname-bash-completion
+	$pkgname-zsh-completion
 	"
 install="$pkgname.post-install $pkgname.pre-deinstall"
 source="$pkgname-$pkgver.tar.gz::https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/etckeeper-$pkgver.tar.gz
 	apk-commit_hook
+	etckeeper.cron
 	"
 
 prepare() {
@@ -30,39 +31,24 @@ check() {
 	make test
 }
 
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
-	install -dm755 "$subpkgdir"/usr/share
-	mv "$pkgdir"/usr/share/bash-completion \
-		"$subpkgdir"/usr/share/
-}
-
-zshcomp() {
-	depends=""
-	pkgdesc="Zsh completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel zsh"
-
-	install -dm755 "$subpkgdir"/usr/share/zsh
-	mv "$pkgdir"/usr/share/zsh/vendor-completions \
-		"$subpkgdir"/usr/share/zsh/site-functions
-	rmdir "$pkgdir"/usr/share/zsh
-}
-
 package() {
 	make install DESTDIR="$pkgdir"
 	rm -rf "$pkgdir"/lib/systemd
 	rmdir "$pkgdir"/lib/
 	rm -rf "$pkgdir"/etc/apt
 
-	install -m755 -D "$builddir"/debian/cron.daily \
+	install -m755 -D "$srcdir"/etckeeper.cron \
 		"$pkgdir"/etc/periodic/daily/"$pkgname"
 
 	install -m755 -D "$srcdir"/apk-commit_hook \
 		"$pkgdir"/etc/apk/commit_hooks.d/"$pkgname"
+
+	mv "$pkgdir"/usr/share/zsh/vendor-completions \
+		"$pkgdir"/usr/share/zsh/site-functions
 }
 
-sha512sums="1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948  etckeeper-1.18.14.tar.gz
-d0ff88615359e8b03da5f9162a7bae3f32c06891a8899096025283d77e950dd72280c6c19b8eb8a4cde08742c6ca715cd32c37c16e8bbf2d030e9fd16a1fc940  apk-commit_hook"
+sha512sums="
+c23bd0f24e04b565ceae77e552eb00926dae16f4a6c8c183c5a6bb404d5351ee7a040e01287b7c0d3d530bc8dea62cd2336b3151a349998aa9c145f1258ac2a0  etckeeper-1.18.21.tar.gz
+d0ff88615359e8b03da5f9162a7bae3f32c06891a8899096025283d77e950dd72280c6c19b8eb8a4cde08742c6ca715cd32c37c16e8bbf2d030e9fd16a1fc940  apk-commit_hook
+471c1f8f2cce94248f679e56e2bfc4ac384d9b6944d4023a2ebdd3d197f95d335f4ccc0d3d946a68513d3cc5638189fa8e04923f097605435fd3e4f01c60e1c2  etckeeper.cron
+"
diff --git a/main/etckeeper/etckeeper.cron b/main/etckeeper/etckeeper.cron
new file mode 100755
index 00000000000..eb74401a546
--- /dev/null
+++ b/main/etckeeper/etckeeper.cron
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
+	. /etc/etckeeper/etckeeper.conf
+	if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then
+		/etc/etckeeper/daily
+	fi
+fi
diff --git a/main/ethtool/APKBUILD b/main/ethtool/APKBUILD
index 7de8b2bdb1a..c2318492853 100644
--- a/main/ethtool/APKBUILD
+++ b/main/ethtool/APKBUILD
@@ -1,16 +1,18 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ethtool
-pkgver=5.4
+pkgver=6.7
 pkgrel=0
 pkgdesc="Utility for controlling network drivers and hardware"
 url="https://mirrors.edge.kernel.org/pub/software/network/ethtool/"
 arch="all"
 license="GPL-2.0-only"
-makedepends="linux-headers"
-subpackages="$pkgname-doc"
+makedepends="linux-headers libmnl-dev"
+subpackages="$pkgname-doc $pkgname-bash-completion"
 source="https://www.kernel.org/pub/software/network/ethtool/ethtool-$pkgver.tar.xz"
 
 build() {
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,4 +29,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c7bfe7eae2ba207d710716274e9f5ae275c57d0bebc0a9acb95677125e64f1b42ef610032011fb59894aab46973988bad40fddbc5ccc238893e7da66f913255b  ethtool-5.4.tar.xz"
+sha512sums="
+07d13f9a8f980dab73c07e7c68179cfee272f53103c6dfbce1814b768e3313dc671a0cbefc63d4d53a616876bc1f96db8db2444617e4d58d741fae3acf0be524  ethtool-6.7.tar.xz
+"
diff --git a/main/eudev/78-sound-card.rules_Import_ID_PATH_early.patch b/main/eudev/78-sound-card.rules_Import_ID_PATH_early.patch
new file mode 100644
index 00000000000..d17fac07766
--- /dev/null
+++ b/main/eudev/78-sound-card.rules_Import_ID_PATH_early.patch
@@ -0,0 +1,42 @@
+From 917ae648f61681257000c3a1f0aca3fbd646563a Mon Sep 17 00:00:00 2001
+From: Johannes Nixdorf <mixi@shadowice.org>
+Date: Fri, 22 Dec 2023 10:27:08 +0100
+Subject: [PATCH] 78-sound-card.rules: Import ID_PATH early
+
+Pipewire requires ID_PATH to use the same device names as with systemd's
+udev. Some rules, such as the ones in asahi-audio [1] use those names, and
+fail if they don't match [2].
+
+On systemd's udev this is instead imported in 71-seat.rules, which we don't
+have.
+
+[1]: https://github.com/AsahiLinux/asahi-audio
+[2]: https://github.com/AsahiLinux/asahi-audio/issues/16
+
+Signed-off-by: Johannes Nixdorf <mixi@shadowice.org>
+---
+ rules/78-sound-card.rules | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rules/78-sound-card.rules b/rules/78-sound-card.rules
+index f2fc27739..c49bd1d4e 100644
+--- a/rules/78-sound-card.rules
++++ b/rules/78-sound-card.rules
+@@ -38,6 +38,8 @@ KERNEL!="card*", GOTO="sound_end"
+ ENV{SOUND_INITIALIZED}="1"
+ 
+ IMPORT{builtin}="hwdb"
++IMPORT{builtin}="path_id"
++
+ SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id"
+ SUBSYSTEMS=="usb", GOTO="skip_pci"
+ 
+@@ -62,8 +64,6 @@ LABEL="skip_pci"
+ ENV{ID_SERIAL}=="?*", ENV{ID_USB_INTERFACE_NUM}=="?*", ENV{ID_ID}="$env{ID_BUS}-$env{ID_SERIAL}-$env{ID_USB_INTERFACE_NUM}"
+ ENV{ID_SERIAL}=="?*", ENV{ID_USB_INTERFACE_NUM}=="", ENV{ID_ID}="$env{ID_BUS}-$env{ID_SERIAL}"
+ 
+-IMPORT{builtin}="path_id"
+-
+ # The values used here for $SOUND_FORM_FACTOR and $SOUND_CLASS should be kept
+ # in sync with those defined for PulseAudio's src/pulse/proplist.h
+ # PA_PROP_DEVICE_FORM_FACTOR, PA_PROP_DEVICE_CLASS properties.
diff --git a/main/eudev/APKBUILD b/main/eudev/APKBUILD
index 975f01eaa9c..bc8b48ddd0f 100644
--- a/main/eudev/APKBUILD
+++ b/main/eudev/APKBUILD
@@ -1,32 +1,46 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
 pkgname=eudev
-pkgver=3.2.9
+pkgver=3.2.14
+_pkgver=${pkgver/_pre/-pre}
 pkgrel=2
-pkgdesc="OpenRC compatible fork of systemd-udev"
-url="https://wiki.gentoo.org/wiki/Project:Eudev"
+pkgdesc="init system agnostic fork of systemd-udev"
+url="https://github.com/eudev-project/eudev"
 arch="all"
-license="GPL-2.0-only"
+license="GPL-2.0-or-later"
 depends="udev-init-scripts"
 replaces="udev"
 provides="udev=176"
-makedepends="gperf glib-dev linux-headers kmod-dev gobject-introspection-dev
-	util-linux-dev"
+provider_priority=100
+makedepends="
+	gperf
+	glib-dev
+	linux-headers
+	kmod-dev
+	gobject-introspection-dev
+	util-linux-dev
+	"
 checkdepends="tree xz perl"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc
-	$pkgname-netifnames::noarch"
+	$pkgname-netifnames::noarch $pkgname-rule-generator::noarch $pkgname-hwids"
 triggers="eudev.trigger=/lib/udev/rules.d:/usr/lib/udev/rules.d"
-source="https://dev.gentoo.org/~blueness/eudev/eudev-$pkgver.tar.gz
+source="https://github.com/eudev-project/eudev/releases/download/v$_pkgver/eudev-$_pkgver.tar.gz
 	default-rules.patch
 	load-fbcon.patch
+	no-sgx.patch
+	78-sound-card.rules_Import_ID_PATH_early.patch
 	udev-postmount.initd
-	setup-udev
 	"
+builddir="$srcdir"/"$pkgname"-"$_pkgver"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
-	# we need disable kmod til busybox depmod generates binary formats:
-	# modules.dep.bin modules.alias.bin modules.symbols.bin
-	# modules.builtin.bin
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -37,7 +51,6 @@ build() {
 		--libdir=/usr/lib \
 		--enable-split-usr \
 		--enable-manpages \
-		--disable-hwdb \
 		--enable-kmod \
 		--exec-prefix=/ \
 		--bindir=/bin
@@ -54,8 +67,6 @@ package() {
 
 	install -Dm755 "$srcdir"/udev-postmount.initd \
 		"$pkgdir"/etc/init.d/udev-postmount
-	install -Dm755 "$srcdir"/setup-udev \
-		"$pkgdir"/sbin/setup-udev
 }
 
 dev() {
@@ -77,14 +88,41 @@ libs() {
 
 netifnames() {
 	pkgdesc="udev rules for systemd-style interface names"
+	depends="!$pkgname-rule-generator"
+
+	amove lib/udev/rules.d/80-net-name-slot.rules
+}
+
+generator() {
+	pkgdesc="generate udev net persistance rules"
+	depends="!$pkgname-netifnames"
+
+	# Since we didn't enable rules-generator which disables netifnames, we
+	# install the rule-generator files.
+	sed -i 's/"write_net_rules"/"\/lib\/udev\/rule_generator\/write_net_rules"/' \
+		"$builddir"/rule_generator/75-persistent-net-generator.rules
+	install -Dm644 "$builddir"/rule_generator/75-persistent-net-generator.rules \
+		"$subpkgdir"/lib/udev/rules.d/75-persistent-net-generator.rules
+	install -Dm755 "$builddir"/rule_generator/write_net_rules \
+		"$subpkgdir"/lib/udev/rule_generator/write_net_rules
+	install -Dm755 "$builddir"/rule_generator/rule_generator.functions \
+		"$subpkgdir"/lib/udev/rule_generator.functions
+}
+
+hwids() {
+	pkgdesc="Hardware identification databases (from eudev)"
+	provides="hwids-udev=$pkgver-r$pkgrel"
+	install_if="hwdata eudev=$pkgver-r$pkgrel"
+	triggers="eudev-hwids.trigger=/lib/udev/hwdb.d:/etc/udev/hwdb.d:/usr/lib/udev/hwdb.d"
 
-	mkdir -p "$subpkgdir"/lib/udev/rules.d
-	mv "$pkgdir"/lib/udev/rules.d/80-net-name-slot.rules \
-		"$subpkgdir"/lib/udev/rules.d/
+	amove etc/udev/hwdb.d
 }
 
-sha512sums="09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f  eudev-3.2.9.tar.gz
+sha512sums="
+1e7593b53c5508a99fe7ff5d24d1d09b3753d9cfba086e7d8cc6ab80cc88013ec687dc4f1eac7b7889051f4e5fd5c40d2b87f5f2d948479d679c8836014d08e0  eudev-3.2.14.tar.gz
 683e3c26ca4f058303f8db7d4977e436d728386ee6866719c4f11ff31db27572d3f486f51d3173310e1ec2cf995fa4c396f2415bdf45dabdd80e6e55e798a314  default-rules.patch
 ff5928fd555e095d9f3234dd004ac4c5925405d308777e9b018e8e03112cd109935b51d75a3bc4a2a1018eb486e8a5e5ef6ee978860002a8fff93b116e9721f5  load-fbcon.patch
+1558800e4132ed2c10b37805fca044ff3129cdfebec71d3e758143fab9ffda824e86d52960926a9042b21fc22f0cda8fe6690484913bd7c3dc4436af92923efe  no-sgx.patch
+8872f124267485d682dea9c7c47aaa8c228aadef90981c430af7ca7f7025b344d2c3c07c653241190a3f44096aa1d3aff990dd05210f5b278d999d6fede659b5  78-sound-card.rules_Import_ID_PATH_early.patch
 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88  udev-postmount.initd
-4e57349a9516d495a6eb6dd437e179c1f990b437c4e671667f64d4361fcd827a2172e4ca120fbd324ca29e9acc65a361cd22a75b8dd8437389cc19ba62198f83  setup-udev"
+"
diff --git a/main/eudev/eudev-hwids.trigger b/main/eudev/eudev-hwids.trigger
new file mode 100644
index 00000000000..b1516251b05
--- /dev/null
+++ b/main/eudev/eudev-hwids.trigger
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+udevadm hwdb --update
+
+exit 0
diff --git a/main/eudev/no-sgx.patch b/main/eudev/no-sgx.patch
new file mode 100644
index 00000000000..e06ae141b5c
--- /dev/null
+++ b/main/eudev/no-sgx.patch
@@ -0,0 +1,17 @@
+see https://gitlab.alpinelinux.org/alpine/aports/-/issues/15043
+we don't have sgx support
+--
+diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules
+index ff50cb8..2cbd96e 100644
+--- a/rules/50-udev-default.rules
++++ b/rules/50-udev-default.rules
+@@ -39,9 +39,6 @@ SUBSYSTEM=="cec", GROUP="video"
+ SUBSYSTEM=="drm", KERNEL=="renderD*", GROUP="video", MODE="0666"
+ SUBSYSTEM=="kfd", GROUP="video", MODE="0666"
+ 
+-SUBSYSTEM=="misc", KERNEL=="sgx_enclave", GROUP="sgx", MODE="0660"
+-SUBSYSTEM=="misc", KERNEL=="sgx_vepc", GROUP="sgx", MODE="0660"
+-
+ # When using static_node= with non-default permissions, also update
+ # tmpfiles.d/static-nodes-permissions.conf.in to keep permissions synchronized.
+ 
diff --git a/main/eudev/setup-udev b/main/eudev/setup-udev
deleted file mode 100644
index 1b1c5664bca..00000000000
--- a/main/eudev/setup-udev
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-while getopts "hn" opt; do
-	case "$opt" in
-	h)	echo "remove mdev and enable udev from boot"
-		echo "usage: $0 [-n]"
-		echo "options:"
-		echo "  -n  Do not start udev"
-		;;
-	n)	dryrun=1
-		;;
-	esac
-done
-
-rm -f /etc/runlevels/sysinit/hwdrivers /etc/runlevels/sysinit/mdev
-
-for i in sysinit/udev-trigger sysinit/udev default/udev-postmount; do
-	if ! [ -e /etc/runlevels/$i ]; then
-		ln -s /etc/init.d/${i#*/} /etc/runlevels/$i
-	fi
-done
-
-if [ -z "$dryrun" ] && ! rc-service --quiet udev status; then
-	rc-service udev start
-	rc-service udev-postmount start
-	rc-service udev-trigger start
-	rc-service udev-settle start
-fi
diff --git a/main/eventlog/APKBUILD b/main/eventlog/APKBUILD
index 0aec4323497..68c81e930fe 100644
--- a/main/eventlog/APKBUILD
+++ b/main/eventlog/APKBUILD
@@ -1,24 +1,22 @@
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
-
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=eventlog
 pkgver=0.2.13
-pkgrel=1
+pkgrel=4
 pkgdesc="API to format and send structured log messages"
 arch="all"
-url="https://www.balabit.com/support/community/products/"
+url="https://github.com/balabit/eventlog"
 license="BSD-3-Clause"
 makedepends="automake autoconf libtool"
 subpackages="$pkgname-dev"
-source="https://src.fedoraproject.org/lookaside/extras/$pkgname/${pkgname}_${pkgver}.tar.gz/68ec8d1ea3b98fa35002bb756227c315/${pkgname}_${pkgver}.tar.gz"
+source="https://src.fedoraproject.org/lookaside/extras/eventlog/eventlog_$pkgver.tar.gz/68ec8d1ea3b98fa35002bb756227c315/eventlog_$pkgver.tar.gz"
 
 prepare() {
-	cd "$builddir"
+	default_prepare
 	autoreconf -vif
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -28,15 +26,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="${pkgdir}" install
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING \
-		"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+		"$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
 }
 
 sha512sums="0c76199479f1d5191e6f591909878dcb747fc211ea97345c5c5575dd50482ee6e2e34aa0e8255ae366c5d563a79a55b178ed3289965cc9013f001909a2cb9732  eventlog_0.2.13.tar.gz"
diff --git a/main/execline/APKBUILD b/main/execline/APKBUILD
index 592de9af826..bce730d2c0a 100644
--- a/main/execline/APKBUILD
+++ b/main/execline/APKBUILD
@@ -1,16 +1,16 @@
-# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 # Contributor: John Regan <john@jrjrtech.com>
+# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 pkgname=execline
-pkgver=2.6.0.0
+pkgver=2.9.4.0
 pkgrel=0
 pkgdesc="A small scripting language, to be used in place of a shell in non-interactive scripts."
-url="http://skarnet.org/software/$pkgname/"
+url=https://skarnet.org/software/execline/
 arch="all"
 license="ISC"
 options="!check"
-makedepends="skalibs-dev"
+makedepends="skalibs-dev>=2.14"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="http://skarnet.org/software/execline/execline-$pkgver.tar.gz"
+source="https://skarnet.org/software/execline/execline-$pkgver.tar.gz"
 
 build() {
 	./configure \
@@ -18,12 +18,16 @@ build() {
 		--enable-static \
 		--disable-allstatic \
 		--libdir=/usr/lib \
-		--with-dynlib=/lib
+		--with-dynlib=/lib \
+		--enable-multicall
 	make
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
+	# Compat symlink for #!/usr/bin/execlineb shebangs, remove if usrmerge
+	mkdir -p "$pkgdir/usr/bin"
+	ln -s ../../bin/execlineb "$pkgdir/usr/bin/execlineb"
 }
 
 doc() {
@@ -37,4 +41,6 @@ static() {
 	rmdir -p "$pkgdir"/usr/lib || :
 }
 
-sha512sums="890a533a6ffad98b066adda34ae4a7e69daa98950974fcdb4635cff4c8957851b7fc6beaf25802c7ed5085285fc9b2aa9d9806afdb1aaa6884745a978b969f7a  execline-2.6.0.0.tar.gz"
+sha512sums="
+11d96863d2f90abc371656e17bac9fd83f1303337444db5a1f24e8a02cab654a3b5e9081af130d5cbca5a4f6ea5cf5f6c2affa66e2b4a9eb39c20410efeb8795  execline-2.9.4.0.tar.gz
+"
diff --git a/main/expat/APKBUILD b/main/expat/APKBUILD
index 35cb8bcf659..47efe6918bc 100644
--- a/main/expat/APKBUILD
+++ b/main/expat/APKBUILD
@@ -1,16 +1,46 @@
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=expat
-pkgver=2.2.9
-pkgrel=1
-pkgdesc="An XML Parser library written in C"
-url="http://www.libexpat.org/"
+pkgver=2.6.2
+pkgrel=0
+pkgdesc="XML Parser library written in C"
+url="https://libexpat.github.io/"
 arch="all"
-license='MIT'
+license="MIT"
 checkdepends="bash"
 source="https://downloads.sourceforge.net/project/expat/expat/$pkgver/expat-$pkgver.tar.bz2"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
+# pull in xmlwf for dev
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+# Order matters, ensure -dev does not gobble up static libraries.
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc lib$pkgname:libs"
 
 # secfixes:
+#   2.6.2-r0:
+#     - CVE-2024-28757
+#   2.6.0-r0:
+#     - CVE-2023-52425
+#     - CVE-2023-52426
+#   2.5.0-r0:
+#     - CVE-2022-43680
+#   2.4.9-r0:
+#     - CVE-2022-40674
+#   2.4.5-r0:
+#     - CVE-2022-25235
+#     - CVE-2022-25236
+#     - CVE-2022-25313
+#     - CVE-2022-25314
+#     - CVE-2022-25315
+#   2.4.4-r0:
+#     - CVE-2022-23852
+#     - CVE-2022-23990
+#   2.4.3-r0:
+#     - CVE-2021-45960
+#     - CVE-2021-46143
+#     - CVE-2022-22822
+#     - CVE-2022-22823
+#     - CVE-2022-22824
+#     - CVE-2022-22825
+#     - CVE-2022-22826
+#     - CVE-2022-22827
 #   2.2.7-r1:
 #     - CVE-2019-15903
 #   2.2.7-r0:
@@ -19,7 +49,6 @@ subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 #     - CVE-2017-9233
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,13 +59,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir/" install
 }
 
-sha512sums="8ea4b89a171dfda8267c8b7a0295516d169bf7f46587ebe460fe0ae7a31478a119ae2a7eaa09b3ce46b107ec7cd2274ea66d91c08b8a4ad6b98ba984cdd4e15b  expat-2.2.9.tar.bz2"
+sha512sums="
+15811413e92a632272188781cc3f2a9e52ed62f6edfad9b2eeeca0946e53132b6c9ca6dc460eda766d6a4e68e5920128335d705f9556b5aa3f77593658780470  expat-2.6.2.tar.bz2
+"
diff --git a/main/expect/07-file-handle.patch b/main/expect/07-file-handle.patch
new file mode 100644
index 00000000000..98e42180bfa
--- /dev/null
+++ b/main/expect/07-file-handle.patch
@@ -0,0 +1,24 @@
+Author: Russell Coker <russell@coker.com.au>
+Description:
+ Fixes file handle 3 to be left open when running programs (Closes: #166677).
+
+--- a/exp_clib.c
++++ b/exp_clib.c
+@@ -2040,6 +2040,7 @@
+ 
+ 	/* save error fd while we're setting up new one */
+ 	errorfd = fcntl(2,F_DUPFD,3);
++	fcntl(3, F_SETFD, FD_CLOEXEC);
+ 	/* and here is the macro to restore it */
+ #define restore_error_fd {close(2);fcntl(errorfd,F_DUPFD,2);}
+ 
+--- a/exp_command.c
++++ b/exp_command.c
+@@ -1162,6 +1162,7 @@
+ 
+     /* save error fd while we're setting up new one */
+     errorfd = fcntl(2,F_DUPFD,3);
++    fcntl(3, F_SETFD, FD_CLOEXEC);
+     /* and here is the macro to restore it */
+ #define restore_error_fd {close(2);fcntl(errorfd,F_DUPFD,2);}
+ 
diff --git a/main/expect/09-unsafe-traps.patch b/main/expect/09-unsafe-traps.patch
new file mode 100644
index 00000000000..1440f217c94
--- /dev/null
+++ b/main/expect/09-unsafe-traps.patch
@@ -0,0 +1,24 @@
+Author: n/a
+Description: Fixes some unsafe traps.
+
+--- a/exp_trap.c
++++ b/exp_trap.c
+@@ -264,6 +264,18 @@
+ #if defined(SIGSTOP)
+ 	traps[SIGSTOP].reserved = TRUE;
+ #endif
++#if defined(SIGSEGV)
++	traps[SIGSEGV].reserved = TRUE;
++#endif
++#if defined(SIGBUS)
++	traps[SIGBUS].reserved = TRUE;
++#endif
++#if defined(SIGILL)
++	traps[SIGILL].reserved = TRUE;
++#endif
++#if defined(SIGFPE)
++	traps[SIGFPE].reserved = TRUE;
++#endif
+ 
+ 	async_handler = Tcl_AsyncCreate(tophalf,(ClientData)0);
+ 
diff --git a/main/expect/10-manpage.patch b/main/expect/10-manpage.patch
new file mode 100644
index 00000000000..2faa21c597d
--- /dev/null
+++ b/main/expect/10-manpage.patch
@@ -0,0 +1,384 @@
+Author: n/a
+Description: Fixes sample expect shebang and excapes dashes.
+
+--- a/expect.man
++++ b/expect.man
+@@ -108,11 +108,11 @@
+ may also be invoked implicitly on systems which support the #! notation
+ by marking the script executable, and making the first line in your script:
+ 
+-    #!/usr/local/bin/expect \-f
++    #!/usr/bin/expect \-f
+ 
+ Of course, the path must accurately describe where
+ .B Expect
+-lives.  /usr/local/bin is just an example.
++lives.  /usr/bin is just an example.
+ 
+ The
+ .B \-c
+@@ -209,7 +209,7 @@
+ original arguments (including the script name) in the variable
+ .IR argv .
+ 
+-    #!/usr/local/bin/expect \-\-
++    #!/usr/bin/expect \-\-
+ 
+ Note that the usual getopt(3) and execve(2) conventions must be observed
+ when adding arguments to the #! line.
+@@ -293,7 +293,7 @@
+ program.)
+ .I
+ .TP 6
+-.BI close " [-slave] [\-onexec 0|1] [\-i spawn_id]"
++.BI close " [\-slave] [\-onexec 0|1] [\-i spawn_id]"
+ closes the connection to the current process.
+ Most interactive programs will detect EOF on their stdin and exit;
+ thus
+@@ -322,7 +322,7 @@
+ 
+ The 
+ .B \-slave
+-flag closes the slave associated with the spawn id.  (See "spawn -pty".)
++flag closes the slave associated with the spawn id.  (See "spawn \-pty".)
+ When the connection is closed, the slave is automatically closed as
+ well if still open.
+ 
+@@ -339,7 +339,7 @@
+ .B wait
+ below for more info.
+ .TP
+-.BI debug " [[-now] 0|1]"
++.BI debug " [[\-now] 0|1]"
+ controls a Tcl debugger allowing you to step through statements, set
+ breakpoints, etc.
+ 
+@@ -357,7 +357,7 @@
+ The
+ .B debug
+ command does not change any traps.  Compare this to starting Expect with the 
+-.B -D
++.B \-D
+ flag (see above).
+ 
+ See the README file or SEE ALSO (below)
+@@ -387,7 +387,7 @@
+ .nf
+ 
+     send_user "password?\\ "
+-    expect_user -re "(.*)\\n"
++    expect_user \-re "(.*)\\n"
+     for {} 1 {} {
+         if {[fork]!=0} {sleep 3600;continue}
+         disconnect
+@@ -454,7 +454,7 @@
+ .B exit
+ is implicitly executed if the end of the script is reached.
+ .TP
+-\fBexp_continue\fR [-continue_timer]
++\fBexp_continue\fR [\-continue_timer]
+ The command
+ .B exp_continue
+ allows
+@@ -464,7 +464,7 @@
+ default
+ .B exp_continue
+ resets the timeout timer. The
+-.I -continue_timer
++.I \-continue_timer
+ flag prevents timer from being restarted. (See
+ .B expect
+ for more information.)
+@@ -627,8 +627,8 @@
+ be used to protect patterns that might otherwise match
+ .B expect
+ flags from doing so.
+-Any pattern beginning with a "-" should be protected this way.  (All strings
+-starting with "-" are reserved for future options.)
++Any pattern beginning with a "\-" should be protected this way.  (All strings
++starting with "\-" are reserved for future options.)
+ 
+ .IP
+ For example, the following fragment looks for a successful login.
+@@ -735,7 +735,7 @@
+ through
+ .IR expect_out(9,string) .
+ If the
+-.B -indices
++.B \-indices
+ flag is used before a pattern,
+ the starting and ending indices (in a form suitable for
+ .BR lrange )
+@@ -782,7 +782,7 @@
+     set expect_out(buffer) abbbcabkkkk
+ 
+ .fi
+-and "a\\n" is left in the output buffer.  The pattern "*" (and -re ".*") will
++and "a\\n" is left in the output buffer.  The pattern "*" (and \-re ".*") will
+ flush the output buffer without reading any more output from the
+ process.
+ .IP
+@@ -790,7 +790,7 @@
+ This may be prevented by prefixing a pattern with the
+ .B \-notransfer
+ flag.  This flag is especially useful in experimenting (and can be
+-abbreviated to "-not" for convenience while experimenting).
++abbreviated to "\-not" for convenience while experimenting).
+ 
+ The spawn id associated with the matching output (or eof or
+ full_buffer) is stored in
+@@ -874,9 +874,9 @@
+ 
+     expect {
+         Password: {
+-            stty -echo
++            stty \-echo
+             send_user "password (for $user) on $host: "
+-            expect_user -re "(.*)\\n"
++            expect_user \-re "(.*)\\n"
+             send_user "\\n"
+             send "$expect_out(1,string)\\r"
+             stty echo
+@@ -891,7 +891,7 @@
+             send_user \\
+                 "connection to host failed: $expect_out(buffer)"
+             exit
+-        } -re $prompt
++        } \-re $prompt
+     }
+ 
+ .fi
+@@ -1023,14 +1023,14 @@
+ By default, it reports on the current spawn id.  An optional spawn id specification may be given for information on that spawn id.  For example
+ .nf
+ 
+-    expect_before -info -i $proc
++    expect_before \-info \-i $proc
+ 
+ .fi
+ At most one spawn id specification may be given.  The flag \-indirect
+ suppresses direct spawn ids that come only from indirect specifications.
+ 
+-Instead of a spawn id specification, the flag "-all" will cause
+-"-info" to report on all spawn ids.
++Instead of a spawn id specification, the flag "\-all" will cause
++"\-info" to report on all spawn ids.
+ 
+ The output of the \-info flag can be reused as the argument to expect_before.
+ .TP
+@@ -1123,7 +1123,7 @@
+ .ta \w'    interact 'u +\w'$CTRLZ  'u +\w'{'u
+     set CTRLZ \\032
+     interact {
+-        -reset $CTRLZ {exec kill \-STOP [pid]}
++        \-reset $CTRLZ {exec kill \-STOP [pid]}
+         \\001   {send_user "you typed a control\-A\\n";
+                 send "\\001"
+                }
+@@ -1152,8 +1152,8 @@
+ flag may be used to protect patterns that might otherwise match
+ .B interact
+ flags from doing so.
+-Any pattern beginning with a "-" should be protected this way.    (All strings
+-starting with "-" are reserved for future options.)
++Any pattern beginning with a "\-" should be protected this way.    (All strings
++starting with "\-" are reserved for future options.)
+ 
+ The
+ .B \-re
+@@ -1199,7 +1199,7 @@
+ messages:
+ .nf
+ 
+-    interact -input $user_spawn_id timeout 3600 return -output \\
++    interact \-input $user_spawn_id timeout 3600 return \-output \\
+         $spawn_id 
+ 
+ .fi
+@@ -1298,9 +1298,9 @@
+ .nf
+ 
+     interact {
+-        -echo ~g {getcurdirectory 1}
+-        -echo ~l {getcurdirectory 0}
+-        -echo ~p {putcurdirectory}
++        \-echo ~g {getcurdirectory 1}
++        \-echo ~l {getcurdirectory 0}
++        \-echo ~p {putcurdirectory}
+     }
+ 
+ .fi
+@@ -1316,11 +1316,11 @@
+ .nf
+ 
+     proc lognumber {} {
+-        interact -nobuffer -re "(.*)\\r" return
++        interact \-nobuffer \-re "(.*)\\r" return
+         puts $log "[clock format [clock seconds]]: dialed $interact_out(1,string)"
+     }
+ 
+-    interact -nobuffer "atd" lognumber
++    interact \-nobuffer "atd" lognumber
+ 
+ .fi
+ .IP
+@@ -1391,7 +1391,7 @@
+ command, except that any_spawn_id is not meaningful in
+ .BR interact .)
+ All following flags and
+-strings (or patterns) apply to this input until another -input flag appears.
++strings (or patterns) apply to this input until another \-input flag appears.
+ If no
+ .B \-input
+ appears,
+@@ -1429,7 +1429,7 @@
+ It is possible to change the processes that are being interacted with
+ by using indirect spawn ids.  (Indirect spawn ids are described in the
+ section on the expect command.)  Indirect spawn ids may be specified
+-with the -i, -u, -input, or -output flags.
++with the \-i, \-u, \-input, or \-output flags.
+ .TP
+ .B interpreter " [args]"
+ causes the user to be interactively prompted for
+@@ -1515,18 +1515,18 @@
+ flag.
+ 
+ The
+-.B -info
++.B \-info
+ flag causes log_file to return a description of the
+ most recent non-info arguments given.
+ .TP
+-.BI log_user " -info|0|1"
++.BI log_user " \-info|0|1"
+ By default, the send/expect dialogue is logged to stdout
+ (and a logfile if open).
+ The logging to stdout is disabled by the command "log_user 0"
+ and reenabled by "log_user 1".  Logging to the logfile is unchanged.
+ 
+ The
+-.B -info
++.B \-info
+ flag causes log_user to return a description of the
+ most recent non-info arguments given.
+ .TP
+@@ -1647,7 +1647,7 @@
+ Any string can be preceded by "\-\-" whether or not it actually looks
+ like a flag.  This provides a reliable mechanism to specify variable strings
+ without being tripped up by those that accidentally look like flags.
+-(All strings starting with "-" are reserved for future options.)
++(All strings starting with "\-" are reserved for future options.)
+ 
+ The
+ .B \-i
+@@ -1671,7 +1671,7 @@
+ The
+ .B \-break
+ flag generates a break condition.  This only makes sense if the spawn
+-id refers to a tty device opened via "spawn -open".  If you have
++id refers to a tty device opened via "spawn \-open".  If you have
+ spawned a process such as tip, you should use tip's convention for
+ generating a break.
+ 
+@@ -1774,7 +1774,7 @@
+ except that the output is sent to stderr rather than the current
+ process.
+ .TP
+-.BI send_log " [\--] string"
++.BI send_log " [\-\-] string"
+ is like
+ .BR send ,
+ except that the string is only sent to the log file (see
+@@ -1951,7 +1951,7 @@
+ The variable
+ .I spawn_out(slave,fd)
+ is set to a file identifier corresponding to the pty slave.
+-It can be closed using "close -slave".
++It can be closed using "close \-slave".
+ 
+ The
+ .B \-ignore
+@@ -1978,7 +1978,7 @@
+ .fi
+ 
+ The
+-.B -info
++.B \-info
+ flag causes strace to return a description of the
+ most recent non-info arguments given.
+ .TP
+@@ -2018,7 +2018,7 @@
+ 
+     stty \-echo
+     send_user "Password: "
+-    expect_user -re "(.*)\\n"
++    expect_user \-re "(.*)\\n"
+     set password $expect_out(1,string)
+     stty echo
+ 
+@@ -2153,7 +2153,7 @@
+     trap exit {SIGINT SIGTERM}
+ 
+ .fi
+-If you use the -D flag to start the debugger, SIGINT is redefined
++If you use the \-D flag to start the debugger, SIGINT is redefined
+ to start the interactive debugger.  This is due to the following trap:
+ .nf
+ 
+@@ -2194,9 +2194,9 @@
+ normally returns a list of four integers.
+ The first integer is the pid of the process that was waited upon.
+ The second integer is the corresponding spawn id.
+-The third integer is -1 if an operating system error occurred, or 0 otherwise.
++The third integer is \-1 if an operating system error occurred, or 0 otherwise.
+ If the third integer was 0, the fourth integer is the status returned by
+-the spawned process.  If the third integer was -1, the fourth integer is
++the spawned process.  If the third integer was \-1, the fourth integer is
+ the value of errno set by the operating system.  The global variable
+ errorCode is also set.
+ 
+@@ -2212,7 +2212,7 @@
+ flag declares the process to wait corresponding to the named spawn_id
+ (NOT the process id).
+ Inside a SIGCHLD handler,
+-it is possible to wait for any spawned process by using the spawn id -1.
++it is possible to wait for any spawned process by using the spawn id \-1.
+ 
+ The
+ .B \-nowait
+@@ -2223,7 +2223,7 @@
+ The
+ .B wait
+ command may also be used wait for a forked process using the arguments
+-"-i -1".  Unlike its use with spawned processes, this command can be
++"\-i \-1".  Unlike its use with spawned processes, this command can be
+ executed at any time.  There is no control over which process is
+ reaped.  However, the return value can be checked for the process id.
+ 
+@@ -2374,7 +2374,7 @@
+ .nf
+ 
+     set env(SHELL) /bin/sh
+-    set env(HOME) /usr/local/bin
++    set env(HOME) /usr/bin
+ 
+ .fi
+ 
+@@ -2427,7 +2427,7 @@
+ to set a flag in the trap code.  Then check the flag immediately after
+ the command (i.e., sleep).
+ 
+-The expect_background command ignores -timeout arguments and has no
++The expect_background command ignores \-timeout arguments and has no
+ concept of timeouts in general.
+ 
+ .SH "EXPECT HINTS"
+@@ -2449,7 +2449,7 @@
+     set prompt "(%|#|\\\\$) $"          ;# default prompt
+     catch {set prompt $env(EXPECT_PROMPT)}
+ 
+-    expect -re $prompt
++    expect \-re $prompt
+ 
+ .fi
+ I encourage you to write
diff --git a/main/expect/12-fdout.patch b/main/expect/12-fdout.patch
new file mode 100644
index 00000000000..0942819ad1f
--- /dev/null
+++ b/main/expect/12-fdout.patch
@@ -0,0 +1,22 @@
+Author: Ian Jackson <iwj@ubuntu.com>
+Description: expBusy forgets to open fdout (Closes: #440818).
+
+--- a/exp_command.c
++++ b/exp_command.c
+@@ -315,7 +315,15 @@
+ 	fcntl(x,F_DUPFD,esPtr->fdin);
+ 	close(x);
+     }
+-    expCloseOnExec(esPtr->fdin);
++    if (esPtr->fdout != EXP_NOFD &&
++	esPtr->fdout != esPtr->fdin) {
++	fcntl(esPtr->fdin,F_DUPFD,esPtr->fdout);
++    }
++    if (esPtr->fdin > 2)
++	expCloseOnExec(esPtr->fdin);
++    if (esPtr->fdout != EXP_NOFD &&
++	esPtr->fdout > 2)
++	expCloseOnExec(esPtr->fdout);
+     esPtr->fdBusy = TRUE;
+ }
+ 
diff --git a/main/expect/22-segfault-with-stubs.patch b/main/expect/22-segfault-with-stubs.patch
new file mode 100644
index 00000000000..3fd825575b4
--- /dev/null
+++ b/main/expect/22-segfault-with-stubs.patch
@@ -0,0 +1,71 @@
+Author: Sergei Golovan <sgolovan@debian.org>
+Description: This dirty hack fixes segfaults if Tcl is built with stubs
+ and Expect is used directly from C program.
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=588817
+Example:
+ #include <stdio.h>
+ #include <tcl8.5/expect.h>
+ int main()
+ {
+     FILE *pipe;
+     char *some_command = "uname";
+     char datum;
+     pipe = exp_popen(some_command);
+     if (pipe == NULL) return 1;
+     while ((datum = getc (pipe)) != EOF)
+ 	printf("%c",datum);
+ }
+Example:
+ #include <stdio.h>
+ #include "expect.h"
+ main()
+ {
+     int fd = 0;
+     fd = exp_spawnl("echo", "echo", "Hello User: Whats up?", (char*) 0);
+     switch (exp_expectl(fd, exp_regexp, "ser:", 1, exp_end)) {
+ 	case 1: {
+ 	    printf("GOT ser:\n");
+ 	    break;
+ 	}
+ 	default: {
+ 	    printf("DEFAULT\n");
+ 	    return 1;
+ 	}
+     }
+     printf("Normal Exit\n");
+     return 0;
+ }
+
+--- a/exp_clib.c
++++ b/exp_clib.c
+@@ -117,7 +117,11 @@
+ #include <stdlib.h>		/* for malloc */
+ #endif
+ 
+-#include <tcl.h>
++#define ckalloc(x) Tcl_Alloc(x)
++#define ckfree(x) Tcl_Free(x)
++extern char *Tcl_ErrnoMsg(int err);
++extern char *Tcl_Alloc(unsigned int size);
++extern void Tcl_Free(char *ptr);
+ #include "expect.h"
+ #define TclRegError exp_TclRegError
+ 
+@@ -392,7 +396,7 @@
+ 		FAIL("regexp too big");
+ 
+ 	/* Allocate space. */
+-	r = (regexp *)ckalloc(sizeof(regexp) + (unsigned)rcstate->regsize);
++	r = (regexp *)malloc(sizeof(regexp) + (unsigned)rcstate->regsize);
+ 	if (r == NULL)
+ 		FAIL("out of space");
+ 
+@@ -402,7 +406,7 @@
+ 	rcstate->regcode = r->program;
+ 	regc(MAGIC, rcstate);
+ 	if (reg(0, &flags, rcstate) == NULL) {
+-	  ckfree ((char*) r);
++	  free ((char*) r);
+ 	  return(NULL);
+ 	}
+ 
diff --git a/main/expect/24-format.patch b/main/expect/24-format.patch
new file mode 100644
index 00000000000..477b7a3e02b
--- /dev/null
+++ b/main/expect/24-format.patch
@@ -0,0 +1,24 @@
+--- a/exp_clib.c
++++ b/exp_clib.c
+@@ -1483,8 +1483,8 @@
+      char *str;
+ {
+   if (exp_is_debugging) {
+-    fprintf(stderr,str);
+-    if (exp_logfile) fprintf(exp_logfile,str);
++    fprintf(stderr,"%s",str);
++    if (exp_logfile) fprintf(exp_logfile,"%s",str);
+   }
+ }
+ 
+--- a/exp_command.c
++++ b/exp_command.c
+@@ -995,7 +995,7 @@
+ 
+ 	    exp_slave_control(master,1);
+ 
+-	    sprintf(value,"%d",esPtr->fd_slave);
++	    sprintf(value,"%ld",esPtr->fd_slave);
+ 	    Tcl_SetVar2(interp,SPAWN_OUT,"slave,fd",value,0);
+ 	}
+ 	Tcl_SetObjResult (interp, Tcl_NewIntObj (EXP_NOPID));
diff --git a/main/expect/APKBUILD b/main/expect/APKBUILD
index ffe48ea4492..b84f6dc76da 100644
--- a/main/expect/APKBUILD
+++ b/main/expect/APKBUILD
@@ -2,24 +2,30 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=expect
 pkgver=5.45.4
-pkgrel=0
+pkgrel=4
 pkgdesc="A tool for automating interactive applications"
-url="http://www.nist.gov/el/msid/expect.cfm"
+url="https://core.tcl-lang.org/expect/index"
 arch="all"
-license="custom"
+# https://expect.sourceforge.net/FAQ.html#q6
+license="NIST-PD"
 makedepends="tcl-dev"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://downloads.sourceforge.net/project/expect/Expect/$pkgver/$pkgname$pkgver.tar.gz"
+source="https://downloads.sourceforge.net/project/expect/Expect/$pkgver/expect$pkgver.tar.gz
+	07-file-handle.patch
+	09-unsafe-traps.patch
+	10-manpage.patch
+	12-fdout.patch
+	22-segfault-with-stubs.patch
+	24-format.patch
+"
 builddir="$srcdir"/$pkgname$pkgver
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -34,13 +40,19 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a  expect5.45.4.tar.gz"
+sha512sums="
+a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a  expect5.45.4.tar.gz
+ccdff94648a732cfb12cb079e37449913579b536d43f46a1e95687c3be8d4ce84b01be6748b34b59a4b4bf1cbc755de96f8f7882d5bc5c9a704cb5ef3103836f  07-file-handle.patch
+e8a3c4c6d634c135e1f3b7ccfb543281fdbaa83870670ff87bdd0aaf07c803f79353b512e49b311ecd8f701c9e2d0d3e2994a3d5b344cdd6f0220d92fc1cea7d  09-unsafe-traps.patch
+f7760ba5ce60659cce4d64beaf3cf50ecd6a8af7714b704bbd08ba970e0883b0eb7ddfd83522f21bf1bbe86cdbe26d70d4517f9d58030128c2a311e6d18c6b30  10-manpage.patch
+8675a93f3344e4eeb5024faa487bdcdfb0bc8ec86ed0abcf5612e130e346b35f7d9bf7d601714cc6acb32ccc77ecc309e51e39e0a0ad17f0a3ceeacc5031f6ce  12-fdout.patch
+f4c7789feea3eae471c988d7c78ce78da1bd4ab765d142e7fce5a7a2a92e887310ba571ea2a010110f7e0859102fadfb56b2b7e1638c52586657299e6e332c91  22-segfault-with-stubs.patch
+38b542330d26ca0dade87bfad20f71f7411fc2951d4d53706f938f83a862ed4868990bc24bdbffb09c9591cca22cca913e073605216311a36a008550c00b1b78  24-format.patch
+"
diff --git a/main/ez-ipupdate/APKBUILD b/main/ez-ipupdate/APKBUILD
index 39db59e4e6a..0452d14400e 100644
--- a/main/ez-ipupdate/APKBUILD
+++ b/main/ez-ipupdate/APKBUILD
@@ -2,53 +2,54 @@
 # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com>
 pkgname=ez-ipupdate
 pkgver=3.0.10
-pkgrel=9
+pkgrel=13
 pkgdesc="utility for updating your host name for many of the dynamic DNS services (ez-ip.net, dyndns.org, etc)"
 url="http://ez-ipupdate.com/"
 arch="all"
-license="GPL"
-depends=""
-makedepends=""
+license="GPL-2.0-or-later"
 pkgusers="ipupdate"
 pkggroups="ipupdate"
 install="$pkgname.pre-install"
-subpackages=""
-source="https://dev.alpinelinux.org/archive/ez-ipupdate/$pkgname-$pkgver.tar.gz
+makedepends="autoconf"
+subpackages="$pkgname-openrc"
+source="https://dev.alpinelinux.org/archive/ez-ipupdate/ez-ipupdate-$pkgver.tar.gz
 	ez-ipupdate.confd
 	ez-ipupdate.initd
 	errno.patch
+	implicit.patch
 	"
-_builddir="$srcdir"/$pkgname-$pkgver
+options="!check"
+
 prepare() {
-	cd "$_builddir"
-	for A in ../*.patch ; do
-		patch -p1 < $A
-	done
+	default_prepare
+
+	autoconf
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
-	make || return 1
+		--infodir=/usr/share/info
+	make
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-        install -d -o ipupdate -g ipupdate "$pkgdir"/var/lib/$pkgname
+	install -d -o ipupdate -g ipupdate "$pkgdir"/var/lib/$pkgname
 }
 
-sha512sums="dfcbdb2f6a53c3781c31d04269e36819b6bcdb53dfcf065f66c36de310420da7c7dc107a18bc8c7d75cfe1e2964bc9a1e3289502295ad386eee12e8a83a6b388  ez-ipupdate-3.0.10.tar.gz
+sha512sums="
+dfcbdb2f6a53c3781c31d04269e36819b6bcdb53dfcf065f66c36de310420da7c7dc107a18bc8c7d75cfe1e2964bc9a1e3289502295ad386eee12e8a83a6b388  ez-ipupdate-3.0.10.tar.gz
 510f7c6cfb6b9c08ecf8940d80ef7ec46acbbd57c0deed7304348e91616affa3381429118aa1e7d5315d61478e54c70599eed2e414cbc75b7df2b8f276648452  ez-ipupdate.confd
 6c7514b91b82e34a489f173e225b04463e33bbdc58d13828c1daef159d4121f57d53e28b54799eb27935c39305507314de480368904e52702ace04cabf631013  ez-ipupdate.initd
-906f25047ae422beeb80b07af07e8516c97cb51dc49298357b11e03919b562f474bc4b45f2eb636e6c7e0e2de787569d1bac387913a046fc4e6d0dffa2a5c502  errno.patch"
+906f25047ae422beeb80b07af07e8516c97cb51dc49298357b11e03919b562f474bc4b45f2eb636e6c7e0e2de787569d1bac387913a046fc4e6d0dffa2a5c502  errno.patch
+d85f051d3d8852630eebcaca61adc67ce06d4300bf2fed562920931d734fa20289de00f442cf1e844599af3de888655e696fe4935234f54fecd5a4a305d9c893  implicit.patch
+"
diff --git a/main/ez-ipupdate/implicit.patch b/main/ez-ipupdate/implicit.patch
new file mode 100644
index 00000000000..c5baf32c934
--- /dev/null
+++ b/main/ez-ipupdate/implicit.patch
@@ -0,0 +1,26 @@
+diff --git a/ez-ipupdate.c b/ez-ipupdate.c
+index 5d2b377..2521318 100644
+--- a/ez-ipupdate.c
++++ b/ez-ipupdate.c
+@@ -38,6 +38,9 @@
+ #  include <config.h>
+ #endif
+ 
++#include <time.h>
++#include <string.h>
++
+ // you man very well need to edit this, don't worry though, email is only sent
+ // if bad things happend and it has to exit when in daemon mode.
+ #define SEND_EMAIL_CMD "mail"
+diff --git a/md5.c b/md5.c
+index 978a9e4..95bd85e 100644
+--- a/md5.c
++++ b/md5.c
+@@ -27,6 +27,7 @@
+ #ifdef USE_MD5
+ 
+ #include <stdlib.h>
++#include <string.h>
+ #ifdef HAVE_STRING_H
+ # include <string.h>
+ #else
diff --git a/main/f2fs-tools/APKBUILD b/main/f2fs-tools/APKBUILD
index 18d09555335..eee20184462 100644
--- a/main/f2fs-tools/APKBUILD
+++ b/main/f2fs-tools/APKBUILD
@@ -1,29 +1,33 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=f2fs-tools
-pkgver=1.13.0
-pkgrel=0
+pkgver=1.16.0
+pkgrel=3
 pkgdesc="Tools for the Flash-Friendly File System (F2FS)"
 url="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git"
 arch="all"
-license="GPL-2.0-or-later LGPL-2.1-or-later"
-depends=""
-depends_dev=""
-makedepends="$depends_dev automake autoconf bsd-compat-headers
+license="GPL-2.0-or-later OR LGPL-2.1-or-later"
+makedepends="automake autoconf bsd-compat-headers
 	libtool util-linux-dev linux-headers"
-install=""
-subpackages="$pkgname-doc $pkgname-dev $pkgname-libs"
-source="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/$pkgname-$pkgver.tar.gz
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs"
+source="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-$pkgver.tar.gz
+	no-lfs64.patch
 	"
-builddir="$srcdir/$pkgname-$pkgver"
+options="!check"
+
+# secfixes:
+#   1.14.0-r0:
+#     - CVE-2021-6104
+#     - CVE-2021-6105
+#     - CVE-2021-6106
+#     - CVE-2021-6107
+#     - CVE-2021-6108
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 	./autogen.sh
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,9 +36,11 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make install DESTDIR="$pkgdir"
 	install -D -m644 mkfs/f2fs_format_utils.h "$pkgdir"/usr/include/
 }
 
-sha512sums="fd920a19e8705a65395809aeef55791c5678ed31c026cdf41fc173e0dbcacdef1db7e0e184ec1aae8637b1784e2ad6e0207583e918255483fe43c73f89bd7f7f  f2fs-tools-1.13.0.tar.gz"
+sha512sums="
+ea198cebf7c5bb0c42c9b53bc80484495c403b1ed1354eb7cb7b4f63ed9a5c81653a76eaf1bc35067171fa5fd99b1564178c5440c21b6b025f4e83b9def82680  f2fs-tools-1.16.0.tar.gz
+f7321994c9ded27c01373da100549c6202c24d167888e729091befe672b922bbdb83374942978942bbe5a37b2d4d286d9214bee16afe324cd0c5cd91cf81a0ff  no-lfs64.patch
+"
diff --git a/main/f2fs-tools/no-lfs64.patch b/main/f2fs-tools/no-lfs64.patch
new file mode 100644
index 00000000000..37ff28888ee
--- /dev/null
+++ b/main/f2fs-tools/no-lfs64.patch
@@ -0,0 +1,458 @@
+From b15b6cc56ac7764be17acbdbf96448f388992adc Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbx@openadk.org>
+Date: Wed, 23 Aug 2023 15:41:28 +0200
+Subject: f2fs-tools: convert to lseek() and kill lseek64
+
+This patch replaces lseek64 with lseek() having #define _FILE_OFFSET_BITS 64.
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
+---
+ configure.ac              |  2 --
+ fsck/Makefile.am          |  2 +-
+ include/android_config.h  |  4 ----
+ lib/Makefile.am           |  2 +-
+ lib/libf2fs.c             |  3 ---
+ lib/libf2fs_io.c          | 47 ++++++++++++++++++-----------------------------
+ lib/libf2fs_zoned.c       |  1 -
+ mkfs/Makefile.am          |  4 ++--
+ mkfs/f2fs_format.c        |  2 --
+ mkfs/f2fs_format_main.c   |  2 --
+ mkfs/f2fs_format_utils.c  | 10 ----------
+ mkfs/f2fs_format_utils.h  |  2 --
+ tools/Makefile.am         |  2 +-
+ tools/f2fs_io/Makefile.am |  2 +-
+ tools/f2fs_io/f2fs_io.c   |  6 ------
+ tools/f2fs_io_parse.c     |  1 -
+ tools/f2fscrypt.c         |  9 ---------
+ tools/fibmap.c            |  7 -------
+ 18 files changed, 24 insertions(+), 84 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index efab8d8..123ddbb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -187,8 +187,6 @@ AC_CHECK_FUNCS_ONCE([
+ 	getmntent
+ 	getuid
+ 	keyctl
+-	llseek
+-	lseek64
+ 	memset
+ 	setmntent
+ 	clock_gettime
+diff --git a/fsck/Makefile.am b/fsck/Makefile.am
+index 579dd26..40d31b8 100644
+--- a/fsck/Makefile.am
++++ b/fsck/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Makefile.am
+ 
+ AM_CPPFLAGS = ${libuuid_CFLAGS} -I$(top_srcdir)/include
+-AM_CFLAGS = -Wall
++AM_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64
+ sbin_PROGRAMS = fsck.f2fs
+ noinst_HEADERS = common.h dict.h dqblk_v2.h f2fs.h fsck.h node.h quotaio.h \
+ 		quotaio_tree.h quotaio_v2.h xattr.h compress.h
+diff --git a/include/android_config.h b/include/android_config.h
+index 141fe06..da8abcb 100644
+--- a/include/android_config.h
++++ b/include/android_config.h
+@@ -30,8 +30,6 @@
+ #define HAVE_FSTAT 1
+ #define HAVE_FSTAT64 1
+ #define HAVE_GETMNTENT 1
+-#define HAVE_LLSEEK 1
+-#define HAVE_LSEEK64 1
+ #define HAVE_MEMSET 1
+ #define HAVE_SELINUX_ANDROID_H 1
+ #define HAVE_SETMNTENT 1
+@@ -67,7 +65,6 @@
+ #define HAVE_FSTAT 1
+ #define HAVE_FSTAT64 1
+ #define HAVE_GETMNTENT 1
+-#define HAVE_LLSEEK 1
+ #define HAVE_MEMSET 1
+ #define HAVE_SPARSE_SPARSE_H 1
+ #define HAVE_LIBLZ4 1
+@@ -78,6 +75,5 @@
+ #endif
+ 
+ #if defined(_WIN32)
+-#define HAVE_LSEEK64
+ #define HAVE_SPARSE_SPARSE_H 1
+ #endif
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 871d773..69d46f8 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -3,7 +3,7 @@
+ lib_LTLIBRARIES = libf2fs.la
+ 
+ libf2fs_la_SOURCES = libf2fs.c libf2fs_io.c libf2fs_zoned.c nls_utf8.c
+-libf2fs_la_CFLAGS = -Wall
++libf2fs_la_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64
+ libf2fs_la_CPPFLAGS = -I$(top_srcdir)/include
+ libf2fs_la_LDFLAGS = -version-info $(LIBF2FS_CURRENT):$(LIBF2FS_REVISION):$(LIBF2FS_AGE)
+ 
+diff --git a/lib/libf2fs.c b/lib/libf2fs.c
+index 577a7e8..c3d5744 100644
+--- a/lib/libf2fs.c
++++ b/lib/libf2fs.c
+@@ -6,9 +6,6 @@
+  *
+  * Dual licensed under the GPL or LGPL version 2 licenses.
+  */
+-#define _LARGEFILE64_SOURCE
+-#define _FILE_OFFSET_BITS 64
+-
+ #include <f2fs_fs.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+diff --git a/lib/libf2fs_io.c b/lib/libf2fs_io.c
+index 1a8167d..74e5f3a 100644
+--- a/lib/libf2fs_io.c
++++ b/lib/libf2fs_io.c
+@@ -11,8 +11,6 @@
+  *
+  * Dual licensed under the GPL or LGPL version 2 licenses.
+  */
+-#define _LARGEFILE64_SOURCE
+-
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -67,22 +65,13 @@ static int __get_device_fd(__u64 *offset)
+ 	return -1;
+ }
+ 
+-#ifndef HAVE_LSEEK64
+-typedef off_t	off64_t;
+-
+-static inline off64_t lseek64(int fd, __u64 offset, int set)
+-{
+-	return lseek(fd, offset, set);
+-}
+-#endif
+-
+ /* ---------- dev_cache, Least Used First (LUF) policy  ------------------- */
+ /*
+  * Least used block will be the first victim to be replaced when max hash
+  * collision exceeds
+  */
+ static bool *dcache_valid; /* is the cached block valid? */
+-static off64_t  *dcache_blk; /* which block it cached */
++static off_t  *dcache_blk; /* which block it cached */
+ static uint64_t *dcache_lastused; /* last used ticks for cache entries */
+ static char *dcache_buf; /* cached block data */
+ static uint64_t dcache_usetick; /* current use tick */
+@@ -172,7 +161,7 @@ static int dcache_alloc_all(long n)
+ {
+ 	if (n <= 0)
+ 		return -1;
+-	if ((dcache_blk = (off64_t *) malloc(sizeof(off64_t) * n)) == NULL
++	if ((dcache_blk = (off_t *) malloc(sizeof(off_t) * n)) == NULL
+ 		|| (dcache_lastused = (uint64_t *)
+ 				malloc(sizeof(uint64_t) * n)) == NULL
+ 		|| (dcache_buf = (char *) malloc (F2FS_BLKSIZE * n)) == NULL
+@@ -257,7 +246,7 @@ static inline long dcache_relocate(long entry, int n)
+ 			dcache_config.num_cache_entry;
+ }
+ 
+-static long dcache_find(off64_t blk)
++static long dcache_find(off_t blk)
+ {
+ 	register long n = dcache_config.num_cache_entry;
+ 	register unsigned m = dcache_config.max_hash_collision;
+@@ -278,10 +267,10 @@ static long dcache_find(off64_t blk)
+ }
+ 
+ /* Physical read into cache */
+-static int dcache_io_read(int fd, long entry, off64_t offset, off64_t blk)
++static int dcache_io_read(int fd, long entry, off_t offset, off_t blk)
+ {
+-	if (lseek64(fd, offset, SEEK_SET) < 0) {
+-		MSG(0, "\n lseek64 fail.\n");
++	if (lseek(fd, offset, SEEK_SET) < 0) {
++		MSG(0, "\n lseek fail.\n");
+ 		return -1;
+ 	}
+ 	if (read(fd, dcache_buf + entry * F2FS_BLKSIZE, F2FS_BLKSIZE) < 0) {
+@@ -308,12 +297,12 @@ static int dcache_io_read(int fd, long entry, off64_t offset, off64_t blk)
+  *       1: cache not available (uninitialized)
+  *      -1: error
+  */
+-static int dcache_update_rw(int fd, void *buf, off64_t offset,
++static int dcache_update_rw(int fd, void *buf, off_t offset,
+ 		size_t byte_count, bool is_write)
+ {
+-	off64_t blk;
++	off_t blk;
+ 	int addr_in_blk;
+-	off64_t start;
++	off_t start;
+ 
+ 	if (!dcache_initialized)
+ 		dcache_init(); /* auto initialize */
+@@ -377,13 +366,13 @@ static int dcache_update_rw(int fd, void *buf, off64_t offset,
+  * return value: 1: cache not available
+  *               0: success, -1: I/O error
+  */
+-int dcache_update_cache(int fd, void *buf, off64_t offset, size_t count)
++int dcache_update_cache(int fd, void *buf, off_t offset, size_t count)
+ {
+ 	return dcache_update_rw(fd, buf, offset, count, true);
+ }
+ 
+ /* handles read into cache + read into buffer  */
+-int dcache_read(int fd, void *buf, off64_t offset, size_t count)
++int dcache_read(int fd, void *buf, off_t offset, size_t count)
+ {
+ 	return dcache_update_rw(fd, buf, offset, count, false);
+ }
+@@ -395,7 +384,7 @@ int dev_read_version(void *buf, __u64 offset, size_t len)
+ {
+ 	if (c.sparse_mode)
+ 		return 0;
+-	if (lseek64(c.kd, (off64_t)offset, SEEK_SET) < 0)
++	if (lseek(c.kd, (off_t)offset, SEEK_SET) < 0)
+ 		return -1;
+ 	if (read(c.kd, buf, len) < 0)
+ 		return -1;
+@@ -534,10 +523,10 @@ int dev_read(void *buf, __u64 offset, size_t len)
+ 
+ 	/* err = 1: cache not available, fall back to non-cache R/W */
+ 	/* err = 0: success, err=-1: I/O error */
+-	err = dcache_read(fd, buf, (off64_t)offset, len);
++	err = dcache_read(fd, buf, (off_t)offset, len);
+ 	if (err <= 0)
+ 		return err;
+-	if (lseek64(fd, (off64_t)offset, SEEK_SET) < 0)
++	if (lseek(fd, (off_t)offset, SEEK_SET) < 0)
+ 		return -1;
+ 	if (read(fd, buf, len) < 0)
+ 		return -1;
+@@ -580,9 +569,9 @@ int dev_write(void *buf, __u64 offset, size_t len)
+ 	 * dcache_update_cache() just update cache, won't do I/O.
+ 	 * Thus even no error, we need normal non-cache I/O for actual write
+ 	 */
+-	if (dcache_update_cache(fd, buf, (off64_t)offset, len) < 0)
++	if (dcache_update_cache(fd, buf, (off_t)offset, len) < 0)
+ 		return -1;
+-	if (lseek64(fd, (off64_t)offset, SEEK_SET) < 0)
++	if (lseek(fd, (off_t)offset, SEEK_SET) < 0)
+ 		return -1;
+ 	if (write(fd, buf, len) < 0)
+ 		return -1;
+@@ -596,7 +585,7 @@ int dev_write_block(void *buf, __u64 blk_addr)
+ 
+ int dev_write_dump(void *buf, __u64 offset, size_t len)
+ {
+-	if (lseek64(c.dump_fd, (off64_t)offset, SEEK_SET) < 0)
++	if (lseek(c.dump_fd, (off_t)offset, SEEK_SET) < 0)
+ 		return -1;
+ 	if (write(c.dump_fd, buf, len) < 0)
+ 		return -1;
+@@ -618,7 +607,7 @@ int dev_fill(void *buf, __u64 offset, size_t len)
+ 	/* Only allow fill to zero */
+ 	if (*((__u8*)buf))
+ 		return -1;
+-	if (lseek64(fd, (off64_t)offset, SEEK_SET) < 0)
++	if (lseek(fd, (off_t)offset, SEEK_SET) < 0)
+ 		return -1;
+ 	if (write(fd, buf, len) < 0)
+ 		return -1;
+diff --git a/lib/libf2fs_zoned.c b/lib/libf2fs_zoned.c
+index a0dd8bd..2ab2497 100644
+--- a/lib/libf2fs_zoned.c
++++ b/lib/libf2fs_zoned.c
+@@ -6,7 +6,6 @@
+  *
+  * Dual licensed under the GPL or LGPL version 2 licenses.
+  */
+-#define _LARGEFILE64_SOURCE
+ 
+ #include <f2fs_fs.h>
+ #include <stdio.h>
+diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am
+index af5b1c7..bfffd88 100644
+--- a/mkfs/Makefile.am
++++ b/mkfs/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Makefile.am
+ 
+ AM_CPPFLAGS = ${libuuid_CFLAGS} ${libblkid_CFLAGS} -I$(top_srcdir)/include
+-AM_CFLAGS = -Wall -DWITH_BLKDISCARD
++AM_CFLAGS = -Wall -DWITH_BLKDISCARD -D_FILE_OFFSET_BITS=64
+ sbin_PROGRAMS = mkfs.f2fs
+ noinst_HEADERS = f2fs_format_utils.h
+ include_HEADERS = $(top_srcdir)/include/f2fs_fs.h
+@@ -10,7 +10,7 @@ mkfs_f2fs_LDADD = ${libuuid_LIBS} ${libblkid_LIBS} $(top_builddir)/lib/libf2fs.l
+ 
+ lib_LTLIBRARIES = libf2fs_format.la
+ libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c
+-libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD
++libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD -D_FILE_OFFSET_BITS=64
+ libf2fs_format_la_LDFLAGS = ${libblkid_LIBS} ${libuuid_LIBS} -L$(top_builddir)/lib -lf2fs \
+ 	-version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE)
+ 
+diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c
+index 019fb3a..d937eda 100644
+--- a/mkfs/f2fs_format.c
++++ b/mkfs/f2fs_format.c
+@@ -6,8 +6,6 @@
+  *
+  * Dual licensed under the GPL or LGPL version 2 licenses.
+  */
+-#define _LARGEFILE64_SOURCE
+-
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <fcntl.h>
+diff --git a/mkfs/f2fs_format_main.c b/mkfs/f2fs_format_main.c
+index d8c9cea..08c1b25 100644
+--- a/mkfs/f2fs_format_main.c
++++ b/mkfs/f2fs_format_main.c
+@@ -6,8 +6,6 @@
+  *
+  * Dual licensed under the GPL or LGPL version 2 licenses.
+  */
+-#define _LARGEFILE64_SOURCE
+-
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <fcntl.h>
+diff --git a/mkfs/f2fs_format_utils.c b/mkfs/f2fs_format_utils.c
+index 448fbaa..437f113 100644
+--- a/mkfs/f2fs_format_utils.c
++++ b/mkfs/f2fs_format_utils.c
+@@ -6,20 +6,10 @@
+  *
+  * Dual licensed under the GPL or LGPL version 2 licenses.
+  */
+-#ifndef _LARGEFILE_SOURCE
+-#define _LARGEFILE_SOURCE
+-#endif
+-#ifndef _LARGEFILE64_SOURCE
+-#define _LARGEFILE64_SOURCE
+-#endif
+ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
+ #endif
+ 
+-#ifndef _FILE_OFFSET_BITS
+-#define _FILE_OFFSET_BITS 64
+-#endif
+-
+ #include <f2fs_fs.h>
+ 
+ #include <stdio.h>
+diff --git a/mkfs/f2fs_format_utils.h b/mkfs/f2fs_format_utils.h
+index 807e7c3..6a7f687 100644
+--- a/mkfs/f2fs_format_utils.h
++++ b/mkfs/f2fs_format_utils.h
+@@ -6,8 +6,6 @@
+  *
+  * Dual licensed under the GPL or LGPL version 2 licenses.
+  */
+-#define _LARGEFILE64_SOURCE
+-
+ #include "f2fs_fs.h"
+ 
+ extern struct f2fs_configuration c;
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 6b03814..7dfffb1 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Makefile.am
+ 
+ AM_CPPFLAGS = ${libuuid_CFLAGS} -I$(top_srcdir)/include
+-AM_CFLAGS = -Wall
++AM_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64
+ sbin_PROGRAMS =
+ if !WINDOWS
+ sbin_PROGRAMS += fibmap.f2fs parse.f2fs
+diff --git a/tools/f2fs_io/Makefile.am b/tools/f2fs_io/Makefile.am
+index bc4f9d0..f5227ce 100644
+--- a/tools/f2fs_io/Makefile.am
++++ b/tools/f2fs_io/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ if LINUX
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+-AM_CFLAGS = -Wall
++AM_CFLAGS = -Wall -D_FILE_OFFSET_BITS=64
+ sbin_PROGRAMS = f2fs_io
+ f2fs_io_SOURCES = f2fs_io.c
+ endif
+diff --git a/tools/f2fs_io/f2fs_io.c b/tools/f2fs_io/f2fs_io.c
+index 771fd16..1f6549b 100644
+--- a/tools/f2fs_io/f2fs_io.c
++++ b/tools/f2fs_io/f2fs_io.c
+@@ -9,12 +9,6 @@
+ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
+ #endif
+-#ifndef _LARGEFILE_SOURCE
+-#define _LARGEFILE_SOURCE
+-#endif
+-#ifndef _LARGEFILE64_SOURCE
+-#define _LARGEFILE64_SOURCE
+-#endif
+ #ifndef O_LARGEFILE
+ #define O_LARGEFILE 0
+ #endif
+diff --git a/tools/f2fs_io_parse.c b/tools/f2fs_io_parse.c
+index 47f1194..c3c1005 100644
+--- a/tools/f2fs_io_parse.c
++++ b/tools/f2fs_io_parse.c
+@@ -8,7 +8,6 @@
+  * it under the terms of the GNU General Public License version 2 as
+  * published by the Free Software Foundation.
+  */
+-#define _LARGEFILE64_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+diff --git a/tools/f2fscrypt.c b/tools/f2fscrypt.c
+index 8640ffa..d5222fb 100644
+--- a/tools/f2fscrypt.c
++++ b/tools/f2fscrypt.c
+@@ -7,15 +7,6 @@
+  * Authors: Michael Halcrow <mhalcrow@google.com>,
+  *	    Ildar Muslukhov <ildarm@google.com>
+  */
+-
+-#ifndef _LARGEFILE_SOURCE
+-#define _LARGEFILE_SOURCE
+-#endif
+-
+-#ifndef _LARGEFILE64_SOURCE
+-#define _LARGEFILE64_SOURCE
+-#endif
+-
+ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
+ #endif
+diff --git a/tools/fibmap.c b/tools/fibmap.c
+index bda8238..3acc77b 100644
+--- a/tools/fibmap.c
++++ b/tools/fibmap.c
+@@ -1,13 +1,6 @@
+ #if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ #define _XOPEN_SOURCE 600
+ #define _DARWIN_C_SOURCE
+-#define _FILE_OFFSET_BITS 64
+-#ifndef _LARGEFILE_SOURCE
+-#define _LARGEFILE_SOURCE
+-#endif
+-#ifndef _LARGEFILE64_SOURCE
+-#define _LARGEFILE64_SOURCE
+-#endif
+ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
+ #endif
+-- 
+cgit 
+
diff --git a/main/fail2ban/APKBUILD b/main/fail2ban/APKBUILD
index 215be5ddfa4..f1804c0ba96 100644
--- a/main/fail2ban/APKBUILD
+++ b/main/fail2ban/APKBUILD
@@ -2,24 +2,28 @@
 # Contributor: Jeff Bilyk <jbilyk@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fail2ban
-pkgver=0.11.1
-pkgrel=0
+pkgver=1.0.2
+pkgrel=4
 pkgdesc="Scans log files for login failures then updates iptables to reject originating ip address"
-url="https://www.fail2ban.org"
+url="https://www.fail2ban.org/"
 arch="noarch"
 license="GPL-2.0-or-later"
-depends="python3 iptables ip6tables logrotate"
+depends="python3 iptables logrotate"
 makedepends="python3-dev py3-setuptools bash"
-subpackages="$pkgname-doc $pkgname-openrc"
+subpackages="$pkgname-pyc $pkgname-tests $pkgname-doc $pkgname-openrc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/fail2ban/fail2ban/archive/$pkgver.tar.gz
-		ec37b1942c4da76f7a0f71efe81bea6835466648.patch
-		fail2ban.confd
-		fail2ban.logrotate
-		alpine-ssh.jaild
-		alpine-sshd.filterd
-		alpine-sshd-ddos.filterd
-		"
-[ "$CARCH" == "mips64" ] && options="!check"
+	fail2ban.initd
+	fail2ban.confd
+	fail2ban.logrotate
+	alpine-ssh.jaild
+	alpine-sshd.filterd
+	alpine-sshd-ddos.filterd
+	"
+options="!check" # really flaky
+
+# secfixes:
+#   0.11.2-r2:
+#     - CVE-2021-32749
 
 build() {
 	sh fail2ban-2to3
@@ -33,7 +37,7 @@ check() {
 package() {
 	python3 setup.py install --root "$pkgdir"
 
-	install -Dm755 files/gentoo-initd "$pkgdir"/etc/init.d/fail2ban
+	install -Dm755 "$srcdir"/fail2ban.initd "$pkgdir"/etc/init.d/fail2ban
 	install -Dm644 "$srcdir"/fail2ban.confd "$pkgdir"/etc/conf.d/fail2ban
 	install -Dm644 "$srcdir"/fail2ban.logrotate \
 		"$pkgdir"/etc/logrotate.d/fail2ban
@@ -43,12 +47,31 @@ package() {
 		"$pkgdir"/etc/fail2ban/filter.d/alpine-sshd.conf
 	install -Dm644 "$srcdir"/alpine-sshd-ddos.filterd \
 		"$pkgdir"/etc/fail2ban/filter.d/alpine-sshd-ddos.conf
+
+	install -Dm644 -t "$pkgdir"/usr/share/man/man1 man/*.1
+	install -Dm644 -t "$pkgdir"/usr/share/man/man5 man/*.5
+
+	# TODO: Create paths-alpine.conf and remove paths-debian.conf.
+	find "$pkgdir"/etc/fail2ban/ -name 'paths-*.conf' \
+		-a ! -name 'paths-common.conf' \
+		-a ! -name 'paths-debian.conf' \
+		-delete
+}
+
+tests() {
+	pkgdesc="Fail2ban test cases"
+	depends="$pkgname=$pkgver-r$pkgrel"
+
+	amove usr/bin/fail2ban-testcases
+	amove usr/lib/python3.*/site-packages/fail2ban/tests
 }
 
-sha512sums="019b088aa6375f98742ed101ef6f65adabca3324444d71d5b8597a8d1d22fa76b9f503660f0498643fe24a3b8e4368de916072a1ab77b8e2ea3eda41c3e0c8c6  fail2ban-0.11.1.tar.gz
-2d57fe7a7e3d1889dfa00ac33f5071069ed62f5fc0edb1e1827aedc47fae3a36d19c568b1721ba3a8e117f4ba6b3756d11942f2320b42864d45203f45761c7b6  ec37b1942c4da76f7a0f71efe81bea6835466648.patch
+sha512sums="
+688a84361b5794e1658f53d2d200ce752fe1e3320ddb1742c32c4b4b82a79ace16ae464e7ea3eeb94a0e862bcac73c2d3a0e61dd7b28e179a4c857f950d74dbb  fail2ban-1.0.2.tar.gz
+9ba3da904e2169264ca2ad3af1a6c10ba82f559b9c746d20c515ec806263a7fe0576536e38e4e6107cd551048aa8868b45986f1a803a049ea745158678b8d8be  fail2ban.initd
 1e7581dd04e7777d6fd5c40cc842a7ec5f4e6a0374673d020d89dd61bf4093d48934844bee89bcac9084f9ae44f3beb66e714cf3c2763d79c3e8feb790c5e43b  fail2ban.confd
-4ff9dd2793f42e414d83676104f47966f781b9e042e90dbc839d4e6b27faee08ebea2231b178d1d41084fa6c59aa62689bdb713977096d8b235a33e73268ccc5  fail2ban.logrotate
+ee1c229db970239ebc707cd484a650fcf2347c70b411728ee2a4a35a72f4118cfccecf2a221275603320e0332efcc16e4979201933cec1aef1c5d5a082fc4940  fail2ban.logrotate
 84915967ae1276f1e14a5813680ee2ebf081af1ff452a688ae5f9ac3363f4aff90e39f8e6456b5c33d5699917d28a16308797095fd1ef9bb1fbcb46d4cea3def  alpine-ssh.jaild
-3e8e08d5e349e857b51ce34a9d968f16661b34e1cec06bec0aa9a32723bbe9be5a9890dd479331a9cc860821d33b1bf3b8e995182e319dead5a3d434b1816304  alpine-sshd.filterd
-36a81b771be0b36fe0dfb5ee4c72c9cb5b504e110618a8eb6f0f241b4e57d92df01dc5cc04b6b68d5bc6a5e6d68de1000092770285d7a328e5937e50b4b226a3  alpine-sshd-ddos.filterd"
+4f982e26d3d066f40172607f20a30edc8a44222185413944584bde50c8ca11baaeedf341a67a7767355bccf88281a47ab80ac121297b2f059aba3d1c58bd567f  alpine-sshd.filterd
+36a81b771be0b36fe0dfb5ee4c72c9cb5b504e110618a8eb6f0f241b4e57d92df01dc5cc04b6b68d5bc6a5e6d68de1000092770285d7a328e5937e50b4b226a3  alpine-sshd-ddos.filterd
+"
diff --git a/main/fail2ban/alpine-sshd.filterd b/main/fail2ban/alpine-sshd.filterd
index 6c2ea19af88..e3b99638bd4 100644
--- a/main/fail2ban/alpine-sshd.filterd
+++ b/main/fail2ban/alpine-sshd.filterd
@@ -18,6 +18,7 @@ _daemon = sshd
 failregex = Failed [-/\w]+ for .* from <HOST> port \d* ssh2
             sshd\[.*\]: Invalid user .* from <HOST> port \d*
             sshd\[.*\]: Received disconnect from <HOST> port \d*:[0-9]+:  \[preauth\]
+            sshd\[.*\]: Disconnected from invalid user .* <HOST> port \d* \[preauth\]
 
 ignoreregex = 
 
diff --git a/main/fail2ban/ec37b1942c4da76f7a0f71efe81bea6835466648.patch b/main/fail2ban/ec37b1942c4da76f7a0f71efe81bea6835466648.patch
deleted file mode 100644
index 38782137b4e..00000000000
--- a/main/fail2ban/ec37b1942c4da76f7a0f71efe81bea6835466648.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ec37b1942c4da76f7a0f71efe81bea6835466648 Mon Sep 17 00:00:00 2001
-From: sebres <serg.brester@sebres.de>
-Date: Tue, 14 Jan 2020 11:39:13 +0100
-Subject: [PATCH] action.d/nginx-block-map.conf: fixed backslash substitution
- (different echo behavior in some shells, gh-2596)
-
----
- config/action.d/nginx-block-map.conf | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/config/action.d/nginx-block-map.conf b/config/action.d/nginx-block-map.conf
-index 0b6aa0ad7..ee702907e 100644
---- a/config/action.d/nginx-block-map.conf
-+++ b/config/action.d/nginx-block-map.conf
-@@ -103,6 +103,8 @@ actionstop = %(actionflush)s
- 
- actioncheck = 
- 
--actionban = echo "\\\\<fid> 1;" >> '%(blck_lst_file)s'; %(blck_lst_reload)s
-+_echo_blck_row = printf '\%%s 1;\n' "<fid>"
- 
--actionunban = id=$(echo "<fid>" | sed -e 's/[]\/$*.^|[]/\\&/g'); sed -i "/^\\\\$id 1;$/d" %(blck_lst_file)s; %(blck_lst_reload)s
-+actionban = %(_echo_blck_row)s >> '%(blck_lst_file)s'; %(blck_lst_reload)s
-+
-+actionunban = id=$(%(_echo_blck_row)s | sed -e 's/[]\/$*.^|[]/\\&/g'); sed -i "/^$id$/d" %(blck_lst_file)s; %(blck_lst_reload)s
diff --git a/main/fail2ban/fail2ban.initd b/main/fail2ban/fail2ban.initd
new file mode 100755
index 00000000000..0fb157cdad4
--- /dev/null
+++ b/main/fail2ban/fail2ban.initd
@@ -0,0 +1,60 @@
+#!/sbin/openrc-run
+# This file is part of Fail2Ban.
+#
+# Fail2Ban 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 of the License, or
+# (at your option) any later version.
+#
+# Fail2Ban 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 Fail2Ban; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# Author: Sireyessire, Cyril Jaquier
+#
+
+description="Daemon to ban hosts that cause multiple authentication errors"
+description_reload="reload configuration"
+description_showlog="show fail2ban logs"
+extra_started_commands="reload showlog"
+
+FAIL2BAN="/usr/bin/fail2ban-client ${FAIL2BAN_OPTIONS}"
+
+depend() {
+	need net
+	need logger
+	after iptables
+}
+
+start() {
+	ebegin "Starting fail2ban"
+	mkdir -p /var/run/fail2ban || return 1
+	# remove stalled sock file after system crash
+	# bug 347477
+	rm -f /var/run/fail2ban/fail2ban.sock || return 1
+	start-stop-daemon --start --pidfile /var/run/fail2ban/fail2ban.pid \
+	-- ${FAIL2BAN} start
+	eend $? "Failed to start fail2ban"
+}
+
+stop() {
+	ebegin "Stopping fail2ban"
+	start-stop-daemon --stop --pidfile /var/run/fail2ban/fail2ban.pid --retry 30 \
+	-- ${FAIL2BAN} stop
+	eend $? "Failed to stop fail2ban"
+}
+
+reload() {
+	ebegin "Reloading fail2ban"
+	${FAIL2BAN} reload
+	eend $? "Failed to reload fail2ban"
+}
+
+showlog(){
+	less /var/log/fail2ban.log
+}
diff --git a/main/fail2ban/fail2ban.logrotate b/main/fail2ban/fail2ban.logrotate
index f635c3ddde9..351bc40febb 100644
--- a/main/fail2ban/fail2ban.logrotate
+++ b/main/fail2ban/fail2ban.logrotate
@@ -4,7 +4,7 @@
     missingok
     compress
     postrotate
-	/usr/bin/fail2ban-client set logtarget /var/log/fail2ban.log 1>/dev/null || true
+	/usr/bin/fail2ban-client flushlogs 1>/dev/null || true
 	chown :wheel /var/log/fail2ban.log
 	chmod 640 /var/log/fail2ban.log
     endscript
diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD
index 7f09542073b..d722f8e4928 100644
--- a/main/fakeroot/APKBUILD
+++ b/main/fakeroot/APKBUILD
@@ -1,37 +1,39 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fakeroot
-pkgver=1.24
+pkgver=1.33
 pkgrel=0
+provider_priority=100
 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
 arch="all"
 license="GPL-3.0-or-later"
 url="https://packages.debian.org/fakeroot"
-checkdepends="bash"
+checkdepends="bash coreutils"
 makedepends_build="libtool autoconf automake po4a"
 makedepends_host="libcap-dev acl-dev linux-headers"
 makedepends="$makedepends_build $makedepends_host"
-subpackages="$pkgname-doc"
-source="http://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_$pkgver.orig.tar.gz
-	fakeroot-hide-dlsym-errors.patch
+subpackages="$pkgname-dbg $pkgname-doc"
+source="https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_$pkgver.orig.tar.gz
 	fakeroot-no64.patch
 	fakeroot-stdint.patch
-	fakeroot-no-ldlibrarypath.patch
 	xstatjunk.patch
 	fix-shell-in-fakeroot.patch
+	fakeroot-skip-ipc-sanity-check.patch
+	do-not-redefine-id_t.patch
+	fix-format.patch
+	t-xattr.patch
 	"
 
-check() {
-	make check
+prepare() {
+	default_prepare
+
+	CONFIG_SHELL=/bin/sh ./bootstrap
 }
 
 build() {
-	if [ "$CLIBC" = "musl" ]; then
-		# musl does not have _STAT_VER, it's really not used for
-		# anything, so define it as zero (just like uclibc does)
-		export CFLAGS="-D_STAT_VER=0 $CFLAGS"
-	fi
+	# musl does not have _STAT_VER, it's really not used for
+	# anything, so define it as zero (just like uclibc does)
+	export CFLAGS="-D_STAT_VER=0 $CFLAGS"
 
-	CONFIG_SHELL=/bin/sh ./bootstrap
 	CONFIG_SHELL=/bin/sh ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -43,14 +45,25 @@ build() {
 	po4a -k 0 --rm-backups --variable "srcdir=../doc/" po4a/po4a.cfg
 }
 
+check() {
+	make check || {
+		cat test/test-suite.log
+		return 1
+	}
+}
+
 package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b15db7bbfb03264f294fb3b42813e17758b43ef7f121e55a24af9ec30ff3f4ec8eb0392db88133e56f9728b3828f6c1432d1e5d2e881a69d083ad444b9177487  fakeroot_1.24.orig.tar.gz
-666f41d6adc5e65eba419e08d5bbc4f561e40b0fc7bfa82090eb87962a7f3193bf319754e04aca289e865c66df2ecced1dbb45c9aa9f093657f22193dda25354  fakeroot-hide-dlsym-errors.patch
+sha512sums="
+f87b85531fc5af4ff24a6e27a5b7a25f7d220672fb0b0b925554b0138f3cff7ff7920ce96ed77313a7fb55656a313dc07b58c2935be262091405e509fdcbec03  fakeroot_1.33.orig.tar.gz
 7a832e6bed3838c7c488e0e12ba84b8d256e84bbb06d6020247452a991de505fa5c6bd7bcb84dce8753eb242e0fcab863b5461301cd56695f2b003fe8d6ff209  fakeroot-no64.patch
 ed7a58b0d201139545420f9e5429f503c00e00f36dea84473e77ea99b23bb8d421da1a8a8ce98ff90e72e378dff4cb9ea3c1a863a969899a5f50dfac3b9c5fac  fakeroot-stdint.patch
-acfc1e5efce132279adddf9e11c28d65602059d5cd723ad98b67cb9183e1de68445f3bba7ac54ee60265b85f25141fcc9b2156f551aa5c624a92631320f5b743  fakeroot-no-ldlibrarypath.patch
-5efd33fd778bd94a529ed7e439fb8fea25ff865dda3f6f9e431264e942b37f3b5d7a0ad14107b55c5fa81b86efd5a82aedb3803cfab08ec57f27f5b229d2fe88  xstatjunk.patch
-47593b3d86a66bab832c50a1d967cdc70e42bbd9ef4436f18140067ccefdd6418516e5157102c67e604f3623ed1b9f4fe1423fc5dad4dfe5356fc250c12818a7  fix-shell-in-fakeroot.patch"
+70bf7609a5951326ac7372a252a15516f96a1ee6e458a659b16f0e4f1e2db6556482c71178d4b2f10e5ebdc0abfb7a3cc97c9878984e60cdf6e7d7281790e1fc  xstatjunk.patch
+47593b3d86a66bab832c50a1d967cdc70e42bbd9ef4436f18140067ccefdd6418516e5157102c67e604f3623ed1b9f4fe1423fc5dad4dfe5356fc250c12818a7  fix-shell-in-fakeroot.patch
+9a3faf924891deb36fab8f200489ad6154df262735b563dea46283afcdc83d12d32b00db33848f2a5c52d0b4422942863247577634e37b9d693f2b3a398a0f1d  fakeroot-skip-ipc-sanity-check.patch
+e07162ec511c38261ad2540864f922ee03f5daa1d5d23729879c9993d62b2ffebc27eab29f3eb522ddb10b052241e58b67265914ef9100b1911948e874bf53a1  do-not-redefine-id_t.patch
+481fac0b2b7388fbf8c6140311da856df1b8facfe331d04f2bc6275c766b8a81c1e07971ffd131aaf8416b8cda1f52fa4ed6d5f6ba913f69efe119288c016d78  fix-format.patch
+70d09c2acb3abccddbb99cd1cb372679d4da6c01d3bab6a1dcf258b1decc88834ae7a5f61f15867ead035819e250f8b40fddcc83eb9ce82138fa18c756836b21  t-xattr.patch
+"
diff --git a/main/fakeroot/do-not-redefine-id_t.patch b/main/fakeroot/do-not-redefine-id_t.patch
new file mode 100644
index 00000000000..4d3bab190f8
--- /dev/null
+++ b/main/fakeroot/do-not-redefine-id_t.patch
@@ -0,0 +1,21 @@
+musl defines id_t as unsigned but doesn't use the _ID_T to detect its
+definition. This causes the type to be redefined as an int by fakeroot
+which causes a compilation error.
+
+diff -upr fakeroot-1.27.orig/libfakeroot.c fakeroot-1.27/libfakeroot.c
+--- fakeroot-1.27.orig/libfakeroot.c	2022-01-30 11:30:25.198506844 +0100
++++ fakeroot-1.27/libfakeroot.c	2022-01-30 11:30:41.928524429 +0100
+@@ -133,13 +133,6 @@
+ #define INT_SEND_STAT(a,b) SEND_STAT(a,b,_STAT_VER)
+ #define INT_SEND_GET_XATTR(a,b) SEND_GET_XATTR(a,b,_STAT_VER)
+ #define INT_SEND_GET_STAT(a,b) SEND_GET_STAT(a,b)
+-
+-/* 10.10 uses id_t in getpriority/setpriority calls, so pretend
+-   id_t is used everywhere, just happens to be int on some OSes */
+-#ifndef _ID_T
+-#define _ID_T
+-typedef int id_t;
+-#endif
+ #endif
+ 
+ #include <sys/types.h>
diff --git a/main/fakeroot/fakeroot-hide-dlsym-errors.patch b/main/fakeroot/fakeroot-hide-dlsym-errors.patch
deleted file mode 100644
index aeeb347da67..00000000000
--- a/main/fakeroot/fakeroot-hide-dlsym-errors.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-it's normal that the acl_* symbols are not found if the application
-is not linked against -lacl. these errors harmless, but mighty
-annoying.
-
---- fakeroot-1.20/libfakeroot.c.orig	2014-03-07 11:20:26.120532847 +0200
-+++ fakeroot-1.20/libfakeroot.c	2014-03-07 11:21:26.486872482 +0200
-@@ -258,10 +258,12 @@
-  /* clear dlerror() just in case dlsym() legitimately returns NULL */
-     msg = dlerror();
-     *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name);
--    if ( (msg = dlerror()) != NULL){
-+#ifdef LIBFAKEROOT_DEBUGGING
-+    if ( fakeroot_debug && (msg = dlerror()) != NULL) {
-       fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
- /*    abort ();*/
-     }
-+#endif
-   }
- }
- 
diff --git a/main/fakeroot/fakeroot-no-ldlibrarypath.patch b/main/fakeroot/fakeroot-no-ldlibrarypath.patch
deleted file mode 100644
index e7b9a037d08..00000000000
--- a/main/fakeroot/fakeroot-no-ldlibrarypath.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -ru fakeroot-1.20.2.orig/scripts/fakeroot.in fakeroot-1.20.2/scripts/fakeroot.in
---- fakeroot-1.20.2.orig/scripts/fakeroot.in	2015-11-12 10:51:23.241681379 +0200
-+++ fakeroot-1.20.2/scripts/fakeroot.in	2015-11-12 10:56:53.331985288 +0200
-@@ -34,8 +34,7 @@
- FAKEROOT_BINDIR=@bindir@
- 
- USEABSLIBPATH=@LDPRELOADABS@
--LIB=lib@fakeroot_transformed@@DLSUFFIX@
--PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
-+LIB=@libdir@/lib@fakeroot_transformed@@DLSUFFIX@
- FAKED=${FAKEROOT_BINDIR}/@faked_transformed@
- 
- FAKED_MODE="unknown-is-root"
-@@ -68,7 +67,6 @@
-     -l|--lib)
-        shift
-        LIB=`eval echo "$1"`
--       PATHS=
-        ;;
-     -f|--faked)
-        shift
-@@ -111,23 +109,11 @@
- 
- # make sure the preload is available
- ABSLIB=""
--if [ -n "$PATHS" ]
--then
--    for dir in `echo $PATHS | sed 's/:/ /g'`
--    do
--	if test -r "$dir/$LIB"
--	then
--	    libfound=yes
--	    ABSLIB="$dir/$LIB"
--	fi
--    done
--else
-     if test -r "$LIB"
-     then
- 	libfound=yes
- 	ABSLIB="$LIB"
-     fi
--fi
- 
- if test $libfound = no
- then
-@@ -148,7 +134,7 @@
- if [ "$WAITINTRAP" -eq 0 ]; then
-   trap "kill -s @signal@ $PID" EXIT INT
- else
--  @MACOSX_FALSE@trap 'FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDPRELOADVAR@="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
-+  @MACOSX_FALSE@trap 'FAKEROOTKEY=$FAKEROOTKEY @LDPRELOADVAR@="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
-   @MACOSX_TRUE@trap 'FAKEROOTKEY=$FAKEROOTKEY @LDPRELOADVAR@="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
- fi
- 
-@@ -159,10 +145,6 @@
- if test $USEABSLIBPATH -ne 0 ; then
-   LIB=$ABSLIB
- fi
--# Keep other library paths
--if test -n "$@LDLIBPATHVAR@"; then
--  PATHS="$PATHS:$@LDLIBPATHVAR@"
--fi
- # ...and preloaded libs
- if test -n "$@LDPRELOADVAR@"; then
-   LIB="$LIB:$@LDPRELOADVAR@"
-@@ -171,11 +153,11 @@
- export FAKEROOT_FD_BASE
- 
- if test -z "$*"; then
--  @MACOSX_FALSE@FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh}
-+  @MACOSX_FALSE@FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh}
-   @MACOSX_TRUE@FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" ${SHELL:-/bin/sh}
-   RESULT=$?
- else
--  @MACOSX_FALSE@FAKEROOTKEY=$FAKEROOTKEY @LDLIBPATHVAR@="$PATHS" @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@"
-+  @MACOSX_FALSE@FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@"
-   @MACOSX_TRUE@FAKEROOTKEY=$FAKEROOTKEY @LDEXTRAVAR@ @LDPRELOADVAR@="$LIB" "$@"
-   RESULT=$?
- fi
-
diff --git a/main/fakeroot/fakeroot-skip-ipc-sanity-check.patch b/main/fakeroot/fakeroot-skip-ipc-sanity-check.patch
new file mode 100644
index 00000000000..9541973c049
--- /dev/null
+++ b/main/fakeroot/fakeroot-skip-ipc-sanity-check.patch
@@ -0,0 +1,59 @@
+This patch was original added in aports commit
+439b449b68ebf3462a3f659804c41195e2d8d8ae. It
+seems to be needed since this sanity checks
+fails spuriously when cros compiling fakeroot.
+
+diff -upr fakeroot-1.27.orig/configure.ac fakeroot-1.27/configure.ac
+--- fakeroot-1.27.orig/configure.ac	2022-01-30 10:43:52.992260063 +0100
++++ fakeroot-1.27/configure.ac	2022-01-30 10:46:22.989526929 +0100
+@@ -25,50 +25,6 @@ AC_CACHE_CHECK([which IPC method to use]
+ 	       [ac_cv_use_ipc],
+ 	       [ac_cv_use_ipc=sysv])
+ 
+-if test $ac_cv_use_ipc = "sysv"; then
+-  AC_MSG_CHECKING([whether SysV IPC message queues are actually working on the host])
+-
+-  AC_LANG_PUSH(C)
+-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+-#include <stdlib.h>
+-#include <sys/types.h>
+-#include <sys/ipc.h>
+-#include <sys/msg.h>
+-#include <time.h>
+-#include <unistd.h>
+-
+-int main() {
+-
+-  srandom(time(NULL)+getpid()*33151);
+-  key_t msg_key = random();
+-  int msg_get = msgget(msg_key, IPC_CREAT|0600);
+-
+-  if (msg_get==-1) {
+-    return 1;
+-  } else {
+-    msgctl(msg_get, IPC_RMID, NULL);
+-    return 0;
+-  }
+-
+-}]])],[ac_cv_use_ipc=sysv],[ac_cv_use_ipc=tcp],[ac_cv_use_ipc=cross])
+-
+-  if test $ac_cv_use_ipc = cross; then
+-    if test "$host_os" = linux-gnu; then
+-      ac_cv_use_ipc=sysv
+-      AC_MSG_RESULT([cross, guessing yes])
+-    else
+-      (set -o posix; set)
+-      AC_MSG_ERROR([cross compiling, unknown result for $host_os])
+-    fi
+-  elif test $ac_cv_use_ipc = "tcp"; then
+-    AC_MSG_RESULT([No, using TCP])
+-  else
+-    AC_MSG_RESULT([Yes])
+-  fi
+-
+-  AC_LANG_POP(C)
+-fi
+-
+ AC_ARG_WITH([dbformat],
+ 	    AS_HELP_STRING([--with-dbformat@<:@=DBFORMAT@:>@],
+ 			   [database format to use: either inode (default) or path]),
diff --git a/main/fakeroot/fix-format.patch b/main/fakeroot/fix-format.patch
new file mode 100644
index 00000000000..8f8639647aa
--- /dev/null
+++ b/main/fakeroot/fix-format.patch
@@ -0,0 +1,25 @@
+Fakeroot defines custom fake_dev_t/fake_ino_t as uint64_t
+but doesn't use the PRIu64 format specifier from inttypes.h
+to print them thereby relying on a specific representation
+of these types.
+
+diff -upr fakeroot-1.27.orig/faked.c fakeroot-1.27/faked.c
+--- fakeroot-1.27.orig/faked.c	2022-01-17 21:37:21.000000000 +0100
++++ fakeroot-1.27/faked.c	2022-01-30 11:36:59.963019225 +0100
+@@ -121,6 +121,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <signal.h>
++#include <inttypes.h>
+ #ifdef HAVE_STDINT_H
+ # include <stdint.h>
+ #endif
+@@ -687,7 +688,7 @@ int load_database(const uint32_t remote)
+ /*                               */
+ /*********************************/
+ void debug_stat(const struct fakestat *st){
+-  fprintf(stderr,"dev:ino=(%llx:%lli), mode=0%lo, own=(%li,%li), nlink=%li, rdev=%lli\n",
++  fprintf(stderr,"dev:ino=(%"PRIx64":%"PRIu64"), mode=0%lo, own=(%li,%li), nlink=%li, rdev=%"PRIu64"\n",
+ 	  st->dev,
+ 	  st->ino,
+ 	  (long)st->mode,
diff --git a/main/fakeroot/t-xattr.patch b/main/fakeroot/t-xattr.patch
new file mode 100644
index 00000000000..aeba42310ac
--- /dev/null
+++ b/main/fakeroot/t-xattr.patch
@@ -0,0 +1,16 @@
+runs when getcap is available, and setting a cap in fakeroot is forbidden so it fails
+--
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 497de99..b2723a3 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -12,8 +12,7 @@ TESTS =						\
+   t.option					\
+   t.tar						\
+   t.touchinstall				\
+-  t.truereturn \
+-  t.xattr
++  t.truereturn
+ 
+ suffix =
+ TESTS_ENVIRONMENT =				\
diff --git a/main/fakeroot/xstatjunk.patch b/main/fakeroot/xstatjunk.patch
index 12f2759b48f..bda4469980d 100644
--- a/main/fakeroot/xstatjunk.patch
+++ b/main/fakeroot/xstatjunk.patch
@@ -1,10 +1,12 @@
---- fakeroot-1.18.4.orig/configure.ac	2012-06-02 18:23:41.000000000 +0000
-+++ fakeroot-1.18.4configure.ac	2015-09-24 23:15:56.917470073 +0000
-@@ -301,7 +301,7 @@
+diff --git a/configure.ac b/configure.ac
+index 9613183..e4a9bbc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -385,7 +385,7 @@ for SEARCH in %stat f%stat l%stat f%statat %stat64 f%stat64 l%stat64 f%statat64
    FUNC=`echo $SEARCH|sed -e 's/.*%//'`
    PRE=`echo $SEARCH|sed -e 's/%.*//'`
    FOUND=
--  for WRAPPED in __${PRE}x${FUNC} _${PRE}x${FUNC} __${PRE}${FUNC}13 ${PRE}${FUNC}; do
+-  for WRAPPED in __${PRE}x${FUNC} _${PRE}x${FUNC} __${PRE}${FUNC}13 ${PRE}${FUNC} __${PRE}${FUNC}; do
 +  for WRAPPED in ${PRE}${FUNC}; do
      AC_CHECK_FUNCS($WRAPPED,FOUND=$WRAPPED)
  dnl
diff --git a/main/fcgi/APKBUILD b/main/fcgi/APKBUILD
index f579b0627c5..48f5f4eab89 100644
--- a/main/fcgi/APKBUILD
+++ b/main/fcgi/APKBUILD
@@ -1,13 +1,13 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=fcgi
 _pkgname=fcgi2
 pkgver=2.4.2
-pkgrel=0
+pkgrel=4
 pkgdesc="FAST CGI(fcgi) is a language independent, high performant extension to CGI"
 url="https://github.com/FastCGI-Archives/fcgi2"
 arch="all"
-license="custom"
+license="OML"
 options="!check" # no test suite
 makedepends="libtool autoconf automake"
 subpackages="$pkgname-dev $pkgname++:xx"
@@ -16,7 +16,6 @@ source="$_pkgname-$pkgver.tar.gz::https://github.com/FastCGI-Archives/fcgi2/arch
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	cd $builddir
 	export LIBS="-lm"
 	./autogen.sh
 	./configure \
@@ -31,7 +30,6 @@ build() {
 }
 
 package() {
-	cd $builddir
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/fcgiwrap/APKBUILD b/main/fcgiwrap/APKBUILD
index 21bd32e6066..930419da322 100644
--- a/main/fcgiwrap/APKBUILD
+++ b/main/fcgiwrap/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fcgiwrap
 pkgver=1.1.0
-pkgrel=3
+pkgrel=8
 pkgdesc="Simple server for running CGI applications over FastCGI"
 url="https://github.com/gnosek/fcgiwrap"
 arch="all"
@@ -12,14 +12,13 @@ pkggroups="www-data"
 install="$pkgname.pre-install"
 makedepends="$depends_dev autoconf libtool automake fcgi-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/gnosek/$pkgname/archive/$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/gnosek/fcgiwrap/archive/$pkgver.tar.gz
+	no-buffering.patch
 	$pkgname.initd
 	$pkgname.confd"
-
-builddir="$srcdir/$pkgname-$pkgver"
+options="!check"
 
 build() {
-	cd "$builddir"
 	autoreconf --install
 	CFLAGS="$CFLAGS -Wno-implicit-fallthrough" \
 	./configure --prefix=/usr \
@@ -29,13 +28,15 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	install -d -m2775 -o fcgiwrap -g www-data  "$pkgdir"/run/fcgiwrap
 	make DESTDIR="$pkgdir" install
 	install -Dm755 $srcdir/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -Dm644 $srcdir/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
-sha512sums="b8d35762d1d3c94a67602290b0092f0c38cffbbcd3dbc16597abf8b92172909b04450c238de2e430e841a17dd47fdd48d6a001f77539966980ef1af61e447ddc  fcgiwrap-1.1.0.tar.gz
-0dbf5f4387e5dc5de6e9bd6d98247e175f1a7943fe1d04ea916881b1269fd0b62abfafac91f8c0dd2f4dc9c71118195ba9dd7cf9bb5e3d93e6e711ec7d770453  fcgiwrap.initd
-893e9afa92c20c9d0dab68fffc806a1be1f2e28a7e73bbb497316386a9ee083be4bad68a90f660e489311a9812a512b50fb0edb8b9c49b12f6cd266ba53b01a6  fcgiwrap.confd"
+sha512sums="
+b8d35762d1d3c94a67602290b0092f0c38cffbbcd3dbc16597abf8b92172909b04450c238de2e430e841a17dd47fdd48d6a001f77539966980ef1af61e447ddc  fcgiwrap-1.1.0.tar.gz
+72ba8a0d044c86cc41358002b1cbb94e77dc81e56669032b474b94d7cde80e6cc5d041a064d79ed98b7db8aee9ffcc8830df88491f14afa251781487a57fd429  no-buffering.patch
+e6111da1089df43f8656e598edf4e658cd2d70e6066833a2c7a465229723e1edce144cf214bd8f771298d54948b8128012c4ce4d509c9d9307a54e8ef90ff2d8  fcgiwrap.initd
+893e9afa92c20c9d0dab68fffc806a1be1f2e28a7e73bbb497316386a9ee083be4bad68a90f660e489311a9812a512b50fb0edb8b9c49b12f6cd266ba53b01a6  fcgiwrap.confd
+"
diff --git a/main/fcgiwrap/fcgiwrap.initd b/main/fcgiwrap/fcgiwrap.initd
index 353e51f3932..2d2e05d8e5d 100644
--- a/main/fcgiwrap/fcgiwrap.initd
+++ b/main/fcgiwrap/fcgiwrap.initd
@@ -29,6 +29,7 @@ start() {
 	ebegin "Starting ${name}"
 	start-stop-daemon --exec ${command} \
 		--background \
+		-k 0002 \
 		-u ${user} -g ${group} \
 		--start -- ${command_args}
 	eend $?
diff --git a/main/fcgiwrap/fcgiwrap.pre-install b/main/fcgiwrap/fcgiwrap.pre-install
index cdd114e0ec2..ec2ba415e5c 100644
--- a/main/fcgiwrap/fcgiwrap.pre-install
+++ b/main/fcgiwrap/fcgiwrap.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -D -H -h /var/run/fcgiwrap -s /sbin/nologin -G www-data \
 	fcgiwrap 2>/dev/null
 exit 0
diff --git a/main/fcgiwrap/no-buffering.patch b/main/fcgiwrap/no-buffering.patch
new file mode 100644
index 00000000000..3d5f0038ee9
--- /dev/null
+++ b/main/fcgiwrap/no-buffering.patch
@@ -0,0 +1,58 @@
+From eb54c65446693366aedfe72f002c6bb4e1a5d748 Mon Sep 17 00:00:00 2001
+From: Richard Stanway <r.stanway@gmail.com>
+Date: Thu, 24 Mar 2016 21:34:17 -0500
+Subject: [PATCH] Add environment variable NO_BUFFERING to disable output
+ buffering
+
+Fixes #36
+---
+ fcgiwrap.8 | 4 ++++
+ fcgiwrap.c | 6 ++++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/fcgiwrap.8 b/fcgiwrap.8
+index bf02c26..892b594 100644
+--- a/fcgiwrap.8
++++ b/fcgiwrap.8
+@@ -65,6 +65,10 @@
+ SCRIPT_FILENAME
+ .RS
+ complete path to CGI script. When set, overrides DOCUMENT_ROOT and SCRIPT_NAME
++.RE
++NO_BUFFERING
++.RS
++When set (e.g., to ""), disables output buffering.
+ 
+ .SH EXAMPLE
+ The fastest way to see \fBfcgiwrap\fP do something is to launch it at the command line
+diff --git a/fcgiwrap.c b/fcgiwrap.c
+index b44d8aa..42e3ec9 100644
+--- a/fcgiwrap.c
++++ b/fcgiwrap.c
+@@ -191,6 +191,7 @@ struct fcgi_context {
+ 	int fd_stderr;
+ 	unsigned int reply_state;
+ 	pid_t cgi_pid;
++	int unbuffered;
+ };
+ 
+ static void fcgi_finish(struct fcgi_context *fc, const char* msg)
+@@ -256,6 +257,10 @@ static const char * fcgi_pass_fd(struct fcgi_context *fc, int *fdp, FCGI_FILE *f
+ 				return "writing CGI reply";
+ 			}
+ 		}
++
++		if (fc->unbuffered && FCGI_fflush(ffp)) {
++			return "flushing CGI reply";
++		}
+ 	} else {
+ 		if (nread < 0) {
+ 			return "reading CGI reply";
+@@ -590,6 +595,7 @@ static void handle_fcgi_request(void)
+ 			fc.fd_stderr = pipe_err[0];
+ 			fc.reply_state = REPLY_STATE_INIT;
+ 			fc.cgi_pid = pid;
++			fc.unbuffered = !!getenv("NO_BUFFERING");
+ 
+ 			fcgi_pass(&fc);
+ 	}
diff --git a/main/ferm/APKBUILD b/main/ferm/APKBUILD
index adf8419cf0a..d5e68285aaf 100644
--- a/main/ferm/APKBUILD
+++ b/main/ferm/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=ferm
-pkgver=2.5.1
-pkgrel=0
+pkgver=2.7
+pkgrel=1
 case $pkgver in
 	*.*.*)  _pkgver=${pkgver%.*};;
 	*.*) _pkgver=$pkgver;;
@@ -11,29 +11,25 @@ esac
 pkgdesc="firewall configuration tool"
 url="http://ferm.foo-projects.org/"
 arch="noarch"
-license="GPL"
+license="GPL-2.0-or-later"
 depends="perl iptables"
-makedepends="perl iptables perl-net-dns-resolver-mock"
+makedepends="perl-net-dns-resolver-mock"
 source="
-	http://ferm.foo-projects.org/download/${_pkgver}/ferm-$pkgver.tar.xz
+	http://ferm.foo-projects.org/download/$_pkgver/ferm-$pkgver.tar.xz
 	ferm.confd
 	ferm.initd
 	"
 subpackages="$pkgname-doc $pkgname-openrc"
-builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	install -m755 -D src/ferm "$pkgdir/usr/sbin/$pkgname"
 	install -m755 -D src/import-ferm "$pkgdir/usr/sbin/import-$pkgname"
 
@@ -52,6 +48,8 @@ openrc() {
 	mv "$pkgdir/etc" "$subpkgdir/"
 	install_if="openrc ferm=$pkgver-r$pkgrel"
 }
-sha512sums="bc7228fbf452722fef54519fec97d3548bc73ec5350aa1f7dd68aa2ac35c233f6fae6aeee6bf687c478cc58f20afab3ce25dd237cd68ebe2eb9b23c77d29e4ab  ferm-2.5.1.tar.xz
+sha512sums="
+bbc0e025514c8bf826dd0c13c24cba64b2729380bce5ab8f0e1a72c4f22471edc4fcd2c343cf9af97a2e9bd204ba27feefcfe21d4b0ce53837be042f863c9c24  ferm-2.7.tar.xz
 26e4673f7c8d0f77eb1d8fdc2051f1a3729e482b075346c65e39305e29014391c390c682cd597cf3dc67fa0f9fe69818e928c41cb362814a69fc67e8bbdf7ad5  ferm.confd
-c36a275d7abeac7dcb17240311b47007aafa8e07e4fd50ce45af3d79e713627624d26eea1bffe7854824f2c174a18524669cedab510ca9cea1565dda4606d394  ferm.initd"
+c36a275d7abeac7dcb17240311b47007aafa8e07e4fd50ce45af3d79e713627624d26eea1bffe7854824f2c174a18524669cedab510ca9cea1565dda4606d394  ferm.initd
+"
diff --git a/main/fetchmail/APKBUILD b/main/fetchmail/APKBUILD
deleted file mode 100644
index 41d767bb2a7..00000000000
--- a/main/fetchmail/APKBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=fetchmail
-pkgver=6.4.2
-pkgrel=0
-pkgdesc="A remote-mail retrieval and forwarding utility"
-url="https://www.fetchmail.info/"
-arch="all"
-license="GPL-2.0-or-later AND Public Domain"
-pkgusers="fetchmail"
-pkggroups="fetchmail"
-makedepends="openssl-dev python3"
-install="fetchmail.pre-install"
-subpackages="
-	$pkgname-doc
-	$pkgname-openrc
-	fetchmailconf::noarch
-	"
-source="https://downloads.sourceforge.net/fetchmail/fetchmail-$pkgver.tar.xz
-	$pkgname.initd
-	$pkgname.confd
-	"
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--with-ssl \
-		--disable-nls \
-		--enable-POP3 \
-		--enable-IMAP \
-		--without-hesiod \
-		--enable-ETRN \
-		--enable-NTLM \
-		--enable-SDPS \
-		--enable-RPA \
-		--without-kerberos5 \
-		--without-gssapi \
-		--enable-fallback=no
-	make
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-	install -o fetchmail -g fetchmail -d "$pkgdir"/var/lib/fetchmail \
-		"$pkgdir"/var/run/fetchmail
-}
-
-fetchmailconf() {
-	depends="python3 py3-future python3-tkinter"
-	pkgdesc="GUI for generating fetchmail configuration files"
-	install=""
-
-	amove usr/bin/fetchmailconf*
-	amove usr/lib/python3*/site-packages/fetchmailconf.py*
-	amove usr/lib/python3*/site-packages/__pycache__/fetchmailconf*
-}
-
-
-sha512sums="8ec62a5df81b9b8c5e5479d35a10aded22aca74f671cded339dc7ae1c78d8a8638dfe4f04be35334184b5b27f3fb857402dc5b587cca8ede3f5b9b268b37edc1  fetchmail-6.4.2.tar.xz
-9520ec6616f4004d091b1c908d3ea38e104ad8f6595959a3cd3ef7544d05e3b75854631289e167ead08479250d04584d3f1855668a7a0ebd16a1ee9106f3b0b3  fetchmail.initd
-6f031ec6bd4a3ae53cd04fbd8470f4d10bd46ca29cabffa634a6801aa2e7707169855fbc045ced3c9a69523e694511a3f076b611678143e49339c8ccac98074e  fetchmail.confd"
diff --git a/main/fetchmail/fetchmail.confd b/main/fetchmail/fetchmail.confd
deleted file mode 100644
index baa1a4c2afc..00000000000
--- a/main/fetchmail/fetchmail.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# /etc/conf.d/fetchmail: config file for /etc/init.d/fetchmail
-
-# See the fetchmail(1) man page for possible options to put here.
-CFGFILE="/etc/fetchmailrc"
-FETCHMAIL_OPTS="-d ${polling_period:-300}"
diff --git a/main/fetchmail/fetchmail.initd b/main/fetchmail/fetchmail.initd
deleted file mode 100644
index cee4f69f861..00000000000
--- a/main/fetchmail/fetchmail.initd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-
-description="Remote mail retrieval and forwarding"
-
-pidfile=/var/run/fetchmail/fetchmail.pid
-
-depend() {
-	need net
-	after firewall
-	use mta
-}
-
-checkconfig() {
-        if [ ! -f "${CFGFILE}" ]; then
-                eerror "Configuration file ${CFGFILE} not found"
-                return 1
-        fi
-}
-
-start() {
-        checkconfig || return 1
-	checkpath -d ${pidfile%/*} -o fetchmail
-
-        ebegin "Starting fetchmail"
-        start-stop-daemon --start --quiet \
-		--user fetchmail --exec /usr/bin/fetchmail \
-		-- -f "${CFGFILE}" ${FETCHMAIL_OPTS} \
-		--pidfile ${pidfile} -i /var/lib/fetchmail/.fetchids
-        eend ${?}
-}
-
-stop() {
-        ebegin "Stopping fetchmail"
-        start-stop-daemon --stop --quiet --pidfile ${pidfile}
-        eend ${?}
-}
-
diff --git a/main/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install
deleted file mode 100644
index ef46a104d79..00000000000
--- a/main/fetchmail/fetchmail.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S fetchmail 2>/dev/null
-adduser -S -D -H -h /var/lib/fetchmail -s /sbin/nologin -G fetchmail -g fetchmail fetchmail 2>/dev/null
-
-exit 0
diff --git a/main/fftw/APKBUILD b/main/fftw/APKBUILD
index 5803e0faf7b..4c750481a1b 100644
--- a/main/fftw/APKBUILD
+++ b/main/fftw/APKBUILD
@@ -1,54 +1,61 @@
-# Contributor: 
-# Maintainer: 
+# Contributor: Magnus Sandin <magnus.sandin@gmail.com>
+# Maintainer: Magnus Sandin <magnus.sandin@gmail.com>
 pkgname=fftw
-pkgver=3.3.8
-pkgrel=0
+pkgver=3.3.10
+_pkgver=${pkgver//p/-pl}
+pkgrel=5
 pkgdesc="Discrete Fourier transform (DFT) library"
-url="http://www.fftw.org"
+url="http://www.fftw.org/"
 arch="all"
 license="GPL-2.0-or-later"
 makedepends="texinfo"
 # order of the libs split functions are important because of lib naming
-subpackages="$pkgname-dev $pkgname-doc $pkgname-single-libs:single
-	$pkgname-long-double-libs:long_double $pkgname-double-libs:double"
-srcpkgver=${pkgver//p/-pl}
-source="http://www.fftw.org/$pkgname-$srcpkgver.tar.gz
-	cycle.h.patch"
-builddir="$srcdir/$pkgname-$srcpkgver"
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-single-libs:single
+	$pkgname-long-double-libs:long_double
+	$pkgname-double-libs:double
+	"
+source="http://www.fftw.org/fftw-$_pkgver.tar.gz
+	cycle.h.patch
+	"
 
 _precision="single double long-double"
 
+# disable tests for arm due to bug with gcc >= 9
+# see https://github.com/FFTW/fftw3/issues/213
 case "$CARCH" in
-	armv7) options="$options !check" ;;
+	armhf|armv7) options="$options !check";;
 esac
 
 prepare() {
 	default_prepare
+	update_config_sub
 
-	cd "$builddir"
 	local i; for i in $_precision; do
 		cp -r "$builddir" $srcdir/$i
 	done
 }
 
 build() {
-	local _openmp=
-
+	export CFLAGS="$CFLAGS -O2"
+	export CXXFLAGS="$CXXFLAGS -O2"
+	local cf
 	local i; for i in $_precision; do
 		case "$i" in
-			single) _cf="--enable-single";;
-			double) _cf="";;
-			long-double) _cf="--enable-long-double";;
+		single) cf="--enable-single" ;;
+		double) cf="" ;;
+		long-double) cf="--enable-long-double" ;;
 		esac
 
 		case "$i--$CARCH" in
-			single--x86_64 | double--x86_64)
-				_cf="$_cf --enable-sse2 --enable-avx";;
-			single--arm* | single--aarch64)
-				_cf="$_cf --enable-neon";;
+		single--x86_64|double--x86_64) cf="$cf --enable-sse2 --enable-avx" ;;
+		single--x86|double--x86) cf="$cf --enable-sse2" ;;
+		single--arm*|single--aarch64) cf="$cf --enable-neon" ;;
 		esac
 
-		msg "Building for $i precision ($_cf)"
+		msg "Building for $i precision ($cf)"
 		cd "$srcdir"/$i
 		./configure \
 			--build=$CBUILD \
@@ -59,8 +66,7 @@ build() {
 			--infodir=/usr/share/info \
 			--enable-shared \
 			--enable-threads \
-			$_openmp \
-			$_cf
+			$cf
 		make
 	done
 }
@@ -80,22 +86,18 @@ package() {
 }
 
 single() {
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libfftw3f*.so* \
-		"$subpkgdir"/usr/lib/
+	amove usr/lib/libfftw3f*.so*
 }
 
 double() {
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libfftw3*.so* \
-		"$subpkgdir"/usr/lib/
+	amove usr/lib/libfftw3*.so*
 }
 
 long_double() {
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libfftw3l*.so* \
-		"$subpkgdir"/usr/lib/
+	amove usr/lib/libfftw3l*.so*
 }
 
-sha512sums="ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38  fftw-3.3.8.tar.gz
-7da269fc43dabd02ae6fad2ebad92b07e06825b6b7c6f8987fc6444f02e0d55080db4ba6e401760e071f5c33015faf8c710f643636cab7a79bdf1af5d434dbb4  cycle.h.patch"
+sha512sums="
+2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40  fftw-3.3.10.tar.gz
+7da269fc43dabd02ae6fad2ebad92b07e06825b6b7c6f8987fc6444f02e0d55080db4ba6e401760e071f5c33015faf8c710f643636cab7a79bdf1af5d434dbb4  cycle.h.patch
+"
diff --git a/main/figlet/APKBUILD b/main/figlet/APKBUILD
deleted file mode 100644
index 7af87acf27e..00000000000
--- a/main/figlet/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
-pkgname=figlet
-pkgver=2.2.5
-pkgrel=0
-pkgdesc="A program for making large letters out of ordinary text"
-url="http://www.figlet.org/"
-arch="all"
-license="BSD"
-depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-doc"
-source="ftp://ftp.figlet.org/pub/figlet/program/unix/${pkgname}-${pkgver}.tar.gz
-	musl-fix-cplusplus-decls.patch
-	"
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	make DEFAULTFONTDIR=/usr/share/figlet/fonts all
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="${pkgdir}" BINDIR=/usr/bin MANDIR=/usr/share/man \
-	    DEFAULTFONTDIR=/usr/share/figlet/fonts install
-        install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-sha512sums="bb9610fd89a51dd3e65c485653fe1292f47dbca7cb9a05af4ce317f5d776bb346ae455aec07fc37c290f6658639920fd7c431c1135a0f4d456a21c0bd25f99fb  figlet-2.2.5.tar.gz
-4ac1788686ff89c27747fe10b43de90f43c2aaa40476610cf5af52ff43c00e180b91acc1646658330fd534d223cef4643ab3c7f7bf0f6c9b5861601b1d8a05fe  musl-fix-cplusplus-decls.patch"
diff --git a/main/figlet/musl-fix-cplusplus-decls.patch b/main/figlet/musl-fix-cplusplus-decls.patch
deleted file mode 100644
index 2a08327eaae..00000000000
--- a/main/figlet/musl-fix-cplusplus-decls.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- figlet-2.2.5.orig/utf8.h
-+++ figlet-2.2.5/utf8.h
-@@ -27,13 +27,17 @@
- #define UTF8_IGNORE_ERROR		0x01
- #define UTF8_SKIP_BOM			0x02
- 
--__BEGIN_DECLS
-+#ifdef   __cplusplus
-+extern "C" {
-+#endif
- 
- size_t		utf8_to_wchar(const char *in, size_t insize, wchar_t *out,
- 		    size_t outsize, int flags);
- size_t		wchar_to_utf8(const wchar_t *in, size_t insize, char *out,
- 		    size_t outsize, int flags);
- 
--__END_DECLS
-+#ifdef   __cplusplus
-+}
-+#endif
- 
- #endif /* !_UTF8_H_ */
diff --git a/main/file/APKBUILD b/main/file/APKBUILD
index 9ae5082dae3..0ef826292fd 100644
--- a/main/file/APKBUILD
+++ b/main/file/APKBUILD
@@ -1,16 +1,15 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=file
-pkgver=5.38
-pkgrel=0
+pkgver=5.45
+pkgrel=1
 pkgdesc="File type identification utility"
-url="https://www.darwinsys.com/file"
+url="https://www.darwinsys.com/file/"
 arch="all"
 license="BSD-2-Clause"
 makedepends="autoconf libtool automake"
-subpackages="$pkgname-dev $pkgname-doc libmagic"
-source="$pkgname-$pkgver.tar.gz::https://github.com/file/file/archive/FILE${pkgver/./_}.tar.gz
-	"
+subpackages="libmagic-static $pkgname-dev $pkgname-doc libmagic"
+source="$pkgname-$pkgver.tar.gz::https://github.com/file/file/archive/FILE${pkgver/./_}.tar.gz"
 builddir="$srcdir/$pkgname-FILE${pkgver/./_}"
 
 # secfixes:
@@ -23,13 +22,19 @@ builddir="$srcdir/$pkgname-FILE${pkgver/./_}"
 #     - CVE-2019-8906
 #     - CVE-2019-8907
 
+prepare() {
+	default_prepare
+
+	autoreconf -fvi
+}
+
 build() {
-	SH_LIBTOOL='/usr/share/build-1/libtool' autoreconf -f -i
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--datadir=/usr/share
+		--datadir=/usr/share \
+		--enable-static
 	make
 }
 
@@ -43,8 +48,12 @@ package() {
 
 libmagic() {
 	pkgdesc="File type identification library"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr
+
+	amove \
+		usr/lib/libmagic.so.* \
+		usr/share/misc/magic.mgc
 }
 
-sha512sums="b8920b0b886600b50ef83d949028972e99830d5ac2e9545a5ff7177e5f4c3db20bfc00884d6b6961e4707a920f0290c59ae89439a02cd8cc2a8673284c4100c4  file-5.38.tar.gz"
+sha512sums="
+fdd4c5d13d5ea1d25686c76d8ebc3252c54040c4871e3f0f623c4548b3841795d4e36050292a9453eedf0fbf932573890e9d6ac9fa63ccf577215598ae84b9ea  file-5.45.tar.gz
+"
diff --git a/main/findutils/APKBUILD b/main/findutils/APKBUILD
index e0d293e28ec..4473690a943 100644
--- a/main/findutils/APKBUILD
+++ b/main/findutils/APKBUILD
@@ -2,18 +2,20 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=findutils
-pkgver=4.7.0
-pkgrel=0
+pkgver=4.9.0
+pkgrel=5
 pkgdesc="GNU utilities for finding files"
 url="https://www.gnu.org/software/findutils/"
 arch="all"
 license="GPL-3.0-or-later"
 checkdepends="coreutils diffutils dejagnu"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-locate:_locate $pkgname-locate-doc:_locate_doc"
 source="https://ftp.gnu.org/pub/gnu/findutils/findutils-$pkgver.tar.xz
 	test-parse-datetime.patch"
 
 build() {
+	CFLAGS="$CFLAGS -flto=auto" \
+	CXXFLAGS="$CXXFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,7 +34,28 @@ check() {
 package() {
 	make DESTDIR="$pkgdir" install
 	rm -rf "$pkgdir"/usr/lib
+	mv "$pkgdir"/usr/share/man/man1/locate.1 "$builddir"
 }
 
-sha512sums="650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e  findutils-4.7.0.tar.xz
-79571dc889afa5e6f01c9e1d4134df5e4112a410f24eb3e315645f6886a901780745abe49597d07c6409a3e3ecd3380b1721d86a684b7705c35767111c93bbf5  test-parse-datetime.patch"
+_locate() {
+	pkgdesc="locate and updatedb from findutils"
+	# requires flags only findutils find supports, like -fstype
+	depends="$pkgname=$pkgver-r$pkgrel"
+
+	amove usr/libexec/frcode \
+		usr/bin/locate \
+		usr/bin/updatedb
+}
+
+_locate_doc() {
+	pkgdesc="locate and updatedb from findutils"
+	install -Dm644 "$builddir"/locate.1 \
+		-t "$pkgdir"/usr/share/man/man1
+	default_doc
+	install_if="docs $pkgname-locate=$pkgver-r$pkgrel"
+}
+
+sha512sums="
+ba4844f4403de0148ad14b46a3dbefd5a721f6257c864bf41a6789b11705408524751c627420b15a52af95564d8e5b52f0978474f640a62ab86a41d20cf14be9  findutils-4.9.0.tar.xz
+79571dc889afa5e6f01c9e1d4134df5e4112a410f24eb3e315645f6886a901780745abe49597d07c6409a3e3ecd3380b1721d86a684b7705c35767111c93bbf5  test-parse-datetime.patch
+"
diff --git a/main/fish/APKBUILD b/main/fish/APKBUILD
index 0322f4bd208..a18c2917c2e 100644
--- a/main/fish/APKBUILD
+++ b/main/fish/APKBUILD
@@ -1,52 +1,71 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=fish
-pkgver=3.1.0
-pkgrel=1
+pkgver=3.7.1
+pkgrel=0
 pkgdesc="Modern interactive commandline shell"
-url="http://www.fishshell.com"
+url="https://fishshell.com/"
 arch="all"
 license="GPL-2.0-only"
 depends="bc"
+depends_doc="util-linux-misc" # Requires 'ul' program
 depends_dev="$pkgname-tools"
-makedepends="cmake doxygen ncurses-dev ncurses pcre2-dev"
-checkdepends="expect bash"
+makedepends="cmake doxygen gettext-dev ncurses-dev ncurses pcre2-dev py3-sphinx samurai"
+checkdepends="py3-pexpect bash"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-tools::noarch"
-source="https://github.com/fish-shell/fish-shell/releases/download/$pkgver/fish-$pkgver.tar.gz"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools::noarch $pkgname-lang"
+source="https://github.com/fish-shell/fish-shell/releases/download/$pkgver/fish-$pkgver.tar.xz
+	README.alpine
+	"
 
-prepare() {
-	default_prepare
-	for f in $(find share/tools -type f -name '*.py'); do
-		sed -i -e '1{s@^#!.*@#!%{__python3}@}' "$f"
-	done
-}
+# these were moved to the correct place, but on upgrade, fish would upgrade first,
+# which would conflict right before the others move, so we need a replaces= for
+# one transaction.
+replaces="
+	black-fish-completion
+	curl-fish-completion
+	docker-fish-completion
+	flatpak-fish-completion
+	helm-fish-completion
+	hugo-fish-completion
+	kind-fish-completion
+	mdbook-fish-completion
+	minikube-fish-completion
+	ouch-fish-completion
+	rclone-fish-completion
+	rustup-fish-completion
+	starship-fish-completion
+	topgrade-fish-completion
+	"
+
+# secfixes:
+#   3.4.0-r0:
+#     - CVE-2022-20001
 
 build() {
-	if [ "$CBUILD" != "$CHOST" ]; then
-		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
-	fi
-	cmake -B builddir \
+	CXXFLAGS="$CXXFLAGS -flto=auto" \
+	cmake -B build -G Ninja \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_SHARED_LIBS=True \
-		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS} .
-	make -C builddir
+		-DBUILD_DOCS=TRUE
+	cmake --build build --target all fish_tests
 }
 
 check() {
-	cd builddir
-	ctest
+	cd build
+	./fish_tests
 }
 
 package() {
-	make -C builddir install DESTDIR="$pkgdir"
+	DESTDIR="$pkgdir" cmake --install build
 	rm -fr "$pkgdir"/usr/share/$pkgname/groff
 
+	# Install our README
+	install -Dm 644 "$srcdir"/README.alpine -t "$pkgdir"/usr/share/doc/fish
+
 	mkdir -p "$pkgdir"/usr/lib
 	mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib
 }
@@ -54,16 +73,17 @@ package() {
 doc() {
 	default_doc
 
-	mkdir -p "$subpkgdir"/usr/share/$pkgname
-	mv "$pkgdir"/usr/share/$pkgname/man "$subpkgdir"/usr/share/$pkgname
+	amove usr/share/$pkgname/man
 }
 
 tools() {
 	pkgdesc="$pkgdesc (tools)"
 	depends="$pkgname python3 cmd:man"
 
-	mkdir -p "$subpkgdir"/usr/share/$pkgname
-	mv "$pkgdir"/usr/share/$pkgname/tools "$subpkgdir"/usr/share/$pkgname
+	amove usr/share/$pkgname/tools
 }
 
-sha512sums="143e462b5329790fa9834e135109e1397c3525756a0209d0ec68a53f7d2a1f581cd45fbbdcde6a5b53dff447da18ed6a62277993d851e7b18ef7f1a6b6d49cff  fish-3.1.0.tar.gz"
+sha512sums="
+f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe  fish-3.7.1.tar.xz
+c28cef48e3d9cde4956d36192dc221e63eca89282a937e2683578ac0958d98a9c54420aea4f1d91d516f5ee2c74589a75865a973305421e1ad0a9e70854dff4f  README.alpine
+"
diff --git a/main/fish/README.alpine b/main/fish/README.alpine
new file mode 100644
index 00000000000..54c9a2eb4cd
--- /dev/null
+++ b/main/fish/README.alpine
@@ -0,0 +1 @@
+To use the `help` command in builtins provided by fish install `fish-doc`
diff --git a/main/flac/APKBUILD b/main/flac/APKBUILD
index d358fe2167e..380c11ccf37 100644
--- a/main/flac/APKBUILD
+++ b/main/flac/APKBUILD
@@ -1,50 +1,67 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=flac
-pkgver=1.3.3
-pkgrel=0
+pkgver=1.4.3
+pkgrel=1
 pkgdesc="Free Lossless Audio Codec"
 url="https://xiph.org/flac/"
 arch="all"
-license="custom:Xiph LGPL GPL FDL"
+license="BSD-3-Clause AND GPL-2.0-or-later"
 options="!check" # Tests are infinite
-subpackages="$pkgname-dev $pkgname-doc"
-makedepends="libogg-dev !libiconv"
-source="http://downloads.xiph.org/releases/flac/flac-$pkgver.tar.xz"
+subpackages="$pkgname-dev $pkgname-libs libflac libflac++:libpp $pkgname-doc"
+makedepends="cmake libogg-dev !libiconv samurai"
+source="https://downloads.xiph.org/releases/flac/flac-$pkgver.tar.xz"
 
 # secfixes:
+#   1.3.4-r0:
+#     - CVE-2020-0499
+#     - CVE-2021-0561
 #   1.3.2-r2:
 #     - CVE-2017-6888
 
-
 build() {
-	local _arch_conf
-	case "$CARCH" in
-		ppc*)	_arch_conf="--enable-altivec" ;;
-		x86_64)	_arch_conf="--enable-sse" ;;
-		x86)	_arch_conf="--disable-sse" ;;
-	esac
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-shared \
-		--enable-ogg \
-		--disable-rpath \
-		--with-pic \
-		$_arch_conf
-	make
+	export CFLAGS="$CFLAGS -O3 -flto=auto"
+	export CXXFLAGS="$CXXFLAGS -O3 -flto=auto"
+
+	cmake -B build -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=None \
+		-DBUILD_TESTING=OFF \
+		-DBUILD_EXAMPLES=OFF \
+		-DBUILD_SHARED_LIBS=ON \
+		-DNDEBUG=ON
+
+	cmake --build build
 }
 
 check() {
-	make check
+	ctest --test-dir build --output-on-failure
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 
 	install -Dm0644 COPYING.Xiph \
 		"$pkgdir"/usr/share/licenses/$pkgname/COPYING.Xiph
 }
-sha512sums="d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28  flac-1.3.3.tar.xz"
+
+libs() {
+	# purely for backwards compat
+	depends="libflac=$pkgver-r$pkgrel libflac++=$pkgver-r$pkgrel"
+	mkdir -p "$subpkgdir"
+}
+
+libflac() {
+	pkgdesc="$pkgdesc (libFLAC)"
+
+	amove usr/lib/libFLAC.so.*
+}
+
+libpp() {
+	pkgdesc="$pkgdesc (libFLAC++)"
+
+	amove usr/lib/libFLAC++.so.*
+}
+
+sha512sums="
+3cf095720bd590a588be8ccbe187d22e7a1c60ab85b1d510ce5e8a22ab0a51827b9acfeaad59bbd645a17d1f200f559255a640101b0330709a164306c0e9709e  flac-1.4.3.tar.xz
+"
diff --git a/main/flashcache-utils/APKBUILD b/main/flashcache-utils/APKBUILD
index 66c1ecb4302..f18b2cd29bc 100644
--- a/main/flashcache-utils/APKBUILD
+++ b/main/flashcache-utils/APKBUILD
@@ -1,37 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=flashcache-utils
 pkgver=3.1.3
-pkgrel=0
+pkgrel=3
 pkgdesc="Userspace utilities for flashcache"
-url="https://github.com/facebook/flashcache"
+url="https://github.com/facebookarchive/flashcache"
 arch="all"
-license="GPL"
-depends=""
-depends_dev=""
+license="GPL-2.0-or-later"
 makedepends="$depends_dev linux-headers"
-install=""
-subpackages=""
-source="flashcache-$pkgver.tar.gz::https://github.com/facebook/flashcache/archive/$pkgver.tar.gz"
+source="flashcache-$pkgver.tar.gz::https://github.com/facebookarchive/flashcache/archive/$pkgver.tar.gz"
 
-_builddir="$srcdir"/flashcache-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/flashcache-$pkgver/src
+options="!check"
 
 build() {
-	cd "$_builddir"/src
 	make -C utils
 }
 
 package() {
-	cd "$_builddir"/src/utils
-	make install DESTDIR="$pkgdir" || return 1
+	make -C utils install DESTDIR="$pkgdir"
 }
 
 sha512sums="f7577993ca7962231b19d3141da22268f9b36bf2d60b83ad33c9cabcbae82db2ff2a1697a7137db61b06d5a8ea897a11dc7a80c9c85184c47feddd57d2297275  flashcache-3.1.3.tar.gz"
diff --git a/main/flashrom/APKBUILD b/main/flashrom/APKBUILD
deleted file mode 100644
index 67c74ec6f40..00000000000
--- a/main/flashrom/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Francesco Colista <fcolista@alpinelinux.org>
-# Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
-pkgname=flashrom
-pkgver=1.2
-pkgrel=0
-pkgdesc="A utility for identifying, reading, writing, verifying and erasing flash chips"
-url="https://www.flashrom.org/Flashrom"
-arch="all"
-license="GPL-2.0-or-later"
-depends="dmidecode"
-makedepends="pciutils-dev libusb-compat-dev linux-headers"
-subpackages="$pkgname-doc"
-install="$pkgname.post-install"
-options="!check" # no test suite
-source="https://download.flashrom.org/releases/flashrom-v$pkgver.tar.bz2
-	musl-ffs.patch
-	"
-
-builddir="$srcdir"/$pkgname-v$pkgver
-
-build() {
-	make PREFIX=/usr/
-}
-
-package() {
-	make PREFIX="$pkgdir/usr/" install
-}
-
-sha512sums="8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8  flashrom-v1.2.tar.bz2
-371131e37ee0f2ce31b5dd264707b91817a2f0a3654943e6b3430df862d4bb64f27117c1c94276cb447f5b45f1771b9997f9c96423d68c6dd4565c1e1f442a5e  musl-ffs.patch"
diff --git a/main/flashrom/flashrom.post-install b/main/flashrom/flashrom.post-install
deleted file mode 100755
index b7919f5fd14..00000000000
--- a/main/flashrom/flashrom.post-install
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-if [ -e /proc/sys/kernel/grsecurity/ ]; then
-cat - <<EOF
-
- ************[  flashrom package installation notice ]****************
- 
-          You appear to be running a grsec enabled kernel.
-   flashrom needs write access to /dev/mem and will likely not work
- 
- *********************************************************************
-
-EOF
-fi
-exit 0
-
diff --git a/main/flashrom/musl-ffs.patch b/main/flashrom/musl-ffs.patch
deleted file mode 100644
index 5af047d5a8d..00000000000
--- a/main/flashrom/musl-ffs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- flashrom-0.9.9/spi.c.orig	2017-07-16 14:56:35.786503889 +0300
-+++ flashrom-0.9.9/spi.c	2017-07-16 14:58:31.698126720 +0300
-@@ -22,6 +22,7 @@
-  * Contains the generic SPI framework
-  */
- 
-+#define _BSD_SOURCE
- #include <strings.h>
- #include <string.h>
- #include "flash.h"
diff --git a/main/flex/APKBUILD b/main/flex/APKBUILD
index f3e3225ae6c..9bf992df7a9 100644
--- a/main/flex/APKBUILD
+++ b/main/flex/APKBUILD
@@ -2,19 +2,23 @@
 # Contributor: Arch3y <arch3y@riseup.net>
 pkgname=flex
 pkgver=2.6.4
-pkgrel=2
+pkgrel=6
 pkgdesc="A tool for generating text-scanning programs"
 url="https://github.com/westes/flex"
 arch="all"
-license="BSD-2-Clause AND LGPL-2.0-or-later"
+license="BSD-2-Clause"
 depends="m4"
 depends_dev="flex"
 makedepends="$depends_dev bison help2man"
 subpackages="$pkgname-doc $pkgname-libs $pkgname-dev"
-source="https://github.com/westes/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
+source="https://github.com/westes/flex/releases/download/v$pkgver/flex-$pkgver.tar.gz"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,14 +33,14 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make install DESTDIR="$pkgdir"
 	ln -s flex "$pkgdir"/usr/bin/lex
 }
 
-sha512sums="e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e  flex-2.6.4.tar.gz"
+sha512sums="
+e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e  flex-2.6.4.tar.gz
+"
diff --git a/main/flite/APKBUILD b/main/flite/APKBUILD
index 2fbf4b84e79..40cbf42d42e 100644
--- a/main/flite/APKBUILD
+++ b/main/flite/APKBUILD
@@ -1,60 +1,48 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=flite
-pkgver=2.1
-pkgrel=1
+pkgver=2.2
+pkgrel=2
 pkgdesc="Small, fast speech synthesis engine (text-to-speech)"
-url="http://www.speech.cs.cmu.edu/flite"
+url="http://cmuflite.org/"
 arch="all"
-license="MIT"
-depends=
-depends_dev=
-makedepends="$depends_dev"
-install=""
+license="BSD-4-Clause"
+makedepends="alsa-lib-dev"
 subpackages="$pkgname-dev"
-source="http://www.festvox.org/$pkgname/packed/$pkgname-$pkgver/$pkgname-$pkgver-release.tar.bz2
-	fix-internal-linking.patch"
-builddir="$srcdir/$pkgname-$pkgver-release"
+source="$pkgname-$pkgver.tar.gz::https://github.com/festvox/flite/archive/v$pkgver.tar.gz
+	flite.pc
+	"
+options="!check"
+
+prepare() {
+	default_prepare
+	sed -e "s|@PKGVER@|$pkgver|" -i "$srcdir"/flite.pc
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
-	CFLAGS="$CFLAGS -fPIC" ./configure \
+	CFLAGS="$CFLAGS -fPIC" \
+	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--enable-shared \
-		--localstatedir=/var
-	# work around parallel build issue
-	make -C include
-	make -C src
-	make -C lang
-	make -C tools
+		--localstatedir=/var \
+		--with-audio=alsa
 	make -j1
 }
 
 package() {
-	cd "$builddir"
 	make install INSTALLBINDIR="$pkgdir"/usr/bin \
 		INSTALLLIBDIR="$pkgdir"/usr/lib \
 		INSTALLINCDIR="$pkgdir"/usr/include/flite
 	# remove relative rpaths
 	scanelf -R -r --fix "$pkgdir"
-	mkdir -p "$pkgdir"/usr/lib/pkgconfig
-	cat > "$pkgdir"/usr/lib/pkgconfig/flite.pc <<EOF
-prefix=/usr
-exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
-includedir=\${prefix}/include
 
-Name: flite
-Description: a text to speech library
-Requires:
-Version: 2.1
-Libs: -L\${libdir} -lflite -lflite_cmu_grapheme_lang -lflite_cmu_grapheme_lex -lflite_cmu_indic_lang -lflite_cmu_indic_lex -lflite_cmulex -lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal16 -lflite_cmu_us_kal -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish
-Libs.private: -lm
-Cflags: -I\${includedir}/flite/
-EOF
+	install -Dm0644 "$srcdir"/flite.pc -t "$pkgdir"/usr/lib/pkgconfig
 }
 
-sha512sums="e9ef9ca4b6920178634d94bbe6e21a8b0ec471b010b07e6cc961ed2d120acb944c8e1d268fe26188f7dfe43fb7bd4bdff7fa53b2d2f12029d37e08d0316620d2  flite-2.1-release.tar.bz2
-3794f7b6520ab11e5fd2e6e8dc2ce630f0bcb26ea42f94778e410c08f50e3b4c9c6388e60c15deb545df0d8a83f0299fc75766a606f040c13f68ae2f38b6a5df  fix-internal-linking.patch"
+sha512sums="
+1ca2f4145651490ef8405fdb830a3b42e885020a7603d965f6a5581b01bed41047d396b38c2ceab138fc0b28d28078db17acd2b5a84c6444cb99d65c581afa72  flite-2.2.tar.gz
+9c8ea1b4241b0488d180b3391b594c76bdd43123051b0579983b17e0760d5b4bdf4887ac5d268111f6648d1373f042be067ab8762b7afb21c83e07fb6d73807b  flite.pc
+"
diff --git a/main/flite/fix-internal-linking.patch b/main/flite/fix-internal-linking.patch
deleted file mode 100644
index b1883bb7ad9..00000000000
--- a/main/flite/fix-internal-linking.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 6e3c1a2fa29c066f7d1a25037a1f61cd295ac3af Mon Sep 17 00:00:00 2001
-From: Paul Gevers <elbrus@debian.org>
-Date: Tue, 2 Jan 2018 19:58:18 +0100
-Subject: [PATCH] Improve internal linking
-
-Building packages in Debian uses a tool to link libraries together at the
-package level. It emits warnings when unknonw symbols are found. E.g:
-
-dpkg-shlibdeps: warning: symbol us_tokentowords used by debian/libflite1/usr/lib/x86_64-linux-gnu/libflite_cmu_indic_lang.so.2.0.0 found in none of the libraries
----
- config/common_make_rules |  2 +-
- main/Makefile            | 16 ++++++++++++++--
- 2 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/config/common_make_rules b/config/common_make_rules
-index 7a03785..34434fd 100644
---- a/config/common_make_rules
-+++ b/config/common_make_rules
-@@ -123,7 +123,7 @@ $(LIBDIR)/%.so: $(LIBDIR)/%.shared.a
- 	@ rm -rf shared_os && mkdir shared_os
- 	@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} 
- 	@ (cd shared_os && ar x ../$<)
--	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
-+	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDFLAGS))
- 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
- 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
- 	@ rm -rf shared_os
-diff --git a/main/Makefile b/main/Makefile
-index ff422e0..47b6344 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -54,7 +54,8 @@ ALL = shared_libs \
- VOICES=$(VOXES)
- VOICELIBS=$(VOICES:%=flite_%)
- 
--flite_LIBS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) flite
-+flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) 
-+flite_LIBS = flite $(flite_MODS)
- 
- flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
- flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
-@@ -65,6 +66,10 @@ include $(TOP)/config/common_make_rules
- # so make clean can remove them
- SHAREDARLIBS= $(flite_LIBS:%=$(LIBDIR)/lib%.shared.a)
- SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so)
-+SHAREDMODS = $(flite_MODS:%=$(LIBDIR)/lib%.so)
-+SHAREDusenMODS = $(LIBDIR)/libflite_cmu_time_awb.so $(LIBDIR)/libflite_cmu_us_awb.so $(LIBDIR)/libflite_cmu_us_kal16.so $(LIBDIR)/libflite_cmu_us_kal.so $(LIBDIR)/libflite_cmu_us_rms.so $(LIBDIR)/libflite_cmu_us_slt.so $(LIBDIR)/libflite_cmu_indic_lang.so
-+SHAREDcmulexMODS = $(LIBDIR)/libflite_cmu_time_awb.so $(LIBDIR)/libflite_cmu_us_awb.so $(LIBDIR)/libflite_cmu_us_kal16.so $(LIBDIR)/libflite_cmu_us_kal.so $(LIBDIR)/libflite_cmu_us_rms.so $(LIBDIR)/libflite_cmu_us_slt.so  $(LIBDIR)/libflite_cmu_indic_lex.so
-+SHAREDindicMODS = $(LIBDIR)/libflite_cmu_indic_lex.so
- VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \
-                     $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
- 
-@@ -79,7 +84,14 @@ LOCAL_CLEAN = $(BINDIR)/flite$(EXEEXT) $(BINDIR)/flite_time$(EXEEXT) \
-               flite_voice_list.c
- 
- ifdef SHFLAGS
--flite_LIBS_flags += -Wl,-rpath $(LIBDIR) 
-+$(SHAREDMODS): $(LIBDIR)/libflite.so
-+$(SHAREDMODS): LDFLAGS+=-L../$(LIBDIR) -lflite
-+$(SHAREDusenMODS): $(LIBDIR)/libflite_usenglish.so
-+$(SHAREDusenMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_usenglish
-+$(SHAREDcmulexMODS): $(LIBDIR)/libflite_cmulex.so
-+$(SHAREDcmulexMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmulex
-+$(SHAREDindicMODS): $(LIBDIR)/libflite_cmu_indic_lang.so
-+$(SHAREDindicMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmu_indic_lang
- shared_libs: $(SHAREDLIBS)
- else
- shared_libs: nothing
-From d673f65b2c4a8cd3da7447079309a6dc4bcf1a5e Mon Sep 17 00:00:00 2001
-From: Alan W Black <awb@cs.cmu.edu>
-Date: Sun, 4 Mar 2018 08:55:40 -0500
-Subject: [PATCH] get libs in the right order
-
----
- main/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/main/Makefile b/main/Makefile
-index 47b6344..1da18a8 100644
---- a/main/Makefile
-+++ b/main/Makefile
-@@ -55,7 +55,7 @@ VOICES=$(VOXES)
- VOICELIBS=$(VOICES:%=flite_%)
- 
- flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) 
--flite_LIBS = flite $(flite_MODS)
-+flite_LIBS = $(flite_MODS) flite
- 
- flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
- flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
diff --git a/main/flite/flite.pc b/main/flite/flite.pc
new file mode 100644
index 00000000000..ed61aeae85a
--- /dev/null
+++ b/main/flite/flite.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=\${prefix}
+libdir=\${exec_prefix}/lib
+includedir=\${prefix}/include
+
+Name: flite
+Description: a text to speech library
+Requires:
+Version: @PKGVER@
+Libs: -L\${libdir} -lflite -lflite_cmu_grapheme_lang -lflite_cmu_grapheme_lex -lflite_cmu_indic_lang -lflite_cmu_indic_lex -lflite_cmulex -lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal16 -lflite_cmu_us_kal -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish
+Libs.private: -lm
+Cflags: -I\${includedir}/flite/
diff --git a/main/fmt/APKBUILD b/main/fmt/APKBUILD
new file mode 100644
index 00000000000..fb4378978bc
--- /dev/null
+++ b/main/fmt/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: Luca Weiss <luca@z3ntu.xyz>
+# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
+pkgname=fmt
+pkgver=10.2.1
+pkgrel=1
+pkgdesc="Open-source formatting library for C++"
+url="https://fmt.dev/latest/index.html"
+arch="all"
+license="MIT"
+makedepends="cmake doxygen python3 samurai"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://github.com/fmtlib/fmt/releases/download/$pkgver/fmt-$pkgver.zip
+	Fix-handling-of-static-separator.patch"
+
+build() {
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	# Build in-tree so the prebuilt docs get installed correctly.
+	# See https://github.com/fmtlib/fmt/issues/2837
+	cmake -B . -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=None \
+		$CMAKE_CROSSOPTS
+	cmake --build .
+}
+
+check() {
+	# libstdc++ locale stuff broken
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'chrono-test|unicode-test|xchar-test'
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install .
+}
+
+sha512sums="
+1cf0e3dd09c7d87e0890b8743559159d3be2a8f33c135516962d17c4eeb7b00659e6acd74518bd5566ee4e83ddaba155fecb4c229f90cd258b3b832e72ad82cd  fmt-10.2.1.zip
+695fb13dc60eea6ce83319d8925be49b3a7af6651d80ab528ed244e589c581ee05ac7887f6c73dbfcf2654afabd2c405c0e2eeb5f1f0851237b14d305185d7d5  Fix-handling-of-static-separator.patch
+"
diff --git a/main/fmt/Fix-handling-of-static-separator.patch b/main/fmt/Fix-handling-of-static-separator.patch
new file mode 100644
index 00000000000..27bfda2a4f7
--- /dev/null
+++ b/main/fmt/Fix-handling-of-static-separator.patch
@@ -0,0 +1,32 @@
+From 44c3fe1ebb466ab5c296e1a1a6991c7c7b51b72e Mon Sep 17 00:00:00 2001
+From: Victor Zverovich <viz@meta.com>
+Date: Fri, 9 Feb 2024 15:58:56 -0800
+Subject: [PATCH] Fix handling of static separator
+
+---
+ include/fmt/format-inl.h | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/include/fmt/format-inl.h
++++ b/include/fmt/format-inl.h
+@@ -114,7 +114,11 @@ template <typename Char> FMT_FUNC Char d
+ 
+ FMT_FUNC auto write_loc(appender out, loc_value value,
+                         const format_specs<>& specs, locale_ref loc) -> bool {
+-#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
++#ifdef FMT_STATIC_THOUSANDS_SEPARATOR
++  value.visit(loc_writer<>{
++      out, specs, std::string(1, FMT_STATIC_THOUSANDS_SEPARATOR), "\3", "."});
++  return true;
++#else
+   auto locale = loc.get<std::locale>();
+   // We cannot use the num_put<char> facet because it may produce output in
+   // a wrong encoding.
+@@ -123,7 +127,6 @@ FMT_FUNC auto write_loc(appender out, lo
+     return std::use_facet<facet>(locale).put(out, value, specs);
+   return facet(locale).put(out, value, specs);
+ #endif
+-  return false;
+ }
+ }  // namespace detail
+ 
diff --git a/main/font-adobe-100dpi/APKBUILD b/main/font-adobe-100dpi/APKBUILD
index 2075737c5fd..3b0bed883df 100644
--- a/main/font-adobe-100dpi/APKBUILD
+++ b/main/font-adobe-100dpi/APKBUILD
@@ -1,40 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-adobe-100dpi
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.4
+pkgrel=2
 pkgdesc="X.org adobe 100dpi font"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
+license="MIT"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-adobe-100dpi-$pkgver.tar.xz"
+subpackages="$pkgname-doc"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/100dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha512sums="27ed98dcdbb9c174c7090cdd8fe230f7471d10b5dfc63e092640b5d0fc6ab351bc8ffa9a92bec1755f2780b3d9c1de3ad298c64b70a68b5e6879a8592ef32987  font-adobe-100dpi-1.0.3.tar.bz2"
+sha512sums="
+fedb86672c3b9cb624ee5d74d1d710f21d92c2d48a1fcf0a45b54b3f992f6f5599fc271d38a7e25ef123b64d405fa60a3d46883fe7a9d71ebad83c9b418f8383  font-adobe-100dpi-1.0.4.tar.xz
+"
diff --git a/main/font-adobe-75dpi/APKBUILD b/main/font-adobe-75dpi/APKBUILD
index 196014e9e1e..ed7c2973c28 100644
--- a/main/font-adobe-75dpi/APKBUILD
+++ b/main/font-adobe-75dpi/APKBUILD
@@ -1,39 +1,36 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-adobe-75dpi
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.4
+pkgrel=2
 pkgdesc="X.org adobe 75dpi font"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="noarch"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+license="MIT"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-adobe-75dpi-$pkgver.tar.xz"
+subpackages="$pkgname-doc"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--with-fontdir=/usr/share/fonts/75dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/75dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha512sums="c0d851df5732e81027e265370751a606c6e4f5eea546d802608988dde02de35fa28238f709f48567191090bf18814f671b1a7f9f0b528d54949b0aa9403f266d  font-adobe-75dpi-1.0.3.tar.bz2"
+sha512sums="
+4e63c268525f21c03525870129c8d42cbd17a03d86d9c88bebdccb5094a1093acef1d2b6d4dde221559cb19f047b86baf58fa8ad65d28d4cb6c3064ec164836a  font-adobe-75dpi-1.0.4.tar.xz
+"
diff --git a/main/font-adobe-utopia-100dpi/APKBUILD b/main/font-adobe-utopia-100dpi/APKBUILD
index d3e27dfa677..12351bd9d89 100644
--- a/main/font-adobe-utopia-100dpi/APKBUILD
+++ b/main/font-adobe-utopia-100dpi/APKBUILD
@@ -1,40 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-adobe-utopia-100dpi
-pkgver=1.0.4
-pkgrel=0
+pkgver=1.0.5
+pkgrel=2
 pkgdesc="X.org adobe 100dpi font"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
+license="Adobe-Utopia"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-adobe-utopia-100dpi-$pkgver.tar.xz"
+subpackages="$pkgname-doc"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/100dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha512sums="fecb9a9bde99a82787d12779ea579c8696dcce168acd74b478a879ae24d421d5978d5f69da651e8ff3b25dca355960aaa19f69f2bf61e540464887e546a7b94b  font-adobe-utopia-100dpi-1.0.4.tar.bz2"
+sha512sums="
+9685d66de107ab3142aa9322bbded20f4f538d7bcd8c97bfb4db8eb1fc440724b0c7574ee8b4b5e96c81044c8ee4da175dd638f03dc3e1e650200fdf7b8a169b  font-adobe-utopia-100dpi-1.0.5.tar.xz
+"
diff --git a/main/font-adobe-utopia-75dpi/APKBUILD b/main/font-adobe-utopia-75dpi/APKBUILD
index 50fbbd5a057..9fe6f7a2096 100644
--- a/main/font-adobe-utopia-75dpi/APKBUILD
+++ b/main/font-adobe-utopia-75dpi/APKBUILD
@@ -1,40 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-adobe-utopia-75dpi
-pkgver=1.0.4
-pkgrel=0
+pkgver=1.0.5
+pkgrel=2
 pkgdesc="X.org adobe 75dpi font"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
+license="Adobe-Utopia"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-adobe-utopia-75dpi-$pkgver.tar.xz"
+subpackages="$pkgname-doc"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/75dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha512sums="c569af760a62b00738be65546364587638e8c46e4a0765013747e9595d51bc0633908c72359e42e7ebf6240fdc6294b51512c0a096a5fe64b2bd300ccbff7b92  font-adobe-utopia-75dpi-1.0.4.tar.bz2"
+sha512sums="
+9608698288fca47bf61cff911b8f081593807eed9f138ea22f05a7b6c26c481ec5144d79665cf509ba889df35ef5406e0de71710362bcf6de6b602c12158e22a  font-adobe-utopia-75dpi-1.0.5.tar.xz
+"
diff --git a/main/font-adobe-utopia-type1/APKBUILD b/main/font-adobe-utopia-type1/APKBUILD
index 76b499dcfe9..9eafb76d9aa 100644
--- a/main/font-adobe-utopia-type1/APKBUILD
+++ b/main/font-adobe-utopia-type1/APKBUILD
@@ -1,40 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-adobe-utopia-type1
-pkgver=1.0.4
-pkgrel=0
+pkgver=1.0.5
+pkgrel=1
 pkgdesc="X.org adobe utopia-type1 fonts"
-url="http://xorg.freedesktop.org/"
-arch="all"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
 license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-adobe-utopia-type1-$pkgver.tar.xz"
+subpackages="$pkgname-doc"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/utopia-type1 \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/utopia-type1
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha512sums="53ff2ce7b17824a0eed1be6c3e3386e51983389f5623e732ac898c4e08769c8720f6d6b7c75b6455e050ec5dc390376747ca4cdb9f831a218f9dd5ee5edcd0d6  font-adobe-utopia-type1-1.0.4.tar.bz2"
+sha512sums="
+e30f4c7702f47a3a42206975fbcfec058317681956d246411e50e372b669bdc875c5d7fe28bad7d298bc61b71a997c7836fb6ac16effd223a96723a6e9ece649  font-adobe-utopia-type1-1.0.5.tar.xz
+"
diff --git a/main/font-alias/APKBUILD b/main/font-alias/APKBUILD
index 30e7eeee800..7fe787b965a 100644
--- a/main/font-alias/APKBUILD
+++ b/main/font-alias/APKBUILD
@@ -1,29 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-alias
-pkgver=1.0.3
-pkgrel=1
+pkgver=1.0.5
+pkgrel=0
 pkgdesc="X.org font alias files"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="noarch"
 license="custom"
-depends=""
-makedepends="util-macros"
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/font/font-alias-$pkgver.tar.xz"
+subpackages="$pkgname-doc"
 
-builddir="$srcdir"/$pkgname-$pkgver
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-prepare() {
-	update_config_sub
-	default_prepare
-}
-
-build () {
-	cd "$builddir"
+build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,9 +18,16 @@ build () {
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha512sums="05abfef4615722d8cf3f21ab1118494522553a75427140d9753b3d312f404735c20766ceacc1b53f9e783ea25ec8f2f6bdb8696525a4962afe29f524ed8b6552  font-alias-1.0.3.tar.bz2"
+sha512sums="
+86bffa6b9ff789eeba715c079965157806ed633d44cd3dbf5e2a4bba2b390a0f48db65edc8e3264acbc2368d78a8d7e05bc2e2e3a86ddbf6b08bfe7f5e862bcc  font-alias-1.0.5.tar.xz
+"
diff --git a/main/font-arabic-misc/APKBUILD b/main/font-arabic-misc/APKBUILD
index 6f404877aa5..f192be11dd1 100644
--- a/main/font-arabic-misc/APKBUILD
+++ b/main/font-arabic-misc/APKBUILD
@@ -1,40 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-arabic-misc
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
+license="MIT"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-arabic-misc-$pkgver.tar.xz"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/misc
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
-sha512sums="46a416bf888afdb54f5dda6c9a7207dc069d14089ba14b262c60cb9ad427784c46e2a61b32a79f1d745e73ea657bbc36b48aa5d4bbd79f73a2d997b027ddfbc0  font-arabic-misc-1.0.3.tar.bz2"
+sha512sums="
+afd5fae32440b133c5ee0195af44ad1462d35c2f451dcf4b1c93e0ce245d009b120d39eb5f780b003ae2f572408965e6d149437e9ebbf5738cb69193aaa4d488  font-arabic-misc-1.0.4.tar.xz
+"
diff --git a/main/font-bh-100dpi/APKBUILD b/main/font-bh-100dpi/APKBUILD
index b2ddde5bcb8..c9f6d95a390 100644
--- a/main/font-bh-100dpi/APKBUILD
+++ b/main/font-bh-100dpi/APKBUILD
@@ -1,40 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bh-100dpi
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="X.Org Bigelow & Holmes bitmap fonts"
-url="http://xorg.freedesktop.org/"
-arch="all"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
 license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-bh-100dpi-$pkgver.tar.xz"
+subpackages="$pkgname-doc"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/100dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha512sums="60532fb3bd25bad08b1db65f96fdd1cdb2ae5fd580729d7851f5b619f1ed6bdef4fec30111ec408cec9ae5e94f92ad9cf214214c01ac684f3a4bd8d43bafd8a2  font-bh-100dpi-1.0.3.tar.bz2"
+sha512sums="
+5fe2a24df0d0e9109f1c1cb2556f4cdbf07cc16441e565333f01a00815dd4555b6ef0dd689ef3196ddb76db7480bca8f0b501d4244262d6c64d4751d75503b44  font-bh-100dpi-1.0.4.tar.xz
+"
diff --git a/main/font-bh-75dpi/APKBUILD b/main/font-bh-75dpi/APKBUILD
index 01802d80953..a9557863745 100644
--- a/main/font-bh-75dpi/APKBUILD
+++ b/main/font-bh-75dpi/APKBUILD
@@ -1,40 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bh-75dpi
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="X.Org Bigelow & Holmes bitmap fonts"
-url="http://xorg.freedesktop.org/"
-arch="all"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
 license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-bh-75dpi-$pkgver.tar.xz"
+subpackages="$pkgname-doc"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/75dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha512sums="fb19c7fe91b6cc0670b01d5b8165075866ad08796293650d6037d79211ca668decdcc1b3684774907c06073145919655690d78ccdcf2511db38b5879328a9f50  font-bh-75dpi-1.0.3.tar.bz2"
+sha512sums="
+8ccc5accdd43b4e1b8007c94e7916c6ee947ff0d57e3b0ce92154b718ef0ac2579659719738a50ef3ab0998a8bcea5b055e6a2e4d72b9fa5755b786143303955  font-bh-75dpi-1.0.4.tar.xz
+"
diff --git a/main/font-bh-lucidatypewriter-100dpi/APKBUILD b/main/font-bh-lucidatypewriter-100dpi/APKBUILD
deleted file mode 100644
index 574f62ec49a..00000000000
--- a/main/font-bh-lucidatypewriter-100dpi/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-bh-lucidatypewriter-100dpi
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="X.Org Bigelow & Holmes Lucida bitmap fonts"
-url="http://xorg.freedesktop.org/"
-arch="noarch"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="font-util-dev font-util bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
-		MKFONTDIR=: \
-		MKFONTSCALE=: \
-		FCCACHE=: \
-		install || return 1
-}
-
-sha512sums="1862003c20aa7709ea07487a4326c619e2beb33b7069d644f438d64182b41a06039c69e2867921b4d12939612a4b8e1e1727fd15851aeab9a0361060183e3b0f  font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2"
diff --git a/main/font-bh-lucidatypewriter-75dpi/APKBUILD b/main/font-bh-lucidatypewriter-75dpi/APKBUILD
deleted file mode 100644
index c13fb03e2dd..00000000000
--- a/main/font-bh-lucidatypewriter-75dpi/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-bh-lucidatypewriter-75dpi
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="X.Org Bigelow & Holmes Lucida bitmap fonts"
-url="http://xorg.freedesktop.org/"
-arch="noarch"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="font-util-dev font-util bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
-		MKFONTDIR=: \
-		MKFONTSCALE=: \
-		FCCACHE=: \
-		install || return 1
-}
-
-sha512sums="2bba19c10df8e95f95d59d5fc7c15380c91a5140b0fa490497dbdf78a5574adae06a5566941c8c61e4a9850712fc9ca16974173aeee771f41976f472f0a2de13  font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2"
diff --git a/main/font-bh-ttf/APKBUILD b/main/font-bh-ttf/APKBUILD
deleted file mode 100644
index d4d906528e0..00000000000
--- a/main/font-bh-ttf/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-bh-ttf
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="X.org bh TTF fonts"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/TTF \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make -j1 DESTDIR="$pkgdir" \
-		MKFONTDIR=: \
-		MKFONTSCALE=: \
-		FCCACHE=: \
-		install || return 1
-}
-
-sha512sums="36b5b6bbc2894cd90a372e8131281a462b42d503be3e9af8565edbcd954b336690aa86a0b6fb162d865ba71b65669c5b911658c5b820effcea39d086d485be25  font-bh-ttf-1.0.3.tar.bz2"
diff --git a/main/font-bh-type1/APKBUILD b/main/font-bh-type1/APKBUILD
deleted file mode 100644
index 583d988532c..00000000000
--- a/main/font-bh-type1/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-bh-type1
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="X.org bh Type1 fonts"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Type1 \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
-		MKFONTDIR=: \
-		MKFONTSCALE=: \
-		FCCACHE=: \
-		install || return 1
-}
-
-sha512sums="dc6cfe7d78a549ae5368ddd2bb3edc6746648b32e1f22bce87f6adc0845ef4827cd3b2472d0afa17a16a2c384e84f74f1c7d807510798bc69089920fdc5486da  font-bh-type1-1.0.3.tar.bz2"
diff --git a/main/font-bitstream-100dpi/APKBUILD b/main/font-bitstream-100dpi/APKBUILD
index e4e65428032..5a5dcb2bd71 100644
--- a/main/font-bitstream-100dpi/APKBUILD
+++ b/main/font-bitstream-100dpi/APKBUILD
@@ -1,40 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bitstream-100dpi
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.4
+pkgrel=2
 pkgdesc="X.Org Bitstream bitmap fonts"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
+license="MIT"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-bitstream-100dpi-$pkgver.tar.xz"
+subpackages="$pkgname-doc"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/100dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/100dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha512sums="10fd920d46d2cb1b314e8c2f05c202e9ffa74a4e5315f34790eba8bd8fcda865a6932eb712a7538624e69367647bcd6891e7015099e65463aeef772d0ba58bfd  font-bitstream-100dpi-1.0.3.tar.bz2"
+sha512sums="
+1389681eee8b9e2bbfe0293b0aa1add7c6fa86149ff3cb779195ddcc548b1a519336c2d43b6988c899dc09d44ca30de9ffb5daca24fc3906694ab0fd391eb437  font-bitstream-100dpi-1.0.4.tar.xz
+"
diff --git a/main/font-bitstream-75dpi/APKBUILD b/main/font-bitstream-75dpi/APKBUILD
index cd91e62fbdf..e8332a0605d 100644
--- a/main/font-bitstream-75dpi/APKBUILD
+++ b/main/font-bitstream-75dpi/APKBUILD
@@ -1,40 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bitstream-75dpi
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.4
+pkgrel=2
 pkgdesc="X.Org Bitstream bitmap fonts"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
+license="MIT"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-bitstream-75dpi-$pkgver.tar.xz"
+subpackages="$pkgname-doc"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/75dpi \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/75dpi
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha512sums="9311a5b0cbe1613aca87fdf7fd9ab263eb1129e3c3eacbce54547f2185e151fb1237128b1b6d39f716f28694a486909564ecc9a0aef061438622d11b5661d650  font-bitstream-75dpi-1.0.3.tar.bz2"
+sha512sums="
+d678c58493696b3a744878991838b329243e5ba7985b1a435b62e9b1a05b5609d0b66d5943d840479ce2c5fc1da1b0633c33f28e3613712d26802fc41ee22c22  font-bitstream-75dpi-1.0.4.tar.xz
+"
diff --git a/main/font-bitstream-speedo/APKBUILD b/main/font-bitstream-speedo/APKBUILD
deleted file mode 100644
index 5cc23a9ef5a..00000000000
--- a/main/font-bitstream-speedo/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-bitstream-speedo
-pkgver=1.0.2
-pkgrel=0
-pkgdesc="X.org bitstream Speedo fonts"
-url="http://xorg.freedesktop.org/"
-arch="noarch"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Speedo \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make -j1 DESTDIR="$pkgdir" MKFONTDIR=: MKFONTSCALE=: install || return 1
-}
-
-sha512sums="78816cc0dd0c9ba3f1de6ba39754bdf19253fea3583ef1bf459ead4b74f2587bc38bbc0bfdc5066a8055c1c45091e44987f6d15e98b6cf4ee18f60c2431349fb  font-bitstream-speedo-1.0.2.tar.bz2"
diff --git a/main/font-bitstream-type1/APKBUILD b/main/font-bitstream-type1/APKBUILD
index 4af564b6a34..dcb64fa0ecb 100644
--- a/main/font-bitstream-type1/APKBUILD
+++ b/main/font-bitstream-type1/APKBUILD
@@ -1,40 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-bitstream-type1
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.4
+pkgrel=2
 pkgdesc="X.org bitstream Type1 fonts"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
+license="Bitstream-Charter"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-bitstream-type1-$pkgver.tar.xz"
+subpackages="$pkgname-doc"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Type1 \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/Type1
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha512sums="71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61  font-bitstream-type1-1.0.3.tar.bz2"
+sha512sums="
+f09d60abb88c9be6227c57f5519f08e5e3c59c916183d32a512d3c2ace0047eaad2b377c3725c8987e8b4c55468eb7821322ff5447f000d4c2be6cb909f6219b  font-bitstream-type1-1.0.4.tar.xz
+"
diff --git a/main/font-cantarell/APKBUILD b/main/font-cantarell/APKBUILD
new file mode 100644
index 00000000000..f001461be26
--- /dev/null
+++ b/main/font-cantarell/APKBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
+pkgname=font-cantarell
+pkgver=0.303.1
+pkgrel=2
+pkgdesc="Humanist sans-serif font designed for on-screen reading"
+url="https://wiki.gnome.org/Projects/CantarellFonts"
+arch="noarch"
+license="OFL-1.1 AND Apache-2.0"
+makedepends="meson gettext-dev"
+source="https://download.gnome.org/sources/cantarell-fonts/${pkgver%.*}/cantarell-fonts-$pkgver.tar.xz"
+builddir="$srcdir/cantarell-fonts-$pkgver"
+
+# it's just data, no testsuites
+options="!check"
+
+# backwards compat (<3.17)
+provides="ttf-cantarell=$pkgver-r$pkgrel"
+replaces="ttf-cantarell"
+
+build() {
+	abuild-meson \
+		-Duseprebuilt=true \
+		build
+	meson compile -C build
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C build
+}
+
+sha512sums="
+f61c2df6bb04167a9623bac141773211486059a5569106c0ed096d6d1a5d57e599cc5b75b06be954859aef13c649f7617ae067d9936932faec0b2ce896fd31b5  cantarell-fonts-0.303.1.tar.xz
+"
diff --git a/main/font-cronyx-cyrillic/APKBUILD b/main/font-cronyx-cyrillic/APKBUILD
index 95610eef63e..13ed2f39927 100644
--- a/main/font-cronyx-cyrillic/APKBUILD
+++ b/main/font-cronyx-cyrillic/APKBUILD
@@ -1,40 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-cronyx-cyrillic
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="X.org cronyx cyrillic fonts"
-url="http://xorg.freedesktop.org/"
-arch="all"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
 license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-cronyx-cyrillic-$pkgver.tar.xz"
+subpackages="$pkgname-doc"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/cyrillic \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/cyrillic
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha512sums="b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456  font-cronyx-cyrillic-1.0.3.tar.bz2"
+sha512sums="
+39c0bfc08ac746fd98a668d7545da503e8413d5d66cdb1884489ed7221fa4f09dad8dc997ca39595113e2f12fd65de6d2bfd8eaf1480aa93d5eb961d2e2f7cff  font-cronyx-cyrillic-1.0.4.tar.xz
+"
diff --git a/main/font-cursor-misc/APKBUILD b/main/font-cursor-misc/APKBUILD
index 5c31009e73e..fef37cdf6e7 100644
--- a/main/font-cursor-misc/APKBUILD
+++ b/main/font-cursor-misc/APKBUILD
@@ -1,25 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-cursor-misc
-pkgver=1.0.3
+pkgver=1.0.4
 pkgrel=1
 pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="noarch"
-license="custom"
+license="Public Domain"
 options="!check"  # No test suite.
-depends="encodings font-alias mkfontscale mkfontdir fontconfig util-macros"
+depends="encodings font-alias mkfontscale fontconfig util-macros"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-}
+source="https://www.x.org/releases/individual/font/font-cursor-misc-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,12 +21,13 @@ build() {
 }
 
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
 		install
 }
 
-sha512sums="7ecb7f1c3c11da8b81fc0ff121fa6c1026b11f6c7878ffd0e4959df036511bc579d6b0552422ce13e26a8d188e3406631d2de55cab6b29bc7fce0416a8cffc83  font-cursor-misc-1.0.3.tar.bz2"
+sha512sums="
+22bd86a81cdfb1e17f885dc3961071c08920171a6f0736ae52d95c8e576b1debc7570aa3b7e1007f474b50435fba411f0eb1847894e8b52f6e6268d91cf9f2db  font-cursor-misc-1.0.4.tar.xz
+"
diff --git a/main/font-daewoo-misc/APKBUILD b/main/font-daewoo-misc/APKBUILD
deleted file mode 100644
index 9e9389c114d..00000000000
--- a/main/font-daewoo-misc/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-daewoo-misc
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
-		MKFONTDIR=: \
-		MKFONTSCALE=: \
-		FCCACHE=: \
-		install || return 1
-}
-
-sha512sums="7e97bc580f66a1316e366617d34e1dbefd576b47b9373ef34833aaaf2fdefc50befc2add5f038915db0b45fbdd56b77304a8a980bb72726479d429085c406f06  font-daewoo-misc-1.0.3.tar.bz2"
diff --git a/main/font-dec-misc/APKBUILD b/main/font-dec-misc/APKBUILD
index cfcef8d2e1a..8bd41732a4b 100644
--- a/main/font-dec-misc/APKBUILD
+++ b/main/font-dec-misc/APKBUILD
@@ -1,40 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-dec-misc
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
+license="HPND-sell-variant"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-dec-misc-$pkgver.tar.xz"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/misc
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
-sha512sums="af755d51c4c59cdbe5d3dccf37990bc787373958feb984bb037c8d8aba8a0eb410965a3600886b5123d89e85e1ea0498b84dfa384fccbbcbcaf3549b83c839c6  font-dec-misc-1.0.3.tar.bz2"
+sha512sums="
+bf6c0e4924835346f1f7913a04fa3903a7c55d292317526dd8eaa799dfb3b52eb2157c34692d659b41a18123af8389785dcb4aa0c31fc387cb368642801c3335  font-dec-misc-1.0.4.tar.xz
+"
diff --git a/main/ttf-dejavu/45-dejavu.conf b/main/font-dejavu/45-dejavu.conf
index a5c3d9d3d50..a5c3d9d3d50 100644
--- a/main/ttf-dejavu/45-dejavu.conf
+++ b/main/font-dejavu/45-dejavu.conf
diff --git a/main/ttf-dejavu/90-tt-dejavu.conf b/main/font-dejavu/90-tt-dejavu.conf
index c722d396748..c722d396748 100644
--- a/main/ttf-dejavu/90-tt-dejavu.conf
+++ b/main/font-dejavu/90-tt-dejavu.conf
diff --git a/main/font-dejavu/APKBUILD b/main/font-dejavu/APKBUILD
new file mode 100644
index 00000000000..d622a871a90
--- /dev/null
+++ b/main/font-dejavu/APKBUILD
@@ -0,0 +1,50 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-dejavu
+pkgver=2.37
+pkgrel=5
+pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters"
+url="https://dejavu-fonts.github.io/"
+arch="noarch"
+license="Bitstream-Vera"
+options="!check"
+depends="fontconfig encodings mkfontscale"
+makedepends="font-util-dev"
+# added fontconfig configuration from:
+# https://github.com/bohoomil/fontconfig-ultimate/tree/master/fontconfig_patches/fonts-settings
+source="https://downloads.sourceforge.net/project/dejavu/dejavu/$pkgver/dejavu-fonts-ttf-$pkgver.tar.bz2
+	https://downloads.sourceforge.net/project/dejavu/dejavu/$pkgver/dejavu-lgc-fonts-ttf-$pkgver.tar.bz2
+	45-dejavu.conf
+	90-tt-dejavu.conf
+	"
+builddir="$srcdir"
+
+# backwards compat (<3.17)
+provides="ttf-dejavu=$pkgver-r$pkgrel"
+replaces="ttf-dejavu"
+
+package() {
+	mkdir -p	"$pkgdir"/etc/fonts/conf.d
+
+	install -Dm644 \
+		dejavu-fonts-ttf-$pkgver/ttf/*.ttf \
+		-t "$pkgdir"/usr/share/fonts/dejavu
+
+	install -Dm644 \
+		"$srcdir"/dejavu-fonts-ttf-$pkgver/fontconfig/*.conf \
+		"$srcdir"/dejavu-lgc-fonts-ttf-$pkgver/fontconfig/*.conf \
+		-t "$pkgdir"/etc/fonts/conf.avail/
+
+	cd "$pkgdir"/etc/fonts/conf.d
+	local j
+	for j in "$srcdir"/*.conf; do
+		install -Dm644 "$j" -t "$pkgdir"/etc/fonts/conf.avail/
+		ln -sf /etc/fonts/conf.avail/${j##*/}
+	done
+}
+
+sha512sums="
+bafa39321021097432777f0825d700190c23f917d754a4504722cd8946716c22c083836294dab7f3ae7cf20af63c4d0944f3423bf4aa25dbca562d1f30e00654  dejavu-fonts-ttf-2.37.tar.bz2
+4bf36813b4143a482a50ee20377166cbc22e3aa62ccb453fe6ce27d2286acaf2b6f06759eb5d5000d2f868a7d93ecad851ad29de60fb531ed9ac2fcd7b9bdc1f  dejavu-lgc-fonts-ttf-2.37.tar.bz2
+df82fea7ad6c58edcc20c960fd2de9d49c70e23f9e63180b063c848a6f0d5592e2ce31dc0dc4a0b5abc8e682393c827c96b4a9da9203974672ebd3a77e5b9fc3  45-dejavu.conf
+bc12705369050739143eda6a2dadaada954112ea262bd297a4823b31861f3da0f61e17ad6fb61226caea16323c3bc9cd88e8b0e60f61b2af6d245af885a4399c  90-tt-dejavu.conf
+"
diff --git a/main/ttf-droid/45-droid.conf b/main/font-droid/45-droid.conf
index 12749e0fb4e..12749e0fb4e 100644
--- a/main/ttf-droid/45-droid.conf
+++ b/main/font-droid/45-droid.conf
diff --git a/main/ttf-droid/65-ttf-droid-sans.conf b/main/font-droid/65-ttf-droid-sans.conf
index afddabeeb8a..afddabeeb8a 100644
--- a/main/ttf-droid/65-ttf-droid-sans.conf
+++ b/main/font-droid/65-ttf-droid-sans.conf
diff --git a/main/ttf-droid/65-ttf-droid-serif.conf b/main/font-droid/65-ttf-droid-serif.conf
index 594af8c26af..594af8c26af 100644
--- a/main/ttf-droid/65-ttf-droid-serif.conf
+++ b/main/font-droid/65-ttf-droid-serif.conf
diff --git a/main/ttf-droid/90-tt-droid.conf b/main/font-droid/90-tt-droid.conf
index 50388866b46..50388866b46 100644
--- a/main/ttf-droid/90-tt-droid.conf
+++ b/main/font-droid/90-tt-droid.conf
diff --git a/main/font-droid/APKBUILD b/main/font-droid/APKBUILD
new file mode 100644
index 00000000000..caa6f884c84
--- /dev/null
+++ b/main/font-droid/APKBUILD
@@ -0,0 +1,77 @@
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer:
+pkgname=font-droid
+pkgver=20200215
+pkgrel=2
+pkgdesc="General-purpose fonts released by Google as part of Android."
+url="https://code.google.com/android/"
+arch="noarch"
+license="Apache-2.0"
+depends="fontconfig"
+subpackages="$pkgname-nonlatin"
+# added fontconfig configuration from:
+# https://github.com/bohoomil/fontconfig-ultimate/tree/master/fontconfig_patches/fonts-settings
+source="https://dev.alpinelinux.org/archive/android-fonts/android-fonts-4.2.2_r1.2.tar.gz
+	https://www.cosmix.org/software/files/DroidSansMonoSlashed.zip
+	https://www.cosmix.org/software/files/DroidSansMonoDotted.zip
+	45-droid.conf
+	65-ttf-droid-sans.conf
+	65-ttf-droid-serif.conf
+	90-tt-droid.conf
+	"
+builddir="$srcdir"
+options="!check" # no tests
+
+# backwards compat (<3.17)
+provides="ttf-droid=$pkgver-r$pkgrel"
+replaces="ttf-droid"
+
+package() {
+	mkdir	-p "$pkgdir"/etc/fonts/conf.d
+
+	local fonts="DroidSerif-Bold.ttf DroidSerif-BoldItalic.ttf
+		DroidSerif-Italic.ttf DroidSerif-Regular.ttf DroidSans-Bold.ttf
+		DroidSans.ttf DroidSansMono.ttf"
+
+	for i in $fonts; do
+		install -Dm644 "$srcdir"/"$i" \
+			-t "$pkgdir"/usr/share/fonts/droid/
+	done
+
+	for j in "$srcdir"/*.conf; do
+		install -Dm644 "$j" \
+			-t "$pkgdir"/etc/fonts/conf.avail/
+		cd "$pkgdir"/etc/fonts/conf.d
+		ln -sf /etc/fonts/conf.avail/${j##*/}
+	done
+}
+
+nonlatin() {
+	pkgdesc="General-purpose fonts released by Google as part of Android. Non-Latin language support"
+	depends="fontconfig"
+	local fonts="DroidKufi-Bold.ttf DroidKufi-Regular.ttf DroidNaskh-Bold.ttf
+		DroidNaskh-Regular-SystemUI.ttf DroidNaskh-Regular.ttf
+		DroidSansArabic.ttf DroidSansArmenian.ttf
+		DroidSansDevanagari-Regular.ttf DroidSansEthiopic-Bold.ttf
+		DroidSansEthiopic-Regular.ttf DroidSansFallback.ttf
+		DroidSansFallbackFull.ttf DroidSansFallbackLegacy.ttf
+		DroidSansGeorgian.ttf DroidSansHebrew-Bold.ttf
+		DroidSansHebrew-Regular.ttf DroidSansJapanese.ttf
+		DroidSansTamil-Bold.ttf DroidSansTamil-Regular.ttf
+		DroidSansThai.ttf"
+
+	for k in $fonts; do
+		install -Dm644 "$srcdir"/"$k" \
+			-t "$subpkgdir"/usr/share/fonts/droid-nonlatin/
+	done
+}
+
+sha512sums="
+63ebea1be1dc1335ccc019b7d72aa54376985a93a0ce83a0c496895a77974c3ba440bf9a4d7196aa1c9d82b967895587ee5512ca7a74370e92fbe913778f974a  android-fonts-4.2.2_r1.2.tar.gz
+e279c650e18f5e3db462c016fd93516442e5bfbe92580e51b6759cfc19e3f81fbd7e262b1a521ecce6c5c4aa3c8e0687d3b00e1ecb46784a090b9fd92d01aa25  DroidSansMonoSlashed.zip
+cc891348632480dbf52f1d515059416bddf8433103904e4e6954b52089f7b736ed6b2c917d0f4d3f32348805a939aea1e5e014271c6aaf672c5800021039ffe3  DroidSansMonoDotted.zip
+96ddb50da19f4219544384417f9b8491e3e02ee1d922f475b2bcf13c38256d5ae0fc10b81e4d10ad0b6553430bf156e82ca2a7811b8e2a9c92bde2058e85c517  45-droid.conf
+07d4ab208c1c1dd4fe04f113daa5cb6361cf042eedade643f714b91ab77d3e1fa39f72db7b63cfcb8b69343e2f258920206d0f2ba204574f57292088e3a6e126  65-ttf-droid-sans.conf
+5257da5537202e742afb168dda000b41873cde45e49807546c3c09aca92fe2c83264a19c2f1835e449ef9c943bf0fdfa1d4020ec93d9b4ff9e505dc4cb7e2464  65-ttf-droid-serif.conf
+5ab9cb21e871be887060620061bafaf826cafca71fac8f58d6e63ea5be3af282ab138fbecc38ca3d4c48d58720bec407e179f804747b6c35c69b825d06ef035a  90-tt-droid.conf
+"
diff --git a/main/font-freefont/APKBUILD b/main/font-freefont/APKBUILD
new file mode 100644
index 00000000000..505725f4dad
--- /dev/null
+++ b/main/font-freefont/APKBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-freefont
+pkgver=20120503
+pkgrel=4
+pkgdesc="A set of free high-quality TrueType fonts covering the UCS character set"
+url="https://nongnu.org/freefont/"
+arch="noarch"
+license="GPL-3.0-or-later"
+options="!check" # No test suite.
+depends="fontconfig encodings mkfontscale"
+subpackages="$pkgname-doc"
+source="https://ftp.gnu.org/gnu/freefont/freefont-otf-$pkgver.tar.gz"
+builddir="$srcdir/freefont-$pkgver"
+
+# backwards compat (<3.17)
+provides="ttf-freefont=$pkgver-r$pkgrel"
+replaces="ttf-freefont"
+
+package() {
+	install -Dm644 ./*.otf -t "$pkgdir"/usr/share/fonts/freefont/
+	# Licensing exception is discussed in README in pkgver==20120503
+	install -Dm644 README "$pkgdir/usr/share/licenses/$pkgname/README"
+}
+
+sha512sums="
+cee9a573b17ccc689b61f0925fb6624d58e3a3369d996e379e70c3a4cd750429d68c14c85fbcab4381101c8f4bf56730ef40e0045fdd79647019db41b4ec74fd  freefont-otf-20120503.tar.gz
+"
diff --git a/main/font-ibm-type1/APKBUILD b/main/font-ibm-type1/APKBUILD
index d5073a3311f..ec02aaff988 100644
--- a/main/font-ibm-type1/APKBUILD
+++ b/main/font-ibm-type1/APKBUILD
@@ -1,40 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-ibm-type1
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="X.org ibm Type1 fonts"
-url="http://xorg.freedesktop.org/"
-arch="all"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
 license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-ibm-type1-$pkgver.tar.xz"
+subpackages="$pkgname-doc"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Type1 \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/Type1
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha512sums="cbd179522c936c4f956ff1fbdc48fc3a55990083b4f858c938c6a54c8526641b4f25eb3a6795d774630b75a0f4fbdf9c16e861e88b2cd95f04c524f95d40f90f  font-ibm-type1-1.0.3.tar.bz2"
+sha512sums="
+42ebc9f1b0726a9a1bf3d7c8a3b7102a448e7c6ff0c5ac1dd8a4861bf51c344ddb2e077df41b86e3e896100371a33f997d6df834b4d64b835d81a36dfddfbce3  font-ibm-type1-1.0.4.tar.xz
+"
diff --git a/main/font-isas-misc/APKBUILD b/main/font-isas-misc/APKBUILD
index 4b0850f0905..41cd37bd472 100644
--- a/main/font-isas-misc/APKBUILD
+++ b/main/font-isas-misc/APKBUILD
@@ -1,40 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-isas-misc
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-arch="all"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
 license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-isas-misc-$pkgver.tar.xz"
+subpackages="$pkgname-doc"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
 		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha512sums="be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b  font-isas-misc-1.0.3.tar.bz2"
+sha512sums="
+7c8cc9083600949fff4a0373f9f22df80f6a2c97d8d56bc2c4d03b102d16ad071b984b1ecf547d2d17ede9335e5c3a418512631a18938b7728c66b4339dcedd5  font-isas-misc-1.0.4.tar.xz
+"
diff --git a/main/font-jis-misc/APKBUILD b/main/font-jis-misc/APKBUILD
index 6a6c0acce6b..b322bb18c26 100644
--- a/main/font-jis-misc/APKBUILD
+++ b/main/font-jis-misc/APKBUILD
@@ -1,39 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-jis-misc
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-arch="all"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
 license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-jis-misc-$pkgver.tar.xz"
+subpackages="$pkgname-doc"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/misc
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
-sha512sums="3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c  font-jis-misc-1.0.3.tar.bz2"
+
+sha512sums="
+c54034205e7bd7a01b311c25c890f9fd1abc25f842315812d5c83d4e4091e5e6c2125a43d4d532b88c79d51cb812b86cfa8e7e4c1a87175746f1bd4e38129440  font-jis-misc-1.0.4.tar.xz
+"
diff --git a/main/ttf-liberation/30-liberation-sans-narrow.conf b/main/font-liberation-sans-narrow/30-liberation-sans-narrow.conf
index 9879b2fe933..770aad41ecc 100644
--- a/main/ttf-liberation/30-liberation-sans-narrow.conf
+++ b/main/font-liberation-sans-narrow/30-liberation-sans-narrow.conf
@@ -9,6 +9,7 @@
       <family>Liberation Sans Narrow</family>
     </accept>
   </alias>
+
   <alias binding="same">
     <family>Liberation Sans Narrow</family>
     <default>
diff --git a/main/font-liberation-sans-narrow/45-liberation-sans-narrow.conf b/main/font-liberation-sans-narrow/45-liberation-sans-narrow.conf
new file mode 100644
index 00000000000..570a86f564d
--- /dev/null
+++ b/main/font-liberation-sans-narrow/45-liberation-sans-narrow.conf
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>Liberation Sans Narrow</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/main/font-liberation-sans-narrow/90-liberation-sans-narrow.conf b/main/font-liberation-sans-narrow/90-liberation-sans-narrow.conf
new file mode 100644
index 00000000000..1f553b65e9e
--- /dev/null
+++ b/main/font-liberation-sans-narrow/90-liberation-sans-narrow.conf
@@ -0,0 +1,24 @@
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+<fontconfig>
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Liberation Sans Narrow</string>
+    </test>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintslight</const>
+    </edit>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+  </match>
+</fontconfig>
diff --git a/main/font-liberation-sans-narrow/APKBUILD b/main/font-liberation-sans-narrow/APKBUILD
new file mode 100644
index 00000000000..e477c69dc9a
--- /dev/null
+++ b/main/font-liberation-sans-narrow/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=font-liberation-sans-narrow
+_fontname=${pkgname#font-}
+pkgver=1.07.6
+pkgrel=2
+pkgdesc="Sans-serif Narrow fonts to replace commonly used Microsoft Arial Narrow"
+url="https://github.com/liberationfonts/liberation-sans-narrow"
+license="GPL-2.0-or-later"
+arch="noarch"
+depends="fontconfig"
+replaces="ttf-liberation<2.1.5"  # for backward compatibility (Alpine <3.16)
+options="!check"
+# added fontconfig configuration from:
+# https://github.com/bohoomil/fontconfig-ultimate/tree/master/fontconfig_patches/fonts-settings
+source="https://github.com/liberationfonts/liberation-sans-narrow/files/2579431/liberation-narrow-fonts-ttf-$pkgver.tar.gz
+	30-$_fontname.conf
+	45-$_fontname.conf
+	90-$_fontname.conf
+	"
+builddir="$srcdir/liberation-narrow-fonts-ttf-$pkgver"
+
+package() {
+	install -D -m644 ./*.ttf -t "$pkgdir"/usr/share/fonts/$_fontname/
+	install -D -m644 License.txt -t "$pkgdir"/usr/share/licenses/$pkgname/
+
+	mkdir -p "$pkgdir"/etc/fonts/conf.d
+
+	local i; for i in "$srcdir"/*.conf; do
+		install -D -m644 "$i" -t "$pkgdir"/etc/fonts/conf.avail/
+		ln -s ../conf.avail/${i##*/} "$pkgdir"/etc/fonts/conf.d/${i##*/}
+	done
+}
+
+sha512sums="
+bea2b8af3eaf32cc57faf1a582fdbef0ba3f2d5c2d9615f3c83c6b5aaac37856a25147cab26c3b18c3dca1b109b2a853874f5876dd6ae614676db3118f1bb804  liberation-narrow-fonts-ttf-1.07.6.tar.gz
+a79487aa5f265ffa2660c252227706341485776b5fbc8419bf902a5110faea225f35a0dabed698ae50c0d0d50dd170aceadf158bd5ba9300b9a08fb3539a04d4  30-liberation-sans-narrow.conf
+a2a0b95c2836c61d620246d6ff945941c04e16d05d6991a7d01abf2cd15a5723d57a70371a392f92074a70e120cea5326c0ef2c4af73bd57c7d3f864047e440b  45-liberation-sans-narrow.conf
+efc095a4c9aa9a54eb50cc1110ae99ccb92a67a82b69ca1d000ce1b90ba076b3757d81ce73ea853a46bbc958cc8770b6d7947caa175a42513b97707f45daab69  90-liberation-sans-narrow.conf
+"
diff --git a/main/ttf-liberation/30-liberation-mono.conf b/main/font-liberation/30-liberation-mono.conf
index 7cab4348148..7cab4348148 100644
--- a/main/ttf-liberation/30-liberation-mono.conf
+++ b/main/font-liberation/30-liberation-mono.conf
diff --git a/main/ttf-liberation/30-liberation-sans.conf b/main/font-liberation/30-liberation-sans.conf
index 648974a3834..648974a3834 100644
--- a/main/ttf-liberation/30-liberation-sans.conf
+++ b/main/font-liberation/30-liberation-sans.conf
diff --git a/main/ttf-liberation/30-liberation-serif.conf b/main/font-liberation/30-liberation-serif.conf
index dac6a60520c..dac6a60520c 100644
--- a/main/ttf-liberation/30-liberation-serif.conf
+++ b/main/font-liberation/30-liberation-serif.conf
diff --git a/main/ttf-liberation/45-liberation.conf b/main/font-liberation/45-liberation.conf
index ab98431bfd7..4c41678316e 100644
--- a/main/ttf-liberation/45-liberation.conf
+++ b/main/font-liberation/45-liberation.conf
@@ -17,13 +17,6 @@
   </alias>
 
   <alias>
-    <family>Liberation Sans Narrow</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-
-  <alias>
     <family>Liberation Serif</family>
     <default>
       <family>serif</family>
diff --git a/main/font-liberation/90-liberation.conf b/main/font-liberation/90-liberation.conf
new file mode 100644
index 00000000000..6c7736dbd71
--- /dev/null
+++ b/main/font-liberation/90-liberation.conf
@@ -0,0 +1,191 @@
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+<fontconfig>
+
+  <!-- Liberation Mono -->
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Liberation Mono</string>
+    </test>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintslight</const>
+    </edit>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+  </match>
+
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Liberation Mono</string>
+    </test>
+    <test name="pixelsize" compare="more">
+      <double>10.5</double>
+    </test>
+    <test name="pixelsize" compare="less">
+      <double>13.5</double>
+    </test>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintfull</const>
+    </edit>
+  </match>
+
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Liberation Mono</string>
+    </test>
+    <test name="pixelsize" compare="more">
+      <double>15.5</double>
+    </test>
+    <test name="pixelsize" compare="less">
+      <double>17.5</double>
+    </test>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintfull</const>
+    </edit>
+  </match>
+
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Liberation Mono</string>
+    </test>
+    <test name="pixelsize" compare="more">
+      <double>19.5</double>
+    </test>
+    <test name="pixelsize" compare="less">
+      <double>22.5</double>
+    </test>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintfull</const>
+    </edit>
+  </match>
+
+  <match target="font">
+    <test name="family">
+      <string>Liberation Mono</string>
+    </test>
+    <test name="pixelsize" compare="less_eq">
+      <double>12.0</double>
+    </test>
+    <edit name="lcd_filter" mode="assign">
+      <const>lcdlegacy</const>
+    </edit>
+  </match>
+
+  <!-- Liberation Sans -->
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Liberation Sans</string>
+    </test>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintslight</const>
+    </edit>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+  </match>
+
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Liberation Sans</string>
+    </test>
+    <test name="pixelsize" compare="less">
+      <double>12.5</double>
+    </test>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintfull</const>
+    </edit>
+    <edit name="lcd_filter" mode="assign">
+      <const>lcdlegacy</const>
+    </edit>
+  </match>
+
+  <!-- Liberation Serif -->
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Liberation Serif</string>
+    </test>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintslight</const>
+    </edit>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+  </match>
+
+</fontconfig>
diff --git a/main/font-liberation/APKBUILD b/main/font-liberation/APKBUILD
new file mode 100644
index 00000000000..397294b8eaf
--- /dev/null
+++ b/main/font-liberation/APKBUILD
@@ -0,0 +1,54 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-liberation
+_fontname=${pkgname#font-}
+pkgver=2.1.5
+pkgrel=2
+pkgdesc="Fonts to replace commonly used Microsoft Windows fonts"
+url="https://github.com/liberationfonts/liberation-fonts"
+license="OFL-1.1"
+arch="noarch"
+depends="fontconfig"
+replaces="ttf-liberation<2.1.5"  # for backward compatibility (Alpine <3.16)
+provides="font-times"
+provider_priority=10
+options="!check"
+subpackages="ttf-liberation:_ttf_liberation:noarch"
+# added fontconfig configuration from:
+# https://github.com/bohoomil/fontconfig-ultimate/tree/master/fontconfig_patches/fonts-settings
+source="https://github.com/liberationfonts/liberation-fonts/files/7261482/liberation-fonts-ttf-$pkgver.tar.gz
+	30-$_fontname-mono.conf
+	30-$_fontname-sans.conf
+	30-$_fontname-serif.conf
+	45-$_fontname.conf
+	90-$_fontname.conf
+	"
+builddir="$srcdir/liberation-fonts-ttf-$pkgver"
+
+package() {
+	install -D -m644 ./*.ttf -t "$pkgdir"/usr/share/fonts/$_fontname/
+
+	mkdir -p "$pkgdir"/etc/fonts/conf.d
+
+	local i; for i in "$srcdir"/*.conf; do
+		install -D -m644 "$i" -t "$pkgdir"/etc/fonts/conf.avail/
+		ln -s ../conf.avail/${i##*/} "$pkgdir"/etc/fonts/conf.d/${i##*/}
+	done
+}
+
+# For backward compatibility with Alpine <3.16.
+_ttf_liberation() {
+	pkgdesc="Deprecated name for font-liberation and font-liberation-sans-narrow"
+	depends="$pkgname=$pkgver-r$pkgrel font-liberation-sans-narrow"
+
+	mkdir -p "$subpkgdir"
+}
+
+sha512sums="
+b9f178fae43c9214ba6de36c6da613fcf59bd98084058afaaa9151d00f2406942bc360430be0a8f35ea6b5529146eef371c7cf75bdd7910403d449254f943fed  liberation-fonts-ttf-2.1.5.tar.gz
+585b74555132098d1d89b118b92fb843471ae2882622dec16178f8e7690fe6b5d8bf46e27e59fc3324aebfbd52a4b511d2ad77a8ddf8ef319cbe89b1a2dac91a  30-liberation-mono.conf
+4983c7be59b451d9f5aec7ca0502155ca0307cc8e8e96da02de36d4b665fd45834da359131f2bc83d579e586e0f1b2158fba0036f3c7c10f6d1ff34f0407c03b  30-liberation-sans.conf
+3d54b6e92159860f16fef48e342bb46badb17d43f0f818a100e5e2fb344da77d7dc999ae35a6986dbb202d4e4423a102f4e100d6f3d67a72e604538c63e44178  30-liberation-serif.conf
+ced72651ec5d9067c659ad83455dd95f2cdad7e46841b23ac09a1514aea258cd0b3e2baced439742f7b1bd34a83f022b4e85507deec0724f28d62e12bf57b6d5  45-liberation.conf
+124d554173d13f2e3b9d4ad7cd428354cc4bb117526074608908bb3036cf06793a04ca735570126dd5a3ee9d973100f7cc02338bd9271d6dd1b65c934de88b50  90-liberation.conf
+"
diff --git a/main/font-linux-libertine/APKBUILD b/main/font-linux-libertine/APKBUILD
new file mode 100644
index 00000000000..a476f19957b
--- /dev/null
+++ b/main/font-linux-libertine/APKBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-linux-libertine
+pkgver=5.3.0
+_date="2012_07_02"
+pkgrel=3
+pkgdesc="Serif (Libertine) and Sans Serif (Biolinum) OpenType fonts with large Unicode coverage"
+url="https://linuxlibertine.sourceforge.net/"
+arch="noarch"
+license="GPL-2.0-or-later WITH Font-exception-2.0 AND OFL-1.0"
+depends="fontconfig encodings mkfontscale"
+source="https://downloads.sourceforge.net/project/linuxlibertine/linuxlibertine/$pkgver/LinLibertineTTF_${pkgver}_$_date.tgz"
+builddir="$srcdir"
+options="!check" # no tests
+
+provides="ttf-linux-libertine=$pkgver-r$pkgrel"
+replaces="ttf-linux-libertine"
+
+package() {
+	install -Dm644 *.ttf -t "$pkgdir"/usr/share/fonts/${pkgname#font-}
+}
+
+sha512sums="
+ea9af8d47d22e5f35be65fbae08c7230602a57abe6f39e9a63a5761a69e519fe4e4ac41b878764035fdf8a2c8ee855c0cb9b0077a216d8ba5a2ddf615913e273  LinLibertineTTF_5.3.0_2012_07_02.tgz
+"
diff --git a/main/font-micro-misc/APKBUILD b/main/font-micro-misc/APKBUILD
index 913a3e68777..5bda9fbed69 100644
--- a/main/font-micro-misc/APKBUILD
+++ b/main/font-micro-misc/APKBUILD
@@ -1,40 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-micro-misc
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
+license="Public Domain"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-micro-misc-$pkgver.tar.xz"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/mis
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
-sha512sums="7a546432225c22ae0aacf9ce88b617a7d1d6678ee1f5eb4b3a93e33764fb752f27bca3feda1312182517bbf7babd5f3700bb9b8de0ef6c35b1ae6e2ce7ab0b69  font-micro-misc-1.0.3.tar.bz2"
+sha512sums="
+e9a402a5042eef0b618bc30b319256cae9f71f546c167c8b638a780f93cbdc2d61c472203efaee7077acedfac3b3981feefbc1017cfee8512077e61deff42ed3  font-micro-misc-1.0.4.tar.xz
+"
diff --git a/main/font-misc-cyrillic/APKBUILD b/main/font-misc-cyrillic/APKBUILD
index 0c7d59ecb53..d9709a9e93b 100644
--- a/main/font-misc-cyrillic/APKBUILD
+++ b/main/font-misc-cyrillic/APKBUILD
@@ -1,40 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-misc-cyrillic
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="X.org misc cyrillic fonts"
-url="http://xorg.freedesktop.org/"
-arch="all"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
 license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-misc-cyrillic-$pkgver.tar.xz"
+subpackages="$pkgname-doc"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/cyrillic \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/cyrillic
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha512sums="75e49cdb633f7ce5b9612d5adb0a85471c8fde5d55e8ccd9302f79f01e99e78b02449642c2cf785289f58d833bfa62042fce4253093fb17c87471559d1f9bdbf  font-misc-cyrillic-1.0.3.tar.bz2"
+sha512sums="
+fb2102805fedbd04b1533b85abcde79f432b97b72822bcfcdc09f525488d0d0c63815c8c25b79bab864bbe11fa1b72e2c34f5ba7b96eee1b6c84b841bb333353  font-misc-cyrillic-1.0.4.tar.xz
+"
diff --git a/main/font-misc-ethiopic/APKBUILD b/main/font-misc-ethiopic/APKBUILD
index a1685b29e6c..6cc5093a940 100644
--- a/main/font-misc-ethiopic/APKBUILD
+++ b/main/font-misc-ethiopic/APKBUILD
@@ -1,42 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-misc-ethiopic
-pkgver=1.0.3
+pkgver=1.0.5
 pkgrel=0
 pkgdesc="X.org misc ethiopic fonts"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="noarch"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/ethiopic \
-		|| return 1
-	make || return 1
-}
+license="MIT"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
+source="https://www.x.org/releases/individual/font/font-misc-ethiopic-$pkgver.tar.xz"
 
 package() {
-	cd "$_builddir"
-	make -j1 DESTDIR="$pkgdir" \
-		FCCACHE=: \
-		MKFONTDIR=: \
-		MKFONTSCALE=: \
-		install || return 1
+	install -Dm644 GohaTibebZemen.otf \
+		-t "$pkgdir"/usr/share/fonts/misc-ethiopic
 }
 
-sha512sums="b3e3f7462f37216796730a894761c7d60d5ede0f51351997e6c3c92e3136c788a2710690f482d05ed1396a4b6be452e1f871febc7e5b7a1a67e43bcc1ec7c77d  font-misc-ethiopic-1.0.3.tar.bz2"
+sha512sums="
+7732a828c005e3762b6383729134c5656fd575ac59288504d047fbe26e9965a80519a37b0cc4c6b89379a85a62160c5ea76017f790447a230c015aa7a9143ba0  font-misc-ethiopic-1.0.5.tar.xz
+"
diff --git a/main/font-misc-meltho/APKBUILD b/main/font-misc-meltho/APKBUILD
deleted file mode 100644
index 88c4929d6c8..00000000000
--- a/main/font-misc-meltho/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=font-misc-meltho
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="X.org misc meltho fonts"
-url="http://xorg.freedesktop.org/"
-arch="noarch"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
-makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/meltho \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make -j1 DESTDIR="$pkgdir" \
-		FCCACHE=: \
-		MKFONTDIR=: \
-		MKFONTSCALE=: \
-		install || return 1
-}
-
-sha512sums="3f42fe3e127f74259d50754f4bb6d2560cb32d810fecf663bd09fddb34829d29b48f3cbfaf43d02dab70b559afb2f806f321076f83450ff3871604345a0cdb56  font-misc-meltho-1.0.3.tar.bz2"
diff --git a/main/font-misc-misc/APKBUILD b/main/font-misc-misc/APKBUILD
index e60fc7bdd99..c0f363ec0d2 100644
--- a/main/font-misc-misc/APKBUILD
+++ b/main/font-misc-misc/APKBUILD
@@ -1,25 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-misc-misc
-pkgver=1.1.2
+pkgver=1.1.3
 pkgrel=1
 pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="noarch"
-license="custom"
+license="Public Domain"
 options="!check"  # No test suite.
-depends="encodings font-alias mkfontscale mkfontdir fontconfig util-macros"
+depends="encodings font-alias mkfontscale fontconfig util-macros"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-}
+source="https://www.x.org/releases/individual/font/font-misc-misc-$pkgver.tar.xz"
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,8 +21,7 @@ build() {
 }
 
 package() {
-	cd "$builddir"
-	make -j1 \
+	make \
 		DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
@@ -38,4 +29,6 @@ package() {
 		install
 }
 
-sha512sums="d0bf74142f9621746846ea7a6fe9ae298a303a09c65e05c7decb4f37b2f513a88d727bf3dc5a3566c30de83b83493f164be0118b41d704464f75700b55018c74  font-misc-misc-1.1.2.tar.bz2"
+sha512sums="
+fac4bfda0e4189d1a9999abc47bdd404f2beeec5301da190d92afc2176cd344789b7223c1b2f4748bd0efe1b9a81fa7f13f7037015d5d800480fa2236f369b48  font-misc-misc-1.1.3.tar.xz
+"
diff --git a/main/font-mutt-misc/APKBUILD b/main/font-mutt-misc/APKBUILD
index 3a5560df0f5..5930b611e0a 100644
--- a/main/font-mutt-misc/APKBUILD
+++ b/main/font-mutt-misc/APKBUILD
@@ -1,40 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-mutt-misc
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-arch="all"
+pkgver=1.0.4
+pkgrel=1
+pkgdesc="X.orgmiscfont"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
 license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-mutt-misc-$pkgver.tar.xz"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/misc
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
-sha512sums="7b152f6c1464d806b1f76664d9b619858c3cb3ea63027b6be1f69897e939e3a0b5312ddf230e0a42a8f3e3701e50f41917cac6ce566c05bc74dfa49bdf2ed4db  font-mutt-misc-1.0.3.tar.bz2"
+sha512sums="
+9cbc82e6a519572576cb60f4d6b9795468666d53ac7df17d6736ab04190cb5f58c8b57be61ab509fc9372e1114c6aaa5e0d098ec1fa63dc5d8638916614f7046  font-mutt-misc-1.0.4.tar.xz
+"
diff --git a/main/font-schumacher-misc/APKBUILD b/main/font-schumacher-misc/APKBUILD
index 7b4899ac716..e1b96804498 100644
--- a/main/font-schumacher-misc/APKBUILD
+++ b/main/font-schumacher-misc/APKBUILD
@@ -1,40 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-schumacher-misc
-pkgver=1.1.2
-pkgrel=0
+pkgver=1.1.3
+pkgrel=1
 pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
+license="NTP"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-schumacher-misc-$pkgver.tar.xz"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/misc
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
-sha512sums="f37a2bfce95458b11376c89767b5adaea03dcecd7ed5b99a19a3d263f48e70b15bf679826a794c55da26b5f1635ea5fa5772ffe44c9f77a1daab0744ed92300a  font-schumacher-misc-1.1.2.tar.bz2"
+sha512sums="
+83b25495535176a5e348269358ac34af8223023a55e2c5c599725ee90ec9ff3ea9ff19cca46b93eeae7ef985da325f9065c83d829a4a8c72d0c3c197242a1b64  font-schumacher-misc-1.1.3.tar.xz
+"
diff --git a/main/font-screen-cyrillic/APKBUILD b/main/font-screen-cyrillic/APKBUILD
index 8a72a5b234f..1826e00aaf7 100644
--- a/main/font-screen-cyrillic/APKBUILD
+++ b/main/font-screen-cyrillic/APKBUILD
@@ -1,40 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-screen-cyrillic
-pkgver=1.0.4
-pkgrel=0
+pkgver=1.0.5
+pkgrel=1
 pkgdesc="X.org screen cyrillic fonts"
-url="http://xorg.freedesktop.org/"
-arch="all"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
 license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-screen-cyrillic-$pkgver.tar.xz"
+subpackages="$pkgname-doc"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/cyrillic \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/cyrillic
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha512sums="58f12a4cbd18e323daad75b32a01ab3980dca0046f8dd94ff4452606ab9316b8a208dda3bc8e9346c02993bd2b8bb2b3dfe3413ccf9fc6a907fc1ea5d236fa51  font-screen-cyrillic-1.0.4.tar.bz2"
+sha512sums="
+9f136fc6f6a3621c4b38302af5396789b1e6558b9b4b1b991624945eb9aac8497a6cd415460abc7dbcbaad1ef8ebd23cacfb3448c6e34cc9ba0726e7973c1a99  font-screen-cyrillic-1.0.5.tar.xz
+"
diff --git a/main/font-sony-misc/APKBUILD b/main/font-sony-misc/APKBUILD
index 613b4124bf3..5838fae7e0e 100644
--- a/main/font-sony-misc/APKBUILD
+++ b/main/font-sony-misc/APKBUILD
@@ -1,25 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-sony-misc
-pkgver=1.0.3
+pkgver=1.0.4
 pkgrel=1
 pkgdesc="X.org Sony fonts"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="noarch"
-license="MIT"
+license="HPND-sell-variant"
 options="!check"  # Cannot test a font.
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-}
+source="https://www.x.org/releases/individual/font/font-sony-misc-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,12 +21,13 @@ build() {
 }
 
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
 		install
 }
 
-sha512sums="c397b4e5081b2946799d701b8c48fca9fd2d55b8fa1dd96d2b29c5cd9996bb7356ae12671bf3bd964e6313bdc154020ed6377534e59ce53067e955e4b37aee1d  font-sony-misc-1.0.3.tar.bz2"
+sha512sums="
+f361fca66db2ec80b1467fb6bff57bd2cfc6722473bd7ad119026a97552eef07ff77552c01eb8f98f3299d7fd40c8c2cb3e0d0b01adca2f81c2c2f75581dc113  font-sony-misc-1.0.4.tar.xz
+"
diff --git a/main/font-sun-misc/APKBUILD b/main/font-sun-misc/APKBUILD
index 6f589b99f9f..cb9492667d9 100644
--- a/main/font-sun-misc/APKBUILD
+++ b/main/font-sun-misc/APKBUILD
@@ -1,40 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-sun-misc
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="X.org misc font"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
+license="MIT"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-sun-misc-$pkgver.tar.xz"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/misc \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/misc
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
-sha512sums="52c4a38e49a94831999652d9830da841949c319083ea40492e83690e1e5c2d31ea1979046a420af0e51bc105b8697bb06b4a438485e82b130d7469ad4519e275  font-sun-misc-1.0.3.tar.bz2"
+sha512sums="
+9eeb330c1190557479636119af8aeb49917f1faeaa42d3a93e35d318348ee4247405544107ce9f5a244dbe2c0001c8d34b604b961bd9d92431f84b992fe9739e  font-sun-misc-1.0.4.tar.xz
+"
diff --git a/main/font-terminus/APKBUILD b/main/font-terminus/APKBUILD
new file mode 100644
index 00000000000..40ff0f9bfe3
--- /dev/null
+++ b/main/font-terminus/APKBUILD
@@ -0,0 +1,50 @@
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Contributor: Orion <systmkor@gmail.com>
+# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
+pkgname=font-terminus
+pkgver=4.49.1
+pkgrel=4
+pkgdesc="Monospace bitmap font (for X11 and console)"
+url="https://terminus-font.sourceforge.net/"
+arch="noarch"
+license="OFL-1.1"
+makedepends="bdftopcf fontconfig mkfontscale python3"
+subpackages="$pkgname-doc"
+source="https://sourceforge.net/projects/terminus-font/files/terminus-font-${pkgver%.*}/terminus-font-$pkgver.tar.gz"
+builddir="$srcdir/terminus-font-$pkgver"
+options="!check" # no test suite
+
+# renamed from terminus-font
+provides="terminus-font=$pkgver-r$pkgrel"
+replaces="terminus-font"
+
+build() {
+	./configure \
+		--prefix=/usr \
+		--x11dir=/usr/share/fonts/misc \
+		--otbdir=/usr/share/fonts/misc \
+		--psfdir=/usr/share/consolefonts
+
+	make all otb
+}
+
+package() {
+	make DESTDIR="$pkgdir" install install-otb
+
+	install -d "$pkgdir"/usr/share/doc/$pkgname
+	install -Dm655 README README-BG \
+		"$pkgdir"/usr/share/doc/$pkgname/
+
+	install -Dm644 75-yes-terminus.conf \
+		"$pkgdir"/etc/fonts/conf.avail/75-yes-terminus.conf
+	install -Dm644 OFL.TXT \
+		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+	install -d "$pkgdir/etc/fonts/conf.d"
+	cd "$pkgdir/etc/fonts/conf.d"
+	ln -s ../conf.avail/75-yes-terminus.conf .
+}
+
+sha512sums="
+2e3a99960c459a453b5879bebbebeb653f0a22060177bf75c67bbeb7d32cfe1acce9e74a88fdc42e299b6dc402e0708552487abd26e80e985c7d6059b0d445a8  terminus-font-4.49.1.tar.gz
+"
diff --git a/main/font-tlwg/APKBUILD b/main/font-tlwg/APKBUILD
new file mode 100644
index 00000000000..afc464e4690
--- /dev/null
+++ b/main/font-tlwg/APKBUILD
@@ -0,0 +1,27 @@
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=font-tlwg
+pkgver=0.7.3
+pkgrel=1
+pkgdesc="The Thai TrueType fonts included here are Norasi and Garuda from the National Font project"
+url="https://linux.thai.net/projects/fonts-tlwg"
+arch="noarch"
+license="LPPL-1.3c AND GPL-2.0-only WITH Font-exception-2.0"
+options="!check" # No tests, only font files
+source="https://linux.thai.net/pub/thailinux/software/fonts-tlwg/fonts/otf-tlwg-$pkgver.tar.xz"
+builddir="$srcdir/otf-tlwg-$pkgver"
+
+# backwards compat (<3.17)
+provides="ttf-tlwg=$pkgver-r$pkgrel"
+replaces="ttf-tlwg"
+
+package() {
+	install -Dm644 ./*.otf \
+		-t "$pkgdir"/usr/share/fonts/tlwg
+	install -Dm644 fontconfig/conf.avail/*.conf \
+		-t "$pkgdir"/etc/fonts/conf.d/
+}
+
+sha512sums="
+025a122157dba56bb1058b516fabdedc4ab83024dc722dfda46bd04eb02ce5f29cf13644d91ce378590b63fb9de085745c875f4a5b8c47173e493d9bb174ac20  otf-tlwg-0.7.3.tar.xz
+"
diff --git a/main/font-unifont/APKBUILD b/main/font-unifont/APKBUILD
new file mode 100644
index 00000000000..1d7cf840e6b
--- /dev/null
+++ b/main/font-unifont/APKBUILD
@@ -0,0 +1,55 @@
+# Contributor: Breno Leitao <breno.leitao@gmail.com>
+# Maintainer: Will Sinatra <wpsinatra@gmail.com>
+pkgname=font-unifont
+pkgver=15.1.05
+pkgrel=0
+pkgdesc="GNU Unifont glyphs"
+url="https://unifoundry.com/unifont/index.html"
+arch="all"
+options="!check"  # No way to test fonts.
+license="GFDL-1.3-or-later GPL-2.0-or-later WITH Font-exception-2.0"
+subpackages="unifont-dev unifont-doc unifont-misc unifont-tools"
+source="https://unifoundry.com/pub/unifont/unifont-$pkgver/unifont-$pkgver.tar.gz"
+builddir="$srcdir/unifont-$pkgver"
+
+prepare() {
+	default_prepare
+	# clean precompiled
+	make clean
+}
+
+build() {
+	make
+}
+
+package() {
+	# renamed from unifont
+	provides="unifont=$pkgver-r$pkgrel"
+	replaces="unifont"
+
+	make PREFIX="$pkgdir/usr" install
+
+	cd "$pkgdir"/usr/share/unifont
+	rm -r html ChangeLog* INSTALL* NEWS* README* ./*.pdf
+}
+
+tools() {
+	depends="bdftopcf perl-gd"
+
+	amove usr/bin
+}
+
+doc() {
+	default_doc
+	amove usr/share/unifont/*.info.*
+}
+
+misc() {
+	pkgdesc="$pkgdesc (misc hex/bmp files)"
+
+	amove usr/share/unifont
+}
+
+sha512sums="
+ce208ac4c5ced01aabd426a5db46e25c01f8a28d840eed42ae42616e3996123fa2609ab330737b03f24d496b2cb75a69f879ccb92ee7d76b49677160332fdb8a  unifont-15.1.05.tar.gz
+"
diff --git a/main/font-util/APKBUILD b/main/font-util/APKBUILD
index 457f1e5520c..5f9c4e4c8b4 100644
--- a/main/font-util/APKBUILD
+++ b/main/font-util/APKBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-util
-pkgver=1.3.2
+pkgver=1.4.1
 pkgrel=0
 pkgdesc="X.org font utilities"
-url="http://xorg.freedesktop.org/"
+url="https://gitlab.freedesktop.org/xorg/font/util"
 arch="all"
 license="custom"
 options="!check"  # No test suite.
@@ -11,10 +11,9 @@ depends="perl"
 depends_dev="font-util"
 makedepends="$depends_dev util-macros"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://www.x.org/releases/individual/font/font-util-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/font/font-util-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,7 +23,11 @@ build() {
 }
 
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
+
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
-sha512sums="7cac529b12ae71185b89c72c1569b9826f52eeaecc1c76010338e7c42c4078ae339f18220b580bbd68fb5dc09df6ecf169a47c32e6104d8ee53bd443fa21d167  font-util-1.3.2.tar.bz2"
+
+sha512sums="
+cec7fc38ba64ca9c81c59a8395da94d71c75e14f19faf6457da0a1a8c3c1cf51bcaab227834f6f5a6d274ba2557555e542dbe2bd88e527c45ea196318bbc38d0  font-util-1.4.1.tar.xz
+"
diff --git a/main/font-vollkorn/APKBUILD b/main/font-vollkorn/APKBUILD
index 56f9fb3cb48..31488587fe4 100644
--- a/main/font-vollkorn/APKBUILD
+++ b/main/font-vollkorn/APKBUILD
@@ -1,21 +1,17 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer:  Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
 pkgname=font-vollkorn
 _pkgname=${pkgname##*-}
 pkgver=4.105
-pkgrel=0
+pkgrel=2
 pkgdesc="Vollkorn typeface by Friedrich Althausen"
 url="http://vollkorn-typeface.com/"
 arch="noarch"
-license="OFL"
+license="OFL-1.1"
 options="!check" # upstream doesn't have a test suite
 source="$pkgname-$pkgver.zip::http://vollkorn-typeface.com/download/$_pkgname-${pkgver/./-}.zip"
 builddir="$srcdir/TTF"
 
-build() {
-	return 0
-}
-
 package() {
 	mkdir -p "$pkgdir"/usr/share/fonts/$_pkgname/
 	install -m644 "$builddir"/*.ttf \
diff --git a/main/font-winitzki-cyrillic/APKBUILD b/main/font-winitzki-cyrillic/APKBUILD
index 9aa82ec715e..06204d3903a 100644
--- a/main/font-winitzki-cyrillic/APKBUILD
+++ b/main/font-winitzki-cyrillic/APKBUILD
@@ -1,40 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-winitzki-cyrillic
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="X.org winitzki cyrillic fonts"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
+license="Public Domain"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-winitzki-cyrillic-$pkgver.tar.xz"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/cyrillic \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/cyrillic
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
-sha512sums="f98fa99c1b0e60160b362310a7fe5fd5798aaa686751a6784a697c546ed754e885537eeed39a1f973dbceabc962cb65b39af1d336649381a49feb6df9f23e2b7  font-winitzki-cyrillic-1.0.3.tar.bz2"
+sha512sums="
+11e366f96abe65aed9fb6fd087b2bd90af9f60548de0cebfeb348262860957a63a997616e00092d312b8ae9c262a7bb52da69c704a27d34018a45b98a87eb158  font-winitzki-cyrillic-1.0.4.tar.xz
+"
diff --git a/main/font-xfree86-type1/APKBUILD b/main/font-xfree86-type1/APKBUILD
index d5fb5f30bb3..6b91ca48691 100644
--- a/main/font-xfree86-type1/APKBUILD
+++ b/main/font-xfree86-type1/APKBUILD
@@ -1,40 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=font-xfree86-type1
-pkgver=1.0.4
-pkgrel=0
+pkgver=1.0.5
+pkgrel=1
 pkgdesc="X.org xfree86 Type1 fonts"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-depends="encodings font-alias mkfontscale mkfontdir fontconfig"
+url="https://xorg.freedesktop.org/"
+arch="noarch"
+license="X11"
+options="!check"
+depends="encodings font-alias mkfontscale fontconfig"
 makedepends="font-util-dev bdftopcf"
-install=
-source="https://www.x.org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	update_config_sub || return 1
-}
+source="https://www.x.org/releases/individual/font/font-xfree86-type1-$pkgver.tar.xz"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-mapfiles=/usr/share/fonts/util \
-		--with-fontdir=/usr/share/fonts/Type1 \
-		|| return 1
-	make || return 1
+		--with-fontdir=/usr/share/fonts/Type1
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		MKFONTDIR=: \
 		MKFONTSCALE=: \
 		FCCACHE=: \
-		install || return 1
+		install
 }
 
-sha512sums="2b4afc6cbb7953f8ba4aab7862d16b7b988ea6a4df6de8d41c8340d35a1cd53d6fcc26479ff88189d1de9f42804e4f56d70e9dbd7e75820eab4ac6ae3a96840c  font-xfree86-type1-1.0.4.tar.bz2"
+sha512sums="
+0a92d911269c5c4d815dfb617bfcc57c3bd54e4cd308eba87f9ec49851369d99dea61950dbd6cdc0f85db92c0c24055da88063b083b4b0cafb3315051bb650ed  font-xfree86-type1-1.0.5.tar.xz
+"
diff --git a/main/fontconfig/APKBUILD b/main/fontconfig/APKBUILD
index 49ed2810620..b29b16cba21 100644
--- a/main/fontconfig/APKBUILD
+++ b/main/fontconfig/APKBUILD
@@ -1,21 +1,29 @@
 # Contributor: Mika Havela <mika.havela@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fontconfig
-pkgver=2.13.1
-pkgrel=2
+pkgver=2.15.0
+pkgrel=1
 pkgdesc="Library for configuring and customizing font access"
 url="https://www.freedesktop.org/wiki/Software/fontconfig"
 arch="all"
 license="MIT"
-makedepends="freetype-dev expat-dev python3-dev gperf util-linux-dev"
+makedepends="freetype-dev expat-dev python3-dev gperf util-linux-dev docbook2x"
+checkdepends="bash json-c-dev uuidgen curl"
 triggers="$pkgname.trigger=/usr/share/fonts/*"
-subpackages="$pkgname-static $pkgname-dev"
-source="https://www.freedesktop.org/software/fontconfig/release/fontconfig-$pkgver.tar.gz"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
+source="https://www.freedesktop.org/software/fontconfig/release/fontconfig-$pkgver.tar.gz
+	fix-arithmetic.patch
+	"
 
-replaces="fontconfig-doc" # Package removed as license is no longer provided
+# For generation of man pages
+export DOC2MAN=docbook2x-man
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	# regenerate hash functions
 	rm -f src/fcobjshash.h
 
@@ -26,20 +34,21 @@ build() {
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-static \
-		--disable-nls \
-		--disable-docs
+		--enable-docs \
+		--disable-nls
 	rm -f src/fcobjhash.h
 	make
 }
 
 check() {
-	cd "$builddir"
-	make check
+	make -j1 check || (cat test/test-suite.log; false)
 }
 
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="830df32e944ee21ad02a9df04787b9902af36ffc13913524acef6e38799a38c5df7a6e407cc0ff9c24455520549d53b3d85d22642a229ac654dc9269926f130b  fontconfig-2.13.1.tar.gz"
+sha512sums="
+4feb02935d94002ed0aba5b9e44bab47c14bbc0ecfcdcdb14c9004681109cef51415cd2368e959f8c4bd2e67ff9e8fcf45102a4bd8728b2f50b3c56723fcb81c  fontconfig-2.15.0.tar.gz
+9e0a010c8075085dedfe6bda1b26d8a7c693091e3ba5e823da8dd79468116c7b6e4a94b1173649999075cf9532bfc81adc97d0182bbff7635e9699bc44d6aa1c  fix-arithmetic.patch
+"
diff --git a/main/fontconfig/fix-arithmetic.patch b/main/fontconfig/fix-arithmetic.patch
new file mode 100644
index 00000000000..84aea7793a1
--- /dev/null
+++ b/main/fontconfig/fix-arithmetic.patch
@@ -0,0 +1,11 @@
+--- a/test/run-test.sh
++++ b/test/run-test.sh
+@@ -388,7 +388,7 @@
+ 
+ if [ -n "${SOURCE_DATE_EPOCH:-}" ]; then
+   old_epoch=${SOURCE_DATE_EPOCH}
+-  SOURCE_DATE_EPOCH=$(("$SOURCE_DATE_EPOCH" + 1))
++  SOURCE_DATE_EPOCH=$(( SOURCE_DATE_EPOCH + 1))
+ fi
+ FONTCONFIG_FILE="$MyPWD"/my-fonts.conf $FCCACHE -f "$FONTDIR"
+ if [ -n "${SOURCE_DATE_EPOCH:-}" ]; then
diff --git a/main/fortify-headers/0001-add-initial-clang-support.patch b/main/fortify-headers/0001-add-initial-clang-support.patch
new file mode 100644
index 00000000000..4080911db2e
--- /dev/null
+++ b/main/fortify-headers/0001-add-initial-clang-support.patch
@@ -0,0 +1,762 @@
+From 1d39f5599ebeb572ac16c3b2e8ad4691463bf6a1 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Wed, 26 Oct 2022 00:30:00 +0200
+Subject: [PATCH] add initial clang support
+
+---
+ include/fortify-headers.h | 25 ++++++++++++++++++--
+ include/poll.h            |  7 +++---
+ include/stdio.h           | 38 +++++++++++++++++++++++------
+ include/stdlib.h          |  4 +++-
+ include/string.h          | 33 ++++++++++++++++----------
+ include/strings.h         |  6 +++--
+ include/sys/select.h      | 13 ++++++++--
+ include/sys/socket.h      | 13 ++++++----
+ include/unistd.h          | 30 +++++++++++++----------
+ include/wchar.h           | 50 ++++++++++++++++++++++++++-------------
+ 10 files changed, 158 insertions(+), 61 deletions(-)
+
+diff --git a/include/fortify-headers.h b/include/fortify-headers.h
+index 4de5bef..2cf3697 100644
+--- a/include/fortify-headers.h
++++ b/include/fortify-headers.h
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright (C) 2015-2016 Dimitris Papastamos <sin@2f30.org>
++ * Copyright (C) 2022 q66 <q66@chimera-linux.org>
+  *
+  * Permission to use, copy, modify, and/or distribute this software for any
+  * purpose with or without fee is hereby granted.
+@@ -16,9 +17,29 @@
+ #ifndef _FORTIFY_HEADERS_H
+ #define _FORTIFY_HEADERS_H
+ 
++#ifdef __clang__
++
++/* clang uses overloads; see https://github.com/llvm/llvm-project/issues/53516 */
++#define _FORTIFY_POSN(n) const __attribute__((__pass_object_size__(n)))
++/* we can't use extern inline with overloads without making them external */
++#define _FORTIFY_INLINE static __inline__ \
++	__attribute__((__always_inline__,__artificial__,__overloadable__))
++
++#else /* !__clang__ */
++
++#define _FORTIFY_POSN(n)
++#define _FORTIFY_INLINE extern __inline__ \
++	__attribute__((__always_inline__,__gnu_inline__,__artificial__))
++
++#endif /* __clang__ */
++
++#define _FORTIFY_POS0 _FORTIFY_POSN(0)
++#define _FORTIFY_POS1 _FORTIFY_POSN(1)
++#define _FORTIFY_POS2 _FORTIFY_POSN(2)
++
+ #define _FORTIFY_STR(s) #s
+ #define _FORTIFY_ORIG(p,fn) __typeof__(fn) __orig_##fn __asm__(_FORTIFY_STR(p) #fn)
+-#define _FORTIFY_FN(fn) _FORTIFY_ORIG(__USER_LABEL_PREFIX__,fn); \
+-	extern __inline__ __attribute__((__always_inline__,__gnu_inline__,__artificial__))
++#define _FORTIFY_FNB(fn) _FORTIFY_ORIG(__USER_LABEL_PREFIX__,fn)
++#define _FORTIFY_FN(fn) _FORTIFY_FNB(fn); _FORTIFY_INLINE
+ 
+ #endif
+diff --git a/include/poll.h b/include/poll.h
+index 24691f1..60a7623 100644
+--- a/include/poll.h
++++ b/include/poll.h
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright (C) 2015-2016 Dimitris Papastamos <sin@2f30.org>
++ * Copyright (C) 2022 q66 <q66@chimera-linux.org>
+  *
+  * Permission to use, copy, modify, and/or distribute this software for any
+  * purpose with or without fee is hereby granted.
+@@ -30,7 +31,7 @@ extern "C" {
+ 
+ #undef poll
+ 
+-_FORTIFY_FN(poll) int poll(struct pollfd *__f, nfds_t __n, int __s)
++_FORTIFY_FN(poll) int poll(struct pollfd * _FORTIFY_POS0 __f, nfds_t __n, int __s)
+ {
+ 	__typeof__(sizeof 0) __b = __builtin_object_size(__f, 0);
+ 
+@@ -41,8 +42,8 @@ _FORTIFY_FN(poll) int poll(struct pollfd *__f, nfds_t __n, int __s)
+ 
+ #ifdef _GNU_SOURCE
+ #undef ppoll
+-_FORTIFY_FN(ppoll) int ppoll(struct pollfd *__f, nfds_t __n, const struct timespec *__s,
+-                             const sigset_t *__m)
++_FORTIFY_FN(ppoll) int ppoll(struct pollfd * _FORTIFY_POS0 __f, nfds_t __n,
++                             const struct timespec *__s, const sigset_t *__m)
+ {
+ 	__typeof__(sizeof 0) __b = __builtin_object_size(__f, 0);
+ 
+diff --git a/include/stdio.h b/include/stdio.h
+index a965184..e50f65f 100644
+--- a/include/stdio.h
++++ b/include/stdio.h
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright (C) 2015-2016 Dimitris Papastamos <sin@2f30.org>
++ * Copyright (C) 2022 q66 <q66@chimera-linux.org>
+  *
+  * Permission to use, copy, modify, and/or distribute this software for any
+  * purpose with or without fee is hereby granted.
+@@ -36,7 +37,7 @@ extern "C" {
+ #undef snprintf
+ #undef sprintf
+ 
+-_FORTIFY_FN(fgets) char *fgets(char *__s, int __n, FILE *__f)
++_FORTIFY_FN(fgets) char *fgets(char * _FORTIFY_POS0 __s, int __n, FILE *__f)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -45,7 +46,8 @@ _FORTIFY_FN(fgets) char *fgets(char *__s, int __n, FILE *__f)
+ 	return __orig_fgets(__s, __n, __f);
+ }
+ 
+-_FORTIFY_FN(fread) size_t fread(void *__d, size_t __n, size_t __m, FILE *__f)
++_FORTIFY_FN(fread) size_t fread(void * _FORTIFY_POS0 __d, size_t __n,
++                                size_t __m, FILE *__f)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+ 
+@@ -56,7 +58,8 @@ _FORTIFY_FN(fread) size_t fread(void *__d, size_t __n, size_t __m, FILE *__f)
+ 	return __orig_fread(__d, __n, __m, __f);
+ }
+ 
+-_FORTIFY_FN(fwrite) size_t fwrite(const void *__d, size_t __n, size_t __m, FILE *__f)
++_FORTIFY_FN(fwrite) size_t fwrite(const void * _FORTIFY_POS0 __d, size_t __n,
++                                  size_t __m, FILE *__f)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+ 
+@@ -67,8 +70,8 @@ _FORTIFY_FN(fwrite) size_t fwrite(const void *__d, size_t __n, size_t __m, FILE
+ 	return __orig_fwrite(__d, __n, __m, __f);
+ }
+ 
+-_FORTIFY_FN(vsnprintf) int vsnprintf(char *__s, size_t __n, const char *__f,
+-                                     __builtin_va_list __v)
++_FORTIFY_FN(vsnprintf) int vsnprintf(char * _FORTIFY_POS0 __s, size_t __n,
++                                     const char *__f, __builtin_va_list __v)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -77,7 +80,8 @@ _FORTIFY_FN(vsnprintf) int vsnprintf(char *__s, size_t __n, const char *__f,
+ 	return __orig_vsnprintf(__s, __n, __f, __v);
+ }
+ 
+-_FORTIFY_FN(vsprintf) int vsprintf(char *__s, const char *__f, __builtin_va_list __v)
++_FORTIFY_FN(vsprintf) int vsprintf(char * _FORTIFY_POS0 __s, const char *__f,
++                                   __builtin_va_list __v)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 	int __r;
+@@ -92,9 +96,26 @@ _FORTIFY_FN(vsprintf) int vsprintf(char *__s, const char *__f, __builtin_va_list
+ 	return __r;
+ }
+ 
+-_FORTIFY_FN(snprintf) int snprintf(char *__s, size_t __n, const char *__f, ...)
++#if defined(__has_builtin)
++#if __has_builtin(__builtin_va_arg_pack)
++
++/* clang is missing __builtin_va_arg_pack, so we cannot use these impls
++ * outside of gcc; we then have a few options:
++ *
++ * 1) using va_start/end and implementing these functions as static inline,
++ *    with inlining never happening; that means extra symbols with internal
++ *    linkage, which is not ideal
++ * 2) using macros; this is incompatible with c++ and since musl does not
++ *    have the __chk variants, we'd need to implement a body with intermediate
++ *    variables within the macro, which means more non-portable mess
++ * 3) not implementing these under clang, which is what we do for now
++ */
++
++_FORTIFY_FN(snprintf) int snprintf(char *__s, size_t __n,
++                                    const char *__f, ...)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
++	int __r;
+ 
+ 	if (__n > __b)
+ 		__builtin_trap();
+@@ -116,6 +137,9 @@ _FORTIFY_FN(sprintf) int sprintf(char *__s, const char *__f, ...)
+ 	return __r;
+ }
+ 
++#endif /* __has_builtin(__builtin_va_arg_pack) */
++#endif /* defined(__has_builtin) */
++
+ #ifdef __cplusplus
+ }
+ #endif
+diff --git a/include/stdlib.h b/include/stdlib.h
+index 11155cf..2b854d0 100644
+--- a/include/stdlib.h
++++ b/include/stdlib.h
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright (C) 2015-2016 Dimitris Papastamos <sin@2f30.org>
++ * Copyright (C) 2022 q66 <q66@chimera-linux.org>
+  *
+  * Permission to use, copy, modify, and/or distribute this software for any
+  * purpose with or without fee is hereby granted.
+@@ -35,7 +36,8 @@ __extension__
+ extern "C" {
+ #endif
+ 
+-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
++/* FIXME clang */
++#if (defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)) && !defined(__clang__)
+ #undef realpath
+ _FORTIFY_FN(realpath) char *realpath(const char *__p, char *__r)
+ {
+diff --git a/include/string.h b/include/string.h
+index 66c23e1..9d4658c 100644
+--- a/include/string.h
++++ b/include/string.h
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright (C) 2015-2016 Dimitris Papastamos <sin@2f30.org>
++ * Copyright (C) 2022 q66 <q66@chimera-linux.org>
+  *
+  * Permission to use, copy, modify, and/or distribute this software for any
+  * purpose with or without fee is hereby granted.
+@@ -36,7 +37,8 @@ extern "C" {
+ #undef strncat
+ #undef strncpy
+ 
+-_FORTIFY_FN(memcpy) void *memcpy(void *__od, const void *__os, size_t __n)
++_FORTIFY_FN(memcpy) void *memcpy(void * _FORTIFY_POS0 __od,
++                                 const void * _FORTIFY_POS0 __os, size_t __n)
+ {
+ 	size_t __bd = __builtin_object_size(__od, 0);
+ 	size_t __bs = __builtin_object_size(__os, 0);
+@@ -53,7 +55,8 @@ _FORTIFY_FN(memcpy) void *memcpy(void *__od, const void *__os, size_t __n)
+ 	return __builtin_memcpy(__od, __os, __n);
+ }
+ 
+-_FORTIFY_FN(memmove) void *memmove(void *__d, const void *__s, size_t __n)
++_FORTIFY_FN(memmove) void *memmove(void * _FORTIFY_POS0 __d,
++                                   const void * _FORTIFY_POS0 __s, size_t __n)
+ {
+ 	size_t __bd = __builtin_object_size(__d, 0);
+ 	size_t __bs = __builtin_object_size(__s, 0);
+@@ -63,7 +66,7 @@ _FORTIFY_FN(memmove) void *memmove(void *__d, const void *__s, size_t __n)
+ 	return __orig_memmove(__d, __s, __n);
+ }
+ 
+-_FORTIFY_FN(memset) void *memset(void *__d, int __c, size_t __n)
++_FORTIFY_FN(memset) void *memset(void * _FORTIFY_POS0 __d, int __c, size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+ 
+@@ -76,7 +79,7 @@ _FORTIFY_FN(memset) void *memset(void *__d, int __c, size_t __n)
+  || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+  || defined(_BSD_SOURCE)
+ #undef stpcpy
+-_FORTIFY_FN(stpcpy) char *stpcpy(char *__d, const char *__s)
++_FORTIFY_FN(stpcpy) char *stpcpy(char * _FORTIFY_POS0 __d, const char *__s)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+ 
+@@ -86,7 +89,8 @@ _FORTIFY_FN(stpcpy) char *stpcpy(char *__d, const char *__s)
+ }
+ 
+ #undef stpncpy
+-_FORTIFY_FN(stpncpy) char *stpncpy(char *__d, const char *__s, size_t __n)
++_FORTIFY_FN(stpncpy) char *stpncpy(char * _FORTIFY_POS0 __d, const char *__s,
++                                   size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+ 
+@@ -96,7 +100,7 @@ _FORTIFY_FN(stpncpy) char *stpncpy(char *__d, const char *__s, size_t __n)
+ }
+ #endif
+ 
+-_FORTIFY_FN(strcat) char *strcat(char *__d, const char *__s)
++_FORTIFY_FN(strcat) char *strcat(char * _FORTIFY_POS0 __d, const char *__s)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+ 
+@@ -105,7 +109,7 @@ _FORTIFY_FN(strcat) char *strcat(char *__d, const char *__s)
+ 	return __orig_strcat(__d, __s);
+ }
+ 
+-_FORTIFY_FN(strcpy) char *strcpy(char *__d, const char *__s)
++_FORTIFY_FN(strcpy) char *strcpy(char * _FORTIFY_POS0 __d, const char *__s)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+ 
+@@ -114,7 +118,8 @@ _FORTIFY_FN(strcpy) char *strcpy(char *__d, const char *__s)
+ 	return __orig_strcpy(__d, __s);
+ }
+ 
+-_FORTIFY_FN(strncat) char *strncat(char *__d, const char *__s, size_t __n)
++_FORTIFY_FN(strncat) char *strncat(char * _FORTIFY_POS0 __d, const char *__s,
++                                   size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+ 	size_t __sl, __dl;
+@@ -130,7 +135,8 @@ _FORTIFY_FN(strncat) char *strncat(char *__d, const char *__s, size_t __n)
+ 	return __orig_strncat(__d, __s, __n);
+ }
+ 
+-_FORTIFY_FN(strncpy) char *strncpy(char *__d, const char *__s, size_t __n)
++_FORTIFY_FN(strncpy) char *strncpy(char * _FORTIFY_POS0 __d,
++                                   const char *__s, size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+ 
+@@ -141,7 +147,8 @@ _FORTIFY_FN(strncpy) char *strncpy(char *__d, const char *__s, size_t __n)
+ 
+ #ifdef _GNU_SOURCE
+ #undef mempcpy
+-_FORTIFY_FN(mempcpy) void *mempcpy(void *__d, const void *__s, size_t __n)
++_FORTIFY_FN(mempcpy) void *mempcpy(void * _FORTIFY_POS0 __d,
++                                   const void * _FORTIFY_POS0 __s, size_t __n)
+ {
+ 	size_t __bd = __builtin_object_size(__d, 0);
+ 	size_t __bs = __builtin_object_size(__s, 0);
+@@ -155,7 +162,8 @@ _FORTIFY_FN(mempcpy) void *mempcpy(void *__d, const void *__s, size_t __n)
+ #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+ #undef strlcat
+ #undef strlcpy
+-_FORTIFY_FN(strlcat) size_t strlcat(char *__d, const char *__s, size_t __n)
++_FORTIFY_FN(strlcat) size_t strlcat(char * _FORTIFY_POS0 __d,
++                                    const char *__s, size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+ 
+@@ -164,7 +172,8 @@ _FORTIFY_FN(strlcat) size_t strlcat(char *__d, const char *__s, size_t __n)
+ 	return __orig_strlcat(__d, __s, __n);
+ }
+ 
+-_FORTIFY_FN(strlcpy) size_t strlcpy(char *__d, const char *__s, size_t __n)
++_FORTIFY_FN(strlcpy) size_t strlcpy(char * _FORTIFY_POS0 __d,
++                                    const char *__s, size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+ 
+diff --git a/include/strings.h b/include/strings.h
+index a16e1ad..4c7e1c7 100644
+--- a/include/strings.h
++++ b/include/strings.h
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright (C) 2015-2016 Dimitris Papastamos <sin@2f30.org>
++ * Copyright (C) 2022 q66 <q66@chimera-linux.org>
+  *
+  * Permission to use, copy, modify, and/or distribute this software for any
+  * purpose with or without fee is hereby granted.
+@@ -30,7 +31,8 @@ extern "C" {
+  || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700)
+ #undef bcopy
+ #undef bzero
+-_FORTIFY_FN(bcopy) void bcopy(const void *__s, void *__d, size_t __n)
++_FORTIFY_FN(bcopy) void bcopy(const void * _FORTIFY_POS0 __s,
++                              void * _FORTIFY_POS0 __d, size_t __n)
+ {
+ 	size_t __bd = __builtin_object_size(__d, 0);
+ 	size_t __bs = __builtin_object_size(__s, 0);
+@@ -40,7 +42,7 @@ _FORTIFY_FN(bcopy) void bcopy(const void *__s, void *__d, size_t __n)
+ 	return __orig_bcopy(__s, __d, __n);
+ }
+ 
+-_FORTIFY_FN(bzero) void bzero(void *__s, size_t __n)
++_FORTIFY_FN(bzero) void bzero(void * _FORTIFY_POS0 __s, size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+diff --git a/include/sys/select.h b/include/sys/select.h
+index bcee8be..527d8e4 100644
+--- a/include/sys/select.h
++++ b/include/sys/select.h
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright (C) 2015-2016 Dimitris Papastamos <sin@2f30.org>
++ * Copyright (C) 2022 q66 <q66@chimera-linux.org>
+  *
+  * Permission to use, copy, modify, and/or distribute this software for any
+  * purpose with or without fee is hereby granted.
+@@ -27,8 +28,14 @@ __extension__
+ extern "C" {
+ #endif
+ 
++#ifdef __clang__
++#define _FORTIFY_FD_POS0 const __attribute__((__pass_object_size__(0)))
++#else
++#define _FORTIFY_FD_POS0
++#endif
++
+ static __inline__ __attribute__((__always_inline__,__gnu_inline__,__artificial__))
+-void __fortify_FD_CLR(int __f, fd_set *__s)
++void __fortify_FD_CLR(int __f, fd_set * _FORTIFY_FD_POS0 __s)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -38,7 +45,7 @@ void __fortify_FD_CLR(int __f, fd_set *__s)
+ }
+ 
+ static __inline__ __attribute__((__always_inline__,__gnu_inline__,__artificial__))
+-void __fortify_FD_SET(int __f, fd_set *__s)
++void __fortify_FD_SET(int __f, fd_set * _FORTIFY_FD_POS0 __s)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -47,6 +54,8 @@ void __fortify_FD_SET(int __f, fd_set *__s)
+ 	FD_SET(__f, __s);
+ }
+ 
++#undef _FORTIFY_FD_POS0
++
+ #undef FD_CLR
+ #define FD_CLR(fd, set) __fortify_FD_CLR(fd, set)
+ #undef FD_SET
+diff --git a/include/sys/socket.h b/include/sys/socket.h
+index ad6ab2d..02cad5f 100644
+--- a/include/sys/socket.h
++++ b/include/sys/socket.h
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright (C) 2015-2016 Dimitris Papastamos <sin@2f30.org>
++ * Copyright (C) 2022 q66 <q66@chimera-linux.org>
+  *
+  * Permission to use, copy, modify, and/or distribute this software for any
+  * purpose with or without fee is hereby granted.
+@@ -33,7 +34,8 @@ extern "C" {
+ #undef send
+ #undef sendto
+ 
+-_FORTIFY_FN(recv) ssize_t recv(int __f, void *__s, size_t __n, int __fl)
++_FORTIFY_FN(recv) ssize_t recv(int __f, void * _FORTIFY_POS0 __s, size_t __n,
++                               int __fl)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -42,7 +44,8 @@ _FORTIFY_FN(recv) ssize_t recv(int __f, void *__s, size_t __n, int __fl)
+ 	return __orig_recv(__f, __s, __n, __fl);
+ }
+ 
+-_FORTIFY_FN(recvfrom) ssize_t recvfrom(int __f, void *__s, size_t __n, int __fl,
++_FORTIFY_FN(recvfrom) ssize_t recvfrom(int __f, void * _FORTIFY_POS0 __s,
++                                       size_t __n, int __fl,
+                                        struct sockaddr *__a, socklen_t *__l)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+@@ -52,7 +55,8 @@ _FORTIFY_FN(recvfrom) ssize_t recvfrom(int __f, void *__s, size_t __n, int __fl,
+ 	return __orig_recvfrom(__f, __s, __n, __fl, __a, __l);
+ }
+ 
+-_FORTIFY_FN(send) ssize_t send(int __f, const void *__s, size_t __n, int __fl)
++_FORTIFY_FN(send) ssize_t send(int __f, const void * _FORTIFY_POS0 __s,
++                               size_t __n, int __fl)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -61,7 +65,8 @@ _FORTIFY_FN(send) ssize_t send(int __f, const void *__s, size_t __n, int __fl)
+ 	return __orig_send(__f, __s, __n, __fl);
+ }
+ 
+-_FORTIFY_FN(sendto) ssize_t sendto(int __f, const void *__s, size_t __n, int __fl,
++_FORTIFY_FN(sendto) ssize_t sendto(int __f, const void * _FORTIFY_POS0 __s,
++                                   size_t __n, int __fl,
+                                    const struct sockaddr *__a, socklen_t __l)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+diff --git a/include/unistd.h b/include/unistd.h
+index 09980ba..9f8a187 100644
+--- a/include/unistd.h
++++ b/include/unistd.h
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright (C) 2015-2016 Dimitris Papastamos <sin@2f30.org>
++ * Copyright (C) 2022 q66 <q66@chimera-linux.org>
+  *
+  * Permission to use, copy, modify, and/or distribute this software for any
+  * purpose with or without fee is hereby granted.
+@@ -40,7 +41,7 @@ extern "C" {
+ #undef ttyname_r
+ #undef write
+ 
+-_FORTIFY_FN(confstr) size_t confstr(int __n, char *__s, size_t __l)
++_FORTIFY_FN(confstr) size_t confstr(int __n, char * _FORTIFY_POS0 __s, size_t __l)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 	size_t __r = __orig_confstr(__n, __s, __b > __l ? __l : __b);
+@@ -50,7 +51,7 @@ _FORTIFY_FN(confstr) size_t confstr(int __n, char *__s, size_t __l)
+ 	return __r;
+ }
+ 
+-_FORTIFY_FN(getcwd) char *getcwd(char *__s, size_t __l)
++_FORTIFY_FN(getcwd) char *getcwd(char * _FORTIFY_POS0 __s, size_t __l)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -61,7 +62,7 @@ _FORTIFY_FN(getcwd) char *getcwd(char *__s, size_t __l)
+ 
+ #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+ #undef getdomainname
+-_FORTIFY_FN(getdomainname) int getdomainname(char *__s, size_t __l)
++_FORTIFY_FN(getdomainname) int getdomainname(char * _FORTIFY_POS0 __s, size_t __l)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -71,7 +72,7 @@ _FORTIFY_FN(getdomainname) int getdomainname(char *__s, size_t __l)
+ }
+ #endif
+ 
+-_FORTIFY_FN(getgroups) int getgroups(int __l, gid_t *__s)
++_FORTIFY_FN(getgroups) int getgroups(int __l, gid_t * _FORTIFY_POS0 __s)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -80,7 +81,7 @@ _FORTIFY_FN(getgroups) int getgroups(int __l, gid_t *__s)
+ 	return __orig_getgroups(__l, __s);
+ }
+ 
+-_FORTIFY_FN(gethostname) int gethostname(char *__s, size_t __l)
++_FORTIFY_FN(gethostname) int gethostname(char * _FORTIFY_POS0 __s, size_t __l)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -89,7 +90,7 @@ _FORTIFY_FN(gethostname) int gethostname(char *__s, size_t __l)
+ 	return __orig_gethostname(__s, __l);
+ }
+ 
+-_FORTIFY_FN(getlogin_r) int getlogin_r(char *__s, size_t __l)
++_FORTIFY_FN(getlogin_r) int getlogin_r(char * _FORTIFY_POS0 __s, size_t __l)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -98,7 +99,8 @@ _FORTIFY_FN(getlogin_r) int getlogin_r(char *__s, size_t __l)
+ 	return __orig_getlogin_r(__s, __l);
+ }
+ 
+-_FORTIFY_FN(pread) ssize_t pread(int __f, void *__s, size_t __n, off_t __o)
++_FORTIFY_FN(pread) ssize_t pread(int __f, void * _FORTIFY_POS0 __s,
++                                 size_t __n, off_t __o)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -107,7 +109,7 @@ _FORTIFY_FN(pread) ssize_t pread(int __f, void *__s, size_t __n, off_t __o)
+ 	return __orig_pread(__f, __s, __n, __o);
+ }
+ 
+-_FORTIFY_FN(read) ssize_t read(int __f, void *__s, size_t __n)
++_FORTIFY_FN(read) ssize_t read(int __f, void * _FORTIFY_POS0 __s, size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -116,7 +118,8 @@ _FORTIFY_FN(read) ssize_t read(int __f, void *__s, size_t __n)
+ 	return __orig_read(__f, __s, __n);
+ }
+ 
+-_FORTIFY_FN(readlink) ssize_t readlink(const char *__p, char *__s, size_t __n)
++_FORTIFY_FN(readlink) ssize_t readlink(const char *__p,
++                                       char * _FORTIFY_POS0 __s, size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -125,7 +128,8 @@ _FORTIFY_FN(readlink) ssize_t readlink(const char *__p, char *__s, size_t __n)
+ 	return __orig_readlink(__p, __s, __n);
+ }
+ 
+-_FORTIFY_FN(readlinkat) ssize_t readlinkat(int __f, const char *__p, char *__s, size_t __n)
++_FORTIFY_FN(readlinkat) ssize_t readlinkat(int __f, const char *__p,
++                                           char * _FORTIFY_POS0 __s, size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -134,7 +138,8 @@ _FORTIFY_FN(readlinkat) ssize_t readlinkat(int __f, const char *__p, char *__s,
+ 	return __orig_readlinkat(__f, __p, __s, __n);
+ }
+ 
+-_FORTIFY_FN(ttyname_r) int ttyname_r(int __f, char *__s, size_t __n)
++_FORTIFY_FN(ttyname_r) int ttyname_r(int __f, char * _FORTIFY_POS0 __s,
++                                     size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -143,7 +148,8 @@ _FORTIFY_FN(ttyname_r) int ttyname_r(int __f, char *__s, size_t __n)
+ 	return __orig_ttyname_r(__f, __s, __n);
+ }
+ 
+-_FORTIFY_FN(write) ssize_t write(int __f, const void *__s, size_t __n)
++_FORTIFY_FN(write) ssize_t write(int __f, const void * _FORTIFY_POS0 __s,
++                                 size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+diff --git a/include/wchar.h b/include/wchar.h
+index c5d0e5d..41423a8 100644
+--- a/include/wchar.h
++++ b/include/wchar.h
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright (C) 2015-2017 Dimitris Papastamos <sin@2f30.org>
++ * Copyright (C) 2022 q66 <q66@chimera-linux.org>
+  *
+  * Permission to use, copy, modify, and/or distribute this software for any
+  * purpose with or without fee is hereby granted.
+@@ -55,7 +56,8 @@ extern "C" {
+ #undef wmemmove
+ #undef wmemset
+ 
+-_FORTIFY_FN(fgetws) wchar_t *fgetws(wchar_t *__s, int __n, FILE *__f)
++_FORTIFY_FN(fgetws) wchar_t *fgetws(wchar_t * _FORTIFY_POS0 __s,
++                                    int __n, FILE *__f)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -67,7 +69,8 @@ _FORTIFY_FN(fgetws) wchar_t *fgetws(wchar_t *__s, int __n, FILE *__f)
+ #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+  || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)  || defined(_BSD_SOURCE)
+ #undef mbsnrtowcs
+-_FORTIFY_FN(mbsnrtowcs) size_t mbsnrtowcs(wchar_t *__d, const char **__s, size_t __n,
++_FORTIFY_FN(mbsnrtowcs) size_t mbsnrtowcs(wchar_t * _FORTIFY_POS0 __d,
++                                          const char **__s, size_t __n,
+                                           size_t __wn, mbstate_t *__st)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+@@ -87,7 +90,8 @@ _FORTIFY_FN(mbsnrtowcs) size_t mbsnrtowcs(wchar_t *__d, const char **__s, size_t
+ }
+ #endif
+ 
+-_FORTIFY_FN(mbsrtowcs) size_t mbsrtowcs(wchar_t *__d, const char **__s, size_t __wn,
++_FORTIFY_FN(mbsrtowcs) size_t mbsrtowcs(wchar_t * _FORTIFY_POS0 __d,
++                                        const char **__s, size_t __wn,
+                                         mbstate_t *__st)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+@@ -100,7 +104,8 @@ _FORTIFY_FN(mbsrtowcs) size_t mbsrtowcs(wchar_t *__d, const char **__s, size_t _
+ 	return __r;
+ }
+ 
+-_FORTIFY_FN(mbstowcs) size_t mbstowcs(wchar_t *__ws, const char *__s, size_t __wn)
++_FORTIFY_FN(mbstowcs) size_t mbstowcs(wchar_t * _FORTIFY_POS0 __ws,
++                                      const char *__s, size_t __wn)
+ {
+ 	size_t __b = __builtin_object_size(__ws, 0);
+ 
+@@ -109,7 +114,9 @@ _FORTIFY_FN(mbstowcs) size_t mbstowcs(wchar_t *__ws, const char *__s, size_t __w
+ 	return __orig_mbstowcs(__ws, __s, __wn);
+ }
+ 
+-_FORTIFY_FN(wcrtomb) size_t wcrtomb(char *__s, wchar_t __w, mbstate_t *__st)
++/* FIXME clang */
++#ifndef __clang__
++_FORTIFY_FN(wcrtomb) size_t wcrtomb(char * __s, wchar_t __w, mbstate_t *__st)
+ {
+ 	if (__s && MB_LEN_MAX > __builtin_object_size(__s, 2)) {
+ 		char __buf[MB_LEN_MAX];
+@@ -125,8 +132,10 @@ _FORTIFY_FN(wcrtomb) size_t wcrtomb(char *__s, wchar_t __w, mbstate_t *__st)
+ 	}
+ 	return __orig_wcrtomb(__s, __w, __st);
+ }
++#endif
+ 
+-_FORTIFY_FN(wcscat) wchar_t *wcscat(wchar_t *__d, const wchar_t *__s)
++_FORTIFY_FN(wcscat) wchar_t *wcscat(wchar_t * _FORTIFY_POS0 __d,
++                                    const wchar_t *__s)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+ 
+@@ -135,7 +144,8 @@ _FORTIFY_FN(wcscat) wchar_t *wcscat(wchar_t *__d, const wchar_t *__s)
+ 	return __orig_wcscat(__d, __s);
+ }
+ 
+-_FORTIFY_FN(wcscpy) wchar_t *wcscpy(wchar_t *__d, const wchar_t *__s)
++_FORTIFY_FN(wcscpy) wchar_t *wcscpy(wchar_t * _FORTIFY_POS0 __d,
++                                    const wchar_t *__s)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+ 
+@@ -144,7 +154,8 @@ _FORTIFY_FN(wcscpy) wchar_t *wcscpy(wchar_t *__d, const wchar_t *__s)
+ 	return __orig_wcscpy(__d, __s);
+ }
+ 
+-_FORTIFY_FN(wcsncat) wchar_t *wcsncat(wchar_t *__d, const wchar_t *__s, size_t __n)
++_FORTIFY_FN(wcsncat) wchar_t *wcsncat(wchar_t * _FORTIFY_POS0 __d,
++                                      const wchar_t *__s, size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+ 	size_t __sl, __dl;
+@@ -160,7 +171,8 @@ _FORTIFY_FN(wcsncat) wchar_t *wcsncat(wchar_t *__d, const wchar_t *__s, size_t _
+ 	return __orig_wcsncat(__d, __s, __n);
+ }
+ 
+-_FORTIFY_FN(wcsncpy) wchar_t *wcsncpy(wchar_t *__d, const wchar_t *__s, size_t __n)
++_FORTIFY_FN(wcsncpy) wchar_t *wcsncpy(wchar_t * _FORTIFY_POS0 __d,
++                                      const wchar_t *__s, size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+ 
+@@ -172,7 +184,8 @@ _FORTIFY_FN(wcsncpy) wchar_t *wcsncpy(wchar_t *__d, const wchar_t *__s, size_t _
+ #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+  || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)  || defined(_BSD_SOURCE)
+ #undef wcsnrtombs
+-_FORTIFY_FN(wcsnrtombs) size_t wcsnrtombs(char *__d, const wchar_t **__s, size_t __wn,
++_FORTIFY_FN(wcsnrtombs) size_t wcsnrtombs(char * _FORTIFY_POS0 __d,
++                                          const wchar_t **__s, size_t __wn,
+                                           size_t __n, mbstate_t *__st)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+@@ -192,7 +205,8 @@ _FORTIFY_FN(wcsnrtombs) size_t wcsnrtombs(char *__d, const wchar_t **__s, size_t
+ }
+ #endif
+ 
+-_FORTIFY_FN(wcsrtombs) size_t wcsrtombs(char *__d, const wchar_t **__s, size_t __n,
++_FORTIFY_FN(wcsrtombs) size_t wcsrtombs(char * _FORTIFY_POS0 __d,
++                                        const wchar_t **__s, size_t __n,
+                                         mbstate_t *__st)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+@@ -204,7 +218,8 @@ _FORTIFY_FN(wcsrtombs) size_t wcsrtombs(char *__d, const wchar_t **__s, size_t _
+ 	return __r;
+ }
+ 
+-_FORTIFY_FN(wcstombs) size_t wcstombs(char *__s, const wchar_t *__ws, size_t __n)
++_FORTIFY_FN(wcstombs) size_t wcstombs(char * _FORTIFY_POS0 __s,
++                                      const wchar_t *__ws, size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -213,7 +228,7 @@ _FORTIFY_FN(wcstombs) size_t wcstombs(char *__s, const wchar_t *__ws, size_t __n
+ 	return __orig_wcstombs(__s, __ws, __n);
+ }
+ 
+-_FORTIFY_FN(wctomb) int wctomb(char *__s, wchar_t __w)
++_FORTIFY_FN(wctomb) int wctomb(char * _FORTIFY_POS0 __s, wchar_t __w)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
+@@ -222,7 +237,8 @@ _FORTIFY_FN(wctomb) int wctomb(char *__s, wchar_t __w)
+ 	return __orig_wctomb(__s, __w);
+ }
+ 
+-_FORTIFY_FN(wmemcpy) wchar_t *wmemcpy(wchar_t *__d, const wchar_t *__s, size_t __n)
++_FORTIFY_FN(wmemcpy) wchar_t *wmemcpy(wchar_t * _FORTIFY_POS0 __d,
++                                      const wchar_t *__s, size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+ 
+@@ -231,7 +247,8 @@ _FORTIFY_FN(wmemcpy) wchar_t *wmemcpy(wchar_t *__d, const wchar_t *__s, size_t _
+ 	return __orig_wmemcpy(__d, __s, __n);
+ }
+ 
+-_FORTIFY_FN(wmemmove) wchar_t *wmemmove(wchar_t *__d, const wchar_t *__s, size_t __n)
++_FORTIFY_FN(wmemmove) wchar_t *wmemmove(wchar_t * _FORTIFY_POS0 __d,
++                                        const wchar_t *__s, size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__d, 0);
+ 
+@@ -240,7 +257,8 @@ _FORTIFY_FN(wmemmove) wchar_t *wmemmove(wchar_t *__d, const wchar_t *__s, size_t
+ 	return __orig_wmemmove(__d, __s, __n);
+ }
+ 
+-_FORTIFY_FN(wmemset) wchar_t *wmemset(wchar_t *__s, wchar_t __c, size_t __n)
++_FORTIFY_FN(wmemset) wchar_t *wmemset(wchar_t * _FORTIFY_POS0 __s,
++                                      wchar_t __c, size_t __n)
+ {
+ 	size_t __b = __builtin_object_size(__s, 0);
+ 
diff --git a/main/fortify-headers/0002-avoid-__extension__-with-clang.patch b/main/fortify-headers/0002-avoid-__extension__-with-clang.patch
new file mode 100644
index 00000000000..fe350d85015
--- /dev/null
+++ b/main/fortify-headers/0002-avoid-__extension__-with-clang.patch
@@ -0,0 +1,144 @@
+From 85afbd3d5a11b48a2d0fa77bcefab20c2f9f5292 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Tue, 1 Nov 2022 01:03:48 +0100
+Subject: [PATCH] avoid __extension__ with clang
+
+It seems useless and triggers 'error: expected external declaration'
+---
+ include/poll.h       | 2 +-
+ include/stdio.h      | 2 +-
+ include/stdlib.h     | 4 ++--
+ include/string.h     | 2 +-
+ include/sys/select.h | 2 +-
+ include/sys/socket.h | 2 +-
+ include/unistd.h     | 2 +-
+ include/wchar.h      | 8 ++++----
+ 8 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/include/poll.h b/include/poll.h
+index 60a7623..b8d5c0b 100644
+--- a/include/poll.h
++++ b/include/poll.h
+@@ -17,7 +17,7 @@
+ #ifndef _FORTIFY_POLL_H
+ #define _FORTIFY_POLL_H
+ 
+-#ifndef __cplusplus
++#if !defined(__cplusplus) && !defined(__clang__)
+ __extension__
+ #endif
+ #include_next <poll.h>
+diff --git a/include/stdio.h b/include/stdio.h
+index e50f65f..a5aaa8f 100644
+--- a/include/stdio.h
++++ b/include/stdio.h
+@@ -17,7 +17,7 @@
+ #ifndef _FORTIFY_STDIO_H
+ #define _FORTIFY_STDIO_H
+ 
+-#ifndef __cplusplus
++#if !defined(__cplusplus) && !defined(__clang__)
+ __extension__
+ #endif
+ #include_next <stdio.h>
+diff --git a/include/stdlib.h b/include/stdlib.h
+index 2b854d0..c43a835 100644
+--- a/include/stdlib.h
++++ b/include/stdlib.h
+@@ -17,14 +17,14 @@
+ #ifndef _FORTIFY_STDLIB_H
+ #define _FORTIFY_STDLIB_H
+ 
+-#ifndef __cplusplus
++#if !defined(__cplusplus) && !defined(__clang__)
+ __extension__
+ #endif
+ #include_next <stdlib.h>
+ 
+ #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
+ #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+-#ifndef __cplusplus
++#if !defined(__cplusplus) && !defined(__clang__)
+ __extension__
+ #endif
+ #include_next <limits.h>
+diff --git a/include/string.h b/include/string.h
+index 9d4658c..834d262 100644
+--- a/include/string.h
++++ b/include/string.h
+@@ -17,7 +17,7 @@
+ #ifndef _FORTIFY_STRING_H
+ #define _FORTIFY_STRING_H
+ 
+-#ifndef __cplusplus
++#if !defined(__cplusplus) && !defined(__clang__)
+ __extension__
+ #endif
+ #include_next <string.h>
+diff --git a/include/sys/select.h b/include/sys/select.h
+index 527d8e4..75c4829 100644
+--- a/include/sys/select.h
++++ b/include/sys/select.h
+@@ -17,7 +17,7 @@
+ #ifndef _FORTIFY_SYS_SELECT_H
+ #define _FORTIFY_SYS_SELECT_H
+ 
+-#ifndef __cplusplus
++#if !defined(__cplusplus) && !defined(__clang__)
+ __extension__
+ #endif
+ #include_next <sys/select.h>
+diff --git a/include/sys/socket.h b/include/sys/socket.h
+index 02cad5f..5a1821c 100644
+--- a/include/sys/socket.h
++++ b/include/sys/socket.h
+@@ -17,7 +17,7 @@
+ #ifndef _FORTIFY_SYS_SOCKET_H
+ #define _FORTIFY_SYS_SOCKET_H
+ 
+-#ifndef __cplusplus
++#if !defined(__cplusplus) && !defined(__clang__)
+ __extension__
+ #endif
+ #include_next <sys/socket.h>
+diff --git a/include/unistd.h b/include/unistd.h
+index 9f8a187..d36dfc4 100644
+--- a/include/unistd.h
++++ b/include/unistd.h
+@@ -17,7 +17,7 @@
+ #ifndef _FORTIFY_UNISTD_H
+ #define _FORTIFY_UNISTD_H
+ 
+-#ifndef __cplusplus
++#if !defined(__cplusplus) && !defined(__clang__)
+ __extension__
+ #endif
+ #include_next <unistd.h>
+diff --git a/include/wchar.h b/include/wchar.h
+index 41423a8..e359452 100644
+--- a/include/wchar.h
++++ b/include/wchar.h
+@@ -17,19 +17,19 @@
+ #ifndef _FORTIFY_WCHAR_H
+ #define _FORTIFY_WCHAR_H
+ 
+-#ifndef __cplusplus
++#if !defined(__cplusplus) && !defined(__clang__)
+ __extension__
+ #endif
+ #include_next <limits.h>
+-#ifndef __cplusplus
++#if !defined(__cplusplus) && !defined(__clang__)
+ __extension__
+ #endif
+ #include_next <stdlib.h>
+-#ifndef __cplusplus
++#if !defined(__cplusplus) && !defined(__clang__)
+ __extension__
+ #endif
+ #include_next <string.h>
+-#ifndef __cplusplus
++#if !defined(__cplusplus) && !defined(__clang__)
+ __extension__
+ #endif
+ #include_next <wchar.h>
diff --git a/main/fortify-headers/0003-Disable-wrapping-of-ppoll.patch b/main/fortify-headers/0003-Disable-wrapping-of-ppoll.patch
new file mode 100644
index 00000000000..52fea94d0d2
--- /dev/null
+++ b/main/fortify-headers/0003-Disable-wrapping-of-ppoll.patch
@@ -0,0 +1,53 @@
+From 6ee1b1498e409b5494a6bbedfd143105380edbac Mon Sep 17 00:00:00 2001
+From: Laurent Bercot <ska-devel@skarnet.org>
+Date: Tue, 16 Feb 2021 18:46:10 +0100
+Subject: [PATCH] Disable wrapping of ppoll
+
+The fortify-headers/poll.h definitions incorrectly forward the ppoll()
+function: on some archs (armv7 for instance), musl renames the symbol to
+accommodate for time_t size, and fortify-headers misses that.
+
+This causes ppoll() to break on all time32 systems.  This commit axes
+the ppoll() redefinition. Fortifying ppoll() is of very little benefit
+anyway.
+---
+ README         |  1 -
+ include/poll.h | 13 -------------
+ 2 files changed, 14 deletions(-)
+
+diff --git a/README b/README
+index 7e9c111..f620a47 100644
+--- a/README
++++ b/README
+@@ -67,7 +67,6 @@ memmove
+ mempcpy
+ memset
+ poll
+-ppoll
+ pread
+ read
+ readlink
+diff --git a/include/poll.h b/include/poll.h
+index b8d5c0b..04f28cb 100644
+--- a/include/poll.h
++++ b/include/poll.h
+@@ -40,19 +40,6 @@ _FORTIFY_FN(poll) int poll(struct pollfd * _FORTIFY_POS0 __f, nfds_t __n, int __
+ 	return __orig_poll(__f, __n, __s);
+ }
+ 
+-#ifdef _GNU_SOURCE
+-#undef ppoll
+-_FORTIFY_FN(ppoll) int ppoll(struct pollfd * _FORTIFY_POS0 __f, nfds_t __n,
+-                             const struct timespec *__s, const sigset_t *__m)
+-{
+-	__typeof__(sizeof 0) __b = __builtin_object_size(__f, 0);
+-
+-	if (__n > __b / sizeof(struct pollfd))
+-		__builtin_trap();
+-	return __orig_ppoll(__f, __n, __s, __m);
+-}
+-#endif
+-
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/main/fortify-headers/APKBUILD b/main/fortify-headers/APKBUILD
index 2148b3b72c7..a0246fdd2ba 100644
--- a/main/fortify-headers/APKBUILD
+++ b/main/fortify-headers/APKBUILD
@@ -2,24 +2,25 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=fortify-headers
 pkgver=1.1
-pkgrel=0
+pkgrel=3
 pkgdesc="standalone fortify source implementation"
 url="http://git.2f30.org/fortify-headers/"
 arch="noarch"
 options="!check"  # No test suite.
-license="BSD-0"
-source="http://dl.2f30.org/releases/$pkgname-$pkgver.tar.gz
+license="0BSD"
+source="http://dl.2f30.org/releases/fortify-headers-$pkgver.tar.gz
+	0001-add-initial-clang-support.patch
+	0002-avoid-__extension__-with-clang.patch
+	0003-Disable-wrapping-of-ppoll.patch
 	"
 
-builddir="$srcdir"/$pkgname-$pkgver
-
-build() {
-	cd "$builddir"
-}
-
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" PREFIX=/usr install
 }
 
-sha512sums="a39d6e7c002bf91085f712aa46bc3f53ff934cc963694a229fa82d84ff4a7556105212a84a231ab5367c01c6a1e385172173f1f4a34d5eb4d2d9c58472c23dd0  fortify-headers-1.1.tar.gz"
+sha512sums="
+a39d6e7c002bf91085f712aa46bc3f53ff934cc963694a229fa82d84ff4a7556105212a84a231ab5367c01c6a1e385172173f1f4a34d5eb4d2d9c58472c23dd0  fortify-headers-1.1.tar.gz
+eeeb4ca86cd59eb0ec3cfab004c9b7b4a4fd9a6c5db8e97d4fd5fda959249553a0a020653cd87e833799bbd2aba2ae628a9e8805272146bd7f895ba6624cdeef  0001-add-initial-clang-support.patch
+4737e6de59ab65e4c8eb285fb716932558c6238f6f0e303eeebfacb106306959fa567d1dc23e2364b1561a06f0013e2fa2e7e7d0ab7dd8c13095a7192d451e89  0002-avoid-__extension__-with-clang.patch
+90d9dfee98b2fb8536f20588ce6017a0d69d1ad12033515f140e3a201eeb0b61be72796dddfb8fc0ccb0fccce202c9206c9db159e3f7ef4c4de4474793c01333  0003-Disable-wrapping-of-ppoll.patch
+"
diff --git a/main/fping/APKBUILD b/main/fping/APKBUILD
index e2dfa2e60f0..f3448cdd41d 100644
--- a/main/fping/APKBUILD
+++ b/main/fping/APKBUILD
@@ -1,17 +1,21 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fping
-pkgver=4.2
-pkgrel=0
+pkgver=5.1
+pkgrel=5
 pkgdesc="A utility to ping multiple hosts at once"
-url="http://fping.org/"
+url="https://fping.org/"
 arch="all"
 license="MIT"
+makedepends="libcap-utils"
 subpackages="$pkgname-doc"
-source="http://fping.org/dist/fping-$pkgver.tar.gz"
-options="suid !check" # No testsuite
+source="https://fping.org/dist/fping-$pkgver.tar.gz
+	int-conversion.patch
+	unprivileged-ping.patch
+	"
+# setcap: needs cap_net_raw to be able to send icmp packets
+options="!check setcap" # no testsuite
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,9 +26,12 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make install DESTDIR="$pkgdir"
-	chmod 4755 "$pkgdir"/usr/sbin/fping*
+	setcap cap_net_raw=+ep "$pkgdir"/usr/sbin/fping
 }
 
-sha512sums="2bab34dae539d942eb5e436802e6f74d57c04aa4b782f9adbd6c27830209fdb47707131f20ed966012bcec3d253c9bb3df9033a60b55bfe560af6bb1f572ee8a  fping-4.2.tar.gz"
+sha512sums="
+1a208da8dcd99093d0512af5d85ba5e7b5743ec97993d24c1fe612bb58d93090ac1ba0952f648aa075f16d390a77c4be65e394ae56dbede2a6914e0e8c68e2bd  fping-5.1.tar.gz
+aac9c7906b44f65eb586b4de50cb6b10c6d99b1a2f7fc2ea030491a23e174500dac945ebe9ad8a85a38da0bac4c3883aa41c6ebf980480de02ded709f76bde38  int-conversion.patch
+57fb8976a382ef21200430a238985cec04ecb72458e67d02ae4eac3af4f14108ad90460d562ee9f46a579d6226335b9391542c641acd2c6e1736fa138176e52f  unprivileged-ping.patch
+"
diff --git a/main/fping/int-conversion.patch b/main/fping/int-conversion.patch
new file mode 100644
index 00000000000..75abfdae596
--- /dev/null
+++ b/main/fping/int-conversion.patch
@@ -0,0 +1,34 @@
+initialising without names is not possible because there are hidden __padding
+fields, so the order of args is wrong.
+--
+diff --git a/src/fping.c b/src/fping.c
+index e26b216..d499689 100644
+--- a/src/fping.c
++++ b/src/fping.c
+@@ -1948,17 +1948,17 @@ int receive_packet(int64_t wait_time,
+     int recv_len;
+     static unsigned char msg_control[40];
+     struct iovec msg_iov = {
+-        reply_buf,
+-        reply_buf_len
++        .iov_base = reply_buf,
++        .iov_len = reply_buf_len
+     };
+     struct msghdr recv_msghdr = {
+-        reply_src_addr,
+-        reply_src_addr_len,
+-        &msg_iov,
+-        1,
+-        &msg_control,
+-        sizeof(msg_control),
+-        0
++        .msg_name = reply_src_addr,
++        .msg_namelen = reply_src_addr_len,
++        .msg_iov = &msg_iov,
++        .msg_iovlen = 1,
++        .msg_control = &msg_control,
++        .msg_controllen = sizeof(msg_control),
++        .msg_flags = 0
+     };
+ #if HAVE_SO_TIMESTAMPNS
+     struct cmsghdr* cmsg;
diff --git a/main/fping/unprivileged-ping.patch b/main/fping/unprivileged-ping.patch
new file mode 100644
index 00000000000..cc414df9e51
--- /dev/null
+++ b/main/fping/unprivileged-ping.patch
@@ -0,0 +1,28 @@
+Patch-Source: https://github.com/schweikert/fping/commit/e975a4339b24716fb57bed234b0a1176f2bf3451
+--
+Author: David Schweikert <david@schweikert.ch>
+Committer: Nash Kaminski <Nash.Kaminski@ny.email.gs.com>
+Summary: This patch backports the upstream bugfix from
+         https://github.com/schweikert/fping/issues/248
+         for a regression introduced in version 5.1 which
+         prevents fping from functioning when run in an
+         unprivileged container.
+----
+diff --git a/src/fping.c b/src/fping.c
+index e26b216c..0bd2b70c 100644
+--- a/src/fping.c
++++ b/src/fping.c
+@@ -1104,11 +1104,11 @@ int main(int argc, char** argv)
+         exit(num_noaddress ? 2 : 1);
+     }
+
+-    if (src_addr_set && socket4 >= 0) {
++    if (socket4 >= 0 && (src_addr_set || socktype4 == SOCK_DGRAM)) {
+         socket_set_src_addr_ipv4(socket4, &src_addr, (socktype4 == SOCK_DGRAM) ? &ident4 : NULL);
+     }
+ #ifdef IPV6
+-    if (src_addr6_set && socket6 >= 0) {
++    if (socket6 >= 0 && (src_addr6_set || socktype4 == SOCK_DGRAM)) {
+         socket_set_src_addr_ipv6(socket6, &src_addr6, (socktype6 == SOCK_DGRAM) ? &ident6 : NULL);
+     }
+ #endif
diff --git a/main/fprobe-ulog/APKBUILD b/main/fprobe-ulog/APKBUILD
index 17bc9f7a342..58df148a2e1 100644
--- a/main/fprobe-ulog/APKBUILD
+++ b/main/fprobe-ulog/APKBUILD
@@ -1,15 +1,13 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=fprobe-ulog
 pkgver=1.2
-pkgrel=4
+pkgrel=9
 pkgdesc="netfilter-based tool that collect network traffic"
 url="https://github.com/opoplawski/fprobe-ulog"
 arch="all"
-license="GPL"
-depends=
+license="GPL-2.0-or-later"
 makedepends="libnfnetlink-dev libnetfilter_log-dev"
-install=""
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
 source="https://github.com/opoplawski/fprobe-ulog/releases/download/v$pkgver/fprobe-ulog-$pkgver.tar.gz
 	fprobe-ulog.confd
 	fprobe-ulog.initd
@@ -17,21 +15,14 @@ source="https://github.com/opoplawski/fprobe-ulog/releases/download/v$pkgver/fpr
 	fix-setuser.patch
 	fprobe-nflog.patch
 	"
-
-_builddir="$srcdir"/$pkgname-$pkgver
+options="!check"
 
 prepare() {
-	cd $_builddir
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	CFLAGS="$CFLAGS -std=gnu89" \
 	./configure \
 		--build=$CBUILD \
@@ -39,18 +30,15 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
-	make || return 1
+		--infodir=/usr/share/info
+	make
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-
 }
 
 sha512sums="c393c0705bd6c7cee998fccc48dede3568063b5130971f36c08f580c7678cf52fdf446c02cc4df3d5a2ead68cb2d14434e0847bfff27b6a0c5ef5ec7d6f61145  fprobe-ulog-1.2.tar.gz
diff --git a/main/fprobe/APKBUILD b/main/fprobe/APKBUILD
index 2595e80a7ee..a3be31a1a3f 100644
--- a/main/fprobe/APKBUILD
+++ b/main/fprobe/APKBUILD
@@ -1,36 +1,27 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=fprobe
 pkgver=1.1
-pkgrel=8
+pkgrel=13
 pkgdesc="libpcap-based tool that collect network traffic"
-url="http://fprobe.sourceforge.net/"
+url="https://fprobe.sourceforge.net/"
 arch="all"
-license="GPL"
-depends=
+license="GPL-2.0-or-later"
 makedepends="libpcap-dev"
-install=""
-subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+subpackages="$pkgname-doc $pkgname-openrc"
+source="https://downloads.sourceforge.net/fprobe/fprobe-$pkgver.tar.bz2
 	fprobe-1.1-pidfile-sanity.patch
 	fprobe-1.1-setgroups.patch
 	$pkgname.initd
 	$pkgname.confd"
-
-_builddir="$srcdir"/$pkgname-$pkgver
+options="!check"
 
 prepare() {
-	cd $_builddir
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	CFLAGS="$CFLAGS -std=gnu89" \
 	./configure \
 		--build=$CBUILD \
@@ -38,13 +29,11 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
-	make || return 1
+		--infodir=/usr/share/info
+	make
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
diff --git a/main/freeradius-client/APKBUILD b/main/freeradius-client/APKBUILD
index 63de595e3d0..7e5b1735deb 100644
--- a/main/freeradius-client/APKBUILD
+++ b/main/freeradius-client/APKBUILD
@@ -1,21 +1,20 @@
-# Contributor: Francesco Colsita <francesco.colista@gmail.com>
-# Maintainer:  Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Francesco Colsita <fcolista@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=freeradius-client
 pkgver=1.1.7
-pkgrel=3
+pkgrel=7
 pkgdesc="FreeRADIUS Client Software"
 url="https://freeradius.org/sub_projects/"
 arch="all"
-license="BSD"
+license="BSD-2-Clause"
 makedepends="nettle-dev automake autoconf libtool"
 subpackages="$pkgname-dev"
 source="$pkgname-$pkgver-release.tar.gz::https://github.com/FreeRADIUS/freeradius-client/archive/release_${pkgver//./_}.tar.gz"
 
-builddir="$srcdir"/$pkgname-$pkgver
 builddir="$srcdir"/freeradius-client-release_${pkgver//./_}
+options="!check"
 
 build() {
-	cd "$_builddir"
 	autoreconf -vif
 	./configure \
 		--build=$CBUILD \
@@ -29,8 +28,9 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c4844f16954d119dfbe1683ca48f4ed5e612fd10f66b885f8338905137b508f609eafbf5ccff1bc04fd19581249bfbf30d179402db042868dfccee72a3105b95  freeradius-client-1.1.7-release.tar.gz"
+sha512sums="
+c4844f16954d119dfbe1683ca48f4ed5e612fd10f66b885f8338905137b508f609eafbf5ccff1bc04fd19581249bfbf30d179402db042868dfccee72a3105b95  freeradius-client-1.1.7-release.tar.gz
+"
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index ec3746f8d34..6cdb837f4ad 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -4,8 +4,8 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=freeradius
-pkgver=3.0.21
-pkgrel=0
+pkgver=3.0.26
+pkgrel=7
 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
 url="https://freeradius.org/"
 arch="all"
@@ -20,15 +20,15 @@ makedepends="
 	json-c-dev
 	krb5-dev
 	libpcap-dev
+	libpq-dev
 	libtool
 	linux-headers
 	linux-pam-dev
 	mariadb-connector-c-dev
 	net-snmp-tools
 	openldap-dev
-	openssl-dev
+	openssl-dev>3
 	perl-dev
-	postgresql-dev
 	python3-dev
 	readline-dev
 	sqlite-dev
@@ -61,24 +61,28 @@ subpackages="
 	$pkgname-redis
 	$pkgname-checkrad
 	$pkgname-utils
+	$pkgname-openrc
 	"
 provides="freeradius3=$pkgver-r$pkgrel"
-source="ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-$pkgver.tar.gz
+source="https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${pkgver//./_}/freeradius-server-$pkgver.tar.gz
 	$pkgname.logrotated
 	radiusd.confd
 	radiusd.initd
 	setup-freeradius.in
 	print-var.mk
+	radacct-rotate
+	radacct-rotate.conf
+	radacct-rotate.crond
 
 	musl-fix-headers.patch
 	fix-scopeid.patch
 	default-config.patch
 	remove-eap-from-default-mods.patch
 	readme-setup-script.patch
-	fix-request_running-segfault.patch
 	dont-install-test-tools.patch
 	"
 builddir="$srcdir/$pkgname-server-$pkgver"
+options="!check"
 
 # secfixes:
 #   3.0.19-r3:
@@ -167,6 +171,10 @@ package() {
 	install -m644 -D "$srcdir"/$pkgname.logrotated "$pkgdir"/etc/logrotate.d/$pkgname
 	install -m755 -D setup-freeradius "$pkgdir"/usr/sbin/setup-freeradius
 
+	install -m755 -D "$srcdir"/radacct-rotate -t "$pkgdir"/usr/bin/
+	install -m644 -D "$srcdir"/radacct-rotate.conf -t "$pkgdir"/etc/raddb/
+	install -m755 -D "$srcdir"/radacct-rotate.crond "$pkgdir"/etc/periodic/daily/radacct-rotate
+
 	# Install misses to create this
 	mkdir -p "$pkgdir"/$_radmodsconfdir/sql/ippool-dhcp/postgresql
 
@@ -369,6 +377,9 @@ utils() {
 	replaces="freeradius-radclient"
 
 	amove usr/bin/*
+
+	mkdir -p "$pkgdir"/usr/bin
+	mv "$subpkgdir"/usr/bin/radacct-rotate "$pkgdir"/usr/bin/
 }
 
 _mvdb() {
@@ -381,16 +392,20 @@ _enable_mod() {
 	ln -s ../mods-available/$1 "$subpkgdir"/$_radconfdir/mods-enabled/$1
 }
 
-sha512sums="85af1c305e99a56400b04be5c966900e7df8beb7b54626d6aa0cb300dc124817e43b424f9b27d86966bb76cca87dce741812ed8d681a568c7d7b63b3b53a9dfa  freeradius-server-3.0.21.tar.gz
-c3ae1ee6bd7743f883310612ba2c20c6ff7f288fedc308735df05b097ecb2f7fa4d1679b844e262757808978c7bb2d7630b99e4b87ce6d6ba7f84013f9c49f1d  freeradius.logrotated
+sha512sums="
+5ffc7389ed76c40eb249f4588b8b1199f21537fe2718585d6886eefe16871055e4602c841e278c557879766df45d5f3ac351e36037dfbbdfed3c2381ad748855  freeradius-server-3.0.26.tar.gz
+52ecccd479bb22c80d5cc298d9d1c12bd2d1a9d80e1265ba032201f3942370910fa78f3bb429031d91bc89712fa2127f16cd68814489cbc99d174fbf5789875f  freeradius.logrotated
 bb3df1fa2c9ed95514ae090e0f6619c4e3280f424c4351bc79f5254bf1a327fa7d27e5fe3add5ab8d9e5ba3792c9553bd9a0481fe9c5bc34945ce46627ef2638  radiusd.confd
-a66ab5d3f1c86450e9c50aa8be10a40fb4118467670048773ad8c80b5f3fb958dd3addc6ef245289d93ce2b184ce2c9882a8a2585d4a134d55c2326c9559f558  radiusd.initd
+5a8579f06e905117c67f87f0833d0760e81e64f97de7672ecee45775733fae05763edb91c472e313bf58523c713f86815e47cc39c841f4c141aa59a5930113c6  radiusd.initd
 9f6a4f76fd06e81cfcfe4536f1f8be494634b07e548a6f7e651e5501aded24b030ed7d57dbdc867ae0eb39ee4a090234c4122a89bed84c13733c77de36b9c2cf  setup-freeradius.in
 5f940e200aa39b2fbbfaf5b24f2ad99869fa75bb7e2008876940ea96cb9dbc7f2b27dd1672aa56cdb5243faabdcbc38875594dd8792af965987183c0aa2aefd1  print-var.mk
+4fbd774618d41a28a5874fd5bd96ccf6ab5ea38e4a97b1671bd51f6d07476985629dabc0a7300b3287bd223c62496c930bc555bb617739d6383afd5d55c97501  radacct-rotate
+2cecaae9bf9dd88f7c4344f2b08977c46d4831e733b82adcf6cf9553c1a77363dac9f1784f9eb9cf93d46c3da10a10d548a1071cdb0cd49e1319a62b7d5a357b  radacct-rotate.conf
+52c477b4d13009bc3776ed889feeb4b1ea8d85bb97b0031b1d2d4c04e6466fcb4e9a16e556e861e7ec56acb54624bea39d73d44802535aa39d3dc84580d95775  radacct-rotate.crond
 c49e5eec7497fccde5fd09dba1ea9b846e57bc88015bd81640aa531fb5c9b449f37136f42c85fe1d7940c5963aed664b85da28442b388c9fb8cc27873df03b2d  musl-fix-headers.patch
 41d478c0e40ff82fc36232964037c1ab8ffca9fdbb7dca02ed49319906e751c133b5d7bc7773c645cec6d9d39d1de69cba25e8d59afa8d6662563dd17f35f234  fix-scopeid.patch
-c266718d830076423c19a31c608a925ec664156ef2da87c97166d376b16f4582e7f8adebd9c8e3ef51b24da0ca3252f00b557ed9ee9dd8325d8a6a317f4e3ed1  default-config.patch
-f96b7b2e0fc614cb8b70bd500933538e98e05b58718af931a62bc7ba2307600cf8c2a8a99de856ad2e18101dd5bfe95c50ee34de20eef21ba0ad795577a6619b  remove-eap-from-default-mods.patch
+caf85ffb96e08ad8314fe72aac052948b2461f94bb21e20ea34925534ee1ef682284457318d50df813ba167a8cb4b520c5a0f38d86de21cd56e8391f299a5dd6  default-config.patch
+5fba0394073cd32a0cd80dea0c27e4474cd44c7d52fdf4e1dafb98025ffa3439bbab6112e091ca5e548713d071c026b280b1f205e8e51e57e4fda4bb6336b020  remove-eap-from-default-mods.patch
 55e179d5e6b31d289c2da7f907e494a6a6f5900483fdff8d3bb25ee15a583b8705942eca1f0d5390e91376966e66e457dce9b2cf1a1f61c8eac6d8fb825404dd  readme-setup-script.patch
-7ddf75901f635216b0d972c14631334a8138e0dbb021685bb6b3a996f38d232b84146c621dae541b00f6149fa401e835d1579bbacd27fad72a80bacd4391b404  fix-request_running-segfault.patch
-908c4408ab6538ddd96577e47d5e509b19e227e144655eaa0fd7569ddadbe5b2298e6599b8370847b3bcb5e788067b163b0cb66e1b3afa4d83dc3f724e058674  dont-install-test-tools.patch"
+908c4408ab6538ddd96577e47d5e509b19e227e144655eaa0fd7569ddadbe5b2298e6599b8370847b3bcb5e788067b163b0cb66e1b3afa4d83dc3f724e058674  dont-install-test-tools.patch
+"
diff --git a/main/freeradius/default-config.patch b/main/freeradius/default-config.patch
index 0ad71173ddc..1c31e19e5cd 100644
--- a/main/freeradius/default-config.patch
+++ b/main/freeradius/default-config.patch
@@ -1,6 +1,28 @@
+From f37bee486aca3de86b594770f0b2b3ff8e96596a Mon Sep 17 00:00:00 2001
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Tue, 18 May 2021 14:10:00 +0000
+Subject: [PATCH] Adjust default config
+
+- Fix default location of db_dir and run_dir.
+- Remove pidfile - this is handled by OpenRC.
+- Change default sqlite db path to a reasonable location.
+- Change default cui sqlite location to $db_dir/.
+- Change default cache paths to /var/cache/radiusd.
+
+---
+ raddb/mods-available/cui        |  2 +-
+ raddb/mods-available/eap        | 11 +++--------
+ raddb/mods-available/sql        |  4 ++--
+ raddb/radiusd.conf.in           | 21 +++++----------------
+ raddb/sites-available/abfab-tls |  4 ++--
+ raddb/sites-available/tls       |  4 ++--
+ 6 files changed, 15 insertions(+), 31 deletions(-)
+
+diff --git a/raddb/mods-available/cui b/raddb/mods-available/cui
+index b72aa30..0dc4e1c 100644
 --- a/raddb/mods-available/cui
 +++ b/raddb/mods-available/cui
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ sql cuisql {
  	driver = "rlm_sql_${dialect}"
  
  	sqlite {
@@ -9,9 +31,11 @@
  		bootstrap = ${modconfdir}/${..:name}/cui/sqlite/schema.sql
  	}
  
+diff --git a/raddb/mods-available/eap b/raddb/mods-available/eap
+index 239ac4c..66d59b4 100644
 --- a/raddb/mods-available/eap
 +++ b/raddb/mods-available/eap
-@@ -504,20 +504,15 @@
+@@ -534,20 +534,15 @@ eap {
  			#  state and the cached VPs. This will persist session
  			#  across server restarts.
  			#
@@ -34,7 +58,7 @@
  
  			#
  			#  As of 3.0.20, it is possible to partially
-@@ -586,7 +581,7 @@
+@@ -616,7 +611,7 @@ eap {
  			#  deleted by the server when the command
  			#  returns.
  			#
@@ -43,9 +67,11 @@
  		}
  
  		#  OCSP Configuration
+diff --git a/raddb/mods-available/sql b/raddb/mods-available/sql
+index cfeac63..7ff51dd 100644
 --- a/raddb/mods-available/sql
 +++ b/raddb/mods-available/sql
-@@ -70,7 +70,7 @@
+@@ -69,7 +69,7 @@ sql {
  	#
  	sqlite {
  		# Path to the sqlite database
@@ -54,7 +80,7 @@
  
  		# How long to wait for write locks on the database to be
  		# released (in ms) before giving up.
-@@ -85,7 +85,7 @@
+@@ -84,7 +84,7 @@ sql {
  	mysql {
  		# If any of the files below are set, TLS encryption is enabled
  		tls {
@@ -63,9 +89,11 @@
  			ca_path = "/etc/ssl/certs/"
  			certificate_file = "/etc/ssl/certs/private/client.crt"
  			private_key_file = "/etc/ssl/certs/private/client.key"
+diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
+index 61cc3a4..29f716a 100644
 --- a/raddb/radiusd.conf.in
 +++ b/raddb/radiusd.conf.in
-@@ -98,10 +98,10 @@
+@@ -98,10 +98,10 @@ confdir = ${raddbdir}
  modconfdir = ${confdir}/mods-config
  certdir = ${confdir}/certs
  cadir   = ${confdir}/certs
@@ -79,12 +107,12 @@
  
  #
  # libdir: Where to find the rlm_* modules.
-@@ -137,18 +137,7 @@
+@@ -137,17 +137,6 @@ db_dir = ${raddbdir}
  #
  libdir = @libdir@
  
 -#  pidfile: Where to place the PID of the RADIUS server.
- #
+-#
 -#  The server may be signalled while it's running by using this
 -#  file.
 -#
@@ -94,11 +122,10 @@
 -#
 -pidfile = ${run_dir}/${name}.pid
 -
--#
+ #
  #  correct_escapes: use correct backslash escaping
  #
- #  Prior to version 3.0.5, the handling of backslashes was a little
-@@ -501,8 +490,8 @@
+@@ -520,8 +509,8 @@ security {
  	#  member.  This can allow for some finer-grained access
  	#  controls.
  	#
@@ -109,18 +136,20 @@
  
  	#  Core dumps are a bad thing.  This should only be set to
  	#  'yes' if you're debugging a problem with the server.
+diff --git a/raddb/sites-available/abfab-tls b/raddb/sites-available/abfab-tls
+index b8d0626..4eba0a3 100644
 --- a/raddb/sites-available/abfab-tls
 +++ b/raddb/sites-available/abfab-tls
-@@ -25,7 +25,7 @@
+@@ -25,7 +25,7 @@ listen {
  			enable = no
  			lifetime = 24 # hours
  			name = "abfab-tls"
--#			persist_dir = ${logdir}/abfab-tls
-+#			persist_dir = ${cachedir}/abfab-tls
+-			# persist_dir = ${logdir}/abfab-tls
++			# persist_dir = ${cachedir}/abfab-tls
  		}
- 
  		require_client_cert = yes
-@@ -64,7 +64,7 @@
+ 		verify {
+@@ -63,7 +63,7 @@ listen {
  			enable = no
  			lifetime = 24 # hours
  			name = "abfab-tls"
@@ -129,9 +158,11 @@
  		}
  		require_client_cert = yes
  		verify {
+diff --git a/raddb/sites-available/tls b/raddb/sites-available/tls
+index 8c8e06a..9f55b74 100644
 --- a/raddb/sites-available/tls
 +++ b/raddb/sites-available/tls
-@@ -316,11 +316,11 @@
+@@ -366,11 +366,11 @@ listen {
  		      #  should be secured from anyone else. You might want
  		      #  a script to remove old files from here periodically:
  		      #
@@ -145,3 +176,6 @@
  		}
  
  		#
+-- 
+2.31.1
+
diff --git a/main/freeradius/fix-request_running-segfault.patch b/main/freeradius/fix-request_running-segfault.patch
deleted file mode 100644
index d1ca8903027..00000000000
--- a/main/freeradius/fix-request_running-segfault.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 30ffd2174ec0acd1c5b4b4988d522c24d80a1049 Mon Sep 17 00:00:00 2001
-From: "Alan T. DeKok" <aland@freeradius.org>
-Date: Wed, 20 Nov 2019 08:30:42 -0500
-Subject: [PATCH] home_server may be NULL if proxying fails
-
----
- src/main/process.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/main/process.c b/src/main/process.c
-index 78c6d8a9e5..c8b3af24e2 100644
---- a/src/main/process.c
-+++ b/src/main/process.c
-@@ -1642,7 +1642,8 @@ static void request_running(REQUEST *request, int action)
- 			 *	handler.
- 			 */
- 			if (request_proxy(request) < 0) {
--				if (request->home_server && request->home_server->server) goto req_finished;
-+				if (!request->home_server ||
-+				    (request->home_server && request->home_server->server)) goto req_finished;
- 
- 				(void) setup_post_proxy_fail(request);
- 				process_proxy_reply(request, NULL);
diff --git a/main/freeradius/freeradius.logrotated b/main/freeradius/freeradius.logrotated
index 1975caee75d..4b6d9455baa 100644
--- a/main/freeradius/freeradius.logrotated
+++ b/main/freeradius/freeradius.logrotated
@@ -18,13 +18,6 @@
 	su radius radius
 }
 
-# There are different detail-rotating strategies you can use.  One is
-# to write to a single detail file per IP and use the rotate config
-# below.  Another is to write to a daily detail file per IP with:
-#     detailfile = ${radacctdir}/%{Client-IP-Address}/%Y%m%d-detail
-# (or similar) in radiusd.conf, without rotation.  If you go with the
-# second technique, you will need another cron job that removes old
-# detail files.  You do not need to comment out the below for method #2.
 /var/log/radius/radacct/*/detail {
 	missingok
 	compress
@@ -32,3 +25,6 @@
 	nocreate
 	su radius radius
 }
+
+# NOTE: Files in /var/log/radius/radacct/*/ with "-YYYYMMDD" suffix are
+# compressed and later removed by script radacct-rotate executed daily by cron.
diff --git a/main/freeradius/radacct-rotate b/main/freeradius/radacct-rotate
new file mode 100644
index 00000000000..5dc03458c34
--- /dev/null
+++ b/main/freeradius/radacct-rotate
@@ -0,0 +1,87 @@
+#!/bin/sh
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2021 Jakub Jirutka <jakub@jirutka.cz>
+#---help---
+# Usage: radacct-rotate [options]
+#
+# Compress and later remove old FreeRADIUS' radacct log files with "-YYYYMMDD"
+# suffix. This script is provided by the freeradius package in Alpine Linux.
+#
+# Options:
+#   -C FILE  Location of radacct-rotate config file (defaults to
+#            /etc/raddb/radacct-rotate.conf).
+#
+#   -c DAYS  Compress files older than DAYS (overrides option
+#            compress_after_days from the config).
+#
+#   -r DAYS  Remove compressed files older than DAYS (overrides
+#            option remove_after_days from the config).
+#
+#   -d       Run in dry-run mode (only print what would be done).
+#
+#   -h       Show this message and exit.
+#---help---
+set -eu
+
+readonly PROGNAME='radacct-rotate'
+#                   Y    Y    Y    Y    m    m    d    d
+readonly DATE_GLOB='[1-9][0-9][0-9][0-9][0-1][0-9][0-3][0-9]'
+readonly HELP_TAG='#---help---'
+
+# Defaults
+CONFIG='/etc/raddb/radacct-rotate.conf'
+DRY_RUN=false
+radacct_dir='/var/log/radius/radacct'
+compress_cmd='gzip -9'
+compress_ext='.gz'
+compress_after_days=2
+remove_after_days=180
+
+while getopts ':C:c:dr:h' OPT; do
+	case "$OPT" in
+		C) CONFIG=$OPTARG;;
+		c) COMPRESS_AFTER_DAYS=$OPTARG;;
+		d) DRY_RUN=true;;
+		r) REMOVE_AFTER_DAYS=$OPTARG;;
+		h) sed -n "/^$HELP_TAG/,/^$HELP_TAG/{/^$HELP_TAG/d; s/^# \\?//; p;}" "$0"; exit 0;;
+		\?) echo "$PROGNAME: invalid option: -$OPTARG (see '$PROGNAME -h')" >&2; exit 100;;
+	esac
+done
+
+readonly CONFIG COMPRESS_AFTER_DAYS DRY_RUN REMOVE_AFTER_DAYS
+
+sh -n "$CONFIG" || exit 100
+. "$CONFIG"
+
+compress_after_days=${COMPRESS_AFTER_DAYS:-$compress_after_days}
+remove_after_days=${REMOVE_AFTER_DAYS:-$remove_after_days}
+
+
+find_compressible() {
+	find "$radacct_dir" -type f -name "*-$DATE_GLOB" -mtime "+$compress_after_days" "$@"
+}
+
+find_deletable() {
+	find "$radacct_dir" -type f -name "*-${DATE_GLOB}${compress_ext}" -mtime "+$remove_after_days" "$@"
+}
+
+check_number() {
+	case "$1" in
+	''|*[!0-9]*) echo "$PROGNAME: option '$2' must be a number, but given: '$1'" >&2; exit 100;;
+	esac
+}
+check_number "$compress_after_days" 'compress_after_days'
+check_number "$remove_after_days" 'remove_after_days'
+
+rc=0
+if $DRY_RUN; then
+	find_compressible -exec echo $compress_cmd {} \; || rc=111
+	find_deletable -exec echo rm {} \; || rc=111
+else
+	for path in $(find_compressible -print); do
+		$compress_cmd "$path" >&2 && touch -ct "${path##*-}0000" "$path".* || rc=111
+	done
+	find_deletable -exec rm '{}' \; >&2 || rc=111
+fi
+
+exit $rc
diff --git a/main/freeradius/radacct-rotate.conf b/main/freeradius/radacct-rotate.conf
new file mode 100644
index 00000000000..4f9003a7014
--- /dev/null
+++ b/main/freeradius/radacct-rotate.conf
@@ -0,0 +1,26 @@
+# Configuration file for radacct-rotate
+#
+# Script radacct-rotate compresses and removes old log files with suffix
+# "-YYYYMMDD" (e.g. detail-20210921) found in /var/log/radius/radacct/*/.
+#
+# The age of the files is determined by their time of last modification
+# (see stat(1)). When the file is compressed, its modification time is set
+# to the date encoded in the file name.
+
+# Set to "yes" to disable cron script /etc/periodic/daily/radacct-rotate.
+#cron_disabled=no
+
+# Compress files older than specified number of days.
+#compress_after_days=3
+
+# Remove files older than specified number of days.
+#remove_after_days=180
+
+# Location of the radacct directory.
+#radacct_dir="/var/log/radius/radacct"
+
+# Specifies which command (and arguments) to use to compress files.
+# It must produce compressed file with ${compress_ext} extension and remove
+# the original file.
+#compress_cmd="gzip -9"
+#compress_ext=".gz"
diff --git a/main/freeradius/radacct-rotate.crond b/main/freeradius/radacct-rotate.crond
new file mode 100644
index 00000000000..69a21df96f4
--- /dev/null
+++ b/main/freeradius/radacct-rotate.crond
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+: ${RADACCT_ROTATE_CONFIG:="/etc/raddb/radacct-rotate.conf"}
+
+/bin/sh -n "$RADACCT_ROTATE_CONFIG" 2>/dev/null || exit 0
+
+. "$RADACCT_ROTATE_CONFIG"
+[ "$cron_disabled" = yes ] && exit 0
+
+exec /usr/bin/radacct-rotate
diff --git a/main/freeradius/radiusd.initd b/main/freeradius/radiusd.initd
index 5e3a0b4e34e..e5f3fae3598 100644
--- a/main/freeradius/radiusd.initd
+++ b/main/freeradius/radiusd.initd
@@ -38,6 +38,11 @@ checkconfig() {
 
 reload () {
 	ebegin "Reloading $name"
-	start-stop-daemon --signal HUP --pidfile "$pidfile"
+
+	if [ "$supervisor" ]; then
+		$supervisor "$RC_SVCNAME" --signal HUP
+	else
+		start-stop-daemon --signal HUP --pidfile "$pidfile"
+	fi
 	eend $?
 }
diff --git a/main/freeradius/remove-eap-from-default-mods.patch b/main/freeradius/remove-eap-from-default-mods.patch
index f741543f2df..cfeafa121da 100644
--- a/main/freeradius/remove-eap-from-default-mods.patch
+++ b/main/freeradius/remove-eap-from-default-mods.patch
@@ -4,7 +4,7 @@ Because we move eap into a subpackage.
 @@ -8,7 +8,7 @@
  LOCAL_SITES :=		$(addprefix raddb/sites-enabled/,$(DEFAULT_SITES))
  
- DEFAULT_MODULES :=	always attr_filter cache_eap chap date \
+ DEFAULT_MODULES :=	always attr_filter chap date \
 -			detail detail.log digest dynamic_clients eap \
 +			detail detail.log digest dynamic_clients \
  			echo exec expiration expr files linelog logintime \
diff --git a/main/freeswitch-sounds-en-us-callie-32000/APKBUILD b/main/freeswitch-sounds-en-us-callie-32000/APKBUILD
index b98df7cbb31..d0005c4fd49 100644
--- a/main/freeswitch-sounds-en-us-callie-32000/APKBUILD
+++ b/main/freeswitch-sounds-en-us-callie-32000/APKBUILD
@@ -1,18 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=freeswitch-sounds-en-us-callie-32000
 pkgver=1.0.16
-pkgrel=1
+pkgrel=3
 pkgdesc="Sounds for freeswitch English"
-url="http://files.freeswitch.org/"
+url="https://files.freeswitch.org/"
 arch="noarch"
-license="unknown"
-depends=
-makedepends=
-install=
-subpackages=
-source="http://files.freeswitch.org/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir"/$pkgname-$pkgver
+license="MPL-1.1"
+options="!check"
+source="https://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-$pkgver.tar.gz"
 _sounds=/usr/share/freeswitch/sounds
 
 build() {
@@ -25,4 +20,6 @@ package() {
 	chown -R root:root "$pkgdir"/$_sounds
 }
 
-sha512sums="cd3ee317bee173d785f3b2828243cb7d60fe7e3c041566e68417058257196e0123c72ed31444c80d9728d6b5daf0e6ef041751ae215b01a01295be469852d2c8  freeswitch-sounds-en-us-callie-32000-1.0.16.tar.gz"
+sha512sums="
+cd3ee317bee173d785f3b2828243cb7d60fe7e3c041566e68417058257196e0123c72ed31444c80d9728d6b5daf0e6ef041751ae215b01a01295be469852d2c8  freeswitch-sounds-en-us-callie-32000-1.0.16.tar.gz
+"
diff --git a/main/freeswitch-sounds-en-us-callie-8000/APKBUILD b/main/freeswitch-sounds-en-us-callie-8000/APKBUILD
index e219417a170..2b438f9e6cd 100644
--- a/main/freeswitch-sounds-en-us-callie-8000/APKBUILD
+++ b/main/freeswitch-sounds-en-us-callie-8000/APKBUILD
@@ -1,18 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=freeswitch-sounds-en-us-callie-8000
 pkgver=1.0.51
-pkgrel=0
+pkgrel=2
 pkgdesc="Sounds for freeswitch English"
-url="http://files.freeswitch.org/"
+url="https://files.freeswitch.org/"
 arch="noarch"
-license="unknown"
-depends=
-makedepends=
-install=
-subpackages=
-source="http://files.freeswitch.org/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir"/$pkgname-$pkgver
+license="MPL-1.1"
+options="!check"
+source="https://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-$pkgver.tar.gz"
 _sounds=/usr/share/freeswitch/sounds
 
 build() {
@@ -25,4 +20,6 @@ package() {
 	chown -R root:root "$pkgdir"/$_sounds
 }
 
-sha512sums="87fa8ab1f969c7c930d9f7ccde3df38edbdccf253d8415ef92c2049279368742f12e8c8ede0a9c106b9d20c3f1faacb030d6cbb2efbd63449c0d6cd35aed0ba2  freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz"
+sha512sums="
+87fa8ab1f969c7c930d9f7ccde3df38edbdccf253d8415ef92c2049279368742f12e8c8ede0a9c106b9d20c3f1faacb030d6cbb2efbd63449c0d6cd35aed0ba2  freeswitch-sounds-en-us-callie-8000-1.0.51.tar.gz
+"
diff --git a/main/freeswitch-sounds-es-mx-maria-44100/APKBUILD b/main/freeswitch-sounds-es-mx-maria-44100/APKBUILD
index e134669086d..9428a0fd1cf 100644
--- a/main/freeswitch-sounds-es-mx-maria-44100/APKBUILD
+++ b/main/freeswitch-sounds-es-mx-maria-44100/APKBUILD
@@ -1,19 +1,14 @@
 # Contributor: Jeff Bilyk <jbilyk@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=freeswitch-sounds-es-mx-maria-44100
-pkgver="0"
-pkgrel=2
+pkgver=0
+pkgrel=4
 pkgdesc="Sounds for freeswitch Spanish"
-url="http://files.freeswitch.org/"
+url="https://files.freeswitch.org/"
 arch="noarch"
-license="unknown"
-depends=
-makedepends=
-install=
-subpackages=
-source="http://files.freeswitch.org/freeswitch-sounds-es-mx-maria-44100.tar.gz"
-
-_builddir="$srcdir"/$pkgname-$pkgver
+license="MPL-1.1"
+options="!check"
+source="https://files.freeswitch.org/freeswitch-sounds-es-mx-maria-44100.tar.gz"
 _sounds=/usr/share/freeswitch/sounds
 
 build() {
@@ -25,4 +20,6 @@ package() {
 	cp -ra "$srcdir"/es/ "$pkgdir"/$_sounds
 }
 
-sha512sums="1ff292222637657a6d794204d843d0d9d03919327555ad461a624e8ffedb249f9bd1e4f6342e281deb83a3aed1e9c02c113e39840b64c4c87ecc16d78a9e00f3  freeswitch-sounds-es-mx-maria-44100.tar.gz"
+sha512sums="
+1ff292222637657a6d794204d843d0d9d03919327555ad461a624e8ffedb249f9bd1e4f6342e281deb83a3aed1e9c02c113e39840b64c4c87ecc16d78a9e00f3  freeswitch-sounds-es-mx-maria-44100.tar.gz
+"
diff --git a/main/freeswitch-sounds-fr-ca-june-8000/APKBUILD b/main/freeswitch-sounds-fr-ca-june-8000/APKBUILD
index 79fd57569a8..7ee2c8453cd 100644
--- a/main/freeswitch-sounds-fr-ca-june-8000/APKBUILD
+++ b/main/freeswitch-sounds-fr-ca-june-8000/APKBUILD
@@ -1,16 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=freeswitch-sounds-fr-ca-june-8000
 pkgver=1.0.51
-pkgrel=0
+pkgrel=2
 pkgdesc="Sounds for freeswitch French"
-url="http://files.freeswitch.org/"
+url="https://files.freeswitch.org/"
 arch="noarch"
-license="unknown"
-depends=
-makedepends=
-install=
-subpackages=
-source="http://files.freeswitch.org/releases/sounds/freeswitch-sounds-fr-ca-june-8000-$pkgver.tar.gz"
+license="MPL-1.1"
+options="!check"
+source="https://files.freeswitch.org/releases/sounds/freeswitch-sounds-fr-ca-june-8000-$pkgver.tar.gz"
 _sounds=/usr/share/freeswitch/sounds
 
 build() {
@@ -23,4 +20,6 @@ package() {
 	chown -R root:root "$pkgdir"/$_sounds
 }
 
-sha512sums="780ce9f7f644b91f7a589a96f3c8841fcd567ce71d68f1c016246501c52de4dfdba24da153101926482af715de500d2294c4d4ffa7d536debb66817f0625c63e  freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz"
+sha512sums="
+780ce9f7f644b91f7a589a96f3c8841fcd567ce71d68f1c016246501c52de4dfdba24da153101926482af715de500d2294c4d4ffa7d536debb66817f0625c63e  freeswitch-sounds-fr-ca-june-8000-1.0.51.tar.gz
+"
diff --git a/main/freeswitch-sounds-fr-fr-sibylle-8000/APKBUILD b/main/freeswitch-sounds-fr-fr-sibylle-8000/APKBUILD
index 92cbebff7b7..85eb99c46f3 100644
--- a/main/freeswitch-sounds-fr-fr-sibylle-8000/APKBUILD
+++ b/main/freeswitch-sounds-fr-fr-sibylle-8000/APKBUILD
@@ -1,20 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=freeswitch-sounds-fr-fr-sibylle-8000
 pkgver=0.1.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Sounds for freeswitch French"
-url="http://www.archive.org/details/FrenchAudioFilesForFreeswitch"
+url="https://www.archive.org/details/FrenchAudioFilesForFreeswitch"
 arch="all"
-license="CC-3.0"
-depends=
-makedepends=
-install=
-subpackages=
-
+license="CC-BY-SA-3.0"
+options="!check"
 source="https://www.archive.org/download/FrenchAudioFilesForFreeswitch/freeswitch-sounds-fr-fr-sibylle-8000-$pkgver.tar.gz"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-
 build() {
 	return 0
 }
@@ -25,4 +19,6 @@ package() {
 	chown -R root:root "$pkgdir"/usr/sounds
 }
 
-sha512sums="5cc6727aff2161e302c8826b5f97550272a3cdacd2a1922234338c1b7de530a67d1d49faadeb28b5cef5c15fef43568cb05199d81133be4d30a9824c72d2b6da  freeswitch-sounds-fr-fr-sibylle-8000-0.1.3.tar.gz"
+sha512sums="
+5cc6727aff2161e302c8826b5f97550272a3cdacd2a1922234338c1b7de530a67d1d49faadeb28b5cef5c15fef43568cb05199d81133be4d30a9824c72d2b6da  freeswitch-sounds-fr-fr-sibylle-8000-0.1.3.tar.gz
+"
diff --git a/main/freeswitch-sounds-music-32000/APKBUILD b/main/freeswitch-sounds-music-32000/APKBUILD
index 7fdfd3071de..69fe288c050 100644
--- a/main/freeswitch-sounds-music-32000/APKBUILD
+++ b/main/freeswitch-sounds-music-32000/APKBUILD
@@ -1,18 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=freeswitch-sounds-music-32000
 pkgver=1.0.8
-pkgrel=1
+pkgrel=3
 pkgdesc="Sounds for freeswitch English"
-url="http://files.freeswitch.org/"
+url="https://files.freeswitch.org/"
 arch="noarch"
-license="unknown"
-depends=
-makedepends=
-install=
-subpackages=
-source="http://files.freeswitch.org/$pkgname-$pkgver.tar.gz"
-
+license="MPL-1.1"
+options="!check"
+source="https://files.freeswitch.org/freeswitch-sounds-music-32000-$pkgver.tar.gz"
 _sounds=/usr/share/freeswitch/sounds
+
 build() {
 	return 0
 }
@@ -23,4 +20,6 @@ package() {
 	chown -R root:root "$pkgdir"/$_sounds
 }
 
-sha512sums="b860ce3585a36406d1488e8ec58c8a7cb3b8432592b6efd6cce2b5878df5ab4068f4666c2481c0c778b0967dc8c49ad91578bbec6db3a9c9cade14cf878d6316  freeswitch-sounds-music-32000-1.0.8.tar.gz"
+sha512sums="
+b860ce3585a36406d1488e8ec58c8a7cb3b8432592b6efd6cce2b5878df5ab4068f4666c2481c0c778b0967dc8c49ad91578bbec6db3a9c9cade14cf878d6316  freeswitch-sounds-music-32000-1.0.8.tar.gz
+"
diff --git a/main/freeswitch-sounds-music-8000/APKBUILD b/main/freeswitch-sounds-music-8000/APKBUILD
index 08ac60518df..6b4acc9f53e 100644
--- a/main/freeswitch-sounds-music-8000/APKBUILD
+++ b/main/freeswitch-sounds-music-8000/APKBUILD
@@ -1,18 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=freeswitch-sounds-music-8000
 pkgver=1.0.8
-pkgrel=1
+pkgrel=3
 pkgdesc="Music for freeswitch"
-url="http://files.freeswitch.org/"
+url="https://files.freeswitch.org/"
 arch="noarch"
-license="unknown"
-depends=
-makedepends=
-install=
-subpackages=
-source="http://files.freeswitch.org/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir"/$pkgname-$pkgver
+license="MPL-1.1"
+options="!check"
+source="https://files.freeswitch.org/freeswitch-sounds-music-8000-$pkgver.tar.gz"
 _sounds=/usr/share/freeswitch/sounds
 
 build() {
@@ -25,4 +20,6 @@ package() {
 	chown -R root:root "$pkgdir"/$_sounds
 }
 
-sha512sums="43dab1180aba6be5325628d40d1c254eaee40246a47e1b9536051928fe84f3d9c70574432390a43f09adcdc334c69f7c77d12b4e4520404d0ae874b032f6a740  freeswitch-sounds-music-8000-1.0.8.tar.gz"
+sha512sums="
+43dab1180aba6be5325628d40d1c254eaee40246a47e1b9536051928fe84f3d9c70574432390a43f09adcdc334c69f7c77d12b4e4520404d0ae874b032f6a740  freeswitch-sounds-music-8000-1.0.8.tar.gz
+"
diff --git a/main/freeswitch-sounds-pt-br-karina-8000/APKBUILD b/main/freeswitch-sounds-pt-br-karina-8000/APKBUILD
index d3fe1f724c5..838912b560b 100644
--- a/main/freeswitch-sounds-pt-br-karina-8000/APKBUILD
+++ b/main/freeswitch-sounds-pt-br-karina-8000/APKBUILD
@@ -2,16 +2,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=freeswitch-sounds-pt-br-karina-8000
 _realname=freeswitch-sounds-pt-BR-karina-8000
-provides="$_realname" # backwards compat
 pkgver=1.0.51
-pkgrel=2
+pkgrel=5
 pkgdesc="Sounds for freeswitch Brazilian Portuguese"
-url="http://files.freeswitch.org/"
+url="https://files.freeswitch.org/"
 arch="noarch"
-license="unknown"
-source="http://files.freeswitch.org/releases/sounds/$_realname-$pkgver.tar.gz"
-
+license="MPL-1.1"
+options="!check"
+source="https://files.freeswitch.org/releases/sounds/$_realname-$pkgver.tar.gz"
 _sounds=/usr/share/freeswitch/sounds
+provides="$_realname=$pkgver-r$pkgrel" # backwards compat
 
 package() {
 	mkdir -p "$pkgdir"/$_sounds/
@@ -19,4 +19,6 @@ package() {
 	chown -R root:root "$pkgdir"/$_sounds
 }
 
-sha512sums="c15a80a879cb931fafc4e1cebf2d893fe492b4a87c92d3cbcf48aacc534c45e2be677c123c3683331f859defe266b28059d439cbcfb70329d99ec021e3670478  freeswitch-sounds-pt-BR-karina-8000-1.0.51.tar.gz"
+sha512sums="
+c15a80a879cb931fafc4e1cebf2d893fe492b4a87c92d3cbcf48aacc534c45e2be677c123c3683331f859defe266b28059d439cbcfb70329d99ec021e3670478  freeswitch-sounds-pt-BR-karina-8000-1.0.51.tar.gz
+"
diff --git a/main/freeswitch-sounds-ru-RU-elena-32000/APKBUILD b/main/freeswitch-sounds-ru-RU-elena-32000/APKBUILD
index d45cd23a816..8515f23f88c 100644
--- a/main/freeswitch-sounds-ru-RU-elena-32000/APKBUILD
+++ b/main/freeswitch-sounds-ru-RU-elena-32000/APKBUILD
@@ -1,16 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=freeswitch-sounds-ru-RU-elena-32000
 pkgver=1.0.12
-pkgrel=1
+pkgrel=3
 pkgdesc="Sounds for freeswitch English"
-url="http://files.freeswitch.org/"
+url="https://files.freeswitch.org/"
 arch="noarch"
-license="unknown"
-depends=
-makedepends=
-install=
-subpackages=
-source="http://files.freeswitch.org/$pkgname-$pkgver.tar.gz"
+license="MPL-1.1"
+options="!check"
+source="https://files.freeswitch.org/freeswitch-sounds-ru-RU-elena-32000-$pkgver.tar.gz"
 _sounds=/usr/share/freeswitch/sounds
 
 build() {
@@ -23,4 +20,6 @@ package() {
 	chown -R root:root "$pkgdir"/$_sounds
 }
 
-sha512sums="3768462f69ddc56949fc574e6572c88083394046c9d6b79ed65a499f8ca795bbf568ab1d31724d59eef5423843cb75693be664f8736cda9b4391d55a18294c45  freeswitch-sounds-ru-RU-elena-32000-1.0.12.tar.gz"
+sha512sums="
+3768462f69ddc56949fc574e6572c88083394046c9d6b79ed65a499f8ca795bbf568ab1d31724d59eef5423843cb75693be664f8736cda9b4391d55a18294c45  freeswitch-sounds-ru-RU-elena-32000-1.0.12.tar.gz
+"
diff --git a/main/freeswitch-sounds-ru-RU-elena-8000/APKBUILD b/main/freeswitch-sounds-ru-RU-elena-8000/APKBUILD
index 3275791a1d2..c0ba5ec216a 100644
--- a/main/freeswitch-sounds-ru-RU-elena-8000/APKBUILD
+++ b/main/freeswitch-sounds-ru-RU-elena-8000/APKBUILD
@@ -1,16 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=freeswitch-sounds-ru-RU-elena-8000
 pkgver=1.0.12
-pkgrel=1
+pkgrel=3
 pkgdesc="Sounds for freeswitch English"
-url="http://files.freeswitch.org/"
+url="https://files.freeswitch.org/"
 arch="noarch"
-license="unknown"
-depends=
-makedepends=
-install=
-subpackages=
-source="http://files.freeswitch.org/$pkgname-$pkgver.tar.gz"
+license="MPL-1.1"
+options="!check"
+source="https://files.freeswitch.org/freeswitch-sounds-ru-RU-elena-8000-$pkgver.tar.gz"
 _sounds=/usr/share/freeswitch/sounds
 
 build() {
@@ -23,4 +20,6 @@ package() {
 	chown -R root:root "$pkgdir"/$_sounds
 }
 
-sha512sums="0a4a8b073224825fe65b8641349d8a13dbc1d665054b74d8ee034901c1542308a66b995eda4cfbcbf9d953ebd9957b54a16f6844b14694b2e55245bab631cfc0  freeswitch-sounds-ru-RU-elena-8000-1.0.12.tar.gz"
+sha512sums="
+0a4a8b073224825fe65b8641349d8a13dbc1d665054b74d8ee034901c1542308a66b995eda4cfbcbf9d953ebd9957b54a16f6844b14694b2e55245bab631cfc0  freeswitch-sounds-ru-RU-elena-8000-1.0.12.tar.gz
+"
diff --git a/main/freeswitch/0001-sofia-sip-byte-order.patch b/main/freeswitch/0001-sofia-sip-byte-order.patch
deleted file mode 100644
index 91952fe5332..00000000000
--- a/main/freeswitch/0001-sofia-sip-byte-order.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From fa276af16c696e505f66e6ca18ab343f985e8f2b Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 27 Jul 2016 07:31:16 +0000
-Subject: [PATCH] sofia-sip: byte-order
-
----
- libs/sofia-sip/libsofia-sip-ua/tport/ws.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
-index 7fe9f18..27d95b2 100644
---- a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
-+++ b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
-@@ -703,14 +703,12 @@ ssize_t ws_close(wsh_t *wsh, int16_t reason)
- 
- uint64_t hton64(uint64_t val)
- {
--	if (__BYTE_ORDER == __BIG_ENDIAN) return (val);
--	else return __bswap_64(val);
-+	return be64toh(val);
- }
- 
- uint64_t ntoh64(uint64_t val)
- {
--	if (__BYTE_ORDER == __BIG_ENDIAN) return (val);
--	else return __bswap_64(val);
-+	return htobe64(val);
- }
- 
- 
--- 
-2.9.1
-
-diff --git a/libs/sofia-sip/configure.ac b/libs/sofia-sip/configure.ac
-index ca6bd3a..3d5677b 100644
---- a/libs/sofia-sip/configure.ac
-+++ b/libs/sofia-sip/configure.ac
-@@ -218,7 +218,6 @@ fi
- AC_C_CONST
- AC_C_INLINE
- AC_C_INLINE_DEFINE
--AC_C_BIGENDIAN(AC_DEFINE([SWITCH_BYTE_ORDER],__BIG_ENDIAN,[Big Endian]),AC_DEFINE([SWITCH_BYTE_ORDER],__LITTLE_ENDIAN,[Little Endian]))
- 
- AC_C_VAR_FUNC
- AC_C_MACRO_FUNCTION
diff --git a/main/freeswitch/0002-FS-verto-bswap_64.patch b/main/freeswitch/0002-FS-verto-bswap_64.patch
deleted file mode 100644
index 0cee934c798..00000000000
--- a/main/freeswitch/0002-FS-verto-bswap_64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/mod/endpoints/mod_verto/ws.h
-+++ b/src/mod/endpoints/mod_verto/ws.h
-@@ -36,6 +36,9 @@
-     ((x>>40) & 0x000000000000FF00) | \
-     (x<<56)
- #endif
-+#ifndef __bswap_64 
-+#include <byteswap.h>
-+#endif
- #ifdef _MSC_VER
- #ifndef strncasecmp
- #define strncasecmp _strnicmp
\ No newline at end of file
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 640a339cc55..7f320a2c29a 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -1,46 +1,53 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Contributor: Cameron Banta <cbanta@gmail.com>
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=freeswitch
-pkgver=1.8.7
+pkgver=1.10.10
 pkgrel=1
 pkgdesc="A communications platform written in C from the ground up"
-url="http://www.freeswitch.org"
+url="https://www.freeswitch.org/"
 arch="all"
 license="MPL-1.1"
+options="!check" # fixme: failing tests
 makedepends="
+	apr-dev
+	autoconf
+	automake
 	bash
 	bsd-compat-headers
 	coreutils
 	curl-dev
-	db-dev
-	flac-dev
+	diffutils
 	flite-dev
 	gdbm-dev
-	gnutls-dev
-	ilbc-dev
 	lame-dev
 	ldns-dev
 	libedit-dev
-	libexecinfo-dev
 	libjpeg-turbo-dev
-	libogg-dev
-	libpri-dev
-	openssl-dev
+	libks-dev
+	libpq-dev
 	libshout-dev
 	libsndfile-dev
-	libvorbis-dev
+	libsrtp-dev
+	libtool
 	linux-headers
 	lua5.3-dev
 	mpg123-dev
+	mariadb-dev
 	ncurses-dev
+	nasm
 	net-snmp-dev
+	openssl-dev>3
 	opus-dev
 	pcre-dev
 	perl-dev
 	portaudio-dev
-	postgresql-dev
+	py3-setuptools
+	python3-dev
 	sngtc_client-dev
+	sofia-sip-dev
+	spandsp3-dev
 	speex-dev
 	speexdsp-dev
 	sqlite-dev
@@ -48,45 +55,49 @@ makedepends="
 	unixodbc-dev
 	util-linux-dev
 	xmlrpc-c-dev
-	yasm
 	zlib-dev
-	autoconf automake libtool
 	"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
-FREESWITCH_USER=freeswitch
-FREESWITCH_GROUP=freeswitch
-pkgusers="$FREESWITCH_USER"
-pkggroups="$FREESWITCH_GROUP"
-subpackages="$pkgname-static $pkgname-dev $pkgname-flite $pkgname-timezones::noarch
-	$pkgname-sample-config:conf:noarch $pkgname-freetdm $pkgname-sangoma
-	$pkgname-snmp $pkgname-pgsql $pkgname-perl $pkgname-perlesl
-	$pkgname-openrc $pkgname-dbg"
-
-source="https://files.freeswitch.org/freeswitch-releases/$pkgname-$pkgver.tar.xz
-	0001-sofia-sip-byte-order.patch
-	0002-FS-verto-bswap_64.patch
-	configure-lua53.patch
-	include-lua53.patch
+_freeswitch_user=freeswitch
+_freeswitch_group=freeswitch
+pkgusers="$_freeswitch_user"
+pkggroups="$_freeswitch_group"
+subpackages="$pkgname-dbg
+	$pkgname-dev $pkgname-flite $pkgname-timezones::noarch
+	$pkgname-sample-config:conf:noarch $pkgname-sangoma
+	$pkgname-snmp $pkgname-pgsql $pkgname-mariadb $pkgname-python3
+	$pkgname-perl $pkgname-perlesl $pkgname-openrc"
+
+source="https://files.freeswitch.org/freeswitch-releases/freeswitch-$pkgver.-release.tar.xz
 	getlib.patch
 	libvpx-fix-arm-float-abi.patch
 	disable-Werror.patch
+	python-3.10.patch
 	modules.conf
 	freeswitch.confd
 	freeswitch.initd
 	"
 
-builddir="$srcdir/$pkgname-$pkgver"
+builddir="$srcdir/$pkgname-$pkgver.-release"
+
+# secfixes:
+#   1.10.7-r0:
+#     - CVE-2021-37624
+#     - CVE-2021-41105
+#     - CVE-2021-41145
+#     - CVE-2021-41157
+#     - CVE-2021-41158
 
 prepare() {
 	default_prepare
-	autoreconf -vif
+	NOCONFIGURE=1 autoreconf -vif
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	cp -f "$srcdir/modules.conf" modules.conf
-	CFLAGS="-Wno-unused-but-set-variable" ./configure \
+	# Wno-format-truncation: https://github.com/signalwire/freeswitch/issues/652
+	CFLAGS="$CFLAGS -Wno-unused-but-set-variable -Wno-format-truncation" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -97,54 +108,58 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--with-devrandom=/dev/urandom \
-		--with-libpri \
+		--with-python3 \
 		--disable-debug \
 		--enable-core-pgsql-support \
 		--enable-system-lua \
 		--enable-system-xmlrpc-c
 
-	# build freetdm with -lexecinfo
-	make -C libs/freetdm LIBS="-lexecinfo"
+	make libs/libvpx/libvpx.a
 	# first build libfreeswitch (in parallel)
 	make src/include/switch_version.h src/include/switch_swigable_cpp.h
 	make libfreeswitch.la
 	# finally we build the rest
-	make -j1 all
+	make all
 
 	# build perlesl module
 	cd "$builddir"/libs/esl
-	make -j1 perlmod
+	make perlmod
 
-}
-package(){
+	# deal with pkg-config version being bogus
 	cd "$builddir"
+	sed -i s:-release::g build/freeswitch.pc
+}
+
+check() {
+	make check
+}
+
+package() {
 	make -j1 DESTDIR="$pkgdir" install samples-conf samples-htdocs
 
 	install -m755 -D "$srcdir"/$pkgname.initd \
 		"$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd \
 		"$pkgdir"/etc/conf.d/$pkgname
-	chown -R $FREESWITCH_USER:$FREESWITCH_GROUP "$pkgdir"/var/*/freeswitch
+	chown -R $_freeswitch_user:$_freeswitch_group "$pkgdir"/var/*/freeswitch
 
 	# install perlesl module
 	cd "$builddir"/libs/esl
 	make -j1 DESTDIR="$pkgdir" perlmod-install
 }
 
-
 _mv_mod() {
 	local moddir=usr/lib/freeswitch/mod i=
 	mkdir -p "$subpkgdir"/$moddir
-	for i in $@; do
+	for i in "$@"; do
 		mv "$pkgdir"/$moddir/$i.so "$subpkgdir"/$moddir/
 	done
 }
 
-
 flite() {
-        pkgdesc="Freeswitch Text To Speech Module"
-        install=
-        _mv_mod mod_flite
+	pkgdesc="Freeswitch Text To Speech Module"
+	install=
+	_mv_mod mod_flite
 ##
 ## The mod_say_xx modules can be used with out flite (for numbers, etc using
 ## sound files). So they shouldn't be in the flite package -cB
@@ -154,14 +169,6 @@ flite() {
 #		mod_say_th mod_say_he
 }
 
-freetdm() {
-	pkgdesc="Freeswitch FreeTDM Module"
-	install=
-	_mv_mod mod_freetdm ftmod_analog ftmod_analog_em ftmod_libpri \
-		ftmod_skel ftmod_zt
-	mv "$pkgdir"/usr/lib/libfreetdm.so* "$subpkgdir"/usr/lib/
-}
-
 sangoma() {
 	pkgdesc="Freeswitch Sangoma Media Transcode Codec Module"
 	install=
@@ -189,6 +196,12 @@ pgsql() {
 	_mv_mod mod_cdr_pg_csv
 }
 
+mariadb() {
+	pkgdesc="Freeswitch MariaDB Module"
+	install=
+	_mv_mod mod_mariadb
+}
+
 perl() {
 	pkgdesc="Freeswitch Perl module"
 	install=
@@ -202,8 +215,14 @@ perlesl() {
 	mv "$pkgdir"/usr/lib/perl5/* "$subpkgdir"/usr/lib/perl5
 }
 
+python3() {
+	pkgdesc="Freeswitch Python3 module"
+	install=
+	_mv_mod mod_python3
+}
+
 conf() {
-	pkgdesc="Freeswitch sample configureation"
+	pkgdesc="Freeswitch sample configuration"
 	depends="freeswitch-timezones"
 	install=
 	mkdir -p "$subpkgdir"/etc/freeswitch
@@ -215,14 +234,13 @@ conf() {
 	mkdir -p "$pkgdir"/etc/freeswitch/scripts
 }
 
-sha512sums="d395368989763ef35fe4f700692febfc18e548a2a7ed13ffde87ed5330b4f5b39ef322b4aaed69c0c84192b42b2fe11c7f778826902851d139cec1f702a98b56  freeswitch-1.8.7.tar.xz
-8a7ca31cc80524b02edc83af891a32af64dd7834ac14b1389112f2ce7fe06fe602d24509a299898f25e807dd0b88544aecb990bf4bd37ee1c7023ae58dacd28a  0001-sofia-sip-byte-order.patch
-5f93150e1acd632df98bc3bed5613fb1e45180ae4096dcfee5c060da213c8355339260eaf5758cd77c785f6d84cf0661650a872ec574b586ab19803d4f6955f8  0002-FS-verto-bswap_64.patch
-222e3510790de29e29428c70325eb1d4e7852eb4315ee546f137293868bd71acf89e7c85c5ca9d0eb708090c9eef91878a8e12c1b9d5cc99a68fecbd42ad962f  configure-lua53.patch
-c1960f3c7acf729468b819f7f15d66a251c3967b2784bce18c7755b333156e687c55fdc1aceda588ceb1bf9638e2fd4a31a169b00b15c5040cf1001c3c73913b  include-lua53.patch
+sha512sums="
+b43079bc818a86bf667d9b328cf904e49c8455827c199c832ee686ff8634273ea186c35d907bed19d0474cbc2e1232d81624ae878a9aaa3b8897fd76e9916e55  freeswitch-1.10.10.-release.tar.xz
 4ceb48f64d2bc26a02cc0846276506241bfd30c156422b0a1d608fd172c099feb5c121a763652e9a45046dcdd0ba0eb71eab240e0c6ce2ad63ff781719e135a4  getlib.patch
 98a53f289c3647cafd05b6f847da0504a838a6e06545c133c10fb058c2d941e6bccf2820f44649fc25f94a4a5b7c1280eaee91098e8110f96ed3342c1cb4346c  libvpx-fix-arm-float-abi.patch
 16e9208fca7f0a1985dd01ec38ddabb6a79da83ad6ab004bb66de528ac45f02fadaddc50a9f228e1aa38fae213fa5af0ca858b7af629b67a7d654339f813a68c  disable-Werror.patch
-6deecb303e765d44bdd970d5a7079c9dd9ce17d12056b68cd978a182a86b477b4a3c19d2f5a18f36199ca2e0594a3b84de521ab821e2f8c89f7449a3d7f21279  modules.conf
+4739be0c1c6783ace2bd10f7573b1ca86be013d21a7f973b5fd348c98fb9ed1a548baacee6bb65b7501251106c8dbd7266997f8699d2d7070a2bd7efe145b866  python-3.10.patch
+b2e4e5982e600098e00d5dce801f6159dc3d0765e9de5acc05492b4c811f399b4302c4c6a91d9788d8464d46d9c7a64b70a345130b97aa5a73da41acc57f67de  modules.conf
 a585f6411185a26206137a1ad97a06fd6c73e80c5439e9be45eabfa70e7a83120169ba882971fcd328436c8e0242cbd664170b80754ea2846021689baf1f1595  freeswitch.confd
-643d0a2e43f5d3bf3b99fcb6f6422302cb4b74a95eccf844eafb100b15aa9856b4ff41f112d6637255c2e9e2bec9fedc9a9215dfff214dfb83b52eae16b71dca  freeswitch.initd"
+643d0a2e43f5d3bf3b99fcb6f6422302cb4b74a95eccf844eafb100b15aa9856b4ff41f112d6637255c2e9e2bec9fedc9a9215dfff214dfb83b52eae16b71dca  freeswitch.initd
+"
diff --git a/main/freeswitch/configure-lua53.patch b/main/freeswitch/configure-lua53.patch
deleted file mode 100644
index d78f7e8c20b..00000000000
--- a/main/freeswitch/configure-lua53.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 127ee01..1b2c041 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -593,14 +593,14 @@ AC_SUBST(SYS_XMLRPC_CFLAGS)
- AC_SUBST(SYS_XMLRPC_LDFLAGS)
- AM_CONDITIONAL([SYSTEM_XMLRPCC],[test "${enable_xmlrpcc}" = "yes"])
- 
--for luaversion in luajit lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do
-+for luaversion in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do
-   PKG_CHECK_MODULES([LUA],[${luaversion}],[have_lua=yes],[have_lua=no])
-   if test ${have_lua} = yes; then
-     break
-   fi
- done
- if test x"${LUA_LIBS}" = x"" ; then
--   LUA_LIBS="-llua"
-+   LUA_LIBS="-llua5.3"
- fi
- 
- AC_ARG_ENABLE(srtp,
diff --git a/main/freeswitch/include-lua53.patch b/main/freeswitch/include-lua53.patch
deleted file mode 100644
index 85907759815..00000000000
--- a/main/freeswitch/include-lua53.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/src/mod/languages/mod_lua/mod_lua.cpp b/src/mod/languages/mod_lua/mod_lua.cpp
-index 63aaf25..1b37b77 100644
---- a/src/mod/languages/mod_lua/mod_lua.cpp
-+++ b/src/mod/languages/mod_lua/mod_lua.cpp
-@@ -34,9 +34,9 @@
- #include <switch.h>
- #include <switch_event.h>
- SWITCH_BEGIN_EXTERN_C
--#include "lua.h"
--#include <lauxlib.h>
--#include <lualib.h>
-+#include "lua5.3/lua.h"
-+#include <lua5.3/lauxlib.h>
-+#include <lua5.3/lualib.h>
- #include "mod_lua_extra.h"
- SWITCH_MODULE_LOAD_FUNCTION(mod_lua_load);
- SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lua_shutdown);
-diff --git a/src/mod/languages/mod_lua/freeswitch_lua.h b/src/mod/languages/mod_lua/freeswitch_lua.h
-index d205f6b..f34bd84 100644
---- a/src/mod/languages/mod_lua/freeswitch_lua.h
-+++ b/src/mod/languages/mod_lua/freeswitch_lua.h
-@@ -2,9 +2,9 @@
- #define FREESWITCH_LUA_H
- 
- extern "C" {
--#include "lua.h"
--#include <lauxlib.h>
--#include <lualib.h>
-+#include "lua5.3/lua.h"
-+#include <lua5.3/lauxlib.h>
-+#include <lua5.3/lualib.h>
- #include "mod_lua_extra.h"
- }
- #include <switch_cpp.h>
-diff --git a/libs/esl/lua/esl_wrap.cpp b/libs/esl/lua/esl_wrap.cpp
-index d89b83e..261eb97 100644
---- a/libs/esl/lua/esl_wrap.cpp
-+++ b/libs/esl/lua/esl_wrap.cpp
-@@ -730,8 +730,8 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
- extern "C" {
- #endif
- 
--#include "lua.h"
--#include "lauxlib.h"
-+#include "lua5.3/lua.h"
-+#include "lua5.3/lauxlib.h"
- #include <stdlib.h>  /* for malloc */
- #include <assert.h>  /* for a few sanity tests */
diff --git a/main/freeswitch/modules.conf b/main/freeswitch/modules.conf
index 9a27687e33c..f2a3b1677cb 100644
--- a/main/freeswitch/modules.conf
+++ b/main/freeswitch/modules.conf
@@ -1,12 +1,15 @@
 #applications/mod_abstraction
+#applications/mod_av
 applications/mod_avmd
+#applications/mod_bert
 applications/mod_blacklist
 applications/mod_callcenter
-#applications/mod_cidlookup
+applications/mod_cidlookup
 applications/mod_cluechoo
 applications/mod_commands
 applications/mod_conference
 applications/mod_curl
+#applications/mod_cv
 applications/mod_db
 applications/mod_directory
 applications/mod_distributor
@@ -20,29 +23,38 @@ applications/mod_fifo
 #applications/mod_fsk
 #applications/mod_fsv
 applications/mod_hash
+#applications/mod_hiredis
 applications/mod_httapi
-#applications/mod_http_cache
+applications/mod_http_cache
 #applications/mod_ladspa
 #applications/mod_lcr
 #applications/mod_memcache
 #applications/mod_mongo
+#applications/mod_mp4
+#applications/mod_mp4v2
 #applications/mod_nibblebill
+#applications/mod_oreka
 #applications/mod_osp
+#applications/mod_prefix
+#applications/mod_rad_auth
 applications/mod_redis
 #applications/mod_rss
+#applications/mod_signalwire
 applications/mod_sms
+#applications/mod_sms_flowroute
 #applications/mod_snapshot
-#applications/mod_snipe_hunt
 #applications/mod_snom
+#applications/mod_sonar
 #applications/mod_soundtouch
 applications/mod_spandsp
 applications/mod_spy
 #applications/mod_stress
+#applications/mod_translate
 applications/mod_valet_parking
+#applications/mod_video_filter
 #applications/mod_vmd
 applications/mod_voicemail
 applications/mod_voicemail_ivr
-#applications/mod_random
 #asr_tts/mod_cepstral
 asr_tts/mod_flite
 #asr_tts/mod_pocketsphinx
@@ -50,29 +62,33 @@ asr_tts/mod_flite
 #asr_tts/mod_unimrcp
 codecs/mod_amr
 #codecs/mod_amrwb
+codecs/mod_b64
 #codecs/mod_bv
-#codecs/mod_celt
+#codecs/mod_clearmode
 #codecs/mod_codec2
 #codecs/mod_com_g729
 #codecs/mod_dahdi_codec
 codecs/mod_g723_1
 codecs/mod_g729
 codecs/mod_h26x
-#codecs/mod_vpx
-codecs/mod_ilbc
+#codecs/mod_ilbc
 #codecs/mod_isac
+#codecs/mod_mp4v
 codecs/mod_opus
 codecs/mod_sangoma_codec
 #codecs/mod_silk
 #codecs/mod_siren
+#codecs/mod_theora
+databases/mod_mariadb
+databases/mod_pgsql
 dialplans/mod_dialplan_asterisk
 #dialplans/mod_dialplan_directory
 dialplans/mod_dialplan_xml
 #directories/mod_ldap
 #endpoints/mod_alsa
 endpoints/mod_dingaling
+#endpoints/mod_gsmopen
 #endpoints/mod_h323
-#endpoints/mod_html5
 #endpoints/mod_khomp
 endpoints/mod_loopback
 #endpoints/mod_opal
@@ -80,20 +96,27 @@ endpoints/mod_portaudio
 endpoints/mod_rtc
 endpoints/mod_rtmp
 endpoints/mod_skinny
-#endpoints/mod_skypopen
 endpoints/mod_sofia
 endpoints/mod_verto
+#event_handlers/mod_amqp
 event_handlers/mod_cdr_csv
-event_handlers/mod_json_cdr
 #event_handlers/mod_cdr_mongodb
 event_handlers/mod_cdr_pg_csv
 event_handlers/mod_cdr_sqlite
 #event_handlers/mod_erlang_event
 #event_handlers/mod_event_multicast
 event_handlers/mod_event_socket
-#event_handlers/mod_event_zmq
+#event_handlers/mod_fail2ban
+#event_handlers/mod_format_cdr
+event_handlers/mod_json_cdr
 #event_handlers/mod_radius_cdr
+#event_handlers/mod_odbc_cdr
+#event_handlers/mod_kazoo
+#event_handlers/mod_rayo
+#event_handlers/mod_smpp
 event_handlers/mod_snmp
+#event_handlers/mod_event_zmq
+#formats/mod_imagick
 formats/mod_local_stream
 formats/mod_native_file
 formats/mod_png
@@ -101,28 +124,39 @@ formats/mod_png
 formats/mod_shell_stream
 formats/mod_shout
 formats/mod_sndfile
+#formats/mod_ssml
 formats/mod_tone_stream
 #formats/mod_vlc
+#formats/mod_opusfile
+#languages/mod_basic
 #languages/mod_java
 languages/mod_lua
 #languages/mod_managed
 languages/mod_perl
-#languages/mod_python
-#languages/mod_spidermonkey
+languages/mod_python3
+#languages/mod_v8
 #languages/mod_yaml
 loggers/mod_console
+#loggers/mod_graylog2
 loggers/mod_logfile
 loggers/mod_syslog
-#say/mod_say_de
+#loggers/mod_raven
+say/mod_say_de
 say/mod_say_en
 say/mod_say_es
+say/mod_say_es_ar
+say/mod_say_fa
 say/mod_say_fr
 say/mod_say_he
+say/mod_say_hr
 say/mod_say_hu
 say/mod_say_it
+say/mod_say_ja
 say/mod_say_nl
+say/mod_say_pl
 say/mod_say_pt
 say/mod_say_ru
+say/mod_say_sv
 say/mod_say_th
 say/mod_say_zh
 #timers/mod_posix_timer
@@ -130,11 +164,9 @@ timers/mod_timerfd
 xml_int/mod_xml_cdr
 xml_int/mod_xml_curl
 #xml_int/mod_xml_ldap
+#xml_int/mod_xml_radius
 xml_int/mod_xml_rpc
 xml_int/mod_xml_scgi
 
-../../libs/freetdm/mod_freetdm
-#../../libs/openzap/mod_openzap
-
 ## Experimental Modules (don't cry if they're broken)
 #../../contrib/mod/xml_int/mod_xml_odbc
diff --git a/main/freeswitch/python-3.10.patch b/main/freeswitch/python-3.10.patch
new file mode 100644
index 00000000000..2d1d01fd5f9
--- /dev/null
+++ b/main/freeswitch/python-3.10.patch
@@ -0,0 +1,22 @@
+diff --git a/configure.ac b/configure.ac
+index 990a59db2a..57a187aa11 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1765,7 +1765,7 @@ then
+ 
+ 		AC_MSG_CHECKING([for python distutils])
+ 		python_result="`$PYTHON -c 'import distutils;' 2>&1`"
+-		if test -z "$python_result" ; then
++		if test $? -eq 0; then
+ 			python_has_distutils="yes"
+ 		else
+ 			python_has_distutils="no"
+@@ -1886,7 +1886,7 @@ then
+ 
+ 		AC_MSG_CHECKING([for python3 distutils])
+ 		python3_result="`$PYTHON3 -c 'import distutils;' 2>&1`"
+-		if test -z "$python3_result" ; then
++		if test $? -eq 0 ; then
+ 			python3_has_distutils="yes"
+ 		else
+ 			python3_has_distutils="no"
diff --git a/main/freetdm/APKBUILD b/main/freetdm/APKBUILD
new file mode 100644
index 00000000000..a8f747f5aa1
--- /dev/null
+++ b/main/freetdm/APKBUILD
@@ -0,0 +1,48 @@
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
+pkgname=freetdm
+# upstream does not tag a release
+# the pkgver is the commit date
+pkgver=0_git20210830
+_commitid=8918ee1c3637cad0f9d41a402d26d3aa076fc202
+pkgrel=5
+pkgdesc="FreeTDM Endpoint Module "
+url="https://github.com/freeswitch/freetdm"
+arch="all"
+license="BSD-3-Clause"
+makedepends="libtool automake autoconf
+freeswitch-dev gsm-dev libpcap-dev zlib-dev
+python3-dev"
+checkdepends="gzip"
+subpackages="$pkgname-dev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/freeswitch/freetdm/archive/$_commitid.tar.gz
+remove-werr.patch"
+builddir="$srcdir"/$pkgname-$_commitid
+
+prepare() {
+	default_prepare
+	sh bootstrap
+}
+
+build() {
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--with-modinstdir=/usr/lib/freeswitch
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	mkdir -p "$pkgdir"/etc/freeswitch/autoload_configs
+	echo '<load module="mod_freetdm"/>' >> "$pkgdir"/etc/freeswitch/autoload_configs/modules.conf.xml
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+059dd7c78a2fa08d79f9e4b9301ac4a0c8ccad9c32359e7c25f4fe5bdff33f9d146be746968baeb03b2c8702c33dbb962fc192f7fd20c8f8d2b5dbb81f2ecb77  freetdm-0_git20210830.tar.gz
+9bbf829370a374c9e09b1bfc02be158695213f4e62d116ee25960f5d05a5a52a8b7956e1def6795686e054f9d03aa270e345930a3401025450a23fb381ac4450  remove-werr.patch
+"
diff --git a/main/freetdm/remove-werr.patch b/main/freetdm/remove-werr.patch
new file mode 100644
index 00000000000..1aee35c0a2c
--- /dev/null
+++ b/main/freetdm/remove-werr.patch
@@ -0,0 +1,44 @@
+diff --git a/configure.ac b/configure.ac
+index aefebab..8b5041d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,7 +88,7 @@ AC_ARG_ENABLE([enable_64],
+ 
+ case "${ax_cv_c_compiler_vendor}" in
+ gnu)
+-	COMP_VENDOR_CFLAGS="-ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -O0"
++	COMP_VENDOR_CFLAGS="-ffast-math -Wall  -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -O0"
+ 	;;
+ sun)
+ 	COMP_VENDOR_CFLAGS="-xc99=all -mt -xCC -xvpara"
+@@ -97,7 +97,7 @@ sun)
+ 	fi
+ 	;;
+ *)
+-	COMP_VENDOR_COMPAT_CFLAGS="-Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes"
++	COMP_VENDOR_COMPAT_CFLAGS="-Wall  -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes"
+ 	COMP_VENDOR_CFLAGS="-std=c99 $COMP_VENDOR_COMPAT_CFLAGS"
+ 	;;
+ esac
+diff --git a/mod_freetdm/CMakeLists.txt b/mod_freetdm/CMakeLists.txt
+index 25847e7..7c7505a 100644
+--- a/mod_freetdm/CMakeLists.txt
++++ b/mod_freetdm/CMakeLists.txt
+@@ -5,7 +5,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+ PROJECT(mod_freetdm)
+ 
+ IF(NOT DEFINED WIN32)
+-	ADD_DEFINITIONS(-g -O2 -ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -O0 -g -ggdb -DPACKAGE_NAME=\"freetdm\" -DPACKAGE_TARNAME=\"freetdm\" -DPACKAGE_VERSION=\"pre-alpha\" -DPACKAGE_STRING=\"freetdm\ pre-alpha\" -DPACKAGE_BUGREPORT=\"bugs@freeswitch.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"libfreetdm\" -DVERSION=\"0.1\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_LIBDL=1 -DHAVE_LIBPTHREAD=1 -DHAVE_LIBM=1 -DSIZEOF_LONG=8 -DHAVE_NETINET_SCTP_H=1 -DHAVE_NETDB_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_GETHOSTBYNAME_R=1) # -DDEBUG=/\*\*/)
++	ADD_DEFINITIONS(-g -O2 -ffast-math -Wall  -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -O0 -g -ggdb -DPACKAGE_NAME=\"freetdm\" -DPACKAGE_TARNAME=\"freetdm\" -DPACKAGE_VERSION=\"pre-alpha\" -DPACKAGE_STRING=\"freetdm\ pre-alpha\" -DPACKAGE_BUGREPORT=\"bugs@freeswitch.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"libfreetdm\" -DVERSION=\"0.1\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_LIBDL=1 -DHAVE_LIBPTHREAD=1 -DHAVE_LIBM=1 -DSIZEOF_LONG=8 -DHAVE_NETINET_SCTP_H=1 -DHAVE_NETDB_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_GETHOSTBYNAME_R=1) # -DDEBUG=/\*\*/)
+ ENDIF(NOT DEFINED WIN32)
+ 
+ # includes
+@@ -19,7 +19,7 @@ INCLUDE_DIRECTORIES(${mod_freetdm_INCLUDES})
+ 
+ LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/..)
+ ADD_LIBRARY(${PROJECT_NAME} SHARED mod_freetdm.c)
+-TARGET_LINK_LIBRARIES(${PROJECT_NAME} freetdm -fPIC -Werror -fvisibility=hidden)
++TARGET_LINK_LIBRARIES(${PROJECT_NAME} freetdm -fPIC  -fvisibility=hidden)
+ 
+ IF(DEFINED WIN32)
+ 	SET(EXT lib)
diff --git a/main/freetds/APKBUILD b/main/freetds/APKBUILD
index d6a4668dc88..3f0c19b4bcd 100644
--- a/main/freetds/APKBUILD
+++ b/main/freetds/APKBUILD
@@ -1,22 +1,23 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Michael Mason <ms13sp@gmail.com>
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=freetds
-pkgver=1.1.24
+pkgver=1.4.12
 pkgrel=0
 pkgdesc="Tabular Datastream Library"
-url="https://www.freetds.org"
+url="https://www.freetds.org/"
 arch="all"
 license="GPL-2.0-or-later OR LGPL-2.0-or-later"
-makedepends="openssl-dev linux-headers readline-dev unixodbc-dev"
+makedepends="openssl-dev>3 linux-headers readline-dev unixodbc-dev"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="https://www.freetds.org/files/stable/$pkgname-$pkgver.tar.bz2
-	fix-includes.patch
-	"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://www.freetds.org/files/stable/freetds-$pkgver.tar.bz2"
 options="!check"  # tests require running SQL server http://www.freetds.org/userguide/confirminstall.htm#TESTS
 
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -37,9 +38,9 @@ check() {
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
-sha512sums="7419a8f171ab50aeeb0cf0adc7f29c524dd5960a79249f89a52ec73b4cb843330d6c096aa71405cbe28bf568a8b7726f255955f74b3c12b5452d5b74715ecaa5  freetds-1.1.24.tar.bz2
-d75d1aab6687586697f3e430db1e82f21208f10076b45996542eea682e36cbbbb344f479a9336fcfd294b5b87d7acb2ec5fb8ddd1914e990e23dd5e7ae93a0b6  fix-includes.patch"
+sha512sums="
+cb537490a06c12aa25ce02e1c3b474ad8d6a2be0737719c1b9f83d51245d275abcbd6f4a32dec158cac964ea924458609e253bf9c1497572e386a7436506df8c  freetds-1.4.12.tar.bz2
+"
diff --git a/main/freetds/fix-includes.patch b/main/freetds/fix-includes.patch
deleted file mode 100644
index af9465d758a..00000000000
--- a/main/freetds/fix-includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/apps/fisql/fisql.c b/src/apps/fisql/fisql.c
-index ec8fded..fd76956 100644
---- a/src/apps/fisql/fisql.c
-+++ b/src/apps/fisql/fisql.c
-@@ -25,6 +25,7 @@
- #include <unistd.h>
- #include <setjmp.h>
- #include <signal.h>
-+#include <sys/stat.h>
- #ifdef HAVE_READLINE
- #include <readline/readline.h>
- #include <readline/history.h>
diff --git a/main/freetype/APKBUILD b/main/freetype/APKBUILD
index 37747e64d17..1e9f9e91e11 100644
--- a/main/freetype/APKBUILD
+++ b/main/freetype/APKBUILD
@@ -1,57 +1,78 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=freetype
-pkgver=2.10.1
+pkgver=2.13.2
 pkgrel=0
 pkgdesc="TrueType font rendering library"
 url="https://www.freetype.org/"
 arch="all"
-license="FTL GPL-2.0-or-later"
+license="FTL OR GPL-2.0-or-later"
 options="!check"
-makedepends="$depends_dev zlib-dev libpng-dev bzip2-dev"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="https://download.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz
-	0001-Enable-table-validation-modules.patch
+makedepends="
+	brotli-dev
+	bzip2-dev
+	libpng-dev
+	libx11-dev
+	meson
+	zlib-dev
+	"
+subpackages="
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-demos
+	$pkgname-doc
+	"
+source="
+	https://de.freedif.org/savannah/freetype/freetype-$pkgver.tar.xz
+	https://de.freedif.org/savannah/freetype/ft2demos-$pkgver.tar.xz
+	pcf-family-names.patch
 	subpixel.patch
+	table-validation-modules.patch
 	"
 
 # secfixes:
+#   2.12.1-r0:
+#     - CVE-2022-27404
+#     - CVE-2022-27405
+#     - CVE-2022-27406
+#   2.10.4-r0:
+#     - CVE-2020-15999
 #   2.9-r1:
 #     - CVE-2018-6942
 #   2.7.1-r1:
 #     - CVE-2017-8105
 #     - CVE-2017-8287
 
-builddir="$srcdir/$pkgname-$pkgver"
+prepare() {
+	default_prepare
 
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--enable-static \
-		--with-bzip2 \
-		--with-png \
-		--enable-freetype-config
-	make
+	ln -sfv ../../freetype-$pkgver "$srcdir"/ft2demos-$pkgver/subprojects/freetype2
 }
 
-static() {
-	pkgdesc="$pkgname static libraries"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
+build() {
+	abuild-meson \
+		-Dfreetype2:default_library=both \
+		-Dlibrsvg=disabled \
+		"$srcdir"/ft2demos-$pkgver output
+	meson compile -C output
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+	install -Dm644 builds/unix/freetype2.m4 \
+		-t "$pkgdir"/usr/share/aclocal
+}
+
+demos() {
+	pkgdesc="A collection of FreeType demos"
+
+	amove usr/bin
 }
 
-sha512sums="c7a565b0ab3dce81927008a6965d5c7540f0dc973fcefdc1677c2e65add8668b4701c2958d25593cb41f706f4488765365d40b93da71dbfa72907394f28b2650  freetype-2.10.1.tar.xz
-580fe59acddfd41966e387bdb6a88336b8bc119cc3d60d8689be20c96fb0dd07c5138ea31f6cb9c854f497ecb41c3adc49eb3ec16a34b2e010e8294851770763  0001-Enable-table-validation-modules.patch
-72883fa203fd2552a7b1b8c39b4aaa68d407c62c289236031cd0fa1c8cdc6ad38e90d3b53f8ee682064986d09c9455961f4941c80566b150d15d5539a716c190  subpixel.patch"
+sha512sums="
+a5917edaa45cb9f75786f8a4f9d12fdf07529247e09dfdb6c0cf7feb08f7588bb24f7b5b11425fb47f8fd62fcb426e731c944658f6d5a59ce4458ad5b0a50194  freetype-2.13.2.tar.xz
+aa83ba4212ff7c4453b72f036136cb9b04cacf7d196388a3e4752613e000b3bb45a4dcf63d3d1d5b3d6ada10720304b532fb6e33ed6a5b399dcce45c27af9ade  ft2demos-2.13.2.tar.xz
+78ad6b1de388d3986fd5a51a7076b0a9d782733e85f400fc8c070b40e5e48130a562a67a7a9b251169b74ae052f571ea8e6b0f9435c271520d93dd72c1845d59  pcf-family-names.patch
+55fb06dbc7cc950129a99d9fd5480397b3e0720f32ab65fb3893768ed40e2de27be2cfd52ec6da490f79c79b4ddfecd0b7efcd32da4a95f2666a6b67a3cd9a31  subpixel.patch
+580fe59acddfd41966e387bdb6a88336b8bc119cc3d60d8689be20c96fb0dd07c5138ea31f6cb9c854f497ecb41c3adc49eb3ec16a34b2e010e8294851770763  table-validation-modules.patch
+"
diff --git a/main/freetype/pcf-family-names.patch b/main/freetype/pcf-family-names.patch
new file mode 100644
index 00000000000..773f1a44265
--- /dev/null
+++ b/main/freetype/pcf-family-names.patch
@@ -0,0 +1,13 @@
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 9e03e17..1411db6 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -913,7 +913,7 @@ FT_BEGIN_HEADER
+    * If this option is activated, it can be controlled with the
+    * `no-long-family-names` property of the 'pcf' driver module.
+    */
+-/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
++#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+ 
+ 
+   /*************************************************************************/
diff --git a/main/freetype/subpixel.patch b/main/freetype/subpixel.patch
index eb1300a0e07..e5da0d74442 100644
--- a/main/freetype/subpixel.patch
+++ b/main/freetype/subpixel.patch
@@ -10,12 +10,3 @@ diff -Naur a/include/freetype/config/ftoption.h b/include/freetype/config/ftopti
  
  
    /**************************************************************************
-@@ -658,7 +658,7 @@
-    * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
-    */
- /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  1         */
--#define TT_CONFIG_OPTION_SUBPIXEL_HINTING  2
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING  3
- /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 ) */
- 
- 
diff --git a/main/freetype/0001-Enable-table-validation-modules.patch b/main/freetype/table-validation-modules.patch
index 968475e3916..968475e3916 100644
--- a/main/freetype/0001-Enable-table-validation-modules.patch
+++ b/main/freetype/table-validation-modules.patch
diff --git a/main/fribidi/APKBUILD b/main/fribidi/APKBUILD
index 4450f6d5e14..d46978f030e 100644
--- a/main/fribidi/APKBUILD
+++ b/main/fribidi/APKBUILD
@@ -1,33 +1,38 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fribidi
-pkgver=1.0.9
+pkgver=1.0.13
 pkgrel=0
 pkgdesc="Free Implementation of the Unicode Bidirectional Algorithm"
 url="https://github.com/fribidi/fribidi"
 arch="all"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
+makedepends="meson"
 subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
 source="https://github.com/fribidi/fribidi/releases/download/v$pkgver/fribidi-$pkgver.tar.xz"
 
 # secfixes:
+#   1.0.12-r0:
+#     - CVE-2022-25308
+#     - CVE-2022-25309
+#     - CVE-2022-25310
 #   1.0.7-r1:
 #     - CVE-2019-18397
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--enable-static
-	make
+	abuild-meson \
+		-Ddefault_library=both \
+	. output
+	meson compile -C output
 }
 
 check() {
-	make check
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-sha512sums="e66989830941172fa003c8b9376719282fa1039592a1e158e975cab81ce8dcb2755453c64906a8464c047f9e9154e012d9bd37256b1f463e235648a13e4601ed  fribidi-1.0.9.tar.xz"
+sha512sums="
+09357d842ff9e05b918f826e28e4a25ad996e17f73242ee9ce53fae9f37ec6c639f9cae4271577f6e0269f34265afc893858225c4a94610f0a6ee7580fb1fe07  fribidi-1.0.13.tar.xz
+"
diff --git a/main/frotz/APKBUILD b/main/frotz/APKBUILD
deleted file mode 100644
index bf7abb80ba8..00000000000
--- a/main/frotz/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
-# Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
-pkgname=frotz
-pkgver=2.44
-pkgrel=0
-pkgdesc="A Portable Z-Machine Interpreter"
-url="http://frotz.sourceforge.net/"
-arch="all"
-license="GPL"
-depends=""
-depends_dev=""
-makedepends="ncurses-dev"
-install=""
-subpackages="$pkgname-doc"
-source="${pkgname}-${pkgver}.tar.gz::https://github.com/DavidGriffith/${pkgname}/archive/${pkgver}.tar.gz
-	Makefile.patch"
-builddir="$srcdir/$pkgname-${pkgver}"
-
-build() {
-	cd "$builddir"
-	make
-}
-
-package() {
-	cd "$builddir"
-	strip $pkgname
-	install -m755 -d "${pkgdir}/usr/bin"
-	install -m755 -d "${pkgdir}/usr/share/man/man6"
-        install -m755 $pkgname "${pkgdir}/usr/bin/"
-        install -m644 doc/${pkgname}.6 ${pkgdir}/usr/share/man/man6/${pkgname}.6
-}
-
-sha512sums="20b2c8948f093463c53498b322230881aa1ad9c8fd68a338b4f5c4803ab28007fc8ba63f6d20f2b4d440fd04138709b9f4f103c9f8a71788e80156ccdff9ce1f  frotz-2.44.tar.gz
-50bd0db62eb09bb316dbab106d2bba0ad389e151fefbc587dbd15faf238b559276ce9d603333d5da8760623d014e2587609b96401e616f22062cb0a6aaa2f346  Makefile.patch"
diff --git a/main/frotz/Makefile.patch b/main/frotz/Makefile.patch
deleted file mode 100644
index ead06f88d04..00000000000
--- a/main/frotz/Makefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/frotz-2.43d/Makefile	2012-01-03 08:32:58.000000000 +0000
-+++ ../Makefile	2014-12-01 13:08:50.390040011 +0000
-@@ -14,19 +14,19 @@
- #-malign-jumps=2
- 
- # Define where you want Frotz installed.  Usually this is /usr/local
--PREFIX = /usr/local
-+PREFIX = /usr
- 
--MAN_PREFIX = $(PREFIX)
--#MAN_PREFIX = /usr/local/share
-+#MAN_PREFIX = $(PREFIX)
-+MAN_PREFIX = /usr/share
- 
--CONFIG_DIR = $(PREFIX)/etc
--#CONFIG_DIR = /etc
-+#CONFIG_DIR = $(PREFIX)/etc
-+CONFIG_DIR = /etc
- 
- # Define where you want Frotz to look for frotz.conf.
- #
--CONFIG_DIR = /usr/local/etc
--#CONFIG_DIR = /etc
--#CONFIG_DIR = /usr/pkg/etc
-+#CONFIG_DIR = /usr/local/etc
-+#CONFIG_DIR = /etc                                                      
-+#CONFIG_DIR = /usr/pkg/etc                                                   
- #CONFIG_DIR =
- 
- # Uncomment this if you want color support.  Most, but not all curses
-@@ -73,15 +73,15 @@
- # curses library won't work, comment out the first option and uncomment
- # the second.
- #
--CURSES = -lcurses
--#CURSES = -lncurses
-+#CURSES = -lcurses
-+CURSES = -lncurses
- 
- # Uncomment this if your need to use ncurses instead of the
- # vendor-supplied curses library.  This just tells the compile process
- # which header to include, so don't worry if ncurses is all you have
- # (like on Linux).  You'll be fine.
- #
--#CURSES_DEF = -DUSE_NCURSES_H
-+CURSES_DEF = -DUSE_NCURSES_H
- 
- # Uncomment this if you're compiling Unix Frotz on a machine that lacks
- # the memmove(3) system call.  If you don't know what this means, leave it
diff --git a/main/fsarchiver/APKBUILD b/main/fsarchiver/APKBUILD
index c1832b12187..fe71b7f76ad 100644
--- a/main/fsarchiver/APKBUILD
+++ b/main/fsarchiver/APKBUILD
@@ -1,13 +1,13 @@
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=fsarchiver
-pkgver=0.8.5
+pkgver=0.8.7
 pkgrel=1
 pkgdesc="Safe and flexible file-system backup and deployment tool"
 options="!check" # No testsuite
 arch="all"
-url="http://www.fsarchiver.org/"
-license="GPL-2.0-only"
+url="https://www.fsarchiver.org/"
+license="GPL-2.0-or-later"
 makedepends="linux-headers attr-dev bzip2-dev e2fsprogs-dev lz4-dev lzo-dev
 	xz-dev libgcrypt-dev zlib-dev zstd-dev"
 subpackages="$pkgname-doc"
@@ -25,4 +25,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="bf427dfcc5a73fc799710766dc1c1392ed379565ec68d7cef49e9391da749e08fb655f2b86b4ab4db7cacaf323286b4673a7c3fbebba81ac50d0b66c1f0b91ff  fsarchiver-0.8.5.tar.gz"
+sha512sums="
+6f7099c9f961f78fc23e6cee57dfb109f0e2e00a707875175e37786ba0abb7a2e6330662f57a4122215c80dff63b8dc1b270690c0f8cc3bedbca83ab857c19b2  fsarchiver-0.8.7.tar.gz
+"
diff --git a/main/fstrm/APKBUILD b/main/fstrm/APKBUILD
index b134c4db551..a31ade37efe 100644
--- a/main/fstrm/APKBUILD
+++ b/main/fstrm/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: tcely <tcely@users.noreply.github.com>
-# Maintainer:
-pkgname="fstrm"
-pkgver="0.6.0"
-pkgrel=1
+# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
+pkgname=fstrm
+pkgver=0.6.1
+pkgrel=4
 pkgdesc="Frame Streams implementation in C"
 url="https://github.com/farsightsec/fstrm"
 arch="all"
@@ -15,9 +15,12 @@ subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-utils"
 source="https://dl.farsightsecurity.com/dist/fstrm/fstrm-$pkgver.tar.gz
 	reduce-testruns.patch"
 
-build() {
-	cd "$builddir"
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
+build() {
 	./configure \
 		--build="$CBUILD" \
 		--host="$CHOST" \
@@ -34,14 +37,10 @@ _cat_found_file() {
 }
 
 check() {
-	cd "$builddir"
-
 	make check || _cat_found_file 'test-suite.log'
 }
 
 package() {
-	cd "$builddir"
-
 	make -j1 DESTDIR="$pkgdir" install
 }
 
@@ -51,5 +50,5 @@ utils() {
 	mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/
 }
 
-sha512sums="d1b754caadb1bd8b4b4ce3e7394168dd0a20353e0b7ac65f28d016d840aefe6fa1ab1aa778564e775152164855b38a47ab5817866f8bfb0b2d70520b2881225d  fstrm-0.6.0.tar.gz
+sha512sums="b8bc954d894a6967ab20975949d3b5ab142933bb14d51f0bd93d6f72e6a8963d06365626ae4df977b70b2678eb495ca6edaedbfd1b9149ac1ec9384df2b56806  fstrm-0.6.1.tar.gz
 1c687ee7741fb20a571c3d7d3fb9a1cf09709d83d66d788eb09835750ee2313aa565f74d35a9cdece2154e1b8c41c68b268ca8f5bc33f8d14550ebe46880d550  reduce-testruns.patch"
diff --git a/main/fts/APKBUILD b/main/fts/APKBUILD
deleted file mode 100644
index 95b188f2eb1..00000000000
--- a/main/fts/APKBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor: 
-# Maintainer: 
-pkgname=fts
-pkgver=1.2.7
-pkgrel=1
-pkgdesc="Provides the fts(3) functions, which are missing in musl libc"
-url="https://github.com/pullmoll/musl-fts/"
-arch="all"
-license="BSD-3-Clause"
-makedepends="automake autoconf libtool"
-subpackages="$pkgname-dev"
-source="https://github.com/pullmoll/musl-fts/archive/v$pkgver.zip"
-
-builddir="$srcdir/musl-$pkgname-$pkgver"
-prepare() {
-	default_prepare
-	cd "$builddir"
-	./bootstrap.sh
-}
-
-build() {
-	cd "$builddir"
-	CFLAGS=-fPIC ./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-
-	mkdir -p "$pkgdir"/usr/lib/pkgconfig
-	cp "$builddir"/musl-fts.pc "$pkgdir"/usr/lib/pkgconfig/libfts.pc
-}
-
-sha512sums="69aceaa7a8dc7ab5845d3288e315357f92ac32fac55c3d670186f2c5756f665a11471fc81f67126755a707058a8d293ba926d906f542c1360a49ca3c9b357976  v1.2.7.zip"
diff --git a/main/fuse/APKBUILD b/main/fuse/APKBUILD
index a9c656eac7a..84babe727c2 100644
--- a/main/fuse/APKBUILD
+++ b/main/fuse/APKBUILD
@@ -1,29 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fuse
 pkgver=2.9.9
-pkgrel=0
+pkgrel=5
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
 url="https://github.com/libfuse/libfuse/"
 arch="all"
-license="GPL-2.0-only LGPL-2.1-only"
+license="GPL-2.0-only AND LGPL-2.1-only"
 options="suid !check" # No test suite
 depends="fuse-common"
 makedepends="gettext-dev"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 source="https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.gz
 	fix-realpath.patch
 	"
 
 # secfixes:
 #   2.9.8-r0:
-#   - CVE-2018-10906
+#     - CVE-2018-10906
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
 	UDEV_RULES_PATH='/lib/udev/rules.d' ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--disable-static \
+		--enable-static \
 		--enable-shared \
 		--disable-example \
 		--enable-lib \
diff --git a/main/fuse3/APKBUILD b/main/fuse3/APKBUILD
index 99949c9a53f..63b83ae31d4 100644
--- a/main/fuse3/APKBUILD
+++ b/main/fuse3/APKBUILD
@@ -1,38 +1,44 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fuse3
-_pkgname=fuse
-pkgver=3.9.1
+pkgver=3.16.2
 pkgrel=0
-pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface"
+pkgdesc="Reference implementation of the Linux FUSE (Filesystem in Userspace) interface"
 url="https://github.com/libfuse/libfuse"
 arch="all"
-license="GPL-2.0-only LGPL-2.1-only"
+license="GPL-2.0-only AND LGPL-2.1-only"
 depends="fuse-common"
-makedepends="gettext-dev linux-headers meson eudev-dev python3
-	py3-six py3-pluggy py3-attrs py3-py"
+makedepends="
+	eudev-dev
+	gettext-dev
+	linux-headers
+	meson
+	"
 checkdepends="py3-pytest"
-subpackages="$pkgname-dev $pkgname-doc fuse-common:_common fuse-openrc:_openrc $pkgname-libs"
-source="https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.xz
-	fix-realpath.patch
+subpackages="
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-libs
+	fuse-common:_common
+	fuse-openrc:_openrc
+	"
+source="https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.gz
 	fuse.initd
+	dont-mknod-dev-fuse.patch
 	"
 options="suid !check" # check is currently broken: https://github.com/libfuse/libfuse/issues/293
-
-builddir="$srcdir"/$_pkgname-$pkgver
+builddir="$srcdir"/fuse-$pkgver
 
 # secfixes:
 #   3.2.5-r0:
 #     - CVE-2018-10906
 
 build() {
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--buildtype=plain \
+	abuild-meson \
+		-Dinitscriptdir="" \
+		--default-library=both \
 		. output
-	ninja -C output
+	meson compile -C output
 }
 
 check() {
@@ -40,29 +46,28 @@ check() {
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C output install
-	rm -r "$pkgdir"/dev "$pkgdir"/etc/init.d
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 
 	install -Dm755 "$srcdir"/fuse.initd "$pkgdir"/etc/init.d/fuse
 	# create config
 	install -d "$pkgdir"/etc
-	cat >"$pkgdir"/etc/fuse.conf << _EOF_
-# Set the maximum number of FUSE mounts allowed to non-root users.
-# The default is 1000.
-#
-#mount_max = 1000
+	cat >"$pkgdir"/etc/fuse.conf <<- _EOF_
+	# Set the maximum number of FUSE mounts allowed to non-root users.
+	# The default is 1000.
+	#
+	#mount_max = 1000
 
-# Allow non-root users to specify the 'allow_other' or 'allow_root'
-# mount options.
-#
-#user_allow_other
-_EOF_
+	# Allow non-root users to specify the 'allow_other' or 'allow_root'
+	# mount options.
+	#
+	#user_allow_other
+	_EOF_
 }
 
 _common() {
 	pkgdesc="Common files for fuse2 and fuse3"
-	mkdir -p "$subpkgdir"/etc/
-	mv "$pkgdir"/etc/fuse.conf "$subpkgdir"/etc/
+
+	amove etc/fuse.conf
 }
 
 _openrc() {
@@ -70,6 +75,8 @@ _openrc() {
 	install_if="openrc fuse-common=$pkgver-r$pkgrel"
 }
 
-sha512sums="295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329  fuse-3.9.1.tar.xz
-1a9e1d1e8a7b0778ffde328e4322c73b5d57ec98d52767c846d755cce861ab27989823a75b6c5f994432ddb77fa351dfa4a8f948c9467c5f7d5f471e4608358b  fix-realpath.patch
-7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1  fuse.initd"
+sha512sums="
+3e8889863cd67dada67271f095f694dc9e5aaf2561fd1e2285aee95b5a54e692bb195ab8fce57fc2bdf08d0ea17b6d56ca4967b4e4371d639d6133907b2370d3  fuse-3.16.2.tar.gz
+7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1  fuse.initd
+9b32a6ba1d1e5fcb7709eaa8e4d5e90fbdd6873ab97b0c651b6d5dda80644a4d1a7c3d1e201929d1f0b13f29422f2cdedf5127832b05d751d0ef83b53870e57a  dont-mknod-dev-fuse.patch
+"
diff --git a/main/fuse3/dont-mknod-dev-fuse.patch b/main/fuse3/dont-mknod-dev-fuse.patch
new file mode 100644
index 00000000000..c3604fff5c1
--- /dev/null
+++ b/main/fuse3/dont-mknod-dev-fuse.patch
@@ -0,0 +1,14 @@
+--- a/util/install_helper.sh
++++ b/util/install_helper.sh
+@@ -30,11 +30,6 @@
+ if $useroot; then
+     chown root:root "${DESTDIR}${bindir}/fusermount3"
+     chmod u+s "${DESTDIR}${bindir}/fusermount3"
+-
+-    if test ! -e "${DESTDIR}/dev/fuse"; then
+-        mkdir -p "${DESTDIR}/dev"
+-        mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229
+-    fi
+ fi
+ 
+ if [ "${udevrulesdir}" != "" ]; then
diff --git a/main/fuse3/fix-realpath.patch b/main/fuse3/fix-realpath.patch
deleted file mode 100644
index 375bedc961c..00000000000
--- a/main/fuse3/fix-realpath.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- fuse-3.1.0.orig/util/fusermount.c
-+++ fuse-3.1.0/util/fusermount.c
-@@ -1200,19 +1200,16 @@
- 
- 	origmnt = argv[optind];
- 
--	drop_privs();
- 	mnt = fuse_mnt_resolve_path(progname, origmnt);
--	if (mnt != NULL) {
--		res = chdir("/");
--		if (res == -1) {
--			fprintf(stderr, "%s: failed to chdir to '/'\n", progname);
--			goto err_out;
--		}
--	}
--	restore_privs();
- 	if (mnt == NULL)
- 		exit(1);
- 
-+	res = chdir("/");
-+	if (res == -1) {
-+		fprintf(stderr, "%s: failed to chdir to '/'\n", progname);
-+		exit(1);
-+	}
-+
- 	umask(033);
- 	if (unmount)
- 		goto do_unmount;
diff --git a/main/gawk/APKBUILD b/main/gawk/APKBUILD
index 2f89b5c56d3..ef5588fdf09 100644
--- a/main/gawk/APKBUILD
+++ b/main/gawk/APKBUILD
@@ -3,19 +3,32 @@
 # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: TBK <alpine@jjtc.eu>
 pkgname=gawk
-pkgver=5.0.1
+pkgver=5.3.0
 pkgrel=0
 pkgdesc="GNU awk pattern-matching language"
 url="https://www.gnu.org/software/gawk/gawk.html"
 arch="all"
 license="GPL-3.0-or-later"
-options="!check" # failing tests
 checkdepends="coreutils diffutils"
 subpackages="$pkgname-doc"
-source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://ftp.gnu.org/gnu/gawk/gawk-$pkgver.tar.xz
+	echild-strerror.patch"
+
+case "$CARCH" in
+# TODO: sigpipe1 test fails
+# See: https://lists.gnu.org/archive/html/bug-gawk/2021-02/msg00005.html
+s390x) options="!check" ;; # sigpipe1 test fails
+esac
+
+prepare() {
+	default_prepare
+
+	# TODO: https://lists.gnu.org/archive/html/bug-gawk/2021-02/msg00005.html
+	sed -i test/Makefile.in -e "/clos1way6/d"
+}
 
 build() {
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,7 +36,8 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-nls
+		--disable-nls \
+		--disable-pma
 	make
 }
 
@@ -35,4 +49,7 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ff9842a91035f843482d93eac8a35cddf2ce16acaa43a0112c1efff08802aebf705ee70d47eff74a190dca7be330c31f7204ad27cb63bdee65333f9b9c984212  gawk-5.0.1.tar.xz"
+sha512sums="
+c274a62c7420e7b7769b8ed94db40024bd5917ff49bd50a77ad6df1f16ecf116968aaf85da94015479466bf5570b370b6fdd197f95212ae0c3509dfcb7d9e35a  gawk-5.3.0.tar.xz
+5bbb175da2d93c9c1d422a4e5a2c2400486c0204929ac6771bf2c2effbee37b84ef9441821a47e1fdc4a337e3cb8ad92cb67d473822876ea790dd373822d4dbd  echild-strerror.patch
+"
diff --git a/main/gawk/echild-strerror.patch b/main/gawk/echild-strerror.patch
new file mode 100644
index 00000000000..5626b690ac5
--- /dev/null
+++ b/main/gawk/echild-strerror.patch
@@ -0,0 +1,14 @@
+musl and glibc use different string values for the ECHILD errno.
+
+diff -upr gawk-5.1.0.orig/test/testext.ok gawk-5.1.0/test/testext.ok
+--- gawk-5.1.0.orig/test/testext.ok	2021-02-06 12:39:05.990158877 +0100
++++ gawk-5.1.0/test/testext.ok	2021-02-06 12:39:24.080236494 +0100
+@@ -21,7 +21,7 @@ var_test: sym_update of ARGC failed - co
+ var_test: sym_update("testvar") succeeded
+ var_test() returned 1, test_var = 42
+ 
+-test_errno() returned 1, ERRNO = No child processes
++test_errno() returned 1, ERRNO = No child process
+ 
+ fubar = 9
+ rumpus = -5
diff --git a/main/gc/0001-Fix-gctest-with-musl-libc-on-s390x.patch b/main/gc/0001-Fix-gctest-with-musl-libc-on-s390x.patch
deleted file mode 100644
index c607d2d1529..00000000000
--- a/main/gc/0001-Fix-gctest-with-musl-libc-on-s390x.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 63ea237b7c367c56b6e14dd4d634b622e3fc0aa7 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 6 Feb 2018 21:21:23 +0100
-Subject: [PATCH] Fix gctest with musl libc on s390x
-
-Issue #202 (bdwgc).
-
-DEFAULT_STACK_MAYBE_SMALL is only set if PARALLEL_MARK is set, but stack
-is too small on musl libc even if PARALLEL_MARK is unset. We solve this
-by detecting musl via NO_GETCONTEXT.
----
---- a/tests/test.c
-+++ b/tests/test.c
-@@ -2313,7 +2313,7 @@
-     }
- #   if defined(GC_IRIX_THREADS) || defined(GC_FREEBSD_THREADS) \
-         || defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS) \
--        || defined(GC_OPENBSD_THREADS)
-+        || defined(GC_OPENBSD_THREADS) || defined(NO_GETCONTEXT) /* musl libc */
-         if ((code = pthread_attr_setstacksize(&attr, 1000 * 1024)) != 0) {
-           GC_printf("pthread_attr_setstacksize failed, error=%d\n", code);
-           FAIL;
diff --git a/main/gc/APKBUILD b/main/gc/APKBUILD
index d6ac1c241c5..326e15db695 100644
--- a/main/gc/APKBUILD
+++ b/main/gc/APKBUILD
@@ -1,19 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gc
-pkgver=8.0.4
-pkgrel=1
-pkgdesc="A garbage collector for C and C++"
+pkgver=8.2.6
+pkgrel=0
+pkgdesc="garbage collector for C and C++"
 url="https://hboehm.info/gc/"
 arch="all"
-license="custom:GPL-like"
-makedepends="libatomic_ops-dev linux-headers"
-subpackages="$pkgname-dev $pkgname-doc libgc++:libgccpp"
-source="http://hboehm.info/gc/gc_source/gc-$pkgver.tar.gz
-	0001-Fix-gctest-with-musl-libc-on-s390x.patch
-	"
+license="Boehm-GC"
+makedepends="linux-headers"
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc libgc++:libgccpp"
+source="https://github.com/ivmai/bdwgc/releases/download/v$pkgver/gc-$pkgver.tar.gz"
+
+case "$CARCH" in
+ppc64le)
+	# FIXME
+	options="!check"
+	;;
+esac
 
 build() {
-	export CFLAGS="$CFLAGS -D_GNU_SOURCE -DNO_GETCONTEXT -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +29,12 @@ build() {
 }
 
 check() {
-	# two FAILs due to grsecurity
 	make check
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
+	install -Dm644 README.md "$pkgdir/usr/share/licenses/$pkgname/README.md"
 }
 
 libgccpp() {
@@ -38,5 +42,6 @@ libgccpp() {
 	mv "$pkgdir"/usr/lib/libgccpp.* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="57ccca15c6e50048d306a30de06c1a844f36103a84c2d1c17cbccbbc0001e17915488baec79737449982da99ce5d14ce527176afae9ae153cbbb5a19d986366e  gc-8.0.4.tar.gz
-0441dfe85b36e9e80b9135d62d56e5e9b67c6db1f927480dd3cf5048765f3a2ab51a45eaa0068066af97ce0398333890fff2f84cd01fec476655f34e0325bc13  0001-Fix-gctest-with-musl-libc-on-s390x.patch"
+sha512sums="
+48afcc1d8570d6b5d62addf8b7b947a3836717e71c073f6dff8982744c06f5973a02e890d17e8dd93f7f997d029b49c652929e6efa0e32aefbcdf7ab0910eda5  gc-8.2.6.tar.gz
+"
diff --git a/main/gcc/0001-posix_memalign.patch b/main/gcc/0001-posix_memalign.patch
new file mode 100644
index 00000000000..04240c29c62
--- /dev/null
+++ b/main/gcc/0001-posix_memalign.patch
@@ -0,0 +1,42 @@
+From 47b4bd4deb2c356bb07d2a96f22127aefafec3a4 Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <nsz@port70.net>
+Date: Fri, 26 Jan 2018 20:32:50 +0000
+Subject: [PATCH 01/35] posix_memalign
+
+---
+ gcc/config/i386/pmm_malloc.h | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
+index 3527283693b..c4071b64b53 100644
+--- a/gcc/config/i386/pmm_malloc.h
++++ b/gcc/config/i386/pmm_malloc.h
+@@ -27,12 +27,13 @@
+ #include <stdlib.h>
+ 
+ /* We can't depend on <stdlib.h> since the prototype of posix_memalign
+-   may not be visible.  */
++   may not be visible and we can't pollute the namespace either.  */
+ #ifndef __cplusplus
+-extern int posix_memalign (void **, size_t, size_t);
++extern int _mm_posix_memalign (void **, size_t, size_t)
+ #else
+-extern "C" int posix_memalign (void **, size_t, size_t) throw ();
++extern "C" int _mm_posix_memalign (void **, size_t, size_t) throw ()
+ #endif
++__asm__("posix_memalign");
+ 
+ static __inline void *
+ _mm_malloc (size_t __size, size_t __alignment)
+@@ -42,7 +43,7 @@ _mm_malloc (size_t __size, size_t __alignment)
+     return malloc (__size);
+   if (__alignment == 2 || (sizeof (void *) == 8 && __alignment == 4))
+     __alignment = sizeof (void *);
+-  if (posix_memalign (&__ptr, __alignment, __size) == 0)
++  if (_mm_posix_memalign (&__ptr, __alignment, __size) == 0)
+     return __ptr;
+   else
+     return NULL;
+-- 
+2.41.0
+
diff --git a/main/gcc/0002-gcc-poison-system-directories.patch b/main/gcc/0002-gcc-poison-system-directories.patch
new file mode 100644
index 00000000000..b14c921c208
--- /dev/null
+++ b/main/gcc/0002-gcc-poison-system-directories.patch
@@ -0,0 +1,203 @@
+From 4fa620d8c3e6730211bfb071eb4c817320491bd0 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 08:59:00 +0400
+Subject: [PATCH 02/35] gcc: poison-system-directories
+
+Add /sw/include and /opt/include based on the original
+zecke-no-host-includes.patch patch.  The original patch checked for
+/usr/include, /sw/include and /opt/include and then triggered a failure and
+aborted.
+
+Instead, we add the two missing items to the current scan.  If the user
+wants this to be a failure, they can add "-Werror=poison-system-directories".
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+---
+ gcc/common.opt      |  4 ++++
+ gcc/config.in       |  6 ++++++
+ gcc/configure       | 16 ++++++++++++++++
+ gcc/configure.ac    | 10 ++++++++++
+ gcc/doc/invoke.texi |  9 +++++++++
+ gcc/gcc.cc          |  2 ++
+ gcc/incpath.cc      | 21 +++++++++++++++++++++
+ 7 files changed, 68 insertions(+)
+
+diff --git a/gcc/common.opt b/gcc/common.opt
+index 862c474d3c8..64c4277c991 100644
+--- a/gcc/common.opt
++++ b/gcc/common.opt
+@@ -711,6 +711,10 @@ Wreturn-local-addr
+ Common Var(warn_return_local_addr) Init(1) Warning
+ Warn about returning a pointer/reference to a local or temporary variable.
+ 
++Wpoison-system-directories
++Common Var(flag_poison_system_directories) Init(1) Warning
++Warn for -I and -L options using system directories if cross compiling
++
+ Wshadow
+ Common Var(warn_shadow) Warning
+ Warn when one variable shadows another.  Same as -Wshadow=global.
+diff --git a/gcc/config.in b/gcc/config.in
+index 4cad077bfbe..0679fbbf4c6 100644
+--- a/gcc/config.in
++++ b/gcc/config.in
+@@ -236,6 +236,12 @@
+ #endif
+ 
+ 
++/* Define to warn for use of native system header directories */
++#ifndef USED_FOR_TARGET
++#undef ENABLE_POISON_SYSTEM_DIRECTORIES
++#endif
++
++
+ /* Define if you want all operations on RTL (the basic data structure of the
+    optimizer and back end) to be checked for dynamic type safety at runtime.
+    This is quite expensive. */
+diff --git a/gcc/configure b/gcc/configure
+index c7b26d1927d..8c46369f73f 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -1026,6 +1026,7 @@ enable_maintainer_mode
+ enable_link_mutex
+ enable_link_serialization
+ enable_version_specific_runtime_libs
++enable_poison_system_directories
+ enable_plugin
+ enable_host_shared
+ enable_libquadmath_support
+@@ -1788,6 +1789,8 @@ Optional Features:
+   --enable-version-specific-runtime-libs
+                           specify that runtime libraries should be installed
+                           in a compiler-specific directory
++  --enable-poison-system-directories
++                          warn for use of native system header directories
+   --enable-plugin         enable plugin support
+   --enable-host-shared    build host code as shared libraries
+   --disable-libquadmath-support
+@@ -31753,6 +31756,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+ fi
+ 
+ 
++# Check whether --enable-poison-system-directories was given.
++if test "${enable_poison_system_directories+set}" = set; then :
++  enableval=$enable_poison_system_directories;
++else
++  enable_poison_system_directories=no
++fi
++
++if test "x${enable_poison_system_directories}" = "xyes"; then
++
++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
++
++fi
++
+ # Substitute configuration variables
+ 
+ 
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 09082e8ccae..5504bf6eb01 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -7292,6 +7292,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+                 [specify that runtime libraries should be
+                  installed in a compiler-specific directory])])
+ 
++AC_ARG_ENABLE([poison-system-directories],
++             AS_HELP_STRING([--enable-poison-system-directories],
++                            [warn for use of native system header directories]),,
++             [enable_poison_system_directories=no])
++if test "x${enable_poison_system_directories}" = "xyes"; then
++  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
++           [1],
++           [Define to warn for use of native system header directories])
++fi
++
+ # Substitute configuration variables
+ AC_SUBST(subdirs)
+ AC_SUBST(srcdir)
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index af0e5933fdb..b6731a4673c 100644
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}.
+ -Wpacked  -Wno-packed-bitfield-compat  -Wpacked-not-aligned  -Wpadded
+ -Wparentheses  -Wno-pedantic-ms-format
+ -Wpointer-arith  -Wno-pointer-compare  -Wno-pointer-to-int-cast
++-Wno-poison-system-directories
+ -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls
+ -Wrestrict  -Wno-return-local-addr  -Wreturn-type
+ -Wno-scalar-storage-order  -Wsequence-point
+@@ -8426,6 +8427,14 @@ made up of data only and thus requires no special treatment.  But, for
+ most targets, it is made up of code and thus requires the stack to be
+ made executable in order for the program to work properly.
+ 
++@opindex Wno-poison-system-directories
++@item -Wno-poison-system-directories
++Do not warn for @option{-I} or @option{-L} options using system
++directories such as @file{/usr/include} when cross compiling.  This
++option is intended for use in chroot environments when such
++directories contain the correct headers and libraries for the target
++system rather than the host.
++
+ @opindex Wfloat-equal
+ @opindex Wno-float-equal
+ @item -Wfloat-equal
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index 16bb07f2cdc..33b56e721d2 100644
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -1146,6 +1146,8 @@ proper position among the other output files.  */
+    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
+    "%X %{o*} %{e*} %{N} %{n} %{r}\
+     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
++    %{Wno-poison-system-directories:--no-poison-system-directories} \
++    %{Werror=poison-system-directories:--error-poison-system-directories} \
+     %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
+     VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
+     %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
+diff --git a/gcc/incpath.cc b/gcc/incpath.cc
+index 4d44321183f..0f3f071b44c 100644
+--- a/gcc/incpath.cc
++++ b/gcc/incpath.cc
+@@ -26,6 +26,7 @@
+ #include "intl.h"
+ #include "incpath.h"
+ #include "cppdefault.h"
++#include "diagnostic-core.h"
+ 
+ /* Microsoft Windows does not natively support inodes.
+    VMS has non-numeric inodes.  */
+@@ -399,6 +400,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
+ 	}
+       fprintf (stderr, _("End of search list.\n"));
+     }
++
++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
++  if (flag_poison_system_directories)
++    {
++       struct cpp_dir *p;
++
++       for (p = heads[INC_QUOTE]; p; p = p->next)
++         {
++          if ((!strncmp (p->name, "/usr/include", 12))
++              || (!strncmp (p->name, "/usr/local/include", 18))
++              || (!strncmp (p->name, "/usr/X11R6/include", 18))
++              || (!strncmp (p->name, "/sw/include", 11))
++              || (!strncmp (p->name, "/opt/include", 12)))
++            warning (OPT_Wpoison_system_directories,
++                     "include location \"%s\" is unsafe for "
++                     "cross-compilation",
++                     p->name);
++         }
++    }
++#endif
+ }
+ 
+ /* Use given -I paths for #include "..." but not #include <...>, and
+-- 
+2.41.0
+
diff --git a/main/gcc/0002-posix_memalign.patch b/main/gcc/0002-posix_memalign.patch
deleted file mode 100644
index 874f49b9b05..00000000000
--- a/main/gcc/0002-posix_memalign.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 65eb86f3e110998d30489df009d44b4bc1043adc Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Fri, 26 Jan 2018 20:32:50 +0000
-Subject: [PATCH 02/12] posix_memalign
-
----
- gcc/config/i386/pmm_malloc.h | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
-index ffbb7f82cf5..b0b890d2403 100644
---- a/gcc/config/i386/pmm_malloc.h
-+++ b/gcc/config/i386/pmm_malloc.h
-@@ -27,12 +27,13 @@
- #include <stdlib.h>
- 
- /* We can't depend on <stdlib.h> since the prototype of posix_memalign
--   may not be visible.  */
-+   may not be visible and we can't pollute the namespace either.  */
- #ifndef __cplusplus
--extern int posix_memalign (void **, size_t, size_t);
-+extern int _mm_posix_memalign (void **, size_t, size_t)
- #else
--extern "C" int posix_memalign (void **, size_t, size_t) throw ();
-+extern "C" int _mm_posix_memalign (void **, size_t, size_t) throw ()
- #endif
-+__asm__("posix_memalign");
- 
- static __inline void *
- _mm_malloc (size_t __size, size_t __alignment)
-@@ -42,7 +43,7 @@ _mm_malloc (size_t __size, size_t __alignment)
-     return malloc (__size);
-   if (__alignment == 2 || (sizeof (void *) == 8 && __alignment == 4))
-     __alignment = sizeof (void *);
--  if (posix_memalign (&__ptr, __alignment, __size) == 0)
-+  if (_mm_posix_memalign (&__ptr, __alignment, __size) == 0)
-     return __ptr;
-   else
-     return NULL;
--- 
-2.17.1
-
diff --git a/main/gcc/0003-gcc-poison-system-directories.patch b/main/gcc/0003-gcc-poison-system-directories.patch
deleted file mode 100644
index 0d6d964d3e1..00000000000
--- a/main/gcc/0003-gcc-poison-system-directories.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From 48c670d2678e0323d88eb72205e039f393cabe05 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 29 Mar 2013 08:59:00 +0400
-Subject: [PATCH 03/39] gcc: poison-system-directories
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Inappropriate [distribution: codesourcery]
----
- gcc/common.opt      |  4 ++++
- gcc/config.in       |  6 ++++++
- gcc/configure       | 16 ++++++++++++++++
- gcc/configure.ac    | 10 ++++++++++
- gcc/doc/invoke.texi |  9 +++++++++
- gcc/gcc.c           |  2 ++
- gcc/incpath.c       | 19 +++++++++++++++++++
- 7 files changed, 66 insertions(+)
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index d6ef85928f3..7b29efe3882 100644
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -679,6 +679,10 @@ Wreturn-local-addr
- Common Var(warn_return_local_addr) Init(1) Warning
- Warn about returning a pointer/reference to a local or temporary variable.
- 
-+Wpoison-system-directories
-+Common Var(flag_poison_system_directories) Init(1) Warning
-+Warn for -I and -L options using system directories if cross compiling
-+
- Wshadow
- Common Var(warn_shadow) Warning
- Warn when one variable shadows another.  Same as -Wshadow=global.
-diff --git a/gcc/config.in b/gcc/config.in
-index 5bccb408016..1c784a8276b 100644
---- a/gcc/config.in
-+++ b/gcc/config.in
-@@ -194,6 +194,12 @@
- #endif
- 
- 
-+/* Define to warn for use of native system header directories */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+#endif
-+
-+
- /* Define if you want all operations on RTL (the basic data structure of the
-    optimizer and back end) to be checked for dynamic type safety at runtime.
-    This is quite expensive. */
-diff --git a/gcc/configure b/gcc/configure
-index 5c345ce0fd7..cafd05fd150 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -953,6 +953,7 @@ with_system_zlib
- enable_maintainer_mode
- enable_link_mutex
- enable_version_specific_runtime_libs
-+enable_poison_system_directories
- enable_plugin
- enable_host_shared
- enable_libquadmath_support
-@@ -1696,6 +1697,8 @@ Optional Features:
-   --enable-version-specific-runtime-libs
-                           specify that runtime libraries should be installed
-                           in a compiler-specific directory
-+  --enable-poison-system-directories
-+                          warn for use of native system header directories
-   --enable-plugin         enable plugin support
-   --enable-host-shared    build host code as shared libraries
-   --disable-libquadmath-support
-@@ -29715,6 +29718,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
- fi
- 
- 
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+  enableval=$enable_poison_system_directories;
-+else
-+  enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
-+
- # Substitute configuration variables
- 
- 
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 65dbf1f2f80..dd5b38195ce 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -6341,6 +6341,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
-                 [specify that runtime libraries should be
-                  installed in a compiler-specific directory])])
- 
-+AC_ARG_ENABLE([poison-system-directories],
-+             AS_HELP_STRING([--enable-poison-system-directories],
-+                            [warn for use of native system header directories]),,
-+             [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+           [1],
-+           [Define to warn for use of native system header directories])
-+fi
-+
- # Substitute configuration variables
- AC_SUBST(subdirs)
- AC_SUBST(srcdir)
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 255149fcfb8..cb71b60fe3c 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -303,6 +303,7 @@ Objective-C and Objective-C++ Dialects}.
- -Wpacked  -Wpacked-bitfield-compat -Wpacked-not-aligned -Wpadded @gol
- -Wparentheses  -Wno-pedantic-ms-format @gol
- -Wplacement-new  -Wplacement-new=@var{n} @gol
-+-Wno-poison-system-directories @gol
- -Wpointer-arith  -Wpointer-compare  -Wno-pointer-to-int-cast @gol
- -Wno-pragmas  -Wredundant-decls  -Wrestrict  -Wno-return-local-addr @gol
- -Wreturn-type  -Wsequence-point  -Wshadow  -Wno-shadow-ivar @gol
-@@ -5712,6 +5713,14 @@ made up of data only and thus requires no special treatment.  But, for
- most targets, it is made up of code and thus requires the stack to be
- made executable in order for the program to work properly.
- 
-+@item -Wno-poison-system-directories
-+@opindex Wno-poison-system-directories
-+Do not warn for @option{-I} or @option{-L} options using system
-+directories such as @file{/usr/include} when cross compiling.  This
-+option is intended for use in chroot environments when such
-+directories contain the correct headers and libraries for the target
-+system rather than the host.
-+
- @item -Wfloat-equal
- @opindex Wfloat-equal
- @opindex Wno-float-equal
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index a716f708259..02b3cd39fc2 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -1061,6 +1060,8 @@
-    "-z relro -z now " \
-    "%X %{o*} %{e*} %{N} %{n} %{r}\
-     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
-+    %{Wno-poison-system-directories:--no-poison-system-directories} \
-+    %{Werror=poison-system-directories:--error-poison-system-directories} \
-     %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
-     VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
-     %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
-diff --git a/gcc/incpath.c b/gcc/incpath.c
-index b11c6a57939..e3b7a21966f 100644
---- a/gcc/incpath.c
-+++ b/gcc/incpath.c
-@@ -26,6 +26,7 @@
- #include "intl.h"
- #include "incpath.h"
- #include "cppdefault.h"
-+#include "diagnostic-core.h"
- 
- /* Microsoft Windows does not natively support inodes.
-    VMS has non-numeric inodes.  */
-@@ -393,6 +394,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
- 	}
-       fprintf (stderr, _("End of search list.\n"));
-     }
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+  if (flag_poison_system_directories)
-+    {
-+       struct cpp_dir *p;
-+
-+       for (p = heads[INC_QUOTE]; p; p = p->next)
-+         {
-+          if ((!strncmp (p->name, "/usr/include", 12))
-+              || (!strncmp (p->name, "/usr/local/include", 18))
-+              || (!strncmp (p->name, "/usr/X11R6/include", 18))
-+              || (!strncmp (p->name, "/sw/include", 11))
-+              || (!strncmp (p->name, "/opt/include", 12)))
-+            warning (OPT_Wpoison_system_directories,
-+                     "include location \"%s\" is unsafe for "
-+                     "cross-compilation",
-+                     p->name);
-+         }
-+    }
-+#endif
- }
- 
- /* Use given -I paths for #include "..." but not #include <...>, and
--- 
-2.17.0
-
diff --git a/main/gcc/0003-specs-turn-on-Wl-z-now-by-default.patch b/main/gcc/0003-specs-turn-on-Wl-z-now-by-default.patch
new file mode 100644
index 00000000000..bfb0a6eba77
--- /dev/null
+++ b/main/gcc/0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -0,0 +1,44 @@
+From ff4dd4ce33133e675b7bedc86b73357c04631cb9 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:45:49 +0000
+Subject: [PATCH 03/35] specs: turn on -Wl,-z,now by default
+
+Previously, we also used to turn on -z relro here, but we now build
+binutils with --enable-relro, which is functionally equivalent.
+
+Binutils does not appear to have a similar option for enabling -z
+now by default.
+---
+ gcc/doc/invoke.texi | 3 +++
+ gcc/gcc.cc          | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index b6731a4673c..f393c7846c6 100644
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -17961,6 +17961,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the
+ linker.  When using the GNU linker, you can also get the same effect with
+ @option{-Wl,-Map=output.map}.
+ 
++NOTE: In Alpine Linux, for LDFLAGS, the option
++@option{-Wl,-z,now} is used.  To disable, use @option{-Wl,-z,nonow}.
++
+ @opindex u
+ @item -u @var{symbol}
+ Pretend the symbol @var{symbol} is undefined, to force linking of
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index 33b56e721d2..f82fae23c22 100644
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -1144,6 +1144,7 @@ proper position among the other output files.  */
+    "%{flto|flto=*:%<fcompare-debug*} \
+     %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
+    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
++   "-z now " \
+    "%X %{o*} %{e*} %{N} %{n} %{r}\
+     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
+     %{Wno-poison-system-directories:--no-poison-system-directories} \
+-- 
+2.41.0
+
diff --git a/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch b/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
new file mode 100644
index 00000000000..13785a24edc
--- /dev/null
+++ b/main/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
@@ -0,0 +1,46 @@
+From 1b315235433701e4a974da259b8d651169ddc7ac Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:46:22 +0000
+Subject: [PATCH 04/35] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++,
+ ObjC, ObjC++, if the optimization level is > 0
+
+---
+ gcc/c-family/c-cppbuiltin.cc | 4 ++++
+ gcc/doc/invoke.texi          | 6 ++++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/gcc/c-family/c-cppbuiltin.cc b/gcc/c-family/c-cppbuiltin.cc
+index 5d64625fcd7..868d69506e4 100644
+--- a/gcc/c-family/c-cppbuiltin.cc
++++ b/gcc/c-family/c-cppbuiltin.cc
+@@ -1546,6 +1546,10 @@ c_cpp_builtins (cpp_reader *pfile)
+   builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
+   builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
+ 
++  /* Fortify Source enabled by default for optimization levels > 0 */
++  if (optimize)
++    builtin_define_with_int_value ("_FORTIFY_SOURCE", 2);
++
+   /* Misc.  */
+   if (flag_gnu89_inline)
+     cpp_define (pfile, "__GNUC_GNU_INLINE__");
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index f393c7846c6..ef3c14a189e 100644
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -11868,6 +11868,12 @@ also turns on the following optimization flags:
+ Please note the warning under @option{-fgcse} about
+ invoking @option{-O2} on programs that use computed gotos.
+ 
++NOTE: In Alpine Linux, @option{-D_FORTIFY_SOURCE=2} is
++set by default, and is activated when @option{-O} is set to 2 or higher.
++This enables additional compile-time and run-time checks for several libc
++functions.  To disable, specify either @option{-U_FORTIFY_SOURCE} or
++@option{-D_FORTIFY_SOURCE=0}.
++
+ @opindex O3
+ @item -O3
+ Optimize yet more.  @option{-O3} turns on all optimizations specified
+-- 
+2.41.0
+
diff --git a/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch b/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
new file mode 100644
index 00000000000..d229bcfa0fb
--- /dev/null
+++ b/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
@@ -0,0 +1,272 @@
+From 67c0f5789630b27149f60ff831999ef7c1dba5d5 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:46:56 +0000
+Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the
+ linker, but always link the sanitizer libraries with --no-as-needed.
+
+---
+ gcc/config/aarch64/aarch64-linux.h |  1 +
+ gcc/config/alpha/linux-elf.h       |  2 +-
+ gcc/config/arm/linux-elf.h         |  1 +
+ gcc/config/gnu-user.h              |  6 +++---
+ gcc/config/i386/gnu-user.h         |  2 +-
+ gcc/config/i386/gnu-user64.h       |  1 +
+ gcc/config/ia64/linux.h            |  2 +-
+ gcc/config/mips/gnu-user.h         |  1 +
+ gcc/config/riscv/linux.h           |  1 +
+ gcc/config/rs6000/linux64.h        |  4 ++--
+ gcc/config/rs6000/sysv4.h          |  2 +-
+ gcc/config/s390/linux.h            |  2 +-
+ gcc/config/sparc/linux.h           |  2 +-
+ gcc/gcc.cc                         | 28 ++++++++++++++++++++--------
+ 14 files changed, 36 insertions(+), 19 deletions(-)
+
+diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
+index 4277f03da2a..b131983a546 100644
+--- a/gcc/config/aarch64/aarch64-linux.h
++++ b/gcc/config/aarch64/aarch64-linux.h
+@@ -35,6 +35,7 @@
+ #define CPP_SPEC "%{pthread:-D_REENTRANT}"
+ 
+ #define LINUX_TARGET_LINK_SPEC  "%{h*}		\
++   --as-needed					\
+    %{static:-Bstatic}				\
+    %{shared:-shared}				\
+    %{symbolic:-Bsymbolic}			\
+diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
+index 03f783f2ad1..d946e700dda 100644
+--- a/gcc/config/alpha/linux-elf.h
++++ b/gcc/config/alpha/linux-elf.h
+@@ -37,7 +37,7 @@ along with GCC; see the file COPYING3.  If not see
+ 
+ #define ELF_DYNAMIC_LINKER	GNU_USER_DYNAMIC_LINKER
+ 
+-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
++#define LINK_SPEC "-m elf64alpha --as-needed %{G*} %{relax:-relax}		\
+   %{O*:-O3} %{!O*:-O1}						\
+   %{shared:-shared}						\
+   %{!shared:							\
+diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
+index 7b7b7cbbe14..49c050c6f2c 100644
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
+@@ -70,6 +70,7 @@
+      %{rdynamic:-export-dynamic} \
+      %{!shared:-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \
+    -X \
++   --as-needed \
+    %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
+    SUBTARGET_EXTRA_LINK_SPEC
+ 
+diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
+index eda8010b133..b26b17f2f2a 100644
+--- a/gcc/config/gnu-user.h
++++ b/gcc/config/gnu-user.h
+@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ #define LIBASAN_EARLY_SPEC "%{!shared:libasan_preinit%O%s} " \
+   "%{static-libasan:%{!shared:" \
+   LD_STATIC_OPTION " --whole-archive -lasan --no-whole-archive " \
+-  LD_DYNAMIC_OPTION "}}%{!static-libasan:-lasan}"
++  LD_DYNAMIC_OPTION "}}%{!static-libasan:%{!fuse-ld=gold:--push-state} --no-as-needed -lasan %{fuse-ld=gold:--as-needed;:--pop-state}}"
+ #undef LIBHWASAN_EARLY_SPEC
+ #define LIBHWASAN_EARLY_SPEC "%{!shared:libhwasan_preinit%O%s} " \
+   "%{static-libhwasan:%{!shared:" \
+@@ -146,12 +146,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ #define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \
+   "%{static-libtsan:%{!shared:" \
+   LD_STATIC_OPTION " --whole-archive -ltsan --no-whole-archive " \
+-  LD_DYNAMIC_OPTION "}}%{!static-libtsan:-ltsan}"
++  LD_DYNAMIC_OPTION "}}%{!static-libtsan:%{!fuse-ld=gold:--push-state} --no-as-needed -ltsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
+ #undef LIBLSAN_EARLY_SPEC
+ #define LIBLSAN_EARLY_SPEC "%{!shared:liblsan_preinit%O%s} " \
+   "%{static-liblsan:%{!shared:" \
+   LD_STATIC_OPTION " --whole-archive -llsan --no-whole-archive " \
+-  LD_DYNAMIC_OPTION "}}%{!static-liblsan:-llsan}"
++  LD_DYNAMIC_OPTION "}}%{!static-liblsan:%{!fuse-ld=gold:--push-state} --no-as-needed -llsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
+ #endif
+ 
+ #undef TARGET_F951_OPTIONS
+diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
+index a79b739089d..e0752673dff 100644
+--- a/gcc/config/i386/gnu-user.h
++++ b/gcc/config/i386/gnu-user.h
+@@ -68,7 +68,7 @@ along with GCC; see the file COPYING3.  If not see
+   { "link_emulation", GNU_USER_LINK_EMULATION },\
+   { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
+ 
+-#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
++#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) --as-needed %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{!static-pie: \
+diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
+index 3b63b99acf6..759bf0db86f 100644
+--- a/gcc/config/i386/gnu-user64.h
++++ b/gcc/config/i386/gnu-user64.h
+@@ -56,6 +56,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+                   "%{" SPEC_64 ":-m " GNU_USER_LINK_EMULATION64 "} \
+                    %{" SPEC_32 ":-m " GNU_USER_LINK_EMULATION32 "} \
+                    %{" SPEC_X32 ":-m " GNU_USER_LINK_EMULATIONX32 "} \
++  --as-needed \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
+index 5dfd428aa17..02656dad7fc 100644
+--- a/gcc/config/ia64/linux.h
++++ b/gcc/config/ia64/linux.h
+@@ -58,7 +58,7 @@ do {						\
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "\
++#define LINK_SPEC " --as-needed \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
+index a4e5380b589..3cc61bce69f 100644
+--- a/gcc/config/mips/gnu-user.h
++++ b/gcc/config/mips/gnu-user.h
+@@ -55,6 +55,7 @@ along with GCC; see the file COPYING3.  If not see
+ #undef GNU_USER_TARGET_LINK_SPEC
+ #define GNU_USER_TARGET_LINK_SPEC "\
+   %{G*} %{EB} %{EL} %{mips*} %{shared} \
++ -as-needed \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
+index 3e625e0f867..f8c2c351e5a 100644
+--- a/gcc/config/riscv/linux.h
++++ b/gcc/config/riscv/linux.h
+@@ -48,6 +48,7 @@ along with GCC; see the file COPYING3.  If not see
+   "%{mabi=ilp32:_ilp32}"
+ 
+ #define LINK_SPEC "\
++-as-needed \
+ -melf" XLEN_SPEC DEFAULT_ENDIAN_SPEC "riscv" LD_EMUL_SUFFIX " \
+ %{mno-relax:--no-relax} \
+ %{mbig-endian:-EB} \
+diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
+index 9e457033d11..08016bf224d 100644
+--- a/gcc/config/rs6000/linux64.h
++++ b/gcc/config/rs6000/linux64.h
+@@ -377,13 +377,13 @@ extern int dot_symbols;
+ 					   " -m elf64ppc")
+ #endif
+ 
+-#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " --as-needed %{!shared: %{!static: \
+   %{!static-pie: \
+     %{rdynamic:-export-dynamic} \
+     -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}}} \
+   %(link_os_extra_spec32)"
+ 
+-#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " --as-needed %{!shared: %{!static: \
+   %{!static-pie: \
+     %{rdynamic:-export-dynamic} \
+     -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
+diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
+index ae932fc22f0..c8ff0c6dc8e 100644
+--- a/gcc/config/rs6000/sysv4.h
++++ b/gcc/config/rs6000/sysv4.h
+@@ -780,7 +780,7 @@ GNU_USER_TARGET_CC1_SPEC
+ #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
+ #endif
+ 
+-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --as-needed %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
+ 
+diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
+index 02aa1edaff8..64df5801134 100644
+--- a/gcc/config/s390/linux.h
++++ b/gcc/config/s390/linux.h
+@@ -82,7 +82,7 @@ along with GCC; see the file COPYING3.  If not see
+ 
+ #undef  LINK_SPEC
+ #define LINK_SPEC \
+-  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
++  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --as-needed \
+    %{shared:-shared} \
+    %{!shared: \
+       %{static:-static} \
+diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
+index 0e33b3cac2c..c2f44546e62 100644
+--- a/gcc/config/sparc/linux.h
++++ b/gcc/config/sparc/linux.h
+@@ -81,7 +81,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+ #undef  LINK_SPEC
+-#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
++#define LINK_SPEC "-m elf32_sparc --as-needed %{shared:-shared} \
+   %{!mno-relax:%{!r:-relax}} \
+   %{!shared: \
+     %{!static: \
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index f82fae23c22..da6417dd0d1 100644
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -754,8 +754,11 @@ proper position among the other output files.  */
+ #ifdef LIBASAN_EARLY_SPEC
+ #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
+ #elif defined(HAVE_LD_STATIC_DYNAMIC)
+-#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION \
+-		     "} -lasan %{static-libasan:" LD_DYNAMIC_OPTION "}" \
++#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
++		     " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
++		     " -lasan " \
++		     " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
++		     " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
+ 		     STATIC_LIBASAN_LIBS
+ #else
+ #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
+@@ -790,8 +793,11 @@ proper position among the other output files.  */
+ #ifdef LIBTSAN_EARLY_SPEC
+ #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
+ #elif defined(HAVE_LD_STATIC_DYNAMIC)
+-#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION \
+-		     "} -ltsan %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
++#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
++		     " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
++		     " -ltsan " \
++		     " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
++		     " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
+ 		     STATIC_LIBTSAN_LIBS
+ #else
+ #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
+@@ -808,8 +814,11 @@ proper position among the other output files.  */
+ #ifdef LIBLSAN_EARLY_SPEC
+ #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
+ #elif defined(HAVE_LD_STATIC_DYNAMIC)
+-#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION \
+-		     "} -llsan %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
++#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
++		     " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
++		     " -llsan " \
++		     " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
++		     " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
+ 		     STATIC_LIBLSAN_LIBS
+ #else
+ #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
+@@ -824,8 +833,11 @@ proper position among the other output files.  */
+ #define STATIC_LIBUBSAN_LIBS \
+   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
+ #ifdef HAVE_LD_STATIC_DYNAMIC
+-#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION \
+-		     "} -lubsan %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
++#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
++		     " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
++		     " -lubsan " \
++		     " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
++		     " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
+ 		     STATIC_LIBUBSAN_LIBS
+ #else
+ #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
+-- 
+2.41.0
+
diff --git a/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch b/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch
new file mode 100644
index 00000000000..55dff3692dc
--- /dev/null
+++ b/main/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch
@@ -0,0 +1,34 @@
+From bb25e8489384504cd59e4a2538720863da1fb29c Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:47:43 +0000
+Subject: [PATCH 06/35] Enable -Wformat and -Wformat-security by default.
+
+---
+ gcc/c-family/c.opt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
+index a75038930ae..b98726f33ed 100644
+--- a/gcc/c-family/c.opt
++++ b/gcc/c-family/c.opt
+@@ -704,7 +704,7 @@ Warn about function calls with format strings that write past the end
+ of the destination region.  Same as -Wformat-overflow=1.
+ 
+ Wformat-security
+-C ObjC C++ ObjC++ Var(warn_format_security) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
++C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
+ Warn about possible security problems with format functions.
+ 
+ Wformat-signedness
+@@ -725,7 +725,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++
+ Warn about zero-length formats.
+ 
+ Wformat=
+-C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
++C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
+ Warn about printf/scanf/strftime/strfmon format string anomalies.
+ 
+ Wformat-overflow=
+-- 
+2.41.0
+
diff --git a/main/gcc/0007-Enable-Wtrampolines-by-default.patch b/main/gcc/0007-Enable-Wtrampolines-by-default.patch
new file mode 100644
index 00000000000..eb7aae83866
--- /dev/null
+++ b/main/gcc/0007-Enable-Wtrampolines-by-default.patch
@@ -0,0 +1,25 @@
+From 4a728ad48a7b437cc6f2697e26603bf648149f86 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:48:24 +0000
+Subject: [PATCH 07/35] Enable -Wtrampolines by default.
+
+---
+ gcc/common.opt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/common.opt b/gcc/common.opt
+index 64c4277c991..c24839d32bc 100644
+--- a/gcc/common.opt
++++ b/gcc/common.opt
+@@ -803,7 +803,7 @@ Common Var(warn_system_headers) Warning
+ Do not suppress warnings from system headers.
+ 
+ Wtrampolines
+-Common Var(warn_trampolines) Warning
++Common Var(warn_trampolines) Init(1) Warning
+ Warn whenever a trampoline is generated.
+ 
+ Wtrivial-auto-var-init
+-- 
+2.41.0
+
diff --git a/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch b/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
new file mode 100644
index 00000000000..69c1bf72545
--- /dev/null
+++ b/main/gcc/0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
@@ -0,0 +1,53 @@
+From 32f24560d0602f7735d5e9efd92fe3151bd72cea Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:49:40 +0000
+Subject: [PATCH 08/35] Disable ssp on -nostdlib, -nodefaultlibs and
+ -ffreestanding Change the buffer size.
+
+---
+ gcc/gcc.cc     | 8 +++++++-
+ gcc/params.opt | 2 +-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index da6417dd0d1..b5a6f200635 100644
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -983,6 +983,12 @@ proper position among the other output files.  */
+ #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
+ #endif
+ 
++#ifdef ENABLE_DEFAULT_SSP
++#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} "
++#else
++#define NO_SSP_SPEC ""
++#endif
++
+ #ifndef LINK_SSP_SPEC
+ #ifdef TARGET_LIBC_PROVIDES_SSP
+ #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
+@@ -1282,7 +1288,7 @@ static const char *cc1_options =
+  %{-version:--version}\
+  %{-help=*:--help=%*}\
+  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %w%b.s}}}\
+- %{fsyntax-only:-o %j} %{-param*}\
++ %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
+  %{coverage:-fprofile-arcs -ftest-coverage}\
+  %{fprofile-arcs|fprofile-generate*|coverage:\
+    %{!fprofile-update=single:\
+diff --git a/gcc/params.opt b/gcc/params.opt
+index 823cdb2ff85..5b096899b40 100644
+--- a/gcc/params.opt
++++ b/gcc/params.opt
+@@ -1006,7 +1006,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim
+ The maximum number of SSA_NAME assignments to follow in determining a value.
+ 
+ -param=ssp-buffer-size=
+-Common Joined UInteger Var(param_ssp_buffer_size) Init(8) IntegerRange(1, 65536) Param Optimization
++Common Joined UInteger Var(param_ssp_buffer_size) Init(4) IntegerRange(1, 65536) Param Optimization
+ The lower bound for a buffer to be considered for stack smashing protection.
+ 
+ -param=stack-clash-protection-guard-size=
+-- 
+2.41.0
+
diff --git a/main/gcc/0008-s390x-muslldso.patch b/main/gcc/0008-s390x-muslldso.patch
deleted file mode 100644
index 64833f308fd..00000000000
--- a/main/gcc/0008-s390x-muslldso.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b693804c8dba92fea7beee98f0aa520853a0532b Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Thu, 22 Dec 2016 11:22:28 +0000
-Subject: [PATCH 08/12] s390x muslldso
-
----
- gcc/config/s390/linux.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
-index 525c17c2c9f..2d4f4a0654e 100644
---- a/gcc/config/s390/linux.h
-+++ b/gcc/config/s390/linux.h
-@@ -76,6 +76,9 @@ along with GCC; see the file COPYING3.  If not see
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
- #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
- 
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-s390.so.1"
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-s390x.so.1"
-+
- #undef  LINK_SPEC
- #define LINK_SPEC \
-   "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
--- 
-2.17.1
-
diff --git a/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch b/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
new file mode 100644
index 00000000000..f4dd52f1910
--- /dev/null
+++ b/main/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
@@ -0,0 +1,54 @@
+From c7ec8da7280d7f97f5543eb9ddeca7600aafc43c Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:50:33 +0000
+Subject: [PATCH 09/35] Ensure that msgfmt doesn't encounter problems during
+ gcc bootstrapping.
+
+Solves error messages like the following:
+
+msgfmt: /var/tmp/portage/sys-devel/gcc-4.1.2/work/build/./gcc/libgcc_s.so.1: version `GCC_4.2.0' not found (required by /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/libstdc++.so.6)
+
+The libgcc_s.so used during build doesn't satisfy the needs of the
+libstdc++.so that msgfmt is linked against. On the other hand, msgfmt
+is used as a stand-alone application here, and what library it uses
+behind the scenes is of no concern to the gcc build process.
+Therefore, simply invoking it "as usual", i.e. without any special
+library path, will make it work as expected here.
+
+2011-09-19 Martin von Gagern
+
+References:
+https://bugs.gentoo.org/372377
+https://bugs.gentoo.org/295480
+---
+ libstdc++-v3/po/Makefile.am | 1 +
+ libstdc++-v3/po/Makefile.in | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
+index 12d34910830..61b13762b71 100644
+--- a/libstdc++-v3/po/Makefile.am
++++ b/libstdc++-v3/po/Makefile.am
+@@ -38,6 +38,7 @@ MSGFMT = msgfmt
+ EXTRA_DIST = string_literals.cc POTFILES.in $(PACKAGE).pot $(LOCALE_IN)
+ 
+ .po.mo:
++	env --unset=LD_LIBRARY_PATH \
+ 	$(MSGFMT) -o $@ $<
+ 
+ all-local: all-local-$(USE_NLS)
+diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
+index 8e93445acd2..d6ff06e5ddb 100644
+--- a/libstdc++-v3/po/Makefile.in
++++ b/libstdc++-v3/po/Makefile.in
+@@ -561,6 +561,7 @@ uninstall-am:
+ 
+ 
+ .po.mo:
++	env --unset=LD_LIBRARY_PATH \
+ 	$(MSGFMT) -o $@ $<
+ 
+ all-local: all-local-$(USE_NLS)
+-- 
+2.41.0
+
diff --git a/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch b/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
new file mode 100644
index 00000000000..f56d41a571c
--- /dev/null
+++ b/main/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
@@ -0,0 +1,28 @@
+From aaa029bcee68298695b7c4278c90b6bc320d098c Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:52:07 +0000
+Subject: [PATCH 10/35] Don't declare asprintf if defined as a macro.
+
+---
+ include/libiberty.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/include/libiberty.h b/include/libiberty.h
+index 1d5c779fcff..19e3cb1e31c 100644
+--- a/include/libiberty.h
++++ b/include/libiberty.h
+@@ -652,8 +652,11 @@ extern void *bsearch_r (const void *, const void *,
+ /* Like sprintf but provides a pointer to malloc'd storage, which must
+    be freed by the caller.  */
+ 
++/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL.  */
++#ifndef asprintf
+ extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
+ #endif
++#endif
+ 
+ /* Like asprintf but allocates memory without fail. This works like
+    xmalloc.  */
+-- 
+2.41.0
+
diff --git a/main/gcc/0010-ldbl128-config.patch b/main/gcc/0010-ldbl128-config.patch
deleted file mode 100644
index b5a10105282..00000000000
--- a/main/gcc/0010-ldbl128-config.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 47467f3ab0fb2f2fcede81060fe8bb339d0909eb Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Wed, 28 Feb 2018 00:54:05 +0000
-Subject: [PATCH 10/12] ldbl128 config
-
----
- gcc/configure    | 13 +++++++++++++
- gcc/configure.ac | 16 ++++++++++++++--
- 2 files changed, 27 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/configure b/gcc/configure
-index 6121e163259..07ff8597d48 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -29309,6 +29309,15 @@ if test "${with_long_double_128+set}" = set; then :
-   withval=$with_long_double_128; gcc_cv_target_ldbl128="$with_long_double_128"
- else
- 
-+      case "$target" in
-+	s390*-*-linux-musl*)
-+	  gcc_cv_target_ldbl128=yes
-+	  ;;
-+	powerpc*-*-linux-musl*)
-+	  gcc_cv_target_ldbl128=no
-+	  ;;
-+	*)
-+
- if test $glibc_version_major -gt 2 \
-   || ( test $glibc_version_major -eq 2 && test $glibc_version_minor -ge 4 ); then :
-   gcc_cv_target_ldbl128=yes
-@@ -29320,6 +29329,10 @@ else
-       && gcc_cv_target_ldbl128=yes
- 
- fi
-+
-+	  ;;
-+      esac
-+
- fi
- 
-     ;;
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index b066cc609e1..6c15ed898c0 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -5971,13 +5971,25 @@ case "$target" in
-     AC_ARG_WITH(long-double-128,
-       [AS_HELP_STRING([--with-long-double-128],
- 		      [use 128-bit long double by default])],
--      gcc_cv_target_ldbl128="$with_long_double_128",
-+      gcc_cv_target_ldbl128="$with_long_double_128", [
-+      case "$target" in
-+	s390*-*-linux-musl*)
-+	  gcc_cv_target_ldbl128=yes
-+	  ;;
-+	powerpc*-*-linux-musl*)
-+	  gcc_cv_target_ldbl128=no
-+	  ;;
-+	*)]
-       [GCC_GLIBC_VERSION_GTE_IFELSE([2], [4], [gcc_cv_target_ldbl128=yes], [
-       [gcc_cv_target_ldbl128=no
-       grep '^[ 	]*#[ 	]*define[ 	][ 	]*__LONG_DOUBLE_MATH_OPTIONAL' \
-         $target_header_dir/bits/wordsize.h > /dev/null 2>&1 \
-       && gcc_cv_target_ldbl128=yes
--      ]])])
-+      ]])]
-+      [
-+	  ;;
-+      esac
-+      ])
-     ;;
- esac
- if test x$gcc_cv_target_ldbl128 = xyes; then
--- 
-2.17.1
-
diff --git a/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch b/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch
new file mode 100644
index 00000000000..b12d4f94bd0
--- /dev/null
+++ b/main/gcc/0011-libiberty-copy-PIC-objects-during-build-process.patch
@@ -0,0 +1,24 @@
+From 65e01e749205c9af218b01233cebd0077538d0ee Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:53:00 +0000
+Subject: [PATCH 11/35] libiberty: copy PIC objects during build process
+
+---
+ libiberty/Makefile.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
+index 72608f3e4a7..58356884728 100644
+--- a/libiberty/Makefile.in
++++ b/libiberty/Makefile.in
+@@ -265,6 +265,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
+ 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
+ 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
+ 	  $(RANLIB) $(TARGETLIB); \
++	  cp $(TARGETLIB) ../ ; \
+ 	  cd ..; \
+ 	else true; fi
+ 
+-- 
+2.41.0
+
diff --git a/main/gcc/0012-libgcc_s.patch b/main/gcc/0012-libgcc_s.patch
new file mode 100644
index 00000000000..d8bbc602f21
--- /dev/null
+++ b/main/gcc/0012-libgcc_s.patch
@@ -0,0 +1,57 @@
+From 453a815bf2844971a91eaef800af188d9e86b784 Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <nsz@port70.net>
+Date: Sat, 24 Oct 2015 20:09:53 +0000
+Subject: [PATCH 12/35] libgcc_s
+
+---
+ gcc/config/i386/i386-expand.cc | 4 ++--
+ libgcc/config/i386/cpuinfo.c   | 6 +++---
+ libgcc/config/i386/t-linux     | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc
+index 0d817fc3f3b..2e99db00db9 100644
+--- a/gcc/config/i386/i386-expand.cc
++++ b/gcc/config/i386/i386-expand.cc
+@@ -12691,10 +12691,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
+     {
+     case IX86_BUILTIN_CPU_INIT:
+       {
+-	/* Make it call __cpu_indicator_init in libgcc.  */
++	/* Make it call __cpu_indicator_init in libgcc.a.  */
+ 	tree call_expr, fndecl, type;
+ 	type = build_function_type_list (integer_type_node, NULL_TREE);
+-	fndecl = build_fn_decl ("__cpu_indicator_init", type);
++	fndecl = build_fn_decl ("__cpu_indicator_init_local", type);
+ 	call_expr = build_call_expr (fndecl, 0);
+ 	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
+       }
+diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
+index 50b6d8248a2..724ced402a1 100644
+--- a/libgcc/config/i386/cpuinfo.c
++++ b/libgcc/config/i386/cpuinfo.c
+@@ -63,7 +63,7 @@ __cpu_indicator_init (void)
+ 			     __cpu_features2);
+ }
+ 
+-#if defined SHARED && defined USE_ELF_SYMVER
+-__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0");
+-__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0");
++#ifndef SHARED
++int __cpu_indicator_init_local (void)
++  __attribute__ ((weak, alias ("__cpu_indicator_init")));
+ #endif
+diff --git a/libgcc/config/i386/t-linux b/libgcc/config/i386/t-linux
+index 8506a635790..564296f788e 100644
+--- a/libgcc/config/i386/t-linux
++++ b/libgcc/config/i386/t-linux
+@@ -3,5 +3,5 @@
+ # t-slibgcc-elf-ver and t-linux
+ SHLIB_MAPFILES = libgcc-std.ver $(srcdir)/config/i386/libgcc-glibc.ver
+ 
+-HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER $(CET_FLAGS)
++HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
+ CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
+-- 
+2.41.0
+
diff --git a/main/gcc/0012-static-pie.patch b/main/gcc/0012-static-pie.patch
deleted file mode 100644
index d7cfcb78157..00000000000
--- a/main/gcc/0012-static-pie.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From a4aa319f7c19e564dced3daeb7222c9315af936c Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Sat, 18 Aug 2018 23:58:45 +0000
-Subject: [PATCH 12/12] static-pie
-
-in gcc-8 -static means static non-pie, even if -pie or -static-pie
-are specified, -static-pie can be used to build static pie.
-
-in musl toolchains -static -pie always meant static pie, so this
-patch fixes the link specs accordingly, the new -static-pie is just
-an alias to -static -pie.
----
- gcc/common.opt            |  4 ++--
- gcc/config/gnu-user.h     | 12 +++++-------
- gcc/config/rs6000/sysv4.h | 11 +++++------
- gcc/gcc.c                 |  6 +++---
- 4 files changed, 15 insertions(+), 18 deletions(-)
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index b52ef0b38c8..0ce5857e01d 100644
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -3197,11 +3197,11 @@ Driver
- 
- no-pie
- Driver RejectNegative Negative(shared)
--Don't create a dynamically linked position independent executable.
-+Don't create a position independent executable.
- 
- pie
- Driver RejectNegative Negative(no-pie)
--Create a dynamically linked position independent executable.
-+Create a position independent executable.
- 
- static-pie
- Driver RejectNegative Negative(pie)
-diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index 8620de3e42d..235328a2642 100644
---- a/gcc/config/gnu-user.h
-+++ b/gcc/config/gnu-user.h
-@@ -51,13 +51,12 @@
- #define GNU_USER_TARGET_STARTFILE_SPEC \
-   "%{shared:; \
-      pg|p|profile:%{static-pie:grcrt1.o%s;:gcrt1.o%s}; \
--     static:crt1.o%s; \
--     static-pie:rcrt1.o%s; \
-+     static|static-pie:%{" PIE_SPEC ":rcrt1.o%s;:crt1.o%s}; \
-      " PIE_SPEC ":Scrt1.o%s; \
-      :crt1.o%s} " \
-    GNU_USER_TARGET_CRTI " \
--   %{static:crtbeginT.o%s; \
--     shared|static-pie|" PIE_SPEC ":crtbeginS.o%s; \
-+   %{shared|" PIE_SPEC ":crtbeginS.o%s; \
-+     static:crtbeginT.o%s; \
-      :crtbegin.o%s} \
-    %{fvtable-verify=none:%s; \
-      fvtable-verify=preinit:vtv_start_preinit.o%s; \
-@@ -76,8 +75,7 @@
-   "%{fvtable-verify=none:%s; \
-      fvtable-verify=preinit:vtv_end_preinit.o%s; \
-      fvtable-verify=std:vtv_end.o%s} \
--   %{static:crtend.o%s; \
--     shared|static-pie|" PIE_SPEC ":crtendS.o%s; \
-+   %{shared|" PIE_SPEC ":crtendS.o%s; \
-      :crtend.o%s} " \
-    GNU_USER_TARGET_CRTN " " \
-    CRTOFFLOADEND
-@@ -133,7 +131,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC
- 
- #if defined(HAVE_LD_EH_FRAME_HDR)
--#define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} "
-+#define LINK_EH_SPEC "%{!static|" PIE_SPEC ":--eh-frame-hdr} "
- #endif
- 
- #undef LINK_GCC_C_SEQUENCE_SPEC
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index eb1610ba8b0..87560afb03c 100644
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -900,7 +900,7 @@ proper position among the other output files.  */
- #define NO_FPIE_AND_FPIC_SPEC	NO_FPIE_SPEC "|" NO_FPIC_SPEC
- #define FPIE_OR_FPIC_SPEC	NO_FPIE_AND_FPIC_SPEC ":;"
- #else
--#define PIE_SPEC		"pie"
-+#define PIE_SPEC		"pie|static-pie"
- #define FPIE1_SPEC		"fpie"
- #define NO_FPIE1_SPEC		FPIE1_SPEC ":;"
- #define FPIE2_SPEC		"fPIE"
-@@ -924,12 +924,12 @@ proper position among the other output files.  */
- #ifndef LINK_PIE_SPEC
- #ifdef HAVE_LD_PIE
- #ifndef LD_PIE_SPEC
--#define LD_PIE_SPEC "-pie"
-+#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic}"
- #endif
- #else
- #define LD_PIE_SPEC ""
- #endif
--#define LINK_PIE_SPEC "%{static|shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} "
-+#define LINK_PIE_SPEC "%{shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} "
- #endif
- 
- #ifndef LINK_BUILDID_SPEC
--- 
-2.17.1
-
diff --git a/main/gcc/0013-nopie.patch b/main/gcc/0013-nopie.patch
new file mode 100644
index 00000000000..28a765ef232
--- /dev/null
+++ b/main/gcc/0013-nopie.patch
@@ -0,0 +1,75 @@
+From 7d7d12137c666761a8dd61179c9651b85dae9b41 Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <nsz@port70.net>
+Date: Sat, 7 Nov 2015 02:08:05 +0000
+Subject: [PATCH 13/35] nopie
+
+---
+ gcc/configure    | 27 +++++++++++++++++++++++++++
+ gcc/configure.ac | 13 +++++++++++++
+ 2 files changed, 40 insertions(+)
+
+diff --git a/gcc/configure b/gcc/configure
+index 8c46369f73f..e59cbee1767 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -32268,6 +32268,33 @@ fi
+ $as_echo "$gcc_cv_no_pie" >&6; }
+ if test "$gcc_cv_no_pie" = "yes"; then
+   NO_PIE_FLAG="-no-pie"
++else
++  # Check if -nopie works.
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -nopie option" >&5
++$as_echo_n "checking for -nopie option... " >&6; }
++if test "${gcc_cv_nopie+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  saved_LDFLAGS="$LDFLAGS"
++     LDFLAGS="$LDFLAGS -nopie"
++     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++int main(void) {return 0;}
++_ACEOF
++if ac_fn_cxx_try_link "$LINENO"; then :
++  gcc_cv_nopie=yes
++else
++  gcc_cv_nopie=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++     LDFLAGS="$saved_LDFLAGS"
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_nopie" >&5
++$as_echo "$gcc_cv_nopie" >&6; }
++  if test "$gcc_cv_nopie" = "yes"; then
++    NO_PIE_FLAG="-nopie"
++  fi
+ fi
+ 
+ 
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 5504bf6eb01..57268319de1 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -7552,6 +7552,19 @@ AC_CACHE_CHECK([for -no-pie option],
+    LDFLAGS="$saved_LDFLAGS"])
+ if test "$gcc_cv_no_pie" = "yes"; then
+   NO_PIE_FLAG="-no-pie"
++else
++  # Check if -nopie works.
++  AC_CACHE_CHECK([for -nopie option],
++    [gcc_cv_nopie],
++    [saved_LDFLAGS="$LDFLAGS"
++     LDFLAGS="$LDFLAGS -nopie"
++     AC_LINK_IFELSE([int main(void) {return 0;}],
++       [gcc_cv_nopie=yes],
++       [gcc_cv_nopie=no])
++     LDFLAGS="$saved_LDFLAGS"])
++  if test "$gcc_cv_nopie" = "yes"; then
++    NO_PIE_FLAG="-nopie"
++  fi
+ fi
+ AC_SUBST([NO_PIE_FLAG])
+ 
+-- 
+2.41.0
+
diff --git a/main/gcc/0014-ada-fix-shared-linking.patch b/main/gcc/0014-ada-fix-shared-linking.patch
new file mode 100644
index 00000000000..ff6e429210e
--- /dev/null
+++ b/main/gcc/0014-ada-fix-shared-linking.patch
@@ -0,0 +1,42 @@
+From dd5bb97c31a9f57034c70a7a18ba6e2e133084c7 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:59:16 +0000
+Subject: [PATCH 14/35] ada: fix shared linking
+
+---
+ gcc/ada/link.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/gcc/ada/link.c b/gcc/ada/link.c
+index f2126441208..22cfa9c641f 100644
+--- a/gcc/ada/link.c
++++ b/gcc/ada/link.c
+@@ -107,9 +107,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
+    || defined (__NetBSD__) || defined (__OpenBSD__) \
+    || defined (__QNX__)
+ const char *__gnat_object_file_option = "-Wl,@";
+-const char *__gnat_run_path_option = "-Wl,-rpath,";
+-char __gnat_shared_libgnat_default = STATIC;
+-char __gnat_shared_libgcc_default = STATIC;
++const char *__gnat_run_path_option = "";
++char __gnat_shared_libgnat_default = SHARED;
++char __gnat_shared_libgcc_default = SHARED;
+ int __gnat_link_max = 8192;
+ unsigned char __gnat_objlist_file_supported = 1;
+ const char *__gnat_object_library_extension = ".a";
+@@ -129,9 +129,9 @@ const char *__gnat_default_libgcc_subdir = "lib";
+ 
+ #elif defined (__linux__) || defined (__GLIBC__)
+ const char *__gnat_object_file_option = "-Wl,@";
+-const char *__gnat_run_path_option = "-Wl,-rpath,";
+-char __gnat_shared_libgnat_default = STATIC;
+-char __gnat_shared_libgcc_default = STATIC;
++const char *__gnat_run_path_option = "";
++char __gnat_shared_libgnat_default = SHARED;
++char __gnat_shared_libgcc_default = SHARED;
+ int __gnat_link_max = 8192;
+ unsigned char __gnat_objlist_file_supported = 1;
+ const char *__gnat_object_library_extension = ".a";
+-- 
+2.41.0
+
diff --git a/main/gcc/0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch b/main/gcc/0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
new file mode 100644
index 00000000000..937cad8a708
--- /dev/null
+++ b/main/gcc/0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
@@ -0,0 +1,24 @@
+From 6bb5b7d9161d05f31b001d8211a9c63caf63fd2f Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 06:59:43 +0000
+Subject: [PATCH 15/35] build: fix CXXFLAGS_FOR_BUILD passing
+
+---
+ Makefile.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.in b/Makefile.in
+index 06a9398e172..6ff2b3f9925 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -178,6 +178,7 @@ BUILD_EXPORTS = \
+ # built for the build system to override those in BASE_FLAGS_TO_PASS.
+ EXTRA_BUILD_FLAGS = \
+ 	CFLAGS="$(CFLAGS_FOR_BUILD)" \
++	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
+ 	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
+ 
+ # This is the list of directories to built for the host system.
+-- 
+2.41.0
+
diff --git a/main/gcc/0016-add-fortify-headers-paths.patch b/main/gcc/0016-add-fortify-headers-paths.patch
new file mode 100644
index 00000000000..b554e0251d3
--- /dev/null
+++ b/main/gcc/0016-add-fortify-headers-paths.patch
@@ -0,0 +1,25 @@
+From f0d9e00cac06689f64b214de7aee80d7116ef084 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 07:01:06 +0000
+Subject: [PATCH 16/35] add fortify-headers paths
+
+---
+ gcc/config/linux.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gcc/config/linux.h b/gcc/config/linux.h
+index e3aca79cccc..b3537b8fbeb 100644
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -159,6 +159,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ 
+ #ifdef NATIVE_SYSTEM_HEADER_DIR
+ #define INCLUDE_DEFAULTS_MUSL_NATIVE			\
++    { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 2 },	\
++    { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 0 },	\
+     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
+     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
+ #else
+-- 
+2.41.0
+
diff --git a/main/gcc/0016-invalid_tls_model.patch b/main/gcc/0016-invalid_tls_model.patch
deleted file mode 100644
index c387f3eb00a..00000000000
--- a/main/gcc/0016-invalid_tls_model.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fixes errors such as:
-
-GEGL-Message: 16:04:13.794: Module '/usr/lib/gegl-0.4/raw-load.so' load error: Error relocating /usr/lib/libgomp.so.1: __cxa_finalize: initial-exec TLS resolves to dynamic definition in /usr/lib/libgomp.so.1
-
---- a/libgomp/configure.tgt	2018-11-08 18:13:04.000000000 +0100
-+++ b/libgomp/configure.tgt	2019-06-29 20:06:31.972950350 +0200
-@@ -10,23 +10,6 @@
- #  XCFLAGS		Add extra compile flags to use.
- #  XLDFLAGS		Add extra link flags to use.
- 
--# Optimize TLS usage by avoiding the overhead of dynamic allocation.
--if test $gcc_cv_have_tls = yes ; then
--  case "${target}" in
--
--    *-*-k*bsd*-gnu*)
--	;;
--
--    *-*-linux* | *-*-gnu*)
--	XCFLAGS="${XCFLAGS} -ftls-model=initial-exec -DUSING_INITIAL_EXEC_TLS"
--	;;
--
--    *-*-rtems*)
--	XCFLAGS="${XCFLAGS} -ftls-model=local-exec"
--	;;
--  esac
--fi
--
- # Since we require POSIX threads, assume a POSIX system by default.
- config_path="posix"
diff --git a/main/gcc/0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch b/main/gcc/0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
new file mode 100644
index 00000000000..96972482c29
--- /dev/null
+++ b/main/gcc/0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
@@ -0,0 +1,31 @@
+From 857db04f4f1a06e866551b4172fe8f27363f4a92 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Fri, 21 Aug 2020 07:03:00 +0000
+Subject: [PATCH 17/35] Alpine musl package provides libssp_nonshared.a. We
+ link to it unconditionally, as otherwise we get link failures if some objects
+ are -fstack-protector built and final link happens with -fno-stack-protector.
+ This seems to be the common case when bootstrapping gcc, the piepatches do
+ not seem to fully fix the crosstoolchain and bootstrap sequence wrt.
+ stack-protector flag usage.
+
+---
+ gcc/gcc.cc | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index b5a6f200635..6cbb726599b 100644
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -991,8 +991,7 @@ proper position among the other output files.  */
+ 
+ #ifndef LINK_SSP_SPEC
+ #ifdef TARGET_LIBC_PROVIDES_SSP
+-#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
+-		       "|fstack-protector-strong|fstack-protector-explicit:}"
++#define LINK_SSP_SPEC "-lssp_nonshared"
+ #else
+ #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
+ 		       "|fstack-protector-strong|fstack-protector-explicit" \
+-- 
+2.41.0
+
diff --git a/main/gcc/0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch b/main/gcc/0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
new file mode 100644
index 00000000000..a9612913e00
--- /dev/null
+++ b/main/gcc/0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
@@ -0,0 +1,69 @@
+From 5a8347e23ab13912b6edec2c6c6e3a101b017c79 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 07:03:42 +0000
+Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when
+ linking libtsan.
+
+---
+ gcc/gcc.cc | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index 6cbb726599b..59390fd39d6 100644
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -755,10 +755,10 @@ proper position among the other output files.  */
+ #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
+ #elif defined(HAVE_LD_STATIC_DYNAMIC)
+ #define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
+-		     " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
++		     " %{!static-libasan:--push-state --no-as-needed}" \
+ 		     " -lasan " \
+ 		     " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
+-		     " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
++		     " %{!static-libasan:--pop-state}" \
+ 		     STATIC_LIBASAN_LIBS
+ #else
+ #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
+@@ -794,10 +794,10 @@ proper position among the other output files.  */
+ #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
+ #elif defined(HAVE_LD_STATIC_DYNAMIC)
+ #define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
+-		     " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
++		     " %{!static-libtsan:--push-state --no-as-needed}" \
+ 		     " -ltsan " \
+ 		     " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
+-		     " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
++		     " %{!static-libtsan:--pop-state}" \
+ 		     STATIC_LIBTSAN_LIBS
+ #else
+ #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
+@@ -815,10 +815,10 @@ proper position among the other output files.  */
+ #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
+ #elif defined(HAVE_LD_STATIC_DYNAMIC)
+ #define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
+-		     " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
++		     " %{!static-liblsan:--push-state --no-as-needed}" \
+ 		     " -llsan " \
+ 		     " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
+-		     " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
++		     " %{!static-liblsan:--pop-state}" \
+ 		     STATIC_LIBLSAN_LIBS
+ #else
+ #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
+@@ -834,10 +834,10 @@ proper position among the other output files.  */
+   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
+ #ifdef HAVE_LD_STATIC_DYNAMIC
+ #define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
+-		     " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
++		     " %{!static-libubsan:--push-state --no-as-needed}" \
+ 		     " -lubsan " \
+ 		     " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
+-		     " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
++		     " %{!static-libubsan:--pop-state}" \
+ 		     STATIC_LIBUBSAN_LIBS
+ #else
+ #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
+-- 
+2.41.0
+
diff --git a/main/gcc/0019-aarch64-disable-multilib-support.patch b/main/gcc/0019-aarch64-disable-multilib-support.patch
new file mode 100644
index 00000000000..5a8148febe9
--- /dev/null
+++ b/main/gcc/0019-aarch64-disable-multilib-support.patch
@@ -0,0 +1,26 @@
+From 41d00a2eb0754acf71958808bd17dbebeb517b84 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:12:55 +0000
+Subject: [PATCH 19/35] aarch64: disable multilib support
+
+multilib is unsupported on Alpine GCC
+---
+ gcc/config/aarch64/t-aarch64-linux | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
+index 57bf4100fcd..172894b57ef 100644
+--- a/gcc/config/aarch64/t-aarch64-linux
++++ b/gcc/config/aarch64/t-aarch64-linux
+@@ -22,7 +22,7 @@ LIB1ASMSRC   = aarch64/lib1funcs.asm
+ LIB1ASMFUNCS = _aarch64_sync_cache_range
+ 
+ AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
+-MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
++MULTILIB_OSDIRNAMES = mabi.lp64=../lib
+ MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
+ 
+ MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
+-- 
+2.41.0
+
diff --git a/main/gcc/0020-s390x-disable-multilib-support.patch b/main/gcc/0020-s390x-disable-multilib-support.patch
new file mode 100644
index 00000000000..ef2f449a4ec
--- /dev/null
+++ b/main/gcc/0020-s390x-disable-multilib-support.patch
@@ -0,0 +1,25 @@
+From 85b42bfbba71616831d14360b16998acb28790fd Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:13:59 +0000
+Subject: [PATCH 20/35] s390x: disable multilib support
+
+multilib is not supported on Alpine GCC at present
+---
+ gcc/config/s390/t-linux64 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64
+index cc6ab367072..7f498ee1cdc 100644
+--- a/gcc/config/s390/t-linux64
++++ b/gcc/config/s390/t-linux64
+@@ -7,5 +7,5 @@
+ 
+ MULTILIB_OPTIONS = m64/m31
+ MULTILIB_DIRNAMES = 64 32
+-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
+-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
++MULTILIB_OSDIRNAMES = m64=../lib
++MULTILIB_OSDIRNAMES+= m32=../lib32
+-- 
+2.41.0
+
diff --git a/main/gcc/0021-ppc64-le-disable-multilib-support.patch b/main/gcc/0021-ppc64-le-disable-multilib-support.patch
new file mode 100644
index 00000000000..dbdc7882841
--- /dev/null
+++ b/main/gcc/0021-ppc64-le-disable-multilib-support.patch
@@ -0,0 +1,81 @@
+From 7b53df284242638e940c0155b6c21e88cea1f55b Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:14:33 +0000
+Subject: [PATCH 21/35] ppc64[le]: disable multilib support
+
+multilib is not presently supported on Alpine GCC
+---
+ gcc/config/rs6000/t-linux       | 6 ++++--
+ gcc/config/rs6000/t-linux64     | 4 ++--
+ gcc/config/rs6000/t-linux64bele | 4 ++--
+ gcc/config/rs6000/t-linux64lebe | 4 ++--
+ 4 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
+index 4e371255533..128c75c7d39 100644
+--- a/gcc/config/rs6000/t-linux
++++ b/gcc/config/rs6000/t-linux
+@@ -2,7 +2,8 @@
+ # or soft-float.
+ ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
+ ifneq (,$(findstring powerpc64,$(target)))
+-MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
++MULTILIB_OSDIRNAMES := m64=../lib
++MULTILIB_OSDIRNAMES += m32=../lib32
+ else
+ MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu)
+ endif
+@@ -10,7 +11,8 @@ ifneq (,$(findstring powerpcle,$(target)))
+ MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))
+ endif
+ ifneq (,$(findstring powerpc64le,$(target)))
+-MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))
++MULTILIB_OSDIRNAMES := m64=../lib
++MULTILIB_OSDIRNAMES += m32=../lib32
+ endif
+ endif
+ 
+diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
+index 01a94242308..b3a76379c03 100644
+--- a/gcc/config/rs6000/t-linux64
++++ b/gcc/config/rs6000/t-linux64
+@@ -28,8 +28,8 @@
+ MULTILIB_OPTIONS    := m64/m32
+ MULTILIB_DIRNAMES   := 64 32
+ MULTILIB_EXTRA_OPTS := 
+-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
+-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
++MULTILIB_OSDIRNAMES := m64=../lib
++MULTILIB_OSDIRNAMES += m32=../lib32
+ 
+ rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.cc
+ 	$(COMPILE) $<
+diff --git a/gcc/config/rs6000/t-linux64bele b/gcc/config/rs6000/t-linux64bele
+index 97c1ee6fb4d..08d72639cb6 100644
+--- a/gcc/config/rs6000/t-linux64bele
++++ b/gcc/config/rs6000/t-linux64bele
+@@ -2,6 +2,6 @@
+ 
+ MULTILIB_OPTIONS    += mlittle
+ MULTILIB_DIRNAMES   += le
+-MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))))))
+-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES)))
++MULTILIB_OSDIRNAMES = m64=../lib
++MULTILIB_OSDIRNAMES+= m32=../lib32
+ MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
+diff --git a/gcc/config/rs6000/t-linux64lebe b/gcc/config/rs6000/t-linux64lebe
+index 2e63bdb9fc9..c6e1c5db65d 100644
+--- a/gcc/config/rs6000/t-linux64lebe
++++ b/gcc/config/rs6000/t-linux64lebe
+@@ -2,6 +2,6 @@
+ 
+ MULTILIB_OPTIONS    += mbig
+ MULTILIB_DIRNAMES   += be
+-MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES))))))
+-MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES)))
++MULTILIB_OSDIRNAMES := m64=../lib
++MULTILIB_OSDIRNAMES += m32=../lib32
+ MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
+-- 
+2.41.0
+
diff --git a/main/gcc/0022-x86_64-disable-multilib-support.patch b/main/gcc/0022-x86_64-disable-multilib-support.patch
new file mode 100644
index 00000000000..2b2f3e7f36b
--- /dev/null
+++ b/main/gcc/0022-x86_64-disable-multilib-support.patch
@@ -0,0 +1,26 @@
+From 96e7e1e9a899d9bb5fcbdf788bd529d0390c626f Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 6 Jan 2022 03:14:54 +0000
+Subject: [PATCH 22/35] x86_64: disable multilib support
+
+multilib is not presently supported on Alpine GCC
+---
+ gcc/config/i386/t-linux64 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
+index 138956b0962..bc03dab874f 100644
+--- a/gcc/config/i386/t-linux64
++++ b/gcc/config/i386/t-linux64
+@@ -33,6 +33,6 @@
+ comma=,
+ MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
+ MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
+-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
+-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
++MULTILIB_OSDIRNAMES = m64=../lib
++MULTILIB_OSDIRNAMES+= m32=../lib32
+ MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
+-- 
+2.41.0
+
diff --git a/main/gcc/0023-riscv-disable-multilib-support.patch b/main/gcc/0023-riscv-disable-multilib-support.patch
new file mode 100644
index 00000000000..b919defc36d
--- /dev/null
+++ b/main/gcc/0023-riscv-disable-multilib-support.patch
@@ -0,0 +1,76 @@
+From b26224acf342eacb33491f6ea0da1faf73d35715 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Mon, 3 Jan 2022 07:14:48 +0100
+Subject: [PATCH 23/35] riscv: disable multilib support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From the musl wiki [1]:
+
+	musl does not support sharing an include directory between archs
+	[…], and thus is not compatible with GCC-style multilib. It is
+	recommended that distributions build GCC with multilib disabled,
+	and use library directories named lib, not lib64 or lib32.
+
+For this reason, we patch existing GCC configuration files (gcc/config)
+to pin MULTILIB_OSDIRNAMES to lib, there is also a corresponding GCC
+upstream bug about this issue [2]. Avoiding the use of lib64 and lib32
+directories is a bit more difficult on the RISC-V architecture. This is
+due to the fact that the default RISC-V configuration does not only use
+the lib64 and lib32 directories but also subdirectories within these
+directories for different RISC-V ABIs (e.g. lp64d, lp64, …) [3].
+
+This patch aligns the RISC-V configuration with other architectures by
+pinning MULTILIB_OSDIRNAMES to lib for rv64gc (our default RISC-V
+-march). Furthermore, this patch removes the ABI-specific startfile
+prefix spec. Since both of these impact the default LIBRARY_PATH [4]
+this patch thereby aligns the default RISC-V LIBRARY_PATH with that from
+other Alpine architectures and thereby fixes #13369 [5].
+
+Incidentally, this also fixes gccgo on riscv64, as without this patch
+gccgo is otherwise not able to find the *.gox files for the Go standard
+library.
+
+[1]: https://wiki.musl-libc.org/guidelines-for-distributions.html#Multilib/multi_arch
+[2]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90077
+[3]: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103889#c14
+[4]: https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/gcc.c;h=d4c8746b0aa322286decf92aa72a12f0a393b655;hb=HEAD#l9122
+[5]: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13369
+---
+ gcc/config/riscv/linux.h | 8 --------
+ gcc/config/riscv/t-linux | 7 +++++--
+ 2 files changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
+index f8c2c351e5a..8d9881eadeb 100644
+--- a/gcc/config/riscv/linux.h
++++ b/gcc/config/riscv/linux.h
+@@ -61,11 +61,3 @@ along with GCC; see the file COPYING3.  If not see
+     %{static:-static}}"
+ 
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+-
+-#define STARTFILE_PREFIX_SPEC 			\
+-   "/lib" XLEN_SPEC "/" ABI_SPEC "/ "		\
+-   "/usr/lib" XLEN_SPEC "/" ABI_SPEC "/ "	\
+-   "/lib/ "					\
+-   "/usr/lib/ "
+-
+-#define RISCV_USE_CUSTOMISED_MULTI_LIB select_by_abi
+diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux
+index 216d2776a18..1a8a863853e 100644
+--- a/gcc/config/riscv/t-linux
++++ b/gcc/config/riscv/t-linux
+@@ -1,3 +1,6 @@
+-# Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/
+-MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
++MULTILIB_OPTIONS := march=rv64gc
++MULTILIB_DIRNAMES := rv64gc
++
++MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib,$(MULTILIB_DIRNAMES)))
+ MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
++MULTILIB_MATCHES := march?rv64gc=march?rv64imafdc
+-- 
+2.41.0
+
diff --git a/main/gcc/0024-always-build-libgcc_eh.a.patch b/main/gcc/0024-always-build-libgcc_eh.a.patch
new file mode 100644
index 00000000000..6b0514e9808
--- /dev/null
+++ b/main/gcc/0024-always-build-libgcc_eh.a.patch
@@ -0,0 +1,51 @@
+From a72e0613f79f6b6867819317accb7a714031a08c Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 07:05:41 +0000
+Subject: [PATCH 24/35] always build libgcc_eh.a
+
+highly inspired by:
+  http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
+---
+ libgcc/Makefile.in | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
+index 6c4dc79ab71..023cede18a7 100644
+--- a/libgcc/Makefile.in
++++ b/libgcc/Makefile.in
+@@ -960,8 +960,9 @@ ifneq ($(LIBUNWIND),)
+ all: libunwind.a
+ endif
+ 
++all: libgcc_eh.a
+ ifeq ($(enable_shared),yes)
+-all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
++all: libgcc_s$(SHLIB_EXT)
+ ifneq ($(LIBUNWIND),)
+ all: libunwind$(SHLIB_EXT)
+ libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
+@@ -1163,10 +1164,6 @@ install-libunwind:
+ install-shared:
+ 	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
+ 
+-	$(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
+-	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
+-	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
+-
+ 	$(subst @multilib_dir@,$(MULTIDIR),$(subst \
+ 		@shlib_base_name@,libgcc_s,$(subst \
+ 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
+@@ -1183,6 +1180,10 @@ ifeq ($(enable_gcov),yes)
+ 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
+ endif
+ 
++	$(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
++	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
++	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
++
+ 	parts="$(INSTALL_PARTS)";				\
+ 	for file in $$parts; do					\
+ 	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
+-- 
+2.41.0
+
diff --git a/main/gcc/0025-ada-libgnarl-compatibility-for-musl.patch b/main/gcc/0025-ada-libgnarl-compatibility-for-musl.patch
new file mode 100644
index 00000000000..b7c1c5f2fbf
--- /dev/null
+++ b/main/gcc/0025-ada-libgnarl-compatibility-for-musl.patch
@@ -0,0 +1,135 @@
+From 3ee8cbc1cad261b30d4a7a66d31496d5f243ce2f Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 07:06:30 +0000
+Subject: [PATCH 25/35] ada: libgnarl compatibility for musl
+
+---
+ gcc/ada/libgnarl/s-osinte__linux.ads | 11 ------
+ gcc/ada/libgnarl/s-taprop__linux.adb | 53 ++--------------------------
+ 2 files changed, 3 insertions(+), 61 deletions(-)
+
+diff --git a/gcc/ada/libgnarl/s-osinte__linux.ads b/gcc/ada/libgnarl/s-osinte__linux.ads
+index a5e645d334d..32165347071 100644
+--- a/gcc/ada/libgnarl/s-osinte__linux.ads
++++ b/gcc/ada/libgnarl/s-osinte__linux.ads
+@@ -403,12 +403,6 @@ package System.OS_Interface is
+    PTHREAD_RWLOCK_PREFER_WRITER_NP              : constant := 1;
+    PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP : constant := 2;
+ 
+-   function pthread_rwlockattr_setkind_np
+-     (attr : access pthread_rwlockattr_t;
+-      pref : int) return int;
+-   pragma Import
+-     (C, pthread_rwlockattr_setkind_np, "pthread_rwlockattr_setkind_np");
+-
+    function pthread_rwlock_init
+      (mutex : access pthread_rwlock_t;
+       attr  : access pthread_rwlockattr_t) return int;
+@@ -470,11 +464,6 @@ package System.OS_Interface is
+       protocol : int) return int;
+    pragma Import (C, pthread_mutexattr_setprotocol);
+ 
+-   function pthread_mutexattr_setprioceiling
+-     (attr        : access pthread_mutexattr_t;
+-      prioceiling : int) return int;
+-   pragma Import (C, pthread_mutexattr_setprioceiling);
+-
+    type struct_sched_param is record
+       sched_priority : int;  --  scheduling priority
+    end record;
+diff --git a/gcc/ada/libgnarl/s-taprop__linux.adb b/gcc/ada/libgnarl/s-taprop__linux.adb
+index 821ceef30e4..ae95b58e01e 100644
+--- a/gcc/ada/libgnarl/s-taprop__linux.adb
++++ b/gcc/ada/libgnarl/s-taprop__linux.adb
+@@ -198,9 +198,6 @@ package body System.Task_Primitives.Operations is
+    pragma Import
+      (C, GNAT_pthread_condattr_setup, "__gnat_pthread_condattr_setup");
+ 
+-   function GNAT_has_cap_sys_nice return C.int;
+-   pragma Import
+-     (C, GNAT_has_cap_sys_nice, "__gnat_has_cap_sys_nice");
+    --  We do not have pragma Linker_Options ("-lcap"); here, because this
+    --  library is not present on many Linux systems. 'libcap' is the Linux
+    --  "capabilities" library, called by __gnat_has_cap_sys_nice.
+@@ -210,38 +207,6 @@ package body System.Task_Primitives.Operations is
+    --  Convert Ada priority to Linux priority. Priorities are 1 .. 99 on
+    --  GNU/Linux, so we map 0 .. 98 to 1 .. 99.
+ 
+-   function Get_Ceiling_Support return Boolean;
+-   --  Get the value of the Ceiling_Support constant (see below).
+-   --  Note well: If this function or related code is modified, it should be
+-   --  tested by hand, because automated testing doesn't exercise it.
+-
+-   -------------------------
+-   -- Get_Ceiling_Support --
+-   -------------------------
+-
+-   function Get_Ceiling_Support return Boolean is
+-      Ceiling_Support : Boolean := False;
+-   begin
+-      if Locking_Policy /= 'C' then
+-         return False;
+-      end if;
+-
+-      declare
+-         function geteuid return Integer;
+-         pragma Import (C, geteuid, "geteuid");
+-         Superuser : constant Boolean := geteuid = 0;
+-         Has_Cap : constant C.int := GNAT_has_cap_sys_nice;
+-         pragma Assert (Has_Cap in 0 | 1);
+-      begin
+-         Ceiling_Support := Superuser or else Has_Cap = 1;
+-      end;
+-
+-      return Ceiling_Support;
+-   end Get_Ceiling_Support;
+-
+-   pragma Warnings (Off, "non-preelaborable call not allowed*");
+-   Ceiling_Support : constant Boolean := Get_Ceiling_Support;
+-   pragma Warnings (On, "non-preelaborable call not allowed*");
+    --  True if the locking policy is Ceiling_Locking, and the current process
+    --  has permission to use this policy. The process has permission if it is
+    --  running as 'root', or if the capability was set by the setcap command,
+@@ -344,7 +309,9 @@ package body System.Task_Primitives.Operations is
+    -- Init_Mutex --
+    ----------------
+ 
++   pragma Warnings (Off, "formal parameter * is not referenced");
+    function Init_Mutex (L : RTS_Lock_Ptr; Prio : Any_Priority) return C.int is
++   pragma Warnings (On, "formal parameter * is not referenced");
+       Mutex_Attr : aliased pthread_mutexattr_t;
+       Result, Result_2 : C.int;
+ 
+@@ -356,16 +323,7 @@ package body System.Task_Primitives.Operations is
+          return Result;
+       end if;
+ 
+-      if Ceiling_Support then
+-         Result := pthread_mutexattr_setprotocol
+-           (Mutex_Attr'Access, PTHREAD_PRIO_PROTECT);
+-         pragma Assert (Result = 0);
+-
+-         Result := pthread_mutexattr_setprioceiling
+-           (Mutex_Attr'Access, Prio_To_Linux_Prio (Prio));
+-         pragma Assert (Result = 0);
+-
+-      elsif Locking_Policy = 'I' then
++      if Locking_Policy = 'I' then
+          Result := pthread_mutexattr_setprotocol
+            (Mutex_Attr'Access, PTHREAD_PRIO_INHERIT);
+          pragma Assert (Result = 0);
+@@ -405,11 +363,6 @@ package body System.Task_Primitives.Operations is
+             Result := pthread_rwlockattr_init (RWlock_Attr'Access);
+             pragma Assert (Result = 0);
+ 
+-            Result := pthread_rwlockattr_setkind_np
+-              (RWlock_Attr'Access,
+-               PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
+-            pragma Assert (Result = 0);
+-
+             Result := pthread_rwlock_init (L.RW'Access, RWlock_Attr'Access);
+ 
+             pragma Assert (Result in 0 | ENOMEM);
+-- 
+2.41.0
+
diff --git a/main/gcc/0026-ada-musl-support-fixes.patch b/main/gcc/0026-ada-musl-support-fixes.patch
new file mode 100644
index 00000000000..ada929350be
--- /dev/null
+++ b/main/gcc/0026-ada-musl-support-fixes.patch
@@ -0,0 +1,223 @@
+From 3df4788c79c7429b196c7b284af2b4cf9a4b4f8d Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 21 Aug 2020 07:07:48 +0000
+Subject: [PATCH 26/35] ada: musl support fixes
+
+---
+ gcc/ada/Makefile.rtl | 10 +++++-----
+ gcc/ada/adaint.c     | 34 +++++++++++++++++++---------------
+ gcc/ada/adaint.h     | 10 ++++------
+ gcc/ada/terminals.c  |  8 ++++----
+ 4 files changed, 32 insertions(+), 30 deletions(-)
+
+diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
+index 96306f8cc9a..090b6770ae5 100644
+--- a/gcc/ada/Makefile.rtl
++++ b/gcc/ada/Makefile.rtl
+@@ -1549,7 +1549,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
+   s-intman.adb<libgnarl/s-intman__posix.adb \
+   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
+   $(TRASYM_DWARF_UNIX_PAIRS) \
+-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
++  s-tsmona.adb<libgnat/s-tsmona.adb \
+   a-exetim.adb<libgnarl/a-exetim__posix.adb \
+   a-exetim.ads<libgnarl/a-exetim__default.ads \
+   s-linux.ads<libgnarl/s-linux.ads \
+@@ -2174,7 +2174,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+   s-tasinf.adb<libgnarl/s-tasinf__linux.adb \
+   s-taspri.ads<libgnarl/s-taspri__posix.ads \
+   $(TRASYM_DWARF_UNIX_PAIRS) \
+-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
++  s-tsmona.adb<libgnat/s-tsmona.adb \
+   $(ATOMICS_TARGET_PAIRS) \
+   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
+   system.ads<libgnat/system-linux-ppc.ads
+@@ -2205,7 +2205,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+ endif
+ 
+ # ARM linux, GNU eabi
+-ifeq ($(strip $(filter-out arm% linux-gnueabi%,$(target_cpu) $(target_os))),)
++ifeq ($(strip $(filter-out arm% linux-gnueabi% linux-musleabi% linux-muslgnueabi%,$(target_cpu) $(target_os))),)
+   LIBGNAT_TARGET_PAIRS = \
+   a-intnam.ads<libgnarl/a-intnam__linux.ads \
+   s-inmaop.adb<libgnarl/s-inmaop__posix.adb \
+@@ -2420,7 +2420,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
+   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
+   s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \
+   $(TRASYM_DWARF_UNIX_PAIRS) \
+-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
++  s-tsmona.adb<libgnat/s-tsmona.adb \
+   $(ATOMICS_TARGET_PAIRS) \
+   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
+   $(GNATRTL_128BIT_PAIRS) \
+@@ -2524,7 +2524,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
+   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
+   s-taspri.ads<libgnarl/s-taspri__posix.ads \
+   $(TRASYM_DWARF_UNIX_PAIRS) \
+-  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
++  s-tsmona.adb<libgnat/s-tsmona.adb \
+   $(ATOMICS_TARGET_PAIRS) \
+   $(X86_64_TARGET_PAIRS) \
+   $(SIMD_PATH_TARGET_PAIRS) \
+diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
+index 8522094164e..92b230a462b 100644
+--- a/gcc/ada/adaint.c
++++ b/gcc/ada/adaint.c
+@@ -91,6 +91,11 @@
+ #include <sys/param.h>
+ #include <sys/pstat.h>
+ #endif
++ 
++#if defined (linux) || defined(__linux__)
++#define _GNU_SOURCE 1
++#include <sched.h>
++#endif
+ 
+ #ifdef __PikeOS__
+ #define __BSD_VISIBLE 1
+@@ -3438,7 +3443,6 @@ __gnat_lwp_self (void)
+ #endif
+ 
+ #if defined (__linux__)
+-#include <sched.h>
+ 
+ /* glibc versions earlier than 2.7 do not define the routines to handle
+    dynamically allocated CPU sets. For these targets, we use the static
+@@ -3448,7 +3452,7 @@ __gnat_lwp_self (void)
+ 
+ /* Dynamic cpu sets */
+ 
+-cpu_set_t *
++void *
+ __gnat_cpu_alloc (size_t count)
+ {
+   return CPU_ALLOC (count);
+@@ -3461,33 +3465,33 @@ __gnat_cpu_alloc_size (size_t count)
+ }
+ 
+ void
+-__gnat_cpu_free (cpu_set_t *set)
++__gnat_cpu_free (void *set)
+ {
+-  CPU_FREE (set);
++  CPU_FREE ((cpu_set_t *) set);
+ }
+ 
+ void
+-__gnat_cpu_zero (size_t count, cpu_set_t *set)
++__gnat_cpu_zero (size_t count, void *set)
+ {
+-  CPU_ZERO_S (count, set);
++  CPU_ZERO_S (count, (cpu_set_t *) set);
+ }
+ 
+ void
+-__gnat_cpu_set (int cpu, size_t count, cpu_set_t *set)
++__gnat_cpu_set (int cpu, size_t count, void *set)
+ {
+   /* Ada handles CPU numbers starting from 1, while C identifies the first
+      CPU by a 0, so we need to adjust. */
+-  CPU_SET_S (cpu - 1, count, set);
++  CPU_SET_S (cpu - 1, count, (cpu_set_t *) set);
+ }
+ 
+ #else /* !CPU_ALLOC */
+ 
+ /* Static cpu sets */
+ 
+-cpu_set_t *
++void *
+ __gnat_cpu_alloc (size_t count ATTRIBUTE_UNUSED)
+ {
+-  return (cpu_set_t *) xmalloc (sizeof (cpu_set_t));
++  return xmalloc (sizeof (cpu_set_t));
+ }
+ 
+ size_t
+@@ -3497,23 +3501,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
+ }
+ 
+ void
+-__gnat_cpu_free (cpu_set_t *set)
++__gnat_cpu_free (void *set)
+ {
+   free (set);
+ }
+ 
+ void
+-__gnat_cpu_zero (size_t count ATTRIBUTE_UNUSED, cpu_set_t *set)
++__gnat_cpu_zero (size_t count ATTRIBUTE_UNUSED, void *set)
+ {
+-  CPU_ZERO (set);
++  CPU_ZERO ((cpu_set_t *) set);
+ }
+ 
+ void
+-__gnat_cpu_set (int cpu, size_t count ATTRIBUTE_UNUSED, cpu_set_t *set)
++__gnat_cpu_set (int cpu, size_t count ATTRIBUTE_UNUSED, void *set)
+ {
+   /* Ada handles CPU numbers starting from 1, while C identifies the first
+      CPU by a 0, so we need to adjust. */
+-  CPU_SET (cpu - 1, set);
++  CPU_SET (cpu - 1, (cpu_set_t *) set);
+ }
+ #endif /* !CPU_ALLOC */
+ #endif /* __linux__ */
+diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
+index 987432c9307..4d782f07de9 100644
+--- a/gcc/ada/adaint.h
++++ b/gcc/ada/adaint.h
+@@ -319,13 +319,11 @@ extern void   *__gnat_lwp_self			   (void);
+ 
+ /* Routines for interface to required CPU set primitives */
+ 
+-#include <sched.h>
+-
+-extern cpu_set_t *__gnat_cpu_alloc                 (size_t);
++extern void * __gnat_cpu_alloc                 (size_t);
+ extern size_t __gnat_cpu_alloc_size                (size_t);
+-extern void   __gnat_cpu_free                  (cpu_set_t *);
+-extern void   __gnat_cpu_zero                      (size_t, cpu_set_t *);
+-extern void   __gnat_cpu_set                       (int, size_t, cpu_set_t *);
++extern void   __gnat_cpu_free                  (void *);
++extern void   __gnat_cpu_zero                      (size_t, void *);
++extern void   __gnat_cpu_set                       (int, size_t, void *);
+ #endif
+ 
+ #if defined (_WIN32)
+diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
+index c0ee4a16bb1..ed796a48c1b 100644
+--- a/gcc/ada/terminals.c
++++ b/gcc/ada/terminals.c
+@@ -1127,7 +1127,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+ /* POSIX does not specify how to open the master side of a terminal.Several
+    methods are available (system specific):
+       1- using a cloning device (USE_CLONE_DEVICE)
+-      2- getpt                  (USE_GETPT)
++      2- posix_openpt           (USE_POSIX_OPENPT)
+       3- openpty                (USE_OPENPTY)
+ 
+    When using the cloning device method, the macro USE_CLONE_DEVICE should
+@@ -1141,7 +1141,7 @@ __gnat_setup_winsize (void *desc ATTRIBUTE_UNUSED,
+ #if defined (__APPLE__) || defined (BSD)
+ #define USE_OPENPTY
+ #elif defined (__linux__)
+-#define USE_GETPT
++#define USE_POSIX_OPENPT
+ #elif defined (__sun__)
+ #define USE_CLONE_DEVICE "/dev/ptmx"
+ #elif defined (_AIX)
+@@ -1190,8 +1190,8 @@ allocate_pty_desc (pty_desc **desc) {
+    int  master_fd   = -1;
+    char *slave_name = NULL;
+ 
+-#ifdef USE_GETPT
+-  master_fd = getpt ();
++#if defined(USE_POSIX_OPENPT)
++  master_fd = posix_openpt(O_RDWR | O_NOCTTY);
+ #elif defined (USE_OPENPTY)
+   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
+ #elif defined (USE_CLONE_DEVICE)
+-- 
+2.41.0
+
diff --git a/main/gcc/0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch b/main/gcc/0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
new file mode 100644
index 00000000000..fcf74ee38d7
--- /dev/null
+++ b/main/gcc/0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
@@ -0,0 +1,256 @@
+From 7b50823d8a4131e5a55d2499a0f5a52b3d91eed2 Mon Sep 17 00:00:00 2001
+From: Drew DeVault <sir@cmpwn.com>
+Date: Wed, 9 Dec 2020 07:42:06 +0000
+Subject: [PATCH 27/35] configure: Add --enable-autolink-libatomic, use in
+ LINK_GCC_C_SEQUENCE_SPEC [PR81358]
+
+This fixes issues with RISC-V.
+---
+ Makefile.in           |  1 +
+ gcc/config.in         |  6 ++++++
+ gcc/config/gnu-user.h | 12 +++++++++++-
+ gcc/configure         | 31 ++++++++++++++++++++++++++++++-
+ gcc/configure.ac      | 21 +++++++++++++++++++++
+ gcc/doc/install.texi  |  8 ++++++++
+ gcc/doc/tm.texi       |  8 +++++++-
+ gcc/doc/tm.texi.in    |  8 +++++++-
+ gcc/gcc.cc            | 12 +++++++++++-
+ 9 files changed, 102 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 6ff2b3f9925..394b105b271 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -235,6 +235,7 @@ HOST_EXPORTS = \
+ 	RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
+ 	READELF_FOR_TARGET="$(READELF_FOR_TARGET)"; export READELF_FOR_TARGET; \
+ 	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
++	TARGET_CONFIGDIRS="$(TARGET_CONFIGDIRS)"; export TARGET_CONFIGDIRS; \
+ 	HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \
+ 	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
+ 	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
+diff --git a/gcc/config.in b/gcc/config.in
+index 0679fbbf4c6..ee81139b385 100644
+--- a/gcc/config.in
++++ b/gcc/config.in
+@@ -118,6 +118,12 @@
+ #endif
+ 
+ 
++/* Define if libatomic should always be linked. */
++#ifndef USED_FOR_TARGET
++#undef ENABLE_AUTOLINK_LIBATOMIC
++#endif
++
++
+ /* Define to 1 to specify that we are using the BID decimal floating point
+    format instead of DPD */
+ #ifndef USED_FOR_TARGET
+diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
+index b26b17f2f2a..3f64ea46180 100644
+--- a/gcc/config/gnu-user.h
++++ b/gcc/config/gnu-user.h
+@@ -109,8 +109,18 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ #define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} "
+ #endif
+ 
++#if !defined(LINK_LIBATOMIC_SPEC) && defined(ENABLE_AUTOLINK_LIBATOMIC)
++#  ifdef LD_AS_NEEDED_OPTION
++#    define LINK_LIBATOMIC_SPEC LD_AS_NEEDED_OPTION " -latomic " LD_NO_AS_NEEDED_OPTION
++#  else
++#    define LINK_LIBATOMIC_SPEC "-latomic"
++#  endif
++#elif !defined(LINK_LIBATOMIC_SPEC)
++#  define LINK_LIBATOMIC_SPEC ""
++#endif
++
+ #define GNU_USER_TARGET_LINK_GCC_C_SEQUENCE_SPEC \
+-  "%{static|static-pie:--start-group} %G %{!nolibc:%L} \
++  "%{static|static-pie:--start-group} %G %{!nolibc:" LINK_LIBATOMIC_SPEC " %L} \
+    %{static|static-pie:--end-group}%{!static:%{!static-pie:%G}}"
+ 
+ #undef LINK_GCC_C_SEQUENCE_SPEC
+diff --git a/gcc/configure b/gcc/configure
+index e59cbee1767..787c35d4e25 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -984,6 +984,7 @@ with_changes_root_url
+ enable_languages
+ with_multilib_list
+ with_multilib_generator
++enable_autolink_libatomic
+ with_zstd
+ with_zstd_include
+ with_zstd_lib
+@@ -1713,6 +1714,9 @@ Optional Features:
+   --disable-shared        don't provide a shared libgcc
+   --disable-gcov          don't provide libgcov and related host tools
+   --enable-languages=LIST specify which front-ends to build
++  --enable-autolink-libatomic
++                          enable automatic linking of libatomic (ignored if
++                          not built)
+   --disable-rpath         do not hardcode runtime library paths
+   --enable-sjlj-exceptions
+                           arrange to use setjmp/longjmp exception handling
+@@ -8329,7 +8333,6 @@ else
+ fi
+ 
+ 
+-
+ # Check whether --with-multilib-generator was given.
+ if test "${with_multilib_generator+set}" = set; then :
+   withval=$with_multilib_generator; :
+@@ -8337,6 +8340,32 @@ else
+   with_multilib_generator=default
+ fi
+ 
++# If libatomic is available, whether it should be linked automatically
++# Check whether --enable-autolink-libatomic was given.
++if test "${enable_autolink_libatomic+set}" = set; then :
++  enableval=$enable_autolink_libatomic;
++  case $enable_autolink_libatomic in
++    yes | no) ;;
++    *) as_fn_error $? "'$enable_autolink_libatomic' is an invalid value for
++--enable-autolink-libatomic.  Valid choices are 'yes' and 'no'." "$LINENO" 5 ;;
++  esac
++
++else
++  enable_autolink_libatomic=''
++fi
++
++
++if test x$enable_autolink_libatomic = xyes; then
++  if echo " ${TARGET_CONFIGDIRS} " | grep " libatomic " > /dev/null 2>&1 ; then
++
++$as_echo "#define ENABLE_AUTOLINK_LIBATOMIC 1" >>confdefs.h
++
++  else
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libatomic is not build for this target, --enable-autolink-libatomic ignored" >&5
++$as_echo "$as_me: WARNING: libatomic is not build for this target, --enable-autolink-libatomic ignored" >&2;}
++  fi
++fi
++
+ 
+ # -------------------------
+ # Checks for other programs
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 57268319de1..56bcaa87620 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -1199,6 +1199,27 @@ AC_ARG_WITH(multilib-generator,
+ :,
+ with_multilib_generator=default)
+ 
++# If libatomic is available, whether it should be linked automatically
++AC_ARG_ENABLE(autolink-libatomic,
++[AS_HELP_STRING([--enable-autolink-libatomic],
++		[enable automatic linking of libatomic (ignored if not built)])],
++[
++  case $enable_autolink_libatomic in
++    yes | no) ;;
++    *) AC_MSG_ERROR(['$enable_autolink_libatomic' is an invalid value for
++--enable-autolink-libatomic.  Valid choices are 'yes' and 'no'.]) ;;
++  esac
++], [enable_autolink_libatomic=''])
++
++if test x$enable_autolink_libatomic = xyes; then
++  if echo " ${TARGET_CONFIGDIRS} " | grep " libatomic " > /dev/null 2>&1 ; then
++    AC_DEFINE(ENABLE_AUTOLINK_LIBATOMIC, 1,
++	[Define if libatomic should always be linked.])
++  else
++    AC_MSG_WARN([libatomic is not build for this target, --enable-autolink-libatomic ignored])
++  fi
++fi
++
+ # -------------------------
+ # Checks for other programs
+ # -------------------------
+diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
+index b30d3691fe6..ccc8e5dbb00 100644
+--- a/gcc/doc/install.texi
++++ b/gcc/doc/install.texi
+@@ -2377,6 +2377,14 @@ files, but these changed header paths may conflict with some compilation
+ environments.  Enabled by default, and may be disabled using
+ @option{--disable-canonical-system-headers}.
+ 
++@item --enable-autolink-libatomic
++@itemx --disable-autolink-libatomic
++Tell GCC that it should automatically link libatomic; if supported by
++the linker, the file is only linked as needed. This flag is ignored
++when libatomic is not built. Note that this conigure flag is in particular
++useful when building an offloading-target compiler; as for those, a
++user had to specify @code{-foffload=target=-latomic} otherwise.
++
+ @item --with-glibc-version=@var{major}.@var{minor}
+ Tell GCC that when the GNU C Library (glibc) is used on the target it
+ will be version @var{major}.@var{minor} or later.  Normally this can
+diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
+index a660e33739b..6183c407a2b 100644
+--- a/gcc/doc/tm.texi
++++ b/gcc/doc/tm.texi
+@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
+ 
+ @defmac LINK_GCC_C_SEQUENCE_SPEC
+ The sequence in which libgcc and libc are specified to the linker.
+-By default this is @code{%G %L %G}.
++By default this is @code{%G LINK_LIBATOMIC_SPEC %L %G}.
++@end defmac
++
++@defmac LINK_LIBATOMIC_SPEC
++This macro is used in the default @code{LINK_GCC_C_SEQUENCE_SPEC} to link
++libatomic. By default, it is unset unless @code{ENABLE_AUTOLINK_LIBATOMIC}
++is set.
+ @end defmac
+ 
+ @defmac POST_LINK_SPEC
+diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
+index f7ab5d48a63..281540aba68 100644
+--- a/gcc/doc/tm.texi.in
++++ b/gcc/doc/tm.texi.in
+@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
+ 
+ @defmac LINK_GCC_C_SEQUENCE_SPEC
+ The sequence in which libgcc and libc are specified to the linker.
+-By default this is @code{%G %L %G}.
++By default this is @code{%G LINK_LIBATOMIC_SPEC %L %G}.
++@end defmac
++
++@defmac LINK_LIBATOMIC_SPEC
++This macro is used in the default @code{LINK_GCC_C_SEQUENCE_SPEC} to link
++libatomic. By default, it is unset unless @code{ENABLE_AUTOLINK_LIBATOMIC}
++is set.
+ @end defmac
+ 
+ @defmac POST_LINK_SPEC
+diff --git a/gcc/gcc.cc b/gcc/gcc.cc
+index 59390fd39d6..dae1dd4cf79 100644
+--- a/gcc/gcc.cc
++++ b/gcc/gcc.cc
+@@ -974,13 +974,23 @@ proper position among the other output files.  */
+ # define ASM_DEBUG_OPTION_SPEC ""
+ #endif
+ 
++#if !defined(LINK_LIBATOMIC_SPEC) && defined(ENABLE_AUTOLINK_LIBATOMIC)
++#  ifdef LD_AS_NEEDED_OPTION
++#    define LINK_LIBATOMIC_SPEC LD_AS_NEEDED_OPTION " -latomic " LD_NO_AS_NEEDED_OPTION
++#  else
++#    define LINK_LIBATOMIC_SPEC "-latomic"
++#  endif
++#elif !defined(LINK_LIBATOMIC_SPEC)
++#  define LINK_LIBATOMIC_SPEC ""
++#endif
++
+ /* Here is the spec for running the linker, after compiling all files.  */
+ 
+ /* This is overridable by the target in case they need to specify the
+    -lgcc and -lc order specially, yet not require them to override all
+    of LINK_COMMAND_SPEC.  */
+ #ifndef LINK_GCC_C_SEQUENCE_SPEC
+-#define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}"
++#define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:" LINK_LIBATOMIC_SPEC " %L %G}"
+ #endif
+ 
+ #ifdef ENABLE_DEFAULT_SSP
+-- 
+2.41.0
+
diff --git a/main/gcc/0028-configure-fix-detection-of-atomic-builtins-in-libato.patch b/main/gcc/0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
new file mode 100644
index 00000000000..f92fc7bf4e2
--- /dev/null
+++ b/main/gcc/0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
@@ -0,0 +1,57 @@
+From 5bbbd320e54ab5341cfba83e8af98685131caba1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Sun, 29 Aug 2021 12:23:34 +0200
+Subject: [PATCH 28/35] configure: fix detection of atomic builtins in
+ libatomic configure script
+
+Alpine's --enable-autolink-libatomic (which is enabled for riscv64 by
+default) causes the libatomic configure script to incorrectly detect
+which builtins are available on riscv64. This then causes incorrect code
+generation for libatomic since it assumes compiler builtins to be
+available which are not actually available on riscv64.
+
+This commit fixes this issue by disabling linking of libatomic configure
+test code entirely, thereby preventing linking against libatomic.
+
+See:
+
+* https://gitlab.alpinelinux.org/alpine/aports/-/issues/12948
+* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101996#c6
+---
+ libatomic/configure.tgt | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
+index a92ae9e8309..90b579ca4d8 100644
+--- a/libatomic/configure.tgt
++++ b/libatomic/configure.tgt
+@@ -30,6 +30,26 @@
+ # on ${target_cpu}.  For example to allow proper use of multilibs.
+ configure_tgt_pre_target_cpu_XCFLAGS="${XCFLAGS}"
+ 
++# The libatomic configure script performs several checks to determine
++# whether builtins for atomic operations are available. When compiling
++# with --enable-autolink-libatomic the test code compiled by the
++# configure script is also linked against libatomic. This causes it
++# to think that builtins are available, even if there are not, since
++# the tested symbols are provided by libatomic.
++#
++# This is a hack to ensure that we don't link against libatomic by not
++# linking any configure test code at all when --enable-autolink-libatomic
++# is given.
++#
++# See:
++#
++#   * https://gitlab.alpinelinux.org/alpine/aports/-/issues/12817
++#   * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101996#c4
++#
++if test x$enable_autolink_libatomic = xyes; then
++	gcc_no_link=yes
++fi
++
+ case "${target_cpu}" in
+   alpha*)
+ 	# fenv.c needs this option to generate inexact exceptions.
+-- 
+2.41.0
+
diff --git a/main/gcc/0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch b/main/gcc/0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
new file mode 100644
index 00000000000..4418cd5b5a7
--- /dev/null
+++ b/main/gcc/0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
@@ -0,0 +1,27 @@
+From 430c701a3cefbe09a9c7c8a2f5bbe957f9b2ecb2 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Thu, 30 Jun 2022 16:44:51 +0000
+Subject: [PATCH 29/35] libstdc++: do not throw exceptions for non-C locales on
+ musl targets
+
+---
+ libstdc++-v3/config/locale/generic/c_locale.cc | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/libstdc++-v3/config/locale/generic/c_locale.cc b/libstdc++-v3/config/locale/generic/c_locale.cc
+index 8849d78fdfa..aff467f98fe 100644
+--- a/libstdc++-v3/config/locale/generic/c_locale.cc
++++ b/libstdc++-v3/config/locale/generic/c_locale.cc
+@@ -242,9 +242,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+     // Currently, the generic model only supports the "C" locale.
+     // See http://gcc.gnu.org/ml/libstdc++/2003-02/msg00345.html
+     __cloc = 0;
+-    if (strcmp(__s, "C"))
+-      __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
+-			    "name not valid"));
+   }
+ 
+   void
+-- 
+2.41.0
+
diff --git a/main/gcc/002_all_default-relro.patch b/main/gcc/002_all_default-relro.patch
deleted file mode 100644
index c461017dc6d..00000000000
--- a/main/gcc/002_all_default-relro.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# Turn on -Wl,-z,relro,-z,now by default.
-
----
- gcc/doc/invoke.texi |    3 +++
- gcc/gcc.c           |    1 +
- 2 files changed, 4 insertions(+), 0 deletions(-)
-
-Index: b/gcc/doc/invoke.texi
-===================================================================
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -11424,6 +11424,9 @@ For example, @option{-Wl,-Map,output.map
- linker.  When using the GNU linker, you can also get the same effect with
- @option{-Wl,-Map=output.map}.
- 
-+NOTE: In Alpine Linux, for LDFLAGS, the option
-+@option{-Wl,-z,relro,now} is used.  To disable, use @option{-Wl,-z,norelro}.
-+
- @item -u @var{symbol}
- @opindex u
- Pretend the symbol @var{symbol} is undefined, to force linking of
-Index: b/gcc/gcc.c
-===================================================================
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -890,6 +890,7 @@ proper position among the other output f
-    "%{flto|flto=*:%<fcompare-debug*} \
-     %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
-    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
-+   "-z relro -z now " \
-    "%X %{o*} %{e*} %{N} %{n} %{r}\
-     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}} " VTABLE_VERIFICATION_SPEC " \
-     %{static:} %{L*} %(mfwrap) %(link_libgcc) " SANITIZER_EARLY_SPEC " %o\
diff --git a/main/gcc/0030-gdc-unconditionally-link-libgphobos-against-libucont.patch b/main/gcc/0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
new file mode 100644
index 00000000000..6c5bf838db9
--- /dev/null
+++ b/main/gcc/0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
@@ -0,0 +1,27 @@
+From 05f0043755f341a2ff4f845379327076b3e0203d Mon Sep 17 00:00:00 2001
+From: Mathias LANG <pro.mathias.lang@gmail.com>
+Date: Mon, 17 Jan 2022 03:49:21 +0000
+Subject: [PATCH 30/35] gdc: unconditionally link libgphobos against
+ libucontext
+
+ref: alpine/aports#13422
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 394b105b271..bc4a77fc300 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -52809,7 +52809,7 @@ configure-target-libphobos:
+ 	esac; \
+ 	module_srcdir=libphobos; \
+ 	rm -f no-such-file || : ; \
+-	CONFIG_SITE=no-such-file $(SHELL) \
++	CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
+ 	  $$s/$$module_srcdir/configure \
+ 	  --srcdir=$${topdir}/$$module_srcdir \
+ 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+-- 
+2.41.0
+
diff --git a/main/gcc/0031-druntime-link-against-libucontext-on-all-platforms.patch b/main/gcc/0031-druntime-link-against-libucontext-on-all-platforms.patch
new file mode 100644
index 00000000000..eb7aa6d2146
--- /dev/null
+++ b/main/gcc/0031-druntime-link-against-libucontext-on-all-platforms.patch
@@ -0,0 +1,54 @@
+From 0b89a74fbf77ae6917f043c79cd03db0d6ef0212 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Sat, 16 Jul 2022 09:21:11 +0200
+Subject: [PATCH 31/35] druntime: link against libucontext on all platforms
+
+On musl-based Linux distributions, swapcontext etc. are not provided by
+musl but instead by libucontext. Hence, we _always_ need to link against
+an external library for these functions.
+---
+ libphobos/configure                | 8 --------
+ libphobos/m4/druntime/libraries.m4 | 8 --------
+ 2 files changed, 16 deletions(-)
+
+diff --git a/libphobos/configure b/libphobos/configure
+index 925c53c5f5e..60c2a0c11c6 100755
+--- a/libphobos/configure
++++ b/libphobos/configure
+@@ -15216,14 +15216,6 @@ fi
+   # Keep this in sync with core/thread.d, set druntime_fiber_asm_external to
+   # "yes" for targets that have 'version = AsmExternal'.
+   druntime_fiber_asm_external=no
+-  case "$target_cpu" in
+-    aarch64* | \
+-    arm* | \
+-    i[34567]86|x86_64 | \
+-    powerpc)
+-      druntime_fiber_asm_external=yes
+-      ;;
+-  esac
+   if test "$druntime_fiber_asm_external" = no; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing swapcontext" >&5
+ $as_echo_n "checking for library containing swapcontext... " >&6; }
+diff --git a/libphobos/m4/druntime/libraries.m4 b/libphobos/m4/druntime/libraries.m4
+index 45a56f6f76a..fef6e890b1e 100644
+--- a/libphobos/m4/druntime/libraries.m4
++++ b/libphobos/m4/druntime/libraries.m4
+@@ -220,14 +220,6 @@ AC_DEFUN([DRUNTIME_LIBRARIES_UCONTEXT],
+   # Keep this in sync with core/thread.d, set druntime_fiber_asm_external to
+   # "yes" for targets that have 'version = AsmExternal'.
+   druntime_fiber_asm_external=no
+-  case "$target_cpu" in
+-    aarch64* | \
+-    arm* | \
+-    i[[34567]]86|x86_64 | \
+-    powerpc)
+-      druntime_fiber_asm_external=yes
+-      ;;
+-  esac
+   if test "$druntime_fiber_asm_external" = no; then
+     AC_SEARCH_LIBS([swapcontext], [c ucontext], [],
+       AC_MSG_ERROR([swapcontext required but not found]))
+-- 
+2.41.0
+
diff --git a/main/gcc/0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch b/main/gcc/0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
new file mode 100644
index 00000000000..e1679a8e57f
--- /dev/null
+++ b/main/gcc/0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
@@ -0,0 +1,25 @@
+From eeec799f43fbd0bfffc13594585b39d708972511 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Tue, 19 Jul 2022 14:54:07 +0200
+Subject: [PATCH 32/35] libgnat: time_t is always 64-bit on musl libc
+
+---
+ gcc/ada/libgnat/s-parame.ads | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/ada/libgnat/s-parame.ads b/gcc/ada/libgnat/s-parame.ads
+index 3d6e345a1ba..cfe0b4d3ca6 100644
+--- a/gcc/ada/libgnat/s-parame.ads
++++ b/gcc/ada/libgnat/s-parame.ads
+@@ -102,7 +102,7 @@ package System.Parameters is
+    -- Characteristics of time_t type --
+    ------------------------------------
+ 
+-   time_t_bits : constant := Long_Integer'Size;
++   time_t_bits : constant := Long_Long_Integer'Size;
+    --  Number of bits in type time_t
+ 
+    ----------------------------------------------
+-- 
+2.41.0
+
diff --git a/main/gcc/0033-libphobos-do-not-use-LFS64-symbols.patch b/main/gcc/0033-libphobos-do-not-use-LFS64-symbols.patch
new file mode 100644
index 00000000000..138bd64b762
--- /dev/null
+++ b/main/gcc/0033-libphobos-do-not-use-LFS64-symbols.patch
@@ -0,0 +1,44 @@
+From b71d21b87e6946c763edad5e420bf22d8a453077 Mon Sep 17 00:00:00 2001
+From: psykose <alice@ayaya.dev>
+Date: Mon, 29 May 2023 15:33:11 +0000
+Subject: [PATCH 33/35] libphobos: do not use LFS64 symbols
+
+musl does not have these since 1.2.4, we can't use the compat interfaces.
+---
+ libphobos/libdruntime/core/sys/posix/config.d   | 2 +-
+ libphobos/libdruntime/core/sys/posix/sys/mman.d | 6 +-----
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/libphobos/libdruntime/core/sys/posix/config.d b/libphobos/libdruntime/core/sys/posix/config.d
+index ae6752f220e..6b80d1ff0e6 100644
+--- a/libphobos/libdruntime/core/sys/posix/config.d
++++ b/libphobos/libdruntime/core/sys/posix/config.d
+@@ -88,7 +88,7 @@ else version (CRuntime_Musl)
+     enum __REDIRECT          = false;
+ 
+     // Those three are irrelevant for Musl as it always uses 64 bits off_t
+-    enum __USE_FILE_OFFSET64 = _FILE_OFFSET_BITS == 64;
++    enum __USE_FILE_OFFSET64 = false;
+     enum __USE_LARGEFILE     = __USE_FILE_OFFSET64 && !__REDIRECT;
+     enum __USE_LARGEFILE64   = __USE_FILE_OFFSET64 && !__REDIRECT;
+ 
+diff --git a/libphobos/libdruntime/core/sys/posix/sys/mman.d b/libphobos/libdruntime/core/sys/posix/sys/mman.d
+index 0d3d517d69a..323aa0af72d 100644
+--- a/libphobos/libdruntime/core/sys/posix/sys/mman.d
++++ b/libphobos/libdruntime/core/sys/posix/sys/mman.d
+@@ -293,11 +293,7 @@ else version (CRuntime_Bionic)
+ }
+ else version (CRuntime_Musl)
+ {
+-    static if (__USE_LARGEFILE64) void* mmap64(void*, size_t, int, int, int, off_t);
+-    static if (__USE_FILE_OFFSET64)
+-        alias mmap = mmap64;
+-    else
+-        void* mmap(void*, size_t, int, int, int, off_t);
++    void* mmap(void*, size_t, int, int, int, off_t);
+     int munmap(void*, size_t);
+ }
+ else version (CRuntime_UClibc)
+-- 
+2.41.0
+
diff --git a/main/gcc/0034-libgo-fix-lfs64-use.patch b/main/gcc/0034-libgo-fix-lfs64-use.patch
new file mode 100644
index 00000000000..cf47858d6ab
--- /dev/null
+++ b/main/gcc/0034-libgo-fix-lfs64-use.patch
@@ -0,0 +1,195 @@
+From 4bfcb35bc43d3e3b7510620362d7c28d9e4c17ca Mon Sep 17 00:00:00 2001
+From: psykose <alice@ayaya.dev>
+Date: Mon, 10 Jul 2023 23:23:29 +0000
+Subject: [PATCH 34/35] libgo: fix lfs64 use
+
+---
+ .../go/internal/syscall/unix/at_largefile.go  |  2 +-
+ libgo/go/os/dir_largefile.go                  |  2 +-
+ libgo/go/syscall/libcall_glibc.go             |  2 +-
+ libgo/go/syscall/libcall_linux.go             |  4 +--
+ libgo/go/syscall/libcall_posix_largefile.go   | 26 +++++++++----------
+ libgo/runtime/go-varargs.c                    |  2 +-
+ libgo/sysinfo.c                               |  9 +++----
+ 7 files changed, 22 insertions(+), 25 deletions(-)
+
+diff --git a/libgo/go/internal/syscall/unix/at_largefile.go b/libgo/go/internal/syscall/unix/at_largefile.go
+index 82e0dcfd074..16151ecad1b 100644
+--- a/libgo/go/internal/syscall/unix/at_largefile.go
++++ b/libgo/go/internal/syscall/unix/at_largefile.go
+@@ -10,5 +10,5 @@ import (
+ 	"syscall"
+ )
+ 
+-//extern fstatat64
++//extern fstatat
+ func fstatat(int32, *byte, *syscall.Stat_t, int32) int32
+diff --git a/libgo/go/os/dir_largefile.go b/libgo/go/os/dir_largefile.go
+index 1fc5ee0771f..0c6dffe1a75 100644
+--- a/libgo/go/os/dir_largefile.go
++++ b/libgo/go/os/dir_largefile.go
+@@ -11,5 +11,5 @@ package os
+ 
+ import "syscall"
+ 
+-//extern readdir64
++//extern readdir
+ func libc_readdir(*syscall.DIR) *syscall.Dirent
+diff --git a/libgo/go/syscall/libcall_glibc.go b/libgo/go/syscall/libcall_glibc.go
+index 5c1ec483c75..5a1245ed44b 100644
+--- a/libgo/go/syscall/libcall_glibc.go
++++ b/libgo/go/syscall/libcall_glibc.go
+@@ -114,7 +114,7 @@ func Pipe2(p []int, flags int) (err error) {
+ }
+ 
+ //sys	sendfile(outfd int, infd int, offset *Offset_t, count int) (written int, err error)
+-//sendfile64(outfd _C_int, infd _C_int, offset *Offset_t, count Size_t) Ssize_t
++//sendfile(outfd _C_int, infd _C_int, offset *Offset_t, count Size_t) Ssize_t
+ 
+ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+ 	if race.Enabled {
+diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go
+index 03ca7261b59..ad21fd0b3ac 100644
+--- a/libgo/go/syscall/libcall_linux.go
++++ b/libgo/go/syscall/libcall_linux.go
+@@ -158,7 +158,7 @@ func Reboot(cmd int) (err error) {
+ //adjtimex(buf *Timex) _C_int
+ 
+ //sys	Fstatfs(fd int, buf *Statfs_t) (err error)
+-//fstatfs64(fd _C_int, buf *Statfs_t) _C_int
++//fstatfs(fd _C_int, buf *Statfs_t) _C_int
+ 
+ func Gettid() (tid int) {
+ 	r1, _, _ := Syscall(SYS_GETTID, 0, 0, 0)
+@@ -245,7 +245,7 @@ func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n i
+ }
+ 
+ //sys	Statfs(path string, buf *Statfs_t) (err error)
+-//statfs64(path *byte, buf *Statfs_t) _C_int
++//statfs(path *byte, buf *Statfs_t) _C_int
+ 
+ //sysnb	Sysinfo(info *Sysinfo_t) (err error)
+ //sysinfo(info *Sysinfo_t) _C_int
+diff --git a/libgo/go/syscall/libcall_posix_largefile.go b/libgo/go/syscall/libcall_posix_largefile.go
+index f90055bb29a..334212f0af1 100644
+--- a/libgo/go/syscall/libcall_posix_largefile.go
++++ b/libgo/go/syscall/libcall_posix_largefile.go
+@@ -10,40 +10,40 @@
+ package syscall
+ 
+ //sys	Creat(path string, mode uint32) (fd int, err error)
+-//creat64(path *byte, mode Mode_t) _C_int
++//creat(path *byte, mode Mode_t) _C_int
+ 
+ //sys	Fstat(fd int, stat *Stat_t) (err error)
+-//fstat64(fd _C_int, stat *Stat_t) _C_int
++//fstat(fd _C_int, stat *Stat_t) _C_int
+ 
+ //sys	Ftruncate(fd int, length int64) (err error)
+-//ftruncate64(fd _C_int, length Offset_t) _C_int
++//ftruncate(fd _C_int, length Offset_t) _C_int
+ 
+ //sysnb	Getrlimit(resource int, rlim *Rlimit) (err error)
+-//getrlimit64(resource _C_int, rlim *Rlimit) _C_int
++//getrlimit(resource _C_int, rlim *Rlimit) _C_int
+ 
+ //sys	Lstat(path string, stat *Stat_t) (err error)
+-//lstat64(path *byte, stat *Stat_t) _C_int
++//lstat(path *byte, stat *Stat_t) _C_int
+ 
+ //sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
+-//mmap64(addr *byte, length Size_t, prot _C_int, flags _C_int, fd _C_int, offset Offset_t) *byte
++//mmap(addr *byte, length Size_t, prot _C_int, flags _C_int, fd _C_int, offset Offset_t) *byte
+ 
+ //sys	Open(path string, mode int, perm uint32) (fd int, err error)
+-//__go_open64(path *byte, mode _C_int, perm Mode_t) _C_int
++//__go_open(path *byte, mode _C_int, perm Mode_t) _C_int
+ 
+ //sys	Pread(fd int, p []byte, offset int64) (n int, err error)
+-//pread64(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
++//pread(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
+ 
+ //sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
+-//pwrite64(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
++//pwrite(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
+ 
+ //sys	Seek(fd int, offset int64, whence int) (off int64, err error)
+-//lseek64(fd _C_int, offset Offset_t, whence _C_int) Offset_t
++//lseek(fd _C_int, offset Offset_t, whence _C_int) Offset_t
+ 
+ //sysnb	Setrlimit(resource int, rlim *Rlimit) (err error)
+-//setrlimit64(resource int, rlim *Rlimit) _C_int
++//setrlimit(resource int, rlim *Rlimit) _C_int
+ 
+ //sys	Stat(path string, stat *Stat_t) (err error)
+-//stat64(path *byte, stat *Stat_t) _C_int
++//stat(path *byte, stat *Stat_t) _C_int
+ 
+ //sys	Truncate(path string, length int64) (err error)
+-//truncate64(path *byte, length Offset_t) _C_int
++//truncate(path *byte, length Offset_t) _C_int
+diff --git a/libgo/runtime/go-varargs.c b/libgo/runtime/go-varargs.c
+index f84860891e6..7efc9615985 100644
+--- a/libgo/runtime/go-varargs.c
++++ b/libgo/runtime/go-varargs.c
+@@ -84,7 +84,7 @@ __go_ioctl_ptr (int d, int request, void *arg)
+ int
+ __go_open64 (char *path, int mode, mode_t perm)
+ {
+-  return open64 (path, mode, perm);
++  return open (path, mode, perm);
+ }
+ 
+ #endif
+diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
+index 180f5c31d74..1d717d55c0e 100644
+--- a/libgo/sysinfo.c
++++ b/libgo/sysinfo.c
+@@ -366,7 +366,7 @@ typedef loff_t libgo_loff_t_type;
+ #endif
+ 
+ #if defined(HAVE_OFF64_T)
+-typedef off64_t libgo_off_t_type;
++typedef off_t libgo_off_t_type;
+ #else
+ typedef off_t libgo_off_t_type;
+ #endif
+@@ -398,13 +398,11 @@ typedef off_t libgo_off_t_type;
+ 
+ // From dirent.h
+ SREF(dirent);
+-SREF(dirent64);
+ OTREF(DIR);
+ EREF(DT_UNKNOWN);
+ 
+ // From fcntl.h
+ SREF(flock);
+-SREF(flock64);
+ 
+ // From ffi headers
+ SREF(_ffi_type);
+@@ -485,11 +483,10 @@ EREF(SS_ONSTACK);
+ EREF(SEGV_MAPERR);
+ 
+ // From stat.h
+-SREF(stat64);
++SREF(stat);
+ 
+ // From statfs.h
+ SREF(statfs);
+-SREF(statfs64);
+ 
+ // From sysinfo.h
+ SREF(sysinfo);
+@@ -519,7 +516,7 @@ EREF(PTRACE_PEEKTEXT);
+ 
+ // From sys/resource.h
+ SREF(rusage);
+-SREF(rlimit64);
++SREF(rlimit);
+ EREF(RLIMIT_NOFILE);
+ EREF(PRIO_USER);
+ EREF(RUSAGE_SELF);
+-- 
+2.41.0
+
diff --git a/main/gcc/0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch b/main/gcc/0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
new file mode 100644
index 00000000000..e3c09cc8483
--- /dev/null
+++ b/main/gcc/0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
@@ -0,0 +1,186 @@
+https://gcc.gnu.org/PR110792
+https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=790c1f60a5662b16eb19eb4b81922995863c7571
+https://github.com/randombit/botan/issues/3637
+
+From 85628c5653ff40963158a24c60eeec6a3b5a8e56 Mon Sep 17 00:00:00 2001
+From: Roger Sayle <roger@nextmovesoftware.com>
+Date: Thu, 3 Aug 2023 07:12:04 +0100
+Subject: [PATCH] PR target/110792: Early clobber issues with
+ rot32di2_doubleword on i386.
+
+This patch is a conservative fix for PR target/110792, a wrong-code
+regression affecting doubleword rotations by BITS_PER_WORD, which
+effectively swaps the highpart and lowpart words, when the source to be
+rotated resides in memory. The issue is that if the register used to
+hold the lowpart of the destination is mentioned in the address of
+the memory operand, the current define_insn_and_split unintentionally
+clobbers it before reading the highpart.
+
+Hence, for the testcase, the incorrectly generated code looks like:
+
+        salq    $4, %rdi		// calculate address
+        movq    WHIRL_S+8(%rdi), %rdi	// accidentally clobber addr
+        movq    WHIRL_S(%rdi), %rbp	// load (wrong) lowpart
+
+Traditionally, the textbook way to fix this would be to add an
+explicit early clobber to the instruction's constraints.
+
+ (define_insn_and_split "<insn>32di2_doubleword"
+- [(set (match_operand:DI 0 "register_operand" "=r,r,r")
++ [(set (match_operand:DI 0 "register_operand" "=r,r,&r")
+        (any_rotate:DI (match_operand:DI 1 "nonimmediate_operand" "0,r,o")
+                       (const_int 32)))]
+
+but unfortunately this currently generates significantly worse code,
+due to a strange choice of reloads (effectively memcpy), which ends up
+looking like:
+
+        salq    $4, %rdi		// calculate address
+        movdqa  WHIRL_S(%rdi), %xmm0	// load the double word in SSE reg.
+        movaps  %xmm0, -16(%rsp)	// store the SSE reg back to the stack
+        movq    -8(%rsp), %rdi		// load highpart
+        movq    -16(%rsp), %rbp		// load lowpart
+
+Note that reload's "&" doesn't distinguish between the memory being
+early clobbered, vs the registers used in an addressing mode being
+early clobbered.
+
+The fix proposed in this patch is to remove the third alternative, that
+allowed offsetable memory as an operand, forcing reload to place the
+operand into a register before the rotation.  This results in:
+
+        salq    $4, %rdi
+        movq    WHIRL_S(%rdi), %rax
+        movq    WHIRL_S+8(%rdi), %rdi
+        movq    %rax, %rbp
+
+I believe there's a more advanced solution, by swapping the order of
+the loads (if first destination register is mentioned in the address),
+or inserting a lea insn (if both destination registers are mentioned
+in the address), but this fix is a minimal "safe" solution, that
+should hopefully be suitable for backporting.
+
+2023-08-03  Roger Sayle  <roger@nextmovesoftware.com>
+
+gcc/ChangeLog
+	PR target/110792
+	* config/i386/i386.md (<any_rotate>ti3): For rotations by 64 bits
+	place operand in a register before gen_<insn>64ti2_doubleword.
+	(<any_rotate>di3): Likewise, for rotations by 32 bits, place
+	operand in a register before gen_<insn>32di2_doubleword.
+	(<any_rotate>32di2_doubleword): Constrain operand to be in register.
+	(<any_rotate>64ti2_doubleword): Likewise.
+
+gcc/testsuite/ChangeLog
+	PR target/110792
+	* g++.target/i386/pr110792.C: New 32-bit C++ test case.
+	* gcc.target/i386/pr110792.c: New 64-bit C test case.
+
+(cherry picked from commit 790c1f60a5662b16eb19eb4b81922995863c7571)
+---
+ gcc/config/i386/i386.md                  | 18 ++++++++++++------
+ gcc/testsuite/g++.target/i386/pr110792.C | 16 ++++++++++++++++
+ gcc/testsuite/gcc.target/i386/pr110792.c | 18 ++++++++++++++++++
+ 3 files changed, 46 insertions(+), 6 deletions(-)
+ create mode 100644 gcc/testsuite/g++.target/i386/pr110792.C
+ create mode 100644 gcc/testsuite/gcc.target/i386/pr110792.c
+
+diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
+index f3a3305..a71e837 100644
+--- a/gcc/config/i386/i386.md
++++ b/gcc/config/i386/i386.md
+@@ -14359,7 +14359,10 @@
+     emit_insn (gen_ix86_<insn>ti3_doubleword
+ 		(operands[0], operands[1], operands[2]));
+   else if (CONST_INT_P (operands[2]) && INTVAL (operands[2]) == 64)
+-    emit_insn (gen_<insn>64ti2_doubleword (operands[0], operands[1]));
++    {
++      operands[1] = force_reg (TImode, operands[1]);
++      emit_insn (gen_<insn>64ti2_doubleword (operands[0], operands[1]));
++    }
+   else
+     {
+       rtx amount = force_reg (QImode, operands[2]);
+@@ -14394,7 +14397,10 @@
+     emit_insn (gen_ix86_<insn>di3_doubleword
+ 		(operands[0], operands[1], operands[2]));
+   else if (CONST_INT_P (operands[2]) && INTVAL (operands[2]) == 32)
+-    emit_insn (gen_<insn>32di2_doubleword (operands[0], operands[1]));
++    {
++      operands[1] = force_reg (DImode, operands[1]);
++      emit_insn (gen_<insn>32di2_doubleword (operands[0], operands[1]));
++    }
+   else
+     FAIL;
+ 
+@@ -14562,8 +14568,8 @@
+ })
+ 
+ (define_insn_and_split "<insn>32di2_doubleword"
+- [(set (match_operand:DI 0 "register_operand" "=r,r,r")
+-       (any_rotate:DI (match_operand:DI 1 "nonimmediate_operand" "0,r,o")
++ [(set (match_operand:DI 0 "register_operand" "=r,r")
++       (any_rotate:DI (match_operand:DI 1 "register_operand" "0,r")
+                       (const_int 32)))]
+  "!TARGET_64BIT"
+  "#"
+@@ -14580,8 +14586,8 @@
+ })
+ 
+ (define_insn_and_split "<insn>64ti2_doubleword"
+- [(set (match_operand:TI 0 "register_operand" "=r,r,r")
+-       (any_rotate:TI (match_operand:TI 1 "nonimmediate_operand" "0,r,o")
++ [(set (match_operand:TI 0 "register_operand" "=r,r")
++       (any_rotate:TI (match_operand:TI 1 "register_operand" "0,r")
+                       (const_int 64)))]
+  "TARGET_64BIT"
+  "#"
+diff --git a/gcc/testsuite/g++.target/i386/pr110792.C b/gcc/testsuite/g++.target/i386/pr110792.C
+new file mode 100644
+index 0000000..ce21a7a
+--- /dev/null
++++ b/gcc/testsuite/g++.target/i386/pr110792.C
+@@ -0,0 +1,16 @@
++/* { dg-do compile { target ia32 } } */
++/* { dg-options "-O2" } */
++
++template <int ROT, typename T>
++inline T rotr(T input)
++{
++   return static_cast<T>((input >> ROT) | (input << (8 * sizeof(T) - ROT)));
++}
++
++unsigned long long WHIRL_S[256] = {0x18186018C07830D8};
++unsigned long long whirl(unsigned char x0)
++{
++   const unsigned long long s4 = WHIRL_S[x0&0xFF];
++   return rotr<32>(s4);
++}
++/* { dg-final { scan-assembler-not "movl\tWHIRL_S\\+4\\(,%eax,8\\), %eax" } } */
+diff --git a/gcc/testsuite/gcc.target/i386/pr110792.c b/gcc/testsuite/gcc.target/i386/pr110792.c
+new file mode 100644
+index 0000000..b65125c
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/i386/pr110792.c
+@@ -0,0 +1,18 @@
++/* { dg-do compile { target int128 } } */
++/* { dg-options "-O2" } */
++
++static inline unsigned __int128 rotr(unsigned __int128 input)
++{
++   return ((input >> 64) | (input << (64)));
++}
++
++unsigned __int128 WHIRL_S[256] = {((__int128)0x18186018C07830D8) << 64 |0x18186018C07830D8};
++unsigned __int128 whirl(unsigned char x0)
++{
++   register int t __asm("rdi") = x0&0xFF;
++   const unsigned __int128 s4 = WHIRL_S[t];
++   register unsigned __int128 tt  __asm("rdi") = rotr(s4);
++   asm("":::"memory");
++   return tt;
++}
++/* { dg-final { scan-assembler-not "movq\tWHIRL_S\\+8\\(%rdi\\), %rdi" } } */
+-- 
+2.41.0
+
diff --git a/main/gcc/0037-loongarch-disable-multilib-support.patch b/main/gcc/0037-loongarch-disable-multilib-support.patch
new file mode 100644
index 00000000000..37de3c72945
--- /dev/null
+++ b/main/gcc/0037-loongarch-disable-multilib-support.patch
@@ -0,0 +1,61 @@
+From c4f484f465a32e796ae384aa3f90e79fa218b4e9 Mon Sep 17 00:00:00 2001
+From: Jingyun Hua <huajingyun@loongson.cn>
+Date: Mon, 7 Aug 2023 15:25:58 +0800
+Subject: [PATCH] loongarch disable multilib support
+
+Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
+---
+ gcc/config/loongarch/linux.h    | 10 +---------
+ gcc/config/loongarch/t-linux    | 18 +++---------------
+ 3 files changed, 5 insertions(+), 25 deletions(-)
+
+diff --git a/gcc/config/loongarch/linux.h b/gcc/config/loongarch/linux.h
+index 9059d2441..23eaff0cc 100644
+--- a/gcc/config/loongarch/linux.h
++++ b/gcc/config/loongarch/linux.h
+@@ -22,15 +22,7 @@ along with GCC; see the file COPYING3.  If not see
+  * can work in a multilib environment.  */
+ 
+ #if defined(LA_DISABLE_MULTILIB) && defined(LA_DISABLE_MULTIARCH)
+-
+-  #if DEFAULT_ABI_BASE == ABI_BASE_LP64D
+-    #define ABI_LIBDIR "lib64"
+-  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64F
+-    #define ABI_LIBDIR "lib64/f32"
+-  #elif DEFAULT_ABI_BASE == ABI_BASE_LP64S
+-    #define ABI_LIBDIR "lib64/sf"
+-  #endif
+-
++    #define ABI_LIBDIR "lib"
+ #endif
+ 
+ #ifndef ABI_LIBDIR
+diff --git a/gcc/config/loongarch/t-linux b/gcc/config/loongarch/t-linux
+index e40da1792..f72c6e878 100644
+--- a/gcc/config/loongarch/t-linux
++++ b/gcc/config/loongarch/t-linux
+@@ -36,18 +36,6 @@ else
+ endif
+ 
+ # Don't define MULTILIB_OSDIRNAMES if multilib is disabled.
+-ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),)
+-
+-    MULTILIB_OSDIRNAMES = \
+-      mabi.lp64d=../lib64$\
+-      $(call if_multiarch,:loongarch64-linux-gnu)
+-
+-    MULTILIB_OSDIRNAMES += \
+-      mabi.lp64f=../lib64/f32$\
+-      $(call if_multiarch,:loongarch64-linux-gnuf32)
+-
+-    MULTILIB_OSDIRNAMES += \
+-      mabi.lp64s=../lib64/sf$\
+-      $(call if_multiarch,:loongarch64-linux-gnusf)
+-
+-endif
++    MULTILIB_OSDIRNAMES =  mabi.lp64d=../lib
++    MULTILIB_OSDIRNAMES += mabi.lp64f=../lib
++    MULTILIB_OSDIRNAMES += mabi.lp64s=../lib
+-- 
+2.41.0
+
diff --git a/main/gcc/003_all_default-fortify-source.patch b/main/gcc/003_all_default-fortify-source.patch
deleted file mode 100644
index 6ca80334308..00000000000
--- a/main/gcc/003_all_default-fortify-source.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-# DP: Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC, ObjC++,
-# DP: if the optimization level is > 0
-
----
- gcc/doc/invoke.texi          |    6 ++++++
- gcc/c-family/c-cppbuiltin.c  |    3 +
- 2 files changed, 9 insertions(+), 0 deletions(-)
-
-Index: b/gcc/doc/invoke.texi
-===================================================================
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -7840,6 +7840,12 @@ also turns on the following optimization
- Please note the warning under @option{-fgcse} about
- invoking @option{-O2} on programs that use computed gotos.
- 
-+NOTE: In Alpine Linux, @option{-D_FORTIFY_SOURCE=2} is
-+set by default, and is activated when @option{-O} is set to 2 or higher.
-+This enables additional compile-time and run-time checks for several libc
-+functions.  To disable, specify either @option{-U_FORTIFY_SOURCE} or
-+@option{-D_FORTIFY_SOURCE=0}.
-+
- @item -O3
- @opindex O3
- Optimize yet more.  @option{-O3} turns on all optimizations specified
-Index: b/gcc/c-family/c-cppbuiltin.c
-===================================================================
---- a/gcc/c-family/c-cppbuiltin.c
-+++ b/gcc/c-family/c-cppbuiltin.c
-@@ -1176,6 +1176,10 @@ c_cpp_builtins (cpp_reader *pfile)
-   builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
-   builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
- 
-+  /* Fortify Source enabled by default for optimization levels > 0 */
-+  if (optimize)
-+    builtin_define_with_int_value ("_FORTIFY_SOURCE", 2);
-+
-   /* Misc.  */
-   if (flag_gnu89_inline)
-     cpp_define (pfile, "__GNUC_GNU_INLINE__");
diff --git a/main/gcc/005_all_default-as-needed.patch b/main/gcc/005_all_default-as-needed.patch
deleted file mode 100644
index 2eced0f06c1..00000000000
--- a/main/gcc/005_all_default-as-needed.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-# DP: On linux targets pass --as-needed by default to the linker, but always
-# DP: link the sanitizer libraries with --no-as-needed.
-
-Index: b/gcc/gcc.c
-===================================================================
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -692,8 +692,11 @@ proper position among the other output f
- #ifdef LIBASAN_EARLY_SPEC
- #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION \
--		     "} -lasan %{static-libasan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -lasan " \
-+		     " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBASAN_LIBS
- #else
- #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -710,8 +713,11 @@ proper position among the other output f
- #ifdef LIBTSAN_EARLY_SPEC
- #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION \
--		     "} -ltsan %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -ltsan " \
-+		     " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBTSAN_LIBS
- #else
- #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -728,8 +734,11 @@ proper position among the other output f
- #ifdef LIBLSAN_EARLY_SPEC
- #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
--#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION \
--		     "} -llsan %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -llsan " \
-+		     " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBLSAN_LIBS
- #else
- #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -744,8 +753,11 @@ proper position among the other output f
- #define STATIC_LIBUBSAN_LIBS \
-   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
- #ifdef HAVE_LD_STATIC_DYNAMIC
--#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION \
--		     "} -lubsan %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
-+#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
-+		     " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " -lubsan " \
-+		     " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
-+		     " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
- 		     STATIC_LIBUBSAN_LIBS
- #else
- #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
-Index: b/gcc/config/gnu-user.h
-===================================================================
---- a/gcc/config/gnu-user.h
-+++ b/gcc/config/gnu-user.h
-@@ -161,15 +161,15 @@ see the files COPYING3 and COPYING.RUNTI
- #define LIBASAN_EARLY_SPEC "%{!shared:libasan_preinit%O%s} " \
-   "%{static-libasan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -lasan --no-whole-archive " \
--  LD_DYNAMIC_OPTION "}}%{!static-libasan:-lasan}"
-+  LD_DYNAMIC_OPTION "}}%{!static-libasan:%{!fuse-ld=gold:--push-state} --no-as-needed -lasan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #undef LIBTSAN_EARLY_SPEC
- #define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \
-   "%{static-libtsan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -ltsan --no-whole-archive " \
--  LD_DYNAMIC_OPTION "}}%{!static-libtsan:-ltsan}"
-+  LD_DYNAMIC_OPTION "}}%{!static-libtsan:%{!fuse-ld=gold:--push-state} --no-as-needed -ltsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #undef LIBLSAN_EARLY_SPEC
- #define LIBLSAN_EARLY_SPEC "%{!shared:liblsan_preinit%O%s} " \
-   "%{static-liblsan:%{!shared:" \
-   LD_STATIC_OPTION " --whole-archive -llsan --no-whole-archive " \
--  LD_DYNAMIC_OPTION "}}%{!static-liblsan:-llsan}"
-+  LD_DYNAMIC_OPTION "}}%{!static-liblsan:%{!fuse-ld=gold:--push-state} --no-as-needed -llsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
- #endif
-Index: b/gcc/config/aarch64/aarch64-linux.h
-===================================================================
---- a/gcc/config/aarch64/aarch64-linux.h
-+++ b/gcc/config/aarch64/aarch64-linux.h
-@@ -35,6 +35,7 @@
- #define CPP_SPEC "%{pthread:-D_REENTRANT}"
- 
- #define LINUX_TARGET_LINK_SPEC  "%{h*}		\
-+   --as-needed					\
-    %{static:-Bstatic}				\
-    %{shared:-shared}				\
-    %{symbolic:-Bsymbolic}			\
-Index: b/gcc/config/ia64/linux.h
-===================================================================
---- a/gcc/config/ia64/linux.h
-+++ b/gcc/config/ia64/linux.h
-@@ -58,7 +58,7 @@ do {						\
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC " --as-needed \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-Index: b/gcc/config/sparc/linux.h
-===================================================================
---- a/gcc/config/sparc/linux.h
-+++ b/gcc/config/sparc/linux.h
-@@ -86,7 +86,7 @@ extern const char *host_detect_local_cpu
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --as-needed %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!static: \
-Index: b/gcc/config/s390/linux.h
-===================================================================
---- a/gcc/config/s390/linux.h
-+++ b/gcc/config/s390/linux.h
-@@ -78,7 +78,7 @@ along with GCC; see the file COPYING3.
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
--  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --as-needed \
-    %{shared:-shared} \
-    %{!shared: \
-       %{static:-static} \
-Index: b/gcc/config/rs6000/linux64.h
-===================================================================
---- a/gcc/config/rs6000/linux64.h
-+++ b/gcc/config/rs6000/linux64.h
-@@ -490,13 +490,13 @@ extern int dot_symbols;
- 					   " -m elf64ppc")
- #endif
- 
--#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " --as-needed %{!shared: %{!static: \
-   %{!static-pie: \
-     %{rdynamic:-export-dynamic} \
-     -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}}} \
-   %(link_os_extra_spec32)"
- 
--#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " --as-needed %{!shared: %{!static: \
-   %{!static-pie: \
-     %{rdynamic:-export-dynamic} \
-     -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
-Index: b/gcc/config/rs6000/sysv4.h
-===================================================================
---- a/gcc/config/rs6000/sysv4.h
-+++ b/gcc/config/rs6000/sysv4.h
-@@ -811,7 +811,7 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
- 			 MUSL_DYNAMIC_LINKER)
- 
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --as-needed %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-   -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
- 
-Index: b/gcc/config/i386/gnu-user64.h
-===================================================================
---- a/gcc/config/i386/gnu-user64.h
-+++ b/gcc/config/i386/gnu-user64.h
-@@ -56,6 +56,7 @@
-                   "%{" SPEC_64 ":-m " GNU_USER_LINK_EMULATION64 "} \
-                    %{" SPEC_32 ":-m " GNU_USER_LINK_EMULATION32 "} \
-                    %{" SPEC_X32 ":-m " GNU_USER_LINK_EMULATIONX32 "} \
-+  --as-needed \
-   %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-Index: b/gcc/config/i386/gnu-user.h
-===================================================================
---- a/gcc/config/i386/gnu-user.h
-+++ b/gcc/config/i386/gnu-user.h
-@@ -74,7 +74,7 @@ along with GCC; see the file COPYING3.
-   { "link_emulation", GNU_USER_LINK_EMULATION },\
-   { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
- 
--#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) --as-needed %{shared:-shared} \
-   %{!shared: \
-     %{!static: \
-       %{!static-pie: \
-Index: b/gcc/config/alpha/linux-elf.h
-===================================================================
---- a/gcc/config/alpha/linux-elf.h
-+++ b/gcc/config/alpha/linux-elf.h
-@@ -37,7 +37,7 @@ along with GCC; see the file COPYING3.
- 
- #define ELF_DYNAMIC_LINKER	GNU_USER_DYNAMIC_LINKER
- 
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
-+#define LINK_SPEC "-m elf64alpha --as-needed %{G*} %{relax:-relax}		\
-   %{O*:-O3} %{!O*:-O1}						\
-   %{shared:-shared}						\
-   %{!shared:							\
-Index: b/gcc/config/arm/linux-elf.h
-===================================================================
---- a/gcc/config/arm/linux-elf.h
-+++ b/gcc/config/arm/linux-elf.h
-@@ -70,6 +70,7 @@
-      %{rdynamic:-export-dynamic} \
-      %{!shared:-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \
-    -X \
-+   --as-needed \
-    %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
-    SUBTARGET_EXTRA_LINK_SPEC
- 
-Index: b/gcc/config/mips/gnu-user.h
-===================================================================
---- a/gcc/config/mips/gnu-user.h
-+++ b/gcc/config/mips/gnu-user.h
-@@ -55,6 +55,7 @@ along with GCC; see the file COPYING3.
- #undef GNU_USER_TARGET_LINK_SPEC
- #define GNU_USER_TARGET_LINK_SPEC "\
-   %{G*} %{EB} %{EL} %{mips*} %{shared} \
-+ -as-needed \
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
-Index: b/gcc/config/riscv/linux.h
-===================================================================
---- a/gcc/config/riscv/linux.h
-+++ b/gcc/config/riscv/linux.h
-@@ -58,6 +58,7 @@
-   "%{mabi=ilp32:_ilp32}"
- 
- #define LINK_SPEC "\
-+-as-needed \
- -melf" XLEN_SPEC "lriscv" LD_EMUL_SUFFIX " \
- %{mno-relax:--no-relax} \
- %{shared} \
diff --git a/main/gcc/011_all_default-warn-format-security.patch b/main/gcc/011_all_default-warn-format-security.patch
deleted file mode 100644
index f809abd9e7a..00000000000
--- a/main/gcc/011_all_default-warn-format-security.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Enable -Wformat and -Wformat-security by default.
-
---- a/gcc/c-family/c.opt	2016-03-23 18:51:56.000000000 +0100
-+++ b/gcc/c-family/c.opt	2016-04-28 23:45:54.063351272 +0200
-@@ -459,7 +459,7 @@ C ObjC C++ ObjC++ Var(warn_format_nonlit
- Warn about format strings that are not literals.
- 
- Wformat-security
--C ObjC C++ ObjC++ Var(warn_format_security) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
-+C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0)
- Warn about possible security problems with format functions.
- 
- Wformat-signedness
-@@ -475,7 +475,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_l
- Warn about zero-length formats.
- 
- Wformat=
--C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
-+C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2)
- Warn about printf/scanf/strftime/strfmon format string anomalies.
- 
- Wignored-qualifiers
diff --git a/main/gcc/012_all_default-warn-trampolines.patch b/main/gcc/012_all_default-warn-trampolines.patch
deleted file mode 100644
index 7a644cb1e1b..00000000000
--- a/main/gcc/012_all_default-warn-trampolines.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Enable -Wtrampolines by default.
-
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -712,7 +712,7 @@ Common Var(warn_system_headers) Warning
- Do not suppress warnings from system headers.
- 
- Wtrampolines
--Common Var(warn_trampolines) Warning
-+Common Var(warn_trampolines) Init(1) Warning
- Warn whenever a trampoline is generated.
- 
- Wtype-limits
diff --git a/main/gcc/013_all_default-ssp-fix.patch b/main/gcc/013_all_default-ssp-fix.patch
deleted file mode 100644
index d2deac760b7..00000000000
--- a/main/gcc/013_all_default-ssp-fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding 
-Change the buffer size.
-
---- a/gcc/gcc.c	2017-07-04 09:15:57.740793000 +0200
-+++ b/gcc/gcc.c	2018-03-02 13:58:44.387741114 +0100
-@@ -857,6 +857,12 @@ proper position among the other output f
- #define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G"
- #endif
- 
-+#ifdef ENABLE_DEFAULT_SSP
-+#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} "
-+#else
-+#define NO_SSP_SPEC ""
-+#endif
-+
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1131,7 +1148,7 @@ static const char *cc1_options =
-  %{-version:--version}\
-  %{-help=*:--help=%*}\
-  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
-- %{fsyntax-only:-o %j} %{-param*}\
-+ %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
-  %{coverage:-fprofile-arcs -ftest-coverage}\
-  %{fprofile-arcs|fprofile-generate*|coverage:\
-    %{!fprofile-update=singel:\
---- a/gcc/params.def	2016-03-30 09:47:40.000000000 +0200
-+++ b/gcc/params.def	2016-09-19 12:56:58.443179039 +0200
-@@ -673,7 +673,7 @@ DEFPARAM (PARAM_INTEGER_SHARE_LIMIT,
- DEFPARAM (PARAM_SSP_BUFFER_SIZE,
- 	  "ssp-buffer-size",
- 	  "The lower bound for a buffer to be considered for stack smashing protection.",
--	  8, 1, 0)
-+	  4, 1, 0)
- 
- DEFPARAM (PARAM_MIN_SIZE_FOR_STACK_SHARING,
- 	  "min-size-for-stack-sharing",
diff --git a/main/gcc/020_all_msgfmt-libstdc++-link.patch b/main/gcc/020_all_msgfmt-libstdc++-link.patch
deleted file mode 100644
index a70ea50a07f..00000000000
--- a/main/gcc/020_all_msgfmt-libstdc++-link.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Ensure that msgfmt doesn't encounter problems during gcc bootstrapping.
-
-Solves error messages like the following:
-
-msgfmt: /var/tmp/portage/sys-devel/gcc-4.1.2/work/build/./gcc/libgcc_s.so.1: version `GCC_4.2.0' not found (required by /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/libstdc++.so.6)
-
-The libgcc_s.so used during build doesn't satisfy the needs of the
-libstdc++.so that msgfmt is linked against. On the other hand, msgfmt
-is used as a stand-alone application here, and what library it uses
-behind the scenes is of no concern to the gcc build process.
-Therefore, simply invoking it "as usual", i.e. without any special
-library path, will make it work as expected here.
-
-2011-09-19 Martin von Gagern
-
-References:
-https://bugs.gentoo.org/372377
-https://bugs.gentoo.org/295480
-
---- gcc-4.1.2.orig/libstdc++-v3/po/Makefile.am
-+++ gcc-4.1.2/libstdc++-v3/po/Makefile.am
-@@ -39,6 +39,7 @@ MSGFMT = msgfmt
- EXTRA_DIST = string_literals.cc POTFILES.in $(PACKAGE).pot $(LOCALE_IN)
- 
- .po.mo:
-+	env --unset=LD_LIBRARY_PATH \
- 	$(MSGFMT) -o $@ $<
- 
- all-local: all-local-$(USE_NLS)
---- gcc-4.1.2.orig/libstdc++-v3/po/Makefile.in
-+++ gcc-4.1.2/libstdc++-v3/po/Makefile.in
-@@ -419,6 +419,7 @@ uninstall-am: uninstall-info-am
- 
- 
- .po.mo:
-+	env --unset=LD_LIBRARY_PATH \
- 	$(MSGFMT) -o $@ $<
- 
- all-local: all-local-$(USE_NLS)
diff --git a/main/gcc/050_all_libiberty-asprintf.patch b/main/gcc/050_all_libiberty-asprintf.patch
deleted file mode 100644
index bee0c4c2377..00000000000
--- a/main/gcc/050_all_libiberty-asprintf.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-2008-07-25  Magnus Granberg  <zorry@ume.nu>
-
-	* include/libiberty.h (asprintf): Don't declare if defined as a macro
-
---- a/include/libiberty.h
-+++ b/include/libiberty.h
-@@ -609,8 +609,11 @@ extern int pwait (int, int *, int);
- /* Like sprintf but provides a pointer to malloc'd storage, which must
-    be freed by the caller.  */
- 
-+/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL.  */
-+#ifndef asprintf
- extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
- #endif
-+#endif
- 
- #if !HAVE_DECL_VASPRINTF
- /* Like vsprintf but provides a pointer to malloc'd storage, which
diff --git a/main/gcc/051_all_libiberty-pic.patch b/main/gcc/051_all_libiberty-pic.patch
deleted file mode 100644
index b6160a73073..00000000000
--- a/main/gcc/051_all_libiberty-pic.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libiberty/Makefile.in
-+++ b/libiberty/Makefile.in
-@@ -246,6 +246,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS)
- 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
- 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- 	  $(RANLIB) $(TARGETLIB); \
-+	  cp $(TARGETLIB) ../ ; \
- 	  cd ..; \
- 	else true; fi
- 
diff --git a/main/gcc/053_all_libitm-no-fortify-source.patch b/main/gcc/053_all_libitm-no-fortify-source.patch
deleted file mode 100644
index 5ab15afc370..00000000000
--- a/main/gcc/053_all_libitm-no-fortify-source.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/508852
-https://gcc.gnu.org/PR61164
-
-2014-04-27  Magnus Granberg  <zorry@gentoo.org>
-
-	#508852
-	* libitm/configure.tgt: Disable FORTIFY
-
---- a/libitm/configure.tgt
-+++ b/libitm/configure.tgt
-@@ -43,6 +43,16 @@ if test "$gcc_cv_have_tls" = yes ; then
-   esac
- fi
- 
-+# FIXME: error: inlining failed in call to always_inline 
-+# ‘int vfprintf(FILE*, const char*, __va_list_tag*)’
-+# : function body can be overwritten at link time
-+# Disable Fortify in libitm for now. #508852
-+case "${target}" in
-+    *-*-linux*)
-+	XCFLAGS="${XCFLAGS} -U_FORTIFY_SOURCE"
-+	;;
-+esac
-+
- # Map the target cpu to an ARCH sub-directory.  At the same time,
- # work out any special compilation flags as necessary.
- case "${target_cpu}" in
diff --git a/main/gcc/090_all_pr55930-dependency-tracking.patch b/main/gcc/090_all_pr55930-dependency-tracking.patch
deleted file mode 100644
index a8743e08c47..00000000000
--- a/main/gcc/090_all_pr55930-dependency-tracking.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-libatomic build failure if configured with --disable-dependency-tracking
-load_n.c:115:1: fatal error: opening dependency file .deps/load_1_.lo.Ppo: No such file or directory
-
-https://bugs.gentoo.org/463463
-http://gcc.gnu.org/PR55930
-
---- a/libatomic/Makefile.in
-+++ b/libatomic/Makefile.in
-@@ -298,7 +298,8 @@ PAT_N = $(word 2,$(PAT_SPLIT))
- PAT_S = $(word 3,$(PAT_SPLIT))
- IFUNC_DEF = -DIFUNC_ALT=$(PAT_S)
- IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS))
--M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
-+@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
-+@AMDEP_FALSE@M_DEPS =
- M_SIZE = -DN=$(PAT_N)
- M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
- M_FILE = $(PAT_BASE)_n.c
diff --git a/main/gcc/203-libgcc_s.patch b/main/gcc/203-libgcc_s.patch
deleted file mode 100644
index f8cab7d1942..00000000000
--- a/main/gcc/203-libgcc_s.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9e3eab51e518018d9d99b3123598b1e2322a6af3 Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Sat, 24 Oct 2015 20:09:53 +0000
-Subject: [PATCH 3/6] libgcc_s
-
----
- gcc/config/i386/i386.c       | 4 ++--
- libgcc/config/i386/cpuinfo.c | 6 +++---
- libgcc/config/i386/t-linux   | 2 +-
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
-index 3d044e8..82523e1 100644
---- a/gcc/config/i386/i386.c
-+++ b/gcc/config/i386/i386.c
-@@ -40269,10 +40269,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
-     {
-     case IX86_BUILTIN_CPU_INIT:
-       {
--	/* Make it call __cpu_indicator_init in libgcc. */
-+	/* Make it call __cpu_indicator_init_local in libgcc.a. */
- 	tree call_expr, fndecl, type;
-         type = build_function_type_list (integer_type_node, NULL_TREE); 
--	fndecl = build_fn_decl ("__cpu_indicator_init", type);
-+	fndecl = build_fn_decl ("__cpu_indicator_init_local", type);
- 	call_expr = build_call_expr (fndecl, 0); 
- 	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
-       }
-diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
-index 8c2248d..6c82f15 100644
---- a/libgcc/config/i386/cpuinfo.c
-+++ b/libgcc/config/i386/cpuinfo.c
-@@ -485,7 +485,7 @@ __cpu_indicator_init (void)
-   return 0;
- }
- 
--#if defined SHARED && defined USE_ELF_SYMVER
--__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0");
--__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0");
-+#ifndef SHARED
-+int __cpu_indicator_init_local (void)
-+  __attribute__ ((weak, alias ("__cpu_indicator_init")));
- #endif
-diff --git a/libgcc/config/i386/t-linux b/libgcc/config/i386/t-linux
-index 11bb46e..4f47f7b 100644
---- a/libgcc/config/i386/t-linux
-+++ b/libgcc/config/i386/t-linux
-@@ -3,5 +3,5 @@
- # t-slibgcc-elf-ver and t-linux
- SHLIB_MAPFILES = libgcc-std.ver $(srcdir)/config/i386/libgcc-glibc.ver
- 
--HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER $(CET_FLAGS)
-+HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
- CRTSTUFF_T_CFLAGS += $(CET_FLAGS)
--- 
-2.8.1
-
diff --git a/main/gcc/205-nopie.patch b/main/gcc/205-nopie.patch
deleted file mode 100644
index e3da94d105c..00000000000
--- a/main/gcc/205-nopie.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From b6015aca9c9cc83739fd0ed637a835119b2c4e34 Mon Sep 17 00:00:00 2001
-From: Szabolcs Nagy <nsz@port70.net>
-Date: Sat, 7 Nov 2015 02:08:05 +0000
-Subject: [PATCH 5/6] nopie
-
----
- gcc/configure    | 27 +++++++++++++++++++++++++++
- gcc/configure.ac | 13 +++++++++++++
- 2 files changed, 40 insertions(+)
-
-diff --git a/gcc/configure b/gcc/configure
-index 1c6e340..7e8b5d6 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -29390,6 +29390,33 @@ fi
- $as_echo "$gcc_cv_no_pie" >&6; }
- if test "$gcc_cv_no_pie" = "yes"; then
-   NO_PIE_FLAG="-no-pie"
-+else
-+  # Check if -nopie works.
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -nopie option" >&5
-+$as_echo_n "checking for -nopie option... " >&6; }
-+if test "${gcc_cv_nopie+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  saved_LDFLAGS="$LDFLAGS"
-+     LDFLAGS="$LDFLAGS -nopie"
-+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+int main(void) {return 0;}
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+  gcc_cv_nopie=yes
-+else
-+  gcc_cv_nopie=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+     LDFLAGS="$saved_LDFLAGS"
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_nopie" >&5
-+$as_echo "$gcc_cv_nopie" >&6; }
-+  if test "$gcc_cv_nopie" = "yes"; then
-+    NO_PIE_FLAG="-nopie"
-+  fi
- fi
- 
- 
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 6c1dcd9..0ca7647 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -6098,6 +6098,19 @@ AC_CACHE_CHECK([for -no-pie option],
-    LDFLAGS="$saved_LDFLAGS"])
- if test "$gcc_cv_no_pie" = "yes"; then
-   NO_PIE_FLAG="-no-pie"
-+else
-+  # Check if -nopie works.
-+  AC_CACHE_CHECK([for -nopie option],
-+    [gcc_cv_nopie],
-+    [saved_LDFLAGS="$LDFLAGS"
-+     LDFLAGS="$LDFLAGS -nopie"
-+     AC_LINK_IFELSE([int main(void) {return 0;}],
-+       [gcc_cv_nopie=yes],
-+       [gcc_cv_nopie=no])
-+     LDFLAGS="$saved_LDFLAGS"])
-+  if test "$gcc_cv_nopie" = "yes"; then
-+    NO_PIE_FLAG="-nopie"
-+  fi
- fi
- AC_SUBST([NO_PIE_FLAG])
- 
--- 
-2.8.1
-
diff --git a/main/gcc/320-libffi-gnulinux.patch b/main/gcc/320-libffi-gnulinux.patch
deleted file mode 100644
index b3b4fc93178..00000000000
--- a/main/gcc/320-libffi-gnulinux.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libffi/closures.c.orig b/libffi/closures.c
-index 721ff00..22a699c 100644
---- a/libffi/src/closures.c.orig
-+++ b/libffi/src/closures.c
-@@ -34,7 +34,7 @@
- #include <ffi_common.h>
-
- #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE
--# if __gnu_linux__ && !defined(__ANDROID__)
-+# if __linux__ && !defined(__ANDROID__)
- /* This macro indicates it may be forbidden to map anonymous memory
-    with both write and execute permission.  Code compiled when this
-    option is defined will attempt to map such pages once, but if it
diff --git a/main/gcc/400-dlang-phobos.patch b/main/gcc/400-dlang-phobos.patch
deleted file mode 100644
index 7e434e78584..00000000000
--- a/main/gcc/400-dlang-phobos.patch
+++ /dev/null
@@ -1,1216 +0,0 @@
-diff -Nurp a/libphobos/libdruntime/core/stdc/fenv.d b/libphobos/libdruntime/core/stdc/fenv.d
---- a/libphobos/libdruntime/core/stdc/fenv.d	2019-10-28 06:37:30.000000000 +0900
-+++ b/libphobos/libdruntime/core/stdc/fenv.d	2019-10-28 08:08:09.000000000 +0900
-@@ -375,7 +375,44 @@ else version (Solaris)
- }
- else version (CRuntime_Musl)
- {
--    version (X86_64)
-+    version (AArch64)
-+    {
-+        struct fenv_t
-+        {
-+            uint __fpcr;
-+            uint __fpsr;
-+        }
-+        alias uint fexcept_t;
-+    }
-+    else version (ARM)
-+    {
-+        import core.stdc.config : c_ulong;
-+
-+        struct fenv_t
-+        {
-+            c_ulong __cw;
-+        }
-+        alias c_ulong fexcept_t;
-+    }
-+    else version (IBMZ_Any)
-+    {
-+        alias uint fenv_t;
-+        alias uint fexcept_t;
-+    }
-+    else version (MIPS_Any)
-+    {
-+        struct fenv_t
-+        {
-+            uint __cw;
-+        }
-+        alias ushort fexcept_t;
-+    }
-+    else version (PPC_Any)
-+    {
-+        alias double fenv_t;
-+        alias uint fexcept_t;
-+    }
-+    else version (X86_Any)
-     {
-         struct fenv_t
-         {
-@@ -391,7 +428,8 @@ else version (CRuntime_Musl)
-             uint   __data_offset;
-             ushort __data_selector;
-             ushort __unused5;
--            uint   __mxcsr;
-+            version (X86_64)
-+                uint __mxcsr;
-         }
-         alias ushort fexcept_t;
-     }
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/dirent.d b/libphobos/libdruntime/core/sys/posix/dirent.d
---- a/libphobos/libdruntime/core/sys/posix/dirent.d	2019-10-28 06:37:30.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/dirent.d	2019-10-28 08:08:09.000000000 +0900
-@@ -506,7 +506,7 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--
-+    int readdir_r(DIR*, dirent*, dirent**);
- }
- else version (CRuntime_UClibc)
- {
-@@ -591,6 +591,8 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+    void   seekdir(DIR*, c_long);
-+    c_long telldir(DIR*);
- }
- else version (CRuntime_UClibc)
- {
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/pthread.d b/libphobos/libdruntime/core/sys/posix/pthread.d
---- a/libphobos/libdruntime/core/sys/posix/pthread.d	2019-10-28 06:37:30.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/pthread.d	2019-10-28 08:08:09.000000000 +0900
-@@ -854,7 +854,15 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+    enum PTHREAD_BARRIER_SERIAL_THREAD = -1;
-
-+    int pthread_barrier_destroy(pthread_barrier_t*);
-+    int pthread_barrier_init(pthread_barrier_t*, in pthread_barrierattr_t*, uint);
-+    int pthread_barrier_wait(pthread_barrier_t*);
-+    int pthread_barrierattr_destroy(pthread_barrierattr_t*);
-+    int pthread_barrierattr_getpshared(in pthread_barrierattr_t*, int*);
-+    int pthread_barrierattr_init(pthread_barrierattr_t*);
-+    int pthread_barrierattr_setpshared(pthread_barrierattr_t*, int);
- }
- else version (CRuntime_UClibc)
- {
-@@ -880,6 +888,55 @@ else
- int pthread_condattr_getclock(in pthread_condattr_t*, clockid_t*);
- int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
- */
-+version (CRuntime_Glibc)
-+{
-+    int pthread_condattr_getclock(in pthread_condattr_t*, clockid_t*);
-+    int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
-+}
-+else version (FreeBSD)
-+{
-+    int pthread_condattr_getclock(in pthread_condattr_t*, clockid_t*);
-+    int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
-+}
-+else version (DragonFlyBSD)
-+{
-+    int pthread_condattr_getclock(in pthread_condattr_t*, clockid_t*);
-+    int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
-+}
-+else version (NetBSD)
-+{
-+    int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
-+}
-+else version (OpenBSD)
-+{
-+    int pthread_condattr_getclock(in pthread_condattr_t*, clockid_t*);
-+    int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
-+}
-+else version (Darwin)
-+{
-+}
-+else version (Solaris)
-+{
-+    int pthread_condattr_getclock(in pthread_condattr_t*, clockid_t*);
-+    int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
-+}
-+else version (CRuntime_Bionic)
-+{
-+}
-+else version (CRuntime_Musl)
-+{
-+    int pthread_condattr_getclock(in pthread_condattr_t*, clockid_t*);
-+    int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
-+}
-+else version (CRuntime_UClibc)
-+{
-+    int pthread_condattr_getclock(in pthread_condattr_t*, clockid_t*);
-+    int pthread_condattr_setclock(pthread_condattr_t*, clockid_t);
-+}
-+else
-+{
-+    static assert(false, "Unsupported platform");
-+}
-
- //
- // Spinlock (SPI)
-@@ -948,7 +1005,11 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--
-+    int pthread_spin_destroy(pthread_spinlock_t*);
-+    int pthread_spin_init(pthread_spinlock_t*, int);
-+    int pthread_spin_lock(pthread_spinlock_t*);
-+    int pthread_spin_trylock(pthread_spinlock_t*);
-+    int pthread_spin_unlock(pthread_spinlock_t*);
- }
- else version (CRuntime_UClibc)
- {
-@@ -1187,7 +1248,7 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--
-+    int pthread_getcpuclockid(pthread_t, clockid_t*);
- }
- else version (CRuntime_UClibc)
- {
-@@ -1256,7 +1317,9 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--
-+    int pthread_mutex_timedlock(pthread_mutex_t*, in timespec*);
-+    int pthread_rwlock_timedrdlock(pthread_rwlock_t*, in timespec*);
-+    int pthread_rwlock_timedwrlock(pthread_rwlock_t*, in timespec*);
- }
- else version (CRuntime_UClibc)
- {
-@@ -1693,7 +1756,12 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--
-+    int pthread_condattr_getpshared(pthread_condattr_t*, int*);
-+    int pthread_condattr_setpshared(pthread_condattr_t*, int);
-+    int pthread_mutexattr_getpshared(pthread_mutexattr_t*, int*);
-+    int pthread_mutexattr_setpshared(pthread_mutexattr_t*, int);
-+    int pthread_rwlockattr_getpshared(pthread_rwlockattr_t*, int*);
-+    int pthread_rwlockattr_setpshared(pthread_rwlockattr_t*, int);
- }
- else version (CRuntime_UClibc)
- {
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/pwd.d b/libphobos/libdruntime/core/sys/posix/pwd.d
---- a/libphobos/libdruntime/core/sys/posix/pwd.d	2019-10-28 06:37:30.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/pwd.d	2019-10-28 08:08:09.000000000 +0900
-@@ -172,7 +172,8 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--    struct passwd {
-+    struct passwd
-+    {
-         char *pw_name;
-         char *pw_passwd;
-         uid_t pw_uid;
-@@ -257,6 +258,8 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+    int getpwnam_r(in char*, passwd*, char*, size_t, passwd**);
-+    int getpwuid_r(uid_t, passwd*, char*, size_t, passwd**);
- }
- else version (CRuntime_UClibc)
- {
-@@ -325,8 +328,9 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--    int getpwnam_r(in char*, passwd*, char*, size_t, passwd**);
--    int getpwuid_r(uid_t, passwd*, char*, size_t, passwd**);
-+    void    endpwent();
-+    passwd* getpwent();
-+    void    setpwent();
- }
- else version (CRuntime_UClibc)
- {
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/signal.d b/libphobos/libdruntime/core/sys/posix/signal.d
---- a/libphobos/libdruntime/core/sys/posix/signal.d	2019-10-28 07:12:22.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/signal.d	2019-10-28 08:08:09.000000000 +0900
-@@ -1136,55 +1136,57 @@ else version (NetBSD)
-     enum SIG_UNBLOCK = 2;
-     enum SIG_SETMASK = 3;
-
--    union sigval_t {
--        int     sival_int;
--        void    *sival_ptr;
--    };
--    struct _rt{
--        pid_t   _pid;
--        uid_t   _uid;
--        sigval_t        _value;
--    };
--    struct _child{
--        pid_t   _pid;
--        uid_t   _uid;
--        int     _status;
--        clock_t _utime;
--        clock_t _stime;
--    };
--   struct _fault{
--        void   *_addr;
--        int     _trap;
--        int     _trap2;
--        int     _trap3;
--    };
--    struct _poll{
--        long    _band;
--        int     _fd;
--    };
--    union _reason{
--        _rt rt;
--        _child child;
--        _fault fault;
--        _poll poll;
--    };
--    struct _ksiginfo {
-+    union sigval_t
-+    {
-+        int   sival_int;
-+        void* sival_ptr;
-+    }
-+
-+    struct _ksiginfo
-+    {
-         int     _signo;
-         int     _code;
-         int     _errno;
--/+#ifdef _LP64
--        /* In _LP64 the union starts on an 8-byte boundary. */
--        int     _pad;
--#endif+/
--        _reason reason;
--    };
-+        version (D_LP64)
-+            int _pad;
-
-+        union reason_t
-+        {
-+            struct rt_t
-+            {
-+                pid_t    _pid;
-+                uid_t    _uid;
-+                sigval_t _value;
-+            } rt_t _rt;
-+            struct child_t
-+            {
-+                pid_t   _pid;
-+                uid_t   _uid;
-+                int     _status;
-+                clock_t _utime;
-+                clock_t _stime;
-+            } child_t _child;
-+            struct fault_t
-+            {
-+                void* _addr;
-+                int   _trap;
-+                int   _trap2;
-+                int   _trap3;
-+            } fault_t fault;
-+            struct poll_t
-+            {
-+                c_long _band;
-+                int  _fd;
-+            } poll_t _poll;
-+        }
-+        reason_t _reason;
-+    }
-
-     union siginfo_t
-     {
--        ubyte[128] si_pad;/* Total size; for future expansion */
-+        ubyte[128] si_pad;
-         _ksiginfo _info;
--        @property ref c_long si_band() return { return _info.reason.poll._band; }
-+        @property ref c_long si_band() return { return _info._reason._poll._band; }
-     }
-
-     enum SI_USER    = 0;
-@@ -1589,27 +1591,53 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--    struct sigset_t {
--        ulong[128/long.sizeof] __bits;
-+    struct sigset_t
-+    {
-+        c_ulong[128/c_long.sizeof] __bits;
-     }
-
--    enum SIG_BLOCK      = 0;
--    enum SIG_UNBLOCK    = 1;
--    enum SIG_SETMASK    = 2;
-+    version (MIPS_Any)
-+    {
-+        enum SIG_BLOCK      = 1;
-+        enum SIG_UNBLOCK    = 2;
-+        enum SIG_SETMASK    = 3;
-+    }
-+    else
-+    {
-+        enum SIG_BLOCK      = 0;
-+        enum SIG_UNBLOCK    = 1;
-+        enum SIG_SETMASK    = 2;
-+    }
-
--    struct siginfo_t {
--        int si_signo, si_errno, si_code;
--        union __si_fields_t {
--            char[128 - 2*int.sizeof - long.sizeof] __pad = 0;
--            struct __si_common_t {
--                union __first_t {
--                    struct __piduid_t {
-+    struct siginfo_t
-+    {
-+        int si_signo;
-+        version (MIPS_Any)  // __SI_SWAP_ERRNO_CODE
-+        {
-+            int si_code;
-+            int si_errno;
-+        }
-+        else
-+        {
-+            int si_errno;
-+            int si_code;
-+        }
-+        union __si_fields_t
-+        {
-+            char[128 - 2*int.sizeof - c_long.sizeof] __pad = 0;
-+            struct __si_common_t
-+            {
-+                union __first_t
-+                {
-+                    struct __piduid_t
-+                    {
-                         pid_t si_pid;
-                         uid_t si_uid;
-                     }
-                     __piduid_t __piduid;
-
--                    struct __timer_t {
-+                    struct __timer_t
-+                    {
-                         int si_timerid;
-                         int si_overrun;
-                     }
-@@ -1617,11 +1645,14 @@ else version (CRuntime_Musl)
-                 }
-                 __first_t __first;
-
--                union __second_t {
-+                union __second_t
-+                {
-                     sigval si_value;
--                    struct __sigchld_t {
-+                    struct __sigchld_t
-+                    {
-                         int si_status;
--                        clock_t si_utime, si_stime;
-+                        clock_t si_utime;
-+                        clock_t si_stime;
-                     }
-                     __sigchld_t __sigchld;
-                 }
-@@ -1629,11 +1660,14 @@ else version (CRuntime_Musl)
-             }
-             __si_common_t __si_common;
-
--            struct __sigfault_t {
-+            struct __sigfault_t
-+            {
-                 void *si_addr;
-                 short si_addr_lsb;
--                union __first_t {
--                    struct __addr_bnd_t {
-+                union __first_t
-+                {
-+                    struct __addr_bnd_t
-+                    {
-                         void *si_lower;
-                         void *si_upper;
-                     }
-@@ -1644,13 +1678,15 @@ else version (CRuntime_Musl)
-             }
-             __sigfault_t __sigfault;
-
--            struct __sigpoll_t {
--                long si_band;
-+            struct __sigpoll_t
-+            {
-+                c_long si_band;
-                 int si_fd;
-             }
-             __sigpoll_t __sigpoll;
-
--            struct __sigsys_t {
-+            struct __sigsys_t
-+            {
-                 void *si_call_addr;
-                 int si_syscall;
-                 uint si_arch;
-@@ -3030,7 +3066,177 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--    enum SA_RESTART     = 0x10000000;
-+    version (MIPS_Any)
-+    {
-+        enum SIGPOLL   = 22;
-+        enum SIGPROF   = 29;
-+        enum SIGSYS    = 12;
-+        enum SIGTRAP   = 5;
-+        enum SIGVTALRM = 28;
-+        enum SIGXCPU   = 30;
-+        enum SIGXFSZ   = 31;
-+
-+        enum SA_ONSTACK   = 0x08000000;
-+        enum SA_RESETHAND = 0x80000000;
-+        enum SA_RESTART   = 0x10000000;
-+        enum SA_SIGINFO   = 8;
-+        enum SA_NOCLDWAIT = 0x10000;
-+        enum SA_NODEFER   = 0x40000000;
-+    }
-+    else
-+    {
-+        enum SIGPOLL   = 29;
-+        enum SIGPROF   = 27;
-+        enum SIGSYS    = 31;
-+        enum SIGTRAP   = 5;
-+        enum SIGVTALRM = 26;
-+        enum SIGXCPU   = 24;
-+        enum SIGXFSZ   = 25;
-+
-+        enum SA_ONSTACK   = 0x08000000;
-+        enum SA_RESETHAND = 0x80000000;
-+        enum SA_RESTART   = 0x10000000;
-+        enum SA_SIGINFO   = 4;
-+        enum SA_NOCLDWAIT = 2;
-+        enum SA_NODEFER   = 0x40000000;
-+    }
-+
-+    enum SS_ONSTACK = 1;
-+    enum SS_DISABLE = 2;
-+
-+    version (ARM)
-+    {
-+        enum MINSIGSTKSZ = 2048;
-+        enum SIGSTKSZ    = 8192;
-+    }
-+    else version (AArch64)
-+    {
-+        enum MINSIGSTKSZ = 6144;
-+        enum SIGSTKSZ    = 12288;
-+    }
-+    else version (IBMZ_Any)
-+    {
-+        enum MINSIGSTKSZ = 4096;
-+        enum SIGSTKSZ    = 10240;
-+    }
-+    else version (MIPS_Any)
-+    {
-+        enum MINSIGSTKSZ = 2048;
-+        enum SIGSTKSZ    = 8192;
-+    }
-+    else version (PPC_Any)
-+    {
-+        enum MINSIGSTKSZ = 4096;
-+        enum SIGSTKSZ    = 10240;
-+    }
-+    else version (X86_Any)
-+    {
-+        enum MINSIGSTKSZ = 2048;
-+        enum SIGSTKSZ    = 8192;
-+    }
-+    else
-+        static assert(0, "unimplemented");
-+
-+    //ucontext_t (defined in core.sys.posix.ucontext)
-+    //mcontext_t (defined in core.sys.posix.ucontext)
-+
-+    version (MIPS_Any)
-+    {
-+        struct stack_t
-+        {
-+            void*  ss_sp;
-+            size_t ss_size;
-+            int    ss_flags;
-+        }
-+    }
-+    else
-+    {
-+        struct stack_t
-+        {
-+            void*  ss_sp;
-+            int    ss_flags;
-+            size_t ss_size;
-+        }
-+    }
-+
-+    enum
-+    {
-+        ILL_ILLOPC = 1,
-+        ILL_ILLOPN,
-+        ILL_ILLADR,
-+        ILL_ILLTRP,
-+        ILL_PRVOPC,
-+        ILL_PRVREG,
-+        ILL_COPROC,
-+        ILL_BADSTK
-+    }
-+
-+    enum
-+    {
-+        FPE_INTDIV = 1,
-+        FPE_INTOVF,
-+        FPE_FLTDIV,
-+        FPE_FLTOVF,
-+        FPE_FLTUND,
-+        FPE_FLTRES,
-+        FPE_FLTINV,
-+        FPE_FLTSUB
-+    }
-+
-+    enum
-+    {
-+        SEGV_MAPERR = 1,
-+        SEGV_ACCERR
-+    }
-+
-+    enum
-+    {
-+        BUS_ADRALN = 1,
-+        BUS_ADRERR,
-+        BUS_OBJERR
-+    }
-+
-+    enum
-+    {
-+        TRAP_BRKPT = 1,
-+        TRAP_TRACE
-+    }
-+
-+    enum
-+    {
-+        CLD_EXITED = 1,
-+        CLD_KILLED,
-+        CLD_DUMPED,
-+        CLD_TRAPPED,
-+        CLD_STOPPED,
-+        CLD_CONTINUED
-+    }
-+
-+    enum
-+    {
-+        POLL_IN = 1,
-+        POLL_OUT,
-+        POLL_MSG,
-+        POLL_ERR,
-+        POLL_PRI,
-+        POLL_HUP
-+    }
-+
-+    sigfn_t bsd_signal(int sig, sigfn_t func);
-+    sigfn_t sigset(int sig, sigfn_t func);
-+
-+  nothrow:
-+  @nogc:
-+    sigfn_t2 bsd_signal(int sig, sigfn_t2 func);
-+    sigfn_t2 sigset(int sig, sigfn_t2 func);
-+
-+    int killpg(pid_t, int);
-+    int sigaltstack(const scope stack_t*, stack_t*);
-+    int sighold(int);
-+    int sigignore(int);
-+    int siginterrupt(int, int);
-+    int sigpause(int);
-+    int sigrelse(int);
- }
- else version (CRuntime_UClibc)
- {
-@@ -3483,7 +3689,7 @@ else version (CRuntime_Musl)
-         int sigev_notify;
-         void function(sigval) sigev_notify_function;
-         pthread_attr_t *sigev_notify_attributes;
--        char[56 - 3 * long.sizeof] __pad = void;
-+        char[56 - 3 * c_long.sizeof] __pad = void;
-     }
- }
- else version (CRuntime_UClibc)
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/sys/mman.d b/libphobos/libdruntime/core/sys/posix/sys/mman.d
---- a/libphobos/libdruntime/core/sys/posix/sys/mman.d	2019-10-28 07:12:22.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/sys/mman.d	2019-10-28 08:08:09.000000000 +0900
-@@ -128,6 +128,15 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+    enum
-+    {
-+        POSIX_MADV_NORMAL = 0,
-+        POSIX_MADV_RANDOM = 1,
-+        POSIX_MADV_SEQUENTIAL = 2,
-+        POSIX_MADV_WILLNEED = 3,
-+        POSIX_MADV_DONTNEED = 4,
-+    }
-+    int posix_madvise(void *, size_t, int);
- }
- else version (CRuntime_UClibc)
- {
-@@ -611,6 +620,14 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+    enum
-+    {
-+        MCL_CURRENT = 1,
-+        MCL_FUTURE = 2,
-+    }
-+
-+    int mlockall(int);
-+    int munlockall();
- }
- else version (CRuntime_UClibc)
- {
-@@ -674,6 +691,8 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+    int mlock(in void*, size_t);
-+    int munlock(in void*, size_t);
- }
- else version (CRuntime_UClibc)
- {
-@@ -776,6 +795,8 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+    int shm_open(in char*, int, mode_t);
-+    int shm_unlink(in char*);
- }
- else version (CRuntime_UClibc)
- {
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/sys/socket.d b/libphobos/libdruntime/core/sys/posix/sys/socket.d
---- a/libphobos/libdruntime/core/sys/posix/sys/socket.d	2019-10-28 07:12:22.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/sys/socket.d	2019-10-28 08:08:09.000000000 +0900
-@@ -1755,10 +1755,10 @@ else version (CRuntime_Musl)
-         c_ulong     __ss_align;
-     }
-
--    enum {
-+    enum
-+    {
-         SOCK_STREAM = 1,
-         SOCK_DGRAM = 2,
--        SOCK_RAW = 3,
-         SOCK_RDM = 4,
-         SOCK_SEQPACKET = 5,
-         SOCK_DCCP = 6,
-@@ -2187,6 +2187,10 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+    enum
-+    {
-+        SOCK_RAW    = 3
-+    }
- }
- else version (CRuntime_UClibc)
- {
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/sys/types.d b/libphobos/libdruntime/core/sys/posix/sys/types.d
---- a/libphobos/libdruntime/core/sys/posix/sys/types.d	2019-10-28 07:12:22.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/sys/types.d	2019-10-28 08:07:51.000000000 +0900
-@@ -112,20 +112,25 @@ version (CRuntime_Glibc)
- }
- else version (CRuntime_Musl)
- {
--    alias long      blksize_t;
--    alias ulong     nlink_t;
--    alias long      dev_t;
--    alias long      blkcnt_t;
--    alias ulong     ino_t;
--    alias long      off_t;
--    alias long      _Addr;
--    alias int       pid_t;
--    alias uint      uid_t;
--    alias uint      gid_t;
--    alias long      time_t;
--    alias long      clock_t;
--    alias ulong     pthread_t;
--    alias _Addr     ssize_t;
-+    alias c_long     blksize_t;
-+    alias c_ulong    nlink_t;
-+    alias long       dev_t;
-+    alias long       blkcnt_t;
-+    alias ulong      ino_t;
-+    alias long       off_t;
-+    alias int        pid_t;
-+    alias uint       uid_t;
-+    alias uint       gid_t;
-+    version (D_X32)
-+        alias long   time_t;
-+    else
-+        alias c_long time_t;
-+    alias c_long     clock_t;
-+    alias c_ulong    pthread_t;
-+    version (D_LP64)
-+        alias c_long ssize_t;
-+    else
-+        alias int    ssize_t;
- }
- else version (Darwin)
- {
-@@ -420,7 +425,10 @@ else version (CRuntime_Musl)
-   }
-     alias uint mode_t;
-     alias uint id_t;
--    alias long suseconds_t;
-+    version (D_X32)
-+        alias long susseconds_t;
-+    else
-+        alias c_long suseconds_t;
- }
- else version (CRuntime_UClibc)
- {
-@@ -723,40 +746,77 @@ version (CRuntime_Glibc)
- }
- else version (CRuntime_Musl)
- {
--    version (X86_64) {
-+    version (D_LP64)
-+    {
-         union pthread_attr_t
-         {
-             int[14] __i;
-             ulong[7] __s;
-         }
-+
-         union pthread_cond_t
-         {
-             int[12] __i;
-             void*[6] __p;
-         }
-+
-         union pthread_mutex_t
-         {
-             int[10] __i;
-             void*[5] __p;
-         }
-+
-         union pthread_rwlock_t
-         {
-             int[14] __i;
-             void*[7] __p;
-         }
--        struct pthread_rwlockattr_t
-+    }
-+    else
-+    {
-+        union pthread_attr_t
-+        {
-+            int[9] __i;
-+            uint[9] __s;
-+        }
-+
-+        union pthread_cond_t
-+        {
-+            int[12] __i;
-+            void*[12] __p;
-+        }
-+
-+        union pthread_mutex_t
-         {
--            uint[2] __attr;
-+            int[6] __i;
-+            void*[6] __p;
-+        }
-+
-+        union pthread_rwlock_t
-+        {
-+            int[8] __i;
-+            void*[8] __p;
-         }
--        alias uint pthread_key_t;
--        alias uint pthread_condattr_t;
--        alias uint pthread_mutexattr_t;
--        alias int pthread_once_t;
-     }
--    else
-+
-+    struct pthread_rwlockattr_t
-     {
--        static assert (false, "Architecture unsupported");
-+        uint[2] __attr;
-     }
-+
-+    alias uint pthread_key_t;
-+
-+    struct pthread_condattr_t
-+    {
-+        uint __attr;
-+    }
-+
-+    struct pthread_mutexattr_t
-+    {
-+        uint __attr;
-+    }
-+
-+    alias int pthread_once_t;
- }
- else version (Darwin)
- {
-@@ -1300,6 +1360,27 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+    version (D_LP64)
-+    {
-+        union pthread_barrier_t
-+        {
-+            int[8] __i;
-+            void*[4] __p;
-+        }
-+    }
-+    else
-+    {
-+        union pthread_barrier_t
-+        {
-+            int[5] __i;
-+            void*[5] __p;
-+        }
-+    }
-+
-+    struct pthread_barrierattr_t
-+    {
-+        uint __attr;
-+    }
- }
- else version (CRuntime_UClibc)
- {
-@@ -1351,6 +1432,10 @@ else version (CRuntime_UClibc)
- {
-     alias int pthread_spinlock_t; // volatile
- }
-+else version (CRuntime_Musl)
-+{
-+    alias int pthread_spinlock_t;
-+}
-
- //
- // Timer (TMR)
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/sys/wait.d b/libphobos/libdruntime/core/sys/posix/sys/wait.d
---- a/libphobos/libdruntime/core/sys/posix/sys/wait.d	2019-10-28 07:12:22.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/sys/wait.d	2019-10-28 08:08:09.000000000 +0900
-@@ -362,6 +362,19 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
-+    enum WEXITED    = 4;
-+    enum WSTOPPED   = 2;
-+    enum WCONTINUED = 8;
-+    enum WNOWAIT    = 0x01000000;
-+
-+    enum idtype_t
-+    {
-+        P_ALL,
-+        P_PID,
-+        P_PGID
-+    }
-+
-+    int waitid(idtype_t, id_t, siginfo_t*, int);
- }
- else version (CRuntime_UClibc)
- {
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/ucontext.d b/libphobos/libdruntime/core/sys/posix/ucontext.d
---- a/libphobos/libdruntime/core/sys/posix/ucontext.d	2019-10-28 07:12:22.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/ucontext.d	2019-10-28 08:08:09.000000000 +0900
-@@ -23,6 +23,10 @@ extern (C):
- nothrow:
- @nogc:
-
-+version (MIPS32)  version = MIPS_Any;
-+version (MIPS64)  version = MIPS_Any;
-+version (PPC)     version = PPC_Any;
-+version (PPC64)   version = PPC_Any;
- version (RISCV32) version = RISCV_Any;
- version (RISCV64) version = RISCV_Any;
- version (S390)    version = IBMZ_Any;
-@@ -770,6 +774,139 @@ version (CRuntime_Glibc)
-     else
-         static assert(0, "unimplemented");
- }
-+else version (CRuntime_Musl)
-+{
-+    version (AArch64)
-+    {
-+        struct mcontext_t
-+        {
-+            real[18+256] __regs;
-+        }
-+
-+        struct ucontext_t
-+        {
-+            c_ulong     uc_flags;
-+            ucontext_t* uc_link;
-+            stack_t     uc_stack;
-+            sigset_t    uc_sigmask;
-+            mcontext_t  uc_mcontext;
-+        }
-+    }
-+    else version (ARM)
-+    {
-+        struct mcontext_t
-+        {
-+            c_ulong[21] __regs;
-+        }
-+
-+        struct ucontext_t
-+        {
-+            c_ulong     uc_flags;
-+            ucontext_t* uc_link;
-+            stack_t     uc_stack;
-+            mcontext_t  uc_mcontext;
-+            sigset_t    uc_sigmask;
-+            ulong[64]   uc_regspace;
-+        }
-+    }
-+    else version (IBMZ_Any)
-+    {
-+        struct mcontext_t
-+        {
-+            c_ulong[18] __regs1;
-+            uint[18]    __regs2;
-+            double[16]  __regs3;
-+        }
-+
-+        struct ucontext_t
-+        {
-+            c_ulong     uc_flags;
-+            ucontext_t* uc_link;
-+            stack_t     uc_stack;
-+            mcontext_t  uc_mcontext;
-+            sigset_t    uc_sigmask;
-+        }
-+    }
-+    else version (MIPS_Any)
-+    {
-+        version (MIPS_N32)
-+        {
-+            struct mcontext_t
-+            {
-+                ulong[32]  __mc1;
-+                double[32] __mc2;
-+                ulong[9]   __mc3;
-+                uint[4]    __mc4;
-+            }
-+        }
-+        else version (MIPS64)
-+        {
-+            struct mcontext_t
-+            {
-+                ulong[32]  __mc1;
-+                double[32] __mc2;
-+                ulong[9]   __mc3;
-+                uint[4]    __mc4;
-+            }
-+        }
-+        else
-+        {
-+            struct mcontext_t
-+            {
-+                uint[2]    __mc1;
-+                ulong[65]  __mc2;
-+                uint[5]    __mc3;
-+                ulong[2]   __mc4;
-+                uint[6]    __mc5;
-+            }
-+        }
-+
-+        struct ucontext_t
-+        {
-+            c_ulong     uc_flags;
-+            ucontext_t* uc_link;
-+            stack_t     uc_stack;
-+            mcontext_t  uc_mcontext;
-+            sigset_t    uc_sigmask;
-+        }
-+    }
-+    else version (X86)
-+    {
-+        struct mcontext_t
-+        {
-+            uint[22] __space;
-+        }
-+
-+        struct ucontext_t
-+        {
-+            c_ulong     uc_flags;
-+            ucontext_t* uc_link;
-+            stack_t     uc_stack;
-+            mcontext_t  uc_mcontext;
-+            sigset_t    uc_sigmask;
-+            c_ulong[28] __fpregs_mem;
-+        }
-+    }
-+    else version (X86_64)
-+    {
-+        struct mcontext_t
-+        {
-+            ulong[32] __space;
-+        }
-+
-+        struct ucontext_t
-+        {
-+            c_ulong     uc_flags;
-+            ucontext_t* uc_link;
-+            stack_t     uc_stack;
-+            mcontext_t  uc_mcontext;
-+            sigset_t    uc_sigmask;
-+            ulong[64]   __fpregs_mem;
-+        }
-+    }
-+    else
-+        static assert(0, "unimplemented");
-+}
- else version (FreeBSD)
- {
-     // <machine/ucontext.h>
-diff -Nurp a/libphobos/src/std/experimental/allocator/building_blocks/region.d b/libphobos/src/std/experimental/allocator/building_blocks/region.d
---- a/libphobos/src/std/experimental/allocator/building_blocks/region.d	2019-10-28 07:23:27.000000000 +0900
-+++ b/libphobos/src/std/experimental/allocator/building_blocks/region.d	2019-10-28 08:08:09.000000000 +0900
-@@ -580,6 +580,12 @@ struct InSituRegion(size_t size, size_t
-     assert(a.length == 2001);
- }
-
-+version(CRuntime_Musl)
-+{
-+    // sbrk and brk are disabled in Musl:
-+    // https://git.musl-libc.org/cgit/musl/commit/?id=7a995fe706e519a4f55399776ef0df9596101f93
-+    // https://git.musl-libc.org/cgit/musl/commit/?id=863d628d93ea341b6a32661a1654320ce69f6a07
-+} else:
- private extern(C) void* sbrk(long);
- private extern(C) int brk(shared void*);
-
-diff -Nurp a/libphobos/src/std/socket.d b/libphobos/src/std/socket.d
---- a/libphobos/src/std/socket.d	2019-10-28 07:23:27.000000000 +0900
-+++ b/libphobos/src/std/socket.d	2019-10-28 08:08:09.000000000 +0900
-@@ -163,47 +163,7 @@ string formatSocketError(int err) @trust
-         {
-             cs = strerror_r(err, buf.ptr, buf.length);
-         }
--        else version (OSX)
--        {
--            auto errs = strerror_r(err, buf.ptr, buf.length);
--            if (errs == 0)
--                cs = buf.ptr;
--            else
--                return "Socket error " ~ to!string(err);
--        }
--        else version (FreeBSD)
--        {
--            auto errs = strerror_r(err, buf.ptr, buf.length);
--            if (errs == 0)
--                cs = buf.ptr;
--            else
--                return "Socket error " ~ to!string(err);
--        }
--        else version (NetBSD)
--        {
--            auto errs = strerror_r(err, buf.ptr, buf.length);
--            if (errs == 0)
--                cs = buf.ptr;
--            else
--                return "Socket error " ~ to!string(err);
--        }
--        else version (DragonFlyBSD)
--        {
--            auto errs = strerror_r(err, buf.ptr, buf.length);
--            if (errs == 0)
--                cs = buf.ptr;
--            else
--                return "Socket error " ~ to!string(err);
--        }
--        else version (Solaris)
--        {
--            auto errs = strerror_r(err, buf.ptr, buf.length);
--            if (errs == 0)
--                cs = buf.ptr;
--            else
--                return "Socket error " ~ to!string(err);
--        }
--        else version (CRuntime_Bionic)
-+        else
-         {
-             auto errs = strerror_r(err, buf.ptr, buf.length);
-             if (errs == 0)
-@@ -211,8 +171,6 @@ string formatSocketError(int err) @trust
-             else
-                 return "Socket error " ~ to!string(err);
-         }
--        else
--            static assert(0);
-
-         auto len = strlen(cs);
-
-diff -Nurp a/libphobos/src/std/stdio.d b/libphobos/src/std/stdio.d
---- a/libphobos/src/std/stdio.d	2019-10-28 07:23:27.000000000 +0900
-+++ b/libphobos/src/std/stdio.d	2019-10-28 08:08:09.000000000 +0900
-@@ -44,38 +44,38 @@ version (CRuntime_Glibc)
-     version = GCC_IO;
-     version = HAS_GETDELIM;
- }
--
--version (OSX)
-+else version (CRuntime_Bionic)
- {
-     version = GENERIC_IO;
-     version = HAS_GETDELIM;
- }
--
--version (FreeBSD)
-+else version (CRuntime_Musl)
- {
-     version = GENERIC_IO;
-     version = HAS_GETDELIM;
- }
-
--version (NetBSD)
-+version (OSX)
- {
-     version = GENERIC_IO;
-     version = HAS_GETDELIM;
- }
--
--version (DragonFlyBSD)
-+else version (FreeBSD)
- {
-     version = GENERIC_IO;
-     version = HAS_GETDELIM;
- }
--
--version (Solaris)
-+else version (NetBSD)
- {
-     version = GENERIC_IO;
--    version = NO_GETDELIM;
-+    version = HAS_GETDELIM;
- }
--
--version (CRuntime_Bionic)
-+else version (DragonFlyBSD)
-+{
-+    version = GENERIC_IO;
-+    version = HAS_GETDELIM;
-+}
-+else version (Solaris)
- {
-     version = GENERIC_IO;
-     version = NO_GETDELIM;
diff --git a/main/gcc/401-dlang-32bits.patch b/main/gcc/401-dlang-32bits.patch
deleted file mode 100644
index 6072546f7b2..00000000000
--- a/main/gcc/401-dlang-32bits.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/libphobos/libdruntime/core/sys/posix/config.d	2019-10-29 15:54:05.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/config.d	2019-10-29 15:54:08.000000000 +0900
-@@ -67,15 +67,21 @@ version (CRuntime_Glibc)
- }
- else version (CRuntime_Musl)
- {
-+    // off_t is always 64 bits on Musl
-     enum _FILE_OFFSET_BITS   = 64;
-
-+    // Not present in Musl sources
-     enum __REDIRECT          = false;
-
-+    // Those three are irrelevant for Musl as it always uses 64 bits off_t
-     enum __USE_FILE_OFFSET64 = _FILE_OFFSET_BITS == 64;
-     enum __USE_LARGEFILE     = __USE_FILE_OFFSET64 && !__REDIRECT;
-     enum __USE_LARGEFILE64   = __USE_FILE_OFFSET64 && !__REDIRECT;
-
--    enum __WORDSIZE=64;
-+    version (D_LP64)
-+        enum __WORDSIZE = 64;
-+    else
-+        enum __WORDSIZE = 32;
- }
- else version (CRuntime_UClibc)
- {
diff --git a/main/gcc/402-dlang-stat.patch b/main/gcc/402-dlang-stat.patch
deleted file mode 100644
index faf4ed731f8..00000000000
--- a/main/gcc/402-dlang-stat.patch
+++ /dev/null
@@ -1,448 +0,0 @@
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/fcntl.d b/libphobos/libdruntime/core/sys/posix/fcntl.d
---- a/libphobos/libdruntime/core/sys/posix/fcntl.d	2020-01-01 00:00:00.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/fcntl.d	2020-01-01 00:00:00.000000000 +0900
-@@ -779,7 +779,102 @@ else version (CRuntime_Bionic)
- }
- else version (CRuntime_Musl)
- {
--    enum {
-+    version (X86_64)
-+    {
-+        enum
-+        {
-+            O_DIRECTORY     = 0x010000, // octal   0200000
-+            O_NOFOLLOW      = 0x020000, // octal   0400000
-+            O_DIRECT        = 0x004000, // octal    040000
-+            O_LARGEFILE     =        0,
-+            O_TMPFILE       = 0x410000, // octal 020200000
-+
-+            F_GETLK        = 5,
-+            F_SETLK        = 6,
-+            F_SETLKW       = 7,
-+        }
-+    }
-+    // Note: Definitions for i386 are in arch/generic/bits/fcntl.h
-+    else version (X86)
-+    {
-+        enum
-+        {
-+            O_DIRECTORY     = 0x010000, // octal   0200000
-+            O_NOFOLLOW      = 0x020000, // octal   0400000
-+            O_DIRECT        = 0x004000, // octal    040000
-+            O_LARGEFILE     = 0x008000, // octal   0100000
-+            O_TMPFILE       = 0x410000, // octal 020200000
-+
-+            F_GETLK        = 12,
-+            F_SETLK        = 13,
-+            F_SETLKW       = 14,
-+        }
-+    }
-+    else version (ARM)
-+    {
-+        enum
-+        {
-+            O_DIRECTORY     = 0x004000, // octal    040000
-+            O_NOFOLLOW      = 0x008000, // octal   0100000
-+            O_DIRECT        = 0x010000, // octal   0200000
-+            O_LARGEFILE     = 0x020000, // octal   0400000
-+            O_TMPFILE       = 0x404000, // octal 020040000
-+
-+            F_GETLK        = 12,
-+            F_SETLK        = 13,
-+            F_SETLKW       = 14,
-+        }
-+    }
-+    else version (AArch64)
-+    {
-+        enum
-+        {
-+            O_DIRECTORY     = 0x004000, // octal    040000
-+            O_NOFOLLOW      = 0x008000, // octal   0100000
-+            O_DIRECT        = 0x010000, // octal   0200000
-+            O_LARGEFILE     = 0x020000, // octal   0400000
-+            O_TMPFILE       = 0x404000, // octal 020040000
-+
-+            F_GETLK        = 5,
-+            F_SETLK        = 6,
-+            F_SETLKW       = 7,
-+        }
-+    }
-+    else version (SystemZ)
-+    {
-+        enum
-+        {
-+            O_DIRECTORY     = 0x010000, // octal   0200000
-+            O_NOFOLLOW      = 0x020000, // octal   0400000
-+            O_DIRECT        = 0x004000, // octal    040000
-+            O_LARGEFILE     = 0x008000, // octal   0100000
-+            O_TMPFILE       = 0x410000, // octal 020200000
-+
-+            F_GETLK        = 5,
-+            F_SETLK        = 6,
-+            F_SETLKW       = 7,
-+        }
-+    }
-+    else version (PPC64)
-+    {
-+        enum
-+        {
-+            O_DIRECTORY     = 0x004000, // octal    040000
-+            O_NOFOLLOW      = 0x008000, // octal   0100000
-+            O_DIRECT        = 0x020000, // octal   0400000
-+            O_LARGEFILE     = 0x010000, // octal   0200000
-+            O_TMPFILE       = 0x410000, // octal 020200000
-+
-+            F_GETLK        = 5,
-+            F_SETLK        = 6,
-+            F_SETLKW       = 7,
-+        }
-+    }
-+    else
-+        static assert(0, "Platform not supported");
-+
-+    enum
-+    {
-         O_CREAT         = 0x40,     // octal     0100
-         O_EXCL          = 0x80,     // octal     0200
-         O_NOCTTY        = 0x100,    // octal     0400
-@@ -790,16 +885,11 @@ else version (CRuntime_Musl)
-         O_DSYNC         = 0x1000,   // octal   010000
-         O_SYNC          = 0x101000, // octal 04010000
-         O_RSYNC         = O_SYNC,
--        O_DIRECTORY     = 0x10000,
--        O_NOFOLLOW      = 0x20000,
-         O_CLOEXEC       = 0x80000,
- 
-         O_ASYNC         = 0x2000,
--        O_DIRECT        = 0x4000,
--        O_LARGEFILE     =      0,
-         O_NOATIME       = 0x40000,
-         O_PATH          = 0x200000,
--        O_TMPFILE       = 0x410000,
-         O_NDELAY        = O_NONBLOCK,
-         O_SEARCH        = O_PATH,
-         O_EXEC          = O_PATH,
-@@ -809,19 +899,19 @@ else version (CRuntime_Musl)
-         O_WRONLY        = 01,
-         O_RDWR          = 02,
-     }
--    enum {
-+    enum
-+    {
-         F_DUPFD        = 0,
-         F_GETFD        = 1,
-         F_SETFD        = 2,
-         F_GETFL        = 3,
-         F_SETFL        = 4,
--        F_GETLK        = 5,
--        F_SETLK        = 6,
--        F_SETLKW       = 7,
-+        // F_GETLK, F_SETLK, F_SETLKW are arch-specific
-         F_SETOWN       = 8,
-         F_GETOWN       = 9,
-     }
--    enum {
-+    enum
-+    {
-         F_RDLCK        = 0,
-         F_WRLCK        = 1,
-         F_UNLCK        = 2,
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/semaphore.d b/libphobos/libdruntime/core/sys/posix/semaphore.d
---- a/libphobos/libdruntime/core/sys/posix/semaphore.d	2020-01-01 00:00:00.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/semaphore.d	2020-01-01 00:00:00.000000000 +0900
-@@ -143,8 +143,10 @@ else version (CRuntime_Bionic)
- else version (CRuntime_Musl)
- {
-     struct sem_t {
--        int[4*long.sizeof/int.sizeof] __val;
-+        int[4*c_long.sizeof/int.sizeof] __val;
-     }
-+
-+    enum SEM_FAILED = (sem_t*).init;
- }
- else version (CRuntime_UClibc)
- {
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/sys/stat.d b/libphobos/libdruntime/core/sys/posix/sys/stat.d
---- a/libphobos/libdruntime/core/sys/posix/sys/stat.d	2020-01-01 00:00:00.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/sys/stat.d	2020-01-01 00:00:00.000000000 +0900
-@@ -1587,31 +1587,225 @@ else version (CRuntime_Musl)
-         S_ISGID    = 0x400, // octal 02000
-         S_ISVTX    = 0x200, // octal 01000
-     }
--    struct stat_t {
--        dev_t st_dev;
--        ino_t st_ino;
--        nlink_t st_nlink;
--
--        mode_t st_mode;
--        uid_t st_uid;
--        gid_t st_gid;
--        uint    __pad0;
--        dev_t st_rdev;
--        off_t st_size;
--        blksize_t st_blksize;
--        blkcnt_t st_blocks;
--
--        timespec st_atim;
--        timespec st_mtim;
--        timespec st_ctim;
--        extern(D) @safe @property inout pure nothrow
--        {
--            ref inout(time_t) st_atime() return { return st_atim.tv_sec; }
--            ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; }
--            ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; }
-+    version (ARM)
-+    {
-+        struct stat_t
-+        {
-+            dev_t st_dev;
-+            int __st_dev_padding;
-+            c_long __st_ino_truncated;
-+            mode_t st_mode;
-+            nlink_t st_nlink;
-+
-+            uid_t st_uid;
-+            gid_t st_gid;
-+            dev_t st_rdev;
-+            int __st_rdev_padding;
-+            off_t st_size;
-+            blksize_t st_blksize;
-+            blkcnt_t st_blocks;
-+
-+            timespec st_atim;
-+            timespec st_mtim;
-+            timespec st_ctim;
-+            ino_t st_ino;
-+
-+            extern(D) @safe @property inout pure nothrow
-+            {
-+                ref inout(time_t) st_atime() return { return st_atim.tv_sec; }
-+                ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; }
-+                ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; }
-+            }
-+        }
-+    }
-+    else version (AArch64)
-+    {
-+        struct stat_t
-+        {
-+            dev_t st_dev;
-+            ino_t st_ino;
-+            mode_t st_mode;
-+            nlink_t st_nlink;
-+
-+            uid_t st_uid;
-+            gid_t st_gid;
-+            dev_t st_rdev;
-+            c_ulong __pad;
-+            off_t st_size;
-+            blksize_t st_blksize;
-+            int __pad2;
-+            blkcnt_t st_blocks;
-+
-+            timespec st_atim;
-+            timespec st_mtim;
-+            timespec st_ctim;
-+            uint[2] __unused;
-+
-+            extern(D) @safe @property inout pure nothrow
-+            {
-+                ref inout(time_t) st_atime() return { return st_atim.tv_sec; }
-+                ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; }
-+                ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; }
-+            }
-+        }
-+    }
-+    else version (X86_64)
-+    {
-+        struct stat_t
-+        {
-+            dev_t st_dev;
-+            ino_t st_ino;
-+            nlink_t st_nlink;
-+
-+            mode_t st_mode;
-+            uid_t st_uid;
-+            gid_t st_gid;
-+            uint   __pad0;
-+            dev_t st_rdev;
-+            off_t st_size;
-+            blksize_t st_blksize;
-+            blkcnt_t st_blocks;
-+
-+            timespec st_atim;
-+            timespec st_mtim;
-+            timespec st_ctim;
-+
-+            c_long[3] __unused;
-+
-+            extern(D) @safe @property inout pure nothrow
-+            {
-+                ref inout(time_t) st_atime() return { return st_atim.tv_sec; }
-+                ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; }
-+                ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; }
-+            }
-+        }
-+    }
-+    else version (X86)
-+    {
-+        struct stat_t
-+        {
-+            dev_t st_dev;
-+            int __st_dev_padding;
-+            c_long __st_ino_truncated;
-+            mode_t st_mode;
-+            nlink_t st_nlink;
-+
-+            uid_t st_uid;
-+            gid_t st_gid;
-+            dev_t st_rdev;
-+            int __st_rdev_padding;
-+            off_t st_size;
-+            blksize_t st_blksize;
-+            blkcnt_t st_blocks;
-+
-+            timespec st_atim;
-+            timespec st_mtim;
-+            timespec st_ctim;
-+            ino_t st_ino;
-+
-+            extern(D) @safe @property inout pure nothrow
-+            {
-+                ref inout(time_t) st_atime() return { return st_atim.tv_sec; }
-+                ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; }
-+                ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; }
-+            }
-         }
--        long[3] __unused;
-     }
-+    else version (MIPS64)
-+    {
-+        struct stat_t
-+        {
-+            dev_t st_dev;
-+            int[3] __pad1;
-+            ino_t st_ino;
-+            mode_t st_mode;
-+            nlink_t st_nlink;
-+
-+            uid_t st_uid;
-+            gid_t st_gid;
-+            dev_t st_rdev;
-+            uint[2] __pad2;
-+            off_t st_size;
-+            int __pad3;
-+
-+            timespec st_atim;
-+            timespec st_mtim;
-+            timespec st_ctim;
-+            blksize_t st_blksize;
-+            uint __pad4;
-+            blkcnt_t st_blocks;
-+            int[14] __pad5;
-+
-+            extern(D) @safe @property inout pure nothrow
-+            {
-+                ref inout(time_t) st_atime() return { return st_atim.tv_sec; }
-+                ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; }
-+                ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; }
-+            }
-+        }
-+    }
-+    else version (PPC64)
-+    {
-+        struct stat_t
-+        {
-+            dev_t st_dev;
-+            ino_t st_ino;
-+            nlink_t st_nlink;
-+            mode_t st_mode;
-+
-+            uid_t st_uid;
-+            gid_t st_gid;
-+            dev_t st_rdev;
-+            off_t st_size;
-+            blksize_t st_blksize;
-+            blkcnt_t st_blocks;
-+
-+            timespec st_atim;
-+            timespec st_mtim;
-+            timespec st_ctim;
-+            c_ulong[3] __unused;
-+
-+            extern(D) @safe @property inout pure nothrow
-+            {
-+                ref inout(time_t) st_atime() return { return st_atim.tv_sec; }
-+                ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; }
-+                ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; }
-+            }
-+        }
-+    }
-+    else version (SystemZ)
-+    {
-+        struct stat_t
-+        {
-+            dev_t st_dev;
-+            ino_t st_ino;
-+            nlink_t st_nlink;
-+            mode_t st_mode;
-+
-+            uid_t st_uid;
-+            gid_t st_gid;
-+            dev_t st_rdev;
-+            off_t st_size;
-+
-+            timespec st_atim;
-+            timespec st_mtim;
-+            timespec st_ctim;
-+
-+            blksize_t st_blksize;
-+            blkcnt_t st_blocks;
-+            c_ulong[3] __unused;
-+
-+            extern(D) @safe @property inout pure nothrow
-+            {
-+                ref inout(time_t) st_atime() return { return st_atim.tv_sec; }
-+                ref inout(time_t) st_mtime() return { return st_mtim.tv_sec; }
-+                ref inout(time_t) st_ctime() return { return st_ctim.tv_sec; }
-+            }
-+        }
-+    }
-+    else
-+        static assert("Unsupported platform");
-+
-     private
-     {
-         extern (D) bool S_ISTYPE( mode_t mode, uint mask )
-diff -Nurp a/libphobos/libdruntime/core/sys/posix/sys/types.d b/libphobos/libdruntime/core/sys/posix/sys/types.d
---- a/libphobos/libdruntime/core/sys/posix/sys/types.d	2020-01-08 00:00:00.000000000 +0900
-+++ b/libphobos/libdruntime/core/sys/posix/sys/types.d	2020-01-08 00:00:00.000000000 +0900
-@@ -112,8 +112,26 @@ version (CRuntime_Glibc)
- }
- else version (CRuntime_Musl)
- {
--    alias c_long     blksize_t;
--    alias c_ulong    nlink_t;
-+    version (AArch64)
-+    {
-+        alias int    blksize_t;
-+        alias uint   nlink_t;
-+    }
-+    else version (MIPS64)
-+    {
-+        alias c_long blksize_t;
-+        alias uint   nlink_t;
-+    }
-+    else version (RISCV64)
-+    {
-+        alias int    blksize_t;
-+        alias uint   nlink_t;
-+    }
-+    else
-+    {
-+        alias c_long blksize_t;
-+        alias c_ulong nlink_t;
-+    }
-     alias long       dev_t;
-     alias long       blkcnt_t;
-     alias ulong      ino_t;
diff --git a/main/gcc/403-dlang-ibmz.patch b/main/gcc/403-dlang-ibmz.patch
deleted file mode 100644
index f6f9a2ce0ca..00000000000
--- a/main/gcc/403-dlang-ibmz.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -Nurp a/libphobos/libdruntime/gcc/sections/elf_shared.d b/libphobos/libdruntime/gcc/sections/elf_shared.d
---- a/libphobos/libdruntime/gcc/sections/elf_shared.d	2020-01-01 00:00:00.000000000 +0900
-+++ b/libphobos/libdruntime/gcc/sections/elf_shared.d	2020-01-01 00:00:00.000000000 +0900
-@@ -1084,7 +1084,9 @@ void[] getTLSRange(size_t mod, size_t sz) nothrow @nogc
-
-         // base offset
-         auto ti = tls_index(mod, 0);
--        version (IBMZ_Any)
-+        version (CRuntime_Musl)
-+            return (__tls_get_addr(&ti)-TLS_DTV_OFFSET)[0 .. sz];
-+        else version (IBMZ_Any)
-         {
-             auto idx = cast(void *)__tls_get_addr_internal(&ti)
-                 + cast(ulong)__builtin_thread_pointer();
-diff -Nurp a/libphobos/configure.ac b/libphobos/configure.ac
---- a/libphobos/configure.ac	2020-01-01 00:00:00.000000000 +0900
-+++ b/libphobos/configure.ac	2020-01-01 00:00:00.000000000 +0900
-@@ -140,6 +140,14 @@ case ${host} in
- esac
- AC_MSG_RESULT($LIBPHOBOS_SUPPORTED)
-
-+AC_MSG_CHECKING([if target needs to link in swapcontext])
-+AC_MSG_RESULT($LIBDRUNTIME_NEEDS_UCONTEXT)
-+AS_IF([test "x$LIBDRUNTIME_NEEDS_UCONTEXT" = xyes], [
-+  AC_SEARCH_LIBS([swapcontext], [c ucontext], [], [
-+	AC_MSG_ERROR([[can't find library providing swapcontext]])
-+  ])
-+])
-+
- # Decide if it's usable.
- case $LIBPHOBOS_SUPPORTED:$enable_libphobos in
- *:no)  use_libphobos=no  ;;
-diff -Nurp a/libphobos/configure.tgt b/libphobos/configure.tgt
---- a/libphobos/configure.tgt	2020-01-01 00:00:00.000000000 +0900
-+++ b/libphobos/configure.tgt	2020-01-01 00:00:00.000000000 +0900
-@@ -22,6 +22,13 @@
- # Disable the libphobos or libdruntime components on untested or known
- # broken systems.  More targets shall be added after testing.
- LIBPHOBOS_SUPPORTED=no
-+
-+# Check if we require 'ucontext' or if we have a custom solution.
-+# Most platform uses a custom assembly solution for context switches,
-+# see `core.thread` and grep for `AsmExternal`.
-+# Definitions are in config/ARCH/
-+LIBPHOBOS_NEEDS_UCONTEXT=no
-+
- case "${target}" in
-   aarch64*-*-linux*)
- 	LIBPHOBOS_SUPPORTED=yes
-@@ -37,6 +44,7 @@ case "${target}" in
- 	;;
-   s390*-linux*)
- 	LIBPHOBOS_SUPPORTED=yes
-+	LIBDRUNTIME_NEEDS_UCONTEXT=yes
- 	;;
-   x86_64-*-kfreebsd*-gnu | i?86-*-kfreebsd*-gnu)
- 	LIBPHOBOS_SUPPORTED=yes
-diff -Nurp a/libphobos/configure b/libphobos/configure
---- a/libphobos/configure	2020-01-01 00:00:00.000000000 +0900
-+++ b/libphobos/configure	2020-01-01 00:00:00.000000000 +0900
-@@ -13955,6 +13955,76 @@ esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBPHOBOS_SUPPORTED" >&5
- $as_echo "$LIBPHOBOS_SUPPORTED" >&6; }
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if target needs to link in swapcontext" >&5
-+$as_echo_n "checking if target needs to link in swapcontext... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBDRUNTIME_NEEDS_UCONTEXT" >&5
-+$as_echo "$LIBDRUNTIME_NEEDS_UCONTEXT" >&6; }
-+if test "x$LIBDRUNTIME_NEEDS_UCONTEXT" = xyes; then :
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing swapcontext" >&5
-+$as_echo_n "checking for library containing swapcontext... " >&6; }
-+if ${ac_cv_search_swapcontext+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char swapcontext ();
-+int
-+main ()
-+{
-+return swapcontext ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' c ucontext; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_swapcontext=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if ${ac_cv_search_swapcontext+:} false; then :
-+  break
-+fi
-+done
-+if ${ac_cv_search_swapcontext+:} false; then :
-+
-+else
-+  ac_cv_search_swapcontext=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_swapcontext" >&5
-+$as_echo "$ac_cv_search_swapcontext" >&6; }
-+ac_res=$ac_cv_search_swapcontext
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+else
-+
-+	as_fn_error $? "can't find library providing swapcontext" "$LINENO" 5
-+
-+fi
-+
-+
-+fi
-+
-+
- # Decide if it's usable.
- case $LIBPHOBOS_SUPPORTED:$enable_libphobos in
- *:no)  use_libphobos=no  ;;
diff --git a/main/gcc/404-dlang-zlib.patch b/main/gcc/404-dlang-zlib.patch
deleted file mode 100644
index 4c453258dc7..00000000000
--- a/main/gcc/404-dlang-zlib.patch
+++ /dev/null
@@ -1,411 +0,0 @@
-diff -Nurp a/libphobos/src/std/zlib.d b/libphobos/src/std/zlib.d
---- a/libphobos/src/std/zlib.d	2020-01-01 00:00:00.000000000 +0900
-+++ b/libphobos/src/std/zlib.d	2020-01-01 00:00:00.000000000 +0900
-@@ -1,7 +1,7 @@
- // Written in the D programming language.
- 
- /**
-- * Compress/decompress data using the $(HTTP www._zlib.net, _zlib library).
-+ * Compress/decompress data using the $(HTTP www.zlib.net, zlib library).
-  *
-  * Examples:
-  *
-@@ -43,12 +43,12 @@
-  * References:
-  *  $(HTTP en.wikipedia.org/wiki/Zlib, Wikipedia)
-  *
-- * Copyright: Copyright Digital Mars 2000 - 2011.
-+ * Copyright: Copyright The D Language Foundation 2000 - 2011.
-  * License:   $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
-  * Authors:   $(HTTP digitalmars.com, Walter Bright)
-- * Source:    $(PHOBOSSRC std/_zlib.d)
-+ * Source:    $(PHOBOSSRC std/zlib.d)
-  */
--/*          Copyright Digital Mars 2000 - 2011.
-+/*          Copyright The D Language Foundation 2000 - 2011.
-  * Distributed under the Boost Software License, Version 1.0.
-  *    (See accompanying file LICENSE_1_0.txt or copy at
-  *          http://www.boost.org/LICENSE_1_0.txt)
-@@ -75,9 +75,9 @@ enum
- 
- class ZlibException : Exception
- {
--    this(int errnum)
--    {   string msg;
--
-+    private static string getmsg(int errnum) nothrow @nogc pure @safe
-+    {
-+        string msg;
-         switch (errnum)
-         {
-             case Z_STREAM_END:      msg = "stream end"; break;
-@@ -90,7 +90,12 @@ class ZlibException : Exception
-             case Z_VERSION_ERROR:   msg = "version error"; break;
-             default:                msg = "unknown error";  break;
-         }
--        super(msg);
-+        return msg;
-+    }
-+
-+    this(int errnum)
-+    {
-+        super(getmsg(errnum));
-     }
- }
- 
-@@ -104,7 +109,7 @@ class ZlibException : Exception
-  *     buf = buffer containing input data
-  *
-  * Returns:
-- *     A $(D uint) checksum for the provided input data and starting checksum
-+ *     A `uint` checksum for the provided input data and starting checksum
-  *
-  * See_Also:
-  *     $(LINK http://en.wikipedia.org/wiki/Adler-32)
-@@ -147,7 +152,7 @@ uint adler32(uint adler, const(void)[] b
-  *     buf = buffer containing input data
-  *
-  * Returns:
-- *     A $(D uint) checksum for the provided input data and starting checksum
-+ *     A `uint` checksum for the provided input data and starting checksum
-  *
-  * See_Also:
-  *     $(LINK http://en.wikipedia.org/wiki/Cyclic_redundancy_check)
-@@ -191,13 +196,14 @@ uint crc32(uint crc, const(void)[] buf)
- ubyte[] compress(const(void)[] srcbuf, int level)
- in
- {
--    assert(-1 <= level && level <= 9);
-+    assert(-1 <= level && level <= 9, "Compression level needs to be within [-1, 9].");
- }
--body
-+do
- {
-     import core.memory : GC;
-+    import std.array : uninitializedArray;
-     auto destlen = srcbuf.length + ((srcbuf.length + 1023) / 1024) + 12;
--    auto destbuf = new ubyte[destlen];
-+    auto destbuf = uninitializedArray!(ubyte[])(destlen);
-     auto err = etc.c.zlib.compress2(destbuf.ptr, &destlen, cast(ubyte *) srcbuf.ptr, srcbuf.length, level);
-     if (err)
-     {
-@@ -276,7 +282,7 @@ void[] uncompress(const(void)[] srcbuf,
-                 throw new ZlibException(err);
-         }
-     }
--    assert(0);
-+    assert(0, "Unreachable code");
- }
- 
- @system unittest
-@@ -370,9 +376,9 @@ class Compress
-     this(int level, HeaderFormat header = HeaderFormat.deflate)
-     in
-     {
--        assert(1 <= level && level <= 9);
-+        assert(1 <= level && level <= 9, "Legal compression level are in [1, 9].");
-     }
--    body
-+    do
-     {
-         this.level = level;
-         this.gzip = header == HeaderFormat.gzip;
-@@ -406,6 +412,7 @@ class Compress
-     const(void)[] compress(const(void)[] buf)
-     {
-         import core.memory : GC;
-+        import std.array : uninitializedArray;
-         int err;
-         ubyte[] destbuf;
- 
-@@ -420,7 +427,7 @@ class Compress
-             inited = 1;
-         }
- 
--        destbuf = new ubyte[zs.avail_in + buf.length];
-+        destbuf = uninitializedArray!(ubyte[])(zs.avail_in + buf.length);
-         zs.next_out = destbuf.ptr;
-         zs.avail_out = to!uint(destbuf.length);
- 
-@@ -461,9 +468,10 @@ class Compress
-     void[] flush(int mode = Z_FINISH)
-     in
-     {
--        assert(mode == Z_FINISH || mode == Z_SYNC_FLUSH || mode == Z_FULL_FLUSH);
-+        assert(mode == Z_FINISH || mode == Z_SYNC_FLUSH || mode == Z_FULL_FLUSH,
-+                "Mode must be either Z_FINISH, Z_SYNC_FLUSH or Z_FULL_FLUSH.");
-     }
--    body
-+    do
-     {
-         import core.memory : GC;
-         ubyte[] destbuf;
-@@ -523,6 +531,7 @@ class UnCompress
-     z_stream zs;
-     int inited;
-     int done;
-+    bool inputEnded;
-     size_t destbufsize;
- 
-     HeaderFormat format;
-@@ -571,16 +580,16 @@ class UnCompress
-     const(void)[] uncompress(const(void)[] buf)
-     in
-     {
--        assert(!done);
-+        assert(!done, "Buffer has been flushed.");
-     }
--    body
-+    do
-     {
-+        if (inputEnded || !buf.length)
-+            return null;
-+
-         import core.memory : GC;
-+        import std.array : uninitializedArray;
-         int err;
--        ubyte[] destbuf;
--
--        if (buf.length == 0)
--            return null;
- 
-         if (!inited)
-         {
-@@ -598,26 +607,152 @@ class UnCompress
-
-         if (!destbufsize)
-             destbufsize = to!uint(buf.length) * 2;
--        destbuf = new ubyte[zs.avail_in * 2 + destbufsize];
--        zs.next_out = destbuf.ptr;
--        zs.avail_out = to!uint(destbuf.length);
--
--        if (zs.avail_in)
--            buf = zs.next_in[0 .. zs.avail_in] ~ cast(ubyte[]) buf;
-+        auto destbuf = uninitializedArray!(ubyte[])(destbufsize);
-+        size_t destFill;
- 
-         zs.next_in = cast(ubyte*) buf.ptr;
-         zs.avail_in = to!uint(buf.length);
- 
--        err = inflate(&zs, Z_NO_FLUSH);
--        if (err != Z_STREAM_END && err != Z_OK)
-+        while (true)
-         {
--            GC.free(destbuf.ptr);
--            error(err);
-+            auto oldAvailIn = zs.avail_in;
-+
-+            zs.next_out = destbuf[destFill .. $].ptr;
-+            zs.avail_out = to!uint(destbuf.length - destFill);
-+
-+            err = inflate(&zs, Z_NO_FLUSH);
-+            if (err == Z_STREAM_END)
-+            {
-+                inputEnded = true;
-+                break;
-+            }
-+            else if (err != Z_OK)
-+            {
-+                GC.free(destbuf.ptr);
-+                error(err);
-+            }
-+            else if (!zs.avail_in)
-+                break;
-+
-+            /*
-+                According to the zlib manual inflate() stops when either there's
-+                no more data to uncompress or the output buffer is full
-+                So at this point, the output buffer is too full
-+            */
-+
-+            destFill = destbuf.length;
-+
-+            if (destbuf.capacity)
-+            {
-+                if (destbuf.length < destbuf.capacity)
-+                    destbuf.length = destbuf.capacity;
-+                else
-+                {
-+                    auto newLength = GC.extend(destbuf.ptr, destbufsize, destbufsize);
-+
-+                    if (newLength && destbuf.length < destbuf.capacity)
-+                        destbuf.length = destbuf.capacity;
-+                    else
-+                        destbuf.length += destbufsize;
-+                }
-+            }
-+            else
-+                destbuf.length += destbufsize;
-         }
-+
-         destbuf.length = destbuf.length - zs.avail_out;
-         return destbuf;
-     }
- 
-+    // Test for issues 3191 and 9505
-+    @system unittest
-+    {
-+        import std.algorithm.comparison;
-+        import std.array;
-+        import std.file;
-+        import std.zlib;
-+
-+        // Data that can be easily compressed
-+        ubyte[1024] originalData;
-+
-+        // This should yield a compression ratio of at least 1/2
-+        auto compressedData = compress(originalData, 9);
-+        assert(compressedData.length < originalData.length / 2,
-+                "The compression ratio is too low to accurately test this situation");
-+
-+        auto chunkSize = compressedData.length / 4;
-+        assert(chunkSize < compressedData.length,
-+                "The length of the compressed data is too small to accurately test this situation");
-+
-+        auto decompressor = new UnCompress();
-+        ubyte[originalData.length] uncompressedData;
-+        ubyte[] reusedBuf;
-+        int progress;
-+
-+        reusedBuf.length = chunkSize;
-+
-+        for (int i = 0; i < compressedData.length; i += chunkSize)
-+        {
-+            auto len = min(chunkSize, compressedData.length - i);
-+            // simulate reading from a stream in small chunks
-+            reusedBuf[0 .. len] = compressedData[i .. i + len];
-+
-+            // decompress using same input buffer
-+            auto chunk = decompressor.uncompress(reusedBuf);
-+            assert(progress + chunk.length <= originalData.length,
-+                    "The uncompressed result is bigger than the original data");
-+
-+            uncompressedData[progress .. progress + chunk.length] = cast(const ubyte[]) chunk[];
-+            progress += chunk.length;
-+        }
-+
-+        auto chunk = decompressor.flush();
-+        assert(progress + chunk.length <= originalData.length,
-+                "The uncompressed result is bigger than the original data");
-+
-+        uncompressedData[progress .. progress + chunk.length] = cast(const ubyte[]) chunk[];
-+        progress += chunk.length;
-+
-+        assert(progress == originalData.length,
-+                "The uncompressed and the original data sizes differ");
-+        assert(originalData[] == uncompressedData[],
-+                "The uncompressed and the original data differ");
-+    }
-+
-+    @system unittest
-+    {
-+        ubyte[1024] invalidData;
-+        auto decompressor = new UnCompress();
-+
-+        try
-+        {
-+            auto uncompressedData = decompressor.uncompress(invalidData);
-+        }
-+        catch (ZlibException e)
-+        {
-+            assert(e.msg == "data error");
-+            return;
-+        }
-+
-+        assert(false, "Corrupted data didn't result in an error");
-+    }
-+
-+    @system unittest
-+    {
-+        ubyte[2014] originalData = void;
-+        auto compressedData = compress(originalData, 9);
-+
-+        auto decompressor = new UnCompress();
-+        auto uncompressedData = decompressor.uncompress(compressedData ~ cast(ubyte[]) "whatever");
-+
-+        assert(originalData.length == uncompressedData.length,
-+                "The uncompressed and the original data sizes differ");
-+        assert(originalData[] == uncompressedData[],
-+                "The uncompressed and the original data differ");
-+        assert(!decompressor.uncompress("whatever").length,
-+                "Compression continued after the end");
-+    }
-+
-     /**
-      * Decompress and return any remaining data.
-      * The returned data should be appended to that returned by uncompress().
-@@ -626,48 +761,39 @@ class UnCompress
-     void[] flush()
-     in
-     {
--        assert(!done);
-+        assert(!done, "Buffer has been flushed before.");
-     }
-     out
-     {
--        assert(done);
-+        assert(done, "Flushing failed.");
-     }
--    body
-+    do
-     {
--        import core.memory : GC;
--        ubyte[] extra;
--        ubyte[] destbuf;
--        int err;
--
-         done = 1;
--        if (!inited)
--            return null;
-+        return null;
-+    }
- 
--      L1:
--        destbuf = new ubyte[zs.avail_in * 2 + 100];
--        zs.next_out = destbuf.ptr;
--        zs.avail_out = to!uint(destbuf.length);
-+    /// Returns true if all input data has been decompressed and no further data
-+    /// can be decompressed (inflate() returned Z_STREAM_END)
-+    @property bool empty() const
-+    {
-+        return inputEnded;
-+    }
- 
--        err = etc.c.zlib.inflate(&zs, Z_NO_FLUSH);
--        if (err == Z_OK && zs.avail_out == 0)
--        {
--            extra ~= destbuf;
--            goto L1;
--        }
--        if (err != Z_STREAM_END)
--        {
--            GC.free(destbuf.ptr);
--            if (err == Z_OK)
--                err = Z_BUF_ERROR;
--            error(err);
--        }
--        destbuf = destbuf.ptr[0 .. zs.next_out - destbuf.ptr];
--        err = etc.c.zlib.inflateEnd(&zs);
--        inited = 0;
--        if (err)
--            error(err);
--        if (extra.length)
--            destbuf = extra ~ destbuf;
--        return destbuf;
-+    ///
-+    @system unittest
-+    {
-+        // some random data
-+        ubyte[1024] originalData = void;
-+
-+        // append garbage data (or don't, this works in both cases)
-+        auto compressedData = cast(ubyte[]) compress(originalData) ~ cast(ubyte[]) "whatever";
-+
-+        auto decompressor = new UnCompress();
-+        auto uncompressedData = decompressor.uncompress(compressedData);
-+
-+        assert(uncompressedData[] == originalData[],
-+                "The uncompressed and the original data differ");
-+        assert(decompressor.empty, "The UnCompressor reports not being done");
-     }
- }
diff --git a/main/gcc/405-dlang-mips.patch b/main/gcc/405-dlang-mips.patch
deleted file mode 100644
index 1b222a0d43a..00000000000
--- a/main/gcc/405-dlang-mips.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- gcc-9.3.0.orig/libphobos/libdruntime/core/sys/posix/fcntl.d
-+++ gcc-9.3.0/libphobos/libdruntime/core/sys/posix/fcntl.d
-@@ -870,6 +870,21 @@
-             F_SETLKW       = 7,
-         }
-     }
-+    else version (MIPS_Any)
-+    {
-+        enum 
-+        {
-+            O_DIRECTORY     = 0x010000, // octal   0200000
-+            O_NOFOLLOW      = 0x020000, // octal   0400000
-+            O_DIRECT        = 0x008000, // octal   0100000
-+            O_LARGEFILE     = 0x002000, // octal   0020000
-+            O_TMPFILE       = 0x410000, // octal 020200000
-+
-+            F_GETLK        = 33,
-+            F_SETLK        = 34,
-+            F_SETLKW       = 35,
-+        }
-+    }
-     else
-         static assert(0, "Platform not supported");
- 
---- gcc-9.3.0.orig/libphobos/configure.tgt
-+++ gcc-9.3.0/libphobos/configure.tgt
-@@ -38,6 +38,7 @@
- 	;;
-   mips*-*-linux*)
- 	LIBPHOBOS_SUPPORTED=yes
-+	LIBDRUNTIME_NEEDS_UCONTEXT=yes
- 	;;
-   riscv*-*-linux*)
- 	LIBPHOBOS_SUPPORTED=yes
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 2efdcaedcdb..fba9f49c48f 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -1,23 +1,30 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
 pkgname=gcc
-pkgver=9.3.0
+pkgver=13.2.1_git20240309
+# i.e. 13.2.1, must match gcc/BASE-VER
+_pkgbase="${pkgver%%_git*}"
+# date component from snapshots
+_pkgsnap="${pkgver##*_git}"
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname="$pkgname$_target"
-pkgrel=1
+pkgrel=0
 pkgdesc="The GNU Compiler Collection"
 url="https://gcc.gnu.org"
 arch="all"
-license="GPL-2.0-or-later LGPL-2.1-or-later"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
-depends="binutils$_target isl"
-makedepends_build="gcc$_cross g++$_cross paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
-makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev !gettext-dev $pkgname-gnat-bootstrap"
+depends="binutils$_target"
+makedepends_build="gcc$_cross g++$_cross bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
+makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev !gettext-dev libucontext-dev"
 subpackages=" "
-[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target"
+[ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc$_target"
 replaces="libstdc++ binutils"
+options="!check"
 
 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -25,6 +32,7 @@ replaces="libstdc++ binutils"
 : "${LANG_GO:=true}"
 : "${LANG_FORTRAN:=true}"
 : "${LANG_ADA:=true}"
+: "${LANG_JIT:=true}"
 
 _libgomp=true
 _libgcc=true
@@ -44,15 +52,18 @@ if [ "$CHOST" != "$CTARGET" ]; then
 	LANG_GO=false
 	LANG_FORTRAN=false
 	LANG_D=false
+	LANG_JIT=false
 	_libgomp=false
 	_libatomic=false
 	_libitm=false
 
+	# format-sec: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100431
+	CPPFLAGS="${CPPFLAGS/-Werror=format-security/}"
 	# reset target flags (should be set in crosscreate abuild)
 	# fixup flags. seems gcc treats CPPFLAGS as global without
 	# _FOR_xxx variants. wrap it in CFLAGS and CXXFLAGS.
-	export CFLAGS="$CPPFLAGS $CFLAGS"
-	export CXXFLAGS="$CPPFLAGS $CXXFLAGS"
+	export CFLAGS="$CPPFLAGS -g0 ${CFLAGS/-Werror=format-security/}"
+	export CXXFLAGS="$CPPFLAGS -g0 ${CXXFLAGS/-Werror=format-security/}"
 	unset CPPFLAGS
 	export CFLAGS_FOR_TARGET=" "
 	export CXXFLAGS_FOR_TARGET=" "
@@ -60,10 +71,12 @@ if [ "$CHOST" != "$CTARGET" ]; then
 
 	STRIP_FOR_TARGET="$CTARGET-strip"
 elif [ "$CBUILD" != "$CHOST" ]; then
+	# format-sec: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100431
+	CPPFLAGS="${CPPFLAGS/-Werror=format-security/}"
 	# fixup flags. seems gcc treats CPPFLAGS as global without
 	# _FOR_xxx variants. wrap it in CFLAGS and CXXFLAGS.
-	export CFLAGS="$CPPFLAGS $CFLAGS"
-	export CXXFLAGS="$CPPFLAGS $CXXFLAGS"
+	export CFLAGS="$CPPFLAGS -g0 ${CFLAGS/-Werror=format-security/}"
+	export CXXFLAGS="$CPPFLAGS -g0 ${CXXFLAGS/-Werror=format-security/}"
 	unset CPPFLAGS
 
 	# reset flags and cc for build
@@ -81,32 +94,62 @@ elif [ "$CBUILD" != "$CHOST" ]; then
 	LANG_GO=false
 	LANG_FORTRAN=false
 	LANG_D=false
+	LANG_JIT=false
 
 	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
 	_builddir="$srcdir/build-cross-native"
 else
 	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
 	_builddir="$srcdir/build"
+
+	# format-sec: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100431
+	CPPFLAGS="${CPPFLAGS/-Werror=format-security/}"
+	# pass -g0 by default to bypass -g, since we don't do debug
+	# if -dbg added, the -g is appended and overrides this
+	export CFLAGS="$CPPFLAGS -g0 ${CFLAGS/-Werror=format-security/} -O2"
+	export CXXFLAGS="$CPPFLAGS -g0 ${CXXFLAGS/-Werror=format-security/} -O2"
+	unset CPPFLAGS
+	# https://gcc.gnu.org/install/build.html
+	export CFLAGS_FOR_TARGET="$CFLAGS"
+	export CXXFLAGS_FOR_TARGET="$CXXFLAGS"
+	export LDFLAGS_FOR_TARGET="$LDFLAGS"
+	export BOOT_CFLAGS="$CFLAGS"
+	export BOOT_CXXFLAGS="$CXXFLAGS"
+	export BOOT_LDFLAGS="$LDFLAGS"
 fi
 
+case "$CARCH" in
 # GDC hasn't been ported to PowerPC
 # See libphobos/configure.tgt in GCC sources for supported targets
-[ "$CARCH" = ppc64le ] && LANG_D=false
-
-# Go needs {set,make,swap}context, unimplemented in musl
-[ "$CTARGET_LIBC" = musl ] && LANG_GO=false
+# riscv fails with: error: static assert  "unimplemented"
+ppc64le|riscv64|loongarch64)	LANG_D=false ;;
+# GDC does currently not work on 32-bit musl architectures.
+# This is a known upstream issue.
+# See: https://github.com/dlang/druntime/pull/3383
+armhf|armv7|x86)	LANG_D=false ;;
+esac
 
 # libitm has TEXTRELs in ARM build, so disable for now
 case "$CTARGET_ARCH" in
 arm*)		_libitm=false ;;
 mips*)		_libitm=false ;;
+riscv64)	_libitm=false ;;
+loongarch64)	_libitm=false ;;
+esac
+
+# Internal libffi fails to build on MIPS at the moment, need to
+# investigate further.  We disable LANG_GO on mips64 as it requires
+# the internal libffi.
+case "$CTARGET_ARCH" in
+mips*)		LANG_GO=false ;;
+loongarch64)	LANG_GO=false ;;
 esac
 
 # Fortran uses libquadmath if toolchain has __float128
 # currently on x86, x86_64 and ia64
 _libquadmath=$LANG_FORTRAN
 case "$CTARGET_ARCH" in
-x86 | x86_64)	_libquadmath=$LANG_FORTRAN ;;
+x86 | x86_64 | ppc64le)	_libquadmath=$LANG_FORTRAN ;;
 *)		_libquadmath=false ;;
 esac
 
@@ -119,15 +162,25 @@ if $_libgomp; then
 	subpackages="$subpackages libgomp::$CTARGET_ARCH"
 fi
 
+case "$CARCH" in
+riscv64)
+LANG_ADA=false;;
+esac
+
+case "$CTARGET_ARCH" in
+loongarch64)
+LANG_ADA=false;;
+esac
+
 _languages=c
 if $LANG_CXX; then
-	subpackages="$subpackages libstdc++:libcxx:$CTARGET_ARCH g++$_target:gpp"
+	subpackages="$subpackages libstdc++:libcxx:$CTARGET_ARCH libstdc++-dev$_target:libcxx_dev g++$_target:gpp"
 	_languages="$_languages,c++"
 fi
 if $LANG_D; then
 	subpackages="$subpackages libgphobos::$CTARGET_ARCH gcc-gdc$_target:gdc"
 	_languages="$_languages,d"
-	makedepends_build="$makedepends_build libucontext-dev"
+	makedepends_build="$makedepends_build libucontext-dev gcc-gdc-bootstrap"
 fi
 if $LANG_OBJC; then
 	subpackages="$subpackages libobjc::$CTARGET_ARCH gcc-objc$_target:objc"
@@ -142,63 +195,78 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
+	subpackages="$subpackages gcc-gnat$_target:gnat"
 	_languages="$_languages,ada"
-	makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
+	if [ "$CBUILD" = "$CTARGET" ]; then
+		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
+		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
+	else
+		subpackages="$subpackages libgnat::$CTARGET_ARCH"
+		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
+	fi
+fi
+if $LANG_JIT; then
+	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
 fi
 makedepends="$makedepends_build $makedepends_host"
 
-source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
-	002_all_default-relro.patch
-	003_all_default-fortify-source.patch
-	005_all_default-as-needed.patch
-	gcc-as-needed-gold.patch
-	011_all_default-warn-format-security.patch
-	012_all_default-warn-trampolines.patch
-	013_all_default-ssp-fix.patch
-	020_all_msgfmt-libstdc++-link.patch
-	050_all_libiberty-asprintf.patch
-	051_all_libiberty-pic.patch
-	053_all_libitm-no-fortify-source.patch
-	090_all_pr55930-dependency-tracking.patch
-	0003-gcc-poison-system-directories.patch
-
-	203-libgcc_s.patch
-	205-nopie.patch
-	0002-posix_memalign.patch
-	0008-s390x-muslldso.patch
-	0010-ldbl128-config.patch
-	0012-static-pie.patch
-
-	libgcc-always-build-gcceh.a.patch
-	gcc-4.9-musl-fortify.patch
-	gcc-6.1-musl-libssp.patch
-	gcc-pure64.patch
-
-	fix-cxxflags-passing.patch
-	ada-shared.patch
-	ada-musl.patch
-	libgnarl-musl.patch
-
-	320-libffi-gnulinux.patch
-
-	gcc-pure64-mips.patch
-	0016-invalid_tls_model.patch
-
-	400-dlang-phobos.patch
-	401-dlang-32bits.patch
-	402-dlang-stat.patch
-	403-dlang-ibmz.patch
-	404-dlang-zlib.patch
-	405-dlang-mips.patch
+# when using upstream releases, use this URI template
+# https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkgbase:-$pkgver}.tar.xz
+#
+# right now, we are using a git snapshot. snapshots are taken from gcc.gnu.org/pub/gcc/snapshots.
+# However, since they are periodically deleted from the GCC mirrors the utilized snapshots are
+# mirrored on dev.alpinelinux.org. Please ensure that the snapshot Git commit (as stated in the
+# README) matches the base commit on the version-specific branch in the Git repository below.
+#
+# PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
+# so that they can be properly tracked and easily rebased if needed.
+source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
+	0001-posix_memalign.patch
+	0002-gcc-poison-system-directories.patch
+	0003-specs-turn-on-Wl-z-now-by-default.patch
+	0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+	0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+	0006-Enable-Wformat-and-Wformat-security-by-default.patch
+	0007-Enable-Wtrampolines-by-default.patch
+	0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+	0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+	0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+	0011-libiberty-copy-PIC-objects-during-build-process.patch
+	0012-libgcc_s.patch
+	0013-nopie.patch
+	0014-ada-fix-shared-linking.patch
+	0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+	0016-add-fortify-headers-paths.patch
+	0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+	0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+	0019-aarch64-disable-multilib-support.patch
+	0020-s390x-disable-multilib-support.patch
+	0021-ppc64-le-disable-multilib-support.patch
+	0022-x86_64-disable-multilib-support.patch
+	0023-riscv-disable-multilib-support.patch
+	0024-always-build-libgcc_eh.a.patch
+	0025-ada-libgnarl-compatibility-for-musl.patch
+	0026-ada-musl-support-fixes.patch
+	0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+	0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
+	0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
+	0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
+	0031-druntime-link-against-libucontext-on-all-platforms.patch
+	0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
+	0033-libphobos-do-not-use-LFS64-symbols.patch
+	0034-libgo-fix-lfs64-use.patch
+	0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
+	0037-loongarch-disable-multilib-support.patch
 	"
 
-#	gcc-4.8-build-args.patch
+# secfixes:
+#   13.2.1_git20231014-r0:
+#     - CVE-2023-4039
 
 # we build out-of-tree
-_gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
-_gcclibdir="/usr/lib/gcc/$CTARGET/$pkgver"
-_gcclibexec="/usr/libexec/gcc/$CTARGET/$pkgver"
+_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
+_gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
+_gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 
 prepare() {
 	cd "$_gccdir"
@@ -221,7 +289,7 @@ prepare() {
 		return 1
 	fi
 
-	echo ${pkgver} > gcc/BASE-VER
+	echo ${_pkgbase:-$pkgver} > gcc/BASE-VER
 }
 
 build() {
@@ -230,13 +298,14 @@ build() {
 	local _cross_configure=
 	local _bootstrap_configure=
 	local _symvers=
+	local _jit_configure=
 
 	cd "$_gccdir"
 
 	case "$CTARGET" in
 	aarch64-*-*-*)		_arch_configure="--with-arch=armv8-a --with-abi=lp64";;
 	armv5-*-*-*eabi)	_arch_configure="--with-arch=armv5te --with-tune=arm926ej-s --with-float=soft --with-abi=aapcs-linux";;
-	armv6-*-*-*eabihf)	_arch_configure="--with-arch=armv6zk --with-tune=arm1176jzf-s --with-fpu=vfp --with-float=hard --with-abi=aapcs-linux";;
+	armv6-*-*-*eabihf)	_arch_configure="--with-arch=armv6kz --with-tune=arm1176jzf-s --with-fpu=vfpv2 --with-float=hard --with-abi=aapcs-linux";;
 	armv7-*-*-*eabihf)	_arch_configure="--with-arch=armv7-a --with-tune=generic-armv7-a --with-fpu=vfpv3-d16 --with-float=hard --with-abi=aapcs-linux --with-mode=thumb";;
 	mips-*-*-*)		_arch_configure="--with-arch=mips32 --with-mips-plt --with-float=soft --with-abi=32";;
 	mips64-*-*-*)		_arch_configure="--with-arch=mips3 --with-tune=mips64 --with-mips-plt --with-float=soft --with-abi=64";;
@@ -245,8 +314,10 @@ build() {
 	powerpc-*-*-*)		_arch_configure="--enable-secureplt --enable-decimal-float=no";;
 	powerpc64*-*-*-*)	_arch_configure="--with-abi=elfv2 --enable-secureplt --enable-decimal-float=no --enable-targets=powerpcle-linux";;
 	i486-*-*-*)		_arch_configure="--with-arch=i486 --with-tune=generic --enable-cld";;
-	i586-*-*-*)		_arch_configure="--with-arch=i586 --with-tune=generic --enable-cld";;
+	i586-*-*-*)		_arch_configure="--with-arch=pentium-m --with-fpmath=sse --with-tune=generic --enable-cld";;
 	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
+	riscv64-*-*-*)		_arch_configure="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic";;
+	loongarch64-*-*-*)      _arch_configure="--with-arch=loongarch64 --with-abi=lp64d";;
 	esac
 
 	case "$CTARGET_ARCH" in
@@ -256,10 +327,9 @@ build() {
 
 	case "$CTARGET_LIBC" in
 	musl)
-		# musl does not support mudflap, or libsanitizer
-		# libmpx uses secure_getenv and struct _libc_fpstate not present in musl
+		# musl does not support libsanitizer
 		# alpine musl provides libssp_nonshared.a, so we don't need libssp either
-		_libc_configure="--disable-libssp --disable-libmpx --disable-libmudflap --disable-libsanitizer"
+		_libc_configure="--disable-libssp --disable-libsanitizer"
 		_symvers="--disable-symvers"
 		export libat_cv_have_ifunc=no
 		;;
@@ -290,37 +360,63 @@ build() {
 	echo "  libc_configure=$_libc_configure"
 	echo "  cross_configure=$_cross_configure"
 	echo "  bootstrap_configure=$_bootstrap_configure"
-	echo "	hash_style_configure=$_hash_style_configure"
+	echo "  hash_style_configure=$_hash_style_configure"
 	echo ""
 
+	local version="Alpine $pkgver"
+	local gccconfiguration="
+		--prefix=/usr
+		--mandir=/usr/share/man
+		--infodir=/usr/share/info
+		--build=$CBUILD
+		--host=$CHOST
+		--target=$CTARGET
+		--enable-checking=release
+		--disable-cet
+		--disable-fixed-point
+		--disable-libstdcxx-pch
+		--disable-multilib
+		--disable-nls
+		--disable-werror
+		$_symvers
+		--enable-__cxa_atexit
+		--enable-default-pie
+		--enable-default-ssp
+		--enable-languages=$_languages
+		--enable-link-serialization=2
+		--enable-linker-build-id
+		$_arch_configure
+		$_libc_configure
+		$_cross_configure
+		$_bootstrap_configure
+		--with-bugurl=https://gitlab.alpinelinux.org/alpine/aports/-/issues
+		--with-system-zlib
+		$_hash_style_configure
+		"
+
 	mkdir -p "$_builddir"
 	cd "$_builddir"
-	"$_gccdir"/configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--build=${CBUILD} \
-		--host=${CHOST} \
-		--target=${CTARGET} \
-		--with-pkgversion="Alpine $pkgver" \
-		--enable-checking=release \
-		--disable-fixed-point \
-		--disable-libstdcxx-pch \
-		--disable-multilib \
-		--disable-nls \
-		--disable-werror \
-		$_symvers \
-		--enable-__cxa_atexit \
-		--enable-default-pie \
-		--enable-default-ssp \
-		--enable-cloog-backend \
-		--enable-languages=$_languages \
-		$_arch_configure \
-		$_libc_configure \
-		$_cross_configure \
-		$_bootstrap_configure \
-		--with-system-zlib \
-		$_hash_style_configure
+	"$_gccdir"/configure $gccconfiguration \
+		--with-pkgversion="$version"
+
+	msg "building gcc"
 	make
+
+	# we build gccjit separate to not build all of gcc with --enable-host-shared
+	# as doing so slows it down a few %, so for some quick if's here we gain
+	# free performance
+	if $LANG_JIT; then
+		mkdir -p "$_builddir"/libgccjit-build
+		cd "$_builddir"/libgccjit-build
+		"$_gccdir"/configure $gccconfiguration \
+			--disable-bootstrap \
+			--enable-host-shared \
+			--enable-languages=jit \
+			--with-pkgversion="$version"
+
+		msg "building libgccjit"
+		make all-gcc
+	fi
 }
 
 package() {
@@ -328,6 +424,11 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install
 
 	ln -s gcc "$pkgdir"/usr/bin/cc
+	ln -s ${CTARGET}-gcc "$pkgdir"/usr/bin/${CTARGET}-cc
+
+	if $LANG_JIT; then
+		make -C "$_builddir"/libgccjit-build/gcc DESTDIR="$pkgdir" jit.install-common
+	fi
 
 	# we dont support gcj -static
 	# and saving 35MB is not bad.
@@ -339,12 +440,11 @@ package() {
 	# strip debug info from some static libs
 	find "$pkgdir" \( -name libgfortran.a -o -name libobjc.a -o -name libgomp.a \
 		-o -name libgphobos.a -o -name libgdruntime.a \
-		-o -name libmudflap.a -o -name libmudflapth.a \
 		-o -name libgcc.a -o -name libgcov.a -o -name libquadmath.a \
 		-o -name libitm.a -o -name libgo.a -o -name libcaf\*.a \
 		-o -name libatomic.a -o -name libasan.a -o -name libtsan.a \) \
 		-a -type f \
-		-exec ${STRIP_FOR_TARGET} -g {} +
+		-exec $STRIP_FOR_TARGET -g {} +
 
 	if $_libgomp; then
 		mv "$pkgdir"/usr/lib/libgomp.spec "$pkgdir"/$_gcclibdir
@@ -365,14 +465,18 @@ package() {
 		done
 	fi
 
-	paxmark -pmrs "$pkgdir"/$_gcclibexec/cc1
-
 	# move ada runtime libs
 	if $LANG_ADA; then
 		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.so"); do
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
+		if [ "$CHOST" = "$CTARGET" ]; then
+			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
+				mv "$i" "$pkgdir"/usr/lib/
+				ln -s ../../../../${i##*/} $i
+			done
+		fi
 	fi
 
 	if [ "$CHOST" != "$CTARGET" ]; then
@@ -418,6 +522,10 @@ done
 exec gcc $_flavor ${1+"$@"}
 EOF
 		chmod 755 "$pkgdir"/usr/bin/c?9
+
+		# install lto plugin so regular binutils may use it
+		mkdir -p "$pkgdir"/usr/lib/bfd-plugins
+		ln -s /$_gcclibexec/liblto_plugin.so "$pkgdir/usr/lib/bfd-plugins/"
 	fi
 }
 
@@ -434,26 +542,54 @@ libcxx() {
 	pkgdesc="GNU C++ standard runtime library"
 	depends=
 
+	if [ "$CHOST" = "$CTARGET" ]; then
+		# verify that we are using clock_gettime rather than doing direct syscalls
+		# so we dont break 32 bit arches due to time64.
+		nm -D "$pkgdir"/usr/lib/libstdc++.so.* | grep clock_gettime
+	fi
+
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libstdc++.so.* "$subpkgdir"/usr/lib/
 }
 
+libcxx_dev() {
+	pkgdesc="GNU C++ standard runtime library (development files)"
+	depends=
+	replaces="g++"
+
+	amove usr/${_target:+$CTARGET/}lib/libstdc++.a \
+		usr/${_target:+$CTARGET/}lib/libstdc++exp.a \
+		usr/${_target:+$CTARGET/}lib/libstdc++.so \
+		usr/${_target:+$CTARGET/}lib/libstdc++fs.a \
+		usr/${_target:+$CTARGET/}lib/libsupc++.a \
+		usr/${_target:+$CTARGET/}include/c++
+}
+
 gpp() {
 	pkgdesc="GNU C++ standard library and compiler"
-	depends="libstdc++=$_gccrel gcc=$_gccrel libc-dev"
+	depends="libstdc++=$_gccrel libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel libc-dev"
 	mkdir -p "$subpkgdir/$_gcclibexec" \
 		"$subpkgdir"/usr/bin \
 		"$subpkgdir"/usr/${_target:+$CTARGET/}include \
 		"$subpkgdir"/usr/${_target:+$CTARGET/}lib \
 
 	mv "$pkgdir/$_gcclibexec/cc1plus" "$subpkgdir/$_gcclibexec/"
-	paxmark -pmrs "$subpkgdir/$_gcclibexec/cc1plus"
 
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/*++* "$subpkgdir"/usr/${_target:+$CTARGET/}lib/
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}include/c++ "$subpkgdir"/usr/${_target:+$CTARGET/}include/
 	mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/
 }
 
+jit() {
+	pkgdesc="GCC JIT Library"
+	depends=
+	amove usr/lib/libgccjit.so*
+}
+
+jitdev() {
+	pkgdesc="GCC JIT Library (development files)"
+	depends="libgccjit"
+	amove usr/include/libgccjit*.h
+}
+
 libobjc() {
 	pkgdesc="GNU Objective-C runtime"
 	replaces="objc"
@@ -467,8 +603,10 @@ objc() {
 	replaces="gcc"
 	depends="libc-dev gcc=$_gccrel libobjc=$_gccrel"
 
-	mkdir -p "$subpkgdir"/$_gcclibdir/include \
+	mkdir -p "$subpkgdir/$_gcclibexec" \
+		"$subpkgdir"/$_gcclibdir/include \
 		"$subpkgdir"/usr/lib
+	mv "$pkgdir/$_gcclibexec/cc1obj" "$subpkgdir/$_gcclibexec/"
 	mv "$pkgdir"/$_gcclibdir/include/objc "$subpkgdir"/$_gcclibdir/include/
 	mv "$pkgdir"/usr/lib/libobjc.so "$pkgdir"/usr/lib/libobjc.a \
 		"$subpkgdir"/usr/lib/
@@ -504,20 +642,26 @@ gdc() {
 	pkgdesc="GCC-based D language compiler"
 	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
 	depends="$depends libucontext-dev"
+	provides="gcc-gdc-bootstrap=$_gccrel"
 
-	mkdir -p "$subpkgdir"/$_gcclibdir/include/d/ \
+	mkdir -p "$subpkgdir/$_gcclibexec" \
+		"$subpkgdir"/$_gcclibdir/include/d/ \
 		"$subpkgdir"/usr/lib \
 		"$subpkgdir"/usr/bin
 	# Copy: The installed '.d' files, the static lib, the binary itself
 	# The shared libs are part of 'libgphobos' so one can run program
 	# without installing the compiler
+	mv "$pkgdir/$_gcclibexec/d21" "$subpkgdir/$_gcclibexec/"
 	mv "$pkgdir"/$_gcclibdir/include/d/* "$subpkgdir"/$_gcclibdir/include/d/
 	mv "$pkgdir"/usr/lib/libgdruntime.a "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgdruntime.so "$subpkgdir"/usr/lib/
 	mv "$pkgdir"/usr/lib/libgphobos.a "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgphobos.spec "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/bin/$CTARGET-gdc "$subpkgdir"/usr/bin/
 	mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
 }
 
-
 libgo() {
 	pkgdesc="Go runtime library for GCC"
 	depends=
@@ -527,18 +671,26 @@ libgo() {
 }
 
 go() {
-	pkgdesc="Go support for GCC"
-	depends="gcc=$_gccrel libgo=$_gccrel"
+	pkgdesc="GCC Go frontend (intended for bootstrapping community/go)"
+	depends="gcc=$_gccrel libgo=$_gccrel !go"
+	install="$pkgname-go.post-install"
 
 	mkdir -p "$subpkgdir"/$_gcclibexec \
 		"$subpkgdir"/usr/lib \
 		"$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/lib/go "$subpkgdir"/usr/lib/
 	mv "$pkgdir"/usr/bin/*gccgo "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/bin/*go "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/*gofmt "$subpkgdir"/usr/bin
 	mv "$pkgdir"/$_gcclibexec/go1 "$subpkgdir"/$_gcclibexec/
+	mv "$pkgdir"/$_gcclibexec/cgo "$subpkgdir"/$_gcclibexec/
+	mv "$pkgdir"/$_gcclibexec/buildid "$subpkgdir"/$_gcclibexec/
+	mv "$pkgdir"/$_gcclibexec/test2json "$subpkgdir"/$_gcclibexec/
+	mv "$pkgdir"/$_gcclibexec/vet "$subpkgdir"/$_gcclibexec/
 	mv "$pkgdir"/usr/lib/libgo.a \
 		"$pkgdir"/usr/lib/libgo.so \
 		"$pkgdir"/usr/lib/libgobegin.a \
+		"$pkgdir"/usr/lib/libgolibbegin.a \
 		"$subpkgdir"/usr/lib/
 }
 
@@ -578,6 +730,7 @@ gfortran() {
 			"$pkgdir"/usr/lib/libquadmath.so \
 			"$subpkgdir"/usr/lib/
 	fi
+	mv "$pkgdir"/$_gcclibdir/finclude "$subpkgdir"/$_gcclibdir/
 	mv "$pkgdir"/$_gcclibexec/f951 "$subpkgdir"/$_gcclibexec
 	mv "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir
 }
@@ -590,10 +743,18 @@ libgnat() {
 	mv "$pkgdir"/usr/lib/libgna*.so "$subpkgdir"/usr/lib/
 }
 
+libgnatstatic() {
+	pkgdesc="GNU Ada static libraries"
+	depends=
+
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/libgna*.a "$subpkgdir"/usr/lib/
+}
+
 gnat() {
 	pkgdesc="Ada support for GCC"
 	depends="gcc=$_gccrel"
-	provides="$pkgname-gnat-bootstrap"
+	provides="$pkgname-gnat-bootstrap=$_gccrel"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"
 
 	mkdir -p "$subpkgdir"/$_gcclibexec \
@@ -604,40 +765,51 @@ gnat() {
 	mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/
 }
 
-sha512sums="4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de  gcc-9.3.0.tar.xz
-e36e95b81489163abd6fe9d58f7867bdca43e61143afacbfb17f4698c0b16ec5fd0061d8fab7b2ae615540bebd721c2e2227f80401b4e7fc253da9da62e6b513  002_all_default-relro.patch
-f86466c62b8291fac46f9c250c7ad8fa5ab7b1cce2504442fd07ddc4543665b317ae28951f244e39aba29aeaf3fff252ec4f6a147aa16adb2b7aed747dd89188  003_all_default-fortify-source.patch
-5e4794d1caddb1050d8935ae5a53ba275b653ad2c9954df89a8c47ac694e6139011829f440eb7e5b24fd57ea25daf25ac83f317871841a78ffb74d167d6f8bf9  005_all_default-as-needed.patch
-6c9a5068f6eea8a85d297a3555b1d2333ffd4b9ddbfb7560a3e643f8577603871ca123373ef7f96e894225291d88f7bf575c7f8386bcfdd1dabcd7ba12598b65  gcc-as-needed-gold.patch
-e026bf9f73ee254528423c6cabdfd7794960c567161581b7d4b7c61c45027e12a6efef79662d4288b9cbaecb4798f01af6a5b4a13b766c2d501444ac1846fd43  011_all_default-warn-format-security.patch
-37de4cc9061bfe1963e6e6570e1a6bbfd58204bf90e0eef819882599a9a80ea28f3eb815c20c1f173dc25d4bd9971b7c7f7f9512d6f8f91f04de1e1175114d4d  012_all_default-warn-trampolines.patch
-38a0fedeac3eebe4a6a957792ba520225cf42663c96a171cd168fdb6c91ffa9a56b80351f8238c5d03b78d3ae2a6539a54481fe4848b4a395e2c87f2ff7adc08  013_all_default-ssp-fix.patch
-d35a3ac7e13a4446921a90e1ff3eec1079840c845f9d523c868e24ae21f94cf69ba041de5341ebef96432a6f57598e223381d4286e8fb8baaa25906707f29fbd  020_all_msgfmt-libstdc++-link.patch
-840070a3c423e6206aaa6e63e1d9a0fcd6efd53626cd1240a193f0b60aa5d84216acc4a2a4fa8bce74549b07e6a316b01d638f20cea13dc62473491a302fb3d6  050_all_libiberty-asprintf.patch
-0a0bc72b9366158f5d23fff1928e756fdd212433bac6ab1f00d632f241382820db8db5d475ddf11ea020eaf7e2e71b12fb9b1c3c870cf84adf6c2b16f15aabca  051_all_libiberty-pic.patch
-e7a2eb1b1870e199d6fd753d065781575656fa12baa264f96c5d179689d88c31b8a3f92a5dae96088c05e96aa2bda138364ad7dbcc79e1819a102f192cbb7bab  053_all_libitm-no-fortify-source.patch
-4a328d1e1a56c20166307edcfa322068915784d9c08025b7f81cf69714da48fc266b6d34f77b9135c2f10da830d9df408276a1b78d1fd218637c2823506593c2  090_all_pr55930-dependency-tracking.patch
-707b30c141778fbcb1e37ebb42873cd7971de232a1298f78bbd834fa74d411b7b49cecfe4f247316d7c785da792f95f26ea6d824cd322a8f87b29537af3f77f3  0003-gcc-poison-system-directories.patch
-d1c2d7ff7f673375dc7cd84ae9d8515853b5af6390c70bb763412c012101344e4ee1ce155151ce3fb6ba2b80af7ed42d697dbe1bf6fd6e7b2b9087a378c47c37  203-libgcc_s.patch
-98473bcaa77903a223ca9b0d2087c0921b287a2816d308cc32c8fe009e6cbf5dd1ae7fba27794ab8d9c09e117fe534413d91a464d1218474fc123ce0adfdc2c1  205-nopie.patch
-6d84354e6df96d5ea244eb3bb5f044781796b88040b11c78fb6ee509e5aac19d46e0e92ca836e98e6495d9751f52439833b748efc419e4f5d5301fb549c4dcc9  0002-posix_memalign.patch
-7f434a7350c9b06d0ae7cc18a569d813238483afa34b0801d112844a0dfe6164ae36b0416955fd4da7a8caa54672247f319a8ec7ce4b6a97a5f4e17ec083112a  0008-s390x-muslldso.patch
-66085c5555e6b91b6874d1782d5a1dc0ab1792889f9400f48cde9483f82b51b9e3a5de1efbba21a19fc5e664334f2188d0c2bc988d42335efa26118b3c85cc7f  0010-ldbl128-config.patch
-d91c5eba37166cf34ca38e03808e3960c091b3627008a0c68c127cdf52e3827f8cfbe478ababe64c3cbb4d5eb8ed6230a21a74b6908549e05e08646de09df37c  0012-static-pie.patch
-d08d7ead2de0429e5c9055d5b029ec2be9a8c821d22cecaf9b51f633652c493333f98963d9267fa2fa63850c50ae5eefd5f59e5910ec10d20044dac082182a8b  libgcc-always-build-gcceh.a.patch
-600fe5098dc54edaa9808fd5717af9dec058953f9ad37d49cfba1db4f7e9a7a8f02019342f75157fc575946fa693259422184de27b7ecc8386d9f3ecc0f7cc5d  gcc-4.9-musl-fortify.patch
-dbe0ee917fc7668571722364ab7c806731e3a31e8bfa30b4941b28b16b877d2a32b4a3897ef533399a28f82d43cac9b28e92de0493f0e779046db56584e07fa4  gcc-6.1-musl-libssp.patch
-fa62556719449caec6b2b434355bfbcaa5ae55ffe017b3e1f827f66a2aae21b79c571ee7a4ce723ea69169bc3a6447e73650991a200cc372adf2f102677518d7  gcc-pure64.patch
-35d6d59f0b7b968f282f56767c9e0823a7bdc5aa0d450aca50fbd802649a7ca608b47671244a3faa208a9b0d6832cabb5a22724157dc817b2c0ad63d09f93282  fix-cxxflags-passing.patch
-3f5bc334d9f73d06f5f7c876738d02356acdd08958bea0e4d2095ebf15c2c2ec4e411abdae0297505ae9a1699ca01b17338e853184e84663203b192b0d35fc19  ada-shared.patch
-cceeac95f47ea8664e1c16c5ebecb472b5aaa56040e943c1b97c7873b50e3a2bf972d9f743d342a2444a3bb711a0720d2446fded43892c5e05bdeefd478b0cd1  ada-musl.patch
-a1f7750bc7b8b7d916a5dee34fcc736bd4fb249c96538b547d495794e6cfd49356aa3974506a15074b4cb58edd5d7e2868607c902dd003e8c464d5066fd4a575  libgnarl-musl.patch
-f4ef08454e28c8732db69115e4998ec153399e8d229dd27f923dbdcf57b68128a65640d026cc7f45b58ba8764ab1eb575d4eb6d6dfc550a87a183f8b94e76181  320-libffi-gnulinux.patch
-86be3338cc9c33089608bc4c5e3b7918c4e500a345c338f361b18c342119a6ed69af5495d72950de7106d760f003528b46ad14795e805f8a3331e206dcb234e3  gcc-pure64-mips.patch
-17e0faeef742d32d57a070d983480367dd28cd28d47a8966ce327afdff3a38ea76803a833c90aff7d3a93aa66dae76c9be47b2408500913b40571af25b85aca7  0016-invalid_tls_model.patch
-38772c5b0905455a44c43d6ef7e5f140530006e2bde9f5ffd6b569c7cf9633992515f666b486d7a78c30ab8da99b92b2775c90fde47821ae542ef1c49dc405df  400-dlang-phobos.patch
-84bdbdfcb972161765b81220ea2e80e83c32f3ab27596b77eb451d8cac4bd6312210df468581c2b0e1363f5e3b31654e369c47ae84c907f3b54a1786d7c17830  401-dlang-32bits.patch
-9d73f21eaa2458d28a144dd0e5478ed52763a4d8bbf62084b607db52bce1e2242f773c853fc34e6aae2d53c4124948139954627064e850e9dabaddaef5cb9d69  402-dlang-stat.patch
-fd056014d0c6f627108d7387bfe46b5fb66786a16fa964da55b0442658b1c8e9e903c641a9e3233000ef37691e32ea4fef22029ab5eba217ccbc8bd5941e81ae  403-dlang-ibmz.patch
-ddb3ca26b5e55f6d376036c2ed87959770bfb72d1175d0dba332f705edf6817806d53765c838ff670472a16ab175bd1ce88946c19d83f9d5e53ff2b4d3558dfb  404-dlang-zlib.patch
-3f40f796f50d49ea0a185d3454c79606fb5f90ed48c030fe25c1df8c4a72ba7cae37dccdb260cf737beb3e921dc2ddad68effbe446dbf220a07d0158b9b9ca8d  405-dlang-mips.patch"
+gdb() {
+	pkgdesc="$pkgdesc (gdb printers)"
+	install_if="$pkgname=$pkgver-r$pkgrel gdb"
+
+	amove \
+		usr/share/gdb/python/ \
+		usr/share/gcc-*/python/
+}
+
+sha512sums="
+2d1e0374ebdee526f0549319fc9c364968c52a0d4aaa16759f00453cb083fe58d8f463c47d97f3bb74a0a92e251989eb75a50ee5800b4569978c72d25446b44e  gcc-13-20240309.tar.xz
+1ecffba1b07d60e1b4422302b032bbea918b674c8e12b30aa6965b544d700ce86b61e9f7b8d402c6caf59257f491a394dd0912f0948565d6eae9335ee54f3b35  0001-posix_memalign.patch
+163f282455b6a4df33f011bcd8b0440566ba0ffaeeab30d8ac52d39948980a56881ca0eff60687129d59556389a58b9d64e7768750bd70b1fe0fedbc9fc30dc2  0002-gcc-poison-system-directories.patch
+3f24bb6a50d3c45b71ea05590e32fe3e69b91377ab185352891d5035c76ed193117c6d0b314a4c364bcf136b9a9dd5c926d6c7c30ab436976c121ebfea8d3ddd  0003-specs-turn-on-Wl-z-now-by-default.patch
+17a2993027d3ddf8595952ebcae425695ddc7b1cf73b384d2e55fddecb9cbf3f6482860a502ff69b14075e12badf27300fd3039f3a9005e851fd8d121d258c2b  0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch
+444550e55491ff89fe8cbbb4b73d017c9c147cdce1ad5c0561fe7d6ab3834515a814c7676c408cfeec18e1aaace27b3c26a2ffe4a75042285df5124976c38672  0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch
+5a5f57e4e45745bb4d9d63d7d410fe9dd56ce12dbd70c376dd45015909307faf02391e75368e4e7404591614a874cee41b20652cf27be234765d6db97ceb4e7e  0006-Enable-Wformat-and-Wformat-security-by-default.patch
+3a2b22388398a93dae7787e794cd580b9c577326f286241e086120c1fcfdd9228c2e00407088ebb163fb1acc21722c199071343551c989a958dc3c845b15132d  0007-Enable-Wtrampolines-by-default.patch
+7535de1c552544e3a51cbb00b5e08ac59edbf3bdcfce2a63b9f319fada3f3676f47e3a00c75d91bcefd14500555ea0844f18c130ff46b20f416ea76071e5af39  0008-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch
+93d03afd83dee5f7129c36a7b81fa8fd323476507e2f53a4fbe40a026037e7dfafa23591145d7af5848d9a322d212497947a0f58ef828734552e6a6dabd00cfa  0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch
+da9eaf2f0ddbec5ee14dc26053936587e6c76fbf16846db804a18cf4d318579426ebcc566aed02daf8e34f60c08b61f5d3959305886dca9bbcdc84db057258d9  0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch
+35b9aafe7eee8138cb7aad7164a8f77c15ccdce26843cee78b5871ef91d76cad22ed0871b20f51c4b89b71afd9cfe4ba4227086e158c466558513708fe7d2a1a  0011-libiberty-copy-PIC-objects-during-build-process.patch
+9d43f844fad0ac6e1c35a2b6f461f9278ae09e468f2c9ae8adc43accbe6934994aa10d3a433644d1393a4a76e3caed69e3191db7f3c0c24b4e7a0a0a0cbac3f1  0012-libgcc_s.patch
+b2c4921c5eef33ee43a92ab5ec7f09d5d3adb49a2416595001e6376ffdf652ef9d0dc21778c3a86e45334290dbe467a4e891ed34a6522e0c72f746def22e8663  0013-nopie.patch
+0b50ad15115192699efa9fda3d4fb1c2fa95da06d7880ba34615b40c19a8256e1fe364da39f5c70dc22fbccf21db2de5900932afef68948722eeb25e435262f8  0014-ada-fix-shared-linking.patch
+00097c7106625ccf02149a757366f434c48f2abe824bb8b4bf067d29308889cb6039a5e5b2d3bd2683617693b47707d549252c56eea6bc3cdc2450a8d14f46a7  0015-build-fix-CXXFLAGS_FOR_BUILD-passing.patch
+7f0bc42b93a389b614054e700b851abfbc53db391aa10cbdf6990d41396b293af78980bb39f1cf0967184d3fbf3d46ac7c7f096717b8f193ea34cbf7f37d7e91  0016-add-fortify-headers-paths.patch
+0841acbce81250f8cb140a75ff62958dfcab3bed792822baf1fe4193dd62633648343f4b66df886c12338eed88a98e591b968131416460f9f0274046019bb8ef  0017-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch
+589d538bdf692559e475e53c79869734dede0eb15228cab9ca901c9db81b0e78a0e532b20dfb05ca584ea19ff4bedd83e139ddca912a26b446c5eb6905180536  0018-DP-Use-push-state-pop-state-for-gold-as-well-when-li.patch
+2213e07bab6f5d8d3d39c732f5385f46cc8f0c84e35054139fdaf13051252d7bf11f647f54aa8456b532166b008fff0656d8f41278e34ba868dd6fe427427a3a  0019-aarch64-disable-multilib-support.patch
+a9567947471c3ba8a547a79c55e183974554bf823d9a97a165c966d7b3caad8789980e096e3b78452ece5de062bd9bb006af464bbf0c5a35b689eac3ee21e5c5  0020-s390x-disable-multilib-support.patch
+f382eb5f7c2c60c5a23fac587c9629a3059d7be0898e97a1feaf9b9cbe1ef4693cc1177eb29333e8b7944fa17487478e73958be45d5782ccb9ef501961fb9a96  0021-ppc64-le-disable-multilib-support.patch
+44ab86feb8e41e7c2b2e27accdf46194c9b80ee6a39543303dc04824f669d9fad182aabd40c9c7f6c265cf9bb71be830c257be115dc9d701d54eca3aa9ef174e  0022-x86_64-disable-multilib-support.patch
+e0763083c31485e8ac0b3724376a28af01bb6f50e1a054780b61886e4e3de2a35d127e6e353eb8d8729964ada9b5751bf05bdd51df539667008216db38f228a3  0023-riscv-disable-multilib-support.patch
+ab88a2f63e3545bbc36537aa9a86f2c6c35e41bbf702d6e13743a405cdac4f901eed5737189b780da96647fea9f5d863fdc76373f25a00064106dcb5514d6d87  0024-always-build-libgcc_eh.a.patch
+8fdbe0c8bf4ca60f458a33e59027de03d15ac91933fe46d8ca62119346d20b9bc2447c0bf22bceb63d0cf8613ab61512d9197f4e6c2224af473b63ef9f254295  0025-ada-libgnarl-compatibility-for-musl.patch
+30369bea84020c32d514196ba3adb3d09d2d0359af5550bd3f9719aa357e44b2f695623c1d2a99416e120dc86896c196c5dd4f638183dced4799604137385367  0026-ada-musl-support-fixes.patch
+3f9a406d7d2ce34951215ffbcadb49a45e55ad5c24ab9097c0e5e92383e43b876872ccd2a7e7def2833ab204975ee5733f8bcf90934db9fa9c4f6f56c62081f6  0027-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
+720a4001f9a1fa4122e456077ecff8d3eb8af7c83d0a81f9da6a6cca05b23664206a82a349e34482c48bfe40e99aa5f21567613d0913f6a24f282bc84a994496  0028-configure-fix-detection-of-atomic-builtins-in-libato.patch
+2044c23b23726965c0a6fd39f616cc464badd650947cb40495eeabd906a3af629878c1d28b403b8eb46b30a1a0ba39083023290d62f0c99ccf070063226e3f8f  0029-libstdc-do-not-throw-exceptions-for-non-C-locales-on.patch
+58e8415612e1042329ad114471852c19f6bf15bf3bfd7cd81ceeafa75778bcc28410a01071a7c8cbf12b8f549acd85723215772813deedb8f266e28b9e01a353  0030-gdc-unconditionally-link-libgphobos-against-libucont.patch
+d47b559075f40d526235f47b91da1d0cf6bfe6c5b7311bbfe08af9dd6e8f27e6c7cd82e3b2d529aab0536246fc56e2d42c089b22cacb0e7f09ca4a9d07556994  0031-druntime-link-against-libucontext-on-all-platforms.patch
+b325035cb7122d79c6b42ca6d3fc9e02319ed2f7cddb0639dff25d2798d2ce63812cd623462cdf95e21c9ffbf2412193f8b9fc89a4c36fa5a6a041661ac7399d  0032-libgnat-time_t-is-always-64-bit-on-musl-libc.patch
+c474f34e6f9a4239d486a65141a133dbe8ce91427d502a57a9fd6eb403478a2b5715ba74f24c1cc0761e16eec77ba2c1ca921fb7d7bc1e040fc3703fc9559e75  0033-libphobos-do-not-use-LFS64-symbols.patch
+c4482ffc36e7894b2140800159f4cbc9a3e9011e43a69b69f4fa92d5a11e2ee645c7e21df4423dd1e0636e8890849a5719647bfbdf84f951d638f8f488cb718c  0034-libgo-fix-lfs64-use.patch
+cc1e10ac6e72db816f09325e301103109cc212a6f3de3ce0b9b038d149233c467319d203941695dbf3d7b9e2dcbbcd17609cdb056e831fcc323cd592423882d8  0036-PR110792-Early-clobber-issues-with-rot32di2-on-i386.patch
+d834f5f95f4ebe70ec0af0748c8632c99a4f57b69dc14db1a38becdfcb03406b32febf39f772f37bd145538147099fa7433edce845e14ee77cd8f38fd9774fc1  0037-loongarch-disable-multilib-support.patch
+"
diff --git a/main/gcc/ada-musl.patch b/main/gcc/ada-musl.patch
deleted file mode 100644
index 1487f4a57d6..00000000000
--- a/main/gcc/ada-musl.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
-index 3b0aea9..ee0bb69 100644
---- a/gcc/ada/adaint.c
-+++ b/gcc/ada/adaint.c
-@@ -76,6 +76,11 @@
- #include <sys/param.h>
- #include <sys/pstat.h>
- #endif
-+ 
-+#if defined (linux)
-+#define _GNU_SOURCE 1
-+#include <sched.h>
-+#endif
- 
- #ifdef __PikeOS__
- #define __BSD_VISIBLE 1
-@@ -3255,7 +3260,6 @@ __gnat_lwp_self (void)
- #endif
- 
- #if defined (__linux__)
--#include <sched.h>
- 
- /* glibc versions earlier than 2.7 do not define the routines to handle
-    dynamically allocated CPU sets. For these targets, we use the static
-@@ -3265,7 +3269,7 @@ __gnat_lwp_self (void)
- 
- /* Dynamic cpu sets */
- 
--cpu_set_t *
-+void *
- __gnat_cpu_alloc (size_t count)
- {
-   return CPU_ALLOC (count);
-@@ -3278,33 +3282,33 @@ __gnat_cpu_alloc_size (size_t count)
- }
- 
- void
--__gnat_cpu_free (cpu_set_t *set)
-+__gnat_cpu_free (void *set)
- {
--  CPU_FREE (set);
-+  CPU_FREE ((cpu_set_t *) set);
- }
- 
- void
--__gnat_cpu_zero (size_t count, cpu_set_t *set)
-+__gnat_cpu_zero (size_t count, void *set)
- {
--  CPU_ZERO_S (count, set);
-+  CPU_ZERO_S (count, (cpu_set_t *) set);
- }
- 
- void
--__gnat_cpu_set (int cpu, size_t count, cpu_set_t *set)
-+__gnat_cpu_set (int cpu, size_t count, void *set)
- {
-   /* Ada handles CPU numbers starting from 1, while C identifies the first
-      CPU by a 0, so we need to adjust. */
--  CPU_SET_S (cpu - 1, count, set);
-+  CPU_SET_S (cpu - 1, count, (cpu_set_t *) set);
- }
- 
- #else /* !CPU_ALLOC */
- 
- /* Static cpu sets */
- 
--cpu_set_t *
-+void *
- __gnat_cpu_alloc (size_t count ATTRIBUTE_UNUSED)
- {
--  return (cpu_set_t *) xmalloc (sizeof (cpu_set_t));
-+  return xmalloc (sizeof (cpu_set_t));
- }
- 
- size_t
-@@ -3314,23 +3318,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED)
- }
- 
- void
--__gnat_cpu_free (cpu_set_t *set)
-+__gnat_cpu_free (void *set)
- {
-   free (set);
- }
- 
- void
--__gnat_cpu_zero (size_t count ATTRIBUTE_UNUSED, cpu_set_t *set)
-+__gnat_cpu_zero (size_t count ATTRIBUTE_UNUSED, void *set)
- {
--  CPU_ZERO (set);
-+  CPU_ZERO ((cpu_set_t *) set);
- }
- 
- void
--__gnat_cpu_set (int cpu, size_t count ATTRIBUTE_UNUSED, cpu_set_t *set)
-+__gnat_cpu_set (int cpu, size_t count ATTRIBUTE_UNUSED, void *set)
- {
-   /* Ada handles CPU numbers starting from 1, while C identifies the first
-      CPU by a 0, so we need to adjust. */
--  CPU_SET (cpu - 1, set);
-+  CPU_SET (cpu - 1, (cpu_set_t *) set);
- }
- #endif /* !CPU_ALLOC */
- #endif /* __linux__ */
-diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h
-index 0d12f7e..a063b47 100644
---- a/gcc/ada/adaint.h
-+++ b/gcc/ada/adaint.h
-@@ -316,13 +316,11 @@ extern void   *__gnat_lwp_self			   (void);
- 
- /* Routines for interface to required CPU set primitives */
- 
--#include <sched.h>
--
--extern cpu_set_t *__gnat_cpu_alloc                 (size_t);
-+extern void * __gnat_cpu_alloc                 (size_t);
- extern size_t __gnat_cpu_alloc_size                (size_t);
--extern void   __gnat_cpu_free                  (cpu_set_t *);
--extern void   __gnat_cpu_zero                      (size_t, cpu_set_t *);
--extern void   __gnat_cpu_set                       (int, size_t, cpu_set_t *);
-+extern void   __gnat_cpu_free                  (void *);
-+extern void   __gnat_cpu_zero                      (size_t, void *);
-+extern void   __gnat_cpu_set                       (int, size_t, void *);
- #endif
- 
- #if defined (_WIN32)
---- a/gcc/ada/Makefile.rtl	2019-05-14 21:18:45.217455681 +0200
-+++ b/gcc/ada/Makefile.rtl	2019-05-14 21:21:30.686464218 +0200
-@@ -1521,7 +1521,7 @@
-   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
-   g-sercom.adb<libgnat/g-sercom__linux.adb \
--  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   a-exetim.adb<libgnarl/a-exetim__posix.adb \
-   a-exetim.ads<libgnarl/a-exetim__default.ads \
-   s-linux.ads<libgnarl/s-linux.ads \
-@@ -2073,7 +2073,7 @@
-   s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
-   g-sercom.adb<libgnat/g-sercom__linux.adb \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
--  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-   system.ads<libgnat/system-linux-ppc.ads
-@@ -2102,7 +2102,7 @@
- endif
- 
- # ARM linux, GNU eabi
--ifeq ($(strip $(filter-out arm% linux-gnueabi%,$(target_cpu) $(target_os))),)
-+ifeq ($(strip $(filter-out arm% linux-gnueabi% linux-musleabi% linux-muslgnueabi%,$(target_cpu) $(target_os))),)
-   LIBGNAT_TARGET_PAIRS = \
-   a-intnam.ads<libgnarl/a-intnam__linux.ads \
-   s-inmaop.adb<libgnarl/s-inmaop__posix.adb \
-@@ -2297,7 +2297,7 @@
-   s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \
-   g-sercom.adb<libgnat/g-sercom__linux.adb \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
--  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(ATOMICS_BUILTINS_TARGET_PAIRS) \
-   system.ads<libgnat/system-linux-ia64.ads
-@@ -2394,7 +2394,7 @@
-   s-taspri.ads<libgnarl/s-taspri__posix.ads \
-   g-sercom.adb<libgnat/g-sercom__linux.adb \
-   $(TRASYM_DWARF_UNIX_PAIRS) \
--  s-tsmona.adb<libgnat/s-tsmona__linux.adb \
-+  s-tsmona.adb<libgnat/s-tsmona.adb \
-   $(ATOMICS_TARGET_PAIRS) \
-   $(X86_64_TARGET_PAIRS) \
-   system.ads<libgnat/system-linux-x86.ads
---- a/gcc/ada/terminals.c	2019-01-08 10:54:04.000000000 +0100
-+++ b/gcc/ada/terminals.c	2019-05-15 13:14:09.935742526 +0200
-@@ -1136,7 +1136,7 @@
- /* POSIX does not specify how to open the master side of a terminal.Several
-    methods are available (system specific):
-       1- using a cloning device (USE_CLONE_DEVICE)
--      2- getpt                  (USE_GETPT)
-+      2- posix_openpt           (USE_POSIX_OPENPT)
-       3- openpty                (USE_OPENPTY)
- 
-    When using the cloning device method, the macro USE_CLONE_DEVICE should
-@@ -1150,7 +1150,7 @@
- #if defined (__APPLE__) || defined (BSD)
- #define USE_OPENPTY
- #elif defined (__linux__)
--#define USE_GETPT
-+#define USE_POSIX_OPENPT
- #elif defined (__sun__)
- #define USE_CLONE_DEVICE "/dev/ptmx"
- #elif defined (_AIX)
-@@ -1199,8 +1199,8 @@
-    int  master_fd   = -1;
-    char *slave_name = NULL;
- 
--#ifdef USE_GETPT
--  master_fd = getpt ();
-+#if defined(USE_POSIX_OPENPT)
-+  master_fd = posix_openpt(O_RDWR | O_NOCTTY);
- #elif defined (USE_OPENPTY)
-   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
- #elif defined (USE_CLONE_DEVICE)
diff --git a/main/gcc/ada-shared.patch b/main/gcc/ada-shared.patch
deleted file mode 100644
index 6f1c16aff97..00000000000
--- a/main/gcc/ada-shared.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: b/gcc/ada/link.c
-===================================================================
---- a/gcc/ada/link.c
-+++ b/gcc/ada/link.c
-@@ -105,9 +105,9 @@
- 
- #elif defined (__FreeBSD__)
- const char *__gnat_object_file_option = "-Wl,@";
--const char *__gnat_run_path_option = "-Wl,-rpath,";
--char __gnat_shared_libgnat_default = STATIC;
--char __gnat_shared_libgcc_default = STATIC;
-+const char *__gnat_run_path_option = "";
-+char __gnat_shared_libgnat_default = SHARED;
-+char __gnat_shared_libgcc_default = SHARED;
- int __gnat_link_max = 8192;
- unsigned char __gnat_objlist_file_supported = 1;
- const char *__gnat_object_library_extension = ".a";
-@@ -127,9 +127,9 @@
- 
- #elif defined (linux) || defined(__GLIBC__)
- const char *__gnat_object_file_option = "-Wl,@";
--const char *__gnat_run_path_option = "-Wl,-rpath,";
--char __gnat_shared_libgnat_default = STATIC;
--char __gnat_shared_libgcc_default = STATIC;
-+const char *__gnat_run_path_option = "";
-+char __gnat_shared_libgnat_default = SHARED;
-+char __gnat_shared_libgcc_default = SHARED;
- int __gnat_link_max = 8192;
- unsigned char __gnat_objlist_file_supported = 1;
- const char *__gnat_object_library_extension = ".a";
diff --git a/main/gcc/fix-cxxflags-passing.patch b/main/gcc/fix-cxxflags-passing.patch
deleted file mode 100644
index 8eb1de77d5c..00000000000
--- a/main/gcc/fix-cxxflags-passing.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gcc-4.8.1/Makefile.in.orig
-+++ gcc-4.8.1/Makefile.in
-@@ -169,6 +169,7 @@
- # built for the build system to override those in BASE_FLAGS_TO_PASSS.
- EXTRA_BUILD_FLAGS = \
- 	CFLAGS="$(CFLAGS_FOR_BUILD)" \
-+	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
- 	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
- 
- # This is the list of directories to built for the host system.
diff --git a/main/gcc/gcc-4.9-musl-fortify.patch b/main/gcc/gcc-4.9-musl-fortify.patch
deleted file mode 100644
index daae954c806..00000000000
--- a/main/gcc/gcc-4.9-musl-fortify.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-4.9.2/gcc/config/linux.h.orig	2015-03-09 13:27:13.289736710 +0000
-+++ gcc-4.9.2/gcc/config/linux.h	2015-03-09 13:29:32.295625046 +0000
-@@ -146,6 +146,8 @@
- 
- #ifdef NATIVE_SYSTEM_HEADER_DIR
- #define INCLUDE_DEFAULTS_MUSL_NATIVE			\
-+    { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 2 },	\
-+    { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 0 },	\
-     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
-     { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
- #else
diff --git a/main/gcc/gcc-6.1-musl-libssp.patch b/main/gcc/gcc-6.1-musl-libssp.patch
deleted file mode 100644
index fe5c61434d4..00000000000
--- a/main/gcc/gcc-6.1-musl-libssp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Timo Teräs <timo.teras@iki.fi>
-
-Alpine musl package provides libssp_nonshared.a. We link to it unconditionally,
-as otherwise we get link failures if some objects are -fstack-protector built
-and final link happens with -fno-stack-protector. This seems to be the common
-case when bootstrapping gcc, the piepatches do not seem to fully fix the
-crosstoolchain and  bootstrap sequence wrt. stack-protector flag usage.
-
---- gcc-6.1.0/gcc/gcc.c.orig
-+++ gcc-6.1.0/gcc/gcc.c
-@@ -870,8 +870,7 @@
- 
- #ifndef LINK_SSP_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
--#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
--		       "|fstack-protector-strong|fstack-protector-explicit:}"
-+#define LINK_SSP_SPEC "-lssp_nonshared"
- #else
- #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
- 		       "|fstack-protector-strong|fstack-protector-explicit" \
diff --git a/main/gcc/gcc-as-needed-gold.patch b/main/gcc/gcc-as-needed-gold.patch
deleted file mode 100644
index e22e59bce0c..00000000000
--- a/main/gcc/gcc-as-needed-gold.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-# DP: Use --push-state/--pop-state for gold as well when linking libtsan.
-
-Index: b/gcc/gcc.c
-===================================================================
---- a/gcc/gcc.c
-+++ b/gcc/gcc.c
-@@ -693,10 +693,10 @@ proper position among the other output f
- #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- #define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
--		     " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-libasan:--push-state --no-as-needed}" \
- 		     " -lasan " \
- 		     " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-libasan:--pop-state}" \
- 		     STATIC_LIBASAN_LIBS
- #else
- #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
-@@ -714,10 +714,10 @@ proper position among the other output f
- #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- #define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
--		     " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-libtsan:--push-state --no-as-needed}" \
- 		     " -ltsan " \
- 		     " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-libtsan:--pop-state}" \
- 		     STATIC_LIBTSAN_LIBS
- #else
- #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
-@@ -735,10 +735,10 @@ proper position among the other output f
- #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- #define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
--		     " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-liblsan:--push-state --no-as-needed}" \
- 		     " -llsan " \
- 		     " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-liblsan:--pop-state}" \
- 		     STATIC_LIBLSAN_LIBS
- #else
- #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
-@@ -754,10 +754,10 @@ proper position among the other output f
-   " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
- #ifdef HAVE_LD_STATIC_DYNAMIC
- #define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
--		     " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
-+		     " %{!static-libubsan:--push-state --no-as-needed}" \
- 		     " -lubsan " \
- 		     " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
--		     " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
-+		     " %{!static-libubsan:--pop-state}" \
- 		     STATIC_LIBUBSAN_LIBS
- #else
- #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
diff --git a/main/gcc/gcc-go.post-install b/main/gcc/gcc-go.post-install
new file mode 100644
index 00000000000..6805fa7cf36
--- /dev/null
+++ b/main/gcc/gcc-go.post-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+cat 1>&2 <<EOF
+*
+* gcc-go is used in Alpine for bootstrapping Go.
+* It is currently discouraged to use it for other purposes.
+*
+EOF
diff --git a/main/gcc/gcc-pure64-mips.patch b/main/gcc/gcc-pure64-mips.patch
deleted file mode 100644
index d78f2838102..00000000000
--- a/main/gcc/gcc-pure64-mips.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b8c4e45d052adc247341066f748421743704b481 Mon Sep 17 00:00:00 2001
-From: Nils Andreas Svee <me@lochnair.net>
-Date: Thu, 21 Dec 2017 03:14:33 +0100
-Subject: [PATCH] Pure 64-bit MIPS
-
----
- gcc/config/mips/mips.h    | 8 ++++----
- gcc/config/mips/t-linux64 | 6 +++---
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
-index 803ab98e7..afd74752f 100644
---- a/gcc/config/mips/mips.h
-+++ b/gcc/config/mips/mips.h
-@@ -3330,11 +3330,11 @@ struct GTY(())  machine_function {
- /* If we are *not* using multilibs and the default ABI is not ABI_32 we
-    need to change these from /lib and /usr/lib.  */
- #if MIPS_ABI_DEFAULT == ABI_N32
--#define STANDARD_STARTFILE_PREFIX_1 "/lib32/"
--#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib32/"
-+#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
-+#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
- #elif MIPS_ABI_DEFAULT == ABI_64
--#define STANDARD_STARTFILE_PREFIX_1 "/lib64/"
--#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib64/"
-+#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
-+#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
- #endif
- 
- /* Load store bonding is not supported by micromips and fix_24k.  The
-diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64
-index 16c8adf85..bb46204db 100644
---- a/gcc/config/mips/t-linux64
-+++ b/gcc/config/mips/t-linux64
-@@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64
- MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el)
- MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
- MULTILIB_OSDIRNAMES = \
--	../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
--	../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
--	../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
-+        ../lib \
-+        ../lib32 \
-+        ../lib
--- 
-2.15.1
-
diff --git a/main/gcc/gcc-pure64.patch b/main/gcc/gcc-pure64.patch
deleted file mode 100644
index 2c350fe5ad0..00000000000
--- a/main/gcc/gcc-pure64.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- ./gcc/config/i386/t-linux64.orig	2013-01-14 16:32:37.000000000 +0000
-+++ ./gcc/config/i386/t-linux64	2013-04-22 06:12:32.984439677 +0000
-@@ -34,6 +34,6 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
---- ./gcc/config/aarch64/t-aarch64-linux.orig
-+++ ./gcc/config/aarch64/t-aarch64-linux
-@@ -22,7 +22,7 @@
- LIB1ASMFUNCS = _aarch64_sync_cache_range
- 
- AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
--MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
-+MULTILIB_OSDIRNAMES = mabi.lp64=../lib
- MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
- 
- MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32
---- ./gcc/config/s390/t-linux64.orig
-+++ ./gcc/config/s390/t-linux64
-@@ -7,5 +7,5 @@
- MULTILIB_OPTIONS = m64/m31
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
--MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
-
---- ./gcc/config/rs6000/t-linux.orig
-+++ ./gcc/config/rs6000/t-linux
-@@ -2,7 +2,8 @@
- # or soft-float.
- ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
- ifneq (,$(findstring powerpc64,$(target)))
--MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
-+MULTILIB_OSDIRNAMES := m64=../lib
-+MULTILIB_OSDIRNAMES += m32=../lib32
- else
- ifneq (,$(findstring spe,$(target)))
- MULTIARCH_DIRNAME := powerpc-linux-gnuspe$(if $(findstring 8548,$(with_cpu)),,v1)
-@@ -14,7 +15,8 @@
- MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))
- endif
- ifneq (,$(findstring powerpc64le,$(target)))
--MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))
-+MULTILIB_OSDIRNAMES := m64=../lib
-+MULTILIB_OSDIRNAMES += m32=../lib32
- endif
- endif
- 
---- ./gcc/config/rs6000/t-linux64.orig
-+++ ./gcc/config/rs6000/t-linux64
-@@ -28,8 +28,8 @@
- MULTILIB_OPTIONS    := m64/m32
- MULTILIB_DIRNAMES   := 64 32
- MULTILIB_EXTRA_OPTS := 
--MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
--MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
-+MULTILIB_OSDIRNAMES := m64=../lib
-+MULTILIB_OSDIRNAMES += m32=../lib32
- 
- rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
- 	$(COMPILE) $<
---- ./gcc/config/rs6000/t-linux64bele.orig
-+++ ./gcc/config/rs6000/t-linux64bele
-@@ -2,6 +2,6 @@
- 
- MULTILIB_OPTIONS    += mlittle
- MULTILIB_DIRNAMES   += le
--MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))))))
--MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES)))
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
---- ./gcc/config/rs6000/t-linux64lebe.orig
-+++ ./gcc/config/rs6000/t-linux64lebe
-@@ -2,6 +2,6 @@
- 
- MULTILIB_OPTIONS    += mbig
- MULTILIB_DIRNAMES   += be
--MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES))))))
--MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES)))
-+MULTILIB_OSDIRNAMES := m64=../lib
-+MULTILIB_OSDIRNAMES += m32=../lib32
- MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
diff --git a/main/gcc/libgcc-always-build-gcceh.a.patch b/main/gcc/libgcc-always-build-gcceh.a.patch
deleted file mode 100644
index 74ae8973048..00000000000
--- a/main/gcc/libgcc-always-build-gcceh.a.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Highly inspired by:
-  http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
-
-diff -durN gcc-4.6.0.orig/libgcc/Makefile.in gcc-4.6.0/libgcc/Makefile.in
---- gcc-4.6.0.orig/libgcc/Makefile.in	2011-01-26 05:19:58.000000000 +0100
-+++ gcc-4.6.0/libgcc/Makefile.in	2011-09-12 18:17:12.743718974 +0200
-@@ -772,8 +772,9 @@
- libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
- endif
- 
-+all: libgcc_eh.a
- ifeq ($(enable_shared),yes)
--all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
-+all: libgcc_s$(SHLIB_EXT)
- ifneq ($(LIBUNWIND),)
- all: libunwind$(SHLIB_EXT)
- endif
-@@ -950,10 +951,6 @@
- install-shared:
- 	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
- 
--	$(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
--	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
--
- 	$(subst @multilib_dir@,$(MULTIDIR),$(subst \
- 		@shlib_base_name@,libgcc_s,$(subst \
- 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))
-@@ -968,6 +965,10 @@
- 	chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a
- 	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a
- 
-+	$(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/
-+	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a
-+
- 	parts="$(INSTALL_PARTS)";				\
- 	for file in $$parts; do					\
- 	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
diff --git a/main/gcc/libgnarl-musl.patch b/main/gcc/libgnarl-musl.patch
deleted file mode 100644
index 7e35cda6820..00000000000
--- a/main/gcc/libgnarl-musl.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -rup gcc-8.2.0/gcc/ada/libgnarl/s-osinte__linux.ads gcc-8.2.0-new/gcc/ada/libgnarl/s-osinte__linux.ads
---- gcc-8.2.0/gcc/ada/libgnarl/s-osinte__linux.ads	2018-01-11 00:55:25.000000000 -0800
-+++ gcc-8.2.0-new/gcc/ada/libgnarl/s-osinte__linux.ads	2018-11-01 16:16:23.372452951 -0700
-@@ -394,12 +394,6 @@ package System.OS_Interface is
-    PTHREAD_RWLOCK_PREFER_WRITER_NP              : constant := 1;
-    PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP : constant := 2;
- 
--   function pthread_rwlockattr_setkind_np
--     (attr : access pthread_rwlockattr_t;
--      pref : int) return int;
--   pragma Import
--     (C, pthread_rwlockattr_setkind_np, "pthread_rwlockattr_setkind_np");
--
-    function pthread_rwlock_init
-      (mutex : access pthread_rwlock_t;
-       attr  : access pthread_rwlockattr_t) return int;
-@@ -464,11 +458,6 @@ package System.OS_Interface is
-       protocol : int) return int;
-    pragma Import (C, pthread_mutexattr_setprotocol);
- 
--   function pthread_mutexattr_setprioceiling
--     (attr        : access pthread_mutexattr_t;
--      prioceiling : int) return int;
--   pragma Import (C, pthread_mutexattr_setprioceiling);
--
-    type struct_sched_param is record
-       sched_priority : int;  --  scheduling priority
-    end record;
-diff -rup gcc-8.2.0/gcc/ada/libgnarl/s-taprop__linux.adb gcc-8.2.0-new/gcc/ada/libgnarl/s-taprop__linux.adb
---- gcc-8.2.0/gcc/ada/libgnarl/s-taprop__linux.adb	2018-01-11 00:55:25.000000000 -0800
-+++ gcc-8.2.0-new/gcc/ada/libgnarl/s-taprop__linux.adb	2018-11-13 11:28:36.433964449 -0800
-@@ -202,9 +202,6 @@ package body System.Task_Primitives.Oper
-    pragma Import
-      (C, GNAT_pthread_condattr_setup, "__gnat_pthread_condattr_setup");
- 
--   function GNAT_has_cap_sys_nice return C.int;
--   pragma Import
--     (C, GNAT_has_cap_sys_nice, "__gnat_has_cap_sys_nice");
-    --  We do not have pragma Linker_Options ("-lcap"); here, because this
-    --  library is not present on many Linux systems. 'libcap' is the Linux
-    --  "capabilities" library, called by __gnat_has_cap_sys_nice.
-@@ -214,38 +211,6 @@ package body System.Task_Primitives.Oper
-    --  Convert Ada priority to Linux priority. Priorities are 1 .. 99 on
-    --  GNU/Linux, so we map 0 .. 98 to 1 .. 99.
- 
--   function Get_Ceiling_Support return Boolean;
--   --  Get the value of the Ceiling_Support constant (see below).
--   --  Note well: If this function or related code is modified, it should be
--   --  tested by hand, because automated testing doesn't exercise it.
--
--   -------------------------
--   -- Get_Ceiling_Support --
--   -------------------------
--
--   function Get_Ceiling_Support return Boolean is
--      Ceiling_Support : Boolean := False;
--   begin
--      if Locking_Policy /= 'C' then
--         return False;
--      end if;
--
--      declare
--         function geteuid return Integer;
--         pragma Import (C, geteuid, "geteuid");
--         Superuser : constant Boolean := geteuid = 0;
--         Has_Cap : constant C.int := GNAT_has_cap_sys_nice;
--         pragma Assert (Has_Cap in 0 | 1);
--      begin
--         Ceiling_Support := Superuser or else Has_Cap = 1;
--      end;
--
--      return Ceiling_Support;
--   end Get_Ceiling_Support;
--
--   pragma Warnings (Off, "non-static call not allowed in preelaborated unit");
--   Ceiling_Support : constant Boolean := Get_Ceiling_Support;
--   pragma Warnings (On, "non-static call not allowed in preelaborated unit");
-    --  True if the locking policy is Ceiling_Locking, and the current process
-    --  has permission to use this policy. The process has permission if it is
-    --  running as 'root', or if the capability was set by the setcap command,
-@@ -348,7 +313,9 @@ package body System.Task_Primitives.Oper
-    -- Init_Mutex --
-    ----------------
- 
-+   pragma Warnings (Off, "formal parameter * is not referenced");
-    function Init_Mutex (L : RTS_Lock_Ptr; Prio : Any_Priority) return C.int is
-+   pragma Warnings (On, "formal parameter * is not referenced");
-       Mutex_Attr : aliased pthread_mutexattr_t;
-       Result, Result_2 : C.int;
- 
-@@ -360,16 +327,7 @@ package body System.Task_Primitives.Oper
-          return Result;
-       end if;
- 
--      if Ceiling_Support then
--         Result := pthread_mutexattr_setprotocol
--           (Mutex_Attr'Access, PTHREAD_PRIO_PROTECT);
--         pragma Assert (Result = 0);
--
--         Result := pthread_mutexattr_setprioceiling
--           (Mutex_Attr'Access, Prio_To_Linux_Prio (Prio));
--         pragma Assert (Result = 0);
--
--      elsif Locking_Policy = 'I' then
-+      if Locking_Policy = 'I' then
-          Result := pthread_mutexattr_setprotocol
-            (Mutex_Attr'Access, PTHREAD_PRIO_INHERIT);
-          pragma Assert (Result = 0);
-@@ -409,11 +367,6 @@ package body System.Task_Primitives.Oper
-             Result := pthread_rwlockattr_init (RWlock_Attr'Access);
-             pragma Assert (Result = 0);
- 
--            Result := pthread_rwlockattr_setkind_np
--              (RWlock_Attr'Access,
--               PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
--            pragma Assert (Result = 0);
--
-             Result := pthread_rwlock_init (L.RW'Access, RWlock_Attr'Access);
- 
-             pragma Assert (Result in 0 | ENOMEM);
diff --git a/main/gcompat/APKBUILD b/main/gcompat/APKBUILD
new file mode 100644
index 00000000000..a9ab294b436
--- /dev/null
+++ b/main/gcompat/APKBUILD
@@ -0,0 +1,91 @@
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Peter Shkenev <santurysim@gmail.com>
+pkgname=gcompat
+pkgver=1.1.0
+pkgrel=4
+pkgdesc="GNU C Library compatibility layer for musl"
+url="https://git.adelielinux.org/adelie/gcompat"
+arch="all"
+license="NCSA"
+makedepends="libucontext-dev musl-obstack-dev"
+source="https://git.adelielinux.org/adelie/gcompat/-/archive/$pkgver/gcompat-$pkgver.tar.gz"
+options="!check lib64" # No test suite
+
+provides="libc6-compat=$pkgver-r$pkgrel"
+replaces="libc6-compat"
+
+# https://sourceware.org/glibc/wiki/ABIList
+case "$CARCH" in
+armhf)
+	_ld="ld-linux-armhf.so.3"
+	ARCH="arm"
+	;;
+armv7)
+	_ld="ld-linux-armhf.so.3"
+	ARCH="arm"
+	;;
+aarch64)
+	_ld="ld-linux-aarch64.so.1"
+	ARCH="aarch64"
+	;;
+x86)
+	_ld="ld-linux.so.2"
+	ARCH="i386"
+	;;
+x86_64)
+	_ld="ld-linux-x86-64.so.2"
+	ARCH="x86_64"
+	;;
+s390x)
+	_ld="ld64.so.1"
+	ARCH="s390x"
+	;;
+ppc64le)
+	_ld="ld64.so.2"
+	ARCH="powerpc64"
+	;;
+riscv64)
+	# hardfloat
+	_ld="ld-linux-riscv64-lp64d.so.1"
+	ARCH="riscv64"
+	;;
+loongarch64)
+	# hardfloat
+	_ld="ld-linux-loongarch-lp64d.so.1"
+	ARCH="loongarch64"
+	;;
+esac
+
+build() {
+	make \
+		WITH_LIBUCONTEXT=1 \
+		WITH_OBSTACK=musl-obstack \
+		LINKER_PATH="/lib/ld-musl-$ARCH.so.1" \
+		LOADER_NAME="$_ld"
+}
+
+package() {
+	make \
+		LINKER_PATH="/lib/ld-musl-$ARCH.so.1" \
+		LOADER_NAME="$_ld" \
+		WITH_LIBUCONTEXT=1 \
+		WITH_OBSTACK=musl-obstack \
+		DESTDIR="$pkgdir" \
+		install
+
+	# Required symlink on 64-bit platforms
+	case "$CARCH" in
+	x86_64|ppc64le|aarch64|s390x|riscv64|loongarch64)
+		mkdir -p "$pkgdir"/lib64
+		ln -sfv ../lib/$_ld "$pkgdir"/lib64/$_ld
+		;;
+	esac
+
+	for i in libc.so.6 libcrypt.so.1 libm.so.6 libpthread.so.0 libresolv.so.2 librt.so.1 libutil.so.1; do
+		ln -sfv libgcompat.so.0 "$pkgdir"/lib/$i
+	done
+}
+
+sha512sums="
+8f27aa8d268586ecb647bc147a9d56704d087b0f3ac357c6c239958663ec9e9e428e6cfdb9a063ead5c2098444cc4a7c4567c18477309feb05ed3de01b24f9e8  gcompat-1.1.0.tar.gz
+"
diff --git a/main/gcr/APKBUILD b/main/gcr/APKBUILD
deleted file mode 100644
index 0f6c397a836..00000000000
--- a/main/gcr/APKBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Contributor: Rasmus Thomsen <oss@cogitri.dev>
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
-pkgname=gcr
-pkgver=3.36.0
-pkgrel=0
-pkgdesc="A library for bits of crypto UI and parsing"
-url="https://wiki.gnome.org/Projects/CryptoGlue"
-arch="all"
-license="LGPL-2.0-or-later"
-makedepends="glib-dev gtk+3.0-dev libgcrypt-dev p11-kit-dev
-	gobject-introspection-dev libxslt vala meson gtk-doc"
-checkdepends="xvfb-run dbus-x11"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-base"
-source="https://download.gnome.org/sources/gcr/${pkgver%.*}/gcr-$pkgver.tar.xz
-	allow-building-without-gpg.patch
-	dont-run-gpg-tests.patch"
-options="!check"  # Some tests are broken, see issue #11327.
-
-build() {
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--buildtype=plain \
-		-Dgpg_path=/usr/bin/gpg2 \
-		output
-	ninja -C output
-}
-
-check() {
-	xvfb-run ninja -C output test
-}
-
-package() {
-	DESTDIR="$pkgdir" ninja -C output install
-}
-
-base() {
-	depends=""
-	pkgdesc="$pkgdesc (base libraries)"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgck-1.so.* \
-		"$pkgdir"/usr/lib/libgcr-base-3.so.* \
-		"$subpkgdir"/usr/lib
-}
-
-sha512sums="0431e7971b73accc62869c9497fcff7c111c453aa6a8ff25b42f19ceae1be0aec52e0e4eb504676f967c6e4f179198c15c521278690822e3457dbc5fe512fd5e  gcr-3.36.0.tar.xz
-7cca3fd0512621129f0a0c532a3592b4ea0e49f887cf5935b1a104363d08fca05dbba470672561efa4b8b02efdbe22c948f989af26fdb32833a82383393207f0  allow-building-without-gpg.patch
-e4fc2248497e7103980e9baf9444505649ee93c657c7a82c042ae62d7c54b2764ad7bc9780467ceda5e53a23fa11dc4957898929c7d7f995d9d0d205d18d5eb7  dont-run-gpg-tests.patch"
diff --git a/main/gcr/allow-building-without-gpg.patch b/main/gcr/allow-building-without-gpg.patch
deleted file mode 100644
index 7560419e8d1..00000000000
--- a/main/gcr/allow-building-without-gpg.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Upstream: See https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/50
-diff --git a/meson.build b/meson.build
-index f19af0f..57b625b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -41,7 +41,10 @@ gobject_dep = dependency('gobject-2.0', version: '>=' + min_glib_version)
- gio_dep = dependency('gio-2.0', version: '>=' + min_glib_version)
- gio_unix_dep = dependency('gio-unix-2.0',version: '>=' + min_glib_version)
- glib_deps = [ glib_dep, gmodule_dep, gthread_dep, gobject_dep, gio_dep, gio_unix_dep, ]
--gpg_bin = find_program('gpg2', 'gpg')
-+gpg_path = get_option('gpg_path')
-+if gpg_path == ''
-+  gpg_path = find_program('gpg2', 'gpg').path()
-+endif
- libgcrypt_dep = dependency('libgcrypt', version: '>= 1')
- p11kit_dep = dependency('p11-kit-1', version: '>= 0.19.0')
- p11_system_config_modules = p11kit_dep.get_pkgconfig_variable('p11_system_config_modules')
-@@ -65,7 +68,7 @@ conf.set('HAVE_GETTEXT', true)
- conf.set('HAVE_LOCALE_H', cc.has_header('locale.h'))
- conf.set('HAVE_TIMEGM', cc.has_function('timegm'))
- conf.set('HAVE_MLOCK', cc.has_function('mlock'))
--conf.set_quoted('GPG_EXECUTABLE', gpg_bin.path())
-+conf.set_quoted('GPG_EXECUTABLE', gpg_path)
- conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version())
- config_file = configure_file(
-   output: 'config.h',
-diff --git a/meson_options.txt b/meson_options.txt
-index bbdc8e3..ae0f524 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -13,3 +13,8 @@ option('gtk_doc',
-   value: true,
-   description: 'Build the reference documentation (requires gtk-doc)',
- )
-+option('gpg_path',
-+  type: 'string',
-+  value: '',
-+  description: 'Path to gpg, autodetected if not set',
-+)
diff --git a/main/gcr/dont-run-gpg-tests.patch b/main/gcr/dont-run-gpg-tests.patch
deleted file mode 100644
index acab92442a3..00000000000
--- a/main/gcr/dont-run-gpg-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/gcr/meson.build b/gcr/meson.build
-index 254a933..8c17e7c 100644
---- a/gcr/meson.build
-+++ b/gcr/meson.build
-@@ -271,7 +271,6 @@ gcr_test_names = [
-   'record',
-   'memory-icon',
-   'gnupg-key',
--  'gnupg-collection',
-   'gnupg-process',
-   'system-prompt',
-   'ssh-askpass',
diff --git a/main/gd/APKBUILD b/main/gd/APKBUILD
index 34582ea1565..273e37c2372 100644
--- a/main/gd/APKBUILD
+++ b/main/gd/APKBUILD
@@ -1,67 +1,82 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Contributor: Nicolas Lorin <androw95220@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=gd
-pkgver=2.2.5
-pkgrel=2
+pkgver=2.3.3
+pkgrel=9
 _pkgreal=lib$pkgname
 pkgdesc="Library for the dynamic creation of images by programmers"
 url="https://libgd.github.io/"
 arch="all"
-license="custom"
-depends=
-makedepends="bash libpng-dev libjpeg-turbo-dev libwebp-dev freetype-dev zlib-dev"
-subpackages="$pkgname-dev $_pkgreal:libs"
-source="https://github.com/$_pkgreal/$_pkgreal/releases/download/$pkgname-$pkgver/$_pkgreal-$pkgver.tar.xz
-	CVE-2018-1000222.patch
-	CVE-2018-5711.patch
-	CVE-2019-6977.patch
-	CVE-2019-6978.patch
+license="GD"
+makedepends="
+	fontconfig-dev
+	freetype-dev
+	libavif-dev
+	libjpeg-turbo-dev
+	libpng-dev
+	libwebp-dev
+	libxpm-dev
+	tiff-dev
+	zlib-dev
 	"
+checkdepends="font-liberation"
+subpackages="$pkgname-dev $pkgname-doc $_pkgreal:libs"
+source="https://github.com/$_pkgreal/$_pkgreal/releases/download/gd-$pkgver/$_pkgreal-$pkgver.tar.xz"
 builddir="$srcdir/$_pkgreal-$pkgver"
+
 case "$CARCH" in
-	aarch64|x86|ppc64le|s390x) options="!check" ;; # https://github.com/libgd/libgd/issues/359
+	# https://github.com/libgd/libgd/issues/359
+	aarch64|mips*|ppc64le|riscv64|s390x|x86|loongarch64) options="!check";;
 esac
 
 # secfixes:
+#   2.3.0-r1:
+#     - CVE-2021-38115
+#     - CVE-2021-40145
+#   2.3.0-r0:
+#     - CVE-2019-11038
+#     - CVE-2018-14553
+#     - CVE-2017-6363
 #   2.2.5-r2:
-#   - CVE-2018-5711
-#   - CVE-2019-6977
-#   - CVE-2019-6978
+#     - CVE-2018-5711
+#     - CVE-2019-6977
+#     - CVE-2019-6978
 #   2.2.5-r1:
-#   - CVE-2018-1000222
+#     - CVE-2018-1000222
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--without-fontconfig \
-		--disable-werror
+		--infodir=/usr/share/info
 	make
 }
 
 check() {
-	cd "$builddir"
-	make check
+	TMPDIR=/tmp make check
 }
 
 package() {
-	cd "$builddir"
 	DESTDIR="$pkgdir" make install
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
 dev() {
-       default_dev
-       depends="$pkgname perl"
-       mv "$pkgdir"/usr/bin/bdftogd "$subpkgdir"/usr/bin
+	default_dev
+	depends="$pkgname perl"
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/bdftogd "$subpkgdir"/usr/bin/
 }
 
-sha512sums="e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b  libgd-2.2.5.tar.xz
-d12462f1b159d50b9032435e9767a5d76e1797a88be950ed33dda7aa17005b7cb60560d04b9520e46d8111e1669d42ce28cb2c508f9c8825d545ac0335d2a10b  CVE-2018-1000222.patch
-b23929f10ad75fa97d2ff797ef44d185cfe6de4f26b649e8e507b6fc41ebdb527ab4633d10df955c92d677428d9ed1707d9997954a1bcfb0070995191211d886  CVE-2018-5711.patch
-5214ac4148c618f3fef3bb3b6675e41a76e31465cd8dac326ee99dc1ae4cfe760749997d2941743efa48e79b8dbdb536d6b6d79d9bc4e5363f2c50da52ab5cac  CVE-2019-6977.patch
-2f70f041b531a23d0bac5c5370a3fb135ca8facaa7baf1554baf35135cc9c6e21de9c09400d939e133ad090b9aa23fa901ea7b5cd9ea20d11edc38257601eb97  CVE-2019-6978.patch"
+sha512sums="
+aa49d4381d604a4360d556419d603df2ffd689a6dcc10f8e5e1d158ddaa3ab89912f6077ca77da4e370055074007971cf6d356ec9bf26dcf39bcff3208bc7e6c  libgd-2.3.3.tar.xz
+"
diff --git a/main/gd/CVE-2018-1000222.patch b/main/gd/CVE-2018-1000222.patch
deleted file mode 100644
index 80f9712bf8e..00000000000
--- a/main/gd/CVE-2018-1000222.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From ac16bdf2d41724b5a65255d4c28fb0ec46bc42f5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 14 Jul 2018 13:54:08 -0400
-Subject: [PATCH] bmp: check return value in gdImageBmpPtr
-
-Closes #447.
----
- src/gd_bmp.c | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/src/gd_bmp.c b/src/gd_bmp.c
-index bde0b9d3..78f40d9a 100644
---- a/src/gd_bmp.c
-+++ b/src/gd_bmp.c
-@@ -47,6 +47,8 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp
- static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp_hdr_t *header);
- static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info);
- 
-+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression);
-+
- #define BMP_DEBUG(s)
- 
- static int gdBMPPutWord(gdIOCtx *out, int w)
-@@ -87,8 +89,10 @@ BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression)
- 	void *rv;
- 	gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
- 	if (out == NULL) return NULL;
--	gdImageBmpCtx(im, out, compression);
--	rv = gdDPExtractData(out, size);
-+	if (!_gdImageBmpCtx(im, out, compression))
-+		rv = gdDPExtractData(out, size);
-+	else
-+		rv = NULL;
- 	out->gd_free(out);
- 	return rv;
- }
-@@ -141,6 +145,11 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression)
- 		compression - whether to apply RLE or not.
- */
- BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
-+{
-+	_gdImageBmpCtx(im, out, compression);
-+}
-+
-+static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
- {
- 	int bitmap_size = 0, info_size, total_size, padding;
- 	int i, row, xpos, pixel;
-@@ -148,6 +157,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
- 	unsigned char *uncompressed_row = NULL, *uncompressed_row_start = NULL;
- 	FILE *tmpfile_for_compression = NULL;
- 	gdIOCtxPtr out_original = NULL;
-+	int ret = 1;
- 
- 	/* No compression if its true colour or we don't support seek */
- 	if (im->trueColor) {
-@@ -325,6 +335,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
- 		out_original = NULL;
- 	}
- 
-+	ret = 0;
- cleanup:
- 	if (tmpfile_for_compression) {
- #ifdef _WIN32
-@@ -338,7 +349,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression)
- 	if (out_original) {
- 		out_original->gd_free(out_original);
- 	}
--	return;
-+	return ret;
- }
- 
- static int compress_row(unsigned char *row, int length)
diff --git a/main/gd/CVE-2018-5711.patch b/main/gd/CVE-2018-5711.patch
deleted file mode 100644
index a90689a321c..00000000000
--- a/main/gd/CVE-2018-5711.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Wed, 29 Nov 2017 19:37:38 +0100
-Subject: Fix #420: Potential infinite loop in gdImageCreateFromGifCtx
-origin: https://github.com/libgd/libgd/commit/a11f47475e6443b7f32d21f2271f28f417e2ac04
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2018-5711
-Bug-Debian: https://bugs.debian.org/887485
-Bug: https://github.com/libgd/libgd/issues/420
-
-Due to a signedness confusion in `GetCode_` a corrupt GIF file can
-trigger an infinite loop.  Furthermore we make sure that a GIF without
-any palette entries is treated as invalid *after* open palette entries
-have been removed.
-
-CVE-2018-5711
-
-See also https://bugs.php.net/bug.php?id=75571.
----
-
---- a/src/gd_gif_in.c
-+++ b/src/gd_gif_in.c
-@@ -335,11 +335,6 @@ terminated:
- 		return 0;
- 	}
- 
--	if(!im->colorsTotal) {
--		gdImageDestroy(im);
--		return 0;
--	}
--
- 	/* Check for open colors at the end, so
- 	 * we can reduce colorsTotal and ultimately
- 	 * BitsPerPixel */
-@@ -351,6 +346,11 @@ terminated:
- 		}
- 	}
- 
-+	if(!im->colorsTotal) {
-+		gdImageDestroy(im);
-+		return 0;
-+	}
-+
- 	return im;
- }
- 
-@@ -447,7 +447,7 @@ static int
- GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroDataBlockP)
- {
- 	int i, j, ret;
--	unsigned char count;
-+	int count;
- 
- 	if(flag) {
- 		scd->curbit = 0;
diff --git a/main/gd/CVE-2019-6977.patch b/main/gd/CVE-2019-6977.patch
deleted file mode 100644
index 0b67a596c6b..00000000000
--- a/main/gd/CVE-2019-6977.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Heap-based buffer overflow in gdImageColorMatch
-Origin: other, https://gist.github.com/cmb69/1f36d285eb297ed326f5c821d7aafced
-Bug-PHP: https://bugs.php.net/bug.php?id=77270
-Bug-Debian: https://bugs.debian.org/920645
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2019-6977
-Forwarded: no
-Author: "Christoph M. Becker" <cmbecker69@gmx.de>
-Last-Update: 2019-02-01
-
-At least some of the image reading functions may return images which
-use color indexes greater than or equal to im->colorsTotal.  We cater
-to this by always using a buffer size which is sufficient for
-`gdMaxColors` in `gdImageColorMatch()`.
----
-
---- a/src/gd_color_match.c
-+++ b/src/gd_color_match.c
-@@ -31,8 +31,8 @@ BGD_DECLARE(int) gdImageColorMatch (gdIm
- 		return -4; /* At least 1 color must be allocated */
- 	}
- 
--	buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * im2->colorsTotal);
--	memset (buf, 0, sizeof(unsigned long) * 5 * im2->colorsTotal );
-+	buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * gdMaxColors);
-+	memset (buf, 0, sizeof(unsigned long) * 5 * gdMaxColors );
- 
- 	for (x=0; x < im1->sx; x++) {
- 		for( y=0; y<im1->sy; y++ ) {
diff --git a/main/gd/CVE-2019-6978.patch b/main/gd/CVE-2019-6978.patch
deleted file mode 100644
index 65e61445ce6..00000000000
--- a/main/gd/CVE-2019-6978.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-From 553702980ae89c83f2d6e254d62cf82e204956d0 Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Thu, 17 Jan 2019 11:54:55 +0100
-Subject: [PATCH] Fix #492: Potential double-free in gdImage*Ptr()
-
-Whenever `gdImage*Ptr()` calls `gdImage*Ctx()` and the latter fails, we
-must not call `gdDPExtractData()`; otherwise a double-free would
-happen.  Since `gdImage*Ctx()` are void functions, and we can't change
-that for BC reasons, we're introducing static helpers which are used
-internally.
-
-We're adding a regression test for `gdImageJpegPtr()`, but not for
-`gdImageGifPtr()` and `gdImageWbmpPtr()` since we don't know how to
-trigger failure of the respective `gdImage*Ctx()` calls.
-
-This potential security issue has been reported by Solmaz Salimi (aka.
-Rooney).
-
-diff --git a/src/gd_gif_out.c b/src/gd_gif_out.c
-index 298a5812..d5a95346 100644
---- a/src/gd_gif_out.c
-+++ b/src/gd_gif_out.c
-@@ -99,6 +99,7 @@ static void char_init(GifCtx *ctx);
- static void char_out(int c, GifCtx *ctx);
- static void flush_char(GifCtx *ctx);
- 
-+static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out);
- 
- 
- 
-@@ -131,8 +132,11 @@ BGD_DECLARE(void *) gdImageGifPtr(gdImagePtr im, int *size)
- 	void *rv;
- 	gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
- 	if (out == NULL) return NULL;
--	gdImageGifCtx(im, out);
--	rv = gdDPExtractData(out, size);
-+	if (!_gdImageGifCtx(im, out)) {
-+		rv = gdDPExtractData(out, size);
-+	} else {
-+		rv = NULL;
-+	}
- 	out->gd_free(out);
- 	return rv;
- }
-@@ -220,6 +224,12 @@ BGD_DECLARE(void) gdImageGif(gdImagePtr im, FILE *outFile)
- 
- */
- BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
-+{
-+	_gdImageGifCtx(im, out);
-+}
-+
-+/* returns 0 on success, 1 on failure */
-+static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
- {
- 	gdImagePtr pim = 0, tim = im;
- 	int interlace, BitsPerPixel;
-@@ -231,7 +241,7 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
- 		based temporary image. */
- 		pim = gdImageCreatePaletteFromTrueColor(im, 1, 256);
- 		if(!pim) {
--			return;
-+			return 1;
- 		}
- 		tim = pim;
- 	}
-@@ -247,6 +257,8 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
- 		/* Destroy palette based temporary image. */
- 		gdImageDestroy(	pim);
- 	}
-+
-+	return 0;
- }
- 
- 
-diff --git a/src/gd_jpeg.c b/src/gd_jpeg.c
-index fc058420..96ef4302 100644
---- a/src/gd_jpeg.c
-+++ b/src/gd_jpeg.c
-@@ -117,6 +117,8 @@ static void fatal_jpeg_error(j_common_ptr cinfo)
- 	exit(99);
- }
- 
-+static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality);
-+
- /*
-  * Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality
-  * QUALITY.  If QUALITY is in the range 0-100, increasing values
-@@ -231,8 +233,11 @@ BGD_DECLARE(void *) gdImageJpegPtr(gdImagePtr im, int *size, int quality)
- 	void *rv;
- 	gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
- 	if (out == NULL) return NULL;
--	gdImageJpegCtx(im, out, quality);
--	rv = gdDPExtractData(out, size);
-+	if (!_gdImageJpegCtx(im, out, quality)) {
-+		rv = gdDPExtractData(out, size);
-+	} else {
-+		rv = NULL;
-+	}
- 	out->gd_free(out);
- 	return rv;
- }
-@@ -253,6 +258,12 @@ void jpeg_gdIOCtx_dest(j_compress_ptr cinfo, gdIOCtx *outfile);
- 
- */
- BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
-+{
-+	_gdImageJpegCtx(im, outfile, quality);
-+}
-+
-+/* returns 0 on success, 1 on failure */
-+static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
- {
- 	struct jpeg_compress_struct cinfo;
- 	struct jpeg_error_mgr jerr;
-@@ -287,7 +298,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
- 		if(row) {
- 			gdFree(row);
- 		}
--		return;
-+		return 1;
- 	}
- 
- 	cinfo.err->emit_message = jpeg_emit_message;
-@@ -328,7 +339,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
- 	if(row == 0) {
- 		gd_error("gd-jpeg: error: unable to allocate JPEG row structure: gdCalloc returns NULL\n");
- 		jpeg_destroy_compress(&cinfo);
--		return;
-+		return 1;
- 	}
- 
- 	rowptr[0] = row;
-@@ -405,6 +416,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
- 	jpeg_finish_compress(&cinfo);
- 	jpeg_destroy_compress(&cinfo);
- 	gdFree(row);
-+	return 0;
- }
- 
- 
-diff --git a/src/gd_wbmp.c b/src/gd_wbmp.c
-index f19a1c96..a49bdbec 100644
---- a/src/gd_wbmp.c
-+++ b/src/gd_wbmp.c
-@@ -88,6 +88,8 @@ int gd_getin(void *in)
- 	return (gdGetC((gdIOCtx *)in));
- }
- 
-+static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out);
-+
- /*
- 	Function: gdImageWBMPCtx
- 
-@@ -100,6 +102,12 @@ int gd_getin(void *in)
- 		out   - the stream where to write
- */
- BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
-+{
-+	_gdImageWBMPCtx(image, fg, out);
-+}
-+
-+/* returns 0 on success, 1 on failure */
-+static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
- {
- 	int x, y, pos;
- 	Wbmp *wbmp;
-@@ -107,7 +115,7 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
- 	/* create the WBMP */
- 	if((wbmp = createwbmp(gdImageSX(image), gdImageSY(image), WBMP_WHITE)) == NULL) {
- 		gd_error("Could not create WBMP\n");
--		return;
-+		return 1;
- 	}
- 
- 	/* fill up the WBMP structure */
-@@ -123,11 +131,15 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
- 
- 	/* write the WBMP to a gd file descriptor */
- 	if(writewbmp(wbmp, &gd_putout, out)) {
-+		freewbmp(wbmp);
- 		gd_error("Could not save WBMP\n");
-+		return 1;
- 	}
- 
- 	/* des submitted this bugfix: gdFree the memory. */
- 	freewbmp(wbmp);
-+
-+	return 0;
- }
- 
- /*
-@@ -271,8 +283,11 @@ BGD_DECLARE(void *) gdImageWBMPPtr(gdImagePtr im, int *size, int fg)
- 	void *rv;
- 	gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
- 	if (out == NULL) return NULL;
--	gdImageWBMPCtx(im, fg, out);
--	rv = gdDPExtractData(out, size);
-+	if (!_gdImageWBMPCtx(im, fg, out)) {
-+		rv = gdDPExtractData(out, size);
-+	} else {
-+		rv = NULL;
-+	}
- 	out->gd_free(out);
- 	return rv;
- }
diff --git a/main/gdb/APKBUILD b/main/gdb/APKBUILD
index 795ccc3d107..178ebc083c2 100644
--- a/main/gdb/APKBUILD
+++ b/main/gdb/APKBUILD
@@ -1,16 +1,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gdb
-pkgver=9.1
-pkgrel=0
+pkgver=14.2
+pkgrel=1
 pkgdesc="The GNU Debugger"
 url="https://www.gnu.org/software/gdb/"
 arch="all"
-license="GPL-3.0-or-later LGPL-3.0-or-later"
-makedepends="ncurses-dev expat-dev texinfo readline-dev python3-dev
-	zlib-dev autoconf automake libtool linux-headers perl"
+license="GPL-3.0-or-later AND LGPL-3.0-or-later"
+makedepends="
+	autoconf
+	automake
+	expat-dev
+	gmp-dev
+	libtool
+	linux-headers
+	mpfr-dev
+	ncurses-dev
+	perl
+	python3-dev
+	readline-dev
+	texinfo
+	zlib-dev
+	zstd-dev
+	"
 options="!check"
-subpackages="$pkgname-doc $pkgname-multiarch"
+subpackages="$pkgname-dbg $pkgname-doc $pkgname-multiarch"
 source="https://ftp.gnu.org/gnu/gdb/gdb-$pkgver.tar.xz
+	gcore-sh.patch
 	s390x-use-elf-gdb_fpregset_t.patch
 	ppc-musl.patch
 	ppc-ptregs.patch
@@ -35,6 +50,9 @@ build() {
 		--mandir=/usr/share/man
 		--infodir=/usr/share/info"
 
+	export CFLAGS="$CFLAGS -O2 -g1"
+	export CXXFLAGS="$CXXFLAGS -O2 -g1"
+
 	# use system readline if not cross compiling
 	[ "$CBUILD" = "$CHOST" ] && _config="$_config --with-system-readline"
 
@@ -48,34 +66,57 @@ build() {
 	../configure $_config
 	make
 
+	# XXX: As of GDB 12.1, --enable-targets=all is broken on 32-bit targets.
+	#
+	# See: https://sourceware.org/pipermail/gdb-patches/2022-May/189227.html
 	cd "$builddir"/multiarch
-	../configure $_config --enable-targets=all
+	case "$CARCH" in
+	arm*|x86) ../configure $_config \
+		--disable-sim \
+		--enable-64-bit-bfd \
+		--enable-targets=all ;;
+	*) ../configure $_config --enable-targets=all ;;
+	esac
 	make
 }
 
 package() {
+	# backtracing/debugging pretty much anything is going to need libc debug symbols
+	# not everything, but the common case needs this, and it's a small dep in comparison
+	depends="musl-dbg"
+
 	cd "$builddir"/vanilla
 	make DESTDIR="$pkgdir" install
 
 	# resolve conflict with binutils-doc
 	rm -f "$pkgdir"/usr/share/info/bfd.info
+	rm -f "$pkgdir"/usr/share/info/ctf-spec.info
 	rm -f "$pkgdir"/usr/share/info/dir
 
 	# those are provided by binutils
 	rm -rf "$pkgdir"/usr/include
 	rm -rf "$pkgdir"/usr/lib
+
+	# resolve conflict with binutils-doc
+	rm "$pkgdir"/usr/share/info/sframe-spec.info
+
+	# install gdb-multiarch here for default dbg() split function to work
+	install -Dm755 "$builddir"/multiarch/gdb/gdb \
+		"$pkgdir"/usr/bin/gdb-multiarch
 }
 
 multiarch() {
 	depends="$pkgname"
 	pkgdesc="The GNU Debugger for all supported architectures"
 
-	install -Dm755 "$builddir"/multiarch/gdb/gdb \
-		"$subpkgdir"/usr/bin/gdb-multiarch
+	amove usr/bin/gdb-multiarch
 }
 
-sha512sums="84cdd408d80a3fc5779de459c5b26154d31b329ebde7e3aa78799fb1eb245d8b64b8c8ee7242382a1dbd95b4e6f9d84fef41d12a0646aa75d3dee4709ea1f6e7  gdb-9.1.tar.xz
+sha512sums="
+7e07941f1fe661288cc571b4964012ceabc1760624fce20320db2f470c01439b2386f859b5288da13204b758e2e3b22a74c68c012178db93b9529b06f1e22ede  gdb-14.2.tar.xz
+68f893e72742eac7e41fd7c3e688b8cccc79327f0422b03319302a1a9d24513e77d698bc6ff16f67236b521df321b9ff0ca2ee342c11f12933c492c5c530ec9b  gcore-sh.patch
 70e7d04e4d72461436da503b5bfa370c5779e03245c521f30e9779d5ff37dbb2d708b05f2afb27f43ad9defc44df4bd979d72f777e744851fdbf156295e1cc9f  s390x-use-elf-gdb_fpregset_t.patch
 04911f87904b62dd7662435f9182b20485afb29ddb3d6398a9d31fef13495f7b70639c77fdae3a40e2775e270d7cd40d0cfd7ddf832372b506808d33c8301e01  ppc-musl.patch
-b75e1c1ee503a1948a7d5b8d90427b5c7d38ded69978056cee0adca222771a5c95ed1ac73127fcae7b795ea94296344eee5fca47e4cd04b418c164a756fb0933  ppc-ptregs.patch
-013141b89afafba02a6ddd1407dfd9b2566606e7b1d4bd03b4e23d9b523231103dbeca17a435669a7a7508f827cbe7f601e3bb1daa96d892ea33b897265966ad  musl-signals.patch"
+ab554899bbb2aa98261fd1b6beb4a71ed7c713a714bddd3fa7ec875258e39bd5474dc96a11accb4dadd316f3834f215e8395d3b373bf3affd122dc5b4a8fe710  ppc-ptregs.patch
+58aacc7cdc119eab729a3c5a5521f6a0db41c6a5bc2d09d6e32cbdd071d85dd1a31b5e6559616f8da1237c5b79ad9e04aab485211e957b4d1ca752c0c5ad660b  musl-signals.patch
+"
diff --git a/main/gdb/gcore-sh.patch b/main/gdb/gcore-sh.patch
new file mode 100644
index 00000000000..166f75467f6
--- /dev/null
+++ b/main/gdb/gcore-sh.patch
@@ -0,0 +1,54 @@
+diff --git a/gdb/gcore.in b/gdb/gcore.in
+index 34860de..5ede1d4 100644
+--- a/gdb/gcore.in
++++ b/gdb/gcore.in
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ #   Copyright (C) 2003-2023 Free Software Foundation, Inc.
+ 
+@@ -25,17 +25,12 @@ prefix=core
+ 
+ # When the -a option is present, this may hold additional commands
+ # to ensure gdb dumps all mappings (OS dependent).
+-dump_all_cmds=()
++dump_all=0
+ 
+ while getopts :ao: opt; do
+     case "$opt" in
+         a)
+-            case "$OSTYPE" in
+-                linux*)
+-                    dump_all_cmds=("-ex" "set use-coredump-filter off")
+-                    dump_all_cmds+=("-ex" "set dump-excluded-mappings on")
+-                    ;;
+-            esac
++            dump_all=1
+             ;;
+         o)
+             prefix=$OPTARG
+@@ -97,11 +92,18 @@ for pid in "$@"
+ do
+ 	# `</dev/null' to avoid touching interactive terminal if it is
+ 	# available but not accessible as GDB would get stopped on SIGTTIN.
+-	"$binary_path/@GDB_TRANSFORM_NAME@" </dev/null \
+-	    --nx --batch --readnever -iex 'set debuginfod enabled off' \
+-	    -ex "set pagination off" -ex "set height 0" -ex "set width 0" \
+-	    "${dump_all_cmds[@]}" \
+-	    -ex "attach $pid" -ex "gcore $prefix.$pid" -ex detach -ex quit
++  if [ "$dump_all" -eq 1 ]; then
++  	"$binary_path/@GDB_TRANSFORM_NAME@" </dev/null \
++  	    --nx --batch --readnever -iex 'set debuginfod enabled off' \
++  	    -ex "set pagination off" -ex "set height 0" -ex "set width 0" \
++        -ex "set use-coredump-filter off" -ex "set dump-excluded-mappings on" \
++  	    -ex "attach $pid" -ex "gcore $prefix.$pid" -ex detach -ex quit
++  else
++  	"$binary_path/@GDB_TRANSFORM_NAME@" </dev/null \
++  	    --nx --batch --readnever -iex 'set debuginfod enabled off' \
++  	    -ex "set pagination off" -ex "set height 0" -ex "set width 0" \
++  	    -ex "attach $pid" -ex "gcore $prefix.$pid" -ex detach -ex quit
++  fi
+ 
+ 	if [ -r "$prefix.$pid" ] ; then
+ 	    rc=0
diff --git a/main/gdb/musl-signals.patch b/main/gdb/musl-signals.patch
index bfc410e303f..e04ed0a1766 100644
--- a/main/gdb/musl-signals.patch
+++ b/main/gdb/musl-signals.patch
@@ -1,5 +1,5 @@
---- a/gdb/gdbsupport/signals.c	2020-02-08 12:50:14.000000000 +0000
-+++ b/gdb/gdbsupport/signals.c	2020-02-11 13:08:56.482694697 +0000
+--- a/gdbsupport/signals.cc	2020-02-08 12:50:14.000000000 +0000
++++ b/gdbsupport/signals.cc	2020-02-11 13:08:56.482694697 +0000
 @@ -31,6 +31,13 @@
     _available_ realtime signal, not the lowest supported; glibc takes
     several for its own use.  */
diff --git a/main/gdb/ppc-ptregs.patch b/main/gdb/ppc-ptregs.patch
index 743bd2e6d26..da131ab4c1e 100644
--- a/main/gdb/ppc-ptregs.patch
+++ b/main/gdb/ppc-ptregs.patch
@@ -1,5 +1,5 @@
---- a/gdb/gdbserver/linux-ppc-low.c
-+++ b/gdb/gdbserver/linux-ppc-low.c
+--- a/gdbserver/linux-ppc-low.cc
++++ b/gdbserver/linux-ppc-low.cc
 @@ -21,7 +21,6 @@
  #include "linux-low.h"
  
diff --git a/main/gdbm/APKBUILD b/main/gdbm/APKBUILD
index 9df6c959185..f8304d464de 100644
--- a/main/gdbm/APKBUILD
+++ b/main/gdbm/APKBUILD
@@ -1,21 +1,22 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gdbm
-pkgver=1.13
+pkgver=1.23
 pkgrel=1
 pkgdesc="GNU dbm is a set of database routines that use extensible hashing"
 url="https://www.gnu.org/software/gdbm/"
 arch="all"
-license="GPL"
-depends=""
-makedepends=""
-install=
-subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://ftp.nluug.nl/pub/gnu/gdbm/gdbm-$pkgver.tar.gz"
+license="GPL-3.0-or-later"
+depends_dev="$pkgname-tools=$pkgver-r$pkgrel"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="https://ftp.gnu.org/gnu/gdbm/gdbm-$pkgver.tar.gz"
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
 
-builddir="$srcdir"/gdbm-$pkgver
 build() {
-	cd "$builddir"
 	# we disable large-file due to it makes the db file non-compat
 	# with gdbm-1.8.3
 	./configure \
@@ -30,13 +31,20 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="fdb777f5b415b0578ea46b4a6fc70151a04a3568e2f2c8c0219ccad8c0d34abb773d80d5d7a06462ad1a3d6c1f3b5b7ab25f9de4f43ccf05c58db05f9a2906ad  gdbm-1.13.tar.gz"
+tools() {
+	pkgdesc="$pkgdesc (CLI tools)"
+	depends="$pkgname=$pkgver-r$pkgrel"
+
+	amove usr/bin/*
+}
+
+sha512sums="
+918080cb0225b221c11eb7339634a95e00c526072395f7a3d46ccf42ef020dea7c4c5bec34aff2c4f16033e1fff6583252b7e978f68b8d7f8736b0e025838e10  gdbm-1.23.tar.gz
+"
diff --git a/main/gdk-pixbuf/APKBUILD b/main/gdk-pixbuf/APKBUILD
index 0c535d4d463..231c6a0866c 100644
--- a/main/gdk-pixbuf/APKBUILD
+++ b/main/gdk-pixbuf/APKBUILD
@@ -1,63 +1,65 @@
 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gdk-pixbuf
-pkgver=2.40.0
-pkgrel=2
+pkgver=2.42.10
+pkgrel=6
 pkgdesc="GTK+ image loading library"
 url="https://wiki.gnome.org/Projects/GdkPixbuf"
 arch="all"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 depends="shared-mime-info"
-depends_dev="shared-mime-info"
-makedepends="tiff-dev libjpeg-turbo-dev gobject-introspection-dev
-	libpng-dev glib-dev meson"
+makedepends="
+	glib-dev
+	gobject-introspection-dev
+	libjpeg-turbo-dev
+	libpng-dev
+	meson
+	py3-docutils
+	tiff-dev
+	"
 install="$pkgname.pre-deinstall"
 triggers="$pkgname.trigger=/usr/lib/gdk-pixbuf-2.0/*/loaders"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-dbg"
+subpackages="$pkgname-dbg $pkgname-doc $pkgname-lang $pkgname-dev $pkgname-loaders"
 source="https://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz"
-replaces="gtk+"
+
+case "$CARCH" in
+x86|arm*)
+	# https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/215
+	options="$options !check"
+esac
 
 # secfixes:
+#   2.42.8-r0:
+#     - CVE-2021-44648
+#   2.42.2-r0:
+#     - CVE-2020-29385
 #   2.36.6-r1:
 #     - CVE-2017-6311
 #     - CVE-2017-6312
 #     - CVE-2017-6314
 
 build() {
-	meson \
-		--prefix=/usr \
-		--buildtype=plain \
+	abuild-meson \
+		-Db_lto=true \
 		-Dinstalled_tests=false \
+		-Dtests="$(want_check && echo true || echo false)" \
 		output .
-	ninja -C output
+	meson compile -C output
 }
 
 check() {
-	# pixbuf-area-updated takes over 50 minutes to run on Drone
-	case $CARCH in
-		armhf)
-			if test $DRONE; then
-				sed -i '/pixbuf-area-updated/d' tests/meson.build
-			fi
-		;;
-	esac
-
-	meson test -t 10 -C output
+	meson test -t 10 --print-errorlogs -C output
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C output install
-}
-
-doc() {
-	replaces="gtk+-doc"
-	default_doc
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-dev() {
-	replaces="gtk+-dev"
-	default_dev
+loaders() {
+	pkgdesc="Metapackage to pull in gdk-pixbuf loaders"
+	mkdir -p "$subpkgdir"
 }
 
-sha512sums="6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa  gdk-pixbuf-2.40.0.tar.xz"
+sha512sums="
+ad64963b61ef8cc84ae450328ec8c90a852f974e29ffdd42263ed32de47af93c058f3ffdf91c5d6e9bba815f4e8e8fe5a19422ac1bfb079666339814ac059b3a  gdk-pixbuf-2.42.10.tar.xz
+"
diff --git a/main/gdl/APKBUILD b/main/gdl/APKBUILD
deleted file mode 100644
index 6bb0b1688ba..00000000000
--- a/main/gdl/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Rasmus Thomsen <oss@cogitri.dev>
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
-pkgname=gdl
-pkgver=3.34.0
-pkgrel=0
-pkgdesc="Gnome Docking library"
-url="https://gitlab.gnome.org/GNOME/gdl"
-arch="all"
-license="LGPL-2.1-or-later"
-makedepends="gtk+3.0-dev libxml2-dev intltool"
-options="!check" # no tests
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.gnome.org/sources/gdl/${pkgver%.*}/gdl-$pkgver.tar.xz"
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static
-	make
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="8c43f330556dae67e4f64e92c3ba5c2e9351d3040d6002bda89f20f9494fc93030abe80072f0cf86280f98e290805154e9ca12aaa7013f0a341d8ea94323d3b0  gdl-3.34.0.tar.xz"
diff --git a/main/gengetopt/APKBUILD b/main/gengetopt/APKBUILD
index b4370b9f56e..37530942220 100644
--- a/main/gengetopt/APKBUILD
+++ b/main/gengetopt/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=gengetopt
 pkgver=2.23
-pkgrel=0
+pkgrel=2
 pkgdesc="Tool to write command line option parsing code for C programs"
 url="https://www.gnu.org/software/gengetopt/"
 arch="all"
@@ -10,10 +10,15 @@ license="GPL-3.0-or-later"
 depends_dev="gengetopt"
 makedepends="$depends_dev texinfo"
 subpackages="$pkgname-doc $pkgname-dev"
-source="https://ftp.gnu.org/gnu/gengetopt/${pkgname}-${pkgver}.tar.xz"
+source="https://ftp.gnu.org/gnu/gengetopt/gengetopt-$pkgver.tar.xz"
+options="!check"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,7 +31,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/geoip/APKBUILD b/main/geoip/APKBUILD
index dcde2c3a593..290946d5933 100644
--- a/main/geoip/APKBUILD
+++ b/main/geoip/APKBUILD
@@ -1,20 +1,23 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
-pkgname="geoip"
+pkgname=geoip
 _pkgname="GeoIP"
 pkgver=1.6.12
-pkgrel=1
+pkgrel=5
 pkgdesc="Lookup countries by IP addresses"
 url="http://www.maxmind.com/app/ip-location"
 arch="all"
-license="GPL"
+license="LGPL-2.1-or-later"
 makedepends="zlib-dev"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://github.com/maxmind/geoip-api-c/releases/download/v$pkgver/$_pkgname-$pkgver.tar.gz
-	geoip.cron"
+source="https://github.com/maxmind/geoip-api-c/releases/download/v$pkgver/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir"/$_pkgname-$pkgver
 
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,16 +29,14 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	mkdir -p "$pkgdir"/usr/share/GeoIP
-	install -m755 -D ../../geoip.cron "$pkgdir"/etc/periodic/monthly/geoip
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
-sha512sums="a1c8120692a7ba6de5836550917f86f4797dd236a8b7d71b6f92b5389e4b071d89e57036654f5de1d4b762730a2a5c331c31414eab0c889c9befaa097941fee7  GeoIP-1.6.12.tar.gz
-910b1efc93898416057aa7fc1a3f57d35f354973656ed40fbe266c737c4b4aa37f28b42e4163ed850a454c999bc880c27d863a04a14328b7b7e65348a85dd7d3  geoip.cron"
+sha512sums="
+a1c8120692a7ba6de5836550917f86f4797dd236a8b7d71b6f92b5389e4b071d89e57036654f5de1d4b762730a2a5c331c31414eab0c889c9befaa097941fee7  GeoIP-1.6.12.tar.gz
+"
diff --git a/main/geoip/geoip.cron b/main/geoip/geoip.cron
deleted file mode 100755
index 8d74aff5cf6..00000000000
--- a/main/geoip/geoip.cron
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-wget -q http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz -O /tmp/GeoIP.dat.gz && gunzip /tmp/GeoIP.dat.gz && mv /tmp/GeoIP.dat /usr/share/GeoIP
-wget -q http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz -O /tmp/GeoIPv6.dat.gz && gunzip /tmp/GeoIPv6.dat.gz && mv /tmp/GeoIPv6.dat /usr/share/GeoIP
-wget -q http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz -O /tmp/GeoLiteCity.dat.gz && gunzip /tmp/GeoLiteCity.dat.gz && mv /tmp/GeoLiteCity.dat /usr/share/GeoIP
-wget -q http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz -O /tmp/GeoLiteCityv6.dat.gz && gunzip /tmp/GeoLiteCityv6.dat.gz && mv /tmp/GeoLiteCityv6.dat /usr/share/GeoIP
-wget -q http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz -O /tmp/GeoIPASNum.dat.gz && gunzip /tmp/GeoIPASNum.dat.gz && mv /tmp/GeoIPASNum.dat /usr/share/GeoIP
-wget -q http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz -O /tmp/GeoIPASNumv6.dat.gz && gunzip /tmp/GeoIPASNumv6.dat.gz && mv /tmp/GeoIPASNumv6.dat /usr/share/GeoIP
diff --git a/main/gettext-tiny/APKBUILD b/main/gettext-tiny/APKBUILD
new file mode 100644
index 00000000000..4237ac32c61
--- /dev/null
+++ b/main/gettext-tiny/APKBUILD
@@ -0,0 +1,32 @@
+# Contributor: TBK <alpine@jjtc.eu>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gettext-tiny
+pkgver=0.3.2
+pkgrel=6
+pkgdesc="Tiny Internationalized Message Handling Library and tools"
+url="https://github.com/sabotage-linux/gettext-tiny"
+arch="all"
+license="MIT"
+options="!check" # No test suite
+depends_dev="musl-libintl"
+subpackages="$pkgname-dev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/sabotage-linux/gettext-tiny/archive/v$pkgver.tar.gz
+	line-length.patch
+	respect-cflags.patch
+	xgettext-version.patch
+	"
+
+build() {
+	make LIBINTL=MUSL prefix=/usr
+}
+
+package() {
+	make LIBINTL=MUSL prefix=/usr DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+0ed85599c8dc4114764b8eeed1e35cde97f11185c3f689e377d020758cc010ba4402febb84dba4cdc78e94fa2cd65614dafade8708ea078db5b2921925c36e78  gettext-tiny-0.3.2.tar.gz
+0a26a8481bffe2ce8c73f7f500963aea9db8379fb87849142d8efabf1656604b22f6ad345483256f14c388466f2f44e5924b9f65d88f26867a753a96d1529270  line-length.patch
+b4e7db4e415f6bc31f2214f2044506ad18ea0bd3cae4200d93bbd34aa493c7478a7f953d0a7e08f29f0fd5a5d7b7cbfa2bcfd5692c37e423706a1c193239bf1d  respect-cflags.patch
+1fe209eef2f9c2fcd2992a96d484032865cd70c34df3c97e8efa3a67af7bee00edeaa21a9a16c3ee9ea61d65e06b6d7e0afcb411a8a5e19702d32daff1a412c6  xgettext-version.patch
+"
diff --git a/main/gettext-tiny/line-length.patch b/main/gettext-tiny/line-length.patch
new file mode 100644
index 00000000000..0ba97819773
--- /dev/null
+++ b/main/gettext-tiny/line-length.patch
@@ -0,0 +1,15 @@
+https://github.com/sabotage-linux/gettext-tiny/issues/50
+
+We're losing the battle of the bulge; someone really should make this use malloc.
+
+--- gettext-tiny-0.3.1_git20191130/src/msgfmt.c.old	2020-01-14 08:03:11.000000000 +0000
++++ gettext-tiny-0.3.1_git20191130/src/msgfmt.c	2020-01-21 18:58:28.257709860 +0000
+@@ -160,7 +160,7 @@
+ 
+ int process(FILE *in, FILE *out, bool strict) {
+ 	struct mo_hdr mohdr = def_hdr;
+-	char line[8192]; char *lp;
++	char line[12288]; char *lp;
+ 	size_t off, i;
+ 	enum po_error t;
+ 	char convbuf[32768];
diff --git a/main/gettext-tiny/respect-cflags.patch b/main/gettext-tiny/respect-cflags.patch
new file mode 100644
index 00000000000..dd1cf3fe2cf
--- /dev/null
+++ b/main/gettext-tiny/respect-cflags.patch
@@ -0,0 +1,11 @@
+--- gettext-tiny-0.2.0/Makefile.old	2017-08-02 06:14:20.000000000 -0500
++++ gettext-tiny-0.2.0/Makefile	2018-06-16 21:21:57.148735892 -0500
+@@ -32,7 +32,7 @@
+ ALL_M4S=$(sort $(wildcard m4/*.m4))
+ ALL_DATA=$(sort $(wildcard data/*))
+ 
+-CFLAGS=-O0 -fPIC
++CFLAGS  ?= -O0 -fPIC
+ 
+ AR      ?= $(CROSS_COMPILE)ar
+ RANLIB  ?= $(CROSS_COMPILE)ranlib
diff --git a/main/gettext-tiny/xgettext-version.patch b/main/gettext-tiny/xgettext-version.patch
new file mode 100644
index 00000000000..f72f7d27cf6
--- /dev/null
+++ b/main/gettext-tiny/xgettext-version.patch
@@ -0,0 +1,25 @@
+Patch-Source: https://github.com/sabotage-linux/gettext-tiny/commit/bcb04de5afcf5532a110babfe3912b5725e7146b
+From bcb04de5afcf5532a110babfe3912b5725e7146b Mon Sep 17 00:00:00 2001
+From: Patrycja <github@ptrcnull.me>
+Date: Wed, 9 Mar 2022 15:42:21 +0100
+Subject: [PATCH] xgettext: fix --version output (#60)
+
+"\n" in the printf parameter doesn't expand
+and the comma gets printed after format string
+---
+ src/xgettext.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xgettext.sh b/src/xgettext.sh
+index fc38369..b113c98 100755
+--- a/src/xgettext.sh
++++ b/src/xgettext.sh
+@@ -16,7 +16,7 @@ syntax() {
+ }
+ 
+ show_version() {
+-	printf "%s\n", "xgettext (GNU gettext-tools compatible) 99.9999.9999\n"
++	printf "%s\n" "xgettext (GNU gettext-tools-compatible) 99.99"
+ 	exit 0
+ }
+ 
diff --git a/main/gettext/APKBUILD b/main/gettext/APKBUILD
index 2cd7911fd7a..8633837b3d9 100644
--- a/main/gettext/APKBUILD
+++ b/main/gettext/APKBUILD
@@ -1,20 +1,35 @@
 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=gettext
-pkgver=0.20.1
-pkgrel=2
+pkgver=0.22.5
+pkgrel=0
 pkgdesc="GNU locale utilities"
 url="https://www.gnu.org/software/gettext/gettext.html"
 arch="all"
 license="GPL-3.0-or-later AND LGPL-2.1-or-later AND MIT"
 # do _not_ add the optional dependencies on libcroco or glib
 # they depend on gettext and would introduce cyclic dependencies
+# xz for autopoint autoreconf
+depends_dev="!musl-libintl xz"
 makedepends="perl ncurses-dev libxml2-dev libunistring-dev"
 checkdepends="coreutils"
+subpackages="
+	$pkgname-dbg
+	$pkgname-doc
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-lang
+	$pkgname-envsubst:_envsubst
+	libintl
+	$pkgname-asprintf
+	$pkgname-libs
+	"
 source="https://ftp.gnu.org/gnu/gettext/gettext-$pkgver.tar.xz
-	skip-tests-musl.patch"
-subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev $pkgname-lang libintl $pkgname-asprintf $pkgname-libs"
+	cwd.patch
+	musl-realpath.patch
+	skip-tests-musl.patch
+	"
 
 # secfixes:
 #   0.20.1-r0:
@@ -40,29 +55,40 @@ check() {
 }
 
 package() {
+	depends="$pkgname-envsubst=$pkgver-r$pkgrel"
 	make -j1 DESTDIR="$pkgdir" install
-}
 
-static() {
-	pkgdesc="libintl static libraries"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
+	# nothing in here is particularly useful, mostly just hello world examples in
+	# every single programming language for using gettext
+	rm -r "$pkgdir"/usr/share/doc
 }
 
 libintl() {
 	pkgdesc="GNU gettext runtime library"
 	license="LGPL-2.1-or-later"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libintl.so.* "$subpkgdir"/usr/lib
+
+	amove usr/lib/libintl.so.*
 	chmod +x "$subpkgdir"/usr/lib/libintl.so.*
 }
 
 asprintf() {
 	pkgdesc="GNU gettext asprintf library"
 	license="LGPL-2.1-or-later"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libasprintf.so.* "$subpkgdir"/usr/lib
+
+	amove usr/lib/libasprintf.so.*
+}
+
+_envsubst() {
+	pkgdesc="GNU gettext envsubst binary"
+	provides="envsubst"
+	provider_priority=100 # highest (other provider of cmd:envsubst is testing/envsubst)
+
+	amove usr/bin/envsubst
 }
 
-sha512sums="82ffa5a28068272d0587262f8d9269f9629c601da5d122b6645c9c4cf98bfe4149df01bb58522ccf8fe25b931672e18551d7fb34de1cbf6a0463a87f9f8ee221  gettext-0.20.1.tar.xz
-9fae1898eaf7a871876d2eaeffdf6ab759455bc8062fc232992526d697752d864b6079eb3c1053aea08d3a41892008b201566564fa62275d0ced5cfa6088a4c0  skip-tests-musl.patch"
+sha512sums="
+a60999bb9d09441f138214d87acb7e59aab81e765bb9253a77c54902681c5de164a5a04de2a9778dfb479dbdefaab2d5de1fbaf6095c555c43e7e9fd7a1c09bd  gettext-0.22.5.tar.xz
+31796534e40c1569b08cf48e25375ca1d0f439df8aa0d24283769d52a290e28522760128f11f5bd04217605974ae1fdee9557ec189ed32b11b2a45b4af3b0f4a  cwd.patch
+c423b7f5610f03af63ed5327801be47fecc1d3de66cb018b32d05179a62889156cefb6d302686e9ecd81421951a5aa5e4c5a7d911823fc41d4c52ad2387e0719  musl-realpath.patch
+a16963f804ce4abe8480da211228f7b24a0715d6ef3ff7d5e5c58a1387d6c4260ee237864081b05b164f082ef199a592494ce691dd0c96c61978e4c451707c7a  skip-tests-musl.patch
+"
diff --git a/main/gettext/cwd.patch b/main/gettext/cwd.patch
new file mode 100644
index 00000000000..cebc626bc9a
--- /dev/null
+++ b/main/gettext/cwd.patch
@@ -0,0 +1,14 @@
+seems to fail on ppc64le
+--
+diff --git a/gettext-tools/gnulib-tests/test-getcwd.sh b/gettext-tools/gnulib-tests/test-getcwd.sh
+index 64a3c7c..ccabb8f 100755
+--- a/gettext-tools/gnulib-tests/test-getcwd.sh
++++ b/gettext-tools/gnulib-tests/test-getcwd.sh
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+ 
++exit 77
++
+ . "${srcdir=.}/init.sh"; path_prepend_ .
+ 
+ ${CHECKER} test-getcwd
diff --git a/main/gettext/musl-realpath.patch b/main/gettext/musl-realpath.patch
new file mode 100644
index 00000000000..0afd08b073c
--- /dev/null
+++ b/main/gettext/musl-realpath.patch
@@ -0,0 +1,11 @@
+--- a/gettext-tools/gnulib-tests/test-canonicalize.c
++++ b/gettext-tools/gnulib-tests/test-canonicalize.c
+@@ -394,7 +394,7 @@
+     ASSERT (stat ("/", &st1) == 0);
+     ASSERT (stat ("//", &st2) == 0);
+     bool same = psame_inode (&st1, &st2);
+-#if defined __MVS__ || defined MUSL_LIBC
++#if defined __MVS__
+     /* On IBM z/OS and musl libc, "/" and "//" both canonicalize to
+        themselves, yet they both have st_dev == st_ino == 1.  */
+     same = false;
diff --git a/main/gettext/skip-tests-musl.patch b/main/gettext/skip-tests-musl.patch
index de9a6b02b3a..8b3e9214103 100644
--- a/main/gettext/skip-tests-musl.patch
+++ b/main/gettext/skip-tests-musl.patch
@@ -3,6 +3,19 @@ As upstream notes:
 # Note: This test fails on Linux with musl libc versions that don't support
 # the BIG5 encoding in 'iconv'.
 
+diff --git a/gettext-tools/tests/msgcat-22 b/gettext-tools/tests/msgcat-22
+index 6047188..abe5877 100755
+--- a/gettext-tools/tests/msgcat-22
++++ b/gettext-tools/tests/msgcat-22
+@@ -6,6 +6,8 @@
+ # Note: This test fails on Linux with musl libc versions that don't support
+ # the GB18030 encoding in 'iconv'.
+ 
++exit 77
++
+ cat <<\EOF > mcat-test22.po
+ msgid ""
+ msgstr ""
 diff --git a/gettext-tools/tests/msgconv-2 b/gettext-tools/tests/msgconv-2
 index d286cda..d96c487 100755
 --- a/gettext-tools/tests/msgconv-2
@@ -16,13 +29,26 @@ index d286cda..d96c487 100755
  cat <<\EOF > mco-test2.po
  # Chinese translation for GNU gettext messages.
  #
+diff --git a/gettext-tools/tests/msgconv-8 b/gettext-tools/tests/msgconv-8
+index 207b0f0..618de0f 100755
+--- a/gettext-tools/tests/msgconv-8
++++ b/gettext-tools/tests/msgconv-8
+@@ -6,6 +6,8 @@
+ # Note: This test fails on Linux with musl libc versions that don't support
+ # the GB18030 encoding in 'iconv'.
+ 
++exit 77
++
+ cat <<\EOF > mco-test8.po
+ msgid ""
+ msgstr ""
 diff --git a/gettext-tools/tests/msgmerge-compendium-6 b/gettext-tools/tests/msgmerge-compendium-6
-index 0afbe1e..1b2fe6b 100755
+index 59eb00e..c4be0b2 100755
 --- a/gettext-tools/tests/msgmerge-compendium-6
 +++ b/gettext-tools/tests/msgmerge-compendium-6
 @@ -10,6 +10,8 @@
- # Note: This test fails on Linux with musl libc versions that don't support
- # the EUC-KR encoding in 'iconv'.
+ # Note: This test fails on Linux with musl libc versions and on Solaris 11
+ # (OpenIndiana, OmniOS) that don't support the EUC-KR encoding in 'iconv'.
  
 +Exit 77
 +
@@ -30,7 +56,7 @@ index 0afbe1e..1b2fe6b 100755
  ${MSGCONV} --to-code=UTF-8 -o mm-ko.utf-8.pot "$wabs_srcdir"/mm-ko.ascii.pot
  
 diff --git a/gettext-tools/tests/xgettext-python-3 b/gettext-tools/tests/xgettext-python-3
-index ca0926d..2c49fd7 100755
+index 1e13b57..7cd480d 100755
 --- a/gettext-tools/tests/xgettext-python-3
 +++ b/gettext-tools/tests/xgettext-python-3
 @@ -6,6 +6,8 @@
diff --git a/main/ghi/APKBUILD b/main/ghi/APKBUILD
deleted file mode 100644
index 1d6873a5230..00000000000
--- a/main/ghi/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Contributor: Eivind Uggedal <eu@eju.no>
-# Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com>
-pkgname=ghi
-pkgver=1.2.0
-pkgrel=4
-pkgdesc="GitHub Issues on the command line"
-url="https://github.com/stephencelis/ghi"
-arch="noarch"
-license="MIT"
-depends="ruby ruby-json ncurses less"
-options="!check"
-subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/stephencelis/ghi/archive/$pkgver.tar.gz"
-
-builddir="$srcdir/$pkgname-$pkgver"
-
-package() {
-	cd "$builddir"
-
-	install -Dm755 $pkgname "$pkgdir/usr/bin/$pkgname"
-	install -D -m644 man/$pkgname.1 "$pkgdir"/usr/share/man/man1/$pkgname.1
-	install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-sha512sums="345f3325007cef9087cb9c0215a2412c09aec542bec8003f2d67c3870fce36078a6ba2c8b73377cac419f82cbf8aed6ddab57ac96622aa2917734ae738014b89  ghi-1.2.0.tar.gz"
diff --git a/main/ghostscript-fonts/APKBUILD b/main/ghostscript-fonts/APKBUILD
index 161b0993e3d..882f297673e 100644
--- a/main/ghostscript-fonts/APKBUILD
+++ b/main/ghostscript-fonts/APKBUILD
@@ -3,21 +3,23 @@
 pkgname=ghostscript-fonts
 _pkgname=ghostscript-fonts-std
 pkgver=8.11
-pkgrel=1
+pkgrel=5
 pkgdesc="Fonts and font metrics distributed with Ghostscript"
-url="http://gs-fonts.sourceforge.net/"
-arch="all"
-license="GPL"
+url="https://gs-fonts.sourceforge.net/"
+arch="noarch"
+license="GPL-2.0-or-later"
 source="https://downloads.sourceforge.net/gs-fonts/$_pkgname-$pkgver.tar.gz"
-
-build(){
-	echo
-}
+options="!check" # no tests
+builddir="$srcdir/fonts"
 
 package() {
-        cd "$srcdir/fonts"
-        mkdir -p "$pkgdir/usr/share/fonts/Type1/"
-        cp * "$pkgdir/usr/share/fonts/Type1/"
+	install -Dm644 ./*.afm ./*.pfb ./*.pfm \
+		-t "$pkgdir"/usr/share/fonts/Type1/
+
+	mkdir -p "$pkgdir"/usr/share/ghostscript
+	ln -sfv /usr/share/fonts/Type1 "$pkgdir"/usr/share/ghostscript/fonts
 }
 
-sha512sums="d4fe6b097a3bdd9694dc704a2d986e22d649fbb7ca8302f872dff573525596a3f38246bd6dd166a5970a4fbca8cce6ebfb9a7030806b4662630afdf243438e1f  ghostscript-fonts-std-8.11.tar.gz"
+sha512sums="
+d4fe6b097a3bdd9694dc704a2d986e22d649fbb7ca8302f872dff573525596a3f38246bd6dd166a5970a4fbca8cce6ebfb9a7030806b4662630afdf243438e1f  ghostscript-fonts-std-8.11.tar.gz
+"
diff --git a/main/ghostscript/APKBUILD b/main/ghostscript/APKBUILD
index 1d30fde707f..ab16d6dd42d 100644
--- a/main/ghostscript/APKBUILD
+++ b/main/ghostscript/APKBUILD
@@ -1,23 +1,66 @@
 # Contributor: Cameron Banta <cbanta@gmail.com>
 # Maintainer: Cameron Banta <cbanta@gmail.com>
 pkgname=ghostscript
-pkgver=9.52
+pkgver=10.02.1
 pkgrel=0
-pkgdesc="An interpreter for the PostScript language and for PDF"
+pkgdesc="Interpreter for the PostScript language and for PDF"
 url="https://ghostscript.com/"
 arch="all"
 license="AGPL-3.0-or-later"
 options="!check"
-makedepends="autoconf automake libjpeg-turbo-dev libpng-dev expat-dev
-	zlib-dev tiff-dev freetype-dev lcms2-dev gtk+3.0-dev
-	cups-dev libtool jbig2dec-dev openjpeg-dev"
+makedepends="
+	autoconf
+	automake
+	cups-dev
+	expat-dev
+	freetype-dev
+	gtk+3.0-dev
+	jbig2dec-dev
+	lcms2-dev
+	libjpeg-turbo-dev
+	libpng-dev
+	libtool
+	openjpeg-dev
+	tiff-dev
+	zlib-dev
+	"
 subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-gtk"
-source="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${pkgver/./}/ghostscript-$pkgver.tar.gz
+source="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${pkgver//./}/ghostscript-$pkgver.tar.gz
 	ghostscript-system-zlib.patch
 	fix-sprintf.patch
 	"
 
 # secfixes:
+#   10.02.0-r0:
+#     - CVE-2023-43115
+#   9.54-r1:
+#     - CVE-2021-3781
+#   9.51-r0:
+#     - CVE-2020-16287
+#     - CVE-2020-16288
+#     - CVE-2020-16289
+#     - CVE-2020-16290
+#     - CVE-2020-16291
+#     - CVE-2020-16292
+#     - CVE-2020-16293
+#     - CVE-2020-16294
+#     - CVE-2020-16295
+#     - CVE-2020-16296
+#     - CVE-2020-16297
+#     - CVE-2020-16298
+#     - CVE-2020-16299
+#     - CVE-2020-16300
+#     - CVE-2020-16301
+#     - CVE-2020-16302
+#     - CVE-2020-16303
+#     - CVE-2020-16304
+#     - CVE-2020-16305
+#     - CVE-2020-16306
+#     - CVE-2020-16307
+#     - CVE-2020-16308
+#     - CVE-2020-16309
+#     - CVE-2020-16310
+#     - CVE-2020-17538
 #   9.50-r0:
 #     - CVE-2019-14869
 #   9.27-r4:
@@ -31,7 +74,6 @@ source="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/
 #   9.26-r2:
 #     - CVE-2019-3835
 #     - CVE-2019-3838
-#     - CVE-2019-6116
 #   9.26-r1:
 #     - CVE-2019-6116
 #   9.26-r0:
@@ -76,6 +118,8 @@ prepare() {
 }
 
 build() {
+	export CFLAGS="$CFLAGS -flto=auto"
+
 	# build ijs
 	cd "$builddir"/ijs
 	./configure \
@@ -83,7 +127,7 @@ build() {
 		--host=$CHOST \
 		--prefix=/usr \
 		--enable-shared \
-		--disable-static \
+		--disable-static
 	make
 
 	cd "$builddir"
@@ -97,17 +141,15 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--docdir=/usr/share/doc/"$pkgname" \
-		--enable-dynamic \
-		--disable-static \
 		--with-system-libtiff \
 		--with-ijs \
 		--with-jbig2dec \
-		--without-omni \
+		--without-libpaper \
+		--without-versioned-path \
 		--enable-gtk \
 		--with-drivers=ALL \
 		--with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
 		--disable-compile-inits
-	make obj/arch.h # workaround parallel build issue
 	make so all
 }
 
@@ -125,10 +167,11 @@ package() {
 gtk() {
 	pkgdesc="A GTK-enabled PostScript interpreter and renderer"
 
-	install -d "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/gsx "$subpkgdir"/usr/bin/
+	amove usr/bin/gsx
 }
 
-sha512sums="32fb2a3d4e81ac9e281202aaed2f7811e80c939cbce3ffef7ec7cf78213e5da8a2f6c13d15f0c6c8fd24566579ba8b69364d4c66f4e4b7851f6df9209d0ff046  ghostscript-9.52.tar.gz
+sha512sums="
+24eeff047a24085413283ee42539a2feea4d3de81077664861399055a9d30349a0ef0950746bb0b0ee2237b4b9ee215340204ab0e33347b53dc2acee85fcfc19  ghostscript-10.02.1.tar.gz
 70721e3a335afa5e21d4e6cf919119010bd4544a03ab8f53f5325c173902221ad9b88c118b4bfeee80b3e1956bcdbaf4c53f64ae7fb81f5ba57dbc956750c482  ghostscript-system-zlib.patch
-beefcf395f7f828e1b81c088022c08a506e218f27535b9de01e0f0edf7979b435316c318fa676771630f6ad16ff1ab059cd68aa128ed97e5a9f2f3fa840200c4  fix-sprintf.patch"
+beefcf395f7f828e1b81c088022c08a506e218f27535b9de01e0f0edf7979b435316c318fa676771630f6ad16ff1ab059cd68aa128ed97e5a9f2f3fa840200c4  fix-sprintf.patch
+"
diff --git a/main/giflib/APKBUILD b/main/giflib/APKBUILD
index 0fa6d02dd54..99596663aa2 100644
--- a/main/giflib/APKBUILD
+++ b/main/giflib/APKBUILD
@@ -1,38 +1,49 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=giflib
-pkgver=5.2.1
+pkgver=5.2.2
 pkgrel=0
 pkgdesc="A library for reading and writing GIF images"
 url="https://sourceforge.net/projects/giflib/"
 arch="all"
 license="MIT"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-utils"
 makedepends="xmlto"
 checkdepends="coreutils"
-source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
-	giflib-restore-deprecated-functions.patch"
+source="https://downloads.sourceforge.net/sourceforge/giflib/giflib-$pkgver.tar.gz
+	CVE-2021-40633.patch
+	correct-document-page-install.patch
+	dont-build-html-pages-images.patch
+	"
+
+# secfixes:
+#   5.2.2-r0:
+#     - CVE-2023-39742
+#     - CVE-2023-48161
+#     - CVE-2021-40633
+#   5.2.1-r2:
+#     - CVE-2022-28506
 
 build() {
-	cd "$builddir"
-	make CFLAGS="-fPIC"
+	make CFLAGS="$CFLAGS -fPIC"
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" PREFIX=/usr install
-	rm -f "$pkgdir"/usr/lib/*.a
 }
 
 utils() {
 	pkgdesc="Programs for manipulating GIF format image files"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+
+	amove usr/bin
 }
 
-sha512sums="4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736  giflib-5.2.1.tar.gz
-fdc4a46e4a61e15e14ad712f164a3595902da700c3280ef3ec6fae345118c055eefb1eb73bb755078d0ea1f6112fa4a2b8edf9d918017e0bdf413497d15e1eaf  giflib-restore-deprecated-functions.patch"
+sha512sums="
+0865ab2b1904fa14640c655fdb14bb54244ad18a66e358565c00287875d00912343f9be8bfac7658cc0146200d626f7ec9160d7a339f20ba3be6b9941d73975f  giflib-5.2.2.tar.gz
+33394cd01a5379ffadffa1a3c9ebd4fe2fddd3ea53fd3c713cc65b0ea0158d26aeb5148a9721c4892e944ef1a5694f54c23450118ab3b6f597e64eb6f3986731  CVE-2021-40633.patch
+6cb391eefc95f554ee83e89edf6fae365498597e370d684de5d020cb8f87f7bc3506afb30cbd36e9de2302d3301e33e044804c2d2a2c977d1bb7fa9e73f489cb  correct-document-page-install.patch
+aa32ccce78120a50f84c2dec644d10996a0fdb41335b47a1d71b45d14ffc9efd14e6aca3f2392dd6713e3c216c07736e94d21d661a90cfe4d57422eb08a1fbc2  dont-build-html-pages-images.patch
+"
diff --git a/main/giflib/CVE-2021-40633.patch b/main/giflib/CVE-2021-40633.patch
new file mode 100644
index 00000000000..9002088b67d
--- /dev/null
+++ b/main/giflib/CVE-2021-40633.patch
@@ -0,0 +1,30 @@
+From ccbc956432650734c91acb3fc88837f7b81267ff Mon Sep 17 00:00:00 2001
+From: "Eric S. Raymond" <esr@thyrsus.com>
+Date: Wed, 21 Feb 2024 18:55:00 -0500
+Subject: [PATCH] Clean up memory better at end of run (CVE-2021-40633)
+
+---
+ gif2rgb.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/gif2rgb.c b/gif2rgb.c
+index d51226d..fc2e683 100644
+--- a/gif2rgb.c
++++ b/gif2rgb.c
+@@ -515,10 +515,13 @@ static void GIF2RGB(int NumFiles, char *FileName, bool OneFileFlag,
+ 	}
+ 
+ 	DumpScreen2RGB(OutFileName, OneFileFlag, ColorMap, ScreenBuffer,
+ 	               GifFile->SWidth, GifFile->SHeight);
+ 
++	for (i = 0; i < GifFile->SHeight; i++) {
++        	(void)free(ScreenBuffer[i]);
++	}
+ 	(void)free(ScreenBuffer);
+ 
+ 	{
+ 		int Error;
+ 		if (DGifCloseFile(GifFile, &Error) == GIF_ERROR) {
+-- 
+2.43.0
+
diff --git a/main/giflib/correct-document-page-install.patch b/main/giflib/correct-document-page-install.patch
new file mode 100644
index 00000000000..4e10d86635e
--- /dev/null
+++ b/main/giflib/correct-document-page-install.patch
@@ -0,0 +1,58 @@
+From 61f375082c80ee479eb8ff03189aea691a6a06aa Mon Sep 17 00:00:00 2001
+From: "Eric S. Raymond" <esr@thyrsus.com>
+Date: Wed, 21 Feb 2024 08:33:51 -0500
+Subject: [PATCH] Correct document page install.
+
+---
+ Makefile | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 87966a9..f4ecb24 100644
+--- a/Makefile
++++ b/Makefile
+@@ -61,19 +61,23 @@ UTILS = $(INSTALLABLE) \
+ 	gifsponge \
+ 	gifwedge
+ 
+ LDLIBS=libgif.a -lm
+ 
+-MANUAL_PAGES = \
++MANUAL_PAGES_1 = \
+ 	doc/gif2rgb.xml \
+ 	doc/gifbuild.xml \
+ 	doc/gifclrmp.xml \
+ 	doc/giffix.xml \
+-	doc/giflib.xml \
+ 	doc/giftext.xml \
+ 	doc/giftool.xml
+ 
++MANUAL_PAGES_7 = \
++	doc/giflib.xml
++
++MANUAL_PAGES = $(MANUAL_PAGES_1) $(MANUAL_PAGES_7)
++
+ SOEXTENSION	= so
+ LIBGIFSO	= libgif.$(SOEXTENSION)
+ LIBGIFSOMAJOR	= libgif.$(SOEXTENSION).$(LIBMAJOR)
+ LIBGIFSOVER	= libgif.$(SOEXTENSION).$(LIBVER)
+ LIBUTILSO	= libutil.$(SOEXTENSION)
+@@ -146,12 +150,13 @@ install-lib:
+ 	$(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a"
+ 	$(INSTALL) -m 755 $(LIBGIFSO) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOVER)"
+ 	ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)"
+ 	ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)"
+ install-man:
+-	$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
+-	$(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1"
++	$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7"
++	$(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1"
++	$(INSTALL) -m 644 $(MANUAL_PAGES_7:xml=7) "$(DESTDIR)$(MANDIR)/man7"
+ uninstall: uninstall-man uninstall-include uninstall-lib uninstall-bin
+ uninstall-bin:
+ 	cd "$(DESTDIR)$(BINDIR)" && rm -f $(INSTALLABLE)
+ uninstall-include:
+ 	rm -f "$(DESTDIR)$(INCDIR)/gif_lib.h"
+-- 
+2.43.0
+
diff --git a/main/giflib/dont-build-html-pages-images.patch b/main/giflib/dont-build-html-pages-images.patch
new file mode 100644
index 00000000000..7d4fe356dcf
--- /dev/null
+++ b/main/giflib/dont-build-html-pages-images.patch
@@ -0,0 +1,18 @@
+Description: Don't build the site HTML pages images.
+  It saves us to have ImageMagick as a b-depend.
+Author: David Suárez <david.sephirot@gmail.com>
+Origin: vendor
+Last-Update: 2024-03-24
+Forwarded: not-needed
+
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -46,7 +46,7 @@
+ 	convert $^ -resize 50x50 $@
+ 
+ # Philosophical choice: the website gets the internal manual pages
+-allhtml: $(XMLALL:.xml=.html) giflib-logo.gif
++allhtml: $(XMLALL:.xml=.html)
+ 
+ manpages: $(XMLMAN1:.xml=.1) $(XMLMAN7:.xml=.7) $(XMLINTERNAL:.xml=.1)
+ 
diff --git a/main/giflib/giflib-restore-deprecated-functions.patch b/main/giflib/giflib-restore-deprecated-functions.patch
deleted file mode 100644
index 770cb16d5ac..00000000000
--- a/main/giflib/giflib-restore-deprecated-functions.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: Gentoo, written by Gary Stein
-Upstream: No
-Reason: restores deprecated GifQuantizeBuffer which some packages (notably libgdiplus) still use
---- a/Makefile	2019-03-28 14:57:23.000000000 -0400
-+++ b/Makefile	2019-03-31 23:38:20.700603561 -0400
-@@ -67,8 +67,8 @@
- 
- $(UTILS):: libgif.a libutil.a
- 
--libgif.so: $(OBJECTS) $(HEADERS)
--	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
-+libgif.so: $(OBJECTS) $(HEADERS) $(UOBJECTS)
-+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) $(UOBJECTS)
- 
- libgif.a: $(OBJECTS) $(HEADERS)
- 	$(AR) rcs libgif.a $(OBJECTS)
-
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index ad5cf69e6ea..ae7059b4487 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -2,6 +2,29 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 #
 # secfixes:
+#   2.40.1-r0:
+#     - CVE-2023-25652
+#     - CVE-2023-25815
+#     - CVE-2023-29007
+#   2.39.2-r0:
+#     - CVE-2023-22490
+#     - CVE-2023-23946
+#   2.39.1-r0:
+#     - CVE-2022-41903
+#     - CVE-2022-23521
+#   2.38.1-r0:
+#     - CVE-2022-39253
+#     - CVE-2022-39260
+#   2.37.1-r0:
+#     - CVE-2022-29187
+#   2.35.2-r0:
+#     - CVE-2022-24765
+#   2.30.2-r0:
+#     - CVE-2021-21300
+#   2.26.2-r0:
+#     - CVE-2020-11008
+#   2.26.1-r0:
+#     - CVE-2020-5260
 #   2.24.1-r0:
 #     - CVE-2019-1348
 #     - CVE-2019-1349
@@ -19,44 +42,77 @@
 #     - CVE-2018-11235
 #   2.14.1-r0:
 #     - CVE-2017-1000117
+#   0:
+#     - CVE-2021-29468
+#     - CVE-2021-46101
+
 pkgname=git
-pkgver=2.26.0
-pkgrel=0
+pkgver=2.44.0
+pkgrel=2
 pkgdesc="Distributed version control system"
 url="https://www.git-scm.com/"
 arch="all"
-license="GPL-2.0-or-later"
-# we need tcl and tk to be built before git due to git-gui and gitk
-makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev python3-dev
-	pcre2-dev asciidoc xmlto perl-error tcl tk"
-options="!check" # Check is currently failing on t3900-i18n-commit.sh ISO-2022-JP.txt
+license="GPL-2.0-only"
+makedepends="
+	curl-dev
+	expat-dev
+	file
+	openssl-dev>3
+	pcre2-dev
+	perl-dev
+	perl-error
+	xmlto
+	zlib-dev
+	"
 # note that order matters
-subpackages="$pkgname-doc
-	$pkgname-bash-completion:completion:noarch
+subpackages="
+	$pkgname-dbg
+	$pkgname-bash-completion
+	$pkgname-prompt::noarch
 	perl-$pkgname-svn:_perl_git_svn:noarch
 	perl-$pkgname:_perl_git:noarch
-	$pkgname-svn
+	$pkgname-svn::noarch
 	$pkgname-email
-	$pkgname-fast-import:_fast_import
+	$pkgname-fast-import:_fast_import:noarch
 	$pkgname-cvs::noarch
-	$pkgname-p4::noarch
 	$pkgname-daemon
 	$pkgname-daemon-openrc:daemon_openrc
+	$pkgname-scalar
 	$pkgname-gitweb::noarch
 	$pkgname-subtree::noarch
-	$pkgname-subtree-doc:subtree_doc:noarch
-	$pkgname-perl:_git_perl:noarch
-	$pkgname-gui::noarch
-	$pkgname-gitk::noarch
 	$pkgname-diff-highlight:diff_highlight:noarch
+	$pkgname-perl:_git_perl:noarch
+	$pkgname-init-template:_init_template:noarch
 	"
 source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz
 	git-daemon.initd
 	git-daemon.confd
+	fix-t4219-with-sticky-bit.patch
 	"
+options="$options !check" # a few need updated for perl 5.38
 
 _gitcoredir=/usr/libexec/git-core
 
+if [ -z "$BOOTSTRAP" ]; then
+	# we need tcl and tk to be built before git due to git-gui and gitk
+	makedepends="$makedepends asciidoc python3-dev tcl tk libsecret-dev glib-dev"
+	subpackages="$subpackages
+		$pkgname-doc
+		$pkgname-p4::noarch
+		$pkgname-gui::noarch
+		$pkgname-gitk::noarch
+		$pkgname-subtree-doc:subtree_doc:noarch
+		$pkgname-credential-libsecret:credential_libsecret
+		"
+fi
+
+case "$CARCH" in
+s390x)
+	# todo: they fail with strange between-test email mismatches
+	options="$options !check"
+	;;
+esac
+
 prepare() {
 	default_prepare
 
@@ -64,42 +120,94 @@ prepare() {
 		NO_GETTEXT=YesPlease
 		NO_SVN_TESTS=YesPlease
 		NO_REGEX=YesPlease
-		USE_LIBPCRE2=YesPlease
 		NO_SYS_POLL_H=1
-		CFLAGS=$CFLAGS
+		ICONV_OMITS_BOM=Yes
+		INSTALL_SYMLINKS=1
+		CC=${CC:-cc}
+		CXX=${CC:-c++}
+		CFLAGS=$CFLAGS -flto=auto
+		LDFLAGS=$LDFLAGS -flto=auto
+		USE_LIBPCRE2=YesPlease
+		PYTHON_PATH=/usr/bin/python3
 	EOF
 
-	# The multimail hook is installed with git. Use python3 to avoid an
-	# unnecessary python2 dependency.
-	sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \
-		contrib/hooks/multimail/git_multimail.py \
-		contrib/hooks/multimail/migrate-mailhook-config \
-		contrib/hooks/multimail/post-receive.example
+	if [ -n "$BOOTSTRAP" ]; then
+		cat >> config.mak <<-EOF
+			NO_PYTHON=YesPlease
+			NO_TCLTK=YesPlease
+		EOF
+	fi
 }
 
 build() {
-	make prefix=/usr DESTDIR="$pkgdir" perllibdir=$(_perl_config vendorlib)
+	make prefix=/usr \
+		DESTDIR="$pkgdir" \
+		perllibdir="$(_perl_config vendorlib)" \
+		all
+
+	make -C contrib/subtree prefix=/usr DESTDIR="$pkgdir"
+	make -C contrib/diff-highlight prefix=/usr DESTDIR="$pkgdir"
+
+	if [ -z "$BOOTSTRAP" ]; then
+		# generate manpages outside of package()
+		make prefix=/usr man
+
+		make prefix=/usr -C contrib/credential/libsecret
+	fi
+}
+
+check() {
+	make -C t prefix=/usr DESTDIR="$pkgdir" \
+		perlibdir="$(_perl_config vendorlib)" \
+		all
 }
 
 package() {
-	make prefix=/usr DESTDIR="$pkgdir" INSTALLDIRS=vendor \
-		perllibdir=$(_perl_config vendorlib) \
-		install install-man
+	if [ -z "$BOOTSTRAP" ]; then
+		local install_man=install-man
+	fi
+
+	make prefix=/usr \
+		DESTDIR="$pkgdir" \
+		INSTALLDIRS=vendor \
+		perllibdir="$(_perl_config vendorlib)" \
+		install \
+		$install_man
+
+	make -C contrib/subtree install prefix=/usr DESTDIR="$pkgdir"
 
 	mkdir -p "$pkgdir"/var/git
+
 	install -Dm755 "$srcdir"/git-daemon.initd "$pkgdir"/etc/init.d/git-daemon
 	install -Dm644 "$srcdir"/git-daemon.confd "$pkgdir"/etc/conf.d/git-daemon
+
+	install -Dm755 contrib/diff-highlight/diff-highlight -t "$pkgdir"/usr/bin/
+
+	install -Dm644 contrib/completion/git-completion.bash \
+		"$pkgdir"/usr/share/bash-completion/completions/git
+
+	install -Dm644 contrib/completion/git-prompt.sh \
+		"$pkgdir"/usr/share/git-core/git-prompt.sh
+
+	if [ -z "$BOOTSTRAP" ]; then
+		install -Dm755 contrib/credential/libsecret/git-credential-libsecret "$pkgdir"/usr/libexec/git-core
+	fi
+}
+
+prompt() {
+	pkgdesc="bash and zsh prompt integration for Git"
+	depends="git=$pkgver-r$pkgrel"
+
+	amove usr/share/git-core/git-prompt.sh
 }
 
 _perl_git_svn() {
 	pkgdesc="Perl interface to Git::SVN"
 	depends="git=$pkgver-r$pkgrel perl-git=$pkgver-r$pkgrel"
-	local vendorlib
 
-	vendorlib=$(_perl_config vendorlib)
+	local vendorlib=$(_perl_config vendorlib)
 
-	mkdir -p "$subpkgdir"/$vendorlib/Git
-	mv "$pkgdir"/$vendorlib/Git/SVN* "$subpkgdir"/$vendorlib/Git/
+	amove $vendorlib/Git/SVN*
 }
 
 _perl_git() {
@@ -109,8 +217,7 @@ _perl_git() {
 	local i
 	for i in "$(_perl_config vendorlib)" "$(_perl_config vendorarch)"; do
 		[ -d "$pkgdir/$i" ] || continue
-		mkdir -p "$subpkgdir"/${i%/*}
-		mv "$pkgdir"/$i "$subpkgdir"/$i
+		amove $i
 	done
 }
 
@@ -118,58 +225,53 @@ email() {
 	pkgdesc="Git tools for sending email"
 	depends="perl perl-git=$pkgver-r$pkgrel perl-net-smtp-ssl perl-authen-sasl"
 
-	mkdir -p "$subpkgdir"/$_gitcoredir
-	mv "$pkgdir"/$_gitcoredir/*email* "$pkgdir"/$_gitcoredir/*imap* \
-		"$subpkgdir"/$_gitcoredir
+	amove $_gitcoredir/*email*
+	amove $_gitcoredir/*imap*
 }
 
 svn() {
 	pkgdesc="Subversion support for git"
-	depends="perl perl-git-svn=$pkgver-r$pkgrel perl-subversion
-		perl-term-readkey"
-
-	mkdir -p "$subpkgdir"/$_gitcoredir
-	mv "$pkgdir"/$_gitcoredir/git-svn \
-		"$pkgdir"$_gitcoredir/git-remote-testsvn \
-		"$subpkgdir"/$_gitcoredir/
+	depends="
+		perl
+		perl-git-svn=$pkgver-r$pkgrel
+		perl-subversion
+		perl-term-readkey
+		"
+
+	amove $_gitcoredir/git-svn
 }
 
 cvs() {
 	pkgdesc="Git tools for importing CVS repositories"
 	depends="perl perl-git=$pkgver-r$pkgrel cvs perl-dbd-sqlite"
 
-	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/$_gitcoredir
-	mv "$pkgdir"/usr/bin/git-cvs* "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/$_gitcoredir/*cvs* "$subpkgdir"/$_gitcoredir
+	amove usr/bin/git-cvs*
+	amove $_gitcoredir/*cvs*
 }
 
 _fast_import() {
 	pkgdesc="Git backend for fast Git data importers"
 	depends="git=$pkgver-r$pkgrel"
 
-	mkdir -p "$subpkgdir"/$_gitcoredir
-	mv "$pkgdir"/$_gitcoredir/git-fast-import "$subpkgdir"/$_gitcoredir/
+	amove $_gitcoredir/git-fast-import
 }
 
 p4() {
 	pkgdesc="Git tools for working with Perforce depots"
 	depends="git=$pkgver-r$pkgrel git-fast-import=$pkgver-r$pkgrel"
 
-	mkdir -p "$subpkgdir"/$_gitcoredir/mergetools
-	mv "$pkgdir"/$_gitcoredir/*p4* "$subpkgdir"/$_gitcoredir/
-	mv "$pkgdir"/$_gitcoredir/mergetools/*p4* \
-		"$subpkgdir"/$_gitcoredir/mergetools/
+	amove $_gitcoredir/*p4*
+	amove $_gitcoredir/mergetools/*p4*
 }
 
 daemon() {
 	pkgdesc="Git protocol daemon"
 	depends="git=$pkgver-r$pkgrel"
 
-	mkdir -p "$subpkgdir"/$_gitcoredir
-	mv "$pkgdir"/$_gitcoredir/git-daemon \
-		"$pkgdir"/$_gitcoredir/git-http-backend \
-		"$pkgdir"/$_gitcoredir/git-shell \
-		"$subpkgdir"/$_gitcoredir/
+	amove $_gitcoredir/git-daemon
+	amove $_gitcoredir/git-http-backend
+	amove $_gitcoredir/git-shell
+	amove var/git
 }
 
 daemon_openrc() {
@@ -185,32 +287,21 @@ gitweb() {
 	pkgdesc="Simple web interface to git repositories"
 	depends="git=$pkgver-r$pkgrel perl"
 
-	mkdir -p "$subpkgdir"/usr/share "$subpkgdir"$_gitcoredir
-	mv "$pkgdir"/usr/share/gitweb "$subpkgdir"/usr/share/
-	mv "$pkgdir"/$_gitcoredir/git-instaweb "$subpkgdir"$_gitcoredir/
-}
-
-completion() {
-	pkgdesc="Bash completion for $pkgname"
-	depends=""
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
-	install -Dm644 "$builddir"/contrib/completion/git-completion.bash \
-		"$subpkgdir"/usr/share/bash-completion/completions/git
+	amove $_gitcoredir/git-instaweb
+	amove usr/share/gitweb
 }
 
 subtree() {
 	depends="git=$pkgver-r$pkgrel"
 	pkgdesc="Split git repository into subtrees"
 
-	cd "$builddir"/contrib/subtree
-	make prefix=/usr DESTDIR="$pkgdir"
-	make install prefix=/usr DESTDIR="$subpkgdir"
+	amove $_gitcoredir/git-subtree
 }
 
 subtree_doc() {
 	pkgdesc="Split git repository into subtrees (documentation)"
 	depends=""
+	install_if="docs git-subtree=$pkgver-r$pkgrel"
 
 	cd "$builddir"/contrib/subtree
 	make install-man prefix=/usr DESTDIR="$subpkgdir"
@@ -221,33 +312,40 @@ gui() {
 	pkgdesc="GUI interface for git"
 	depends="git=$pkgver-r$pkgrel tcl tk"
 
-	mkdir -p "$subpkgdir"/usr/share "$subpkgdir"/usr/libexec/git-core
-	mv "$pkgdir"/usr/share/git-gui "$subpkgdir"/usr/share/
-	mv "$pkgdir"/usr/libexec/git-core/git-citool \
-		"$pkgdir"/usr/libexec/git-core/git-gui \
-		"$pkgdir"/usr/libexec/git-core/git-gui--askpass \
-		"$subpkgdir"/usr/libexec/git-core/
+	amove usr/share/git-gui
+	amove $_gitcoredir/git-citool
+	amove $_gitcoredir/git-gui
+	amove $_gitcoredir/git-gui--askpass
 }
 
 gitk() {
 	pkgdesc="Gitk interface for git"
 	depends="git=$pkgver-r$pkgrel tcl tk"
 
-	mkdir -p "$subpkgdir"/usr/share "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/share/gitk "$subpkgdir"/usr/share/
-	mv "$pkgdir"/usr/bin/gitk "$subpkgdir"/usr/bin/
+	amove usr/share/gitk
+	amove usr/bin/gitk
 }
 
 diff_highlight() {
 	pkgdesc="diff highlight for git"
 	depends="git=$pkgver-r$pkgrel perl"
 
-	cd "$builddir"/contrib/diff-highlight
+	amove usr/bin/diff-highlight
+}
 
-	make prefix=/usr DESTDIR="$subpkgdir"
+credential_libsecret() {
+	pkgdesc="libsecret-based credential helper"
+	depends="git=$pkgver-r$pkgrel"
 
-	mkdir -p "$subpkgdir"/usr/bin
-	install -Dm755 diff-highlight "$subpkgdir"/usr/bin/
+	amove usr/libexec/git-core/git-credential-libsecret
+}
+
+scalar() {
+	pkgdesc="Git scalar monorepo tool"
+	depends="git=$pkgver-r$pkgrel"
+
+	amove usr/bin/scalar
+	amove usr/libexec/git-core/scalar
 }
 
 # catch-the-rest of stuff that needs perl
@@ -258,9 +356,8 @@ _git_perl() {
 
 	mkdir -p "$subpkgdir"/usr/lib
 	cd "$pkgdir"
-	find -type f | xargs file --mime-type | grep perl | cut -d: -f1| while read f; do
-		mkdir -p "$subpkgdir"/${f%/*}
-		mv "$f" "$subpkgdir"/${f%/*}
+	find . -type f -print0 | xargs -0 file --mime-type | grep perl | cut -d: -f1 | while read -r f; do
+		amove "$f"
 	done
 	find "$subpkgdir" -name perllocal.pod -delete
 }
@@ -270,6 +367,20 @@ _perl_config() {
 	perl -e "use Config; print \$Config{$1};"
 }
 
-sha512sums="bf8a832211782a9446d041a54da254f2586b894375191fb1a6dc7a6594856ca43230fa1ea804b54daceb68caa8d20c02bdbdbf7b2fa1761ce05a11a26b122a9b  git-2.26.0.tar.xz
+_init_template() {
+	pkgdesc="Git init template directory"
+	# Some scripts expect file from the template to exist. Installing
+	# them by default for compatibility
+	install_if="git=$pkgver-r$pkgrel"
+
+	# leave empty directory to prevent git warning
+	mkdir -p -- "$subpkgdir"/usr/share/git-core/templates
+	mv -- "$pkgdir"/usr/share/git-core/templates/* "$subpkgdir"/usr/share/git-core/templates
+}
+
+sha512sums="
+9e4b9c8a8e28cd50c0db75a93eae8a3423aa7e51c4312af1e1cdaf408e93f306c23aa747f0a97f27c11ab0e2f5e6283e52c8b61c9fe6be5b9b18673a43ce1780  git-2.44.0.tar.xz
 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a  git-daemon.initd
-fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec  git-daemon.confd"
+fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec  git-daemon.confd
+be5d568fc5b8b84c9afb97b31e471e41f32ccfe188eba0588ea0ef98b2d96c2ce4b2c1a3d70e88205aa4f6667f850b3f32c13bbb149ecddbf670344c162a4e25  fix-t4219-with-sticky-bit.patch
+"
diff --git a/main/git/fix-t4219-with-sticky-bit.patch b/main/git/fix-t4219-with-sticky-bit.patch
new file mode 100644
index 00000000000..54ac184f2d3
--- /dev/null
+++ b/main/git/fix-t4219-with-sticky-bit.patch
@@ -0,0 +1,48 @@
+The last test of t4129 creates a directory and expects its setgid bit
+(g+s) to be off. But this makes the test fail when the parent directory
+has the bit set, as setgid's state is inherited by newly created
+subdirectories. Make the test more robust by accepting the presence of
+the setgid bit on the created directory. We only allow 'S' (setgid on
+but no executable permission) and not 's' (setgid on with executable
+permission) because the previous 'umask 0077' shouldn't allow the second
+scenario to happen.
+
+Note that only subdirectories inherit this bit, so we don't have to make
+the same change for the regular file that is also created by this test.
+But checking the permissions using grep instead of test_cmp makes the
+test a little simpler, so let's use it for the regular file as well.
+
+Also note that the sticky bit (+t) and the setuid bit (u+s) are not
+inherited, so we don't have to worry about those.
+
+Reported-by: Kevin Daudt <me@ikke.info>
+Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
+---
+ t/t4129-apply-samemode.sh | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh
+index 41818d8315..3818398ca9 100755
+--- a/t/t4129-apply-samemode.sh
++++ b/t/t4129-apply-samemode.sh
+@@ -90,12 +90,10 @@ test_expect_success POSIXPERM 'do not use core.sharedRepository for working tree
+ 		rm -rf d f1 &&
+ 		git apply patch-f1-and-f2.txt &&
+ 
+-		echo "-rw-------" >f1_mode.expected &&
+-		echo "drwx------" >d_mode.expected &&
+-		test_modebits f1 >f1_mode.actual &&
+-		test_modebits d >d_mode.actual &&
+-		test_cmp f1_mode.expected f1_mode.actual &&
+-		test_cmp d_mode.expected d_mode.actual
++		test_modebits f1 >f1_mode &&
++		test_modebits d >d_mode &&
++		grep "^-rw-------$" f1_mode &&
++		grep "^drwx--[-S]---$" d_mode
+ 	)
+ '
+ 
+-- 
+2.29.2
+
+
diff --git a/main/gitolite/APKBUILD b/main/gitolite/APKBUILD
index 9bd61986cad..9c7a49c7c51 100644
--- a/main/gitolite/APKBUILD
+++ b/main/gitolite/APKBUILD
@@ -1,33 +1,38 @@
+# Maintainer: Łukasz Jendrysik <scadu@yandex.com>
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Maintainer:	Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=gitolite
-pkgver=3.6.11
+pkgver=3.6.13
 pkgrel=0
 pkgdesc="Centralized git server, with very fine-grained access control and many powerful features"
 url="https://github.com/sitaramc/gitolite"
 arch="noarch"
 license="GPL-2.0-only"
+options="!check" # fixme: setup test environment
 depends="git perl"
 install=$pkgname.pre-install
 pkgusers="git"
 pkggroups="git"
 source="$pkgname-$pkgver.tar.gz::https://github.com/sitaramc/gitolite/archive/v$pkgver.tar.gz"
-builddir="$srcdir"/$pkgname-$pkgver
 
 # secfixes:
 #   3.6.11-r0:
-#   - CVE-2018-20683
+#     - CVE-2018-20683
+
+check() {
+	GITOLITE_TEST=y prove
+}
 
 package() {
 	install -d "$pkgdir"/usr/bin
 	install -d "$pkgdir"/usr/lib/gitolite
 
-	cd "$builddir"
 	./install -to "$pkgdir"/usr/lib/gitolite
 	echo $pkgver > "$pkgdir"/usr/lib/gitolite/VERSION
 	ln -s /usr/lib/gitolite/gitolite "$pkgdir"/usr/bin/
 	install -o git -g git -d -m 700 "$pkgdir"/var/lib/git
 }
 
-sha512sums="7c11b3dfde9ecf9ef66185aab175d78302c42cc24f13e3e855fa27ffaee65b5887bdd7f96b00b6eed944b91af2b86993b284d1a09fe5a5a3cce82acd33631212  gitolite-3.6.11.tar.gz"
+sha512sums="
+95c232dd117b8849b205946b6427422abadbfb0d59fdb72f1de75813cbe3fbf63cbc0f5f5f2de4e761797c0cf5423c94805a55af87b7ff78a2d9ea9f2406dfcb  gitolite-3.6.13.tar.gz
+"
diff --git a/main/glib/0001-gquark-fix-initialization-with-c-constructors.patch b/main/glib/0001-gquark-fix-initialization-with-c-constructors.patch
deleted file mode 100644
index 50a9a8c28a1..00000000000
--- a/main/glib/0001-gquark-fix-initialization-with-c-constructors.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e4216dee57f5156e192b2910f13eb855a104cb18 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 6 Jul 2016 12:38:40 +0200
-Subject: [PATCH] gquark: fix initialization with c++ constructors
-
-C++ constructors may want create new quarks, but we can not guarantee
-that the glib library ctor is executed first. Therefore we make sure
-that quarks are always initialized from g_quark_from_string and
-g_quark_from_static_string
-
-This fixes crashes in glibmm with musl which likely happens on AIX too.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=768215
-https://bugzilla.gnome.org/show_bug.cgi?id=756139#c14
----
- glib/gquark.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/glib/gquark.c b/glib/gquark.c
-index 9e51a92..17ecd7f 100644
---- a/glib/gquark.c
-+++ b/glib/gquark.c
-@@ -57,6 +57,11 @@ static gint           quark_block_offset = 0;
- void
- g_quark_init (void)
- {
-+  /* we may be initialized from c++ constructor or the glib ctor, but we
-+  cannot guarantee in what order. So we check if we have been initialized */
-+  if (quark_ht != NULL)
-+    return;
-+
-   g_assert (quark_seq_id == 0);
-   quark_ht = g_hash_table_new (g_str_hash, g_str_equal);
-   quarks = g_new (gchar*, QUARK_BLOCK_SIZE);
-@@ -179,6 +184,9 @@ quark_from_string (const gchar *string,
- {
-   GQuark quark = 0;
- 
-+  if (G_UNLIKELY (quark_ht == NULL))
-+    g_quark_init();
-+
-   quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string));
- 
-   if (!quark)
--- 
-2.9.0
-
diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD
index 3a8f4a6b3fa..babe4c69254 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -1,79 +1,150 @@
 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Pablo Correa Gómez <ablocorrea@hotmail.com>
 pkgname=glib
-pkgver=2.64.1
-pkgrel=0
+pkgver=2.80.0
+_gi_version=1.80.1
+pkgrel=3
 pkgdesc="Common C routines used by Gtk+ and other libs"
 url="https://developer.gnome.org/glib/"
 arch="all"
 license="LGPL-2.1-or-later"
-triggers="$pkgname.trigger=/usr/share/glib-2.0/schemas:/usr/lib/gio/modules"
-depends_dev="python3 gettext-dev bzip2-dev libxml2-utils libxslt
-	docbook-xml docbook-xsl"
-makedepends="$depends_dev pcre-dev meson zlib-dev libffi-dev util-linux-dev"
-options="!check" # don't like to be run without first being installed
+triggers="$pkgname.trigger=/usr/share/glib-2.0/schemas:/usr/lib/gio/modules:/usr/lib/gtk-4.0"
+depends_dev="
+	bzip2-dev
+	docbook-xml
+	docbook-xsl
+	gettext-dev
+	libxml2-utils
+	libxslt
+	python3
+	py3-packaging
+	"
+makedepends="$depends_dev
+	bison
+	flex
+	libffi-dev
+	meson
+	pcre2-dev
+	py3-setuptools
+	python3-dev
+	util-linux-dev
+	zlib-dev
+	py3-docutils
+	"
+subpackages="
+	$pkgname-dbg
+	$pkgname-doc
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-lang
+	$pkgname-bash-completion
+	"
 source="https://download.gnome.org/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
-	0001-gquark-fix-initialization-with-c-constructors.patch
+	https://download.gnome.org/sources/gobject-introspection/${_gi_version%.*}/gobject-introspection-$_gi_version.tar.xz
+	alwaysbash.patch
 	deprecated-no-warn.patch
-	musl-libintl.patch
-	mips-disable-memory-barrier.patch
-	mips-disable-some-gio-test-resources.patch
+	tests-machine-id.patch
+	fix-tests.patch
+	flaky-tests.patch
 	"
-subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev $pkgname-lang"
+
+# 2.80 moves gir here
+replaces="gobject-introspection<1.80.0"
 
 # secfixes:
+#   2.66.6-r0:
+#     - CVE-2021-27219 GHSL-2021-045
 #   2.62.5-r0:
 #     - CVE-2020-6750
 #   2.60.4-r0:
 #     - CVE-2019-12450
 
 build() {
-	meson \
+	export CFLAGS="$CFLAGS -ffat-lto-objects -O2"
+	export CXXFLAGS="$CXXFLAGS -O2"
+	export CPPFLAGS="$CPPFLAGS -O2"
+	local _prefix="$PWD/boostrap-glib"
+
+	msg "build bootstrap glib"
+	meson setup \
+		--default-library=shared \
+		--prefix="$_prefix" \
+		-Dman-pages=disabled \
+		-Dlibmount=disabled \
+		-Dtests=false \
+		-Dintrospection=disabled \
+		-Dnls=disabled \
+		. output
+	meson compile -C output
+	meson install --no-rebuild -C output
+
+	msg "build bootstrap gobject-introspection"
+	meson setup \
+		--pkg-config-path="$_prefix"/lib/pkgconfig \
+		--prefix="$_prefix" \
+		-Dbuild_introspection_data=false \
+		-Dcairo=disabled \
+		-Ddoctool=disabled \
+		"$srcdir"/gobject-introspection-$_gi_version \
+		gioutput
+	meson compile -C gioutput
+	meson install --no-rebuild -C gioutput
+
+	msg "re-build glib with introspection"
+	PATH="$_prefix/bin:$PATH" LD_LIBRARY_PATH="$_prefix/lib" \
+		meson setup \
+		--reconfigure \
+		--pkg-config-path="$_prefix"/lib/pkgconfig \
 		--default-library=both \
 		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--buildtype=plain \
-		-Dman=true \
+		-Dman-pages=enabled \
+		-Dlibmount=enabled \
+		-Dtests="$(want_check && echo true || echo false)" \
+		-Dintrospection=enabled \
+		-Dnls=enabled \
 		. output
-	ninja -C output
+	PATH="$_prefix/bin:$PATH" LD_LIBRARY_PATH="$_prefix/lib" \
+		meson compile -C output
+}
 
-	# FIXME: meson adds -lintl first in Libs: in the .pc file but it needs to be
-	#        last for static builds (e.g. qemu)
-	sed -i -e '/^Libs:/s/-lintl \(.*\)/\1 -lintl/' output/meson-private/glib-2.0.pc
+check() {
+	# riscv64 may time out increase the timeout
+	meson test --timeout-multiplier 2 --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C output install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
 dev() {
+	# 2.80 moves gir here
+	replaces="gobject-introspection-dev<1.80.0"
 	default_dev
 	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/share
-		find "$pkgdir"/usr/bin ! -name "glib-compile-schemas" -a \( \
+	find "$pkgdir"/usr/bin ! -name "glib-compile-schemas" -a \( \
 		-name "gdbus-codegen" -o \
 		-name "gobject-query" -o \
 		-name "gresource" -o \
 		-name "gtester*" -o \
 		-name "glib-*" \) \
 		-exec mv {} "$subpkgdir"/usr/bin \;
-	mv "$pkgdir"/usr/share/gdb "$pkgdir"/usr/share/glib-2.0 \
-		"$subpkgdir"/usr/share
+
+	amove usr/share/gdb usr/share/glib-2.0
 }
 
 static() {
-	pkgdesc="glib static libraries"
+	default_static
 	depends="gettext-static"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
 }
 
-sha512sums="1cefe49a42233f24ac6bd09c134ceea7119f4f74f42204a731be56100a180eec69c8224674f0b08d1538ad0859896ed08260a6af0fed469c7d10b4508116a6bc  glib-2.64.1.tar.xz
-32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b  0001-gquark-fix-initialization-with-c-constructors.patch
+sha512sums="
+1514d62aeb4c4a1a1048ae0f84f7db7f0dbf355772b2dadf6a34ec547045b163a5e28331b096e7616fe3c9c19bed98025a0202b05073f5d7ee901d0efaffe143  glib-2.80.0.tar.xz
+f45c2c1b105086488d974c6134db9910746df8edb187772f2ecd249656a1047c8ac88ba51f5bf7393c3d99c3ace143ecd09be256c2f4d0ceee110c9ad51a839a  gobject-introspection-1.80.1.tar.xz
+41d23f0797cae11d017f9e9492173f1f68125d99c28416ff2482e3eb81460a9c33cecc2bee806dad1d1da19800d0a90ae43d9a44f5e2864c2cd7c8a704669eb3  alwaysbash.patch
 744239ea2afb47e15d5d0214c37d7c798edac53797ca3ac14d515aee4cc3999ef9716ba744c64c40198fb259edc922559f77c9051104a568fc8ee4fc790810b1  deprecated-no-warn.patch
-6ec43e76bb973367bd99c5e2077113e86df2b120b3788aeeb4692a572392bba7227e8217b28a918e02ad82fcb8ca6d260c3221b84688774d86779755af51a847  musl-libintl.patch
-f853ddb4ff8231e1df15323773af938323517b643b241fc635d05f7d6e103ff18417d203c65661c7dd0b5e44c5d74c71a497e82281c2bb4ed4e2fe9b9ed7140f  mips-disable-memory-barrier.patch
-755c468622e1923967d52de4878d641ec7d31bd0f83b0756d61cb668220213d6db1a751826f4f1fb611e998b653afc1e367fe0fe475063737c9786f84ee91538  mips-disable-some-gio-test-resources.patch"
+4f561bfede4a559b314195aa4b7b5923a52c62063e6dd33b4933ad53b29c32ef789d69b9f7b17d8d701323006366e6b7acbb083a68674c1c535c185d35cc5d1f  tests-machine-id.patch
+f04c66eb04b709df16fbc24e51a6bb11f06dc1658c55295f7c8203dd091bc5ca99acd224c760b467b04e102d98987b585e828ad80125c08e407b399e9651ea3a  fix-tests.patch
+268cf6f089274f29285242f1e29bf5650e85f9fcb5744df884deb139493cc25792ad78487113732665f1c5393c94b2f76f97093a1a003e3caaf65c07960a1bf9  flaky-tests.patch
+"
diff --git a/main/glib/alwaysbash.patch b/main/glib/alwaysbash.patch
new file mode 100644
index 00000000000..ec29d87ba1e
--- /dev/null
+++ b/main/glib/alwaysbash.patch
@@ -0,0 +1,16 @@
+the completions only install if bash is detected.
+instead of adding bash to makedeps, just always install them
+--
+diff --git a/gio/meson.build b/gio/meson.build
+index 462606f..bb3e19d 100644
+--- a/gio/meson.build
++++ b/gio/meson.build
+@@ -805,7 +805,7 @@ if host_system == 'windows'
+   internal_deps += [ giowin32_lib ]
+ endif
+ 
+-if have_bash
++if true
+   bash_comp_inst_dir = ''
+   if bash_comp_dep.found()
+     bash_comp_dir_override = bash_comp_dep.version().version_compare('>= 2.10') ? ['datadir', get_option('datadir')] : ['prefix', get_option('prefix')]
diff --git a/main/glib/fix-tests.patch b/main/glib/fix-tests.patch
new file mode 100644
index 00000000000..8db4619f2d4
--- /dev/null
+++ b/main/glib/fix-tests.patch
@@ -0,0 +1,457 @@
+From 01304c97693a7c789bde9c543979872fc63c387c Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 3 Apr 2024 21:11:24 +0200
+Subject: [PATCH 1/3] tests: skip test that requires shared-mime-info when its
+ missing
+
+shared-mime-info required glib to build and will not be there during
+bootstrap. Skip the test if it is missing.
+
+ref: https://gitlab.gnome.org/GNOME/glib/-/issues/3317
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ gio/tests/contenttype.c | 47 +++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 45 insertions(+), 2 deletions(-)
+
+diff --git a/gio/tests/contenttype.c b/gio/tests/contenttype.c
+index 8784374f2..b442d5352 100644
+--- a/gio/tests/contenttype.c
++++ b/gio/tests/contenttype.c
+@@ -13,6 +13,20 @@
+                                   __s1, " == ", __s2); 		\
+   } while (0)
+ 
++static gboolean
++skip_missing_shared_mime_info (void)
++{
++  const gchar *path = g_find_program_in_path("update-mime-database");
++
++  if (path == NULL)
++    {
++      g_test_skip ("shared-mime-info is required to run this test");
++      return TRUE;
++    }
++  g_free(path);
++  return FALSE;
++}
++
+ static void
+ test_guess (void)
+ {
+@@ -26,6 +40,9 @@ test_guess (void)
+     "Name=appinfo-test\n"
+     "Exec=./appinfo-test --option\n";
+ 
++  if (skip_missing_shared_mime_info ())
++    return;
++
+ #ifdef G_OS_WIN32
+   existing_directory = (gchar *) g_getenv ("SYSTEMROOT");
+ 
+@@ -150,6 +167,9 @@ test_subtype (void)
+   gchar *plain;
+   gchar *xml;
+ 
++  if (skip_missing_shared_mime_info ())
++    return;
++
+   plain = g_content_type_from_mime_type ("text/plain");
+   xml = g_content_type_from_mime_type ("application/xml");
+ 
+@@ -175,6 +195,9 @@ test_list (void)
+   gchar *plain;
+   gchar *xml;
+ 
++  if (skip_missing_shared_mime_info ())
++    return;
++
+ #ifdef __APPLE__
+   g_test_skip ("The OSX backend does not implement g_content_types_get_registered()");
+   return;
+@@ -202,6 +225,9 @@ test_executable (void)
+ {
+   gchar *type;
+ 
++  if (skip_missing_shared_mime_info ())
++    return;
++
+ #ifdef G_OS_WIN32
+   type = g_content_type_from_mime_type ("application/vnd.microsoft.portable-executable");
+   /* FIXME: the MIME is not in the default `MIME\Database\Content Type` registry.
+@@ -228,6 +254,9 @@ test_description (void)
+   gchar *type;
+   gchar *desc;
+ 
++  if (skip_missing_shared_mime_info ())
++    return;
++
+   type = g_content_type_from_mime_type ("text/plain");
+   desc = g_content_type_get_description (type);
+   g_assert_nonnull (desc);
+@@ -242,6 +271,9 @@ test_icon (void)
+   gchar *type;
+   GIcon *icon;
+ 
++  if (skip_missing_shared_mime_info ())
++    return;
++
+   type = g_content_type_from_mime_type ("text/plain");
+   icon = g_content_type_get_icon (type);
+   g_assert_true (G_IS_ICON (icon));
+@@ -290,6 +322,9 @@ test_symbolic_icon (void)
+   gchar *type;
+   GIcon *icon;
+ 
++  if (skip_missing_shared_mime_info ())
++    return;
++
+   type = g_content_type_from_mime_type ("text/plain");
+   icon = g_content_type_get_symbolic_icon (type);
+   g_assert_true (G_IS_ICON (icon));
+@@ -344,6 +379,9 @@ test_tree (void)
+   gchar **types;
+   gsize i;
+ 
++  if (skip_missing_shared_mime_info ())
++    return;
++
+ #if defined(__APPLE__) || defined(G_OS_WIN32)
+   g_test_skip ("The OSX & Windows backends do not implement g_content_type_guess_for_tree()");
+   return;
+@@ -437,8 +475,13 @@ test_guess_svg_from_data (void)
+ </svg>\n";
+ 
+   gboolean uncertain = TRUE;
+-  gchar *res = g_content_type_guess (NULL, (guchar *)svgfilecontent,
+-                                     sizeof (svgfilecontent) - 1, &uncertain);
++  gchar *res;
++
++  if (skip_missing_shared_mime_info ())
++    return;
++
++  res = g_content_type_guess (NULL, (guchar *)svgfilecontent,
++                              sizeof (svgfilecontent) - 1, &uncertain);
+ #ifdef __APPLE__
+   g_assert_cmpstr (res, ==, "public.svg-image");
+ #elif defined(G_OS_WIN32)
+-- 
+2.44.0
+
+
+From a77fdc4cae8deb7ef9f47e81f81a8db139434093 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 4 Apr 2024 17:08:46 +0200
+Subject: [PATCH 2/3] tests: skip tests that requires dbus-daemon when its
+ missing
+
+dbus may not be built yet during bootstrap, because it needs glib to
+build.
+
+Ref: https://gitlab.gnome.org/GNOME/glib/-/issues/3317
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ gio/tests/appinfo.c          | 22 ++++++++++++++++++++++
+ gio/tests/desktop-app-info.c | 19 +++++++++++++++++++
+ 2 files changed, 41 insertions(+)
+
+diff --git a/gio/tests/appinfo.c b/gio/tests/appinfo.c
+index d9c53c853..81bc48191 100644
+--- a/gio/tests/appinfo.c
++++ b/gio/tests/appinfo.c
+@@ -49,6 +49,19 @@ test_launch_for_app_info (GAppInfo *appinfo)
+   g_free (uri);
+ }
+ 
++static gboolean
++skip_missing_dbus_daemon (void)
++{
++  const gchar *path = g_find_program_in_path ("dbus-daemon");
++  if (path == NULL)
++    {
++      g_test_skip ("dbus-daemon is required to run this test");
++      return TRUE;
++    }
++  g_free (path);
++  return FALSE;
++}
++
+ static void
+ test_launch (void)
+ {
+@@ -56,6 +69,9 @@ test_launch (void)
+   GAppInfo *appinfo;
+   const gchar *path;
+ 
++  if (skip_missing_dbus_daemon ())
++    return;
++
+   /* Set up a test session bus to keep D-Bus traffic off the real session bus. */
+   bus = g_test_dbus_new (G_TEST_DBUS_NONE);
+   g_test_dbus_up (bus);
+@@ -96,6 +112,9 @@ test_launch_no_app_id (void)
+   gchar *exec_line_variants[2];
+   gsize i;
+ 
++  if (skip_missing_dbus_daemon ())
++    return;
++
+   exec_line_variants[0] = g_strdup_printf (
+       "Exec=%s/appinfo-test --option %%U %%i --name %%c --filename %%k %%m %%%%",
+       g_test_get_dir (G_TEST_BUILT));
+@@ -356,6 +375,9 @@ test_launch_context_signals (void)
+   gboolean success;
+   gchar *cmdline;
+ 
++  if (skip_missing_dbus_daemon ())
++    return;
++
+   /* Set up a test session bus to keep D-Bus traffic off the real session bus. */
+   bus = g_test_dbus_new (G_TEST_DBUS_NONE);
+   g_test_dbus_up (bus);
+diff --git a/gio/tests/desktop-app-info.c b/gio/tests/desktop-app-info.c
+index e82e2dd31..ec65b7618 100644
+--- a/gio/tests/desktop-app-info.c
++++ b/gio/tests/desktop-app-info.c
+@@ -593,6 +593,19 @@ wait_for_file (const gchar *want_this,
+   unlink (or_this);
+ }
+ 
++static gboolean
++skip_missing_dbus_daemon (void)
++{
++  const gchar *path = g_find_program_in_path ("dbus-daemon");
++  if (path == NULL)
++    {
++      g_test_skip ("dbus-daemon is required to run this test");
++      return TRUE;
++    }
++  g_free (path);
++  return FALSE;
++}
++
+ static void
+ test_actions (void)
+ {
+@@ -606,6 +619,9 @@ test_actions (void)
+   gchar *tweak_path;
+   gchar *twiddle_path;
+ 
++  if (skip_missing_dbus_daemon ())
++    return;
++
+   /* Set up a test session bus to keep D-Bus traffic off the real session bus. */
+   bus = g_test_dbus_new (G_TEST_DBUS_NONE);
+   g_test_dbus_up (bus);
+@@ -1833,6 +1849,9 @@ test_launch_fail_dbus (void)
+   GAsyncResult *result = NULL;
+   GError *error = NULL;
+ 
++  if (skip_missing_dbus_daemon ())
++    return;
++
+   /* Set up a test session bus to ensure that launching the app happens using
+    * D-Bus rather than spawning. */
+   bus = g_test_dbus_new (G_TEST_DBUS_NONE);
+-- 
+2.44.0
+
+
+From 0ec9c399c7d2755147e409d065690b2ff53fda40 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 3 Apr 2024 22:10:18 +0200
+Subject: [PATCH 3/3] tests: find update-desktop-database
+
+Disable tests that require update-desktop-database when it is missing.
+
+It requires glib to build so it will be missing when bootstrapping glib.
+
+Refactor the ifdef for Windows and MacOS while at it and reduce number
+of ifdefs.
+
+Ref: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3658
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ gio/tests/desktop-app-info.c | 35 +++++++++++++++++++++++++++++
+ gio/tests/file.c             | 43 ++++++++++++++++++++++--------------
+ 2 files changed, 62 insertions(+), 16 deletions(-)
+
+diff --git a/gio/tests/desktop-app-info.c b/gio/tests/desktop-app-info.c
+index ec65b7618..e492b1346 100644
+--- a/gio/tests/desktop-app-info.c
++++ b/gio/tests/desktop-app-info.c
+@@ -125,6 +125,20 @@ create_app_info (const char *name)
+   return info;
+ }
+ 
++static gboolean
++skip_missing_update_desktop_database (void)
++{
++  const gchar *path = g_find_program_in_path ("update-desktop-database");
++
++  if (path == NULL)
++    {
++      g_test_skip ("update-desktop-database is required to run this test");
++      return TRUE;
++    }
++  g_free (path);
++  return FALSE;
++}
++
+ static void
+ test_delete (void)
+ {
+@@ -134,6 +148,9 @@ test_delete (void)
+   char *filename;
+   gboolean res;
+ 
++  if (skip_missing_update_desktop_database ())
++    return;
++
+   info = create_app_info ("Blah");
+  
+   id = g_app_info_get_id (info);
+@@ -177,6 +194,9 @@ test_default (void)
+   GList *list;
+   GError *error = NULL;  
+ 
++if (skip_missing_update_desktop_database ())
++    return;
++
+   info1 = create_app_info ("Blah1");
+   info2 = create_app_info ("Blah2");
+   info3 = create_app_info ("Blah3");
+@@ -316,6 +336,9 @@ test_default_async (void)
+   GList *list;
+   GError *error = NULL;
+ 
++  if (skip_missing_update_desktop_database ())
++    return;
++
+   data.loop = g_main_loop_new (NULL, TRUE);
+ 
+   info1 = create_app_info ("Blah1");
+@@ -418,6 +441,9 @@ test_fallback (void)
+   GError *error = NULL;
+   gint old_length;
+ 
++  if (skip_missing_update_desktop_database ())
++    return;
++
+   info1 = create_app_info ("Test1");
+   info2 = create_app_info ("Test2");
+ 
+@@ -492,6 +518,9 @@ test_last_used (void)
+   GAppInfo *info1, *info2, *default_app;
+   GError *error = NULL;
+ 
++  if (skip_missing_update_desktop_database ())
++    return;
++
+   info1 = create_app_info ("Test1");
+   info2 = create_app_info ("Test2");
+ 
+@@ -1222,6 +1251,9 @@ test_default_uri_handler (void)
+   gchar *file_path = NULL;
+   GAppInfo *info;
+ 
++  if (skip_missing_update_desktop_database ())
++    return;
++
+   info = create_app_info_toucher ("Touch Handled", "handled",
+                                   "x-scheme-handler/glib-touch",
+                                   &file_path);
+@@ -1298,6 +1330,9 @@ test_default_uri_handler_async (void)
+   gboolean called = FALSE;
+   gint64 start_time, touch_time;
+ 
++  if (skip_missing_update_desktop_database ())
++    return;
++
+   loop = g_main_loop_new (NULL, FALSE);
+   info = create_app_info_toucher ("Touch Handled", "handled-async",
+                                   "x-scheme-handler/glib-async-touch",
+diff --git a/gio/tests/file.c b/gio/tests/file.c
+index 72296d008..dba5fe66c 100644
+--- a/gio/tests/file.c
++++ b/gio/tests/file.c
+@@ -3784,6 +3784,25 @@ create_command_line_app_info (const char *name,
+   return g_steal_pointer (&info);
+ }
+ 
++static gboolean
++skip_missing_update_desktop_database (void)
++{
++#if defined(G_OS_WIN32) || defined(__APPLE__)
++  g_test_skip ("Default URI handlers are not currently supported on Windows or macOS");
++  return TRUE;
++#else
++  const gchar *path = g_find_program_in_path ("update-desktop-database");
++
++  if (path == NULL)
++    {
++      g_test_skip ("update-desktop-database is required to run this test");
++      return TRUE;
++    }
++  g_free (path);
++  return FALSE;
++#endif
++}
++
+ static void
+ test_query_default_handler_uri (void)
+ {
+@@ -3793,10 +3812,8 @@ test_query_default_handler_uri (void)
+   GFile *file;
+   GFile *invalid_file;
+ 
+-#if defined(G_OS_WIN32) || defined(__APPLE__)
+-  g_test_skip ("Default URI handlers are not currently supported on Windows or macOS");
+-  return;
+-#endif
++  if (skip_missing_update_desktop_database ())
++    return;
+ 
+   info = create_command_line_app_info ("Gio File Handler", "true",
+                                        "x-scheme-handler/gio-file");
+@@ -3878,10 +3895,8 @@ test_query_default_handler_file (void)
+   const char buffer[] = "Text file!\n";
+   const guint8 binary_buffer[] = "\xde\xad\xbe\xff";
+ 
+-#if defined(G_OS_WIN32) || defined(__APPLE__)
+-  g_test_skip ("Default URI handlers are not currently supported on Windows or macOS");
+-  return;
+-#endif
++  if (skip_missing_update_desktop_database ())
++    return;
+ 
+   text_file = g_file_new_tmp ("query-default-handler-XXXXXX", &iostream, &error);
+   g_assert_no_error (error);
+@@ -3974,10 +3989,8 @@ test_query_default_handler_file_async (void)
+   const guint8 binary_buffer[] = "\xde\xad\xbe\xff";
+   GError *error = NULL;
+ 
+-#if defined(G_OS_WIN32) || defined(__APPLE__)
+-  g_test_skip ("Default URI handlers are not currently supported on Windows or macOS");
+-  return;
+-#endif
++  if (skip_missing_update_desktop_database ())
++    return;
+ 
+   data.loop = g_main_loop_new (NULL, FALSE);
+ 
+@@ -4064,10 +4077,8 @@ test_query_default_handler_uri_async (void)
+   GFile *file;
+   GFile *invalid_file;
+ 
+-#if defined(G_OS_WIN32) || defined(__APPLE__)
+-  g_test_skip ("Default URI handlers are not currently supported on Windows or macOS");
+-  return;
+-#endif
++  if (skip_missing_update_desktop_database ())
++    return;
+ 
+   info = create_command_line_app_info ("Gio File Handler", "true",
+                                        "x-scheme-handler/gio-file");
+-- 
+2.44.0
+
diff --git a/main/glib/flaky-tests.patch b/main/glib/flaky-tests.patch
new file mode 100644
index 00000000000..bc6f0aad745
--- /dev/null
+++ b/main/glib/flaky-tests.patch
@@ -0,0 +1,83 @@
+https://gitlab.gnome.org/GNOME/glib/-/issues/3318
+https://gitlab.gnome.org/GNOME/glib/-/issues/3320
+
+diff --git a/glib/tests/meson.build b/glib/tests/meson.build
+index 85f40d2e1..059a786d3 100644
+--- a/glib/tests/meson.build
++++ b/glib/tests/meson.build
+@@ -54,6 +54,7 @@ glib_tests = {
+   'gwakeup' : {
+     'source' : ['gwakeuptest.c', '../gwakeup.c'],
+     'install' : false,
++    'can_fail': host_machine.cpu_family() == 's390x',
+   },
+   'hash' : {},
+   'hmac' : {},
+@@ -226,6 +227,7 @@ if glib_conf.has('HAVE_EVENTFD')
+       'source' : ['gwakeuptest.c', '../gwakeup.c'],
+       'c_args' : ['-DTEST_EVENTFD_FALLBACK'],
+       'install' : false,
++      'can_fail': host_machine.cpu_family() == 's390x',
+     },
+   }
+ endif
+diff --git a/gobject/tests/meson.build b/gobject/tests/meson.build
+index a163e5f91..12c449519 100644
+--- a/gobject/tests/meson.build
++++ b/gobject/tests/meson.build
+@@ -78,7 +78,7 @@ gobject_tests = {
+   'references' : {},
+   'basic-signals' : {},
+   'singleton' : {},
+-  'threadtests' : {},
++  'threadtests' : { 'can_fail': 'aarch64' in host_machine.cpu_family() or 'riscv' in host_machine.cpu_family() },
+   'dynamictests' : {},
+   'binding' : {},
+   'bindinggroup' : {},
+From ad2925ef361a7c889ff696a1ba9e677accaecd08 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 4 Apr 2024 10:15:07 +0200
+Subject: [PATCH] tests: increase timeout on slow architectures
+
+Prevent tests to timeout on architectures that are slow.
+
+Fixes https://gitlab.gnome.org/GNOME/glib/-/issues/3319
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ meson.build | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index f0c5e070b..4c6c87766 100644
+--- a/meson.build
++++ b/meson.build
+@@ -182,6 +182,12 @@ test_protocol = 'tap'
+ test_timeout = 30
+ test_timeout_slow = 90
+ 
++# give more time on slow architectures
++if 'riscv' in host_machine.cpu_family()
++  test_timeout = test_timeout * 4
++  test_timeout_slow = test_timeout_slow * 4
++endif
++
+ add_test_setup('default',
+   is_default: true,
+   exclude_suites: ['flaky', 'failing'],
+-- 
+2.44.0
+
+diff --git a/glib/tests/meson.build b/glib/tests/meson.build
+index 85f40d2e1..f2ee59678 100644
+--- a/glib/tests/meson.build
++++ b/glib/tests/meson.build
+@@ -113,6 +113,8 @@ glib_tests = {
+   'regex' : {
+     'dependencies' : [pcre2],
+     'c_args' : use_pcre2_static_flag ? ['-DPCRE2_STATIC'] : [],
++    # https://gitlab.gnome.org/GNOME/glib/-/issues/3321
++    'can_fail': host_machine.cpu_family() == 'riscv64',
+   },
+   'relation' : {},
+   'rwlock' : {},
diff --git a/main/glib/glib.trigger b/main/glib/glib.trigger
index cf23eff7d1f..e042aacf4f6 100644
--- a/main/glib/glib.trigger
+++ b/main/glib/glib.trigger
@@ -5,7 +5,7 @@ for i in "$@"; do
 		continue
 	fi
 	case "$i" in
-	*/modules)
+	*/modules|*gtk-4.0)
 		/usr/bin/gio-querymodules "$i"
 		;;
 	*/schemas)
diff --git a/main/glib/mips-disable-memory-barrier.patch b/main/glib/mips-disable-memory-barrier.patch
deleted file mode 100644
index e442764792b..00000000000
--- a/main/glib/mips-disable-memory-barrier.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib-2.62.3.orig/meson.build
-+++ glib-2.62.3/meson.build
-@@ -1586,7 +1586,7 @@
- 
- # We need a more robust approach here...
- host_cpu_family = host_machine.cpu_family()
--if host_cpu_family == 'x86' or host_cpu_family == 'x86_64' or host_cpu_family == 's390' or host_cpu_family == 's390x' or host_cpu_family.startswith('arm') or host_cpu_family == 'aarch64' or host_cpu_family.startswith('crisv32') or host_cpu_family.startswith('etrax')
-+if host_cpu_family == 'x86' or host_cpu_family == 'x86_64' or host_cpu_family == 's390' or host_cpu_family == 's390x' or host_cpu_family.startswith('arm') or host_cpu_family == 'aarch64' or host_cpu_family.startswith('crisv32') or host_cpu_family.startswith('etrax') or host_cpu_family.startswith('mips')
-   glib_memory_barrier_needed = false
- elif host_cpu_family.startswith('sparc') or host_cpu_family.startswith('alpha') or host_cpu_family.startswith('powerpc') or host_cpu_family == 'ia64'
-   glib_memory_barrier_needed = true
diff --git a/main/glib/mips-disable-some-gio-test-resources.patch b/main/glib/mips-disable-some-gio-test-resources.patch
deleted file mode 100644
index 6327812bf0e..00000000000
--- a/main/glib/mips-disable-some-gio-test-resources.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib-2.64.1.orig/gio/tests/meson.build
-+++ glib-2.64.1/gio/tests/meson.build
-@@ -668,7 +668,7 @@
- 
-   ld = find_program('ld', required : false)
- 
--  if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
-+  if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found() and host_machine.cpu_family() != 'mips64'
-     test_gresource_binary = custom_target('test5.gresource',
-       input : 'test5.gresource.xml',
-       output : 'test5.gresource',
diff --git a/main/glib/musl-libintl.patch b/main/glib/musl-libintl.patch
deleted file mode 100644
index d54bd3fa43d..00000000000
--- a/main/glib/musl-libintl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 8320449..1d05edd 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1785,10 +1785,10 @@ endif
- # proxy-libintl subproject.
- # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
- # implementations. This could be extended if issues are found in some platforms.
--if cc.has_function('ngettext')
--  libintl = []
--  have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
--else
-+#if cc.has_function('ngettext')
-+#  libintl = []
-+#  have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
-+#else
-   libintl = cc.find_library('intl', required : false)
-   if not libintl.found()
-     libintl = subproject('proxy-libintl').get_variable('intl_dep')
-@@ -1797,7 +1797,7 @@ else
-     have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset',
-                                                    dependencies : libintl)
-   endif
--endif
-+#endif
- 
- glib_conf.set('HAVE_BIND_TEXTDOMAIN_CODESET', have_bind_textdomain_codeset)
- 
diff --git a/main/glib/tests-machine-id.patch b/main/glib/tests-machine-id.patch
new file mode 100644
index 00000000000..66648984b5b
--- /dev/null
+++ b/main/glib/tests-machine-id.patch
@@ -0,0 +1,41 @@
+From 5cf08a9a1041a9dc9975371fb62f8f22c3be76c4 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 3 Apr 2024 21:25:04 +0200
+Subject: [PATCH 2/3] tests: skip gio tests which fails with missing machine-id
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ gio/tests/meson.build | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/gio/tests/meson.build b/gio/tests/meson.build
+index f04ff43ff..71ec09750 100644
+--- a/gio/tests/meson.build
++++ b/gio/tests/meson.build
+@@ -46,6 +46,8 @@ if glib_build_shared
+   subdir('modules')
+ endif
+ 
++have_machine_id = import('fs').is_file('/etc/machine-id')
++
+ #  Test programs buildable on all platforms
+ gio_tests = {
+   'application-command-line': {},
+@@ -98,7 +100,7 @@ gio_tests = {
+     'install_rpath' : installed_tests_execdir,
+     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
+     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/3148
+-    'can_fail' : host_system in ['darwin', 'windows', 'gnu'],
++    'can_fail' : host_system in ['darwin', 'windows', 'gnu'] or not have_machine_id,
+   },
+   'inet-address' : {},
+   'io-stream' : {},
+@@ -147,7 +149,7 @@ gio_tests = {
+     'extra_programs': host_system != 'windows' ? ['dbus-launch'] : [],
+     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
+     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/3148
+-    'can_fail' : host_system in ['darwin', 'gnu'],
++    'can_fail' : host_system in ['darwin', 'gnu'] or not have_machine_id,
+   },
+   'win32-appinfo' : {},
+ }
diff --git a/main/glslang/APKBUILD b/main/glslang/APKBUILD
index 944bf4c6d96..f2c838c9bc7 100644
--- a/main/glslang/APKBUILD
+++ b/main/glslang/APKBUILD
@@ -1,60 +1,62 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Simon Zeni <simon@bl4ckb0ne.ca>
 pkgname=glslang
-pkgver=8.13.3559
-pkgrel=5
-_commit=07e1a0a67aee5b21561bd6b93d73c8d87e010d98
+pkgver=1.3.261.1
+pkgrel=0
 pkgdesc="Khronos reference front-end for GLSL, ESSL, and sample SPIR-V generator"
-options="!check" # Requires git checkout of gmock
 url="https://github.com/KhronosGroup/glslang"
 arch="all"
 license="BSD-3-Clause"
 depends_dev="$pkgname"
 makedepends="cmake samurai python3 bison spirv-tools-dev"
-subpackages="$pkgname-static $pkgname-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/KhronosGroup/glslang/archive/$_commit.tar.gz
-	pkgconfig.patch
-	default-resources.patch
-	"
-builddir="$srcdir/glslang-$_commit"
+checkdepends="bash gtest-dev"
+subpackages="$pkgname-static $pkgname-libs $pkgname-dev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/KhronosGroup/glslang/archive/refs/tags/sdk-$pkgver.tar.gz"
+builddir="$srcdir/glslang-sdk-$pkgver"
+
+case "$CARCH" in
+s390x) options="$options !check" ;; # testsuite seems to fail on big endian
+esac
 
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
-	mkdir -p build-shared build-static
-	(cd build-shared
-		cmake \
-			-GNinja \
-			-DCMAKE_INSTALL_PREFIX=/usr \
-			-DCMAKE_INSTALL_LIBDIR=lib \
-			-DCMAKE_BUILD_TYPE=None \
-			-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-			-DCMAKE_C_FLAGS="$CFLAGS" \
-			-DBUILD_SHARED_LIBS=ON \
-			${CMAKE_CROSSOPTS} ..
-		ninja
-	)
+	cmake -B build-shared -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DBUILD_SHARED_LIBS=ON \
+		-DENABLE_CTEST="$(want_check && echo ON || echo OFF)" \
+		$CMAKE_CROSSOPTS
+	cmake --build build-shared
+
 	sed -i '/add_library(glslang-default-resource-limits/ s/$/ STATIC/' StandAlone/CMakeLists.txt
-	(cd build-static
-		cmake \
-			-GNinja \
-			-DCMAKE_INSTALL_PREFIX=/usr \
-			-DCMAKE_INSTALL_LIBDIR=lib \
-			-DCMAKE_BUILD_TYPE=None \
-			-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-			-DCMAKE_C_FLAGS="$CFLAGS" \
-			-DBUILD_SHARED_LIBS=OFF \
-			${CMAKE_CROSSOPTS} ..
-		ninja
-	)
+	cmake -B build-static -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DBUILD_SHARED_LIBS=OFF \
+		-DENABLE_CTEST="$(want_check && echo ON || echo OFF)" \
+		$CMAKE_CROSSOPTS
+	cmake --build build-static
+}
+
+check() {
+	msg "Testing shared version of glslang"
+	ctest --test-dir build-shared --output-on-failure
+
+	msg "Testing static version of glslang"
+	ctest --test-dir build-static --output-on-failure
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C build-shared install
-	DESTDIR="$pkgdir" ninja -C build-static install
+	# installing static first lets shared overwrite the executables so they
+	# themselves are not statically linking the library
+	DESTDIR="$pkgdir" cmake --install build-static
+	DESTDIR="$pkgdir" cmake --install build-shared
 }
 
-sha512sums="7d5cdf232b8f8f05c2546d030d28529d6943dff478ae27b53de0e54719663a254c104f6d7af51444a908a65925edf75c93d5d8886340f33212fb21da15d885fb  glslang-07e1a0a67aee5b21561bd6b93d73c8d87e010d98.tar.gz
-9490ed637a8f4a032fb0e0d266843b4ffccedce5983de1f16f96348c7b8340d4d8791f3a6a247f53ef5ea256deecf674d8cf0030d77b7d7d396091aed5bbb404  pkgconfig.patch
-f526443c070fc3e4639cdec0a4876e5a75529af4cf41282ba23b0d9234434f764bf55b93aaaf7ed1de757193842f3d0b51437cf62c41d955dd86907fcc1a911e  default-resources.patch"
+sha512sums="
+13838ce67f151dbb27cc6809e5fcac0e4f728ac301a5cb3c624b1491180040f16487271a8e02aaf87159a8d337121af346a3d5bdc5f81e5db49a30088dd8c255  glslang-1.3.261.1.tar.gz
+"
diff --git a/main/glslang/default-resources.patch b/main/glslang/default-resources.patch
deleted file mode 100644
index 3ba35f34cc5..00000000000
--- a/main/glslang/default-resources.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
-index a0259a3..e34ab9e 100644
---- a/glslang/CMakeLists.txt
-+++ b/glslang/CMakeLists.txt
-@@ -86,6 +86,7 @@ add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${H
- set_property(TARGET glslang PROPERTY FOLDER glslang)
- set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON)
- target_link_libraries(glslang OGLCompiler OSDependent)
-+target_sources(glslang PRIVATE ${CMAKE_SOURCE_DIR}/StandAlone/ResourceLimits.cpp)
- target_include_directories(glslang PUBLIC 
-     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
-     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
diff --git a/main/glslang/pkgconfig.patch b/main/glslang/pkgconfig.patch
deleted file mode 100644
index bd280475eff..00000000000
--- a/main/glslang/pkgconfig.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a80cd5f..0fd15ca 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -87,6 +87,13 @@ endmacro(glslang_pch)
- 
- project(glslang)
- 
-+# using pkg-config to configure include paths and link libraries
-+include(FindPkgConfig)
-+pkg_check_modules(SPIRV_TOOLS REQUIRED SPIRV-Tools>=2019.2.1)
-+if(BUILD_SHARED_LIBS)
-+    pkg_check_modules(SPIRV_TOOLS_SHARED REQUIRED SPIRV-Tools-shared>=2019.2.1)
-+endif(BUILD_SHARED_LIBS)
-+
- if(ENABLE_CTEST)
-     include(CTest)
- endif()
-@@ -175,11 +182,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External)
- 	add_subdirectory(External)
- endif()
- 
--if(NOT TARGET SPIRV-Tools-opt)
--    set(ENABLE_OPT OFF)
--endif()
--
--if(ENABLE_OPT)
-+if(${SPIRV_TOOLS_FOUND} EQUAL 1)
-     message(STATUS "optimizer enabled")
-     add_definitions(-DENABLE_OPT=1)
- else()
-diff --git a/External/CMakeLists.txt b/External/CMakeLists.txt
-index 6ff4f47..cfb48bd 100644
---- a/External/CMakeLists.txt
-+++ b/External/CMakeLists.txt
-@@ -35,10 +35,3 @@ if(BUILD_TESTING)
-     endif()
- endif()
- 
--if(ENABLE_OPT AND NOT TARGET SPIRV-Tools-opt)
--    if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools)
--        set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip building SPIRV-Tools tests")
--        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools spirv-tools)
--    endif()
--endif()
--
-diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
-index 439b991..494e21f 100755
---- a/SPIRV/CMakeLists.txt
-+++ b/SPIRV/CMakeLists.txt
-@@ -40,6 +40,10 @@ target_include_directories(SPIRV PUBLIC
- 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
- 	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
- 
-+
-+set(SPIRV_NAME spirv)
-+set(SPIRV_VERSION 1.5.1)
-+
- if (ENABLE_SPVREMAPPER)
-     add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
-     set_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
-@@ -53,15 +57,21 @@ if(WIN32 AND BUILD_SHARED_LIBS)
-     endif()
- endif()
- 
-+target_include_directories(SPIRV PUBLIC ${SPIRV_TOOLS_INCLUDE_DIRS})
-+target_compile_options(SPIRV PUBLIC ${SPIRV_TOOLS_CFLAGS_OTHER})
-+target_link_libraries(SPIRV ${SPIRV_TOOLS_LIBRARIES})
-+if(BUILD_SHARED_LIBS)
-+    target_include_directories(SPIRV PUBLIC ${SPIRV_TOOLS_SHARED_INCLUDE_DIRS})
-+    target_compile_options(SPIRV PUBLIC ${SPIRV_TOOLS_SHARED_CFLAGS_OTHER})
-+    target_link_libraries(SPIRV ${SPIRV_TOOLS_SHARED_LIBRARIES})
-+endif(BUILD_SHARED_LIBS)
-+  
- if(ENABLE_OPT)
-     target_include_directories(SPIRV
-         PRIVATE ${spirv-tools_SOURCE_DIR}/include
-         PRIVATE ${spirv-tools_SOURCE_DIR}/source
-     )
--    target_link_libraries(SPIRV glslang SPIRV-Tools-opt)
--    target_include_directories(SPIRV PUBLIC
--		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
--		$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
-+    target_link_libraries(SPIRV glslang)
- else()
-     target_link_libraries(SPIRV glslang)
- endif(ENABLE_OPT)
-diff --git a/SPIRV/SpvTools.cpp b/SPIRV/SpvTools.cpp
-index 97bd4e7..098cb84 100644
---- a/SPIRV/SpvTools.cpp
-+++ b/SPIRV/SpvTools.cpp
-@@ -43,8 +43,8 @@
- #include <iostream>
- 
- #include "SpvTools.h"
--#include "spirv-tools/optimizer.hpp"
--#include "spirv-tools/libspirv.h"
-+#include <spirv-tools/optimizer.hpp>
-+#include <spirv-tools/libspirv.h>
- 
- namespace glslang {
- 
-diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
-index 2cf2899..c981c0a 100644
---- a/StandAlone/CMakeLists.txt
-+++ b/StandAlone/CMakeLists.txt
-@@ -23,6 +23,14 @@ if(ENABLE_SPVREMAPPER)
-     set(LIBRARIES ${LIBRARIES} SPVRemapper)
- endif()
- 
-+if(BUILD_SHARED_LIBS)
-+    set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_SHARED_LIBRARIES})
-+    target_include_directories(glslangValidator PUBLIC ${SPIRV_TOOLS_SHARED_INCLUDE_DIRS})
-+else()
-+    set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_LIBRARIES})
-+    target_include_directories(glslangValidator PUBLIC ${SPIRV_TOOLS_INCLUDE_DIRS})
-+endif(BUILD_SHARED_LIBS)
-+
- if(WIN32)
-     set(LIBRARIES ${LIBRARIES} psapi)
- elseif(UNIX)
-@@ -32,9 +40,6 @@ elseif(UNIX)
- endif(WIN32)
- 
- target_link_libraries(glslangValidator ${LIBRARIES})
--target_include_directories(glslangValidator PUBLIC
--    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External>
--    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>)
- 
- if(ENABLE_SPVREMAPPER)
-     set(REMAPPER_SOURCES spirv-remap.cpp)
-diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
-index a0259a3..dab067d 100644
---- a/glslang/CMakeLists.txt
-+++ b/glslang/CMakeLists.txt
-@@ -80,6 +80,7 @@ set(HEADERS
-     MachineIndependent/preprocessor/PpContext.h
-     MachineIndependent/preprocessor/PpTokens.h)
- 
-+set(VERSION 8.13.3559)
- glslang_pch(SOURCES MachineIndependent/pch.cpp)
- 
- add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
diff --git a/main/glu/APKBUILD b/main/glu/APKBUILD
index a5913c09922..d746752097b 100644
--- a/main/glu/APKBUILD
+++ b/main/glu/APKBUILD
@@ -1,31 +1,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=glu
-pkgver=9.0.1
-pkgrel=0
+pkgver=9.0.3
+pkgrel=3
 pkgdesc="Mesa OpenGL Utility library"
 url="https://cgit.freedesktop.org/mesa/glu/"
 arch="all"
 options="!check"  # No test suite.
 license="SGI-B-1.1 AND SGI-B-2.0"
 depends_dev="mesa-dev"
-makedepends="$depends_dev"
+makedepends="$depends_dev meson"
 replaces="mesa-glu"
 subpackages="$pkgname-dev"
-source="ftp://ftp.freedesktop.org/pub/mesa/glu/glu-$pkgver.tar.xz"
+source="https://mesa.freedesktop.org/archive/glu/glu-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--disable-static
-	make
+	abuild-meson \
+		-Db_lto=true \
+		-Ddefault_library=shared \
+		-Dgl_provider=osmesa \
+		. output
+	meson compile -C output
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-sha512sums="8a6dae5b4bd63efb96d15f23ccda4ad9c2ffaa964897e5fa63d1e58360d8d4e6732c5efd2109dba04155d5fc457ab1718a65cf9b544ce0d452679ba988d04018  glu-9.0.1.tar.xz"
+sha512sums="
+b2781059c0e176192c3fc0d7244645020937a463311171efddb9f35fb94ee43faabcf627fa7f429d48fceaf6dd9c5adb69c86c7a21ec4ea490f4ab143d52e3ba  glu-9.0.3.tar.xz
+"
diff --git a/main/gmp/APKBUILD b/main/gmp/APKBUILD
index 3dc82ba612b..62bc2270797 100644
--- a/main/gmp/APKBUILD
+++ b/main/gmp/APKBUILD
@@ -1,24 +1,33 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gmp
-pkgver=6.2.0
+pkgver=6.3.0
 pkgrel=0
-pkgdesc="A free library for arbitrary precision arithmetic"
+pkgdesc="free library for arbitrary precision arithmetic"
 url="https://gmplib.org/"
 arch="all"
-license="LGPL-3.0-or-later"
-makedepends="m4 texinfo libtool"
+license="LGPL-3.0-or-later OR GPL-2.0-or-later"
+makedepends="m4 texinfo libtool autoconf automake"
 subpackages="$pkgname-doc $pkgname-dev libgmpxx"
-source="https://gmplib.org/download/gmp/gmp-$pkgver.tar.xz
-	"
+source="https://gmplib.org/download/gmp/gmp-$pkgver.tar.xz"
 replaces="gmp5"
 
+# secfixes:
+#   6.2.1-r1:
+#     - CVE-2021-43618
+
+# lto is not available during bootstrap
+if [ -z "$BOOTSTRAP" ]; then
+	_lto_cflags="-flto=auto"
+fi
+
 prepare() {
 	default_prepare
 	# force update to libtool with fixed cross-build support
-	libtoolize -f
+	autoreconf -vif
 }
 
 build() {
+	CFLAGS="$CFLAGS $_lto_cflags" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,14 +41,14 @@ build() {
 	make
 }
 
-package() {
-	make -j1 DESTDIR="$pkgdir" install
-}
-
 check() {
 	[ "$CBUILD" = "$CHOST" ] && make check
 }
 
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
 libgmpxx() {
 	pkgdesc="C++ support for gmp"
 	mkdir -p "$subpkgdir"/usr/lib/
@@ -51,4 +60,6 @@ doc() {
 	replaces="gmp5-doc"
 }
 
-sha512sums="a066f0456f0314a1359f553c49fc2587e484ff8ac390ff88537266a146ea373f97a1c0ba24608bf6756f4eab11c9056f103c8deb99e5b57741b4f7f0ec44b90c  gmp-6.2.0.tar.xz"
+sha512sums="
+e85a0dab5195889948a3462189f0e0598d331d3457612e2d3350799dba2e244316d256f8161df5219538eb003e4b5343f989aaa00f96321559063ed8c8f29fd2  gmp-6.3.0.tar.xz
+"
diff --git a/main/gnats/APKBUILD b/main/gnats/APKBUILD
deleted file mode 100644
index b893775d39b..00000000000
--- a/main/gnats/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gnats
-pkgver=4.2.0
-pkgrel=5
-pkgdesc="The GNU Bug Tracking System"
-url="https://www.gnu.org/software/gnats/"
-arch="all"
-license="GPL-3.0"
-depends="postfix"
-makedepends="texinfo"
-install=
-source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz
-	no-werror.patch
-	"
-subpackages="$pkgname-doc"
-pkgusers="gnats"
-pkggroups="gnats"
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--sharedstatedir=/var/lib \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
-
-	make -j1 || return 1
-}
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir/" install
-	rm -f "$pkgdir"/gnats.el
-}
-
-sha512sums="650faa87206889912e27a27daba4c86292fac90250a88e7e6272cc8488fc19dfd6098bdd450553cd6c2c1d446072a8da9395f1ce7b1cd284596994ce53744152  gnats-4.2.0.tar.gz
-f37cbc05bcf4fe37226e95ca84162ffa9ca92da3e30907dbbde67805aa0ab6210724a954a9106f4522c0adcaf936919beb11afb7d477142491be09c9da0ee38d  no-werror.patch"
diff --git a/main/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
deleted file mode 100644
index 7e46b87e625..00000000000
--- a/main/gnats/gnats.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S gnats 2>/dev/null
-adduser -S -D -h /var/lib/gnatsdb -G gnats -g gnats gnats 2>/dev/null
-
-exit 0
diff --git a/main/gnats/no-werror.patch b/main/gnats/no-werror.patch
deleted file mode 100644
index e7d4d14e5ec..00000000000
--- a/main/gnats/no-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure b/configure
-index dfacf87..c3bdb3a 100755
---- a/configure
-+++ b/configure
-@@ -6722,7 +6722,7 @@ fi
- 
- 
- if test "x$GCC" = "xyes" ; then
--		GCC_CFLAGS="-ansi -Werror -Wall"
-+		GCC_CFLAGS="-ansi -Wall"
- 
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wextra" >&5
- $as_echo_n "checking whether C compiler accepts -Wextra... " >&6; }
diff --git a/main/gnokii/APKBUILD b/main/gnokii/APKBUILD
deleted file mode 100644
index b89ad289d6d..00000000000
--- a/main/gnokii/APKBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gnokii
-pkgver=0.6.31
-pkgrel=10
-pkgdesc="Tools and user space driver for use with mobile phones"
-url="http://www.gnokii.org/"
-arch="all"
-license="GPL-2.0-or-later"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs xgnokii $pkgname-smsd
-	$pkgname-smsd-pgsql:pgsql $pkgname-smsd-mysql:mysql
-	$pkgname-smsd-sqlite:sqlite $pkgname-lang"
-
-makedepends="gtk+-dev mariadb-connector-c-dev intltool libusb-compat-dev libxpm-dev
-	bluez-dev libical-dev postgresql-dev sqlite-dev
-	autoconf automake libtool gettext-dev"
-source="http://www.gnokii.org/download/gnokii/gnokii-$pkgver.tar.bz2
-	gnokii.patch
-	xgnokii.patch
-	gnokii-0.6.31-gcc5.patch
-	"
-
-prepare() {
-	default_prepare
-	update_config_sub
-	sed -i 's|cellphone|phone|' xgnokii/xgnokii.desktop.in
-}
-
-build() {
-	CFLAGS="$CFLAGS -std=gnu89" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--enable-security \
-		--disable-unix98test \
-		--disable-phonet \
-		--with-x
-	make
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-}
-
-libs() {
-	pkgdesc="gnokii shared libraries"
-	replaces="libgnokii"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgnokii.so.* "$subpkgdir"/usr/lib/
-}
-
-xgnokii() {
-	pkgdesc="Gtk+ gnokii application"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/xgnokii "$subpkgdir"/usr/bin/
-}
-
-smsd() {
-	pkgdesc="SMS Daemon for mobile phones"
-	mkdir -p "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/bin/smsd "$subpkgdir"/usr/bin/
-}
-
-pgsql() {
-	pkgdesc="SMSD plugin for PostgreSQL storage backend"
-	depends="gnokii-smsd"
-	mkdir -p "$subpkgdir"/usr/lib/smsd
-	mv "$pkgdir"/usr/lib/smsd/*pq.so "$subpkgdir"/usr/lib/smsd/
-}
-
-mysql() {
-	pkgdesc="SMSD plugin for MySQL storage backend"
-	depends="gnokii-smsd"
-	mkdir -p "$subpkgdir"/usr/lib/smsd
-	mv "$pkgdir"/usr/lib/smsd/*mysql.so "$subpkgdir"/usr/lib/smsd/
-}
-
-sqlite() {
-	pkgdesc="SMSD plugin for SQLite storage backend"
-	depends="gnokii-smsd"
-	mkdir -p "$subpkgdir"/usr/lib/smsd
-	mv "$pkgdir"/usr/lib/smsd/*sqlite*.so "$subpkgdir"/usr/lib/smsd/
-}
-sha512sums="529f6d0d29873f48ac00cf7151ba35dcbd93405ab27d69848ed17dea73f4fba71721d1811d921441b4214777b9b33f760b372631627cc108eb94c39684da343d  gnokii-0.6.31.tar.bz2
-a253cd0a461b06b3d11202f36c518f6364705008c36d4e7ecd292ecd2e4288e42fbd55110405c6bb2d2d82499e047876aa92a9292b629d1323189a9164359d32  gnokii.patch
-b7033907d8bca55366b09ef976e1f1e48a31ef2630e55770200fc3818c1a36aa6478bc73cb4f180b469d21157ad5af389dc075280f22251b7402d7ab584f37dc  xgnokii.patch
-548a32f93b059e45c8616dedf49a0ce3b0e63463f8ddc3384b473d91bd12c3fab2c6e21de0b09d2b330c189454a2bf3e486aa25122ea58392d9cb11994592086  gnokii-0.6.31-gcc5.patch"
diff --git a/main/gnokii/gnokii-0.6.31-gcc5.patch b/main/gnokii/gnokii-0.6.31-gcc5.patch
deleted file mode 100644
index 09b65f5b0f8..00000000000
--- a/main/gnokii/gnokii-0.6.31-gcc5.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Patch by Robert Scheck <robert@fedoraproject.org> for gnokii <= 0.6.31 to avoid
-build failures with GCC 5.x as "gnokii-0.6.31/xgnokii/xgnokii.c:1209: undefined
-reference to `GUI_HideAbout'" and "xgnokii-xgnokii_logos.o:(.data.rel+0xe0):
-undefined reference to `CloseLogosWindow'".
-
---- gnokii-0.6.31/xgnokii/xgnokii.c		2011-12-02 15:53:04.000000000 +0100
-+++ gnokii-0.6.31/xgnokii/xgnokii.c.gcc5	2015-06-20 15:49:59.000000000 +0200
-@@ -798,7 +798,7 @@
- }
- 
- 
--inline void GUI_HideAbout(void)
-+void GUI_HideAbout(void)
- {
- 	gtk_widget_hide(AboutDialog);
- }
---- gnokii-0.6.31/xgnokii/xgnokii_logos.c	2011-12-02 15:53:04.000000000 +0100
-+++ gnokii-0.6.31/xgnokii/xgnokii_logos.c.gcc5	2015-06-20 15:50:15.000000000 +0200
-@@ -1304,7 +1304,7 @@
- 	return 0;
- }
- 
--inline void CloseLogosWindow(void)
-+void CloseLogosWindow(void)
- {
- 	gtk_widget_hide(GUI_LogosWindow);
- }
diff --git a/main/gnokii/gnokii.patch b/main/gnokii/gnokii.patch
deleted file mode 100644
index 69ca868e3b1..00000000000
--- a/main/gnokii/gnokii.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Docs/sample/gnokiirc.orig
-+++ ./Docs/sample/gnokiirc
-@@ -238,7 +238,7 @@
- # In particular ensure that mgnokiidev is in this location, with
- # permissions 4750, owned by root, group gnokii.  Ensure you
- # are in the gnokii group and that the group exists...
--bindir = /usr/local/sbin/
-+bindir = /usr/sbin/
- 
- # Any entries in the following two sections will be set as environment
- # variables when running the scripts.
diff --git a/main/gnokii/xgnokii.patch b/main/gnokii/xgnokii.patch
deleted file mode 100644
index b354166139a..00000000000
--- a/main/gnokii/xgnokii.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.in.orig
-+++ ./configure.in
-@@ -689,7 +689,7 @@
-    fi
- fi
- 
--AM_CONDITIONAL(XGNOKII, test "x$_support" = "xyes")
-+AM_CONDITIONAL(XGNOKII, test "x$x_support" = "xyes")
- 
- dnl ======================== Check for libsocket
- AC_CHECK_LIB(socket, socket)
diff --git a/main/gnu-efi/APKBUILD b/main/gnu-efi/APKBUILD
index 452bd63ba09..c5ecbcbda1e 100644
--- a/main/gnu-efi/APKBUILD
+++ b/main/gnu-efi/APKBUILD
@@ -1,16 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gnu-efi
-pkgver=3.0.11
-pkgrel=0
+pkgver=3.0.15
+pkgrel=4
 pkgdesc="Development Libraries and headers for EFI"
-url="ftp://ftp.hpl.hp.com/pub/linux-ia64"
+url="https://sourceforge.net/projects/gnu-efi/"
 arch="all !armhf !s390x !ppc64le !mips !mips64"
-license="BSD-3-Clause"
+license="BSD-2-Clause"
 subpackages="$pkgname-dev"
 depends_dev="$pkgname"
 source="https://downloads.sourceforge.net/project/gnu-efi/gnu-efi-$pkgver.tar.bz2
 	no-werror.patch
 	"
+options="!check"
 
 build() {
 	make -j1
@@ -20,5 +21,7 @@ package() {
 	make PREFIX=/usr INSTALLROOT="$pkgdir" install
 }
 
-sha512sums="1a6b06b69eb95e03c00fb1c476bf346ab2cb0ecca9a44e163f52f2aa4b9837d3dd2d3ed8b4ce77aaf32a66e49f826ea5b43a97c8c7c56aaa030bc20b3415122a  gnu-efi-3.0.11.tar.bz2
-f384597dc967cc9b1cf738d4002dc75847606c8ab10efbaf9e23844c767f5b9a33518374321b2ae5c5d7e4c9c3abaed996d0690ea81a7906355cabec1426d248  no-werror.patch"
+sha512sums="
+64d408b6d115bdc6eebae12fbd6cd907ed5f847f54e506c1e8f8ea5de38a95cf6fac66ab1009bd1d0bd2d54ad45ad598d29bcc303926a5899bf5cc25448cbb2f  gnu-efi-3.0.15.tar.bz2
+f384597dc967cc9b1cf738d4002dc75847606c8ab10efbaf9e23844c767f5b9a33518374321b2ae5c5d7e4c9c3abaed996d0690ea81a7906355cabec1426d248  no-werror.patch
+"
diff --git a/main/gnupg/0001-Include-sys-select.h-for-FD_SETSIZE.patch b/main/gnupg/0001-Include-sys-select.h-for-FD_SETSIZE.patch
deleted file mode 100644
index a835f39278f..00000000000
--- a/main/gnupg/0001-Include-sys-select.h-for-FD_SETSIZE.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d2f3053e156a8dfc3e2e7f8fa814f671d851b26f Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 4 Jul 2014 08:15:21 +0000
-Subject: [PATCH] Include sys/select.h for FD_SETSIZE
-
-This fixes the following compile error with musl libc:
-watchgnupg.c:225:18: error: 'FD_SETSIZE' undeclared (first use in this
-function)
-   else if (fd >= FD_SETSIZE)
-                  ^
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- tools/watchgnupg.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c
-index 4f4d54d..7aede22 100644
---- a/tools/watchgnupg.c
-+++ b/tools/watchgnupg.c
-@@ -28,6 +28,7 @@
- #include <stdarg.h>
- #include <assert.h>
- #include <unistd.h>
-+#include <sys/select.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <netinet/in.h>
--- 
-2.0.1
-
diff --git a/main/gnupg/0010-avoid-beta-warning.patch b/main/gnupg/0010-avoid-beta-warning.patch
new file mode 100644
index 00000000000..2c3c873fe60
--- /dev/null
+++ b/main/gnupg/0010-avoid-beta-warning.patch
@@ -0,0 +1,46 @@
+From: Debian GnuPG Maintainers <pkg-gnupg-maint@lists.alioth.debian.org>
+Date: Tue, 14 Apr 2015 10:02:31 -0400
+Subject: avoid-beta-warning
+
+avoid self-describing as a beta
+
+Using autoreconf against the source as distributed in tarball form
+invariably results in a package that thinks it's a "beta" package,
+which produces the "THIS IS A DEVELOPMENT VERSION" warning string.
+
+since we use dh_autoreconf, i need this patch to avoid producing
+builds that announce themselves as DEVELOPMENT VERSIONs.
+
+See discussion at:
+
+ http://lists.gnupg.org/pipermail/gnupg-devel/2014-November/029065.html
+---
+ autogen.sh | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+Patch-Source: https://sources.debian.org/data/main/g/gnupg2/2.2.27-2/debian/patches/debian-packaging/avoid-beta-warning.patch
+
+diff --git a/autogen.sh b/autogen.sh
+index b238550..9b86d3f 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -229,7 +229,7 @@ if [ "$myhost" = "find-version" ]; then
+     esac
+ 
+     beta=no
+-    if [ -e .git ]; then
++    if false; then
+       ingit=yes
+       tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
+       tmp=$(echo "$tmp" | sed s/^"$package"//)
+@@ -245,8 +245,8 @@ if [ "$myhost" = "find-version" ]; then
+       rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
+     else
+       ingit=no
+-      beta=yes
+-      tmp="-unknown"
++      beta=no
++      tmp=""
+       rev="0000000"
+       rvd="0"
+     fi
diff --git a/main/gnupg/0020-avoid-regenerating-defsincdate-use-shipped-file.patch b/main/gnupg/0020-avoid-regenerating-defsincdate-use-shipped-file.patch
new file mode 100644
index 00000000000..2ce171a48b5
--- /dev/null
+++ b/main/gnupg/0020-avoid-regenerating-defsincdate-use-shipped-file.patch
@@ -0,0 +1,41 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 29 Aug 2016 12:34:42 -0400
+Subject: avoid regenerating defsincdate (use shipped file)
+
+upstream ships doc/defsincdate in its tarballs.  but doc/Makefile.am
+tries to rewrite doc/defsincdate if it notices that any of the files
+have been modified more recently, and it does so assuming that we're
+running from a git repo.
+
+However, we'd rather ship the documents cleanly without regenerating
+defsincdate -- we don't have a git repo available (debian builds from
+upstream tarballs) and any changes to the texinfo files (e.g. from
+debian/patches/) might result in different dates on the files than we
+expect after they're applied by dpkg or quilt or whatever, which makes
+the datestamp unreproducible.
+---
+ doc/Makefile.am | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+Patch-Source: https://sources.debian.org/data/main/g/gnupg2/2.2.27-2/debian/patches/debian-packaging/avoid-regenerating-defsincdate-use-shipped-file.patch
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 2b882c3..6be571b 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -178,15 +178,6 @@ $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
+ 
+ dist-hook: defsincdate
+ 
+-defsincdate: $(gnupg_TEXINFOS)
+-	: >defsincdate ; \
+-	if test -e $(top_srcdir)/.git; then \
+-	  (cd $(srcdir) && git log -1 --format='%ct' \
+-               -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
+-        elif test x"$$SOURCE_DATE_EPOCH" != x; then   \
+-	   echo "$$SOURCE_DATE_EPOCH" >>defsincdate ; \
+-	fi
+-
+ defs.inc : defsincdate Makefile mkdefsinc
+ 	incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
+ 	./mkdefsinc -C $(srcdir) --date "`cat $$incd 2>/dev/null`" \
diff --git a/main/gnupg/0110-avoid-simple-memory-dumps-via-ptrace.patch b/main/gnupg/0110-avoid-simple-memory-dumps-via-ptrace.patch
new file mode 100644
index 00000000000..35ab352c072
--- /dev/null
+++ b/main/gnupg/0110-avoid-simple-memory-dumps-via-ptrace.patch
@@ -0,0 +1,91 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Tue, 11 Aug 2015 20:28:26 -0400
+Subject: Avoid simple memory dumps via ptrace
+
+This avoids needing to setgid gpg-agent.  It probably doesn't defend
+against all possible attacks, but it defends against one specific (and
+easy) one.  If there are other protections we should do them too.
+
+This will make it slightly harder to debug the agent because the
+normal user won't be able to attach gdb to it directly while it runs.
+
+The remaining options for debugging are:
+
+ * launch the agent from gdb directly
+ * connect gdb to a running agent as the superuser
+
+Upstream bug: https://dev.gnupg.org/T1211
+---
+ agent/gpg-agent.c | 8 ++++++++
+ configure.ac      | 2 +-
+ scd/scdaemon.c    | 9 +++++++++
+ 3 files changed, 18 insertions(+), 1 deletion(-)
+
+Patch-Source: https://sources.debian.org/data/main/g/gnupg2/2.2.27-2/debian/patches/block-ptrace-on-secret-daemons/Avoid-simple-memory-dumps-via-ptrace.patch
+
+diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
+index 412eb43..1de989b 100644
+--- a/agent/gpg-agent.c
++++ b/agent/gpg-agent.c
+@@ -48,6 +48,9 @@
+ # include <signal.h>
+ #endif
+ #include <npth.h>
++#ifdef HAVE_PRCTL
++# include <sys/prctl.h>
++#endif
+ 
+ #define INCLUDED_BY_MAIN_MODULE 1
+ #define GNUPG_COMMON_NEED_AFLOCAL
+@@ -1095,6 +1098,11 @@ main (int argc, char **argv)
+ 
+   early_system_init ();
+ 
++#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
++  /* Disable ptrace on Linux without sgid bit */
++  prctl(PR_SET_DUMPABLE, 0);
++#endif
++
+   /* Before we do anything else we save the list of currently open
+      file descriptors and the signal mask.  This info is required to
+      do the exec call properly.  We don't need it on Windows.  */
+diff --git a/configure.ac b/configure.ac
+index 099c6a8..4c9fcee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1419,7 +1419,7 @@ AC_CHECK_FUNCS([atexit canonicalize_file_name clock_gettime ctermid  \
+                 ftruncate funlockfile getaddrinfo getenv getpagesize \
+                 getpwnam getpwuid getrlimit getrusage gettimeofday   \
+                 gmtime_r inet_ntop inet_pton isascii lstat memicmp   \
+-                memmove memrchr mmap nl_langinfo pipe raise rand     \
++                memmove memrchr mmap nl_langinfo pipe prctl raise rand \
+                 setenv setlocale setrlimit sigaction sigprocmask     \
+                 stat stpcpy strcasecmp strerror strftime stricmp     \
+                 strlwr strncasecmp strpbrk strsep strtol strtoul     \
+diff --git a/scd/scdaemon.c b/scd/scdaemon.c
+index e43769f..2066543 100644
+--- a/scd/scdaemon.c
++++ b/scd/scdaemon.c
+@@ -37,6 +37,9 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <npth.h>
++#ifdef HAVE_PRCTL
++# include <sys/prctl.h>
++#endif
+ 
+ #define INCLUDED_BY_MAIN_MODULE 1
+ #define GNUPG_COMMON_NEED_AFLOCAL
+@@ -462,6 +465,12 @@ main (int argc, char **argv )
+   const char *application_priority = NULL;
+ 
+   early_system_init ();
++
++#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
++  /* Disable ptrace on Linux without sgid bit */
++  prctl(PR_SET_DUMPABLE, 0);
++#endif
++
+   gpgrt_set_strusage (my_strusage);
+   gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
+   /* Please note that we may running SUID(ROOT), so be very CAREFUL
diff --git a/main/gnupg/0210-dirmngr-hkp-avoid-potential-race-condition-when-some-host-die.patch b/main/gnupg/0210-dirmngr-hkp-avoid-potential-race-condition-when-some-host-die.patch
new file mode 100644
index 00000000000..32942e6f91f
--- /dev/null
+++ b/main/gnupg/0210-dirmngr-hkp-avoid-potential-race-condition-when-some-host-die.patch
@@ -0,0 +1,284 @@
+note: combination of previous 0210+0220
+--
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Sat, 29 Oct 2016 01:25:05 -0400
+Subject: dirmngr: hkp: Avoid potential race condition when some hosts die.
+
+* dirmngr/ks-engine-hkp.c (select_random_host): Use atomic pass
+through the host table instead of risking out-of-bounds write.
+
+--
+
+Multiple threads may write to hosttable[x]->dead while
+select_random_host() is running.  For example, a housekeeping thread
+might clear the ->dead bit on some entries, or another connection to
+dirmngr might manually mark a host as alive.
+
+If one or more hosts are resurrected between the two loops over a
+given table in select_random_host(), then the allocation of tbl might
+not be large enough, resulting in a write past the end of tbl on the
+second loop.
+
+This change collapses the two loops into a single loop to avoid this
+discrepancy: each host's "dead" bit is now only checked once.
+
+As Werner points out, this isn't currently strictly necessary, since
+npth will not switch threads unless a blocking system call is made,
+and no blocking system call is made in these two loops.
+
+However, in a subsequent change in this series, we will call a
+function in this loop, and that function may sometimes write(2), or
+call other functions, which may themselves block.  Keeping this as a
+single-pass loop avoids the need to keep track of what might block and
+what might not.
+
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ dirmngr/ks-engine-hkp.c | 23 ++++++++++-------------
+ 1 file changed, 10 insertions(+), 13 deletions(-)
+
+Patch-Source: https://sources.debian.org/data/main/g/gnupg2/2.2.27-2/debian/patches/dirmngr-idling/dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
+
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Sat, 29 Oct 2016 02:00:50 -0400
+Subject: dirmngr: Avoid need for hkp housekeeping.
+
+* dirmngr/ks-engine-hkp.c (host_is_alive): New function.  Test whether
+host is alive and resurrects it if it has been dead long enough.
+(select_random_host, map_host, ks_hkp_mark_host): Use host_is_alive
+instead of testing hostinfo_t->dead directly.
+(ks_hkp_housekeeping): Remove function, no longer needed.
+* dirmngr/dirmngr.c (housekeeping_thread): Remove call to
+ks_hkp_housekeeping.
+
+--
+
+Rather than resurrecting hosts upon scheduled resurrection times, test
+whether hosts should be resurrected as they're inspected for being
+dead.  This removes the need for explicit housekeeping, and makes host
+resurrections happen "just in time", rather than being clustered on
+HOUSEKEEPING_INTERVAL seconds.
+
+According to 392e068e9f143d41f6350345619543cbcd47380f,
+dns_stuff_housekeeping only works on Windows, so it also isn't
+necessary in debian, but it remains in place for now.
+
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ dirmngr/dirmngr.c       |  3 ---
+ dirmngr/dirmngr.h       |  1 -
+ dirmngr/ks-engine-hkp.c | 72 ++++++++++++++++++++++++-------------------------
+ 3 files changed, 35 insertions(+), 41 deletions(-)
+
+Patch-Source: https://sources.debian.org/data/main/g/gnupg2/2.2.27-2/debian/patches/dirmngr-idling/dirmngr-Avoid-need-for-hkp-housekeeping.patch
+
+diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
+index 977e7dd..5017c3f 100644
+--- a/dirmngr/dirmngr.c
++++ b/dirmngr/dirmngr.c
+@@ -2085,7 +2085,6 @@ housekeeping_thread (void *arg)
+   dirmngr_init_default_ctrl (&ctrlbuf);
+ 
+   dns_stuff_housekeeping ();
+-  ks_hkp_housekeeping (curtime);
+   if (network_activity_seen)
+     {
+       network_activity_seen = 0;
+diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
+index 5292da8..690b37d 100644
+--- a/dirmngr/ks-engine-hkp.c
++++ b/dirmngr/ks-engine-hkp.c
+@@ -221,6 +221,24 @@ host_in_pool_p (hostinfo_t hi, int tblidx)
+   return 0;
+ }
+ 
++static int
++host_is_alive (hostinfo_t hi, time_t curtime)
++{
++  if (!hi)
++    return 0;
++  if (!hi->dead)
++    return 1;
++  if (!hi->died_at)
++    return 0; /* manually marked dead */
++  if (hi->died_at + RESURRECT_INTERVAL <= curtime
++      || hi->died_at > curtime)
++    {
++      hi->dead = 0;
++      log_info ("resurrected host '%s'", hi->name);
++      return 1;
++    }
++  return 0;
++}
+ 
+ /* Select a random host.  Consult HI->pool which indices into the global
+    hosttable.  Returns index into HI->pool or -1 if no host could be
+@@ -228,32 +246,32 @@ host_in_pool_p (hostinfo_t hi, int tblidx)
+ static int
+ select_random_host (hostinfo_t hi)
+ {
+-  int *tbl;
+-  size_t tblsize;
++  int *tbl = NULL;
++  size_t tblsize = 0;
+   int pidx, idx;
++  time_t curtime;
++
++  curtime = gnupg_get_time ();
+ 
+   /* CHECKTHIS();  See */
+   /*                 https://sources.debian.org/patches/gnupg2/2.2.20-1/dirmngr-idling/dirmngr-hkp-Avoid-potential-race-condition-when-some.patch/ */
+ 
+   /* We create a new table so that we randomly select only from
+      currently alive hosts.  */
+-  for (idx = 0, tblsize = 0;
++  for (idx = 0;
+        idx < hi->pool_len && (pidx = hi->pool[idx]) != -1;
+        idx++)
+-    if (hosttable[pidx] && !hosttable[pidx]->dead)
+-      tblsize++;
++    if (hosttable[pidx] && host_is_alive (hosttable[pidx], curtime))
++      {
++        tblsize++;
++        tbl = xtryrealloc(tbl, tblsize * sizeof *tbl);
++        if (!tbl)
++          return -1; /* memory allocation failed! */
++        tbl[tblsize-1] = pidx;
++      }
+   if (!tblsize)
+     return -1; /* No hosts.  */
+ 
+-  tbl = xtrymalloc (tblsize * sizeof *tbl);
+-  if (!tbl)
+-    return -1;
+-  for (idx = 0, tblsize = 0;
+-       idx < hi->pool_len && (pidx = hi->pool[idx]) != -1;
+-       idx++)
+-    if (hosttable[pidx] && !hosttable[pidx]->dead)
+-      tbl[tblsize++] = pidx;
+-
+   if (tblsize == 1)  /* Save a get_uint_nonce.  */
+     pidx = tbl[0];
+   else
+@@ -471,6 +489,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
+   int is_pool;
+   int new_hosts = 0;
+   char *cname;
++  time_t curtime;
+ 
+   *r_host = NULL;
+   if (r_httpflags)
+@@ -510,6 +529,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
+     }
+   else
+     hi = hosttable[idx];
++  curtime = gnupg_get_time ();
+ 
+   is_pool = hi->pool != NULL;
+ 
+@@ -616,7 +636,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
+       if (force_reselect)
+         hi->poolidx = -1;
+       else if (hi->poolidx >= 0 && hi->poolidx < hosttable_size
+-               && hosttable[hi->poolidx] && hosttable[hi->poolidx]->dead)
++               && hosttable[hi->poolidx] && !host_is_alive (hosttable[hi->poolidx], curtime))
+         hi->poolidx = -1;
+ 
+       /* Select a host if needed.  */
+@@ -675,7 +695,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
+         return gpg_error_from_syserror ();
+     }
+ 
+-  if (hi->dead)
++  if (!host_is_alive (hi, curtime))
+     {
+       log_error ("host '%s' marked as dead\n", hi->name);
+       if (r_httphost)
+@@ -781,7 +801,8 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
+ {
+   gpg_error_t err = 0;
+   hostinfo_t hi, hi2;
+-  int idx, idx2, idx3, n;
++  int idx, idx2, idx3, n, is_alive;
++  time_t curtime;
+ 
+   if (!name || !*name || !strcmp (name, "localhost"))
+     return 0;
+@@ -796,13 +817,15 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
+       goto leave;
+     }
+ 
++  curtime = gnupg_get_time ();
+   hi = hosttable[idx];
+-  if (alive && hi->dead)
++  is_alive = host_is_alive (hi, curtime);
++  if (alive && !is_alive)
+     {
+       hi->dead = 0;
+       err = ks_printf_help (ctrl, "marking '%s' as alive", name);
+     }
+-  else if (!alive && !hi->dead)
++  else if (!alive && is_alive)
+     {
+       hi->dead = 1;
+       hi->died_at = 0; /* Manually set dead.  */
+@@ -836,14 +859,15 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
+ 
+           hi2 = hosttable[n];
+           if (!hi2)
+-            ;
+-          else if (alive && hi2->dead)
++            continue;
++          is_alive = host_is_alive (hi2, curtime);
++          if (alive && !is_alive)
+             {
+               hi2->dead = 0;
+               err = ks_printf_help (ctrl, "marking '%s' as alive",
+                                     hi2->name);
+             }
+-          else if (!alive && !hi2->dead)
++          else if (!alive && is_alive)
+             {
+               hi2->dead = 1;
+               hi2->died_at = 0; /* Manually set dead. */
+@@ -1149,40 +1173,6 @@ ks_hkp_resolve (ctrl_t ctrl, parsed_uri_t uri)
+ }
+ 
+ 
+-/* Housekeeping function called from the housekeeping thread.  It is
+-   used to mark dead hosts alive so that they may be tried again after
+-   some time.  */
+-void
+-ks_hkp_housekeeping (time_t curtime)
+-{
+-  int idx;
+-  hostinfo_t hi;
+-
+-  if (npth_mutex_lock (&hosttable_lock))
+-    log_fatal ("failed to acquire mutex\n");
+-
+-  for (idx=0; idx < hosttable_size; idx++)
+-    {
+-      hi = hosttable[idx];
+-      if (!hi)
+-        continue;
+-      if (!hi->dead)
+-        continue;
+-      if (!hi->died_at)
+-        continue; /* Do not resurrect manually shot hosts.  */
+-      if (hi->died_at + RESURRECT_INTERVAL <= curtime
+-          || hi->died_at > curtime)
+-        {
+-          hi->dead = 0;
+-          log_info ("resurrected host '%s'", hi->name);
+-        }
+-    }
+-
+-  if (npth_mutex_unlock (&hosttable_lock))
+-    log_fatal ("failed to release mutex\n");
+-}
+-
+-
+ /* Reload (SIGHUP) action for this module.  We mark all host alive
+  * even those which have been manually shot.  */
+ void
diff --git a/main/gnupg/0230-dirmngr-avoid-automatically-checking-upstream-swdb.patch b/main/gnupg/0230-dirmngr-avoid-automatically-checking-upstream-swdb.patch
new file mode 100644
index 00000000000..8ffd8973e3a
--- /dev/null
+++ b/main/gnupg/0230-dirmngr-avoid-automatically-checking-upstream-swdb.patch
@@ -0,0 +1,51 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sun, 20 Nov 2016 23:09:24 -0500
+Date: Wed, 18 Aug 2021 21:08:20 +0200
+Subject: dirmngr: Avoid automatically checking upstream swdb.
+
+* dirmngr/dirmngr.c (housekeeping_thread): Avoid automatically
+checking upstream's software database.  In Debian, software updates
+should be handled by the distro mechanism, and additional upstream
+checks only confuse the user.
+* doc/dirmngr.texi: document that --allow-version-check does nothing.
+
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ dirmngr/dirmngr.c | 2 --
+ doc/dirmngr.texi  | 7 ++++---
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+Patch-Source: https://sources.debian.org/data/main/g/gnupg2/2.2.27-2/debian/patches/dirmngr-idling/dirmngr-Avoid-automatically-checking-upstream-swdb.patch
+
+diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
+index 89eea4e..f26ed63 100644
+--- a/dirmngr/dirmngr.c
++++ b/dirmngr/dirmngr.c
+@@ -1955,8 +1955,6 @@ housekeeping_thread (void *arg)
+   if (network_activity_seen)
+     {
+       network_activity_seen = 0;
+-      if (opt.allow_version_check)
+-        dirmngr_load_swdb (&ctrlbuf, 0);
+       workqueue_run_global_tasks (&ctrlbuf, 1);
+     }
+   else
+diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
+index 843fdbf..84a8d28 100644
+--- a/doc/dirmngr.texi
++++ b/doc/dirmngr.texi
+@@ -291,9 +291,10 @@ Set the size of the queue for pending connections.  The default is 64.
+ @item --allow-version-check
+ @opindex allow-version-check
+ Allow Dirmngr to connect to @code{https://versions.gnupg.org} to get
+-the list of current software versions.  If this option is enabled
+-the list is retrieved in case the local
+-copy does not exist or is older than 5 to 7 days.  See the option
++the list of current software versions.
++On Alpine-packaged versions, this option does nothing since software
++updates should be handled by the distribution.
++See the option
+ @option{--query-swdb} of the command @command{gpgconf} for more
+ details.  Note, that regardless of this option a version check can
+ always be triggered using this command:
diff --git a/main/gnupg/0330-gpg-default-to-sha512-for-all-signature-types-on-rsa-keys.patch b/main/gnupg/0330-gpg-default-to-sha512-for-all-signature-types-on-rsa-keys.patch
new file mode 100644
index 00000000000..3b4e146a512
--- /dev/null
+++ b/main/gnupg/0330-gpg-default-to-sha512-for-all-signature-types-on-rsa-keys.patch
@@ -0,0 +1,66 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Thu, 7 Sep 2017 18:49:35 -0400
+Subject: gpg: Default to SHA-512 for all signature types on RSA keys.
+
+* g10/main.h (DEFAULT_DIGEST_ALGO): Use SHA512 instead of SHA256 in
+--gnupg mode (leave strict RFC and PGP modes alone).
+* configure.ac: Do not allow disabling sha512.
+* g10/misc.c (map_md_openpgp_to_gcry): Always support SHA512.
+
+--
+
+SHA512 is more performant on most 64-bit platforms than SHA256, and
+offers a better security margin.  It is also widely implemented.
+
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ configure.ac | 2 +-
+ g10/main.h   | 2 +-
+ g10/misc.c   | 5 +----
+ 3 files changed, 3 insertions(+), 6 deletions(-)
+
+Patch-Source: https://sources.debian.org/data/main/g/gnupg2/2.2.27-2/debian/patches/update-defaults/gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch
+
+diff --git a/configure.ac b/configure.ac
+index c31ae02..f7788b3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -339,7 +339,7 @@ GNUPG_GPG_DISABLE_ALGO([rmd160],[RIPE-MD160 hash])
+ GNUPG_GPG_DISABLE_ALGO([sha224],[SHA-224 hash])
+ # SHA256 is a MUST algorithm for GnuPG.
+ GNUPG_GPG_DISABLE_ALGO([sha384],[SHA-384 hash])
+-GNUPG_GPG_DISABLE_ALGO([sha512],[SHA-512 hash])
++# SHA512 is a MUST algorithm for GnuPG.
+ 
+ 
+ # Allow disabling of zip support.
+diff --git a/g10/main.h b/g10/main.h
+index b29e23e..0a64a21 100644
+--- a/g10/main.h
++++ b/g10/main.h
+@@ -41,7 +41,7 @@
+ # define DEFAULT_CIPHER_ALGO     CIPHER_ALGO_3DES
+ #endif
+ 
+-#define DEFAULT_DIGEST_ALGO     ((GNUPG)? DIGEST_ALGO_SHA256:DIGEST_ALGO_SHA1)
++#define DEFAULT_DIGEST_ALGO     ((GNUPG)? DIGEST_ALGO_SHA512:DIGEST_ALGO_SHA1)
+ #define DEFAULT_S2K_DIGEST_ALGO  DEFAULT_DIGEST_ALGO
+ #ifdef HAVE_ZIP
+ # define DEFAULT_COMPRESS_ALGO   COMPRESS_ALGO_ZIP
+diff --git a/g10/misc.c b/g10/misc.c
+index 2f4b452..0e6d9d5 100644
+--- a/g10/misc.c
++++ b/g10/misc.c
+@@ -862,11 +862,8 @@ map_md_openpgp_to_gcry (digest_algo_t algo)
+     case DIGEST_ALGO_SHA384: return 0;
+ #endif
+ 
+-#ifdef GPG_USE_SHA512
+     case DIGEST_ALGO_SHA512: return GCRY_MD_SHA512;
+-#else
+-    case DIGEST_ALGO_SHA512: return 0;
+-#endif
++
+     default: return 0;
+     }
+ }
diff --git a/main/gnupg/0340-gpg-prefer-sha512-and-sha384-in-personal-digest.patch b/main/gnupg/0340-gpg-prefer-sha512-and-sha384-in-personal-digest.patch
new file mode 100644
index 00000000000..bac31b3f031
--- /dev/null
+++ b/main/gnupg/0340-gpg-prefer-sha512-and-sha384-in-personal-digest.patch
@@ -0,0 +1,48 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Wed, 3 Jan 2018 12:34:26 -0500
+Subject: gpg: Prefer SHA-512 and SHA-384 in personal-digest-preferences.
+
+* g10/keygen.c (keygen_set_std_prefs): prefer SHA-512
+and SHA-384 by default.
+
+--
+
+In 8ede3ae29a39641a2f98ad9a4cf61ea99085a892, upstream changed the
+defaults for --default-preference-list to advertise a preference for
+SHA-512, without touching --personal-digest-preferences.  This makes
+the same change for --personal-digest-preferences, since every modern
+OpenPGP library supports them all.
+
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ g10/keygen.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+Patch-Source: https://sources.debian.org/data/main/g/gnupg2/2.2.27-2/debian/patches/update-defaults/gpg-Prefer-SHA-512-and-SHA-384-in-personal-digest.patch
+
+diff --git a/g10/keygen.c b/g10/keygen.c
+index 79d4579..cb92468 100644
+--- a/g10/keygen.c
++++ b/g10/keygen.c
+@@ -391,16 +391,16 @@ keygen_set_std_prefs (const char *string,int personal)
+             if (personal)
+               {
+                 /* The default internal hash algo order is:
+-                 *  SHA-256, SHA-384, SHA-512, SHA-224, SHA-1.
++                 *  SHA-512, SHA-384, SHA-256, SHA-224, SHA-1.
+                  */
+-                if (!openpgp_md_test_algo (DIGEST_ALGO_SHA256))
+-                  strcat (dummy_string, "H8 ");
++                if (!openpgp_md_test_algo (DIGEST_ALGO_SHA512))
++                  strcat (dummy_string, "H10 ");
+ 
+                 if (!openpgp_md_test_algo (DIGEST_ALGO_SHA384))
+                   strcat (dummy_string, "H9 ");
+ 
+-                if (!openpgp_md_test_algo (DIGEST_ALGO_SHA512))
+-                  strcat (dummy_string, "H10 ");
++                if (!openpgp_md_test_algo (DIGEST_ALGO_SHA256))
++                  strcat (dummy_string, "H8 ");
+               }
+             else
+               {
diff --git a/main/gnupg/0420-gpg-drop-import-clean-from-default-keyserver-import-options.patch b/main/gnupg/0420-gpg-drop-import-clean-from-default-keyserver-import-options.patch
new file mode 100644
index 00000000000..26098e791fd
--- /dev/null
+++ b/main/gnupg/0420-gpg-drop-import-clean-from-default-keyserver-import-options.patch
@@ -0,0 +1,51 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 15 Jul 2019 16:24:35 -0400
+Subject: gpg: drop import-clean from default keyserver import options
+
+* g10/gpg.c (main): drop IMPORT_CLEAN from the
+default opt.keyserver_options.import_options
+* doc/gpg.texi: reflect this change in the documentation
+
+Given that SELF_SIGS_ONLY is already set, it's not clear what
+additional benefit IMPORT_CLEAN provides.  Furthermore, IMPORT_CLEAN
+means that receiving an OpenPGP certificate from a keyserver will
+potentially delete data that is otherwise held in the local keyring,
+which is surprising to users who expect retrieval from the keyservers
+to be purely additive.
+
+GnuPG-Bug-Id: 4628
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ doc/gpg.texi | 2 +-
+ g10/gpg.c    | 3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+Patch-Source: https://sources.debian.org/data/main/g/gnupg2/2.2.27-2/debian/patches/gpg-drop-import-clean-from-default-keyserver-import-optio.patch
+
+diff --git a/doc/gpg.texi b/doc/gpg.texi
+index 804ecf9..b238278 100644
+--- a/doc/gpg.texi
++++ b/doc/gpg.texi
+@@ -2047,7 +2047,7 @@ are available for all keyserver types, some common options are:
+ 
+ @end table
+ 
+-The default list of options is: "self-sigs-only, import-clean,
++The default list of options is: "self-sigs-only,
+ repair-keys, repair-pks-subkey-bug, export-attributes". However, if
+ the actual used source is an LDAP server "no-self-sigs-only" is
+ assumed unless "self-sigs-only" has been explicitly configured.
+diff --git a/g10/gpg.c b/g10/gpg.c
+index 68c0454..205de60 100644
+--- a/g10/gpg.c
++++ b/g10/gpg.c
+@@ -2441,8 +2441,7 @@ main (int argc, char **argv)
+ 					    | IMPORT_REPAIR_PKS_SUBKEY_BUG
+                                             | IMPORT_SELF_SIGS_ONLY
+                                             | IMPORT_COLLAPSE_UIDS
+-                                            | IMPORT_COLLAPSE_SUBKEYS
+-                                            | IMPORT_CLEAN);
++                                            | IMPORT_COLLAPSE_SUBKEYS);
+     opt.keyserver_options.export_options = EXPORT_ATTRIBUTES;
+     opt.keyserver_options.options = 0;
+     opt.verify_options = (LIST_SHOW_UID_VALIDITY
diff --git a/main/gnupg/APKBUILD b/main/gnupg/APKBUILD
index 33bb02a9335..9d128f13c58 100644
--- a/main/gnupg/APKBUILD
+++ b/main/gnupg/APKBUILD
@@ -1,31 +1,93 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gnupg
-pkgver=2.2.20
+# Upgrade to LTS versions only.
+pkgver=2.4.5
 _ver=${pkgver/_beta/-beta}
 pkgrel=0
-pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool"
+pkgdesc="GNU Privacy Guard 2 - meta package for full GnuPG suite"
 url="https://www.gnupg.org/"
 arch="all"
 license="GPL-3.0-or-later"
-depends="pinentry"
-makedepends="gnutls-dev libksba-dev libgcrypt-dev libgpg-error-dev
-	npth-dev zlib-dev libassuan-dev openldap-dev bzip2-dev
-	sqlite-dev libusb-dev"
-subpackages="$pkgname-doc $pkgname-scdaemon"
+depends="gpg=$pkgver-r$pkgrel
+	gpg-agent=$pkgver-r$pkgrel
+	gpg-wks-server=$pkgver-r$pkgrel
+	gpgsm=$pkgver-r$pkgrel
+	gpgv=$pkgver-r$pkgrel
+	$pkgname-dirmngr=$pkgver-r$pkgrel
+	$pkgname-utils=$pkgver-r$pkgrel
+	$pkgname-wks-client=$pkgver-r$pkgrel
+	"
+makedepends="
+	autoconf
+	automake
+	bzip2-dev
+	gettext-dev
+	gnutls-dev
+	libassuan-dev
+	libgcrypt-dev
+	libgpg-error-dev
+	libksba-dev
+	libtool
+	libusb-dev
+	npth-dev
+	openldap-dev
+	pinentry
+	sqlite-dev
+	texinfo
+	xz
+	zlib-dev
+	"
+install="$pkgname-scdaemon.pre-install"
+subpackages="
+	$pkgname-doc
+	$pkgname-lang::noarch
+	$pkgname-dirmngr
+	$pkgname-gpgconf
+	$pkgname-scdaemon
+	$pkgname-keyboxd
+	$pkgname-wks-client:_wks_client
+	gpg
+	gpg-agent:_agent
+	gpg-wks-server:_wks_server
+	gpgsm
+	gpgv
+	$pkgname-utils
+	"
 source="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$_ver.tar.bz2
-	0001-Include-sys-select.h-for-FD_SETSIZE.patch
+	0010-avoid-beta-warning.patch
+	0020-avoid-regenerating-defsincdate-use-shipped-file.patch
+	0110-avoid-simple-memory-dumps-via-ptrace.patch
+	0210-dirmngr-hkp-avoid-potential-race-condition-when-some-host-die.patch
+	0230-dirmngr-avoid-automatically-checking-upstream-swdb.patch
+	0330-gpg-default-to-sha512-for-all-signature-types-on-rsa-keys.patch
+	0340-gpg-prefer-sha512-and-sha384-in-personal-digest.patch
+	0420-gpg-drop-import-clean-from-default-keyserver-import-options.patch
 	fix-i18n.patch
+	HACK-revert-rfc4880bis-default.patch
 	60-scdaemon.rules
 	"
-install="$pkgname-scdaemon.pre-install"
 
 # secfixes:
+#   2.2.35-r4:
+#     - CVE-2022-34903
+#   2.2.23-r0:
+#     - CVE-2020-25125
 #   2.2.18-r0:
 #     - CVE-2019-14855
 #   2.2.8-r0:
 #     - CVE-2018-12020
 
+prepare() {
+	default_prepare
+
+	# tries to mkdir -p setup.scm/tests but this is a file?
+	rm tests/gpgme/setup.scm
+
+	autoreconf -vif
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
@@ -50,29 +112,150 @@ check() {
 package() {
 	make DESTDIR="$pkgdir" install
 
-	# install compat symlink
-	ln -s gpg  "$pkgdir"/usr/bin/gpg2
-	ln -s gpgv "$pkgdir"/usr/bin/gpgv2
+	install -Dm644 -t "$pkgdir"/lib/udev/rules.d/ "$srcdir"/60-scdaemon.rules
+
+	cd "$pkgdir"
 
-	install -m755 tools/gpg-zip "$pkgdir"/usr/bin/gpg-zip
+	# install compat symlink
+	ln -s gpg  usr/bin/gpg2
+	ln -s gpgv usr/bin/gpgv2
 
 	# Remove docs for systemd-user
-	rm -rf "$pkgdir"/usr/share/doc/gnupg/examples/systemd-user
+	rm -rf usr/share/doc/gnupg/examples/systemd-user
+
+	# Remove gpg scheme interpreter - an internal tool used in gpg tests
+	rm -rf usr/bin/gpgscm
+}
+
+_agent() {
+	pkgdesc="GNU Privacy Guard 2 - cryptographic agent"
+	depends="$pkgname-gpgconf=$pkgver-r$pkgrel"
+	replaces="$pkgname"  # for backward compatibility
+
+	amove usr/bin/gpg-agent
+	amove usr/libexec/gpg-check-pattern
+	amove usr/libexec/gpg-preset-passphrase
+	amove usr/libexec/gpg-protect-tool
+	amove usr/share/gnupg/help.txt
+}
+
+dirmngr() {
+	pkgdesc="GNU Privacy Guard 2 - network certificate management service"
+	depends="$pkgname-gpgconf=$pkgver-r$pkgrel"
+	provides="dirmngr=$pkgver-r$pkgrel"  # alternative package name
+	replaces="$pkgname"  # for backward compatibility
+
+	amove usr/bin/dirmngr*
+	amove usr/libexec/dirmngr_ldap
+	amove usr/share/gnupg/sks-keyservers.netCA.pem
+}
+
+gpg() {
+	pkgdesc="GNU Privacy Guard 2 - public key operations only"
+	depends="
+		$pkgname-dirmngr=$pkgver-r$pkgrel
+		$pkgname-gpgconf=$pkgver-r$pkgrel
+		$pkgname-keyboxd=$pkgver-r$pkgrel
+		"
+	replaces="$pkgname"  # for backward compatibility
+	provider_priority=100  # highest (other provider of cmd:gpg is gnupg1)
+
+	amove usr/bin/gpg
+	amove usr/bin/gpg2
+}
+
+gpgconf() {
+	pkgdesc="GNU Privacy Guard 2 - core configuration utilities"
+	depends="pinentry"
+	replaces="$pkgname"  # for backward compatibility
+	provides="gpgconf=$pkgver-r$pkgrel"  # alternative package name
+
+	amove usr/bin/gpg-connect-agent
+	amove usr/bin/gpgconf
+	amove usr/share/gnupg/distsigkey.gpg
+}
+
+gpgsm() {
+	pkgdesc="GNU Privacy Guard 2 - S/MIME version"
+	depends="$pkgname-gpgconf=$pkgver-r$pkgrel"
+	replaces="$pkgname"  # for backward compatibility
+
+	amove usr/bin/gpgsm
+}
+
+gpgv() {
+	pkgdesc="GNU Privacy Guard 2 - signature verification only"
+	depends=""
+	replaces="$pkgname"  # for backward compatibility
+	provider_priority=100  # highest (other provider of cmd:gpgv is gnupg1)
+
+	amove usr/bin/gpgv
+	amove usr/bin/gpgv2
+}
+
+lang() {
+	pkgdesc="Languages for package gnupg"
+	depends=""
+	install_if="$pkgname=$pkgver-r$pkgrel lang"
+	replaces="$pkgname"  # for backward compatibility
+
+	amove usr/share/gnupg/help.*.txt
 }
 
 scdaemon() {
-	pkgdesc="GNU Privacy Guard 2 - smart card support"
-	depends="gnupg"
+	pkgdesc="GNU Privacy Guard 2 - smart card support daemon"
+	depends="gpg-agent=$pkgver-r$pkgrel"
+	replaces="$pkgname"  # for backward compatibility
+
+	amove usr/libexec/scdaemon
+	amove lib/udev/rules.d
+}
+
+_wks_client() {
+	pkgdesc="GNU Privacy Guard 2 - Web Key Service client"
+	depends="gpg=$pkgver-r$pkgrel gpg-agent=$pkgver-r$pkgrel $pkgname-dirmngr=$pkgver-r$pkgrel"
+	replaces="$pkgname"  # for backward compatibility
+
+	amove usr/bin/gpg-wks-client
+	amove usr/libexec/gpg-wks-client
+}
+
+_wks_server() {
+	pkgdesc="GNU Privacy Guard 2 - Web Key Service server"
+	depends="gpg=$pkgver-r$pkgrel gpg-agent=$pkgver-r$pkgrel"
+	replaces="$pkgname"  # for backward compatibility
+
+	amove usr/bin/gpg-wks-server
+}
+
+keyboxd() {
+	pkgdesc="GNU Privacy Guard 2 - keyboxd manager"
+	depends=""
+
+	amove usr/libexec/keyboxd
+}
 
-	mkdir -p "$subpkgdir/usr/libexec"
-	mkdir -p "$subpkgdir/lib/udev/rules.d"
+# Must be the last!
+utils() {
+	pkgdesc="GNU Privacy Guard 2 - utility programs"
+	depends=""
+	replaces="$pkgname"  # for backward compatibility
+	provider_priority=100  # highest (other provider of cmd:gpgsplit is gnupg1)
 
-	install -Dm644 -t "$subpkgdir/lib/udev/rules.d/" \
-		"$srcdir/60-scdaemon.rules"
-	mv "$pkgdir/usr/libexec/scdaemon" "$subpkgdir/usr/libexec/"
+	amove usr/*
 }
 
-sha512sums="3e69f102366ec3415f439ab81aae2458182fa1a18dfb86565b1d9dc638f3fc4c179a5947f0042b7c5a813345676285a662793664a1803ea9ad8328f0548e0edc  gnupg-2.2.20.tar.bz2
-c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7  0001-Include-sys-select.h-for-FD_SETSIZE.patch
-b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b  fix-i18n.patch
-4bfb9742279c2d1c872d63cd4bcb01f6a2a13d94618eff954d3a37451fa870a9bb29687330854ee47e8876d6e60dc81cb2569c3931beaefacda33db23c464402  60-scdaemon.rules"
+sha512sums="
+4d54744f09399c5899144d0cb5fdc2756e45b058db41b9ea9df3be03e80b914509e16ef35aa0248e7561185b80f7a5f9fd6afcab8ccff75ff82ed555448a38ff  gnupg-2.4.5.tar.bz2
+0e2aef4ae5c43c43efe2c914534d73f8f7068b49b5826b1f999296c30395497c4af121e4e99152ff7b43dcf56d1792cd46aea5158ca48597d6e0fca6d7358711  0010-avoid-beta-warning.patch
+18004e52925b1f03e67a29a3d43b39e8119cf3426cdad4136824b932ad906ac499b4ceb3d7573177a9f16410d3b80c8f0e4bcdc54dd284f3f803a2cef609ad01  0020-avoid-regenerating-defsincdate-use-shipped-file.patch
+d77a230e099ac26cf70acf4bf5c4a8446460f677857818027c16fd029292c249a24f31f7073e0388757cf567656e416b7f91af3bba62a85a2ffbdcf985c5050c  0110-avoid-simple-memory-dumps-via-ptrace.patch
+54d6b805ad89b384df140e1dc7c4ecd6703bf317fb97834026458fab92f3f0f4f426f0da86c0fbfe102bb1304a489d15ea2e728d5f97d4f0c9bf14cc30cb8c23  0210-dirmngr-hkp-avoid-potential-race-condition-when-some-host-die.patch
+1c38b039950fa9733e9584ac61d52e12aad56489d7f3aec396b2528d0bf41729971d3fe9b4d04d50595a2a954181892ed1ec93f1b7ade24e4da26744d78598fc  0230-dirmngr-avoid-automatically-checking-upstream-swdb.patch
+1afea38e6fe3206be1cc2b2bc1410753aba9bc1e1370da76e711f7107924fc169008e1fba15117e0c5b244d71146e86c49ce0d816ce49a50b2452159144e1893  0330-gpg-default-to-sha512-for-all-signature-types-on-rsa-keys.patch
+462af7b1e530e00d3870062666ef427d6df57ee8358b043c06fb8b7b54e50891fc8a49beeaabe45d1822d222ffc47da624798ceb8889a02e38ce85612453bb8b  0340-gpg-prefer-sha512-and-sha384-in-personal-digest.patch
+0c1c44932e47ded65d412c48f859f1615a896ae1dd0a9e0e46fd491f3a25adc80e29fe12e329c3f541a60729cdf82330e81ab7bb7cacf1ddc6a9701a38bbbfaf  0420-gpg-drop-import-clean-from-default-keyserver-import-options.patch
+28cba87121c66b1bbc90bb0f3ca8c69ff19376243854577a4d24afa4a3d4a4b8a952a3a7bbecc200058b6f722cfcd4fc72d5630c822f78ef3fc819f972798e34  fix-i18n.patch
+eeeab08c22844ee364a64d7b772f0e42e5404428aaf37ef2504f043d7a69d1d3b32a34c680c413756ffb419733f23cea16172a6a611986c70bbffc801d071de8  HACK-revert-rfc4880bis-default.patch
+4bfb9742279c2d1c872d63cd4bcb01f6a2a13d94618eff954d3a37451fa870a9bb29687330854ee47e8876d6e60dc81cb2569c3931beaefacda33db23c464402  60-scdaemon.rules
+"
diff --git a/main/gnupg/HACK-revert-rfc4880bis-default.patch b/main/gnupg/HACK-revert-rfc4880bis-default.patch
new file mode 100644
index 00000000000..cd2c1dc3277
--- /dev/null
+++ b/main/gnupg/HACK-revert-rfc4880bis-default.patch
@@ -0,0 +1,207 @@
+see:
+https://lore.kernel.org/distributions/F30D6590-3E0C-4865-A944-7DE118A619CF@gentoo.org/
+
+this reverts to the pre-2.4 default of key generation. the new one is
+(apparently) not compatible with a potential future specification, and
+generates incompatible keys by default.
+
+once this is figured out, find a better solution than this
+--
+From 8b3e9127ea02eae8ec3470149e22804a572df5b8 Mon Sep 17 00:00:00 2001
+From: psykose <alice@ayaya.dev>
+Date: Tue, 7 Feb 2023 10:14:34 +0100
+Subject: [PATCH] Revert "gpg: Merge --rfc4880bis features into --gnupg"
+
+This reverts commit 4583f4fe2e11b3dd070066628c3f16776cc74f72.
+---
+ g10/gpg.c    | 35 ++++++++++++++++++++++++++++++++---
+ g10/keygen.c | 30 ++++++++++++++++++------------
+ 2 files changed, 50 insertions(+), 15 deletions(-)
+
+diff --git a/g10/gpg.c b/g10/gpg.c
+index b759cc1..5a04163 100644
+--- a/g10/gpg.c
++++ b/g10/gpg.c
+@@ -247,6 +247,7 @@ enum cmd_and_opt_values
+     oGnuPG,
+     oRFC2440,
+     oRFC4880,
++    oRFC4880bis,
+     oOpenPGP,
+     oPGP7,
+     oPGP8,
+@@ -635,6 +636,7 @@ static gpgrt_opt_t opts[] = {
+   ARGPARSE_s_n (oGnuPG, "no-pgp8", "@"),
+   ARGPARSE_s_n (oRFC2440, "rfc2440", "@"),
+   ARGPARSE_s_n (oRFC4880, "rfc4880", "@"),
++  ARGPARSE_s_n (oRFC4880bis, "rfc4880bis", "@"),
+   ARGPARSE_s_n (oOpenPGP, "openpgp", N_("use strict OpenPGP behavior")),
+   ARGPARSE_s_n (oPGP7, "pgp6", "@"),
+   ARGPARSE_s_n (oPGP7, "pgp7", "@"),
+@@ -976,7 +978,6 @@ static gpgrt_opt_t opts[] = {
+   ARGPARSE_s_n (oNoop, "no-allow-multiple-messages", "@"),
+   ARGPARSE_s_s (oNoop, "aead-algo", "@"),
+   ARGPARSE_s_s (oNoop, "personal-aead-preferences","@"),
+-  ARGPARSE_s_n (oNoop, "rfc4880bis", "@"),
+   ARGPARSE_s_n (oNoop, "override-compliance-check", "@"),
+ 
+ 
+@@ -2225,7 +2226,7 @@ static struct gnupg_compliance_option compliance_options[] =
+   {
+     { "gnupg",      oGnuPG },
+     { "openpgp",    oOpenPGP },
+-    { "rfc4880bis", oGnuPG },
++    { "rfc4880bis", oRFC4880bis },
+     { "rfc4880",    oRFC4880 },
+     { "rfc2440",    oRFC2440 },
+     { "pgp6",       oPGP7 },
+@@ -2241,8 +2242,28 @@ static struct gnupg_compliance_option compliance_options[] =
+ static void
+ set_compliance_option (enum cmd_and_opt_values option)
+ {
++  opt.flags.rfc4880bis = 0;  /* Clear because it is initially set.  */
++
+   switch (option)
+     {
++    case oRFC4880bis:
++      opt.flags.rfc4880bis = 1;
++      opt.compliance = CO_RFC4880;
++      opt.flags.dsa2 = 1;
++      opt.flags.require_cross_cert = 1;
++      opt.rfc2440_text = 0;
++      opt.allow_non_selfsigned_uid = 1;
++      opt.allow_freeform_uid = 1;
++      opt.escape_from = 1;
++      opt.not_dash_escaped = 0;
++      opt.def_cipher_algo = 0;
++      opt.def_digest_algo = 0;
++      opt.cert_digest_algo = 0;
++      opt.compress_algo = -1;
++      opt.s2k_mode = 3; /* iterated+salted */
++      opt.s2k_digest_algo = DIGEST_ALGO_SHA256;
++      opt.s2k_cipher_algo = CIPHER_ALGO_AES256;
++      break;
+     case oOpenPGP:
+     case oRFC4880:
+       /* This is effectively the same as RFC2440, but with
+@@ -2286,6 +2307,7 @@ set_compliance_option (enum cmd_and_opt_values option)
+     case oPGP8:  opt.compliance = CO_PGP8;  break;
+     case oGnuPG:
+       opt.compliance = CO_GNUPG;
++      opt.flags.rfc4880bis = 1;
+       break;
+ 
+     case oDE_VS:
+@@ -2488,6 +2510,7 @@ main (int argc, char **argv)
+     opt.emit_version = 0;
+     opt.weak_digests = NULL;
+     opt.compliance = CO_GNUPG;
++    opt.flags.rfc4880bis = 1;
+ 
+     /* Check special options given on the command line.  */
+     orig_argc = argc;
+@@ -3030,6 +3053,7 @@ main (int argc, char **argv)
+           case oOpenPGP:
+           case oRFC2440:
+           case oRFC4880:
++          case oRFC4880bis:
+           case oPGP7:
+           case oPGP8:
+           case oGnuPG:
+@@ -3858,6 +3882,11 @@ main (int argc, char **argv)
+     if( may_coredump && !opt.quiet )
+ 	log_info(_("WARNING: program may create a core file!\n"));
+ 
++    if (!opt.flags.rfc4880bis)
++      {
++        opt.mimemode = 0; /* This will use text mode instead.  */
++      }
++
+     if (eyes_only) {
+       if (opt.set_filename)
+ 	  log_info(_("WARNING: %s overrides %s\n"),
+@@ -4074,7 +4103,7 @@ main (int argc, char **argv)
+     /* Check our chosen algorithms against the list of legal
+        algorithms. */
+ 
+-    if(!GNUPG)
++    if(!GNUPG && !opt.flags.rfc4880bis)
+       {
+ 	const char *badalg=NULL;
+ 	preftype_t badtype=PREFTYPE_NONE;
+diff --git a/g10/keygen.c b/g10/keygen.c
+index 7f54f7d..83fc3f3 100644
+--- a/g10/keygen.c
++++ b/g10/keygen.c
+@@ -404,7 +404,7 @@ keygen_set_std_prefs (const char *string,int personal)
+ 	      strcat(dummy_string,"S7 ");
+ 	    strcat(dummy_string,"S2 "); /* 3DES */
+ 
+-            if (!openpgp_aead_test_algo (AEAD_ALGO_OCB))
++            if (opt.flags.rfc4880bis && !openpgp_aead_test_algo (AEAD_ALGO_OCB))
+ 	      strcat(dummy_string,"A2 ");
+ 
+             if (personal)
+@@ -889,7 +889,7 @@ keygen_upd_std_prefs (PKT_signature *sig, void *opaque)
+   /* Make sure that the MDC feature flag is set if needed.  */
+   add_feature_mdc (sig,mdc_available);
+   add_feature_aead (sig, aead_available);
+-  add_feature_v5 (sig, 1);
++  add_feature_v5 (sig, opt.flags.rfc4880bis);
+   add_keyserver_modify (sig,ks_modify);
+   keygen_add_keyserver_url(sig,NULL);
+ 
+@@ -3382,7 +3382,10 @@ parse_key_parameter_part (ctrl_t ctrl,
+                 }
+             }
+           else if (!ascii_strcasecmp (s, "v5"))
+-            keyversion = 5;
++            {
++              if (opt.flags.rfc4880bis)
++                keyversion = 5;
++            }
+           else if (!ascii_strcasecmp (s, "v4"))
+             keyversion = 4;
+           else
+@@ -3641,7 +3644,7 @@ parse_key_parameter_part (ctrl_t ctrl,
+  *   ecdsa := Use algorithm ECDSA.
+  *   eddsa := Use algorithm EdDSA.
+  *   ecdh  := Use algorithm ECDH.
+- *   v5    := Create version 5 key
++ *   v5    := Create version 5 key (requires option --rfc4880bis)
+  *
+  * There are several defaults and fallbacks depending on the
+  * algorithm.  PART can be used to select which part of STRING is
+@@ -4513,9 +4516,9 @@ read_parameter_file (ctrl_t ctrl, const char *fname )
+ 	    }
+ 	}
+ 
+-        if ((keywords[i].key == pVERSION
+-             || keywords[i].key == pSUBVERSION))
+-          ; /* Ignore version.  */
++        if (!opt.flags.rfc4880bis && (keywords[i].key == pVERSION
++                                      || keywords[i].key == pSUBVERSION))
++          ; /* Ignore version unless --rfc4880bis is active.  */
+         else
+           {
+             r = xmalloc_clear( sizeof *r + strlen( value ) );
+@@ -4610,11 +4613,14 @@ quickgen_set_para (struct para_data_s *para, int for_subkey,
+       para = r;
+     }
+ 
+-  r = xmalloc_clear (sizeof *r + 20);
+-  r->key = for_subkey? pSUBVERSION : pVERSION;
+-  snprintf (r->u.value, 20, "%d", version);
+-  r->next = para;
+-  para = r;
++  if (opt.flags.rfc4880bis)
++    {
++      r = xmalloc_clear (sizeof *r + 20);
++      r->key = for_subkey? pSUBVERSION : pVERSION;
++      snprintf (r->u.value, 20, "%d", version);
++      r->next = para;
++      para = r;
++    }
+ 
+   if (keytime)
+     {
diff --git a/main/gnupg/fix-i18n.patch b/main/gnupg/fix-i18n.patch
index 00d71dd5cf7..90fc03382f5 100644
--- a/main/gnupg/fix-i18n.patch
+++ b/main/gnupg/fix-i18n.patch
@@ -7,6 +7,6 @@
 -# ifdef ENABLE_NLS
    setlocale (LC_ALL, "" );
 +# ifdef ENABLE_NLS
-   bindtextdomain (PACKAGE_GT, LOCALEDIR);
+   bindtextdomain (PACKAGE_GT, gnupg_localedir ());
    textdomain (PACKAGE_GT);
  # endif
diff --git a/main/gnupg/gnupg-scdaemon.pre-install b/main/gnupg/gnupg-scdaemon.pre-install
index 8d8262ceea0..b0cac4cb3b5 100644
--- a/main/gnupg/gnupg-scdaemon.pre-install
+++ b/main/gnupg/gnupg-scdaemon.pre-install
@@ -1,2 +1,4 @@
 #!/bin/sh
 addgroup -S gnupg 2> /dev/null
+
+exit 0
diff --git a/main/gnupg1/APKBUILD b/main/gnupg1/APKBUILD
deleted file mode 100644
index b945e9a737c..00000000000
--- a/main/gnupg1/APKBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gnupg1
-pkgver=1.4.23
-pkgrel=0
-pkgdesc="GNU Privacy Guard 1 - a PGP replacement tool"
-url="http://www.gnupg.org/"
-arch="all"
-license="GPL"
-depends="pinentry"
-makedepends="curl-dev libassuan libksba-dev libgcrypt-dev libgpg-error-dev
-	zlib-dev libassuan-dev"
-subpackages="$pkgname-doc"
-provides="gnupg=$pkgver-r$pkgrel"
-replaces="gnupg"
-source="https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-$pkgver.tar.bz2"
-
-# secfixes:
-#   1.4.23-r0:
-#     - CVE-2017-7526
-#   1.4.22-r1:
-#     - CVE-2018-12020
-
-builddir="$srcdir/gnupg-$pkgver"
-prepare() {
-	default_prepare
-	cd "$builddir"
-
-	# Fix PIC definitions
-	sed -i -e 's:PIC:__PIC__:' \
-		mpi/i386/mpih-add1.S \
-		mpi/i386/mpih-sub1.S \
-		intl/relocatable.c \
-		|| return 1
-}
-
-build() {
-	cd "$builddir"
-	export CFLAGS="$CFLAGS -g"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--disable-nls \
-		--enable-noexecstack \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install
-}
-
-doc() {
-	default_doc
-	provides="gnupg-doc=$pkgver-r$pkgrel"
-}
-
-sha512sums="78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612  gnupg-1.4.23.tar.bz2"
diff --git a/main/gnutls/APKBUILD b/main/gnutls/APKBUILD
index 49ae9717a2b..465344e133d 100644
--- a/main/gnutls/APKBUILD
+++ b/main/gnutls/APKBUILD
@@ -2,24 +2,52 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gnutls
-pkgver=3.6.12
+pkgver=3.8.3
 pkgrel=0
-pkgdesc="A TLS protocol implementation"
+pkgdesc="TLS protocol implementation"
 url="https://www.gnutls.org/"
 arch="all"
-license="GPL-3.0-or-later"
+license="LGPL-2.1-or-later"
 checkdepends="diffutils datefudge"
-makedepends="nettle-dev zlib-dev libtasn1-dev p11-kit-dev libunistring-dev texinfo"
+makedepends="
+	libidn2-dev
+	libkcapi-dev
+	libtasn1-dev
+	libunistring-dev
+	linux-headers
+	nettle-dev
+	p11-kit-dev
+	texinfo
+	zlib-dev
+	"
 subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-utils $pkgname-c++:xx"
 _v=${pkgver%.*}
 case $pkgver in
 *.*.*.*) _v=${_v%.*};;
 esac
 source="https://www.gnupg.org/ftp/gcrypt/gnutls/v$_v/gnutls-$pkgver.tar.xz
-	tests-crq.patch
-	tests-certtool.patch"
+	skip-ktls.patch
+	"
 
+# Upstream Tracker: https://gnutls.org/security-new.html
 # secfixes:
+#   3.8.3-r0:
+#     - CVE-2023-5981
+#     - CVE-2024-0553
+#     - CVE-2024-0567
+#   3.8.0-r0:
+#     - CVE-2023-0361
+#   3.7.7-r0:
+#     - CVE-2022-2509 GNUTLS-SA-2022-07-07
+#   3.7.1-r0:
+#     - CVE-2021-20231 GNUTLS-SA-2021-03-10
+#     - CVE-2021-20232 GNUTLS-SA-2021-03-10
+#   3.6.15-r0:
+#     - CVE-2020-24659 GNUTLS-SA-2020-09-04
+#   3.6.14-r0:
+#     - CVE-2020-13777 GNUTLS-SA-2020-06-03
+#   3.6.13-r0:
+#     - CVE-2020-11501 GNUTLS-SA-2020-03-31
 #   3.6.7-r0:
 #     - CVE-2019-3836
 #     - CVE-2019-3829
@@ -27,31 +55,36 @@ source="https://www.gnupg.org/ftp/gcrypt/gnutls/v$_v/gnutls-$pkgver.tar.xz
 #     - CVE-2017-7507
 
 build() {
-	LIBS="-lgmp" ./configure \
+	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
+		--enable-ktls \
 		--disable-openssl-compatibility \
 		--disable-rpath \
 		--disable-static \
-		--disable-guile \
 		--disable-valgrind-tests
 	make
 }
 
 check() {
-	make check
+	# millis, 100s
+	export GNUTLS_TEST_TIMEOUT=100000
+	make check 	|| {
+		cat tests/test-suite.log
+		return 1
+	}
 }
 
 package() {
-	make -j1 DESTDIR="$pkgdir" \
-		-C "$builddir" install
+	DESTDIR="$pkgdir" make -C "$builddir" install
 }
 
 utils() {
+	license="GPL-3.0-or-later"
 	pkgdesc="Command line tools for TLS protocol"
 	mkdir -p "$subpkgdir"/usr/
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
@@ -63,6 +96,7 @@ xx() {
 	mv "$pkgdir"/usr/lib/lib*xx.so.* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="e1031fd1239d8b0f056a6b736e4c72c9268fb635f273527f310771c608b841cad7b6631401382ec3040d9b539180bf421882bf43427ad3549a5787d2864c2fa5  gnutls-3.6.12.tar.xz
-3e7d872963cc25e49f1ecf98de7d6f3b6b22d2c1c9e982bc4b22ce658c11d8567903728e5aa33ce7b6d3e25fe0b7a75b8aca3e8f53838155af5abe23887d33fa  tests-crq.patch
-30739b5ca06bb72e93d021065fbc90a1808c5fc139ff917308738456ae8601f5c372d223d77e51cdd34a6aa4d28dcb8140101c3f753ede1e39ee12e229c24cbe  tests-certtool.patch"
+sha512sums="
+74eddba01ce4c2ffdca781c85db3bb52c85f1db3c09813ee2b8ceea0608f92ca3912fd9266f55deb36a8ba4d01802895ca5d5d219e7d9caec45e1a8534e45a84  gnutls-3.8.3.tar.xz
+0913e95e58c509c5bb3463cce262741486ada05e283f770a0ef9bf88956e1b87224070036d32069a6d0b6cb880253627890aee98edb5f1b07acf26a97bc19cee  skip-ktls.patch
+"
diff --git a/main/gnutls/skip-ktls.patch b/main/gnutls/skip-ktls.patch
new file mode 100644
index 00000000000..4446c75ef0d
--- /dev/null
+++ b/main/gnutls/skip-ktls.patch
@@ -0,0 +1,137 @@
+fails on builders
+not sure why, as the support works
+--
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index c6da8c1..ec5c1fd 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -170,8 +170,6 @@ host_triplet = @host@
+ @ENABLE_PKCS11_TRUE@@WINDOWS_FALSE@	global-init-override
+ 
+ @ENABLE_TPM2_TRUE@am__append_16 = tpm2.sh
+-@ENABLE_KTLS_TRUE@am__append_17 = gnutls_ktls ktls_keyupdate
+-@ENABLE_KTLS_TRUE@am__append_18 = ktls.sh ktls_keyupdate.sh
+ 
+ #
+ # List of tests not available/functional under windows
+@@ -486,7 +484,6 @@ am__EXEEXT_15 = tls13/supported_versions$(EXEEXT) \
+ 	tls11-rollback-detection$(EXEEXT) \
+ 	tls12-check-rollback-val$(EXEEXT) \
+ 	tls11-check-rollback-val$(EXEEXT) \
+-	tls13/post-handshake-with-psk$(EXEEXT) \
+ 	tls13/post-handshake-with-cert-auto$(EXEEXT) \
+ 	tls13/anti_replay$(EXEEXT) tls13/compress-cert$(EXEEXT) \
+ 	tls13/compress-cert-neg$(EXEEXT) \
+@@ -686,8 +686,6 @@
+ 	$(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) \
+ 	$(am__EXEEXT_12) record-sendfile$(EXEEXT) $(am__EXEEXT_13) \
+ 	$(am__EXEEXT_14)
+-@ENABLE_KTLS_TRUE@am__EXEEXT_16 = gnutls_ktls$(EXEEXT) \
+-@ENABLE_KTLS_TRUE@	ktls_keyupdate$(EXEEXT)
+ @WINDOWS_FALSE@am__EXEEXT_17 = dtls-stress$(EXEEXT)
+ @DISABLE_SYSTEM_CONFIG_FALSE@@WINDOWS_FALSE@am__EXEEXT_18 = system-override-curves-allowlist$(EXEEXT) \
+ @DISABLE_SYSTEM_CONFIG_FALSE@@WINDOWS_FALSE@	protocol-set-allowlist$(EXEEXT)
+@@ -2904,10 +2899,6 @@ tls13_post_handshake_with_cert_ticket_OBJECTS =  \
+ tls13_post_handshake_with_cert_ticket_LDADD = $(LDADD)
+ tls13_post_handshake_with_cert_ticket_DEPENDENCIES =  \
+ 	$(COMMON_GNUTLS_LDADD) libutils.la $(am__DEPENDENCIES_2)
+-tls13_post_handshake_with_psk_SOURCES =  \
+-	tls13/post-handshake-with-psk.c
+-tls13_post_handshake_with_psk_OBJECTS =  \
+-	tls13/post-handshake-with-psk.$(OBJEXT)
+ tls13_post_handshake_with_psk_LDADD = $(LDADD)
+ tls13_post_handshake_with_psk_DEPENDENCIES = $(COMMON_GNUTLS_LDADD) \
+ 	libutils.la $(am__DEPENDENCIES_2)
+@@ -3123,7 +3114,7 @@ xts_key_check_DEPENDENCIES = $(COMMON_GNUTLS_LDADD) libutils.la \
+ 	$(am__DEPENDENCIES_2)
+ am__dist_check_SCRIPTS_DIST = rfc2253-escape-test.sh \
+ 	rsa-md5-collision/rsa-md5-collision.sh systemkey.sh tpm2.sh \
+-	ktls.sh ktls_keyupdate.sh dtls/dtls.sh dtls/dtls-resume.sh \
++	dtls/dtls.sh dtls/dtls-resume.sh \
+ 	fastopen.sh pkgconfig.sh starttls.sh starttls-ftp.sh \
+ 	starttls-smtp.sh starttls-lmtp.sh starttls-pop3.sh \
+ 	starttls-xmpp.sh starttls-nntp.sh starttls-sieve.sh \
+@@ -3509,7 +3500,6 @@ am__depfiles_remade = ./$(DEPDIR)/aead-cipher-vec.Po \
+ 	tls13/$(DEPDIR)/post-handshake-with-cert-pkcs11.Po \
+ 	tls13/$(DEPDIR)/post-handshake-with-cert-ticket.Po \
+ 	tls13/$(DEPDIR)/post-handshake-with-cert.Po \
+-	tls13/$(DEPDIR)/post-handshake-with-psk.Po \
+ 	tls13/$(DEPDIR)/post-handshake-without-cert.Po \
+ 	tls13/$(DEPDIR)/prf-early.Po tls13/$(DEPDIR)/prf.Po \
+ 	tls13/$(DEPDIR)/psk-dumbfw.Po tls13/$(DEPDIR)/psk-ext.Po \
+@@ -3732,7 +3722,6 @@ SOURCES = $(libpkcs11mock1_la_SOURCES) $(libpkcs11mock2_la_SOURCES) \
+ 	tls13/post-handshake-with-cert-auto.c \
+ 	tls13/post-handshake-with-cert-pkcs11.c \
+ 	tls13/post-handshake-with-cert-ticket.c \
+-	tls13/post-handshake-with-psk.c \
+ 	tls13/post-handshake-without-cert.c tls13/prf.c \
+ 	tls13/prf-early.c tls13/psk-dumbfw.c tls13/psk-ext.c \
+ 	tls13/psk-ke-modes.c tls13/supported_versions.c \
+@@ -3924,7 +3913,6 @@ DIST_SOURCES = $(am__libpkcs11mock1_la_SOURCES_DIST) \
+ 	tls13/post-handshake-with-cert-auto.c \
+ 	tls13/post-handshake-with-cert-pkcs11.c \
+ 	tls13/post-handshake-with-cert-ticket.c \
+-	tls13/post-handshake-with-psk.c \
+ 	tls13/post-handshake-without-cert.c tls13/prf.c \
+ 	tls13/prf-early.c tls13/psk-dumbfw.c tls13/psk-ext.c \
+ 	tls13/psk-ke-modes.c tls13/supported_versions.c \
+@@ -6094,7 +6082,7 @@ ctests = tls13/supported_versions tls13/tls12-no-tls13-exts \
+ 	tls13/prf tls13/prf-early \
+ 	tls13/post-handshake-with-cert-ticket tls12-rollback-detection \
+ 	tls11-rollback-detection tls12-check-rollback-val \
+-	tls11-check-rollback-val tls13/post-handshake-with-psk \
++	tls11-check-rollback-val \
+ 	tls13/post-handshake-with-cert-auto tls13/anti_replay \
+ 	tls13/compress-cert tls13/compress-cert-neg \
+ 	tls13/compress-cert-neg2 tls13/compress-cert-cli \
+@@ -8290,12 +8278,7 @@ tls13/post-handshake-with-cert-ticket.$(OBJEXT):  \
+ tls13/post-handshake-with-cert-ticket$(EXEEXT): $(tls13_post_handshake_with_cert_ticket_OBJECTS) $(tls13_post_handshake_with_cert_ticket_DEPENDENCIES) $(EXTRA_tls13_post_handshake_with_cert_ticket_DEPENDENCIES) tls13/$(am__dirstamp)
+ 	@rm -f tls13/post-handshake-with-cert-ticket$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(tls13_post_handshake_with_cert_ticket_OBJECTS) $(tls13_post_handshake_with_cert_ticket_LDADD) $(LIBS)
+-tls13/post-handshake-with-psk.$(OBJEXT): tls13/$(am__dirstamp) \
+-	tls13/$(DEPDIR)/$(am__dirstamp)
+ 
+-tls13/post-handshake-with-psk$(EXEEXT): $(tls13_post_handshake_with_psk_OBJECTS) $(tls13_post_handshake_with_psk_DEPENDENCIES) $(EXTRA_tls13_post_handshake_with_psk_DEPENDENCIES) tls13/$(am__dirstamp)
+-	@rm -f tls13/post-handshake-with-psk$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(tls13_post_handshake_with_psk_OBJECTS) $(tls13_post_handshake_with_psk_LDADD) $(LIBS)
+ tls13/post-handshake-without-cert.$(OBJEXT): tls13/$(am__dirstamp) \
+ 	tls13/$(DEPDIR)/$(am__dirstamp)
+ 
+@@ -8939,7 +8922,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@tls13/$(DEPDIR)/post-handshake-with-cert-pkcs11.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@tls13/$(DEPDIR)/post-handshake-with-cert-ticket.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@tls13/$(DEPDIR)/post-handshake-with-cert.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@tls13/$(DEPDIR)/post-handshake-with-psk.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@tls13/$(DEPDIR)/post-handshake-without-cert.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@tls13/$(DEPDIR)/prf-early.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@tls13/$(DEPDIR)/prf.Po@am__quote@ # am--include-marker
+@@ -9676,13 +9658,6 @@ tls11-check-rollback-val.log: tls11-check-rollback-val$(EXEEXT)
+ 	--log-file $$b.log --trs-file $$b.trs \
+ 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+-tls13/post-handshake-with-psk.log: tls13/post-handshake-with-psk$(EXEEXT)
+-	@p='tls13/post-handshake-with-psk$(EXEEXT)'; \
+-	b='tls13/post-handshake-with-psk'; \
+-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+-	--log-file $$b.log --trs-file $$b.trs \
+-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+-	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ tls13/post-handshake-with-cert-auto.log: tls13/post-handshake-with-cert-auto$(EXEEXT)
+ 	@p='tls13/post-handshake-with-cert-auto$(EXEEXT)'; \
+ 	b='tls13/post-handshake-with-cert-auto'; \
+@@ -13285,7 +13260,6 @@ distclean: distclean-recursive
+ 	-rm -f tls13/$(DEPDIR)/post-handshake-with-cert-pkcs11.Po
+ 	-rm -f tls13/$(DEPDIR)/post-handshake-with-cert-ticket.Po
+ 	-rm -f tls13/$(DEPDIR)/post-handshake-with-cert.Po
+-	-rm -f tls13/$(DEPDIR)/post-handshake-with-psk.Po
+ 	-rm -f tls13/$(DEPDIR)/post-handshake-without-cert.Po
+ 	-rm -f tls13/$(DEPDIR)/prf-early.Po
+ 	-rm -f tls13/$(DEPDIR)/prf.Po
+@@ -13794,7 +13768,6 @@ maintainer-clean: maintainer-clean-recursive
+ 	-rm -f tls13/$(DEPDIR)/post-handshake-with-cert-pkcs11.Po
+ 	-rm -f tls13/$(DEPDIR)/post-handshake-with-cert-ticket.Po
+ 	-rm -f tls13/$(DEPDIR)/post-handshake-with-cert.Po
+-	-rm -f tls13/$(DEPDIR)/post-handshake-with-psk.Po
+ 	-rm -f tls13/$(DEPDIR)/post-handshake-without-cert.Po
+ 	-rm -f tls13/$(DEPDIR)/prf-early.Po
+ 	-rm -f tls13/$(DEPDIR)/prf.Po
diff --git a/main/gnutls/tests-certtool.patch b/main/gnutls/tests-certtool.patch
deleted file mode 100644
index 3c6a9a1885c..00000000000
--- a/main/gnutls/tests-certtool.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-I think this tests is simply wrong.
-When a PIN is given, the program should run in batch mode.
-So the question for "Enter password" should _not_ be present.
-
---- a/tests/cert-tests/certtool	2019-02-07 07:33:45.960887338 +0000
-+++ b/tests/cert-tests/certtool	2019-02-07 07:36:14.550955051 +0000
-@@ -49,7 +49,7 @@
- 
- 	#check whether password is being honoured
- 	#some CI runners need GNUTLS_PIN (GNUTLS_PIN=${PASS})
--	${SETSID} "${CERTTOOL}" --generate-self-signed --load-privkey ${TMPFILE1} --template ${srcdir}/templates/template-test.tmpl --ask-pass >${TMPFILE2} 2>&1 <<EOF
-+	GNUTLS_PIN=${PASS} ${SETSID} "${CERTTOOL}" --generate-self-signed --load-privkey ${TMPFILE1} --template ${srcdir}/templates/template-test.tmpl --ask-pass >${TMPFILE2} 2>&1 <<EOF
- $PASS
- EOF
- 	if test $? != 0;then
-@@ -59,7 +59,7 @@
- 	fi
- 
- 	grep "Enter password" ${TMPFILE2} >/dev/null 2>&1
--	if test $? != 0;then
-+	if test $? != 1; then
- 		cat ${TMPFILE2}
- 		echo "No password was asked"
- 		exit 1
diff --git a/main/gnutls/tests-crq.patch b/main/gnutls/tests-crq.patch
deleted file mode 100644
index 948ece529e6..00000000000
--- a/main/gnutls/tests-crq.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-The "crq" test somehow fails, I don't exactly know why.
-I'm pretty sure that the test is faulty, so I just patch the expected result.
-
---- a/tests/cert-tests/data/template-long-dns-crq.pem	2019-02-07 07:28:24.865062914 +0000
-+++ b/tests/cert-tests/data/template-long-dns-crq.pem	2019-02-07 07:28:29.908997322 +0000
-@@ -23,8 +23,8 @@
- 			Basic Constraints (critical):
- 				Certificate Authority (CA): FALSE
- 			Key Purpose (critical):
--				Time stamping.
--				Ipsec IKE.
-+				Email protection.
-+				OCSP signing.
- 			Key Usage (critical):
- 				Digital signature.
- 				Key encipherment.
-@@ -53,9 +53,9 @@
- cnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnkt
- dmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVy
- eS12ZXJ5LXZlcnktdmVyeS12ZXJ5LXZlcnktdmVyeS1sb25nLmNvbTAMBgNVHRMB
--Af8EAjAAMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMIBggrBgEFBQcDETAPBgNVHQ8B
--Af8EBQMDB6AAMA0GCSqGSIb3DQEBCwUAA4GBAAvOg5LbxJz4p0WZIRSqUJt73TO6
--9uJwZrvhknWoOcAAKQC77eQ/oKqXuma1OX9TDzgUrBw7IIGcsR8Gi47ix9rAkhuR
--orrwaKg3zc0NnO105jy37AX28m+9yF3rXBsfkKepzU7KQU9Nco4Y6WGYoJb/Vbzt
--G+/JZg2ixgPsm/1b
-+Af8EAjAAMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMEBggrBgEFBQcDCTAPBgNVHQ8B
-+Af8EBQMDB6AAMA0GCSqGSIb3DQEBCwUAA4GBAA1ewR8HbtPWqdobY48JE0vFZe35
-+F99U/I6cl6CNcjcVrqQq5B2LtQIZtAO9inP6ldO6cTLiQFq9uAOdWNhuwO/ihbbM
-+Gr4nVl56qSG7voi4jHdhfRGj9PkuFPvmSD90tIc+LFD0T2vtOz+BptaaiN4wYAeI
-+2dVyz3dNNT0qf+BB
- -----END NEW CERTIFICATE REQUEST-----
diff --git a/main/goaccess/APKBUILD b/main/goaccess/APKBUILD
index 75a25d182c9..8cc52567b02 100644
--- a/main/goaccess/APKBUILD
+++ b/main/goaccess/APKBUILD
@@ -1,25 +1,19 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=goaccess
-pkgver=1.3
+pkgver=1.9.2
 pkgrel=0
-pkgdesc="A real-time web log analyzer and interactive viewer"
-url="http://goaccess.prosoftcorp.com/"
+pkgdesc="Real-time web log analyzer and interactive viewer"
+options="!check" # no test suite
+url="https://goaccess.io/"
 arch="all"
-license="GPL-2.0-or-later"
-makedepends="ncurses-dev geoip-dev glib-dev"
-subpackages="$pkgname-doc"
-source="http://tar.goaccess.io/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	default_prepare || return 1
-	update_config_sub
-}
+license="MIT"
+makedepends="ncurses-dev geoip-dev glib-dev libmaxminddb-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://tar.goaccess.io/goaccess-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,14 +22,17 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--enable-geoip=legacy \
-		|| return 1
-	make || return 1
+		--enable-geoip=mmdb \
+		--enable-utf8
+	make
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
+
+	install -Dvm644 COPYING -t "$pkgdir"/usr/share/licenses/$pkgname/
 }
 
-sha512sums="7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1  goaccess-1.3.tar.gz"
+sha512sums="
+138fbe1e5970e43a9f6ae1934eb016c4a2cccdfbbe237eb3b505ac2c3b9536e11de76fac82c8d22d6ee74168784227b2eb425f35a3bc65f6e93fa973f88b6c94  goaccess-1.9.2.tar.gz
+"
diff --git a/main/gobject-introspection/APKBUILD b/main/gobject-introspection/APKBUILD
index 2078bd9d6f0..b154d28e675 100644
--- a/main/gobject-introspection/APKBUILD
+++ b/main/gobject-introspection/APKBUILD
@@ -1,46 +1,61 @@
 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gobject-introspection
-pkgver=1.64.0
-pkgrel=0
+pkgver=1.80.1
+pkgrel=2
 pkgdesc="Introspection system for GObject-based libraries"
 url="https://wiki.gnome.org/action/show/Projects/GObjectIntrospection"
 arch="all"
 license="LGPL-2.0-or-later AND GPL-2.0-or-later AND MIT"
-depends_dev="python3 cairo-dev libtool"
-makedepends="$depends_dev glib-dev libffi-dev flex bison python3-dev meson"
+depends_dev="
+	cairo-dev
+	libtool
+	py3-setuptools
+	python3
+	"
+makedepends="$depends_dev
+	bison
+	flex
+	glib-dev
+	libffi-dev
+	meson
+	python3-dev
+	"
 subpackages="$pkgname-doc $pkgname-dev"
 replaces="libgirepository"
 checkdepends="sed"
 source="https://download.gnome.org/sources/gobject-introspection/${pkgver%.*}/gobject-introspection-$pkgver.tar.xz"
 
+case "$CARCH" in
+*)
+	# FIXME: the gir scan on
+	#define REGRESS_GOOD_EXPR_CONSTANT (1 + 2 * (3 + 2) << 3 - 4 >> REGRESS_ATEST_ERROR_CODE2)
+	# evaluates to 0 instead of -2305843009213693952
+	# so a test failes
+	# https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/458
+	options="$options !check"
+	;;
+esac
+
 build() {
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--buildtype=plain \
-		. output
-	ninja -C output
+	abuild-meson -Db_lto=true . output
+	meson compile -C output
 }
 
 check() {
-	ninja -C output test
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C output install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
 dev() {
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/share "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/lib/gobject-introspection "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+	amove usr/bin usr/share usr/lib/gobject-introspection
 	default_dev
 	replaces="gobject-introspection"
 }
 
-sha512sums="d1960424d82dea1f1d36a7c3f9922029e751e77da8dc6904c24750babe7c3f4c11a6795eb218aab342ccbb6326d0ac3eac2c2c903e90b146f4e28c0f413da1ae  gobject-introspection-1.64.0.tar.xz"
+sha512sums="
+f45c2c1b105086488d974c6134db9910746df8edb187772f2ecd249656a1047c8ac88ba51f5bf7393c3d99c3ace143ecd09be256c2f4d0ceee110c9ad51a839a  gobject-introspection-1.80.1.tar.xz
+"
diff --git a/main/gperf/APKBUILD b/main/gperf/APKBUILD
index cb08f86fbde..2de55df8a1b 100644
--- a/main/gperf/APKBUILD
+++ b/main/gperf/APKBUILD
@@ -1,19 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gperf
 pkgver=3.1
-pkgrel=2
+pkgrel=4
 pkgdesc="Perfect hash function generator."
 url="https://www.gnu.org/software/gperf/"
 arch="all"
-license="GPL-3.0+"
+license="GPL-3.0-or-later"
 subpackages="$pkgname-doc"
-depends=
-makedepends=
-source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
+source="https://ftp.gnu.org/gnu/gperf/gperf-$pkgver.tar.gz"
 
-build ()
-{
-	cd "$builddir"
+build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,12 +18,11 @@ build ()
 }
 
 check() {
-	cd "$builddir"
 	make -j1 check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
+
 sha512sums="855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4  gperf-3.1.tar.gz"
diff --git a/main/gphoto2/APKBUILD b/main/gphoto2/APKBUILD
deleted file mode 100644
index ff21c29b176..00000000000
--- a/main/gphoto2/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gphoto2
-pkgver=2.5.23
-pkgrel=0
-pkgdesc="Commandline utilities for accessing cameras"
-url="http://www.gphoto.org/"
-arch="all"
-license="LGPL-2.1-or-later"
-makedepends="libgphoto2-dev popt-dev gettext-dev libjpeg-turbo-dev libtool"
-subpackages="$pkgname-lang $pkgname-doc"
-source="https://sourceforge.net/projects/gphoto/files/gphoto/$pkgver/gphoto2-$pkgver.tar.bz2"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="b5cea3008b5b9de93444fa25b11eab13155d479896920275caada123e0578ed3f84f9b15fe82406c332e64955ba075b642341d88e20a2ee78b42991890bca86b  gphoto2-2.5.23.tar.bz2"
diff --git a/main/gpm/APKBUILD b/main/gpm/APKBUILD
new file mode 100644
index 00000000000..0e881668ca1
--- /dev/null
+++ b/main/gpm/APKBUILD
@@ -0,0 +1,86 @@
+# Contributor: Jeff Pohlmeyer <yetanothergeek@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=gpm
+pkgver=1.20.7
+pkgrel=4
+pkgdesc="A mouse server for the console"
+options="!check" # No testsuite
+url="https://www.nico.schottelius.org/software/gpm/"
+arch="all"
+license="GPL-2.0-or-later"
+depends_dev="$pkgname-libs"
+makedepends="$depends_dev texinfo autoconf automake libtool bison linux-headers
+	ncurses-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-utils
+	$pkgname-openrc"
+source="http://www.nico.schottelius.org/software/gpm/archives/gpm-$pkgver.tar.bz2
+	error-format.patch
+	fix-highly-illegal-return-of-in-as-char.patch
+	fix-signedness-issue.patch
+	install-shared-libs-with-+x-perms.patch
+	install-unversioned-solibrary.patch
+	musl-fixes.patch
+	constify-format-strings.patch
+	gpm-include-sysmacros.patch
+	gcc-10.patch
+
+	$pkgname.initd
+	$pkgname.confd
+	"
+
+# Fix build with gcc >= 10
+export CFLAGS="$CFLAGS -fcommon"
+
+prepare() {
+	default_prepare
+	./autogen.sh
+}
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--disable-static
+	export CPPFLAGS="$CPPFLAGS -I$builddir/src/headers"
+	make
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+
+	# Create solink
+	ln -s libgpm.so.2.1.0 "$pkgdir"/usr/lib/libgpm.so
+
+	install -m755 -D "$srcdir"/$pkgname.initd \
+		"$pkgdir"/etc/init.d/$pkgname
+	install -m644 -D "$srcdir"/$pkgname.confd \
+		"$pkgdir"/etc/conf.d/$pkgname
+}
+
+utils() {
+	depends="$pkgname"
+	pkgdesc="Mouse utilities for console"
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+	rmdir "$pkgdir"/usr/lib
+}
+
+sha512sums="
+51c1141ed502f8b6bc846485a8e315bafe3cf2b7c9d1ea8a710d9748ff2058f29c7ab5715fc1730a8437c613181d2050f37b134e9288c69ba8ff7fb0be7ec0d1  gpm-1.20.7.tar.bz2
+b4a883cb3a5b3977e0ba3909d68335b5543ae3a7d9aaa704ec82693a474813996cc6822a086737da17c67e2c2b827e3d4a48ec27d9c82f3070f75c1126651896  error-format.patch
+15c4f1459a28c931362a4f6cd22278b52c998b3b6f7164ee2e0dbd88fdace74b5e3599d3f3ac665c1df79a6ece14faac2b35f57d5d834a7714de2419954e6b5f  fix-highly-illegal-return-of-in-as-char.patch
+db7e02b50bb02726ca743d2c7bef7d49edb359bb1594cc18f371662471d425a32f5c9f99743f237046b5a3534d2c6257fdd5cb6d9e08824c6d84725b7ddf0272  fix-signedness-issue.patch
+ec21b7029e0880b342bca5a70522e33d5cabbf77c44c1dd23b16d829d8fcc6cadcdf77b01724a91a6640916673f6d5ab91d18db4cd709ed77f9ce22dec723a13  install-shared-libs-with-+x-perms.patch
+05bdf6a03870175dcee5414d6d2d434b6cd3e06686f0be22d70fc7f9759db8ccea0bf9ae900d95e6d2872845cd66ee0a794afc5ece78c6640be163cad2065c58  install-unversioned-solibrary.patch
+45d3a20a8f9f00f78b21c10143e138add17d414e9b5ecc28d9efee9c2190450c79dca00b13a8247ee7753ff778b09bc88fe8c512366d5b1622981bb5d612f933  musl-fixes.patch
+36a5059c6336010b504ec6fc53c2d3df0811b1f1249c0e04c13066db06667119377a21e58121aaa8d4b620be2a5c21da0b018f168e36a44f85802cc50c936ba5  constify-format-strings.patch
+62d294f900ba1922119ebc87f97e86b1653647e03576c982011bf4f629332cc703f3994d5cc4b9bf2dac3c18636a61e420000d16cfdc7c284185c9442cce5b64  gpm-include-sysmacros.patch
+8de69783f14a2f686eb96d91d2761c879367b14f68801283cd415849f05253686cd11170971f21e5ddc932c02b0621d4aa528ff497a69d27daf29debf896f3ea  gcc-10.patch
+d268504bd0cf83706863a8af5c5719b0d192c34ae6a78ff0378521841eca242b39a6e6891080a5fc5512732f84e7439697ba92bfda3ecc1aaebd36b16e946477  gpm.initd
+0e7c96f29222d33301fc9c5c8cf409b7dbe6cbb1e79d76444ae5724e8b793679d3ea597a8ad64187e85680799847632095e469445ae56f893616cb0235a29f3a  gpm.confd
+"
diff --git a/main/gpm/constify-format-strings.patch b/main/gpm/constify-format-strings.patch
new file mode 100644
index 00000000000..799aac875e9
--- /dev/null
+++ b/main/gpm/constify-format-strings.patch
@@ -0,0 +1,85 @@
+From 7d21d7f469d90c2d55b23926c866bba635aa7e6f Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 14 Feb 2016 18:05:49 -0500
+Subject: [PATCH] report/oops: constify format strings
+
+---
+ src/headers/gpm.h     | 4 ++--
+ src/headers/message.h | 2 +-
+ src/lib/report-lib.c  | 4 ++--
+ src/prog/mouse-test.c | 2 +-
+ src/report.c          | 2 +-
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/headers/gpm.h b/src/headers/gpm.h
+index 57dc618..9e96deb 100644
+--- a/src/headers/gpm.h
++++ b/src/headers/gpm.h
+@@ -280,10 +280,10 @@ int   Gpm_GetSnapshot(Gpm_Event *ePtr);
+ char *Gpm_get_console( void );
+ int Gpm_x_high_y(int base, int pot_y);
+ int Gpm_cnt_digits(int number);
+-void gpm_oops(int line, char *file, char *text, ... );
++void gpm_oops(int line, const char *file, const char *text, ... );
+ 
+ /* report.c / report-lib.c */
+-void gpm_report(int line, char *file, int stat, char *text, ... );
++void gpm_report(int line, const char *file, int stat, const char *text, ... );
+ 
+ #ifdef __cplusplus
+   };
+diff --git a/src/headers/message.h b/src/headers/message.h
+index a0fed0e..25cad8c 100644
+--- a/src/headers/message.h
++++ b/src/headers/message.h
+@@ -226,7 +226,7 @@
+ /* #define GPM_MESS_                   "" */
+ 
+ /* functions */
+-void gpm_report(int line, char *file, int stat, char *text, ... );
++void gpm_report(int line, const char *file, int stat, const char *text, ... );
+ 
+ /* rest of wd.h */
+ #ifdef HAVE_SYSLOG_H
+diff --git a/src/lib/report-lib.c b/src/lib/report-lib.c
+index c0ae086..b565b77 100644
+--- a/src/lib/report-lib.c
++++ b/src/lib/report-lib.c
+@@ -24,9 +24,9 @@
+ 
+ #include "headers/message.h"
+ 
+-void gpm_report(int line, char *file, int stat, char *text, ... )
++void gpm_report(int line, const char *file, int stat, const char *text, ... )
+ {
+-   char *string = NULL;
++   const char *string = NULL;
+    int log_level;
+    va_list ap;
+ 
+diff --git a/src/prog/mouse-test.c b/src/prog/mouse-test.c
+index 0bb1982..ab8d602 100644
+--- a/src/prog/mouse-test.c
++++ b/src/prog/mouse-test.c
+@@ -182,7 +182,7 @@ Gpm_Type *(*I_serial)(int fd, unsigned short flags, struct Gpm_Type *type,
+ /*----------------------------------------------------------------------------- 
+    Place the description here.
+  -----------------------------------------------------------------------------*/
+-int mousereopen(int oldfd, char *name, Gpm_Type *type)
++int mousereopen(int oldfd, const char *name, Gpm_Type *type)
+ {
+    int fd;
+    if (!type) type=mice+1; /* ms */
+diff --git a/src/report.c b/src/report.c
+index 6c7c2ee..286c1b7 100644
+--- a/src/report.c
++++ b/src/report.c
+@@ -69,7 +69,7 @@
+  *
+  */
+ 
+-void gpm_report(int line, char *file, int stat, char *text, ... )
++void gpm_report(int line, const char *file, int stat, const char *text, ...)
+ {
+    FILE *console = NULL;
+    va_list ap, ap3;
diff --git a/main/gpm/error-format.patch b/main/gpm/error-format.patch
new file mode 100644
index 00000000000..df7aa651259
--- /dev/null
+++ b/main/gpm/error-format.patch
@@ -0,0 +1,39 @@
+From 7ba518ff8b5e5c06d0a74b1fecf3b682f14c631c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 14 Feb 2016 18:07:46 -0500
+Subject: [PATCH] report: avoid -Wformat-security warnings
+
+Some functions warn when you pass a string to a printf style function
+that is a dynamic buffer as its contents cannot be verified.  Since we
+don't want to support that here, just use %s.
+---
+ src/lib/report-lib.c  | 2 +-
+ src/prog/mouse-test.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/report-lib.c b/src/lib/report-lib.c
+index b565b77..03230b4 100644
+--- a/src/lib/report-lib.c
++++ b/src/lib/report-lib.c
+@@ -47,7 +47,7 @@ void gpm_report(int line, const char *file, int stat, const char *text, ... )
+                            log_level = LOG_CRIT; break;
+    }
+ #ifdef HAVE_VSYSLOG
+-   syslog(log_level, string);
++   syslog(log_level, "%s", string);
+    vsyslog(log_level, text, ap);
+ #else
+    fprintf(stderr,"%s[%s(%d)]:\n",string,file,line);
+diff --git a/src/prog/mouse-test.c b/src/prog/mouse-test.c
+index ab8d602..d7d1027 100644
+--- a/src/prog/mouse-test.c
++++ b/src/prog/mouse-test.c
+@@ -189,7 +189,7 @@ int mousereopen(int oldfd, const char *name, Gpm_Type *type)
+    close(oldfd);
+    usleep(100000);
+    fd=open(name,O_RDWR);
+-   if (fd < 0) gpm_report(GPM_PR_OOPS,name);
++   if (fd < 0) gpm_report(GPM_PR_OOPS, "%s", name);
+    (*I_serial)(fd,type->flags,type,1,&type->name); /* ms initialization */
+    return fd;
+ }
diff --git a/main/gpm/fix-highly-illegal-return-of-in-as-char.patch b/main/gpm/fix-highly-illegal-return-of-in-as-char.patch
new file mode 100644
index 00000000000..6cf0e22a2d6
--- /dev/null
+++ b/main/gpm/fix-highly-illegal-return-of-in-as-char.patch
@@ -0,0 +1,44 @@
+From 5648239f18ac041fe1a93b8b784bf3ca8e1d83bc Mon Sep 17 00:00:00 2001
+From: nick black <nick.black@sprezzatech.com>
+Date: Fri, 8 Feb 2013 05:52:13 -0500
+Subject: [PATCH] fix highly illegal return of int as char *, and less worrying
+ set-but-not-used warning
+
+---
+ src/twiddler.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/twiddler.c b/src/twiddler.c
+index 1d2bd50..972a616 100644
+--- a/src/twiddler.c
++++ b/src/twiddler.c
+@@ -250,7 +250,6 @@ static inline int twiddler_use_item(char *item)
+ int twiddler_key(unsigned long message)
+ {
+    char **table = twiddler_get_table(message);
+-   char *val;
+   /*
+    * These two are needed to avoid transmitting single keys when typing
+    * chords. When the number of keys being held down decreases, data
+@@ -269,7 +268,6 @@ int twiddler_key(unsigned long message)
+ 
+    if (!table) return 0;
+    message &= 0xff;
+-   val = table[message];
+ 
+    if ((message < last_message) && !marked) { /* ok, do it */
+       marked++; /* don't retransmit on release */
+@@ -428,8 +426,11 @@ char *twiddler_rest_to_value(char *s)
+       buf[ibuf]='\0';
+       return strdup(buf);
+    }
+-   if (*ptr == '\\')
+-      return (char *)twiddler_escape_sequence(ptr+1, &len /* unused */);
++   if (*ptr == '\\') {
++      buf[ibuf++] = twiddler_escape_sequence(ptr+1, &len /* unused */);
++      buf[ibuf] = '\0';
++      return strdup(buf);
++   }
+ 
+    if (strlen(ptr)==1) return ((char *)((unsigned long)*ptr & 0xFF));
+ 
diff --git a/main/gpm/fix-signedness-issue.patch b/main/gpm/fix-signedness-issue.patch
new file mode 100644
index 00000000000..6b2b6ce75a5
--- /dev/null
+++ b/main/gpm/fix-signedness-issue.patch
@@ -0,0 +1,24 @@
+From 4337fd9fc2d2ea83654f2ca69245503730231ac3 Mon Sep 17 00:00:00 2001
+From: iljavs <ivansprundel@ioactive.com>
+Date: Mon, 27 Jun 2016 01:17:57 -0700
+Subject: [PATCH] fix signedness issue
+
+This commit fixes a signedness issue, where a negative vc coming from a malicious client could possibly cause memory corruption.
+---
+ src/daemon/processconn.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/daemon/processconn.c b/src/daemon/processconn.c
+index a5839a3..e92fa63 100644
+--- a/src/daemon/processconn.c
++++ b/src/daemon/processconn.c
+@@ -67,7 +67,8 @@ int processConn(int fd)
+       return -1;
+    }
+ 
+-   if((vc = request->vc) > MAX_VC) {
++   vc = request->vc;
++   if(vc > MAX_VC || vc < 0) {
+       gpm_report(GPM_PR_DEBUG, GPM_MESS_REQUEST_ON, vc, MAX_VC);
+       free(info);
+       close(newfd);
diff --git a/main/gpm/gcc-10.patch b/main/gpm/gcc-10.patch
new file mode 100644
index 00000000000..6c2392f6759
--- /dev/null
+++ b/main/gpm/gcc-10.patch
@@ -0,0 +1,12 @@
+diff -upr gpm-1.20.7.orig/src/headers/daemon.h gpm-1.20.7/src/headers/daemon.h
+--- gpm-1.20.7.orig/src/headers/daemon.h	2021-07-21 13:08:21.833110930 +0200
++++ gpm-1.20.7/src/headers/daemon.h	2021-07-21 13:08:44.273115400 +0200
+@@ -180,7 +180,7 @@ extern struct mouse_features  mouse_tabl
+ extern Gpm_Type         mice[];
+ extern Gpm_Type         *repeated_type;
+ 
+-time_t                  last_selection_time;
++extern time_t           last_selection_time;
+ 
+ 
+ 
diff --git a/main/gpm/gpm-include-sysmacros.patch b/main/gpm/gpm-include-sysmacros.patch
new file mode 100644
index 00000000000..0a18976e94c
--- /dev/null
+++ b/main/gpm/gpm-include-sysmacros.patch
@@ -0,0 +1,10 @@
+--- a/src/daemon/open_console.c
++++ b/src/daemon/open_console.c
+@@ -22,6 +22,7 @@
+ #include <fcntl.h>                  /* open and co.      */
+ #include <sys/stat.h>               /* stat()            */
+ #include <sys/types.h>              /* major()           */
++#include <sys/sysmacros.h>
+ #include <sys/ioctl.h>              /* ioctl             */
+ 
+ /* Linux specific (to be outsourced in gpm2 */
diff --git a/main/gpm/gpm.confd b/main/gpm/gpm.confd
new file mode 100644
index 00000000000..eb77c711fef
--- /dev/null
+++ b/main/gpm/gpm.confd
@@ -0,0 +1,8 @@
+# gpm conf.d file for alpine linux
+
+#
+# Specify gpm mouse daemon options here.
+#
+
+#gpm_opts="-m /dev/input/mice -t imps2"
+
diff --git a/main/gpm/gpm.initd b/main/gpm/gpm.initd
new file mode 100644
index 00000000000..85b292c3171
--- /dev/null
+++ b/main/gpm/gpm.initd
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+
+pidfile=/var/run/gpm.pid
+command=/usr/sbin/gpm
+command_args=${gpm_opts:--m /dev/input/mice -t imps2}
+
+depend() {
+	after localmount
+	use hotplug logger
+}
diff --git a/main/gpm/install-shared-libs-with-+x-perms.patch b/main/gpm/install-shared-libs-with-+x-perms.patch
new file mode 100644
index 00000000000..d32619c2dae
--- /dev/null
+++ b/main/gpm/install-shared-libs-with-+x-perms.patch
@@ -0,0 +1,25 @@
+From 01373f6fd5dd274116c8ec693245677dbf5390e6 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 28 Oct 2012 07:25:40 -0400
+Subject: [PATCH] install shared lib with +x perms
+
+This is executable code, so it should have +x perms on the file.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ src/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index d3b1dcd..6b60ad3 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -113,7 +113,7 @@ install:	check
+ 	# 2.x goes along; unfortunately that means an additional
+ 	# headache in cases like this
+ 	if test "x@SHLIB@" != "x" ; then \
+-		$(INSTALL_DATA) -m 644 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@	;	\
++		$(INSTALL_DATA) -m 755 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@	;	\
+ 		cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ 					;	\
+       echo "WARNING: We installed a lib, you should now call ldconfig" 						; 	\
+       echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" 								;	\
diff --git a/main/gpm/install-unversioned-solibrary.patch b/main/gpm/install-unversioned-solibrary.patch
new file mode 100644
index 00000000000..0af762e9da2
--- /dev/null
+++ b/main/gpm/install-unversioned-solibrary.patch
@@ -0,0 +1,36 @@
+From 06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa Mon Sep 17 00:00:00 2001
+From: Kamil Rytarowski <n54@gmx.com>
+Date: Sat, 4 May 2013 01:30:17 +0200
+Subject: [PATCH] Install unversioned solibrary
+
+Unversioned solibraries are shipped with -devel packages in Linux
+distros. Generate and install it for the consistency.
+---
+ src/Makefile.in | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 6b60ad3..7e9e2ef 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -79,7 +79,7 @@ prog/%:	prog/%.o
+ #		| $(SED) '\''s/\($*\)\.o\([ :]*\)/\1.o \1.lo\2/g'\'' > $(DEPDIR)/$@'
+ 
+ # Do it all!
+-all:	gpm lib/libgpm.so.@abi_lev@ @LIBGPM_A@ $(PROG)
++all:	gpm lib/libgpm.so.@abi_lev@ lib/libgpm.so @LIBGPM_A@ $(PROG)
+ 
+ gpm:	$(GOBJ)
+ 	$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm
+@@ -168,9 +168,8 @@ lib/libgpm.so.@abi_full@:	$(PICS)
+ 	@LDFLAGS@ $(LDFLAGS) -o lib/libgpm.so.@abi_full@ $^ @LIBS@ @SHARED_LIBS@ $(LIBS)	
+ lib/libgpm.so.@abi_lev@:	lib/libgpm.so.@abi_full@
+ 	$(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so.@abi_lev@
+-# unneeded, isn't it?
+-#lib/libgpm.so:	lib/libgpm.so.@abi_full@
+-#	$(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so
++lib/libgpm.so:	lib/libgpm.so.@abi_full@
++	$(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so
+ 
+ include $(DEPFILE)
+ 
diff --git a/main/gpm/musl-fixes.patch b/main/gpm/musl-fixes.patch
new file mode 100644
index 00000000000..6653aaf4752
--- /dev/null
+++ b/main/gpm/musl-fixes.patch
@@ -0,0 +1,64 @@
+From d88fb1de5803c366ab62f7de9ee5d83207fb2afe Mon Sep 17 00:00:00 2001
+From: Dima Krasner <dima@dimakrasner.com>
+Date: Wed, 12 Nov 2014 23:06:46 +0200
+Subject: [PATCH] Added musl support to libgpm and the daemon.
+
+---
+ src/daemon/open_console.c  | 1 +
+ src/prog/display-buttons.c | 1 +
+ src/prog/display-coords.c  | 1 +
+ src/prog/gpm-root.y        | 4 ++--
+ 4 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c
+index 98297c9..4d6c0af 100644
+--- a/src/daemon/open_console.c
++++ b/src/daemon/open_console.c
+@@ -21,6 +21,7 @@
+ 
+ #include <fcntl.h>                  /* open and co.      */
+ #include <sys/stat.h>               /* stat()            */
++#include <sys/types.h>              /* major()           */
+ #include <sys/ioctl.h>              /* ioctl             */
+ 
+ /* Linux specific (to be outsourced in gpm2 */
+diff --git a/src/prog/display-buttons.c b/src/prog/display-buttons.c
+index de8e5b2..38d2f11 100644
+--- a/src/prog/display-buttons.c
++++ b/src/prog/display-buttons.c
+@@ -36,6 +36,7 @@
+ #include <stdio.h>            /* printf()             */
+ #include <time.h>             /* time()               */
+ #include <errno.h>            /* errno                */
++#include <sys/select.h>       /* fd_set and FD_*      */
+ #include <gpm.h>              /* gpm information      */
+ 
+ /* display resulting data */
+diff --git a/src/prog/display-coords.c b/src/prog/display-coords.c
+index 1fb810f..82afd12 100644
+--- a/src/prog/display-coords.c
++++ b/src/prog/display-coords.c
+@@ -38,6 +38,7 @@
+ #include <stdio.h>            /* printf()             */
+ #include <time.h>             /* time()               */
+ #include <errno.h>            /* errno                */
++#include <sys/select.h>       /* fd_set and FD_*      */
+ #include <gpm.h>              /* gpm information      */
+ 
+ /* display resulting data */
+diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
+index 069d801..188ae35 100644
+--- a/src/prog/gpm-root.y
++++ b/src/prog/gpm-root.y
+@@ -1199,9 +1199,9 @@ int main(int argc, char **argv)
+ #if defined(__GLIBC__)
+    __sigemptyset(&childaction.sa_mask);
+ #else /* __GLIBC__ */
+-   childaction.sa_mask=0;
++   sigemptyset(&childaction.sa_mask);
+ #endif /* __GLIBC__ */
+-   childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
++   childaction.sa_flags=0;
+    sigaction(SIGCHLD,&childaction,NULL);
+ 
+    /*....................................... Connect and get your buffer */
diff --git a/main/gpsd/0001-workaround-for-scons-using-python2.patch b/main/gpsd/0001-workaround-for-scons-using-python2.patch
deleted file mode 100644
index 5e8e1f0976c..00000000000
--- a/main/gpsd/0001-workaround-for-scons-using-python2.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-diff --git a/contrib/ntpshmviz b/contrib/ntpshmviz
-index a7ae44f..5627d3a 100755
---- a/contrib/ntpshmviz
-+++ b/contrib/ntpshmviz
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # This file is Copyright (c) 2010-2018 by the GPSD project
- # SPDX-License-Identifier: BSD-2-clause
-diff --git a/contrib/skyview2svg b/contrib/skyview2svg
-index 9c79b25..6b80d4b 100644
---- a/contrib/skyview2svg
-+++ b/contrib/skyview2svg
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- """
- skyview2svg -- Create an SVG image of GPS satellites sky view.
-diff --git a/contrib/webgps.py b/contrib/webgps.py
-index 902c162..942dcbb 100755
---- a/contrib/webgps.py
-+++ b/contrib/webgps.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # encoding: utf-8
- 
- """webgps.py
-diff --git a/devtools/ais.py b/devtools/ais.py
-index f269433..531a4c7 100755
---- a/devtools/ais.py
-+++ b/devtools/ais.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # A Python AIVDM/AIVDO decoder
- #
-diff --git a/devtools/aivdmtable b/devtools/aivdmtable
-index 13c1e5f..51c4146 100755
---- a/devtools/aivdmtable
-+++ b/devtools/aivdmtable
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Generate an asciidoc table of the six-bit encoding used in AIVDM packets.
- #
-diff --git a/devtools/cycle_analyzer b/devtools/cycle_analyzer
-index aac4c6c..0aa20c2 100755
---- a/devtools/cycle_analyzer
-+++ b/devtools/cycle_analyzer
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # This file is Copyright (c) 2010 by the GPSD project
- # BSD terms apply: see the file COPYING in the distribution root for details.
-diff --git a/devtools/flocktest b/devtools/flocktest
-index d301ee7..8cf2d9e 100755
---- a/devtools/flocktest
-+++ b/devtools/flocktest
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # This file is Copyright (c) 2010 by the GPSD project
- # BSD terms apply: see the file COPYING in the distribution root for details.
-diff --git a/devtools/identify_failing_build_options.py b/devtools/identify_failing_build_options.py
-index ec10a84..480a3fb 100755
---- a/devtools/identify_failing_build_options.py
-+++ b/devtools/identify_failing_build_options.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # This code runs compatibly under Python 2 and 3.x for x >= 2.
- # Preserve this property!
-diff --git a/devtools/regress-builder b/devtools/regress-builder
-index 3266768..ef44506 100755
---- a/devtools/regress-builder
-+++ b/devtools/regress-builder
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # This file is Copyright (c) 2010-2019 by the GPSD project
- # BSD terms apply: see the file COPYING in the distribution root for details.
-diff --git a/devtools/regressdiff b/devtools/regressdiff
-index 6188687..24d5f42 100755
---- a/devtools/regressdiff
-+++ b/devtools/regressdiff
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Walk through a pair of textfiles looking for where they begin to differ.
- # May be useful for comparing logs when regression tests break.
-diff --git a/devtools/sizes b/devtools/sizes
-index f6459cf..05a5fb7 100755
---- a/devtools/sizes
-+++ b/devtools/sizes
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # sizes -- explore the sizes of static gpsd binaries
- #
-diff --git a/devtools/striplog b/devtools/striplog
-index e81a2c8..4ba3cbd 100755
---- a/devtools/striplog
-+++ b/devtools/striplog
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # striplog -- strip leading lines from logs
- #
-diff --git a/devtools/tablegen.py b/devtools/tablegen.py
-index b8a3ed3..f42a59e 100755
---- a/devtools/tablegen.py
-+++ b/devtools/tablegen.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # This tool is intended to automate away the drudgery in bring up support
- # for a new AIS message type.  It parses the tabular description of a message
-diff --git a/devtools/test_json_validity.py b/devtools/test_json_validity.py
-index 959bfe8..cac10da 100755
---- a/devtools/test_json_validity.py
-+++ b/devtools/test_json_validity.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Christian Gagneraud - 2012
- # Simple python script that will parse json dictionaries on its input,
-diff --git a/devtools/uninstall_cleanup.py b/devtools/uninstall_cleanup.py
-index e78d412..916fbab 100755
---- a/devtools/uninstall_cleanup.py
-+++ b/devtools/uninstall_cleanup.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # This code runs compatibly under Python 2 and 3.x for x >= 2.
- # Preserve this property!
-diff --git a/gegps b/gegps
-index 8672e7e..0c1b53e 100755
---- a/gegps
-+++ b/gegps
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- '''
- usage: gegps [-i] [-d kmldir]
-diff --git a/gps/gps.py b/gps/gps.py
-index c3f4a03..5956eec 100644
---- a/gps/gps.py
-+++ b/gps/gps.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- '''gps.py -- Python interface to GPSD.
- 
-diff --git a/gpscat b/gpscat
-index c04dc72..0035316 100755
---- a/gpscat
-+++ b/gpscat
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- "Display GPS output.  Hexify it if necessary."
- 
-diff --git a/gpsfake b/gpsfake
-index 6bae262..485fea6 100755
---- a/gpsfake
-+++ b/gpsfake
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- '''
- gpsfake -- test harness for gpsd
-diff --git a/gpsprof b/gpsprof
-index 9bd665c..3989627 100755
---- a/gpsprof
-+++ b/gpsprof
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- '''
- Collect and plot latency-profiling data from a running gpsd.
-diff --git a/jsongen.py b/jsongen.py
-index e27eeb6..4788458 100755
---- a/jsongen.py
-+++ b/jsongen.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # This file is Copyright (c) 2010 by the GPSD project
- # SPDX-License-Identifier: BSD-2-clause
-diff --git a/maskaudit.py b/maskaudit.py
-index 00d1275..2029494 100755
---- a/maskaudit.py
-+++ b/maskaudit.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # This file is Copyright (c) 2010 by the GPSD project
- # SPDX-License-Identifier: BSD-2-clause
-diff --git a/test_misc.py b/test_misc.py
-index eb79c10..7a81957 100755
---- a/test_misc.py
-+++ b/test_misc.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Test gps/misc.py
- #
-diff --git a/test_xgps_deps.py b/test_xgps_deps.py
-index cb9448e..e1f5301 100755
---- a/test_xgps_deps.py
-+++ b/test_xgps_deps.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- """Test imports needed by X11-based tools."""
- 
- from __future__ import print_function
-diff --git a/ubxtool b/ubxtool
-index 7e4a042..bab887e 100755
---- a/ubxtool
-+++ b/ubxtool
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: UTF-8
- '''
- ubxtool -- u-blox configurator and packet decoder
-diff --git a/valgrind-audit.py b/valgrind-audit.py
-index 749b2fa..30a1817 100755
---- a/valgrind-audit.py
-+++ b/valgrind-audit.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # This is a valgrind torture test for the gpsd daemon.
- # It's not really expected to spot anything as long as we aren't using
-diff --git a/xgps b/xgps
-index 89d96d1..3edfa6a 100755
---- a/xgps
-+++ b/xgps
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: UTF-8
- '''
- xgps -- test client for gpsd
-diff --git a/xgpsspeed b/xgpsspeed
-index b532fe5..4ce3beb 100755
---- a/xgpsspeed
-+++ b/xgpsspeed
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # by
- # Robin Wittler <real@the-real.org> (speedometer mode)
-diff --git a/zerk b/zerk
-index 4186042..f0257e6 100755
---- a/zerk
-+++ b/zerk
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: UTF-8
- '''
- zerk -- GREIS configurator and packet decoder
diff --git a/main/gpsd/APKBUILD b/main/gpsd/APKBUILD
index d67ee0b7281..b342d744690 100644
--- a/main/gpsd/APKBUILD
+++ b/main/gpsd/APKBUILD
@@ -1,24 +1,28 @@
 # Contributor: Nathan Angelacos <nangel@alpinelinux.org>
 # Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
+
+# gpsd is commonly used with NTP servers to provide a stable clock,
+# please do not move to community.
+
 pkgname=gpsd
-pkgver=3.20
-pkgrel=0
-pkgdesc="A GPS daemon"
-arch=all
-url="http://catb.org/gpsd/"
-license="BSD"
-makedepends="scons python3-dev libcap-dev ncurses-dev python"
-subpackages="$pkgname-dev $pkgname-doc py3-$pkgname:_py $pkgname-clients:_clients"
-source="https://download-mirror.savannah.gnu.org/releases/gpsd/$pkgname-$pkgver.tar.gz
+pkgver=3.25
+pkgrel=2
+pkgdesc="GPS daemon"
+arch="all"
+url="https://gpsd.gitlab.io/gpsd/index.html"
+license="BSD-2-Clause"
+makedepends="scons asciidoctor python3-dev libcap-dev ncurses-dev py3-setuptools"
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	py3-$pkgname:_py:noarch
+	$pkgname-clients:_clients
+	$pkgname-openrc"
+source="https://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-$pkgver.tar.gz
 	timepps.h
-	gpsd-use-local-timepps-header.patch
-	0001-workaround-for-scons-using-python2.patch
 	gpsd.initd
 	gpsd.confd"
 
-builddir="$srcdir/$pkgname-$pkgver"
-options="!check" # FIXME: tests fails
-
 prepare() {
 	# We copy timepps.h to the local build directory instead of
 	# creating a pps-tools-dev package for ppstime.h
@@ -26,31 +30,33 @@ prepare() {
 	mkdir -p "$builddir"/sys
 	cp "$srcdir"/timepps.h "$builddir"/sys/
 
+	# x86 regression test fails for the Caterpillar GPS - 1e-9 error on lat or lon
+	# on 2 tests.  Other platforms pass the test.
+	# reported upstream for 3.25 2023-02-06.  For now delete that test
+	if [ "$CARCH" = "x86" ]; then
+		# rm "$builddir/test/daemon/cat*" does not work for some reason ...
+		find "$builddir/test/daemon" -name "cat*" -exec rm {} \;
+	fi
+
 	default_prepare
 }
 
 build() {
-	cd "$builddir"
-	CPPFLAGS="-I. -DHAVE_SYS_TIMEPPS_H"
+	CPPFLAGS="$CPPFLAGS -I$builddir -DHAVE_SYS_TIMEPPS_H"
 	scons -j${JOBS:-1} \
 		prefix=/usr \
 		target_python=python3 \
+		python_shebang=/usr/bin/python3 \
 		dbus_export=no \
 		systemd=no
 }
 
 check() {
-	cd "$builddir"
 	scons check
 }
 
 package() {
-	cd "$builddir"
-
 	DESTDIR="$pkgdir" scons install
-	# fix python interpreter path
-	 sed -e "s,#!/usr/bin/\(python[23]\?\|env \+python[23]\?\),#!/usr/bin/python3},g" -i \
-	         gegps gpscat gpsfake xgps xgpsspeed gpsprof gps/*.py
 	install -m755 -D "$srcdir"/gpsd.initd "$pkgdir"/etc/init.d/gpsd
 	install -m644 -D "$srcdir"/gpsd.confd "$pkgdir"/etc/conf.d/gpsd
 }
@@ -62,11 +68,11 @@ _py() {
 	mkdir -p "$subpkgdir"/usr/lib
 	# As of 3.18.1, gpsd wants to put the python stuff in /usr/local
 	mv "$pkgdir"/usr/local/lib/python*  "$subpkgdir"/usr/lib/
-	rm -rf "$pkgdir"/usr/local
+	rm -rf "${pkgdir:?}"/usr/local
 
 	mkdir -p "$subpkgdir"/usr/bin
 	for n in gpscat gpsfake gpsprof; do
-		mv "$pkgdir"/usr/bin/${n} "$subpkgdir"/usr/bin/
+		mv "$pkgdir"/usr/bin/$n "$subpkgdir"/usr/bin/
 	done
 
 }
@@ -77,9 +83,9 @@ _clients() {
 	mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin
 }
 
-sha512sums="557ef5e5f3b511da4fc441f4bb2e0cd2e23c2981e8b3ce2999973767a04fde070d3ec6f14af60d0e471320078e9f4d1144e5796e7927975ecfbd55fc97f470a9  gpsd-3.20.tar.gz
-eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048  timepps.h
-b692c9fc77a9db3fc621693d3b9e3ef9bc2efbbc7b01651168d7b928d29d48a489b8859930bad01b6021e211372e069a726b78dd5938385ed4ae0153b38f4170  gpsd-use-local-timepps-header.patch
-6599951b4df6154de0bc1088f1bc740af68e2b5a1e3ea2b422a406ed54a79d4273a5015e5e4efdf832c8926cb50626fc7fe8be361448128cc63c41b0f8359a70  0001-workaround-for-scons-using-python2.patch
-51319247eb78c3021d3eb897cb5d6026cc09d46a532a245a835459ed525947ffb6239f08126dd7e344de52e3b0387226bce060191ec3f14f99fc9f255d96f8ea  gpsd.initd
-75dbfe39eb900cc9587dd70794ee77ae2230765bbede47760ca227145aa3f2290b6995335ffcfeae6cd86f56b01ca87367548f4fbcf810aff1bc012b7416deef  gpsd.confd"
+sha512sums="
+0684cbd30defa1a328898589e1d61b2431462a774aff56c588bd00c1fbd92ac94cf6fc1f2b981debac78c34ab09fa24f48ed6334f3ecd09e6b8f5faa92ae1085  gpsd-3.25.tar.gz
+699b3652e9033d4deb62b61e4aee8845ecbf2fa257cfc6f821783878245fe9303caf657ab979afd2bd5d034de03837349e3f8f4221eb746280faa8060f2c3b7f  timepps.h
+f88940570cbed761495c3a13949428e873c2c3d112e8ac25d36dd3230ecf2171f67b0f429c37e593bb360dc1e5622fe9066e597880264561c81376ff42d1a818  gpsd.initd
+75dbfe39eb900cc9587dd70794ee77ae2230765bbede47760ca227145aa3f2290b6995335ffcfeae6cd86f56b01ca87367548f4fbcf810aff1bc012b7416deef  gpsd.confd
+"
diff --git a/main/gpsd/gpsd-use-local-timepps-header.patch b/main/gpsd/gpsd-use-local-timepps-header.patch
deleted file mode 100644
index e7b7642cd15..00000000000
--- a/main/gpsd/gpsd-use-local-timepps-header.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index 33e0ff3..cf39fd9 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -319,7 +319,7 @@ for var in import_env:
-         envs[var] = os.environ[var]
- envs["GPSD_HOME"] = os.getcwd()
- 
--env = Environment(tools=["default", "tar", "textfile"], options=opts, ENV=envs)
-+env = Environment(tools=["default", "tar", "textfile"], options=opts, ENV=envs, CPPPATH=".")
- 
- #  Minimal build turns off every option not set on the command line,
- if ARGUMENTS.get('minimal'):
diff --git a/main/gpsd/gpsd.initd b/main/gpsd/gpsd.initd
index d2a30071a22..150a9d7386f 100644
--- a/main/gpsd/gpsd.initd
+++ b/main/gpsd/gpsd.initd
@@ -5,6 +5,7 @@
 depend() {
 	after dbus
 	before ntpd
+	need loopback
 }
 
 PIDFILE=/var/run/${SVCNAME}.pid
diff --git a/main/gpsd/timepps.h b/main/gpsd/timepps.h
index 8c3bd835d69..9694c7a4300 100644
--- a/main/gpsd/timepps.h
+++ b/main/gpsd/timepps.h
@@ -14,13 +14,14 @@
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU General Public License for more details.
  *
- * Source: https://github.com/ago/pps-tools/ - Retreived Dec 2013
+ * Source: https://github.com/ago/pps-tools/ - Retreived 2022-09-03
  */
 
 #ifndef _SYS_TIMEPPS_H_
 #define _SYS_TIMEPPS_H_
 
 #include <errno.h>
+#include <unistd.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <linux/types.h>
@@ -117,7 +118,7 @@ static __inline int time_pps_getparams(pps_handle_t handle,
 					pps_params_t *ppsparams)
 {
 	int ret;
-	struct pps_kparams __ppsparams;
+	struct pps_kparams __ppsparams = {};
 
 	ret = ioctl(handle, PPS_GETPARAMS, &__ppsparams);
 
@@ -134,7 +135,7 @@ static __inline int time_pps_getparams(pps_handle_t handle,
 static __inline int time_pps_setparams(pps_handle_t handle,
 					const pps_params_t *ppsparams)
 {
-	struct pps_kparams __ppsparams;
+	struct pps_kparams __ppsparams = {};
 
 	__ppsparams.api_version = ppsparams->api_version;
 	__ppsparams.mode = ppsparams->mode;
@@ -156,7 +157,7 @@ static __inline int time_pps_fetch(pps_handle_t handle, const int tsformat,
 					pps_info_t *ppsinfobuf,
 					const struct timespec *timeout)
 {
-	struct pps_fdata __fdata;
+	struct pps_fdata __fdata = {};
 	int ret;
 
 	/* Sanity checks */
@@ -168,7 +169,6 @@ static __inline int time_pps_fetch(pps_handle_t handle, const int tsformat,
 	if (timeout) {
 		__fdata.timeout.sec = timeout->tv_sec;
 		__fdata.timeout.nsec = timeout->tv_nsec;
-		__fdata.timeout.flags = ~PPS_TIME_INVALID;
 	} else
 		__fdata.timeout.flags = PPS_TIME_INVALID;
 
@@ -191,7 +191,7 @@ static __inline int time_pps_kcbind(pps_handle_t handle,
 					const int kernel_consumer,
 					const int edge, const int tsformat)
 {
-	struct pps_bind_args __bind_args;
+	struct pps_bind_args __bind_args = {};
 
 	__bind_args.tsformat = tsformat;
 	__bind_args.edge = edge;
diff --git a/main/gptfdisk/APKBUILD b/main/gptfdisk/APKBUILD
index 0e93d5b98f5..ef3d6d29525 100644
--- a/main/gptfdisk/APKBUILD
+++ b/main/gptfdisk/APKBUILD
@@ -1,17 +1,21 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gptfdisk
-pkgver=1.0.5
+pkgver=1.0.10
 pkgrel=0
 pkgdesc="Text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks"
 arch="all"
 url="https://www.rodsbooks.com/gdisk"
-options="!check"  # No test suite.
 license="GPL-2.0-or-later"
 makedepends="ncurses-dev e2fsprogs-dev popt-dev linux-headers"
 subpackages="$pkgname-doc sgdisk"
 source="https://downloads.sourceforge.net/project/gptfdisk/gptfdisk/$pkgver/gptfdisk-$pkgver.tar.gz
 	fix-wrong-include.patch
+	fix-musl.patch
 	"
+# secfixes:
+#   1.0.6-r0:
+#     - CVE-2021-0308
+#     - CVE-2020-0256
 
 build() {
 	make CXX="${CXX:-g++}" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
@@ -25,11 +29,18 @@ package() {
 	done
 }
 
+check() {
+	sh "$builddir"/gdisk_test.sh
+}
+
 sgdisk() {
 	pkgdesc="Command-line GUID partition table (GPT) manipulator"
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/sgdisk "$subpkgdir"/usr/bin/
 }
 
-sha512sums="3d3a59e3488dd3d6bda5d103b9ad8b7936752210346b9787ddc936681498fba90577b6ae950c471d09a01bf6405fce32038ff1777c52db0b21e5277737fe3703  gptfdisk-1.0.5.tar.gz
-7bb67d132e53cd66a4ae954b4a78f6841c3cdb60bee7cbbecbe1667b95292513fc1561261861607d79164e592faf2045ae51b08ff74ebb5097ad760280307995  fix-wrong-include.patch"
+sha512sums="
+76764e176cd92470648a1d7a8d2570ebc41005204e73b0f2dd5a7aff2fc1981d3bec61a3bd68b855cc3474bcb7cf49c1cb2ea25843d4e7945bef7648d548383d  gptfdisk-1.0.10.tar.gz
+9b64c0e565137b4d4275bd6e8b050f98a73ff5593093b54d43736e6aabd24abf6e35d88ea27be17c5fee70aada4ad05a70fe5af3523212aad114f05aaf82356f  fix-wrong-include.patch
+c85306ad9902d4c4f685c8fa5f6f4e1976d3036a4fc747cbc68403fa811a177a0d6ce29575c4d2dc03ccf9bcc44167dd5830eb8f548d9d55d2b6579ed1b4ffab  fix-musl.patch
+"
diff --git a/main/gptfdisk/fix-musl.patch b/main/gptfdisk/fix-musl.patch
new file mode 100644
index 00000000000..69c26f025b0
--- /dev/null
+++ b/main/gptfdisk/fix-musl.patch
@@ -0,0 +1,58 @@
+--- a/diskio-unix.cc
++++ b/diskio-unix.cc
+@@ -52,7 +52,7 @@
+ // work.
+ int DiskIO::OpenForRead(void) {
+    int shouldOpen = 1;
+-   struct stat64 st;
++   struct stat st;
+ 
+    if (isOpen) { // file is already open
+       if (openForWrite) {
+@@ -78,7 +78,7 @@
+       } else {
+          isOpen = 0;
+          openForWrite = 0;
+-         if (fstat64(fd, &st) == 0) {
++         if (fstat(fd, &st) == 0) {
+             if (S_ISDIR(st.st_mode))
+                cerr << "The specified path is a directory!\n";
+ #if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) \
+@@ -311,7 +311,7 @@
+ // Note that seeking beyond the end of the file is NOT detected as a failure!
+ int DiskIO::Seek(uint64_t sector) {
+    int retval = 1;
+-   off64_t seekTo, sought;
++   off_t seekTo, sought;
+ 
+    // If disk isn't open, try to open it....
+    if (!isOpen) {
+@@ -320,7 +320,7 @@
+ 
+    if (isOpen) {
+       seekTo = sector * (uint64_t) GetBlockSize();
+-      sought = lseek64(fd, seekTo, SEEK_SET);
++      sought = lseek(fd, seekTo, SEEK_SET);
+       if (sought != seekTo) {
+          retval = 0;
+       } // if
+@@ -428,8 +428,8 @@
+ // return correct values for disk image files.
+ uint64_t DiskIO::DiskSize(int *err) {
+    uint64_t sectors = 0; // size in sectors
+-   off64_t bytes = 0; // size in bytes
+-   struct stat64 st;
++   off_t bytes = 0; // size in bytes
++   struct stat st;
+    int platformFound = 0;
+ #ifdef __sun__
+    struct dk_minfo minfo;
+@@ -488,7 +488,7 @@
+       // file (a QEMU image, dd backup, or what have you) and see what
+       // fstat() gives us....
+       if ((sectors == 0) || (*err == -1)) {
+-         if (fstat64(fd, &st) == 0) {
++         if (fstat(fd, &st) == 0) {
+             bytes = st.st_size;
+             if ((bytes % UINT64_C(512)) != 0)
+                cerr << "Warning: File size is not a multiple of 512 bytes!"
diff --git a/main/gptfdisk/fix-wrong-include.patch b/main/gptfdisk/fix-wrong-include.patch
index d2d601731f8..069ae24f501 100644
--- a/main/gptfdisk/fix-wrong-include.patch
+++ b/main/gptfdisk/fix-wrong-include.patch
@@ -6,7 +6,7 @@ index 1b18cf2..4ebfde1 100644
  #include <iostream>
  #include <string>
  #include <sstream>
--#ifdef __APPLE__
+-#if defined (__APPLE__) || (__FreeBSD__)
  #include <ncurses.h>
 -#else
 -#include <ncursesw/ncurses.h>
diff --git a/main/graphene/0001-meson-don-t-install-introspection-file-with-installe.patch b/main/graphene/0001-meson-don-t-install-introspection-file-with-installe.patch
new file mode 100644
index 00000000000..a7605531516
--- /dev/null
+++ b/main/graphene/0001-meson-don-t-install-introspection-file-with-installe.patch
@@ -0,0 +1,29 @@
+Patch-Source: https://github.com/ebassi/graphene/pull/248
+From 85289fa63b1a5e4e5a03a79b947d1db5b9ec4778 Mon Sep 17 00:00:00 2001
+From: psykose <alice@ayaya.dev>
+Date: Thu, 7 Apr 2022 19:01:49 +0000
+Subject: [PATCH] meson: don't install introspection file with
+ installed_tests=false
+
+---
+ tests/meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index 0a6a355..0120c29 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -67,7 +67,9 @@ src_build_path = meson.current_build_dir() / '../src'
+ 
+ if build_gir and host_system == 'linux' and not meson.is_cross_build()
+   foreach unit: ['introspection.py']
+-    install_data(unit, install_dir: installed_test_bindir)
++    if get_option('installed_tests')
++      install_data(unit, install_dir: installed_test_bindir)
++    endif
+ 
+     wrapper = '@0@.test'.format(unit)
+     custom_target(wrapper,
+-- 
+2.35.1
+
diff --git a/main/graphene/APKBUILD b/main/graphene/APKBUILD
new file mode 100644
index 00000000000..3c04d0fdd09
--- /dev/null
+++ b/main/graphene/APKBUILD
@@ -0,0 +1,47 @@
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=graphene
+pkgver=1.10.8
+pkgrel=4
+pkgdesc="A thin layer of graphic data types"
+url="http://ebassi.github.io/graphene/"
+arch="all"
+license="MIT"
+makedepends="meson glib-dev gobject-introspection-dev"
+checkdepends="py3-gobject3"
+subpackages="$pkgname-dev"
+source="https://github.com/ebassi/graphene/archive/$pkgver/graphene-$pkgver.tar.gz
+	0001-meson-don-t-install-introspection-file-with-installe.patch
+	"
+
+build() {
+	case "$CARCH" in
+	arm*)
+		# XXX: https://github.com/ebassi/graphene/issues/215
+		# neon quite broken on arm 32-bit
+		_neon=false
+		;;
+	*)
+		_neon=true
+		;;
+	esac
+	abuild-meson \
+		-Db_lto=true \
+		-Darm_neon=$_neon \
+		-Dinstalled_tests=false \
+		. output
+	meson compile -C output
+}
+
+check() {
+	meson test --no-rebuild --print-errorlogs -C output
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+}
+
+sha512sums="
+526b0c17049459b687ceb7f6c26c9d982535e4048e74a0b6282704f9811d3c2e7e0e6cfef166aa953306b6cf77add6677bc600ae0c66cc052dc04c3d0345bd68  graphene-1.10.8.tar.gz
+ce7e9f13821c1f0f4a9b3ae8e744c8418ca516af21417b666ed6f52db623b1214c40180a0d3a00e47a628758dabc2399b627b02fa758e4ddcf0a7e485c360f5b  0001-meson-don-t-install-introspection-file-with-installe.patch
+"
diff --git a/main/graphite2/APKBUILD b/main/graphite2/APKBUILD
index 0d4aaf5cb5e..a79a1e102d7 100644
--- a/main/graphite2/APKBUILD
+++ b/main/graphite2/APKBUILD
@@ -1,16 +1,16 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=graphite2
 _realname=${pkgname/2/}
 pkgver=1.3.14
-pkgrel=0
+pkgrel=6
 pkgdesc="reimplementation of the SIL Graphite text processing engine"
 options="!check" # Testsuite requires graphite 1
 url="https://graphite.sil.org/"
 arch="all"
 license="LGPL-2.1-or-later OR MPL-1.1"
 depends_dev="freetype-dev"
-makedepends="$depends_dev cmake"
+makedepends="$depends_dev cmake samurai"
 subpackages="$pkgname-static $pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/silnrsi/$_realname/archive/$pkgver.tar.gz
 	cmake.patch
@@ -23,38 +23,36 @@ build() {
 	# See https://github.com/silnrsi/graphite/pull/12#issuecomment-311756732
 
 	# shared
-	mkdir build && cd build
-	cmake -G "Unix Makefiles" .. \
-		-DCMAKE_C_FLAGS:STRING="$CFLAGS" \
+	# they pass ndebug in release mode
+	CFLAGS="$CFLAGS -O2 -flto=auto -DNDEBUG" \
+	CXXFLAGS="$CXXFLAGS -O2 -flto=auto -DNDEBUG" \
+	cmake -B build-shared -G Ninja \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_BUILD_TYPE:STRING=None \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_SKIP_INSTALL_RPATH=ON \
 		-DGRAPHITE2_COMPARE_RENDERER=OFF \
-		-DGRAPHITE2_NFILEFACE=ON
-	make
+		-DGRAPHITE2_NFILEFACE=ON \
+		-DGRAPHITE2_VM_TYPE="direct"
+	cmake --build build-shared
 
 	# static
-	cd ..
-	mkdir build-static && cd build-static
-	cmake -G "Unix Makefiles" .. \
-		-DCMAKE_C_FLAGS:STRING="$CFLAGS" \
+	cmake -B build-static -G Ninja \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_BUILD_TYPE:STRING=None \
+		-DCMAKE_BUILD_TYPE=None \
+		-DBUILD_SHARED_LIBS=OFF \
+		-DCMAKE_SKIP_INSTALL_RPATH=ON \
 		-DGRAPHITE2_COMPARE_RENDERER=OFF \
 		-DGRAPHITE2_NFILEFACE=ON \
-		-DBUILD_SHARED_LIBS=OFF
-	make
-}
-
-static() {
-	pkgdesc="$pkgname static libraries"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$builddir"/build-static/src/libgraphite2.a "$subpkgdir"/usr/lib/
+		-DGRAPHITE2_VM_TYPE="direct"
+	cmake --build build-static
 }
 
 package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir/" install
+	DESTDIR="$pkgdir" cmake --install build-static
+	DESTDIR="$pkgdir" cmake --install build-shared
 }
 
-sha512sums="49d127964d3f5c9403c7aecbfb5b18f32f25fe4919a81c49e0534e7123fe845423e16b0b8c8baaae21162b1150ab3e0f1c22c344e07d4364b6b8473c40a0822c  graphite2-1.3.14.tar.gz
-729fb5ce0b012dca27cda10ec2b8cdf90029394915072f3a11ee4a3ec1b62aa5d810ca118a428419ac88d0dd316b07de557601d1ce079d3f96bfff4be271addb  cmake.patch"
+sha512sums="
+49d127964d3f5c9403c7aecbfb5b18f32f25fe4919a81c49e0534e7123fe845423e16b0b8c8baaae21162b1150ab3e0f1c22c344e07d4364b6b8473c40a0822c  graphite2-1.3.14.tar.gz
+729fb5ce0b012dca27cda10ec2b8cdf90029394915072f3a11ee4a3ec1b62aa5d810ca118a428419ac88d0dd316b07de557601d1ce079d3f96bfff4be271addb  cmake.patch
+"
diff --git a/main/graphviz/0001-clone-nameclash.patch b/main/graphviz/0001-clone-nameclash.patch
deleted file mode 100644
index 6222238d8d9..00000000000
--- a/main/graphviz/0001-clone-nameclash.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From cb8bbbd3a48fa1f41965617852d11e02eb20b1f0 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 26 Jul 2011 12:41:21 +0000
-Subject: [PATCH] clone nameclash
-
----
- lib/gvpr/actions.c |    6 +++---
- lib/gvpr/actions.h |    2 +-
- lib/gvpr/compile.c |    2 +-
- lib/gvpr/gvpr.c    |    4 ++--
- 4 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/lib/gvpr/actions.c b/lib/gvpr/actions.c
-index 05bfcd1..b3b4a60 100644
---- a/lib/gvpr/actions.c
-+++ b/lib/gvpr/actions.c
-@@ -380,7 +380,7 @@ Agraph_t *cloneG(Agraph_t * g, char* name)
-  * graph. Otherwise, create a clone subgraph of g.
-  * Assume obj != NULL.
-  */
--Agobj_t *clone(Agraph_t * g, Agobj_t * obj)
-+Agobj_t *cloneO(Agraph_t * g, Agobj_t * obj)
- {
-     Agobj_t *nobj = 0;
-     Agedge_t *e;
-@@ -415,8 +415,8 @@ Agobj_t *clone(Agraph_t * g, Agobj_t * obj)
-     case AGINEDGE:
-     case AGOUTEDGE:
- 	e = (Agedge_t *) obj;
--	t = (Agnode_t *) clone(g, OBJ(agtail(e)));
--	h = (Agnode_t *) clone(g, OBJ(aghead(e)));
-+	t = (Agnode_t *) cloneO(g, OBJ(agtail(e)));
-+	h = (Agnode_t *) cloneO(g, OBJ(aghead(e)));
- 	name = agnameof (AGMKOUT(e));
- 	nobj = (Agobj_t *) openEdge(g, t, h, name);
- 	if (nobj)
-diff --git a/lib/gvpr/actions.h b/lib/gvpr/actions.h
-index 5c62a3b..4223c52 100644
---- a/lib/gvpr/actions.h
-+++ b/lib/gvpr/actions.h
-@@ -22,7 +22,7 @@ extern "C" {
- #include "expr.h"
- 
-     extern void nodeInduce(Agraph_t * selected);
--    extern Agobj_t *clone(Agraph_t * g, Agobj_t * obj);
-+    extern Agobj_t *cloneO(Agraph_t * g, Agobj_t * obj);
-     extern Agraph_t *cloneG(Agraph_t * g, char* name);
-     extern Agobj_t *copy(Agraph_t * g, Agobj_t * obj);
-     extern int copyAttr(Agobj_t * obj, Agobj_t * obj1);
-diff --git a/lib/gvpr/compile.c b/lib/gvpr/compile.c
-index c157572..0914210 100644
---- a/lib/gvpr/compile.c
-+++ b/lib/gvpr/compile.c
-@@ -1087,7 +1087,7 @@ getval(Expr_t * pgm, Exnode_t * node, Exid_t * sym, Exref_t * ref,
- 		error(ERROR_WARNING, "NULL object passed to clone()");
- 		v.integer = 0;
- 	    } else
--		v.integer = PTR2INT(clone(gp, objp));
-+		v.integer = PTR2INT(cloneO(gp, objp));
- 	    break;
- 	case F_cloneG:
- 	    gp = INT2PTR(Agraph_t *, args[0].integer);
-diff --git a/lib/gvpr/gvpr.c b/lib/gvpr/gvpr.c
-index 0d47d70..9a1bfd1 100644
---- a/lib/gvpr/gvpr.c
-+++ b/lib/gvpr/gvpr.c
-@@ -803,7 +803,7 @@ addOutputGraph (Gpr_t* state, gvpropts* uopts)
-     Agraph_t* g = state->outgraph;
- 
-     if ((agroot(g) == state->curgraph) && !uopts->ingraphs)
--	g = (Agraph_t*)clone (0, (Agobj_t *)g);
-+	g = (Agraph_t*)cloneO (0, (Agobj_t *)g);
- 
-     uopts->n_outgraphs++;
-     uopts->outgraphs = oldof(uopts->outgraphs,Agraph_t*,uopts->n_outgraphs,0);
-@@ -988,7 +988,7 @@ int gvpr (int argc, char *argv[], gvpropts * uopts)
- 
- 		/* begin graph */
- 		if (incoreGraphs && (opts->compflags & CLONE))
--		    state->curgraph = (Agraph_t*)clone (0, (Agobj_t*)(state->curgraph));
-+		    state->curgraph = (Agraph_t*)cloneO (0, (Agobj_t*)(state->curgraph));
- 		state->curobj = (Agobj_t *) state->curgraph;
- 		state->tvroot = 0;
- 		if (bp->begg_stmt)
--- 
-1.7.6
-
diff --git a/main/graphviz/APKBUILD b/main/graphviz/APKBUILD
index c27fae0d03b..00c672f6f8a 100644
--- a/main/graphviz/APKBUILD
+++ b/main/graphviz/APKBUILD
@@ -2,41 +2,73 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=graphviz
-pkgver=2.42.3
-pkgrel=0
+pkgver=9.0.0
+pkgrel=1
 pkgdesc="Graph Visualization Tools"
 url="https://www.graphviz.org/"
 arch="all"
 license="EPL-1.0"
-_luaver=5.3
-depends_dev="zlib-dev libpng-dev libjpeg-turbo-dev expat-dev
-	fontconfig-dev libsm-dev libxext-dev cairo-dev pango-dev
-	gmp-dev freetype-dev python3-dev"
-makedepends="$depends_dev flex swig m4 libtool libxaw-dev bison lua$_luaver-dev
-	libltdl tcl autoconf automake bash"
+options="!check" # fixme: enable testsuite
+_luaver=5.4
+depends_dev="
+	cairo-dev
+	expat-dev
+	fontconfig-dev
+	freetype-dev
+	gd-dev
+	gmp-dev
+	libjpeg-turbo-dev
+	libpng-dev
+	libsm-dev
+	libxext-dev
+	pango-dev
+	python3-dev
+	zlib-dev
+	"
+makedepends="
+	$depends_dev
+	bison
+	flex
+	libltdl
+	libxaw-dev
+	lua$_luaver-dev
+	m4
+	swig
+	tcl
+	"
 install="$pkgname.pre-deinstall"
 triggers="$pkgname.trigger=/usr/lib/graphviz"
-subpackages="$pkgname-dev $pkgname-doc py3-gv:_py3 lua$_luaver-$pkgname:_lua
-	$pkgname-graphs::noarch"
-source="https://www2.graphviz.org/Packages/stable/portable_source/graphviz-$pkgver.tar.gz
-	0001-clone-nameclash.patch
+subpackages="
+	$pkgname-dev
+	$pkgname-libs
+	$pkgname-doc
+	py3-gv:_py3
+	lua$_luaver-$pkgname:_lua
+	$pkgname-graphs::noarch
 	"
+source="$pkgname-$pkgver.tar.xz::https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/$pkgver/graphviz-$pkgver.tar.xz"
+
+# secfixes:
+#   2.46.0-r0:
+#     - CVE-2020-18032
 
 prepare() {
-	default_prepare
-	./autogen.sh NOCONFIG
+ 	default_prepare
+	update_config_sub
 }
 
 build() {
-	CONFIG_SHELL=/bin/bash \
 	LIBPOSTFIX=/ \
 	LUA=lua$_luaver \
 	lua_suffix=$_luaver \
+	CFLAGS="$CFLAGS -O2 -flto=auto" \
+	CXXFLAGS="$CXXFLAGS -O2 -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
+		--disable-python \
 		--disable-silent-rules \
 		--disable-static \
 		--disable-dependency-tracking \
@@ -50,46 +82,35 @@ build() {
 		--enable-ocaml=no \
 		--enable-perl=no \
 		--enable-php=no \
-		--enable-python=yes \
+		--enable-python3 \
 		--enable-r=no \
 		--enable-ruby=no \
 		--enable-tcl=no \
 		--without-included-ltdl \
-		--with-x \
-		--with-rsvg=yes \
-		--with-pangocairo=yes \
 		--with-gdk-pixbuf=yes \
-		--with-libgd=no \
-		--with-ipsepcola=yes
-
-	if [ "$CARCH" = "x86_64" ]; then
-		# the configure script thinks we have sincos. we dont.
-		sed -i -e '/HAVE_SINCOS/d' config.h
-	fi
+		--with-ipsepcola=yes \
+		--with-jpeg \
+		--with-libgd=yes \
+		--with-pangocairo=yes \
+		--with-rsvg=yes \
+		--with-x
 
 	make
 }
 
 package() {
 	# Install has race conditions...
-	make -j1 DESTDIR="$pkgdir" \
+	make DESTDIR="$pkgdir" \
 		pkgconfigdir=/usr/lib/pkgconfig \
 		install
-
-	mkdir -p "$pkgdir"/usr/share/doc
-	mv "$pkgdir"/usr/share/graphviz/doc \
-		"$pkgdir"/usr/share/doc/graphviz
 }
 
 _py3() {
 	pkgdesc="Python3 extension for graphviz"
 	depends="python3"
 
-	mkdir -p "$subpkgdir"/usr/lib/graphviz \
-		"$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/graphviz/python3* \
-		"$subpkgdir"/usr/lib/graphviz
-	mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/
+	amove usr/lib/graphviz/python3* \
+		usr/lib/python3*
 }
 
 _lua() {
@@ -97,20 +118,17 @@ _lua() {
 	provides="lua-$pkgname=$pkgver-r$pkgrel"  # for backward compatibility
 	replaces="lua-$pkgname"  # for backward compatibility
 
-	mkdir -p "$subpkgdir"/usr/lib/graphviz \
-		"$subpkgdir"/usr/lib/lua
-	mv "$pkgdir"/usr/lib/graphviz/lua \
-		"$subpkgdir"/usr/lib/graphviz/
+	mkdir -p "$subpkgdir"/usr/lib/lua
 	mv "$pkgdir"/usr/lib/lua "$subpkgdir"/usr/lib/lua/$_luaver
+	amove usr/lib/graphviz/lua
 }
 
 graphs() {
 	pkgdesc="Demo graphs for graphviz"
 
-	mkdir -p "$subpkgdir"/usr/share/graphviz
-	mv "$pkgdir"/usr/share/graphviz/graphs \
-		"$subpkgdir"/usr/share/graphviz/
+	amove usr/share/graphviz/graphs
 }
 
-sha512sums="e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9  graphviz-2.42.3.tar.gz
-aa4cbc341906a949a6bf78cadd96c437d6bcc90369941fe03519aa4447731ecbf6063a0dd0366d3e7aaadf22b69e4bcab3f8632a7da7a01f8e08a3be05c2bc5d  0001-clone-nameclash.patch"
+sha512sums="
+912f31a4a90e21de9601ffcf8a85d2650d46f07e61aeb0e5124e5a91c67f444d08d40d49f15f2e4078d53d01fb9ca6f54dc9d18c1c08406da91b8ba9ad61416c  graphviz-9.0.0.tar.xz
+"
diff --git a/main/grep/APKBUILD b/main/grep/APKBUILD
index 7afc14cdb8d..d58d5bbc59b 100644
--- a/main/grep/APKBUILD
+++ b/main/grep/APKBUILD
@@ -1,27 +1,19 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=grep
-pkgver=3.4
+pkgver=3.11
 pkgrel=0
 pkgdesc="Searches input files for lines containing a match to a specified pattern"
 url="https://www.gnu.org/software/grep/grep.html"
 arch="all"
 license="GPL-3.0-or-later"
-makedepends="pcre-dev autoconf automake"
+makedepends="pcre2-dev autoconf automake"
 checkdepends="coreutils bash diffutils"
 subpackages="$pkgname-doc"
-source="https://mirrors.kernel.org/gnu/grep/grep-$pkgver.tar.xz
-	fix-tests.patch"
-# for whatever reason, all the builders locked up in the testsuite.  investigate later.
-options="!check"
-
-prepare() {
-	default_prepare
-	sed -i '/test-localename$(EXEEXT)/d' \
-		"$builddir"/gnulib-tests/Makefile.in
-}
+source="https://mirrors.kernel.org/gnu/grep/grep-$pkgver.tar.xz"
 
 build() {
+	CFLAGS="$CFLAGS -flto=auto"\
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -35,15 +27,15 @@ build() {
 }
 
 check() {
-	make -C "$builddir" check
+	make check || {
+		cat tests/test-suite.log
+	}
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
-
-	rm -rf "$pkgdir"/usr/lib/charset.alias
-	rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
 }
 
-sha512sums="0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206  grep-3.4.tar.xz
-9ba6b01c0c74933299afb469dadd2ea0c7e24befa34c691671a576063e32a1f0c735541e5e2bb0073d8afd814790909f7f895827aa8a2fbacdfcae380a7bcb11  fix-tests.patch"
+sha512sums="
+f254a1905a08c8173e12fbdd4fd8baed9a200217fba9d7641f0d78e4e002c1f2a621152d67027d9b25f0bb2430898f5233dc70909d8464fd13d7dd9298e65c42  grep-3.11.tar.xz
+"
diff --git a/main/grep/fix-tests.patch b/main/grep/fix-tests.patch
deleted file mode 100644
index cb29457147f..00000000000
--- a/main/grep/fix-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -upr grep-3.1.orig/tests/pcre-jitstack grep-3.1/tests/pcre-jitstack
---- grep-3.1.orig/tests/pcre-jitstack	2017-11-29 01:48:08.772121987 +0100
-+++ grep-3.1/tests/pcre-jitstack	2017-11-29 01:49:37.763570125 +0100
-@@ -25,7 +25,7 @@ foo=$( (echo foo | gzip | gzip -d) 2>/de
- 
- fail=0
- 
--b64_decode >pcrejit.txt.gz <<'EOF' || framework_failure_
-+cat <<EOF
- H4sIAAAAAAACA+2bUU4DMQxE/7mMz5T7XwKE+IBKVLue58yk0B9EtX6xJxN7t4VaH69a6+tHrW+/
- r4e3n75KARWShSOFTtiumE3FPVyo79ATIJ0Ry0No/yXe99UIUqTGKKUzYHFJHJoaCONQDCnDSCDS
- IPAvGCVeXNsZ7lpbWFfdaZtgPos5LeK2C1TBKzD09V3HFlCOsbFT/hNbz4HzJaRjnjdam9FXw/o6
-@@ -36,7 +36,9 @@ uSHRnTkzIdZMmZ5kYX/iJFtTwu9cFvr3aDWcUx4p
- dkcKkYUglER2Q4L4gnmOiNGzSBATwGQgwihs5/QffIhyfg4hJvM2r4Rp6L+1ibCCd4jYZ6jCiBlc
- 2+y4fl4yTGIwcWXNAUEeXmu8iCMV96DNTnmRNICDk2N5qaXGbsF91OX/0hlcYTjrMfy02p9Xv70D
- mv3RZCFOAAA=
--EOF
-+EOF > pcrejit.tmp.txt
-+
-+b64_decode < pcrejit.tmp.txt > pcrejit.txt.gz || framework_failure_
- 
- gzip -d pcrejit.txt || framework_failure_
- 
diff --git a/main/groff/APKBUILD b/main/groff/APKBUILD
index 2b6aad06e6b..06b87d36c02 100644
--- a/main/groff/APKBUILD
+++ b/main/groff/APKBUILD
@@ -1,45 +1,42 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=groff
-pkgver=1.22.4
-pkgrel=0
+pkgver=1.23.0
+pkgrel=2
 pkgdesc="GNU troff text-formatting system"
 url="https://www.gnu.org/software/groff/groff.html"
 arch="all"
 license="GPL-3.0-or-later"
-makedepends="perl bison zlib-dev texinfo"
+depends="perl"
+makedepends="bison zlib-dev texinfo"
 checkdepends="diffutils"
 subpackages="$pkgname-doc"
-source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
-	site.tmac
+source="https://ftp.gnu.org/gnu/groff/groff-$pkgver.tar.gz
 	"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--without-x \
 		--disable-rpath
-	# work around parallel build issue
-	make arch/misc && make
+	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	rm -rf "$pkgdir"/usr/lib/charset.alias
 	rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
-	for f in man mdoc; do
-		cat ${srcdir}/site.tmac >> \
-			${pkgdir}/usr/share/groff/site-tmac/${f}.local
-	done
+
+	# Prevent conflict with mandoc-doc
+	rm -f "$pkgdir"/usr/share/man/man1/soelim.1 \
+		"$pkgdir"/usr/share/man/man7/roff.7
 }
 
-sha512sums="1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d  groff-1.22.4.tar.gz
-f6818f17fdfc76bfecc90c225b0173dabe2be0fe04058869d09556a22cb2c44545a51fa668f69d1843fe2d2344b978367da61189d65b27eed39dcbb9d7a12309  site.tmac"
+sha512sums="
+eff473fd1d0e6b27527318452ef2b7c6c7aba0b1c27fc529036496eccba5717f3639df0b81a297a57f700e27543196d7086b15e43d7e3c7bf075f95feb7f4089  groff-1.23.0.tar.gz
+"
diff --git a/main/groff/site.tmac b/main/groff/site.tmac
deleted file mode 100644
index cf0ef61d634..00000000000
--- a/main/groff/site.tmac
+++ /dev/null
@@ -1,17 +0,0 @@
-.
-.if n \{\
-.  \" Character translations for non-keyboard
-.  \" characters - to make them searchable
-.  if '\*[.T]'utf8' \{\
-.    char \- \N'45'
-.    char - \N'45'
-.    char ' \N'39'
-.    char \' \N'39'
-.  \}
-.
-.  \" Shut off SGR by default (groff colors)
-.  \" Require GROFF_SGR envvar defined to turn it on
-.  if '\V[GROFF_SGR]'' \
-.    output x X tty: sgr 0
-.\}
-
diff --git a/main/gross/APKBUILD b/main/gross/APKBUILD
index b33af258296..e587d6a5c83 100644
--- a/main/gross/APKBUILD
+++ b/main/gross/APKBUILD
@@ -1,54 +1,41 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gross
-pkgver=1.0.2
-pkgrel=11
+pkgver=1.0.4
+pkgrel=0
 pkgdesc="Greylisting of suspicious sources"
-url="http://code.google.com/p/gross/"
+url="https://codeberg.org/bizdelnick/gross"
 arch="all"
-license="BSD"
-depends=
+license="BSD-3-Clause"
 makedepends="c-ares-dev autoconf automake libtool sed"
 install="$pkgname.pre-install $pkgname.pre-upgrade
 	$pkgname.post-upgrade"
-subpackages="$pkgname-doc $pkgname-dev"
-source="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gross/gross-$pkgver.tar.gz
+subpackages="$pkgname-doc $pkgname-dev $pkgname-openrc"
+source="https://codeberg.org/bizdelnick/gross/releases/download/v$pkgver/gross-$pkgver.tar.xz
 	grossd.initd
 	grossd.confd
 	gross-1.0.1-default-conf.patch
 	gross-grey_tuple.patch
-	fix-shadow-declaration.patch"
+	"
+options="!check"
 
-_builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
-	local i
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	update_config_sub
+	default_prepare
 }
 
-
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
-
-	make -j1 || return 1
+		--infodir=/usr/share/info
+	make -j1
 }
 
 package() {
-	cd "$_builddir"
-
 	make -j1 DESTDIR="$pkgdir" install
 
 	install -dD "$pkgdir"/var/run/gross
@@ -56,9 +43,10 @@ package() {
 	install -m644 -D "$srcdir"/grossd.confd "$pkgdir"/etc/conf.d/grossd
 }
 
-sha512sums="fefeef9ec37747c7cbab8323aa4761e36352641bf314fd8fd98ac4e4d5890c5cf7c0858207d7d35a197cc0cad645a12e22b356575dd5f2c4eb4eac033636a2d2  gross-1.0.2.tar.gz
+sha512sums="
+28126ed65ca82b9826b04f6210a95865fc514b924c0f14123e822923d2ce44f2c5c80d41f5b23c3ff845f9734a8e6ca3424fa165e7955d0fa99d52ae45bb30ea  gross-1.0.4.tar.xz
 8784cd056372dced708b561548f71f24177b302efe2256626a6bb9b91374ae783be1c4d844b6f38af4b03f370b0c8c803ab9ce2f07855e630f98b585e0f65dc9  grossd.initd
 d9f8b74d13e0d3f0e2dfe20e1b7a6e50e91e81c9769d3e1afe3370edf66da5827d3b24f369216370f426a0a242a797a470408831b2cf4e880d4f17d1611a065d  grossd.confd
 90d80c1a68f71f671c19187dccaee9d475d92925a947d25e68c277b0c52f43e0e4b37c1d8f063a2ef155daa93d8f60fc19e3692f0193a9662670d47e425f37d4  gross-1.0.1-default-conf.patch
 5561d46da4848b56d9bb38aa857fe584d7c35a0c432005430b25a2280ca320c70ae8a92bb2718243198345d2919d8eb3d04fb24056c404a648a17a9a6b564c94  gross-grey_tuple.patch
-2a66db84af5d26291eaddb287bce1dddaa461f30792637b6efcebeb3c45f1e72e5f8beb0837bc4a5ddd330c59d4f2db4a58e5cd398164ad6481db27817f1ad15  fix-shadow-declaration.patch"
+"
diff --git a/main/gross/fix-shadow-declaration.patch b/main/gross/fix-shadow-declaration.patch
deleted file mode 100644
index 9b70a61ca1d..00000000000
--- a/main/gross/fix-shadow-declaration.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gross-1.0.2.orig/include/utils.h
-+++ gross-1.0.2/include/utils.h
-@@ -39,7 +39,9 @@
- #endif /* ! USE_GETTIMEOFDAY */
- 
- int readline(int fd, void *vptr, size_t maxlen);
-+#if 0
- int getline(int fd, char *line, size_t maxlen);
-+#endif
- ssize_t readn(int fd, void *vptr, size_t n);
- ssize_t writen(int fd, const void *vptr, size_t n);
- ssize_t writeline(int fd, const char *line);
-
diff --git a/main/grub/0001-Fix-grub-mkconfig-detection-of-linux-edge-virt.patch b/main/grub/0001-Fix-grub-mkconfig-detection-of-linux-edge-virt.patch
new file mode 100644
index 00000000000..8f605060c30
--- /dev/null
+++ b/main/grub/0001-Fix-grub-mkconfig-detection-of-linux-edge-virt.patch
@@ -0,0 +1,43 @@
+8d370d5bd81c8467878cf88be24938a33efc06bf Fix grub-mkconfig detection of linux-edge-virt
+ util/grub.d/10_linux.in     | 2 +-
+ util/grub.d/20_linux_xen.in | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index a694050df..4e5f71f0b 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -210,7 +210,7 @@ while [ "x$list" != "x" ] ; do
+   basename=`basename $linux`
+   dirname=`dirname $linux`
+   rel_dirname=`make_system_path_relative_to_its_root $dirname`
+-  version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
++  version=`echo $basename | sed -e "s,^[^-]*-,,g"`
+   alt_version=`echo $version | sed -e "s,\.old$,,g"`
+   linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+ 
+diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
+index b6ea5bbd1..15319fe06 100644
+--- a/util/grub.d/20_linux_xen.in
++++ b/util/grub.d/20_linux_xen.in
+@@ -184,7 +184,7 @@ linux_list=
+ for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
+     if grub_file_is_not_garbage "$i"; then
+     	basename=$(basename $i)
+-	version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
++	version=$(echo $basename | sed -e "s,^[^-]*-,,g")
+ 	dirname=$(dirname $i)
+ 	config=
+ 	for j in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
+@@ -290,7 +290,7 @@ while [ "x${xen_list}" != "x" ] ; do
+ 	basename=`basename $linux`
+ 	dirname=`dirname $linux`
+ 	rel_dirname=`make_system_path_relative_to_its_root $dirname`
+-	version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
++	version=`echo $basename | sed -e "s,^[^-]*-,,g"`
+ 	alt_version=`echo $version | sed -e "s,\.old$,,g"`
+ 	linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+ 
+-- 
+2.39.2
+
diff --git a/main/grub/0002-ensure-grub-mkconfig-ignores-.apk-new-files.patch b/main/grub/0002-ensure-grub-mkconfig-ignores-.apk-new-files.patch
new file mode 100644
index 00000000000..13b30d7466f
--- /dev/null
+++ b/main/grub/0002-ensure-grub-mkconfig-ignores-.apk-new-files.patch
@@ -0,0 +1,22 @@
+65d6f17b0b6651007ded36dff9ba206fac8d7caa ensure grub-mkconfig ignores *.apk-new files
+ util/grub-mkconfig.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index f8cbb8d7a..8b6501209 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -282,6 +282,10 @@ for i in "${grub_mkconfig_dir}"/* ; do
+     *~) ;;
+     # emacsen autosave files. FIXME: support other editors
+     */\#*\#) ;;
++    # Copy of a template file from Alpine Grub package where the stock file
++    # was locally modified. Any such *.apk-new files should be ignored by
++    # grub-mkconfig.
++    *.apk-new) ;;
+     *)
+       if grub_file_is_not_garbage "$i" && test -x "$i" ; then
+         echo
+-- 
+2.39.2
+
diff --git a/main/grub/0003-prevent-harmless-LVM-warnings-from-grub-probe.patch b/main/grub/0003-prevent-harmless-LVM-warnings-from-grub-probe.patch
new file mode 100644
index 00000000000..44abb769b35
--- /dev/null
+++ b/main/grub/0003-prevent-harmless-LVM-warnings-from-grub-probe.patch
@@ -0,0 +1,20 @@
+24552b8fd1291c9c8046d14dd813b9a4f22bf883 prevent harmless LVM warnings from grub-probe
+ grub-core/osdep/unix/getroot.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/osdep/unix/getroot.c b/grub-core/osdep/unix/getroot.c
+index 74f69116d..8e143beb2 100644
+--- a/grub-core/osdep/unix/getroot.c
++++ b/grub-core/osdep/unix/getroot.c
+@@ -610,7 +610,7 @@ grub_util_pull_lvm_by_command (const char *os_dev)
+   /* by default PV name is left aligned in 10 character field, meaning that
+      we do not know where name ends. Using dummy --separator disables
+      alignment. We have a single field, so separator itself is not output */
+-  argv[0] = "vgs";
++  argv[0] = "LVM_SUPPRESS_FD_WARNINGS=1 vgs";
+   argv[1] = "--options";
+   if (vgid)
+     argv[2] = "vg_uuid,pv_name";
+-- 
+2.39.2
+
diff --git a/main/grub/0004-Handle-encrypted-zfs-root-partition.patch b/main/grub/0004-Handle-encrypted-zfs-root-partition.patch
new file mode 100644
index 00000000000..3c5f38b5239
--- /dev/null
+++ b/main/grub/0004-Handle-encrypted-zfs-root-partition.patch
@@ -0,0 +1,34 @@
+0979d0808c8d977cebe4715c729295d485c12725 Handle encrypted zfs root partition
+ util/grub.d/10_linux.in     | 2 +-
+ util/grub.d/20_linux_xen.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 4e5f71f0b..7afa1fd2f 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -73,7 +73,7 @@ case x"$GRUB_FS" in
+ 	    GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
+ 	fi;;
+     xzfs)
+-	rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
++	rpool="`blkid -o value -s LABEL ${GRUB_DEVICE}`"
+ 	bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
+ 	LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs%/}"
+ 	;;
+diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
+index 15319fe06..8656bb453 100644
+--- a/util/grub.d/20_linux_xen.in
++++ b/util/grub.d/20_linux_xen.in
+@@ -81,7 +81,7 @@ case x"$GRUB_FS" in
+ 	    GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
+ 	fi;;
+     xzfs)
+-	rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
++	rpool="`blkid -o value -s LABEL ${GRUB_DEVICE}`"
+ 	bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
+ 	LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs%/}"
+ 	;;
+-- 
+2.39.2
+
diff --git a/main/grub/0005-Alpine-Linux-fixes-for-menu.patch b/main/grub/0005-Alpine-Linux-fixes-for-menu.patch
new file mode 100644
index 00000000000..7a83767d646
--- /dev/null
+++ b/main/grub/0005-Alpine-Linux-fixes-for-menu.patch
@@ -0,0 +1,78 @@
+7a71eaf97380e505520b8ef92b35ffb44e6c5227 Alpine Linux fixes for menu
+ util/grub.d/10_linux.in     | 12 ++++++++----
+ util/grub.d/20_linux_xen.in |  5 +++--
+ 2 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 7afa1fd2f..76e006b99 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -21,17 +21,22 @@ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ datarootdir="@datarootdir@"
+ 
++if [ -f /etc/update-extlinux.conf ]; then
++	. /etc/update-extlinux.conf
++	GRUB_CMDLINE_LINUX_DEFAULT="modules=${modules} ${default_kernel_opts} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++fi
+ . "$pkgdatadir/grub-mkconfig_lib"
+ 
++
+ export TEXTDOMAIN=@PACKAGE@
+ export TEXTDOMAINDIR="@localedir@"
+ 
+ CLASS="--class gnu-linux --class gnu --class os"
+ 
+ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+-  OS=GNU/Linux
++  OS="$( . /etc/os-release; echo "$PRETTY_NAME")"
+ else
+-  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
++  OS="${GRUB_DISTRIBUTOR}"
+   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
+ fi
+ 
+@@ -54,8 +59,6 @@ GRUB_DISABLE_LINUX_PARTUUID=${GRUB_DISABLE_LINUX_PARTUUID-true}
+ if ( [ "x${GRUB_DEVICE_UUID}" = "x" ] && [ "x${GRUB_DEVICE_PARTUUID}" = "x" ] ) \
+     || ( [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
+ 	&& [ "x${GRUB_DISABLE_LINUX_PARTUUID}" = "xtrue" ] ) \
+-    || ( ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
+-	&& ! test -e "/dev/disk/by-partuuid/${GRUB_DEVICE_PARTUUID}" ) \
+     || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
+   LINUX_ROOT_DEVICE=${GRUB_DEVICE}
+ elif [ "x${GRUB_DEVICE_UUID}" = "x" ] \
+@@ -229,6 +232,7 @@ while [ "x$list" != "x" ] ; do
+ 	   "initramfs-${version}.img" "initramfs-${alt_version}.img.old" \
+ 	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
+ 	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
++	   "initramfs-${version}" \
+ 	   "initramfs-genkernel-${version}" \
+ 	   "initramfs-genkernel-${alt_version}" \
+ 	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
+diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
+index 8656bb453..69c76a820 100644
+--- a/util/grub.d/20_linux_xen.in
++++ b/util/grub.d/20_linux_xen.in
+@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
+ CLASS="--class gnu-linux --class gnu --class os --class xen"
+ 
+ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+-  OS=GNU/Linux
++  OS="$( . /etc/os-release; echo "$PRETTY_NAME")"
+ else
+-  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
++  OS="${GRUB_DISTRIBUTOR}"
+   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
+ fi
+ 
+@@ -301,6 +301,7 @@ while [ "x${xen_list}" != "x" ] ; do
+ 	   "initramfs-${version}.img" "initramfs-${alt_version}.img.old" \
+ 	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
+ 	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
++	   "initramfs-${version}" \
+ 	   "initramfs-genkernel-${version}" \
+ 	   "initramfs-genkernel-${alt_version}" \
+ 	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
+-- 
+2.39.2
+
diff --git a/main/grub/0006-build-force-no-pie.patch b/main/grub/0006-build-force-no-pie.patch
new file mode 100644
index 00000000000..8dc50cb1846
--- /dev/null
+++ b/main/grub/0006-build-force-no-pie.patch
@@ -0,0 +1,20 @@
+8826c39fdbf7988c73ae42846a8cf0cfbd81fbad build: force -no-pie
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9c5fa618d..dffdaa9e7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1254,7 +1254,7 @@ if test x"$efiemu_excuse" = x ; then
+   if test x"$grub_cv_target_cc_efiemu64_link_format" = xunknown; then
+     efiemu_excuse="no suitable link format for efiemu64 found"
+   else
+-    EFIEMU64_LINK_FORMAT="-Wl,$grub_cv_target_cc_efiemu64_link_format"
++    EFIEMU64_LINK_FORMAT="-Wl,$grub_cv_target_cc_efiemu64_link_format -no-pie"
+   fi
+ fi
+ if test x"$enable_efiemu" = xyes && test x"$efiemu_excuse" != x ; then
+-- 
+2.39.2
+
diff --git a/main/grub/0007-uefi-firmware-remove-fsetup-check.patch b/main/grub/0007-uefi-firmware-remove-fsetup-check.patch
new file mode 100644
index 00000000000..287163cd73c
--- /dev/null
+++ b/main/grub/0007-uefi-firmware-remove-fsetup-check.patch
@@ -0,0 +1,30 @@
+grub 2.12 introduced the `--is-supported` argument for fwsetup, and runs it for
+efi systems to determine whether to show the uefi-firmware menu item.
+
+The problem is that grub 2.06 does not support the `--is-supported` flag yet,
+and calling it just crashes grub, causing the machine to reboot.
+
+Showing a menu entry for uefi-firmware that may not work is infinitely better
+than crashing and preventing the machine to boot, so remove the condition and
+always show the menu entry.
+
+See also: https://bugs.archlinux.org/task/75701
+diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in
+index 1c2365d..b6041b5 100644
+--- a/util/grub.d/30_uefi-firmware.in
++++ b/util/grub.d/30_uefi-firmware.in
+@@ -32,11 +32,8 @@ gettext_printf "Adding boot menu entry for UEFI Firmware Settings ...\n" >&2
+ 
+ cat << EOF
+ if [ "\$grub_platform" = "efi" ]; then
+-	fwsetup --is-supported
+-	if [ "\$?" = 0 ]; then
+-		menuentry '$LABEL' \$menuentry_id_option 'uefi-firmware' {
+-			fwsetup
+-		}
+-	fi
++	menuentry '$LABEL' \$menuentry_id_option 'uefi-firmware' {
++		fwsetup
++	}
+ fi
+ EOF
diff --git a/main/grub/APKBUILD b/main/grub/APKBUILD
index 3168d3aa0cf..9820b1a0f35 100644
--- a/main/grub/APKBUILD
+++ b/main/grub/APKBUILD
@@ -1,54 +1,88 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=grub
-pkgver=2.04
-pkgrel=0
+pkgver=2.12
+pkgrel=3
 pkgdesc="Bootloader with support for Linux, Multiboot and more"
 url="https://www.gnu.org/software/grub/"
 arch="all !s390x"
 license="GPL-3.0-or-later"
-depends="mkinitfs"
+depends="initramfs-generator"
 triggers="grub.trigger=/boot"
-depends_dev=""
-makedepends="$depends_dev bison flex linux-headers xz-dev lvm2-dev
-	automake autoconf libtool python3 freetype-dev unifont gettext-dev"
+makedepends="autoconf automake bison flex font-unifont freetype-dev
+	fuse-dev gawk gettext-dev libtool linux-headers lvm2-dev python3 xz-dev"
 install="$pkgname.post-upgrade"
 # strip handled by grub Makefiles, abuild strip breaks xen pv-grub
 options="!check !strip"  # Cannot test boot loader.
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-mkfont
+	$pkgname-mount
+	$pkgname-bash-completion
+	"
 
 # currently grub only builds on x86*, aarch64 and ppc* systems
-flavors=""
 case "$CARCH" in
-x86)		flavors="efi bios";;
-x86_64)		flavors="efi bios xenhost xenhost_pvh";;
-aarch64|arm*)	flavors="efi";;
-mips*)		flavors="qemu_mips";;
-ppc*)		flavors="ieee1275"; makedepends="$makedepends powerpc-utils" ;;
-s390x)		flavors="emu" ;;
+	x86)		flavors="efi bios";;
+	x86_64)		flavors="efi bios xenhost xenhost_pvh";;
+	aarch64|arm*)	flavors="efi";;
+	mips*)		flavors="qemu_mips";;
+	riscv*)		flavors="efi";;
+	ppc*)		flavors="ieee1275"; makedepends="$makedepends powerpc-utils" ;;
+	s390x)		flavors="emu" ;;
+	loongarch64)	flavors="efi" ;;
 esac
 for f in $flavors; do
-	[ x"$f" = x"xenhost_pvh" ] && continue # xenhost_pvh shipped in the xenhost subpackage
+	[ "$f" = "xenhost_pvh" ] && continue # xenhost_pvh shipped in the xenhost subpackage
 	subpackages="$subpackages $pkgname-$f"
 done
 
 source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz
-	fix-gcc-no-pie-specs.patch
+	update-grub
 	grub-xen-host_grub.cfg
-	alpine-mkconfig.patch
-	lang-C.UTF-8.patch
+
+	0001-Fix-grub-mkconfig-detection-of-linux-edge-virt.patch
+	0002-ensure-grub-mkconfig-ignores-.apk-new-files.patch
+	0003-prevent-harmless-LVM-warnings-from-grub-probe.patch
+	0004-Handle-encrypted-zfs-root-partition.patch
+	0005-Alpine-Linux-fixes-for-menu.patch
+	0006-build-force-no-pie.patch
+	0007-uefi-firmware-remove-fsetup-check.patch
 	"
-builddir="$srcdir/grub-$pkgver"
+
+# secfixes:
+#   2.06-r13:
+#     - CVE-2021-3697
+#   2.06-r0:
+#     - CVE-2021-3418
+#     - CVE-2020-10713
+#     - CVE-2020-14308
+#     - CVE-2020-14309
+#     - CVE-2020-14310
+#     - CVE-2020-14311
+#     - CVE-2020-14372
+#     - CVE-2020-15705
+#     - CVE-2020-15706
+#     - CVE-2020-15707
+#     - CVE-2020-25632
+#     - CVE-2020-25647
+#     - CVE-2020-27749
+#     - CVE-2020-27779
+#     - CVE-2021-20225
+#     - CVE-2021-20233
 
 prepare() {
 	default_prepare
-	PYTHON=python3 ./autogen.sh
+	PYTHON=python3 sh ./autogen.sh
+
+	# Required to fix 2.12 build - (empty) file is missing from release
+	touch "$builddir"/grub-core/extra_deps.lst
 }
 
 _build_flavor() {
 	local flavor="$1"
 	shift
-	local _configure="$@"
 
 	msg "Building grub for platform $flavor"
 	mkdir -p "$srcdir"/build-$flavor
@@ -63,7 +97,7 @@ _build_flavor() {
 		--localstatedir=/var \
 		--disable-nls \
 		--disable-werror \
-		$_configure
+		"$@"
 	make
 }
 
@@ -71,10 +105,12 @@ build() {
 	local f
 	for f in $flavors; do
 		case "$f" in
-		bios)		_build_flavor $f --with-platform=pc;;
+		bios)		CFLAGS="${CFLAGS/-fno-plt/}" \
+				  _build_flavor $f --with-platform=pc;;
 		efi)		_build_flavor $f --with-platform=efi --disable-efiemu;;
 		xenhost)	_build_flavor $f --with-platform=xen;;
-		xenhost_pvh)	_build_flavor $f --with-platform=xen_pvh --target=i386;;
+		xenhost_pvh)	CFLAGS="${CFLAGS/-fno-plt/}" \
+				  _build_flavor $f --with-platform=xen_pvh --target=i386;;
 		*)		_build_flavor $f --with-platform=$f;;
 
 		esac
@@ -82,9 +118,9 @@ build() {
 }
 
 _install_xen() {
-	grub_dir=`mktemp -d`
-	cfg=`mktemp`
-	grub_memdisk=`mktemp`
+	grub_dir=$(mktemp -d)
+	cfg=$(mktemp)
+	grub_memdisk=$(mktemp)
 
 	mkdir -p $grub_dir/boot/grub
 	echo 'normal (memdisk)/grub.cfg' > $cfg
@@ -105,9 +141,9 @@ _install_xen() {
 }
 
 _install_xenpvh() {
-	grub_dir=`mktemp -d`
-	cfg=`mktemp`
-	grub_memdisk=`mktemp`
+	grub_dir=$(mktemp -d)
+	cfg=$(mktemp)
+	grub_memdisk=$(mktemp)
 
 	mkdir -p $grub_dir/boot/grub
 	echo 'normal (memdisk)/grub.cfg' > $cfg
@@ -157,6 +193,11 @@ package() {
 	GRUB_DISABLE_SUBMENU=y
 	GRUB_DISABLE_RECOVERY=true
 	EOF
+
+	mkdir -p "$pkgdir"/usr/share/bash-completion
+	mv "$pkgdir"/etc/bash_completion.d "$pkgdir"/usr/share/bash-completion/completions
+
+	install -D -m755 "$srcdir"/update-grub "$pkgdir"/usr/sbin/update-grub
 }
 
 bios() {
@@ -203,8 +244,29 @@ emu() {
 	mv $pkgdir/usr/lib/grub/*-emu $subpkgdir/usr/lib/grub/
 }
 
-sha512sums="9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb  grub-2.04.tar.xz
-f2a7d9ab6c445f4e402e790db56378cecd6631b5c367451aa6ce5c01cd95b95c83c3dd24d6d4b857f8f42601eba82c855607513eb6ce5b2af6bd6c71f046e288  fix-gcc-no-pie-specs.patch
+mkfont() {
+	pkgdesc="$pkgdesc (mkfont utility)"
+	depends="$pkgname"
+	mkdir -p $subpkgdir/usr/bin
+	mv $pkgdir/usr/bin/grub-mkfont $subpkgdir/usr/bin/
+}
+
+mount() {
+	pkgdesc="$pkgdesc (mount utility)"
+	depends=""
+	mkdir -p $subpkgdir/usr/bin
+	mv $pkgdir/usr/bin/grub-mount $subpkgdir/usr/bin/
+}
+
+sha512sums="
+761c060a4c3da9c0e810b0ea967e3ebc66baa4ddd682a503ae3d30a83707626bccaf49359304a16b3a26fc4435fe6bea1ee90be910c84de3c2b5485a31a15be3  grub-2.12.tar.xz
+85b3c56670fb0aaaf831cc6d7ca45faeb68b844cb17cfd6f9b51c2473f0b153cfa7b26ff8bf00a88b2ed3e0ae69a1e8f735256e6cecc91e959169606e2abf887  update-grub
 4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4  grub-xen-host_grub.cfg
-84d9694af384336c0846faad968a63b154e2bd957671fa7c0163c36e20fd086a8d5b67ddf5eb983a11a69f65dac52668d0f51537e7cfe9a1ea9bca7aba91f20b  alpine-mkconfig.patch
-f23702741f2a37c83d0cbf16a000a6229dfd433cd583f3254d523ce35b3668c1db2d8a704a75013e74655ec4f9da5db6b630aa92e3ca5cc47df44cc9e41d1806  lang-C.UTF-8.patch"
+d45f416f7308f338cd187909207cd8329dcb21e22ab0573ae932110c3e108e4bafe6411ae22b5f87809bea39544660dcb03e3fea2c1c33492cd230fa6d3b2760  0001-Fix-grub-mkconfig-detection-of-linux-edge-virt.patch
+e1612f34d14644b30a63d9dc18a0eaf9617ef9f4aa6787c386e6304e15b4573f5149758936cac1ceffdb4e39f6a83e7e7c01a7ef3ed2f7bc974971ae0e2c644c  0002-ensure-grub-mkconfig-ignores-.apk-new-files.patch
+d8606bc2fc6b34e683fdba8b2a131b7d5bede907556c141a30be1d7475a65bf5e2266d577f7a0f0da91646f8605c74d083858c100d2285375474249e53c14fd4  0003-prevent-harmless-LVM-warnings-from-grub-probe.patch
+0f64ab38da309d3c91043b4b662bd8facbcad859c3150da0b15aa0874e33640de1ad7b1539f858f69d26f72512ebbaa70556f07613bea59d1ce509933ba5b753  0004-Handle-encrypted-zfs-root-partition.patch
+474f3576b45f612de4b157f951fbd334d7e136275dd2640e2d3deac7c813e4e8a8809a3b798476eb51cb0a3dd42b52583f7fe526fc78e7638f4506861c98a062  0005-Alpine-Linux-fixes-for-menu.patch
+bb792f7c7be99dee95a031e48be69698ec8e0e76a3060bff314922cca19f086525af6680fb3ea845949be85c7731659a7ab91b2b008e3d526d1549bb108053c2  0006-build-force-no-pie.patch
+c0bea923acc6affd32e78a58685e847f24e26c501b5bbabee99cc6e25c5668263e61f0bf508a6741bd75fef891ca3229f9d746ef254c72d2cb8dca7c18f92f54  0007-uefi-firmware-remove-fsetup-check.patch
+"
diff --git a/main/grub/alpine-mkconfig.patch b/main/grub/alpine-mkconfig.patch
deleted file mode 100644
index 276f8abddaa..00000000000
--- a/main/grub/alpine-mkconfig.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 4532266..42e0248 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -21,17 +21,22 @@ prefix="@prefix@"
- exec_prefix="@exec_prefix@"
- datarootdir="@datarootdir@"
- 
-+if [ -f /etc/update-extlinux.conf ]; then
-+	. /etc/update-extlinux.conf
-+	GRUB_CMDLINE_LINUX_DEFAULT="modules=${modules} ${default_kernel_opts} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+fi
- . "$pkgdatadir/grub-mkconfig_lib"
- 
-+
- export TEXTDOMAIN=@PACKAGE@
- export TEXTDOMAINDIR="@localedir@"
- 
- CLASS="--class gnu-linux --class gnu --class os"
- 
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
--  OS=GNU/Linux
-+  OS="$( . /etc/os-release; echo "$PRETTY_NAME")"
- else
--  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  OS="${GRUB_DISTRIBUTOR}"
-   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
- fi
- 
-@@ -52,8 +57,6 @@ GRUB_DISABLE_LINUX_PARTUUID=${GRUB_DISABLE_LINUX_PARTUUID-true}
- if ( [ "x${GRUB_DEVICE_UUID}" = "x" ] && [ "x${GRUB_DEVICE_PARTUUID}" = "x" ] ) \
-     || ( [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
- 	&& [ "x${GRUB_DISABLE_LINUX_PARTUUID}" = "xtrue" ] ) \
--    || ( ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
--	&& ! test -e "/dev/disk/by-partuuid/${GRUB_DEVICE_PARTUUID}" ) \
-     || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
-   LINUX_ROOT_DEVICE=${GRUB_DEVICE}
- elif [ "x${GRUB_DEVICE_UUID}" = "x" ] \
-@@ -215,6 +218,7 @@ while [ "x$list" != "x" ] ; do
- 	   "initrd-${version}" "initramfs-${version}.img" \
- 	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
- 	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
-+	   "initramfs-${version}" \
- 	   "initramfs-genkernel-${version}" \
- 	   "initramfs-genkernel-${alt_version}" \
- 	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
-diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index 96179ea..6c4c411 100644
---- a/util/grub.d/20_linux_xen.in
-+++ b/util/grub.d/20_linux_xen.in
-@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
- CLASS="--class gnu-linux --class gnu --class os --class xen"
- 
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
--  OS=GNU/Linux
-+  OS="$( . /etc/os-release; echo "$PRETTY_NAME")"
- else
--  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  OS="${GRUB_DISTRIBUTOR}"
-   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
- fi
- 
-@@ -256,6 +256,7 @@ while [ "x${xen_list}" != "x" ] ; do
- 	   "initrd-${version}" "initramfs-${version}.img" \
- 	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
- 	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
-+	   "initramfs-${version}" \
- 	   "initramfs-genkernel-${version}" \
- 	   "initramfs-genkernel-${alt_version}" \
- 	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
diff --git a/main/grub/fix-gcc-no-pie-specs.patch b/main/grub/fix-gcc-no-pie-specs.patch
deleted file mode 100644
index 273c9dbe39f..00000000000
--- a/main/grub/fix-gcc-no-pie-specs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.ac.orig
-+++ ./configure.ac
-@@ -1100,7 +1100,7 @@
-   if test x"$grub_cv_target_cc_efiemu64_link_format" = xunknown; then
-     efiemu_excuse="no suitable link format for efiemu64 found"
-   else
--    EFIEMU64_LINK_FORMAT="-Wl,$grub_cv_target_cc_efiemu64_link_format"
-+    EFIEMU64_LINK_FORMAT="-Wl,$grub_cv_target_cc_efiemu64_link_format -no-pie"
-   fi
- fi
- if test x"$enable_efiemu" = xyes && test x"$efiemu_excuse" != x ; then
diff --git a/main/grub/grub.post-upgrade b/main/grub/grub.post-upgrade
index 59614d035e8..6e4380cb84f 100644
--- a/main/grub/grub.post-upgrade
+++ b/main/grub/grub.post-upgrade
@@ -17,3 +17,6 @@ if [ -z "$GRUB_CMDLINE_LINUX_DEFAULT" ]; then
 	echo "GRUB_CMDLINE_LINUX_DEFAULT=\"$bootopts\"" >> /etc/default/grub
 fi
 
+if [ -e /etc/grub-autoinstall ]; then
+	. /etc/grub-autoinstall
+fi
diff --git a/main/grub/grub.trigger b/main/grub/grub.trigger
index 740dfcb813c..edc2de42fd7 100644
--- a/main/grub/grub.trigger
+++ b/main/grub/grub.trigger
@@ -1,8 +1,7 @@
 #!/bin/sh
-if [ -e /boot/grub/grub.cfg ]; then
-	cp /boot/grub/grub.cfg /boot/grub/grub.cfg.backup
+
+if grep -q '^disable_trigger=1' /etc/update-grub.conf 2>/dev/null; then
+	exit 0
 fi
-mkdir -p /boot/grub
-grub-mkconfig -o /boot/grub/grub.cfg.new \
-	&& mv /boot/grub/grub.cfg.new /boot/grub/grub.cfg
 
+exec /usr/sbin/update-grub
diff --git a/main/grub/lang-C.UTF-8.patch b/main/grub/lang-C.UTF-8.patch
deleted file mode 100644
index 0b74654bcbc..00000000000
--- a/main/grub/lang-C.UTF-8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 93a9023..130abd4 100644
---- a/util/grub.d/00_header.in
-+++ b/util/grub.d/00_header.in
-@@ -191,7 +191,7 @@ EOF
- EOF
- 
- # Gettext variables and module
--if [ "x${LANG}" != "xC" ] &&  [ "x${LANG}" != "x" ]; then
-+if [ "x${LANG%.UTF-8}" != "xC" ] &&  [ "x${LANG}" != "x" ]; then
-   cat << EOF
-   set locale_dir=\$prefix/locale
-   set lang=${grub_lang}
diff --git a/main/grub/update-grub b/main/grub/update-grub
new file mode 100644
index 00000000000..77dadd14e5c
--- /dev/null
+++ b/main/grub/update-grub
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -e /boot/grub/grub.cfg ]; then
+	cp /boot/grub/grub.cfg /boot/grub/grub.cfg.backup
+fi
+mkdir -p /boot/grub
+grub-mkconfig -o /boot/grub/grub.cfg.new \
+	&& mv /boot/grub/grub.cfg.new /boot/grub/grub.cfg
+
diff --git a/main/gsm/APKBUILD b/main/gsm/APKBUILD
index 302306c5c14..abfdc67ea27 100644
--- a/main/gsm/APKBUILD
+++ b/main/gsm/APKBUILD
@@ -1,16 +1,16 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gsm
-pkgver=1.0.19
-pkgrel=0
+pkgver=1.0.22
+pkgrel=3
 _soname=1.0.12
 pkgdesc="Shared libraries for GSM speech compressor"
-url="http://www.quut.com/gsm/"
+url="https://www.quut.com/gsm/"
 arch="all"
-license="custom:TU-Berlin-2.0"
+license="TU-Berlin-2.0"
 makedepends="$depends_dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
-source="http://www.quut.com/gsm/gsm-$pkgver.tar.gz
+source="https://www.quut.com/gsm/gsm-$pkgver.tar.gz
 	gsm-64bit.patch
 	gsm-makefile.patch
 	"
@@ -41,7 +41,11 @@ package() {
 	ln -s libgsm.so.$_soname "$pkgdir"/usr/lib/libgsm.so.1
 	ln -s libgsm.so.$_soname "$pkgdir"/usr/lib/libgsm.so
 
-	ln -s gsm/gsm.h "$pkgdir"/usr/include/
+	# the makefile is really broken
+	install -Dm644 inc/gsm.h \
+		-t "$pkgdir"/usr/include/gsm/
+	ln -s gsm/gsm.h "$pkgdir"/usr/include/gsm.h
+
 	rm -f "$pkgdir"/usr/lib/lib*.a
 }
 
@@ -51,6 +55,8 @@ tools() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
 }
 
-sha512sums="f69b4bf2d918b118b5de90b8ab88fd026008ac7432f07b872b81fe52cdc781f605dca8eedcdaebc8beb974cef388496c618f92a41961c62057009964159f8392  gsm-1.0.19.tar.gz
+sha512sums="
+f4284f096ed4d606ddece5c1b28edb63feacc26a0b664f1350c040dbf50113d27bedfd9896bf1620cb4fc3a6c8f6a5244955a6c625ded833dcee607c63c97dd2  gsm-1.0.22.tar.gz
 5b01f6d2fd3ee7cd859da70870463e2ccc6614c5fb1bd5efc88a223a0c5477271221557fef13ba46697e70cc5820c13efff738413f8990d5884b95cc89c30152  gsm-64bit.patch
-1d92b7eacf52e5281c9f1a0f08313d10f15c35d22fb2292e5a885ceb3cb766557a5e3a08954db75fb13db59345ef9f6b08939881ba38c9d384e09a1c96b47bc5  gsm-makefile.patch"
+acfb7623a7d66580b704967e335e2c30b9d4ce62226c268f588451d5c8d040846c627fbe77473f4eb0a0c9c144d2dddd75f124e7e91f4ecf0da77039be54b4a9  gsm-makefile.patch
+"
diff --git a/main/gsm/gsm-makefile.patch b/main/gsm/gsm-makefile.patch
index b11e1506d5f..e433b5ed092 100644
--- a/main/gsm/gsm-makefile.patch
+++ b/main/gsm/gsm-makefile.patch
@@ -1,6 +1,8 @@
---- gsm-1.0-pl12/Makefile.mk	2006-04-26 21:14:26.000000000 +0200
-+++ gsm-1.0-pl12/Makefile	2007-05-13 13:03:32.000000000 +0200
-@@ -30,6 +30,10 @@
+diff --git a/Makefile b/Makefile
+index 2ad5e5d..c898103 100644
+--- a/Makefile
++++ b/Makefile
+@@ -30,6 +30,10 @@ WAV49	= -DWAV49
  ######### define this, and read about the GSM_OPT_WAV49 option in the
  ######### manual page on gsm_option(3).
  
@@ -11,7 +13,7 @@
  # Choose a compiler.  The code works both with ANSI and K&R-C.
  # Use -DNeedFunctionPrototypes to compile with, -UNeedFunctionPrototypes to
  # compile without, function prototypes in the header files.
-@@ -44,7 +48,7 @@
+@@ -44,7 +48,7 @@ WAV49	= -DWAV49
  # CCFLAGS 	= -c -O
  
  CC		= gcc -ansi -pedantic
@@ -20,7 +22,7 @@
  
  LD 		= $(CC)
  
-@@ -81,7 +85,7 @@
+@@ -81,7 +85,7 @@ INSTALL_ROOT	=
  GSM_INSTALL_ROOT = $(INSTALL_ROOT)
  GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
  GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
@@ -29,7 +31,7 @@
  
  
  # Where do you want to install the toast binaries and their manpage?
-@@ -91,16 +95,16 @@
+@@ -91,12 +95,12 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
  
  TOAST_INSTALL_ROOT	  = $(INSTALL_ROOT)
  TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin
@@ -44,12 +46,7 @@
  BASENAME 	= basename
  AR		= ar
  ARFLAGS		= cr
--RMFLAGS		=
-+RMFLAGS		= -f
- FIND		= find
- COMPRESS 	= compress
- COMPRESSFLAGS 	= 
-@@ -129,17 +133,18 @@
+@@ -129,17 +133,18 @@ INC	= $(ROOT)/inc
  # DEBUG	= -DNDEBUG
  ######### Remove -DNDEBUG to enable assertions.
  
@@ -70,7 +67,7 @@
  
  TOAST	= $(BIN)/toast
  UNTOAST	= $(BIN)/untoast
-@@ -279,7 +284,7 @@
+@@ -279,7 +284,7 @@ TOAST_INSTALL_TARGETS =	\
  
  # Target rules
  
@@ -79,7 +76,7 @@
  		@-echo $(ROOT): Done.
  
  tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
-@@ -299,24 +304,28 @@
+@@ -299,24 +304,28 @@ install:	toastinstall gsminstall
  
  # The basic API: libgsm
  
@@ -113,3 +110,17 @@
  
  
  # The local bin and lib directories
+@@ -357,11 +366,11 @@ $(TOAST_INSTALL_BIN)/toast:	$(TOAST)
+ 
+ $(TOAST_INSTALL_BIN)/untoast:	$(TOAST_INSTALL_BIN)/toast
+ 		-rm $(RMFLAGS) $@
+-		$(LN) $? $@
++		$(LN) toast $@
+ 
+ $(TOAST_INSTALL_BIN)/tcat:	$(TOAST_INSTALL_BIN)/toast
+ 		-rm $(RMFLAGS) $@
+-		$(LN) $? $@
++		$(LN) toast $@
+ 
+ $(TOAST_INSTALL_MAN)/toast.1:	$(MAN)/toast.1
+ 		-rm $(RMFLAGS) $@
diff --git a/main/gst-plugins-base/APKBUILD b/main/gst-plugins-base/APKBUILD
index c2c927ba6cc..df1b3823208 100644
--- a/main/gst-plugins-base/APKBUILD
+++ b/main/gst-plugins-base/APKBUILD
@@ -1,22 +1,42 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gst-plugins-base
-pkgver=1.16.2
-pkgrel=3
+pkgver=1.22.11
+pkgrel=0
 pkgdesc="GStreamer streaming media framework base plug-ins"
 url="https://gstreamer.freedesktop.org"
 arch="all"
-license="GPL-2.0-or-later LGPL-2.0-or-later"
+license="GPL-2.0-or-later AND LGPL-2.0-or-later"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 replaces="gst-plugins-base1 gst-plugins-bad"
 depends_dev="wayland-dev"
-makedepends="alsa-lib-dev cdparanoia-dev expat-dev glib-dev
-	gobject-introspection-dev gstreamer-dev gtk+3.0-dev libice-dev
-	libogg-dev libsm-dev libtheora-dev libvorbis-dev libxv-dev mesa-dev
-	meson opus-dev orc-compiler orc-dev perl"
+makedepends="
+	alsa-lib-dev
+	cdparanoia-dev
+	expat-dev
+	glib-dev
+	gobject-introspection-dev
+	graphene-dev
+	gstreamer-dev
+	gtk+3.0-dev
+	libice-dev
+	libogg-dev
+	libsm-dev
+	libtheora-dev
+	libvorbis-dev
+	libxv-dev
+	mesa-dev
+	meson
+	opus-dev
+	orc-compiler
+	orc-dev
+	perl
+	"
 source="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$pkgver.tar.xz"
 ldpath="/usr/lib/gstreamer-1.0"
 
 # secfixes:
+#   1.18.4-r0:
+#     - CVE-2021-3522
 #   1.16.0-r0:
 #     - CVE-2019-9928
 
@@ -25,18 +45,18 @@ ldpath="/usr/lib/gstreamer-1.0"
 options="!check"
 
 build() {
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--buildtype=plain \
+	CFLAGS="$CFLAGS -O2" \
+	CXXFLAGS="$CXXFLAGS -O2" \
+	CPPFLAGS="$CPPFLAGS -O2" \
+	abuild-meson \
+		-Db_lto=true \
 		-Dalsa=enabled \
 		-Dintrospection=enabled \
 		-Dpackage-origin="https://alpinelinux.org" \
 		-Dpackage-name="GStreamer base plug-ins (Alpine Linux)" \
+		-Dtests="$(want_check && echo enabled || echo disabled)" \
 		. output
-	ninja -C output
+	meson compile -C output
 }
 
 check() {
@@ -44,7 +64,7 @@ check() {
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C output install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
 doc() {
@@ -52,4 +72,6 @@ doc() {
 	replaces="${pkgname}1-doc"
 }
 
-sha512sums="f28e71bba8ba25d4f18ba3a196f057721151f1ebf1309d808bd6771a3f9a68facfa1970dc4353b6f2fd1e8945edf5272854d328ea11ef399544f8b330f754a42  gst-plugins-base-1.16.2.tar.xz"
+sha512sums="
+cfd8f7fe66f4707e043c8f070110eb80f9804cec529c8d29b13dbc8604db90e3f010c9614d538ad076b826df54f75ce5ebac355bd05a874e44dccead6a953c60  gst-plugins-base-1.22.11.tar.xz
+"
diff --git a/main/gstreamer/APKBUILD b/main/gstreamer/APKBUILD
index e6c62293237..e9fb455fe44 100644
--- a/main/gstreamer/APKBUILD
+++ b/main/gstreamer/APKBUILD
@@ -1,49 +1,96 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gstreamer
-pkgver=1.16.2
-pkgrel=2
+pkgver=1.22.11
+pkgrel=0
 pkgdesc="GStreamer streaming media framework"
 url="https://gstreamer.freedesktop.org"
 arch="all"
 license="LGPL-2.0-or-later"
 replaces="gstreamer1"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-lang"
 depends_dev="libxml2-dev"
-makedepends="$depends_dev bison flex glib-dev gobject-introspection-dev
-	libcap-dev meson perl"
+makedepends="$depends_dev
+	bison
+	flex
+	glib-dev
+	gobject-introspection-dev
+	libcap-dev
+	libcap-utils
+	meson
+	perl
+	"
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-tools
+	$pkgname-lang
+	$pkgname-ptp-helper:ptp_helper
+	"
 source="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$pkgver.tar.xz"
+# setcap: gst-ptp-helper
+# FIXME: two tests fail
+options="setcap !check"
+
+# secfixes:
+#   1.18.4-r0:
+#     - CVE-2021-3497
+#     - CVE-2021-3498
 
 build() {
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--buildtype=plain \
+	CFLAGS="$CFLAGS -O2" \
+	CXXFLAGS="$CXXFLAGS -O2" \
+	CPPFLAGS="$CPPFLAGS -O2" \
+	abuild-meson \
+		-Db_lto=true \
 		-Dintrospection=enabled \
 		-Dbash-completion=disabled \
 		-Dptp-helper-permissions=capabilities \
 		-Dpackage-name="GStreamer (Alpine Linux)" \
 		-Dpackage-origin="https://alpinelinux.org" \
 		. output
-	ninja -C output
+	meson compile -C output
+}
+
+check() {
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C output install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+}
+
+dev() {
+	default_dev
+
+	# Support for debugging.
+	amove usr/share/gdb
+	amove usr/share/gstreamer-*/gdb
+
+	# Unit test libraries.
+	amove usr/bin/gst-tester-*
+	amove usr/lib/libgstcheck-*.so.*
+	amove usr/lib/girepository-1.0/GstCheck-*.typelib
+}
+
+doc() {
+	default_doc
+	replaces="${pkgname}1-doc"
 }
 
 tools() {
 	pkgdesc="Tools for GStreamer streaming media framework"
 	# gst-feedback needs this
 	depends="pkgconfig"
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+
+	amove usr/bin
 }
 
-doc() {
-	default_doc
-	replaces="${pkgname}1-doc"
+ptp_helper() {
+	pkgdesc="$pkgdesc (ptp helper)"
+	install_if="$pkgname=$pkgver-r$pkgrel"
+
+	amove usr/libexec/gstreamer-*/gst-ptp-helper
 }
 
-sha512sums="a8dcdb452a88f411676e54016fcf83149068b2f0b60422bebdbc81220078c61c415512006010ba0299df81ffb59853695c3ce00580f8fc46a079f6aaaa42609f  gstreamer-1.16.2.tar.xz"
+sha512sums="
+8976cebd2cbac3ef31ee6163d2c5264be7d10d54ab9fe6f0b2317d7d0380420ef2378e1b476af09f1e6b203e3eafcda88fc08bb2f550a6f411d8670dec04843e  gstreamer-1.22.11.tar.xz
+"
diff --git a/main/gtest/APKBUILD b/main/gtest/APKBUILD
index 62d78346ef5..b6a306d5075 100644
--- a/main/gtest/APKBUILD
+++ b/main/gtest/APKBUILD
@@ -1,52 +1,51 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=gtest
-pkgver=1.10.0
-pkgrel=1
+pkgver=1.14.0
+pkgrel=2
 pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit)"
 url="https://github.com/google/googletest"
 arch="all"
-options="!check"  # googletest-death-test-test hangs
 license="BSD-3-Clause"
-depends_dev="${pkgname}=$pkgver-r${pkgrel} gmock=$pkgver-r${pkgrel} cmake"
-makedepends="$depends_dev python3-dev"
-subpackages="$pkgname-dev gmock"
-source="$pkgname-$pkgver.tar.gz::https://github.com/google/googletest/archive/release-$pkgver.tar.gz
-	gtest-1.8.1-libversion.patch
-	gtest-1.8.1-null-pointer.patch" # https://src.fedoraproject.org/rpms/gtest/tree/master
-
-builddir="$srcdir"/googletest-release-$pkgver
-
-prepare() {
-	# fixup version as they are never correct
-	sed -E "s|(GOOGLETEST_VERSION) [0-9\\.]+|\\1 ${pkgver}|" -i CMakeLists.txt
-}
+depends_dev="$pkgname=$pkgver-r$pkgrel gmock=$pkgver-r$pkgrel"
+makedepends="$depends_dev cmake python3-dev samurai"
+subpackages="$pkgname-dev gmock $pkgname-src"
+source="$pkgname-$pkgver.tar.gz::https://github.com/google/googletest/archive/refs/tags/v$pkgver.tar.gz"
+builddir="$srcdir/googletest-$pkgver"
 
 build() {
-	cmake -B build . \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_SHARED_LIBS=ON \
 		-DPYTHON_EXECUTABLE=python3 \
-		-Dgtest_build_tests=ON
-	make -C build
+		-Dgtest_build_tests=ON \
+		-DBUILD_GMOCK=ON
+	cmake --build build
 }
 
 check() {
-	make -C build test
+	# fails of x86
+	ctest --test-dir build -E "(googletest-port-test|googletest-printers-test)"
 }
 
 package() {
-	make -C build DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --build build --target install
 	find "$pkgdir" -name '*.pump' -print -delete
 }
 
 gmock() {
 	pkgdesc="Google Mock - A library for writing and using C++ mock classes"
 	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgmock*.so "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libgmock*.so* "$subpkgdir"/usr/lib/
+}
+
+src() {
+	arch="noarch"
+	mkdir -p "$subpkgdir"/usr/src/$pkgname/src
+	mv  "$builddir"/googletest/src/* "$subpkgdir"/usr/src/$pkgname/src
 }
 
-sha512sums="bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9  gtest-1.10.0.tar.gz
-fd53e4a703c39cf4f1bc2eec2fac6c567e583d5e5a2ab4b52700ead77caf4f4903c4d32b8b25b983c5f650fc2b1e835fdf124b04a971705f42a707a42b34a99e  gtest-1.8.1-libversion.patch
-afa75f975d8aed453c901245dae753939958d8b72e3e5c52995efe7980f44de4fd1ea08f1b0a4cc927443d858de0a1fe34a919512ce05ae443bfb9600b08f029  gtest-1.8.1-null-pointer.patch"
+sha512sums="
+765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c  gtest-1.14.0.tar.gz
+"
diff --git a/main/gtest/gtest-1.8.1-libversion.patch b/main/gtest/gtest-1.8.1-libversion.patch
deleted file mode 100644
index 08904c1749e..00000000000
--- a/main/gtest/gtest-1.8.1-libversion.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
-index 8a8de1f..3d86a59 100644
---- a/googlemock/CMakeLists.txt
-+++ b/googlemock/CMakeLists.txt
-@@ -109,8 +109,10 @@ if (MSVC)
- else()
-   cxx_library(gmock "${cxx_strict}" src/gmock-all.cc)
-   target_link_libraries(gmock PUBLIC gtest)
-+  set_target_properties(gmock PROPERTIES VERSION ${GOOGLETEST_VERSION})
-   cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc)
-   target_link_libraries(gmock_main PUBLIC gmock)
-+  set_target_properties(gmock_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
- endif()
- # If the CMake version supports it, attach header directory information
- # to the targets for when we are part of a parent build (ie being pulled
-diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
-index 9ee7940..8099130 100644
---- a/googletest/CMakeLists.txt
-+++ b/googletest/CMakeLists.txt
-@@ -131,7 +131,9 @@ endif()
- # are used for other targets, to ensure that gtest can be compiled by a user
- # aggressive about warnings.
- cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
-+set_target_properties(gtest PROPERTIES VERSION ${GOOGLETEST_VERSION})
- cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
-+set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
- # If the CMake version supports it, attach header directory information
- # to the targets for when we are part of a parent build (ie being pulled
- # in via add_subdirectory() rather than being a standalone build).
diff --git a/main/gtest/gtest-1.8.1-null-pointer.patch b/main/gtest/gtest-1.8.1-null-pointer.patch
deleted file mode 100644
index d062baca40c..00000000000
--- a/main/gtest/gtest-1.8.1-null-pointer.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
-index 96b07c6..4af3e5a 100644
---- a/googletest/src/gtest.cc
-+++ b/googletest/src/gtest.cc
-@@ -2693,10 +2693,12 @@ void TestInfo::Run() {
-     test->Run();
-   }
- 
-+  if (test != NULL) {
-     // Deletes the test object.
-     impl->os_stack_trace_getter()->UponLeavingGTest();
-     internal::HandleExceptionsInMethodIfSupported(
-         test, &Test::DeleteSelf_, "the test fixture's destructor");
-+  }
- 
-   result_.set_elapsed_time(internal::GetTimeInMillis() - start);
- 
diff --git a/main/gtk+/APKBUILD b/main/gtk+/APKBUILD
deleted file mode 100644
index f980b36cdf3..00000000000
--- a/main/gtk+/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor:
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gtk+
-pkgver=2.24.31
-pkgrel=1
-pkgdesc="metapackage for GTK+ runtime and development"
-url="https://www.gtk.org/"
-arch="all"
-license="LGPL-2.0-or-later"
-options="!check"
-depends="gtk+2.0>=$pkgver"
-subpackages="$pkgname-dev"
-
-dev() {
-	depends="gtk+2.0-dev"
-	mkdir -p "$subpkgdir"
-}
-
-package() {
-	mkdir -p "$pkgdir"
-}
-
diff --git a/main/gtk+2.0/APKBUILD b/main/gtk+2.0/APKBUILD
deleted file mode 100644
index 5c99a6a4a35..00000000000
--- a/main/gtk+2.0/APKBUILD
+++ /dev/null
@@ -1,109 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=gtk+2.0
-pkgver=2.24.32
-pkgrel=1
-_subpkg=gtk-update-icon-cache
-pkgdesc="The GTK+ Toolkit (v2)"
-url="https://www.gtk.org/"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-triggers="$_subpkg.trigger=/usr/share/icons/*"
-arch="all"
-options="!check"  # Requires xvfb, resulting in eventual circular dependency
-license="LGPL-2.0+"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $_subpkg:icon_cache"
-depends="shared-mime-info gtk-update-icon-cache"
-
-replaces="gtk+"
-replaces_dev="gtk+-dev"
-replaces_doc="gtk+-doc"
-
-depends_dev="
-	atk-dev
-	cairo-dev
-	intltool
-	libxdamage-dev
-	pango-dev
-	"
-# we add hicolor-icon-theme because the subpackage gtk-update-icon-cache
-# needs it. We need to force hicolor-icon-cache to be built before gtk+.2.0
-makedepends="
-	autoconf automake libtool
-	$depends_dev
-	cups-dev
-	expat-dev
-	gdk-pixbuf-dev
-	gettext-dev
-	glib-dev
-	gnutls-dev
-	gobject-introspection-dev
-	gtk-doc
-	hicolor-icon-theme
-	libice-dev
-	libx11-dev
-	libxcomposite-dev
-	libxcursor-dev
-	libxext-dev
-	libxfixes-dev
-	libxrandr-dev
-	libxi-dev
-	zlib-dev"
-source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
-	xid-collision-debug.patch
-	gtk2-fixdso.patch
-	"
-
-builddir="$srcdir"/gtk+-$pkgver
-
-prepare() {
-	cd "$builddir"
-	default_prepare
-	libtoolize --force \
-		&& aclocal -I m4 \
-		&& autoconf \
-		&& automake --add-missing
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-xinput=yes \
-		--without-libjasper \
-		--with-included-loaders=png \
-		--with-gdktarget=x11 \
-		--enable-cups \
-		--enable-man
-	# https://bugzilla.gnome.org/show_bug.cgi?id=655517
-	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-dev() {
-	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/share/
-	mv "$pkgdir"/usr/share/gtk-2.0 "$subpkgdir"/usr/share/
-	default_dev
-	replaces="gtk+2.0"
-	mv "$pkgdir"/usr/bin/gtk-builder-convert \
-		"$pkgdir"/usr/bin/gtk-demo \
-		"$subpkgdir"/usr/bin
-}
-
-icon_cache() {
-	depends="hicolor-icon-theme"
-
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/"$_subpkg" "$subpkgdir"/usr/bin
-}
-
-sha512sums="8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696  gtk+-2.24.32.tar.xz
-89e3223c86731a76b12d39245f1ec4cf8b4860ab1d11d74a10e5deb0db302f20b4bb5d9034da1d8aeb96369dbdeddcdd2f28943270dc501476c694562b960159  xid-collision-debug.patch
-95f28633a5164a2a9fec45ee1aa80bd1c07e0c5a7ac8d770b9c74af0909b7286b823eb634aa384cad609dc8799d2e6c9e8392c2732b9093076fdf94b4f6878b7  gtk2-fixdso.patch"
diff --git a/main/gtk+2.0/gtk+2.0.post-deinstall b/main/gtk+2.0/gtk+2.0.post-deinstall
deleted file mode 100644
index ea39aa8bf8c..00000000000
--- a/main/gtk+2.0/gtk+2.0.post-deinstall
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# since we depend on coreutils and busybox trigger has not yet run, we
-# use busybox directly as workaround
-/bin/busybox rm -f etc/gtk-2.0/gtk.immodules
-/bin/busybox rm -f etc/gtk-2.0/gdk-pixbuf.loaders
-
diff --git a/main/gtk+2.0/gtk+2.0.post-install b/main/gtk+2.0/gtk+2.0.post-install
deleted file mode 100644
index 80444cfb934..00000000000
--- a/main/gtk+2.0/gtk+2.0.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-usr/bin/gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders
-
diff --git a/main/gtk+2.0/gtk+2.0.post-upgrade b/main/gtk+2.0/gtk+2.0.post-upgrade
deleted file mode 120000
index 5bd77f90dba..00000000000
--- a/main/gtk+2.0/gtk+2.0.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-gtk+2.0.post-install
\ No newline at end of file
diff --git a/main/gtk+2.0/gtk-update-icon-cache.trigger b/main/gtk+2.0/gtk-update-icon-cache.trigger
deleted file mode 100644
index f247335938d..00000000000
--- a/main/gtk+2.0/gtk-update-icon-cache.trigger
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-for i in "$@"; do
-	if ! [ -e "$i" ]; then
-		continue
-	fi
-	gtk-update-icon-cache -q -t -f $i
-done
-
diff --git a/main/gtk+2.0/gtk2-fixdso.patch b/main/gtk+2.0/gtk2-fixdso.patch
deleted file mode 100644
index 3ea784699e7..00000000000
--- a/main/gtk+2.0/gtk2-fixdso.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gtk+-2.24.8/gtk/Makefile.am.orig	2012-02-01 11:14:25.468115547 +0000
-+++ gtk+-2.24.8/gtk/Makefile.am	2012-02-01 11:14:57.920116650 +0000
-@@ -904,10 +904,10 @@
- libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources)
- libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources)
- 
--libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
-+libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) -lgmodule-2.0
- libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
- libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
--libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
-+libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) -lgmodule-2.0
- 
- libgtk_x11_2_0_la_LIBADD = $(libadd)
- libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
diff --git a/main/gtk+2.0/xid-collision-debug.patch b/main/gtk+2.0/xid-collision-debug.patch
deleted file mode 100644
index d61238c3b27..00000000000
--- a/main/gtk+2.0/xid-collision-debug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gtk+-2.18.3/gdk/x11/gdkxid.c	2009-06-19 04:59:18.000000000 +0200
-+++ gtk+-2.18.3/gdk/x11/gdkxid.c.new	2009-07-22 11:30:12.000000000 +0200
-@@ -56,10 +56,10 @@
-   if (!display_x11->xid_ht)
-     display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
- 					    (GEqualFunc) gdk_xid_equal);
--
-+/*
-   if (g_hash_table_lookup (display_x11->xid_ht, xid))
-     g_warning ("XID collision, trouble ahead");
--
-+*/
-   g_hash_table_insert (display_x11->xid_ht, xid, data);
- }
- 
diff --git a/main/gtk+3.0/10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch b/main/gtk+3.0/10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch
deleted file mode 100644
index 22517a796cf..00000000000
--- a/main/gtk+3.0/10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/gdk/gdkseatdefault.c b/gdk/gdkseatdefault.c
-index ce4bdc82d2..9650f4b121 100644
---- a/gdk/gdkseatdefault.c
-+++ b/gdk/gdkseatdefault.c
-@@ -134,22 +134,9 @@ gdk_seat_default_grab (GdkSeat                *seat,
- 
-   if (capabilities & GDK_SEAT_CAPABILITY_ALL_POINTING)
-     {
--      /* ALL_POINTING spans 3 capabilities; get the mask for the ones we have */
--      GdkEventMask pointer_evmask = 0;
--
--      /* We let tablet styli take over the pointer cursor */
--      if (capabilities & (GDK_SEAT_CAPABILITY_POINTER |
--                          GDK_SEAT_CAPABILITY_TABLET_STYLUS))
--        {
--          pointer_evmask |= POINTER_EVENTS;
--        }
--
--      if (capabilities & GDK_SEAT_CAPABILITY_TOUCH)
--        pointer_evmask |= TOUCH_EVENTS;
--
-       status = gdk_device_grab (priv->master_pointer, window,
-                                 GDK_OWNERSHIP_NONE, owner_events,
--                                pointer_evmask, cursor,
-+                                POINTER_EVENTS, cursor,
-                                 evtime);
-     }
- 
diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD
index fbb9eb723a7..66d673136a3 100644
--- a/main/gtk+3.0/APKBUILD
+++ b/main/gtk+3.0/APKBUILD
@@ -1,48 +1,51 @@
 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gtk+3.0
-pkgver=3.24.16
+pkgver=3.24.41
 pkgrel=0
 pkgdesc="The GTK+ Toolkit (v3)"
 url="https://www.gtk.org/"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
+install="$pkgname.post-deinstall"
+triggers="$pkgname.trigger=/usr/lib/gtk-3.0/immodules:/usr/lib/gtk-3.0/*/immodules gtk-update-icon-cache.trigger=/usr/share/icons/*"
 arch="all"
 license="LGPL-2.1-or-later"
-options="!check" # Most glade tests fail :c
-subpackages="$pkgname-demo $pkgname-dev $pkgname-doc $pkgname-lang $pkgname-dbg"
+options="!check" # checkdepends in community
+subpackages="
+	$pkgname-dbg
+	$pkgname-demo
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-lang
+	gtk-update-icon-cache:icon_cache
+	"
 depends="shared-mime-info gtk-update-icon-cache"
-
-replaces="gtk+"
-
 depends_dev="
-	atk-dev
 	gdk-pixbuf-dev
 	glib-dev
 	libepoxy-dev
 	libxext-dev
 	libxi-dev
 	libxinerama-dev
-	wayland-protocols
+	libxkbcommon-dev
 	wayland-libs-client
 	wayland-libs-cursor
-	libxkbcommon-dev
+	wayland-protocols
 	"
+_icon_cache_depends="hicolor-icon-theme"
 makedepends="
 	$depends_dev
+	$_icon_cache_depends
+	at-spi2-core-dev
+	cairo-dev
 	cups-dev
 	expat-dev
+	fontconfig-dev
 	gettext-dev
-	gnutls-dev
 	gobject-introspection-dev
+	hicolor-icon-theme
+	iso-codes-dev
 	libice-dev
-	tiff-dev
-	zlib-dev
-	at-spi2-atk-dev
-	cairo-dev
-	fontconfig-dev
-	pango-dev
-	wayland-dev
 	libx11-dev
 	libxcomposite-dev
 	libxcursor-dev
@@ -50,74 +53,83 @@ makedepends="
 	libxfixes-dev
 	libxrandr-dev
 	meson
-	gtk-doc
-	iso-codes-dev
+	pango-dev
+	tiff-dev
+	wayland-dev
+	zlib-dev
 	"
 checkdepends="
-	xvfb-run
 	ibus
-	librsvg
-	gdk-pixbuf
+	xvfb-run
 	"
 source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
-	10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch
 	"
-
-
 builddir="$srcdir/gtk+-$pkgver"
 
 build() {
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--buildtype=plain \
+	CFLAGS="$CFLAGS -O2" \
+	CXXFLAGS="$CXXFLAGS -O2" \
+	abuild-meson \
+		-Db_lto=true \
 		-Dman=true \
-		-Dgtk_doc=true \
+		-Dgtk_doc=false \
 		-Dbroadway_backend=true \
+		-Dtests="$(want_check && echo true || echo false)" \
 		output
-	ninja -C output
+	meson compile -C output
 }
 
 check() {
-	xvfb-run ninja -C output test
+	xvfb-run -a meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C output install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+}
 
-	# use gtk-update-icon-cache from gtk+2.0 for now
-	rm -f "$pkgdir"/usr/bin/gtk-update-icon-cache
-	rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1
+dev() {
+	default_dev
+
+	amove usr/bin/gtk-builder-tool \
+		usr/bin/gtk-encode-symbolic-svg \
+		usr/bin/gtk-query-settings
+}
+
+doc() {
+	default_doc
+	# gtk-update-icon-cache
+	replaces="gtk+2.0-doc"
 }
 
 demo() {
 	pkgdesc="$pkgdesc (demonstration application)"
-	install -Dm755 "$pkgdir"/usr/bin/gtk3-demo \
-				   "$pkgdir"/usr/bin/gtk3-widget-factory \
-				   "$pkgdir"/usr/bin/gtk3-demo-application \
-				   -t "$subpkgdir"/usr/bin
-	install -Dm644 "$pkgdir"/usr/share/gtk-3.0/gtkbuilder.rng \
-				   -t "$subpkgdir"/usr/share/gtk-3.0
-	install -Dm644 "$pkgdir"/usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml \
-				   -t "$subpkgdir"/usr/share/glib-2.0/schemas
-	install -Dm644 "$pkgdir"/usr/share/applications/gtk3-widget-factory.desktop \
-				   "$pkgdir"/usr/share/applications/gtk3-demo.desktop \
-				   -t "$subpkgdir"/usr/share/applications
-	mkdir -p "$subpkgdir"/usr/share
-	mv "$pkgdir"/usr/share/icons "$subpkgdir"/usr/share
+	amove usr/bin/gtk3-demo \
+		usr/bin/gtk3-demo-application \
+		usr/bin/gtk3-icon-browser \
+		usr/bin/gtk3-widget-factory \
+		usr/share/gtk-3.0/gtkbuilder.rng \
+		usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml \
+		usr/share/applications/gtk3-demo.desktop \
+		usr/share/applications/gtk3-icon-browser.desktop \
+		usr/share/applications/gtk3-widget-factory.desktop \
+		usr/share/icons
 }
 
-dev() {
-	replaces="gtk+-dev"
-	default_dev
+lang() {
+	default_lang
+
+	amove usr/share/gtk-3.0/emoji
 }
 
-doc() {
-	replaces="gtk+-doc"
-	default_doc
+icon_cache() {
+	depends="$_icon_cache_depends"
+	replaces="gtk4.0" # gtk4-update-icon-cache
+
+	# provide gtk4 symlink too
+	amove usr/bin/gtk-update-icon-cache
+	ln -s gtk-update-icon-cache "$subpkgdir"/usr/bin/gtk4-update-icon-cache
 }
 
-sha512sums="181d31dea038016357cd0eba5b9e8a17056bc061f4ae2ebc713bceee46cd30787993cec463aae658faddc57b9071549fa196f6a2a1f67c314d99e4365f50a0cb  gtk+-3.24.16.tar.xz
-e4ea76484b70bd9beb65b2964bbcff3b3f78f5f6fe70b12309a7721ca134e3735e8aaac09803f93b393a6130a703f8f346c0df89ad45d18c580dac1e0e922276  10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch"
+sha512sums="
+aaf061d846fac592e71089feace302bdef1bb64bb2ad6ff30d51d90000da9084cad2fa5bf88cb75adcd789c911d94231ae60a2ca7cf97a2f5720687369a3da98  gtk+-3.24.41.tar.xz
+"
diff --git a/main/gtk+3.0/gtk+3.0.post-deinstall b/main/gtk+3.0/gtk+3.0.post-deinstall
index b1e3f7a6835..d9cd8e9521d 100644
--- a/main/gtk+3.0/gtk+3.0.post-deinstall
+++ b/main/gtk+3.0/gtk+3.0.post-deinstall
@@ -1,5 +1,3 @@
 #!/bin/sh
 
 rm -f etc/gtk-3.0/gtk.immodules
-rm -f etc/gtk-3.0/gdk-pixbuf.loaders
-
diff --git a/main/gtk+3.0/gtk+3.0.post-install b/main/gtk+3.0/gtk+3.0.post-install
deleted file mode 100644
index 0570816c750..00000000000
--- a/main/gtk+3.0/gtk+3.0.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-usr/bin/gtk-query-immodules-3.0 > etc/gtk-3.0/gtk.immodules
-usr/bin/gdk-pixbuf-query-loaders > etc/gtk-3.0/gdk-pixbuf.loaders
-
diff --git a/main/gtk+3.0/gtk+3.0.post-upgrade b/main/gtk+3.0/gtk+3.0.post-upgrade
deleted file mode 120000
index f313df3d117..00000000000
--- a/main/gtk+3.0/gtk+3.0.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-gtk+3.0.post-install
\ No newline at end of file
diff --git a/main/gtk+3.0/gtk+3.0.trigger b/main/gtk+3.0/gtk+3.0.trigger
new file mode 100644
index 00000000000..5ecc37a936d
--- /dev/null
+++ b/main/gtk+3.0/gtk+3.0.trigger
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/bin/gtk-query-immodules-3.0 --update-cache
diff --git a/main/gtk+3.0/gtk-update-icon-cache.trigger b/main/gtk+3.0/gtk-update-icon-cache.trigger
new file mode 100644
index 00000000000..b3c88c75b3b
--- /dev/null
+++ b/main/gtk+3.0/gtk-update-icon-cache.trigger
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+for i in "$@"; do
+	if ! [ -e "$i" ]; then
+		continue
+	fi
+	gtk-update-icon-cache -q -t -f "$i"
+	rmdir "$1" 2>/dev/null || :
+done
diff --git a/main/gtk-doc/APKBUILD b/main/gtk-doc/APKBUILD
index 04a49caf866..8fb860e363d 100644
--- a/main/gtk-doc/APKBUILD
+++ b/main/gtk-doc/APKBUILD
@@ -1,27 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gtk-doc
-pkgver=1.32
-pkgrel=0
+pkgver=1.33.2
+pkgrel=3
 pkgdesc="Documentation tool for public library API"
-url="https://www.gtk.org/gtk-doc/"
+url="https://wiki.gnome.org/DocumentationProject/GtkDoc"
 arch="noarch"
 license="GPL-2.0-or-later AND GFDL-1.1-or-later"
-depends="docbook-xsl python3 py3-six pkgconf glib-dev py3-pygments"
+depends="docbook-xsl python3 pkgconf glib-dev py3-pygments"
 makedepends="rarian-dev gettext autoconf automake libtool"
 checkdepends="bc"
-source="https://download.gnome.org/sources/gtk-doc/$pkgver/gtk-doc-$pkgver.tar.xz"
+source="https://download.gnome.org/sources/gtk-doc/${pkgver%.*}/gtk-doc-$pkgver.tar.xz"
 
 # it does not seem to be possible to disable tests of pdf which requires dblatex or fop
 # disable checks for now
 options="!check"
 
 prepare() {
-	cd "$builddir"
+	default_prepare
 	autoreconf -vif
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -31,13 +30,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28  gtk-doc-1.32.tar.xz"
+sha512sums="
+f50f68ab6b4bc59f55e84b49c1481f05700171cbf79eca9ba8f3a142a30a4ba88fe096983ebb8d117a9ef8bcea40934674096683d956f5c54cae457d31f651ab  gtk-doc-1.33.2.tar.xz
+"
diff --git a/main/guile/0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch b/main/guile/0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
index cbe194dfd51..60048127280 100644
--- a/main/guile/0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
+++ b/main/guile/0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
@@ -14,7 +14,7 @@ diff --git a/test-suite/tests/threads.test b/test-suite/tests/threads.test
 index 8178120..7d180de 100644
 --- a/test-suite/tests/threads.test
 +++ b/test-suite/tests/threads.test
-@@ -412,8 +412,10 @@
+@@ -389,8 +389,10 @@
  
              (gc) (gc)
              (let ((m (g)))
diff --git a/main/guile/APKBUILD b/main/guile/APKBUILD
index 9193fa1a97d..f8e93f74de9 100644
--- a/main/guile/APKBUILD
+++ b/main/guile/APKBUILD
@@ -5,41 +5,101 @@
 # reverted at any time, at the core team's discretion.
 
 pkgname=guile
-pkgver=2.0.14
+pkgver=3.0.9
 pkgrel=0
-pkgdesc="Guile is a portable, embeddable Scheme implementation written in C"
+pkgdesc="portable, embeddable Scheme implementation written in C"
 url="https://www.gnu.org/software/guile/"
 arch="all"
-options="!check"  # Requires actual LC_COLLATE and LC_MONETARY support.
-license="LGPL-3.0+, GPL-3.0+"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-makedepends="gmp-dev libtool ncurses-dev texinfo libunistring-dev libffi-dev
-	gc-dev"
-depends=
-depends_dev="guile gc-dev"
-install=
-source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
+license="LGPL-3.0-or-later AND GPL-3.0-or-later"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-readline"
+depends_dev="
+	$pkgname=$pkgver-r$pkgrel
+	gc-dev
+	gmp-dev
+	"
+makedepends="
+	$depends_dev
+	libffi-dev
+	libtool
+	libunistring-dev
+	ncurses-dev
+	readline-dev
+	texinfo
+	"
+source="https://ftp.gnu.org/gnu/guile/guile-$pkgver.tar.gz
 	0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
+	failing-encoding-test.patch
+	failing-filesys-test.patch
 	"
 
-builddir="$srcdir"/$pkgname-$pkgver
+case "$CARCH" in
+# Otherwise we'll get strip: Unable to recognise the format of the input file
+x86|x86_64|loongarch64) options="$options !strip" ;;
+esac
+
+prepare() {
+	# remove sticky bit. it breaks the test suite
+	find . -type d -exec chmod g-s {} \;
+
+	default_prepare
+
+	# remove tests that don't pass with musl libc.
+	# most of them fail because musl only supports UTF-8.
+	rm -f \
+		./test-suite/tests/time.test \
+		./test-suite/tests/encoding-escapes.test \
+		./test-suite/tests/i18n.test \
+		./test-suite/tests/encoding-iso88597.test \
+		./test-suite/tests/iconv.test \
+		./test-suite/tests/suspendable-ports.test \
+		./test-suite/tests/r6rs-ports.test
+
+	case "$CARCH" in
+	x86)
+		# probably needs sse2?
+		rm -f ./test-suite/tests/numbers.test
+		;;
+	esac
+}
 
 build() {
-	cd "$builddir"
+	# programming language
+	CFLAGS="$CFLAGS -g0 -O2" \
+	CXXFLAGS="$CXXFLAGS -g0 -O2" \
 	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
+		--build="$CBUILD" \
+		--host="$CHOST" \
 		--prefix=/usr \
 		--disable-error-on-warning \
 		--disable-static
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	rm "$pkgdir"/usr/lib/charset.alias
 }
 
-sha512sums="d69c9bdf589fedcc227f3203012f6ed11c327cef3a0147d8e016fe276abecdb4272625efe1d0c7aa68219fe8f29bbced44089a4b479e4eafe01976c6b2b83633  guile-2.0.14.tar.gz
-b1c309cc07830ff1741ef88857f8099187b449580e8d57862886abc367ef1accc5a35636d81eee09247f13d3a751cdc8909fdea05368d3d509bd2039ce06d078  0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch"
+doc() {
+	default_doc
+	license="GFDL-1.3-or-later"
+}
+
+readline() {
+	amove \
+		usr/lib/guile/3.0/ccache/ice-9/readline.go \
+		usr/lib/guile/3.0/extensions/guile-readline.so \
+		usr/lib/guile/3.0/extensions/guile-readline.so.0 \
+		usr/lib/guile/3.0/extensions/guile-readline.so.0.0.0 \
+		usr/share/guile/3.0/ice-9/readline.scm
+}
+
+sha512sums="
+6fd14f0860c7f5b7a9b53c43a60c6a7ca53072684ddc818cd10c720af2c5761ef110b29af466b89ded884fb66d66060894b14e615eaebee8844c397932d05fa2  guile-3.0.9.tar.gz
+54a9fe0fa2ea83da7ae61f96612e3e653ec80f60ab41d1995dc44bd05c7ff68cc4fab36a655e8835c4ab1cf0966765a299ef2d73cb9f69d3ef955e6aeaa8062d  0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
+257b32dda7a9195f14dadb00e2699fa7711198087f78cc100b768cf9d5bb8a0d69fb5b84003a893e05c63b7f6fb9f550d3991fb41d840d9826214529d20610c1  failing-encoding-test.patch
+810e4afc6b097c169672e23725426a9a523c1bdeabe7770e3dfb9ad0b2e0c0f93c7207e1d34b1190f71ae8518a488ecae3f114094db5aa74f086d42ae7a30381  failing-filesys-test.patch
+"
diff --git a/main/guile/failing-encoding-test.patch b/main/guile/failing-encoding-test.patch
new file mode 100644
index 00000000000..ae262bacc68
--- /dev/null
+++ b/main/guile/failing-encoding-test.patch
@@ -0,0 +1,26 @@
+The set-port-encoding! procedure does not work properly on musl
+as musl only supports UTF-8 text encoding.
+
+diff -upr guile-3.0.8.orig/test-suite/tests/reader.test guile-3.0.8/test-suite/tests/reader.test
+--- guile-3.0.8.orig/test-suite/tests/reader.test	2022-07-22 17:32:35.731931222 +0200
++++ guile-3.0.8/test-suite/tests/reader.test	2022-07-22 17:33:06.671996144 +0200
+@@ -405,19 +405,6 @@
+                 (string->list s2)
+                 (list #\" #\\ #\b #\\ #\x #\1 #\8 #\; #\space #\0 #\@ #\"))))
+ 
+-    (pass-if "display R6RS string escapes"
+-      (string=?
+-       (with-read-options '(r6rs-hex-escapes)
+-         (lambda ()
+-           (let ((pt (open-output-string))
+-                 (s1 (apply string (map integer->char
+-                                        '(#xFF #x100 #xFFF #x1000 #xFFFF #x10000)))))
+-             (set-port-encoding! pt "ASCII")
+-             (set-port-conversion-strategy! pt 'escape)
+-             (display s1 pt)
+-             (get-output-string pt))))
+-       "\\xff;\\x100;\\xfff;\\x1000;\\xffff;\\x10000;"))
+-
+     (pass-if "one-digit hex escape"
+       (eqv? (with-input-from-string "#\\xA" read)
+             (integer->char #x0A)))
diff --git a/main/guile/failing-filesys-test.patch b/main/guile/failing-filesys-test.patch
new file mode 100644
index 00000000000..a64df5fe362
--- /dev/null
+++ b/main/guile/failing-filesys-test.patch
@@ -0,0 +1,24 @@
+diff --git a/test-suite/tests/filesys.test b/test-suite/tests/filesys.test
+index 45e77c8..a887109 100644
+--- a/test-suite/tests/filesys.test
++++ b/test-suite/tests/filesys.test
+@@ -457,19 +457,6 @@
+         (pass-if-equal "file name of symlink" (test-file)
+           (readlink (test-symlink)))
+ 
+-        (pass-if-equal "port representing a symlink" (test-file)
+-          (let ()
+-            (unless (and (provided? 'readlink-port)
+-                         (defined? 'O_NOFOLLOW)
+-                         (defined? 'O_PATH)
+-                         (not (= 0 O_NOFOLLOW))
+-                         (not (= 0 O_PATH)))
+-              (throw 'unsupported))
+-            (define port (open (test-symlink) (logior O_NOFOLLOW O_PATH)))
+-            (define points-to (false-if-exception (readlink port)))
+-            (close-port port)
+-            points-to))
+-
+         (pass-if-exception "not a port or file name" exception:wrong-type-arg
+           (readlink '(stuff)))))
+ 
diff --git a/main/gummiboot/APKBUILD b/main/gummiboot/APKBUILD
index bebecb50928..f6a50f56e74 100644
--- a/main/gummiboot/APKBUILD
+++ b/main/gummiboot/APKBUILD
@@ -1,45 +1,54 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gummiboot
 pkgver=48.1
-pkgrel=0
+pkgrel=7
 pkgdesc="Simple EFI Boot Manager"
-url="http://freedesktop.org/wiki/Software/gummiboot"
-arch="x86 x86_64"
+url="https://cgit.freedesktop.org/gummiboot/"
+arch="x86 x86_64 aarch64"
 license="LGPL-2.0-or-later"
-depends=""
-depends_dev="util-linux-dev"
-makedepends="$depends_dev gnu-efi-dev autoconf automake docbook-xsl libxslt"
-install=""
-subpackages="$pkgname-doc"
+depends="$pkgname-efistub=$pkgver-r$pkgrel"
+makedepends="util-linux-dev gnu-efi-dev autoconf automake docbook-xsl libxslt"
+subpackages="$pkgname-doc $pkgname-efistub"
 #source="https://cgit.freedesktop.org/gummiboot/snapshot/gummiboot-$pkgver.tar.gz"
 source="https://dev.alpinelinux.org/archive/gummiboot/gummiboot-$pkgver.tar.gz
 	gummiboot-aarch64-support.patch
 	sysmacros.patch
+	remove-conflicts.patch
 	"
-
-builddir="$srcdir"/gummiboot-$pkgver
+options="!check"
 
 prepare() {
-	cd "$builddir"
-	default_prepare || return 1
-	./autogen.sh || return 1
+	default_prepare
+	./autogen.sh
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make -j1 EFI_CFLAGS="$CFLAGS -std=gnu89"
+		--prefix=/usr
+	# new gnu-efi has stddef.h include which relies on it coming from syste.,
+	# this uses -nostdinc and doesn't add it. these cflags come last, so it still
+	# shouldn't shadow the efi incdir.
+	make -j1 EFI_CFLAGS="$CFLAGS -I/usr/include -std=gnu89"
 }
 
 package() {
-	cd "$builddir"
-	make install DESTDIR="$pkgdir" || return 1
+	make install DESTDIR="$pkgdir"
+}
+
+efistub() {
+	pkgdesc="Linux UEFI stub from the gummiboot project"
+	depends=
+	provides="efistub"
+	provider_priority=100 # highest
+
+	amove usr/lib/gummiboot/*.efi.stub
 }
 
-sha512sums="a536db10ee384fa2cd38d22bd43f87215501c38471612a1d30986748d645d970e67b3f3d38fc9d6b53fe8532ec18283690f88d77b056dd737db5efb50bf63293  gummiboot-48.1.tar.gz
+sha512sums="
+a536db10ee384fa2cd38d22bd43f87215501c38471612a1d30986748d645d970e67b3f3d38fc9d6b53fe8532ec18283690f88d77b056dd737db5efb50bf63293  gummiboot-48.1.tar.gz
 6acc971c59b917616d75f5935859d109efff14c55b8fb26075ee89b6e4141f1c91708c1fc77f0acb2239d9030f4b350eaf1dac59ebb37e7a9ae5682eb52687cf  gummiboot-aarch64-support.patch
-b16d5f68429acfd7ff7942ef6091455035645cb592b9f4b1424daff3245c584bf61c30a7d5eb236530c46226d67ba48f6496f6ae00de6c94a7c5e37f5bdc4831  sysmacros.patch"
+b16d5f68429acfd7ff7942ef6091455035645cb592b9f4b1424daff3245c584bf61c30a7d5eb236530c46226d67ba48f6496f6ae00de6c94a7c5e37f5bdc4831  sysmacros.patch
+2f48957253afdb05d1ec401a80383bc582543822fda2c2a30b8a9137481b6911194ac34c7da323414dd00234cd51b8f7803788360e747d325e192b71f9171f72  remove-conflicts.patch
+"
diff --git a/main/gummiboot/remove-conflicts.patch b/main/gummiboot/remove-conflicts.patch
new file mode 100644
index 00000000000..15dd48bc7da
--- /dev/null
+++ b/main/gummiboot/remove-conflicts.patch
@@ -0,0 +1,66 @@
+Done in a hurry to fix build with latest gnu-efi, this project is dead and was absorbed into systemd
+but there are still users of its EFISTUB file
+
+diff --git a/src/efi/console.c b/src/efi/console.c
+index 6206c80..42942ba 100644
+--- a/src/efi/console.c
++++ b/src/efi/console.c
+@@ -26,58 +26,8 @@
+ 
+ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL;
+ 
+-typedef EFI_STATUS (EFIAPI *EFI_INPUT_RESET_EX)(
+-        struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This;
+-        BOOLEAN ExtendedVerification;
+-);
+-
+ typedef UINT8 EFI_KEY_TOGGLE_STATE;
+ 
+-typedef struct {
+-        UINT32 KeyShiftState;
+-        EFI_KEY_TOGGLE_STATE KeyToggleState;
+-} EFI_KEY_STATE;
+-
+-typedef struct {
+-        EFI_INPUT_KEY Key;
+-        EFI_KEY_STATE KeyState;
+-} EFI_KEY_DATA;
+-
+-typedef EFI_STATUS (EFIAPI *EFI_INPUT_READ_KEY_EX)(
+-        struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This;
+-        EFI_KEY_DATA *KeyData;
+-);
+-
+-typedef EFI_STATUS (EFIAPI *EFI_SET_STATE)(
+-        struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This;
+-        EFI_KEY_TOGGLE_STATE *KeyToggleState;
+-);
+-
+-typedef EFI_STATUS (EFIAPI *EFI_KEY_NOTIFY_FUNCTION)(
+-        EFI_KEY_DATA *KeyData;
+-);
+-
+-typedef EFI_STATUS (EFIAPI *EFI_REGISTER_KEYSTROKE_NOTIFY)(
+-        struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This;
+-        EFI_KEY_DATA KeyData;
+-        EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction;
+-        VOID **NotifyHandle;
+-);
+-
+-typedef EFI_STATUS (EFIAPI *EFI_UNREGISTER_KEYSTROKE_NOTIFY)(
+-        struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This;
+-        VOID *NotificationHandle;
+-);
+-
+-typedef struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL {
+-        EFI_INPUT_RESET_EX Reset;
+-        EFI_INPUT_READ_KEY_EX ReadKeyStrokeEx;
+-        EFI_EVENT WaitForKeyEx;
+-        EFI_SET_STATE SetState;
+-        EFI_REGISTER_KEYSTROKE_NOTIFY RegisterKeyNotify;
+-        EFI_UNREGISTER_KEYSTROKE_NOTIFY UnregisterKeyNotify;
+-} EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL;
+-
+ EFI_STATUS console_key_read(UINT64 *key, BOOLEAN wait) {
+         EFI_GUID EfiSimpleTextInputExProtocolGuid = EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID;
+         static EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *TextInputEx;
diff --git a/main/gvpe/APKBUILD b/main/gvpe/APKBUILD
index bb7720cc5f5..953ca1f096f 100644
--- a/main/gvpe/APKBUILD
+++ b/main/gvpe/APKBUILD
@@ -2,14 +2,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gvpe
 pkgver=3.1
-pkgrel=0
+pkgrel=6
 pkgdesc="GNU Virtual Private Ethernet"
 url="http://software.schmorp.de/pkg/gvpe.html"
 arch="all"
-license="GPL-2.0"
-depends=""
-makedepends="openssl-dev libev-dev zlib-dev gmp-dev linux-headers"
-source="https://ftp.gnu.org/gnu/$pkgname/${pkgname}-${pkgver}.tar.gz
+license="GPL-2.0-or-later"
+makedepends="openssl-dev>3 libev-dev zlib-dev gmp-dev linux-headers"
+source="https://ftp.gnu.org/gnu/gvpe/gvpe-$pkgver.tar.gz
 	compile-fix.patch
 	musl-getopt_long.patch
 	gvpe.conf.example
@@ -17,12 +16,15 @@ source="https://ftp.gnu.org/gnu/$pkgname/${pkgname}-${pkgver}.tar.gz
 	gvpe.initd
 	if-up
 	"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
+options="!check"
 
-builddir="${srcdir}"/${pkgname}-${pkgver}
+prepare() {
+ 	default_prepare
+	update_config_guess
+}
 
 build() {
-	cd "${builddir}"
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -34,13 +36,12 @@ build() {
 }
 
 package() {
-	cd "${builddir}"
-	make DESTDIR="${pkgdir}" install
-	install -D -m0644 "${srcdir}"/gvpe.confd "${pkgdir}"/etc/conf.d/gvpe
-	install -D -m0644 "${srcdir}"/gvpe.conf.example \
-		"${pkgdir}"/etc/gvpe/gvpe.conf.example
-	install -D -m0755 "${srcdir}"/if-up "${pkgdir}"/etc/gvpe/if-up
-	install -D -m0755 "${srcdir}"/gvpe.initd "${pkgdir}"/etc/init.d/gvpe
+	make DESTDIR="$pkgdir" install
+	install -D -m0644 "$srcdir"/gvpe.confd "$pkgdir"/etc/conf.d/gvpe
+	install -D -m0644 "$srcdir"/gvpe.conf.example \
+		"$pkgdir"/etc/gvpe/gvpe.conf.example
+	install -D -m0755 "$srcdir"/if-up "$pkgdir"/etc/gvpe/if-up
+	install -D -m0755 "$srcdir"/gvpe.initd "$pkgdir"/etc/init.d/gvpe
 }
 
 sha512sums="4deeefb5b9773e3eb46f5fcbff1fe61e64824f7b29615b84b3415ff2a240071d5e19f00a6ecac5dd491a8dbf8c9636efc4a9cde943dbdba5ef4c6bc04597840a  gvpe-3.1.tar.gz
diff --git a/main/gyp/APKBUILD b/main/gyp/APKBUILD
new file mode 100644
index 00000000000..91884ff4374
--- /dev/null
+++ b/main/gyp/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: Alex Yam <alex@alexyam.com>
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer:
+pkgname=gyp
+pkgver=20230301
+_gitrev=c6d8b9f7ee355cff1531b0f369cd338a50baeb07
+pkgrel=3
+pkgdesc="Generate Your Projects Meta-Build system"
+options="!check" # Tests currently fail
+url="https://gyp.gsrc.io"
+arch="noarch"
+license="BSD-3-Clause"
+depends="python3 ninja py3-six"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+subpackages="$pkgname-pyc"
+source="$pkgname-$_gitrev.tar.gz::https://github.com/chromium/gyp/archive/$_gitrev.tar.gz
+	py3.8.patch
+	fips.patch
+	cmake.patch
+	"
+builddir="$srcdir/$pkgname-$_gitrev"
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
+}
+
+sha512sums="
+ce447cfe6310251ef0db3b2c73a9127762fd7096c4d0934740cca9298a77e4bd2476932b6cc18759d276d41973d14af9b34618c0fa493aac76c27b1a382f08c9  gyp-c6d8b9f7ee355cff1531b0f369cd338a50baeb07.tar.gz
+5ad7993ffc78421a87a4825394d704f651c5fa82dc971cefd2af9440ee2d6898b7f61276da92046ab2eca26d8320be848d9a3f65bfd18b98dd2a4ce06c78980d  py3.8.patch
+04bfc412a245e328d2cb2f9ca383fe31b0b3ae69ffad04cfbe21b882ef807ad0d89f807483eb18980ea41eccd111de1a99cb282f1b79f6a406b17ee6ca48d9de  fips.patch
+8ed4eeec23acc437e0aeb89bc6c3fda5de0a2a45167e396b6ffc8fba704fb7bc11193e726b47fa864c7ae75b1442cbc2ac7c356427f7a995e37e8ac3440d2b3c  cmake.patch
+"
diff --git a/main/gyp/cmake.patch b/main/gyp/cmake.patch
new file mode 100644
index 00000000000..9ed7dba106f
--- /dev/null
+++ b/main/gyp/cmake.patch
@@ -0,0 +1,45 @@
+Patch-Source: https://github.com/archlinux/svntogit-packages/blob/2a3fe81edf582af4e97e9954ad20408306273561/trunk/0002-gyp-fix-cmake.patch
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Sat, 25 Jun 2022 20:41:40 +0000
+Subject: [PATCH] gyp-fix-cmake
+
+(From Fedora, with fixed exception type)
+---
+ pylib/gyp/generator/cmake.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pylib/gyp/generator/cmake.py b/pylib/gyp/generator/cmake.py
+index 4a2041cf2687..12461dc1d48b 100644
+--- a/pylib/gyp/generator/cmake.py
++++ b/pylib/gyp/generator/cmake.py
+@@ -40,9 +40,9 @@ import gyp.xcode_emulation
+ 
+ try:
+   # maketrans moved to str in python3.
+-  _maketrans = string.maketrans
+-except NameError:
+   _maketrans = str.maketrans
++except AttributeError:
++  _maketrans = string.maketrans
+ 
+ generator_default_variables = {
+   'EXECUTABLE_PREFIX': '',
+@@ -281,7 +281,7 @@ def WriteActions(target_name, actions, extra_sources, extra_deps,
+     dirs = set(dir for dir in (os.path.dirname(o) for o in outputs) if dir)
+ 
+     if int(action.get('process_outputs_as_sources', False)):
+-      extra_sources.extend(zip(cmake_outputs, outputs))
++      extra_sources.extend(list(zip(cmake_outputs, outputs)))
+ 
+     # add_custom_command
+     output.write('add_custom_command(OUTPUT ')
+@@ -987,7 +987,7 @@ def WriteTarget(namer, qualified_target, target_dicts, build_dir, config_to_use,
+ 
+     # XCode settings
+     xcode_settings = config.get('xcode_settings', {})
+-    for xcode_setting, xcode_value in xcode_settings.viewitems():
++    for xcode_setting, xcode_value in xcode_settings.items():
+       SetTargetProperty(output, cmake_target_name,
+                         "XCODE_ATTRIBUTE_%s" % xcode_setting, xcode_value,
+                         '' if isinstance(xcode_value, str) else ' ')
diff --git a/main/gyp/fips.patch b/main/gyp/fips.patch
new file mode 100644
index 00000000000..902ac09f9f5
--- /dev/null
+++ b/main/gyp/fips.patch
@@ -0,0 +1,47 @@
+Patch-Source: https://github.com/archlinux/svntogit-packages/blob/2a3fe81edf582af4e97e9954ad20408306273561/trunk/0003-gyp-fips.patch
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Sat, 25 Jun 2022 20:45:54 +0000
+Subject: [PATCH] gyp-fips
+
+(From Fedora, ported to gyp master)
+---
+ pylib/gyp/generator/make.py  | 2 +-
+ pylib/gyp/generator/ninja.py | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pylib/gyp/generator/make.py b/pylib/gyp/generator/make.py
+index 997eec08666e..06c763db609a 100644
+--- a/pylib/gyp/generator/make.py
++++ b/pylib/gyp/generator/make.py
+@@ -1774,7 +1774,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
+ 
+       # Hash the target name to avoid generating overlong filenames.
+       cmdstring = (command if command else self.target).encode('utf-8')
+-      cmddigest = hashlib.sha1(cmdstring).hexdigest()
++      cmddigest = hashlib.sha1(cmdstring, usedforsecurity=False).hexdigest()
+       intermediate = "%s.intermediate" % (cmddigest)
+       self.WriteLn('%s: %s' % (' '.join(outputs), intermediate))
+       self.WriteLn('\t%s' % '@:');
+diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py
+index 3bcfe352925b..c439c8b728ad 100644
+--- a/pylib/gyp/generator/ninja.py
++++ b/pylib/gyp/generator/ninja.py
+@@ -752,7 +752,7 @@ class NinjaWriter(object):
+         if self.flavor == 'win':
+           # WriteNewNinjaRule uses unique_name for creating an rsp file on win.
+           extra_bindings.append(('unique_name',
+-              hashlib.md5(six.ensure_binary(outputs[0])).hexdigest()))
++              hashlib.md5(six.ensure_binary(outputs[0]), usedforsecurity=False).hexdigest()))
+ 
+         self.ninja.build(outputs, rule_name, self.GypPathToNinja(source),
+                          implicit=inputs,
+@@ -2389,7 +2389,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
+     qualified_target_for_hash = gyp.common.QualifiedTarget(build_file, name,
+                                                            toolset)
+     qualified_target_for_hash = qualified_target_for_hash.encode('utf-8')
+-    hash_for_rules = hashlib.md5(qualified_target_for_hash).hexdigest()
++    hash_for_rules = hashlib.md5(qualified_target_for_hash, usedforsecurity=False).hexdigest()
+ 
+     base_path = os.path.dirname(build_file)
+     obj = 'obj'
diff --git a/main/gyp/py3.8.patch b/main/gyp/py3.8.patch
new file mode 100644
index 00000000000..933bb2eab21
--- /dev/null
+++ b/main/gyp/py3.8.patch
@@ -0,0 +1,72 @@
+Patch-Source: https://github.com/archlinux/svntogit-packages/blob/2a3fe81edf582af4e97e9954ad20408306273561/trunk/0001-gyp-python38.patch
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tom Hughes <tom@compton.nu>
+Date: Fri, 23 Aug 2019 09:33:14 +0100
+Subject: [PATCH] gyp-python38
+
+Fix python 3.8 warnings
+
+(From Fedora)
+---
+ pylib/gyp/input.py  | 2 +-
+ test/lib/TestCmd.py | 6 +++---
+ test/lib/TestGyp.py | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/pylib/gyp/input.py b/pylib/gyp/input.py
+index 4c1289164045..2bea3341adc5 100644
+--- a/pylib/gyp/input.py
++++ b/pylib/gyp/input.py
+@@ -1183,7 +1183,7 @@ def LoadVariablesFromVariablesDict(variables, the_dict, the_dict_key):
+       if variable_name in variables:
+         # If the variable is already set, don't set it.
+         continue
+-      if the_dict_key is 'variables' and variable_name in the_dict:
++      if the_dict_key == 'variables' and variable_name in the_dict:
+         # If the variable is set without a % in the_dict, and the_dict is a
+         # variables dict (making |variables| a varaibles sub-dict of a
+         # variables dict), use the_dict's definition.
+diff --git a/test/lib/TestCmd.py b/test/lib/TestCmd.py
+index 1ec50933a4a8..457694c877d4 100644
+--- a/test/lib/TestCmd.py
++++ b/test/lib/TestCmd.py
+@@ -283,7 +283,7 @@ if os.name in ('posix', 'nt'):
+ else:
+     tempfile.template = 'testcmd.'
+ 
+-re_space = re.compile('\s')
++re_space = re.compile(r'\s')
+ 
+ _Cleanup = []
+ 
+@@ -882,7 +882,7 @@ class TestCmd(object):
+                 #self.diff_function = difflib.unified_diff
+         self._dirlist = []
+         self._preserve = {'pass_test': 0, 'fail_test': 0, 'no_result': 0}
+-        if 'PRESERVE' in os.environ and os.environ['PRESERVE'] is not '':
++        if 'PRESERVE' in os.environ and os.environ['PRESERVE'] != '':
+             self._preserve['pass_test'] = os.environ['PRESERVE']
+             self._preserve['fail_test'] = os.environ['PRESERVE']
+             self._preserve['no_result'] = os.environ['PRESERVE']
+@@ -1103,7 +1103,7 @@ class TestCmd(object):
+         the temporary working directories to be preserved for all
+         conditions.
+         """
+-        if conditions is ():
++        if len(conditions) == 0:
+             conditions = ('pass_test', 'fail_test', 'no_result')
+         for cond in conditions:
+             self._preserve[cond] = 1
+diff --git a/test/lib/TestGyp.py b/test/lib/TestGyp.py
+index 2aa78684f517..badfa910100f 100644
+--- a/test/lib/TestGyp.py
++++ b/test/lib/TestGyp.py
+@@ -743,7 +743,7 @@ def FindVisualStudioInstallation():
+           build_tool = None
+       if not build_tool:
+         args1 = ['reg', 'query',
+-                    'HKLM\Software\Microsoft\VisualStudio\SxS\VS7',
++                    r'HKLM\Software\Microsoft\VisualStudio\SxS\VS7',
+                     '/v', '15.0', '/reg:32']
+         build_tool = subprocess.check_output(args1).decode(
+             'utf-8', 'ignore').strip().split(b'\r\n').pop().split(b' ').pop()
diff --git a/main/gzip/APKBUILD b/main/gzip/APKBUILD
index 2ea52d44caf..25480f72140 100644
--- a/main/gzip/APKBUILD
+++ b/main/gzip/APKBUILD
@@ -1,22 +1,22 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gzip
-pkgver=1.10
+pkgver=1.13
 pkgrel=0
-pkgdesc="A popular data compression program"
+pkgdesc="Popular data compression program"
 subpackages="$pkgname-doc"
 url="https://www.gnu.org/software/gzip/"
 arch="all"
-license="GPL-2.0"
-depends=
-makedepends=
-checkdepends="less"
-install=
-source="https://ftp.gnu.org/gnu/gzip/gzip-$pkgver.tar.gz"
+license="GPL-3.0-or-later"
+depends="less"
+checkdepends="diffutils grep perl"
+source="https://ftp.gnu.org/gnu/gzip/gzip-$pkgver.tar.xz"
 
-build() {
-	cd "$builddir"
+# secfixes:
+#   1.12-r0:
+#     - CVE-2022-1271
 
+build() {
 	# avoid text relocation
 	export DEFS="NO_ASM"
 	./configure \
@@ -29,12 +29,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR=$pkgdir install
 
 	rm -rf "$pkgdir"/usr/lib/charset.alias
@@ -49,4 +47,6 @@ package() {
 	ln -sf /bin/gunzip "$pkgdir"/usr/bin/uncompress
 }
 
-sha512sums="7939043e74554ced0c1c05d354ab4eb36cd6dce89ad79d02ccdc5ed6b7ee390759689b2d47c07227b9b44a62851afe7c76c4cae9f92527d999f3f1b4df1cccff  gzip-1.10.tar.gz"
+sha512sums="
+e3d4d4aa4b2e53fdad980620307257c91dfbbc40bcec9baa8d4e85e8327f55e2ece552c9baf209df7b66a07103ab92d4954ac53c86c57fbde5e1dd461143f94c  gzip-1.13.tar.xz
+"
diff --git a/main/haproxy/APKBUILD b/main/haproxy/APKBUILD
index 369ceff9b0a..bbcfa4ba334 100644
--- a/main/haproxy/APKBUILD
+++ b/main/haproxy/APKBUILD
@@ -1,54 +1,63 @@
 # Contributor: Jeff Bilyk <jbilyk@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Milan P. Stanić <mps@arvanta.net>
 pkgname=haproxy
-pkgver=2.1.3
+# NOTE: Upgrade only to LTS versions announced on upstream site url!
+# Using LTS versions is easier to keep it in good shape for stable releases
+pkgver=2.8.9
 _pkgmajorver=${pkgver%.*}
 pkgrel=0
 pkgdesc="A TCP/HTTP reverse proxy for high availability environments"
 url="https://www.haproxy.org/"
 arch="all"
-license="GPL-2.0-or-later LGPL-2.1-or-later"
-_luaver="5.3"
-options="!check"  # FIXME: no idea how to run tests
-makedepends="pcre-dev openssl-dev linux-headers lua${_luaver}-dev zlib-dev"
+license="(GPL-2.0-or-later AND GPL-2.1-or-later) WITH OpenSSL-Exception"
+_luaver=5.4
+options="!check" # FIXME: depends on vtest
+makedepends="pcre2-dev openssl-dev linux-headers lua$_luaver-dev zlib-dev"
 install="haproxy.pre-install haproxy.pre-upgrade"
 subpackages="$pkgname-doc $pkgname-openrc"
-source="https://www.haproxy.org/download/${_pkgmajorver}/src/$pkgname-$pkgver.tar.gz
+source="https://www.haproxy.org/download/$_pkgmajorver/src/haproxy-$pkgver.tar.gz
 	haproxy.initd
 	haproxy.cfg"
 
-builddir="$srcdir/$pkgname-$pkgver"
+# secfixes:
+#   2.1.4-r0:
+#     - CVE-2020-11100
 
 build() {
-	cd "$builddir"
-	case "$CARCH" in mips|mipsel*) _carchflags="ADDLIB=-latomic";; esac
 	make \
-	     $_carchflags \
-	     TARGET=linux-glibc \
-	     USE_PCRE=1 \
-	     USE_OPENSSL=1 \
-	     USE_ZLIB=1 \
-	     USE_LUA=1 \
-	     USE_NS=1 \
-	     LUA_LIB=/usr/lib/lua${_luaver} \
-	     LUA_INC=/usr/include/lua${_luaver} \
-	     CFLAGS="$CFLAGS"
+		$_carchflags \
+		TARGET=linux-musl \
+		USE_PCRE2=1 \
+		USE_PCRE2_JIT=1 \
+		USE_OPENSSL=1 \
+		USE_ZLIB=1 \
+		USE_LUA=1 \
+		USE_NS=1 \
+		USE_PROMEX=1 \
+		LUA_LIB=/usr/lib/lua$_luaver \
+		LUA_INC=/usr/include/lua$_luaver
+}
+
+check() {
+	make reg-tests
 }
 
 package() {
-	cd "$builddir"
 	make install \
-	     DESTDIR="$pkgdir" PREFIX=/usr DOCDIR=/usr/share/doc/haproxy
+		DESTDIR="$pkgdir" PREFIX=/usr DOCDIR=/usr/share/doc/haproxy
 	install -d \
-	        "$pkgdir"/var/lib/haproxy
+		"$pkgdir"/var/lib/haproxy
 	install -D -m 755 \
-	        "$srcdir"/$pkgname.initd \
-	        "$pkgdir"/etc/init.d/$pkgname
+		"$srcdir"/$pkgname.initd \
+		"$pkgdir"/etc/init.d/$pkgname
 	install -D -m 644 \
-	        "$srcdir"/haproxy.cfg \
-	        "$pkgdir"/etc/haproxy/haproxy.cfg
+		"$srcdir"/haproxy.cfg \
+		"$pkgdir"/etc/haproxy/haproxy.cfg
 }
 
-sha512sums="4728c1177b2bba69465cbc56b1ed73a1b2d36891ba2d94d29bb49714ad98ccfac4b52947735aded211f0cd8070002f5406ddd77cabd2f8230b00438189dd7a60  haproxy-2.1.3.tar.gz
-3ab277bf77fe864ec6c927118dcd70bdec0eb3c54535812d1c3c0995fa66a3ea91a73c342edeb8944caeb097d2dd1a7761099182df44af5e3ef42de6e2176d26  haproxy.initd
-26bc8f8ac504fcbaec113ecbb9bb59b9da47dc8834779ebbb2870a8cadf2ee7561b3a811f01e619358a98c6c7768e8fdd90ab447098c05b82e788c8212c4c41f  haproxy.cfg"
+sha512sums="
+087dfe318bd56c3b1e834975277a35f5ebf434fdc4d342a78a24e8bec2f1d5a07d958383581eae6277754cd138e69f465e1d8fe6f1eae2f94f14a9914082bb7f  haproxy-2.8.9.tar.gz
+4aa8fc812079baf1d17cf9484a9b44568c3dd94f35243a57a4a7868e7f88146a4e94c80ea8ab86f1b08a524567e269a3ec119b67fc679f6bd0d9f1c70ce4f080  haproxy.initd
+26bc8f8ac504fcbaec113ecbb9bb59b9da47dc8834779ebbb2870a8cadf2ee7561b3a811f01e619358a98c6c7768e8fdd90ab447098c05b82e788c8212c4c41f  haproxy.cfg
+"
diff --git a/main/haproxy/haproxy.initd b/main/haproxy/haproxy.initd
index b475590ddbf..c278b1666b0 100644
--- a/main/haproxy/haproxy.initd
+++ b/main/haproxy/haproxy.initd
@@ -7,7 +7,7 @@ extra_commands="checkconfig"
 extra_started_commands="reload"
 command=/usr/sbin/haproxy
 
-CONFFILE=${HAPROXY_CONF:-/etc/haproxy/${SVCNAME}.cfg}
+CONF=${HAPROXY_CONF:-/etc/haproxy/${SVCNAME}.cfg}
 PIDFILE=/var/run/${SVCNAME}.pid
 
 depend() {
@@ -17,20 +17,20 @@ depend() {
 }
 
 checkconfig() {
-	if [ ! -f "${CONFFILE}" ]; then
-		eerror "${CONFFILE} does not exist!"
+	if [ ! -f "${CONF}" ] && [ ! -d "${CONF}" ]; then
+		eerror "${CONF} does not exist!"
 		return 1
 	fi
 
-	ebegin "Checking ${CONFFILE}"
-	$command -q -c -f "${CONFFILE}"
+	ebegin "Checking ${CONF}"
+	$command -q -c -f "${CONF}"
 	eend $?
 }
 
 start() {
 	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon --pidfile "${PIDFILE}" --exec $command \
-		--start -- -D -p "${PIDFILE}" -f "${CONFFILE}"
+		--start -- -D -p "${PIDFILE}" -f "${CONF}"
 	eend $?
 }
 
@@ -47,8 +47,8 @@ stop() {
 
 reload() {
 	ebegin "Reloading ${SVCNAME}"
-	checkconfig || { eerror "Reloading failed, please fix your ${CONFFILE} first"; return 1; }
-	$command -D -p "${PIDFILE}" -f "${CONFFILE}" -sf $(cat "${PIDFILE}")
+	checkconfig || { eerror "Reloading failed, please fix your ${CONF} first"; return 1; }
+	$command -D -p "${PIDFILE}" -f "${CONF}" -sf $(cat "${PIDFILE}")
 	eend $?
 }
 
diff --git a/main/haproxy/haproxy.pre-install b/main/haproxy/haproxy.pre-install
index 85cefc98146..c1d34dbc25e 100644
--- a/main/haproxy/haproxy.pre-install
+++ b/main/haproxy/haproxy.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S haproxy 2>/dev/null
-adduser -S -D -H -h /var/lib/haproxy -s /bin/false \
+adduser -S -D -H -h /var/lib/haproxy -s /sbin/nologin \
 	-G haproxy -g haproxy haproxy 2>/dev/null
 
 # move config to new location
diff --git a/main/harfbuzz/APKBUILD b/main/harfbuzz/APKBUILD
index 693912b67b0..d373fc9c021 100644
--- a/main/harfbuzz/APKBUILD
+++ b/main/harfbuzz/APKBUILD
@@ -1,66 +1,99 @@
 # Contributor: Sören Tempel <soeren+alpinelinux@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=harfbuzz
-pkgver=2.6.4
-pkgrel=2
+pkgver=8.4.0
+pkgrel=0
 pkgdesc="Text shaping library"
-url="https://freedesktop.org/wiki/Software/HarfBuzz"
+url="https://harfbuzz.github.io/"
 arch="all"
 license="MIT"
-# tests depend on certain freetype behaviours
-options="!check"
-makedepends="freetype-dev glib-dev gobject-introspection-dev cairo-dev icu-dev
-	graphite2-dev"
+makedepends="
+	cairo-dev
+	freetype-dev
+	glib-dev
+	gobject-introspection-dev
+	graphite2-dev
+	gtk-doc
+	icu-dev
+	meson
+	"
 checkdepends="python3"
-subpackages="$pkgname-static $pkgname-dev $pkgname-icu $pkgname-doc"
-source="https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$pkgver.tar.xz"
+subpackages="
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-cairo
+	$pkgname-doc
+	$pkgname-gobject
+	$pkgname-icu
+	$pkgname-subset
+	$pkgname-utils
+	"
+source="https://github.com/harfbuzz/harfbuzz/releases/download/$pkgver/harfbuzz-$pkgver.tar.xz"
+
+# secfixes:
+#   4.4.1-r0:
+#     - CVE-2022-33068
 
 build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--enable-static \
-		--with-glib \
-		--with-gobject \
-		--with-graphite2 \
-		--with-icu \
-		--with-freetype
-	make
+	CFLAGS="$CFLAGS -O2 -flto=auto -ffat-lto-objects" \
+	CXXFLAGS="$CXXFLAGS -O2 -flto=auto -ffat-lto-objects" \
+	CPPFLAGS="$CPPFLAGS -O2 -flto=auto -ffat-lto-objects" \
+	abuild-meson \
+		--default-library=both \
+		-Dglib=enabled \
+		-Dgobject=enabled \
+		-Dgraphite=enabled \
+		-Dicu=enabled \
+		-Dfreetype=enabled \
+		-Dtests="$(want_check && echo enabled || echo disabled)" \
+		-Dcairo=enabled \
+		-Ddocs=enabled \
+		. output
+	meson compile -C output
 }
 
 check() {
-	cd "$builddir"
-	make check
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-static() {
-	pkgdesc="$pkgdesc (static libraries)"
+icu() {
+	pkgdesc="Harfbuzz ICU support library"
+	replaces="harfbuzz"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
+	amove usr/lib/lib*icu.so.*
 }
 
-dev() {
-	default_dev
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+gobject() {
+	pkgdesc="Harfbuzz gobject library"
+	amove usr/lib/lib*gobject.so.*
 }
 
-icu() {
-	pkgdesc="Harfbuzz ICU support library"
-	replaces="harfbuzz"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*icu.so.* "$subpkgdir"/usr/lib/
+cairo() {
+	pkgdesc="Harfbuzz cairo library"
+	amove usr/lib/lib*cairo.so.*
+}
+
+subset() {
+	pkgdesc="Harfbuzz subset library"
+	amove usr/lib/lib*subset.so.*
+}
+
+utils() {
+	pkgdesc="$pkgdesc (utilities)"
+
+	amove usr/bin
+}
+
+dev() {
+	default_dev
+	provides="harfbuzz-bootstrap-dev"
+	provider_priority=2
 }
 
-sha512sums="d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f  harfbuzz-2.6.4.tar.xz"
+sha512sums="
+9d79ea86f7642f2f1a8726e12a48363eb395162c9b50524e7651b63ad3bb458a69fc82427dbcbfe2550231138f7e454b2c12097a51890f63c645fa3dc668f542  harfbuzz-8.4.0.tar.xz
+"
diff --git a/main/haserl/APKBUILD b/main/haserl/APKBUILD
index 11921d8939f..37f858a1570 100644
--- a/main/haserl/APKBUILD
+++ b/main/haserl/APKBUILD
@@ -1,14 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.3 5.2 5.1"
-_defaultlua="5.3"
+_luaversions="5.4 5.3 5.2 5.1"
+_defaultlua="5.4"
 pkgname=haserl
-pkgver=0.9.35
-pkgrel=1
+pkgver=0.9.36
+pkgrel=4
 pkgdesc="Html And Shell Embedded Report Language"
-url="http://haserl.sourceforge.net/"
+url="https://haserl.sourceforge.net/"
 arch="all"
-license="GPL-2.0"
-depends=""
+license="GPL-2.0-only"
 makedepends="automake autoconf"
 subpackages="$pkgname-doc"
 for _i in $_luaversions; do
@@ -16,24 +15,23 @@ for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev"
 	subpackages="$subpackages haserl-lua$_i:split_${_i/./_}"
 done
-options="suid"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+options="suid !check" # no test suite
+source="https://downloads.sourceforge.net/haserl/haserl-$pkgver.tar.gz"
+
+# secfixes:
+#   0.9.36-r0:
+#     - CVE-2021-29133
 
-_sdir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$_sdir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	sed -i -e 's/^        /\t/' src/Makefile.am || return 1
+	default_prepare
+
+	sed -i -e 's/^        /\t/' src/Makefile.am
 	rm -f src/haserl_lualib.inc
 
-	aclocal && autoconf && autoheader && automake --add-missing || return 1
+	aclocal && autoconf && autoheader && automake --add-missing
 
 	for _i in $_luaversions; do
-		cp -r "$_sdir" "$srcdir"/build-$_i
+		cp -r "$builddir" "$srcdir"/build-$_i
 	done
 }
 
@@ -44,16 +42,15 @@ build() {
 			--build=$CBUILD \
 			--host=$CHOST \
 			--prefix=/usr \
-			--with-lua=lua$_i \
-			|| return 1
-		make || return 1
+			--with-lua=lua$_i
+		make
 	done
 }
 
 package() {
 	for _i in $_luaversions; do
 		cd "$srcdir"/build-$_i
-		make DESTDIR="$pkgdir/" install || return 1
+		make DESTDIR="$pkgdir/" install
 		chmod 4111 "$pkgdir"/usr/bin/haserl
 		mv "$pkgdir"/usr/bin/haserl "$pkgdir"/usr/bin/haserl-lua$_i
 	done
@@ -61,18 +58,16 @@ package() {
 }
 
 _split() {
-	local d= _ver=$1
+	local _ver=$1
 	pkgdesc="Html And Shell Embedded Report Language with Lua $_ver support"
 	replaces="$pkgname"
 	depends=
-	if [ -f "$pkgdir"/usr/bin/haserl-lua$_ver ]; then
-		mkdir -p "$subpkgdir"/usr/bin
-		mv "$pkgdir"/usr/bin/haserl-lua$_ver "$subpkgdir"/usr/bin/ || return 1
-	fi
+
+	amove usr/bin/haserl-lua$_ver
 }
 
 for _i in $_luaversions; do
 	eval "split_${_i/./_}() { _split $_i; }"
 done
 
-sha512sums="f0f2fc46540223b4b5369fe13b3020bed5e0578b7ca1ed1688f01678ba5302c876540c0d58dde427f9180915fa38cfffd01f1a4cbbc0fce851789056b3665ab0  haserl-0.9.35.tar.gz"
+sha512sums="727c6b4cf26bb7fd9d55c328dcca47dc0093b2836cd4874ad28a9c07d9ad4c82c22b899f64df33bad37325f66ce1af8aec1fe0a90e42b9f6cc06b01afe3062d9  haserl-0.9.36.tar.gz"
diff --git a/main/haveged/APKBUILD b/main/haveged/APKBUILD
index d686ff70178..2827bda5b62 100644
--- a/main/haveged/APKBUILD
+++ b/main/haveged/APKBUILD
@@ -2,27 +2,27 @@
 # Contributor: Danilo Godec <danilo.godec@agenda.si>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=haveged
-pkgver=1.9.8
-pkgrel=0
+pkgver=1.9.18
+pkgrel=2
 pkgdesc="Entropy harvesting daemon using CPU timings"
 url="https://www.issihosts.com/haveged/"
 arch="all"
 license="GPL-3.0-or-later"
-subpackages="$pkgname-doc $pkgname-openrc"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
 makedepends="autoconf automake libtool linux-headers"
 source="$pkgname-$pkgver.tar.gz::https://github.com/jirka-h/haveged/archive/v$pkgver.tar.gz
-	double-the-sample-size-used-in-the-entest.patch
 	haveged.initd
 	haveged.confd"
 
 prepare() {
 	default_prepare
+
+	sed -i 's|/bin/bash|/bin/sh|' ent/test.sh
+
 	autoreconf -vif
 }
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,13 +33,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 
 	rm "$pkgdir"/usr/lib/libhavege.la
@@ -50,7 +47,8 @@ package() {
 		"$pkgdir"/etc/conf.d/haveged
 }
 
-sha512sums="6a4012c7ab0ad7df77ae61dd3aca072a7aeca942c180d37c8495009fad13a4c9c0e7bf64a3ffce00e50c06679d4b948c3930a960789a06edf074076cf68d37db  haveged-1.9.8.tar.gz
-e977a6487df29a0e7de07ef3ef6546776ee9671cc8ac02868800351c6461be4d0d2e05cf40c5bc54742c00d5fe1878027959ab598d96be4f81a9eb4969fce08d  double-the-sample-size-used-in-the-entest.patch
-9d39a7f94987b5734ba414edf23ec986f344e00748d20dd5b37b64403cebd4fad68469df52ce1d115d0ee0c71497f1ac21144d0370345b5ef57e306d7d376f89  haveged.initd
-57201472fc659aaab919562a00d474d3823d5becea62e8b13ef93eda05e1fd667721c968f224fcae871d13cfcd16d1924403d9181e0899fa214fa00bf4fefc75  haveged.confd"
+sha512sums="
+ef2e0ae3be68a8fba16371c3347d52ecf9748269ae30eef2e5c26aad6cfb516f87295e1e56be902df1064e7d4ace04863dd094d62b69e584608f779d63b42d8e  haveged-1.9.18.tar.gz
+99dfe4e40b99041a34cfff8539d6148c88413d2fadc2ab8db7edda95f8c84e21b61643de51855d70f0f6d20bbe1f46fc8198bfd5d512099545fad74d1c7132b6  haveged.initd
+c2dcaf151d314500c9147b97ce08bb65c902431ac1c60e76072f5237164fa4ff4aa9115eba9329fffb14add7759e4d9acc894bcf49dcc4ea37339a01c2aa1ed7  haveged.confd
+"
diff --git a/main/haveged/double-the-sample-size-used-in-the-entest.patch b/main/haveged/double-the-sample-size-used-in-the-entest.patch
deleted file mode 100644
index 673566f94c0..00000000000
--- a/main/haveged/double-the-sample-size-used-in-the-entest.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 55eb83a7d6c29667a4035df487b5417529fc8518 Mon Sep 17 00:00:00 2001
-From: Henrik Riomar <henrik.riomar@gmail.com>
-Date: Mon, 8 Apr 2019 22:42:05 +0200
-Subject: [PATCH] double the sample size used in the entest
-
----
- ent/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ent/Makefile.am b/ent/Makefile.am
-index 265504c..4782377 100644
---- a/ent/Makefile.am
-+++ b/ent/Makefile.am
-@@ -17,6 +17,6 @@ MAINTAINERCLEANFILES = Makefile.in
- if ENABLE_ENT_TEST
- check-local:
- 	./entest -t ${srcdir}/entitle.gif
--	../src/haveged -n 16384k -v 1 $*
-+	../src/haveged -n 32768k -v 1 $*
- 	./entest -vf sample
- endif
--- 
-2.21.0
-
diff --git a/main/haveged/haveged.confd b/main/haveged/haveged.confd
index 9ee6c617768..ee3ec1dae6e 100644
--- a/main/haveged/haveged.confd
+++ b/main/haveged/haveged.confd
@@ -1,5 +1,7 @@
-# Config file for /etc/init.d/haveged
+# Configuration file for /etc/init.d/haveged
 
-# Any extra options you want to pass to haveged
-# on start-up should be put here.
-HAVEGED_OPTS=""
+# Additional arguments to pass to haveged.
+#command_args=
+
+# Uncomment to use process supervisor.
+#supervisor="supervise-daemon"
diff --git a/main/haveged/haveged.initd b/main/haveged/haveged.initd
index da1d6245f2f..21fe3137c65 100644
--- a/main/haveged/haveged.initd
+++ b/main/haveged/haveged.initd
@@ -1,12 +1,12 @@
 #!/sbin/openrc-run
-supervisor=supervise-daemon
 
-name="RNG Daemon"
-description="haveged Random Number Generator"
+description="Entropy harvesting daemon using CPU timings"
 
-command=/usr/sbin/haveged
-command_args="$HAVEGED_OPTS"
-command_args_foreground="--Foreground"
+command="/usr/sbin/haveged"
+# $HAVEGED_OPTS is here for backward compatiblity only
+command_args="--Foreground ${command_args:-$HAVEGED_OPTS}"
+command_background="yes"
+pidfile="/run/$RC_SVCNAME.pid"
 
 depend() {
 	need localmount
diff --git a/main/hdparm/APKBUILD b/main/hdparm/APKBUILD
index 02d56496e65..61d5709e72e 100644
--- a/main/hdparm/APKBUILD
+++ b/main/hdparm/APKBUILD
@@ -1,34 +1,33 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=hdparm
-pkgver=9.58
-pkgrel=0
+pkgver=9.65
+pkgrel=2
 pkgdesc="Utility for manipulating IDE device parameters"
-url="https://sourceforge.net/projects/hdparm"
+url="https://sourceforge.net/projects/hdparm/"
 arch="all"
-license="BSD GPL-2.0"
+license="BSD-2-Clause OR GPL-2.0-only"
 makedepends="linux-headers"
 options="!check"
 subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://downloads.sourceforge.net/sourceforge/hdparm/hdparm-$pkgver.tar.gz"
 
 prepare() {
 	default_prepare
-	sed -i '/^LDFLAGS/d' "$builddir"/Makefile 
+	sed -i '/^LDFLAGS/d' "$builddir"/Makefile
 }
 
 build() {
-	cd "$builddir"
 	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -D -m755 contrib/idectl "$pkgdir"/sbin
 	install -D -m755 contrib/ultrabayd "$pkgdir"/sbin
 	install -D -m644 LICENSE.TXT "$pkgdir"/usr/share/licenses/hdparm/LICENSE.TXT
 }
 
-sha512sums="42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea  hdparm-9.58.tar.gz"
+sha512sums="
+4ffc8902b90cee10d68af8ddb9f3b9454d523ecd49cdaaed254b4d7a999462a8ad5ec1bb5d7684b09fefa41b5941ab533b167dad290003b51c795a633ca88913  hdparm-9.65.tar.gz
+"
diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD
index 6bc6581393e..1e440480cd1 100644
--- a/main/heimdal/APKBUILD
+++ b/main/heimdal/APKBUILD
@@ -1,19 +1,19 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=heimdal
-pkgver=7.7.0
+pkgver=7.8.0
 _ver=${pkgver/_rc/rc}
-pkgrel=1
-pkgdesc="An implementation of Kerberos 5"
+pkgrel=3
+pkgdesc="Implementation of Kerberos 5"
 arch="all"
 url="https://github.com/heimdal/"
 license="BSD-3-Clause"
 depends="krb5-conf"
-depends_dev="openssl-dev e2fsprogs-dev db-dev"
+depends_dev="openssl-dev>3 e2fsprogs-dev"
 makedepends="$depends_dev autoconf automake bash gawk libtool
-	ncurses-dev perl readline-dev sqlite-dev texinfo perl-json"
-options="suid !check" #FIXME: FAIL: snprintf-test
-subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc"
+	ncurses-dev perl readline-dev sqlite-dev texinfo perl-json python3 gdbm-dev"
+options="suid !check" #FIXME: FAIL: test_nist
+subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-su $pkgname-openrc"
 source="https://github.com/heimdal/heimdal/releases/download/heimdal-$pkgver/heimdal-$pkgver.tar.gz
 	heimdal-kadmind.initd
 	heimdal-kdc.initd
@@ -22,10 +22,21 @@ source="https://github.com/heimdal/heimdal/releases/download/heimdal-$pkgver/hei
 	005_all_heimdal-suid_fix.patch
 	heimdal_missing-include.patch
 	CVE-2018-16860.patch
+	CVE-2022-45142.patch
+	silence-include-headers-redirect-warnings.patch
 	"
-builddir="$srcdir/$pkgname-$_ver"
 
 # secfixes:
+#   7.8.0-r2:
+#     - CVE-2022-45142
+#   7.7.1-r0:
+#     - CVE-2019-14870
+#     - CVE-2021-3671
+#     - CVE-2021-44758
+#     - CVE-2022-3437
+#     - CVE-2022-41916
+#     - CVE-2022-42898
+#     - CVE-2022-44640
 #   7.5.3-r4:
 #     - CVE-2018-16860
 #   7.4.0-r2:
@@ -42,30 +53,22 @@ prepare() {
 }
 
 build() {
-	export LDFLAGS="${LDFLAGS} -Wl,--as-needed"
-	export LIBS="-ldb"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--enable-shared=yes \
 		--without-x \
-		--with-berkeley-db \
+		--without-berkeley-db \
 		--with-readline-lib=/usr/lib \
 		--with-readline-include=/usr/include/readline \
 		--with-sqlite3=/usr \
-		--without-openssl
+		--without-openssl \
+		--with-db-type-preference=
 
 	# make sure we use system version
 	rm -r lib/sqlite lib/com_err
 
-	# workarount a parallell build issue
-	make -C lib/asn1 der-protos.h der-private.h
-	make -C lib/kadm5 kadm5-protos.h kadm5-private.h kadm5_err.h
-	make -C lib/krb5 krb5-protos.h krb5-private.h krb5_err.h krb_err.h \
-		heim_err.h k524_err.h
-	make -C lib/hx509 hx509-private.h  hx509-protos.h
 	make
 }
 
@@ -78,7 +81,6 @@ package() {
 	mandir=/usr/share/man infodir=/usr/share/info datadir=/var/lib/heimdal \
 	localstatedir=/var/lib/heimdal libexecdir=/usr/sbin install
 
-
 	install -m755 -D "$srcdir"/heimdal-kadmind.initd \
 		"$pkgdir"/etc/init.d/heimdal-kadmind
 	install -m755 -D "$srcdir"/heimdal-kdc.initd \
@@ -121,10 +123,24 @@ libs() {
 
 }
 
-sha512sums="6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99  heimdal-7.7.0.tar.gz
+su() {
+	# splitting into subpkg in order to avoid conflict
+	# with shadow-login and util-linux-login
+	pkgdesc="Heimdal su binary with Kerberos support"
+	replaces="login-utils shadow-login util-linux-login"
+	replaces_priority=100
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/su "$subpkgdir"/usr/bin
+}
+
+sha512sums="
+0167345aca77d65b7a1113874eee5b65ec6e1fec1f196d57e571265409fa35ef95a673a4fd4aafbb0ab5fb5b246b97412353a68d6613a8aff6393a9f1e72999e  heimdal-7.8.0.tar.gz
 0ae0fec4bdb3907d9e82e788e12ef185dd00e6db4c17f55758da5600fedd72ed1118b6b492d039f91cc54d54bf2f79f624ea38a68067e424b737b128494a4bbd  heimdal-kadmind.initd
 4dca69bb1c1c6dfce8c0fc1da84855e4549be478ab09511fa5143ee61d1609fed7f3303179bc1e499b0f20445e04c41eda132dd1c5f72e2fea4fcf60a35ad2a9  heimdal-kdc.initd
 abee8390632fa775e74900d09e5c72b02fe4f9616b43cc8d0a76175486ed6d4707fb3ce4d06ceb09b0e8d1384e037c3cff6525e11def0122c35c32eebd0d196f  heimdal-kpasswdd.initd
 2a6b20588a86a9ea3c35209b96ef2da0b39bc3112aec1505e69a60efc9ffb9ddc1d0dbdfaf864142e9d2f81da3d2653de56d6ffa01871c20fde17e4642625c56  005_all_heimdal-suid_fix.patch
 e89efdc942c512363aac1d9797c6bf622324e9200e282bc5ed680300b9e1b39a4ea20f059cdac8f22f972eb0af0e625fd41f267ebcafcfec0aaa81192aff79c1  heimdal_missing-include.patch
-36738795eb3478b55790bf1927f85a421b13b6b47dcc273daeb6630c39a4e1c1258148fa0e9f004ae59a9ac89caf54cb25efedb417e852e42a2c32d02e43fd56  CVE-2018-16860.patch"
+36738795eb3478b55790bf1927f85a421b13b6b47dcc273daeb6630c39a4e1c1258148fa0e9f004ae59a9ac89caf54cb25efedb417e852e42a2c32d02e43fd56  CVE-2018-16860.patch
+3205ce659c755b1a9e3bca3a3088cf241550fb2343fe46bee4370623b1ea2845395bcf7682a8c472d067067fbf8b3a8ea8809e8d3e6d5f62e05dcd680ba7230b  CVE-2022-45142.patch
+5d507a4312bbc59f2b67cb441d0880eaa060e3fdd166b7b8cf9b967d404722a1672e10cc8daedc46a786b8cbbb78de0bc2585d1d4d5b985da16c18f60c87d54f  silence-include-headers-redirect-warnings.patch
+"
diff --git a/main/heimdal/CVE-2022-45142.patch b/main/heimdal/CVE-2022-45142.patch
new file mode 100644
index 00000000000..917d41578e7
--- /dev/null
+++ b/main/heimdal/CVE-2022-45142.patch
@@ -0,0 +1,22 @@
+diff --git a/lib/gssapi/krb5/arcfour.c b/lib/gssapi/krb5/arcfour.c
+index aa03cbe..c6c15eb 100644
+--- a/lib/gssapi/krb5/arcfour.c
++++ b/lib/gssapi/krb5/arcfour.c
+@@ -365,7 +365,7 @@ _gssapi_verify_mic_arcfour(OM_uint32 * minor_status,
+ 	return GSS_S_FAILURE;
+     }
+ 
+-    cmp = (ct_memcmp(cksum_data, p + 8, 8) == 0);
++    cmp = (ct_memcmp(cksum_data, p + 8, 8) != 0);
+     if (cmp) {
+ 	*minor_status = 0;
+ 	return GSS_S_BAD_MIC;
+@@ -730,7 +730,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status,
+ 	return GSS_S_FAILURE;
+     }
+ 
+-    cmp = (ct_memcmp(cksum_data, p0 + 16, 8) == 0); /* SGN_CKSUM */
++    cmp = (ct_memcmp(cksum_data, p0 + 16, 8) != 0); /* SGN_CKSUM */
+     if (cmp) {
+ 	_gsskrb5_release_buffer(minor_status, output_message_buffer);
+ 	*minor_status = 0;
diff --git a/main/heimdal/silence-include-headers-redirect-warnings.patch b/main/heimdal/silence-include-headers-redirect-warnings.patch
new file mode 100644
index 00000000000..76de2535073
--- /dev/null
+++ b/main/heimdal/silence-include-headers-redirect-warnings.patch
@@ -0,0 +1,78 @@
+From 2eb67c91834a21e68c90380254c7c10ffe03a7ca Mon Sep 17 00:00:00 2001
+From: Leonardo Arena <rnalrd@alpinelinux.org>
+Date: Thu, 14 Apr 2022 08:47:15 +0000
+Subject: [PATCH] silence include header warnings
+
+---
+ cf/roken-frag.m4       | 1 -
+ configure              | 2 +-
+ lib/ipc/hi_locl.h      | 2 +-
+ lib/krb5/krb5_locl.h   | 2 +-
+ lib/roken/getifaddrs.c | 2 +-
+ 5 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/cf/roken-frag.m4 b/cf/roken-frag.m4
+index f22b43a..589b2cc 100644
+--- a/cf/roken-frag.m4
++++ b/cf/roken-frag.m4
+@@ -73,7 +73,6 @@ AC_CHECK_HEADERS([\
+ 	stdint.h				\
+ 	sys/auxv.h				\
+ 	sys/bswap.h				\
+-	sys/errno.h				\
+ 	sys/ioctl.h				\
+ 	sys/mman.h				\
+ 	sys/param.h				\
+diff --git a/configure b/configure
+index 4cefc43..bc3bf78 100755
+--- a/configure
++++ b/configure
+@@ -19706,7 +19706,7 @@
+   printf "%s\n" "#define HAVE_SYS_BSWAP_H 1" >>confdefs.h
+ 
+ fi
+-ac_fn_c_check_header_compile "$LINENO" "sys/errno.h" "ac_cv_header_sys_errno_h" "$ac_includes_default"
++ac_fn_c_check_header_compile "$LINENO" "errno.h" "ac_cv_header_sys_errno_h" "$ac_includes_default"
+ if test "x$ac_cv_header_sys_errno_h" = xyes
+ then :
+   printf "%s\n" "#define HAVE_SYS_ERRNO_H 1" >>confdefs.h
+diff --git a/lib/ipc/hi_locl.h b/lib/ipc/hi_locl.h
+index 7efe6ca..3195b44 100644
+--- a/lib/ipc/hi_locl.h
++++ b/lib/ipc/hi_locl.h
+@@ -41,7 +41,7 @@
+ #include <sys/un.h>
+ #endif
+ 
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ #include <ctype.h>
+ #include <stdio.h>
+diff --git a/lib/krb5/krb5_locl.h b/lib/krb5/krb5_locl.h
+index b64f3a9..f62c40d 100644
+--- a/lib/krb5/krb5_locl.h
++++ b/lib/krb5/krb5_locl.h
+@@ -44,7 +44,7 @@
+ #include <ctype.h>
+ 
+ #ifdef HAVE_POLL_H
+-#include <sys/poll.h>
++#include <poll.h>
+ #endif
+ 
+ #include <krb5-types.h>
+diff --git a/lib/roken/getifaddrs.c b/lib/roken/getifaddrs.c
+index cc949b0..a82adc5 100644
+--- a/lib/roken/getifaddrs.c
++++ b/lib/roken/getifaddrs.c
+@@ -120,7 +120,7 @@ struct mbuf;
+ #include <linux/rtnetlink.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <netpacket/packet.h>
+ #include <net/ethernet.h>     /* the L2 protocols */
+ #include <sys/uio.h>
+-- 
diff --git a/main/help2man/APKBUILD b/main/help2man/APKBUILD
index eb6ca230be0..be1c8a32953 100644
--- a/main/help2man/APKBUILD
+++ b/main/help2man/APKBUILD
@@ -1,6 +1,7 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=help2man
-pkgver=1.47.13
+pkgver=1.49.3
 pkgrel=0
 pkgdesc="Create simple man pages from --help output"
 url="https://www.gnu.org/software/help2man"
@@ -27,4 +28,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="7bf4c75a42c103dd8413a94505f383c6e2b215f9a4cc506e11935acc7f108caad01a5fa489ee157ebef5fa02299145592f65cc828fc016417af557382975d57a  help2man-1.47.13.tar.xz"
+sha512sums="
+5f19fad1e38b0572b63ed8bfd146b717fc22dff3a26641e8b5c8431df13da9574679d9a3407da62790db8a29286694ea1bfd751cba168f475302ad31cce845cf  help2man-1.49.3.tar.xz
+"
diff --git a/main/hicolor-icon-theme/APKBUILD b/main/hicolor-icon-theme/APKBUILD
index f414df9ecd0..bdaf25cca16 100644
--- a/main/hicolor-icon-theme/APKBUILD
+++ b/main/hicolor-icon-theme/APKBUILD
@@ -1,16 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=hicolor-icon-theme
 pkgver=0.17
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org Hicolor icon theme"
 url="https://www.freedesktop.org/wiki/Software/icon-theme/"
 arch="noarch"
 options="!check"  # Just icon set, no tests.
 license="GPL-2.0-only"
-source="https://icon-theme.freedesktop.org/releases/$pkgname-$pkgver.tar.xz"
+source="https://icon-theme.freedesktop.org/releases/hicolor-icon-theme-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -19,7 +18,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/highlight/APKBUILD b/main/highlight/APKBUILD
index 657a11ed497..8053e3245ae 100644
--- a/main/highlight/APKBUILD
+++ b/main/highlight/APKBUILD
@@ -1,24 +1,31 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaver=5.3
+_luaver=5.4
 pkgname=highlight
-pkgver=3.55
+pkgver=4.11
 pkgrel=0
 pkgdesc="Fast and flexible source code highlighter"
 url="http://www.andre-simon.de/doku/highlight/highlight.html"
 arch="all"
-options="!check"  # No test suite.
+options="!check" # No test suite.
 license="GPL-3.0-or-later"
 makedepends="lua$_luaver-dev boost-dev"
-subpackages="$pkgname-doc"
+subpackages="
+	$pkgname-doc
+	$pkgname-bash-completion
+	$pkgname-fish-completion
+	$pkgname-zsh-completion
+	"
 source="http://www.andre-simon.de/zip/highlight-$pkgver.tar.bz2"
 
 build() {
-	make cli LUAPC=lua$_luaver
+	make cli LUA_PKG_NAME=lua5.4
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="92966cb904f3c0f5fc6c22d0677d08d59d53b0a9ba3a9d9f6ee84c15dd21b345e53de715d329bc3a113c0831d1550ee25892931df8c1fd82de61242c48709e4d  highlight-3.55.tar.bz2"
+sha512sums="
+eb0c92e5dc3ecf280bf6e5a4e68ffb0289a09b3b92fb37756495a5c4e1936800b74385ea0eec2650cae2c690715cc37fd7eeff13e36615410af4c2edd9f2c868  highlight-4.11.tar.bz2
+"
diff --git a/main/hiredis/APKBUILD b/main/hiredis/APKBUILD
index 907a93221a3..f621857982b 100644
--- a/main/hiredis/APKBUILD
+++ b/main/hiredis/APKBUILD
@@ -1,42 +1,50 @@
 # Contributor: Eivind Uggedal <eu@eju.no>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=hiredis
-pkgver=0.14.1
+pkgver=1.2.0
 pkgrel=0
 pkgdesc="Minimalistic C client library for Redis"
 url="https://github.com/redis/hiredis"
 arch="all"
 license="BSD-3-Clause"
+makedepends="openssl-dev>3"
 checkdepends="redis"
-subpackages="$pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz
-	musl-test.patch"
-
+subpackages="$pkgname-ssl $pkgname-dev"
+source="$pkgname-$pkgver-99.tar.gz::https://github.com/redis/hiredis/archive/v$pkgver.tar.gz"
+options="!check" # fail with redis 7 for now for some reason
 
 build() {
-	make PREFIX=/usr DEBUG="$CFLAGS" LDFLAGS="$LDFLAGS"
+	make USE_SSL=1 PREFIX=/usr DEBUG="$CFLAGS" LDFLAGS="$LDFLAGS"
 }
 
 check() {
-	redis-server --dir "$builddir" --unixsocket "$builddir"/redis.sock&
+	redis-server \
+		--dir "$builddir" \
+		--enable-debug-command local \
+		--unixsocket "$builddir"/redis.sock&
 	local _redispid=$!
 
+	make hiredis-test
+
 	# make sure socket is available before we start running tests
 	local _n=100 # wait up to 10 sec
 	while ! [ -e "$builddir"/redis.sock ] && [ $_n -gt 0 ]; do
 		sleep 0.1s
-		_n=$(( $_n - 1))
+		let _n="$_n - 1"
 	done
 
-	make hiredis-test
 	./hiredis-test -s "$builddir"/redis.sock || (kill $_redispid && false)
 	kill $_redispid
 }
 
 package() {
-	make PREFIX="$pkgdir"/usr install
+	make USE_SSL=1 PREFIX="$pkgdir"/usr install
 }
 
+ssl() {
+	amove usr/lib/libhiredis_ssl.so*
+}
 
-sha512sums="a7310f2d65075df0c17636a0220e16487759471a3442b1de2595ab747565f6b6262e37131613b13e396b31050bcbe5529c35d420cd43fd7d500d9d563d469c4f  hiredis-0.14.1.tar.gz
-a16c212e6c391a0434ffbd865b241cebfc6f46acc282ac6a651fb2dea7e30991fe5a2ef267dded03eb13c6d4012d7588f9d1224596da4782bc93b5fd6829c117  musl-test.patch"
+sha512sums="
+f8984abb29c09e7e6b56e656616c5155f36c53da4161a2d4c85688486411cadcdf20aa1adb9bda208c500b401c750871be1c8d58ba9df5328634d00e9d1b6589  hiredis-1.2.0-99.tar.gz
+"
diff --git a/main/hiredis/musl-test.patch b/main/hiredis/musl-test.patch
deleted file mode 100644
index 400f4a9d56d..00000000000
--- a/main/hiredis/musl-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hiredis-0.14.0/test.c
-+++ hiredis-0.14.0_p/test.c
-@@ -439,6 +439,8 @@
-     c = redisConnect((char*)"idontexist.test", 6379);
-     test_cond(c->err == REDIS_ERR_OTHER &&
-         (strcmp(c->errstr,"Name or service not known") == 0 ||
-+         strcmp(c->errstr,"Name does not resolve") == 0 ||
-+         strcmp(c->errstr,"Try again") == 0 ||
-          strcmp(c->errstr,"Can't resolve: idontexist.test") == 0 ||
-          strcmp(c->errstr,"nodename nor servname provided, or not known") == 0 ||
-          strcmp(c->errstr,"No address associated with hostname") == 0 ||
diff --git a/main/hostapd/0001-hostapd-Add-the-missing-CONFIG_SAE-option-to-the-def.patch b/main/hostapd/0001-hostapd-Add-the-missing-CONFIG_SAE-option-to-the-def.patch
new file mode 100644
index 00000000000..97d6e046d9e
--- /dev/null
+++ b/main/hostapd/0001-hostapd-Add-the-missing-CONFIG_SAE-option-to-the-def.patch
@@ -0,0 +1,30 @@
+From 6ff8bda992463a8c0dc34ee18820ca56cf9cccc0 Mon Sep 17 00:00:00 2001
+From: Yegor Yefremov <yegorslists@googlemail.com>
+Date: Wed, 30 Mar 2022 10:11:16 +0200
+Subject: [PATCH] hostapd: Add the missing CONFIG_SAE option to the defconfig
+
+CONFIG_SAE was added to wpa_supplicant's defconfig but wasn't
+added to the hostapd's defconfig file.
+
+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
+---
+ hostapd/defconfig | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/hostapd/defconfig b/hostapd/defconfig
+index 6b50b6c59..611f96ffa 100644
+--- a/hostapd/defconfig
++++ b/hostapd/defconfig
+@@ -161,6 +161,9 @@ CONFIG_IPV6=y
+ # final IEEE 802.11ax version.
+ #CONFIG_IEEE80211AX=y
+ 
++# Simultaneous Authentication of Equals (SAE), WPA3-Personal
++#CONFIG_SAE=y
++
+ # Remove debugging code that is printing out debug messages to stdout.
+ # This can be used to reduce the size of the hostapd considerably if debugging
+ # code is not needed.
+-- 
+2.30.2
+
diff --git a/main/hostapd/APKBUILD b/main/hostapd/APKBUILD
index 098241c17ee..3c2a6020cd8 100644
--- a/main/hostapd/APKBUILD
+++ b/main/hostapd/APKBUILD
@@ -1,30 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=hostapd
-pkgver=2.9
-pkgrel=1
+pkgver=2.10
+pkgrel=6
 pkgdesc="daemon for wireless software access points"
 url="https://w1.fi/hostapd/"
 arch="all"
-license="custom"
-makedepends="openssl-dev libnl3-dev linux-headers"
+license="BSD-3-Clause"
+makedepends="openssl-dev>3 libnl3-dev linux-headers"
 subpackages="$pkgname-doc $pkgname-openrc"
-patches="CVE-2019-16275.patch"
-source="https://w1.fi/releases/$pkgname-$pkgver.tar.gz
-	$patches
+source="https://w1.fi/releases/hostapd-$pkgver.tar.gz
 	$pkgname.initd
 	$pkgname.confd
+	0001-hostapd-Add-the-missing-CONFIG_SAE-option-to-the-def.patch
 	"
 options="!check" #no testsuite
+patch_args="-p2"
 builddir="$srcdir"/$pkgname-$pkgver/hostapd
 
 # secfixes:
+#   2.10-r0:
+#     - CVE-2022-23303
+#     - CVE-2022-23304
+#   2.9-r3:
+#     - CVE-2021-30004
+#   2.9-r2:
+#     - CVE-2020-12695
 #   2.9-r1:
 #     - CVE-2019-16275
 #   2.8-r0:
 #     - CVE-2019-11555
 #     - CVE-2019-9496
-#   2.7-r0:
-#     - CVE-2017-13082
 #   2.6-r2:
 #     - CVE-2017-13077
 #     - CVE-2017-13078
@@ -37,64 +42,70 @@ builddir="$srcdir"/$pkgname-$pkgver/hostapd
 #     - CVE-2017-13088
 
 prepare() {
-	local conf="$builddir/.config"
-
-	cd "$builddir"/..
-	for i in $patches; do
-		msg $i
-		patch -p1 -i "$srcdir"/$i
-	done
+	default_prepare
 
-	cd "$builddir"
 	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
 		hostapd.conf
 
 	# toolchain setup
-	sed \
-		-e '/^#CONFIG_DRIVER_NL80211=y/s/^#//' \
-		-e '/^#CONFIG_RADIUS_SERVER=y/s/^#//' \
-		-e '/^#CONFIG_DRIVER_WIRED=y/s/^#//' \
-		-e '/^#CONFIG_DRIVER_NONE=y/s/^#//' \
-		-e '/^#CONFIG_IEEE80211N=y/s/^#//' \
-		-e '/^#CONFIG_IEEE80211R=y/s/^#//' \
-		-e '/^#CONFIG_IEEE80211AC=y/s/^#//' \
-		-e '/^#CONFIG_FULL_DYNAMIC_VLAN=y/s/^#//' \
-		-e '/^#CONFIG_LIBNL32=y/s/^#//' \
-		-e '/^#CONFIG_ACS=y/s/^#//' \
-		defconfig >> .config
-	echo "CC ?= ${CC:-gcc}" >> .config
-	echo "CFLAGS += -I/usr/include/libnl3" >> .config
-	echo "LIBS += -L/usr/lib" >> .config
+	{
+		sed \
+			-e '/^#CONFIG_DRIVER_NL80211=y/s/^#//' \
+			-e '/^#CONFIG_RADIUS_SERVER=y/s/^#//' \
+			-e '/^#CONFIG_DRIVER_WIRED=y/s/^#//' \
+			-e '/^#CONFIG_DRIVER_NONE=y/s/^#//' \
+			-e '/^#CONFIG_IEEE80211N=y/s/^#//' \
+			-e '/^#CONFIG_IEEE80211R=y/s/^#//' \
+			-e '/^#CONFIG_IEEE80211AC=y/s/^#//' \
+			-e '/^#CONFIG_IEEE80211AX=y/s/^#//' \
+			-e '/^#CONFIG_FULL_DYNAMIC_VLAN=y/s/^#//' \
+			-e '/^#CONFIG_LIBNL32=y/s/^#//' \
+			-e '/^#CONFIG_ACS=y/s/^#//' \
+			-e '/^#CONFIG_WEP=y/s/^#//' \
+			-e '/^#CONFIG_SAE=y/s/^#//' \
+			defconfig
+
+		echo "CC ?= ${CC:-gcc}"
+		echo "CFLAGS += -I/usr/include/libnl3"
+		echo "LIBS += -L/usr/lib"
+	} >> .config
 }
 
 build() {
-	cd "$builddir"
-	make
-	msg "nt_password_hash"
-	make nt_password_hash
+	export CFLAGS="$CFLAGS -flto=auto"
+
+	make all nt_password_hash
 }
 
 package() {
-	cd "$builddir"
-	install -d "$pkgdir"/etc/hostapd
-	install hostapd.conf hostapd.accept hostapd.deny hostapd.eap_user \
-		hostapd.radius_clients hostapd.sim_db hostapd.wpa_psk \
-		"$pkgdir"/etc/hostapd/
+	install -D hostapd.conf \
+		hostapd.accept \
+		hostapd.deny \
+		hostapd.eap_user \
+		hostapd.radius_clients \
+		hostapd.sim_db \
+		hostapd.wpa_psk \
+		-t "$pkgdir"/etc/hostapd/
 
-	install -Dm755 hostapd "$pkgdir"/usr/sbin/hostapd \
-		&& install -Dm755 hostapd_cli "$pkgdir"/usr/bin/hostapd_cli \
-		&& install -Dm755 nt_password_hash \
-			"$pkgdir"/usr/bin/nt_password_hash \
-		&& install -Dm755 "$srcdir"/hostapd.initd \
-			"$pkgdir"/etc/init.d/hostapd \
-		&& install -Dm644 "$srcdir"/hostapd.confd \
-			"$pkgdir"/etc/conf.d/hostapd \
-		&& install -Dm644 hostapd.8 \
-			"$pkgdir"/usr/share/man/man8/hostapd.8 \
-		&& install -Dm644 hostapd_cli.1 \
-			"$pkgdir"/usr/share/man/man1/hostapd_cli
+	install -Dm755 hostapd \
+		-t "$pkgdir"/usr/sbin/
+	install -Dm755 hostapd_cli nt_password_hash \
+		-t "$pkgdir"/usr/bin/
+
+	install -Dm755 "$srcdir"/hostapd.initd \
+		"$pkgdir"/etc/init.d/hostapd
+	install -Dm644 "$srcdir"/hostapd.confd \
+		"$pkgdir"/etc/conf.d/hostapd
+
+	install -Dm644 hostapd.8 \
+		-t "$pkgdir"/usr/share/man/man8/
+	install -Dm644 hostapd_cli.1 \
+		-t "$pkgdir"/usr/share/man/man1/
 }
-sha512sums="66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c  hostapd-2.9.tar.gz
-63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38  CVE-2019-16275.patch
-b54b7c6aa17e5cb86a9b354a516eb2dbefb544df18471339c61d82776de447011a2ac290bea1e6c8beae4b6cebefafb8174683ea42fb773e9e8fe6c679f33ba3  hostapd.initd
-0882263bbd7c0b05bf51f51d66e11a23a0b8ca7da2a3b8a30166d2c5f044c0c134e6bccb1d02c9e81819ca8fb0c0fb55c7121a08fe7233ccaa73ff8ab9a238fe  hostapd.confd"
+
+sha512sums="
+243baa82d621f859d2507d8d5beb0ebda15a75548a62451dc9bca42717dcc8607adac49b354919a41d8257d16d07ac7268203a79750db0cfb34b51f80ff1ce8f  hostapd-2.10.tar.gz
+adeca34c6254ac6fccd84e6f08f8c394225e1b89e2c8771b46da5c85fe3fdabc568628530c39da3ab30b72e98891b07bbdb63f74217e79d6afb9796715d822f1  hostapd.initd
+250b072ae26892d5ba285d717d2742a29c12d52db59f021ff18a5eff709827f9987965539bf3f7b83c03fb8c103ea49604118a1d15056e6f1d8a7ae8043affbb  hostapd.confd
+7cde99c431f1cf746473ae53c3009735c2a718e7038c3bc1629fc45ca85a191d799e975960da96e3cf14a56389ba06eee78453a9dd457941d6af758b730cbd05  0001-hostapd-Add-the-missing-CONFIG_SAE-option-to-the-def.patch
+"
diff --git a/main/hostapd/CVE-2019-16275.patch b/main/hostapd/CVE-2019-16275.patch
deleted file mode 100644
index d764a9db016..00000000000
--- a/main/hostapd/CVE-2019-16275.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Thu, 29 Aug 2019 11:52:04 +0300
-Subject: [PATCH] AP: Silently ignore management frame from unexpected source
- address
-
-Do not process any received Management frames with unexpected/invalid SA
-so that we do not add any state for unexpected STA addresses or end up
-sending out frames to unexpected destination. This prevents unexpected
-sequences where an unprotected frame might end up causing the AP to send
-out a response to another device and that other device processing the
-unexpected response.
-
-In particular, this prevents some potential denial of service cases
-where the unexpected response frame from the AP might result in a
-connected station dropping its association.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/ap/drv_callbacks.c | 13 +++++++++++++
- src/ap/ieee802_11.c    | 12 ++++++++++++
- 2 files changed, 25 insertions(+)
-
-diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
-index 31587685fe3b..34ca379edc3d 100644
---- a/src/ap/drv_callbacks.c
-+++ b/src/ap/drv_callbacks.c
-@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
- 			   "hostapd_notif_assoc: Skip event with no address");
- 		return -1;
- 	}
-+
-+	if (is_multicast_ether_addr(addr) ||
-+	    is_zero_ether_addr(addr) ||
-+	    os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) {
-+		/* Do not process any frames with unexpected/invalid SA so that
-+		 * we do not add any state for unexpected STA addresses or end
-+		 * up sending out frames to unexpected destination. */
-+		wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR
-+			   " in received indication - ignore this indication silently",
-+			   __func__, MAC2STR(addr));
-+		return 0;
-+	}
-+
- 	random_add_randomness(addr, ETH_ALEN);
- 
- 	hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
-diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
-index c85a28db44b7..e7065372e158 100644
---- a/src/ap/ieee802_11.c
-+++ b/src/ap/ieee802_11.c
-@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len,
- 	fc = le_to_host16(mgmt->frame_control);
- 	stype = WLAN_FC_GET_STYPE(fc);
- 
-+	if (is_multicast_ether_addr(mgmt->sa) ||
-+	    is_zero_ether_addr(mgmt->sa) ||
-+	    os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) {
-+		/* Do not process any frames with unexpected/invalid SA so that
-+		 * we do not add any state for unexpected STA addresses or end
-+		 * up sending out frames to unexpected destination. */
-+		wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR
-+			   " in received frame - ignore this frame silently",
-+			   MAC2STR(mgmt->sa));
-+		return 0;
-+	}
-+
- 	if (stype == WLAN_FC_STYPE_BEACON) {
- 		handle_beacon(hapd, mgmt, len, fi);
- 		return 1;
--- 
-2.20.1
-
diff --git a/main/hostapd/hostapd.confd b/main/hostapd/hostapd.confd
index 60381153aa6..6c01a071c45 100644
--- a/main/hostapd/hostapd.confd
+++ b/main/hostapd/hostapd.confd
@@ -1,5 +1,10 @@
-# Space separated list of configuration files
-CONFIGS="/etc/hostapd/hostapd.conf"
+# Configuration for /etc/init.d/hostapd
 
-# Extra options to pass to hostapd, see hostapd(8)
-OPTIONS=""
+# Path to the hostapd configuration file or multiple files separated by space.
+#cfgfile="/etc/hostapd/hostapd.conf"
+
+# Extra options to pass to hostapd, see hostapd(8).
+#command_args=""
+
+# Uncomment to run with process supervisor.
+# supervisor="supervise-daemon"
diff --git a/main/hostapd/hostapd.initd b/main/hostapd/hostapd.initd
index 7813fd19d15..a7b603342de 100644
--- a/main/hostapd/hostapd.initd
+++ b/main/hostapd/hostapd.initd
@@ -1,46 +1,34 @@
 #!/sbin/openrc-run
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hostapd/files/hostapd-0.6.9-init.d,v 1.2 2009/05/17 10:18:18 gurligebis Exp $
+
+name="hostapd"
+description="User space daemon for access point and authentication servers"
 
 extra_started_commands="reload"
 
+# $CONFIGS and $OPTIONS are deprecated since Alpine v3.17.
+# NOTE: cfgfile can contain more than one file path in this case.
+: ${cfgfile:=${CONFIGS:-"/etc/hostapd/hostapd.conf"}}
+
+command="/usr/sbin/hostapd"
+command_args="${command_args:-$OPTIONS} $cfgfile"
+command_background="yes"
+pidfile="/run/$RC_SVCNAME.pid"
+
+required_files="$cfgfile"
+
 depend() {
 	need net
 	after firewall
 	use logger
 }
 
-checkconfig() {
-	local file
-
-	for file in ${CONFIGS}; do
-		if [ ! -r "${file}" ]; then
-			eerror "hostapd configuration file (${CONFIG}) not found"
-			return 1
-		fi
-	done
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/sbin/hostapd \
-		-- -B ${OPTIONS} ${CONFIGS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/sbin/hostapd
-	eend $?
-}
-
 reload() {
-	checkconfig || return 1
+	ebegin "Reloading $name configuration"
 
-	ebegin "Reloading ${SVCNAME} configuration"
-	kill -HUP $(pidof /usr/sbin/hostapd) > /dev/null 2>&1
+	if [ "$supervisor" ]; then
+		$supervisor "$RC_SVCNAME" --signal HUP
+	else
+		start-stop-daemon --signal HUP --pidfile "$pidfile"
+	fi
 	eend $?
 }
diff --git a/main/htop/APKBUILD b/main/htop/APKBUILD
index cc63071c1e6..4cd5c8ee70b 100644
--- a/main/htop/APKBUILD
+++ b/main/htop/APKBUILD
@@ -1,22 +1,18 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=htop
-pkgver=2.2.0
+pkgver=3.3.0
 pkgrel=0
 pkgdesc="Interactive process viewer"
-url="http://hisham.hm/htop"
+url="https://htop.dev/"
 arch="all"
 license="GPL-2.0-or-later"
-depends=""
-makedepends="ncurses-dev python3"
+makedepends="ncurses-dev python3 linux-headers lm-sensors-dev"
 subpackages="$pkgname-doc"
+source="https://github.com/htop-dev/htop/releases/download/$pkgver/htop-$pkgver.tar.xz"
 options="!check" # no upstream/available test-suite
-source="http://hisham.hm/htop/releases/$pkgver/$pkgname-$pkgver.tar.gz
-	fix-python-path.patch"
 
-builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,9 +26,9 @@ build() {
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" pixmapdir=/usr/share/icons/hicolor/128x128/apps install
 }
 
-sha512sums="ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e  htop-2.2.0.tar.gz
-f2eeafb7207ba14dc7577aa85618adb71fb689a42476d04c99f6be01e8c6ac77cd5ed8ee056b80ddb60c821e1d2c44ebcf4da40960c3b7e8bb3a0d64aad0fd9a  fix-python-path.patch"
+sha512sums="
+f98d4a4370954969d0ae16993d80ca5ce48670a711f17445de979513ac9caf2b197291732d937ae07d48709ded660ea09601b3a41ad7c48b3abb87e7a67deb65  htop-3.3.0.tar.xz
+"
diff --git a/main/htop/fix-python-path.patch b/main/htop/fix-python-path.patch
deleted file mode 100644
index 2bf34705160..00000000000
--- a/main/htop/fix-python-path.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/scripts/MakeHeader.py
-+++ b/scripts/MakeHeader.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- import os, sys, string, io
- try:
-    from StringIO import StringIO
diff --git a/main/http-parser/APKBUILD b/main/http-parser/APKBUILD
deleted file mode 100644
index 5ae42220613..00000000000
--- a/main/http-parser/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Jakub Jirutka <jakub@jirutka.cz>
-# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
-pkgname=http-parser
-pkgver=2.9.3
-pkgrel=0
-pkgdesc="HTTP request/response parser for C"
-url="https://github.com/nodejs/http-parser"
-arch="all"
-license="MIT"
-subpackages="$pkgname-dev"
-# Note: All the patches are copied from Gentoo ebuild.
-# upstream: https://github.com/nodejs/http-parser/pull/272
-source="$pkgname-$pkgver.tar.gz::https://github.com/nodejs/http-parser/archive/v$pkgver.tar.gz"
-
-build() {
-	make library
-}
-
-check() {
-	make test
-}
-
-package() {
-	make install DESTDIR="$pkgdir" PREFIX="/usr"
-}
-
-sha512sums="d200c52f594192ba80a8d5b59d414404843f8601dac647f29c27845db75ac1f015789031e30e91aaab5b553af1ee6af50b90f9342a444c10c1027e10fdb9a31b  http-parser-2.9.3.tar.gz"
diff --git a/main/hunspell-en/APKBUILD b/main/hunspell-en/APKBUILD
index 0bdbc458d5f..261450eb8fb 100644
--- a/main/hunspell-en/APKBUILD
+++ b/main/hunspell-en/APKBUILD
@@ -1,45 +1,39 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=hunspell-en
-pkgver=2019.10.06
-pkgrel=0
+pkgver=2020.12.07
+pkgrel=4
 pkgdesc="English hunspell dictionaries"
 url="http://wordlist.aspell.net/dicts/"
 arch="noarch"
-license="LGPL-2.0-or-later scowl"
+license="custom"
 subpackages="$pkgname-doc"
-options="!check" # data only package
+options="!check !spdx" # data only package
 source="https://downloads.sourceforge.net/project/wordlist/speller/$pkgver/hunspell-en_US-$pkgver.zip
 	https://downloads.sourceforge.net/project/wordlist/speller/$pkgver/hunspell-en_CA-$pkgver.zip
+	https://downloads.sourceforge.net/project/wordlist/speller/$pkgver/hunspell-en_AU-$pkgver.zip
 	https://downloads.sourceforge.net/project/wordlist/speller/$pkgver/hunspell-en_GB-large-$pkgver.zip
+	apostrophe.patch
 	"
+builddir="$srcdir"
 
-unpack() {
-	msg "Unpacking sources..."
-	mkdir -p "$builddir"
-	cd "$builddir"
-	for u in $source; do
-		local s="$SRCDEST/$(filename_from_uri $u)"
-		unzip $s
-	done
-}
+_languages="en_ag en_au en_bs en_bw en_bz en_ca en_dk en_gb en_gh en_hk en_ie en_in en_jm en_na en_ng en_nz en_ph en_sg en_tt en_us en_za en_zw"
+for _language in $_languages; do
+	_subpkgname=$pkgname-${_language##en_}
 
-prepare() {
-	cd "$builddir"
-	default_prepare
-	sed -i "s:SET UTF8:SET UTF-8:g"  *.aff
-}
+	depends="$depends $_subpkgname=$pkgver-r$pkgrel"
+	subpackages="$subpackages $_subpkgname:_split_langs"
+done
 
 package() {
-	cd "$builddir"
-
 	install -dm755 "$pkgdir"/usr/share/hunspell
 	install -m644 en_*.dic en_*.aff "$pkgdir"/usr/share/hunspell
 
 	local lang
-	for lang in en_AG en_AU en_BS en_BW en_BZ en_DK en_GB en_GH en_HK en_IE en_IN en_JM en_NA en_NG en_NZ en_SG en_TT en_ZA en_ZW; do
+	for lang in en_AG en_BS en_BW en_BZ en_DK en_GB en_GH en_HK en_IE en_IN en_JM en_NA en_NG en_NZ en_SG en_TT en_ZA en_ZW; do
 		ln -svf en_GB-large.aff "$pkgdir"/usr/share/hunspell/$lang.aff
 		ln -svf en_GB-large.dic "$pkgdir"/usr/share/hunspell/$lang.dic
 	done
+	# shellcheck disable=2043
 	for lang in en_PH; do
 		ln -svf en_US.aff "$pkgdir"/usr/share/hunspell/$lang.aff
 		ln -svf en_US.dic "$pkgdir"/usr/share/hunspell/$lang.dic
@@ -55,6 +49,33 @@ package() {
 	install -D -m644 README_en_GB-large.txt "$pkgdir"/usr/share/licenses/$pkgname/Copyright_en_GB-large
 }
 
-sha512sums="14c50a2fd7d390aa1fe20dd1f5e9536bcfd9a36cf829532b340cfc86f72e6415cd41a28e23be67be5a87482bad2af7d7b961524eff10449cad6923518ae0612a  hunspell-en_US-2019.10.06.zip
-a2a7526686f950311fdecc24010f4a79081fb2f2e65b588f817e7bcf9e17c902f72139674fa8d7272f16cf43126cd8468f2e38c7edccc9083b8a2916c0026ce0  hunspell-en_CA-2019.10.06.zip
-51d9268f02b54804ef364d67e3f38d428abfacac1995186751b2e46477c570653e8fa58fcdc561040a6a03c9aa90631b8c46f3df6250ff04aa7c95a5ef6af886  hunspell-en_GB-large-2019.10.06.zip"
+_split_langs() {
+	_variant=$(echo ${subpkgname#"$pkgname"-} | tr '[:lower:]' '[:upper:]')
+
+	depends=""
+	pkgdesc="English hunspell dictionaries ($_variant only)"
+
+	amove "usr/share/hunspell/en_$_variant*.aff"
+	amove "usr/share/hunspell/en_$_variant*.dic"
+
+	if [ -f "$pkgdir"/usr/share/licenses/$pkgname/Copyright_en_$_variant ]; then
+		amove usr/share/licenses/$pkgname/Copyright_en_$_variant
+	fi
+	if [ -f "$pkgdir"/usr/share/licenses/$pkgname/Copyright_en_$_variant-large ]; then
+		amove usr/share/licenses/$pkgname/Copyright_en_$_variant-large
+	fi
+	if [ -f "$pkgdir"/usr/share/doc/hunspell-en/README_en_$_variant.txt ]; then
+		amove usr/share/doc/hunspell-en/README_en_$_variant.txt
+	fi
+	if [ -f "$pkgdir"/usr/share/doc/hunspell-en/README_en_$_variant-large.txt ]; then
+		amove usr/share/doc/hunspell-en/README_en_$_variant-large.txt
+	fi
+}
+
+sha512sums="
+a35ff630883e2410164e21669e6a46d15c73c76d969829cbf20903949dc7815886c0907f192aad9d363f777dcc9acfbd1e60c8175fbebf14d551e1d6e524c075  hunspell-en_US-2020.12.07.zip
+6e34bddbc1f8fd37c4b57d4520cd89a1f301430e7202cc35b0918ca856ff3eaba00743ef904a8b89f806812729976169826857a0fa2f452dd0ed922eeb6a9303  hunspell-en_CA-2020.12.07.zip
+626ea0f54e6203e9824cf2473d72e3e395966bf295adeef7cc02a83b2a20c30af1b1241384eb919f72fc8ee6c36cc351a754453004ec55c0e5f8168d2cd45da2  hunspell-en_AU-2020.12.07.zip
+a402c40717cd185ea8c14be2d4dc7df67580f197d276ae660a7cf478ae3e07e469c78271feb0c4c6b7c1c418bfb10e7f42c1e5f4b9635a4d3c47e1af4a747a4c  hunspell-en_GB-large-2020.12.07.zip
+09f4ff19e628cb58bc43a62fd39bb9be88ef0e0d262d2462b44db15d0f4a222aa74d5a1798aed13260eb874ff6be9cd7a2f21f5fd96ba9b27c26a9432253d0a8  apostrophe.patch
+"
diff --git a/main/hunspell-en/apostrophe.patch b/main/hunspell-en/apostrophe.patch
new file mode 100644
index 00000000000..27a461a7106
--- /dev/null
+++ b/main/hunspell-en/apostrophe.patch
@@ -0,0 +1,36 @@
+Patch-Source: https://src.fedoraproject.org/rpms/hunspell-en/blob/867a4c3e890757878ec8a45c22701640a8b4817f/f/hunspell-en-allow-non-typographical.marks.patch
+(inspired)
+--
+--- a/en_CA.aff
++++ b/en_CA.aff
+@@ -14,7 +14,7 @@
+ COMPOUNDRULE 2
+ COMPOUNDRULE n*1t
+ COMPOUNDRULE n*mp
+-WORDCHARS 0123456789
++WORDCHARS 0123456789'
+ 
+ PFX A Y 1
+ PFX A   0     re         .
+--- a/en_US.aff
++++ b/en_US.aff
+@@ -14,7 +14,7 @@
+ COMPOUNDRULE 2
+ COMPOUNDRULE n*1t
+ COMPOUNDRULE n*mp
+-WORDCHARS 0123456789
++WORDCHARS 0123456789'
+ 
+ PFX A Y 1
+ PFX A   0     re         .
+--- a/en_GB-large.aff
++++ b/en_GB-large.aff
+@@ -14,7 +14,7 @@
+ COMPOUNDRULE 2
+ COMPOUNDRULE n*1t
+ COMPOUNDRULE n*mp
+-WORDCHARS 0123456789
++WORDCHARS 0123456789'
+ 
+ PFX A Y 1
+ PFX A   0     re         .
diff --git a/main/hunspell-pt-br/APKBUILD b/main/hunspell-pt-br/APKBUILD
index f75569144a3..4bd2bf7f5d6 100644
--- a/main/hunspell-pt-br/APKBUILD
+++ b/main/hunspell-pt-br/APKBUILD
@@ -1,22 +1,19 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=hunspell-pt-br
 pkgver=20131017
-pkgrel=0
+pkgrel=2
 pkgdesc="Portuguese (Brazil) hunspell dictionaries"
-url="http://pt-br.libreoffice.org/"
+url="https://pt-br.libreoffice.org/"
 arch="noarch"
-license="LGPL-3.0 MPL"
-depends=""
-makedepends=""
+license="LGPL-3.0-only AND MPL-1.1"
 source="https://pt-br.libreoffice.org/assets/Uploads/PT-BR-Documents/VERO/VeroptBRV320AOC.oxt
 	"
-
-_builddir="$srcdir"/$pkgname-$pkgver
+options="!check"
 
 unpack() {
 	msg "Unpacking sources..."
-	mkdir -p "$_builddir"
-	cd "$_builddir"
+	mkdir -p "$builddir"
+	cd "$builddir"
 	for u in $source; do
 		local s="$SRCDEST/$(filename_from_uri $u)"
 		case "$s" in
@@ -25,19 +22,13 @@ unpack() {
 	done
 }
 
-build() {
-	:
-}
-
 package() {
-	cd "$_builddir"
-
 	install -dm755 $pkgdir/usr/share/hunspell
 	install -m644 pt_BR.dic pt_BR.aff $pkgdir/usr/share/hunspell
 
 	# docs
-	install -dm755 ${pkgdir}/usr/share/doc/$pkgname
-	install -m644 README_pt_BR.txt ${pkgdir}/usr/share/doc/$pkgname
+	install -dm755 $pkgdir/usr/share/doc/$pkgname
+	install -m644 README_pt_BR.txt $pkgdir/usr/share/doc/$pkgname
 }
 
 sha512sums="217d25ecc532c4b3386593cea4d430094ec4badb81e12648d3ca87a7f2e29243a94028a1287ff50db4532c6e1a33e52a0839fd0d45ae8c167bc89df940209b14  VeroptBRV320AOC.oxt"
diff --git a/main/hunspell-pt/APKBUILD b/main/hunspell-pt/APKBUILD
index 7f51471b84a..46d49433695 100644
--- a/main/hunspell-pt/APKBUILD
+++ b/main/hunspell-pt/APKBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=hunspell-pt
-pkgver=20190329
-pkgrel=0
+pkgver=20201212
+pkgrel=1
 pkgdesc="Portuguese hunspell dictionaries"
-url="http://natura.di.uminho.pt/download/sources/Dictionaries/hunspell/"
+url="https://natura.di.uminho.pt/download/sources/Dictionaries/hunspell/"
 arch="noarch"
 options="!check" # data only package
 license="GPL-2.0-or-later AND LGPL-2.1-or-later AND MPL-1.1"
@@ -13,8 +13,6 @@ source="http://natura.di.uminho.pt/download/sources/Dictionaries/hunspell/hunspe
 builddir="$srcdir"/hunspell-pt_PT-$pkgver
 
 package() {
-	cd "$builddir"
-
 	install -dm755 $pkgdir/usr/share/hunspell
 	install -m644 pt_*.dic pt_*.aff $pkgdir/usr/share/hunspell
 
@@ -25,8 +23,8 @@ package() {
 	done
 
 	# docs
-	install -dm755 ${pkgdir}/usr/share/doc/$pkgname
+	install -dm755 $pkgdir/usr/share/doc/$pkgname
 	install -m644 README_pt*.txt $pkgdir/usr/share/doc/$pkgname
 }
 
-sha512sums="b250f9d2a9ea41d757a9f986d3774a794ab7b3936d2313c2944f7d1e193ccbba1e6010b3d2ce387bb898ec3b2e6bffa510d25a349270db41feaf0633ae2b4bcd  hunspell-pt_PT-20190329.tar.gz"
+sha512sums="40c8c3bd2533868771bb255051bdfedf1aa4d2e60a41ba0fb50d8424217a17def927530f1258c0ac2ae4032ca44ebec36e4ed567e3bcf46bb66c7dc2a7710d76  hunspell-pt_PT-20201212.tar.gz"
diff --git a/main/hunspell/APKBUILD b/main/hunspell/APKBUILD
index e7862047638..e676907c932 100644
--- a/main/hunspell/APKBUILD
+++ b/main/hunspell/APKBUILD
@@ -1,29 +1,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=hunspell
-pkgver=1.7.0
-pkgrel=1
+pkgver=1.7.2
+pkgrel=4
 pkgdesc="Spell checker and morphological analyzer library and program"
 url="https://hunspell.github.io/"
 arch="all"
-license="GPL-2.0-or-later LGPL-2.0-or-later MPL-1.1"
+license="GPL-2.0-or-later OR LGPL-2.1-or-later OR MPL-1.1"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang lib$pkgname:libs"
-makedepends="gettext-dev ncurses-dev readline-dev autoconf automake libtool"
-source="$pkgname-$pkgver.tar.gz::https://github.com/hunspell/hunspell/archive/v$pkgver.tar.gz
-	CVE-2019-16707.patch
-	"
+makedepends="gettext-dev ncurses-dev readline-dev"
+checkdepends="bash"
+source="https://github.com/hunspell/hunspell/releases/download/v$pkgver/hunspell-$pkgver.tar.gz"
 
 # secfixes:
 #   1.7.0-r1:
 #     - CVE-2019-16707
 
 prepare() {
-	cd "$builddir"
-	default_prepare
-	autoreconf -vif
+ 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -36,14 +34,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903  hunspell-1.7.0.tar.gz
-e7674819a9da4c3d742d34338d68d137d8613f97be2d25bf20db5219d4dd626f59a63ed4757b92f34307f499f2d687014065cdea97b55c98db295a8290300d2d  CVE-2019-16707.patch"
+sha512sums="
+49b3619bff12e111b6cc3f3d9463612b116f9b2a976896718e65f5bc4a83ece11100aaf56a4d18127ea39107446c495e12affe5ff3c9159ae8aba70e512f44ac  hunspell-1.7.2.tar.gz
+"
diff --git a/main/hunspell/CVE-2019-16707.patch b/main/hunspell/CVE-2019-16707.patch
deleted file mode 100644
index 649eef5b293..00000000000
--- a/main/hunspell/CVE-2019-16707.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From ac938e2ecb48ab4dd21298126c7921689d60571b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Tue, 12 Nov 2019 20:03:15 +0000
-Subject: [PATCH] invalid read memory access #624
-
----
- src/hunspell/suggestmgr.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/hunspell/suggestmgr.cxx b/src/hunspell/suggestmgr.cxx
-index dba084e9..c23f165a 100644
---- a/src/hunspell/suggestmgr.cxx
-+++ b/src/hunspell/suggestmgr.cxx
-@@ -2040,7 +2040,7 @@ int SuggestMgr::leftcommonsubstring(
-   int l2 = su2.size();
-   // decapitalize dictionary word
-   if (complexprefixes) {
--    if (su1[l1 - 1] == su2[l2 - 1])
-+    if (l1 && l2 && su1[l1 - 1] == su2[l2 - 1])
-       return 1;
-   } else {
-     unsigned short idx = su2.empty() ? 0 : (su2[0].h << 8) + su2[0].l;
diff --git a/main/hvtools/APKBUILD b/main/hvtools/APKBUILD
index d15d3bce8de..3da62ee552a 100644
--- a/main/hvtools/APKBUILD
+++ b/main/hvtools/APKBUILD
@@ -2,12 +2,13 @@
 pkgname=hvtools
 pkgver=4.11.9
 _kernver=${pkgver%.*}
-pkgrel=1
+pkgrel=4
 pkgdesc="Hyper-v tools"
 url="https://www.kernel.org/"
 arch="all"
 license="GPL-2.0-only"
 makedepends="$depends_dev linux-headers"
+subpackages="$pkgname-openrc"
 source="https://kernel.org/pub/linux/kernel/v4.x/linux-$_kernver.tar.xz
 	https://kernel.org/pub/linux/kernel/v4.x/patch-$pkgver.xz
 	hv_kvp_daemon.initd
@@ -16,6 +17,7 @@ source="https://kernel.org/pub/linux/kernel/v4.x/linux-$_kernver.tar.xz
 	"
 
 builddir="$srcdir"/linux-$_kernver
+options="!check"
 
 prepare() {
 	if [ "${pkgver%.0}" = "$pkgver" ]; then
diff --git a/main/hwdata/APKBUILD b/main/hwdata/APKBUILD
new file mode 100644
index 00000000000..4e56c2eb9ea
--- /dev/null
+++ b/main/hwdata/APKBUILD
@@ -0,0 +1,74 @@
+# Maintainer: Simon Zeni <simon@bl4ckb0ne.ca>
+pkgname=hwdata
+pkgver=0.381
+pkgrel=0
+pkgdesc="Hardware identification and configuration data"
+url="https://github.com/vcrhonek/hwdata"
+arch="noarch"
+license="GPL-2.0-or-later OR XFree86-1.1"
+subpackages="$pkgname-dev $pkgname-usb $pkgname-pci $pkgname-pnp $pkgname-net"
+source="$pkgname-$pkgver.tar.gz::https://github.com/vcrhonek/hwdata/archive/refs/tags/v$pkgver.tar.gz"
+options="!check" # just firmware data
+
+replaces="hwids"
+# be higher since hwids was a large date version
+provides="hwids=20220101-r$pkgrel"
+builddir="$srcdir/$pkgname-$pkgver"
+
+build() {
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--disable-blacklist
+}
+
+package() {
+	depends="
+		$pkgname-usb=$pkgver-r$pkgrel
+		$pkgname-pci=$pkgver-r$pkgrel
+		$pkgname-pnp=$pkgver-r$pkgrel
+		$pkgname-net=$pkgver-r$pkgrel
+		"
+	make -j1 DESTDIR="$pkgdir" install
+}
+
+dev() {
+	default_dev
+	depends="$pkgname=$pkgver-r$pkgrel"
+}
+
+usb() {
+	pkgdesc="$pkgdesc (usb data)"
+	provides="hwids-usb=20220101-r$pkgrel"
+	replaces="hwids-usb"
+
+	amove usr/share/hwdata/usb.ids
+}
+
+pci() {
+	pkgdesc="$pkgdesc (pci data)"
+	provides="hwids-pci=20220101-r$pkgrel"
+	replaces="hwids-pci"
+
+	amove usr/share/hwdata/pci.ids
+}
+
+net() {
+	pkgdesc="$pkgdesc (net data)"
+	provides="hwids-net=20220101-r$pkgrel"
+	replaces="hwids-net"
+
+	amove usr/share/hwdata/oui.txt
+	amove usr/share/hwdata/iab.txt
+}
+
+pnp() {
+	pkgdesc="$pkgdesc (pnp data)"
+
+	amove usr/share/hwdata/pnp.ids
+}
+
+sha512sums="
+683fa1df2f04b768b95ac77ab785c5fee8ed1ce352d8367fca2346330aa0a563bb66765df4413ce012a1ab224cb2af9b90d44e4d57d38affd7c7d88383dd97bc  hwdata-0.381.tar.gz
+"
diff --git a/main/hwids/APKBUILD b/main/hwids/APKBUILD
deleted file mode 100644
index 64bc8963285..00000000000
--- a/main/hwids/APKBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=hwids
-pkgver=20200306
-pkgrel=0
-pkgdesc="Hardware identification databases"
-url="https://github.com/gentoo/hwids/"
-arch="noarch"
-options="!check"  # No test suite, just databases.
-license="BSD-3-Clause OR GPL-2.0-or-later"
-makedepends="eudev-dev"
-subpackages="$pkgname-net $pkgname-pci $pkgname-udev $pkgname-usb"
-depends="$subpackages"
-subpackages="$subpackages $pkgname-doc"
-source="https://github.com/gentoo/hwids/archive/hwids-$pkgver.tar.gz"
-builddir="$srcdir/hwids-hwids-$pkgver"
-
-build() {
-	make UDEV=yes
-}
-
-package() {
-	make DESTDIR="$pkgdir" DOCDIR="/usr/share/doc/$pkgname-$pkgver" \
-		MISCDIR="/usr/share/hwdata" UDEV=yes install
-}
-
-_mv() {
-	local _file
-	pkgdesc="$pkgdesc ($1)"
-	shift
-	depends=""
-	mkdir -p "$subpkgdir"/usr/share/hwdata
-	for _file in $*; do
-		mv "$pkgdir"/usr/share/hwdata/$_file "$subpkgdir"/usr/share/hwdata
-	done
-}
-
-usb() {
-	replaces="hwdata-usb"
-	provides="hwdata-usb=$pkgver-r$pkgrel"
-	_mv "USB IDs" usb.ids
-}
-
-pci() {
-	replaces="hwdata-pci"
-	provides="hwdata-pci=$pkgver-r$pkgrel"
-	_mv "PCI IDs" pci.ids
-}
-
-net() {
-	replaces="hwdata-oui hwdata"
-	provides="hwdata-oui=$pkgver-r$pkgrel"
-	license="Public-Domain"
-	_mv "Networking OUIs" oui.txt iab.txt
-}
-
-udev() {
-	install_if="hwids=$pkgver-r$pkgrel eudev"
-	install_if="hwids-pci=$pkgver-r$pkgrel eudev"
-	install_if="hwids-usb=$pkgver-r$pkgrel eudev"
-	pkgdesc="$pkgdesc (udev integration)"
-
-	mkdir -p "$subpkgdir"/
-	mv "$pkgdir"/lib "$subpkgdir"/
-	mv "$pkgdir"/etc "$subpkgdir"/
-}
-
-sha512sums="eff1d2783925ca459b387fbaa5cf68a98aa4209ab8509ad92a902b4d02cc7f4a47e5506c2beed4c792d24a8ab636ad77b376a92b59ae4f605d1b5258350ff250  hwids-20200306.tar.gz"
diff --git a/main/hwloc/APKBUILD b/main/hwloc/APKBUILD
new file mode 100644
index 00000000000..4a2d8c01459
--- /dev/null
+++ b/main/hwloc/APKBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Krassy Boykinov <kboykinov@teamcentrixx.com>
+pkgname=hwloc
+pkgver=2.10.0
+pkgrel=0
+pkgdesc="Portable abstraction of hierarchical hardware architectures"
+url="https://www.open-mpi.org/"
+arch="all"
+license="BSD-3-Clause"
+makedepends="cairo-dev eudev-dev libxml2-dev ncurses-dev"
+case "$CARCH" in
+	arm*) true;;
+	*) makedepends="$makedepends numactl-dev";;
+esac
+options="!check" # fails on multiple arches with different tests
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-bash-completion
+	$pkgname-tools
+	"
+source="https://www.open-mpi.org/software/hwloc/v${pkgver%.*}/downloads/hwloc-$pkgver.tar.bz2"
+
+build() {
+	./configure \
+		--prefix=/usr \
+		--sbindir=/usr/bin \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	rm "$pkgdir"/usr/share/hwloc/hwloc-dump-hwdata.service
+}
+
+doc() {
+	default_doc
+
+	amove usr/share/hwloc/hwloc-ps.www
+	amove usr/share/hwloc/hwloc*.dtd
+}
+
+tools() {
+	pkgdesc="Portable hardware locality tools"
+
+	amove usr/bin
+	amove usr/share/applications/lstopo.desktop
+}
+
+sha512sums="
+8fcf448ef16874862e5cf5a814ecc4885d53817369640bb8a0079b0c7d9294b3933a6a8cf2472e8e104a5c346e09e1fffab401a1976d7b2da0457f0c5271a18a  hwloc-2.10.0.tar.bz2
+"
diff --git a/main/hylafax/APKBUILD b/main/hylafax/APKBUILD
index c78855040fa..3a488ede5c3 100644
--- a/main/hylafax/APKBUILD
+++ b/main/hylafax/APKBUILD
@@ -2,20 +2,24 @@
 # Maintainer: Cameron Banta <cbanta@gmail.com>
 pkgname=hylafax
 pkgver=6.0.7
-pkgrel=3
+pkgrel=10
 pkgdesc="Sends and receives faxes"
 url="http://www.hylafax.org/"
-arch="all"
+arch="" # https://gitlab.alpinelinux.org/alpine/aports/-/issues/15384
 license="MIT"
 #depends on gcc for libgcc_s.so, it's scripts are hardcoded to bash
 depends="ghostscript bash tiff-tools"
-makedepends="zlib-dev tiff-dev<4.2 gettext-dev"
-subpackages="$pkgname-doc $pkgname-lang"
+makedepends="zlib-dev tiff-dev gettext-dev"
+subpackages="$pkgname-doc $pkgname-lang $pkgname-openrc"
 source="ftp://ftp.hylafax.org/source/hylafax-$pkgver.tar.gz
 	$pkgname.initd
 	$pkgname.confd
 	hylafax-charset.patch
-	libtiff-41-compatibility.patch"
+	tiff-compat.patch
+	tiff-4.5.patch
+	format-security.patch
+	"
+options="!check"
 
 # secfixes:
 #   6.0.6-r5:
@@ -90,8 +94,12 @@ package() {
 		"$pkgdir"/etc/conf.d/$pkgname
 }
 
-sha512sums="fc57feb416772a7a4bfaf5c3c76a0c2254ead2f63a72b3dfa465444327d440345a0402b7c7dad14f6d03029302ef39cf160c8ef5bfdee2c966fd15fbaac230a3  hylafax-6.0.7.tar.gz
+sha512sums="
+fc57feb416772a7a4bfaf5c3c76a0c2254ead2f63a72b3dfa465444327d440345a0402b7c7dad14f6d03029302ef39cf160c8ef5bfdee2c966fd15fbaac230a3  hylafax-6.0.7.tar.gz
 012e204ee7f86804c8cb249f6c53452b7a36b7140aa4d8f61c5c63cfe1fdfb84c42be46b1e39ca37766d9fcb209db7d96a32a01108d1e66a8f7df28e72167ce0  hylafax.initd
 3c07726cc9d7351dceb80a46354c6626e54b033b0f434c1db01db2a3b3ab5e9084d551dd23cae3ab40806f27aa5fa0a5b70c43a6b7802356871c0b343baa2376  hylafax.confd
 f97c805a62dfcb57f85f614b6eb28bd6b58e0582ce4f9aa5166337a46d453ea038a098223d879d120f51454008a5e8ed2fa60ba6e8be12af7b7d5a4927c51471  hylafax-charset.patch
-ba4c2724e81e156fb603f22dc80fb25399d8661e1a2c176371d5ee36647e8c3710a3dfa3be97340aaba8631d8cee6c31c71829bd824cd6c4cd6239d947df0fcf  libtiff-41-compatibility.patch"
+0e5efd8d0924857958b44cfac36649fe3143dd45c9b0275da9c9b801d88102e26b857fecd4a9dae6916126959bbb38cd230a1083cabb6fd973478b850226ce37  tiff-compat.patch
+74987e151ad36c055179ecf7f716b8927eb76cd7bc056def2b2b93cb71c800f3330b0c57cd19e38281af7181952ec9d851cfb35ba36b3a30c66b92c14f7cb499  tiff-4.5.patch
+57e04c5e575a02b3a64bab910e985532dfcf96c8c8613cbb918ee9b7114d4caedf309a27db5ccda3ff3dad97da76e9c3f0c9c81e1c9deab7b71c94411b9b5154  format-security.patch
+"
diff --git a/main/hylafax/format-security.patch b/main/hylafax/format-security.patch
new file mode 100644
index 00000000000..a648d0c182b
--- /dev/null
+++ b/main/hylafax/format-security.patch
@@ -0,0 +1,110 @@
+Patch-Source: https://github.com/ifax/HylaFAX/pull/1
+--
+From 9afcaa405e05a3ec3c79091e96f7255b8de86981 Mon Sep 17 00:00:00 2001
+From: XieJiSS <XieJiSS@users.noreply.github.com>
+Date: Mon, 29 Nov 2021 18:59:48 +0800
+Subject: [PATCH] fix: add %s for (f)printf to build on gcc>=10
+
+---
+ libhylafax/FaxClient.c++  |  2 +-
+ libhylafax/SNPPClient.c++ |  2 +-
+ libhylafax/TextFormat.c++ |  2 +-
+ libhylafax/TypeRules.c++  | 12 ++++++------
+ 4 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/libhylafax/FaxClient.c++ b/libhylafax/FaxClient.c++
+index 9a5d375..b6de282 100644
+--- a/libhylafax/FaxClient.c++
++++ b/libhylafax/FaxClient.c++
+@@ -116,7 +116,7 @@ FaxClient::printWarning(const char* fmt ...)
+ void
+ FaxClient::vprintWarning(const char* fmt, va_list ap)
+ {
+-    fprintf(stderr, NLS::TEXT("Warning, "));
++    fprintf(stderr, "%s", NLS::TEXT("Warning, "));
+     vfprintf(stderr, fmt, ap);
+     fputs("\n", stderr);
+ }
+diff --git a/libhylafax/SNPPClient.c++ b/libhylafax/SNPPClient.c++
+index ef5ae21..76b5166 100644
+--- a/libhylafax/SNPPClient.c++
++++ b/libhylafax/SNPPClient.c++
+@@ -103,7 +103,7 @@ SNPPClient::printWarning(const char* fmt ...)
+ void
+ SNPPClient::vprintWarning(const char* fmt, va_list ap)
+ {
+-    fprintf(stderr, NLS::TEXT("Warning, "));
++    fprintf(stderr, "%s", NLS::TEXT("Warning, "));
+     vfprintf(stderr, fmt, ap);
+     fputs("\n", stderr);
+ }
+diff --git a/libhylafax/TextFormat.c++ b/libhylafax/TextFormat.c++
+index bfbbc49..d3d6168 100644
+--- a/libhylafax/TextFormat.c++
++++ b/libhylafax/TextFormat.c++
+@@ -1371,7 +1371,7 @@ TextFont::openAFMFile(fxStr& fontpath)
+ {
+     fxStr emsg;
+     if (!decodeFontName(family, fontpath, emsg)) {
+-	fprintf(stderr,emsg);
++	fprintf(stderr, "%s", emsg);
+ 	return NULL;
+     }
+     return Sys::fopen(fontpath, "r");
+diff --git a/libhylafax/TypeRules.c++ b/libhylafax/TypeRules.c++
+index 54d9b8a..c447212 100644
+--- a/libhylafax/TypeRules.c++
++++ b/libhylafax/TypeRules.c++
+@@ -101,7 +101,7 @@ TypeRule::match(const void* data, size_t size, bool verbose) const
+ 	    printf(" \"%s\"", value.s);
+ 	else if (type != ASCII && type != ASCIIESC) {
+ 	    if (op == ANY)
+-		printf(NLS::TEXT(" <any value>"));
++		printf("%s", NLS::TEXT(" <any value>"));
+ 	    else
+ 		printf(" %#llx", (long long) value.v);
+ 	}
+@@ -109,7 +109,7 @@ TypeRule::match(const void* data, size_t size, bool verbose) const
+     }
+     if (off > (off_t)size) {
+ 	if (verbose)
+-	    printf(NLS::TEXT("failed (offset past data)\n"));
++	    printf("%s", NLS::TEXT("failed (offset past data)\n"));
+ 	return (false);
+     }
+     bool ok = false;
+@@ -162,7 +162,7 @@ TypeRule::match(const void* data, size_t size, bool verbose) const
+ 	    break;
+ 	}
+ 	if (verbose)
+-	    printf(NLS::TEXT("failed (insufficient data)\n"));
++	    printf("%s", NLS::TEXT("failed (insufficient data)\n"));
+ 	return (false);
+     case LONG:
+ 	if (off + 4 < (off_t)size) {
+@@ -171,7 +171,7 @@ TypeRule::match(const void* data, size_t size, bool verbose) const
+ 	    break;
+ 	}
+ 	if (verbose)
+-	    printf(NLS::TEXT("failed (insufficient data)\n"));
++	    printf("%s", NLS::TEXT("failed (insufficient data)\n"));
+ 	return (false);
+     }
+     /*
+@@ -195,7 +195,7 @@ done:
+ 	    printf(NLS::TEXT("success (result %s, rule \"%s\")\n"),
+ 		resultNames[result], (const char*) cmd);
+ 	else
+-	    printf(NLS::TEXT("failed (comparison)\n"));
++	    printf("%s", NLS::TEXT("failed (comparison)\n"));
+     }
+     return (ok);
+ }
+@@ -496,6 +496,6 @@ TypeRules::match(const void* data, u_int size) const
+ 	    return (&(*rules)[i + match2(i, data, size, verbose)]);
+     }
+     if (verbose)
+-	printf(NLS::TEXT("no match\n"));
++	printf("%s", NLS::TEXT("no match\n"));
+     return (NULL);
+ }
diff --git a/main/hylafax/libtiff-41-compatibility.patch b/main/hylafax/libtiff-41-compatibility.patch
deleted file mode 100644
index 72409ee1bfa..00000000000
--- a/main/hylafax/libtiff-41-compatibility.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure b/configure.new
-index 8f591b554c..849e0ef355 100755
---- a/configure
-+++ b/configure.new
-@@ -2563,7 +2563,7 @@ EOF
- 				tiff_offset_t="uint32"
- 				tiff_bytecount_t="uint32"
- 				;;
--		4.[0])		tiff_runlen_t="uint32"
-+		4.[01])		tiff_runlen_t="uint32"
- 				tiff_offset_t="uint64"
- 				tiff_bytecount_t="uint64"
- 				echo '#define TIFFHeader	TIFFHeaderClassic'
diff --git a/main/hylafax/tiff-4.5.patch b/main/hylafax/tiff-4.5.patch
new file mode 100644
index 00000000000..9519023898e
--- /dev/null
+++ b/main/hylafax/tiff-4.5.patch
@@ -0,0 +1,1566 @@
+Patch-Source: https://sourceforge.net/p/hylafax/HylaFAX+/2695/
+--- trunk/faxd/G3Decoder.c++	(revision 2694)
++++ trunk/faxd/G3Decoder.c++	(revision 2695)
+@@ -43,7 +43,7 @@
+     int RunLength;			/* length of current run */	\
+     tiff_runlen_t* pa;			/* place to stuff next run */	\
+     tiff_runlen_t* thisrun;			/* current row's run array */	\
+-    const TIFFFaxTabEnt* TabEnt
++    const hf_TIFFFaxTabEnt* TabEnt
+ #define	DECLARE_STATE_2D()						\
+     DECLARE_STATE();							\
+     int b1;				/* next change on prev line */	\
+@@ -185,7 +185,134 @@
+ #define	prematureEOF(a0)	// never happens 'cuz of longjmp
+ #define	SWAP(t,a,b)	{ t x; x = (a); (a) = (b); (b) = x; }
+ 
++#define isAligned(p, t) ((((size_t)(p)) & (sizeof(t) - 1)) == 0)
++
++#define FILL(n, cp)                                                            \
++    for (int32_t ifill = 0; ifill < (n); ++ifill)                              \
++    {                                                                          \
++        (cp)[ifill] = 0xff;                                                    \
++    }                                                                          \
++    (cp) += (n);
++
++#define ZERO(n, cp)                                                            \
++    for (int32_t izero = 0; izero < (n); ++izero)                              \
++    {                                                                          \
++        (cp)[izero] = 0;                                                       \
++    }                                                                          \
++    (cp) += (n);
++
+ /*
++ * Bit-fill a row according to the white/black
++ * runs generated during G3/G4 decoding.
++ * Lifted from libtiff-4.5.0 source.
++ */
++void hf_TIFFFax3fillruns(unsigned char *buf, uint32_t *runs, uint32_t *erun,
++                       uint32_t lastx)
++{
++    static const unsigned char _fillmasks[] = {0x00, 0x80, 0xc0, 0xe0, 0xf0,
++                                               0xf8, 0xfc, 0xfe, 0xff};
++    unsigned char *cp;
++    uint32_t x, bx, run;
++    int32_t n, nw;
++    int64_t *lp;
++
++    if ((erun - runs) & 1)
++        *erun++ = 0;
++    x = 0;
++    for (; runs < erun; runs += 2)
++    {
++        run = runs[0];
++        if (x + run > lastx || run > lastx)
++            run = runs[0] = (uint32_t)(lastx - x);
++        if (run)
++        {
++            cp = buf + (x >> 3);
++            bx = x & 7;
++            if (run > 8 - bx)
++            {
++                if (bx)
++                { /* align to byte boundary */
++                    *cp++ &= 0xff << (8 - bx);
++                    run -= 8 - bx;
++                }
++                if ((n = run >> 3) != 0)
++                { /* multiple bytes to fill */
++                    if ((n / sizeof(int64_t)) > 1)
++                    {
++                        /*
++                         * Align to int64_tword boundary and fill.
++                         */
++                        for (; n && !isAligned(cp, int64_t); n--)
++                            *cp++ = 0x00;
++                        lp = (int64_t *)cp;
++                        nw = (int32_t)(n / sizeof(int64_t));
++                        n -= nw * sizeof(int64_t);
++                        do
++                        {
++                            *lp++ = 0L;
++                        } while (--nw);
++                        cp = (unsigned char *)lp;
++                    }
++                    ZERO(n, cp);
++                    run &= 7;
++                }
++                if (run)
++                    cp[0] &= 0xff >> run;
++            }
++            else
++                cp[0] &= ~(_fillmasks[run] >> bx);
++            x += runs[0];
++        }
++        run = runs[1];
++        if (x + run > lastx || run > lastx)
++            run = runs[1] = lastx - x;
++        if (run)
++        {
++            cp = buf + (x >> 3);
++            bx = x & 7;
++            if (run > 8 - bx)
++            {
++                if (bx)
++                { /* align to byte boundary */
++                    *cp++ |= 0xff >> bx;
++                    run -= 8 - bx;
++                }
++                if ((n = run >> 3) != 0)
++                { /* multiple bytes to fill */
++                    if ((n / sizeof(int64_t)) > 1)
++                    {
++                        /*
++                         * Align to int64_t boundary and fill.
++                         */
++                        for (; n && !isAligned(cp, int64_t); n--)
++                            *cp++ = 0xff;
++                        lp = (int64_t *)cp;
++                        nw = (int32_t)(n / sizeof(int64_t));
++                        n -= nw * sizeof(int64_t);
++                        do
++                        {
++                            *lp++ = -1L;
++                        } while (--nw);
++                        cp = (unsigned char *)lp;
++                    }
++                    FILL(n, cp);
++                    run &= 7;
++                }
++                /* Explicit 0xff masking to make icc -check=conversions happy */
++                if (run)
++                    cp[0] = (unsigned char)((cp[0] | (0xff00 >> run)) & 0xff);
++            }
++            else
++                cp[0] |= _fillmasks[run] >> bx;
++            x += runs[1];
++        }
++    }
++    assert(x == lastx);
++}
++#undef ZERO
++#undef FILL
++
++/*
+  * Decode a single row of pixels and return
+  * the decoded data in the scanline buffer.
+  */
+@@ -239,7 +366,7 @@
+     if (!nullrow)
+ 	RTCrun = 0;
+     if (scanline)
+-	_TIFFFax3fillruns((u_char*) scanline, thisrun, pa, lastx);
++	hf_TIFFFax3fillruns((u_char*) scanline, thisrun, pa, lastx);
+     if (is2D) {
+ 	SETVAL(0);			// imaginary change for reference
+ 	SWAP(tiff_runlen_t*, curruns, refruns);
+Index: trunk/faxd/G3Encoder.c++
+===================================================================
+--- trunk/faxd/G3Encoder.c++	(revision 2694)
++++ trunk/faxd/G3Encoder.c++	(revision 2695)
+@@ -323,11 +323,11 @@
+ 			a2 = finddiff2(bp, a1, w, PIXEL(bp,a1));
+ 			putcode(horizcode);
+ 			if (a0+a1 == 0 || PIXEL(bp, a0) == 0) {
+-			    putspan(a1-a0, TIFFFaxWhiteCodes);
+-			    putspan(a2-a1, TIFFFaxBlackCodes);
++			    putspan(a1-a0, hf_TIFFFaxWhiteCodes);
++			    putspan(a2-a1, hf_TIFFFaxBlackCodes);
+ 			} else {
+-			    putspan(a1-a0, TIFFFaxBlackCodes);
+-			    putspan(a2-a1, TIFFFaxWhiteCodes);
++			    putspan(a1-a0, hf_TIFFFaxBlackCodes);
++			    putspan(a2-a1, hf_TIFFFaxWhiteCodes);
+ 			}
+ 			a0 = a2;
+ 		    } else {				/* vertical mode */
+@@ -350,12 +350,12 @@
+ 	    int bs = 0, span;
+ 	    for (;;) {
+ 		span = findspan(&bp, bs, w, zeroruns);		// white span
+-		putspan(span, TIFFFaxWhiteCodes);
++		putspan(span, hf_TIFFFaxWhiteCodes);
+ 		bs += span;
+ 		if ((u_int) bs >= w)
+ 		    break;
+ 		span = findspan(&bp, bs, w, oneruns);		// black span
+-		putspan(span, TIFFFaxBlackCodes);
++		putspan(span, hf_TIFFFaxBlackCodes);
+ 		bs += span;
+ 		if ((u_int) bs >= w)
+ 		    break;
+Index: trunk/faxd/t4.h
+===================================================================
+--- trunk/faxd/t4.h	(revision 2694)
++++ trunk/faxd/t4.h	(revision 2695)
+@@ -54,8 +54,7 @@
+  * NB: The G3CODE_INVALID entries are only used
+  *     during state generation (see mkg3states.c).
+  */
+-#ifdef G3CODES
+-const tableentry TIFFFaxWhiteCodes[] = {
++const tableentry hf_TIFFFaxWhiteCodes[] = {
+     { 8, 0x35, 0 },	/* 0011 0101 */
+     { 6, 0x7, 1 },	/* 0001 11 */
+     { 4, 0x7, 2 },	/* 0111 */
+@@ -167,7 +166,7 @@
+     { 12, 0x0, G3CODE_INVALID },	/* 0000 0000 0000 */
+ };
+ 
+-const tableentry TIFFFaxBlackCodes[] = {
++const tableentry hf_TIFFFaxBlackCodes[] = {
+     { 10, 0x37, 0 },	/* 0000 1101 11 */
+     { 3, 0x2, 1 },	/* 010 */
+     { 2, 0x3, 2 },	/* 11 */
+@@ -278,8 +277,4 @@
+     { 11, 0x1, G3CODE_INVALID },	/* 0000 0000 001 */
+     { 12, 0x0, G3CODE_INVALID },	/* 0000 0000 0000 */
+ };
+-#else
+-extern	const tableentry TIFFFaxWhiteCodes[];
+-extern	const tableentry TIFFFaxBlackCodes[];
+-#endif
+ #endif /* _T4_ */
+Index: trunk/faxd/tif_fax3.h
+===================================================================
+--- trunk/faxd/tif_fax3.h	(revision 2694)
++++ trunk/faxd/tif_fax3.h	(revision 2695)
+@@ -60,7 +60,7 @@
+ #if defined(__cplusplus)
+ extern "C" {
+ #endif
+-extern	void _TIFFFax3fillruns(unsigned char*, tiff_runlen_t*, tiff_runlen_t*, tiff_runlen_t);
++extern	void hf_TIFFFax3fillruns(unsigned char*, tiff_runlen_t*, tiff_runlen_t*, tiff_runlen_t);
+ #if defined(__cplusplus)
+ }
+ #endif
+@@ -85,12 +85,1262 @@
+ 	unsigned char State;	/* see above */
+ 	unsigned char Width;	/* width of code in bits */
+ 	tiff_runlen_t Param;		/* unsigned 32-bit run length in bits */
+-} TIFFFaxTabEnt;
++} hf_TIFFFaxTabEnt;
+ 
+-extern	const TIFFFaxTabEnt TIFFFaxMainTable[];
+-extern	const TIFFFaxTabEnt TIFFFaxWhiteTable[];
+-extern	const TIFFFaxTabEnt TIFFFaxBlackTable[];
++/* The following three tables were lifted from libtiff-4.5.0. */
+ 
++const hf_TIFFFaxTabEnt hf_TIFFFaxMainTable[128] = {
++{12,7,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{1,4,0},{3,1,0},
++{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{5,6,2},{3,1,0},{5,3,1},{3,1,0},
++{2,3,0},{3,1,0},{4,3,1},{3,1,0},{1,4,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},
++{4,3,1},{3,1,0},{5,7,3},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},
++{1,4,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{4,6,2},{3,1,0},
++{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{1,4,0},{3,1,0},{5,3,1},{3,1,0},
++{2,3,0},{3,1,0},{4,3,1},{3,1,0},{6,7,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},
++{4,3,1},{3,1,0},{1,4,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},
++{5,6,2},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{1,4,0},{3,1,0},
++{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},{4,7,3},{3,1,0},{5,3,1},{3,1,0},
++{2,3,0},{3,1,0},{4,3,1},{3,1,0},{1,4,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},
++{4,3,1},{3,1,0},{4,6,2},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0},
++{1,4,0},{3,1,0},{5,3,1},{3,1,0},{2,3,0},{3,1,0},{4,3,1},{3,1,0}
++};
++
++const hf_TIFFFaxTabEnt hf_TIFFFaxWhiteTable[4096] = {
++{12,11,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
++{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
++{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},
++{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
++{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
++{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},
++{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,960},{7,4,6},{7,8,31},{7,5,8},
++{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
++{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},
++{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
++{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,11,1792},{7,4,3},
++{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
++{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},
++{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},
++{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1600},{7,4,5},
++{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
++{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},
++{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
++{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},
++{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
++{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},
++{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
++{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},
++{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},
++{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},
++{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1536},{7,4,5},{7,8,43},{7,6,17},
++{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},
++{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},
++{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,768},{7,4,6},
++{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
++{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,11,1856},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
++{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
++{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,896},{7,4,6},{7,7,19},{7,5,8},
++{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},
++{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},
++{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},{7,8,44},{7,6,17},{9,9,1408},{7,4,6},
++{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},
++{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},
++{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},
++{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},
++{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
++{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
++{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
++{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},
++{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},
++{7,6,13},{7,4,3},{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},{7,6,1},{7,5,8},
++{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},
++{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},
++{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,960},{7,4,6},
++{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
++{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},
++{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
++{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{11,12,2112},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
++{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
++{7,8,40},{7,6,16},{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},
++{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
++{9,9,1600},{7,4,5},{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
++{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},
++{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},{7,8,32},{7,5,8},
++{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
++{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},
++{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
++{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},
++{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
++{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},
++{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},
++{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1536},{7,4,5},
++{7,8,43},{7,6,17},{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
++{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},
++{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
++{9,9,768},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},
++{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
++{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,12,2368},{7,4,3},{7,5,11},{7,4,5},
++{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
++{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,896},{7,4,6},
++{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},
++{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},
++{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},{7,8,44},{7,6,17},
++{9,9,1408},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},
++{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},
++{7,8,42},{7,6,16},{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},
++{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
++{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
++{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
++{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},
++{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},
++{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},
++{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},
++{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},
++{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},
++{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},
++{9,9,960},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},
++{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
++{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{11,12,1984},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
++{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
++{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},
++{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},
++{7,6,13},{7,4,3},{9,9,1600},{7,4,5},{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},
++{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},
++{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},
++{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},
++{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
++{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},
++{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
++{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
++{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
++{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},
++{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
++{9,9,1536},{7,4,5},{7,8,43},{7,6,17},{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
++{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},
++{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},
++{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
++{7,7,26},{7,5,9},{9,9,768},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},
++{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
++{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,11,1920},{7,4,3},
++{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
++{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},
++{9,9,896},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},
++{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},
++{7,8,44},{7,6,17},{9,9,1408},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
++{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},
++{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
++{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},
++{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
++{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},
++{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
++{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},
++{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},
++{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},
++{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1472},{7,4,5},{7,8,43},{7,6,17},
++{9,9,1216},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},
++{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},
++{7,8,41},{7,6,16},{9,9,960},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,704},{7,4,6},
++{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
++{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,12,2240},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
++{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
++{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,832},{7,4,6},{7,7,19},{7,5,8},
++{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},
++{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},
++{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1600},{7,4,5},{7,8,44},{7,6,17},{9,9,1344},{7,4,6},
++{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},
++{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},
++{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},
++{9,9,1088},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},
++{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
++{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
++{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
++{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},
++{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},
++{7,6,13},{7,4,3},{9,9,1536},{7,4,5},{7,8,43},{7,6,17},{9,9,1280},{7,4,6},{7,6,1},{7,5,8},
++{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},
++{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},
++{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,1024},{7,4,6},
++{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
++{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,768},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},
++{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
++{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{11,12,2496},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
++{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
++{7,8,40},{7,6,16},{9,9,896},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},
++{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
++{9,9,1728},{7,4,5},{7,8,44},{7,6,17},{9,9,1408},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
++{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},
++{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1152},{7,4,6},{7,8,32},{7,5,8},
++{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
++{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},
++{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
++{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{12,11,0},{7,4,3},
++{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
++{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},
++{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},
++{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1472},{7,4,5},
++{7,8,43},{7,6,17},{9,9,1216},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
++{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},
++{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,960},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
++{9,9,704},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},
++{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
++{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,11,1792},{7,4,3},{7,5,11},{7,4,5},
++{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
++{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,832},{7,4,6},
++{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},
++{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},
++{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1600},{7,4,5},{7,8,44},{7,6,17},
++{9,9,1344},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},
++{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},
++{7,8,42},{7,6,16},{9,9,1088},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},
++{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
++{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
++{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
++{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},
++{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},
++{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},
++{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1536},{7,4,5},{7,8,43},{7,6,17},{9,9,1280},{7,4,6},
++{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},
++{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},
++{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},
++{9,9,1024},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,768},{7,4,6},{7,8,37},{9,5,128},
++{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
++{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{11,11,1856},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
++{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
++{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,896},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},
++{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},
++{7,6,13},{7,4,3},{9,9,1728},{7,4,5},{7,8,44},{7,6,17},{9,9,1408},{7,4,6},{7,6,1},{7,5,8},
++{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},
++{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},
++{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1152},{7,4,6},
++{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
++{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},
++{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
++{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
++{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
++{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},
++{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
++{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
++{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},
++{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,960},{7,4,6},{7,8,31},{7,5,8},
++{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
++{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},
++{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
++{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,12,2176},{7,4,3},
++{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
++{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},
++{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},
++{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1600},{7,4,5},
++{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
++{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},
++{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
++{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},
++{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
++{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},
++{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
++{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},
++{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},
++{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},
++{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1536},{7,4,5},{7,8,43},{7,6,17},
++{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},
++{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},
++{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,768},{7,4,6},
++{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
++{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,12,2432},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
++{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
++{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,896},{7,4,6},{7,7,19},{7,5,8},
++{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},
++{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},
++{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},{7,8,44},{7,6,17},{9,9,1408},{7,4,6},
++{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},
++{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},
++{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},
++{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},
++{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
++{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
++{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
++{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},
++{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},
++{7,6,13},{7,4,3},{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},{7,6,1},{7,5,8},
++{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},
++{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},
++{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,960},{7,4,6},
++{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
++{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},
++{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
++{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{11,12,2048},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
++{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
++{7,8,40},{7,6,16},{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},
++{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
++{9,9,1600},{7,4,5},{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
++{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},
++{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},{7,8,32},{7,5,8},
++{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
++{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},
++{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
++{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},
++{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
++{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},
++{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},
++{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1536},{7,4,5},
++{7,8,43},{7,6,17},{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
++{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},
++{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
++{9,9,768},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},
++{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
++{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,11,1920},{7,4,3},{7,5,11},{7,4,5},
++{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},
++{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,896},{7,4,6},
++{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},
++{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},
++{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},{7,8,44},{7,6,17},
++{9,9,1408},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},
++{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},
++{7,8,42},{7,6,16},{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},
++{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
++{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
++{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},
++{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},
++{7,8,55},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},
++{7,8,53},{7,5,9},{9,8,448},{7,4,6},{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},
++{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1472},{7,4,5},{7,8,43},{7,6,17},{9,9,1216},{7,4,6},
++{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},
++{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},
++{7,8,61},{7,4,4},{7,4,2},{7,4,7},{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},
++{9,9,960},{7,4,6},{7,8,31},{7,5,8},{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,9,704},{7,4,6},{7,8,37},{9,5,128},
++{7,7,25},{7,6,15},{9,8,320},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},
++{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{11,12,2304},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
++{7,7,20},{9,5,128},{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},
++{7,7,27},{7,4,5},{7,8,40},{7,6,16},{9,9,832},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},
++{9,8,512},{7,4,6},{7,8,36},{9,5,128},{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},
++{7,6,13},{7,4,3},{9,9,1600},{7,4,5},{7,8,44},{7,6,17},{9,9,1344},{7,4,6},{7,6,1},{7,5,8},
++{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},
++{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},
++{7,4,2},{7,4,7},{7,8,48},{7,4,3},{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1088},{7,4,6},
++{7,8,32},{7,5,8},{7,8,58},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},
++{7,5,11},{7,4,5},{7,7,26},{7,5,9},{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},
++{9,8,384},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},
++{9,7,256},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{0,0,0},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},
++{7,7,24},{7,6,14},{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},
++{7,8,39},{7,6,16},{9,8,576},{7,4,6},{7,7,19},{7,5,8},{7,8,55},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,8,45},{7,4,3},{7,5,11},{7,4,5},{7,8,53},{7,5,9},{9,8,448},{7,4,6},
++{7,8,35},{9,5,128},{7,8,51},{7,6,15},{7,8,63},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},
++{9,9,1536},{7,4,5},{7,8,43},{7,6,17},{9,9,1280},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,8,29},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},
++{9,6,1664},{7,4,6},{7,8,33},{9,5,128},{7,8,49},{7,6,14},{7,8,61},{7,4,4},{7,4,2},{7,4,7},
++{7,8,47},{7,4,3},{7,8,59},{7,4,5},{7,8,41},{7,6,16},{9,9,1024},{7,4,6},{7,8,31},{7,5,8},
++{7,8,57},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},
++{7,7,26},{7,5,9},{9,9,768},{7,4,6},{7,8,37},{9,5,128},{7,7,25},{7,6,15},{9,8,320},{7,4,4},
++{7,4,2},{7,4,7},{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},
++{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},{11,12,2560},{7,4,3},
++{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},{7,7,20},{9,5,128},{7,7,24},{7,6,14},
++{7,7,28},{7,4,4},{7,4,2},{7,4,7},{7,7,23},{7,4,3},{7,7,27},{7,4,5},{7,8,40},{7,6,16},
++{9,9,896},{7,4,6},{7,7,19},{7,5,8},{7,8,56},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7},
++{7,8,46},{7,4,3},{7,5,11},{7,4,5},{7,8,54},{7,5,9},{9,8,512},{7,4,6},{7,8,36},{9,5,128},
++{7,8,52},{7,6,15},{7,8,0},{7,4,4},{7,4,2},{7,4,7},{7,6,13},{7,4,3},{9,9,1728},{7,4,5},
++{7,8,44},{7,6,17},{9,9,1408},{7,4,6},{7,6,1},{7,5,8},{9,6,192},{9,5,64},{7,5,10},{7,4,4},
++{7,4,2},{7,4,7},{7,8,30},{7,4,3},{7,5,11},{7,4,5},{7,6,12},{7,5,9},{9,6,1664},{7,4,6},
++{7,8,34},{9,5,128},{7,8,50},{7,6,14},{7,8,62},{7,4,4},{7,4,2},{7,4,7},{7,8,48},{7,4,3},
++{7,8,60},{7,4,5},{7,8,42},{7,6,16},{9,9,1152},{7,4,6},{7,8,32},{7,5,8},{7,8,58},{9,5,64},
++{7,5,10},{7,4,4},{7,4,2},{7,4,7},{7,7,22},{7,4,3},{7,5,11},{7,4,5},{7,7,26},{7,5,9},
++{9,8,640},{7,4,6},{7,8,38},{9,5,128},{7,7,25},{7,6,15},{9,8,384},{7,4,4},{7,4,2},{7,4,7},
++{7,6,13},{7,4,3},{7,7,18},{7,4,5},{7,7,21},{7,6,17},{9,7,256},{7,4,6},{7,6,1},{7,5,8},
++{9,6,192},{9,5,64},{7,5,10},{7,4,4},{7,4,2},{7,4,7}
++};
++
++const hf_TIFFFaxTabEnt hf_TIFFFaxBlackTable[8192] = {
++{12,11,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,18},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,17},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1792},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,11,23},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,20},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,11,25},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,128},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,12,56},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,30},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1856},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,57},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,11,21},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,54},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,52},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,48},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{11,12,2112},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,44},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,36},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,384},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,28},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,60},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,40},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2368},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,16},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{10,10,64},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,18},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,10,17},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{11,12,1984},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,50},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,12,34},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1664},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,26},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1408},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,32},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1920},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,12,61},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,42},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{10,13,1024},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{10,13,768},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,62},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2240},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,46},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,38},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,512},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,11,19},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,24},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,22},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{11,12,2496},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,10,16},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,0},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,10,64},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{12,11,0},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,10,18},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,17},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1792},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,23},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,20},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,11,25},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{10,12,192},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1280},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,12,31},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{11,11,1856},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,58},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,11,21},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,896},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,640},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,49},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2176},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,12,45},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,37},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{10,12,448},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,29},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{10,13,1536},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,41},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2432},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,16},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,10,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,10,64},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,18},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,17},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{11,12,2048},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,51},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,35},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,320},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,27},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,59},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,33},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1920},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,256},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,43},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{10,13,1152},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,55},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,12,63},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{11,12,2304},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,47},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,12,39},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,53},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,19},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,24},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,22},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2560},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,10,16},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,0},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{10,10,64},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{12,11,0},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,10,18},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,10,17},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1792},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,23},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,11,20},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,25},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{10,12,128},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,56},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,30},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{11,11,1856},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,57},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,21},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,54},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,52},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,48},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2112},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,44},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,36},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{10,12,384},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,28},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,60},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,12,40},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{11,12,2368},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,16},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,10,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,10,64},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,18},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,17},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,1984},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,12,50},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,34},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{10,13,1728},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,26},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{10,13,1472},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,32},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1920},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,61},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,42},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1088},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,832},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,62},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{11,12,2240},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,46},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,38},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,576},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,19},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,11,24},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,22},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2496},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,16},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{10,10,64},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{12,11,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,18},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,10,17},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{11,11,1792},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,23},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,11,20},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,25},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,192},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1344},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,31},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,11,1856},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,12,58},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,21},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{10,13,960},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{10,13,704},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,49},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2176},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,45},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,37},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,448},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,12,29},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1600},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,41},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{11,12,2432},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,10,16},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,0},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,10,64},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,10,18},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,17},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2048},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,51},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,35},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{10,12,320},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,27},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,59},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,12,33},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{11,11,1920},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,12,256},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,12,43},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,13,1216},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{0,0,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,8,13},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,9,15},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,55},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,63},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2304},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,12,47},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,12,39},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,12,53},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,12},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{0,0,0},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,8,13},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,11,19},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,11,24},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,11,22},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{11,12,2560},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,7,10},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,10,16},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2},{8,10,0},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},
++{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{10,10,64},{8,2,3},
++{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,9},{8,2,3},{8,3,1},{8,2,2},
++{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,11},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},
++{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},
++{8,8,14},{8,2,3},{8,3,1},{8,2,2},{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,6,8},{8,2,3},
++{8,3,1},{8,2,2},{8,4,5},{8,2,3},{8,3,4},{8,2,2},{8,7,12},{8,2,3},{8,3,1},{8,2,2},
++{8,4,6},{8,2,3},{8,3,4},{8,2,2},{8,5,7},{8,2,3},{8,3,1},{8,2,2},{8,4,5},{8,2,3},
++{8,3,4},{8,2,2}
++};
++
+ /*
+  * The following macros define the majority of the G3/G4 decoder
+  * algorithm using the state tables defined elsewhere.  To build
+@@ -323,7 +1573,7 @@
+ #define EXPAND1D(eoflab) do {						\
+     for (;;) {								\
+ 	for (;;) {							\
+-	    LOOKUP16(12, TIFFFaxWhiteTable, eof1d);			\
++	    LOOKUP16(12, hf_TIFFFaxWhiteTable, eof1d);			\
+ 	    switch (TabEnt->State) {					\
+ 	    case S_EOL:							\
+ 		EOLcnt = 1;						\
+@@ -345,7 +1595,7 @@
+ 	if ((tiff_runlen_t)a0 >= lastx)					\
+ 	    goto done1d;						\
+ 	for (;;) {							\
+-	    LOOKUP16(13, TIFFFaxBlackTable, eof1d);			\
++	    LOOKUP16(13, hf_TIFFFaxBlackTable, eof1d);			\
+ 	    switch (TabEnt->State) {					\
+ 	    case S_EOL:							\
+ 		EOLcnt = 1;						\
+@@ -393,7 +1643,7 @@
+  */
+ #define EXPAND2D(eoflab) do {						\
+     while ((tiff_runlen_t)a0 < lastx) {					\
+-	LOOKUP8(7, TIFFFaxMainTable, eof2d);				\
++	LOOKUP8(7, hf_TIFFFaxMainTable, eof2d);				\
+ 	switch (TabEnt->State) {					\
+ 	case S_Pass:							\
+ 	    CHECK_b1;							\
+@@ -405,7 +1655,7 @@
+ 	case S_Horiz:							\
+ 	    if ((pa-thisrun)&1) {					\
+ 		for (;;) {	/* black first */			\
+-		    LOOKUP16(13, TIFFFaxBlackTable, eof2d);		\
++		    LOOKUP16(13, hf_TIFFFaxBlackTable, eof2d);		\
+ 		    switch (TabEnt->State) {				\
+ 		    case S_TermB:					\
+ 			SETVAL(TabEnt->Param);				\
+@@ -421,7 +1671,7 @@
+ 		}							\
+ 	    doneWhite2da:;						\
+ 		for (;;) {	/* then white */			\
+-		    LOOKUP16(12, TIFFFaxWhiteTable, eof2d);		\
++		    LOOKUP16(12, hf_TIFFFaxWhiteTable, eof2d);		\
+ 		    switch (TabEnt->State) {				\
+ 		    case S_TermW:					\
+ 			SETVAL(TabEnt->Param);				\
+@@ -438,7 +1688,7 @@
+ 	    doneBlack2da:;						\
+ 	    } else {							\
+ 		for (;;) {	/* white first */			\
+-		    LOOKUP16(12, TIFFFaxWhiteTable, eof2d);		\
++		    LOOKUP16(12, hf_TIFFFaxWhiteTable, eof2d);		\
+ 		    switch (TabEnt->State) {				\
+ 		    case S_TermW:					\
+ 			SETVAL(TabEnt->Param);				\
+@@ -454,7 +1704,7 @@
+ 		}							\
+ 	    doneWhite2db:;						\
+ 		for (;;) {	/* then black */			\
+-		    LOOKUP16(13, TIFFFaxBlackTable, eof2d);		\
++		    LOOKUP16(13, hf_TIFFFaxBlackTable, eof2d);		\
+ 		    switch (TabEnt->State) {				\
+ 		    case S_TermB:					\
+ 			SETVAL(TabEnt->Param);				\
diff --git a/main/hylafax/tiff-compat.patch b/main/hylafax/tiff-compat.patch
new file mode 100644
index 00000000000..1d8fe51cef5
--- /dev/null
+++ b/main/hylafax/tiff-compat.patch
@@ -0,0 +1,13 @@
+diff --git a/configure b/configure.new
+index 8f591b554c..849e0ef355 100755
+--- a/configure
++++ b/configure.new
+@@ -2563,7 +2563,7 @@ EOF
+ 				tiff_offset_t="uint32"
+ 				tiff_bytecount_t="uint32"
+ 				;;
+-		4.[0])		tiff_runlen_t="uint32"
++		4.[012345])	tiff_runlen_t="uint32"
+ 				tiff_offset_t="uint64"
+ 				tiff_bytecount_t="uint64"
+ 				echo '#define TIFFHeader	TIFFHeaderClassic'
diff --git a/main/hylafaxplus/APKBUILD b/main/hylafaxplus/APKBUILD
index c02b55f2162..beeef418bdf 100644
--- a/main/hylafaxplus/APKBUILD
+++ b/main/hylafaxplus/APKBUILD
@@ -2,27 +2,39 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=hylafaxplus
 _pkgname=hylafax
-pkgver=7.0.2
-pkgrel=1
+pkgver=7.0.8
+pkgrel=0
 pkgdesc="Making the Premier Open-Source Fax Management System Even Better"
-url="http://hylafax.sourceforge.net"
-arch="all"
+url="https://hylafax.sourceforge.net/"
+# arch="all" # https://gitlab.alpinelinux.org/alpine/aports/-/issues/15384
 license="MIT"
 # check/test not supported from upstream
 options="!check"
-depends="ghostscript bash tiff-tools !$_pkgname"
-makedepends="zlib-dev tiff-dev<4.2 gettext-dev openldap-dev lcms2-dev
-	libffi-dev jbig2dec-dev sed readline-dev"
-subpackages="$pkgname-doc $pkgname-lang $pkgname-openrc"
+depends="ghostscript bash tiff-tools findutils !$_pkgname"
+makedepends="zlib-dev tiff-dev gettext-dev openldap-dev lcms2-dev
+	libffi-dev jbig2dec-dev sed readline-dev openssl-dev>3"
+subpackages="$pkgname-dbg $pkgname-doc $pkgname-lang $pkgname-openrc"
 source="https://downloads.sourceforge.net/hylafax/$_pkgname-$pkgver.tar.gz
 	$pkgname.initd
 	$pkgname.confd
 	common-functions-busybox-awk.patch
 	no-locale.patch
 	utf8-dictionary.patch
+	dont-ship-xferfaxlog-file.patch
+	config-files-default-extension.patch
 	"
 builddir="$srcdir"/$_pkgname-$pkgver
 
+# secfixes:
+#   7.0.2-r2:
+#     - CVE-2020-15396
+#     - CVE-2020-15397
+
+prepare() {
+	default_prepare
+	update_config_guess
+}
+
 build() {
 	# the configure script does not handle ccache or distcc
 	export CC=gcc
@@ -89,9 +101,13 @@ package() {
 		"$pkgdir"/etc/conf.d/$pkgname
 }
 
-sha512sums="ea68404ad79e798b29450683eaa927e73033e0fa8160b803a3e2c9000df487c81193cc8fc0c1187477f5e1b2e26eec1c065ebc17e0be82e9a3e3758b1b5b5e4e  hylafax-7.0.2.tar.gz
-63f032b4b39dfb03380815a1a6290c5c4338761af8fecc0e55cf6f60bcbcb02e90780659e283d35911504c07d3e7492d19a2b1c08140d2e8f314649872b301f4  hylafaxplus.initd
+sha512sums="
+eb04cb55c687a404b2fb68be8dea09d5c33668b808e6fce71ab2dde0d0a42c788ec657c287f01245a8f6371b7d659e4d37f75e1307fdb4d499ecc90564756ca8  hylafax-7.0.8.tar.gz
+ae9de1dbf53ef64acd8b03515c5cd840c12596921edb8c45a333eb7a69e911ec3a449a9f0201c5c73d54d9f01c4696f1accacf1e83137737341a5913f0725b16  hylafaxplus.initd
 a2117eddc8f0ff70a23a90f2001dcb88c5bddee46ffa021d6d1701cc5cfc3bcb0362ead2b1b1ce2b288992728053c5947466d08916649f45e7dfb1876576e50f  hylafaxplus.confd
 41ae2055a7781d83fc275aafe18ced0fe75ba79d3ad7d5096eabaeae3a514b564723185dd33820268577174f6c53bfcfddb30922ba50754b15c5c3b0abbec837  common-functions-busybox-awk.patch
 4a1243daff9904e6395c3e28aa4a78a74de99f5aa9dbf5055a3781acfcd9b1b3db42b1569409b27e3ef9b0e55272dc99122436a79a08c9a1c140c2547c5a2c15  no-locale.patch
-f5f1e33897a91b8297311c033d50e7ea2f9088568264a5b9224285066a504da8cc4296f973dd0a70e09abca538cef26964c6181f4f67f76400783d0697f05e61  utf8-dictionary.patch"
+f5f1e33897a91b8297311c033d50e7ea2f9088568264a5b9224285066a504da8cc4296f973dd0a70e09abca538cef26964c6181f4f67f76400783d0697f05e61  utf8-dictionary.patch
+56a747d0592a4f7caa90b4bbf2f7f01a8000e80bea0f33a4d15af87315789cc3ca0b6031312db6d7a93ac4f4d16abe540331ef841c4911b291f0af30e41c8e8f  dont-ship-xferfaxlog-file.patch
+49bd5e1f590c59de1a96cafa96f3ce5ba0afbacbf08f026682f5be56e4405f95a06df6acef5429a158652b967a446c7c976274729342608527ccbc035979f0b1  config-files-default-extension.patch
+"
diff --git a/main/hylafaxplus/config-files-default-extension.patch b/main/hylafaxplus/config-files-default-extension.patch
new file mode 100644
index 00000000000..74d872181ec
--- /dev/null
+++ b/main/hylafaxplus/config-files-default-extension.patch
@@ -0,0 +1,26 @@
+diff --git a/etc/Makefile.in b/etc/Makefile.in
+index 22aa277..f451d01 100644
+--- a/etc/Makefile.in
++++ b/etc/Makefile.in
+@@ -87,7 +87,7 @@ install: default
+		-src ${SRCDIR}/faxsetup.$$i -O faxsetup.$$i; \
+	done
+	${PUTSERVER} -root ${INSTALLROOT} -F ${SBIN} -m 755 -src probemodem.sh -O probemodem
+-	${PUTSAMPLE} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 600 -o hosts.hfaxd
++	${PUTSAMPLE} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 600 -o hosts.hfaxd.default
+	for i in ${DIALRULES}; do \
+	    ${PUTSERVER} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 444 -src ${SRCDIR}/$$i \
+		-idb "config(update)" -O $$i; \
+diff --git a/hfaxd/Makefile.in b/hfaxd/Makefile.in
+index 90fdcfe..982cd81 100644
+--- a/hfaxd/Makefile.in
++++ b/hfaxd/Makefile.in
+@@ -98,7 +98,7 @@ install: default
+	${INSTALL} -root ${INSTALLROOT} -F ${LIBEXEC} -u root -m 755 \
+	    -idb ${PRODUCT}.sw.server -O hfaxd
+	${INSTALL} -root ${INSTALLROOT} -F ${LIBDATA} -m 644 -idb ${PRODUCT}.sw.server \
+-	    -idb "config(noupdate)" -src ${SRCDIR}/hfaxd.conf -O hfaxd.conf
++	    -idb "config(noupdate)" -src ${SRCDIR}/hfaxd.conf -O hfaxd.conf.default
+
+ uninstall::
+	${RM} -f ${LIBEXEC}/hfaxd
diff --git a/main/hylafaxplus/dont-ship-xferfaxlog-file.patch b/main/hylafaxplus/dont-ship-xferfaxlog-file.patch
new file mode 100644
index 00000000000..bf5c09dcaa1
--- /dev/null
+++ b/main/hylafaxplus/dont-ship-xferfaxlog-file.patch
@@ -0,0 +1,38 @@
+diff --git a/etc/Makefile.in b/etc/Makefile.in
+index c5f647a..22aa277 100644
+--- a/etc/Makefile.in
++++ b/etc/Makefile.in
+@@ -56,7 +56,7 @@ DIALRULES=dialrules \
+	dialrules.ext \
+	dialrules.world \
+	dialrules.uk
+-TARGETS	= config.fax hosts.hfaxd xferfaxlog lockname ondelay
++TARGETS	= config.fax hosts.hfaxd lockname ondelay
+
+ default all::
+	@${MAKE} targets
+@@ -68,8 +68,6 @@ targets: ${TARGETS}
+ hosts.hfaxd:
+	${ECHO} "localhost" >hosts.hfaxd
+	${ECHO} "127.0.0.1" >>hosts.hfaxd
+-xferfaxlog:
+-	${ECHO} >xferfaxlog
+ config.fax:
+	${ECHO} on >config.fax
+ lockname: ${SRCDIR}/lockname.c
+@@ -89,7 +87,6 @@ install: default
+		-src ${SRCDIR}/faxsetup.$$i -O faxsetup.$$i; \
+	done
+	${PUTSERVER} -root ${INSTALLROOT} -F ${SBIN} -m 755 -src probemodem.sh -O probemodem
+-	${PUTSAMPLE} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 644 -o xferfaxlog
+	${PUTSAMPLE} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 600 -o hosts.hfaxd
+	for i in ${DIALRULES}; do \
+	    ${PUTSERVER} -root ${INSTALLROOT} -F ${SPOOL}/etc -m 444 -src ${SRCDIR}/$$i \
+@@ -108,7 +105,6 @@ uninstall::
+		${RM} -f ${SBIN}/faxsetup.$$i; \
+	done
+	${RM} -f ${SBIN}/probemodem
+-	${RM} -f ${SPOOL}/etc/xferfaxlog
+	${RM} -f ${SPOOL}/etc/hosts.hfaxd
+	for i in ${DIALRULES}; do \
+	    ${RM} -f ${SPOOL}/etc/$$i; \
diff --git a/main/hylafaxplus/hylafaxplus.initd b/main/hylafaxplus/hylafaxplus.initd
index fe29a58358b..c3ac4c4d9c5 100644
--- a/main/hylafaxplus/hylafaxplus.initd
+++ b/main/hylafaxplus/hylafaxplus.initd
@@ -25,6 +25,11 @@ checkconfig() {
 		return 1
 	fi
 
+	if [ ! -f $SPOOL/lib/hfaxd.conf ] ; then
+		eerror "No $SPOOL/lib/hfaxd.conf file found. Rename and modify the hfaxd.conf.default"
+		return 1
+	fi
+
 	if [ ! -f $SPOOL/etc/setup.cache ] ; then
 		eerror "No $SPOOL/etc/setup.cache file found. Use faxsetup command"
 		return 1
diff --git a/main/hypermail/APKBUILD b/main/hypermail/APKBUILD
index 7a061c357b2..bbcdac214b3 100644
--- a/main/hypermail/APKBUILD
+++ b/main/hypermail/APKBUILD
@@ -1,27 +1,35 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=hypermail
-pkgver=2.3.0
-pkgrel=4
+pkgver=2.4.0
+pkgrel=3
 pkgdesc="Mail Archiver"
 url="http://www.hypermail-project.org"
 arch="all"
 license="GPL-2.0-or-later"
 depends="lua"
-makedepends="pcre-dev bison gdbm-dev"
-install=""
-subpackages=""
-source="http://www.hypermail-project.org/$pkgname-$pkgver.tar.gz
-	mdir2mbox.lua"
+makedepends="autoconf automake libtool pcre-dev bison gdbm-dev"
+source="https://github.com/hypermail-project/hypermail/releases/download/v$pkgver/hypermail-$pkgver.tar.gz
+	modernc.patch
+	mdir2mbox.lua
+	"
+options="!check"
 
-_builddir="$srcdir"/hypermail
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
+	default_prepare
+
+	rm -fv src/trio/*.a
+	rm -fv src/trio/*.o
+	update_config_sub
+	update_config_guess
+	libtoolize --force
+	aclocal
+	autoconf -f
 }
 
 build() {
-	cd "$_builddir"
+	# build system does not set the -L correctly to the dir
+	LDFLAGS="$LDFLAGS -L$PWD/src/trio/"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,13 +38,11 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--with-httpddir=/var/www \
-		--with-cgidir=/var/www/cgi-bin \
-		|| return 1
-	make || return 1
+		--with-cgidir=/var/www/cgi-bin
+	make -C src/trio
+	make
 }
 package() {
-	cd "$_builddir"
-
 	#does not understand DESTDIR so going to install ourselves
 	#make DESTDIR="$pkgdir" install
 
@@ -46,5 +52,8 @@ package() {
 	install -m755 -D "$srcdir"/mdir2mbox.lua "$pkgdir"/usr/bin/mdir2mbox.lua
 }
 
-sha512sums="6f4db2613a53f27e88a9827057be57df49b1dfff6dfcc7b531fdb983b03e64818f5845411f9eb42fc7ae8829281c67773d16fcb3b9d3fa2a7c92d5100fa9bb57  hypermail-2.3.0.tar.gz
-203c292c46d40c35023629795ef0baa254c036ccfdb5628b3abf2d0c965bff9274f39571dfcb27aa508d9b801356d793fd5f78466ebb69b2306f56b28ac85b9c  mdir2mbox.lua"
+sha512sums="
+cb21341d60f14fe03ec5817d2464567e9e547d21ce38857a3958a769710da3e49ab4592dac4f87f1f4eb873120659a8fc6a85d27d11b575f855abbf3347bed82  hypermail-2.4.0.tar.gz
+91c41a7ab3fccfec80739dbca9d23e7c917836d6275f209d73ca9f851312ace348d6b134ef4d89f35f3db46575095d1becb6c9a174cdf5a11fcad7ee100955df  modernc.patch
+203c292c46d40c35023629795ef0baa254c036ccfdb5628b3abf2d0c965bff9274f39571dfcb27aa508d9b801356d793fd5f78466ebb69b2306f56b28ac85b9c  mdir2mbox.lua
+"
diff --git a/main/hypermail/modernc.patch b/main/hypermail/modernc.patch
new file mode 100644
index 00000000000..48ddd852c5b
--- /dev/null
+++ b/main/hypermail/modernc.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 2a3b7fa..1779ec0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,7 +86,7 @@ export CFLAGS CC
+ AC_SUBST(INSTALL)
+ 
+ AC_MSG_CHECKING([that the compiler works])
+-AC_RUN_IFELSE([AC_LANG_SOURCE([[ main(int ac, char **av) { return 0; } ]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
++AC_RUN_IFELSE([AC_LANG_SOURCE([[ int main(int ac, char **av) { return 0; } ]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
+     AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)],[AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)])
+ 
+ dnl ===========================================================================
diff --git a/main/iaxmodem/APKBUILD b/main/iaxmodem/APKBUILD
index 19f0cc4b488..bf96fcacfa9 100644
--- a/main/iaxmodem/APKBUILD
+++ b/main/iaxmodem/APKBUILD
@@ -2,42 +2,34 @@
 # Contributor: Mika Havela <mika.havela@gmail.com>
 # Maintainer: Cameron Banta <cbanta@gmail.com>
 pkgname=iaxmodem
-pkgver=1.3.0
+pkgver=1.3.4
 pkgrel=0
 pkgdesc="Softmodem for hylafax that connects to VOIP gateway with IAX"
-url="http://iaxmodem.sourceforge.net/"
+url="https://iaxmodem.sourceforge.net/"
 arch="all"
-license="LGPL+"
-depends=""
-depends_dev=""
-makedepends="$depends_dev tiff-dev"
-install=""
-subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+license="GPL-2.0-or-later"
+options="!check" # no tests
+makedepends="tiff-dev"
+subpackages="$pkgname-dbg $pkgname-doc $pkgname-openrc"
+source="https://downloads.sourceforge.net/iaxmodem/iaxmodem-$pkgver.tar.gz
 	iaxmodem-fix.patch
-	config.guess
-	config.sub
+	fix-printf.patch
 	$pkgname.confd
-	$pkgname.initd"
-
-builddir=$srcdir/$pkgname-$pkgver
+	$pkgname.initd
+	"
 
 prepare() {
-	cd "$builddir"
-        for i in . lib/spandsp/config lib/libiax2; do
-		cp $srcdir/config.guess $srcdir/config.sub $i
-	done
-	default_prepare || return 1
+	update_config_sub
+	update_config_guess
+	default_prepare
 }
 
 build() {
-	cd "$builddir"
-	./configure || return 1
-	make || return 1
+	./configure
+	make
 }
 
 package() {
-	cd "$builddir"
 	install -m755 -s -D "$srcdir/$pkgname-$pkgver/iaxmodem" \
 		"$pkgdir/usr/sbin/iaxmodem"
 	mkdir -p "$pkgdir/etc/iaxmodem"
@@ -67,13 +59,12 @@ package() {
 		"$pkgdir/usr/share/doc/$pkgname/iaxmodem.init.debian"
 	install -m644 -D "$srcdir/$pkgname-$pkgver/config.ttyIAX" \
 		"$pkgdir/usr/share/doc/$pkgname/config.ttyIAX"
-
 }
 
-
-sha512sums="3add8fe1c228ee63f12a3d23fcc8bad5405b9fa6af70cadbcdb276d4e7dfe2a90f1b7c300d35659ab0247010c2315e25a5def5715e670071226bd89271d004f4  iaxmodem-1.3.0.tar.gz
+sha512sums="
+5765f42918964e944c2b8031cccffae25287e9a6b333467d8fbabb69b1dbe9b6153077bc8fdcf867de5ad28bfebba835431dbe07d866e74a558fcfc530827ea8  iaxmodem-1.3.4.tar.gz
 999ba9d554ffa8ecb00b4e18b2e25d0c077a64560985ffc035fe89dedf7ff9686c347aba16a0bc05ad9a4d11e17b9ddad3b99772b2b61e1fcaea00c63bcbb897  iaxmodem-fix.patch
-ec32c1c81a460033d1b419292f408974409d08cfc754af92ca5af303cc848fc5dc3a019028c6724346e96ab5d600519862fd9a2c3f01ae6cf7139ff377de4b80  config.guess
-fb999aada492f963fdf86184629a7351e5ff3adac6f4707a2d150ae18cea02478b4ebcb1d2d0bd11698ed74415d2a73bc07d8c0d96a5035bd567d2738fa73128  config.sub
+dbc2e72fcf6d45f471343d46a788e1c5d7fe20d88b2c73b45604f368b6dcabc59731542ba1758567fc6bae90a6b092323ff61730986edf7791c6b29cf84392a5  fix-printf.patch
 c5b01eecd8048a99777c0265bc31cd8dcafa7ab2b30798500ec52e759f4ad97ffc13e8e72ad3018e9cd77b2acefdbbe7125b0b0d7f7cefd4ab6d764c690c89a1  iaxmodem.confd
-5e62ae6ea099db21e5f3ce319a28b3e6a9da1a2283fd29404126b486209119cfcf32628e9d3f3323522db30dbf052378f654f9498cd1ae75a447d44005b1f587  iaxmodem.initd"
+5e62ae6ea099db21e5f3ce319a28b3e6a9da1a2283fd29404126b486209119cfcf32628e9d3f3323522db30dbf052378f654f9498cd1ae75a447d44005b1f587  iaxmodem.initd
+"
diff --git a/main/iaxmodem/config.guess b/main/iaxmodem/config.guess
deleted file mode 100644
index c4bd827a7be..00000000000
--- a/main/iaxmodem/config.guess
+++ /dev/null
@@ -1,1456 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
-
-timestamp='2016-05-15'
-
-# This file 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 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-#
-# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
-#
-# Please send patches to <config-patches@gnu.org>.
-
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright 1992-2016 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-case "${UNAME_SYSTEM}" in
-Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
-
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
-	#include <features.h>
-	#if defined(__UCLIBC__)
-	LIBC=uclibc
-	#elif defined(__dietlibc__)
-	LIBC=dietlibc
-	#else
-	LIBC=gnu
-	#endif
-	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
-	;;
-esac
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-	    /sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || \
-	    echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    earmv*)
-		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
-		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
-		machine=${arch}${endian}-unknown
-		;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently (or will in the future) and ABI.
-	case "${UNAME_MACHINE_ARCH}" in
-	    earm*)
-		os=netbsdelf
-		;;
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-		os=netbsd
-		;;
-	esac
-	# Determine ABI tags.
-	case "${UNAME_MACHINE_ARCH}" in
-	    earm*)
-		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}${abi}"
-	exit ;;
-    *:Bitrig:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:LibertyBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:Sortix:*:*)
-	echo ${UNAME_MACHINE}-unknown-sortix
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE=alpha ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE=alpha ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE=alpha ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE=alphaev5 ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE=alphaev56 ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE=alphapca56 ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE=alphapca57 ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE=alphaev6 ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE=alphaev67 ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE=alphaev68 ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE=alphaev69 ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE=alphaev7 ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE=alphaev79 ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm*:riscos:*:*|arm*:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH=i386
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH=x86_64
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
-	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[4567])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/lslpp ] ; then
-		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
-			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
-		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH=hppa2.0n ;;
-			  64) HP_ARCH=hppa2.0w ;;
-			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
-			esac ;;
-		    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
-
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
-
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
-
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
-EOF
-		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = hppa2.0w ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH=hppa2.0w
-	    else
-		HP_ARCH=hppa64
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW64*:*)
-	echo ${UNAME_MACHINE}-pc-mingw64
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    *:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:*)
-	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
-	    else
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
-	    fi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
-    crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
-    e2k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    i*86:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    k1om:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
-	;;
-    openrisc*:Linux:*:*)
-	echo or1k-unknown-linux-${LIBC}
-	exit ;;
-    or32:Linux:*:* | or1k*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-${LIBC}
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
-	exit ;;
-    ppc64le:Linux:*:*)
-	echo powerpc64le-unknown-linux-${LIBC}
-	exit ;;
-    ppcle:Linux:*:*)
-	echo powerpcle-unknown-linux-${LIBC}
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
-	exit ;;
-    sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
-	exit ;;
-    x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
-    xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configure will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
-	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-	exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    x86_64:Haiku:*:*)
-	echo x86_64-unknown-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-ACE:SUPER-UX:*:*)
-	echo sxace-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval $set_cc_for_build
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	    UNAME_PROCESSOR=powerpc
-	fi
-	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		    grep IS_64BIT_ARCH >/dev/null
-		then
-		    case $UNAME_PROCESSOR in
-			i386) UNAME_PROCESSOR=x86_64 ;;
-			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		    esac
-		fi
-	    fi
-	elif test "$UNAME_PROCESSOR" = i386 ; then
-	    # Avoid executing cc on OS X 10.9, as it ships with a stub
-	    # that puts up a graphical alert prompting to install
-	    # developer tools.  Any system running Mac OS X 10.7 or
-	    # later (Darwin 11 and later) is required to have a 64-bit
-	    # processor. This is not true of the ARM version of Darwin
-	    # that Apple uses in portable devices.
-	    UNAME_PROCESSOR=x86_64
-	fi
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = x86; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSE-*:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = 386; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-    x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
-    amd64:Isilon\ OneFS:*:*)
-	echo x86_64-unknown-onefs
-	exit ;;
-esac
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script (version $timestamp), has failed to recognize the
-operating system you are using. If your script is old, overwrite
-config.guess and config.sub with the latest versions from:
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-
-If $0 has already been updated, send the following data and any
-information you think might be pertinent to config-patches@gnu.org to
-provide the necessary information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/main/iaxmodem/config.sub b/main/iaxmodem/config.sub
deleted file mode 100644
index 9feb73bf088..00000000000
--- a/main/iaxmodem/config.sub
+++ /dev/null
@@ -1,1823 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
-
-timestamp='2016-06-20'
-
-# This file 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 3 of the License, or
-# (at your option) any later version.
-#
-# This program 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, see <http://www.gnu.org/licenses/>.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-
-
-# Please send patches to <config-patches@gnu.org>.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright 1992-2016 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| ba \
-	| be32 | be64 \
-	| bfin \
-	| c4x | c8051 | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| e2k | epiphany \
-	| fido | fr30 | frv | ft32 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| k1om \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
-	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pyramid \
-	| riscv32 | riscv64 \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| visium \
-	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	leon|leon[3-9])
-		basic_machine=sparc-$basic_machine
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
-		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| ba-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| e2k-* | elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| k1om-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| or1k*-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pyramid-* \
-	| riscv32-* | riscv64-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| visium-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	asmjs)
-		basic_machine=asmjs-unknown
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	e500v[12])
-		basic_machine=powerpc-unknown
-		os=$os"spe"
-		;;
-	e500v[12]-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=$os"spe"
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	leon-*|leon[3-9]-*)
-		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
-	mingw32)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	moxiebox)
-		basic_machine=moxie-unknown
-		os=-moxiebox
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i686-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
-		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
-		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* | -cloudabi* | -sortix* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-	-nacl*)
-		;;
-	-ios)
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	score-*)
-		os=-elf
-		;;
-	spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
-	c8051-*)
-		os=-elf
-		;;
-	hexagon-*)
-		os=-elf
-		;;
-	tic54x-*)
-		os=-coff
-		;;
-	tic55x-*)
-		os=-coff
-		;;
-	tic6x-*)
-		os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-cnk*|-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/main/iaxmodem/fix-printf.patch b/main/iaxmodem/fix-printf.patch
new file mode 100644
index 00000000000..00a91aaa76e
--- /dev/null
+++ b/main/iaxmodem/fix-printf.patch
@@ -0,0 +1,11 @@
+--- a/lib/libiax2/src/iax2-parser.c
++++ b/lib/libiax2/src/iax2-parser.c
+@@ -56,7 +56,7 @@
+ 
+ static void internaloutput(const char *str)
+ {
+-	printf(str);
++	printf("%s", str);
+ }
+ 
+ static void internalerror(const char *str)
diff --git a/main/icecast/APKBUILD b/main/icecast/APKBUILD
index 5fa0f17a009..97b55df9b94 100644
--- a/main/icecast/APKBUILD
+++ b/main/icecast/APKBUILD
@@ -1,30 +1,33 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
-# Maintainer:  Francesco Colista <fcolista@alpinelinux.org>
-#
-# secfixes:
-#   2.4.4-r0:
-#     - CVE-2018-18820
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 
 pkgname=icecast
 pkgver=2.4.4
-pkgrel=1
+pkgrel=10
 pkgdesc="Open source media server"
-url="http://www.icecast.org"
+url="https://icecast.org/"
 arch="all"
-license="GPL"
+license="GPL-2.0-only"
 install="$pkgname.pre-install"
 pkgusers="icecast"
 pkggroups="icecast"
-makedepends="libxslt-dev libxml2-dev libogg-dev libvorbis-dev libtheora-dev openssl-dev curl-dev"
+makedepends="libxslt-dev libxml2-dev libogg-dev libvorbis-dev libtheora-dev openssl-dev>3 curl-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
-source="http://downloads.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz
+source="https://downloads.xiph.org/releases/icecast/icecast-$pkgver.tar.gz
 	conf-change-owner.patch
 	icecast.initd
-	icecast.confd"
+"
+
+# secfixes:
+#   2.4.4-r0:
+#     - CVE-2018-18820
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
-builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd $builddir
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -38,19 +41,14 @@ build() {
 }
 
 check() {
-	cd $builddir
 	make check
 }
 
 package() {
-	cd $builddir
 	make DESTDIR="$pkgdir" install
-	install -D -m755 ../icecast.initd "$pkgdir"/etc/init.d/icecast
-	install -D -m755 ../icecast.confd "$pkgdir"/etc/conf.d/icecast
-	install -d -D -o icecast -g icecast "$pkgdir"/var/log/icecast
+	install -Dm755 "$srcdir"/icecast.initd "$pkgdir"/etc/init.d/icecast
 }
 
 sha512sums="e9ffb478cac2570891787455591d881a59185e067bb36f51706a7070cd9d82d80425ec8cf151f5ebb17d1b75654449fc760f8b82a1bb05f020b47ec09e46b4d0  icecast-2.4.4.tar.gz
 3de3ed881a60f99d3e4cf656a46cdb157e95abcfa9bd44ebc7e13840a9b0ee84ec9e5b30878d67e42385dac5fa974694c215ad162b910c47b6b7864d474bf636  conf-change-owner.patch
-c78f7e6aa9ff04f7400944e95485994a23493e79d47e0b9799b9235fa5f3ed9d64840be1380a262c30594f9fa2dac96d904226608bfc133d51b3a62ed90d990d  icecast.initd
-7e4299b34207bd4323bc89f2d98abebcb62cbeee3b0931d6d18e1c2c736a17e823b07dfb38364f22a375585843a917031beb1b9efe2fff71de036146371536f3  icecast.confd"
+56b71344cf72e15df2e24fda1c745365a67ebc2f3d167c75ca7ac00e40fc81bc8fb0b787d0feafee130718ce09013a11a150ce0efd359cf8b8ec0b003d17e7b4  icecast.initd"
diff --git a/main/icecast/icecast.confd b/main/icecast/icecast.confd
deleted file mode 100644
index 80cdfc57fb6..00000000000
--- a/main/icecast/icecast.confd
+++ /dev/null
@@ -1 +0,0 @@
-ICEC_OPTS="-b -c ${icecast_conf:-/etc/icecast.xml}"
diff --git a/main/icecast/icecast.initd b/main/icecast/icecast.initd
index d7239187143..11003c2e717 100644
--- a/main/icecast/icecast.initd
+++ b/main/icecast/icecast.initd
@@ -1,19 +1,19 @@
 #!/sbin/openrc-run
 
+name="Icecast 2"
+command="/usr/bin/icecast"
+command_background=yes
+: ${cfgfile:=/etc/icecast.xml}
+: ${command_user:=icecast}
+: ${command_group:=icecast}
+command_args="-c $cfgfile ${ICEC_OPTS}"
+pidfile="/run/icecast/icecast.pid"
+
 depend() {
 	need net
 	after firewall
 }
 
-start() {
-	ebegin "Starting Icecast 2"
-	start-stop-daemon --start --exec /usr/bin/icecast \
-		-- ${ICEC_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Icecast 2"
-	start-stop-daemon --stop --exec /usr/bin/icecast
-	eend $?
+start_pre() {
+	checkpath --directory --owner $command_user:$command_group ${pidfile%/*} /var/log/icecast
 }
diff --git a/main/icon-naming-utils/APKBUILD b/main/icon-naming-utils/APKBUILD
index 07fd7bf52a8..0495770bbe0 100644
--- a/main/icon-naming-utils/APKBUILD
+++ b/main/icon-naming-utils/APKBUILD
@@ -1,18 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=icon-naming-utils
 pkgver=0.8.90
-pkgrel=2
+pkgrel=4
 pkgdesc="Maps the new names of icons for Tango to the legacy names used by the GNOME and KDE desktops."
 url="http://tango.freedesktop.org/"
 arch="noarch"
 options="!check"  # No test suite.
-license="GPL-2.0"
+license="GPL-2.0-or-later"
 depends="perl-xml-simple"
-makedepends=""
-source="http://tango.freedesktop.org/releases/$pkgname-$pkgver.tar.bz2"
+source="http://tango.freedesktop.org/releases/icon-naming-utils-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,7 +22,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/pkgconfig
 	chmod +x "$pkgdir"/usr/lib/icon-naming-utils/icon-name-mapping
diff --git a/main/icu/APKBUILD b/main/icu/APKBUILD
index 62839b36061..084a54e34d7 100644
--- a/main/icu/APKBUILD
+++ b/main/icu/APKBUILD
@@ -1,19 +1,42 @@
 # Contributor: Sergey Lukin <sergej.lukin@gmail.com>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=icu
-pkgver=66.1
+pkgver=74.2
 pkgrel=0
 pkgdesc="International Components for Unicode library"
-url="http://icu-project.org/"
+url="https://icu.unicode.org/"
 arch="all"
-license="MIT ICU Unicode-TOU"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs"
+license="ICU"
 depends_dev="$pkgname=$pkgver-r$pkgrel"
-checkdepends="diffutils python3"
-source="https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-src.tgz"
-builddir="$srcdir"/icu/source
+makedepends="python3 py3-yaml"
+checkdepends="diffutils"
+install="$pkgname-data-en.post-install"
+subpackages="
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-libs
+	$pkgname-data-en:_data_en:noarch
+	$pkgname-data-full:_data_full:noarch
+	"
+source="https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-src.tgz
+	https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-data.zip
+	https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-data-bin-b.zip
+	https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-data-bin-l.zip
+	standardize-vtzone-output.patch
+	data-filter-en.yml
+	"
+builddir="$srcdir/icu/source"
+
+# seems to fail check now with gcc13, only on x86
+case "$CARCH" in
+x86) options="$options !check" ;;
+esac
 
 # secfixes:
+#   66.1-r0:
+#     - CVE-2020-21913
 #   65.1-r1:
 #     - CVE-2020-10531
 #   57.1-r1:
@@ -24,45 +47,115 @@ builddir="$srcdir"/icu/source
 #     - CVE-2017-7867
 #     - CVE-2017-7868
 
-# Failing tests on ARMv7
 case "$CARCH" in
-	armv7) options="!check";;
+	s390x) _icudtfile=icudt${pkgver%%.*}b.dat;;
+	*) _icudtfile=icudt${pkgver%%.*}l.dat;;
 esac
 
+prepare() {
+	default_prepare
+	update_config_sub
+
+	rm -rf data
+	mv "$srcdir"/data .
+}
+
 build() {
+	_yaml2json "$srcdir"/data-filter-en.yml > data-filter-en.json
+	export ICU_DATA_FILTER_FILE="./data-filter-en.json"
+
+	case "$CARCH" in
+	armv7)
+		# bus error with -Os for some reason
+		export CFLAGS="$CFLAGS -O2"
+		export CXXFLAGS="$CXXFLAGS -O2"
+		;;
+	esac
+
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		--with-data-packaging=library \
+		--with-data-packaging=archive \
 		--disable-samples \
 		--enable-static \
 		--mandir=/usr/share/man
-	mkdir -p data/out # work around for s390x build issue
 	make
 }
 
 check() {
-	make check
+	# Tests need full data.
+	export ICU_DATA="$srcdir"/$_icudtfile
+
+	CINTLTST_OPTS='-w' make check
 }
 
 package() {
 	make -j1 DESTDIR="$pkgdir" install
+
 	chmod +x "$pkgdir"/usr/bin/icu-config
-	install -Dm644 "$srcdir"/icu/license.html \
-		"$pkgdir"/usr/share/licenses/icu/license.html
+
+	install -Dm644 "$srcdir"/icu/license.html -t "$pkgdir"/usr/share/licenses/icu/
 }
 
-static() {
-	pkgdesc="$pkgname static libraries"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
+dev() {
+	default_dev
+
+	amove usr/lib/icu
+	amove usr/lib/libicutest.so.*
+	amove usr/share/icu/*/LICENSE
+	amove usr/share/icu/*/config
+	amove usr/share/icu/*/install-sh
+	amove usr/share/icu/*/mkinstalldirs
 }
 
 libs() {
-	default_libs
+	pkgdesc="$pkgdesc (libraries)"
+	depends="$pkgname-data=$pkgver-r$pkgrel"
 	replaces="icu"
+
+	# Data stub required by the Common and I18n libraries.
+	amove usr/lib/libicudata.so.[0-9]*
+	# A library that contains many locale based internationalization (i18n) functions.
+	amove usr/lib/libicui18n.so.[0-9]*
+	# An optional library that provides a stdio like API with Unicode support.
+	amove usr/lib/libicuio.so.[0-9]*
+	# Base library required by all other ICU libraries.
+	amove usr/lib/libicuuc.so.[0-9]*
+
+	# An internal library that contains internal APIs that are only used by ICU’s tools.
+	# Keep in the base package.
+	#amove usr/lib/libicutu.so.[0-9]*
+}
+
+_data_en() {
+	pkgdesc="Stripped down ICU data with only en_US/GB locale and no legacy charset converters"
+	provides="$pkgname-data=$pkgver-r$pkgrel"
+	provider_priority=100  # highest (other provider is icu-data-full)
+	replaces="$pkgname-data<71.1-r1"
+
+	amove usr/share/icu/$pkgver/$_icudtfile
+}
+
+_data_full() {
+	pkgdesc="Full ICU data"
+	provides="$pkgname-data=$pkgver-r$pkgrel"
+	provider_priority=10  # lowest (other provider is icu-data-en)
+	replaces="$pkgname-data<71.1-r1"
+
+	install -D -m644 "$srcdir"/$_icudtfile -t "$subpkgdir"/usr/share/icu/$pkgver/
+}
+
+_yaml2json() {
+	python3 -c 'import sys, yaml, json; json.dump(yaml.safe_load(sys.stdin), sys.stdout)' <"$1"
 }
 
-sha512sums="78d87bce65a7bdf7e9a19bda13e353c60846816ff34025f829d1ff15f9ac49aa6061eb192173742be0eca105684ce0e39e95656147afe848520bf60274c8d246  icu4c-66_1-src.tgz"
+sha512sums="
+e6c7876c0f3d756f3a6969cad9a8909e535eeaac352f3a721338b9cbd56864bf7414469d29ec843462997815d2ca9d0dab06d38c37cdd4d8feb28ad04d8781b0  icu4c-74_2-src.tgz
+f9dbd303f78de1bf9089262211f3b618f1ec915e57877855d0bc6496332620f4ea92eabe1dff9fa721600e9a6ce56885f79361bbcdf97d0cfedd18e4a2d58ad0  icu4c-74_2-data.zip
+76cc9a684be584ce2bd674b40191975a7506ef14c9c7a08cfe0a09d28c90e49529a2eb01baf698cf27895bec9f8fdf6b76c1d1bd010607fac04be7d12e954e50  icu4c-74_2-data-bin-b.zip
+6ef1554c0af06cec777c454cbbeaca44884b8db028d777311323d44e5697a7638df394cfc53760ddcdab763d975f24043f47ac4828e20c9774b4108030a7be15  icu4c-74_2-data-bin-l.zip
+c76fd529f92a7b27a45a307c8bb91c109910d012478414b08983af3320e29fbe76e03d8434c4efbde68ecaa56a86130d6514428c5a1085985634bc3650e8e96e  standardize-vtzone-output.patch
+609541c1ac10c12b2b52f7800a2057d5c97e49dc9a1774a1b53e13d88599128baa7637f1a63b4de52dfe58b1038c7f3462ef29ad223dbe2ecb2862e3249a1cf4  data-filter-en.yml
+"
diff --git a/main/icu/data-filter-en.yml b/main/icu/data-filter-en.yml
new file mode 100644
index 00000000000..e5c303dddd1
--- /dev/null
+++ b/main/icu/data-filter-en.yml
@@ -0,0 +1,87 @@
+localeFilter:
+  filterType: locale
+  includeChildren: false
+  # Note: en_GB doesn't noticeably increase the data size, so let's include it too.
+  includelist:
+    - en_US
+    - en_GB
+featureFilters:
+  # Dictionaries are needed only for non-latin and non-cyrillic scripts.
+  brkitr_dictionaries: exclude
+  brkitr_rules:
+    filterType: regex
+    excludelist:
+      - ^.*_cj$  # Chinese
+  coll_tree:
+    filterType: language
+    # Include top 23 languages with Latin, Cyrillic or Greek script
+    # (selected by the number of speakers and file size).
+    includelist:
+      - be
+      - cs
+      - de
+      - el
+      - en
+      - es
+      - ff
+      - fr
+      - ha
+      - hu
+      - ig
+      - it
+      - kk
+      - ms
+      - nl
+      - pl
+      - pt
+      - ro
+      - ru
+      - tr
+      - uk
+      - xh
+      - zu
+  # Conversion mappings are needed only for legacy character encodings.
+  conversion_mappings: exclude
+  stringprep:
+    # Exclude profiles that no one is likely to need.
+    excludelist:
+      - rfc3722      # iSCSI names
+      - rfc3920node  # XMPP
+      - rfc3920res   # XMPP
+resourceFilters:
+  - categories: [coll_tree]
+    rules:
+      - -/collations/emoji
+      - -/collations/private-unihan
+  - categories: [translit]
+    rules:
+      - -/
+      - +/%%Parent
+      - +/%%ALIAS
+      - +/*/ASCII-Latin
+      - +/*/Latin-ASCII
+      - +/*/Accents-Any
+      - +/*/Any-Accents
+      - +/*/Publishing-Any
+      - +/*/Any-Publishing
+      - +/*/Cyrillic-Latin
+      - +/*/Cyrl-Latn
+      - +/*/Latin-Cyrillic
+      - +/*/Latn-Cyrl
+      - +/*/Greek-Latin
+      - +/*/Grek-Latn
+      - +/*/Greek-Latin/BGN
+      - +/*/el-el_Latn/BGN
+      - +/*/Latin-Greek
+      - +/*/Latn-Grek
+      - +/*/Russian-Latin/BGN
+      - +/*/ru-ru_Latn/BGN
+      - +/*/Latin-Russian/BGN
+      - +/*/ru_Latn-ru/BGN
+      - +/*/Ukrainian-Latin/BGN
+      - +/*/uk-uk_Latn/BGN
+      - +/*/de-ASCII
+      - +/*/de-t-de-d0-ascii
+# Use smaller UCAData
+# https://unicode-org.github.io/icu/userguide/icu_data/buildtool.html#collation-ucadata
+collationUCAData: implicithan
diff --git a/main/icu/icu-data-en.post-install b/main/icu/icu-data-en.post-install
new file mode 100644
index 00000000000..118c4f56ee6
--- /dev/null
+++ b/main/icu/icu-data-en.post-install
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+cat >&2 <<EOF
+*
+* If you need ICU with non-English locales and legacy charset support, install
+* package icu-data-full.
+*
+EOF
+
+exit 0
diff --git a/main/icu/standardize-vtzone-output.patch b/main/icu/standardize-vtzone-output.patch
new file mode 100644
index 00000000000..05e296f1383
--- /dev/null
+++ b/main/icu/standardize-vtzone-output.patch
@@ -0,0 +1,33 @@
+Patch-Source: https://github.com/chimera-linux/cports/blob/c48ec38c2d88f6e5962299583a8f862159c89349/main/icu/patches/standardize-vtzone-output.patch
+https://bugzilla.mozilla.org/show_bug.cgi?id=1790071
+https://unicode-org.atlassian.net/browse/ICU-22132  
+needed for thunderbird
+--
+diff --git a/intl/icu/source/i18n/vtzone.cpp b/intl/icu/source/i18n/vtzone.cpp
+--- a/i18n/vtzone.cpp
++++ b/i18n/vtzone.cpp
+@@ -1735,14 +1735,17 @@ VTimeZone::write(VTZWriter& writer, UErr
+             }
+         }
+     } else {
+-        UnicodeString icutzprop;
+-        UVector customProps(nullptr, uhash_compareUnicodeString, status);
++        UVector customProps(uprv_deleteUObject, uhash_compareUnicodeString, status);
+         if (olsonzid.length() > 0 && icutzver.length() > 0) {
+-            icutzprop.append(olsonzid);
+-            icutzprop.append(u'[');
+-            icutzprop.append(icutzver);
+-            icutzprop.append(u']');
+-            customProps.addElement(&icutzprop, status);
++            LocalPointer<UnicodeString> icutzprop(new UnicodeString(ICU_TZINFO_PROP), status);
++            if (U_FAILURE(status)) {
++                return;
++            }
++            icutzprop->append(olsonzid);
++            icutzprop->append(u'[');
++            icutzprop->append(icutzver);
++            icutzprop->append(u']');
++            customProps.adoptElement(icutzprop.orphan(), status);
+         }
+         writeZone(writer, *tz, &customProps, status);
+     }
diff --git a/main/iftop/APKBUILD b/main/iftop/APKBUILD
index fb7813dc985..d4bbcbe914a 100644
--- a/main/iftop/APKBUILD
+++ b/main/iftop/APKBUILD
@@ -1,36 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=iftop
 pkgver=0.17
-pkgrel=7
+pkgrel=11
 pkgdesc="A tool to display bandwidth usage on an interface"
-url="http://www.ex-parrot.com/~pdw/iftop/"
+url="https://www.ex-parrot.com/~pdw/iftop/"
 arch="all"
-license="GPL-2.0"
-depends=""
+license="GPL-2.0-or-later"
 makedepends="libpcap-dev>=1 ncurses-dev"
+options="!check" # no tests
 subpackages="$pkgname-doc"
-source="http://www.ex-parrot.com/~pdw/$pkgname/download/$pkgname-$pkgver.tar.gz"
+source="https://www.ex-parrot.com/~pdw/iftop/download/iftop-$pkgver.tar.gz
+	format-security.patch
+	"
 
-_builddir="$srcdir"/iftop-$pkgver
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
+	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--mandir=/usr/share/man \
-		|| return 1
-	make || return 1
+		--mandir=/usr/share/man
+	make
 }
 
-package()  {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+package() {
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="41e3bc5feac5927f67356f491fcab7a28f7a32102cc33c67d81c1dc755273c42e32b540b14b6254a540f1b6c1b1ad6c50e3095c3b5282db2ea12dd0049ce2ebd  iftop-0.17.tar.gz"
+sha512sums="
+41e3bc5feac5927f67356f491fcab7a28f7a32102cc33c67d81c1dc755273c42e32b540b14b6254a540f1b6c1b1ad6c50e3095c3b5282db2ea12dd0049ce2ebd  iftop-0.17.tar.gz
+ab478e521c6b460766a8149786c59a3e977f9c44d1b880476baa0c7851a1c6bbf1e998051a25e63aafaf21e629d64cf3336b909c683f8604ffa922ee9e25cd4b  format-security.patch
+"
diff --git a/main/iftop/format-security.patch b/main/iftop/format-security.patch
new file mode 100644
index 00000000000..41156751aa9
--- /dev/null
+++ b/main/iftop/format-security.patch
@@ -0,0 +1,52 @@
+also fixes implicit function decls
+--
+diff --git a/cfgfile.c b/cfgfile.c
+index 442316c..6637bd1 100644
+--- a/cfgfile.c
++++ b/cfgfile.c
+@@ -7,6 +7,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ #include <errno.h>
+ 
+ #include "stringmap.h"
+diff --git a/iftop.c b/iftop.c
+index 5a7b41e..a08e8cd 100644
+--- a/iftop.c
++++ b/iftop.c
+@@ -46,6 +46,10 @@
+ #include "ppp.h"
+ 
+ 
++void options_read_args(int argc, char **argv);
++void options_make(void);
++int get_addrs_ioctl(char *interface, char if_hw_addr[], struct in_addr *if_ip_addr);
++
+ /* ethernet address of interface. */
+ int have_hw_addr = 0;
+ unsigned char if_hw_addr[6];    
+diff --git a/options.c b/options.c
+index 8f385de..a9aac5e 100644
+--- a/options.c
++++ b/options.c
+@@ -28,6 +28,9 @@
+ #   define inet_aton(a, b)  inet_pton(AF_INET, (a), (b))
+ #endif
+ 
++void config_set_string(const char *directive, const char* s);
++int config_get_enum(const char *directive, config_enumeration_type *enumeration, int *value);
++
+ options_t options;
+ 
+ char optstr[] = "+i:f:nNF:hpbBPm:c:";
+@@ -159,7 +162,7 @@ void options_set_defaults() {
+ }
+ 
+ static void die(char *msg) {
+-    fprintf(stderr, msg);
++    fprintf(stderr, "%s", msg);
+     exit(1);
+ }
+ 
diff --git a/main/ifupdown-ng/01-add-onlink-to-default-route.patch b/main/ifupdown-ng/01-add-onlink-to-default-route.patch
new file mode 100644
index 00000000000..e663cdf4ce8
--- /dev/null
+++ b/main/ifupdown-ng/01-add-onlink-to-default-route.patch
@@ -0,0 +1,30 @@
+From: Dermot Bradley <dermot_bradley@yahoo.com>
+Date: Wed,  4 Jan 2023 00:23 +0000
+Subject: [PATCH] for static executor add "onlink" option to default route
+
+Add the "onlink" next-hop option to the default route. This is required
+for situations like some VPS/Cloud Providers where they provide a /32 IPv4
+address or a /128 IPv6 address and obviously the router to use as the gateway
+for the default route is not in the same subnet.
+
+The ifupdown package has been adding the "onlink" option for the past 7
+years when Debian added it:
+
+https://salsa.debian.org/debian/ifupdown/-/commit/8b7bca9597d2f75670b182f0fc149cdbaec3544c
+
+This patch has been submitted upstream to ifupdown-ng as PR #207.
+
+---
+
+diff -aur a/executor-scripts/linux/static b/executor-scripts/linux/static
+--- a/executor-scripts/linux/static
++++ b/executor-scripts/linux/static
+@@ -33,7 +33,7 @@
+ configure_gateways() {
+ 	for gw in ${IF_GATEWAYS}; do
+ 		addrfam=$(addr_family ${gw})
+-		${MOCK} ip "${addrfam}" route add default via "${gw}" ${VRF_TABLE} ${METRIC} dev "${IFACE}"
++		${MOCK} ip "${addrfam}" route add default via "${gw}" ${VRF_TABLE} ${METRIC} dev "${IFACE}" onlink
+ 	done
+ }
+ 
diff --git a/main/ifupdown-ng/APKBUILD b/main/ifupdown-ng/APKBUILD
new file mode 100644
index 00000000000..219b10cda11
--- /dev/null
+++ b/main/ifupdown-ng/APKBUILD
@@ -0,0 +1,120 @@
+# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
+pkgname=ifupdown-ng
+pkgver=0.12.1
+pkgrel=5
+pkgdesc="tools for managing network configuration"
+url="https://github.com/ifupdown-ng/ifupdown-ng"
+arch="all"
+license="ISC"
+checkdepends="kyua atf"
+makedepends="scdoc"
+# Networking initd script is provided by openrc package
+subpackages="
+	$pkgname-doc
+	$pkgname-iproute2
+	$pkgname-ppp
+	$pkgname-wireguard
+	$pkgname-wireguard-quick:wgquick
+	$pkgname-ethtool
+	$pkgname-batman
+	$pkgname-wifi
+"
+source="https://distfiles.ariadne.space/ifupdown-ng/ifupdown-ng-$pkgver.tar.xz
+	01-add-onlink-to-default-route.patch
+	"
+provides="ifupdown-any"
+provider_priority=900
+
+# We conflict with the vlan package because we provide our own
+# vlan support with the link executor.
+depends="!vlan"
+
+# We only install the core executors right now.  The other executors are
+# still being ported to run under ifupdown-ng natively, and so we will
+# use the ifupdown scripts for now for those cases.  However, it is nice
+# to make the automatic dependency resolution work, and ifupdown-ng
+# provides some stubs to enable that.
+_executor_stubs="bridge bond"
+
+# These are optional executors which do not conflict with what we are
+# presently shipping.  These executors require iproute2.
+_executor_iproute2="vrf gre vxlan mpls"
+
+# These are all optional executors we plan to use.
+_executor_opt="ppp wireguard wireguard-quick ethtool batman wifi $_executor_iproute2"
+
+build() {
+	make
+	make docs
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" EXECUTOR_SCRIPTS_OPT="$_executor_opt" EXECUTOR_SCRIPTS_STUB="$_executor_stubs" install install_docs
+}
+
+iproute2() {
+	pkgdesc="ifupdown-ng integration for iproute2"
+	depends="iproute2-minimal"
+	install_if="$pkgname=$pkgver-r$pkgrel $depends"
+
+	for exec in $_executor_iproute2; do
+		amove usr/libexec/ifupdown-ng/$exec
+	done
+}
+
+ppp() {
+	pkgdesc="ifupdown-ng integration for ppp"
+	depends="ppp-daemon"
+	install_if="$pkgname=$pkgver-r$pkgrel $depends"
+
+	amove usr/libexec/ifupdown-ng/ppp
+}
+
+wireguard() {
+	pkgdesc="ifupdown-ng integration for wireguard"
+	depends="wireguard-tools-wg"
+	install_if="$pkgname=$pkgver-r$pkgrel $depends"
+
+	amove usr/libexec/ifupdown-ng/wireguard
+}
+
+wgquick() {
+	pkgdesc="ifupdown-ng integration for wireguard wg-quick"
+	depends="wireguard-tools-wg-quick"
+	install_if="$pkgname=$pkgver-r$pkgrel $depends"
+
+	amove usr/libexec/ifupdown-ng/wireguard-quick
+}
+
+ethtool() {
+	pkgdesc="ifupdown-ng integration for ethtool"
+	depends="ethtool"
+	install_if="$pkgname=$pkgver-r$pkgrel $depends"
+
+	amove usr/libexec/ifupdown-ng/ethtool
+}
+
+batman() {
+	pkgdesc="ifupdown-ng integration for B.A.T.M.A.N. advanced"
+	depends="batctl"
+	install_if="$pkgname=$pkgver-r$pkgrel $depends"
+
+	amove usr/libexec/ifupdown-ng/batman
+}
+
+wifi() {
+	pkgdesc="ifupdown-ng integration for wifi"
+	depends="wpa_supplicant"
+	install_if="$pkgname=$pkgver-r$pkgrel $depends"
+
+	amove usr/libexec/ifupdown-ng/wifi
+}
+
+sha512sums="
+c2c1e27fbd53eeb4150e544a893352f13845b491850e982a5880160c3be03b628794f7989c802ff823ac3e8c6c34dc4ab97c0abcefdda85f06fcd64ced8ac60c  ifupdown-ng-0.12.1.tar.xz
+5a4900356cf4ea48d5088d98328cf3f8a821a52a3b9518987a6432fc1349c3a314bbe20d46736ec8781e2a675398e15183c1ab8c0ba617c3e49b164fbbb48baf  01-add-onlink-to-default-route.patch
+"
diff --git a/main/ifupdown/APKBUILD b/main/ifupdown/APKBUILD
deleted file mode 100644
index bba0f08260a..00000000000
--- a/main/ifupdown/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Contributor: 
-# Maintainer: 
-pkgname=ifupdown
-pkgver=0.8.35
-pkgrel=0
-pkgdesc="high level tools to configure network interfaces"
-url="http://packages.debian.org/ifupdown"
-arch="all"
-license="GPL"
-makedepends="perl"
-source="http://ftp.de.debian.org/debian/pool/main/i/$pkgname/${pkgname}_$pkgver.tar.xz
-	musl-macros-main.patch
-	musl-macros-archlinux.patch
-	makefile-arch.patch
-	busybox-compat.patch
-	ifupdown-alpine-ifstate.patch
-	ifupdown-no-dpkg.patch"
-
-builddir="$srcdir/$pkgname"
-
-prepare() {
-	cd $builddir
-	local i
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd $builddir
-	make || return 1
-}
-
-package() {
-	cd $builddir
-	make BASEDIR="$pkgdir" install || return 1
-}
-
-sha512sums="ec18b9cc36914b27ee9cfd1d30dc6fbf356f9ca5a0e7af1eafe6318c22ab59f6e214869e47c61ca00389061a58fa46e4bf113423156b8b5ebf75308a3ad23153  ifupdown_0.8.35.tar.xz
-1de60402dfc2e246c162726093c765971021e7a0069372e0a167f62a9e90ef742f4a5e7593dd9da45f689e806d23e59156754d6bbeed4e1a725d97adb525eac6  musl-macros-main.patch
-a70b947b1b618d838e03f6493f2a9748565b0a077b1d526c6ad7ba7f4d7e8c287c42d92140164f4e7eb2e1860e1d476b3d44b88070e5e6bfe00ab0286db64006  musl-macros-archlinux.patch
-31e436464be33e63c37a914ab77c9a3c0d4b94a1037457e483754bb1c262d4c6a318205a76277f58510a7030b7e69ae6b36ab8a966940771dbe8544a6079915b  makefile-arch.patch
-c99209142275b103d978e45037f3dcf0dcc4a6f33cf480e582e48d9c7858b7873012f287c2894376c841610842046b4e5b7da58632f839ab526e33704f758e5d  busybox-compat.patch
-422998dae8d0ac6049064c93c22baea143eefa7cab9a330b41ec6e317294da4976c193a7a252a8b4a3a47b93ebb01ef308f5a3803838d6452fc283a159ad1e89  ifupdown-alpine-ifstate.patch
-dfda752c68fd71d016f770753fa7142179dcb2c6f92cc78a9efa8135897e8186c549062bb1631c50c6087725e796c62e900d3f3a91e52d8c436be64a18efbfba  ifupdown-no-dpkg.patch"
diff --git a/main/ifupdown/busybox-compat.patch b/main/ifupdown/busybox-compat.patch
deleted file mode 100644
index 706b5040060..00000000000
--- a/main/ifupdown/busybox-compat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/main.c	2019-01-28 18:21:37.000000000 +0100
-+++ b/main.c	2019-06-01 19:22:23.224959630 +0200
-@@ -94,8 +94,8 @@
- 		"\t--no-loopback          don't act specially on the loopback device\n");
- 
- 	if (!(cmds == iface_list) && !(cmds == iface_query))
--		printf(	"\t--force                force de/configuration\n"
--			"\t--ignore-errors        ignore errors\n");
-+    printf("\t-f,--force\t\t\tforce de/configuration\n"
-+			"\t--ignore-errors\t\t\tignore errors\n");
- 
- 	if ((cmds == iface_list) || (cmds == iface_query))
- 		printf(	"\t--list                 list all matching known interfaces\n"
-@@ -439,7 +439,7 @@
- 		{"no-mappings", no_argument, NULL, 1},
- 		{"no-scripts", no_argument, NULL, 4},
- 		{"no-loopback", no_argument, NULL, 5},
--		{"force", no_argument, NULL, 2},
-+		{"force", no_argument, NULL, 'f'},
- 		{"ignore-errors", no_argument, NULL, 7},
- 		{"option", required_argument, NULL, 'o'},
- 		{"list", no_argument, NULL, 'l'},
-@@ -450,7 +450,7 @@
- 	};
- 
- 	for (;;) {
--		int c = getopt_long(*argc, *argv, "X:s:i:o:hVvnal", long_opts, NULL);
-+		int c = getopt_long(*argc, *argv, "X:s:i:o:hVvnalf", long_opts, NULL);
- 
- 		if (c == EOF)
- 			break;
-@@ -526,7 +526,7 @@
- 			run_mappings = false;
- 			break;
- 
--		case 2: /* --force */
-+		case 'f': /* --force */
- 			if ((cmds == iface_list) || (cmds == iface_query))
- 				usage();
- 			force = true;
diff --git a/main/ifupdown/ifupdown-alpine-ifstate.patch b/main/ifupdown/ifupdown-alpine-ifstate.patch
deleted file mode 100644
index fd76da91b2c..00000000000
--- a/main/ifupdown/ifupdown-alpine-ifstate.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/header.h b/header.h
-index b621448..a735176 100644
---- a/header.h
-+++ b/header.h
-@@ -97,7 +97,7 @@ struct mapping_defn
- #define MAX_VARNAME    32
- #define EUNBALPER   10000
- #ifndef RUN_DIR
--#define RUN_DIR "/run/network/"
-+#define RUN_DIR "/var/run/"
- #endif
- 
- #ifndef LO_IFACE
diff --git a/main/ifupdown/ifupdown-no-dpkg.patch b/main/ifupdown/ifupdown-no-dpkg.patch
deleted file mode 100644
index 4cb9268123b..00000000000
--- a/main/ifupdown/ifupdown-no-dpkg.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/defn2c.pl b/defn2c.pl
-index c449de2..ef8d475 100755
---- a/defn2c.pl
-+++ b/defn2c.pl
-@@ -2,7 +2,7 @@
- 
- use strict;
- 
--my $DEB_HOST_ARCH_OS = `dpkg-architecture -qDEB_HOST_ARCH_OS`;
-+my $DEB_HOST_ARCH_OS = `uname -s|tr [A-Z] [a-z]`;
- 
- $DEB_HOST_ARCH_OS =~ s/\n//;
- 
-diff --git a/defn2man.pl b/defn2man.pl
-index 6ddcfdd..f1e6bde 100755
---- a/defn2man.pl
-+++ b/defn2man.pl
-@@ -2,7 +2,7 @@
- 
- use strict;
- 
--my $DEB_HOST_ARCH_OS = `dpkg-architecture -qDEB_HOST_ARCH_OS`;
-+my $DEB_HOST_ARCH_OS = `uname -s | tr [A-Z] [a-z]`;
- 
- $DEB_HOST_ARCH_OS =~ s/\n//;
- 
diff --git a/main/ifupdown/makefile-arch.patch b/main/ifupdown/makefile-arch.patch
deleted file mode 100644
index 8a856d1f2d7..00000000000
--- a/main/ifupdown/makefile-arch.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile	2019-01-28 18:25:51.000000000 +0100
-+++ b/Makefile	2019-06-01 19:10:28.644361881 +0200
-@@ -1,6 +1,6 @@
- VERSION ?= 0.8
- CFLAGS ?= -Wall -W -Wno-unused-parameter -g -O2
--ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-+ARCH := linux
- 
- BASEDIR ?= $(DESTDIR)
- 
diff --git a/main/ifupdown/musl-macros-archlinux.patch b/main/ifupdown/musl-macros-archlinux.patch
deleted file mode 100644
index e72e6d79ba1..00000000000
--- a/main/ifupdown/musl-macros-archlinux.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/archlinux.c	2018-08-25 16:09:19.000000000 +0200
-+++ b/archlinux.c	2019-06-01 19:02:42.615387535 +0200
-@@ -10,6 +10,10 @@
- 
- #include "archcommon.h"
- 
-+#ifndef FNM_EXTMATCH
-+#define FNM_EXTMATCH 0
-+#endif
-+
- bool variable_match(const char *iface, const char *variable, const char *pattern) {
- 	// Map platform-independent variables to sysfs names
- 	if(!strcasecmp(variable, "mac"))
diff --git a/main/ifupdown/musl-macros-main.patch b/main/ifupdown/musl-macros-main.patch
deleted file mode 100644
index d934f274270..00000000000
--- a/main/ifupdown/musl-macros-main.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/main.c	2019-01-28 18:21:37.000000000 +0100
-+++ b/main.c	2019-06-01 18:59:48.889202981 +0200
-@@ -20,6 +20,10 @@
- #include "archcommon.h"
- #include "header.h"
- 
-+#ifndef FNM_EXTMATCH
-+#define FNM_EXTMATCH 0
-+#endif
-+
- static const char *argv0;
- bool do_interface_lock = true;
- bool no_act = false;
diff --git a/main/igmpproxy/APKBUILD b/main/igmpproxy/APKBUILD
index 1ce77a91053..6254338db63 100644
--- a/main/igmpproxy/APKBUILD
+++ b/main/igmpproxy/APKBUILD
@@ -1,19 +1,22 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=igmpproxy
-pkgver=0.2.1
-pkgrel=0
+pkgver=0.4
+pkgrel=1
 pkgdesc="A simple dynamic Multicast Routing Daemon using only IGMP signalling"
-url="https://sourceforge.net/projects/igmpproxy/"
+url="https://github.com/pali/igmpproxy"
 arch="all"
 license="GPL-2.0-or-later"
 makedepends="linux-headers"
 subpackages="$pkgname-doc"
-source="https://github.com/pali/igmpproxy/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://github.com/pali/igmpproxy/releases/download/$pkgver/igmpproxy-$pkgver.tar.gz"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	# our kernel have a patch that changes MAXVIFS
 	# note that this is ABI incompatible
 	sed -i -e 's:^#define MAX_MC_VIFS.*:#define MAX_MC_VIFS   MAXVIFS:' \
@@ -30,13 +33,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="17f6891bf49d3e70cdf3930ab1abe6a0ad7b9f12ff2d1cdde3761771988585301f459995ba5ea956c742597de4ce13fbf0ba3c1ae37d13b2eee2a09f16f51ae2  igmpproxy-0.2.1.tar.gz"
+sha512sums="
+ad5d8f0794cf74e42f6f99a57815402904ef7f03b76a901885c16aa0d148e552ce001832e82e4cc4ac33e2d4fd6059c51352363f13f192bca48ea9bca12c640c  igmpproxy-0.4.tar.gz
+"
diff --git a/main/ilbc/APKBUILD b/main/ilbc/APKBUILD
deleted file mode 100644
index 3871720aa9a..00000000000
--- a/main/ilbc/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=ilbc
-pkgver=0.0.1
-pkgrel=0
-pkgdesc="Internet Low Bitrate Codec - FreeSwitch"
-url="https://freeswitch.org/stash/projects/SD/repos/libilbc/browse"
-arch="all"
-license="BSD"
-depends=""
-makedepends="autoconf automake libtool"
-install=""
-subpackages="$pkgname-dev"
-source="http://files.freeswitch.org/downloads/libs/ilbc-$pkgver.tar.gz"
-
-_builddir="$srcdir"/ilbc-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	sh bootstrap.sh || return 1
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-sha512sums="35ab51c5fe7cc4e820375bd9d991168119ecf0160024da0ad7191f27b4827e3958471724238e4bc940435c1fc9e33b2c82bb6d20943c00599f297039669ce237  ilbc-0.0.1.tar.gz"
diff --git a/main/imake/APKBUILD b/main/imake/APKBUILD
index c0d2f256873..4dd7486b30e 100644
--- a/main/imake/APKBUILD
+++ b/main/imake/APKBUILD
@@ -1,25 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=imake
-pkgver=1.0.8
+pkgver=1.0.10
 pkgrel=1
 pkgdesc="X Windows make utility"
 url="https://www.x.org"
 arch="all"
-license="MIT-enna"
+license="custom"
 options="!check"  # No test suite.
 makedepends="util-macros xorgproto"
 subpackages="$pkgname-doc"
-source="https://ftp.x.org/pub/individual/util/$pkgname-$pkgver.tar.bz2"
+source="https://ftp.x.org/pub/individual/util/imake-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure --prefix=/usr
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha512sums="5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728  imake-1.0.8.tar.bz2"
+sha512sums="
+ea96db27a6da13ea2d64652936e508b5e3d5d712347a2eb248376dc1f262c18720d9934b8ae69b4c0fc65b135c847be42da084fe924e4825ce1d359f4ef7e60f  imake-1.0.10.tar.xz
+"
diff --git a/main/imap/APKBUILD b/main/imap/APKBUILD
index d3d4c4e0e24..f04361d24d9 100644
--- a/main/imap/APKBUILD
+++ b/main/imap/APKBUILD
@@ -5,22 +5,21 @@
 # build it shared
 pkgname=imap
 pkgver=2007f
-pkgrel=11
+pkgrel=15
 pkgdesc="An IMAP/POP server"
 url="http://www.washington.edu/imap"
 arch="all"
 license="Apache-2.0"
 subpackages="$pkgname-dev c-client:cclient"
-depends=""
-makedepends="openssl-dev"
+makedepends="openssl-dev>3"
 source="http://ftp.ntua.gr/pub/net/mail/imap/imap-$pkgver.tar.gz
 	fix-linking.patch
 	c-client-2006k_KOLAB_Annotations.patch
 	1006_openssl1.1_autoverify.patch
 	2014_openssl1.1.1_sni.patch
 	"
+options="!check"
 
-builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	default_prepare
 	sed -e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \
@@ -31,15 +30,13 @@ prepare() {
 }
 
 build() {
-	cd $builddir
 	export GCCCFLAGS="$CFLAGS"
-	yes "y" | make slx SPECIALAUTHENTICATORS=ssl SSLTYPE=unix \
+	yes "y" | make -j1 slx SPECIALAUTHENTICATORS=ssl SSLTYPE=unix \
 		EXTRACFLAGS="$CFLAGS -fPIC" \
 		EXTRALDFLAGS="$LDFLAGS"
 }
 
 package() {
-	cd $builddir
 	mkdir -p $pkgdir/usr/sbin
 	install -D -m755 imapd/imapd $pkgdir/usr/sbin/imapd
 	install -D -m755 ipopd/ipop2d $pkgdir/usr/sbin/ipop2d
diff --git a/main/imlib2/APKBUILD b/main/imlib2/APKBUILD
index 961d2760098..c9f918668a8 100644
--- a/main/imlib2/APKBUILD
+++ b/main/imlib2/APKBUILD
@@ -1,26 +1,36 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=imlib2
-pkgver=1.6.1
+pkgver=1.12.2
 pkgrel=0
 pkgdesc="Image manipulation library"
-url="https://sourceforge.net/projects/enlightenment"
+url="https://sourceforge.net/projects/enlightenment/"
 arch="all"
 license="Imlib2"
 subpackages="$pkgname-dev"
 depends_dev="freetype-dev libxext-dev libsm-dev"
-makedepends="$depends_dev tiff-dev giflib-dev bzip2-dev libpng-dev
-	libid3tag-dev libjpeg-turbo-dev zlib-dev util-linux-dev"
+makedepends="
+	$depends_dev
+	tiff-dev
+	bzip2-dev
+	giflib-dev
+	libid3tag-dev
+	libjpeg-turbo-dev
+	libpng-dev
+	libwebp-dev
+	zlib-dev
+	"
 source="https://downloads.sourceforge.net/enlightenment/imlib2-$pkgver.tar.gz"
 
 build() {
+	CFLAGS="$CFLAGS -flto=auto" \
+	CXXFLAGS="$CXXFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc/imlib2 \
 		--x-libraries=/usr/lib \
-		--disable-mmx \
-		--disable-amd64 \
+		--disable-static \
 		--enable-visibility-hiding \
 		--with-x \
 		--with-bzip2 \
@@ -29,6 +39,7 @@ build() {
 		--with-jpeg \
 		--with-png \
 		--with-tiff \
+		--with-webp \
 		--with-zlib
 	make
 }
@@ -41,4 +52,6 @@ package() {
 	make DESTDIR=$pkgdir install
 }
 
-sha512sums="0c6d874973c46c7e96e49fc391d463ec8c7c5ce9de682600cb4e28ca81ff0366a02055cbec2a2b743204051243d20b2316ab602b98df9d03dcf319297f7e6a13  imlib2-1.6.1.tar.gz"
+sha512sums="
+5b7ce1fc2ca5d80674dcf06bc025da322789a52063dfc4c057073fbb4fedd2533c637bbc2b15cad30bc92c01ea19cbadd3b41cb0abb19a075afb09c1e390952c  imlib2-1.12.2.tar.gz
+"
diff --git a/main/in-sync/APKBUILD b/main/in-sync/APKBUILD
new file mode 100644
index 00000000000..719689be47b
--- /dev/null
+++ b/main/in-sync/APKBUILD
@@ -0,0 +1,23 @@
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
+pkgname=in-sync
+pkgver=1.1
+pkgrel=0
+pkgdesc="inotify-triggered file synchronization"
+url="https://git.alpinelinux.org/cgit/aports/tree/main/in-sync"
+arch="noarch"
+license="GPL-2.0-only"
+depends="inotify-tools rsync /bin/sh"
+subpackages="$pkgname-openrc"
+source="in-sync in-sync.conf in-sync.initd"
+options="!check" # No testsuite
+
+package() {
+	install -D -m 755 "$srcdir/in-sync" "$pkgdir/usr/sbin/in-sync"
+	install -D -m 644 "$srcdir/in-sync.conf" "$pkgdir/etc/in-sync.conf"
+	install -D -m 755 "$srcdir/in-sync.initd" "$pkgdir/etc/init.d/in-sync"
+}
+
+sha512sums="e525963135dbf185385fc1739b9241efd149ca14b9198eb52c3667f5ba13bbc924b7192d937179dde8eab2edff0e7d108b72ef75ef5adb0320202cf3838f1c7d  in-sync
+27f1f36437f245e3555d598228ddc81c9ddc217fc54aadaa4135cb3b2794559b485c220e3d481efb600f5386f41af8566c409b6353e9d3f563dfce08a9e9bf78  in-sync.conf
+de73c5375f734a0e1955ee7d2e3f2474e23ff0f8ddcd310a5eb774d208e4de13005d640a3c8fb22ac63b88040a6f7cc88b5723b8ac28829a3784aac2e04a7bd2  in-sync.initd"
diff --git a/main/in-sync/in-sync b/main/in-sync/in-sync
new file mode 100644
index 00000000000..421974dc9ec
--- /dev/null
+++ b/main/in-sync/in-sync
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# inotify-triggered file synchronization
+# Copyright (c) 2020 Kaarle Ritvanen
+
+. /etc/in-sync.conf
+
+log() {
+	logger -p daemon.$1 "$(basename "$0"): $2"
+}
+
+list_files() {
+	local path
+	cat /etc/in-sync.d/* | while read path; do
+		[ -e "$path" ] && echo "$path"
+	done
+}
+
+while :; do
+	for host in $TARGET_HOSTS; do
+		if list_files | rsync -avz --files-from - / $host:/; then
+			log info "successfully synchronized to $host"
+		else
+			log err "synchronization to $host failed"
+		fi
+	done
+	list_files | inotifywait -e close_write -t 900 --fromfile -
+	[ $? -eq 1 ] && sleep 60
+done
diff --git a/main/in-sync/in-sync.conf b/main/in-sync/in-sync.conf
new file mode 100644
index 00000000000..4931f8ccbc8
--- /dev/null
+++ b/main/in-sync/in-sync.conf
@@ -0,0 +1 @@
+TARGET_HOSTS=""
diff --git a/main/in-sync/in-sync.initd b/main/in-sync/in-sync.initd
new file mode 100644
index 00000000000..9cc86c0109f
--- /dev/null
+++ b/main/in-sync/in-sync.initd
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+
+# inotify-triggered file synchronization
+# Copyright (c) 2020 Kaarle Ritvanen
+
+name=in-sync
+command=/usr/sbin/in-sync
+command_background=1
+pidfile=/var/run/$name.pid
+
+depend() {
+	need net
+	after firewall
+}
diff --git a/main/indent/APKBUILD b/main/indent/APKBUILD
index 37f5598db1e..71e9938b582 100644
--- a/main/indent/APKBUILD
+++ b/main/indent/APKBUILD
@@ -1,45 +1,42 @@
-# Contributor: 
-# Maintainer: 
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=indent
-pkgver=2.2.12
-pkgrel=0
+pkgver=2.2.13
+pkgrel=2
 pkgdesc="An indenting utility"
 url="https://www.gnu.org/software/indent/"
-arch="all"
-license="GPL-3.0-or-later BSD"
-depends=""
-makedepends="gettext-dev"
-install=""
+# ppc64le: segfaults in tests
+arch="all !ppc64le"
+license="GPL-3.0-or-later"
+makedepends="gettext-dev texinfo"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://ftpmirror.gnu.org/indent/$pkgname-$pkgver.tar.gz"
+source="https://ftp.gnu.org/gnu/indent/indent-$pkgver.tar.xz"
 
-_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
-	# apply patches here
+	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--without-included-gettext \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--without-texinfo \
-		|| return 1
-	make SUBDIRS="intl po src" || return 1
+		--disable-dependency-tracking
+	make
+}
+
+check() {
+	make check
 }
 
 package() {
-	cd "$_builddir"
-	make SUBDIRS="intl po src man" DESTDIR="$pkgdir" install || return 1
-	rm -rf "$pkgdir"/usr/lib/charset.alias
-	rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3fab46979779b2ac35c6ca8aaf52589ef3ccec55d41889941afb18764d5f9b6c516ea93da02e621cc42b01e87ec534c4e4bc3b6a77ba733f028a512b013c9ede  indent-2.2.12.tar.gz"
+sha512sums="
+a92028f99cc64b451aac99802de564f2e915e7f0e258df761141f77595c07cc95c3f2c35917618dbc2cfa3aa5b163544e07aa6641c32298aca3a1c5331bb8c69  indent-2.2.13.tar.xz
+"
diff --git a/main/inih/APKBUILD b/main/inih/APKBUILD
new file mode 100644
index 00000000000..55ea50ba2bf
--- /dev/null
+++ b/main/inih/APKBUILD
@@ -0,0 +1,62 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=inih
+pkgver=58
+pkgrel=0
+pkgdesc="Simple .INI file parser for embedded systems"
+options="!check" # No testsuite in Meson, unittests always return 0
+url="https://github.com/benhoyt/inih"
+arch="all"
+license="BSD-3-Clause"
+makedepends="meson"
+checkdepends="bash"
+subpackages="
+	$pkgname-dev:_dev
+	$pkgname-inireader
+	$pkgname-inireader-dev
+	"
+source="$pkgname-$pkgver.tar.gz::https://github.com/benhoyt/inih/archive/r$pkgver.tar.gz"
+builddir="$srcdir/inih-r$pkgver"
+
+build() {
+	abuild-meson \
+		-Ddefault_library=both \
+		-Ddistro_install=true \
+		-Dwith_INIReader=true \
+		-Dmulti-line_entries=true \
+		-Dutf-8_bom=true \
+		-Dinline_comments=true \
+		-Duse_heap=false \
+		. output
+	meson compile -C output
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+}
+
+inireader() {
+	pkgdesc="C++ library and API for inih"
+	amove usr/lib/libINIReader.so.*
+}
+
+_dev() {
+	default_dev
+
+	# Move inireader stuff out, it will be caught later
+	mkdir -p "$pkgdir"/usr/lib/pkgconfig "$pkgdir"/usr/include
+
+	# Headers
+	mv "$subpkgdir"/usr/include/INIReader.h "$pkgdir"/usr/include
+
+	# Static and Shared libraries
+	mv "$subpkgdir"/usr/lib/libINIReader.so "$pkgdir"/usr/lib
+	mv "$subpkgdir"/usr/lib/libINIReader.a "$pkgdir"/usr/lib
+
+	# Pkgconfig
+	mv "$subpkgdir"/usr/lib/pkgconfig/INIReader.pc "$pkgdir"/usr/lib/pkgconfig
+}
+
+sha512sums="
+d69f488299c1896e87ddd3dd20cd9db5848da7afa4c6159b8a99ba9a5d33f35cadfdb9f65d6f2fe31decdbadb8b43bf610ff2699df475e1f9ff045e343ac26ae  inih-58.tar.gz
+"
diff --git a/main/iniparser/APKBUILD b/main/iniparser/APKBUILD
index 316aa74cd83..bed53f62a35 100644
--- a/main/iniparser/APKBUILD
+++ b/main/iniparser/APKBUILD
@@ -1,32 +1,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=iniparser
 pkgver=4.1
-pkgrel=0
-pkgdesc="C library for parsing "INI-style" files"
-url="http://ndevilla.free.fr/iniparser/"
+pkgrel=4
+pkgdesc="C library for parsing INI-style files"
+url="https://github.com/ndevilla/iniparser"
 arch="all"
 license="MIT"
-depends=""
 makedepends="bash"
 subpackages="$pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/ndevilla/iniparser/archive/v$pkgver.tar.gz
-	rpath.patch"
-builddir="$srcdir"/iniparser-$pkgver
+	CVE-2023-33461.patch
+	rpath.patch
+	"
+
+# secfixes:
+#   4.1-r3:
+#     - CVE-2023-33461
 
 build() {
-	cd "$builddir"
-#	make CC="${CC:-gcc}" CFLAGS="${CFLAGS} -fPIC" LDFLAGS="$LDFLAGS" \
-#		libiniparser.so
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	install -d "$pkgdir"/usr/lib "$pkgdir"/usr/include
 	install -m 644 src/dictionary.h "$pkgdir"/usr/include/dictionary.h
 	install -m 644 src/iniparser.h "$pkgdir"/usr/include/iniparser.h
@@ -34,5 +33,8 @@ package() {
 	ln -s libiniparser.so.1 "$pkgdir"/usr/lib/libiniparser.so
 }
 
-sha512sums="a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968  iniparser-4.1.tar.gz
-db7bdab6f8faafd47c8b50104e1a461fbd9324b75482b1455a8fc059c07278e7e60f088a3f712b0ade05a9bb989168d17684455b9863018f22a61e0190a888c6  rpath.patch"
+sha512sums="
+a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968  iniparser-4.1.tar.gz
+d2becc2fdbe5a57c7bdd05c61ba4f5a199c43fac55cd98c9b54e11ca06d74d5c592e7fea86c634c91db92c74fa3ec95abad379ff4caa4c79449198528d5b6e48  CVE-2023-33461.patch
+db7bdab6f8faafd47c8b50104e1a461fbd9324b75482b1455a8fc059c07278e7e60f088a3f712b0ade05a9bb989168d17684455b9863018f22a61e0190a888c6  rpath.patch
+"
diff --git a/main/iniparser/CVE-2023-33461.patch b/main/iniparser/CVE-2023-33461.patch
new file mode 100644
index 00000000000..d667ffca1ee
--- /dev/null
+++ b/main/iniparser/CVE-2023-33461.patch
@@ -0,0 +1,45 @@
+Patch-Source: https://github.com/ndevilla/iniparser/pull/146
+--
+From ace9871f65d11b5d73f0b9ee8cf5d2807439442d Mon Sep 17 00:00:00 2001
+From: Antonio <antoniolrt@gmail.com>
+Date: Fri, 2 Jun 2023 15:03:10 -0300
+Subject: [PATCH] Handle null return from iniparser_getstring
+
+Fix handling of NULL returns from iniparser_getstring in
+iniparser_getboolean, iniparser_getlongint and iniparser_getdouble,
+avoiding a crash.
+---
+ src/iniparser.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/iniparser.c b/src/iniparser.c
+index f1d1658..dbceb20 100644
+--- a/src/iniparser.c
++++ b/src/iniparser.c
+@@ -456,7 +456,7 @@ long int iniparser_getlongint(const dictionary * d, const char * key, long int n
+     const char * str ;
+ 
+     str = iniparser_getstring(d, key, INI_INVALID_KEY);
+-    if (str==INI_INVALID_KEY) return notfound ;
++    if (str==NULL || str==INI_INVALID_KEY) return notfound ;
+     return strtol(str, NULL, 0);
+ }
+ 
+@@ -511,7 +511,7 @@ double iniparser_getdouble(const dictionary * d, const char * key, double notfou
+     const char * str ;
+ 
+     str = iniparser_getstring(d, key, INI_INVALID_KEY);
+-    if (str==INI_INVALID_KEY) return notfound ;
++    if (str==NULL || str==INI_INVALID_KEY) return notfound ;
+     return atof(str);
+ }
+ 
+@@ -553,7 +553,7 @@ int iniparser_getboolean(const dictionary * d, const char * key, int notfound)
+     const char * c ;
+ 
+     c = iniparser_getstring(d, key, INI_INVALID_KEY);
+-    if (c==INI_INVALID_KEY) return notfound ;
++    if (c==NULL || c==INI_INVALID_KEY) return notfound ;
+     if (c[0]=='y' || c[0]=='Y' || c[0]=='1' || c[0]=='t' || c[0]=='T') {
+         ret = 1 ;
+     } else if (c[0]=='n' || c[0]=='N' || c[0]=='0' || c[0]=='f' || c[0]=='F') {
diff --git a/main/inotify-tools/APKBUILD b/main/inotify-tools/APKBUILD
index 236e0142bf6..76430abaf3f 100644
--- a/main/inotify-tools/APKBUILD
+++ b/main/inotify-tools/APKBUILD
@@ -1,19 +1,18 @@
 # Contributor:
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=inotify-tools
-pkgver=3.20.2.2
+pkgver=4.23.9.0
 pkgrel=0
 pkgdesc="C library and CLI tools providing a simple interface to inotify"
-url="https://github.com/rvoicilas/inotify-tools"
+url="https://github.com/inotify-tools/inotify-tools"
 arch="all"
 license="GPL-2.0-only"
 makedepends="automake autoconf libtool"
-subpackages="$pkgname-dev $pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/rvoicilas/inotify-tools/archive/$pkgver.tar.gz"
+subpackages="$pkgname-dev $pkgname-libs $pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/inotify-tools/inotify-tools/archive/$pkgver.tar.gz"
 
 prepare() {
 	default_prepare
-	touch README
 	autoreconf -vif
 }
 
@@ -34,4 +33,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="72d6fdcc216d8083cd384c71c02dc8e800d3a9702613568b3c571f704aee3d42bf084c52f2141c9afb8d28e8b87ebb6391ed3d825b3d664ed51c552debeb1881  inotify-tools-3.20.2.2.tar.gz"
+sha512sums="
+8f44037a482fa39978b845b4989834e8c897ad872913c6cb8c4a987e0d13f9177b05f593332b859d7adde228fdc3512fd45d66cab65368c38926f41d57e22d13  inotify-tools-4.23.9.0.tar.gz
+"
diff --git a/main/installkernel/APKBUILD b/main/installkernel/APKBUILD
index 761f0691296..7b3235d6747 100644
--- a/main/installkernel/APKBUILD
+++ b/main/installkernel/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=installkernel
-pkgver=3.5
+pkgver=4.1
 pkgrel=0
 pkgdesc="Alpine Linux Kernel install script"
 url="https://git.alpinelinux.org/cgit/aports/tree/main/installkernel"
 arch="noarch"
-license="GPL-2.0"
-subpackages=""
-depends=""
+license="GPL-2.0-only"
+depends="/bin/sh"
+options="!check" # no test suite
 source="installkernel"
 
 build() {
@@ -18,4 +18,6 @@ package() {
 	install -Dm755 "$srcdir"/installkernel "$pkgdir"/sbin/installkernel
 }
 
-sha512sums="b937b89b1f0deb79153c217f02e35dd4539d6d587012db93e50b887e339b9b641633cd2619cfee4b44dd76a1833bde066f6723c39bc69d6893b0d1cab0a01d26  installkernel"
+sha512sums="
+65167320eca2f1bf18b523afd3359276af8ed4a5bd502adfecd0bfad73d01e1b89a71b41ceb0bb7e95c84e1f993dd2b6813038d8944f2051937d08a0d687a1ce  installkernel
+"
diff --git a/main/installkernel/installkernel b/main/installkernel/installkernel
index 2c9fc416a99..3b33a9b87b9 100644
--- a/main/installkernel/installkernel
+++ b/main/installkernel/installkernel
@@ -3,7 +3,7 @@
 set -e
 
 if [ $# -eq 3 ] || [ $# -eq 4 ]; then
-	kernelversion="$1"
+	kernelrelease="$1"
 	bootimage="$2"
 	mapfile="$3"
 	destdir="${4:-/boot}"
@@ -18,8 +18,8 @@ config="$mapdir"/.config
 
 
 suffix=
-flavor=${kernelversion##*[0-9]-}
-if [ "$flavor" != "$kernelversion" ]; then
+flavor=${kernelrelease##*[0-9]-}
+if [ "$flavor" != "$kernelrelease" ]; then
 	suffix=-$flavor
 fi
 
@@ -30,7 +30,16 @@ for i in vmlinuz${suffix} System.map${suffix} config${suffix}; do
 done
 
 cp "$bootimage" "$destdir"/vmlinuz${suffix}
-cp "$mapfile" "$destdir"/System.map${suffix}
-cp "$config" "$destdir"/config${suffix}
+cp "$mapfile" "$destdir"/System.map-${kernelrelease}
+cp "$config" "$destdir"/config-${kernelrelease}
+
+destdir_root="${destdir%/boot}"
+if [ "$destdir_root" != "$destdir" ]; then
+	moddir="$destdir_root/lib/modules/$kernelrelease"
+	mkdir -p "$moddir"
+	if ! [ -e "$moddir"/kernel-suffix ]; then
+		echo "$suffix" > "$moddir"/kernel-suffix
+	fi
+fi
 
 exit 0
diff --git a/main/intel-ucode/APKBUILD b/main/intel-ucode/APKBUILD
new file mode 100644
index 00000000000..c2528ff91ee
--- /dev/null
+++ b/main/intel-ucode/APKBUILD
@@ -0,0 +1,83 @@
+# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
+pkgname=intel-ucode
+pkgver=20240312
+pkgrel=0
+pkgdesc="Microcode update files for Intel CPUs"
+arch="x86 x86_64"
+url="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files"
+license="custom"
+makedepends="iucode-tool"
+source="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-$pkgver.tar.gz"
+options="!check"
+builddir="$srcdir/Intel-Linux-Processor-Microcode-Data-Files-microcode-$pkgver"
+
+# (Taken from https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/blob/main/releasenote.md)
+# secfixes:
+#   20240312-40:
+#     - CVE-2023-39368
+#     - CVE-2023-38575
+#     - CVE-2023-28746
+#     - CVE-2023-22655
+#     - CVE-2023-43490
+#   20231114-r0:
+#     - CVE-2023-23583
+#   20230808-r0:
+#     - CVE-2022-40982
+#     - CVE-2022-41804
+#     - CVE-2023-23908
+#   20230214-r0:
+#     - CVE-2022-21216
+#     - CVE-2022-33196
+#     - CVE-2022-38090
+#   20220809-r0:
+#     - CVE-2022-21233
+#   20220510-r0:
+#     - CVE-2022-21151
+#   20220207-r0:
+#     - CVE-2021-0127
+#     - CVE-2021-0146
+#   20210608-r0:
+#     - CVE-2020-24489
+#     - CVE-2020-24511
+#     - CVE-2020-24513
+#   20210216-r0:
+#     - CVE-2020-8698
+#   20201112-r0:
+#     - CVE-2020-8694
+#     - CVE-2020-8698
+#   20201110-r0:
+#     - CVE-2020-8694
+#     - CVE-2020-8698
+#   20200609-r0:
+#     - CVE-2020-0548
+#   20191113-r0:
+#     - CVE-2019-11135
+#   20191112-r0:
+#     - CVE-2018-12126
+#     - CVE-2019-11135
+#   20190918-r0:
+#     - CVE-2019-11135
+#   20190618-r0:
+#     - CVE-2018-12126
+#   20190514a-r0:
+#     - CVE-2018-12126
+#     - CVE-2017-5754
+#     - CVE-2017-5753
+
+build() {
+	rm -f intel-ucode/list intel-ucode-with-caveats/list
+	mkdir -p kernel/x86/microcode
+	iucode_tool -w kernel/x86/microcode/GenuineIntel.bin \
+		intel-ucode/ intel-ucode-with-caveats/
+	echo kernel/x86/microcode/GenuineIntel.bin | \
+		 cpio -o -H newc -R 0:0 > intel-ucode.img
+}
+
+package() {
+	install -D -m0644 intel-ucode.img "$pkgdir"/boot/intel-ucode.img
+	install -Dm644 license "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+sha512sums="
+f5f3dfb1706675060b00057b5f017c2cb4ac0df74727139185fd167ca67fc6c611e205b1caeded23b006e4d8d314f87537007e7bafba2c87373f6d960988c911  microcode-20240312.tar.gz
+"
diff --git a/main/intltool/APKBUILD b/main/intltool/APKBUILD
deleted file mode 100644
index 1595bb5a49e..00000000000
--- a/main/intltool/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=intltool
-pkgver=0.51.0
-pkgrel=4
-pkgdesc="The internationalization tool collection"
-url="http://freedesktop.org/wiki/Software/intltool"
-arch="noarch"
-license="GPL-2.0"
-depends="perl perl-xml-parser gettext file"
-subpackages="$pkgname-doc"
-source="https://edge.launchpad.net/intltool/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz
-	intltool-perl-regexp.patch"
-builddir="$srcdir/$pkgname-$pkgver"
-
-build () {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf  intltool-0.51.0.tar.gz
-119386effcacde4e41250fe527bd868e5f2dea4b46856313126bc664f22a1513980f2ab7dc37317ca4f6be6daa2617127f07477ad312f2ff7bc360120a30627a  intltool-perl-regexp.patch"
diff --git a/main/intltool/intltool-perl-regexp.patch b/main/intltool/intltool-perl-regexp.patch
deleted file mode 100644
index f423bee92ff..00000000000
--- a/main/intltool/intltool-perl-regexp.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/intltool-update.in.orig	2015-03-09 01:39:54.000000000 +0000
-+++ b/intltool-update.in	2017-01-22 20:14:20.359080387 +0000
-@@ -1062,13 +1062,13 @@
- 	}
-     }
- 
--    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
-+    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
-     {
- 	my $rest = $3;
- 	my $untouched = $1;
- 	my $sub = "";
-         # Ignore recursive definitions of variables
--        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
-+        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/;
- 
- 	return SubstituteVariable ("$untouched$sub$rest");
-     }
-@@ -1190,10 +1190,10 @@
- 	$name    =~ s/\(+$//g;
- 	$version =~ s/\(+$//g;
- 
--	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
--	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
--	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
--	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
-+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
-+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
-+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
-+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
-     }
- 
-     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
-@@ -1219,11 +1219,11 @@
- 	$version =~ s/\(+$//g;
-         $bugurl  =~ s/\(+$//g if (defined $bugurl);
- 
--	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
--	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
--	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
--	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
--        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
-+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
-+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
-+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
-+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
-+        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
-     }
- 
-     # \s makes this not work, why?
diff --git a/main/iperf/APKBUILD b/main/iperf/APKBUILD
deleted file mode 100644
index cd43d08fb89..00000000000
--- a/main/iperf/APKBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Contributor: Oleg Titov <oleg.titov@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=iperf
-pkgver=2.0.13
-pkgrel=1
-pkgdesc="A tool to measure IP bandwidth using UDP or TCP"
-url="http://iperf2.sourceforge.net/"
-arch="all"
-license="BSD"
-depends="!iperf3" # openrc services conflict
-subpackages="$pkgname-doc $pkgname-openrc"
-source="https://sourceforge.net/projects/iperf2/files/iperf-$pkgver.tar.gz
-	iperf.initd
-	iperf.confd
-	"
-builddir="$srcdir/$pkgname-$pkgver"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make
-}
-
-check() {
-	cd "$builddir"
-	# iperf -v returns 1
-	./src/iperf -v || test $? = 1
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	install -D -m0755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -D -m0644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-}
-
-sha512sums="40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea  iperf-2.0.13.tar.gz
-339fb04b41cce11e8ea8694d95c13af9c88e0d1143356d913ec810c9b11efa27212d585b5dcc49cc2eb860a6d8bc557092c8659d7d5cfe532c5afdb36f8eedf8  iperf.initd
-fb5e155fff568a72488cc1511d30358835a48bcce309f8f46d040160932b4a4ccb85040c27c60dee477900a25bd34c50eac21d1d0bea984b40faa401be2ba7e8  iperf.confd"
diff --git a/main/iperf/iperf.confd b/main/iperf/iperf.confd
deleted file mode 100644
index 1f425faa674..00000000000
--- a/main/iperf/iperf.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default option for iperf: --server (runs in TCP/5001 mode)
-# For further server options check --help flag
-command_args=""
diff --git a/main/iperf/iperf.initd b/main/iperf/iperf.initd
deleted file mode 100644
index a135bafc92f..00000000000
--- a/main/iperf/iperf.initd
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-
-command="/usr/bin/iperf"
-pidfile="/var/run/$SVCNAME/$SVCNAME.pid"
-
-depend() {
-	need net
-	after firewall
-}
-
-start() {
-	ebegin "Starting $SVCNAME"
-	start-stop-daemon --start --make-pid --user ${exec_user:-nobody} \
-		--pidfile ${pidfile} --background --exec $command \
-		-- --server ${command_args}
-	eend
-}
-
diff --git a/main/iperf3/APKBUILD b/main/iperf3/APKBUILD
index 24399817535..15b7c4a879f 100644
--- a/main/iperf3/APKBUILD
+++ b/main/iperf3/APKBUILD
@@ -2,55 +2,48 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=iperf3
 _pkgname=iperf
-pkgver=3.7
+pkgver=3.16
 pkgrel=0
-pkgdesc="A tool to measure IP bandwidth using UDP or TCP"
+pkgdesc="Tool to measure IP bandwidth using UDP or TCP"
 url="https://github.com/esnet/iperf"
 arch="all"
-license="BSD"
-depends=""
-makedepends=""
-install=""
-subpackages="$pkgname-doc $pkgname-openrc"
+license="BSD-3-Clause-LBNL"
+makedepends="openssl-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/esnet/$_pkgname/archive/$pkgver.tar.gz
-	$_pkgname.initd
-	$_pkgname.confd
-
-	build-fixes.patch
-	remove-pg-flags.patch
+	$pkgname.initd
+	$pkgname.confd
 	"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
-	CFLAGS="$CFLAGS -D_GNU_SOURCE"
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make -j1
+		--infodir=/usr/share/info \
+		--disable-static
+	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
-	install -Dm755 "$srcdir"/$_pkgname.initd \
-		"$pkgdir"/etc/init.d/$_pkgname
-	install -Dm644 "$srcdir"/$_pkgname.confd \
-		"$pkgdir"/etc/conf.d/$_pkgname
+	install -Dm755 "$srcdir"/$pkgname.initd \
+		"$pkgdir"/etc/init.d/$pkgname
+	install -Dm644 "$srcdir"/$pkgname.confd \
+		"$pkgdir"/etc/conf.d/$pkgname
 }
 
-sha512sums="4a861a506d7e37958e1af62d1634d11c4937d5974bfce636d421aa80c88f038c96738d9e196a7667e38ef515f998b467d4ff3db30af7e3efea8d9ac8a63a61e7  iperf3-3.7.tar.gz
-339fb04b41cce11e8ea8694d95c13af9c88e0d1143356d913ec810c9b11efa27212d585b5dcc49cc2eb860a6d8bc557092c8659d7d5cfe532c5afdb36f8eedf8  iperf.initd
-fb5e155fff568a72488cc1511d30358835a48bcce309f8f46d040160932b4a4ccb85040c27c60dee477900a25bd34c50eac21d1d0bea984b40faa401be2ba7e8  iperf.confd
-aef39e45bf63341b724b9131d8bfdf96702acc059e10d7d502053effa69a03097f64e9ba2a26c6a1e3e1567cf9a95013fc58b3b47623de79add14230bd820fa0  build-fixes.patch
-9334d51ec4bb4931272f972a83109dadd44123c9b46803a5b2d16e725576b860f93b62ae3d85be2a2d8a955cff24211da7675fe733a4f3ad8aaae005939a4097  remove-pg-flags.patch"
+sha512sums="
+32c0a35c632ade4185ba495495842fe7a6af62cb8a8691b791ea4b37429b7b9a22baf5e7389a4c41e344fb35149cf64ece6adda2c79cc096c7787f7c2e3421da  iperf3-3.16.tar.gz
+fdaf06316886ae02a865848ea6df6b77aecde78fab15bcbc22e077871c3f567521eeee19ef13c402fef467c2edd916a7d976a4c933dbfb637373145a18563ef9  iperf3.initd
+4c6b766c154612f5f2e5f6150396f443ba37ec59ed0a8a994bf84612059db22827aee3dd3b7c3249e0bb6037163788d830efcb1caad5eba1c97d2349bdbc55f9  iperf3.confd
+"
diff --git a/main/iperf3/build-fixes.patch b/main/iperf3/build-fixes.patch
deleted file mode 100644
index 0f6804ecf39..00000000000
--- a/main/iperf3/build-fixes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/t_timer.c
-+++ b/src/t_timer.c
-@@ -33,6 +33,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <sys/time.h>
-+#include <sys/types.h>
- 
- #include "timer.h"
- #include "iperf_time.h"
---- a/src/t_uuid.c
-+++ b/src/t_uuid.c
-@@ -28,6 +28,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/time.h>
-+#include <sys/types.h>
- 
- #include "iperf_util.h"
- 
diff --git a/main/iperf3/iperf.confd b/main/iperf3/iperf.confd
deleted file mode 100644
index 1f425faa674..00000000000
--- a/main/iperf3/iperf.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default option for iperf: --server (runs in TCP/5001 mode)
-# For further server options check --help flag
-command_args=""
diff --git a/main/iperf3/iperf.initd b/main/iperf3/iperf.initd
deleted file mode 100644
index a135bafc92f..00000000000
--- a/main/iperf3/iperf.initd
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-
-command="/usr/bin/iperf"
-pidfile="/var/run/$SVCNAME/$SVCNAME.pid"
-
-depend() {
-	need net
-	after firewall
-}
-
-start() {
-	ebegin "Starting $SVCNAME"
-	start-stop-daemon --start --make-pid --user ${exec_user:-nobody} \
-		--pidfile ${pidfile} --background --exec $command \
-		-- --server ${command_args}
-	eend
-}
-
diff --git a/main/iperf3/iperf3.confd b/main/iperf3/iperf3.confd
new file mode 100644
index 00000000000..d8bbac8cf09
--- /dev/null
+++ b/main/iperf3/iperf3.confd
@@ -0,0 +1,3 @@
+# Default option for iperf3: --server (runs in TCP/5201 mode)
+# For further server options check --help flag
+command_args=""
diff --git a/main/iperf3/iperf3.initd b/main/iperf3/iperf3.initd
new file mode 100644
index 00000000000..ab059746ee6
--- /dev/null
+++ b/main/iperf3/iperf3.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+
+supervisor=supervise-daemon
+
+command="/usr/bin/iperf3"
+command_args="--server $command_args"
+description="A tool for performing network throughput measurements"
+
+depend() {
+	need net
+	after firewall
+}
diff --git a/main/iperf3/remove-pg-flags.patch b/main/iperf3/remove-pg-flags.patch
deleted file mode 100644
index 3c0ab1321d2..00000000000
--- a/main/iperf3/remove-pg-flags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -58,9 +58,9 @@
- iperf3_profile_SOURCES  = main.c \
-                           $(libiperf_la_SOURCES)
- 
--iperf3_profile_CFLAGS   = -pg -g
-+iperf3_profile_CFLAGS   = -g
- iperf3_profile_LDADD    = libiperf.la
--iperf3_profile_LDFLAGS  = -pg -g
-+iperf3_profile_LDFLAGS  = -g
- endif
- 
- # Specify the sources and various flags for the test cases
-
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -670,9 +670,9 @@
- @ENABLE_PROFILING_TRUE@iperf3_profile_SOURCES = main.c \
- @ENABLE_PROFILING_TRUE@                          $(libiperf_la_SOURCES)
- 
--@ENABLE_PROFILING_TRUE@iperf3_profile_CFLAGS = -pg -g
-+@ENABLE_PROFILING_TRUE@iperf3_profile_CFLAGS = -g
- @ENABLE_PROFILING_TRUE@iperf3_profile_LDADD = libiperf.la
--@ENABLE_PROFILING_TRUE@iperf3_profile_LDFLAGS = -pg -g
-+@ENABLE_PROFILING_TRUE@iperf3_profile_LDFLAGS = -g
- 
- # Specify the sources and various flags for the test cases
- t_timer_SOURCES = t_timer.c
diff --git a/main/iproute2-qos/APKBUILD b/main/iproute2-qos/APKBUILD
index 4cd4863d8d1..63104f8c028 100644
--- a/main/iproute2-qos/APKBUILD
+++ b/main/iproute2-qos/APKBUILD
@@ -2,18 +2,15 @@
 # Maintainer: Iilluzion <iilluzion@gmail.com>
 pkgname=iproute2-qos
 pkgver=0.5
-pkgrel=1
+pkgrel=5
 pkgdesc="Scripts to set up quality of service with iproute2"
 url="https://git.alpinelinux.org/cgit/aports"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
 depends="iproute2"
-makedepends=""
+subpackages="$pkgname-openrc"
 source="qos.initd qos.eth0.sample qos.ifb0.sample setup-qos"
-
-build() {
-	return 0
-}
+options="!check"
 
 package() {
 	install -m755 -D "$srcdir"/setup-qos "$pkgdir"/usr/sbin/setup-qos
@@ -24,7 +21,9 @@ package() {
 		"$pkgdir"/etc/conf.d/qos.ifb0.sample
 }
 
-sha512sums="ac329c26b44e0e7ff6a1469626fbd166351d05135b9e688fcda7d96649e81a65ab927d04f98b80e6b0b9010ecf46fff17b27d67d673f8fa23cab7dd8fd454959  qos.initd
+sha512sums="
+8a0b1df950e36e20cabc45ae172afe62bcbf8f3ef65481bc54d179c8c5eeeb3b5c82f50165259c84d6125698fde308031048dacf257d260f164e19c9ae0110b5  qos.initd
 9c4ca37a6416dc6bc4e0b3fbce0568cbd9c31f3c0fde1d3c8b713bf8b185859c948121ddc4182e2b133b29fab63f4d928aca27205568fc656f2787829beef243  qos.eth0.sample
 720396a86552de052faad47c22a5b295d00de01ac81fad109c5c6a7bad1b05ac9282a5edc175149361228480aad2d246b2def7fc1fa3d7acdcbe12ea9ef9a2ac  qos.ifb0.sample
-112a9fd7789751d2feeef9e007accc0138134818f3e13ddb62250e6d77b82a3ba34edcf7b475cf15f89b6c71ea50b943037f61c44ca54e5d1ea304bdc04ff0ae  setup-qos"
+112a9fd7789751d2feeef9e007accc0138134818f3e13ddb62250e6d77b82a3ba34edcf7b475cf15f89b6c71ea50b943037f61c44ca54e5d1ea304bdc04ff0ae  setup-qos
+"
diff --git a/main/iproute2-qos/qos.initd b/main/iproute2-qos/qos.initd
index b04d6299135..43f10aa3876 100644
--- a/main/iproute2-qos/qos.initd
+++ b/main/iproute2-qos/qos.initd
@@ -152,7 +152,7 @@ reset()
 	# Supported Queuing Disciplines
 	QDISCS="prio|tbf|htb|hfsc|sfq|red|pfifo"
 
-	tc qdisc show dev $DEV | grep -v "pfifo_fast" | egrep -q "$QDISCS" && $ECHO tc qdisc del dev $DEV root
+	tc qdisc show dev $DEV | grep -v "pfifo_fast" | grep -E -q "$QDISCS" && $ECHO tc qdisc del dev $DEV root
 	tc qdisc show dev $DEV | grep -v "pfifo_fast" | grep  -q ingress && $ECHO tc qdisc del dev $DEV ingress
 
 	if [ "$INGRESS_ALG" = "ifb" ] && [ ! -z $IFB_DEV ]; then 
diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD
index 5c0cdcf65a4..8706f53fa90 100644
--- a/main/iproute2/APKBUILD
+++ b/main/iproute2/APKBUILD
@@ -1,53 +1,91 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=iproute2
-pkgver=5.5.0
+pkgver=6.8.0
 pkgrel=0
 pkgdesc="IP Routing Utilities"
-url="https://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
+url="https://wiki.linuxfoundation.org/networking/iproute2"
 arch="all"
 license="GPL-2.0-or-later"
 install="$pkgname.post-install"
-makedepends="bison flex bash iptables-dev elfutils-dev"
-subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
-source="https://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz
-	fix-install-errors.patch
-	musl-fixes.patch"
-
-prepare() {
-	default_prepare
-	sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
-	sed -i 's:/usr/local:/usr:' tc/m_ipt.c include/iptables.h
-	sed -i -e 's:=/share:=/usr/share:' \
-		-e 's:-Werror::' Makefile
-}
+depends="
+	$pkgname-minimal
+	$pkgname-tc
+	$pkgname-ss
+	"
+makedepends="
+	bash
+	bison
+	elfutils-dev
+	flex
+	iptables-dev
+	libcap-dev
+	libmnl-dev
+	"
+subpackages="
+	$pkgname-doc
+	$pkgname-dev
+	$pkgname-bash-completion
+	$pkgname-minimal
+	$pkgname-tc
+	$pkgname-ss
+	$pkgname-rdma
+	"
+source="https://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz"
+options="!check"  # requires namespaces support and root
+
+# secfixes:
+#   5.1.0-r0:
+#     - CVE-2019-20795
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make CCOPTS="-D_GNU_SOURCE $CFLAGS"
+	export CFLAGS="$CFLAGS -flto=auto"
+	make V=1
 }
 
 package() {
-	make -j1 DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
+
+	install -D -m644 include/libnetlink.h "$pkgdir"/usr/include/libnetlink.h
+	install -D -m644 lib/libnetlink.a "$pkgdir"/usr/lib/libnetlink.a
+}
+
+minimal() {
+	pkgdesc="IP Routing Utilities (/sbin/ip only)"
+	depends=""
+	replaces="$pkgname"  # for backward compatibility (Alpine <3.13)
+
+	amove sbin/ip
+	amove usr/share/iproute2
 }
 
-bashcomp() {
+tc() {
+	pkgdesc="$pkgdesc (traffic control and XDP support)"
 	depends=""
-	pkgdesc="Bash completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
+	replaces="$pkgname"  # for backward compatibility (Alpine <3.13)
 
-	mkdir -p "$subpkgdir"/usr/share/
-	mv "$pkgdir"/usr/share/bash-completion \
-		"$subpkgdir"/usr/share
+	amove sbin/tc
+	amove usr/lib/tc
+}
+
+ss() {
+	pkgdesc="$pkgdesc (socket statistics tool)"
+	depends=""
+	replaces="$pkgname"  # for backward compatibility (Alpine <3.13)
+
+	amove sbin/ss
+}
+
+rdma() {
+	pkgdesc="$pkgdesc (rdma utilities)"
+	depends=""
 
-	rmdir -p "$pkgdir"/usr/share 2>/dev/null || true
+	amove sbin/dcb
+	amove sbin/devlink
+	amove sbin/rdma
+	amove sbin/tipc
+	amove sbin/vdpa
 }
 
-sha512sums="a59fb6d620206aa17a4ff7d4510b99322e39b6cf34a00953a7d4cd4d62ca85de16d2e28e33cafa7b026edd4f63c81f3f337954aafe963b964ca0cd2d5c54ac78  iproute2-5.5.0.tar.xz
-24fc2a901650e11f80bcaa82c839e70c21aafdf3c5b8a357d932d066a0b98ae2ec8379fc17a0a16a1b5b4fa5edc131179c10fc02e55d6101701df5a09966912c  fix-install-errors.patch
-2e3558caddf814da8c4d78c74eddb7a659d6f94b93de5396bdd995e2333e3cd656f9c936ac7a5a86d0477abc27a92550582575ab4ed19fc2ec0d9b6699cd612c  musl-fixes.patch"
+sha512sums="
+54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0  iproute2-6.8.0.tar.xz
+"
diff --git a/main/iproute2/fix-install-errors.patch b/main/iproute2/fix-install-errors.patch
deleted file mode 100644
index d514032b77f..00000000000
--- a/main/iproute2/fix-install-errors.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Without this patch the following error message shows up three times
-during `make install:`
-
-	install -m 0755  /home/travis/build/alpinelinux/aports/main/iproute2/pkg/iproute2/sbin
-	BusyBox v1.28.4 (2018-05-30 10:45:57 UTC) multi-call binary.
-	Usage: install [-cdDsp] [-o USER] [-g GRP] [-m MODE] [-t DIR] [SOURCE]... DEST
-	Copy files and set attributes
-		-c	Just copy (default)
-		-d	Create directories
-		-D	Create leading target directories
-		-s	Strip symbol table
-		-p	Preserve date
-		-o USER	Set ownership
-		-g GRP	Set group ownership
-		-m MODE	Set permissions
-		-t DIR	Install to DIR
-	make[1]: *** [Makefile:25: install] Error 1
-
-diff -upr iproute2-4.17.0.orig/Makefile iproute2-4.17.0/Makefile
---- iproute2-4.17.0.orig/Makefile	2018-06-27 22:58:35.818077991 +0200
-+++ iproute2-4.17.0/Makefile	2018-06-27 23:00:33.118560603 +0200
-@@ -61,7 +61,17 @@ WFLAGS += -Wmissing-declarations -Wold-s
- CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) $(CFLAGS)
- YACCFLAGS = -d -t -v
- 
--SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma man
-+SUBDIRS=lib ip tc bridge misc netem genl man
-+
-+# The following subdirs require libmnl. If libmnl isn't installed
-+# install(1) is called with invalid arguments when the install
-+# target is invoked in those subdirs because $(TARGETS) is empty.
-+#
-+# To prevent these errors we only include the subdirs if libmnl is
-+# actually available.
-+ifeq ($(HAVE_MNL),y)
-+SUBDIRS += tipc devlink rdma
-+endif
- 
- LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a
- LDLIBS += $(LIBNETLINK)
diff --git a/main/iproute2/musl-fixes.patch b/main/iproute2/musl-fixes.patch
deleted file mode 100644
index 6c2990481ad..00000000000
--- a/main/iproute2/musl-fixes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Include linux/limits.h to fix the following compilation error:
-
-	f_flower.c: In function 'flower_parse_enc_opts':
-	f_flower.c:702:11: error: 'XATTR_SIZE_MAX' undeclared (first use in this function); did you mean 'SSIZE_MAX
-	  char key[XATTR_SIZE_MAX], mask[XATTR_SIZE_MAX];
-		   ^~~~~~~~~~~~~~
-		   SSIZE_MAX
-
-diff -upr iproute2-4.20.0.orig/tc/f_flower.c iproute2-4.20.0/tc/f_flower.c
---- iproute2-4.20.0.orig/tc/f_flower.c	2019-03-16 16:49:46.328056814 +0100
-+++ iproute2-4.20.0/tc/f_flower.c	2019-03-16 16:50:13.658058776 +0100
-@@ -19,6 +19,7 @@
- #include <linux/ip.h>
- #include <linux/tc_act/tc_vlan.h>
- #include <linux/mpls.h>
-+#include <linux/limits.h>
- 
- #include "utils.h"
- #include "tc_util.h"
diff --git a/main/ipsec-tools/20-grekey-support.patch b/main/ipsec-tools/20-grekey-support.patch
deleted file mode 100644
index 7651b8dbf2c..00000000000
--- a/main/ipsec-tools/20-grekey-support.patch
+++ /dev/null
@@ -1,786 +0,0 @@
-Index: ipsec-tools-cvs-HEAD/src/racoon/racoonctl.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/racoonctl.c	2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/racoonctl.c	2011-03-29 22:08:43.000000000 +0300
-@@ -232,7 +232,7 @@
- "\n"
- "    <saopts>: \"isakmp\" <family> <src> <dst>\n"
- "            : {\"esp\",\"ah\"} <family> <src/prefixlen/port> <dst/prefixlen/port>\n"
--"                              <ul_proto>\n"
-+"                              <ul_proto> [grekey <grekey>]\n"
- "    <family>: \"inet\" or \"inet6\"\n"
- "    <ul_proto>: \"icmp\", \"tcp\", \"udp\", \"gre\" or \"any\"\n"
- "\n",
-@@ -819,7 +819,7 @@
- {
- 	int family;
- 
--	if (ac != 3 && ac != 4) {
-+	if (ac < 3) {
- 		errno = EINVAL;
- 		return NULL;
- 	}
-@@ -861,10 +861,8 @@
- 	struct sockaddr *src = NULL, *dst = NULL;
- 	int ulproto;
- 
--	if (ac != 2 && ac != 3) {
--		errno = EINVAL;
--		return NULL;
--	}
-+	if (ac < 2)
-+		goto bad_args;
- 
- 	if (get_comindex(*av, &p_name, &p_port, &p_prefs) == -1)
- 		goto bad;
-@@ -901,13 +899,34 @@
- 
- 	av++;
- 	ac--;
--	if(ac){
-+	if (ac) {
- 		ulproto = get_ulproto(*av);
- 		if (ulproto == -1)
- 			goto bad;
--	}else
-+		av++;
-+		ac--;
-+	} else
- 		ulproto=0;
- 
-+	if (ac == 2 && strcmp(av[0], "grekey") == 0) {
-+		int a, b, c, d;
-+		unsigned long u;
-+
-+		if (sscanf(av[1], "%d.%d.%d.%d", &a, &b, &c, &d) == 4) {
-+			set_port(src, (a << 8) + b);
-+			set_port(dst, (c << 8) + d);
-+		} else if (sscanf(av[1], "%lu", &u) == 1) {
-+			set_port(src, u >> 16);
-+			set_port(dst, u & 0xffff);
-+		} else
-+			goto bad_args;
-+		av += 2;
-+		ac -= 2;
-+	}
-+
-+	if (ac != 0)
-+		goto bad_args;
-+
- 	ci = (struct admin_com_indexes *)buf->v;
- 	if(p_prefs)
- 		ci->prefs = (u_int8_t)atoi(p_prefs); /* XXX should be handled error. */
-@@ -926,7 +945,9 @@
- 
- 	return buf;
- 
--   bad:
-+bad_args:
-+	errno = EINVAL;
-+bad:
- 	if (p_name)
- 		racoon_free(p_name);
- 	if (p_port)
-Index: ipsec-tools-cvs-HEAD/src/racoon/admin.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/admin.c	2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/admin.c	2011-03-30 09:41:46.000000000 +0300
-@@ -444,7 +444,7 @@
- 
- 			/* search appropreate configuration */
- 			if (name == NULL)
--				rmconf = getrmconf(dst, 0);
-+				rmconf = getrmconf(dst, 0, 0);
- 			else
- 				rmconf = getrmconf_by_name(name);
- 			if (rmconf == NULL) {
-@@ -536,6 +536,7 @@
- 			spidx.prefs = ndx->prefd;
- 			spidx.prefd = ndx->prefs;
- 			spidx.ul_proto = ndx->ul_proto;
-+			spidx_normalize_ulports(&spidx);
- 
- 			sp_in = getsp_r(&spidx);
- 			if (sp_in) {
-Index: ipsec-tools-cvs-HEAD/src/racoon/cftoken.l
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/cftoken.l	2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/cftoken.l	2011-03-29 22:08:43.000000000 +0300
-@@ -288,6 +288,7 @@
- <S_SAINF>any		{ YYD; return(ANY); }
- <S_SAINF>from		{ YYD; return(FROM); }
- <S_SAINF>group		{ YYD; return(GROUP); }
-+<S_SAINF>grekey		{ YYD; return(GREKEY); }
- 	/* sainfo spec */
- <S_SAINF>{bcl}		{ BEGIN S_SAINFS; return(BOC); }
- <S_SAINF>{semi}		{ BEGIN S_INI; return(EOS); }
-Index: ipsec-tools-cvs-HEAD/src/racoon/cfparse.y
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/cfparse.y	2011-03-14 19:12:41.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/cfparse.y	2011-03-29 22:08:43.000000000 +0300
-@@ -214,7 +214,7 @@
- 	/* algorithm */
- %token ALGORITHM_CLASS ALGORITHMTYPE STRENGTHTYPE
- 	/* sainfo */
--%token SAINFO FROM
-+%token SAINFO FROM GREKEY
- 	/* remote */
- %token REMOTE ANONYMOUS CLIENTADDR INHERIT REMOTE_ADDRESS
- %token EXCHANGE_MODE EXCHANGETYPE DOI DOITYPE SITUATION SITUATIONTYPE
-@@ -1302,6 +1302,35 @@
- 			cur_sainfo->idsrc = $1;
- 			cur_sainfo->iddst = $2;
- 		}
-+	|	sainfo_id sainfo_id GREKEY ADDRSTRING
-+		{
-+			int a, b, c, d;
-+
-+			if (sscanf($4->v, "%d.%d.%d.%d", &a, &b, &c, &d) == 4) {
-+				a = ipsecdoi_fixup_id_uldata(
-+					$1, $2, IPPROTO_GRE,
-+					(a << 8) + b, (c << 8) + d);
-+			} else {
-+				yyerror("grekey format unrecognized.");
-+				return -1;
-+			}
-+			if (a != 0) {
-+				yyerror("ul_proto needs to be 'gre' to use grekey.");
-+				return -1;
-+			}
-+			cur_sainfo->idsrc = $1;
-+			cur_sainfo->iddst = $2;
-+		}
-+	|	sainfo_id sainfo_id GREKEY NUMBER
-+		{
-+			if (ipsecdoi_fixup_id_uldata($1, $2, IPPROTO_GRE,
-+						     ($4) >> 16, ($4) & 0xffff) != 0) {
-+				yyerror("ul_proto needs to be 'gre' to use grekey.");
-+				return -1;
-+			}
-+			cur_sainfo->idsrc = $1;
-+			cur_sainfo->iddst = $2;
-+		}
- 	;
- sainfo_id
- 	:	IDENTIFIERTYPE ADDRSTRING prefix port ul_proto
-@@ -1668,7 +1697,7 @@
- 		{
- 			struct remoteconf *from, *new;
- 
--			from = getrmconf($4, GETRMCONF_F_NO_ANONYMOUS);
-+			from = getrmconf($4, GETRMCONF_F_NO_ANONYMOUS, 0);
- 			if (from == NULL) {
- 				yyerror("failed to get remoteconf for %s.",
- 					saddr2str($4));
-Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.h
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/ipsec_doi.h	2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.h	2011-03-30 09:22:13.000000000 +0300
-@@ -227,6 +227,10 @@
- extern int set_identifier_qual __P((vchar_t **, int, vchar_t *, int));
- extern int ipsecdoi_setid2 __P((struct ph2handle *));
- extern vchar_t *ipsecdoi_sockaddr2id __P((struct sockaddr *, u_int, u_int));
-+extern int ipsecdoi_fixup_id_uldata __P((vchar_t *, vchar_t *, u_int16_t, u_int16_t, u_int16_t));
-+extern int ipsecdoi_normalize_id_uldata __P((vchar_t *, vchar_t *));
-+extern int ipsecdoi_id_has_port __P((vchar_t *));
-+
- extern int ipsecdoi_id2sockaddr __P((vchar_t *, struct sockaddr *,
- 	u_int8_t *, u_int16_t *));
- extern char *ipsecdoi_id2str __P((const vchar_t *));
-Index: ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/ipsec_doi.c	2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/ipsec_doi.c	2011-03-30 16:59:49.000000000 +0300
-@@ -3308,6 +3308,7 @@
- 	const vchar_t *subnet;
- 	const vchar_t *address;
- {
-+	struct in_addr *a, *b;
- 	struct in_addr *mask;
- 
- 	if (address->l != sizeof(struct in_addr))
-@@ -3316,12 +3317,15 @@
- 	if (subnet->l != (sizeof(struct in_addr)*2))
- 		return 1;
- 
-+	a = (struct in_addr*)(subnet->v);
-+	b = (struct in_addr*)(address->v);
- 	mask = (struct in_addr*)(subnet->v + sizeof(struct in_addr));
- 
--	if (mask->s_addr!=0xffffffff)
--		return 1;
-+	//if (mask->s_addr!=0xffffffff)
-+	//	return 1;
-+	//return memcmp(subnet->v,address->v,address->l);
- 
--	return memcmp(subnet->v,address->v,address->l);
-+	return (a->s_addr & mask->s_addr) != (b->s_addr & mask->s_addr);
- }
- 
- #ifdef INET6
-@@ -3371,6 +3375,7 @@
- 	vchar_t ident_t;
- 	vchar_t ident_s;
- 	int result;
-+	int check_ports = 0;
- 
- 	/* handle wildcard IDs */
- 
-@@ -3410,12 +3415,14 @@
- 
- 		if ((id_bs->type == IPSECDOI_ID_IPV4_ADDR)&&
- 		    (id_bt->type == IPSECDOI_ID_IPV4_ADDR_SUBNET)) {
-+			check_ports = 1;
- 			result = ipsecdoi_subnetisaddr_v4(&ident_t,&ident_s);
- 			goto cmpid_result;
- 		}
- 
- 		if ((id_bs->type == IPSECDOI_ID_IPV4_ADDR_SUBNET)&&
- 		    (id_bt->type == IPSECDOI_ID_IPV4_ADDR)) {
-+			check_ports = 1;
- 			result = ipsecdoi_subnetisaddr_v4(&ident_s,&ident_t);
- 			goto cmpid_result;
- 		}
-@@ -3423,12 +3430,14 @@
- #ifdef INET6
- 		if ((id_bs->type == IPSECDOI_ID_IPV6_ADDR)&&
- 		    (id_bt->type == IPSECDOI_ID_IPV6_ADDR_SUBNET)) {
-+			check_ports = 1;
- 			result = ipsecdoi_subnetisaddr_v6(&ident_t,&ident_s);
- 			goto cmpid_result;
- 		}
- 
- 		if ((id_bs->type == IPSECDOI_ID_IPV6_ADDR_SUBNET)&&
- 		    (id_bt->type == IPSECDOI_ID_IPV6_ADDR)) {
-+			check_ports = 1;
- 			result = ipsecdoi_subnetisaddr_v6(&ident_s,&ident_t);
- 			goto cmpid_result;
- 		}
-@@ -3460,6 +3469,7 @@
- 
- 		case IPSECDOI_ID_IPV4_ADDR:
- 			/* validate lengths */
-+			check_ports = 1;
- 			if ((ident_t.l != sizeof(struct in_addr))||
- 			    (ident_s.l != sizeof(struct in_addr)))
- 				goto cmpid_invalid;
-@@ -3468,6 +3478,7 @@
- 		case IPSECDOI_ID_IPV4_ADDR_SUBNET:
- 		case IPSECDOI_ID_IPV4_ADDR_RANGE:
- 			/* validate lengths */
-+			check_ports = 1;
- 			if ((ident_t.l != (sizeof(struct in_addr)*2))||
- 			    (ident_s.l != (sizeof(struct in_addr)*2)))
- 				goto cmpid_invalid;
-@@ -3476,6 +3487,7 @@
- #ifdef INET6
- 		case IPSECDOI_ID_IPV6_ADDR:
- 			/* validate lengths */
-+			check_ports = 1;
- 			if ((ident_t.l != sizeof(struct in6_addr))||
- 			    (ident_s.l != sizeof(struct in6_addr)))
- 				goto cmpid_invalid;
-@@ -3484,6 +3496,7 @@
- 		case IPSECDOI_ID_IPV6_ADDR_SUBNET:
- 		case IPSECDOI_ID_IPV6_ADDR_RANGE:
- 			/* validate lengths */
-+			check_ports = 1;
- 			if ((ident_t.l != (sizeof(struct in6_addr)*2))||
- 			    (ident_s.l != (sizeof(struct in6_addr)*2)))
- 				goto cmpid_invalid;
-@@ -3502,12 +3515,18 @@
- 	}
- 
- 	/* validate matching data and length */
--	if (ident_t.l == ident_s.l)
--		result = memcmp(ident_t.v,ident_s.v,ident_t.l);
--	else
-+	if (ident_t.l != ident_s.l)
- 		result = 1;
-+	else
-+		result = memcmp(ident_t.v,ident_s.v,ident_t.l);
- 
- cmpid_result:
-+	if (check_ports &&
-+	    (id_bt->port != id_bs->port && id_bs->port != 0))  {
-+		/* if target is wildcard, source should be too, otherwise
-+		 * specific rule matches wildcard request */
-+		result = 1;
-+	}
- 
- 	/* debug level output */
- 	if(loglevel >= LLV_DEBUG) {
-@@ -4089,6 +4108,67 @@
- 	return new;
- }
- 
-+int ipsecdoi_fixup_id_uldata(srcid, dstid, ul_proto, ul_data1, ul_data2)
-+	vchar_t *srcid, *dstid;
-+	u_int16_t ul_proto;
-+	u_int16_t ul_data1, ul_data2;
-+{
-+	struct ipsecdoi_id_b *src = (struct ipsecdoi_id_b *) srcid->v;
-+	struct ipsecdoi_id_b *dst = (struct ipsecdoi_id_b *) dstid->v;
-+
-+	if (src->proto_id != ul_proto ||
-+	    dst->proto_id != ul_proto)
-+		return -1;
-+
-+	src->port = htons(ul_data1);
-+	dst->port = htons(ul_data2);
-+
-+	return 0;
-+}
-+
-+int ipsecdoi_normalize_id_uldata(srcid, dstid)
-+	vchar_t *srcid, *dstid;
-+{
-+	struct ipsecdoi_id_b *src = (struct ipsecdoi_id_b *) srcid->v;
-+	struct ipsecdoi_id_b *dst = (struct ipsecdoi_id_b *) dstid->v;
-+	u_int16_t tmp;
-+
-+	if (src->proto_id != dst->proto_id)
-+		return -1;
-+
-+	switch (src->proto_id) {
-+	case IPPROTO_ICMP:
-+	case IPPROTO_ICMPV6:
-+	case IPPROTO_GRE:
-+		tmp = src->port;
-+		src->port = dst->port;
-+		dst->port = tmp;
-+		break;
-+	}
-+
-+	return 0;
-+}
-+
-+int ipsecdoi_id_has_port(id)
-+	vchar_t *id;
-+{
-+	struct ipsecdoi_id_b *id_b = (struct ipsecdoi_id_b *) id->v;
-+
-+	switch (id_b->type) {
-+	case IPSECDOI_ID_IPV4_ADDR:
-+	case IPSECDOI_ID_IPV4_ADDR_SUBNET:
-+	case IPSECDOI_ID_IPV4_ADDR_RANGE:
-+	case IPSECDOI_ID_IPV6_ADDR:
-+	case IPSECDOI_ID_IPV6_ADDR_SUBNET:
-+	case IPSECDOI_ID_IPV6_ADDR_RANGE:
-+		if (ntohs(id_b->port) != 0)
-+			return 1;
-+		break;
-+	}
-+	return 0;
-+}
-+
-+
- vchar_t *
- ipsecdoi_sockrange2id(laddr, haddr, ul_proto)
- 	struct sockaddr *laddr, *haddr;
-@@ -4318,7 +4398,7 @@
- 		saddr.sa.sa_len = sizeof(struct sockaddr_in);
- #endif
- 		saddr.sa.sa_family = AF_INET;
--		saddr.sin.sin_port = IPSEC_PORT_ANY;
-+		saddr.sin.sin_port = id_b->port;
- 		memcpy(&saddr.sin.sin_addr,
- 			id->v + sizeof(*id_b), sizeof(struct in_addr));
- 		break;
-@@ -4331,7 +4411,7 @@
- 		saddr.sa.sa_len = sizeof(struct sockaddr_in6);
- #endif
- 		saddr.sa.sa_family = AF_INET6;
--		saddr.sin6.sin6_port = IPSEC_PORT_ANY;
-+		saddr.sin6.sin6_port = id_b->port;
- 		memcpy(&saddr.sin6.sin6_addr,
- 			id->v + sizeof(*id_b), sizeof(struct in6_addr));
- 		saddr.sin6.sin6_scope_id =
-@@ -4347,7 +4427,7 @@
- #ifdef INET6
- 	case IPSECDOI_ID_IPV6_ADDR:
- #endif
--		len = snprintf( buf, BUFLEN, "%s", saddrwop2str(&saddr.sa));
-+		len = snprintf( buf, BUFLEN, "%s", saddr2str(&saddr.sa));
- 		break;
- 
- 	case IPSECDOI_ID_IPV4_ADDR_SUBNET:
-@@ -4403,7 +4483,9 @@
- 			plen += l;
- 		}
- 
--		len = snprintf( buf, BUFLEN, "%s/%i", saddrwop2str(&saddr.sa), plen);
-+		len = snprintf(buf, BUFLEN, "%s/%i[%d]",
-+			       saddrwop2str(&saddr.sa), plen,
-+			       ntohs(id_b->port));
- 	    }
- 		break;
- 
-@@ -4415,12 +4497,12 @@
- 		saddr.sa.sa_len = sizeof(struct sockaddr_in);
- #endif
- 		saddr.sa.sa_family = AF_INET;
--		saddr.sin.sin_port = IPSEC_PORT_ANY;
-+		saddr.sin.sin_port = id_b->port;
- 		memcpy(&saddr.sin.sin_addr,
- 			id->v + sizeof(*id_b) + sizeof(struct in_addr),
- 			sizeof(struct in_addr));
- 
--		len += snprintf(buf + len, BUFLEN - len, "%s", saddrwop2str(&saddr.sa));
-+		len += snprintf(buf + len, BUFLEN - len, "%s", saddr2str(&saddr.sa));
- 		break;
- 
- #ifdef INET6
-@@ -4431,7 +4513,7 @@
- 		saddr.sa.sa_len = sizeof(struct sockaddr_in6);
- #endif
- 		saddr.sa.sa_family = AF_INET6;
--		saddr.sin6.sin6_port = IPSEC_PORT_ANY;
-+		saddr.sin6.sin6_port = id_b->port;
- 		memcpy(&saddr.sin6.sin6_addr,
- 			id->v + sizeof(*id_b) + sizeof(struct in6_addr),
- 			sizeof(struct in6_addr));
-@@ -4440,7 +4522,7 @@
- 				? ((struct sockaddr_in6 *)id_b)->sin6_scope_id
- 				: 0);
- 
--		len += snprintf(buf + len, BUFLEN - len, "%s", saddrwop2str(&saddr.sa));
-+		len += snprintf(buf + len, BUFLEN - len, "%s", saddr2str(&saddr.sa));
- 		break;
- #endif
- 
-Index: ipsec-tools-cvs-HEAD/src/racoon/sainfo.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/sainfo.c	2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/sainfo.c	2011-03-29 22:08:44.000000000 +0300
-@@ -124,7 +124,7 @@
- 		plog(LLV_DEBUG, LOCATION, NULL,
- 			"evaluating sainfo: %s\n", sainfostr);
- 
--		if(s->remoteid != remoteid) {
-+		if (remoteid != -1 && s->remoteid != remoteid) {
- 			plog(LLV_DEBUG, LOCATION, NULL,
- 				"remoteid mismatch: %u != %u\n",
- 				s->remoteid, remoteid);
-@@ -234,16 +234,22 @@
- 	int pri = 0;
- 
- 	if(s->remoteid)
--		pri += 3;
-+		pri += 7;
- 
- 	if(s->id_i)
--		pri += 3;
-+		pri += 7;
- 
--	if(s->idsrc)
-+	if(s->idsrc) {
- 		pri++;
-+		if (ipsecdoi_id_has_port(s->idsrc))
-+			pri += 2;
-+	}
- 
--	if(s->iddst)
-+	if(s->iddst) {
- 		pri++;
-+		if (ipsecdoi_id_has_port(s->iddst))
-+			pri += 2;
-+	}
- 
- 	return pri;
- }
-Index: ipsec-tools-cvs-HEAD/src/racoon/isakmp.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/isakmp.c	2011-03-14 19:18:12.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/isakmp.c	2011-03-30 09:41:46.000000000 +0300
-@@ -2173,7 +2173,15 @@
- 	 * so no need to bother yet. --arno */
- 
- 	if (iph1hint == NULL || iph1hint->rmconf == NULL) {
--		rmconf = getrmconf(iph2->dst, nopassive ? GETRMCONF_F_NO_PASSIVE : 0);
-+		int flags = 0;
-+		uint32_t remoteid = 0;
-+		if (nopassive)
-+			flags |= GETRMCONF_F_NO_PASSIVE;
-+		if (iph2->sainfo != NULL) {
-+			flags |= GETRMCONF_F_HAS_REMOTEID;
-+			remoteid = iph2->sainfo->remoteid;
-+		}
-+		rmconf = getrmconf(iph2->dst, flags, remoteid);
- 		if (rmconf == NULL) {
- 			plog(LLV_ERROR, LOCATION, NULL,
- 				"no configuration found for %s.\n",
-@@ -2249,7 +2257,7 @@
- 	struct secpolicy *sp_out, *sp_in;
- {
- 	struct remoteconf *conf;
--	uint32_t remoteid = 0;
-+	uint32_t remoteid = -1;
- 
- 	plog(LLV_DEBUG, LOCATION, NULL,
- 		"new acquire %s\n", spidx2str(&sp_out->spidx));
-@@ -2276,7 +2284,7 @@
- 			return -1;
- 		}
- 
--		conf = getrmconf(iph2->dst, 0);
-+		conf = getrmconf(iph2->dst, 0, 0);
- 		if (conf != NULL)
- 			remoteid = conf->ph1id;
- 		else
-@@ -3582,6 +3590,8 @@
- 
- #undef _XIDT
- 
-+	spidx_normalize_ulports(&spidx);
-+
- 	plog(LLV_DEBUG, LOCATION, NULL,
- 		 "get a src address from ID payload "
- 		 "%s prefixlen=%u ul_proto=%u\n",
-@@ -3654,6 +3664,7 @@
- 	pref = spidx.prefs;
- 	spidx.prefs = spidx.prefd;
- 	spidx.prefd = pref;
-+	spidx_normalize_ulports(&spidx);
- 
- 	if (pk_sendspddelete(iph2) < 0) {
- 		plog(LLV_ERROR, LOCATION, NULL,
-Index: ipsec-tools-cvs-HEAD/src/racoon/remoteconf.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/remoteconf.c	2011-03-14 19:12:41.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/remoteconf.c	2011-03-29 22:08:44.000000000 +0300
-@@ -217,6 +217,13 @@
- 		return MATCH_NONE;
- 	}
- 
-+	if ((rmsel->flags & GETRMCONF_F_HAS_REMOTEID) &&
-+	    rmsel->remoteid != rmconf->ph1id){
-+		plog(LLV_DEBUG2, LOCATION, rmsel->remote,
-+		     "Not matched: remote_id did not match.\n");
-+		return MATCH_NONE;
-+	}
-+
- 	ret |= MATCH_BASIC;
- 
- 	/* Check address */
-@@ -387,9 +394,10 @@
-  */
- 
- struct remoteconf *
--getrmconf(remote, flags)
-+getrmconf(remote, flags, remoteid)
- 	struct sockaddr *remote;
- 	int flags;
-+	uint32_t remoteid;
- {
- 	struct rmconf_find_context ctx;
- 	int n = 0;
-@@ -397,6 +405,7 @@
- 	memset(&ctx, 0, sizeof(ctx));
- 	ctx.sel.flags = flags;
- 	ctx.sel.remote = remote;
-+	ctx.sel.remoteid = remoteid;
- 
- 	if (enumrmconf(&ctx.sel, rmconf_find, &ctx) != 0) {
- 		plog(LLV_ERROR, LOCATION, remote,
-Index: ipsec-tools-cvs-HEAD/src/racoon/remoteconf.h
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/remoteconf.h	2011-03-14 19:12:41.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/remoteconf.h	2011-03-29 22:08:44.000000000 +0300
-@@ -178,6 +178,7 @@
- 	int flags;
- 	struct sockaddr *remote;
- 	int etype;
-+	uint32_t remoteid;
- 	struct isakmpsa *approval;
- 	vchar_t *identity;
- 	vchar_t *certificate_request;
-@@ -191,12 +192,13 @@
- 
- #define GETRMCONF_F_NO_ANONYMOUS	0x0001
- #define GETRMCONF_F_NO_PASSIVE		0x0002
-+#define GETRMCONF_F_HAS_REMOTEID	0x0004
- 
- #define RMCONF_ERR_MULTIPLE		((struct remoteconf *) -1)
- 
- extern int rmconf_match_identity __P((struct remoteconf *rmconf,
- 				      vchar_t *id_p));
--extern struct remoteconf *getrmconf __P((struct sockaddr *remote, int flags));
-+extern struct remoteconf *getrmconf __P((struct sockaddr *remote, int flags, uint32_t remoteid));
- extern struct remoteconf *getrmconf_by_ph1 __P((struct ph1handle *iph1));
- extern struct remoteconf *getrmconf_by_name __P((const char *name));
- 
-Index: ipsec-tools-cvs-HEAD/src/racoon/pfkey.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/pfkey.c	2011-03-14 19:18:13.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/pfkey.c	2011-03-30 08:21:09.000000000 +0300
-@@ -1886,6 +1886,7 @@
- 	spidx.prefs = sp_out->spidx.prefd;
- 	spidx.prefd = sp_out->spidx.prefs;
- 	spidx.ul_proto = sp_out->spidx.ul_proto;
-+	spidx_normalize_ulports(&spidx);
- 
- #ifdef HAVE_SECCTX
- 	if (m_sec_ctx) {
-@@ -2898,7 +2899,7 @@
- 
- 		/* If we are not acting as initiator, let's just leave and
- 		 * let the remote peer handle the restart */
--		rmconf = getrmconf(ma->remote, 0);
-+		rmconf = getrmconf(ma->remote, 0, 0);
- 		if (rmconf == NULL || !rmconf->passive) {
- 			iph1->status = PHASE1ST_EXPIRED;
- 			sched_schedule(&iph1->sce, 1, isakmp_ph1delete_stub);
-@@ -3068,8 +3069,10 @@
- 
- 		if (iph2->ph1 && iph2->ph1->rmconf)
- 			rmconf = iph2->ph1->rmconf;
-+		else if (iph2->sainfo != NULL)
-+			rmconf = getrmconf(iph2->dst, GETRMCONF_F_HAS_REMOTEID, iph2->sainfo->remoteid);
- 		else
--			rmconf = getrmconf(iph2->dst, 0);
-+			rmconf = getrmconf(iph2->dst, 0, 0);
- 
- 		if (rmconf && !rmconf->passive) {
- 			struct ph1handle *iph1hint;
-Index: ipsec-tools-cvs-HEAD/src/setkey/setkey.8
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/setkey/setkey.8	2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/setkey/setkey.8	2011-03-29 22:08:44.000000000 +0300
-@@ -453,7 +453,7 @@
- .Pp
- A second example of requiring transport mode encryption of specific
- GRE tunnel:
--.Dl spdadd 0.0.0.0 0.0.0.0 gre 1234 ipsec esp/transport//require ;
-+.Dl spdadd 0.0.0.0 0.0.0.0 gre 1234 -P in ipsec esp/transport//require ;
- .Pp
- .Em Note :
- .Ar upperspec
-Index: ipsec-tools-cvs-HEAD/src/racoon/racoon.conf.5
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/racoon.conf.5	2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/racoon.conf.5	2011-03-29 22:08:44.000000000 +0300
-@@ -981,6 +981,7 @@
- .Bl -tag -width Ds -compact
- .It Ic sainfo Po Ar local_id | Ic anonymous Pc \
- Po Ar remote_id | Ic clientaddr | Ic anonymous Pc \
-+Bo Ic grekey Ar key Bc \
- Bo Ic from Ar idtype Bo Ar string Bc Bc Bo Ic group Ar string Bc \
- Ic { Ar statements Ic }
- Defines the parameters of the IKE phase 2 (IPsec-SA establishment).
-@@ -1026,6 +1027,15 @@
- to restrict policy generation when racoon is acting as a client gateway
- for peers with dynamic ip addresses.
- .Pp
-+If both
-+.Ar local_id
-+and
-+.Ar remote_id
-+are specified with GRE as upper layer protocol, the upper layer GRE
-+key match can be specified with
-+.Ic grekey
-+.Ar key .
-+.Pp
- The
- .Ic from
- keyword allows an sainfo to only match for peers that use a specific phase1
-Index: ipsec-tools-cvs-HEAD/src/setkey/parse.y
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/setkey/parse.y	2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/setkey/parse.y	2011-03-29 22:08:44.000000000 +0300
-@@ -856,6 +856,17 @@
- 			}
- 			$$.len = strlen($$.buf);
- 		}
-+	|	DECSTRING
-+		{
-+			char tmp[16];
-+			sprintf(tmp, "%lu", $1);
-+			$$.buf = strdup(tmp);
-+			if (!$$.buf) {
-+				yyerror("insufficient memory");
-+				return -1;
-+			}
-+			$$.len = strlen(tmp);
-+		}
- 	;
- 
- context_spec
-Index: ipsec-tools-cvs-HEAD/src/racoon/racoonctl.8
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/racoonctl.8	2011-03-05 09:23:59.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/racoonctl.8	2011-03-29 22:08:44.000000000 +0300
-@@ -158,8 +158,8 @@
- has the following format:
- .Bl -tag -width Bl
- .It isakmp {inet|inet6} Ar src Ar dst
--.It {esp|ah} {inet|inet6} Ar src/prefixlen/port Ar dst/prefixlen/port
--{icmp|tcp|udp|gre|any}
-+.It {esp|ah} {inet|inet6} Ar src/prefixlen/port Ar dst/prefixlen/port \
-+  {icmp|tcp|udp|gre|any} Oo grekey Ar key Oc
- .El
- .It vpn-connect Oo Fl u Ar username Oc Ar vpn_gateway
- This is a particular case of the previous command.
-Index: ipsec-tools-cvs-HEAD/src/racoon/isakmp_quick.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/isakmp_quick.c	2011-03-29 22:18:12.000000000 +0300
-+++ ipsec-tools-cvs-HEAD/src/racoon/isakmp_quick.c	2011-03-30 09:23:13.000000000 +0300
-@@ -2168,6 +2168,8 @@
- 		goto end;
- 	}
- 
-+	ipsecdoi_normalize_id_uldata(idsrc, iddst);
-+
- #ifdef ENABLE_HYBRID
- 
- 	/* clientaddr check : obtain modecfg address */
-@@ -2494,6 +2496,7 @@
- 	pref = spidx.prefs;
- 	spidx.prefs = spidx.prefd;
- 	spidx.prefd = pref;
-+	spidx_normalize_ulports(&spidx);
- 
- 	sp_out = getsp_r(&spidx);
- 	if (!sp_out) {
-Index: ipsec-tools-cvs-HEAD/src/racoon/policy.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/policy.c	2011-03-30 08:03:15.000000000 +0300
-+++ ipsec-tools-cvs-HEAD/src/racoon/policy.c	2011-03-30 08:05:23.000000000 +0300
-@@ -444,6 +444,25 @@
- 	return new;
- }
- 
-+void
-+spidx_normalize_ulports(spidx)
-+	struct policyindex *spidx;
-+{
-+	u_int16_t tmp;
-+
-+	switch (spidx->ul_proto) {
-+	case IPPROTO_ICMP:
-+	case IPPROTO_ICMPV6:
-+	case IPPROTO_GRE:
-+		/* Ports are UL specific data, and should not get swapped */
-+		tmp = extract_port((struct sockaddr *) &spidx->src);
-+		set_port((struct sockaddr *) &spidx->src,
-+			 extract_port((struct sockaddr *) &spidx->dst));
-+		set_port((struct sockaddr *) &spidx->dst, tmp);
-+		break;
-+	}
-+}
-+
- const char *
- spidx2str(spidx)
- 	const struct policyindex *spidx;
-Index: ipsec-tools-cvs-HEAD/src/racoon/policy.h
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/policy.h	2011-03-30 08:15:44.000000000 +0300
-+++ ipsec-tools-cvs-HEAD/src/racoon/policy.h	2011-03-30 08:16:21.000000000 +0300
-@@ -156,6 +156,7 @@
- extern void flushsp __P((void));
- extern void initsp __P((void));
- extern struct ipsecrequest *newipsecreq __P((void));
-+extern void spidx_normalize_ulports __P((struct policyindex *));
- 
- extern const char *spidx2str __P((const struct policyindex *));
- #ifdef HAVE_SECCTX
diff --git a/main/ipsec-tools/50-reverse-connect.patch b/main/ipsec-tools/50-reverse-connect.patch
deleted file mode 100644
index 54e77a39761..00000000000
--- a/main/ipsec-tools/50-reverse-connect.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-When new ISAKMP is required, allow incoming reverse connection to take
-
-From: Timo Teras <timo.teras@iki.fi>
-
-over pending phase1:s. Useful when the other party is firewalled or NATted.
----
-
- src/racoon/admin.c   |   12 ++++++++++++
- src/racoon/evt.c     |   13 +++++++++++++
- src/racoon/evt.h     |    3 +++
- src/racoon/handler.c |   28 +++++++++++++++++++++-------
- src/racoon/isakmp.c  |   39 ++++++++++++++++++++++++++++++++++-----
- 5 files changed, 83 insertions(+), 12 deletions(-)
-
-
-Index: ipsec-tools-cvs-HEAD/src/racoon/admin.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/admin.c	2011-03-03 21:16:47.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/admin.c	2011-03-04 13:50:30.000000000 +0200
-@@ -414,11 +414,23 @@
- 		struct sockaddr *dst;
- 		struct sockaddr *src;
- 		char *name = NULL;
-+		char *loc, *rem;
- 
- 		ndx = (struct admin_com_indexes *) ((caddr_t)com + sizeof(*com));
- 		src = (struct sockaddr *) &ndx->src;
- 		dst = (struct sockaddr *) &ndx->dst;
- 
-+		loc = racoon_strdup(saddr2str(src));
-+		rem = racoon_strdup(saddr2str(dst));
-+		STRDUP_FATAL(loc);
-+		STRDUP_FATAL(rem);
-+
-+		plog(LLV_INFO, LOCATION, NULL,
-+			"admin establish-sa %x %s %s\n",
-+			com->ac_proto, loc, rem);
-+		racoon_free(loc);
-+		racoon_free(rem);
-+
- 		if (com->ac_cmd == ADMIN_ESTABLISH_SA &&
- 		    com->ac_len > sizeof(*com) + sizeof(*ndx))
- 			name = (char *) ((caddr_t) ndx + sizeof(*ndx));
-Index: ipsec-tools-cvs-HEAD/src/racoon/evt.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/evt.c	2011-03-03 19:25:50.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/evt.c	2011-03-04 13:50:30.000000000 +0200
-@@ -396,4 +396,17 @@
- 		evt_unsubscribe(LIST_FIRST(list));
- }
- 
-+void
-+evt_list_move(from, to)
-+	struct evt_listener_list *from, *to;
-+{
-+	struct evt_listener *l;
-+
-+	while (!LIST_EMPTY(from)) {
-+		l = LIST_FIRST(from);
-+		LIST_REMOVE(l, ll_chain);
-+		LIST_INSERT_HEAD(to, l, ll_chain);
-+	}
-+}
-+
- #endif /* ENABLE_ADMINPORT */
-Index: ipsec-tools-cvs-HEAD/src/racoon/evt.h
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/evt.h	2011-03-03 19:25:50.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/evt.h	2011-03-04 13:50:30.000000000 +0200
-@@ -124,6 +124,8 @@
- vchar_t *evt_dump __P((void));
- 
- int  evt_subscribe __P((struct evt_listener_list *list, int fd));
-+void evt_list_move __P((struct evt_listener_list *from,
-+			struct evt_listener_list *to));
- void evt_list_init __P((struct evt_listener_list *list));
- void evt_list_cleanup __P((struct evt_listener_list *list));
- 
-@@ -136,6 +138,7 @@
- #define evt_phase2(ph2, type, optdata) ;
- 
- #define evt_subscribe(eventlist, fd) ;
-+#deifne evt_list_move(from, to) ;
- #define evt_list_init(eventlist) ;
- #define evt_list_cleanup(eventlist) ;
- #define evt_get_fdmask(nfds, fdset) nfds
-Index: ipsec-tools-cvs-HEAD/src/racoon/handler.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/handler.c	2011-03-03 19:29:31.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/handler.c	2011-03-04 13:53:01.000000000 +0200
-@@ -292,17 +292,32 @@
- void migrate_dying_ph12(iph1)
- 	struct ph1handle *iph1;
- {
--	struct ph1handle *p;
-+	struct ph1handle *p, *next;
- 
--	LIST_FOREACH(p, &ph1tree, chain) {
-+	for (p = LIST_FIRST(&ph1tree); p; p = next) {
-+		next = LIST_NEXT(p, chain);
- 		if (p == iph1)
- 			continue;
--		if (p->status < PHASE1ST_DYING)
-+
-+		/* Same remote? */
-+		if (cmpsaddr(iph1->local, p->local) > CMPSADDR_WOP_MATCH ||
-+		    cmpsaddr(iph1->remote, p->remote) > CMPSADDR_WOP_MATCH ||
-+		    iph1->rmconf != p->rmconf)
- 			continue;
- 
--		if (cmpsaddr(iph1->local, p->local) == CMPSADDR_MATCH
--		 && cmpsaddr(iph1->remote, p->remote) == CMPSADDR_MATCH)
-+		/* migrate phase2:s from expiring entries */
-+		if (p->status >= PHASE1ST_DYING)
- 			migrate_ph12(p, iph1);
-+
-+		/* and allow reverse connections to release
-+		 * pending connections that do not work due
-+		 * to firewall or nat */
-+		if (iph1->side == RESPONDER && p->side == INITIATOR &&
-+		    p->status < PHASE1ST_MSG3RECEIVED) {
-+			/* Do not delete ph1, since if the node is not NATted,
-+			 * and we delete it we might get phase2's lost */
-+			evt_list_move(&p->evt_listeners, &iph1->evt_listeners);
-+		}
- 	}
- }
- 
-Index: ipsec-tools-cvs-HEAD/src/racoon/isakmp.c
-===================================================================
---- ipsec-tools-cvs-HEAD.orig/src/racoon/isakmp.c	2011-03-03 21:14:13.000000000 +0200
-+++ ipsec-tools-cvs-HEAD/src/racoon/isakmp.c	2011-03-04 13:50:30.000000000 +0200
-@@ -2138,13 +2138,33 @@
- 
- 	remph2(iph2);
- 	delph2(iph2);
--
--	return;
- }
- 
- /* %%%
-  * Interface between PF_KEYv2 and ISAKMP
-  */
-+
-+static void
-+isakmp_chkph2there(p)
-+	struct sched *p;
-+{
-+	struct ph2handle *iph2 = container_of(p, struct ph2handle, sce);
-+	struct ph2handle *tmp;
-+
-+	/* Check if a similar phase2 appared meanwhile */
-+	remph2(iph2);
-+	tmp = getph2byid(iph2->src, iph2->dst, iph2->spid);
-+	if (tmp == NULL) {
-+		/* Nope, lets start this then */
-+		insph2(iph2);
-+		isakmp_chkph1there(iph2);
-+	} else {
-+		/* Yes, delete this initiation attempt as redundant */
-+		evt_phase2(iph2, EVT_PHASE2_UP, NULL);
-+		delph2(iph2);
-+	}
-+}
-+
- /*
-  * receive ACQUIRE from kernel, and begin either phase1 or phase2.
-  * if phase1 has been finished, begin phase2.
-@@ -2235,8 +2255,14 @@
- 		/*NOTREACHED*/
- 	}
- 
--	/* found established ISAKMP-SA */
--	/* i.e. iph1->status == PHASE1ST_ESTABLISHED */
-+	/* found established ISAKMP-SA, if this is a RESPONDER ISAKMP-SA
-+	 * add a small delay; this will make sure the initiator gets
-+	 * an first attempt at rekeying, and usually avoids duplicate ph2:s */
-+	if (iph1->side == RESPONDER) {
-+		iph2->retry_checkph1 = 1;
-+		sched_schedule(&iph2->sce, 1, isakmp_chkph2there);
-+		return 0;
-+	}
- 
- 	/* found ISAKMP-SA. */
- 	plog(LLV_DEBUG, LOCATION, NULL, "begin QUICK mode.\n");
-@@ -2403,7 +2429,10 @@
- 		plog(LLV_DEBUG2, LOCATION, NULL, "dst: %s\n", saddr2str(iph2->dst));
- 
- 		/* begin quick mode */
--		(void)isakmp_ph2begin_i(iph1, iph2);
-+		if (isakmp_ph2begin_i(iph1, iph2)) {
-+			remph2(iph2);
-+			delph2(iph2);
-+		}
- 		return;
- 	}
- 
diff --git a/main/ipsec-tools/70-defer-isakmp-ident-handling.patch b/main/ipsec-tools/70-defer-isakmp-ident-handling.patch
deleted file mode 100644
index 9be37aa1545..00000000000
--- a/main/ipsec-tools/70-defer-isakmp-ident-handling.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-Index: src/racoon/isakmp.c
-===================================================================
-RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/isakmp.c,v
-retrieving revision 1.63
-diff -u -r1.63 isakmp.c
---- a/src/racoon/isakmp.c	21 Oct 2010 06:15:28 -0000	1.63
-+++ b/src/racoon/isakmp.c	29 Oct 2010 10:51:28 -0000
-@@ -130,6 +130,10 @@
- #  define SOL_UDP IPPROTO_UDP
- # endif /* __NetBSD__ / __FreeBSD__ */
- 
-+vchar_t *postponed_buf;
-+struct sockaddr_storage postponed_remote;
-+struct sockaddr_storage postponed_local;
-+
- static int nostate1 __P((struct ph1handle *, vchar_t *));
- static int nostate2 __P((struct ph2handle *, vchar_t *));
- 
-@@ -177,7 +181,7 @@
- 
- static u_char r_ck0[] = { 0,0,0,0,0,0,0,0 }; /* used to verify the r_ck. */
- 
--static int isakmp_main __P((vchar_t *, struct sockaddr *, struct sockaddr *));
-+/* static int isakmp_main __P((vchar_t *, struct sockaddr *, struct sockaddr *)); */
- static int ph1_main __P((struct ph1handle *, vchar_t *));
- static int quick_main __P((struct ph2handle *, vchar_t *));
- static int isakmp_ph1begin_r __P((vchar_t *,
-@@ -374,10 +378,17 @@
- 	}
- 
- 	/* isakmp main routine */
--	if (isakmp_main(buf, (struct sockaddr *)&remote,
--			(struct sockaddr *)&local) != 0) goto end;
--
--	error = 0;
-+	res = isakmp_main(buf, (struct sockaddr *)&remote,
-+			  (struct sockaddr *)&local);
-+	if (res == 0) {
-+		error = 0;
-+	} else if (res == -42424 && postponed_buf == NULL) {
-+		postponed_buf    = buf;
-+		postponed_remote = remote;
-+		postponed_local  = local;
-+		buf              = NULL;
-+		error = 0;
-+	}
- 
- end:
- 	if (tmpbuf != NULL)
-@@ -390,7 +401,7 @@
- /*
-  * main processing to handle isakmp payload
-  */
--static int
-+int
- isakmp_main(msg, remote, local)
- 	vchar_t *msg;
- 	struct sockaddr *remote, *local;
-@@ -399,6 +410,7 @@
- 	isakmp_index *index = (isakmp_index *)isakmp;
- 	u_int32_t msgid = isakmp->msgid;
- 	struct ph1handle *iph1;
-+	int rc;
- 
- #ifdef HAVE_PRINT_ISAKMP_C
- 	isakmp_printpacket(msg, remote, local, 0);
-@@ -604,12 +616,14 @@
- #endif
- 
- 		/* call main process of phase 1 */
--		if (ph1_main(iph1, msg) < 0) {
--			plog(LLV_ERROR, LOCATION, iph1->remote,
--				"phase1 negotiation failed.\n");
--			remph1(iph1);
--			delph1(iph1);
--			return -1;
-+		if ((rc=ph1_main(iph1, msg)) < 0) {
-+			if (rc != -42424) {
-+				plog(LLV_ERROR, LOCATION, iph1->remote,
-+					"phase1 negotiation failed.\n");
-+				remph1(iph1);
-+				delph1(iph1);
-+			}
-+			return rc;
- 		}
- 		break;
- 
-@@ -813,10 +827,11 @@
- 				"failed to pre-process ph1 packet (side: %d, status %d).\n",
- 				iph1->side, iph1->status);
- 			return -1;
--		} else {
--			/* ignore the error and keep phase 1 handler */
--			return 0;
- 		}
-+		if (error == -42424)
-+			return error;
-+		/* ignore the error and keep phase 1 handler */
-+		return 0;
- 	}
- 
- #ifndef ENABLE_FRAG
-Index: src/racoon/isakmp_ident.c
-===================================================================
-RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c,v
-retrieving revision 1.13
-diff -u -r1.13 isakmp_ident.c
---- a/src/racoon/isakmp_ident.c	18 Sep 2009 10:31:11 -0000	1.13
-+++ b/src/racoon/isakmp_ident.c	29 Oct 2010 10:51:29 -0000
-@@ -1128,6 +1128,11 @@
- 		goto end;
- 	}
- 
-+	if (postponed_buf != msg) {
-+		error = -42424;
-+		goto end;
-+	}
-+
- 	/* validate the type of next payload */
- 	pbuf = isakmp_parse(msg);
- 	if (pbuf == NULL)
-Index: src/racoon/isakmp_var.h
-===================================================================
-RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/isakmp_var.h,v
-retrieving revision 1.16
-diff -u -r1.16 isakmp_var.h
---- a/src/racoon/isakmp_var.h	3 Sep 2009 09:29:07 -0000	1.16
-+++ b/src/racoon/isakmp_var.h	29 Oct 2010 10:51:29 -0000
-@@ -141,4 +141,10 @@
- u_int32_t setscopeid __P((struct sockaddr *, struct sockaddr *));
- #endif
- 
-+int isakmp_main __P((vchar_t *, struct sockaddr *, struct sockaddr *));
-+
-+extern vchar_t *postponed_buf;
-+extern struct sockaddr_storage postponed_remote;
-+extern struct sockaddr_storage postponed_local;
-+
- #endif /* _ISAKMP_VAR_H */
-Index: src/racoon/session.c
-===================================================================
-RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/session.c,v
-retrieving revision 1.28
-diff -u -r1.28 session.c
---- a/src/racoon/session.c	21 Oct 2010 06:15:28 -0000	1.28
-+++ b/src/racoon/session.c	29 Oct 2010 10:51:29 -0000
-@@ -172,7 +172,7 @@
- int
- session(void)
- {
--	struct timeval *timeout;
-+	struct timeval *timeout, to_zero = { 0, 0 };
- 	int error;
- 	char pid_file[MAXPATHLEN];
- 	FILE *fp;
-@@ -295,6 +295,8 @@
- 
- 		/* scheduling */
- 		timeout = schedular();
-+		if (postponed_buf != NULL)
-+			timeout = &to_zero;
- 
- 		/* schedular can change select() mask, so we reset
- 		 * the working copy here */
-@@ -332,6 +334,14 @@
- 				break;
- 		}
- 
-+		if (count == 0 && postponed_buf != NULL) {
-+			(void) isakmp_main(
-+				postponed_buf,
-+				(struct sockaddr *) &postponed_remote,
-+				(struct sockaddr *) &postponed_local);
-+			vfree(postponed_buf);
-+			postponed_buf = NULL;
-+		}
- 	}
- }
- 
diff --git a/main/ipsec-tools/75-racoonctl-rcvbuf.patch b/main/ipsec-tools/75-racoonctl-rcvbuf.patch
deleted file mode 100644
index 3a68bfc2ae6..00000000000
--- a/main/ipsec-tools/75-racoonctl-rcvbuf.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: src/racoon/kmpstat.c
-===================================================================
-RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/kmpstat.c,v
-retrieving revision 1.6
-diff -u -r1.6 kmpstat.c
---- a/src/racoon/kmpstat.c	2 Oct 2007 09:47:45 -0000	1.6
-+++ b/src/racoon/kmpstat.c	14 Oct 2010 12:48:22 -0000
-@@ -99,6 +99,7 @@
- com_init()
- {
- 	struct sockaddr_un name;
-+	int rcvSize;
- 
- 	memset(&name, 0, sizeof(name));
- 	name.sun_family = AF_UNIX;
-@@ -114,6 +115,17 @@
- 		return -1;
- 	}
- 
-+        /* set receive buffer size - should be relative large:
-+         * racoon daemon will try to send all info in one go, if
-+         * it does not fit we'll miss stuff */
-+	rcvSize = 1024 * 1024;
-+	if (setsockopt(so, SOL_SOCKET, SO_RCVBUF,
-+		       (void*) &rcvSize, sizeof(rcvSize)) < 0) {
-+		rcvSize = 512 * 1024;
-+		(void) setsockopt(so, SOL_SOCKET, SO_RCVBUF,
-+				  (void*) &rcvSize, sizeof(rcvSize));
-+	}
-+
- 	return 0;
- }
- 
diff --git a/main/ipsec-tools/90-dead-on-initial-contact.patch b/main/ipsec-tools/90-dead-on-initial-contact.patch
deleted file mode 100644
index 9554ae3d32c..00000000000
--- a/main/ipsec-tools/90-dead-on-initial-contact.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/racoon/isakmp_inf.c        15 Mar 2011 13:20:14 -0000      1.47
-+++ b/src/racoon/isakmp_inf.c        10 Aug 2011 08:42:20 -0000
-@@ -1248,6 +1248,8 @@
- 	if (f_local)
- 		return 0;
- 
-+	script_hook(iph1, SCRIPT_PHASE1_DEAD);
-+
- #if 0
- 	loc = racoon_strdup(saddrwop2str(iph1->local));
- 	rem = racoon_strdup(saddrwop2str(iph1->remote));
diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD
deleted file mode 100644
index 90ae8319617..00000000000
--- a/main/ipsec-tools/APKBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=ipsec-tools
-pkgver=0.8.2
-pkgrel=9
-pkgdesc="User-space IPsec tools for various IPsec implementations"
-url="http://ipsec-tools.sourceforge.net/"
-arch="all"
-license="BSD"
-depends=""
-makedepends="linux-headers bsd-compat-headers openssl-dev bison flex
-	autoconf automake libtool"
-subpackages="$pkgname-doc $pkgname-dev"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-	racoon.initd
-	racoon.confd
-	20-grekey-support.patch
-	50-reverse-connect.patch
-	70-defer-isakmp-ident-handling.patch
-	75-racoonctl-rcvbuf.patch
-	90-dead-on-initial-contact.patch
-	musl-cdefs.patch
-	fix-yywrap.patch
-	ipsec-tools-openssl-1.1.patch
-	disable-Werror.patch
-	"
-
-builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	default_prepare
-	touch AUTHORS
-	autoreconf -vif -I.
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var/lib \
-		--with-kernel-headers=/usr/include \
-		--disable-security-context \
-		--enable-adminport \
-		--enable-dpd \
-		--enable-frag \
-		--enable-hybrid \
-		--enable-ipv6 \
-		--enable-natt
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-
-	install -D -m755 ../racoon.initd "$pkgdir"/etc/init.d/racoon
-	install -D -m644 ../racoon.confd "$pkgdir"/etc/conf.d/racoon
-}
-
-sha512sums="6cf4f1da7b461127e75f87fba8349f46b879f8bca179ae1cb27b2e011045753460c5edddbe8ba5892d6a28a021a0a01a9ff9fdb0f5da451519859570d748b9f2  ipsec-tools-0.8.2.tar.gz
-2a5e723779be12dce45fc315a948b440fbf7fba9547b7c0a019d31a529a52d694b09ab823af8bd36aa15b6ad5c059fdd7650620ed6647f1b730fdf6a105b7ca6  racoon.initd
-61c285e63a21e4162efa058d91cc061ad0a8387a7e6f654151f31bac757cdd250247c1be6776e1f04edea223dfb56d015285459ab5bbfd6218bfe3e51b861576  racoon.confd
-22b79d5906dd4c5e740655303fe88fbdc2596cfbd057347cc303f8cfdd22f83fe61098613127d78030e3098335be83f46fe6d4dd5c2ebc8dd93ed94b7904812c  20-grekey-support.patch
-2e111e0388a5e94ffa87483eac8c0b38fff1ba44d79c3db7438b3d03010db6334861acffecf044ebd3953f062230b528c34a05d38cf6831f5ebece0a307fb776  50-reverse-connect.patch
-00ea3fb4b2ac91a550aaaffe53a29cc22f37f713052e2c5aee1bada6bcbc55b55ebe577f3df1ab09b314e99a45fd322152c2858263173cff17ff17993007b042  70-defer-isakmp-ident-handling.patch
-b65fbb7b8af6863f6dcb0b1cf5a6c856deb62a50f2b19455740340c4c453f5800335bc3b89509de06fc9bc21aa8db16f9eff579aa10b0762bb649ab891a06bfb  75-racoonctl-rcvbuf.patch
-9719f7854ff5d37cb927fc6dd23241ade2c031ae7f3eaf14b41613c3f2139c7a237c739cc1df50a954b349f1c75e0992302cce6a7a551c139f4b9c5fcd376b1b  90-dead-on-initial-contact.patch
-3794055d05883ea4c0cb4822248373c2e1e37e871ef8cd9ede07ad3d212422342e9ebefb4684e312793f0c509b9e35c0ad7c6453baadc33fbd5fc01e5fc96de9  musl-cdefs.patch
-568e64288e4c15fc0b1221ce9fa2e88c234e36d5c1e366b8c52b39171aa319d99843817c1d3c0b8517b638474289e4a113220903f319806a6365115585feffc0  fix-yywrap.patch
-60c50aa09753d22c6572661058b42dca8bbb43dc3f64519ef9ad808b8b3d4a5bcfc31d5e0af70e3d71e89c589c901c1da07ad96a2663bdb21557dad7b5aa732d  ipsec-tools-openssl-1.1.patch
-45cd7c76e2b8ded08fc0e3d73e14ed12fdac02be091db9a9ea25d753d655c40c3facc4ce7376bfc4316fc921bd979c686114c31c77a8465aa38f55c2edff775b  disable-Werror.patch"
diff --git a/main/ipsec-tools/disable-Werror.patch b/main/ipsec-tools/disable-Werror.patch
deleted file mode 100644
index 30c0ab3b683..00000000000
--- a/main/ipsec-tools/disable-Werror.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 8506245..f00afd0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -18,7 +18,7 @@ AM_PROG_LEX
- AC_SUBST(LEXLIB)
- AC_PROG_EGREP
- 
--CFLAGS_ADD="$CFLAGS_ADD -Wall -Werror -Wno-unused"
-+CFLAGS_ADD="$CFLAGS_ADD -Wall  -Wno-unused"
- 
- case $host in
- *netbsd*)
-@@ -131,7 +131,7 @@ RACOON_CHECK_VA_COPY
- # Check if printf accepts "%z" type modifier for size_t argument
- AC_MSG_CHECKING(if printf accepts %z)
- saved_CFLAGS=$CFLAGS
--CFLAGS="$CFLAGS -Wall -Werror"
-+CFLAGS="$CFLAGS -Wall "
- AC_TRY_COMPILE([
- #include <stdio.h>
- ], [
-@@ -433,7 +433,7 @@ if test "$libldap_dir" != "no"; then
- 	LIBS="$LIBS -L$libldap_dir/lib -R$libldap_dir/lib -lldap"
- 
- 	saved_CFLAGS=$CFLAGS
--	CFLAGS="$CFLAGS -Wall -Werror"
-+	CFLAGS="$CFLAGS -Wall "
- 	saved_CPPFLAGS=$CPPFLAGS
-         CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD"
- 	AC_TRY_COMPILE(
-@@ -484,7 +484,7 @@ if test "x$enable_gssapi" = "xyes"; then
- 
- 	# Check if iconv 2nd argument needs const 
- 	saved_CFLAGS=$CFLAGS
--	CFLAGS="$CFLAGS -Wall -Werror"
-+	CFLAGS="$CFLAGS -Wall "
- 	saved_CPPFLAGS=$CPPFLAGS
-         CPPFLAGS="$CPPFLAGS $CPPFLAGS_ADD"
- 	AC_CHECK_HEADER([iconv.h], [], [AC_MSG_ERROR([iconv.h not found, but needed for GSSAPI support. Aborting.])])
diff --git a/main/ipsec-tools/fix-yywrap.patch b/main/ipsec-tools/fix-yywrap.patch
deleted file mode 100644
index 0a9ff374926..00000000000
--- a/main/ipsec-tools/fix-yywrap.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- ipsec-tools-0.8.2.orig/src/racoon/cftoken.l	2014-04-15 14:47:11.000000000 -0300
-+++ ipsec-tools-0.8.2/src/racoon/cftoken.l	2014-04-15 18:49:14.589422339 -0300
-@@ -110,6 +110,8 @@
- static int yy_first_time = 1;
- %}
- 
-+%option noyywrap
-+
- /* common seciton */
- nl		\n
- ws		[ \t]+
-diff -ru ipsec-tools-0.8.2.orig/src/setkey/token.l ipsec-tools-0.8.2/src/setkey/token.l
---- ipsec-tools-0.8.2.orig/src/setkey/token.l	2012-08-23 14:10:46.000000000 -0300
-+++ ipsec-tools-0.8.2/src/setkey/token.l	2014-04-15 18:48:11.023100041 -0300
-@@ -111,7 +111,7 @@
- 
- %s S_PL S_AUTHALG S_ENCALG
- 
--%option noinput nounput
-+%option noinput nounput noyywrap
- %%
- 
- 
diff --git a/main/ipsec-tools/ipsec-tools-openssl-1.1.patch b/main/ipsec-tools/ipsec-tools-openssl-1.1.patch
deleted file mode 100644
index 3861f34eadf..00000000000
--- a/main/ipsec-tools/ipsec-tools-openssl-1.1.patch
+++ /dev/null
@@ -1,1085 +0,0 @@
-This patch updates the calls to openssl 1.1 API, and adds a
-compatibility layer so it compiles with (at least) openssl 1.0.2, I
-haven't tested it with lower versions, but all that's needed is to edit
-the openssl_compat.* files and add the missing functions there--they're
-usually trivial.
-
-Signed-off-by: Eneas U de Queiroz <cote2004-github@...>
----
- src/racoon/Makefile.am      |  10 +--
- src/racoon/algorithm.c      |   6 +-
- src/racoon/cfparse.y        |   2 +-
- src/racoon/crypto_openssl.c | 197 +++++++++++++++++++++-------------------
- src/racoon/crypto_openssl.h |   2 +-
- src/racoon/eaytest.c        |   7 +-
- src/racoon/ipsec_doi.c      |   2 +-
- src/racoon/openssl_compat.c | 213 ++++++++++++++++++++++++++++++++++++++++++++
- src/racoon/openssl_compat.h |  45 ++++++++++
- src/racoon/plainrsa-gen.c   |  41 +++++----
- src/racoon/prsa_par.y       |  28 ++++--
- src/racoon/rsalist.c        |   5 +-
- 12 files changed, 431 insertions(+), 127 deletions(-)
- create mode 100644 src/racoon/openssl_compat.c
- create mode 100644 src/racoon/openssl_compat.h
-
-diff --git a/src/racoon/Makefile.am b/src/racoon/Makefile.am
-index dbaded9..4c585f3 100644
---- a/src/racoon/Makefile.am
-+++ b/src/racoon/Makefile.am
-@@ -4,7 +4,7 @@ sbin_PROGRAMS = racoon racoonctl plainrsa-gen
- noinst_PROGRAMS = eaytest
- include_racoon_HEADERS = racoonctl.h var.h vmbuf.h misc.h gcmalloc.h admin.h \
- 	schedule.h sockmisc.h isakmp_var.h isakmp.h isakmp_xauth.h \
--	isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h
-+	isakmp_cfg.h isakmp_unity.h ipsec_doi.h evt.h openssl_compat.h
- lib_LTLIBRARIES = libracoon.la
- 
- adminsockdir=${localstatedir}/racoon
-@@ -32,7 +32,7 @@ racoon_SOURCES = \
- 	gssapi.c dnssec.c getcertsbyname.c privsep.c \
- 	pfkey.c admin.c evt.c ipsec_doi.c oakley.c grabmyaddr.c vendorid.c \
- 	policy.c localconf.c remoteconf.c crypto_openssl.c algorithm.c \
--	proposal.c sainfo.c strnames.c \
-+	openssl_compat.c proposal.c sainfo.c strnames.c \
- 	plog.c logger.c schedule.c str2val.c \
- 	safefile.c backupsa.c genlist.c rsalist.c \
- 	cftoken.l cfparse.y prsa_tok.l prsa_par.y 
-@@ -51,12 +51,12 @@ libracoon_la_SOURCES = kmpstat.c vmbuf.c sockmisc.c misc.c
- libracoon_la_CFLAGS = -DNOUSE_PRIVSEP $(AM_CFLAGS)
- 
- plainrsa_gen_SOURCES = plainrsa-gen.c plog.c \
--	crypto_openssl.c logger.c 
-+	crypto_openssl.c logger.c openssl_compat.c
- EXTRA_plainrsa_gen_SOURCES = $(MISSING_ALGOS)
- plainrsa_gen_LDADD = $(CRYPTOBJS) vmbuf.o misc.o
- plainrsa_gen_DEPENDENCIES = $(CRYPTOBJS) vmbuf.o misc.o
- 
--eaytest_SOURCES = eaytest.c plog.c logger.c
-+eaytest_SOURCES = eaytest.c plog.c logger.c openssl_compat.c
- EXTRA_eaytest_SOURCES = missing/crypto/sha2/sha2.c
- eaytest_LDADD =	crypto_openssl_test.o vmbuf.o str2val.o misc_noplog.o \
- 	$(CRYPTOBJS)
-@@ -75,7 +75,7 @@ noinst_HEADERS = \
- 	debugrm.h         isakmp.h      misc.h          sainfo.h \
- 	dhgroup.h         isakmp_agg.h  netdb_dnssec.h  schedule.h \
- 	isakmp_cfg.h      isakmp_xauth.h isakmp_unity.h isakmp_frag.h \
--	throttle.h	  privsep.h \
-+	throttle.h	  privsep.h     openssl_compat.h \
- 	cfparse_proto.h	  cftoken_proto.h genlist.h     rsalist.h \
- 	missing/crypto/sha2/sha2.h missing/crypto/rijndael/rijndael_local.h \
- 	missing/crypto/rijndael/rijndael-api-fst.h \
-diff --git a/src/racoon/algorithm.c b/src/racoon/algorithm.c
-index 3fd50f6..66c874b 100644
---- a/src/racoon/algorithm.c
-+++ b/src/racoon/algorithm.c
-@@ -128,7 +128,7 @@ static struct enc_algorithm oakley_encdef[] = {
- { "aes",	algtype_aes,	OAKLEY_ATTR_ENC_ALG_AES,	16,
- 		eay_aes_encrypt,	eay_aes_decrypt,
- 		eay_aes_weakkey,	eay_aes_keylen, },
--#ifdef HAVE_OPENSSL_CAMELLIA_H
-+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA)
- { "camellia",	algtype_camellia,	OAKLEY_ATTR_ENC_ALG_CAMELLIA,	16,
- 		eay_camellia_encrypt,	eay_camellia_decrypt,
- 		eay_camellia_weakkey,	eay_camellia_keylen, },
-@@ -168,7 +168,7 @@ static struct enc_algorithm ipsec_encdef[] = {
- { "twofish",	algtype_twofish,	IPSECDOI_ESP_TWOFISH,		16,
- 		NULL,			NULL,
- 		NULL,			eay_twofish_keylen, },
--#ifdef HAVE_OPENSSL_IDEA_H
-+#if defined(HAVE_OPENSSL_IDEA_H) && ! defined(OPENSSL_NO_IDEA)
- { "3idea",	algtype_3idea,		IPSECDOI_ESP_3IDEA,		8,
- 		NULL,			NULL,
- 		NULL,			NULL, },
-@@ -179,7 +179,7 @@ static struct enc_algorithm ipsec_encdef[] = {
- { "rc4",	algtype_rc4,		IPSECDOI_ESP_RC4,		8,
- 		NULL,			NULL,
- 		NULL,			NULL, },
--#ifdef HAVE_OPENSSL_CAMELLIA_H
-+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA)
- { "camellia",	algtype_camellia,	IPSECDOI_ESP_CAMELLIA,		16,
- 		NULL,			NULL,
- 		NULL,			eay_camellia_keylen, },
-diff --git a/src/racoon/cfparse.y b/src/racoon/cfparse.y
-index 0d9bd67..8415752 100644
---- a/src/racoon/cfparse.y
-+++ b/src/racoon/cfparse.y
-@@ -2564,7 +2564,7 @@ set_isakmp_proposal(rmconf)
- 		plog(LLV_DEBUG2, LOCATION, NULL,
- 			"encklen=%d\n", s->encklen);
- 
--		memset(types, 0, ARRAYLEN(types));
-+		memset(types, 0, sizeof types);
- 		types[algclass_isakmp_enc] = s->algclass[algclass_isakmp_enc];
- 		types[algclass_isakmp_hash] = s->algclass[algclass_isakmp_hash];
- 		types[algclass_isakmp_dh] = s->algclass[algclass_isakmp_dh];
-diff --git a/src/racoon/crypto_openssl.c b/src/racoon/crypto_openssl.c
-index 55b076a..8fb358f 100644
---- a/src/racoon/crypto_openssl.c
-+++ b/src/racoon/crypto_openssl.c
-@@ -90,6 +90,7 @@
- #endif
- #endif
- #include "plog.h"
-+#include "openssl_compat.h"
- 
- #define USE_NEW_DES_API
- 
-@@ -316,9 +317,12 @@ eay_cmp_asn1dn(n1, n2)
- 			i = idx+1;
- 			goto end;
- 		}
--		if ((ea->value->length == 1 && ea->value->data[0] == '*') ||
--		    (eb->value->length == 1 && eb->value->data[0] == '*')) {
--	    		if (OBJ_cmp(ea->object,eb->object)) {
-+		ASN1_STRING *sa = X509_NAME_ENTRY_get_data(ea);
-+		ASN1_STRING *sb = X509_NAME_ENTRY_get_data(eb);
-+		if ((ASN1_STRING_length(sa) == 1 && ASN1_STRING_get0_data(sa)[0] == '*') ||
-+		    (ASN1_STRING_length(sb) == 1 && ASN1_STRING_get0_data(sb)[0] == '*')) {
-+	    		if (OBJ_cmp(X509_NAME_ENTRY_get_object(ea),
-+				    X509_NAME_ENTRY_get_object(eb))) {
- 				i = idx+1;
- 				goto end;
- 	    		}
-@@ -430,7 +434,7 @@ cb_check_cert_local(ok, ctx)
- 
- 	if (!ok) {
- 		X509_NAME_oneline(
--				X509_get_subject_name(ctx->current_cert),
-+				X509_get_subject_name(X509_STORE_CTX_get_current_cert(ctx)),
- 				buf,
- 				256);
- 		/*
-@@ -438,7 +442,8 @@ cb_check_cert_local(ok, ctx)
- 		 * ok if they are self signed. But we should still warn
- 		 * the user.
-  		 */
--		switch (ctx->error) {
-+		int ctx_error = X509_STORE_CTX_get_error(ctx);
-+		switch (ctx_error) {
- 		case X509_V_ERR_CERT_HAS_EXPIRED:
- 		case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
- 		case X509_V_ERR_INVALID_CA:
-@@ -453,9 +458,9 @@ cb_check_cert_local(ok, ctx)
- 		}
- 		plog(log_tag, LOCATION, NULL,
- 			"%s(%d) at depth:%d SubjectName:%s\n",
--			X509_verify_cert_error_string(ctx->error),
--			ctx->error,
--			ctx->error_depth,
-+			X509_verify_cert_error_string(ctx_error),
-+			ctx_error,
-+			X509_STORE_CTX_get_error_depth(ctx),
- 			buf);
- 	}
- 	ERR_clear_error();
-@@ -477,10 +482,11 @@ cb_check_cert_remote(ok, ctx)
- 
- 	if (!ok) {
- 		X509_NAME_oneline(
--				X509_get_subject_name(ctx->current_cert),
-+				X509_get_subject_name(X509_STORE_CTX_get_current_cert(ctx)),
- 				buf,
- 				256);
--		switch (ctx->error) {
-+		int ctx_error=X509_STORE_CTX_get_error(ctx);
-+		switch (ctx_error) {
- 		case X509_V_ERR_UNABLE_TO_GET_CRL:
- 			ok = 1;
- 			log_tag = LLV_WARNING;
-@@ -490,9 +496,9 @@ cb_check_cert_remote(ok, ctx)
- 		}
- 		plog(log_tag, LOCATION, NULL,
- 			"%s(%d) at depth:%d SubjectName:%s\n",
--			X509_verify_cert_error_string(ctx->error),
--			ctx->error,
--			ctx->error_depth,
-+			X509_verify_cert_error_string(ctx_error),
-+			ctx_error,
-+			X509_STORE_CTX_get_error_depth(ctx),
- 			buf);
- 	}
- 	ERR_clear_error();
-@@ -516,14 +522,15 @@ eay_get_x509asn1subjectname(cert)
- 	if (x509 == NULL)
- 		goto error;
- 
-+	X509_NAME *subject_name = X509_get_subject_name(x509);
- 	/* get the length of the name */
--	len = i2d_X509_NAME(x509->cert_info->subject, NULL);
-+	len = i2d_X509_NAME(subject_name, NULL);
- 	name = vmalloc(len);
- 	if (!name)
- 		goto error;
- 	/* get the name */
- 	bp = (unsigned char *) name->v;
--	len = i2d_X509_NAME(x509->cert_info->subject, &bp);
-+	len = i2d_X509_NAME(subject_name, &bp);
- 
- 	X509_free(x509);
- 
-@@ -661,15 +668,16 @@ eay_get_x509asn1issuername(cert)
- 	if (x509 == NULL)
- 		goto error;
- 
-+	X509_NAME *issuer_name = X509_get_issuer_name(x509);
- 	/* get the length of the name */
--	len = i2d_X509_NAME(x509->cert_info->issuer, NULL);
-+	len = i2d_X509_NAME(issuer_name, NULL);
- 	name = vmalloc(len);
- 	if (name == NULL)
- 		goto error;
- 
- 	/* get the name */
- 	bp = (unsigned char *) name->v;
--	len = i2d_X509_NAME(x509->cert_info->issuer, &bp);
-+	len = i2d_X509_NAME(issuer_name, &bp);
- 
- 	X509_free(x509);
- 
-@@ -850,7 +858,7 @@ eay_check_x509sign(source, sig, cert)
- 		return -1;
- 	}
- 
--	res = eay_rsa_verify(source, sig, evp->pkey.rsa);
-+	res = eay_rsa_verify(source, sig, EVP_PKEY_get0_RSA(evp));
- 
- 	EVP_PKEY_free(evp);
- 	X509_free(x509);
-@@ -992,7 +1000,7 @@ eay_get_x509sign(src, privkey)
- 	if (evp == NULL)
- 		return NULL;
- 
--	sig = eay_rsa_sign(src, evp->pkey.rsa);
-+	sig = eay_rsa_sign(src, EVP_PKEY_get0_RSA(evp));
- 
- 	EVP_PKEY_free(evp);
- 
-@@ -1079,7 +1087,11 @@ eay_strerror()
- 	int line, flags;
- 	unsigned long es;
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+	es = 0; /* even when allowed by OPENSSL_API_COMPAT, it is defined as 0 */
-+#else
- 	es = CRYPTO_thread_id();
-+#endif
- 
- 	while ((l = ERR_get_error_line_data(&file, &line, &data, &flags)) != 0){
- 		n = snprintf(ebuf + len, sizeof(ebuf) - len,
-@@ -1100,7 +1112,7 @@ vchar_t *
- evp_crypt(vchar_t *data, vchar_t *key, vchar_t *iv, const EVP_CIPHER *e, int enc)
- {
- 	vchar_t *res;
--	EVP_CIPHER_CTX ctx;
-+	EVP_CIPHER_CTX *ctx;
- 
- 	if (!e)
- 		return NULL;
-@@ -1111,7 +1123,7 @@ evp_crypt(vchar_t *data, vchar_t *key, vchar_t *iv, const EVP_CIPHER *e, int enc
- 	if ((res = vmalloc(data->l)) == NULL)
- 		return NULL;
- 
--	EVP_CIPHER_CTX_init(&ctx);
-+	ctx = EVP_CIPHER_CTX_new();
- 
- 	switch(EVP_CIPHER_nid(e)){
- 	case NID_bf_cbc:
-@@ -1125,54 +1137,41 @@ evp_crypt(vchar_t *data, vchar_t *key, vchar_t *iv, const EVP_CIPHER *e, int enc
- 		/* XXX: can we do that also for algos with a fixed key size ?
- 		 */
- 		/* init context without key/iv
--         */
--        if (!EVP_CipherInit(&ctx, e, NULL, NULL, enc))
--        {
--            OpenSSL_BUG();
--            vfree(res);
--            return NULL;
--        }
-+                 */
-+		if (!EVP_CipherInit(ctx, e, NULL, NULL, enc))
-+			goto out;
- 		
--        /* update key size
--         */
--        if (!EVP_CIPHER_CTX_set_key_length(&ctx, key->l))
--        {
--            OpenSSL_BUG();
--            vfree(res);
--            return NULL;
--        }
--
--        /* finalize context init with desired key size
--         */
--        if (!EVP_CipherInit(&ctx, NULL, (u_char *) key->v,
-+		/* update key size
-+		 */
-+		if (!EVP_CIPHER_CTX_set_key_length(ctx, key->l))
-+			goto out;
-+
-+		/* finalize context init with desired key size
-+		 */
-+		if (!EVP_CipherInit(ctx, NULL, (u_char *) key->v,
- 							(u_char *) iv->v, enc))
--        {
--            OpenSSL_BUG();
--            vfree(res);
--            return NULL;
--		}
-+			goto out;
- 		break;
- 	default:
--		if (!EVP_CipherInit(&ctx, e, (u_char *) key->v, 
--							(u_char *) iv->v, enc)) {
--			OpenSSL_BUG();
--			vfree(res);
--			return NULL;
--		}
-+		if (!EVP_CipherInit(ctx, e, (u_char *) key->v,
-+							(u_char *) iv->v, enc))
-+            		goto out;
- 	}
- 
- 	/* disable openssl padding */
--	EVP_CIPHER_CTX_set_padding(&ctx, 0); 
-+	EVP_CIPHER_CTX_set_padding(ctx, 0);
- 	
--	if (!EVP_Cipher(&ctx, (u_char *) res->v, (u_char *) data->v, data->l)) {
--		OpenSSL_BUG();
--		vfree(res);
--		return NULL;
--	}
-+	if (!EVP_Cipher(ctx, (u_char *) res->v, (u_char *) data->v, data->l))
-+		goto out;
- 
--	EVP_CIPHER_CTX_cleanup(&ctx);
-+	EVP_CIPHER_CTX_free(ctx);
- 
- 	return res;
-+out:
-+	EVP_CIPHER_CTX_free(ctx);
-+	OpenSSL_BUG();
-+	vfree(res);
-+	return NULL;
- }
- 
- int
-@@ -1230,7 +1229,7 @@ eay_des_keylen(len)
- 	return evp_keylen(len, EVP_des_cbc());
- }
- 
--#ifdef HAVE_OPENSSL_IDEA_H
-+#if defined(HAVE_OPENSSL_IDEA_H) && ! defined(OPENSSL_NO_IDEA)
- /*
-  * IDEA-CBC
-  */
-@@ -1587,7 +1586,7 @@ eay_aes_keylen(len)
- 	return len;
- }
- 
--#if defined(HAVE_OPENSSL_CAMELLIA_H)
-+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA)
- /*
-  * CAMELLIA-CBC
-  */
-@@ -1680,9 +1679,9 @@ eay_hmac_init(key, md)
- 	vchar_t *key;
- 	const EVP_MD *md;
- {
--	HMAC_CTX *c = racoon_malloc(sizeof(*c));
-+	HMAC_CTX *c = HMAC_CTX_new();
- 
--	HMAC_Init(c, key->v, key->l, md);
-+	HMAC_Init_ex(c, key->v, key->l, md, NULL);
- 
- 	return (caddr_t)c;
- }
-@@ -1761,8 +1760,7 @@ eay_hmacsha2_512_final(c)
- 
- 	HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
- 	res->l = l;
--	HMAC_cleanup((HMAC_CTX *)c);
--	(void)racoon_free(c);
-+	HMAC_CTX_free((HMAC_CTX *)c);
- 
- 	if (SHA512_DIGEST_LENGTH != res->l) {
- 		plog(LLV_ERROR, LOCATION, NULL,
-@@ -1811,8 +1809,7 @@ eay_hmacsha2_384_final(c)
- 
- 	HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
- 	res->l = l;
--	HMAC_cleanup((HMAC_CTX *)c);
--	(void)racoon_free(c);
-+	HMAC_CTX_free((HMAC_CTX *)c);
- 
- 	if (SHA384_DIGEST_LENGTH != res->l) {
- 		plog(LLV_ERROR, LOCATION, NULL,
-@@ -1861,8 +1858,7 @@ eay_hmacsha2_256_final(c)
- 
- 	HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
- 	res->l = l;
--	HMAC_cleanup((HMAC_CTX *)c);
--	(void)racoon_free(c);
-+	HMAC_CTX_free((HMAC_CTX *)c);
- 
- 	if (SHA256_DIGEST_LENGTH != res->l) {
- 		plog(LLV_ERROR, LOCATION, NULL,
-@@ -1912,8 +1908,7 @@ eay_hmacsha1_final(c)
- 
- 	HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
- 	res->l = l;
--	HMAC_cleanup((HMAC_CTX *)c);
--	(void)racoon_free(c);
-+	HMAC_CTX_free((HMAC_CTX *)c);
- 
- 	if (SHA_DIGEST_LENGTH != res->l) {
- 		plog(LLV_ERROR, LOCATION, NULL,
-@@ -1962,8 +1957,7 @@ eay_hmacmd5_final(c)
- 
- 	HMAC_Final((HMAC_CTX *)c, (unsigned char *) res->v, &l);
- 	res->l = l;
--	HMAC_cleanup((HMAC_CTX *)c);
--	(void)racoon_free(c);
-+	HMAC_CTX_free((HMAC_CTX *)c);
- 
- 	if (MD5_DIGEST_LENGTH != res->l) {
- 		plog(LLV_ERROR, LOCATION, NULL,
-@@ -2266,6 +2260,7 @@ eay_dh_generate(prime, g, publen, pub, priv)
- 	u_int32_t g;
- {
- 	BIGNUM *p = NULL;
-+	BIGNUM *BNg = NULL;
- 	DH *dh = NULL;
- 	int error = -1;
- 
-@@ -2276,25 +2271,28 @@ eay_dh_generate(prime, g, publen, pub, priv)
- 
- 	if ((dh = DH_new()) == NULL)
- 		goto end;
--	dh->p = p;
--	p = NULL;	/* p is now part of dh structure */
--	dh->g = NULL;
--	if ((dh->g = BN_new()) == NULL)
-+	if ((BNg = BN_new()) == NULL)
- 		goto end;
--	if (!BN_set_word(dh->g, g))
-+	if (!BN_set_word(BNg, g))
- 		goto end;
-+	if (! DH_set0_pqg(dh, p, NULL, BNg))
-+		goto end;
-+	BNg = NULL;
-+	p = NULL;	/* p is now part of dh structure */
- 
- 	if (publen != 0)
--		dh->length = publen;
-+		DH_set_length(dh, publen);
- 
- 	/* generate public and private number */
- 	if (!DH_generate_key(dh))
- 		goto end;
- 
- 	/* copy results to buffers */
--	if (eay_bn2v(pub, dh->pub_key) < 0)
-+	BIGNUM *pub_key, *priv_key;
-+	DH_get0_key(dh, (const BIGNUM**) &pub_key, (const BIGNUM**) &priv_key);
-+	if (eay_bn2v(pub, pub_key) < 0)
- 		goto end;
--	if (eay_bn2v(priv, dh->priv_key) < 0) {
-+	if (eay_bn2v(priv, priv_key) < 0) {
- 		vfree(*pub);
- 		goto end;
- 	}
-@@ -2306,6 +2304,8 @@ end:
- 		DH_free(dh);
- 	if (p != 0)
- 		BN_free(p);
-+	if (BNg != 0)
-+		BN_free(BNg);
- 	return(error);
- }
- 
-@@ -2319,6 +2319,10 @@ eay_dh_compute(prime, g, pub, priv, pub2, key)
- 	int l;
- 	unsigned char *v = NULL;
- 	int error = -1;
-+	BIGNUM *p = BN_new();
-+	BIGNUM *BNg = BN_new();
-+	BIGNUM *pub_key = BN_new();
-+	BIGNUM *priv_key = BN_new();
- 
- 	/* make public number to compute */
- 	if (eay_v2bn(&dh_pub, pub2) < 0)
-@@ -2327,19 +2331,21 @@ eay_dh_compute(prime, g, pub, priv, pub2, key)
- 	/* make DH structure */
- 	if ((dh = DH_new()) == NULL)
- 		goto end;
--	if (eay_v2bn(&dh->p, prime) < 0)
-+	if (p == NULL || BNg == NULL || pub_key == NULL || priv_key == NULL)
- 		goto end;
--	if (eay_v2bn(&dh->pub_key, pub) < 0)
-+
-+	if (eay_v2bn(&p, prime) < 0)
- 		goto end;
--	if (eay_v2bn(&dh->priv_key, priv) < 0)
-+	if (eay_v2bn(&pub_key, pub) < 0)
- 		goto end;
--	dh->length = pub2->l * 8;
--
--	dh->g = NULL;
--	if ((dh->g = BN_new()) == NULL)
-+	if (eay_v2bn(&priv_key, priv) < 0)
- 		goto end;
--	if (!BN_set_word(dh->g, g))
-+	if (!BN_set_word(BNg, g))
- 		goto end;
-+	DH_set0_key(dh, pub_key, priv_key);
-+	DH_set_length(dh, pub2->l * 8);
-+	DH_set0_pqg(dh, p, NULL, BNg);
-+	pub_key = priv_key = p = BNg = NULL;
- 
- 	if ((v = racoon_calloc(prime->l, sizeof(u_char))) == NULL)
- 		goto end;
-@@ -2350,6 +2356,14 @@ eay_dh_compute(prime, g, pub, priv, pub2, key)
- 	error = 0;
- 
- end:
-+	if (p != NULL)
-+		BN_free(p);
-+	if (BNg != NULL)
-+		BN_free(BNg);
-+	if (pub_key != NULL)
-+		BN_free(pub_key);
-+	if (priv_key != NULL)
-+		BN_free(priv_key);
- 	if (dh_pub != NULL)
- 		BN_free(dh_pub);
- 	if (dh != NULL)
-@@ -2400,12 +2414,14 @@ eay_bn2v(var, bn)
- void
- eay_init()
- {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	OpenSSL_add_all_algorithms();
- 	ERR_load_crypto_strings();
- #ifdef HAVE_OPENSSL_ENGINE_H
- 	ENGINE_load_builtin_engines();
- 	ENGINE_register_all_complete();
- #endif
-+#endif
- }
- 
- vchar_t *
-@@ -2504,8 +2520,7 @@ binbuf_pubkey2rsa(vchar_t *binbuf)
- 		goto out;
- 	}
- 	
--	rsa_pub->n = mod;
--	rsa_pub->e = exp;
-+	RSA_set0_key(rsa_pub, mod, exp, NULL);
- 
- out:
- 	return rsa_pub;
-@@ -2582,5 +2597,5 @@ eay_random()
- const char *
- eay_version()
- {
--	return SSLeay_version(SSLEAY_VERSION);
-+	return OpenSSL_version(OPENSSL_VERSION);
- }
-diff --git a/src/racoon/crypto_openssl.h b/src/racoon/crypto_openssl.h
-index 66fac73..ee5b765 100644
---- a/src/racoon/crypto_openssl.h
-+++ b/src/racoon/crypto_openssl.h
-@@ -124,7 +124,7 @@ extern vchar_t *eay_aes_decrypt __P((vchar_t *, vchar_t *, vchar_t *));
- extern int eay_aes_weakkey __P((vchar_t *));
- extern int eay_aes_keylen __P((int));
- 
--#if defined(HAVE_OPENSSL_CAMELLIA_H)
-+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA)
- /* Camellia */
- extern vchar_t *eay_camellia_encrypt __P((vchar_t *, vchar_t *, vchar_t *));
- extern vchar_t *eay_camellia_decrypt __P((vchar_t *, vchar_t *, vchar_t *));
-diff --git a/src/racoon/eaytest.c b/src/racoon/eaytest.c
-index 1474bdc..ae09db3 100644
---- a/src/racoon/eaytest.c
-+++ b/src/racoon/eaytest.c
-@@ -62,6 +62,7 @@
- #include "dhgroup.h"
- #include "crypto_openssl.h"
- #include "gnuc.h"
-+#include "openssl_compat.h"
- 
- #include "package_version.h"
- 
-@@ -103,7 +104,7 @@ rsa_verify_with_pubkey(src, sig, pubkey_txt)
- 		printf ("PEM_read_PUBKEY(): %s\n", eay_strerror());
- 		return -1;
- 	}
--	error = eay_check_rsasign(src, sig, evp->pkey.rsa);
-+	error = eay_check_rsasign(src, sig, EVP_PKEY_get0_RSA(evp));
- 
- 	return error;
- }
-@@ -698,7 +699,7 @@ ciphertest(ac, av)
- 			  eay_cast_encrypt, eay_cast_decrypt) < 0)
- 	  return -1;
- 	
--#ifdef HAVE_OPENSSL_IDEA_H
-+#if defined(HAVE_OPENSSL_IDEA_H) && ! defined(OPENSSL_NO_IDEA)
- 	if (ciphertest_1 ("IDEA",
- 			  &data, 8,
- 			  &key, key.l,
-@@ -715,7 +716,7 @@ ciphertest(ac, av)
- 			  eay_rc5_encrypt, eay_rc5_decrypt) < 0)
- 	  return -1;
- #endif
--#if defined(HAVE_OPENSSL_CAMELLIA_H)
-+#if defined(HAVE_OPENSSL_CAMELLIA_H) && ! defined(OPENSSL_NO_CAMELLIA)
- 	if (ciphertest_1 ("CAMELLIA",
- 			  &data, 16,
- 			  &key, key.l,
-diff --git a/src/racoon/ipsec_doi.c b/src/racoon/ipsec_doi.c
-index 84a4c71..b52469f 100644
---- a/src/racoon/ipsec_doi.c
-+++ b/src/racoon/ipsec_doi.c
-@@ -715,7 +715,7 @@ out:
- 	/* key length must not be specified on some algorithms */
- 	if (keylen) {
- 		if (sa->enctype == OAKLEY_ATTR_ENC_ALG_DES
--#ifdef HAVE_OPENSSL_IDEA_H
-+#if defined(HAVE_OPENSSL_IDEA_H) && ! defined(OPENSSL_NO_IDEA)
- 		 || sa->enctype == OAKLEY_ATTR_ENC_ALG_IDEA
- #endif
- 		 || sa->enctype == OAKLEY_ATTR_ENC_ALG_3DES) {
-diff --git a/src/racoon/openssl_compat.c b/src/racoon/openssl_compat.c
-new file mode 100644
-index 0000000..864b5fb
---- /dev/null
-+++ b/src/racoon/openssl_compat.c
-@@ -0,0 +1,213 @@
-+/*
-+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
-+ *
-+ * Licensed under the OpenSSL license (the "License").  You may not use
-+ * this file except in compliance with the License.  You can obtain a copy
-+ * in the file LICENSE in the source distribution or at
-+ * https://www.openssl.org/source/license.html
-+ */
-+
-+#include "openssl_compat.h"
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+
-+#include <string.h>
-+
-+static void *OPENSSL_zalloc(size_t num)
-+{
-+    void *ret = OPENSSL_malloc(num);
-+
-+    if (ret != NULL)
-+        memset(ret, 0, num);
-+    return ret;
-+}
-+
-+int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-+{
-+    /* If the fields n and e in r are NULL, the corresponding input
-+     * parameters MUST be non-NULL for n and e.  d may be
-+     * left NULL (in case only the public key is used).
-+     */
-+    if ((r->n == NULL && n == NULL)
-+        || (r->e == NULL && e == NULL))
-+        return 0;
-+
-+    if (n != NULL) {
-+        BN_free(r->n);
-+        r->n = n;
-+    }
-+    if (e != NULL) {
-+        BN_free(r->e);
-+        r->e = e;
-+    }
-+    if (d != NULL) {
-+        BN_free(r->d);
-+        r->d = d;
-+    }
-+
-+    return 1;
-+}
-+
-+int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q)
-+{
-+    /* If the fields p and q in r are NULL, the corresponding input
-+     * parameters MUST be non-NULL.
-+     */
-+    if ((r->p == NULL && p == NULL)
-+        || (r->q == NULL && q == NULL))
-+        return 0;
-+
-+    if (p != NULL) {
-+        BN_free(r->p);
-+        r->p = p;
-+    }
-+    if (q != NULL) {
-+        BN_free(r->q);
-+        r->q = q;
-+    }
-+
-+    return 1;
-+}
-+
-+int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp)
-+{
-+    /* If the fields dmp1, dmq1 and iqmp in r are NULL, the corresponding input
-+     * parameters MUST be non-NULL.
-+     */
-+    if ((r->dmp1 == NULL && dmp1 == NULL)
-+        || (r->dmq1 == NULL && dmq1 == NULL)
-+        || (r->iqmp == NULL && iqmp == NULL))
-+        return 0;
-+
-+    if (dmp1 != NULL) {
-+        BN_free(r->dmp1);
-+        r->dmp1 = dmp1;
-+    }
-+    if (dmq1 != NULL) {
-+        BN_free(r->dmq1);
-+        r->dmq1 = dmq1;
-+    }
-+    if (iqmp != NULL) {
-+        BN_free(r->iqmp);
-+        r->iqmp = iqmp;
-+    }
-+
-+    return 1;
-+}
-+
-+void RSA_get0_key(const RSA *r,
-+                  const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
-+{
-+    if (n != NULL)
-+        *n = r->n;
-+    if (e != NULL)
-+        *e = r->e;
-+    if (d != NULL)
-+        *d = r->d;
-+}
-+
-+void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q)
-+{
-+    if (p != NULL)
-+        *p = r->p;
-+    if (q != NULL)
-+        *q = r->q;
-+}
-+
-+void RSA_get0_crt_params(const RSA *r,
-+                         const BIGNUM **dmp1, const BIGNUM **dmq1,
-+                         const BIGNUM **iqmp)
-+{
-+    if (dmp1 != NULL)
-+        *dmp1 = r->dmp1;
-+    if (dmq1 != NULL)
-+        *dmq1 = r->dmq1;
-+    if (iqmp != NULL)
-+        *iqmp = r->iqmp;
-+}
-+
-+int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+    /* If the fields p and g in d are NULL, the corresponding input
-+     * parameters MUST be non-NULL.  q may remain NULL.
-+     */
-+    if ((dh->p == NULL && p == NULL)
-+        || (dh->g == NULL && g == NULL))
-+        return 0;
-+
-+    if (p != NULL) {
-+        BN_free(dh->p);
-+        dh->p = p;
-+    }
-+    if (q != NULL) {
-+        BN_free(dh->q);
-+        dh->q = q;
-+    }
-+    if (g != NULL) {
-+        BN_free(dh->g);
-+        dh->g = g;
-+    }
-+
-+    if (q != NULL) {
-+        dh->length = BN_num_bits(q);
-+    }
-+
-+    return 1;
-+}
-+
-+void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key)
-+{
-+    if (pub_key != NULL)
-+        *pub_key = dh->pub_key;
-+    if (priv_key != NULL)
-+        *priv_key = dh->priv_key;
-+}
-+
-+int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key)
-+{
-+    /* If the field pub_key in dh is NULL, the corresponding input
-+     * parameters MUST be non-NULL.  The priv_key field may
-+     * be left NULL.
-+     */
-+    if (dh->pub_key == NULL && pub_key == NULL)
-+        return 0;
-+
-+    if (pub_key != NULL) {
-+        BN_free(dh->pub_key);
-+        dh->pub_key = pub_key;
-+    }
-+    if (priv_key != NULL) {
-+        BN_free(dh->priv_key);
-+        dh->priv_key = priv_key;
-+    }
-+
-+    return 1;
-+}
-+
-+int DH_set_length(DH *dh, long length)
-+{
-+    dh->length = length;
-+    return 1;
-+}
-+
-+HMAC_CTX *HMAC_CTX_new(void)
-+{
-+    return OPENSSL_zalloc(sizeof(HMAC_CTX));
-+}
-+
-+void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+    HMAC_CTX_cleanup(ctx);
-+    OPENSSL_free(ctx);
-+}
-+
-+RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
-+{
-+    if (pkey->type != EVP_PKEY_RSA) {
-+        return NULL;
-+    }
-+    return pkey->pkey.rsa;
-+}
-+
-+
-+#endif /* OPENSSL_VERSION_NUMBER */
-diff --git a/src/racoon/openssl_compat.h b/src/racoon/openssl_compat.h
-new file mode 100644
-index 0000000..9e152c2
---- /dev/null
-+++ b/src/racoon/openssl_compat.h
-@@ -0,0 +1,45 @@
-+#ifndef OPENSSL_COMPAT_H
-+#define OPENSSL_COMPAT_H
-+
-+#include <openssl/opensslv.h>
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+
-+#include <openssl/rsa.h>
-+#include <openssl/dh.h>
-+#include <openssl/evp.h>
-+#include <openssl/hmac.h>
-+
-+int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d);
-+int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q);
-+int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp);
-+void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d);
-+void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q);
-+void RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const BIGNUM **dmq1, const BIGNUM **iqmp);
-+
-+int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
-+void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key);
-+int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key);
-+int DH_set_length(DH *dh, long length);
-+
-+HMAC_CTX *HMAC_CTX_new(void);
-+void HMAC_CTX_free(HMAC_CTX* ctx);
-+
-+RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey);
-+
-+#define ASN1_STRING_length(s) s->length
-+#define ASN1_STRING_get0_data(s) s->data
-+
-+#define X509_get_subject_name(x) x->cert_info->subject
-+#define X509_get_issuer_name(x) x->cert_info->issuer
-+#define X509_NAME_ENTRY_get_data(n) n->value
-+#define X509_NAME_ENTRY_get_object(n) n->object
-+#define X509_STORE_CTX_get_current_cert(ctx) ctx->current_cert
-+#define X509_STORE_CTX_get_error(ctx) ctx->error
-+#define X509_STORE_CTX_get_error_depth(ctx) ctx->error_depth
-+
-+#define OPENSSL_VERSION SSLEAY_VERSION
-+#define OpenSSL_version SSLeay_version
-+
-+#endif /* OPENSSL_VERSION_NUMBER */
-+
-+#endif /* OPENSSL_COMPAT_H */
-diff --git a/src/racoon/plainrsa-gen.c b/src/racoon/plainrsa-gen.c
-index cad1861..b949b08 100644
---- a/src/racoon/plainrsa-gen.c
-+++ b/src/racoon/plainrsa-gen.c
-@@ -60,6 +60,7 @@
- #include "vmbuf.h"
- #include "plog.h"
- #include "crypto_openssl.h"
-+#include "openssl_compat.h"
- 
- #include "package_version.h"
- 
-@@ -90,12 +91,14 @@ mix_b64_pubkey(const RSA *key)
- 	char *binbuf;
- 	long binlen, ret;
- 	vchar_t *res;
--	
--	binlen = 1 + BN_num_bytes(key->e) + BN_num_bytes(key->n);
-+	const BIGNUM *e, *n;
-+
-+	RSA_get0_key(key, &n, &e, NULL);
-+	binlen = 1 + BN_num_bytes(e) + BN_num_bytes(n);
- 	binbuf = malloc(binlen);
- 	memset(binbuf, 0, binlen);
--	binbuf[0] = BN_bn2bin(key->e, (unsigned char *) &binbuf[1]);
--	ret = BN_bn2bin(key->n, (unsigned char *) (&binbuf[binbuf[0] + 1]));
-+	binbuf[0] = BN_bn2bin(e, (unsigned char *) &binbuf[1]);
-+	ret = BN_bn2bin(n, (unsigned char *) (&binbuf[binbuf[0] + 1]));
- 	if (1 + binbuf[0] + ret != binlen) {
- 		plog(LLV_ERROR, LOCATION, NULL,
- 		     "Pubkey generation failed. This is really strange...\n");
-@@ -131,16 +134,20 @@ print_rsa_key(FILE *fp, const RSA *key)
- 	
- 	fprintf(fp, "# : PUB 0s%s\n", pubkey64->v);
- 	fprintf(fp, ": RSA\t{\n");
--	fprintf(fp, "\t# RSA %d bits\n", BN_num_bits(key->n));
-+	const BIGNUM *n, *e, *d, *p, *q, *dmp1, *dmq1, *iqmp;
-+	RSA_get0_key(key, &n, &e, &d);
-+	RSA_get0_factors(key, &p, &q);
-+	RSA_get0_crt_params(key, &dmp1, &dmq1, &iqmp);
-+	fprintf(fp, "\t# RSA %d bits\n", BN_num_bits(n));
- 	fprintf(fp, "\t# pubkey=0s%s\n", pubkey64->v);
--	fprintf(fp, "\tModulus: 0x%s\n", lowercase(BN_bn2hex(key->n)));
--	fprintf(fp, "\tPublicExponent: 0x%s\n", lowercase(BN_bn2hex(key->e)));
--	fprintf(fp, "\tPrivateExponent: 0x%s\n", lowercase(BN_bn2hex(key->d)));
--	fprintf(fp, "\tPrime1: 0x%s\n", lowercase(BN_bn2hex(key->p)));
--	fprintf(fp, "\tPrime2: 0x%s\n", lowercase(BN_bn2hex(key->q)));
--	fprintf(fp, "\tExponent1: 0x%s\n", lowercase(BN_bn2hex(key->dmp1)));
--	fprintf(fp, "\tExponent2: 0x%s\n", lowercase(BN_bn2hex(key->dmq1)));
--	fprintf(fp, "\tCoefficient: 0x%s\n", lowercase(BN_bn2hex(key->iqmp)));
-+	fprintf(fp, "\tModulus: 0x%s\n", lowercase(BN_bn2hex(n)));
-+	fprintf(fp, "\tPublicExponent: 0x%s\n", lowercase(BN_bn2hex(e)));
-+	fprintf(fp, "\tPrivateExponent: 0x%s\n", lowercase(BN_bn2hex(d)));
-+	fprintf(fp, "\tPrime1: 0x%s\n", lowercase(BN_bn2hex(p)));
-+	fprintf(fp, "\tPrime2: 0x%s\n", lowercase(BN_bn2hex(q)));
-+	fprintf(fp, "\tExponent1: 0x%s\n", lowercase(BN_bn2hex(dmp1)));
-+	fprintf(fp, "\tExponent2: 0x%s\n", lowercase(BN_bn2hex(dmq1)));
-+	fprintf(fp, "\tCoefficient: 0x%s\n", lowercase(BN_bn2hex(iqmp)));
- 	fprintf(fp, "  }\n");
- 
- 	vfree(pubkey64);
-@@ -203,11 +210,13 @@ int
- gen_rsa_key(FILE *fp, size_t bits, unsigned long exp)
- {
- 	int ret;
--	RSA *key;
-+	RSA *key = RSA_new();
-+	BIGNUM *e = BN_new();
- 
--	key = RSA_generate_key(bits, exp, NULL, NULL);
--	if (!key) {
-+	BN_set_word(e, exp);
-+	if (! RSA_generate_key_ex(key, bits, e, NULL)) {
- 		fprintf(stderr, "RSA_generate_key(): %s\n", eay_strerror());
-+		RSA_free(key);
- 		return -1;
- 	}
- 	
-diff --git a/src/racoon/prsa_par.y b/src/racoon/prsa_par.y
-index 1987e4d..27ce4c6 100644
---- a/src/racoon/prsa_par.y
-+++ b/src/racoon/prsa_par.y
-@@ -68,6 +68,7 @@
- #include "isakmp_var.h"
- #include "handler.h"
- #include "crypto_openssl.h"
-+#include "openssl_compat.h"
- #include "sockmisc.h"
- #include "rsalist.h"
- 
-@@ -85,7 +86,18 @@ char *prsa_cur_fname = NULL;
- struct genlist *prsa_cur_list = NULL;
- enum rsa_key_type prsa_cur_type = RSA_TYPE_ANY;
- 
--static RSA *rsa_cur;
-+struct my_rsa_st {
-+	BIGNUM *n;
-+	BIGNUM *e;
-+	BIGNUM *d;
-+	BIGNUM *p;
-+	BIGNUM *q;
-+	BIGNUM *dmp1;
-+	BIGNUM *dmq1;
-+	BIGNUM *iqmp;
-+};
-+
-+static struct my_rsa_st *rsa_cur;
- 
- void
- prsaerror(const char *s, ...)
-@@ -201,8 +213,12 @@ rsa_statement:
- 				rsa_cur->iqmp = NULL;
- 			}
- 		}
--		$$ = rsa_cur;
--		rsa_cur = RSA_new();
-+		RSA * rsa_tmp = RSA_new();
-+		RSA_set0_key(rsa_tmp, rsa_cur->n, rsa_cur->e, rsa_cur->d);
-+		RSA_set0_factors(rsa_tmp, rsa_cur->p, rsa_cur->q);
-+		RSA_set0_crt_params(rsa_tmp, rsa_cur->dmp1, rsa_cur->dmq1, rsa_cur->iqmp);
-+		$$ = rsa_tmp;
-+		memset(rsa_cur, 0, sizeof(struct my_rsa_st));
- 	}
- 	| TAG_PUB BASE64
- 	{
-@@ -351,10 +367,12 @@ prsa_parse_file(struct genlist *list, char *fname, enum rsa_key_type type)
- 	prsa_cur_fname = fname;
- 	prsa_cur_list = list;
- 	prsa_cur_type = type;
--	rsa_cur = RSA_new();
-+	rsa_cur = malloc(sizeof(struct my_rsa_st));
-+	memset(rsa_cur, 0, sizeof(struct my_rsa_st));
- 	ret = prsaparse();
- 	if (rsa_cur) {
--		RSA_free(rsa_cur);
-+		memset(rsa_cur, 0, sizeof(struct my_rsa_st));
-+		free(rsa_cur);
- 		rsa_cur = NULL;
- 	}
- 	fclose (fp);
-diff --git a/src/racoon/rsalist.c b/src/racoon/rsalist.c
-index f152c82..96e8363 100644
---- a/src/racoon/rsalist.c
-+++ b/src/racoon/rsalist.c
-@@ -52,6 +52,7 @@
- #include "genlist.h"
- #include "remoteconf.h"
- #include "crypto_openssl.h"
-+#include "openssl_compat.h"
- 
- #ifndef LIST_FIRST
- #define LIST_FIRST(head)        ((head)->lh_first)
-@@ -98,7 +99,9 @@ rsa_key_dup(struct rsa_key *key)
- 		return NULL;
- 
- 	if (key->rsa) {
--		new->rsa = key->rsa->d != NULL ? RSAPrivateKey_dup(key->rsa) : RSAPublicKey_dup(key->rsa);
-+		const BIGNUM *d;
-+		RSA_get0_key(key->rsa, NULL, NULL, &d);
-+		new->rsa = (d != NULL ? RSAPrivateKey_dup(key->rsa) : RSAPublicKey_dup(key->rsa));
- 		if (new->rsa == NULL)
- 			goto dup_error;
- 	}
diff --git a/main/ipsec-tools/musl-cdefs.patch b/main/ipsec-tools/musl-cdefs.patch
deleted file mode 100644
index 234433f61d2..00000000000
--- a/main/ipsec-tools/musl-cdefs.patch
+++ /dev/null
@@ -1,156 +0,0 @@
---- ipsec-tools-0.8.1.orig/src/libipsec/ipsec_strerror.h
-+++ ipsec-tools-0.8.1/src/libipsec/ipsec_strerror.h
-@@ -34,6 +34,8 @@
- #ifndef _IPSEC_STRERROR_H
- #define _IPSEC_STRERROR_H
- 
-+#include <sys/cdefs.h>
-+
- extern int __ipsec_errcode;
- extern void __ipsec_set_strerror __P((const char *));
- 
---- ipsec-tools-0.8.1.orig/src/libipsec/libpfkey.h
-+++ ipsec-tools-0.8.1/src/libipsec/libpfkey.h
-@@ -34,6 +34,8 @@
- #ifndef _LIBPFKEY_H
- #define _LIBPFKEY_H
- 
-+#include <sys/cdefs.h>
-+
- #ifndef KAME_LIBPFKEY_H
- #define KAME_LIBPFKEY_H
- 
---- ipsec-tools-0.8.1.orig/src/racoon/cftoken.l
-+++ ipsec-tools-0.8.1/src/racoon/cftoken.l
-@@ -77,6 +77,10 @@
- 
- #include "cfparse.h"
- 
-+#ifndef GLOB_TILDE
-+#define GLOB_TILDE 0
-+#endif
-+
- int yyerrorcount = 0;
- 
- #if defined(YIPS_DEBUG)
---- ipsec-tools-0.8.1.orig/src/racoon/logger.h
-+++ ipsec-tools-0.8.1/src/racoon/logger.h
-@@ -34,6 +34,8 @@
- #ifndef _LOGGER_H
- #define _LOGGER_H
- 
-+#include <sys/cdefs.h>
-+
- struct log {
- 	int head;
- 	int siz;
---- ipsec-tools-0.8.1.orig/src/racoon/misc.h
-+++ ipsec-tools-0.8.1/src/racoon/misc.h
-@@ -34,6 +34,8 @@
- #ifndef _MISC_H
- #define _MISC_H
- 
-+#include <sys/cdefs.h>
-+
- #define BIT2STR(b) bit2str(b, sizeof(b)<<3)
- 
- #ifdef HAVE_FUNC_MACRO
---- ipsec-tools-0.8.1.orig/src/racoon/missing/crypto/sha2/sha2.h
-+++ ipsec-tools-0.8.1/src/racoon/missing/crypto/sha2/sha2.h
-@@ -40,6 +40,8 @@
- #ifndef __SHA2_H__
- #define __SHA2_H__
- 
-+#include <sys/cdefs.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
---- ipsec-tools-0.8.1.orig/src/racoon/netdb_dnssec.h
-+++ ipsec-tools-0.8.1/src/racoon/netdb_dnssec.h
-@@ -34,6 +34,8 @@
- #ifndef _NETDB_DNSSEC_H
- #define _NETDB_DNSSEC_H
- 
-+#include <sys/cdefs.h>
-+
- #ifndef T_CERT
- #define T_CERT	37		/* defined by RFC2538 section 2 */
- #endif
---- ipsec-tools-0.8.1.orig/src/racoon/plog.h
-+++ ipsec-tools-0.8.1/src/racoon/plog.h
-@@ -34,6 +34,7 @@
- #ifndef _PLOG_H
- #define _PLOG_H
- 
-+#include <sys/cdefs.h>
- #ifdef HAVE_STDARG_H
- #include <stdarg.h>
- #else
---- ipsec-tools-0.8.1.orig/src/racoon/str2val.h
-+++ ipsec-tools-0.8.1/src/racoon/str2val.h
-@@ -34,6 +34,8 @@
- #ifndef _STR2VAL_H
- #define _STR2VAL_H
- 
-+#include <sys/cdefs.h>
-+
- extern caddr_t val2str __P((const char *, size_t));
- extern char *str2val __P((const char *, int, size_t *));
- 
---- ipsec-tools-0.8.1.orig/src/racoon/vmbuf.h
-+++ ipsec-tools-0.8.1/src/racoon/vmbuf.h
-@@ -34,6 +34,8 @@
- #ifndef _VMBUF_H
- #define _VMBUF_H
- 
-+#include <sys/cdefs.h>
-+
- /*
-  *	bp      v
-  *	v       v
---- ipsec-tools-0.8.1.orig/src/setkey/extern.h
-+++ ipsec-tools-0.8.1/src/setkey/extern.h
-@@ -1,6 +1,6 @@
- /*	$NetBSD: extern.h,v 1.5 2009/03/06 11:45:03 tteras Exp $	*/
- 
--
-+#include <sys/cdefs.h>
- 
- void parse_init __P((void));
- int parse __P((FILE **));
---- ipsec-tools-0.8.1.orig/src/racoon/backupsa.c
-+++ ipsec-tools-0.8.1/src/racoon/backupsa.c
-@@ -276,9 +276,9 @@
- 		GETNEXTNUM(sa_args.a_keylen, strtoul);
- 		GETNEXTNUM(sa_args.flags, strtoul);
- 		GETNEXTNUM(sa_args.l_alloc, strtoul);
--		GETNEXTNUM(sa_args.l_bytes, strtouq);
--		GETNEXTNUM(sa_args.l_addtime, strtouq);
--		GETNEXTNUM(sa_args.l_usetime, strtouq);
-+		GETNEXTNUM(sa_args.l_bytes, strtoull);
-+		GETNEXTNUM(sa_args.l_addtime, strtoull);
-+		GETNEXTNUM(sa_args.l_usetime, strtoull);
- 		GETNEXTNUM(sa_args.seq, strtoul);
- 
- #undef GETNEXTNUM
---- ipsec-tools-0.8.2.orig/src/setkey/setkey.c
-+++ ipsec-tools-0.8.2/src/setkey/setkey.c
-@@ -40,7 +40,6 @@
- #include <sys/socket.h>
- #include <sys/time.h>
- #include <sys/stat.h>
--#include <sys/sysctl.h>
- #include <err.h>
- #include <netinet/in.h>
- #include <net/pfkeyv2.h>
---- ipsec-tools-0.8.2.orig/src/racoon/pfkey.c
-+++ ipsec-tools-0.8.2/src/racoon/pfkey.c
-@@ -59,7 +59,6 @@
- #include <sys/param.h>
- #include <sys/socket.h>
- #include <sys/queue.h>
--#include <sys/sysctl.h>
- 
- #include <net/route.h>
- #include <net/pfkeyv2.h>
diff --git a/main/ipsec-tools/racoon.confd b/main/ipsec-tools/racoon.confd
deleted file mode 100644
index bf9926c5b58..00000000000
--- a/main/ipsec-tools/racoon.confd
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/files/racoon.conf.d,v 1.3 2004/07/14 23:29:57 agriffis Exp $
-
-# Config file for /etc/init.d/racoon
-
-# See the manual pages for racoon or run `racoon --help`
-# for valid command-line options
-
-RACOON_OPTS="-4"
-SETKEY_OPTS=""
-
-RACOON_CONF="/etc/racoon/racoon.conf"
-RACOON_PSK_FILE="/etc/racoon/psk.txt"
-SETKEY_CONF="/etc/ipsec.conf"
-
-# Comment or remove the following if you don't want the policy tables
-# to be flushed when racoon is stopped.
-
-RACOON_RESET_TABLES="true"
diff --git a/main/ipsec-tools/racoon.initd b/main/ipsec-tools/racoon.initd
deleted file mode 100644
index a41671aa016..00000000000
--- a/main/ipsec-tools/racoon.initd
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	before netmount
-	use net
-	after firewall ntp-client
-	provide ipsec
-}
-
-checkconfig() {
-	if [ ! -e ${SETKEY_CONF} ] ; then
-		eerror "You need to configure setkey before starting racoon."
-		return 1
-	fi
-	if [ ! -e ${RACOON_CONF} ] ; then
-		eerror "You need a configuration file to start racoon."
-		return 1
-	fi
-	if [ ! -z ${RACOON_PSK_FILE} ] ; then
-		if [ ! -f ${RACOON_PSK_FILE} ] ; then
-			eerror "PSK file not found as specified."
-			eerror "Set RACOON_PSK_FILE in /etc/conf.d/racoon."
-			return 1
-		fi
-		case "`ls -Lldn ${RACOON_PSK_FILE}`" in
-			-r--------*)
-				;;
-			*)
-				eerror "Your defined PSK file should be mode 400 for security!"
-				return 1
-				;;
-		esac
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	einfo "Loading ipsec policies from ${SETKEY_CONF}."
-	/usr/sbin/setkey ${SETKEY_OPTS} -f ${SETKEY_CONF}
-	if [ $? -eq 1 ] ; then
-		eerror "Error while loading ipsec policies"
-	fi
-	ebegin "Starting racoon"
-	start-stop-daemon -S -x /usr/sbin/racoon -- -f ${RACOON_CONF} ${RACOON_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping racoon"
-	start-stop-daemon -K -p /var/run/racoon.pid
-	eend $?
-	if [ -n "${RACOON_RESET_TABLES}" ]; then
-		ebegin "Flushing policy entries"
-		/usr/sbin/setkey -F
-		/usr/sbin/setkey -FP
-		eend $?
-	fi
-}
diff --git a/main/ipset/APKBUILD b/main/ipset/APKBUILD
index 2e5cdc8927d..97e89480c3b 100644
--- a/main/ipset/APKBUILD
+++ b/main/ipset/APKBUILD
@@ -1,17 +1,27 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
 pkgname=ipset
-pkgver=7.6
-pkgrel=0
+pkgver=7.21
+pkgrel=2
 pkgdesc="Manage Linux IP sets"
-url="http://ipset.netfilter.org/"
+url="https://ipset.netfilter.org/"
 arch="all"
 license="GPL-2.0-only"
 depends_dev="libmnl-dev"
 makedepends="$depends_dev automake autoconf libtool linux-headers"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://ipset.netfilter.org/ipset-$pkgver.tar.bz2
-	ipset.initd"
+checkdepends="bash iptables"
+options="!check" # Tests require privileges to load kernel modules
+subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
+source="https://ipset.netfilter.org/ipset-$pkgver.tar.bz2
+	ipset.initd
+
+	basename-include.patch
+	"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
 	./configure \
@@ -22,13 +32,20 @@ build() {
 	make
 }
 
+check() {
+	make tests
+}
+
 package() {
-	make install DESTDIR=$pkgdir
+	make install DESTDIR="$pkgdir"
 
 	mkdir -p "$pkgdir/etc/init.d" \
 		"$pkgdir/etc/ipset.d"
-	install -m 755 "$startdir/ipset.initd" "$pkgdir/etc/init.d/ipset"
+	install -m 755 "$srcdir/ipset.initd" "$pkgdir/etc/init.d/ipset"
 }
 
-sha512sums="c4d9c65895335dec8f855fca6c940d2ee19e7b8d2292325778a1608e795e2e35caa787cbcdeb8e2877f3695c641ac348b23ac43f73bdc1a8242e8d04f4944084  ipset-7.6.tar.bz2
-c7d3344ce879ff3b21f9e30a00d49a41cbd68172aec1a933a4b501dded54e3c57615386850901da22c652a34bcbe39caac86a3a0447da24bae29b40632153239  ipset.initd"
+sha512sums="
+175c6516c2091c57738a0324678d8d016e4d7f18fa03cb0dcc502391cac4caf4db1e757f61ad2fe312c1dbe431ec9cfabbc8e15a64a94ebd2fa903155b27c88f  ipset-7.21.tar.bz2
+4c4492258a39b94ef7cdf193d73060af28bef05aad305743f9db698f08d4e89352788e72ef98fad7c099aef0937f333e0b84a5df0ae27740fa2626654576f89c  ipset.initd
+acbcee9b83da3804746eb7af451a13ab62eaf679056e8feedd72b703f42e20ec9bdc30386a5c206f302d9332c3ebfafbce0ce69ba518d337c72d892359dace9b  basename-include.patch
+"
diff --git a/main/ipset/basename-include.patch b/main/ipset/basename-include.patch
new file mode 100644
index 00000000000..3ce5cd4e733
--- /dev/null
+++ b/main/ipset/basename-include.patch
@@ -0,0 +1,12 @@
+what
+
+https://gitlab.alpinelinux.org/alpine/aports/-/issues/15911
+
+diff --git a/src/ipset.c b/src/ipset.c
+index 162f477..5eca659 100644
+--- a/src/ipset.c
++++ b/src/ipset.c
+@@ -13,2 +13,3 @@
+ #include <string.h>			/* strcmp */
++#include <libgen.h>			/* basename */
+ 
diff --git a/main/ipset/ipset.initd b/main/ipset/ipset.initd
index 83cfee920fa..6e2838f7382 100644
--- a/main/ipset/ipset.initd
+++ b/main/ipset/ipset.initd
@@ -10,19 +10,31 @@ description_reload="Load firewall IP sets"
 extra_started_commands="save reload"
 
 IPSET=/usr/sbin/ipset
-DIR=/etc/ipset.d
 STATUS=0
 
+if [ "${RC_SVCNAME#*.}" != "$RC_SVCNAME" ] ; then
+	: ${netns:="${RC_SVCNAME#*.}"}
+fi
+
+# Add ip netns if configured to run in a netns namespace
+if [ -n "$netns" ]; then
+	test -e /run/netns/$netns || ip netns add $netns
+	IPSET="ip netns exec $netns $IPSET"
+	: ${ipset_def_dir:=/etc/ipset.$netns.d}
+else
+	: ${ipset_def_dir:=/etc/ipset.d}
+fi
+
 ipset() {
 	$IPSET $* || STATUS=1
 }
 
 set_files() {
-	(cd $DIR && ls)
+	(cd $ipset_def_dir && ls)
 }
 
 set_file() {
-	grep -v ^# $DIR/$1
+	grep -v ^# $ipset_def_dir/$1
 }
 
 set_exists() {
@@ -66,7 +78,7 @@ save() {
 	ipset save | while read cmd; do
 		set -- $cmd
 		local action=$1
-		local file=$DIR/$2
+		local file=$ipset_def_dir/$2
 		shift 2
 		if [ "$action" = create ]; then
 			echo $* > $file
@@ -76,7 +88,7 @@ save() {
 	done
 
 	for name in $(set_files); do
-		set_exists $name || rm -f $DIR/$name
+		set_exists $name || rm -f $ipset_def_dir/$name
 	done
 
 	eend $STATUS
@@ -113,11 +125,11 @@ reload() {
 	) | ipset restore
 
 	for name in $(set_lists); do
-		[ -f $DIR/$name ] || echo destroy $name
+		[ -f $ipset_def_dir/$name ] || echo destroy $name
 	done | ipset restore
 
 	for name in $(sets); do
-		[ -f $DIR/$name ] || echo destroy $name
+		[ -f $ipset_def_dir/$name ] || echo destroy $name
 	done | ipset restore
 
 	eend $STATUS
diff --git a/main/iptables/APKBUILD b/main/iptables/APKBUILD
index d354d52443d..40e17277045 100644
--- a/main/iptables/APKBUILD
+++ b/main/iptables/APKBUILD
@@ -1,27 +1,42 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-
 pkgname=iptables
-pkgver=1.8.4
-pkgrel=1
+pkgver=1.8.10
+pkgrel=3
 pkgdesc="Linux kernel firewall, NAT and packet mangling tools"
 url="https://www.netfilter.org/projects/iptables/index.html"
 arch="all"
 license="GPL-2.0-or-later"
 depends_dev="linux-headers"
+install="$pkgname.post-upgrade"
 makedepends="$depends_dev libnftnl-dev bison flex autoconf automake"
-subpackages="ip6tables $pkgname-doc $pkgname-dev $pkgname-openrc ip6tables-openrc:ip6tables_openrc"
-provides="ebtables" # for backards compat
-replaces="ebtables"
-source="https://www.netfilter.org/projects/iptables/files/iptables-$pkgver.tar.bz2
+subpackages="
+	iptables-legacy
+	libip4tc
+	libip6tc
+	libipq
+	libxtables
+	$pkgname-doc
+	$pkgname-dev
+	$pkgname-openrc
+	"
+provides="ip6tables=$pkgver-r$pkgrel ebtables=$pkgver-r$pkgrel" # for backards compat
+replaces="ip6tables ebtables"
+source="https://www.netfilter.org/projects/iptables/files/iptables-$pkgver.tar.xz
+	use-sh-iptables-apply.patch
 	iptables.initd
 	iptables.confd
 	ip6tables.confd
 	ebtables.initd
 	ebtables.confd
 	"
+options="!check"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
-	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
 	./configure \
 		--build="$CBUILD" \
 		--host="$CHOST" \
@@ -42,45 +57,76 @@ build() {
 }
 
 package() {
-	make -j1 install DESTDIR="$pkgdir"
+	make install DESTDIR="$pkgdir"
 
-	mkdir -p "$pkgdir"/usr/include/libiptc \
-		"$pkgdir"/usr/lib \
+	mkdir -p "$pkgdir"/usr/lib \
 		"$pkgdir"/var/lib/iptables \
+		"$pkgdir"/var/lib/ip6tables \
 		"$pkgdir"/etc/iptables
 
-	install -m644 include/iptables.h include/ip6tables.h \
-		"$pkgdir"/usr/include/
-	install include/libiptc/*.h "$pkgdir"/usr/include/libiptc/
+	install -Dm644 include/iptables.h include/ip6tables.h \
+		-t "$pkgdir"/usr/include/
+	install -Dm644 include/libiptc/*.h -t "$pkgdir"/usr/include/libiptc/
 
 	install -D -m755 "$srcdir"/iptables.initd "$pkgdir"/etc/init.d/iptables
 	install -D -m644 "$srcdir"/iptables.confd "$pkgdir"/etc/conf.d/iptables
+	install -D -m755 "$srcdir"/iptables.initd "$pkgdir"/etc/init.d/ip6tables
+	install -D -m644 "$srcdir"/ip6tables.confd "$pkgdir"/etc/conf.d/ip6tables
 	install -D -m755 "$srcdir"/ebtables.initd "$pkgdir"/etc/init.d/ebtables
 	install -D -m644 "$srcdir"/ebtables.confd "$pkgdir"/etc/conf.d/ebtables
+
+	ln -sfv xtables-nft-multi "$pkgdir"/sbin/iptables
+	ln -sfv xtables-nft-multi "$pkgdir"/sbin/iptables-save
+	ln -sfv xtables-nft-multi "$pkgdir"/sbin/iptables-restore
+	ln -sfv xtables-nft-multi "$pkgdir"/sbin/ip6tables
+	ln -sfv xtables-nft-multi "$pkgdir"/sbin/ip6tables-save
+	ln -sfv xtables-nft-multi "$pkgdir"/sbin/ip6tables-restore
 }
 
-ip6tables() {
-	mkdir -p "$subpkgdir"
-	cd "$subpkgdir"
+legacy() {
+	pkgdesc="$pkgdesc (legacy xtables-legacy binaries)"
 
-	mkdir -p sbin \
-		var/lib/ip6tables \
-		usr/lib/xtables
+	amove \
+		sbin/*legacy* \
+		usr/bin/iptables-xml
+}
+
+libip4tc() {
+	pkgdesc="$pkgdesc (legacy libip4tc library)"
 
-	mv "$pkgdir"/sbin/ip6* sbin/
-	mv "$pkgdir"/usr/lib/xtables/libip6* usr/lib/xtables/
+	amove usr/lib/libip4tc.so.*
 }
 
-ip6tables_openrc() {
-	default_openrc
+libip6tc() {
+	pkgdesc="$pkgdesc (legacy libip6tc library)"
 
-	install -D -m755 "$srcdir"/iptables.initd "$subpkgdir"/etc/init.d/ip6tables
-	install -D -m644 "$srcdir"/ip6tables.confd "$subpkgdir"/etc/conf.d/ip6tables
+	amove usr/lib/libip6tc.so.*
+}
+
+libipq() {
+	pkgdesc="$pkgdesc (legacy libipq library)"
+
+	amove usr/lib/libipq.so.*
+}
+
+libxtables() {
+	pkgdesc="$pkgdesc (xtables library)"
+
+	amove usr/lib/libxtables.so.*
+}
+
+openrc() {
+	default_openrc
+	provides="ip6tables-openrc=$pkgver-r$pkgrel"
+	replaces="ip6tables-openrc"
 }
 
-sha512sums="a7faaab58608ffaa51e26e8056551c0e91a49187439d30fcf5cce2800274cc3c0515db6cfba0f4c85613fb80779cf96089b8915db0e89161e9980a6384faebdb  iptables-1.8.4.tar.bz2
-059b3bd8dd7dec60060ec5eb1e639fe8203207629f3a7dd4fdbe5ebca3f7e9b80df5592ebb27542e31830fd15a53cffac5772567053c104dfccf9b78613a31a1  iptables.initd
+sha512sums="
+71e6ed2260859157d61981a4fe5039dc9e8d7da885a626a4b5dae8164c509a9d9f874286b9468bb6a462d6e259d4d32d5967777ecefdd8a293011ae80c00f153  iptables-1.8.10.tar.xz
+ac78898c2acbe66ed8d32a06f41ff08cde7c22c3df6dfec6bc89a912d2cef2bde730de19d25a5407886d567cb0972a0b7bde7e6b18a34c4511495b4dad3b90ad  use-sh-iptables-apply.patch
+a9d0bccfdacfad65182abe5f4bba18ae0f538c1d476a8fc6f33e228d9b0ee6caf29c37081d070c2f9e411e9057309df5e3300618314b461dac529bfc43d89bb0  iptables.initd
 cb7fecd5cab2c78bd3f215a41f39ec11c37eb360efbe83982378a0e647e0aa9dc0b7ec915a5b5081aa2f7747464787e69404aa15ba15a063c32cb8fb7dd13d1e  iptables.confd
 0897a7a22f8b700f7f1f5c355ad6cbf39740e44d6c962af99e479978d8a2d556ca7fe4e31f238829046b4a871ce0b5fd52e2544f1361d15dd1ea3e33992646c4  ip6tables.confd
-c8fccc96610ddc24a3a0c7c2c9f2460b87e582424e338beeb20d77726b27324f89906ef853680e62912ed3544c967469870d78aa6e39de11efda072dd8a4a836  ebtables.initd
-b24afd1f5c2f200a1eec6ed7fd63500237dc168bfb9cc1297ffc288d12d30224a1ee84a7f61663daf408c42457dd7deac7594a23e448218806798294e9a1018d  ebtables.confd"
+6f3a7e3f6cedff9e73aa0fb959c92a93b2c484ae3c9b48d9522d1ee1e5ee4e2af12be8c3d73b932fe7f5716b5dd1c5cdfde729a808c0ae9a7dbd4ceec93e5a32  ebtables.initd
+1623109d7b564b817904e35b6c6964ce84fe123a8ae1b656944648a39cfef719431cfad313b48eb36ae53a0d1a6b388a5caec1a990448d02f77e5d12b1f7ee9d  ebtables.confd
+"
diff --git a/main/iptables/ebtables.confd b/main/iptables/ebtables.confd
index db46ffb5879..0b48cb4150a 100644
--- a/main/iptables/ebtables.confd
+++ b/main/iptables/ebtables.confd
@@ -12,4 +12,4 @@ SAVE_ON_STOP="yes"
 
 # Tables to be saved and restored. If you have built ebtables as modules, you
 # may leave it blank. Otherwise, you MUST define which to control.
-TABLE_NAMES="filter nat broute"
+TABLE_NAMES="filter nat"
diff --git a/main/iptables/ebtables.initd b/main/iptables/ebtables.initd
index c3e8ba92cb4..51a296d1795 100644
--- a/main/iptables/ebtables.initd
+++ b/main/iptables/ebtables.initd
@@ -13,6 +13,12 @@ if [ "$ebtables_tables" == "" ] ; then
 	ebtables_tables=${TABLE_NAMES}
 fi
 
+# Add ip netns if configured to run in a netns namespace
+if [ -n "$netns" ]; then
+	test -e /run/netns/$netns || ip netns add $netns
+	ebtables_bin="ip netns exec $netns $ebtables_bin"
+fi
+
 depend() {
 	before net
 	use logger
@@ -77,9 +83,10 @@ reload() {
 
 save() {
 	ebegin "Saving ebtables state"
-	touch "${ebtables_save}"
-	chmod 0600 "${ebtables_save}"
-	${ebtables_bin}-save ${ebtables_tables} ${SAVE_RESTORE_OPTIONS} > "${ebtables_save}"
+	checkpath -Fm 0600 "${ebtables_save}"
+	for a in ${ebtables_tables} ; do
+		${ebtables_bin}-save -t ${a} ${SAVE_RESTORE_OPTIONS} >> "${ebtables_save}"
+	done
 	eend $?
 }
 
diff --git a/main/iptables/iptables.initd b/main/iptables/iptables.initd
index 98b52d0cdda..e67e12080db 100644
--- a/main/iptables/iptables.initd
+++ b/main/iptables/iptables.initd
@@ -8,25 +8,35 @@ description_save="Save firewall state"
 description_panic="Drop all packets"
 description_reload="Reload configuration"
 
-extra_commands="save panic"
+extra_commands="check save panic"
 extra_started_commands="reload"
 
 iptables_name=${SVCNAME}
-if [ "${iptables_name}" != "iptables" -a "${iptables_name}" != "ip6tables" ] ; then
-	iptables_name="iptables"
-fi
+case "$iptables_name" in
+	iptables|ip6tables) ;;
+	*) iptables_name="iptables" ;;
+esac
 
 iptables_bin="/sbin/${iptables_name}"
 case ${iptables_name} in
-	iptables)  iptables_proc="/proc/net/ip_tables_names"
-	           iptables_save=${IPTABLES_SAVE}
-		   sysctl_ipfwd=net.ipv4.ip_forward;;
-	ip6tables) iptables_proc="/proc/net/ip6_tables_names"
-	           iptables_save=${IP6TABLES_SAVE}
-		   sysctl_ipfwd=net.ipv6.conf.all.forwarding;;
+	iptables)
+		#shellcheck disable=SC2153
+		iptables_save="${IPTABLES_SAVE}"
+		sysctl_ipfwd=net.ipv4.ip_forward
+		;;
+	ip6tables)
+		iptables_save="${IP6TABLES_SAVE}"
+		sysctl_ipfwd=net.ipv6.conf.all.forwarding
+		;;
 esac
 
+# Add ip netns if configured to run in a netns namespace
+if [ -n "$netns" ]; then
+	iptables_bin="ip netns exec $netns $iptables_bin"
+fi
+
 depend() {
+	need localmount # in case IPTABLES_SAVE=/var/...
 	before net
 	after sysctl
 	use logger
@@ -34,7 +44,7 @@ depend() {
 }
 
 set_table_policy() {
-	local chains table=$1 policy=$2
+	local chains table="$1" policy="$2"
 	case ${table} in
 		nat)    chains="PREROUTING POSTROUTING OUTPUT";;
 		mangle) chains="PREROUTING INPUT FORWARD OUTPUT POSTROUTING";;
@@ -43,20 +53,17 @@ set_table_policy() {
 	esac
 	local chain
 	for chain in ${chains} ; do
-		${iptables_bin} -t ${table} -P ${chain} ${policy}
+		${iptables_bin} --wait 5 --table "${table}" --policy "${chain}" "${policy}"
 	done
 }
 
-checkkernel() {
-	if [ ! -e ${iptables_proc} ] ; then
-		eerror "Your kernel lacks ${iptables_name} support, please load"
-		eerror "appropriate modules and try again."
-		return 1
-	fi
-	return 0
+get_tables() {
+	# shellcheck disable=SC2086
+	${iptables_bin}-save | /bin/sed -n 's/^\*//p'
 }
+
 checkconfig() {
-	if [ ! -f ${iptables_save} ] ; then
+	if [ ! -f "${iptables_save}" ] ; then
 		eerror "Not starting ${iptables_name}.  First create some rules then run:"
 		eerror "/etc/init.d/${iptables_name} save"
 		return 1
@@ -64,14 +71,21 @@ checkconfig() {
 	return 0
 }
 
-start() {
+start_pre() {
 	checkconfig || return 1
+	if [ -n "$netns" ] && ! test -e "/run/netns/$netns"; then
+		ip netns add "$netns"
+	fi
+}
+
+start() {
 	ebegin "Loading ${iptables_name} state and starting firewall"
+	# shellcheck disable=SC2086
 	${iptables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"
 	eend $?
 	if yesno "${IPFORWARD}"; then
 		ebegin "Enabling forwarding"
-		/sbin/sysctl -w ${sysctl_ipfwd}=1 > /dev/null
+		/sbin/sysctl -w "${sysctl_ipfwd}=1" > /dev/null
 		eend $?
 	fi
 }
@@ -79,58 +93,79 @@ start() {
 stop() {
 	if yesno "${IPFORWARD}"; then
 		ebegin "Disabling forwarding"
-		/sbin/sysctl -w ${sysctl_ipfwd}=0 > /dev/null
+		/sbin/sysctl -w "${sysctl_ipfwd}=0" > /dev/null
 		eend $?
 	fi
 	if yesno "${SAVE_ON_STOP}"; then
 		save || return 1
 	fi
-	checkkernel || return 1
 	ebegin "Stopping firewall"
 	local a
-	for a in $(cat ${iptables_proc}) ; do
-		set_table_policy $a ACCEPT
+	for a in $(get_tables) ; do
+		set_table_policy "$a" ACCEPT
 
-		${iptables_bin} -F -t $a
-		${iptables_bin} -X -t $a
+		${iptables_bin} --wait 5 --flush --table "$a"
+		${iptables_bin} --wait 5 --delete-chain --table "$a"
 	done
 	eend $?
 }
 
 reload() {
-	checkkernel || return 1
+	checkrules || return 1
 	ebegin "Flushing firewall"
 	local a
-	for a in $(cat ${iptables_proc}) ; do
-		${iptables_bin} -F -t $a
-		${iptables_bin} -X -t $a
+	for a in $(get_tables) ; do
+		${iptables_bin} --wait 5 --flush --table "$a"
+		${iptables_bin} --wait 5 --delete-chain --table "$a"
 	done
 	eend $?
 
 	start
 }
 
+checkrules() {
+	ebegin "Checking rules"
+	# shellcheck disable=SC2086
+	${iptables_bin}-restore --test ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"
+	eend $?
+}
+
+check() {
+	# Short name for users of init.d script.
+	checkrules
+}
+
 save() {
 	ebegin "Saving ${iptables_name} state"
-	touch "${iptables_save}"
-	chmod 0600 "${iptables_save}"
-	${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}"
-	eend $?
+	checkpath -fm 0600 "${iptables_save}"
+	local exitcode tmp
+
+	tmp="$(mktemp)"
+	# shellcheck disable=SC2086
+	${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${tmp}"
+	exitcode=$?
+	if [ "$exitcode" -eq 0 ]; then
+		# command succeeded, so overwrite
+		mv "${tmp}" "${iptables_save}"
+	else
+		ewarn "${iptables_bin}-save failed!"
+		rm -f "${tmp}"
+	fi
+	eend $exitcode
 }
 
 panic() {
-	checkkernel || return 1
-	if service_started ${iptables_name}; then
-		rc-service ${iptables_name} stop
+	if service_started "${iptables_name}"; then
+		rc-service "${iptables_name}" stop
 	fi
 
 	local a
 	ebegin "Dropping all packets"
-	for a in $(cat ${iptables_proc}) ; do
-		${iptables_bin} -F -t $a
-		${iptables_bin} -X -t $a
+	for a in $(get_tables) ; do
+		${iptables_bin} --wait 5 --flush --table "$a"
+		${iptables_bin} --wait 5 --delete-chain --table "$a"
 
-		set_table_policy $a DROP
+		set_table_policy "$a" DROP
 	done
 	eend $?
 }
diff --git a/main/iptables/iptables.post-upgrade b/main/iptables/iptables.post-upgrade
new file mode 100644
index 00000000000..89c13667d00
--- /dev/null
+++ b/main/iptables/iptables.post-upgrade
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+ver_old=$2
+
+if [ "$(apk version -t "$ver_old" '1.8.9-r4')" = '<' ]; then
+	cat >&2 <<-EOF
+	*
+	* the "iptables" commands now point to xtables-nft-multi
+	* instead of xtables-legacy-multi. this means that by default,
+	* the kernel nftables backend is used instead of the iptables one.
+	* 
+	* note that to keep working with your current loaded ruleset (if you want to
+	* make changes before rebooting, or save your rules), you have to install
+	* iptables-legacy. to save the rules, use iptables-legacy-save/ip6tables-legacy-save
+	* from that package (to where the rules are normally saved, IPTABLES_SAVE from
+	* /etc/conf.d/iptables / /etc/conf.d/ip6tables)
+	*
+	* because mixing backends is not supported, you should reboot your system.
+	*
+	EOF
+fi
diff --git a/main/iptables/use-sh-iptables-apply.patch b/main/iptables/use-sh-iptables-apply.patch
new file mode 100644
index 00000000000..b31fc948c4e
--- /dev/null
+++ b/main/iptables/use-sh-iptables-apply.patch
@@ -0,0 +1,39 @@
+From: Simon Frankenberger <simon-alpine@fraho.eu>
+
+make iptables-apply use posix sh
+
+--- a/iptables/iptables-apply
++++ b/iptables/iptables-apply
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ # iptables-apply -- a safer way to update iptables remotely
+ #
+ # Usage:
+@@ -110,7 +110,7 @@
+ }
+ 
+ function checkcommands() {
+-	for cmd in "${COMMANDS[@]}"; do
++	for cmd in ${COMMANDS}; do
+ 		if ! command -v "$cmd" >/dev/null; then
+ 			echo "Error: needed command not found: $cmd" >&2
+ 			exit 127
+@@ -184,7 +184,7 @@
+ 		fi
+ 
+ 		# Needed commands
+-		COMMANDS=(mktemp "$SAVE" "$RESTORE" "$RUNCMD")
++		COMMANDS="mktemp $SAVE $RESTORE $RUNCMD"
+ 		checkcommands
+ 		;;
+ 	(*)
+@@ -196,7 +196,7 @@
+ 		fi
+ 
+ 		# Needed commands
+-		COMMANDS=(mktemp "$SAVE" "$RESTORE")
++		COMMANDS="mktemp $SAVE $RESTORE"
+ 		checkcommands
+ 		;;
+ esac
diff --git a/main/iptraf-ng/APKBUILD b/main/iptraf-ng/APKBUILD
deleted file mode 100644
index b52fe0ecf60..00000000000
--- a/main/iptraf-ng/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
-pkgname=iptraf-ng
-pkgver=1.1.4
-pkgrel=4
-pkgdesc="An IP Network Monitoring tool"
-url="https://fedorahosted.org/iptraf-ng/"
-arch="all"
-license="GPL-2.0"
-depends=""
-makedepends="ncurses-dev linux-headers"
-install=""
-subpackages="$pkgname-doc"
-source="http://pkgs.fedoraproject.org/repo/pkgs/iptraf-ng/$pkgname-$pkgver.tar.gz/de27cfeeede96e2acfb0edc8439b034a/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir"/iptraf-ng-$pkgver
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	CFLAGS="$CFLAGS -D_GNU_SOURCE -std=gnu99" ./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-sha512sums="8cafb0000cec75eb4071156a9e9350ffe6de99cb6386e8f50d05337113872ee50082a30009d85faa02d83633a8e727039791332d600654321b95ca6cfc881774  iptraf-ng-1.1.4.tar.gz"
diff --git a/main/iputils/APKBUILD b/main/iputils/APKBUILD
index 670046e94e6..1526cd0ecb6 100644
--- a/main/iputils/APKBUILD
+++ b/main/iputils/APKBUILD
@@ -1,49 +1,80 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=iputils
-pkgver=20190709
+pkgver=20240117
 pkgrel=0
-pkgdesc="IP Configuration Utilities (and Ping)"
+pkgdesc="IP Configuration Utilities"
 url="https://github.com/iputils/iputils/"
 arch="all"
-license="BSD-3-Clause GPL-2.0-or-later"
-makedepends="libcap-dev openssl-dev meson"
+license="BSD-3-Clause AND GPL-2.0-or-later"
 replaces="bbsuid"
-source="https://github.com/iputils/$pkgname/archive/s$pkgver.tar.gz"
-options="!check suid"
-builddir="$srcdir/$pkgname-s$pkgver"
+makedepends="
+	libcap-dev
+	meson
+	"
+subpackages="
+	iputils-arping
+	iputils-clockdiff
+	iputils-ping
+	iputils-tracepath
+	"
+source="iputils-$pkgver.tar.xz::https://github.com/iputils/iputils/releases/download/$pkgver/iputils-$pkgver.tar.xz"
+# checks need suid/setcap'd binaries
+# ping is suid
+options="suid !check"
 
 build() {
-	cd "$builddir"
-
-	meson \
-		--buildtype=plain \
-		--prefix="/usr" \
-		--sbindir="bin" \
+	abuild-meson \
+		-Db_lto=true \
 		-DNO_SETCAP_OR_SUID=true \
-		-DBUILD_RARPD=true \
-		-DBUILD_TRACEROUTE6=true \
 		-DBUILD_MANS=false \
 		-DUSE_IDN=false \
 		-DUSE_GETTEXT=false \
-		"build"
-	ninja -C "build"
+		. output
+	meson compile -C output
+}
+
+check() {
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	local name
-	cd "$builddir"/build
+	depends="
+		iputils-arping=$pkgver-r$pkgrel
+		iputils-clockdiff=$pkgver-r$pkgrel
+		iputils-ping=$pkgver-r$pkgrel
+		iputils-tracepath=$pkgver-r$pkgrel
+		"
 
-	for name in arping clockdiff rarpd rdisc tftpd tracepath; do
-		install -D -m755 $name "$pkgdir"/usr/sbin/$name
-	done
-	install -D -m755 ninfod/ninfod "$pkgdir"/usr/sbin/ninfod
+	install -Dm4755 output/ping/ping "$pkgdir"/bin/ping
 
-	for name in ping traceroute6; do
-		install -D -m4755 $name "$pkgdir"/bin/$name
+	for name in arping clockdiff tracepath; do
+		install -Dm755 output/$name "$pkgdir"/usr/sbin/$name
 	done
 
 	ln -s tracepath "$pkgdir"/usr/sbin/tracepath6
 	ln -s ping "$pkgdir"/bin/ping6
 }
 
-sha512sums="5db18ac49fa46ed810da4d508e78f4baf2d5c07e7f923eb49d005ad8745743d8861e5788b34a7e37fb7261cee7ddfb768b737eee9d200502ea53537142cac6b5  s20190709.tar.gz"
+arping() {
+	pkgdesc="$pkgdesc (arping utility)"
+	amove usr/sbin/arping
+}
+
+clockdiff() {
+	pkgdesc="$pkgdesc (clockdiff utility)"
+	amove usr/sbin/clockdiff
+}
+
+ping() {
+	pkgdesc="$pkgdesc (ping utility)"
+	amove bin/ping*
+}
+
+tracepath() {
+	pkgdesc="$pkgdesc (tracepath utility)"
+	amove usr/sbin/tracepath*
+}
+
+sha512sums="
+c45822c5641f194dc07cba919c13a4b7a79d050bb53957a894ebb6ccc1f71bac1f26489e13d18ef1ce235982f5fa1824e677f95037a0f5cce6bcb94be4c2e2de  iputils-20240117.tar.xz
+"
diff --git a/main/ipvsadm/APKBUILD b/main/ipvsadm/APKBUILD
index afba9e043ba..13a159c30da 100644
--- a/main/ipvsadm/APKBUILD
+++ b/main/ipvsadm/APKBUILD
@@ -2,16 +2,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ipvsadm
 pkgver=1.31
-pkgrel=0
+pkgrel=3
 pkgdesc="The IP Virtual Server administration utility"
 url="http://www.linuxvirtualserver.org/software/ipvs.html"
 arch="all"
 license="GPL-2.0-or-later"
 makedepends="libnl3-dev popt-dev linux-headers"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
 source="https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-$pkgver.tar.xz
 	$pkgname.initd
 	"
+options="!check"
 
 build() {
 	make libs && make BUILD_ROOT="$pkgdir" \
diff --git a/main/ircii/APKBUILD b/main/ircii/APKBUILD
deleted file mode 100644
index 7ec1b04d429..00000000000
--- a/main/ircii/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=ircii
-pkgver=20190117
-pkgrel=0
-pkgdesc="Universal IRC for Unix systems"
-url="http://www.eterna.com.au/ircii/"
-arch="all"
-license="BSD"
-depends=""
-makedepends="ncurses-dev openssl-dev"
-install=""
-subpackages="$pkgname-doc"
-source="http://ircii.warped.com/ircii-$pkgver.tar.bz2"
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--with-default-server=irc.freenode.net
-	make
-}
-
-package() {
-	make -j1 DESTDIR="$pkgdir" install
-}
-
-sha512sums="08ca96cd62bae35245b40791c8588752b96136b53e5c9434d0f7976d03841fca80e8c83cf8608aad79c381820b06e00167447c6dc0c6294c6b3dfd91a9fdb6d4  ircii-20190117.tar.bz2"
diff --git a/main/ircservices/APKBUILD b/main/ircservices/APKBUILD
deleted file mode 100644
index 3f8dbdb547c..00000000000
--- a/main/ircservices/APKBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=ircservices
-pkgver=5.1.24
-pkgrel=4
-pkgdesc="Services for IRC (NickServ, ChanServ, MemoServ)"
-url="http://www.ircservices.za.net/"
-arch="all"
-license="GPL-2.0"
-depends=""
-makedepends="perl"
-install=$pkgname.pre-install
-pkgusers="ircservices"
-pkggroups="ircservices"
-subpackages="$pkgname-doc"
-source="http://achurch.org/services/tarballs/ircservices-$pkgver.tar.gz
-		$pkgname.initd"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_builddir"
-	sed -i \
-		-e "s/-m 750/-m 755/" \
-		-e "s/-m 640/-m 644/" \
-		configure
-}
-
-build() {
-	cd "$_builddir"
-	# note: this is not autotools
-	RUNGROUP=ircservices ./configure \
-		-cc "$CC" \
-		-cflags "$CFLAGS" \
-		-bindest /usr/bin \
-		-datdest /var/lib/ircservices \
-		|| return 1
-
-	# build targets one by one as paralell builds breaks
-	make config-check && \
-		make langstrs.h && \
-		make ircservices && \
-		make languages && \
-		make tools
-}
-
-package() {
-	cd "$_builddir"
-#	export INSTALL_PREFIX="$pkgdir"
-	make -j1 \
-		BINDEST="$pkgdir"/usr/bin \
-		DATDEST="$pkgdir"/var/lib/ircservices \
-		install || return 1
-
-	install -d "$pkgdir"/usr/share/man/man8
-	install docs/ircservices.8 "$pkgdir"/usr/share/man/man8/ircservices.8
-	install docs/convert-db.8 \
-		"$pkgdir"/usr/share/man/man8/ircservices-convert-db.8
-
-	# try conform to FHS
-	cd "$pkgdir"
-	install -d etc/ircservices usr/share/ircservices var/log/ircservices
-
-	mv var/lib/ircservices/convert-db usr/bin/ircservices-convert-db
-
-	mv var/lib/ircservices/example-ircservices.conf \
-		etc/ircservices/ircservices.conf
-	ln -s /etc/ircservices/ircservices.conf \
-		var/lib/ircservices/ircservices.conf
-
-	mv var/lib/ircservices/example-modules.conf \
-		etc/ircservices/modules.conf
-	ln -s /etc/ircservices/modules.conf var/lib/ircservices/modules.conf
-
-	mv var/lib/ircservices/languages \
-		var/lib/ircservices/helpfiles \
-		usr/share/ircservices/
-	ln -s /usr/share/ircservices/languages var/lib/ircservices/
-	ln -s /usr/share/ircservices/helpfiles var/lib/ircservices/
-
-	install -Dm755 "$srcdir"/ircservices.initd \
-		etc/init.d/ircservices
-
-	chown ircservices:ircservices var/lib/ircservices \
-		var/log/ircservices
-
-	chown root:ircservices etc/ircservices/ircservices.conf \
-		etc/ircservices/modules.conf
-}
-
-sha512sums="1c1a0ec6d0e0a11071532e07792a15b1910fe108f09e991ca27e0196cfeec72e057a067fa69396b8647aca4ed8097c857eb8e714d8bee2ca6a0c5e27593fb06d  ircservices-5.1.24.tar.gz
-009a60b44deb8e6fd894dbffe25c6c3d6ea9497c6295a3aed5c94e8856b42bfece544c72c6af5214e1f5845964643cc21d3dbdad7baf6af183796a54c9f94f9a  ircservices.initd"
diff --git a/main/ircservices/ircservices.initd b/main/ircservices/ircservices.initd
deleted file mode 100644
index e26fe49ba9b..00000000000
--- a/main/ircservices/ircservices.initd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/files/ircservices.init.d,v 1.5 2006/11/05 22:23:08 swegener Exp $
-
-depend() {
-	need net
-	after firewall
-	use ircd
-}
-
-start() {
-	ebegin "Starting IRC Services"
-	start-stop-daemon --start --quiet --exec /usr/bin/ircservices \
-		--user ircservices \
-		-- \
-		-dir=/var/lib/ircservices \
-		-log=/var/log/ircservices/ircservices.log \
-		&>/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping IRC Services"
-	start-stop-daemon --stop --quiet \
-		--pidfile /var/lib/ircservices/ircservices.pid
-	eend $?
-	rm -f /var/lib/ircservices/ircservices.pid
-}
diff --git a/main/ircservices/ircservices.pre-install b/main/ircservices/ircservices.pre-install
deleted file mode 100644
index ee50e3bce0c..00000000000
--- a/main/ircservices/ircservices.pre-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-adduser -S -D -h /var/lib/ircservices -s /sbin/nologin -g ircservices ircservices 2>/dev/null
-
-exit 0
diff --git a/main/irqbalance/APKBUILD b/main/irqbalance/APKBUILD
index 7bccbccdfeb..48092ccf76b 100644
--- a/main/irqbalance/APKBUILD
+++ b/main/irqbalance/APKBUILD
@@ -1,36 +1,25 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=irqbalance
-pkgver=1.6.0
-pkgrel=1
+pkgver=1.9.4
+pkgrel=0
 pkgdesc="Daemon that distributes interrupts over the processors"
 url="https://github.com/Irqbalance/irqbalance"
 arch="all"
 license="GPL-2.0-or-later"
-makedepends="$depends_dev glib-dev autoconf automake libtool ncurses-dev"
-case "$CARCH" in
-	arm*|mips*)
-		# no numactl-dev for arm, mips*
-		;;
-	*)
-		makedepends="$makedepends numactl-dev"
-		;;
-esac
+makedepends="$depends_dev glib-dev autoconf automake libtool ncurses-dev numactl-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/Irqbalance/irqbalance/archive/v$pkgver.tar.gz
 	irqbalance.confd
 	irqbalance.initd
 	"
 
-builddir="$srcdir"/$pkgname-$pkgver
-
 prepare() {
 	default_prepare
 	./autogen.sh
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -42,17 +31,17 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
-sha512sums="ce89dc41eb3aab5950a56b4b1c817aae5e87eaa84bc69bf88618caf53386513e488bb0b4724a600ae175c96be509367cfc418c7f85531007f80e02f7de549b16  irqbalance-1.6.0.tar.gz
+sha512sums="
+abdcac9dccabb18ae644b73dc2a8528c03279811c1f9182a5a5b0af43b30c5982d7bb14e79d4430b5d4f2cea8e17115e6038851c74de1ff3bdfc4e303392479a  irqbalance-1.9.4.tar.gz
 90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c  irqbalance.confd
-ba4933d35d17c0eaec8026305411605cadfddaba28e5dbbfb55f8d4311feb04db8dc8853a3e63be55ee8ab4b0356658b2f3eba60fa0b4e59effdd1db94a255c2  irqbalance.initd"
+72cfbe333253837481aca9b47d5af47a91f83c554df9ed6d958cd3099de403a23d99528c2d245c1be730b37678a127f57bc61a8d497f51ad4abb78ed81854185  irqbalance.initd
+"
diff --git a/main/irqbalance/irqbalance.initd b/main/irqbalance/irqbalance.initd
index 51fa66c1502..9c40fd92388 100644
--- a/main/irqbalance/irqbalance.initd
+++ b/main/irqbalance/irqbalance.initd
@@ -3,28 +3,17 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/irqbalance/files/irqbalance.init,v 1.5 2012/01/07 22:04:49 vapier Exp $
 
+command="/usr/sbin/irqbalance"
+command_args="--foreground $IRQBALANCE_OPTS"
+pidfile="/run/$RC_SVCNAME.pid"
+command_background=true
+
 depends() {
 	need localmount
-	after hwdrivers modules
-}
-
-ssd() {
-	start-stop-daemon --exec /usr/sbin/irqbalance "$@"
+	after bootmisc hwdrivers modules
 }
 
 start_pre() {
 	checkpath --quiet --directory --mode 0755 \
-		--owner root:root /var/run/irqbalance
-}
-
-start() {
-	ebegin "Starting irqbalance"
-	ssd --start -- ${IRQBALANCE_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping irqbalance"
-	ssd --stop
-	eend $?
+		--owner root:root /run/irqbalance
 }
diff --git a/main/irssi/APKBUILD b/main/irssi/APKBUILD
deleted file mode 100644
index 845b8d06ca8..00000000000
--- a/main/irssi/APKBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=irssi
-pkgver=1.2.2
-pkgrel=1
-pkgdesc="Modular textUI IRC client with IPv6 support"
-url="https://irssi.org/"
-arch="all"
-license="GPL-2.0-or-later"
-makedepends="glib-dev openssl-dev ncurses-dev perl-dev automake autoconf libtool libotr-dev"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-proxy $pkgname-perl $pkgname-otr"
-source="https://github.com/irssi/irssi/releases/download/$pkgver/irssi-$pkgver.tar.xz
-	"
-
-# secfixes:
-#   1.2.2-r0:
-#     - CVE-2019-15717
-#   1.2.1-r0:
-#     - CVE-2019-13045
-#   1.1.2-r0:
-#     - CVE-2019-5882
-#   1.0.3-r0:
-#     - CVE-2017-9468
-#     - CVE-2017-9469
-#   1.0.4-r0:
-#     - CVE-2017-10965
-#     - CVE-2017-10966
-#   1.0.5-r0:
-#     - CVE-2017-15721
-#     - CVE-2017-15722
-#     - CVE-2017-15723
-#     - CVE-2017-15227
-#     - CVE-2017-15228
-#   1.0.6-r0:
-#     - CVE-2018-5205
-#     - CVE-2018-5206
-#     - CVE-2018-5207
-#     - CVE-2018-5208
-#   1.1.1-r0:
-#     - CVE-2018-7050
-#     - CVE-2018-7051
-#     - CVE-2018-7052
-#     - CVE-2018-7053
-#     - CVE-2018-7054
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--with-perl=module \
-		--with-perl-lib=vendor \
-		--with-proxy \
-		--enable-true-color \
-		--with-otr=yes
-	make
-}
-
-check() {
-	cd "$builddir"
-	./src/fe-text/irssi -v
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	find "$pkgdir" -name perllocal.pod -delete
-}
-
-perl() {
-	depends="$pkgname perl"
-	pkgdesc="Irssi perl support and scripts"
-	mkdir -p "$subpkgdir"/usr/share/irssi
-	mv "$pkgdir"/usr/share/irssi/scripts \
-		"$subpkgdir"/usr/share/irssi/
-	mkdir -p "$subpkgdir"/usr/lib/irssi/modules
-	mv "$pkgdir"/usr/lib/irssi/modules/libfe_perl.* \
-		"$pkgdir"/usr/lib/irssi/modules/libperl_core.* \
-		"$subpkgdir"/usr/lib/irssi/modules/
-	mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib/
-	#need write permission when stripping
-	for i in TextUI/TextUI.so Irssi.so Irc/Irc.so UI/UI.so; do
-		chmod +w "$subpkgdir"/usr/lib/perl5/vendor_perl/auto/Irssi/$1
-	done
-}
-
-proxy() {
-	depends="$pkgname"
-	pkgdesc="Irssi module for enabling bouncer-like functionality"
-	mkdir -p "$subpkgdir"/usr/lib/irssi/modules
-	mv "$pkgdir"/usr/lib/irssi/modules/libirc_proxy.* "$subpkgdir"/usr/lib/irssi/modules/
-}
-
-otr() {
-	depends="$pkgname"
-	pkgdesc="Irssi module for enabling OTR functionality"
-	mkdir -p "$subpkgdir"/usr/lib/irssi/modules
-	mv "$pkgdir"/usr/lib/irssi/modules/libotr_core.* "$subpkgdir"/usr/lib/irssi/modules/
-	mkdir -p "$subpkgdir"/usr/share/irssi/help
-	mv "$pkgdir"/usr/share/irssi/help/otr "$subpkgdir"/usr/share/irssi/help/
-}
-
-sha512sums="5444ac102ff9ad3a6399a47c967d138e181330dd226eac68886d35fee4ad455932b9306a367bee3478095158e41ba67fb46deb8f0a33512046b9b83bae37c610  irssi-1.2.2.tar.xz"
diff --git a/main/iscsi-scst/APKBUILD b/main/iscsi-scst/APKBUILD
index 9d9f9a82a69..42b52a5c051 100644
--- a/main/iscsi-scst/APKBUILD
+++ b/main/iscsi-scst/APKBUILD
@@ -2,18 +2,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=iscsi-scst
 pkgver=2.2.1
-pkgrel=3
+pkgrel=6
 pkgdesc="ISCSI target for SCST - userspace tools"
-url="http://scst.sourceforge.net/"
+url="https://scst.sourceforge.net/"
 arch="all"
 license="GPL-2.0-only"
 makedepends="linux-headers bash"
+subpackages="$pkgname-openrc"
 source="https://downloads.sourceforge.net/scst/iscsi-scst-$pkgver.tar.bz2
 	https://downloads.sourceforge.net/scst/scst-$pkgver.tar.bz2
 	$pkgname.initd
 	$pkgname.confd
 	scst.conf
 	"
+options="!check"
 
 prepare() {
 	cp Makefile_user_space_only Makefile
diff --git a/main/isl/APKBUILD b/main/isl/APKBUILD
deleted file mode 100644
index 9e6957b8539..00000000000
--- a/main/isl/APKBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# Contributor: Timo Teräs <timo.teras@iki.fi>
-# Maintainer: Timo Teräs <timo.teras@iki.fi>
-pkgname=isl
-pkgver=0.18
-pkgrel=0
-pkgdesc="An Integer Set Library for the Polyhedral Model"
-url="http://isl.gforge.inria.fr/"
-arch="all"
-license="MIT"
-depends=""
-depends_dev="gmp-dev"
-makedepends_host="$depends_dev"
-makedepends="$makedepends_host"
-replaces="cloog"
-install=""
-subpackages="$pkgname-dev"
-source="http://isl.gforge.inria.fr/isl-$pkgver.tar.bz2"
-
-builddir="$srcdir"/$pkgname-$pkgver
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--with-sysroot=${CBUILDROOT}
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" INSTALL="install -D" install
-}
-
-dev() {
-	default_dev
-	replaces="cloog-dev"
-	mkdir -p "$subpkgdir"/usr/share/gdb/python/auto-load/usr/lib
-	mv "$pkgdir"/usr/lib/*-gdb.py \
-		"$subpkgdir"/usr/share/gdb/python/auto-load/usr/lib/
-}
-
-sha512sums="85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94  isl-0.18.tar.bz2"
diff --git a/main/isl25/APKBUILD b/main/isl25/APKBUILD
new file mode 100644
index 00000000000..1603867d323
--- /dev/null
+++ b/main/isl25/APKBUILD
@@ -0,0 +1,57 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Timo Teräs <timo.teras@iki.fi>
+
+# this package needs special care since it is a part of the toolchain.
+# we need to be able to have the old version installed in parallel with
+# a new with ABI breaking change. That is why we have the version
+# as a part of the pkgname.
+
+pkgname=isl25
+pkgver=0.25
+pkgrel=2
+pkgdesc="An Integer Set Library for the Polyhedral Model"
+url="http://isl.gforge.inria.fr/"
+arch="all"
+license="MIT"
+depends_dev="gmp-dev"
+makedepends_host="$depends_dev"
+makedepends="$makedepends_host"
+source="https://libisl.sourceforge.io/isl-$pkgver.tar.bz2"
+
+builddir="$srcdir"/isl-$pkgver
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--with-sysroot=$CBUILDROOT
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	replaces="isl24" # they have the same soname
+	make DESTDIR="$pkgdir" INSTALL="install -D" install
+	# isl-dev is provided by isl26
+	rm -rf "$pkgdir"/usr/include \
+		"$pkgdir"/usr/lib/pkgconfig \
+		"$pkgdir"/usr/lib/*.a \
+		"$pkgdir"/usr/lib/*.so \
+		"$pkgdir"/usr/lib/*.py
+}
+
+sha512sums="
+d309388d7dc1c861fddf74dbcc0f15b0166b166d0ed694473445ec47eb7d3dfab96412554016b3e06292f01967441546783ab329829dc4df4b9813716e2ef9ed  isl-0.25.tar.bz2
+"
diff --git a/main/isl26/APKBUILD b/main/isl26/APKBUILD
new file mode 100644
index 00000000000..8b6a40efcb6
--- /dev/null
+++ b/main/isl26/APKBUILD
@@ -0,0 +1,54 @@
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Timo Teräs <timo.teras@iki.fi>
+
+# this package needs special care since it is a part of the toolchain.
+# we need to be able to have the old version installed in parallel with
+# a new with ABI breaking change. That is why we have the version
+# as a part of the pkgname.
+
+pkgname=isl26
+pkgver=0.26
+pkgrel=1
+pkgdesc="An Integer Set Library for the Polyhedral Model"
+url="http://isl.gforge.inria.fr/"
+arch="all"
+license="MIT"
+depends_dev="gmp-dev"
+makedepends_host="$depends_dev"
+makedepends="$makedepends_host"
+subpackages="isl-dev:_dev"
+source="https://libisl.sourceforge.io/isl-$pkgver.tar.bz2"
+
+builddir="$srcdir"/isl-$pkgver
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--with-sysroot=$CBUILDROOT
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	replaces="isl24 isl25" # they have the same soname
+	make DESTDIR="$pkgdir" INSTALL="install -D" install
+}
+
+_dev() {
+	default_dev
+	mkdir -p "$subpkgdir"/usr/share/gdb/python/auto-load/usr/lib
+	mv "$pkgdir"/usr/lib/*-gdb.py \
+		"$subpkgdir"/usr/share/gdb/python/auto-load/usr/lib/
+}
+
+sha512sums="
+492deba2cbfc693efb41621861a0679390becf2777e32111aceef8db1d38d772385dfd83cee14a41c930f9904549334e4d6dc2c5fce0c69e0bef9c8cf031d6b5  isl-0.26.tar.bz2
+"
diff --git a/main/iso-codes/APKBUILD b/main/iso-codes/APKBUILD
index dd71ac288c1..c06de110e5e 100644
--- a/main/iso-codes/APKBUILD
+++ b/main/iso-codes/APKBUILD
@@ -1,16 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=iso-codes
-pkgver=4.4
+pkgver=4.16.0
 pkgrel=0
 pkgdesc="ISO codes and their translations"
 url="https://salsa.debian.org/iso-codes-team/iso-codes"
 arch="noarch"
 license="LGPL-2.1-or-later"
-subpackages="$pkgname-lang $pkgname-dev"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
 makedepends="python3 gettext"
-source="http://http.debian.net/debian/pool/main/i/iso-codes/iso-codes_$pkgver.orig.tar.xz"
+subpackages="$pkgname-lang $pkgname-dev"
+source="https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v$pkgver/iso-codes-v$pkgver.tar.bz2"
+builddir="$srcdir/iso-codes-v$pkgver"
+
 build() {
-	cd "$builddir"
 	./configure \
 		--host=$CHOST \
 		--build=$CBUILD \
@@ -19,12 +21,13 @@ build() {
 }
 
 check() {
-	make -C "$builddir" check
+	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" pkgconfigdir=/usr/lib/pkgconfig install
 }
 
-sha512sums="a832447edd0847d514086e05c90fa143d4c19146c06d266bc70d5c8da0605efdd6be35fcf73d5833c616396e486a77c107b4f506172e7a47f689a44f892eb669  iso-codes_4.4.orig.tar.xz"
+sha512sums="
+9d8b9243f13886809f0bbbde47a568f00e14c82ce8f0c79fdf656cdfbd45afa67aca23d501fa79a982d535b97bb32c6ad3d3e44343c13aae61c4917144690cb5  iso-codes-v4.16.0.tar.bz2
+"
diff --git a/main/itstool/APKBUILD b/main/itstool/APKBUILD
index abab2d4a1a0..f029a61c176 100644
--- a/main/itstool/APKBUILD
+++ b/main/itstool/APKBUILD
@@ -1,20 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=itstool
-pkgver=2.0.4
-pkgrel=3
+pkgver=2.0.7
+pkgrel=1
 pkgdesc="ITS-based XML translation tool"
-url="http://itstool.org/"
+url="https://itstool.org/"
 arch="noarch"
 license="GPL-3.0-or-later"
 depends="py3-libxml2 python3"
+makedepends="autoconf automake"
+checkdepends="diffutils gettext"
 subpackages="$pkgname-doc"
-source="http://files.itstool.org/itstool/$pkgname-$pkgver.tar.bz2
-	fix-segfault.patch"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://github.com/itstool/itstool/archive/$pkgver/itstool-$pkgver.tar.gz
+	fix-segfault.patch
+	"
+options="net" # Tests require network access
 
-build() {
-	cd "$builddir"
+prepare() {
+	default_prepare
+	autoreconf -vif
+}
 
+build() {
 	PYTHON="/usr/bin/python3" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,17 +33,14 @@ build() {
 }
 
 check() {
-	cd "$builddir"
-	make check
-	# verify that the shebang is correct
-	chmod +x itstool
-	./itstool
+	python3 tests/run_tests.py
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f5cfa9c75710f9cc43a61caeb92ca04ec77023bce6fb14d770dda82efde2e5d9050245618c249d309227a3d43555cb1739f5fe680b4a370786ed4631fa9ee4b7  itstool-2.0.4.tar.bz2
-eb426e7cc9f151154f47b93ef46d6fcfb5fa0982be3bf78863ebf5ea009a89de252a6c63dfb090d76003c47107ebb5d1ac2a7d1ef7db08defe19e32f996dbdbd  fix-segfault.patch"
+sha512sums="
+03f16486336add31d24e74554fcb22f5ec00e0db63f890fb94d4a4561048b7aecaadd86d9ab7489a1b5f7adf180ce1b27131db928488e4e6ffe9444eee38a2e9  itstool-2.0.7.tar.gz
+a47ab86ee0ea7b8fa8329649cda28db91e106ffdc695836e55f274b406759e3945835dbaf32230a30f2afaf482aff0ef205a12d722a19a6ab874c8f33413df9a  fix-segfault.patch
+"
diff --git a/main/itstool/fix-segfault.patch b/main/itstool/fix-segfault.patch
index 047b691b748..3de72e9faa9 100644
--- a/main/itstool/fix-segfault.patch
+++ b/main/itstool/fix-segfault.patch
@@ -14,7 +14,7 @@ diff --git a/itstool.in b/itstool.in
 index c1d0585..e492e95 100755
 --- a/itstool.in
 +++ b/itstool.in
-@@ -1048,7 +1048,7 @@ class Document (object):
+@@ -1053,7 +1053,7 @@ class Document (object):
          else:
              ctxt.replaceEntities(1)
          ctxt.parseDocument()
diff --git a/main/iucode-tool/APKBUILD b/main/iucode-tool/APKBUILD
new file mode 100644
index 00000000000..eab4aa20e67
--- /dev/null
+++ b/main/iucode-tool/APKBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=iucode-tool
+pkgver=2.3.1
+pkgrel=3
+pkgdesc="manipulate microcode update collections for Intel i686 and X86-64"
+url="https://gitlab.com/iucode-tool/iucode-tool"
+arch="x86 x86_64"
+license="GPL-2.0-or-later"
+makedepends="autoconf automake libtool argp-standalone"
+subpackages="$pkgname-doc"
+source="https://gitlab.com/iucode-tool/iucode-tool/-/archive/v$pkgver/iucode-tool-v$pkgver.tar.gz"
+builddir="$srcdir/iucode-tool-v$pkgver"
+
+build() {
+	./autogen.sh
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make install DESTDIR="$pkgdir"
+}
+
+sha512sums="e6b1d6b6362e129037105b8759f372ff1e3bfacde5525fd58d87a479807c59e0491348f5891bc995aec6bd3cb150401fe10b4beccd5b96742665d735fbf2c911  iucode-tool-v2.3.1.tar.gz"
diff --git a/main/ivykis/APKBUILD b/main/ivykis/APKBUILD
index 051b95761ba..aa1856a7b52 100644
--- a/main/ivykis/APKBUILD
+++ b/main/ivykis/APKBUILD
@@ -2,14 +2,14 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=ivykis
 pkgver=0.42.4
-pkgrel=0
+pkgrel=5
 pkgdesc="Library for asynchronous I/O readiness notification"
-url="http://libivykis.sourceforge.net"
+url="https://libivykis.sourceforge.net/"
 arch="all"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 makedepends="automake autoconf libtool"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="http://downloads.sourceforge.net/project/libivykis/$pkgver/ivykis-$pkgver.tar.gz"
+source="https://downloads.sourceforge.net/project/libivykis/$pkgver/ivykis-$pkgver.tar.gz"
 
 prepare() {
 	default_prepare
diff --git a/main/iw/APKBUILD b/main/iw/APKBUILD
index b7dfb14df95..688a4d8ca9d 100644
--- a/main/iw/APKBUILD
+++ b/main/iw/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=iw
-pkgver=5.4
+pkgver=6.7
 pkgrel=0
 pkgdesc="nl80211 based CLI configuration utility for wireless devices"
 url="https://wireless.kernel.org/en/users/Documentation/iw"
@@ -19,4 +19,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="84408194e5b3a2f119ae9711d856ecb4343734ebb91150e0441b2410af8f75f460ce9ab1ce7151b0dda3926270bcb80fa684058945b7549c98964a0379e39ba2  iw-5.4.tar.xz"
+sha512sums="
+7370d3b55ce43691ba84913be334c04dcdf9aa44e9556e4214d8016ddf9733b2c555ebdfbdfc814d2eba7da68501503d267ad6353b14f87b81f064f629afbef5  iw-6.7.tar.xz
+"
diff --git a/main/jack/APKBUILD b/main/jack/APKBUILD
index 6aaebc5dd82..ff43af57e63 100644
--- a/main/jack/APKBUILD
+++ b/main/jack/APKBUILD
@@ -1,28 +1,33 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=jack
-_realname=jack2
-pkgver=1.9.14
-pkgrel=0
+pkgver=1.9.22
+pkgrel=4
 pkgdesc="The Jack Audio Connection Kit"
-url="http://www.jackaudio.org"
+url="https://jackaudio.org/"
 arch="all"
-license="GPL-2.0 GPL-2.0-or-later LGPL-2.0-or-later"
-makedepends="$depends_dev alsa-lib-dev dbus-dev expat-dev libsamplerate-dev
-	libsndfile-dev ncurses-dev readline-dev python3 linux-headers"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-dbus $pkgname-example-clients:_clients"
-source="$pkgname-$pkgver.tar.gz::https://github.com/jackaudio/jack2/archive/v$pkgver.tar.gz
+license="GPL-2.0-or-later"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+makedepends="
+	alsa-lib-dev
+	dbus-dev
+	expat-dev
+	libsamplerate-dev
+	libsndfile-dev
+	linux-headers
+	ncurses-dev
+	python3
+	readline-dev
+	"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-dbus"
+source="https://github.com/jackaudio/jack2/archive/v$pkgver/jack2-v$pkgver.tar.gz
 	fix-execinfo.patch
+	increase-api-version.patch
 	"
-builddir="$srcdir"/$_realname-$pkgver
-
-prepare() {
-	default_prepare
-	sed -i -e '1s:#!/bin/bash:#!/bin/sh:' svnversion_regenerate.sh
-}
+builddir="$srcdir/jack2-$pkgver"
+options="!check" # no real tests provided
 
 build() {
 	./waf configure \
-		-j1 \
 		--prefix=/usr \
 		--mandir=/usr/share/man/man1 \
 		--libdir=/usr/lib \
@@ -30,7 +35,7 @@ build() {
 		--alsa \
 		--classic
 
-	./waf build -j${JOBS:-2} -v
+	./waf build -v
 }
 
 package() {
@@ -39,16 +44,13 @@ package() {
 
 dbus() {
 	pkgdesc="Jack D-Bus launcher"
-	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/share
-	mv "$pkgdir"/usr/bin/jackdbus "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/share/dbus* "$subpkgdir"/usr/share/
-}
 
-_clients() {
-	pkgdesc="Example clients that use Jack"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*_* "$subpkgdir"/usr/bin/
+	amove usr/bin/jackdbus
+	amove usr/share/dbus*
 }
 
-sha512sums="ca9738fd5aadcb7e125f98a358437905959afebe0b792cab316fc31410e89ea3aefdb85154792a9d0a80fa988aa7eff379ff5c7ac6c4bfa1d57ad3d7de7b5fdd  jack-1.9.14.tar.gz
-b5abec7e67485d1c13f399b5961539177dd35d21c5dd95e0aa767adb0f5b1e588e9ca2f9b29cc4d66fc039311ff7eacc4cf21f6700ef0a2c8de99b63cb00f84d  fix-execinfo.patch"
+sha512sums="
+d93cb2bcc57b72b6815eed143de1092d14fe22542ae9a1f8480d9ed5f44b59c50f81279d18bdd84ff6276ddd71ca1aa64a1e46d61199a5eda0d873a356194ab4  jack2-v1.9.22.tar.gz
+b5abec7e67485d1c13f399b5961539177dd35d21c5dd95e0aa767adb0f5b1e588e9ca2f9b29cc4d66fc039311ff7eacc4cf21f6700ef0a2c8de99b63cb00f84d  fix-execinfo.patch
+1ee0159ea0f75f964baa167fe13031fe82e04b31a1b14122c12161d103e1a3205061fc019bcd978f47eed6efc8ea6ee96188c0eb795e3d83f34481e193086fbe  increase-api-version.patch
+"
diff --git a/main/jack/increase-api-version.patch b/main/jack/increase-api-version.patch
new file mode 100644
index 00000000000..5968441fd07
--- /dev/null
+++ b/main/jack/increase-api-version.patch
@@ -0,0 +1,16 @@
+jack's low API version (so:libjack.so.0.1.0) makes apk prefer pipewire-jack over jack
+We don't want this, users need to explicitly tell users they prefer pipewire-jack, so we increase the API version here to be always higher than pipewire-jack
+
+diff --git a/wscript b/wscript
+index e0d32c8d..2c0a7123 100644
+--- a/wscript
++++ b/wscript
+@@ -13,7 +13,7 @@ from waflib.Build import BuildContext, CleanContext, InstallContext, UninstallCo
+ 
+ VERSION = '1.9.20'
+ APPNAME = 'jack'
+-JACK_API_VERSION = '0.1.0'
++JACK_API_VERSION = '0.999.0'
+ 
+ # these variables are mandatory ('/' are converted automatically)
+ top = '.'
diff --git a/main/jansson/APKBUILD b/main/jansson/APKBUILD
index e5dcf1347d0..5fc58b0bc95 100644
--- a/main/jansson/APKBUILD
+++ b/main/jansson/APKBUILD
@@ -1,17 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=jansson
-pkgver=2.12
-pkgrel=0
+pkgver=2.14
+pkgrel=4
 pkgdesc="lightweight JSON library"
 url="http://www.digip.org/jansson/"
 arch="all"
 license="MIT"
-subpackages="$pkgname-dev"
-source="http://www.digip.org/jansson/releases/$pkgname-$pkgver.tar.bz2"
-builddir="$srcdir/$pkgname-$pkgver"
+checkdepends="bash"
+subpackages="$pkgname-static $pkgname-dev"
+source="https://github.com/akheron/jansson/releases/download/v$pkgver/jansson-$pkgver.tar.gz"
+
+# secfixes:
+#   0:
+#     - CVE-2020-36325
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,13 +27,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="6ed665a441c789cdf7eb22b6e69d02575746c81b00e0a81ced90d30aaf2badc93fac32e5841fd4e07751a27726a327a63fe28bb0689c6bef5b6164b435bbc30d  jansson-2.12.tar.bz2"
+sha512sums="
+5a592776c7ba8c0b1f5efaf813f77948bbc4bda168a72d221d176af0cf61038e26c1f30795433be10e2fc5069d5763d11852a8574774906a9f8ad261ac30109c  jansson-2.14.tar.gz
+"
diff --git a/main/java-common/APKBUILD b/main/java-common/APKBUILD
deleted file mode 100644
index 204b62ed3df..00000000000
--- a/main/java-common/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Contributor: Timo Teras <timo.teras@iki.fi>
-# Maintainer: Timo Teras <timo.teras@iki.fi>
-pkgname=java-common
-pkgver=0.2
-pkgrel=0
-pkgdesc="Java common (updates java links)"
-url="https://git.alpinelinux.org/aports.git"
-arch="noarch"
-options="!check"  # Symlinks only.
-license="GPL-2.0"
-depends=
-makedepends=""
-install=""
-subpackages=""
-source=""
-triggers="java-common.trigger=/usr/lib/jvm"
-
-package() {
-	mkdir -p "$pkgdir"/usr/bin
-	ln -sf ../lib/jvm/default-jvm/jre/bin/java "$pkgdir"/usr/bin
-	ln -sf ../lib/jvm/default-jvm/jre/bin/rmiregistry "$pkgdir"/usr/bin
-	ln -sf ../lib/jvm/default-jvm/jre/bin/keytool "$pkgdir"/usr/bin
-	ln -sf ../lib/jvm/default-jvm/bin/appletviewer "$pkgdir"/usr/bin
-}
-
diff --git a/main/java-common/java-common.trigger b/main/java-common/java-common.trigger
deleted file mode 100644
index d46bcbe8ba0..00000000000
--- a/main/java-common/java-common.trigger
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-if [ -x /usr/lib/jvm/forced-jvm ]; then
-	ln -sfn forced-jvm default-jvm
-	exit 0
-fi
-
-cd /usr/lib/jvm
-LATEST=`ls -d java-* | sort -Vr | head -1`
-if [ "$LATEST" ]; then
-	ln -sfn $LATEST default-jvm
-fi
-
diff --git a/main/jbig2dec/APKBUILD b/main/jbig2dec/APKBUILD
index 157d3a2369b..abc924b9b76 100644
--- a/main/jbig2dec/APKBUILD
+++ b/main/jbig2dec/APKBUILD
@@ -1,18 +1,20 @@
 # Contributor: Michael Zhou <zhoumichaely@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=jbig2dec
-pkgver=0.18
-_gsver="gs952"
+pkgver=0.20
 pkgrel=0
 pkgdesc="JBIG2 image compression format decoder"
 options="!check" # Tests require python2
 url="https://jbig2dec.com/"
 arch="all"
-license="GPL-2.0-or-later"
+license="AGPL-3.0-or-later"
 makedepends="autoconf automake libtool"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/$_gsver/jbig2dec-$pkgver.tar.gz"
+source="https://github.com/ArtifexSoftware/jbig2dec/releases/download/$pkgver/jbig2dec-$pkgver.tar.gz"
 
+# secfixes:
+#   0.18-r0:
+#     - CVE-2020-12268
 
 prepare() {
 	default_prepare
@@ -36,4 +38,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9d9da97a54562b092b30c67ec959d1c48f737316ebf3e6a9fbc5a2fcdf635b0703027c90a904e45dedb1d9400281cae9dd424ae78aa47979862791ccceb7077d  jbig2dec-0.18.tar.gz"
+sha512sums="
+74d40b4d5b21dcb2b6ed15de84e9ef292774783547d0a36c7185740f3fe34341665b4aa756369d27d158404f15f36f3edd2fd1a8187a196d08c9b06ab3d04101  jbig2dec-0.20.tar.gz
+"
diff --git a/main/jemalloc/APKBUILD b/main/jemalloc/APKBUILD
new file mode 100644
index 00000000000..41c2afe053d
--- /dev/null
+++ b/main/jemalloc/APKBUILD
@@ -0,0 +1,43 @@
+# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Contributor: Duncan Bellamy <dunk@denkimushi.com>
+pkgname=jemalloc
+pkgver=5.3.0
+pkgrel=4
+pkgdesc="general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support"
+url="http://jemalloc.net"
+arch="all"
+license="BSD-2-Clause"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
+source="https://github.com/jemalloc/jemalloc/releases/download/$pkgver/jemalloc-$pkgver.tar.bz2"
+
+build() {
+	local _pgs
+	case "$CARCH" in
+		x86|x86_64)	_pgs=12 ;;
+		ppc64le)	export CPPFLAGS="$CPPFLAGS -maltivec -mabi=altivec" && _pgs=16 ;;
+		*)		_pgs=16 ;;
+	esac
+
+	echo "$pkgver" > VERSION
+	./configure \
+		--enable-xmalloc \
+		--prefix=/usr \
+		--localstatedir=/var \
+		--sysconfdir=/etc \
+		--with-lg-page="$_pgs" \
+		--with-lg-hugepage=21
+	make all dist
+}
+
+check() {
+	make tests
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+22907bb052096e2caffb6e4e23548aecc5cc9283dce476896a2b1127eee64170e3562fa2e7db9571298814a7a2c7df6e8d1fbe152bd3f3b0c1abec22a2de34b1  jemalloc-5.3.0.tar.bz2
+"
diff --git a/main/jfsutils/APKBUILD b/main/jfsutils/APKBUILD
deleted file mode 100644
index 955235ca317..00000000000
--- a/main/jfsutils/APKBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Contributor: Teran McKinney <sega01@go-beyond.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=jfsutils
-pkgver=1.1.15
-pkgrel=2
-pkgdesc="JFS filesystem utilities"
-url="http://jfs.sourceforge.net"
-arch="all"
-license="GPL"
-depends=
-install=
-makedepends="e2fsprogs-dev" # is pulled in externally.
-subpackages="$pkgname-doc"
-source="http://jfs.sourceforge.net/project/pub/jfsutils-$pkgver.tar.gz
-	musl-fix-includes.patch
-	jfsutils-include-sysmacros.patch
-	missing-stdinth.patch"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-        local i
-        cd "$_builddir"
-        for i in $source; do
-                case $i in
-                *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-                esac
-        done
-}
-
-build () {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--mandir=/usr/share/man \
-		|| return 1
-
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make -j1 LDCONFIG=: DESTDIR="${pkgdir}" install || return 1
-}
-
-sha512sums="fa8ba7f4997471da3e6ea7239564f3395046222cfbb2b10e37b24ad0bd107b7eadbb51ce328d89d193034360b4035ca5e0e5b0b416a74483d7a2c0a2b9c65858  jfsutils-1.1.15.tar.gz
-fb0d7348e2e13a6a9c3a987d161e0cf05363649515366ef49a45e3580b8f6135fce8465b99ff8a351231d970371c00bea6ceb9edb1d0f24da20d261b06ec85bd  musl-fix-includes.patch
-dd634072847158520ae1eb1b624884cd4fdf6847c468335d8cb784f82f0fa09814c3756014f373b19fa3a5d19a95128964c2b6a12aac7ea6da6b7714646765d4  jfsutils-include-sysmacros.patch
-a8e2332f2dec37affa8404b31e7e68399d815d450422ad342243c51d117e4d7ef4aaa0e30d1389380a81ed076a7ef1e1d41fcf260fa05ce4d823aa779628982d  missing-stdinth.patch"
diff --git a/main/jfsutils/jfsutils-include-sysmacros.patch b/main/jfsutils/jfsutils-include-sysmacros.patch
deleted file mode 100644
index e1b87f89b8a..00000000000
--- a/main/jfsutils/jfsutils-include-sysmacros.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libfs/devices.c
-+++ b/libfs/devices.c
-@@ -38,6 +38,7 @@
- #endif
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
- #if defined(__DragonFly__)
diff --git a/main/jfsutils/missing-stdinth.patch b/main/jfsutils/missing-stdinth.patch
deleted file mode 100644
index 06a74bf32e1..00000000000
--- a/main/jfsutils/missing-stdinth.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- jfsutils-1.1.15/fscklog/extract.c.orig
-+++ jfsutils-1.1.15/fscklog/extract.c
-@@ -28,6 +28,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
-+#include <stdint.h>
- 
- #include "devices.h"
- #include "diskmap.h"
-
diff --git a/main/jfsutils/musl-fix-includes.patch b/main/jfsutils/musl-fix-includes.patch
deleted file mode 100644
index 33ba55d7959..00000000000
--- a/main/jfsutils/musl-fix-includes.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- jfsutils-1.1.15.orig/libfs/fssubs.c
-+++ jfsutils-1.1.15/libfs/fssubs.c
-@@ -24,6 +24,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <paths.h>
- 
- #if HAVE_MNTENT_H
- #include <mntent.h>
-@@ -31,7 +32,6 @@
- #endif
- 
- #if HAVE_GETMNTINFO
--#include <paths.h>
- #include <sys/param.h>
- #include <sys/mount.h>
- #endif
diff --git a/main/jitterentropy-library/01-disable-gcc-optimisation.patch b/main/jitterentropy-library/01-disable-gcc-optimisation.patch
new file mode 100644
index 00000000000..cc129c58be8
--- /dev/null
+++ b/main/jitterentropy-library/01-disable-gcc-optimisation.patch
@@ -0,0 +1,26 @@
+From: Dermot Bradley <dermot_bradley@yahoo.com>
+Date: Wed, 14 Jul 2020 22:58 +0100
+
+Jitterentropy library must be built with compiler optimisation disabled
+as it *relies* on this. The below change to the Makefile ensures that abuild
+general settings do not override the -O0 setting in the Makefile.
+
+This is an Alpine-specific change and so not submitted upstream - it was
+however discussed with upstream:
+https://github.com/smuellerDD/jitterentropy-library/issues/55
+
+---
+
+diff -aur a/Makefile b/Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,8 @@
+ #Hardening
+ ENABLE_STACK_PROTECTOR ?= 1
+ CFLAGS ?= -fwrapv --param ssp-buffer-size=4 -fvisibility=hidden -fPIE -Wcast-align -Wmissing-field-initializers -Wshadow -Wswitch-enum
+-CFLAGS +=-Wextra -Wall -pedantic -fPIC -O0 -fwrapv -Wconversion
++CFLAGS :=-Wextra -Wall -pedantic -fPIC -O0 -fwrapv -Wconversion
++CPPFLAGS :=
+ LDFLAGS +=-Wl,-z,relro,-z,now -lpthread
+ 
+ # Enable internal timer support
diff --git a/main/jitterentropy-library/02-fix-s390x-stack-corruption.patch b/main/jitterentropy-library/02-fix-s390x-stack-corruption.patch
new file mode 100644
index 00000000000..2f5cfe809bf
--- /dev/null
+++ b/main/jitterentropy-library/02-fix-s390x-stack-corruption.patch
@@ -0,0 +1,66 @@
+From: Dermot Bradley <dermot_bradley@yahoo.com>
+Date: Mon, 10 Apr 2023 14:25 +0100
+
+Output size of the STCKE command on s390x is 16 bytes, compared to 8
+bytes of the STCK command. This leads to a stack corruption in
+jent_get_nstime() on an s390x system.
+
+Upstream PR #95, already merged in master.
+
+---
+
+diff -aur a/jitterentropy-base-user.h b/jitterentropy-base-user.h
+--- a/jitterentropy-base-user.h
++++ b/jitterentropy-base-user.h
+@@ -129,13 +129,46 @@
+ 
+ static inline void jent_get_nstime(uint64_t *out)
+ {
+-	uint64_t clk;
++	/*
++	 * This is MVS+STCK code! Enable it with -S in the compiler.
++	 *
++	 * uint64_t clk;
++	 * __asm__ volatile("stck %0" : "=m" (clk) : : "cc");
++	 * *out = (uint64_t)(clk);
++	 */
++
++	/*
++	 * This is GCC+STCKE code. STCKE command and data format:
++	 * z/Architecture - Principles of Operation
++	 * http://publibz.boulder.ibm.com/epubs/pdf/dz9zr007.pdf
++	 *
++	 * The current value of bits 0-103 of the TOD clock is stored in bytes
++	 * 1-13 of the sixteen-byte output:
++	 *
++	 * bits 0-7: zeros (reserved for future extention)
++	 * bits 8-111: TOD Clock value
++	 * bits 112-127: Programmable Field
++	 *
++	 * Output bit 59 (TOD-Clock bit 51) effectively increments every
++	 * microsecond. Bits 60 to 111 of STCKE output are fractions of
++	 * a miscrosecond: bit 59 is 1.0us, bit 60 is .5us, bit 61 is .25us,
++	 * bit 62 is .125us, bit 63 is 62.5ns, etc.
++	 *
++	 * Some of these bits can be implemented, some not. 64 bits of
++	 * the TOD clock are implemented usually nowadays, these are
++	 * bits 8-71 of the output.
++	 *
++	 * The stepping value of TOD-clock bit position 63, if implemented,
++	 * is 2^-12 microseconds, or approximately 244 picoseconds. This value
++	 * is called a clock unit.
++	 */
++
++	uint8_t clk[16];
+ 
+-	/* this is MVS code! enable with -S in the compiler */
+-	/*__asm__ volatile("stck %0" : "=m" (clk) : : "cc"); */
+-	/* this is gcc */
+ 	asm volatile("stcke %0" : "=Q" (clk) : : "cc");
+-	*out = (uint64_t)(clk);
++
++	/* s390x is big-endian, so just perfom a byte-by-byte copy */
++	*out = *(uint64_t *)(clk + 1);
+ }
+ 
+ #elif defined(__powerpc)
diff --git a/main/jitterentropy-library/03-fix-dangling-pointer.patch b/main/jitterentropy-library/03-fix-dangling-pointer.patch
new file mode 100644
index 00000000000..81b631e8ed7
--- /dev/null
+++ b/main/jitterentropy-library/03-fix-dangling-pointer.patch
@@ -0,0 +1,25 @@
+From: Dermot Bradley <dermot_bradley@yahoo.com>
+Date: Mon, 10 Apr 2023 14:25 +0100
+
+On a failure of jent_read_entropy() where the entropy collector will
+be reallocated, jent_entropy_collector_free() is used to release
+*ec, but *ec is not set to NULL. If a failure occurs in the
+following call to jent_entropy_collector_ex() then the function will
+return with a dangling pointer remaining in *ec. Set *ec to NULL
+after freeing to prevent this.
+
+Upstream PR #97, already merged in master.
+
+---
+
+diff -aur a/src/jitterentropy-base.c b/src/jitterentropy-base.c
+--- a/src/jitterentropy-base.c
++++ b/src/jitterentropy-base.c
+@@ -308,6 +308,7 @@
+ 			 * memory size
+ 			 */
+ 			jent_entropy_collector_free(*ec);
++			*ec = NULL;
+ 
+ 			/* Perform new health test with updated OSR */
+ 			if (jent_entropy_init_ex(osr, flags))
diff --git a/main/jitterentropy-library/04-fix-memory-leak.patch b/main/jitterentropy-library/04-fix-memory-leak.patch
new file mode 100644
index 00000000000..dfa790d95ad
--- /dev/null
+++ b/main/jitterentropy-library/04-fix-memory-leak.patch
@@ -0,0 +1,27 @@
+From: Dermot Bradley <dermot_bradley@yahoo.com>
+Date: Mon, 10 Apr 2023 14:25 +0100
+
+In the error cleanup block of jent_entropy_collector_alloc_internal(),
+the hash_state should also be zeroed and freed.
+
+Conflicting flags of JENT_DISABLE_INTERNAL_TIMER and
+JENT_FORCE_INTERNAL_TIMER will cause a EHEALTH return from
+jent_notime_enable() and jump to the error cleanup block after
+hash_state has been allocated.
+
+Upstream PR #98, already merged in master.
+
+---
+
+diff -aur a/src/jitterentropy-base.c b/src/jitterentropy-base.c
+--- a/src/jitterentropy-base.c
++++ b/src/jitterentropy-base.c
+@@ -486,6 +486,8 @@
+ err:
+ 	if (entropy_collector->mem != NULL)
+ 		jent_zfree(entropy_collector->mem, memsize);
++	if (entropy_collector->hash_state != NULL)
++		sha3_dealloc(entropy_collector->hash_state);
+ 	jent_zfree(entropy_collector, sizeof(struct rand_data));
+ 	return NULL;
+ }
diff --git a/main/jitterentropy-library/APKBUILD b/main/jitterentropy-library/APKBUILD
new file mode 100644
index 00000000000..9d2bde35db5
--- /dev/null
+++ b/main/jitterentropy-library/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Dermot Bradley <dermot_bradley@yahoo.com>
+# Maintainer: Celeste <cielesti@protonmail.com>
+pkgname=jitterentropy-library
+#
+# NOTE: This package is (currently) only used by rng-tools and care
+# needs to be taken that both are aligned (i.e. some necessary
+# changes in *both* packages may not be released at the same time
+# and potentially upgrading jitterentropy-library alone could break
+# rng-tools' jitter functionality).
+#
+pkgver=3.4.1
+pkgrel=2
+pkgdesc="Jitterentropy library"
+url="https://www.chronox.de/jent/"
+arch="all"
+license="BSD-3-Clause OR GPL-2.0-only"
+subpackages="$pkgname-dev $pkgname-doc"
+options="!check" # There are no testcases
+source="$pkgname-$pkgver.tar.gz::https://github.com/smuellerDD/jitterentropy-library/archive/v$pkgver.tar.gz
+	01-disable-gcc-optimisation.patch
+	02-fix-s390x-stack-corruption.patch
+	03-fix-dangling-pointer.patch
+	04-fix-memory-leak.patch
+	"
+
+build() {
+	make
+}
+
+package() {
+	make DESTDIR="$pkgdir" PREFIX=/usr install
+}
+
+sha512sums="
+c832b33c084a8c56fb9ee0c0f7397fa9206cbd6fcbea047495e543566fc0d9b5d8978c8668103203d87b5b70c0e177f9ef7cc614b3ce689b90fbb8b85e6fedbb  jitterentropy-library-3.4.1.tar.gz
+da19a711ca37081d05cefd46eff148dc6f44590b3b7375fbee9dd4bad453e2127256135d0f396ff614dc729fee2c80e0e567e19bb8829761cbd4a4c125341e4b  01-disable-gcc-optimisation.patch
+737848e0f2b43b81b2caf8f9600c616d6ad79a1c3a9bbc2346ae9e23f7dddf20ddb265caeb6be0e0bd70cc6e7d2eaf36aa457d2b45c86d9e8e2efa37ba9013b7  02-fix-s390x-stack-corruption.patch
+a3a4f0d66094c7d3139eef02437d17848fb5dcd338a84757f36eae71ba5c685cfe038d24cba990c2a940eccfcfdc6b3aaa780afa4ded33efe6f165d96df75c78  03-fix-dangling-pointer.patch
+1edd24b3deb171850dc06e25a579ca15db69ac28bb867c9210c8a600b4370afb82aa12511daddbe994d58997282dc8d486e538c5e7ceb5296a5387c88c1f120a  04-fix-memory-leak.patch
+"
diff --git a/main/joe/APKBUILD b/main/joe/APKBUILD
index 62789a7eed9..4e8a51e8abe 100644
--- a/main/joe/APKBUILD
+++ b/main/joe/APKBUILD
@@ -2,20 +2,24 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=joe
 pkgver=4.6
-pkgrel=0
+pkgrel=5
 pkgdesc="Full featured terminal-based screen editor"
-url="http://joe-editor.sourceforge.net/"
+url="https://joe-editor.sourceforge.net/"
 arch="all"
-license="GPL"
-depends=""
+license="GPL-2.0-or-later"
 makedepends="ncurses-dev"
 subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/project/joe-editor/JOE%20sources/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz"
+source="https://downloads.sourceforge.net/project/joe-editor/JOE%20sources/joe-$pkgver/joe-$pkgver.tar.gz
+	c99.patch
+	protos.patch
+	"
 
-builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,14 +29,16 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="3dd64a994fb3d352a12bf027ef16d57d14ac2577fd63fb6b6e25cae46052befaa7c15dc029bff2f8c3275df90f0343bd46313601055d97277ea4540e109fbe82  joe-4.6.tar.gz"
+sha512sums="
+3dd64a994fb3d352a12bf027ef16d57d14ac2577fd63fb6b6e25cae46052befaa7c15dc029bff2f8c3275df90f0343bd46313601055d97277ea4540e109fbe82  joe-4.6.tar.gz
+201e74d0af44a5c4c9cfd665a2a79222246e535deab017f6bf4884215644e89921a08b051f7ba43cdf8cdbbbb15a17e729088ced4e4b6f57e84c4472b28691bd  c99.patch
+9ccd53de36e813c79dbd1c76e43c7f9b756243455e0faf7eb98e8ebeada30256393475270a9858c6f319f28b4fe56f320e81c7898e41cf8b4ade1c22000e6884  protos.patch
+"
diff --git a/main/joe/c99.patch b/main/joe/c99.patch
new file mode 100644
index 00000000000..8d7a64a6419
--- /dev/null
+++ b/main/joe/c99.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/900164
+Patch from https://sourceforge.net/p/joe-editor/mercurial/merge-requests/3/
+
+commit 26e83257075789d901cadbe280ff7f1bd7602983
+Authored by: Nikita Popov 2023-01-31
+
+   Port to C99
+
+   Ensure that functions are declared before use for compatibility
+   with newer compiler versions.
+
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -9,7 +9,7 @@
+ int main() {
+   int a = 0;
+   isblank(a++);
+-  exit(a != 1);
++  return a != 1;
+ }
+ 			],
+ 			[joe_cv_isblank=yes],
+@@ -34,7 +34,7 @@
+ #endif
+ int main() {
+ 	/* exit succesfully if setpgrp() takes two args (*BSD systems) */
+-	exit(setpgrp(0, 0) != 0);
++	return setpgrp(0, 0) != 0;
+ }],
+ 			[joe_cv_setpgrp_void=no],
+ 			[joe_cv_setpgrp_void=yes],
+@@ -95,7 +95,7 @@
+ 	kill((int)getpid(), SIGINT);
+ 	kill((int)getpid(), SIGINT);
+ 	/* exit succesfully if don't have to reinstall sighandler when invoked */
+-	exit(nsigint != 2);
++	return nsigint != 2;
+ }],
+ 			[joe_cv_reinstall_sighandlers=no],
+ 			[joe_cv_reinstall_sighandlers=yes],
+--- a/joe/selinux.c
++++ b/joe/selinux.c
+@@ -6,6 +6,7 @@
+ 
+ #ifdef WITH_SELINUX
+ #include <selinux/selinux.h>
++#include <error.h>
+ static int selinux_enabled = -1;
+ #endif
+ 
+@@ -108,7 +109,7 @@
+ 		return 0;
+ 
+ 	if (setfscreatecon(0) < 0) {
+-		error(0, errno, joe_gettext(_("Could not reset default security context")));
++		error(0, errno, "%s", joe_gettext(_("Could not reset default security context")));
+ 		return 1;
+ 	}
+ #endif
diff --git a/main/joe/protos.patch b/main/joe/protos.patch
new file mode 100644
index 00000000000..f37d18f650a
--- /dev/null
+++ b/main/joe/protos.patch
@@ -0,0 +1,409 @@
+
+Bug: https://bugs.gentoo.org/870769
+
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+
+--- joe-4.6/joe/b.c
++++ joe-4.6-prototypes/joe/b.c
+@@ -23,8 +23,6 @@
+ #endif
+ #endif
+ 
+-extern int errno;
+-
+ #ifdef WITH_SELINUX
+ #include <selinux/selinux.h>
+ static int selinux_enabled = -1;
+@@ -147,7 +145,7 @@ static void pfree(P *p)
+ B bufs = { {&bufs, &bufs} };
+ static B frebufs = { {&frebufs, &frebufs} };
+ 
+-void set_file_pos_orphaned()
++void set_file_pos_orphaned(void)
+ {
+ 	B *b;
+ 	for (b = bufs.link.next; b != &bufs; b = b->link.next)
+@@ -324,7 +322,7 @@ void brm(B *b)
+ 	}
+ }
+ 
+-void brmall()
++void brmall(void)
+ {
+ 	while (!qempty(B, link, &bufs))
+ 		brm(bufs.link.next);
+--- joe-4.6/joe/b.h
++++ joe-4.6-prototypes/joe/b.h
+@@ -171,7 +171,7 @@ extern const char *msgs[];	/* File acces
+ 
+ B *bmk(B *prop);
+ void brm(B *b);
+-void brmall();
++void brmall(void);
+ 
+ B *bfind(const char *s);
+ B *bfind_scratch(const char *s);
+@@ -330,7 +330,7 @@ extern int break_links; /* Break hard li
+ extern int break_symlinks; /* Break symbolic links on write */
+ extern int nodeadjoe; /* Prevent creation of DEADJOE files */
+ 
+-void set_file_pos_orphaned();
++void set_file_pos_orphaned(void);
+ 
+ void breplace(B *b, B *n);
+ 
+--- joe-4.6/joe/charmap.c
++++ joe-4.6-prototypes/joe/charmap.c
+@@ -1423,7 +1423,7 @@ main(int argc,char *argv[])
+ 
+ /* Get names of available encodings (for tab completion of ^T E prompt) */
+ 
+-char **get_encodings()
++char **get_encodings(void)
+ {
+ 	int y;
+ 	char **encodings = 0;
+@@ -1591,7 +1591,7 @@ struct charmap *locale_map;
+ struct charmap *locale_map_non_utf8;
+ 			/* Old, non-utf8 version of locale */
+ 
+-void joe_locale()
++void joe_locale(void)
+ {
+ 	const char *sc;
+ 	char *s, *t, *u;
+--- joe-4.6/joe/charmap.h
++++ joe-4.6-prototypes/joe/charmap.h
+@@ -80,7 +80,7 @@ int from_utf8(struct charmap *map,const
+ int to_uni(struct charmap *cset, int c);
+ void to_utf8(struct charmap *map,char *s,int c);
+ 
+-void joe_locale();
++void joe_locale(void);
+ extern struct charmap *locale_map;	/* Character map of terminal */
+ extern struct charmap *utf8_map;	/* UTF-8 character map */
+ extern struct charmap *utf16_map;	/* UTF-16 character map */
+--- joe-4.6/joe/cmd.c
++++ joe-4.6-prototypes/joe/cmd.c
+@@ -476,7 +476,7 @@ int execmd(CMD *cmd, int k)
+ 	return ret;
+ }
+ 
+-void do_auto_scroll()
++void do_auto_scroll(void)
+ {
+ 	static CMD *myscrup = 0;
+ 	static CMD *myscrdn = 0;
+--- joe-4.6/joe/cmd.h
++++ joe-4.6-prototypes/joe/cmd.h
+@@ -42,7 +42,7 @@ void addcmd(const char *s, MACRO *m);
+ 
+ /* Execute a command.  Returns return value of command */
+ int execmd(CMD *cmd, int k);
+-void do_auto_scroll();
++void do_auto_scroll(void);
+ 
+ extern B *cmdhist; /* Command history buffer */
+ 
+--- joe-4.6/joe/kbd.c
++++ joe-4.6-prototypes/joe/kbd.c
+@@ -425,7 +425,7 @@ static int dokeymap(W *w,char *s,void *o
+ 	return 0;
+ }
+ 
+-static char **get_keymap_list()
++static char **get_keymap_list(void)
+ {
+ 	char **lst = 0;
+ 	struct context *c;
+--- joe-4.6/joe/main.c
++++ joe-4.6-prototypes/joe/main.c
+@@ -95,7 +95,7 @@ time_t cur_time;
+ time_t timer_macro_delay;
+ MACRO *timer_macro;
+ 
+-MACRO *timer_play()
++MACRO *timer_play(void)
+ {
+ 	cur_time = time(NULL);
+ 	if (timer_macro && timer_macro_delay && cur_time >= last_timer_time + timer_macro_delay) {
+--- joe-4.6/joe/mouse.c
++++ joe-4.6-prototypes/joe/mouse.c
+@@ -136,7 +136,7 @@ int uextmouse(W *w, int k)
+ 	return mouse_event(w);
+ }
+ 
+-long mnow()
++long mnow(void)
+ {
+ 	struct timeval tv;
+ 	gettimeofday(&tv, NULL);
+@@ -245,7 +245,7 @@ static void ttputs64(char *pp, ptrdiff_t
+         }
+ }
+ 
+-static void ttputs64_flush()
++static void ttputs64_flush(void)
+ {
+     char x;
+     switch (base64_count) {
+@@ -449,7 +449,7 @@ int utomouse(W *xx, int k)
+  * position that utomouse would use into tmspos. */
+ static off_t tmspos;
+ 
+-static int tomousestay()
++static int tomousestay(void)
+ {
+ 	BW *bw;
+ 	ptrdiff_t x = Cx - 1,y = Cy - 1;
+@@ -556,7 +556,7 @@ int udefmdown(W *xx, int k)
+ 	return 0;
+ }
+ 
+-void reset_trig_time()
++void reset_trig_time(void)
+ {
+ 	if (!auto_rate)
+ 		auto_rate = 1;
+@@ -761,7 +761,7 @@ int udefm3up(W *w, int k)
+ 	return 0;
+ }
+ 
+-void mouseopen()
++void mouseopen(void)
+ {
+ #ifdef MOUSE_XTERM
+ 	if (usexmouse) {
+@@ -774,7 +774,7 @@ void mouseopen()
+ #endif
+ }
+ 
+-void mouseclose()
++void mouseclose(void)
+ {
+ #ifdef MOUSE_XTERM
+ 	if (usexmouse) {
+--- joe-4.6/joe/mouse.h
++++ joe-4.6-prototypes/joe/mouse.h
+@@ -21,12 +21,12 @@ JOE; see the file COPYING.  If not, writ
+ #define MOUSE_MULTI_THRESH	300
+ 
+ #ifdef MOUSE_GPM
+-int gpmopen();		/* initialize the connection. returns 0 on failure. */
+-void gpmclose();	/* close the connection. */
++int gpmopen(void);		/* initialize the connection. returns 0 on failure. */
++void gpmclose(void);	/* close the connection. */
+ #endif
+ 
+-void mouseopen();	/* initialize mouse */
+-void mouseclose();	/* de-initialize mouse */
++void mouseopen(void);	/* initialize mouse */
++void mouseclose(void);	/* de-initialize mouse */
+ 
+ /* mousedn(int x, int y, int middle) - handle a mouse-down event */
+ void mousedn(ptrdiff_t x, ptrdiff_t y, int middle);
+@@ -56,8 +56,8 @@ int udefm3drag(W *, int);
+ int udefmiddledown(W *, int);
+ int udefmiddleup(W *, int);
+ 
+-long mnow();
+-void reset_trig_time();
++long mnow(void);
++void reset_trig_time(void);
+ 
+ /* options */
+ extern int floatmouse;	/* Allow mouse to set cursor past end of lines */
+--- joe-4.6/joe/rc.c
++++ joe-4.6-prototypes/joe/rc.c
+@@ -9,7 +9,7 @@
+ 
+ /* Validate joerc file */
+ 
+-int validate_rc()
++int validate_rc(void)
+ {
+ 	KMAP *k;
+ 	if (!(k = ngetcontext("main")) || kmap_empty(k)) {
+--- joe-4.6/joe/rc.h
++++ joe-4.6-prototypes/joe/rc.h
+@@ -14,4 +14,4 @@
+ int procrc(CAP *cap, char *name);
+ 
+ /* Validate rc file: return -1 if it's bad (call this after rc file has been loaded) */
+-int validate_rc();
++int validate_rc(void);
+--- joe-4.6/joe/selinux.c
++++ joe-4.6-prototypes/joe/selinux.c
+@@ -98,7 +98,7 @@ int match_default_security_context(const
+ }
+ 
+ 
+-int reset_default_security_context()
++int reset_default_security_context(void)
+ {
+ #ifdef WITH_SELINUX
+ 	if (selinux_enabled == -1)
+--- joe-4.6/joe/selinux.h
++++ joe-4.6-prototypes/joe/selinux.h
+@@ -1,4 +1,4 @@
+ int copy_security_context(const char *from_file, const char *to_file);
+ int match_default_security_context(const char *from_file);
+-int reset_default_security_context();
++int reset_default_security_context(void);
+ int output_security_context(const char *from_file);
+--- joe-4.6/joe/state.c
++++ joe-4.6-prototypes/joe/state.c
+@@ -79,7 +79,7 @@ static void load_hist(FILE *f,B **bp)
+ 
+ #define STATE_ID "# JOE state file v1.0\n"
+ 
+-void save_state()
++void save_state(void)
+ {
+ 	char *home = getenv("HOME");
+ 	mode_t old_mask;
+@@ -117,7 +117,7 @@ void save_state()
+ 
+ /* Load state */
+ 
+-void load_state()
++void load_state(void)
+ {
+ 	char *home = getenv("HOME");
+ 	char buf[1024];
+--- joe-4.6/joe/state.h
++++ joe-4.6-prototypes/joe/state.h
+@@ -12,8 +12,8 @@ extern int joe_state;
+ 
+ /* Load state from file */
+ 
+-void load_state();
++void load_state(void);
+ 
+ /* Save state to file */
+ 
+-void save_state();
++void save_state(void);
+--- joe-4.6/joe/syntax.c
++++ joe-4.6-prototypes/joe/syntax.c
+@@ -450,7 +450,7 @@ static void iz_cmd(struct high_cmd *cmd)
+ 	cmd->call = 0;
+ }
+ 
+-static struct high_cmd *mkcmd()
++static struct high_cmd *mkcmd(void)
+ {
+ 	struct high_cmd *cmd = (struct high_cmd *)joe_malloc(SIZEOF(struct high_cmd));
+ 	iz_cmd(cmd);
+--- joe-4.6/joe/tty.c
++++ joe-4.6-prototypes/joe/tty.c
+@@ -520,7 +520,7 @@ static void pauseit(void)
+ 
+ /* Check for type-ahead */
+ 
+-int ttcheck()
++int ttcheck(void)
+ {
+ 	/* Ack previous packet */
+ 	if (ackkbd != -1 && acceptch != NO_MORE_DATA && !have) {
+@@ -710,7 +710,7 @@ char ttgetc(void)
+ 
+ static struct utf8_sm main_utf8_sm;
+ 
+-int ttgetch()
++int ttgetch(void)
+ {
+ 	if (locale_map->type) {
+ 		int utf8_char;
+--- joe-4.6/joe/umath.c
++++ joe-4.6-prototypes/joe/umath.c
+@@ -1645,7 +1645,7 @@ B *mathhist = NULL;
+ 
+ static char **math_word_list;
+ 
+-static void get_math_list()
++static void get_math_list(void)
+ {
+ 	struct var *v;
+ 	char *s;
+--- joe-4.6/joe/unicode.c
++++ joe-4.6-prototypes/joe/unicode.c
+@@ -191,7 +191,7 @@ Convenient character classes:
+ 	cclass_notword:		\W	opposite
+ */
+ 
+-void joe_iswinit()
++void joe_iswinit(void)
+ {
+ 	int x;
+ 
+--- joe-4.6/joe/unicode.h
++++ joe-4.6-prototypes/joe/unicode.h
+@@ -47,7 +47,7 @@ extern struct Cclass cclass_word[1];
+ extern struct Cclass cclass_notword[1];
+ extern struct Cclass cclass_combining[1];
+ 
+-void joe_iswinit();
++void joe_iswinit(void);
+ 
+ int joe_iswupper(struct charmap *,int c);
+ int joe_iswlower(struct charmap *,int c);
+--- joe-4.6/joe/ushell.c
++++ joe-4.6-prototypes/joe/ushell.c
+@@ -114,7 +114,7 @@ static void cfollow(B *b, VT *vt, off_t
+ 	}
+ }
+ 
+-void vt_scrdn()
++void vt_scrdn(void)
+ {
+ 	W *w;
+ 	 if ((w = maint->topwin) != NULL) {
+--- joe-4.6/joe/ushell.h
++++ joe-4.6-prototypes/joe/ushell.h
+@@ -17,4 +17,4 @@ extern B *runhist; /* Shell command hist
+ extern B *buildhist; /* Build command history */
+ extern B *grephist; /* Grep command history */
+ 
+-void vt_scrdn();
++void vt_scrdn(void);
+--- joe-4.6/joe/utag.c
++++ joe-4.6-prototypes/joe/utag.c
+@@ -33,7 +33,7 @@ static void freetag(TAG *n)
+ 	enquef(TAG, link, &tagnodes, n);
+ }
+ 
+-static void clrtags()
++static void clrtags(void)
+ {
+ 	while (!qempty(TAG, link, &tags)) {
+ 		freetag(deque_f(TAG, link, tags.link.next));
+@@ -386,7 +386,7 @@ static int dotag(W *w, char *s, void *ob
+ static char **tag_word_list;
+ static time_t last_update;
+ 
+-static void get_tag_list()
++static void get_tag_list(void)
+ {
+ 	char buf[512];
+ 	char tag[512];
+--- joe-4.6/joe/util/checkwidths.c
++++ joe-4.6-prototypes/joe/util/checkwidths.c
+@@ -87,7 +87,7 @@ int full_read(unsigned char *p, int tota
+ 
+ int get_line(char *buf, int timeout)
+ {
+-    char c;
++    unsigned char c;
+     for (;;) {
+         int x;
+         for (x = 0; x != timeout; ++x)
+@@ -104,7 +104,7 @@ int get_line(char *buf, int timeout)
+     
+ }
+ 
+-int main()
++int main(int argc, char **argv)
+ {
+     struct termios org_attr;
+     struct termios attr;
diff --git a/main/jpeg/APKBUILD b/main/jpeg/APKBUILD
index 5a21f5048dc..6d59c55c5ba 100644
--- a/main/jpeg/APKBUILD
+++ b/main/jpeg/APKBUILD
@@ -1,13 +1,13 @@
-# Contributor: Carlo Landmeter <clandmeter at gmail>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=jpeg
-pkgver=9d
-pkgrel=0
+pkgver=9e
+pkgrel=1
 pkgdesc="Wrapper for libjpeg-turbo"
 url="https://www.ijg.org/"
 arch="noarch"
 options="!check"  # Simple wrapper/container package; no tests needed.
-license="AS-IS"
+license="Public Domain"
 depends="libjpeg-turbo-utils"
 subpackages="$pkgname-dev libjpeg"
 
diff --git a/main/jq/APKBUILD b/main/jq/APKBUILD
index 57afc94ce37..d8c671fdf81 100644
--- a/main/jq/APKBUILD
+++ b/main/jq/APKBUILD
@@ -1,26 +1,20 @@
 # Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr>
-# Maintainer: Johannes Matheis <jomat+alpinebuild@jmt.gr>
+# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
 pkgname=jq
-pkgver=1.6
-pkgrel=1
+pkgver=1.7.1
+pkgrel=0
 pkgdesc="A lightweight and flexible command-line JSON processor"
-url="https://stedolan.github.io/jq/"
+url="https://jqlang.github.io/jq/"
 arch="all"
 license="MIT"
-makedepends="oniguruma-dev automake autoconf libtool"
+makedepends="oniguruma-dev"
 subpackages="$pkgname-doc $pkgname-dev"
-source="https://github.com/stedolan/jq/archive/jq-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgname-$pkgver"
+source="jq-$pkgver.tar.gz::https://github.com/jqlang/jq/releases/download/jq-$pkgver/jq-$pkgver.tar.gz"
 
 # secfixes:
 #   1.6_rc1-r0:
 #     - CVE-2016-4074
 
-prepare() {
-	default_prepare
-	autoreconf -fi
-}
-
 build() {
 	./configure \
 		--build=$CBUILD \
@@ -41,4 +35,6 @@ package() {
 	make DESTDIR="$pkgdir" prefix=/usr install
 }
 
-sha512sums="e707682239c9a3e6c31c2ce0d433c35140d88881d25637cefa880e0ae288b7746497b73b25403ad11134707c755979bee455523fb32b77a716f101f1e07a1149  jq-1.6.tar.gz"
+sha512sums="
+464861fb2e0d6934b616f1dc7f8002d7dae727c8c0c07b385b813e7522ba1ada8ead4165e1d99c892e3ea76e238c55a15b718c738805419721920f88f8d8478c  jq-1.7.1.tar.gz
+"
diff --git a/main/json-c/APKBUILD b/main/json-c/APKBUILD
index de361f308c4..664440b1300 100644
--- a/main/json-c/APKBUILD
+++ b/main/json-c/APKBUILD
@@ -1,56 +1,43 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=json-c
-pkgver=0.13.1
+pkgver=0.17
 pkgrel=0
 pkgdesc="A JSON implementation in C"
 url="https://github.com/json-c/json-c/wiki"
 arch="all"
 license="MIT"
-depends=""
-depends_dev=""
-makedepends="$depends_dev autoconf automake libtool"
-install=""
-subpackages="$pkgname-static $pkgname-dev"
-source="https://s3.amazonaws.com/${pkgname}_releases/releases/$pkgname-${pkgver}.tar.gz
-	"
+makedepends="cmake doxygen samurai"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://s3.amazonaws.com/json-c_releases/releases/json-c-$pkgver.tar.gz"
 
-builddir="$srcdir"/json-c-$pkgver
-prepare() {
-	cd "$builddir"
-	default_prepare
-	autoreconf -f -v -i
-}
+# secfixes:
+#   0.14-r1:
+#     - CVE-2020-12762
 
 build() {
-	cd "$builddir"
-	export CFLAGS="${CFLAGS} -Wno-error=unused-but-set-variable"
-	./configure --prefix=/usr \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--enable-shared \
-		ac_cv_func_malloc_0_nonnull=yes \
-		ac_cv_func_realloc_0_nonnull=yes
-	make -j1
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake -B build -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=ON \
+		-DBUILD_STATIC_LIBS=ON \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		$CMAKE_CROSSOPTS
+	cmake --build build --target all doc
 }
 
 check() {
-	cd "$builddir"
-	make USE_VALGRIND=0 check
+	cmake --build build --target test
 }
 
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install
-}
-
-static() {
-	pkgdesc="Static json-c library"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
+	DESTDIR="$pkgdir" cmake --install build
+	mkdir -p "$pkgdir"/usr/share/doc/$pkgname
+	mv doc/html "$pkgdir"/usr/share/doc/$pkgname
 }
 
-sha512sums="e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1  json-c-0.13.1.tar.gz"
+sha512sums="
+4cbedd559502bf9014cfcd1d0bb8bb80d2abac4e969d95d4170123cd9cbafb0756b913fdbb83f666d14f674d6539a60ed1c5d0eb03c36b8037a2e00dc1636e19  json-c-0.17.tar.gz
+"
diff --git a/main/jwhois/APKBUILD b/main/jwhois/APKBUILD
deleted file mode 100644
index 97cb5af9762..00000000000
--- a/main/jwhois/APKBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# Maintainer: 
-pkgname=jwhois
-pkgver=4.0
-pkgrel=4
-pkgdesc="WHOIS/RWHOIS client"
-url="https://www.gnu.org/software/jwhois/"
-license="GPL"
-depends=
-makedepends="autoconf automake libtool gdbm-dev"
-install=
-subpackages="$pkgname-doc"
-source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
-	automake.patch
-	jwhois-libiconv.patch
-	no-gnulib.patch"
-arch="all"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	autoreconf
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/ \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--disable-nls \
-		--with-cache \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="5d625c3f1031a8eb8ef766ef5d47a8c1a4396d1ad3344fc9449f80dd71ad84aadf21ba67f5c2f99348f732a4df998eefe699fcec4efcadf87f579b70302a44ae  jwhois-4.0.tar.gz
-28d191d01569b68e3453e116fb7294405c38be6c3cea7bc4e3bb8039e823e0af3919501a8291512f4c0b8990b57f6711dc347a432cf9833fe9dcf402358def92  automake.patch
-0daee64f91c8dfd6faa4ad751889aaf10805d7b127bd62856112bdcdd9cb4b29c2e2e62d58a9843cd4d511648c2264a1d47f42137bca8ed59d5a6a7d803c857d  jwhois-libiconv.patch
-60f081d544044ba2ab91f231df0c8facf76b89b406906b61d5b395ca3d299a0d712cd177fe98464db918803500e5f149a4eac44932e47f8cede4ab162bea638e  no-gnulib.patch"
diff --git a/main/jwhois/automake.patch b/main/jwhois/automake.patch
deleted file mode 100644
index f451342c503..00000000000
--- a/main/jwhois/automake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.ac.orig	2012-12-31 15:46:58.239163472 +0000
-+++ ./configure.ac	2012-12-31 15:47:47.289600890 +0000
-@@ -20,7 +20,7 @@
- AC_INIT
- AC_CONFIG_SRCDIR([src/jconfig.c])
- AM_INIT_AUTOMAKE(jwhois,4.0)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
- 
- AH_TEMPLATE([PACKAGE], [package name])
- AH_TEMPLATE([VERSION], [package version])
diff --git a/main/jwhois/jwhois-libiconv.patch b/main/jwhois/jwhois-libiconv.patch
deleted file mode 100644
index 31c54bdf458..00000000000
--- a/main/jwhois/jwhois-libiconv.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- jwhois-4.0/src/Makefile.am
-+++ jwhois-4.0.mod/src/Makefile.am
-@@ -23,6 +23,7 @@
- 	getopt.c getopt1.c jconfig.c string.c cache.c rwhois.c jwhois.c \
- 	whois.c http.c
- 
-+LIBS += @LIBICONV@
- jwhois_LIBS = @LIBINTL@ @LIBICONV@ @LIBS@ 
- 
- jwhois_CFLAGS = $(OLDCFLAGS) -DSYSCONFDIR="\"$(sysconfdir)\"" \
diff --git a/main/jwhois/no-gnulib.patch b/main/jwhois/no-gnulib.patch
deleted file mode 100644
index f4610214f12..00000000000
--- a/main/jwhois/no-gnulib.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- ./configure.ac.orig
-+++ ./configure.ac
-@@ -88,7 +88,6 @@
- AC_PROG_INSTALL
- AC_PROG_CC
- AC_PROG_RANLIB
--gl_EARLY
- 
- GETTEXT_PACKAGE=jwhois
- AC_SUBST(GETTEXT_PACKAGE)
-@@ -209,14 +208,11 @@
- OLDCFLAGS=$CFLAGS
- AC_SUBST(OLDCFLAGS)
- 
--gl_INIT
--
- AC_OUTPUT([ po/Makefile.in m4/Makefile 
- Makefile 
- doc/Makefile 
- doc/sv/Makefile 
- src/Makefile 
--gl/Makefile
- example/Makefile 
- jwhois.spec
- ])
---- ./Makefile.am.orig
-+++ ./Makefile.am
-@@ -19,9 +19,8 @@
- ##
- 
- EXTRA_DIST = config.rpath  m4/ChangeLog config.rpath include/*.h example/jwhois.conf m4/*.m4 jwhois.spec.in jwhois.spec
--SUBDIRS = m4 doc gl src example po
-+SUBDIRS = m4 doc src example po
- 
--AM_CPPFLAGS = -I$(top_srcdir)/gl
- LDADD = lib/libgnu.a
- 
--ACLOCAL_AMFLAGS = -I m4 -I gl/m4
-+ACLOCAL_AMFLAGS = -I m4
---- ./src/Makefile.am.orig
-+++ ./src/Makefile.am
-@@ -30,9 +30,7 @@
-          -DLOCALSTATEDIR="\"$(localstatedir)\"" \
-          -DLOCALEDIR="\"$(localedir)\""
- 
--jwhois_LDADD = $(top_srcdir)/gl/libgnu.a
--
- AM_CFLAGS = $(jwhois_CFLAGS)
- 
- 
--INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl -I$(top_srcdir)/gl
-+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
diff --git a/main/kamailio/0001-mohqueue.patch b/main/kamailio/0001-mohqueue.patch
deleted file mode 100644
index 72ca36b12b0..00000000000
--- a/main/kamailio/0001-mohqueue.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/modules/mohqueue/mohq_funcs.c
-+++ b/src/modules/mohqueue/mohq_funcs.c
-@@ -1405,9 +1405,12 @@
- 
- {
- call_lst *pcall = (call_lst *)*pcbp->param;
-+if (pcall->call_state >= CLSTA_INQUEUE)
-+  { return; }
-+LM_ERR ("invite_cb: INVITE failed for call (%s), code=%x, callstate=%x!\n",
-+  pcall->call_from, ntype, pcall->call_state);
- if (ntype == TMCB_DESTROY)
-   { pcall->call_hash = pcall->call_label = 0; }
--LM_ERR ("invite_cb: INVITE failed for call (%s)!\n", pcall->call_from);
- delete_call (pcall);
- return;
- }
-
diff --git a/main/kamailio/0004-src_core_tcp_read_c.patch b/main/kamailio/0004-src_core_tcp_read_c.patch
deleted file mode 100644
index 08308f77b11..00000000000
--- a/main/kamailio/0004-src_core_tcp_read_c.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_core_tcp_read_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
-
-Index: a/src/core/tcp_read.c
---- a/src/core/tcp_read.c.orig
-+++ a/src/core/tcp_read.c
-@@ -1497,6 +1497,14 @@ void release_tcpconn(struct tcp_connection* c, long st
- 				ip_addr2a(&c->rcv.src_ip), c->rcv.src_port,
- 				ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port);
- 		LM_DBG("extra_data %p\n", c->extra_data);
-+
-+		/* experimental fix tls crash with libressl */
-+		/* add cleanup SSL structure in child process, in parent process SSL structure is empty */
-+		if ((c->type==PROTO_TLS || c->type==PROTO_WSS) && (c->extra_data) && c->fd != -1) {
-+			tls_close(c, c->fd);
-+			tls_tcpconn_clean(c);
-+		}
-+
- 		/* release req & signal the parent */
- 		c->reader_pid=0; /* reset it */
- 		if (c->fd!=-1){
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 772ce0243ca..e0f531580e6 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -1,49 +1,89 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Contributor: Leonardo Arena <rnalrd@gmail.com>
+# Contributor: Yann Vigara <yvigara@angarium.co.uk>
 # Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
 
 pkgname=kamailio
-pkgver=5.2.5
-pkgrel=2
+pkgver=5.8.1
+pkgrel=1
 
 # If building from a git snapshot, specify the gitcommit
-# If building a proper release, leave gitcommit blank
+# If building a proper release, leave gitcommit blank or commented
 #_gitcommit=991fe9b28e0e201309048f3b38a135037e40357a
 
-[ ! -z "$_gitcommit" ] && pkgver="$pkgver.$(date +%Y%m%d)"
-[ ! -z "$_gitcommit" ] && _suffix="-${_gitcommit:0:7}"
-[ ! -z "$_gitcommit" ] && builddir="$srcdir/$pkgname-$_gitcommit" || builddir="$srcdir/$pkgname-$pkgver"
+[ -n "$_gitcommit" ] && pkgver="$pkgver.$(date +%Y%m%d)"
+[ -n "$_gitcommit" ] && _suffix="-${_gitcommit:0:7}"
+[ -n "$_gitcommit" ] && builddir="$srcdir/$pkgname-$_gitcommit" || builddir="$srcdir/$pkgname-$pkgver"
 [ -z "$_gitcommit" ] && _gitcommit="$pkgver"
 
 pkgdesc="Open Source SIP Server"
-url="http://www.kamailio.org/"
-arch="all"
+url="https://www.kamailio.org/"
 pkgusers="kamailio"
 pkggroups="kamailio"
 arch="all"
 license="GPL-2.0-or-later"
+options="!check" # no testsuite
 depends="gawk"
-makedepends="bison db-dev flex freeradius-client-dev expat-dev
-	lksctp-tools-dev perl-dev postgresql-dev python3-dev
-	pcre-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev
-	confuse-dev ncurses-dev sqlite-dev lua-dev openldap-dev openssl-dev
-	net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev
-	linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev
-	ruby-dev libmaxminddb-dev libunistring-dev"
+makedepends="bison
+	confuse-dev
+	curl-dev
+	expat-dev
+	flex
+	freeradius-client-dev
+	hiredis-dev
+	jansson-dev
+	json-c-dev
+	libev-dev
+	libevent-dev
+	libmaxminddb-dev
+	libmemcached-dev
+	libmnl-dev
+	pcre2-dev
+	libpq-dev
+	libgcrypt-dev
+	libunistring-dev
+	libuuid
+	libxml2-dev
+	linux-headers
+	lksctp-tools-dev
+	lua-dev
+	mariadb-dev
+	mosquitto-dev
+	ncurses-dev
+	net-snmp-dev
+	openldap-dev
+	openssl-dev>3
+	openssl-libs-static
+	pcre-dev
+	perl-dev
+	python3-dev
+	rabbitmq-c-dev
+	ruby-dev
+	sqlite-dev
+	unixodbc-dev
+	zlib-static
+	"
+	# These are in testing  / community - can't enable for kamailio in main
+	# librdkafka-dev dnssec-tools-dev libmicrohttpd-dev
+source="kamailio-${pkgver}$_suffix.tar.gz::https://github.com/kamailio/kamailio/archive/$_gitcommit.tar.gz
+	kamailio.initd
+	"
 
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 
+[ "$CARCH" = "armv7" ] && options="$options textrels"
+
 # secfixes:
 #   5.1.4-r0:
-#   - CVE-2018-14767
+#     - CVE-2018-14767
 
 # See Makefile.groups for the list of recommended modules for
 # each package.  What follows is a simplified version of Makefile.groups
 #
 # Alpine specific changes:
 #
-# _mod_list_debugger is not defined in the orginal
+# _mod_list_debugger is not defined in the original
 #
 # Move avp from _mod_list_extras to _mod_list_basic, so that we can create
 # a kamailio-extras package
@@ -56,27 +96,28 @@ _mod_list_basic="avp async auth benchmark blst cfg_rpc cfgt cfgutils corex count
 		maxfwd mediaproxy mqueue \
 		nat_traversal nathelper path pike pv ratelimit rr rtimer \
 		rtpproxy sanity sdpops siputils sl smsops statsc statistics \
-		textops textopsx tm tmx topoh topos xlog rtpengine stun sipt"
+		textops textopsx tm tmx topoh topos xlog rtpengine stun sipt \
+		pv_headers kemix dlgs"
 
 # - extra used modules, with no extra dependency
-_mod_list_extras="auth_diameter call_control cnxcc dmq domainpolicy log_custom \
-		msrp pdb qos sca seas sms sst timer tmrec tsilo uac_redirect \
-		xhttp xhttp_rpc xprint nosip dmq_usrloc statsd rtjson tcpops \
-		auth_xkeys cfgt"
+_mod_list_extras="auth_diameter auth_xkeys call_control cfgt cnxcc dmq dmq_usrloc \
+		domainpolicy file_out influxdbc log_custom msrp nosip pdb qos \
+		rtjson sca seas sms sst statsd tcpops timer tmrec tsilo \
+		uac_redirect xhttp xhttp_rpc xprint"
 
 # - common modules depending on database
-_mod_list_db="acc alias_db auth_db avpops cfg_db db_berkeley db_flatstore \
+_mod_list_db="acc alias_db auth_db avpops cfg_db db_flatstore \
 		db_cluster dialog dispatcher domain drouting group \
 		htable imc matrix mohqueue msilo mtree p_usrloc pdt permissions \
 		pipelimit prefix_route registrar sipcapture siptrace speeddial \
-		sqlops uac uri_db userblacklist usrloc"
+		sqlops uac uri_db userblocklist usrloc"
 
 # - common modules depending on database, using UID db schema
 _mod_list_dbuid="db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags \
 		uid_uri_db"
 
 # - modules for devel purposes
-_mod_list_devel="malloc_test print print_lib"
+_mod_list_devel="print print_lib"
 
 # - modules depending on pcre3 library
 _mod_list_pcre="dialplan lcr regex"
@@ -114,23 +155,20 @@ _mod_list_xmpp="xmpp"
 # - modules depending on confuse library
 _mod_list_carrierroute="carrierroute"
 
-# - modules depending on bdb (db4) library
-_mod_list_berkeley="db_berkeley"
-
 # - modules depending on curl library
 _mod_list_utils="utils http_client"
 
 # - async http_async_client
 _mod_list_http_async="http_async_client"
 
-# - modules depending on purple library
-_mod_list_purple="purple"
-
 # - modules depending on memcache library
 _mod_list_memcached="memcached"
 
 # - modules depending on openssl library
-_mod_list_tls="auth_identity crypto tls"
+_mod_list_tls="crypto tls"
+
+# - modules depending on static openssl library
+_mod_list_tlsa="tlsa"
 
 # - modules depending on openssl library
 _mod_list_outbound="outbound"
@@ -138,7 +176,7 @@ _mod_list_outbound="outbound"
 # - modules depending on unistring library
 _mod_list_websocket="websocket"
 
-# - modules depending on libval-threads libcrypto libsres libpthread
+# - modules depending on dnssec-tools-dev
 _mod_list_dnssec="dnssec"
 
 # - modules depending on libsctp
@@ -156,20 +194,26 @@ _mod_list_presence="presence presence_conference presence_dialoginfo \
 			rls xcap_client xcap_server"
 
 # - modules depending on lua library
-_mod_list_lua="app_lua"
+_mod_list_lua="app_lua app_lua_sr"
 
 # - modules depending on perl library
 _mod_list_perl="app_perl db_perlvdb"
 
-# - modules depending on python3 libarary
-_mod_list_python3="app_python3"
+# - modules depending on python3 library
+_mod_list_python3="app_python3 app_python3s"
 
 # - modules depending on ruby library
-_mod_list_ruby="app_ruby"
+_mod_list_ruby="app_ruby app_ruby_proc"
 
 # - modules depending on rabbitmq
 _mod_list_rabbitmq="rabbitmq"
 
+# - modules depending on rdkafka library
+_mod_list_kafka=kafka
+
+# - modules depending on mqtt mosquitto and ev library
+_mod_list_mqtt=mqtt
+
 # - modules depending on geoip2 library
 _mod_list_geoip2="geoip2"
 
@@ -189,9 +233,10 @@ _mod_list_redis="db_redis ndb_redis topos_redis"
 _mod_list_mono="app_mono"
 
 # - modules related to IMS extensions
-_mod_list_ims="cdp cdp_avp ims_dialog ims_diameter_server ims_auth ims_isc ims_icscf ims_qos \
-		ims_registrar_pcscf ims_registrar_scscf ims_usrloc_pcscf ims_ocs \
-		ims_usrloc_scscf ims_charging"
+_mod_list_ims="cdp cdp_avp ims_dialog ims_diameter_server ims_auth \
+		ims_ipsec_pcscf ims_isc ims_icscf ims_qos ims_registrar_pcscf \
+		ims_registrar_scscf ims_usrloc_pcscf ims_ocs ims_usrloc_scscf \
+		ims_charging"
 
 # - modules depending on osp toolkit library
 _mod_list_osp="osp"
@@ -199,9 +244,6 @@ _mod_list_osp="osp"
 # - modules depending on java library
 _mod_list_java="app_java"
 
-# - modules depending on iptables library
-_mod_list_iptrtpproxy="iptrtpproxy"
-
 # - modules depending on gzip library
 _mod_list_gzcompress="gzcompress"
 
@@ -223,15 +265,18 @@ _mod_list_jansson="jansson janssonrpcc acc_json"
 # - modules depending on libm
 _mod_list_jsdt="app_jsdt"
 
-# - modules depending on sqlang
-_mod_list_sqlang="app_sqlang"
-
 # - modules depending on rabbitmq
 _mod_list_rabbitmq="rabbitmq"
 
 # - modules depending on sipdump
 _mod_list_sipdump="sipdump"
 
+# - modules depending on libgcrypt
+_mod_list_gcrypt="gcrypt"
+
+# - modules depending on libmicrohttpd
+_mod_list_microhttpd="microhttpd"
+
 
 # Alpine Specific
 _mod_list_debugger="$_mod_list_devel benchmark debugger"
@@ -245,23 +290,16 @@ subpackages="$pkgname-doc $pkgname-dbg $pkgname-openrc"
 _modules="$_module_group_kstandard"
 for _i in db postgres sqlite dbtext mysql \
 	cpl xml unixodbc snmpstats xmpp carrierroute \
-	ldap utils tls presence lua ims outbound debugger \
+	ldap utils tls tlsa presence lua ims outbound debugger \
 	extras json websocket authephemeral \
-	uuid ev memcached redis geoip2 jansson sqlang sipdump \
-	jsdt http_async kazoo rabbitmq sctp radius perl python3 \
-	ruby; do
+	uuid ev memcached redis geoip2 jansson sipdump \
+	jsdt http_async kazoo rabbitmq sctp radius perl \
+	python3 mqtt ruby gcrypt; do
 
 	subpackages="$subpackages $pkgname-$_i"
 	eval "_modules=\"\$_modules \$_mod_list_$_i\""
 done
 
-source="kamailio-${pkgver}$_suffix.tar.gz::https://github.com/kamailio/kamailio/archive/$_gitcommit.tar.gz
-	0001-mohqueue.patch
-	0004-src_core_tcp_read_c.patch
-	dont-force-mips-revision.patch
-	kamailio.initd
-	"
-
 snapshot() {
 	if [ ! -f "$SRCDEST"/$pkgname-${pkgver}$_suffix.tar.gz ]; then
 		wget -O "$SRCDEST"/$pkgname-${pkgver}$_suffix.tar.gz https://github.com/kamailio/$pkgname/archive/$_gitcommit.tar.gz
@@ -275,7 +313,7 @@ prepare() {
 	cd utils/kamctl/
 	sed -i -e 's:/var/run/kamailio.pid:/var/run/kamailio/kamailio.pid:g' \
 		kamctl.base kamctlrc
-	# we actually dont need bash
+	# we actually don't need bash
 	sed -i -e 's:/bin/bash:/bin/sh:' kamctl kamdbctl
 }
 
@@ -295,7 +333,7 @@ build() {
 }
 
 package() {
-	make  FREERADIUS=1 -j1 install
+	make FREERADIUS=1 install
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -d -o kamailio "$pkgdir"/var/run/kamailio
@@ -304,7 +342,7 @@ package() {
 _mv_mod() {
 	local moddir=usr/lib/kamailio/modules i=
 	mkdir -p "$subpkgdir"/$moddir
-	for i in $@; do
+	for i in "$@"; do
 		mv "$pkgdir"/$moddir/$i.so "$subpkgdir"/$moddir/
 	done
 }
@@ -315,7 +353,6 @@ _generic_pkg() {
 	_mv_mod $2
 }
 
-
 _db_driver() {
 	pkgdesc="Database drivers for $1"
 	depends="$pkgname $pkgname-db"
@@ -328,7 +365,6 @@ _db_driver() {
 		"$subpkgdir"/usr/lib/kamailio/kamctl/
 }
 
-
 db() {
 	_generic_pkg "modules using a database backend" "$_mod_list_db"
 }
@@ -348,8 +384,7 @@ sqlite() {
 dbtext() {
 	_db_driver DBText text dbtext dbtext
 	# kamdbctl.dbtext is a python script - but we will not make python
-	# a dependency because kamdbctl is not normaly used
-	depends="$depends"
+	# a dependency because kamdbctl is not normally used
 	mkdir -p "$subpkgdir"/usr/lib/kamailio/kamctl
 	mv "$pkgdir"/usr/lib/kamailio/kamctl/dbtextdb \
 		"$subpkgdir"/usr/lib/kamailio/kamctl/
@@ -400,7 +435,7 @@ ldap() {
 }
 
 utils() {
-	_generic_pkg "miscelaneous utility functions" \
+	_generic_pkg "miscellaneous utility functions" \
 		"$_mod_list_utils"
 }
 
@@ -409,6 +444,11 @@ tls() {
 		"$_mod_list_tls"
 }
 
+tlsa() {
+	_generic_pkg "TLS support compiled statically against libssl and libcrypto" \
+		"$_mod_list_tlsa"
+}
+
 presence() {
 	_generic_pkg "SIP Notify (Presence) support" \
 		"$_mod_list_presence"
@@ -489,7 +529,6 @@ jsdt() {
 		"$_mod_list_jsdt"
 }
 
-
 redis() {
 	_generic_pkg "Redis NoSQL support" \
 		"$_mod_list_redis"
@@ -530,23 +569,49 @@ ruby() {
 		"$_mod_list_ruby"
 }
 
-sqlang() {
-	_generic_pkg "Squirrel Language (SQLang) for Kamailio" \
-		"$_mod_list_sqlang"
+# Archived as of 5.8.0 (2024-03-29)
+#sqlang() {
+#	_generic_pkg "Squirrel Language (SQLang) for Kamailio" \
+#		"$_mod_list_sqlang"
+#}
+
+mqtt() {
+		_generic_pkg "MQTT publish/subscribe connector" \
+		"$_mod_list_mqtt"
 }
 
+# kafka() {
+#		_generic_pkg "Produce and send messages to a Kafka server" \
+#		"$_mod_list_kafka"
+# }
+
 rabbitmq() {
 	_generic_pkg "RabbitMQ related modules for Kamailio" \
 		"$_mod_list_rabbitmq"
 }
 
+# dnssec() {
+#	_generic_pkg "DNSSEC implementation for SIP routing" \
+#		"$_mod_list_dnssec"
+# }
+
 sipdump() {
 	_generic_pkg "This module writes SIP traffic and some associated details into local files" \
 		"$_mod_list_sipdump"
 }
 
-sha512sums="045f52f633897fdfce8afe508bf2f803f79a2b7d16be129314464c0da7a124fd64d9de8783b11b184324775bebf9d9aa82eb76a9e9397b8d6fd2d8d3470b03e8  kamailio-5.2.5.tar.gz
-bbb00a3b680d2805aebf412a7cd77d5ac16e5edb45077516635101f78782dcaa779f84a3678fdd820fa7d7f021ae89271811b2e344092a8f5b7fe6eeee4c2599  0001-mohqueue.patch
-af8362201957eae6b66baf7368c9ca884024209a396d77c5c52180c9aabe13772e9c6513e59721d39503e5bb7a8c1030f5c10301ea9055bddafb7f01ee2f3076  0004-src_core_tcp_read_c.patch
-100a40ec63eaf62f8ac794f1bb17e8109030413617e61a7d2f55a8c8efbe26c1f0f611e6d99548638001f1af678fb7129a98db175eb02190c85d31f60af52202  dont-force-mips-revision.patch
-0c87bfb78481568c03e603049eb8597a90d24ae2941fc81694181b2326fa9db89fbddaaa3cf08c7bc2f5fa0e7ffac4cf4e2d010d08c4faa6cf6df98593432539  kamailio.initd"
+microhttpd() {
+	_generic_pkg "Simple HTTP server using libmicrohttpd" \
+		"$_mod_list_microhttpd"
+}
+
+gcrypt() {
+	_generic_pkg "Cryptography functions using libcrypt" \
+		"$_mod_list_gcrypt"
+}
+
+
+sha512sums="
+84e1ca018477d880bdb085c2267205f9f04730053c9aa3a61eb5c11528a4d5f3c7bea0b6fa7bc6ab45036fc1b3fedd97c70d1e4628e9e6a295787d342ade3183  kamailio-5.8.1.tar.gz
+38a786b48d433b2e99a29249458c1ffcc3f449a1898df6ef1f4b8ebf7770e99d80ce6e3340ea680b44e725b951e65fd06d395ecb903600d7c8fdc0a736c4d9b1  kamailio.initd
+"
diff --git a/main/kamailio/dont-force-mips-revision.patch b/main/kamailio/dont-force-mips-revision.patch
deleted file mode 100644
index 154772304e4..00000000000
--- a/main/kamailio/dont-force-mips-revision.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/src/Makefile.defs
-+++ b/src/Makefile.defs
-@@ -321,7 +321,8 @@
- 
- mips_macros= __mips__ __mips _MIPS_ARCH_MIPS1
- mips2_macros= _MIPS_ISA_MIPS2 _MIPS_ISA_MIPS3 _MIPS_ISA_MIPS4 \
--			_MIPS_ARCH_MIPS2 _MIPS_ARCH_MIPS3 _MIPS_ARCH_MIPS4
-+			_MIPS_ARCH_MIPS2 _MIPS_ARCH_MIPS3 _MIPS_ARCH_MIPS4 \
-+			_MIPS_ISA_MIPS32
- mips64_macros= _MIPS_ISA_MIPS64 _MIPS_ARCH_MIPS64
- 
- alpha_macros= __alpha__ __alpha _M_ALPHA_
-@@ -1364,7 +1365,7 @@
- ifeq		($(CC_NAME), gcc)
- 				C_DEFS+=-DCC_GCC_LIKE_ASM
- 				#common stuff
--				CFLAGS= -mips2 $(CC_OPT) -funroll-loops $(PROFILE)
-+				CFLAGS= $(CC_OPT) -funroll-loops $(PROFILE)
- 			#if gcc 8.0+, 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+
- ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+,$(CC_SHORTVER))))
- 					CFLAGS+=-ftree-vectorize -fno-strict-overflow
-@@ -1410,7 +1411,7 @@
- ifeq		($(CC_NAME), gcc)
- 				C_DEFS+=-DCC_GCC_LIKE_ASM
- 				#common stuff
--				CFLAGS= -mips64 $(CC_OPT) -funroll-loops $(PROFILE)
-+				CFLAGS= $(CC_OPT) -funroll-loops $(PROFILE)
- 			#if gcc 8.0+, 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+
- ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+,$(CC_SHORTVER))))
- 					CFLAGS+=-ftree-vectorize -fno-strict-overflow
diff --git a/main/kamailio/kamailio.initd b/main/kamailio/kamailio.initd
index 8c400173c50..d6124ab413b 100644
--- a/main/kamailio/kamailio.initd
+++ b/main/kamailio/kamailio.initd
@@ -1,35 +1,16 @@
 #!/sbin/openrc-run
 
-daemon=/usr/sbin/kamailio
-pidfile=/var/run/kamailio/kamailio.pid
-
-extra_started_commands="reload"
+command="/usr/sbin/kamailio"
+command_args="$KAMAILIO_OPTS -DD -u ${KAMAILIO_USER:-kamailio} -g ${KAMAILIO_GROUP:-kamailio}"
+command_background="true"
+pidfile="/run/kamailio.pid"
 
 depend() {
 	need net
 	after firewall mariadb postgresql
 }
 
-start() {
-	ebegin "Starting Kamailio"
+start_pre() {
 	checkpath -d -o kamailio:kamailio /var/run/kamailio
-	start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon \
-		-- \
-		-u ${KAMAILIO_USER:-kamailio} \
-		-g ${KAMAILIO_GROUP:-kamailio} \
-		-P $pidfile \
-		${KAMAILIO_OPTS:-}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Kamailio"
-	start-stop-daemon --retry 10 --stop --quiet --pidfile $pidfile
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading Kamailio"
-	echo mi_dg dp_reload | kamcmd 2>/dev/null
-	eend $?
+	kamailio -c
 }
diff --git a/main/kbd/0001-libkbdfile-Check-compression-suffix-even-if-the-suff.patch b/main/kbd/0001-libkbdfile-Check-compression-suffix-even-if-the-suff.patch
deleted file mode 100644
index f3e8628af00..00000000000
--- a/main/kbd/0001-libkbdfile-Check-compression-suffix-even-if-the-suff.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 7e27102b6fc6991a6a4eca422b513781a26b1639 Mon Sep 17 00:00:00 2001
-From: Alexey Gladkov <gladkov.alexey@gmail.com>
-Date: Wed, 21 Aug 2019 13:29:16 +0200
-Subject: [PATCH] libkbdfile: Check compression suffix even if the suffix is
- part of filename
-
-Link: https://github.com/legionus/kbd/issues/32
-
-Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
----
- src/libkbdfile/kbdfile.c | 25 ++++++++++++-------------
- src/libkbdfile/kbdfile.h |  2 ++
- 2 files changed, 14 insertions(+), 13 deletions(-)
-
-diff --git a/src/libkbdfile/kbdfile.c b/src/libkbdfile/kbdfile.c
-index fb8e035..487b434 100644
---- a/src/libkbdfile/kbdfile.c
-+++ b/src/libkbdfile/kbdfile.c
-@@ -344,20 +344,13 @@ StartScan:
- 		snprintf(fp->pathname, sizeof(fp->pathname), "%s/%s%s%s", dir, fnam, suf[index], (dc ? dc->ext : ""));
- 
- 		if (!dc) {
--			fp->flags &= ~KBDFILE_PIPE;
--			fp->fd = fopen(fp->pathname, "r");
-+			rc = maybe_pipe_open(fp);
-+			goto EndScan;
-+		}
- 
--			if (!(fp->fd)) {
--				strerror_r(errno, errbuf, sizeof(errbuf));
--				ERR(fp->ctx, "fopen: %s: %s", fp->pathname, errbuf);
--				rc = -1;
--				goto EndScan;
--			}
--		} else {
--			if (pipe_open(dc, fp) < 0) {
--				rc = -1;
--				goto EndScan;
--			}
-+		if (pipe_open(dc, fp) < 0) {
-+			rc = -1;
-+			goto EndScan;
- 		}
- 	}
- 
-@@ -457,3 +450,9 @@ kbdfile_open(struct kbdfile_ctx *ctx, const char *filename)
- 
- 	return fp;
- }
-+
-+int
-+kbdfile_is_compressed(struct kbdfile *fp)
-+{
-+	return (fp->flags & KBDFILE_PIPE);
-+}
-diff --git a/src/libkbdfile/kbdfile.h b/src/libkbdfile/kbdfile.h
-index 412179a..0318a8e 100644
---- a/src/libkbdfile/kbdfile.h
-+++ b/src/libkbdfile/kbdfile.h
-@@ -45,6 +45,8 @@ int kbdfile_set_pathname(struct kbdfile *fp, const char *pathname);
- FILE *kbdfile_get_file(struct kbdfile *fp);
- int kbdfile_set_file(struct kbdfile *fp, FILE *x);
- 
-+int kbdfile_is_compressed(struct kbdfile *fp);
-+
- #include <syslog.h>
- 
- void
diff --git a/main/kbd/0001-libkeymap-Fix-the-compatibility-with-the-busybox-s-l.patch b/main/kbd/0001-libkeymap-Fix-the-compatibility-with-the-busybox-s-l.patch
deleted file mode 100644
index 45508e3eee5..00000000000
--- a/main/kbd/0001-libkeymap-Fix-the-compatibility-with-the-busybox-s-l.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c994c7763b390d28ac92223eaa6176a136ad7b58 Mon Sep 17 00:00:00 2001
-From: Alexey Gladkov <gladkov.alexey@gmail.com>
-Date: Thu, 26 Sep 2019 11:24:48 +0200
-Subject: [PATCH] libkeymap: Fix the compatibility with the busybox's loadkmap
-
-Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
----
- src/libkeymap/dump.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c
-index 83ac351..8531b5a 100644
---- a/src/libkeymap/dump.c
-+++ b/src/libkeymap/dump.c
-@@ -72,9 +72,14 @@ int lk_dump_bkeymap(struct lk_ctx *ctx, FILE *fd)
- 			continue;
- 
- 		for (j = 0; j < NR_KEYS / 2; j++) {
--			int v = lk_get_key(ctx, i, j);
-+			int value = lk_get_key(ctx, i, j);
- 
--			if (fwrite(&v, sizeof(v), 1, fd) != 1)
-+			if (value < 0 || value > USHRT_MAX) {
-+				ERR(ctx, _("can not bind key %d to value %d because it is too large"), j, value);
-+				goto fail;
-+			}
-+
-+			if (fwrite(&value, sizeof(unsigned short), 1, fd) != 1)
- 				goto fail;
- 		}
- 	}
diff --git a/main/kbd/APKBUILD b/main/kbd/APKBUILD
index 873c06ee18d..c619bb68eec 100644
--- a/main/kbd/APKBUILD
+++ b/main/kbd/APKBUILD
@@ -1,24 +1,28 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kbd
-pkgver=2.2.0
-pkgrel=2
+pkgver=2.6.4
+pkgrel=0
 pkgdesc="Tools for configuring the console (keyboard, virtual terminals, etc.)"
-url="http://kbd-project.org/"
+url="https://kbd-project.org/"
 arch="all"
 license="GPL-2.0-or-later"
 depends="kbd-misc"
-makedepends="linux-headers linux-pam-dev check-dev ckbcomp xkeyboard-config"
+makedepends="
+	autoconf
+	automake
+	check-dev
+	ckbcomp
+	linux-headers
+	linux-pam-dev
+	musl-legacy-error
+	xkeyboard-config-dev
+	"
 subpackages="$pkgname-bkeymaps::noarch $pkgname-legacy::noarch
 	$pkgname-misc::noarch $pkgname-doc $pkgname-openrc $pkgname-vlock"
 source="https://www.kernel.org/pub/linux/utils/kbd/kbd-$pkgver.tar.gz
 	loadkeys.initd
 	loadkeys.confd
-
-	error.h
-	fix-tests.patch
-	0001-libkbdfile-Check-compression-suffix-even-if-the-suff.patch
-	0001-libkeymap-Fix-the-compatibility-with-the-busybox-s-l.patch
 	"
 
 _datadir=/usr/share
@@ -26,40 +30,28 @@ _xmapdir="$_datadir"/keymaps/xkb
 _bmapdir="$_datadir"/bkeymaps
 _badmaps="pk-ara"
 
-prepare() {
-	default_prepare
-
-	# 0001-libkeymap-Fix-the-compatibility-with-the-busybox-s-l.patch
-	# makes this test fail because changes to tests were not backported.
-	# Remove the following line when the patch is removed.
-	truncate -s0 "$builddir"/tests/dumpkeys-bkeymap.in
-
-	cd "$builddir"
-	cp "$srcdir"/error.h .
-}
-
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--disable-nls \
 		--prefix=/usr \
+		--sysconfdir=/etc \
 		--datadir="$_datadir" \
-		--htmldir=/usr/share/html/$pkgname
+		--htmldir=/usr/share/html/$pkgname \
+		--disable-static
 	make
 }
 
 check() {
 	# dumpkeys-bkeymap fails
 	[ "$CARCH" = s390x ] && return 0
-	cd "$builddir"
 	make check
 }
 
 _listxmaps() {
 	local invariant line; invariant=false
-	grep -v '^$' /usr/share/X11/xkb/rules/base.lst | while read line; do
+	grep -v '^$' /usr/share/X11/xkb/rules/base.lst | while read -r line; do
 	case "$line" in
 		'! variant') invariant=true ;;
 		'!'*) invariant=false ;;
@@ -71,7 +63,6 @@ _listxmaps() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -Dm755 "$srcdir"/loadkeys.initd \
@@ -112,10 +103,10 @@ package() {
 	_listxmaps | while read -r variant layout; do
 		if ! test -f "$pkgdir$_xmapdir"/"$layout".map.gz; then
 			echo "Generating keymap $layout..."
-			ckbcomp "$layout" | gzip > "$pkgdir$_xmapdir"/"$layout".map.gz || exit 1
+			ckbcomp "$layout" | gzip > "$pkgdir$_xmapdir"/"$layout".map.gz
 		fi
 		echo "Generating keymap $layout-$variant..."
-		ckbcomp "$layout" "$variant" | gzip > "$pkgdir$_xmapdir"/"$layout"-"$variant".map.gz || exit 1
+		ckbcomp "$layout" "$variant" | gzip > "$pkgdir$_xmapdir"/"$layout"-"$variant".map.gz
 	done
 
 	# Do some fix-ups on X.org keymaps
@@ -153,6 +144,7 @@ bkeymaps() {
 	mkdir -p "$subpkgdir$_bmapdir"
 	local map variant layout; for map in "$pkgdir$_xmapdir"/*.map.gz; do
 		variant="$(basename "$map" | cut -d. -f1)"
+		# shellcheck disable=2254
 		case "$variant" in $_badmaps) continue ;; esac
 
 		layout="${variant%%-*}"
@@ -180,10 +172,8 @@ misc() {
 	done
 }
 
-sha512sums="17f70402126e545c318a5de0265875135b6ebdc0ff9905cb8094dc74a5b27a9d6cede05f7dd4f6f1e68d4aff113e9c82b41caf4da5657d818b4d6a6d477a2789  kbd-2.2.0.tar.gz
+sha512sums="
+2bde7a271392f0ac81966af46c4b3568c9e777550fd0b0d1627db158f0b24b8a67f3c0cca84de9b33d43ac8cbb730c1610212c3da071add3559abe6c4397272f  kbd-2.6.4.tar.gz
 64b5ab4c362350521da8f507d22c0b77784da99bbe1b32f0c001cd826f63c607e3f9cd6af01f06a61af8bd709760bbf2bb3cfe2010c33925f2987a1af6ef4998  loadkeys.initd
 12028796552a5ffed1d5cb19d37fc6a73fb4f2e2bf34d837a81171c7ebee98d6c3f557715bf79706d79ce053b9b2450cd8cf1c4ea045428fb7d8a5915ae3ed78  loadkeys.confd
-c66f6b0d8c8b8d285c740bdbe7130dee272ac01cd5e73b35a58cedf1a77fe8d9e062631b804fb58014d8eb9861c8f28aed07bc022ef31662bcc61b5c85a21752  error.h
-bb67e5bb933a48f4a04402e07d7d67169a97485e6b469f8ccd4436466eb17ec2ddcf0ef74d22b3aae9e813feaee5bef0822ec50c384e0276a8c91f9325502a5f  fix-tests.patch
-edd53405ae22c19c0c4384318fde7bdea27de5428931b304b1d1a02bc268aea147ec9ff2c7296f7f22ee1b544c6ba30688d77e85a3f8751d4c5bcbe80fd0e518  0001-libkbdfile-Check-compression-suffix-even-if-the-suff.patch
-af4c92c7420a42b5ad7a8d24ad97ce8fd63c75f37e5f3dbc04adfdce2509d343160475e74c03f78243eff32abe5d5efa9df61cbe9b754f4ed8f56c07d7890969  0001-libkeymap-Fix-the-compatibility-with-the-busybox-s-l.patch"
+"
diff --git a/main/kbd/error.h b/main/kbd/error.h
deleted file mode 100644
index 5eb8ed5115f..00000000000
--- a/main/kbd/error.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef ERROR_H
-#define ERROR_H
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <err.h>
-
-static inline void error(int status, int errnum, const char *fmt, ...)
-{
-	va_list ap;
-	void (*errfunc[2])(int, const char *, va_list) = { &verr, &verrx };
-	void (*warnfunc[2])(const char *, va_list) = { &vwarn, &vwarnx };
-	fflush(stdout);
-	va_start(ap, fmt);
-	if (status != 0)
-		errfunc[errnum==0](status, fmt, ap); /* does not return */
-	warnfunc[errnum==0](fmt, ap);
-	va_end(ap);
-}
-#endif
diff --git a/main/kbd/fix-tests.patch b/main/kbd/fix-tests.patch
deleted file mode 100644
index 0ca82420c78..00000000000
--- a/main/kbd/fix-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-busybox readlink doesn't accept -e, and in these cases -f has the same effect.
---- a/tests/alt-is-meta.in
-+++ b/tests/alt-is-meta.in
-@@ -1,6 +1,6 @@
- #!/bin/sh -efu
- 
--cwd="$(readlink -ev "${0%/*}")"
-+cwd="$(readlink -fv "${0%/*}")"
- 
- cd "$cwd"
- 
---- a/tests/dumpkeys-bkeymap.in
-+++ b/tests/dumpkeys-bkeymap.in
-@@ -1,6 +1,6 @@
- #!/bin/sh -efu
- 
--cwd="$(readlink -ev "${0%/*}")"
-+cwd="$(readlink -fv "${0%/*}")"
- 
- cd "$cwd"
- 
---- a/tests/dumpkeys-fulltable.in
-+++ b/tests/dumpkeys-fulltable.in
-@@ -1,6 +1,6 @@
- #!/bin/sh -efu
- 
--cwd="$(readlink -ev "${0%/*}")"
-+cwd="$(readlink -fv "${0%/*}")"
- 
- cd "$cwd"
- 
---- a/tests/dumpkeys-mktable.in
-+++ b/tests/dumpkeys-mktable.in
-@@ -1,6 +1,6 @@
- #!/bin/sh -efu
- 
--cwd="$(readlink -ev "${0%/*}")"
-+cwd="$(readlink -fv "${0%/*}")"
- 
- cd "$cwd"
- 
diff --git a/main/kea/APKBUILD b/main/kea/APKBUILD
new file mode 100644
index 00000000000..c74d0630dcc
--- /dev/null
+++ b/main/kea/APKBUILD
@@ -0,0 +1,287 @@
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+# Contributor: Steve Holweg <skytep@gmail.com>
+# Contributor: Baptiste Jonglez <baptiste--aur@jonglez.org>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=kea
+# NOTE: Upgrade only to even-numbered versions (e.g. 1.8.x, 1.10.x)!
+#   Odd-numbered versions are development versions.
+# NOTE: When bumping, always rebuild all kea hooks (kea-* aports)!
+pkgver=2.4.1
+pkgrel=1
+pkgdesc="DHCPv4 and DHCPv6 server from ISC"
+url="https://kea.isc.org/"
+arch="all"
+license="MPL-2.0"
+depends="kea-dhcp4 kea-dhcp6"
+depends_dev="boost-dev log4cplus-dev"
+checkdepends="procps"
+makedepends="
+	$depends_dev
+	autoconf
+	automake
+	bison
+	botan-dev
+	flex
+	libcap-utils
+	libtool
+	mariadb-dev
+	postgresql-dev
+	python3-dev
+	"
+pkgusers="kea"
+pkggroups="kea"
+install="$pkgname-common.pre-install $pkgname-common.post-upgrade"
+subpackages="
+	$pkgname-doc
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-admin::noarch
+	$pkgname-ctrl-agent:ctrlagent
+	$pkgname-dhcp-ddns:dhcpddns
+	$pkgname-dhcp4
+	$pkgname-dhcp6
+	$pkgname-shell-pyc
+	$pkgname-shell::noarch
+	$pkgname-hook-mysql-cb:hook_mysql_cb
+	$pkgname-hook-pgsql-cb:hook_pgsql_cb
+	$pkgname-hook-ha:hook_ha
+	$pkgname-hook-stat-cmds:hook_stat_cmds
+	$pkgname-hook-lease-cmds:hook_lease_cmds
+	$pkgname-hook-flex-option:hook_flex_option
+	$pkgname-hook-bootp:hook_bootp
+	$pkgname-hook-run-script:hook_run_script
+	$pkgname-common
+	"
+source="https://ftp.isc.org/isc/kea/$pkgver/kea-$pkgver.tar.gz
+	disable-db-tests.patch
+	configs-fix-paths.patch
+	put-LOCKFILE_DIR-to-runstatedir.patch
+	move-api-files-to-doc.patch
+	kea-admin-remove-builddir.patch
+	python3.12.patch
+	kea.initd.in
+	kea.confd.in
+	"
+validpgpkeys="BE0E9748B718253A28BB89FFF1B11BF05CF02E57" # Internet Systems Consortium, Inc. (Signing key, 2017-2018) <codesign@isc.org>
+
+# secfixes:
+#   1.7.2-r0:
+#     - CVE-2019-6472
+#     - CVE-2019-6473
+#     - CVE-2019-6474
+
+# NOTE: libkea-dhcpsrv.so depends on libkea-{mysql,pgsql}, that's why
+#   kea-common depends on libpq and libmariadb. :(
+
+prepare() {
+	default_prepare
+	update_config_sub
+
+	autoreconf -fv
+
+	# Remove the builddir path from the scripts.
+	# NOTE: There's a new script each release, so using patch file would be
+	# very inconvenient.
+	find src/share/database/scripts/ \
+		-name '*.sh.in' \
+		-exec sed -i 's|^\s*. @abs_top_builddir@/src/bin/admin/admin-utils.sh.*|echo "admin-utils.sh not found!"; exit 1|' {} \;
+}
+
+build() {
+	# Complete build for dev and doc
+
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--libexecdir=/usr/lib \
+		--runstatedir=/run \
+		--with-mysql \
+		--with-pgsql \
+		--disable-rpath \
+		--enable-generate-messages \
+		--enable-generate-parser \
+		--enable-shell
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+
+	cd "$pkgdir"
+
+	install -d -m 0750 -o kea -g kea ./var/log/kea ./var/lib/kea
+
+	# keactrl is unnecessary since we provide OpenRC init scripts.
+	rm ./usr/sbin/keactrl ./etc/kea/keactrl.conf
+
+	rm -Rf ./run
+}
+
+dev() {
+	default_dev
+
+	amove ./usr/bin/kea-msg-compiler
+}
+
+admin() {
+	pkgdesc="Databases administration tools for Kea DHCP server"
+	depends="$pkgname-common=$pkgver-r$pkgrel"
+
+	amove ./usr/sbin/kea-admin
+	amove ./usr/share/kea
+}
+
+ctrlagent() {
+	pkgdesc="Kea Control Agent - REST service for controlling Kea DHCP server"
+	depends="$pkgname-common=$pkgver-r$pkgrel"
+
+	amove usr/sbin/kea-ctrl-agent
+	amove ./etc/kea/kea-ctrl-agent.conf
+
+	_install_initd kea-ctrl-agent
+}
+
+dhcpddns() {
+	pkgdesc="Kea DHCP Dynamic DNS Server"
+	depends="$pkgname-common=$pkgver-r$pkgrel"
+
+	amove ./usr/sbin/kea-dhcp-ddns
+	amove ./etc/kea/kea-dhcp-ddns.conf
+	amove ./usr/lib/libkea-asiodns.so.*
+	amove ./usr/lib/libkea-d2srv.so.*
+
+	_install_initd kea-dhcp-ddns
+}
+
+dhcp4() {
+	pkgdesc="Kea IPv4 DHCP Server"
+	depends="$pkgname-common=$pkgver-r$pkgrel"
+
+	amove ./usr/sbin/kea-dhcp4
+	amove ./etc/kea/kea-dhcp4.conf
+
+	_install_initd kea-dhcp4
+}
+
+dhcp6() {
+	pkgdesc="Kea IPv6 DHCP Server"
+	depends="$pkgname-common=$pkgver-r$pkgrel"
+
+	amove ./usr/sbin/kea-dhcp6
+	amove ./etc/kea/kea-dhcp6.conf
+
+	_install_initd kea-dhcp6
+}
+
+shell() {
+	pkgdesc="Text client for Kea DHCP Control Agent"
+	depends="python3"
+
+	amove ./usr/sbin/kea-shell
+	amove ./usr/lib/python3*
+}
+
+hook_mysql_cb() {
+	pkgdesc="Kea MySQL Configuration Backend hooks library"
+	depends=""
+
+	amove ./usr/lib/kea/hooks/libdhcp_mysql_cb.so
+}
+
+hook_pgsql_cb() {
+	pkgdesc="Kea PostgreSQL Configuration Backend hooks library"
+	depends=""
+
+	amove ./usr/lib/kea/hooks/libdhcp_pgsql_cb.so
+}
+
+hook_ha() {
+	pkgdesc="Kea High Availability hooks library"
+	depends="$pkgname-hook-lease-cmds"
+
+	amove ./usr/lib/kea/hooks/libdhcp_ha.so
+}
+
+hook_stat_cmds() {
+	pkgdesc="Kea Statistics Commands hooks library"
+	depends=""
+
+	amove ./usr/lib/kea/hooks/libdhcp_stat_cmds.so
+}
+
+hook_lease_cmds() {
+	pkgdesc="Kea Lease Commands hooks library"
+	depends=""
+
+	amove ./usr/lib/kea/hooks/libdhcp_lease_cmds.so
+}
+
+hook_flex_option() {
+	pkgdesc="Kea Flexible Option hooks library"
+	depends=""
+
+	amove ./usr/lib/kea/hooks/libdhcp_flex_option.so
+}
+
+hook_bootp() {
+	pkgdesc="Kea BOOTP hooks library"
+	depends=""
+
+	amove ./usr/lib/kea/hooks/libdhcp_bootp.so
+}
+
+hook_run_script() {
+	pkgdesc="Kea Run Script hooks library"
+	depends=""
+
+	amove ./usr/lib/kea/hooks/libdhcp_run_script.so
+}
+
+common() {
+	pkgdesc="Common files and libraries for Kea DHCP Server"
+	replaces="kea-utils"  # for backward compatibility
+	provides="kea-utils=$pkgver-r$pkgrel kea-http=$pkgver-r$pkgrel"  # for backward compatibility
+	depends=""
+
+	mkdir -p "$subpkgdir"
+	mv "$pkgdir"/* "$subpkgdir"/
+}
+
+_install_initd() {
+	local name="$1"
+
+	local caps='^cap_net_bind_service'
+	case "$name" in
+		kea-dhcp4) caps="$caps,^cap_net_raw";;
+		kea-ctrl-agent) caps='';;
+	esac
+
+	install -Dm755 "$srcdir"/kea.initd.in "$subpkgdir"/etc/init.d/$name
+	install -Dm644 "$srcdir"/kea.confd.in "$subpkgdir"/etc/conf.d/$name
+	# /^capabilities... is to remove this variable when it's rendered empty (see #15048).
+	sed -i \
+		-e "s|@@NAME@@|$name|g" \
+		-e "s|@@CAPABILITIES@@|$caps|" \
+		-e '/^capabilities=""/d' \
+		"$subpkgdir"/etc/init.d/$name \
+		"$subpkgdir"/etc/conf.d/$name
+}
+
+sha512sums="
+b8a3b6f2cae213fd9826c37568c71d3458f52eed973dbe437a1d0974dafa026635a730d828c6ff03b32e030be57d75a7914a8ca313833e91d9996b6a05b2b224  kea-2.4.1.tar.gz
+9008df39883884db5fb4a6551d92262b465c186275bebd45358bdd25a637517c5613634f7541c226869dd8ca4118230726bf250b1d4c5198f3c5079527c72440  disable-db-tests.patch
+3439046a80de33b31bf3f12e3c9728e47119e245fb888a1e4484a443b20e7b364f0e15e10fa96b4fcfcec29e6d2828ba9ab728a83028546a9c28f30fc404512d  configs-fix-paths.patch
+52de95e9b4de3e518b4fbbce19799230684a2924433e666c24b866e537ffeaea9cd16b0b41499a17dd3ed528be1f899e94e67f6e464d551149b850cdbf29c1b2  put-LOCKFILE_DIR-to-runstatedir.patch
+100b70f3ccecb46b98e9fd599ab6f0c3aa191d862d914ed84f4d34efea0cc119817d1e14b967c0f5024614af1ef6841a8d12e789945cad147d943965f194ece1  move-api-files-to-doc.patch
+eef973da24aaa3dd1b02925d6be1f59caa363a7721e2e4dd6bd8553b0c351961f7436b21c32cbc6acdf90cf99a7fe7daa954c8ce4dbd0eda36844f566b126c48  kea-admin-remove-builddir.patch
+8feb09cf184c3128b8f434e896f062d12e978a3fda435bb57389756cf0290ba993604fc2512101b7d7865c7be831d9fe6519c9e16885c7e737ea63513ed9135f  python3.12.patch
+e2f77a403b1c84918c92acf8c22d4bd3ea3662d109c334aebb4f55f1821901fbf287f0c1ac03f5de56227e888edc63667f54a0ee51fa4b654479f4e14841d11a  kea.initd.in
+eb45671073174e319cd4fedb61c5f8664370f701856569c675a5aaa280bde974bdabbc30e733379b2e61b32dc2e1e94808b79f141de7c209109e874b2b4b5e8f  kea.confd.in
+"
diff --git a/main/kea/configs-fix-paths.patch b/main/kea/configs-fix-paths.patch
new file mode 100644
index 00000000000..d2b3136d005
--- /dev/null
+++ b/main/kea/configs-fix-paths.patch
@@ -0,0 +1,116 @@
+* We have to move logs from /var/log to /var/log/kea to allow running
+  under unprivileged user.
+* /tmp is not a good location for control sockets, move them to /run/kea.
+
+--- a/src/bin/keactrl/kea-ctrl-agent.conf.pre
++++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre
+@@ -32,15 +32,15 @@
+     "control-sockets": {
+         "dhcp4": {
+             "socket-type": "unix",
+-            "socket-name": "/tmp/kea4-ctrl-socket"
++            "socket-name": "/run/kea/kea-dhcp4-ctrl.sock"
+         },
+         "dhcp6": {
+             "socket-type": "unix",
+-            "socket-name": "/tmp/kea6-ctrl-socket"
++            "socket-name": "/run/kea/kea-dhcp6-ctrl.sock"
+         },
+         "d2": {
+             "socket-type": "unix",
+-            "socket-name": "/tmp/kea-ddns-ctrl-socket"
++            "socket-name": "/run/kea/kea-dhcp-ddns-ctrl.sock"
+         }
+     },
+ 
+@@ -73,7 +73,7 @@
+                 // - syslog (logs to syslog)
+                 // - syslog:name (logs to syslog using specified name)
+                 // Any other value is considered a name of the file
+-                "output": "@localstatedir@/log/kea-ctrl-agent.log"
++                "output": "@localstatedir@/log/kea/kea-ctrl-agent.log"
+ 
+                 // Shorter log pattern suitable for use with systemd,
+                 // avoids redundant information
+--- a/src/bin/keactrl/kea-dhcp-ddns.conf.pre
++++ b/src/bin/keactrl/kea-dhcp-ddns.conf.pre
+@@ -23,7 +23,7 @@
+   "port": 53001,
+   "control-socket": {
+       "socket-type": "unix",
+-      "socket-name": "/tmp/kea-ddns-ctrl-socket"
++      "socket-name": "/run/kea/kea-dhcp-ddns-ctrl.sock"
+   },
+   "tsig-keys": [],
+   "forward-ddns" : {},
+@@ -44,7 +44,7 @@
+                 // - syslog (logs to syslog)
+                 // - syslog:name (logs to syslog using specified name)
+                 // Any other value is considered a name of the file
+-                "output": "@localstatedir@/log/kea-ddns.log"
++                "output": "@localstatedir@/log/kea/kea-ddns.log"
+ 
+                 // Shorter log pattern suitable for use with systemd,
+                 // avoids redundant information
+--- a/src/bin/keactrl/kea-dhcp4.conf.pre
++++ b/src/bin/keactrl/kea-dhcp4.conf.pre
+@@ -49,7 +49,7 @@
+     // more. For detailed description, see Sections 8.8, 16 and 15.
+     "control-socket": {
+         "socket-type": "unix",
+-        "socket-name": "/tmp/kea4-ctrl-socket"
++        "socket-name": "/run/kea/kea-dhcp4-ctrl.sock"
+     },
+ 
+     // Use Memfile lease database backend to store leases in a CSV file.
+@@ -429,7 +429,7 @@
+                 // - syslog (logs to syslog)
+                 // - syslog:name (logs to syslog using specified name)
+                 // Any other value is considered a name of the file
+-                "output": "@localstatedir@/log/kea-dhcp4.log"
++                "output": "@localstatedir@/log/kea/kea-dhcp4.log"
+ 
+                 // Shorter log pattern suitable for use with systemd,
+                 // avoids redundant information
+--- a/src/bin/keactrl/kea-dhcp6.conf.pre
++++ b/src/bin/keactrl/kea-dhcp6.conf.pre
+@@ -43,7 +43,7 @@
+     // description, see Sections 9.12, 16 and 15.
+     "control-socket": {
+         "socket-type": "unix",
+-        "socket-name": "/tmp/kea6-ctrl-socket"
++        "socket-name": "/run/kea/kea-dhcp6-ctrl.sock"
+     },
+ 
+     // Use Memfile lease database backend to store leases in a CSV file.
+@@ -388,7 +388,7 @@
+                 // - syslog (logs to syslog)
+                 // - syslog:name (logs to syslog using specified name)
+                 // Any other value is considered a name of the file
+-                "output": "@localstatedir@/log/kea-dhcp6.log"
++                "output": "@localstatedir@/log/kea/kea-dhcp6.log"
+ 
+                 // Shorter log pattern suitable for use with systemd,
+                 // avoids redundant information
+--- a/src/bin/keactrl/kea-netconf.conf.pre
++++ b/src/bin/keactrl/kea-netconf.conf.pre
+@@ -69,7 +69,7 @@
+                 // - syslog (logs to syslog)
+                 // - syslog:name (logs to syslog using specified name)
+                 // Any other value is considered a name of a time
+-                "output": "@localstatedir@/log/kea-netconf.log"
++                "output": "@localstatedir@/log/kea/kea-netconf.log"
+ 
+                 // Shorter log pattern suitable for use with systemd,
+                 // avoids redundant information
+--- a/src/bin/keactrl/keactrl.in
++++ b/src/bin/keactrl/keactrl.in
+@@ -336,7 +336,7 @@
+ # to the default file.
+ if [ -z "${KEA_LOGGER_DESTINATION+x}" ]; then
+     prefix="@prefix@"
+-    export KEA_LOGGER_DESTINATION="@localstatedir@/log/kea.log"
++    export KEA_LOGGER_DESTINATION="@localstatedir@/log/kea/kea.log"
+ fi
+ 
+ command=${1-}
diff --git a/main/kea/disable-db-tests.patch b/main/kea/disable-db-tests.patch
new file mode 100644
index 00000000000..6d254d17833
--- /dev/null
+++ b/main/kea/disable-db-tests.patch
@@ -0,0 +1,18 @@
+Tests for MySQL/PostgreSQL integration are kinda broken, they expect
+already initialized databases prepared for Kea tests.
+
+--- a/src/bin/admin/tests/Makefile.am
++++ b/src/bin/admin/tests/Makefile.am
+@@ -10,10 +10,10 @@
+ SHTESTS += admin_tests.sh
+ SHTESTS += memfile_tests.sh
+ if HAVE_MYSQL
+-SHTESTS += mysql_tests.sh
++#SHTESTS += mysql_tests.sh
+ endif
+ if HAVE_PGSQL
+-SHTESTS += pgsql_tests.sh
++#SHTESTS += pgsql_tests.sh
+ endif
+ 
+ # Run tests on "make check".
diff --git a/main/kea/kea-admin-remove-builddir.patch b/main/kea/kea-admin-remove-builddir.patch
new file mode 100644
index 00000000000..de6be64899b
--- /dev/null
+++ b/main/kea/kea-admin-remove-builddir.patch
@@ -0,0 +1,19 @@
+Patch-Source: https://sources.debian.org/src/isc-kea/1.5.0-2/debian/patches/0003-kea_admin_fix/ (modified)
+--
+From: Kea <isc-kea@packages.debian.org>
+Date: Tue, 19 Feb 2019 12:39:35 +0000
+Subject: kea_admin_fix
+
+Removed the fallback to the build version of kea-admin since it will not exist on users hosts.
+
+--- a/src/bin/admin/kea-admin.in
++++ b/src/bin/admin/kea-admin.in
+@@ -50,8 +50,6 @@
+ # Include the installed admin-utils.sh if available. Fallback to sources otherwise.
+ if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
+     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+-else
+-    . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
+ fi
+ 
+ # Find the installed kea-lfc if available. Fallback to sources otherwise.
diff --git a/main/kea/kea-common.post-upgrade b/main/kea/kea-common.post-upgrade
new file mode 100644
index 00000000000..b873f3150cc
--- /dev/null
+++ b/main/kea/kea-common.post-upgrade
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+ver_old="$2"
+
+if [ "$(apk version -t "$ver_old" '2.0.0-r0')" = '<' ]; then
+	cat >&2 <<-EOF
+	*
+	* Kea BOOTP hook has been moved to a subpackage. If you use it, run
+	*   apk add kea-hook-bootp
+	*
+	EOF
+fi
+
+exit 0
diff --git a/main/kea/kea-common.pre-install b/main/kea/kea-common.pre-install
new file mode 100644
index 00000000000..820a35b364c
--- /dev/null
+++ b/main/kea/kea-common.pre-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+addgroup -S kea 2>/dev/null
+adduser -S -D -H -h /var/lib/kea -s /sbin/nologin -G kea -g "Kea" kea 2>/dev/null
+
+exit 0
diff --git a/main/kea/kea.confd.in b/main/kea/kea.confd.in
new file mode 100644
index 00000000000..2a2289eb04f
--- /dev/null
+++ b/main/kea/kea.confd.in
@@ -0,0 +1,17 @@
+# Configuration for /etc/init.d/@@NAME@@
+
+# Path to @@NAME@@ configuration file.
+#cfgfile="/etc/kea/@@NAME@@.conf"
+
+# Specifies the logging output; one of:
+# - stdout - log to standard output
+# - stderr - log to standard error
+# - syslog:<facility> - log via syslog (default facility is local0)
+# - <filepath> - log to file <filepath>
+#logger_dest="syslog"
+
+# The user (and group) to run @@NAME@@ daemon.
+#command_user="kea"
+
+# Comment out to run without process supervisor.
+supervisor=supervise-daemon
diff --git a/main/kea/kea.initd.in b/main/kea/kea.initd.in
new file mode 100644
index 00000000000..383465d8f49
--- /dev/null
+++ b/main/kea/kea.initd.in
@@ -0,0 +1,45 @@
+#!/sbin/openrc-run
+
+: ${cfgfile:="/etc/kea/@@NAME@@.conf"}
+: ${logger_dest:="syslog"}
+: ${command_user:="kea"}
+: ${retry:="SIGTERM/5/SIGINT/1/SIGKILL/1"}
+: ${wait:=300}
+
+name="@@NAME@@"
+extra_commands="checkconfig"
+description_checkconfig="Checks configuration file for errors"
+
+command="/usr/sbin/@@NAME@@"
+command_args="-c $cfgfile"
+command_background="yes"
+pidfile="/run/$RC_SVCNAME.pid"
+
+start_stop_daemon_args="--wait $wait $start_stop_daemon_args"
+# The leading space is to avoid fallback to $start_stop_daemon_args when this
+# is empty (supervise-daemon doesn't support --wait).
+supervise_daemon_args=" $supervise_daemon_args"
+
+capabilities="@@CAPABILITIES@@"
+
+depend() {
+	need net
+	after firewall
+}
+
+start_pre() {
+	checkpath -d -m 0750 -o $command_user -q /run/kea /run/kea/lock || return 1
+	case "$logger_dest" in
+		/*) checkpath -f -m 0640 -o $command_user "$logger_dest" || return 1
+	esac
+
+	export KEA_LOGGER_DESTINATION="$logger_dest"
+
+	checkconfig
+}
+
+checkconfig() {
+	ebegin "Checking $name configuration"
+	$command -t "$cfgfile" >/dev/null
+	eend $?
+}
diff --git a/main/kea/move-api-files-to-doc.patch b/main/kea/move-api-files-to-doc.patch
new file mode 100644
index 00000000000..d90d9157294
--- /dev/null
+++ b/main/kea/move-api-files-to-doc.patch
@@ -0,0 +1,18 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Tue, 26 Oct 2021 22:40:00 +0200
+Subject: [PATCH] Move api files to /usr/share/doc/kea
+
+--- a/src/share/api/Makefile.am
++++ b/src/share/api/Makefile.am
+@@ -10,8 +10,8 @@
+ EXTRA_DIST += $(api_files)
+ 
+ install-data-local:
+-	mkdir -p $(DESTDIR)$(datarootdir)/${PACKAGE_NAME}/api
+-	cp $(api_files) $(DESTDIR)$(datarootdir)/${PACKAGE_NAME}/api
++	mkdir -p $(DESTDIR)$(datarootdir)/doc/${PACKAGE_NAME}/api
++	cp $(api_files) $(DESTDIR)$(datarootdir)/doc/${PACKAGE_NAME}/api
+ 
+ uninstall-local:
+-	rm -rf $(DESTDIR)$(datarootdir)/${PACKAGE_NAME}/api
++	rm -rf $(DESTDIR)$(datarootdir)/doc/${PACKAGE_NAME}/api
diff --git a/main/kea/put-LOCKFILE_DIR-to-runstatedir.patch b/main/kea/put-LOCKFILE_DIR-to-runstatedir.patch
new file mode 100644
index 00000000000..edf4823c23d
--- /dev/null
+++ b/main/kea/put-LOCKFILE_DIR-to-runstatedir.patch
@@ -0,0 +1,13 @@
+This patch is based on https://sources.debian.org/src/isc-kea/1.5.0-2/debian/patches/0005-Put-KEA_LOCKFILE_DIR-to-runstatedir.patch/
+
+--- a/src/lib/log/interprocess/Makefile.am
++++ b/src/lib/log/interprocess/Makefile.am
+@@ -1,7 +1,7 @@
+ SUBDIRS = . tests
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
+-AM_CPPFLAGS += -DLOCKFILE_DIR=\"$(localstatedir)/run/$(PACKAGE_NAME)\"
++AM_CPPFLAGS += -DLOCKFILE_DIR=\"$(runstatedir)/$(PACKAGE_NAME)\"
+ AM_CPPFLAGS += $(BOOST_INCLUDES)
+ 
+ AM_CXXFLAGS = $(KEA_CXXFLAGS)
diff --git a/main/kea/python3.12.patch b/main/kea/python3.12.patch
new file mode 100644
index 00000000000..5619bf90a2e
--- /dev/null
+++ b/main/kea/python3.12.patch
@@ -0,0 +1,90 @@
+From 9ba2f0ddbcf08d4d67baffa8779abff7042a1c96 Mon Sep 17 00:00:00 2001
+From: Karl Berry <karl@freefriends.org>
+Date: Tue, 25 Feb 2020 18:07:15 -0800
+Subject: python: support both Python 2 and 3 in py-compile
+
+* lib/py-compile: check python major version and use imp
+or importlib accordingly, plus related changes. Original
+patch for Python 3 only from Gabriel Ganne at:
+https://lists.gnu.org/archive/html/automake-patches/2019-07/msg00002.html
+---
+ lib/py-compile | 33 ++++++++++++++++++++++++++-------
+ 1 file changed, 26 insertions(+), 7 deletions(-)
+
+(limited to 'lib/py-compile')
+
+diff --git a/lib/py-compile b/lib/py-compile
+index f2be7d0..e56d98d 100755
+--- a/py-compile
++++ b/py-compile
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # py-compile - Compile a Python program
+ 
+-scriptversion=2018-03-07.03; # UTC
++scriptversion=2020-02-19.23; # UTC
+ 
+ # Copyright (C) 2000-2020 Free Software Foundation, Inc.
+ 
+@@ -115,8 +115,27 @@ else
+     filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
+ fi
+ 
++python_major=$($PYTHON -V 2>&1 | sed -e 's/.* //;s/\..*$//;1q')
++if test -z "$python_major"; then
++  echo "$me: could not determine $PYTHON major version, guessing 3" >&2
++  python_major=3
++fi
++
++# The old way to import libraries was deprecated.
++if test "$python_major" -le 2; then
++  import_lib=imp
++  import_test="hasattr(imp, 'get_tag')"
++  import_call=imp.cache_from_source
++  import_arg2=', False' # needed in one call and not the other
++else
++  import_lib=importlib
++  import_test="hasattr(sys.implementation, 'cache_tag')"
++  import_call=importlib.util.cache_from_source
++  import_arg2=
++fi
++
+ $PYTHON -c "
+-import sys, os, py_compile, imp
++import sys, os, py_compile, $import_lib
+ 
+ files = '''$files'''
+ 
+@@ -129,15 +148,15 @@ for file in files.split():
+ 	    continue
+     sys.stdout.write(file)
+     sys.stdout.flush()
+-    if hasattr(imp, 'get_tag'):
+-        py_compile.compile(filepath, imp.cache_from_source(filepath), path)
++    if $import_test:
++        py_compile.compile(filepath, $import_call(filepath), path)
+     else:
+         py_compile.compile(filepath, filepath + 'c', path)
+ sys.stdout.write('\n')" || exit $?
+ 
+ # this will fail for python < 1.5, but that doesn't matter ...
+ $PYTHON -O -c "
+-import sys, os, py_compile, imp
++import sys, os, py_compile, $import_lib
+ 
+ # pypy does not use .pyo optimization
+ if hasattr(sys, 'pypy_translation_info'):
+@@ -153,8 +172,8 @@ for file in files.split():
+ 	    continue
+     sys.stdout.write(file)
+     sys.stdout.flush()
+-    if hasattr(imp, 'get_tag'):
+-        py_compile.compile(filepath, imp.cache_from_source(filepath, False), path)
++    if $import_test:
++        py_compile.compile(filepath, $import_call(filepath$import_arg2), path)
+     else:
+         py_compile.compile(filepath, filepath + 'o', path)
+ sys.stdout.write('\n')" 2>/dev/null || :
+-- 
+cgit v1.1
+
diff --git a/main/kernel-hooks/APKBUILD b/main/kernel-hooks/APKBUILD
new file mode 100644
index 00000000000..3497f64e9fc
--- /dev/null
+++ b/main/kernel-hooks/APKBUILD
@@ -0,0 +1,20 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=kernel-hooks
+pkgver=0.2
+pkgrel=0
+pkgdesc="Run user-provided hooks when /lib/modules/* is updated"
+url="https://gitlab.alpinelinux.org/alpine/aports/"
+arch="noarch"
+license="MIT"
+triggers="$pkgname.trigger=/lib/modules/*"
+source="README"
+options="!check"  # no tests
+
+package() {
+	install -D -m644 "$srcdir"/README "$pkgdir"/etc/kernel-hooks.d/README
+}
+
+sha512sums="
+757a49dc238ce69210219ad7db9a6ebcd14d696d29d1e52dd57d8ce891aac5218aedbb95d1c73bb60f782d586c837ac100cd347b01c64116c41aa873ac7ff67d  README
+"
diff --git a/main/kernel-hooks/README b/main/kernel-hooks/README
new file mode 100644
index 00000000000..4c908dbddee
--- /dev/null
+++ b/main/kernel-hooks/README
@@ -0,0 +1,13 @@
+Executable scripts found in this directory are executed by the kernel-hooks
+package trigger after any kernel package or package providing kernel modules
+is (re)installed, upgraded or removed.
+
+Scripts are executed sequentially in alphabetic order with the following
+arguments: <kernel-flavor> <new-version> [<old-version>].
+
+<*-version> is a version of kernel package in the same format as in 'uname -r',
+without the flavor (e.g. 5.10.51-0).
+
+<new-version> is empty string if the kernel is removed.
+<old-version> is empty string if the kernel is (re)installed or any package
+providing modules for this kernel is installed, upgraded or removed.
diff --git a/main/kernel-hooks/kernel-hooks.trigger b/main/kernel-hooks/kernel-hooks.trigger
new file mode 100644
index 00000000000..5d05d3f54e4
--- /dev/null
+++ b/main/kernel-hooks/kernel-hooks.trigger
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+PROGNAME='kernel-hooks'
+HOOKS_DIR='/etc/kernel-hooks.d'
+
+[ -d $HOOKS_DIR ] || exit 0
+
+flavors_vers=
+for path in "$@"; do
+	name="${path##*/}"
+
+	case "$name" in
+		[0-9]*-[0-9]*-*) ;;  # go on
+		*) echo "$PROGNAME: ERROR: invalid kernel version: $name!" >&2; exit 1;;
+	esac
+
+	flavor=${name#*-}; flavor=${flavor#*-}
+	ver=${name%-$flavor}
+	flavors_vers="$flavors_vers $flavor:$ver"
+done
+
+for flavor in $(printf '%s\n' $flavors_vers | sort | cut -d: -f1 | uniq); do
+	relfile=/usr/share/kernel/$flavor/kernel.release
+
+	new_ver=
+	old_ver=
+	for fv in $flavors_vers; do
+		[ "${fv%:*}" = "$flavor" ] || continue
+		ver=${fv#*:}
+
+		[ "$(cat "$relfile" 2>/dev/null)" = "$ver-$flavor" ] \
+			&& new_ver=$ver \
+			|| old_ver=$ver
+	done
+
+	for hook in $HOOKS_DIR/*; do
+		[ -x "$hook" ] || continue
+		name=${hook##*/}
+
+		echo "$PROGNAME: executing hook $name ($flavor, $new_ver, $old_ver)" >&2
+
+		$hook "$flavor" "$new_ver" "$old_ver" \
+			|| echo "$PROGNAME: ERROR: hook $name failed" >&2
+	done
+done
+
+# Triggers exiting with a non-zero status cause headaches. APK marks the
+# corresponding package and the world as broken. Consequently, it exists with
+# status 1 even after e.g. successful installation of a new package.
+exit 0
diff --git a/main/keyutils/APKBUILD b/main/keyutils/APKBUILD
index 68b1e487c2f..7172031166a 100644
--- a/main/keyutils/APKBUILD
+++ b/main/keyutils/APKBUILD
@@ -1,19 +1,18 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=keyutils
-pkgver=1.6.1
-pkgrel=1
+pkgver=1.6.3
+pkgrel=3
 pkgdesc="Linux Key Management Utilities"
-url="http://people.redhat.com/~dhowells/keyutils/"
+url="https://people.redhat.com/~dhowells/keyutils/"
 arch="all"
 options="!check"  # Test suite requires RPM.
-license="GPL-2.0-or-later LGPL-2.0-or-later"
+license="GPL-2.0-or-later AND LGPL-2.0-or-later"
 makedepends="file linux-headers"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
 source="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	make -j1 \
 		NO_ARLIB=1 \
 		LIBDIR=/usr/lib \
@@ -24,7 +23,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" \
 		NO_ARLIB=1 \
 		LIBDIR=/usr/lib \
@@ -38,4 +36,4 @@ libs() {
 	mv "$pkgdir"/usr/lib/* "$subpkgdir"/usr/lib
 }
 
-sha512sums="a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2  keyutils-1.6.1.tar.gz"
+sha512sums="f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9  keyutils-1.6.3.tar.gz"
diff --git a/main/kmod/APKBUILD b/main/kmod/APKBUILD
index 66dceff5cfb..2819f90e4c2 100644
--- a/main/kmod/APKBUILD
+++ b/main/kmod/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kmod
-pkgver=27
+pkgver=32
 pkgrel=0
 pkgdesc="Linux kernel module management utilities"
 url="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary"
@@ -10,17 +10,24 @@ options="!check"  # https://bugs.gentoo.org/408915#c3
 license="GPL-2.0-or-later"
 # gnu sed is needed for symlink
 makedepends_build="sed libxslt"
-makedepends_host="$depends_dev zlib-dev xz-dev openssl-dev"
+makedepends_host="$depends_dev zlib-dev xz-dev zstd-dev openssl-dev>3"
 makedepends="$makedepends_build $makedepends_host"
 triggers="$pkgname.trigger=/lib/modules/*"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc $pkgname-libs
-	$pkgname-bash-completion:bashcomp:noarch"
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-libs
+	$pkgname-bash-completion
+	"
 source="https://kernel.org/pub/linux/utils/kernel/kmod/kmod-$pkgver.tar.xz
 	strndupa.patch
-	kmod-static-nodes.initd
+	portable-basename.patch
 	"
 
 build() {
+	if [ -z "$BOOTSTRAP" ]; then
+		export CFLAGS="$CFLAGS -flto=auto"
+	fi
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,6 +37,7 @@ build() {
 		--with-rootlibdir=/lib \
 		--with-zlib \
 		--with-xz \
+		--with-zstd \
 		--with-openssl
 	make
 }
@@ -39,22 +47,8 @@ package() {
 	local i
 	mkdir -p "$pkgdir"/sbin
 	for i in lsmod rmmod insmod modinfo modprobe depmod; do
-		ln -sf ../bin/kmod "$pkgdir"/sbin/$i
-	done
-	for i in lsmod modinfo; do
-		ln -s kmod "$pkgdir"/bin/$i
+		ln -sf ../bin/$i "$pkgdir"/sbin/$i
 	done
-	install -Dm755 "$srcdir"/kmod-static-nodes.initd \
-		"$pkgdir"/etc/init.d/kmod-static-nodes
-}
-
-bashcomp() {
-	pkgdesc="Bash completion for $pkgname"
-	depends=""
-	install_if="bash-completion $pkgname=$pkgver-r$pkgrel"
-
-	mkdir -p "$subpkgdir"/usr/share
-	mv "$pkgdir"/usr/share/bash-completion "$subpkgdir"/usr/share/
 }
 
 libs() {
@@ -62,6 +56,8 @@ libs() {
 	default_libs
 }
 
-sha512sums="e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c  kmod-27.tar.xz
+sha512sums="
+29162135aabd025dff178a4147a754b5da5964855dbeee65ca867dec3b84437f35c1c97f0f027e974a021d3ee9a4940309a716859cc3cfe93c7ed0aada338f24  kmod-32.tar.xz
 f2ea3527bfba182c5e15557c224a5bba8c7e2ea3d21cf604e6eb2277226dcf983c3aeb9ac44a322c7f2b4942b35135da999d63a5b946b829d3f3b09c050a0f17  strndupa.patch
-7f0f89fe98167f71b7924f341ba701d001158225463c2f5e39f706a0224b1e952ee901b441f28cb15787563e83bb6e54eb752bf8669ae7c0ffbb11984542f354  kmod-static-nodes.initd"
+5fc41a7c4ea3ad3e33516ebdf8d19ac7ce0223d75a3e99f185e8a7fd71007b9d2e2d850e319b122d470cd95f45098a5a39faa21a17c0fb82124138f97db9d85c  portable-basename.patch
+"
diff --git a/main/kmod/kmod-static-nodes.initd b/main/kmod/kmod-static-nodes.initd
deleted file mode 100644
index ef8912f60b7..00000000000
--- a/main/kmod/kmod-static-nodes.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/files/kmod-static-nodes-r1,v 1.1 2014/07/11 12:28:07 ssuominen Exp $
-
-description="Create list of required static device nodes for the current kernel"
-
-depend() {
-	after dev-mount
-	before tmpfiles.dev dev
-	keyword -lxc
-}
-
-start() {
-	ebegin "Creating list of required static device nodes for the current kernel"
-	checkpath -q -d /run/tmpfiles.d
-	kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
-	eend $?
-}
diff --git a/main/kmod/kmod.trigger b/main/kmod/kmod.trigger
index 1693ea1eaea..4516d8a0708 100644
--- a/main/kmod/kmod.trigger
+++ b/main/kmod/kmod.trigger
@@ -1,8 +1,21 @@
 #!/bin/sh
 
 for i in "$@"; do
-	if [ -d "$i" ]; then
+	if [ -e "$i"/modules.order ]; then
 		/sbin/depmod ${i#/lib/modules/}
-		fi
+	else
+		#clean up on uninstall
+		rm -f "$i"/modules.alias \
+			"$i"/modules.builtin.alias.bin \
+			"$i"/modules.dep \
+			"$i"/modules.devname \
+			"$i"/modules.symbols \
+			"$i"/modules.alias.bin \
+			"$i"/modules.builtin.bin \
+			"$i"/modules.dep.bin \
+			"$i"/modules.softdep \
+			"$i"/modules.symbols.bin
+		rmdir "$i" 2>/dev/null || :
+	fi
 done
 
diff --git a/main/kmod/portable-basename.patch b/main/kmod/portable-basename.patch
new file mode 100644
index 00000000000..ddaab288278
--- /dev/null
+++ b/main/kmod/portable-basename.patch
@@ -0,0 +1,106 @@
+Upstream PR #32
+
+musl has removed the non-prototype declaration of basename from
+string.h [1] which now results in build errors with clang-17+
+compiler.
+
+https://github.com/kmod-project/kmod/pull/32
+
+---
+
+diff -aur a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
+--- a/libkmod/libkmod-config.c
++++ b/libkmod/libkmod-config.c
+@@ -794,7 +794,7 @@
+ 	bool is_single = false;
+ 
+ 	if (name == NULL) {
+-		name = basename(path);
++		name = gnu_basename(path);
+ 		is_single = true;
+ 	}
+ 
+diff -aur a/shared/util.c b/shared/util.c
+--- a/shared/util.c
++++ b/shared/util.c
+@@ -172,9 +172,9 @@
+ 
+ char *path_to_modname(const char *path, char buf[static PATH_MAX], size_t *len)
+ {
+-	char *modname;
++	const char *modname;
+ 
+-	modname = basename(path);
++	modname = gnu_basename(path);
+ 	if (modname == NULL || modname[0] == '\0')
+ 		return NULL;
+ 
+diff -aur a/shared/util.h b/shared/util.h
+--- a/shared/util.h
++++ b/shared/util.h
+@@ -5,6 +5,7 @@
+ #include <stdbool.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <time.h>
+@@ -76,6 +77,12 @@
+ 	__p->__v = (val);			\
+ } while(0)
+ 
++static _always_inline_ const char *gnu_basename(const char *s)
++{
++  const char *p = strrchr(s, '/');
++  return p ? p+1 : s;
++}
++
+ static _always_inline_ unsigned int ALIGN_POWER2(unsigned int u)
+ {
+ 	return 1 << ((sizeof(u) * 8) - __builtin_clz(u - 1));
+diff -aur a/testsuite/testsuite.c b/testsuite/testsuite.c
+--- a/testsuite/testsuite.c
++++ b/testsuite/testsuite.c
+@@ -70,7 +70,7 @@
+ 
+ 	printf("Usage:\n"
+ 	       "\t%s [options] <test>\n"
+-	       "Options:\n", basename(progname));
++	       "Options:\n", gnu_basename(progname));
+ 
+ 	for (itr = options, itr_short = options_short;
+ 				itr->name != NULL; itr++, itr_short++)
+diff -aur a/tools/depmod.c b/tools/depmod.c
+--- a/tools/depmod.c
++++ b/tools/depmod.c
+@@ -761,7 +761,7 @@
+ 	if (name != NULL)
+ 		namelen = strlen(name);
+ 	else {
+-		name = basename(dir);
++		name = gnu_basename(dir);
+ 		namelen = strlen(name);
+ 		dirlen -= namelen + 1;
+ 	}
+diff -aur a/tools/kmod.c b/tools/kmod.c
+--- a/tools/kmod.c
++++ b/tools/kmod.c
+@@ -68,7 +68,7 @@
+ 			"Options:\n"
+ 			"\t-V, --version     show version\n"
+ 			"\t-h, --help        show this help\n\n"
+-			"Commands:\n", basename(argv[0]));
++			"Commands:\n", gnu_basename(argv[0]));
+ 
+ 	for (i = 0; i < ARRAY_SIZE(kmod_cmds); i++) {
+ 		if (kmod_cmds[i]->help != NULL) {
+@@ -156,7 +156,7 @@
+ 	const char *cmd;
+ 	size_t i;
+ 
+-	cmd = basename(argv[0]);
++	cmd = gnu_basename(argv[0]);
+ 
+ 	for (i = 0; i < ARRAY_SIZE(kmod_compat_cmds); i++) {
+ 		if (streq(kmod_compat_cmds[i]->name, cmd))
diff --git a/main/knock/APKBUILD b/main/knock/APKBUILD
index 617a9e45b3e..9336f5fa49f 100644
--- a/main/knock/APKBUILD
+++ b/main/knock/APKBUILD
@@ -1,27 +1,23 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=knock
-pkgver=0.8
-pkgrel=1
+pkgver=0.8.2
+pkgrel=2
 pkgdesc="A simple port-knocking daemon"
-url="http://www.zeroflux.org/projects/knock"
+url="https://github.com/TDFKAOlli/knock"
 arch="all"
 license="GPL-2.0-or-later"
 depends="iptables"
 makedepends="libpcap-dev autoconf automake"
-install=
 subpackages="$pkgname-doc $pkgname-openrc"
 # Original hasnt been maintained in a long time - use this fork instead - includes IPv6 support
 _fork="TDFKAOlli"
-source="$pkgname-$pkgver.tar.gz::https://github.com/$_fork/$pkgname/archive/${pkgver}.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/$_fork/knock/archive/$pkgver.tar.gz
 	knock.initd
 	knock.confd"
 options="!check"
 
-builddir="$srcdir/$pkgname-$pkgver"
-
 build() {
-	cd "$builddir"
 	autoreconf -fi
 	./configure \
 		--build=$CBUILD \
@@ -34,7 +30,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -m755 -D "$srcdir"/$pkgname.initd \
@@ -43,6 +38,8 @@ package() {
 		"$pkgdir"/etc/conf.d/knockd
 }
 
-sha512sums="cfc0b92e90c34ffa629b866e63f9f9f4b9c2423491680e6155efeb8f40c24446df29f961f2f8505441b153c2a87a32b834fd1182896b6de92dee430044680c27  knock-0.8.tar.gz
+sha512sums="
+008eb99b1f0df1645db7832b0950eebb6e211ff6c29dae5f0e538664f85538f29c0720f0fda57cfd3956c2a20e850a0ba15e0272104561b540e75405a24b3bc3  knock-0.8.2.tar.gz
 369010549a1b33efe9f634794f039249421778d49739e8f10e4d6baa83424e066a63c0ef637b70762ee34617e7b67f9ac6683125d35ded85d6779d6b2ef0f7db  knock.initd
-63fa311e6adf21450d4c93008a9537ec1b3c0dbed28e3daf955f2761127d9d756f2f7a84d8357d81a5e1a5a48453f9179d0c18cf18af0b9f30437c862a438d7f  knock.confd"
+63fa311e6adf21450d4c93008a9537ec1b3c0dbed28e3daf955f2761127d9d756f2f7a84d8357d81a5e1a5a48453f9179d0c18cf18af0b9f30437c862a438d7f  knock.confd
+"
diff --git a/main/knot/APKBUILD b/main/knot/APKBUILD
index 58cefc5a80d..463d754204d 100644
--- a/main/knot/APKBUILD
+++ b/main/knot/APKBUILD
@@ -3,54 +3,66 @@
 # Contributor: Francesco Zanini <francesco@zanini.me>
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
-pkgname="knot"
-pkgver=2.9.2
+pkgname=knot
+pkgver=3.3.5
 pkgrel=0
 pkgdesc="An high-performance authoritative-only DNS server"
-url="https://www.knot-dns.cz"
+url="https://www.knot-dns.cz/"
 arch="all"
 license="GPL-3.0-or-later"
-depends=""
-depends_dev="$pkgname $pkgname-libs-static $pkgname-utils"
+depends_dev="
+	$pkgname=$pkgver-r$pkgrel
+	$pkgname-libs-static=$pkgver-r$pkgrel
+	$pkgname-utils=$pkgver-r$pkgrel
+	"
 checkdepends="softhsm"
 makedepends="
 	bison
 	bsd-compat-headers
 	flex
+	fstrm-dev
 	gnutls-dev
 	jansson-dev
 	libcap-ng-dev
 	libedit-dev
-	libidn-dev
+	libidn2-dev
 	libtool
 	lmdb-dev
 	m4
-	openssl-dev
+	libmaxminddb-dev
+	nghttp2-dev
+	ngtcp2-dev
+	openssl-dev>3
 	perl
+	protobuf-c-dev
 	sed
 	userspace-rcu-dev
 	zlib-dev
 	"
 install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade"
-pkgusers="$pkgname"
-pkggroups="$pkgname"
-subpackages="$pkgname-libs
+pkgusers="knot"
+pkggroups="knot"
+subpackages="
+	$pkgname-mod-dnstap:_module
+	$pkgname-mod-geoip:_module
+	$pkgname-libs
 	$pkgname-libs-static
 	$pkgname-utils
 	$pkgname-dev
 	$pkgname-doc
 	$pkgname-openrc
 	"
-source="https://secure.nic.cz/files/$pkgname-dns/$pkgname-$pkgver.tar.xz
-	test_net.patch
+source="https://secure.nic.cz/files/knot-dns/knot-$pkgver.tar.xz
 	knotd.confd
 	knotd.initd
 	"
 
+# link against gcc libatomic on riscv64
+[ "$CARCH" = "riscv64" ] && export LDFLAGS="$LDFLAGS -latomic"
+
 prepare() {
 	default_prepare
 
-	cd "$builddir"
 	# Make sure embedded LMDB library is not used.
 	rm -rf src/contrib/lmdb
 }
@@ -62,8 +74,12 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir="/usr/lib/$pkgname" \
+		--enable-maxminddb \
+		--enable-quic=yes \
 		--with-rundir="/run/$pkgname" \
 		--with-storage="/var/lib/$pkgname" \
+		--with-module-dnstap=shared \
+		--with-module-geoip=shared \
 		--disable-silent-rules
 	make
 }
@@ -75,38 +91,43 @@ check() {
 package() {
 	make DESTDIR="$pkgdir" install
 
-	rm -rf "$pkgdir/run"
-	chown "${pkgusers%% *}:${pkggroups%% *}" "$pkgdir/var/lib/$pkgname"
-	chmod 750 "$pkgdir/var/lib/$pkgname"
+	rm -rf "$pkgdir"/run
+	install -d -m750 -o knot -g knot "$pkgdir"/var/lib/$pkgname
 
-	install -Dm 644 "$srcdir/knotd.confd" \
-		"$pkgdir/etc/conf.d/knotd"
-	install -Dm 755 "$srcdir/knotd.initd" \
-		"$pkgdir/etc/init.d/knotd"
+	install -D -m755 "$srcdir"/knotd.initd "$pkgdir"/etc/init.d/knotd
+	install -D -m644 "$srcdir"/knotd.confd "$pkgdir"/etc/conf.d/knotd
 }
 
 libs() {
 	pkgdesc="Libraries used by the Knot DNS server and client applications"
 
-	cd "$pkgdir"
-	mkdir -p "$subpkgdir/usr/lib"
-	mv ./usr/lib/libdnssec.so.* \
-		./usr/lib/libknot.so.* \
-		./usr/lib/libzscanner.so.* \
-		"$subpkgdir/usr/lib/"
+	amove usr/lib/libdnssec.so.*
+	amove usr/lib/libknot.so.*
+	amove usr/lib/libzscanner.so.*
 }
 
 utils() {
-	pkgdesc="DNS client utilities shipped with the Knot DNS server"
+	pkgdesc="Knot and DNS client utilities shipped with the Knot DNS server"
+
+	amove usr/bin
+	amove usr/sbin/keymgr
+	amove usr/sbin/kjournalprint
+	amove usr/sbin/kcatalogprint
+}
+
+_module() {
+	local modname=${subpkgname#$pkgname-mod-}
+	pkgdesc="$modname module for Knot DNS"
+	depends="$pkgname=$pkgver-r$pkgrel"
 
-	mkdir -p "$subpkgdir/usr"
-	mv "$pkgdir/usr/bin" "$subpkgdir/usr/"
+	amove usr/lib/$pkgname/modules-${pkgver%.*}/$modname.so
 }
 
 gpg_signature_extensions="asc"
 gpgfingerprints="good:742F A4E9 5829 B6C5 EAC6  B857 10BB 7AF6 FEBB D6AB"
 
-sha512sums="7e09cd6e587342b0a213f7a108704fff7535d02dd47d662e60b96ae5d75d9745d659131622253f964deb1607f28d172d1d46dc3b5f61e2f6c70e5002e746da68  knot-2.9.2.tar.xz
-39503d16603eaff04cb34de97bff987952818d229ccb5b190567198505ece8077efdf230d5402e69ca4ab8acb282c53bfaaf495360dc11191c985a48fbb61318  test_net.patch
+sha512sums="
+f0e22514aba4bdf01d3e21f1e8a61852a0cabcd12bfa0d955c36bb127bb57448f38f8bdb45fe40fdd0d15abe8a707288c1dbbe96ef14d8918c4ddc5f3edf97ea  knot-3.3.5.tar.xz
 471d3c639a8235ba09491c99d36c0a4f1074d6055ccfd3807be02a30d3ed5bbe69a84f0414ea7810db6bbc1e38f5837108e5744fc59f949ed78a262a7de4597e  knotd.confd
-979f06a83dd4326920a682f8190319577faf904e0e379b3c55e0420eb43dcb55d86c6727015634fa0c2dff1dddac43bbd5a216ff04f217ad91d670eb899dbefa  knotd.initd"
+352f9f85344743670e1ed2be3a4b9e6ddffa47fcc1958c3b903713a7437da02a1ec0521d73289a826e1d6bd5ad24553116757a5763e3c2b3dba74b3220937dbb  knotd.initd
+"
diff --git a/main/knot/knot.post-upgrade b/main/knot/knot.post-upgrade
index f86b42f9416..478873583fb 100644
--- a/main/knot/knot.post-upgrade
+++ b/main/knot/knot.post-upgrade
@@ -4,12 +4,28 @@ ver_new="$1"
 ver_old="$2"
 
 if [ "$(apk version -t "$ver_old" "2.3.0-r1")" = "<" ]; then
-	cat 1>&2 <<-EOF
+	cat >&2 <<-EOF
 	*
 	* Knot utilities kdig, khost, knsec3hash, and knsupdate have been moved
 	* to subpackage knot-utils. If you use them, run: apk add knot-utils.
 	*
 	EOF
 fi
+if [ "$(apk version -t "$ver_old" "3.0.0-r0")" = "<" ]; then
+	cat >&2 <<-EOF
+	*
+	* Knot utilities keymgr and kjournalprint have been moved to subpackage
+	* knot-utils. If you use them, run: apk add knot-utils.
+	*
+	EOF
+fi
+if [ "$(apk version -t "$ver_old" "3.1.4-r0")" = "<" ]; then
+	cat >&2 <<-EOF
+	*
+	* GeoIP module has been moved to a subpackage. If you use it, install it:
+	* apk add knot-mod-geoip.
+	*
+	EOF
+fi
 
 exit 0
diff --git a/main/knot/knotd.initd b/main/knot/knotd.initd
index 781346216ca..6ae461267e1 100644
--- a/main/knot/knotd.initd
+++ b/main/knot/knotd.initd
@@ -16,7 +16,8 @@ depend() {
 }
 
 start_pre() {
-	checkpath -d -m 0750 -o knot:knot /run/knot/ /var/lib/knot/
+	checkpath -d -m 0751 -o knot:knot /run/knot/
+	checkpath -d -m 0750 -o knot:knot /var/lib/knot/
 }
 
 stop() {
diff --git a/main/knot/test_net.patch b/main/knot/test_net.patch
deleted file mode 100644
index 70a1ba751dd..00000000000
--- a/main/knot/test_net.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/tests/contrib/test_net.c b/tests/contrib/test_net.c
-index 95833625e..ff028eb99 100644
---- a/tests/contrib/test_net.c
-+++ b/tests/contrib/test_net.c
-@@ -40,10 +40,7 @@ const int TIMEOUT_SHORT = 500;
- static struct sockaddr_storage addr_local(void)
- {
- 	struct sockaddr_storage addr = { 0 };
--	struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)&addr;
--
--	addr6->sin6_family = AF_INET6;
--	addr6->sin6_addr = in6addr_loopback;
-+	sockaddr_set(&addr, AF_INET, "127.0.0.1", 0);
- 
- 	return addr;
- }
diff --git a/main/krb5/APKBUILD b/main/krb5/APKBUILD
index 0663100a21f..149af55aa03 100644
--- a/main/krb5/APKBUILD
+++ b/main/krb5/APKBUILD
@@ -1,27 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=krb5
-pkgver=1.18
+pkgver=1.21.2
 pkgrel=0
 pkgdesc="The Kerberos network authentication system"
 url="https://web.mit.edu/kerberos/www/"
 arch="all"
 license="MIT"
 depends="krb5-conf"
-depends_dev="e2fsprogs-dev"
-makedepends="$depends_dev libverto-dev openldap-dev openssl-dev
+depends_dev="e2fsprogs-dev libverto-dev"
+makedepends="$depends_dev openldap-dev openssl-dev>3
 	keyutils-dev bison flex perl"
-options="suid"
+options="suid !check" # https://gitlab.alpinelinux.org/alpine/aports/-/issues/13155
 subpackages="$pkgname-dev $pkgname-doc $pkgname-server
-	$pkgname-server-ldap:ldap $pkgname-pkinit $pkgname-libs"
+	$pkgname-server-openrc:server_openrc $pkgname-server-ldap:ldap
+	$pkgname-pkinit $pkgname-libs"
 
 _maj_min=$pkgver
 case $pkgver in
-*.*.*) _maj_min=${pkgver%.*};;
+	*.*.*) _maj_min=${pkgver%.*} ;;
 esac
 
 source="https://web.mit.edu/kerberos/dist/krb5/$_maj_min/krb5-$pkgver.tar.gz
-	mit-krb5_krb5-config_LDFLAGS.patch
-	musl-util_plugins.patch
 
 	krb5kadmind.initd
 	krb5kdc.initd
@@ -30,6 +29,14 @@ source="https://web.mit.edu/kerberos/dist/krb5/$_maj_min/krb5-$pkgver.tar.gz
 builddir="$srcdir/$pkgname-$pkgver/src"
 
 # secfixes:
+#   1.20.1-r0:
+#     - CVE-2022-42898
+#   1.19.3-r0:
+#     - CVE-2021-37750
+#   1.18.4-r0:
+#     - CVE-2021-36222
+#   1.18.3-r0:
+#     - CVE-2020-28196
 #   1.15.4-r0:
 #     - CVE-2018-20217
 #   1.15.3-r0:
@@ -65,55 +72,57 @@ package() {
 	make install DESTDIR="$pkgdir"
 	mkdir -p "$pkgdir"/usr/share/doc/$pkgname
 	mv "$pkgdir"/usr/share/examples "$pkgdir"/usr/share/doc/$pkgname/
-
-	for i in $source; do
-		case $i in
-		*.initd) install -Dm755 "$srcdir"/$i \
-			"$pkgdir"/etc/init.d/${i%.initd};;
-		esac
-	done
 }
 
 server() {
 	pkgdesc="The KDC and related programs for Kerberos 5"
 	depends="libverto-libev"
 	mkdir -p "$subpkgdir"/usr/share \
-		"$subpkgdir"/usr/bin \
-		"$subpkgdir"/etc/
+		"$subpkgdir"/usr/bin
 	install -d "$subpkgdir"/var/lib/krb5kdc
 	mv "$pkgdir"/usr/sbin "$subpkgdir"/usr/
-	mv "$pkgdir"/etc/init.d "$subpkgdir"/etc/
+
 	# used for testing server
-	mv "$pkgdir"/usr/bin/sclient "$subpkgdir"/usr/bin/
+	amove usr/bin/sclient
+}
+
+server_openrc() {
+	pkgdesc="The KDC and related programs for Kerberos 5 (OpenRC init scripts)"
+	install_if="$pkgname-server=$pkgver-r$pkgrel openrc"
 
+	for i in $source; do
+		case $i in
+		*.initd) install -Dm755 "$srcdir"/$i \
+			"$subpkgdir"/etc/init.d/${i%.initd};;
+		esac
+	done
 }
 
 ldap() {
 	pkgdesc="The LDAP storage plugin for the Kerberos 5 KDC"
-	mkdir -p "$subpkgdir"/usr/lib/krb5/plugins/kdb
-	mv "$pkgdir"/usr/lib/krb5/plugins/kdb/kldap.so \
-		"$subpkgdir"/usr/lib/krb5/plugins/kdb/
-	mv "$pkgdir"/usr/lib/libkdb_ldap* \
-		 "$subpkgdir"/usr/lib/
+	install -Dm644 \
+		-t "$subpkgdir"/usr/share/kerberos \
+		"$builddir"/plugins/kdb/ldap/libkdb_ldap/kerberos.ldif \
+		"$builddir"/plugins/kdb/ldap/libkdb_ldap/kerberos.openldap.ldif
+	amove usr/lib/krb5/plugins/kdb/kldap.so
+	amove usr/lib/libkdb_ldap*
 }
 
 pkinit() {
 	pkgdesc="The PKINIT module for Kerberos 5"
 	mkdir -p "$subpkgdir"/usr/lib/krb5/plugins/preauth
-	mv "$pkgdir"/usr/lib/krb5/plugins/preauth/pkinit.so \
-		"$subpkgdir"/usr/lib/krb5/plugins/preauth/pkinit.so
+	amove usr/lib/krb5/plugins/preauth/pkinit.so
 }
 
 libs() {
 	pkgdesc="The shared libraries used by Kerberos 5"
 	depends="krb5-conf"
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
+	amove usr/lib
 }
 
-sha512sums="36a01ea310b4b3d0a3d209b641739575239e1ca5e93b3de99cb1fec83e82f9a70ad0761dd6eb77cda5c18c53044ab80168b00725642a0c2dfde0e492c42af6a9  krb5-1.18.tar.gz
-5c62cbcbf1ef0462323f3392a362b42ed301967a1de80ddcb27eece4fad23efeeb5f04f5af521cfffff36b918bb93813262aa62785e59d6cb5af437a2c9e886d  mit-krb5_krb5-config_LDFLAGS.patch
-82f4c92dfcfc3e9ac819502f6ab2f9b65b534edf7e8f3d9ef08a6091f378914056779d9b5172e7066a41c2d2f1e929c8fc9d67537c449c3b88a7508486e5f293  musl-util_plugins.patch
+sha512sums="
+4e09296b412383d53872661718dbfaa90201e0d85f69db48e57a8d4bd73c95a90c7ec7b6f0f325f6bc967f8d203b256b071c0191facf080aca0e2caec5d0ac49  krb5-1.21.2.tar.gz
 43b9885b7eb8d0d60920def688de482f2b1701288f9acb1bb21dc76b2395428ff304961959eb04ba5eafd0412bae35668d6d2c8223424b9337bc051eadf51682  krb5kadmind.initd
 ede15f15bbbc9d0227235067abe15245bb9713aea260d397379c63275ce74aea0db6c91c15d599e40c6e89612d76f3a0f8fdd21cbafa3f30d426d4310d3e2cec  krb5kdc.initd
-45be0d421efd41e9dd056125a750c90856586e990317456b68170d733b03cba9ecd18ab87603b20e49575e7839fb4a6d628255533f2631f9e8ddb7f3cc493a90  krb5kpropd.initd"
+45be0d421efd41e9dd056125a750c90856586e990317456b68170d733b03cba9ecd18ab87603b20e49575e7839fb4a6d628255533f2631f9e8ddb7f3cc493a90  krb5kpropd.initd
+"
diff --git a/main/krb5/mit-krb5_krb5-config_LDFLAGS.patch b/main/krb5/mit-krb5_krb5-config_LDFLAGS.patch
deleted file mode 100644
index 9ae52264cde..00000000000
--- a/main/krb5/mit-krb5_krb5-config_LDFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Bug #448778
---- a/build-tools/krb5-config.in
-+++ b/build-tools/krb5-config.in
-@@ -221,7 +221,7 @@
- 	    -e 's#\$(PROG_RPATH)#'$libdir'#' \
- 	    -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \
- 	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
--	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
-+	    -e 's#\$(LDFLAGS)##' \
- 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
- 	    -e 's#\$(CFLAGS)##'`
- 
diff --git a/main/krb5/musl-util_plugins.patch b/main/krb5/musl-util_plugins.patch
deleted file mode 100644
index 7723dae8e30..00000000000
--- a/main/krb5/musl-util_plugins.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/util/support/plugins.c
-+++ b/util/support/plugins.c
-@@ -64,10 +64,12 @@
-  */
- #ifdef __linux__
- #include <features.h>
-+#if defined(__GLIBC__)
- #if ! __GLIBC_PREREQ(2, 25)
- #define dlclose(x)
- #endif
- #endif
-+#endif
- 
- #if USE_DLOPEN && USE_CFBUNDLE
- #include <CoreFoundation/CoreFoundation.h>
diff --git a/main/ksymoops/APKBUILD b/main/ksymoops/APKBUILD
deleted file mode 100644
index 71bba22b11d..00000000000
--- a/main/ksymoops/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=ksymoops
-pkgver=2.4.11
-pkgrel=7
-pkgdesc="A Linux kernel Oops file troubleshooting tool"
-url="https://kernel.org/pub/linux/utils/kernel/ksymoops/v2.4"
-arch="all"
-license="GPL-2.0"
-depends=""
-makedepends="binutils-dev"
-subpackages="$pkgname-doc"
-source="https://kernel.org/pub/linux/utils/kernel/$pkgname/v${pkgver%.*}/$pkgname-$pkgver.tar.gz
-	$pkgname-$pkgver-build.patch
-	"
-builddir="$srcdir/$pkgname-$pkgver"
-
-build() {
-	cd "$builddir"
-	# see https://sourceware.org/bugzilla/show_bug.cgi?id=14243
-	# we abuse DEBUG variable which is added to CFLAGS
-	make DEBUG="$CFLAGS -DPACKAGE -DPACKAGE_VERSION" || return 1
-}
-
-package() {
-	cd "$builddir"
-	make install \
-		INSTALL=install \
-		INSTALL_PREFIX="$pkgdir"/usr \
-		INSTALL_MANDIR="$pkgdir"/usr/share/man
-}
-
-sha512sums="4b1055e03f83f9d433af0427234c24ea81f2718b242f234c4e058033089e13f4ac972064835d516686f4a5ad760618aa741b6be2c97df89eff52141d14af64ac  ksymoops-2.4.11.tar.gz
-1d72c79847435850b12912bae602fd560a44604ea8c4960744668fe7726bbddc25b6d10cd6ec2f0078ddb9a378400d03f04ba50ae380de0051998245e011cb00  ksymoops-2.4.11-build.patch"
diff --git a/main/ksymoops/ksymoops-2.4.11-build.patch b/main/ksymoops/ksymoops-2.4.11-build.patch
deleted file mode 100644
index e563840c6ca..00000000000
--- a/main/ksymoops/ksymoops-2.4.11-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile.orig	2006-11-16 17:39:45.000000000 -0500
-+++ b/Makefile	2006-11-16 17:39:55.000000000 -0500
-@@ -96,9 +96,6 @@
- 	INSTALL_MANDIR := $(INSTALL_PREFIX)/man
- endif
- 
--STATIC := -Wl,-Bstatic
--DYNAMIC := -Wl,-Bdynamic
--
- OBJECTS := io.o ksyms.o ksymoops.o map.o misc.o object.o oops.o re.o symbol.o
- 
- all: $(PROGS)
diff --git a/main/kyua/APKBUILD b/main/kyua/APKBUILD
index d7eb0bbd6ac..ad4313eeba9 100644
--- a/main/kyua/APKBUILD
+++ b/main/kyua/APKBUILD
@@ -1,16 +1,20 @@
-# Maintainer:
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kyua
 pkgver=0.13
-pkgrel=4
+pkgrel=8
 pkgdesc="testing framework for infrastructure software"
-url="https://github.com/jmmv/kyua"
+url="https://github.com/freebsd/kyua"
 arch="all"
 license="BSD-3-Clause"
 makedepends="atf-dev lutok-dev sqlite-dev"
-subpackages="$pkgname-doc"
-source="https://github.com/jmmv/kyua/releases/download/kyua-$pkgver/kyua-$pkgver.tar.gz"
+subpackages="$pkgname-dbg $pkgname-doc"
+source="https://github.com/freebsd/kyua/releases/download/kyua-$pkgver/kyua-$pkgver.tar.gz"
+options="!check"
 
 build() {
+
+	# reduce size of debug syms
+	CFLAGS="$CFLAGS -g1" CXXFLAGS="$CXXFLAGS -g1" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,4 +29,6 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install
 }
 
-sha512sums="80ecf4fd888d4759122f3c1d1d5b06a19135e06f7bca1ef8458c7a5e78c1b6baff54969c863c93f11c40611ca256fc0334402531397b16788fb3ec701dd278ae  kyua-0.13.tar.gz"
+sha512sums="
+80ecf4fd888d4759122f3c1d1d5b06a19135e06f7bca1ef8458c7a5e78c1b6baff54969c863c93f11c40611ca256fc0334402531397b16788fb3ec701dd278ae  kyua-0.13.tar.gz
+"
diff --git a/main/lame/APKBUILD b/main/lame/APKBUILD
index 80caadcd112..1be22556321 100644
--- a/main/lame/APKBUILD
+++ b/main/lame/APKBUILD
@@ -1,22 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lame
 pkgver=3.100
-pkgrel=0
+pkgrel=5
 pkgdesc="An MP3 encoder and graphical frame analyzer"
-url="http://lame.sourceforge.net/"
+url="https://lame.sourceforge.net/"
 arch="all"
 license="LGPL-2.0-or-later"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-dev $pkgname-libs $pkgname-doc"
 makedepends="nasm ncurses-dev autoconf automake libtool"
-source="https://downloads.sourceforge.net/project/lame/lame/$pkgver/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$pkgname-$pkgver
+source="https://downloads.sourceforge.net/project/lame/lame/$pkgver/lame-$pkgver.tar.gz
+	id3tagfix.patch
+	lame.pc.in
+	"
 
 # secfixes:
-#   3.100-r0:
-#     - CVE-2017-9410
-#     - CVE-2017-9411
-#     - CVE-2017-9412
-#     - CVE-2015-9099
 #   3.99.5-r6:
 #     - CVE-2015-9099
 #     - CVE-2015-9100
@@ -26,8 +23,6 @@ builddir="$srcdir"/$pkgname-$pkgver
 #     - CVE-2017-11720
 
 prepare() {
-	cd "$builddir"
-
 	default_prepare
 
 	# fix for parallel builds
@@ -40,7 +35,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -49,19 +43,23 @@ build() {
 		--disable-mp3x \
 		--enable-shared \
 		--with-pic
-
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
+
+	mkdir -p "$pkgdir"/usr/lib/pkgconfig/
+	sed "s|@PKGVER@|$pkgver|" "$srcdir"/lame.pc.in \
+		> "$pkgdir"/usr/lib/pkgconfig/lame.pc
 }
 
-sha512sums="0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b  lame-3.100.tar.gz"
+sha512sums="
+0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b  lame-3.100.tar.gz
+2b47995715c526c74e782ac34778b7075fad1fa16b5299e73b2c62cdf6bfa64ba0862d18e949565aff49c613d2468794dc6e336836ed4ebdb2e6ef67be8af5b0  id3tagfix.patch
+ace7813debdb2cd8b08c26e99db50776180b05105832db96ad0bb314dc3e1eadccfd14de3adab7b1a37b6df7d521b5216ed7d9c3c11d5bae388197debca58f0f  lame.pc.in
+"
diff --git a/main/lame/id3tagfix.patch b/main/lame/id3tagfix.patch
new file mode 100644
index 00000000000..4b633f1cbeb
--- /dev/null
+++ b/main/lame/id3tagfix.patch
@@ -0,0 +1,29 @@
+Patch-Source: https://github.com/void-linux/void-packages/commit/ba30046be66be546c307c4186d54f448a674fb7e
+musl doesn't have translit, so just remove it
+--
+--- a/frontend/parse.c
++++ b/frontend/parse.c
+@@ -232,7 +232,11 @@
+         dst = calloc(n+4, 4);
+         if (dst != 0) {
+             char* cur_code = nl_langinfo(CODESET);
++#ifdef __GLIBC__
+             iconv_t xiconv = iconv_open("ISO_8859-1//TRANSLIT", cur_code);
++#else
++            iconv_t xiconv = iconv_open("ISO_8859-1", cur_code);
++#endif
+             if (xiconv != (iconv_t)-1) {
+                 char* i_ptr = (char*)src;
+                 char* o_ptr = dst;
+@@ -258,7 +262,11 @@
+         dst = calloc(n+4, 4);
+         if (dst != 0) {
+             char* cur_code = nl_langinfo(CODESET);
++#ifdef __GLIBC__
+             iconv_t xiconv = iconv_open("UTF-16LE//TRANSLIT", cur_code);
++#else
++            iconv_t xiconv = iconv_open("UTF-16LE", cur_code);
++#endif
+             dst[0] = 0xff;
+             dst[1] = 0xfe;
+             if (xiconv != (iconv_t)-1) {
diff --git a/main/lame/lame.pc.in b/main/lame/lame.pc.in
new file mode 100644
index 00000000000..327f6f4dc32
--- /dev/null
+++ b/main/lame/lame.pc.in
@@ -0,0 +1,10 @@
+prefix=/usr
+includedir=${prefix}/include
+libdir=${prefix}/lib
+
+Name: Lame
+Description: MP3 encoder/decoder
+Version: @PKGVER@
+Requires:
+Libs: -L${libdir} -lmp3lame
+Cflags: -I${includedir}/lame
diff --git a/main/lang/APKBUILD b/main/lang/APKBUILD
index 1030c2172c3..e3b24684423 100644
--- a/main/lang/APKBUILD
+++ b/main/lang/APKBUILD
@@ -2,11 +2,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lang
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Meta package for translations"
 url="https://alpinelinux.org"
 arch="noarch"
 license="GPL-2.0-only"
+depends="musl-locales"
+options="!check"
 
 package() {
 	mkdir -p "$pkgdir"
diff --git a/main/lcms/APKBUILD b/main/lcms/APKBUILD
deleted file mode 100644
index 3f924ccfc2e..00000000000
--- a/main/lcms/APKBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=lcms
-pkgver=1.19
-pkgrel=8
-pkgdesc="Lightweight color management development library/engine"
-url="http://www.littlecms.com"
-arch="all"
-license="MIT"
-depends=
-makedepends="tiff-dev libjpeg-turbo-dev zlib-dev"
-subpackages="$pkgname-dev $pkgname-doc liblcms"
-source="https://downloads.sourceforge.net/project/lcms/lcms/$pkgver/lcms-$pkgver.tar.gz
-	configure-for-musl.patch
-	CVE-2013-4276.patch
-	ppc64le.patch
-	remove-linear-interpol-test.patch
-	"
-
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm 644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-
-liblcms() {
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/liblcms.so.* "$subpkgdir"/usr/lib/
-}
-
-sha512sums="85a55ad0673f0df2aaa80d18caa50314319f8da5ee4d84eed919059d0dad9861d684ef6353ce0ec6f9892a4603ce8e8e12f84d46858e23f52846b8aefd3cf449  lcms-1.19.tar.gz
-5ef4671234cec59a8ba088937d6e4c26cfdadbe69ad2654eeb8521fd7c15f7405fc18f860722b41e2da9f55637325fe39e36c080003eed0371e6610d2e3fd264  configure-for-musl.patch
-73037e6e2f8e52f402c5160a38e1d8cc6f7f5f88145d68f733f796def539902a6dfcf685eae076d1456d885c782771993dc64f78b4e381421b0e4e8730eaa1d2  CVE-2013-4276.patch
-80eb01662357123fba965300111f1d0fb524d9ae58a54bf39c9563edb6407d7a95855906c2991af6de5aa4629624fdb35d4e6c274b1c990597961ff4ec3022a9  ppc64le.patch
-c7a43657b7e1f8e7402274ff5ac767e716b8a07cf44e7d089222568bdc75dcb830de2121a35db2040e52196386324b139f45ac9d014805086cf334a482efb39e  remove-linear-interpol-test.patch"
diff --git a/main/lcms/CVE-2013-4276.patch b/main/lcms/CVE-2013-4276.patch
deleted file mode 100644
index 8f2f3229782..00000000000
--- a/main/lcms/CVE-2013-4276.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ur lcms-1.19.dfsg/samples/icctrans.c lcms-1.19.dfsg-patched/samples/icctrans.c
---- lcms-1.19.dfsg/samples/icctrans.c	2009-10-30 15:57:45.000000000 +0000
-+++ lcms-1.19.dfsg-patched/samples/icctrans.c	2013-08-06 11:53:14.385266647 +0100
-@@ -86,6 +86,8 @@
- static LPcmsNAMEDCOLORLIST InputColorant = NULL;
- static LPcmsNAMEDCOLORLIST OutputColorant = NULL;
- 
-+unsigned int Buffer_size = 4096;
-+
- 
- // isatty replacement
- 
-@@ -500,7 +502,7 @@
- 
-     Prefix[0] = 0;
-     if (!lTerse)
--        sprintf(Prefix, "%s=", C);
-+        snprintf(Prefix, 20, "%s=", C);
- 
-     if (InHexa)
-     {
-@@ -648,7 +650,9 @@
- static
- void GetLine(char* Buffer)
- {    
--    scanf("%s", Buffer);
-+    char User_buffer[Buffer_size];
-+    fgets(User_buffer, (Buffer_size - 1), stdin);
-+    sscanf(User_buffer,"%s", Buffer);
-     
-     if (toupper(Buffer[0]) == 'Q') { // Quit?
- 
-@@ -668,7 +672,7 @@
- static
- double GetAnswer(const char* Prompt, double Range)
- {
--    char Buffer[4096];
-+    char Buffer[Buffer_size];
-     double val = 0.0;
- 	       
-     if (Range == 0.0) {              // Range 0 means double value
-@@ -738,7 +742,7 @@
- static
- WORD GetIndex(void)
- {
--    char Buffer[4096], Name[40], Prefix[40], Suffix[40];
-+    char Buffer[Buffer_size], Name[40], Prefix[40], Suffix[40];
-     int index, max;
- 
-     max = cmsNamedColorCount(hTrans)-1;
-diff -ur lcms-1.19.dfsg/tifficc/tiffdiff.c lcms-1.19.dfsg-patched/tifficc/tiffdiff.c
---- lcms-1.19.dfsg/tifficc/tiffdiff.c	2009-10-30 15:57:46.000000000 +0000
-+++ lcms-1.19.dfsg-patched/tifficc/tiffdiff.c	2013-08-06 11:49:06.698951157 +0100
-@@ -633,7 +633,7 @@
-     cmsIT8SetSheetType(hIT8, "TIFFDIFF");
-     
-    
--    sprintf(Buffer, "Differences between %s and %s", TiffName1, TiffName2);
-+    snprintf(Buffer, 256, "Differences between %s and %s", TiffName1, TiffName2);
-   
-     cmsIT8SetComment(hIT8, Buffer);
- 
diff --git a/main/lcms/configure-for-musl.patch b/main/lcms/configure-for-musl.patch
deleted file mode 100644
index b9977dcbf64..00000000000
--- a/main/lcms/configure-for-musl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lcms-1.19/include/lcms.h.old	2009-10-30 10:57:45.000000000 -0500
-+++ lcms-1.19/include/lcms.h	2017-09-08 00:47:09.931999949 -0500
-@@ -55,7 +55,7 @@
- 
- // Some machines does not have a reliable 'swab' function. Usually
- // leave commented unless the testbed diagnoses the contrary.
--// #define USE_CUSTOM_SWAB   1
-+#define USE_CUSTOM_SWAB   1
- 
- // Uncomment this if your compiler supports inline
- #define USE_INLINE  1
-@@ -64,7 +64,7 @@
- // #define USE_DEFAULT_FLOOR_CONVERSION  1
- 
- // Uncomment this line on multithreading environments
--// #define USE_PTHREADS    1
-+#define USE_PTHREADS    1
- 
- // Uncomment this line if you want lcms to use the black point tag in profile, 
- // if commented, lcms will compute the black point by its own. 
diff --git a/main/lcms/ppc64le.patch b/main/lcms/ppc64le.patch
deleted file mode 100644
index dfdfcec00de..00000000000
--- a/main/lcms/ppc64le.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- lcms-1.19.orig/include/lcms.h
-+++ lcms-1.19/include/lcms.h
-@@ -139,12 +139,8 @@
- #   define USE_BIG_ENDIAN      1
- #endif
- 
--#if defined(__sgi__) || defined(__sgi) || defined(__powerpc__) || defined(sparc) || defined(__ppc__) || defined(__s390__) || defined(__s390x__)
-+#if defined(__sgi__) || defined(__sgi) || defined(sparc) || defined(__s390__) || defined(__s390x__)
- #   define USE_BIG_ENDIAN      1
--#endif
--
--#if TARGET_CPU_PPC
--#   define USE_BIG_ENDIAN   1
- #endif
- 
- #if macintosh
diff --git a/main/lcms/remove-linear-interpol-test.patch b/main/lcms/remove-linear-interpol-test.patch
deleted file mode 100644
index 3e93e6946d6..00000000000
--- a/main/lcms/remove-linear-interpol-test.patch
+++ /dev/null
@@ -1,279 +0,0 @@
-diff --git a/testbed/testcms.c b/testbed/testcms.c
-index 98ec153..1f3f162 100755
---- a/testbed/testcms.c
-+++ b/testbed/testcms.c
-@@ -329,266 +329,6 @@ int TestReversingOfCurves(void)
- // Tables are supposed to be monotonic, but the algorithm works on
- // non-monotonic as well.
- 
--static
--int TestLinearInterpolation(int lExhaustive)
--{
--       static WORD Tab[4098];
--       int j, i, k = 0;
--       L16PARAMS p;
--       int n;
--       clock_t time;
--
--       printf("Testing linear interpolation ...");
--
--       // First I will check exact values. Since prime factors of 65535 (FFFF) are,
--       //
--       //            0xFFFF = 1 * 3 * 5 * 17 * 257
--       //
--       // I test tables of 2, 4, 6, and 18 points, that will be exact.
--       // Then, a table of 3 elements are tested. Error must be < 1
--       // Since no floating point is involved, This will be a measure of speed.
--
--
--       // Perform 10 times, so i can measure average times
--
--       time = clock();
--       for (j=0; j < 10; j++)
--       {
--
--       // 2 points - exact
--
--       Tab[0] = 0;
--       Tab[1] = 0xffffU;
--
--       cmsCalcL16Params(2, &p);
--
--       for (i=0; i <= 0xffffL; i++)
--       {
--              n = cmsLinearInterpLUT16((WORD) i, Tab, &p);
--              if (n != i)
--                     {
--                     printf("Error in Linear interpolation (2p): Must be i=%x, But is n=%x\n", i, n);
--                     return 0;
--                     }
--
--       }
--
--
--       // 3 points - Here the error must be <= 1, since
--       // 2 == (3 - 1)  is not a factor of 0xffff
--
--       Tab[0] = 0;
--       Tab[1] = 0x7FFF;
--       Tab[2] = 0xffffU;
--
--       cmsCalcL16Params(3, &p);
--
--       for (i=0; i <= 0xffffL; i++)
--       {
--              n = cmsLinearInterpLUT16((WORD) i, Tab, &p);
--              if (abs(n - i) > 1)
--                     {
--                     printf("Error in Linear interpolation (3p): Must be i=%x, But is n=%x\n", i, n);
--                     return 0;
--                     }
--
--       }
--
--
--       // 4 points - exact
--
--       Tab[0] = 0;
--       Tab[1] = 0x5555U;
--       Tab[2] = 0xAAAAU;
--       Tab[3] = 0xffffU;
--
--       cmsCalcL16Params(4, &p);
--
--       for (i=0; i <= 0xffffL; i++)
--       {
--              n = cmsLinearInterpLUT16((WORD) i, Tab, &p);
--              if (n != i) {
--                     printf("Error in Linear interpolation (4p): Must be i=%x, But is n=%x\n", i, n);
--                     return 0;
--                     }
--
--       }
--
--
--       // 6 - points
--
--       Tab[0] = 0;
--       Tab[1] = 0x3333U;
--       Tab[2] = 0x6666U;
--       Tab[3] = 0x9999U;
--       Tab[4] = 0xCCCCU;
--       Tab[5] = 0xFFFFU;
--
--       cmsCalcL16Params(6, &p);
--
--       for (i=0; i <= 0xffffL; i++)
--       {
--              n = cmsLinearInterpLUT16((WORD) i, Tab, &p);
--              if (n != i) {
--                     printf("Error in Linear interpolation (6p): Must be i=%x, But is n=%x\n", i, n);
--                     return 0;
--                     }
--
--       }
--
--
--       // 18 points
--
--       for (i=0; i < 18; i++)
--              Tab[i] = (WORD) (0x0f0fU*i);
--
--       cmsCalcL16Params(18, &p);
--
--       for (i=0; i <= 0xffffL; i++)
--       {
--              n = cmsLinearInterpLUT16((WORD) i, Tab, &p);
--              if (n != i) {
--                     printf("Error in Linear interpolation (18p): Must be i=%x, But is n=%x\n", i, n);
--                     return 0;
--                     }
--       }
--       }
--
--
--
--       printf("pass. (%d tics)\n", (int) (clock() - time));
--
--       // Now test descending tables
--       printf("Testing descending tables (linear interpolation)...");
--
--       // 2 points - exact
--
--       Tab[1] = 0;
--       Tab[0] = 0xffffU;
--
--       cmsCalcL16Params(2, &p);
--
--       for (i=0xffffL; i > 0; --i)
--       {
--              n = cmsLinearInterpLUT16((WORD) i, Tab, &p);
--              if ((0xffffL - n) != i) {
--
--                     printf("Error in Linear interpolation (descending) (2p): Must be i=%x, But is n=%x\n", i, 0xffff - n);
--                     return 0;
--                     }
--       }
--
--
--       // 3 points - Here the error must be <= 1, since
--       // 2 = (3 - 1)  is not a factor of 0xffff
--
--       Tab[2] = 0;
--       Tab[1] = 0x7FFF;
--       Tab[0] = 0xffffU;
--
--       cmsCalcL16Params(3, &p);
--
--       for (i=0xffffL; i > 0; --i)
--       {
--              n = cmsLinearInterpLUT16((WORD) i, Tab, &p);
--              if (abs((0xffffL - n) - i) > 1) {
--
--                     printf("Error in Linear interpolation (descending) (3p): Must be i=%x, But is n=%x\n", i, n);
--                     return 0;
--                     }
--       }
--
--
--       // 4 points - exact
--
--       Tab[3] = 0;
--       Tab[2] = 0x5555U;
--       Tab[1] = 0xAAAAU;
--       Tab[0] = 0xffffU;
--
--       cmsCalcL16Params(4, &p);
--
--       for (i=0xffffL; i > 0; --i)
--       {
--              n = cmsLinearInterpLUT16((WORD) i, Tab, &p);
--              if ((0xffffL - n) != i) {
--
--                     printf("Error in Linear interpolation (descending) (4p): Must be i=%x, But is n=%x\n", i, n);
--                     return 0;
--                     }
--       }
--
--
--       // 6 - points
--
--       Tab[5] = 0;
--       Tab[4] = 0x3333U;
--       Tab[3] = 0x6666U;
--       Tab[2] = 0x9999U;
--       Tab[1] = 0xCCCCU;
--       Tab[0] = 0xFFFFU;
--
--       cmsCalcL16Params(6, &p);
--
--       for (i=0xffffL; i > 0; --i)
--       {
--              n = cmsLinearInterpLUT16((WORD) i, Tab, &p);
--              if ((0xffffL - n) != i) {
--                     printf("Error in Linear interpolation (descending) (6p): Must be i=%x, But is n=%x\n", i, n);
--                     return 0;
--                     }
--
--       }
--
--
--       // 18 points
--
--       for (i=0; i < 18; i++)
--              Tab[17-i] = (WORD) (0x0f0fU*i);
--
--       cmsCalcL16Params(18, &p);
--
--       for (i=0xffffL; i > 0; --i)
--       {
--              n = cmsLinearInterpLUT16((WORD) i, Tab, &p);
--              if ((0xffffL - n) != i) {
--
--                     printf("Error in Linear interpolation (descending) (18p): Must be i=%x, But is n=%x\n", i, n);
--                     return 0;
--                     }
--       }
--
--       printf("pass.\n");
--
--       if (!lExhaustive) return 1;
--
--       printf("Now, testing interpolation errors for tables of n elements ...\n");
--
--       for (j=10; j < 4096; j ++)
--       {
--       if ((j % 10) == 0) printf("%d\r", j);
--
--       for (i=0; i <= j; i++)
--              {
--              Tab[i] = (WORD) floor((((double) i / ((double) j-1)) * 65535.0) + .5);
--              }
--
--       k =0;
--       cmsCalcL16Params(j, &p);
--       for (i=0; i <= 0xffffL; i++)
--       {
--              n = cmsLinearInterpLUT16((WORD) i, Tab, &p);
--              if (n != i) k++;
--
--       }
--       
--       }
--       printf("\n%d: %d errors\n\n", j, k);
--       return 1;
--}
--
--
--
- static
- int IsGood(const char *frm, WORD in, WORD out)
- {
-@@ -2318,7 +2058,6 @@ int main(int argc, char *argv[])
-        if (!TestFixedScaling()) return 1;          
-        if (!TestJointCurves()) return 1;
-        if (!TestReversingOfCurves()) return 1;
--       if (!TestLinearInterpolation(lExhaustive)) return 1;
-        if (!TestReverseLinearInterpolation()) return 1;
- 
-        
diff --git a/main/lcms2/APKBUILD b/main/lcms2/APKBUILD
index 36ed15661ad..58c44426f95 100644
--- a/main/lcms2/APKBUILD
+++ b/main/lcms2/APKBUILD
@@ -1,20 +1,21 @@
 # Contributor: Sergei Lukin <sergej.lukin@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lcms2
-pkgver=2.9
-pkgrel=1
+pkgver=2.16
+pkgrel=0
 pkgdesc="Color Management Engine"
-url="http://www.littlecms.com"
+url="https://www.littlecms.com"
 arch="all"
 license="MIT"
-depends=""
-depends_dev="libjpeg-turbo-dev tiff-dev zlib-dev"
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
-source="http://www.littlecms.com/$pkgname-$pkgver.tar.gz
-	CVE-2018-16435.patch
+depends_dev="
+	$pkgname-plugins=$pkgver-r$pkgrel
+	libjpeg-turbo-dev
+	tiff-dev
+	zlib-dev
 	"
+makedepends="$depends_dev meson"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-utils $pkgname-plugins"
+source="https://github.com/mm2/Little-CMS/releases/download/lcms$pkgver/lcms2-$pkgver.tar.gz"
 
 # secfixes:
 #   2.9-r1:
@@ -23,38 +24,38 @@ source="http://www.littlecms.com/$pkgname-$pkgver.tar.gz
 #     - CVE-2016-10165
 
 build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--disable-static \
-		--with-jpeg \
-		--with-tiff \
-		--with-zlib \
-		--with-threads
-	make
+	abuild-meson \
+		--default-library=both \
+		-Dfastfloat=true \
+		-Dthreaded=true \
+		-Dutils=true \
+		-Djpeg=enabled \
+		-Dtiff=enabled \
+		. output
+	meson compile -C output
 }
 
 check() {
-	cd "$builddir"
-	make check
+	meson test -t4 --no-rebuild -C output
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
 utils() {
 	pkgdesc="Utility applications for lcms2"
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+
+	amove usr/bin
+}
+
+plugins() {
+	pkgdesc="$pkgdesc (threaded + fast_float plugins)"
+	license="GPL-3.0-or-later"
+
+	amove usr/lib/liblcms2_*.so
 }
 
-sha512sums="70b1c51fa8d137d5072425e580745ff1fbf49c6e8bb1da0a8adb0647d3b7c095208793cb02de1e8d1a01363b8575fa60c61bedbff99bbec57a44228239cb00e5  lcms2-2.9.tar.gz
-9f2b0c72b7be0747fcdc71391bea1d1579a7b7ae7b6e8ac861f9faa603b4415e8cdd3c183bdeed444387bc618c16a028d74813a3d0040d70a0f474db2c90d832  CVE-2018-16435.patch"
+sha512sums="
+638dd6ad6787456c8145510d18b2d0727bd0a446a13ac2934aabc9531d1156eca2a2c0fd780a453823fbd35a1895f9d8de5dc4b3cab505459dd3f0535b4e837d  lcms2-2.16.tar.gz
+"
diff --git a/main/lcms2/CVE-2018-16435.patch b/main/lcms2/CVE-2018-16435.patch
deleted file mode 100644
index 775225c9884..00000000000
--- a/main/lcms2/CVE-2018-16435.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 768f70ca405cd3159d990e962d54456773bb8cf8 Mon Sep 17 00:00:00 2001
-From: Marti Maria <info@littlecms.com>
-Date: Wed, 15 Aug 2018 20:07:56 +0200
-Subject: [PATCH] Upgrade Visual studio 2017 15.8
-
-- Upgrade to 15.8
-- Add check on CGATS memory allocation (thanks to Quang Nguyen for
-pointing out this)
----
- Projects/VC2017/jpegicc/jpegicc.vcxproj           |  1 +
- Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj       |  2 +-
- Projects/VC2017/lcms2_static/lcms2_static.vcxproj |  2 +-
- Projects/VC2017/linkicc/linkicc.vcxproj           |  2 +-
- Projects/VC2017/psicc/psicc.vcxproj               |  2 +-
- Projects/VC2017/testbed/testbed.vcxproj           |  2 +-
- Projects/VC2017/tiffdiff/tiffdiff.vcxproj         |  2 +-
- Projects/VC2017/tifficc/tifficc.vcxproj           |  2 +-
- Projects/VC2017/transicc/transicc.vcxproj         |  1 +
- src/cmscgats.c                                    | 14 ++++++++++----
- 10 files changed, 19 insertions(+), 11 deletions(-)
-
-diff --git a/Projects/VC2017/jpegicc/jpegicc.vcxproj b/Projects/VC2017/jpegicc/jpegicc.vcxproj
-index ab26a53..39cfd00 100644
---- a/Projects/VC2017/jpegicc/jpegicc.vcxproj
-+++ b/Projects/VC2017/jpegicc/jpegicc.vcxproj
-@@ -22,6 +22,7 @@
-     <ProjectGuid>{62812507-F926-4968-96A9-17678460AD90}</ProjectGuid>
-     <RootNamespace>jpegicc</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj b/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj
-index 4c8aa3f..d1bf3eb 100644
---- a/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj
-+++ b/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj
-@@ -22,7 +22,7 @@
-     <ProjectGuid>{8C51BE48-ADB8-4089-A9EC-F6BF993A0548}</ProjectGuid>
-     <RootNamespace>lcms2_DLL</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
--    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/lcms2_static/lcms2_static.vcxproj b/Projects/VC2017/lcms2_static/lcms2_static.vcxproj
-index 2a9988a..9fc05ce 100644
---- a/Projects/VC2017/lcms2_static/lcms2_static.vcxproj
-+++ b/Projects/VC2017/lcms2_static/lcms2_static.vcxproj
-@@ -22,7 +22,7 @@
-     <ProjectGuid>{71DEDE59-3F1E-486B-A899-4283000F76B5}</ProjectGuid>
-     <RootNamespace>lcms2_static</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
--    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/linkicc/linkicc.vcxproj b/Projects/VC2017/linkicc/linkicc.vcxproj
-index 30c2b4e..51586dd 100644
---- a/Projects/VC2017/linkicc/linkicc.vcxproj
-+++ b/Projects/VC2017/linkicc/linkicc.vcxproj
-@@ -22,7 +22,7 @@
-     <ProjectGuid>{FBFBE1DC-DB84-4BA1-9552-B4780F457849}</ProjectGuid>
-     <RootNamespace>linkicc</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
--    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/psicc/psicc.vcxproj b/Projects/VC2017/psicc/psicc.vcxproj
-index 9dcf89a..8f26e12 100644
---- a/Projects/VC2017/psicc/psicc.vcxproj
-+++ b/Projects/VC2017/psicc/psicc.vcxproj
-@@ -22,7 +22,7 @@
-     <ProjectGuid>{EF6A8851-65FE-46F5-B9EF-14F0B671F693}</ProjectGuid>
-     <RootNamespace>psicc</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
--    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/testbed/testbed.vcxproj b/Projects/VC2017/testbed/testbed.vcxproj
-index 0af3762..3f6aea3 100644
---- a/Projects/VC2017/testbed/testbed.vcxproj
-+++ b/Projects/VC2017/testbed/testbed.vcxproj
-@@ -22,7 +22,7 @@
-     <ProjectGuid>{928A3A2B-46EF-4279-959C-513B3652FF0E}</ProjectGuid>
-     <RootNamespace>testbed</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
--    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/tiffdiff/tiffdiff.vcxproj b/Projects/VC2017/tiffdiff/tiffdiff.vcxproj
-index 7edfe28..3a6d837 100644
---- a/Projects/VC2017/tiffdiff/tiffdiff.vcxproj
-+++ b/Projects/VC2017/tiffdiff/tiffdiff.vcxproj
-@@ -22,7 +22,7 @@
-     <ProjectGuid>{75B91835-CCD7-48BE-A606-A9C997D5DBEE}</ProjectGuid>
-     <RootNamespace>tiffdiff</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
--    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/tifficc/tifficc.vcxproj b/Projects/VC2017/tifficc/tifficc.vcxproj
-index cd9f04c..5ef954f 100644
---- a/Projects/VC2017/tifficc/tifficc.vcxproj
-+++ b/Projects/VC2017/tifficc/tifficc.vcxproj
-@@ -22,7 +22,7 @@
-     <ProjectGuid>{2256DE16-ED92-4A6F-9C54-F65BB61E64A2}</ProjectGuid>
-     <RootNamespace>tifficc</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
--    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/Projects/VC2017/transicc/transicc.vcxproj b/Projects/VC2017/transicc/transicc.vcxproj
-index d9b77c6..b3173d8 100644
---- a/Projects/VC2017/transicc/transicc.vcxproj
-+++ b/Projects/VC2017/transicc/transicc.vcxproj
-@@ -22,6 +22,7 @@
-     <ProjectGuid>{9EE22D66-C849-474C-9ED5-C3E141DAB160}</ProjectGuid>
-     <RootNamespace>transicc</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-diff --git a/src/cmscgats.c b/src/cmscgats.c
-index 1a87613..8c3e96d 100644
---- a/src/cmscgats.c
-+++ b/src/cmscgats.c
-@@ -1,7 +1,7 @@
- //---------------------------------------------------------------------------------
- //
- //  Little Color Management System
--//  Copyright (c) 1998-2017 Marti Maria Saguer
-+//  Copyright (c) 1998-2018 Marti Maria Saguer
- //
- // Permission is hereby granted, free of charge, to any person obtaining
- // a copy of this software and associated documentation files (the "Software"),
-@@ -1506,10 +1506,16 @@ void AllocateDataSet(cmsIT8* it8)
-     t-> nSamples   = atoi(cmsIT8GetProperty(it8, "NUMBER_OF_FIELDS"));
-     t-> nPatches   = atoi(cmsIT8GetProperty(it8, "NUMBER_OF_SETS"));
- 
--    t-> Data = (char**)AllocChunk (it8, ((cmsUInt32Number) t->nSamples + 1) * ((cmsUInt32Number) t->nPatches + 1) *sizeof (char*));
--    if (t->Data == NULL) {
-+    if (t -> nSamples < 0 || t->nSamples > 0x7ffe || t->nPatches < 0 || t->nPatches > 0x7ffe)
-+    {
-+        SynError(it8, "AllocateDataSet: too much data");
-+    }
-+    else {
-+        t->Data = (char**)AllocChunk(it8, ((cmsUInt32Number)t->nSamples + 1) * ((cmsUInt32Number)t->nPatches + 1) * sizeof(char*));
-+        if (t->Data == NULL) {
- 
--        SynError(it8, "AllocateDataSet: Unable to allocate data array");
-+            SynError(it8, "AllocateDataSet: Unable to allocate data array");
-+        }
-     }
- 
- }
diff --git a/main/ldapvi/APKBUILD b/main/ldapvi/APKBUILD
index f0495941130..2e6ada9c80b 100644
--- a/main/ldapvi/APKBUILD
+++ b/main/ldapvi/APKBUILD
@@ -2,38 +2,34 @@
 # Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
 pkgname=ldapvi
 pkgver=1.7
-pkgrel=11
+pkgrel=15
 pkgdesc="ldapvi is an interactive LDAP client for Unix terminals"
 url="http://www.lichteblau.com/ldapvi/"
 arch="all"
-license="GPL"
-depends=""
-makedepends="ncurses-dev openldap-dev popt-dev readline-dev glib-dev"
+license="GPL-2.0-or-later"
+makedepends="ncurses-dev openldap-dev popt-dev readline-dev glib-dev openssl-dev>3"
 subpackages="$pkgname-doc"
-source="http://www.lichteblau.com/download/${pkgname}-${pkgver}.tar.gz
+source="http://www.lichteblau.com/download/ldapvi-$pkgver.tar.gz
 	GNUmakefile.in.diff
 	ldapvi_vim_modeline_fix.patch
 	ldapvi_getline.patch"
-builddir="$srcdir/${pkgname}-${pkgver}"
+options="!check"
 
 prepare() {
-	cd "$builddir"
-	patch -Np0 -i "$srcdir"/GNUmakefile.in.diff || return 1
+	patch -Np0 -i "$srcdir"/GNUmakefile.in.diff
 
 	default_prepare  # apply patches
 }
 
 build() {
-	cd "$builddir"
 	./configure --prefix=/usr && make
 }
 
 package() {
-	cd "$builddir"
 	mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/share/doc/ldapvi" \
 		"$pkgdir/usr/share/man/man1"
 	make DESTDIR="$pkgdir" MANDIR="$pkgdir"/usr/share/man/man1 \
-		DOCDIR="$pkgdir/usr/share/doc/ldapvi" install || return 1
+		DOCDIR="$pkgdir/usr/share/doc/ldapvi" install
 }
 
 sha512sums="4b38cee0763aa33703afbd5e358a458b1468abf58e43ea885879b2117bc1c0bbc375d91c6a43467ec08035b8b3b7dd4b024f2937c37741c7a5513ea9192aed36  ldapvi-1.7.tar.gz
diff --git a/main/ldb/APKBUILD b/main/ldb/APKBUILD
index c12dc7e4c36..14d0bfd9d86 100644
--- a/main/ldb/APKBUILD
+++ b/main/ldb/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ldb
-pkgver=2.1.1
-pkgrel=0
-pkgdesc="A schema-less, ldap like, API and database"
+pkgver=2.8.0
+pkgrel=1
+pkgdesc="schema-less, ldap like, API and database"
 url="https://ldb.samba.org/"
 arch="all"
 license="LGPL-3.0-or-later"
@@ -11,7 +11,7 @@ makedepends="libtirpc-dev tevent-dev py3-tevent tdb-dev py3-tdb talloc-dev
 subpackages="$pkgname-dev py3-$pkgname:_py3 $pkgname-tools $pkgname-doc"
 source="https://www.samba.org/ftp/pub/ldb/ldb-$pkgver.tar.gz
 	disable-compile-error-test.patch
-	disable-failing-test-ppc64le.patch
+	strtoull.patch
 	"
 
 # secfixes:
@@ -20,58 +20,44 @@ source="https://www.samba.org/ftp/pub/ldb/ldb-$pkgver.tar.gz
 
 _waf=buildtools/bin/waf
 
-prepare() {
-	default_prepare
-
-	# [ RUN      ] test_get_size
-	# [  FAILED  ] test_get_size
-	# [==========] 13 test(s) run.
-	# [  ERROR   ] --- 13369 is not within the range 2500-5000
-	# [   LINE   ] --- ../../tests/ldb_kv_ops_test.c:1721: error: Failure!
-	if [ $CARCH = ppc64le ]; then
-		msg "Patching test_get_size in tests/ldb_kv_opts_test.c"
-		sed -e 's/5000/15000/' -i tests/ldb_kv_ops_test.c
-
-		msg "Disabling one assertion in tests/python/repack.py"
-		sed -e '/test_guid_indexed_v1_db/,+18{/toggle_guidindex_check_pack/d}' \
-			-i tests/python/repack.py
-	fi
-}
+case "$CARCH" in
+	ppc64le) options="$options !check" ;;
+	x86|armhf|armv7) options="$options !check" ;;
+esac
 
 build() {
-	"$_waf" configure \
+	CFLAGS="$CFLAGS -flto=auto" \
+	./configure \
 		--prefix=/usr \
 		--disable-rpath \
 		--disable-rpath-install \
 		--builtin-libraries=replace \
 		--bundled-libraries=NONE \
 		--with-modulesdir=/usr/lib/ldb/modules
-	"$_waf" build
+	make
 }
 
 check() {
-	"$_waf" test
+	make check
 }
 
 package() {
-	DESTDIR="$pkgdir" "$_waf" install
+	make install DESTDIR="$pkgdir"
 }
 
 _py3() {
 	pkgdesc="Python 3 binding for the ldb library"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/libpyldb-util.cpython* "$subpkgdir"/usr/lib/
+	amove usr/lib/python3* \
+		usr/lib/libpyldb-util.cpython*
 }
 
 tools() {
 	pkgdesc="Tools to manage LDB files"
-	mkdir -p "$subpkgdir"/usr/lib/ldb
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/lib/ldb/libldb-cmdline.* "$subpkgdir"/usr/lib/ldb/
+	amove usr/bin usr/lib/ldb/libldb-cmdline.*
 }
 
-sha512sums="dd87da0746790895c617108c64b718ab6e6e630f1e3269154b40fc0e5623199a4b132d41623ae00d5c263ce79c4d6da34f072a140bee91a59dd6934969315fc8  ldb-2.1.1.tar.gz
+sha512sums="
+b6f289af3137e02a8e3ee0588bc300d1756b8980558e0b3a3a9eee4449100ccd42ed873187dbdb334e7e7834a8bff8478cd4f20588d4ca834d9ea14c0ee2c2f9  ldb-2.8.0.tar.gz
 ed55d5151bbcaf5c0a1b70a1f44b461a501ad94ce02ee97e3ea10c560ce3656a190510697bbd3c5b6f70a74519bf7c0a91210bcb415ffd97d9440045e10a02e8  disable-compile-error-test.patch
-ac50c60082bd761b462f32f949cd6b3bacfd354b3f5dae8bd8655aaa3589e09d6146c42e2edc7c76ca9badd5beec69b5c87cee7cc10e50655cd5c4befd3e4208  disable-failing-test-ppc64le.patch"
+8e005bf69759b962b60898a746443a7324ab93dde0e6e21bbeddeb6e49a9cb90152129ef874c8cf82c45291427363307182bb54ce573eee3669ec0f0a251e3cb  strtoull.patch
+"
diff --git a/main/ldb/disable-failing-test-ppc64le.patch b/main/ldb/disable-failing-test-ppc64le.patch
deleted file mode 100644
index 61202ad363c..00000000000
--- a/main/ldb/disable-failing-test-ppc64le.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/python/repack.py b/tests/python/repack.py
-index 0844cd2..189789e 100644
---- a/tests/python/repack.py
-+++ b/tests/python/repack.py
-@@ -194,7 +194,6 @@ class GUIDIndexAndPackFormatTests(TestCase):
-         self.assertEqual(pack_formats, [ldb.PACKING_FORMAT_V2])
-         self.assertEqual(self.get_database(), expect_db)
- 
--        self.toggle_guidindex_check_pack()
- 
- 
- if __name__ == '__main__':
diff --git a/main/ldb/strtoull.patch b/main/ldb/strtoull.patch
new file mode 100644
index 00000000000..2fcd928a3d1
--- /dev/null
+++ b/main/ldb/strtoull.patch
@@ -0,0 +1,89 @@
+diff --git a/lib/replace/replace.c b/lib/replace/replace.c
+index 0652cb4..02b6ebf 100644
+--- a/lib/replace/replace.c
++++ b/lib/replace/replace.c
+@@ -559,41 +559,6 @@ long long int rep_strtoll(const char *str, char **endptr, int base)
+ #endif /* HAVE_STRTOLL */
+ 
+ 
+-#ifndef HAVE_STRTOULL
+-unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
+-{
+-#ifdef HAVE_STRTOUQ
+-	return strtouq(str, endptr, base);
+-#elif defined(HAVE___STRTOULL) 
+-	return __strtoull(str, endptr, base);
+-#elif SIZEOF_LONG == SIZEOF_LONG_LONG
+-	return (unsigned long long int) strtoul(str, endptr, base);
+-#else
+-# error "You need a strtoull function"
+-#endif
+-}
+-#else
+-#ifdef HAVE_BSD_STRTOLL
+-#undef strtoull
+-unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
+-{
+-	int saved_errno = errno;
+-	unsigned long long int nb = strtoull(str, endptr, base);
+-	/* With glibc EINVAL is only returned if base is not ok */
+-	if (errno == EINVAL) {
+-		if (base == 0 || (base >1 && base <37)) {
+-			/* Base was ok so it's because we were not
+-			 * able to make the conversion.
+-			 * Let's reset errno.
+-			 */
+-			errno = saved_errno;
+-		}
+-	}
+-	return nb;
+-}
+-#endif /* HAVE_BSD_STRTOLL */
+-#endif /* HAVE_STRTOULL */
+-
+ #ifndef HAVE_SETENV
+ int rep_setenv(const char *name, const char *value, int overwrite) 
+ {
+diff --git a/lib/replace/replace.h b/lib/replace/replace.h
+index a8910e2..854b1a7 100644
+--- a/lib/replace/replace.h
++++ b/lib/replace/replace.h
+@@ -394,16 +394,6 @@ long long int rep_strtoll(const char *str, char **endptr, int base);
+ #endif
+ #endif
+ 
+-#ifndef HAVE_STRTOULL
+-#define strtoull rep_strtoull
+-unsigned long long int rep_strtoull(const char *str, char **endptr, int base);
+-#else
+-#ifdef HAVE_BSD_STRTOLL /* yes, it's not HAVE_BSD_STRTOULL */
+-#define strtoull rep_strtoull
+-unsigned long long int rep_strtoull(const char *str, char **endptr, int base);
+-#endif
+-#endif
+-
+ #ifndef HAVE_FTRUNCATE
+ #define ftruncate rep_ftruncate
+ int rep_ftruncate(int,off_t);
+diff --git a/lib/replace/wscript b/lib/replace/wscript
+index 4c774d9..a1dc6d0 100644
+--- a/lib/replace/wscript
++++ b/lib/replace/wscript
+@@ -411,7 +411,7 @@ def configure(conf):
+     conf.CHECK_FUNCS('initgroups pread pwrite strndup strcasestr strsep')
+     conf.CHECK_FUNCS('strtok_r mkdtemp dup2 dprintf vdprintf isatty chown lchown')
+     conf.CHECK_FUNCS('link readlink symlink realpath snprintf vsnprintf')
+-    conf.CHECK_FUNCS('asprintf vasprintf setenv unsetenv strnlen strtoull __strtoull')
++    conf.CHECK_FUNCS('asprintf vasprintf setenv unsetenv strnlen')
+     conf.CHECK_FUNCS('strtouq strtoll __strtoll strtoq memalign posix_memalign')
+     conf.CHECK_FUNCS('fmemopen')
+ 
+@@ -866,7 +866,7 @@ REPLACEMENT_FUNCTIONS = {
+                   'memmove', 'strdup', 'setlinebuf', 'vsyslog', 'strnlen',
+                   'strndup', 'waitpid', 'seteuid', 'setegid', 'chroot',
+                   'mkstemp', 'mkdtemp', 'pread', 'pwrite', 'strcasestr',
+-                  'strsep', 'strtok_r', 'strtoll', 'strtoull', 'setenv', 'unsetenv',
++                  'strsep', 'strtok_r', 'strtoll', 'setenv', 'unsetenv',
+                   'utime', 'utimes', 'dup2', 'chown', 'link', 'readlink',
+                   'symlink', 'lchown', 'realpath', 'memmem', 'vdprintf',
+                   'dprintf', 'get_current_dir_name', 'copy_file_range',
diff --git a/main/lddtree/0001-use-musl-ldso-conf.patch b/main/lddtree/0001-use-musl-ldso-conf.patch
deleted file mode 100644
index a0f2b321867..00000000000
--- a/main/lddtree/0001-use-musl-ldso-conf.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Author: Ain <41307858+nero@users.noreply.github.com>
-
-    Fix ldso configuration parsing for musl binaries
-    
-    Previously, lddtree always checked for the glibc library paths, even
-    when ran on a musl binary. This resulted in incorrect results on
-    multiarch systems with both musl and glibc.
-
-diff --git a/lddtree.sh b/lddtree.sh
-index 5f06813..74ca830 100755
---- a/lddtree.sh
-+++ b/lddtree.sh
-@@ -107,7 +107,7 @@ c_ldso_paths_loaded='false'
- find_elf() {
- 	_find_elf=''
- 
--	local elf=$1 needed_by=$2
-+	local interp elf=$1 needed_by=$2
- 	if [ "${elf}" != "${elf##*/}" ] && [ -e "${elf}" ] ; then
- 		_find_elf=${elf}
- 		return 0
-@@ -151,28 +151,36 @@ find_elf() {
- 		if ! ${c_ldso_paths_loaded} ; then
- 			c_ldso_paths_loaded='true'
- 			c_ldso_paths=
--			if [ -r ${ROOT}etc/ld.so.conf ] ; then
--				read_ldso_conf() {
--					local line p
--					for p ; do
--						# if the glob didnt match anything #360041,
--						# or the files arent readable, skip it
--						[ -r "${p}" ] || continue
--						while read line ; do
--							case ${line} in
--								"#"*) ;;
--								"include "*) read_ldso_conf ${line#* } ;;
--								*) c_ldso_paths="$c_ldso_paths:${ROOT}${line#/}";;
--							esac
--						done <"${p}"
--					done
--				}
--				# the 'include' command is relative
--				local _oldpwd="$PWD"
--				cd "$ROOT"etc >/dev/null
-+			read_ldso_conf() {
-+				local line p
-+				for p ; do
-+					# if the glob didnt match anything #360041,
-+					# or the files arent readable, skip it
-+					[ -r "${p}" ] || continue
-+					while read line ; do
-+						case ${line} in
-+							"#"*) ;;
-+							"include "*) read_ldso_conf ${line#* } ;;
-+							*) c_ldso_paths="$c_ldso_paths:${ROOT}${line#/}";;
-+						esac
-+					done <"${p}"
-+				done
-+			}
-+			# the 'include' command is relative
-+			local _oldpwd="$PWD"
-+			cd "$ROOT"etc >/dev/null
-+			interp=$(elf_interp "${needed_by}")
-+			case "$interp" in
-+			*/ld-musl-*)
-+				musl_arch=${interp%.so*}
-+				musl_arch=${musl_arch##*-}
-+				read_ldso_conf "${ROOT}"etc/ld-musl-${musl_arch}.path
-+				;;
-+			*/ld-linux*|*/ld.so*) # glibc
- 				read_ldso_conf "${ROOT}"etc/ld.so.conf
--				cd "$_oldpwd"
--			fi
-+				;;
-+			esac
-+			cd "$_oldpwd"
- 		fi
- 		if [ -n "${c_ldso_paths}" ] ; then
- 			check_paths "${elf}" "${c_ldso_paths}" && return 0
diff --git a/main/lddtree/APKBUILD b/main/lddtree/APKBUILD
index 3856f0f3e22..7b1dcfbd0f6 100644
--- a/main/lddtree/APKBUILD
+++ b/main/lddtree/APKBUILD
@@ -1,30 +1,25 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lddtree
-pkgver=1.26
-pkgrel=2
+pkgver=1.27
+pkgrel=0
 pkgdesc="List dynamic dependencies as a tree"
 url="https://github.com/ncopa/lddtree"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
 depends="scanelf"
-depends_dev=""
 replaces="pax-utils"
-makedepends="$depends_dev"
-install=""
-subpackages=""
-options="!check"
+checkdepends="kyua"
 source="lddtree-$pkgver.tar.gz::https://github.com/ncopa/lddtree/archive/v$pkgver.tar.gz
-	0001-use-musl-ldso-conf.patch
 	"
 
-build() {
-	return 0
+check() {
+	make check
 }
 
 package() {
-	cd "$builddir"
 	install -Dm755 lddtree.sh "$pkgdir"/usr/bin/lddtree
 }
 
-sha512sums="9c244cf47627e6cfb396f4187e7c35b438bcb8e3978e43a91ad5a5d034233eaaffd1319e98b6a26b8bbcb570ede3eeb809a14720b50771587a96dde5f6516340  lddtree-1.26.tar.gz
-de2e9321a955697860a74a6bd383e7c77a4a10733247b2cb0c5ccbb4586c24d60cd7ee3d30cc4f33620cb971247d84b9550073ff0f7a11ef7a46af75c5fcf920  0001-use-musl-ldso-conf.patch"
+sha512sums="
+aa27c8556a8370a662dc08a5a1fe80ce1dbcab28478e61bf52997fe93108c1ce96f6bbe5427326c5f215abc58b3ba45a8aae4e5196bda1746ef9c95c99dd5ee2  lddtree-1.27.tar.gz
+"
diff --git a/main/ldns/APKBUILD b/main/ldns/APKBUILD
index 1d75456eddd..1c5d9d94d85 100644
--- a/main/ldns/APKBUILD
+++ b/main/ldns/APKBUILD
@@ -1,14 +1,15 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ldns
-pkgver=1.7.1
-pkgrel=1
+pkgver=1.8.3
+pkgrel=2
 pkgdesc="Lowlevel DNS(SEC) library"
-url="http://nlnetlabs.nl/projects/ldns/"
+url="https://nlnetlabs.nl/projects/ldns/"
 arch="all"
-license="Custom"
-depends_dev="openssl-dev"
-makedepends="$depends_dev libpcap-dev perl"
+license="BSD-3-Clause"
+options="!check" # tests not shipped in tarball
+depends_dev="openssl-dev>3"
+makedepends="$depends_dev libpcap-dev perl autoconf automake libtool"
 subpackages="$pkgname-dev $pkgname-doc drill $pkgname-tools"
 source="https://nlnetlabs.nl/downloads/ldns/ldns-$pkgver.tar.gz"
 
@@ -18,7 +19,6 @@ source="https://nlnetlabs.nl/downloads/ldns/ldns-$pkgver.tar.gz"
 #     - CVE-2017-1000232
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -34,8 +34,11 @@ build() {
 	make
 }
 
+check() {
+	make test
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	rm -f "$pkgdir"/usr/lib/*.a
@@ -70,4 +73,6 @@ tools() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-sha512sums="e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7  ldns-1.7.1.tar.gz"
+sha512sums="
+c318747bd975ade389d048680b80495fb083b46507d8dcea7d4d42c75823f56a35b438dcc5320803d39583e5a1e515a51686f7f9010c061a6e8199e1a5505ae9  ldns-1.8.3.tar.gz
+"
diff --git a/main/ldoc/APKBUILD b/main/ldoc/APKBUILD
index ed74f40b605..9ba4cc187ca 100644
--- a/main/ldoc/APKBUILD
+++ b/main/ldoc/APKBUILD
@@ -1,34 +1,28 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ldoc
-_pkgname=LDoc
-pkgver=1.4.6
-pkgrel=2
+pkgver=1.5.0
+pkgrel=0
 pkgdesc="Documentation tool for Lua"
-url="https://github.com/stevedonovan/LDoc"
+url="https://github.com/lunarmodules/LDoc"
 arch="noarch"
 license="MIT"
-_luaver=5.3
-depends="lua-penlight lua$_luaver" # lua-penlight provides lua5.3-penlight
-source="$_pkgname-$pkgver.tar.gz::https://github.com/stevedonovan/$_pkgname/archive/$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-prepare() {
-	default_prepare
-	cd "$builddir"
-
-	sed -i "1s:.*:#!/usr/bin/lua$_luaver:" ldoc.lua
-	find . -type d | xargs chmod 755
-}
+_luaver=5.4
+depends="lua-penlight lua$_luaver" # lua-penlight provides lua5.4-penlight
+source="$pkgname-$pkgver.tar.gz::https://github.com/lunarmodules/LDoc/archive/v$pkgver.tar.gz
+	lua5.4.patch
+	"
+options="!check"
 
 package() {
 	local lmod_dir="$pkgdir/usr/share/lua/$_luaver"
-	cd "$builddir"
-
 	install -Dm755 ldoc.lua "$pkgdir"/usr/bin/ldoc
 
 	install -d "$lmod_dir"
 	cp -a ldoc "$lmod_dir"/
 }
 
-sha512sums="bcaddba4e462a4fb0aa0d8fcff390de3f195fa5cc569d8f05b84ad0fff900f5ac945be7a2eb15cf5ca60cc462f02c874579e4a19e33776178a04104ef9d944af  LDoc-1.4.6.tar.gz"
+sha512sums="
+5879c5a73546ca30240faf65803500754af37b8a51eb0baac0c0ee71870fbdb258011901e50c8e204906c8f705bab1ba2f94ce6fcc417920d4c8d92363f44e07  ldoc-1.5.0.tar.gz
+c39db0dc643c40c0e98611057cd2d9fc01bf54a55608f8083ad704cce8adb2d86172bebe0867a6a0da425bce90f60468b0f6367afe9063b2f37d22f8f22adfc6  lua5.4.patch
+"
diff --git a/main/ldoc/lua5.4.patch b/main/ldoc/lua5.4.patch
new file mode 100644
index 00000000000..9f68bf8407a
--- /dev/null
+++ b/main/ldoc/lua5.4.patch
@@ -0,0 +1,10 @@
+diff --git a/ldoc.lua b/ldoc.lua
+index aff63b9..06501fc 100644
+--- a/ldoc.lua
++++ b/ldoc.lua
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env lua
++#!/usr/bin/env lua5.4
+ ---------------
+ -- ## ldoc, a Lua documentation generator.
+ --
diff --git a/main/less/APKBUILD b/main/less/APKBUILD
index 7e4f326822f..5dce792a566 100644
--- a/main/less/APKBUILD
+++ b/main/less/APKBUILD
@@ -1,20 +1,20 @@
 # Contributor: Cameron Banta <cbanta@gmail.com>
-# Maintainer: Cameron Banta <cbanta@gmail.com>
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=less
-pkgver=551
-pkgrel=0
+pkgver=643
+pkgrel=2
 pkgdesc="File pager"
-url="http://www.greenwoodsoftware.com/less/"
+url="https://www.greenwoodsoftware.com/less/"
 arch="all"
-license="GPL"
+license="GPL-3.0-or-later OR BSD-2-Clause"
 options="!check"
 makedepends="ncurses-dev"
 subpackages="$pkgname-doc"
-source="http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://www.greenwoodsoftware.com/less/less-$pkgver.tar.gz
+	CVE-2024-32487.patch
+	"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,8 +26,10 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ef5296b9ebd72f83c05cad8a0f7a5eec2290e9b358ee725e09e8541bd95f94c0e14ea22aa04b287a0654079338eaeae813f2235b8e9f819fbbc9040dd65a9585  less-551.tar.gz"
+sha512sums="
+6a324ac54e22429ac652dc303bc1fe48933555d1cbf8ad7ecf345940910c014fef9551a3219743cfb7115e356b5841ae97d6ce62e7a1ba1e3300d243efca34d9  less-643.tar.gz
+a7d32e8f969a19f23b6ce4b53e6c58f2920e95ac76ce2a4a1b97e5d545e3556c2f9edf804a8475748f477f97aaa3faa290d393995c863e99090a09fda3d82a56  CVE-2024-32487.patch
+"
diff --git a/main/less/CVE-2024-32487.patch b/main/less/CVE-2024-32487.patch
new file mode 100644
index 00000000000..b879d90309a
--- /dev/null
+++ b/main/less/CVE-2024-32487.patch
@@ -0,0 +1,67 @@
+From 007521ac3c95bc76e3d59c6dbfe75d06c8075c33 Mon Sep 17 00:00:00 2001
+From: Mark Nudelman <markn@greenwoodsoftware.com>
+Date: Thu, 11 Apr 2024 17:49:48 -0700
+Subject: [PATCH] Fix bug when viewing a file whose name contains a newline.
+
+---
+ filename.c | 31 +++++++++++++++++++++++++------
+ 1 file changed, 25 insertions(+), 6 deletions(-)
+
+diff --git a/filename.c b/filename.c
+index f90e0e82..a52c6354 100644
+--- a/filename.c
++++ b/filename.c
+@@ -133,6 +133,15 @@ static constant char * metachars(void)
+ 	return (strchr(metachars(), c) != NULL);
+ }
+ 
++/*
++ * Must use quotes rather than escape char for this metachar?
++ */
++static int must_quote(char c)
++{
++	/* {{ Maybe the set of must_quote chars should be configurable? }} */
++	return (c == '\n'); 
++}
++
+ /*
+  * Insert a backslash before each metacharacter in a string.
+  */
+@@ -164,6 +173,9 @@ public char * shell_quoten(constant char *s, size_t slen)
+ 				 * doesn't support escape chars.  Use quotes.
+ 				 */
+ 				use_quotes = 1;
++			} else if (must_quote(*p))
++			{
++				len += 3; /* open quote + char + close quote */
+ 			} else
+ 			{
+ 				/*
+@@ -193,15 +205,22 @@ public char * shell_quoten(constant char *s, size_t slen)
+ 	{
+ 		while (*s != '\0')
+ 		{
+-			if (metachar(*s))
++			if (!metachar(*s))
+ 			{
+-				/*
+-				 * Add the escape char.
+-				 */
++				*p++ = *s++;
++			} else if (must_quote(*s))
++			{
++				/* Surround the char with quotes. */
++				*p++ = openquote;
++				*p++ = *s++;
++				*p++ = closequote;
++			} else
++			{
++				/* Insert an escape char before the char. */
+ 				strcpy(p, esc);
+ 				p += esclen;
++				*p++ = *s++;
+ 			}
+-			*p++ = *s++;
+ 		}
+ 		*p = '\0';
+ 	}
diff --git a/main/leveldb/APKBUILD b/main/leveldb/APKBUILD
deleted file mode 100644
index cd7929f8e61..00000000000
--- a/main/leveldb/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: TBK <alpine@jjtc.eu>
-pkgname=leveldb
-pkgver=1.22
-pkgrel=1
-pkgdesc="A fast and lightweight key/value database library by Google"
-url="https://github.com/google/leveldb"
-arch="all"
-license="BSD-3-Clause"
-makedepends="cmake snappy-dev"
-subpackages="$pkgname-dev $pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/google/$pkgname/archive/$pkgver.tar.gz"
-
-build() {
-	mkdir build && cd build
-	cmake .. \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-		-DLEVELDB_BUILD_TESTS=ON \
-		-DLEVELDB_INSTALL=ON \
-		-DBUILD_SHARED_LIBS=ON
-	make
-}
-
-check() {
-	cd "$builddir"/build
-	make test
-}
-
-package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir" install
-	mkdir -p "$pkgdir"/usr/share/doc
-	cp -a ../doc "$pkgdir"/usr/share/doc/$pkgname
-}
-
-sha512sums="f9bbf5f466e7f707b94e19261762319ea9f65d41911690e84f59098551e2e69beccf756a414d705ade74ee96fd979bdb8b94c171c6f2cc83873cbd4a9380dbab  leveldb-1.22.tar.gz"
diff --git a/main/lftp/APKBUILD b/main/lftp/APKBUILD
index afa2565181c..f3e6f4f39e8 100644
--- a/main/lftp/APKBUILD
+++ b/main/lftp/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=lftp
-pkgver=4.9.1
-pkgrel=0
+pkgver=4.9.2
+pkgrel=6
 pkgdesc="Sophisticated ftp/http client"
 url="https://lftp.tech"
 arch="all"
 license="GPL-3.0-or-later"
-makedepends="zlib-dev openssl-dev readline-dev ncurses-dev"
+makedepends="zlib-dev openssl-dev>3 readline-dev ncurses-dev"
 subpackages="$pkgname-doc"
 source="https://lftp.yar.ru/ftp/lftp-$pkgver.tar.xz"
 
@@ -16,6 +16,11 @@ source="https://lftp.yar.ru/ftp/lftp-$pkgver.tar.xz"
 #   4.8.4-r0:
 #     - CVE-2018-10916
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
@@ -39,7 +44,9 @@ package() {
 
 check() {
 	# skip ftp tests due to firewall issues
-	make -C tests check check_PROGRAMS=http-get
+	make -C tests check check_PROGRAMS=
 }
 
-sha512sums="303e2354bd61a850403a02ac5b71e54719c12b026c7e36194a6382e9044f1fee93ea581ba0a55fea19981e07b896216e92c7d961c719350762eb0cfb51a2c506  lftp-4.9.1.tar.xz"
+sha512sums="
+cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad  lftp-4.9.2.tar.xz
+"
diff --git a/main/libaio/APKBUILD b/main/libaio/APKBUILD
index 96a4f1dc260..6dc8f5853ca 100644
--- a/main/libaio/APKBUILD
+++ b/main/libaio/APKBUILD
@@ -1,30 +1,48 @@
 # Contributor: Michael Pirogov <vbnet.ru@gmail.com>
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
-pkgname="libaio"
-pkgver=0.3.112
-pkgrel=1
+pkgname=libaio
+pkgver=0.3.113
+pkgrel=2
 pkgdesc="Asynchronous input/output library"
 url="https://pagure.io/libaio"
 arch="all"
 license="LGPL-2.1-or-later"
-options="!check" # No test suite.
-makedepends_host="linux-headers"
-subpackages="$pkgname-dev"
-source="https://releases.pagure.org/libaio/libaio-$pkgver.tar.gz
-	libaio-optional-werror.patch
+checkdepends="bash"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://pagure.io/libaio/archive/libaio-$pkgver/libaio-libaio-$pkgver.tar.gz
 	libaio-cppflags.patch
-	libaio-errno.patch"
+	libaio-errno.patch
+	test.patch
+	test-poll.patch
+	"
+
+case "$CARCH" in
+arm*|aarch64)
+	# fail for some reason on builders only
+	options="$options !check"
+	;;
+esac
+builddir="$srcdir/libaio-libaio-$pkgver"
+
+build() {
+	make
+}
+
+check() {
+	make partcheck
+}
 
 package() {
-	make prefix="$pkgdir/usr" \
-		sysconfdir="$pkgdir/etc" \
-		mandir="$pkgdir/usr/share/man" \
-		infodir="$pkgdir/usr/share/info" \
-		install
+	DESTDIR="$pkgdir" make install
+	cd man
+	find ./ -name "*.3" -exec install -Dm 644 {} "$pkgdir"/usr/share/man/man3/{} \;
 }
 
-sha512sums="5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa  libaio-0.3.112.tar.gz
-9b04df1f92b245c3012d161a96bc54d3bcc07d8a1049d7e5acfae50fba9bba94cbdbc220d75d186d6bf2333d58b093b9cf17bd7cd594cfdbfb6682a63daf19fd  libaio-optional-werror.patch
+sha512sums="
+8058c927de0b5f7079fc232d2be23272537694bf271488af1dc0330b58afc307931792ab138512c5e00aa3ea921935a6d862f575fb0cc2bf323de63d8df208cd  libaio-libaio-0.3.113.tar.gz
 c9ad6ff35ba12f33e308059d89592281768cef7091213b4702b64af2d194462864ec660dea327f8b718e5c723ec9ba6170b591461e2b140ba94f6838cddb8d7c  libaio-cppflags.patch
-2bf5224f5c5714786cb9ed28d9ae7c1721ad21a498d7e76d0cd1443435f7cd424bd6d80baa961a07f38f20359711b3270cd5913890a47b683e035dfe00f66054  libaio-errno.patch"
+2bf5224f5c5714786cb9ed28d9ae7c1721ad21a498d7e76d0cd1443435f7cd424bd6d80baa961a07f38f20359711b3270cd5913890a47b683e035dfe00f66054  libaio-errno.patch
+b2bb73b7fe2ae083af8d7a8a6e5fe34830bff007b5dcdb565a440d81178f85862ac5b45b5e9ea061a5624eb4841ef013ed5c0d725e23f329721d4699b3d2cf56  test.patch
+b8c0fc6eb5c624a58c0110893af44cb1a3b3b047a6498705655854e3e1172fc587520cbe945738689c69d89b39c11c614e039e4850e0bb019e6a78fa1b5a9a85  test-poll.patch
+"
diff --git a/main/libaio/libaio-optional-werror.patch b/main/libaio/libaio-optional-werror.patch
deleted file mode 100644
index a5bd4045e6f..00000000000
--- a/main/libaio/libaio-optional-werror.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ebe62b178f3e5fcde8a311e64aaffe62099204a5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 21 Apr 2019 12:44:26 +0200
-Subject: [PATCH] make -Werror into an optional flag
-
-This lets distros disable the flag as random errors might come up with
-different compiler flags and older/newer toolchain versions.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- harness/Makefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/harness/Makefile b/harness/Makefile
-index f477737..a155c4b 100644
---- a/harness/Makefile
-+++ b/harness/Makefile
-@@ -6,7 +6,8 @@ PROGS:=$(PARTPROGS) $(EXTRAPROGS)
- HARNESS_SRCS:=main.c
- # io_queue.c
- 
--CFLAGS+=-Wall -Werror -I../src -g -O2 -DPAGE_SIZE=$(shell getconf PAGESIZE)
-+CFLAGS_WERROR?=-Werror
-+CFLAGS+=-Wall $(CFLAGS_WERROR) -I../src -g -O2 -DPAGE_SIZE=$(shell getconf PAGESIZE)
- #-lpthread -lrt
- 
- all: $(PROGS)
--- 
-2.21.0
-
-
diff --git a/main/libaio/test-poll.patch b/main/libaio/test-poll.patch
new file mode 100644
index 00000000000..1183a4b453b
--- /dev/null
+++ b/main/libaio/test-poll.patch
@@ -0,0 +1,12 @@
+diff -Nurp a/harness/cases/22.t b/harness/cases/22.t
+--- a/harness/cases/22.t	2018-10-22 20:59:34.000000000 +0100
++++ b/harness/cases/22.t	2022-02-26 09:48:59.421311473 +0000
+@@ -11,7 +11,7 @@
+ #include <signal.h>
+ #include <stdio.h>
+ #include <unistd.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/wait.h>
+ #include <stdlib.h>
+ 
diff --git a/main/libaio/test.patch b/main/libaio/test.patch
new file mode 100644
index 00000000000..08227231187
--- /dev/null
+++ b/main/libaio/test.patch
@@ -0,0 +1,55 @@
+From: Lee Duncan <lduncan@suse.com>
+Date: Thu, 11 Feb 2021 11:34:42 -0800
+Subject: [PATCH] Fix test issue with gcc-11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Test 3.t exercises io_submit() with invalid addresses,
+and one test attempted to pass in "-1" as an invalid
+pointer. But gcc-11 realizes you cannot take an offset
+from an invalid pointer, making it impossible to
+compile or run this test:
+
+> sh# make CC=gcc-11 partcheck
+> make[1]: Entering directory '/alt/public_software/libaio/src'
+> make[1]: Nothing to be done for 'all'.
+> make[1]: Leaving directory '/alt/public_software/libaio/src'
+> make[1]: Entering directory '/alt/public_software/libaio/harness'
+> gcc-11 -Wall -Werror -I../src -g -O2 -DTEST_NAME=\"cases/2.t\" -o cases/2.p main.c ../src/libaio.a -lpthread
+> gcc-11 -Wall -Werror -I../src -g -O2 -DTEST_NAME=\"cases/3.t\" -o cases/3.p main.c ../src/libaio.a -lpthread
+> In file included from main.c:24:
+> cases/3.t: In function ‘test_main’:
+> cases/3.t:18:19: error: ‘attempt_io_submit’ accessing 8 bytes in a region of size 0 [-Werror=stringop-overflow=]
+>    18 |         status |= attempt_io_submit( io_ctx, 1, (void *)-1, -EFAULT);
+>       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+> cases/3.t:18:19: note: referencing argument 3 of type ‘struct iocb **’
+> In file included from cases/3.t:5,
+>                  from main.c:24:
+> cases/aio_setup.h:15:5: note: in a call to function ‘attempt_io_submit’
+>    15 | int attempt_io_submit(io_context_t ctx, long nr, struct iocb *ios[], int expect)
+>       |     ^~~~~~~~~~~~~~~~~
+> cc1: all warnings being treated as errors
+> make[1]: *** [Makefile:19: cases/3.p] Error 1
+> make[1]: Leaving directory '/alt/public_software/libaio/harness'
+> make: *** [Makefile:23: partcheck] Error 2
+
+The fix is to remove this one test case, since the compiler now
+ensures the running code will never see this case.
+
+Signed-off-by: Lee Duncan <leeman.duncan@gmail.com>
+---
+ harness/cases/3.t | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff -Nurp a/harness/cases/3.t b/harness/cases/3.t
+--- a/harness/cases/3.t	2018-10-22 20:59:34.000000000 +0100
++++ b/harness/cases/3.t	2022-02-26 09:46:51.969845084 +0000
+@@ -15,7 +15,6 @@ int test_main(void)
+ 	status |= attempt_io_submit(BAD_CTX, 1,   good_ios, -EINVAL);
+ 	status |= attempt_io_submit( io_ctx, 0,   good_ios,       0);
+ 	status |= attempt_io_submit( io_ctx, 1,       NULL, -EFAULT);
+-	status |= attempt_io_submit( io_ctx, 1, (void *)-1, -EFAULT);
+ 	status |= attempt_io_submit( io_ctx, 2,   bad1_ios, -EFAULT);
+ 	status |= attempt_io_submit( io_ctx, 2,   bad2_ios, -EFAULT);
+ 	status |= attempt_io_submit( io_ctx, -1,  good_ios, -EINVAL);
diff --git a/main/libao/APKBUILD b/main/libao/APKBUILD
deleted file mode 100644
index b67860178cf..00000000000
--- a/main/libao/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libao
-pkgver=1.2.2
-pkgrel=0
-pkgdesc="Cross-platform audio output library and plugins"
-url="http://www.xiph.org/ao"
-arch="all"
-options="!check"  # No test suite.
-license="GPL-2.0-or-later"
-subpackages="$pkgname-doc $pkgname-dev"
-makedepends="alsa-lib-dev automake autoconf libtool"
-source="$pkgname-$pkgver.tar.gz::https://github.com/xiph/libao/archive/${pkgver}.tar.gz
-	CVE-2017-11548.patch
-	"
-
-# secfixes:
-#   1.2.0-r3:
-#   - CVE-2017-11548
-
-build() {
-	cd "$builddir"
-	autoreconf -fi
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--disable-esd \
-		--disable-arts \
-		--enable-alsa-mmap
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a  libao-1.2.2.tar.gz
-2108047bf0b17b1a516c6acaa7d373f46f0c8efe8d355c5353abf73ead987b5a3b97a102ebd596113ca8670d303c13922e5cca764c0604971a1ccac4cba770be  CVE-2017-11548.patch"
diff --git a/main/libao/CVE-2017-11548.patch b/main/libao/CVE-2017-11548.patch
deleted file mode 100644
index 6f2aa7a143f..00000000000
--- a/main/libao/CVE-2017-11548.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-diff --git a/src/audio_out.c b/src/audio_out.c
-index bd8f6fc..f5942d6 100644
---- a/src/audio_out.c
-+++ b/src/audio_out.c
-@@ -634,6 +634,10 @@ static char *_sanitize_matrix(int maxchannels, char *matrix, ao_device *device){
-     char *ret = calloc(strlen(matrix)+1,1); /* can only get smaller */
-     char *p=matrix;
-     int count=0;
-+
-+    if(!ret)
-+      return NULL;
-+
-     while(count<maxchannels){
-       char *h,*t;
-       int m=0;
-@@ -706,6 +710,15 @@ static int _find_channel(int needle, char *haystack){
-   return -1;
- }
- 
-+static void _free_map(char **m){
-+  char **in=m;
-+  while(m && *m){
-+    free(*m);
-+    m++;
-+  }
-+  if(in)free(in);
-+}
-+
- static char **_tokenize_matrix(char *matrix){
-   char **ret=NULL;
-   char *p=matrix;
-@@ -730,6 +743,8 @@ static char **_tokenize_matrix(char *matrix){
-   }
- 
-   ret = calloc(count+1,sizeof(*ret));
-+  if(!ret)
-+    return NULL;
- 
-   p=matrix;
-   count=0;
-@@ -748,6 +763,10 @@ static char **_tokenize_matrix(char *matrix){
-     while(t>p && isspace(*(t-1)))t--;
- 
-     ret[count] = calloc(t-p+1,1);
-+    if(!ret[count]){
-+      _free_map(ret);
-+      return NULL;
-+    }
-     memcpy(ret[count],p,t-p);
-     count++;
-     if(!*h)break;
-@@ -755,16 +774,6 @@ static char **_tokenize_matrix(char *matrix){
-   }
- 
-   return ret;
--
--}
--
--static void _free_map(char **m){
--  char **in=m;
--  while(m && *m){
--    free(*m);
--    m++;
--  }
--  if(in)free(in);
- }
- 
- static unsigned int _matrix_to_channelmask(int ch, char *matrix, char *premap, int **mout){
-@@ -772,7 +781,14 @@ static unsigned int _matrix_to_channelmask(int ch, char *matrix, char *premap, i
-   char *p=matrix;
-   int *perm=(*mout=malloc(ch*sizeof(*mout)));
-   int i;
--  char **map = _tokenize_matrix(premap);
-+  char **map;
-+
-+  if(!perm)
-+    return 0;
-+
-+  map = _tokenize_matrix(premap);
-+  if(!map)
-+    return 0;
- 
-   for(i=0;i<ch;i++) perm[i] = -1;
-   i=0;
-@@ -810,6 +826,9 @@ static char *_channelmask_to_matrix(unsigned int mask, char *premap){
-   char buffer[257]={0};
-   char **map = _tokenize_matrix(premap);
- 
-+  if(!map)
-+    return NULL;
-+
-   while(map[m]){
-     if(mask & (1<<m)){
-       if(count)
-@@ -849,6 +868,9 @@ static char *_matrix_intersect(char *matrix,char *premap){
-   int count=0;
-   char **map = _tokenize_matrix(premap);
- 
-+  if(!map)
-+    return NULL;
-+
-   while(1){
-     char *h=p;
-     int m=0;
-@@ -1039,7 +1061,7 @@ static ao_device* _open_device(int driver_id, ao_sample_format *format,
-                                                          device->output_matrix,
-                                                          &device->input_map);
-               int channels = _channelmask_bits(mask);
--              if(channels<0){
-+              if(channels<=0){
-                 aerror("Unable to map any channels from input matrix to output");
-                 errno = AO_EBADFORMAT;
-                 goto error;
-@@ -1060,7 +1082,7 @@ static ao_device* _open_device(int driver_id, ao_sample_format *format,
-                                                          device->output_matrix,
-                                                          &device->input_map);
-               int channels = _channelmask_bits(mask);
--              if(channels<0){
-+              if(channels<=0){
-                 aerror("Unable to map any channels from input matrix to output");
-                 errno = AO_EBADFORMAT;
-                 goto error;
-@@ -1111,6 +1133,10 @@ static ao_device* _open_device(int driver_id, ao_sample_format *format,
-             int count=0;
-             device->inter_permute = calloc(device->output_channels,sizeof(int));
- 
-+            if (!device->inter_permute) {
-+              errno = AO_EFAIL;
-+              goto error;
-+            }
-             adebug("\n");
- 
-             while(count<device->output_channels){
-@@ -1157,8 +1183,10 @@ static ao_device* _open_device(int driver_id, ao_sample_format *format,
-                 for(i=0;i<device->output_channels;i++)
-                   if(device->inter_permute[i]==j)break;
-                 if(i==device->output_channels){
--                  adebug("input %d (%s)\t -> none\n",
--                         j,inch[j]);
-+                  if(inch){
-+                    adebug("input %d (%s)\t -> none\n",
-+                           j,inch[j]);
-+                  }
-                   unflag=1;
-                 }
-               }
-diff --git a/src/plugins/macosx/ao_macosx.c b/src/plugins/macosx/ao_macosx.c
-index a3daf1b..129020d 100644
---- a/src/plugins/macosx/ao_macosx.c
-+++ b/src/plugins/macosx/ao_macosx.c
-@@ -594,11 +594,11 @@ int ao_plugin_open(ao_device *device, ao_sample_format *format)
-   internal->firstValidByteOffset = 0;
-   internal->validByteCount = 0;
-   internal->buffer = malloc(internal->bufferByteCount);
--  memset(internal->buffer, 0, internal->bufferByteCount);
-   if (!internal->buffer) {
-     aerror("Unable to allocate queue buffer.\n");
-     return 0;
-   }
-+  memset(internal->buffer, 0, internal->bufferByteCount);
- 
-   /* limited to stereo for now */
-   //if(!device->output_matrix)
-diff --git a/src/plugins/sndio/ao_sndio.c b/src/plugins/sndio/ao_sndio.c
-index ec251fb..e23fd47 100644
---- a/src/plugins/sndio/ao_sndio.c
-+++ b/src/plugins/sndio/ao_sndio.c
-@@ -67,6 +67,9 @@ int ao_plugin_device_init(ao_device *device)
- {
-   ao_sndio_internal *internal;
-   internal = (ao_sndio_internal *) calloc(1,sizeof(*internal));
-+  if (internal == NULL)
-+    return 0;
-+
-   internal->id=-1;
-   device->internal = internal;
-   device->output_matrix_order = AO_OUTPUT_MATRIX_FIXED;
diff --git a/main/libarchive/APKBUILD b/main/libarchive/APKBUILD
index 78f094903f1..184bb58b397 100644
--- a/main/libarchive/APKBUILD
+++ b/main/libarchive/APKBUILD
@@ -1,18 +1,35 @@
 # Contributor: Sergei Lukin <sergej.lukin@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libarchive
-pkgver=3.4.2
+pkgver=3.7.3
 pkgrel=0
 pkgdesc="library that can create and read several streaming archive formats"
 url="https://libarchive.org/"
 arch="all"
 license="BSD-2-Clause AND BSD-3-Clause AND Public-Domain"
-makedepends="zlib-dev bzip2-dev xz-dev lz4-dev acl-dev openssl-dev expat-dev
-	attr-dev zstd-dev"
+makedepends="
+	acl-dev
+	attr-dev
+	bsd-compat-headers
+	bzip2-dev
+	expat-dev
+	lz4-dev
+	openssl-dev
+	xz-dev
+	zlib-dev
+	zstd-dev
+	"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-tools"
-source="https://github.com/libarchive/libarchive/releases/download/v$pkgver/libarchive-$pkgver.tar.gz"
+source="https://libarchive.org/downloads/libarchive-$pkgver.tar.xz"
+options="!check"
 
 # secfixes:
+#   3.6.1-r2:
+#     - CVE-2022-36227
+#   3.6.1-r0:
+#     - CVE-2022-26280
+#   3.6.0-r0:
+#     - CVE-2021-36976
 #   3.4.2-r0:
 #     - CVE-2020-19221
 #     - CVE-2020-9308
@@ -22,6 +39,7 @@ source="https://github.com/libarchive/libarchive/releases/download/v$pkgver/liba
 #     - CVE-2017-14166
 
 build() {
+	CFLAGS="$CFLAGS -ffat-lto-objects -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -37,8 +55,9 @@ package() {
 tools() {
 	pkgdesc="libarchive tools bsdtar and bsdcpio"
 
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+	amove usr/bin
 }
 
-sha512sums="a8922e54f2e985889d205ee8a0594c1d30dad950438b602a5be6bb1b274a735ad20a48ed484efd458013a0810d26ee4ae76e3a6c820823243d24ea0593ed7021  libarchive-3.4.2.tar.gz"
+sha512sums="
+984e7c61010b9555bafe54d5f52ff2d089e28afe5cea3a14615e2aca8539075293789d18f17f8915882ec328bcbdca7b3d1536d6dc19620ca226e8b6d802ef63  libarchive-3.7.3.tar.xz
+"
diff --git a/main/libart-lgpl/APKBUILD b/main/libart-lgpl/APKBUILD
index ff7603ac6fe..53a1371c723 100644
--- a/main/libart-lgpl/APKBUILD
+++ b/main/libart-lgpl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libart-lgpl
 pkgver=2.3.21
-pkgrel=6
+pkgrel=8
 pkgdesc="A library for high-performance 2D graphics"
 url="https://www.levien.com/libart/"
 arch="all"
diff --git a/main/libasr/0002-Replace-missing-res_randomid-with-the-more-secure-ar.patch b/main/libasr/0002-Replace-missing-res_randomid-with-the-more-secure-ar.patch
deleted file mode 100644
index a843125a5a1..00000000000
--- a/main/libasr/0002-Replace-missing-res_randomid-with-the-more-secure-ar.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From fb2c3b37d1022d84506ca0815c7c888c4f08e90c Mon Sep 17 00:00:00 2001
-From: xentec <xentec@aix0.eu>
-Date: Sat, 11 Feb 2017 14:39:24 +0000
-Subject: [PATCH 2/3] Replace missing res_randomid() with the more secure
- arc4random()
-
----
- configure.ac                    | 2 ++
- openbsd-compat/openbsd-compat.h | 2 ++
- src/res_mkquery.c               | 2 +-
- src/res_send_async.c            | 2 +-
- 4 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 10aff04..fa0e896 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -87,6 +87,8 @@
- # libasr specific checks.
- #
- 
-+LIBS="-lcrypto -lbsd $LIBS"
-+
- # This ought to be part of the generic compat library, but we don't want to force
- # linking against other libs (-lresolv for instance) in all cases.
- # It has to be improved at some point.
-diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
-index c30591c..9be2e0b 100644
---- a/openbsd-compat/includes/compat-stdlib.h
-+++ b/openbsd-compat/includes/compat-stdlib.h
-@@ -30,3 +30,5 @@
- long long strtonum(const char *nptr, long long minval, long long maxval,
-     const char **errstr);
- #endif
-+
-+unsigned int arc4random(void);
-diff --git a/src/res_mkquery.c b/src/res_mkquery.c
-index 27ed21e..cce4029 100644
---- a/src/res_mkquery.c
-+++ b/src/res_mkquery.c
-@@ -57,7 +57,7 @@ res_mkquery(int op, const char *dname, int class, int type,
- 	ac = asr_use_resolver(NULL);
- 
- 	memset(&h, 0, sizeof h);
--	h.id = res_randomid();
-+	h.id = arc4random();
- 	if (ac->ac_options & RES_RECURSE)
- 		h.flags |= RD_MASK;
- 	h.qdcount = 1;
-diff --git a/src/res_send_async.c b/src/res_send_async.c
-index a60aa0d..a0f4704 100644
---- a/src/res_send_async.c
-+++ b/src/res_send_async.c
-@@ -380,7 +380,7 @@ setup_query(struct asr_query *as, const char *name, const char *dom,
- 	as->as.dns.obuflen = 0;
- 
- 	memset(&h, 0, sizeof h);
--	h.id = res_randomid();
-+	h.id = arc4random();
- 	if (as->as_ctx->ac_options & RES_RECURSE)
- 		h.flags |= RD_MASK;
- 	h.qdcount = 1;
--- 
-2.11.1
diff --git a/main/libasr/APKBUILD b/main/libasr/APKBUILD
deleted file mode 100644
index 2bcda5c8581..00000000000
--- a/main/libasr/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname=libasr
-pkgver=1.0.4
-pkgrel=0
-pkgdesc="libasr is a free, simple and portable asynchronous resolver library"
-url="https://www.opensmtpd.org"
-arch="all"
-license="ISC"
-makedepends="mdocml bison openssl-dev automake autoconf libtool libbsd-dev"
-subpackages="$pkgname-dbg $pkgname-static $pkgname-dev"
-source="https://github.com/OpenSMTPD/libasr/archive/$pkgver/libasr-$pkgver.tar.gz
-	0002-Replace-missing-res_randomid-with-the-more-secure-ar.patch
-	"
-
-prepare() {
-	default_prepare
-	./bootstrap
-}
-
-check() {
-	gcc -L src/.libs -I src tests/asr_simple.c -lasr -o tests/asr_simple
-	LD_LIBRARY_PATH=src/.libs ./tests/asr_simple
-}
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--mandir=/usr/share/man
-	make
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="93ff4643c46cccb36e4981336dde198975499c1e48df6ed0fa8e57628ea05a8dc1d5159fe9d0ee99ff2e7ab418aa346668749aca8be2f3346f07d884e4818368  libasr-1.0.4.tar.gz
-693c2bfce2ca9397909a281b3d634b37608ff6286a4e9b3c1d638a337c585d307db4a325fb8b607ef45399c1ee05063eda5eb46060d804e5b4ad51ca6890846d  0002-Replace-missing-res_randomid-with-the-more-secure-ar.patch"
diff --git a/main/libassuan/APKBUILD b/main/libassuan/APKBUILD
index 3955cc1b4c8..d7ac94c9a05 100644
--- a/main/libassuan/APKBUILD
+++ b/main/libassuan/APKBUILD
@@ -1,33 +1,32 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libassuan
-pkgver=2.5.3
+pkgver=2.5.7
 pkgrel=0
-pkgdesc="A IPC library used by some GnuPG related software"
+pkgdesc="IPC library used by some GnuPG related software"
 url="https://www.gnupg.org/software/libassuan/index.html"
 arch="all"
 license="LGPL-2.1-or-later"
 makedepends="libgpg-error-dev"
-subpackages="${pkgname}-dev ${pkgname}-doc"
-source="https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-builddir="${srcdir}/${pkgname}-${pkgver}"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
+source="https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/usr \
+		--enable-static
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617  libassuan-2.5.3.tar.bz2"
+sha512sums="
+ca33bd0325bbebccb63b6a84cc0aa5c85b25c6275a68df83aeb3f3729b2cd38220198a941c3479bd461f16b7ddb6b558c0664697ca3153c7fb430544303d773f  libassuan-2.5.7.tar.bz2
+"
diff --git a/main/libatomic_ops/APKBUILD b/main/libatomic_ops/APKBUILD
deleted file mode 100644
index 251112b718c..00000000000
--- a/main/libatomic_ops/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: TBK <alpine@jjtc.eu>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
-pkgname=libatomic_ops
-pkgver=7.6.10
-pkgrel=2
-pkgdesc="Semi-portable access to hardware provided atomic memory operations"
-arch="all"
-url="https://github.com/ivmai/libatomic_ops"
-license="GPL-2.0-or-later AND MIT"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="https://github.com/ivmai/libatomic_ops/releases/download/v$pkgver/libatomic_ops-$pkgver.tar.gz"
-
-case "$CARCH" in
-	s390x) options="!check" ;; # FIXME https://github.com/ivmai/libatomic_ops/issues/44
-esac
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--enable-shared
-	make
-}
-
-check() {
-	make check
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-}
-
-static() {
-	depends=""
-	pkgdesc="$pkgdesc (static library)"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
-}
-
-sha512sums="4661445503ef4303e873559af319ad799a7eddad3df45ad602cf338c594a642ad4333a36fa91722f0d8c48acd38bbf45c60a468c7375d14824520a83c1109ec9  libatomic_ops-7.6.10.tar.gz"
diff --git a/main/libavc1394/APKBUILD b/main/libavc1394/APKBUILD
deleted file mode 100644
index e70c8217fa2..00000000000
--- a/main/libavc1394/APKBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libavc1394
-pkgver=0.5.4
-pkgrel=2
-pkgdesc="Audio/Video Control library for IEEE-1394 devices"
-url="https://sourceforge.net/projects/libavc1394/"
-arch="all"
-license="GPL-2.0-or-later LGPL-2.0-or-later"
-depends=
-makedepends="libraw1394-dev libtool automake autoconf"
-[ "$ALPINE_LIBC" != "eglibc" ] && makedepends="$makedepends argp-standalone"
-install=""
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://downloads.sourceforge.net/libavc1394/libavc1394-$pkgver.tar.gz
-	automake.patch
-	argp.patch"
-
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-	libtoolize && aclocal && autoconf && automake --add-missing
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="ef07631cd2de9b79dec9d81247d705be318101e8f8a1fe007b946ffab3dfe7b97f392144614d867ef6b2315b6c0e82d53e915f07855d4e21401645293e18842a  libavc1394-0.5.4.tar.gz
-8854bed6b9efa4b2bb56762614bcbceadb5cb1cdd393fd676476d40672cc3965962da764543f8628f51567a32ecf5035edb35b883b8963f94bce034ff4793c11  automake.patch
-77bf60530b6b81f6bd3c69a11de7ac015f1182fcd8c2586d0fd9605818c3ccde310c386f30c00166853a405f60c13bf6b2d304327ec181de28609c58b215ab31  argp.patch"
diff --git a/main/libavc1394/argp.patch b/main/libavc1394/argp.patch
deleted file mode 100644
index 9c86a625e5e..00000000000
--- a/main/libavc1394/argp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.in.orig
-+++ ./configure.in
-@@ -11,6 +11,8 @@
- 
- AC_HEADER_STDC
- AC_CHECK_HEADERS(sys/time.h sys/types.h unistd.h string.h netinet/in.h stdio.h)
-+AC_SEARCH_LIBS([argp_usage], [argp], [],
-+	[AC_MSG_ERROR([argp not found. Consider installing argp-standalone])])
- PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 1.0.0)
- 
- #set the libtool shared library version numbers
diff --git a/main/libavc1394/automake.patch b/main/libavc1394/automake.patch
deleted file mode 100644
index 9bb6280ae59..00000000000
--- a/main/libavc1394/automake.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./configure.in.orig	2012-12-31 19:52:37.126761564 +0000
-+++ ./configure.in	2012-12-31 19:52:55.096923632 +0000
-@@ -1,6 +1,6 @@
- AC_INIT(Makefile.am)
- AM_INIT_AUTOMAKE(libavc1394, 0.5.4)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
- AM_MAINTAINER_MODE
- 
- AC_PROG_CC
diff --git a/main/libavif/APKBUILD b/main/libavif/APKBUILD
new file mode 100644
index 00000000000..e8054123a69
--- /dev/null
+++ b/main/libavif/APKBUILD
@@ -0,0 +1,66 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=libavif
+pkgver=1.0.4
+pkgrel=0
+pkgdesc="Library for encoding and decoding .avif files"
+url="https://aomediacodec.github.io/av1-avif/"
+arch="all"
+license="BSD-2-Clause"
+makedepends="
+	aom-dev
+	cmake
+	dav1d-dev
+	gdk-pixbuf-dev
+	gtest-dev
+	libjpeg-turbo-dev
+	libpng-dev
+	samurai
+	zlib-dev
+	"
+subpackages="$pkgname-dev $pkgname-apps $pkgname-pixbuf-loader"
+source="https://github.com/AOMediaCodec/libavif/archive/v$pkgver/libavif-v$pkgver.tar.gz"
+
+build() {
+	CFLAGS="$CFLAGS -flto=auto" \
+	CXXFLAGS="$CXXFLAGS -flto=auto" \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DAVIF_BUILD_APPS=ON \
+		-DAVIF_BUILD_GDK_PIXBUF=ON \
+		-DAVIF_BUILD_TESTS=ON \
+		-DAVIF_CODEC_AOM=ON \
+		-DAVIF_CODEC_DAV1D=ON
+	cmake --build build
+}
+
+check() {
+	# cmake --build build --target avif_test_all
+
+	# https://github.com/AOMediaCodec/libavif/issues/800
+	cd "$builddir"/build
+	./tests/aviftest ../tests/data --io-only
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+apps() {
+	amove usr/bin
+}
+
+loader() {
+	pkgdesc="$pkgdesc (pixbuf loader)"
+	install_if="$pkgname=$pkgver-r$pkgrel gdk-pixbuf-loaders"
+
+	amove \
+		usr/lib/gdk-pixbuf-* \
+		usr/share/thumbnailers
+}
+
+sha512sums="
+37f0de757180c6414778e688006940395960b316c25192d6beb97a07942aff4bd3b712dec2eff52cd26f5d72c352731442175dfeb90e2e1381133539760142b0  libavif-v1.0.4.tar.gz
+"
diff --git a/main/libbpf/10-consolidate-lib-dirs.patch b/main/libbpf/10-consolidate-lib-dirs.patch
new file mode 100644
index 00000000000..34083371306
--- /dev/null
+++ b/main/libbpf/10-consolidate-lib-dirs.patch
@@ -0,0 +1,18 @@
+Alpine doesn't recognize lib64 directories by default, so we consolidate into lib.
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -77,12 +77,7 @@
+ 
+ DESTDIR ?=
+ 
+-HOSTARCH = $(firstword $(subst -, ,$(shell $(CC) -dumpmachine)))
+-ifeq ($(filter-out %64 %64be %64eb %64le %64el s390x, $(HOSTARCH)),)
+-	LIBSUBDIR := lib64
+-else
+-	LIBSUBDIR := lib
+-endif
++LIBSUBDIR := lib
+ 
+ # By default let the pc file itself use ${prefix} in includedir/libdir so that
+ # the prefix can be overridden at runtime (eg: --define-prefix)
diff --git a/main/libbpf/APKBUILD b/main/libbpf/APKBUILD
new file mode 100644
index 00000000000..cc5df6998a7
--- /dev/null
+++ b/main/libbpf/APKBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Adam Jensen <acjensen@gmail.com>
+pkgname=libbpf
+pkgver=1.4.0
+pkgrel=0
+pkgdesc="A library for interacting with the Linux kernel's Berkeley Packet Filter (BPF) facility from user space"
+url="https://github.com/libbpf/libbpf"
+arch="all"
+license="LGPL-2.1-only OR BSD-2-Clause"
+makedepends="
+	elfutils-dev
+	linux-headers
+	zlib-dev
+	"
+subpackages="$pkgname-dev"
+source="https://github.com/libbpf/libbpf/archive/v$pkgver/libbpf-$pkgver.tar.gz
+	10-consolidate-lib-dirs.patch
+	"
+
+build() {
+	make -C src
+}
+
+check() {
+	echo "#include \"$builddir/src/btf.h\"" | gcc -xc -c -o /dev/null -
+}
+
+package() {
+	make -C src install DESTDIR="$pkgdir"
+
+	# Install somewhere out of the way that will hopefully not be included by mistake.
+	cd include/uapi/linux
+	install -D -m644 -t "$pkgdir"/usr/include/bpf/uapi/linux/ \
+		bpf.h \
+		bpf_common.h \
+		btf.h
+}
+
+sha512sums="
+400c91a4870be8bb115f7abcc12c460700980fb6a3afdf43c885b1cdbe28fed1d37142d3987a85e12b4c565787a48f5cd0b07cafff067d91902d70713528929f  libbpf-1.4.0.tar.gz
+a374386f8b361b60c70d566aebb11b87a23bc43d8cfa02cce9997961139f89caf691d826020c4b08159e815c14d87cc907f2cc6e784329d0288d18d2b609fefd  10-consolidate-lib-dirs.patch
+"
diff --git a/main/libbsd/APKBUILD b/main/libbsd/APKBUILD
index 32780b489be..b686090559b 100644
--- a/main/libbsd/APKBUILD
+++ b/main/libbsd/APKBUILD
@@ -1,30 +1,30 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: Drew DeVault <sir@cmpwn.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libbsd
-pkgver=0.10.0
+pkgver=0.12.2
 pkgrel=0
 pkgdesc="commonly-used BSD functions not implemented by all libcs"
 url="https://libbsd.freedesktop.org/"
 arch="all"
-license="BSD"
-depends="musl>=1.1.16-r22"
-depends_dev="bsd-compat-headers linux-headers"
+license="BSD-3-Clause"
+depends="musl"
+depends_dev="bsd-compat-headers linux-headers libmd-dev libbsd=$pkgver-r$pkgrel" # libbsd.so is a GNU ld script and not symlink
 makedepends_build="autoconf automake libtool"
 makedepends_host="$depends_dev"
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz
-	disable-fpurge-test.patch"
-builddir="$srcdir/$pkgname-$pkgver"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
+source="https://libbsd.freedesktop.org/releases/libbsd-$pkgver.tar.xz"
+
+# secfixes:
+#   0.10.0-r0:
+#     - CVE-2019-20367
 
 prepare() {
 	default_prepare
 
-	cd "$builddir"
-	autoreconf -fi
+	./autogen
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -37,13 +37,18 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	make DESTDIR="$pkgdir" -C "$builddir" install
+	make DESTDIR="$pkgdir" install
+}
+
+dev() {
+	default_dev
+	amove usr/lib/libbsd.so
 }
 
-sha512sums="b75529785b16c93d31401187f8a58258fbebe565dac071c8311775c913af989f62cd29d5ce2651af3ea6221cffd31cf04826577d3e546ab9ca14340f297777b9  libbsd-0.10.0.tar.xz
-34ab57a9b67c0d6035312dff78e6dd0d1c48442c6a1b6e769b6ebb6dccb0dac80ccc2c309724e39c097cdac944bdbd9522582f93f2567da8c6615990e2d0238b  disable-fpurge-test.patch"
+sha512sums="
+ce43e4f0486d5f00d4a8119ee863eaaa2f968cae4aa3d622976bb31ad601dfc565afacef7ebade5eba33fff1c329b5296c6387c008d1e1805d878431038f8b21  libbsd-0.12.2.tar.xz
+"
diff --git a/main/libbsd/disable-fpurge-test.patch b/main/libbsd/disable-fpurge-test.patch
deleted file mode 100644
index 2a1950b123c..00000000000
--- a/main/libbsd/disable-fpurge-test.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libbsd-0.8.3/test/Makefile.am.old	2017-08-17 02:42:30.045825258 +0000
-+++ libbsd-0.8.3/test/Makefile.am	2017-08-17 03:49:17.928202106 +0000
-@@ -37,7 +37,6 @@
- 	humanize \
- 	fgetln \
- 	fparseln \
--	fpurge \
- 	md5 \
- 	proctitle-init \
- 	strmode \
diff --git a/main/libburn/APKBUILD b/main/libburn/APKBUILD
index e91f5ca3e7f..cedada57c70 100644
--- a/main/libburn/APKBUILD
+++ b/main/libburn/APKBUILD
@@ -1,21 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libburn
-pkgver=1.5.2
+pkgver=1.5.6
 _ver=${pkgver%_p*}
 if [ "$_ver" != "$pkgver" ]; then
 	_pver=".pl${pkgver##*_p}"
 fi
 pkgrel=0
 pkgdesc="Library for reading, mastering and writing optical discs"
-url="http://libburnia-project.org/"
+url="https://dev.lovelyhq.com/libburnia/web/wiki"
 arch="all"
 license="GPL-2.0-or-later"
 makedepends="linux-headers"
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://files.libburnia-project.org/releases/libburn-${_ver}$_pver.tar.gz"
+source="https://files.libburnia-project.org/releases/libburn-${_ver}$_pver.tar.gz"
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +30,12 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a8887907bbfcd9b743dfc2e8924cc9290d7af5a71651aeabfdc5874f2df076278ccdbc94f81efd6a720972f380512d330576739837ba685055ee717dd74797d3  libburn-1.5.2.tar.gz"
+sha512sums="
+549cb25310aac5ce445639374d84f0c09fb1fdd70be97479588775e5afcc12dd0655c5bf51bd3f1bf8c06a66b318fd1e709dcfd72845e795ffaf353ea621accd  libburn-1.5.6.tar.gz
+"
diff --git a/main/libc-dev/APKBUILD b/main/libc-dev/APKBUILD
deleted file mode 100644
index 6f79ce9c15e..00000000000
--- a/main/libc-dev/APKBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libc-dev
-pkgver=0.7.2
-pkgrel=3
-pkgdesc="Meta package to pull in correct libc"
-url="https://alpinelinux.org"
-arch="noarch"
-license="BSD-2-Clause AND BSD-3-Clause"
-options="!check" # No test suite
-makedepends_build=" "
-makedepends_host=" "
-makedepends="$makedepends_build $makedepends_host"
-depends="$CLIBC-dev"
-subpackages="libc-utils:utils bsd-compat-headers:bsdcompat"
-source="sys-cdefs.h
-	sys-queue.h
-	sys-tree.h
-	sgidefs.h
-	"
-
-prepare() {
-	mkdir -p "$builddir"
-}
-
-package() {
-	mkdir -p "$pkgdir"
-
-	case "$CTARGET" in
-	mips*)
-		install -D "$srcdir"/sgidefs.h "$pkgdir"/usr/include/sgidefs.h
-		;;
-	esac
-}
-
-utils() {
-	depends="$CLIBC-utils"
-
-	mkdir -p "$subpkgdir"
-}
-
-bsdcompat() {
-	pkgdesc="BSD compatibility headers (cdefs, queue, tree)"
-	depends=""
-
-	mkdir -p "$subpkgdir"
-	case "$CLIBC" in
-	musl)
-		install -D "$srcdir"/sys-cdefs.h "$subpkgdir"/usr/include/sys/cdefs.h
-		install -D "$srcdir"/sys-queue.h "$subpkgdir"/usr/include/sys/queue.h
-		install -D "$srcdir"/sys-tree.h "$subpkgdir"/usr/include/sys/tree.h
-		;;
-	esac
-}
-
-sha512sums="8c3fddd73b696a38e633953715c79c47703739be27ee085fc6c960a57b6746ca05bf6406f7e6126cc1a13204254fd5830afb566624e1f298f4d6b58216013c28  sys-cdefs.h
-2f0d5e6e4dc3350285cf17009265dddcbe12431c111868eea39bc8cb038ab7c1f2acacbb21735c4e9d4a1fd106a8fc0f8611ea33987d4faba37dde5ce6da0750  sys-queue.h
-07cb70f2f0ddb31e23dd913c6f561fc9885667c5803fdf3a559676c99d08834b4104589bacb5d17b4a0b379c68c81a1cf3173832b3da33a7b936fa7b93706844  sys-tree.h
-7f8fc4b50aa88106adfba4971b2e441d6f480efef45ba8dce3b6c1235b1835a31883718e3d1f0606ad7366b965e52e00faf91c322e53f3af35da630126f26de4  sgidefs.h"
diff --git a/main/libc-dev/sgidefs.h b/main/libc-dev/sgidefs.h
deleted file mode 100644
index 22c110c928c..00000000000
--- a/main/libc-dev/sgidefs.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <asm/sgidefs.h>
-
-#ifndef _ABIO32
-# define _ABIO32	_MIPS_SIM_ABI32
-#endif
-
-#ifndef _ABIN32
-# define _ABIN32	_MIPS_SIM_NABI32
-#endif
-
-#ifndef _ABI64
-# define _ABI64		_MIPS_SIM_ABI64
-#endif
diff --git a/main/libc-dev/sys-cdefs.h b/main/libc-dev/sys-cdefs.h
deleted file mode 100644
index 209a623c0f0..00000000000
--- a/main/libc-dev/sys-cdefs.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#warning usage of non-standard #include <sys/cdefs.h> is deprecated
-
-#undef __P
-#undef __PMT
-
-#define __P(args)	args
-#define __PMT(args)	args
-
-#define __CONCAT(x,y)	x ## y
-#define __STRING(x)	#x
-
-#ifdef  __cplusplus
-# define __BEGIN_DECLS	extern "C" {
-# define __END_DECLS	}
-#else
-# define __BEGIN_DECLS
-# define __END_DECLS
-#endif
-
-#if defined(__GNUC__) && !defined(__cplusplus)
-# define __THROW	__attribute__ ((__nothrow__))
-# define __NTH(fct)	__attribute__ ((__nothrow__)) fct
-#else
-# define __THROW
-# define __NTH(fct)     fct
-#endif
diff --git a/main/libc-dev/sys-tree.h b/main/libc-dev/sys-tree.h
deleted file mode 100644
index eaea56aae39..00000000000
--- a/main/libc-dev/sys-tree.h
+++ /dev/null
@@ -1,761 +0,0 @@
-/*	$NetBSD: tree.h,v 1.20 2013/09/14 13:20:45 joerg Exp $	*/
-/*	$OpenBSD: tree.h,v 1.13 2011/07/09 00:19:45 pirofti Exp $	*/
-/*
- * Copyright 2002 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef	_SYS_TREE_H_
-#define	_SYS_TREE_H_
-
-/*
- * This file defines data structures for different types of trees:
- * splay trees and red-black trees.
- *
- * A splay tree is a self-organizing data structure.  Every operation
- * on the tree causes a splay to happen.  The splay moves the requested
- * node to the root of the tree and partly rebalances it.
- *
- * This has the benefit that request locality causes faster lookups as
- * the requested nodes move to the top of the tree.  On the other hand,
- * every lookup causes memory writes.
- *
- * The Balance Theorem bounds the total access time for m operations
- * and n inserts on an initially empty tree as O((m + n)lg n).  The
- * amortized cost for a sequence of m accesses to a splay tree is O(lg n);
- *
- * A red-black tree is a binary search tree with the node color as an
- * extra attribute.  It fulfills a set of conditions:
- *	- every search path from the root to a leaf consists of the
- *	  same number of black nodes,
- *	- each red node (except for the root) has a black parent,
- *	- each leaf node is black.
- *
- * Every operation on a red-black tree is bounded as O(lg n).
- * The maximum height of a red-black tree is 2lg (n+1).
- */
-
-#define SPLAY_HEAD(name, type)						\
-struct name {								\
-	struct type *sph_root; /* root of the tree */			\
-}
-
-#define SPLAY_INITIALIZER(root)						\
-	{ NULL }
-
-#define SPLAY_INIT(root) do {						\
-	(root)->sph_root = NULL;					\
-} while (/*CONSTCOND*/ 0)
-
-#define SPLAY_ENTRY(type)						\
-struct {								\
-	struct type *spe_left; /* left element */			\
-	struct type *spe_right; /* right element */			\
-}
-
-#define SPLAY_LEFT(elm, field)		(elm)->field.spe_left
-#define SPLAY_RIGHT(elm, field)		(elm)->field.spe_right
-#define SPLAY_ROOT(head)		(head)->sph_root
-#define SPLAY_EMPTY(head)		(SPLAY_ROOT(head) == NULL)
-
-/* SPLAY_ROTATE_{LEFT,RIGHT} expect that tmp hold SPLAY_{RIGHT,LEFT} */
-#define SPLAY_ROTATE_RIGHT(head, tmp, field) do {			\
-	SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(tmp, field);	\
-	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
-	(head)->sph_root = tmp;						\
-} while (/*CONSTCOND*/ 0)
-
-#define SPLAY_ROTATE_LEFT(head, tmp, field) do {			\
-	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field);	\
-	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
-	(head)->sph_root = tmp;						\
-} while (/*CONSTCOND*/ 0)
-
-#define SPLAY_LINKLEFT(head, tmp, field) do {				\
-	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
-	tmp = (head)->sph_root;						\
-	(head)->sph_root = SPLAY_LEFT((head)->sph_root, field);		\
-} while (/*CONSTCOND*/ 0)
-
-#define SPLAY_LINKRIGHT(head, tmp, field) do {				\
-	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
-	tmp = (head)->sph_root;						\
-	(head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);	\
-} while (/*CONSTCOND*/ 0)
-
-#define SPLAY_ASSEMBLE(head, node, left, right, field) do {		\
-	SPLAY_RIGHT(left, field) = SPLAY_LEFT((head)->sph_root, field);	\
-	SPLAY_LEFT(right, field) = SPLAY_RIGHT((head)->sph_root, field);\
-	SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(node, field);	\
-	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(node, field);	\
-} while (/*CONSTCOND*/ 0)
-
-/* Generates prototypes and inline functions */
-
-#define SPLAY_PROTOTYPE(name, type, field, cmp)				\
-void name##_SPLAY(struct name *, struct type *);			\
-void name##_SPLAY_MINMAX(struct name *, int);				\
-struct type *name##_SPLAY_INSERT(struct name *, struct type *);		\
-struct type *name##_SPLAY_REMOVE(struct name *, struct type *);		\
-									\
-/* Finds the node with the same key as elm */				\
-static __inline struct type *						\
-name##_SPLAY_FIND(struct name *head, struct type *elm)			\
-{									\
-	if (SPLAY_EMPTY(head))						\
-		return(NULL);						\
-	name##_SPLAY(head, elm);					\
-	if ((cmp)(elm, (head)->sph_root) == 0)				\
-		return (head->sph_root);				\
-	return (NULL);							\
-}									\
-									\
-static __inline __unused struct type *					\
-name##_SPLAY_NEXT(struct name *head, struct type *elm)			\
-{									\
-	name##_SPLAY(head, elm);					\
-	if (SPLAY_RIGHT(elm, field) != NULL) {				\
-		elm = SPLAY_RIGHT(elm, field);				\
-		while (SPLAY_LEFT(elm, field) != NULL) {		\
-			elm = SPLAY_LEFT(elm, field);			\
-		}							\
-	} else								\
-		elm = NULL;						\
-	return (elm);							\
-}									\
-									\
-static __unused __inline struct type *					\
-name##_SPLAY_MIN_MAX(struct name *head, int val)			\
-{									\
-	name##_SPLAY_MINMAX(head, val);					\
-        return (SPLAY_ROOT(head));					\
-}
-
-/* Main splay operation.
- * Moves node close to the key of elm to top
- */
-#define SPLAY_GENERATE(name, type, field, cmp)				\
-struct type *								\
-name##_SPLAY_INSERT(struct name *head, struct type *elm)		\
-{									\
-    if (SPLAY_EMPTY(head)) {						\
-	    SPLAY_LEFT(elm, field) = SPLAY_RIGHT(elm, field) = NULL;	\
-    } else {								\
-	    int __comp;							\
-	    name##_SPLAY(head, elm);					\
-	    __comp = (cmp)(elm, (head)->sph_root);			\
-	    if(__comp < 0) {						\
-		    SPLAY_LEFT(elm, field) = SPLAY_LEFT((head)->sph_root, field);\
-		    SPLAY_RIGHT(elm, field) = (head)->sph_root;		\
-		    SPLAY_LEFT((head)->sph_root, field) = NULL;		\
-	    } else if (__comp > 0) {					\
-		    SPLAY_RIGHT(elm, field) = SPLAY_RIGHT((head)->sph_root, field);\
-		    SPLAY_LEFT(elm, field) = (head)->sph_root;		\
-		    SPLAY_RIGHT((head)->sph_root, field) = NULL;	\
-	    } else							\
-		    return ((head)->sph_root);				\
-    }									\
-    (head)->sph_root = (elm);						\
-    return (NULL);							\
-}									\
-									\
-struct type *								\
-name##_SPLAY_REMOVE(struct name *head, struct type *elm)		\
-{									\
-	struct type *__tmp;						\
-	if (SPLAY_EMPTY(head))						\
-		return (NULL);						\
-	name##_SPLAY(head, elm);					\
-	if ((cmp)(elm, (head)->sph_root) == 0) {			\
-		if (SPLAY_LEFT((head)->sph_root, field) == NULL) {	\
-			(head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);\
-		} else {						\
-			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
-			(head)->sph_root = SPLAY_LEFT((head)->sph_root, field);\
-			name##_SPLAY(head, elm);			\
-			SPLAY_RIGHT((head)->sph_root, field) = __tmp;	\
-		}							\
-		return (elm);						\
-	}								\
-	return (NULL);							\
-}									\
-									\
-void									\
-name##_SPLAY(struct name *head, struct type *elm)			\
-{									\
-	struct type __node, *__left, *__right, *__tmp;			\
-	int __comp;							\
-\
-	SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\
-	__left = __right = &__node;					\
-\
-	while ((__comp = (cmp)(elm, (head)->sph_root)) != 0) {		\
-		if (__comp < 0) {					\
-			__tmp = SPLAY_LEFT((head)->sph_root, field);	\
-			if (__tmp == NULL)				\
-				break;					\
-			if ((cmp)(elm, __tmp) < 0){			\
-				SPLAY_ROTATE_RIGHT(head, __tmp, field);	\
-				if (SPLAY_LEFT((head)->sph_root, field) == NULL)\
-					break;				\
-			}						\
-			SPLAY_LINKLEFT(head, __right, field);		\
-		} else if (__comp > 0) {				\
-			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
-			if (__tmp == NULL)				\
-				break;					\
-			if ((cmp)(elm, __tmp) > 0){			\
-				SPLAY_ROTATE_LEFT(head, __tmp, field);	\
-				if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\
-					break;				\
-			}						\
-			SPLAY_LINKRIGHT(head, __left, field);		\
-		}							\
-	}								\
-	SPLAY_ASSEMBLE(head, &__node, __left, __right, field);		\
-}									\
-									\
-/* Splay with either the minimum or the maximum element			\
- * Used to find minimum or maximum element in tree.			\
- */									\
-void name##_SPLAY_MINMAX(struct name *head, int __comp) \
-{									\
-	struct type __node, *__left, *__right, *__tmp;			\
-\
-	SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\
-	__left = __right = &__node;					\
-\
-	while (1) {							\
-		if (__comp < 0) {					\
-			__tmp = SPLAY_LEFT((head)->sph_root, field);	\
-			if (__tmp == NULL)				\
-				break;					\
-			if (__comp < 0){				\
-				SPLAY_ROTATE_RIGHT(head, __tmp, field);	\
-				if (SPLAY_LEFT((head)->sph_root, field) == NULL)\
-					break;				\
-			}						\
-			SPLAY_LINKLEFT(head, __right, field);		\
-		} else if (__comp > 0) {				\
-			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
-			if (__tmp == NULL)				\
-				break;					\
-			if (__comp > 0) {				\
-				SPLAY_ROTATE_LEFT(head, __tmp, field);	\
-				if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\
-					break;				\
-			}						\
-			SPLAY_LINKRIGHT(head, __left, field);		\
-		}							\
-	}								\
-	SPLAY_ASSEMBLE(head, &__node, __left, __right, field);		\
-}
-
-#define SPLAY_NEGINF	-1
-#define SPLAY_INF	1
-
-#define SPLAY_INSERT(name, x, y)	name##_SPLAY_INSERT(x, y)
-#define SPLAY_REMOVE(name, x, y)	name##_SPLAY_REMOVE(x, y)
-#define SPLAY_FIND(name, x, y)		name##_SPLAY_FIND(x, y)
-#define SPLAY_NEXT(name, x, y)		name##_SPLAY_NEXT(x, y)
-#define SPLAY_MIN(name, x)		(SPLAY_EMPTY(x) ? NULL	\
-					: name##_SPLAY_MIN_MAX(x, SPLAY_NEGINF))
-#define SPLAY_MAX(name, x)		(SPLAY_EMPTY(x) ? NULL	\
-					: name##_SPLAY_MIN_MAX(x, SPLAY_INF))
-
-#define SPLAY_FOREACH(x, name, head)					\
-	for ((x) = SPLAY_MIN(name, head);				\
-	     (x) != NULL;						\
-	     (x) = SPLAY_NEXT(name, head, x))
-
-/* Macros that define a red-black tree */
-#define RB_HEAD(name, type)						\
-struct name {								\
-	struct type *rbh_root; /* root of the tree */			\
-}
-
-#define RB_INITIALIZER(root)						\
-	{ NULL }
-
-#define RB_INIT(root) do {						\
-	(root)->rbh_root = NULL;					\
-} while (/*CONSTCOND*/ 0)
-
-#define RB_BLACK	0
-#define RB_RED		1
-#define RB_ENTRY(type)							\
-struct {								\
-	struct type *rbe_left;		/* left element */		\
-	struct type *rbe_right;		/* right element */		\
-	struct type *rbe_parent;	/* parent element */		\
-	int rbe_color;			/* node color */		\
-}
-
-#define RB_LEFT(elm, field)		(elm)->field.rbe_left
-#define RB_RIGHT(elm, field)		(elm)->field.rbe_right
-#define RB_PARENT(elm, field)		(elm)->field.rbe_parent
-#define RB_COLOR(elm, field)		(elm)->field.rbe_color
-#define RB_ROOT(head)			(head)->rbh_root
-#define RB_EMPTY(head)			(RB_ROOT(head) == NULL)
-
-#define RB_SET(elm, parent, field) do {					\
-	RB_PARENT(elm, field) = parent;					\
-	RB_LEFT(elm, field) = RB_RIGHT(elm, field) = NULL;		\
-	RB_COLOR(elm, field) = RB_RED;					\
-} while (/*CONSTCOND*/ 0)
-
-#define RB_SET_BLACKRED(black, red, field) do {				\
-	RB_COLOR(black, field) = RB_BLACK;				\
-	RB_COLOR(red, field) = RB_RED;					\
-} while (/*CONSTCOND*/ 0)
-
-#ifndef RB_AUGMENT
-#define RB_AUGMENT(x)	do {} while (/*CONSTCOND*/ 0)
-#endif
-
-#define RB_ROTATE_LEFT(head, elm, tmp, field) do {			\
-	(tmp) = RB_RIGHT(elm, field);					\
-	if ((RB_RIGHT(elm, field) = RB_LEFT(tmp, field)) != NULL) {	\
-		RB_PARENT(RB_LEFT(tmp, field), field) = (elm);		\
-	}								\
-	RB_AUGMENT(elm);						\
-	if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field)) != NULL) {	\
-		if ((elm) == RB_LEFT(RB_PARENT(elm, field), field))	\
-			RB_LEFT(RB_PARENT(elm, field), field) = (tmp);	\
-		else							\
-			RB_RIGHT(RB_PARENT(elm, field), field) = (tmp);	\
-	} else								\
-		(head)->rbh_root = (tmp);				\
-	RB_LEFT(tmp, field) = (elm);					\
-	RB_PARENT(elm, field) = (tmp);					\
-	RB_AUGMENT(tmp);						\
-	if ((RB_PARENT(tmp, field)))					\
-		RB_AUGMENT(RB_PARENT(tmp, field));			\
-} while (/*CONSTCOND*/ 0)
-
-#define RB_ROTATE_RIGHT(head, elm, tmp, field) do {			\
-	(tmp) = RB_LEFT(elm, field);					\
-	if ((RB_LEFT(elm, field) = RB_RIGHT(tmp, field)) != NULL) {	\
-		RB_PARENT(RB_RIGHT(tmp, field), field) = (elm);		\
-	}								\
-	RB_AUGMENT(elm);						\
-	if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field)) != NULL) {	\
-		if ((elm) == RB_LEFT(RB_PARENT(elm, field), field))	\
-			RB_LEFT(RB_PARENT(elm, field), field) = (tmp);	\
-		else							\
-			RB_RIGHT(RB_PARENT(elm, field), field) = (tmp);	\
-	} else								\
-		(head)->rbh_root = (tmp);				\
-	RB_RIGHT(tmp, field) = (elm);					\
-	RB_PARENT(elm, field) = (tmp);					\
-	RB_AUGMENT(tmp);						\
-	if ((RB_PARENT(tmp, field)))					\
-		RB_AUGMENT(RB_PARENT(tmp, field));			\
-} while (/*CONSTCOND*/ 0)
-
-/* Generates prototypes and inline functions */
-#define RB_PROTOTYPE(name, type, field, cmp)				\
-	RB_PROTOTYPE_INTERNAL(name, type, field, cmp,)
-#define	RB_PROTOTYPE_STATIC(name, type, field, cmp)			\
-	RB_PROTOTYPE_INTERNAL(name, type, field, cmp, __unused static)
-#define RB_PROTOTYPE_INTERNAL(name, type, field, cmp, attr)		\
-attr void name##_RB_INSERT_COLOR(struct name *, struct type *);		\
-attr void name##_RB_REMOVE_COLOR(struct name *, struct type *, struct type *);\
-attr struct type *name##_RB_REMOVE(struct name *, struct type *);	\
-attr struct type *name##_RB_INSERT(struct name *, struct type *);	\
-attr struct type *name##_RB_FIND(struct name *, struct type *);		\
-attr struct type *name##_RB_NFIND(struct name *, struct type *);	\
-attr struct type *name##_RB_NEXT(struct type *);			\
-attr struct type *name##_RB_PREV(struct type *);			\
-attr struct type *name##_RB_MINMAX(struct name *, int);			\
-									\
-
-/* Main rb operation.
- * Moves node close to the key of elm to top
- */
-#define	RB_GENERATE(name, type, field, cmp)				\
-	RB_GENERATE_INTERNAL(name, type, field, cmp,)
-#define	RB_GENERATE_STATIC(name, type, field, cmp)			\
-	RB_GENERATE_INTERNAL(name, type, field, cmp, __unused static)
-#define RB_GENERATE_INTERNAL(name, type, field, cmp, attr)		\
-attr void								\
-name##_RB_INSERT_COLOR(struct name *head, struct type *elm)		\
-{									\
-	struct type *parent, *gparent, *tmp;				\
-	while ((parent = RB_PARENT(elm, field)) != NULL &&		\
-	    RB_COLOR(parent, field) == RB_RED) {			\
-		gparent = RB_PARENT(parent, field);			\
-		if (parent == RB_LEFT(gparent, field)) {		\
-			tmp = RB_RIGHT(gparent, field);			\
-			if (tmp && RB_COLOR(tmp, field) == RB_RED) {	\
-				RB_COLOR(tmp, field) = RB_BLACK;	\
-				RB_SET_BLACKRED(parent, gparent, field);\
-				elm = gparent;				\
-				continue;				\
-			}						\
-			if (RB_RIGHT(parent, field) == elm) {		\
-				RB_ROTATE_LEFT(head, parent, tmp, field);\
-				tmp = parent;				\
-				parent = elm;				\
-				elm = tmp;				\
-			}						\
-			RB_SET_BLACKRED(parent, gparent, field);	\
-			RB_ROTATE_RIGHT(head, gparent, tmp, field);	\
-		} else {						\
-			tmp = RB_LEFT(gparent, field);			\
-			if (tmp && RB_COLOR(tmp, field) == RB_RED) {	\
-				RB_COLOR(tmp, field) = RB_BLACK;	\
-				RB_SET_BLACKRED(parent, gparent, field);\
-				elm = gparent;				\
-				continue;				\
-			}						\
-			if (RB_LEFT(parent, field) == elm) {		\
-				RB_ROTATE_RIGHT(head, parent, tmp, field);\
-				tmp = parent;				\
-				parent = elm;				\
-				elm = tmp;				\
-			}						\
-			RB_SET_BLACKRED(parent, gparent, field);	\
-			RB_ROTATE_LEFT(head, gparent, tmp, field);	\
-		}							\
-	}								\
-	RB_COLOR(head->rbh_root, field) = RB_BLACK;			\
-}									\
-									\
-attr void								\
-name##_RB_REMOVE_COLOR(struct name *head, struct type *parent, struct type *elm) \
-{									\
-	struct type *tmp;						\
-	while ((elm == NULL || RB_COLOR(elm, field) == RB_BLACK) &&	\
-	    elm != RB_ROOT(head)) {					\
-		if (RB_LEFT(parent, field) == elm) {			\
-			tmp = RB_RIGHT(parent, field);			\
-			if (RB_COLOR(tmp, field) == RB_RED) {		\
-				RB_SET_BLACKRED(tmp, parent, field);	\
-				RB_ROTATE_LEFT(head, parent, tmp, field);\
-				tmp = RB_RIGHT(parent, field);		\
-			}						\
-			if ((RB_LEFT(tmp, field) == NULL ||		\
-			    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
-			    (RB_RIGHT(tmp, field) == NULL ||		\
-			    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
-				RB_COLOR(tmp, field) = RB_RED;		\
-				elm = parent;				\
-				parent = RB_PARENT(elm, field);		\
-			} else {					\
-				if (RB_RIGHT(tmp, field) == NULL ||	\
-				    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK) {\
-					struct type *oleft;		\
-					if ((oleft = RB_LEFT(tmp, field)) \
-					    != NULL)			\
-						RB_COLOR(oleft, field) = RB_BLACK;\
-					RB_COLOR(tmp, field) = RB_RED;	\
-					RB_ROTATE_RIGHT(head, tmp, oleft, field);\
-					tmp = RB_RIGHT(parent, field);	\
-				}					\
-				RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
-				RB_COLOR(parent, field) = RB_BLACK;	\
-				if (RB_RIGHT(tmp, field))		\
-					RB_COLOR(RB_RIGHT(tmp, field), field) = RB_BLACK;\
-				RB_ROTATE_LEFT(head, parent, tmp, field);\
-				elm = RB_ROOT(head);			\
-				break;					\
-			}						\
-		} else {						\
-			tmp = RB_LEFT(parent, field);			\
-			if (RB_COLOR(tmp, field) == RB_RED) {		\
-				RB_SET_BLACKRED(tmp, parent, field);	\
-				RB_ROTATE_RIGHT(head, parent, tmp, field);\
-				tmp = RB_LEFT(parent, field);		\
-			}						\
-			if ((RB_LEFT(tmp, field) == NULL ||		\
-			    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
-			    (RB_RIGHT(tmp, field) == NULL ||		\
-			    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
-				RB_COLOR(tmp, field) = RB_RED;		\
-				elm = parent;				\
-				parent = RB_PARENT(elm, field);		\
-			} else {					\
-				if (RB_LEFT(tmp, field) == NULL ||	\
-				    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) {\
-					struct type *oright;		\
-					if ((oright = RB_RIGHT(tmp, field)) \
-					    != NULL)			\
-						RB_COLOR(oright, field) = RB_BLACK;\
-					RB_COLOR(tmp, field) = RB_RED;	\
-					RB_ROTATE_LEFT(head, tmp, oright, field);\
-					tmp = RB_LEFT(parent, field);	\
-				}					\
-				RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
-				RB_COLOR(parent, field) = RB_BLACK;	\
-				if (RB_LEFT(tmp, field))		\
-					RB_COLOR(RB_LEFT(tmp, field), field) = RB_BLACK;\
-				RB_ROTATE_RIGHT(head, parent, tmp, field);\
-				elm = RB_ROOT(head);			\
-				break;					\
-			}						\
-		}							\
-	}								\
-	if (elm)							\
-		RB_COLOR(elm, field) = RB_BLACK;			\
-}									\
-									\
-attr struct type *							\
-name##_RB_REMOVE(struct name *head, struct type *elm)			\
-{									\
-	struct type *child, *parent, *old = elm;			\
-	int color;							\
-	if (RB_LEFT(elm, field) == NULL)				\
-		child = RB_RIGHT(elm, field);				\
-	else if (RB_RIGHT(elm, field) == NULL)				\
-		child = RB_LEFT(elm, field);				\
-	else {								\
-		struct type *left;					\
-		elm = RB_RIGHT(elm, field);				\
-		while ((left = RB_LEFT(elm, field)) != NULL)		\
-			elm = left;					\
-		child = RB_RIGHT(elm, field);				\
-		parent = RB_PARENT(elm, field);				\
-		color = RB_COLOR(elm, field);				\
-		if (child)						\
-			RB_PARENT(child, field) = parent;		\
-		if (parent) {						\
-			if (RB_LEFT(parent, field) == elm)		\
-				RB_LEFT(parent, field) = child;		\
-			else						\
-				RB_RIGHT(parent, field) = child;	\
-			RB_AUGMENT(parent);				\
-		} else							\
-			RB_ROOT(head) = child;				\
-		if (RB_PARENT(elm, field) == old)			\
-			parent = elm;					\
-		(elm)->field = (old)->field;				\
-		if (RB_PARENT(old, field)) {				\
-			if (RB_LEFT(RB_PARENT(old, field), field) == old)\
-				RB_LEFT(RB_PARENT(old, field), field) = elm;\
-			else						\
-				RB_RIGHT(RB_PARENT(old, field), field) = elm;\
-			RB_AUGMENT(RB_PARENT(old, field));		\
-		} else							\
-			RB_ROOT(head) = elm;				\
-		RB_PARENT(RB_LEFT(old, field), field) = elm;		\
-		if (RB_RIGHT(old, field))				\
-			RB_PARENT(RB_RIGHT(old, field), field) = elm;	\
-		if (parent) {						\
-			left = parent;					\
-			do {						\
-				RB_AUGMENT(left);			\
-			} while ((left = RB_PARENT(left, field)) != NULL); \
-		}							\
-		goto color;						\
-	}								\
-	parent = RB_PARENT(elm, field);					\
-	color = RB_COLOR(elm, field);					\
-	if (child)							\
-		RB_PARENT(child, field) = parent;			\
-	if (parent) {							\
-		if (RB_LEFT(parent, field) == elm)			\
-			RB_LEFT(parent, field) = child;			\
-		else							\
-			RB_RIGHT(parent, field) = child;		\
-		RB_AUGMENT(parent);					\
-	} else								\
-		RB_ROOT(head) = child;					\
-color:									\
-	if (color == RB_BLACK)						\
-		name##_RB_REMOVE_COLOR(head, parent, child);		\
-	return (old);							\
-}									\
-									\
-/* Inserts a node into the RB tree */					\
-attr struct type *							\
-name##_RB_INSERT(struct name *head, struct type *elm)			\
-{									\
-	struct type *tmp;						\
-	struct type *parent = NULL;					\
-	int comp = 0;							\
-	tmp = RB_ROOT(head);						\
-	while (tmp) {							\
-		parent = tmp;						\
-		comp = (cmp)(elm, parent);				\
-		if (comp < 0)						\
-			tmp = RB_LEFT(tmp, field);			\
-		else if (comp > 0)					\
-			tmp = RB_RIGHT(tmp, field);			\
-		else							\
-			return (tmp);					\
-	}								\
-	RB_SET(elm, parent, field);					\
-	if (parent != NULL) {						\
-		if (comp < 0)						\
-			RB_LEFT(parent, field) = elm;			\
-		else							\
-			RB_RIGHT(parent, field) = elm;			\
-		RB_AUGMENT(parent);					\
-	} else								\
-		RB_ROOT(head) = elm;					\
-	name##_RB_INSERT_COLOR(head, elm);				\
-	return (NULL);							\
-}									\
-									\
-/* Finds the node with the same key as elm */				\
-attr struct type *							\
-name##_RB_FIND(struct name *head, struct type *elm)			\
-{									\
-	struct type *tmp = RB_ROOT(head);				\
-	int comp;							\
-	while (tmp) {							\
-		comp = cmp(elm, tmp);					\
-		if (comp < 0)						\
-			tmp = RB_LEFT(tmp, field);			\
-		else if (comp > 0)					\
-			tmp = RB_RIGHT(tmp, field);			\
-		else							\
-			return (tmp);					\
-	}								\
-	return (NULL);							\
-}									\
-									\
-/* Finds the first node greater than or equal to the search key */	\
-attr struct type *							\
-name##_RB_NFIND(struct name *head, struct type *elm)			\
-{									\
-	struct type *tmp = RB_ROOT(head);				\
-	struct type *res = NULL;					\
-	int comp;							\
-	while (tmp) {							\
-		comp = cmp(elm, tmp);					\
-		if (comp < 0) {						\
-			res = tmp;					\
-			tmp = RB_LEFT(tmp, field);			\
-		}							\
-		else if (comp > 0)					\
-			tmp = RB_RIGHT(tmp, field);			\
-		else							\
-			return (tmp);					\
-	}								\
-	return (res);							\
-}									\
-									\
-/* ARGSUSED */								\
-attr struct type *							\
-name##_RB_NEXT(struct type *elm)					\
-{									\
-	if (RB_RIGHT(elm, field)) {					\
-		elm = RB_RIGHT(elm, field);				\
-		while (RB_LEFT(elm, field))				\
-			elm = RB_LEFT(elm, field);			\
-	} else {							\
-		if (RB_PARENT(elm, field) &&				\
-		    (elm == RB_LEFT(RB_PARENT(elm, field), field)))	\
-			elm = RB_PARENT(elm, field);			\
-		else {							\
-			while (RB_PARENT(elm, field) &&			\
-			    (elm == RB_RIGHT(RB_PARENT(elm, field), field)))\
-				elm = RB_PARENT(elm, field);		\
-			elm = RB_PARENT(elm, field);			\
-		}							\
-	}								\
-	return (elm);							\
-}									\
-									\
-/* ARGSUSED */								\
-attr struct type *							\
-name##_RB_PREV(struct type *elm)					\
-{									\
-	if (RB_LEFT(elm, field)) {					\
-		elm = RB_LEFT(elm, field);				\
-		while (RB_RIGHT(elm, field))				\
-			elm = RB_RIGHT(elm, field);			\
-	} else {							\
-		if (RB_PARENT(elm, field) &&				\
-		    (elm == RB_RIGHT(RB_PARENT(elm, field), field)))	\
-			elm = RB_PARENT(elm, field);			\
-		else {							\
-			while (RB_PARENT(elm, field) &&			\
-			    (elm == RB_LEFT(RB_PARENT(elm, field), field)))\
-				elm = RB_PARENT(elm, field);		\
-			elm = RB_PARENT(elm, field);			\
-		}							\
-	}								\
-	return (elm);							\
-}									\
-									\
-attr struct type *							\
-name##_RB_MINMAX(struct name *head, int val)				\
-{									\
-	struct type *tmp = RB_ROOT(head);				\
-	struct type *parent = NULL;					\
-	while (tmp) {							\
-		parent = tmp;						\
-		if (val < 0)						\
-			tmp = RB_LEFT(tmp, field);			\
-		else							\
-			tmp = RB_RIGHT(tmp, field);			\
-	}								\
-	return (parent);						\
-}
-
-#define RB_NEGINF	-1
-#define RB_INF	1
-
-#define RB_INSERT(name, x, y)	name##_RB_INSERT(x, y)
-#define RB_REMOVE(name, x, y)	name##_RB_REMOVE(x, y)
-#define RB_FIND(name, x, y)	name##_RB_FIND(x, y)
-#define RB_NFIND(name, x, y)	name##_RB_NFIND(x, y)
-#define RB_NEXT(name, x, y)	name##_RB_NEXT(y)
-#define RB_PREV(name, x, y)	name##_RB_PREV(y)
-#define RB_MIN(name, x)		name##_RB_MINMAX(x, RB_NEGINF)
-#define RB_MAX(name, x)		name##_RB_MINMAX(x, RB_INF)
-
-#define RB_FOREACH(x, name, head)					\
-	for ((x) = RB_MIN(name, head);					\
-	     (x) != NULL;						\
-	     (x) = name##_RB_NEXT(x))
-
-#define RB_FOREACH_FROM(x, name, y)					\
-	for ((x) = (y);							\
-	    ((x) != NULL) && ((y) = name##_RB_NEXT(x), (x) != NULL);	\
-	     (x) = (y))
-
-#define RB_FOREACH_SAFE(x, name, head, y)				\
-	for ((x) = RB_MIN(name, head);					\
-	    ((x) != NULL) && ((y) = name##_RB_NEXT(x), (x) != NULL);	\
-	     (x) = (y))
-
-#define RB_FOREACH_REVERSE(x, name, head)				\
-	for ((x) = RB_MAX(name, head);					\
-	     (x) != NULL;						\
-	     (x) = name##_RB_PREV(x))
-
-#define RB_FOREACH_REVERSE_FROM(x, name, y)				\
-	for ((x) = (y);							\
-	    ((x) != NULL) && ((y) = name##_RB_PREV(x), (x) != NULL);	\
-	     (x) = (y))
-
-#define RB_FOREACH_REVERSE_SAFE(x, name, head, y)			\
-	for ((x) = RB_MAX(name, head);					\
-	    ((x) != NULL) && ((y) = name##_RB_PREV(x), (x) != NULL);	\
-	     (x) = (y))
-
-#endif	/* _SYS_TREE_H_ */
diff --git a/main/libcap-ng/APKBUILD b/main/libcap-ng/APKBUILD
index 5834f6262ee..b3397c90ec1 100644
--- a/main/libcap-ng/APKBUILD
+++ b/main/libcap-ng/APKBUILD
@@ -1,22 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libcap-ng
-pkgver=0.7.10
+pkgver=0.8.4
 pkgrel=0
 pkgdesc="POSIX capabilities library"
-url="http://people.redhat.com/sgrubb/libcap-ng/index.html"
+url="https://people.redhat.com/sgrubb/libcap-ng/index.html"
 arch="all"
-license="GPL-2.0-or-later LGPL-2.1-or-later"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 depends_dev="linux-headers"
-makedepends_build=""
 makedepends_host="$depends_dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-utils"
 source="https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-$pkgver.tar.gz
-	fix-includes.patch
+	apply-disable.patch
 	"
-builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	ac_cv_prog_swig_found=no \
 	./configure \
 		--build=$CBUILD \
@@ -26,26 +23,26 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--without-python \
-		--without-python3
+		--without-python3 \
+		--enable-static
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
 utils() {
 	pkgdesc="posix capabilities utils"
 
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/
+	amove usr/bin
 }
 
-sha512sums="1b93c7f5c20ae5cc705fe5244af3e299454e988388cda95f006e248d97c0713e77da2a81c67ecf15755f3958df373fc6d1ca14197d6357ab1f2d8c3a0fd12def  libcap-ng-0.7.10.tar.gz
-8de98ce0fae63812cf7fd17e788343798b0cab63ba029f046ac9b89b2305da17432bafdd3dfa36046fc2cc0a453e0c889f6744c632f4617e0e5fc08e2823e324  fix-includes.patch"
+sha512sums="
+f4f3499d592e8583c2bdb8d700981a7930bd545f0889bc02f49acecf17e3bc600b100cd4f64e9326e5bac0a07a02a1ac4b7e83e919563066665a3d67cbe6871e  libcap-ng-0.8.4.tar.gz
+5f362d5d3f791d1bddc5d9ef3b31e5089c54f852904e12bc3b58dcd22fa87086766cfc095ae8b485bee1b3c4fd854575b89821052b77967a6fdca4ff7e0a0397  apply-disable.patch
+"
diff --git a/main/libcap-ng/apply-disable.patch b/main/libcap-ng/apply-disable.patch
new file mode 100644
index 00000000000..a476c1ae5b1
--- /dev/null
+++ b/main/libcap-ng/apply-disable.patch
@@ -0,0 +1,29 @@
+Upstream: Fedora patch
+Reason: Remove error codes that nobody handles and crashes everything
+
+diff -urp libcap-ng-0.8.2.orig/src/cap-ng.c libcap-ng-0.8.2/src/cap-ng.c
+--- libcap-ng-0.8.2.orig/src/cap-ng.c	2020-11-20 15:04:09.000000000 -0500
++++ libcap-ng-0.8.2/src/cap-ng.c	2020-11-20 16:04:55.425496426 -0500
+@@ -698,19 +698,19 @@ int capng_apply(capng_select_t set)
+ 				if (capng_have_capability(CAPNG_BOUNDING_SET,
+ 								 i) == 0) {
+ 				    if (prctl(PR_CAPBSET_DROP, i, 0, 0, 0) <0) {
+-					rc = -2;
++//					rc = -2;
+ 					goto try_caps;
+ 				    }
+ 				}
+ 			}
+ 			m.state = CAPNG_APPLIED;
+ 			if (get_bounding_set() < 0) {
+-				rc = -3;
++//				rc = -3;
+ 				goto try_caps;
+ 			}
+ 		} else {
+ 			memcpy(&m, &state, sizeof(m)); /* restore state */
+-			rc = -4;
++//			rc = -4;
+ 			goto try_caps;
+ 		}
+ #endif
diff --git a/main/libcap-ng/fix-includes.patch b/main/libcap-ng/fix-includes.patch
deleted file mode 100644
index 8fbd984b8bb..00000000000
--- a/main/libcap-ng/fix-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru libcap-ng-0.7.4.orig/src/cap-ng.c libcap-ng-0.7.4/src/cap-ng.c
---- libcap-ng-0.7.4.orig/src/cap-ng.c	2014-04-24 15:41:43.000000000 -0300
-+++ libcap-ng-0.7.4/src/cap-ng.c	2015-04-15 08:45:10.783335463 -0300
-@@ -34,6 +34,7 @@
- #include <stdarg.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <endian.h>
- #include <byteswap.h>
- #ifdef HAVE_SYSCALL_H
- #include <sys/syscall.h>
diff --git a/main/libcap/APKBUILD b/main/libcap/APKBUILD
index 8dd33d3b603..14a4143e2db 100644
--- a/main/libcap/APKBUILD
+++ b/main/libcap/APKBUILD
@@ -1,46 +1,68 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libcap
-pkgver=2.27
-pkgrel=0
+pkgver=2.69
+pkgrel=1
 pkgdesc="POSIX 1003.1e capabilities"
-options="checkroot"
 arch="all"
 license="BSD-3-Clause OR GPL-2.0-only"
-url="http://www.friedhoff.org/posixfilecaps.html"
+url="https://sites.google.com/site/fullycapable/"
 depends_dev="linux-headers"
-makedepends_build="linux-headers perl"
-makedepends_host="$depends_dev attr-dev"
+makedepends_build="linux-headers perl bash"
+makedepends_host="$depends_dev"
 makedepends="$makedepends_build $makedepends_host"
-checkdepends="bash"
+subpackages="
+	$pkgname-doc
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-getcap
+	$pkgname-setcap
+	$pkgname-utils
+	libcap2
+	"
 source="https://kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-$pkgver.tar.xz"
-subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
-builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
-	cd "$builddir"
-	make BUILD_CC=gcc CC="${CC:-gcc}" lib=lib prefix=/usr DESTDIR="$pkgdir"
+	make BUILD_CC=gcc CC="${CC:-gcc}" lib=lib prefix=/usr GOLANG=no \
+		DESTDIR="$pkgdir"
 }
 
 check() {
-	cd "$builddir"
-	# Running make test runs the command below but with sudo
-	cd progs && ./quicktest.sh
+	make GOLANG=no test
 }
 
 package() {
-	cd "$builddir"
-	make lib=lib prefix=/usr RAISE_SETFCAP=no DESTDIR="$pkgdir" install
-	# Fix perms
-	chmod -v 0755 "$pkgdir"/usr/lib/libcap.so.${pkgver}
+	# backwards compatibility for things that depended on 'libcap'
+	depends="libcap2=$pkgver-r$pkgrel $pkgname-utils=$pkgver-r$pkgrel"
+
+	make lib=lib prefix=/usr GOLANG=no DESTDIR="$pkgdir" \
+		install
 }
 
-static() {
-	depends=""
-	pkgdesc="$pkgdesc (static library)"
+getcap() {
+	pkgdesc="$pkgdesc (getcap utility)"
+
+	amove usr/sbin/getcap
+}
+
+setcap() {
+	pkgdesc="$pkgdesc (setcap utility)"
+
+	amove usr/sbin/setcap
+}
+
+utils() {
+	pkgdesc="$pkgdesc (extra utils)"
+	depends="$pkgname-getcap=$pkgver-r$pkgrel $pkgname-setcap=$pkgver-r$pkgrel"
+
+	amove usr/sbin
+}
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
+libcap2() {
+	replaces="$pkgname<2.64-r1"
+	default_libs
 }
 
-sha512sums="e32335fd3e0d1564574acc73df7030b5b0fd98875217bffabd76f2765f1a7a6f1369f03df2ee22a1782776838784e342378c10613ea1163d53ae5055ab6a62b6  libcap-2.27.tar.xz"
+sha512sums="
+647c307dc451517da9d089495ab959b4a6fbbe41c79f4e1e9bb663569dad630ead0c2e413dfb393319e3ea14dc9848c81b392107fe3382ce1813d278c3394a7f  libcap-2.69.tar.xz
+"
diff --git a/main/libcbor/APKBUILD b/main/libcbor/APKBUILD
new file mode 100644
index 00000000000..81cbaf5349f
--- /dev/null
+++ b/main/libcbor/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Will Sinatra <wpsinatra@gmail.com>
+pkgname=libcbor
+pkgver=0.11.0
+pkgrel=0
+pkgdesc="CBOR protocol implementation for C"
+url="https://github.com/PJK/libcbor"
+arch="all"
+license="MIT"
+makedepends="cmake samurai"
+subpackages="$pkgname-dev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/PJK/libcbor/archive/refs/tags/v$pkgver.tar.gz"
+#rebuild: libfido2 fwupd
+
+build() {
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake -B build -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		$CMAKE_CROSSOPTS .
+	cmake --build build
+}
+
+check() {
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+c14aaa55c0c82e09b9eb2cc6847951d1bac8a081a247776c507d5450367da5717b1056bad09fb0f0178311de8754e8f89c060e0fc0f400fafdc42de441421e66  libcbor-0.11.0.tar.gz
+"
diff --git a/main/libcddb/APKBUILD b/main/libcddb/APKBUILD
deleted file mode 100644
index 77bcfe96df8..00000000000
--- a/main/libcddb/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Contributor: Carlo Landmeter
-# Maintainer:
-pkgname=libcddb
-pkgver=1.3.2
-pkgrel=3
-pkgdesc="Library that implements the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB server (e.g. http://freedb.org)."
-url="https://sourceforge.net/projects/libcddb/"
-arch="all"
-options="!check"  # Tests are known broken since 2009:
-# https://sourceforge.net/p/libcddb/bugs/7/
-license="LGPL-2.0+"
-depends=
-makedepends=
-install=
-subpackages="$pkgname-dev"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="0e07e7d37f2013164d75b530a5528f54847271fd20f3b7bedb192a05d1f61dcf006d10dc2927efe155a01eddcc57b940bc31d8ac88d5dfc4f1a09771caa84e0a  libcddb-1.3.2.tar.bz2"
diff --git a/main/libcdio/APKBUILD b/main/libcdio/APKBUILD
deleted file mode 100644
index 1687a587e29..00000000000
--- a/main/libcdio/APKBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Contributor: Carlo Landmeter
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libcdio
-pkgver=2.1.0
-pkgrel=0
-pkgdesc="GNU Compact Disc Input and Control Library"
-url="https://www.gnu.org/software/libcdio/"
-arch="all"
-license="GPL-3.0-or-later"
-checkdepends="bash"
-makedepends="libcddb-dev ncurses-dev linux-headers"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-tools ${pkgname}++:_cpp"
-source="https://ftp.gnu.org/gnu/libcdio/$pkgname-$pkgver.tar.bz2
-	disable-broken-test.patch"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--disable-vcd-info \
-		--disable-static \
-		--disable-rpath \
-		--disable-cpp-progs
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install
-}
-
-tools() {
-	pkgdesc="libcdio example tools"
-	install -d "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
-}
-
-_cpp() {
-	pkgdesc="libcdio bindings for C++"
-	install -d "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*++.* "$subpkgdir"/usr/lib/
-}
-
-sha512sums="c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f  libcdio-2.1.0.tar.bz2
-be0149128bb2fa131f514bcff848279d826340a99a05b958e104f4640bda1a89d6146b0ec348783f4bbd8a3c313c41297152f75ee04f492f08b337bd79dd9c3e  disable-broken-test.patch"
diff --git a/main/libcdio/disable-broken-test.patch b/main/libcdio/disable-broken-test.patch
deleted file mode 100644
index 223445df3fe..00000000000
--- a/main/libcdio/disable-broken-test.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- libcdio-0.94/test/driver/realpath.c.old	2015-05-08 06:40:54.000000000 -0500
-+++ libcdio-0.94/test/driver/realpath.c	2017-10-07 02:03:01.832979859 -0500
-@@ -155,6 +155,7 @@
-             check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
-         }
- 
-+#if 0	/* This test requires undefined behaviour in realpath(3). */
-         /* Make sure we handle a cyclic symbolic name, e.g. xx -> xx */
-         cdio_realpath(psz_symlink_file, symlink_file);
-         rc = check_rc(symlink(psz_symlink_file, psz_symlink_file),
-@@ -168,6 +169,7 @@
-             }
-             check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
-         }
-+#endif
- 
-     }
- 
---- libcdio-0.94/test/malformed.right.old	2015-05-07 23:25:02.000000000 -0500
-+++ libcdio-0.94/test/malformed.right	2017-10-07 02:08:17.898937537 -0500
-@@ -1,3 +1,3 @@
--Error getting above directory information
- __________________________________
-+Error getting above directory information
- ISO-9660 Information
---- libcdio-0.94/test/malformed2.right.old	2015-05-08 05:54:32.000000000 -0500
-+++ libcdio-0.94/test/malformed2.right	2017-10-07 02:09:46.362072631 -0500
-@@ -1,5 +1,5 @@
--Error getting above directory information
- __________________________________
-+Error getting above directory information
- ISO-9660 Information
-      2048 /a
-         0 /b.txt
diff --git a/main/libclc/APKBUILD b/main/libclc/APKBUILD
new file mode 100644
index 00000000000..8ff2067b5b6
--- /dev/null
+++ b/main/libclc/APKBUILD
@@ -0,0 +1,52 @@
+# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
+pkgname=libclc
+# follow llvm versioning
+pkgver=17.0.6
+pkgrel=0
+_llvmver=${pkgver%%.*}
+pkgdesc="Open source implementation of the library requirements of the OpenCL C programming language"
+url="https://libclc.llvm.org/"
+arch="all"
+license="Apache-2.0 WITH LLVM-exception"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+makedepends="
+	clang$_llvmver
+	cmake
+	llvm$_llvmver-dev
+	llvm$_llvmver-static
+	llvm$_llvmver-gtest
+	samurai
+	spirv-llvm-translator-dev
+	"
+checkdepends="llvm-test-utils"
+subpackages="$pkgname-dev"
+source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/libclc-$pkgver.src.tar.xz
+	https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/cmake-$pkgver.src.tar.xz
+	"
+builddir="$srcdir/libclc-$pkgver.src"
+options="!check" # todo: they fail for some reason
+
+build() {
+	CC=clang-$_llvmver \
+	CXX=clang++-$_llvmver \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DLLVM_CONFIG="llvm-config-$_llvmver" \
+		-DLLVM_SPIRV=/usr/bin/llvm-spirv \
+		-DCMAKE_MODULE_PATH="$srcdir/cmake-$pkgver.src/Modules"
+	cmake --build build
+}
+
+check() {
+	cmake --build build --target test
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+6165bfa0112fb42756cd0e83a0d3d4406985b1d6db6eed8abb3bee9a74fcc451cc88928b24231493694035c35d9bcd367aa6a4a67da631cb4ee5e7a98037fee3  libclc-17.0.6.src.tar.xz
+b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a  cmake-17.0.6.src.tar.xz
+"
diff --git a/main/libconfig/APKBUILD b/main/libconfig/APKBUILD
index 18c529221f1..c0e3bea6897 100644
--- a/main/libconfig/APKBUILD
+++ b/main/libconfig/APKBUILD
@@ -1,24 +1,22 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libconfig
-pkgver=1.7.2
-pkgrel=0
+pkgver=1.7.3
+pkgrel=3
 pkgdesc="A simple library for manipulating structured configuration files"
-url="http://www.hyperrealm.com/libconfig/"
+url="https://www.hyperrealm.com/libconfig/libconfig.html"
 arch="all"
 license="LGPL-2.1-or-later"
 makedepends="automake autoconf libtool texinfo"
 subpackages="$pkgname-static $pkgname-doc $pkgname-dev $pkgname++:_cxx"
-source="$pkgname-$pkgver.tar.gz::https://github.com/hyperrealm/$pkgname/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/hyperrealm/libconfig/archive/v$pkgver.tar.gz"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	autoreconf -fi
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,13 +26,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir/" install
+	make DESTDIR="$pkgdir/" install
 }
 
 _cxx() {
@@ -50,4 +46,6 @@ static() {
 	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
 }
 
-sha512sums="9df57355c2d08381b4a0a6366f0db3633fbe8f73c2bb8c370c040b0bae96ce89ee4ac6c17a5a247fed855d890fa383e5b70cb5573fc9cfc62194d5b94e161cee  libconfig-1.7.2.tar.gz"
+sha512sums="
+3749bf9eb29bab0f6b14f4fc759f0c419ed27a843842aaabed1ec1fbe0faa8c93322ff875ca1291d69cb28a39ece86d512aec42c2140d566c38c56dc616734f4  libconfig-1.7.3.tar.gz
+"
diff --git a/main/libdaemon/APKBUILD b/main/libdaemon/APKBUILD
index 69c3c158ea1..4f690c526e7 100644
--- a/main/libdaemon/APKBUILD
+++ b/main/libdaemon/APKBUILD
@@ -1,27 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libdaemon
 pkgver=0.14
-pkgrel=2
+pkgrel=4
 pkgdesc="A lightweight C library which eases the writing of UNIX daemons"
 url="http://0pointer.de/lennart/projects/libdaemon/"
 arch="all"
-license="LGPL"
+license="LGPL-2.1-or-later"
 options="!check"  # No test suite.
-depends=""
-makedepends=""
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://dev.alpinelinux.org/archive/libdaemon/libdaemon-$pkgver.tar.gz
 	fix-includes.patch
 	"
 
 prepare() {
-	cd "$builddir"
 	update_config_sub
 	default_prepare
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,7 +28,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/libdbi/APKBUILD b/main/libdbi/APKBUILD
index 05118145fc0..21b9298afe5 100644
--- a/main/libdbi/APKBUILD
+++ b/main/libdbi/APKBUILD
@@ -2,31 +2,33 @@
 # Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
 pkgname=libdbi
 pkgver=0.9.0
-pkgrel=0
+pkgrel=4
 pkgdesc="Database independent abstraction layer for C"
-url="http://libdbi.sourceforge.net/"
+options="libtool !check"
+url="https://libdbi.sourceforge.net/"
 arch="all"
-license="LGPL-2.0-or-later"
-depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
+license="LGPL-2.1-or-later"
 subpackages="$pkgname-doc $pkgname-dev"
-source="https://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"
-options=libtool
+source="https://downloads.sourceforge.net/project/libdbi/libdbi/libdbi-$pkgver/libdbi-$pkgver.tar.gz"
 
-builddir=${srcdir}/${pkgname}-${pkgver}
+prepare() {
+	default_prepare
+	update_config_guess
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
-	update_config_guess || return 1
-	./configure --prefix=/usr
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr
 	make
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ee8777195af43057409d051a6055ec0467cd926d48da076458b09f91d2f0995a1cc4bc071762e401b7bdcd8a4173fd8ea3472db3a1518e34b4c5b5ed24e4e2ce  libdbi-0.9.0.tar.gz"
+sha512sums="
+ee8777195af43057409d051a6055ec0467cd926d48da076458b09f91d2f0995a1cc4bc071762e401b7bdcd8a4173fd8ea3472db3a1518e34b4c5b5ed24e4e2ce  libdbi-0.9.0.tar.gz
+"
diff --git a/main/libde265/APKBUILD b/main/libde265/APKBUILD
index ee8ad1c604e..a486f972150 100644
--- a/main/libde265/APKBUILD
+++ b/main/libde265/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=libde265
-pkgver=1.0.4
+pkgver=1.0.15
 pkgrel=0
 pkgdesc="Open h.265 video codec implementation"
 url="https://github.com/strukturag/libde265"
@@ -9,12 +9,55 @@ arch="all"
 license="LGPL-3.0-or-later"
 makedepends="autoconf automake libtool"
 options="!check"  # no tests provided
-subpackages="$pkgname-dev"
+subpackages="$pkgname-dev $pkgname-examples"
 source="https://github.com/strukturag/libde265/releases/download/v$pkgver/libde265-$pkgver.tar.gz
+	disable_tools.patch
 	export-only-decoder-api.patch
-	disable-tools.patch
-	use-new-ffmpeg-enum-names.patch
 	"
+# secfixes:
+#   1.0.15-r0:
+#     - CVE-2023-49465
+#     - CVE-2023-49467
+#     - CVE-2023-49468
+#   1.0.11-r1:
+#     - CVE-2023-27102
+#     - CVE-2023-27103
+#   1.0.11-r0:
+#     - CVE-2020-21594
+#     - CVE-2020-21595
+#     - CVE-2020-21596
+#     - CVE-2020-21597
+#     - CVE-2020-21598
+#     - CVE-2020-21599
+#     - CVE-2020-21600
+#     - CVE-2020-21601
+#     - CVE-2020-21602
+#     - CVE-2020-21603
+#     - CVE-2020-21604
+#     - CVE-2020-21605
+#     - CVE-2020-21606
+#     - CVE-2022-43236
+#     - CVE-2022-43237
+#     - CVE-2022-43238
+#     - CVE-2022-43239
+#     - CVE-2022-43240
+#     - CVE-2022-43241
+#     - CVE-2022-43242
+#     - CVE-2022-43243
+#     - CVE-2022-43244
+#     - CVE-2022-43245
+#     - CVE-2022-43248
+#     - CVE-2022-43249
+#     - CVE-2022-43250
+#     - CVE-2022-43252
+#     - CVE-2022-43253
+#     - CVE-2022-47655
+#   1.0.8-r2:
+#     - CVE-2021-35452
+#     - CVE-2021-36408
+#     - CVE-2021-36410
+#     - CVE-2021-36411
+#     - CVE-2022-1253
 
 prepare() {
 	default_prepare
@@ -27,8 +70,8 @@ build() {
 	export CXXFLAGS="${CXXFLAGS/-Os/-O2}"
 
 	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
+		--build="$CBUILD" \
+		--host="$CHOST" \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--disable-sherlock265
@@ -37,9 +80,20 @@ build() {
 
 package() {
 	make DESTDIR="$pkgdir" install
+
+	# The upstream do the same in their Ubuntu/PPA packages.
+	mv "$pkgdir"/usr/bin/dec265 "$pkgdir"/usr/bin/libde265-dec265
+}
+
+examples() {
+	pkgdesc="$pkgdesc (examples)"
+	depends="$pkgname=$pkgver-r$pkgrel"
+
+	amove usr/bin/*
 }
 
-sha512sums="1c57a0b543d17a09928ce126b957b71d3d92add24936f724767d0fff13a137036e9b053fb3aaa6f8f9c5e3e60cb76d9ad816384a7bb626f7fe0cd1aad6d13ec1  libde265-1.0.4.tar.gz
-b937024655020eaea60cc02110018a4b8a63c7fca5a3c14cf042952e6acc83cf39d8d5a23d16536738a374538e2a20c8130d62e0e82a2dbd86ccea9a01433d11  export-only-decoder-api.patch
-ec3d78eb5e0df13900fdc87711372de8dbf12371feeb885dd54e824b4e6370c8b19528ad1fe07aca410ab281665a64e1357d4ab88fc78fb68d2a9ebd18761bca  disable-tools.patch
-6007f51114dcfaefed402ac88599add00f5a25d9e670f20e658d166843b4df3525e9f59556c50358fad85878d5bc2062616a1dede597f4664f46fe1f3baaef7d  use-new-ffmpeg-enum-names.patch"
+sha512sums="
+375d8e781108247e0e8b4d7a036d20cc5d0670bdbf6ddb40a6d3dbf912fa776d2f001fb762301cb97e4d43be29eb415b0cdbfc6e07aa18b3f2346f7409c64fce  libde265-1.0.15.tar.gz
+1c702f229e2bafb2e72c90aed55b14691fa8f216ea855931197b8cd266c701ce2679a8f143651bdf984d7ac79a66a0d84b603822601a800ffb504461399d84ee  disable_tools.patch
+f7bd3799f4e4440e7efb98671eca425a5926dd526f8b1147cee2e49b1995853f67b63287c12739ef8ea680713af903517820f83f7f88eac6459f37bae01b4d50  export-only-decoder-api.patch
+"
diff --git a/main/libde265/disable-tools.patch b/main/libde265/disable-tools.patch
deleted file mode 100644
index 2376fef5033..00000000000
--- a/main/libde265/disable-tools.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Disable building of some internal tools that no longer link
- because internal symbols are not exported.
-Author: Joachim Bauch <bauch@struktur.de>
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,10 +8,6 @@
- SUBDIRS+=dec265
- endif
- 
--SUBDIRS+=enc265
--SUBDIRS+=tools
--SUBDIRS+=acceleration-speed
--
- if ENABLE_SHERLOCK265
- SUBDIRS+=sherlock265
- endif
---- a/dec265/Makefile.am
-+++ b/dec265/Makefile.am
-@@ -1,5 +1,5 @@
- 
--bin_PROGRAMS = dec265 hdrcopy
-+bin_PROGRAMS = dec265
- 
- AM_CPPFLAGS = -I../libde265
- 
-@@ -9,12 +9,6 @@
- dec265_LDADD = ../libde265/libde265.la -lstdc++
- dec265_SOURCES = dec265.cc
- 
--hdrcopy_DEPENDENCIES = ../libde265/libde265.la
--hdrcopy_CXXFLAGS =
--hdrcopy_LDFLAGS =
--hdrcopy_LDADD = ../libde265/libde265.la -lstdc++
--hdrcopy_SOURCES = hdrcopy.cc
--
- if HAVE_VIDEOGFX
-   dec265_CXXFLAGS += $(VIDEOGFX_CFLAGS)
-   dec265_LDFLAGS += $(VIDEOGFX_LIBS)
-
diff --git a/main/libde265/disable_tools.patch b/main/libde265/disable_tools.patch
new file mode 100644
index 00000000000..e927ac1e0f7
--- /dev/null
+++ b/main/libde265/disable_tools.patch
@@ -0,0 +1,21 @@
+Description: Disable building of some internal tools that no longer link
+	because internal symbols are no longer exported.
+
+diff --git a/Makefile.am b/Makefile.am
+index b4098f8..0d66934 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,13 +8,6 @@ if ENABLE_DEC265
+ SUBDIRS+=dec265
+ endif
+ 
+-if ENABLE_ENCODER
+-SUBDIRS+=enc265
+-endif
+-
+-SUBDIRS+=tools
+-SUBDIRS+=acceleration-speed
+-
+ if ENABLE_SHERLOCK265
+ SUBDIRS+=sherlock265
+ endif
diff --git a/main/libde265/export-only-decoder-api.patch b/main/libde265/export-only-decoder-api.patch
index b41effac4d8..cd58d39636c 100644
--- a/main/libde265/export-only-decoder-api.patch
+++ b/main/libde265/export-only-decoder-api.patch
@@ -7,7 +7,7 @@ Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265
 
 --- a/libde265/encoder/Makefile.am
 +++ b/libde265/encoder/Makefile.am
-@@ -10,6 +10,18 @@
+@@ -12,6 +12,18 @@
    encpicbuf.h encpicbuf.cc \
    sop.h sop.cc
  
@@ -44,7 +44,7 @@ Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265
    CMakeLists.txt
 --- a/configure.ac
 +++ b/configure.ac
-@@ -50,9 +50,7 @@
+@@ -56,9 +56,7 @@
  fi
  changequote([,])dnl
  
@@ -57,7 +57,7 @@ Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265
  # Checks for header files.
 --- a/libde265/image-io.cc
 +++ b/libde265/image-io.cc
-@@ -183,7 +183,7 @@
+@@ -186,7 +186,7 @@
  }
  
  
@@ -66,7 +66,7 @@ Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265
  {
    if (mFH) {
      fclose(mFH);
-@@ -191,7 +191,7 @@
+@@ -194,7 +194,7 @@
  }
  
  
@@ -75,7 +75,7 @@ Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265
  {
    assert(mFH==NULL);
  
-@@ -199,7 +199,7 @@
+@@ -202,7 +202,7 @@
  }
  
  
diff --git a/main/libde265/use-new-ffmpeg-enum-names.patch b/main/libde265/use-new-ffmpeg-enum-names.patch
deleted file mode 100644
index 3a2facc4404..00000000000
--- a/main/libde265/use-new-ffmpeg-enum-names.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e5b8e2e703d608777afadc54955bd396e4211da0 Mon Sep 17 00:00:00 2001
-From: Dirk Farin <farin@struktur.de>
-Date: Thu, 19 Apr 2018 13:15:18 +0200
-Subject: [PATCH] use new FFMPEG enum names
-
-Patch-Source: https://build.opensuse.org/package/view_file/home:jirutka/libde265/libde265-use_new_FFMPEG_enum_names.patch
----
- sherlock265/VideoDecoder.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sherlock265/VideoDecoder.cc b/sherlock265/VideoDecoder.cc
-index 119f6152..b829e1c7 100644
---- a/sherlock265/VideoDecoder.cc
-+++ b/sherlock265/VideoDecoder.cc
-@@ -237,7 +237,7 @@ void VideoDecoder::convert_frame_swscale(const de265_image* img, QImage & qimg)
-     }
-     width = img->get_width();
-     height = img->get_height();
--    sws = sws_getContext(width, height, PIX_FMT_YUV420P, width, height, PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
-+    sws = sws_getContext(width, height, AV_PIX_FMT_YUV420P, width, height, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
-   }
- 
-   int stride[3];
-
-
diff --git a/main/libdnet/APKBUILD b/main/libdnet/APKBUILD
index 8d6324a3787..636d0cd1ac7 100644
--- a/main/libdnet/APKBUILD
+++ b/main/libdnet/APKBUILD
@@ -1,28 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libdnet
-pkgver=1.12
-pkgrel=7
-pkgdesc="A simplified, portable interface to several low-level networking routines"
-url="https://github.com/dugsong/libdnet"
+pkgver=1.17.0
+pkgrel=0
+pkgdesc="simplified, portable interface to several low-level networking routines"
+url="https://github.com/ofalk/libdnet"
 arch="all"
-license="BSD"
+license="BSD-3-Clause"
+makedepends="check-dev linux-headers"
+options="!check" # fails to find test-driver
 subpackages="$pkgname-dev $pkgname-doc"
-makedepends="autoconf automake bash libtool linux-headers"
-source="https://github.com/dugsong/libdnet/archive/$pkgname-$pkgver.tar.gz
-	automake.patch
-	"
-
+source="https://github.com/ofalk/libdnet/archive/libdnet-$pkgver.tar.gz"
 builddir="$srcdir"/$pkgname-$pkgname-$pkgver
+
 prepare() {
-	default_prepare
-	# the libtool script does not add .so extention to we generate
-	# new libtool
-	aclocal -I config && autoconf && automake --force --add-missing \
-		&& libtoolize
+ 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,10 +27,14 @@ build() {
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a2410a98b76d4bccecf7bcb82ff0b6e9fb809b389f7fea938cc42d94e18622cc5f353d2de737121a1990d9e16e9db8cc2f82677c94f78cd03c9227e815eab9e0  libdnet-1.12.tar.gz
-8a47795c5edb5f67df46a59f2f4d8798b2e34f34e0aae3202a6cca8e475f105e08fa5586a432fba9f443c1df57441cffcdc08f5e4eb53df8e73c2a6c8c075477  automake.patch"
+sha512sums="
+b207b2f61e3759a2b17827eabf37b0eb68cb9fa27418f99ee4efd754b01dfe8504dff465664b14054d54df334195d43963d142c7104dc603b2b8b1491590d2a7  libdnet-1.17.0.tar.gz
+"
diff --git a/main/libdnet/automake.patch b/main/libdnet/automake.patch
deleted file mode 100644
index c6c257f3efb..00000000000
--- a/main/libdnet/automake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.in.orig	2012-12-31 19:55:17.838213967 +0000
-+++ ./configure.in	2012-12-31 19:55:31.191667853 +0000
-@@ -10,7 +10,7 @@
- AC_SUBST(ac_aux_dir)
- 
- AM_INIT_AUTOMAKE(libdnet, 1.12)
--AM_CONFIG_HEADER(include/config.h)
-+AC_CONFIG_HEADER(include/config.h)
- 
- dnl XXX - stop the insanity!@#$
- AM_MAINTAINER_MODE
diff --git a/main/libdrm/APKBUILD b/main/libdrm/APKBUILD
index 11ca01a7989..fbdd8e4fbd0 100644
--- a/main/libdrm/APKBUILD
+++ b/main/libdrm/APKBUILD
@@ -1,43 +1,53 @@
+# Contributor: Will Sinatra <wpsinatra@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libdrm
-pkgver=2.4.100
-pkgrel=1
+pkgver=2.4.120
+pkgrel=0
 pkgdesc="Userspace interface to kernel DRM services"
-url="https://dri.freedesktop.org/"
+url="https://gitlab.freedesktop.org/mesa/drm"
 arch="all"
 # Requires a computer with gfx, no X running, build user in 'video' group..
 options="!check"
 license="MIT"
 depends_dev="linux-headers"
-makedepends="$depends_dev meson libpthread-stubs eudev-dev libpciaccess-dev xmlto"
+makedepends="$depends_dev meson eudev-dev libpciaccess-dev xmlto"
 checkdepends="cunit-dev bash"
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://dri.freedesktop.org/libdrm/libdrm-$pkgver.tar.bz2
-	ioctl.patch
-	"
+subpackages="$pkgname-dev $pkgname-tests"
+source="https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-$pkgver/drm-libdrm-$pkgver.tar.gz"
+builddir="$srcdir/drm-libdrm-$pkgver"
 
 build() {
-	mkdir -p "$builddir"/builddir
-	cd "$builddir"/builddir
-	meson \
-		-Dprefix=/usr \
-		--buildtype=plain \
-		-Dfreedreno=true \
-		-Dtegra=true \
-		-Detnaviv=true \
-		-Dudev=true
-	ninja
+	CFLAGS="$CFLAGS -O2" \
+	CPPFLAGS="$CPPFLAGS -O2" \
+	CXXFLAGS="$CXXFLAGS -O2" \
+	abuild-meson \
+		-Db_lto=true \
+		-Dfreedreno=enabled \
+		-Dintel=enabled \
+		-Dtegra=enabled \
+		-Domap=enabled \
+		-Dexynos=enabled \
+		-Dvc4=enabled \
+		-Detnaviv=enabled \
+		-Dudev=true \
+		-Dinstall-test-programs=true \
+		-Dtests=true \
+		. output
+	meson compile -C output
 }
 
 check() {
-	cd "$builddir"/builddir
-	meson test
+	meson test --print-errorlogs -C output
 }
 
 package() {
-	cd "$builddir"/builddir
-	DESTDIR="$pkgdir" ninja install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-sha512sums="4d3a5556e650872944af52f49de395e0ce8ac9ac58530e39a34413e94dc56c231ee71b8b8de9fb944263515a922b3ebbf7ddfebeaaa91543c2604f9bcf561247  libdrm-2.4.100.tar.bz2
-af52fef51aaa05a4dd17919371cb9d92a77480402730bf53ba223e54df52f3825be05a7f28e6aef8c904db5ee59fe38a6c15bc6aafa7f8d31a719e80399dd51f  ioctl.patch"
+tests() {
+	amove usr/bin
+}
+
+sha512sums="
+31428ec49476af3bb7acbe088ebb2411f2f69013af63afd0832546df1a45a7f45ebb472dce3f07946b9202e41deba7aae3590c2e721c56b6d64de908704ae308  drm-libdrm-2.4.120.tar.gz
+"
diff --git a/main/libdrm/ioctl.patch b/main/libdrm/ioctl.patch
deleted file mode 100644
index 9ffe5f93356..00000000000
--- a/main/libdrm/ioctl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libdrm-2.4.83/tests/nouveau/threaded.c
-+++ libdrm-2.4.83/tests/nouveau/threaded.c
-@@ -40,7 +40,7 @@
-
- static int import_fd;
-
--int ioctl(int fd, unsigned long request, ...)
-+int ioctl(int fd, int request, ...)
- {
-        va_list va;
-        int ret;
diff --git a/main/libdv/APKBUILD b/main/libdv/APKBUILD
deleted file mode 100644
index 7a179335afb..00000000000
--- a/main/libdv/APKBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libdv
-pkgver=1.0.0
-pkgrel=3
-pkgdesc="Software decoder for DV format video"
-url="http://libdv.sourceforge.net/"
-arch="all"
-options="!check"  # No test suite.
-license="LGPL-2.0-or-later"
-depends=
-makedepends="gtk+-dev libxv-dev sdl-dev autoconf automake libtool
-	linux-headers"
-install=""
-subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
-source="https://downloads.sourceforge.net/libdv/libdv-$pkgver.tar.gz
-	libdv-0.104-no-exec-stack.patch
-	libdv-1.0.0-dso-linking.patch
-	libdv-1.0.0-pic.patch
-	libdv-1.0.0-gtk2.patch
-	automake.patch
-	"
-
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-	rm -f missing
-	libtoolize --force && aclocal && autoconf && automake --add-missing
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--with-pic
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-tools() {
-	pkgdesc="Basic tools to manipulate Digital Video streams"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
-}
-
-sha512sums="19887a6f452fa7da8924901ad841f5c4a434a3bde56c932ddb43717592aa744281e3a8ad220231e11d7e6bc3b0e704952a8324e5f85d4e088675edceeeca7dc8  libdv-1.0.0.tar.gz
-b6477886fb07a15e7213fda0aa42364420aff32991b4a6b2fb24e4ac6064bcc83063bd091d6e00a58ac7faa7f142840ab5099b8f2365b1ca47646e02ac98b5fd  libdv-0.104-no-exec-stack.patch
-de160c8cf9e0a7a3975958b42a4833a968a32448218800d975e84da71dcc2d7c55d0e08f01fd7b4c7a1d2e15487b401ec9f85436ebbed746b4749846665abfd6  libdv-1.0.0-dso-linking.patch
-19397c8a5f5b0b3ec64909f1834715cf58baf3314c7a19e643c823e7b58177997d9ad56aa059a4da9d01a5c5084ddb6a861425ad9fb191b97b2ac1fff736513b  libdv-1.0.0-pic.patch
-e2b8de4b1e8f9620f85b4e8f0f5aba5ac59c8912806ad06d4bcdc3f3e4448013ba3f968107a5fd6ba446e8ab9ff62505058eae540944c842b42ea67cda3a0c84  libdv-1.0.0-gtk2.patch
-e219b4bf50f87cceb3a39d23b050945defa36cc343ad0ab87ce7491d4f21b7c2dee0c9e1e795bb332b8d94c5bfd59ac24f7cb74c77ac6f1aea4eea752bb002df  automake.patch"
diff --git a/main/libdv/automake.patch b/main/libdv/automake.patch
deleted file mode 100644
index acd769e54e0..00000000000
--- a/main/libdv/automake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.ac.orig	2012-12-31 20:01:40.477502306 +0000
-+++ ./configure.ac	2012-12-31 20:01:55.184285224 +0000
-@@ -1,7 +1,7 @@
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(libdv/parse.c)
- dnl AC_CONFIG_AUX_DIR(config)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
- 
- RPM_RELEASE=1
- AC_CANONICAL_HOST
diff --git a/main/libdv/libdv-0.104-no-exec-stack.patch b/main/libdv/libdv-0.104-no-exec-stack.patch
deleted file mode 100644
index edf917c3703..00000000000
--- a/main/libdv/libdv-0.104-no-exec-stack.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-Make sure that the asm files don't incorrectly trigger an executable
-stack marking in the final shared library.  That's bad, mmmkay.
-
-Upstream has already fixed this in their cvs.
-
---- a/libdv/dct_block_mmx.S
-+++ b/libdv/dct_block_mmx.S
-@@ -1207,3 +1207,7 @@ _dv_dct_block_mmx_postscale_248:
- 	popl	 %esi
- 	popl	 %ebp
- 	ret
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- a/libdv/dct_block_mmx_x86_64.S
-+++ b/libdv/dct_block_mmx_x86_64.S
-@@ -1197,3 +1197,7 @@ _dv_dct_block_mmx_x86_64_postscale_248:
- 	pop	 %r12
- 	
- 	ret
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- a/libdv/encode_x86.S
-+++ b/libdv/encode_x86.S
-@@ -599,3 +599,6 @@ _dv_need_dct_248_mmx_rows:
- 
- 
- 
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- a/libdv/encode_x86_64.S
-+++ b/libdv/encode_x86_64.S
-@@ -600,3 +600,6 @@ _dv_need_dct_248_mmx_x86_64_rows:
- 
- 
- 
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- a/libdv/idct_block_mmx.S
-+++ b/libdv/idct_block_mmx.S
-@@ -648,3 +648,6 @@ x0:
- 	.long 0,0
- 	.align 8
- 
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- a/libdv/idct_block_mmx_x86_64.S
-+++ b/libdv/idct_block_mmx_x86_64.S
-@@ -653,3 +653,6 @@ x0:
- 	.long 0,0
- 	.align 8
- 
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- a/libdv/quant_x86.S
-+++ b/libdv/quant_x86.S
-@@ -454,3 +454,6 @@ _dv_quant_x86:	
- 
- 
- 
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- a/libdv/quant_x86_64.S
-+++ b/libdv/quant_x86_64.S
-@@ -459,3 +459,6 @@ _dv_quant_x86_64:
- 
- 
- 
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- a/libdv/rgbtoyuv.S
-+++ b/libdv/rgbtoyuv.S
-@@ -1430,3 +1430,6 @@ video_copy_ntsc_c_block_mmx_loop:	
- 
- 
- 
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- a/libdv/rgbtoyuv_x86_64.S
-+++ b/libdv/rgbtoyuv_x86_64.S
-@@ -1370,3 +1370,6 @@ video_copy_ntsc_c_block_mmx_loop:	
- 
- 
- 
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- a/libdv/transpose_x86.S
-+++ b/libdv/transpose_x86.S
-@@ -188,3 +188,7 @@ popl    %esi
- popl %ebp
- 
- ret     $0
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- a/libdv/transpose_x86_64.S
-+++ b/libdv/transpose_x86_64.S
-@@ -188,3 +188,7 @@ all_done_ready_to_exit:
- 	pop	%r12
- 
- 	ret     $0
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- a/libdv/vlc_x86.S
-+++ b/libdv/vlc_x86.S
-@@ -585,3 +585,7 @@ mod_12:
- 	.align 16
- const_f_0_0_0:
- 	.short	0xffff,0,0,0
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- a/libdv/vlc_x86_64.S
-+++ b/libdv/vlc_x86_64.S
-@@ -671,3 +671,7 @@ mod_12:
- 	.align 16
- const_f_0_0_0:
- 	.short	0xffff,0,0,0
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
diff --git a/main/libdv/libdv-1.0.0-dso-linking.patch b/main/libdv/libdv-1.0.0-dso-linking.patch
deleted file mode 100644
index ced01f2b873..00000000000
--- a/main/libdv/libdv-1.0.0-dso-linking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-We now need to explicitly link to libraries that we use because we can no
-longer depend on our dependencies to pull them in for us.  See
-http://fedoraproject.org/wiki/UnderstandingDSOLinkChange
-
---- libdv-1.0.0/playdv/#Makefile.am~	2010-02-15 14:49:06.000000000 -0500
-+++ libdv-1.0.0/playdv/Makefile.am	2010-02-15 14:49:06.000000000 -0500
-@@ -15,4 +15,4 @@ bin_PROGRAMS= playdv
- noinst_HEADERS=  display.h oss.h
- 
- playdv_SOURCES= playdv.c display.c display.h oss.c
--playdv_LDADD= $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB)
-+playdv_LDADD= $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB) -lX11 -lXext
diff --git a/main/libdv/libdv-1.0.0-gtk2.patch b/main/libdv/libdv-1.0.0-gtk2.patch
deleted file mode 100644
index ca93dc5544b..00000000000
--- a/main/libdv/libdv-1.0.0-gtk2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libdv-1.0.0/configure.ac.orig	2007-01-19 15:48:43.000000000 -0500
-+++ libdv-1.0.0/configure.ac	2007-01-19 15:50:08.000000000 -0500
-@@ -162,7 +162,7 @@
- dnl Checks for libraries.
- have_gtk="false"
- if $use_gtk; then
--	REQUIRES='glib >= 1.2.4 gtk+ >= 1.2.4'
-+	REQUIRES='glib-2.0 >= 2.1.0 gtk+-x11-2.0 >= 2.1.0'
- 	PKG_CHECK_MODULES(GTK,$REQUIRES,have_gtk="true",have_gtk="false")
- 	AC_DEFINE(HAVE_GTK)
- fi
diff --git a/main/libdv/libdv-1.0.0-pic.patch b/main/libdv/libdv-1.0.0-pic.patch
deleted file mode 100644
index 25cc11dca70..00000000000
--- a/main/libdv/libdv-1.0.0-pic.patch
+++ /dev/null
@@ -1,1634 +0,0 @@
-Patch downloaded from
-http://bugs.gentoo.org/show_bug.cgi?id=121871
-http://bugs.gentoo.org/attachment.cgi?id=98094
-
---- libdv-0.104-old/libdv/asm_common.S
-+++ libdv-0.104/libdv/asm_common.S
-@@ -0,0 +1,29 @@
-+/* public domain, do what you want */
-+
-+#ifdef __PIC__
-+# define MUNG(sym)                 sym##@GOTOFF(%ebp)
-+# define MUNG_ARR(sym, args...)    sym##@GOTOFF(%ebp,##args)
-+#else
-+# define MUNG(sym)                 sym
-+# define MUNG_ARR(sym, args...)    sym(,##args)
-+#endif
-+
-+#ifdef __PIC__
-+# undef __i686 /* gcc define gets in our way */
-+# define LOAD_PIC_REG(reg) \
-+	.ifndef  __i686.get_pc_thunk.reg; \
-+	.section .gnu.linkonce.t.__i686.get_pc_thunk.reg,"ax",@progbits; \
-+	.global  __i686.get_pc_thunk.reg; \
-+	.hidden  __i686.get_pc_thunk.reg; \
-+	.type    __i686.get_pc_thunk.reg,@function; \
-+	__i686.get_pc_thunk.reg: \
-+	movl (%esp), %e##reg; \
-+	ret; \
-+	.size __i686.get_pc_thunk.reg,.-__i686.get_pc_thunk.reg; \
-+	.previous; \
-+	.endif; \
-+	call __i686.get_pc_thunk.reg; \
-+	addl $_GLOBAL_OFFSET_TABLE_, %e##reg
-+#else
-+# define LOAD_PIC_REG(reg)
-+#endif
---- libdv-0.104-old/libdv/dct_block_mmx.S
-+++ libdv-0.104/libdv/dct_block_mmx.S
-@@ -53,19 +53,22 @@ scratch2:       .quad 0
- 
- .section .note.GNU-stack, "", @progbits
- 
-+#include "asm_common.S"
-+
- .text
- 
- .align 8	
- .global _dv_dct_88_block_mmx
- .hidden _dv_dct_88_block_mmx
- .type   _dv_dct_88_block_mmx,@function
- _dv_dct_88_block_mmx:
- 
- 	pushl   %ebp
--	movl    %esp, %ebp
- 	pushl   %esi
- 
--	movl    8(%ebp), %esi          # source
-+	LOAD_PIC_REG(bp)
-+
-+	movl    12(%esp), %esi          # source
- 
- # column 0
- 	movq 16*0(%esi), %mm0          # v0
-@@ -86,22 +91,22 @@ _dv_dct_88_block_mmx:
- 
- 	movq 16*3(%esi), %mm5          # v3
- 	movq 16*4(%esi), %mm7          # v4
--	movq  %mm7, scratch1           # scratch1: v4   ; 
-+	movq  %mm7, MUNG(scratch1)     # scratch1: v4   ; 
- 	movq  %mm5, %mm7               # duplicate v3 
--	paddw scratch1, %mm5           # v03: v3+v4  
--	psubw scratch1, %mm7           # v04: v3-v4  
--	movq  %mm5, scratch2           # scratch2: v03
-+	paddw MUNG(scratch1), %mm5     # v03: v3+v4  
-+	psubw MUNG(scratch1), %mm7     # v04: v3-v4  
-+	movq  %mm5, MUNG(scratch2)     # scratch2: v03
- 	movq  %mm0, %mm5               # mm5: v00
- 
--	paddw scratch2, %mm0           # v10: v00+v03   
--	psubw scratch2, %mm5           # v13: v00-v03   
--	movq  %mm3, scratch3           # scratch3: v02
-+	paddw MUNG(scratch2), %mm0     # v10: v00+v03   
-+	psubw MUNG(scratch2), %mm5     # v13: v00-v03   
-+	movq  %mm3, MUNG(scratch3)     # scratch3: v02
- 	movq  %mm1, %mm3               # duplicate v01
- 
--	paddw scratch3, %mm1          # v11: v01+v02
--	psubw scratch3, %mm3          # v12: v01-v02
-+	paddw MUNG(scratch3), %mm1    # v11: v01+v02
-+	psubw MUNG(scratch3), %mm3    # v12: v01-v02
- 
--	movq  %mm6, scratch4           # scratch4: v05
-+	movq  %mm6, MUNG(scratch4)     # scratch4: v05
- 	movq  %mm0, %mm6               # duplicate v10
- 
- 	paddw %mm1, %mm0              # v10+v11
-@@ -111,10 +116,10 @@ _dv_dct_88_block_mmx:
- 	movq  %mm6, 16*4(%esi)         # out4: v10-v11 
- 
- 	movq  %mm4, %mm0               # mm0: v06
--	paddw scratch4, %mm4          # v15: v05+v06 
-+	paddw MUNG(scratch4), %mm4    # v15: v05+v06 
- 	paddw  %mm2, %mm0             # v16: v07+v06
- 
--	pmulhw WA3, %mm4               # v35~: WA3*v15
-+	pmulhw MUNG(WA3), %mm4         # v35~: WA3*v15
- 	psllw  $1, %mm4                # v35: compensate the coeefient scale
- 
- 	movq   %mm4, %mm6              # duplicate v35
-@@ -123,7 +128,7 @@ _dv_dct_88_block_mmx:
- 
- 	paddw  %mm5, %mm3             # v22: v12+v13
- 
--	pmulhw WA1, %mm3               # v32~: WA1*v22
-+	pmulhw MUNG(WA1), %mm3         # v32~: WA1*v22
- 	psllw  $16-NSHIFT, %mm3        # v32: compensate the coeefient scale
- 	movq   %mm5, %mm6              # duplicate v13
- 
-@@ -134,13 +139,13 @@ _dv_dct_88_block_mmx:
- 	movq  %mm6, 16*6(%esi)         # out6: v13-v32 
- 
- 
--	paddw  scratch4, %mm7         # v14n: v04+v05
-+	paddw  MUNG(scratch4), %mm7   # v14n: v04+v05
- 	movq   %mm0, %mm5              # duplicate v16
- 
- 	psubw  %mm7, %mm0             # va1: v16-v14n
--	pmulhw WA5, %mm0               # va0~:  va1*WA5
--	pmulhw WA4, %mm5               # v36~~: v16*WA4
--	pmulhw WA2, %mm7               # v34~~: v14n*WA2
-+	pmulhw MUNG(WA5), %mm0         # va0~:  va1*WA5
-+	pmulhw MUNG(WA4), %mm5         # v36~~: v16*WA4
-+	pmulhw MUNG(WA2), %mm7         # v34~~: v14n*WA2
- 	psllw  $16-WA4_SHIFT, %mm5     # v36: compensate the coeefient scale 
- 	psllw  $16-NSHIFT, %mm7        # v34: compensate the coeefient scale
- 
-@@ -188,22 +193,22 @@ _dv_dct_88_block_mmx:
- 
- 	movq 16*3(%esi), %mm5              # v3
- 	movq 16*4(%esi), %mm7              # v4
--	movq  %mm7, scratch1                    # scratch1: v4   ; 
-+	movq  %mm7, MUNG(scratch1)     # scratch1: v4   ; 
- 	movq  %mm5, %mm7               # duplicate v3 
--	paddw scratch1, %mm5           # v03: v3+v4  
--	psubw scratch1, %mm7           # v04: v3-v4  
--	movq  %mm5, scratch2        # scratch2: v03
-+	paddw MUNG(scratch1), %mm5     # v03: v3+v4  
-+	psubw MUNG(scratch1), %mm7     # v04: v3-v4  
-+	movq  %mm5, MUNG(scratch2)     # scratch2: v03
- 	movq  %mm0, %mm5               # mm5: v00
- 
--	paddw scratch2, %mm0           # v10: v00+v03   
--	psubw scratch2, %mm5           # v13: v00-v03   
--	movq  %mm3, scratch3         # scratc3: v02
-+	paddw MUNG(scratch2), %mm0     # v10: v00+v03   
-+	psubw MUNG(scratch2), %mm5     # v13: v00-v03   
-+	movq  %mm3, MUNG(scratch3)     # scratc3: v02
- 	movq  %mm1, %mm3               # duplicate v01
- 
--	paddw scratch3, %mm1           # v11: v01+v02
--	psubw scratch3, %mm3           # v12: v01-v02
-+	paddw MUNG(scratch3), %mm1     # v11: v01+v02
-+	psubw MUNG(scratch3), %mm3     # v12: v01-v02
- 
--	movq  %mm6, scratch4         # scratc4: v05
-+	movq  %mm6, MUNG(scratch4)     # scratc4: v05
- 	movq  %mm0, %mm6               # duplicate v10
- 
- 	paddw %mm1, %mm0                            # v10+v11
-@@ -213,10 +218,10 @@ _dv_dct_88_block_mmx:
- 	movq  %mm6, 16*4(%esi)          # out4: v10-v11 
- 
- 	movq  %mm4, %mm0             # mm0: v06
--	paddw scratch4, %mm4         # v15: v05+v06 
-+	paddw MUNG(scratch4), %mm4     # v15: v05+v06 
- 	paddw  %mm2, %mm0                       # v16: v07+v06
- 
--	pmulhw WA3, %mm4           # v35~: WA3*v15
-+	pmulhw MUNG(WA3), %mm4         # v35~: WA3*v15
- 	psllw  $16-NSHIFT, %mm4       # v35: compensate the coeefient scale
- 
- 	movq   %mm4, %mm6            # duplicate v35
-@@ -225,7 +230,7 @@ _dv_dct_88_block_mmx:
- 
- 	paddw  %mm5, %mm3            # v22: v12+v13
- 
--	pmulhw WA1, %mm3           # v32~: WA3*v15
-+	pmulhw MUNG(WA1), %mm3         # v32~: WA3*v15
- 	psllw  $16-NSHIFT, %mm3       # v32: compensate the coeefient scale
- 	movq   %mm5, %mm6            # duplicate v13
- 
-@@ -235,13 +240,13 @@ _dv_dct_88_block_mmx:
- 	movq  %mm5, 16*2(%esi)          # out2: v13+v32 
- 	movq  %mm6, 16*6(%esi)          # out6: v13-v32 
- 
--	paddw  scratch4, %mm7                           # v14n: v04+v05
-+	paddw  MUNG(scratch4), %mm7     # v14n: v04+v05
- 	movq   %mm0, %mm5                               # duplicate v16
- 
- 	psubw  %mm7, %mm0                               # va1: v16-v14n
--	pmulhw WA2, %mm7                # v34~~: v14n*WA2
--	pmulhw WA5, %mm0                # va0~:  va1*WA5
--	pmulhw WA4, %mm5                        # v36~~: v16*WA4
-+	pmulhw MUNG(WA2), %mm7          # v34~~: v14n*WA2
-+	pmulhw MUNG(WA5), %mm0          # va0~:  va1*WA5
-+	pmulhw MUNG(WA4), %mm5          # v36~~: v16*WA4
- 	psllw  $16-NSHIFT, %mm7
- 	psllw  $16-WA4_SHIFT, %mm5      # v36: compensate the coeffient 
- 		# scale note that WA4 is shifted 1 bit less than the others
-@@ -748,11 +755,12 @@ _dv_dct_block_mmx_postscale_88:
- _dv_dct_248_block_mmx:
- 
- 	pushl   %ebp
--	movl    %esp, %ebp
- 	pushl   %esi
- 	pushl   %edi
- 
--	movl    8(%ebp), %esi          # source
-+	LOAD_PIC_REG(bp)
-+
-+	movl    16(%esp), %esi          # source
- 
- # column 0
- 
-@@ -779,7 +789,7 @@ _dv_dct_248_block_mmx:
- 	paddw %mm1, %mm0	       # v20: v10+v11
- 	psubw %mm1, %mm3	       # v21: v10-v11
- 
--	pmulhw WA1, %mm5               # v32~: WA1*v22
-+	pmulhw MUNG(WA1), %mm5         # v32~: WA1*v22
- 	movq  %mm4, %mm2	
- 	psllw  $16-NSHIFT, %mm5        # v32: compensate the coeffient scale
- 
-@@ -818,7 +828,7 @@ _dv_dct_248_block_mmx:
- 	paddw %mm1, %mm0	       # v20: v10+v11
- 	psubw %mm1, %mm3	       # v21: v10-v11
- 
--	pmulhw WA1, %mm5               # v32~: WA1*v22
-+	pmulhw MUNG(WA1), %mm5         # v32~: WA1*v22
- 	movq  %mm4, %mm2	
- 	psllw  $16-NSHIFT, %mm5        # v32: compensate the coeffient scale
- 
-@@ -855,7 +865,7 @@ _dv_dct_248_block_mmx:
- 	paddw %mm1, %mm0	       # v20: v10+v11
- 	psubw %mm1, %mm3	       # v21: v10-v11
- 
--	pmulhw WA1, %mm5               # v32~: WA1*v22
-+	pmulhw MUNG(WA1), %mm5         # v32~: WA1*v22
- 	movq  %mm4, %mm2	
- 	psllw  $16-NSHIFT, %mm5        # v32: compensate the coeffient scale
- 
-@@ -892,7 +902,7 @@ _dv_dct_248_block_mmx:
- 	paddw %mm1, %mm0	       # v20: v10+v11
- 	psubw %mm1, %mm3	       # v21: v10-v11
- 
--	pmulhw WA1, %mm5               # v32~: WA1*v22
-+	pmulhw MUNG(WA1), %mm5         # v32~: WA1*v22
- 	movq  %mm4, %mm2	
- 	psllw  $16-NSHIFT, %mm5        # v32: compensate the coeffient scale
- 
---- libdv-0.104-old/libdv/dv.c
-+++ libdv-0.104/libdv/dv.c
-@@ -205,6 +205,9 @@ dv_reconfigure(int clamp_luma, int clamp
- } /* dv_reconfigure */
- 
- 
-+extern uint8_t dv_quant_offset[4];
-+extern uint8_t dv_quant_shifts[22][4];
-+
- static inline void 
- dv_decode_macroblock(dv_decoder_t *dv, dv_macroblock_t *mb, unsigned int quality) {
-   int i;
-@@ -218,7 +221,7 @@ dv_decode_macroblock(dv_decoder_t *dv, d
-       dv_idct_248 (co248, mb->b[i].coeffs);
-     } else {
- #if ARCH_X86
--      _dv_quant_88_inverse_x86(mb->b[i].coeffs,mb->qno,mb->b[i].class_no);
-+      _dv_quant_88_inverse_x86(mb->b[i].coeffs,mb->qno,mb->b[i].class_no,dv_quant_offset,dv_quant_shifts);
-       _dv_idct_88(mb->b[i].coeffs);
- #elif ARCH_X86_64
-       _dv_quant_88_inverse_x86_64(mb->b[i].coeffs,mb->qno,mb->b[i].class_no);
-@@ -250,7 +253,7 @@ dv_decode_video_segment(dv_decoder_t *dv
- 	dv_idct_248 (co248, mb->b[b].coeffs);
-       } else {
- #if ARCH_X86
--	_dv_quant_88_inverse_x86(bl->coeffs,mb->qno,bl->class_no);
-+	_dv_quant_88_inverse_x86(bl->coeffs,mb->qno,bl->class_no,dv_quant_offset,dv_quant_shifts);
- 	_dv_weight_88_inverse(bl->coeffs);
- 	_dv_idct_88(bl->coeffs);
- #elif ARCH_X86_64
---- libdv-0.104-old/libdv/encode.c
-+++ libdv-0.104/libdv/encode.c
-@@ -521,7 +521,8 @@ static void reorder_block(dv_block_t *bl
- }
- 
- extern unsigned long _dv_vlc_encode_block_mmx(dv_coeff_t* coeffs,
--					  dv_vlc_entry_t ** out);
-+					  dv_vlc_entry_t ** out,
-+					  dv_vlc_entry_t * lookup);
- 
- extern unsigned long _dv_vlc_encode_block_mmx_x86_64(dv_coeff_t* coeffs,
- 					  dv_vlc_entry_t ** out);
-@@ -558,7 +559,7 @@ static unsigned long vlc_encode_block(dv
- #elif ARCH_X86
- 	int num_bits;
- 
--	num_bits = _dv_vlc_encode_block_mmx(coeffs, &o);
-+	num_bits = _dv_vlc_encode_block_mmx(coeffs, &o, vlc_encode_lookup);
- 	emms();
- #else
- 	int num_bits;
-@@ -574,7 +575,7 @@ static unsigned long vlc_encode_block(dv
- 	return num_bits;
- }
- 
--extern unsigned long _dv_vlc_num_bits_block_x86(dv_coeff_t* coeffs);
-+extern unsigned long _dv_vlc_num_bits_block_x86(dv_coeff_t* coeffs, unsigned char* lookup);
- extern unsigned long _dv_vlc_num_bits_block_x86_64(dv_coeff_t* coeffs);
- 
- extern unsigned long _dv_vlc_num_bits_block(dv_coeff_t* coeffs)
-@@ -600,7 +601,7 @@ extern unsigned long _dv_vlc_num_bits_bl
- #elif ARCH_X86_64
- 	return _dv_vlc_num_bits_block_x86_64(coeffs);
- #else
--	return _dv_vlc_num_bits_block_x86(coeffs);
-+	return _dv_vlc_num_bits_block_x86(coeffs, vlc_num_bits_lookup);
- #endif
- }
- 
---- libdv-0.104-old/libdv/encode_x86.S
-+++ libdv-0.104/libdv/encode_x86.S
-@@ -23,9 +23,6 @@
-  *  The libdv homepage is http://libdv.sourceforge.net/.  
-  */
- 
--.data
--ALLONE:		.word 1,1,1,1
--VLCADDMASK:	.byte 255,0,0,0,255,0,0,0
- 		
- 
- .section .note.GNU-stack, "", @progbits
-@@ -45,11 +43,14 @@ _dv_vlc_encode_block_mmx:	
- 
- 	movl	$63, %ecx
- 
--	movl	vlc_encode_lookup, %esi
-+	movl	4+4*4+8(%esp), %esi              # vlc_encode_lookup
- 
- 	pxor	%mm0, %mm0
- 	pxor	%mm2, %mm2
--	movq	VLCADDMASK, %mm1
-+	pushl	$0x000000FF                      # these four lines
-+	pushl	$0x000000FF                      # load VLCADDMASK
-+	movq	(%esp), %mm1                     # into %mm1 off the stack
-+	addl	$8, %esp                         #  --> no TEXTRELs
- 	xorl	%ebp, %ebp
- 	subl	$8, %edx
- vlc_encode_block_mmx_loop:
-@@ -121,7 +124,7 @@ _dv_vlc_num_bits_block_x86:	
- 	addl	$2, %edi
- 
- 	movl	$63, %ecx
--	movl	vlc_num_bits_lookup, %esi
-+	movl	4+4*4+4(%esp), %esi              # vlc_num_bits_lookup
- 	
- vlc_num_bits_block_x86_loop:
- 	movw	(%edi), %ax
-@@ -579,8 +590,11 @@ _dv_need_dct_248_mmx_rows:
- 	paddw	%mm5, %mm1
- 
- 	paddw	%mm1, %mm0
--	
--	pmaddwd	ALLONE, %mm0	
-+
-+	pushl	$0x00010001              # these four lines
-+	pushl	$0x00010001              # load ALLONE
-+	pmaddwd	(%esp), %mm0             # into %mm0 off the stack
-+	addl	$8, %esp                 #  --> no TEXTRELs
- 	movq	%mm0, %mm1
- 	psrlq	$32, %mm1
- 	paddd	%mm1, %mm0
---- libdv-0.104-old/libdv/idct_block_mmx.S
-+++ libdv-0.104/libdv/idct_block_mmx.S
-@@ -8,17 +8,21 @@
- 
- .section .note.GNU-stack, "", @progbits
- 
-+#include "asm_common.S"
-+
- .text
- 	.align 4
- .global _dv_idct_block_mmx
- .hidden _dv_idct_block_mmx
- .type   _dv_idct_block_mmx,@function
- _dv_idct_block_mmx:
- 	pushl	 %ebp
--	movl	 %esp,%ebp
- 	pushl	 %esi
--	leal	 preSC, %ecx
--	movl	 8(%ebp),%esi		/* source matrix */
-+
-+	LOAD_PIC_REG(bp)
-+
-+	leal	 MUNG(preSC), %ecx
-+	movl	 12(%esp),%esi		/* source matrix */
- 
- /* 
-  *	column 0: even part
-@@ -35,7 +41,7 @@ _dv_idct_block_mmx:
- 	movq %mm1, %mm2			/* added 11/1/96 */
- 	pmulhw 8*8(%esi),%mm5		/* V8 */
- 	psubsw %mm0, %mm1		/* V16 */
--	pmulhw x5a825a825a825a82, %mm1	/* 23170 ->V18 */
-+	pmulhw MUNG(x5a825a825a825a82), %mm1	/* 23170 ->V18 */
- 	paddsw %mm0, %mm2		/* V17 */
- 	movq %mm2, %mm0			/* duplicate V17 */
- 	psraw $1, %mm2			/* t75=t82 */
-@@ -76,7 +82,7 @@ _dv_idct_block_mmx:
- 	paddsw %mm0, %mm3		/* V29 ; free mm0 */
- 	movq %mm7, %mm1			/* duplicate V26 */
- 	psraw $1, %mm3			/* t91=t94 */
--	pmulhw x539f539f539f539f,%mm7	/* V33 */
-+	pmulhw MUNG(x539f539f539f539f),%mm7	/* V33 */
- 	psraw $1, %mm1			/* t96 */
- 	movq %mm5, %mm0			/* duplicate V2 */
- 	psraw $2, %mm4			/* t85=t87 */
-@@ -84,15 +90,15 @@ _dv_idct_block_mmx:
- 	psubsw %mm4, %mm0		/* V28 ; free mm4 */
- 	movq %mm0, %mm2			/* duplicate V28 */
- 	psraw $1, %mm5			/* t90=t93 */
--	pmulhw x4546454645464546,%mm0	/* V35 */
-+	pmulhw MUNG(x4546454645464546),%mm0	/* V35 */
- 	psraw $1, %mm2			/* t97 */
- 	movq %mm5, %mm4			/* duplicate t90=t93 */
- 	psubsw %mm2, %mm1		/* V32 ; free mm2 */
--	pmulhw x61f861f861f861f8,%mm1	/* V36 */
-+	pmulhw MUNG(x61f861f861f861f8),%mm1	/* V36 */
- 	psllw $1, %mm7			/* t107 */
- 	paddsw %mm3, %mm5		/* V31 */
- 	psubsw %mm3, %mm4		/* V30 ; free mm3 */
--	pmulhw x5a825a825a825a82,%mm4	/* V34 */
-+	pmulhw MUNG(x5a825a825a825a82),%mm4	/* V34 */
- 	nop
- 	psubsw %mm1, %mm0		/* V38 */
- 	psubsw %mm7, %mm1		/* V37 ; free mm7 */
-@@ -159,7 +165,7 @@ _dv_idct_block_mmx:
- 	psubsw %mm7, %mm1		/* V50 */
- 	pmulhw 8*9(%esi), %mm5		/* V9 */
- 	paddsw %mm7, %mm2		/* V51 */
--	pmulhw x5a825a825a825a82, %mm1	/* 23170 ->V52 */
-+	pmulhw MUNG(x5a825a825a825a82), %mm1	/* 23170 ->V52 */
- 	movq %mm2, %mm6			/* duplicate V51 */
- 	psraw $1, %mm2			/* t138=t144 */
- 	movq %mm3, %mm4			/* duplicate V1 */
-@@ -200,11 +206,11 @@ _dv_idct_block_mmx:
-  * even more by doing the correction step in a later stage when the number
-  * is actually multiplied by 16
-  */
--	paddw x0005000200010001, %mm4
-+	paddw MUNG(x0005000200010001), %mm4
- 	psubsw %mm6, %mm3		/* V60 ; free mm6 */
- 	psraw $1, %mm0			/* t154=t156 */
- 	movq %mm3, %mm1			/* duplicate V60 */
--	pmulhw x539f539f539f539f, %mm1	/* V67 */
-+	pmulhw MUNG(x539f539f539f539f), %mm1	/* V67 */
- 	movq %mm5, %mm6			/* duplicate V3 */
- 	psraw $2, %mm4			/* t148=t150 */
- 	paddsw %mm4, %mm5		/* V61 */
-@@ -213,13 +219,13 @@ _dv_idct_block_mmx:
- 	psllw $1, %mm1			/* t169 */
- 	paddsw %mm0, %mm5		/* V65 -> result */
- 	psubsw %mm0, %mm4		/* V64 ; free mm0 */
--	pmulhw x5a825a825a825a82, %mm4	/* V68 */
-+	pmulhw MUNG(x5a825a825a825a82), %mm4	/* V68 */
- 	psraw $1, %mm3			/* t158 */
- 	psubsw %mm6, %mm3		/* V66 */
- 	movq %mm5, %mm2			/* duplicate V65 */
--	pmulhw x61f861f861f861f8, %mm3	/* V70 */
-+	pmulhw MUNG(x61f861f861f861f8), %mm3	/* V70 */
- 	psllw $1, %mm6			/* t165 */
--	pmulhw x4546454645464546, %mm6	/* V69 */
-+	pmulhw MUNG(x4546454645464546), %mm6	/* V69 */
- 	psraw $1, %mm2			/* t172 */
- /* moved from next block */
- 	movq 8*5(%esi), %mm0		/* V56 */
-@@ -344,7 +350,7 @@ _dv_idct_block_mmx:
- *	movq 8*13(%esi), %mm4		tmt13
- */
- 	psubsw %mm4, %mm3		/* V134 */
--	pmulhw x5a825a825a825a82, %mm3	/* 23170 ->V136 */
-+	pmulhw MUNG(x5a825a825a825a82), %mm3	/* 23170 ->V136 */
- 	movq 8*9(%esi), %mm6		/* tmt9 */
- 	paddsw %mm4, %mm5		/* V135 ; mm4 free */
- 	movq %mm0, %mm4			/* duplicate tmt1 */
-@@ -373,17 +379,17 @@ _dv_idct_block_mmx:
- 	psubsw %mm7, %mm0		/* V144 */
- 	movq %mm0, %mm3			/* duplicate V144 */
- 	paddsw %mm7, %mm2		/* V147 ; free mm7 */
--	pmulhw x539f539f539f539f, %mm0	/* 21407-> V151 */
-+	pmulhw MUNG(x539f539f539f539f), %mm0	/* 21407-> V151 */
- 	movq %mm1, %mm7			/* duplicate tmt3 */
- 	paddsw %mm5, %mm7		/* V145 */
- 	psubsw %mm5, %mm1		/* V146 ; free mm5 */
- 	psubsw %mm1, %mm3		/* V150 */
- 	movq %mm7, %mm5			/* duplicate V145 */
--	pmulhw x4546454645464546, %mm1	/* 17734-> V153 */
-+	pmulhw MUNG(x4546454645464546), %mm1	/* 17734-> V153 */
- 	psubsw %mm2, %mm5		/* V148 */
--	pmulhw x61f861f861f861f8, %mm3	/* 25080-> V154 */
-+	pmulhw MUNG(x61f861f861f861f8), %mm3	/* 25080-> V154 */
- 	psllw $2, %mm0			/* t311 */
--	pmulhw x5a825a825a825a82, %mm5	/* 23170-> V152 */
-+	pmulhw MUNG(x5a825a825a825a82), %mm5	/* 23170-> V152 */
- 	paddsw %mm2, %mm7		/* V149 ; free mm2 */
- 	psllw $1, %mm1			/* t313 */
- 	nop	/* without the nop - freeze here for one clock */
-@@ -409,7 +415,7 @@ _dv_idct_block_mmx:
- 	paddsw %mm3, %mm6		/* V164 ; free mm3 */
- 	movq %mm4, %mm3			/* duplicate V142 */
- 	psubsw %mm5, %mm4		/* V165 ; free mm5 */
--	movq %mm2, scratch7		/* out7 */
-+	movq %mm2, MUNG(scratch7)		/* out7 */
- 	psraw $4, %mm6
- 	psraw $4, %mm4
- 	paddsw %mm5, %mm3		/* V162 */
-@@ -420,11 +426,11 @@ _dv_idct_block_mmx:
-  */
- 	movq %mm6, 8*9(%esi)		/* out9 */
- 	paddsw %mm1, %mm0		/* V161 */
--	movq %mm3, scratch5		/* out5 */
-+	movq %mm3, MUNG(scratch5)		/* out5 */
- 	psubsw %mm1, %mm5		/* V166 ; free mm1 */
- 	movq %mm4, 8*11(%esi)		/* out11 */
- 	psraw $4, %mm5
--	movq %mm0, scratch3		/* out3 */
-+	movq %mm0, MUNG(scratch3)		/* out3 */
- 	movq %mm2, %mm4			/* duplicate V140 */
- 	movq %mm5, 8*13(%esi)		/* out13 */
- 	paddsw %mm7, %mm2		/* V160 */
-@@ -434,7 +440,7 @@ _dv_idct_block_mmx:
- /* moved from the next block */
- 	movq 8*3(%esi), %mm7
- 	psraw $4, %mm4
--	movq %mm2, scratch1		/* out1 */
-+	movq %mm2, MUNG(scratch1)		/* out1 */
- /* moved from the next block */
- 	movq %mm0, %mm1
- 	movq %mm4, 8*15(%esi)		/* out15 */
-@@ -491,15 +497,15 @@ _dv_idct_block_mmx:
- 	paddsw %mm4, %mm3		/* V113 ; free mm4 */
- 	movq %mm0, %mm4			/* duplicate V110 */
- 	paddsw %mm1, %mm2		/* V111 */
--	pmulhw x539f539f539f539f, %mm0	/* 21407-> V117 */
-+	pmulhw MUNG(x539f539f539f539f), %mm0	/* 21407-> V117 */
- 	psubsw %mm1, %mm5		/* V112 ; free mm1 */
- 	psubsw %mm5, %mm4		/* V116 */
- 	movq %mm2, %mm1			/* duplicate V111 */
--	pmulhw x4546454645464546, %mm5	/* 17734-> V119 */
-+	pmulhw MUNG(x4546454645464546), %mm5	/* 17734-> V119 */
- 	psubsw %mm3, %mm2		/* V114 */
--	pmulhw x61f861f861f861f8, %mm4	/* 25080-> V120 */
-+	pmulhw MUNG(x61f861f861f861f8), %mm4	/* 25080-> V120 */
- 	paddsw %mm3, %mm1		/* V115 ; free mm3 */
--	pmulhw x5a825a825a825a82, %mm2	/* 23170-> V118 */
-+	pmulhw MUNG(x5a825a825a825a82), %mm2	/* 23170-> V118 */
- 	psllw $2, %mm0			/* t266 */
- 	movq %mm1, (%esi)		/* save V115 */
- 	psllw $1, %mm5			/* t268 */
-@@ -517,7 +523,7 @@ _dv_idct_block_mmx:
- 	movq %mm6, %mm3			/* duplicate tmt4 */
- 	psubsw %mm0, %mm6		/* V100 */
- 	paddsw %mm0, %mm3		/* V101 ; free mm0 */
--	pmulhw x5a825a825a825a82, %mm6	/* 23170 ->V102 */
-+	pmulhw MUNG(x5a825a825a825a82), %mm6	/* 23170 ->V102 */
- 	movq %mm7, %mm5			/* duplicate tmt0 */
- 	movq 8*8(%esi), %mm1		/* tmt8 */
- 	paddsw %mm1, %mm7		/* V103 */
-@@ -551,10 +557,10 @@ _dv_idct_block_mmx:
- 	movq 8*2(%esi), %mm3		/* V123 */
- 	paddsw %mm4, %mm7		/* out0 */
- /* moved up from next block */
--	movq scratch3, %mm0
-+	movq MUNG(scratch3), %mm0
- 	psraw $4, %mm7
- /* moved up from next block */
--	movq scratch5, %mm6 
-+	movq MUNG(scratch5), %mm6 
- 	psubsw %mm4, %mm1		/* out14 ; free mm4 */
- 	paddsw %mm3, %mm5		/* out2 */
- 	psraw $4, %mm1
-@@ -565,7 +571,7 @@ _dv_idct_block_mmx:
- 	movq %mm5, 8*2(%esi)		/* out2 ; free mm5 */
- 	psraw $4, %mm2
- /* moved up to the prev block */
--	movq scratch7, %mm4
-+	movq MUNG(scratch7), %mm4
- /* moved up to the prev block */
- 	psraw $4, %mm0
- 	movq %mm2, 8*12(%esi)		/* out12 ; free mm2 */
-@@ -579,7 +585,7 @@ _dv_idct_block_mmx:
-  *	psraw $4, %mm0
-  *	psraw $4, %mm6
- */
--	movq scratch1, %mm1
-+	movq MUNG(scratch1), %mm1
- 	psraw $4, %mm4
- 	movq %mm0, 8*3(%esi)		/* out3 */
- 	psraw $4, %mm1
---- libdv-0.104-old/libdv/parse.c
-+++ libdv-0.104/libdv/parse.c
-@@ -477,6 +477,13 @@ dv_parse_ac_coeffs(dv_videosegment_t *se
-   exit(0);
- #endif
- } /* dv_parse_ac_coeffs */
-+#if defined __GNUC__ && __ELF__
-+# define dv_strong_hidden_alias(name, aliasname) \
-+    extern __typeof (name) aliasname __attribute__ ((alias (#name), visibility ("hidden")))
-+dv_strong_hidden_alias(dv_parse_ac_coeffs, asm_dv_parse_ac_coeffs);
-+#else
-+int asm_dv_parse_ac_coeffs(dv_videosegment_t *seg) { return dv_parse_ac_coeffs(seg); }
-+#endif
- 
- /* ---------------------------------------------------------------------------
-  */
---- libdv-0.104-old/libdv/quant.c
-+++ libdv-0.104/libdv/quant.c
-@@ -144,7 +144,7 @@ uint8_t  dv_quant_offset[4] = { 6,3,0,1 
- uint32_t	dv_quant_248_mul_tab [2] [22] [64];
- uint32_t dv_quant_88_mul_tab [2] [22] [64];
- 
--extern void             _dv_quant_x86(dv_coeff_t *block,int qno,int klass);
-+extern void             _dv_quant_x86(dv_coeff_t *block,int qno,int klass,uint8_t *dv_quant_offset,uint8_t *dv_quant_shifts);
- extern void             _dv_quant_x86_64(dv_coeff_t *block,int qno,int klass);
- static void quant_248_inverse_std(dv_coeff_t *block,int qno,int klass,dv_248_coeff_t *co);
- static void quant_248_inverse_mmx(dv_coeff_t *block,int qno,int klass,dv_248_coeff_t *co);
-@@ -210,7 +210,7 @@ void _dv_quant(dv_coeff_t *block,int qno
- 		_dv_quant_x86_64(block, qno, klass);
- 		emms();
- #else
--		_dv_quant_x86(block, qno, klass);
-+		_dv_quant_x86(block, qno, klass, dv_quant_offset, dv_quant_shifts);
- 		emms();
- #endif
- 	}
---- libdv-0.104-old/libdv/quant.h
-+++ libdv-0.104/libdv/quant.h
-@@ -27,7 +27,7 @@ extern void _dv_quant(dv_coeff_t *block,
- extern void _dv_quant_88_inverse(dv_coeff_t *block,int qno,int klass);
- extern void (*_dv_quant_248_inverse) (dv_coeff_t *block,int qno,int klass,
-                                   dv_248_coeff_t *co);
--extern void _dv_quant_88_inverse_x86(dv_coeff_t *block,int qno,int klass);
-+extern void _dv_quant_88_inverse_x86(dv_coeff_t *block,int qno,int klass, uint8_t *offset, uint8_t *shifts);
- extern void _dv_quant_88_inverse_x86_64(dv_coeff_t *block,int qno,int klass);
- extern void dv_quant_init (void);
- #ifdef __cplusplus
---- libdv-0.104-old/libdv/quant_x86.S
-+++ libdv-0.104/libdv/quant_x86.S
-@@ -71,10 +73,13 @@ _dv_quant_88_inverse_x86:	
- 	
- 	/*  pq = dv_quant_shifts[qno + dv_quant_offset[class]]; */
- 	movl	ARGn(1),%eax	/* qno */
-+	movl	ARGn(3),%ebx	/* dv_quant_offset */
-+	addl	ARGn(2),%ebx	/* class */
-+	movzbl	(%ebx),%ecx
- 	movl	ARGn(2),%ebx	/* class */
--	movzbl	dv_quant_offset(%ebx),%ecx
- 	addl	%ecx,%eax
--	leal	dv_quant_shifts(,%eax,4),%edx	/* edx is pq */
-+	movl	ARGn(4),%edx	/* dv_quant_shifts */
-+	leal	(%edx,%eax,4),%edx	/* edx is pq */
- 
- 	/* extra = (class == 3); */
- 				/*  0   1   2   3 */
-@@ -212,11 +219,13 @@ _dv_quant_x86:	
- 	
- 	/*  pq = dv_quant_shifts[qno + dv_quant_offset[class]]; */
- 	movl	ARGn(1),%eax	/* qno */
-+	movl	ARGn(3),%ebx	/* offset */
-+	addl	ARGn(2),%ebx	/* class */
-+	movzbl	(%ebx),%ecx
- 	movl	ARGn(2),%ebx	/* class */
--
--	movzbl	dv_quant_offset(%ebx),%ecx
-+	movl	ARGn(4),%edx	/* shifts */
- 	addl	%ecx,%eax
--	leal	dv_quant_shifts(,%eax,4),%edx	/* edx is pq */
-+	leal	(%edx,%eax,4),%edx	/* edx is pq */
- 
- 	/* extra = (class == 3); */
- 				/*  0   1   2   3 */
---- libdv-0.104-old/libdv/rgbtoyuv.S
-+++ libdv-0.104/libdv/rgbtoyuv.S
-@@ -41,9 +41,6 @@
- #define DV_WIDTH_SHORT_HALF 720
- #define DV_WIDTH_BYTE_HALF  360	
- 		
--.global _dv_rgbtoycb_mmx
--# .global yuvtoycb_mmx
--
- .data
- 
- .align 8
-@@ -110,25 +107,26 @@ VR0GR:  .long   0,0
- VBG0B:  .long   0,0
- 	
- #endif	
--	
-+
-+#include "asm_common.S"
-+
- .section .note.GNU-stack, "", @progbits
- 
- .text
- 
--#define _inPtr     8
--#define _rows      12
--#define _columns   16
--#define _outyPtr   20
--#define _outuPtr   24
--#define _outvPtr   28
-+#define _inPtr     24+8
-+#define _rows      24+12
-+#define _columns   24+16
-+#define _outyPtr   24+20
-+#define _outuPtr   24+24
-+#define _outvPtr   24+28
- 
- .global _dv_rgbtoycb_mmx
- .hidden _dv_rgbtoycb_mmx
- .type   _dv_rgbtoycb_mmx,@function
- _dv_rgbtoycb_mmx:
- 
- 	pushl   %ebp
--	movl    %esp, %ebp
- 	pushl   %eax
- 	pushl   %ebx
- 	pushl   %ecx
-@@ -131,46 +132,47 @@ _dv_rgbtoycb_mmx:
- 	pushl   %esi
- 	pushl   %edi
- 
--	leal    ZEROSX, %eax    #This section gets around a bug
-+	LOAD_PIC_REG(bp)
-+
-+	leal    MUNG(ZEROSX), %eax    #This section gets around a bug
- 	movq    (%eax), %mm0    #unlikely to persist
--	movq    %mm0, ZEROS
--	leal    OFFSETDX, %eax
-+	movq    %mm0, MUNG(ZEROS)
-+	leal    MUNG(OFFSETDX), %eax
- 	movq    (%eax), %mm0
--	movq    %mm0, OFFSETD
--	leal    OFFSETWX, %eax
-+	movq    %mm0, MUNG(OFFSETD)
-+	leal    MUNG(OFFSETWX), %eax
- 	movq    (%eax), %mm0
--	movq    %mm0, OFFSETW
--	leal    OFFSETBX, %eax
-+	movq    %mm0, MUNG(OFFSETW)
-+	leal    MUNG(OFFSETBX), %eax
- 	movq    (%eax), %mm0
--	movq    %mm0, OFFSETB
--	leal    YR0GRX, %eax
-+	movq    %mm0, MUNG(OFFSETB)
-+	leal    MUNG(YR0GRX), %eax
- 	movq    (%eax), %mm0
--	movq    %mm0, YR0GR
--	leal    YBG0BX, %eax
-+	movq    %mm0, MUNG(YR0GR)
-+	leal    MUNG(YBG0BX), %eax
- 	movq    (%eax), %mm0
--	movq    %mm0, YBG0B
--	leal    UR0GRX, %eax
-+	movq    %mm0, MUNG(YBG0B)
-+	leal    MUNG(UR0GRX), %eax
- 	movq    (%eax), %mm0
--	movq    %mm0, UR0GR
--	leal    UBG0BX, %eax
-+	movq    %mm0, MUNG(UR0GR)
-+	leal    MUNG(UBG0BX), %eax
- 	movq    (%eax), %mm0
--	movq    %mm0, UBG0B
--	leal    VR0GRX, %eax
-+	movq    %mm0, MUNG(UBG0B)
-+	leal    MUNG(VR0GRX), %eax
- 	movq    (%eax), %mm0
--	movq    %mm0, VR0GR
--	leal    VBG0BX, %eax
-+	movq    %mm0, MUNG(VR0GR)
-+	leal    MUNG(VBG0BX), %eax
- 	movq    (%eax), %mm0
--	movq    %mm0, VBG0B
--	
--	movl    _rows(%ebp), %eax
--	movl    _columns(%ebp), %ebx
-+	movq    %mm0, MUNG(VBG0B)
-+	movl    _rows(%esp), %eax
-+	movl    _columns(%esp), %ebx
- 	mull    %ebx            #number pixels
- 	shrl    $3, %eax        #number of loops
- 	movl    %eax, %edi      #loop counter in edi
--	movl    _inPtr(%ebp), %eax
--	movl    _outyPtr(%ebp), %ebx
--	movl    _outuPtr(%ebp), %ecx
--	movl    _outvPtr(%ebp), %edx
-+	movl    _inPtr(%esp), %eax
-+	movl    _outyPtr(%esp), %ebx
-+	movl    _outuPtr(%esp), %ecx
-+	movl    _outvPtr(%esp), %edx
- rgbtoycb_mmx_loop: 
- 	movq    (%eax), %mm1    #load G2R2B1G1R1B0G0R0
- 	pxor    %mm6, %mm6      #0 -> mm6
-@@ -184,29 +186,29 @@ rgbtoycb_mmx_loop: 
- 	punpcklbw %mm6, %mm1     #B1G1R1B0 -> mm1
- 	movq    %mm0, %mm2      #R1B0G0R0 -> mm2
- 
--	pmaddwd YR0GR, %mm0     #yrR1,ygG0+yrR0 -> mm0
-+	pmaddwd MUNG(YR0GR), %mm0     #yrR1,ygG0+yrR0 -> mm0
- 	movq    %mm1, %mm3      #B1G1R1B0 -> mm3
- 
--	pmaddwd YBG0B, %mm1     #ybB1+ygG1,ybB0 -> mm1
-+	pmaddwd MUNG(YBG0B), %mm1     #ybB1+ygG1,ybB0 -> mm1
- 	movq    %mm2, %mm4      #R1B0G0R0 -> mm4
- 
--	pmaddwd UR0GR, %mm2     #urR1,ugG0+urR0 -> mm2
-+	pmaddwd MUNG(UR0GR), %mm2     #urR1,ugG0+urR0 -> mm2
- 	movq    %mm3, %mm5      #B1G1R1B0 -> mm5
- 
--	pmaddwd UBG0B, %mm3     #ubB1+ugG1,ubB0 -> mm3
-+	pmaddwd MUNG(UBG0B), %mm3     #ubB1+ugG1,ubB0 -> mm3
- 	punpckhbw       %mm6, %mm7 #    00G2R2 -> mm7
- 
--	pmaddwd VR0GR, %mm4     #vrR1,vgG0+vrR0 -> mm4
-+	pmaddwd MUNG(VR0GR), %mm4     #vrR1,vgG0+vrR0 -> mm4
- 	paddd   %mm1, %mm0      #Y1Y0 -> mm0
- 
--	pmaddwd VBG0B, %mm5     #vbB1+vgG1,vbB0 -> mm5
-+	pmaddwd MUNG(VBG0B), %mm5     #vbB1+vgG1,vbB0 -> mm5
- 
- 	movq    8(%eax), %mm1   #R5B4G4R4B3G3R3B2 -> mm1
- 	paddd   %mm3, %mm2      #U1U0 -> mm2
- 
- 	movq    %mm1, %mm6      #R5B4G4R4B3G3R3B2 -> mm6
- 
--	punpcklbw       ZEROS, %mm1     #B3G3R3B2 -> mm1
-+	punpcklbw       MUNG(ZEROS), %mm1     #B3G3R3B2 -> mm1
- 	paddd   %mm5, %mm4      #V1V0 -> mm4
- 
- 	movq    %mm1, %mm5      #B3G3R3B2 -> mm5
-@@ -214,29 +216,29 @@ rgbtoycb_mmx_loop: 
- 
- 	paddd   %mm7, %mm1      #R3B200+00G2R2=R3B2G2R2->mm1
- 
--	punpckhbw       ZEROS, %mm6     #R5B4G4R3 -> mm6
-+	punpckhbw       MUNG(ZEROS), %mm6     #R5B4G4R3 -> mm6
- 	movq    %mm1, %mm3      #R3B2G2R2 -> mm3
- 
--	pmaddwd YR0GR, %mm1     #yrR3,ygG2+yrR2 -> mm1
-+	pmaddwd MUNG(YR0GR), %mm1     #yrR3,ygG2+yrR2 -> mm1
- 	movq    %mm5, %mm7      #B3G3R3B2 -> mm7
- 
--	pmaddwd YBG0B, %mm5     #ybB3+ygG3,ybB2 -> mm5
-+	pmaddwd MUNG(YBG0B), %mm5     #ybB3+ygG3,ybB2 -> mm5
- 	psrad   $FIXPSHIFT, %mm0       #32-bit scaled Y1Y0 -> mm0
- 
--	movq    %mm6, TEMP0     #R5B4G4R4 -> TEMP0
-+	movq    %mm6, MUNG(TEMP0)     #R5B4G4R4 -> TEMP0
- 	movq    %mm3, %mm6      #R3B2G2R2 -> mm6
--	pmaddwd UR0GR, %mm6     #urR3,ugG2+urR2 -> mm6
-+	pmaddwd MUNG(UR0GR), %mm6     #urR3,ugG2+urR2 -> mm6
- 	psrad   $FIXPSHIFT, %mm2       #32-bit scaled U1U0 -> mm2
- 
- 	paddd   %mm5, %mm1      #Y3Y2 -> mm1
- 	movq    %mm7, %mm5      #B3G3R3B2 -> mm5
--	pmaddwd UBG0B, %mm7     #ubB3+ugG3,ubB2
-+	pmaddwd MUNG(UBG0B), %mm7     #ubB3+ugG3,ubB2
- 	psrad   $FIXPSHIFT, %mm1 #32-bit scaled Y3Y2 -> mm1
- 
--	pmaddwd VR0GR, %mm3     #vrR3,vgG2+vgR2
-+	pmaddwd MUNG(VR0GR), %mm3     #vrR3,vgG2+vgR2
- 	packssdw        %mm1, %mm0      #Y3Y2Y1Y0 -> mm0
- 
--	pmaddwd VBG0B, %mm5     #vbB3+vgG3,vbB2 -> mm5
-+	pmaddwd MUNG(VBG0B), %mm5     #vbB3+vgG3,vbB2 -> mm5
- 	psrad   $FIXPSHIFT, %mm4       #32-bit scaled V1V0 -> mm4
- 
- 	movq    16(%eax), %mm1  #B7G7R7B6G6R6B5G5 -> mm7
-@@ -251,58 +253,58 @@ rgbtoycb_mmx_loop: 
- 	movq    %mm7, %mm5      #R7B6G6R6B5G500 -> mm5
- 	psrad   $FIXPSHIFT, %mm3       #32-bit scaled V3V2 -> mm3
- 
--	paddw	OFFSETY, %mm0
-+	paddw	MUNG(OFFSETY), %mm0
- 	movq    %mm0, (%ebx)     #store Y3Y2Y1Y0 
- 	packssdw %mm6, %mm2      #32-bit scaled U3U2U1U0 -> mm2
- 
--	movq    TEMP0, %mm0     #R5B4G4R4 -> mm0
-+	movq    MUNG(TEMP0), %mm0     #R5B4G4R4 -> mm0
- 	addl	$8, %ebx
--	
--	punpcklbw       ZEROS, %mm7     #B5G500 -> mm7
-+
-+	punpcklbw       MUNG(ZEROS), %mm7     #B5G500 -> mm7
- 	movq    %mm0, %mm6      #R5B4G4R4 -> mm6
- 
--	movq    %mm2, TEMPU     #32-bit scaled U3U2U1U0 -> TEMPU
-+	movq    %mm2, MUNG(TEMPU)     #32-bit scaled U3U2U1U0 -> TEMPU
- 	psrlq   $32, %mm0       #00R5B4 -> mm0
- 
- 	paddw   %mm0, %mm7      #B5G5R5B4 -> mm7
- 	movq    %mm6, %mm2      #B5B4G4R4 -> mm2
- 
--	pmaddwd YR0GR, %mm2     #yrR5,ygG4+yrR4 -> mm2
-+	pmaddwd MUNG(YR0GR), %mm2     #yrR5,ygG4+yrR4 -> mm2
- 	movq    %mm7, %mm0      #B5G5R5B4 -> mm0
- 
--	pmaddwd YBG0B, %mm7     #ybB5+ygG5,ybB4 -> mm7
-+	pmaddwd MUNG(YBG0B), %mm7     #ybB5+ygG5,ybB4 -> mm7
- 	packssdw        %mm3, %mm4      #32-bit scaled V3V2V1V0 -> mm4
- 
- 	addl    $24, %eax       #increment RGB count
- 
--	movq    %mm4, TEMPV     #(V3V2V1V0)/256 -> mm4
-+	movq    %mm4, MUNG(TEMPV)     #(V3V2V1V0)/256 -> mm4
- 	movq    %mm6, %mm4      #B5B4G4R4 -> mm4
- 
--	pmaddwd UR0GR, %mm6     #urR5,ugG4+urR4
-+	pmaddwd MUNG(UR0GR), %mm6     #urR5,ugG4+urR4
- 	movq    %mm0, %mm3      #B5G5R5B4 -> mm0
- 
--	pmaddwd UBG0B, %mm0     #ubB5+ugG5,ubB4
-+	pmaddwd MUNG(UBG0B), %mm0     #ubB5+ugG5,ubB4
- 	paddd   %mm7, %mm2      #Y5Y4 -> mm2
- 
--	pmaddwd         VR0GR, %mm4     #vrR5,vgG4+vrR4 -> mm4
-+	pmaddwd         MUNG(VR0GR), %mm4     #vrR5,vgG4+vrR4 -> mm4
- 	pxor    %mm7, %mm7      #0 -> mm7
- 
--	pmaddwd VBG0B, %mm3     #vbB5+vgG5,vbB4 -> mm3
-+	pmaddwd MUNG(VBG0B), %mm3     #vbB5+vgG5,vbB4 -> mm3
- 	punpckhbw       %mm7, %mm1      #B7G7R7B6 -> mm1
- 
- 	paddd   %mm6, %mm0      #U5U4 -> mm0
- 	movq    %mm1, %mm6      #B7G7R7B6 -> mm6
- 
--	pmaddwd YBG0B, %mm6     #ybB7+ygG7,ybB6 -> mm6
-+	pmaddwd MUNG(YBG0B), %mm6     #ybB7+ygG7,ybB6 -> mm6
- 	punpckhbw       %mm7, %mm5      #R7B6G6R6 -> mm5
- 
- 	movq    %mm5, %mm7      #R7B6G6R6 -> mm7
- 	paddd   %mm4, %mm3      #V5V4 -> mm3
- 
--	pmaddwd YR0GR, %mm5     #yrR7,ygG6+yrR6 -> mm5
-+	pmaddwd MUNG(YR0GR), %mm5     #yrR7,ygG6+yrR6 -> mm5
- 	movq    %mm1, %mm4      #B7G7R7B6 -> mm4
- 
--	pmaddwd UBG0B, %mm4     #ubB7+ugG7,ubB6 -> mm4
-+	pmaddwd MUNG(UBG0B), %mm4     #ubB7+ugG7,ubB6 -> mm4
- 	psrad   $FIXPSHIFT, %mm0       #32-bit scaled U5U4 -> mm0
- 
- 	psrad   $FIXPSHIFT, %mm2       #32-bit scaled Y5Y4 -> mm2
-@@ -310,25 +312,25 @@ rgbtoycb_mmx_loop: 
- 	paddd   %mm5, %mm6      #Y7Y6 -> mm6
- 	movq    %mm7, %mm5      #R7B6G6R6 -> mm5
- 
--	pmaddwd UR0GR, %mm7     #urR7,ugG6+ugR6 -> mm7
-+	pmaddwd MUNG(UR0GR), %mm7     #urR7,ugG6+ugR6 -> mm7
- 	psrad   $FIXPSHIFT, %mm3       #32-bit scaled V5V4 -> mm3
- 
--	pmaddwd VBG0B, %mm1     #vbB7+vgG7,vbB6 -> mm1
-+	pmaddwd MUNG(VBG0B), %mm1     #vbB7+vgG7,vbB6 -> mm1
- 	psrad   $FIXPSHIFT, %mm6 #32-bit scaled Y7Y6 -> mm6
- 
- 	packssdw %mm6, %mm2     #Y7Y6Y5Y4 -> mm2
- 
--	pmaddwd VR0GR, %mm5     #vrR7,vgG6+vrR6 -> mm5
-+	pmaddwd MUNG(VR0GR), %mm5     #vrR7,vgG6+vrR6 -> mm5
- 	paddd   %mm4, %mm7      #U7U6 -> mm7    
- 
- 	psrad   $FIXPSHIFT, %mm7       #32-bit scaled U7U6 -> mm7
--	paddw	OFFSETY, %mm2
-+	paddw	MUNG(OFFSETY), %mm2
- 	movq	%mm2, (%ebx)    #store Y7Y6Y5Y4 
- 
--	movq	ALLONE, %mm6
-+	movq	MUNG(ALLONE), %mm6
- 	packssdw %mm7, %mm0     #32-bit scaled U7U6U5U4 -> mm0
- 
--	movq    TEMPU, %mm4     #32-bit scaled U3U2U1U0 -> mm4
-+	movq    MUNG(TEMPU), %mm4     #32-bit scaled U3U2U1U0 -> mm4
- 	pmaddwd	%mm6, %mm0      #U7U6U5U4 averaged -> (U7U6)(U5U4)=UU3 UU2->mm0
- 	
- 	pmaddwd	%mm6, %mm4      #U3U2U1U0 averaged -> (U3U2)(U1U0)=UU1 UU0->mm4
-@@ -338,8 +340,8 @@ rgbtoycb_mmx_loop: 
- 
- 	psrad   $FIXPSHIFT, %mm1       #32-bit scaled V7V6 -> mm1
- 	psraw	$1, %mm4 	#divide UU3 UU2 UU1 UU0 by 2 -> mm4
--		
--	movq    TEMPV, %mm5     #32-bit scaled V3V2V1V0 -> mm5
-+
-+	movq    MUNG(TEMPV), %mm5     #32-bit scaled V3V2V1V0 -> mm5
- 
- 	movq	%mm4, (%ecx)    # store U	
- 
-@@ -422,14 +426,15 @@ _dv_ppm_copy_y_block_mmx:
- _dv_pgm_copy_y_block_mmx:
- 
- 	pushl   %ebp
--	movl    %esp, %ebp
- 	pushl   %esi
- 	pushl	%edi
--	
--	movl    8(%ebp), %edi          # dest
--	movl    12(%ebp), %esi         # src
- 
--	movq	OFFSETY, %mm7
-+	LOAD_PIC_REG(bp)
-+
-+	movl    16(%esp), %edi          # dest
-+	movl    20(%esp), %esi         # src
-+
-+	movq	MUNG(OFFSETY), %mm7
- 	pxor	%mm6, %mm6
- 	
- 	movq	(%esi), %mm0
-@@ -564,14 +571,15 @@ _dv_pgm_copy_y_block_mmx:
- _dv_video_copy_y_block_mmx:
- 
- 	pushl   %ebp
--	movl    %esp, %ebp
- 	pushl   %esi
- 	pushl	%edi
--	
--	movl    8(%ebp), %edi          # dest
--	movl    12(%ebp), %esi         # src
- 
--	movq	OFFSETBX, %mm7
-+	LOAD_PIC_REG(bp)
-+
-+	movl    16(%esp), %edi          # dest
-+	movl    20(%esp), %esi         # src
-+
-+	movq	MUNG(OFFSETBX), %mm7
- 	pxor	%mm6, %mm6
- 	
- 	movq	(%esi), %mm0
-@@ -852,16 +864,16 @@ _dv_ppm_copy_pal_c_block_mmx:
- _dv_pgm_copy_pal_c_block_mmx:
- 				
- 	pushl   %ebp
--	movl    %esp, %ebp
- 	pushl   %esi
- 	pushl	%edi
- 	pushl	%ebx
--	
--	movl    8(%ebp), %edi          # dest
--	movl    12(%ebp), %esi         # src
- 
-+	LOAD_PIC_REG(bp)
-+
-+	movl    20(%esp), %edi          # dest
-+	movl    24(%esp), %esi         # src
- 
--	movq	OFFSETBX, %mm7
-+	movq	MUNG(OFFSETBX), %mm7
- 	pxor	%mm6, %mm6
- 
- 	
-@@ -1000,15 +1014,16 @@ _dv_pgm_copy_pal_c_block_mmx:
- _dv_video_copy_pal_c_block_mmx:
- 				
- 	pushl   %ebp
--	movl    %esp, %ebp
- 	pushl   %esi
- 	pushl	%edi
- 	pushl	%ebx
--	
--	movl    8(%ebp), %edi          # dest
--	movl    12(%ebp), %esi         # src
- 
--	movq	OFFSETBX, %mm7
-+	LOAD_PIC_REG(bp)
-+
-+	movl    20(%esp), %edi          # dest
-+	movl    24(%esp), %esi         # src
-+
-+	movq	MUNG(OFFSETBX), %mm7
- 	paddw	%mm7, %mm7
- 	pxor	%mm6, %mm6
- 
-@@ -1095,18 +1112,18 @@ video_copy_pal_c_block_mmx_loop:	
- _dv_ppm_copy_ntsc_c_block_mmx:
- 				
- 	pushl   %ebp
--	movl    %esp, %ebp
- 	pushl   %esi
- 	pushl	%edi
- 	pushl	%ebx
--	
--	movl    8(%ebp), %edi          # dest
--	movl    12(%ebp), %esi         # src
-+
-+	LOAD_PIC_REG(bp)
-+
-+	movl    20(%esp), %edi          # dest
-+	movl    24(%esp), %esi         # src
- 
- 	movl	$4, %ebx	
- 
--	movq	ALLONE, %mm6
--	
-+	movq	MUNG(ALLONE), %mm6
- ppm_copy_ntsc_c_block_mmx_loop:	
- 	
- 	movq	(%esi), %mm0
-@@ -1168,14 +1187,15 @@ ppm_copy_ntsc_c_block_mmx_loop:	
- _dv_pgm_copy_ntsc_c_block_mmx:
- 				
- 	pushl   %ebp
--	movl    %esp, %ebp
- 	pushl   %esi
- 	pushl	%edi
--	
--	movl    8(%ebp), %edi          # dest
--	movl    12(%ebp), %esi         # src
- 
--	movq	OFFSETBX, %mm7
-+	LOAD_PIC_REG(bp)
-+
-+	movl    16(%esp), %edi          # dest
-+	movl    20(%esp), %esi         # src
-+
-+	movq	MUNG(OFFSETBX), %mm7
- 	paddw	%mm7, %mm7
- 	pxor	%mm6, %mm6
- 
-@@ -1325,15 +1347,16 @@ _dv_pgm_copy_ntsc_c_block_mmx:
- _dv_video_copy_ntsc_c_block_mmx:
- 				
- 	pushl   %ebp
--	movl    %esp, %ebp
- 	pushl   %esi
- 	pushl	%edi
- 	pushl	%ebx
--	
--	movl    8(%ebp), %edi          # dest
--	movl    12(%ebp), %esi         # src
- 
--	movq	OFFSETBX, %mm7
-+	LOAD_PIC_REG(bp)
-+
-+	movl    20(%esp), %edi          # dest
-+	movl    24(%esp), %esi         # src
-+
-+	movq	MUNG(OFFSETBX), %mm7
- 	paddw	%mm7, %mm7
- 	pxor	%mm6, %mm6
- 
---- libdv-0.104-old/libdv/rgbtoyuv_x86_64.S
-+++ libdv-0.104/libdv/rgbtoyuv_x86_64.S
-@@ -41,9 +41,6 @@
- #define DV_WIDTH_SHORT_HALF 720
- #define DV_WIDTH_BYTE_HALF  360	
- 		
--.global _dv_rgbtoycb_mmx_x86_64
--# .global yuvtoycb_mmx_x86_64
--
- .data
- 
- .align 8
---- libdv-0.104-old/libdv/vlc_x86.S
-+++ libdv-0.104/libdv/vlc_x86.S
-@@ -1,31 +1,39 @@
- 	#include "asmoff.h"
- .section .note.GNU-stack, "", @progbits
-+	#include "asm_common.S"
- 
- .text
- 	.align 4
- .globl dv_decode_vlc 
-+.globl asm_dv_decode_vlc 
-+.hidden asm_dv_decode_vlc
-+asm_dv_decode_vlc = dv_decode_vlc
-+
- 	.type	 dv_decode_vlc,@function
- dv_decode_vlc:
- 	pushl %ebx
-+	pushl %ebp
-+
-+	LOAD_PIC_REG(bp)
- 
--	/* Args are at 8(%esp). */
--	movl  8(%esp),%eax		/* %eax is bits */
--	movl  12(%esp),%ebx		/* %ebx is maxbits */
-+	/* Args are at 12(%esp). */
-+	movl  12(%esp),%eax		/* %eax is bits */
-+	movl  16(%esp),%ebx		/* %ebx is maxbits */
- 	andl  $0x3f,%ebx		/* limit index range STL*/
- 
--	movl  dv_vlc_class_index_mask(,%ebx,4),%edx
-+	movl  MUNG_ARR(dv_vlc_class_index_mask,%ebx,4),%edx
- 	andl  %eax,%edx
--	movl  dv_vlc_class_index_rshift(,%ebx,4),%ecx
-+	movl  MUNG_ARR(dv_vlc_class_index_rshift,%ebx,4),%ecx
- 	sarl  %cl,%edx
--	movl  dv_vlc_classes(,%ebx,4),%ecx
-+	movl  MUNG_ARR(dv_vlc_classes,%ebx,4),%ecx
- 	movsbl  (%ecx,%edx,1),%edx	/* %edx is class */
- 			
--	movl  dv_vlc_index_mask(,%edx,4),%ebx
--	movl  dv_vlc_index_rshift(,%edx,4),%ecx
-+	movl  MUNG_ARR(dv_vlc_index_mask,%edx,4),%ebx
-+	movl  MUNG_ARR(dv_vlc_index_rshift,%edx,4),%ecx
- 	andl  %eax,%ebx
- 	sarl  %cl,%ebx
- 
--	movl  dv_vlc_lookups(,%edx,4),%edx
-+	movl  MUNG_ARR(dv_vlc_lookups,%edx,4),%edx
- 	movl  (%edx,%ebx,4),%edx
- 
- 	/* Now %edx holds result, like this:
-@@ -42,7 +51,7 @@ dv_decode_vlc:
- 	movl  %edx,%ecx
- 	sarl  $8,%ecx
- 	andl  $0xff,%ecx
--	movl  sign_mask(,%ecx,4),%ebx
-+	movl  MUNG_ARR(sign_mask,%ecx,4),%ebx
- 	andl  %ebx,%eax
- 	negl  %eax
- 	sarl  $31,%eax
-@@ -63,14 +72,14 @@ dv_decode_vlc:
- 	    *result = broken;
- 	Note that the 'broken' pattern is all ones (i.e. 0xffffffff)
- 	*/
--	movl  12(%esp),%ebx		/* %ebx is maxbits */
-+	movl  16(%esp),%ebx		/* %ebx is maxbits */
- 	subl  %ecx,%ebx
- 	sbbl  %ebx,%ebx
- 	orl   %ebx,%edx
- 
--	movl  16(%esp),%eax
-+	movl  20(%esp),%eax
- 	movl  %edx,(%eax)
--	
-+	popl  %ebp
- 	popl  %ebx
- 	ret
- 	
-@@ -80,21 +89,28 @@ dv_decode_vlc:
- 	.type	 __dv_decode_vlc,@function
- __dv_decode_vlc:
- 	pushl %ebx
-+	pushl %ebp
-+
-+	LOAD_PIC_REG(bp)
- 
--	/* Args are at 8(%esp). */
--	movl  8(%esp),%eax		/* %eax is bits */
-+	/* Args are at 12(%esp). */
-+	movl  12(%esp),%eax		/* %eax is bits */
- 	
- 	movl  %eax,%edx			/* %edx is class */
- 	andl  $0xfe00,%edx
- 	sarl  $9,%edx
-+#ifdef __PIC__
-+	movsbl dv_vlc_class_lookup5@GOTOFF(%ebp,%edx),%edx
-+#else
- 	movsbl dv_vlc_class_lookup5(%edx),%edx
--	
--	movl  dv_vlc_index_mask(,%edx,4),%ebx
--	movl  dv_vlc_index_rshift(,%edx,4),%ecx
-+#endif
-+
-+	movl  MUNG_ARR(dv_vlc_index_mask,%edx,4),%ebx
-+	movl  MUNG_ARR(dv_vlc_index_rshift,%edx,4),%ecx
- 	andl  %eax,%ebx
- 	sarl  %cl,%ebx
- 
--	movl  dv_vlc_lookups(,%edx,4),%edx
-+	movl  MUNG_ARR(dv_vlc_lookups,%edx,4),%edx
- 	movl  (%edx,%ebx,4),%edx
- 
- 	/* Now %edx holds result, like this:
-@@ -112,7 +128,7 @@ __dv_decode_vlc:
- 	movl  %edx,%ecx
- 	sarl  $8,%ecx
- 	andl  $0xff,%ecx
--	movl  sign_mask(,%ecx,4),%ecx
-+	movl  MUNG_ARR(sign_mask,%ecx,4),%ecx
- 	andl  %ecx,%eax
- 	negl  %eax
- 	sarl  $31,%eax
-@@ -127,9 +143,9 @@ __dv_decode_vlc:
- 	xorl  %eax,%edx
- 	subl  %eax,%edx
- 
--	movl  12(%esp),%eax
-+	movl  16(%esp),%eax
- 	movl  %edx,(%eax)
--	
-+	popl  %ebp
- 	popl  %ebx
- 	ret
- 
-@@ -140,14 +156,20 @@ void dv_parse_ac_coeffs_pass0(bitstream_
- */
- .text
- 	.align	4
-+.globl asm_dv_parse_ac_coeffs_pass0
-+.hidden asm_dv_parse_ac_coeffs_pass0
-+	asm_dv_parse_ac_coeffs_pass0 = dv_parse_ac_coeffs_pass0
-+
- .globl	dv_parse_ac_coeffs_pass0
- .type	dv_parse_ac_coeffs_pass0,@function
- dv_parse_ac_coeffs_pass0:
- 	pushl	%ebx
- 	pushl	%edi
- 	pushl	%esi
- 	pushl	%ebp
- 
-+	LOAD_PIC_REG(si)
-+
- #define ARGn(N)  (20+(4*(N)))(%esp)
- 
- 	/*
-@@ -159,8 +182,10 @@ dv_parse_ac_coeffs_pass0:
- 	ebp	bl
- 	*/
- 	movl    ARGn(2),%ebp
-+#ifndef __PIC__
- 	movl	ARGn(0),%esi
- 	movl	bitstream_t_buf(%esi),%esi
-+#endif
- 	movl	dv_block_t_offset(%ebp),%edi
- 	movl	dv_block_t_reorder(%ebp),%ebx
- 
-@@ -170,7 +195,11 @@ dv_parse_ac_coeffs_pass0:
- 	
- 	movq    dv_block_t_coeffs(%ebp),%mm1
- 	pxor    %mm0,%mm0
-+#ifdef __PIC__
-+	pand    const_f_0_0_0@GOTOFF(%esi),%mm1
-+#else
- 	pand    const_f_0_0_0,%mm1
-+#endif
- 	movq    %mm1,dv_block_t_coeffs(%ebp)
- 	movq    %mm0,(dv_block_t_coeffs + 8)(%ebp)
- 	movq    %mm0,(dv_block_t_coeffs + 16)(%ebp)
-@@ -191,9 +220,17 @@ dv_parse_ac_coeffs_pass0:
- readloop:
- 	movl	%edi,%ecx
- 	shrl	$3,%ecx
-+#ifdef __PIC__
-+	movl    ARGn(0),%eax
-+	addl    bitstream_t_buf(%eax),%ecx
-+	movzbl  (%ecx),%eax
-+	movzbl  1(%ecx),%edx
-+	movzbl  2(%ecx),%ecx
-+#else
- 	movzbl  (%esi,%ecx,1),%eax
- 	movzbl  1(%esi,%ecx,1),%edx
- 	movzbl  2(%esi,%ecx,1),%ecx
-+#endif
- 	shll	$16,%eax
- 	shll	$8,%edx
- 	orl	%ecx,%eax
-@@ -217,7 +254,11 @@ readloop:
- 
- 	/* Attempt to use the shortcut first.  If it hits, then
- 	   this vlc term has been decoded. */
-+#ifdef __PIC__
-+	movl	dv_vlc_class1_shortcut@GOTOFF(%esi,%ecx,4),%edx
-+#else
- 	movl	dv_vlc_class1_shortcut(,%ecx,4),%edx
-+#endif
- 	test	$0x80,%edx
- 	je	done_decode
- 
-@@ -228,12 +269,19 @@ readloop:
- 	movl	%ebx,dv_block_t_reorder(%ebp)
- 
- 	/* %eax is bits */
--	
-+#ifdef __PIC__
-+	movsbl dv_vlc_class_lookup5@GOTOFF(%esi,%ecx),%ecx
-+
-+	movl  dv_vlc_index_mask@GOTOFF(%esi,%ecx,4),%ebx
-+	movl  dv_vlc_lookups@GOTOFF(%esi,%ecx,4),%edx
-+	movl  dv_vlc_index_rshift@GOTOFF(%esi,%ecx,4),%ecx
-+#else
- 	movsbl dv_vlc_class_lookup5(%ecx),%ecx
- 
- 	movl  dv_vlc_index_mask(,%ecx,4),%ebx
- 	movl  dv_vlc_lookups(,%ecx,4),%edx
- 	movl  dv_vlc_index_rshift(,%ecx,4),%ecx
-+#endif
- 	andl  %eax,%ebx
- 	sarl  %cl,%ebx
- 
-@@ -256,7 +304,11 @@ readloop:
- 	movl  %edx,%ecx
- 	sarl  $8,%ecx
- 	andl  $0xff,%ecx
-+#ifdef __PIC__
-+	movl  sign_mask@GOTOFF(%esi,%ecx,4),%ecx
-+#else
- 	movl  sign_mask(,%ecx,4),%ecx
-+#endif
- 	andl  %ecx,%eax
- 	negl  %eax
- 	sarl  $31,%eax
-@@ -326,10 +378,16 @@ alldone:
- 
- slowpath:
- 	/* slow path:	 use dv_decode_vlc */;
-+#ifdef __PIC__
-+	pushl	%esi
-+	leal	vlc@GOTOFF(%esi),%esi
-+	xchgl	%esi,(%esp)	/* last parameter is &vlc */
-+#else
- 	pushl	$vlc		/* last parameter is &vlc */
-+#endif
- 	pushl	%edx		/* bits_left */
- 	pushl	%eax		/* bits */
--	call	dv_decode_vlc
-+	call	asm_dv_decode_vlc
- 	addl	$12,%esp
- 	test	$0x80,%edx	/* If (vlc.run < 0) break */
- 	jne	escape
-@@ -359,6 +417,8 @@ show16:
- 	pushl	%esi
- 	pushl	%ebp
- 
-+	LOAD_PIC_REG(si)
-+
- #define ARGn(N)  (20+(4*(N)))(%esp)
- 
- 	movl	ARGn(1),%eax			/* quality */
-@@ -373,7 +434,11 @@ dv_parse_video_segment:
- 	jz	its_mono
- 	movl	$6,%ebx
- its_mono:
-+#ifdef __PIC__
-+	movl	%ebx,n_blocks@GOTOFF(%esi)
-+#else
- 	movl	%ebx,n_blocks
-+#endif
- 	
- 	/*
- 	 *	ebx	seg/b
-@@ -384,15 +449,22 @@ its_mono:
- 	 *	ebp	bl
- 	 */
- 	movl	ARGn(0),%ebx
-+#ifndef __PIC__
- 	movl	dv_videosegment_t_bs(%ebx),%esi
- 	movl	bitstream_t_buf(%esi),%esi
-+#endif
- 	leal	dv_videosegment_t_mb(%ebx),%edi
- 
- 	movl	$0,%eax
- 	movl	$0,%ecx
- macloop:
-+#ifdef __PIC__
-+	movl	%eax,m@GOTOFF(%esi)
-+	movl	%ecx,mb_start@GOTOFF(%esi)
-+#else
- 	movl	%eax,m
- 	movl	%ecx,mb_start
-+#endif
- 
- 	movl	ARGn(0),%ebx
- 	
-@@ -400,7 +472,13 @@ macloop:
- 	/* mb->qno = bitstream_get(bs,4); */
- 	movl	%ecx,%edx
- 	shr	$3,%edx
-+#ifdef __PIC__
-+	movl	dv_videosegment_t_bs(%ebx),%ecx
-+	movl	bitstream_t_buf(%ecx),%ecx
-+	movzbl	3(%ecx,%edx,1),%edx
-+#else
- 	movzbl	3(%esi,%edx,1),%edx
-+#endif
- 	andl	$0xf,%edx
- 	movl	%edx,dv_macroblock_t_qno(%edi)
- 
-@@ -411,7 +489,11 @@ macloop:
- 	movl	%edx,dv_macroblock_t_eob_count(%edi)
- 
- 	/* mb->i = (seg->i + dv_super_map_vertical[m]) % (seg->isPAL?12:10); */
-+#ifdef __PIC__
-+	movl	dv_super_map_vertical@GOTOFF(%esi,%eax,4),%edx
-+#else
- 	movl	dv_super_map_vertical(,%eax,4),%edx
-+#endif
- 	movl	dv_videosegment_t_i(%ebx),%ecx
- 	addl	%ecx,%edx
- 
-@@ -422,11 +504,20 @@ skarly:	
- 	andl	$1,%ecx
- 	shll	$5,%ecx		/* ecx = (isPAL ? 32 : 0) */
- 
-+#ifdef __PIC__
-+	leal	mod_10@GOTOFF(%esi),%edx
-+	movzbl	(%edx,%ecx,1),%edx	/* uses mod_12 for PAL */
-+#else
- 	movzbl	mod_10(%edx,%ecx,1),%edx	/* uses mod_12 for PAL */
-+#endif
- 	movl	%edx,dv_macroblock_t_i(%edi)
- 
- 	/*  mb->j = dv_super_map_horizontal[m]; */	
-+#ifdef __PIC__
-+	movl	dv_super_map_horizontal@GOTOFF(%esi,%eax,4),%edx
-+#else
- 	movl	dv_super_map_horizontal(,%eax,4),%edx
-+#endif
- 	movl	%edx,dv_macroblock_t_j(%edi)
- 
- 	/* mb->k = seg->k; */
-@@ -445,12 +536,28 @@ blkloop:
- 	        +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+
- 	*/
- 	/* dc = bitstream_get(bs,9); */
-+#ifdef __PIC__
-+	movl	mb_start@GOTOFF(%esi),%ecx
-+#else
- 	movl	mb_start,%ecx
-+#endif
- 	shr	$3,%ecx
-+#ifdef __PIC__
-+	movzbl	blk_start@GOTOFF(%esi,%ebx),%edx
-+#else
- 	movzbl	blk_start(%ebx),%edx
-+#endif
- 	addl	%ecx,%edx
-+#ifdef __PIC__
-+	movl	ARGn(0),%ecx
-+	movl	dv_videosegment_t_bs(%ecx),%ecx
-+	movl	bitstream_t_buf(%ecx),%ecx
-+	movzbl	(%ecx,%edx,1),%eax	/* hi byte */
-+	movzbl	1(%ecx,%edx,1),%ecx	/* lo byte */
-+#else
- 	movzbl	(%esi,%edx,1),%eax	/* hi byte */
- 	movzbl	1(%esi,%edx,1),%ecx	/* lo byte */
-+#endif
- 	shll	$8,%eax
- 	orl	%ecx,%eax
- 
-@@ -477,7 +584,11 @@ blkloop:
- 
- 	/* bl->reorder = &dv_reorder[bl->dct_mode][1]; */
- 	shll	$6,%eax
-+#ifdef __PIC__
-+	leal	dv_reorder@GOTOFF+1(%esi,%eax),%eax
-+#else
- 	addl	$(dv_reorder+1),%eax
-+#endif
- 	movl	%eax,dv_block_t_reorder(%ebp)
- 
- 	/* bl->reorder_sentinel = bl->reorder + 63; */
-@@ -485,13 +596,22 @@ blkloop:
- 	movl	%eax,dv_block_t_reorder_sentinel(%ebp)
- 
- 	/* bl->offset= mb_start + dv_parse_bit_start[b]; */
-+#ifdef __PIC__
-+	movl	mb_start@GOTOFF(%esi),%ecx
-+	movl	dv_parse_bit_start@GOTOFF(%esi,%ebx,4),%eax
-+#else
- 	movl	mb_start,%ecx
- 	movl	dv_parse_bit_start(,%ebx,4),%eax
-+#endif
- 	addl	%ecx,%eax
- 	movl	%eax,dv_block_t_offset(%ebp)
- 
- 	/* bl->end= mb_start + dv_parse_bit_end[b]; */
-+#ifdef __PIC__
-+	movl	dv_parse_bit_end@GOTOFF(%esi,%ebx,4),%eax
-+#else
- 	movl	dv_parse_bit_end(,%ebx,4),%eax
-+#endif
- 	addl	%ecx,%eax
- 	movl	%eax,dv_block_t_end(%ebp)
- 
-@@ -503,7 +623,11 @@ blkloop:
- 	/* no AC pass.  Just zero out the remaining coeffs */
- 	movq    dv_block_t_coeffs(%ebp),%mm1
- 	pxor    %mm0,%mm0
-+#ifdef __PIC__
-+	pand    const_f_0_0_0@GOTOFF(%esi),%mm1
-+#else
- 	pand    const_f_0_0_0,%mm1
-+#endif
- 	movq    %mm1,dv_block_t_coeffs(%ebp)
- 	movq    %mm0,(dv_block_t_coeffs + 8)(%ebp)
- 	movq    %mm0,(dv_block_t_coeffs + 16)(%ebp)
-@@ -528,18 +652,27 @@ do_ac_pass:
- 	pushl	%ebp
- 	pushl	%edi
- 	pushl	%eax
--	call	dv_parse_ac_coeffs_pass0
-+	call	asm_dv_parse_ac_coeffs_pass0
- 	addl	$12,%esp
- done_ac:
- 
-+#ifdef __PIC__
-+	movl	n_blocks@GOTOFF(%esi),%eax
-+#else
- 	movl	n_blocks,%eax
-+#endif
- 	addl	$dv_block_t_size,%ebp
- 	incl	%ebx
- 	cmpl	%eax,%ebx
- 	jnz	blkloop
- 
-+#ifdef __PIC__
-+	movl	m@GOTOFF(%esi),%eax
-+	movl	mb_start@GOTOFF(%esi),%ecx
-+#else
- 	movl	m,%eax
- 	movl	mb_start,%ecx
-+#endif
- 	addl	$(8 * 80),%ecx
- 	addl	$dv_macroblock_t_size,%edi
- 	incl	%eax
-@@ -557,7 +690,7 @@ done_ac:
- 
- 	andl	$DV_QUALITY_AC_MASK,%eax
- 	cmpl	$DV_QUALITY_AC_2,%eax
--	jz	dv_parse_ac_coeffs
-+	jz	asm_dv_parse_ac_coeffs
- 	movl	$0,%eax
- 	ret
- 
diff --git a/main/libdwarf/APKBUILD b/main/libdwarf/APKBUILD
new file mode 100644
index 00000000000..04862973fa5
--- /dev/null
+++ b/main/libdwarf/APKBUILD
@@ -0,0 +1,53 @@
+# Contributor: David Huffman <storedbox@outlook.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libdwarf
+pkgver=0.9.2
+pkgrel=0
+pkgdesc="Parsing library for DWARF2 and later debugging file format"
+url="https://www.prevanders.net/dwarf.html"
+arch="all"
+license="LGPL-2.1-only"
+makedepends="elfutils-dev meson python3 zlib-dev zstd-dev"
+subpackages="liblibdwarfp $pkgname-dev dwarf-tools dwarf-tools-doc"
+source="https://www.prevanders.net/libdwarf-$pkgver.tar.xz"
+
+# secfixes:
+#   0.9.2-r0:
+#     - DW202402-001
+#     - DW202402-002
+#     - DW202402-003
+#     - DW202403-001
+#   0.6.0-r0:
+#     - CVE-2019-14249
+#     - CVE-2015-8538
+
+build() {
+	abuild-meson \
+		-Db_lto=true \
+		-Ddwarfgen=true \
+		. output
+	meson compile -C output
+}
+
+check() {
+	meson test --no-rebuild --print-errorlogs -C output
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+}
+
+liblibdwarfp() {
+	amove usr/lib/libdwarfp.so.*
+}
+
+tools() {
+	license="GPL-2.0-only AND BSD-3-Clause"
+	pkgdesc="Tools for interacting with DWARF2 and later debugging files"
+
+	amove usr/bin usr/share/dwarfdump
+}
+
+sha512sums="
+f502b6da4b96d5962da1197c4ae522bfdb2858496c4af198109d844e0021318cb2a5ebc9c8cf9fc2e4439997ca9545c650ca4f28f0d96cb66b05c9b89b98f2f8  libdwarf-0.9.2.tar.xz
+"
diff --git a/main/libeatmydata/APKBUILD b/main/libeatmydata/APKBUILD
new file mode 100644
index 00000000000..7a2b5df84fc
--- /dev/null
+++ b/main/libeatmydata/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer:
+pkgname=libeatmydata
+pkgver=131
+pkgrel=7
+pkgdesc="LD_PRELOAD library and utility that disables all forms of writing data safely to disk"
+url="https://www.flamingspork.com/projects/libeatmydata/"
+arch="all"
+license="GPL-3.0-or-later"
+checkdepends="bash strace"
+source="https://github.com/stewartsmith/libeatmydata/releases/download/v$pkgver/libeatmydata-$pkgver.tar.gz
+	lfs64.patch
+	"
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--disable-static
+	make
+}
+
+check() {
+	make check-debug
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+064417dc085cb82e4baf1d160fcde2c6e0d9fed60e5c595799630b030053c373d888853055894c127c5b384be9204e8bbb251877651811b5fc5cdca8ffd9cf42  libeatmydata-131.tar.gz
+e23d50193673d568442b9562cd61817710787b9cbd4b7c6bf30438b58bf421c1505a745147d0d901fe5c2e188cf36d9ffabd5dde97d860c5436fc6e7463d1458  lfs64.patch
+"
diff --git a/main/libeatmydata/lfs64.patch b/main/libeatmydata/lfs64.patch
new file mode 100644
index 00000000000..e1522aae810
--- /dev/null
+++ b/main/libeatmydata/lfs64.patch
@@ -0,0 +1,22 @@
+diff --git a/libeatmydata/libeatmydata.c b/libeatmydata/libeatmydata.c
+index 134afcd..b302e7b 100644
+--- a/libeatmydata/libeatmydata.c
++++ b/libeatmydata/libeatmydata.c
+@@ -44,7 +44,7 @@ typedef int (*libc_sync_t)(void);
+ typedef int (*libc_fdatasync_t)(int);
+ typedef int (*libc_msync_t)(void*, size_t, int);
+ #ifdef HAVE_SYNC_FILE_RANGE
+-typedef int (*libc_sync_file_range_t)(int, off64_t, off64_t, unsigned int);
++typedef int (*libc_sync_file_range_t)(int, off_t, off_t, unsigned int);
+ #endif
+ #ifdef HAVE_SYNCFS
+ typedef int (*libc_syncfs_t)(int);
+@@ -259,7 +259,7 @@ int LIBEATMYDATA_API msync(void *addr, size_t length, int flags)
+ }
+ 
+ #ifdef HAVE_SYNC_FILE_RANGE
+-int LIBEATMYDATA_API sync_file_range(int fd, off64_t offset, off64_t nbytes,
++int LIBEATMYDATA_API sync_file_range(int fd, off_t offset, off_t nbytes,
+ 				     unsigned int flags)
+ {
+ 	if (eatmydata_is_hungry()) {
diff --git a/main/libeconf/0001-Fix-build-with-musl-libc-on-ppc64le.patch b/main/libeconf/0001-Fix-build-with-musl-libc-on-ppc64le.patch
new file mode 100644
index 00000000000..a181e139e35
--- /dev/null
+++ b/main/libeconf/0001-Fix-build-with-musl-libc-on-ppc64le.patch
@@ -0,0 +1,29 @@
+From abeea53fd7b214a6cb72e4a42ae2646e1db8fd06 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 8 Mar 2024 12:40:06 +0100
+Subject: [PATCH] Fix build with musl libc on ppc64le
+
+PATH_MAX is defined in limits.h in POSIX.
+
+Fixes https://github.com/openSUSE/libeconf/issues/197
+
+ref: https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html
+---
+ lib/libeconf.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/libeconf.c b/lib/libeconf.c
+index c68a290..8459724 100644
+--- a/lib/libeconf.c
++++ b/lib/libeconf.c
+@@ -31,6 +31,7 @@
+ #include "readconfig.h"
+ 
+ #include <libgen.h>
++#include <limits.h>
+ #include <dirent.h>
+ #include <stdio.h>
+ #include <string.h>
+-- 
+2.44.0
+
diff --git a/main/libeconf/APKBUILD b/main/libeconf/APKBUILD
new file mode 100644
index 00000000000..6d0ee9e84dc
--- /dev/null
+++ b/main/libeconf/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libeconf
+pkgver=0.6.2
+pkgrel=0
+pkgdesc="Enhanced Config File Parser"
+url="https://github.com/openSUSE/libeconf"
+arch="all"
+license="MIT"
+makedepends="meson"
+checkdepends="bash"
+subpackages="$pkgname-dev $pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/openSUSE/libeconf/archive/refs/tags/v$pkgver.tar.gz
+	musl-tests.patch
+	0001-Fix-build-with-musl-libc-on-ppc64le.patch
+	"
+
+build() {
+	abuild-meson -Db_lto=true . output
+	meson compile -C output
+}
+
+check() {
+	meson test --no-rebuild --print-errorlogs -C output
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+}
+
+sha512sums="
+5646af5e76b54a9a1a05780160404dd53cdf2022085a519098223539d5c162b6ab5c1ba0ce1099a28eb411a19dd2df1a51c487a34cfe4f7f9fc3ecbce7762e59  libeconf-0.6.2.tar.gz
+28431c1f80ee7815991584ef6307dabe593b4da58b9406e6f1a9cb30bfba3e925a48c83b0d3824427631bede5b1249b0c87e0d9fb55971d4ecf90805076b25dd  musl-tests.patch
+88a2e97e9952fee4f0957e97877e85da3524fb8ff2dfe14bb76eb77dbf1d93335377380a1277723491d98a66739b1d35e729524f4807ad03979476e8fef62b97  0001-Fix-build-with-musl-libc-on-ppc64le.patch
+"
diff --git a/main/libeconf/musl-tests.patch b/main/libeconf/musl-tests.patch
new file mode 100644
index 00000000000..e2559401c2c
--- /dev/null
+++ b/main/libeconf/musl-tests.patch
@@ -0,0 +1,14 @@
+Upstream: shouldn't be
+Reason: Disable failing test, that checks commandline output
+
+diff --git a/tests/meson.build b/tests/meson.build
+index e8f6bd8..6da8b1f 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -93,6 +93,5 @@ test('tst-parseconfig1', tst_parseconfig1_exe)
+ tst_quote1_exe = executable('tst-quote1', 'tst-quote1.c', c_args: test_args, dependencies : libeconf_dep)
+ test('tst-quote1', tst_quote1_exe)
+ 
+-test('tst_econftool1', find_program('tst-econftool1.sh'))
+ test('tst_econftool_show1', find_program('tst-econftool_show1.sh'))
+ test('tst_econftool_cat', find_program('tst-econftool_cat.sh'))
diff --git a/main/libedit/APKBUILD b/main/libedit/APKBUILD
index 133b76dcc0b..1c48d7d0231 100644
--- a/main/libedit/APKBUILD
+++ b/main/libedit/APKBUILD
@@ -1,21 +1,19 @@
-# Maintainer: Drew DeVault <sir@cmpwn.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libedit
-pkgver=20191231.3.1
+pkgver=20230828.3.1
 _ver=${pkgver/./-}
-pkgrel=0
+pkgrel=4
 pkgdesc="BSD line editing library"
 url="https://www.thrysoee.dk/editline"
 arch="all"
 license="BSD-3-Clause"
-depends_dev="ncurses-dev"
-makedepends_build=""
+depends_dev="bsd-compat-headers ncurses-dev"
 makedepends_host="$depends_dev"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 source="https://www.thrysoee.dk/editline/libedit-$_ver.tar.gz"
 builddir="$srcdir"/libedit-$_ver
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,14 +26,25 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+
+	# Prevent conflict with editline-doc and readline-doc
+	mv "$pkgdir"/usr/share/man/man3/editline.3 \
+		"$pkgdir"/usr/share/man/man3/libedit.3
+
+	# update symlinks
+	find "$pkgdir"/usr/share/man/man3/ -type l | while IFS= read -r path; do
+		[ "$(readlink "$path")" != 'editline.3.gz' ] && continue
+		echo ln -s -f -T -- 'libedit.3.gz' "$path"
+	done
+
 	rm "$pkgdir"/usr/share/man/man3/history.3*
 }
 
-sha512sums="1df2eced98e8db1bb0af940678c154d87e3b11dd21e65a903682367f5feace5112f9a543b8e0cb04bbfeaaf73729f808db2d9c302637fc063e81c0a37777ac2c  libedit-20191231-3.1.tar.gz"
+sha512sums="
+c7232376ef1bc128ed79f950a5f1f207f874011218682d7e6186f76443927df5483b46c4daa8cf02e327079259aee1a56e2b791aa682491eb802d90ff8940cca  libedit-20230828-3.1.tar.gz
+"
diff --git a/main/libepoxy/APKBUILD b/main/libepoxy/APKBUILD
index 5688a3e1547..ad1943fabda 100644
--- a/main/libepoxy/APKBUILD
+++ b/main/libepoxy/APKBUILD
@@ -1,40 +1,37 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libepoxy
-pkgver=1.5.4
-pkgrel=0
+pkgver=1.5.10
+pkgrel=1
 pkgdesc="Direct Rendering Manager runtime library"
 url="https://github.com/anholt/libepoxy"
 arch="all"
 license="MIT"
 options="!check"  # Requires dlvsym
-depends_dev="libx11-dev mesa-dev"
-makedepends="$depends_dev autoconf automake libtool util-macros python3"
+depends_dev="libx11-dev"
+makedepends="$depends_dev mesa-dev meson"
 subpackages="$pkgname-dev"
-source="https://github.com/anholt/libepoxy/releases/download/$pkgver/libepoxy-$pkgver.tar.xz"
-
-prepare() {
-	default_prepare
-	autoreconf -vif
-}
+source="$pkgname-pkgver.tar.gz::https://github.com/anholt/libepoxy/archive/refs/tags/$pkgver.tar.gz"
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--disable-static \
-		--enable-shared
-	make
+	abuild-meson \
+		-Ddocs=false \
+		-Degl=yes \
+		-Dglx=yes \
+		-Dx11=true \
+		-Dtests=true \
+		. output
+	meson compile -C output
 }
 
 check() {
-	make check
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	make install DESTDIR="$pkgdir"
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-sha512sums="7bde6fe7164aaa88b6e476dafb13391c551c530267936a1456e242d2bf648117f319788ba089100b3f773444098a894db6d27326b47dc4ae26db4766308d7510  libepoxy-1.5.4.tar.xz"
+sha512sums="
+6786f31c6e2865e68a90eb912900a86bf56fd3df4d78a477356886ac3b6ef52ac887b9c7a77aa027525f868ae9e88b12e5927ba56069c2e115acd631fca3abee  libepoxy-pkgver.tar.gz
+"
diff --git a/main/libestr/APKBUILD b/main/libestr/APKBUILD
index f65b19c4b72..2fa2c5897dc 100644
--- a/main/libestr/APKBUILD
+++ b/main/libestr/APKBUILD
@@ -2,17 +2,21 @@
 # Maintainer: Cameron Banta <cbanta@gmail.com>
 pkgname=libestr
 pkgver=0.1.11
-pkgrel=1
+pkgrel=4
 pkgdesc="essentials for string handling (and a bit more)"
 options="!check" # No testsuite
 url="https://libestr.adiscon.com/"
 arch="all"
 license="LGPL-2.1-or-later"
 subpackages="$pkgname-dev"
-source="http://libestr.adiscon.com/files/download/$pkgname-$pkgver.tar.gz"
+source="http://libestr.adiscon.com/files/download/libestr-$pkgver.tar.gz"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,7 +26,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/libev/APKBUILD b/main/libev/APKBUILD
index 5c6e850931f..e4e8dd88f5e 100644
--- a/main/libev/APKBUILD
+++ b/main/libev/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libev
 pkgver=4.33
-pkgrel=0
+pkgrel=1
 pkgdesc="event dispatch library"
 url="http://software.schmorp.de/pkg/libev.html"
 arch="all"
@@ -16,6 +16,8 @@ source="http://dist.schmorp.de/libev/Attic/libev-$pkgver.tar.gz
 
 prepare() {
 	default_prepare
+	update_config_sub
+
 	libtoolize --force && aclocal -I m4 && autoheader&&  autoconf \
 		&& automake --add-missing
 }
diff --git a/main/libevdev/APKBUILD b/main/libevdev/APKBUILD
deleted file mode 100644
index f62654b1fbb..00000000000
--- a/main/libevdev/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libevdev
-pkgver=1.9.0
-pkgrel=0
-pkgdesc="Kernel Evdev Device Wrapper Library"
-url="https://www.freedesktop.org/wiki/Software/libevdev"
-arch="all"
-license="MIT"
-options="!check"  # Requires CONFIG_INPUT_UINPUT in kernel
-makedepends="meson python3 linux-headers doxygen"
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://freedesktop.org/software/libevdev/libevdev-$pkgver.tar.xz"
-
-build() {
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--buildtype=plain \
-		-Dtests=disabled \
-		-Ddocumentation=enabled \
-		. output
-	ninja -C output
-}
-
-package() {
-	DESTDIR="$pkgdir" ninja -C output install
-}
-
-sha512sums="6e7589b5776437ac23fbf65b3194fb1dd3a68a294696145060cdd97bcdeb9b04f355f2be028dc1a5efe98ef2cafca15e4f61115edf5d62591e3a8944dc95942a  libevdev-1.9.0.tar.xz"
diff --git a/main/libevent/APKBUILD b/main/libevent/APKBUILD
index 8194f052091..632db86c63a 100644
--- a/main/libevent/APKBUILD
+++ b/main/libevent/APKBUILD
@@ -1,36 +1,36 @@
 # Contributor: Sergei Lukin <sergej.lukin@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libevent
-pkgver=2.1.11
+pkgver=2.1.12
 _pkgver=$pkgver-stable
-pkgrel=0
+pkgrel=7
 pkgdesc="An event notification library"
-url="http://libevent.org/"
+url="https://libevent.org/"
 arch="all"
 license="BSD-3-Clause"
 options="!check" # regression tests failed
 depends_dev="python3"
-makedepends="$depends_dev openssl-dev"
+makedepends="$depends_dev openssl-dev>3"
 subpackages="$pkgname-static $pkgname-dev"
 source="https://github.com/libevent/libevent/releases/download/release-$_pkgver/libevent-$_pkgver.tar.gz"
 builddir="$srcdir/$pkgname-$_pkgver"
 
 # secfixes:
 #   2.1.8-r0:
-#   - CVE-2016-10195
-#   - CVE-2016-10196
-#   - CVE-2016-10197
+#     - CVE-2016-10195
+#     - CVE-2016-10196
+#     - CVE-2016-10197
 
 prepare() {
 	default_prepare
+	update_config_sub
 
-	cd "$builddir"
+	sed -i '1s|^#!/usr/bin/env python$|#!/usr/bin/python3|' event_rpcgen.py
 	# help provides tracing work out correctly
 	sed -i -e "s/@VERSION@/$pkgver-r$pkgrel/" *.pc.in
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -40,12 +40,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make -j1 check
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR=$pkgdir install
 }
 
@@ -62,4 +60,4 @@ static() {
 	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
 }
 
-sha512sums="9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3  libevent-2.1.11-stable.tar.gz"
+sha512sums="88d8944cd75cbe78bc4e56a6741ca67c017a3686d5349100f1c74f8a68ac0b6410ce64dff160be4a4ba0696ee29540dfed59aaf3c9a02f0c164b00307fcfe84f  libevent-2.1.12-stable.tar.gz"
diff --git a/main/libexecinfo/10-execinfo.patch b/main/libexecinfo/10-execinfo.patch
deleted file mode 100644
index 44db53026ad..00000000000
--- a/main/libexecinfo/10-execinfo.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/execinfo.c.orig
-+++ b/execinfo.c
-@@ -69,7 +69,8 @@
- char **
- backtrace_symbols(void *const *buffer, int size)
- {
--    int i, clen, alen, offset;
-+    size_t clen, alen;
-+    int i, offset;
-     char **rval;
-     char *cp;
-     Dl_info info;
-@@ -78,7 +79,6 @@
-     rval = malloc(clen);
-     if (rval == NULL)
-         return NULL;
--    (char **)cp = &(rval[size]);
-     for (i = 0; i < size; i++) {
-         if (dladdr(buffer[i], &info) != 0) {
-             if (info.dli_sname == NULL)
-@@ -92,14 +92,14 @@
-                    2 +                      /* " <" */
-                    strlen(info.dli_sname) + /* "function" */
-                    1 +                      /* "+" */
--                   D10(offset) +            /* "offset */
-+                   10 +                     /* "offset */
-                    5 +                      /* "> at " */
-                    strlen(info.dli_fname) + /* "filename" */
-                    1;                       /* "\0" */
-             rval = realloc_safe(rval, clen + alen);
-             if (rval == NULL)
-                 return NULL;
--            snprintf(cp, alen, "%p <%s+%d> at %s",
-+            snprintf((char *) rval + clen, alen, "%p <%s+%d> at %s",
-               buffer[i], info.dli_sname, offset, info.dli_fname);
-         } else {
-             alen = 2 +                      /* "0x" */
-@@ -108,12 +108,15 @@
-             rval = realloc_safe(rval, clen + alen);
-             if (rval == NULL)
-                 return NULL;
--            snprintf(cp, alen, "%p", buffer[i]);
-+            snprintf((char *) rval + clen, alen, "%p", buffer[i]);
-         }
--        rval[i] = cp;
--        cp += alen;
-+        rval[i] = (char *) clen;
-+        clen += alen;
-     }
- 
-+    for (i = 0; i < size; i++)
-+        rval[i] += (long) rval;
-+
-     return rval;
- }
- 
-@@ -155,6 +158,6 @@
-                 return;
-             snprintf(buf, len, "%p\n", buffer[i]);
-         }
--        write(fd, buf, len - 1);
-+        write(fd, buf, strlen(buf));
-     }
- }
diff --git a/main/libexecinfo/20-define-gnu-source.patch b/main/libexecinfo/20-define-gnu-source.patch
deleted file mode 100644
index 7255ecdd6a8..00000000000
--- a/main/libexecinfo/20-define-gnu-source.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/execinfo.c.orig
-+++ b/execinfo.c
-@@ -26,6 +26,7 @@
-  * $Id: execinfo.c,v 1.3 2004/07/19 05:21:09 sobomax Exp $
-  */
- 
-+#define _GNU_SOURCE
- #include <sys/types.h>
- #include <sys/uio.h>
- #include <dlfcn.h>
---- a/stacktraverse.c.orig
-+++ b/stacktraverse.c
-@@ -1,3 +1,4 @@
-+#define _GNU_SOURCE
- #include <stddef.h>
- 
- #include "stacktraverse.h"
---- a/test.c.orig
-+++ b/test.c
-@@ -1,3 +1,4 @@
-+#define _GNU_SOURCE
- #include <stdio.h>
- #include <stdlib.h>
- 
diff --git a/main/libexecinfo/30-linux-makefile.patch b/main/libexecinfo/30-linux-makefile.patch
deleted file mode 100644
index 6bc8a899d25..00000000000
--- a/main/libexecinfo/30-linux-makefile.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/Makefile.orig
-+++ b/Makefile
-@@ -23,24 +23,25 @@
- # SUCH DAMAGE.
- #
- # $Id: Makefile,v 1.3 2004/07/19 05:19:55 sobomax Exp $
-+#
-+# Linux Makefile by Matt Smith <mcs@darkregion.net>, 2011/01/04
- 
--LIB=	execinfo
-+CC=cc
-+AR=ar
-+EXECINFO_CFLAGS=$(CFLAGS) -O2 -pipe -fno-strict-aliasing -std=gnu99 -fstack-protector -c
-+EXECINFO_LDFLAGS=$(LDFLAGS)
- 
--SRCS=	stacktraverse.c stacktraverse.h execinfo.c execinfo.h
-+all: static dynamic
- 
--INCS=	execinfo.h
-+static:
-+	$(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c
-+	$(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c
-+	$(AR) rcs libexecinfo.a stacktraverse.o execinfo.o
- 
--SHLIB_MAJOR=	1
--SHLIB_MINOR=	0
-+dynamic:
-+	$(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -o stacktraverse.So
-+	$(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -o execinfo.So
-+	$(CC) -shared -Wl,-soname,libexecinfo.so.1 -o libexecinfo.so.1 stacktraverse.So execinfo.So
- 
--NOPROFILE=	yes
--
--DPADD=		${LIBM}
--LDADD=		-lm
--
--#WARNS?=	4
--
--#stacktraverse.c: gen.py
--#	./gen.py > stacktraverse.c
--
--.include <bsd.lib.mk>
-+clean:
-+	rm -rf *.o *.So *.a *.so
diff --git a/main/libexecinfo/APKBUILD b/main/libexecinfo/APKBUILD
deleted file mode 100644
index 0e91c2ca359..00000000000
--- a/main/libexecinfo/APKBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Contributor: Philipp Andronov <filipp.andronov@gmail.com>
-# Maintainer: Matt Smith <mcs@darkregion.net>
-pkgname=libexecinfo
-pkgver=1.1
-pkgrel=1
-pkgdesc="A quick-n-dirty BSD licensed clone of the GNU libc backtrace facility."
-options="!check" # No testsuite
-url="https://www.freshports.org/devel/libexecinfo"
-arch="all"
-license="BSD-2-Clause"
-subpackages="$pkgname-static ${pkgname}-dev"
-source="http://distcache.freebsd.org/local-distfiles/itetcu/$pkgname-$pkgver.tar.bz2
-	10-execinfo.patch
-	20-define-gnu-source.patch
-	30-linux-makefile.patch
-	"
-
-build() {
-	cd "$builddir"
-	export CFLAGS="${CFLAGS} -fno-omit-frame-pointer"
-	make
-}
-
-package() {
-	cd "$builddir"
-
-	install -D -m755 "$builddir"/execinfo.h \
-		"$pkgdir"/usr/include/execinfo.h
-	install -D -m755 "$builddir"/stacktraverse.h \
-		"$pkgdir"/usr/include/stacktraverse.h
-	install -D -m755 "$builddir"/libexecinfo.a \
-		"$pkgdir"/usr/lib/libexecinfo.a
-	install -D -m755 "$builddir"/libexecinfo.so.1 \
-		"$pkgdir"/usr/lib/libexecinfo.so.1
-	ln -s /usr/lib/libexecinfo.so.1 \
-		"$pkgdir"/usr/lib/libexecinfo.so
-}
-
-static() {
-	depends=""
-	pkgdesc="$pkgdesc (static library)"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
-}
-
-sha512sums="51fea7910ef6873061a25c22434ce4da724e9d8e37616a069ad0a58c0463755be4c6c7da88cd747484c2f3373909d7be4678b32a4bd91b6d9e0f74526094e92c  libexecinfo-1.1.tar.bz2
-cd35c9046d88b39b05bc36faffb1e71ae3b2140632da7da37f374fff671d4ad812eebd0581011ff9e3b25d3cb4bc962cf35957074f713817b3b617511425af1a  10-execinfo.patch
-c961b2f86cba291e8c69a507e3880354ad7369fd04c8948d54c4db0578fe30cca8f4250742cb63d1ab6e5875988f04c4729256197030369404f0e925f299a66c  20-define-gnu-source.patch
-13d3df88a6dabd78ee2cf50092511f5a10f0e5ff3d81dbacb182fcf85ceb0c13a5f0252397b4eb0ac57f8d8bd3fc3af6c05865d6398cbc1517f347210c5750da  30-linux-makefile.patch"
diff --git a/main/libexif/APKBUILD b/main/libexif/APKBUILD
deleted file mode 100644
index 467acb3b995..00000000000
--- a/main/libexif/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libexif
-pkgver=0.6.21
-pkgrel=3
-pkgdesc="A library to parse an EXIF file and read the data from those tags"
-url="https://sourceforge.net/projects/libexif"
-arch="all"
-license="LGPL-2.0+"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends=
-source="https://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-	CVE-2017-7544.patch
-	"
-
-# secfixes:
-#   0.6.21-r3:
-#     - CVE-2017-7544
-
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35  libexif-0.6.21.tar.bz2
-5475c9e0f4a05448a571077d24d545cfaa0a7b15978345e92440107770077158b994fc0c785a81bb95ad6b409929c4c516c6e002cd65c9d35eb0e91161750e48  CVE-2017-7544.patch"
diff --git a/main/libexif/CVE-2017-7544.patch b/main/libexif/CVE-2017-7544.patch
deleted file mode 100644
index b8825e1385c..00000000000
--- a/main/libexif/CVE-2017-7544.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: libexif/exif-data.c
-===================================================================
-RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
-retrieving revision 1.131
-diff -u -r1.131 exif-data.c
---- a/libexif/exif-data.c	12 Jul 2012 17:28:26 -0000	1.131
-+++ b/libexif/exif-data.c	25 Jul 2017 21:34:06 -0000
-@@ -255,6 +255,12 @@
- 			exif_mnote_data_set_offset (data->priv->md, *ds - 6);
- 			exif_mnote_data_save (data->priv->md, &e->data, &e->size);
- 			e->components = e->size;
-+			if (exif_format_get_size (e->format) != 1) {
-+				/* e->format is taken from input code,
-+				 * but we need to make sure it is a 1 byte
-+				 * entity due to the multiplication below. */
-+				e->format = EXIF_FORMAT_UNDEFINED;
-+			}
- 		}
- 	}
- 
diff --git a/main/libfastjson/APKBUILD b/main/libfastjson/APKBUILD
index 9bbd2d786b8..f4a0bfcd756 100644
--- a/main/libfastjson/APKBUILD
+++ b/main/libfastjson/APKBUILD
@@ -1,23 +1,26 @@
 # Contributor: Ashley Sommer <ashleysommer@gmail.com>
 # Maintainer: Ashley Sommer <ashleysommer@gmail.com>
 pkgname=libfastjson
-pkgver=0.99.8
-pkgrel=2
-pkgdesc="A fork of the json-c library for rsyslog, optimized for liblognorm processing."
+pkgver=1.2304.0
+pkgrel=4
+pkgdesc="fork of the json-c library for rsyslog, optimized for liblognorm processing."
 url="https://www.rsyslog.com/"
 arch="all"
 license="MIT"
 makedepends="autoconf automake libtool"
 subpackages="$pkgname-dev $pkgname-dbg"
-source="$pkgname-$pkgver.tar.gz::https://github.com/rsyslog/$pkgname/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/rsyslog/libfastjson/archive/v$pkgver.tar.gz"
+
+# secfixes:
+#   1.2304.0-r0:
+#     - CVE-2020-12762
 
 prepare() {
-	cd "$builddir"
+	default_prepare
 	./autogen.sh
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,13 +32,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="bd68705ab41d360582bb08b1f29be5b16f55d18674f26066cdd36c66a52a571873e013e31dbb0d21ea73684709a63d0f831be9eb12d8c6e9d8eaf5ec71ce6f18  libfastjson-0.99.8.tar.gz"
+sha512sums="
+a43dc809c0fc073f8bddaebdf91c996ccfc6275d7dcc312762e8dfb366dc121c7698c316b71bd5b43f2f7e9b3c326c90cfa927ce415824a7d32dd5e6667048ab  libfastjson-1.2304.0.tar.gz
+"
diff --git a/main/libffi/APKBUILD b/main/libffi/APKBUILD
index 7f3c52864bb..0fd49b272f1 100644
--- a/main/libffi/APKBUILD
+++ b/main/libffi/APKBUILD
@@ -1,54 +1,36 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libffi
-pkgver=3.2.1
-pkgrel=6
-pkgdesc="A portable, high level programming interface to various calling conventions."
-url="http://sourceware.org/libffi"
+pkgver=3.4.6
+pkgrel=0
+pkgdesc="portable, high level programming interface to various calling conventions."
+url="https://sourceware.org/libffi/"
 arch="all"
 license="MIT"
-depends=
 depends_dev="linux-headers"
 makedepends_build="texinfo"
-# on mips* ffitarget.h wants <asm/sgidefs.h>
-makedepends_host="linux-headers"
-install=
-subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.gz
-	gnu-linux-define.patch
-	pax-dlmmap.patch
-	use-stdc-compatible-linux-define.patch
-	mips-softfloat.patch
-	"
+checkdepends="dejagnu"
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc"
+source="https://github.com/libffi/libffi/releases/download/v$pkgver/libffi-$pkgver.tar.gz"
 
-builddir="$srcdir"/$pkgname-$pkgver
-
-build () {
-	cd "$builddir"
+build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--enable-pax_emutramp
+		--enable-pax_emutramp \
+		--enable-portable-binary \
+		--disable-exec-static-tramp
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
-	cd "$builddir"
-	make DESTDIR=""$pkgdir"" install
-	install -m755 -d ""$pkgdir"/usr/share/licenses/$pkgname"
-	install -m644 LICENSE ""$pkgdir"/usr/share/licenses/$pkgname/"
-	# fix location for headers
-	# see also: https://github.com/libffi/libffi/issues/24
-	mkdir -p "$pkgdir"/usr/include/
-	mv "$pkgdir"/usr/lib/libffi-$pkgver/include/*.h \
-		"$pkgdir"/usr/include/
-	rmdir "$pkgdir"/usr/lib/libffi-$pkgver/include || true
-	sed -i -e '/^includedir=/{s,=.*,=/usr/include,g}' \
-		"$pkgdir"/usr/lib/pkgconfig/libffi.pc
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483  libffi-3.2.1.tar.gz
-264af568ae5388d50f647f891a406945c73cc358692266f65ad341787c0bf5f6bf31203b86c39fa1b338101c1a6d2f4fec60f95a90d379951ff5153f8f9e178f  gnu-linux-define.patch
-72486b389db16055ae4d7d33ba0cb05840537e28fe7a86aa89e2cb922592125d99c18c26c5df7ffde6282742e79f2b9126353e58b58f091f0486589e14dd6474  pax-dlmmap.patch
-d15aaf7ecf6fe7a1532695a515a496d462c3930a50ec3e2a019713ecfc810a112250563c41f018834323f201f1c814e7c94d296f167706af300907264ee80924  use-stdc-compatible-linux-define.patch
-e306a6cf0a3084e0ab519c291b70c57ab6d62d20879c224860d9a8969015877077b5180607fd407d8b80a0d2ce28239fc5f899a64305554eb7cf2f1f0792ce95  mips-softfloat.patch"
+sha512sums="
+033d2600e879b83c6bce0eb80f69c5f32aa775bf2e962c9d39fbd21226fa19d1e79173d8eaa0d0157014d54509ea73315ad86842356fc3a303c0831c94c6ab39  libffi-3.4.6.tar.gz
+"
diff --git a/main/libffi/gnu-linux-define.patch b/main/libffi/gnu-linux-define.patch
deleted file mode 100644
index 8dcae738ba8..00000000000
--- a/main/libffi/gnu-linux-define.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.alpinelinux.org/issues/4275
-
-diff --git a/closures.c.orig b/closures.c
-index 721ff00..22a699c 100644
---- a/src/closures.c.orig
-+++ b/src/closures.c
-@@ -34,7 +34,7 @@
- #include <ffi_common.h>
-
- #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE
--# if __gnu_linux__ && !defined(__ANDROID__)
-+# if __linux__ && !defined(__ANDROID__)
- /* This macro indicates it may be forbidden to map anonymous memory
-    with both write and execute permission.  Code compiled when this
-    option is defined will attempt to map such pages once, but if it
diff --git a/main/libffi/mips-softfloat.patch b/main/libffi/mips-softfloat.patch
deleted file mode 100644
index bf2ac5d34db..00000000000
--- a/main/libffi/mips-softfloat.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff --git a/src/mips/n32.S b/src/mips/n32.S
-index b402c88c..edc6905c 100644
---- a/src/mips/n32.S
-+++ b/src/mips/n32.S
-@@ -112,6 +112,16 @@ loadregs:
- 
- 	REG_L	t6, 3*FFI_SIZEOF_ARG($fp)  # load the flags word into t6.
- 
-+#ifdef __mips_soft_float
-+	REG_L	a0, 0*FFI_SIZEOF_ARG(t9)
-+	REG_L	a1, 1*FFI_SIZEOF_ARG(t9)
-+	REG_L	a2, 2*FFI_SIZEOF_ARG(t9)
-+	REG_L	a3, 3*FFI_SIZEOF_ARG(t9)
-+	REG_L	a4, 4*FFI_SIZEOF_ARG(t9)
-+	REG_L	a5, 5*FFI_SIZEOF_ARG(t9)
-+	REG_L	a6, 6*FFI_SIZEOF_ARG(t9)
-+	REG_L	a7, 7*FFI_SIZEOF_ARG(t9)
-+#else
- 	and	t4, t6, ((1<<FFI_FLAG_BITS)-1)
- 	REG_L	a0, 0*FFI_SIZEOF_ARG(t9)
- 	beqz	t4, arg1_next
-@@ -198,6 +208,7 @@ arg7_next:
- arg8_doublep:	
-  	l.d	$f19, 7*FFI_SIZEOF_ARG(t9)	
- arg8_next:	
-+#endif
- 
- callit:		
- 	# Load the function pointer
-@@ -222,6 +233,7 @@ retint:
- 	b	epilogue
- 
- retfloat:
-+#ifndef __mips_soft_float
- 	bne     t6, FFI_TYPE_FLOAT, retdouble
- 	jal	t9
- 	REG_L	t4, 4*FFI_SIZEOF_ARG($fp)
-@@ -280,6 +292,7 @@ retstruct_f_d:
- 	s.s	$f0, 0(t4)
- 	s.d	$f2, 8(t4)
- 	b	epilogue
-+#endif
- 
- retstruct_d_soft:
- 	bne	t6, FFI_TYPE_STRUCT_D_SOFT, retstruct_f_soft
-@@ -483,6 +496,7 @@ $do_closure:
- 	REG_S	a6, A6_OFF2($sp)
- 	REG_S	a7, A7_OFF2($sp)
- 
-+#ifndef __mips_soft_float
- 	# Store all possible float/double registers.
- 	s.d	$f12, F12_OFF2($sp)
- 	s.d	$f13, F13_OFF2($sp)
-@@ -492,6 +506,7 @@ $do_closure:
- 	s.d	$f17, F17_OFF2($sp)
- 	s.d	$f18, F18_OFF2($sp)
- 	s.d	$f19, F19_OFF2($sp)
-+#endif
- 
- 	jalr	t9
- 
-@@ -506,6 +521,7 @@ cls_retint:
- 	b	cls_epilogue
- 
- cls_retfloat:
-+#ifndef __mips_soft_float
- 	bne     v0, FFI_TYPE_FLOAT, cls_retdouble
- 	l.s	$f0, V0_OFF2($sp)
- 	b	cls_epilogue
-@@ -548,6 +564,7 @@ cls_retstruct_f_d:
- 	l.s	$f0, V0_OFF2($sp)
- 	l.d	$f2, V1_OFF2($sp)
- 	b	cls_epilogue
-+#endif
- 	
- cls_retstruct_small2:	
- 	REG_L	v0, V0_OFF2($sp)
-diff --git a/src/mips/o32.S b/src/mips/o32.S
-index 69324e60..44e74cb9 100644
---- a/src/mips/o32.S
-+++ b/src/mips/o32.S
-@@ -82,13 +82,16 @@ sixteen:
- 		
- 	ADDU	$sp, 4 * FFI_SIZEOF_ARG		# adjust $sp to new args
- 
-+#ifndef __mips_soft_float
- 	bnez	t0, pass_d			# make it quick for int
-+#endif
- 	REG_L	a0, 0*FFI_SIZEOF_ARG($sp)	# just go ahead and load the
- 	REG_L	a1, 1*FFI_SIZEOF_ARG($sp)	# four regs.
- 	REG_L	a2, 2*FFI_SIZEOF_ARG($sp)
- 	REG_L	a3, 3*FFI_SIZEOF_ARG($sp)
- 	b	call_it
- 
-+#ifndef __mips_soft_float
- pass_d:
- 	bne	t0, FFI_ARGS_D, pass_f
- 	l.d	$f12, 0*FFI_SIZEOF_ARG($sp)	# load $fp regs from args
-@@ -130,6 +133,7 @@ pass_f_d:
-  #	bne	t0, FFI_ARGS_F_D, call_it
- 	l.s	$f12, 0*FFI_SIZEOF_ARG($sp)	# load $fp regs from args
- 	l.d	$f14, 2*FFI_SIZEOF_ARG($sp)	# passing double and float
-+#endif
- 
- call_it:	
- 	# Load the static chain pointer
-@@ -161,14 +165,23 @@ retfloat:
- 	bne     t2, FFI_TYPE_FLOAT, retdouble
- 	jalr	t9
- 	REG_L	t0, SIZEOF_FRAME + 4*FFI_SIZEOF_ARG($fp)
-+#ifndef __mips_soft_float
- 	s.s	$f0, 0(t0)
-+#else
-+	REG_S	v0, 0(t0)
-+#endif
- 	b	epilogue
- 
- retdouble:	
- 	bne	t2, FFI_TYPE_DOUBLE, noretval
- 	jalr	t9
- 	REG_L	t0, SIZEOF_FRAME + 4*FFI_SIZEOF_ARG($fp)
-+#ifndef __mips_soft_float
- 	s.d	$f0, 0(t0)
-+#else
-+	REG_S	v1, 4(t0)
-+	REG_S	v0, 0(t0)
-+#endif
- 	b	epilogue
- 	
- noretval:	
-@@ -324,9 +337,11 @@ $LCFI22:
- 	li	$13, 1		# FFI_O32
- 	bne	$16, $13, 1f	# Skip fp save if FFI_O32_SOFT_FLOAT
- 	
-+#ifndef __mips_soft_float
- 	# Store all possible float/double registers.
- 	s.d	$f12, FA_0_0_OFF2($fp)
- 	s.d	$f14, FA_1_0_OFF2($fp)
-+#endif
- 1:	
- 	# prepare arguments for ffi_closure_mips_inner_O32
- 	REG_L	a0, 20($12)	 # cif pointer follows tramp.
-@@ -353,6 +368,7 @@ $do_closure:
- 	li	$13, 1		# FFI_O32
- 	bne	$16, $13, 1f	# Skip fp restore if FFI_O32_SOFT_FLOAT
- 
-+#ifndef __mips_soft_float
- 	li	$9, FFI_TYPE_FLOAT
- 	l.s	$f0, V0_OFF2($fp)
- 	beq	$8, $9, closure_done
-@@ -360,6 +376,7 @@ $do_closure:
- 	li	$9, FFI_TYPE_DOUBLE
- 	l.d	$f0, V0_OFF2($fp)
- 	beq	$8, $9, closure_done
-+#endif
- 1:	
- 	REG_L	$3, V1_OFF2($fp)
- 	REG_L	$2, V0_OFF2($fp)
diff --git a/main/libffi/pax-dlmmap.patch b/main/libffi/pax-dlmmap.patch
deleted file mode 100644
index ec4150410d3..00000000000
--- a/main/libffi/pax-dlmmap.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 48d2e46528fb6e621d95a7fa194069fd136b712d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20B=C3=BChler?= <buehler@cert.uni-stuttgart.de>
-Date: Wed, 7 Sep 2016 15:49:48 +0200
-Subject: [PATCH 1/2] dlmmap_locked always needs locking as it always modifies
- execsize
-
----
- src/closures.c | 13 ++++---------
- 1 file changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/src/closures.c b/src/closures.c
-index 2e0ffb45..04d6e27f 100644
---- a/src/closures.c
-+++ b/src/closures.c
-@@ -769,16 +769,11 @@ dlmmap (void *start, size_t length, int prot,
- 	 MREMAP_DUP and prot at this point.  */
-     }
- 
--  if (execsize == 0 || execfd == -1)
--    {
--      pthread_mutex_lock (&open_temp_exec_file_mutex);
--      ptr = dlmmap_locked (start, length, prot, flags, offset);
--      pthread_mutex_unlock (&open_temp_exec_file_mutex);
-+  pthread_mutex_lock (&open_temp_exec_file_mutex);
-+  ptr = dlmmap_locked (start, length, prot, flags, offset);
-+  pthread_mutex_unlock (&open_temp_exec_file_mutex);
- 
--      return ptr;
--    }
--
--  return dlmmap_locked (start, length, prot, flags, offset);
-+  return ptr;
- }
- 
- /* Release memory at the given address, as well as the corresponding
-
-From 7aad5f895e2dfdb79d2ef67e1b231d21063e6511 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20B=C3=BChler?= <buehler@cert.uni-stuttgart.de>
-Date: Wed, 7 Sep 2016 15:50:54 +0200
-Subject: [PATCH 2/2] ignore PaX EMUTRAMP flag; instead check for MPROTECT
-
-- code using ffi_closure_alloc doesn't necessarily generate gcc compatible trampolines; only those are allowed by PaX
-- if MPROTECT is enabled use the same workaround as is used for SELinux (double mmap())
----
- src/closures.c | 29 +++++++++++++----------------
- 1 file changed, 13 insertions(+), 16 deletions(-)
-
-diff --git a/src/closures.c b/src/closures.c
-index 04d6e27f..babecc1a 100644
---- a/src/closures.c
-+++ b/src/closures.c
-@@ -401,14 +401,15 @@ selinux_enabled_check (void)
- 
- #endif /* !FFI_MMAP_EXEC_SELINUX */
- 
--/* On PaX enable kernels that have MPROTECT enable we can't use PROT_EXEC. */
-+/* On PaX enable kernels that have MPROTECT enabled we can't use PROT_EXEC. */
- #ifdef FFI_MMAP_EXEC_EMUTRAMP_PAX
- #include <stdlib.h>
- 
--static int emutramp_enabled = -1;
-+/* -1: not read yet; 0: no PaX or MPROTECT disabled; 1: MPROTECT enabled.  */
-+static int mprotect_enabled = -1;
- 
- static int
--emutramp_enabled_check (void)
-+mprotect_enabled_check (void)
- {
-   char *buf = NULL;
-   size_t len = 0;
-@@ -422,9 +423,7 @@ emutramp_enabled_check (void)
-   while (getline (&buf, &len, f) != -1)
-     if (!strncmp (buf, "PaX:", 4))
-       {
--        char emutramp;
--        if (sscanf (buf, "%*s %*c%c", &emutramp) == 1)
--          ret = (emutramp == 'E');
-+        ret = (NULL != strchr (buf + 4, 'M'));
-         break;
-       }
-   free (buf);
-@@ -432,8 +431,9 @@ emutramp_enabled_check (void)
-   return ret;
- }
- 
--#define is_emutramp_enabled() (emutramp_enabled >= 0 ? emutramp_enabled \
--                               : (emutramp_enabled = emutramp_enabled_check ()))
-+#define is_mprotect_enabled() (mprotect_enabled >= 0 ? mprotect_enabled \
-+                               : (mprotect_enabled = mprotect_enabled_check ()))
-+
- #endif /* FFI_MMAP_EXEC_EMUTRAMP_PAX */
- 
- #elif defined (__CYGWIN__) || defined(__INTERIX)
-@@ -446,7 +446,7 @@ emutramp_enabled_check (void)
- #endif /* !defined(X86_WIN32) && !defined(X86_WIN64) */
- 
- #ifndef FFI_MMAP_EXEC_EMUTRAMP_PAX
--#define is_emutramp_enabled() 0
-+#define is_mprotect_enabled() 0
- #endif /* FFI_MMAP_EXEC_EMUTRAMP_PAX */
- 
- /* Declare all functions defined in dlmalloc.c as static.  */
-@@ -750,13 +750,10 @@ dlmmap (void *start, size_t length, int prot,
- 	  && flags == (MAP_PRIVATE | MAP_ANONYMOUS)
- 	  && fd == -1 && offset == 0);
- 
--  if (execfd == -1 && is_emutramp_enabled ())
--    {
--      ptr = mmap (start, length, prot & ~PROT_EXEC, flags, fd, offset);
--      return ptr;
--    }
--
--  if (execfd == -1 && !is_selinux_enabled ())
-+  /* -1 != execfd hints that we already decided to use dlmmap_locked
-+     last time.  If PaX MPROTECT or SELinux is active fallback to
-+     dlmmap_locked.  */
-+  if (execfd == -1 && !is_mprotect_enabled () && !is_selinux_enabled ())
-     {
-       ptr = mmap (start, length, prot | PROT_EXEC, flags, fd, offset);
- 
diff --git a/main/libffi/use-stdc-compatible-linux-define.patch b/main/libffi/use-stdc-compatible-linux-define.patch
deleted file mode 100644
index ad7c8750150..00000000000
--- a/main/libffi/use-stdc-compatible-linux-define.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mips/ffitarget.h
-+++ b/src/mips/ffitarget.h
-@@ -32,7 +32,7 @@
- #error "Please do not include ffitarget.h directly into your source.  Use ffi.h instead."
- #endif
- 
--#ifdef linux
-+#ifdef __linux__
- # include <asm/sgidefs.h>
- #elif defined(__rtems__)
- /*
diff --git a/main/libfido2/APKBUILD b/main/libfido2/APKBUILD
new file mode 100644
index 00000000000..41c494ffd25
--- /dev/null
+++ b/main/libfido2/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Will Sinatra <wpsinatra@gmail.com>
+pkgname=libfido2
+pkgver=1.14.0
+pkgrel=1
+pkgdesc="library for FIDO 2.0 functionality"
+url="https://github.com/Yubico/libfido2"
+arch="all"
+license="BSD-2-Clause"
+install="$pkgname.pre-install"
+makedepends="cmake libcbor-dev openssl-dev>3 zlib-dev eudev-dev linux-headers samurai"
+subpackages="$pkgname-dev $pkgname-doc fido2:fido"
+source="$pkgname-$pkgver.tar.gz::https://github.com/Yubico/libfido2/archive/refs/tags/$pkgver.tar.gz"
+
+build() {
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake -B build -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		$CMAKE_CROSSOPTS .
+	cmake --build build
+}
+
+check() {
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest -j4
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+	install -Dm644 -t "$pkgdir"/lib/udev/rules.d/ "$builddir"/udev/70-u2f.rules
+}
+
+fido() {
+	pkgdesc="commandline utilities for FIDO 2.0"
+	amove usr/bin
+}
+
+sha512sums="
+83454b0db0cc8546f377d0dd59f95785fe6b73cf28e499a6182a6ece4b7bce17c3e750155262adf71f339ec0b3b6c3d3d64a07b01c8428b4b91de97ae768f0e6  libfido2-1.14.0.tar.gz
+"
diff --git a/main/libfido2/libfido2.pre-install b/main/libfido2/libfido2.pre-install
new file mode 100644
index 00000000000..a2ac1afb479
--- /dev/null
+++ b/main/libfido2/libfido2.pre-install
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+addgroup -S plugdev 2>/dev/null
+
+cat <<EOF
+*
+* To use U2F USB tokens (such as YubiKey), regular users must be members of
+* 'plugdev' group.
+*
+EOF
+
+exit 0
diff --git a/main/libfontenc/APKBUILD b/main/libfontenc/APKBUILD
index ad6b2ba4eb9..0024b51e7b0 100644
--- a/main/libfontenc/APKBUILD
+++ b/main/libfontenc/APKBUILD
@@ -1,19 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libfontenc
-pkgver=1.1.4
-pkgrel=0
+pkgver=1.1.7
+pkgrel=5
 pkgdesc="X11 font encoding library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 options="!check"  # No test suite.
-depends=
 makedepends="util-macros xorgproto zlib-dev"
 subpackages="$pkgname-dev"
-source="https://www.x.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/lib/libfontenc-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,8 +24,9 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582  libfontenc-1.1.4.tar.bz2"
+sha512sums="
+fd8578a81090fa938dd75ad9081ab62c6c54fa2535d1c6291afd799ac8dc7c344a43f07cea5cd4433af16df0d926c22e7c169877bc8b13d92584e7dec173d701  libfontenc-1.1.7.tar.xz
+"
diff --git a/main/libgcrypt/APKBUILD b/main/libgcrypt/APKBUILD
index 1ed022721c4..bf0410a0c7f 100644
--- a/main/libgcrypt/APKBUILD
+++ b/main/libgcrypt/APKBUILD
@@ -1,17 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libgcrypt
-pkgver=1.8.5
+pkgver=1.10.3
 pkgrel=0
-pkgdesc="general purpose crypto library based on the code used in GnuPG"
+pkgdesc="General purpose crypto library based on the code used in GnuPG"
 url="https://www.gnupg.org/"
 arch="all"
-license="LGPL-2.1-or-later"
-depends_dev="libgpg-error-dev"
-makedepends="$depends_dev texinfo"
+license="LGPL-2.1-or-later AND GPL-2.0-or-later"
+makedepends="libgpg-error-dev texinfo"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 source="https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$pkgver.tar.bz2"
 
 # secfixes:
+#   1.9.4-r0:
+#     - CVE-2021-33560
 #   1.8.5-r0:
 #     - CVE-2019-13627
 #   1.8.4-r2:
@@ -19,18 +20,12 @@ source="https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$pkgver.tar.bz2"
 #   1.8.3-r0:
 #     - CVE-2018-0495
 
-build() {
-	local _arch_configure=
-	case "$CARCH" in
-	arm*)
-		# disable arm assembly for now as it produces TEXTRELs
-		export gcry_cv_gcc_arm_platform_as_ok=no
-		;;
-	x86 | x86_64)
-		_arch_configure="--enable-padlock-support"
-		;;
-	esac
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
+build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -38,27 +33,25 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
-		--enable-static \
-		$_arch_configure
-
+		--enable-static
 	make
 }
 
 check() {
-	# t-secmem fails on ppc64le, see https://dev.gnupg.org/T3375
-	[ "$CARCH" != ppc64le ] || return 0
 	make check
 }
 
 package() {
-	make -j1 DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
 	rm -f $pkgdir/usr/share/info/dir
 }
 
-static() {
-	pkgdesc="$pkgnanme static libraries"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
+dev() {
+	default_dev
+
+	amove usr/bin/*
 }
 
-sha512sums="b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89  libgcrypt-1.8.5.tar.bz2"
+sha512sums="
+8a8d4c61a6622d8481ceb9edc88ec43f58da32e316f79f8d4775325a48f8936aaa9eb355923b39e2c267b784e9c390600daeb62e0c94f00e30bbadb0d8c0865d  libgcrypt-1.10.3.tar.bz2
+"
diff --git a/main/libgit2/APKBUILD b/main/libgit2/APKBUILD
deleted file mode 100644
index 416b81eaca4..00000000000
--- a/main/libgit2/APKBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Pierre-Gilas MILLON <pgmillon@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libgit2
-pkgver=0.28.4
-pkgrel=1
-pkgdesc="A linkable library for Git"
-url="https://libgit2.org/"
-arch="all"
-license="GPL-2.0-only WITH GCC-exception-2.0"
-depends_dev="curl-dev libssh2-dev http-parser-dev"
-makedepends="$depends_dev python3 cmake zlib-dev openssl-dev"
-subpackages="$pkgname-static $pkgname-dev $pkgname-tests::noarch"
-source="$pkgname-$pkgver.tar.gz::https://github.com/libgit2/libgit2/archive/v$pkgver.tar.gz
-	"
-
-# secfixes:
-#   0.28.4-r0:
-#     - CVE-2019-1348
-#     - CVE-2019-1349
-#     - CVE-2019-1350
-#     - CVE-2019-1351
-#     - CVE-2019-1352
-#     - CVE-2019-1353
-#     - CVE-2019-1354
-#     - CVE-2019-1387
-#   0.27.4-r0:
-#     - CVE-2018-15501
-#   0.27.3-r0:
-#     - CVE-2018-10887
-#     - CVE-2018-10888
-#   0.25.1-r0:
-#     - CVE-2016-10128
-#     - CVE-2016-10129
-#     - CVE-2016-10130
-#   0.24.3-r0:
-#     - CVE-2016-8568
-#     - CVE-2016-8569
-
-prepare() {
-	default_prepare
-	mkdir -p "$builddir"/build
-	sed -i 's|/usr/bin/env python|/usr/bin/env python3|' tests/generate.py
-}
-
-build() {
-	cd "$builddir"/build
-
-	cmake .. \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_C_FLAGS="$CFLAGS"
-	make
-
-	# Build static library
-	mkdir -p "$builddir"/build-static
-	cd "$builddir"/build-static
-
-	cmake .. \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DBUILD_SHARED_LIBS=OFF
-	make
-}
-
-check() {
-	cd "$builddir"/build
-	# Test 'offline' fails on s390x, aarch64 and ppc64le
-	ctest -E offline
-}
-
-package() {
-	make -C build DESTDIR="$pkgdir" install
-	make -C build-static DESTDIR="$pkgdir" install
-}
-
-tests() {
-	pkgdesc="$pkgdesc (tests)"
-
-	mkdir -p "$subpkgdir"/usr/src/$pkgname/
-	cp -a "$builddir"/tests "$subpkgdir"/usr/src/$pkgname/
-}
-
-sha512sums="b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15  libgit2-0.28.4.tar.gz"
diff --git a/main/libgpg-error/APKBUILD b/main/libgpg-error/APKBUILD
index 56919b7bb16..a16244e3612 100644
--- a/main/libgpg-error/APKBUILD
+++ b/main/libgpg-error/APKBUILD
@@ -1,24 +1,16 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 # Contributor: Arto Kitula <arto.kitula@gmail.com>
-
 pkgname=libgpg-error
-pkgver=1.37
+pkgver=1.48
 pkgrel=0
 pkgdesc="Support library for libgcrypt"
-url="http://www.gnupg.org"
+url="https://www.gnupg.org/"
 arch="all"
-license="GPL-2.0-or-later LGPL-2.1-or-later"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-lisp:lisp:noarch"
-makedepends="automake autoconf"
 source="https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-$pkgver.tar.bz2"
 
-prepare() {
-	default_prepare
-	aclocal
-	automake
-}
-
 build() {
 	./configure \
 		--build=$CBUILD \
@@ -27,6 +19,7 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
+		--enable-install-gpg-error-config \
 		--enable-static \
 		--disable-nls
 	make
@@ -37,7 +30,13 @@ check() {
 }
 
 package() {
-	make -j1 DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
+}
+
+dev() {
+	default_dev
+
+	amove usr/bin/yat2m
 }
 
 lisp() {
@@ -46,9 +45,11 @@ lisp() {
 }
 
 static() {
-	pkgdesc="$pkgnanme static libraries"
+	pkgdesc="$pkgname static libraries"
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
 }
 
-sha512sums="fa12977237fcc872e944cda39ca43ee7d2cc9c52e243ede6077f4a31ae135e322dc848b4b55cffdc4ec53f27601ba30ddb368b090a94cd00d9345a55b323f179  libgpg-error-1.37.tar.bz2"
+sha512sums="
+3e9ea99cfb7d706791eb3349a9356b6bc44a53ef8bfa9a4e89afb5203dad5af3f466a039a1764361c0c7f697a6fa668a21d05ceaeb8e44ec5a11d6468998adf2  libgpg-error-1.48.tar.bz2
+"
diff --git a/main/libgphoto2/APKBUILD b/main/libgphoto2/APKBUILD
deleted file mode 100644
index 5d9e6c243be..00000000000
--- a/main/libgphoto2/APKBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libgphoto2
-pkgver=2.5.24
-pkgrel=0
-pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs."
-url="http://www.gphoto.org"
-arch="all"
-license="LGPL-2.1-or-later"
-depends_dev="libexif-dev libusb-dev"
-makedepends="$depends_dev libjpeg-turbo-dev libtool"
-install="$pkgname.pre-install $pkgname.pre-upgrade"
-subpackages="$pkgname-dev $pkgname-doc"
-replaces="libgphoto2-dev"
-source="https://downloads.sourceforge.net/gphoto/libgphoto2-$pkgver.tar.bz2"
-options="libtool"
-
-build() {
-	udevscriptdir=/lib/udev ./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--with-drivers=all \
-		--disable-static \
-		--disable-rpath
-	make
-}
-
-check() {
-	make check
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-	rm -f "$pkgdir"/usr/lib/libgphoto2/*/*.a \
-		"$pkgdir"/usr/lib/*.a
-
-	install -m755 -d "$pkgdir/lib/udev/rules.d"
-	LD_LIBRARY_PATH="$pkgdir/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
-		CAMLIBS="$pkgdir/usr/lib/libgphoto2/$pkgver" \
-		"$pkgdir/usr/lib/libgphoto2/print-camera-list" udev-rules version 136 group camera mode 0660 > "$pkgdir/lib/udev/rules.d/54-gphoto.rules"
-}
-
-sha512sums="8e9256ac3078a9fbb80ef124983b8dcf47a4693f28a55f38ceffbe60ead9e41bfd79296a001752d6d37dc13b369c26efc2e429409520a06604d1c4cfd72dd9b1  libgphoto2-2.5.24.tar.bz2"
diff --git a/main/libgphoto2/libgphoto2.pre-install b/main/libgphoto2/libgphoto2.pre-install
deleted file mode 100644
index c696fcdcaf1..00000000000
--- a/main/libgphoto2/libgphoto2.pre-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-addgroup -S camera 2>/dev/null
-
-exit 0
diff --git a/main/libgphoto2/libgphoto2.pre-upgrade b/main/libgphoto2/libgphoto2.pre-upgrade
deleted file mode 120000
index bc38b3b082a..00000000000
--- a/main/libgphoto2/libgphoto2.pre-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-libgphoto2.pre-install
\ No newline at end of file
diff --git a/main/libgsf/APKBUILD b/main/libgsf/APKBUILD
deleted file mode 100644
index 998d53f38d3..00000000000
--- a/main/libgsf/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libgsf
-pkgver=1.14.47
-pkgrel=0
-pkgdesc="Utility library for reading and writing structured file formats"
-url="https://www.gnome.org/"
-arch="all"
-license="LGPL-2.1-only"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-depends_dev="bzip2-dev"
-makedepends="libxml2-dev glib-dev bzip2-dev intltool python3 zlib-dev
-	gobject-introspection-dev"
-source="https://download.gnome.org/sources/libgsf/1.14/libgsf-$pkgver.tar.xz"
-
-# secfixes:
-#   1.14.41-r0:
-#     - CVE-2016-9888
-
-build() {
-	sed -i -e 's/gsf-gnome//' -e 's/thumbnailer//' Makefile.*
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--disable-static \
-		--without-gnome-vfs \
-		--without-bonobo \
-		--enable-introspection
-	make
-}
-
-check() {
-	make check
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-	rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1
-}
-
-sha512sums="143d48eb02be8202b9eb97e29e5909061a0e1a562b86e4bb4b2eac3fb0a42b139ead131ed1ffa4dfe304b65527089777823122223a74ebbc9df94c17d013f97b  libgsf-1.14.47.tar.xz"
diff --git a/main/libical/APKBUILD b/main/libical/APKBUILD
index 84cbe013980..10f2c9202aa 100644
--- a/main/libical/APKBUILD
+++ b/main/libical/APKBUILD
@@ -1,39 +1,39 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libical
-pkgver=3.0.8
-pkgrel=1
+pkgver=3.0.18
+pkgrel=0
 pkgdesc="Reference implementation of the iCalendar format"
 url="https://libical.github.io/libical/"
 arch="all"
 license="LGPL-2.1-only OR MPL-2.0"
-depends_dev="db-dev"
-makedepends="$depends_dev perl cmake glib-dev icu-dev libxml2-dev
-	gobject-introspection-dev vala"
+depends_dev="libxml2-dev gobject-introspection-dev"
+makedepends="perl cmake vala glib-dev icu-dev samurai $depends_dev"
 checkdepends="tzdata py3-gobject3"
 subpackages="$pkgname-dev"
 source="https://github.com/libical/libical/releases/download/v$pkgver/libical-$pkgver.tar.gz"
 
-
 build() {
-	cmake -B build . \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DSHARED_ONLY=true \
 		-DENABLE_GTK_DOC=false \
 		-DGOBJECT_INTROSPECTION=true \
 		-DICAL_GLIB_VAPI=true
-	make -C build
+	cmake --build build
 }
 
 check() {
 	cd build
-	ctest -E regression
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(icalrecurtest|icalrecurtest_r)'
 }
 
 package() {
-	make -C build DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
-sha512sums="ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b  libical-3.0.8.tar.gz"
+sha512sums="
+53ecf6c14a68d569dd11bfdeb1a072def847a14d189c6af16eab202e004350ee7d9488c6b63e9cb67889e8c2dec90643fef46aec143a915f28270d0752eaa9d5  libical-3.0.18.tar.gz
+"
diff --git a/main/libice/APKBUILD b/main/libice/APKBUILD
index 304d87a0bf4..af947c6facb 100644
--- a/main/libice/APKBUILD
+++ b/main/libice/APKBUILD
@@ -1,29 +1,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libice
-pkgver=1.0.10
-pkgrel=0
+pkgver=1.1.1
+pkgrel=6
 pkgdesc="X11 Inter-Client Exchange library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
 license="X11"
-makedepends="xorgproto xtrans util-macros xmlto check-dev
-	autoconf automake libtool"
+makedepends="
+	check-dev
+	util-macros
+	xmlto
+	xorgproto
+	xtrans
+	"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="https://www.x.org/releases/individual/lib/libICE-$pkgver.tar.bz2"
-
+source="https://www.x.org/releases/individual/lib/libICE-$pkgver.tar.xz"
 builddir="$srcdir/libICE-$pkgver"
 
 # secfixes:
 #   1.0.10-r0:
-#   - CVE-2017-2626
-
-prepare() {
-	default_prepare
-	autoreconf -fi
-}
+#     - CVE-2017-2626
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -37,12 +35,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468  libICE-1.0.10.tar.bz2"
+
+sha512sums="
+2f7833a25f31cc743ca95cb88f9a8403b50e19ffb5bf43bfef87ba405857d359789daaa9ec2391351237d958f16d35dbf082adb76d301e46d3a54162a6b452d3  libICE-1.1.1.tar.xz
+"
diff --git a/main/libid3tag/APKBUILD b/main/libid3tag/APKBUILD
index 175579c2543..6d05da73639 100644
--- a/main/libid3tag/APKBUILD
+++ b/main/libid3tag/APKBUILD
@@ -1,61 +1,36 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=libid3tag
-pkgver=0.15.1b
-pkgrel=7
+pkgver=0.16.2
+pkgrel=2
 pkgdesc="MAD ID3 tagger for MP3 audio files"
-url="http://www.underbit.com/products/mad/"
+url="https://codeberg.org/tenacityteam/libid3tag"
 arch="all"
-license="GPL-2.0+"
-depends=""
-makedepends="zlib-dev"
-install=
+license="GPL-2.0-or-later"
+options="!check" # no tests
+makedepends="cmake samurai zlib-dev"
 subpackages="$pkgname-dev"
-source="ftp://ftp.mars.org/pub/mpeg/libid3tag-$pkgver.tar.gz
-	CVE-2008-2109.patch
-	"
+source="$pkgname-$pkgver-1.tar.gz::https://codeberg.org/tenacityteam/libid3tag/archive/$pkgver.tar.gz"
+builddir="$srcdir/$pkgname"
 
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-}
+# secfixes:
+#   0.16.2-r0:
+#     - CVE-2017-11550
+#   0.16.1-r0:
+#     - CVE-2017-11551
 
 build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib
+	cmake --build build
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	mkdir -p "$pkgdir"/usr/lib/pkgconfig
-	cat > "$pkgdir"/usr/lib/pkgconfig/id3tag.pc <<EOF
-prefix=/usr
-exec_prefix=/usr/bin
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: id3tag
-Description: ID3 tag manipulation library
-Requires:
-Version: $pkgver
-Libs: -lid3tag
-Cflags:
-EOF
+	DESTDIR="$pkgdir" cmake --install build
 }
 
-sha512sums="ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3  libid3tag-0.15.1b.tar.gz
-fc79d44ca9d1435ab5b11d4da6b46d3684827a1384a0156cd88242225f98f3a0668c0d6e6a88159f0c4985fcbdc636777c2f100d7f371eef258a6050d6fde567  CVE-2008-2109.patch"
+sha512sums="
+b093614599ddc4d90072f355659a6d4d7d9fb6fe99509f62273db27291c02fb6cba280bb7ee954e014f4e5cffecc4e7f0258ebd15fcd18bf4e8abf8a02267c4c  libid3tag-0.16.2-1.tar.gz
+"
diff --git a/main/libid3tag/CVE-2008-2109.patch b/main/libid3tag/CVE-2008-2109.patch
deleted file mode 100644
index 6226d14af7a..00000000000
--- a/main/libid3tag/CVE-2008-2109.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/field.c.orig	2008-05-05 09:49:15.000000000 -0400
-+++ b/field.c	2008-05-05 09:49:25.000000000 -0400
-@@ -291,7 +291,7 @@
- 
-       end = *ptr + length;
- 
--      while (end - *ptr > 0) {
-+      while (end - *ptr > 0 && **ptr != '\0') {
- 	ucs4 = id3_parse_string(ptr, end - *ptr, *encoding, 0);
- 	if (ucs4 == 0)
- 	  goto fail;
diff --git a/main/libidl/APKBUILD b/main/libidl/APKBUILD
deleted file mode 100644
index 24650de7f3b..00000000000
--- a/main/libidl/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: 
-# Maintainer: 
-pkgname=libidl
-pkgver=0.8.14
-pkgrel=2
-pkgdesc="Library for parsing Interface Definition Language files"
-url="https://www.gnome.org/"
-arch="all"
-options="!check"  # No test suite.
-license="LGPL-2.0+"
-depends=
-makedepends="glib-dev flex bison"
-install=
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://download.gnome.org/sources/libIDL/${pkgver%.*}/libIDL-$pkgver.tar.bz2"
-
-builddir="$srcdir"/libIDL-$pkgver
-
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="906dde087908acd64b209fe466a89ae52a6ea23601cb30092063a6e062b1b6640fc2d5f422efcdd52b2b36ce20e6c244da6205fde0bdcec787fe64058be7adac  libIDL-0.8.14.tar.bz2"
diff --git a/main/libidn/APKBUILD b/main/libidn/APKBUILD
index b02d5db3ccd..efd2dfaf9e8 100644
--- a/main/libidn/APKBUILD
+++ b/main/libidn/APKBUILD
@@ -1,31 +1,27 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libidn
-pkgver=1.35
+pkgver=1.42
 pkgrel=0
 pkgdesc="Encode/Decode library for internationalized domain names"
 url="https://www.gnu.org/software/libidn"
 arch="all"
-license="GPL-2.0-or-later GPL-3.0-or-later LGPL-3.0-or-later"
-depends=
-makedepends=
+license="LGPL-2.1-or-later"
+makedepends="help2man texinfo"
 checkdepends="diffutils"
-install=
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://ftp.gnu.org/gnu/libidn/$pkgname-$pkgver.tar.gz
-	localename-test-fix.patch"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://ftp.gnu.org/gnu/libidn/libidn-$pkgver.tar.gz
+	format-security.patch
+	"
 
 # secfixes:
 #   1.33-r0:
-#   - CVE-2015-8948
-#   - CVE-2016-6261
-#   - CVE-2016-6262
-#   - CVE-2016-6263
+#     - CVE-2015-8948
+#     - CVE-2016-6261
+#     - CVE-2016-6262
+#     - CVE-2016-6263
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -38,17 +34,17 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	# only keep man pages
 	rm -rf "$pkgdir"/usr/share/info
 }
 
-sha512sums="782260f73b1fd8ebea8a40e2b3a6866c4f67494b2b3df03748daa9c0f842a9578932e746eb4bbf2547fccb1d65d7fc99a7977759dbe58f87f2fdd26d0fe45a09  libidn-1.35.tar.gz
-c37f9e318ab1f1e44a75074395bd8a93429265bdd3ccc6d7eae0f78beff53ff8ebac531a072d1859053ef517c7a1a6c1bf1b1f579d6dfc183df4cd016be4f825  localename-test-fix.patch"
+sha512sums="
+1a99f0c9aa12cebed2de7db603c203696544cfe093afd7b233b0955f4fbe65440bf637089a624ed74e204abe854b1d16d11b77dc1b8d56c97ba6b20715aeb0d7  libidn-1.42.tar.gz
+bc4fc4348ff87615d40cc535b35de6edfe4379720313df1de8d0041609307dec51b1d283da29b562f7d5ab8fd1934ad094ea5df8044341ad206009739e7751c9  format-security.patch
+"
diff --git a/main/libidn/format-security.patch b/main/libidn/format-security.patch
new file mode 100644
index 00000000000..1ebf736e1c9
--- /dev/null
+++ b/main/libidn/format-security.patch
@@ -0,0 +1,129 @@
+diff --git a/src/idn.c b/src/idn.c
+index 9e1e766..ea89ecb 100644
+--- a/src/idn.c
++++ b/src/idn.c
+@@ -170,7 +170,7 @@ main (int argc, char *argv[])
+       (args_info.nfkc_given ? 1 : 0) != 1)
+     {
+       error (0, 0,
+-	     _("only one of -s, -e, -d, -a, -u or -n can be specified"));
++	     "%s", _("only one of -s, -e, -d, -a, -u or -n can be specified"));
+       usage (EXIT_FAILURE);
+     }
+ 
+@@ -183,7 +183,7 @@ main (int argc, char *argv[])
+ 
+   if (!args_info.quiet_given
+       && args_info.inputs_num == 0 && isatty (fileno (stdin)))
+-    fprintf (stderr, _("Type each input string on a line by itself, "
++    fprintf (stderr, "%s", _("Type each input string on a line by itself, "
+ 		       "terminated by a newline character.\n"));
+ 
+   do
+@@ -195,7 +195,7 @@ main (int argc, char *argv[])
+ 	  if (feof (stdin))
+ 	    break;
+ 
+-	  error (EXIT_FAILURE, errno, _("input error"));
++	  error (EXIT_FAILURE, errno, "%s", _("input error"));
+ 	}
+ 
+       if (strlen (line) > 0)
+@@ -213,7 +213,7 @@ main (int argc, char *argv[])
+ 	  if (!q)
+ 	    {
+ 	      free (p);
+-	      error (EXIT_FAILURE, 0,
++	      error (EXIT_FAILURE, 0, "%s",
+ 		     _("could not convert from UTF-8 to UCS-4"));
+ 	    }
+ 
+@@ -238,7 +238,7 @@ main (int argc, char *argv[])
+ 	  if (!q)
+ 	    {
+ 	      free (r);
+-	      error (EXIT_FAILURE, 0,
++	      error (EXIT_FAILURE, 0, "%s",
+ 		     _("could not convert from UTF-8 to UCS-4"));
+ 	    }
+ 
+@@ -275,7 +275,7 @@ main (int argc, char *argv[])
+ 	  q = stringprep_utf8_to_ucs4 (p, -1, &len);
+ 	  free (p);
+ 	  if (!q)
+-	    error (EXIT_FAILURE, 0,
++	    error (EXIT_FAILURE, 0, "%s",
+ 		   _("could not convert from UTF-8 to UCS-4"));
+ 
+ 	  if (args_info.debug_given)
+@@ -334,7 +334,7 @@ main (int argc, char *argv[])
+ 	  r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL);
+ 	  free (q);
+ 	  if (!r)
+-	    error (EXIT_FAILURE, 0,
++	    error (EXIT_FAILURE, 0, "%s",
+ 		   _("could not convert from UCS-4 to UTF-8"));
+ 
+ 	  p = stringprep_utf8_to_locale (r);
+@@ -358,14 +358,14 @@ main (int argc, char *argv[])
+ 	  q = stringprep_utf8_to_ucs4 (p, -1, NULL);
+ 	  free (p);
+ 	  if (!q)
+-	    error (EXIT_FAILURE, 0,
++	    error (EXIT_FAILURE, 0, "%s",
+ 		   _("could not convert from UCS-4 to UTF-8"));
+ 
+ 	  if (args_info.debug_given)
+ 	    {
+ 	      size_t i;
+ 	      for (i = 0; q[i]; i++)
+-		fprintf (stderr, "input[%lu] = U+%04x\n",
++		fprintf (stderr, "%s", "input[%lu] = U+%04x\n",
+ 			 (unsigned long) i, q[i]);
+ 	    }
+ 
+@@ -436,7 +436,7 @@ main (int argc, char *argv[])
+ 	  if (!q)
+ 	    {
+ 	      free (p);
+-	      error (EXIT_FAILURE, 0,
++	      error (EXIT_FAILURE, 0, "%s",
+ 		     _("could not convert from UCS-4 to UTF-8"));
+ 	    }
+ 
+@@ -492,7 +492,7 @@ main (int argc, char *argv[])
+ 	  r = stringprep_ucs4_to_utf8 (q, -1, NULL, NULL);
+ 	  free (q);
+ 	  if (!r)
+-	    error (EXIT_FAILURE, 0,
++	    error (EXIT_FAILURE, 0, "%s",
+ 		   _("could not convert from UTF-8 to UCS-4"));
+ 
+ 	  p = stringprep_utf8_to_locale (r);
+@@ -521,7 +521,7 @@ main (int argc, char *argv[])
+ 	      if (!q)
+ 		{
+ 		  free (p);
+-		  error (EXIT_FAILURE, 0,
++		  error (EXIT_FAILURE, 0, "%s",
+ 			 _("could not convert from UTF-8 to UCS-4"));
+ 		}
+ 
+@@ -535,7 +535,7 @@ main (int argc, char *argv[])
+ 	  r = stringprep_utf8_nfkc_normalize (p, -1);
+ 	  free (p);
+ 	  if (!r)
+-	    error (EXIT_FAILURE, 0, _("could not do NFKC normalization"));
++	    error (EXIT_FAILURE, 0, "%s", _("could not do NFKC normalization"));
+ 
+ 	  if (args_info.debug_given)
+ 	    {
+@@ -545,7 +545,7 @@ main (int argc, char *argv[])
+ 	      if (!q)
+ 		{
+ 		  free (r);
+-		  error (EXIT_FAILURE, 0,
++		  error (EXIT_FAILURE, 0, "%s",
+ 			 _("could not convert from UTF-8 to UCS-4"));
+ 		}
+ 
diff --git a/main/libidn/localename-test-fix.patch b/main/libidn/localename-test-fix.patch
deleted file mode 100644
index 8debe393862..00000000000
--- a/main/libidn/localename-test-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/lib/gltests/localename.c	2018-02-03 19:27:45.000000000 +0000
-+++ b/lib/gltests/localename.c	2018-04-01 15:54:44.383612550 +0000
-@@ -40,7 +40,7 @@
- # if defined __APPLE__ && defined __MACH__
- #  include <xlocale.h>
- # endif
--# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || defined __CYGWIN__
-+# if defined __linux__
- #  include <langinfo.h>
- # endif
- # if !defined IN_LIBINTL
-@@ -2692,16 +2692,19 @@ gl_locale_name_thread_unsafe (int catego
-     locale_t thread_locale = uselocale (NULL);
-     if (thread_locale != LC_GLOBAL_LOCALE)
-       {
-+# if defined(_NL_LOCALE_NAME)
-+	const char *name = nl_langinfo(_NL_LOCALE_NAME(category));
- #  if __GLIBC__ >= 2 && !defined __UCLIBC__
-         /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
-            glibc < 2.12.
-            See <https://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */
--        const char *name =
--          nl_langinfo (_NL_ITEM ((category), _NL_ITEM_INDEX (-1)));
-+        if (name[0] == '\0')
-+          name = nl_langinfo (_NL_ITEM ((category), _NL_ITEM_INDEX (-1)));
-         if (name[0] == '\0')
-           /* Fallback code for glibc < 2.4, which did not implement
-              nl_langinfo (_NL_LOCALE_NAME (category)).  */
-           name = thread_locale->__names[category];
-+# endif
-         return name;
- #  elif (defined __FreeBSD__ || defined __DragonFly__) || (defined __APPLE__ && defined __MACH__)
-         /* FreeBSD, Mac OS X */
diff --git a/main/libidn2/APKBUILD b/main/libidn2/APKBUILD
index d778e36e068..afb526cbae9 100644
--- a/main/libidn2/APKBUILD
+++ b/main/libidn2/APKBUILD
@@ -1,14 +1,14 @@
-# Maintainer: Drew DeVault <sir@cmpwn.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libidn2
-pkgver=2.3.0
+pkgver=2.3.7
 pkgrel=0
 pkgdesc="Encode/Decode library for internationalized domain names"
 url="https://www.gnu.org/software/libidn#libidn2"
 arch="all"
-license="GPL-2.0-or-later GPL-3.0-or-later LGPL-3.0-or-later"
+license="GPL-2.0-or-later OR LGPL-3.0-or-later"
 makedepends="libunistring-dev"
 checkdepends="diffutils"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
+subpackages="${pkgname#lib}-utils:utils $pkgname-static $pkgname-dev $pkgname-doc"
 source="https://ftp.gnu.org/gnu/libidn/libidn2-$pkgver.tar.gz"
 
 # secfixes:
@@ -40,4 +40,13 @@ package() {
 	rm -rf "$pkgdir"/usr/share/info
 }
 
-sha512sums="a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187  libidn2-2.3.0.tar.gz"
+utils() {
+	license='GPL-3.0-or-later'
+	pkgdesc="$pkgdesc (CLI utilities)"
+
+	amove 'usr/bin'
+}
+
+sha512sums="
+eab5702bc0baed45492f8dde43a4d2ea3560ad80645e5f9e0cfa8d3b57bccd7fd782d04638e000ba07924a5d9f85e760095b55189188c4017b94705bef9b4a66  libidn2-2.3.7.tar.gz
+"
diff --git a/main/libiec61883/APKBUILD b/main/libiec61883/APKBUILD
deleted file mode 100644
index 30f9559a6b6..00000000000
--- a/main/libiec61883/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libiec61883
-pkgver=1.2.0
-pkgrel=2
-pkgdesc="Streaming library for IEEE1394"
-url="http://ieee1394.wiki.kernel.org/index.php/Libraries#libiec61883"
-arch="all"
-options="!check"  # No test suite.
-license="LGPL-2.1-or-later"
-depends=
-makedepends="libraw1394-dev"
-install=""
-subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
-source="https://www.kernel.org/pub/linux/libs/ieee1394/libiec61883-$pkgver.tar.xz"
-
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" INSTALL="install -p" install
-}
-
-utils() {
-	pkgdesc="Utilities for use with libiec61883"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
-}
-
-sha512sums="817177081a229c6253340e5911369aab746bd657d5b3d6a1ef3cf639cceee667bdb677fb0536163468cc9e719c4e81c6beaf42c93e5a56eb52684964b6dd1e23  libiec61883-1.2.0.tar.xz"
diff --git a/main/libinput/APKBUILD b/main/libinput/APKBUILD
deleted file mode 100644
index c5879f93ada..00000000000
--- a/main/libinput/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: Daniel Sabogal <dsabogalcc@gmail.com>
-pkgname=libinput
-pkgver=1.15.4
-pkgrel=0
-pkgdesc="Library for handling input devices"
-url="https://www.freedesktop.org/wiki/Software/libinput"
-arch="all"
-license="MIT"
-makedepends="eudev-dev libevdev-dev meson mtdev-dev"
-checkdepends="diffutils bash"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-source="https://freedesktop.org/software/libinput/libinput-$pkgver.tar.xz"
-
-build() {
-	meson \
-		--buildtype=plain \
-		--prefix=/usr \
-		--libdir=lib \
-		-Ddocumentation=false \
-		-Dlibwacom=false \
-		-Ddebug-gui=false \
-		-Dtests=false builddir/
-	ninja -C builddir/
-}
-
-check() {
-	cd "$builddir/builddir"
-	ninja test
-}
-
-package() {
-	DESTDIR="$pkgdir" ninja -C builddir/ install
-}
-
-sha512sums="4659818952dc729cd5bdb78ebe21edbbacbf8a66a592b13ba30f3bb4c4e264208ec94440a253cfa4edc8b2ef904954eecea6be0f8d63cf239e3858d3abb64a80  libinput-1.15.4.tar.xz"
diff --git a/main/libisoburn/APKBUILD b/main/libisoburn/APKBUILD
new file mode 100644
index 00000000000..df6e625f3c2
--- /dev/null
+++ b/main/libisoburn/APKBUILD
@@ -0,0 +1,55 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libisoburn
+pkgver=1.5.6
+pkgrel=0
+pkgdesc="Library to enable creation and expansion of ISO-9660 filesystems"
+url="https://dev.lovelyhq.com/libburnia/libisoburn"
+arch="all"
+license="GPL-2.0-or-later"
+makedepends="
+	acl-dev
+	libburn-dev
+	libedit-dev
+	libisofs-dev
+	zlib-dev
+	"
+subpackages="$pkgname-dev $pkgname-doc xorriso:_xorriso"
+source="https://files.libburnia-project.org/releases/libisoburn-$pkgver.tar.gz"
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
+build() {
+	CFLAGS="$CFLAGS -flto=auto" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--disable-static
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	rm "$pkgdir"/usr/bin/xorriso-tcltk
+	ln -s xorriso "$pkgdir"/usr/bin/mkisofs
+}
+
+_xorriso() {
+	pkgdesc="ISO-9660 and Rock Ridge image manipulation tool"
+	replaces="cdrkit"
+	amove usr/bin
+}
+
+sha512sums="
+0fc0058aa4cf755f30d5be0de808012978c657348412c7f129b8f8128da41f18216f3e039050a5851b557ffab344cf7dc44df374400ca008e34e2e2524fbd979  libisoburn-1.5.6.tar.gz
+"
diff --git a/main/libisofs/APKBUILD b/main/libisofs/APKBUILD
new file mode 100644
index 00000000000..bdca65435ab
--- /dev/null
+++ b/main/libisofs/APKBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libisofs
+pkgver=1.5.6
+pkgrel=0
+pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image"
+url="https://dev.lovelyhq.com/libburnia/libisofs"
+arch="all"
+license="GPL-2.0-or-later"
+makedepends="acl-dev zlib-dev"
+subpackages="$pkgname-dev"
+source="https://files.libburnia-project.org/releases/libisofs-$pkgver.tar.gz"
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
+build() {
+	CFLAGS="$CFLAGS -flto=auto" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--enable-libacl \
+		--enable-xattr \
+		--disable-static
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+a5f573bbe9758e072fad195cc9beb672568273ddb993ece9c15585ad3f99efb0deae6fefb6d3d40b9712e73e3bc68869d79d923b2a09623d190f5dc84974d65f  libisofs-1.5.6.tar.gz
+"
diff --git a/main/libjpeg-turbo/APKBUILD b/main/libjpeg-turbo/APKBUILD
index e8b4c255952..7eb09c36324 100644
--- a/main/libjpeg-turbo/APKBUILD
+++ b/main/libjpeg-turbo/APKBUILD
@@ -1,21 +1,26 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libjpeg-turbo
-pkgver=2.0.4
-pkgrel=1
+pkgver=3.0.2
+pkgrel=0
 pkgdesc="Accelerated baseline JPEG compression and decompression library"
 url="https://libjpeg-turbo.org/"
 arch="all"
-license="BSD-3-Clause IJG Zlib"
-makedepends="cmake nasm"
+license="BSD-3-Clause AND IJG AND Zlib"
+makedepends="cmake nasm samurai"
 replaces="libjpeg"
-subpackages="$pkgname-static $pkgname-doc $pkgname-dev $pkgname-utils"
-source="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.tar.gz"
-
-# Some tests broken on mips64.
-[ "$CARCH" = "mips64" ] && options="!check"
+subpackages="$pkgname-static $pkgname-doc $pkgname-dev libturbojpeg $pkgname-utils"
+source="https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$pkgver/libjpeg-turbo-$pkgver.tar.gz"
 
 # secfixes:
+#   2.1.5.1-r4:
+#     - CVE-2023-2804
+#   2.1.0-r0:
+#     - CVE-2021-20205
+#   2.0.6-r0:
+#     - CVE-2020-35538
+#   2.0.4-r2:
+#     - CVE-2020-13790
 #   2.0.4-r0:
 #     - CVE-2019-2201
 #   2.0.2-r0:
@@ -26,28 +31,52 @@ source="https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.ta
 #   1.5.3-r2:
 #     - CVE-2018-1152
 
-
 build() {
+	local _floattest=
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
-	cmake \
+	case "$CARCH" in
+		ppc64le) export JSIMD_FORCENONE=1;;
+		s390x|riscv64) _floattest="-DFLOATTEST=fp-contract";;
+	esac
+
+	CFLAGS="$CFLAGS -O2 -DNDEBUG -flto=auto" \
+	CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG -flto=auto" \
+	cmake -B build-shared -G Ninja \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
 		-DBUILD_SHARED_LIBS=True \
+		-DENABLE_STATIC=False \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_SKIP_INSTALL_RPATH=ON \
+		-DWITH_JPEG8=1 \
+		$_floattest \
+		$CMAKE_CROSSOPTS
+	cmake --build build-shared
+
+	cmake -B build-static -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		-DBUILD_SHARED_LIBS=False \
+		-DENABLE_STATIC=True \
 		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
+		-DCMAKE_SKIP_INSTALL_RPATH=ON \
 		-DWITH_JPEG8=1 \
+		$_floattest \
 		$CMAKE_CROSSOPTS
-	make
+	cmake --build build-static
 }
 
 check() {
-	make test
+	cd build-shared
+	# random checksum failures
+	ctest --output-on-failure -E '(djpeg-shared-3x2-float-prog-cmp|example-12bit-shared-decompress-cmp)'
 }
 
 package() {
-	make -j1 DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build-static
+	DESTDIR="$pkgdir" cmake --install build-shared
 	install -d "$pkgdir"/usr/share/licenses/$pkgname
 	ln -s ../../doc/libjpeg-turbo/LICENSE.md "$pkgdir/usr/share/licenses/$pkgname"
 }
@@ -55,8 +84,12 @@ package() {
 utils() {
 	pkgdesc="Utilities for manipulating JPEG images"
 	replaces="jpeg"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+
+	amove usr/bin
+}
+
+libturbojpeg() {
+	amove usr/lib/libturbojpeg.so.*
 }
 
 doc() {
@@ -69,4 +102,6 @@ dev() {
 	replaces="jpeg-dev"
 }
 
-sha512sums="708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9  libjpeg-turbo-2.0.4.tar.gz"
+sha512sums="
+f5eadda0712feb810a8c3bb2621fda24a4c30574998ce30f423b3ffa25225c7a87cb14b696232bc0270485f422a2853a5c32eafb65bc5eeab1b41d8aeb32ad29  libjpeg-turbo-3.0.2.tar.gz
+"
diff --git a/main/libkcapi/APKBUILD b/main/libkcapi/APKBUILD
new file mode 100644
index 00000000000..f5169406321
--- /dev/null
+++ b/main/libkcapi/APKBUILD
@@ -0,0 +1,86 @@
+# Maintainer:
+pkgname=libkcapi
+pkgver=1.4.0
+pkgrel=4
+pkgdesc="Linux Kernel Crypto API User Space Interface Library"
+url="https://www.chronox.de/libkcapi.html"
+arch="all"
+license="BSD-3-Clause OR GPL-2.0-only"
+makedepends="
+	autoconf
+	automake
+	libtool
+	linux-headers
+	"
+checkdepends="bash openssl"
+subpackages="$pkgname-dev $pkgname-tools $pkgname-doc"
+source="https://www.chronox.de/libkcapi/libkcapi-$pkgver.tar.xz
+	no-werror.patch
+	"
+# requires AF_ALG support and enablement of ktls on running kernel
+options="!check"
+
+prepare() {
+	default_prepare
+
+	autoreconf -fvi
+}
+
+build() {
+	CFLAGS="$CFLAGS -flto=auto" \
+	./configure \
+		--prefix=/usr \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--enable-kcapi-hasher \
+		--enable-kcapi-speed \
+		--enable-kcapi-rngapp \
+		--enable-kcapi-encapp \
+		--enable-kcapi-dgstapp \
+		--enable-kcapi-test \
+		--disable-static
+	make
+}
+
+check() {
+	local tests="
+		hasher-test.sh
+		kcapi-convenience.sh
+		kcapi-dgst-test.sh
+		kcapi-enc-test-large.sh
+		kcapi-enc-test.sh
+		kcapi-fuzz-test.sh
+		"
+	for test in $tests; do
+		msg "testing $test"
+		./test/$test
+	done
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+
+	rm "$pkgdir"/usr/lib/.[!.]*
+	rm "$pkgdir"/usr/bin/.[!.]*
+	rm "$pkgdir"/usr/bin/fips*
+	rm -r "$pkgdir"/usr/libexec/
+
+	cd "$pkgdir"/usr/bin
+
+	# rename generic utils to not conflict with generic names. the options
+	# aren't guaranteed to be compatible
+	for tool in sha* md5* sm3*; do
+		mv $tool kcapi-$tool
+	done
+}
+
+tools() {
+	pkgdesc="$pkgdesc (commandline utilities)"
+
+	amove usr/bin
+}
+
+sha512sums="
+fa3df1fe22eba32585de5df044f907d3ad189c33f5704fe29b0fdeda92e772ef077055b80e17bc1646a8cdedaf4f195aadf0b133f493597f0f7657b04ea93a99  libkcapi-1.4.0.tar.xz
+a5b38f49a7bb07eb57523566e065bad702999d8be21fa6cd8a01af1b60e9bd8fbb6fd9cf71f70dca7d616aa381475273d995841b8580f91418fb0094263e6402  no-werror.patch
+"
diff --git a/main/libkcapi/no-werror.patch b/main/libkcapi/no-werror.patch
new file mode 100644
index 00000000000..d2a0677e02b
--- /dev/null
+++ b/main/libkcapi/no-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index fa7ba4d..5d9e45b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
+ AUTOMAKE_OPTIONS = subdir-objects
+ lib_LTLIBRARIES = libkcapi.la
+ 
+-COMMON_CPPFLAGS = -Wextra -Wall -pedantic -fwrapv --param ssp-buffer-size=4 -O2 -Werror -std=gnu99 -Wconversion
++COMMON_CPPFLAGS = -Wextra -Wall -pedantic -fwrapv --param ssp-buffer-size=4 -O2 -std=gnu99 -Wconversion
+ COMMON_LDFLAGS =  -Wl,-z,relro,-z,now
+ 
+ libtool: $(LIBTOOL_DEPS)
diff --git a/main/libks/APKBUILD b/main/libks/APKBUILD
new file mode 100644
index 00000000000..32cda3f25a6
--- /dev/null
+++ b/main/libks/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
+pkgname=libks
+pkgver=1.8.2
+pkgrel=1
+pkgdesc="Foundational support for signalwire C products"
+url="https://github.com/signalwire/libks"
+arch="all"
+license="MIT"
+makedepends="cmake samurai util-linux-dev openssl-dev>3"
+subpackages="$pkgname-dev $pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/signalwire/libks/archive/refs/tags/v$pkgver.tar.gz
+disable-failing-tests.patch"
+
+build() {
+	cmake -B . -G Ninja \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	cmake --build .
+}
+
+check() {
+	ctest --test-dir . --output-on-failure
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install .
+}
+
+sha512sums="
+5c976803ce649e0690c5b4c14e16e2f08e21cbce67d21fcaaf1f3edbc83c110ad68eb1798b1f5601bd3245992fe471eee1e584d7232c8727957e6804e899b923  libks-1.8.2.tar.gz
+2b9dcde2423531ce9677780c8bd1781450ace473fb9e176fd7449deeef51dc323af9825011f856e3494a7efaf688aff802b7c58105d65e3d21c22bfc71cffbaa  disable-failing-tests.patch
+"
diff --git a/main/libks/disable-failing-tests.patch b/main/libks/disable-failing-tests.patch
new file mode 100644
index 00000000000..8af00f980e1
--- /dev/null
+++ b/main/libks/disable-failing-tests.patch
@@ -0,0 +1,21 @@
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index cd9fe7c..0aeda05 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -2,16 +2,9 @@ ksutil_add_test(pools)
+ ksutil_add_test(realloc)
+ ksutil_add_test(acl)
+ ksutil_add_test(threadpools)
+-ksutil_add_test(threadmutex)
+-ksutil_add_test(time)
+-ksutil_add_test(q)
+ ksutil_add_test(hash)
+-ksutil_add_test(sock)
+ ksutil_add_test(sock2)
+ ksutil_add_test(websock)
+ ksutil_add_test(websock2)
+-ksutil_add_test(http)
+ ksutil_add_test(string)
+ ksutil_add_test(log)
+-ksutil_add_test(json)
+-ksutil_add_test(handle)
diff --git a/main/libksba/APKBUILD b/main/libksba/APKBUILD
index e5a0d284657..4025172095d 100644
--- a/main/libksba/APKBUILD
+++ b/main/libksba/APKBUILD
@@ -1,20 +1,23 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libksba
-pkgver=1.3.5
+pkgver=1.6.6
 pkgrel=0
 pkgdesc="Libksba is a CMS and X.509 access library"
 url="https://www.gnupg.org/software/libksba/index.html"
 arch="all"
-license="GPL"
+license="LGPL-3.0-only AND GPL-2.0-only AND GPL-3.0-only"
 makedepends="libgpg-error-dev"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://www.gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2"
+source="https://www.gnupg.org/ftp/gcrypt/libksba/libksba-$pkgver.tar.bz2"
 
-builddir="$srcdir/$pkgname-$pkgver"
+# secfixes:
+#   1.6.3-r0:
+#     - CVE-2022-47629
+#   1.6.2-r0:
+#     - CVE-2022-3515
 
-build () {
-	cd "$builddir"
+build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,13 +26,13 @@ build () {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="60179bfd109b7b4fd8d2b30a3216540f03f5a13620d9a5b63f1f95788028708a420911619f172ba57e945a6a2fcd2ef7eaafc5585a0eb2b9652cfadf47bf39a2  libksba-1.3.5.tar.bz2"
+sha512sums="
+3b30bef9452ae0c52b4a52e9145fbd6dc57cf7a2b59302e3af063db6b45384e8ed7af62604efd7939b9e0cb5931e946b15609888e9699fafe4acbb0cbf138087  libksba-1.6.6.tar.bz2
+"
diff --git a/main/liblockfile/APKBUILD b/main/liblockfile/APKBUILD
index d1329c9864b..1aa101bbad6 100644
--- a/main/liblockfile/APKBUILD
+++ b/main/liblockfile/APKBUILD
@@ -1,17 +1,16 @@
 # Contributor: Duane Hughes <duanejevon@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=liblockfile
-pkgver=1.16
-pkgrel=0
+pkgver=1.17
+pkgrel=4
 pkgdesc="Shared library with NFS-safe locking functions"
 url="https://github.com/miquels/liblockfile"
 arch="all"
-license="LGPL-2.0-or-later and GPL-2.0-or-later"
+license="LGPL-2.0-or-later AND GPL-2.0-or-later"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/miquels/$pkgname/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/miquels/liblockfile/archive/v$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	LDCONFIG=/bin/true \
 	./configure \
 		--build=$CBUILD \
@@ -23,13 +22,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
-sha512sums="ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d  liblockfile-1.16.tar.gz"
+sha512sums="2169ac2219950d6ec7def6b5cc712cc04d1a185dc9c09b364c8d47b7b3d15c3482a2200b591872da87eb784717b2ba3537fbc39d7075c329cc8ba48039473a83  liblockfile-1.17.tar.gz"
diff --git a/main/liblogging/APKBUILD b/main/liblogging/APKBUILD
index 9c7c7a147d9..7d531668cdf 100644
--- a/main/liblogging/APKBUILD
+++ b/main/liblogging/APKBUILD
@@ -1,19 +1,22 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer:
+# Maintainer: Will Sinatra <wpsinatra@gmail.com>
 pkgname=liblogging
 pkgver=1.0.6
-pkgrel=0
+pkgrel=4
 pkgdesc="An easy to use logging library"
 url="http://www.liblogging.org/"
 arch="all"
-license="BSD"
-depends=""
+license="BSD-2-Clause"
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://download.rsyslog.com/$pkgname/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$pkgname-$pkgver
+source="http://download.rsyslog.com/liblogging/liblogging-$pkgver.tar.gz"
+options="!check"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,14 +26,12 @@ build() {
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
 		--disable-journal \
-		--enable-stdlog \
-		|| return 1
-	make || return 1
+		--enable-stdlog
+	make
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="09c90a93b2d32afa44be5a800705a64690810a56d21bed1455cb70680b01fecd4efef3881a43f98ebcafa996b6046ed8e5af935eacc12014f330a7fd23674964  liblogging-1.0.6.tar.gz"
diff --git a/main/liblognorm/APKBUILD b/main/liblognorm/APKBUILD
index 64415ddb7bc..54c6d9e758f 100644
--- a/main/liblognorm/APKBUILD
+++ b/main/liblognorm/APKBUILD
@@ -2,21 +2,25 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=liblognorm
 pkgver=2.0.6
-pkgrel=2
+pkgrel=5
 pkgdesc="A fast log-normalization library"
 url="https://www.liblognorm.com/"
 arch="all"
-license="LGPL-2.1-or-later Apache-2.0"
+license="LGPL-2.1-or-later AND Apache-2.0"
 depends_dev="libestr-dev"
 checkdepends="bash"
 makedepends="$depends_dev libfastjson-dev"
 subpackages="$pkgname-dev"
-source="http://www.liblognorm.com/files/download/$pkgname-$pkgver.tar.gz
+source="http://www.liblognorm.com/files/download/liblognorm-$pkgver.tar.gz
 	parse-name-value-quoting-support.patch
 	"
 
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,12 +31,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make -j1 check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/libmaa/APKBUILD b/main/libmaa/APKBUILD
deleted file mode 100644
index 90237a15e2f..00000000000
--- a/main/libmaa/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
-# Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
-pkgname=libmaa
-pkgver=1.3.2
-pkgrel=1
-pkgdesc="Provides many low-level data structures which are helpful for writing compilers"
-url="https://sourceforge.net/projects/dict/"
-arch="all"
-license="GPL"
-depends=""
-depends_dev=""
-makedepends="libtool perl flex"
-install=""
-subpackages="$pkgname-dev"
-source="https://downloads.sourceforge.net/dict/${pkgname}-${pkgver}.tar.gz
-	fix-ppc64le-build-snprinf-buflen.patch"
-options="libtool"
-
-builddir="${srcdir}/${pkgname}-${pkgver}"
-
-build() {
-	cd "$builddir"
-	update_config_guess || return 1
-	./configure --prefix=/usr
-	make || return 1
-}
-
-package() {
-	cd "$builddir"
-        make DESTDIR="${pkgdir}" install || return 1
-}
-
-sha512sums="dde91e8bf1c08515ff4662282d16a03b18a1dfb16eb7b95be980ba398ed1e65d8cd88e58d454e03a03f48a5ecca8bf23b4ebaf475a98630a9178318c12a1b176  libmaa-1.3.2.tar.gz
-8efab0163bbdb0e16cc4914779cddccd53b6107c0ddc5b8c370e408f837d6ababd490e52e91386df7bc69d3a973a38f19e3721f379528b17913b5a32bfab6101  fix-ppc64le-build-snprinf-buflen.patch"
diff --git a/main/libmaa/fix-ppc64le-build-snprinf-buflen.patch b/main/libmaa/fix-ppc64le-build-snprinf-buflen.patch
deleted file mode 100644
index 7c8bf66e123..00000000000
--- a/main/libmaa/fix-ppc64le-build-snprinf-buflen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/log.c
-+++ b/log.c
-@@ -297,7 +297,7 @@
- {
-    va_list ap_copy;
-    time_t t;
--   static char   buf [4096] = "";
-+   static char   buf [4356] = "";
-    static char   buf_main [4096] = "";
-    static char   buf_preamble [256] = "";
- 
diff --git a/main/libmaxminddb/APKBUILD b/main/libmaxminddb/APKBUILD
index 72bd39fdab3..c1d4c82d9c3 100644
--- a/main/libmaxminddb/APKBUILD
+++ b/main/libmaxminddb/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=libmaxminddb
-pkgver=1.4.2
+pkgver=1.9.1
 pkgrel=0
 pkgdesc="Maxmind GeoIP2 database library"
 url="https://github.com/maxmind/libmaxminddb"
@@ -8,14 +8,18 @@ arch="all"
 license="Apache-2.0"
 depends="curl"
 checkdepends="perl"
-subpackages="$pkgname-dev $pkgname-doc"
-source="$url/releases/download/$pkgver/$pkgname-$pkgver.tar.gz
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs"
+install="libmaxminddb.post-upgrade"
+source="https://github.com/maxmind/libmaxminddb/releases/download/$pkgver/libmaxminddb-$pkgver.tar.gz
 	libmaxminddb.cron
 	libmaxminddb.confd
 	"
 
+# secfixes:
+#   1.4.3-r0:
+#     - CVE-2020-28241
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,20 +29,22 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make install DESTDIR="$pkgdir"
 
 	# install alpine specifics
 	mkdir -p "$pkgdir"/var/lib/libmaxminddb
-	install -m755 -D "$srcdir"/libmaxminddb.cron "$pkgdir"/etc/periodic/weekly/libmaxminddb
-	install -m755 -D "$srcdir"/libmaxminddb.confd "$pkgdir"/etc/conf.d/libmaxminddb
+	install -Dm755 "$srcdir"/libmaxminddb.cron "$pkgdir"/etc/periodic/weekly/libmaxminddb
+
+	# Not an openrc config file. See cron script.
+	install -Dm644 "$srcdir"/libmaxminddb.confd "$pkgdir"/etc/libmaxminddb.cron.conf
 }
 
-sha512sums="bc18d2f19a74639888a466483afde1bccfc3a83787011a6f38808b76e5a513c9912ff369ccbf584091d4def657e0574b16b35dc69ab12ae4c439aaaf3669c4c1  libmaxminddb-1.4.2.tar.gz
-1feb1f2dd57991d729b6f9d29834f43d7405038cdbdfb0113a0e8f8f951a74c5e40651f9d241460f110acdd300196cf580b370e6cec56985cca797ba5610e622  libmaxminddb.cron
-5f8dc6dad84cb1d188504a22470acf89542755c0bb3a78e4d3ae4e5bfa49fe64a7d2ee17441084db2710115463d39361df060a74b3a48fc4d8fc5e802afd2099  libmaxminddb.confd"
+sha512sums="
+6da76bb584c5f8a0c01eb9439afd7c4b18b765966591c15e9aaf6ce7edfd3c429cff87a3e7481eff1d3e75df6eb7fd484752946417747c193dbfb277a843810c  libmaxminddb-1.9.1.tar.gz
+ca1d60847b20a477e91e14ae27d6bbe5d34ddc328e39387eaf9376c72e7f3b4418a932e007fc5b018f0f40e28761dca2a0e9c78f6cf423049f959a075fcaa34f  libmaxminddb.cron
+d7a9614d7420c2ffff9f789d5086002a84a1e9d6dd1dc014d8f792e0e4bd47f7d4794991b786005b8d5539815b305cfc768058c8b4ed49cad542e74e095971a7  libmaxminddb.confd
+"
diff --git a/main/libmaxminddb/libmaxminddb.confd b/main/libmaxminddb/libmaxminddb.confd
index 6955e542f1b..2c8e711d42c 100755..100644
--- a/main/libmaxminddb/libmaxminddb.confd
+++ b/main/libmaxminddb/libmaxminddb.confd
@@ -2,7 +2,11 @@
 # MAXMINDDB_FILES="GeoLite2-City.mmdb"
 
 # Database download directory
-# MAXMINDDB_URL="http://geolite.maxmind.com/download/geoip/database"
+# MAXMINDDB_URL="https://download.maxmind.com/geoip/databases"
 
 # Local target directory
 # MAXMINDDB_LIBDIR="/var/lib/libmaxminddb"
+
+# MaxMind license key and user id can be retrieved through https://www.maxmind.com/en/geolite2/signup
+MAXMINDDB_LICENSE_KEY=""
+MAXMINDDB_USER_ID=""
diff --git a/main/libmaxminddb/libmaxminddb.cron b/main/libmaxminddb/libmaxminddb.cron
index 9b6e5fab8ee..1027dc99c11 100755
--- a/main/libmaxminddb/libmaxminddb.cron
+++ b/main/libmaxminddb/libmaxminddb.cron
@@ -1,22 +1,25 @@
 #!/bin/sh
 
-. /etc/conf.d/libmaxminddb
+. /etc/libmaxminddb.cron.conf
 
 set -e
 
-[ -z "$MAXMINDDB_FILES"  ] && MAXMINDDB_FILES="GeoLite2-City.mmdb"
-[ -z "$MAXMINDDB_URL"    ] && MAXMINDDB_URL="http://geolite.maxmind.com/download/geoip/database"
-[ -z "$MAXMINDDB_LIBDIR" ] && MAXMINDDB_LIBDIR="/var/lib/libmaxminddb"
+[ -z "$MAXMINDDB_FILES"       ] && MAXMINDDB_FILES="GeoLite2-City.mmdb"
+[ -z "$MAXMINDDB_URL"         ] && MAXMINDDB_URL="https://download.maxmind.com/geoip/databases"
+[ -z "$MAXMINDDB_LIBDIR"      ] && MAXMINDDB_LIBDIR="/var/lib/libmaxminddb"
+[ -z "$MAXMINDDB_LICENSE_KEY" ] && { echo "No MaxMind license key found; exiting. Please enter your license key into /etc/libmaxminddb.cron.conf"; exit 1; }
+[ -z "$MAXMINDDB_USER_ID"     ] && { echo "No MaxMind user id found; exiting. Please enter your user id into /etc/libmaxminddb.cron.conf"; exit 1; }
 
 clean_up() {
 	[ -n "$TMPDIR" ] && rm -rf "$TMPDIR"
 }
-trap clean_up EXIT SIGTERM SIGINT SIGQUIT
+trap clean_up EXIT TERM INT QUIT
 
 TMPDIR="$(mktemp -d)"
 for filename in $MAXMINDDB_FILES; do
-	curl --silent "$MAXMINDDB_URL/$filename.gz" -o "$TMPDIR/$filename.gz"
-	gunzip "$TMPDIR/$filename.gz"
+	EDITION_ID=$(echo "${filename}" | sed 's/\.mmdb$//')
+	curl --silent -L -u "${MAXMINDDB_USER_ID}:${MAXMINDDB_LICENSE_KEY}" "${MAXMINDDB_URL}/${EDITION_ID}/download?suffix=tar.gz" -o "$TMPDIR/${filename}.tar.gz"
+	tar xf "$TMPDIR/${filename}.tar.gz" -C "$TMPDIR" --strip-components=1
 	mv "$TMPDIR/$filename" "$MAXMINDDB_LIBDIR"
 done
 exit 0
diff --git a/main/libmaxminddb/libmaxminddb.post-upgrade b/main/libmaxminddb/libmaxminddb.post-upgrade
new file mode 100755
index 00000000000..0a150753af2
--- /dev/null
+++ b/main/libmaxminddb/libmaxminddb.post-upgrade
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+ver_old="$2"
+
+if [ "$(apk version -t "$ver_old" "1.9.1-r0")" = "<" ]; then
+	cat >&2 <<-"EOF"
+	The cron to update the geoip db now requires $MAXMINDDB_USER_ID to be
+	set in /etc/libmaxminddb.cron.conf
+	EOF
+fi
diff --git a/main/libmd/APKBUILD b/main/libmd/APKBUILD
new file mode 100644
index 00000000000..c87bef7b14d
--- /dev/null
+++ b/main/libmd/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: omni <omni+alpine@hack.org>
+# Maintainer: omni <omni+alpine@hack.org>
+pkgname=libmd
+pkgver=1.1.0
+pkgrel=0
+pkgdesc="Message Digest functions from BSD systems"
+url="https://www.hadrons.org/software/libmd/"
+arch="all"
+license="BSD-3-Clause AND BSD-2-Clause AND ISC AND Beerware AND Public Domain"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://archive.hadrons.org/software/libmd/libmd-$pkgver.tar.xz"
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	install -Dm0644 COPYING -t "$pkgdir"/usr/share/licenses/"$pkgname"
+}
+
+sha512sums="
+5d0da3337038e474fae7377bbc646d17214e72dc848a7aadc157f49333ce7b5ac1456e45d13674bd410ea08477c6115fc4282fed6c8e6a0bf63537a418c0df96  libmd-1.1.0.tar.xz
+"
diff --git a/main/libmemcached/APKBUILD b/main/libmemcached/APKBUILD
index a67d9621ba2..08608de729c 100644
--- a/main/libmemcached/APKBUILD
+++ b/main/libmemcached/APKBUILD
@@ -1,42 +1,47 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libmemcached
-pkgver=1.0.18
-pkgrel=4
-pkgdesc="Client library and command line tools for memcached server"
-url="https://libmemcached.org/libMemcached.html"
+pkgver=1.1.4
+pkgrel=1
+pkgdesc="Client library and command line tools for memcached server (resurrected)"
+url="https://github.com/awesomized/libmemcached"
 arch="all"
 license="BSD-3-Clause"
-options="!check" # tests are broken
 depends_dev="cyrus-sasl-dev"
-makedepends="$depends_dev memcached-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-source="https://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz
-	fix-ppc64le-ptr-check.patch
-	musl-fixes.patch"
+makedepends="
+	$depends_dev
+	bison
+	cmake
+	flex
+	libevent-dev
+	memcached-dev
+	samurai
+	"
+subpackages="$pkgname-dev $pkgname-libs"
+source="$pkgname-$pkgver.tar.gz::https://github.com/awesomized/libmemcached/archive/refs/tags/$pkgver.tar.gz"
+options="!check" # no tests built
 
 build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--disable-static \
-		--enable-sasl \
-		--enable-libmemcachedprotocol \
-		--enable-memaslap
-	make
+	CXXFLAGS="$CXXFLAGS -flto=auto" \
+	CFLAGS="$CFLAGS -flto=auto" \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_SHARED_LIBS=ON \
+		-DENABLE_SASL=ON
+	cmake --build build
 }
 
 check() {
-	cd "$builddir"
-	make check || { find . -name 'test-suite.log' -exec cat '{}' ';'; return 1; }
+	# make check
+	ctest --test-dir build --output-on-failure
 }
 
 package() {
-	cd "$builddir"
-	make -j1 AM_MAKEFLAGS= DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
+	# just junk top-level readme/changelog files from repo
+	rm -r "$pkgdir"/usr/share/doc
 }
 
-sha512sums="2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585  libmemcached-1.0.18.tar.gz
-ca92a91c1cbe6497195013d101a465899b9d84243f0416a9eef6fd4cec9e7f29667763891af5fd7fbbf20094a3ddf222a2d31f322909193bd65fa0dce20c73bc  fix-ppc64le-ptr-check.patch
-ff8f59d2b6d3b7d1d110ff3f1d03dbceba3a000271e69f465ffd02e77c0a092e6904b19ac4aea624a0622cec6a16ecd048f46107e011cb9011027ef71265aaf5  musl-fixes.patch"
+sha512sums="
+0a10a2431142ec6e4547f82fdd35b55c018264e5f8c39910a65252c3f53d862fb5945e7a671951915aac076767cc995740b3e499eb584017a38eb2d1e82171fb  libmemcached-1.1.4.tar.gz
+"
diff --git a/main/libmemcached/fix-ppc64le-ptr-check.patch b/main/libmemcached/fix-ppc64le-ptr-check.patch
deleted file mode 100644
index 6644c8353e0..00000000000
--- a/main/libmemcached/fix-ppc64le-ptr-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/clients/memflush.cc
-+++ b/clients/memflush.cc
-@@ -39,7 +39,7 @@
- {
-   options_parse(argc, argv);
- 
--  if (opt_servers == false)
-+  if (opt_servers == NULL)
-   {
-     char *temp;
- 
-@@ -48,7 +48,7 @@
-       opt_servers= strdup(temp);
-     }
- 
--    if (opt_servers == false)
-+    if (opt_servers == NULL)
-     {
-       std::cerr << "No Servers provided" << std::endl;
-       exit(EXIT_FAILURE);
diff --git a/main/libmemcached/musl-fixes.patch b/main/libmemcached/musl-fixes.patch
deleted file mode 100644
index eb2a6bc980e..00000000000
--- a/main/libmemcached/musl-fixes.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/libhashkit/fnv_64.cc b/libhashkit/fnv_64.cc
-index 68e4dd0..64656b7 100644
---- a/libhashkit/fnv_64.cc
-+++ b/libhashkit/fnv_64.cc
-@@ -37,8 +37,9 @@
- 
- 
- #include <libhashkit/common.h>
-+#include <limits.h>
- 
--#if __WORDSIZE == 64 && defined(HAVE_FNV64_HASH)
-+#if (LONG_BITS == 64) && defined(HAVE_FNV64_HASH)
- 
- /* FNV hash'es lifted from Dustin Sallings work */
- static uint64_t FNV_64_INIT= 0xcbf29ce484222325;
-diff --git a/libhashkit/has.cc b/libhashkit/has.cc
-index 843e32e..4153e5e 100644
---- a/libhashkit/has.cc
-+++ b/libhashkit/has.cc
-@@ -37,6 +37,7 @@
- 
- 
- #include <libhashkit/common.h>
-+#include <limits.h>
- 
- bool libhashkit_has_algorithm(const hashkit_hash_algorithm_t algo)
- {
-@@ -44,7 +45,7 @@ bool libhashkit_has_algorithm(const hashkit_hash_algorithm_t algo)
-   {
-   case HASHKIT_HASH_FNV1_64:
-   case HASHKIT_HASH_FNV1A_64:
--#if __WORDSIZE == 64 && defined(HAVE_FNV64_HASH)
-+#if (LONG_BITS == 64) && defined(HAVE_FNV64_HASH)
-     return true;
- #else
-     return false;
-diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc
-index 29a22de..161c646 100644
---- a/libtest/cmdline.cc
-+++ b/libtest/cmdline.cc
-@@ -61,7 +61,7 @@ using namespace libtest;
- #include <algorithm>
- #include <stdexcept>
- 
--#ifndef __USE_GNU
-+#ifndef _GNU_SOURCE
- static char **environ= NULL;
- #endif
- 
-@@ -201,7 +201,7 @@ Application::error_t Application::run(const char *args[])
- 
-   fatal_assert(posix_spawnattr_setsigmask(&spawnattr, &mask) == 0);
- 
--#if defined(POSIX_SPAWN_USEVFORK) || defined(__linux__)
-+#if defined(POSIX_SPAWN_USEVFORK) || defined(__GLIBC__)
-   // Use USEVFORK on linux
-   flags |= POSIX_SPAWN_USEVFORK;
- #endif
diff --git a/main/libmilter/APKBUILD b/main/libmilter/APKBUILD
index fa9b5ada17b..d2bdbe98682 100644
--- a/main/libmilter/APKBUILD
+++ b/main/libmilter/APKBUILD
@@ -5,19 +5,19 @@ pkgname=libmilter
 _pkgname=sendmail
 # This library is part of sendmail, but it does not share the version number with it.
 # In order to find the right libmilter version number, check SMFI_VERSION definition
-# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines).
+# that can be found in include/libmilter/mfapi.h (see also SM_LM_VRS_* defines).
 # For example, version 1.0.1 has a SMFI_VERSION of 0x01000001.
 pkgver=1.0.2
-_pkgver=8.15.2
-pkgrel=6
+_pkgver=8.17.1
+pkgrel=9
 pkgdesc="Sendmail Mail Filter API (Milter)"
-url="http://www.sendmail.com/sm/open_source"
+url="https://www.sendmail.com/sm/open_source"
 arch="all"
 options="!check"  # No independent test suite.
 license="Sendmail"
 makedepends="m4 linux-headers bsd-compat-headers"
 subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://ftp.sendmail.org/pub/$_pkgname/$_pkgname.$_pkgver.tar.gz
+source="https://ftp.sendmail.org/$_pkgname.$_pkgver.tar.gz
 	libmilter-sharedlib.patch
 	default-pthread-stacksize.patch"
 builddir="$srcdir/$_pkgname-$_pkgver"
@@ -25,7 +25,6 @@ builddir="$srcdir/$_pkgname-$_pkgver"
 prepare() {
 	default_prepare
 
-	cd "$builddir"
 	cat >> devtools/Site/site.config.m4 <<-EOF
 		dnl enable ipv6
 		APPENDDEF(\`conf_libmilter_ENVDEF',\`-DNETINET6=1')
@@ -35,15 +34,12 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
-	make -j1 -C libmilter MILTER_SOVER=$pkgver
+	make -C libmilter MILTER_SOVER=$pkgver
 }
 
 package() {
-	cd "$builddir"
-
 	mkdir -p "$pkgdir"/usr/lib
-	make -j1 -C libmilter \
+	make -C libmilter \
 		INCOWN=root INCGRP=root INCMODE=644 \
 		LIBOWN=root LIBGRP=root LIBMODE=644 UBINMODE=755 \
 		MILTER_SOVER=$pkgver \
@@ -56,6 +52,8 @@ package() {
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/license
 }
 
-sha512sums="04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9  sendmail.8.15.2.tar.gz
+sha512sums="
+ae42343fb06c09f2db5d919d602afc4241914387dfdae0f15e0967dda3be25bf1d3a4637b57266763679646a3cea6aa07e6453266fd9b7358c1a09ec2b627a15  sendmail.8.17.1.tar.gz
 31c36b57739946c1b9c7c85307fe5c53c45d7f8cbf427a0f2248db8b74871a6f5a30ef1af524915821aeca54310d28272bcd0a587cb918192214fa5c30e4a8da  libmilter-sharedlib.patch
-d3e12943fe7e9babdf700a2d8c0229bc16fa2ea16097615600341dee13f137b157ffa4b03f76c92ba9c5552ca3bf01cb598f6a6201720408df3a37247001a219  default-pthread-stacksize.patch"
+d3e12943fe7e9babdf700a2d8c0229bc16fa2ea16097615600341dee13f137b157ffa4b03f76c92ba9c5552ca3bf01cb598f6a6201720408df3a37247001a219  default-pthread-stacksize.patch
+"
diff --git a/main/libmnl/APKBUILD b/main/libmnl/APKBUILD
index 853f319694d..4e1c5f4f5bb 100644
--- a/main/libmnl/APKBUILD
+++ b/main/libmnl/APKBUILD
@@ -1,32 +1,40 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=libmnl
-pkgver=1.0.4
-pkgrel=0
+pkgver=1.0.5
+pkgrel=2
 pkgdesc="Library for minimalistic netlink"
-url="http://www.netfilter.org/projects/libmnl/"
+url="https://www.netfilter.org/projects/libmnl/"
 arch="all"
-license="GPL"
-depends=
+license="LGPL-2.1-or-later"
 depends_dev="linux-headers"
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-dev"
-source="https://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"
-builddir="$srcdir"/$pkgname-$pkgver
+makedepends="$depends_dev bsd-compat-headers"
+subpackages="$pkgname-static $pkgname-dev"
+source="https://www.netfilter.org/projects/libmnl/files/libmnl-$pkgver.tar.bz2
+	musl-fix-headers.patch"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		|| return 1
+		--enable-static
+}
+
+check() {
+	make check
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9  libmnl-1.0.4.tar.bz2"
+sha512sums="
+16fa48e74c9da7724a85c655dfb0abd8369392627934639d65de951543e1447ac3e048d231248f1ce8861443c2ef62654a85a81feeedbbffaf2e5744f6cf4c9f  libmnl-1.0.5.tar.bz2
+984307f6a40bdd1231cf97ac84719eefaf436544bcad3a52f8590ab73676ac3064f44af65b57dfb7920aa3c84a44977e385410faf354a0a64efc5364b4314496  musl-fix-headers.patch
+"
diff --git a/main/libmnl/musl-fix-headers.patch b/main/libmnl/musl-fix-headers.patch
new file mode 100644
index 00000000000..f3338b10354
--- /dev/null
+++ b/main/libmnl/musl-fix-headers.patch
@@ -0,0 +1,13 @@
+diff --git a/examples/netfilter/nfct-daemon.c b/examples/netfilter/nfct-daemon.c
+index a97c2ec..e3bb17a 100644
+--- a/examples/netfilter/nfct-daemon.c
++++ b/examples/netfilter/nfct-daemon.c
+@@ -20,6 +20,8 @@
+ #include <linux/netfilter/nfnetlink_conntrack.h>
+ 
+ #include <sys/queue.h>
++#include <sys/time.h>
++#include <sys/select.h>
+ 
+ struct nstats {
+ 	LIST_ENTRY(nstats)	list;
diff --git a/main/libnet/APKBUILD b/main/libnet/APKBUILD
index 64fab20fd58..65b433ff1f7 100644
--- a/main/libnet/APKBUILD
+++ b/main/libnet/APKBUILD
@@ -1,28 +1,17 @@
 # Contributor: Mika Havela <mika.havela@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libnet
-pkgver=1.1.6
-pkgrel=3
+pkgver=1.3
+pkgrel=0
 pkgdesc="A generic networking API that provides access to several protocols."
 url="https://sourceforge.net/projects/libnet-dev/"
 arch="all"
 license="BSD-2-Clause"
-makedepends="autoconf automake libtool linux-headers"
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://downloads.sourceforge.net/project/libnet-dev/libnet-$pkgver.tar.gz
-	fix-includes.patch
-	"
-
-
-prepare() {
-	default_prepare
-	cd "$builddir"
-	update_config_sub
-}
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
+source="https://github.com/libnet/libnet/releases/download/v$pkgver/libnet-$pkgver.tar.gz"
+options="!check"
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,9 +21,9 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a67e502b0e6957ca590e47cb50b0472dd83d622d84c62818d665d771616df91b5a8fa8fcf1040d13b7860aaabaf338152ef40f66ab97c3fc9502edb08cea0bb6  libnet-1.1.6.tar.gz
-6cde8d5c5c3c34f9a02df5ae472f23b823aab293eed2588bbd6c836d228b1c180dc04208916cd6be7b11e02d6e5b2bfffda5e34ec1ceb99e83d1adfafff09231  fix-includes.patch"
+sha512sums="
+c434327108b61e73b61acc5f2b346d049ab5d58e494db21971368eac733a9a0a3e9d95e0b4523c20629b02ed0feef086c50c582719635f21e980c440d55dd462  libnet-1.3.tar.gz
+"
diff --git a/main/libnet/fix-includes.patch b/main/libnet/fix-includes.patch
deleted file mode 100644
index 5eb86bc37b7..00000000000
--- a/main/libnet/fix-includes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- libnet-1.1.6.orig/src/libnet_link_linux.c
-+++ libnet-1.1.6/src/libnet_link_linux.c
-@@ -30,26 +30,15 @@
- #include <sys/time.h>
- 
- #include <net/if.h>
--#if (__GLIBC__)
- #include <netinet/if_ether.h>
- #include <net/if_arp.h>
--#else
--#include <linux/if_arp.h>
--#include <linux/if_ether.h>
--#endif
- 
- #if (HAVE_PACKET_SOCKET)
- #ifndef SOL_PACKET
- #define SOL_PACKET 263
- #endif  /* SOL_PACKET */
--#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1
- #include <netpacket/packet.h>
- #include <net/ethernet.h>     /* the L2 protocols */
--#else
--#include <asm/types.h>
--#include <linux/if_packet.h>
--#include <linux/if_ether.h>   /* The L2 protocols */
--#endif
- #endif  /* HAVE_PACKET_SOCKET */
- 
- #include "../include/libnet.h"
diff --git a/main/libnetfilter_acct/APKBUILD b/main/libnetfilter_acct/APKBUILD
index e85f54126c9..c71d96e00d3 100644
--- a/main/libnetfilter_acct/APKBUILD
+++ b/main/libnetfilter_acct/APKBUILD
@@ -2,39 +2,33 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=libnetfilter_acct
 pkgver=1.0.3
-pkgrel=0
+pkgrel=3
 pkgdesc="Userspace library providing interface to extended accounting infrastructure."
-url="http://www.netfilter.org/projects/libnetfilter_conntrack/"
+url="https://www.netfilter.org/projects/libnetfilter_acct/"
 arch="all"
-license="GPL-2.0"
-depends=
+license="LGPL-2.1-or-later"
 makedepends="libnfnetlink-dev libmnl-dev linux-headers"
 subpackages="$pkgname-dev"
-source="https://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"
-
-_builddir="$srcdir/$pkgname-$pkgver"
+source="https://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-$pkgver.tar.bz2"
+options="!check"
 
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
-	make || return 1
+		--infodir=/usr/share/info
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="5ca332840663941182343fdc0d5e45116bba71a97a913db0b385ea37ef31a04f8267a2279b7a2862ce338c6eeb093bb3ef9908f57770e64acf5d2b2266d3bfe5  libnetfilter_acct-1.0.3.tar.bz2"
diff --git a/main/libnetfilter_conntrack/APKBUILD b/main/libnetfilter_conntrack/APKBUILD
index 3872e5f314c..5b108a27527 100644
--- a/main/libnetfilter_conntrack/APKBUILD
+++ b/main/libnetfilter_conntrack/APKBUILD
@@ -1,31 +1,44 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libnetfilter_conntrack
-pkgver=1.0.7
-pkgrel=0
+pkgver=1.0.9
+pkgrel=3
 pkgdesc="programming interface (API) to the in-kernel connection tracking state table"
-url="http://www.netfilter.org/projects/libnetfilter_conntrack/"
+url="https://www.netfilter.org/projects/libnetfilter_conntrack/"
 arch="all"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
 makedepends="linux-headers libnfnetlink-dev libmnl-dev"
-subpackages="$pkgname-dev"
-source="https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-$pkgver.tar.bz2"
+subpackages="$pkgname-static $pkgname-dev"
+source="https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-$pkgver.tar.bz2
+	fix_build_with_kernel_5.15_and_musl.patch
+	"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		--enable-static
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="5be5ed5daba385d11123a4e497c6334c6bb7e668594e667f85596619afe607f8783c088934098a4c07557d86f9b9157ff67d28541c8f4a80a5454307b979c22b  libnetfilter_conntrack-1.0.7.tar.bz2"
+sha512sums="
+e8b03425aaba3b72e6034c215656c34176d0550c08e0455aaeb1365d9141505d0c4feaa8978c8ccf2b7af9db6c9e874ceb866347e533b41cb03a189884f4004c  libnetfilter_conntrack-1.0.9.tar.bz2
+1a93a36cf5cb89cec08e6e2476bf8d6fc68e9608f55e370418ed6a87e369545bdff1050e810aab2d5a9706f9559b3c1c48c404d954b2d01b84dbd68bae063450  fix_build_with_kernel_5.15_and_musl.patch
+"
diff --git a/main/libnetfilter_conntrack/fix_build_with_kernel_5.15_and_musl.patch b/main/libnetfilter_conntrack/fix_build_with_kernel_5.15_and_musl.patch
new file mode 100644
index 00000000000..2e5608ae95c
--- /dev/null
+++ b/main/libnetfilter_conntrack/fix_build_with_kernel_5.15_and_musl.patch
@@ -0,0 +1,56 @@
+From 21ee35dde73aec5eba35290587d479218c6dd824 Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Thu, 24 Feb 2022 15:01:11 +0100
+Subject: [PATCH] conntrack: fix build with kernel 5.15 and musl
+
+Currently, with kernel 5.15 headers and musl building is failing with
+redefinition errors due to a conflict between the kernel and musl headers.
+
+Musl is able to suppres the conflicting kernel header definitions if they
+are included after the standard libc ones, however since ICMP definitions
+were moved into a separate internal header to avoid duplication this has
+stopped working and is breaking the builds.
+
+It seems that the issue is that <netinet/in.h> which contains the UAPI
+suppression defines is included in the internal.h header and not in the
+proto.h which actually includes the kernel ICMP headers and thus UAPI
+supression defines are not present.
+
+Solve this by moving the <netinet/in.h> include before the ICMP kernel
+includes in the proto.h
+
+Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file")
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+Signed-off-by: Florian Westphal <fw@strlen.de>
+---
+ include/internal/internal.h | 1 -
+ include/internal/proto.h    | 1 +
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/internal/internal.h b/include/internal/internal.h
+index 2ef8a90..7cd7c44 100644
+--- a/include/internal/internal.h
++++ b/include/internal/internal.h
+@@ -14,7 +14,6 @@
+ #include <arpa/inet.h>
+ #include <time.h>
+ #include <errno.h>
+-#include <netinet/in.h>
+ 
+ #include <libnfnetlink/libnfnetlink.h>
+ #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
+diff --git a/include/internal/proto.h b/include/internal/proto.h
+index 40e7bfe..60a5f4e 100644
+--- a/include/internal/proto.h
++++ b/include/internal/proto.h
+@@ -2,6 +2,7 @@
+ #define _NFCT_PROTO_H_
+ 
+ #include <stdint.h>
++#include <netinet/in.h>
+ #include <linux/icmp.h>
+ #include <linux/icmpv6.h>
+ 
+-- 
+2.37.1
+
diff --git a/main/libnetfilter_cthelper/APKBUILD b/main/libnetfilter_cthelper/APKBUILD
index ef952e48ec8..92cac88545b 100644
--- a/main/libnetfilter_cthelper/APKBUILD
+++ b/main/libnetfilter_cthelper/APKBUILD
@@ -1,31 +1,22 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libnetfilter_cthelper
-pkgver=1.0.0
-pkgrel=0
+pkgver=1.0.1
+pkgrel=2
 pkgdesc="A Netfilter netlink library for connection tracking helpers"
-url="http://www.netfilter.org/projects/libnetfilter_cthelper/index.html"
+url="https://www.netfilter.org/projects/libnetfilter_cthelper/"
 arch="all"
-license="GPL-2.0"
-depends=""
+license="GPL-2.0-only"
 makedepends="linux-headers libmnl-dev"
-install=""
 subpackages="$pkgname-dev"
 source="https://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-$pkgver.tar.bz2"
+options="!check"
 
-_builddir="$srcdir"/libnetfilter_cthelper-$pkgver
 prepare() {
-	local i
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+ 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,14 +24,14 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
+		--localstatedir=/var
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f0372daee0edbf4c27ee80eadd4ce786a4b67b39c0b9d22e88bc9adcbdffd6676eb9df01b933ee64d2fcea9c05a9ca9070c94e907277d69acbd22ae9a3c74e45  libnetfilter_cthelper-1.0.0.tar.bz2"
+sha512sums="
+f0591edd579aee92b62446e2b8fef6af9c404848c42c8da76850bb01aec3567442612f53cf8d3af6ba4d6d920487bff310a4e547bccf595478b1f96b4280eada  libnetfilter_cthelper-1.0.1.tar.bz2
+"
diff --git a/main/libnetfilter_cttimeout/APKBUILD b/main/libnetfilter_cttimeout/APKBUILD
index 86a57a265f8..cdb7295be25 100644
--- a/main/libnetfilter_cttimeout/APKBUILD
+++ b/main/libnetfilter_cttimeout/APKBUILD
@@ -1,33 +1,24 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libnetfilter_cttimeout
-pkgver=1.0.0
-pkgrel=0
+pkgver=1.0.1
+pkgrel=2
 pkgdesc="Library for the connection tracking timeout infrastructure"
-url="http://www.netfilter.org/projects/libnetfilter_cttimeout/"
+url="https://www.netfilter.org/projects/libnetfilter_cttimeout/"
 arch="all"
-license="GPL-2.0"
-depends=""
+license="GPL-2.0-only"
 depends_dev="libmnl-dev"
 makedepends="linux-headers $depends_dev"
-install=""
 subpackages="$pkgname-dev"
 source="https://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-$pkgver.tar.bz2"
+options="!check"
 
-_builddir="$srcdir"/libnetfilter_cttimeout-$pkgver
 prepare() {
-	local i
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+ 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -35,14 +26,14 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
+		--localstatedir=/var
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d64f592be022d02b6e6627470f9aed75114b0c7177012d31d868ee7eb39fca330a7638c9a209ff489d4a8c0549b8fcfd33582c6d36ee519b920cf27429301c85  libnetfilter_cttimeout-1.0.0.tar.bz2"
+sha512sums="
+3f7886b2b8c67fb45d9f6d03f8a327d0f04072abf75ec0fa310f4a321a1749607e79b48f47c8b8488f9833734689419264afada0cbc1f0360a5ae9e17d4a1100  libnetfilter_cttimeout-1.0.1.tar.bz2
+"
diff --git a/main/libnetfilter_log/APKBUILD b/main/libnetfilter_log/APKBUILD
index c27dc055080..480e3091ee1 100644
--- a/main/libnetfilter_log/APKBUILD
+++ b/main/libnetfilter_log/APKBUILD
@@ -1,29 +1,25 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=libnetfilter_log
-pkgver=1.0.1
-pkgrel=3
+pkgver=1.0.2
+pkgrel=2
 pkgdesc="interface to packets that have been logged by the kernel packet filter"
-url="http://www.netfilter.org/projects/libnetfilter_log/"
+url="https://www.netfilter.org/projects/libnetfilter_log/"
 arch="all"
-license="GPL-2.0"
+license="GPL-2.0-only"
 depends_dev="linux-headers"
-makedepends="$depends_dev libnfnetlink-dev"
+makedepends="$depends_dev libnfnetlink-dev libmnl-dev"
 subpackages="$pkgname-dev"
-source="https://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-$pkgver.tar.bz2
-	sys-types.patch
-	sys-types2.patch
-	"
+source="https://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-$pkgver.tar.bz2"
+options="!check"
 
 prepare() {
-	cd "$builddir"
-	default_prepare
+ 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -35,10 +31,9 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4088b9bf055fb4cd5f2e201a46a00def7642116b5d1695a371936b7b45eb93877944456506b45761bf2f3f81b40c161c1ecdcfb90532009f073dac3cedc6f436  libnetfilter_log-1.0.1.tar.bz2
-aa8b2502fd53bce2ffdb4607bcbb179b854d9544814eca43c5313392c39bf5f8abdc51e61629d26cce1df07b0499d793858020144eac6d4785ab96d59db8e364  sys-types.patch
-b2c93fc854cd52040637164f422ac9bc6cdf22585c638b45f500c30c59925131ff874fdf3dc231d948adf12b45744809d6278a79abd4a2887aa5a7b5e8e4cc9d  sys-types2.patch"
+sha512sums="
+6b33718b1dd7f4504bceae14001da3a652cec46a6725a5dee83a7b55028cfa8e768cba917f968a5d5b60fd9ff04edf6040ef271a68e5fb65858bf73f4f9ccf23  libnetfilter_log-1.0.2.tar.bz2
+"
diff --git a/main/libnetfilter_log/sys-types.patch b/main/libnetfilter_log/sys-types.patch
deleted file mode 100644
index 1662636cc60..00000000000
--- a/main/libnetfilter_log/sys-types.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 7529487f70e244cd31ef84b037b1c32749c134a7 Mon Sep 17 00:00:00 2001
-From: Eric Leblond <eric@regit.org>
-Date: Sun, 4 Nov 2012 09:29:44 +0100
-Subject: Add include needed for integer type definition.
-
-
-diff --git a/include/libnetfilter_log/libnetfilter_log.h b/include/libnetfilter_log/libnetfilter_log.h
-index 6b0d3b0..a1331de 100644
---- a/include/libnetfilter_log/libnetfilter_log.h
-+++ b/include/libnetfilter_log/libnetfilter_log.h
-@@ -9,6 +9,7 @@
- #ifndef __LIBNETFILTER_LOG_H
- #define __LIBNETFILTER_LOG_H
- 
-+#include <sys/types.h>
- #include <libnetfilter_log/linux_nfnetlink_log.h>
- 
- struct nflog_handle;
--- 
-cgit v0.10.2
-
diff --git a/main/libnetfilter_log/sys-types2.patch b/main/libnetfilter_log/sys-types2.patch
deleted file mode 100644
index e211453ecf8..00000000000
--- a/main/libnetfilter_log/sys-types2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/include/libnetfilter_log/libipulog.h b/include/libnetfilter_log/libipulog.h
-index 8a4ae2a..0994b4a 100644
---- a/include/libnetfilter_log/libipulog.h
-+++ b/include/libnetfilter_log/libipulog.h
-@@ -5,6 +5,8 @@
- #include <unistd.h>
- #include <fcntl.h>
- 
-+#include <sys/types.h>	/* for u_int*_t */
-+
- /* FIXME: glibc sucks */
- #ifndef MSG_TRUNC 
- #define MSG_TRUNC	0x20
-
diff --git a/main/libnetfilter_queue/APKBUILD b/main/libnetfilter_queue/APKBUILD
index 064ea95fd66..3bb74efc7f8 100644
--- a/main/libnetfilter_queue/APKBUILD
+++ b/main/libnetfilter_queue/APKBUILD
@@ -1,25 +1,21 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libnetfilter_queue
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.5
+pkgrel=2
 pkgdesc="API to packets that have been queued by the kernel packet filter"
-url="http://www.netfilter.org/projects/libnetfilter_queue/index.html"
+url="https://www.netfilter.org/projects/libnetfilter_queue/"
 arch="all"
-license="GPL-2.0"
-depends=""
+license="GPL-2.0-or-later"
 makedepends="libnfnetlink-dev libmnl-dev linux-headers"
-install=""
 subpackages="$pkgname-dev"
 source="https://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-$pkgver.tar.bz2"
 
-builddir="$srcdir"/libnetfilter_queue-$pkgver
 prepare() {
-	cd "$builddir"
-	default_prepare
+ 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,13 +28,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="1d9e0202878bc0ae26ceecd0f4fa4c21f89056e5671d46949f92f21c155d589958b7775760fc837547da34eb9a81e537e95c770d25c166e709dad16de4ca452e  libnetfilter_queue-1.0.3.tar.bz2"
+sha512sums="732a44b602e5efaa4f5582ea25ff8f5ec8f4dca5c0e725cd93fe2d441db80416b25c6018147be90acb262d7428eb5b21b3f7b5920e612d115061ec6a19d67f85  libnetfilter_queue-1.0.5.tar.bz2"
diff --git a/main/libnfnetlink/APKBUILD b/main/libnfnetlink/APKBUILD
index bdc86e23649..d6af283c6dc 100644
--- a/main/libnfnetlink/APKBUILD
+++ b/main/libnfnetlink/APKBUILD
@@ -1,40 +1,38 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libnfnetlink
-pkgver=1.0.1
-pkgrel=2
+pkgver=1.0.2
+pkgrel=3
 pkgdesc="low-level library for netfilter related kernel/userspace communication"
-url="http://www.netfilter.org/projects/libnfnetlink/"
+url="https://www.netfilter.org/projects/libnfnetlink/"
 arch="all"
 license="GPL-2.0-only"
 makedepends="linux-headers"
-subpackages="$pkgname-dev"
-source="https://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-$pkgver.tar.bz2
-	musl-fix-includes.patch
-	"
+subpackages="$pkgname-static $pkgname-dev"
+source="https://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-$pkgver.tar.bz2"
+options="!check"
 
 prepare() {
-	cd "$builddir"
-	default_prepare
+ 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		--enable-static
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="2ec2cd389c04e21c8a02fb3f6d6f326fc33ca9589577f1739c23d883fe2ee9feaa16e83b6ed09063ad886432e49565dc3256277d035260aca5aab17954b46104  libnfnetlink-1.0.1.tar.bz2
-fc452e2924fa4de66e104229bc05a663c253148fb1c0bd62e5454a907877ffb084ba6a04e38bf4ef71a4e58041f4a242001a8029aefbe97ccc00e3bfcb7bba41  musl-fix-includes.patch"
+
+sha512sums="
+a5e9ae22831f1d17703f83953f3b0ef898e8b3fa7f0f771b038db51816ddae3158574380ac4d45c09fb8fbb8677e2ccdcc5c4736e3b09de06eac99f899130854  libnfnetlink-1.0.2.tar.bz2
+"
diff --git a/main/libnfnetlink/musl-fix-includes.patch b/main/libnfnetlink/musl-fix-includes.patch
deleted file mode 100644
index 04aef8a4ded..00000000000
--- a/main/libnfnetlink/musl-fix-includes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libnfnetlink-1.0.1.orig/include/libnfnetlink/linux_nfnetlink.h
-+++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink.h
-@@ -1,6 +1,6 @@
- #ifndef _NFNETLINK_H
- #define _NFNETLINK_H
--#include <linux/types.h>
-+#include <sys/types.h>
- #include <libnfnetlink/linux_nfnetlink_compat.h>
- 
- enum nfnetlink_groups {
---- libnfnetlink-1.0.1.orig/include/libnfnetlink/libnfnetlink.h
-+++ libnfnetlink-1.0.1/include/libnfnetlink/libnfnetlink.h
-@@ -15,6 +15,7 @@
- #define aligned_u64 unsigned long long __attribute__((aligned(8)))
- #endif
- 
-+#include <sys/types.h>
- #include <sys/socket.h>	/* for sa_family_t */
- #include <linux/netlink.h>
- #include <libnfnetlink/linux_nfnetlink.h>
diff --git a/main/libnftnl/APKBUILD b/main/libnftnl/APKBUILD
index bf00eb9bc42..85cf969ac4c 100644
--- a/main/libnftnl/APKBUILD
+++ b/main/libnftnl/APKBUILD
@@ -1,24 +1,28 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=libnftnl
-pkgver=1.1.5
+pkgver=1.2.6
 pkgrel=0
 pkgdesc="Netfilter library providing interface to the nf_tables subsystem"
 url="https://netfilter.org/projects/libnftnl"
 arch="all"
 license="GPL-2.0-or-later"
-depends_dev="libmnl-dev"
-makedepends="$depends_dev bash jansson-dev"
-subpackages="$pkgname-dev $pkgname-libs"
-source="https://netfilter.org/projects/libnftnl/files/libnftnl-$pkgver.tar.bz2
-nft-flowtable-test.patch"
+makedepends="bash jansson-dev libmnl-dev"
+provides="$pkgname-libs=$pkgver-r$pkgrel"  # for backward compatibility (Alpine <3.15)
+replaces="$pkgname-libs"  # for backward compatibility (Alpine <3.15)
+subpackages="$pkgname-dev"
+source="https://netfilter.org/projects/libnftnl/files/libnftnl-$pkgver.tar.xz"
 
 case "$CARCH" in
 	s390x) options="!check" ;; # FIXME
 esac
 
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,19 +30,19 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
-		--with-json-parsing
+		--enable-static
 	make
 }
 
 check() {
-	cd "$builddir"/tests
+	cd tests
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a0495e1a99ea9efcf3994db48e50943023ff3d8101055887574ff4eb6b0df8600cf7db68a9c91ca02bbbcc1f01099b008649f88321bb956897bcc90eb4167ee7  libnftnl-1.1.5.tar.bz2
-9c9efaccc2f01e031fe6e05db480a3a1aeace74d11e5e2f2f25979e7543beeea86ea80c0661836a2ec26663c801abb08de3c76c5ac98536b8c05e7caab1f9407  nft-flowtable-test.patch"
+sha512sums="
+0c8c369eec84b0c568f0067598bece6e3be9a0fbd977e443ae3b14a5a6d842a6086ceb5426a65f8c77204709655f148c1241193f1a928f8c12154a57e3548b34  libnftnl-1.2.6.tar.xz
+"
diff --git a/main/libnftnl/nft-flowtable-test.patch b/main/libnftnl/nft-flowtable-test.patch
deleted file mode 100644
index 7b02e94f1aa..00000000000
--- a/main/libnftnl/nft-flowtable-test.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b2388765e0c4405442faa13845419f6a35d0134c Mon Sep 17 00:00:00 2001
-From: Phil Sutter <phil@nwl.cc>
-Date: Mon, 2 Dec 2019 18:29:56 +0100
-Subject: tests: flowtable: Don't check NFTNL_FLOWTABLE_SIZE
-
-Marshalling code around that attribute has been dropped by commit
-d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") so it's value is
-lost during the test.
-
-Assuming that NFTNL_FLOWTABLE_SIZE will receive kernel support at a
-later point, leave the test code in place but just comment it out.
-
-Fixes: d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE")
-Signed-off-by: Phil Sutter <phil@nwl.cc>
-Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- tests/nft-flowtable-test.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/nft-flowtable-test.c b/tests/nft-flowtable-test.c
-index 3edb00d..8ab8d4c 100644
---- a/tests/nft-flowtable-test.c
-+++ b/tests/nft-flowtable-test.c
-@@ -33,9 +33,11 @@ static void cmp_nftnl_flowtable(struct nftnl_flowtable *a, struct nftnl_flowtabl
- 	if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_USE) !=
- 	    nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_USE))
- 		print_err("Flowtable use mismatches");
-+#if 0
- 	if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_SIZE) !=
- 	    nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_SIZE))
- 		print_err("Flowtable size mismatches");
-+#endif
- 	if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_FLAGS) !=
- 	    nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_FLAGS))
- 		print_err("Flowtable flags mismatches");
--- 
-cgit v1.2.1
-
diff --git a/main/libnice/APKBUILD b/main/libnice/APKBUILD
deleted file mode 100644
index edf05a4a4b0..00000000000
--- a/main/libnice/APKBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libnice
-pkgver=0.1.16
-pkgrel=1
-pkgdesc="GLib ICE implementation"
-options="!check" # Testsuite fails
-url="https://nice.freedesktop.org/wiki/"
-arch="all"
-license="LGPL-2.0-or-later MPL-1.1"
-makedepends="
-	glib-dev
-	gnutls-dev
-	gstreamer-dev
-	gobject-introspection-dev
-	gtk-doc
-	meson"
-subpackages="
-	$pkgname-dbg
-	$pkgname-dev
-	$pkgname-doc
-	$pkgname-gstreamer:_gst"
-source="https://nice.freedesktop.org/releases/libnice-$pkgver.tar.gz"
-
-build() {
-	meson --prefix=/usr \
-		--libdir=/usr/lib \
-		--bindir=/usr/bin \
-		--buildtype=plain \
-		-Dgtk_doc=enabled \
-		-Dtests=disabled \
-		-Dexamples=disabled \
-		-Dintrospection=enabled \
-		-Dcrypto-library=gnutls \
-		-Dgstreamer=enabled \
-		-Dgupnp=disabled builddir
-	ninja -C builddir
-}
-
-package() {
-	DESTDIR="$pkgdir" ninja -C builddir install
-}
-
-_gst() {
-	pkgdesc="Gstreamer 1.0 plugin for libnice"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/gstreamer-1.0 "$subpkgdir"/usr/lib/
-}
-
-sha512sums="8fdf0f9fcf43c0fdffbdcb61988a7f9e14bd13bb1bc561d2b9faf493deb18151da14d484740571a302fa203ec7109d45c361ea791e81a2b29932a26220ce902c  libnice-0.1.16.tar.gz"
diff --git a/main/libnih/APKBUILD b/main/libnih/APKBUILD
deleted file mode 100644
index 1670fe9a3be..00000000000
--- a/main/libnih/APKBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Contributor: 
-# Maintainer: 
-pkgname=libnih
-pkgver=1.0.3
-pkgrel=5
-pkgdesc="glib-like library for embedded use"
-url="https://launchpad.net/libnih"
-arch="all"
-# gettext tests are broken
-options="!check"
-license="GPL-2.0-only"
-depends=
-depends_dev="dbus-dev expat-dev"
-makedepends="$depends_dev"
-checkdepends="linux-headers"
-install=""
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://launchpad.net/libnih/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz
-	musl-fix-signals.patch
-	disable-broken-test.patch
-	musl-enomem-message.patch
-	"
-
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--libdir=/lib \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-nls
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="fce40d2445b28c27b8838631681ca3206a4f053b2dd4fc488fc9ef98bbd3d933e3d62b82cf346be2ef1677f6457f692cf5544cd915a6bb1e5c618f98ffa101b4  libnih-1.0.3.tar.gz
-77a979b3076c4e4229359f28c2e9d4fb66d799a66d60391ab6fd7e0dfe2a615b88330a979877b105293a95ed147546596eca174f52b75beca0457c49a017d040  musl-fix-signals.patch
-b5b77b1f18d7aa5d603a0d312b785c28200c38b7bbe5c384ee576c762bd9e3163682c29dd5410baf18c5c3734f0b719602caa1de096f1758d624d94b7753066a  disable-broken-test.patch
-b800c99153ad66c9d7399bc7544a0237de0c7a4ddac129509f13eb1c31805fcac31c93bbf2945da557dfc900c9ec837ec0fded1c3f9887095dae52ff6fc046ec  musl-enomem-message.patch"
diff --git a/main/libnih/disable-broken-test.patch b/main/libnih/disable-broken-test.patch
deleted file mode 100644
index 15027945a7d..00000000000
--- a/main/libnih/disable-broken-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libnih-1.0.3/nih/tests/test_child.c.old	2010-09-20 18:17:01.000000000 -0500
-+++ libnih-1.0.3/nih/tests/test_child.c	2017-09-27 20:22:23.576368549 -0500
-@@ -652,7 +652,7 @@
-       char *argv[])
- {
- 	test_add_watch ();
--	test_poll ();
-+	// test_poll ();
- 
- 	return 0;
- }
diff --git a/main/libnih/musl-enomem-message.patch b/main/libnih/musl-enomem-message.patch
deleted file mode 100644
index 2adeff852ef..00000000000
--- a/main/libnih/musl-enomem-message.patch
+++ /dev/null
@@ -1,489 +0,0 @@
---- libnih-1.0.3/nih-dbus-tool/tests/test_parse.c.old	2010-09-20 18:17:01.000000000 -0500
-+++ libnih-1.0.3/nih-dbus-tool/tests/test_parse.c	2017-09-27 20:40:32.998734677 -0500
-@@ -1583,11 +1583,16 @@
- 	Signal *   signal;
- 	Property * property;
- 	Argument * argument;
-+	char       mem_error[280] = "test:foo:[0-9]*:[0-9]*: ";
- 
- 	TEST_FUNCTION ("parse_xml");
- 	fp = tmpfile ();
- 	output = tmpfile ();
- 
-+ 
-+	strerror_r(ENOMEM, mem_error+24, 254);
-+	mem_error[strlen(mem_error)] = '\n';
-+
- 	/* Check that a file containing a single node entity is parsed
- 	 * successfully, returning a Node structure with no information
- 	 * attached.
-@@ -1608,8 +1613,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -1645,8 +1649,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -1686,8 +1689,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -1743,8 +1745,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -1800,8 +1801,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -1857,8 +1857,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -1916,8 +1915,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -1973,8 +1971,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -2047,8 +2044,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -2121,8 +2117,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -2195,8 +2190,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -2271,8 +2265,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -2345,8 +2338,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -2419,8 +2411,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -2493,8 +2484,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -2567,8 +2557,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -2641,8 +2630,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -2729,8 +2717,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -2817,8 +2804,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -2904,8 +2890,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -2992,8 +2977,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -3107,8 +3091,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -3199,8 +3182,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -3291,8 +3273,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -3417,8 +3398,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -3575,8 +3555,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -3647,8 +3626,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -3719,8 +3697,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -3791,8 +3768,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -3865,8 +3841,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -3937,8 +3912,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -4023,8 +3997,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -4108,8 +4081,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -4194,8 +4166,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -4306,8 +4277,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -4426,8 +4396,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -4579,8 +4548,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -4652,8 +4620,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -4725,8 +4692,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -4800,8 +4766,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -4875,8 +4840,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -4950,8 +4914,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -5027,8 +4990,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -5104,8 +5066,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -5233,8 +5194,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -5570,8 +5530,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
-@@ -5996,8 +5955,7 @@
- 		if (test_alloc_failed) {
- 			TEST_EQ_P (node, NULL);
- 
--			TEST_FILE_MATCH (output, ("test:foo:[0-9]*:[0-9]*: "
--						  "Cannot allocate memory\n"));
-+			TEST_FILE_MATCH (output, mem_error);
- 			TEST_FILE_END (output);
- 			TEST_FILE_RESET (output);
- 			continue;
diff --git a/main/libnih/musl-fix-signals.patch b/main/libnih/musl-fix-signals.patch
deleted file mode 100644
index 97ef8196dea..00000000000
--- a/main/libnih/musl-fix-signals.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libnih-1.0.3.orig/nih/signal.c
-+++ libnih-1.0.3/nih/signal.c
-@@ -87,7 +87,9 @@
- 	{ SIGSTKFLT, "STKFLT" },
- #endif
- 	{ SIGCHLD,   "CHLD"   },
-+#ifdef SIGCLD
- 	{ SIGCLD,    "CLD"    },
-+#endif
- 	{ SIGCONT,   "CONT"   },
- 	{ SIGSTOP,   "STOP"   },
- 	{ SIGTSTP,   "TSTP"   },
diff --git a/main/libnl/APKBUILD b/main/libnl/APKBUILD
deleted file mode 100644
index 8e2aaf59830..00000000000
--- a/main/libnl/APKBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libnl
-pkgver=1.1.4
-pkgrel=1
-pkgdesc="Library for applications dealing with netlink sockets"
-url="https://www.infradead.org/~tgr/libnl/"
-arch="all"
-license="LGPL-2.1-only"
-makedepends="linux-headers"
-subpackages="$pkgname-dev"
-source="https://www.infradead.org/~tgr/libnl/files/$pkgname-$pkgver.tar.gz
-	libnl-1.1-flags.patch
-	libnl-1.1-vlan-header.patch
-	fix-strerror_r.patch
-	fix-includes.patch"
-
-# tests does not work on s390x builder
-# or mips
-case "$CARCH" in
-s390x) options="$options !check";;
-mips*) options="$options !check";;
-esac
-
-build() {
-	cd "$builddir"
-	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"/tests
-	LD_LIBRARY_PATH=$(pwd)/../lib ./test-genl
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4  libnl-1.1.4.tar.gz
-7ef2b3a7fb79227644c897a8cd59d6fc1e94a37211ea59684fe11ec4e34fe95cdc8c3df72134128326c2db10cbada9641290994253a4a80875971d95a73a74c0  libnl-1.1-flags.patch
-ea45d780b16e6045735aaf2e3febf19ddccab4ca0e03710aebfe51655adc50177aefa3bd4d06e0ccce0160f4c6db73cfa4eb7cebe53b3e15c1807c3b00dc1c9c  libnl-1.1-vlan-header.patch
-0464db6611234e3ece7191d88da12d241d0a1cf03e8fa1a8ec1757c0ae971fde1ae727e39358a49ac74f2fee8465b02f6fe21ae0ccc58851299c325b9475d58b  fix-strerror_r.patch
-3d7281137f95e2dcdbc17e1e1676f2a220a735161527cef80d4608e0c16d985d4d14df1d040b6d18b24c407577b6bf0cfb0d7f3520657e9c16b2d487eb1d445a  fix-includes.patch"
diff --git a/main/libnl/fix-includes.patch b/main/libnl/fix-includes.patch
deleted file mode 100644
index b9a6bea0644..00000000000
--- a/main/libnl/fix-includes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- libnl-1.1.orig/lib/netfilter/log.c
-+++ libnl-1.1/lib/netfilter/log.c
-@@ -18,6 +18,7 @@
-  * @{
-  */
- 
-+#include <byteswap.h>
- #include <sys/types.h>
- #include <linux/netfilter/nfnetlink_log.h>
- 
---- libnl-1.1.orig/include/netlink/netlink.h
-+++ libnl-1.1/include/netlink/netlink.h
-@@ -12,11 +12,11 @@
- #ifndef NETLINK_NETLINK_H_
- #define NETLINK_NETLINK_H_
- 
-+#include <poll.h>
- #include <stdio.h>
- #include <stdint.h>
- #include <string.h>
- #include <stdlib.h>
--#include <sys/poll.h>
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/time.h>
diff --git a/main/libnl/fix-strerror_r.patch b/main/libnl/fix-strerror_r.patch
deleted file mode 100644
index ff129be7219..00000000000
--- a/main/libnl/fix-strerror_r.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- libnl-1.1.4.orig/lib/fib_lookup/lookup.c
-+++ libnl-1.1.4/lib/fib_lookup/lookup.c
-@@ -124,7 +124,7 @@
- static int result_dump_brief(struct nl_object *obj, struct nl_dump_params *p)
- {
- 	struct flnl_result *res = (struct flnl_result *) obj;
--	char buf[256];
-+	char buf[256], buf2[256];
- 	int line = 1;
- 
- 	dp_dump(p, "table %s prefixlen %u next-hop-selector %u\n",
-@@ -132,9 +132,10 @@
- 		res->fr_prefixlen, res->fr_nh_sel);
- 	dp_dump_line(p, line++, "type %s ",
- 		     nl_rtntype2str(res->fr_type, buf, sizeof(buf)));
-+	strerror_r(-res->fr_error, buf2, sizeof(buf2));
- 	dp_dump(p, "scope %s error %s (%d)\n",
- 		rtnl_scope2str(res->fr_scope, buf, sizeof(buf)),
--		strerror_r(-res->fr_error, buf, sizeof(buf)), res->fr_error);
-+		buf2, res->fr_error);
- 
- 	return line;
- }
---- libnl-1.1.4.orig/lib/handlers.c
-+++ libnl-1.1.4/lib/handlers.c
-@@ -136,8 +136,8 @@
- 	FILE *ofd = arg ? arg : stderr;
- 	char buf[256];
- 
--	fprintf(ofd, "-- Error received: %s\n-- Original message: ",
--		strerror_r(-e->error, buf, sizeof(buf)));
-+	strerror_r(-e->error, buf, sizeof(buf));
-+	fprintf(ofd, "-- Error received: %s\n-- Original message: ", buf);
- 	print_header_content(ofd, &e->msg);
- 	fprintf(ofd, "\n");
- 
---- libnl-1.1.4.orig/lib/msg.c
-+++ libnl-1.1.4/lib/msg.c
-@@ -961,9 +961,9 @@
- 		struct nlmsgerr *err = nlmsg_data(hdr);
- 		char buf[256];
- 
-+		strerror_r(-err->error, buf, sizeof(buf));
- 		fprintf(ofd, "  [ERRORMSG] %Zu octets\n", sizeof(*err));
--		fprintf(ofd, "    .error = %d \"%s\"\n", err->error,
--			strerror_r(-err->error, buf, sizeof(buf)));
-+		fprintf(ofd, "    .error = %d \"%s\"\n", err->error, buf);
- 		fprintf(ofd, "  [ORIGINAL MESSAGE] %Zu octets\n", sizeof(*hdr));
- 
- 		errmsg = nlmsg_inherit(&err->msg);
diff --git a/main/libnl/libnl-1.1-flags.patch b/main/libnl/libnl-1.1-flags.patch
deleted file mode 100644
index bb09b362660..00000000000
--- a/main/libnl/libnl-1.1-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libnl-1.1/lib/Makefile.orig	2008-01-14 16:48:45.000000000 +0100
-+++ libnl-1.1/lib/Makefile	2009-05-26 09:47:42.000000000 +0200
-@@ -48,7 +48,7 @@
- 
- $(OUT_SLIB): ../Makefile.opts $(OBJ)
- 	@echo "  LD $(OUT_SLIB)"; \
--	$(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
- 	@echo "  LN $(OUT_SLIB) $(LN1_SLIB)"; \
- 	rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB)
- 	@echo "  LN $(LN1_SLIB) $(LN_SLIB)"; \
diff --git a/main/libnl/libnl-1.1-vlan-header.patch b/main/libnl/libnl-1.1-vlan-header.patch
deleted file mode 100644
index c4c2fc6382d..00000000000
--- a/main/libnl/libnl-1.1-vlan-header.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Patrick McHardy <kaber@trash.net>
-Date: Fri, 18 Jan 2008 16:55:48 +0000 (+0100)
-Subject: [LIBNL]: Add if_vlan.h
-X-Git-Url: http://git.kernel.org/?p=libs%2Fnetlink%2Flibnl.git;a=commitdiff_plain;h=e91bb2ffb090955d443e643a25b250bf3d33534a;hp=7f6b7a8eea0334b34d58dec72c66121a76f08958
-
-[LIBNL]: Add if_vlan.h
-
-vlan support needs VLAN_FLAG_REORDER_HDR, which is not available in
-older if_vlan.h versions. Add the current version from the kernel.
-
-Signed-off-by: Patrick McHardy <kaber@trash.net>
----
-
-diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
-new file mode 100644
-index 0000000..068cd7b
---- /dev/null
-+++ include/linux/if_vlan.h
-@@ -0,0 +1,61 @@
-+/*
-+ * VLAN		An implementation of 802.1Q VLAN tagging.
-+ *
-+ * Authors:	Ben Greear <greearb@candelatech.com>
-+ *
-+ *		This program 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 of the License, or (at your option) any later version.
-+ *
-+ */
-+
-+#ifndef _LINUX_IF_VLAN_H_
-+#define _LINUX_IF_VLAN_H_
-+
-+
-+/* VLAN IOCTLs are found in sockios.h */
-+
-+/* Passed in vlan_ioctl_args structure to determine behaviour. */
-+enum vlan_ioctl_cmds {
-+	ADD_VLAN_CMD,
-+	DEL_VLAN_CMD,
-+	SET_VLAN_INGRESS_PRIORITY_CMD,
-+	SET_VLAN_EGRESS_PRIORITY_CMD,
-+	GET_VLAN_INGRESS_PRIORITY_CMD,
-+	GET_VLAN_EGRESS_PRIORITY_CMD,
-+	SET_VLAN_NAME_TYPE_CMD,
-+	SET_VLAN_FLAG_CMD,
-+	GET_VLAN_REALDEV_NAME_CMD, /* If this works, you know it's a VLAN device, btw */
-+	GET_VLAN_VID_CMD /* Get the VID of this VLAN (specified by name) */
-+};
-+
-+enum vlan_flags {
-+	VLAN_FLAG_REORDER_HDR	= 0x1,
-+};
-+
-+enum vlan_name_types {
-+	VLAN_NAME_TYPE_PLUS_VID, /* Name will look like:  vlan0005 */
-+	VLAN_NAME_TYPE_RAW_PLUS_VID, /* name will look like:  eth1.0005 */
-+	VLAN_NAME_TYPE_PLUS_VID_NO_PAD, /* Name will look like:  vlan5 */
-+	VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, /* Name will look like:  eth0.5 */
-+	VLAN_NAME_TYPE_HIGHEST
-+};
-+
-+struct vlan_ioctl_args {
-+	int cmd; /* Should be one of the vlan_ioctl_cmds enum above. */
-+	char device1[24];
-+
-+        union {
-+		char device2[24];
-+		int VID;
-+		unsigned int skb_priority;
-+		unsigned int name_type;
-+		unsigned int bind_type;
-+		unsigned int flag; /* Matches vlan_dev_info flags */
-+        } u;
-+
-+	short vlan_qos;
-+};
-+
-+#endif /* !(_LINUX_IF_VLAN_H_) */
diff --git a/main/libnl3/APKBUILD b/main/libnl3/APKBUILD
index 0ddd5e3b739..3999ffab1b4 100644
--- a/main/libnl3/APKBUILD
+++ b/main/libnl3/APKBUILD
@@ -1,14 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libnl3
-pkgver=3.5.0
-pkgrel=0
+pkgver=3.9.0
+pkgrel=1
 pkgdesc="Library for applications dealing with netlink sockets"
 url="http://www.infradead.org/~tgr/libnl/"
 arch="all"
 license="LGPL-2.1-or-later"
 makedepends="linux-headers flex bison libtool autoconf automake"
 checkdepends="check-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-cli"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-cli"
+# XXX: Since 3.6.0, the tests modify the process namespace.
+# Many of these operations are not allowed by our CI sandbox.
+# The tests should pass locally.
+#
+# See: https://github.com/thom311/libnl/commit/9102872ac24c71f5ac48b6a1f09115c872b5793b
+options="!check"
 source="https://github.com/thom311/libnl/releases/download/libnl${pkgver//./_}/libnl-$pkgver.tar.gz
 	libnl3-musl.patch
 	"
@@ -16,12 +22,10 @@ source="https://github.com/thom311/libnl/releases/download/libnl${pkgver//./_}/l
 builddir="$srcdir"/libnl-$pkgver
 prepare() {
 	default_prepare
-	cd "$builddir"
 	autoreconf -vif
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,18 +33,16 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
-		--disable-static \
+		--enable-static \
 		--enable-unit-tests
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
@@ -53,5 +55,7 @@ cli() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-sha512sums="9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c  libnl-3.5.0.tar.gz
-2b9b569c00b9e29930a83e88264e9cb63a4991bd89a04f2fc4b4c468a2a73309d9463f0b9e4a945e614c0f831a68fc99c5768a0f2214a0dde00785215e24e1dc  libnl3-musl.patch"
+sha512sums="
+b6f3633d1920e61645c97f4c4c4419444e7fd66aa3b67b0a73bc29df24cf27065542a62a9c2581f90d0c153247922ce5c649b7da51c0fead6afceaf4d0361dce  libnl-3.9.0.tar.gz
+2b9b569c00b9e29930a83e88264e9cb63a4991bd89a04f2fc4b4c468a2a73309d9463f0b9e4a945e614c0f831a68fc99c5768a0f2214a0dde00785215e24e1dc  libnl3-musl.patch
+"
diff --git a/main/libnvme/APKBUILD b/main/libnvme/APKBUILD
new file mode 100644
index 00000000000..34f0db57d1d
--- /dev/null
+++ b/main/libnvme/APKBUILD
@@ -0,0 +1,60 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libnvme
+pkgver=1.8
+pkgrel=1
+pkgdesc="C Library for NVM Express on Linux"
+url="https://github.com/linux-nvme/libnvme/"
+arch="all"
+license="LGPL-2.1-or-later"
+depends_dev="
+	json-c-dev
+	linux-headers
+	openssl-dev
+	"
+makedepends="
+	$depends_dev
+	bash
+	dbus-dev
+	meson
+	python3-dev
+	swig
+	util-linux-dev
+	xz
+	"
+checkdepends="diffutils"
+subpackages="${pkgname}mi:mi $pkgname-dev py3-nvme:_py3"
+source="https://github.com/linux-nvme/libnvme/archive/v$pkgver/libnvme-v$pkgver.tar.gz
+	doc-test.patch
+	sysfs-test-getc-eof.patch
+	"
+
+build() {
+	abuild-meson \
+		-Db_lto=true \
+		-Ddocs=false \
+		. output
+	meson compile -C output
+}
+
+check() {
+	meson test --print-errorlogs -C output || [ "$CARCH" = "s390x" ]
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+}
+
+_py3() {
+	pkgdesc="$pkgdesc (python bindings)"
+	amove usr/lib/python3*
+}
+
+mi() {
+	amove usr/lib/libnvme-mi.so.*
+}
+
+sha512sums="
+ba0cec72fd6c9bb29b29c4342be7b25aec1f31157a094ad387a1105cbd1961ab600e1448a2462d8be2af91d5251b2970d6d06d4871ce96604c5be204d6096bcb  libnvme-v1.8.tar.gz
+6ca036287d964db018a2ddfb5480b0b46e6f2edd9f0a7c39dbf5977ce58d8da4d619705e16a3f269bfa7c619d6da5aeff20d9b558c697f6d68e5d89a73ef586e  doc-test.patch
+5c417a296fb9fcf4ef3f617017d1bc2bfc450eb7cea808c5560728a25f3bf584a8b8973c299acff8e303100cbc93d2ac01746873bd931112b1a9305e74194b9f  sysfs-test-getc-eof.patch
+"
diff --git a/main/libnvme/doc-test.patch b/main/libnvme/doc-test.patch
new file mode 100644
index 00000000000..40bcab7c724
--- /dev/null
+++ b/main/libnvme/doc-test.patch
@@ -0,0 +1,14 @@
+needs kernel-doc from linux docs
+diff --git a/doc/meson.build b/doc/meson.build
+index d716c8b..02e90e2 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -49,7 +49,7 @@ want_docs_build = get_option('docs-build')
+ kernel_doc = find_program('kernel-doc')
+ kernel_doc_check = find_program('kernel-doc-check')
+ 
+-test('kdoc', kernel_doc_check, args: api_paths)
++#test('kdoc', kernel_doc_check, args: api_paths)
+ 
+ if want_docs != 'false'
+ 
diff --git a/main/libnvme/sysfs-test-getc-eof.patch b/main/libnvme/sysfs-test-getc-eof.patch
new file mode 100644
index 00000000000..bf8fae206ce
--- /dev/null
+++ b/main/libnvme/sysfs-test-getc-eof.patch
@@ -0,0 +1,11 @@
+--- a/test/sysfs/sysfs.c
++++ b/test/sysfs/sysfs.c
+@@ -44,7 +44,7 @@
+ static bool compare_content(const char *filename1, const char *filename2)
+ {
+ 	FILE *f1, *f2;
+-	char c1, c2;
++	int c1, c2;
+ 	bool pass = false;
+ 
+ 	f1 = fopen(filename1, "r");
diff --git a/main/libogg/APKBUILD b/main/libogg/APKBUILD
index f7555a32a7a..0d9ae64523f 100644
--- a/main/libogg/APKBUILD
+++ b/main/libogg/APKBUILD
@@ -1,35 +1,48 @@
 # Contributor: Mika Havela <mika.havela@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libogg
-pkgver=1.3.4
-pkgrel=0
+pkgver=1.3.5
+pkgrel=5
 pkgdesc="Ogg bitstream and framing library"
 url="https://xiph.org/ogg/"
 arch="all"
 license="BSD-3-Clause"
-subpackages="$pkgname-doc $pkgname-dev"
-source="http://downloads.xiph.org/releases/ogg/libogg-$pkgver.tar.gz"
+makedepends="cmake samurai"
+subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
+source="https://downloads.xiph.org/releases/ogg/libogg-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	CFLAGS="$CFLAGS -O2 -flto=auto" \
+	cmake -B build-shared -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=ON \
+		-DCMAKE_BUILD_TYPE=None \
+		$CMAKE_CROSSOPTS
+	cmake --build build-shared
 
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
+	cmake -B build-static -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=OFF \
+		-DCMAKE_BUILD_TYPE=Release \
+		$CMAKE_CROSSOPTS
+	cmake --build build-static
 }
 
 check() {
-	cd "$builddir"
-	make check
+	ctest --test-dir build-shared --output-on-failure
+	ctest --test-dir build-static --output-on-failure
 }
 
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install
-
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+	DESTDIR="$pkgdir" cmake --install build-static
+	DESTDIR="$pkgdir" cmake --install build-shared
 }
 
-sha512sums="aabe5de063a1963729ce0c055d538612d242b360d13f032d1508f0e82ad23f61d89d0b00386b358a87aba43317bb7a67b8e52361a41a079a1fc2bc6df61917d9  libogg-1.3.4.tar.gz"
+sha512sums="
+e4d798621bb04a62dcb831e58a444357635ab3bcb9efbdffa009cb0be1cafb5e72bf71cbcad5305aa5268a92076a03a7e564a19c0c8d54b93a05d9b03ad2da6b  libogg-1.3.5.tar.gz
+"
diff --git a/main/libotr/APKBUILD b/main/libotr/APKBUILD
index 75930207f2a..07c85f058dd 100644
--- a/main/libotr/APKBUILD
+++ b/main/libotr/APKBUILD
@@ -1,17 +1,19 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=libotr
 pkgver=4.1.1
-pkgrel=1
+pkgrel=5
 pkgdesc="Off The Record Messaging, an encryption library for secure IM conversations"
 options="!check"
 url="http://otr.cypherpunks.ca/"
 arch="all"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-only"
 depends_dev="libgcrypt-dev"
 makedepends="$depends_dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
-source="https://www.cypherpunks.ca/otr/libotr-$pkgver.tar.gz"
+source="https://www.cypherpunks.ca/otr/libotr-$pkgver.tar.gz
+	socklen-t.patch
+	"
 
 prepare() {
 	default_prepare
@@ -36,4 +38,7 @@ tools() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-sha512sums="c957206235b9f627542f23a645c822ea1b318d83fa655f41ed8d9a3c0dddf30b88f0ca82060026af155e48ecb13969dc9270831f20304669794151f666ae5cb0  libotr-4.1.1.tar.gz"
+sha512sums="
+c957206235b9f627542f23a645c822ea1b318d83fa655f41ed8d9a3c0dddf30b88f0ca82060026af155e48ecb13969dc9270831f20304669794151f666ae5cb0  libotr-4.1.1.tar.gz
+0e17f0ffd91c54c7d8b9960b65696ebd4735d52c525ef46fb35e2eeb6a43bdc850e40132a9d2581fc51e2e3f7e88d8cf44e0d01c6792648e9d6dd0252b3cbb26  socklen-t.patch
+"
diff --git a/main/libotr/socklen-t.patch b/main/libotr/socklen-t.patch
new file mode 100644
index 00000000000..6d543adb8df
--- /dev/null
+++ b/main/libotr/socklen-t.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/regression/client/client.c b/tests/regression/client/client.c
+index e72b661..e0b3453 100644
+--- a/tests/regression/client/client.c
++++ b/tests/regression/client/client.c
+@@ -26,6 +26,7 @@
+ #include <stdlib.h>
+ #include <syscall.h>
+ #include <sys/epoll.h>
++#include <sys/socket.h>
+ #include <sys/types.h>
+ #include <sys/un.h>
+ #include <unistd.h>
diff --git a/main/libpaper/APKBUILD b/main/libpaper/APKBUILD
index 74c7c0f8b92..dcfd2c765fb 100644
--- a/main/libpaper/APKBUILD
+++ b/main/libpaper/APKBUILD
@@ -1,36 +1,36 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libpaper
-pkgver=1.1.28
+pkgver=2.2.5
 pkgrel=0
 pkgdesc="Library for handling paper characteristics"
-url="http://packages.debian.org/unstable/source/libpaper"
+url="https://github.com/rrthomas/libpaper/"
 arch="all"
-options="!check"  # No test suite.
-license="GPL-2.0-only"
-makedepends="automake autoconf libtool"
+license="LGPL-2.1-or-later OR MIT"
+makedepends="help2man"
+checkdepends="bash"
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://ftp.debian.org/debian/pool/main/libp/libpaper/libpaper_$pkgver.tar.gz"
-
-prepare() {
-	cd "$builddir"
-	default_prepare
-	autoreconf -fi
-}
+source="https://github.com/rrthomas/libpaper/releases/download/v$pkgver/libpaper-$pkgver.tar.gz"
+options="!check" # really broken
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--disable-static \
-		--mandir="$pkgdir"/usr/share/man
+		--sysconfdir=/etc \
+		--disable-static
 	make
 }
 
+check() {
+	cd tests
+	./run-test
+}
+
 package() {
-	cd "$builddir"
-	make prefix="$pkgdir"/usr install
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc  libpaper_1.1.28.tar.gz"
+sha512sums="
+db8da6f7c41a11458e917e4ecceab69c77ada54ac7de9ca13137f019ccca29d85f49573307327c05704697f8bdf7a044231c123b41e5033f78ad610202163808  libpaper-2.2.5.tar.gz
+"
diff --git a/main/libpcap/APKBUILD b/main/libpcap/APKBUILD
index 53b52ca826a..8fb63ca07b4 100644
--- a/main/libpcap/APKBUILD
+++ b/main/libpcap/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libpcap
-pkgver=1.9.1
-pkgrel=2
+pkgver=1.10.4
+pkgrel=1
 pkgdesc="A system-independent interface for user-level packet capture"
 url="https://www.tcpdump.org/"
 arch="all"
@@ -14,12 +14,12 @@ subpackages="$pkgname-doc $pkgname-dev"
 
 # secfixes:
 #   1.9.1-r0:
-#    - CVE-2018-16301
-#    - CVE-2019-15161
-#    - CVE-2019-15162
-#    - CVE-2019-15163
-#    - CVE-2019-15164
-#    - CVE-2019-15165
+#     - CVE-2018-16301
+#     - CVE-2019-15161
+#     - CVE-2019-15162
+#     - CVE-2019-15163
+#     - CVE-2019-15164
+#     - CVE-2019-15165
 
 build() {
 	./configure \
@@ -42,5 +42,7 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install install-shared
 }
 
-sha512sums="ae0d6b0ad8253e7e059336c0f4ed3850d20d7d2f4dc1d942c2951f99a5443a690f0cc42c6f8fdc4a0ccb19e9e985192ba6f399c4bde2c7076e420f547fddfb08  libpcap-1.9.1.tar.gz
-77590c8fcea96427fd08e85023609695f8b280a9b24a503d19b08a3c6baf3537a949c94078a5cd577f0476d735a257050955590374d85ce6a2f35a09143da5a3  fix-headers.patch"
+sha512sums="
+1f6d6ddd07dae7c557054cb246437ecdaf39d579592a5a6bdf1144eea6cb5a779ac4ca647cfed11ec1b0bb18efc63b845444e497070bacefaaed19a5787ae5e1  libpcap-1.10.4.tar.gz
+77590c8fcea96427fd08e85023609695f8b280a9b24a503d19b08a3c6baf3537a949c94078a5cd577f0476d735a257050955590374d85ce6a2f35a09143da5a3  fix-headers.patch
+"
diff --git a/main/libpciaccess/APKBUILD b/main/libpciaccess/APKBUILD
index 504715127ff..7ef6211a1f4 100644
--- a/main/libpciaccess/APKBUILD
+++ b/main/libpciaccess/APKBUILD
@@ -1,31 +1,29 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libpciaccess
-pkgver=0.16
+pkgver=0.18.1
 pkgrel=0
 pkgdesc="X11 PCI access library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
 license="X11"
 options="!check"  # No test suite.
-makedepends="util-macros"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="https://www.x.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2
-	limits_h.patch"
+depends="hwdata-pci"
+makedepends="meson util-macros"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://www.x.org/releases/individual/lib/libpciaccess-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
+	abuild-meson \
+		-Db_lto=true \
+		. output
+	meson compile -C output
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1  libpciaccess-0.16.tar.bz2
-331a498059d8b2bfd0a7da0ced3616266ebc129b785090ef1dc19cd645b013428c60d5678fc080bd15ecaf7598ec8b1084509d6bea5d563101169a449b6fe75b  limits_h.patch"
+sha512sums="
+ef27999446e735df2331e94219ee3dafe9198a2472bb452f63ef9c9c446d5431f9e231e224cfabdeba1402974a5a0064546f9abced4d1770f994f5fc0c2b3310  libpciaccess-0.18.1.tar.xz
+"
diff --git a/main/libpciaccess/limits_h.patch b/main/libpciaccess/limits_h.patch
deleted file mode 100644
index 6e0d7eeab56..00000000000
--- a/main/libpciaccess/limits_h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/linux_sysfs.c
-+++ b/src/linux_sysfs.c
-@@ -48,6 +48,7 @@
- #include <sys/mman.h>
- #include <dirent.h>
- #include <errno.h>
-+#include <limits.h>
- 
- #if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
- #include <sys/io.h>
diff --git a/main/libpng/APKBUILD b/main/libpng/APKBUILD
index d1da38e0216..535bc3c7cae 100644
--- a/main/libpng/APKBUILD
+++ b/main/libpng/APKBUILD
@@ -1,20 +1,18 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libpng
-pkgver=1.6.37
-pkgrel=1
+pkgver=1.6.43
+pkgrel=0
 pkgdesc="Portable Network Graphics library"
 url="http://www.libpng.org"
 arch="all"
 license="Libpng"
 makedepends="zlib-dev gawk autoconf automake libtool"
 subpackages="$pkgname-doc $pkgname-static $pkgname-dev $pkgname-utils"
-source="https://downloads.sourceforge.net/libpng/$pkgname-$pkgver.tar.gz
-	https://downloads.sourceforge.net/sourceforge/libpng-apng/$pkgname-$pkgver-apng.patch.gz
+source="https://downloads.sourceforge.net/libpng/libpng-$pkgver.tar.gz
+	https://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-1.6.43-apng.patch.gz
 	libpng-fix-arm-neon.patch
-	dont-run-pngtest.patch
 	"
-builddir="$srcdir/$pkgname-$pkgver"
 
 # secfixes:
 #   1.6.37-r0:
@@ -23,15 +21,12 @@ builddir="$srcdir/$pkgname-$pkgver"
 #     - CVE-2018-14550
 
 prepare() {
-	cd "$builddir"
-	gunzip -c "$srcdir"/$pkgname-$pkgver-apng.patch.gz | patch -p1
 	default_prepare
 	# libpng-fix-arm-neon.patch modifies configure.ac
 	autoreconf -vif
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -43,31 +38,22 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
 utils() {
 	pkgdesc="$pkgdesc (pngfix utils)"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
-}
-
-static() {
-	depends=""
-	pkgdesc="$pkgdesc (static library)"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
+	amove usr/bin
 }
 
-sha512sums="2ce2b855af307ca92a6e053f521f5d262c36eb836b4810cb53c809aa3ea2dcc08f834aee0ffd66137768a54397e28e92804534a74abb6fc9f6f3127f14c9c338  libpng-1.6.37.tar.gz
-226adcb3a8c60f2267fe2976ab531329ae43c2603dab4d0cf8f16217d64069936b879f3d6516b75d259c47d6f5c5b1f24f887602206c8e46abde0fb7f5c7946b  libpng-1.6.37-apng.patch.gz
-e3fae918f14bc34e7c126892f69527c6e1b4d72593835ece839d9a28cff55a886b2030f877cf9e29b2c97abf2e47bbb5ba54584828edd2a841c2556f330b9c7e  libpng-fix-arm-neon.patch
-dbd581dacdc284ac9a6ea5a8d043478f17b9173d89d05acc1bcdc8fab7032437b5a21fd18a06c52df91d9cd4a2d8aee48f1a7bd1cb2e3f6cfd6f6a13d31c7823  dont-run-pngtest.patch"
+sha512sums="
+ac8831f28afcdf951001dff1b7a0c89cbd907a1e3ba3f21bc7bc98574b1bd7e0358ee6ac0d343b3f0a2083be730ecbd2ba8e94d0ee816f3ae58f4c664df63beb  libpng-1.6.43.tar.gz
+a724f7de486920cb119818f7172fb589bc2c3c1cc1f81bb5c4da0609ab108ef9ef7406cf689a20bc4e8da69647847f550ed497b3fa99a10539e9a0abf492c053  libpng-1.6.43-apng.patch.gz
+0a5efa609bda4c2a38f5110b7287020a5f9dc81583f2b05a951d897a18ce62ea80350baf52daa3d02f20dff51bbc177b3af317ab7bbc09eb23a3c252600414a5  libpng-fix-arm-neon.patch
+"
diff --git a/main/libpng/dont-run-pngtest.patch b/main/libpng/dont-run-pngtest.patch
deleted file mode 100644
index 7ce5d67b75a..00000000000
--- a/main/libpng/dont-run-pngtest.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 4f621aa..3583c60 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -59,7 +59,6 @@ pngcp_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
- # Generally these are single line shell scripts to run a test with a particular
- # set of parameters:
- TESTS =\
--   tests/pngtest\
-    tests/pngtest-badpngs\
-    tests/pngvalid-gamma-16-to-8 tests/pngvalid-gamma-alpha-mode\
-    tests/pngvalid-gamma-background tests/pngvalid-gamma-expand16-alpha-mode\
diff --git a/main/libpng/libpng-fix-arm-neon.patch b/main/libpng/libpng-fix-arm-neon.patch
index 2cd3f18c28d..099083fd923 100644
--- a/main/libpng/libpng-fix-arm-neon.patch
+++ b/main/libpng/libpng-fix-arm-neon.patch
@@ -1,6 +1,8 @@
+diff --git a/configure.ac b/configure.ac
+index 7b6d5b9..d02e16d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -364,17 +364,21 @@
+@@ -357,17 +357,21 @@ AC_ARG_ENABLE([arm-neon],
     [case "$enableval" in
        no|off)
           # disable the default enabling on __ARM_NEON__ systems:
@@ -8,7 +10,7 @@
           AC_DEFINE([PNG_ARM_NEON_OPT], [0],
                     [Disable ARM Neon optimizations])
           # Prevent inclusion of the assembler files below:
-          enable_arm_neon=no;;
+          enable_arm_neon=no ;;
        check)
 +         AC_DEFINE([PNG_ARM_NEON], [], [ARM NEON support])
           AC_DEFINE([PNG_ARM_NEON_CHECK_SUPPORTED], [],
@@ -22,6 +24,8 @@
           AC_DEFINE([PNG_ARM_NEON_OPT], [2],
                     [Enable ARM Neon optimizations])
           AC_MSG_WARN([--enable-arm-neon: please specify 'check' or 'api', if]
+diff --git a/pngpriv.h b/pngpriv.h
+index 2e426cf..fb521cf 100644
 --- a/pngpriv.h
 +++ b/pngpriv.h
 @@ -127,7 +127,7 @@
diff --git a/main/libpri/APKBUILD b/main/libpri/APKBUILD
deleted file mode 100644
index 24fd6430562..00000000000
--- a/main/libpri/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Timo Teras <timo.teras@iki.fi>
-# Maintainer: Timo Teras <timo.teras@iki.fi>
-pkgname=libpri
-pkgver=1.6.0
-pkgrel=1
-pkgdesc="Primary Rate ISDN (PRI) library"
-options="!check" # No testsuite
-url="https://github.com/asterisk/libpri"
-arch="all"
-license="GPL-2.0-only"
-makedepends="dahdi-linux-dev dahdi-tools-dev"
-subpackages="$pkgname-dev"
-source="http://downloads.digium.com/pub/telephony/libpri/releases/$pkgname-$pkgver.tar.gz"
-
-prepare() {
-	cd "$builddir"
-	default_prepare
-	sed -i -e 's,^#include <sys/signal.h>$,#include <signal.h>,g' \
-		pritest.c testprilib.c
-}
-
-build() {
-	cd "$builddir"
-	make LDCONFIG="echo"
-}
-
-package() {
-	cd "$builddir"
-	make LDCONFIG="echo" INSTALL_PREFIX="$pkgdir" install
-	rm -f "$pkgdir"/usr/lib/*.a
-}
-
-sha512sums="3eb876477cdd27c88f274e4a2e35a67f660b8d8eed140e56c40769982a58f1cdd4e5be352f8f220dc100eedf1ad09286c578430a52d9abe326440c8cbf517fa5  libpri-1.6.0.tar.gz"
diff --git a/main/libpsl/APKBUILD b/main/libpsl/APKBUILD
new file mode 100644
index 00000000000..cb82a796256
--- /dev/null
+++ b/main/libpsl/APKBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=libpsl
+pkgver=0.21.5
+pkgrel=1
+pkgdesc="C library for the Publix Suffix List"
+url="https://rockdaboot.github.io/libpsl"
+arch="all"
+license="MIT"
+depends_dev="$pkgname-utils=$pkgver-r$pkgrel"
+makedepends="python3 libidn2-dev libunistring-dev meson"
+subpackages="$pkgname-static $pkgname-utils $pkgname-dev $pkgname-doc"
+source="https://github.com/rockdaboot/libpsl/releases/download/$pkgver/libpsl-$pkgver.tar.gz"
+
+build() {
+	# -Db_lto=true does not work when cross-compiling
+	if [ "$CBUILD" != "$CHOST" ];then
+		_b_lto_configure="-Db_lto=false"
+	else
+		_b_lto_configure="-Db_lto=true"
+	fi
+	abuild-meson \
+		--default-library=both \
+		$_b_lto_configure \
+		. output
+	meson compile -C output
+}
+
+check() {
+	meson test --no-rebuild --print-errorlogs -C output
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+}
+
+utils() {
+	pkgdesc="$pkgdesc (utils)"
+
+	amove usr/bin
+}
+
+sha512sums="
+c14d575cecc0f1693894dd79565b6b9220084ddfa43b908a1cefe16d147cdd5ec47796eb0c2135e2f829a951abaf39d8a371ab5c1352f57b36e610e25adf91f5  libpsl-0.21.5.tar.gz
+"
diff --git a/main/libpthread-stubs/APKBUILD b/main/libpthread-stubs/APKBUILD
deleted file mode 100644
index d447d5265a3..00000000000
--- a/main/libpthread-stubs/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libpthread-stubs
-pkgver=0.3
-pkgrel=5
-pkgdesc="Pthread functions stubs for platforms missing them"
-url="https://cgit.freedesktop.org/xcb/pthread-stubs"
-arch="all"
-license="X11"
-options="!dbg"
-source="https://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2"
-builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	update_config_sub
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install
-}
-
-sha512sums="c7cf63fa82ce9e8c37c6dc3b8cc30f8883655f95683c4466c54b617b086dd26a43bfa36363e47dc5730af6d59ac70443d211eb01b07d276edd144030a3580b15  libpthread-stubs-0.3.tar.bz2"
diff --git a/main/libraw1394/APKBUILD b/main/libraw1394/APKBUILD
deleted file mode 100644
index 27430b0d370..00000000000
--- a/main/libraw1394/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
-pkgname=libraw1394
-pkgver=2.1.2
-pkgrel=1
-pkgdesc="Library to provide access to Linux 1394 subsystem"
-url="https://sourceforge.net/projects/libraw1394"
-arch="all"
-license="LGPL-2.1+"
-depends=
-depends_dev=
-makedepends="linux-headers"
-install=
-subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
-source="https://kernel.org/pub/linux/libs/ieee1394/$pkgname-$pkgver.tar.xz"
-
-builddir="$srcdir"/$pkgname-$pkgver
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--disable-static
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-tools() {
-	pkgdesc="Tools for libraw1394"
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
-}
-
-sha512sums="1ef38961b747c4ebb18d823a4c38d5bf019f8bd0ac55547838d153b1899b91ae0ff56f5b6732e309d6975b55725d1ce989917ffcf605cf64f7d33624f54f0567  libraw1394-2.1.2.tar.xz"
diff --git a/main/librelp/APKBUILD b/main/librelp/APKBUILD
index fc7aa068b1a..8dda5c4009d 100644
--- a/main/librelp/APKBUILD
+++ b/main/librelp/APKBUILD
@@ -1,28 +1,47 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=librelp
-pkgver=1.5.0
-pkgrel=0
+pkgver=1.11.0
+pkgrel=2
 pkgdesc="The Reliable Event Logging Protocol library"
 url="https://www.rsyslog.com"
 arch="all"
 license="GPL-3.0-or-later"
-makedepends="gnutls-dev openssl-dev"
+makedepends="gnutls-dev openssl-dev>3"
+checkdepends="bash coreutils"
 subpackages="$pkgname-static $pkgname-dev"
-source="http://download.rsyslog.com/librelp/librelp-$pkgver.tar.gz"
-options="!check"  # XXX: all tests fail, don't know why
+source="https://download.rsyslog.com/librelp/librelp-$pkgver.tar.gz
+	implicit-decl.patch
+	"
+options="!check" # XXX: some fail in CI, don't know why
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--mandir=/usr/share/man
+		--mandir=/usr/share/man \
+		--enable-valgrind=no
 	make
 }
 
+check() {
+	make -j1 check || {
+		cat tests/test-suite.log
+		return 1
+	}
+}
+
 package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b7fb35e4ddb5c3c14ef733699405f8aa62911adef305cd4f494170e111bc61a9208b84dab472a708582cd76ad9976894dae0e7574e60acdae2b56491aa7daf36  librelp-1.5.0.tar.gz"
+sha512sums="
+e93cbc12fb6e596762c351cdfa3293fea89dd8cf90de4f890771216b56c3f66e3578fefea447d4ca9f754f146712481e7bab9a831f16fcf0cd15b10d475925bc  librelp-1.11.0.tar.gz
+706447c06fe5a9d5d2f55093c692142884bd6802eb3be51214c356c00d210681d5ce2d33485e6f22edd2bb8113cf63318880cbfca193ea686626e5c23eb941a6  implicit-decl.patch
+"
diff --git a/main/librelp/implicit-decl.patch b/main/librelp/implicit-decl.patch
new file mode 100644
index 00000000000..413fc849630
--- /dev/null
+++ b/main/librelp/implicit-decl.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/receive.c b/tests/receive.c
+index f376cb4..c2a6137 100644
+--- a/tests/receive.c
++++ b/tests/receive.c
+@@ -31,6 +31,7 @@
+ #endif
+ #include <string.h>
+ #include <limits.h>
++#include <sys/select.h>
+ #include <errno.h>
+ #include <signal.h>
+ #include "librelp.h"
diff --git a/main/libresample/APKBUILD b/main/libresample/APKBUILD
index cfa4f9995d8..8581ec7f9bf 100644
--- a/main/libresample/APKBUILD
+++ b/main/libresample/APKBUILD
@@ -2,43 +2,30 @@
 # Maintainer:
 pkgname=libresample
 pkgver=0.1.3
-pkgrel=1
+pkgrel=3
 pkgdesc="real-time library for sampling rate conversion"
 url="https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html"
 arch="all"
-license="GPL"
-depends=
-makedepends="wget"
-install=
-subpackages=
+license="LGPL-2.1-or-later"
 source="https://ccrma.stanford.edu/~jos/gz/libresample-$pkgver.tgz"
+options="!check"
 
 # append extra dependencies to -dev subpackage
 # remove if not used.
 # depends_dev="somepackage-dev"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	cd "$_builddir"
-	# apply patches here
-}
-
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
-	make || return 1
+		--infodir=/usr/share/info
+	make
 }
 
 package() {
-	cd "$_builddir"
 	install -d "$pkgdir"/usr/include "$pkgdir"/usr/lib
 	install -m644 include/libresample.h "$pkgdir"/usr/include/
 	install -m644 libresample.a "$pkgdir"/usr/lib/
diff --git a/main/libressl/APKBUILD b/main/libressl/APKBUILD
deleted file mode 100644
index 84cf67ba0e8..00000000000
--- a/main/libressl/APKBUILD
+++ /dev/null
@@ -1,99 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Orion <systmkor@gmail.com>
-# Maintainer: Orion <systmkor@gmail.com>
-#
-# secfixes:
-#   2.7.4-r0:
-#     - CVE-2018-0732
-#     - CVE-2018-0495
-#   2.5.3-r1:
-#     - CVE-2017-8301
-#
-pkgname=libressl
-pkgver=3.0.2
-_namever=${pkgname}${pkgver%.*}
-pkgrel=0
-pkgdesc="Version of the TLS/crypto stack forked from OpenSSL"
-url="http://www.libressl.org/"
-arch="all"
-license="custom"
-depends=""
-pcprefix="libressl:" # avoid mix up with openssl pkg-config
-makedepends_build="automake autoconf libtool"
-makedepends_host="linux-headers"
-makedepends="$makedepends_host $makedepends_build"
-subpackages="$pkgname-dbg $_namever-libcrypto:_libs $_namever-libssl:_libs
-	$_namever-libtls:_libs $pkgname-dev $pkgname-doc"
-source="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/$pkgname-$pkgver.tar.gz
-	starttls-ldap.patch
-	ssl-libcompat.patch
-	s_client-add-options-verify_.patch
-	"
-builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	autoreconf -vif
-}
-
-build() {
-	cd "$builddir"
-
-	CFLAGS="-L$CBUILDROOT/usr/lib $CFLAGS" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--with-sysroot=$CBUILDROOT \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-check() {
-	cd "$builddir"
-	make -j1 check
-}
-
-package() {
-	cd "$builddir"
-
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-
-	cd "$pkgdir"
-
-	# /usr/bin/openssl will be replaced with openssl's binary. We provide
-	# a /usr/bin/libressl binary in case something needs it.
-	mv usr/bin/openssl usr/bin/libressl
-
-	# Provided by ca-certificates-cacerts
-	rm etc/ssl/cert.pem
-	rmdir etc/ssl/certs
-
-	# Provided by openssl's libcrypto1.1
-	rm etc/ssl/openssl.cnf
-}
-
-_libs() {
-	local name="${subpkgname#$_namever-}"
-	pkgdesc="libressl $name library"
-	depends=""
-
-	mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib
-	local f; for f in "$pkgdir"/usr/lib/$name.so.*; do
-		mv $f "$subpkgdir"/lib/
-		ln -s ../../lib/${f##*/} "$subpkgdir"/usr/lib/${f##*/}
-	done
-	if [ "$name" = "libcrypto" ]; then
-		mv "$pkgdir"/etc "$subpkgdir"
-	fi
-}
-
-sha512sums="19226da3bc9776e1da40b8e94dfa53564d5e6acc80edee539ba12d7a75c1bb8c0603e7633f26a6ef8b12adc56bb677ccda448575aa6be2ad3df5447465a4b080  libressl-3.0.2.tar.gz
-9f1628fbc2a697b6570353920d784b161ca0a122047066d8bee15225bad1e5271aa2ed72b145506bcd4ffe58b35da2caf38c4a048db7e014dabd16b5eba44581  starttls-ldap.patch
-ef8150843f5aae577a859198439673591764fb3ab1da03436607328962f084356fd7f793484c3ad5f2294bd9e8dad15644c311b0da811acbc83eed4b71c0145a  ssl-libcompat.patch
-4c992872addbe4fd612ba9e3f859b5ba69b448aafa7676751ca7ca09bbcfc47a2a1cad468c235f8d1a65c65e8efb38f27c512a32b444346c39ec0d8dcfbcd346  s_client-add-options-verify_.patch"
diff --git a/main/libressl/s_client-add-options-verify_.patch b/main/libressl/s_client-add-options-verify_.patch
deleted file mode 100644
index 24048cea9e3..00000000000
--- a/main/libressl/s_client-add-options-verify_.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Sun, 27 May 2018 22:08:00 +0200
-Subject: [PATCH] s_client: Add options -verify_{hostname,email,ip}
-
-This code is ported from OpenSSL 1.0.2o. We need it for Busybox wget.
-
---- a/apps/openssl/apps.c
-+++ b/apps/openssl/apps.c
-@@ -1845,6 +1845,9 @@
- 	char **oldargs = *pargs;
- 	char *arg = **pargs, *argn = (*pargs)[1];
- 	time_t at_time = 0;
-+	char *hostname = NULL;
-+	char *email = NULL;
-+	char *ipasc = NULL;
- 	const char *errstr = NULL;
- 
- 	if (!strcmp(arg, "-policy")) {
-@@ -1905,6 +1908,21 @@
- 			at_time = (time_t) timestamp;
- 		}
- 		(*pargs)++;
-+	} else if (strcmp(arg, "-verify_hostname") == 0) {
-+		if (!argn)
-+			*badarg = 1;
-+		hostname = argn;
-+		(*pargs)++;
-+	} else if (strcmp(arg, "-verify_email") == 0) {
-+		if (!argn)
-+			*badarg = 1;
-+		email = argn;
-+		(*pargs)++;
-+	} else if (strcmp(arg, "-verify_ip") == 0) {
-+		if (!argn)
-+			*badarg = 1;
-+		ipasc = argn;
-+		(*pargs)++;
- 	} else if (!strcmp(arg, "-ignore_critical"))
- 		flags |= X509_V_FLAG_IGNORE_CRITICAL;
- 	else if (!strcmp(arg, "-issuer_checks"))
-@@ -1958,6 +1976,15 @@
- 
- 	if (at_time)
- 		X509_VERIFY_PARAM_set_time(*pm, at_time);
-+
-+	if (hostname && !X509_VERIFY_PARAM_set1_host(*pm, hostname, 0))
-+		*badarg = 1;
-+
-+	if (email && !X509_VERIFY_PARAM_set1_email(*pm, email, 0))
-+		*badarg = 1;
-+
-+	if (ipasc && !X509_VERIFY_PARAM_set1_ip_asc(*pm, ipasc))
-+		*badarg = 1;
- 
-  end:
- 	(*pargs)++;
---- a/apps/openssl/s_client.c
-+++ b/apps/openssl/s_client.c
-@@ -200,8 +200,12 @@
- 	BIO_printf(bio_err, " -port port     - use -connect instead\n");
- 	BIO_printf(bio_err, " -connect host:port - who to connect to (default is %s:%s)\n", SSL_HOST_NAME, PORT_STR);
- 	BIO_printf(bio_err, " -proxy host:port - connect to http proxy\n");
-+	BIO_printf(bio_err, " -verify_hostname host - check peer certificate matches \"host\"\n");
-+	BIO_printf(bio_err, " -verify_email email - check peer certificate matches \"email\"\n");
-+	BIO_printf(bio_err, " -verify_ip ipaddr - check peer certificate matches \"ipaddr\"\n");
- 
- 	BIO_printf(bio_err, " -verify arg   - turn on peer certificate verification\n");
-+	BIO_printf(bio_err, " -verify_return_error - return verification errors\n");
- 	BIO_printf(bio_err, " -cert arg     - certificate file to use, PEM format assumed\n");
- 	BIO_printf(bio_err, " -certform arg - certificate format (PEM or DER) PEM default\n");
- 	BIO_printf(bio_err, " -key arg      - Private key file to use, in cert file if\n");
diff --git a/main/libressl/ssl-libcompat.patch b/main/libressl/ssl-libcompat.patch
deleted file mode 100644
index c28c33aa5cb..00000000000
--- a/main/libressl/ssl-libcompat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ssl/Makefile.am b/ssl/Makefile.am
-index 99d138a..9d8f1f4 100644
---- a/ssl/Makefile.am
-+++ b/ssl/Makefile.am
-@@ -7,7 +7,7 @@ EXTRA_DIST += CMakeLists.txt
- EXTRA_DIST += ssl.sym
- 
- libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -export-symbols $(top_srcdir)/ssl/ssl.sym
--libssl_la_LIBADD = $(abs_top_builddir)/crypto/libcrypto.la
-+libssl_la_LIBADD = $(abs_top_builddir)/crypto/libcrypto.la $(abs_top_builddir)/crypto/libcompat.la
- 
- libssl_la_SOURCES = bio_ssl.c
- libssl_la_SOURCES += bs_ber.c
diff --git a/main/libressl/starttls-ldap.patch b/main/libressl/starttls-ldap.patch
deleted file mode 100644
index 3ee44d87fdb..00000000000
--- a/main/libressl/starttls-ldap.patch
+++ /dev/null
@@ -1,207 +0,0 @@
---- a/apps/openssl/s_client.c
-+++ b/apps/openssl/s_client.c
-@@ -56,7 +56,7 @@
-  * [including the GNU Public Licence.]
-  */
- /* ====================================================================
-- * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
-+ * Copyright (c) 1998-2017 The OpenSSL Project.  All rights reserved.
-  *
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions
-@@ -184,6 +184,7 @@
- static void sc_usage(void);
- static void print_stuff(BIO * berr, SSL * con, int full);
- static int ocsp_resp_cb(SSL * s, void *arg);
-+static int ldap_ExtendedResponse_parse(const char *buf, long rem);
- static BIO *bio_c_out = NULL;
- static int c_quiet = 0;
- static int c_ign_eof = 0;
-@@ -234,7 +235,7 @@
- 	BIO_printf(bio_err, " -starttls prot - use the STARTTLS command before starting TLS\n");
- 	BIO_printf(bio_err, "                 for those protocols that support it, where\n");
- 	BIO_printf(bio_err, "                 'prot' defines which one to assume.  Currently,\n");
--	BIO_printf(bio_err, "                 only \"smtp\", \"lmtp\", \"pop3\", \"imap\", \"ftp\" and \"xmpp\"\n");
-+	BIO_printf(bio_err, "                 only \"smtp\", \"lmtp\", \"pop3\", \"imap\", \"ftp\", \"xmpp\" and \"ldap\"\n");
- 	BIO_printf(bio_err, "                 are supported.\n");
- 	BIO_printf(bio_err, " -xmpphost host - connect to this virtual host on the xmpp server\n");
- 	BIO_printf(bio_err, " -sess_out arg - file to write SSL session to\n");
-@@ -284,7 +285,8 @@
- 	PROTO_POP3,
- 	PROTO_IMAP,
- 	PROTO_FTP,
--	PROTO_XMPP
-+	PROTO_XMPP,
-+	PROTO_LDAP
- };
- 
- int
-@@ -543,6 +545,8 @@
- 				starttls_proto = PROTO_FTP;
- 			else if (strcmp(*argv, "xmpp") == 0)
- 				starttls_proto = PROTO_XMPP;
-+			else if (strcmp(*argv, "ldap") == 0)
-+				starttls_proto = PROTO_LDAP;
- 			else
- 				goto bad;
- 		}
-@@ -934,6 +938,72 @@
- 		if (!strstr(sbuf, "<proceed"))
- 			goto shut;
- 		mbuf[0] = 0;
-+	} else if (starttls_proto == PROTO_LDAP) {
-+		/* StartTLS Operation according to RFC 4511 */
-+		static char ldap_tls_genconf[] = "asn1=SEQUENCE:LDAPMessage\n"
-+			"[LDAPMessage]\n"
-+			"messageID=INTEGER:1\n"
-+			"extendedReq=EXPLICIT:23A,IMPLICIT:0C,"
-+			"FORMAT:ASCII,OCT:1.3.6.1.4.1.1466.20037\n";
-+		long errline = -1;
-+		char *genstr = NULL;
-+		int result = -1;
-+		ASN1_TYPE *atyp = NULL;
-+		BIO *ldapbio = BIO_new(BIO_s_mem());
-+		CONF *cnf = NCONF_new(NULL);
-+
-+		if (cnf == NULL) {
-+			BIO_free(ldapbio);
-+			goto end;
-+		}
-+		BIO_puts(ldapbio, ldap_tls_genconf);
-+		if (NCONF_load_bio(cnf, ldapbio, &errline) <= 0) {
-+			BIO_free(ldapbio);
-+			NCONF_free(cnf);
-+			if (errline <= 0) {
-+				BIO_printf(bio_err, "NCONF_load_bio failed\n");
-+				goto end;
-+			} else {
-+				BIO_printf(bio_err, "Error on line %ld\n", errline);
-+				goto end;
-+			}
-+		}
-+		BIO_free(ldapbio);
-+		genstr = NCONF_get_string(cnf, "default", "asn1");
-+		if (genstr == NULL) {
-+			NCONF_free(cnf);
-+			BIO_printf(bio_err, "NCONF_get_string failed\n");
-+			goto end;
-+		}
-+		atyp = ASN1_generate_nconf(genstr, cnf);
-+		if (atyp == NULL) {
-+			NCONF_free(cnf);
-+			BIO_printf(bio_err, "ASN1_generate_nconf failed\n");
-+			goto end;
-+		}
-+		NCONF_free(cnf);
-+
-+		/* Send SSLRequest packet */
-+		BIO_write(sbio, atyp->value.sequence->data,
-+				  atyp->value.sequence->length);
-+		(void)BIO_flush(sbio);
-+		ASN1_TYPE_free(atyp);
-+
-+		mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ);
-+		if (mbuf_len < 0) {
-+			BIO_printf(bio_err, "BIO_read failed\n");
-+			goto end;
-+		}
-+		result = ldap_ExtendedResponse_parse(mbuf, mbuf_len);
-+		if (result < 0) {
-+			BIO_printf(bio_err, "ldap_ExtendedResponse_parse failed\n");
-+			goto shut;
-+		} else if (result > 0) {
-+			BIO_printf(bio_err, "STARTTLS failed, LDAP Result Code: %i\n",
-+			           result);
-+			goto shut;
-+		}
-+		mbuf_len = 0;
- 	} else if (proxy != NULL) {
- 		BIO_printf(sbio, "CONNECT %s HTTP/1.0\r\n\r\n", connect);
- 		mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ);
-@@ -1437,3 +1507,86 @@
- 	return 1;
- }
- 
-+static int ldap_ExtendedResponse_parse(const char *buf, long rem)
-+{
-+	const unsigned char *cur, *end;
-+	long len;
-+	int tag, xclass, inf, ret = -1;
-+
-+	cur = (const unsigned char *)buf;
-+	end = cur + rem;
-+
-+	/*
-+	 * From RFC 4511:
-+	 *
-+	 *    LDAPMessage ::= SEQUENCE {
-+	 *         messageID       MessageID,
-+	 *         protocolOp      CHOICE {
-+	 *              ...
-+	 *              extendedResp          ExtendedResponse,
-+	 *              ... },
-+	 *         controls       [0] Controls OPTIONAL }
-+	 *
-+	 *    ExtendedResponse ::= [APPLICATION 24] SEQUENCE {
-+	 *         COMPONENTS OF LDAPResult,
-+	 *         responseName     [10] LDAPOID OPTIONAL,
-+	 *         responseValue    [11] OCTET STRING OPTIONAL }
-+	 *
-+	 *    LDAPResult ::= SEQUENCE {
-+	 *         resultCode         ENUMERATED {
-+	 *              success                      (0),
-+	 *              ...
-+	 *              other                        (80),
-+	 *              ...  },
-+	 *         matchedDN          LDAPDN,
-+	 *         diagnosticMessage  LDAPString,
-+	 *         referral           [3] Referral OPTIONAL }
-+	 */
-+
-+	/* pull SEQUENCE */
-+	inf = ASN1_get_object(&cur, &len, &tag, &xclass, rem);
-+	if (inf != V_ASN1_CONSTRUCTED || tag != V_ASN1_SEQUENCE ||
-+		(rem = end - cur, len > rem)) {
-+		BIO_printf(bio_err, "Unexpected LDAP response\n");
-+		goto end;
-+	}
-+
-+	rem = len;  /* ensure that we don't overstep the SEQUENCE */
-+
-+	/* pull MessageID */
-+	inf = ASN1_get_object(&cur, &len, &tag, &xclass, rem);
-+	if (inf != V_ASN1_UNIVERSAL || tag != V_ASN1_INTEGER ||
-+		(rem = end - cur, len > rem)) {
-+		BIO_printf(bio_err, "No MessageID\n");
-+		goto end;
-+	}
-+
-+	cur += len; /* shall we check for MessageId match or just skip? */
-+
-+	/* pull [APPLICATION 24] */
-+	rem = end - cur;
-+	inf = ASN1_get_object(&cur, &len, &tag, &xclass, rem);
-+	if (inf != V_ASN1_CONSTRUCTED || xclass != V_ASN1_APPLICATION ||
-+		tag != 24) {
-+		BIO_printf(bio_err, "Not ExtendedResponse\n");
-+		goto end;
-+	}
-+
-+	/* pull resultCode */
-+	rem = end - cur;
-+	inf = ASN1_get_object(&cur, &len, &tag, &xclass, rem);
-+	if (inf != V_ASN1_UNIVERSAL || tag != V_ASN1_ENUMERATED || len == 0 ||
-+		(rem = end - cur, len > rem)) {
-+		BIO_printf(bio_err, "Not LDAPResult\n");
-+		goto end;
-+	}
-+
-+	/* len should always be one, but just in case... */
-+	for (ret = 0, inf = 0; inf < len; inf++) {
-+		ret <<= 8;
-+		ret |= cur[inf];
-+	}
-+	/* There is more data, but we don't care... */
-+    end:
-+	return ret;
-+}
diff --git a/main/libretls/APKBUILD b/main/libretls/APKBUILD
new file mode 100644
index 00000000000..8a8d475f297
--- /dev/null
+++ b/main/libretls/APKBUILD
@@ -0,0 +1,64 @@
+# Contributor: TBK <alpine@jjtc.eu>
+# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
+pkgname=libretls
+pkgver=3.7.0
+pkgrel=2
+pkgdesc="port of libtls from libressl to openssl"
+arch="all"
+url="https://git.causal.agency/libretls/"
+license="ISC AND ( BSD-3-Clause OR MIT )"
+depends="ca-certificates-bundle"
+depends_dev="openssl-dev>3"
+base_deps="autoconf automake libtool"
+makedepends="$depends_dev $base_deps"
+makedepends_host="openssl-dev>3"
+makedepends_build="$base_deps"
+
+subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
+source="https://causal.agency/libretls/libretls-$pkgver.tar.gz
+	test_program.c"
+
+# secfixes:
+#   3.5.1-r0:
+#     - CVE-2022-0778
+
+prepare() {
+	default_prepare
+	update_config_sub
+
+	# Override the LIBTLS_VERSION to be 2:*:*, as libtls-standalone was 1:0:0.
+	# also make sure the LIBTLS version is different from upstream libressl
+	# so they can be installed in parallel
+	local _current _rev _age
+	IFS=: read _current _rev _age < LIBTLS_VERSION
+	printf "%d:%d:%d\n" $(( $_current - 18 )) $_rev $_age > LIBTLS_VERSION
+
+	autoreconf
+}
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr
+	make all
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+check() {
+	set -x
+
+	# shellcheck disable=SC2046
+	gcc -o test_program "$srcdir"/test_program.c -I"$builddir"/include -L"$builddir"/.libs -ltls $(pkgconf --cflags --libs openssl)
+	LD_LIBRARY_PATH="$builddir"/.libs ./test_program
+
+	set +x
+}
+
+sha512sums="
+18987d09ee804883e2c3cfae1209494b7020d976cc7137ba39540c18e0dc23d25034a46c6c64955201b425ca981e03cbe629f9ff979fd4a72d3dcfbd51efdf84  libretls-3.7.0.tar.gz
+71d36fe25c95a0a45497e3f699b01dddcaae9053dd1b1e2419df94272c47024cf6516c51c902129201061601b04a72551904b15a332a4cf53358983b5db73618  test_program.c
+"
diff --git a/main/libtls-standalone/test_program.c b/main/libretls/test_program.c
index f8d7332d725..f8d7332d725 100644
--- a/main/libtls-standalone/test_program.c
+++ b/main/libretls/test_program.c
diff --git a/main/librsync/APKBUILD b/main/librsync/APKBUILD
index 4b1e444d17f..c2c4958df75 100644
--- a/main/librsync/APKBUILD
+++ b/main/librsync/APKBUILD
@@ -1,38 +1,43 @@
 # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com>
 # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com>
 pkgname=librsync
-pkgver=2.2.1
+pkgver=2.3.4
 pkgrel=1
 pkgdesc="librsync implements the rolling-checksum algorithm of rsync"
 url="https://github.com/librsync/librsync"
 arch="all"
 license="LGPL-2.1-or-later"
-makedepends="cmake popt-dev bzip2-dev zlib-dev perl"
+makedepends="
+	bzip2-dev
+	cmake
+	perl
+	popt-dev
+	samurai
+	zlib-dev
+	"
 subpackages="$pkgname-dev $pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/librsync/librsync/archive/v$pkgver.tar.gz"
-
-prepare() {
-	default_prepare
-	# don't invoke bash in test scripts
-	sed -i 's,#! /bin/bash,#!/bin/sh,' tests/rdiff_bad_option.sh
-}
+source="$pkgname-$pkgver.tar.gz::https://github.com/librsync/librsync/archive/v$pkgver.tar.gz
+	"
 
 build() {
-	cmake -B build . \
+	CFLAGS="$CFLAGS -O2 -flto=auto" \
+	CXXFLAGS="$CXXFLAGS -O2 -flto=auto" \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=None \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DCMAKE_INSTALL_PREFIX=/usr
-	make -C build
+	cmake --build build
 }
 
 check() {
-	make -C build check
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest -j${JOBS:-2}
 }
 
 package() {
-	make -C build DESTDIR="$pkgdir" install
-	install -D -m644 doc/rdiff.1 "$pkgdir/usr/share/man/man1/rdiff.1"
-	install -D -m644 doc/librsync.3 "$pkgdir/usr/share/man/man3/librsync.3"
+	DESTDIR="$pkgdir" cmake --install build
 }
 
-sha512sums="6581a4285ebcfa1c4dfecac2d6796dab736a4c66a7fb82863c778506073446d9a113d39de7eb29e845a484646f1d8fec29019338bce31a091b0acdc461ab1bcd  librsync-2.2.1.tar.gz"
+sha512sums="
+ac01413b875e774db9fec3888210a4b9a5f3d32c081f1ed5f2cf9dc29cfae6ecedf6eac42062631e6dcf188853313fce4520430549768a0f68993419b07e58d9  librsync-2.3.4.tar.gz
+"
diff --git a/main/librtlsdr/APKBUILD b/main/librtlsdr/APKBUILD
new file mode 100644
index 00000000000..071b4e49453
--- /dev/null
+++ b/main/librtlsdr/APKBUILD
@@ -0,0 +1,49 @@
+# Contributor: Jared Szechy <jared.szechy@gmail.com>
+# Maintainer: omni <omni+alpine@hack.org>
+pkgname=librtlsdr
+_realpkgname=rtl-sdr
+pkgver=2.0.1
+pkgrel=1
+pkgdesc="Software defined radio receiver for Realtek RTL2832U"
+url="https://osmocom.org/projects/sdr/wiki/rtl-sdr"
+arch="all"
+license="GPL-2.0-or-later"
+options="!check" # no tests
+depends_dev="libusb-dev"
+makedepends="$depends_dev cmake samurai"
+subpackages="$pkgname-dev rtl-sdr:tools $pkgname-doc"
+source="$_realpkgname-$pkgver.tar.gz::https://gitea.osmocom.org/sdr/rtl-sdr/archive/v$pkgver.tar.gz
+	correct_udev_rules_path.patch
+	"
+builddir=$srcdir/$_realpkgname
+
+build() {
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
+		-DDETACH_KERNEL_DRIVER=ON \
+		-DINSTALL_UDEV_RULES=ON \
+		-Wno-dev
+	cmake --build build
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+	mkdir -p $pkgdir/usr/share/man1/
+	cp $builddir/debian/*1 $pkgdir/usr/share/man1/
+}
+
+tools() {
+	pkgdesc="Software defined radio receiver for Realtek RTL2832U (tools)"
+	amove usr/bin
+}
+
+doc() {
+	pkgdesc="Software defined radio receiver for Realtek RTL2832U (doc)"
+	amove usr/share/
+}
+
+sha512sums="
+ae481780ed6d084c8fa367c19c1d87007e4d4bf91f183e8e243924aa0369b386f7628f806af74f048978591549c7aeb40e6a5036840ddf52d7008f69edce9271  rtl-sdr-2.0.1.tar.gz
+8768be0e24cd5502f304363728caf65df10ae88806a2fffcde80acb4aa844d46b8433b5cb7cb5a658f7dece564e8c749f32a0a9636a49adb5e9d71530826b0f0  correct_udev_rules_path.patch
+"
diff --git a/main/librtlsdr/correct_udev_rules_path.patch b/main/librtlsdr/correct_udev_rules_path.patch
new file mode 100644
index 00000000000..10b477808bf
--- /dev/null
+++ b/main/librtlsdr/correct_udev_rules_path.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -111,7 +111,7 @@ option(INSTALL_UDEV_RULES "Install udev
+ if (INSTALL_UDEV_RULES)
+     install (
+         FILES rtl-sdr.rules
+-        DESTINATION "/etc/udev/rules.d"
++        DESTINATION "/usr/lib/udev/rules.d"
+         COMPONENT "udev"
+         )
+ else (INSTALL_UDEV_RULES)
diff --git a/main/libsamplerate/APKBUILD b/main/libsamplerate/APKBUILD
index 15c39e57bb4..2fb0f62a236 100644
--- a/main/libsamplerate/APKBUILD
+++ b/main/libsamplerate/APKBUILD
@@ -1,38 +1,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libsamplerate
-pkgver=0.1.9
-pkgrel=1
+pkgver=0.2.2
+pkgrel=3
 pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio"
 url="http://www.mega-nerd.com/SRC/index.html"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 arch="all"
-license="BSD-2-Clause-NetBSD"
-depends=""
+license="BSD-2-Clause"
 makedepends="fftw-dev libsndfile-dev linux-headers"
-source="http://www.mega-nerd.com/SRC/$pkgname-$pkgver.tar.gz"
-
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-}
+source="https://github.com/libsndfile/libsamplerate/releases/download/$pkgver/libsamplerate-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/usr \
+		--enable-static
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728  libsamplerate-0.1.9.tar.gz"
+sha512sums="
+d23ae54d23209ba22baae9e5fd178dd8e0e99205dada7e7c3a7b3a3d8cf816ed427a411bfeb008427f64da7767d645edce40811f238af11c8c386f5ef25a9f0c  libsamplerate-0.2.2.tar.xz
+"
diff --git a/main/libseccomp/APKBUILD b/main/libseccomp/APKBUILD
index 164fc0c2140..43b39a4549a 100644
--- a/main/libseccomp/APKBUILD
+++ b/main/libseccomp/APKBUILD
@@ -1,20 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Contributor: Dan Williams <dan@ma.ssive.co>
 pkgname=libseccomp
-pkgver=2.4.3
-pkgrel=0
-pkgdesc="An interface to the Linux Kernel's syscall filtering mechanism"
+pkgver=2.5.5
+pkgrel=1
+pkgdesc="interface to the Linux Kernel's syscall filtering mechanism"
 url="https://github.com/seccomp/libseccomp"
 arch="all"
 license="LGPL-2.1-or-later"
 depends_dev="linux-headers"
-makedepends="$depends_dev"
+makedepends="$depends_dev gperf cython python3 python3-dev py3-setuptools"
 checkdepends="bash"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc py3-$pkgname:py3"
 source="https://github.com/seccomp/libseccomp/releases/download/v$pkgver/libseccomp-$pkgver.tar.gz
 	remove-redefinition-prctl.patch
-	fix-performace-regression.patch
 	"
 
 case "$CARCH" in
@@ -33,6 +32,8 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
+		--enable-python \
+		--enable-static \
 		--localstatedir=/var
 	make
 }
@@ -44,6 +45,9 @@ check() {
 		ppc64le|s390x) rm -f tests/36-sim-ipc_syscalls.tests \
 			             tests/37-sim-ipc_syscalls_be.tests;;
 	esac
+	# fix python shebang
+	sed -i -e 's@cmd /usr/bin/env python @cmd /usr/bin/env python3 @' tests/regression
+	sed -i -e 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@' tests/*.py
 	make check
 }
 
@@ -51,6 +55,14 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="7b7af2e98493243ffe1934fefff5723b24ae9b9bdc4bf039343ee8456c15acb0ea34e81ec292a41143848272aeca794ef92ad38fc3f42c77465170cb540479ef  libseccomp-2.4.3.tar.gz
+py3() {
+	pkgdesc="Python 3 bindings for $pkgname"
+	depends="$depends $pkgname python3"
+
+	amove usr/lib/python3*
+}
+
+sha512sums="
+f630e7a7e53a21b7ccb4d3e7b37616b89aeceba916677c8e3032830411d77a14c2d74dcf594cd193b1acc11f52595072e28316dc44300e54083d5d7b314a38da  libseccomp-2.5.5.tar.gz
 f2c31dcafdc9a1ad78e32e76b75e1c1603071eaa3f979e1f2483b879a34ad07e0a4ef3642196a695415cdf81e1ed2bf325175872fb4e203ef9d0e668c287493f  remove-redefinition-prctl.patch
-c9dd939552089b006e03b94a323c9932806b0681b493b3365c291273cff4485b1066a73919a85dff238fc10e33cd4f67c99645049b0696ba0d6f229aac8d8b81  fix-performace-regression.patch"
+"
diff --git a/main/libseccomp/fix-performace-regression.patch b/main/libseccomp/fix-performace-regression.patch
deleted file mode 100644
index 88ba597cc6b..00000000000
--- a/main/libseccomp/fix-performace-regression.patch
+++ /dev/null
@@ -1,361 +0,0 @@
-From 21b98d85e8bfdb701a5f9afd54ff5175af910a45 Mon Sep 17 00:00:00 2001
-From: Paul Moore <paul@paul-moore.com>
-Date: Fri, 1 Nov 2019 12:05:58 -0400
-Subject: [PATCH] db: consolidate some of the code which adds rules to a single
- filter
-
-Pay back some of the technical debt in db_col_rule_add(), no logic
-changes in this patch, just removing some code duplication.
-
-Acked-by: Tom Hromatka <tom.hromatka@oracle.com>
-Signed-off-by: Paul Moore <paul@paul-moore.com>
----
- src/db.c | 85 +++++++++++++++++++++++++++++---------------------------
- 1 file changed, 44 insertions(+), 41 deletions(-)
-
-diff --git a/src/db.c b/src/db.c
-index 03e1ba3..6a30c64 100644
---- a/src/db.c
-+++ b/src/db.c
-@@ -2179,6 +2179,44 @@ int db_col_syscall_priority(struct db_filter_col *col,
- 	return rc;
- }
- 
-+/**
-+ * Add a new rule to a single filter
-+ * @param filter the filter
-+ * @param rule the filter rule
-+ *
-+ * This is a helper function for db_col_rule_add() and similar functions, it
-+ * isn't generally useful.  Returns zero on success, negative values on error.
-+ *
-+ */
-+static int _db_col_rule_add(struct db_filter *filter,
-+			    struct db_api_rule_list *rule)
-+{
-+	int rc;
-+	struct db_api_rule_list *iter;
-+
-+	/* add the rule to the filter */
-+	rc = arch_filter_rule_add(filter, rule);
-+	if (rc != 0)
-+		return rc;
-+
-+	/* insert the chain to the end of the rule list */
-+	iter = rule;
-+	while (iter->next)
-+		iter = iter->next;
-+	if (filter->rules != NULL) {
-+		rule->prev = filter->rules->prev;
-+		iter->next = filter->rules;
-+		filter->rules->prev->next = rule;
-+		filter->rules->prev = iter;
-+	} else {
-+		rule->prev = iter;
-+		iter->next = rule;
-+		filter->rules = rule;
-+	}
-+
-+	return 0;
-+}
-+
- /**
-  * Add a new rule to the current filter
-  * @param col the filter collection
-@@ -2207,7 +2245,7 @@ int db_col_rule_add(struct db_filter_col *col,
- 	size_t chain_size;
- 	struct db_api_arg *chain = NULL;
- 	struct scmp_arg_cmp arg_data;
--	struct db_api_rule_list *rule, *rule_tmp;
-+	struct db_api_rule_list *rule;
- 	struct db_filter *db;
- 
- 	/* collect the arguments for the filter rule */
-@@ -2255,9 +2293,6 @@ int db_col_rule_add(struct db_filter_col *col,
- 
- 	/* add the rule to the different filters in the collection */
- 	for (iter = 0; iter < col->filter_cnt; iter++) {
--
--		/* TODO: consolidate with db_col_transaction_start() */
--
- 		db = col->filters[iter];
- 
- 		/* create the rule */
-@@ -2268,24 +2303,10 @@ int db_col_rule_add(struct db_filter_col *col,
- 		}
- 
- 		/* add the rule */
--		rc_tmp = arch_filter_rule_add(db, rule);
--		if (rc_tmp == 0) {
--			/* insert the chain to the end of the rule list */
--			rule_tmp = rule;
--			while (rule_tmp->next)
--				rule_tmp = rule_tmp->next;
--			if (db->rules != NULL) {
--				rule->prev = db->rules->prev;
--				rule_tmp->next = db->rules;
--				db->rules->prev->next = rule;
--				db->rules->prev = rule_tmp;
--			} else {
--				rule->prev = rule_tmp;
--				rule_tmp->next = rule;
--				db->rules = rule;
--			}
--		} else
-+		rc_tmp = _db_col_rule_add(db, rule);
-+		if (rc_tmp != 0)
- 			free(rule);
-+
- add_arch_fail:
- 		if (rc_tmp != 0 && rc == 0)
- 			rc = rc_tmp;
-@@ -2320,7 +2341,7 @@ int db_col_transaction_start(struct db_filter_col *col)
- 	unsigned int iter;
- 	struct db_filter_snap *snap;
- 	struct db_filter *filter_o, *filter_s;
--	struct db_api_rule_list *rule_o, *rule_s = NULL, *rule_tmp;
-+	struct db_api_rule_list *rule_o, *rule_s = NULL;
- 
- 	/* allocate the snapshot */
- 	snap = zmalloc(sizeof(*snap));
-@@ -2350,33 +2371,15 @@ int db_col_transaction_start(struct db_filter_col *col)
- 		if (rule_o == NULL)
- 			continue;
- 		do {
--
--			/* TODO: consolidate with db_col_rule_add() */
--
- 			/* duplicate the rule */
- 			rule_s = db_rule_dup(rule_o);
- 			if (rule_s == NULL)
- 				goto trans_start_failure;
- 
- 			/* add the rule */
--			rc = arch_filter_rule_add(filter_s, rule_s);
-+			rc = _db_col_rule_add(filter_s, rule_s);
- 			if (rc != 0)
- 				goto trans_start_failure;
--
--			/* insert the chain to the end of the rule list */
--			rule_tmp = rule_s;
--			while (rule_tmp->next)
--				rule_tmp = rule_tmp->next;
--			if (filter_s->rules != NULL) {
--				rule_s->prev = filter_s->rules->prev;
--				rule_tmp->next = filter_s->rules;
--				filter_s->rules->prev->next = rule_s;
--				filter_s->rules->prev = rule_tmp;
--			} else {
--				rule_s->prev = rule_tmp;
--				rule_tmp->next = rule_s;
--				filter_s->rules = rule_s;
--			}
- 			rule_s = NULL;
- 
- 			/* next rule */
-From 19af04da86e9a4168a443f3563fc7aec8839edf0 Mon Sep 17 00:00:00 2001
-From: Paul Moore <paul@paul-moore.com>
-Date: Mon, 4 Nov 2019 20:15:20 -0500
-Subject: [PATCH] db: add shadow transactions
-
-Creating a transaction can be very time consuming on large filters since we
-create a duplicate filter tree iteratively using the rules supplied by the
-caller.  In an effort to speed this up we introduce the idea of shadow
-transactions where on a successful transaction commit we preserve the old
-transaction checkpoint and bring it up to date with the current filter and
-save it for future use.  The next time we start a new transaction we check
-to see if a shadow transaction exists, if it does we use that instead of
-creating a new transaction checkpoint from scratch.
-
-Acked-by: Tom Hromatka <tom.hromatka@oracle.com>
-Signed-off-by: Paul Moore <paul@paul-moore.com>
----
- src/db.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
- src/db.h |   1 +
- 2 files changed, 127 insertions(+), 1 deletion(-)
-
-diff --git a/src/db.c b/src/db.c
-index 6a30c64..a40cb2b 100644
---- a/src/db.c
-+++ b/src/db.c
-@@ -909,6 +909,9 @@ static void _db_snap_release(struct db_filter_snap *snap)
- {
- 	unsigned int iter;
- 
-+	if (snap == NULL)
-+		return;
-+
- 	if (snap->filter_cnt > 0) {
- 		for (iter = 0; iter < snap->filter_cnt; iter++) {
- 			if (snap->filters[iter])
-@@ -1134,6 +1137,7 @@ struct db_filter_col *db_col_init(uint32_t def_action)
- void db_col_release(struct db_filter_col *col)
- {
- 	unsigned int iter;
-+	struct db_filter_snap *snap;
- 
- 	if (col == NULL)
- 		return;
-@@ -1141,6 +1145,13 @@ void db_col_release(struct db_filter_col *col)
- 	/* set the state, just in case */
- 	col->state = _DB_STA_FREED;
- 
-+	/* free any snapshots */
-+	while (col->snapshots != NULL) {
-+		snap = col->snapshots;
-+		col->snapshots = snap->next;
-+		_db_snap_release(snap);
-+	}
-+
- 	/* free any filters */
- 	for (iter = 0; iter < col->filter_cnt; iter++)
- 		_db_release(col->filters[iter]);
-@@ -2343,6 +2354,20 @@ int db_col_transaction_start(struct db_filter_col *col)
- 	struct db_filter *filter_o, *filter_s;
- 	struct db_api_rule_list *rule_o, *rule_s = NULL;
- 
-+	/* check to see if a shadow snapshot exists */
-+	if (col->snapshots && col->snapshots->shadow) {
-+		/* we have a shadow!  this will be easy */
-+
-+		/* NOTE: we don't bother to do any verification of the shadow
-+		 *       because we start a new transaction every time we add
-+		 *       a new rule to the filter(s); if this ever changes we
-+		 *       will need to add a mechanism to verify that the shadow
-+		 *       transaction is current/correct */
-+
-+		col->snapshots->shadow = false;
-+		return 0;
-+	}
-+
- 	/* allocate the snapshot */
- 	snap = zmalloc(sizeof(*snap));
- 	if (snap == NULL)
-@@ -2436,14 +2461,114 @@ void db_col_transaction_abort(struct db_filter_col *col)
-  * Commit the top most seccomp filter transaction
-  * @param col the filter collection
-  *
-- * This function commits the most recent seccomp filter transaction.
-+ * This function commits the most recent seccomp filter transaction and
-+ * attempts to create a shadow transaction that is a duplicate of the current
-+ * filter to speed up future transactions.
-  *
-  */
- void db_col_transaction_commit(struct db_filter_col *col)
- {
-+	int rc;
-+	unsigned int iter;
- 	struct db_filter_snap *snap;
-+	struct db_filter *filter_o, *filter_s;
-+	struct db_api_rule_list *rule_o, *rule_s;
- 
- 	snap = col->snapshots;
-+	if (snap == NULL)
-+		return;
-+
-+	/* check for a shadow set by a higher transaction commit */
-+	if (snap->shadow) {
-+		/* leave the shadow intact, but drop the next snapshot */
-+		if (snap->next) {
-+			snap->next = snap->next->next;
-+			_db_snap_release(snap->next);
-+		}
-+		return;
-+	}
-+
-+	/* adjust the number of filters if needed */
-+	if (col->filter_cnt > snap->filter_cnt) {
-+		unsigned int tmp_i;
-+		struct db_filter **tmp_f;
-+
-+		/* add filters */
-+		tmp_f = realloc(snap->filters,
-+				sizeof(struct db_filter *) * col->filter_cnt);
-+		if (tmp_f == NULL)
-+			goto shadow_err;
-+		snap->filters = tmp_f;
-+		do {
-+			tmp_i = snap->filter_cnt;
-+			snap->filters[tmp_i] =
-+				_db_init(col->filters[tmp_i]->arch);
-+			if (snap->filters[tmp_i] == NULL)
-+				goto shadow_err;
-+			snap->filter_cnt++;
-+		} while (snap->filter_cnt < col->filter_cnt);
-+	} else if (col->filter_cnt < snap->filter_cnt) {
-+		/* remove filters */
-+
-+		/* NOTE: while we release the filters we no longer need, we
-+		 *       don't bother to resize the filter array, we just
-+		 *       adjust the filter counter, this *should* be harmless
-+		 *       at the cost of a not reaping all the memory possible */
-+
-+		do {
-+			_db_release(snap->filters[snap->filter_cnt--]);
-+		} while (snap->filter_cnt > col->filter_cnt);
-+	}
-+
-+	/* loop through each filter and update the rules on the snapshot */
-+	for (iter = 0; iter < col->filter_cnt; iter++) {
-+		filter_o = col->filters[iter];
-+		filter_s = snap->filters[iter];
-+
-+		/* skip ahead to the new rule(s) */
-+		rule_o = filter_o->rules;
-+		rule_s = filter_s->rules;
-+		if (rule_o == NULL)
-+			/* nothing to shadow */
-+			continue;
-+		if (rule_s != NULL) {
-+			do {
-+				rule_o = rule_o->next;
-+				rule_s = rule_s->next;
-+			} while (rule_s != filter_s->rules);
-+
-+			/* did we actually add any rules? */
-+			if (rule_o == filter_o->rules)
-+				/* no, we are done in this case */
-+				continue;
-+		}
-+
-+		/* update the old snapshot to make it a shadow */
-+		do {
-+			/* duplicate the rule */
-+			rule_s = db_rule_dup(rule_o);
-+			if (rule_s == NULL)
-+				goto shadow_err;
-+
-+			/* add the rule */
-+			rc = _db_col_rule_add(filter_s, rule_s);
-+			if (rc != 0) {
-+				free(rule_s);
-+				goto shadow_err;
-+			}
-+
-+			/* next rule */
-+			rule_o = rule_o->next;
-+		} while (rule_o != filter_o->rules);
-+	}
-+
-+	/* success, mark the snapshot as a shadow and return */
-+	snap->shadow = true;
-+	return;
-+
-+shadow_err:
-+	/* we failed making a shadow, cleanup and return */
- 	col->snapshots = snap->next;
- 	_db_snap_release(snap);
-+	return;
- }
-diff --git a/src/db.h b/src/db.h
-index c181038..9dce65a 100644
---- a/src/db.h
-+++ b/src/db.h
-@@ -135,6 +135,7 @@ struct db_filter_snap {
- 	/* individual filters */
- 	struct db_filter **filters;
- 	unsigned int filter_cnt;
-+	bool shadow;
- 
- 	struct db_filter_snap *next;
- };
diff --git a/main/libsecret/APKBUILD b/main/libsecret/APKBUILD
index 0463c7ea079..4d5902fa2e8 100644
--- a/main/libsecret/APKBUILD
+++ b/main/libsecret/APKBUILD
@@ -1,39 +1,35 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libsecret
-pkgver=0.20.2
+pkgver=0.21.4
 pkgrel=0
 pkgdesc="Library for storing and retrieving passwords and other secrets"
 url="https://wiki.gnome.org/Projects/Libsecret"
 arch="all"
-license="LGPL-2.0-or-later"
-makedepends="glib-dev intltool libxslt-dev docbook-xsl libgcrypt-dev
+license="LGPL-2.1-or-later"
+makedepends="glib-dev libxslt-dev docbook-xsl libgcrypt-dev
 	gobject-introspection-dev vala meson"
 checkdepends="py3-dbus py3-gobject3 xvfb-run dbus-x11"
 options="!check" # gjs is in community now
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.gnome.org/sources/libsecret/${pkgver%.*}/libsecret-$pkgver.tar.xz"
+source="https://gitlab.gnome.org/GNOME/libsecret/-/archive/$pkgver/libsecret-$pkgver.tar.bz2"
 
 build() {
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
+	abuild-meson \
 		--default-library=both \
-		--buildtype=plain \
 		-Dgtk_doc=false \
 		output
-	ninja -C output
+	meson compile -C output
 }
 
 check() {
-	xvfb-run ninja -C output test
+	xvfb-run meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C output install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-
-sha512sums="89143c8ccc8f6fa0cda2c98baef92e8cbf9b319a984826a09c527125e14712023ee65cada42a2c9232524528da8c1c3d2235ecbcb93e2f06e94121a601c22857  libsecret-0.20.2.tar.xz"
+sha512sums="
+6618e0096ae2e500071f997957085080e2c0c8c8e6ed7927f13a6ee51c70b91b61b46706982be2e2254e6af3f803461aaf5c02a62651b6a5eb8d93014d3dc0ad  libsecret-0.21.4.tar.bz2
+"
diff --git a/main/libshout/APKBUILD b/main/libshout/APKBUILD
index dea1dd0bcbd..733684f00fc 100644
--- a/main/libshout/APKBUILD
+++ b/main/libshout/APKBUILD
@@ -1,18 +1,22 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=libshout
-pkgver=2.4.3
-pkgrel=1
+pkgver=2.4.6
+pkgrel=3
 pkgdesc="Library for accessing a shoutcast/icecast server"
 url="https://icecast.org/"
 arch="all"
 license="GPL-2.0-only"
-makedepends="speex-dev libtheora-dev libvorbis-dev openssl-dev"
+makedepends="speex-dev libtheora-dev libvorbis-dev openssl-dev>3"
 subpackages="$pkgname-static $pkgname-doc $pkgname-dev"
-source="http://downloads.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
+source="https://downloads.xiph.org/releases/libshout/libshout-$pkgver.tar.gz"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,13 +28,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="fe36778c6640e620f27504cb21234940e18a65a33f9178bf7e77d4baf854a9affc82d85db8ed8c1c8e2d80399685d8be10106fff5be1ddf76e03e2ffeeed1d34  libshout-2.4.3.tar.gz"
+sha512sums="
+e8478cdbf9a27674c16a7b620d1576f2e31a47262b8e29b314d0f46d4e5be24b9a29790b7b226f48939bc34cacf5734fae0aa5686c7ed5879cdbd827ff8e0339  libshout-2.4.6.tar.gz
+"
diff --git a/main/libsm/APKBUILD b/main/libsm/APKBUILD
index 35f9eebfd46..0a2b6e65574 100644
--- a/main/libsm/APKBUILD
+++ b/main/libsm/APKBUILD
@@ -1,21 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libsm
-pkgver=1.2.3
-pkgrel=0
+pkgver=1.2.4
+pkgrel=4
 pkgdesc="X11 Session Management library"
 url="https://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
-depends=
 subpackages="$pkgname-dev $pkgname-doc"
 makedepends="libice-dev xorgproto xtrans util-linux-dev util-macros xmlto"
 checkdepends="check-dev"
-source="https://www.x.org/releases/individual/lib/libSM-$pkgver.tar.bz2"
-
+source="https://www.x.org/releases/individual/lib/libSM-$pkgver.tar.xz"
 builddir="$srcdir"/libSM-$pkgver
 
-build () {
-	cd "$builddir"
+build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,14 +26,13 @@ build () {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903  libSM-1.2.3.tar.bz2"
+sha512sums="
+7f1d41b7b6c5dd456c49ccad7740c3ba9791a2793fa50fd94814a4164ce2e20c4a0a0ad42a87708e494ed5c23f611be6d3ccd9ef1e9add6d46ac545e2b0f6f86  libSM-1.2.4.tar.xz
+"
diff --git a/main/libsndfile/APKBUILD b/main/libsndfile/APKBUILD
index 481d8a140c1..a3d4cd3a621 100644
--- a/main/libsndfile/APKBUILD
+++ b/main/libsndfile/APKBUILD
@@ -1,33 +1,40 @@
 # Contributor: Sergei Lukin <sergej.lukin@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libsndfile
-pkgver=1.0.28
-pkgrel=8
-pkgdesc="A C library for reading and writing files containing sampled sound"
-url="http://www.mega-nerd.com/libsndfile"
+pkgver=1.2.2
+pkgrel=0
+pkgdesc="C library for reading and writing files containing sampled sound"
+url="https://libsndfile.github.io/libsndfile/"
 arch="all"
-license="LGPL-2.0-or-later"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-depends_dev="flac-dev libvorbis-dev libogg-dev"
-makedepends="linux-headers alsa-lib-dev $depends_dev"
-source="http://www.mega-nerd.com/$pkgname/files/$pkgname-$pkgver.tar.gz
-	CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch
-	CVE-2017-8362.patch
-	CVE-2017-12562.patch
-	CVE-2018-13139.patch
-	CVE-2017-17456_CVE-2017-17457_CVE-2018-19661_CVE-2018-19662.patch
-	CVE-2018-19758.patch
-	fix-rf64-varargs-bug.patch
+license="LGPL-2.1-or-later"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
+depends_dev="opus-dev"
+makedepends="
+	$depends_dev
+	alsa-lib-dev
+	cmake
+	flac-dev
+	libogg-dev
+	libvorbis-dev
+	linux-headers
+	python3
+	samurai
 	"
-# sporadic testsuite failures on armhf
-case $CARCH in arm*) options="!check";; esac
+source="https://github.com/libsndfile/libsndfile/releases/download/$pkgver/libsndfile-$pkgver.tar.xz"
+
+# arm: sporadic testsuite failures
+# s390x: broken opus support but opus is required to make
+#        external libraries work at all (all libraries or none).
+#        See: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/12659)
+case $CARCH in
+arm*)   options="!check" ;; # sporadic testsuite failures
+s390x*) options="!check" ;; # broken opus support
+mips*)	options="!check" ;; # takes way too long
+esac
 
 # secfixes:
 #   1.0.28-r8:
-#     - CVE-2018-19758
 #     - CVE-2019-3832
-#   1.0.28-r7:
 #     - CVE-2018-19758
 #   1.0.28-r6:
 #     - CVE-2017-17456
@@ -49,31 +56,32 @@ case $CARCH in arm*) options="!check";; esac
 #     - CVE-2017-8365
 
 build() {
-	cd "$builddir"
-	ac_cv_sys_largefile_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--disable-sqlite \
-		--enable-largefile
-	make
+	CFLAGS="$CFLAGS -flto=auto" \
+	cmake -B build-shared -G Ninja \
+		-DBUILD_SHARED_LIBS=ON \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_TESTING=OFF
+	cmake --build build-shared
+
+	cmake -B build-static -G Ninja \
+		-DBUILD_SHARED_LIBS=OFF \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_TESTING="$(want_check && echo ON || echo OFF)"
+	cmake --build build-static
 }
 
 check() {
-	cd "$builddir"
-	make check
+	cd build-static
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build-static
+	DESTDIR="$pkgdir" cmake --install build-shared
 }
-sha512sums="890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f  libsndfile-1.0.28.tar.gz
-f98c40696fca3e7bca867df993de55bb4145c23428e65d1a669182eb2293046478ac727ae7f94bb77123ef0355c3c53be4f9d6a432665c90c74687d8d3afd9e3  CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch
-dfd4b5f1c7471fc416eed5c6040580a020543f145de9103751adaad6ce1c5c6a22abc1cf0ffd381aed3072644cd5ee03ba3598265aa7d202d63167da251cb595  CVE-2017-8362.patch
-814139567d90fb07908014e858c341fe933e04dca69b88ad66078910888237bbeba94f85d9e1489883c424f35fca312eb98c21ae2b122d9289bb6418725cd02e  CVE-2017-12562.patch
-33817e7c85180635fa239e4ea38973b18312878522639f43071188a995f0e1a35dbca6d133555fb0875292b4b609950ae38e747a6b1949f8ae840db9dc3a2805  CVE-2018-13139.patch
-ba3e5321713dbc118f45dac6f86049a15e6ba54fc788776eb267b1b165a0853bec278d8b066c71372cd243c852faa6781bef6a71d108e7cdbc64fb77fa3afc0a  CVE-2017-17456_CVE-2017-17457_CVE-2018-19661_CVE-2018-19662.patch
-ec90d652056166188ccc360d463d7b5549510aca7fcbbb439dd2d6086f759236ece6091c76d0c7074fb09e7b86df229c39ffdd8c8603b253c33d4d05c42615d2  CVE-2018-19758.patch
-0b7ce6bd6c1ec825521974c36b8c6eb5edd17d3c57d5ae3de287fb34a6be7108bc9511abb497538eef36e5883b84f4137fad6fe9a1d150345111de9f068838f9  fix-rf64-varargs-bug.patch"
+
+sha512sums="
+a6e3ea3ac5d91befaa99f6a31a3fac44e7b7c11f1de4698167317a461d5a19a2651d47486a920b34400f18367b4f6173bf0c1c9ba80eb682cece1b5beee352a0  libsndfile-1.2.2.tar.xz
+"
diff --git a/main/libsndfile/CVE-2017-12562.patch b/main/libsndfile/CVE-2017-12562.patch
deleted file mode 100644
index f195e87e43a..00000000000
--- a/main/libsndfile/CVE-2017-12562.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From cf7a8182c2642c50f1cf90dddea9ce96a8bad2e8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= <osmanx@problemloesungsmaschine.de>
-Date: Wed, 14 Jun 2017 12:25:40 +0200
-Subject: [PATCH] src/common.c: Fix heap buffer overflows when writing strings
- in binheader
-
-Fixes the following problems:
- 1. Case 's' only enlarges the buffer by 16 bytes instead of size bytes.
- 2. psf_binheader_writef() enlarges the header buffer (if needed) prior to the
-    big switch statement by an amount (16 bytes) which is enough for all cases
-    where only a single value gets added. Cases 's', 'S', 'p' however
-    additionally write an arbitrary length block of data and again enlarge the
-    buffer to the required amount. However, the required space calculation does
-    not take into account the size of the length field which gets output before
-    the data.
- 3. Buffer size requirement calculation in case 'S' does not account for the
-    padding byte ("size += (size & 1) ;" happens after the calculation which
-    uses "size").
- 4. Case 'S' can overrun the header buffer by 1 byte when no padding is
-    involved
-    ("memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + 1) ;" while
-    the buffer is only guaranteed to have "size" space available).
- 5. "psf->header.ptr [psf->header.indx] = 0 ;" in case 'S' always writes 1 byte
-    beyond the space which is guaranteed to be allocated in the header buffer.
- 6. Case 's' can overrun the provided source string by 1 byte if padding is
-    involved ("memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size) ;"
-    where "size" is "strlen (strptr) + 1" (which includes the 0 terminator,
-    plus optionally another 1 which is padding and not guaranteed to be
-    readable via the source string pointer).
-
-Closes: https://github.com/erikd/libsndfile/issues/292
----
- src/common.c | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/src/common.c b/src/common.c
-index 1a6204ca..6b2a2ee9 100644
---- a/src/common.c
-+++ b/src/common.c
-@@ -681,16 +681,16 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...)
- 					/* Write a C string (guaranteed to have a zero terminator). */
- 					strptr = va_arg (argptr, char *) ;
- 					size = strlen (strptr) + 1 ;
--					size += (size & 1) ;
- 
--					if (psf->header.indx + (sf_count_t) size >= psf->header.len && psf_bump_header_allocation (psf, 16))
-+					if (psf->header.indx + 4 + (sf_count_t) size + (sf_count_t) (size & 1) > psf->header.len && psf_bump_header_allocation (psf, 4 + size + (size & 1)))
- 						return count ;
- 
- 					if (psf->rwf_endian == SF_ENDIAN_BIG)
--						header_put_be_int (psf, size) ;
-+						header_put_be_int (psf, size + (size & 1)) ;
- 					else
--						header_put_le_int (psf, size) ;
-+						header_put_le_int (psf, size + (size & 1)) ;
- 					memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size) ;
-+					size += (size & 1) ;
- 					psf->header.indx += size ;
- 					psf->header.ptr [psf->header.indx - 1] = 0 ;
- 					count += 4 + size ;
-@@ -703,16 +703,15 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...)
- 					*/
- 					strptr = va_arg (argptr, char *) ;
- 					size = strlen (strptr) ;
--					if (psf->header.indx + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, size))
-+					if (psf->header.indx + 4 + (sf_count_t) size + (sf_count_t) (size & 1) > psf->header.len && psf_bump_header_allocation (psf, 4 + size + (size & 1)))
- 						return count ;
- 					if (psf->rwf_endian == SF_ENDIAN_BIG)
- 						header_put_be_int (psf, size) ;
- 					else
- 						header_put_le_int (psf, size) ;
--					memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + 1) ;
-+					memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + (size & 1)) ;
- 					size += (size & 1) ;
- 					psf->header.indx += size ;
--					psf->header.ptr [psf->header.indx] = 0 ;
- 					count += 4 + size ;
- 					break ;
- 
-@@ -724,7 +723,7 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...)
- 					size = (size & 1) ? size : size + 1 ;
- 					size = (size > 254) ? 254 : size ;
- 
--					if (psf->header.indx + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, size))
-+					if (psf->header.indx + 1 + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, 1 + size))
- 						return count ;
- 
- 					header_put_byte (psf, size) ;
diff --git a/main/libsndfile/CVE-2017-17456_CVE-2017-17457_CVE-2018-19661_CVE-2018-19662.patch b/main/libsndfile/CVE-2017-17456_CVE-2017-17457_CVE-2018-19661_CVE-2018-19662.patch
deleted file mode 100644
index 5b58114dbe5..00000000000
--- a/main/libsndfile/CVE-2017-17456_CVE-2017-17457_CVE-2018-19661_CVE-2018-19662.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-commit 8ddc442d539ca775d80cdbc7af17a718634a743f
-Author: Hugo Lefeuvre <hle@owl.eu.com>
-Date:   Mon Dec 24 06:43:48 2018 +0100
-
-    a/ulaw: fix multiple buffer overflows (#432)
-    
-    i2ulaw_array() and i2alaw_array() fail to handle ptr [count] = INT_MIN
-    properly, leading to buffer underflow. INT_MIN is a special value
-    since - INT_MIN cannot be represented as int.
-    
-    In this case round - INT_MIN to INT_MAX and proceed as usual.
-    
-    f2ulaw_array() and f2alaw_array() fail to handle ptr [count] = NaN
-    properly, leading to null pointer dereference.
-    
-    In this case, arbitrarily set the buffer value to 0.
-    
-    This commit fixes #429 (CVE-2018-19661 and CVE-2018-19662) and
-    fixes #344 (CVE-2017-17456 and CVE-2017-17457).
-
-diff --git a/src/alaw.c b/src/alaw.c
-index 063fd1a2..4220224c 100644
---- a/src/alaw.c
-+++ b/src/alaw.c
-@@ -19,6 +19,7 @@
- #include	"sfconfig.h"
- 
- #include	<math.h>
-+#include	<limits.h>
- 
- #include	"sndfile.h"
- #include	"common.h"
-@@ -326,7 +327,9 @@ s2alaw_array (const short *ptr, int count, unsigned char *buffer)
- static inline void
- i2alaw_array (const int *ptr, int count, unsigned char *buffer)
- {	while (--count >= 0)
--	{	if (ptr [count] >= 0)
-+	{	if (ptr [count] == INT_MIN)
-+			buffer [count] = alaw_encode [INT_MAX >> (16 + 4)] ;
-+		else if (ptr [count] >= 0)
- 			buffer [count] = alaw_encode [ptr [count] >> (16 + 4)] ;
- 		else
- 			buffer [count] = 0x7F & alaw_encode [- ptr [count] >> (16 + 4)] ;
-@@ -346,7 +349,9 @@ f2alaw_array (const float *ptr, int count, unsigned char *buffer, float normfact
- static inline void
- d2alaw_array (const double *ptr, int count, unsigned char *buffer, double normfact)
- {	while (--count >= 0)
--	{	if (ptr [count] >= 0)
-+	{	if (!isfinite (ptr [count]))
-+			buffer [count] = 0 ;
-+		else if (ptr [count] >= 0)
- 			buffer [count] = alaw_encode [lrint (normfact * ptr [count])] ;
- 		else
- 			buffer [count] = 0x7F & alaw_encode [- lrint (normfact * ptr [count])] ;
-diff --git a/src/ulaw.c b/src/ulaw.c
-index e50b4cb5..b6070ade 100644
---- a/src/ulaw.c
-+++ b/src/ulaw.c
-@@ -19,6 +19,7 @@
- #include	"sfconfig.h"
- 
- #include	<math.h>
-+#include	<limits.h>
- 
- #include	"sndfile.h"
- #include	"common.h"
-@@ -827,7 +828,9 @@ s2ulaw_array (const short *ptr, int count, unsigned char *buffer)
- static inline void
- i2ulaw_array (const int *ptr, int count, unsigned char *buffer)
- {	while (--count >= 0)
--	{	if (ptr [count] >= 0)
-+	{	if (ptr [count] == INT_MIN)
-+			buffer [count] = ulaw_encode [INT_MAX >> (16 + 2)] ;
-+		else if (ptr [count] >= 0)
- 			buffer [count] = ulaw_encode [ptr [count] >> (16 + 2)] ;
- 		else
- 			buffer [count] = 0x7F & ulaw_encode [-ptr [count] >> (16 + 2)] ;
-@@ -847,7 +850,9 @@ f2ulaw_array (const float *ptr, int count, unsigned char *buffer, float normfact
- static inline void
- d2ulaw_array (const double *ptr, int count, unsigned char *buffer, double normfact)
- {	while (--count >= 0)
--	{	if (ptr [count] >= 0)
-+	{	if (!isfinite (ptr [count]))
-+			buffer [count] = 0 ;
-+		else if (ptr [count] >= 0)
- 			buffer [count] = ulaw_encode [lrint (normfact * ptr [count])] ;
- 		else
- 			buffer [count] = 0x7F & ulaw_encode [- lrint (normfact * ptr [count])] ;
diff --git a/main/libsndfile/CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch b/main/libsndfile/CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch
deleted file mode 100644
index 1dc5b57f1d3..00000000000
--- a/main/libsndfile/CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From fd0484aba8e51d16af1e3a880f9b8b857b385eb3 Mon Sep 17 00:00:00 2001
-From: Erik de Castro Lopo <erikd@mega-nerd.com>
-Date: Wed, 12 Apr 2017 19:45:30 +1000
-Subject: [PATCH] FLAC: Fix a buffer read overrun
-
-Buffer read overrun occurs when reading a FLAC file that switches
-from 2 channels to one channel mid-stream. Only option is to
-abort the read.
-
-Closes: https://github.com/erikd/libsndfile/issues/230
----
- src/common.h  |  1 +
- src/flac.c    | 13 +++++++++++++
- src/sndfile.c |  1 +
- 3 files changed, 15 insertions(+)
-
-diff --git a/src/common.h b/src/common.h
-index 0bd810c3..e2669b6a 100644
---- a/src/common.h
-+++ b/src/common.h
-@@ -725,6 +725,7 @@ enum
- 	SFE_FLAC_INIT_DECODER,
- 	SFE_FLAC_LOST_SYNC,
- 	SFE_FLAC_BAD_SAMPLE_RATE,
-+	SFE_FLAC_CHANNEL_COUNT_CHANGED,
- 	SFE_FLAC_UNKOWN_ERROR,
- 
- 	SFE_WVE_NOT_WVE,
-diff --git a/src/flac.c b/src/flac.c
-index 84de0e26..986a7b8f 100644
---- a/src/flac.c
-+++ b/src/flac.c
-@@ -434,6 +434,19 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_
- 
- 	switch (metadata->type)
- 	{	case FLAC__METADATA_TYPE_STREAMINFO :
-+			if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels)
-+			{	psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n"
-+									"Nothing to be but to error out.\n" ,
-+									psf->sf.channels, metadata->data.stream_info.channels) ;
-+				psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ;
-+				return ;
-+				} ;
-+
-+			if (psf->sf.channels > 0 && psf->sf.samplerate != (int) metadata->data.stream_info.sample_rate)
-+			{	psf_log_printf (psf, "Warning: FLAC stream changed sample rates from %d to %d.\n"
-+									"Carrying on as if nothing happened.",
-+									psf->sf.samplerate, metadata->data.stream_info.sample_rate) ;
-+				} ;
- 			psf->sf.channels = metadata->data.stream_info.channels ;
- 			psf->sf.samplerate = metadata->data.stream_info.sample_rate ;
- 			psf->sf.frames = metadata->data.stream_info.total_samples ;
-diff --git a/src/sndfile.c b/src/sndfile.c
-index 41875610..e2a87be8 100644
---- a/src/sndfile.c
-+++ b/src/sndfile.c
-@@ -245,6 +245,7 @@ ErrorStruct SndfileErrors [] =
- 	{	SFE_FLAC_INIT_DECODER	, "Error : problem with initialization of the flac decoder." },
- 	{	SFE_FLAC_LOST_SYNC		, "Error : flac decoder lost sync." },
- 	{	SFE_FLAC_BAD_SAMPLE_RATE, "Error : flac does not support this sample rate." },
-+	{	SFE_FLAC_CHANNEL_COUNT_CHANGED, "Error : flac channel changed mid stream." },
- 	{	SFE_FLAC_UNKOWN_ERROR	, "Error : unknown error in flac decoder." },
- 
- 	{	SFE_WVE_NOT_WVE			, "Error : not a WVE file." },
diff --git a/main/libsndfile/CVE-2017-8362.patch b/main/libsndfile/CVE-2017-8362.patch
deleted file mode 100644
index 54fbfb44c3b..00000000000
--- a/main/libsndfile/CVE-2017-8362.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ef1dbb2df1c0e741486646de40bd638a9c4cd808 Mon Sep 17 00:00:00 2001
-From: Erik de Castro Lopo <erikd@mega-nerd.com>
-Date: Fri, 14 Apr 2017 15:19:16 +1000
-Subject: [PATCH] src/flac.c: Fix a buffer read overflow
-
-A file (generated by a fuzzer) which increased the number of channels
-from one frame to the next could cause a read beyond the end of the
-buffer provided by libFLAC. Only option is to abort the read.
-
-Closes: https://github.com/erikd/libsndfile/issues/231
----
- src/flac.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/flac.c b/src/flac.c
-index 5a4f8c21..e4f9aaa0 100644
---- a/src/flac.c
-+++ b/src/flac.c
-@@ -169,6 +169,14 @@ flac_buffer_copy (SF_PRIVATE *psf)
- 	const int32_t* const *buffer = pflac->wbuffer ;
- 	unsigned i = 0, j, offset, channels, len ;
- 
-+	if (psf->sf.channels != (int) frame->header.channels)
-+	{	psf_log_printf (psf, "Error: FLAC frame changed from %d to %d channels\n"
-+									"Nothing to do but to error out.\n" ,
-+									psf->sf.channels, frame->header.channels) ;
-+		psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ;
-+		return 0 ;
-+		} ;
-+
- 	/*
- 	**	frame->header.blocksize is variable and we're using a constant blocksize
- 	**	of FLAC__MAX_BLOCK_SIZE.
-@@ -202,7 +210,6 @@ flac_buffer_copy (SF_PRIVATE *psf)
- 		return 0 ;
- 		} ;
- 
--
- 	len = SF_MIN (pflac->len, frame->header.blocksize) ;
- 
- 	if (pflac->remain % channels != 0)
-@@ -436,7 +443,7 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_
- 	{	case FLAC__METADATA_TYPE_STREAMINFO :
- 			if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels)
- 			{	psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n"
--									"Nothing to be but to error out.\n" ,
-+									"Nothing to do but to error out.\n" ,
- 									psf->sf.channels, metadata->data.stream_info.channels) ;
- 				psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ;
- 				return ;
diff --git a/main/libsndfile/CVE-2018-13139.patch b/main/libsndfile/CVE-2018-13139.patch
deleted file mode 100644
index f75843267b0..00000000000
--- a/main/libsndfile/CVE-2018-13139.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From df18323c622b54221ee7ace74b177cdcccc152d7 Mon Sep 17 00:00:00 2001
-From: "Brett T. Warden" <brett.t.warden@intel.com>
-Date: Tue, 28 Aug 2018 12:01:17 -0700
-Subject: [PATCH] Check MAX_CHANNELS in sndfile-deinterleave
-
-Allocated buffer has space for only 16 channels. Verify that input file
-meets this limit.
-
-Fixes #397
----
- programs/sndfile-deinterleave.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/programs/sndfile-deinterleave.c b/programs/sndfile-deinterleave.c
-index 53660310..225b4d54 100644
---- a/programs/sndfile-deinterleave.c
-+++ b/programs/sndfile-deinterleave.c
-@@ -89,6 +89,13 @@ main (int argc, char **argv)
- 		exit (1) ;
- 		} ;
- 
-+	if (sfinfo.channels > MAX_CHANNELS)
-+	{	printf ("\nError : Input file '%s' has too many (%d) channels. Limit is %d.\n",
-+			argv [1], sfinfo.channels, MAX_CHANNELS) ;
-+		exit (1) ;
-+		} ;
-+
-+
- 	state.channels = sfinfo.channels ;
- 	sfinfo.channels = 1 ;
- 
diff --git a/main/libsndfile/CVE-2018-19758.patch b/main/libsndfile/CVE-2018-19758.patch
deleted file mode 100644
index 7b4e9477bb6..00000000000
--- a/main/libsndfile/CVE-2018-19758.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/wav.c.orig
-+++ b/src/wav.c
-@@ -1094,6 +1094,10 @@
- 		psf_binheader_writef (psf, "44", 0, 0) ; /* SMTPE format */
- 		psf_binheader_writef (psf, "44", psf->instrument->loop_count, 0) ;
- 
-+		/* Make sure we don't read past the loops array end. */
-+		if (psf->instrument->loop_count > ARRAY_LEN (psf->instrument->loops))
-+			psf->instrument->loop_count = ARRAY_LEN (psf->instrument->loops) ;
-+
- 		for (tmp = 0 ; tmp < psf->instrument->loop_count ; tmp++)
- 		{	int type ;
- 
diff --git a/main/libsndfile/fix-rf64-varargs-bug.patch b/main/libsndfile/fix-rf64-varargs-bug.patch
deleted file mode 100644
index 37c7c9c166b..00000000000
--- a/main/libsndfile/fix-rf64-varargs-bug.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 9d470ee5577d3ccedb1c28c7e0a7295ba17feaf5
-Author: Erik de Castro Lopo <erikd@mega-nerd.com>
-Date:   Sun Apr 16 17:54:17 2017 +1000
-
-    src/rf64.c: Fix varargs related bug
-    
-    C's <stargs.h> functionality isn't type checked so that passing an
-    `sf_count_t` (64 bits) by mistake in place of a `unit32_t` can cause
-    errors. This would be fine if it was an error on every architecture
-    and platform, but its not. This particular problem only manifested
-    on armhf and some other Arm architectures. It was not an issue on
-    32 bit x86.
-    
-    I have now fixed variants of this same bug several times.
-    
-    Closes: https://github.com/erikd/libsndfile/issues/229
-
-diff --git a/src/rf64.c b/src/rf64.c
-index b3d637fa..02dd9046 100644
---- a/src/rf64.c
-+++ b/src/rf64.c
-@@ -742,7 +742,7 @@ rf64_write_header (SF_PRIVATE *psf, int calc_length)
- 
- 	pad_size = psf->dataoffset - 16 - psf->header.indx ;
- 	if (pad_size >= 0)
--		psf_binheader_writef (psf, "m4z", PAD_MARKER, pad_size, make_size_t (pad_size)) ;
-+		psf_binheader_writef (psf, "m4z", PAD_MARKER, (unsigned int) pad_size, make_size_t (pad_size)) ;
- 
- 	if (wpriv->rf64_downgrade && (psf->filelength < RIFF_DOWNGRADE_BYTES))
- 		psf_binheader_writef (psf, "tm8", data_MARKER, psf->datalength) ;
diff --git a/main/libsodium/APKBUILD b/main/libsodium/APKBUILD
index 45d2bfaf7a4..b566bec53bd 100644
--- a/main/libsodium/APKBUILD
+++ b/main/libsodium/APKBUILD
@@ -2,14 +2,15 @@
 # Contributor: Stuart Cardall <developer@it-offshore.co.uk>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=libsodium
-pkgver=1.0.18
+pkgver=1.0.19
 pkgrel=0
 pkgdesc="P(ortable|ackageable) NaCl-based crypto library"
 url="https://github.com/jedisct1/libsodium"
 arch="all"
 license="ISC"
 subpackages="$pkgname-static $pkgname-dev"
-source="https://download.libsodium.org/$pkgname/releases/$pkgname-$pkgver.tar.gz"
+source="https://github.com/jedisct1/libsodium/releases/download/$pkgver-RELEASE/libsodium-$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-stable"
 
 build() {
 	./configure \
@@ -23,15 +24,10 @@ check() {
 	make check
 }
 
-static() {
-	pkgdesc="libsodium static libraries"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
-}
-
 package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="17e8638e46d8f6f7d024fe5559eccf2b8baf23e143fadd472a7d29d228b186d86686a5e6920385fe2020729119a5f12f989c3a782afbd05a8db4819bb18666ef  libsodium-1.0.18.tar.gz"
+sha512sums="
+8e9b6d796f6330e00921ce37f1b43545966094250938626ae227deef5fd1279f2fc18b5cd55e23484732a27df4d919cf0d2f07b9c2f1aa0c0ef689e668b0d439  libsodium-1.0.19.tar.gz
+"
diff --git a/main/libspf2/APKBUILD b/main/libspf2/APKBUILD
index 80843440bff..9c5e7122363 100644
--- a/main/libspf2/APKBUILD
+++ b/main/libspf2/APKBUILD
@@ -2,37 +2,46 @@
 # Contributor: Josef Fröhle <github@josef-froehle.de>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libspf2
-pkgver=1.2.10
-pkgrel=4
+pkgver=1.2.11
+_commit=8131fe140704eaae695e76b5cd09e39bd1dd220b
+pkgrel=3
 pkgdesc="Sender Policy Framework library, a part of the SPF/SRS protocol pair."
-url="https://wiki.gnome.org/Projects/Libsecret"
+url="https://www.libspf2.org/"
 arch="all"
 license="LGPL-2.1-or-later OR BSD-2-Clause"
 subpackages="$pkgname-dev $pkgname-tools"
 makedepends="autoconf automake libtool"
-source="http://www.libspf2.org/spf/$pkgname-$pkgver.tar.gz
+options="!check" # no test suite
+source="$pkgname-$pkgver.tar.gz::https://github.com/shevek/libspf2/archive/$_commit.tar.gz
+	CVE-2023-42118.patch
 	00001.patch
 	00002.patch
 	netdb_success.patch
 	musl-res_close.patch
-	fix-gcc-variadic-macros.patch
+	implicit.patch
 	"
+builddir="$srcdir/$pkgname-$_commit"
+
+# secfixes:
+#   1.2.11-r3:
+#     - CVE-2023-42118
+#   1.2.11-r0:
+#     - CVE-2021-33912
+#     - CVE-2021-33913
+#     - CVE-2021-33914
+#   1.2.10-r5:
+#     - CVE-2021-20314
 
 prepare() {
-	cd "$builddir"
+	default_prepare
 	update_config_sub
 	rm -r src/libreplace
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i ;;
-		esac
-	done
+
 	libtoolize --force && aclocal && automake --add-missing && autoconf \
 		&& autoheader
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -41,7 +50,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
@@ -53,9 +61,12 @@ tools() {
 	rm -fr "$pkgdir"/usr/bin
 }
 
-sha512sums="162ce382628c6fcadac3e11f5a12442db622bb23f7ec503e16f5ba7fc88afdd777bce6b093c12a58210355985fd11b74b140f08fab347334d82d953dd183b130  libspf2-1.2.10.tar.gz
+sha512sums="
+bbc8b053aa5dc960be7a31ee4d4385d9ed7f42a7c998a392626610de9a7dd9f95f16ad309990d0118f1eab3bed49189ed1be9c30d291c0ca54541677a968ceb3  libspf2-1.2.11.tar.gz
+9e17764f24de8147a27a41a5aeaf0554af6f434c04aa5ddea56fd4692f208c1c2576acd28ff06a2be6ff32945f5a441405b2ebb2f393c6a571e34723b023b1f5  CVE-2023-42118.patch
 3b9bff9b5a5b95f6722f86a43373b0c84cbb79a4509cf0c73486612c0a1b33587bb0b42966b0d2e3a317e4d7a730091fa444bd1258afd06bb3553c4a96d3ee34  00001.patch
 18ddfe106b652e2fb9e36a9f1743fc7cecf38530da65a06ac892b60d2c430aaad657f5653495950d4af4b9833826366b79e629937498e5ce7f6af716303221c4  00002.patch
 033dd1e959004f7a1026fb1de73813e934560101e04897297e468918ee28e4d7d0f271d6f05d984db22dd43e097f6aa133df18d11419b085d89db89b120750c9  netdb_success.patch
 4fb8a28a667d8fe54a48fa89230446b758c6d532866ee26e8b9ef3032f6e0993ec19a2cc2fb265d18d259e35de6fe66183763bbc69c424de70ad8fe0dbcf7a2f  musl-res_close.patch
-2face288cfb2cbcfced0f6d47f905b9efdccf696de780892c4e36b134bb4dbe77416b42f42f8ccb16da47551d800fe037899324dec33e140fb8cea0f201abd74  fix-gcc-variadic-macros.patch"
+1c17b099e8a3533c45881250a62c8bc52bd46572a7a36588ea9063dca09f7d431d870289abafe15ec5285354fb14301a4b6c866dd6ccd8da4488dd73cbdd7af2  implicit.patch
+"
diff --git a/main/libspf2/CVE-2023-42118.patch b/main/libspf2/CVE-2023-42118.patch
new file mode 100644
index 00000000000..e13f3646da1
--- /dev/null
+++ b/main/libspf2/CVE-2023-42118.patch
@@ -0,0 +1,26 @@
+From c93823faef044150e1b232928d225ff5ff297e6c Mon Sep 17 00:00:00 2001
+From: Simon Arlott <sa.me.uk>
+Date: Sat, 30 Sep 2023 12:18:51 +0100
+Subject: [PATCH] Fix integer underflow
+
+---
+ src/libspf2/spf_compile.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/libspf2/spf_compile.c b/src/libspf2/spf_compile.c
+index b08ffe2..d401028 100644
+--- a/src/libspf2/spf_compile.c
++++ b/src/libspf2/spf_compile.c
+@@ -455,7 +455,11 @@ SPF_c_parse_var(SPF_response_t *spf_response, SPF_data_var_t *data,
+ 			/* Magic numbers for x/Nc in gdb. */					\
+ 			data->ds.__unused0 = 0xba; data->ds.__unused1 = 0xbe;	\
+ 			dst = SPF_data_str( data );								\
+-			ds_avail = _avail - sizeof(SPF_data_t);					\
++			if ((_avail) < sizeof(SPF_data_t))						\
++				return SPF_response_add_error_ptr(spf_response,		\
++									SPF_E_BIG_STRING, NULL, src,	\
++								"Out of memory for string literal");\
++			ds_avail = (_avail) - sizeof(SPF_data_t);				\
+ 			ds_len = 0;												\
+ 		} while(0)
+ 
diff --git a/main/libspf2/fix-gcc-variadic-macros.patch b/main/libspf2/fix-gcc-variadic-macros.patch
deleted file mode 100644
index caac94a90fb..00000000000
--- a/main/libspf2/fix-gcc-variadic-macros.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/include/spf_log.h b/src/include/spf_log.h
-index 0d2adeb..4e22ef4 100644
---- a/src/include/spf_log.h
-+++ b/src/include/spf_log.h
-@@ -60,10 +60,10 @@ void SPF_debugv( const char *file, int line, const char *format, va_list ap ) __
-
- #if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L
-
--#define SPF_errorf(format, ... ) SPF_errorx( __FILE__, __LINE__, format, __VA_ARGS__ )
--#define SPF_warningf(format, ... ) SPF_warningx( __FILE__, __LINE__, format, __VA_ARGS__ )
--#define SPF_infof(format, ... ) SPF_infox( __FILE__, __LINE__, format, __VA_ARGS__ )
--#define SPF_debugf(format, ... ) SPF_debugx( __FILE__, __LINE__, format, __VA_ARGS__ )
-+#define SPF_errorf(format, ... ) SPF_errorx( __FILE__, __LINE__, format, ##__VA_ARGS__ )
-+#define SPF_warningf(format, ... ) SPF_warningx( __FILE__, __LINE__, format, ##__VA_ARGS__ )
-+#define SPF_infof(format, ... ) SPF_infox( __FILE__, __LINE__, format, ##__VA_ARGS__ )
-+#define SPF_debugf(format, ... ) SPF_debugx( __FILE__, __LINE__, format, ##__VA_ARGS__ )
-
- #elif defined( __GNUC__ )
diff --git a/main/libspf2/implicit.patch b/main/libspf2/implicit.patch
new file mode 100644
index 00000000000..cf51f29022f
--- /dev/null
+++ b/main/libspf2/implicit.patch
@@ -0,0 +1,13 @@
+diff --git a/src/libspf2/spf_utils.c b/src/libspf2/spf_utils.c
+index 54878fa..49188dc 100644
+--- a/src/libspf2/spf_utils.c
++++ b/src/libspf2/spf_utils.c
+@@ -25,6 +25,8 @@
+ #include <memory.h>
+ #endif
+ 
++#include <string.h>
++
+ 
+ 
+ #include "spf.h"
diff --git a/main/libsrtp/APKBUILD b/main/libsrtp/APKBUILD
index 2903d6d4ddd..d68369ab983 100644
--- a/main/libsrtp/APKBUILD
+++ b/main/libsrtp/APKBUILD
@@ -1,42 +1,35 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libsrtp
-pkgver=2.3.0
-pkgrel=0
-pkgdesc="An implementation of the Secure Real-time Transport Protocol (SRTP)"
-url="http://srtp.sourceforge.net"
+pkgver=2.5.0
+pkgrel=1
+pkgdesc="implementation of the Secure Real-time Transport Protocol (SRTP)"
+url="https://github.com/cisco/libsrtp"
 arch="all"
 license="BSD-3-Clause"
-makedepends="automake autoconf libtool"
-subpackages="$pkgname-static $pkgname-dev"
+makedepends="doxygen libpcap-dev meson openssl-dev"
+subpackages="$pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/cisco/libsrtp/archive/v$pkgver.tar.gz"
 
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var
-	make all shared_library
-}
+case "$CARCH" in
+	s390x) options="$options !check" ;;
+esac
 
-package() {
-	make DESTDIR="$pkgdir" install
+build() {
+	abuild-meson \
+		-Dcrypto-library=openssl \
+		builddir .
+	meson compile -C builddir
 }
 
 check() {
-	# Required for loading libsrtp2.so.1
-	LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$builddir" make runtest
+	meson test --no-rebuild --print-errorlogs -C builddir
 }
 
-static() {
-	depends=""
-	pkgdesc="$pkgdesc (static library)"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C builddir
 }
 
-sha512sums="34b1a01cb9a75aed175be09aadd2827224203b9801becc3fbc5214667cce79c3b87b0f59e4315583863ab5a2cc4fc81d56ab604a5e4c984518b8a8a2a7b77461  libsrtp-2.3.0.tar.gz"
+sha512sums="
+bd679ab65ccf22ca30fe867b9649a0b84cfa6fad6e22eb10f081141632f6dd56479a04d525b865f11fd46007303ca211065d9c170e4820d6ea7055403702340a  libsrtp-2.5.0.tar.gz
+"
diff --git a/main/libssh2/APKBUILD b/main/libssh2/APKBUILD
index eb10e6535ea..ac3f82698ab 100644
--- a/main/libssh2/APKBUILD
+++ b/main/libssh2/APKBUILD
@@ -1,36 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libssh2
-pkgver=1.9.0
-pkgrel=1
+pkgver=1.11.0
+pkgrel=2
 pkgdesc="library for accessing ssh1/ssh2 protocol servers"
 url="https://libssh2.org/"
 arch="all"
 license="BSD-3-Clause"
-makedepends="openssl-dev zlib-dev"
+makedepends_host="openssl-dev>3 zlib-dev"
+checkdepends="bash"
 subpackages="$pkgname-dbg $pkgname-static $pkgname-dev $pkgname-doc"
-source="http://www.libssh2.org/download/libssh2-$pkgver.tar.gz
-	CVE-2019-17498.patch
+source="https://www.libssh2.org/download/libssh2-$pkgver.tar.gz
+	add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch
 	"
 
-# security fixes:
+# secfixes:
+#   1.11.0-r1:
+#     - CVE-2023-48795
 #   1.9.0-r1:
 #     - CVE-2019-17498
 #   1.9.0-r0:
 #     - CVE-2019-13115
 #   1.8.1-r0:
-#     -  CVE-2019-3855
-#     -  CVE-2019-3856
-#     -  CVE-2019-3857
-#     -  CVE-2019-3858
-#     -  CVE-2019-3859
-#     -  CVE-2019-3860
-#     -  CVE-2019-3861
-#     -  CVE-2019-3862
-#     -  CVE-2019-3863
-
+#     - CVE-2019-3855
+#     - CVE-2019-3856
+#     - CVE-2019-3857
+#     - CVE-2019-3858
+#     - CVE-2019-3859
+#     - CVE-2019-3860
+#     - CVE-2019-3861
+#     - CVE-2019-3862
+#     - CVE-2019-3863
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -38,27 +39,24 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--localstatedir=/var
+		--localstatedir=/var \
+		--with-crypto=openssl \
+		--with-libssl-prefix=$CBUILDROOT/ \
+		--disable-docker-tests
 	make
 }
 
 check() {
-	cd "$builddir"
-	make check
+	# with --disable-docker-tests above only mansyntax.sh and test_simple are
+	# run, other tests require docker and a running sshd
+	make check VERBOSE=1
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-static() {
-	depends=""
-	pkgdesc="$pkgdesc (static library)"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
-}
-
-sha512sums="41a3ebcf84e32eab69b7411ffb0a3b6e6db71491c968602b17392cfe3490ef00239726ec28acb3d25bf0ed62700db7f4d0bb5a9175618f413865f40badca6e17  libssh2-1.9.0.tar.gz
-fedd840ec8459409c80ef3984f3539e09c0730fb1a7ccc8034e3e03618590a5c0589b7dff132c813b148be9f5b784d3cd50830c502d419af77ce86e848297813  CVE-2019-17498.patch"
+sha512sums="
+ef85e152dc252bd9b1c05276972b9c22313f5d492743dde090235742746d67f634f2a419eff9162132e2274c8582113b75279b074e0c7b34b2526b92fd1a1e8e  libssh2-1.11.0.tar.gz
+5a3fc886962032d4f0a244942c0db216bb108d57ac79f454ec05527e76a744689a5dc89d6d20b5abc2a0b75144d7c2eb95286f23190ecaf9bbb456fb14922125  add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch
+"
diff --git a/main/libssh2/CVE-2019-17498.patch b/main/libssh2/CVE-2019-17498.patch
deleted file mode 100644
index e858cca1862..00000000000
--- a/main/libssh2/CVE-2019-17498.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 1c6fa92b77e34d089493fe6d3e2c6c8775858b94 Mon Sep 17 00:00:00 2001
-From: Will Cosgrove <will@panic.com>
-Date: Thu, 29 Aug 2019 15:24:22 -0700
-Subject: [PATCH] fixed type issue, updated SSH_MSG_DISCONNECT
-
-SSH_MSG_DISCONNECT now also uses  _libssh2_get API.
----
- src/packet.c | 40 +++++++++++++++-------------------------
- 1 file changed, 15 insertions(+), 25 deletions(-)
-
-diff --git a/src/packet.c b/src/packet.c
-index 8908b2c5..97f0cdd4 100644
---- a/src/packet.c
-+++ b/src/packet.c
-@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
-                     size_t datalen, int macstate)
- {
-     int rc = 0;
--    char *message = NULL;
--    char *language = NULL;
-+    unsigned char *message = NULL;
-+    unsigned char *language = NULL;
-     size_t message_len = 0;
-     size_t language_len = 0;
-     LIBSSH2_CHANNEL *channelp = NULL;
-@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
- 
-         case SSH_MSG_DISCONNECT:
-             if(datalen >= 5) {
--                size_t reason = _libssh2_ntohu32(data + 1);
-+                uint32_t reason = 0;
-+                struct string_buf buf;
-+                buf.data = (unsigned char *)data;
-+                buf.dataptr = buf.data;
-+                buf.len = datalen;
-+                buf.dataptr++; /* advance past type */
- 
--                if(datalen >= 9) {
--                    message_len = _libssh2_ntohu32(data + 5);
-+                _libssh2_get_u32(&buf, &reason);
-+                _libssh2_get_string(&buf, &message, &message_len);
-+                _libssh2_get_string(&buf, &language, &language_len);
- 
--                    if(message_len < datalen-13) {
--                        /* 9 = packet_type(1) + reason(4) + message_len(4) */
--                        message = (char *) data + 9;
--
--                        language_len =
--                            _libssh2_ntohu32(data + 9 + message_len);
--                        language = (char *) data + 9 + message_len + 4;
--
--                        if(language_len > (datalen-13-message_len)) {
--                            /* bad input, clear info */
--                            language = message = NULL;
--                            language_len = message_len = 0;
--                        }
--                    }
--                    else
--                        /* bad size, clear it */
--                        message_len = 0;
--                }
-                 if(session->ssh_msg_disconnect) {
--                    LIBSSH2_DISCONNECT(session, reason, message,
--                                       message_len, language, language_len);
-+                    LIBSSH2_DISCONNECT(session, reason, (const char *)message,
-+                                       message_len, (const char *)language,
-+                                       language_len);
-                 }
-+
-                 _libssh2_debug(session, LIBSSH2_TRACE_TRANS,
-                                "Disconnect(%d): %s(%s)", reason,
-                                message, language);
diff --git a/main/libssh2/add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch b/main/libssh2/add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch
new file mode 100644
index 00000000000..a651422bcd4
--- /dev/null
+++ b/main/libssh2/add-strict-KEX-to-fix-CVE-2023-48795-Terrapin-Attack.patch
@@ -0,0 +1,436 @@
+diff --git a/src/kex.c b/src/kex.c
+index 8e7b7f0af3..a7b301e157 100644
+--- a/src/kex.c
++++ b/src/kex.c
+@@ -3032,6 +3032,13 @@ kex_method_extension_negotiation = {
+     0,
+ };
+ 
++static const LIBSSH2_KEX_METHOD
++kex_method_strict_client_extension = {
++    "kex-strict-c-v00@openssh.com",
++    NULL,
++    0,
++};
++
+ static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = {
+ #if LIBSSH2_ED25519
+     &kex_method_ssh_curve25519_sha256,
+@@ -3050,6 +3057,7 @@ static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = {
+     &kex_method_diffie_helman_group1_sha1,
+     &kex_method_diffie_helman_group_exchange_sha1,
+     &kex_method_extension_negotiation,
++    &kex_method_strict_client_extension,
+     NULL
+ };
+ 
+@@ -3302,13 +3310,13 @@ static int kexinit(LIBSSH2_SESSION * session)
+     return 0;
+ }
+ 
+-/* kex_agree_instr
++/* _libssh2_kex_agree_instr
+  * Kex specific variant of strstr()
+  * Needle must be preceded by BOL or ',', and followed by ',' or EOL
+  */
+-static unsigned char *
+-kex_agree_instr(unsigned char *haystack, size_t haystack_len,
+-                const unsigned char *needle, size_t needle_len)
++unsigned char *
++_libssh2_kex_agree_instr(unsigned char *haystack, size_t haystack_len,
++                         const unsigned char *needle, size_t needle_len)
+ {
+     unsigned char *s;
+     unsigned char *end_haystack;
+@@ -3393,7 +3401,7 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session,
+         while(s && *s) {
+             unsigned char *p = (unsigned char *) strchr((char *) s, ',');
+             size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s));
+-            if(kex_agree_instr(hostkey, hostkey_len, s, method_len)) {
++            if(_libssh2_kex_agree_instr(hostkey, hostkey_len, s, method_len)) {
+                 const LIBSSH2_HOSTKEY_METHOD *method =
+                     (const LIBSSH2_HOSTKEY_METHOD *)
+                     kex_get_method_by_name((char *) s, method_len,
+@@ -3427,9 +3435,9 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session,
+     }
+ 
+     while(hostkeyp && (*hostkeyp) && (*hostkeyp)->name) {
+-        s = kex_agree_instr(hostkey, hostkey_len,
+-                            (unsigned char *) (*hostkeyp)->name,
+-                            strlen((*hostkeyp)->name));
++        s = _libssh2_kex_agree_instr(hostkey, hostkey_len,
++                                     (unsigned char *) (*hostkeyp)->name,
++                                     strlen((*hostkeyp)->name));
+         if(s) {
+             /* So far so good, but does it suit our purposes? (Encrypting vs
+                Signing) */
+@@ -3463,6 +3471,12 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex,
+ {
+     const LIBSSH2_KEX_METHOD **kexp = libssh2_kex_methods;
+     unsigned char *s;
++    const unsigned char *strict =
++        (unsigned char *)"kex-strict-s-v00@openssh.com";
++
++    if(_libssh2_kex_agree_instr(kex, kex_len, strict, 28)) {
++        session->kex_strict = 1;
++    }
+ 
+     if(session->kex_prefs) {
+         s = (unsigned char *) session->kex_prefs;
+@@ -3470,7 +3484,7 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex,
+         while(s && *s) {
+             unsigned char *q, *p = (unsigned char *) strchr((char *) s, ',');
+             size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s));
+-            q = kex_agree_instr(kex, kex_len, s, method_len);
++            q = _libssh2_kex_agree_instr(kex, kex_len, s, method_len);
+             if(q) {
+                 const LIBSSH2_KEX_METHOD *method = (const LIBSSH2_KEX_METHOD *)
+                     kex_get_method_by_name((char *) s, method_len,
+@@ -3504,9 +3518,9 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex,
+     }
+ 
+     while(*kexp && (*kexp)->name) {
+-        s = kex_agree_instr(kex, kex_len,
+-                            (unsigned char *) (*kexp)->name,
+-                            strlen((*kexp)->name));
++        s = _libssh2_kex_agree_instr(kex, kex_len,
++                                     (unsigned char *) (*kexp)->name,
++                                     strlen((*kexp)->name));
+         if(s) {
+             /* We've agreed on a key exchange method,
+              * Can we agree on a hostkey that works with this kex?
+@@ -3550,7 +3564,7 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session,
+             unsigned char *p = (unsigned char *) strchr((char *) s, ',');
+             size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s));
+ 
+-            if(kex_agree_instr(crypt, crypt_len, s, method_len)) {
++            if(_libssh2_kex_agree_instr(crypt, crypt_len, s, method_len)) {
+                 const LIBSSH2_CRYPT_METHOD *method =
+                     (const LIBSSH2_CRYPT_METHOD *)
+                     kex_get_method_by_name((char *) s, method_len,
+@@ -3572,9 +3586,9 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session,
+     }
+ 
+     while(*cryptp && (*cryptp)->name) {
+-        s = kex_agree_instr(crypt, crypt_len,
+-                            (unsigned char *) (*cryptp)->name,
+-                            strlen((*cryptp)->name));
++        s = _libssh2_kex_agree_instr(crypt, crypt_len,
++                                     (unsigned char *) (*cryptp)->name,
++                                     strlen((*cryptp)->name));
+         if(s) {
+             endpoint->crypt = *cryptp;
+             return 0;
+@@ -3614,7 +3628,7 @@ static int kex_agree_mac(LIBSSH2_SESSION * session,
+             unsigned char *p = (unsigned char *) strchr((char *) s, ',');
+             size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s));
+ 
+-            if(kex_agree_instr(mac, mac_len, s, method_len)) {
++            if(_libssh2_kex_agree_instr(mac, mac_len, s, method_len)) {
+                 const LIBSSH2_MAC_METHOD *method = (const LIBSSH2_MAC_METHOD *)
+                     kex_get_method_by_name((char *) s, method_len,
+                                            (const LIBSSH2_COMMON_METHOD **)
+@@ -3635,8 +3649,9 @@ static int kex_agree_mac(LIBSSH2_SESSION * session,
+     }
+ 
+     while(*macp && (*macp)->name) {
+-        s = kex_agree_instr(mac, mac_len, (unsigned char *) (*macp)->name,
+-                            strlen((*macp)->name));
++        s = _libssh2_kex_agree_instr(mac, mac_len,
++                                     (unsigned char *) (*macp)->name,
++                                     strlen((*macp)->name));
+         if(s) {
+             endpoint->mac = *macp;
+             return 0;
+@@ -3667,7 +3682,7 @@ static int kex_agree_comp(LIBSSH2_SESSION *session,
+             unsigned char *p = (unsigned char *) strchr((char *) s, ',');
+             size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s));
+ 
+-            if(kex_agree_instr(comp, comp_len, s, method_len)) {
++            if(_libssh2_kex_agree_instr(comp, comp_len, s, method_len)) {
+                 const LIBSSH2_COMP_METHOD *method =
+                     (const LIBSSH2_COMP_METHOD *)
+                     kex_get_method_by_name((char *) s, method_len,
+@@ -3689,8 +3704,9 @@ static int kex_agree_comp(LIBSSH2_SESSION *session,
+     }
+ 
+     while(*compp && (*compp)->name) {
+-        s = kex_agree_instr(comp, comp_len, (unsigned char *) (*compp)->name,
+-                            strlen((*compp)->name));
++        s = _libssh2_kex_agree_instr(comp, comp_len,
++                                     (unsigned char *) (*compp)->name,
++                                     strlen((*compp)->name));
+         if(s) {
+             endpoint->comp = *compp;
+             return 0;
+@@ -3871,6 +3887,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange,
+                 session->local.kexinit = key_state->oldlocal;
+                 session->local.kexinit_len = key_state->oldlocal_len;
+                 key_state->state = libssh2_NB_state_idle;
++                session->state &= ~LIBSSH2_STATE_INITIAL_KEX;
+                 session->state &= ~LIBSSH2_STATE_KEX_ACTIVE;
+                 session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS;
+                 return -1;
+@@ -3896,6 +3913,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange,
+                 session->local.kexinit = key_state->oldlocal;
+                 session->local.kexinit_len = key_state->oldlocal_len;
+                 key_state->state = libssh2_NB_state_idle;
++                session->state &= ~LIBSSH2_STATE_INITIAL_KEX;
+                 session->state &= ~LIBSSH2_STATE_KEX_ACTIVE;
+                 session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS;
+                 return -1;
+@@ -3944,6 +3962,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange,
+         session->remote.kexinit = NULL;
+     }
+ 
++    session->state &= ~LIBSSH2_STATE_INITIAL_KEX;
+     session->state &= ~LIBSSH2_STATE_KEX_ACTIVE;
+     session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS;
+ 
+diff --git a/src/libssh2_priv.h b/src/libssh2_priv.h
+index 7660366954..18d9ab2130 100644
+--- a/src/libssh2_priv.h
++++ b/src/libssh2_priv.h
+@@ -736,6 +736,9 @@ struct _LIBSSH2_SESSION
+     /* key signing algorithm preferences -- NULL yields server order */
+     char *sign_algo_prefs;
+ 
++    /* Whether to use the OpenSSH Strict KEX extension */
++    int kex_strict;
++
+     /* (remote as source of data -- packet_read ) */
+     libssh2_endpoint_data remote;
+ 
+@@ -908,6 +911,7 @@ struct _LIBSSH2_SESSION
+     int fullpacket_macstate;
+     size_t fullpacket_payload_len;
+     int fullpacket_packet_type;
++    uint32_t fullpacket_required_type;
+ 
+     /* State variables used in libssh2_sftp_init() */
+     libssh2_nonblocking_states sftpInit_state;
+@@ -948,10 +952,11 @@ struct _LIBSSH2_SESSION
+ };
+ 
+ /* session.state bits */
+-#define LIBSSH2_STATE_EXCHANGING_KEYS   0x00000001
+-#define LIBSSH2_STATE_NEWKEYS           0x00000002
+-#define LIBSSH2_STATE_AUTHENTICATED     0x00000004
+-#define LIBSSH2_STATE_KEX_ACTIVE        0x00000008
++#define LIBSSH2_STATE_INITIAL_KEX       0x00000001
++#define LIBSSH2_STATE_EXCHANGING_KEYS   0x00000002
++#define LIBSSH2_STATE_NEWKEYS           0x00000004
++#define LIBSSH2_STATE_AUTHENTICATED     0x00000008
++#define LIBSSH2_STATE_KEX_ACTIVE        0x00000010
+ 
+ /* session.flag helpers */
+ #ifdef MSG_NOSIGNAL
+@@ -1182,6 +1187,11 @@ ssize_t _libssh2_send(libssh2_socket_t socket, const void *buffer,
+ int _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange,
+                           key_exchange_state_t * state);
+ 
++unsigned char *_libssh2_kex_agree_instr(unsigned char *haystack,
++                                        size_t haystack_len,
++                                        const unsigned char *needle,
++                                        size_t needle_len);
++
+ /* Let crypt.c/hostkey.c expose their method structs */
+ const LIBSSH2_CRYPT_METHOD **libssh2_crypt_methods(void);
+ const LIBSSH2_HOSTKEY_METHOD **libssh2_hostkey_methods(void);
+diff --git a/src/packet.c b/src/packet.c
+index eccb8c56a8..6da14e9fa1 100644
+--- a/src/packet.c
++++ b/src/packet.c
+@@ -624,14 +624,13 @@ packet_authagent_open(LIBSSH2_SESSION * session,
+  * layer when it has received a packet.
+  *
+  * The input pointer 'data' is pointing to allocated data that this function
+- * is asked to deal with so on failure OR success, it must be freed fine.
+- * The only exception is when the return code is LIBSSH2_ERROR_EAGAIN.
++ * will be freed unless return the code is LIBSSH2_ERROR_EAGAIN.
+  *
+  * This function will always be called with 'datalen' greater than zero.
+  */
+ int
+ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
+-                    size_t datalen, int macstate)
++                    size_t datalen, int macstate, uint32_t seq)
+ {
+     int rc = 0;
+     unsigned char *message = NULL;
+@@ -676,6 +675,70 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
+         break;
+     }
+ 
++    if(session->state & LIBSSH2_STATE_INITIAL_KEX) {
++        if(msg == SSH_MSG_KEXINIT) {
++            if(!session->kex_strict) {
++                if(datalen < 17) {
++                    LIBSSH2_FREE(session, data);
++                    session->packAdd_state = libssh2_NB_state_idle;
++                    return _libssh2_error(session,
++                                          LIBSSH2_ERROR_BUFFER_TOO_SMALL,
++                                          "Data too short extracting kex");
++                }
++                else {
++                    const unsigned char *strict =
++                    (unsigned char *)"kex-strict-s-v00@openssh.com";
++                    struct string_buf buf;
++                    unsigned char *algs = NULL;
++                    size_t algs_len = 0;
++
++                    buf.data = (unsigned char *)data;
++                    buf.dataptr = buf.data;
++                    buf.len = datalen;
++                    buf.dataptr += 17; /* advance past type and cookie */
++
++                    if(_libssh2_get_string(&buf, &algs, &algs_len)) {
++                        LIBSSH2_FREE(session, data);
++                        session->packAdd_state = libssh2_NB_state_idle;
++                        return _libssh2_error(session,
++                                              LIBSSH2_ERROR_BUFFER_TOO_SMALL,
++                                              "Algs too short");
++                    }
++
++                    if(algs_len == 0 ||
++                       _libssh2_kex_agree_instr(algs, algs_len, strict, 28)) {
++                        session->kex_strict = 1;
++                    }
++                }
++            }
++
++            if(session->kex_strict && seq) {
++                LIBSSH2_FREE(session, data);
++                session->socket_state = LIBSSH2_SOCKET_DISCONNECTED;
++                session->packAdd_state = libssh2_NB_state_idle;
++                libssh2_session_disconnect(session, "strict KEX violation: "
++                                           "KEXINIT was not the first packet");
++
++                return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT,
++                                      "strict KEX violation: "
++                                      "KEXINIT was not the first packet");
++            }
++        }
++
++        if(session->kex_strict && session->fullpacket_required_type &&
++            session->fullpacket_required_type != msg) {
++            LIBSSH2_FREE(session, data);
++            session->socket_state = LIBSSH2_SOCKET_DISCONNECTED;
++            session->packAdd_state = libssh2_NB_state_idle;
++            libssh2_session_disconnect(session, "strict KEX violation: "
++                                       "unexpected packet type");
++
++            return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT,
++                                  "strict KEX violation: "
++                                  "unexpected packet type");
++        }
++    }
++
+     if(session->packAdd_state == libssh2_NB_state_allocated) {
+         /* A couple exceptions to the packet adding rule: */
+         switch(msg) {
+@@ -1364,6 +1427,15 @@ _libssh2_packet_ask(LIBSSH2_SESSION * session, unsigned char packet_type,
+ 
+             return 0;
+         }
++        else if(session->kex_strict &&
++                (session->state & LIBSSH2_STATE_INITIAL_KEX)) {
++            libssh2_session_disconnect(session, "strict KEX violation: "
++                                       "unexpected packet type");
++
++            return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT,
++                                  "strict KEX violation: "
++                                  "unexpected packet type");
++        }
+         packet = _libssh2_list_next(&packet->node);
+     }
+     return -1;
+@@ -1425,7 +1497,10 @@ _libssh2_packet_require(LIBSSH2_SESSION * session, unsigned char packet_type,
+     }
+ 
+     while(session->socket_state == LIBSSH2_SOCKET_CONNECTED) {
+-        int ret = _libssh2_transport_read(session);
++        int ret;
++        session->fullpacket_required_type = packet_type;
++        ret = _libssh2_transport_read(session);
++        session->fullpacket_required_type = 0;
+         if(ret == LIBSSH2_ERROR_EAGAIN)
+             return ret;
+         else if(ret < 0) {
+diff --git a/src/packet.h b/src/packet.h
+index 1d90b8af12..955351e5f6 100644
+--- a/src/packet.h
++++ b/src/packet.h
+@@ -72,6 +72,6 @@ int _libssh2_packet_burn(LIBSSH2_SESSION * session,
+ int _libssh2_packet_write(LIBSSH2_SESSION * session, unsigned char *data,
+                           unsigned long data_len);
+ int _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
+-                        size_t datalen, int macstate);
++                        size_t datalen, int macstate, uint32_t seq);
+ 
+ #endif /* LIBSSH2_PACKET_H */
+diff --git a/src/session.c b/src/session.c
+index 35e7929fe7..9d89ade8ec 100644
+--- a/src/session.c
++++ b/src/session.c
+@@ -469,6 +469,8 @@ libssh2_session_init_ex(LIBSSH2_ALLOC_FUNC((*my_alloc)),
+         session->abstract = abstract;
+         session->api_timeout = 0; /* timeout-free API by default */
+         session->api_block_mode = 1; /* blocking API by default */
++        session->state = LIBSSH2_STATE_INITIAL_KEX;
++        session->fullpacket_required_type = 0;
+         session->packet_read_timeout = LIBSSH2_DEFAULT_READ_TIMEOUT;
+         session->flag.quote_paths = 1; /* default behavior is to quote paths
+                                           for the scp subsystem */
+@@ -1223,6 +1225,7 @@ libssh2_session_disconnect_ex(LIBSSH2_SESSION *session, int reason,
+                               const char *desc, const char *lang)
+ {
+     int rc;
++    session->state &= ~LIBSSH2_STATE_INITIAL_KEX;
+     session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS;
+     BLOCK_ADJUST(rc, session,
+                  session_disconnect(session, reason, desc, lang));
+diff --git a/src/transport.c b/src/transport.c
+index 21be9d2b80..a8bb588a4b 100644
+--- a/src/transport.c
++++ b/src/transport.c
+@@ -186,6 +186,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ )
+     struct transportpacket *p = &session->packet;
+     int rc;
+     int compressed;
++    uint32_t seq = session->remote.seqno;
+ 
+     if(session->fullpacket_state == libssh2_NB_state_idle) {
+         session->fullpacket_macstate = LIBSSH2_MAC_CONFIRMED;
+@@ -317,7 +318,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ )
+     if(session->fullpacket_state == libssh2_NB_state_created) {
+         rc = _libssh2_packet_add(session, p->payload,
+                                  session->fullpacket_payload_len,
+-                                 session->fullpacket_macstate);
++                                 session->fullpacket_macstate, seq);
+         if(rc == LIBSSH2_ERROR_EAGAIN)
+             return rc;
+         if(rc) {
+@@ -328,6 +329,11 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ )
+ 
+     session->fullpacket_state = libssh2_NB_state_idle;
+ 
++    if(session->kex_strict &&
++        session->fullpacket_packet_type == SSH_MSG_NEWKEYS) {
++        session->remote.seqno = 0;
++    }
++
+     return session->fullpacket_packet_type;
+ }
+ 
+@@ -1093,6 +1099,10 @@ int _libssh2_transport_send(LIBSSH2_SESSION *session,
+ 
+     session->local.seqno++;
+ 
++    if(session->kex_strict && data[0] == SSH_MSG_NEWKEYS) {
++        session->local.seqno = 0;
++    }
++
+     ret = LIBSSH2_SEND(session, p->outbuf, total_length,
+                        LIBSSH2_SOCKET_SEND_FLAGS(session));
+     if(ret < 0)
diff --git a/main/libtasn1/APKBUILD b/main/libtasn1/APKBUILD
index 636ed222dc9..ee8bb88df58 100644
--- a/main/libtasn1/APKBUILD
+++ b/main/libtasn1/APKBUILD
@@ -1,18 +1,21 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libtasn1
-pkgver=4.16.0
-pkgrel=1
+pkgver=4.19.0
+pkgrel=2
 pkgdesc="The ASN.1 library used in GNUTLS"
 url="https://www.gnu.org/software/gnutls/"
 arch="all"
 license="LGPL-2.1-or-later"
+depends_dev="$pkgname-progs=$pkgver-r$pkgrel"
 makedepends="texinfo"
 checkdepends="diffutils"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-progs"
 source="https://ftp.gnu.org/gnu/libtasn1/libtasn1-$pkgver.tar.gz"
 
 # secfixes:
+#   4.19-r0:
+#     - CVE-2021-46848
 #   4.14-r0:
 #     - CVE-2018-1000654
 #   4.13-r0:
@@ -21,7 +24,7 @@ source="https://ftp.gnu.org/gnu/libtasn1/libtasn1-$pkgver.tar.gz"
 #     - CVE-2017-10790
 
 build() {
-	CFLAGS="-Wno-error=inline" ./configure \
+	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -29,7 +32,7 @@ build() {
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
 		--disable-static
-	make -j1
+	make
 }
 
 check() {
@@ -40,17 +43,13 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-dev() {
-	depends_dev="$pkgname-progs=$pkgver-r$pkgrel"
-	default_dev
-}
-
 progs() {
 	license="GPL-3.0-only"
 	pkgdesc="$pkgdesc (utilities)"
 
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/bin
+	amove usr/bin
 }
 
-sha512sums="b356249535d5d592f9b59de39d21e26dd0f3f00ea47c9cef292cdd878042ea41ecbb7c8d2f02ac5839f5210092fe92a25acd343260ddf644887b031b167c2e71  libtasn1-4.16.0.tar.gz"
+sha512sums="
+287f5eddfb5e21762d9f14d11997e56b953b980b2b03a97ed4cd6d37909bda1ed7d2cdff9da5d270a21d863ab7e54be6b85c05f1075ac5d8f0198997cf335ef4  libtasn1-4.19.0.tar.gz
+"
diff --git a/main/libtheora/APKBUILD b/main/libtheora/APKBUILD
index f1c720dd783..4bd2f6f2b79 100644
--- a/main/libtheora/APKBUILD
+++ b/main/libtheora/APKBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libtheora
 pkgver=1.1.1
-pkgrel=14
+pkgrel=18
 pkgdesc="An open video codec developed by the Xiph.org"
 url="https://www.xiph.org"
 arch="all"
 license="BSD-3-Clause"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-examples"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 depends_dev="libogg-dev"
-makedepends="libvorbis-dev libogg-dev sdl-dev autoconf automake libtool
+makedepends="libvorbis-dev libogg-dev autoconf automake libtool
 	linux-headers"
-source="http://downloads.xiph.org/releases/theora/$pkgname-$pkgver.tar.bz2
+source="https://downloads.xiph.org/releases/theora/libtheora-$pkgver.tar.bz2
 	libtheora-flags.patch
 	enc.patch
 	fix-timeb.patch
@@ -20,9 +20,6 @@ source="http://downloads.xiph.org/releases/theora/$pkgname-$pkgver.tar.bz2
 
 prepare() {
 	default_prepare
-	cd "$builddir"
-
-	sed -i 's/png_\(sizeof\)/\1/g' examples/png2theora.c
 
 	libtoolize --force
 	aclocal -I m4
@@ -31,38 +28,24 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
-
 	CFLAGS="${CFLAGS/-Os/-O3}" CPPFLAGS="${CPPFLAGS/-Os/-O3}" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--enable-shared \
 		--enable-static
-	make -C lib
+	make -j 1 -C lib
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
-examples() {
-	pkgdesc="Example applications for libtheora"
-
-	cd "$builddir"/examples/.libs
-
-	install -d "$subpkgdir"/usr/bin
-	install -m755 dump_psnr player_example dump_video encoder_example \
-		"$subpkgdir"/usr/bin/
-}
-
 static() {
 	depends=""
 	pkgdesc="$pkgdesc (static libraries)"
diff --git a/main/libtirpc/APKBUILD b/main/libtirpc/APKBUILD
index 8e889b2a666..39febd342a4 100644
--- a/main/libtirpc/APKBUILD
+++ b/main/libtirpc/APKBUILD
@@ -1,20 +1,29 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libtirpc
-pkgver=1.2.5
-pkgrel=3
+pkgver=1.3.4
+pkgrel=0
 pkgdesc="Transport Independent RPC library (SunRPC replacement)"
-url="https://sourceforge.net/projects/libtirpc"
+url="https://sourceforge.net/projects/libtirpc/"
 arch="all"
 license="BSD-3-Clause"
 options="!check"
 depends="$pkgname-conf"
-depends_dev="krb5-dev bsd-compat-headers"
-makedepends="$depends_dev autoconf automake libtool linux-headers"
+depends_dev="
+	bsd-compat-headers
+	krb5-dev
+	"
+makedepends="
+	$depends_dev
+	autoconf
+	automake
+	libtool
+	linux-headers
+	"
 subpackages="
+	$pkgname-dbg
 	$pkgname-static
 	$pkgname-dev
 	$pkgname-doc
-	$pkgname-dbg
 	$pkgname-conf::noarch
 	$pkgname-nokrb
 	"
@@ -22,6 +31,10 @@ source="https://sourceforge.net/projects/libtirpc/files/libtirpc/$pkgver/libtirp
 	soname-suffix.patch
 	"
 
+# secfixes:
+#   1.3.2-r2:
+#     - CVE-2021-46828
+
 prepare() {
 	default_prepare
 	autoreconf -fi
@@ -63,5 +76,7 @@ nokrb() {
 	amove usr/lib/libtirpc-nokrb.*
 }
 
-sha512sums="d31cd4e22301abe1baddd7e8f45aaaf056a40799e961646691d071084fed50563b5eecdd9b78062fe378be8db7a6d4b87597e21cb81ac925e447148684a2b002  libtirpc-1.2.5.tar.bz2
-ccb6352c3c3b896765581595b9a0e45a527c34cbc16495d3890f996a2bc077a02ceae0ddd63505b3420a8414b93a267c82a11bc75997de8f9ca0a22e4c4daa5c  soname-suffix.patch"
+sha512sums="
+004e61b5853717324790c46cda5ff227d525909f189194ae72a1ec8f476ca35d7f4c1f03c0fbc690c1696d60a212675b09246dbe627fdbf1a9a47f5664e82b00  libtirpc-1.3.4.tar.bz2
+912a2ad979cb7f41c4d2b558d2d213aaa02e904685ddddc43fbab4ee537543df5288d08b704102654e780d96175774496680384a4bfec37e7f1d7770922a63af  soname-suffix.patch
+"
diff --git a/main/libtirpc/soname-suffix.patch b/main/libtirpc/soname-suffix.patch
index 4941bab172d..4037ef0ae24 100644
--- a/main/libtirpc/soname-suffix.patch
+++ b/main/libtirpc/soname-suffix.patch
@@ -1,9 +1,23 @@
-Allow to append a suffix to the library name via configuration
-variable SONAME_SUFFIX.
+Allow appending a suffix with SONAME_SUFFIX=
 
+diff --git a/Makefile.am b/Makefile.am
+index 3f60637..252568b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -46,7 +46,7 @@ nobase_include_HEADERS += \
+ endif
+ 
+ pkgconfigdir=$(libdir)/pkgconfig
+-pkgconfig_DATA = libtirpc.pc
++pkgconfig_DATA = libtirpc@SONAME_SUFFIX@.pc
+ 
+ CLEANFILES	       = cscope.* *~
+ DISTCLEANFILES	       = Makefile.in libtirpc*.tar.gz
+diff --git a/configure.ac b/configure.ac
+index 8065881..c1a2a97 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -74,6 +74,8 @@
+@@ -74,6 +74,8 @@ AC_ARG_ENABLE(symvers,
        [],[enable_symvers=yes])
  AM_CONDITIONAL(SYMVERS, test "x$enable_symvers" = xyes)
  
@@ -12,7 +26,7 @@ variable SONAME_SUFFIX.
  AC_CANONICAL_BUILD
  # Check for which host we are on and setup a few things
  # specifically based on the host
-@@ -98,6 +100,7 @@
+@@ -98,6 +100,7 @@ AC_CHECK_LIB([pthread], [pthread_create])
  AC_CHECK_FUNCS([getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent])
  
  AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile])
@@ -21,17 +35,25 @@ variable SONAME_SUFFIX.
 +AC_OUTPUT
  
  
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -46,7 +46,7 @@
- endif
- 
- pkgconfigdir=$(libdir)/pkgconfig
--pkgconfig_DATA = libtirpc.pc
-+pkgconfig_DATA = libtirpc@SONAME_SUFFIX@.pc
+diff --git a/libtirpc.pc.in b/libtirpc.pc.in
+index d2c7878..090b3fa 100644
+--- a/libtirpc.pc.in
++++ b/libtirpc.pc.in
+@@ -3,10 +3,10 @@
+ libdir=@libdir@
+ includedir=@includedir@
  
- CLEANFILES	       = cscope.* *~
- DISTCLEANFILES	       = Makefile.in libtirpc*.tar.gz
+-Name: libtirpc
++Name: libtirpc@SONAME_SUFFIX@
+ Description: Transport Independent RPC Library
+ Requires:
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -ltirpc
++Libs: -L${libdir} -ltirpc@SONAME_SUFFIX@
+ Libs.private: @PTHREAD_LIBS@
+ Cflags: -I${includedir}/tirpc
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b2d5436..7280403 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -10,12 +10,12 @@
@@ -41,9 +63,9 @@ variable SONAME_SUFFIX.
 -lib_LTLIBRARIES = libtirpc.la
 +lib_LTLIBRARIES = libtirpc@SONAME_SUFFIX@.la
  
--libtirpc_la_LDFLAGS = @LDFLAG_NOUNDEFINED@ -no-undefined -lpthread
+-libtirpc_la_LDFLAGS = @LDFLAG_NOUNDEFINED@ -no-undefined @PTHREAD_LIBS@
 -libtirpc_la_LDFLAGS += -version-info @LT_VERSION_INFO@
-+libtirpc@SONAME_SUFFIX@_la_LDFLAGS = @LDFLAG_NOUNDEFINED@ -no-undefined -lpthread
++libtirpc@SONAME_SUFFIX@_la_LDFLAGS = @LDFLAG_NOUNDEFINED@ -no-undefined @PTHREAD_LIBS@
 +libtirpc@SONAME_SUFFIX@_la_LDFLAGS += -version-info @LT_VERSION_INFO@
  
 -libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c \
@@ -86,18 +108,3 @@ variable SONAME_SUFFIX.
  
  CLEANFILES	       = cscope.* *~
  DISTCLEANFILES	       = Makefile.in
---- a/libtirpc.pc.in
-+++ b/libtirpc.pc.in
-@@ -3,10 +3,10 @@
- libdir=@libdir@
- includedir=@includedir@
- 
--Name: libtirpc
-+Name: libtirpc@SONAME_SUFFIX@
- Description: Transport Independent RPC Library
- Requires:
- Version: @PACKAGE_VERSION@
--Libs: -L@libdir@ -ltirpc
-+Libs: -L@libdir@ -ltirpc@SONAME_SUFFIX@
- Libs.private: -lpthread
- Cflags: -I@includedir@/tirpc
diff --git a/main/libtls-standalone/APKBUILD b/main/libtls-standalone/APKBUILD
deleted file mode 100644
index d5709e651e1..00000000000
--- a/main/libtls-standalone/APKBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Maintainer: 
-pkgname=libtls-standalone
-pkgver=2.9.1
-_namever=${pkgname}${pkgver%.*}
-pkgrel=0
-pkgdesc="libtls extricated from libressl sources"
-url="https://www.libressl.org/"
-arch="all"
-license="ISC"
-depends="ca-certificates-cacert"
-depends_dev="openssl-dev"
-makedepends_build=""
-makedepends_host="libbsd-dev openssl-dev"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc"
-source="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-$pkgver.tar.gz
-	Makefile
-	tls_compat.c
-	tls_compat.h
-	test_program.c
-	libtls-ciphers.patch
-	openssl-1.1.0-bio-method.patch
-	openssl-1.1.0-verify-param.patch
-	openssl-1.1.0-asn1-string.patch
-	openssl-1.1.0-x509-object.patch
-	"
-libressl_src="$srcdir/libressl-$pkgver"
-builddir="$srcdir"
-
-prepare() {
-	cd "$builddir"
-	rm -rf "$libressl_src"/include/openssl
-
-	cd "$libressl_src"
-	patch -p1 < "$srcdir"/libtls-ciphers.patch
-	patch -p1 < "$srcdir"/openssl-1.1.0-bio-method.patch
-	patch -p1 < "$srcdir"/openssl-1.1.0-verify-param.patch
-	patch -p1 < "$srcdir"/openssl-1.1.0-asn1-string.patch
-	patch -p1 < "$srcdir"/openssl-1.1.0-x509-object.patch
-}
-
-build() {
-	cd "$builddir"
-
-	make PREFIX=/usr LIBRESSL_SRCDIR="${libressl_src}" LIBRESSL_VERSION="${pkgver}"
-}
-
-check() {
-	cd "$builddir"
-	make PREFIX=/usr LIBRESSL_SRCDIR="${libressl_src}" LIBRESSL_VERSION="${pkgver}" check
-}
-
-package() {
-	cd "$builddir"
-
-	make PREFIX=/usr LIBRESSL_SRCDIR="${libressl_src}" LIBRESSL_VERSION="${pkgver}" DESTDIR="${pkgdir}" install
-	install -Dm644 "${libressl_src}"/COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="7051911e566bb093c48a70da72c9981b870e3bf49a167ba6c934eece873084cc41221fbe3cd0c8baba268d0484070df7164e4b937854e716337540a87c214354  libressl-2.9.1.tar.gz
-75292dcd0321a3cb00b30715f537cd35f2375922aac3ad5445f3d7b9eff16ab934926b1605f3330032f8455378c89f41bd1ed83f5a027fc967adff7006ed9486  Makefile
-be8216d08a6992ca65a8e3f1e010645833899465090179f269a62de5fcfe2711d463fe1aa57e408492648878fa2ee53377c4509ef48a2aafe3f267cce73e9209  tls_compat.c
-0b8fca899e1f7b51979d69458be23c77c1b7f265ed60de76cf5cfb9eb5742111cf50813bd35384831301523a6a0562a20acf1aec22dc0d9ad653271d45ede915  tls_compat.h
-71d36fe25c95a0a45497e3f699b01dddcaae9053dd1b1e2419df94272c47024cf6516c51c902129201061601b04a72551904b15a332a4cf53358983b5db73618  test_program.c
-8da41dc7f3a3e94c7c26c20b88e649eeaa556064c6b45deb4604fb0b5738109344bf2d9e5c37dc963634db1761370aa5ed4dfe085cae2a21e74535b5b98f4a43  libtls-ciphers.patch
-90244db67d2f5a2b4679cd4b905f6e58105e20e5a4648dd0781dee3f3d1ce87350eee9683f2e6e554949a390ee45d2247e7588e75668e82feb68213178905d3d  openssl-1.1.0-bio-method.patch
-b0c6c0b32d6ea30b7161ae75e36b8102b3c00268723dec15464318bae8f77a386dba9ef0537d47018b385b16f57132b5c893e494b8853d51b638b4d270e1f9d6  openssl-1.1.0-verify-param.patch
-e0b7ce674269714cd63f628c332ed3420086c973f6e763a9a5d57991738370759d437b59edff5349ce4213725588f58e196c479b372a702833fcae75da9d71a1  openssl-1.1.0-asn1-string.patch
-7d88088240f78dc3656e71d67f2222b4562bbcfacfaac77e7d8d3ace50ae7f02fac15cea0df2d9990b8d30f6cfd0b4ffd92ea97191181f0b00b1d34c050ef130  openssl-1.1.0-x509-object.patch"
diff --git a/main/libtls-standalone/Makefile b/main/libtls-standalone/Makefile
deleted file mode 100644
index 781a15a7d1b..00000000000
--- a/main/libtls-standalone/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-PREFIX = /usr/local
-EXEC_PREFIX = ${PREFIX}
-LIBDIR = ${PREFIX}/lib
-INCLUDEDIR = ${PREFIX}/include
-
-LIBRESSL_VERSION = 1.0
-LIBTLS_SOVERSION = 1
-LIBTLS_FULLVERSION = 1.0.0
-
-OPENSSL_CFLAGS = $(shell pkgconf openssl --cflags)
-OPENSSL_LIBS = $(shell pkgconf openssl --libs)
-
-CFLAGS = -Wall -Wno-pointer-sign -fPIC -DPIC -shared -include tls_compat.h -isystem ${LIBRESSL_SRCDIR}/include/compat ${OPENSSL_CFLAGS} -I ${LIBRESSL_SRCDIR}/include \
-	-D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS=
-LDFLAGS = -fPIC -DPIC -shared -Wl,-soname,libtls-standalone.so.${LIBTLS_SOVERSION} ${OPENSSL_LIBS}
-
-SOURCES = \
-	tls_compat.c				\
-	${LIBRESSL_SRCDIR}/tls/tls.c		\
-	${LIBRESSL_SRCDIR}/tls/tls_bio_cb.c	\
-	${LIBRESSL_SRCDIR}/tls/tls_client.c	\
-	${LIBRESSL_SRCDIR}/tls/tls_config.c	\
-	${LIBRESSL_SRCDIR}/tls/tls_conninfo.c	\
-	${LIBRESSL_SRCDIR}/tls/tls_keypair.c	\
-	${LIBRESSL_SRCDIR}/tls/tls_ocsp.c	\
-	${LIBRESSL_SRCDIR}/tls/tls_peer.c	\
-	${LIBRESSL_SRCDIR}/tls/tls_server.c	\
-	${LIBRESSL_SRCDIR}/tls/tls_util.c	\
-	${LIBRESSL_SRCDIR}/tls/tls_verify.c	\
-	${LIBRESSL_SRCDIR}/crypto/compat/arc4random.c		\
-	${LIBRESSL_SRCDIR}/crypto/compat/arc4random_uniform.c	\
-	${LIBRESSL_SRCDIR}/crypto/compat/freezero.c		\
-	${LIBRESSL_SRCDIR}/crypto/compat/reallocarray.c		\
-	${LIBRESSL_SRCDIR}/crypto/compat/timingsafe_memcmp.c
-
-OBJECTS = ${SOURCES:.c=.o}
-
-all: dumpconfig libtls-standalone.so.${LIBTLS_FULLVERSION} libtls-standalone.so.${LIBTLS_SOVERSION} libtls-standalone.pc
-
-dumpconfig:
-	@echo "Building with:"
-	@echo "  LIBRESSL_SRCDIR = ${LIBRESSL_SRCDIR}"
-	@echo "  OPENSSL_CFLAGS  = ${OPENSSL_CFLAGS}"
-	@echo "  OPENSSL_LIBS    = ${OPENSSL_LIBS}"
-
-.c.o:
-	${CC} ${CFLAGS} -o $@ -c $<
-
-libtls-standalone.so.${LIBTLS_SOVERSION}: libtls-standalone.so.${LIBTLS_FULLVERSION}
-	ln -s $< $@
-
-libtls-standalone.so.${LIBTLS_FULLVERSION}: ${OBJECTS}
-	${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${OPENSSL_LIBS}
-
-check: test_program
-	LD_LIBRARY_PATH=$$PWD ./test_program
-
-test_program: test_program.c
-	${CC} -I${LIBRESSL_SRCDIR}/include -o $@ test_program.c ./libtls-standalone.so.${LIBTLS_FULLVERSION}
-
-clean:
-	rm -f ${OBJECTS}
-	rm -f libtls-standalone.so.${LIBTLS_FULLVERSION} libtls-standalone.so.${LIBTLS_SOVERSION}
-	rm -f test_program
-
-install:
-	install -D -m755 libtls-standalone.so.${LIBTLS_FULLVERSION} ${DESTDIR}${PREFIX}/lib/libtls-standalone.so.${LIBTLS_FULLVERSION}
-	ln -sf libtls-standalone.so.${LIBTLS_FULLVERSION} ${DESTDIR}${PREFIX}/lib/libtls-standalone.so.${LIBTLS_SOVERSION}
-	ln -sf libtls-standalone.so.${LIBTLS_FULLVERSION} ${DESTDIR}${PREFIX}/lib/libtls-standalone.so
-
-	install -D -m644 ${LIBRESSL_SRCDIR}/include/tls.h ${DESTDIR}${PREFIX}/include/libtls-standalone/tls.h
-
-	install -D -m644 libtls-standalone.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/libtls-standalone.pc
-
-libtls-standalone.pc: ${LIBRESSL_SRCDIR}/libtls.pc.in
-	sed -e s:@prefix@:${PREFIX}:g \
-	    -e s:@exec_prefix@:${EXEC_PREFIX}:g \
-	    -e s:@libdir@:${LIBDIR}:g \
-	    -e s:@includedir@:${INCLUDEDIR}/libtls-standalone:g \
-	    -e s:@LIBS@:-ltls-standalone:g \
-	    -e s:@PLATFORM_LDADD@::g \
-	    -e s:@VERSION@:${LIBRESSL_VERSION}:g \
-	    -e /^Libs:/s:-ltls:-ltls-standalone:g \
-	    $< > libtls-standalone.pc
-
-.DUMMY: check dumpconfig clean install
diff --git a/main/libtls-standalone/libtls-ciphers.patch b/main/libtls-standalone/libtls-ciphers.patch
deleted file mode 100644
index 7b5843b28c3..00000000000
--- a/main/libtls-standalone/libtls-ciphers.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- libressl-2.7.4.orig/tls/tls_internal.h
-+++ libressl-2.7.4/tls/tls_internal.h
-@@ -30,12 +30,12 @@
- #define _PATH_SSL_CA_FILE "/etc/ssl/cert.pem"
- #endif
- 
--#define TLS_CIPHERS_DEFAULT	"TLSv1.2+AEAD+ECDHE:TLSv1.2+AEAD+DHE"
- #define TLS_CIPHERS_COMPAT	"HIGH:!aNULL"
- #define TLS_CIPHERS_LEGACY	"HIGH:MEDIUM:!aNULL"
- #define TLS_CIPHERS_ALL		"ALL:!aNULL:!eNULL"
-+#define TLS_CIPHERS_DEFAULT	TLS_CIPHERS_COMPAT
- 
--#define TLS_ECDHE_CURVES	"X25519,P-256,P-384"
-+#define TLS_ECDHE_CURVES	"P-256,P-384"
- 
- union tls_addr {
- 	struct in_addr ip4;
diff --git a/main/libtls-standalone/openssl-1.1.0-asn1-string.patch b/main/libtls-standalone/openssl-1.1.0-asn1-string.patch
deleted file mode 100644
index 258ba60a5de..00000000000
--- a/main/libtls-standalone/openssl-1.1.0-asn1-string.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- libressl-2.7.4.orig/tls/tls_verify.c
-+++ libressl-2.7.4/tls/tls_verify.c
-@@ -126,12 +126,12 @@
- 			continue;
- 
- 		if (type == GEN_DNS) {
--			unsigned char	*data;
-+			const unsigned char	*data;
- 			int		 format, len;
- 
- 			format = ASN1_STRING_type(altname->d.dNSName);
- 			if (format == V_ASN1_IA5STRING) {
--				data = ASN1_STRING_data(altname->d.dNSName);
-+				data = ASN1_STRING_get0_data(altname->d.dNSName);
- 				len = ASN1_STRING_length(altname->d.dNSName);
- 
- 				if (len < 0 || (size_t)len != strlen(data)) {
-@@ -171,11 +171,11 @@
- 			}
- 
- 		} else if (type == GEN_IPADD) {
--			unsigned char	*data;
-+			const unsigned char	*data;
- 			int		 datalen;
- 
- 			datalen = ASN1_STRING_length(altname->d.iPAddress);
--			data = ASN1_STRING_data(altname->d.iPAddress);
-+			data = ASN1_STRING_get0_data(altname->d.iPAddress);
- 
- 			if (datalen < 0) {
- 				tls_set_errorx(ctx,
diff --git a/main/libtls-standalone/openssl-1.1.0-bio-method.patch b/main/libtls-standalone/openssl-1.1.0-bio-method.patch
deleted file mode 100644
index 4f4290c3cea..00000000000
--- a/main/libtls-standalone/openssl-1.1.0-bio-method.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- libressl-2.7.4.orig/tls/tls_bio_cb.c
-+++ libressl-2.7.4/tls/tls_bio_cb.c
-@@ -18,6 +18,7 @@
- #include <fcntl.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <assert.h>
- 
- #include <openssl/bio.h>
- 
-@@ -29,19 +30,36 @@
- static int bio_cb_puts(BIO *bio, const char *str);
- static long bio_cb_ctrl(BIO *bio, int cmd, long num, void *ptr);
- 
--static BIO_METHOD bio_cb_method = {
--	.type = BIO_TYPE_MEM,
--	.name = "libtls_callbacks",
--	.bwrite = bio_cb_write,
--	.bread = bio_cb_read,
--	.bputs = bio_cb_puts,
--	.ctrl = bio_cb_ctrl,
--};
-+static pthread_once_t bio_cb_init_once = PTHREAD_ONCE_INIT;
- 
-+static BIO_METHOD *bio_cb_method = NULL;
-+
-+static void
-+bio_s_cb_init(void)
-+{
-+	BIO_METHOD *method;
-+
-+	method = BIO_meth_new(BIO_TYPE_MEM, "libtls_callbacks");
-+	assert(method != NULL);
-+
-+	BIO_meth_set_read(method, bio_cb_read);
-+	BIO_meth_set_write(method, bio_cb_write);
-+	BIO_meth_set_puts(method, bio_cb_puts);
-+	BIO_meth_set_ctrl(method, bio_cb_ctrl);
-+
-+	bio_cb_method = method;
-+}
-+
- static BIO_METHOD *
- bio_s_cb(void)
- {
--	return (&bio_cb_method);
-+	if (bio_cb_method != NULL) {
-+		return bio_cb_method;
-+	}
-+
-+	(void) pthread_once(&bio_cb_init_once, bio_s_cb_init);
-+
-+	return bio_cb_method;
- }
- 
- static int
-@@ -57,10 +75,10 @@
- 
- 	switch (cmd) {
- 	case BIO_CTRL_GET_CLOSE:
--		ret = (long)bio->shutdown;
-+		ret = (long) BIO_get_shutdown(bio);
- 		break;
- 	case BIO_CTRL_SET_CLOSE:
--		bio->shutdown = (int)num;
-+		BIO_set_shutdown(bio, (int) num);
- 		break;
- 	case BIO_CTRL_DUP:
- 	case BIO_CTRL_FLUSH:
-@@ -69,7 +87,7 @@
- 	case BIO_CTRL_GET:
- 	case BIO_CTRL_SET:
- 	default:
--		ret = BIO_ctrl(bio->next_bio, cmd, num, ptr);
-+		ret = BIO_ctrl(BIO_next(bio), cmd, num, ptr);
- 	}
- 
- 	return (ret);
-@@ -78,7 +96,7 @@
- static int
- bio_cb_write(BIO *bio, const char *buf, int num)
- {
--	struct tls *ctx = bio->ptr;
-+	struct tls *ctx = BIO_get_data(bio);
- 	int rv;
- 
- 	BIO_clear_retry_flags(bio);
-@@ -96,7 +114,7 @@
- static int
- bio_cb_read(BIO *bio, char *buf, int size)
- {
--	struct tls *ctx = bio->ptr;
-+	struct tls *ctx = BIO_get_data(bio);
- 	int rv;
- 
- 	BIO_clear_retry_flags(bio);
-@@ -131,8 +149,8 @@
- 		tls_set_errorx(ctx, "failed to create callback i/o");
- 		goto err;
- 	}
--	bio->ptr = ctx;
--	bio->init = 1;
-+	BIO_set_data(bio, ctx);
-+	BIO_set_init(bio, 1);
- 
- 	SSL_set_bio(ctx->ssl_conn, bio, bio);
- 
diff --git a/main/libtls-standalone/openssl-1.1.0-verify-param.patch b/main/libtls-standalone/openssl-1.1.0-verify-param.patch
deleted file mode 100644
index ef3f948e02d..00000000000
--- a/main/libtls-standalone/openssl-1.1.0-verify-param.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- libressl-2.7.4.orig/tls/tls.c
-+++ libressl-2.7.4/tls/tls.c
-@@ -438,8 +438,16 @@
- 	}
- 
- 	if (ctx->config->verify_time == 0) {
--		X509_VERIFY_PARAM_set_flags(ssl_ctx->param,
--		    X509_V_FLAG_NO_CHECK_TIME);
-+		X509_VERIFY_PARAM *param = X509_VERIFY_PARAM_new();
-+
-+		if (param == NULL) {
-+			goto err;
-+		}
-+
-+		X509_VERIFY_PARAM_set_flags(param, X509_V_FLAG_NO_CHECK_TIME);
-+		SSL_CTX_set1_param(ssl_ctx, param);
-+
-+		X509_VERIFY_PARAM_free(param);
- 	}
- 
- 	/* Disable any form of session caching by default */
-@@ -487,6 +495,7 @@
- 	STACK_OF(X509_INFO) *xis = NULL;
- 	X509_STORE *store;
- 	X509_INFO *xi;
-+	X509_VERIFY_PARAM *param;
- 	BIO *bio = NULL;
- 	int rv = -1;
- 	int i;
-@@ -548,8 +557,19 @@
- 			}
- 			xi->crl = NULL;
- 		}
--		X509_VERIFY_PARAM_set_flags(store->param,
-+
-+		param = X509_VERIFY_PARAM_new();
-+
-+		if (param == NULL) {
-+			goto err;
-+		}
-+		
-+		X509_VERIFY_PARAM_set_flags(param,
- 		    X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL);
-+
-+		X509_STORE_set1_param(store, param);
-+
-+		X509_VERIFY_PARAM_free(param);
- 	}
- 
-  done:
diff --git a/main/libtls-standalone/openssl-1.1.0-x509-object.patch b/main/libtls-standalone/openssl-1.1.0-x509-object.patch
deleted file mode 100644
index e90903252f1..00000000000
--- a/main/libtls-standalone/openssl-1.1.0-x509-object.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libressl-2.7.4.orig/tls/tls_ocsp.c
-+++ libressl-2.7.4/tls/tls_ocsp.c
-@@ -127,8 +127,8 @@
- {
- 	X509_NAME *issuer_name;
- 	X509 *issuer;
--	X509_STORE_CTX storectx;
--	X509_OBJECT tmpobj;
-+	X509_STORE_CTX *storectx;
-+	X509_OBJECT *tmpobj;
- 	OCSP_CERTID *cid = NULL;
- 	X509_STORE *store;
- 
-@@ -143,14 +143,20 @@
- 
- 	if ((store = SSL_CTX_get_cert_store(ssl_ctx)) == NULL)
- 		return NULL;
--	if (X509_STORE_CTX_init(&storectx, store, main_cert, extra_certs) != 1)
-+	if ((storectx = X509_STORE_CTX_new()) == NULL)
- 		return NULL;
--	if (X509_STORE_get_by_subject(&storectx, X509_LU_X509, issuer_name,
--		&tmpobj) == 1) {
--		cid = OCSP_cert_to_id(NULL, main_cert, tmpobj.data.x509);
--		X509_OBJECT_free_contents(&tmpobj);
-+	if (X509_STORE_CTX_init(storectx, store, main_cert, extra_certs) != 1)
-+		goto err;
-+	if ((tmpobj = X509_OBJECT_new()) == NULL)
-+		goto err;
-+	if (X509_STORE_get_by_subject(storectx, X509_LU_X509, issuer_name,
-+		tmpobj) == 1) {
-+		cid = OCSP_cert_to_id(NULL, main_cert, X509_OBJECT_get0_X509(tmpobj));
-+		X509_OBJECT_free(tmpobj);
- 	}
--	X509_STORE_CTX_cleanup(&storectx);
-+
-+ err:
-+	X509_STORE_CTX_cleanup(storectx);
- 	return cid;
- }
- 
diff --git a/main/libtls-standalone/tls_compat.c b/main/libtls-standalone/tls_compat.c
deleted file mode 100644
index 2d184e4020d..00000000000
--- a/main/libtls-standalone/tls_compat.c
+++ /dev/null
@@ -1,369 +0,0 @@
-/*
- * Copyright (c) 2016 Tai Chi Minh Ralph Eastwood <tcmreastwood@gmail.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <openssl/opensslv.h>
-#include <openssl/x509_vfy.h>
-#include <openssl/ssl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <ctype.h>
-
-int SSL_CTX_load_verify_mem(SSL_CTX *ctx, void *buf, int len)
-{
-    char fname[] = "/tmp/libtlscompatXXXXXX";
-    int rc;
-    int fd;
-
-    fd = mkstemp(fname);
-
-    if (fd < 0)
-        return -1;
-    do {
-        ssize_t wrote = write(fd, buf, len);
-        if(wrote == -1) {
-            break;
-        } else {
-            buf = (char *)buf + wrote;
-            len -= wrote;
-        }
-    } while(len);
-    close(fd);
-	rc = SSL_CTX_load_verify_locations(ctx, fname, NULL);
-    remove(fname);
-    return rc;
-}
-
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <sys/types.h>
-
-#include <unistd.h>
-#include <stdio.h>
-
-#include <openssl/err.h>
-#include <openssl/bio.h>
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-#include <openssl/ssl.h>
-
-int
-SSL_CTX_use_certificate_chain_mem(SSL_CTX *ctx, char *buf, off_t len)
-{
-	int ret;
-	BIO*in;
-	X509*x;
-	X509*ca;
-	unsigned long err;
-
-	ret = 0;
-	x = ca = NULL;
-
-	if ((in = BIO_new_mem_buf(buf, len)) == NULL) {
-		SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE, ERR_R_BUF_LIB);
-		goto end;
-	}
-
-	if ((x = PEM_read_bio_X509(in, NULL,
-		    SSL_CTX_get_default_passwd_cb(ctx),
-		    SSL_CTX_get_default_passwd_cb_userdata(ctx))) == NULL) {
-		SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE, ERR_R_PEM_LIB);
-		goto end;
-	}
-
-	if (!SSL_CTX_use_certificate(ctx, x) || ERR_peek_error() != 0)
-		goto end;
-
-	/* If we could set up our certificate, now proceed to
-	 * the CA certificates.
-	 */
-	SSL_CTX_clear_extra_chain_certs(ctx);
-
-	while ((ca = PEM_read_bio_X509(in, NULL,
-		    SSL_CTX_get_default_passwd_cb(ctx),
-		    SSL_CTX_get_default_passwd_cb_userdata(ctx))) != NULL) {
-
-		if (!SSL_CTX_add_extra_chain_cert(ctx, ca))
-			goto end;
-	}
-
-	err = ERR_peek_last_error();
-	if (ERR_GET_LIB(err) == ERR_LIB_PEM &&
-	    ERR_GET_REASON(err) == PEM_R_NO_START_LINE)
-		ERR_clear_error();
-	else
-		goto end;
-
-	ret = 1;
-end:
-	if (ca != NULL)
-		X509_free(ca);
-	if (x != NULL)
-		X509_free(x);
-	if (in != NULL)
-		BIO_free(in);
-	return (ret);
-}
-
-/*
- * Copyright (c) 2015 Bob Beck <beck@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * Parse an RFC 5280 format ASN.1 time string.
- *
- * mode must be:
- * 0 if we expect to parse a time as specified in RFC 5280 from an X509 object.
- * V_ASN1_UTCTIME if we wish to parse on RFC5280 format UTC time.
- * V_ASN1_GENERALIZEDTIME if we wish to parse an RFC5280 format Generalized time.
- *
- * Returns:
- * -1 if the string was invalid.
- * V_ASN1_UTCTIME if the string validated as a UTC time string.
- * V_ASN1_GENERALIZEDTIME if the string validated as a Generalized time string.
- *
- * Fills in *tm with the corresponding time if tm is non NULL.
- */
-
-#define GENTIME_LENGTH 15
-#define UTCTIME_LENGTH 13
-
-#define	ATOI2(ar)	((ar) += 2, ((ar)[-2] - '0') * 10 + ((ar)[-1] - '0'))
-int
-ASN1_time_parse(const char *bytes, size_t len, struct tm *tm, int mode)
-{
-	size_t i;
-	int type = 0;
-	struct tm ltm;
-	struct tm *lt;
-	const char *p;
-
-	if (bytes == NULL)
-		return (-1);
-
-	/* Constrain to valid lengths. */
-	if (len != UTCTIME_LENGTH && len != GENTIME_LENGTH)
-		return (-1);
-
-	lt = tm;
-	if (lt == NULL) {
-		memset(&ltm, 0, sizeof(ltm));
-		lt = &ltm;
-	}
-
-	/* Timezone is required and must be GMT (Zulu). */
-	if (bytes[len - 1] != 'Z')
-		return (-1);
-
-	/* Make sure everything else is digits. */
-	for (i = 0; i < len - 1; i++) {
-		if (isdigit((unsigned char)bytes[i]))
-			continue;
-		return (-1);
-	}
-
-	/*
-	 * Validate and convert the time
-	 */
-	p = bytes;
-	switch (len) {
-	case GENTIME_LENGTH:
-		if (mode == V_ASN1_UTCTIME)
-			return (-1);
-		lt->tm_year = (ATOI2(p) * 100) - 1900;	/* cc */
-		type = V_ASN1_GENERALIZEDTIME;
-		/* FALLTHROUGH */
-	case UTCTIME_LENGTH:
-		if (type == 0) {
-			if (mode == V_ASN1_GENERALIZEDTIME)
-				return (-1);
-			type = V_ASN1_UTCTIME;
-		}
-		lt->tm_year += ATOI2(p);		/* yy */
-		if (type == V_ASN1_UTCTIME) {
-			if (lt->tm_year < 50)
-				lt->tm_year += 100;
-		}
-		lt->tm_mon = ATOI2(p) - 1;		/* mm */
-		if (lt->tm_mon < 0 || lt->tm_mon > 11)
-			return (-1);
-		lt->tm_mday = ATOI2(p);			/* dd */
-		if (lt->tm_mday < 1 || lt->tm_mday > 31)
-			return (-1);
-		lt->tm_hour = ATOI2(p);			/* HH */
-		if (lt->tm_hour < 0 || lt->tm_hour > 23)
-			return (-1);
-		lt->tm_min = ATOI2(p);			/* MM */
-		if (lt->tm_min < 0 || lt->tm_min > 59)
-			return (-1);
-		lt->tm_sec = ATOI2(p);			/* SS */
-		/* Leap second 60 is not accepted. Reconsider later? */
-		if (lt->tm_sec < 0 || lt->tm_sec > 59)
-			return (-1);
-		break;
-	default:
-		return (-1);
-	}
-
-	return (type);
-}
-
-/* $OpenBSD: a_time_tm.c,v 1.14 2017/08/28 17:42:47 jsing Exp $ */
-/*
- * Copyright (c) 2015 Bob Beck <beck@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <ctype.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-
-#include <openssl/asn1t.h>
-#include <openssl/err.h>
-
-#define RFC5280 0
-#define GENTIME_LENGTH 15
-#define UTCTIME_LENGTH 13
-
-int
-ASN1_time_tm_cmp(struct tm *tm1, struct tm *tm2)
-{
-	if (tm1->tm_year < tm2->tm_year)
-		return (-1);
-	if (tm1->tm_year > tm2->tm_year)
-		return (1);
-	if (tm1->tm_mon < tm2->tm_mon)
-		return (-1);
-	if (tm1->tm_mon > tm2->tm_mon)
-		return (1);
-	if (tm1->tm_mday < tm2->tm_mday)
-		return (-1);
-	if (tm1->tm_mday > tm2->tm_mday)
-		return (1);
-	if (tm1->tm_hour < tm2->tm_hour)
-		return (-1);
-	if (tm1->tm_hour > tm2->tm_hour)
-		return (1);
-	if (tm1->tm_min < tm2->tm_min)
-		return (-1);
-	if (tm1->tm_min > tm2->tm_min)
-		return (1);
-	if (tm1->tm_sec < tm2->tm_sec)
-		return (-1);
-	if (tm1->tm_sec > tm2->tm_sec)
-		return (1);
-	return 0;
-}
-
-int
-ASN1_time_tm_clamp_notafter(struct tm *tm)
-{
-	if (sizeof(time_t) < 8) {
-		struct tm broken_os_epoch_tm;
-		time_t broken_os_epoch_time = INT_MAX;
-
-		if (gmtime_r(&broken_os_epoch_time, &broken_os_epoch_tm) == NULL)
-			return 0;
-
-		if (ASN1_time_tm_cmp(tm, &broken_os_epoch_tm) == 1)
-			memcpy(tm, &broken_os_epoch_tm, sizeof(*tm));
-	}
-
-	return 1;
-}
diff --git a/main/libtls-standalone/tls_compat.h b/main/libtls-standalone/tls_compat.h
deleted file mode 100644
index 8e4629e35af..00000000000
--- a/main/libtls-standalone/tls_compat.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <string.h>
-
-#include <openssl/opensslv.h>
-#include <openssl/x509_vfy.h>
-
-#ifndef LIBTLS_TLS_COMPAT_H
-#define LIBTLS_TLS_COMPAT_H
-
-#ifndef X509_V_FLAG_NO_CHECK_TIME
-#define X509_V_FLAG_NO_CHECK_TIME 0
-#endif
-
-#ifndef SSL_OP_NO_CLIENT_RENEGOTIATION
-#define SSL_OP_NO_CLIENT_RENEGOTIATION 0
-#endif
-
-int SSL_CTX_load_verify_mem(SSL_CTX *ctx, void *buf, int len);
-
-int ASN1_time_parse(const char *bytes, size_t len, struct tm *tm, int mode);
-
-int SSL_CTX_use_certificate_chain_mem(SSL_CTX *, char *buf, off_t);
-
-#endif
diff --git a/main/libtool/APKBUILD b/main/libtool/APKBUILD
index b75c35d14d9..7b622fb2499 100644
--- a/main/libtool/APKBUILD
+++ b/main/libtool/APKBUILD
@@ -1,27 +1,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libtool
-pkgver=2.4.6
-pkgrel=7
+pkgver=2.4.7
+pkgrel=3
 pkgdesc="A generic library support script"
 arch="all"
-license="LGPL-2.0+"
+license="LGPL-2.0-or-later AND GPL-2.0-or-later"
 url="https://www.gnu.org/software/libtool"
-source="https://ftp.gnu.org/gnu/libtool/${pkgname}-${pkgver}.tar.gz
+source="https://ftp.gnu.org/gnu/libtool/libtool-$pkgver.tar.gz
 	libtool-fix-cross-compile.patch
 	"
-depends="bash libltdl"
+depends="libltdl"
 makedepends="m4 help2man"
 checkdepends="gawk autoconf automake gzip"
 subpackages="libltdl-static libltdl $pkgname-doc"
+options="libtool"
 
-# 1 test presently fails on Alpine (need to investigate):
-#  69: shlibpath_overrides_runpath                     FAILED (shlibpath.at:68)
-options="libtool !check"
+prepare() {
+	default_prepare
 
-builddir="$srcdir"/$pkgname-$pkgver
+	# failing gnulib tests
+	sed -i \
+		-e "s|test-funclib-quote.sh||" \
+		-e "s|test-option-parser.sh||" \
+		gnulib-tests/Makefile.in
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,23 +34,22 @@ build() {
 }
 
 check() {
-	cd "$builddir"
-	# Test 70 and 117 are known to fail
-	# Test 170 repeats the entire test suite with shorter max_cmd_len
-	make check TESTSUITEFLAGS="1-69 71-116 118-169"
+	# Test 69 shlibpath_overrides_runpath fails
+	# Test 169 repeats the entire test suite with shorter max_cmd_len
+	make check TESTSUITEFLAGS="1-68 70-168"
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
 libltdl() {
 	pkgdesc="Runtime libraries for GNU Libtool Dynamic Module Loader"
 	depends=
-	mkdir -p "$subpkgdir/usr/lib"
-	mv "$pkgdir/usr/lib/libltdl.so"* "$subpkgdir/usr/lib/"
+	amove usr/lib/libltdl.so*
 }
 
-sha512sums="3233d81cb2739a54b840a0a82064eebbfaa4fb442fb993a35d6bd41d8395c51f038c90ae048b9252f172d0a5bbfb4b36e2b13d4477001f9ff7d4124237819a18  libtool-2.4.6.tar.gz
-aa14cadd70a633520249fa3a6a4c45b309a980380e62dd5982b3ae842c478a77401ad809297fceebd167c167b0a19f380e6a6c295bc75d1029d56d3bf262b209  libtool-fix-cross-compile.patch"
+sha512sums="
+27acef46d9eb67203d708b57d80b853f76fa4b9c2720ff36ec161e6cdf702249e7982214ddf60bae75511aa79bc7d92aa27e3eab7ef9c0f5c040e8e42e76a385  libtool-2.4.7.tar.gz
+aa14cadd70a633520249fa3a6a4c45b309a980380e62dd5982b3ae842c478a77401ad809297fceebd167c167b0a19f380e6a6c295bc75d1029d56d3bf262b209  libtool-fix-cross-compile.patch
+"
diff --git a/main/libtxc_dxtn/APKBUILD b/main/libtxc_dxtn/APKBUILD
deleted file mode 100644
index 89057d55e9f..00000000000
--- a/main/libtxc_dxtn/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: 
-# Maintainer: 
-pkgname=libtxc_dxtn
-pkgver=1.0.1
-pkgrel=5
-pkgdesc="S3TC texture decompression helper library"
-url="http://dri.freedesktop.org/wiki/S3TC"
-arch="all"
-license="BSD"
-depends_dev="mesa-dev"
-makedepends="$depends_dev automake autoconf libtool"
-subpackages="$pkgname-dev"
-source="$pkgname-$pkgver-r$pkgrel.tar.bz2::https://people.freedesktop.org/~cbrill/$pkgname/$pkgname-$pkgver.tar.bz2"
-builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	default_prepare
-	libtoolize --force && aclocal -I m4 && autoreconf -fvi \
-		&& automake --add-missing
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		|| return 1
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	rm "$pkgdir"/usr/lib/libtxc_dxtn.la
-}
-
-sha512sums="56714a8c947d9b1f47e3ccb23cff9e4e57bd131907a82968de521d094a000275b3aaeecff28e9184bcc4f3932baa1a8bfbbefbc970fcd034ff953d0617148479  libtxc_dxtn-1.0.1-r5.tar.bz2"
diff --git a/main/libucontext/0001-common-trampoline-Ensure-omission-of-frame-pointer.patch b/main/libucontext/0001-common-trampoline-Ensure-omission-of-frame-pointer.patch
new file mode 100644
index 00000000000..cb0c588b8fd
--- /dev/null
+++ b/main/libucontext/0001-common-trampoline-Ensure-omission-of-frame-pointer.patch
@@ -0,0 +1,47 @@
+From 13437174df7cd45873cf2d1d9c4c4277e2db8a5a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Sat, 10 Feb 2024 00:13:28 +0100
+Subject: [PATCH] common-trampoline: Ensure omission of frame-pointer
+
+Some architecture-specific implementations of the FETCH_LINKPTR
+(e.g. the one for x86) attempt to find the linkptr relative to the
+stack pointer. Therefore, they make assumption about the value of
+the SP at the point where the FETCH_LINKPTR code is executed. This
+means that we don't want the C compiler to mess with our SP.
+
+For this purpose, local variables in this function are currently
+declared using the register storage specifier. Additionally, we
+need to make sure that a frame pointer is /always/ omitted for
+this function. On x86 Alpine, the frame pointer is presently not
+omitted with GCC 13 when using -Os, therefore the tests segfault
+with -Os on Alpine presently.
+
+Fixes #52
+---
+ arch/common/common-trampoline.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/arch/common/common-trampoline.c b/arch/common/common-trampoline.c
+index 5b52327..41f994b 100644
+--- a/arch/common/common-trampoline.c
++++ b/arch/common/common-trampoline.c
+@@ -14,7 +14,19 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
++/* We need to make sure that the C compiler doesn't push any
++ * additional data to the stack frame. Otherwise, assumptions
++ * made by the architecture-specific implementation of the
++ * FETCH_LINKPTR() macro about the location of the linkptr,
++ * relative to the stack pointer, will not hold.
++ *
++ * Hence, we compile this function with -fomit-frame-pointer
++ * and use the register storage-class specifier for all local
++ * vars. Note that the latter is just a "suggestion" (see C99).
++ */
++
+ __attribute__ ((visibility ("hidden")))
++__attribute__ ((optimize ("omit-frame-pointer")))
+ void
+ libucontext_trampoline(void)
+ {
diff --git a/main/libucontext/APKBUILD b/main/libucontext/APKBUILD
index 49436bec959..25242d05f48 100644
--- a/main/libucontext/APKBUILD
+++ b/main/libucontext/APKBUILD
@@ -1,13 +1,15 @@
 # Maintainer: Ariadne Conill <ariadne@dereferenced.org>
 pkgname=libucontext
-pkgver=0.10
-pkgrel=0
+pkgver=1.2
+pkgrel=3
 pkgdesc="ucontext function implementations"
 url="https://github.com/kaniini/libucontext"
 arch="all"
 license="ISC"
-subpackages="$pkgname-dev"
-source="https://distfiles.dereferenced.org/libucontext/libucontext-$pkgver.tar.xz"
+subpackages="$pkgname-dev $pkgname-doc"
+makedepends="scdoc"
+source="https://distfiles.ariadne.space/libucontext/libucontext-$pkgver.tar.xz
+	0001-common-trampoline-Ensure-omission-of-frame-pointer.patch"
 
 case "$CTARGET_ARCH" in
 	arm*)		LIBUCONTEXT_ARCH="arm" ;;
@@ -17,6 +19,7 @@ esac
 
 build() {
 	make ARCH="$LIBUCONTEXT_ARCH"
+	make ARCH="$LIBUCONTEXT_ARCH" docs
 }
 
 check() {
@@ -24,7 +27,10 @@ check() {
 }
 
 package() {
-	make ARCH="$LIBUCONTEXT_ARCH" DESTDIR="$pkgdir" install
+	make ARCH="$LIBUCONTEXT_ARCH" DESTDIR="$pkgdir" install install_docs
 }
 
-sha512sums="ef04485f66edd94711a15681953aed12652ea3821036e6a5b10d1ba3c0371ffabd689c85ee2403bc6a94544932e64855d8f5412f46b50d8b5a934f70a771fcb1  libucontext-0.10.tar.xz"
+sha512sums="
+6603f2dcd87c4d9919c1726f2964632483e1a647733ff543d5935e3e2dac548adf320f1f9fb4c494691fe99fb393d64b15369f04d3783b2ca4c40b68c3d87865  libucontext-1.2.tar.xz
+4e797976943dcc98dbc2541a17e517da1b95ed50e0c730c547ccc604e682d1150e90c6bb29f601549b6a0bf4b7228e7a7d9883e97ea6bff4d12956df6b9a1195  0001-common-trampoline-Ensure-omission-of-frame-pointer.patch
+"
diff --git a/main/libunistring/APKBUILD b/main/libunistring/APKBUILD
index 5b48ce63adf..660d42c9511 100644
--- a/main/libunistring/APKBUILD
+++ b/main/libunistring/APKBUILD
@@ -1,22 +1,17 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libunistring
-pkgver=0.9.10
+pkgver=1.2
 pkgrel=0
 pkgdesc="Library for manipulating Unicode strings and C strings"
 url="https://www.gnu.org/software/libunistring/"
 arch="all"
 options="!check"  # Tests fail with musl locale library
-license="GPL-2.0+ OR LGPL-3.0+"
-depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-dev $pkgname-doc"
+license="GPL-2.0-or-later OR LGPL-3.0-or-later"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 source="https://ftp.gnu.org/gnu/libunistring/libunistring-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,15 +19,14 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--disable-static
+		--localstatedir=/var
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	rm -f "$pkgdir"/usr/lib/charset.alias
 }
 
-sha512sums="01dcab6e05ea4c33572bf96cc0558bcffbfc0e62fc86410cef06c1597a0073d5750525fe2dee4fdb39c9bd704557fcbab864f9645958108a2e07950bc539fe54  libunistring-0.9.10.tar.xz"
+sha512sums="
+5fbb5a0a864db73a6d18cdea7b31237da907fff0ef288f3a8db6ebdba8ef61ad8855e5fc780c2bbf632218d8fa59dd119734e5937ca64dc77f53f30f13b80b17  libunistring-1.2.tar.xz
+"
diff --git a/main/libunwind/APKBUILD b/main/libunwind/APKBUILD
index a9251ac20f1..5775db0fcd2 100644
--- a/main/libunwind/APKBUILD
+++ b/main/libunwind/APKBUILD
@@ -1,32 +1,25 @@
 # Contributor: Ben Pye <ben@curlybracket.co.uk>
-# Maintainer: Ben Pye <ben@curlybracket.co.uk>
+# Maintainer: Krassy Boykinov <kboykinov@teamcentrixx.com>
 pkgname=libunwind
-pkgver=1.3.1
+pkgver=1.8.1
 pkgrel=0
 pkgdesc="Portable and efficient C programming interface (API) to determine the call-chain of a program"
 url="https://www.nongnu.org/libunwind/"
 arch="all"
 license="MIT"
-options="!check" # v1.3.1 11 tests failing - https://github.com/libunwind/libunwind/issues/164
+options="!check" # v1.4.0 12 tests failing - https://github.com/libunwind/libunwind/issues/164
 depends_dev="libucontext-dev"
-makedepends="$depends_dev autoconf automake libtool linux-headers xz-dev"
+makedepends_build="autoconf automake libtool"
+makedepends_host="$depends_dev linux-headers xz-dev"
+makedepends="$makedepends_build $makedepends_host"
 subpackages="$pkgname-dbg $pkgname-static $pkgname-dev $pkgname-doc"
-source="https://download.savannah.gnu.org/releases/libunwind/libunwind-$pkgver.tar.gz
+source="https://github.com/libunwind/libunwind/releases/download/v$pkgver/libunwind-$pkgver.tar.gz
 	force-enable-man.patch
-	musl-mips-fix.patch
-	ppc64-musl.patch
-	fix-ppc64-libdir.patch
-	fix-test-coredump-unwind.patch
 	fix-libunwind-pc-in.patch
-	add-s390x.patch
 	"
 
-prepare() {
-	default_prepare
-	autoreconf -fi
-}
-
 build() {
+	# shellcheck disable=2046
 	LDFLAGS="$LDFLAGS -lucontext" CFLAGS="$CFLAGS -fno-stack-protector" \
 	./configure \
 		--build="$CBUILD" \
@@ -35,7 +28,8 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
-		--enable-cxx-exceptions
+		--enable-cxx-exceptions \
+		$(want_check || echo --disable-tests)
 	make
 }
 
@@ -47,11 +41,8 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="3110d0aed4f5c781ef1ff72c9337e59793c02c42066209a4ac44f50eff1c0b0e02a5ff9f66891e62016de14af065a47975763970b839b700c0ff2e9f415c8def  libunwind-1.3.1.tar.gz
-de3cefd8a2fa9ae3eabf052cb94a1fdde4f9b7e85af839220592269f7a885470572f67ecf6d773129de8d82916fbcbdda44b541f4eeec84744c54f230c36b6a1  force-enable-man.patch
-a1751b80f2c42a741f0a7778f758c7afe42653bf61a353edf38182d731008ed7bd0b8a41bf466aa83275b22241bfcd4f6051055489e3cc87fcd7dd4488bc089d  musl-mips-fix.patch
-3b59620c758784faa6d66c8a0a2e49ced743b7ebff6a7e461e40aea653ef9f8cbd8948fb766c63acdd625cb506601c102f133074cef9ef150e9bb8b81584fe9d  ppc64-musl.patch
-8b66dc1d62e9fd120d136daed743c294d3d586b3da9c527fb65accc3db4fe810e87a176f0a0134c43d913cc33ddfb634039842a289c132a087f3700ee407fe50  fix-ppc64-libdir.patch
-7be9e5118f96ea7c344572cb5146f1711cde23eaaf5e72bb17f1fc752d22cf022e56b42747ba8003ec9e141d14cc0c650a7e2a2df3999c66acc4833dbb3df6fc  fix-test-coredump-unwind.patch
-68f7e28c6eb6560ebb2e26737913bff9c9f868ec89e2ad0682516e1c78e98698c73d40d6a3765290df2e1280e00c5691f0d8c21cb15263ad8e513f607906ca76  fix-libunwind-pc-in.patch
-4a8ef2159640521f2feeec7c4d0f94efab2f4f8e4208baa98216b6c79c05841dfb9f7a7dd68c68d0d5b90de67a290b14a277d774c01dac12a44adc8b126ac8b2  add-s390x.patch"
+sha512sums="
+aba7b578c1b8cbe78f05b64e154f3530525f8a34668b2a9f1ee6acb4b22c857befe34ad4e9e8cca99dbb66689d41bc72060a8f191bd8be232725d342809431b3  libunwind-1.8.1.tar.gz
+2d210a2d8e960610e515d8cf9ebd388faa30a4f35613cae6a40a06e1ca1267540b974e96a9d94c02c465d47e114d3d3d6cbad72b4c1dbd0eb53d812970b1712d  force-enable-man.patch
+ab5d44e9d3aaf32e3119fe79389e5dfcdc859c78cfda8400e54ee29fd1cdf04b99e2686caf18ab0b76ac94f861861d69a5cf740d46967af9c630095485523f1c  fix-libunwind-pc-in.patch
+"
diff --git a/main/libunwind/add-s390x.patch b/main/libunwind/add-s390x.patch
deleted file mode 100644
index 78f18d1bafd..00000000000
--- a/main/libunwind/add-s390x.patch
+++ /dev/null
@@ -1,2652 +0,0 @@
-Backported from master https://github.com/libunwind/libunwind
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -175,6 +175,7 @@ AM_CONDITIONAL(ARCH_PPC32, test x$target
- AM_CONDITIONAL(ARCH_PPC64, test x$target_arch = xppc64)
- AM_CONDITIONAL(ARCH_SH, test x$target_arch = xsh)
- AM_CONDITIONAL(ARCH_TILEGX, test x$target_arch = xtilegx)
-+AM_CONDITIONAL(ARCH_S390X, test x$target_arch = xs390x)
- AM_CONDITIONAL(OS_LINUX, expr x$target_os : xlinux >/dev/null)
- AM_CONDITIONAL(OS_HPUX, expr x$target_os : xhpux >/dev/null)
- AM_CONDITIONAL(OS_FREEBSD, expr x$target_os : xfreebsd >/dev/null)
-@@ -183,7 +184,7 @@ AM_CONDITIONAL(OS_QNX, expr x$target_os
- AC_MSG_CHECKING([for ELF helper width])
- case "${target_arch}" in
- (arm|hppa|ppc32|x86|sh) use_elf32=yes; AC_MSG_RESULT([32]);;
--(aarch64|ia64|ppc64|x86_64|tilegx)  use_elf64=yes; AC_MSG_RESULT([64]);;
-+(aarch64|ia64|ppc64|x86_64|s390x|tilegx)  use_elf64=yes; AC_MSG_RESULT([64]);;
- (mips)                 use_elfxx=yes; AC_MSG_RESULT([xx]);;
- *)                     AC_MSG_ERROR([Unknown ELF target: ${target_arch}])
- esac
---- a/include/libunwind.h.in
-+++ b/include/libunwind.h.in
-@@ -25,6 +25,8 @@
- # include "libunwind-x86_64.h"
- #elif defined __tilegx__
- # include "libunwind-tilegx.h"
-+#elif defined __s390x__
-+# include "libunwind-s390x.h"
- #else
- # error "Unsupported arch"
- #endif
---- a/include/libunwind-s390x.h
-+++ b/include/libunwind-s390x.h
-@@ -0,0 +1,144 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (C) 2002-2004 Hewlett-Packard Co
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+   Modified for s390x by Michael Munday <mike.munday@ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#ifndef LIBUNWIND_H
-+#define LIBUNWIND_H
-+
-+#if defined(__cplusplus) || defined(c_plusplus)
-+extern "C" {
-+#endif
-+
-+#include <sys/types.h>
-+#include <inttypes.h>
-+#include <ucontext.h>
-+
-+#define UNW_TARGET              s390x
-+#define UNW_TARGET_S390X        1
-+
-+#define _U_TDEP_QP_TRUE 0       /* see libunwind-dynamic.h  */
-+
-+/* This needs to be big enough to accommodate "struct cursor", while
-+   leaving some slack for future expansion.  Changing this value will
-+   require recompiling all users of this library.  Stack allocation is
-+   relatively cheap and unwind-state copying is relatively rare, so we
-+   want to err on making it rather too big than too small.  */
-+#define UNW_TDEP_CURSOR_LEN     384
-+
-+typedef uint64_t unw_word_t;
-+typedef int64_t unw_sword_t;
-+
-+typedef double unw_tdep_fpreg_t;
-+
-+typedef enum
-+  {
-+    /* general purpose registers */
-+    UNW_S390X_R0,
-+    UNW_S390X_R1,
-+    UNW_S390X_R2,
-+    UNW_S390X_R3,
-+    UNW_S390X_R4,
-+    UNW_S390X_R5,
-+    UNW_S390X_R6,
-+    UNW_S390X_R7,
-+    UNW_S390X_R8,
-+    UNW_S390X_R9,
-+    UNW_S390X_R10,
-+    UNW_S390X_R11,
-+    UNW_S390X_R12,
-+    UNW_S390X_R13,
-+    UNW_S390X_R14,
-+    UNW_S390X_R15,
-+
-+    /* floating point registers */
-+    UNW_S390X_F0,
-+    UNW_S390X_F1,
-+    UNW_S390X_F2,
-+    UNW_S390X_F3,
-+    UNW_S390X_F4,
-+    UNW_S390X_F5,
-+    UNW_S390X_F6,
-+    UNW_S390X_F7,
-+    UNW_S390X_F8,
-+    UNW_S390X_F9,
-+    UNW_S390X_F10,
-+    UNW_S390X_F11,
-+    UNW_S390X_F12,
-+    UNW_S390X_F13,
-+    UNW_S390X_F14,
-+    UNW_S390X_F15,
-+
-+    /* PSW */
-+    UNW_S390X_IP,
-+
-+    UNW_TDEP_LAST_REG = UNW_S390X_IP,
-+
-+    /* TODO: access, vector registers */
-+
-+    /* frame info (read-only) */
-+    UNW_S390X_CFA,
-+
-+    UNW_TDEP_IP = UNW_S390X_IP,
-+    UNW_TDEP_SP = UNW_S390X_R15,
-+
-+    /* TODO: placeholders */
-+    UNW_TDEP_EH = UNW_S390X_R0,
-+  }
-+s390x_regnum_t;
-+
-+#define UNW_TDEP_NUM_EH_REGS    2       /* XXX Not sure what this means */
-+
-+typedef struct unw_tdep_save_loc
-+  {
-+    /* Additional target-dependent info on a save location.  */
-+    char unused;
-+  }
-+unw_tdep_save_loc_t;
-+
-+/* On s390x, we can directly use ucontext_t as the unwind context.  */
-+typedef ucontext_t unw_tdep_context_t;
-+
-+typedef struct
-+  {
-+    /* no s390x-specific auxiliary proc-info */
-+    char unused;
-+  }
-+unw_tdep_proc_info_t;
-+
-+#include "libunwind-dynamic.h"
-+#include "libunwind-common.h"
-+
-+#define unw_tdep_getcontext             UNW_ARCH_OBJ(getcontext)
-+#define unw_tdep_is_fpreg               UNW_ARCH_OBJ(is_fpreg)
-+
-+extern int unw_tdep_getcontext (unw_tdep_context_t *);
-+extern int unw_tdep_is_fpreg (int);
-+
-+#if defined(__cplusplus) || defined(c_plusplus)
-+}
-+#endif
-+
-+#endif /* LIBUNWIND_H */
---- a/include/tdep/libunwind_i.h.in
-+++ b/include/tdep/libunwind_i.h.in
-@@ -25,6 +25,8 @@
- # include "tdep-x86_64/libunwind_i.h"
- #elif defined __tilegx__
- # include "tdep-tilegx/libunwind_i.h"
-+#elif defined __s390x__
-+# include "tdep-s390x/libunwind_i.h"
- #else
- # error "Unsupported arch"
- #endif
---- a/include/tdep-s390x/dwarf-config.h
-+++ b/include/tdep-s390x/dwarf-config.h
-@@ -0,0 +1,52 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (c) 2003, 2005 Hewlett-Packard Development Company, L.P.
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+   Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+/* copy of include/tdep-x86/dwarf-config.h, modified slightly for x86-64
-+   some consolidation is possible here */
-+
-+#ifndef dwarf_config_h
-+#define dwarf_config_h
-+
-+/* derived from DWARF register mappings in Z ELF ABI */
-+#define DWARF_NUM_PRESERVED_REGS        66
-+#define DWARF_REGNUM_MAP_LENGTH         DWARF_NUM_PRESERVED_REGS
-+
-+/* Return TRUE if the ADDR_SPACE uses big-endian byte-order.  */
-+#define dwarf_is_big_endian(addr_space) 1
-+
-+/* Convert a pointer to a dwarf_cursor structure to a pointer to
-+   unw_cursor_t.  */
-+#define dwarf_to_cursor(c)      ((unw_cursor_t *) (c))
-+
-+typedef struct dwarf_loc
-+  {
-+    unw_word_t val;
-+    unw_word_t type;            /* see S390X_LOC_TYPE_* macros.  */
-+  }
-+dwarf_loc_t;
-+
-+#endif /* dwarf_config_h */
---- a/include/tdep-s390x/jmpbuf.h
-+++ b/include/tdep-s390x/jmpbuf.h
-@@ -0,0 +1,35 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (C) 2004 Hewlett-Packard Co
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#if defined __linux__
-+
-+/* Use glibc's jump-buffer indices; NPTL peeks at SP: */
-+
-+#define JB_SP           9  // __gregs[9]
-+#define JB_RP           8  // __gregs[8]
-+#define JB_MASK_SAVED   18 // __mask_was_saved
-+#define JB_MASK         19 // __saved_mask
-+
-+#endif
---- a/include/tdep-s390x/libunwind_i.h
-+++ b/include/tdep-s390x/libunwind_i.h
-@@ -0,0 +1,262 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (C) 2002-2005 Hewlett-Packard Co
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+   Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#ifndef S390X_LIBUNWIND_I_H
-+#define S390X_LIBUNWIND_I_H
-+
-+/* Target-dependent definitions that are internal to libunwind but need
-+   to be shared with target-independent code.  */
-+
-+#include <stdlib.h>
-+#include <libunwind.h>
-+
-+#include "elf64.h"
-+#include "mempool.h"
-+#include "dwarf.h"
-+
-+struct unw_addr_space
-+  {
-+    struct unw_accessors acc;
-+    unw_caching_policy_t caching_policy;
-+#ifdef HAVE_ATOMIC_OPS_H
-+    AO_t cache_generation;
-+#else
-+    uint32_t cache_generation;
-+#endif
-+    unw_word_t dyn_generation;          /* see dyn-common.h */
-+    unw_word_t dyn_info_list_addr;      /* (cached) dyn_info_list_addr */
-+    struct dwarf_rs_cache global_cache;
-+    struct unw_debug_frame_list *debug_frames;
-+   };
-+
-+struct cursor
-+  {
-+    struct dwarf_cursor dwarf;          /* must be first */
-+
-+    /* Format of sigcontext structure and address at which it is
-+       stored: */
-+    enum
-+      {
-+        S390X_SCF_NONE              = 0, /* no signal frame encountered */
-+        S390X_SCF_LINUX_SIGFRAME    = 1, /* Linux struct sigcontext */
-+        S390X_SCF_LINUX_RT_SIGFRAME = 2, /* Linux ucontext_t */
-+      }
-+    sigcontext_format;
-+    unw_word_t sigcontext_addr;
-+    unw_word_t sigcontext_sp;
-+    unw_word_t sigcontext_pc;
-+    int validate;
-+    ucontext_t *uc;
-+  };
-+
-+static inline ucontext_t *
-+dwarf_get_uc(const struct dwarf_cursor *cursor)
-+{
-+  const struct cursor *c = (struct cursor *) cursor->as_arg;
-+  return c->uc;
-+}
-+
-+#define DWARF_GET_LOC(l)        ((l).val)
-+# define DWARF_LOC_TYPE_MEM     (0 << 0)
-+# define DWARF_LOC_TYPE_FP      (1 << 0)
-+# define DWARF_LOC_TYPE_REG     (1 << 1)
-+# define DWARF_LOC_TYPE_VAL     (1 << 2)
-+
-+# define DWARF_IS_REG_LOC(l)    (((l).type & DWARF_LOC_TYPE_REG) != 0)
-+# define DWARF_IS_FP_LOC(l)     (((l).type & DWARF_LOC_TYPE_FP) != 0)
-+# define DWARF_IS_MEM_LOC(l)    ((l).type == DWARF_LOC_TYPE_MEM)
-+# define DWARF_IS_VAL_LOC(l)    (((l).type & DWARF_LOC_TYPE_VAL) != 0)
-+
-+# define DWARF_LOC(r, t)        ((dwarf_loc_t) { .val = (r), .type = (t) })
-+# define DWARF_VAL_LOC(c,v)     DWARF_LOC ((v), DWARF_LOC_TYPE_VAL)
-+# define DWARF_MEM_LOC(c,m)     DWARF_LOC ((m), DWARF_LOC_TYPE_MEM)
-+
-+#ifdef UNW_LOCAL_ONLY
-+# define DWARF_NULL_LOC         DWARF_LOC (0, 0)
-+# define DWARF_IS_NULL_LOC(l)   (DWARF_GET_LOC (l) == 0)
-+# define DWARF_REG_LOC(c,r)     (DWARF_LOC((unw_word_t)                      \
-+                                 tdep_uc_addr(dwarf_get_uc(c), (r)), 0))
-+# define DWARF_FPREG_LOC(c,r)   (DWARF_LOC((unw_word_t)                      \
-+                                 tdep_uc_addr(dwarf_get_uc(c), (r)), 0))
-+
-+#else /* !UNW_LOCAL_ONLY */
-+
-+# define DWARF_NULL_LOC         DWARF_LOC (0, 0)
-+# define DWARF_IS_NULL_LOC(l)                                           \
-+                ({ dwarf_loc_t _l = (l); _l.val == 0 && _l.type == 0; })
-+# define DWARF_REG_LOC(c,r)     DWARF_LOC((r), DWARF_LOC_TYPE_REG)
-+# define DWARF_FPREG_LOC(c,r)   DWARF_LOC((r), (DWARF_LOC_TYPE_REG      \
-+                                                | DWARF_LOC_TYPE_FP))
-+
-+#endif /* !UNW_LOCAL_ONLY */
-+
-+static inline int
-+dwarf_getfp (struct dwarf_cursor *c, dwarf_loc_t loc, unw_fpreg_t *val)
-+{
-+  assert(sizeof(unw_fpreg_t) == sizeof(unw_word_t));
-+
-+  if (DWARF_IS_NULL_LOC (loc))
-+    return -UNW_EBADREG;
-+
-+  if (DWARF_IS_FP_LOC (loc))
-+    return (*c->as->acc.access_fpreg) (c->as, DWARF_GET_LOC (loc), val,
-+                                       0, c->as_arg);
-+  /* FPRs may be saved in GPRs */
-+  if (DWARF_IS_REG_LOC (loc))
-+    return (*c->as->acc.access_reg) (c->as, DWARF_GET_LOC (loc), (unw_word_t*)val,
-+                                     0, c->as_arg);
-+  if (DWARF_IS_MEM_LOC (loc))
-+    return (*c->as->acc.access_mem) (c->as, DWARF_GET_LOC (loc), (unw_word_t*)val,
-+                                     0, c->as_arg);
-+  assert(DWARF_IS_VAL_LOC (loc));
-+  *val = *(unw_fpreg_t*) DWARF_GET_LOC (loc);
-+  return 0;
-+}
-+
-+static inline int
-+dwarf_putfp (struct dwarf_cursor *c, dwarf_loc_t loc, unw_fpreg_t val)
-+{
-+  assert(sizeof(unw_fpreg_t) == sizeof(unw_word_t));
-+  assert(!DWARF_IS_VAL_LOC (loc));
-+
-+  if (DWARF_IS_NULL_LOC (loc))
-+    return -UNW_EBADREG;
-+
-+  if (DWARF_IS_FP_LOC (loc))
-+    return (*c->as->acc.access_fpreg) (c->as, DWARF_GET_LOC (loc), &val,
-+                                       1, c->as_arg);
-+  /* FPRs may be saved in GPRs */
-+  if (DWARF_IS_REG_LOC (loc))
-+    return (*c->as->acc.access_reg) (c->as, DWARF_GET_LOC (loc), (unw_word_t*) &val,
-+                                     1, c->as_arg);
-+
-+  assert(DWARF_IS_MEM_LOC (loc));
-+  return (*c->as->acc.access_mem) (c->as, DWARF_GET_LOC (loc), (unw_word_t*) &val,
-+                                   1, c->as_arg);
-+}
-+
-+static inline int
-+dwarf_get (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t *val)
-+{
-+  assert(sizeof(unw_fpreg_t) == sizeof(unw_word_t));
-+
-+  if (DWARF_IS_NULL_LOC (loc))
-+    return -UNW_EBADREG;
-+
-+  if (DWARF_IS_REG_LOC (loc))
-+    return (*c->as->acc.access_reg) (c->as, DWARF_GET_LOC (loc), val,
-+                                     0, c->as_arg);
-+  if (DWARF_IS_MEM_LOC (loc))
-+    return (*c->as->acc.access_mem) (c->as, DWARF_GET_LOC (loc), val,
-+                                     0, c->as_arg);
-+  /* GPRs may be saved in FPRs */
-+  if (DWARF_IS_FP_LOC (loc))
-+    return (*c->as->acc.access_fpreg) (c->as, DWARF_GET_LOC (loc), (unw_fpreg_t*)val,
-+                                       0, c->as_arg);
-+  assert(DWARF_IS_VAL_LOC (loc));
-+  *val = DWARF_GET_LOC (loc);
-+  return 0;
-+}
-+
-+static inline int
-+dwarf_put (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t val)
-+{
-+  assert(sizeof(unw_fpreg_t) == sizeof(unw_word_t));
-+  assert(!DWARF_IS_VAL_LOC (loc));
-+
-+  if (DWARF_IS_NULL_LOC (loc))
-+    return -UNW_EBADREG;
-+
-+  if (DWARF_IS_REG_LOC (loc))
-+    return (*c->as->acc.access_reg) (c->as, DWARF_GET_LOC (loc), &val,
-+                                     1, c->as_arg);
-+  /* GPRs may be saved in FPRs */
-+  if (DWARF_IS_FP_LOC (loc))
-+    return (*c->as->acc.access_fpreg) (c->as, DWARF_GET_LOC (loc), (unw_fpreg_t*) &val,
-+                                       1, c->as_arg);
-+
-+  assert(DWARF_IS_MEM_LOC (loc));
-+  return (*c->as->acc.access_mem) (c->as, DWARF_GET_LOC (loc), &val,
-+                                   1, c->as_arg);
-+}
-+
-+#define tdep_getcontext_trace           unw_getcontext
-+#define tdep_init_done                  UNW_OBJ(init_done)
-+#define tdep_init_mem_validate          UNW_OBJ(init_mem_validate)
-+#define tdep_init                       UNW_OBJ(init)
-+/* Platforms that support UNW_INFO_FORMAT_TABLE need to define
-+   tdep_search_unwind_table.  */
-+#define tdep_search_unwind_table        dwarf_search_unwind_table
-+#define tdep_find_unwind_table          dwarf_find_unwind_table
-+#define tdep_get_elf_image              UNW_ARCH_OBJ(get_elf_image)
-+#define tdep_get_exe_image_path         UNW_ARCH_OBJ(get_exe_image_path)
-+#define tdep_access_reg                 UNW_OBJ(access_reg)
-+#define tdep_access_fpreg               UNW_OBJ(access_fpreg)
-+#define tdep_fetch_frame(c,ip,n)        do {} while(0)
-+#define tdep_cache_frame(c)             0
-+#define tdep_reuse_frame(c,rs)          do {} while(0)
-+#define tdep_stash_frame(cs,rs)         do {} while(0)
-+#define tdep_trace(cur,addr,n)          (-UNW_ENOINFO)
-+#define tdep_uc_addr                    UNW_OBJ(uc_addr)
-+
-+#ifdef UNW_LOCAL_ONLY
-+# define tdep_find_proc_info(c,ip,n)                            \
-+        dwarf_find_proc_info((c)->as, (ip), &(c)->pi, (n),      \
-+                                       (c)->as_arg)
-+# define tdep_put_unwind_info(as,pi,arg)                \
-+        dwarf_put_unwind_info((as), (pi), (arg))
-+#else
-+# define tdep_find_proc_info(c,ip,n)                                    \
-+        (*(c)->as->acc.find_proc_info)((c)->as, (ip), &(c)->pi, (n),    \
-+                                       (c)->as_arg)
-+# define tdep_put_unwind_info(as,pi,arg)                        \
-+        (*(as)->acc.put_unwind_info)((as), (pi), (arg))
-+#endif
-+
-+#define tdep_get_as(c)                  ((c)->dwarf.as)
-+#define tdep_get_as_arg(c)              ((c)->dwarf.as_arg)
-+#define tdep_get_ip(c)                  ((c)->dwarf.ip)
-+#define tdep_big_endian(as)             1
-+
-+extern int tdep_init_done;
-+
-+extern void tdep_init (void);
-+extern void tdep_init_mem_validate (void);
-+extern int tdep_search_unwind_table (unw_addr_space_t as, unw_word_t ip,
-+                                     unw_dyn_info_t *di, unw_proc_info_t *pi,
-+                                     int need_unwind_info, void *arg);
-+extern void *tdep_uc_addr (unw_tdep_context_t *uc, int reg);
-+extern int tdep_get_elf_image (struct elf_image *ei, pid_t pid, unw_word_t ip,
-+                               unsigned long *segbase, unsigned long *mapoff,
-+                               char *path, size_t pathlen);
-+extern void tdep_get_exe_image_path (char *path);
-+extern int tdep_access_reg (struct cursor *c, unw_regnum_t reg,
-+                            unw_word_t *valp, int write);
-+extern int tdep_access_fpreg (struct cursor *c, unw_regnum_t reg,
-+                              unw_fpreg_t *valp, int write);
-+
-+#endif /* S390X_LIBUNWIND_I_H */
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -41,6 +41,9 @@ endif
- if ARCH_SH
- include_HEADERS += include/libunwind-sh.h
- endif
-+if ARCH_S390X
-+include_HEADERS += include/libunwind-s390x.h
-+endif
- 
- if !REMOTE_ONLY
- include_HEADERS += include/libunwind.h include/unwind.h
-@@ -84,6 +87,8 @@ noinst_HEADERS = include/dwarf.h include
- 	include/tdep-ppc64/jmpbuf.h include/tdep-ppc64/libunwind_i.h	\
- 	include/tdep-sh/dwarf-config.h					\
- 	include/tdep-sh/jmpbuf.h include/tdep-sh/libunwind_i.h		\
-+	include/tdep-s390x/dwarf-config.h				\
-+	include/tdep-s390x/jmpbuf.h include/tdep-s390x/libunwind_i.h	\
- 	include/tdep/libunwind_i.h					\
- 	include/tdep/jmpbuf.h include/tdep/dwarf-config.h
- 
---- a/src/coredump/_UCD_access_reg_linux.c
-+++ b/src/coredump/_UCD_access_reg_linux.c
-@@ -54,6 +54,9 @@ _UCD_access_reg (unw_addr_space_t as,
- #elif defined(UNW_TARGET_TILEGX)
-   if (regnum > UNW_TILEGX_CFA)
-     goto badreg;
-+#elif defined(UNW_TARGET_S390X)
-+  if (regnum > UNW_S390X_R15)
-+    goto badreg;
- #else
- #if defined(UNW_TARGET_MIPS)
-   static const uint8_t remap_regs[] =
---- a/src/dwarf/Gparser.c
-+++ b/src/dwarf/Gparser.c
-@@ -831,6 +831,14 @@ apply_reg_state (struct dwarf_cursor *c,
-           break;
- 
-         case DWARF_WHERE_REG:
-+#ifdef __s390x__
-+          /* GPRs can be saved in FPRs on s390x */
-+          if (unw_is_fpreg (dwarf_to_unw_regnum (rs->reg.val[i])))
-+            {
-+              new_loc[i] = DWARF_FPREG_LOC (c, dwarf_to_unw_regnum (rs->reg.val[i]));
-+              break;
-+            }
-+#endif
-           new_loc[i] = DWARF_REG_LOC (c, dwarf_to_unw_regnum (rs->reg.val[i]));
-           break;
- 
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -463,6 +463,30 @@ libunwind_sh_la_SOURCES_sh = $(libunwind
- 	sh/Gglobal.c sh/Ginit.c sh/Ginit_local.c sh/Ginit_remote.c	\
- 	sh/Gis_signal_frame.c sh/Gregs.c sh/Gresume.c sh/Gstep.c
- 
-+# The list of files that go both into libunwind and libunwind-s390x:
-+noinst_HEADERS += s390x/init.h s390x/unwind_i.h
-+libunwind_la_SOURCES_s390x_common = $(libunwind_la_SOURCES_common)	\
-+	s390x/is_fpreg.c s390x/regname.c
-+
-+# The list of files that go into libunwind:
-+libunwind_la_SOURCES_s390x = $(libunwind_la_SOURCES_s390x_common)	    \
-+	$(libunwind_la_SOURCES_local)					    \
-+	s390x/Lapply_reg_state.c s390x/Lreg_states_iterate.c		    \
-+	s390x/Lcreate_addr_space.c s390x/Lget_save_loc.c s390x/Lglobal.c    \
-+	s390x/Linit.c s390x/Linit_local.c s390x/Linit_remote.c	            \
-+	s390x/Lget_proc_info.c s390x/Lregs.c s390x/Lresume.c		    \
-+	s390x/Lis_signal_frame.c s390x/Lstep.c				    \
-+	s390x/getcontext.S s390x/setcontext.S
-+
-+# The list of files that go into libunwind-s390x:
-+libunwind_s390x_la_SOURCES_s390x = $(libunwind_la_SOURCES_s390x_common)     \
-+	$(libunwind_la_SOURCES_generic)					    \
-+	s390x/Gapply_reg_state.c s390x/Greg_states_iterate.c	            \
-+	s390x/Gcreate_addr_space.c s390x/Gget_save_loc.c s390x/Gglobal.c    \
-+	s390x/Ginit.c s390x/Ginit_local.c s390x/Ginit_remote.c	            \
-+	s390x/Gget_proc_info.c s390x/Gregs.c s390x/Gresume.c		    \
-+	s390x/Gis_signal_frame.c s390x/Gstep.c
-+
- if REMOTE_ONLY
- install-exec-hook:
- #	Nothing to do here....
-@@ -662,7 +686,19 @@ if !REMOTE_ONLY
-  libunwind_sh_la_LIBADD += libunwind.la -lc
- endif
-  libunwind_setjmp_la_SOURCES += sh/siglongjmp.S
-+else
-+if ARCH_S390X
-+ lib_LTLIBRARIES += libunwind-s390x.la
-+ libunwind_la_SOURCES = $(libunwind_la_SOURCES_s390x)
-+ libunwind_s390x_la_SOURCES = $(libunwind_s390x_la_SOURCES_s390x)
-+ libunwind_s390x_la_LDFLAGS = $(COMMON_SO_LDFLAGS) -version-info $(SOVERSION)
-+ libunwind_s390x_la_LIBADD = libunwind-dwarf-generic.la
-+ libunwind_s390x_la_LIBADD += libunwind-elf64.la
-+if !REMOTE_ONLY
-+ libunwind_s390x_la_LIBADD += libunwind.la -lc
-+endif
- 
-+endif # ARCH_S390X
- endif # ARCH_SH
- endif # ARCH_PPC64
- endif # ARCH_PPC32
---- a/src/ptrace/_UPT_reg_offset.c
-+++ b/src/ptrace/_UPT_reg_offset.c
-@@ -632,6 +632,40 @@ const int _UPT_reg_offset[UNW_REG_LAST +
-     [UNW_TILEGX_R54]    = 0x1b0,
-     [UNW_TILEGX_R55]    = 0x1b8,
-     [UNW_TILEGX_PC]     = 0x1a0
-+#elif defined(UNW_TARGET_S390X)
-+    [UNW_S390X_R0]      = 0x10,
-+    [UNW_S390X_R1]      = 0x18,
-+    [UNW_S390X_R2]      = 0x20,
-+    [UNW_S390X_R3]      = 0x28,
-+    [UNW_S390X_R4]      = 0x30,
-+    [UNW_S390X_R5]      = 0x38,
-+    [UNW_S390X_R6]      = 0x40,
-+    [UNW_S390X_R7]      = 0x48,
-+    [UNW_S390X_R8]      = 0x50,
-+    [UNW_S390X_R9]      = 0x58,
-+    [UNW_S390X_R10]     = 0x60,
-+    [UNW_S390X_R11]     = 0x68,
-+    [UNW_S390X_R12]     = 0x70,
-+    [UNW_S390X_R13]     = 0x78,
-+    [UNW_S390X_R14]     = 0x80,
-+    [UNW_S390X_R15]     = 0x88,
-+    [UNW_S390X_F0]      = 0xe0,
-+    [UNW_S390X_F1]      = 0xe8,
-+    [UNW_S390X_F2]      = 0xf0,
-+    [UNW_S390X_F3]      = 0xf8,
-+    [UNW_S390X_F4]      = 0x100,
-+    [UNW_S390X_F5]      = 0x108,
-+    [UNW_S390X_F6]      = 0x110,
-+    [UNW_S390X_F7]      = 0x118,
-+    [UNW_S390X_F8]      = 0x120,
-+    [UNW_S390X_F9]      = 0x128,
-+    [UNW_S390X_F10]     = 0x130,
-+    [UNW_S390X_F11]     = 0x138,
-+    [UNW_S390X_F12]     = 0x140,
-+    [UNW_S390X_F13]     = 0x148,
-+    [UNW_S390X_F14]     = 0x150,
-+    [UNW_S390X_F15]     = 0x150,
-+    [UNW_S390X_IP]      = 0x08
- #else
- # error Fix me.
- #endif
---- a/src/s390x/Gapply_reg_state.c
-+++ b/src/s390x/Gapply_reg_state.c
-@@ -0,0 +1,37 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (c) 2002-2003 Hewlett-Packard Development Company, L.P.
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+   Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#include "unwind_i.h"
-+
-+int
-+unw_apply_reg_state (unw_cursor_t *cursor,
-+		     void *reg_states_data)
-+{
-+  struct cursor *c = (struct cursor *) cursor;
-+
-+  return dwarf_apply_reg_state (&c->dwarf, (dwarf_reg_state_t *)reg_states_data);
-+}
---- a/src/s390x/Gcreate_addr_space.c
-+++ b/src/s390x/Gcreate_addr_space.c
-@@ -0,0 +1,62 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (C) 2003 Hewlett-Packard Co
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+   Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
-+   Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com>
-+   Modified for s390x by Michael Munday <mike.munday@ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#include <stdlib.h>
-+
-+#include "unwind_i.h"
-+
-+#if defined(_BIG_ENDIAN) && !defined(__BIG_ENDIAN)
-+#define __BIG_ENDIAN _BIG_ENDIAN
-+#endif
-+
-+unw_addr_space_t
-+unw_create_addr_space (unw_accessors_t *a, int byte_order)
-+{
-+#ifdef UNW_LOCAL_ONLY
-+  return NULL;
-+#else
-+  unw_addr_space_t as;
-+
-+  /*
-+   * s390x supports only big-endian.
-+   */
-+  if (byte_order != 0 && byte_order != __BIG_ENDIAN)
-+    return NULL;
-+
-+  as = malloc (sizeof (*as));
-+  if (!as)
-+    return NULL;
-+
-+  memset (as, 0, sizeof (*as));
-+
-+  as->acc = *a;
-+
-+  return as;
-+#endif
-+}
---- a/src/s390x/getcontext.S
-+++ b/src/s390x/getcontext.S
-@@ -0,0 +1,74 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (C) 2008 Google, Inc
-+	Contributed by Paul Pluzhnikov <ppluzhnikov@google.com>
-+   Copyright (C) 2010 Konstantin Belousov <kib@freebsd.org>
-+   Copyright (C) 2017 IBM
-+
-+   Modified for s390x by Michael Munday <mike.munday@ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+// int _Us390x_getcontext (unw_tdep_context_t *ucp)
-+
-+	.global _Us390x_getcontext
-+	.type _Us390x_getcontext, @function
-+_Us390x_getcontext:
-+	.cfi_startproc
-+
-+	// Save the minimal set of registers required to restore the
-+	// context. Generally speaking this is just the preserved
-+	// registers but we've also saved the parameter registers
-+	// so that return values can be modified too.
-+
-+	// save PSW address
-+	// (not strictly needed but makes other code simpler)
-+	stg   %r14,0x30(%r2)
-+
-+	// floating point parameters (not strictly needed)
-+	std   %f0,0x100(%r2)
-+	std   %f2,0x110(%r2)
-+	std   %f4,0x120(%r2)
-+	std   %f6,0x130(%r2)
-+
-+	// floating point preserved registers
-+	stfpc 0xf8(%r2)
-+	std   %f8,0x140(%r2)
-+	std   %f9,0x148(%r2)
-+	std   %f10,0x150(%r2)
-+	std   %f11,0x158(%r2)
-+	std   %f12,0x160(%r2)
-+	std   %f13,0x168(%r2)
-+	std   %f14,0x170(%r2)
-+	std   %f15,0x178(%r2)
-+
-+	// preserved registers and parameters
-+	lgr   %r1,%r2
-+	lghi  %r2,0
-+	stmg  %r2,%r15,0x48(%r1)
-+
-+	br    %r14
-+
-+	.cfi_endproc
-+	.size _Us390x_getcontext, . - _Us390x_getcontext
-+
-+	// We do not need executable stack.
-+	.section        .note.GNU-stack,"",@progbits
---- a/src/s390x/Gget_proc_info.c
-+++ b/src/s390x/Gget_proc_info.c
-@@ -0,0 +1,48 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (c) 2002-2003 Hewlett-Packard Development Company, L.P.
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+   Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#include "unwind_i.h"
-+
-+int
-+unw_get_proc_info (unw_cursor_t *cursor, unw_proc_info_t *pi)
-+{
-+  struct cursor *c = (struct cursor *) cursor;
-+
-+  if (dwarf_make_proc_info (&c->dwarf) < 0)
-+    {
-+      /* On x86-64, some key routines such as _start() and _dl_start()
-+         are missing DWARF unwind info.  We don't want to fail in that
-+         case, because those frames are uninteresting and just mark
-+         the end of the frame-chain anyhow.  */
-+      memset (pi, 0, sizeof (*pi));
-+      pi->start_ip = c->dwarf.ip;
-+      pi->end_ip = c->dwarf.ip + 1;
-+      return 0;
-+    }
-+  *pi = c->dwarf.pi;
-+  return 0;
-+}
---- a/src/s390x/Gget_save_loc.c
-+++ b/src/s390x/Gget_save_loc.c
-@@ -0,0 +1,86 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (C) 2004 Hewlett-Packard Co
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+   Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
-+   Modified for s390x by Michael Munday <mike.munday@ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#include "unwind_i.h"
-+
-+int
-+unw_get_save_loc (unw_cursor_t *cursor, int reg, unw_save_loc_t *sloc)
-+{
-+  struct cursor *c = (struct cursor *) cursor;
-+  dwarf_loc_t loc;
-+
-+  loc = DWARF_NULL_LOC;         /* default to "not saved" */
-+
-+  switch (reg)
-+    {
-+    case UNW_S390X_R6:
-+    case UNW_S390X_R7:
-+    case UNW_S390X_R8:
-+    case UNW_S390X_R9:
-+    case UNW_S390X_R10:
-+    case UNW_S390X_R11:
-+    case UNW_S390X_R12:
-+    case UNW_S390X_R13:
-+    case UNW_S390X_R15:
-+    case UNW_S390X_F8:
-+    case UNW_S390X_F9:
-+    case UNW_S390X_F10:
-+    case UNW_S390X_F11:
-+    case UNW_S390X_F12:
-+    case UNW_S390X_F13:
-+    case UNW_S390X_F14:
-+    case UNW_S390X_F15:
-+      loc = c->dwarf.loc[reg];
-+      break;
-+
-+    default:
-+      break;
-+    }
-+
-+  memset (sloc, 0, sizeof (*sloc));
-+
-+  if (DWARF_IS_NULL_LOC (loc))
-+    {
-+      sloc->type = UNW_SLT_NONE;
-+      return 0;
-+    }
-+
-+#if !defined(UNW_LOCAL_ONLY)
-+  if (DWARF_IS_REG_LOC (loc))
-+    {
-+      sloc->type = UNW_SLT_REG;
-+      sloc->u.regnum = DWARF_GET_LOC (loc);
-+    }
-+  else
-+#endif
-+    {
-+      sloc->type = UNW_SLT_MEMORY;
-+      sloc->u.addr = DWARF_GET_LOC (loc);
-+    }
-+  return 0;
-+}
---- a/src/s390x/Gglobal.c
-+++ b/src/s390x/Gglobal.c
-@@ -0,0 +1,101 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (c) 2003, 2005 Hewlett-Packard Development Company, L.P.
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+   Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
-+   Modified for s390x by Michael Munday <mike.munday@ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#include "config.h"
-+#include "unwind_i.h"
-+#include "dwarf_i.h"
-+
-+HIDDEN define_lock (s390x_lock);
-+HIDDEN int tdep_init_done;
-+
-+/* The API register numbers are exactly the same as the .eh_frame
-+   registers, for now at least.  */
-+HIDDEN const uint8_t dwarf_to_unw_regnum_map[DWARF_NUM_PRESERVED_REGS] =
-+  {
-+    UNW_S390X_R0,
-+    UNW_S390X_R1,
-+    UNW_S390X_R2,
-+    UNW_S390X_R3,
-+    UNW_S390X_R4,
-+    UNW_S390X_R5,
-+    UNW_S390X_R6,
-+    UNW_S390X_R7,
-+    UNW_S390X_R8,
-+    UNW_S390X_R9,
-+    UNW_S390X_R10,
-+    UNW_S390X_R11,
-+    UNW_S390X_R12,
-+    UNW_S390X_R13,
-+    UNW_S390X_R14,
-+    UNW_S390X_R15,
-+
-+    UNW_S390X_F0,
-+    UNW_S390X_F2,
-+    UNW_S390X_F4,
-+    UNW_S390X_F6,
-+    UNW_S390X_F1,
-+    UNW_S390X_F3,
-+    UNW_S390X_F5,
-+    UNW_S390X_F7,
-+    UNW_S390X_F8,
-+    UNW_S390X_F10,
-+    UNW_S390X_F12,
-+    UNW_S390X_F14,
-+    UNW_S390X_F9,
-+    UNW_S390X_F11,
-+    UNW_S390X_F13,
-+    UNW_S390X_F15,
-+  };
-+
-+HIDDEN void
-+tdep_init (void)
-+{
-+  intrmask_t saved_mask;
-+
-+  sigfillset (&unwi_full_mask);
-+
-+  lock_acquire (&s390x_lock, saved_mask);
-+  {
-+    if (tdep_init_done)
-+      /* another thread else beat us to it... */
-+      goto out;
-+
-+    mi_init ();
-+
-+    dwarf_init ();
-+
-+    tdep_init_mem_validate ();
-+
-+#ifndef UNW_REMOTE_ONLY
-+    s390x_local_addr_space_init ();
-+#endif
-+    tdep_init_done = 1; /* signal that we're initialized... */
-+  }
-+ out:
-+  lock_release (&s390x_lock, saved_mask);
-+}
---- a/src/s390x/Ginit.c
-+++ b/src/s390x/Ginit.c
-@@ -0,0 +1,364 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (C) 2002 Hewlett-Packard Co
-+   Copyright (C) 2007 David Mosberger-Tang
-+        Contributed by David Mosberger-Tang <dmosberger@gmail.com>
-+
-+   Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
-+   Modified for s390x by Michael Munday <mike.munday@ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/mman.h>
-+
-+#include "unwind_i.h"
-+
-+#ifdef UNW_REMOTE_ONLY
-+
-+/* unw_local_addr_space is a NULL pointer in this case.  */
-+unw_addr_space_t unw_local_addr_space;
-+
-+#else /* !UNW_REMOTE_ONLY */
-+
-+static struct unw_addr_space local_addr_space;
-+
-+unw_addr_space_t unw_local_addr_space = &local_addr_space;
-+
-+HIDDEN unw_dyn_info_list_t _U_dyn_info_list;
-+
-+static inline void *
-+uc_addr (ucontext_t *uc, int reg)
-+{
-+  if (reg >= UNW_S390X_R0 && reg <= UNW_S390X_R15)
-+    return &uc->uc_mcontext.gregs[reg - UNW_S390X_R0];
-+  if (reg >= UNW_S390X_F0 && reg <= UNW_S390X_F15)
-+    return &uc->uc_mcontext.fpregs.fprs[reg - UNW_S390X_F0];
-+  if (reg == UNW_S390X_IP)
-+    return &uc->uc_mcontext.psw.addr;
-+
-+  return NULL;
-+}
-+
-+# ifdef UNW_LOCAL_ONLY
-+
-+HIDDEN void *
-+tdep_uc_addr (ucontext_t *uc, int reg)
-+{
-+  return uc_addr (uc, reg);
-+}
-+
-+# endif /* UNW_LOCAL_ONLY */
-+
-+/* XXX fix me: there is currently no way to locate the dyn-info list
-+       by a remote unwinder.  On ia64, this is done via a special
-+       unwind-table entry.  Perhaps something similar can be done with
-+       DWARF2 unwind info.  */
-+
-+static void
-+put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg)
-+{
-+  /* it's a no-op */
-+}
-+
-+static int
-+get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr,
-+                        void *arg)
-+{
-+  *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list;
-+  return 0;
-+}
-+
-+#define PAGE_SIZE 4096
-+#define PAGE_START(a)   ((a) & ~(PAGE_SIZE-1))
-+
-+static int mem_validate_pipe[2] = {-1, -1};
-+
-+static inline void
-+open_pipe (void)
-+{
-+  /* ignore errors for closing invalid fd's */
-+  close (mem_validate_pipe[0]);
-+  close (mem_validate_pipe[1]);
-+
-+  pipe2 (mem_validate_pipe, O_CLOEXEC | O_NONBLOCK);
-+}
-+
-+ALWAYS_INLINE
-+static int
-+write_validate (void *addr)
-+{
-+  int ret = -1;
-+  ssize_t bytes = 0;
-+
-+  do
-+    {
-+      char buf;
-+      bytes = read (mem_validate_pipe[0], &buf, 1);
-+    }
-+  while ( errno == EINTR );
-+
-+  int valid_read = (bytes > 0 || errno == EAGAIN || errno == EWOULDBLOCK);
-+  if (!valid_read)
-+    {
-+      // re-open closed pipe
-+      open_pipe ();
-+    }
-+
-+  do
-+    {
-+      ret = write (mem_validate_pipe[1], addr, 1);
-+    }
-+  while ( errno == EINTR );
-+
-+  return ret;
-+}
-+
-+static int (*mem_validate_func) (void *addr, size_t len);
-+static int msync_validate (void *addr, size_t len)
-+{
-+  if (msync (addr, len, MS_ASYNC) != 0)
-+    {
-+      return -1;
-+    }
-+
-+  return write_validate (addr);
-+}
-+
-+#ifdef HAVE_MINCORE
-+static int mincore_validate (void *addr, size_t len)
-+{
-+  unsigned char mvec[2]; /* Unaligned access may cross page boundary */
-+  size_t i;
-+
-+  /* mincore could fail with EAGAIN but we conservatively return -1
-+     instead of looping. */
-+  if (mincore (addr, len, mvec) != 0)
-+    {
-+      return -1;
-+    }
-+
-+  for (i = 0; i < (len + PAGE_SIZE - 1) / PAGE_SIZE; i++)
-+    {
-+      if (!(mvec[i] & 1)) return -1;
-+    }
-+
-+  return write_validate (addr);
-+}
-+#endif
-+
-+/* Initialise memory validation method. On linux kernels <2.6.21,
-+   mincore() returns incorrect value for MAP_PRIVATE mappings,
-+   such as stacks. If mincore() was available at compile time,
-+   check if we can actually use it. If not, use msync() instead. */
-+HIDDEN void
-+tdep_init_mem_validate (void)
-+{
-+  open_pipe ();
-+
-+#ifdef HAVE_MINCORE
-+  unsigned char present = 1;
-+  unw_word_t addr = PAGE_START((unw_word_t)&present);
-+  unsigned char mvec[1];
-+  int ret;
-+  while ((ret = mincore ((void*)addr, PAGE_SIZE, mvec)) == -1 &&
-+         errno == EAGAIN) {}
-+  if (ret == 0 && (mvec[0] & 1))
-+    {
-+      Debug(1, "using mincore to validate memory\n");
-+      mem_validate_func = mincore_validate;
-+    }
-+  else
-+#endif
-+    {
-+      Debug(1, "using msync to validate memory\n");
-+      mem_validate_func = msync_validate;
-+    }
-+}
-+
-+/* Cache of already validated addresses */
-+#define NLGA 4
-+static unw_word_t last_good_addr[NLGA];
-+static int lga_victim;
-+
-+static int
-+validate_mem (unw_word_t addr)
-+{
-+  int i, victim;
-+  size_t len;
-+
-+  if (PAGE_START(addr + sizeof (unw_word_t) - 1) == PAGE_START(addr))
-+    len = PAGE_SIZE;
-+  else
-+    len = PAGE_SIZE * 2;
-+
-+  addr = PAGE_START(addr);
-+
-+  if (addr == 0)
-+    return -1;
-+
-+  for (i = 0; i < NLGA; i++)
-+    {
-+      if (last_good_addr[i] && (addr == last_good_addr[i]))
-+        return 0;
-+    }
-+
-+  if (mem_validate_func ((void *) addr, len) == -1)
-+    return -1;
-+
-+  victim = lga_victim;
-+  for (i = 0; i < NLGA; i++) {
-+    if (!last_good_addr[victim]) {
-+      last_good_addr[victim++] = addr;
-+      return 0;
-+    }
-+    victim = (victim + 1) % NLGA;
-+  }
-+
-+  /* All slots full. Evict the victim. */
-+  last_good_addr[victim] = addr;
-+  victim = (victim + 1) % NLGA;
-+  lga_victim = victim;
-+
-+  return 0;
-+}
-+
-+static int
-+access_mem (unw_addr_space_t as, unw_word_t addr, unw_word_t *val, int write,
-+            void *arg)
-+{
-+  if (unlikely (write))
-+    {
-+      Debug (16, "mem[%016lx] <- %lx\n", addr, *val);
-+      *(unw_word_t *) addr = *val;
-+    }
-+  else
-+    {
-+      /* validate address */
-+      const struct cursor *c = (const struct cursor *)arg;
-+      if (likely (c != NULL) && unlikely (c->validate)
-+          && unlikely (validate_mem (addr))) {
-+        Debug (16, "mem[%016lx] -> invalid\n", addr);
-+        return -1;
-+      }
-+      *val = *(unw_word_t *) addr;
-+      Debug (16, "mem[%016lx] -> %lx\n", addr, *val);
-+    }
-+  return 0;
-+}
-+
-+static int
-+access_reg (unw_addr_space_t as, unw_regnum_t reg, unw_word_t *val, int write,
-+            void *arg)
-+{
-+  unw_word_t *addr;
-+  ucontext_t *uc = ((struct cursor *)arg)->uc;
-+
-+  if (unw_is_fpreg (reg))
-+    goto badreg;
-+
-+  if (!(addr = uc_addr (uc, reg)))
-+    goto badreg;
-+
-+  if (write)
-+    {
-+      *(unw_word_t *) addr = *val;
-+      Debug (12, "%s <- 0x%016lx\n", unw_regname (reg), *val);
-+    }
-+  else
-+    {
-+      *val = *(unw_word_t *) addr;
-+      Debug (12, "%s -> 0x%016lx\n", unw_regname (reg), *val);
-+    }
-+  return 0;
-+
-+ badreg:
-+  Debug (1, "bad register number %u\n", reg);
-+  return -UNW_EBADREG;
-+}
-+
-+static int
-+access_fpreg (unw_addr_space_t as, unw_regnum_t reg, unw_fpreg_t *val,
-+              int write, void *arg)
-+{
-+  ucontext_t *uc = ((struct cursor *)arg)->uc;
-+  unw_fpreg_t *addr;
-+
-+  if (!unw_is_fpreg (reg))
-+    goto badreg;
-+
-+  if (!(addr = uc_addr (uc, reg)))
-+    goto badreg;
-+
-+  if (write)
-+    {
-+      Debug (12, "%s <- %08lx.%08lx.%08lx\n", unw_regname (reg),
-+             ((long *)val)[0], ((long *)val)[1], ((long *)val)[2]);
-+      *(unw_fpreg_t *) addr = *val;
-+    }
-+  else
-+    {
-+      *val = *(unw_fpreg_t *) addr;
-+      Debug (12, "%s -> %08lx.%08lx.%08lx\n", unw_regname (reg),
-+             ((long *)val)[0], ((long *)val)[1], ((long *)val)[2]);
-+    }
-+  return 0;
-+
-+ badreg:
-+  Debug (1, "bad register number %u\n", reg);
-+  /* attempt to access a non-preserved register */
-+  return -UNW_EBADREG;
-+}
-+
-+static int
-+get_static_proc_name (unw_addr_space_t as, unw_word_t ip,
-+                      char *buf, size_t buf_len, unw_word_t *offp,
-+                      void *arg)
-+{
-+  return _Uelf64_get_proc_name (as, getpid (), ip, buf, buf_len, offp);
-+}
-+
-+HIDDEN void
-+s390x_local_addr_space_init (void)
-+{
-+  memset (&local_addr_space, 0, sizeof (local_addr_space));
-+  local_addr_space.caching_policy = UNW_CACHE_GLOBAL;
-+  local_addr_space.acc.find_proc_info = dwarf_find_proc_info;
-+  local_addr_space.acc.put_unwind_info = put_unwind_info;
-+  local_addr_space.acc.get_dyn_info_list_addr = get_dyn_info_list_addr;
-+  local_addr_space.acc.access_mem = access_mem;
-+  local_addr_space.acc.access_reg = access_reg;
-+  local_addr_space.acc.access_fpreg = access_fpreg;
-+  local_addr_space.acc.resume = s390x_local_resume;
-+  local_addr_space.acc.get_proc_name = get_static_proc_name;
-+  unw_flush_cache (&local_addr_space, 0, 0);
-+
-+  memset (last_good_addr, 0, sizeof (unw_word_t) * NLGA);
-+  lga_victim = 0;
-+}
-+
-+#endif /* !UNW_REMOTE_ONLY */
---- a/src/s390x/Ginit_local.c
-+++ b/src/s390x/Ginit_local.c
-@@ -0,0 +1,81 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (c) 2002-2003 Hewlett-Packard Development Company, L.P.
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+   Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#include "unwind_i.h"
-+#include "init.h"
-+
-+#ifdef UNW_REMOTE_ONLY
-+
-+int
-+unw_init_local (unw_cursor_t *cursor, ucontext_t *uc)
-+{
-+  return -UNW_EINVAL;
-+}
-+
-+#else /* !UNW_REMOTE_ONLY */
-+
-+static int
-+unw_init_local_common (unw_cursor_t *cursor, ucontext_t *uc, unsigned use_prev_instr)
-+{
-+  struct cursor *c = (struct cursor *) cursor;
-+
-+  if (unlikely (!tdep_init_done))
-+    tdep_init ();
-+
-+  Debug (1, "(cursor=%p)\n", c);
-+
-+  c->dwarf.as = unw_local_addr_space;
-+  c->dwarf.as_arg = c;
-+  c->uc = uc;
-+  c->validate = 0;
-+  return common_init (c, use_prev_instr);
-+}
-+
-+int
-+unw_init_local (unw_cursor_t *cursor, ucontext_t *uc)
-+{
-+  return unw_init_local_common(cursor, uc, 1);
-+}
-+
-+int
-+unw_init_local2 (unw_cursor_t *cursor, ucontext_t *uc, int flag)
-+{
-+  if (!flag)
-+    {
-+      return unw_init_local_common(cursor, uc, 1);
-+    }
-+  else if (flag == UNW_INIT_SIGNAL_FRAME)
-+    {
-+      return unw_init_local_common(cursor, uc, 0);
-+    }
-+  else
-+    {
-+      return -UNW_EINVAL;
-+    }
-+}
-+
-+#endif /* !UNW_REMOTE_ONLY */
---- a/src/s390x/Ginit_remote.c
-+++ b/src/s390x/Ginit_remote.c
-@@ -0,0 +1,57 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (c) 2003 Hewlett-Packard Development Company, L.P.
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+   Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#include "init.h"
-+#include "unwind_i.h"
-+
-+int
-+unw_init_remote (unw_cursor_t *cursor, unw_addr_space_t as, void *as_arg)
-+{
-+#ifdef UNW_LOCAL_ONLY
-+  return -UNW_EINVAL;
-+#else /* !UNW_LOCAL_ONLY */
-+  struct cursor *c = (struct cursor *) cursor;
-+
-+  if (!tdep_init_done)
-+    tdep_init ();
-+
-+  Debug (1, "(cursor=%p)\n", c);
-+
-+  c->dwarf.as = as;
-+  if (as == unw_local_addr_space)
-+    {
-+      c->dwarf.as_arg = c;
-+      c->uc = as_arg;
-+    }
-+  else
-+    {
-+      c->dwarf.as_arg = as_arg;
-+      c->uc = NULL;
-+    }
-+  return common_init (c, 0);
-+#endif /* !UNW_LOCAL_ONLY */
-+}
---- a/src/s390x/Gis_signal_frame.c
-+++ b/src/s390x/Gis_signal_frame.c
-@@ -0,0 +1,77 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com>
-+   Copyright (C) 2013 Linaro Limited
-+   Copyright (C) 2017 IBM
-+
-+   Modified for s390x by Michael Munday <mike.munday@ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#include "unwind_i.h"
-+
-+/* The restorer stub will be a system call:
-+   - rt_sigreturn: svc 173 (0x0aad)
-+   - sigreturn:    svc 119 (0x0a77)
-+*/
-+
-+int
-+unw_is_signal_frame (unw_cursor_t *cursor)
-+{
-+#ifdef __linux__
-+  struct cursor *c = (struct cursor *) cursor;
-+  unw_word_t w0, ip;
-+  unw_addr_space_t as;
-+  unw_accessors_t *a;
-+  void *arg;
-+  int ret, shift = 48;
-+
-+  as = c->dwarf.as;
-+  a = unw_get_accessors (as);
-+  arg = c->dwarf.as_arg;
-+
-+  /* Align the instruction pointer to 8 bytes so that we guarantee
-+     an 8 byte read from it won't cross a page boundary.
-+     Instructions on s390x are 2 byte aligned.  */
-+  ip = c->dwarf.ip & ~7;
-+  shift -= (c->dwarf.ip - ip) * 8;
-+
-+  ret = (*a->access_mem) (as, ip, &w0, 0, arg);
-+  if (ret < 0)
-+    return ret;
-+
-+  /* extract first 2 bytes of the next instruction */
-+  w0 = (w0 >> shift) & 0xffff;
-+
-+  /* sigreturn */
-+  if (w0 == 0x0a77)
-+    return 1;
-+
-+  /* rt_sigreturn */
-+  if (w0 == 0x0aad)
-+    return 2;
-+
-+  return 0;
-+
-+#else
-+  return -UNW_ENOINFO;
-+#endif
-+}
---- a/src/s390x/Gregs.c
-+++ b/src/s390x/Gregs.c
-@@ -0,0 +1,116 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (c) 2002-2004 Hewlett-Packard Development Company, L.P.
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+   Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
-+   Modified for s390x by Michael Munday <mike.munday@ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#include "unwind_i.h"
-+
-+HIDDEN int
-+tdep_access_reg (struct cursor *c, unw_regnum_t reg, unw_word_t *valp,
-+                 int write)
-+{
-+  dwarf_loc_t loc = DWARF_NULL_LOC;
-+
-+  switch (reg)
-+    {
-+    case UNW_S390X_CFA:
-+      if (write)
-+        return -UNW_EREADONLYREG;
-+      *valp = c->dwarf.cfa;
-+      return 0;
-+
-+    case UNW_S390X_R0:
-+    case UNW_S390X_R1:
-+    case UNW_S390X_R2:
-+    case UNW_S390X_R3:
-+    case UNW_S390X_R4:
-+    case UNW_S390X_R5:
-+    case UNW_S390X_R6:
-+    case UNW_S390X_R7:
-+    case UNW_S390X_R8:
-+    case UNW_S390X_R9:
-+    case UNW_S390X_R10:
-+    case UNW_S390X_R11:
-+    case UNW_S390X_R12:
-+    case UNW_S390X_R13:
-+    case UNW_S390X_R14:
-+    case UNW_S390X_IP:
-+      loc = c->dwarf.loc[reg];
-+      break;
-+
-+    case UNW_S390X_R15:
-+      if (write)
-+        return -UNW_EREADONLYREG;
-+      loc = c->dwarf.loc[reg];
-+      break;
-+
-+    default:
-+      Debug (1, "bad register number %u\n", reg);
-+      return -UNW_EBADREG;
-+    }
-+
-+  if (write)
-+    return dwarf_put (&c->dwarf, loc, *valp);
-+  else
-+    return dwarf_get (&c->dwarf, loc, valp);
-+}
-+
-+HIDDEN int
-+tdep_access_fpreg (struct cursor *c, unw_regnum_t reg, unw_fpreg_t *valp,
-+                   int write)
-+{
-+  dwarf_loc_t loc = DWARF_NULL_LOC;
-+
-+  switch (reg)
-+    {
-+    case UNW_S390X_F0:
-+    case UNW_S390X_F1:
-+    case UNW_S390X_F2:
-+    case UNW_S390X_F3:
-+    case UNW_S390X_F4:
-+    case UNW_S390X_F5:
-+    case UNW_S390X_F6:
-+    case UNW_S390X_F7:
-+    case UNW_S390X_F8:
-+    case UNW_S390X_F9:
-+    case UNW_S390X_F10:
-+    case UNW_S390X_F11:
-+    case UNW_S390X_F12:
-+    case UNW_S390X_F13:
-+    case UNW_S390X_F14:
-+    case UNW_S390X_F15:
-+      loc = c->dwarf.loc[reg];
-+      break;
-+    default:
-+      Debug (1, "bad register number %u\n", reg);
-+      return -UNW_EBADREG;
-+    }
-+
-+  if (write)
-+    return dwarf_putfp (&c->dwarf, loc, *valp);
-+  else
-+    return dwarf_getfp (&c->dwarf, loc, valp);
-+}
---- a/src/s390x/Greg_states_iterate.c
-+++ b/src/s390x/Greg_states_iterate.c
-@@ -0,0 +1,37 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (c) 2002-2003 Hewlett-Packard Development Company, L.P.
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+   Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#include "unwind_i.h"
-+
-+int
-+unw_reg_states_iterate (unw_cursor_t *cursor,
-+			unw_reg_states_callback cb, void *token)
-+{
-+  struct cursor *c = (struct cursor *) cursor;
-+
-+  return dwarf_reg_states_iterate (&c->dwarf, cb, token);
-+}
---- a/src/s390x/Gresume.c
-+++ b/src/s390x/Gresume.c
-@@ -0,0 +1,160 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (c) 2002-2004 Hewlett-Packard Development Company, L.P.
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+   Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#include <stdlib.h>
-+
-+#include "unwind_i.h"
-+
-+#ifndef UNW_REMOTE_ONLY
-+
-+HIDDEN inline int
-+s390x_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg)
-+{
-+  struct cursor *c = (struct cursor *) cursor;
-+  ucontext_t uc = *c->uc;
-+  ucontext_t *rt = NULL;
-+  struct sigcontext *sc = NULL;
-+  int i;
-+  unw_word_t sp, ip;
-+  uc.uc_mcontext.psw.addr = c->dwarf.ip;
-+
-+  /* Ensure c->pi is up-to-date.  On x86-64, it's relatively common to
-+     be missing DWARF unwind info.  We don't want to fail in that
-+     case, because the frame-chain still would let us do a backtrace
-+     at least.  */
-+  dwarf_make_proc_info (&c->dwarf);
-+
-+  switch (c->sigcontext_format)
-+    {
-+    case S390X_SCF_NONE:
-+      Debug (8, "resuming at ip=%llx via setcontext()\n",
-+                (unsigned long long) c->dwarf.ip);
-+      setcontext (&uc);
-+      abort(); /* unreachable */
-+    case S390X_SCF_LINUX_SIGFRAME:
-+      Debug (8, "resuming at ip=%llx via signal trampoline\n",
-+                (unsigned long long) c->dwarf.ip);
-+      sc = (struct sigcontext*)c->sigcontext_addr;
-+      for (i = UNW_S390X_R0; i <= UNW_S390X_R15; ++i)
-+        sc->sregs->regs.gprs[i-UNW_S390X_R0] = uc.uc_mcontext.gregs[i-UNW_S390X_R0];
-+      for (i = UNW_S390X_F0; i <= UNW_S390X_F15; ++i)
-+        sc->sregs->fpregs.fprs[i-UNW_S390X_F0] = uc.uc_mcontext.fpregs.fprs[i-UNW_S390X_F0].d;
-+      sc->sregs->regs.psw.addr = uc.uc_mcontext.psw.addr;
-+
-+      sp = c->sigcontext_sp;
-+      ip = c->sigcontext_pc;
-+      __asm__ __volatile__ (
-+        "lgr 15, %[sp]\n"
-+        "br %[ip]\n"
-+        : : [sp] "r" (sp), [ip] "r" (ip)
-+      );
-+      abort(); /* unreachable */
-+    case S390X_SCF_LINUX_RT_SIGFRAME:
-+      Debug (8, "resuming at ip=%llx via signal trampoline\n",
-+                (unsigned long long) c->dwarf.ip);
-+      rt = (ucontext_t*)c->sigcontext_addr;
-+      for (i = UNW_S390X_R0; i <= UNW_S390X_R15; ++i)
-+        rt->uc_mcontext.gregs[i-UNW_S390X_R0] = uc.uc_mcontext.gregs[i-UNW_S390X_R0];
-+      for (i = UNW_S390X_F0; i <= UNW_S390X_F15; ++i)
-+        rt->uc_mcontext.fpregs.fprs[i-UNW_S390X_F0] = uc.uc_mcontext.fpregs.fprs[i-UNW_S390X_F0];
-+      rt->uc_mcontext.psw.addr = uc.uc_mcontext.psw.addr;
-+
-+      sp = c->sigcontext_sp;
-+      ip = c->sigcontext_pc;
-+      __asm__ __volatile__ (
-+        "lgr 15, %[sp]\n"
-+        "br %[ip]\n"
-+        : : [sp] "r" (sp), [ip] "r" (ip)
-+      );
-+      abort(); /* unreachable */
-+    }
-+  return -UNW_EINVAL;
-+}
-+
-+#endif /* !UNW_REMOTE_ONLY */
-+
-+/* This routine is responsible for copying the register values in
-+   cursor C and establishing them as the current machine state. */
-+
-+static inline int
-+establish_machine_state (struct cursor *c)
-+{
-+  int (*access_reg) (unw_addr_space_t, unw_regnum_t, unw_word_t *,
-+                     int write, void *);
-+  int (*access_fpreg) (unw_addr_space_t, unw_regnum_t, unw_fpreg_t *,
-+                       int write, void *);
-+  unw_addr_space_t as = c->dwarf.as;
-+  void *arg = c->dwarf.as_arg;
-+  unw_fpreg_t fpval;
-+  unw_word_t val;
-+  int reg;
-+
-+  access_reg = as->acc.access_reg;
-+  access_fpreg = as->acc.access_fpreg;
-+
-+  Debug (8, "copying out cursor state\n");
-+
-+  for (reg = 0; reg <= UNW_REG_LAST; ++reg)
-+    {
-+      Debug (16, "copying %s %d\n", unw_regname (reg), reg);
-+      if (unw_is_fpreg (reg))
-+        {
-+          if (tdep_access_fpreg (c, reg, &fpval, 0) >= 0)
-+            (*access_fpreg) (as, reg, &fpval, 1, arg);
-+        }
-+      else
-+        {
-+          if (tdep_access_reg (c, reg, &val, 0) >= 0)
-+            (*access_reg) (as, reg, &val, 1, arg);
-+        }
-+    }
-+
-+  if (c->dwarf.args_size)
-+    {
-+      if (tdep_access_reg (c, UNW_S390X_R15, &val, 0) >= 0)
-+        {
-+          val += c->dwarf.args_size;
-+          (*access_reg) (as, UNW_S390X_R15, &val, 1, arg);
-+        }
-+    }
-+  return 0;
-+}
-+
-+int
-+unw_resume (unw_cursor_t *cursor)
-+{
-+  struct cursor *c = (struct cursor *) cursor;
-+  int ret;
-+
-+  Debug (1, "(cursor=%p)\n", c);
-+
-+  if ((ret = establish_machine_state (c)) < 0)
-+    return ret;
-+
-+  return (*c->dwarf.as->acc.resume) (c->dwarf.as, (unw_cursor_t *) c,
-+                                     c->dwarf.as_arg);
-+}
---- a/src/s390x/Gstep.c
-+++ b/src/s390x/Gstep.c
-@@ -0,0 +1,146 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (C) 2002-2004 Hewlett-Packard Co
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+   Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
-+   Modified for s390x by Michael Munday <mike.munday@ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#include "unwind_i.h"
-+#include <signal.h>
-+
-+static int
-+s390x_handle_signal_frame (unw_cursor_t *cursor)
-+{
-+  struct cursor *c = (struct cursor *) cursor;
-+  int ret, i;
-+  unw_word_t sc_addr, sp, *gprs, *fprs, *psw;
-+
-+  ret = dwarf_get (&c->dwarf, c->dwarf.loc[UNW_S390X_R15], &sp);
-+  if (ret < 0)
-+    return ret;
-+
-+  /* Save the SP and PC to be able to return execution at this point
-+     later in time (unw_resume).  */
-+  c->sigcontext_sp = sp;
-+  c->sigcontext_pc = c->dwarf.ip;
-+  switch (c->sigcontext_format)
-+    {
-+    case S390X_SCF_LINUX_SIGFRAME: /* sigreturn */
-+      sc_addr = sp + 160;
-+      gprs = ((struct sigcontext*)sc_addr)->sregs->regs.gprs;
-+      fprs = (unw_word_t*)((struct sigcontext*)sc_addr)->sregs->fpregs.fprs;
-+      psw  = &((struct sigcontext*)sc_addr)->sregs->regs.psw.addr;
-+      break;
-+    case S390X_SCF_LINUX_RT_SIGFRAME: /* rt_sigreturn */
-+      sc_addr = sp + sizeof(siginfo_t) + 8 + 160;
-+      gprs = ((ucontext_t*)sc_addr)->uc_mcontext.gregs;
-+      fprs = (unw_word_t*)((ucontext_t*)sc_addr)->uc_mcontext.fpregs.fprs;
-+      psw  = &((ucontext_t*)sc_addr)->uc_mcontext.psw.addr;
-+      break;
-+    default:
-+      return -UNW_EUNSPEC;
-+    }
-+
-+  c->sigcontext_addr = sc_addr;
-+
-+  /* Update the dwarf cursor.
-+     Set the location of the registers to the corresponding addresses of the
-+     uc_mcontext / sigcontext structure contents.  */
-+  for (i = UNW_S390X_R0; i <= UNW_S390X_R15; ++i)
-+    c->dwarf.loc[i] = DWARF_MEM_LOC (c, (unw_word_t) &gprs[i-UNW_S390X_R0]);
-+  for (i = UNW_S390X_F0; i <= UNW_S390X_F15; ++i)
-+    c->dwarf.loc[i] = DWARF_MEM_LOC (c, (unw_word_t) &fprs[i-UNW_S390X_F0]);
-+
-+  c->dwarf.loc[UNW_S390X_IP] = DWARF_MEM_LOC (c, (unw_word_t) psw);
-+
-+  /* Set SP/CFA and PC/IP.
-+     Normally the default CFA on s390x is r15+160. We do not add that offset
-+     here because dwarf_step will add the offset.  */
-+  dwarf_get (&c->dwarf, c->dwarf.loc[UNW_S390X_R15], &c->dwarf.cfa);
-+  dwarf_get (&c->dwarf, c->dwarf.loc[UNW_S390X_IP], &c->dwarf.ip);
-+
-+  c->dwarf.pi_valid = 0;
-+  c->dwarf.use_prev_instr = 0;
-+
-+  return 1;
-+}
-+
-+int
-+unw_step (unw_cursor_t *cursor)
-+{
-+  struct cursor *c = (struct cursor *) cursor;
-+  int ret = 0, val = c->validate, sig;
-+
-+#if CONSERVATIVE_CHECKS
-+  c->validate = 1;
-+#endif
-+
-+  Debug (1, "(cursor=%p, ip=0x%016lx, cfa=0x%016lx)\n",
-+         c, c->dwarf.ip, c->dwarf.cfa);
-+
-+  /* Try DWARF-based unwinding... */
-+  c->sigcontext_format = S390X_SCF_NONE;
-+  ret = dwarf_step (&c->dwarf);
-+
-+#if CONSERVATIVE_CHECKS
-+  c->validate = val;
-+#endif
-+
-+  if (unlikely (ret == -UNW_ENOINFO))
-+    {
-+      /* GCC doesn't currently emit debug information for signal
-+         trampolines on s390x so we check for them explicitly.
-+
-+         If there isn't debug information available we could also
-+         try using the backchain (if available).
-+
-+         Other platforms also detect PLT entries here. That's
-+         tricky to do reliably on s390x so I've left it out for
-+         now.  */
-+
-+      /* Memory accesses here are quite likely to be unsafe. */
-+      c->validate = 1;
-+
-+      /* Check if this is a signal frame. */
-+      sig = unw_is_signal_frame (cursor);
-+      if (sig > 0)
-+        {
-+          c->sigcontext_format = sig;
-+          ret = s390x_handle_signal_frame (cursor);
-+        }
-+      else
-+        {
-+          c->dwarf.ip = 0;
-+          ret = 0;
-+        }
-+
-+      c->validate = val;
-+      return ret;
-+    }
-+
-+  if (unlikely (ret > 0 && c->dwarf.ip == 0))
-+    return 0;
-+
-+  return ret;
-+}
---- a/src/s390x/init.h
-+++ b/src/s390x/init.h
-@@ -0,0 +1,71 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (C) 2002 Hewlett-Packard Co
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+   Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
-+   Modified for s390x by Michael Munday <mike.munday@ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#include "unwind_i.h"
-+
-+static inline int
-+common_init (struct cursor *c, unsigned use_prev_instr)
-+{
-+  int ret;
-+  int i;
-+
-+  for (i = UNW_S390X_R0; i <= UNW_S390X_R15; ++i) {
-+    c->dwarf.loc[i] = DWARF_REG_LOC(&c->dwarf, i);
-+  }
-+  for (i = UNW_S390X_F0; i <= UNW_S390X_F15; ++i) {
-+    c->dwarf.loc[i] = DWARF_FPREG_LOC(&c->dwarf, i);
-+  }
-+  /* IP isn't a real register, it is encoded in the PSW */
-+  c->dwarf.loc[UNW_S390X_IP] = DWARF_REG_LOC(&c->dwarf, UNW_S390X_IP);
-+
-+  ret = dwarf_get (&c->dwarf, c->dwarf.loc[UNW_S390X_IP], &c->dwarf.ip);
-+  if (ret < 0)
-+    return ret;
-+
-+  /* Normally the CFA offset on s390x is biased, however this is taken
-+     into account by the CFA offset in dwarf_step, so here we just mark
-+     make it equal to the stack pointer.  */
-+  ret = dwarf_get (&c->dwarf, DWARF_REG_LOC (&c->dwarf, UNW_S390X_R15),
-+                   &c->dwarf.cfa);
-+  if (ret < 0)
-+    return ret;
-+
-+  c->sigcontext_format = S390X_SCF_NONE;
-+  c->sigcontext_addr = 0;
-+
-+  c->dwarf.args_size = 0;
-+  c->dwarf.stash_frames = 0;
-+  c->dwarf.use_prev_instr = use_prev_instr;
-+  c->dwarf.pi_valid = 0;
-+  c->dwarf.pi_is_dynamic = 0;
-+  c->dwarf.hint = 0;
-+  c->dwarf.prev_rs = 0;
-+  c->dwarf.eh_valid_mask = 0;
-+
-+  return 0;
-+}
---- a/src/s390x/is_fpreg.c
-+++ b/src/s390x/is_fpreg.c
-@@ -0,0 +1,36 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (c) 2004-2005 Hewlett-Packard Development Company, L.P.
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+   Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
-+   Modified for s390x by Michael Munday <mike.munday@ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#include "libunwind_i.h"
-+
-+int
-+unw_is_fpreg (int regnum)
-+{
-+  /* vector registers? */
-+  return regnum >= UNW_S390X_F0 && regnum <= UNW_S390X_F15;
-+}
---- a/src/s390x/Lapply_reg_state.c
-+++ b/src/s390x/Lapply_reg_state.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Gapply_reg_state.c"
-+#endif
---- a/src/s390x/Lcreate_addr_space.c
-+++ b/src/s390x/Lcreate_addr_space.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Gcreate_addr_space.c"
-+#endif
---- a/src/s390x/Lget_proc_info.c
-+++ b/src/s390x/Lget_proc_info.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Gget_proc_info.c"
-+#endif
---- a/src/s390x/Lget_save_loc.c
-+++ b/src/s390x/Lget_save_loc.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Gget_save_loc.c"
-+#endif
---- a/src/s390x/Lglobal.c
-+++ b/src/s390x/Lglobal.c
-@@ -0,0 +1,6 @@
-+#define UNW_LOCAL_ONLY
-+#include "config.h"
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Gglobal.c"
-+#endif
---- a/src/s390x/Linit.c
-+++ b/src/s390x/Linit.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Ginit.c"
-+#endif
---- a/src/s390x/Linit_local.c
-+++ b/src/s390x/Linit_local.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Ginit_local.c"
-+#endif
---- a/src/s390x/Linit_remote.c
-+++ b/src/s390x/Linit_remote.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Ginit_remote.c"
-+#endif
---- a/src/s390x/Lis_signal_frame.c
-+++ b/src/s390x/Lis_signal_frame.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Gis_signal_frame.c"
-+#endif
---- a/src/s390x/Lregs.c
-+++ b/src/s390x/Lregs.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Gregs.c"
-+#endif
---- a/src/s390x/Lreg_states_iterate.c
-+++ b/src/s390x/Lreg_states_iterate.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Greg_states_iterate.c"
-+#endif
---- a/src/s390x/Lresume.c
-+++ b/src/s390x/Lresume.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Gresume.c"
-+#endif
---- a/src/s390x/Lstep.c
-+++ b/src/s390x/Lstep.c
-@@ -0,0 +1,5 @@
-+#define UNW_LOCAL_ONLY
-+#include <libunwind.h>
-+#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
-+#include "Gstep.c"
-+#endif
---- a/src/s390x/regname.c
-+++ b/src/s390x/regname.c
-@@ -0,0 +1,57 @@
-+/* libunwind - a platform-independent unwind library
-+
-+        Contributed by Max Asbock <masbock@us.ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#include "unwind_i.h"
-+
-+static const char *regname[] =
-+  {
-+    [UNW_S390X_R0]="R0",
-+    [UNW_S390X_R1]="R1",
-+    [UNW_S390X_R2]="R2",
-+    [UNW_S390X_R3]="R3",
-+    [UNW_S390X_R4]="R4",
-+    [UNW_S390X_R5]="R5",
-+    [UNW_S390X_R6]="R6",
-+    [UNW_S390X_R7]="R7",
-+    [UNW_S390X_R8]="R8",
-+    [UNW_S390X_R9]="R9",
-+    [UNW_S390X_R10]="R10",
-+    [UNW_S390X_R11]="R11",
-+    [UNW_S390X_R12]="R12",
-+    [UNW_S390X_R13]="R13",
-+    [UNW_S390X_R14]="R14",
-+    [UNW_S390X_R15]="R15",
-+
-+    [UNW_S390X_IP]="IP"
-+   };
-+
-+const char *
-+unw_regname (unw_regnum_t reg)
-+{
-+  if (reg < (unw_regnum_t) ARRAY_SIZE (regname))
-+    return regname[reg];
-+  else
-+    return "???";
-+}
---- a/src/s390x/setcontext.S
-+++ b/src/s390x/setcontext.S
-@@ -0,0 +1,76 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (C) 2008 Google, Inc
-+	Contributed by Paul Pluzhnikov <ppluzhnikov@google.com>
-+   Copyright (C) 2010 Konstantin Belousov <kib@freebsd.org>
-+   Copyright (C) 2017 IBM
-+
-+   Modified for s390x by Michael Munday <mike.munday@ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+// int _Us390x_setcontext (const ucontext_t *ucp)
-+
-+	.global _Us390x_setcontext
-+	.type _Us390x_setcontext, @function
-+_Us390x_setcontext:
-+	.cfi_startproc
-+
-+	// Must only restore registers saved by getcontext, other fields
-+	// in the ucontext_t might be uninitialised.
-+
-+	// Stop this function being unwound. We are clobbering callee-save
-+	// registers in this function so unwinding it is unsafe.
-+	// Ideally we'd save callee-save registers, update the CFI for them
-+	// and then switch to the new CFI once the context switch is
-+	// complete.
-+	.cfi_undefined %r14
-+
-+	// floating point parameters
-+	ld    %f0,0x100(%r2)
-+	ld    %f2,0x110(%r2)
-+	ld    %f4,0x120(%r2)
-+	ld    %f6,0x130(%r2)
-+
-+	// floating point preserved registers
-+	lfpc  0xf8(%r2)
-+	ld    %f8,0x140(%r2)
-+	ld    %f9,0x148(%r2)
-+	ld    %f10,0x150(%r2)
-+	ld    %f11,0x158(%r2)
-+	ld    %f12,0x160(%r2)
-+	ld    %f13,0x168(%r2)
-+	ld    %f14,0x170(%r2)
-+	ld    %f15,0x178(%r2)
-+
-+	// preserved registers and parameters
-+	lgr   %r1,%r2
-+	lmg   %r2,%r15,0x48(%r1)
-+
-+	// restore PSW address
-+	lg    %r1,0x30(%r1)
-+	br    %r1
-+
-+	.cfi_endproc
-+	.size _Us390x_setcontext, . - _Us390x_setcontext
-+
-+	// We do not need executable stack.
-+	.section        .note.GNU-stack,"",@progbits
---- a/src/s390x/unwind_i.h
-+++ b/src/s390x/unwind_i.h
-@@ -0,0 +1,48 @@
-+/* libunwind - a platform-independent unwind library
-+   Copyright (C) 2002, 2005 Hewlett-Packard Co
-+        Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-+
-+   Modified for x86_64 by Max Asbock <masbock@us.ibm.com>
-+   Modified for s390x by Michael Munday <mike.munday@ibm.com>
-+
-+This file is part of libunwind.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-+
-+#ifndef unwind_i_h
-+#define unwind_i_h
-+
-+#include <stdint.h>
-+
-+#include <libunwind-s390x.h>
-+
-+#include "libunwind_i.h"
-+#include <sys/ucontext.h>
-+
-+#define s390x_lock                     UNW_OBJ(lock)
-+#define s390x_local_resume             UNW_OBJ(local_resume)
-+#define s390x_local_addr_space_init    UNW_OBJ(local_addr_space_init)
-+#define setcontext                     UNW_ARCH_OBJ(setcontext)
-+
-+extern void s390x_local_addr_space_init (void);
-+extern int s390x_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg);
-+extern int setcontext (const ucontext_t *ucp);
-+
-+#endif /* unwind_i_h */
---- a/tests/check-namespace.sh.in
-+++ b/tests/check-namespace.sh.in
-@@ -167,15 +167,23 @@ check_local_unw_abi () {
- 	    match _UL${plat}_dwarf_search_unwind_table
- 	    match _UL${plat}_dwarf_find_unwind_table
- 	    ;;
--        tilegx)
--            match _U${plat}_is_fpreg
-+    tilegx)
-+	    match _U${plat}_is_fpreg
- 	    match _UL${plat}_dwarf_search_unwind_table
- 	    match _UL${plat}_dwarf_find_unwind_table
--            match _UL${plat}_local_addr_space_init
--            match _U${plat}_get_elf_image
-+	    match _UL${plat}_local_addr_space_init
-+	    match _U${plat}_get_elf_image
- 	    match _U${plat}_get_exe_image_path
--            match ${plat}_lock
--            ;;
-+	    match ${plat}_lock
-+	    ;;
-+	s390x)
-+	    match _U${plat}_get_elf_image
-+	    match _U${plat}_get_exe_image_path
-+	    match _U${plat}_is_fpreg
-+	    match _UL${plat}_dwarf_search_unwind_table
-+	    match _UL${plat}_dwarf_find_unwind_table
-+	    match _U${plat}_setcontext
-+	    ;;
- 
- 	*)
- 	    match _U${plat}_is_fpreg
-@@ -267,15 +275,22 @@ check_generic_unw_abi () {
- 	    match _U${plat}_dwarf_search_unwind_table
- 	    match _U${plat}_dwarf_find_unwind_table
- 	    ;;
--        tilegx)
--            match _U${plat}_dwarf_search_unwind_table
-+    tilegx)
-+	    match _U${plat}_dwarf_search_unwind_table
- 	    match _U${plat}_dwarf_find_unwind_table
--            match _U${plat}_get_elf_image
-+	    match _U${plat}_get_elf_image
- 	    match _U${plat}_get_exe_image_path
--            match _U${plat}_is_fpreg
--            match _U${plat}_local_addr_space_init
--            match ${plat}_lock
--            ;;
-+	    match _U${plat}_is_fpreg
-+	    match _U${plat}_local_addr_space_init
-+	    match ${plat}_lock
-+	    ;;
-+	s390x)
-+	    match _U${plat}_is_fpreg
-+	    match _U${plat}_get_elf_image
-+	    match _U${plat}_get_exe_image_path
-+	    match _U${plat}_dwarf_search_unwind_table
-+	    match _U${plat}_dwarf_find_unwind_table
-+	    ;;
- 	*)
- 	    match _U${plat}_is_fpreg
- 	    match _U${plat}_dwarf_search_unwind_table
diff --git a/main/libunwind/fix-libunwind-pc-in.patch b/main/libunwind/fix-libunwind-pc-in.patch
index ce93df4fad0..4fe5008eaf9 100644
--- a/main/libunwind/fix-libunwind-pc-in.patch
+++ b/main/libunwind/fix-libunwind-pc-in.patch
@@ -1,3 +1,6 @@
+needed since we need libucontext for ppc, and other reasons (musl doesn't have
+ucontext api, so the lib is external)
+--
 --- a/src/unwind/libunwind.pc.in
 +++ b/src/unwind/libunwind.pc.in
 @@ -6,6 +6,6 @@
@@ -6,5 +9,5 @@
  Version: @VERSION@
 -Libs: -L${libdir} -lunwind
 +Libs: -L${libdir} -lunwind -lucontext
- Libs.private: @LIBLZMA@
+ Libs.private: @LIBLZMA@ @LIBZ@
  Cflags: -I${includedir}
diff --git a/main/libunwind/fix-ppc64-libdir.patch b/main/libunwind/fix-ppc64-libdir.patch
deleted file mode 100644
index fd37d378076..00000000000
--- a/main/libunwind/fix-ppc64-libdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -201,7 +201,7 @@
- AC_MSG_RESULT([$use_dwarf])
- 
- if test x$target_arch = xppc64; then
--        libdir='${exec_prefix}/lib64'
-+        libdir='${exec_prefix}/lib'
-         AC_MSG_NOTICE([PowerPC64 detected, lib will be installed ${libdir}]);
-         AC_SUBST([libdir])
- fi
diff --git a/main/libunwind/fix-test-coredump-unwind.patch b/main/libunwind/fix-test-coredump-unwind.patch
deleted file mode 100644
index ff3bc5a87df..00000000000
--- a/main/libunwind/fix-test-coredump-unwind.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/tests/test-coredump-unwind.c
-+++ b/tests/test-coredump-unwind.c
-@@ -57,7 +57,11 @@
- #include <grp.h>
- 
- /* For SIGSEGV handler code */
--#include <execinfo.h>
-+#if HAVE_EXECINFO_H
-+# include <execinfo.h>
-+#else
-+  extern int backtrace (void **, int);
-+#endif
- #include <sys/ucontext.h>
- 
- #include <libunwind-coredump.h>
-@@ -242,7 +246,7 @@
-     void *array[50];
-     int size;
-     size = backtrace(array, 50);
--#ifdef __linux__
-+#if defined __linux__ && HAVE_EXECINFO_H
-     backtrace_symbols_fd(array, size, 2);
- #endif
-   }
diff --git a/main/libunwind/force-enable-man.patch b/main/libunwind/force-enable-man.patch
index 0940c8110f6..57240d67902 100644
--- a/main/libunwind/force-enable-man.patch
+++ b/main/libunwind/force-enable-man.patch
@@ -1,16 +1,15 @@
 Man pages are already built in the release tarball, so we don't need latex2man.
---- a/configure.ac
-+++ b/configure.ac
-@@ -420,12 +420,6 @@
- AC_SUBST(DLLIB)
- AC_SUBST(BACKTRACELIB)
+--
+diff --git a/configure b/configure
+index 86c8126..989bcc2 100755
+--- a/configure
++++ b/configure
+@@ -18024,7 +18024,7 @@
  
--AC_PATH_PROG([LATEX2MAN],[latex2man])
--if test "x$LATEX2MAN" = "x"; then
--  AC_MSG_WARN([latex2man not found. Install latex2man. Disabling docs.])
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: latex2man not found. Install latex2man. Disabling docs." >&5
+ $as_echo "$as_me: WARNING: latex2man not found. Install latex2man. Disabling docs." >&2;}
 -  enable_documentation="no";
--fi
--
- AM_CONDITIONAL([CONFIG_DOCS], [test x$enable_documentation = xyes])
- if test "x$enable_documentation" = "xyes"; then
-   AC_CONFIG_FILES(doc/Makefile doc/common.tex)
++  enable_documentation="yes";
+ 
+ fi
+  if test x$enable_documentation != xno; then
diff --git a/main/libunwind/musl-mips-fix.patch b/main/libunwind/musl-mips-fix.patch
deleted file mode 100644
index 2f62e345f48..00000000000
--- a/main/libunwind/musl-mips-fix.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- a/src/coredump/_UCD_access_reg_linux.c
-+++ b/src/coredump/_UCD_access_reg_linux.c
-@@ -58,36 +58,36 @@
- #if defined(UNW_TARGET_MIPS)
-   static const uint8_t remap_regs[] =
-     {
--      [UNW_MIPS_R0]  = EF_REG0,
--      [UNW_MIPS_R1]  = EF_REG1,
--      [UNW_MIPS_R2]  = EF_REG2,
--      [UNW_MIPS_R3]  = EF_REG3,
--      [UNW_MIPS_R4]  = EF_REG4,
--      [UNW_MIPS_R5]  = EF_REG5,
--      [UNW_MIPS_R6]  = EF_REG6,
--      [UNW_MIPS_R7]  = EF_REG7,
--      [UNW_MIPS_R8]  = EF_REG8,
--      [UNW_MIPS_R9]  = EF_REG9,
--      [UNW_MIPS_R10] = EF_REG10,
--      [UNW_MIPS_R11] = EF_REG11,
--      [UNW_MIPS_R12] = EF_REG12,
--      [UNW_MIPS_R13] = EF_REG13,
--      [UNW_MIPS_R14] = EF_REG14,
--      [UNW_MIPS_R15] = EF_REG15,
--      [UNW_MIPS_R16] = EF_REG16,
--      [UNW_MIPS_R17] = EF_REG17,
--      [UNW_MIPS_R18] = EF_REG18,
--      [UNW_MIPS_R19] = EF_REG19,
--      [UNW_MIPS_R20] = EF_REG20,
--      [UNW_MIPS_R21] = EF_REG21,
--      [UNW_MIPS_R22] = EF_REG22,
--      [UNW_MIPS_R23] = EF_REG23,
--      [UNW_MIPS_R24] = EF_REG24,
--      [UNW_MIPS_R25] = EF_REG25,
--      [UNW_MIPS_R28] = EF_REG28,
--      [UNW_MIPS_R29] = EF_REG29,
--      [UNW_MIPS_R30] = EF_REG30,
--      [UNW_MIPS_R31] = EF_REG31,
-+      [UNW_MIPS_R0]  = EF_R0,
-+      [UNW_MIPS_R1]  = EF_R1,
-+      [UNW_MIPS_R2]  = EF_R2,
-+      [UNW_MIPS_R3]  = EF_R3,
-+      [UNW_MIPS_R4]  = EF_R4,
-+      [UNW_MIPS_R5]  = EF_R5,
-+      [UNW_MIPS_R6]  = EF_R6,
-+      [UNW_MIPS_R7]  = EF_R7,
-+      [UNW_MIPS_R8]  = EF_R8,
-+      [UNW_MIPS_R9]  = EF_R9,
-+      [UNW_MIPS_R10] = EF_R10,
-+      [UNW_MIPS_R11] = EF_R11,
-+      [UNW_MIPS_R12] = EF_R12,
-+      [UNW_MIPS_R13] = EF_R13,
-+      [UNW_MIPS_R14] = EF_R14,
-+      [UNW_MIPS_R15] = EF_R15,
-+      [UNW_MIPS_R16] = EF_R16,
-+      [UNW_MIPS_R17] = EF_R17,
-+      [UNW_MIPS_R18] = EF_R18,
-+      [UNW_MIPS_R19] = EF_R19,
-+      [UNW_MIPS_R20] = EF_R20,
-+      [UNW_MIPS_R21] = EF_R21,
-+      [UNW_MIPS_R22] = EF_R22,
-+      [UNW_MIPS_R23] = EF_R23,
-+      [UNW_MIPS_R24] = EF_R24,
-+      [UNW_MIPS_R25] = EF_R25,
-+      [UNW_MIPS_R28] = EF_R28,
-+      [UNW_MIPS_R29] = EF_R29,
-+      [UNW_MIPS_R30] = EF_R30,
-+      [UNW_MIPS_R31] = EF_R31,
-       [UNW_MIPS_PC]  = EF_CP0_EPC,
-     };
- #elif defined(UNW_TARGET_X86)
---- a/src/coredump/_UCD_lib.h
-+++ b/src/coredump/_UCD_lib.h
-@@ -50,6 +50,7 @@
- #include <stdbool.h>
- #include <limits.h>
- #include <sys/param.h>
-+#include <sys/reg.h>
- #include <pwd.h>
- #include <grp.h>
- #include <syslog.h>
---- a/src/mips/getcontext.S
-+++ b/src/mips/getcontext.S
-@@ -24,12 +24,11 @@
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
- 
- #include "offsets.h"
--#include <endian.h>
- 
- 	.text
- 
- #if _MIPS_SIM == _ABIO32
--# if __BYTE_ORDER == __BIG_ENDIAN
-+# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
- #  define OFFSET 4
- # else
- #  define OFFSET 0
diff --git a/main/libunwind/ppc64-musl.patch b/main/libunwind/ppc64-musl.patch
deleted file mode 100644
index e3f4848871a..00000000000
--- a/main/libunwind/ppc64-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/ptrace/_UPT_reg_offset.c
-+++ b/src/ptrace/_UPT_reg_offset.c
-@@ -32,6 +32,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
- # include <asm/ptrace_offsets.h>
- #endif
- 
-+#include <asm/ptrace.h>
-+
- const int _UPT_reg_offset[UNW_REG_LAST + 1] =
-   {
- #ifdef HAVE_ASM_PTRACE_OFFSETS_H
diff --git a/main/liburing/APKBUILD b/main/liburing/APKBUILD
new file mode 100644
index 00000000000..479730f61d9
--- /dev/null
+++ b/main/liburing/APKBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Milan P. Stanić <mps@arvanta.net>
+pkgname=liburing
+pkgver=2.5
+pkgrel=1
+pkgdesc="Linux kernel io_uring access library"
+url="https://git.kernel.dk/cgit/liburing/"
+arch="all"
+license="LGPL-2.1-or-later OR MIT"
+makedepends="linux-headers"
+subpackages="liburing-ffi $pkgname-dev $pkgname-doc"
+source="https://git.kernel.dk/cgit/liburing/snapshot/liburing-$pkgver.tar.gz
+	"
+
+build() {
+	./configure \
+		--prefix=/usr \
+		--use-libc \
+		--mandir=/usr/share/man
+}
+
+check() {
+	make test
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+ffi() {
+	amove usr/lib/liburing-ffi.so.*
+}
+
+sha512sums="
+b537a644ba338fc6edc747e08a0c33e99008f5b0a33be03f304c7f94f4c28473d0eee7b0d731be966bf32be835b0e45beb308b3a0b3f6264a69a9e5362f00928  liburing-2.5.tar.gz
+"
diff --git a/main/libusb-compat/APKBUILD b/main/libusb-compat/APKBUILD
index c800b9747f5..572d55db7d1 100644
--- a/main/libusb-compat/APKBUILD
+++ b/main/libusb-compat/APKBUILD
@@ -1,20 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libusb-compat
-pkgver=0.1.5
-pkgrel=4
+pkgver=0.1.8
+pkgrel=2
 pkgdesc="Compatility for older libusb"
-url="http://libusb.sourceforge.net/"
+url="https://libusb.info/"
 arch="all"
-options="!check"  # No test suite.
-license="LGPL-2.1+"
+license="LGPL-2.1-or-later"
 subpackages="$pkgname-dev"
-depends=
-makedepends="libusb-dev"
-source="https://downloads.sourceforge.net/libusb/$pkgname-$pkgver.tar.bz2
-	fix-headers.patch"
+depends="libusb"
+makedepends="autoconf automake linux-headers libtool libusb-dev"
+source="https://github.com/libusb/libusb-compat-0.1/releases/download/v$pkgver/libusb-compat-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,9 +19,14 @@ build() {
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="fe63bd1c65e67588a83ebfdd329025ecf75f33f877fb80dd83eb528df057efb591e010416027f9054294504562299166e8e2811a7681fa1967a03baae9b88857  libusb-compat-0.1.5.tar.bz2
-3abb7e90299f6cdb397b4fcf1b7af0bfc20cc3b0937e0787716109608313bc988ce3532ed88ba4d05e7d57bdaca3de4b5ce704e0a3d4bf871c48ac03103a18d7  fix-headers.patch"
+
+sha512sums="
+0f935b89d06a8ffd6c87b03d649b1136a0f84110874d1b8d071a0af922b9b2f911143670fc9297309053f29ba02e1714fa4f4bdd8b71c26dbaf32146699fcf34  libusb-compat-0.1.8.tar.gz
+"
diff --git a/main/libusb-compat/fix-headers.patch b/main/libusb-compat/fix-headers.patch
deleted file mode 100644
index ea9cbc34978..00000000000
--- a/main/libusb-compat/fix-headers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libusb-compat-0.1.5.orig/libusb/usb.h
-+++ libusb-compat-0.1.5/libusb/usb.h
-@@ -25,6 +25,7 @@
- #ifndef __USB_H__
- #define __USB_H__
- 
-+#include <sys/types.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <limits.h>
diff --git a/main/libusb/APKBUILD b/main/libusb/APKBUILD
index 078a51a026a..7363e90ae1e 100644
--- a/main/libusb/APKBUILD
+++ b/main/libusb/APKBUILD
@@ -1,37 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libusb
-pkgver=1.0.23
-_ver=${pkgver/_/-}
+pkgver=1.0.27
 pkgrel=0
 pkgdesc="Library that enables userspace access to USB devices"
 url="https://libusb.info/"
 arch="all"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
 subpackages="$pkgname-dev"
 replaces="libusbx"
 makedepends="linux-headers"
-source="https://github.com/libusb/libusb/releases/download/v$pkgver/libusb-$pkgver.tar.bz2
-	"
+source="https://github.com/libusb/libusb/releases/download/v$pkgver/libusb-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--disable-udev \
-		--disable-static
+		--enable-static
 	make -j1
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="73430ad31dd405e76a9c6c55086961003989c44964e2735b5076f9ca849e3f6fe71d10a66b74b111f0c34a0d2cb744b9ca105863c552123fce4ec0bbdd2ec15b  libusb-1.0.23.tar.bz2"
+sha512sums="
+42abbbcf2564f86cc2f05826aeefa6beb03c9f89dc9fe05bdfa351caa3dbd07713ce193daadecf29557604dd3cbc770c8031a78e1ad0a8df3627c3f551d28ff0  libusb-1.0.27.tar.bz2
+"
diff --git a/main/libutempter/APKBUILD b/main/libutempter/APKBUILD
new file mode 100644
index 00000000000..05a6507c043
--- /dev/null
+++ b/main/libutempter/APKBUILD
@@ -0,0 +1,30 @@
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
+pkgname=libutempter
+pkgver=1.2.1
+_pkgver=$pkgver-alt1
+pkgrel=9
+pkgdesc="Library interface to record user sessions in utmp/wtmp files"
+url="http://freecode.com/projects/libutempter"
+arch="all"
+license="LGPL-2.1-or-later"
+makedepends="utmps-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+options="suid !check"
+pkggroups="utmp"
+source="https://github.com/altlinux/libutempter/archive/$_pkgver.tar.gz"
+builddir="$srcdir/$pkgname-$_pkgver/$pkgname"
+
+build() {
+	make CFLAGS="$CFLAGS -I/usr/include/utmps" LDLIBS="-Wl,--no-as-needed -lutmps -lskarnet -Wl,--as-needed"
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	chown root:$pkggroups "$pkgdir/usr/lib/utempter/utempter"
+	chmod 2755 "$pkgdir/usr/lib/utempter/utempter"
+}
+
+sha512sums="
+4dcc52bdc0d45b959c45d37d195794f5386061490b943e4473485259de46f31bb23d82feb74a54aea49eeb339bf1682a0a96adba1ae4a1114c8f39aaa2df6761  1.2.1-alt1.tar.gz
+"
diff --git a/main/libuv/APKBUILD b/main/libuv/APKBUILD
index 210fda3e7a3..ebe5e156ff4 100644
--- a/main/libuv/APKBUILD
+++ b/main/libuv/APKBUILD
@@ -2,26 +2,31 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libuv
-pkgver=1.35.0
+pkgver=1.48.0
 pkgrel=0
 pkgdesc="Cross-platform asychronous I/O"
-url="https://libuv.org"
+url="https://libuv.org/"
 arch="all"
-license="MIT AND ISC"
+license="MIT"
 makedepends_build="automake autoconf libtool"
 makedepends_host="linux-headers"
-subpackages="$pkgname-static $pkgname-dev $pkgname-dbg"
-source="https://dist.libuv.org/dist/v$pkgver/libuv-v$pkgver.tar.gz
-	disable-test-failing-on-builders.patch
-	"
+subpackages="$pkgname-dbg $pkgname-static $pkgname-dev"
+source="https://dist.libuv.org/dist/v$pkgver/libuv-v$pkgver.tar.gz"
 builddir="$srcdir/$pkgname-v$pkgver"
 
+# secfixes:
+#   1.48.0-r0:
+#     - CVE-2024-24806
+#   1.39.0-r0:
+#     - CVE-2020-8252
+
 prepare() {
 	default_prepare
 	sh autogen.sh
 }
 
 build() {
+	CFLAGS="$CFLAGS -O2" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,19 +34,10 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var
-	make CFLAGS="$CFLAGS -D__USE_MISC" BUILDTYPE=Release
+	make
 }
 
 check() {
-	# see https://github.com/libuv/libuv/issues/2307
-	case $CARCH in
-		x86*)
-			if test $DRONE; then
-				sed -i "s/TEST_.*(ipc_closed_handle)//g" test/test-list.h
-			fi
-		;;
-	esac
-
 	make check
 }
 
@@ -51,5 +47,6 @@ package() {
 		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="11c074f711e36727715950ac86b90e6bc877b77b3892f861bb35af0d4a1e89e4a670a7cb3372dccc3bdceb55c43c6fb89829e7b47ef9d4fbd85f0c083ffd6c39  libuv-v1.35.0.tar.gz
-0d155259cfaa78fd229a015fd7181b9a76bf4618e36e6e9d4697323cddcde42f29598f161f6831489ec31adc5cf2614cb670021bf6f5ede7202bcbad7f675fbb  disable-test-failing-on-builders.patch"
+sha512sums="
+7ae3a4c02f654a26056db1541e52ccc4c54aaea39c33585f0cf6949af997d0a0a29f30a294c8df6e92f6f6af7ce64c2766b1a2cc67f342e3e139cd55b7326c94  libuv-v1.48.0.tar.gz
+"
diff --git a/main/libuv/disable-test-failing-on-builders.patch b/main/libuv/disable-test-failing-on-builders.patch
deleted file mode 100644
index 35007b40067..00000000000
--- a/main/libuv/disable-test-failing-on-builders.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/test/test-list.h b/test/test-list.h
-index a6cfc6b..613dc95 100644
---- a/test/test-list.h
-+++ b/test/test-list.h
-@@ -146,7 +146,6 @@ TEST_DECLARE   (udp_send_hang_loop)
- TEST_DECLARE   (udp_send_immediate)
- TEST_DECLARE   (udp_send_unreachable)
- TEST_DECLARE   (udp_multicast_join)
--TEST_DECLARE   (udp_multicast_join6)
- TEST_DECLARE   (udp_multicast_ttl)
- TEST_DECLARE   (udp_multicast_interface)
- TEST_DECLARE   (udp_multicast_interface6)
-@@ -679,7 +678,6 @@ TASK_LIST_START
-   TEST_ENTRY  (udp_multicast_interface)
-   TEST_ENTRY  (udp_multicast_interface6)
-   TEST_ENTRY  (udp_multicast_join)
--  TEST_ENTRY  (udp_multicast_join6)
-   TEST_ENTRY  (udp_multicast_ttl)
-   TEST_ENTRY  (udp_try_send)
- 
diff --git a/main/libva-glx/APKBUILD b/main/libva-glx/APKBUILD
deleted file mode 100644
index 2d4d2447673..00000000000
--- a/main/libva-glx/APKBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-
-# this package is to resolve the circular dependency libva -> mesa -> libva
-
-pkgname=libva-glx
-pkgver=2.6.1
-pkgrel=1
-pkgdesc="Video Acceleration (VA) API for Linux with MESA support"
-url="https://01.org/linuxmedia"
-arch="all"
-options="!check"  # No test suite.
-license="MIT"
-depends_dev="libva-dev mesa-dev libxfixes-dev"
-makedepends="$depends_dev meson wayland-dev"
-subpackages="$pkgname-dev"
-source="libva-$pkgver.tar.gz::https://github.com/intel/libva/archive/$pkgver.tar.gz"
-builddir="$srcdir"/libva-$pkgver
-
-prepare() {
-	( if [ -f "$startdir"/../libva/APKBUILD ]; then
-		_v=$pkgver
-		. "$startdir"/../libva/APKBUILD
-		if [ "$_v" != "$pkgver" ]; then
-			die "libva and libva-glx needs to be same version"
-		fi
-	fi )
-	default_prepare
-}
-
-build() {
-	meson builddir \
-		--prefix=/usr \
-		--buildtype=plain \
-		-Dwith_glx=yes \
-		-Dwith_wayland=yes
-	ninja -C builddir
-}
-
-package() {
-	DESTDIR="$pkgdir" ninja -C builddir install
-
-	mkdir -p $builddir/temp/usr/lib/pkgconfig $builddir/temp/usr/include/va
-
-	mv $pkgdir/usr/lib/libva-glx* $builddir/temp/usr/lib
-	mv $pkgdir/usr/include/va/va_glx.h $builddir/temp/usr/include/va
-	mv $pkgdir/usr/include/va/va_backend_glx.h $builddir/temp/usr/include/va
-	mv $pkgdir/usr/lib/pkgconfig/libva-glx.pc $builddir/temp/usr/lib/pkgconfig
-	rm -rf $pkgdir/*
-	mv $builddir/temp/* $pkgdir
-}
-
-sha512sums="29dd4df9da5f9a02149dadfc30cb5edfde63f2d912a99ef8dc4eecb983a09d2cd0451d61bad2b9bec0a25a6c2d2c60d644a2251e2141623fdf0a08eb3e70569a  libva-2.6.1.tar.gz"
diff --git a/main/libva-intel-driver/APKBUILD b/main/libva-intel-driver/APKBUILD
deleted file mode 100644
index 7e634af58e1..00000000000
--- a/main/libva-intel-driver/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libva-intel-driver
-pkgver=2.4.0
-pkgrel=1
-pkgdesc="VA-API implementation for Intel GMA chipsets and Intel HD Graphics"
-url="https://freedesktop.org/wiki/Software/vaapi"
-arch="x86 x86_64"
-license="MIT"
-makedepends="libdrm-dev libva-dev wayland-dev meson"
-install_if="libva xf86-video-intel"
-source="$pkgname-$pkgver.tar.gz::https://github.com/intel/intel-vaapi-driver/archive/$pkgver.pre1.tar.gz"
-
-builddir="$srcdir"/intel-vaapi-driver-$pkgver.pre1
-
-build() {
-	meson builddir \
-		--prefix=/usr \
-		--buildtype=plain \
-		-Dwith_wayland=yes \
-		-Dwith_x11=yes
-	ninja -C builddir
-}
-
-check() {
-	ninja -C builddir test
-}
-
-package() {
-	DESTDIR="$pkgdir" ninja -C builddir install
-}
-
-sha512sums="de4840a0e999defbccf4965b02fb0787b777795e5134894a4f30f67ec11fd1c99b765cd4a79802972671d38b3d20b443e76f75d34c03112a8fcb9b345a8640b5  libva-intel-driver-2.4.0.tar.gz"
diff --git a/main/libva/APKBUILD b/main/libva/APKBUILD
index b55b093ecd4..dc71a1755c9 100644
--- a/main/libva/APKBUILD
+++ b/main/libva/APKBUILD
@@ -1,7 +1,7 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libva
-pkgver=2.6.1
+pkgver=2.21.0
 pkgrel=0
 pkgdesc="Video Acceleration (VA) API for Linux"
 url="https://01.org/linuxmedia"
@@ -25,15 +25,18 @@ prepare() {
 }
 
 build() {
-	meson builddir \
-		--prefix=/usr \
+	abuild-meson \
+		-Db_lto=true \
 		-Dwith_glx=no \
-		-Dwith_wayland=yes
-	ninja -C builddir
+		-Dwith_wayland=yes \
+		builddir
+	meson compile -C builddir
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C builddir install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C builddir
 }
 
-sha512sums="29dd4df9da5f9a02149dadfc30cb5edfde63f2d912a99ef8dc4eecb983a09d2cd0451d61bad2b9bec0a25a6c2d2c60d644a2251e2141623fdf0a08eb3e70569a  libva-2.6.1.tar.gz"
+sha512sums="
+93654bb892e0e269d7682a1344fe6f7298432d1f2b347396c63aa1bd84ac0f707af34950a93098fe86a9bc8986fc9f97f75f0f15d8495ffd2caf8cf0eed9612c  libva-2.21.0.tar.gz
+"
diff --git a/main/libvdpau/APKBUILD b/main/libvdpau/APKBUILD
index 2a064e4586c..e9ca58306ae 100644
--- a/main/libvdpau/APKBUILD
+++ b/main/libvdpau/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libvdpau
-pkgver=1.3
-pkgrel=2
+pkgver=1.5
+pkgrel=3
 pkgdesc="Hardware-accelerated video playback library"
 url="https://gitlab.freedesktop.org/vdpau/libvdpau"
 arch="all"
@@ -12,26 +12,20 @@ subpackages="$pkgname-dev"
 source="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/$pkgver/libvdpau-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--buildtype=plain \
+	abuild-meson \
 		-Ddri2=true \
 		. output
-	ninja -C output
+	meson compile -C output
 }
 
 check() {
-	cd "$builddir"
-	ninja -C output test
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	cd "$builddir"
-	DESTDIR="$pkgdir" ninja -C output install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-sha512sums="7df0079c41ff7fd9f80e4500353c8154f57eb456f703aee4a9ff4d810185ef453fcf1b3925d13337b6765dbc86335e9700ef91f88b073c5bb5c8f9181447dea1  libvdpau-1.3.tar.gz"
+sha512sums="
+cebe0e0d9411b87238fa2adec40516881c61a67f33f80c22372f514e672e2dff839687291ab0b01d47af811c254fa65da579f360fcded3f65e382720548d3ea5  libvdpau-1.5.tar.gz
+"
diff --git a/main/libverto/APKBUILD b/main/libverto/APKBUILD
index f8f624b4136..133792f6e95 100644
--- a/main/libverto/APKBUILD
+++ b/main/libverto/APKBUILD
@@ -1,25 +1,22 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=libverto
-pkgver=0.3.1
-pkgrel=1
+pkgver=0.3.2
+pkgrel=2
 pkgdesc="Main loop abstraction library"
-url="https://github.com/npmccallum/libverto"
+url="https://github.com/latchset/libverto"
 arch="all"
 license="MIT"
 makedepends="glib-dev libevent-dev libev-dev automake autoconf libtool"
 subpackages="$pkgname-dev $pkgname-libev $pkgname-libevent $pkgname-glib"
-source="$pkgname-$pkgver.tar.gz::https://github.com/npmccallum/$pkgname/archive/$pkgver.tar.gz"
-builddir="$srcdir"/libverto-$pkgver
+source="$pkgname-$pkgver.tar.gz::https://github.com/latchset/libverto/archive/$pkgver.tar.gz"
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 	autoreconf -i
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,12 +27,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
@@ -49,4 +44,4 @@ libev() { _mv_backend libev; }
 libevent() { _mv_backend libevent; }
 glib() { _mv_backend glib; }
 
-sha512sums="8b46a5c410be210e52b92dccfe6e677026b26fd6cab1ee7a97d7eab4d4951913bde8768a77942189a0188ee336d5dcca2a985e9edc3a8c7529f164a7e5077bd8  libverto-0.3.1.tar.gz"
+sha512sums="0fb2b1bb80b62a06f8c068ba23011a5ddf1f640e08f3273292f33d9e4b6d101a3cd34113a592b7f4789931e95f180aae8d81e6fca94d8dc39dbf42d075da91f3  libverto-0.3.2.tar.gz"
diff --git a/main/libvirt/APKBUILD b/main/libvirt/APKBUILD
deleted file mode 100644
index b3b024ee0b7..00000000000
--- a/main/libvirt/APKBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname=libvirt
-pkgver=6.1.0
-_ver="${pkgver/_rc/-rc}"
-pkgrel=0
-pkgdesc="A virtualization API for several hypervisor and container systems"
-url="https://libvirt.org/"
-arch="all"
-options="!check"
-license="LGPL-2.1-or-later"
-_daemon_deps="bridge-utils dmidecode dnsmasq ip6tables iptables"
-_client_deps="pm-utils gnutls-utils netcat-openbsd"
-depends="lvm2"
-depends_dev="libtirpc-dev"
-makedepends="augeas-dev cyrus-sasl-dev device-mapper
-	e2fsprogs-dev gnutls-dev libcap-ng-dev libgpg-error-dev
-	netcf-dev libnl3-dev libxml2-dev libxslt-dev libtasn1-dev
-	lvm2-dev lxc-dev libgcrypt-dev parted-dev perl pkgconfig
-	eudev-dev zlib-dev yajl-dev libpcap-dev curl-dev libpciaccess-dev
-	polkit-dev readline-dev linux-headers jansson-dev
-	$depends_dev perl-xml-xpath
-	fuse-dev util-linux libxml2-utils bash-completion $_daemon_deps $_client_deps
-	automake autoconf libtool rpcsvc-proto py3-docutils
-	"
-install="$pkgname.post-install"
-subpackages="$pkgname-static $pkgname-libs $pkgname-dev $pkgname-doc $pkgname-client $pkgname-daemon
-	$pkgname-lang $pkgname-lxc $pkgname-qemu $pkgname-uml::noarch $pkgname-vbox
-	$pkgname-bash-completion:bashcomp:noarch"
-source="https://libvirt.org/sources/libvirt-$pkgver.tar.xz
-	libvirt.confd
-	libvirt.initd
-	virtlogd.initd
-	virtlockd.initd
-	musl-fix-includes.patch
-	stderr-fix.patch
-	"
-if [ "$CARCH" = "x86_64" ]; then
-	subpackages="$subpackages $pkgname-xen"
-	makedepends="$makedepends xen-dev zfs"
-fi
-subpackages="$subpackages $pkgname-common-drivers:_common_drivers"
-
-# secfixes:
-#   5.5.0-r0:
-#     - CVE-2019-10168
-#     - CVE-2019-10167
-#     - CVE-2019-10166
-#     - CVE-2019-10161
-
-prepare() {
-	default_prepare
-	mkdir -p build
-	cd build
-	autoreconf -fi ../
-}
-
-build() {
-	cd build
-	# qemu sets libexec dir to /usr/lib/qemu
-	export ac_cv_path_QEMU_BRIDGE_HELPER="/usr/lib/qemu/qemu-bridge-helper"
-	[ "$CARCH" = x86_64 ] && local _xen_opt="--with-libxl"
-	[ "$CARCH" = x86_64 ] && local _zfs_opt="--with-storage-zfs"
-	../configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--libexec=/usr/lib/"$pkgname" \
-		$_xen_opt \
-		$_zfs_opt \
-		--with-polkit \
-		--with-storage-fs \
-		--with-storage-lvm \
-		--enable-static \
-		--with-qemu \
-		--with-qemu-group=kvm \
-		--with-qemu-user=qemu
-	make
-}
-
-package() {
-	cd build
-	make DESTDIR="$pkgdir" install
-	install -D -m755 $srcdir/$pkgname.initd $pkgdir/etc/init.d/libvirtd
-	install -D -m755 $srcdir/$pkgname.confd $pkgdir/etc/conf.d/libvirtd
-	install -D -m755 $srcdir/virtlogd.initd $pkgdir/etc/init.d/virtlogd
-	install -D -m755 $srcdir/virtlockd.initd $pkgdir/etc/init.d/virtlockd
-
-	install -d "$pkgdir"/lib/modules-load.d
-	echo "tun" > "$pkgdir"/lib/modules-load.d/libvirt.conf
-
-	rm -rf "$pkgdir"/usr/lib/charset.alias
-	rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
-}
-
-dev() {
-	default_dev
-	mkdir -p "$subpkgdir"/usr/share/libvirt
-	mv "$pkgdir"/usr/share/libvirt/api \
-		"$subpkgdir"/usr/share/libvirt/
-}
-
-daemon() {
-	cd "$builddir"
-	pkgdesc="libvirt daemon package"
-	depends="libvirt-client $_daemon_deps"
-	replaces="libvirt"
-	mkdir -p "$subpkgdir"/etc/$pkgname \
-	 "$subpkgdir"/etc/logrotate.d \
-	 "$subpkgdir"/usr/sbin
-	mv "$pkgdir"/etc/init.d "$subpkgdir"/etc
-	mv "$pkgdir"/etc/conf.d "$subpkgdir"/etc
-	mv "$pkgdir"/lib/modules-load.d "$subpkgdir"/lib
-	mv "$pkgdir"/etc/$pkgname/libvirtd.conf "$subpkgdir"/etc/libvirt/
-	mv "$pkgdir"/usr/sbin/libvirtd "$subpkgdir"/usr/sbin/
-	mv "$pkgdir"/etc/logrotate.d/libvirtd "$subpkgdir"/etc/logrotate.d/
-}
-
-client() {
-	cd "$builddir"
-	pkgdesc="libvirt client package"
-	depends="libvirt $_client_deps"
-	replaces="libvirt"
-	mkdir -p "$subpkgdir"/etc/$pkgname "$subpkgdir"/usr/bin \
-		"$subpkgdir"/usr/lib
-	mv "$pkgdir"/etc/$pkgname/$pkgname.conf "$subpkgdir"/etc/libvirt/
-	mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/
-}
-
-static() {
-	pkgdesc="$pkgname static libraries"
-	mkdir -p "$subpkgdir"/usr/lib
-	cd "$pkgdir"
-	for _lib in  $(find . -name '*.a'); do
-		mkdir -p "$subpkgdir"/${_lib%/*}
-		mv "$_lib" "$subpkgdir"/${_lib%/*}/
-	done
-}
-
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-	mkdir -p "$subpkgdir"/usr/share/
-	mv "$pkgdir"/usr/share/bash-completion \
-		"$subpkgdir"/usr/share/
-}
-
-_mv_driver() {
-	local _name="$1" _drivers="$2" _pkg="$3"
-	pkgdesc="$_name driver for libvirt"
-	depends="$pkgname-daemon=$pkgver-r$pkgrel
-		$pkgname-common-drivers=$pkgver-r$pkgrel"
-	replaces="libvirt"
-	if [ -n "$_pkg" ]; then
-		install_if="$pkgname-daemon=$pkgver-r$pkgrel $_pkg"
-	else
-		install_if=
-	fi
-	local _dir=/usr/lib/libvirt/connection-driver
-	mkdir -p "$subpkgdir"/$_dir \
-		"$subpkgdir"/etc/libvirt \
-		"$subpkgdir"/etc/logrotate.d
-	local _d
-	cd "$pkgdir"
-	for _d in $_drivers; do
-		find * -name "*$_d[.-]*" -o -name "*$_d" | while read _f; do
-			mkdir -p "$subpkgdir"/${_f%/*}
-			mv "$pkgdir"/$_f "$subpkgdir"/$_f
-		done
-	done
-}
-
-qemu() { _mv_driver "QEMU" qemu qemu; }
-xen() { _mv_driver "XEN" "libxl xen" xen; }
-lxc() { _mv_driver "LXC" lxc lxc; }
-uml() { _mv_driver "UML" uml; }
-vbox() { _mv_driver "VirtualBox" vbox; }
-
-_common_drivers() {
-	pkgdesc="Common libvirt daemon drivers"
-	replaces="libvirt"
-	mkdir -p "$subpkgdir"/usr/lib/libvirt \
-		"$subpkgdir"/etc/libvirt/nwfilter
-	mv "$pkgdir"/usr/lib/libvirt/connection-driver \
-		"$subpkgdir"/usr/lib/libvirt/
-	mv "$pkgdir"/etc/libvirt/nwfilter \
-		"$subpkgdir"/etc/libvirt/
-}
-
-sha512sums="17a2641f300a4a05149261bae74ac856e9a2511a259146595d2e2412c4a0601d88369b0544ba86edc80e433a47cf828317d8de38c6ec86a1b3efaca75294a606  libvirt-6.1.0.tar.xz
-9aba6ab73219a635c64a340ee8887356e644445c9128734cbce73f5d54778378da2f10a190365ad88a7db8bc95b1fb17f0c6ca41fc41bb786c09e1afe84d65dc  libvirt.confd
-734afb83b7a4703dd238f1d89dbc853a8c73bcf1994af648c41ab01ae4088e5c7a423f0cb91e5e31f2ae5e60c66d08a6e1583a1e3b88bb5554e0f9fd15ecc15c  libvirt.initd
-36b85f473d292be8df415256d01a562131d8ae61450ba3893658090a12d589ca32215382f56f286a830b4e59ffd98fbe1d92004f2ce14ca0834451b943cd8f2f  virtlogd.initd
-a4c4d26e4111931acbe7594451bf963a36c8db33c64b1bc447ab4758bb92803510bebee0511d6bc16ba80c289ab6f87e74377d47bf560412f9adb9c161a206d9  virtlockd.initd
-dfe042c596028125bf8548115de2922683829c4716f6b0efb8efc38518670e3e848481661b9714bb0664c1022b87e8f3c0773611fe10187b0bc588e2336ada0c  musl-fix-includes.patch
-d32551d56eae2c33bab7571964f76421336967918c293cd1d18fc66626a7ead3551b5672a9e3fc3d8b7bca82cc0abb17e428ee8271d04d73bc06fd16309918b3  stderr-fix.patch"
diff --git a/main/libvirt/libvirt.confd b/main/libvirt/libvirt.confd
deleted file mode 100644
index d51bdb99d1f..00000000000
--- a/main/libvirt/libvirt.confd
+++ /dev/null
@@ -1,27 +0,0 @@
-# /etc/conf.d/libvirtd
-
-# You may want to add '--listen' to have libvirtd listen for tcp/ip connections
-# if you want to use libvirt for remote control
-
-# Please consult 'libvirtd --help' for more options
-
-#LIBVIRTD_OPTS="--listen"
-
-# Valid options:
-# * shutdown - Sends an ACPI shutdown (think when you tap the power button
-# 				on your machine and it begins a graceful shutdown). If your
-# 				VM ignores this, it will have the power yanked out from under
-# 				it in LIBVIRTD_KVM_SHUTDOWN_MAXWAIT seconds.
-# * managedsave - Performs a state save external to the VM. qemu-kvm will stop
-# 				stop the CPU and save off all state to a separate file. When
-# 				the machine is started again, it will resume like nothing ever
-# 				happened. This is guarenteed to always successfully stop your
-# 				machine and restart it. However it may take some time to finish.
-# * none - No attempts will be made to stop any VMs. If you are restarting your
-# 		machine the qemu-kvm process will be simply killed, which may result
-# 		in your VMs having disk corruption.
-LIBVIRTD_KVM_SHUTDOWN="managedsave"
-
-# Timeout in seconds until stopping libvirtd and "pulling the plug" on the
-# remaining VM's still in a running state
-#LIBVIRTD_KVM_SHUTDOWN_MAXWAIT="500"
diff --git a/main/libvirt/libvirt.initd b/main/libvirt/libvirt.initd
deleted file mode 100644
index 693b77b8862..00000000000
--- a/main/libvirt/libvirt.initd
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/sbin/openrc-run
-
-extra_started_commands="reload"
-
-depend() {
-    need net virtlogd
-    use virtlockd
-    after firewall
-}
-
-libvirtd_virsh() {
-    # Silence errors because virsh always throws an error about
-    # not finding the hypervisor version when connecting to libvirtd
-    LC_ALL=C virsh -c qemu:///system "$@" 2>/dev/null
-}
-
-libvirtd_dom_list() {
-    # Make sure that it wouldn't be confused if the domain name
-    # contains the word running.
-    libvirtd_virsh list | awk '$3 == "running" { print $1 }'
-}
-
-libvirtd_dom_count() {
-    # Make sure that it wouldn't be confused if the domain name
-    # contains the word running.
-    libvirtd_virsh list | awk 'BEGIN { count = 0 } \
-		$3 == "running" { count++ } \
-		END { print count }'
-}
-
-start() {
-    ebegin "Starting libvirtd"
-    start-stop-daemon --start \
-        --env KRB5_KTNAME=/etc/libvirt/krb5.tab \
-        --exec /usr/sbin/libvirtd --quiet -- -d ${LIBVIRTD_OPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping libvirtd"
-    # try to shutdown all (KVM/Qemu) domains
-    DOM_COUNT="$(libvirtd_dom_count)"
-    if [ "${LIBVIRTD_KVM_SHUTDOWN}" != "none" ] \
-        && [ "${DOM_COUNT}" != "0" ] ; then
-
-        einfo " Shutting down domain(s):"
-        for DOM_ID in $(libvirtd_dom_list) ; do
-            NAME="$(libvirtd_virsh domname ${DOM_ID} | head -n 1)"
-            einfo "   ${NAME}"
-            libvirtd_virsh ${LIBVIRTD_KVM_SHUTDOWN} ${DOM_ID} > /dev/null
-        done
-
-        if [ -n "${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" ] ; then
-            COUNTER="${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}"
-        else
-            COUNTER=500
-        fi
-
-		if [ "${LIBVIRTD_KVM_SHUTDOWN}" = "shutdown" ]; then
-			einfo " Waiting ${COUNTER} seconds while domains shutdown ..."
-			DOM_COUNT="$(libvirtd_dom_count)"
-			while [ ${DOM_COUNT} -gt 0 ] && [ ${COUNTER} -gt 0 ] ; do
-				DOM_COUNT="$(libvirtd_dom_count)"
-					sleep 1
-					COUNTER=$((${COUNTER} - 1))
-					echo -n "."
-			done
-		fi
-
-        DOM_COUNT="$(libvirtd_dom_count)"
-        if [ "${DOM_COUNT}" != "0" ] ; then
-            eerror " !!! Some guests are still running, stopping anyways"
-        fi
-
-    fi
-    start-stop-daemon --stop --quiet --exec /usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
-    eend $?
-}
-
-reload() {
-    ebegin "Reloading libvirtd without shutting down your VMs"
-    start-stop-daemon --stop --quiet --exec /usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
-	if [ $? -ne 0 ]; then
-		eend $?
-	fi
-    start-stop-daemon --start --quiet --exec /usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS}
-    eend $?
-}
diff --git a/main/libvirt/libvirt.post-install b/main/libvirt/libvirt.post-install
deleted file mode 100755
index a7477012d38..00000000000
--- a/main/libvirt/libvirt.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-addgroup -S libvirt 2>/dev/null
-
-exit 0
diff --git a/main/libvirt/musl-fix-includes.patch b/main/libvirt/musl-fix-includes.patch
deleted file mode 100644
index 6b7cee93d5a..00000000000
--- a/main/libvirt/musl-fix-includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
-index 0837443..0954e11 100644
---- a/src/storage/storage_backend_fs.c
-+++ b/src/storage/storage_backend_fs.c
-@@ -26,6 +26,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <paths.h>
- 
- #include "virerror.h"
- #include "storage_backend_fs.h"
diff --git a/main/libvirt/stderr-fix.patch b/main/libvirt/stderr-fix.patch
deleted file mode 100644
index 9d26721872c..00000000000
--- a/main/libvirt/stderr-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/qemu/qemu_process.c	2019-03-07 18:52:23.722271821 +0100
-+++ b/src/qemu/qemu_process.c	2019-03-07 18:53:53.129064501 +0100
-@@ -92,6 +92,10 @@
- 
- VIR_LOG_INIT("qemu.qemu_process");
- 
-+#ifdef stderr
-+#  undef stderr
-+#endif
-+
- /**
-  * qemuProcessRemoveDomainStatus
-  *
diff --git a/main/libvirt/virtlockd.initd b/main/libvirt/virtlockd.initd
deleted file mode 100644
index ebb7ecf9fd0..00000000000
--- a/main/libvirt/virtlockd.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-description="libvirt virtual machine lock manager"
-command="/usr/sbin/virtlockd"
-command_args="-d"
-pidfile="/var/run/virtlockd.pid"
-
-extra_started_commands="reload"
-description_reload="re-exec the daemon, while maintaining locks and clients"
-
-
-depend() {
-    after ntp-client ntpd nfs nfsmount corosync
-}
-
-reload() {
-    ebegin "re-exec() virtlockd"
-
-    start-stop-daemon --signal SIGUSR1 \
-      --exec "${command}" --pidfile "${pidfile}"
-}
-
diff --git a/main/libvirt/virtlogd.initd b/main/libvirt/virtlogd.initd
deleted file mode 100644
index 0d3493bd564..00000000000
--- a/main/libvirt/virtlogd.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-description="libvirt virtual machine logging manager"
-command="/usr/sbin/virtlogd"
-command_args="-d"
-pidfile="/var/run/virtlogd.pid"
-
-extra_started_commands="reload"
-description_reload="re-exec the daemon, while maintaining open connections"
-
-
-depend() {
-    after ntp-client ntpd nfs nfsmount corosync
-}
-
-reload() {
-    ebegin "re-exec() virtlogd"
-
-    start-stop-daemon --signal SIGUSR1 \
-      --exec "${command}" --pidfile "${pidfile}"
-}
diff --git a/main/libvorbis/APKBUILD b/main/libvorbis/APKBUILD
index 390b4d840e2..1abdf1db95a 100644
--- a/main/libvorbis/APKBUILD
+++ b/main/libvorbis/APKBUILD
@@ -1,40 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libvorbis
-pkgver=1.3.6
+pkgver=1.3.7
 pkgrel=2
 pkgdesc="Vorbis codec library"
 url="https://xiph.org/vorbis"
 arch="all"
 license="BSD-3-Clause"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 makedepends="libogg-dev"
-source="http://downloads.xiph.org/releases/vorbis/$pkgname-$pkgver.tar.xz
-	CVE-2017-14160.patch
-	CVE-2018-10392.patch
-	CVE-2018-10393.patch
-	"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://downloads.xiph.org/releases/vorbis/libvorbis-$pkgver.tar.xz"
 
 # secfixes:
 #   1.3.6-r2:
-#   - CVE-2018-10393
+#     - CVE-2018-10393
 #   1.3.6-r1:
-#   - CVE-2018-10392
+#     - CVE-2018-10392
 #   1.3.6-r0:
-#   - CVE-2018-5146
+#     - CVE-2018-5146
 #   1.3.5-r4:
-#   - CVE-2017-14632
-#   - CVE-2017-14633
+#     - CVE-2017-14632
+#     - CVE-2017-14633
 #   1.3.5-r3:
-#   - CVE-2017-14160
-#   - CVE-2018-10393
+#     - CVE-2017-14160
 
 prepare() {
-	default_prepare
+ 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -46,16 +40,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make -j1 check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a5d990bb88db2501b16f8eaee9f2ecb599cefd7dab2134d16538d8905263a972157c7671867848c2a8a358bf5e5dbc7721205ece001032482f168be7bda4f132  libvorbis-1.3.6.tar.xz
-4c2f7be947f2159ae47175cba89950c7b7d357b37a20d54382e4fbecd8c268b148e6cb86cb148945c7b68bbe8b14f466e910b35b80903ab51f1b02cfccf5806e  CVE-2017-14160.patch
-a60d45144882bc72c3f4937a34baa5e2bda80a3a858b858637fee508755349b616690519e013ff6aafa7e8ff85fd1d0687a3e748b0e8bce25df1abeece97dc36  CVE-2018-10392.patch
-aaa8c09458ad20d45392c99781130ba815f839484b65c61e404198bae570e12401c2cf612f9c4f0b3932cc9e5eac0b066d515950425afa6eb2d6db7cc67731a6  CVE-2018-10393.patch"
+sha512sums="bbf5f11f623d959b3ba98d6b52806521b0b918b59b867f0658c153ea1013293364eead4987e9e71f8798021379310860a2e548fcf89d10caf23d45e41aba45cd  libvorbis-1.3.7.tar.xz"
diff --git a/main/libvorbis/CVE-2017-14160.patch b/main/libvorbis/CVE-2017-14160.patch
deleted file mode 100644
index 9ad9d18f750..00000000000
--- a/main/libvorbis/CVE-2017-14160.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 98a60969315dba8c1e8231f561e1551670bc80ae Mon Sep 17 00:00:00 2001
-Message-Id: <98a60969315dba8c1e8231f561e1551670bc80ae.1511192857.git.agx@sigxcpu.org>
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Wed, 15 Nov 2017 13:12:00 +0100
-Subject: [PATCH] CVE-2017-14160: make sure we don't overflow
-
----
- lib/psy.c | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/lib/psy.c b/lib/psy.c
-index 422c6f1e..8bbf6cf3 100644
---- a/lib/psy.c
-+++ b/lib/psy.c
-@@ -599,7 +599,7 @@ static void bark_noise_hybridmp(int n,const long *b,
-     XY[i] = tXY;
-   }
- 
--  for (i = 0, x = 0.f;; i++, x += 1.f) {
-+  for (i = 0, x = 0.f; i < n; i++, x += 1.f) {
- 
-     lo = b[i] >> 16;
-     if( lo>=0 ) break;
-@@ -621,12 +621,11 @@ static void bark_noise_hybridmp(int n,const long *b,
-     noise[i] = R - offset;
-   }
- 
--  for ( ;; i++, x += 1.f) {
-+  for ( ; i < n; i++, x += 1.f) {
- 
-     lo = b[i] >> 16;
-     hi = b[i] & 0xffff;
-     if(hi>=n)break;
--
-     tN = N[hi] - N[lo];
-     tX = X[hi] - X[lo];
-     tXX = XX[hi] - XX[lo];
-@@ -651,7 +650,7 @@ static void bark_noise_hybridmp(int n,const long *b,
- 
-   if (fixed <= 0) return;
- 
--  for (i = 0, x = 0.f;; i++, x += 1.f) {
-+  for (i = 0, x = 0.f; i < n; i++, x += 1.f) {
-     hi = i + fixed / 2;
-     lo = hi - fixed;
-     if(lo>=0)break;
-@@ -670,7 +669,7 @@ static void bark_noise_hybridmp(int n,const long *b,
- 
-     if (R - offset < noise[i]) noise[i] = R - offset;
-   }
--  for ( ;; i++, x += 1.f) {
-+  for ( ; i < n; i++, x += 1.f) {
- 
-     hi = i + fixed / 2;
-     lo = hi - fixed;
--- 
-2.15.0
-
diff --git a/main/libvorbis/CVE-2018-10392.patch b/main/libvorbis/CVE-2018-10392.patch
deleted file mode 100644
index 3d3a16cdea4..00000000000
--- a/main/libvorbis/CVE-2018-10392.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 112d3bd0aaacad51305e1464d4b381dabad0e88b Mon Sep 17 00:00:00 2001
-From: Thomas Daede <daede003@umn.edu>
-Date: Thu, 17 May 2018 16:19:19 -0700
-Subject: [PATCH] Sanity check number of channels in setup.
-
-Fixes #2335.
----
- lib/vorbisenc.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/vorbisenc.c b/lib/vorbisenc.c
-index 4fc7b62..64a51b5 100644
---- a/lib/vorbisenc.c
-+++ b/lib/vorbisenc.c
-@@ -684,6 +684,7 @@ int vorbis_encode_setup_init(vorbis_info *vi){
-   highlevel_encode_setup *hi=&ci->hi;
- 
-   if(ci==NULL)return(OV_EINVAL);
-+  if(vi->channels<1||vi->channels>255)return(OV_EINVAL);
-   if(!hi->impulse_block_p)i0=1;
- 
-   /* too low/high an ATH floater is nonsensical, but doesn't break anything */
---
-libgit2 0.26.0
-
diff --git a/main/libvorbis/CVE-2018-10393.patch b/main/libvorbis/CVE-2018-10393.patch
deleted file mode 100644
index c61247a5085..00000000000
--- a/main/libvorbis/CVE-2018-10393.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 018ca26dece618457dd13585cad52941193c4a25 Mon Sep 17 00:00:00 2001
-From: Thomas Daede <daede003@umn.edu>
-Date: Wed, 9 May 2018 14:56:59 -0700
-Subject: [PATCH] CVE-2017-14160: fix bounds check on very low sample rates.
-
----
- lib/psy.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/psy.c b/lib/psy.c
-index 422c6f1e..13101230 100644
---- a/lib/psy.c
-+++ b/lib/psy.c
-@@ -602,8 +602,9 @@ static void bark_noise_hybridmp(int n,const long *b,
-   for (i = 0, x = 0.f;; i++, x += 1.f) {
- 
-     lo = b[i] >> 16;
--    if( lo>=0 ) break;
-     hi = b[i] & 0xffff;
-+    if( lo>=0 ) break;
-+    if( hi>=n ) break;
- 
-     tN = N[hi] + N[-lo];
-     tX = X[hi] - X[-lo];
--- 
-2.18.0
-
diff --git a/main/libwebp/APKBUILD b/main/libwebp/APKBUILD
index 33938e60f3d..9831a09ee13 100644
--- a/main/libwebp/APKBUILD
+++ b/main/libwebp/APKBUILD
@@ -1,30 +1,41 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libwebp
-pkgver=1.1.0
+pkgver=1.3.2
 pkgrel=0
 pkgdesc="Libraries for working with WebP images"
 url="https://developers.google.com/speed/webp"
 arch="all"
 license="BSD-3-Clause"
-makedepends="autoconf automake giflib-dev libjpeg-turbo-dev libpng-dev libtool
-	tiff-dev"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-tools"
+makedepends="giflib-dev libjpeg-turbo-dev libpng-dev"
+subpackages="
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-tools
+	libsharpyuv:_lib
+	libwebpdecoder:_lib
+	libwebpdemux:_lib
+	libwebpmux:_lib
+	"
 source="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$pkgver.tar.gz"
 
-prepare() {
-	default_prepare
-	./autogen.sh
-}
+# secfixes:
+#   1.3.1-r1:
+#     - CVE-2023-4863
+#   1.3.0-r3:
+#     - CVE-2023-1999
 
 build() {
+	CFLAGS="$CFLAGS -O2 -flto=auto -ffat-lto-objects" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--enable-libwebpmux \
 		--enable-libwebpdemux \
-		--enable-libwebpdecoder
+		--enable-libwebpdecoder \
+		--disable-tiff # dependency-loop
 	make
 }
 
@@ -35,13 +46,19 @@ check() {
 package() {
 	make DESTDIR="$pkgdir" install
 	mkdir -p "$pkgdir"/usr/share/doc/$pkgname
-	install -Dm644 PATENTS README "$pkgdir"/usr/share/doc/$pkgname
+	install -Dm644 PATENTS README.md "$pkgdir"/usr/share/doc/$pkgname
 }
 
 tools() {
 	pkgdesc="The WebP command line tools"
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+	amove usr/bin
+}
+
+_lib() {
+	pkgdesc="$pkgdesc ($subpkgname library)"
+	amove usr/lib/$subpkgname.so.*
 }
 
-sha512sums="c8440059a985587d4876a5e7fc2d07523bc7f582a04ee5dab0ef07df32b9635b907224de2cc15246c831dd5d9215569770196626badccc3171fe2832d7cb4549  libwebp-1.1.0.tar.gz"
+sha512sums="
+2b624d2ecfbff6b4db2719e38f146722638ae262acd96327073a04451dd05fb27ef70c5681187821d251df728a6be7e89209c861c561a13bfb786495a830bc20  libwebp-1.3.2.tar.gz
+"
diff --git a/main/libwebsockets/APKBUILD b/main/libwebsockets/APKBUILD
index 16f3c8a6e34..ecb00222c50 100644
--- a/main/libwebsockets/APKBUILD
+++ b/main/libwebsockets/APKBUILD
@@ -1,39 +1,40 @@
 # Contributor: V.Krishn <vkrishn4@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libwebsockets
-pkgver=3.2.2
+pkgver=4.3.3
 pkgrel=0
 pkgdesc="C library for lightweight websocket clients and servers"
-url="https://libwebsockets.org"
+url="https://libwebsockets.org/"
 arch="all"
-license="LGPL-2.0-or-later"
-options="!check"
-makedepends="cmake zlib-dev openssl-dev"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-test:_test"
-source="libwebsockets-$pkgver.tar.gz::https://github.com/warmcat/libwebsockets/archive/v$pkgver.tar.gz"
+license="MIT"
+makedepends="cmake linux-headers openssl-dev>3 zlib-dev libuv-dev samurai"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-test:_test $pkgname-evlib_uv:_evlib"
+source="$pkgname-$pkgver.tar.gz::https://github.com/warmcat/libwebsockets/archive/v$pkgver.tar.gz
+	fix-version-string.patch
+	"
 
 build() {
-	mkdir -p "$builddir"/build
-	cd "$builddir"/build
-
-	cmake .. \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_VERBOSE_MAKEFILE=TRUE \
+		-DLWS_IPV6=ON \
+		-DLWS_WITH_LIBUV=ON \
 		-DLWS_WITH_STATIC=OFF \
-		-DLWS_LINK_TESTAPPS_DYNAMIC=ON
-	make
+		-DLWS_LINK_TESTAPPS_DYNAMIC=ON \
+		-DLWS_WITH_SDEVENT=OFF
+	cmake --build build
 }
 
 # TODO: Use test subpkg to validate
 check() {
-	make check
+	ctest --test-dir build --output-on-failure
 }
 
 package() {
 	install -Dm644 LICENSE \
 		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-	make -C build DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
 _test() {
@@ -43,4 +44,13 @@ _test() {
 	mv "$pkgdir"/usr/share "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-sha512sums="be6cd57ae1d15de059c277ce56e9ccc87f7918811b40a427c96978397f2b1d446e1b5ed6ae62a6aa82c6d775871d6a15885d283d74d7887e98205ab61d206fc0  libwebsockets-3.2.2.tar.gz"
+_evlib() {
+	local _plugin=${subpkgname#$pkgname-}
+	pkgdesc="libwebsocket $_plugin plugin"
+	amove usr/lib/libwebsockets-$_plugin.so
+}
+
+sha512sums="
+2ffd248ddf283369725097ca7410f947fe0389c360b329c76f0754afab4ba87c20a0687c5e7b8bd991b157f9d20c6faa3049757b3398e66d08662c3aa7ff9658  libwebsockets-4.3.3.tar.gz
+9325b7cadeb2ca8fb20b4759feb49fb255b1b14c432b7c8c3a1b793a49266bb4f69b78a9c72656039e94ba4fc59ca2c5e821ba33e4f133e72cab26786feb9d60  fix-version-string.patch
+"
diff --git a/main/libwebsockets/fix-version-string.patch b/main/libwebsockets/fix-version-string.patch
new file mode 100644
index 00000000000..416f586f957
--- /dev/null
+++ b/main/libwebsockets/fix-version-string.patch
@@ -0,0 +1,15 @@
+Exclude the git hash from aports tree in the libwebsocket.pc version
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 42abee8..2ed3f7a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -340,7 +340,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR "4")
+ set(CPACK_PACKAGE_VERSION_MINOR "1")
+ set(CPACK_PACKAGE_VERSION_PATCH_NUMBER "4")
+ 
+-set(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH_NUMBER}-${LWS_BUILD_HASH}")
++set(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH_NUMBER}")
+ set(CPACK_PACKAGE_RELEASE 1)
+ 
+ set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
diff --git a/main/libx11/APKBUILD b/main/libx11/APKBUILD
index a16022292c5..b9873d64ecf 100644
--- a/main/libx11/APKBUILD
+++ b/main/libx11/APKBUILD
@@ -1,26 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libx11
-pkgver=1.6.9
-pkgrel=0
+pkgver=1.8.9
+pkgrel=1
 pkgdesc="X11 client-side library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
-license="custom:XFREE86"
+license="X11"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 depends_dev="libxcb-dev xtrans"
 makedepends="$depends_dev xorgproto util-macros xmlto"
-source="https://www.x.org/releases/individual/lib/libX11-$pkgver.tar.bz2"
-
+source="https://www.x.org/releases/individual/lib/libX11-$pkgver.tar.xz"
 builddir="$srcdir"/libX11-$pkgver
 
 # secfixes:
+#   1.8.7-r0:
+#     - CVE-2023-43785
+#     - CVE-2023-43786
+#     - CVE-2023-43787
+#   1.7.1-r0:
+#     - CVE-2021-31535
+#   1.6.12-r0:
+#     - CVE-2020-14363
+#   1.6.10-r0:
+#     - CVE-2020-14344
 #   1.6.6-r0:
-#   - CVE-2018-14598
-#   - CVE-2018-14599
-#   - CVE-2018-14600
+#     - CVE-2018-14598
+#     - CVE-2018-14599
+#     - CVE-2018-14600
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,19 +36,19 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
-		--with-xcb
+		--disable-xf86bigfont
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="fc18f0dc17ade1fc37402179f52e1f2b9c7b7d3a1a9590fea13046eb0c5193b4796289431cd99388eac01e8e59de77db45d2c9675d4f05ef8cf3ba6382c3dd31  libX11-1.6.9.tar.bz2"
+sha512sums="
+737af91818537295ac86be601b1e3d7e37d150716ec549580913b7cc9a44fee7a6ce9dbc3d46167eed91f23fe857c4dd355ed8f8440fe5fbbf8e9ebe47091b96  libX11-1.8.9.tar.xz
+"
diff --git a/main/libxau/APKBUILD b/main/libxau/APKBUILD
index 8bd22dc5c51..3ee0cd25c2c 100644
--- a/main/libxau/APKBUILD
+++ b/main/libxau/APKBUILD
@@ -1,20 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxau
-pkgver=1.0.9
-pkgrel=0
+pkgver=1.0.11
+pkgrel=4
 pkgdesc="X11 authorisation library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
-depends=
 makedepends="xorgproto util-macros"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://www.x.org/releases/individual/lib/libXau-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/lib/libXau-$pkgver.tar.xz"
 
 builddir="$srcdir"/libXau-$pkgver
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,15 +22,14 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	install -m755 -d "$pkgdir"/usr/share/licenses/$pkgname
-	install -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562  libXau-1.0.9.tar.bz2"
+sha512sums="
+f56abba3bef3fdd4739dfa69367a4251b5fab7c89194c9aece9efa66b9ebbf0736690cc9bd654aab19d9db377e4b9a5268c9c020b3d293bb5351bff5fe75a4dd  libXau-1.0.11.tar.xz
+"
diff --git a/main/libxaw/APKBUILD b/main/libxaw/APKBUILD
index 3978b146ac0..989dc1fc68f 100644
--- a/main/libxaw/APKBUILD
+++ b/main/libxaw/APKBUILD
@@ -1,18 +1,24 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxaw
-pkgver=1.0.13
-pkgrel=3
+pkgver=1.0.16
+pkgrel=1
 pkgdesc="X Athena Widget Set"
-url="https://www.x.org"
+url="https://www.x.org/"
 arch="all"
 license="MIT"
-makedepends="libxmu-dev libxpm-dev libxext-dev libx11-dev util-macros xorgproto"
+makedepends="
+	libx11-dev
+	libxext-dev
+	libxmu-dev
+	libxpm-dev
+	util-macros
+	xorgproto
+	"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://www.x.org/releases/individual/lib/libXaw-$pkgver.tar.bz2"
-
+source="https://www.x.org/releases/individual/lib/libXaw-$pkgver.tar.xz"
 builddir="$srcdir"/libXaw-$pkgver
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -21,20 +27,19 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--disable-xaw8 \
 		--disable-static \
 		--disable-xaw6
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d768a39f7111802493fa1df1b80d858e4139ceeb883d45ff13ce3b7a0e775a7d2834b7ad157c8330117f04c32f38979795332dd7a119adb2344fcb1aa9cf1e2f  libXaw-1.0.13.tar.bz2"
+sha512sums="
+1cabad1a9b06dec7de601b977e844536823ee1a0045244acc42ca6b6107da9b4953736d94898a96cab40845eab77dae21e20e1fa66a3dfc4dedf575dfbca04aa  libXaw-1.0.16.tar.xz
+"
diff --git a/main/libxcb/APKBUILD b/main/libxcb/APKBUILD
index e603828416a..a93a8b8c328 100644
--- a/main/libxcb/APKBUILD
+++ b/main/libxcb/APKBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxcb
-pkgver=1.14
+pkgver=1.16.1
 pkgrel=0
 pkgdesc="X11 client-side library"
-url="https://xcb.freedesktop.org"
+url="https://xcb.freedesktop.org/"
 arch="all"
 license="MIT"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 depends_dev="libxau-dev xcb-proto"
 checkdepends="check-dev"
 options="!check" # upstream requires an old check version (0.9.4)
-makedepends="$depends_dev libpthread-stubs libxdmcp-dev libxslt python3"
+makedepends="$depends_dev libxdmcp-dev libxslt python3"
 source="https://xorg.freedesktop.org/archive/individual/lib/libxcb-$pkgver.tar.xz"
 
 build() {
@@ -32,4 +32,6 @@ check() {
 	make check
 }
 
-sha512sums="b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6  libxcb-1.14.tar.xz"
+sha512sums="
+e3afdae1c0e2a5ae2add7b2c4fdd3283cb86023ef6448f5b8b29a4bb72c274e34eaf0fc7523762bcd3f5116910fe7374490e8f26c25744301563ced80acc3e7f  libxcb-1.16.1.tar.xz
+"
diff --git a/main/libxcomposite/APKBUILD b/main/libxcomposite/APKBUILD
index e4741c2fd5f..2a4822d71f9 100644
--- a/main/libxcomposite/APKBUILD
+++ b/main/libxcomposite/APKBUILD
@@ -1,22 +1,20 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxcomposite
-pkgver=0.4.5
-pkgrel=0
+pkgver=0.4.6
+pkgrel=5
 pkgdesc="X11 Composite extension library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
-license="custom"
+license="MIT"
 options="!check"  # No test suite.
 subpackages="$pkgname-dev $pkgname-doc"
 depends_dev="libxext-dev"
 makedepends="xorgproto libx11-dev libxext-dev libxfixes-dev util-macros"
-source="https://www.x.org/releases/individual/lib/libXcomposite-$pkgver.tar.bz2"
-
+source="https://www.x.org/releases/individual/lib/libXcomposite-$pkgver.tar.xz"
 builddir="$srcdir"/libXcomposite-$pkgver
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,9 +24,10 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5  libXcomposite-0.4.5.tar.bz2"
+sha512sums="
+f35a0da8f9f22fd788eee01209557fe3a1b1abdc9744f76330ba42b21b6e3af5464ca4451c33415856417c30da5aa5624e3707980c644327249bfeda5a62a59b  libXcomposite-0.4.6.tar.xz
+"
diff --git a/main/libxcursor/APKBUILD b/main/libxcursor/APKBUILD
index 07bc5dc1702..f7fdd53e9bc 100644
--- a/main/libxcursor/APKBUILD
+++ b/main/libxcursor/APKBUILD
@@ -1,24 +1,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxcursor
-pkgver=1.2.0
-pkgrel=0
+pkgver=1.2.2
+pkgrel=1
 pkgdesc="X cursor management library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 options="!check"  # No test suite.
 subpackages="$pkgname-dev $pkgname-doc"
-depends=
 makedepends="xorgproto util-macros libx11-dev libxrender-dev libxfixes-dev"
-source="https://www.x.org/releases/individual/lib/libXcursor-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/lib/libXcursor-$pkgver.tar.xz"
 builddir="$srcdir"/libXcursor-$pkgver
 
 # secfixes:
 #   1.1.15-r0:
 #     - CVE-2017-16612
 
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,8 +31,9 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03  libXcursor-1.2.0.tar.bz2"
+sha512sums="
+6550ce1e69b35ef3356f25e31aa2779503d9cea780eff307cb646364993dfaa971304085d32677e68996bd3b8e067436c8fc89aeb4db07a12ce5bc93b735b5b0  libXcursor-1.2.2.tar.xz
+"
diff --git a/main/libxdamage/APKBUILD b/main/libxdamage/APKBUILD
index 0e035451200..408b271927b 100644
--- a/main/libxdamage/APKBUILD
+++ b/main/libxdamage/APKBUILD
@@ -1,32 +1,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxdamage
-pkgver=1.1.5
-pkgrel=0
+pkgver=1.1.6
+pkgrel=5
 pkgdesc="X11 damaged region extension library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 options="!check"  # No test suite.
-depends=
 makedepends="xorgproto libx11-dev libxfixes-dev util-macros"
 subpackages="$pkgname-dev"
-source="https://www.x.org/releases/individual/lib/libXdamage-$pkgver.tar.bz2"
-
+source="https://www.x.org/releases/individual/lib/libXdamage-$pkgver.tar.xz"
 builddir="$srcdir"/libXdamage-$pkgver
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--sysconfdir=/etc
+		--sysconfdir=/etc \
+		--disable-static
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124  libXdamage-1.1.5.tar.bz2"
+sha512sums="
+624dcefa1c79064569df952892f7f1351dc19ad338ce73d1a57041e406cb3e18abe531bab352b93d1f0f5c9b5c6b2652cc84a8f1fbfcbba648343812695a8acb  libXdamage-1.1.6.tar.xz
+"
diff --git a/main/libxdmcp/APKBUILD b/main/libxdmcp/APKBUILD
index 1b64266a345..6fdc55ec79b 100644
--- a/main/libxdmcp/APKBUILD
+++ b/main/libxdmcp/APKBUILD
@@ -1,22 +1,21 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxdmcp
-pkgver=1.1.3
-pkgrel=0
+pkgver=1.1.5
+pkgrel=1
 pkgdesc="X11 Display Manager Control Protocol library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 makedepends="xorgproto libbsd-dev util-macros xmlto"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://www.x.org/releases/individual/lib/libXdmcp-$pkgver.tar.bz2"
-
+source="https://www.x.org/releases/individual/lib/libXdmcp-$pkgver.tar.xz"
 builddir="$srcdir/libXdmcp-$pkgver"
+
 # secfixes:
 #   1.1.2-r3:
-#   - CVE-2017-2625
+#     - CVE-2017-2625
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +25,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
-sha512sums="cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec  libXdmcp-1.1.3.tar.bz2"
+
+sha512sums="
+d7a1d70a58b7d34ddd01a91d3ccbc086a36626b7081cfcbb150d24288c6adad612b042ba7ea63a218595afb2ee04384c0f8ba84ee3c6bd29913724b54e898d83  libXdmcp-1.1.5.tar.xz
+"
diff --git a/main/libxext/APKBUILD b/main/libxext/APKBUILD
index b811247bdbc..e953421741f 100644
--- a/main/libxext/APKBUILD
+++ b/main/libxext/APKBUILD
@@ -1,36 +1,36 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxext
-pkgver=1.3.4
-pkgrel=0
+pkgver=1.3.6
+pkgrel=2
 pkgdesc="X11 miscellaneous extensions library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
-depends=
 depends_dev="libxau-dev"
 makedepends="$depends_dev libx11-dev xorgproto util-macros xmlto"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 options="!check"
-source="https://www.x.org/releases/individual/lib/libXext-$pkgver.tar.bz2
+source="https://www.x.org/releases/individual/lib/libXext-$pkgver.tar.xz
 	"
 
 builddir="$srcdir"/libXext-$pkgver
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
+		--enable-static \
 		--with-xmlto \
 		--without-fop
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a  libXext-1.3.4.tar.bz2"
+sha512sums="
+fd7693b5698cc4f5e80002a2cd4bd88e5d52c755c19a0417ee73029bd65f9d77b0969e765a1febc4d8fce1ba5dfb7278717f47be742e33d8fc5eb941e769792e  libXext-1.3.6.tar.xz
+"
diff --git a/main/libxfixes/APKBUILD b/main/libxfixes/APKBUILD
index d357e49480e..692ca9b7304 100644
--- a/main/libxfixes/APKBUILD
+++ b/main/libxfixes/APKBUILD
@@ -1,21 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxfixes
-pkgver=5.0.3
-pkgrel=2
+pkgver=6.0.1
+pkgrel=4
 pkgdesc="X11 miscellaneous 'fixes' extension library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
-license="custom"
+license="MIT"
 options="!check"  # No test suite.
-depends=
 makedepends="xorgproto libx11-dev util-macros"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://www.x.org/releases/individual/lib/libXfixes-$pkgver.tar.bz2"
-
+source="https://www.x.org/releases/individual/lib/libXfixes-$pkgver.tar.xz"
 builddir="$srcdir"/libXfixes-$pkgver
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,8 +24,9 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="72d5ee496e5c0520c95ef6bbb52deff1ee4c29792f11aa17aeb25c8ec5eb992ca502de040c77ad95835d1b1432f315b6cb7a3308b434847c28b9c2c6f9d1ac10  libXfixes-5.0.3.tar.bz2"
+sha512sums="
+b46deffb30cd73ec8a127390d99f2ba2f3ab78f334fdba227f1f461441644a0c169b0d13ffa47576fa458780e7a6db664ff8b93e9195fb217262efd8128f1ffe  libXfixes-6.0.1.tar.xz
+"
diff --git a/main/libxfont/APKBUILD b/main/libxfont/APKBUILD
deleted file mode 100644
index 76917a8ebcb..00000000000
--- a/main/libxfont/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxfont
-pkgver=1.5.4
-pkgrel=1
-pkgdesc="X11 font rasterisation library"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-options="!check"  # No test suite.
-subpackages="$pkgname-dev"
-depends=""
-makedepends="xorgproto libfontenc-dev freetype-dev xtrans zlib-dev util-macros"
-source="https://www.x.org/archive/individual/lib/libXfont-$pkgver.tar.bz2"
-builddir="$srcdir/libXfont-$pkgver"
-
-# secfixes:
-#   1.5.4-r0:
-#     - CVE-2017-16611
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="864edbaff45c44bd92bc4b06275c73fdf584a9b88bc523a297d4c75c01ca253f438463e929af70d753ddecfa648bb0b9bcf0ec72267db9f2b1704f7afa906cb3  libXfont-1.5.4.tar.bz2"
diff --git a/main/libxfont2/APKBUILD b/main/libxfont2/APKBUILD
deleted file mode 100644
index 9f552faa905..00000000000
--- a/main/libxfont2/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxfont2
-pkgver=2.0.4
-pkgrel=0
-pkgdesc="X.Org X11 libXfont2 runtime library"
-url="https://www.x.org"
-arch="all"
-license="MIT"
-options="!check"  # No test suite.
-makedepends="$depends_dev libfontenc-dev freetype-dev zlib-dev xtrans
-	util-macros autoconf automake libtool xorgproto"
-subpackages="$pkgname-dev"
-source="https://www.x.org/pub/individual/lib/libXfont2-$pkgver.tar.bz2"
-builddir="$srcdir/libXfont2-$pkgver"
-
-# secfixes:
-#   2.0.3-r0:
-#     - CVE-2017-16611
-
-prepare() {
-	default_prepare
-	autoreconf -vif
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--disable-static \
-		--without-fop
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="7cf6c58e520e48e24fc4f05fec760fcbeaaac0cedeed57dded262c855e1515cc34cd033222945a0b016f6857b83009fc2a6946c7d632c2f7bb0060f8e8a8a106  libXfont2-2.0.4.tar.bz2"
diff --git a/main/libxft/APKBUILD b/main/libxft/APKBUILD
index f00d287693f..33b9b180dcc 100644
--- a/main/libxft/APKBUILD
+++ b/main/libxft/APKBUILD
@@ -1,22 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxft
-pkgver=2.3.3
-pkgrel=0
+pkgver=2.3.8
+pkgrel=3
 pkgdesc="FreeType-based font drawing library for X"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 options="!check"  # No test suite.
 subpackages="$pkgname-dev $pkgname-doc"
-depends=
 depends_dev="zlib-dev"
 makedepends="$depends_dev xorgproto fontconfig-dev freetype-dev libxrender-dev util-macros"
-source="https://www.x.org/releases/individual/lib/libXft-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/lib/libXft-$pkgver.tar.xz"
 
 builddir="$srcdir/libXft-$pkgver"
 
-build () {
-	cd "$builddir"
+build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,9 +24,10 @@ build () {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8  libXft-2.3.3.tar.bz2"
+sha512sums="
+fc385d73e1acb701942c154ffb5a283d17891f21d3ac598c4a3fb375a7d6082734593062368c15cad67c1a94177dd15deed878ec5ea852188393b52e92c372c8  libXft-2.3.8.tar.xz
+"
diff --git a/main/libxi/APKBUILD b/main/libxi/APKBUILD
index 66e78c4e171..57074c66445 100644
--- a/main/libxi/APKBUILD
+++ b/main/libxi/APKBUILD
@@ -1,14 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxi
-pkgver=1.7.10
-pkgrel=0
+pkgver=1.8.1
+pkgrel=4
 pkgdesc="X11 Input extension library"
 url="https://www.x.org"
 arch="all"
 license="MIT AND X11"
 options="!check"  # No test suite.
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 makedepends="
 	xorgproto
 	libx11-dev
@@ -17,11 +16,10 @@ makedepends="
 	util-macros
 	xmlto
 	"
-source="https://www.x.org/releases/individual/lib/libXi-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/lib/libXi-$pkgver.tar.xz"
 
 builddir="$srcdir"/libXi-$pkgver
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -31,14 +29,15 @@ build() {
 		--localstatedir=/var \
 		--with-xmlto \
 		--without-fop \
-		--disable-static
+		--enable-static
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218  libXi-1.7.10.tar.bz2"
+sha512sums="
+a30b1a07e6d710f5196e7477415d68074736f89d954e8f2d5ccc9b5f349e7d1d440c90fb512508176b5db5ecad55608cfb540872936b731963fd83343db3a0b9  libXi-1.8.1.tar.xz
+"
diff --git a/main/libxinerama/APKBUILD b/main/libxinerama/APKBUILD
index 07661b4bf40..b223dfa5577 100644
--- a/main/libxinerama/APKBUILD
+++ b/main/libxinerama/APKBUILD
@@ -1,22 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxinerama
-pkgver=1.1.4
-pkgrel=1
+pkgver=1.1.5
+pkgrel=4
 pkgdesc="X11 Xinerama extension library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 options="!check"  # No test suite.
 subpackages="$pkgname-dev $pkgname-doc"
-depends=
 makedepends="libx11-dev libxext-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/lib/libXinerama-$pkgver.tar.bz2
+source="https://www.x.org/releases/individual/lib/libXinerama-$pkgver.tar.xz
 	"
 
 builddir="$srcdir"/libXinerama-$pkgver
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,7 +23,9 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14  libXinerama-1.1.4.tar.bz2"
+
+sha512sums="
+735b5320de4782005b379e409bf2f976131c17d496b297d33a0e127ca1443034778586b6b25c077b2ad73a4ab34d440d7510475e0041f38202bb40f15fb08ff7  libXinerama-1.1.5.tar.xz
+"
diff --git a/main/libxkbcommon/APKBUILD b/main/libxkbcommon/APKBUILD
index db6ef2d8eca..3d50e9b8e00 100644
--- a/main/libxkbcommon/APKBUILD
+++ b/main/libxkbcommon/APKBUILD
@@ -1,49 +1,76 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Peter Shkenev <santurysim@gmail.com>
 pkgname=libxkbcommon
-pkgver=0.10.0
-pkgrel=1
-pkgdesc="a keyboard handling library"
+pkgver=1.7.0
+pkgrel=0
+pkgdesc="keyboard handling library"
 url="https://www.xkbcommon.org/"
 arch="all"
 license="MIT"
+depends="xkeyboard-config"
 depends_dev="libxkbcommon-x11=$pkgver-r$pkgrel"
 makedepends="
 	bison
+	libxcb-dev
+	libxml2-dev
+	meson
 	wayland-dev
 	wayland-protocols
-	libxcb-dev
-	xkeyboard-config
-	meson"
+	xkeyboard-config-dev
+	"
 checkdepends="bash"
-subpackages="$pkgname-static $pkgname-dev $pkgname-x11"
-source="$pkgname-$pkgver.tar.gz::https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-$pkgver.tar.gz"
-builddir="$srcdir/libxkbcommon-xkbcommon-$pkgver"
+subpackages="
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-x11
+	xkbcli
+	xkbcli-doc
+	xkbcli-bash-completion
+	"
+source="https://xkbcommon.org/download/libxkbcommon-$pkgver.tar.xz
+	allow-skip-test.patch
+	"
 
 build() {
-	meson \
-		--prefix=/usr \
-		--buildtype=plain \
+	abuild-meson \
 		-Denable-wayland=true \
 		-Denable-docs=false \
 		-Denable-x11=true \
 		-Ddefault_library=both \
 		build
-	ninja -C build
+	meson compile -C build
 }
 
 check() {
-	ninja -C build test
+	meson test --no-rebuild --print-errorlogs -C build
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C build install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C build
 }
 
 x11() {
 	pkgdesc="$pkgdesc (x11 support)"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*x11*.so.* "$subpkgdir"/usr/lib
+
+	amove usr/lib/*x11*.so.*
+}
+
+xkbcli() {
+	pkgdesc="xkb command-line tool with interactive debugger"
+
+	amove usr/bin/xkbcli
+	amove usr/libexec/xkbcommon/xkbcli*
 }
 
-sha512sums="682a08124491ba9115011b145836ffac26932acdd804a76f7fb076b6f12b8a1ad23480e6272cb5c374cde7fb6c32ce2bb431b8b3e15316f132f236367ca1a964  libxkbcommon-0.10.0.tar.gz"
+bashcomp() {
+	default_bashcomp
+
+	pkgdesc="Bash completions for xkbcli"
+	install_if="xkbcli=$pkgver-r$pkgrel bash-completion"
+}
+
+
+sha512sums="
+4b74a9f3f63e2ebc1cbdcaa963c70362e55fa527e1d89b6a1fd30d7a84a8b60c1b3dc99bcfbde85aa31890e0b2f62f0bad3c8ff8340fe6a930ee662b33448ba5  libxkbcommon-1.7.0.tar.xz
+17608171e5fe145030585a84ac43770a5f3d57a8d083b27ee443f08e886e046a802833658f68bcd2c07834ec7c95d5fa952414d6940a9ae4c38736c55d0bf98f  allow-skip-test.patch
+"
diff --git a/main/libxkbcommon/allow-skip-test.patch b/main/libxkbcommon/allow-skip-test.patch
new file mode 100644
index 00000000000..b0f342ec4ca
--- /dev/null
+++ b/main/libxkbcommon/allow-skip-test.patch
@@ -0,0 +1,84 @@
+Partial revert of 0ed9390c07130c2d3ebaf2e1b67c6dc0011a8aee
+as we don't have xvfb, needed for the tests, packaged in main
+
+diff --git a/test/x11.c b/test/x11.c
+index c3cf2ee..4ff211e 100644
+--- a/test/x11.c
++++ b/test/x11.c
+@@ -45,7 +45,7 @@ X11_TEST(test_basic)
+     */
+     conn = xcb_connect(display, NULL);
+     if (!conn || xcb_connection_has_error(conn)) {
+-        exit_code = TEST_SETUP_FAILURE;
++        exit_code = SKIP_TEST;
+         goto err_conn;
+     }
+ 
+@@ -55,7 +55,7 @@ X11_TEST(test_basic)
+                                       XKB_X11_SETUP_XKB_EXTENSION_NO_FLAGS,
+                                       NULL, NULL, NULL, NULL);
+     if (!ret) {
+-        exit_code = TEST_SETUP_FAILURE;
++        exit_code = SKIP_TEST;
+         goto err_conn;
+     }
+ 
+diff --git a/test/x11comp.c b/test/x11comp.c
+index 33dd7c2..dc70fd1 100644
+--- a/test/x11comp.c
++++ b/test/x11comp.c
+@@ -51,7 +51,7 @@ X11_TEST(test_basic)
+ 
+     conn = xcb_connect(display, NULL);
+     if (xcb_connection_has_error(conn)) {
+-        ret = TEST_SETUP_FAILURE;
++        ret = SKIP_TEST;
+         goto err_conn;
+     }
+     ret = xkb_x11_setup_xkb_extension(conn,
+@@ -60,7 +60,7 @@ X11_TEST(test_basic)
+                                       XKB_X11_SETUP_XKB_EXTENSION_NO_FLAGS,
+                                       NULL, NULL, NULL, NULL);
+     if (!ret) {
+-        ret = TEST_SETUP_FAILURE;
++        ret = SKIP_TEST;
+         goto err_xcb;
+     }
+     device_id = xkb_x11_get_core_keyboard_device_id(conn);
+@@ -72,12 +72,12 @@ X11_TEST(test_basic)
+     ret = posix_spawnp(&xkbcomp_pid, "xkbcomp", NULL, NULL, xkbcomp_argv, envp);
+     free(xkb_path);
+     if (ret != 0) {
+-        ret = TEST_SETUP_FAILURE;
++        ret = SKIP_TEST;
+         goto err_xcb;
+     }
+     ret = waitpid(xkbcomp_pid, &status, 0);
+     if (ret < 0 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+-        ret = TEST_SETUP_FAILURE;
++        ret = SKIP_TEST;
+         goto err_xcb;
+     }
+ 
+diff --git a/test/xvfb-wrapper.c b/test/xvfb-wrapper.c
+index ab0c645..144187a 100644
+--- a/test/xvfb-wrapper.c
++++ b/test/xvfb-wrapper.c
+@@ -92,7 +92,7 @@ xvfb_wrapper(int (*test_func)(char* display))
+     ret = posix_spawnp(&xvfb_pid, "Xvfb", NULL, NULL, xvfb_argv, envp);
+     if (ret != 0) {
+         fprintf(stderr, "posix_spawnp error %d: %s\n", ret, strerror(ret));
+-        ret = TEST_SETUP_FAILURE;
++        ret = SKIP_TEST;
+         goto err_xvfd;
+     }
+ 
+@@ -118,7 +118,7 @@ xvfb_wrapper(int (*test_func)(char* display))
+     length = fread(&display[1], 1, sizeof(display) - 1, display_fd);
+     if (length <= 0) {
+         fprintf(stderr, "fread error: length=%zu\n", length);
+-        ret = TEST_SETUP_FAILURE;
++        ret = SKIP_TEST;
+         goto err_xvfd;
+     } else {
+         /* Drop the newline character */
diff --git a/main/libxkbfile/APKBUILD b/main/libxkbfile/APKBUILD
index 24a42a5442a..4d6bae58c69 100644
--- a/main/libxkbfile/APKBUILD
+++ b/main/libxkbfile/APKBUILD
@@ -1,20 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxkbfile
-pkgver=1.1.0
+pkgver=1.1.3
 pkgrel=0
 pkgdesc="X11 keyboard file manipulation library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
-depends=
 makedepends="libx11-dev util-macros"
-subpackages="$pkgname-dev"
-source="https://www.x.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://www.x.org/releases/individual/lib/libxkbfile-$pkgver.tar.xz"
 
-builddir="$srcdir/$pkgname-$pkgver"
-
-build () {
-	cd "$builddir"
+build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,15 +20,15 @@ build () {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	install -D -m644 "$srcdir"/$pkgname-$pkgver/COPYING \
+	install -D -m644 COPYING \
 		"$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826  libxkbfile-1.1.0.tar.bz2"
+sha512sums="
+d80ac41f6fa3a1ffad77ea1f8f9d9542f0bd210d74b263802bc6e6c1594fe325b27f42b5454aeeb36352518963b1ed1fdbbad95d7db3690b2e36d54742b7c236  libxkbfile-1.1.3.tar.xz
+"
diff --git a/main/libxkbui/APKBUILD b/main/libxkbui/APKBUILD
deleted file mode 100644
index a0a868e29ea..00000000000
--- a/main/libxkbui/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxkbui
-pkgver=1.0.2
-pkgrel=9
-pkgdesc="X11 keyboard UI presentation library"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="custom"
-options="!check"  # No test suite.
-subpackages="$pkgname-dev"
-depends=
-depends_dev="xorgproto"
-makedepends="$depends_dev libsm-dev libice-dev libx11-dev libxkbfile-dev libxt-dev"
-source="https://www.x.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="ccfa2c8f740ae66e5b7c2ed19a8243696a34fb60d45d8d01bb540eb925d69c95ebe16b7a54f4362acc3170b1543f44eea8910135b11c4af88abce3637726062d  libxkbui-1.0.2.tar.bz2"
diff --git a/main/libxml2/APKBUILD b/main/libxml2/APKBUILD
index 490e8322c4f..6ff9ac0e451 100644
--- a/main/libxml2/APKBUILD
+++ b/main/libxml2/APKBUILD
@@ -1,46 +1,66 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=libxml2
-pkgver=2.9.10
-pkgrel=3
+pkgver=2.12.6
+pkgrel=2
 pkgdesc="XML parsing library, version 2"
-url="http://www.xmlsoft.org/"
+url="https://gitlab.gnome.org/GNOME/libxml2"
 arch="all"
 license="MIT"
-depends_dev="zlib-dev xz-dev"
+depends_dev="zlib-dev xz-dev $pkgname-utils=$pkgver-r$pkgrel"
 checkdepends="perl tar"
-makedepends="$depends_dev python3-dev"
-subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-utils
-	py3-$pkgname:_py3"
-options="!strip"
-source="http://xmlsoft.org/sources/libxml2-$pkgver.tar.gz
-	libxml2-CVE-2020-7595.patch::https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch
-	revert-Make-xmlFreeNodeList-non-recursive.patch
-	libxml2-2.9.8-python3-unicode-errors.patch
-	"
+makedepends_host="$depends_dev"
+subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev $pkgname-utils"
+if [ -z "$BOOTSTRAP" ]; then
+	makedepends_build="$makedepends_build python3-dev"
+	subpackages="$subpackages py3-$pkgname-pyc py3-$pkgname:_py3"
+	_py_configure="--with-python=/usr/bin/python3"
+else
+	_py_configure="--with-python=no"
+fi
+source="https://download.gnome.org/sources/libxml2/${pkgver%.*}/libxml2-$pkgver.tar.xz"
 
 # secfixes:
+#   2.12.5-r0:
+#     - CVE-2024-25062
+#   2.10.4-r0:
+#     - CVE-2023-28484
+#     - CVE-2023-29469
+#   2.10.3-r0:
+#     - CVE-2022-40303
+#     - CVE-2022-40304
+#   2.10.0-r0:
+#     - CVE-2022-2309
+#   2.9.14-r0:
+#     - CVE-2022-29824
+#   2.9.13-r0:
+#     - CVE-2022-23308
+#   2.9.11-r0:
+#     - CVE-2016-3709
+#     - CVE-2021-3517
+#     - CVE-2021-3518
+#     - CVE-2021-3537
+#     - CVE-2021-3541
+#   2.9.10-r5:
+#     - CVE-2020-24977
+#   2.9.10-r4:
+#     - CVE-2019-20388
 #   2.9.8-r3:
-#   - CVE-2020-7595
+#     - CVE-2020-7595
 #   2.9.8-r1:
-#   - CVE-2018-9251
-#   - CVE-2018-14404
-#   - CVE-2018-14567
+#     - CVE-2018-9251
+#     - CVE-2018-14404
+#     - CVE-2018-14567
 #   2.9.4-r4:
-#   - CVE-2017-5969
+#     - CVE-2017-5969
 #   2.9.4-r2:
-#   - CVE-2016-9318
+#     - CVE-2016-9318
 #   2.9.4-r1:
-#   - CVE-2016-5131
-
-
+#     - CVE-2016-5131
 
 prepare() {
 	default_prepare
 
-	# setup.py is generated
-	rm python/setup.py
-
 	# We don't build libxml2 with icu.
 	rm test/icu_parse_test.xml
 }
@@ -53,9 +73,10 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
+		--enable-static \
 		--with-lzma \
 		--with-zlib \
-		--with-python=/usr/bin/python3
+		$_py_configure
 	make
 }
 
@@ -66,30 +87,22 @@ check() {
 
 package() {
 	make -j1 DESTDIR="$pkgdir" install
-
-	# We don't need static lib for python bindings.
-	rm "$pkgdir"/usr/lib/python*/site-packages/*.a
-}
-
-dev() {
-	default_dev
-	mv "$pkgdir"/usr/lib/*.sh "$subpkgdir"/usr/lib/
 }
 
 _py3() {
+	depends="python3"
 	pkgdesc="$pkgname python3 bindings"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/
+
+	amove usr/lib/python3*
 }
 
 utils() {
 	pkgdesc="XML utilities"
 	replaces="libxml2"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+
+	amove usr/bin
 }
 
-sha512sums="0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed  libxml2-2.9.10.tar.gz
-90db832e60c700e971669f57a54fdb297660c42602089b4e77e013a7051c880f380f0c98c059d9f54de99855b2d9be78fcf0639443f3765a925b52fc093fb4d9  libxml2-CVE-2020-7595.patch
-347178e432379d543683cba21b902e7305202c03e8dbd724ae395963d677096a5cfc4e345e208d498163ca5174683c167610fc2b297090476038bc2bb7c84b4f  revert-Make-xmlFreeNodeList-non-recursive.patch
-a205c97fa1488fb8907cfa08b5f82e2055c80b86213dc3cc5c4b526fe6aa786bcc4e4eeb226c44635a1d021307b39e3940f706c42fb60e9e3e9b490a84164df7  libxml2-2.9.8-python3-unicode-errors.patch"
+sha512sums="
+19d6901c0f189813e8bd20ffdfbb29d8545ca30154d1f3cc82624d64e4db3cfbe8eef7e8ccc1e195289f1bf94bb50fefcf11a95badb0ddeb845b4e4ea5a819ac  libxml2-2.12.6.tar.xz
+"
diff --git a/main/libxml2/libxml2-2.9.8-python3-unicode-errors.patch b/main/libxml2/libxml2-2.9.8-python3-unicode-errors.patch
deleted file mode 100644
index e87dcdedf88..00000000000
--- a/main/libxml2/libxml2-2.9.8-python3-unicode-errors.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: libxml2-2.9.5/python/libxml.c
-===================================================================
---- libxml2-2.9.5.orig/python/libxml.c
-+++ libxml2-2.9.5/python/libxml.c
-@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
-     PyObject *message;
-     PyObject *result;
-     char str[1000];
-+    unsigned char *ptr = (unsigned char *)str;
- 
- #ifdef DEBUG_ERROR
-     printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
-@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
- 	    str[999] = 0;
-         va_end(ap);
- 
-+#if PY_MAJOR_VERSION >= 3
-+        /* Ensure the error string doesn't start at UTF8 continuation. */
-+        while (*ptr && (*ptr & 0xc0) == 0x80)
-+            ptr++;
-+#endif
-+
-         list = PyTuple_New(2);
-         PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
-         Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
--        message = libxml_charPtrConstWrap(str);
-+        message = libxml_charPtrConstWrap(ptr);
-         PyTuple_SetItem(list, 1, message);
-         result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
-+        /* Forget any errors caused in the error handler. */
-+        PyErr_Clear();
-         Py_XDECREF(list);
-         Py_XDECREF(result);
-     }
diff --git a/main/libxml2/revert-Make-xmlFreeNodeList-non-recursive.patch b/main/libxml2/revert-Make-xmlFreeNodeList-non-recursive.patch
deleted file mode 100644
index 102abdb3134..00000000000
--- a/main/libxml2/revert-Make-xmlFreeNodeList-non-recursive.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-This is a revert of
-https://github.com/GNOME/libxml2/commit/0762c9b69ba01628f72eada1c64ff3d361fb5716
-
-This fixes perl-xml-libxslt test suite
-https://bugzilla.suse.com/show_bug.cgi?id=1157450
-
-diff --git a/tree.c b/tree.c
-index 08b1a50..f2b1457 100644
---- a/tree.c
-+++ b/tree.c
-@@ -3664,9 +3664,7 @@ xmlNextElementSibling(xmlNodePtr node) {
- void
- xmlFreeNodeList(xmlNodePtr cur) {
-     xmlNodePtr next;
--    xmlNodePtr parent;
-     xmlDictPtr dict = NULL;
--    size_t depth = 0;
- 
-     if (cur == NULL) return;
-     if (cur->type == XML_NAMESPACE_DECL) {
-@@ -3682,21 +3680,16 @@ xmlFreeNodeList(xmlNodePtr cur) {
- 	return;
-     }
-     if (cur->doc != NULL) dict = cur->doc->dict;
--    while (1) {
--        while ((cur->children != NULL) &&
--               (cur->type != XML_DTD_NODE) &&
--               (cur->type != XML_ENTITY_REF_NODE)) {
--            cur = cur->children;
--            depth += 1;
--        }
--
-+    while (cur != NULL) {
-         next = cur->next;
--        parent = cur->parent;
- 	if (cur->type != XML_DTD_NODE) {
- 
- 	    if ((__xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue))
- 		xmlDeregisterNodeDefaultValue(cur);
- 
-+	    if ((cur->children != NULL) &&
-+		(cur->type != XML_ENTITY_REF_NODE))
-+		xmlFreeNodeList(cur->children);
- 	    if (((cur->type == XML_ELEMENT_NODE) ||
- 		 (cur->type == XML_XINCLUDE_START) ||
- 		 (cur->type == XML_XINCLUDE_END)) &&
-@@ -3727,16 +3720,7 @@ xmlFreeNodeList(xmlNodePtr cur) {
- 		DICT_FREE(cur->name)
- 	    xmlFree(cur);
- 	}
--
--        if (next != NULL) {
--	    cur = next;
--        } else {
--            if ((depth == 0) || (parent == NULL))
--                break;
--            depth -= 1;
--            cur = parent;
--            cur->children = NULL;
--        }
-+	cur = next;
-     }
- }
- 
diff --git a/main/libxmu/APKBUILD b/main/libxmu/APKBUILD
index 6fc2c7689a3..232ec26c704 100644
--- a/main/libxmu/APKBUILD
+++ b/main/libxmu/APKBUILD
@@ -1,22 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxmu
-pkgver=1.1.3
-pkgrel=0
+pkgver=1.1.4
+pkgrel=2
 pkgdesc="X11 miscellaneous micro-utility library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
-options="!check"  # No test suite.
 subpackages="$pkgname-dev $pkgname-doc"
-depends=
 depends_dev="util-linux-dev"
-makedepends="libxext-dev libxt-dev libx11-dev libsm-dev util-linux-dev
-	util-macros xmlto"
-source="https://www.x.org/releases/individual/lib/libXmu-$pkgver.tar.bz2"
-
+makedepends="
+	libsm-dev
+	libx11-dev
+	libxext-dev
+	libxt-dev
+	util-linux-dev
+	util-macros
+	xmlto
+	"
+source="https://www.x.org/releases/individual/lib/libXmu-$pkgver.tar.xz"
 builddir="$srcdir"/libXmu-$pkgver
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,10 +30,15 @@ build() {
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762  libXmu-1.1.3.tar.bz2"
+sha512sums="
+3cf90cb3ff380aafefbb39297bdd95b9e1e6d6618cecb53ff09faf38f9b9c54599d28367f07a9ec77a20214c6c3e661b8d0a12b38082556790a79a59942039c1  libXmu-1.1.4.tar.xz
+"
diff --git a/main/libxpm/APKBUILD b/main/libxpm/APKBUILD
index de514b92ac3..7f5a14efb63 100644
--- a/main/libxpm/APKBUILD
+++ b/main/libxpm/APKBUILD
@@ -1,25 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxpm
-pkgver=3.5.13
+pkgver=3.5.17
 pkgrel=0
 pkgdesc="X11 pixmap library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
-license="custom:BELL"
+license="X11"
 options="!check"  # No test suite.
 subpackages="$pkgname-dev $pkgname-doc"
 makedepends="libxt-dev libxext-dev util-linux-dev util-macros"
-source="https://www.x.org/releases/individual/lib/libXpm-$pkgver.tar.bz2"
-
+source="https://www.x.org/releases/individual/lib/libXpm-$pkgver.tar.xz"
 builddir="$srcdir"/libXpm-$pkgver
 
+# secfixes:
+#   3.5.17-r0:
+#     - CVE-2023-43788
+#     - CVE-2023-43789
+#   3.5.15-r0:
+#     - CVE-2022-46285
+#     - CVE-2022-44617
+#     - CVE-2022-4883
+
 build() {
 	ac_cv_search_gettext=no \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--sysconfdir=/etc
+		--sysconfdir=/etc \
+		--disable-open-zfile
 	make
 }
 
@@ -27,4 +36,7 @@ package() {
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-sha512sums="3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5  libXpm-3.5.13.tar.bz2"
+
+sha512sums="
+52f9d2664a47a26c1a6ad65d18867de870b66947b0b0d99cca3512756a0aaa6ce2a245c0b49f20b70c3ce48bf04c47c333e8119a147465c277bca727f6ab017e  libXpm-3.5.17.tar.xz
+"
diff --git a/main/libxrandr/APKBUILD b/main/libxrandr/APKBUILD
index de64a70fae2..452deb4f6cd 100644
--- a/main/libxrandr/APKBUILD
+++ b/main/libxrandr/APKBUILD
@@ -1,36 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxrandr
-pkgver=1.5.2
-pkgrel=0
+pkgver=1.5.4
+pkgrel=1
 pkgdesc="X11 RandR extension library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-dev $pkgname-doc"
 options="!check"  # No test suite.
-depends=
 depends_dev="libxext-dev"
 makedepends="xorgproto $depends_dev libx11-dev libxrender-dev util-macros"
-source="https://www.x.org/releases/individual/lib/libXrandr-$pkgver.tar.bz2
-	"
-
+source="https://www.x.org/releases/individual/lib/libXrandr-$pkgver.tar.xz"
 builddir="$srcdir"/libXrandr-$pkgver
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--localstatedir=/var
+		--localstatedir=/var \
+		--disable-static
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87  libXrandr-1.5.2.tar.bz2"
+sha512sums="
+f7c0b083943e11b4cc3c97e10e2cbbc3920fe0c9c5031ef86fca2eb5df413d767caf53dca266abf65395eb10e55354c8fe59ed6b3265402ffccb919a813bc781  libXrandr-1.5.4.tar.xz
+"
diff --git a/main/libxrender/APKBUILD b/main/libxrender/APKBUILD
index c507f872929..acb078244b6 100644
--- a/main/libxrender/APKBUILD
+++ b/main/libxrender/APKBUILD
@@ -1,20 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxrender
-pkgver=0.9.10
-pkgrel=3
+pkgver=0.9.11
+pkgrel=5
 pkgdesc="X Rendering Extension client library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
-license="custom"
+license="MIT"
 subpackages="$pkgname-dev $pkgname-doc"
 options="!check"  # No test suite.
-depends=
 makedepends="xorgproto libx11-dev util-macros"
-source="https://www.x.org/releases/individual/lib/libXrender-$pkgver.tar.bz2"
-
+source="https://www.x.org/releases/individual/lib/libXrender-$pkgver.tar.xz"
 builddir="$srcdir"/libXrender-$pkgver
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,8 +24,9 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="16ea0cf638b32d7df54b270457ef8c9d9a80da27fa845b105b560cb31027b4c7fe799cf23d6b6bac492be5961264e96d7845d316a9af4de9ff38bf40885ea6fe  libXrender-0.9.10.tar.bz2"
+sha512sums="
+2327cc1b530382d81df29b8d579f801f1f990202107cc84506986bcf5d15010d414e9418987b200e3f222d188afce46f0d7754febcdca62a5fc1e541b3bb82de  libXrender-0.9.11.tar.xz
+"
diff --git a/main/libxscrnsaver/APKBUILD b/main/libxscrnsaver/APKBUILD
deleted file mode 100644
index f365b83c7e4..00000000000
--- a/main/libxscrnsaver/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxscrnsaver
-pkgver=1.2.3
-pkgrel=0
-pkgdesc="X.Org screen saver extension"
-url="https://cgit.freedesktop.org/xorg/lib/libXScrnSaver/"
-arch="all"
-license="MIT"
-makedepends="$depends_dev libxext-dev libx11-dev util-macros xorgproto"
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://www.x.org/releases/individual/lib/libXScrnSaver-$pkgver.tar.bz2"
-
-builddir="$srcdir"/libXScrnSaver-$pkgver
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--disable-static
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a  libXScrnSaver-1.2.3.tar.bz2"
diff --git a/main/libxshmfence/APKBUILD b/main/libxshmfence/APKBUILD
index c8745865375..91890bd3bee 100644
--- a/main/libxshmfence/APKBUILD
+++ b/main/libxshmfence/APKBUILD
@@ -1,21 +1,19 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer:
+# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
 pkgname=libxshmfence
-pkgver=1.3
-pkgrel=0
+pkgver=1.3.2
+pkgrel=6
 pkgdesc="X11 shared memory fences"
 url="https://www.x.org/"
 arch="all"
 license="MIT"
-depends=""
 depends_dev="linux-headers"
 makedepends="$depends_dev util-macros xorgproto"
-install=""
 subpackages="$pkgname-dev"
-source="https://www.x.org/releases/individual/lib/libxshmfence-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/lib/libxshmfence-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,13 +24,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7  libxshmfence-1.3.tar.bz2"
+sha512sums="
+e20a6827e370726cf50489a69f4a52b897f1c44e3eba8c72a4e626b08724e877d090770b8016765736d887d5d5eaba1fda9c29066e62d259b4d1e2064bc1626c  libxshmfence-1.3.2.tar.xz
+"
diff --git a/main/libxslt/APKBUILD b/main/libxslt/APKBUILD
index 1a59b967c79..9b190600926 100644
--- a/main/libxslt/APKBUILD
+++ b/main/libxslt/APKBUILD
@@ -1,17 +1,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=libxslt
-pkgver=1.1.34
-pkgrel=0
+pkgver=1.1.39
+pkgrel=1
 pkgdesc="XML stylesheet transformation library"
 url="http://xmlsoft.org/XSLT/"
 arch="all"
-license="custom"
-makedepends="libxml2-dev libgcrypt-dev libgpg-error-dev"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://xmlsoft.org/sources/libxslt-$pkgver.tar.gz"
+license="X11"
+makedepends="
+	libgcrypt-dev
+	libgpg-error-dev
+	libxml2-dev
+	"
+subpackages="
+	$pkgname-static
+	$pkgname-doc
+	$pkgname-dev
+	"
+source="https://download.gnome.org/sources/libxslt/${pkgver%.*}/libxslt-$pkgver.tar.xz"
 
 # secfixes:
+#   1.1.35-r0:
+#     - CVE-2021-30560
 #   1.1.34-r0:
 #     - CVE-2019-13117
 #     - CVE-2019-13118
@@ -21,26 +31,40 @@ source="http://xmlsoft.org/sources/libxslt-$pkgver.tar.gz"
 #     - CVE-2019-11068
 #   1.1.29-r1:
 #     - CVE-2017-5029
+#   0:
+#     - CVE-2022-29824
 
 prepare() {
 	default_prepare
-	chmod 644 python/tests/*
+	# fails for some reason
+	rm -fv tests/REC/test-10-3.xsl
 }
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/usr \
+		--with-python=no \
+		--enable-static
 	make
 }
 
-package() {
-	cd "$builddir"
+check() {
+	make check
+}
 
+package() {
 	make DESTDIR="$pkgdir" install
 	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-sha512sums="1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b  libxslt-1.1.34.tar.gz"
+
+dev() {
+	default_dev
+
+	amove usr/lib/xsltConf.sh
+}
+
+sha512sums="
+c0c99dc63f8b2acb6cc3ad7ad684ffa2a427ee8d1740495cbf8a7c9b9c8679f96351b4b676c73ccc191014db4cb4ab42b9a0070f6295565f39dbc665c5c16f89  libxslt-1.1.39.tar.xz
+"
diff --git a/main/libxt/APKBUILD b/main/libxt/APKBUILD
index 9af9dd7af3a..0c618d0be71 100644
--- a/main/libxt/APKBUILD
+++ b/main/libxt/APKBUILD
@@ -1,22 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxt
-pkgver=1.2.0
-pkgrel=0
+pkgver=1.3.0
+pkgrel=5
 pkgdesc="X11 toolkit intrinsics library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
-license="custom"
+license="MIT"
 subpackages="$pkgname-dev $pkgname-doc"
 depends_dev="libsm-dev"
 makedepends="$depends_dev libice-dev libx11-dev util-macros xorgproto"
 checkdepends="glib-dev"
-source="https://www.x.org/releases/individual/lib/libXt-$pkgver.tar.bz2
-	"
-
+source="https://www.x.org/releases/individual/lib/libXt-$pkgver.tar.xz"
 builddir="$srcdir"/libXt-$pkgver
 
 build() {
-	cd "$builddir"
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,12 +25,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
-sha512sums="06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1  libXt-1.2.0.tar.bz2"
+
+sha512sums="
+64c5978655135b925c3aaad86b1aa6a3f3b57ad8b3592bf142be616b8aa339a02c2fc7badfab9564ea8076ea8f37acfe31709ed528f5a1d251f2d116aa074118  libXt-1.3.0.tar.xz
+"
diff --git a/main/libxtst/APKBUILD b/main/libxtst/APKBUILD
index e5a04b6c34b..b435b639c18 100644
--- a/main/libxtst/APKBUILD
+++ b/main/libxtst/APKBUILD
@@ -1,20 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxtst
-pkgver=1.2.3
-pkgrel=3
+pkgver=1.2.4
+pkgrel=6
 pkgdesc="X11 Testing -- Resource extension library"
 url="https://wiki.freedesktop.org/xorg/"
 arch="all"
-license="custom"
+license="MIT"
 options="!check"  # No test suite.
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 makedepends="xorgproto libx11-dev libxext-dev libxi-dev util-macros"
-source="https://www.x.org/releases/individual/lib/libXtst-$pkgver.tar.bz2
+source="https://www.x.org/releases/individual/lib/libXtst-$pkgver.tar.xz
 	"
-
 builddir="$srcdir"/libXtst-$pkgver
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,14 +21,15 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
-		--disable-static
+		--enable-static
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="6f6741fd3596775eaa056465319f78c29c91b3893a851a4899df651a2023a4d762497b112a33d7d3e8865fe85d173d03e4b49daef76a66af1ae1eaab82a12765  libXtst-1.2.3.tar.bz2"
+sha512sums="
+f2f4e01239b892b8e26284cede90feb4fe7738beb243bca0f6adb349029f8bf87b5a482911edcd2401733c92ef78eec07fcd455b92e5b8c4828374769e60098d  libXtst-1.2.4.tar.xz
+"
diff --git a/main/libxv/APKBUILD b/main/libxv/APKBUILD
index 4662e86d8cc..fe610724e11 100644
--- a/main/libxv/APKBUILD
+++ b/main/libxv/APKBUILD
@@ -1,20 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxv
-pkgver=1.0.11
-pkgrel=2
+pkgver=1.0.12
+pkgrel=5
 pkgdesc="X11 Video extension library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
-license="custom"
-depends=""
+license="MIT"
 makedepends="xorgproto libx11-dev libxext-dev util-macros"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://www.x.org/releases/individual/lib/libXv-$pkgver.tar.bz2
-	"
-
+source="https://www.x.org/releases/individual/lib/libXv-$pkgver.tar.xz"
 builddir="$srcdir"/libXv-$pkgver
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,14 +23,14 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="97cb3ab06cedc87799d06e1affd5cee32ed0e551903fa5c915f79e7ed92eded867e3220b4a663822f7ebd86fdc71b09943b7077d98f1200019992e8d24144e58  libXv-1.0.11.tar.bz2"
+sha512sums="
+bdd00de1ce6a8911056181ab4de32f9e319a68567389162d4bc2e3c9946d5f3c60f87eb6c53f74c9b6a342255e591d5fef4a445a4ac8ca3c1b6fe87d42c51c1e  libXv-1.0.12.tar.xz
+"
diff --git a/main/libxvmc/APKBUILD b/main/libxvmc/APKBUILD
deleted file mode 100644
index 23bdaeacda4..00000000000
--- a/main/libxvmc/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxvmc
-pkgver=1.0.12
-pkgrel=0
-pkgdesc="X11 Video Motion Compensation extension library"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="MIT"
-options="!check"  # No test suite.
-subpackages="$pkgname-dev $pkgname-doc"
-depends_dev="libxext-dev"
-makedepends="xorgproto libx11-dev libxv-dev util-macros"
-source="https://www.x.org/releases/individual/lib/libXvMC-$pkgver.tar.bz2"
-builddir="$srcdir"/libXvMC-$pkgver
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	rm -f "$pkgdir"/usr/lib/*.a
-}
-
-sha512sums="62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955  libXvMC-1.0.12.tar.bz2"
diff --git a/main/libxxf86dga/APKBUILD b/main/libxxf86dga/APKBUILD
deleted file mode 100644
index 8a4aa78174c..00000000000
--- a/main/libxxf86dga/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxxf86dga
-pkgver=1.1.5
-pkgrel=0
-pkgdesc="X11 Direct Graphics Access extension library"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="MIT"
-options="!check"  # No test suite.
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="libxext-dev libx11-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/lib/libXxf86dga-$pkgver.tar.bz2"
-
-builddir="$srcdir"/libXxf86dga-$pkgver
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89  libXxf86dga-1.1.5.tar.bz2"
diff --git a/main/libxxf86misc/APKBUILD b/main/libxxf86misc/APKBUILD
deleted file mode 100644
index de495946f6c..00000000000
--- a/main/libxxf86misc/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libxxf86misc
-pkgver=1.0.4
-pkgrel=0
-pkgdesc="X11 XFree86 miscellaneous extension library"
-url="http://xorg.freedesktop.org/"
-arch="all"
-options="!check"  # No test suite.
-license="custom"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="libxext-dev libx11-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/lib/libXxf86misc-$pkgver.tar.bz2"
-
-builddir="$srcdir/libXxf86misc-$pkgver"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--mandir=/usr/share/man
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="1dbd51a51188a060f676b88e5d98809ea355f69933972ceb7721c83289b5bb94c1f7b889baa83209a5ed864e67dd8a4ed62f1393634e97cc99ce36a2cef447fb  libXxf86misc-1.0.4.tar.bz2"
diff --git a/main/libxxf86vm/APKBUILD b/main/libxxf86vm/APKBUILD
index 9dc57952bbf..afba70836a5 100644
--- a/main/libxxf86vm/APKBUILD
+++ b/main/libxxf86vm/APKBUILD
@@ -1,32 +1,30 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxxf86vm
-pkgver=1.1.4
-pkgrel=2
+pkgver=1.1.5
+pkgrel=6
 pkgdesc="X11 XFree86 video mode extension library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
-license="custom"
+license="MIT"
 options="!check"  # No test suite.
 subpackages="$pkgname-dev $pkgname-doc"
-depends=
 makedepends="xorgproto libx11-dev libxext-dev util-macros"
-source="https://www.x.org/releases/individual/lib/libXxf86vm-$pkgver.tar.bz2
-	"
-
+source="https://www.x.org/releases/individual/lib/libXxf86vm-$pkgver.tar.xz"
 builddir="$srcdir"/libXxf86vm-$pkgver
-
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/usr \
+		--disable-static
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-sha512sums="c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0  libXxf86vm-1.1.4.tar.bz2"
+
+sha512sums="
+68226fcb9773a583ea417ab413146203dd7db6ff8a4d388285da972353355e11e179861a77c9fa284aefac025bb3bbf5a9537fa0bf246c782e0116a667c9d9b6  libXxf86vm-1.1.5.tar.xz
+"
diff --git a/main/lighttpd/APKBUILD b/main/lighttpd/APKBUILD
index 6efea1eebf0..9e82fd6f100 100644
--- a/main/lighttpd/APKBUILD
+++ b/main/lighttpd/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lighttpd
-pkgver=1.4.55
-pkgrel=1
+pkgver=1.4.76
+pkgrel=0
 pkgdesc="Secure, fast, compliant and very flexible web-server"
 url="https://www.lighttpd.net"
 arch="all"
@@ -10,10 +10,27 @@ license="BSD-3-Clause"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 pkgusers="lighttpd"
 pkggroups="lighttpd"
-makedepends="flex pcre-dev openssl-dev zlib-dev bzip2-dev lua5.3-dev
-	automake autoconf openldap-dev libxml2-dev sqlite-dev libev-dev"
-subpackages="$pkgname-doc $pkgname-dbg $pkgname-openrc $pkgname-mod_auth
-	$pkgname-mod_webdav"
+makedepends="
+	brotli-dev
+	libdbi-dev
+	libxml2-dev
+	lua5.4-dev
+	meson
+	openldap-dev
+	openssl-dev
+	pcre2-dev
+	sqlite-dev
+	zlib-dev
+	zstd-dev
+	"
+checkdepends="perl"
+subpackages="
+	$pkgname-dbg
+	$pkgname-doc
+	$pkgname-openrc
+	$pkgname-mod_auth
+	$pkgname-mod_webdav
+	"
 source="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-$pkgver.tar.xz
 	$pkgname.initd
 	$pkgname.confd
@@ -22,35 +39,37 @@ source="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-$pkgver.t
 	mime-types.conf
 	mod_cgi.conf
 	mod_fastcgi.conf
-	mod_fastcgi_fpm.conf"
+	mod_fastcgi_fpm.conf
+	"
+
+# secfixes:
+#   1.4.67-r0:
+#     - CVE-2022-41556
+#   1.4.64-r0:
+#     - CVE-2022-22707
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--disable-dependency-tracking \
-		--enable-lfs \
-		--libdir=/usr/lib/lighttpd \
-		--without-mysql \
-		--without-attr \
-		--with-webdav-props \
-		--with-webdav-locks \
-		--without-gdbm \
-		--with-bzip2 \
-		--with-ldap \
-		--with-openssl \
-		--with-libev \
-		--with-lua
-	make
+	abuild-meson \
+		-Db_lto=true \
+		-Dwith_brotli=enabled \
+		-Dwith_dbi=enabled \
+		-Dwith_ldap=enabled \
+		-Dwith_lua=true \
+		-Dwith_openssl=true \
+		-Dwith_pcre2=true \
+		-Dwith_webdav_locks=enabled \
+		-Dwith_webdav_props=enabled \
+		-Dwith_zstd=enabled \
+		. output
+	meson compile -C output
 }
 
 check() {
-	make check
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 
 	# create dirs
 	install -d -m2750 -o lighttpd -g wheel \
@@ -71,7 +90,7 @@ package() {
 	local i; for i in lighttpd.conf mime-types.conf mod_cgi.conf \
 		mod_fastcgi.conf mod_fastcgi_fpm.conf
 	do
-		install -m644 "$srcdir"/$i "$pkgdir"/etc/lighttpd/$i
+		install -Dm644 "$srcdir"/$i "$pkgdir"/etc/lighttpd/$i
 	done
 }
 
@@ -94,12 +113,14 @@ mod_webdav() {
 	_mv_mod mod_webdav
 }
 
-sha512sums="023d5a54079e710a89a59e259c0b5798103ef6fce4544c36110dc4c5281ef429ef99369923d74123fcf8be37afe622d44cd7149078d21971ff26f3f4ee37c439  lighttpd-1.4.55.tar.xz
-f2f3c5c7731550237fd75a8de66275f427eaf897cffff7ac7ef44178328ad8fad6c4ec6654759bfc665cbaf7991ddcdf0aaa916831c8b6aa440192d57b242038  lighttpd.initd
+sha512sums="
+940f00f2d84e3424c389108d09756a0af41db3559474135b6c502deccd08ad051b5184f3f7907436384964d2b05045e27dca463af98c889cee69b0ae6e202782  lighttpd-1.4.76.tar.xz
+a74fb8394fb77fca2a08bdcfc79d4e13de6aca7bc4ed842b7e05f7f3a9cc85dccaa4971ba8fd0edfaa19da8d3870a743b713d9e51f1cbfe5b8e2843bb7fe5346  lighttpd.initd
 9d2ab5deb7353ebf290e90936b511941df440859c78589d0bcf130ef69a5e9c79e4d318548b6b118df002083c46f7476230a28954b7a10a9dbd05040e02b1291  lighttpd.confd
 0536b4f21d2e8659f7831b45998c13d9f6051ae7ecde13be01f372f837d255bfc4e211de48a7686cc743d53aa9c08ab3f10ec19788896dcf8356b90053ca7a16  lighttpd.logrotate
-0aab94cb49ef5a96c1b5dbcf142b41acf49286ed6e2a252210f3f7fb6ee0639ebc5b8f4ddc89eb4b9a2bde38af07b8f008473aef2a460488ac806844f398350d  lighttpd.conf
+37ff6ad319fbbe1f390098c7eecee8e292d5766af94533243e603c4918f41d702abe449eaed59455d2b65f13546f5fd1353ca6455aede5ce62ec1d77edaf9a97  lighttpd.conf
 a3f2f5763885d7e4f510491b24164e34aaf62bb02daa12991575dc64335c12668355af5bb8d6ce191eb4e9cce95324b1f7c9ba61b323b4e7b50a1e03e021afcf  mime-types.conf
 27cc638d8068dcf47bd9db44943d1db6c6f4e8e6abd6b42af7cea004b1c093440068541d98c68f8bea70b956713adaf8ed59a4b642dea826ee8620a05f8cfde5  mod_cgi.conf
 1d15b84c03fb648a0e67ab5c5411b85478b4454c44bc2959cc96d1700eeadd7ff429520a5f1550db6527267646622dccd3d47d3fd1258869fccaf5c22d4ad4b2  mod_fastcgi.conf
-f9efc4b70d825600f5356c30e57d0b6cac11c01739337f7192c09c2cfd96cb76c8328b11d818ea4c2addc1a6d253975b84700106ae75854d55d0df73e220bd2b  mod_fastcgi_fpm.conf"
+f9efc4b70d825600f5356c30e57d0b6cac11c01739337f7192c09c2cfd96cb76c8328b11d818ea4c2addc1a6d253975b84700106ae75854d55d0df73e220bd2b  mod_fastcgi_fpm.conf
+"
diff --git a/main/lighttpd/lighttpd.conf b/main/lighttpd/lighttpd.conf
index 076f53875f7..6d6e76afa90 100644
--- a/main/lighttpd/lighttpd.conf
+++ b/main/lighttpd/lighttpd.conf
@@ -18,8 +18,6 @@ server.modules = (
 #    "mod_redirect",
 #    "mod_alias",
     "mod_access",
-#    "mod_cml",
-#    "mod_trigger_b4_dl",
 #    "mod_auth",
 #    "mod_status",
 #    "mod_setenv",
@@ -27,11 +25,9 @@ server.modules = (
 #    "mod_simple_vhost",
 #    "mod_evhost",
 #    "mod_userdir",
-#    "mod_compress",
+#    "mod_deflate",
 #    "mod_ssi",
-#    "mod_usertrack",
 #    "mod_expire",
-#    "mod_secdownload",
 #    "mod_rrdtool",
 #    "mod_webdav",
     "mod_accesslog"
@@ -59,18 +55,13 @@ server.errorlog      = var.logdir  + "/error.log"
 # log errors to syslog instead
 #   server.errorlog-use-syslog = "enable"
 
-server.indexfiles    = ("index.php", "index.html",
-						"index.htm", "default.htm")
+index-file.names     = ("index.php", "index.html", "index.htm", "default.htm")
 
 # server.tag           = "lighttpd"
 
-server.follow-symlink = "enable"
-
-# event handler (defaults to "poll")
+# event handler (defaults to OS-specific event framework)
 # see performance.txt
 # 
-# for >= linux-2.4
-#   server.event-handler = "linux-rtsig"
 # for >= linux-2.6
 #   server.event-handler = "linux-sysepoll"
 # for FreeBSD
@@ -93,9 +84,11 @@ server.follow-symlink = "enable"
 # -> ..../status-404.html for 'File not found'
 # server.errorfile-prefix    = var.basedir + "/error/status-"
 
-# FAM support for caching stat() calls
-# requires that lighttpd be built with USE=fam
-#   server.stat-cache-engine = "fam"
+# support for caching stat() calls (default "simple")
+# for Linux
+#   server.stat-cache-engine = "inotify"
+# for FreeBSD
+#   server.stat-cache-engine = "kqueue"
 # }}}
 
 # {{{ mod_staticfile
@@ -174,11 +167,11 @@ url.access-deny = ("~", ".inc")
 # simple-vhost.document-root = "/pages/"
 # }}}
 
-# {{{ mod_compress
+# {{{ mod_deflate
 # see compress.txt
 #
-# compress.cache-dir   = var.statedir + "/cache/compress"
-# compress.filetype    = ("text/plain", "text/html")
+# deflate.cache-dir   = var.statedir + "/cache/compress"
+# deflate.mimetypes   = ("text/plain", "text/html")
 # }}}
 
 # {{{ mod_proxy
@@ -269,25 +262,6 @@ url.access-deny = ("~", ".inc")
 # setenv.add-response-header = ( "X-Secret-Message" => "42" )
 # }}}
 
-# {{{ mod_trigger_b4_dl
-# see trigger_b4_dl.txt
-#
-# trigger-before-download.gdbm-filename = "/home/weigon/testbase/trigger.db"
-# trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" )
-# trigger-before-download.trigger-url = "^/trigger/"
-# trigger-before-download.download-url = "^/download/"
-# trigger-before-download.deny-url = "http://127.0.0.1/index.html"
-# trigger-before-download.trigger-timeout = 10
-# }}}
-
-# {{{ mod_cml
-# see cml.txt
-#
-# don't forget to add index.cml to server.indexfiles
-# cml.extension               = ".cml"
-# cml.memcache-hosts          = ( "127.0.0.1:11211" )
-# }}} 
-
 # {{{ mod_webdav
 # see webdav.txt
 #
diff --git a/main/lighttpd/lighttpd.initd b/main/lighttpd/lighttpd.initd
index 614cb213267..597b9070b2a 100644
--- a/main/lighttpd/lighttpd.initd
+++ b/main/lighttpd/lighttpd.initd
@@ -25,7 +25,7 @@ checkconfig() {
 		ewarn "is not set. Falling back to lighttpd.pid"
 		LIGHTTPD_PID="/run/lighttpd.pid"
 	fi
-	/usr/sbin/lighttpd -t -f ${LIGHTTPD_CONF} >/dev/null
+	/usr/sbin/lighttpd -tt -f ${LIGHTTPD_CONF}
 }
 
 start() {
diff --git a/main/linenoise/APKBUILD b/main/linenoise/APKBUILD
index 92443594f2e..d484162f687 100644
--- a/main/linenoise/APKBUILD
+++ b/main/linenoise/APKBUILD
@@ -1,29 +1,24 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer:
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=linenoise
 pkgver=1.0
-pkgrel=1
+pkgrel=5
 pkgdesc="Minimal replacement for readline"
 url="https://github.com/antirez/linenoise"
 arch="all"
 options="!check"  # No test suite.
-license="BSD-2-Clause-NetBSD"
-depends=""
-depends_dev=""
+license="BSD-2-Clause"
 makedepends="$depends_dev"
-install=""
 subpackages="$pkgname-dev"
 source="linenoise-$pkgver.tar.gz::https://github.com/antirez/linenoise/archive/$pkgver.tar.gz
 	build-shared-lib.patch
 	"
 
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/links/APKBUILD b/main/links/APKBUILD
index aee529cd215..c44dc519bcf 100644
--- a/main/links/APKBUILD
+++ b/main/links/APKBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=links
-pkgver=2.20.2
+pkgver=2.29
 pkgrel=1
 pkgdesc="Web browser running in both graphics and text mode"
-url="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links"
+url="http://links.twibright.com/"
 arch="all"
 options="!check"  # No test suite.
-license="GPL-2.0-or-later"
+license="GPL-2.0-or-later WITH OpenSSL-Exception"
 subpackages="$pkgname-doc"
-makedepends="bzip2-dev openssl-dev zlib-dev libevent-dev zstd-dev"
-source="http://links.twibright.com/download/links-$pkgver.tar.bz2"
+makedepends="bzip2-dev openssl-dev>3 zlib-dev libevent-dev zstd-dev"
+source="http://links.twibright.com/download/links-$pkgver.tar.bz2
+	configure.patch
+	"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,8 +27,10 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="82be459856f49f45c9b824589b78c0f58b039b09802e077420053e9449bc1ded272bb8ad57ea10522d8b3305ceb212a5dd08b01052538cd5b4f0447d0ba02152  links-2.20.2.tar.bz2"
+sha512sums="
+5ea8b2fd0eb74d9dc2b45614aef6ee878fe686dff9bcee75ac6ea01f6a7331670f7709233d31986fc64ad86ce549616a4471057837b6caf15af6d1c5c503ac75  links-2.29.tar.bz2
+b56fcfb6165b3a3340672b25b83826ae32ab5a36673ac90207a40afa5e1e4e5fe21cd958bfb9600035dd84a9b8af1b68ad5be97d794840796d4d2deb992ffa4c  configure.patch
+"
diff --git a/main/links/configure.patch b/main/links/configure.patch
new file mode 100644
index 00000000000..dcd20c452b8
--- /dev/null
+++ b/main/links/configure.patch
@@ -0,0 +1,57 @@
+werror=implicit-int
+diff --git a/confdefs.h b/confdefs.h
+new file mode 100644
+index 0000000..260c62f
+--- /dev/null
++++ b/confdefs.h
+@@ -0,0 +1,3 @@
++
++#define PACKAGE "links"
++#define VERSION "2.29"
+diff --git a/config.cache b/config.cache
+new file mode 100644
+index 0000000..e69de29
+diff --git a/config.log b/config.log
+new file mode 100644
+index 0000000..7bf8995
+--- /dev/null
++++ b/config.log
+@@ -0,0 +1,25 @@
++This file contains any messages produced by compilers while
++running configure, to aid debugging if configure makes a mistake.
++
++configure:640: checking for a BSD compatible install
++configure:693: checking whether build environment is sane
++configure:750: checking whether make sets ${MAKE}
++configure:796: checking for working aclocal-1.4
++configure:809: checking for working autoconf
++configure:822: checking for working automake-1.4
++configure:835: checking for working autoheader
++configure:848: checking for working makeinfo
++configure:880: checking for gcc
++configure:993: checking whether the C compiler (clang -O3 -flto=thin -DNDEBUG -march=native -fPIC -fstack-clash-protection -fstack-protector-strong -fcf-protection -pipe -fomit-frame-pointer -fdiagnostics-color=always -fno-semantic-interposition -flto=thin -fuse-ld=lld -Wl,-O2,--as-needed,--gc-sections,-z,defs,-z,relro,-z,now,--icf=safe,-z,pack-relative-relocs,--Bsymbolic) works
++configure:1009: clang -o conftest -O3 -flto=thin -DNDEBUG -march=native -fPIC -fstack-clash-protection -fstack-protector-strong -fcf-protection -pipe -fomit-frame-pointer -fdiagnostics-color=always -fno-semantic-interposition  -flto=thin -fuse-ld=lld -Wl,-O2,--as-needed,--gc-sections,-z,defs,-z,relro,-z,now,--icf=safe,-z,pack-relative-relocs,--Bsymbolic conftest.c  1>&5
++configure:1006:1: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
++main(){return(0);}
++^
++int
++1 error generated.
++configure: failed program was:
++
++#line 1004 "configure"
++#include "confdefs.h"
++
++main(){return(0);}
+diff --git a/configure b/configure
+index 354c422..88e0d53 100755
+--- a/configure
++++ b/configure
+@@ -1001,7 +1001,7 @@ cat > conftest.$ac_ext << EOF
+ #line 1004 "configure"
+ #include "confdefs.h"
+ 
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:1009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
diff --git a/main/linux-firmware/APKBUILD b/main/linux-firmware/APKBUILD
index 04fcb72a3a2..b3a0654643e 100644
--- a/main/linux-firmware/APKBUILD
+++ b/main/linux-firmware/APKBUILD
@@ -1,42 +1,38 @@
 # Contributor: Oliver Smith <ollieparanoid@postmarketos.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=linux-firmware
-pkgver=20191215
+pkgver=20240312
 pkgrel=0
 pkgdesc="firmware files for linux"
-#url="https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary"
-url="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
+url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
 arch="all"
-license="custom:multiple"
-makedepends=
-install=""
+license="custom"
+makedepends="libarchive-tools coreutils rdfind"
 provides="linux-firmware-any"
-provider_priority=1
-options="!strip !check !archcheck !tracedeps !spdx"
+provider_priority=2
+options="!strip !check !archcheck !spdx"
 
-_rpi_bt=fff76cb15527c435ce99a9787848eacd6288282c
+_rpi_bt=78d6a07730e2d20c035899521ab67726dc028e1c
+_rpi_brcm=223ccf3a3ddb11b3ea829749fbbba4d65b380897
 
-# cypress fmac: https://community.cypress.com/docs/DOC-17441
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-${pkgver}.tar.gz
-	https://community.cypress.com/servlet/JiveServlet/download/17441-2-50210/cypress-fmac-v4.14.77-2019_1031.zip
-	BCM43430A1.hcd.${_rpi_bt::8}::https://github.com/RPi-Distro/bluez-firmware/raw/$_rpi_bt/broadcom/BCM43430A1.hcd
-	BCM4345C0.hcd.${_rpi_bt::8}::https://github.com/RPi-Distro/bluez-firmware/raw/$_rpi_bt/broadcom/BCM4345C0.hcd
+source="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-$pkgver.tar.gz
+	bluez-firmware-$_rpi_bt.tar.gz::https://github.com/RPi-Distro/bluez-firmware/archive/$_rpi_bt.tar.gz
+	brcm-firmware-$_rpi_brcm.tar.gz::https://github.com/RPi-Distro/firmware-nonfree/archive/$_rpi_brcm.tar.gz
+	$pkgname-ucode-amd17h-zenbleed-microcode_amd_fam17h.bin::https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/amd-ucode/microcode_amd_fam17h.bin?id=59fbffa9ec8e4b0b31d2d13e715cf6580ad0e99c
+	$pkgname-ucode-amd19h-zenbleed-microcode_amd_fam19h.bin::https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/amd-ucode/microcode_amd_fam19h.bin?id=59fbffa9ec8e4b0b31d2d13e715cf6580ad0e99c
 	"
 
-_giturl="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
-_upload=dev.alpinelinux.org:/archive/$pkgname/
-
-_builddir="$srcdir"/$pkgname-$pkgver
-
 # Put /lib/firmware/* folders in subpackages
-_folders="3com acenic adaptec advansys amd amd-ucode amdgpu ar3k ath10k ath6k
-	ath9k_htc atmel atusb av7110 bnx2 bnx2x brcm cadence cavium cis cpia2 cxgb3
-	cxgb4 dabusb dpaa2 dsp56k e100 edgeport emi26 emi62 ene-ub6250 ess go7007 i915
-	imx inside-secure intel isci kaweth keyspan keyspan_pda korg libertas liquidio matrox
-	mediatek mellanox meson microchip moxa mrvl mwl8k mwlwifi myricom netronome
-	nvidia ositech qca qcom qed qlogic r128 radeon rockchip rsi rtl8192e rtl_bt
-	rtl_nic rtlwifi rtw88 sb16 slicoss sun sxg tehuti ti-connectivity ti-keystone
-	tigon ttusb-budget ueagle-atm vicam vxge yam yamaha"
+_folders="3com acenic adaptec advansys airoha amd amd-ucode amdgpu amdtee
+	amlogic amphion ar3k arm ath10k ath11k ath12k ath6k ath9k_htc atmel atusb
+	av7110 bnx2 bnx2x brcm cadence cavium cirrus cis cnm cpia2 cxgb3 cxgb4 cypress
+	dabusb dpaa2 dsp56k e100 edgeport emi26 emi62 ene-ub6250 ess go7007 i915 imx
+	inside-secure intel isci ixp4xx kaweth keyspan keyspan_pda korg libertas
+	liquidio matrox mediatek mellanox meson microchip moxa mrvl mwl8k mwlwifi
+	myricom netronome nvidia nxp ositech powervr qca qcom qed qlogic r128 radeon
+	rockchip rsi rtl_bt rtl_nic rtlwifi rtw88 rtw89 sb16 slicoss sun sxg synaptics
+	tehuti ti ti-connectivity ti-keystone tigon ttusb-budget ueagle-atm vicam vxge
+	wfx xe yam yamaha"
 
 subpackages="$pkgname-other::noarch $pkgname-none::noarch"
 depends="linux-firmware-other=$pkgver-r$pkgrel"
@@ -44,52 +40,67 @@ for i in $_folders; do
 	subpackages="$pkgname-$i:_folder:noarch $subpackages"
 	depends="$pkgname-$i=$pkgver-r$pkgrel $depends"
 done
+subpackages="amd-ucode::noarch $subpackages"
 
-snapshot() {
-	local _date=$(date +%Y%m%d)
-	local _pkg=$pkgname-$_date.tar.gz
-	mkdir -p "$srcdir"
-	cd "$srcdir"
-	rm -rf "$pkgname"
-	git clone --depth=1 --bare $_giturl
-	git --git-dir ${_giturl##*/} archive -o $_pkg \
-		--prefix=$pkgname-$_date/ HEAD
-	msg "New snapshot: $_pkg"
-	if [ -n "$_upload" ]; then
-		msg "Uploading to $_upload"
-		scp $_pkg $_upload && abump $pkgname-$_date
-	fi
+# Add S5P MFC subpackage separately (it doesn't have its own folder)
+subpackages="$pkgname-s5p-mfc:s5p_mfc:noarch $subpackages"
+depends="$pkgname-s5p-mfc=$pkgver-r$pkgrel $depends"
+
+prepare() {
+	default_prepare
+
+	cp "$srcdir"/$pkgname-ucode-amd17h-zenbleed-microcode_amd_fam17h.bin amd-ucode/microcode_amd_fam17h.bin
+	cp "$srcdir"/$pkgname-ucode-amd19h-zenbleed-microcode_amd_fam19h.bin amd-ucode/microcode_amd_fam19h.bin
 }
 
 package() {
-	cd "${_builddir}"
-	make DESTDIR="${pkgdir}" FIRMWAREDIR="/lib/firmware" install
-
-	# add compat links for pre-5.0 kernel
-	ln -s brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt "$pkgdir"/lib/firmware/brcm/brcmfmac43455-sdio.txt
-	ln -s brcmfmac43430-sdio.raspberrypi,3-model-b.txt      "$pkgdir"/lib/firmware/brcm/brcmfmac43430-sdio.txt
-
-	local fw; for fw in $source; do
-		local _f=${fw%::*}
-		case $_f in
-		*.hcd*)
-			install -Dm 644 $srcdir/$_f \
-				"$pkgdir"/lib/firmware/brcm/"${_f%.*}"
-			;;
-		*.zip)
-			unzip -p $srcdir/${fw##*/} "cypress-firmware-*.tar.gz" | \
-				tar xzv -C "$pkgdir"/lib/firmware/brcm/ \
-					--wildcards --strip-components=1 \
-					"*.bin" "*.clm_blob"
-			;;
-		esac
-	done
+	## install upstream linux-firmare files
+	make DESTDIR="$pkgdir" FIRMWAREDIR="/lib/firmware" install
 
-	rm -f "${pkgdir}/usr/lib/firmware/{Makefile,README,configure,GPL-3}"
+	rm -f "$pkgdir/usr/lib/firmware/{Makefile,README,configure,GPL-3}"
 
-	find "${pkgdir}" \( -name '*.S' -or -name '*.asm' -or \
+	find "$pkgdir" \( -name '*.S' -or -name '*.asm' -or \
 		-name '*.c' -or -name '*.h' -or -name '*.pl' -or \
-                -name 'Makefile' \) -exec rm -- {} \;
+		-name 'Makefile' \) -exec rm -- {} \;
+
+	## add original Pi Foundation bluetooth firmware files (supplement to upstream)
+	install -Dm 644 "$srcdir"/bluez-firmware-$_rpi_bt/debian/firmware/broadcom/*.hcd \
+		-t "$pkgdir"/lib/firmware/brcm
+	install -Dm 644 "$srcdir"/bluez-firmware-$_rpi_bt/debian/firmware/synaptics/*.hcd \
+		-t "$pkgdir"/lib/firmware/synaptics
+	# add symlinks from bluez-firmware.links
+	while read -r link_args; do
+		link_args="${link_args/ \/lib/ lib}"
+		link_args="${link_args/\/lib\/firmware\/brcm\//}"
+		( cd "$pkgdir" && ln -sfv ${link_args/\/lib\/firmware\/synaptics\//..\/synaptics\/} )
+	done < "$srcdir/bluez-firmware-$_rpi_bt/debian/bluez-firmware.links"
+
+
+	## add original Pi Foundation brcm wifi firmware files
+	# we can use either the -standard or -minimal 43455 file so use standard by default
+	ln -sfv cyfmac43455-sdio-standard.bin "$srcdir"/firmware-nonfree-$_rpi_brcm/debian/config/brcm80211/cypress/cyfmac43455-sdio.bin
+
+	# install deref's symlinks and copies a whole file, which makes rpi use duplicated
+	# variants specifically from downstream firmware (does not alter base upstream files)
+	install -Dm644 \
+		"$srcdir"/firmware-nonfree-$_rpi_brcm/debian/config/brcm80211/brcm/brcmfmac*raspberrypi* \
+		-t "$pkgdir"/lib/firmware/brcm
+
+	# but 43436/43436s/43456 is not in linux-firmware, so copy it normally
+	cp -a \
+		"$srcdir"/firmware-nonfree-$_rpi_brcm/debian/config/brcm80211/brcm/brcmfmac43456* \
+		"$srcdir"/firmware-nonfree-$_rpi_brcm/debian/config/brcm80211/brcm/brcmfmac43436* \
+		"$pkgdir"/lib/firmware/brcm
+
+	## symlinks for Visionfive1 riscv64 boards, till it fixed upstream
+	ln -sfv ../cypress/cyfmac43430-sdio.bin "$pkgdir"/lib/firmware/brcm/brcmfmac43430-sdio.starfive,visionfive-v1.bin
+
+	dangling=$(cd "$pkgdir" && find . -type l ! -exec test -e {} \; -print)
+	if [ -n "$dangling" ]; then
+		error "dangling symlinks:"
+		echo "$dangling" >&2
+		return 1
+	fi
 }
 
 _folder() {
@@ -97,12 +108,26 @@ _folder() {
 	pkgdesc="firmware files for linux ($folder folder)"
 	depends=""
 	provides="linux-firmware-any"
-	provider_priority=
+	provider_priority=1
+
+	local linkedbins= bin=
+	cd "$pkgdir"
+	# Move things that symlink into the target folder
+	# this fixes the -other deps, because
+	# - there are top-level files that are in -other (non-folder)
+	# - but, they are actually symlinks into .e.g -mediatek
+	# so, -other now depends on -mediatek due to symlink resolution
+	# this moves the symlinks along with the thing they symlink to.
+	linkedbins="$(find lib/firmware -maxdepth 1 -type l -exec sh -c "readlink \$1 | grep -qi $folder && echo \$1" - {} \;)"
+
+	if [ -n "$linkedbins" ]; then
+		for bin in $linkedbins; do
+			amove "$bin"
+		done
+	fi
 
 	# Move /lib/firmware/$folder (case insensitive)
-	mkdir -p "$subpkgdir/lib/firmware"
-	mv "$(find "$pkgdir/lib/firmware" -iname "$folder" -type d)" \
-		"$subpkgdir/lib/firmware"
+	amove "$(find lib/firmware -iname "$folder" -type d)"
 }
 
 other() {
@@ -116,8 +141,8 @@ other() {
 		local fixed
 		error "Not all subfolders have been moved to subpackages!"
 		error "Fix this by adjusting _folders as follows:"
-		fixed="$(echo $_folders$leftover | tr " " "\n" | tr '[A-Z]' '[a-z]' | sort)"
-		echo "_folders=\"$(printf "$fixed" | tr "\n" " ")\"" | fold -s
+		fixed="$(echo $_folders$leftover | tr " " "\n" | tr '[:upper:]' '[:lower:]' | sort)"
+		echo "_folders=\"$(printf "%s" "$fixed" | tr "\n" " ")\"" | fold -s
 		return 1
 	fi
 
@@ -125,22 +150,51 @@ other() {
 	pkgdesc="firmware files for linux (uncategorized)"
 	depends=""
 	provides="linux-firmware-any"
-	provider_priority=
-	mkdir -p "$subpkgdir"/
-	mv "$pkgdir"/lib "$subpkgdir"/
+	provider_priority=1
+
+	amove /lib
 }
 
 none() {
 	# dummy package with no firmware
 	pkgdesc="Empty linux firwmare package for those who does not need any firmware"
-	provider_priority=
 	provides="linux-firmware-any"
+	provider_priority=1
 	depends=
 	mkdir -p "$subpkgdir"
 }
 
+ucode() {
+	pkgdesc="Microcode update files for AMD CPUs"
+	provider_priority=
+	provides=
+	depends=
+
+	# build ported from Arch Linux's PKGBUILD
+	mkdir -p "$subpkgdir"/boot
+	mkdir -p "$builddir"/kernel/x86/microcode
+	cat "$pkgdir"/lib/firmware/amd-ucode/microcode_amd*.bin > "$builddir"/kernel/x86/microcode/AuthenticAMD.bin
+	[ -n "$SOURCE_DATE_EPOCH" ] && touch -d @$SOURCE_DATE_EPOCH "$builddir"/kernel/x86/microcode/AuthenticAMD.bin
+	cd "$builddir" && echo kernel/x86/microcode/AuthenticAMD.bin |
+	  bsdtar --uid 0 --gid 0 -cnf - -T - |
+	  bsdtar --null -cf - --format=newc @- > "$subpkgdir"/boot/amd-ucode.img
+}
+
+s5p_mfc() {
+	# This needs its own function as the files are not in a directory,
+	# but rather loose in the main directory.
+	pkgdesc="firmware files for linux (S5P MFC firmware)"
+	provides="linux-firmware-any"
+	provider_priority=1
+	depends=
+
+	amove /lib/firmware/s5p-mfc*.fw
+}
 
-sha512sums="c54051447c1959e621e49d00c73e4b24a3a01b62b57e4bb73e093382d7d3d0c3838773dc5d1c004033af16299d647c000f06b6c9dc96da546fc3ceda0c3811f9  linux-firmware-20191215.tar.gz
-53fd07c4db0ed44c3790bdf758e272ea63afc21ac6c26a886e7518ab571699b5d420dfee04f17a35d3c1d9fd743f50e5fbb23ad23bbfa8dbecccf1c7257c0ba9  cypress-fmac-v4.14.77-2019_1031.zip
-a7b37bce092367125e390017bb0329c3b7f8fa891cf30d422ee73ce53d0592d4ff0fc2e2a94a87eefb641d5dd8631fae1cc46664224dea987ca04b68a8af8519  BCM43430A1.hcd.fff76cb1
-a52fdb876131affa85b39434d619580c0e1605094992ffa3bb321af387dd79739736842dea9ffa759e6658aecde40eda6b06d93dbb58234a4b126b756c28521e  BCM4345C0.hcd.fff76cb1"
+sha512sums="
+da151677939aa5edb2456dd6cf492abe74a40ba0e4b9bc0a2c3eab279cd1e8f70c6976adb5af37cf707af73bf3e28949433fb59bd16ea23e883c00a2f6e2b4ed  linux-firmware-20240312.tar.gz
+d5182840ba3c1a12e5d8afa078fa334d8c1a2e0e5ca33fa675e64ac1ac26f732a588ac2c7451a4ccf739121268bc56b2f7f22d66cc5344ff108e39e410886419  bluez-firmware-78d6a07730e2d20c035899521ab67726dc028e1c.tar.gz
+0dd00bc388a76613ec0e06000dc1066d200f236142ca9777a4cee62faf611064f0b4625e6120bb3e5f9ec60d33a80b3a2b62bcc1a710618260c3c720eed8b800  brcm-firmware-223ccf3a3ddb11b3ea829749fbbba4d65b380897.tar.gz
+1e122c69184c2b8b6aa71ad7dc961816cd74070622386af11880333190d5cd13dbac11fe2afe92535b0048e207ab25f5d465b1fc97095e24b3e54ccf6f1ea922  linux-firmware-ucode-amd17h-zenbleed-microcode_amd_fam17h.bin
+75bc2c681606c37fc363c54f318a01d3f25a0265c1690b68e4b294f4dc17bb803a2619dd0d41ac72cb7e58fdc4423ad85979b4c9a1039c1c01c1e86ce140d7b8  linux-firmware-ucode-amd19h-zenbleed-microcode_amd_fam19h.bin
+"
diff --git a/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch b/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
index b5c4e1750e9..f3381c4b183 100644
--- a/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
+++ b/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
@@ -13,17 +13,17 @@ Upstream-Status: Submitted
  include/uapi/linux/kernel.h | 2 ++
  1 file changed, 2 insertions(+)
 
-Index: linux-4.8-rc4/include/uapi/linux/kernel.h
-===================================================================
---- linux-4.8-rc4.orig/include/uapi/linux/kernel.h
-+++ linux-4.8-rc4/include/uapi/linux/kernel.h
-@@ -1,7 +1,9 @@
+diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h
+index fadf2db71fe8..813800ed141f 100644
+--- a/include/uapi/linux/kernel.h
++++ b/include/uapi/linux/kernel.h
+@@ -2,7 +2,9 @@
  #ifndef _UAPI_LINUX_KERNEL_H
  #define _UAPI_LINUX_KERNEL_H
  
 +#ifdef __GLIBC__
  #include <linux/sysinfo.h>
 +#endif
+ #include <linux/const.h>
  
- /*
-  * 'kernel.h' contains some often-used function prototypes etc
+ #endif /* _UAPI_LINUX_KERNEL_H */
diff --git a/main/linux-headers/APKBUILD b/main/linux-headers/APKBUILD
index 01008319552..3992f449f2e 100644
--- a/main/linux-headers/APKBUILD
+++ b/main/linux-headers/APKBUILD
@@ -1,22 +1,41 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=linux-headers
-pkgver=5.4.5
-_kernver=${pkgver%.*}
-pkgrel=1
+pkgver=6.6 # Follow the latest Linux stable
+case $pkgver in
+	*.*.*)	_kernver=${pkgver%.*};;
+	*.*) _kernver=$pkgver;;
+esac
+pkgrel=0
 pkgdesc="Linux system headers"
-url="http://kernel.org"
-arch="all"
+url="https://kernel.org/"
+arch="noarch"
 license="GPL-2.0-only"
-makedepends="perl rsync"
+makedepends="perl"
 options="!check !dbg !strip !tracedeps"
-source="https://kernel.org/pub/linux/kernel/v5.x/linux-$_kernver.tar.xz
-	https://kernel.org/pub/linux/kernel/v5.x/patch-$pkgver.xz
+source="https://kernel.org/pub/linux/kernel/v6.x/linux-$_kernver.tar.xz
 	revert-broken-uapi.patch
 	0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
-	include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch
 	"
+if [ "${pkgver%.0}" = "$pkgver" ]; then
+	source="
+		$source
+		https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz
+		"
+fi
 builddir="$srcdir/linux-$_kernver"
 
+_carch="$CARCH"
+case "$_carch" in
+aarch64*) _carch="arm64" ;;
+arm*) _carch="arm" ;;
+mips*) _carch="mips" ;;
+s390*) _carch="s390" ;;
+ppc*) _carch="powerpc" ;;
+riscv*) _carch="riscv" ;;
+loongarch*) _carch="loongarch" ;;
+# not sure about this --	ppc64*) _carch="powerpc64" ;;
+esac
+
 prepare() {
 	if [ "$_kernver" != "$pkgver" ]; then
 		unxz -c < "$srcdir"/patch-$pkgver.xz | patch -p1
@@ -24,30 +43,24 @@ prepare() {
 	default_prepare
 }
 
-package() {
-	local _carch=$CARCH
-
-	case "$_carch" in
-	aarch64*) _carch="arm64" ;;
-	arm*) _carch="arm" ;;
-	mips*) _carch="mips" ;;
-	s390*) _carch="s390" ;;
-	ppc*) _carch="powerpc" ;;
-# not sure about this --	ppc64*) _carch="powerpc64" ;;
-	esac
+build() {
+	make headers ARCH="$_carch"
+}
 
-	mkdir -p "$pkgdir/usr"
-	make headers_install ARCH="$_carch" INSTALL_HDR_PATH="$pkgdir/usr"
+package() {
+	mkdir -p "$pkgdir"/usr/
+	cp -a usr/include/ "$pkgdir"/usr/include/
 
-	find "$pkgdir/usr" \( -name .install -o -name ..install.cmd \) -exec \
-		rm -f {} \;
+	msg "purging non header files.."
+	find "$pkgdir"/usr/include/ ! -iname "*.h" -type f -exec rm -v {} \+
 
 	# provided by libdrm
 	rm -rf "$pkgdir"/usr/include/drm
 }
 
-sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f  linux-5.4.tar.xz
-5c33d5db4d6787d7841a82dd8dc5b38dd80c5706bdaf9bd331e82173302a4cf3bc9c5e1d00f489d3d78b54bc1f8f82f34df2fcd47b1ab4ffb0a01dc7bdc06cff  patch-5.4.5.xz
+sha512sums="
+458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35  linux-6.6.tar.xz
 32597f2672d1ec365a936d15041a7cf219ef9353241d4a5c378244cf2fc155610443a19bbcd391c86099a0b08486c45e042ec7c90b0d04fe675c3ad0ffc36b53  revert-broken-uapi.patch
-302283b1b5f560c850e24aad73febcf7f906ed62b4cad2d826bf140ffe59191631f3cd4ac29525c349cdfe61aba6a47886a0d76f1c6a4a16b744d59b94ea5df8  0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
-b1cf5a1b020f815797c8a2de18595a399800a1ec887e6793739c62a2172855aa95643c1e7a5db9db9699ae7f2b1517925630919c2307f3cd233a4d459b2c5e8b  include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch"
+607c074d72aca88fea9ecdbd62198d8f7857daca75e5d027966e0a9997338d6ac8ce0a1e9114b19232b390751d05acca09e28b0cfad2a12d5942f5575a9f4684  0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
+1898e06d074961ab3919de9408cdb9bcb359194e3c5d7de78e9a2dd20457a3f55e2bf1d8a9c1689d3117353b095d6b63a29ff7d9874ac35c7deb7a2155bcbf72  patch-6.6.xz
+"
diff --git a/main/linux-headers/include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch b/main/linux-headers/include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch
deleted file mode 100644
index a0b8b734e3e..00000000000
--- a/main/linux-headers/include-uapi-linux-swab-Fix-potentially-missing-__always_inline.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Matt Redfearn <matt.redfearn@mips.com>
-Subject: [PATCH] include/uapi/linux/swab: Fix potentially missing __always_inline
-Date: Wed, 3 Jan 2018 09:57:30 +0000
-Message-ID: <1514973450-12447-1-git-send-email-matt.redfearn@mips.com>
-X-Mailer: git-send-email 2.7.4
-MIME-Version: 1.0
-Content-Type: text/plain; charset="UTF-8"
-Content-Transfer-Encoding: 8BIT
-
-Commit bc27fb68aaad ("include/uapi/linux/byteorder, swab: force inlining
-of some byteswap operations") added __always_inline to swab functions
-and commit 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to
-userspace headers") added a definition of __always_inline for use in
-exported headers when the kernel's compiler.h is not available.
-
-However, since swab.h does not include stddef.h, if the header soup does
-not indirectly include it, the definition of __always_inline is missing,
-resulting in a compilation failure, which was observed compiling the
-perf tool using exported headers containing this commit:
-
-In file included from /usr/include/linux/byteorder/little_endian.h:12:0,
-                 from /usr/include/asm/byteorder.h:14,
-                 from tools/include/uapi/linux/perf_event.h:20,
-                 from perf.h:8,
-                 from builtin-bench.c:18:
-/usr/include/linux/swab.h:160:8: error: unknown type name ‘__always_inline’
- static __always_inline __u16 __swab16p(const __u16 *p)
-
-Fix this by replacing the inclusion of linux/compiler.h with
-linux/stddef.h to ensure that we pick up that definition if required,
-without relying on it's indirect inclusion. compiler.h is then included
-indirectly, via stddef.h.
-
-Fixes: 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to userspace headers")
-Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
-
----
-
- include/uapi/linux/swab.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
-index 23cd84868cc3..f6a8cf737abf 100644
---- a/include/uapi/linux/swab.h
-+++ b/include/uapi/linux/swab.h
-@@ -3,7 +3,7 @@
- #define _UAPI_LINUX_SWAB_H
- 
- #include <linux/types.h>
--#include <linux/compiler.h>
-+#include <linux/stddef.h>
- #include <asm/swab.h>
- 
- /*
--- 
-2.7.4
diff --git a/main/linux-lts/0001-powerpc-boot-wrapper-Add-z-notext-flag-for-ppc64le.patch b/main/linux-lts/0001-powerpc-boot-wrapper-Add-z-notext-flag-for-ppc64le.patch
new file mode 100644
index 00000000000..f994c25fc86
--- /dev/null
+++ b/main/linux-lts/0001-powerpc-boot-wrapper-Add-z-notext-flag-for-ppc64le.patch
@@ -0,0 +1,28 @@
+From b4d7a16d2b76e09ec88ff53a86f6e263c329e160 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 28 Nov 2023 14:35:54 +0100
+Subject: [PATCH 1/5] powerpc/boot/wrapper: Add "-z notext" flag for ppc64le
+
+This is a follow up to commit 4c078c86b4a4 (powerpc/boot/wrapper: Add
+"-z notext" flag to disable diagnostic)
+
+Ref: https://gitlab.alpinelinux.org/alpine/aports/-/issues/14560
+---
+ arch/powerpc/boot/wrapper | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
+index 352d7de24018..ceaef956f821 100755
+--- a/arch/powerpc/boot/wrapper
++++ b/arch/powerpc/boot/wrapper
+@@ -268,6 +268,7 @@ pseries)
+     if [ "$format" != "elf32ppc" ]; then
+ 	link_address=
+ 	pie=-pie
++	notext='-z notext'
+     fi
+     make_space=n
+     ;;
+-- 
+2.43.0
+
diff --git a/main/linux-lts/0002-powerpc-config-defang-gcc-check-for-stack-protector-.patch b/main/linux-lts/0002-powerpc-config-defang-gcc-check-for-stack-protector-.patch
deleted file mode 100644
index 8c72faeffd5..00000000000
--- a/main/linux-lts/0002-powerpc-config-defang-gcc-check-for-stack-protector-.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4639a92dc56793b596f3a9ae0ec1a60d67a617f5 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 18 Feb 2020 21:10:22 +0000
-Subject: [PATCH 2/2] powerpc: config: defang gcc check for stack-protector
- support
-
-When we rebase kernel configs in Alpine, it is common to do so from
-an environment where CARCH does not match CHOST.
-
-Accordingly, we assume that the gcc check will always pass, and
-simply remove it in preference for always enabling the
-HAVE_STACKPROTECTOR config option.
-
-Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
----
- arch/powerpc/Kconfig | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
-index 3e56c9c2f16e..f0b7d77aaef1 100644
---- a/arch/powerpc/Kconfig
-+++ b/arch/powerpc/Kconfig
-@@ -181,8 +181,7 @@ config PPC
- 	select HAVE_ASM_MODVERSIONS
- 	select HAVE_C_RECORDMCOUNT
- 	select HAVE_CBPF_JIT			if !PPC64
--	select HAVE_STACKPROTECTOR		if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13)
--	select HAVE_STACKPROTECTOR		if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2)
-+	select HAVE_STACKPROTECTOR
- 	select HAVE_CONTEXT_TRACKING		if PPC64
- 	select HAVE_COPY_THREAD_TLS
- 	select HAVE_DEBUG_KMEMLEAK
--- 
-2.24.0
-
diff --git a/main/linux-lts/0002-x86-Compress-vmlinux-with-zstd-19-instead-of-22.patch b/main/linux-lts/0002-x86-Compress-vmlinux-with-zstd-19-instead-of-22.patch
new file mode 100644
index 00000000000..39acc392f8b
--- /dev/null
+++ b/main/linux-lts/0002-x86-Compress-vmlinux-with-zstd-19-instead-of-22.patch
@@ -0,0 +1,30 @@
+From b7a5aef6b0d761be21e8df6cd11a963f762768ea Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 13 Dec 2022 16:45:51 +0100
+Subject: [PATCH 2/5] x86: Compress vmlinux with zstd -19 instead of -22
+
+This gives slightly bigger kernel but it avoids run out of memory on 32
+bit kernels with the error:
+zstd kernel compression error 11
+
+https://forums.gentoo.org/viewtopic-p-8641020.html#8641020
+---
+ arch/x86/boot/compressed/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
+index 71fc531b95b4..260d38e772b0 100644
+--- a/arch/x86/boot/compressed/Makefile
++++ b/arch/x86/boot/compressed/Makefile
+@@ -147,7 +147,7 @@ $(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
+ $(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE
+ 	$(call if_changed,lz4_with_size)
+ $(obj)/vmlinux.bin.zst: $(vmlinux.bin.all-y) FORCE
+-	$(call if_changed,zstd22_with_size)
++	$(call if_changed,zstd_with_size)
+ 
+ suffix-$(CONFIG_KERNEL_GZIP)	:= gz
+ suffix-$(CONFIG_KERNEL_BZIP2)	:= bz2
+-- 
+2.43.0
+
diff --git a/main/linux-lts/0003-kexec-add-kexec_load_disabled-boot-option.patch b/main/linux-lts/0003-kexec-add-kexec_load_disabled-boot-option.patch
new file mode 100644
index 00000000000..a13d12a4bd4
--- /dev/null
+++ b/main/linux-lts/0003-kexec-add-kexec_load_disabled-boot-option.patch
@@ -0,0 +1,36 @@
+From cf29b5a58ef88adf96317c3c933a16f9c865e09a Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 14 Jul 2022 13:23:51 +0200
+Subject: [PATCH 3/5] kexec: add kexec_load_disabled boot option
+
+Make kexec_load disabled by default and add a boot option to enable it:
+kexec_load_disabled=0
+---
+ kernel/kexec_core.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
+index 9dc728982d79..7650ffe5631e 100644
+--- a/kernel/kexec_core.c
++++ b/kernel/kexec_core.c
+@@ -942,7 +942,16 @@ static struct kexec_load_limit load_limit_panic = {
+ 
+ struct kimage *kexec_image;
+ struct kimage *kexec_crash_image;
+-static int kexec_load_disabled;
++static int kexec_load_disabled = 1;
++
++static int __init kexec_load_disabled_setup(char *str)
++{
++	unsigned long disabled;
++	if (!kstrtoul(str, 0, &disabled))
++		kexec_load_disabled = disabled ? 1 : 0;
++	return 1;
++}
++__setup("kexec_load_disabled=", kexec_load_disabled_setup);
+ 
+ #ifdef CONFIG_SYSCTL
+ static int kexec_limit_handler(struct ctl_table *table, int write,
+-- 
+2.43.0
+
diff --git a/main/linux-lts/0004-objtool-respect-AWK-setting.patch b/main/linux-lts/0004-objtool-respect-AWK-setting.patch
new file mode 100644
index 00000000000..7c04574b846
--- /dev/null
+++ b/main/linux-lts/0004-objtool-respect-AWK-setting.patch
@@ -0,0 +1,26 @@
+From dc34b09b20b7aa88ca55742a113d223f33c09c32 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 28 Nov 2023 14:22:46 +0100
+Subject: [PATCH 4/5] objtool: respect AWK setting
+
+AWK= is not passed on as an makefile argument so we need pass it as an env.
+---
+ tools/objtool/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
+index 83b100c1e7f6..6ccddfa6de4f 100644
+--- a/tools/objtool/Makefile
++++ b/tools/objtool/Makefile
+@@ -42,7 +42,7 @@ OBJTOOL_CFLAGS += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED)
+ # Always want host compilation.
+ HOST_OVERRIDES := CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)"
+ 
+-AWK = awk
++AWK ?= awk
+ MKDIR = mkdir
+ 
+ ifeq ($(V),1)
+-- 
+2.43.0
+
diff --git a/main/linux-lts/0005-powerpc-config-defang-gcc-check-for-stack-protector-.patch b/main/linux-lts/0005-powerpc-config-defang-gcc-check-for-stack-protector-.patch
new file mode 100644
index 00000000000..bf2e0d52884
--- /dev/null
+++ b/main/linux-lts/0005-powerpc-config-defang-gcc-check-for-stack-protector-.patch
@@ -0,0 +1,35 @@
+From 0306d648bbd12489c9ffbe8f5bd9cc82fa5eadd8 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Tue, 18 Feb 2020 21:10:22 +0000
+Subject: [PATCH 5/5] powerpc: config: defang gcc check for stack-protector
+ support
+
+When we rebase kernel configs in Alpine, it is common to do so from
+an environment where CARCH does not match CHOST.
+
+Accordingly, we assume that the gcc check will always pass, and
+simply remove it in preference for always enabling the
+HAVE_STACKPROTECTOR config option.
+
+Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
+---
+ arch/powerpc/Kconfig | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
+index d5d5388973ac..0ba9d88de22f 100644
+--- a/arch/powerpc/Kconfig
++++ b/arch/powerpc/Kconfig
+@@ -271,8 +271,7 @@ config PPC
+ 	select HAVE_RSEQ
+ 	select HAVE_SETUP_PER_CPU_AREA		if PPC64
+ 	select HAVE_SOFTIRQ_ON_OWN_STACK
+-	select HAVE_STACKPROTECTOR		if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2)
+-	select HAVE_STACKPROTECTOR		if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13)
++	select HAVE_STACKPROTECTOR
+ 	select HAVE_STATIC_CALL			if PPC32
+ 	select HAVE_SYSCALL_TRACEPOINTS
+ 	select HAVE_VIRT_CPU_ACCOUNTING
+-- 
+2.43.0
+
diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD
index 1a243c2a3c7..d5e710a3fea 100644
--- a/main/linux-lts/APKBUILD
+++ b/main/linux-lts/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
 _flavor=lts
-pkgname=linux-${_flavor}
-pkgver=5.4.28
+pkgname=linux-$_flavor
+pkgver=6.6.28
 case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
@@ -10,125 +10,208 @@ esac
 pkgrel=0
 pkgdesc="Linux lts kernel"
 url="https://www.kernel.org"
-depends="mkinitfs"
-_depends_dev="perl gmp-dev elfutils-dev bash flex bison"
-makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware-any openssl-dev
-	diffutils"
-options="!strip"
+depends="initramfs-generator"
+_depends_dev="perl gmp-dev mpc1-dev mpfr-dev elfutils-dev bash flex bison zstd"
+makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware-any openssl-dev>3 mawk
+	diffutils findutils zstd pahole python3 gcc>=13.1.1_git20230624"
+options="!strip !check"
 _config=${config:-config-lts.${CARCH}}
-install=
 source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
-	0002-powerpc-config-defang-gcc-check-for-stack-protector-.patch
-
-	config-lts.aarch64
-	config-lts.armv7
-	config-lts.x86
-	config-lts.x86_64
-	config-lts.ppc64le
-	config-lts.s390x
-	config-lts.mips64
-	config-lts.mips
-
-	config-virt.aarch64
-	config-virt.armv7
-	config-virt.x86
-	config-virt.x86_64
+	0001-powerpc-boot-wrapper-Add-z-notext-flag-for-ppc64le.patch
+	0002-x86-Compress-vmlinux-with-zstd-19-instead-of-22.patch
+	0003-kexec-add-kexec_load_disabled-boot-option.patch
+	0004-objtool-respect-AWK-setting.patch
+	0005-powerpc-config-defang-gcc-check-for-stack-protector-.patch
+
+	lts.aarch64.config
+	lts.armv7.config
+	lts.x86.config
+	lts.x86_64.config
+	lts.ppc64le.config
+	lts.s390x.config
+	lts.loongarch64.config
+
+	virt.aarch64.config
+	virt.armv7.config
+	virt.ppc64le.config
+	virt.x86.config
+	virt.x86_64.config
 	"
-subpackages="$pkgname-dev:_dev:$CBUILD_ARCH"
-_flavors=
+subpackages="$pkgname-dev:_dev:$CBUILD_ARCH $pkgname-doc"
 for _i in $source; do
 	case $_i in
-	config-*.$CARCH)
-		_f=${_i%.$CARCH}
-		_f=${_f#config-}
-		_flavors="$_flavors ${_f}"
+	*.$CARCH.config)
+		_f=${_i%."$CARCH".config}
+		_flavors="$_flavors $_f"
 		if [ "linux-$_f" != "$pkgname" ]; then
-			subpackages="$subpackages linux-${_f}::$CBUILD_ARCH linux-${_f}-dev:_dev:$CBUILD_ARCH"
+			subpackages="$subpackages linux-$_f::$CBUILD_ARCH linux-$_f-dev:_dev:$CBUILD_ARCH"
 		fi
 		;;
 	esac
 done
+builddir="$srcdir"/linux-$_kernver
 
 if [ "${pkgver%.0}" = "$pkgver" ]; then
 	source="$source
 	https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz"
 fi
-arch="all !armhf"
-license="GPL-2.0"
-
-_carch=${CARCH}
-case "$_carch" in
-aarch64*) _carch="arm64" ;;
-arm*) _carch="arm" ;;
-mips*) _carch="mips" ;;
-ppc*) _carch="powerpc" ;;
-s390*) _carch="s390" ;;
-esac
+arch="all !armhf !riscv64"
+license="GPL-2.0-only"
+
+# secfixes:
+#   5.10.4-r0:
+#     - CVE-2020-29568
+#     - CVE-2020-29569
+#   5.15.74-r0:
+#     - CVE-2022-41674
+#     - CVE-2022-42719
+#     - CVE-2022-42720
+#     - CVE-2022-42721
+#     - CVE-2022-42722
+#   6.1.27-r3:
+#     - CVE-2023-32233
+#   6.6.13-r1:
+#     - CVE-46838
 
 prepare() {
-	local _patch_failed=
-	cd "$srcdir"/linux-$_kernver
 	if [ "$_kernver" != "$pkgver" ]; then
 		msg "Applying patch-$pkgver.xz"
 		unxz -c < "$srcdir"/patch-$pkgver.xz | patch -p1 -N
 	fi
 
-	# first apply patches in specified order
+	default_prepare
+
+	# remove localversion from patch if any
+	rm -f localversion*
+}
+
+_kernelarch() {
+	local arch="$1"
+	case "$arch" in
+		aarch64*) arch="arm64" ;;
+		arm*) arch="arm" ;;
+		mips*) arch="mips" ;;
+		ppc*) arch="powerpc" ;;
+		s390*) arch="s390" ;;
+		riscv*) arch="riscv" ;;
+		loongarch64) arch="loongarch" ;;
+	esac
+	echo "$arch"
+}
+
+_prepareconfig() {
+	local _flavor="$1"
+	local _arch="$2"
+	local _config=$_flavor.$_arch.config
+	local _builddir="$srcdir"/build-$_flavor.$_arch
+	mkdir -p "$_builddir"
+	echo "-$pkgrel-$_flavor" > "$_builddir"/localversion-alpine
+
+	cp "$srcdir"/$_config "$_builddir"/.config
+	msg "Configuring $_flavor kernel ($_arch)"
+	make -C "$builddir" \
+		O="$_builddir" \
+		ARCH="$(_kernelarch $_arch)" \
+		olddefconfig
+
+	if grep "CONFIG_MODULE_SIG=y" "$_builddir"/.config >/dev/null; then
+		if [ -f "$KERNEL_SIGNING_KEY" ]; then
+			sed -i -e "s:^CONFIG_MODULE_SIG_KEY=.*:CONFIG_MODULE_SIG_KEY=\"$KERNEL_SIGNING_KEY\":" \
+				"$_builddir"/.config
+			msg "Using $KERNEL_SIGNING_KEY to sign $_flavor kernel ($_arch) modules"
+		else
+			warning "KERNEL_SIGNING_KEY was not set. A signing key will be generated, but 3rd"
+			warning "party modules can not be signed"
+		fi
+	fi
+}
+
+listconfigs() {
 	for i in $source; do
-		case $i in
-		*.patch)
-			msg "Applying $i..."
-			if ! patch -s -p1 -N -i "$srcdir"/$i; then
-				echo $i >>failed
-				_patch_failed=1
-			fi
-			;;
+		case "$i" in
+			*.config) echo $i;;
 		esac
 	done
+}
 
-	if ! [ -z "$_patch_failed" ]; then
-		error "The following patches failed:"
-		cat failed
-		return 1
-	fi
+prepareconfigs() {
+	for _config in $(listconfigs); do
+		local _flavor=${_config%%.*}
+		local _arch=${_config%.config}
+		_arch=${_arch#*.}
+		local _builddir="$srcdir"/build-$_flavor.$_arch
+		_prepareconfig "$_flavor" "$_arch"
+	done
+}
 
-	# remove localversion from patch if any
-	rm -f localversion*
-	oldconfig
+# this is supposed to be run before version is bumped so we can compare
+# what new kernel config knobs are introduced
+prepareupdate() {
+	clean && fetch && unpack && prepare && deps
+	prepareconfigs
+	rm -r "$builddir"
 }
 
-oldconfig() {
-	for i in $_flavors; do
-		local _config=config-$i.${CARCH}
-		local _builddir="$srcdir"/build-$i.$CARCH
+updateconfigs() {
+	if ! [ -d "$builddir" ]; then
+		deps && fetch && unpack && prepare
+	fi
+	for _config in ${CONFIGS:-$(listconfigs)}; do
+		msg "updating $_config"
+		local _flavor=${_config%%.*}
+		local _arch=${_config%.config}
+		_arch=${_arch#*.}
+		local _builddir="$srcdir"/build-$_flavor.$_arch
 		mkdir -p "$_builddir"
-		echo "-$pkgrel-$i" > "$_builddir"/localversion-alpine \
-			|| return 1
-
-		cp "$srcdir"/$_config "$_builddir"/.config
-		make -C "$srcdir"/linux-$_kernver \
+		echo "-$pkgrel-$_flavor" > "$_builddir"/localversion-alpine
+		local actions="listnewconfig oldconfig"
+		if ! [ -f "$_builddir"/.config ]; then
+			cp "$srcdir"/$_config "$_builddir"/.config
+			actions="olddefconfig"
+		fi
+		env | grep ^CONFIG_ >> "$_builddir"/.config || true
+		make -j1 -C "$builddir" \
 			O="$_builddir" \
-			ARCH="$_carch" \
-			listnewconfig oldconfig
+			ARCH="$(_kernelarch $_arch)" \
+			$actions savedefconfig
+
+		cp "$_builddir"/defconfig "$startdir"/$_config
 	done
 }
 
 build() {
 	unset LDFLAGS
+	# for some reason these sometimes leak into the kernel build,
+	# -Werror=format-security breaks some stuff
+	unset CFLAGS CPPFLAGS CXXFLAGS
 	export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 	for i in $_flavors; do
+		_prepareconfig "$i" "$CARCH"
+	done
+	for i in $_flavors; do
+		msg "Building $i kernel"
 		cd "$srcdir"/build-$i.$CARCH
-		make ARCH="$_carch" CC="${CC:-gcc}" \
+
+		# set org in cert for modules signing
+		# https://www.kernel.org/doc/html/v6.1/admin-guide/module-signing.html#generating-signing-keys
+		mkdir -p certs
+		sed -e 's/#O = Unspecified company/O = alpinelinux.org/' \
+			"$builddir"/certs/default_x509.genkey \
+			> certs/x509.genkey
+
+		make ARCH="$(_kernelarch $CARCH)" \
+			CC="${CC:-gcc}" \
+			AWK="${AWK:-mawk}" \
 			KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine"
 	done
 }
 
 _package() {
 	local _buildflavor="$1" _outdir="$2"
-	local _abi_release=${pkgver}-${pkgrel}-${_buildflavor}
 	export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 
 	cd "$srcdir"/build-$_buildflavor.$CARCH
+	local _abi_release="$(make -s kernelrelease)"
 	# modules_install seems to regenerate a defect Modules.symvers on s390x. Work
 	# around it by backing it up and restore it after modules_install
 	cp Module.symvers Module.symvers.backup
@@ -137,31 +220,59 @@ _package() {
 
 	local _install
 	case "$CARCH" in
-		arm*|aarch64) _install="zinstall dtbs_install";;
+		arm*|aarch64|riscv*) _install="zinstall dtbs_install";;
 		*) _install=install;;
 	esac
 
-	make -j1 modules_install $_install \
-		ARCH="$_carch" \
+	make modules_install $_install \
+		ARCH="$(_kernelarch $CARCH)" \
 		INSTALL_MOD_PATH="$_outdir" \
+		INSTALL_MOD_STRIP=1 \
 		INSTALL_PATH="$_outdir"/boot \
-		INSTALL_DTBS_PATH="$_outdir/boot/dtbs-$_flavor"
+		INSTALL_DTBS_PATH="$_outdir/boot/dtbs-$_buildflavor"
 
 	cp Module.symvers.backup Module.symvers
 
-	rm -f "$_outdir"/lib/modules/${_abi_release}/build \
-		"$_outdir"/lib/modules/${_abi_release}/source
+	rm -f "$_outdir"/lib/modules/"$_abi_release"/build \
+		"$_outdir"/lib/modules/"$_abi_release"/source
 	rm -rf "$_outdir"/lib/firmware
 
-	install -D include/config/kernel.release \
+	install -D -m644 include/config/kernel.release \
 		"$_outdir"/usr/share/kernel/$_buildflavor/kernel.release
+
+	case "$CARCH" in
+	loongarch64)
+		mv  "$_outdir"/boot/vmlinuz-$_abi_release \
+			"$_outdir"/boot/vmlinuz-$_buildflavor
+
+		mv  "$_outdir"/boot/config-$_abi_release \
+			"$_outdir"/boot/config-$_buildflavor
+
+		mv  "$_outdir"/boot/System.map-$_abi_release \
+			"$_outdir"/boot/System.map-$_buildflavor
+		;;
+	esac
 }
 
 # main flavor installs in $pkgdir
 package() {
 	depends="$depends linux-firmware-any"
 
-	_package lts "$pkgdir"
+	_package "$_flavor" "$pkgdir"
+
+	# copy files for linux-lts-doc sub package
+	mkdir -p "$pkgdir"/usr/share/doc
+	cp -r "$builddir"/Documentation \
+		"$pkgdir"/usr/share/doc/linux-doc-"$pkgver"/
+	# remove files that aren't part of the documentation itself
+	for nondoc in \
+		.gitignore conf.py docutils.conf \
+		dontdiff Kconfig Makefile
+	do
+		rm "$pkgdir"/usr/share/doc/linux-doc-"$pkgver"/"$nondoc"
+	done
+	# create /usr/share/doc/linux-doc symlink
+	cd "$pkgdir"/usr/share/doc; ln -s linux-doc-"$pkgver" linux-doc
 }
 
 # subflavors install in $subpkgdir
@@ -171,7 +282,8 @@ virt() {
 
 _dev() {
 	local _flavor=$(echo $subpkgname | sed -E 's/(^linux-|-dev$)//g')
-	local _abi_release=${pkgver}-${pkgrel}-$_flavor
+	local _builddir="$srcdir"/build-$_flavor.$CARCH
+	local _abi_release="$(make -C "$_builddir" -s kernelrelease)"
 	# copy the only the parts that we really need for build 3rd party
 	# kernel modules and install those as /usr/src/linux-headers,
 	# simlar to what ubuntu does
@@ -181,27 +293,32 @@ _dev() {
 	#
 	pkgdesc="Headers and script for third party modules for $_flavor kernel"
 	depends="$_depends_dev"
-	local dir="$subpkgdir"/usr/src/linux-headers-${_abi_release}
+	local dir="$subpkgdir"/usr/src/linux-headers-"$_abi_release"
 	export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 
 	# first we import config, run prepare to set up for building
 	# external modules, and create the scripts
 	mkdir -p "$dir"
-	cp "$srcdir"/config-$_flavor.${CARCH} "$dir"/.config
-	echo "-$pkgrel-$_flavor" > "$dir"/localversion-alpine
+	cp -a "$_builddir"/.config "$_builddir"/localversion-alpine \
+		"$dir"/
 
-	make -j1 -C "$srcdir"/linux-$_kernver O="$dir" ARCH="$_carch" \
-		syncconfig prepare modules_prepare scripts
+	install -D -t "$dir"/certs "$_builddir"/certs/signing_key.x509 || :
+
+	make -C "$builddir" \
+		O="$dir" \
+		ARCH="$(_kernelarch $CARCH)" \
+		AWK="${AWK:-mawk}" \
+		prepare modules_prepare scripts
 
 	# remove the stuff that points to real sources. we want 3rd party
-	# modules to believe this is the soruces
+	# modules to believe this is the sources
 	rm "$dir"/Makefile "$dir"/source
 
 	# copy the needed stuff from real sources
 	#
 	# this is taken from ubuntu kernel build script
 	# http://kernel.ubuntu.com/git/ubuntu/ubuntu-zesty.git/tree/debian/rules.d/3-binary-indep.mk
-	cd "$srcdir"/linux-$_kernver
+	cd "$builddir"
 	find .  -path './include/*' -prune \
 		-o -path './scripts/*' -prune -o -type f \
 		\( -name 'Makefile*' -o -name 'Kconfig*' -o -name 'Kbuild*' -o \
@@ -210,29 +327,49 @@ _dev() {
 
 	cp -a scripts include "$dir"
 
-	find $(find arch -name include -type d -print) -type f \
-		| cpio -pdm "$dir"
+	find "arch/$_karch" -name include -type d -print | while IFS='' read -r folder; do
+		find "$folder" -type f
+	done | sort -u | cpio -pdm "$dir"
 
 	install -Dm644 "$srcdir"/build-$_flavor.$CARCH/Module.symvers \
 		"$dir"/Module.symvers
 
-	mkdir -p "$subpkgdir"/lib/modules/${_abi_release}
-	ln -sf /usr/src/linux-headers-${_abi_release} \
-		"$subpkgdir"/lib/modules/${_abi_release}/build
+	# remove unneeded things
+	msg "Removing documentation..."
+	rm -r "$dir"/Documentation
+	find "$dir" -type f -name '*.o' -printf 'Removing %P\n' -delete
+	local _karch="$(_kernelarch $CARCH | sed 's/x86_64/x86/')"
+	msg "Removing unneeded arch headers..."
+	for i in "$dir"/arch/*; do
+		if [ "${i##*/}" != "$_karch" ]; then
+			echo "  ${i##*/}"
+			rm -r "$i"
+		fi
+	done
+
+	mkdir -p "$subpkgdir"/lib/modules/"$_abi_release"
+	ln -sf /usr/src/linux-headers-"$_abi_release" \
+		"$subpkgdir"/lib/modules/"$_abi_release"/build
 }
 
-sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f  linux-5.4.tar.xz
-d19365fe94431008768c96a2c88955652f70b6df6677457ee55ee95246a64fdd2c6fed9b3bef37c29075178294a7fc91f148ead636382530ebfa822be4ad8c2f  0002-powerpc-config-defang-gcc-check-for-stack-protector-.patch
-572d6267aada9c839e6c44db9b0016129bb92c627e354a5089c88aaa69555636be58c1c351f5a627cc6ed5dda16f533b44dc0135d07dc13c2c7cdd7c54f3a212  config-lts.aarch64
-66bb4711b634681a3e46dccb6c362eb81489d7ef57a96be1e33dfa498901cf6aba7a6fa12ae3005da58b27fa0485c59c08fd116e4f336db853a067cfe0ff4c04  config-lts.armv7
-fb7a6873a1e15f14eafed0d9390b48a81548364438f07ac408a73cf57265312c36c09fb870f9bbcd054580355f2f50d480e30f8331d754d8c537e9cd30fb0d6f  config-lts.x86
-3d96664bbd66c88f5291c690aef9f8a42278434c59a8b2fe767a487334ad08edc2183d44c2888570fa25d0a018baea5c0533a06ebb3ac07d3b27650fd008098b  config-lts.x86_64
-d47ad32c2585f566e78befdad44609d915c5a3f19962db310d531bd48849727926baf6341f1f43db6acbcda32545e40966b2c7d37300a003cd67ad9e5853b75f  config-lts.ppc64le
-091856d7928e017ddfac147350983c9d38bdeb512df1ec765de3417bf086ddcd98263251b157b7a7f65fe9a1785c45b89df3e9387ad17571d410564155e7f97d  config-lts.s390x
-d127413fe1c4730157ac51bdae70823a57d3f0a171de59f747759b24af35d93e762a041790a43b05100eeed26901e3e9e09191dc943ecbbd8e0ae580d9b5ca81  config-lts.mips64
-185973559cc91739d008f114d9e0b4f61453bd9a135602ab6e3d00a8c2c359ea0facca110d1de25183712fab8dc4c6bef90493d65a7d020adeb89db3d6517e35  config-lts.mips
-da6e7dea244559dd799a4e3310aaec6ca2de66e586052d9440ddef3d468dda82e1755daf038750ce65f02319aedaba98613a90ac95489ed5334d802367debdef  config-virt.aarch64
-455f7dc1da8b103ea0ad35638620d2ec347789c0eca7f4bcc20abdd3bb930908a5cbed1e37e65f8fc7b15e1610c4f08fdb02a0c2787edbe58638b8c72ea4e7b4  config-virt.armv7
-a11a9629aeace01577b44076fe5256d972443ac01d376eb807df4a5faecf9e75da64ca7a2f9a7fe3cb05fbddf5245721a0449b415794f9ca4c70b6099ef22276  config-virt.x86
-7a0938f685ead350edbf2809b02ea8b0a3c95885559e8298028b40d338d24259a648a29e45ac6f85e87d01e933cceb442b9753aa73b67c8caf3dddacbae84a7f  config-virt.x86_64
-883aa429e22a3b2623b52ee4c376f15c128baff3377873e0515231902e46701e4928699dc3404eaed73ab7d333cb2a32ebebf35d727a22d3dac11b5680d4db36  patch-5.4.28.xz"
+sha512sums="
+458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35  linux-6.6.tar.xz
+58bf9e84fb01f811f0cada7f7953d111908f0b0650648d6a3522061fe08c9fe284c9315515ae386189253e37d0c92419f78048d6568e2e426654b1e61010685f  0001-powerpc-boot-wrapper-Add-z-notext-flag-for-ppc64le.patch
+763dcb40f698d43b0bb856f44493973e840b66efe62a8fd41a08b6e3fa38cf903e059d107be3735ab2f38a0f27bdb0262798e5e530a1905f96195cd8bcf62fdf  0002-x86-Compress-vmlinux-with-zstd-19-instead-of-22.patch
+75f232b6becee7d36d360ffaf2aaa837d13518f9ec620ca159bcb2a0e98eb18a77631406a9b44244ea0164a7ed59fad583823909681e9b894a012f9d13365b69  0003-kexec-add-kexec_load_disabled-boot-option.patch
+2956050bb332411d00a285e9656618f2e34b631492bbc19bef54d83a6e91b8531f4e18830b9313cfe52fbf8a8ca6fb76cf55b3ddd146ca3b977046cf2fd10cad  0004-objtool-respect-AWK-setting.patch
+4b16f15b47b5e5835b926126e39723f519290469517875cfb2d2b857a93ad1344f0d1ba4b255289e20f4da9c867647526b344f752981cee0a48c51577badac3f  0005-powerpc-config-defang-gcc-check-for-stack-protector-.patch
+db28d1a2fe74f1d5147ccbaf693d464e7e52ca911433debe50c7dccdbb382baf2de193820e7ec11b9eff7a57e5266c4490e240b5c7bd657297829737f449c458  lts.aarch64.config
+00f389f3f53b71b963e1f730d869b97c990499febecaa62b620c9cc9ac759b538c87526de894faa1a51b223ebbb1e5ed31dfa778bc11fd66c77095430666c6c1  lts.armv7.config
+6dd7a9aa588fa5b3d15bf1064d12b44c74b3445d9cfed16950e309225b115a6706cb26798cab7cf29413514979d0600b827b32871767413b244dad73b8455331  lts.x86.config
+0c364a4098dd69cf5e95c6a90f60a0a3cbe21d4ffa1ac91ddd0f8ce7a7efecbe1189554549ff546ece9284a33c4c34969882d93a3a0d71098acaaaa1d9f9860c  lts.x86_64.config
+d2664761764e9c0b1a3cdcc028fbeb2bb8b98fe28ce5bcda832fbdc69316cff41e78402f834b8cb2e16d9f1743568d9cfbe5ec1e4a4437cd0526464e521519d2  lts.ppc64le.config
+a29343f52d69e7f8b91d92421098ade75b3249fa356c4c909b02c92efc49bfc98c52e43c715ca803da91255822865c7274794aa52f934c588dcd333b6c6dce14  lts.s390x.config
+fc45e1f44c4f97ad00349ae412507ac6d040da4c071d3485ef8ac0f30e703424111fc2f6f9146eb901a84322fda2f3bb8bad66d3fd9cf152156e666398fd22e3  lts.loongarch64.config
+a66b4f86921bc34f931b00a81bc56c837ca34abf984720fcbcdaaabeaef767427b2805fc1056eea7ed732685bfbdf8850425e5eab10918a7ff6f5d2a1a2388c9  virt.aarch64.config
+8251d9f585e4468f54e800e0cbecff5ed7dba4f06ecd40309d3eae64804d3b6074a5b1082bf9ab3ae33259afe9e64bcec5b69db487f0c0b53ccec72f2fa441bc  virt.armv7.config
+461623079918cf73d621231c86497273be91bec9fc2d2aa4c520720a7a432c1dd0b7ee29652c90d8f21bd2293a3a8022aa55f2ac767fc3f0cc72d10c06fc3c24  virt.ppc64le.config
+bc3f98ab75e02f6baf47bc8372b0b8ba75aae68b0a5130f7e53076dce255dc16f6c5afe8acec1aa848b51c391255285d3f2cdd491388acdf00dc90a42d64a1f8  virt.x86.config
+5fc65b8033c56b58dc5c9a227a6bcb1069d53fabc79864c65ddb86d4fef25692b107665aaeb4fb07fe05bb7c1085956e18adf9cb2b62487a7f2202aded9162b7  virt.x86_64.config
+26d7bacd5516faa6377b135fb066bd8a00323a8999840b9a74ef03de8b993d2cba59e7f182a318b93b50de1f3453935bbbfd65c7ee1eaf3cb6dba5dcbab35724  patch-6.6.28.xz
+"
diff --git a/main/linux-lts/config-lts.aarch64 b/main/linux-lts/config-lts.aarch64
deleted file mode 100644
index 52a2cce53ee..00000000000
--- a/main/linux-lts/config-lts.aarch64
+++ /dev/null
@@ -1,9070 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.23 Kernel Configuration
-#
-
-#
-# Compiler: gcc (Alpine 9.2.0) 9.2.0
-#
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-CONFIG_THREAD_INFO_IN_TASK=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-# CONFIG_HEADER_TEST is not set
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT=""
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-# CONFIG_CROSS_MEMORY_ATTACH is not set
-# CONFIG_USELIB is not set
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_IRQ_MSI_IOMMU=y
-CONFIG_HANDLE_DOMAIN_IRQ=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
-# end of IRQ subsystem
-
-CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_ARCH_HAS_TICK_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-# end of Timers subsystem
-
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-CONFIG_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_SCHED_AVG_IRQ=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_PSI=y
-CONFIG_PSI_DEFAULT_DISABLED=y
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-CONFIG_IKCONFIG=m
-CONFIG_IKCONFIG_PROC=y
-# CONFIG_IKHEADERS is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-CONFIG_GENERIC_SCHED_CLOCK=y
-
-#
-# Scheduler features
-#
-# CONFIG_UCLAMP_TASK is not set
-# end of Scheduler features
-
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_ARCH_SUPPORTS_INT128=y
-CONFIG_NUMA_BALANCING=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_CGROUPS=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CPUSETS=y
-# CONFIG_PROC_PID_CPUSET is not set
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-# CONFIG_CGROUP_PERF is not set
-CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-# CONFIG_CHECKPOINT_RESTORE is not set
-CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_MULTIUSER=y
-# CONFIG_SGETMASK_SYSCALL is not set
-# CONFIG_SYSFS_SYSCALL is not set
-# CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_FHANDLE is not set
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
-# CONFIG_USERFAULTFD is not set
-CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-# CONFIG_PC104 is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_SLAB_FREELIST_RANDOM=y
-# CONFIG_SLAB_FREELIST_HARDENED is not set
-CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_SYSTEM_DATA_VERIFICATION=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-# end of General setup
-
-CONFIG_ARM64=y
-CONFIG_64BIT=y
-CONFIG_MMU=y
-CONFIG_ARM64_PAGE_SHIFT=12
-CONFIG_ARM64_CONT_SHIFT=4
-CONFIG_ARCH_MMAP_RND_BITS_MIN=18
-CONFIG_ARCH_MMAP_RND_BITS_MAX=33
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CSUM=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_SMP=y
-CONFIG_KERNEL_MODE_NEON=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=4
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-
-#
-# Platform selection
-#
-# CONFIG_ARCH_ACTIONS is not set
-# CONFIG_ARCH_AGILEX is not set
-CONFIG_ARCH_SUNXI=y
-# CONFIG_ARCH_ALPINE is not set
-CONFIG_ARCH_BCM2835=y
-# CONFIG_ARCH_BCM_IPROC is not set
-CONFIG_ARCH_BERLIN=y
-# CONFIG_ARCH_BITMAIN is not set
-# CONFIG_ARCH_BRCMSTB is not set
-CONFIG_ARCH_EXYNOS=y
-# CONFIG_ARCH_K3 is not set
-CONFIG_ARCH_LAYERSCAPE=y
-# CONFIG_ARCH_LG1K is not set
-CONFIG_ARCH_HISI=y
-CONFIG_ARCH_MEDIATEK=y
-# CONFIG_ARCH_MESON is not set
-CONFIG_ARCH_MVEBU=y
-# CONFIG_ARCH_MXC is not set
-CONFIG_ARCH_QCOM=y
-# CONFIG_ARCH_REALTEK is not set
-# CONFIG_ARCH_RENESAS is not set
-CONFIG_ARCH_ROCKCHIP=y
-CONFIG_ARCH_SEATTLE=y
-CONFIG_ARCH_STRATIX10=y
-CONFIG_ARCH_SYNQUACER=y
-CONFIG_ARCH_TEGRA=y
-CONFIG_ARCH_SPRD=y
-CONFIG_ARCH_THUNDER=y
-CONFIG_ARCH_THUNDER2=y
-# CONFIG_ARCH_UNIPHIER is not set
-CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARCH_XGENE=y
-# CONFIG_ARCH_ZX is not set
-CONFIG_ARCH_ZYNQMP=y
-# end of Platform selection
-
-#
-# Kernel Features
-#
-
-#
-# ARM errata workarounds via the alternatives framework
-#
-CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
-CONFIG_ARM64_ERRATUM_826319=y
-CONFIG_ARM64_ERRATUM_827319=y
-CONFIG_ARM64_ERRATUM_824069=y
-CONFIG_ARM64_ERRATUM_819472=y
-CONFIG_ARM64_ERRATUM_832075=y
-CONFIG_ARM64_ERRATUM_834220=y
-CONFIG_ARM64_ERRATUM_845719=y
-CONFIG_ARM64_ERRATUM_843419=y
-CONFIG_ARM64_ERRATUM_1024718=y
-CONFIG_ARM64_ERRATUM_1418040=y
-CONFIG_ARM64_ERRATUM_1165522=y
-CONFIG_ARM64_ERRATUM_1286807=y
-CONFIG_ARM64_ERRATUM_1463225=y
-CONFIG_CAVIUM_ERRATUM_22375=y
-CONFIG_CAVIUM_ERRATUM_23144=y
-CONFIG_CAVIUM_ERRATUM_23154=y
-CONFIG_CAVIUM_ERRATUM_27456=y
-CONFIG_CAVIUM_ERRATUM_30115=y
-CONFIG_CAVIUM_TX2_ERRATUM_219=y
-CONFIG_QCOM_FALKOR_ERRATUM_1003=y
-CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
-CONFIG_QCOM_FALKOR_ERRATUM_1009=y
-CONFIG_QCOM_QDF2400_ERRATUM_0065=y
-CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
-CONFIG_HISILICON_ERRATUM_161600802=y
-CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
-CONFIG_FUJITSU_ERRATUM_010001=y
-# end of ARM errata workarounds via the alternatives framework
-
-CONFIG_ARM64_4K_PAGES=y
-# CONFIG_ARM64_16K_PAGES is not set
-# CONFIG_ARM64_64K_PAGES is not set
-# CONFIG_ARM64_VA_BITS_39 is not set
-CONFIG_ARM64_VA_BITS_48=y
-CONFIG_ARM64_VA_BITS=48
-CONFIG_ARM64_PA_BITS_48=y
-CONFIG_ARM64_PA_BITS=48
-# CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_SMT=y
-CONFIG_NR_CPUS=256
-CONFIG_HOTPLUG_CPU=y
-CONFIG_NUMA=y
-CONFIG_NODES_SHIFT=9
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_HOLES_IN_ZONE=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-CONFIG_HZ_300=y
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=300
-CONFIG_SCHED_HRTICK=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
-CONFIG_HW_PERF_EVENTS=y
-CONFIG_SYS_SUPPORTS_HUGETLBFS=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_SECCOMP=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-# CONFIG_KEXEC is not set
-# CONFIG_KEXEC_FILE is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_XEN_DOM0=y
-CONFIG_XEN=y
-CONFIG_FORCE_MAX_ZONEORDER=11
-CONFIG_UNMAP_KERNEL_AT_EL0=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
-CONFIG_HARDEN_EL2_VECTORS=y
-CONFIG_ARM64_SSBD=y
-CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM64_TAGGED_ADDR_ABI=y
-CONFIG_COMPAT=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_ARMV8_DEPRECATED=y
-CONFIG_SWP_EMULATION=y
-CONFIG_CP15_BARRIER_EMULATION=y
-# CONFIG_SETEND_EMULATION is not set
-
-#
-# ARMv8.1 architectural features
-#
-CONFIG_ARM64_HW_AFDBM=y
-CONFIG_ARM64_PAN=y
-# CONFIG_ARM64_LSE_ATOMICS is not set
-CONFIG_ARM64_VHE=y
-# end of ARMv8.1 architectural features
-
-#
-# ARMv8.2 architectural features
-#
-CONFIG_ARM64_UAO=y
-# CONFIG_ARM64_PMEM is not set
-CONFIG_ARM64_RAS_EXTN=y
-CONFIG_ARM64_CNP=y
-# end of ARMv8.2 architectural features
-
-#
-# ARMv8.3 architectural features
-#
-CONFIG_ARM64_PTR_AUTH=y
-# end of ARMv8.3 architectural features
-
-CONFIG_ARM64_SVE=y
-CONFIG_ARM64_MODULE_PLTS=y
-# CONFIG_ARM64_PSEUDO_NMI is not set
-# CONFIG_RANDOMIZE_BASE is not set
-# end of Kernel Features
-
-#
-# Boot options
-#
-CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
-CONFIG_CMDLINE=""
-# CONFIG_CMDLINE_FORCE is not set
-CONFIG_EFI_STUB=y
-CONFIG_EFI=y
-CONFIG_DMI=y
-# end of Boot options
-
-CONFIG_SYSVIPC_COMPAT=y
-
-#
-# Power management options
-#
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_CLK=y
-CONFIG_PM_GENERIC_DOMAINS=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_GENERIC_DOMAINS_OF=y
-CONFIG_CPU_PM=y
-# CONFIG_ENERGY_MODEL is not set
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# end of Power management options
-
-#
-# CPU Power Management
-#
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
-CONFIG_DT_IDLE_STATES=y
-
-#
-# ARM CPU Idle Drivers
-#
-CONFIG_ARM_CPUIDLE=y
-# CONFIG_ARM_PSCI_CPUIDLE is not set
-# end of ARM CPU Idle Drivers
-# end of CPU Idle
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-
-#
-# CPU frequency scaling drivers
-#
-CONFIG_CPUFREQ_DT=m
-CONFIG_CPUFREQ_DT_PLATDEV=y
-# CONFIG_ACPI_CPPC_CPUFREQ is not set
-# CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM is not set
-CONFIG_ARM_ARMADA_37XX_CPUFREQ=m
-# CONFIG_ARM_ARMADA_8K_CPUFREQ is not set
-# CONFIG_ARM_MEDIATEK_CPUFREQ is not set
-# CONFIG_ARM_QCOM_CPUFREQ_HW is not set
-CONFIG_ARM_SCMI_CPUFREQ=m
-CONFIG_ARM_TEGRA20_CPUFREQ=y
-CONFIG_ARM_TEGRA124_CPUFREQ=y
-CONFIG_ARM_TEGRA186_CPUFREQ=m
-# CONFIG_QORIQ_CPUFREQ is not set
-# end of CPU Frequency scaling
-# end of CPU Power Management
-
-#
-# Firmware Drivers
-#
-CONFIG_ARM_SCMI_PROTOCOL=y
-CONFIG_ARM_SCMI_POWER_DOMAIN=m
-# CONFIG_ARM_SCPI_PROTOCOL is not set
-CONFIG_ARM_SDE_INTERFACE=y
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DMIID=y
-# CONFIG_DMI_SYSFS is not set
-# CONFIG_ISCSI_IBFT is not set
-CONFIG_RASPBERRYPI_FIRMWARE=m
-CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
-# CONFIG_INTEL_STRATIX10_SERVICE is not set
-CONFIG_QCOM_SCM=y
-CONFIG_QCOM_SCM_64=y
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
-# CONFIG_TURRIS_MOX_RWTM is not set
-CONFIG_HAVE_ARM_SMCCC=y
-CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_PSCI_CHECKER is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-CONFIG_EFI_PARAMS_FROM_FDT=y
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_ARMSTUB=y
-CONFIG_EFI_ARMSTUB_DTB_LOADER=y
-# CONFIG_EFI_BOOTLOADER_CONTROL is not set
-# CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_TEST is not set
-# CONFIG_RESET_ATTACK_MITIGATION is not set
-# end of EFI (Extensible Firmware Interface) Support
-
-CONFIG_EFI_EARLYCON=y
-
-#
-# Tegra firmware driver
-#
-CONFIG_TEGRA_IVC=y
-CONFIG_TEGRA_BPMP=y
-# end of Tegra firmware driver
-
-#
-# Zynq MPSoC Firmware Drivers
-#
-CONFIG_ZYNQMP_FIRMWARE=y
-# CONFIG_ZYNQMP_FIRMWARE_DEBUG is not set
-# end of Zynq MPSoC Firmware Drivers
-# end of Firmware Drivers
-
-CONFIG_ARCH_SUPPORTS_ACPI=y
-CONFIG_ACPI=y
-CONFIG_ACPI_GENERIC_GSI=y
-CONFIG_ACPI_CCA_REQUIRED=y
-# CONFIG_ACPI_DEBUGGER is not set
-CONFIG_ACPI_SPCR_TABLE=y
-CONFIG_ACPI_EC_DEBUGFS=y
-CONFIG_ACPI_AC=y
-CONFIG_ACPI_BATTERY=y
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_TAD=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_PROCESSOR_IDLE=y
-CONFIG_ACPI_MCFG=y
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_NUMA=y
-CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
-CONFIG_ACPI_TABLE_UPGRADE=y
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HED=m
-# CONFIG_ACPI_CUSTOM_METHOD is not set
-# CONFIG_ACPI_BGRT is not set
-CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
-# CONFIG_ACPI_HMAT is not set
-CONFIG_HAVE_ACPI_APEI=y
-# CONFIG_ACPI_APEI is not set
-CONFIG_ACPI_WATCHDOG=y
-CONFIG_PMIC_OPREGION=y
-CONFIG_ACPI_CONFIGFS=m
-CONFIG_ACPI_IORT=y
-CONFIG_ACPI_GTDT=y
-CONFIG_ACPI_PPTT=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_MMIO=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_KVM_VFIO=y
-CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
-CONFIG_IRQ_BYPASS_MANAGER=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
-CONFIG_KVM_ARM_HOST=y
-CONFIG_KVM_ARM_PMU=y
-CONFIG_KVM_INDIRECT_VECTORS=y
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_VSOCK=m
-CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_SHA256_ARM64=m
-CONFIG_CRYPTO_SHA512_ARM64=m
-CONFIG_CRYPTO_SHA1_ARM64_CE=m
-CONFIG_CRYPTO_SHA2_ARM64_CE=m
-CONFIG_CRYPTO_SHA512_ARM64_CE=m
-CONFIG_CRYPTO_SHA3_ARM64=m
-CONFIG_CRYPTO_SM3_ARM64_CE=m
-CONFIG_CRYPTO_SM4_ARM64_CE=m
-CONFIG_CRYPTO_GHASH_ARM64_CE=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64=m
-CONFIG_CRYPTO_AES_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
-CONFIG_CRYPTO_CHACHA20_NEON=m
-CONFIG_CRYPTO_NHPOLY1305_NEON=m
-CONFIG_CRYPTO_AES_ARM64_BS=m
-
-#
-# General architecture-dependent options
-#
-CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_UPROBES=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_KRETPROBES=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_HAS_KEEPINITRD=y
-CONFIG_ARCH_HAS_SET_MEMORY=y
-CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
-CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
-CONFIG_HAVE_ASM_MODVERSIONS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
-CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_ARCH_STACKLEAK=y
-CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_HUGE_VMAP=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_ARCH_MMAP_RND_BITS=24
-CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
-CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_COMPAT_OLD_SIGACTION=y
-CONFIG_64BIT_TIME=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_HAVE_ARCH_VMAP_STACK=y
-CONFIG_VMAP_STACK=y
-CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_REFCOUNT_FULL=y
-CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
-# CONFIG_LOCK_EVENT_COUNTS is not set
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# end of GCOV-based kernel profiling
-
-CONFIG_PLUGIN_HOSTCC=""
-CONFIG_HAVE_GCC_PLUGINS=y
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
-CONFIG_ASM_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-# CONFIG_BLK_DEV_ZONED is not set
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
-# CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_WBT is not set
-CONFIG_BLK_CGROUP_IOLATENCY=y
-# CONFIG_BLK_CGROUP_IOCOST is not set
-CONFIG_BLK_DEBUG_FS=y
-# CONFIG_BLK_SED_OPAL is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AIX_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_CMDLINE_PARTITION is not set
-# end of Partition Types
-
-CONFIG_BLOCK_COMPAT=y
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_MQ_RDMA=y
-CONFIG_BLK_PM=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-# CONFIG_IOSCHED_BFQ is not set
-# end of IO Schedulers
-
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=y
-CONFIG_ARCH_INLINE_SPIN_TRYLOCK=y
-CONFIG_ARCH_INLINE_SPIN_TRYLOCK_BH=y
-CONFIG_ARCH_INLINE_SPIN_LOCK=y
-CONFIG_ARCH_INLINE_SPIN_LOCK_BH=y
-CONFIG_ARCH_INLINE_SPIN_LOCK_IRQ=y
-CONFIG_ARCH_INLINE_SPIN_LOCK_IRQSAVE=y
-CONFIG_ARCH_INLINE_SPIN_UNLOCK=y
-CONFIG_ARCH_INLINE_SPIN_UNLOCK_BH=y
-CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE=y
-CONFIG_ARCH_INLINE_READ_LOCK=y
-CONFIG_ARCH_INLINE_READ_LOCK_BH=y
-CONFIG_ARCH_INLINE_READ_LOCK_IRQ=y
-CONFIG_ARCH_INLINE_READ_LOCK_IRQSAVE=y
-CONFIG_ARCH_INLINE_READ_UNLOCK=y
-CONFIG_ARCH_INLINE_READ_UNLOCK_BH=y
-CONFIG_ARCH_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_ARCH_INLINE_READ_UNLOCK_IRQRESTORE=y
-CONFIG_ARCH_INLINE_WRITE_LOCK=y
-CONFIG_ARCH_INLINE_WRITE_LOCK_BH=y
-CONFIG_ARCH_INLINE_WRITE_LOCK_IRQ=y
-CONFIG_ARCH_INLINE_WRITE_LOCK_IRQSAVE=y
-CONFIG_ARCH_INLINE_WRITE_UNLOCK=y
-CONFIG_ARCH_INLINE_WRITE_UNLOCK_BH=y
-CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE=y
-CONFIG_INLINE_SPIN_TRYLOCK=y
-CONFIG_INLINE_SPIN_TRYLOCK_BH=y
-CONFIG_INLINE_SPIN_LOCK=y
-CONFIG_INLINE_SPIN_LOCK_BH=y
-CONFIG_INLINE_SPIN_LOCK_IRQ=y
-CONFIG_INLINE_SPIN_LOCK_IRQSAVE=y
-CONFIG_INLINE_SPIN_UNLOCK_BH=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE=y
-CONFIG_INLINE_READ_LOCK=y
-CONFIG_INLINE_READ_LOCK_BH=y
-CONFIG_INLINE_READ_LOCK_IRQ=y
-CONFIG_INLINE_READ_LOCK_IRQSAVE=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_BH=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK_IRQRESTORE=y
-CONFIG_INLINE_WRITE_LOCK=y
-CONFIG_INLINE_WRITE_LOCK_BH=y
-CONFIG_INLINE_WRITE_LOCK_IRQ=y
-CONFIG_INLINE_WRITE_LOCK_IRQSAVE=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_BH=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-CONFIG_QUEUED_SPINLOCKS=y
-CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
-CONFIG_FREEZER=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_ELFCORE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_FAST_GUP=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_MEMORY_ISOLATION=y
-# CONFIG_MEMORY_HOTPLUG is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_CONTIG_ALLOC=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-# CONFIG_MEMORY_FAILURE is not set
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
-# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_AREAS=7
-CONFIG_ZPOOL=m
-# CONFIG_ZBUD is not set
-CONFIG_Z3FOLD=m
-CONFIG_ZSMALLOC=y
-# CONFIG_PGTABLE_MAPPING is not set
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_ARCH_HAS_PTE_DEVMAP=y
-CONFIG_FRAME_VECTOR=y
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
-# CONFIG_READ_ONLY_THP_FOR_FS is not set
-CONFIG_ARCH_HAS_PTE_SPECIAL=y
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_EGRESS=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=m
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-CONFIG_UNIX_DIAG=m
-# CONFIG_TLS is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-CONFIG_XFRM_INTERFACE=m
-CONFIG_XFRM_SUB_POLICY=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_SMC is not set
-CONFIG_XDP_SOCKETS=y
-# CONFIG_XDP_SOCKETS_DIAG is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=y
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE_COMMON=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-# CONFIG_IP_PIMSM_V1 is not set
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-CONFIG_NET_FOU_IP_TUNNELS=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-# CONFIG_INET_ESP_OFFLOAD is not set
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-# CONFIG_INET_RAW_DIAG is not set
-CONFIG_INET_DIAG_DESTROY=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_NV=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_TCP_CONG_DCTCP=m
-CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-# CONFIG_INET6_ESP_OFFLOAD is not set
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_FOU=m
-CONFIG_IPV6_FOU_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_NETLABEL is not set
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NET_PTP_CLASSIFY=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_FAMILY_BRIDGE=y
-CONFIG_NETFILTER_FAMILY_ARP=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK_OSF=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-# CONFIG_NF_LOG_NETDEV is not set
-CONFIG_NETFILTER_CONNCOUNT=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_PROCFS=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=y
-CONFIG_NF_NAT_MASQUERADE=y
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_SET=m
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_NUMGEN=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_FLOW_OFFLOAD=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CONNLIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_TUNNEL=m
-# CONFIG_NFT_OBJREF is not set
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_FIB=m
-CONFIG_NFT_FIB_INET=m
-# CONFIG_NFT_XFRM is not set
-CONFIG_NFT_SOCKET=m
-CONFIG_NFT_OSF=m
-CONFIG_NFT_TPROXY=m
-# CONFIG_NFT_SYNPROXY is not set
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_FIB_NETDEV=m
-CONFIG_NF_FLOW_TABLE_INET=m
-CONFIG_NF_FLOW_TABLE=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-# end of Core Netfilter Configuration
-
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_MH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS MH scheduler
-#
-CONFIG_IP_VS_MH_TAB_INDEX=12
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_SOCKET_IPV4=m
-CONFIG_NF_TPROXY_IPV4=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_FLOW_TABLE_IPV4=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-# CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# end of IP: Netfilter Configuration
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_SOCKET_IPV6=m
-CONFIG_NF_TPROXY_IPV6=m
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_FIB_IPV6=m
-CONFIG_NF_FLOW_TABLE_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_SRH=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-# CONFIG_IP6_NF_SECURITY is not set
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-# end of IPv6: Netfilter Configuration
-
-CONFIG_NF_DEFRAG_IPV6=m
-
-#
-# DECnet: Netfilter Configuration
-#
-CONFIG_DECNET_NF_GRABULATOR=m
-# end of DECnet: Netfilter Configuration
-
-CONFIG_NF_TABLES_BRIDGE=m
-# CONFIG_NFT_BRIDGE_META is not set
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-# CONFIG_BPFILTER is not set
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-# end of DCCP CCIDs Configuration
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-# end of DCCP Kernel Hacking
-
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-CONFIG_INET_SCTP_DIAG=m
-CONFIG_RDS=m
-# CONFIG_RDS_RDMA is not set
-# CONFIG_RDS_TCP is not set
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-# CONFIG_TIPC_MEDIA_IB is not set
-CONFIG_TIPC_MEDIA_UDP=y
-CONFIG_TIPC_DIAG=m
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-# CONFIG_L2TP_DEBUGFS is not set
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_MRP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_HAVE_NET_DSA=y
-CONFIG_NET_DSA=m
-# CONFIG_NET_DSA_TAG_8021Q is not set
-CONFIG_NET_DSA_TAG_BRCM_COMMON=m
-CONFIG_NET_DSA_TAG_BRCM=m
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
-# CONFIG_NET_DSA_TAG_GSWIP is not set
-CONFIG_NET_DSA_TAG_DSA=m
-CONFIG_NET_DSA_TAG_EDSA=m
-# CONFIG_NET_DSA_TAG_MTK is not set
-# CONFIG_NET_DSA_TAG_KSZ is not set
-CONFIG_NET_DSA_TAG_QCA=m
-# CONFIG_NET_DSA_TAG_LAN9303 is not set
-# CONFIG_NET_DSA_TAG_SJA1105 is not set
-# CONFIG_NET_DSA_TAG_TRAILER is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q_MVRP=y
-CONFIG_DECNET=m
-CONFIG_DECNET_ROUTER=y
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_X25=m
-CONFIG_LAPB=m
-CONFIG_PHONET=m
-CONFIG_6LOWPAN=m
-CONFIG_6LOWPAN_DEBUGFS=y
-CONFIG_6LOWPAN_NHC=m
-CONFIG_6LOWPAN_NHC_DEST=m
-CONFIG_6LOWPAN_NHC_FRAGMENT=m
-CONFIG_6LOWPAN_NHC_HOP=m
-CONFIG_6LOWPAN_NHC_IPV6=m
-CONFIG_6LOWPAN_NHC_MOBILITY=m
-CONFIG_6LOWPAN_NHC_ROUTING=m
-CONFIG_6LOWPAN_NHC_UDP=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
-CONFIG_6LOWPAN_GHC_UDP=m
-CONFIG_6LOWPAN_GHC_ICMPV6=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
-CONFIG_IEEE802154=m
-# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
-CONFIG_IEEE802154_SOCKET=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_CBS=m
-CONFIG_NET_SCH_ETF=m
-# CONFIG_NET_SCH_TAPRIO is not set
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_SKBPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_CAKE=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-# CONFIG_NET_SCH_DEFAULT is not set
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-# CONFIG_NET_CLS_CGROUP is not set
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_MATCHALL=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_IPT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-# CONFIG_NET_ACT_SAMPLE is not set
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-# CONFIG_NET_ACT_MPLS is not set
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_ACT_CTINFO is not set
-CONFIG_NET_ACT_SKBMOD=m
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_TUNNEL_KEY=m
-# CONFIG_NET_ACT_CT is not set
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IFE_SKBTCINDEX=m
-# CONFIG_NET_TC_SKB_EXT is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-# CONFIG_BATMAN_ADV is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
-CONFIG_VSOCKETS_DIAG=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
-CONFIG_NETLINK_DIAG=y
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_NET_NSH=m
-# CONFIG_HSR is not set
-CONFIG_NET_SWITCHDEV=y
-CONFIG_NET_L3_MASTER_DEV=y
-# CONFIG_QRTR is not set
-CONFIG_NET_NCSI=y
-# CONFIG_NCSI_OEM_CMD_GET_MAC is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-# CONFIG_BPF_STREAM_PARSER is not set
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-# CONFIG_NET_DROP_MONITOR is not set
-# end of Network testing
-# end of Networking options
-
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-# CONFIG_BT_6LOWPAN is not set
-CONFIG_BT_LEDS=y
-# CONFIG_BT_SELFTEST is not set
-# CONFIG_BT_DEBUGFS is not set
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_QCA=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
-CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
-# CONFIG_BT_MTKSDIO is not set
-CONFIG_BT_QCOMSMD=m
-CONFIG_BT_HCIRSI=m
-# end of Bluetooth device drivers
-
-CONFIG_AF_RXRPC=m
-CONFIG_AF_RXRPC_IPV6=y
-# CONFIG_AF_RXRPC_INJECT_LOSS is not set
-# CONFIG_AF_RXRPC_DEBUG is not set
-# CONFIG_RXKAD is not set
-# CONFIG_AF_KCM is not set
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
-CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
-CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_CFG80211_CRDA_SUPPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-# CONFIG_MAC80211_MESH is not set
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-# CONFIG_RFKILL_INPUT is not set
-CONFIG_RFKILL_GPIO=m
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_XEN is not set
-CONFIG_NET_9P_RDMA=m
-# CONFIG_NET_9P_DEBUG is not set
-# CONFIG_CAIF is not set
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
-CONFIG_NFC=m
-CONFIG_NFC_DIGITAL=m
-CONFIG_NFC_NCI=m
-CONFIG_NFC_NCI_SPI=m
-CONFIG_NFC_NCI_UART=m
-CONFIG_NFC_HCI=m
-CONFIG_NFC_SHDLC=y
-
-#
-# Near Field Communication (NFC) devices
-#
-CONFIG_NFC_TRF7970A=m
-CONFIG_NFC_SIM=m
-CONFIG_NFC_PORT100=m
-CONFIG_NFC_FDP=m
-CONFIG_NFC_FDP_I2C=m
-CONFIG_NFC_PN544=m
-CONFIG_NFC_PN544_I2C=m
-CONFIG_NFC_PN533=m
-CONFIG_NFC_PN533_USB=m
-CONFIG_NFC_PN533_I2C=m
-CONFIG_NFC_MICROREAD=m
-CONFIG_NFC_MICROREAD_I2C=m
-CONFIG_NFC_MRVL=m
-CONFIG_NFC_MRVL_USB=m
-CONFIG_NFC_MRVL_UART=m
-CONFIG_NFC_MRVL_I2C=m
-CONFIG_NFC_MRVL_SPI=m
-CONFIG_NFC_ST21NFCA=m
-CONFIG_NFC_ST21NFCA_I2C=m
-CONFIG_NFC_ST_NCI=m
-CONFIG_NFC_ST_NCI_I2C=m
-CONFIG_NFC_ST_NCI_SPI=m
-# CONFIG_NFC_NXP_NCI is not set
-CONFIG_NFC_S3FWRN5=m
-CONFIG_NFC_S3FWRN5_I2C=m
-# CONFIG_NFC_ST95HF is not set
-# end of Near Field Communication (NFC) devices
-
-# CONFIG_PSAMPLE is not set
-CONFIG_NET_IFE=m
-CONFIG_LWTUNNEL=y
-CONFIG_LWTUNNEL_BPF=y
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-CONFIG_NET_DEVLINK=y
-CONFIG_PAGE_POOL=y
-CONFIG_FAILOVER=m
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-CONFIG_ARM_AMBA=y
-CONFIG_TEGRA_AHB=y
-CONFIG_HAVE_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_DOMAINS_GENERIC=y
-CONFIG_PCI_SYSCALL=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-# CONFIG_PCIEAER is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-CONFIG_PCIE_PTM=y
-# CONFIG_PCIE_BW is not set
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-CONFIG_PCI_STUB=m
-CONFIG_PCI_PF_STUB=m
-CONFIG_PCI_ATS=y
-CONFIG_PCI_ECAM=y
-CONFIG_PCI_BRIDGE_EMUL=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_LABEL=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-# CONFIG_HOTPLUG_PCI_SHPC is not set
-
-#
-# PCI controller drivers
-#
-CONFIG_PCI_AARDVARK=y
-
-#
-# Cadence PCIe controllers support
-#
-CONFIG_PCIE_CADENCE=y
-CONFIG_PCIE_CADENCE_HOST=y
-# end of Cadence PCIe controllers support
-
-# CONFIG_PCIE_XILINX_NWL is not set
-# CONFIG_PCI_FTPCI100 is not set
-# CONFIG_PCI_TEGRA is not set
-CONFIG_PCI_HOST_COMMON=y
-CONFIG_PCI_HOST_GENERIC=y
-CONFIG_PCIE_XILINX=y
-CONFIG_PCI_XGENE=y
-CONFIG_PCI_XGENE_MSI=y
-# CONFIG_PCIE_ALTERA is not set
-CONFIG_PCI_HOST_THUNDER_PEM=y
-CONFIG_PCI_HOST_THUNDER_ECAM=y
-# CONFIG_PCIE_ROCKCHIP_HOST is not set
-# CONFIG_PCIE_MEDIATEK is not set
-# CONFIG_PCIE_MOBIVEIL is not set
-
-#
-# DesignWare PCI Core Support
-#
-CONFIG_PCIE_DW=y
-CONFIG_PCIE_DW_HOST=y
-CONFIG_PCIE_DW_PLAT=y
-CONFIG_PCIE_DW_PLAT_HOST=y
-CONFIG_PCI_LAYERSCAPE=y
-# CONFIG_PCI_HISI is not set
-CONFIG_PCIE_QCOM=y
-CONFIG_PCIE_ARMADA_8K=y
-# CONFIG_PCIE_KIRIN is not set
-CONFIG_PCIE_HISI_STB=y
-# CONFIG_PCI_MESON is not set
-# CONFIG_PCIE_TEGRA194 is not set
-# CONFIG_PCIE_AL is not set
-# end of DesignWare PCI Core Support
-# end of PCI controller drivers
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-# end of PCI Endpoint
-
-#
-# PCI switch controller drivers
-#
-CONFIG_PCI_SW_SWITCHTEC=m
-# end of PCI switch controller drivers
-
-# CONFIG_PCCARD is not set
-# CONFIG_RAPIDIO is not set
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=y
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
-# end of Firmware loader
-
-CONFIG_WANT_DEV_COREDUMP=y
-# CONFIG_ALLOW_DEV_COREDUMP is not set
-# CONFIG_DEBUG_DRIVER is not set
-CONFIG_DEBUG_DEVRES=y
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_SYS_HYPERVISOR=y
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_SOC_BUS=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_SPI=m
-CONFIG_REGMAP_MMIO=y
-CONFIG_REGMAP_IRQ=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
-CONFIG_GENERIC_ARCH_TOPOLOGY=y
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-CONFIG_ARM_CCI=y
-# CONFIG_BRCMSTB_GISB_ARB is not set
-# CONFIG_MOXTET is not set
-CONFIG_HISILICON_LPC=y
-# CONFIG_QCOM_EBI2 is not set
-# CONFIG_SIMPLE_PM_BUS is not set
-CONFIG_SUN50I_DE2_BUS=y
-CONFIG_SUNXI_RSB=m
-CONFIG_TEGRA_ACONNECT=m
-# CONFIG_TEGRA_GMI is not set
-CONFIG_VEXPRESS_CONFIG=y
-# CONFIG_FSL_MC_BUS is not set
-# end of Bus devices
-
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-# CONFIG_GNSS is not set
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-
-#
-# Partition parsers
-#
-CONFIG_MTD_AR7_PARTS=m
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_OF_PARTS=m
-# CONFIG_MTD_AFS_PARTS is not set
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# end of Partition parsers
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-CONFIG_SM_FTL=m
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_SWAP=m
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-# end of RAM/ROM/Flash chip drivers
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP_OF is not set
-# CONFIG_MTD_PHYSMAP_GPIO_ADDR is not set
-CONFIG_MTD_PCI=m
-CONFIG_MTD_INTEL_VR_NOR=m
-CONFIG_MTD_PLATRAM=m
-# end of Mapping drivers for chip access
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-CONFIG_MTD_PMC551_BUGFIX=y
-# CONFIG_MTD_PMC551_DEBUG is not set
-CONFIG_MTD_DATAFLASH=m
-# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
-# CONFIG_MTD_DATAFLASH_OTP is not set
-# CONFIG_MTD_MCHP23K256 is not set
-# CONFIG_MTD_SST25L is not set
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOCG3 is not set
-# end of Self-contained MTD device drivers
-
-CONFIG_MTD_NAND_CORE=m
-CONFIG_MTD_ONENAND=m
-# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND_GENERIC is not set
-CONFIG_MTD_ONENAND_OTP=y
-CONFIG_MTD_ONENAND_2X_PROGRAM=y
-CONFIG_MTD_NAND_ECC_SW_HAMMING=m
-# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_RAW_NAND is not set
-CONFIG_MTD_SPI_NAND=m
-
-#
-# LPDDR & LPDDR2 PCM memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-# end of LPDDR & LPDDR2 PCM memory drivers
-
-# CONFIG_MTD_SPI_NOR is not set
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_BLOCK is not set
-# CONFIG_MTD_HYPERBUS is not set
-CONFIG_DTC=y
-CONFIG_OF=y
-# CONFIG_OF_UNITTEST is not set
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_DYNAMIC=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
-CONFIG_OF_MDIO=y
-CONFIG_OF_RESERVED_MEM=y
-CONFIG_OF_RESOLVE=y
-CONFIG_OF_OVERLAY=y
-CONFIG_OF_NUMA=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_AX88796=m
-# CONFIG_PARPORT_1284 is not set
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_NULL_BLK is not set
-CONFIG_CDROM=m
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_WRITEBACK is not set
-# CONFIG_ZRAM_MEMORY_TRACKING is not set
-CONFIG_BLK_DEV_UMEM=m
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_SKD=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_BLKDEV_BACKEND=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_VIRTIO_BLK_SCSI is not set
-# CONFIG_BLK_DEV_RBD is not set
-CONFIG_BLK_DEV_RSXX=m
-
-#
-# NVME Support
-#
-CONFIG_NVME_CORE=m
-CONFIG_BLK_DEV_NVME=m
-CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_FABRICS=m
-CONFIG_NVME_RDMA=m
-# CONFIG_NVME_FC is not set
-# CONFIG_NVME_TCP is not set
-CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_LOOP=m
-CONFIG_NVME_TARGET_RDMA=m
-# CONFIG_NVME_TARGET_FC is not set
-# CONFIG_NVME_TARGET_TCP is not set
-# end of NVME Support
-
-#
-# Misc devices
-#
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT_SPI=m
-# CONFIG_DUMMY_IRQ is not set
-CONFIG_PHANTOM=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_HP_ILO=m
-# CONFIG_QCOM_FASTRPC is not set
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-# CONFIG_LATTICE_ECP3_CONFIG is not set
-CONFIG_SRAM=y
-CONFIG_VEXPRESS_SYSCFG=y
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_XILINX_SDFEC is not set
-CONFIG_MISC_RTSX=m
-CONFIG_PVPANIC=m
-CONFIG_C2PORT=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_AT25=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_EEPROM_93XX46=m
-# CONFIG_EEPROM_IDT_89HPESX is not set
-# CONFIG_EEPROM_EE1004 is not set
-# end of EEPROM support
-
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-# end of Texas Instruments shared transport line discipline
-
-CONFIG_SENSORS_LIS3_I2C=m
-
-#
-# Altera FPGA firmware download module (requires I2C)
-#
-CONFIG_ALTERA_STAPL=m
-
-#
-# Intel MIC & related support
-#
-
-#
-# Intel MIC Bus Driver
-#
-
-#
-# SCIF Bus Driver
-#
-
-#
-# VOP Bus Driver
-#
-# CONFIG_VOP_BUS is not set
-
-#
-# Intel MIC Host Driver
-#
-
-#
-# Intel MIC Card Driver
-#
-
-#
-# SCIF Driver
-#
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-
-#
-# VOP Driver
-#
-# end of Intel MIC & related support
-
-# CONFIG_GENWQE is not set
-# CONFIG_ECHO is not set
-# CONFIG_MISC_ALCOR_PCI is not set
-CONFIG_MISC_RTSX_PCI=m
-CONFIG_MISC_RTSX_USB=m
-# CONFIG_HABANA_AI is not set
-# end of Misc devices
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_SCAN_ASYNC=y
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-# end of SCSI Transports
-
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
-CONFIG_AIC7XXX_DEBUG_ENABLE=y
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
-CONFIG_AIC79XX_DEBUG_ENABLE=y
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_HISI_SAS=m
-CONFIG_SCSI_HISI_SAS_PCI=m
-CONFIG_SCSI_MVSAS=m
-CONFIG_SCSI_MVSAS_DEBUG=y
-CONFIG_SCSI_MVSAS_TASKLET=y
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ESAS2R=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_SMARTPQI=m
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
-# CONFIG_SCSI_UFS_BSG is not set
-CONFIG_SCSI_HPTIOP=m
-# CONFIG_SCSI_MYRB is not set
-# CONFIG_SCSI_MYRS is not set
-CONFIG_XEN_SCSI_FRONTEND=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-# CONFIG_SCSI_SNIC is not set
-CONFIG_SCSI_DMX3191D=m
-# CONFIG_SCSI_FDOMAIN_PCI is not set
-# CONFIG_SCSI_GDTH is not set
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
-# CONFIG_TCM_QLA2XXX_DEBUG is not set
-CONFIG_SCSI_QLA_ISCSI=m
-# CONFIG_QEDI is not set
-# CONFIG_QEDF is not set
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_WD719X=m
-CONFIG_SCSI_DEBUG=m
-# CONFIG_SCSI_PMCRAID is not set
-CONFIG_SCSI_PM8001=m
-# CONFIG_SCSI_BFA_FC is not set
-CONFIG_SCSI_VIRTIO=m
-# CONFIG_SCSI_CHELSIO_FCOE is not set
-# CONFIG_SCSI_DH is not set
-# end of SCSI device support
-
-CONFIG_HAVE_PATA_PLATFORM=y
-CONFIG_ATA=m
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-# CONFIG_SATA_ZPODD is not set
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=3
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_AHCI_CEVA=m
-# CONFIG_AHCI_MTK is not set
-CONFIG_AHCI_MVEBU=m
-CONFIG_AHCI_SUNXI=m
-CONFIG_AHCI_TEGRA=m
-CONFIG_AHCI_XGENE=m
-CONFIG_AHCI_QORIQ=m
-CONFIG_SATA_AHCI_SEATTLE=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_SIL24=m
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SX4=m
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=m
-# CONFIG_SATA_DWC is not set
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3=m
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PLATFORM=m
-# CONFIG_PATA_OF_PLATFORM is not set
-CONFIG_PATA_RZ1000=m
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_PATA_ACPI=m
-CONFIG_ATA_GENERIC=m
-CONFIG_PATA_LEGACY=m
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-# CONFIG_MD_AUTODETECT is not set
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-# CONFIG_MD_CLUSTER is not set
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_UNSTRIPED=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_WRITECACHE=m
-# CONFIG_DM_ERA is not set
-# CONFIG_DM_CLONE is not set
-CONFIG_DM_MIRROR=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-# CONFIG_DM_DUST is not set
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
-CONFIG_DM_VERITY_FEC=y
-CONFIG_DM_SWITCH=m
-CONFIG_DM_LOG_WRITES=m
-CONFIG_DM_INTEGRITY=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_TCM_USER2=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_ISCSI_TARGET_CXGB4=m
-CONFIG_SBP_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-# end of IEEE 1394 (FireWire) support
-
-CONFIG_NETDEVICES=y
-CONFIG_MII=m
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-# CONFIG_NET_FC is not set
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=m
-# CONFIG_IPVTAP is not set
-CONFIG_VXLAN=m
-CONFIG_GENEVE=m
-# CONFIG_GTP is not set
-CONFIG_MACSEC=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NTB_NETDEV=m
-CONFIG_TUN=m
-CONFIG_TAP=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_NET_VRF=m
-# CONFIG_VSOCKMON is not set
-CONFIG_SUNGEM_PHY=m
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-CONFIG_ARCNET_COM90xx=m
-CONFIG_ARCNET_COM90xxIO=m
-CONFIG_ARCNET_RIM_I=m
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_ATM_DRIVERS=y
-CONFIG_ATM_DUMMY=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-CONFIG_ATM_FORE200E_USE_TASKLET=y
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-CONFIG_ATM_HE_USE_SUNI=y
-CONFIG_ATM_SOLOS=m
-
-#
-# CAIF transport drivers
-#
-
-#
-# Distributed Switch Architecture drivers
-#
-CONFIG_B53=m
-CONFIG_B53_SPI_DRIVER=m
-CONFIG_B53_MDIO_DRIVER=m
-CONFIG_B53_MMAP_DRIVER=m
-CONFIG_B53_SRAB_DRIVER=m
-# CONFIG_B53_SERDES is not set
-CONFIG_NET_DSA_BCM_SF2=m
-# CONFIG_NET_DSA_LOOP is not set
-# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_MT7530 is not set
-# CONFIG_NET_DSA_MV88E6060 is not set
-# CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set
-# CONFIG_NET_DSA_MICROCHIP_KSZ8795 is not set
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
-CONFIG_NET_DSA_MV88E6XXX_PTP=y
-# CONFIG_NET_DSA_SJA1105 is not set
-CONFIG_NET_DSA_QCA8K=m
-# CONFIG_NET_DSA_REALTEK_SMI is not set
-# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
-# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
-# end of Distributed Switch Architecture drivers
-
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_AGERE=y
-# CONFIG_ET131X is not set
-CONFIG_NET_VENDOR_ALACRITECH=y
-# CONFIG_SLICOSS is not set
-CONFIG_NET_VENDOR_ALLWINNER=y
-# CONFIG_SUN4I_EMAC is not set
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_ALTERA_TSE=m
-CONFIG_NET_VENDOR_AMAZON=y
-# CONFIG_ENA_ETHERNET is not set
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_AMD8111_ETH=m
-CONFIG_PCNET32=m
-CONFIG_AMD_XGBE=m
-CONFIG_NET_XGENE=m
-CONFIG_NET_XGENE_V2=m
-CONFIG_NET_VENDOR_AQUANTIA=y
-# CONFIG_AQTION is not set
-CONFIG_NET_VENDOR_ARC=y
-# CONFIG_EMAC_ROCKCHIP is not set
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_ALX=m
-# CONFIG_NET_VENDOR_AURORA is not set
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_BCMGENET=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_TIGON3=m
-CONFIG_TIGON3_HWMON=y
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-CONFIG_SYSTEMPORT=m
-CONFIG_BNXT=m
-CONFIG_BNXT_SRIOV=y
-CONFIG_BNXT_FLOWER_OFFLOAD=y
-CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
-CONFIG_NET_VENDOR_CADENCE=y
-CONFIG_MACB=m
-CONFIG_MACB_USE_HWSTAMP=y
-# CONFIG_MACB_PCI is not set
-CONFIG_NET_VENDOR_CAVIUM=y
-CONFIG_THUNDER_NIC_PF=m
-CONFIG_THUNDER_NIC_VF=m
-CONFIG_THUNDER_NIC_BGX=m
-CONFIG_THUNDER_NIC_RGX=m
-CONFIG_CAVIUM_PTP=m
-CONFIG_LIQUIDIO=m
-# CONFIG_LIQUIDIO_VF is not set
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_CHELSIO_LIB=m
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-# CONFIG_NET_VENDOR_CORTINA is not set
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET_BE2=y
-CONFIG_BE2NET_BE3=y
-CONFIG_BE2NET_LANCER=y
-CONFIG_BE2NET_SKYHAWK=y
-CONFIG_NET_VENDOR_EZCHIP=y
-# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
-CONFIG_NET_VENDOR_FREESCALE=y
-# CONFIG_FSL_FMAN is not set
-CONFIG_FSL_PQ_MDIO=m
-CONFIG_FSL_XGMAC_MDIO=m
-CONFIG_GIANFAR=m
-# CONFIG_FSL_ENETC is not set
-# CONFIG_FSL_ENETC_VF is not set
-# CONFIG_FSL_ENETC_MDIO is not set
-CONFIG_NET_VENDOR_GOOGLE=y
-# CONFIG_GVE is not set
-CONFIG_NET_VENDOR_HISILICON=y
-CONFIG_HIX5HD2_GMAC=m
-CONFIG_HISI_FEMAC=m
-CONFIG_HIP04_ETH=m
-# CONFIG_HI13X1_GMAC is not set
-CONFIG_HNS_MDIO=m
-CONFIG_HNS=m
-CONFIG_HNS_DSAF=m
-CONFIG_HNS_ENET=m
-# CONFIG_HNS3 is not set
-CONFIG_NET_VENDOR_HP=y
-CONFIG_HP100=m
-CONFIG_NET_VENDOR_HUAWEI=y
-CONFIG_HINIC=m
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IGB=m
-CONFIG_IGB_HWMON=y
-CONFIG_IGBVF=m
-CONFIG_IXGB=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBEVF=m
-CONFIG_I40E=m
-# CONFIG_I40EVF is not set
-CONFIG_ICE=m
-# CONFIG_FM10K is not set
-# CONFIG_IGC is not set
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_MVMDIO=m
-# CONFIG_MVNETA is not set
-# CONFIG_MVPP2 is not set
-CONFIG_PXA168_ETH=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-# CONFIG_OCTEONTX2_AF is not set
-# CONFIG_NET_VENDOR_MEDIATEK is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX4_CORE_GEN2=y
-CONFIG_MLX5_CORE=m
-# CONFIG_MLX5_FPGA is not set
-CONFIG_MLX5_CORE_EN=y
-CONFIG_MLX5_EN_ARFS=y
-CONFIG_MLX5_EN_RXNFC=y
-CONFIG_MLX5_MPFS=y
-CONFIG_MLX5_ESWITCH=y
-# CONFIG_MLX5_CORE_IPOIB is not set
-CONFIG_MLX5_SW_STEERING=y
-# CONFIG_MLXSW_CORE is not set
-# CONFIG_MLXFW is not set
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MICROCHIP=y
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-CONFIG_ENCX24J600=m
-# CONFIG_LAN743X is not set
-# CONFIG_NET_VENDOR_MICROSEMI is not set
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_NETERION=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_NETRONOME=y
-CONFIG_NFP=m
-# CONFIG_NFP_APP_FLOWER is not set
-# CONFIG_NFP_APP_ABM_NIC is not set
-# CONFIG_NFP_DEBUG is not set
-# CONFIG_NET_VENDOR_NI is not set
-CONFIG_NET_VENDOR_8390=y
-CONFIG_NE2K_PCI=m
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=m
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_ETHOC=m
-CONFIG_NET_VENDOR_PACKET_ENGINES=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_PENSANDO=y
-# CONFIG_IONIC is not set
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLCNIC_HWMON=y
-CONFIG_NETXEN_NIC=m
-CONFIG_QED=m
-CONFIG_QED_SRIOV=y
-CONFIG_QEDE=m
-# CONFIG_NET_VENDOR_QUALCOMM is not set
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-# CONFIG_8139TOO_8129 is not set
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
-CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_ROCKER=y
-CONFIG_ROCKER=m
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SOLARFLARE=y
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_SFC_MCDI_LOGGING=y
-# CONFIG_SFC_FALCON is not set
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_NET_VENDOR_SMSC=y
-# CONFIG_SMC91X is not set
-CONFIG_EPIC100=m
-CONFIG_SMSC911X=m
-CONFIG_SMSC9420=m
-CONFIG_NET_VENDOR_SOCIONEXT=y
-CONFIG_SNI_NETSEC=m
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_SELFTESTS is not set
-# CONFIG_STMMAC_PLATFORM is not set
-# CONFIG_STMMAC_PCI is not set
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_SYNOPSYS=y
-# CONFIG_DWC_XLGMAC is not set
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-# CONFIG_TI_CPSW_PHY_SEL is not set
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_WIZNET_W5100_SPI=m
-CONFIG_FDDI=y
-CONFIG_DEFXX=m
-# CONFIG_DEFXX_MMIO is not set
-CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
-CONFIG_NET_SB1000=m
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_BUS=y
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_MDIO_BITBANG=m
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
-CONFIG_MDIO_CAVIUM=m
-CONFIG_MDIO_GPIO=m
-CONFIG_MDIO_HISI_FEMAC=m
-CONFIG_MDIO_I2C=m
-# CONFIG_MDIO_MSCC_MIIM is not set
-CONFIG_MDIO_OCTEON=m
-# CONFIG_MDIO_SUN4I is not set
-CONFIG_MDIO_THUNDER=m
-CONFIG_MDIO_XGENE=y
-CONFIG_PHYLINK=m
-CONFIG_PHYLIB=y
-CONFIG_SWPHY=y
-# CONFIG_LED_TRIGGER_PHY is not set
-
-#
-# MII PHY device drivers
-#
-CONFIG_SFP=m
-# CONFIG_ADIN_PHY is not set
-CONFIG_AMD_PHY=m
-CONFIG_AQUANTIA_PHY=m
-# CONFIG_AX88796B_PHY is not set
-CONFIG_AT803X_PHY=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_CICADA_PHY=m
-# CONFIG_CORTINA_PHY is not set
-CONFIG_DAVICOM_PHY=m
-CONFIG_DP83822_PHY=m
-# CONFIG_DP83TC811_PHY is not set
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_FIXED_PHY=y
-CONFIG_ICPLUS_PHY=m
-CONFIG_INTEL_XWAY_PHY=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_MARVELL_PHY=m
-# CONFIG_MARVELL_10G_PHY is not set
-CONFIG_MICREL_PHY=m
-CONFIG_MICROCHIP_PHY=m
-# CONFIG_MICROCHIP_T1_PHY is not set
-CONFIG_MICROSEMI_PHY=m
-CONFIG_NATIONAL_PHY=m
-# CONFIG_NXP_TJA11XX_PHY is not set
-CONFIG_QSEMI_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_RENESAS_PHY=m
-# CONFIG_ROCKCHIP_PHY is not set
-CONFIG_SMSC_PHY=m
-CONFIG_STE10XP=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_XILINX_GMII2RGMII=m
-CONFIG_MICREL_KS8995MA=m
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-CONFIG_SLIP_MODE_SLIP6=y
-
-#
-# Host-side USB support is needed for USB Network Adapter support
-#
-CONFIG_USB_NET_DRIVERS=m
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-# CONFIG_USB_NET_CDC_MBIM is not set
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SR9700=m
-# CONFIG_USB_NET_SR9800 is not set
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_USB_NET_CH9200=m
-# CONFIG_USB_NET_AQC111 is not set
-CONFIG_WLAN=y
-# CONFIG_WIRELESS_WDS is not set
-# CONFIG_WLAN_VENDOR_ADMTEK is not set
-CONFIG_ATH_COMMON=m
-CONFIG_WLAN_VENDOR_ATH=y
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_AHB=y
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_DYNACK is not set
-# CONFIG_ATH9K_WOW is not set
-CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
-CONFIG_ATH9K_PCOEM=y
-# CONFIG_ATH9K_PCI_NO_EEPROM is not set
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-# CONFIG_ATH9K_HWRNG is not set
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-CONFIG_CARL9170_HWRNG=y
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-CONFIG_ATH6KL_DEBUG=y
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-# CONFIG_WIL6210_TRACING is not set
-CONFIG_WIL6210_DEBUGFS=y
-CONFIG_ATH10K=m
-CONFIG_ATH10K_CE=y
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH10K_AHB is not set
-# CONFIG_ATH10K_SDIO is not set
-# CONFIG_ATH10K_USB is not set
-CONFIG_ATH10K_SNOC=m
-# CONFIG_ATH10K_DEBUG is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_TRACING is not set
-CONFIG_WCN36XX=m
-# CONFIG_WCN36XX_DEBUGFS is not set
-# CONFIG_WLAN_VENDOR_ATMEL is not set
-CONFIG_WLAN_VENDOR_BROADCOM=y
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_DEBUG=y
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMFMAC_PCIE=y
-# CONFIG_BRCM_TRACING is not set
-# CONFIG_BRCMDBG is not set
-# CONFIG_WLAN_VENDOR_CISCO is not set
-CONFIG_WLAN_VENDOR_INTEL=y
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-
-#
-# iwl3945 / iwl4965 Debugging Options
-#
-# CONFIG_IWLEGACY_DEBUG is not set
-# end of iwl3945 / iwl4965 Debugging Options
-
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLDVM=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-# CONFIG_IWLWIFI_BCAST_FILTERING is not set
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-# CONFIG_IWLWIFI_DEVICE_TRACING is not set
-# end of Debugging Options
-
-CONFIG_WLAN_VENDOR_INTERSIL=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HERMES=m
-# CONFIG_HERMES_PRISM is not set
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_SPI=m
-# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
-CONFIG_P54_LEDS=y
-CONFIG_PRISM54=m
-CONFIG_WLAN_VENDOR_MARVELL=y
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_SPI=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_MWL8K=m
-CONFIG_WLAN_VENDOR_MEDIATEK=y
-CONFIG_MT7601U=m
-CONFIG_MT76_CORE=m
-CONFIG_MT76_LEDS=y
-CONFIG_MT76_USB=m
-CONFIG_MT76x02_LIB=m
-CONFIG_MT76x02_USB=m
-CONFIG_MT76x0_COMMON=m
-CONFIG_MT76x0U=m
-# CONFIG_MT76x0E is not set
-CONFIG_MT76x2_COMMON=m
-CONFIG_MT76x2E=m
-CONFIG_MT76x2U=m
-# CONFIG_MT7603E is not set
-# CONFIG_MT7615E is not set
-CONFIG_WLAN_VENDOR_RALINK=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-# CONFIG_RT2800PCI_RT35XX is not set
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-# CONFIG_RT2800USB_RT35XX is not set
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WLAN_VENDOR_REALTEK=y
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8821AE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL8XXXU=m
-# CONFIG_RTL8XXXU_UNTESTED is not set
-# CONFIG_RTW88 is not set
-CONFIG_WLAN_VENDOR_RSI=y
-CONFIG_RSI_91X=m
-CONFIG_RSI_DEBUGFS=y
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-CONFIG_RSI_COEX=y
-CONFIG_WLAN_VENDOR_ST=y
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CW1200_WLAN_SPI=m
-CONFIG_WLAN_VENDOR_TI=y
-CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SPI=m
-CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_WLAN_VENDOR_ZYDAS=y
-CONFIG_USB_ZD1201=m
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_WLAN_VENDOR_QUANTENNA=y
-# CONFIG_QTNFMAC_PCIE is not set
-CONFIG_MAC80211_HWSIM=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-# CONFIG_VIRT_WIFI is not set
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-# end of WiMAX Wireless Broadband devices
-
-CONFIG_WAN=y
-CONFIG_HDLC=m
-CONFIG_HDLC_RAW=m
-CONFIG_HDLC_RAW_ETH=m
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC_PPP=m
-CONFIG_HDLC_X25=m
-CONFIG_PCI200SYN=m
-CONFIG_WANXL=m
-# CONFIG_WANXL_BUILD_FIRMWARE is not set
-CONFIG_PC300TOO=m
-CONFIG_FARSYNC=m
-# CONFIG_SLIC_DS26522 is not set
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
-CONFIG_LAPBETHER=m
-CONFIG_X25_ASY=m
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKELB=m
-# CONFIG_IEEE802154_AT86RF230 is not set
-# CONFIG_IEEE802154_MRF24J40 is not set
-CONFIG_IEEE802154_CC2520=m
-CONFIG_IEEE802154_ATUSB=m
-CONFIG_IEEE802154_ADF7242=m
-# CONFIG_IEEE802154_CA8210 is not set
-CONFIG_IEEE802154_MCR20A=m
-# CONFIG_IEEE802154_HWSIM is not set
-CONFIG_XEN_NETDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_BACKEND=m
-CONFIG_VMXNET3=m
-CONFIG_FUJITSU_ES=m
-# CONFIG_NETDEVSIM is not set
-CONFIG_NET_FAILOVER=m
-CONFIG_ISDN=y
-CONFIG_ISDN_CAPI=m
-# CONFIG_CAPI_TRACE is not set
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-# CONFIG_MISDN_SPEEDFAX is not set
-# CONFIG_MISDN_INFINEON is not set
-# CONFIG_MISDN_W6692 is not set
-# CONFIG_MISDN_NETJET is not set
-CONFIG_MISDN_IPAC=m
-# CONFIG_NVM is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_LEDS=m
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-CONFIG_INPUT_EVBUG=m
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADC=m
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ADP5589 is not set
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_QT1050 is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_QT2160 is not set
-# CONFIG_KEYBOARD_DLINK_DIR685 is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-CONFIG_KEYBOARD_GPIO_POLLED=m
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_TCA8418 is not set
-# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_MPR121 is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_KEYBOARD_TEGRA=m
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_SUN4I_LRADC is not set
-CONFIG_KEYBOARD_OMAP4=m
-# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_CAP11XX is not set
-# CONFIG_KEYBOARD_BCM is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-# CONFIG_MOUSE_PS2_BYD is not set
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
-CONFIG_MOUSE_PS2_CYPRESS=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
-# CONFIG_MOUSE_PS2_SENTELIC is not set
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_PS2_FOCALTECH=y
-CONFIG_MOUSE_PS2_SMBUS=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_MOUSE_SYNAPTICS_USB=m
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_PROPERTIES=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879_SPI=m
-CONFIG_TOUCHSCREEN_ADC=m
-CONFIG_TOUCHSCREEN_AR1021_I2C=m
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
-# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
-CONFIG_TOUCHSCREEN_BU21013=m
-# CONFIG_TOUCHSCREEN_BU21029 is not set
-CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
-# CONFIG_TOUCHSCREEN_CHIPONE_ICN8505 is not set
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
-# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-# CONFIG_TOUCHSCREEN_EGALAX is not set
-CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
-# CONFIG_TOUCHSCREEN_EXC3000 is not set
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GOODIX=m
-# CONFIG_TOUCHSCREEN_HIDEEP is not set
-# CONFIG_TOUCHSCREEN_ILI210X is not set
-# CONFIG_TOUCHSCREEN_S6SY761 is not set
-CONFIG_TOUCHSCREEN_GUNZE=m
-# CONFIG_TOUCHSCREEN_EKTF2127 is not set
-CONFIG_TOUCHSCREEN_ELAN=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
-# CONFIG_TOUCHSCREEN_MAX11801 is not set
-# CONFIG_TOUCHSCREEN_MCS5000 is not set
-# CONFIG_TOUCHSCREEN_MMS114 is not set
-# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
-# CONFIG_TOUCHSCREEN_RASPBERRYPI_FW is not set
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-# CONFIG_TOUCHSCREEN_USB_EASYTOUCH is not set
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-CONFIG_TOUCHSCREEN_TSC200X_CORE=m
-CONFIG_TOUCHSCREEN_TSC2004=m
-# CONFIG_TOUCHSCREEN_TSC2005 is not set
-CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
-CONFIG_TOUCHSCREEN_RM_TS=m
-CONFIG_TOUCHSCREEN_SILEAD=m
-CONFIG_TOUCHSCREEN_SIS_I2C=m
-CONFIG_TOUCHSCREEN_ST1232=m
-# CONFIG_TOUCHSCREEN_STMFTS is not set
-# CONFIG_TOUCHSCREEN_SUN4I is not set
-# CONFIG_TOUCHSCREEN_SUR40 is not set
-CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
-# CONFIG_TOUCHSCREEN_SX8654 is not set
-CONFIG_TOUCHSCREEN_TPS6507X=m
-# CONFIG_TOUCHSCREEN_ZET6223 is not set
-CONFIG_TOUCHSCREEN_ZFORCE=m
-CONFIG_TOUCHSCREEN_ROHM_BU21023=m
-# CONFIG_TOUCHSCREEN_IQS5XX is not set
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_AD714X_SPI=m
-# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BMA150 is not set
-CONFIG_INPUT_E3X0_BUTTON=m
-# CONFIG_INPUT_MSM_VIBRATOR is not set
-CONFIG_INPUT_MMA8450=m
-# CONFIG_INPUT_GP2A is not set
-# CONFIG_INPUT_GPIO_BEEPER is not set
-# CONFIG_INPUT_GPIO_DECODER is not set
-# CONFIG_INPUT_GPIO_VIBRA is not set
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_REGULATOR_HAPTIC=m
-CONFIG_INPUT_AXP20X_PEK=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-# CONFIG_INPUT_PWM_BEEPER is not set
-# CONFIG_INPUT_PWM_VIBRA is not set
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
-# CONFIG_INPUT_IMS_PCU is not set
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
-# CONFIG_INPUT_DRV260X_HAPTICS is not set
-CONFIG_INPUT_DRV2665_HAPTICS=m
-# CONFIG_INPUT_DRV2667_HAPTICS is not set
-CONFIG_INPUT_HISI_POWERKEY=m
-CONFIG_RMI4_CORE=m
-CONFIG_RMI4_I2C=m
-CONFIG_RMI4_SPI=m
-# CONFIG_RMI4_SMB is not set
-CONFIG_RMI4_F03=y
-CONFIG_RMI4_F03_SERIO=m
-CONFIG_RMI4_2D_SENSOR=y
-CONFIG_RMI4_F11=y
-CONFIG_RMI4_F12=y
-CONFIG_RMI4_F30=y
-# CONFIG_RMI4_F34 is not set
-# CONFIG_RMI4_F54 is not set
-# CONFIG_RMI4_F55 is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_AMBAKMI=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-# CONFIG_SERIO_ARC_PS2 is not set
-# CONFIG_SERIO_APBPS2 is not set
-# CONFIG_SERIO_SUN4I_PS2 is not set
-# CONFIG_SERIO_GPIO_PS2 is not set
-# CONFIG_USERIO is not set
-# CONFIG_GAMEPORT is not set
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-CONFIG_MOXA_INTELLIO=m
-CONFIG_MOXA_SMARTIO=m
-CONFIG_SYNCLINKMP=m
-CONFIG_SYNCLINK_GT=m
-CONFIG_NOZOMI=m
-CONFIG_ISI=m
-CONFIG_N_HDLC=m
-# CONFIG_N_GSM is not set
-# CONFIG_TRACE_SINK is not set
-# CONFIG_NULL_TTY is not set
-# CONFIG_LDISC_AUTOLOAD is not set
-CONFIG_DEVMEM=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-CONFIG_SERIAL_8250_PNP=y
-# CONFIG_SERIAL_8250_FINTEK is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_EXAR=y
-CONFIG_SERIAL_8250_NR_UARTS=16
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-# CONFIG_SERIAL_8250_ASPEED_VUART is not set
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_8250_BCM2835AUX=m
-CONFIG_SERIAL_8250_FSL=y
-# CONFIG_SERIAL_8250_DW is not set
-# CONFIG_SERIAL_8250_RT288X is not set
-# CONFIG_SERIAL_8250_MT6577 is not set
-CONFIG_SERIAL_OF_PLATFORM=y
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_AMBA_PL010=y
-CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
-CONFIG_SERIAL_SAMSUNG=y
-CONFIG_SERIAL_SAMSUNG_UARTS_4=y
-CONFIG_SERIAL_SAMSUNG_UARTS=4
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-# CONFIG_SERIAL_TEGRA_TCU is not set
-CONFIG_SERIAL_MAX3100=m
-# CONFIG_SERIAL_MAX310X is not set
-# CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-# CONFIG_SERIAL_MSM is not set
-CONFIG_SERIAL_QCOM_GENI=m
-# CONFIG_SERIAL_SIFIVE is not set
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_IFX6X60=m
-CONFIG_SERIAL_XILINX_PS_UART=m
-CONFIG_SERIAL_ARC=m
-CONFIG_SERIAL_ARC_NR_PORTS=1
-# CONFIG_SERIAL_RP2 is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_FSL_LINFLEXUART is not set
-# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
-# CONFIG_SERIAL_SPRD is not set
-CONFIG_SERIAL_MVEBU_UART=y
-CONFIG_SERIAL_MVEBU_CONSOLE=y
-# end of Serial drivers
-
-CONFIG_SERIAL_MCTRL_GPIO=y
-# CONFIG_SERIAL_DEV_BUS is not set
-# CONFIG_TTY_PRINTK is not set
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_HVC_XEN_FRONTEND=y
-# CONFIG_HVC_DCC is not set
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_DMI_DECODE=y
-CONFIG_IPMI_PLAT_DATA=y
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_SSIF=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-# CONFIG_IPMB_DEVICE_INTERFACE is not set
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_BCM2835=m
-CONFIG_HW_RANDOM_OMAP=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_HISI=m
-CONFIG_HW_RANDOM_XGENE=m
-CONFIG_HW_RANDOM_CAVIUM=m
-CONFIG_HW_RANDOM_MTK=m
-# CONFIG_HW_RANDOM_EXYNOS is not set
-CONFIG_APPLICOM=m
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=256
-CONFIG_TCG_TPM=m
-CONFIG_HW_RANDOM_TPM=y
-# CONFIG_TCG_TIS is not set
-# CONFIG_TCG_TIS_SPI is not set
-# CONFIG_TCG_TIS_I2C_ATMEL is not set
-# CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C_NUVOTON is not set
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
-CONFIG_TCG_XEN=m
-# CONFIG_TCG_CRB is not set
-# CONFIG_TCG_VTPM_PROXY is not set
-# CONFIG_TCG_TIS_ST33ZP24_I2C is not set
-# CONFIG_TCG_TIS_ST33ZP24_SPI is not set
-CONFIG_DEVPORT=y
-# CONFIG_XILLYBUS is not set
-# end of Character devices
-
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-CONFIG_I2C_MUX_GPIO=m
-# CONFIG_I2C_MUX_GPMUX is not set
-# CONFIG_I2C_MUX_LTC4306 is not set
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-# CONFIG_I2C_MUX_PINCTRL is not set
-# CONFIG_I2C_MUX_REG is not set
-# CONFIG_I2C_DEMUX_PINCTRL is not set
-# CONFIG_I2C_MUX_MLXCPLD is not set
-# end of Multiplexer I2C Chip support
-
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD8111=m
-# CONFIG_I2C_AMD_MP2 is not set
-# CONFIG_I2C_HIX5HD2 is not set
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-# CONFIG_I2C_NVIDIA_GPU is not set
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-CONFIG_I2C_BCM2835=m
-# CONFIG_I2C_CADENCE is not set
-# CONFIG_I2C_CBUS_GPIO is not set
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
-# CONFIG_I2C_DESIGNWARE_SLAVE is not set
-CONFIG_I2C_DESIGNWARE_PCI=m
-# CONFIG_I2C_EMEV2 is not set
-CONFIG_I2C_EXYNOS5=m
-CONFIG_I2C_GPIO=m
-# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
-# CONFIG_I2C_IMX is not set
-# CONFIG_I2C_MT65XX is not set
-CONFIG_I2C_MV64XXX=m
-# CONFIG_I2C_NOMADIK is not set
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-# CONFIG_I2C_PXA is not set
-CONFIG_I2C_QCOM_GENI=m
-# CONFIG_I2C_QUP is not set
-# CONFIG_I2C_RK3X is not set
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_SYNQUACER=m
-CONFIG_I2C_TEGRA=m
-CONFIG_I2C_TEGRA_BPMP=m
-CONFIG_I2C_VERSATILE=m
-CONFIG_I2C_THUNDERX=m
-CONFIG_I2C_XILINX=m
-CONFIG_I2C_XLP9XX=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_XGENE_SLIMPRO=m
-# end of I2C Hardware Bus support
-
-CONFIG_I2C_STUB=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SLAVE_EEPROM=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# end of I2C support
-
-# CONFIG_I3C is not set
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_MEM=y
-
-#
-# SPI Master Controller Drivers
-#
-# CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_ARMADA_3700 is not set
-# CONFIG_SPI_AXI_SPI_ENGINE is not set
-CONFIG_SPI_BCM2835=m
-CONFIG_SPI_BCM2835AUX=m
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-# CONFIG_SPI_CADENCE is not set
-CONFIG_SPI_DESIGNWARE=m
-CONFIG_SPI_DW_PCI=m
-# CONFIG_SPI_DW_MID_DMA is not set
-# CONFIG_SPI_DW_MMIO is not set
-# CONFIG_SPI_FSL_QUADSPI is not set
-# CONFIG_SPI_NXP_FLEXSPI is not set
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_LM70_LLP=m
-# CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_FSL_DSPI is not set
-# CONFIG_SPI_MT65XX is not set
-# CONFIG_SPI_OC_TINY is not set
-CONFIG_SPI_ORION=m
-# CONFIG_SPI_PL022 is not set
-# CONFIG_SPI_PXA2XX is not set
-# CONFIG_SPI_ROCKCHIP is not set
-# CONFIG_SPI_QCOM_QSPI is not set
-# CONFIG_SPI_QUP is not set
-# CONFIG_SPI_QCOM_GENI is not set
-# CONFIG_SPI_S3C64XX is not set
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_SIFIVE is not set
-# CONFIG_SPI_SPRD is not set
-# CONFIG_SPI_SUN4I is not set
-CONFIG_SPI_SUN6I=m
-# CONFIG_SPI_SYNQUACER is not set
-# CONFIG_SPI_MXIC is not set
-# CONFIG_SPI_TEGRA20_SFLASH is not set
-CONFIG_SPI_THUNDERX=m
-CONFIG_SPI_XCOMM=m
-# CONFIG_SPI_XILINX is not set
-CONFIG_SPI_XLP=m
-# CONFIG_SPI_ZYNQMP_GQSPI is not set
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=m
-# CONFIG_SPI_LOOPBACK_TEST is not set
-CONFIG_SPI_TLE62X0=m
-# CONFIG_SPI_SLAVE is not set
-# CONFIG_SPMI is not set
-# CONFIG_HSI is not set
-CONFIG_PPS=y
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-CONFIG_PPS_CLIENT_LDISC=m
-# CONFIG_PPS_CLIENT_PARPORT is not set
-# CONFIG_PPS_CLIENT_GPIO is not set
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=y
-CONFIG_PTP_1588_CLOCK_QORIQ=m
-CONFIG_DP83640_PHY=m
-# end of PTP clock support
-
-CONFIG_PINCTRL=y
-CONFIG_PINMUX=y
-CONFIG_PINCONF=y
-CONFIG_GENERIC_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
-CONFIG_PINCTRL_AXP209=m
-# CONFIG_PINCTRL_AMD is not set
-# CONFIG_PINCTRL_MCP23S08 is not set
-CONFIG_PINCTRL_ROCKCHIP=y
-# CONFIG_PINCTRL_SINGLE is not set
-# CONFIG_PINCTRL_STMFX is not set
-# CONFIG_PINCTRL_OCELOT is not set
-CONFIG_PINCTRL_BCM2835=y
-# CONFIG_PINCTRL_AS370 is not set
-# CONFIG_PINCTRL_BERLIN_BG4CT is not set
-CONFIG_PINCTRL_MVEBU=y
-CONFIG_PINCTRL_ARMADA_AP806=y
-CONFIG_PINCTRL_ARMADA_CP110=y
-CONFIG_PINCTRL_ARMADA_37XX=y
-CONFIG_PINCTRL_MSM=y
-# CONFIG_PINCTRL_APQ8064 is not set
-# CONFIG_PINCTRL_APQ8084 is not set
-# CONFIG_PINCTRL_IPQ4019 is not set
-# CONFIG_PINCTRL_IPQ8064 is not set
-# CONFIG_PINCTRL_IPQ8074 is not set
-# CONFIG_PINCTRL_MSM8660 is not set
-# CONFIG_PINCTRL_MSM8960 is not set
-# CONFIG_PINCTRL_MDM9615 is not set
-# CONFIG_PINCTRL_MSM8X74 is not set
-# CONFIG_PINCTRL_MSM8916 is not set
-# CONFIG_PINCTRL_MSM8994 is not set
-CONFIG_PINCTRL_MSM8996=m
-CONFIG_PINCTRL_MSM8998=m
-# CONFIG_PINCTRL_QCS404 is not set
-# CONFIG_PINCTRL_QDF2XXX is not set
-# CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
-# CONFIG_PINCTRL_SC7180 is not set
-# CONFIG_PINCTRL_SDM660 is not set
-CONFIG_PINCTRL_SDM845=y
-# CONFIG_PINCTRL_SM8150 is not set
-CONFIG_PINCTRL_SAMSUNG=y
-CONFIG_PINCTRL_EXYNOS=y
-CONFIG_PINCTRL_EXYNOS_ARM64=y
-# CONFIG_PINCTRL_SPRD is not set
-CONFIG_PINCTRL_SUNXI=y
-# CONFIG_PINCTRL_SUN4I_A10 is not set
-# CONFIG_PINCTRL_SUN5I is not set
-# CONFIG_PINCTRL_SUN6I_A31 is not set
-# CONFIG_PINCTRL_SUN6I_A31_R is not set
-# CONFIG_PINCTRL_SUN8I_A23 is not set
-# CONFIG_PINCTRL_SUN8I_A33 is not set
-# CONFIG_PINCTRL_SUN8I_A83T is not set
-# CONFIG_PINCTRL_SUN8I_A83T_R is not set
-# CONFIG_PINCTRL_SUN8I_A23_R is not set
-# CONFIG_PINCTRL_SUN8I_H3 is not set
-CONFIG_PINCTRL_SUN8I_H3_R=y
-# CONFIG_PINCTRL_SUN8I_V3S is not set
-# CONFIG_PINCTRL_SUN9I_A80 is not set
-# CONFIG_PINCTRL_SUN9I_A80_R is not set
-CONFIG_PINCTRL_SUN50I_A64=y
-CONFIG_PINCTRL_SUN50I_A64_R=y
-CONFIG_PINCTRL_SUN50I_H5=y
-CONFIG_PINCTRL_SUN50I_H6=y
-CONFIG_PINCTRL_SUN50I_H6_R=y
-CONFIG_PINCTRL_TEGRA=y
-CONFIG_PINCTRL_TEGRA124=y
-CONFIG_PINCTRL_TEGRA210=y
-CONFIG_PINCTRL_TEGRA194=y
-CONFIG_PINCTRL_TEGRA_XUSB=y
-
-#
-# MediaTek pinctrl drivers
-#
-CONFIG_EINT_MTK=y
-CONFIG_PINCTRL_MTK=y
-CONFIG_PINCTRL_MTK_PARIS=y
-CONFIG_PINCTRL_MT2712=y
-CONFIG_PINCTRL_MT6765=y
-CONFIG_PINCTRL_MT6797=y
-# CONFIG_PINCTRL_MT7622 is not set
-CONFIG_PINCTRL_MT8173=y
-CONFIG_PINCTRL_MT8183=y
-CONFIG_PINCTRL_MT8516=y
-# end of MediaTek pinctrl drivers
-
-CONFIG_GPIOLIB=y
-CONFIG_GPIOLIB_FASTPATH_LIMIT=512
-CONFIG_OF_GPIO=y
-CONFIG_GPIO_ACPI=y
-CONFIG_GPIOLIB_IRQCHIP=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO drivers
-#
-# CONFIG_GPIO_74XX_MMIO is not set
-# CONFIG_GPIO_ALTERA is not set
-# CONFIG_GPIO_AMDPT is not set
-CONFIG_GPIO_RASPBERRYPI_EXP=m
-# CONFIG_GPIO_CADENCE is not set
-# CONFIG_GPIO_DWAPB is not set
-# CONFIG_GPIO_EIC_SPRD is not set
-# CONFIG_GPIO_EXAR is not set
-# CONFIG_GPIO_FTGPIO010 is not set
-CONFIG_GPIO_GENERIC_PLATFORM=y
-# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_HLWD is not set
-CONFIG_GPIO_MB86S7X=m
-# CONFIG_GPIO_MPC8XXX is not set
-CONFIG_GPIO_MVEBU=y
-# CONFIG_GPIO_PL061 is not set
-# CONFIG_GPIO_SAMA5D2_PIOBU is not set
-# CONFIG_GPIO_SPRD is not set
-# CONFIG_GPIO_SYSCON is not set
-CONFIG_GPIO_TEGRA=y
-CONFIG_GPIO_THUNDERX=y
-CONFIG_GPIO_XGENE=y
-CONFIG_GPIO_XGENE_SB=m
-# CONFIG_GPIO_XILINX is not set
-CONFIG_GPIO_XLP=m
-# CONFIG_GPIO_ZYNQ is not set
-# CONFIG_GPIO_AMD_FCH is not set
-# end of Memory mapped GPIO drivers
-
-#
-# I2C GPIO expanders
-#
-CONFIG_GPIO_ADP5588=m
-# CONFIG_GPIO_ADNP is not set
-# CONFIG_GPIO_GW_PLD is not set
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-# CONFIG_GPIO_TPIC2810 is not set
-# end of I2C GPIO expanders
-
-#
-# MFD GPIO expanders
-#
-CONFIG_GPIO_JANZ_TTL=m
-# CONFIG_GPIO_UCB1400 is not set
-# end of MFD GPIO expanders
-
-#
-# PCI GPIO expanders
-#
-CONFIG_GPIO_BT8XX=m
-# CONFIG_GPIO_PCI_IDIO_16 is not set
-# CONFIG_GPIO_PCIE_IDIO_24 is not set
-CONFIG_GPIO_RDC321X=m
-# end of PCI GPIO expanders
-
-#
-# SPI GPIO expanders
-#
-# CONFIG_GPIO_74X164 is not set
-# CONFIG_GPIO_MAX3191X is not set
-CONFIG_GPIO_MAX7301=m
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_PISOSR is not set
-# CONFIG_GPIO_XRA1403 is not set
-# end of SPI GPIO expanders
-
-#
-# USB GPIO expanders
-#
-# end of USB GPIO expanders
-
-# CONFIG_GPIO_MOCKUP is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_AVS is not set
-CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_BRCMSTB is not set
-CONFIG_POWER_RESET_GPIO=y
-CONFIG_POWER_RESET_GPIO_RESTART=y
-# CONFIG_POWER_RESET_HISI is not set
-# CONFIG_POWER_RESET_MSM is not set
-# CONFIG_POWER_RESET_LTC2952 is not set
-CONFIG_POWER_RESET_RESTART=y
-CONFIG_POWER_RESET_VEXPRESS=y
-CONFIG_POWER_RESET_XGENE=y
-CONFIG_POWER_RESET_SYSCON=y
-CONFIG_POWER_RESET_SYSCON_POWEROFF=y
-# CONFIG_SYSCON_REBOOT_MODE is not set
-# CONFIG_NVMEM_REBOOT_MODE is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-# CONFIG_PDA_POWER is not set
-CONFIG_GENERIC_ADC_BATTERY=m
-# CONFIG_TEST_POWER is not set
-# CONFIG_CHARGER_ADP5061 is not set
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_LEGO_EV3 is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_CHARGER_SBS is not set
-# CONFIG_MANAGER_SBS is not set
-# CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_AXP20X_POWER is not set
-# CONFIG_AXP288_FUEL_GAUGE is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_ISP1704 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# CONFIG_CHARGER_GPIO is not set
-# CONFIG_CHARGER_MANAGER is not set
-# CONFIG_CHARGER_LT3651 is not set
-# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
-# CONFIG_CHARGER_BQ2415X is not set
-# CONFIG_CHARGER_BQ24190 is not set
-# CONFIG_CHARGER_BQ24257 is not set
-# CONFIG_CHARGER_BQ24735 is not set
-# CONFIG_CHARGER_BQ25890 is not set
-# CONFIG_CHARGER_SMB347 is not set
-# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_CHARGER_RT9455 is not set
-# CONFIG_CHARGER_UCS1002 is not set
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_AD7314=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_ADT7310=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-# CONFIG_SENSORS_AS370 is not set
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_ARM_SCMI=m
-# CONFIG_SENSORS_ASPEED is not set
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FTSTEUTATES=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-CONFIG_SENSORS_GPIO_FAN=m
-# CONFIG_SENSORS_HIH6130 is not set
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-# CONFIG_SENSORS_IIO_HWMON is not set
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC2990=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX1111=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX31722=m
-# CONFIG_SENSORS_MAX6621 is not set
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_MCP3021=m
-# CONFIG_SENSORS_TC654 is not set
-CONFIG_SENSORS_ADCXX=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM70=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_NPCM7XX=m
-# CONFIG_SENSORS_OCC_P8_I2C is not set
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-# CONFIG_SENSORS_IBM_CFFPS is not set
-# CONFIG_SENSORS_INSPUR_IPSPS is not set
-# CONFIG_SENSORS_IR35221 is not set
-# CONFIG_SENSORS_IR38064 is not set
-# CONFIG_SENSORS_IRPS5401 is not set
-# CONFIG_SENSORS_ISL68137 is not set
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-# CONFIG_SENSORS_LTC2978_REGULATOR is not set
-CONFIG_SENSORS_LTC3815=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX20751=m
-# CONFIG_SENSORS_MAX31785 is not set
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-# CONFIG_SENSORS_PXE1610 is not set
-CONFIG_SENSORS_TPS40422=m
-# CONFIG_SENSORS_TPS53679 is not set
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_ZL6100=m
-# CONFIG_SENSORS_PWM_FAN is not set
-CONFIG_SENSORS_RASPBERRYPI_HWMON=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHT3x=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-# CONFIG_SENSORS_STTS751 is not set
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADS7871=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_INA209=m
-# CONFIG_SENSORS_INA2XX is not set
-CONFIG_SENSORS_INA3221=m
-# CONFIG_SENSORS_TC74 is not set
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-# CONFIG_SENSORS_TMP108 is not set
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-# CONFIG_SENSORS_VEXPRESS is not set
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83773G=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-CONFIG_SENSORS_W83795_FANCTRL=y
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_XGENE=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_THERMAL=y
-CONFIG_THERMAL_STATISTICS=y
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-CONFIG_THERMAL_OF=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
-CONFIG_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
-# CONFIG_CPU_THERMAL is not set
-# CONFIG_CLOCK_THERMAL is not set
-# CONFIG_DEVFREQ_THERMAL is not set
-# CONFIG_THERMAL_EMULATION is not set
-# CONFIG_THERMAL_MMIO is not set
-CONFIG_HISI_THERMAL=y
-# CONFIG_QORIQ_THERMAL is not set
-# CONFIG_ROCKCHIP_THERMAL is not set
-CONFIG_ARMADA_THERMAL=m
-# CONFIG_MTK_THERMAL is not set
-
-#
-# Broadcom thermal drivers
-#
-CONFIG_BCM2835_THERMAL=m
-# end of Broadcom thermal drivers
-
-#
-# Samsung thermal drivers
-#
-# CONFIG_EXYNOS_THERMAL is not set
-# end of Samsung thermal drivers
-
-#
-# NVIDIA Tegra thermal drivers
-#
-# CONFIG_TEGRA_SOCTHERM is not set
-CONFIG_TEGRA_BPMP_THERMAL=m
-# end of NVIDIA Tegra thermal drivers
-
-CONFIG_GENERIC_ADC_THERMAL=m
-
-#
-# Qualcomm thermal drivers
-#
-CONFIG_QCOM_TSENS=m
-# end of Qualcomm thermal drivers
-
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
-CONFIG_WATCHDOG_OPEN_TIMEOUT=0
-CONFIG_WATCHDOG_SYSFS=y
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-# CONFIG_GPIO_WATCHDOG is not set
-CONFIG_WDAT_WDT=m
-# CONFIG_XILINX_WATCHDOG is not set
-# CONFIG_ZIIRAVE_WATCHDOG is not set
-# CONFIG_ARM_SP805_WATCHDOG is not set
-CONFIG_ARM_SBSA_WATCHDOG=m
-# CONFIG_ARMADA_37XX_WATCHDOG is not set
-# CONFIG_CADENCE_WATCHDOG is not set
-CONFIG_HAVE_S3C2410_WATCHDOG=y
-# CONFIG_S3C2410_WATCHDOG is not set
-# CONFIG_DW_WATCHDOG is not set
-CONFIG_SUNXI_WATCHDOG=m
-CONFIG_MAX63XX_WATCHDOG=m
-# CONFIG_IMX2_WDT is not set
-# CONFIG_TEGRA_WATCHDOG is not set
-# CONFIG_QCOM_WDT is not set
-# CONFIG_MEDIATEK_WATCHDOG is not set
-# CONFIG_SPRD_WATCHDOG is not set
-CONFIG_ALIM7101_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_BCM2835_WDT=m
-# CONFIG_MEN_A21_WDT is not set
-CONFIG_XEN_WDT=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-# CONFIG_SSB_DRIVER_GPIO is not set
-CONFIG_BCMA_POSSIBLE=y
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_HOST_SOC is not set
-CONFIG_BCMA_DRIVER_PCI=y
-CONFIG_BCMA_DRIVER_GMAC_CMN=y
-CONFIG_BCMA_DRIVER_GPIO=y
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-# CONFIG_MFD_ALTERA_SYSMGR is not set
-# CONFIG_MFD_ACT8945A is not set
-# CONFIG_MFD_SUN4I_GPADC is not set
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
-# CONFIG_MFD_ATMEL_HLCDC is not set
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_BD9571MWV is not set
-CONFIG_MFD_AC100=m
-CONFIG_MFD_AXP20X=m
-# CONFIG_MFD_AXP20X_I2C is not set
-CONFIG_MFD_AXP20X_RSB=m
-# CONFIG_MFD_MADERA is not set
-# CONFIG_MFD_DA9052_SPI is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_EXYNOS_LPASS is not set
-# CONFIG_MFD_MC13XXX_SPI is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-# CONFIG_MFD_HI6421_PMIC is not set
-CONFIG_MFD_HI655X_PMIC=m
-CONFIG_HTC_PASIC3=m
-CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
-CONFIG_MFD_JANZ_CMODIO=m
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77650 is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_MENF21BMC is not set
-# CONFIG_EZX_PCAP is not set
-# CONFIG_MFD_CPCAP is not set
-# CONFIG_MFD_VIPERBOARD is not set
-# CONFIG_MFD_RETU is not set
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_UCB1400_CORE=m
-# CONFIG_MFD_QCOM_RPM is not set
-CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_RK808 is not set
-# CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_SI476X_CORE is not set
-CONFIG_MFD_SM501=m
-# CONFIG_MFD_SM501_GPIO is not set
-# CONFIG_MFD_SKY81452 is not set
-# CONFIG_MFD_SC27XX_PMIC is not set
-CONFIG_ABX500_CORE=y
-# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN6I_PRCM=y
-CONFIG_MFD_SYSCON=y
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_TI_LMU is not set
-# CONFIG_TPS6105X is not set
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-# CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_TPS65217 is not set
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TI_LP87565 is not set
-# CONFIG_MFD_TPS65218 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-CONFIG_MFD_WL1273_CORE=m
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_TQMX86 is not set
-CONFIG_MFD_VX855=m
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MFD_STMFX is not set
-CONFIG_MFD_VEXPRESS_SYSREG=y
-# end of Multifunction device drivers
-
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-# CONFIG_REGULATOR_88PG86X is not set
-# CONFIG_REGULATOR_ACT8865 is not set
-# CONFIG_REGULATOR_AD5398 is not set
-# CONFIG_REGULATOR_ANATOP is not set
-CONFIG_REGULATOR_AXP20X=m
-# CONFIG_REGULATOR_DA9210 is not set
-# CONFIG_REGULATOR_DA9211 is not set
-# CONFIG_REGULATOR_FAN53555 is not set
-# CONFIG_REGULATOR_GPIO is not set
-CONFIG_REGULATOR_HI655X=m
-# CONFIG_REGULATOR_ISL9305 is not set
-# CONFIG_REGULATOR_ISL6271A is not set
-# CONFIG_REGULATOR_LP3971 is not set
-# CONFIG_REGULATOR_LP3972 is not set
-# CONFIG_REGULATOR_LP872X is not set
-# CONFIG_REGULATOR_LP8755 is not set
-# CONFIG_REGULATOR_LTC3589 is not set
-# CONFIG_REGULATOR_LTC3676 is not set
-# CONFIG_REGULATOR_MAX1586 is not set
-# CONFIG_REGULATOR_MAX8649 is not set
-# CONFIG_REGULATOR_MAX8660 is not set
-# CONFIG_REGULATOR_MAX8952 is not set
-# CONFIG_REGULATOR_MAX8973 is not set
-# CONFIG_REGULATOR_MCP16502 is not set
-# CONFIG_REGULATOR_MT6311 is not set
-# CONFIG_REGULATOR_PCF50633 is not set
-# CONFIG_REGULATOR_PFUZE100 is not set
-# CONFIG_REGULATOR_PV88060 is not set
-# CONFIG_REGULATOR_PV88080 is not set
-# CONFIG_REGULATOR_PV88090 is not set
-# CONFIG_REGULATOR_PWM is not set
-CONFIG_REGULATOR_QCOM_RPMH=m
-CONFIG_REGULATOR_QCOM_SMD_RPM=m
-# CONFIG_REGULATOR_SLG51000 is not set
-CONFIG_REGULATOR_SY8106A=m
-# CONFIG_REGULATOR_SY8824X is not set
-# CONFIG_REGULATOR_TPS51632 is not set
-# CONFIG_REGULATOR_TPS62360 is not set
-# CONFIG_REGULATOR_TPS65023 is not set
-# CONFIG_REGULATOR_TPS6507X is not set
-# CONFIG_REGULATOR_TPS65132 is not set
-# CONFIG_REGULATOR_TPS6524X is not set
-# CONFIG_REGULATOR_VCTRL is not set
-# CONFIG_REGULATOR_VEXPRESS is not set
-CONFIG_CEC_CORE=y
-CONFIG_CEC_NOTIFIER=y
-CONFIG_CEC_PIN=y
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-# CONFIG_LIRC is not set
-CONFIG_RC_DECODERS=y
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_SHARP_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_XMP_DECODER=m
-CONFIG_IR_IMON_DECODER=m
-# CONFIG_IR_RCMM_DECODER is not set
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_HIX5HD2=m
-CONFIG_IR_IMON=m
-CONFIG_IR_IMON_RAW=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-# CONFIG_IR_MTK is not set
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_IGORPLUGUSB=m
-CONFIG_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-CONFIG_IR_SUNXI=m
-# CONFIG_IR_SERIAL is not set
-# CONFIG_IR_SIR is not set
-# CONFIG_RC_XBOX_DVD is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-# CONFIG_MEDIA_SDR_SUPPORT is not set
-# CONFIG_MEDIA_CEC_SUPPORT is not set
-# CONFIG_CEC_PIN_ERROR_INJ is not set
-CONFIG_MEDIA_CONTROLLER=y
-# CONFIG_MEDIA_CONTROLLER_DVB is not set
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L2_I2C=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_V4L2_FLASH_LED_CLASS=m
-CONFIG_V4L2_FWNODE=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_DVB_CORE=m
-# CONFIG_DVB_MMAP is not set
-CONFIG_DVB_NET=y
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
-# CONFIG_DVB_ULE_DEBUG is not set
-
-#
-# Media drivers
-#
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-# CONFIG_USB_GSPCA_KONICA is not set
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-# CONFIG_USB_GSPCA_SPCA1528 is not set
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
-CONFIG_USB_GSPCA_ZC3XX=m
-# CONFIG_USB_PWC is not set
-# CONFIG_VIDEO_CPIA2 is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_VIDEO_USBTV=m
-
-#
-# Analog TV USB devices
-#
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_USBVISION is not set
-# CONFIG_VIDEO_STK1160_COMMON is not set
-# CONFIG_VIDEO_GO7007 is not set
-
-#
-# Analog/digital TV USB devices
-#
-# CONFIG_VIDEO_AU0828 is not set
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_DIB3000MC=m
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-# CONFIG_DVB_USB_CXUSB_ANALOG is not set
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_DVBSKY=m
-# CONFIG_DVB_USB_ZD1301 is not set
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-# CONFIG_SMS_USB_DRV is not set
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-# CONFIG_DVB_AS102 is not set
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-# CONFIG_VIDEO_EM28XX_DVB is not set
-CONFIG_VIDEO_EM28XX_RC=m
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-#
-# Media capture support
-#
-CONFIG_VIDEO_SOLO6X10=m
-# CONFIG_VIDEO_TW5864 is not set
-# CONFIG_VIDEO_TW68 is not set
-CONFIG_VIDEO_TW686X=m
-
-#
-# Media capture/analog TV support
-#
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_DT3155 is not set
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_ENABLE_VP3054=y
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7164=m
-
-#
-# Media digital TV PCI Adapters
-#
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-# CONFIG_DVB_PT3 is not set
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_DDBRIDGE=m
-# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
-CONFIG_DVB_SMIPCIE=m
-CONFIG_DVB_NETUP_UNIDVB=m
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-# CONFIG_VIDEO_MEDIATEK_VPU is not set
-# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set
-# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set
-# CONFIG_VIDEO_SAMSUNG_S5P_MFC is not set
-# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
-# CONFIG_VIDEO_SH_VEU is not set
-CONFIG_VIDEO_ROCKCHIP_RGA=m
-# CONFIG_VIDEO_QCOM_VENUS is not set
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_DVB_PLATFORM_DRIVERS is not set
-
-#
-# Supported MMC/SDIO adapters
-#
-# CONFIG_SMS_SDIO_DRV is not set
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_V4L2=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-
-#
-# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
-#
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# I2C Encoders, decoders, sensors and other helper chips
-#
-
-#
-# Audio decoders, processors and mixers
-#
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA1997X is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS3308=m
-CONFIG_VIDEO_CS5345=m
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_UDA1342 is not set
-CONFIG_VIDEO_WM8775=m
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_SONY_BTF_MPX is not set
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7183 is not set
-# CONFIG_VIDEO_ADV748X is not set
-# CONFIG_VIDEO_ADV7604 is not set
-# CONFIG_VIDEO_ADV7842 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_ML86V7667 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-CONFIG_VIDEO_SAA711X=m
-# CONFIG_VIDEO_TC358743 is not set
-# CONFIG_VIDEO_TVP514X is not set
-CONFIG_VIDEO_TVP5150=m
-# CONFIG_VIDEO_TVP7002 is not set
-# CONFIG_VIDEO_TW2804 is not set
-# CONFIG_VIDEO_TW9903 is not set
-# CONFIG_VIDEO_TW9906 is not set
-# CONFIG_VIDEO_TW9910 is not set
-# CONFIG_VIDEO_VPX3220 is not set
-
-#
-# Video and audio decoders
-#
-# CONFIG_VIDEO_SAA717X is not set
-CONFIG_VIDEO_CX25840=m
-
-#
-# Video encoders
-#
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV7393 is not set
-# CONFIG_VIDEO_AD9389B is not set
-# CONFIG_VIDEO_AK881X is not set
-# CONFIG_VIDEO_THS8200 is not set
-
-#
-# Camera sensor devices
-#
-# CONFIG_VIDEO_IMX214 is not set
-# CONFIG_VIDEO_IMX258 is not set
-# CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX319 is not set
-# CONFIG_VIDEO_IMX355 is not set
-CONFIG_VIDEO_OV2640=m
-# CONFIG_VIDEO_OV2659 is not set
-# CONFIG_VIDEO_OV2680 is not set
-# CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV5640 is not set
-# CONFIG_VIDEO_OV5645 is not set
-# CONFIG_VIDEO_OV5647 is not set
-# CONFIG_VIDEO_OV6650 is not set
-# CONFIG_VIDEO_OV5670 is not set
-# CONFIG_VIDEO_OV5675 is not set
-# CONFIG_VIDEO_OV5695 is not set
-# CONFIG_VIDEO_OV7251 is not set
-# CONFIG_VIDEO_OV772X is not set
-# CONFIG_VIDEO_OV7640 is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OV7740 is not set
-# CONFIG_VIDEO_OV8856 is not set
-# CONFIG_VIDEO_OV9640 is not set
-# CONFIG_VIDEO_OV9650 is not set
-# CONFIG_VIDEO_OV13858 is not set
-# CONFIG_VIDEO_VS6624 is not set
-# CONFIG_VIDEO_MT9M001 is not set
-# CONFIG_VIDEO_MT9M032 is not set
-# CONFIG_VIDEO_MT9M111 is not set
-# CONFIG_VIDEO_MT9P031 is not set
-# CONFIG_VIDEO_MT9T001 is not set
-# CONFIG_VIDEO_MT9T112 is not set
-CONFIG_VIDEO_MT9V011=m
-# CONFIG_VIDEO_MT9V032 is not set
-# CONFIG_VIDEO_MT9V111 is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_VIDEO_M5MOLS is not set
-# CONFIG_VIDEO_RJ54N1 is not set
-# CONFIG_VIDEO_S5K6AA is not set
-# CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_S5K4ECGX is not set
-# CONFIG_VIDEO_S5K5BAF is not set
-# CONFIG_VIDEO_SMIAPP is not set
-# CONFIG_VIDEO_ET8EK8 is not set
-# CONFIG_VIDEO_S5C73M3 is not set
-
-#
-# Lens drivers
-#
-# CONFIG_VIDEO_AD5820 is not set
-# CONFIG_VIDEO_AK7375 is not set
-# CONFIG_VIDEO_DW9714 is not set
-# CONFIG_VIDEO_DW9807_VCM is not set
-
-#
-# Flash devices
-#
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_LM3560 is not set
-# CONFIG_VIDEO_LM3646 is not set
-
-#
-# Video improvement chips
-#
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-
-#
-# Audio/Video compression chips
-#
-CONFIG_VIDEO_SAA6752HS=m
-
-#
-# SDR tuner chips
-#
-
-#
-# Miscellaneous helper chips
-#
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_I2C is not set
-# CONFIG_VIDEO_ST_MIPID02 is not set
-# end of I2C Encoders, decoders, sensors and other helper chips
-
-#
-# SPI helper chips
-#
-# CONFIG_VIDEO_GS1662 is not set
-# end of SPI helper chips
-
-#
-# Media SPI Adapters
-#
-CONFIG_CXD2880_SPI_DRV=m
-# end of Media SPI Adapters
-
-CONFIG_MEDIA_TUNER=m
-
-#
-# Customize TV tuners
-#
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA18250=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_MSI001 is not set
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_M88RS6000T=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-# CONFIG_MEDIA_TUNER_MXL301RF is not set
-# CONFIG_MEDIA_TUNER_QM1D1C0042 is not set
-CONFIG_MEDIA_TUNER_QM1D1B0004=m
-# end of Customize TV tuners
-
-#
-# Customise DVB Frontends
-#
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV0910=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_STV6111=m
-CONFIG_DVB_MXL5XX=m
-CONFIG_DVB_M88DS3103=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_SI2165=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-
-#
-# DVB-S (satellite) frontends
-#
-# CONFIG_DVB_CX24110 is not set
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24117=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_TS2020=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-# CONFIG_DVB_SP887X is not set
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-# CONFIG_DVB_S5H1432 is not set
-# CONFIG_DVB_DRXD is not set
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-# CONFIG_DVB_DIB9000 is not set
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_CXD2841ER=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_SI2168=m
-# CONFIG_DVB_ZD1301_DEMOD is not set
-CONFIG_DVB_GP8PSK_FE=m
-# CONFIG_DVB_CXD2880 is not set
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-# CONFIG_DVB_OR51211 is not set
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT3306A=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1409=m
-# CONFIG_DVB_AU8522_DTV is not set
-# CONFIG_DVB_AU8522_V4L is not set
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-# CONFIG_DVB_S921 is not set
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_TC90522=m
-# CONFIG_DVB_MN88443X is not set
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-# CONFIG_DVB_DRX39XYJ is not set
-CONFIG_DVB_LNBH25=m
-# CONFIG_DVB_LNBH29 is not set
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-# CONFIG_DVB_LGS8GL5 is not set
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_HORUS3A=m
-CONFIG_DVB_ASCOT2E=m
-CONFIG_DVB_HELENE=m
-
-#
-# Common Interface (EN50221) controller drivers
-#
-CONFIG_DVB_CXD2099=m
-CONFIG_DVB_SP2=m
-
-#
-# Tools to develop new frontends
-#
-CONFIG_DVB_DUMMY_FE=m
-# end of Customise DVB Frontends
-
-#
-# Graphics support
-#
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_TEGRA_HOST1X=m
-CONFIG_TEGRA_HOST1X_FIREWALL=y
-CONFIG_DRM=m
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_DP_AUX_CHARDEV=y
-# CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-CONFIG_DRM_DP_CEC=y
-CONFIG_DRM_TTM=m
-CONFIG_DRM_VRAM_HELPER=m
-CONFIG_DRM_GEM_CMA_HELPER=y
-CONFIG_DRM_KMS_CMA_HELPER=y
-CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_VM=y
-CONFIG_DRM_SCHED=m
-
-#
-# I2C encoder or helper chips
-#
-# CONFIG_DRM_I2C_CH7006 is not set
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# end of I2C encoder or helper chips
-
-#
-# ARM devices
-#
-CONFIG_DRM_HDLCD=m
-# CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
-CONFIG_DRM_MALI_DISPLAY=m
-# CONFIG_DRM_KOMEDA is not set
-# end of ARM devices
-
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_USERPTR=y
-CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
-# CONFIG_DRM_AMDGPU_CIK is not set
-# CONFIG_DRM_AMDGPU_USERPTR is not set
-# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
-
-#
-# ACP (Audio CoProcessor) Configuration
-#
-CONFIG_DRM_AMD_ACP=y
-# end of ACP (Audio CoProcessor) Configuration
-
-#
-# Display Engine Configuration
-#
-CONFIG_DRM_AMD_DC=y
-# CONFIG_DEBUG_KERNEL_DC is not set
-# end of Display Engine Configuration
-
-# CONFIG_HSA_AMD is not set
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
-CONFIG_NOUVEAU_PLATFORM_DRIVER=y
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-# CONFIG_NOUVEAU_DEBUG_MMU is not set
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_VGEM=m
-# CONFIG_DRM_VKMS is not set
-CONFIG_DRM_ATI_PCIGART=y
-# CONFIG_DRM_EXYNOS is not set
-# CONFIG_DRM_UDL is not set
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
-# CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_LVDS is not set
-CONFIG_DRM_RCAR_WRITEBACK=y
-CONFIG_DRM_SUN4I=m
-CONFIG_DRM_SUN4I_HDMI=m
-CONFIG_DRM_SUN4I_HDMI_CEC=y
-CONFIG_DRM_SUN4I_BACKEND=m
-CONFIG_DRM_SUN6I_DSI=m
-CONFIG_DRM_SUN8I_DW_HDMI=m
-CONFIG_DRM_SUN8I_MIXER=m
-CONFIG_DRM_SUN8I_TCON_TOP=m
-CONFIG_DRM_QXL=m
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_MSM=m
-CONFIG_DRM_MSM_GPU_STATE=y
-# CONFIG_DRM_MSM_REGISTER_LOGGING is not set
-# CONFIG_DRM_MSM_GPU_SUDO is not set
-CONFIG_DRM_MSM_HDMI_HDCP=y
-CONFIG_DRM_MSM_DSI=y
-CONFIG_DRM_MSM_DSI_PLL=y
-CONFIG_DRM_MSM_DSI_28NM_PHY=y
-CONFIG_DRM_MSM_DSI_20NM_PHY=y
-# CONFIG_DRM_MSM_DSI_28NM_8960_PHY is not set
-CONFIG_DRM_MSM_DSI_14NM_PHY=y
-CONFIG_DRM_MSM_DSI_10NM_PHY=y
-CONFIG_DRM_TEGRA=m
-# CONFIG_DRM_TEGRA_DEBUG is not set
-# CONFIG_DRM_TEGRA_STAGING is not set
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-CONFIG_DRM_PANEL_ARM_VERSATILE=m
-# CONFIG_DRM_PANEL_LVDS is not set
-# CONFIG_DRM_PANEL_SIMPLE is not set
-# CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
-CONFIG_DRM_PANEL_ILITEK_IL9322=m
-# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
-# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
-# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
-# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
-# CONFIG_DRM_PANEL_LG_LB035Q02 is not set
-# CONFIG_DRM_PANEL_LG_LG4573 is not set
-# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
-# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
-# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
-CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
-# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
-CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
-CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
-# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
-CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
-# CONFIG_DRM_PANEL_ROCKTECH_JH057N00900 is not set
-# CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
-CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
-# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
-CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
-# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
-# CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set
-CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
-# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
-# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
-# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
-# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
-# CONFIG_DRM_PANEL_TPO_TPG110 is not set
-# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
-# end of Display Panels
-
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_PANEL_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-CONFIG_DRM_ANALOGIX_ANX78XX=m
-# CONFIG_DRM_CDNS_DSI is not set
-CONFIG_DRM_DUMB_VGA_DAC=m
-# CONFIG_DRM_LVDS_ENCODER is not set
-# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
-# CONFIG_DRM_NXP_PTN3460 is not set
-# CONFIG_DRM_PARADE_PS8622 is not set
-# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SII902X is not set
-CONFIG_DRM_SII9234=m
-# CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TOSHIBA_TC358764 is not set
-# CONFIG_DRM_TOSHIBA_TC358767 is not set
-# CONFIG_DRM_TI_TFP410 is not set
-# CONFIG_DRM_TI_SN65DSI86 is not set
-CONFIG_DRM_I2C_ADV7511=m
-# CONFIG_DRM_I2C_ADV7511_AUDIO is not set
-# CONFIG_DRM_I2C_ADV7533 is not set
-CONFIG_DRM_I2C_ADV7511_CEC=y
-CONFIG_DRM_DW_HDMI=m
-CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
-CONFIG_DRM_DW_HDMI_CEC=m
-# end of Display Interface Bridges
-
-CONFIG_DRM_VC4=m
-# CONFIG_DRM_VC4_HDMI_CEC is not set
-CONFIG_DRM_ETNAVIV=m
-CONFIG_DRM_ETNAVIV_THERMAL=y
-# CONFIG_DRM_ARCPGU is not set
-# CONFIG_DRM_HISI_HIBMC is not set
-CONFIG_DRM_HISI_KIRIN=m
-# CONFIG_DRM_MEDIATEK is not set
-# CONFIG_DRM_MXSFB is not set
-# CONFIG_DRM_GM12U320 is not set
-# CONFIG_TINYDRM_HX8357D is not set
-# CONFIG_TINYDRM_ILI9225 is not set
-# CONFIG_TINYDRM_ILI9341 is not set
-# CONFIG_TINYDRM_MI0283QT is not set
-# CONFIG_TINYDRM_REPAPER is not set
-# CONFIG_TINYDRM_ST7586 is not set
-# CONFIG_TINYDRM_ST7735R is not set
-# CONFIG_DRM_PL111 is not set
-# CONFIG_DRM_XEN is not set
-# CONFIG_DRM_LIMA is not set
-# CONFIG_DRM_PANFROST is not set
-CONFIG_DRM_LEGACY=y
-# CONFIG_DRM_TDFX is not set
-# CONFIG_DRM_R128 is not set
-# CONFIG_DRM_MGA is not set
-# CONFIG_DRM_VIA is not set
-# CONFIG_DRM_SAVAGE is not set
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FB_DDC=m
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_SVGALIB=m
-CONFIG_FB_BACKLIGHT=m
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_PM2=m
-CONFIG_FB_PM2_FIFO_DISCONNECT=y
-# CONFIG_FB_ARMCLCD is not set
-CONFIG_FB_CYBER2000=m
-CONFIG_FB_CYBER2000_DDC=y
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_UVESA=m
-CONFIG_FB_EFI=y
-# CONFIG_FB_OPENCORES is not set
-CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-# CONFIG_FB_I740 is not set
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
-CONFIG_FB_S3_DDC=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-CONFIG_FB_ARK=m
-CONFIG_FB_PM3=m
-CONFIG_FB_CARMINE=m
-CONFIG_FB_CARMINE_DRAM_EVAL=y
-# CONFIG_CARMINE_DRAM_CUSTOM is not set
-CONFIG_FB_SM501=m
-# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_XILINX is not set
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_XEN_FBDEV_FRONTEND=m
-CONFIG_FB_METRONOME=m
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-CONFIG_FB_MB862XX_I2C=y
-CONFIG_FB_SIMPLE=y
-# CONFIG_FB_SSD1307 is not set
-# CONFIG_FB_SM712 is not set
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LMS283GF05=m
-CONFIG_LCD_LTV350QV=m
-# CONFIG_LCD_ILI922X is not set
-CONFIG_LCD_ILI9320=m
-CONFIG_LCD_TDO24M=m
-CONFIG_LCD_VGG2432A4=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_AMS369FG06=m
-CONFIG_LCD_LMS501KF03=m
-CONFIG_LCD_HX8357=m
-# CONFIG_LCD_OTM3225A is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_PWM=m
-# CONFIG_BACKLIGHT_PM8941_WLED is not set
-CONFIG_BACKLIGHT_ADP8860=m
-# CONFIG_BACKLIGHT_ADP8870 is not set
-CONFIG_BACKLIGHT_PCF50633=m
-# CONFIG_BACKLIGHT_LM3630A is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_GPIO is not set
-# CONFIG_BACKLIGHT_LV5207LP is not set
-# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_ARCXCNN is not set
-# end of Backlight & LCD device support
-
-CONFIG_VGASTATE=m
-CONFIG_VIDEOMODE_HELPERS=y
-CONFIG_HDMI=y
-
-#
-# Console display driver support
-#
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
-# end of Console display driver support
-
-# CONFIG_LOGO is not set
-# end of Graphics support
-
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_PCM_ELD=y
-CONFIG_SND_PCM_IEC958=y
-CONFIG_SND_DMAENGINE_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_SEQ_DEVICE=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_JACK_INPUT_DEV=y
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_PCM_TIMER=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=32
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_PROC_FS=y
-# CONFIG_SND_VERBOSE_PROCFS is not set
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_SEQUENCER_OSS=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_SEQ_MIDI_EVENT=m
-CONFIG_SND_SEQ_MIDI=m
-CONFIG_SND_SEQ_MIDI_EMUL=m
-CONFIG_SND_SEQ_VIRMIDI=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-CONFIG_SND_DUMMY=m
-# CONFIG_SND_ALOOP is not set
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_FM801=m
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-
-#
-# HD-Audio
-#
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_INTEL=m
-# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
-CONFIG_SND_HDA_TEGRA=m
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=0
-# CONFIG_SND_HDA_PATCH_LOADER is not set
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-# end of HD-Audio
-
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_ALIGNED_MMIO=y
-CONFIG_SND_HDA_COMPONENT=y
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
-CONFIG_SND_INTEL_NHLT=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_CAIAQ=m
-# CONFIG_SND_USB_CAIAQ_INPUT is not set
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
-# CONFIG_SND_BCD2000 is not set
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_DICE=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_BEBOB=m
-# CONFIG_SND_FIREWIRE_DIGI00X is not set
-# CONFIG_SND_FIREWIRE_TASCAM is not set
-# CONFIG_SND_FIREWIRE_MOTU is not set
-# CONFIG_SND_FIREFACE is not set
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
-CONFIG_SND_SOC_AMD_ACP=m
-CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
-CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
-# CONFIG_SND_ATMEL_SOC is not set
-CONFIG_SND_BCM2835_SOC_I2S=m
-# CONFIG_SND_DESIGNWARE_I2S is not set
-
-#
-# SoC Audio for Freescale CPUs
-#
-
-#
-# Common SoC Audio options for Freescale CPUs:
-#
-# CONFIG_SND_SOC_FSL_ASRC is not set
-# CONFIG_SND_SOC_FSL_SAI is not set
-# CONFIG_SND_SOC_FSL_AUDMIX is not set
-# CONFIG_SND_SOC_FSL_SSI is not set
-# CONFIG_SND_SOC_FSL_SPDIF is not set
-# CONFIG_SND_SOC_FSL_ESAI is not set
-# CONFIG_SND_SOC_FSL_MICFIL is not set
-# CONFIG_SND_SOC_IMX_AUDMUX is not set
-# end of SoC Audio for Freescale CPUs
-
-# CONFIG_SND_I2S_HI6210_I2S is not set
-# CONFIG_SND_KIRKWOOD_SOC is not set
-# CONFIG_SND_SOC_IMG is not set
-# CONFIG_SND_SOC_MT2701 is not set
-# CONFIG_SND_SOC_MT6797 is not set
-# CONFIG_SND_SOC_MT8173 is not set
-# CONFIG_SND_SOC_MT8183 is not set
-# CONFIG_SND_SOC_MTK_BTCVSD is not set
-# CONFIG_SND_SOC_QCOM is not set
-# CONFIG_SND_SOC_ROCKCHIP is not set
-# CONFIG_SND_SOC_SAMSUNG is not set
-# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
-# CONFIG_SND_SOC_SPRD is not set
-
-#
-# STMicroelectronics STM32 SOC audio support
-#
-# end of STMicroelectronics STM32 SOC audio support
-
-#
-# Allwinner SoC Audio support
-#
-# CONFIG_SND_SUN4I_CODEC is not set
-# CONFIG_SND_SUN8I_CODEC is not set
-# CONFIG_SND_SUN8I_CODEC_ANALOG is not set
-# CONFIG_SND_SUN50I_CODEC_ANALOG is not set
-# CONFIG_SND_SUN4I_I2S is not set
-# CONFIG_SND_SUN4I_SPDIF is not set
-# end of Allwinner SoC Audio support
-
-# CONFIG_SND_SOC_XILINX_I2S is not set
-# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
-# CONFIG_SND_SOC_XILINX_SPDIF is not set
-# CONFIG_SND_SOC_XTFPGA_I2S is not set
-# CONFIG_ZX_TDM is not set
-CONFIG_SND_SOC_I2C_AND_SPI=m
-
-#
-# CODEC drivers
-#
-# CONFIG_SND_SOC_AC97_CODEC is not set
-# CONFIG_SND_SOC_ADAU1701 is not set
-# CONFIG_SND_SOC_ADAU1761_I2C is not set
-# CONFIG_SND_SOC_ADAU1761_SPI is not set
-CONFIG_SND_SOC_ADAU7002=m
-# CONFIG_SND_SOC_AK4104 is not set
-# CONFIG_SND_SOC_AK4118 is not set
-CONFIG_SND_SOC_AK4458=m
-# CONFIG_SND_SOC_AK4554 is not set
-# CONFIG_SND_SOC_AK4613 is not set
-# CONFIG_SND_SOC_AK4642 is not set
-# CONFIG_SND_SOC_AK5386 is not set
-CONFIG_SND_SOC_AK5558=m
-# CONFIG_SND_SOC_ALC5623 is not set
-CONFIG_SND_SOC_BD28623=m
-# CONFIG_SND_SOC_BT_SCO is not set
-# CONFIG_SND_SOC_CS35L32 is not set
-# CONFIG_SND_SOC_CS35L33 is not set
-# CONFIG_SND_SOC_CS35L34 is not set
-# CONFIG_SND_SOC_CS35L35 is not set
-# CONFIG_SND_SOC_CS35L36 is not set
-# CONFIG_SND_SOC_CS42L42 is not set
-# CONFIG_SND_SOC_CS42L51_I2C is not set
-# CONFIG_SND_SOC_CS42L52 is not set
-# CONFIG_SND_SOC_CS42L56 is not set
-# CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS4265 is not set
-# CONFIG_SND_SOC_CS4270 is not set
-# CONFIG_SND_SOC_CS4271_I2C is not set
-# CONFIG_SND_SOC_CS4271_SPI is not set
-# CONFIG_SND_SOC_CS42XX8_I2C is not set
-# CONFIG_SND_SOC_CS43130 is not set
-# CONFIG_SND_SOC_CS4341 is not set
-# CONFIG_SND_SOC_CS4349 is not set
-# CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_CX2072X is not set
-CONFIG_SND_SOC_DA7219=m
-# CONFIG_SND_SOC_DMIC is not set
-CONFIG_SND_SOC_HDMI_CODEC=m
-# CONFIG_SND_SOC_ES7134 is not set
-# CONFIG_SND_SOC_ES7241 is not set
-# CONFIG_SND_SOC_ES8316 is not set
-# CONFIG_SND_SOC_ES8328_I2C is not set
-# CONFIG_SND_SOC_ES8328_SPI is not set
-# CONFIG_SND_SOC_GTM601 is not set
-# CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_MAX98088 is not set
-CONFIG_SND_SOC_MAX98357A=m
-# CONFIG_SND_SOC_MAX98504 is not set
-CONFIG_SND_SOC_MAX9867=m
-# CONFIG_SND_SOC_MAX98927 is not set
-CONFIG_SND_SOC_MAX98373=m
-# CONFIG_SND_SOC_MAX9860 is not set
-# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
-# CONFIG_SND_SOC_PCM1681 is not set
-CONFIG_SND_SOC_PCM1789=m
-CONFIG_SND_SOC_PCM1789_I2C=m
-# CONFIG_SND_SOC_PCM179X_I2C is not set
-# CONFIG_SND_SOC_PCM179X_SPI is not set
-CONFIG_SND_SOC_PCM186X=m
-CONFIG_SND_SOC_PCM186X_I2C=m
-CONFIG_SND_SOC_PCM186X_SPI=m
-# CONFIG_SND_SOC_PCM3060_I2C is not set
-# CONFIG_SND_SOC_PCM3060_SPI is not set
-# CONFIG_SND_SOC_PCM3168A_I2C is not set
-# CONFIG_SND_SOC_PCM3168A_SPI is not set
-# CONFIG_SND_SOC_PCM512x_I2C is not set
-# CONFIG_SND_SOC_PCM512x_SPI is not set
-# CONFIG_SND_SOC_RK3328 is not set
-CONFIG_SND_SOC_RL6231=m
-# CONFIG_SND_SOC_RT5616 is not set
-# CONFIG_SND_SOC_RT5631 is not set
-CONFIG_SND_SOC_RT5645=m
-# CONFIG_SND_SOC_SGTL5000 is not set
-CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
-# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
-CONFIG_SND_SOC_SPDIF=m
-# CONFIG_SND_SOC_SSM2305 is not set
-# CONFIG_SND_SOC_SSM2602_SPI is not set
-# CONFIG_SND_SOC_SSM2602_I2C is not set
-# CONFIG_SND_SOC_SSM4567 is not set
-# CONFIG_SND_SOC_STA32X is not set
-# CONFIG_SND_SOC_STA350 is not set
-# CONFIG_SND_SOC_STI_SAS is not set
-# CONFIG_SND_SOC_TAS2552 is not set
-# CONFIG_SND_SOC_TAS5086 is not set
-# CONFIG_SND_SOC_TAS571X is not set
-# CONFIG_SND_SOC_TAS5720 is not set
-CONFIG_SND_SOC_TAS6424=m
-CONFIG_SND_SOC_TDA7419=m
-# CONFIG_SND_SOC_TFA9879 is not set
-# CONFIG_SND_SOC_TLV320AIC23_I2C is not set
-# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
-# CONFIG_SND_SOC_TLV320AIC31XX is not set
-CONFIG_SND_SOC_TLV320AIC32X4=m
-CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
-CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
-# CONFIG_SND_SOC_TLV320AIC3X is not set
-# CONFIG_SND_SOC_TS3A227E is not set
-CONFIG_SND_SOC_TSCS42XX=m
-# CONFIG_SND_SOC_TSCS454 is not set
-# CONFIG_SND_SOC_UDA1334 is not set
-# CONFIG_SND_SOC_WCD9335 is not set
-# CONFIG_SND_SOC_WM8510 is not set
-# CONFIG_SND_SOC_WM8523 is not set
-# CONFIG_SND_SOC_WM8524 is not set
-# CONFIG_SND_SOC_WM8580 is not set
-# CONFIG_SND_SOC_WM8711 is not set
-# CONFIG_SND_SOC_WM8728 is not set
-# CONFIG_SND_SOC_WM8731 is not set
-# CONFIG_SND_SOC_WM8737 is not set
-# CONFIG_SND_SOC_WM8741 is not set
-# CONFIG_SND_SOC_WM8750 is not set
-# CONFIG_SND_SOC_WM8753 is not set
-# CONFIG_SND_SOC_WM8770 is not set
-# CONFIG_SND_SOC_WM8776 is not set
-# CONFIG_SND_SOC_WM8782 is not set
-# CONFIG_SND_SOC_WM8804_I2C is not set
-# CONFIG_SND_SOC_WM8804_SPI is not set
-# CONFIG_SND_SOC_WM8903 is not set
-# CONFIG_SND_SOC_WM8904 is not set
-# CONFIG_SND_SOC_WM8960 is not set
-# CONFIG_SND_SOC_WM8962 is not set
-# CONFIG_SND_SOC_WM8974 is not set
-# CONFIG_SND_SOC_WM8978 is not set
-# CONFIG_SND_SOC_WM8985 is not set
-# CONFIG_SND_SOC_ZX_AUD96P22 is not set
-CONFIG_SND_SOC_MAX9759=m
-# CONFIG_SND_SOC_MT6351 is not set
-# CONFIG_SND_SOC_MT6358 is not set
-# CONFIG_SND_SOC_NAU8540 is not set
-# CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8822 is not set
-# CONFIG_SND_SOC_NAU8824 is not set
-# CONFIG_SND_SOC_TPA6130A2 is not set
-# end of CODEC drivers
-
-CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_CARD=m
-# CONFIG_SND_AUDIO_GRAPH_CARD is not set
-# CONFIG_SND_XEN_FRONTEND is not set
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=m
-CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACCUTOUCH is not set
-# CONFIG_HID_ACRUX is not set
-CONFIG_HID_APPLE=m
-# CONFIG_HID_APPLEIR is not set
-CONFIG_HID_ASUS=m
-# CONFIG_HID_AUREAL is not set
-# CONFIG_HID_BELKIN is not set
-CONFIG_HID_BETOP_FF=m
-# CONFIG_HID_BIGBEN_FF is not set
-CONFIG_HID_CHERRY=m
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_CORSAIR is not set
-CONFIG_HID_COUGAR=m
-# CONFIG_HID_MACALLY is not set
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CMEDIA=m
-# CONFIG_HID_CP2112 is not set
-# CONFIG_HID_CREATIVE_SB0540 is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-CONFIG_HID_ELAN=m
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GEMBIRD is not set
-# CONFIG_HID_GFRM is not set
-# CONFIG_HID_HOLTEK is not set
-CONFIG_HID_GT683R=m
-CONFIG_HID_KEYTOUCH=m
-# CONFIG_HID_KYE is not set
-CONFIG_HID_UCLOGIC=m
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_VIEWSONIC is not set
-# CONFIG_HID_GYRATION is not set
-CONFIG_HID_ICADE=m
-# CONFIG_HID_ITE is not set
-CONFIG_HID_JABRA=m
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_KENSINGTON is not set
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LED=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-# CONFIG_HID_MALTRON is not set
-# CONFIG_HID_MAYFLASH is not set
-# CONFIG_HID_REDRAGON is not set
-CONFIG_HID_MICROSOFT=m
-# CONFIG_HID_MONTEREY is not set
-CONFIG_HID_MULTITOUCH=m
-# CONFIG_HID_NTI is not set
-# CONFIG_HID_NTRIG is not set
-CONFIG_HID_ORTEK=m
-# CONFIG_HID_PANTHERLORD is not set
-CONFIG_HID_PENMOUNT=m
-# CONFIG_HID_PETALYNX is not set
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PLANTRONICS=m
-CONFIG_HID_PRIMAX=m
-# CONFIG_HID_RETRODE is not set
-CONFIG_HID_ROCCAT=m
-# CONFIG_HID_SAITEK is not set
-# CONFIG_HID_SAMSUNG is not set
-CONFIG_HID_SONY=m
-CONFIG_SONY_FF=y
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEAM=m
-# CONFIG_HID_STEELSERIES is not set
-# CONFIG_HID_SUNPLUS is not set
-CONFIG_HID_RMI=m
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-CONFIG_HID_THINGM=m
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_UDRAW_PS3 is not set
-# CONFIG_HID_U2FZERO is not set
-# CONFIG_HID_WACOM is not set
-CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-# CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
-CONFIG_HID_ALPS=m
-# end of Special HID drivers
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# end of USB HID Boot Protocol drivers
-# end of USB HID support
-
-#
-# I2C HID support
-#
-CONFIG_I2C_HID=m
-# end of I2C HID support
-# end of HID support
-
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_LED_TRIG=y
-# CONFIG_USB_ULPI_BUS is not set
-# CONFIG_USB_CONN_GPIO is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-CONFIG_USB_PCI=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG_FSM is not set
-CONFIG_USB_LEDS_TRIGGER_USBPORT=m
-CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_MON=m
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PLATFORM=m
-# CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_MTK is not set
-CONFIG_USB_XHCI_MVEBU=m
-CONFIG_USB_XHCI_TEGRA=m
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-CONFIG_USB_EHCI_PCI=m
-# CONFIG_USB_EHCI_FSL is not set
-CONFIG_USB_EHCI_HCD_ORION=m
-# CONFIG_USB_EHCI_TEGRA is not set
-# CONFIG_USB_EHCI_EXYNOS is not set
-CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-# CONFIG_USB_FOTG210_HCD is not set
-# CONFIG_USB_MAX3421_HCD is not set
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_SSB=y
-# CONFIG_USB_OHCI_EXYNOS is not set
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_HCD_ISO=y
-CONFIG_USB_R8A66597_HCD=m
-# CONFIG_USB_HCD_BCMA is not set
-CONFIG_USB_HCD_SSB=m
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_VHCI_HC_PORTS=8
-CONFIG_USBIP_VHCI_NR_HCS=1
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-# CONFIG_USB_CDNS3 is not set
-# CONFIG_USB_MTU3 is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_ISP1760 is not set
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-# CONFIG_USB_SERIAL_F81232 is not set
-# CONFIG_USB_SERIAL_F8153X is not set
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-# CONFIG_USB_SERIAL_MXUPORT is not set
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-# CONFIG_USB_SERIAL_WISHBONE is not set
-# CONFIG_USB_SERIAL_SSU100 is not set
-CONFIG_USB_SERIAL_QT2=m
-# CONFIG_USB_SERIAL_UPD78F0730 is not set
-CONFIG_USB_SERIAL_DEBUG=m
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-# CONFIG_USB_LEGOTOWER is not set
-CONFIG_USB_LCD=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-# CONFIG_USB_APPLEDISPLAY is not set
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_LD=m
-# CONFIG_USB_TRANCEVIBRATOR is not set
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-CONFIG_USB_ISIGHTFW=m
-# CONFIG_USB_YUREX is not set
-CONFIG_USB_EZUSB_FX2=m
-# CONFIG_USB_HUB_USB251XB is not set
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_HSIC_USB4604=m
-# CONFIG_USB_LINK_LAYER_TEST is not set
-CONFIG_USB_CHAOSKEY=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-
-#
-# USB Physical Layer drivers
-#
-CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_USB_GPIO_VBUS=m
-# CONFIG_USB_ISP1301 is not set
-CONFIG_USB_TEGRA_PHY=m
-CONFIG_USB_ULPI=y
-CONFIG_USB_ULPI_VIEWPORT=y
-# end of USB Physical Layer drivers
-
-# CONFIG_USB_GADGET is not set
-CONFIG_TYPEC=m
-# CONFIG_TYPEC_TCPM is not set
-# CONFIG_TYPEC_UCSI is not set
-CONFIG_TYPEC_TPS6598X=m
-
-#
-# USB Type-C Multiplexer/DeMultiplexer Switch support
-#
-CONFIG_TYPEC_MUX_PI3USB30532=m
-# end of USB Type-C Multiplexer/DeMultiplexer Switch support
-
-#
-# USB Type-C Alternate Mode drivers
-#
-CONFIG_TYPEC_DP_ALTMODE=m
-# CONFIG_TYPEC_NVIDIA_ALTMODE is not set
-# end of USB Type-C Alternate Mode drivers
-
-CONFIG_USB_ROLE_SWITCH=m
-CONFIG_MMC=m
-# CONFIG_PWRSEQ_EMMC is not set
-# CONFIG_PWRSEQ_SD8787 is not set
-# CONFIG_PWRSEQ_SIMPLE is not set
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_SDIO_UART=m
-CONFIG_MMC_TEST=m
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_ARMMMCI=m
-CONFIG_MMC_QCOM_DML=y
-CONFIG_MMC_STM32_SDMMC=y
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-# CONFIG_MMC_SDHCI_ACPI is not set
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_SDHCI_OF_ARASAN=m
-# CONFIG_MMC_SDHCI_OF_ASPEED is not set
-CONFIG_MMC_SDHCI_OF_AT91=m
-CONFIG_MMC_SDHCI_OF_ESDHC=m
-# CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
-# CONFIG_MMC_SDHCI_CADENCE is not set
-CONFIG_MMC_SDHCI_TEGRA=m
-CONFIG_MMC_SDHCI_PXAV3=m
-CONFIG_MMC_SDHCI_F_SDH30=m
-CONFIG_MMC_SDHCI_IPROC=m
-CONFIG_MMC_SDHCI_MSM=m
-CONFIG_MMC_TIFM_SD=m
-# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_SDHCI_SPRD is not set
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_CAVIUM_THUNDERX=m
-CONFIG_MMC_DW=m
-CONFIG_MMC_DW_PLTFM=m
-# CONFIG_MMC_DW_BLUEFIELD is not set
-CONFIG_MMC_DW_EXYNOS=m
-CONFIG_MMC_DW_HI3798CV200=m
-CONFIG_MMC_DW_K3=m
-CONFIG_MMC_DW_PCI=m
-CONFIG_MMC_DW_ROCKCHIP=m
-CONFIG_MMC_VUB300=m
-# CONFIG_MMC_USHC is not set
-# CONFIG_MMC_USDHI6ROL0 is not set
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_SUNXI=m
-CONFIG_MMC_CQHCI=m
-CONFIG_MMC_TOSHIBA_PCI=m
-# CONFIG_MMC_BCM2835 is not set
-CONFIG_MMC_MTK=m
-CONFIG_MMC_SDHCI_XENON=m
-CONFIG_MMC_SDHCI_OMAP=m
-# CONFIG_MMC_SDHCI_AM654 is not set
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-# CONFIG_MS_BLOCK is not set
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_CLASS_FLASH=m
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
-
-#
-# LED drivers
-#
-# CONFIG_LEDS_AAT1290 is not set
-# CONFIG_LEDS_AN30259A is not set
-# CONFIG_LEDS_AS3645A is not set
-# CONFIG_LEDS_BCM6328 is not set
-# CONFIG_LEDS_BCM6358 is not set
-CONFIG_LEDS_CR0014114=m
-CONFIG_LEDS_LM3530=m
-# CONFIG_LEDS_LM3532 is not set
-# CONFIG_LEDS_LM3642 is not set
-CONFIG_LEDS_LM3692X=m
-CONFIG_LEDS_LM3601X=m
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_GPIO is not set
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP3952=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-# CONFIG_LEDS_LP8501 is not set
-# CONFIG_LEDS_LP8860 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_DAC124S085 is not set
-# CONFIG_LEDS_PWM is not set
-# CONFIG_LEDS_REGULATOR is not set
-# CONFIG_LEDS_BD2802 is not set
-CONFIG_LEDS_LT3593=m
-# CONFIG_LEDS_TCA6507 is not set
-# CONFIG_LEDS_TLC591XX is not set
-# CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_KTD2692 is not set
-# CONFIG_LEDS_IS31FL319X is not set
-# CONFIG_LEDS_IS31FL32XX is not set
-
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-CONFIG_LEDS_BLINKM=m
-# CONFIG_LEDS_SYSCON is not set
-CONFIG_LEDS_MLXREG=m
-# CONFIG_LEDS_USER is not set
-# CONFIG_LEDS_SPI_BYTE is not set
-# CONFIG_LEDS_TI_LMU_COMMON is not set
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_DISK=y
-CONFIG_LEDS_TRIGGER_MTD=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-# CONFIG_LEDS_TRIGGER_CPU is not set
-CONFIG_LEDS_TRIGGER_ACTIVITY=m
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_LEDS_TRIGGER_PANIC=y
-CONFIG_LEDS_TRIGGER_NETDEV=m
-# CONFIG_LEDS_TRIGGER_PATTERN is not set
-CONFIG_LEDS_TRIGGER_AUDIO=m
-CONFIG_ACCESSIBILITY=y
-# CONFIG_A11Y_BRAILLE_CONSOLE is not set
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
-CONFIG_INFINIBAND_MTHCA=m
-# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
-CONFIG_INFINIBAND_CXGB3=m
-CONFIG_INFINIBAND_CXGB4=m
-# CONFIG_INFINIBAND_EFA is not set
-CONFIG_INFINIBAND_I40IW=m
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_MLX5_INFINIBAND=m
-# CONFIG_INFINIBAND_OCRDMA is not set
-# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
-# CONFIG_INFINIBAND_HNS is not set
-# CONFIG_INFINIBAND_QEDR is not set
-CONFIG_RDMA_RXE=m
-# CONFIG_RDMA_SIW is not set
-CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
-# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SRPT=m
-CONFIG_INFINIBAND_ISER=m
-# CONFIG_INFINIBAND_ISERT is not set
-CONFIG_EDAC_SUPPORT=y
-CONFIG_EDAC=y
-CONFIG_EDAC_LEGACY_SYSFS=y
-# CONFIG_EDAC_DEBUG is not set
-# CONFIG_EDAC_LAYERSCAPE is not set
-CONFIG_EDAC_THUNDERX=m
-# CONFIG_EDAC_ALTERA is not set
-# CONFIG_EDAC_SYNOPSYS is not set
-CONFIG_EDAC_XGENE=m
-# CONFIG_EDAC_QCOM is not set
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_NVMEM=y
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-# CONFIG_RTC_DRV_ABB5ZES3 is not set
-# CONFIG_RTC_DRV_ABEOZ9 is not set
-CONFIG_RTC_DRV_ABX80X=m
-CONFIG_RTC_DRV_AC100=m
-CONFIG_RTC_DRV_DS1307=m
-# CONFIG_RTC_DRV_DS1307_CENTURY is not set
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1374_WDT=y
-CONFIG_RTC_DRV_DS1672=m
-# CONFIG_RTC_DRV_HYM8563 is not set
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-# CONFIG_RTC_DRV_ISL12022 is not set
-CONFIG_RTC_DRV_ISL12026=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF85063=m
-# CONFIG_RTC_DRV_PCF85363 is not set
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8010=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
-# CONFIG_RTC_DRV_RV3028 is not set
-CONFIG_RTC_DRV_RV8803=m
-# CONFIG_RTC_DRV_SD3078 is not set
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_DRV_M41T93=m
-CONFIG_RTC_DRV_M41T94=m
-# CONFIG_RTC_DRV_DS1302 is not set
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1343=m
-CONFIG_RTC_DRV_DS1347=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_MAX6916=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RX4581=m
-# CONFIG_RTC_DRV_RX6110 is not set
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_PCF2123=m
-CONFIG_RTC_DRV_MCP795=m
-CONFIG_RTC_I2C_AND_SPI=m
-
-#
-# SPI and I2C RTC drivers
-#
-# CONFIG_RTC_DRV_DS3232 is not set
-CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_RV3029C2=m
-CONFIG_RTC_DRV_RV3029_HWMON=y
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1685_FAMILY=m
-CONFIG_RTC_DRV_DS1685=y
-# CONFIG_RTC_DRV_DS1689 is not set
-# CONFIG_RTC_DRV_DS17285 is not set
-# CONFIG_RTC_DRV_DS17485 is not set
-# CONFIG_RTC_DRV_DS17885 is not set
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_DS2404=m
-# CONFIG_RTC_DRV_EFI is not set
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_PCF50633=m
-# CONFIG_RTC_DRV_ZYNQMP is not set
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_FSL_FTM_ALARM=y
-CONFIG_HAVE_S3C_RTC=y
-# CONFIG_RTC_DRV_S3C is not set
-# CONFIG_RTC_DRV_PL030 is not set
-# CONFIG_RTC_DRV_PL031 is not set
-CONFIG_RTC_DRV_SUN6I=y
-CONFIG_RTC_DRV_MV=m
-CONFIG_RTC_DRV_ARMADA38X=m
-# CONFIG_RTC_DRV_CADENCE is not set
-# CONFIG_RTC_DRV_FTRTC010 is not set
-# CONFIG_RTC_DRV_TEGRA is not set
-CONFIG_RTC_DRV_SNVS=m
-# CONFIG_RTC_DRV_MT7622 is not set
-CONFIG_RTC_DRV_XGENE=m
-# CONFIG_RTC_DRV_R7301 is not set
-
-#
-# HID Sensor RTC drivers
-#
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_VIRTUAL_CHANNELS=y
-CONFIG_DMA_ACPI=y
-CONFIG_DMA_OF=y
-# CONFIG_ALTERA_MSGDMA is not set
-# CONFIG_AMBA_PL08X is not set
-# CONFIG_AXI_DMAC is not set
-# CONFIG_BCM_SBA_RAID is not set
-CONFIG_DMA_BCM2835=m
-# CONFIG_DMA_SUN6I is not set
-# CONFIG_DW_AXI_DMAC is not set
-CONFIG_FSL_EDMA=m
-# CONFIG_FSL_QDMA is not set
-CONFIG_INTEL_IDMA64=m
-# CONFIG_K3_DMA is not set
-CONFIG_MV_XOR=y
-# CONFIG_MV_XOR_V2 is not set
-CONFIG_PL330_DMA=m
-# CONFIG_SPRD_DMA is not set
-# CONFIG_TEGRA20_APB_DMA is not set
-CONFIG_TEGRA210_ADMA=y
-CONFIG_XGENE_DMA=m
-# CONFIG_XILINX_DMA is not set
-# CONFIG_XILINX_ZYNQMP_DMA is not set
-# CONFIG_MTK_HSDMA is not set
-# CONFIG_MTK_CQDMA is not set
-CONFIG_QCOM_BAM_DMA=m
-CONFIG_QCOM_HIDMA_MGMT=m
-CONFIG_QCOM_HIDMA=m
-CONFIG_DW_DMAC_CORE=m
-# CONFIG_DW_DMAC is not set
-CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
-
-#
-# DMA Clients
-#
-# CONFIG_ASYNC_TX_DMA is not set
-CONFIG_DMATEST=m
-CONFIG_DMA_ENGINE_RAID=y
-
-#
-# DMABUF options
-#
-CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
-# CONFIG_DMABUF_SELFTESTS is not set
-# end of DMABUF options
-
-CONFIG_AUXDISPLAY=y
-# CONFIG_HD44780 is not set
-# CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_HT16K33 is not set
-# CONFIG_PARPORT_PANEL is not set
-# CONFIG_CHARLCD_BL_OFF is not set
-# CONFIG_CHARLCD_BL_ON is not set
-CONFIG_CHARLCD_BL_FLASH=y
-# CONFIG_PANEL is not set
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV_GENIRQ=m
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-# CONFIG_UIO_PRUSS is not set
-# CONFIG_UIO_MF624 is not set
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO_VIRQFD=m
-CONFIG_VFIO=m
-# CONFIG_VFIO_NOIOMMU is not set
-CONFIG_VFIO_PCI=m
-CONFIG_VFIO_PCI_MMAP=y
-CONFIG_VFIO_PCI_INTX=y
-CONFIG_VFIO_PLATFORM=m
-CONFIG_VFIO_AMBA=m
-# CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set
-# CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set
-# CONFIG_VFIO_MDEV is not set
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-# CONFIG_VIRTIO_PMEM is not set
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-# end of Microsoft Hyper-V guest support
-
-#
-# Xen driver support
-#
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
-CONFIG_XEN_DEV_EVTCHN=m
-CONFIG_XEN_BACKEND=y
-CONFIG_XENFS=m
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_XENBUS_FRONTEND=y
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-# CONFIG_XEN_GRANT_DMA_ALLOC is not set
-CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_PVCALLS_FRONTEND=m
-# CONFIG_XEN_PVCALLS_BACKEND is not set
-CONFIG_XEN_SCSI_BACKEND=m
-CONFIG_XEN_PRIVCMD=m
-CONFIG_XEN_EFI=y
-CONFIG_XEN_AUTO_XLATE=y
-# end of Xen driver support
-
-# CONFIG_GREYBUS is not set
-CONFIG_STAGING=y
-# CONFIG_PRISM2_USB is not set
-# CONFIG_COMEDI is not set
-# CONFIG_RTL8192U is not set
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-# CONFIG_RTL8192E is not set
-# CONFIG_RTL8723BS is not set
-# CONFIG_R8712U is not set
-# CONFIG_R8188EU is not set
-# CONFIG_RTS5208 is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-
-#
-# IIO staging drivers
-#
-
-#
-# Accelerometers
-#
-# CONFIG_ADIS16203 is not set
-# CONFIG_ADIS16240 is not set
-# end of Accelerometers
-
-#
-# Analog to digital converters
-#
-# CONFIG_AD7816 is not set
-# CONFIG_AD7192 is not set
-# CONFIG_AD7280 is not set
-# end of Analog to digital converters
-
-#
-# Analog digital bi-direction converters
-#
-# CONFIG_ADT7316 is not set
-# end of Analog digital bi-direction converters
-
-#
-# Capacitance to digital converters
-#
-# CONFIG_AD7150 is not set
-# CONFIG_AD7746 is not set
-# end of Capacitance to digital converters
-
-#
-# Direct Digital Synthesis
-#
-# CONFIG_AD9832 is not set
-# CONFIG_AD9834 is not set
-# end of Direct Digital Synthesis
-
-#
-# Network Analyzer, Impedance Converters
-#
-# CONFIG_AD5933 is not set
-# end of Network Analyzer, Impedance Converters
-
-#
-# Active energy metering IC
-#
-# CONFIG_ADE7854 is not set
-# end of Active energy metering IC
-
-#
-# Resolver to digital converters
-#
-# CONFIG_AD2S1210 is not set
-# end of Resolver to digital converters
-# end of IIO staging drivers
-
-# CONFIG_FB_SM750 is not set
-
-#
-# Speakup console speech
-#
-# CONFIG_SPEAKUP is not set
-# end of Speakup console speech
-
-# CONFIG_MFD_NVEC is not set
-# CONFIG_STAGING_MEDIA is not set
-
-#
-# Android
-#
-CONFIG_ASHMEM=y
-# CONFIG_ANDROID_VSOC is not set
-# CONFIG_ION is not set
-# end of Android
-
-# CONFIG_STAGING_BOARD is not set
-# CONFIG_LTE_GDM724X is not set
-# CONFIG_FIREWIRE_SERIAL is not set
-# CONFIG_GS_FPGABOOT is not set
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-# CONFIG_FB_TFT is not set
-# CONFIG_WILC1000_SDIO is not set
-# CONFIG_WILC1000_SPI is not set
-# CONFIG_MOST is not set
-# CONFIG_KS7010 is not set
-CONFIG_BCM_VIDEOCORE=m
-# CONFIG_BCM2835_VCHIQ is not set
-# CONFIG_SND_BCM2835 is not set
-# CONFIG_VIDEO_BCM2835 is not set
-# CONFIG_PI433 is not set
-
-#
-# Gasket devices
-#
-# CONFIG_STAGING_GASKET_FRAMEWORK is not set
-# end of Gasket devices
-
-# CONFIG_XIL_AXIS_FIFO is not set
-# CONFIG_FIELDBUS_DEV is not set
-# CONFIG_KPC2000 is not set
-
-#
-# ISDN CAPI drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-# end of ISDN CAPI drivers
-
-# CONFIG_USB_WUSB is not set
-# CONFIG_USB_WUSB_CBAF is not set
-# CONFIG_USB_WHCI_HCD is not set
-# CONFIG_USB_HWA_HCD is not set
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
-CONFIG_EXFAT_FS=m
-CONFIG_EXFAT_DONT_MOUNT_VFAT=y
-CONFIG_EXFAT_DISCARD=y
-# CONFIG_EXFAT_DELAYED_SYNC is not set
-# CONFIG_EXFAT_KERNEL_DEBUG is not set
-# CONFIG_EXFAT_DEBUG_MSG is not set
-CONFIG_EXFAT_DEFAULT_CODEPAGE=437
-CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_QLGE is not set
-# CONFIG_GOLDFISH is not set
-# CONFIG_MFD_CROS_EC is not set
-CONFIG_CHROME_PLATFORMS=y
-# CONFIG_CHROMEOS_TBMC is not set
-# CONFIG_CROS_EC is not set
-# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
-# CONFIG_MELLANOX_PLATFORM is not set
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-
-#
-# Common Clock Framework
-#
-CONFIG_COMMON_CLK_VERSATILE=y
-CONFIG_CLK_SP810=y
-CONFIG_CLK_VEXPRESS_OSC=y
-# CONFIG_CLK_HSDK is not set
-# CONFIG_COMMON_CLK_MAX9485 is not set
-# CONFIG_COMMON_CLK_HI655X is not set
-CONFIG_COMMON_CLK_SCMI=m
-# CONFIG_COMMON_CLK_SI5341 is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-# CONFIG_COMMON_CLK_SI514 is not set
-CONFIG_COMMON_CLK_SI544=m
-# CONFIG_COMMON_CLK_SI570 is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CDCE925 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_CLK_QORIQ is not set
-CONFIG_COMMON_CLK_XGENE=y
-# CONFIG_COMMON_CLK_PWM is not set
-# CONFIG_COMMON_CLK_VC5 is not set
-# CONFIG_COMMON_CLK_FIXED_MMIO is not set
-CONFIG_CLK_BCM2835=y
-# CONFIG_CLK_RASPBERRYPI is not set
-CONFIG_COMMON_CLK_HI3516CV300=y
-# CONFIG_COMMON_CLK_HI3519 is not set
-CONFIG_COMMON_CLK_HI3660=y
-CONFIG_COMMON_CLK_HI3670=y
-CONFIG_COMMON_CLK_HI3798CV200=y
-CONFIG_COMMON_CLK_HI6220=y
-CONFIG_RESET_HISI=y
-# CONFIG_STUB_CLK_HI6220 is not set
-CONFIG_STUB_CLK_HI3660=y
-
-#
-# Clock driver for MediaTek SoC
-#
-CONFIG_COMMON_CLK_MEDIATEK=y
-# CONFIG_COMMON_CLK_MT2712 is not set
-CONFIG_COMMON_CLK_MT6779=y
-# CONFIG_COMMON_CLK_MT6779_MMSYS is not set
-# CONFIG_COMMON_CLK_MT6779_IMGSYS is not set
-# CONFIG_COMMON_CLK_MT6779_IPESYS is not set
-# CONFIG_COMMON_CLK_MT6779_CAMSYS is not set
-# CONFIG_COMMON_CLK_MT6779_VDECSYS is not set
-# CONFIG_COMMON_CLK_MT6779_VENCSYS is not set
-# CONFIG_COMMON_CLK_MT6779_MFGCFG is not set
-# CONFIG_COMMON_CLK_MT6779_AUDSYS is not set
-CONFIG_COMMON_CLK_MT6797=y
-# CONFIG_COMMON_CLK_MT6797_MMSYS is not set
-# CONFIG_COMMON_CLK_MT6797_IMGSYS is not set
-# CONFIG_COMMON_CLK_MT6797_VDECSYS is not set
-# CONFIG_COMMON_CLK_MT6797_VENCSYS is not set
-# CONFIG_COMMON_CLK_MT7622 is not set
-# CONFIG_COMMON_CLK_MT8173 is not set
-CONFIG_COMMON_CLK_MT8183=y
-# CONFIG_COMMON_CLK_MT8183_AUDIOSYS is not set
-# CONFIG_COMMON_CLK_MT8183_CAMSYS is not set
-# CONFIG_COMMON_CLK_MT8183_IMGSYS is not set
-# CONFIG_COMMON_CLK_MT8183_IPU_CORE0 is not set
-# CONFIG_COMMON_CLK_MT8183_IPU_CORE1 is not set
-# CONFIG_COMMON_CLK_MT8183_IPU_ADL is not set
-# CONFIG_COMMON_CLK_MT8183_IPU_CONN is not set
-# CONFIG_COMMON_CLK_MT8183_MFGCFG is not set
-# CONFIG_COMMON_CLK_MT8183_MMSYS is not set
-# CONFIG_COMMON_CLK_MT8183_VDECSYS is not set
-# CONFIG_COMMON_CLK_MT8183_VENCSYS is not set
-CONFIG_COMMON_CLK_MT8516=y
-# CONFIG_COMMON_CLK_MT8516_AUDSYS is not set
-# end of Clock driver for MediaTek SoC
-
-CONFIG_ARMADA_AP_CP_HELPER=y
-CONFIG_ARMADA_37XX_CLK=y
-CONFIG_ARMADA_AP806_SYSCON=y
-CONFIG_ARMADA_CP110_SYSCON=y
-# CONFIG_COMMON_CLK_QCOM is not set
-CONFIG_COMMON_CLK_SAMSUNG=y
-CONFIG_EXYNOS_ARM64_COMMON_CLK=y
-# CONFIG_EXYNOS_AUDSS_CLK_CON is not set
-# CONFIG_SPRD_COMMON_CLK is not set
-CONFIG_CLK_SUNXI=y
-CONFIG_CLK_SUNXI_CLOCKS=y
-CONFIG_CLK_SUNXI_PRCM_SUN6I=y
-CONFIG_CLK_SUNXI_PRCM_SUN8I=y
-CONFIG_CLK_SUNXI_PRCM_SUN9I=y
-CONFIG_SUNXI_CCU=y
-CONFIG_SUN50I_A64_CCU=y
-CONFIG_SUN50I_H6_CCU=y
-CONFIG_SUN50I_H6_R_CCU=y
-# CONFIG_SUN8I_A83T_CCU is not set
-# CONFIG_SUN8I_H3_CCU is not set
-# CONFIG_SUN8I_DE2_CCU is not set
-CONFIG_SUN8I_R_CCU=y
-CONFIG_CLK_TEGRA_BPMP=y
-CONFIG_TEGRA_CLK_DFLL=y
-# CONFIG_COMMON_CLK_ZYNQMP is not set
-# end of Common Clock Framework
-
-# CONFIG_HWSPINLOCK is not set
-
-#
-# Clock Source drivers
-#
-CONFIG_TIMER_OF=y
-CONFIG_TIMER_ACPI=y
-CONFIG_TIMER_PROBE=y
-CONFIG_CLKSRC_MMIO=y
-CONFIG_ROCKCHIP_TIMER=y
-CONFIG_TEGRA_TIMER=y
-CONFIG_ARM_ARCH_TIMER=y
-CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
-CONFIG_FSL_ERRATUM_A008585=y
-CONFIG_HISILICON_ERRATUM_161010101=y
-CONFIG_ARM64_ERRATUM_858921=y
-CONFIG_SUN50I_ERRATUM_UNKNOWN1=y
-CONFIG_ARM_TIMER_SP804=y
-CONFIG_MTK_TIMER=y
-# CONFIG_SPRD_TIMER is not set
-CONFIG_CLKSRC_VERSATILE=y
-# end of Clock Source drivers
-
-CONFIG_MAILBOX=y
-CONFIG_ARM_MHU=m
-CONFIG_PLATFORM_MHU=m
-CONFIG_PL320_MBOX=y
-# CONFIG_ARMADA_37XX_RWTM_MBOX is not set
-CONFIG_ROCKCHIP_MBOX=y
-CONFIG_PCC=y
-# CONFIG_ALTERA_MBOX is not set
-CONFIG_BCM2835_MBOX=m
-CONFIG_HI3660_MBOX=y
-CONFIG_HI6220_MBOX=m
-# CONFIG_MAILBOX_TEST is not set
-# CONFIG_QCOM_APCS_IPC is not set
-CONFIG_TEGRA_HSP_MBOX=y
-CONFIG_XGENE_SLIMPRO_MBOX=y
-# CONFIG_MTK_CMDQ_MBOX is not set
-# CONFIG_ZYNQMP_IPI_MBOX is not set
-CONFIG_IOMMU_IOVA=y
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-CONFIG_IOMMU_IO_PGTABLE=y
-CONFIG_IOMMU_IO_PGTABLE_LPAE=y
-# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
-# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
-# end of Generic IOMMU Pagetable Support
-
-# CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_OF_IOMMU=y
-CONFIG_IOMMU_DMA=y
-# CONFIG_ROCKCHIP_IOMMU is not set
-# CONFIG_TEGRA_IOMMU_SMMU is not set
-# CONFIG_EXYNOS_IOMMU is not set
-CONFIG_ARM_SMMU=y
-CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
-CONFIG_ARM_SMMU_V3=y
-# CONFIG_MTK_IOMMU is not set
-# CONFIG_QCOM_IOMMU is not set
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-CONFIG_RPMSG=m
-# CONFIG_RPMSG_CHAR is not set
-# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
-CONFIG_RPMSG_VIRTIO=m
-# end of Rpmsg drivers
-
-CONFIG_SOUNDWIRE=y
-
-#
-# SoundWire Devices
-#
-
-#
-# SOC (System On Chip) specific Drivers
-#
-
-#
-# Amlogic SoC drivers
-#
-# end of Amlogic SoC drivers
-
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-CONFIG_BCM2835_POWER=y
-# CONFIG_SOC_BRCMSTB is not set
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-# CONFIG_FSL_DPAA is not set
-CONFIG_FSL_GUTS=y
-CONFIG_DPAA2_CONSOLE=y
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-# end of i.MX SoC drivers
-
-#
-# MediaTek SoC drivers
-#
-# CONFIG_MTK_CMDQ is not set
-CONFIG_MTK_INFRACFG=y
-# CONFIG_MTK_PMIC_WRAP is not set
-CONFIG_MTK_SCPSYS=y
-# end of MediaTek SoC drivers
-
-#
-# Qualcomm SoC drivers
-#
-# CONFIG_QCOM_AOSS_QMP is not set
-CONFIG_QCOM_COMMAND_DB=y
-CONFIG_QCOM_GENI_SE=m
-# CONFIG_QCOM_GSBI is not set
-CONFIG_QCOM_LLCC=m
-CONFIG_QCOM_SDM845_LLCC=m
-CONFIG_QCOM_MDT_LOADER=m
-CONFIG_QCOM_QMI_HELPERS=m
-CONFIG_QCOM_RMTFS_MEM=m
-CONFIG_QCOM_RPMH=y
-# CONFIG_QCOM_RPMHPD is not set
-CONFIG_QCOM_SMD_RPM=m
-CONFIG_QCOM_WCNSS_CTRL=m
-# CONFIG_QCOM_APR is not set
-# end of Qualcomm SoC drivers
-
-CONFIG_ROCKCHIP_GRF=y
-# CONFIG_ROCKCHIP_PM_DOMAINS is not set
-CONFIG_SOC_SAMSUNG=y
-CONFIG_EXYNOS_CHIPID=y
-CONFIG_EXYNOS_PMU=y
-CONFIG_EXYNOS_PM_DOMAINS=y
-CONFIG_SUNXI_SRAM=y
-CONFIG_ARCH_TEGRA_132_SOC=y
-CONFIG_ARCH_TEGRA_210_SOC=y
-# CONFIG_ARCH_TEGRA_186_SOC is not set
-CONFIG_ARCH_TEGRA_194_SOC=y
-CONFIG_SOC_TEGRA_FUSE=y
-CONFIG_SOC_TEGRA_FLOWCTRL=y
-CONFIG_SOC_TEGRA_PMC=y
-CONFIG_SOC_TEGRA_POWERGATE_BPMP=y
-# CONFIG_SOC_TI is not set
-
-#
-# Xilinx SoC drivers
-#
-CONFIG_XILINX_VCU=m
-CONFIG_ZYNQMP_POWER=y
-CONFIG_ZYNQMP_PM_DOMAINS=y
-# end of Xilinx SoC drivers
-# end of SOC (System On Chip) specific Drivers
-
-CONFIG_PM_DEVFREQ=y
-
-#
-# DEVFREQ Governors
-#
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
-CONFIG_DEVFREQ_GOV_PERFORMANCE=m
-CONFIG_DEVFREQ_GOV_POWERSAVE=m
-CONFIG_DEVFREQ_GOV_USERSPACE=m
-# CONFIG_DEVFREQ_GOV_PASSIVE is not set
-
-#
-# DEVFREQ Drivers
-#
-# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
-# CONFIG_ARM_TEGRA_DEVFREQ is not set
-CONFIG_ARM_RK3399_DMC_DEVFREQ=m
-CONFIG_PM_DEVFREQ_EVENT=y
-# CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP is not set
-# CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU is not set
-CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
-CONFIG_EXTCON=y
-
-#
-# Extcon Device Drivers
-#
-# CONFIG_EXTCON_ADC_JACK is not set
-# CONFIG_EXTCON_FSA9480 is not set
-CONFIG_EXTCON_GPIO=m
-# CONFIG_EXTCON_MAX3355 is not set
-# CONFIG_EXTCON_PTN5150 is not set
-# CONFIG_EXTCON_QCOM_SPMI_MISC is not set
-# CONFIG_EXTCON_RT8973A is not set
-# CONFIG_EXTCON_SM5502 is not set
-# CONFIG_EXTCON_USB_GPIO is not set
-CONFIG_MEMORY=y
-# CONFIG_ARM_PL172_MPMC is not set
-CONFIG_TEGRA_MC=y
-CONFIG_IIO=m
-CONFIG_IIO_BUFFER=y
-CONFIG_IIO_BUFFER_CB=m
-# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
-# CONFIG_IIO_CONFIGFS is not set
-CONFIG_IIO_TRIGGER=y
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-# CONFIG_IIO_SW_DEVICE is not set
-# CONFIG_IIO_SW_TRIGGER is not set
-
-#
-# Accelerometers
-#
-# CONFIG_ADIS16201 is not set
-# CONFIG_ADIS16209 is not set
-# CONFIG_ADXL372_SPI is not set
-# CONFIG_ADXL372_I2C is not set
-# CONFIG_BMA180 is not set
-# CONFIG_BMA220 is not set
-# CONFIG_BMC150_ACCEL is not set
-# CONFIG_DA280 is not set
-# CONFIG_DA311 is not set
-# CONFIG_DMARD06 is not set
-# CONFIG_DMARD09 is not set
-# CONFIG_DMARD10 is not set
-CONFIG_HID_SENSOR_ACCEL_3D=m
-# CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_KXSD9 is not set
-# CONFIG_KXCJK1013 is not set
-# CONFIG_MC3230 is not set
-# CONFIG_MMA7455_I2C is not set
-# CONFIG_MMA7455_SPI is not set
-# CONFIG_MMA7660 is not set
-# CONFIG_MMA8452 is not set
-# CONFIG_MMA9551 is not set
-# CONFIG_MMA9553 is not set
-# CONFIG_MXC4005 is not set
-# CONFIG_MXC6255 is not set
-# CONFIG_SCA3000 is not set
-# CONFIG_STK8312 is not set
-# CONFIG_STK8BA50 is not set
-# end of Accelerometers
-
-#
-# Analog to digital converters
-#
-# CONFIG_AD7124 is not set
-# CONFIG_AD7266 is not set
-# CONFIG_AD7291 is not set
-# CONFIG_AD7298 is not set
-# CONFIG_AD7476 is not set
-# CONFIG_AD7606_IFACE_PARALLEL is not set
-# CONFIG_AD7606_IFACE_SPI is not set
-# CONFIG_AD7766 is not set
-# CONFIG_AD7768_1 is not set
-# CONFIG_AD7780 is not set
-# CONFIG_AD7791 is not set
-# CONFIG_AD7793 is not set
-# CONFIG_AD7887 is not set
-# CONFIG_AD7923 is not set
-# CONFIG_AD7949 is not set
-# CONFIG_AD799X is not set
-# CONFIG_AXP20X_ADC is not set
-# CONFIG_AXP288_ADC is not set
-# CONFIG_BERLIN2_ADC is not set
-# CONFIG_CC10001_ADC is not set
-# CONFIG_ENVELOPE_DETECTOR is not set
-# CONFIG_EXYNOS_ADC is not set
-# CONFIG_HI8435 is not set
-# CONFIG_HX711 is not set
-# CONFIG_INA2XX_ADC is not set
-# CONFIG_LTC2471 is not set
-# CONFIG_LTC2485 is not set
-# CONFIG_LTC2497 is not set
-# CONFIG_MAX1027 is not set
-# CONFIG_MAX11100 is not set
-# CONFIG_MAX1118 is not set
-# CONFIG_MAX1363 is not set
-# CONFIG_MAX9611 is not set
-# CONFIG_MCP320X is not set
-# CONFIG_MCP3422 is not set
-# CONFIG_MCP3911 is not set
-# CONFIG_MEDIATEK_MT6577_AUXADC is not set
-# CONFIG_NAU7802 is not set
-# CONFIG_ROCKCHIP_SARADC is not set
-# CONFIG_SD_ADC_MODULATOR is not set
-# CONFIG_TI_ADC081C is not set
-# CONFIG_TI_ADC0832 is not set
-# CONFIG_TI_ADC084S021 is not set
-# CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC108S102 is not set
-# CONFIG_TI_ADC128S052 is not set
-# CONFIG_TI_ADC161S626 is not set
-# CONFIG_TI_ADS1015 is not set
-# CONFIG_TI_ADS7950 is not set
-# CONFIG_TI_ADS8344 is not set
-# CONFIG_TI_ADS8688 is not set
-# CONFIG_TI_ADS124S08 is not set
-# CONFIG_TI_TLC4541 is not set
-# CONFIG_VF610_ADC is not set
-# CONFIG_XILINX_XADC is not set
-# end of Analog to digital converters
-
-#
-# Analog Front Ends
-#
-# CONFIG_IIO_RESCALE is not set
-# end of Analog Front Ends
-
-#
-# Amplifiers
-#
-# CONFIG_AD8366 is not set
-# end of Amplifiers
-
-#
-# Chemical Sensors
-#
-# CONFIG_ATLAS_PH_SENSOR is not set
-# CONFIG_BME680 is not set
-# CONFIG_CCS811 is not set
-# CONFIG_IAQCORE is not set
-# CONFIG_SENSIRION_SGP30 is not set
-# CONFIG_SPS30 is not set
-# CONFIG_VZ89X is not set
-# end of Chemical Sensors
-
-#
-# Hid Sensor IIO Common
-#
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-# end of Hid Sensor IIO Common
-
-#
-# SSP Sensor Common
-#
-# CONFIG_IIO_SSP_SENSORHUB is not set
-# end of SSP Sensor Common
-
-#
-# Digital to analog converters
-#
-# CONFIG_AD5064 is not set
-# CONFIG_AD5360 is not set
-# CONFIG_AD5380 is not set
-# CONFIG_AD5421 is not set
-# CONFIG_AD5446 is not set
-# CONFIG_AD5449 is not set
-# CONFIG_AD5592R is not set
-# CONFIG_AD5593R is not set
-# CONFIG_AD5504 is not set
-# CONFIG_AD5624R_SPI is not set
-# CONFIG_LTC1660 is not set
-# CONFIG_LTC2632 is not set
-# CONFIG_AD5686_SPI is not set
-# CONFIG_AD5696_I2C is not set
-# CONFIG_AD5755 is not set
-# CONFIG_AD5758 is not set
-# CONFIG_AD5761 is not set
-# CONFIG_AD5764 is not set
-# CONFIG_AD5791 is not set
-# CONFIG_AD7303 is not set
-# CONFIG_AD8801 is not set
-# CONFIG_DPOT_DAC is not set
-# CONFIG_DS4424 is not set
-# CONFIG_M62332 is not set
-# CONFIG_MAX517 is not set
-# CONFIG_MAX5821 is not set
-# CONFIG_MCP4725 is not set
-# CONFIG_MCP4922 is not set
-# CONFIG_TI_DAC082S085 is not set
-# CONFIG_TI_DAC5571 is not set
-# CONFIG_TI_DAC7311 is not set
-# CONFIG_TI_DAC7612 is not set
-# CONFIG_VF610_DAC is not set
-# end of Digital to analog converters
-
-#
-# IIO dummy driver
-#
-# end of IIO dummy driver
-
-#
-# Frequency Synthesizers DDS/PLL
-#
-
-#
-# Clock Generator/Distribution
-#
-# CONFIG_AD9523 is not set
-# end of Clock Generator/Distribution
-
-#
-# Phase-Locked Loop (PLL) frequency synthesizers
-#
-# CONFIG_ADF4350 is not set
-# CONFIG_ADF4371 is not set
-# end of Phase-Locked Loop (PLL) frequency synthesizers
-# end of Frequency Synthesizers DDS/PLL
-
-#
-# Digital gyroscope sensors
-#
-# CONFIG_ADIS16080 is not set
-# CONFIG_ADIS16130 is not set
-# CONFIG_ADIS16136 is not set
-# CONFIG_ADIS16260 is not set
-# CONFIG_ADXRS450 is not set
-# CONFIG_BMG160 is not set
-# CONFIG_FXAS21002C is not set
-CONFIG_HID_SENSOR_GYRO_3D=m
-# CONFIG_MPU3050_I2C is not set
-# CONFIG_IIO_ST_GYRO_3AXIS is not set
-# CONFIG_ITG3200 is not set
-# end of Digital gyroscope sensors
-
-#
-# Health Sensors
-#
-
-#
-# Heart Rate Monitors
-#
-# CONFIG_AFE4403 is not set
-# CONFIG_AFE4404 is not set
-# CONFIG_MAX30100 is not set
-# CONFIG_MAX30102 is not set
-# end of Heart Rate Monitors
-# end of Health Sensors
-
-#
-# Humidity sensors
-#
-# CONFIG_AM2315 is not set
-# CONFIG_DHT11 is not set
-# CONFIG_HDC100X is not set
-CONFIG_HID_SENSOR_HUMIDITY=m
-# CONFIG_HTS221 is not set
-# CONFIG_HTU21 is not set
-# CONFIG_SI7005 is not set
-# CONFIG_SI7020 is not set
-# end of Humidity sensors
-
-#
-# Inertial measurement units
-#
-# CONFIG_ADIS16400 is not set
-# CONFIG_ADIS16460 is not set
-# CONFIG_ADIS16480 is not set
-# CONFIG_BMI160_I2C is not set
-# CONFIG_BMI160_SPI is not set
-# CONFIG_KMX61 is not set
-# CONFIG_INV_MPU6050_I2C is not set
-# CONFIG_INV_MPU6050_SPI is not set
-# CONFIG_IIO_ST_LSM6DSX is not set
-# end of Inertial measurement units
-
-#
-# Light sensors
-#
-# CONFIG_ACPI_ALS is not set
-# CONFIG_ADJD_S311 is not set
-# CONFIG_AL3320A is not set
-# CONFIG_APDS9300 is not set
-# CONFIG_APDS9960 is not set
-# CONFIG_BH1750 is not set
-# CONFIG_BH1780 is not set
-# CONFIG_CM32181 is not set
-# CONFIG_CM3232 is not set
-# CONFIG_CM3323 is not set
-# CONFIG_CM3605 is not set
-# CONFIG_CM36651 is not set
-# CONFIG_GP2AP020A00F is not set
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
-# CONFIG_ISL29125 is not set
-CONFIG_HID_SENSOR_ALS=m
-CONFIG_HID_SENSOR_PROX=m
-# CONFIG_JSA1212 is not set
-# CONFIG_RPR0521 is not set
-# CONFIG_LTR501 is not set
-# CONFIG_LV0104CS is not set
-# CONFIG_MAX44000 is not set
-# CONFIG_MAX44009 is not set
-# CONFIG_NOA1305 is not set
-# CONFIG_OPT3001 is not set
-# CONFIG_PA12203001 is not set
-# CONFIG_SI1133 is not set
-# CONFIG_SI1145 is not set
-# CONFIG_STK3310 is not set
-# CONFIG_ST_UVIS25 is not set
-# CONFIG_TCS3414 is not set
-# CONFIG_TCS3472 is not set
-# CONFIG_SENSORS_TSL2563 is not set
-# CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
-# CONFIG_TSL4531 is not set
-# CONFIG_US5182D is not set
-# CONFIG_VCNL4000 is not set
-# CONFIG_VCNL4035 is not set
-# CONFIG_VEML6070 is not set
-# CONFIG_VL6180 is not set
-# CONFIG_ZOPT2201 is not set
-# end of Light sensors
-
-#
-# Magnetometer sensors
-#
-# CONFIG_AK8974 is not set
-# CONFIG_AK8975 is not set
-# CONFIG_AK09911 is not set
-# CONFIG_BMC150_MAGN_I2C is not set
-# CONFIG_BMC150_MAGN_SPI is not set
-# CONFIG_MAG3110 is not set
-CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
-# CONFIG_MMC35240 is not set
-# CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_SENSORS_HMC5843_I2C is not set
-# CONFIG_SENSORS_HMC5843_SPI is not set
-# CONFIG_SENSORS_RM3100_I2C is not set
-# CONFIG_SENSORS_RM3100_SPI is not set
-# end of Magnetometer sensors
-
-#
-# Multiplexers
-#
-# CONFIG_IIO_MUX is not set
-# end of Multiplexers
-
-#
-# Inclinometer sensors
-#
-CONFIG_HID_SENSOR_INCLINOMETER_3D=m
-CONFIG_HID_SENSOR_DEVICE_ROTATION=m
-# end of Inclinometer sensors
-
-#
-# Triggers - standalone
-#
-# CONFIG_IIO_INTERRUPT_TRIGGER is not set
-# CONFIG_IIO_SYSFS_TRIGGER is not set
-# end of Triggers - standalone
-
-#
-# Digital potentiometers
-#
-# CONFIG_AD5272 is not set
-# CONFIG_DS1803 is not set
-# CONFIG_MAX5432 is not set
-# CONFIG_MAX5481 is not set
-# CONFIG_MAX5487 is not set
-# CONFIG_MCP4018 is not set
-# CONFIG_MCP4131 is not set
-# CONFIG_MCP4531 is not set
-# CONFIG_MCP41010 is not set
-# CONFIG_TPL0102 is not set
-# end of Digital potentiometers
-
-#
-# Digital potentiostats
-#
-# CONFIG_LMP91000 is not set
-# end of Digital potentiostats
-
-#
-# Pressure sensors
-#
-# CONFIG_ABP060MG is not set
-# CONFIG_BMP280 is not set
-# CONFIG_DPS310 is not set
-CONFIG_HID_SENSOR_PRESS=m
-# CONFIG_HP03 is not set
-# CONFIG_MPL115_I2C is not set
-# CONFIG_MPL115_SPI is not set
-# CONFIG_MPL3115 is not set
-# CONFIG_MS5611 is not set
-# CONFIG_MS5637 is not set
-# CONFIG_IIO_ST_PRESS is not set
-# CONFIG_T5403 is not set
-# CONFIG_HP206C is not set
-# CONFIG_ZPA2326 is not set
-# end of Pressure sensors
-
-#
-# Lightning sensors
-#
-# CONFIG_AS3935 is not set
-# end of Lightning sensors
-
-#
-# Proximity and distance sensors
-#
-# CONFIG_ISL29501 is not set
-# CONFIG_LIDAR_LITE_V2 is not set
-# CONFIG_MB1232 is not set
-# CONFIG_RFD77402 is not set
-# CONFIG_SRF04 is not set
-# CONFIG_SX9500 is not set
-# CONFIG_SRF08 is not set
-# CONFIG_VL53L0X_I2C is not set
-# end of Proximity and distance sensors
-
-#
-# Resolver to digital converters
-#
-# CONFIG_AD2S90 is not set
-# CONFIG_AD2S1200 is not set
-# end of Resolver to digital converters
-
-#
-# Temperature sensors
-#
-# CONFIG_MAXIM_THERMOCOUPLE is not set
-CONFIG_HID_SENSOR_TEMP=m
-# CONFIG_MLX90614 is not set
-# CONFIG_MLX90632 is not set
-# CONFIG_TMP006 is not set
-# CONFIG_TMP007 is not set
-# CONFIG_TSYS01 is not set
-# CONFIG_TSYS02D is not set
-# CONFIG_MAX31856 is not set
-# end of Temperature sensors
-
-CONFIG_NTB=m
-# CONFIG_NTB_MSI is not set
-# CONFIG_NTB_IDT is not set
-CONFIG_NTB_SWITCHTEC=m
-CONFIG_NTB_PINGPONG=m
-# CONFIG_NTB_TOOL is not set
-CONFIG_NTB_PERF=m
-CONFIG_NTB_TRANSPORT=m
-# CONFIG_VME_BUS is not set
-CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
-CONFIG_PWM_BCM2835=m
-# CONFIG_PWM_BERLIN is not set
-# CONFIG_PWM_FSL_FTM is not set
-# CONFIG_PWM_HIBVT is not set
-# CONFIG_PWM_MTK_DISP is not set
-# CONFIG_PWM_MEDIATEK is not set
-CONFIG_PWM_PCA9685=m
-# CONFIG_PWM_ROCKCHIP is not set
-# CONFIG_PWM_SAMSUNG is not set
-# CONFIG_PWM_SPRD is not set
-CONFIG_PWM_SUN4I=m
-# CONFIG_PWM_TEGRA is not set
-
-#
-# IRQ chip support
-#
-CONFIG_IRQCHIP=y
-CONFIG_ARM_GIC=y
-CONFIG_ARM_GIC_PM=y
-CONFIG_ARM_GIC_MAX_NR=1
-CONFIG_ARM_GIC_V2M=y
-CONFIG_ARM_GIC_V3=y
-CONFIG_ARM_GIC_V3_ITS=y
-CONFIG_ARM_GIC_V3_ITS_PCI=y
-# CONFIG_AL_FIC is not set
-CONFIG_DW_APB_ICTL=y
-CONFIG_HISILICON_IRQ_MBIGEN=y
-CONFIG_MVEBU_GICP=y
-CONFIG_MVEBU_ICU=y
-CONFIG_MVEBU_ODMI=y
-CONFIG_MVEBU_PIC=y
-CONFIG_MVEBU_SEI=y
-CONFIG_LS_SCFG_MSI=y
-CONFIG_PARTITION_PERCPU=y
-# CONFIG_QCOM_IRQ_COMBINER is not set
-CONFIG_QCOM_PDC=y
-# end of IRQ chip support
-
-# CONFIG_IPACK_BUS is not set
-CONFIG_ARCH_HAS_RESET_CONTROLLER=y
-CONFIG_RESET_CONTROLLER=y
-CONFIG_RESET_BERLIN=y
-CONFIG_RESET_QCOM_AOSS=y
-# CONFIG_RESET_QCOM_PDC is not set
-CONFIG_RESET_SCMI=y
-CONFIG_RESET_SIMPLE=y
-CONFIG_RESET_SUNXI=y
-# CONFIG_RESET_TI_SYSCON is not set
-CONFIG_COMMON_RESET_HI3660=y
-CONFIG_COMMON_RESET_HI6220=m
-CONFIG_RESET_TEGRA_BPMP=y
-
-#
-# PHY Subsystem
-#
-CONFIG_GENERIC_PHY=y
-CONFIG_GENERIC_PHY_MIPI_DPHY=y
-CONFIG_PHY_XGENE=m
-# CONFIG_PHY_SUN4I_USB is not set
-CONFIG_PHY_SUN6I_MIPI_DPHY=m
-# CONFIG_PHY_SUN9I_USB is not set
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_CADENCE_DP is not set
-# CONFIG_PHY_CADENCE_DPHY is not set
-# CONFIG_PHY_CADENCE_SIERRA is not set
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-CONFIG_PHY_HI6220_USB=m
-# CONFIG_PHY_HI3660_USB is not set
-CONFIG_PHY_HISTB_COMBPHY=m
-CONFIG_PHY_HISI_INNO_USB2=m
-# CONFIG_PHY_BERLIN_SATA is not set
-# CONFIG_PHY_BERLIN_USB is not set
-CONFIG_PHY_MVEBU_A3700_COMPHY=y
-CONFIG_PHY_MVEBU_A3700_UTMI=y
-# CONFIG_PHY_MVEBU_A38X_COMPHY is not set
-# CONFIG_PHY_MVEBU_CP110_COMPHY is not set
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_MTK_TPHY is not set
-# CONFIG_PHY_MTK_UFS is not set
-# CONFIG_PHY_MTK_XSPHY is not set
-# CONFIG_PHY_CPCAP_USB is not set
-# CONFIG_PHY_MAPPHONE_MDM6600 is not set
-# CONFIG_PHY_OCELOT_SERDES is not set
-# CONFIG_PHY_QCOM_APQ8064_SATA is not set
-# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
-# CONFIG_PHY_QCOM_PCIE2 is not set
-# CONFIG_PHY_QCOM_QMP is not set
-# CONFIG_PHY_QCOM_QUSB2 is not set
-# CONFIG_PHY_QCOM_UFS is not set
-CONFIG_PHY_ROCKCHIP_DP=m
-CONFIG_PHY_ROCKCHIP_EMMC=m
-# CONFIG_PHY_ROCKCHIP_INNO_HDMI is not set
-CONFIG_PHY_ROCKCHIP_INNO_USB2=m
-CONFIG_PHY_ROCKCHIP_PCIE=m
-CONFIG_PHY_ROCKCHIP_TYPEC=m
-# CONFIG_PHY_ROCKCHIP_USB is not set
-CONFIG_PHY_EXYNOS_DP_VIDEO=y
-CONFIG_PHY_EXYNOS_MIPI_VIDEO=y
-# CONFIG_PHY_EXYNOS_PCIE is not set
-CONFIG_PHY_TEGRA_XUSB=m
-# CONFIG_PHY_TEGRA194_P2U is not set
-# end of PHY Subsystem
-
-# CONFIG_POWERCAP is not set
-# CONFIG_MCB is not set
-
-#
-# Performance monitor support
-#
-CONFIG_ARM_CCI_PMU=y
-# CONFIG_ARM_CCI400_PMU is not set
-CONFIG_ARM_CCI5xx_PMU=y
-# CONFIG_ARM_CCN is not set
-CONFIG_ARM_PMU=y
-CONFIG_ARM_PMU_ACPI=y
-# CONFIG_ARM_SMMU_V3_PMU is not set
-CONFIG_ARM_DSU_PMU=m
-CONFIG_HISI_PMU=y
-# CONFIG_QCOM_L2_PMU is not set
-# CONFIG_QCOM_L3_PMU is not set
-CONFIG_THUNDERX2_PMU=m
-CONFIG_XGENE_PMU=y
-CONFIG_ARM_SPE_PMU=m
-# end of Performance monitor support
-
-CONFIG_RAS=y
-
-#
-# Android
-#
-CONFIG_ANDROID=y
-CONFIG_ANDROID_BINDER_IPC=y
-# CONFIG_ANDROID_BINDERFS is not set
-CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
-CONFIG_ANDROID_BINDER_IPC_SELFTEST=y
-# end of Android
-
-CONFIG_LIBNVDIMM=y
-CONFIG_BLK_DEV_PMEM=m
-CONFIG_ND_BLK=y
-CONFIG_ND_CLAIM=y
-CONFIG_ND_BTT=y
-CONFIG_BTT=y
-CONFIG_OF_PMEM=m
-CONFIG_DAX_DRIVER=y
-CONFIG_DAX=y
-CONFIG_DEV_DAX=m
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SYSFS=y
-# CONFIG_MTK_EFUSE is not set
-CONFIG_QCOM_QFPROM=m
-CONFIG_ROCKCHIP_EFUSE=m
-CONFIG_NVMEM_SUNXI_SID=m
-# CONFIG_NVMEM_ZYNQMP is not set
-
-#
-# HW tracing support
-#
-# CONFIG_STM is not set
-# CONFIG_INTEL_TH is not set
-# end of HW tracing support
-
-# CONFIG_FPGA is not set
-# CONFIG_FSI is not set
-# CONFIG_TEE is not set
-CONFIG_PM_OPP=y
-# CONFIG_SIOX is not set
-CONFIG_SLIMBUS=m
-CONFIG_SLIM_QCOM_CTRL=m
-# CONFIG_SLIM_QCOM_NGD_CTRL is not set
-# CONFIG_INTERCONNECT is not set
-# CONFIG_COUNTER is not set
-# end of Device Drivers
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-# CONFIG_VALIDATE_FS_PARSER is not set
-CONFIG_FS_IOMAP=y
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-# CONFIG_REISERFS_FS_SECURITY is not set
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-CONFIG_XFS_ONLINE_SCRUB=y
-# CONFIG_XFS_ONLINE_REPAIR is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-# CONFIG_OCFS2_FS_STATS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_FS_REF_VERIFY is not set
-CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=m
-# CONFIG_F2FS_STAT_FS is not set
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-# CONFIG_F2FS_FS_SECURITY is not set
-# CONFIG_F2FS_CHECK_FS is not set
-# CONFIG_F2FS_IO_TRACE is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_FS_DAX is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=m
-CONFIG_EXPORTFS_BLOCK_OPS=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_MANDATORY_FILE_LOCKING is not set
-CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_DNOTIFY is not set
-CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_AUTOFS_FS=m
-CONFIG_FUSE_FS=m
-# CONFIG_CUSE is not set
-CONFIG_VIRTIO_FS=m
-CONFIG_OVERLAY_FS=m
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
-# CONFIG_OVERLAY_FS_INDEX is not set
-# CONFIG_OVERLAY_FS_XINO_AUTO is not set
-# CONFIG_OVERLAY_FS_METACOPY is not set
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_FAT_DEFAULT_UTF8 is not set
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-# end of DOS/FAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-# CONFIG_PROC_KCORE is not set
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PROC_CHILDREN is not set
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-# CONFIG_HUGETLBFS is not set
-CONFIG_MEMFD_CREATE=y
-CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
-CONFIG_CONFIGFS_FS=m
-CONFIG_EFIVAR_FS=m
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_ORANGEFS_FS=m
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-CONFIG_EFS_FS=m
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_FS_XATTR=y
-CONFIG_JFFS2_FS_POSIX_ACL=y
-CONFIG_JFFS2_FS_SECURITY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RTIME=y
-CONFIG_JFFS2_RUBIN=y
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-CONFIG_UBIFS_FS=m
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
-# CONFIG_UBIFS_ATIME_SUPPORT is not set
-CONFIG_UBIFS_FS_XATTR=y
-CONFIG_UBIFS_FS_SECURITY=y
-# CONFIG_UBIFS_FS_AUTHENTICATION is not set
-# CONFIG_CRAMFS is not set
-CONFIG_SQUASHFS=m
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZSTD is not set
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-CONFIG_HPFS_FS=m
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-CONFIG_ROMFS_FS=m
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
-# CONFIG_ROMFS_BACKED_BY_MTD is not set
-# CONFIG_ROMFS_BACKED_BY_BOTH is not set
-CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_PSTORE=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=y
-# CONFIG_PSTORE_LZO_COMPRESS is not set
-# CONFIG_PSTORE_LZ4_COMPRESS is not set
-# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
-# CONFIG_PSTORE_842_COMPRESS is not set
-# CONFIG_PSTORE_ZSTD_COMPRESS is not set
-CONFIG_PSTORE_COMPRESS=y
-CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
-CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-# CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-# CONFIG_EROFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
-# CONFIG_NFS_V4_1_MIGRATION is not set
-CONFIG_NFS_V4_SECURITY_LABEL=y
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_BLOCKLAYOUT=y
-CONFIG_NFSD_SCSILAYOUT=y
-CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFSD_V4_SECURITY_LABEL is not set
-CONFIG_GRACE_PERIOD=m
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
-# CONFIG_SUNRPC_DEBUG is not set
-CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CEPH_FS_POSIX_ACL=y
-# CONFIG_CEPH_FS_SECURITY_LABEL is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_UPCALL is not set
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_DEBUG=y
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
-CONFIG_CIFS_DFS_UPCALL=y
-# CONFIG_CIFS_SMB_DIRECT is not set
-CONFIG_CIFS_FSCACHE=y
-CONFIG_CODA_FS=m
-# CONFIG_AFS_FS is not set
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-# CONFIG_9P_FS_SECURITY is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-# CONFIG_UNICODE is not set
-# end of File systems
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_COMPAT=y
-CONFIG_KEYS_REQUEST_CACHE=y
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_KEY_DH_OPERATIONS=y
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_INFINIBAND is not set
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_HARDENED_USERCOPY_FALLBACK=y
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
-CONFIG_FORTIFY_SOURCE=y
-# CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_HASH=y
-CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
-# CONFIG_SECURITY_APPARMOR_DEBUG is not set
-# CONFIG_SECURITY_LOADPIN is not set
-CONFIG_SECURITY_YAMA=y
-# CONFIG_SECURITY_SAFESETID is not set
-# CONFIG_SECURITY_LOCKDOWN_LSM is not set
-# CONFIG_INTEGRITY is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=m
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_KPP=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_SIMD=m
-CONFIG_CRYPTO_ENGINE=m
-
-#
-# Public-key cryptography
-#
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECC=m
-CONFIG_CRYPTO_ECDH=m
-# CONFIG_CRYPTO_ECRDSA is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128_SIMD=y
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CFB=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=m
-# CONFIG_CRYPTO_OFB is not set
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m
-CONFIG_CRYPTO_NHPOLY1305=m
-# CONFIG_CRYPTO_ADIANTUM is not set
-CONFIG_CRYPTO_ESSIV=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32=m
-# CONFIG_CRYPTO_XXHASH is not set
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_AES_TI=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=m
-CONFIG_CRYPTO_842=m
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-CONFIG_CRYPTO_ZSTD=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=m
-CONFIG_CRYPTO_DRBG_HMAC=y
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-CONFIG_CRYPTO_DRBG=m
-CONFIG_CRYPTO_JITTERENTROPY=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
-CONFIG_CRYPTO_HASH_INFO=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_MARVELL_CESA=m
-CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON=m
-CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
-CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC=m
-CONFIG_CRYPTO_DEV_FSL_CAAM=m
-# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
-CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
-CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
-# CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set
-CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
-# CONFIG_CRYPTO_DEV_EXYNOS_RNG is not set
-CONFIG_CRYPTO_DEV_S5P=m
-# CONFIG_CRYPTO_DEV_EXYNOS_HASH is not set
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_SP_CCP=y
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
-CONFIG_CRYPTO_DEV_CPT=m
-CONFIG_CAVIUM_CPT=m
-CONFIG_CRYPTO_DEV_NITROX=m
-CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
-CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m
-CONFIG_CRYPTO_DEV_QCE=m
-CONFIG_CRYPTO_DEV_QCOM_RNG=m
-CONFIG_CRYPTO_DEV_ROCKCHIP=m
-CONFIG_CRYPTO_DEV_CHELSIO=m
-CONFIG_CRYPTO_DEV_VIRTIO=m
-# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
-# CONFIG_CRYPTO_DEV_CCREE is not set
-# CONFIG_CRYPTO_DEV_HISI_SEC is not set
-# CONFIG_CRYPTO_DEV_HISI_ZIP is not set
-CONFIG_ASYMMETRIC_KEY_TYPE=y
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-# CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE is not set
-CONFIG_X509_CERTIFICATE_PARSER=y
-# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set
-CONFIG_PKCS7_MESSAGE_PARSER=y
-# CONFIG_PKCS7_TEST_KEY is not set
-CONFIG_SIGNED_PE_FILE_VERIFICATION=y
-
-#
-# Certificates for signature checking
-#
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
-CONFIG_SECONDARY_TRUSTED_KEYRING=y
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-# end of Certificates for signature checking
-
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_RAID6_PQ_BENCHMARK=y
-# CONFIG_PACKING is not set
-CONFIG_BITREVERSE=y
-CONFIG_HAVE_ARCH_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_CORDIC=m
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
-CONFIG_INDIRECT_PIO=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=m
-# CONFIG_CRC4 is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_XXHASH=y
-CONFIG_AUDIT_GENERIC=y
-CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
-CONFIG_AUDIT_COMPAT_GENERIC=y
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_842_COMPRESS=m
-CONFIG_842_DECOMPRESS=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_COMPRESS=m
-CONFIG_ZSTD_DECOMPRESS=m
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_INTERVAL_TREE=y
-CONFIG_XARRAY_MULTI=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_DMA_DECLARE_COHERENT=y
-CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
-CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
-CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
-CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
-CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
-CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y
-CONFIG_DMA_VIRT_OPS=y
-CONFIG_SWIOTLB=y
-CONFIG_DMA_REMAP=y
-CONFIG_DMA_DIRECT_REMAP=y
-CONFIG_DMA_CMA=y
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=16
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
-CONFIG_CLZ_TAB=y
-CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=y
-CONFIG_DIMLIB=y
-CONFIG_LIBFDT=y
-CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=y
-CONFIG_HAVE_GENERIC_VDSO=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_FONT_SUPPORT=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-CONFIG_SG_POOL=y
-CONFIG_SBITMAP=y
-# CONFIG_STRING_SELFTEST is not set
-# end of Library routines
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-# CONFIG_PRINTK_CALLER is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=3
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# end of printk and dmesg options
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1280
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_INSTALL is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# end of Compile-time checks and compiler options
-
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_MAGIC_SYSRQ_SERIAL=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_OWNER is not set
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=16000
-# CONFIG_DEBUG_KMEMLEAK_TEST is not set
-CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
-CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN=y
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_ARCH_KASAN=y
-CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
-CONFIG_CC_HAS_KASAN_GENERIC=y
-# CONFIG_KASAN is not set
-CONFIG_KASAN_STACK=1
-# end of Memory Debugging
-
-CONFIG_ARCH_HAS_KCOV=y
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
-CONFIG_DEBUG_SHIRQ=y
-
-#
-# Debug Lockups and Hangs
-#
-# CONFIG_SOFTLOCKUP_DETECTOR is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_WQ_WATCHDOG is not set
-# end of Debug Lockups and Hangs
-
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-CONFIG_SCHEDSTATS=y
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-# end of Lock Debugging (spinlocks, mutexes, etc...)
-
-CONFIG_STACKTRACE=y
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_HAVE_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# end of RCU Debugging
-
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-CONFIG_FUNCTION_ERROR_INJECTION=y
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_LATENCYTOP=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_PREEMPTIRQ_EVENTS is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-CONFIG_HWLAT_TRACER=y
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_KPROBE_EVENTS=y
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_DYNAMIC_FTRACE=y
-# CONFIG_FUNCTION_PROFILER is not set
-# CONFIG_BPF_KPROBE_OVERRIDE is not set
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_RUNTIME_TESTING_MENU is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_IO_STRICT_DEVMEM=y
-# CONFIG_ARM64_PTDUMP_DEBUGFS is not set
-# CONFIG_PID_IN_CONTEXTIDR is not set
-# CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
-# CONFIG_DEBUG_WX is not set
-# CONFIG_DEBUG_ALIGN_RODATA is not set
-# CONFIG_ARM64_RELOC_TEST is not set
-# CONFIG_CORESIGHT is not set
-# end of Kernel hacking
diff --git a/main/linux-lts/config-lts.armv7 b/main/linux-lts/config-lts.armv7
deleted file mode 100644
index abb550d0cec..00000000000
--- a/main/linux-lts/config-lts.armv7
+++ /dev/null
@@ -1,7786 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.4.23 Kernel Configuration
-#
-
-#
-# Compiler: gcc (Alpine 9.2.0) 9.2.0
-#
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-# CONFIG_HEADER_TEST is not set
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT=""
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-# CONFIG_USELIB is not set
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_HANDLE_DOMAIN_IRQ=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
-# end of IRQ subsystem
-
-CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_ARCH_HAS_TICK_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-# end of Timers subsystem
-
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_HAVE_SCHED_AVG_IRQ=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_PSI=y
-CONFIG_PSI_DEFAULT_DISABLED=y
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-CONFIG_IKCONFIG=m
-CONFIG_IKCONFIG_PROC=y
-# CONFIG_IKHEADERS is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-CONFIG_GENERIC_SCHED_CLOCK=y
-
-#
-# Scheduler features
-#
-# CONFIG_UCLAMP_TASK is not set
-# end of Scheduler features
-
-CONFIG_CGROUPS=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-# CONFIG_MEMCG_SWAP is not set
-CONFIG_MEMCG_KMEM=y
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-# CONFIG_CFS_BANDWIDTH is not set
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
-CONFIG_CGROUP_FREEZER=y
-# CONFIG_CPUSETS is not set
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-# CONFIG_CGROUP_PERF is not set
-CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-# CONFIG_CHECKPOINT_RESTORE is not set
-CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_HAVE_UID16=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_MULTIUSER=y
-# CONFIG_SGETMASK_SYSCALL is not set
-# CONFIG_SYSFS_SYSCALL is not set
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_FHANDLE=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_SYSCALL=y
-# CONFIG_USERFAULTFD is not set
-CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_PERF_USE_VMALLOC=y
-# CONFIG_PC104 is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_SLAB_FREELIST_RANDOM=y
-# CONFIG_SLAB_FREELIST_HARDENED is not set
-# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_SYSTEM_DATA_VERIFICATION=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-# end of General setup
-
-CONFIG_ARM=y
-CONFIG_ARM_HAS_SG_CHAIN=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_HAVE_PROC_CPU=y
-CONFIG_NO_IOPORT_MAP=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_ARCH_HAS_BANDGAP=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_FIQ=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_GENERIC_BUG=y
-CONFIG_PGTABLE_LEVELS=2
-
-#
-# System Type
-#
-CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_BITS_MAX=15
-CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_S3C24XX is not set
-# CONFIG_ARCH_OMAP1 is not set
-
-#
-# Multiple platform selection
-#
-
-#
-# CPU Core family selection
-#
-# CONFIG_ARCH_MULTI_V6 is not set
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MULTI_V6_V7=y
-# end of Multiple platform selection
-
-# CONFIG_ARCH_VIRT is not set
-# CONFIG_ARCH_ACTIONS is not set
-# CONFIG_ARCH_ALPINE is not set
-# CONFIG_ARCH_ARTPEC is not set
-# CONFIG_ARCH_ASPEED is not set
-# CONFIG_ARCH_AT91 is not set
-CONFIG_ARCH_BCM=y
-
-#
-# IPROC architected SoCs
-#
-# CONFIG_ARCH_BCM_CYGNUS is not set
-# CONFIG_ARCH_BCM_HR2 is not set
-# CONFIG_ARCH_BCM_NSP is not set
-# CONFIG_ARCH_BCM_5301X is not set
-
-#
-# KONA architected SoCs
-#
-# CONFIG_ARCH_BCM_281XX is not set
-# CONFIG_ARCH_BCM_21664 is not set
-# CONFIG_ARCH_BCM_23550 is not set
-
-#
-# Other Architectures
-#
-CONFIG_ARCH_BCM2835=y
-# CONFIG_ARCH_BCM_53573 is not set
-# CONFIG_ARCH_BCM_63XX is not set
-# CONFIG_ARCH_BRCMSTB is not set
-# CONFIG_ARCH_BERLIN is not set
-# CONFIG_ARCH_DIGICOLOR is not set
-CONFIG_ARCH_EXYNOS=y
-CONFIG_S5P_DEV_MFC=y
-# CONFIG_ARCH_EXYNOS3 is not set
-CONFIG_ARCH_EXYNOS4=y
-CONFIG_ARCH_EXYNOS5=y
-
-#
-# EXYNOS SoCs
-#
-CONFIG_CPU_EXYNOS4210=y
-CONFIG_SOC_EXYNOS4412=y
-CONFIG_SOC_EXYNOS5250=y
-CONFIG_SOC_EXYNOS5260=y
-CONFIG_SOC_EXYNOS5410=y
-CONFIG_SOC_EXYNOS5420=y
-CONFIG_SOC_EXYNOS5800=y
-CONFIG_EXYNOS_MCPM=y
-CONFIG_EXYNOS_CPU_SUSPEND=y
-CONFIG_PLAT_SAMSUNG=y
-
-#
-# Samsung Common options
-#
-
-#
-# Boot options
-#
-
-#
-# Power management
-#
-# end of Samsung Common options
-
-# CONFIG_ARCH_HIGHBANK is not set
-# CONFIG_ARCH_HISI is not set
-CONFIG_ARCH_MXC=y
-CONFIG_MXC_TZIC=y
-CONFIG_HAVE_IMX_ANATOP=y
-CONFIG_HAVE_IMX_GPC=y
-CONFIG_HAVE_IMX_MMDC=y
-CONFIG_HAVE_IMX_SRC=y
-
-#
-# Device tree only
-#
-
-#
-# Cortex-A platforms
-#
-CONFIG_SOC_IMX5=y
-# CONFIG_SOC_IMX50 is not set
-CONFIG_SOC_IMX51=y
-CONFIG_SOC_IMX53=y
-CONFIG_SOC_IMX6=y
-CONFIG_SOC_IMX6Q=y
-CONFIG_SOC_IMX6SL=y
-# CONFIG_SOC_IMX6SLL is not set
-CONFIG_SOC_IMX6SX=y
-CONFIG_SOC_IMX6UL=y
-# CONFIG_SOC_LS1021A is not set
-
-#
-# Cortex-A/Cortex-M asymmetric multiprocessing platforms
-#
-CONFIG_SOC_IMX7D_CA7=y
-CONFIG_SOC_IMX7D=y
-# CONFIG_SOC_IMX7ULP is not set
-# CONFIG_SOC_VF610 is not set
-# CONFIG_ARCH_KEYSTONE is not set
-# CONFIG_ARCH_MEDIATEK is not set
-# CONFIG_ARCH_MESON is not set
-# CONFIG_ARCH_MILBEAUT is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MVEBU is not set
-# CONFIG_ARCH_NPCM is not set
-CONFIG_ARCH_OMAP=y
-
-#
-# TI OMAP Common Features
-#
-
-#
-# OMAP Feature Selections
-#
-# CONFIG_OMAP_RESET_CLOCKS is not set
-CONFIG_OMAP_32K_TIMER=y
-# end of TI OMAP Common Features
-
-CONFIG_MACH_OMAP_GENERIC=y
-
-#
-# TI OMAP/AM/DM/DRA Family
-#
-# CONFIG_ARCH_OMAP3 is not set
-# CONFIG_ARCH_OMAP4 is not set
-# CONFIG_SOC_OMAP5 is not set
-CONFIG_SOC_AM33XX=y
-# CONFIG_SOC_AM43XX is not set
-# CONFIG_SOC_DRA7XX is not set
-CONFIG_ARCH_OMAP2PLUS=y
-
-#
-# TI OMAP2/3/4 Specific Features
-#
-CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
-# CONFIG_SOC_HAS_OMAP2_SDRC is not set
-
-#
-# OMAP Legacy Platform Data Board Type
-#
-# end of TI OMAP2/3/4 Specific Features
-# end of TI OMAP/AM/DM/DRA Family
-
-# CONFIG_ARCH_SIRF is not set
-CONFIG_ARCH_QCOM=y
-CONFIG_ARCH_MSM8X60=y
-CONFIG_ARCH_MSM8960=y
-CONFIG_ARCH_MSM8974=y
-# CONFIG_ARCH_MDM9615 is not set
-# CONFIG_ARCH_RDA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_S5PV210 is not set
-# CONFIG_ARCH_RENESAS is not set
-# CONFIG_ARCH_SOCFPGA is not set
-# CONFIG_PLAT_SPEAR is not set
-# CONFIG_ARCH_STI is not set
-# CONFIG_ARCH_STM32 is not set
-CONFIG_ARCH_SUNXI=y
-CONFIG_MACH_SUN4I=y
-CONFIG_MACH_SUN5I=y
-CONFIG_MACH_SUN6I=y
-CONFIG_MACH_SUN7I=y
-CONFIG_MACH_SUN8I=y
-CONFIG_MACH_SUN9I=y
-CONFIG_ARCH_SUNXI_MC_SMP=y
-# CONFIG_ARCH_TANGO is not set
-CONFIG_ARCH_TEGRA=y
-# CONFIG_ARCH_UNIPHIER is not set
-# CONFIG_ARCH_U8500 is not set
-CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
-CONFIG_ARCH_VEXPRESS_DCSCB=y
-CONFIG_ARCH_VEXPRESS_SPC=y
-CONFIG_ARCH_VEXPRESS_TC2_PM=y
-# CONFIG_ARCH_WM8850 is not set
-# CONFIG_ARCH_ZX is not set
-CONFIG_ARCH_ZYNQ=y
-CONFIG_PLAT_VERSATILE=y
-
-#
-# Processor Type
-#
-CONFIG_CPU_V7=y
-CONFIG_CPU_THUMB_CAPABLE=y
-CONFIG_CPU_32v6K=y
-CONFIG_CPU_32v7=y
-CONFIG_CPU_ABRT_EV7=y
-CONFIG_CPU_PABRT_V7=y
-CONFIG_CPU_CACHE_V7=y
-CONFIG_CPU_CACHE_VIPT=y
-CONFIG_CPU_COPY_V6=y
-CONFIG_CPU_TLB_V7=y
-CONFIG_CPU_HAS_ASID=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-
-#
-# Processor Features
-#
-# CONFIG_ARM_LPAE is not set
-CONFIG_ARM_THUMB=y
-CONFIG_ARM_THUMBEE=y
-CONFIG_ARM_VIRT_EXT=y
-CONFIG_SWP_EMULATE=y
-# CONFIG_CPU_BIG_ENDIAN is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
-# CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND is not set
-# CONFIG_CPU_BPREDICT_DISABLE is not set
-CONFIG_CPU_SPECTRE=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_VDSO=y
-CONFIG_OUTER_CACHE=y
-CONFIG_OUTER_CACHE_SYNC=y
-CONFIG_MIGHT_HAVE_CACHE_L2X0=y
-CONFIG_CACHE_L2X0=y
-CONFIG_CACHE_L2X0_PMU=y
-CONFIG_PL310_ERRATA_588369=y
-CONFIG_PL310_ERRATA_727915=y
-CONFIG_PL310_ERRATA_753970=y
-CONFIG_PL310_ERRATA_769419=y
-CONFIG_ARM_L1_CACHE_SHIFT_6=y
-CONFIG_ARM_L1_CACHE_SHIFT=6
-CONFIG_ARM_DMA_MEM_BUFFERABLE=y
-CONFIG_ARM_HEAVY_MB=y
-CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
-CONFIG_DEBUG_ALIGN_RODATA=y
-CONFIG_ARM_ERRATA_430973=y
-CONFIG_ARM_ERRATA_643719=y
-CONFIG_ARM_ERRATA_720789=y
-CONFIG_ARM_ERRATA_754322=y
-CONFIG_ARM_ERRATA_754327=y
-CONFIG_ARM_ERRATA_764369=y
-CONFIG_ARM_ERRATA_775420=y
-CONFIG_ARM_ERRATA_798181=y
-CONFIG_ARM_ERRATA_773022=y
-CONFIG_ARM_ERRATA_818325_852422=y
-CONFIG_ARM_ERRATA_821420=y
-CONFIG_ARM_ERRATA_825619=y
-# CONFIG_ARM_ERRATA_857271 is not set
-CONFIG_ARM_ERRATA_852421=y
-CONFIG_ARM_ERRATA_852423=y
-# CONFIG_ARM_ERRATA_857272 is not set
-# end of System Type
-
-#
-# Bus support
-#
-# CONFIG_ARM_ERRATA_814220 is not set
-# end of Bus support
-
-#
-# Kernel Features
-#
-CONFIG_HAVE_SMP=y
-CONFIG_SMP=y
-CONFIG_SMP_ON_UP=y
-CONFIG_ARM_CPU_TOPOLOGY=y
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_SMT=y
-CONFIG_HAVE_ARM_SCU=y
-CONFIG_HAVE_ARM_ARCH_TIMER=y
-CONFIG_HAVE_ARM_TWD=y
-CONFIG_MCPM=y
-# CONFIG_BIG_LITTLE is not set
-# CONFIG_VMSPLIT_3G is not set
-# CONFIG_VMSPLIT_3G_OPT is not set
-CONFIG_VMSPLIT_2G=y
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0x80000000
-CONFIG_NR_CPUS=4
-CONFIG_HOTPLUG_CPU=y
-CONFIG_ARM_PSCI=y
-CONFIG_ARCH_NR_GPIO=1024
-CONFIG_HZ_FIXED=0
-CONFIG_HZ_100=y
-# CONFIG_HZ_200 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_500 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=100
-CONFIG_SCHED_HRTICK=y
-# CONFIG_THUMB2_KERNEL is not set
-CONFIG_ARM_PATCH_IDIV=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
-CONFIG_HIGHMEM=y
-# CONFIG_HIGHPTE is not set
-# CONFIG_CPU_SW_DOMAIN_PAN is not set
-CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-# CONFIG_ARM_MODULE_PLTS is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
-CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_UACCESS_WITH_MEMCPY is not set
-CONFIG_SECCOMP=y
-CONFIG_PARAVIRT=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
-# CONFIG_XEN is not set
-# end of Kernel Features
-
-#
-# Boot options
-#
-CONFIG_USE_OF=y
-CONFIG_ATAGS=y
-# CONFIG_DEPRECATED_PARAM_STRUCT is not set
-CONFIG_ZBOOT_ROM_TEXT=0
-CONFIG_ZBOOT_ROM_BSS=0
-# CONFIG_ARM_APPENDED_DTB is not set
-CONFIG_CMDLINE=""
-# CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_AUTO_ZRELADDR=y
-CONFIG_EFI_STUB=y
-CONFIG_EFI=y
-CONFIG_DMI=y
-# end of Boot options
-
-#
-# CPU Power Management
-#
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-
-#
-# CPU frequency scaling drivers
-#
-CONFIG_CPUFREQ_DT=m
-CONFIG_CPUFREQ_DT_PLATDEV=y
-# CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM is not set
-# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
-CONFIG_ARM_IMX6Q_CPUFREQ=y
-# CONFIG_ARM_IMX_CPUFREQ_DT is not set
-CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
-# CONFIG_ARM_QCOM_CPUFREQ_HW is not set
-CONFIG_ARM_TEGRA20_CPUFREQ=y
-CONFIG_ARM_TEGRA124_CPUFREQ=y
-# CONFIG_ARM_TI_CPUFREQ is not set
-# CONFIG_QORIQ_CPUFREQ is not set
-# end of CPU Frequency scaling
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
-
-#
-# ARM CPU Idle Drivers
-#
-# CONFIG_ARM_CPUIDLE is not set
-# CONFIG_ARM_PSCI_CPUIDLE is not set
-# CONFIG_ARM_BIG_LITTLE_CPUIDLE is not set
-# CONFIG_ARM_HIGHBANK_CPUIDLE is not set
-# CONFIG_ARM_ZYNQ_CPUIDLE is not set
-# CONFIG_ARM_EXYNOS_CPUIDLE is not set
-# end of ARM CPU Idle Drivers
-# end of CPU Idle
-# end of CPU Power Management
-
-#
-# Floating point emulation
-#
-
-#
-# At least one emulation must be selected
-#
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_NEON=y
-CONFIG_KERNEL_MODE_NEON=y
-# end of Floating point emulation
-
-#
-# Power management options
-#
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_AUTOSLEEP=y
-CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=100
-CONFIG_PM_WAKELOCKS_GC=y
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-# CONFIG_APM_EMULATION is not set
-CONFIG_PM_CLK=y
-CONFIG_PM_GENERIC_DOMAINS=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_GENERIC_DOMAINS_OF=y
-CONFIG_CPU_PM=y
-# CONFIG_ENERGY_MODEL is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-# end of Power management options
-
-#
-# Firmware Drivers
-#
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DMIID=y
-# CONFIG_DMI_SYSFS is not set
-CONFIG_QCOM_SCM=y
-CONFIG_QCOM_SCM_32=y
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
-# CONFIG_TRUSTED_FOUNDATIONS is not set
-CONFIG_HAVE_ARM_SMCCC=y
-CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_PSCI_CHECKER is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-CONFIG_EFI_PARAMS_FROM_FDT=y
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_ARMSTUB=y
-CONFIG_EFI_ARMSTUB_DTB_LOADER=y
-# CONFIG_EFI_BOOTLOADER_CONTROL is not set
-# CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_TEST is not set
-# CONFIG_RESET_ATTACK_MITIGATION is not set
-# end of EFI (Extensible Firmware Interface) Support
-
-#
-# Tegra firmware driver
-#
-# CONFIG_TEGRA_IVC is not set
-# end of Tegra firmware driver
-# end of Firmware Drivers
-
-CONFIG_ARM_CRYPTO=y
-CONFIG_CRYPTO_SHA1_ARM=m
-CONFIG_CRYPTO_SHA1_ARM_NEON=m
-# CONFIG_CRYPTO_SHA1_ARM_CE is not set
-# CONFIG_CRYPTO_SHA2_ARM_CE is not set
-CONFIG_CRYPTO_SHA256_ARM=m
-CONFIG_CRYPTO_SHA512_ARM=m
-CONFIG_CRYPTO_AES_ARM=m
-CONFIG_CRYPTO_AES_ARM_BS=m
-# CONFIG_CRYPTO_AES_ARM_CE is not set
-# CONFIG_CRYPTO_GHASH_ARM_CE is not set
-# CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set
-# CONFIG_CRYPTO_CRC32_ARM_CE is not set
-# CONFIG_CRYPTO_CHACHA20_NEON is not set
-CONFIG_CRYPTO_NHPOLY1305_NEON=m
-CONFIG_VIRTUALIZATION=y
-CONFIG_VHOST_NET=m
-# CONFIG_VHOST_SCSI is not set
-CONFIG_VHOST_VSOCK=m
-CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-
-#
-# General architecture-dependent options
-#
-CONFIG_OPROFILE=m
-CONFIG_HAVE_OPROFILE=y
-CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_OPTPROBES=y
-CONFIG_UPROBES=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_KRETPROBES=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_HAS_KEEPINITRD=y
-CONFIG_ARCH_HAS_SET_MEMORY=y
-CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
-CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=8
-CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_OLD_SIGACTION=y
-CONFIG_64BIT_TIME=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
-CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
-CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_ARCH_HAS_PHYS_TO_DMA=y
-CONFIG_REFCOUNT_FULL=y
-# CONFIG_LOCK_EVENT_COUNTS is not set
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# end of GCOV-based kernel profiling
-
-CONFIG_PLUGIN_HOSTCC=""
-CONFIG_HAVE_GCC_PLUGINS=y
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-# CONFIG_BLK_DEV_ZONED is not set
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
-# CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_WBT is not set
-CONFIG_BLK_CGROUP_IOLATENCY=y
-# CONFIG_BLK_CGROUP_IOCOST is not set
-CONFIG_BLK_DEBUG_FS=y
-# CONFIG_BLK_SED_OPAL is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AIX_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_CMDLINE_PARTITION is not set
-# end of Partition Types
-
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_PM=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-# CONFIG_IOSCHED_BFQ is not set
-# end of IO Schedulers
-
-CONFIG_PADATA=y
-CONFIG_ASN1=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_FREEZER=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_ELF_FDPIC is not set
-CONFIG_ELFCORE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_ARCH_HAS_BINFMT_FLAT=y
-# CONFIG_BINFMT_FLAT is not set
-CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_MEMORY_ISOLATION=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_CONTIG_ALLOC=y
-CONFIG_BOUNCE=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_AREAS=7
-CONFIG_ZPOOL=m
-CONFIG_ZBUD=m
-CONFIG_Z3FOLD=m
-CONFIG_ZSMALLOC=m
-# CONFIG_PGTABLE_MAPPING is not set
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-# CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_FRAME_VECTOR=y
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_EGRESS=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=m
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-CONFIG_UNIX_DIAG=m
-CONFIG_TLS=m
-# CONFIG_TLS_DEVICE is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-CONFIG_XFRM_INTERFACE=m
-CONFIG_XFRM_SUB_POLICY=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_XDP_SOCKETS=y
-# CONFIG_XDP_SOCKETS_DIAG is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE_COMMON=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-# CONFIG_IP_PIMSM_V1 is not set
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-CONFIG_NET_FOU_IP_TUNNELS=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-# CONFIG_INET_ESP_OFFLOAD is not set
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-# CONFIG_INET_RAW_DIAG is not set
-CONFIG_INET_DIAG_DESTROY=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_NV=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_TCP_CONG_DCTCP=m
-CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-# CONFIG_INET6_ESP_OFFLOAD is not set
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_FOU=m
-CONFIG_IPV6_FOU_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-CONFIG_IPV6_SEG6_LWTUNNEL=y
-CONFIG_IPV6_SEG6_HMAC=y
-CONFIG_NETLABEL=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NET_PTP_CLASSIFY=y
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_FAMILY_BRIDGE=y
-CONFIG_NETFILTER_FAMILY_ARP=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK_OSF=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-CONFIG_NF_LOG_NETDEV=m
-CONFIG_NETFILTER_CONNCOUNT=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_PROCFS=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=y
-CONFIG_NF_NAT_MASQUERADE=y
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_SET=m
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_NUMGEN=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_FLOW_OFFLOAD=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CONNLIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_TUNNEL=m
-# CONFIG_NFT_OBJREF is not set
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_FIB=m
-CONFIG_NFT_FIB_INET=m
-# CONFIG_NFT_XFRM is not set
-CONFIG_NFT_SOCKET=m
-CONFIG_NFT_OSF=m
-CONFIG_NFT_TPROXY=m
-# CONFIG_NFT_SYNPROXY is not set
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_FIB_NETDEV=m
-CONFIG_NF_FLOW_TABLE_INET=m
-CONFIG_NF_FLOW_TABLE=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-# end of Core Netfilter Configuration
-
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_MH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS MH scheduler
-#
-CONFIG_IP_VS_MH_TAB_INDEX=12
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_SOCKET_IPV4=m
-CONFIG_NF_TPROXY_IPV4=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_FLOW_TABLE_IPV4=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# end of IP: Netfilter Configuration
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_SOCKET_IPV6=m
-CONFIG_NF_TPROXY_IPV6=m
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_FIB_IPV6=m
-CONFIG_NF_FLOW_TABLE_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_SRH=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-# CONFIG_IP6_NF_SECURITY is not set
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-# end of IPv6: Netfilter Configuration
-
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_TABLES_BRIDGE=m
-# CONFIG_NFT_BRIDGE_META is not set
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_BPFILTER=y
-CONFIG_BPFILTER_UMH=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-# end of DCCP CCIDs Configuration
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-# end of DCCP Kernel Hacking
-
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-CONFIG_INET_SCTP_DIAG=m
-CONFIG_RDS=m
-# CONFIG_RDS_TCP is not set
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-CONFIG_TIPC_MEDIA_UDP=y
-CONFIG_TIPC_DIAG=m
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-# CONFIG_L2TP_DEBUGFS is not set
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_GARP=m
-CONFIG_MRP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_HAVE_NET_DSA=y
-CONFIG_NET_DSA=m
-# CONFIG_NET_DSA_TAG_8021Q is not set
-CONFIG_NET_DSA_TAG_BRCM_COMMON=m
-CONFIG_NET_DSA_TAG_BRCM=m
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
-# CONFIG_NET_DSA_TAG_GSWIP is not set
-CONFIG_NET_DSA_TAG_DSA=m
-CONFIG_NET_DSA_TAG_EDSA=m
-# CONFIG_NET_DSA_TAG_MTK is not set
-# CONFIG_NET_DSA_TAG_KSZ is not set
-# CONFIG_NET_DSA_TAG_QCA is not set
-# CONFIG_NET_DSA_TAG_LAN9303 is not set
-# CONFIG_NET_DSA_TAG_SJA1105 is not set
-CONFIG_NET_DSA_TAG_TRAILER=m
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_X25=m
-CONFIG_LAPB=m
-CONFIG_PHONET=m
-CONFIG_6LOWPAN=m
-# CONFIG_6LOWPAN_DEBUGFS is not set
-CONFIG_6LOWPAN_NHC=m
-CONFIG_6LOWPAN_NHC_DEST=m
-CONFIG_6LOWPAN_NHC_FRAGMENT=m
-CONFIG_6LOWPAN_NHC_HOP=m
-CONFIG_6LOWPAN_NHC_IPV6=m
-CONFIG_6LOWPAN_NHC_MOBILITY=m
-CONFIG_6LOWPAN_NHC_ROUTING=m
-CONFIG_6LOWPAN_NHC_UDP=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
-CONFIG_6LOWPAN_GHC_UDP=m
-CONFIG_6LOWPAN_GHC_ICMPV6=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
-CONFIG_IEEE802154=m
-# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
-CONFIG_IEEE802154_SOCKET=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_CBS=m
-CONFIG_NET_SCH_ETF=m
-# CONFIG_NET_SCH_TAPRIO is not set
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_SKBPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_CAKE=m
-# CONFIG_NET_SCH_FQ is not set
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-# CONFIG_NET_SCH_DEFAULT is not set
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_MATCHALL=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_IPT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-# CONFIG_NET_ACT_SAMPLE is not set
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-# CONFIG_NET_ACT_MPLS is not set
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_ACT_CTINFO is not set
-CONFIG_NET_ACT_SKBMOD=m
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_TUNNEL_KEY=m
-# CONFIG_NET_ACT_CT is not set
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IFE_SKBTCINDEX=m
-# CONFIG_NET_TC_SKB_EXT is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-# CONFIG_BATMAN_ADV is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_VSOCKETS=m
-CONFIG_VSOCKETS_DIAG=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
-CONFIG_NETLINK_DIAG=m
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_NET_NSH=m
-# CONFIG_HSR is not set
-CONFIG_NET_SWITCHDEV=y
-CONFIG_NET_L3_MASTER_DEV=y
-# CONFIG_QRTR is not set
-CONFIG_NET_NCSI=y
-# CONFIG_NCSI_OEM_CMD_GET_MAC is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-# CONFIG_CGROUP_NET_PRIO is not set
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-# CONFIG_BPF_JIT is not set
-# CONFIG_BPF_STREAM_PARSER is not set
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-# CONFIG_NET_DROP_MONITOR is not set
-# end of Network testing
-# end of Networking options
-
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-CONFIG_BT_6LOWPAN=m
-CONFIG_BT_LEDS=y
-# CONFIG_BT_SELFTEST is not set
-# CONFIG_BT_DEBUGFS is not set
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_QCA=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
-CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-# CONFIG_BT_HCIUART_INTEL is not set
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIVHCI=m
-# CONFIG_BT_MRVL is not set
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
-# CONFIG_BT_MTKSDIO is not set
-CONFIG_BT_QCOMSMD=m
-CONFIG_BT_HCIRSI=m
-# end of Bluetooth device drivers
-
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_IPV6 is not set
-# CONFIG_AF_RXRPC_INJECT_LOSS is not set
-# CONFIG_AF_RXRPC_DEBUG is not set
-# CONFIG_RXKAD is not set
-# CONFIG_AF_KCM is not set
-CONFIG_STREAM_PARSER=y
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-CONFIG_NL80211_TESTMODE=y
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
-CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
-CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_CFG80211_CRDA_SUPPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-# CONFIG_RFKILL_GPIO is not set
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_DEBUG is not set
-# CONFIG_CAIF is not set
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
-CONFIG_NFC=m
-CONFIG_NFC_DIGITAL=m
-CONFIG_NFC_NCI=m
-CONFIG_NFC_NCI_SPI=m
-CONFIG_NFC_NCI_UART=m
-CONFIG_NFC_HCI=m
-CONFIG_NFC_SHDLC=y
-
-#
-# Near Field Communication (NFC) devices
-#
-CONFIG_NFC_TRF7970A=m
-CONFIG_NFC_SIM=m
-CONFIG_NFC_PORT100=m
-CONFIG_NFC_FDP=m
-CONFIG_NFC_FDP_I2C=m
-CONFIG_NFC_PN544=m
-CONFIG_NFC_PN544_I2C=m
-CONFIG_NFC_PN533=m
-CONFIG_NFC_PN533_USB=m
-CONFIG_NFC_PN533_I2C=m
-CONFIG_NFC_MICROREAD=m
-CONFIG_NFC_MICROREAD_I2C=m
-CONFIG_NFC_MRVL=m
-CONFIG_NFC_MRVL_USB=m
-CONFIG_NFC_MRVL_UART=m
-CONFIG_NFC_MRVL_I2C=m
-CONFIG_NFC_MRVL_SPI=m
-CONFIG_NFC_ST21NFCA=m
-CONFIG_NFC_ST21NFCA_I2C=m
-CONFIG_NFC_ST_NCI=m
-CONFIG_NFC_ST_NCI_I2C=m
-CONFIG_NFC_ST_NCI_SPI=m
-CONFIG_NFC_NXP_NCI=m
-CONFIG_NFC_NXP_NCI_I2C=m
-CONFIG_NFC_S3FWRN5=m
-CONFIG_NFC_S3FWRN5_I2C=m
-CONFIG_NFC_ST95HF=m
-# end of Near Field Communication (NFC) devices
-
-CONFIG_PSAMPLE=m
-CONFIG_NET_IFE=m
-CONFIG_LWTUNNEL=y
-CONFIG_LWTUNNEL_BPF=y
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-CONFIG_NET_SOCK_MSG=y
-CONFIG_NET_DEVLINK=y
-CONFIG_PAGE_POOL=y
-CONFIG_FAILOVER=m
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-CONFIG_ARM_AMBA=y
-CONFIG_TEGRA_AHB=y
-CONFIG_HAVE_PCI=y
-# CONFIG_PCI is not set
-# CONFIG_PCCARD is not set
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=y
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
-# end of Firmware loader
-
-CONFIG_WANT_DEV_COREDUMP=y
-# CONFIG_ALLOW_DEV_COREDUMP is not set
-# CONFIG_DEBUG_DRIVER is not set
-CONFIG_DEBUG_DEVRES=y
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_SOC_BUS=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_SPI=m
-CONFIG_REGMAP_SPMI=m
-CONFIG_REGMAP_MMIO=y
-CONFIG_REGMAP_IRQ=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
-CONFIG_GENERIC_ARCH_TOPOLOGY=y
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-CONFIG_ARM_CCI=y
-CONFIG_ARM_CCI400_COMMON=y
-CONFIG_ARM_CCI400_PORT_CTRL=y
-# CONFIG_BRCMSTB_GISB_ARB is not set
-# CONFIG_MOXTET is not set
-# CONFIG_IMX_WEIM is not set
-# CONFIG_OMAP_INTERCONNECT is not set
-# CONFIG_OMAP_OCP2SCP is not set
-# CONFIG_QCOM_EBI2 is not set
-# CONFIG_SIMPLE_PM_BUS is not set
-# CONFIG_SUN50I_DE2_BUS is not set
-CONFIG_SUNXI_RSB=y
-# CONFIG_TEGRA_GMI is not set
-CONFIG_TI_SYSC=y
-CONFIG_VEXPRESS_CONFIG=y
-# end of Bus devices
-
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-# CONFIG_GNSS is not set
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-
-#
-# Partition parsers
-#
-CONFIG_MTD_AR7_PARTS=m
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_OF_PARTS=m
-# CONFIG_MTD_AFS_PARTS is not set
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# end of Partition parsers
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-CONFIG_SM_FTL=m
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_SWAP=m
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-# end of RAM/ROM/Flash chip drivers
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP_OF is not set
-# CONFIG_MTD_PHYSMAP_GPIO_ADDR is not set
-# CONFIG_MTD_IMPA7 is not set
-CONFIG_MTD_PLATRAM=m
-# end of Mapping drivers for chip access
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_DATAFLASH=m
-# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
-# CONFIG_MTD_DATAFLASH_OTP is not set
-# CONFIG_MTD_MCHP23K256 is not set
-# CONFIG_MTD_SST25L is not set
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOCG3 is not set
-# end of Self-contained MTD device drivers
-
-CONFIG_MTD_NAND_CORE=m
-CONFIG_MTD_ONENAND=m
-# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND_GENERIC is not set
-# CONFIG_MTD_ONENAND_SAMSUNG is not set
-CONFIG_MTD_ONENAND_OTP=y
-CONFIG_MTD_ONENAND_2X_PROGRAM=y
-CONFIG_MTD_NAND_ECC_SW_HAMMING=m
-# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_RAW_NAND is not set
-CONFIG_MTD_SPI_NAND=m
-
-#
-# LPDDR & LPDDR2 PCM memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-# CONFIG_MTD_LPDDR2_NVM is not set
-# end of LPDDR & LPDDR2 PCM memory drivers
-
-CONFIG_MTD_SPI_NOR=m
-# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
-# CONFIG_SPI_CADENCE_QUADSPI is not set
-# CONFIG_SPI_MTK_QUADSPI is not set
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_BLOCK is not set
-# CONFIG_MTD_HYPERBUS is not set
-CONFIG_DTC=y
-CONFIG_OF=y
-# CONFIG_OF_UNITTEST is not set
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_DYNAMIC=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
-CONFIG_OF_MDIO=y
-CONFIG_OF_RESERVED_MEM=y
-CONFIG_OF_RESOLVE=y
-CONFIG_OF_OVERLAY=y
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-# CONFIG_PARPORT is not set
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_NULL_BLK is not set
-CONFIG_CDROM=m
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_WRITEBACK is not set
-# CONFIG_ZRAM_MEMORY_TRACKING is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_VIRTIO_BLK_SCSI is not set
-# CONFIG_BLK_DEV_RBD is not set
-
-#
-# NVME Support
-#
-CONFIG_NVME_CORE=m
-CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_FABRICS=m
-# CONFIG_NVME_FC is not set
-CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_LOOP=m
-# CONFIG_NVME_TARGET_FC is not set
-# CONFIG_NVME_TARGET_TCP is not set
-# end of NVME Support
-
-#
-# Misc devices
-#
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT_SPI=m
-# CONFIG_DUMMY_IRQ is not set
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-# CONFIG_QCOM_COINCELL is not set
-# CONFIG_QCOM_FASTRPC is not set
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-# CONFIG_LATTICE_ECP3_CONFIG is not set
-CONFIG_SRAM=y
-CONFIG_SRAM_EXEC=y
-CONFIG_VEXPRESS_SYSCFG=y
-# CONFIG_XILINX_SDFEC is not set
-CONFIG_MISC_RTSX=m
-# CONFIG_PVPANIC is not set
-CONFIG_C2PORT=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_AT25=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_EEPROM_93XX46=m
-# CONFIG_EEPROM_IDT_89HPESX is not set
-# CONFIG_EEPROM_EE1004 is not set
-# end of EEPROM support
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-# end of Texas Instruments shared transport line discipline
-
-# CONFIG_SENSORS_LIS3_SPI is not set
-CONFIG_SENSORS_LIS3_I2C=m
-CONFIG_ALTERA_STAPL=m
-
-#
-# Intel MIC & related support
-#
-
-#
-# Intel MIC Bus Driver
-#
-
-#
-# SCIF Bus Driver
-#
-
-#
-# VOP Bus Driver
-#
-# CONFIG_VOP_BUS is not set
-
-#
-# Intel MIC Host Driver
-#
-
-#
-# Intel MIC Card Driver
-#
-
-#
-# SCIF Driver
-#
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-
-#
-# VOP Driver
-#
-# end of Intel MIC & related support
-
-# CONFIG_ECHO is not set
-CONFIG_MISC_RTSX_USB=m
-# end of Misc devices
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_SCAN_ASYNC=y
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-# end of SCSI Transports
-
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_UFSHCD=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
-# CONFIG_SCSI_UFS_BSG is not set
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_SCSI_DEBUG=m
-CONFIG_SCSI_VIRTIO=m
-# CONFIG_SCSI_DH is not set
-# end of SCSI device support
-
-CONFIG_HAVE_PATA_PLATFORM=y
-CONFIG_ATA=m
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI_PLATFORM=m
-# CONFIG_AHCI_DM816 is not set
-CONFIG_AHCI_IMX=m
-# CONFIG_AHCI_CEVA is not set
-CONFIG_AHCI_SUNXI=m
-# CONFIG_AHCI_TEGRA is not set
-# CONFIG_AHCI_QORIQ is not set
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-# CONFIG_SATA_DWC is not set
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_IMX=m
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_PLATFORM=m
-# CONFIG_PATA_OF_PLATFORM is not set
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-# CONFIG_MD_AUTODETECT is not set
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-# CONFIG_MD_CLUSTER is not set
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_UNSTRIPED=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_WRITECACHE=m
-# CONFIG_DM_ERA is not set
-# CONFIG_DM_CLONE is not set
-CONFIG_DM_MIRROR=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-# CONFIG_DM_DUST is not set
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
-CONFIG_DM_VERITY_FEC=y
-# CONFIG_DM_SWITCH is not set
-CONFIG_DM_LOG_WRITES=m
-CONFIG_DM_INTEGRITY=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_TCM_USER2=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_NETDEVICES=y
-CONFIG_MII=m
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-# CONFIG_NET_TEAM_MODE_RANDOM is not set
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=m
-# CONFIG_IPVTAP is not set
-CONFIG_VXLAN=m
-# CONFIG_GENEVE is not set
-CONFIG_GTP=m
-CONFIG_MACSEC=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_TUN=m
-CONFIG_TAP=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-# CONFIG_NLMON is not set
-CONFIG_NET_VRF=m
-# CONFIG_VSOCKMON is not set
-CONFIG_ATM_DRIVERS=y
-CONFIG_ATM_DUMMY=m
-CONFIG_ATM_TCP=m
-
-#
-# CAIF transport drivers
-#
-
-#
-# Distributed Switch Architecture drivers
-#
-# CONFIG_B53 is not set
-# CONFIG_NET_DSA_BCM_SF2 is not set
-# CONFIG_NET_DSA_LOOP is not set
-# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_MT7530 is not set
-# CONFIG_NET_DSA_MV88E6060 is not set
-# CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set
-# CONFIG_NET_DSA_MICROCHIP_KSZ8795 is not set
-# CONFIG_NET_DSA_MV88E6XXX is not set
-# CONFIG_NET_DSA_SJA1105 is not set
-# CONFIG_NET_DSA_QCA8K is not set
-# CONFIG_NET_DSA_REALTEK_SMI is not set
-# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
-# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX_SPI is not set
-# CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM is not set
-# end of Distributed Switch Architecture drivers
-
-CONFIG_ETHERNET=y
-CONFIG_NET_VENDOR_ALACRITECH=y
-CONFIG_NET_VENDOR_ALLWINNER=y
-CONFIG_SUN4I_EMAC=m
-CONFIG_ALTERA_TSE=m
-# CONFIG_NET_VENDOR_AMAZON is not set
-CONFIG_NET_VENDOR_AQUANTIA=y
-CONFIG_NET_VENDOR_ARC=y
-# CONFIG_NET_VENDOR_AURORA is not set
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_BCMGENET=m
-# CONFIG_SYSTEMPORT is not set
-CONFIG_NET_VENDOR_CADENCE=y
-CONFIG_MACB=m
-CONFIG_MACB_USE_HWSTAMP=y
-# CONFIG_NET_VENDOR_CAVIUM is not set
-CONFIG_NET_VENDOR_CIRRUS=y
-# CONFIG_CS89x0 is not set
-# CONFIG_NET_VENDOR_CORTINA is not set
-# CONFIG_DM9000 is not set
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_EZCHIP=y
-# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
-CONFIG_NET_VENDOR_FARADAY=y
-# CONFIG_FTMAC100 is not set
-# CONFIG_FTGMAC100 is not set
-CONFIG_NET_VENDOR_FREESCALE=y
-CONFIG_FEC=m
-CONFIG_FSL_PQ_MDIO=m
-CONFIG_FSL_XGMAC_MDIO=m
-# CONFIG_GIANFAR is not set
-CONFIG_NET_VENDOR_GOOGLE=y
-# CONFIG_NET_VENDOR_HISILICON is not set
-CONFIG_NET_VENDOR_HUAWEI=y
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_NET_VENDOR_MARVELL=y
-# CONFIG_MVMDIO is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-# CONFIG_MLXSW_CORE is not set
-# CONFIG_MLXFW is not set
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
-CONFIG_NET_VENDOR_MICROCHIP=y
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-CONFIG_ENCX24J600=m
-# CONFIG_NET_VENDOR_MICROSEMI is not set
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NET_VENDOR_NETRONOME=y
-# CONFIG_NET_VENDOR_NI is not set
-CONFIG_NET_VENDOR_8390=y
-# CONFIG_AX88796 is not set
-CONFIG_ETHOC=m
-CONFIG_NET_VENDOR_PENSANDO=y
-# CONFIG_NET_VENDOR_QUALCOMM is not set
-CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_ROCKER=y
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SOLARFLARE=y
-CONFIG_NET_VENDOR_SMSC=y
-# CONFIG_SMC91X is not set
-# CONFIG_SMC911X is not set
-# CONFIG_SMSC911X is not set
-# CONFIG_NET_VENDOR_SOCIONEXT is not set
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_SELFTESTS is not set
-CONFIG_STMMAC_PLATFORM=m
-CONFIG_DWMAC_DWC_QOS_ETH=m
-CONFIG_DWMAC_GENERIC=m
-CONFIG_DWMAC_IPQ806X=m
-CONFIG_DWMAC_QCOM_ETHQOS=m
-CONFIG_DWMAC_SUNXI=m
-CONFIG_DWMAC_SUN8I=m
-CONFIG_NET_VENDOR_SYNOPSYS=y
-# CONFIG_DWC_XLGMAC is not set
-CONFIG_NET_VENDOR_TI=y
-CONFIG_TI_DAVINCI_MDIO=m
-CONFIG_TI_CPSW_PHY_SEL=y
-CONFIG_TI_CPSW=m
-# CONFIG_TI_CPTS is not set
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-# CONFIG_VIA_VELOCITY is not set
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_WIZNET_W5100_SPI=m
-CONFIG_NET_VENDOR_XILINX=y
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_XILINX_AXI_EMAC is not set
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_BUS=y
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_BUS_MUX=m
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
-CONFIG_MDIO_GPIO=m
-# CONFIG_MDIO_HISI_FEMAC is not set
-# CONFIG_MDIO_MSCC_MIIM is not set
-CONFIG_MDIO_SUN4I=m
-CONFIG_PHYLINK=m
-CONFIG_PHYLIB=y
-CONFIG_SWPHY=y
-# CONFIG_LED_TRIGGER_PHY is not set
-
-#
-# MII PHY device drivers
-#
-# CONFIG_SFP is not set
-# CONFIG_ADIN_PHY is not set
-CONFIG_AMD_PHY=m
-CONFIG_AQUANTIA_PHY=m
-# CONFIG_AX88796B_PHY is not set
-# CONFIG_AT803X_PHY is not set
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_CICADA_PHY=m
-# CONFIG_CORTINA_PHY is not set
-CONFIG_DAVICOM_PHY=m
-CONFIG_DP83822_PHY=m
-# CONFIG_DP83TC811_PHY is not set
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_FIXED_PHY=y
-CONFIG_ICPLUS_PHY=m
-CONFIG_INTEL_XWAY_PHY=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_MARVELL_PHY=m
-# CONFIG_MARVELL_10G_PHY is not set
-CONFIG_MICREL_PHY=m
-CONFIG_MICROCHIP_PHY=m
-# CONFIG_MICROCHIP_T1_PHY is not set
-CONFIG_MICROSEMI_PHY=m
-CONFIG_NATIONAL_PHY=m
-# CONFIG_NXP_TJA11XX_PHY is not set
-CONFIG_QSEMI_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_RENESAS_PHY=m
-# CONFIG_ROCKCHIP_PHY is not set
-CONFIG_SMSC_PHY=m
-CONFIG_STE10XP=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_XILINX_GMII2RGMII=m
-CONFIG_MICREL_KS8995MA=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-CONFIG_SLIP_MODE_SLIP6=y
-
-#
-# Host-side USB support is needed for USB Network Adapter support
-#
-CONFIG_USB_NET_DRIVERS=m
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-# CONFIG_USB_RTL8152 is not set
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set
-# CONFIG_USB_NET_CDC_MBIM is not set
-CONFIG_USB_NET_DM9601=m
-# CONFIG_USB_NET_SR9700 is not set
-# CONFIG_USB_NET_SR9800 is not set
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_USB_NET_CH9200=m
-# CONFIG_USB_NET_AQC111 is not set
-CONFIG_WLAN=y
-# CONFIG_WIRELESS_WDS is not set
-# CONFIG_WLAN_VENDOR_ADMTEK is not set
-CONFIG_ATH_COMMON=m
-CONFIG_WLAN_VENDOR_ATH=y
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_AHB=y
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_DYNACK is not set
-# CONFIG_ATH9K_WOW is not set
-CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
-# CONFIG_ATH9K_PCOEM is not set
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-# CONFIG_ATH9K_HWRNG is not set
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-CONFIG_CARL9170_HWRNG=y
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-CONFIG_ATH6KL_DEBUG=y
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-# CONFIG_ATH10K is not set
-# CONFIG_WCN36XX is not set
-# CONFIG_WLAN_VENDOR_ATMEL is not set
-CONFIG_WLAN_VENDOR_BROADCOM=y
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_DEBUG=y
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCMFMAC is not set
-# CONFIG_BRCM_TRACING is not set
-# CONFIG_BRCMDBG is not set
-# CONFIG_WLAN_VENDOR_CISCO is not set
-CONFIG_WLAN_VENDOR_INTEL=y
-CONFIG_WLAN_VENDOR_INTERSIL=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_SPI=m
-# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
-CONFIG_P54_LEDS=y
-CONFIG_WLAN_VENDOR_MARVELL=y
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_SPI=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_WLAN_VENDOR_MEDIATEK=y
-CONFIG_MT7601U=m
-CONFIG_MT76_CORE=m
-CONFIG_MT76_LEDS=y
-CONFIG_MT76_USB=m
-CONFIG_MT76x02_LIB=m
-CONFIG_MT76x02_USB=m
-CONFIG_MT76x0_COMMON=m
-CONFIG_MT76x0U=m
-CONFIG_MT76x2_COMMON=m
-CONFIG_MT76x2U=m
-CONFIG_WLAN_VENDOR_RALINK=y
-CONFIG_RT2X00=m
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-# CONFIG_RT2800USB_RT35XX is not set
-# CONFIG_RT2800USB_RT3573 is not set
-CONFIG_RT2800USB_RT53XX=y
-# CONFIG_RT2800USB_RT55XX is not set
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WLAN_VENDOR_REALTEK=y
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_USB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8XXXU=m
-# CONFIG_RTL8XXXU_UNTESTED is not set
-# CONFIG_RTW88 is not set
-CONFIG_WLAN_VENDOR_RSI=y
-CONFIG_RSI_91X=m
-CONFIG_RSI_DEBUGFS=y
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-CONFIG_RSI_COEX=y
-CONFIG_WLAN_VENDOR_ST=y
-# CONFIG_CW1200 is not set
-CONFIG_WLAN_VENDOR_TI=y
-CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SPI=m
-CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_WLAN_VENDOR_ZYDAS=y
-CONFIG_USB_ZD1201=m
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_WLAN_VENDOR_QUANTENNA=y
-CONFIG_MAC80211_HWSIM=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-# CONFIG_VIRT_WIFI is not set
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-# end of WiMAX Wireless Broadband devices
-
-CONFIG_WAN=y
-CONFIG_HDLC=m
-CONFIG_HDLC_RAW=m
-CONFIG_HDLC_RAW_ETH=m
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC_PPP=m
-CONFIG_HDLC_X25=m
-# CONFIG_SLIC_DS26522 is not set
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
-CONFIG_LAPBETHER=m
-CONFIG_X25_ASY=m
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKELB=m
-# CONFIG_IEEE802154_AT86RF230 is not set
-CONFIG_IEEE802154_MRF24J40=m
-CONFIG_IEEE802154_CC2520=m
-CONFIG_IEEE802154_ATUSB=m
-CONFIG_IEEE802154_ADF7242=m
-# CONFIG_IEEE802154_CA8210 is not set
-CONFIG_IEEE802154_MCR20A=m
-# CONFIG_IEEE802154_HWSIM is not set
-# CONFIG_NETDEVSIM is not set
-CONFIG_NET_FAILOVER=m
-# CONFIG_ISDN is not set
-# CONFIG_NVM is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_LEDS=m
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-CONFIG_INPUT_MATRIXKMAP=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-CONFIG_INPUT_EVBUG=m
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ADC is not set
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ADP5589 is not set
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_QT1050 is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_QT2160 is not set
-# CONFIG_KEYBOARD_DLINK_DIR685 is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-CONFIG_KEYBOARD_GPIO_POLLED=m
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_TCA8418 is not set
-# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_MPR121 is not set
-# CONFIG_KEYBOARD_SNVS_PWRKEY is not set
-# CONFIG_KEYBOARD_IMX is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_TEGRA is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-CONFIG_KEYBOARD_PMIC8XXX=m
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_SUN4I_LRADC is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
-# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_CAP11XX is not set
-CONFIG_KEYBOARD_BCM=m
-CONFIG_INPUT_MOUSE=y
-# CONFIG_MOUSE_PS2 is not set
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-# CONFIG_MOUSE_ELAN_I2C is not set
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_MOUSE_SYNAPTICS_USB=m
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_PROPERTIES=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879_SPI=m
-# CONFIG_TOUCHSCREEN_ADC is not set
-# CONFIG_TOUCHSCREEN_AR1021_I2C is not set
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
-# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
-CONFIG_TOUCHSCREEN_BU21013=m
-# CONFIG_TOUCHSCREEN_BU21029 is not set
-# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
-# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-# CONFIG_TOUCHSCREEN_EGALAX is not set
-CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
-# CONFIG_TOUCHSCREEN_EXC3000 is not set
-CONFIG_TOUCHSCREEN_FUJITSU=m
-# CONFIG_TOUCHSCREEN_GOODIX is not set
-# CONFIG_TOUCHSCREEN_HIDEEP is not set
-# CONFIG_TOUCHSCREEN_ILI210X is not set
-# CONFIG_TOUCHSCREEN_S6SY761 is not set
-CONFIG_TOUCHSCREEN_GUNZE=m
-# CONFIG_TOUCHSCREEN_EKTF2127 is not set
-# CONFIG_TOUCHSCREEN_ELAN is not set
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
-# CONFIG_TOUCHSCREEN_MAX11801 is not set
-# CONFIG_TOUCHSCREEN_MCS5000 is not set
-# CONFIG_TOUCHSCREEN_MMS114 is not set
-# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-# CONFIG_TOUCHSCREEN_TI_AM335X_TSC is not set
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-# CONFIG_TOUCHSCREEN_MC13783 is not set
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-# CONFIG_TOUCHSCREEN_USB_EASYTOUCH is not set
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TS4800=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-CONFIG_TOUCHSCREEN_TSC200X_CORE=m
-CONFIG_TOUCHSCREEN_TSC2004=m
-# CONFIG_TOUCHSCREEN_TSC2005 is not set
-CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
-CONFIG_TOUCHSCREEN_RM_TS=m
-CONFIG_TOUCHSCREEN_SILEAD=m
-CONFIG_TOUCHSCREEN_SIS_I2C=m
-CONFIG_TOUCHSCREEN_ST1232=m
-# CONFIG_TOUCHSCREEN_STMFTS is not set
-# CONFIG_TOUCHSCREEN_SUN4I is not set
-# CONFIG_TOUCHSCREEN_SUR40 is not set
-# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
-# CONFIG_TOUCHSCREEN_SX8654 is not set
-CONFIG_TOUCHSCREEN_TPS6507X=m
-# CONFIG_TOUCHSCREEN_ZET6223 is not set
-CONFIG_TOUCHSCREEN_ZFORCE=m
-CONFIG_TOUCHSCREEN_ROHM_BU21023=m
-# CONFIG_TOUCHSCREEN_IQS5XX is not set
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_AD714X_SPI=m
-# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BMA150 is not set
-CONFIG_INPUT_E3X0_BUTTON=m
-# CONFIG_INPUT_MSM_VIBRATOR is not set
-# CONFIG_INPUT_PM8941_PWRKEY is not set
-CONFIG_INPUT_PM8XXX_VIBRATOR=m
-CONFIG_INPUT_PMIC8XXX_PWRKEY=m
-# CONFIG_INPUT_MC13783_PWRBUTTON is not set
-CONFIG_INPUT_MMA8450=m
-# CONFIG_INPUT_GP2A is not set
-CONFIG_INPUT_GPIO_BEEPER=m
-# CONFIG_INPUT_GPIO_DECODER is not set
-# CONFIG_INPUT_GPIO_VIBRA is not set
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-# CONFIG_INPUT_REGULATOR_HAPTIC is not set
-# CONFIG_INPUT_TPS65218_PWRBUTTON is not set
-# CONFIG_INPUT_AXP20X_PEK is not set
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-CONFIG_INPUT_PWM_BEEPER=m
-# CONFIG_INPUT_PWM_VIBRA is not set
-# CONFIG_INPUT_RK805_PWRKEY is not set
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
-# CONFIG_INPUT_IMS_PCU is not set
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-# CONFIG_INPUT_DRV260X_HAPTICS is not set
-CONFIG_INPUT_DRV2665_HAPTICS=m
-# CONFIG_INPUT_DRV2667_HAPTICS is not set
-CONFIG_RMI4_CORE=m
-CONFIG_RMI4_I2C=m
-CONFIG_RMI4_SPI=m
-# CONFIG_RMI4_SMB is not set
-CONFIG_RMI4_F03=y
-CONFIG_RMI4_F03_SERIO=m
-CONFIG_RMI4_2D_SENSOR=y
-CONFIG_RMI4_F11=y
-CONFIG_RMI4_F12=y
-CONFIG_RMI4_F30=y
-# CONFIG_RMI4_F34 is not set
-# CONFIG_RMI4_F54 is not set
-# CONFIG_RMI4_F55 is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=m
-# CONFIG_SERIO_AMBAKMI is not set
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-# CONFIG_SERIO_ARC_PS2 is not set
-# CONFIG_SERIO_APBPS2 is not set
-# CONFIG_SERIO_SUN4I_PS2 is not set
-# CONFIG_SERIO_GPIO_PS2 is not set
-# CONFIG_USERIO is not set
-# CONFIG_GAMEPORT is not set
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_N_HDLC=m
-# CONFIG_N_GSM is not set
-# CONFIG_TRACE_SINK is not set
-# CONFIG_NULL_TTY is not set
-# CONFIG_LDISC_AUTOLOAD is not set
-CONFIG_DEVMEM=y
-CONFIG_DEVKMEM=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
-# CONFIG_SERIAL_8250_FINTEK is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
-# CONFIG_SERIAL_8250_MEN_MCB is not set
-CONFIG_SERIAL_8250_NR_UARTS=8
-CONFIG_SERIAL_8250_RUNTIME_UARTS=8
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SERIAL_8250_ASPEED_VUART is not set
-CONFIG_SERIAL_8250_DWLIB=y
-CONFIG_SERIAL_8250_FSL=y
-CONFIG_SERIAL_8250_DW=y
-# CONFIG_SERIAL_8250_EM is not set
-# CONFIG_SERIAL_8250_RT288X is not set
-# CONFIG_SERIAL_8250_OMAP is not set
-CONFIG_SERIAL_OF_PLATFORM=y
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_AMBA_PL010=y
-CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
-# CONFIG_SERIAL_SAMSUNG is not set
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_MAX310X is not set
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-# CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_MSM=y
-CONFIG_SERIAL_MSM_CONSOLE=y
-CONFIG_SERIAL_OMAP=y
-CONFIG_SERIAL_OMAP_CONSOLE=y
-# CONFIG_SERIAL_SIFIVE is not set
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
-CONFIG_SERIAL_BCM63XX=m
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_IFX6X60 is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
-# CONFIG_SERIAL_ARC is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_FSL_LINFLEXUART is not set
-# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
-# CONFIG_SERIAL_ST_ASC is not set
-# CONFIG_SERIAL_MEN_Z135 is not set
-# end of Serial drivers
-
-CONFIG_SERIAL_MCTRL_GPIO=y
-# CONFIG_SERIAL_DEV_BUS is not set
-# CONFIG_TTY_PRINTK is not set
-CONFIG_HVC_DRIVER=y
-# CONFIG_HVC_DCC is not set
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_DMI_DECODE=y
-CONFIG_IPMI_PLAT_DATA=y
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_SSIF=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-# CONFIG_IPMB_DEVICE_INTERFACE is not set
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_BCM2835=m
-CONFIG_HW_RANDOM_OMAP=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_IMX_RNGC=m
-CONFIG_HW_RANDOM_EXYNOS=m
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=256
-CONFIG_TCG_TPM=m
-CONFIG_HW_RANDOM_TPM=y
-# CONFIG_TCG_TIS is not set
-# CONFIG_TCG_TIS_SPI is not set
-# CONFIG_TCG_TIS_I2C_ATMEL is not set
-# CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C_NUVOTON is not set
-# CONFIG_TCG_VTPM_PROXY is not set
-# CONFIG_TCG_TIS_ST33ZP24_I2C is not set
-# CONFIG_TCG_TIS_ST33ZP24_SPI is not set
-# CONFIG_XILLYBUS is not set
-# end of Character devices
-
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-CONFIG_I2C_MUX_GPIO=m
-# CONFIG_I2C_MUX_GPMUX is not set
-# CONFIG_I2C_MUX_LTC4306 is not set
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-# CONFIG_I2C_MUX_PINCTRL is not set
-# CONFIG_I2C_MUX_REG is not set
-# CONFIG_I2C_DEMUX_PINCTRL is not set
-# CONFIG_I2C_MUX_MLXCPLD is not set
-# end of Multiplexer I2C Chip support
-
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_BCM2835 is not set
-# CONFIG_I2C_CADENCE is not set
-# CONFIG_I2C_CBUS_GPIO is not set
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_EMEV2 is not set
-CONFIG_I2C_EXYNOS5=y
-CONFIG_I2C_GPIO=m
-# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
-CONFIG_I2C_IMX=m
-# CONFIG_I2C_IMX_LPI2C is not set
-# CONFIG_I2C_MV64XXX is not set
-# CONFIG_I2C_NOMADIK is not set
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_OMAP=y
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_QUP=m
-# CONFIG_I2C_RK3X is not set
-CONFIG_HAVE_S3C2410_I2C=y
-# CONFIG_I2C_S3C2410 is not set
-CONFIG_I2C_SIMTEC=m
-# CONFIG_I2C_SUN6I_P2WI is not set
-# CONFIG_I2C_TEGRA is not set
-# CONFIG_I2C_VERSATILE is not set
-CONFIG_I2C_XILINX=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-# CONFIG_I2C_DLN2 is not set
-CONFIG_I2C_PARPORT_LIGHT=m
-# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-# end of I2C Hardware Bus support
-
-CONFIG_I2C_STUB=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SLAVE_EEPROM=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# end of I2C support
-
-# CONFIG_I3C is not set
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_MEM=y
-
-#
-# SPI Master Controller Drivers
-#
-# CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_AXI_SPI_ENGINE is not set
-# CONFIG_SPI_BCM2835 is not set
-# CONFIG_SPI_BCM2835AUX is not set
-# CONFIG_SPI_BCM_QSPI is not set
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_CADENCE=m
-CONFIG_SPI_DESIGNWARE=m
-# CONFIG_SPI_DW_MMIO is not set
-# CONFIG_SPI_DLN2 is not set
-# CONFIG_SPI_FSL_LPSPI is not set
-CONFIG_SPI_FSL_QUADSPI=m
-# CONFIG_SPI_NXP_FLEXSPI is not set
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_IMX=m
-# CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_OC_TINY is not set
-# CONFIG_SPI_OMAP24XX is not set
-# CONFIG_SPI_TI_QSPI is not set
-# CONFIG_SPI_PL022 is not set
-CONFIG_SPI_ROCKCHIP=m
-# CONFIG_SPI_QCOM_QSPI is not set
-CONFIG_SPI_QUP=m
-# CONFIG_SPI_S3C64XX is not set
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_SIFIVE is not set
-# CONFIG_SPI_SUN4I is not set
-# CONFIG_SPI_SUN6I is not set
-# CONFIG_SPI_MXIC is not set
-# CONFIG_SPI_TEGRA20_SFLASH is not set
-CONFIG_SPI_XCOMM=m
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_ZYNQ_QSPI is not set
-# CONFIG_SPI_ZYNQMP_GQSPI is not set
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=m
-# CONFIG_SPI_LOOPBACK_TEST is not set
-CONFIG_SPI_TLE62X0=m
-# CONFIG_SPI_SLAVE is not set
-CONFIG_SPMI=m
-CONFIG_SPMI_MSM_PMIC_ARB=m
-# CONFIG_HSI is not set
-CONFIG_PPS=y
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-CONFIG_PPS_CLIENT_LDISC=m
-# CONFIG_PPS_CLIENT_GPIO is not set
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=y
-
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-# end of PTP clock support
-
-CONFIG_PINCTRL=y
-CONFIG_GENERIC_PINCTRL_GROUPS=y
-CONFIG_PINMUX=y
-CONFIG_GENERIC_PINMUX_FUNCTIONS=y
-CONFIG_PINCONF=y
-CONFIG_GENERIC_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
-CONFIG_PINCTRL_AXP209=m
-# CONFIG_PINCTRL_AMD is not set
-# CONFIG_PINCTRL_MCP23S08 is not set
-CONFIG_PINCTRL_SINGLE=y
-# CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_STMFX is not set
-CONFIG_PINCTRL_ZYNQ=y
-# CONFIG_PINCTRL_RK805 is not set
-# CONFIG_PINCTRL_OCELOT is not set
-CONFIG_PINCTRL_BCM2835=y
-CONFIG_PINCTRL_IMX=y
-CONFIG_PINCTRL_IMX51=y
-CONFIG_PINCTRL_IMX53=y
-CONFIG_PINCTRL_IMX6Q=y
-CONFIG_PINCTRL_IMX6SL=y
-CONFIG_PINCTRL_IMX6SX=y
-CONFIG_PINCTRL_IMX6UL=y
-CONFIG_PINCTRL_IMX7D=y
-CONFIG_PINCTRL_MSM=y
-CONFIG_PINCTRL_APQ8064=m
-CONFIG_PINCTRL_APQ8084=m
-# CONFIG_PINCTRL_IPQ4019 is not set
-CONFIG_PINCTRL_IPQ8064=m
-# CONFIG_PINCTRL_IPQ8074 is not set
-CONFIG_PINCTRL_MSM8660=m
-CONFIG_PINCTRL_MSM8960=m
-# CONFIG_PINCTRL_MDM9615 is not set
-# CONFIG_PINCTRL_MSM8X74 is not set
-CONFIG_PINCTRL_MSM8916=m
-# CONFIG_PINCTRL_MSM8994 is not set
-# CONFIG_PINCTRL_MSM8996 is not set
-CONFIG_PINCTRL_MSM8998=m
-# CONFIG_PINCTRL_QCS404 is not set
-CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
-CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
-# CONFIG_PINCTRL_SC7180 is not set
-# CONFIG_PINCTRL_SDM660 is not set
-# CONFIG_PINCTRL_SDM845 is not set
-# CONFIG_PINCTRL_SM8150 is not set
-CONFIG_PINCTRL_SAMSUNG=y
-CONFIG_PINCTRL_EXYNOS=y
-CONFIG_PINCTRL_EXYNOS_ARM=y
-CONFIG_PINCTRL_SUNXI=y
-CONFIG_PINCTRL_SUN4I_A10=y
-CONFIG_PINCTRL_SUN5I=y
-CONFIG_PINCTRL_SUN6I_A31=y
-CONFIG_PINCTRL_SUN6I_A31_R=y
-CONFIG_PINCTRL_SUN8I_A23=y
-CONFIG_PINCTRL_SUN8I_A33=y
-CONFIG_PINCTRL_SUN8I_A83T=y
-CONFIG_PINCTRL_SUN8I_A83T_R=y
-CONFIG_PINCTRL_SUN8I_A23_R=y
-CONFIG_PINCTRL_SUN8I_H3=y
-CONFIG_PINCTRL_SUN8I_H3_R=y
-CONFIG_PINCTRL_SUN8I_V3S=y
-CONFIG_PINCTRL_SUN9I_A80=y
-CONFIG_PINCTRL_SUN9I_A80_R=y
-# CONFIG_PINCTRL_SUN50I_A64 is not set
-# CONFIG_PINCTRL_SUN50I_A64_R is not set
-# CONFIG_PINCTRL_SUN50I_H5 is not set
-# CONFIG_PINCTRL_SUN50I_H6 is not set
-# CONFIG_PINCTRL_SUN50I_H6_R is not set
-CONFIG_PINCTRL_TEGRA_XUSB=y
-CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIOLIB_FASTPATH_LIMIT=512
-CONFIG_OF_GPIO=y
-CONFIG_GPIOLIB_IRQCHIP=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO drivers
-#
-CONFIG_GPIO_74XX_MMIO=m
-CONFIG_GPIO_ALTERA=m
-# CONFIG_GPIO_CADENCE is not set
-# CONFIG_GPIO_DWAPB is not set
-# CONFIG_GPIO_FTGPIO010 is not set
-CONFIG_GPIO_GENERIC_PLATFORM=y
-# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_HLWD is not set
-# CONFIG_GPIO_MB86S7X is not set
-# CONFIG_GPIO_MENZ127 is not set
-# CONFIG_GPIO_MPC8XXX is not set
-CONFIG_GPIO_MXC=y
-CONFIG_GPIO_OMAP=y
-# CONFIG_GPIO_PL061 is not set
-# CONFIG_GPIO_SAMA5D2_PIOBU is not set
-CONFIG_GPIO_SYSCON=m
-CONFIG_GPIO_TEGRA=y
-CONFIG_GPIO_TS4800=m
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GPIO_ZEVIO is not set
-# CONFIG_GPIO_ZYNQ is not set
-# CONFIG_GPIO_AMD_FCH is not set
-# end of Memory mapped GPIO drivers
-
-#
-# I2C GPIO expanders
-#
-CONFIG_GPIO_ADP5588=m
-# CONFIG_GPIO_ADNP is not set
-# CONFIG_GPIO_GW_PLD is not set
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-# CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TS4900 is not set
-# end of I2C GPIO expanders
-
-#
-# MFD GPIO expanders
-#
-# CONFIG_GPIO_DLN2 is not set
-# CONFIG_HTC_EGPIO is not set
-CONFIG_GPIO_TPS65218=m
-# CONFIG_GPIO_UCB1400 is not set
-# end of MFD GPIO expanders
-
-#
-# SPI GPIO expanders
-#
-CONFIG_GPIO_74X164=m
-# CONFIG_GPIO_MAX3191X is not set
-CONFIG_GPIO_MAX7301=m
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_PISOSR is not set
-# CONFIG_GPIO_XRA1403 is not set
-# end of SPI GPIO expanders
-
-#
-# USB GPIO expanders
-#
-# end of USB GPIO expanders
-
-# CONFIG_GPIO_MOCKUP is not set
-# CONFIG_W1 is not set
-CONFIG_POWER_AVS=y
-CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_BRCMKONA is not set
-# CONFIG_POWER_RESET_BRCMSTB is not set
-# CONFIG_POWER_RESET_GPIO is not set
-CONFIG_POWER_RESET_GPIO_RESTART=y
-CONFIG_POWER_RESET_MSM=y
-CONFIG_POWER_RESET_QCOM_PON=m
-# CONFIG_POWER_RESET_LTC2952 is not set
-# CONFIG_POWER_RESET_RESTART is not set
-CONFIG_POWER_RESET_VERSATILE=y
-CONFIG_POWER_RESET_VEXPRESS=y
-CONFIG_POWER_RESET_SYSCON=y
-CONFIG_POWER_RESET_SYSCON_POWEROFF=y
-CONFIG_REBOOT_MODE=m
-# CONFIG_SYSCON_REBOOT_MODE is not set
-# CONFIG_NVMEM_REBOOT_MODE is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-# CONFIG_PDA_POWER is not set
-# CONFIG_GENERIC_ADC_BATTERY is not set
-# CONFIG_TEST_POWER is not set
-# CONFIG_CHARGER_ADP5061 is not set
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_LEGO_EV3 is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_CHARGER_SBS is not set
-# CONFIG_MANAGER_SBS is not set
-# CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_AXP20X_POWER is not set
-# CONFIG_AXP288_FUEL_GAUGE is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_ISP1704 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# CONFIG_CHARGER_GPIO is not set
-# CONFIG_CHARGER_MANAGER is not set
-# CONFIG_CHARGER_LT3651 is not set
-# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
-# CONFIG_CHARGER_QCOM_SMBB is not set
-# CONFIG_CHARGER_BQ2415X is not set
-# CONFIG_CHARGER_BQ24190 is not set
-# CONFIG_CHARGER_BQ24257 is not set
-# CONFIG_CHARGER_BQ24735 is not set
-# CONFIG_CHARGER_BQ25890 is not set
-# CONFIG_CHARGER_SMB347 is not set
-CONFIG_CHARGER_TPS65217=m
-# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_CHARGER_RT9455 is not set
-# CONFIG_CHARGER_UCS1002 is not set
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_AD7314=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_ADT7310=m
-# CONFIG_SENSORS_ADT7410 is not set
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-# CONFIG_SENSORS_AS370 is not set
-CONFIG_SENSORS_ASC7621=m
-# CONFIG_SENSORS_ASPEED is not set
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-# CONFIG_SENSORS_MC13783_ADC is not set
-CONFIG_SENSORS_FTSTEUTATES=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_G760A=m
-# CONFIG_SENSORS_G762 is not set
-CONFIG_SENSORS_GPIO_FAN=m
-# CONFIG_SENSORS_HIH6130 is not set
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-# CONFIG_SENSORS_IIO_HWMON is not set
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC2990=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX1111=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-# CONFIG_SENSORS_MAX197 is not set
-CONFIG_SENSORS_MAX31722=m
-# CONFIG_SENSORS_MAX6621 is not set
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_MLXREG_FAN=m
-# CONFIG_SENSORS_TC654 is not set
-CONFIG_SENSORS_ADCXX=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM70=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-# CONFIG_SENSORS_LM95234 is not set
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-# CONFIG_SENSORS_NTC_THERMISTOR is not set
-CONFIG_SENSORS_NCT6683=m
-# CONFIG_SENSORS_NCT6775 is not set
-# CONFIG_SENSORS_NCT7802 is not set
-# CONFIG_SENSORS_NCT7904 is not set
-CONFIG_SENSORS_NPCM7XX=m
-# CONFIG_SENSORS_OCC_P8_I2C is not set
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-# CONFIG_SENSORS_IBM_CFFPS is not set
-# CONFIG_SENSORS_INSPUR_IPSPS is not set
-# CONFIG_SENSORS_IR35221 is not set
-# CONFIG_SENSORS_IR38064 is not set
-# CONFIG_SENSORS_IRPS5401 is not set
-# CONFIG_SENSORS_ISL68137 is not set
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-# CONFIG_SENSORS_LTC2978_REGULATOR is not set
-CONFIG_SENSORS_LTC3815=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX20751=m
-# CONFIG_SENSORS_MAX31785 is not set
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-# CONFIG_SENSORS_PXE1610 is not set
-CONFIG_SENSORS_TPS40422=m
-# CONFIG_SENSORS_TPS53679 is not set
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_PWM_FAN=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHT3x=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-# CONFIG_SENSORS_STTS751 is not set
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADS7871=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_INA209=m
-# CONFIG_SENSORS_INA2XX is not set
-CONFIG_SENSORS_INA3221=m
-# CONFIG_SENSORS_TC74 is not set
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-# CONFIG_SENSORS_TMP108 is not set
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-# CONFIG_SENSORS_VEXPRESS is not set
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_W83773G=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-CONFIG_SENSORS_W83795_FANCTRL=y
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_THERMAL=y
-CONFIG_THERMAL_STATISTICS=y
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-CONFIG_THERMAL_OF=y
-# CONFIG_THERMAL_WRITABLE_TRIPS is not set
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
-CONFIG_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-# CONFIG_THERMAL_GOV_BANG_BANG is not set
-# CONFIG_THERMAL_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
-# CONFIG_CPU_THERMAL is not set
-# CONFIG_CLOCK_THERMAL is not set
-# CONFIG_DEVFREQ_THERMAL is not set
-# CONFIG_THERMAL_EMULATION is not set
-# CONFIG_THERMAL_MMIO is not set
-# CONFIG_IMX_THERMAL is not set
-# CONFIG_QORIQ_THERMAL is not set
-
-#
-# Broadcom thermal drivers
-#
-# CONFIG_BCM2835_THERMAL is not set
-# end of Broadcom thermal drivers
-
-#
-# Texas Instruments thermal drivers
-#
-# CONFIG_TI_SOC_THERMAL is not set
-# end of Texas Instruments thermal drivers
-
-#
-# Samsung thermal drivers
-#
-CONFIG_EXYNOS_THERMAL=y
-# end of Samsung thermal drivers
-
-#
-# NVIDIA Tegra thermal drivers
-#
-# CONFIG_TEGRA_SOCTHERM is not set
-# end of NVIDIA Tegra thermal drivers
-
-# CONFIG_GENERIC_ADC_THERMAL is not set
-
-#
-# Qualcomm thermal drivers
-#
-CONFIG_QCOM_TSENS=m
-# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
-# end of Qualcomm thermal drivers
-
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
-CONFIG_WATCHDOG_OPEN_TIMEOUT=0
-CONFIG_WATCHDOG_SYSFS=y
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_GPIO_WATCHDOG=m
-# CONFIG_MENZ069_WATCHDOG is not set
-CONFIG_XILINX_WATCHDOG=m
-# CONFIG_ZIIRAVE_WATCHDOG is not set
-# CONFIG_MLX_WDT is not set
-# CONFIG_ARM_SP805_WATCHDOG is not set
-CONFIG_CADENCE_WATCHDOG=m
-# CONFIG_FTWDT010_WATCHDOG is not set
-CONFIG_HAVE_S3C2410_WATCHDOG=y
-# CONFIG_S3C2410_WATCHDOG is not set
-# CONFIG_DW_WATCHDOG is not set
-CONFIG_OMAP_WATCHDOG=m
-# CONFIG_SUNXI_WATCHDOG is not set
-# CONFIG_TS4800_WATCHDOG is not set
-# CONFIG_MAX63XX_WATCHDOG is not set
-# CONFIG_IMX2_WDT is not set
-# CONFIG_IMX7ULP_WDT is not set
-# CONFIG_TEGRA_WATCHDOG is not set
-CONFIG_QCOM_WDT=m
-# CONFIG_PM8916_WATCHDOG is not set
-# CONFIG_BCM2835_WDT is not set
-# CONFIG_MEN_A21_WDT is not set
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SSB=m
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_DRIVER_GPIO is not set
-CONFIG_BCMA_POSSIBLE=y
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-# CONFIG_BCMA_HOST_SOC is not set
-CONFIG_BCMA_DRIVER_GMAC_CMN=y
-CONFIG_BCMA_DRIVER_GPIO=y
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-# CONFIG_MFD_ACT8945A is not set
-# CONFIG_MFD_SUN4I_GPADC is not set
-# CONFIG_MFD_AS3711 is not set
-# CONFIG_MFD_AS3722 is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
-CONFIG_MFD_ATMEL_HLCDC=m
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_BD9571MWV is not set
-CONFIG_MFD_AC100=m
-CONFIG_MFD_AXP20X=m
-CONFIG_MFD_AXP20X_I2C=m
-CONFIG_MFD_AXP20X_RSB=m
-# CONFIG_MFD_MADERA is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_MFD_DA9052_SPI is not set
-# CONFIG_MFD_DA9052_I2C is not set
-# CONFIG_MFD_DA9055 is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_DA9150 is not set
-CONFIG_MFD_DLN2=m
-# CONFIG_MFD_EXYNOS_LPASS is not set
-CONFIG_MFD_MC13XXX=m
-CONFIG_MFD_MC13XXX_SPI=m
-CONFIG_MFD_MC13XXX_I2C=m
-# CONFIG_MFD_HI6421_PMIC is not set
-CONFIG_HTC_PASIC3=m
-# CONFIG_HTC_I2CPLD is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77620 is not set
-# CONFIG_MFD_MAX77650 is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX77843 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MAX8925 is not set
-# CONFIG_MFD_MAX8997 is not set
-# CONFIG_MFD_MAX8998 is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_MENF21BMC is not set
-# CONFIG_EZX_PCAP is not set
-# CONFIG_MFD_CPCAP is not set
-# CONFIG_MFD_VIPERBOARD is not set
-# CONFIG_MFD_RETU is not set
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_PM8XXX=m
-# CONFIG_MFD_QCOM_RPM is not set
-CONFIG_MFD_SPMI_PMIC=m
-# CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_RC5T583 is not set
-CONFIG_MFD_RK808=m
-# CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_SEC_CORE is not set
-# CONFIG_MFD_SI476X_CORE is not set
-CONFIG_MFD_SM501=m
-# CONFIG_MFD_SM501_GPIO is not set
-# CONFIG_MFD_SKY81452 is not set
-# CONFIG_MFD_SMSC is not set
-CONFIG_ABX500_CORE=y
-# CONFIG_AB3100_CORE is not set
-# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN6I_PRCM=y
-CONFIG_MFD_SYSCON=y
-CONFIG_MFD_TI_AM335X_TSCADC=m
-# CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_LP8788 is not set
-# CONFIG_MFD_TI_LMU is not set
-CONFIG_MFD_OMAP_USB_HOST=y
-# CONFIG_MFD_PALMAS is not set
-# CONFIG_TPS6105X is not set
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-# CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_TPS65090 is not set
-CONFIG_MFD_TPS65217=m
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TI_LP87565 is not set
-CONFIG_MFD_TPS65218=m
-# CONFIG_MFD_TPS6586X is not set
-# CONFIG_MFD_TPS65910 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-# CONFIG_MFD_TPS80031 is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_TWL6040_CORE is not set
-CONFIG_MFD_WL1273_CORE=m
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_TC3589X is not set
-# CONFIG_MFD_T7L66XB is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_TQMX86 is not set
-# CONFIG_MFD_LOCHNAGAR is not set
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM831X_I2C is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MFD_ROHM_BD718XX is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
-# CONFIG_MFD_STPMIC1 is not set
-# CONFIG_MFD_STMFX is not set
-CONFIG_MFD_VEXPRESS_SYSREG=y
-# end of Multifunction device drivers
-
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-# CONFIG_REGULATOR_88PG86X is not set
-# CONFIG_REGULATOR_ACT8865 is not set
-# CONFIG_REGULATOR_AD5398 is not set
-CONFIG_REGULATOR_ANATOP=y
-CONFIG_REGULATOR_AXP20X=m
-# CONFIG_REGULATOR_DA9210 is not set
-CONFIG_REGULATOR_DA9211=m
-# CONFIG_REGULATOR_FAN53555 is not set
-# CONFIG_REGULATOR_GPIO is not set
-CONFIG_REGULATOR_ISL9305=m
-# CONFIG_REGULATOR_ISL6271A is not set
-# CONFIG_REGULATOR_LP3971 is not set
-# CONFIG_REGULATOR_LP3972 is not set
-# CONFIG_REGULATOR_LP872X is not set
-# CONFIG_REGULATOR_LP8755 is not set
-CONFIG_REGULATOR_LTC3589=m
-# CONFIG_REGULATOR_LTC3676 is not set
-# CONFIG_REGULATOR_MAX1586 is not set
-# CONFIG_REGULATOR_MAX8649 is not set
-# CONFIG_REGULATOR_MAX8660 is not set
-# CONFIG_REGULATOR_MAX8952 is not set
-# CONFIG_REGULATOR_MAX8973 is not set
-CONFIG_REGULATOR_MC13XXX_CORE=m
-CONFIG_REGULATOR_MC13783=m
-CONFIG_REGULATOR_MC13892=m
-# CONFIG_REGULATOR_MCP16502 is not set
-# CONFIG_REGULATOR_MT6311 is not set
-# CONFIG_REGULATOR_PBIAS is not set
-# CONFIG_REGULATOR_PCF50633 is not set
-# CONFIG_REGULATOR_PFUZE100 is not set
-CONFIG_REGULATOR_PV88060=m
-# CONFIG_REGULATOR_PV88080 is not set
-CONFIG_REGULATOR_PV88090=m
-CONFIG_REGULATOR_PWM=m
-CONFIG_REGULATOR_QCOM_SMD_RPM=m
-# CONFIG_REGULATOR_QCOM_SPMI is not set
-CONFIG_REGULATOR_RK808=m
-# CONFIG_REGULATOR_SLG51000 is not set
-# CONFIG_REGULATOR_TI_ABB is not set
-# CONFIG_REGULATOR_SY8106A is not set
-# CONFIG_REGULATOR_SY8824X is not set
-# CONFIG_REGULATOR_TPS51632 is not set
-# CONFIG_REGULATOR_TPS62360 is not set
-# CONFIG_REGULATOR_TPS65023 is not set
-# CONFIG_REGULATOR_TPS6507X is not set
-# CONFIG_REGULATOR_TPS65132 is not set
-CONFIG_REGULATOR_TPS65217=m
-CONFIG_REGULATOR_TPS65218=m
-# CONFIG_REGULATOR_TPS6524X is not set
-# CONFIG_REGULATOR_VCTRL is not set
-# CONFIG_REGULATOR_VEXPRESS is not set
-CONFIG_CEC_CORE=y
-CONFIG_CEC_NOTIFIER=y
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-# CONFIG_LIRC is not set
-CONFIG_RC_DECODERS=y
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_SHARP_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_XMP_DECODER=m
-CONFIG_IR_IMON_DECODER=m
-# CONFIG_IR_RCMM_DECODER is not set
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_HIX5HD2=m
-CONFIG_IR_IMON=m
-CONFIG_IR_IMON_RAW=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_IGORPLUGUSB=m
-CONFIG_IR_IGUANA=m
-# CONFIG_IR_TTUSBIR is not set
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_GPIO_CIR=m
-# CONFIG_IR_SUNXI is not set
-# CONFIG_IR_SERIAL is not set
-# CONFIG_IR_SIR is not set
-# CONFIG_RC_XBOX_DVD is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-# CONFIG_MEDIA_SDR_SUPPORT is not set
-# CONFIG_MEDIA_CEC_SUPPORT is not set
-CONFIG_MEDIA_CONTROLLER=y
-# CONFIG_MEDIA_CONTROLLER_DVB is not set
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L2_I2C=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_V4L2_FLASH_LED_CLASS=m
-CONFIG_V4L2_FWNODE=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_DVB_CORE=m
-# CONFIG_DVB_MMAP is not set
-CONFIG_DVB_NET=y
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
-# CONFIG_DVB_ULE_DEBUG is not set
-
-#
-# Media drivers
-#
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-# CONFIG_USB_GSPCA_KONICA is not set
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-# CONFIG_USB_GSPCA_SPCA1528 is not set
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-# CONFIG_USB_GSPCA_SQ930X is not set
-CONFIG_USB_GSPCA_STK014=m
-# CONFIG_USB_GSPCA_STK1135 is not set
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
-CONFIG_USB_GSPCA_ZC3XX=m
-# CONFIG_USB_PWC is not set
-# CONFIG_VIDEO_CPIA2 is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-# CONFIG_VIDEO_USBTV is not set
-
-#
-# Analog TV USB devices
-#
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_USBVISION is not set
-# CONFIG_VIDEO_STK1160_COMMON is not set
-# CONFIG_VIDEO_GO7007 is not set
-
-#
-# Analog/digital TV USB devices
-#
-# CONFIG_VIDEO_AU0828 is not set
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_DIB3000MC=m
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-# CONFIG_DVB_USB_CXUSB_ANALOG is not set
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_DVBSKY=m
-# CONFIG_DVB_USB_ZD1301 is not set
-# CONFIG_SMS_USB_DRV is not set
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-# CONFIG_DVB_AS102 is not set
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-# CONFIG_VIDEO_EM28XX_DVB is not set
-CONFIG_VIDEO_EM28XX_RC=m
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-# CONFIG_VIDEO_CODA is not set
-# CONFIG_VIDEO_IMX_PXP is not set
-CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
-# CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set
-# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set
-# CONFIG_VIDEO_SAMSUNG_S5P_MFC is not set
-# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
-# CONFIG_VIDEO_SH_VEU is not set
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_DVB_PLATFORM_DRIVERS is not set
-
-#
-# Supported MMC/SDIO adapters
-#
-# CONFIG_SMS_SDIO_DRV is not set
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_V4L2=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_DVB_B2C2_FLEXCOP=m
-
-#
-# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
-#
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# I2C Encoders, decoders, sensors and other helper chips
-#
-
-#
-# Audio decoders, processors and mixers
-#
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA1997X is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-CONFIG_VIDEO_MSP3400=m
-# CONFIG_VIDEO_CS3308 is not set
-# CONFIG_VIDEO_CS5345 is not set
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_UDA1342 is not set
-# CONFIG_VIDEO_WM8775 is not set
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_SONY_BTF_MPX is not set
-
-#
-# RDS decoders
-#
-# CONFIG_VIDEO_SAA6588 is not set
-
-#
-# Video decoders
-#
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7183 is not set
-# CONFIG_VIDEO_ADV748X is not set
-# CONFIG_VIDEO_ADV7604 is not set
-# CONFIG_VIDEO_ADV7842 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_ML86V7667 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-CONFIG_VIDEO_SAA711X=m
-# CONFIG_VIDEO_TC358743 is not set
-# CONFIG_VIDEO_TVP514X is not set
-CONFIG_VIDEO_TVP5150=m
-# CONFIG_VIDEO_TVP7002 is not set
-# CONFIG_VIDEO_TW2804 is not set
-# CONFIG_VIDEO_TW9903 is not set
-# CONFIG_VIDEO_TW9906 is not set
-# CONFIG_VIDEO_TW9910 is not set
-# CONFIG_VIDEO_VPX3220 is not set
-
-#
-# Video and audio decoders
-#
-# CONFIG_VIDEO_SAA717X is not set
-CONFIG_VIDEO_CX25840=m
-
-#
-# Video encoders
-#
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV7393 is not set
-# CONFIG_VIDEO_AD9389B is not set
-# CONFIG_VIDEO_AK881X is not set
-# CONFIG_VIDEO_THS8200 is not set
-
-#
-# Camera sensor devices
-#
-# CONFIG_VIDEO_IMX214 is not set
-# CONFIG_VIDEO_IMX258 is not set
-# CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX319 is not set
-# CONFIG_VIDEO_IMX355 is not set
-CONFIG_VIDEO_OV2640=m
-# CONFIG_VIDEO_OV2659 is not set
-# CONFIG_VIDEO_OV2680 is not set
-# CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV5640 is not set
-# CONFIG_VIDEO_OV5645 is not set
-# CONFIG_VIDEO_OV5647 is not set
-# CONFIG_VIDEO_OV6650 is not set
-# CONFIG_VIDEO_OV5670 is not set
-# CONFIG_VIDEO_OV5675 is not set
-# CONFIG_VIDEO_OV5695 is not set
-# CONFIG_VIDEO_OV7251 is not set
-# CONFIG_VIDEO_OV772X is not set
-# CONFIG_VIDEO_OV7640 is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OV7740 is not set
-# CONFIG_VIDEO_OV8856 is not set
-# CONFIG_VIDEO_OV9640 is not set
-# CONFIG_VIDEO_OV9650 is not set
-# CONFIG_VIDEO_OV13858 is not set
-# CONFIG_VIDEO_VS6624 is not set
-# CONFIG_VIDEO_MT9M001 is not set
-# CONFIG_VIDEO_MT9M032 is not set
-# CONFIG_VIDEO_MT9M111 is not set
-# CONFIG_VIDEO_MT9P031 is not set
-# CONFIG_VIDEO_MT9T001 is not set
-# CONFIG_VIDEO_MT9T112 is not set
-CONFIG_VIDEO_MT9V011=m
-# CONFIG_VIDEO_MT9V032 is not set
-# CONFIG_VIDEO_MT9V111 is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_VIDEO_M5MOLS is not set
-# CONFIG_VIDEO_RJ54N1 is not set
-# CONFIG_VIDEO_S5K6AA is not set
-# CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_S5K4ECGX is not set
-# CONFIG_VIDEO_S5K5BAF is not set
-# CONFIG_VIDEO_SMIAPP is not set
-# CONFIG_VIDEO_ET8EK8 is not set
-# CONFIG_VIDEO_S5C73M3 is not set
-
-#
-# Lens drivers
-#
-# CONFIG_VIDEO_AD5820 is not set
-# CONFIG_VIDEO_AK7375 is not set
-# CONFIG_VIDEO_DW9714 is not set
-# CONFIG_VIDEO_DW9807_VCM is not set
-
-#
-# Flash devices
-#
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_LM3560 is not set
-# CONFIG_VIDEO_LM3646 is not set
-
-#
-# Video improvement chips
-#
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-
-#
-# Audio/Video compression chips
-#
-# CONFIG_VIDEO_SAA6752HS is not set
-
-#
-# SDR tuner chips
-#
-
-#
-# Miscellaneous helper chips
-#
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_I2C is not set
-# CONFIG_VIDEO_ST_MIPID02 is not set
-# end of I2C Encoders, decoders, sensors and other helper chips
-
-#
-# SPI helper chips
-#
-# CONFIG_VIDEO_GS1662 is not set
-# end of SPI helper chips
-
-#
-# Media SPI Adapters
-#
-CONFIG_CXD2880_SPI_DRV=m
-# end of Media SPI Adapters
-
-CONFIG_MEDIA_TUNER=m
-
-#
-# Customize TV tuners
-#
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA18250=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_MSI001 is not set
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-# CONFIG_MEDIA_TUNER_MT2131 is not set
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-# CONFIG_MEDIA_TUNER_M88RS6000T is not set
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-# CONFIG_MEDIA_TUNER_MXL301RF is not set
-# CONFIG_MEDIA_TUNER_QM1D1C0042 is not set
-# CONFIG_MEDIA_TUNER_QM1D1B0004 is not set
-# end of Customize TV tuners
-
-#
-# Customise DVB Frontends
-#
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-# CONFIG_DVB_STV0910 is not set
-CONFIG_DVB_STV6110x=m
-# CONFIG_DVB_STV6111 is not set
-# CONFIG_DVB_MXL5XX is not set
-CONFIG_DVB_M88DS3103=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_SI2165=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-
-#
-# DVB-S (satellite) frontends
-#
-# CONFIG_DVB_CX24110 is not set
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-# CONFIG_DVB_ZL10036 is not set
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-# CONFIG_DVB_TDA8083 is not set
-CONFIG_DVB_TDA10086=m
-# CONFIG_DVB_TDA8261 is not set
-# CONFIG_DVB_VES1X93 is not set
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-# CONFIG_DVB_TUA6100 is not set
-CONFIG_DVB_CX24116=m
-# CONFIG_DVB_CX24117 is not set
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_TS2020=m
-CONFIG_DVB_DS3000=m
-# CONFIG_DVB_MB86A16 is not set
-# CONFIG_DVB_TDA10071 is not set
-
-#
-# DVB-T (terrestrial) frontends
-#
-# CONFIG_DVB_SP8870 is not set
-# CONFIG_DVB_SP887X is not set
-# CONFIG_DVB_CX22700 is not set
-CONFIG_DVB_CX22702=m
-# CONFIG_DVB_S5H1432 is not set
-# CONFIG_DVB_DRXD is not set
-# CONFIG_DVB_L64781 is not set
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-# CONFIG_DVB_DIB9000 is not set
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-# CONFIG_DVB_STV0367 is not set
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_CXD2841ER=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_SI2168=m
-# CONFIG_DVB_ZD1301_DEMOD is not set
-CONFIG_DVB_GP8PSK_FE=m
-# CONFIG_DVB_CXD2880 is not set
-
-#
-# DVB-C (cable) frontends
-#
-# CONFIG_DVB_VES1820 is not set
-# CONFIG_DVB_TDA10021 is not set
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-# CONFIG_DVB_OR51211 is not set
-# CONFIG_DVB_OR51132 is not set
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT3306A=m
-CONFIG_DVB_LG2160=m
-# CONFIG_DVB_S5H1409 is not set
-# CONFIG_DVB_AU8522_DTV is not set
-# CONFIG_DVB_AU8522_V4L is not set
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-# CONFIG_DVB_S921 is not set
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_TC90522=m
-# CONFIG_DVB_MN88443X is not set
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-# CONFIG_DVB_DRX39XYJ is not set
-# CONFIG_DVB_LNBH25 is not set
-# CONFIG_DVB_LNBH29 is not set
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-# CONFIG_DVB_ISL6405 is not set
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-# CONFIG_DVB_A8293 is not set
-# CONFIG_DVB_LGS8GL5 is not set
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-# CONFIG_DVB_TDA665x is not set
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-# CONFIG_DVB_HORUS3A is not set
-# CONFIG_DVB_ASCOT2E is not set
-# CONFIG_DVB_HELENE is not set
-
-#
-# Common Interface (EN50221) controller drivers
-#
-# CONFIG_DVB_CXD2099 is not set
-CONFIG_DVB_SP2=m
-
-#
-# Tools to develop new frontends
-#
-# CONFIG_DVB_DUMMY_FE is not set
-# end of Customise DVB Frontends
-
-#
-# Graphics support
-#
-# CONFIG_TEGRA_HOST1X is not set
-CONFIG_IMX_IPUV3_CORE=m
-CONFIG_DRM=m
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_DP_AUX_CHARDEV=y
-# CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-CONFIG_DRM_DP_CEC=y
-CONFIG_DRM_TTM=m
-CONFIG_DRM_GEM_CMA_HELPER=y
-CONFIG_DRM_KMS_CMA_HELPER=y
-CONFIG_DRM_SCHED=m
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# end of I2C encoder or helper chips
-
-#
-# ARM devices
-#
-CONFIG_DRM_HDLCD=m
-# CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
-CONFIG_DRM_MALI_DISPLAY=m
-# CONFIG_DRM_KOMEDA is not set
-# end of ARM devices
-
-#
-# ACP (Audio CoProcessor) Configuration
-#
-# end of ACP (Audio CoProcessor) Configuration
-
-# CONFIG_DRM_VGEM is not set
-# CONFIG_DRM_VKMS is not set
-# CONFIG_DRM_EXYNOS is not set
-# CONFIG_DRM_UDL is not set
-# CONFIG_DRM_ARMADA is not set
-# CONFIG_DRM_ATMEL_HLCDC is not set
-# CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_LVDS is not set
-CONFIG_DRM_SUN4I=m
-CONFIG_DRM_SUN4I_HDMI=m
-# CONFIG_DRM_SUN4I_HDMI_CEC is not set
-CONFIG_DRM_SUN4I_BACKEND=m
-CONFIG_DRM_SUN6I_DSI=m
-CONFIG_DRM_SUN8I_DW_HDMI=m
-CONFIG_DRM_SUN8I_MIXER=m
-CONFIG_DRM_SUN8I_TCON_TOP=m
-# CONFIG_DRM_OMAP is not set
-# CONFIG_DRM_TILCDC is not set
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_MSM=m
-CONFIG_DRM_MSM_GPU_STATE=y
-# CONFIG_DRM_MSM_REGISTER_LOGGING is not set
-# CONFIG_DRM_MSM_GPU_SUDO is not set
-CONFIG_DRM_MSM_HDMI_HDCP=y
-CONFIG_DRM_MSM_DSI=y
-CONFIG_DRM_MSM_DSI_PLL=y
-CONFIG_DRM_MSM_DSI_28NM_PHY=y
-CONFIG_DRM_MSM_DSI_20NM_PHY=y
-# CONFIG_DRM_MSM_DSI_28NM_8960_PHY is not set
-CONFIG_DRM_MSM_DSI_14NM_PHY=y
-CONFIG_DRM_MSM_DSI_10NM_PHY=y
-# CONFIG_DRM_FSL_DCU is not set
-# CONFIG_DRM_TEGRA is not set
-# CONFIG_DRM_STM is not set
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-CONFIG_DRM_PANEL_ARM_VERSATILE=m
-# CONFIG_DRM_PANEL_LVDS is not set
-CONFIG_DRM_PANEL_SIMPLE=m
-# CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
-CONFIG_DRM_PANEL_ILITEK_IL9322=m
-# CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
-# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
-# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
-# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
-# CONFIG_DRM_PANEL_LG_LB035Q02 is not set
-# CONFIG_DRM_PANEL_LG_LG4573 is not set
-# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
-# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
-# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
-CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
-# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
-CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
-CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
-# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
-CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
-# CONFIG_DRM_PANEL_ROCKTECH_JH057N00900 is not set
-# CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
-CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
-# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
-CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
-CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
-# CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set
-CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
-# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
-# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
-# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
-# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
-# CONFIG_DRM_PANEL_TPO_TPG110 is not set
-# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
-# end of Display Panels
-
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_PANEL_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-CONFIG_DRM_ANALOGIX_ANX78XX=m
-# CONFIG_DRM_CDNS_DSI is not set
-CONFIG_DRM_DUMB_VGA_DAC=m
-# CONFIG_DRM_LVDS_ENCODER is not set
-# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
-# CONFIG_DRM_NXP_PTN3460 is not set
-# CONFIG_DRM_PARADE_PS8622 is not set
-# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SII902X is not set
-CONFIG_DRM_SII9234=m
-# CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TOSHIBA_TC358764 is not set
-# CONFIG_DRM_TOSHIBA_TC358767 is not set
-# CONFIG_DRM_TI_TFP410 is not set
-# CONFIG_DRM_TI_SN65DSI86 is not set
-CONFIG_DRM_I2C_ADV7511=m
-# CONFIG_DRM_I2C_ADV7511_AUDIO is not set
-# CONFIG_DRM_I2C_ADV7533 is not set
-CONFIG_DRM_I2C_ADV7511_CEC=y
-CONFIG_DRM_DW_HDMI=m
-CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
-CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
-CONFIG_DRM_DW_HDMI_CEC=m
-# end of Display Interface Bridges
-
-# CONFIG_DRM_STI is not set
-# CONFIG_DRM_IMX is not set
-# CONFIG_DRM_V3D is not set
-# CONFIG_DRM_VC4 is not set
-CONFIG_DRM_ETNAVIV=m
-CONFIG_DRM_ETNAVIV_THERMAL=y
-# CONFIG_DRM_ARCPGU is not set
-# CONFIG_DRM_MXSFB is not set
-# CONFIG_DRM_GM12U320 is not set
-# CONFIG_TINYDRM_HX8357D is not set
-# CONFIG_TINYDRM_ILI9225 is not set
-# CONFIG_TINYDRM_ILI9341 is not set
-# CONFIG_TINYDRM_MI0283QT is not set
-# CONFIG_TINYDRM_REPAPER is not set
-# CONFIG_TINYDRM_ST7586 is not set
-# CONFIG_TINYDRM_ST7735R is not set
-# CONFIG_DRM_PL111 is not set
-CONFIG_DRM_TVE200=m
-# CONFIG_DRM_LIMA is not set
-# CONFIG_DRM_PANFROST is not set
-# CONFIG_DRM_MCDE is not set
-# CONFIG_DRM_LEGACY is not set
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_BACKLIGHT=m
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_ARMCLCD=m
-# CONFIG_FB_IMX is not set
-CONFIG_FB_UVESA=m
-CONFIG_FB_EFI=y
-# CONFIG_FB_OPENCORES is not set
-CONFIG_FB_S1D13XXX=m
-CONFIG_FB_SM501=m
-# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_XILINX is not set
-# CONFIG_FB_DA8XX is not set
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_METRONOME=m
-CONFIG_FB_MX3=m
-# CONFIG_FB_SIMPLE is not set
-# CONFIG_FB_SSD1307 is not set
-# CONFIG_FB_OMAP2 is not set
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LMS283GF05=m
-CONFIG_LCD_LTV350QV=m
-# CONFIG_LCD_ILI922X is not set
-CONFIG_LCD_ILI9320=m
-CONFIG_LCD_TDO24M=m
-CONFIG_LCD_VGG2432A4=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_AMS369FG06=m
-CONFIG_LCD_LMS501KF03=m
-CONFIG_LCD_HX8357=m
-# CONFIG_LCD_OTM3225A is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_PWM=m
-# CONFIG_BACKLIGHT_PM8941_WLED is not set
-CONFIG_BACKLIGHT_ADP8860=m
-# CONFIG_BACKLIGHT_ADP8870 is not set
-CONFIG_BACKLIGHT_PCF50633=m
-# CONFIG_BACKLIGHT_LM3630A is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_TPS65217 is not set
-# CONFIG_BACKLIGHT_GPIO is not set
-# CONFIG_BACKLIGHT_LV5207LP is not set
-# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_ARCXCNN is not set
-# end of Backlight & LCD device support
-
-CONFIG_VIDEOMODE_HELPERS=y
-CONFIG_HDMI=y
-
-#
-# Console display driver support
-#
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
-# end of Console display driver support
-
-# CONFIG_LOGO is not set
-# end of Graphics support
-
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_PCM_ELD=y
-CONFIG_SND_PCM_IEC958=y
-CONFIG_SND_DMAENGINE_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_SEQ_DEVICE=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_JACK_INPUT_DEV=y
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_PCM_TIMER=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=8
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_PROC_FS=y
-# CONFIG_SND_VERBOSE_PROCFS is not set
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_SEQUENCER_OSS=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_SEQ_MIDI_EVENT=m
-CONFIG_SND_SEQ_MIDI=m
-CONFIG_SND_SEQ_VIRMIDI=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-CONFIG_SND_DUMMY=m
-# CONFIG_SND_ALOOP is not set
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-
-#
-# HD-Audio
-#
-# CONFIG_SND_HDA_TEGRA is not set
-# end of HD-Audio
-
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
-CONFIG_SND_ARM=y
-CONFIG_SND_ARMAACI=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_CAIAQ=m
-# CONFIG_SND_USB_CAIAQ_INPUT is not set
-CONFIG_SND_USB_6FIRE=m
-# CONFIG_SND_USB_HIFACE is not set
-# CONFIG_SND_BCD2000 is not set
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
-# CONFIG_SND_SOC_ADI is not set
-CONFIG_SND_SOC_AMD_ACP=m
-CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
-CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
-# CONFIG_SND_ATMEL_SOC is not set
-# CONFIG_SND_BCM2835_SOC_I2S is not set
-# CONFIG_SND_DESIGNWARE_I2S is not set
-
-#
-# SoC Audio for Freescale CPUs
-#
-
-#
-# Common SoC Audio options for Freescale CPUs:
-#
-CONFIG_SND_SOC_FSL_ASRC=m
-CONFIG_SND_SOC_FSL_SAI=m
-# CONFIG_SND_SOC_FSL_AUDMIX is not set
-CONFIG_SND_SOC_FSL_SSI=m
-CONFIG_SND_SOC_FSL_SPDIF=m
-CONFIG_SND_SOC_FSL_ESAI=m
-# CONFIG_SND_SOC_FSL_MICFIL is not set
-CONFIG_SND_SOC_FSL_UTILS=m
-CONFIG_SND_SOC_IMX_PCM_DMA=m
-CONFIG_SND_SOC_IMX_AUDMUX=m
-CONFIG_SND_IMX_SOC=m
-CONFIG_SND_SOC_IMX_PCM_FIQ=m
-CONFIG_SND_SOC_IMX_SSI=m
-
-#
-# SoC Audio support for Freescale i.MX boards:
-#
-CONFIG_SND_SOC_EUKREA_TLV320=m
-CONFIG_SND_SOC_IMX_ES8328=m
-CONFIG_SND_SOC_IMX_SGTL5000=m
-CONFIG_SND_SOC_IMX_SPDIF=m
-CONFIG_SND_SOC_IMX_MC13783=m
-CONFIG_SND_SOC_FSL_ASOC_CARD=m
-# CONFIG_SND_SOC_IMX_AUDMIX is not set
-# end of SoC Audio for Freescale CPUs
-
-# CONFIG_SND_I2S_HI6210_I2S is not set
-# CONFIG_SND_SOC_IMG is not set
-# CONFIG_SND_SOC_MTK_BTCVSD is not set
-CONFIG_SND_SOC_QCOM=m
-CONFIG_SND_SOC_LPASS_CPU=m
-CONFIG_SND_SOC_LPASS_PLATFORM=m
-CONFIG_SND_SOC_LPASS_IPQ806X=m
-CONFIG_SND_SOC_STORM=m
-# CONFIG_SND_SOC_APQ8016_SBC is not set
-# CONFIG_SND_SOC_SAMSUNG is not set
-# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
-
-#
-# STMicroelectronics STM32 SOC audio support
-#
-# end of STMicroelectronics STM32 SOC audio support
-
-#
-# Allwinner SoC Audio support
-#
-CONFIG_SND_SUN4I_CODEC=m
-# CONFIG_SND_SUN8I_CODEC is not set
-# CONFIG_SND_SUN8I_CODEC_ANALOG is not set
-CONFIG_SND_SUN4I_I2S=m
-CONFIG_SND_SUN4I_SPDIF=m
-# end of Allwinner SoC Audio support
-
-#
-# Audio support for Texas Instruments SoCs
-#
-
-#
-# Texas Instruments DAI support for:
-#
-# CONFIG_SND_SOC_DAVINCI_MCASP is not set
-# CONFIG_SND_SOC_OMAP_MCBSP is not set
-
-#
-# Audio support for boards with Texas Instruments SoCs
-#
-# end of Audio support for Texas Instruments SoCs
-
-# CONFIG_SND_SOC_XILINX_I2S is not set
-# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
-# CONFIG_SND_SOC_XILINX_SPDIF is not set
-CONFIG_SND_SOC_XTFPGA_I2S=m
-# CONFIG_ZX_TDM is not set
-CONFIG_SND_SOC_I2C_AND_SPI=m
-
-#
-# CODEC drivers
-#
-# CONFIG_SND_SOC_AC97_CODEC is not set
-# CONFIG_SND_SOC_ADAU1701 is not set
-# CONFIG_SND_SOC_ADAU1761_I2C is not set
-# CONFIG_SND_SOC_ADAU1761_SPI is not set
-CONFIG_SND_SOC_ADAU7002=m
-# CONFIG_SND_SOC_AK4104 is not set
-# CONFIG_SND_SOC_AK4118 is not set
-CONFIG_SND_SOC_AK4458=m
-# CONFIG_SND_SOC_AK4554 is not set
-# CONFIG_SND_SOC_AK4613 is not set
-# CONFIG_SND_SOC_AK4642 is not set
-# CONFIG_SND_SOC_AK5386 is not set
-CONFIG_SND_SOC_AK5558=m
-# CONFIG_SND_SOC_ALC5623 is not set
-CONFIG_SND_SOC_BD28623=m
-# CONFIG_SND_SOC_BT_SCO is not set
-# CONFIG_SND_SOC_CS35L32 is not set
-# CONFIG_SND_SOC_CS35L33 is not set
-# CONFIG_SND_SOC_CS35L34 is not set
-# CONFIG_SND_SOC_CS35L35 is not set
-# CONFIG_SND_SOC_CS35L36 is not set
-# CONFIG_SND_SOC_CS42L42 is not set
-# CONFIG_SND_SOC_CS42L51_I2C is not set
-# CONFIG_SND_SOC_CS42L52 is not set
-# CONFIG_SND_SOC_CS42L56 is not set
-# CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS4265 is not set
-# CONFIG_SND_SOC_CS4270 is not set
-# CONFIG_SND_SOC_CS4271_I2C is not set
-# CONFIG_SND_SOC_CS4271_SPI is not set
-CONFIG_SND_SOC_CS42XX8=m
-CONFIG_SND_SOC_CS42XX8_I2C=m
-# CONFIG_SND_SOC_CS43130 is not set
-# CONFIG_SND_SOC_CS4341 is not set
-# CONFIG_SND_SOC_CS4349 is not set
-# CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_CX2072X is not set
-CONFIG_SND_SOC_DA7219=m
-# CONFIG_SND_SOC_DMIC is not set
-CONFIG_SND_SOC_HDMI_CODEC=m
-# CONFIG_SND_SOC_ES7134 is not set
-# CONFIG_SND_SOC_ES7241 is not set
-# CONFIG_SND_SOC_ES8316 is not set
-CONFIG_SND_SOC_ES8328=m
-CONFIG_SND_SOC_ES8328_I2C=m
-CONFIG_SND_SOC_ES8328_SPI=m
-# CONFIG_SND_SOC_GTM601 is not set
-# CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_MAX98088 is not set
-CONFIG_SND_SOC_MAX98357A=m
-# CONFIG_SND_SOC_MAX98504 is not set
-CONFIG_SND_SOC_MAX9867=m
-# CONFIG_SND_SOC_MAX98927 is not set
-CONFIG_SND_SOC_MAX98373=m
-# CONFIG_SND_SOC_MAX9860 is not set
-# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
-# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
-# CONFIG_SND_SOC_PCM1681 is not set
-CONFIG_SND_SOC_PCM1789=m
-CONFIG_SND_SOC_PCM1789_I2C=m
-# CONFIG_SND_SOC_PCM179X_I2C is not set
-# CONFIG_SND_SOC_PCM179X_SPI is not set
-CONFIG_SND_SOC_PCM186X=m
-CONFIG_SND_SOC_PCM186X_I2C=m
-CONFIG_SND_SOC_PCM186X_SPI=m
-# CONFIG_SND_SOC_PCM3060_I2C is not set
-# CONFIG_SND_SOC_PCM3060_SPI is not set
-# CONFIG_SND_SOC_PCM3168A_I2C is not set
-# CONFIG_SND_SOC_PCM3168A_SPI is not set
-# CONFIG_SND_SOC_PCM512x_I2C is not set
-# CONFIG_SND_SOC_PCM512x_SPI is not set
-# CONFIG_SND_SOC_RK3328 is not set
-CONFIG_SND_SOC_RL6231=m
-# CONFIG_SND_SOC_RT5616 is not set
-# CONFIG_SND_SOC_RT5631 is not set
-CONFIG_SND_SOC_RT5645=m
-CONFIG_SND_SOC_SGTL5000=m
-CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
-# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
-CONFIG_SND_SOC_SPDIF=m
-# CONFIG_SND_SOC_SSM2305 is not set
-# CONFIG_SND_SOC_SSM2602_SPI is not set
-# CONFIG_SND_SOC_SSM2602_I2C is not set
-# CONFIG_SND_SOC_SSM4567 is not set
-# CONFIG_SND_SOC_STA32X is not set
-# CONFIG_SND_SOC_STA350 is not set
-# CONFIG_SND_SOC_STI_SAS is not set
-# CONFIG_SND_SOC_TAS2552 is not set
-# CONFIG_SND_SOC_TAS5086 is not set
-# CONFIG_SND_SOC_TAS571X is not set
-# CONFIG_SND_SOC_TAS5720 is not set
-CONFIG_SND_SOC_TAS6424=m
-CONFIG_SND_SOC_TDA7419=m
-# CONFIG_SND_SOC_TFA9879 is not set
-CONFIG_SND_SOC_TLV320AIC23=m
-CONFIG_SND_SOC_TLV320AIC23_I2C=m
-# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
-# CONFIG_SND_SOC_TLV320AIC31XX is not set
-CONFIG_SND_SOC_TLV320AIC32X4=m
-CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
-CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
-# CONFIG_SND_SOC_TLV320AIC3X is not set
-# CONFIG_SND_SOC_TS3A227E is not set
-CONFIG_SND_SOC_TSCS42XX=m
-# CONFIG_SND_SOC_TSCS454 is not set
-# CONFIG_SND_SOC_UDA1334 is not set
-# CONFIG_SND_SOC_WM8510 is not set
-# CONFIG_SND_SOC_WM8523 is not set
-# CONFIG_SND_SOC_WM8524 is not set
-# CONFIG_SND_SOC_WM8580 is not set
-# CONFIG_SND_SOC_WM8711 is not set
-# CONFIG_SND_SOC_WM8728 is not set
-# CONFIG_SND_SOC_WM8731 is not set
-# CONFIG_SND_SOC_WM8737 is not set
-# CONFIG_SND_SOC_WM8741 is not set
-# CONFIG_SND_SOC_WM8750 is not set
-# CONFIG_SND_SOC_WM8753 is not set
-# CONFIG_SND_SOC_WM8770 is not set
-# CONFIG_SND_SOC_WM8776 is not set
-# CONFIG_SND_SOC_WM8782 is not set
-# CONFIG_SND_SOC_WM8804_I2C is not set
-# CONFIG_SND_SOC_WM8804_SPI is not set
-# CONFIG_SND_SOC_WM8903 is not set
-# CONFIG_SND_SOC_WM8904 is not set
-CONFIG_SND_SOC_WM8960=m
-CONFIG_SND_SOC_WM8962=m
-# CONFIG_SND_SOC_WM8974 is not set
-# CONFIG_SND_SOC_WM8978 is not set
-# CONFIG_SND_SOC_WM8985 is not set
-# CONFIG_SND_SOC_ZX_AUD96P22 is not set
-CONFIG_SND_SOC_MAX9759=m
-CONFIG_SND_SOC_MC13783=m
-# CONFIG_SND_SOC_MT6351 is not set
-# CONFIG_SND_SOC_MT6358 is not set
-# CONFIG_SND_SOC_NAU8540 is not set
-# CONFIG_SND_SOC_NAU8810 is not set
-CONFIG_SND_SOC_NAU8822=m
-# CONFIG_SND_SOC_NAU8824 is not set
-# CONFIG_SND_SOC_TPA6130A2 is not set
-# end of CODEC drivers
-
-CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_CARD=m
-# CONFIG_SND_AUDIO_GRAPH_CARD is not set
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=m
-CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACCUTOUCH is not set
-# CONFIG_HID_ACRUX is not set
-CONFIG_HID_APPLE=m
-# CONFIG_HID_APPLEIR is not set
-CONFIG_HID_ASUS=m
-# CONFIG_HID_AUREAL is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BETOP_FF is not set
-# CONFIG_HID_BIGBEN_FF is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_CORSAIR is not set
-CONFIG_HID_COUGAR=m
-# CONFIG_HID_MACALLY is not set
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CMEDIA=m
-# CONFIG_HID_CP2112 is not set
-# CONFIG_HID_CREATIVE_SB0540 is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-CONFIG_HID_ELAN=m
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GEMBIRD is not set
-# CONFIG_HID_GFRM is not set
-# CONFIG_HID_HOLTEK is not set
-CONFIG_HID_GT683R=m
-CONFIG_HID_KEYTOUCH=m
-# CONFIG_HID_KYE is not set
-CONFIG_HID_UCLOGIC=m
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_VIEWSONIC is not set
-# CONFIG_HID_GYRATION is not set
-CONFIG_HID_ICADE=m
-# CONFIG_HID_ITE is not set
-CONFIG_HID_JABRA=m
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_KENSINGTON is not set
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LED=m
-# CONFIG_HID_LENOVO is not set
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-# CONFIG_HID_MALTRON is not set
-# CONFIG_HID_MAYFLASH is not set
-# CONFIG_HID_REDRAGON is not set
-CONFIG_HID_MICROSOFT=m
-# CONFIG_HID_MONTEREY is not set
-CONFIG_HID_MULTITOUCH=m
-# CONFIG_HID_NTI is not set
-# CONFIG_HID_NTRIG is not set
-CONFIG_HID_ORTEK=m
-# CONFIG_HID_PANTHERLORD is not set
-CONFIG_HID_PENMOUNT=m
-# CONFIG_HID_PETALYNX is not set
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-# CONFIG_HID_PLANTRONICS is not set
-CONFIG_HID_PRIMAX=m
-# CONFIG_HID_RETRODE is not set
-CONFIG_HID_ROCCAT=m
-# CONFIG_HID_SAITEK is not set
-# CONFIG_HID_SAMSUNG is not set
-CONFIG_HID_SONY=m
-CONFIG_SONY_FF=y
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEAM=m
-# CONFIG_HID_STEELSERIES is not set
-# CONFIG_HID_SUNPLUS is not set
-CONFIG_HID_RMI=m
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-CONFIG_HID_THINGM=m
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_UDRAW_PS3 is not set
-# CONFIG_HID_U2FZERO is not set
-# CONFIG_HID_WACOM is not set
-CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-# CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
-CONFIG_HID_ALPS=m
-# end of Special HID drivers
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# end of USB HID Boot Protocol drivers
-# end of USB HID support
-
-#
-# I2C HID support
-#
-CONFIG_I2C_HID=m
-# end of I2C HID support
-# end of HID support
-
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_LED_TRIG=y
-# CONFIG_USB_ULPI_BUS is not set
-# CONFIG_USB_CONN_GPIO is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG_FSM is not set
-CONFIG_USB_LEDS_TRIGGER_USBPORT=m
-CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_MON=m
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-# CONFIG_USB_EHCI_FSL is not set
-# CONFIG_USB_EHCI_MXC is not set
-CONFIG_USB_EHCI_HCD_OMAP=m
-# CONFIG_USB_EHCI_TEGRA is not set
-# CONFIG_USB_EHCI_EXYNOS is not set
-CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-# CONFIG_USB_FOTG210_HCD is not set
-# CONFIG_USB_MAX3421_HCD is not set
-CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OHCI_EXYNOS is not set
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_HCD_ISO=y
-CONFIG_USB_R8A66597_HCD=m
-# CONFIG_USB_IMX21_HCD is not set
-# CONFIG_USB_HCD_BCMA is not set
-CONFIG_USB_HCD_SSB=m
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_VHCI_HC_PORTS=8
-CONFIG_USBIP_VHCI_NR_HCS=1
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-# CONFIG_USB_CDNS3 is not set
-CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_MUSB_HOST=y
-
-#
-# Platform Glue Layer
-#
-# CONFIG_USB_MUSB_SUNXI is not set
-# CONFIG_USB_MUSB_TUSB6010 is not set
-# CONFIG_USB_MUSB_OMAP2PLUS is not set
-# CONFIG_USB_MUSB_AM35X is not set
-CONFIG_USB_MUSB_DSPS=m
-CONFIG_USB_MUSB_AM335X_CHILD=m
-
-#
-# MUSB DMA mode
-#
-# CONFIG_MUSB_PIO_ONLY is not set
-CONFIG_USB_TI_CPPI41_DMA=y
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_ISP1760 is not set
-
-#
-# USB port drivers
-#
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-# CONFIG_USB_SERIAL_SIMPLE is not set
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-# CONFIG_USB_SERIAL_F81232 is not set
-# CONFIG_USB_SERIAL_F8153X is not set
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-# CONFIG_USB_SERIAL_MXUPORT is not set
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-# CONFIG_USB_SERIAL_WISHBONE is not set
-# CONFIG_USB_SERIAL_SSU100 is not set
-CONFIG_USB_SERIAL_QT2=m
-# CONFIG_USB_SERIAL_UPD78F0730 is not set
-CONFIG_USB_SERIAL_DEBUG=m
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-# CONFIG_USB_LEGOTOWER is not set
-CONFIG_USB_LCD=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-# CONFIG_USB_APPLEDISPLAY is not set
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_LD=m
-# CONFIG_USB_TRANCEVIBRATOR is not set
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-CONFIG_USB_ISIGHTFW=m
-# CONFIG_USB_YUREX is not set
-CONFIG_USB_EZUSB_FX2=m
-# CONFIG_USB_HUB_USB251XB is not set
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_HSIC_USB4604=m
-# CONFIG_USB_LINK_LAYER_TEST is not set
-# CONFIG_USB_CHAOSKEY is not set
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-
-#
-# USB Physical Layer drivers
-#
-CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_AM335X_CONTROL_USB=m
-CONFIG_AM335X_PHY_USB=m
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_ISP1301 is not set
-# CONFIG_USB_MXS_PHY is not set
-# CONFIG_USB_TEGRA_PHY is not set
-# CONFIG_USB_ULPI is not set
-# end of USB Physical Layer drivers
-
-# CONFIG_USB_GADGET is not set
-CONFIG_TYPEC=m
-# CONFIG_TYPEC_TCPM is not set
-# CONFIG_TYPEC_UCSI is not set
-CONFIG_TYPEC_TPS6598X=m
-
-#
-# USB Type-C Multiplexer/DeMultiplexer Switch support
-#
-CONFIG_TYPEC_MUX_PI3USB30532=m
-# end of USB Type-C Multiplexer/DeMultiplexer Switch support
-
-#
-# USB Type-C Alternate Mode drivers
-#
-CONFIG_TYPEC_DP_ALTMODE=m
-# CONFIG_TYPEC_NVIDIA_ALTMODE is not set
-# end of USB Type-C Alternate Mode drivers
-
-CONFIG_USB_ROLE_SWITCH=m
-CONFIG_MMC=m
-# CONFIG_PWRSEQ_EMMC is not set
-# CONFIG_PWRSEQ_SD8787 is not set
-# CONFIG_PWRSEQ_SIMPLE is not set
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_SDIO_UART=m
-CONFIG_MMC_TEST=m
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_ARMMMCI=m
-CONFIG_MMC_QCOM_DML=y
-CONFIG_MMC_STM32_SDMMC=y
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_SDHCI_OF_ARASAN=m
-# CONFIG_MMC_SDHCI_OF_ASPEED is not set
-CONFIG_MMC_SDHCI_OF_AT91=m
-CONFIG_MMC_SDHCI_OF_ESDHC=m
-# CONFIG_MMC_SDHCI_OF_DWCMSHC is not set
-# CONFIG_MMC_SDHCI_CADENCE is not set
-CONFIG_MMC_SDHCI_ESDHC_IMX=m
-# CONFIG_MMC_SDHCI_TEGRA is not set
-# CONFIG_MMC_SDHCI_S3C is not set
-CONFIG_MMC_SDHCI_F_SDH30=m
-# CONFIG_MMC_SDHCI_IPROC is not set
-# CONFIG_MMC_OMAP is not set
-CONFIG_MMC_OMAP_HS=m
-CONFIG_MMC_SDHCI_MSM=m
-CONFIG_MMC_MXC=m
-# CONFIG_MMC_SPI is not set
-# CONFIG_MMC_DW is not set
-CONFIG_MMC_VUB300=m
-# CONFIG_MMC_USHC is not set
-# CONFIG_MMC_USDHI6ROL0 is not set
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_SUNXI=m
-CONFIG_MMC_CQHCI=m
-# CONFIG_MMC_BCM2835 is not set
-CONFIG_MMC_MTK=m
-# CONFIG_MMC_SDHCI_XENON is not set
-CONFIG_MMC_SDHCI_OMAP=m
-# CONFIG_MMC_SDHCI_AM654 is not set
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-# CONFIG_MS_BLOCK is not set
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_CLASS_FLASH=m
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
-
-#
-# LED drivers
-#
-CONFIG_LEDS_AAT1290=m
-# CONFIG_LEDS_AN30259A is not set
-# CONFIG_LEDS_AS3645A is not set
-CONFIG_LEDS_BCM6328=m
-CONFIG_LEDS_BCM6358=m
-CONFIG_LEDS_CR0014114=m
-CONFIG_LEDS_LM3530=m
-# CONFIG_LEDS_LM3532 is not set
-# CONFIG_LEDS_LM3642 is not set
-CONFIG_LEDS_LM3692X=m
-CONFIG_LEDS_LM3601X=m
-CONFIG_LEDS_PCA9532=m
-# CONFIG_LEDS_PCA9532_GPIO is not set
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_LP3944=m
-# CONFIG_LEDS_LP3952 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_LP5523 is not set
-# CONFIG_LEDS_LP5562 is not set
-# CONFIG_LEDS_LP8501 is not set
-# CONFIG_LEDS_LP8860 is not set
-CONFIG_LEDS_PCA955X=m
-# CONFIG_LEDS_PCA955X_GPIO is not set
-# CONFIG_LEDS_PCA963X is not set
-CONFIG_LEDS_DAC124S085=m
-# CONFIG_LEDS_PWM is not set
-# CONFIG_LEDS_REGULATOR is not set
-CONFIG_LEDS_BD2802=m
-CONFIG_LEDS_LT3593=m
-# CONFIG_LEDS_MC13783 is not set
-# CONFIG_LEDS_TCA6507 is not set
-CONFIG_LEDS_TLC591XX=m
-# CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_KTD2692 is not set
-# CONFIG_LEDS_IS31FL319X is not set
-# CONFIG_LEDS_IS31FL32XX is not set
-
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_PM8058=m
-CONFIG_LEDS_MLXREG=m
-# CONFIG_LEDS_USER is not set
-# CONFIG_LEDS_SPI_BYTE is not set
-# CONFIG_LEDS_TI_LMU_COMMON is not set
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_DISK=y
-CONFIG_LEDS_TRIGGER_MTD=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_TRIGGER_ACTIVITY=m
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-# CONFIG_LEDS_TRIGGER_CAMERA is not set
-CONFIG_LEDS_TRIGGER_PANIC=y
-CONFIG_LEDS_TRIGGER_NETDEV=m
-# CONFIG_LEDS_TRIGGER_PATTERN is not set
-CONFIG_LEDS_TRIGGER_AUDIO=m
-CONFIG_ACCESSIBILITY=y
-# CONFIG_A11Y_BRAILLE_CONSOLE is not set
-# CONFIG_INFINIBAND is not set
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-# CONFIG_EDAC is not set
-CONFIG_RTC_LIB=y
-CONFIG_RTC_MC146818_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_NVMEM=y
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-# CONFIG_RTC_DRV_ABB5ZES3 is not set
-# CONFIG_RTC_DRV_ABEOZ9 is not set
-# CONFIG_RTC_DRV_ABX80X is not set
-CONFIG_RTC_DRV_AC100=m
-CONFIG_RTC_DRV_DS1307=m
-# CONFIG_RTC_DRV_DS1307_CENTURY is not set
-CONFIG_RTC_DRV_DS1374=m
-# CONFIG_RTC_DRV_DS1374_WDT is not set
-CONFIG_RTC_DRV_DS1672=m
-# CONFIG_RTC_DRV_HYM8563 is not set
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RK808=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-# CONFIG_RTC_DRV_ISL12022 is not set
-CONFIG_RTC_DRV_ISL12026=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF85063=m
-# CONFIG_RTC_DRV_PCF85363 is not set
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8010=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
-# CONFIG_RTC_DRV_RV3028 is not set
-CONFIG_RTC_DRV_RV8803=m
-# CONFIG_RTC_DRV_SD3078 is not set
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_DRV_M41T93=m
-CONFIG_RTC_DRV_M41T94=m
-# CONFIG_RTC_DRV_DS1302 is not set
-CONFIG_RTC_DRV_DS1305=m
-# CONFIG_RTC_DRV_DS1343 is not set
-# CONFIG_RTC_DRV_DS1347 is not set
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_MAX6916=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RX4581=m
-# CONFIG_RTC_DRV_RX6110 is not set
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_PCF2123=m
-# CONFIG_RTC_DRV_MCP795 is not set
-CONFIG_RTC_I2C_AND_SPI=y
-
-#
-# SPI and I2C RTC drivers
-#
-# CONFIG_RTC_DRV_DS3232 is not set
-# CONFIG_RTC_DRV_PCF2127 is not set
-CONFIG_RTC_DRV_RV3029C2=m
-CONFIG_RTC_DRV_RV3029_HWMON=y
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-# CONFIG_RTC_DRV_DS1685_FAMILY is not set
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_DS2404=m
-# CONFIG_RTC_DRV_EFI is not set
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_PCF50633=m
-# CONFIG_RTC_DRV_ZYNQMP is not set
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_IMXDI=m
-# CONFIG_RTC_DRV_OMAP is not set
-CONFIG_HAVE_S3C_RTC=y
-# CONFIG_RTC_DRV_S3C is not set
-CONFIG_RTC_DRV_PL030=m
-CONFIG_RTC_DRV_PL031=m
-CONFIG_RTC_DRV_SUN6I=y
-CONFIG_RTC_DRV_SUNXI=m
-# CONFIG_RTC_DRV_CADENCE is not set
-# CONFIG_RTC_DRV_FTRTC010 is not set
-# CONFIG_RTC_DRV_MC13XXX is not set
-CONFIG_RTC_DRV_PM8XXX=m
-# CONFIG_RTC_DRV_TEGRA is not set
-CONFIG_RTC_DRV_MXC=m
-CONFIG_RTC_DRV_MXC_V2=m
-CONFIG_RTC_DRV_SNVS=m
-# CONFIG_RTC_DRV_R7301 is not set
-
-#
-# HID Sensor RTC drivers
-#
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_VIRTUAL_CHANNELS=y
-CONFIG_DMA_OF=y
-# CONFIG_ALTERA_MSGDMA is not set
-# CONFIG_AMBA_PL08X is not set
-# CONFIG_AXI_DMAC is not set
-# CONFIG_DMA_BCM2835 is not set
-CONFIG_DMA_SUN4I=m
-# CONFIG_DMA_SUN6I is not set
-# CONFIG_DW_AXI_DMAC is not set
-# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_QDMA is not set
-CONFIG_IMX_DMA=m
-CONFIG_IMX_SDMA=m
-# CONFIG_INTEL_IDMA64 is not set
-# CONFIG_MXS_DMA is not set
-CONFIG_MX3_IPU=y
-CONFIG_MX3_IPU_IRQS=4
-# CONFIG_NBPFAXI_DMA is not set
-# CONFIG_PL330_DMA is not set
-# CONFIG_TEGRA20_APB_DMA is not set
-# CONFIG_XILINX_DMA is not set
-# CONFIG_XILINX_ZYNQMP_DMA is not set
-CONFIG_QCOM_BAM_DMA=m
-# CONFIG_QCOM_HIDMA_MGMT is not set
-# CONFIG_QCOM_HIDMA is not set
-# CONFIG_DW_DMAC is not set
-CONFIG_TI_CPPI41=m
-CONFIG_TI_EDMA=y
-CONFIG_DMA_OMAP=y
-CONFIG_TI_DMA_CROSSBAR=y
-
-#
-# DMA Clients
-#
-# CONFIG_ASYNC_TX_DMA is not set
-CONFIG_DMATEST=m
-CONFIG_DMA_ENGINE_RAID=y
-
-#
-# DMABUF options
-#
-CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
-# CONFIG_DMABUF_SELFTESTS is not set
-# end of DMABUF options
-
-CONFIG_AUXDISPLAY=y
-# CONFIG_HD44780 is not set
-# CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_HT16K33 is not set
-# CONFIG_ARM_CHARLCD is not set
-# CONFIG_CHARLCD_BL_OFF is not set
-# CONFIG_CHARLCD_BL_ON is not set
-CONFIG_CHARLCD_BL_FLASH=y
-CONFIG_UIO=m
-CONFIG_UIO_PDRV_GENIRQ=m
-# CONFIG_UIO_DMEM_GENIRQ is not set
-# CONFIG_UIO_PRUSS is not set
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_BALLOON=m
-# CONFIG_VIRTIO_INPUT is not set
-CONFIG_VIRTIO_MMIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-# end of Microsoft Hyper-V guest support
-
-# CONFIG_GREYBUS is not set
-CONFIG_STAGING=y
-# CONFIG_PRISM2_USB is not set
-# CONFIG_COMEDI is not set
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-# CONFIG_RTL8723BS is not set
-# CONFIG_R8712U is not set
-# CONFIG_R8188EU is not set
-# CONFIG_VT6656 is not set
-
-#
-# IIO staging drivers
-#
-
-#
-# Accelerometers
-#
-# CONFIG_ADIS16203 is not set
-# CONFIG_ADIS16240 is not set
-# end of Accelerometers
-
-#
-# Analog to digital converters
-#
-# CONFIG_AD7816 is not set
-# CONFIG_AD7192 is not set
-# CONFIG_AD7280 is not set
-# end of Analog to digital converters
-
-#
-# Analog digital bi-direction converters
-#
-# CONFIG_ADT7316 is not set
-# end of Analog digital bi-direction converters
-
-#
-# Capacitance to digital converters
-#
-# CONFIG_AD7150 is not set
-# CONFIG_AD7746 is not set
-# end of Capacitance to digital converters
-
-#
-# Direct Digital Synthesis
-#
-# CONFIG_AD9832 is not set
-# CONFIG_AD9834 is not set
-# end of Direct Digital Synthesis
-
-#
-# Network Analyzer, Impedance Converters
-#
-# CONFIG_AD5933 is not set
-# end of Network Analyzer, Impedance Converters
-
-#
-# Active energy metering IC
-#
-# CONFIG_ADE7854 is not set
-# end of Active energy metering IC
-
-#
-# Resolver to digital converters
-#
-# CONFIG_AD2S1210 is not set
-# end of Resolver to digital converters
-# end of IIO staging drivers
-
-#
-# Speakup console speech
-#
-# CONFIG_SPEAKUP is not set
-# end of Speakup console speech
-
-# CONFIG_MFD_NVEC is not set
-# CONFIG_STAGING_MEDIA is not set
-
-#
-# Android
-#
-CONFIG_ASHMEM=y
-# CONFIG_ION is not set
-# end of Android
-
-# CONFIG_STAGING_BOARD is not set
-# CONFIG_LTE_GDM724X is not set
-CONFIG_GS_FPGABOOT=m
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
-CONFIG_FB_TFT=m
-# CONFIG_FB_TFT_AGM1264K_FL is not set
-# CONFIG_FB_TFT_BD663474 is not set
-# CONFIG_FB_TFT_HX8340BN is not set
-# CONFIG_FB_TFT_HX8347D is not set
-# CONFIG_FB_TFT_HX8353D is not set
-CONFIG_FB_TFT_HX8357D=m
-# CONFIG_FB_TFT_ILI9163 is not set
-# CONFIG_FB_TFT_ILI9320 is not set
-# CONFIG_FB_TFT_ILI9325 is not set
-# CONFIG_FB_TFT_ILI9340 is not set
-# CONFIG_FB_TFT_ILI9341 is not set
-# CONFIG_FB_TFT_ILI9481 is not set
-# CONFIG_FB_TFT_ILI9486 is not set
-# CONFIG_FB_TFT_PCD8544 is not set
-# CONFIG_FB_TFT_RA8875 is not set
-# CONFIG_FB_TFT_S6D02A1 is not set
-# CONFIG_FB_TFT_S6D1121 is not set
-# CONFIG_FB_TFT_SH1106 is not set
-# CONFIG_FB_TFT_SSD1289 is not set
-# CONFIG_FB_TFT_SSD1305 is not set
-# CONFIG_FB_TFT_SSD1306 is not set
-# CONFIG_FB_TFT_SSD1331 is not set
-# CONFIG_FB_TFT_SSD1351 is not set
-# CONFIG_FB_TFT_ST7735R is not set
-CONFIG_FB_TFT_ST7789V=m
-# CONFIG_FB_TFT_TINYLCD is not set
-# CONFIG_FB_TFT_TLS8204 is not set
-CONFIG_FB_TFT_UC1611=m
-# CONFIG_FB_TFT_UC1701 is not set
-# CONFIG_FB_TFT_UPD161704 is not set
-# CONFIG_FB_TFT_WATTEROTT is not set
-# CONFIG_WILC1000_SDIO is not set
-# CONFIG_WILC1000_SPI is not set
-# CONFIG_MOST is not set
-# CONFIG_KS7010 is not set
-# CONFIG_PI433 is not set
-
-#
-# Gasket devices
-#
-# end of Gasket devices
-
-# CONFIG_XIL_AXIS_FIFO is not set
-# CONFIG_FIELDBUS_DEV is not set
-CONFIG_USB_WUSB=m
-# CONFIG_USB_WUSB_CBAF is not set
-CONFIG_USB_HWA_HCD=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_I1480U=m
-CONFIG_EXFAT_FS=m
-CONFIG_EXFAT_DONT_MOUNT_VFAT=y
-CONFIG_EXFAT_DISCARD=y
-# CONFIG_EXFAT_DELAYED_SYNC is not set
-# CONFIG_EXFAT_KERNEL_DEBUG is not set
-# CONFIG_EXFAT_DEBUG_MSG is not set
-CONFIG_EXFAT_DEFAULT_CODEPAGE=437
-CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_GOLDFISH is not set
-# CONFIG_MFD_CROS_EC is not set
-# CONFIG_CHROME_PLATFORMS is not set
-CONFIG_MELLANOX_PLATFORM=y
-CONFIG_MLXREG_HOTPLUG=m
-CONFIG_MLXREG_IO=m
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-
-#
-# Common Clock Framework
-#
-CONFIG_ICST=y
-CONFIG_COMMON_CLK_VERSATILE=y
-CONFIG_CLK_SP810=y
-CONFIG_CLK_VEXPRESS_OSC=y
-# CONFIG_CLK_HSDK is not set
-# CONFIG_COMMON_CLK_MAX9485 is not set
-CONFIG_COMMON_CLK_RK808=m
-# CONFIG_COMMON_CLK_SI5341 is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-# CONFIG_COMMON_CLK_SI514 is not set
-CONFIG_COMMON_CLK_SI544=m
-# CONFIG_COMMON_CLK_SI570 is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CDCE925 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_AXI_CLKGEN is not set
-# CONFIG_CLK_QORIQ is not set
-# CONFIG_COMMON_CLK_PWM is not set
-# CONFIG_COMMON_CLK_VC5 is not set
-# CONFIG_COMMON_CLK_FIXED_MMIO is not set
-CONFIG_CLK_BCM2835=y
-CONFIG_MXC_CLK=y
-# CONFIG_COMMON_CLK_QCOM is not set
-CONFIG_COMMON_CLK_SAMSUNG=y
-CONFIG_EXYNOS_AUDSS_CLK_CON=y
-CONFIG_CLK_SUNXI=y
-CONFIG_CLK_SUNXI_CLOCKS=y
-CONFIG_CLK_SUNXI_PRCM_SUN6I=y
-CONFIG_CLK_SUNXI_PRCM_SUN8I=y
-CONFIG_CLK_SUNXI_PRCM_SUN9I=y
-CONFIG_SUNXI_CCU=y
-CONFIG_SUN4I_A10_CCU=y
-CONFIG_SUN5I_CCU=y
-# CONFIG_SUN6I_A31_CCU is not set
-# CONFIG_SUN8I_A23_CCU is not set
-# CONFIG_SUN8I_A33_CCU is not set
-CONFIG_SUN8I_A83T_CCU=y
-CONFIG_SUN8I_H3_CCU=y
-CONFIG_SUN8I_V3S_CCU=y
-# CONFIG_SUN8I_DE2_CCU is not set
-CONFIG_SUN8I_R40_CCU=y
-CONFIG_SUN9I_A80_CCU=y
-CONFIG_SUN8I_R_CCU=y
-# CONFIG_COMMON_CLK_TI_ADPLL is not set
-# end of Common Clock Framework
-
-# CONFIG_HWSPINLOCK is not set
-
-#
-# Clock Source drivers
-#
-CONFIG_TIMER_OF=y
-CONFIG_TIMER_PROBE=y
-CONFIG_OMAP_DM_TIMER=y
-CONFIG_CLKSRC_MMIO=y
-CONFIG_BCM2835_TIMER=y
-CONFIG_SUN4I_TIMER=y
-CONFIG_SUN5I_HSTIMER=y
-CONFIG_CADENCE_TTC_TIMER=y
-CONFIG_CLKSRC_TI_32K=y
-CONFIG_ARM_ARCH_TIMER=y
-CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-CONFIG_ARM_GLOBAL_TIMER=y
-CONFIG_ARM_TIMER_SP804=y
-CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
-CONFIG_CLKSRC_EXYNOS_MCT=y
-CONFIG_CLKSRC_SAMSUNG_PWM=y
-CONFIG_CLKSRC_QCOM=y
-CONFIG_CLKSRC_VERSATILE=y
-CONFIG_CLKSRC_IMX_GPT=y
-# end of Clock Source drivers
-
-# CONFIG_MAILBOX is not set
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
-# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
-# end of Generic IOMMU Pagetable Support
-
-# CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_MSM_IOMMU is not set
-# CONFIG_OMAP_IOMMU is not set
-# CONFIG_TEGRA_IOMMU_SMMU is not set
-# CONFIG_EXYNOS_IOMMU is not set
-# CONFIG_ARM_SMMU is not set
-# CONFIG_QCOM_IOMMU is not set
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-CONFIG_RPMSG=m
-# CONFIG_RPMSG_CHAR is not set
-CONFIG_RPMSG_VIRTIO=m
-# end of Rpmsg drivers
-
-# CONFIG_SOUNDWIRE is not set
-
-#
-# SOC (System On Chip) specific Drivers
-#
-
-#
-# Amlogic SoC drivers
-#
-# end of Amlogic SoC drivers
-
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-CONFIG_BCM2835_POWER=y
-# CONFIG_SOC_BRCMSTB is not set
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-CONFIG_FSL_GUTS=y
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-CONFIG_IMX_GPCV2_PM_DOMAINS=y
-# end of i.MX SoC drivers
-
-#
-# Qualcomm SoC drivers
-#
-CONFIG_QCOM_COMMAND_DB=y
-# CONFIG_QCOM_GENI_SE is not set
-CONFIG_QCOM_GSBI=m
-# CONFIG_QCOM_LLCC is not set
-CONFIG_QCOM_MDT_LOADER=m
-# CONFIG_QCOM_PM is not set
-CONFIG_QCOM_RMTFS_MEM=m
-CONFIG_QCOM_SMD_RPM=m
-CONFIG_QCOM_WCNSS_CTRL=m
-# CONFIG_QCOM_APR is not set
-# end of Qualcomm SoC drivers
-
-CONFIG_SOC_SAMSUNG=y
-CONFIG_EXYNOS_CHIPID=y
-CONFIG_EXYNOS_PMU=y
-CONFIG_EXYNOS_PMU_ARM_DRIVERS=y
-CONFIG_EXYNOS_PM_DOMAINS=y
-CONFIG_SUNXI_SRAM=y
-# CONFIG_ARCH_TEGRA_2x_SOC is not set
-# CONFIG_ARCH_TEGRA_3x_SOC is not set
-# CONFIG_ARCH_TEGRA_114_SOC is not set
-# CONFIG_ARCH_TEGRA_124_SOC is not set
-CONFIG_SOC_TEGRA_FUSE=y
-CONFIG_SOC_TI=y
-
-#
-# Xilinx SoC drivers
-#
-CONFIG_XILINX_VCU=m
-# end of Xilinx SoC drivers
-# end of SOC (System On Chip) specific Drivers
-
-CONFIG_PM_DEVFREQ=y
-
-#
-# DEVFREQ Governors
-#
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
-CONFIG_DEVFREQ_GOV_PERFORMANCE=m
-CONFIG_DEVFREQ_GOV_POWERSAVE=m
-CONFIG_DEVFREQ_GOV_USERSPACE=m
-CONFIG_DEVFREQ_GOV_PASSIVE=m
-
-#
-# DEVFREQ Drivers
-#
-# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
-# CONFIG_PM_DEVFREQ_EVENT is not set
-CONFIG_EXTCON=y
-
-#
-# Extcon Device Drivers
-#
-# CONFIG_EXTCON_ADC_JACK is not set
-# CONFIG_EXTCON_FSA9480 is not set
-CONFIG_EXTCON_GPIO=m
-# CONFIG_EXTCON_MAX3355 is not set
-# CONFIG_EXTCON_PTN5150 is not set
-# CONFIG_EXTCON_QCOM_SPMI_MISC is not set
-# CONFIG_EXTCON_RT8973A is not set
-# CONFIG_EXTCON_SM5502 is not set
-# CONFIG_EXTCON_USB_GPIO is not set
-CONFIG_MEMORY=y
-# CONFIG_ARM_PL172_MPMC is not set
-# CONFIG_TI_EMIF is not set
-CONFIG_OMAP_GPMC=y
-# CONFIG_OMAP_GPMC_DEBUG is not set
-# CONFIG_TI_EMIF_SRAM is not set
-CONFIG_PL353_SMC=y
-CONFIG_SAMSUNG_MC=y
-CONFIG_EXYNOS_SROM=y
-CONFIG_TEGRA_MC=y
-CONFIG_IIO=m
-CONFIG_IIO_BUFFER=y
-# CONFIG_IIO_BUFFER_CB is not set
-# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
-CONFIG_IIO_KFIFO_BUF=m
-# CONFIG_IIO_CONFIGFS is not set
-# CONFIG_IIO_TRIGGER is not set
-# CONFIG_IIO_SW_DEVICE is not set
-# CONFIG_IIO_SW_TRIGGER is not set
-
-#
-# Accelerometers
-#
-# CONFIG_ADIS16201 is not set
-# CONFIG_ADIS16209 is not set
-# CONFIG_ADXL372_SPI is not set
-# CONFIG_ADXL372_I2C is not set
-# CONFIG_BMA180 is not set
-# CONFIG_BMA220 is not set
-# CONFIG_BMC150_ACCEL is not set
-# CONFIG_DA280 is not set
-# CONFIG_DA311 is not set
-# CONFIG_DMARD06 is not set
-# CONFIG_DMARD09 is not set
-# CONFIG_DMARD10 is not set
-# CONFIG_HID_SENSOR_ACCEL_3D is not set
-# CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_KXSD9 is not set
-# CONFIG_KXCJK1013 is not set
-# CONFIG_MC3230 is not set
-# CONFIG_MMA7455_I2C is not set
-# CONFIG_MMA7455_SPI is not set
-# CONFIG_MMA7660 is not set
-# CONFIG_MMA8452 is not set
-# CONFIG_MMA9551 is not set
-# CONFIG_MMA9553 is not set
-# CONFIG_MXC4005 is not set
-# CONFIG_MXC6255 is not set
-# CONFIG_SCA3000 is not set
-# CONFIG_STK8312 is not set
-# CONFIG_STK8BA50 is not set
-# end of Accelerometers
-
-#
-# Analog to digital converters
-#
-# CONFIG_AD7124 is not set
-# CONFIG_AD7266 is not set
-# CONFIG_AD7291 is not set
-# CONFIG_AD7298 is not set
-# CONFIG_AD7476 is not set
-# CONFIG_AD7606_IFACE_PARALLEL is not set
-# CONFIG_AD7606_IFACE_SPI is not set
-# CONFIG_AD7766 is not set
-# CONFIG_AD7768_1 is not set
-# CONFIG_AD7780 is not set
-# CONFIG_AD7791 is not set
-# CONFIG_AD7793 is not set
-# CONFIG_AD7887 is not set
-# CONFIG_AD7923 is not set
-# CONFIG_AD7949 is not set
-# CONFIG_AD799X is not set
-# CONFIG_AXP20X_ADC is not set
-# CONFIG_AXP288_ADC is not set
-# CONFIG_CC10001_ADC is not set
-# CONFIG_DLN2_ADC is not set
-# CONFIG_ENVELOPE_DETECTOR is not set
-# CONFIG_EXYNOS_ADC is not set
-# CONFIG_HI8435 is not set
-# CONFIG_HX711 is not set
-# CONFIG_INA2XX_ADC is not set
-# CONFIG_IMX7D_ADC is not set
-# CONFIG_LTC2471 is not set
-# CONFIG_LTC2485 is not set
-# CONFIG_LTC2497 is not set
-# CONFIG_MAX1027 is not set
-# CONFIG_MAX11100 is not set
-# CONFIG_MAX1118 is not set
-# CONFIG_MAX1363 is not set
-# CONFIG_MAX9611 is not set
-# CONFIG_MCP320X is not set
-# CONFIG_MCP3422 is not set
-# CONFIG_MCP3911 is not set
-# CONFIG_MEN_Z188_ADC is not set
-# CONFIG_NAU7802 is not set
-# CONFIG_QCOM_PM8XXX_XOADC is not set
-# CONFIG_QCOM_SPMI_IADC is not set
-# CONFIG_QCOM_SPMI_VADC is not set
-# CONFIG_QCOM_SPMI_ADC5 is not set
-# CONFIG_SD_ADC_MODULATOR is not set
-# CONFIG_SUN4I_GPADC is not set
-# CONFIG_TI_ADC081C is not set
-# CONFIG_TI_ADC0832 is not set
-# CONFIG_TI_ADC084S021 is not set
-# CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC108S102 is not set
-# CONFIG_TI_ADC128S052 is not set
-# CONFIG_TI_ADC161S626 is not set
-# CONFIG_TI_ADS1015 is not set
-# CONFIG_TI_ADS7950 is not set
-# CONFIG_TI_ADS8344 is not set
-# CONFIG_TI_ADS8688 is not set
-# CONFIG_TI_ADS124S08 is not set
-CONFIG_TI_AM335X_ADC=m
-# CONFIG_TI_TLC4541 is not set
-# CONFIG_VF610_ADC is not set
-# CONFIG_XILINX_XADC is not set
-# end of Analog to digital converters
-
-#
-# Analog Front Ends
-#
-# CONFIG_IIO_RESCALE is not set
-# end of Analog Front Ends
-
-#
-# Amplifiers
-#
-# CONFIG_AD8366 is not set
-# end of Amplifiers
-
-#
-# Chemical Sensors
-#
-# CONFIG_ATLAS_PH_SENSOR is not set
-# CONFIG_BME680 is not set
-# CONFIG_CCS811 is not set
-# CONFIG_IAQCORE is not set
-# CONFIG_SENSIRION_SGP30 is not set
-# CONFIG_SPS30 is not set
-# CONFIG_VZ89X is not set
-# end of Chemical Sensors
-
-#
-# Hid Sensor IIO Common
-#
-# CONFIG_HID_SENSOR_IIO_COMMON is not set
-# end of Hid Sensor IIO Common
-
-#
-# SSP Sensor Common
-#
-# CONFIG_IIO_SSP_SENSORHUB is not set
-# end of SSP Sensor Common
-
-#
-# Digital to analog converters
-#
-# CONFIG_AD5064 is not set
-# CONFIG_AD5360 is not set
-# CONFIG_AD5380 is not set
-# CONFIG_AD5421 is not set
-# CONFIG_AD5446 is not set
-# CONFIG_AD5449 is not set
-# CONFIG_AD5592R is not set
-# CONFIG_AD5593R is not set
-# CONFIG_AD5504 is not set
-# CONFIG_AD5624R_SPI is not set
-# CONFIG_LTC1660 is not set
-# CONFIG_LTC2632 is not set
-# CONFIG_AD5686_SPI is not set
-# CONFIG_AD5696_I2C is not set
-# CONFIG_AD5755 is not set
-# CONFIG_AD5758 is not set
-# CONFIG_AD5761 is not set
-# CONFIG_AD5764 is not set
-# CONFIG_AD5791 is not set
-# CONFIG_AD7303 is not set
-# CONFIG_AD8801 is not set
-# CONFIG_DPOT_DAC is not set
-# CONFIG_DS4424 is not set
-# CONFIG_M62332 is not set
-# CONFIG_MAX517 is not set
-# CONFIG_MAX5821 is not set
-# CONFIG_MCP4725 is not set
-# CONFIG_MCP4922 is not set
-# CONFIG_TI_DAC082S085 is not set
-# CONFIG_TI_DAC5571 is not set
-# CONFIG_TI_DAC7311 is not set
-# CONFIG_TI_DAC7612 is not set
-# CONFIG_VF610_DAC is not set
-# end of Digital to analog converters
-
-#
-# IIO dummy driver
-#
-# end of IIO dummy driver
-
-#
-# Frequency Synthesizers DDS/PLL
-#
-
-#
-# Clock Generator/Distribution
-#
-# CONFIG_AD9523 is not set
-# end of Clock Generator/Distribution
-
-#
-# Phase-Locked Loop (PLL) frequency synthesizers
-#
-# CONFIG_ADF4350 is not set
-# CONFIG_ADF4371 is not set
-# end of Phase-Locked Loop (PLL) frequency synthesizers
-# end of Frequency Synthesizers DDS/PLL
-
-#
-# Digital gyroscope sensors
-#
-# CONFIG_ADIS16080 is not set
-# CONFIG_ADIS16130 is not set
-# CONFIG_ADIS16136 is not set
-# CONFIG_ADIS16260 is not set
-# CONFIG_ADXRS450 is not set
-# CONFIG_BMG160 is not set
-# CONFIG_FXAS21002C is not set
-# CONFIG_HID_SENSOR_GYRO_3D is not set
-# CONFIG_MPU3050_I2C is not set
-# CONFIG_IIO_ST_GYRO_3AXIS is not set
-# CONFIG_ITG3200 is not set
-# end of Digital gyroscope sensors
-
-#
-# Health Sensors
-#
-
-#
-# Heart Rate Monitors
-#
-# CONFIG_AFE4403 is not set
-# CONFIG_AFE4404 is not set
-# CONFIG_MAX30100 is not set
-# CONFIG_MAX30102 is not set
-# end of Heart Rate Monitors
-# end of Health Sensors
-
-#
-# Humidity sensors
-#
-# CONFIG_AM2315 is not set
-# CONFIG_DHT11 is not set
-# CONFIG_HDC100X is not set
-# CONFIG_HID_SENSOR_HUMIDITY is not set
-# CONFIG_HTS221 is not set
-# CONFIG_HTU21 is not set
-# CONFIG_SI7005 is not set
-# CONFIG_SI7020 is not set
-# end of Humidity sensors
-
-#
-# Inertial measurement units
-#
-# CONFIG_ADIS16400 is not set
-# CONFIG_ADIS16460 is not set
-# CONFIG_ADIS16480 is not set
-# CONFIG_BMI160_I2C is not set
-# CONFIG_BMI160_SPI is not set
-# CONFIG_KMX61 is not set
-# CONFIG_INV_MPU6050_I2C is not set
-# CONFIG_INV_MPU6050_SPI is not set
-# CONFIG_IIO_ST_LSM6DSX is not set
-# end of Inertial measurement units
-
-#
-# Light sensors
-#
-# CONFIG_ADJD_S311 is not set
-# CONFIG_AL3320A is not set
-# CONFIG_APDS9300 is not set
-# CONFIG_APDS9960 is not set
-# CONFIG_BH1750 is not set
-# CONFIG_BH1780 is not set
-# CONFIG_CM32181 is not set
-# CONFIG_CM3232 is not set
-# CONFIG_CM3323 is not set
-# CONFIG_CM3605 is not set
-# CONFIG_CM36651 is not set
-# CONFIG_GP2AP020A00F is not set
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
-# CONFIG_ISL29125 is not set
-# CONFIG_HID_SENSOR_ALS is not set
-# CONFIG_HID_SENSOR_PROX is not set
-# CONFIG_JSA1212 is not set
-# CONFIG_RPR0521 is not set
-# CONFIG_LTR501 is not set
-# CONFIG_LV0104CS is not set
-# CONFIG_MAX44000 is not set
-# CONFIG_MAX44009 is not set
-# CONFIG_NOA1305 is not set
-# CONFIG_OPT3001 is not set
-# CONFIG_PA12203001 is not set
-# CONFIG_SI1133 is not set
-# CONFIG_SI1145 is not set
-# CONFIG_STK3310 is not set
-# CONFIG_ST_UVIS25 is not set
-# CONFIG_TCS3414 is not set
-# CONFIG_TCS3472 is not set
-# CONFIG_SENSORS_TSL2563 is not set
-# CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
-# CONFIG_TSL4531 is not set
-# CONFIG_US5182D is not set
-# CONFIG_VCNL4000 is not set
-# CONFIG_VCNL4035 is not set
-# CONFIG_VEML6070 is not set
-# CONFIG_VL6180 is not set
-# CONFIG_ZOPT2201 is not set
-# end of Light sensors
-
-#
-# Magnetometer sensors
-#
-# CONFIG_AK8974 is not set
-# CONFIG_AK8975 is not set
-# CONFIG_AK09911 is not set
-# CONFIG_BMC150_MAGN_I2C is not set
-# CONFIG_BMC150_MAGN_SPI is not set
-# CONFIG_MAG3110 is not set
-# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
-# CONFIG_MMC35240 is not set
-# CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_SENSORS_HMC5843_I2C is not set
-# CONFIG_SENSORS_HMC5843_SPI is not set
-# CONFIG_SENSORS_RM3100_I2C is not set
-# CONFIG_SENSORS_RM3100_SPI is not set
-# end of Magnetometer sensors
-
-#
-# Multiplexers
-#
-# CONFIG_IIO_MUX is not set
-# end of Multiplexers
-
-#
-# Inclinometer sensors
-#
-# CONFIG_HID_SENSOR_INCLINOMETER_3D is not set
-# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
-# end of Inclinometer sensors
-
-#
-# Digital potentiometers
-#
-# CONFIG_AD5272 is not set
-# CONFIG_DS1803 is not set
-# CONFIG_MAX5432 is not set
-# CONFIG_MAX5481 is not set
-# CONFIG_MAX5487 is not set
-# CONFIG_MCP4018 is not set
-# CONFIG_MCP4131 is not set
-# CONFIG_MCP4531 is not set
-# CONFIG_MCP41010 is not set
-# CONFIG_TPL0102 is not set
-# end of Digital potentiometers
-
-#
-# Digital potentiostats
-#
-# CONFIG_LMP91000 is not set
-# end of Digital potentiostats
-
-#
-# Pressure sensors
-#
-# CONFIG_ABP060MG is not set
-# CONFIG_BMP280 is not set
-# CONFIG_DPS310 is not set
-# CONFIG_HID_SENSOR_PRESS is not set
-# CONFIG_HP03 is not set
-# CONFIG_MPL115_I2C is not set
-# CONFIG_MPL115_SPI is not set
-# CONFIG_MPL3115 is not set
-# CONFIG_MS5611 is not set
-# CONFIG_MS5637 is not set
-# CONFIG_IIO_ST_PRESS is not set
-# CONFIG_T5403 is not set
-# CONFIG_HP206C is not set
-# CONFIG_ZPA2326 is not set
-# end of Pressure sensors
-
-#
-# Lightning sensors
-#
-# CONFIG_AS3935 is not set
-# end of Lightning sensors
-
-#
-# Proximity and distance sensors
-#
-# CONFIG_ISL29501 is not set
-# CONFIG_LIDAR_LITE_V2 is not set
-# CONFIG_MB1232 is not set
-# CONFIG_RFD77402 is not set
-# CONFIG_SRF04 is not set
-# CONFIG_SX9500 is not set
-# CONFIG_SRF08 is not set
-# CONFIG_VL53L0X_I2C is not set
-# end of Proximity and distance sensors
-
-#
-# Resolver to digital converters
-#
-# CONFIG_AD2S90 is not set
-# CONFIG_AD2S1200 is not set
-# end of Resolver to digital converters
-
-#
-# Temperature sensors
-#
-# CONFIG_MAXIM_THERMOCOUPLE is not set
-# CONFIG_HID_SENSOR_TEMP is not set
-# CONFIG_MLX90614 is not set
-# CONFIG_MLX90632 is not set
-# CONFIG_TMP006 is not set
-# CONFIG_TMP007 is not set
-# CONFIG_TSYS01 is not set
-# CONFIG_TSYS02D is not set
-# CONFIG_MAX31856 is not set
-# end of Temperature sensors
-
-CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
-# CONFIG_PWM_ATMEL_HLCDC_PWM is not set
-# CONFIG_PWM_BCM2835 is not set
-# CONFIG_PWM_FSL_FTM is not set
-# CONFIG_PWM_IMX1 is not set
-# CONFIG_PWM_IMX27 is not set
-# CONFIG_PWM_IMX_TPM is not set
-# CONFIG_PWM_OMAP_DMTIMER is not set
-# CONFIG_PWM_PCA9685 is not set
-# CONFIG_PWM_SAMSUNG is not set
-CONFIG_PWM_SUN4I=m
-# CONFIG_PWM_TEGRA is not set
-# CONFIG_PWM_TIECAP is not set
-# CONFIG_PWM_TIEHRPWM is not set
-
-#
-# IRQ chip support
-#
-CONFIG_IRQCHIP=y
-CONFIG_ARM_GIC=y
-CONFIG_ARM_GIC_MAX_NR=1
-CONFIG_GIC_NON_BANKED=y
-# CONFIG_AL_FIC is not set
-CONFIG_OMAP_IRQCHIP=y
-# CONFIG_TS4800_IRQ is not set
-CONFIG_IMX_GPCV2=y
-CONFIG_QCOM_PDC=y
-CONFIG_IMX_IRQSTEER=y
-# end of IRQ chip support
-
-# CONFIG_IPACK_BUS is not set
-CONFIG_ARCH_HAS_RESET_CONTROLLER=y
-CONFIG_RESET_CONTROLLER=y
-CONFIG_RESET_IMX7=y
-# CONFIG_RESET_QCOM_AOSS is not set
-# CONFIG_RESET_QCOM_PDC is not set
-CONFIG_RESET_SIMPLE=y
-CONFIG_RESET_SUNXI=y
-# CONFIG_RESET_TI_SYSCON is not set
-CONFIG_RESET_ZYNQ=y
-
-#
-# PHY Subsystem
-#
-CONFIG_GENERIC_PHY=y
-CONFIG_GENERIC_PHY_MIPI_DPHY=y
-CONFIG_PHY_SUN4I_USB=m
-CONFIG_PHY_SUN6I_MIPI_DPHY=m
-CONFIG_PHY_SUN9I_USB=m
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_CADENCE_DP is not set
-# CONFIG_PHY_CADENCE_DPHY is not set
-# CONFIG_PHY_CADENCE_SIERRA is not set
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_CPCAP_USB is not set
-# CONFIG_PHY_MAPPHONE_MDM6600 is not set
-# CONFIG_PHY_OCELOT_SERDES is not set
-CONFIG_PHY_QCOM_APQ8064_SATA=m
-CONFIG_PHY_QCOM_IPQ806X_SATA=m
-# CONFIG_PHY_QCOM_PCIE2 is not set
-# CONFIG_PHY_QCOM_QMP is not set
-# CONFIG_PHY_QCOM_QUSB2 is not set
-CONFIG_PHY_QCOM_UFS=m
-CONFIG_PHY_QCOM_UFS_14NM=m
-CONFIG_PHY_EXYNOS_DP_VIDEO=y
-CONFIG_PHY_EXYNOS_MIPI_VIDEO=y
-# CONFIG_PHY_EXYNOS_PCIE is not set
-# CONFIG_PHY_EXYNOS5250_SATA is not set
-# CONFIG_PHY_TEGRA_XUSB is not set
-# CONFIG_PHY_DM816X_USB is not set
-# CONFIG_OMAP_CONTROL_PHY is not set
-# CONFIG_OMAP_USB2 is not set
-# CONFIG_TI_PIPE3 is not set
-CONFIG_PHY_TI_GMII_SEL=m
-# end of PHY Subsystem
-
-# CONFIG_POWERCAP is not set
-CONFIG_MCB=m
-# CONFIG_MCB_LPC is not set
-
-#
-# Performance monitor support
-#
-CONFIG_ARM_CCI_PMU=y
-CONFIG_ARM_CCI400_PMU=y
-CONFIG_ARM_CCI5xx_PMU=y
-CONFIG_ARM_CCN=y
-CONFIG_ARM_PMU=y
-# CONFIG_FSL_IMX8_DDR_PMU is not set
-# end of Performance monitor support
-
-CONFIG_RAS=y
-
-#
-# Android
-#
-CONFIG_ANDROID=y
-CONFIG_ANDROID_BINDER_IPC=y
-# CONFIG_ANDROID_BINDERFS is not set
-CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
-CONFIG_ANDROID_BINDER_IPC_SELFTEST=y
-# end of Android
-
-CONFIG_DAX=m
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SYSFS=y
-# CONFIG_NVMEM_IMX_IIM is not set
-CONFIG_NVMEM_IMX_OCOTP=m
-CONFIG_QCOM_QFPROM=m
-CONFIG_NVMEM_SUNXI_SID=m
-CONFIG_NVMEM_SNVS_LPGPR=m
-
-#
-# HW tracing support
-#
-# CONFIG_STM is not set
-# CONFIG_INTEL_TH is not set
-# end of HW tracing support
-
-# CONFIG_FPGA is not set
-# CONFIG_FSI is not set
-# CONFIG_TEE is not set
-CONFIG_PM_OPP=y
-# CONFIG_SIOX is not set
-# CONFIG_SLIMBUS is not set
-# CONFIG_INTERCONNECT is not set
-# CONFIG_COUNTER is not set
-# end of Device Drivers
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-# CONFIG_VALIDATE_FS_PARSER is not set
-CONFIG_FS_IOMAP=y
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-# CONFIG_REISERFS_FS_SECURITY is not set
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-CONFIG_XFS_ONLINE_SCRUB=y
-# CONFIG_XFS_ONLINE_REPAIR is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-# CONFIG_OCFS2_FS_STATS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-# CONFIG_BTRFS_FS is not set
-CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=m
-# CONFIG_F2FS_STAT_FS is not set
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-# CONFIG_F2FS_FS_SECURITY is not set
-# CONFIG_F2FS_CHECK_FS is not set
-# CONFIG_F2FS_IO_TRACE is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_EXPORTFS_BLOCK_OPS=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_MANDATORY_FILE_LOCKING is not set
-CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_DNOTIFY is not set
-CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-# CONFIG_QFMT_V1 is not set
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_AUTOFS_FS=m
-CONFIG_FUSE_FS=m
-# CONFIG_CUSE is not set
-CONFIG_VIRTIO_FS=m
-CONFIG_OVERLAY_FS=m
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
-# CONFIG_OVERLAY_FS_INDEX is not set
-# CONFIG_OVERLAY_FS_XINO_AUTO is not set
-# CONFIG_OVERLAY_FS_METACOPY is not set
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_FAT_DEFAULT_UTF8 is not set
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-# end of DOS/FAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PROC_CHILDREN is not set
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_CONFIGFS_FS=m
-CONFIG_EFIVAR_FS=m
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_ORANGEFS_FS=m
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-CONFIG_EFS_FS=m
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_FS_XATTR=y
-CONFIG_JFFS2_FS_POSIX_ACL=y
-CONFIG_JFFS2_FS_SECURITY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RTIME=y
-CONFIG_JFFS2_RUBIN=y
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-CONFIG_UBIFS_FS=m
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
-# CONFIG_UBIFS_ATIME_SUPPORT is not set
-CONFIG_UBIFS_FS_XATTR=y
-CONFIG_UBIFS_FS_SECURITY=y
-# CONFIG_UBIFS_FS_AUTHENTICATION is not set
-# CONFIG_CRAMFS is not set
-CONFIG_SQUASHFS=m
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-CONFIG_SQUASHFS_DECOMP_MULTI=y
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZSTD is not set
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-CONFIG_MINIX_FS=m
-# CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-CONFIG_ROMFS_FS=m
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
-# CONFIG_ROMFS_BACKED_BY_MTD is not set
-# CONFIG_ROMFS_BACKED_BY_BOTH is not set
-CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_PSTORE=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=y
-# CONFIG_PSTORE_LZO_COMPRESS is not set
-# CONFIG_PSTORE_LZ4_COMPRESS is not set
-# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
-# CONFIG_PSTORE_842_COMPRESS is not set
-# CONFIG_PSTORE_ZSTD_COMPRESS is not set
-CONFIG_PSTORE_COMPRESS=y
-CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
-CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-# CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
-# CONFIG_SYSV_FS is not set
-CONFIG_UFS_FS=m
-CONFIG_UFS_FS_WRITE=y
-# CONFIG_UFS_DEBUG is not set
-# CONFIG_EROFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
-# CONFIG_NFS_V4_1_MIGRATION is not set
-CONFIG_NFS_V4_SECURITY_LABEL=y
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_BLOCKLAYOUT=y
-CONFIG_NFSD_SCSILAYOUT=y
-CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFSD_V4_SECURITY_LABEL is not set
-CONFIG_GRACE_PERIOD=m
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
-# CONFIG_SUNRPC_DEBUG is not set
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CEPH_FS_POSIX_ACL=y
-# CONFIG_CEPH_FS_SECURITY_LABEL is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_UPCALL is not set
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_DEBUG=y
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_FSCACHE=y
-CONFIG_CODA_FS=m
-# CONFIG_AFS_FS is not set
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-# CONFIG_9P_FS_SECURITY is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-# CONFIG_UNICODE is not set
-# end of File systems
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_REQUEST_CACHE=y
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_KEY_DH_OPERATIONS=y
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_HARDENED_USERCOPY_FALLBACK=y
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
-CONFIG_FORTIFY_SOURCE=y
-# CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_HASH=y
-CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
-# CONFIG_SECURITY_APPARMOR_DEBUG is not set
-# CONFIG_SECURITY_LOADPIN is not set
-CONFIG_SECURITY_YAMA=y
-# CONFIG_SECURITY_SAFESETID is not set
-# CONFIG_SECURITY_LOCKDOWN_LSM is not set
-# CONFIG_INTEGRITY is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=m
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_KPP=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_SIMD=m
-CONFIG_CRYPTO_ENGINE=m
-
-#
-# Public-key cryptography
-#
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECC=m
-CONFIG_CRYPTO_ECDH=m
-# CONFIG_CRYPTO_ECRDSA is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128_SIMD=y
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CFB=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=m
-# CONFIG_CRYPTO_OFB is not set
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m
-CONFIG_CRYPTO_NHPOLY1305=m
-# CONFIG_CRYPTO_ADIANTUM is not set
-CONFIG_CRYPTO_ESSIV=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32=m
-# CONFIG_CRYPTO_XXHASH is not set
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=m
-# CONFIG_CRYPTO_842 is not set
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-CONFIG_CRYPTO_ZSTD=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=m
-CONFIG_CRYPTO_DRBG_HMAC=y
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-CONFIG_CRYPTO_DRBG=m
-CONFIG_CRYPTO_JITTERENTROPY=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
-CONFIG_CRYPTO_HASH_INFO=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON=m
-CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m
-CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC=m
-CONFIG_CRYPTO_DEV_FSL_CAAM=m
-# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
-CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
-CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
-# CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set
-CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
-# CONFIG_CRYPTO_DEV_OMAP is not set
-# CONFIG_CRYPTO_DEV_SAHARA is not set
-# CONFIG_CRYPTO_DEV_EXYNOS_RNG is not set
-# CONFIG_CRYPTO_DEV_S5P is not set
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
-CONFIG_CRYPTO_DEV_MXS_DCP=m
-CONFIG_CRYPTO_DEV_QCE=m
-CONFIG_CRYPTO_DEV_QCOM_RNG=m
-CONFIG_CRYPTO_DEV_SUN4I_SS=m
-# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set
-CONFIG_CRYPTO_DEV_VIRTIO=m
-# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
-# CONFIG_CRYPTO_DEV_CCREE is not set
-CONFIG_ASYMMETRIC_KEY_TYPE=y
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-# CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE is not set
-CONFIG_X509_CERTIFICATE_PARSER=y
-# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set
-CONFIG_PKCS7_MESSAGE_PARSER=y
-# CONFIG_PKCS7_TEST_KEY is not set
-CONFIG_SIGNED_PE_FILE_VERIFICATION=y
-
-#
-# Certificates for signature checking
-#
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
-CONFIG_SECONDARY_TRUSTED_KEYRING=y
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-# end of Certificates for signature checking
-
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_RAID6_PQ_BENCHMARK=y
-# CONFIG_PACKING is not set
-CONFIG_BITREVERSE=y
-CONFIG_HAVE_ARCH_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_CORDIC=m
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_STMP_DEVICE=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=m
-# CONFIG_CRC4 is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_XXHASH=y
-CONFIG_AUDIT_GENERIC=y
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_COMPRESS=m
-CONFIG_ZSTD_DECOMPRESS=m
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_DMA=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_DMA_DECLARE_COHERENT=y
-CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
-CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
-CONFIG_DMA_REMAP=y
-CONFIG_DMA_CMA=y
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=48
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
-CONFIG_CLZ_TAB=y
-CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=y
-CONFIG_DIMLIB=y
-CONFIG_LIBFDT=y
-CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=y
-CONFIG_FONT_SUPPORT=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-CONFIG_SG_POOL=y
-CONFIG_SBITMAP=y
-# CONFIG_STRING_SELFTEST is not set
-# end of Library routines
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-# CONFIG_PRINTK_CALLER is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=3
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# end of printk and dmesg options
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=1024
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_INSTALL is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# end of Compile-time checks and compiler options
-
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_MAGIC_SYSRQ_SERIAL=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_PAGE_OWNER is not set
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=16000
-# CONFIG_DEBUG_KMEMLEAK_TEST is not set
-CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
-CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN=y
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_CC_HAS_KASAN_GENERIC=y
-CONFIG_KASAN_STACK=1
-# end of Memory Debugging
-
-CONFIG_ARCH_HAS_KCOV=y
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
-CONFIG_DEBUG_SHIRQ=y
-
-#
-# Debug Lockups and Hangs
-#
-# CONFIG_SOFTLOCKUP_DETECTOR is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_WQ_WATCHDOG is not set
-# end of Debug Lockups and Hangs
-
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-CONFIG_SCHEDSTATS=y
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-# end of Lock Debugging (spinlocks, mutexes, etc...)
-
-CONFIG_STACKTRACE=y
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# end of RCU Debugging
-
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_LATENCYTOP=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_PREEMPTIRQ_EVENTS is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_KPROBE_EVENTS=y
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_RUNTIME_TESTING_MENU is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-# CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_IO_STRICT_DEVMEM=y
-# CONFIG_ARM_PTDUMP_DEBUGFS is not set
-# CONFIG_DEBUG_WX is not set
-CONFIG_UNWINDER_FRAME_POINTER=y
-# CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_LL is not set
-CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
-CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
-# CONFIG_ARM_KPROBES_TEST is not set
-# CONFIG_PID_IN_CONTEXTIDR is not set
-# CONFIG_CORESIGHT is not set
-# end of Kernel hacking
diff --git a/main/linux-lts/config-lts.mips b/main/linux-lts/config-lts.mips
deleted file mode 100644
index 712c1d41dd6..00000000000
--- a/main/linux-lts/config-lts.mips
+++ /dev/null
@@ -1,3146 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/mips 5.4.23 Kernel Configuration
-#
-
-#
-# Compiler: gcc (Alpine 9.2.0) 9.2.0
-#
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-# CONFIG_HEADER_TEST is not set
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_BUILD_SALT=""
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-# CONFIG_USELIB is not set
-CONFIG_AUDIT=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_GENERIC_IRQ_IPI=y
-CONFIG_HANDLE_DOMAIN_IRQ=y
-CONFIG_IRQ_FORCED_THREADING=y
-# end of IRQ subsystem
-
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-CONFIG_NO_HZ=y
-# CONFIG_HIGH_RES_TIMERS is not set
-# end of Timers subsystem
-
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_PSI is not set
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-# CONFIG_IKHEADERS is not set
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-CONFIG_GENERIC_SCHED_CLOCK=y
-
-#
-# Scheduler features
-#
-# end of Scheduler features
-
-CONFIG_CGROUPS=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_SWAP_ENABLED=y
-CONFIG_MEMCG_KMEM=y
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_RDMA=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_BPF=y
-CONFIG_CGROUP_DEBUG=y
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-# CONFIG_CHECKPOINT_RESTORE is not set
-# CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_RELAY is not set
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
-# CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is not set
-CONFIG_SYSCTL=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_MULTIUSER=y
-CONFIG_SGETMASK_SYSCALL=y
-CONFIG_SYSFS_SYSCALL=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_FHANDLE=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_SYSCALL=y
-# CONFIG_USERFAULTFD is not set
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
-CONFIG_EMBEDDED=y
-CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_PERF_USE_VMALLOC=y
-# CONFIG_PC104 is not set
-
-#
-# Kernel Performance Events And Counters
-#
-# CONFIG_PERF_EVENTS is not set
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_COMPAT_BRK=y
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-# CONFIG_SLAB_FREELIST_RANDOM is not set
-# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
-# CONFIG_PROFILING is not set
-# end of General setup
-
-CONFIG_MIPS=y
-
-#
-# Machine selection
-#
-# CONFIG_MIPS_GENERIC is not set
-# CONFIG_MIPS_ALCHEMY is not set
-# CONFIG_AR7 is not set
-# CONFIG_ATH25 is not set
-# CONFIG_ATH79 is not set
-# CONFIG_BMIPS_GENERIC is not set
-# CONFIG_BCM47XX is not set
-# CONFIG_BCM63XX is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_INGENIC is not set
-# CONFIG_LANTIQ is not set
-# CONFIG_LASAT is not set
-# CONFIG_MACH_LOONGSON32 is not set
-# CONFIG_MACH_LOONGSON64 is not set
-# CONFIG_MACH_PISTACHIO is not set
-CONFIG_MIPS_MALTA=y
-# CONFIG_MACH_PIC32 is not set
-# CONFIG_NEC_MARKEINS is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-# CONFIG_PMC_MSP is not set
-# CONFIG_RALINK is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MIKROTIK_RB532 is not set
-# CONFIG_CAVIUM_OCTEON_SOC is not set
-# CONFIG_NLM_XLR_BOARD is not set
-# CONFIG_NLM_XLP_BOARD is not set
-# CONFIG_MIPS_PARAVIRT is not set
-# end of Machine selection
-
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_BOOT_RAW=y
-CONFIG_CEVT_R4K=y
-CONFIG_CSRC_R4K=y
-CONFIG_MIPS_CLOCK_VSYSCALL=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_DMA_MAYBE_COHERENT=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_SYS_SUPPORTS_HOTPLUG_CPU=y
-CONFIG_MIPS_BONITO64=y
-CONFIG_MIPS_MSC=y
-CONFIG_SYNC_R4K=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_ISA_DMA_API=y
-CONFIG_SYS_SUPPORTS_RELOCATABLE=y
-CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_CPU_LITTLE_ENDIAN is not set
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-CONFIG_PCI_GT64XXX_PCI0=y
-CONFIG_MIPS_SPRAM=y
-CONFIG_SWAP_IO_SPACE=y
-CONFIG_BOOT_ELF32=y
-CONFIG_MIPS_L1_CACHE_SHIFT_6=y
-CONFIG_MIPS_L1_CACHE_SHIFT=6
-
-#
-# CPU selection
-#
-# CONFIG_CPU_MIPS32_R1 is not set
-CONFIG_CPU_MIPS32_R2=y
-# CONFIG_CPU_MIPS32_R6 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-# CONFIG_CPU_MIPS64_R6 is not set
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_MIPS32_3_5_FEATURES is not set
-# CONFIG_CPU_MIPS32_R5_FEATURES is not set
-CONFIG_SYS_SUPPORTS_ZBOOT=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_CPU_MIPS32_R2=y
-CONFIG_SYS_HAS_CPU_MIPS32_R3_5=y
-CONFIG_SYS_HAS_CPU_MIPS32_R5=y
-CONFIG_SYS_HAS_CPU_MIPS32_R6=y
-CONFIG_SYS_HAS_CPU_MIPS64_R1=y
-CONFIG_SYS_HAS_CPU_MIPS64_R2=y
-CONFIG_SYS_HAS_CPU_MIPS64_R6=y
-CONFIG_SYS_HAS_CPU_NEVADA=y
-CONFIG_SYS_HAS_CPU_RM7000=y
-CONFIG_WEAK_ORDERING=y
-# end of CPU selection
-
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPSR2=y
-CONFIG_TARGET_ISA_REV=2
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_HARDWARE_WATCHPOINTS=y
-
-#
-# Kernel type
-#
-CONFIG_32BIT=y
-# CONFIG_PAGE_SIZE_4KB is not set
-CONFIG_PAGE_SIZE_16KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
-CONFIG_BOARD_SCACHE=y
-CONFIG_MIPS_CPU_SCACHE=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_GENERIC_DUMP_TLB=y
-CONFIG_MIPS_FP_SUPPORT=y
-CONFIG_CPU_R4K_FPU=y
-CONFIG_CPU_R4K_CACHE_TLB=y
-CONFIG_MIPS_MT_SMP=y
-CONFIG_MIPS_MT=y
-# CONFIG_SCHED_SMT is not set
-CONFIG_SYS_SUPPORTS_SCHED_SMT=y
-CONFIG_SYS_SUPPORTS_MULTITHREADING=y
-CONFIG_MIPS_MT_FPAFF=y
-CONFIG_SYS_SUPPORTS_VPE_LOADER=y
-# CONFIG_MIPS_VPE_LOADER is not set
-# CONFIG_MIPS_CMP is not set
-CONFIG_MIPS_CPS=y
-CONFIG_MIPS_CPS_PM=y
-CONFIG_MIPS_CM=y
-CONFIG_MIPS_CPC=y
-CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y
-# CONFIG_CPU_HAS_SMARTMIPS is not set
-# CONFIG_CPU_MICROMIPS is not set
-CONFIG_CPU_HAS_RIXI=y
-CONFIG_CPU_HAS_LOAD_STORE_LR=y
-CONFIG_CPU_MIPSR2_IRQ_VI=y
-CONFIG_CPU_MIPSR2_IRQ_EI=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_MIPS_ASID_SHIFT=0
-CONFIG_MIPS_ASID_BITS=8
-# CONFIG_HIGHMEM is not set
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-CONFIG_SYS_SUPPORTS_HIGHMEM=y
-CONFIG_SYS_SUPPORTS_SMARTMIPS=y
-CONFIG_SYS_SUPPORTS_MICROMIPS=y
-CONFIG_SYS_SUPPORTS_MIPS16=y
-CONFIG_CPU_SUPPORTS_MSA=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_RELOCATABLE is not set
-CONFIG_SMP=y
-CONFIG_HOTPLUG_CPU=y
-CONFIG_SMP_UP=y
-CONFIG_SYS_SUPPORTS_MIPS_CMP=y
-CONFIG_SYS_SUPPORTS_MIPS_CPS=y
-CONFIG_SYS_SUPPORTS_SMP=y
-CONFIG_NR_CPUS=2
-CONFIG_MIPS_PERF_SHARED_TC_COUNTERS=y
-CONFIG_MIPS_NR_CPU_NR_MAP=2
-# CONFIG_HZ_24 is not set
-# CONFIG_HZ_48 is not set
-CONFIG_HZ_100=y
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_1024 is not set
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=100
-# CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_SECCOMP=y
-# CONFIG_MIPS_O32_FP64_SUPPORT is not set
-CONFIG_USE_OF=y
-CONFIG_BUILTIN_DTB=y
-CONFIG_MIPS_NO_APPENDED_DTB=y
-# CONFIG_MIPS_ELF_APPENDED_DTB is not set
-# CONFIG_MIPS_RAW_APPENDED_DTB is not set
-# CONFIG_MIPS_CMDLINE_FROM_DTB is not set
-# CONFIG_MIPS_CMDLINE_DTB_EXTEND is not set
-CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y
-# end of Kernel type
-
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_PGTABLE_LEVELS=2
-
-#
-# Bus options (PCI, PCMCIA, EISA, ISA, TC)
-#
-CONFIG_PCI_DRIVERS_LEGACY=y
-CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_BITS_MAX=15
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15
-CONFIG_I8253=y
-CONFIG_ZONE_DMA=y
-# end of Bus options (PCI, PCMCIA, EISA, ISA, TC)
-
-CONFIG_TRAD_SIGNALS=y
-
-#
-# Power management options
-#
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-# CONFIG_HIBERNATION is not set
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_CLK=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-# end of Power management options
-
-CONFIG_MIPS_EXTERNAL_TIMER=y
-
-#
-# CPU Power Management
-#
-
-#
-# CPU Idle
-#
-# CONFIG_CPU_IDLE is not set
-# end of CPU Idle
-# end of CPU Power Management
-
-#
-# Firmware Drivers
-#
-# CONFIG_FIRMWARE_MEMMAP is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-CONFIG_EFI_EARLYCON=y
-
-#
-# Tegra firmware driver
-#
-# end of Tegra firmware driver
-# end of Firmware Drivers
-
-CONFIG_HAVE_KVM=y
-# CONFIG_VIRTUALIZATION is not set
-
-#
-# General architecture-dependent options
-#
-CONFIG_CRASH_CORE=y
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
-# CONFIG_JUMP_LABEL is not set
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_ARCH_HAS_UNCACHED_SEGMENT=y
-CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_HAVE_ASM_MODVERSIONS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=12
-CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_64BIT_TIME=y
-CONFIG_COMPAT_32BIT_TIME=y
-# CONFIG_REFCOUNT_FULL is not set
-CONFIG_HAVE_ARCH_COMPILER_H=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
-
-#
-# GCOV-based kernel profiling
-#
-# end of GCOV-based kernel profiling
-
-CONFIG_PLUGIN_HOSTCC=""
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
-CONFIG_ASM_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_BLOCK=y
-CONFIG_BLK_RQ_ALLOC_TIME=y
-CONFIG_BLK_SCSI_REQUEST=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_BSGLIB is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_ZONED is not set
-CONFIG_BLK_DEV_THROTTLING=y
-CONFIG_BLK_DEV_THROTTLING_LOW=y
-# CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_WBT is not set
-CONFIG_BLK_CGROUP_IOLATENCY=y
-CONFIG_BLK_CGROUP_IOCOST=y
-# CONFIG_BLK_SED_OPAL is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# end of Partition Types
-
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_PM=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-# CONFIG_IOSCHED_BFQ is not set
-# end of IO Schedulers
-
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-CONFIG_QUEUED_SPINLOCKS=y
-CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_FREEZER=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_ARCH_BINFMT_ELF_STATE=y
-CONFIG_ELFCORE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-# CONFIG_BINFMT_MISC is not set
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_FAST_GUP=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
-# CONFIG_CMA is not set
-# CONFIG_ZPOOL is not set
-# CONFIG_ZBUD is not set
-# CONFIG_ZSMALLOC is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_EGRESS=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_DIAG is not set
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-# CONFIG_UNIX_DIAG is not set
-# CONFIG_TLS is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=y
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_INTERFACE is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=y
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_XDP_SOCKETS=y
-# CONFIG_XDP_SOCKETS_DIAG is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IP_PNP_RARP is not set
-CONFIG_NET_IPIP=m
-# CONFIG_NET_IPGRE_DEMUX is not set
-CONFIG_NET_IP_TUNNEL=y
-CONFIG_IP_MROUTE_COMMON=y
-CONFIG_IP_MROUTE=y
-# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-# CONFIG_NET_IPVTI is not set
-# CONFIG_NET_FOU is not set
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-# CONFIG_INET_ESP_OFFLOAD is not set
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-# CONFIG_INET_UDP_DIAG is not set
-# CONFIG_INET_RAW_DIAG is not set
-# CONFIG_INET_DIAG_DESTROY is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=y
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-# CONFIG_INET6_ESP_OFFLOAD is not set
-CONFIG_INET6_IPCOMP=m
-# CONFIG_IPV6_MIP6 is not set
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-# CONFIG_IPV6_VTI is not set
-CONFIG_IPV6_SIT=y
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_BPFILTER is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_L2TP is not set
-CONFIG_STP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_BRIDGE_VLAN_FILTERING is not set
-CONFIG_HAVE_NET_DSA=y
-# CONFIG_NET_DSA is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-# CONFIG_VLAN_8021Q_MVRP is not set
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-# CONFIG_LLC2 is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_PHONET is not set
-# CONFIG_6LOWPAN is not set
-# CONFIG_IEEE802154 is not set
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_PRIO=m
-# CONFIG_NET_SCH_MULTIQ is not set
-CONFIG_NET_SCH_RED=m
-# CONFIG_NET_SCH_SFB is not set
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-# CONFIG_NET_SCH_CBS is not set
-# CONFIG_NET_SCH_ETF is not set
-# CONFIG_NET_SCH_TAPRIO is not set
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-# CONFIG_NET_SCH_DRR is not set
-# CONFIG_NET_SCH_MQPRIO is not set
-# CONFIG_NET_SCH_SKBPRIO is not set
-# CONFIG_NET_SCH_CHOKE is not set
-# CONFIG_NET_SCH_QFQ is not set
-# CONFIG_NET_SCH_CODEL is not set
-# CONFIG_NET_SCH_FQ_CODEL is not set
-# CONFIG_NET_SCH_CAKE is not set
-# CONFIG_NET_SCH_FQ is not set
-# CONFIG_NET_SCH_HHF is not set
-# CONFIG_NET_SCH_PIE is not set
-CONFIG_NET_SCH_INGRESS=m
-# CONFIG_NET_SCH_PLUG is not set
-# CONFIG_NET_SCH_DEFAULT is not set
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-# CONFIG_NET_CLS_FLOW is not set
-CONFIG_NET_CLS_CGROUP=m
-# CONFIG_NET_CLS_BPF is not set
-# CONFIG_NET_CLS_FLOWER is not set
-# CONFIG_NET_CLS_MATCHALL is not set
-# CONFIG_NET_EMATCH is not set
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=y
-# CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_MIRRED is not set
-# CONFIG_NET_ACT_SAMPLE is not set
-# CONFIG_NET_ACT_NAT is not set
-# CONFIG_NET_ACT_PEDIT is not set
-# CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_ACT_SKBEDIT is not set
-# CONFIG_NET_ACT_CSUM is not set
-# CONFIG_NET_ACT_MPLS is not set
-# CONFIG_NET_ACT_VLAN is not set
-# CONFIG_NET_ACT_BPF is not set
-# CONFIG_NET_ACT_SKBMOD is not set
-# CONFIG_NET_ACT_IFE is not set
-# CONFIG_NET_ACT_TUNNEL_KEY is not set
-# CONFIG_NET_TC_SKB_EXT is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-# CONFIG_DNS_RESOLVER is not set
-# CONFIG_BATMAN_ADV is not set
-# CONFIG_OPENVSWITCH is not set
-# CONFIG_VSOCKETS is not set
-# CONFIG_NETLINK_DIAG is not set
-# CONFIG_MPLS is not set
-# CONFIG_NET_NSH is not set
-# CONFIG_HSR is not set
-# CONFIG_NET_SWITCHDEV is not set
-# CONFIG_NET_L3_MASTER_DEV is not set
-# CONFIG_NET_NCSI is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-# CONFIG_CGROUP_NET_PRIO is not set
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-# CONFIG_BPF_STREAM_PARSER is not set
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# end of Network testing
-# end of Networking options
-
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AF_KCM is not set
-CONFIG_FIB_RULES=y
-# CONFIG_WIRELESS is not set
-# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
-# CONFIG_NET_9P is not set
-# CONFIG_CAIF is not set
-# CONFIG_CEPH_LIB is not set
-# CONFIG_NFC is not set
-# CONFIG_PSAMPLE is not set
-# CONFIG_NET_IFE is not set
-# CONFIG_LWTUNNEL is not set
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-# CONFIG_FAILOVER is not set
-
-#
-# Device Drivers
-#
-CONFIG_HAVE_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PCIEPORTBUS is not set
-# CONFIG_PCI_MSI is not set
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_STUB is not set
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_PRI is not set
-# CONFIG_PCI_PASID is not set
-# CONFIG_HOTPLUG_PCI is not set
-
-#
-# PCI controller drivers
-#
-
-#
-# Cadence PCIe controllers support
-#
-# CONFIG_PCIE_CADENCE_HOST is not set
-# end of Cadence PCIe controllers support
-
-# CONFIG_PCI_FTPCI100 is not set
-# CONFIG_PCI_HOST_GENERIC is not set
-# CONFIG_PCIE_XILINX is not set
-
-#
-# DesignWare PCI Core Support
-#
-# end of DesignWare PCI Core Support
-# end of PCI controller drivers
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-# end of PCI Endpoint
-
-#
-# PCI switch controller drivers
-#
-# CONFIG_PCI_SW_SWITCHTEC is not set
-# end of PCI switch controller drivers
-
-# CONFIG_PCCARD is not set
-# CONFIG_RAPIDIO is not set
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=y
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
-# end of Firmware loader
-
-CONFIG_ALLOW_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_MMIO=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-# CONFIG_BRCMSTB_GISB_ARB is not set
-# CONFIG_MIPS_CDMM is not set
-# CONFIG_SIMPLE_PM_BUS is not set
-# end of Bus devices
-
-# CONFIG_CONNECTOR is not set
-# CONFIG_GNSS is not set
-# CONFIG_MTD is not set
-CONFIG_DTC=y
-CONFIG_OF=y
-# CONFIG_OF_UNITTEST is not set
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
-CONFIG_OF_RESERVED_MEM=y
-# CONFIG_OF_OVERLAY is not set
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-# CONFIG_PARPORT is not set
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_NULL_BLK is not set
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
-# CONFIG_BLK_DEV_UMEM is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-# CONFIG_BLK_DEV_DRBD is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_VIRTIO_BLK is not set
-# CONFIG_BLK_DEV_RBD is not set
-# CONFIG_BLK_DEV_RSXX is not set
-
-#
-# NVME Support
-#
-# CONFIG_BLK_DEV_NVME is not set
-# CONFIG_NVME_FC is not set
-# end of NVME Support
-
-#
-# Misc devices
-#
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_APDS9802ALS is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISL29020 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_BH1770 is not set
-# CONFIG_SENSORS_APDS990X is not set
-# CONFIG_HMC6352 is not set
-# CONFIG_DS1682 is not set
-# CONFIG_PCH_PHUB is not set
-# CONFIG_SRAM is not set
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_XILINX_SDFEC is not set
-# CONFIG_PVPANIC is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_IDT_89HPESX is not set
-# CONFIG_EEPROM_EE1004 is not set
-# end of EEPROM support
-
-# CONFIG_CB710_CORE is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# end of Texas Instruments shared transport line discipline
-
-# CONFIG_SENSORS_LIS3_I2C is not set
-
-#
-# Altera FPGA firmware download module (requires I2C)
-#
-# CONFIG_ALTERA_STAPL is not set
-
-#
-# Intel MIC & related support
-#
-
-#
-# Intel MIC Bus Driver
-#
-
-#
-# SCIF Bus Driver
-#
-
-#
-# VOP Bus Driver
-#
-# CONFIG_VOP_BUS is not set
-
-#
-# Intel MIC Host Driver
-#
-
-#
-# Intel MIC Card Driver
-#
-
-#
-# SCIF Driver
-#
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-
-#
-# VOP Driver
-#
-# end of Intel MIC & related support
-
-# CONFIG_ECHO is not set
-# CONFIG_MISC_ALCOR_PCI is not set
-# CONFIG_MISC_RTSX_PCI is not set
-# CONFIG_MISC_RTSX_USB is not set
-# CONFIG_HABANA_AI is not set
-# end of Misc devices
-
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-# CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_BLK_DEV_SR is not set
-CONFIG_CHR_DEV_SG=y
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# end of SCSI Transports
-
-# CONFIG_SCSI_LOWLEVEL is not set
-# CONFIG_SCSI_DH is not set
-# end of SCSI device support
-
-CONFIG_ATA=y
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_AHCI_PLATFORM is not set
-# CONFIG_AHCI_CEVA is not set
-# CONFIG_AHCI_QORIQ is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_ACARD_AHCI is not set
-# CONFIG_SATA_SIL24 is not set
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-# CONFIG_PDC_ADMA is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SX4 is not set
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=y
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-
-#
-# PATA SFF controllers with BMDMA
-#
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_ATP867X is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5536 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87415 is not set
-CONFIG_PATA_OLDPIIX=y
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TOSHIBA is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-
-#
-# PIO-only SFF controllers
-#
-# CONFIG_PATA_CMD640_PCI is not set
-CONFIG_PATA_MPIIX=y
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_RZ1000 is not set
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_ATA_GENERIC=y
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_MD is not set
-# CONFIG_TARGET_CORE is not set
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_NOSY is not set
-# end of IEEE 1394 (FireWire) support
-
-CONFIG_NETDEVICES=y
-CONFIG_MII=y
-CONFIG_NET_CORE=y
-# CONFIG_BONDING is not set
-# CONFIG_DUMMY is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_NET_FC is not set
-# CONFIG_IFB is not set
-# CONFIG_NET_TEAM is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_IPVLAN is not set
-# CONFIG_VXLAN is not set
-# CONFIG_GENEVE is not set
-# CONFIG_GTP is not set
-# CONFIG_MACSEC is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_TUN is not set
-# CONFIG_TUN_VNET_CROSS_LE is not set
-# CONFIG_VETH is not set
-# CONFIG_VIRTIO_NET is not set
-# CONFIG_NLMON is not set
-# CONFIG_ARCNET is not set
-
-#
-# CAIF transport drivers
-#
-
-#
-# Distributed Switch Architecture drivers
-#
-# end of Distributed Switch Architecture drivers
-
-CONFIG_ETHERNET=y
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
-CONFIG_NET_VENDOR_AGERE=y
-# CONFIG_ET131X is not set
-CONFIG_NET_VENDOR_ALACRITECH=y
-# CONFIG_SLICOSS is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
-# CONFIG_ALTERA_TSE is not set
-CONFIG_NET_VENDOR_AMAZON=y
-CONFIG_NET_VENDOR_AMD=y
-# CONFIG_AMD8111_ETH is not set
-CONFIG_PCNET32=y
-CONFIG_NET_VENDOR_AQUANTIA=y
-CONFIG_NET_VENDOR_ARC=y
-# CONFIG_NET_VENDOR_ATHEROS is not set
-CONFIG_NET_VENDOR_AURORA=y
-# CONFIG_AURORA_NB8800 is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
-CONFIG_NET_VENDOR_CADENCE=y
-# CONFIG_MACB is not set
-CONFIG_NET_VENDOR_CAVIUM=y
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CISCO is not set
-CONFIG_NET_VENDOR_CORTINA=y
-# CONFIG_GEMINI_ETHERNET is not set
-# CONFIG_DM9000 is not set
-# CONFIG_DNET is not set
-# CONFIG_NET_VENDOR_DEC is not set
-# CONFIG_NET_VENDOR_DLINK is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
-CONFIG_NET_VENDOR_EZCHIP=y
-# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
-CONFIG_NET_VENDOR_GOOGLE=y
-# CONFIG_NET_VENDOR_HP is not set
-CONFIG_NET_VENDOR_HUAWEI=y
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_JME is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-CONFIG_NET_VENDOR_MICROCHIP=y
-# CONFIG_LAN743X is not set
-CONFIG_NET_VENDOR_MICROSEMI=y
-# CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-CONFIG_NET_VENDOR_NETERION=y
-# CONFIG_S2IO is not set
-# CONFIG_VXGE is not set
-CONFIG_NET_VENDOR_NETRONOME=y
-CONFIG_NET_VENDOR_NI=y
-# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
-# CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_ETHOC is not set
-CONFIG_NET_VENDOR_PACKET_ENGINES=y
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-CONFIG_NET_VENDOR_PENSANDO=y
-# CONFIG_NET_VENDOR_QLOGIC is not set
-CONFIG_NET_VENDOR_QUALCOMM=y
-# CONFIG_QCOM_EMAC is not set
-# CONFIG_RMNET is not set
-# CONFIG_NET_VENDOR_RDC is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
-CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_ROCKER=y
-CONFIG_NET_VENDOR_SAMSUNG=y
-# CONFIG_SXGBE_ETH is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-CONFIG_NET_VENDOR_SOLARFLARE=y
-# CONFIG_SFC is not set
-# CONFIG_SFC_FALCON is not set
-# CONFIG_NET_VENDOR_SILAN is not set
-# CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-CONFIG_NET_VENDOR_SOCIONEXT=y
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SUN is not set
-CONFIG_NET_VENDOR_SYNOPSYS=y
-# CONFIG_DWC_XLGMAC is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_NET_VENDOR_TI is not set
-# CONFIG_NET_VENDOR_TOSHIBA is not set
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-CONFIG_NET_VENDOR_XILINX=y
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_MDIO_DEVICE is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-CONFIG_USB_NET_DRIVERS=y
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_RTL8152 is not set
-# CONFIG_USB_LAN78XX is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_IPHETH is not set
-# CONFIG_WLAN is not set
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
-# CONFIG_WAN is not set
-# CONFIG_VMXNET3 is not set
-# CONFIG_NET_FAILOVER is not set
-# CONFIG_ISDN is not set
-# CONFIG_NVM is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_LEDS=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_MATRIXKMAP is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ADP5589 is not set
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_QT1050 is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_QT2160 is not set
-# CONFIG_KEYBOARD_DLINK_DIR685 is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_TCA8418 is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_MPR121 is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
-# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_CAP11XX is not set
-# CONFIG_KEYBOARD_BCM is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_BYD=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_CYPRESS=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-# CONFIG_MOUSE_PS2_ELANTECH is not set
-# CONFIG_MOUSE_PS2_SENTELIC is not set
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_PS2_FOCALTECH=y
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_BCM5974 is not set
-# CONFIG_MOUSE_CYAPA is not set
-# CONFIG_MOUSE_ELAN_I2C is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MOUSE_SYNAPTICS_USB is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-# CONFIG_RMI4_CORE is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_PCIPS2 is not set
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
-# CONFIG_SERIO_ALTERA_PS2 is not set
-# CONFIG_SERIO_PS2MULT is not set
-# CONFIG_SERIO_ARC_PS2 is not set
-# CONFIG_SERIO_APBPS2 is not set
-# CONFIG_USERIO is not set
-# CONFIG_GAMEPORT is not set
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-# CONFIG_VT is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=4
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_N_GSM is not set
-# CONFIG_TRACE_SINK is not set
-# CONFIG_NULL_TTY is not set
-CONFIG_LDISC_AUTOLOAD=y
-CONFIG_DEVMEM=y
-# CONFIG_DEVKMEM is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
-# CONFIG_SERIAL_8250_FINTEK is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_EXAR=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SERIAL_8250_ASPEED_VUART is not set
-# CONFIG_SERIAL_8250_DW is not set
-# CONFIG_SERIAL_8250_RT288X is not set
-# CONFIG_SERIAL_8250_INGENIC is not set
-# CONFIG_SERIAL_OF_PLATFORM is not set
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_SIFIVE is not set
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
-# CONFIG_SERIAL_BCM63XX is not set
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_PCH_UART is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
-# CONFIG_SERIAL_ARC is not set
-# CONFIG_SERIAL_RP2 is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_FSL_LINFLEXUART is not set
-# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
-# end of Serial drivers
-
-# CONFIG_SERIAL_DEV_BUS is not set
-# CONFIG_TTY_PRINTK is not set
-# CONFIG_VIRTIO_CONSOLE is not set
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_HW_RANDOM=y
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_VIRTIO is not set
-# CONFIG_APPLICOM is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
-CONFIG_DEVPORT=y
-# CONFIG_XILLYBUS is not set
-# end of Character devices
-
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-# CONFIG_I2C_CHARDEV is not set
-# CONFIG_I2C_MUX is not set
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOBIT=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_NVIDIA_GPU is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_DESIGNWARE_PCI is not set
-# CONFIG_I2C_EG20T is not set
-# CONFIG_I2C_EMEV2 is not set
-# CONFIG_I2C_IMG is not set
-# CONFIG_I2C_JZ4780 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_RK3X is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_XILINX is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-# CONFIG_I2C_DIOLAN_U2C is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-
-#
-# Other I2C/SMBus bus drivers
-#
-# end of I2C Hardware Bus support
-
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_SLAVE is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# end of I2C support
-
-# CONFIG_I3C is not set
-# CONFIG_SPI is not set
-# CONFIG_SPMI is not set
-# CONFIG_HSI is not set
-# CONFIG_PPS is not set
-
-#
-# PTP clock support
-#
-# CONFIG_PTP_1588_CLOCK is not set
-
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-# end of PTP clock support
-
-# CONFIG_PINCTRL is not set
-# CONFIG_GPIOLIB is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_AVS is not set
-CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_BRCMSTB is not set
-CONFIG_POWER_RESET_PIIX4_POWEROFF=y
-# CONFIG_POWER_RESET_RESTART is not set
-CONFIG_POWER_RESET_SYSCON=y
-# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
-# CONFIG_SYSCON_REBOOT_MODE is not set
-# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_HWMON is not set
-# CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB is not set
-CONFIG_BCMA_POSSIBLE=y
-# CONFIG_BCMA is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_ACT8945A is not set
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
-# CONFIG_MFD_ATMEL_HLCDC is not set
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_MADERA is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-# CONFIG_MFD_HI6421_PMIC is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_LPC_ICH is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77650 is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_MENF21BMC is not set
-# CONFIG_MFD_VIPERBOARD is not set
-# CONFIG_MFD_RETU is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_RK808 is not set
-# CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_SKY81452 is not set
-# CONFIG_ABX500_CORE is not set
-CONFIG_MFD_SYSCON=y
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_TI_LMU is not set
-# CONFIG_TPS6105X is not set
-# CONFIG_TPS6507X is not set
-# CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_TPS65217 is not set
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TI_LP87565 is not set
-# CONFIG_MFD_TPS65218 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_WL1273_CORE is not set
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_TQMX86 is not set
-# CONFIG_MFD_VX855 is not set
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MFD_STMFX is not set
-# end of Multifunction device drivers
-
-# CONFIG_REGULATOR is not set
-# CONFIG_RC_CORE is not set
-# CONFIG_MEDIA_SUPPORT is not set
-
-#
-# Graphics support
-#
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_DRM=m
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-# CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_TTM=m
-CONFIG_DRM_VRAM_HELPER=m
-
-#
-# I2C encoder or helper chips
-#
-# CONFIG_DRM_I2C_CH7006 is not set
-# CONFIG_DRM_I2C_SIL164 is not set
-# CONFIG_DRM_I2C_NXP_TDA998X is not set
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# end of I2C encoder or helper chips
-
-#
-# ARM devices
-#
-# CONFIG_DRM_KOMEDA is not set
-# end of ARM devices
-
-# CONFIG_DRM_RADEON is not set
-# CONFIG_DRM_AMDGPU is not set
-
-#
-# ACP (Audio CoProcessor) Configuration
-#
-# end of ACP (Audio CoProcessor) Configuration
-
-# CONFIG_DRM_NOUVEAU is not set
-# CONFIG_DRM_VGEM is not set
-# CONFIG_DRM_VKMS is not set
-# CONFIG_DRM_UDL is not set
-# CONFIG_DRM_AST is not set
-# CONFIG_DRM_MGAG200 is not set
-# CONFIG_DRM_CIRRUS_QEMU is not set
-# CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_LVDS is not set
-# CONFIG_DRM_QXL is not set
-CONFIG_DRM_BOCHS=m
-# CONFIG_DRM_VIRTIO_GPU is not set
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-# CONFIG_DRM_PANEL_ARM_VERSATILE is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
-# end of Display Panels
-
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_PANEL_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-# CONFIG_DRM_ANALOGIX_ANX78XX is not set
-# CONFIG_DRM_CDNS_DSI is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
-# CONFIG_DRM_LVDS_ENCODER is not set
-# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
-# CONFIG_DRM_NXP_PTN3460 is not set
-# CONFIG_DRM_PARADE_PS8622 is not set
-# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SII902X is not set
-# CONFIG_DRM_SII9234 is not set
-# CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TOSHIBA_TC358764 is not set
-# CONFIG_DRM_TOSHIBA_TC358767 is not set
-# CONFIG_DRM_TI_TFP410 is not set
-# CONFIG_DRM_TI_SN65DSI86 is not set
-# CONFIG_DRM_I2C_ADV7511 is not set
-# end of Display Interface Bridges
-
-# CONFIG_DRM_ETNAVIV is not set
-# CONFIG_DRM_ARCPGU is not set
-# CONFIG_DRM_MXSFB is not set
-# CONFIG_DRM_GM12U320 is not set
-# CONFIG_DRM_LEGACY is not set
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_MODE_HELPERS is not set
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_OPENCORES is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-CONFIG_FB_MATROX=y
-# CONFIG_FB_MATROX_MILLENIUM is not set
-# CONFIG_FB_MATROX_MYSTIQUE is not set
-CONFIG_FB_MATROX_G=y
-# CONFIG_FB_MATROX_I2C is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_SIMPLE is not set
-# CONFIG_FB_SM712 is not set
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
-# end of Backlight & LCD device support
-
-CONFIG_HDMI=y
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
-# end of Graphics support
-
-# CONFIG_SOUND is not set
-
-#
-# HID support
-#
-CONFIG_HID=y
-# CONFIG_HID_BATTERY_STRENGTH is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_UHID is not set
-CONFIG_HID_GENERIC=y
-
-#
-# Special HID drivers
-#
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACCUTOUCH is not set
-# CONFIG_HID_ACRUX is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_APPLEIR is not set
-# CONFIG_HID_ASUS is not set
-# CONFIG_HID_AUREAL is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BETOP_FF is not set
-# CONFIG_HID_BIGBEN_FF is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_CORSAIR is not set
-# CONFIG_HID_COUGAR is not set
-# CONFIG_HID_MACALLY is not set
-# CONFIG_HID_CMEDIA is not set
-# CONFIG_HID_CREATIVE_SB0540 is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_ELAN is not set
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GEMBIRD is not set
-# CONFIG_HID_GFRM is not set
-# CONFIG_HID_HOLTEK is not set
-# CONFIG_HID_GT683R is not set
-# CONFIG_HID_KEYTOUCH is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_UCLOGIC is not set
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_VIEWSONIC is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_ICADE is not set
-# CONFIG_HID_ITE is not set
-# CONFIG_HID_JABRA is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_LED is not set
-# CONFIG_HID_LENOVO is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MAGICMOUSE is not set
-# CONFIG_HID_MALTRON is not set
-# CONFIG_HID_MAYFLASH is not set
-# CONFIG_HID_REDRAGON is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_MULTITOUCH is not set
-# CONFIG_HID_NTI is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PENMOUNT is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PICOLCD is not set
-# CONFIG_HID_PLANTRONICS is not set
-# CONFIG_HID_PRIMAX is not set
-# CONFIG_HID_RETRODE is not set
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_SAITEK is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SPEEDLINK is not set
-# CONFIG_HID_STEAM is not set
-# CONFIG_HID_STEELSERIES is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_RMI is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_THINGM is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_UDRAW_PS3 is not set
-# CONFIG_HID_U2FZERO is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_WIIMOTE is not set
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HID_ZYDACRON is not set
-# CONFIG_HID_SENSOR_HUB is not set
-# CONFIG_HID_ALPS is not set
-# end of Special HID drivers
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=y
-# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
-# end of USB HID support
-
-#
-# I2C HID support
-#
-# CONFIG_I2C_HID is not set
-# end of I2C HID support
-# end of HID support
-
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
-# CONFIG_USB_LED_TRIG is not set
-# CONFIG_USB_ULPI_BUS is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=y
-CONFIG_USB_PCI=y
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
-CONFIG_USB_AUTOSUSPEND_DELAY=2
-# CONFIG_USB_MON is not set
-
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_XHCI_HCD is not set
-CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-CONFIG_USB_EHCI_PCI=y
-# CONFIG_USB_EHCI_FSL is not set
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_FOTG210_HCD is not set
-# CONFIG_USB_OHCI_HCD is not set
-CONFIG_USB_UHCI_HCD=y
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_TMC is not set
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=y
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_REALTEK is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-# CONFIG_USB_UAS is not set
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USBIP_CORE is not set
-# CONFIG_USB_CDNS3 is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_ISP1760 is not set
-
-#
-# USB port drivers
-#
-# CONFIG_USB_SERIAL is not set
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_YUREX is not set
-# CONFIG_USB_EZUSB_FX2 is not set
-# CONFIG_USB_HUB_USB251XB is not set
-# CONFIG_USB_HSIC_USB3503 is not set
-# CONFIG_USB_HSIC_USB4604 is not set
-# CONFIG_USB_LINK_LAYER_TEST is not set
-# CONFIG_USB_CHAOSKEY is not set
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_USB_ISP1301 is not set
-# end of USB Physical Layer drivers
-
-# CONFIG_USB_GADGET is not set
-# CONFIG_TYPEC is not set
-# CONFIG_USB_ROLE_SWITCH is not set
-# CONFIG_MMC is not set
-# CONFIG_MEMSTICK is not set
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_CLASS_FLASH is not set
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
-
-#
-# LED drivers
-#
-# CONFIG_LEDS_AN30259A is not set
-# CONFIG_LEDS_BCM6328 is not set
-# CONFIG_LEDS_BCM6358 is not set
-# CONFIG_LEDS_LM3530 is not set
-# CONFIG_LEDS_LM3532 is not set
-# CONFIG_LEDS_LM3642 is not set
-# CONFIG_LEDS_LM3692X is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_LP5523 is not set
-# CONFIG_LEDS_LP5562 is not set
-# CONFIG_LEDS_LP8501 is not set
-# CONFIG_LEDS_LP8860 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_BD2802 is not set
-# CONFIG_LEDS_TCA6507 is not set
-# CONFIG_LEDS_TLC591XX is not set
-# CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_IS31FL319X is not set
-# CONFIG_LEDS_IS31FL32XX is not set
-
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-# CONFIG_LEDS_BLINKM is not set
-# CONFIG_LEDS_SYSCON is not set
-# CONFIG_LEDS_MLXREG is not set
-# CONFIG_LEDS_USER is not set
-# CONFIG_LEDS_TI_LMU_COMMON is not set
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEDS_TRIGGER_ONESHOT is not set
-CONFIG_LEDS_TRIGGER_DISK=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-# CONFIG_LEDS_TRIGGER_CPU is not set
-# CONFIG_LEDS_TRIGGER_ACTIVITY is not set
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
-# CONFIG_LEDS_TRIGGER_CAMERA is not set
-# CONFIG_LEDS_TRIGGER_PANIC is not set
-# CONFIG_LEDS_TRIGGER_NETDEV is not set
-# CONFIG_LEDS_TRIGGER_PATTERN is not set
-# CONFIG_LEDS_TRIGGER_AUDIO is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_INFINIBAND is not set
-CONFIG_RTC_LIB=y
-CONFIG_RTC_MC146818_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_NVMEM=y
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-# CONFIG_RTC_DRV_TEST is not set
-
-#
-# I2C RTC drivers
-#
-# CONFIG_RTC_DRV_ABB5ZES3 is not set
-# CONFIG_RTC_DRV_ABEOZ9 is not set
-# CONFIG_RTC_DRV_ABX80X is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_ISL12022 is not set
-# CONFIG_RTC_DRV_ISL12026 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_PCF8523 is not set
-# CONFIG_RTC_DRV_PCF85063 is not set
-# CONFIG_RTC_DRV_PCF85363 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_BQ32K is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_RX8010 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_EM3027 is not set
-# CONFIG_RTC_DRV_RV3028 is not set
-# CONFIG_RTC_DRV_RV8803 is not set
-# CONFIG_RTC_DRV_SD3078 is not set
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_I2C_AND_SPI=m
-
-#
-# SPI and I2C RTC drivers
-#
-# CONFIG_RTC_DRV_DS3232 is not set
-# CONFIG_RTC_DRV_PCF2127 is not set
-# CONFIG_RTC_DRV_RV3029C2 is not set
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1685_FAMILY is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS2404 is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_MSM6242 is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-# CONFIG_RTC_DRV_RP5C01 is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_ZYNQMP is not set
-
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_CADENCE is not set
-# CONFIG_RTC_DRV_FTRTC010 is not set
-# CONFIG_RTC_DRV_JZ4740 is not set
-# CONFIG_RTC_DRV_SNVS is not set
-# CONFIG_RTC_DRV_R7301 is not set
-
-#
-# HID Sensor RTC drivers
-#
-# CONFIG_DMADEVICES is not set
-
-#
-# DMABUF options
-#
-CONFIG_SYNC_FILE=y
-# CONFIG_UDMABUF is not set
-# CONFIG_DMABUF_SELFTESTS is not set
-# end of DMABUF options
-
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
-# CONFIG_VIRT_DRIVERS is not set
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_PCI_LEGACY=y
-# CONFIG_VIRTIO_BALLOON is not set
-CONFIG_VIRTIO_INPUT=y
-# CONFIG_VIRTIO_MMIO is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-# end of Microsoft Hyper-V guest support
-
-# CONFIG_GREYBUS is not set
-# CONFIG_STAGING is not set
-CONFIG_MIPS_PLATFORM_DEVICES=y
-# CONFIG_GOLDFISH is not set
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-
-#
-# Common Clock Framework
-#
-# CONFIG_CLK_HSDK is not set
-# CONFIG_COMMON_CLK_MAX9485 is not set
-# CONFIG_COMMON_CLK_SI5341 is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-# CONFIG_COMMON_CLK_SI514 is not set
-# CONFIG_COMMON_CLK_SI544 is not set
-# CONFIG_COMMON_CLK_SI570 is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CDCE925 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_VC5 is not set
-# CONFIG_COMMON_CLK_FIXED_MMIO is not set
-# CONFIG_COMMON_CLK_BOSTON is not set
-
-#
-# Ingenic SoCs drivers
-#
-# CONFIG_INGENIC_CGU_JZ4740 is not set
-# CONFIG_INGENIC_CGU_JZ4725B is not set
-# CONFIG_INGENIC_CGU_JZ4770 is not set
-# CONFIG_INGENIC_CGU_JZ4780 is not set
-# CONFIG_INGENIC_TCU_CLK is not set
-# end of Ingenic SoCs drivers
-# end of Common Clock Framework
-
-# CONFIG_HWSPINLOCK is not set
-
-#
-# Clock Source drivers
-#
-CONFIG_TIMER_OF=y
-CONFIG_TIMER_PROBE=y
-CONFIG_CLKSRC_I8253=y
-CONFIG_CLKEVT_I8253=y
-CONFIG_I8253_LOCK=y
-CONFIG_CLKBLD_I8253=y
-CONFIG_CLKSRC_MIPS_GIC=y
-# CONFIG_INGENIC_TIMER is not set
-# end of Clock Source drivers
-
-# CONFIG_MAILBOX is not set
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-# end of Generic IOMMU Pagetable Support
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-# CONFIG_RPMSG_VIRTIO is not set
-# end of Rpmsg drivers
-
-# CONFIG_SOUNDWIRE is not set
-
-#
-# SOC (System On Chip) specific Drivers
-#
-
-#
-# Amlogic SoC drivers
-#
-# end of Amlogic SoC drivers
-
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-# end of i.MX SoC drivers
-
-#
-# Qualcomm SoC drivers
-#
-# end of Qualcomm SoC drivers
-
-# CONFIG_SOC_TI is not set
-
-#
-# Xilinx SoC drivers
-#
-# CONFIG_XILINX_VCU is not set
-# end of Xilinx SoC drivers
-# end of SOC (System On Chip) specific Drivers
-
-# CONFIG_PM_DEVFREQ is not set
-# CONFIG_EXTCON is not set
-# CONFIG_MEMORY is not set
-# CONFIG_IIO is not set
-# CONFIG_NTB is not set
-# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
-
-#
-# IRQ chip support
-#
-CONFIG_IRQCHIP=y
-# CONFIG_AL_FIC is not set
-CONFIG_I8259=y
-CONFIG_IRQ_MIPS_CPU=y
-CONFIG_MIPS_GIC=y
-# CONFIG_INGENIC_TCU_IRQ is not set
-# end of IRQ chip support
-
-# CONFIG_IPACK_BUS is not set
-# CONFIG_RESET_CONTROLLER is not set
-
-#
-# PHY Subsystem
-#
-# CONFIG_GENERIC_PHY is not set
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_CADENCE_DP is not set
-# CONFIG_PHY_CADENCE_DPHY is not set
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_OCELOT_SERDES is not set
-# end of PHY Subsystem
-
-# CONFIG_POWERCAP is not set
-# CONFIG_MCB is not set
-# CONFIG_RAS is not set
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-# end of Android
-
-# CONFIG_DAX is not set
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SYSFS=y
-
-#
-# HW tracing support
-#
-# CONFIG_STM is not set
-# CONFIG_INTEL_TH is not set
-# end of HW tracing support
-
-# CONFIG_FPGA is not set
-# CONFIG_FSI is not set
-# CONFIG_SIOX is not set
-# CONFIG_SLIMBUS is not set
-# CONFIG_INTERCONNECT is not set
-# CONFIG_COUNTER is not set
-# end of Device Drivers
-
-#
-# File systems
-#
-# CONFIG_VALIDATE_FS_PARSER is not set
-CONFIG_FS_IOMAP=y
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-# CONFIG_EXT3_FS_SECURITY is not set
-CONFIG_EXT4_FS=y
-# CONFIG_EXT4_FS_POSIX_ACL is not set
-# CONFIG_EXT4_FS_SECURITY is not set
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=y
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-CONFIG_XFS_FS=y
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_NILFS2_FS is not set
-# CONFIG_F2FS_FS is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-# CONFIG_EXPORTFS_BLOCK_OPS is not set
-CONFIG_FILE_LOCKING=y
-CONFIG_MANDATORY_FILE_LOCKING=y
-# CONFIG_FS_ENCRYPTION is not set
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
-CONFIG_QUOTA=y
-# CONFIG_QUOTA_NETLINK_INTERFACE is not set
-CONFIG_PRINT_QUOTA_WARNING=y
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=y
-# CONFIG_QFMT_V1 is not set
-CONFIG_QFMT_V2=y
-CONFIG_QUOTACTL=y
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_FUSE_FS is not set
-# CONFIG_OVERLAY_FS is not set
-
-#
-# Caches
-#
-# CONFIG_FSCACHE is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_FAT_DEFAULT_UTF8 is not set
-# CONFIG_NTFS_FS is not set
-# end of DOS/FAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PROC_CHILDREN is not set
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-# CONFIG_TMPFS_XATTR is not set
-CONFIG_MEMFD_CREATE=y
-# CONFIG_CONFIGFS_FS is not set
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ORANGEFS_FS is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_ECRYPT_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_SQUASHFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_PSTORE is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-# CONFIG_EROFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V2=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_SWAP is not set
-CONFIG_ROOT_NFS=y
-# CONFIG_NFSD is not set
-CONFIG_GRACE_PERIOD=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-# CONFIG_SUNRPC_DEBUG is not set
-# CONFIG_CEPH_FS is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-CONFIG_CIFS_WEAK_PW_HASH=y
-# CONFIG_CIFS_UPCALL is not set
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_DEBUG=y
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=m
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=m
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_MAC_ROMAN is not set
-# CONFIG_NLS_MAC_CELTIC is not set
-# CONFIG_NLS_MAC_CENTEURO is not set
-# CONFIG_NLS_MAC_CROATIAN is not set
-# CONFIG_NLS_MAC_CYRILLIC is not set
-# CONFIG_NLS_MAC_GAELIC is not set
-# CONFIG_NLS_MAC_GREEK is not set
-# CONFIG_NLS_MAC_ICELAND is not set
-# CONFIG_NLS_MAC_INUIT is not set
-# CONFIG_NLS_MAC_ROMANIAN is not set
-# CONFIG_NLS_MAC_TURKISH is not set
-# CONFIG_NLS_UTF8 is not set
-# CONFIG_UNICODE is not set
-# end of File systems
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_KEYS_REQUEST_CACHE is not set
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-# CONFIG_ENCRYPTED_KEYS is not set
-# CONFIG_KEY_DH_OPERATIONS is not set
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-# CONFIG_SECURITY is not set
-# CONFIG_SECURITYFS is not set
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-# CONFIG_HARDENED_USERCOPY is not set
-# CONFIG_STATIC_USERMODEHELPER is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=m
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-# CONFIG_CRYPTO_USER is not set
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_NULL2=y
-# CONFIG_CRYPTO_PCRYPT is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-CONFIG_CRYPTO_AUTHENC=m
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Public-key cryptography
-#
-# CONFIG_CRYPTO_RSA is not set
-# CONFIG_CRYPTO_DH is not set
-# CONFIG_CRYPTO_ECDH is not set
-# CONFIG_CRYPTO_ECRDSA is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
-# CONFIG_CRYPTO_AEGIS128 is not set
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=m
-# CONFIG_CRYPTO_CFB is not set
-CONFIG_CRYPTO_CTR=m
-# CONFIG_CRYPTO_CTS is not set
-CONFIG_CRYPTO_ECB=m
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_OFB is not set
-CONFIG_CRYPTO_PCBC=m
-# CONFIG_CRYPTO_XTS is not set
-# CONFIG_CRYPTO_KEYWRAP is not set
-# CONFIG_CRYPTO_ADIANTUM is not set
-# CONFIG_CRYPTO_ESSIV is not set
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_VMAC is not set
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_CRC32 is not set
-# CONFIG_CRYPTO_XXHASH is not set
-# CONFIG_CRYPTO_CRCT10DIF is not set
-CONFIG_CRYPTO_GHASH=m
-# CONFIG_CRYPTO_POLY1305 is not set
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_LIB_SHA256=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-# CONFIG_CRYPTO_SHA3 is not set
-# CONFIG_CRYPTO_SM3 is not set
-# CONFIG_CRYPTO_STREEBOG is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-# CONFIG_CRYPTO_CAMELLIA is not set
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_FCRYPT is not set
-CONFIG_CRYPTO_KHAZAD=m
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_CHACHA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-CONFIG_CRYPTO_SERPENT=m
-# CONFIG_CRYPTO_SM4 is not set
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=m
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_842 is not set
-# CONFIG_CRYPTO_LZ4 is not set
-# CONFIG_CRYPTO_LZ4HC is not set
-# CONFIG_CRYPTO_ZSTD is not set
-
-#
-# Random Number Generation
-#
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_DRBG_MENU=m
-CONFIG_CRYPTO_DRBG_HMAC=y
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-CONFIG_CRYPTO_DRBG=m
-CONFIG_CRYPTO_JITTERENTROPY=m
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-# CONFIG_CRYPTO_USER_API_RNG is not set
-# CONFIG_CRYPTO_USER_API_AEAD is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_ASYMMETRIC_KEY_TYPE is not set
-
-#
-# Certificates for signature checking
-#
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-# end of Certificates for signature checking
-
-#
-# Library routines
-#
-# CONFIG_PACKING is not set
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_NET_UTILS=y
-# CONFIG_CORDIC is not set
-CONFIG_RATIONAL=y
-CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-# CONFIG_CRC_CCITT is not set
-CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
-# CONFIG_CRC_ITU_T is not set
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-# CONFIG_CRC64 is not set
-# CONFIG_CRC4 is not set
-# CONFIG_CRC7 is not set
-CONFIG_LIBCRC32C=y
-# CONFIG_CRC8 is not set
-CONFIG_AUDIT_GENERIC=y
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
-# CONFIG_XZ_DEC is not set
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_ARCH_HAS_DMA_COHERENCE_H=y
-CONFIG_ARCH_HAS_DMA_WRITE_COMBINE=y
-CONFIG_DMA_DECLARE_COHERENT=y
-CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
-CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
-CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
-CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y
-CONFIG_DMA_NONCOHERENT_CACHE_SYNC=y
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_GENERIC_ATOMIC64=y
-# CONFIG_IRQ_POLL is not set
-CONFIG_LIBFDT=y
-CONFIG_HAVE_GENERIC_VDSO=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FONT_8x16=y
-CONFIG_FONT_AUTOSELECT=y
-CONFIG_SG_POOL=y
-CONFIG_SBITMAP=y
-# CONFIG_STRING_SELFTEST is not set
-# end of Library routines
-
-CONFIG_GENERIC_LIB_ASHLDI3=y
-CONFIG_GENERIC_LIB_ASHRDI3=y
-CONFIG_GENERIC_LIB_LSHRDI3=y
-CONFIG_GENERIC_LIB_CMPDI2=y
-CONFIG_GENERIC_LIB_UCMPDI2=y
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-# CONFIG_PRINTK_TIME is not set
-# CONFIG_PRINTK_CALLER is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=4
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# end of printk and dmesg options
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=1024
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_INSTALL is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# end of Compile-time checks and compiler options
-
-# CONFIG_MAGIC_SYSRQ is not set
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_OWNER is not set
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SLAB is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_CC_HAS_KASAN_GENERIC=y
-CONFIG_KASAN_STACK=1
-# end of Memory Debugging
-
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Lockups and Hangs
-#
-# CONFIG_SOFTLOCKUP_DETECTOR is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_WQ_WATCHDOG is not set
-# end of Debug Lockups and Hangs
-
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-# end of Lock Debugging (spinlocks, mutexes, etc...)
-
-# CONFIG_STACKTRACE is not set
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# end of RCU Debugging
-
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_FTRACE is not set
-CONFIG_RUNTIME_TESTING_MENU=y
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_TEST_SORT is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_REED_SOLOMON_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_PERCPU_TEST is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-# CONFIG_TEST_HEXDUMP is not set
-# CONFIG_TEST_STRING_HELPERS is not set
-# CONFIG_TEST_STRSCPY is not set
-# CONFIG_TEST_KSTRTOX is not set
-# CONFIG_TEST_PRINTF is not set
-# CONFIG_TEST_BITMAP is not set
-# CONFIG_TEST_BITFIELD is not set
-# CONFIG_TEST_UUID is not set
-# CONFIG_TEST_XARRAY is not set
-# CONFIG_TEST_OVERFLOW is not set
-# CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_HASH is not set
-# CONFIG_TEST_IDA is not set
-# CONFIG_TEST_LKM is not set
-# CONFIG_TEST_VMALLOC is not set
-# CONFIG_TEST_USER_COPY is not set
-# CONFIG_TEST_BPF is not set
-# CONFIG_TEST_BLACKHOLE_DEV is not set
-# CONFIG_FIND_BIT_BENCHMARK is not set
-# CONFIG_TEST_FIRMWARE is not set
-# CONFIG_TEST_SYSCTL is not set
-# CONFIG_TEST_UDELAY is not set
-# CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_TEST_KMOD is not set
-# CONFIG_TEST_MEMCAT_P is not set
-# CONFIG_TEST_STACKINIT is not set
-# CONFIG_TEST_MEMINIT is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_CMDLINE_BOOL is not set
-# CONFIG_DEBUG_ZBOOT is not set
-# CONFIG_MIPS_CPS_NS16550_BOOL is not set
-# end of Kernel hacking
diff --git a/main/linux-lts/config-lts.mips64 b/main/linux-lts/config-lts.mips64
deleted file mode 100644
index 3d2ae38ec49..00000000000
--- a/main/linux-lts/config-lts.mips64
+++ /dev/null
@@ -1,3170 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/mips 5.4.23 Kernel Configuration
-#
-
-#
-# Compiler: gcc (Alpine 9.2.0) 9.2.0
-#
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-# CONFIG_HEADER_TEST is not set
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_BUILD_SALT=""
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-# CONFIG_USELIB is not set
-CONFIG_AUDIT=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_GENERIC_IRQ_IPI=y
-CONFIG_HANDLE_DOMAIN_IRQ=y
-CONFIG_IRQ_FORCED_THREADING=y
-# end of IRQ subsystem
-
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
-CONFIG_NO_HZ=y
-# CONFIG_HIGH_RES_TIMERS is not set
-# end of Timers subsystem
-
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_PSI is not set
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-# CONFIG_IKHEADERS is not set
-CONFIG_LOG_BUF_SHIFT=15
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-CONFIG_GENERIC_SCHED_CLOCK=y
-
-#
-# Scheduler features
-#
-# end of Scheduler features
-
-CONFIG_CGROUPS=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_SWAP_ENABLED=y
-CONFIG_MEMCG_KMEM=y
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_RDMA=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_BPF=y
-CONFIG_CGROUP_DEBUG=y
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-# CONFIG_CHECKPOINT_RESTORE is not set
-# CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_RELAY is not set
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
-# CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is not set
-CONFIG_SYSCTL=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_MULTIUSER=y
-CONFIG_SGETMASK_SYSCALL=y
-CONFIG_SYSFS_SYSCALL=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_FHANDLE=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_SYSCALL=y
-# CONFIG_USERFAULTFD is not set
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
-CONFIG_EMBEDDED=y
-CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_PERF_USE_VMALLOC=y
-# CONFIG_PC104 is not set
-
-#
-# Kernel Performance Events And Counters
-#
-# CONFIG_PERF_EVENTS is not set
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_COMPAT_BRK=y
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-# CONFIG_SLAB_FREELIST_RANDOM is not set
-# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
-# CONFIG_PROFILING is not set
-# end of General setup
-
-CONFIG_MIPS=y
-
-#
-# Machine selection
-#
-# CONFIG_MIPS_GENERIC is not set
-# CONFIG_MIPS_ALCHEMY is not set
-# CONFIG_AR7 is not set
-# CONFIG_ATH25 is not set
-# CONFIG_ATH79 is not set
-# CONFIG_BMIPS_GENERIC is not set
-# CONFIG_BCM47XX is not set
-# CONFIG_BCM63XX is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_INGENIC is not set
-# CONFIG_LANTIQ is not set
-# CONFIG_LASAT is not set
-# CONFIG_MACH_LOONGSON32 is not set
-# CONFIG_MACH_LOONGSON64 is not set
-# CONFIG_MACH_PISTACHIO is not set
-CONFIG_MIPS_MALTA=y
-# CONFIG_MACH_PIC32 is not set
-# CONFIG_NEC_MARKEINS is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-# CONFIG_PMC_MSP is not set
-# CONFIG_RALINK is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MIKROTIK_RB532 is not set
-# CONFIG_CAVIUM_OCTEON_SOC is not set
-# CONFIG_NLM_XLR_BOARD is not set
-# CONFIG_NLM_XLP_BOARD is not set
-# CONFIG_MIPS_PARAVIRT is not set
-# end of Machine selection
-
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_BOOT_RAW=y
-CONFIG_CEVT_R4K=y
-CONFIG_CSRC_R4K=y
-CONFIG_MIPS_CLOCK_VSYSCALL=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_DMA_MAYBE_COHERENT=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_SYS_SUPPORTS_HOTPLUG_CPU=y
-CONFIG_MIPS_BONITO64=y
-CONFIG_MIPS_MSC=y
-CONFIG_SYNC_R4K=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_ISA_DMA_API=y
-CONFIG_SYS_SUPPORTS_RELOCATABLE=y
-CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_CPU_LITTLE_ENDIAN is not set
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-CONFIG_SYS_SUPPORTS_HUGETLBFS=y
-CONFIG_PCI_GT64XXX_PCI0=y
-CONFIG_MIPS_SPRAM=y
-CONFIG_SWAP_IO_SPACE=y
-CONFIG_BOOT_ELF32=y
-CONFIG_MIPS_L1_CACHE_SHIFT_6=y
-CONFIG_MIPS_L1_CACHE_SHIFT=6
-
-#
-# CPU selection
-#
-# CONFIG_CPU_MIPS32_R1 is not set
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS32_R6 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-CONFIG_CPU_MIPS64_R2=y
-# CONFIG_CPU_MIPS64_R6 is not set
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_RM7000 is not set
-CONFIG_SYS_SUPPORTS_ZBOOT=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_CPU_MIPS32_R2=y
-CONFIG_SYS_HAS_CPU_MIPS32_R3_5=y
-CONFIG_SYS_HAS_CPU_MIPS32_R5=y
-CONFIG_SYS_HAS_CPU_MIPS32_R6=y
-CONFIG_SYS_HAS_CPU_MIPS64_R1=y
-CONFIG_SYS_HAS_CPU_MIPS64_R2=y
-CONFIG_SYS_HAS_CPU_MIPS64_R6=y
-CONFIG_SYS_HAS_CPU_NEVADA=y
-CONFIG_SYS_HAS_CPU_RM7000=y
-CONFIG_WEAK_ORDERING=y
-# end of CPU selection
-
-CONFIG_CPU_MIPS64=y
-CONFIG_CPU_MIPSR2=y
-CONFIG_TARGET_ISA_REV=2
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HUGEPAGES=y
-CONFIG_MIPS_PGD_C0_CONTEXT=y
-CONFIG_HARDWARE_WATCHPOINTS=y
-
-#
-# Kernel type
-#
-# CONFIG_32BIT is not set
-CONFIG_64BIT=y
-# CONFIG_MIPS_VA_BITS_48 is not set
-# CONFIG_PAGE_SIZE_4KB is not set
-CONFIG_PAGE_SIZE_16KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
-CONFIG_BOARD_SCACHE=y
-CONFIG_MIPS_CPU_SCACHE=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_GENERIC_DUMP_TLB=y
-CONFIG_MIPS_FP_SUPPORT=y
-CONFIG_CPU_R4K_FPU=y
-CONFIG_CPU_R4K_CACHE_TLB=y
-CONFIG_MIPS_MT_SMP=y
-CONFIG_MIPS_MT=y
-# CONFIG_SCHED_SMT is not set
-CONFIG_SYS_SUPPORTS_SCHED_SMT=y
-CONFIG_SYS_SUPPORTS_MULTITHREADING=y
-CONFIG_MIPS_MT_FPAFF=y
-CONFIG_SYS_SUPPORTS_VPE_LOADER=y
-# CONFIG_MIPS_VPE_LOADER is not set
-# CONFIG_MIPS_CMP is not set
-CONFIG_MIPS_CPS=y
-CONFIG_MIPS_CPS_PM=y
-CONFIG_MIPS_CM=y
-CONFIG_MIPS_CPC=y
-CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y
-# CONFIG_CPU_HAS_SMARTMIPS is not set
-CONFIG_CPU_HAS_MSA=y
-CONFIG_CPU_HAS_RIXI=y
-CONFIG_CPU_HAS_LOAD_STORE_LR=y
-CONFIG_CPU_MIPSR2_IRQ_VI=y
-CONFIG_CPU_MIPSR2_IRQ_EI=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_MIPS_ASID_SHIFT=0
-CONFIG_MIPS_ASID_BITS=8
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-CONFIG_SYS_SUPPORTS_HIGHMEM=y
-CONFIG_SYS_SUPPORTS_SMARTMIPS=y
-CONFIG_SYS_SUPPORTS_MICROMIPS=y
-CONFIG_SYS_SUPPORTS_MIPS16=y
-CONFIG_CPU_SUPPORTS_MSA=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_RELOCATABLE is not set
-CONFIG_SMP=y
-CONFIG_HOTPLUG_CPU=y
-CONFIG_SMP_UP=y
-CONFIG_SYS_SUPPORTS_MIPS_CMP=y
-CONFIG_SYS_SUPPORTS_MIPS_CPS=y
-CONFIG_SYS_SUPPORTS_SMP=y
-CONFIG_NR_CPUS=2
-CONFIG_MIPS_PERF_SHARED_TC_COUNTERS=y
-CONFIG_MIPS_NR_CPU_NR_MAP=2
-# CONFIG_HZ_24 is not set
-# CONFIG_HZ_48 is not set
-CONFIG_HZ_100=y
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_1024 is not set
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=100
-# CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_SECCOMP=y
-CONFIG_USE_OF=y
-CONFIG_BUILTIN_DTB=y
-CONFIG_MIPS_NO_APPENDED_DTB=y
-# CONFIG_MIPS_ELF_APPENDED_DTB is not set
-# CONFIG_MIPS_RAW_APPENDED_DTB is not set
-# CONFIG_MIPS_CMDLINE_FROM_DTB is not set
-# CONFIG_MIPS_CMDLINE_DTB_EXTEND is not set
-CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y
-# end of Kernel type
-
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_PGTABLE_LEVELS=3
-
-#
-# Bus options (PCI, PCMCIA, EISA, ISA, TC)
-#
-CONFIG_PCI_DRIVERS_LEGACY=y
-CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MIN=12
-CONFIG_ARCH_MMAP_RND_BITS_MAX=18
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15
-CONFIG_I8253=y
-CONFIG_ZONE_DMA=y
-CONFIG_ZONE_DMA32=y
-# end of Bus options (PCI, PCMCIA, EISA, ISA, TC)
-
-# CONFIG_MIPS32_O32 is not set
-# CONFIG_MIPS32_N32 is not set
-
-#
-# Power management options
-#
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-# CONFIG_HIBERNATION is not set
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_CLK=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-# end of Power management options
-
-CONFIG_MIPS_EXTERNAL_TIMER=y
-
-#
-# CPU Power Management
-#
-
-#
-# CPU Idle
-#
-# CONFIG_CPU_IDLE is not set
-# end of CPU Idle
-# end of CPU Power Management
-
-#
-# Firmware Drivers
-#
-# CONFIG_FIRMWARE_MEMMAP is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-CONFIG_EFI_EARLYCON=y
-
-#
-# Tegra firmware driver
-#
-# end of Tegra firmware driver
-# end of Firmware Drivers
-
-CONFIG_HAVE_KVM=y
-# CONFIG_VIRTUALIZATION is not set
-
-#
-# General architecture-dependent options
-#
-CONFIG_CRASH_CORE=y
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
-# CONFIG_JUMP_LABEL is not set
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_ARCH_HAS_UNCACHED_SEGMENT=y
-CONFIG_HAVE_ASM_MODVERSIONS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=12
-CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_64BIT_TIME=y
-# CONFIG_REFCOUNT_FULL is not set
-CONFIG_HAVE_ARCH_COMPILER_H=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
-
-#
-# GCOV-based kernel profiling
-#
-# end of GCOV-based kernel profiling
-
-CONFIG_PLUGIN_HOSTCC=""
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
-CONFIG_ASM_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_BLOCK=y
-CONFIG_BLK_RQ_ALLOC_TIME=y
-CONFIG_BLK_SCSI_REQUEST=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_BSGLIB is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_ZONED is not set
-CONFIG_BLK_DEV_THROTTLING=y
-CONFIG_BLK_DEV_THROTTLING_LOW=y
-# CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_WBT is not set
-CONFIG_BLK_CGROUP_IOLATENCY=y
-CONFIG_BLK_CGROUP_IOCOST=y
-# CONFIG_BLK_SED_OPAL is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# end of Partition Types
-
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_PM=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-# CONFIG_IOSCHED_BFQ is not set
-# end of IO Schedulers
-
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-CONFIG_QUEUED_SPINLOCKS=y
-CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_FREEZER=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_ARCH_BINFMT_ELF_STATE=y
-CONFIG_ELFCORE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-# CONFIG_BINFMT_MISC is not set
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_FAST_GUP=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
-# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
-# CONFIG_CMA is not set
-# CONFIG_ZPOOL is not set
-# CONFIG_ZBUD is not set
-# CONFIG_ZSMALLOC is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
-CONFIG_ARCH_HAS_PTE_SPECIAL=y
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_EGRESS=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_DIAG is not set
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-# CONFIG_UNIX_DIAG is not set
-# CONFIG_TLS is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=y
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_INTERFACE is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=y
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_XDP_SOCKETS=y
-# CONFIG_XDP_SOCKETS_DIAG is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IP_PNP_RARP is not set
-CONFIG_NET_IPIP=m
-# CONFIG_NET_IPGRE_DEMUX is not set
-CONFIG_NET_IP_TUNNEL=y
-CONFIG_IP_MROUTE_COMMON=y
-CONFIG_IP_MROUTE=y
-# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-# CONFIG_NET_IPVTI is not set
-# CONFIG_NET_FOU is not set
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-# CONFIG_INET_ESP_OFFLOAD is not set
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-# CONFIG_INET_UDP_DIAG is not set
-# CONFIG_INET_RAW_DIAG is not set
-# CONFIG_INET_DIAG_DESTROY is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=y
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-# CONFIG_INET6_ESP_OFFLOAD is not set
-CONFIG_INET6_IPCOMP=m
-# CONFIG_IPV6_MIP6 is not set
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-# CONFIG_IPV6_VTI is not set
-CONFIG_IPV6_SIT=y
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_BPFILTER is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_L2TP is not set
-CONFIG_STP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_BRIDGE_VLAN_FILTERING is not set
-CONFIG_HAVE_NET_DSA=y
-# CONFIG_NET_DSA is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-# CONFIG_VLAN_8021Q_MVRP is not set
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-# CONFIG_LLC2 is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_PHONET is not set
-# CONFIG_6LOWPAN is not set
-# CONFIG_IEEE802154 is not set
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_PRIO=m
-# CONFIG_NET_SCH_MULTIQ is not set
-CONFIG_NET_SCH_RED=m
-# CONFIG_NET_SCH_SFB is not set
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-# CONFIG_NET_SCH_CBS is not set
-# CONFIG_NET_SCH_ETF is not set
-# CONFIG_NET_SCH_TAPRIO is not set
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-# CONFIG_NET_SCH_DRR is not set
-# CONFIG_NET_SCH_MQPRIO is not set
-# CONFIG_NET_SCH_SKBPRIO is not set
-# CONFIG_NET_SCH_CHOKE is not set
-# CONFIG_NET_SCH_QFQ is not set
-# CONFIG_NET_SCH_CODEL is not set
-# CONFIG_NET_SCH_FQ_CODEL is not set
-# CONFIG_NET_SCH_CAKE is not set
-# CONFIG_NET_SCH_FQ is not set
-# CONFIG_NET_SCH_HHF is not set
-# CONFIG_NET_SCH_PIE is not set
-CONFIG_NET_SCH_INGRESS=m
-# CONFIG_NET_SCH_PLUG is not set
-# CONFIG_NET_SCH_DEFAULT is not set
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-# CONFIG_NET_CLS_FLOW is not set
-CONFIG_NET_CLS_CGROUP=m
-# CONFIG_NET_CLS_BPF is not set
-# CONFIG_NET_CLS_FLOWER is not set
-# CONFIG_NET_CLS_MATCHALL is not set
-# CONFIG_NET_EMATCH is not set
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=y
-# CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_MIRRED is not set
-# CONFIG_NET_ACT_SAMPLE is not set
-# CONFIG_NET_ACT_NAT is not set
-# CONFIG_NET_ACT_PEDIT is not set
-# CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_ACT_SKBEDIT is not set
-# CONFIG_NET_ACT_CSUM is not set
-# CONFIG_NET_ACT_MPLS is not set
-# CONFIG_NET_ACT_VLAN is not set
-# CONFIG_NET_ACT_BPF is not set
-# CONFIG_NET_ACT_SKBMOD is not set
-# CONFIG_NET_ACT_IFE is not set
-# CONFIG_NET_ACT_TUNNEL_KEY is not set
-# CONFIG_NET_TC_SKB_EXT is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-# CONFIG_DNS_RESOLVER is not set
-# CONFIG_BATMAN_ADV is not set
-# CONFIG_OPENVSWITCH is not set
-# CONFIG_VSOCKETS is not set
-# CONFIG_NETLINK_DIAG is not set
-# CONFIG_MPLS is not set
-# CONFIG_NET_NSH is not set
-# CONFIG_HSR is not set
-# CONFIG_NET_SWITCHDEV is not set
-# CONFIG_NET_L3_MASTER_DEV is not set
-# CONFIG_NET_NCSI is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-# CONFIG_CGROUP_NET_PRIO is not set
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-# CONFIG_BPF_JIT is not set
-# CONFIG_BPF_STREAM_PARSER is not set
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# end of Network testing
-# end of Networking options
-
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AF_KCM is not set
-CONFIG_FIB_RULES=y
-# CONFIG_WIRELESS is not set
-# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
-# CONFIG_NET_9P is not set
-# CONFIG_CAIF is not set
-# CONFIG_CEPH_LIB is not set
-# CONFIG_NFC is not set
-# CONFIG_PSAMPLE is not set
-# CONFIG_NET_IFE is not set
-# CONFIG_LWTUNNEL is not set
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-# CONFIG_FAILOVER is not set
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-CONFIG_HAVE_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PCIEPORTBUS is not set
-# CONFIG_PCI_MSI is not set
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_STUB is not set
-# CONFIG_PCI_IOV is not set
-# CONFIG_PCI_PRI is not set
-# CONFIG_PCI_PASID is not set
-# CONFIG_HOTPLUG_PCI is not set
-
-#
-# PCI controller drivers
-#
-
-#
-# Cadence PCIe controllers support
-#
-# CONFIG_PCIE_CADENCE_HOST is not set
-# end of Cadence PCIe controllers support
-
-# CONFIG_PCI_FTPCI100 is not set
-# CONFIG_PCI_HOST_GENERIC is not set
-# CONFIG_PCIE_XILINX is not set
-
-#
-# DesignWare PCI Core Support
-#
-# end of DesignWare PCI Core Support
-# end of PCI controller drivers
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-# end of PCI Endpoint
-
-#
-# PCI switch controller drivers
-#
-# CONFIG_PCI_SW_SWITCHTEC is not set
-# end of PCI switch controller drivers
-
-# CONFIG_PCCARD is not set
-# CONFIG_RAPIDIO is not set
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=y
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
-# end of Firmware loader
-
-CONFIG_ALLOW_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_MMIO=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-# CONFIG_BRCMSTB_GISB_ARB is not set
-# CONFIG_MIPS_CDMM is not set
-# CONFIG_SIMPLE_PM_BUS is not set
-# end of Bus devices
-
-# CONFIG_CONNECTOR is not set
-# CONFIG_GNSS is not set
-# CONFIG_MTD is not set
-CONFIG_DTC=y
-CONFIG_OF=y
-# CONFIG_OF_UNITTEST is not set
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
-CONFIG_OF_RESERVED_MEM=y
-# CONFIG_OF_OVERLAY is not set
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-# CONFIG_PARPORT is not set
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_NULL_BLK is not set
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
-# CONFIG_BLK_DEV_UMEM is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-# CONFIG_BLK_DEV_DRBD is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_SKD is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_VIRTIO_BLK is not set
-# CONFIG_BLK_DEV_RBD is not set
-# CONFIG_BLK_DEV_RSXX is not set
-
-#
-# NVME Support
-#
-# CONFIG_BLK_DEV_NVME is not set
-# CONFIG_NVME_FC is not set
-# end of NVME Support
-
-#
-# Misc devices
-#
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_APDS9802ALS is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISL29020 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_BH1770 is not set
-# CONFIG_SENSORS_APDS990X is not set
-# CONFIG_HMC6352 is not set
-# CONFIG_DS1682 is not set
-# CONFIG_PCH_PHUB is not set
-# CONFIG_SRAM is not set
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_XILINX_SDFEC is not set
-# CONFIG_PVPANIC is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_IDT_89HPESX is not set
-# CONFIG_EEPROM_EE1004 is not set
-# end of EEPROM support
-
-# CONFIG_CB710_CORE is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# end of Texas Instruments shared transport line discipline
-
-# CONFIG_SENSORS_LIS3_I2C is not set
-
-#
-# Altera FPGA firmware download module (requires I2C)
-#
-# CONFIG_ALTERA_STAPL is not set
-
-#
-# Intel MIC & related support
-#
-
-#
-# Intel MIC Bus Driver
-#
-
-#
-# SCIF Bus Driver
-#
-
-#
-# VOP Bus Driver
-#
-# CONFIG_VOP_BUS is not set
-
-#
-# Intel MIC Host Driver
-#
-
-#
-# Intel MIC Card Driver
-#
-
-#
-# SCIF Driver
-#
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-
-#
-# VOP Driver
-#
-# end of Intel MIC & related support
-
-# CONFIG_GENWQE is not set
-# CONFIG_ECHO is not set
-# CONFIG_MISC_ALCOR_PCI is not set
-# CONFIG_MISC_RTSX_PCI is not set
-# CONFIG_MISC_RTSX_USB is not set
-# CONFIG_HABANA_AI is not set
-# end of Misc devices
-
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-# CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_BLK_DEV_SR is not set
-CONFIG_CHR_DEV_SG=y
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# end of SCSI Transports
-
-# CONFIG_SCSI_LOWLEVEL is not set
-# CONFIG_SCSI_DH is not set
-# end of SCSI device support
-
-CONFIG_ATA=y
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-# CONFIG_SATA_AHCI is not set
-# CONFIG_SATA_AHCI_PLATFORM is not set
-# CONFIG_AHCI_CEVA is not set
-# CONFIG_AHCI_QORIQ is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_ACARD_AHCI is not set
-# CONFIG_SATA_SIL24 is not set
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-# CONFIG_PDC_ADMA is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SX4 is not set
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=y
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-
-#
-# PATA SFF controllers with BMDMA
-#
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_ATP867X is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5536 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87415 is not set
-CONFIG_PATA_OLDPIIX=y
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TOSHIBA is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-
-#
-# PIO-only SFF controllers
-#
-# CONFIG_PATA_CMD640_PCI is not set
-CONFIG_PATA_MPIIX=y
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_RZ1000 is not set
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_ATA_GENERIC=y
-# CONFIG_PATA_LEGACY is not set
-# CONFIG_MD is not set
-# CONFIG_TARGET_CORE is not set
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_NOSY is not set
-# end of IEEE 1394 (FireWire) support
-
-CONFIG_NETDEVICES=y
-CONFIG_MII=y
-CONFIG_NET_CORE=y
-# CONFIG_BONDING is not set
-# CONFIG_DUMMY is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_NET_FC is not set
-# CONFIG_IFB is not set
-# CONFIG_NET_TEAM is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_IPVLAN is not set
-# CONFIG_VXLAN is not set
-# CONFIG_GENEVE is not set
-# CONFIG_GTP is not set
-# CONFIG_MACSEC is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_TUN is not set
-# CONFIG_TUN_VNET_CROSS_LE is not set
-# CONFIG_VETH is not set
-# CONFIG_VIRTIO_NET is not set
-# CONFIG_NLMON is not set
-# CONFIG_ARCNET is not set
-
-#
-# CAIF transport drivers
-#
-
-#
-# Distributed Switch Architecture drivers
-#
-# end of Distributed Switch Architecture drivers
-
-CONFIG_ETHERNET=y
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
-CONFIG_NET_VENDOR_AGERE=y
-# CONFIG_ET131X is not set
-CONFIG_NET_VENDOR_ALACRITECH=y
-# CONFIG_SLICOSS is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
-# CONFIG_ALTERA_TSE is not set
-CONFIG_NET_VENDOR_AMAZON=y
-CONFIG_NET_VENDOR_AMD=y
-# CONFIG_AMD8111_ETH is not set
-CONFIG_PCNET32=y
-CONFIG_NET_VENDOR_AQUANTIA=y
-CONFIG_NET_VENDOR_ARC=y
-# CONFIG_NET_VENDOR_ATHEROS is not set
-CONFIG_NET_VENDOR_AURORA=y
-# CONFIG_AURORA_NB8800 is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
-CONFIG_NET_VENDOR_CADENCE=y
-# CONFIG_MACB is not set
-CONFIG_NET_VENDOR_CAVIUM=y
-# CONFIG_THUNDER_NIC_PF is not set
-# CONFIG_THUNDER_NIC_VF is not set
-# CONFIG_THUNDER_NIC_BGX is not set
-# CONFIG_THUNDER_NIC_RGX is not set
-CONFIG_CAVIUM_PTP=y
-# CONFIG_LIQUIDIO is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CISCO is not set
-CONFIG_NET_VENDOR_CORTINA=y
-# CONFIG_GEMINI_ETHERNET is not set
-# CONFIG_DM9000 is not set
-# CONFIG_DNET is not set
-# CONFIG_NET_VENDOR_DEC is not set
-# CONFIG_NET_VENDOR_DLINK is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
-CONFIG_NET_VENDOR_EZCHIP=y
-# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
-CONFIG_NET_VENDOR_GOOGLE=y
-# CONFIG_NET_VENDOR_HP is not set
-CONFIG_NET_VENDOR_HUAWEI=y
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_JME is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-CONFIG_NET_VENDOR_MICROCHIP=y
-# CONFIG_LAN743X is not set
-CONFIG_NET_VENDOR_MICROSEMI=y
-# CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-CONFIG_NET_VENDOR_NETERION=y
-# CONFIG_S2IO is not set
-# CONFIG_VXGE is not set
-CONFIG_NET_VENDOR_NETRONOME=y
-CONFIG_NET_VENDOR_NI=y
-# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
-# CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_ETHOC is not set
-CONFIG_NET_VENDOR_PACKET_ENGINES=y
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-CONFIG_NET_VENDOR_PENSANDO=y
-# CONFIG_IONIC is not set
-# CONFIG_NET_VENDOR_QLOGIC is not set
-CONFIG_NET_VENDOR_QUALCOMM=y
-# CONFIG_QCOM_EMAC is not set
-# CONFIG_RMNET is not set
-# CONFIG_NET_VENDOR_RDC is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
-CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_ROCKER=y
-CONFIG_NET_VENDOR_SAMSUNG=y
-# CONFIG_SXGBE_ETH is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-CONFIG_NET_VENDOR_SOLARFLARE=y
-# CONFIG_SFC is not set
-# CONFIG_SFC_FALCON is not set
-# CONFIG_NET_VENDOR_SILAN is not set
-# CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-CONFIG_NET_VENDOR_SOCIONEXT=y
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SUN is not set
-CONFIG_NET_VENDOR_SYNOPSYS=y
-# CONFIG_DWC_XLGMAC is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_NET_VENDOR_TI is not set
-# CONFIG_NET_VENDOR_TOSHIBA is not set
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-CONFIG_NET_VENDOR_XILINX=y
-# CONFIG_XILINX_EMACLITE is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_MDIO_DEVICE is not set
-# CONFIG_PHYLIB is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-CONFIG_USB_NET_DRIVERS=y
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_RTL8152 is not set
-# CONFIG_USB_LAN78XX is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_IPHETH is not set
-# CONFIG_WLAN is not set
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
-# CONFIG_WAN is not set
-# CONFIG_VMXNET3 is not set
-# CONFIG_NET_FAILOVER is not set
-# CONFIG_ISDN is not set
-# CONFIG_NVM is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_LEDS=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_MATRIXKMAP is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ADP5589 is not set
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_QT1050 is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_QT2160 is not set
-# CONFIG_KEYBOARD_DLINK_DIR685 is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_TCA8418 is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_MPR121 is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
-# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_CAP11XX is not set
-# CONFIG_KEYBOARD_BCM is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_BYD=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_CYPRESS=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-# CONFIG_MOUSE_PS2_ELANTECH is not set
-# CONFIG_MOUSE_PS2_SENTELIC is not set
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_PS2_FOCALTECH=y
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_BCM5974 is not set
-# CONFIG_MOUSE_CYAPA is not set
-# CONFIG_MOUSE_ELAN_I2C is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MOUSE_SYNAPTICS_USB is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-# CONFIG_RMI4_CORE is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_PCIPS2 is not set
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
-# CONFIG_SERIO_ALTERA_PS2 is not set
-# CONFIG_SERIO_PS2MULT is not set
-# CONFIG_SERIO_ARC_PS2 is not set
-# CONFIG_SERIO_APBPS2 is not set
-# CONFIG_USERIO is not set
-# CONFIG_GAMEPORT is not set
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-# CONFIG_VT is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=4
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_N_GSM is not set
-# CONFIG_TRACE_SINK is not set
-# CONFIG_NULL_TTY is not set
-CONFIG_LDISC_AUTOLOAD=y
-CONFIG_DEVMEM=y
-# CONFIG_DEVKMEM is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
-# CONFIG_SERIAL_8250_FINTEK is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_EXAR=y
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SERIAL_8250_ASPEED_VUART is not set
-# CONFIG_SERIAL_8250_DW is not set
-# CONFIG_SERIAL_8250_RT288X is not set
-# CONFIG_SERIAL_8250_INGENIC is not set
-# CONFIG_SERIAL_OF_PLATFORM is not set
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_SIFIVE is not set
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
-# CONFIG_SERIAL_BCM63XX is not set
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_PCH_UART is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
-# CONFIG_SERIAL_ARC is not set
-# CONFIG_SERIAL_RP2 is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_FSL_LINFLEXUART is not set
-# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
-# end of Serial drivers
-
-# CONFIG_SERIAL_DEV_BUS is not set
-# CONFIG_TTY_PRINTK is not set
-# CONFIG_VIRTIO_CONSOLE is not set
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_HW_RANDOM=y
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_VIRTIO is not set
-# CONFIG_APPLICOM is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
-CONFIG_DEVPORT=y
-# CONFIG_XILLYBUS is not set
-# end of Character devices
-
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-# CONFIG_I2C_CHARDEV is not set
-# CONFIG_I2C_MUX is not set
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOBIT=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_NVIDIA_GPU is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_DESIGNWARE_PCI is not set
-# CONFIG_I2C_EG20T is not set
-# CONFIG_I2C_EMEV2 is not set
-# CONFIG_I2C_IMG is not set
-# CONFIG_I2C_JZ4780 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_RK3X is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_XILINX is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-# CONFIG_I2C_DIOLAN_U2C is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-
-#
-# Other I2C/SMBus bus drivers
-#
-# end of I2C Hardware Bus support
-
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_SLAVE is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# end of I2C support
-
-# CONFIG_I3C is not set
-# CONFIG_SPI is not set
-# CONFIG_SPMI is not set
-# CONFIG_HSI is not set
-# CONFIG_PPS is not set
-
-#
-# PTP clock support
-#
-# CONFIG_PTP_1588_CLOCK is not set
-
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-# end of PTP clock support
-
-# CONFIG_PINCTRL is not set
-# CONFIG_GPIOLIB is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_AVS is not set
-CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_BRCMSTB is not set
-CONFIG_POWER_RESET_PIIX4_POWEROFF=y
-# CONFIG_POWER_RESET_RESTART is not set
-CONFIG_POWER_RESET_SYSCON=y
-# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
-# CONFIG_SYSCON_REBOOT_MODE is not set
-# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_HWMON is not set
-# CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB is not set
-CONFIG_BCMA_POSSIBLE=y
-# CONFIG_BCMA is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_ACT8945A is not set
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
-# CONFIG_MFD_ATMEL_HLCDC is not set
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_MADERA is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-# CONFIG_MFD_HI6421_PMIC is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_LPC_ICH is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77650 is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_MENF21BMC is not set
-# CONFIG_MFD_VIPERBOARD is not set
-# CONFIG_MFD_RETU is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_RK808 is not set
-# CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_SKY81452 is not set
-# CONFIG_ABX500_CORE is not set
-CONFIG_MFD_SYSCON=y
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_TI_LMU is not set
-# CONFIG_TPS6105X is not set
-# CONFIG_TPS6507X is not set
-# CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_TPS65217 is not set
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TI_LP87565 is not set
-# CONFIG_MFD_TPS65218 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_WL1273_CORE is not set
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_TQMX86 is not set
-# CONFIG_MFD_VX855 is not set
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MFD_STMFX is not set
-# end of Multifunction device drivers
-
-# CONFIG_REGULATOR is not set
-# CONFIG_RC_CORE is not set
-# CONFIG_MEDIA_SUPPORT is not set
-
-#
-# Graphics support
-#
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_DRM=m
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-# CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_TTM=m
-CONFIG_DRM_VRAM_HELPER=m
-
-#
-# I2C encoder or helper chips
-#
-# CONFIG_DRM_I2C_CH7006 is not set
-# CONFIG_DRM_I2C_SIL164 is not set
-# CONFIG_DRM_I2C_NXP_TDA998X is not set
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# end of I2C encoder or helper chips
-
-#
-# ARM devices
-#
-# CONFIG_DRM_KOMEDA is not set
-# end of ARM devices
-
-# CONFIG_DRM_RADEON is not set
-# CONFIG_DRM_AMDGPU is not set
-
-#
-# ACP (Audio CoProcessor) Configuration
-#
-# end of ACP (Audio CoProcessor) Configuration
-
-# CONFIG_DRM_NOUVEAU is not set
-# CONFIG_DRM_VGEM is not set
-# CONFIG_DRM_VKMS is not set
-# CONFIG_DRM_UDL is not set
-# CONFIG_DRM_AST is not set
-# CONFIG_DRM_MGAG200 is not set
-# CONFIG_DRM_CIRRUS_QEMU is not set
-# CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_LVDS is not set
-# CONFIG_DRM_QXL is not set
-CONFIG_DRM_BOCHS=m
-# CONFIG_DRM_VIRTIO_GPU is not set
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-# CONFIG_DRM_PANEL_ARM_VERSATILE is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
-# end of Display Panels
-
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_PANEL_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-# CONFIG_DRM_ANALOGIX_ANX78XX is not set
-# CONFIG_DRM_CDNS_DSI is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
-# CONFIG_DRM_LVDS_ENCODER is not set
-# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
-# CONFIG_DRM_NXP_PTN3460 is not set
-# CONFIG_DRM_PARADE_PS8622 is not set
-# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SII902X is not set
-# CONFIG_DRM_SII9234 is not set
-# CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TOSHIBA_TC358764 is not set
-# CONFIG_DRM_TOSHIBA_TC358767 is not set
-# CONFIG_DRM_TI_TFP410 is not set
-# CONFIG_DRM_TI_SN65DSI86 is not set
-# CONFIG_DRM_I2C_ADV7511 is not set
-# end of Display Interface Bridges
-
-# CONFIG_DRM_ETNAVIV is not set
-# CONFIG_DRM_ARCPGU is not set
-# CONFIG_DRM_MXSFB is not set
-# CONFIG_DRM_GM12U320 is not set
-# CONFIG_DRM_LEGACY is not set
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_MODE_HELPERS is not set
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_OPENCORES is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-CONFIG_FB_MATROX=y
-# CONFIG_FB_MATROX_MILLENIUM is not set
-# CONFIG_FB_MATROX_MYSTIQUE is not set
-CONFIG_FB_MATROX_G=y
-# CONFIG_FB_MATROX_I2C is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_SIMPLE is not set
-# CONFIG_FB_SM712 is not set
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
-# end of Backlight & LCD device support
-
-CONFIG_HDMI=y
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
-# end of Graphics support
-
-# CONFIG_SOUND is not set
-
-#
-# HID support
-#
-CONFIG_HID=y
-# CONFIG_HID_BATTERY_STRENGTH is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_UHID is not set
-CONFIG_HID_GENERIC=y
-
-#
-# Special HID drivers
-#
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACCUTOUCH is not set
-# CONFIG_HID_ACRUX is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_APPLEIR is not set
-# CONFIG_HID_ASUS is not set
-# CONFIG_HID_AUREAL is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BETOP_FF is not set
-# CONFIG_HID_BIGBEN_FF is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_CORSAIR is not set
-# CONFIG_HID_COUGAR is not set
-# CONFIG_HID_MACALLY is not set
-# CONFIG_HID_CMEDIA is not set
-# CONFIG_HID_CREATIVE_SB0540 is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_ELAN is not set
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GEMBIRD is not set
-# CONFIG_HID_GFRM is not set
-# CONFIG_HID_HOLTEK is not set
-# CONFIG_HID_GT683R is not set
-# CONFIG_HID_KEYTOUCH is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_UCLOGIC is not set
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_VIEWSONIC is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_ICADE is not set
-# CONFIG_HID_ITE is not set
-# CONFIG_HID_JABRA is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_LED is not set
-# CONFIG_HID_LENOVO is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MAGICMOUSE is not set
-# CONFIG_HID_MALTRON is not set
-# CONFIG_HID_MAYFLASH is not set
-# CONFIG_HID_REDRAGON is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_MULTITOUCH is not set
-# CONFIG_HID_NTI is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PENMOUNT is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PICOLCD is not set
-# CONFIG_HID_PLANTRONICS is not set
-# CONFIG_HID_PRIMAX is not set
-# CONFIG_HID_RETRODE is not set
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_SAITEK is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SPEEDLINK is not set
-# CONFIG_HID_STEAM is not set
-# CONFIG_HID_STEELSERIES is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_RMI is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_THINGM is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_UDRAW_PS3 is not set
-# CONFIG_HID_U2FZERO is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_WIIMOTE is not set
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HID_ZYDACRON is not set
-# CONFIG_HID_SENSOR_HUB is not set
-# CONFIG_HID_ALPS is not set
-# end of Special HID drivers
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=y
-# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
-# end of USB HID support
-
-#
-# I2C HID support
-#
-# CONFIG_I2C_HID is not set
-# end of I2C HID support
-# end of HID support
-
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
-# CONFIG_USB_LED_TRIG is not set
-# CONFIG_USB_ULPI_BUS is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=y
-CONFIG_USB_PCI=y
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
-CONFIG_USB_AUTOSUSPEND_DELAY=2
-# CONFIG_USB_MON is not set
-
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_XHCI_HCD is not set
-CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-CONFIG_USB_EHCI_PCI=y
-# CONFIG_USB_EHCI_FSL is not set
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_FOTG210_HCD is not set
-# CONFIG_USB_OHCI_HCD is not set
-CONFIG_USB_UHCI_HCD=y
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_TMC is not set
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=y
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_REALTEK is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-# CONFIG_USB_UAS is not set
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USBIP_CORE is not set
-# CONFIG_USB_CDNS3 is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_ISP1760 is not set
-
-#
-# USB port drivers
-#
-# CONFIG_USB_SERIAL is not set
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_YUREX is not set
-# CONFIG_USB_EZUSB_FX2 is not set
-# CONFIG_USB_HUB_USB251XB is not set
-# CONFIG_USB_HSIC_USB3503 is not set
-# CONFIG_USB_HSIC_USB4604 is not set
-# CONFIG_USB_LINK_LAYER_TEST is not set
-# CONFIG_USB_CHAOSKEY is not set
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_USB_ISP1301 is not set
-# end of USB Physical Layer drivers
-
-# CONFIG_USB_GADGET is not set
-# CONFIG_TYPEC is not set
-# CONFIG_USB_ROLE_SWITCH is not set
-# CONFIG_MMC is not set
-# CONFIG_MEMSTICK is not set
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-# CONFIG_LEDS_CLASS_FLASH is not set
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
-
-#
-# LED drivers
-#
-# CONFIG_LEDS_AN30259A is not set
-# CONFIG_LEDS_BCM6328 is not set
-# CONFIG_LEDS_BCM6358 is not set
-# CONFIG_LEDS_LM3530 is not set
-# CONFIG_LEDS_LM3532 is not set
-# CONFIG_LEDS_LM3642 is not set
-# CONFIG_LEDS_LM3692X is not set
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_LP5523 is not set
-# CONFIG_LEDS_LP5562 is not set
-# CONFIG_LEDS_LP8501 is not set
-# CONFIG_LEDS_LP8860 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_BD2802 is not set
-# CONFIG_LEDS_TCA6507 is not set
-# CONFIG_LEDS_TLC591XX is not set
-# CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_IS31FL319X is not set
-# CONFIG_LEDS_IS31FL32XX is not set
-
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-# CONFIG_LEDS_BLINKM is not set
-# CONFIG_LEDS_SYSCON is not set
-# CONFIG_LEDS_MLXREG is not set
-# CONFIG_LEDS_USER is not set
-# CONFIG_LEDS_TI_LMU_COMMON is not set
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEDS_TRIGGER_ONESHOT is not set
-CONFIG_LEDS_TRIGGER_DISK=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-# CONFIG_LEDS_TRIGGER_CPU is not set
-# CONFIG_LEDS_TRIGGER_ACTIVITY is not set
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
-# CONFIG_LEDS_TRIGGER_CAMERA is not set
-# CONFIG_LEDS_TRIGGER_PANIC is not set
-# CONFIG_LEDS_TRIGGER_NETDEV is not set
-# CONFIG_LEDS_TRIGGER_PATTERN is not set
-# CONFIG_LEDS_TRIGGER_AUDIO is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_INFINIBAND is not set
-CONFIG_RTC_LIB=y
-CONFIG_RTC_MC146818_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_NVMEM=y
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-# CONFIG_RTC_DRV_TEST is not set
-
-#
-# I2C RTC drivers
-#
-# CONFIG_RTC_DRV_ABB5ZES3 is not set
-# CONFIG_RTC_DRV_ABEOZ9 is not set
-# CONFIG_RTC_DRV_ABX80X is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_ISL12022 is not set
-# CONFIG_RTC_DRV_ISL12026 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_PCF8523 is not set
-# CONFIG_RTC_DRV_PCF85063 is not set
-# CONFIG_RTC_DRV_PCF85363 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_BQ32K is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_RX8010 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_EM3027 is not set
-# CONFIG_RTC_DRV_RV3028 is not set
-# CONFIG_RTC_DRV_RV8803 is not set
-# CONFIG_RTC_DRV_SD3078 is not set
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_I2C_AND_SPI=m
-
-#
-# SPI and I2C RTC drivers
-#
-# CONFIG_RTC_DRV_DS3232 is not set
-# CONFIG_RTC_DRV_PCF2127 is not set
-# CONFIG_RTC_DRV_RV3029C2 is not set
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1685_FAMILY is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS2404 is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_MSM6242 is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-# CONFIG_RTC_DRV_RP5C01 is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_ZYNQMP is not set
-
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_CADENCE is not set
-# CONFIG_RTC_DRV_FTRTC010 is not set
-# CONFIG_RTC_DRV_JZ4740 is not set
-# CONFIG_RTC_DRV_SNVS is not set
-# CONFIG_RTC_DRV_R7301 is not set
-
-#
-# HID Sensor RTC drivers
-#
-# CONFIG_DMADEVICES is not set
-
-#
-# DMABUF options
-#
-CONFIG_SYNC_FILE=y
-# CONFIG_UDMABUF is not set
-# CONFIG_DMABUF_SELFTESTS is not set
-# end of DMABUF options
-
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
-# CONFIG_VIRT_DRIVERS is not set
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_PCI_LEGACY=y
-# CONFIG_VIRTIO_BALLOON is not set
-CONFIG_VIRTIO_INPUT=y
-# CONFIG_VIRTIO_MMIO is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-# end of Microsoft Hyper-V guest support
-
-# CONFIG_GREYBUS is not set
-# CONFIG_STAGING is not set
-CONFIG_MIPS_PLATFORM_DEVICES=y
-# CONFIG_GOLDFISH is not set
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-
-#
-# Common Clock Framework
-#
-# CONFIG_CLK_HSDK is not set
-# CONFIG_COMMON_CLK_MAX9485 is not set
-# CONFIG_COMMON_CLK_SI5341 is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-# CONFIG_COMMON_CLK_SI514 is not set
-# CONFIG_COMMON_CLK_SI544 is not set
-# CONFIG_COMMON_CLK_SI570 is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CDCE925 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_VC5 is not set
-# CONFIG_COMMON_CLK_FIXED_MMIO is not set
-# CONFIG_COMMON_CLK_BOSTON is not set
-
-#
-# Ingenic SoCs drivers
-#
-# CONFIG_INGENIC_CGU_JZ4740 is not set
-# CONFIG_INGENIC_CGU_JZ4725B is not set
-# CONFIG_INGENIC_CGU_JZ4770 is not set
-# CONFIG_INGENIC_CGU_JZ4780 is not set
-# CONFIG_INGENIC_TCU_CLK is not set
-# end of Ingenic SoCs drivers
-# end of Common Clock Framework
-
-# CONFIG_HWSPINLOCK is not set
-
-#
-# Clock Source drivers
-#
-CONFIG_TIMER_OF=y
-CONFIG_TIMER_PROBE=y
-CONFIG_CLKSRC_I8253=y
-CONFIG_CLKEVT_I8253=y
-CONFIG_I8253_LOCK=y
-CONFIG_CLKBLD_I8253=y
-CONFIG_CLKSRC_MIPS_GIC=y
-# CONFIG_INGENIC_TIMER is not set
-# end of Clock Source drivers
-
-# CONFIG_MAILBOX is not set
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-# end of Generic IOMMU Pagetable Support
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-# CONFIG_RPMSG_VIRTIO is not set
-# end of Rpmsg drivers
-
-# CONFIG_SOUNDWIRE is not set
-
-#
-# SOC (System On Chip) specific Drivers
-#
-
-#
-# Amlogic SoC drivers
-#
-# end of Amlogic SoC drivers
-
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-# end of i.MX SoC drivers
-
-#
-# Qualcomm SoC drivers
-#
-# end of Qualcomm SoC drivers
-
-# CONFIG_SOC_TI is not set
-
-#
-# Xilinx SoC drivers
-#
-# CONFIG_XILINX_VCU is not set
-# end of Xilinx SoC drivers
-# end of SOC (System On Chip) specific Drivers
-
-# CONFIG_PM_DEVFREQ is not set
-# CONFIG_EXTCON is not set
-# CONFIG_MEMORY is not set
-# CONFIG_IIO is not set
-# CONFIG_NTB is not set
-# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
-
-#
-# IRQ chip support
-#
-CONFIG_IRQCHIP=y
-# CONFIG_AL_FIC is not set
-CONFIG_I8259=y
-CONFIG_IRQ_MIPS_CPU=y
-CONFIG_MIPS_GIC=y
-# CONFIG_INGENIC_TCU_IRQ is not set
-# end of IRQ chip support
-
-# CONFIG_IPACK_BUS is not set
-# CONFIG_RESET_CONTROLLER is not set
-
-#
-# PHY Subsystem
-#
-# CONFIG_GENERIC_PHY is not set
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_CADENCE_DP is not set
-# CONFIG_PHY_CADENCE_DPHY is not set
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_OCELOT_SERDES is not set
-# end of PHY Subsystem
-
-# CONFIG_POWERCAP is not set
-# CONFIG_MCB is not set
-# CONFIG_RAS is not set
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-# end of Android
-
-# CONFIG_LIBNVDIMM is not set
-# CONFIG_DAX is not set
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SYSFS=y
-
-#
-# HW tracing support
-#
-# CONFIG_STM is not set
-# CONFIG_INTEL_TH is not set
-# end of HW tracing support
-
-# CONFIG_FPGA is not set
-# CONFIG_FSI is not set
-# CONFIG_SIOX is not set
-# CONFIG_SLIMBUS is not set
-# CONFIG_INTERCONNECT is not set
-# CONFIG_COUNTER is not set
-# end of Device Drivers
-
-#
-# File systems
-#
-# CONFIG_VALIDATE_FS_PARSER is not set
-CONFIG_FS_IOMAP=y
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-# CONFIG_EXT3_FS_SECURITY is not set
-CONFIG_EXT4_FS=y
-# CONFIG_EXT4_FS_POSIX_ACL is not set
-# CONFIG_EXT4_FS_SECURITY is not set
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=y
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-CONFIG_XFS_FS=y
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
-# CONFIG_XFS_ONLINE_SCRUB is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_NILFS2_FS is not set
-# CONFIG_F2FS_FS is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-# CONFIG_EXPORTFS_BLOCK_OPS is not set
-CONFIG_FILE_LOCKING=y
-CONFIG_MANDATORY_FILE_LOCKING=y
-# CONFIG_FS_ENCRYPTION is not set
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
-CONFIG_QUOTA=y
-# CONFIG_QUOTA_NETLINK_INTERFACE is not set
-CONFIG_PRINT_QUOTA_WARNING=y
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=y
-# CONFIG_QFMT_V1 is not set
-CONFIG_QFMT_V2=y
-CONFIG_QUOTACTL=y
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_FUSE_FS is not set
-# CONFIG_OVERLAY_FS is not set
-
-#
-# Caches
-#
-# CONFIG_FSCACHE is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_FAT_DEFAULT_UTF8 is not set
-# CONFIG_NTFS_FS is not set
-# end of DOS/FAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PROC_CHILDREN is not set
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-# CONFIG_TMPFS_XATTR is not set
-# CONFIG_HUGETLBFS is not set
-CONFIG_MEMFD_CREATE=y
-# CONFIG_CONFIGFS_FS is not set
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ORANGEFS_FS is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_ECRYPT_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_SQUASHFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_PSTORE is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-# CONFIG_EROFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V2=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_SWAP is not set
-CONFIG_ROOT_NFS=y
-# CONFIG_NFSD is not set
-CONFIG_GRACE_PERIOD=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-# CONFIG_SUNRPC_DEBUG is not set
-# CONFIG_CEPH_FS is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-CONFIG_CIFS_WEAK_PW_HASH=y
-# CONFIG_CIFS_UPCALL is not set
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_DEBUG=y
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=m
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=m
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_MAC_ROMAN is not set
-# CONFIG_NLS_MAC_CELTIC is not set
-# CONFIG_NLS_MAC_CENTEURO is not set
-# CONFIG_NLS_MAC_CROATIAN is not set
-# CONFIG_NLS_MAC_CYRILLIC is not set
-# CONFIG_NLS_MAC_GAELIC is not set
-# CONFIG_NLS_MAC_GREEK is not set
-# CONFIG_NLS_MAC_ICELAND is not set
-# CONFIG_NLS_MAC_INUIT is not set
-# CONFIG_NLS_MAC_ROMANIAN is not set
-# CONFIG_NLS_MAC_TURKISH is not set
-# CONFIG_NLS_UTF8 is not set
-# CONFIG_UNICODE is not set
-# end of File systems
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_KEYS_REQUEST_CACHE is not set
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-# CONFIG_ENCRYPTED_KEYS is not set
-# CONFIG_KEY_DH_OPERATIONS is not set
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-# CONFIG_SECURITY is not set
-# CONFIG_SECURITYFS is not set
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-# CONFIG_HARDENED_USERCOPY is not set
-# CONFIG_STATIC_USERMODEHELPER is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=m
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-# CONFIG_CRYPTO_USER is not set
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_NULL2=y
-# CONFIG_CRYPTO_PCRYPT is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-CONFIG_CRYPTO_AUTHENC=m
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Public-key cryptography
-#
-# CONFIG_CRYPTO_RSA is not set
-# CONFIG_CRYPTO_DH is not set
-# CONFIG_CRYPTO_ECDH is not set
-# CONFIG_CRYPTO_ECRDSA is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
-# CONFIG_CRYPTO_AEGIS128 is not set
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=m
-# CONFIG_CRYPTO_CFB is not set
-CONFIG_CRYPTO_CTR=m
-# CONFIG_CRYPTO_CTS is not set
-CONFIG_CRYPTO_ECB=m
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_OFB is not set
-CONFIG_CRYPTO_PCBC=m
-# CONFIG_CRYPTO_XTS is not set
-# CONFIG_CRYPTO_KEYWRAP is not set
-# CONFIG_CRYPTO_ADIANTUM is not set
-# CONFIG_CRYPTO_ESSIV is not set
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_VMAC is not set
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_CRC32 is not set
-# CONFIG_CRYPTO_XXHASH is not set
-# CONFIG_CRYPTO_CRCT10DIF is not set
-CONFIG_CRYPTO_GHASH=m
-# CONFIG_CRYPTO_POLY1305 is not set
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_LIB_SHA256=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-# CONFIG_CRYPTO_SHA3 is not set
-# CONFIG_CRYPTO_SM3 is not set
-# CONFIG_CRYPTO_STREEBOG is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-# CONFIG_CRYPTO_CAMELLIA is not set
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_FCRYPT is not set
-CONFIG_CRYPTO_KHAZAD=m
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_CHACHA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-CONFIG_CRYPTO_SERPENT=m
-# CONFIG_CRYPTO_SM4 is not set
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=m
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_842 is not set
-# CONFIG_CRYPTO_LZ4 is not set
-# CONFIG_CRYPTO_LZ4HC is not set
-# CONFIG_CRYPTO_ZSTD is not set
-
-#
-# Random Number Generation
-#
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_DRBG_MENU=m
-CONFIG_CRYPTO_DRBG_HMAC=y
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-CONFIG_CRYPTO_DRBG=m
-CONFIG_CRYPTO_JITTERENTROPY=m
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-# CONFIG_CRYPTO_USER_API_RNG is not set
-# CONFIG_CRYPTO_USER_API_AEAD is not set
-# CONFIG_CRYPTO_HW is not set
-# CONFIG_ASYMMETRIC_KEY_TYPE is not set
-
-#
-# Certificates for signature checking
-#
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-# end of Certificates for signature checking
-
-#
-# Library routines
-#
-# CONFIG_PACKING is not set
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_NET_UTILS=y
-# CONFIG_CORDIC is not set
-CONFIG_RATIONAL=y
-CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-# CONFIG_CRC_CCITT is not set
-CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
-# CONFIG_CRC_ITU_T is not set
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-# CONFIG_CRC64 is not set
-# CONFIG_CRC4 is not set
-# CONFIG_CRC7 is not set
-CONFIG_LIBCRC32C=y
-# CONFIG_CRC8 is not set
-CONFIG_AUDIT_GENERIC=y
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_ZLIB_INFLATE=m
-CONFIG_ZLIB_DEFLATE=m
-# CONFIG_XZ_DEC is not set
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARCH_HAS_DMA_COHERENCE_H=y
-CONFIG_ARCH_HAS_DMA_WRITE_COMBINE=y
-CONFIG_DMA_DECLARE_COHERENT=y
-CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
-CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
-CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
-CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y
-CONFIG_DMA_NONCOHERENT_CACHE_SYNC=y
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-# CONFIG_IRQ_POLL is not set
-CONFIG_LIBFDT=y
-CONFIG_HAVE_GENERIC_VDSO=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FONT_8x16=y
-CONFIG_FONT_AUTOSELECT=y
-CONFIG_SG_POOL=y
-CONFIG_SBITMAP=y
-# CONFIG_STRING_SELFTEST is not set
-# end of Library routines
-
-CONFIG_GENERIC_LIB_ASHLDI3=y
-CONFIG_GENERIC_LIB_ASHRDI3=y
-CONFIG_GENERIC_LIB_LSHRDI3=y
-CONFIG_GENERIC_LIB_CMPDI2=y
-CONFIG_GENERIC_LIB_UCMPDI2=y
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-# CONFIG_PRINTK_TIME is not set
-# CONFIG_PRINTK_CALLER is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=4
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# end of printk and dmesg options
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=1024
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_INSTALL is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# end of Compile-time checks and compiler options
-
-# CONFIG_MAGIC_SYSRQ is not set
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_OWNER is not set
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SLAB is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_CC_HAS_KASAN_GENERIC=y
-CONFIG_KASAN_STACK=1
-# end of Memory Debugging
-
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Lockups and Hangs
-#
-# CONFIG_SOFTLOCKUP_DETECTOR is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_WQ_WATCHDOG is not set
-# end of Debug Lockups and Hangs
-
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-# end of Lock Debugging (spinlocks, mutexes, etc...)
-
-# CONFIG_STACKTRACE is not set
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# end of RCU Debugging
-
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_FTRACE is not set
-CONFIG_RUNTIME_TESTING_MENU=y
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_TEST_SORT is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_REED_SOLOMON_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_PERCPU_TEST is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-# CONFIG_TEST_HEXDUMP is not set
-# CONFIG_TEST_STRING_HELPERS is not set
-# CONFIG_TEST_STRSCPY is not set
-# CONFIG_TEST_KSTRTOX is not set
-# CONFIG_TEST_PRINTF is not set
-# CONFIG_TEST_BITMAP is not set
-# CONFIG_TEST_BITFIELD is not set
-# CONFIG_TEST_UUID is not set
-# CONFIG_TEST_XARRAY is not set
-# CONFIG_TEST_OVERFLOW is not set
-# CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_HASH is not set
-# CONFIG_TEST_IDA is not set
-# CONFIG_TEST_LKM is not set
-# CONFIG_TEST_VMALLOC is not set
-# CONFIG_TEST_USER_COPY is not set
-# CONFIG_TEST_BPF is not set
-# CONFIG_TEST_BLACKHOLE_DEV is not set
-# CONFIG_FIND_BIT_BENCHMARK is not set
-# CONFIG_TEST_FIRMWARE is not set
-# CONFIG_TEST_SYSCTL is not set
-# CONFIG_TEST_UDELAY is not set
-# CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_TEST_KMOD is not set
-# CONFIG_TEST_MEMCAT_P is not set
-# CONFIG_TEST_STACKINIT is not set
-# CONFIG_TEST_MEMINIT is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_CMDLINE_BOOL is not set
-# CONFIG_DEBUG_ZBOOT is not set
-# CONFIG_MIPS_CPS_NS16550_BOOL is not set
-# end of Kernel hacking
diff --git a/main/linux-lts/config-lts.ppc64le b/main/linux-lts/config-lts.ppc64le
deleted file mode 100644
index a1c7d2c5da8..00000000000
--- a/main/linux-lts/config-lts.ppc64le
+++ /dev/null
@@ -1,4583 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.23 Kernel Configuration
-#
-
-#
-# Compiler: gcc (Alpine 9.2.0) 9.2.0
-#
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-CONFIG_THREAD_INFO_IN_TASK=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-# CONFIG_HEADER_TEST is not set
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_BUILD_SALT=""
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_XZ is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-# CONFIG_USELIB is not set
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
-# end of IRQ subsystem
-
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_ARCH_HAS_TICK_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-# end of Timers subsystem
-
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_VIRT_CPU_ACCOUNTING=y
-# CONFIG_TICK_CPU_ACCOUNTING is not set
-CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_PSI=y
-CONFIG_PSI_DEFAULT_DISABLED=y
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-# CONFIG_IKHEADERS is not set
-CONFIG_LOG_BUF_SHIFT=17
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-
-#
-# Scheduler features
-#
-# CONFIG_UCLAMP_TASK is not set
-# end of Scheduler features
-
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_NUMA_BALANCING=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_CGROUPS=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_SWAP_ENABLED=y
-CONFIG_MEMCG_KMEM=y
-# CONFIG_BLK_CGROUP is not set
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-# CONFIG_CFS_BANDWIDTH is not set
-# CONFIG_RT_GROUP_SCHED is not set
-# CONFIG_CGROUP_PIDS is not set
-# CONFIG_CGROUP_RDMA is not set
-CONFIG_CGROUP_FREEZER=y
-# CONFIG_CGROUP_HUGETLB is not set
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-# CONFIG_CHECKPOINT_RESTORE is not set
-# CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
-CONFIG_SYSCTL=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-CONFIG_BPF=y
-# CONFIG_EXPERT is not set
-CONFIG_MULTIUSER=y
-CONFIG_SGETMASK_SYSCALL=y
-CONFIG_SYSFS_SYSCALL=y
-CONFIG_FHANDLE=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_SYSCALL=y
-# CONFIG_USERFAULTFD is not set
-CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=y
-CONFIG_RSEQ=y
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_SLAB_FREELIST_RANDOM=y
-# CONFIG_SLAB_FREELIST_HARDENED is not set
-# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-# end of General setup
-
-CONFIG_PPC64=y
-
-#
-# Processor support
-#
-CONFIG_PPC_BOOK3S_64=y
-# CONFIG_PPC_BOOK3E_64 is not set
-# CONFIG_GENERIC_CPU is not set
-# CONFIG_POWER7_CPU is not set
-CONFIG_POWER8_CPU=y
-# CONFIG_POWER9_CPU is not set
-CONFIG_TARGET_CPU_BOOL=y
-CONFIG_TARGET_CPU="power8"
-CONFIG_PPC_BOOK3S=y
-CONFIG_PPC_FPU=y
-CONFIG_ALTIVEC=y
-CONFIG_VSX=y
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_PPC_RADIX_MMU=y
-CONFIG_PPC_RADIX_MMU_DEFAULT=y
-CONFIG_PPC_HAVE_KUEP=y
-CONFIG_PPC_KUEP=y
-CONFIG_PPC_HAVE_KUAP=y
-CONFIG_PPC_KUAP=y
-# CONFIG_PPC_KUAP_DEBUG is not set
-CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
-CONFIG_PPC_MM_SLICES=y
-CONFIG_PPC_HAVE_PMU_SUPPORT=y
-CONFIG_PPC_PERF_CTRS=y
-CONFIG_FORCE_SMP=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=2048
-CONFIG_PPC_DOORBELL=y
-# end of Processor support
-
-# CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_PPC64_BOOT_WRAPPER=y
-CONFIG_64BIT=y
-CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MAX=29
-CONFIG_ARCH_MMAP_RND_BITS_MIN=14
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=13
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=7
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NR_IRQS=512
-CONFIG_NMI_IPI=y
-CONFIG_PPC_WATCHDOG=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_PPC=y
-CONFIG_PPC_BARRIER_NOSPEC=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_PANIC_TIMEOUT=180
-CONFIG_COMPAT=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_PPC_UDBG_16550=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_GENERIC_BUG=y
-CONFIG_EPAPR_BOOT=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_NONZERO_CPU=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_PPC_DAWR=y
-CONFIG_PGTABLE_LEVELS=4
-CONFIG_PPC_MSI_BITMAP=y
-CONFIG_PPC_XICS=y
-CONFIG_PPC_ICP_NATIVE=y
-CONFIG_PPC_ICP_HV=y
-CONFIG_PPC_ICS_RTAS=y
-CONFIG_PPC_XIVE=y
-CONFIG_PPC_XIVE_NATIVE=y
-CONFIG_PPC_XIVE_SPAPR=y
-
-#
-# Platform support
-#
-CONFIG_PPC_POWERNV=y
-CONFIG_OPAL_PRD=y
-# CONFIG_PPC_MEMTRACE is not set
-CONFIG_PPC_VAS=y
-# CONFIG_SCOM_DEBUGFS is not set
-CONFIG_PPC_PSERIES=y
-# CONFIG_PPC_SPLPAR is not set
-CONFIG_PSERIES_ENERGY=y
-# CONFIG_SCANLOG is not set
-CONFIG_IO_EVENT_IRQ=y
-# CONFIG_LPARCFG is not set
-# CONFIG_PPC_SMLPAR is not set
-CONFIG_HV_PERF_CTRS=y
-CONFIG_IBMVIO=y
-# CONFIG_PPC_SVM is not set
-# CONFIG_KVM_GUEST is not set
-# CONFIG_EPAPR_PARAVIRT is not set
-CONFIG_PPC_NATIVE=y
-CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
-CONFIG_PPC_DT_CPU_FTRS=y
-# CONFIG_UDBG_RTAS_CONSOLE is not set
-CONFIG_PPC_SMP_MUXED_IPI=y
-CONFIG_MPIC=y
-# CONFIG_MPIC_MSGR is not set
-CONFIG_PPC_I8259=y
-CONFIG_PPC_RTAS=y
-CONFIG_RTAS_ERROR_LOGGING=y
-CONFIG_PPC_RTAS_DAEMON=y
-CONFIG_RTAS_PROC=y
-CONFIG_RTAS_FLASH=m
-CONFIG_EEH=y
-CONFIG_PPC_P7_NAP=y
-CONFIG_PPC_INDIRECT_PIO=y
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-# CONFIG_CPU_FREQ_STAT is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-
-#
-# CPU frequency scaling drivers
-#
-CONFIG_POWERNV_CPUFREQ=y
-# end of CPU Frequency scaling
-
-#
-# CPUIdle driver
-#
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_GOV_LADDER is not set
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
-
-#
-# POWERPC CPU Idle Drivers
-#
-CONFIG_PSERIES_CPUIDLE=y
-CONFIG_POWERNV_CPUIDLE=y
-# end of POWERPC CPU Idle Drivers
-# end of CPU Idle
-# end of CPUIdle driver
-
-# CONFIG_GEN_RTC is not set
-# CONFIG_SIMPLE_GPIO is not set
-# end of Platform support
-
-#
-# Kernel options
-#
-CONFIG_HZ_100=y
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=100
-CONFIG_SCHED_HRTICK=y
-CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
-CONFIG_PPC_TRANSACTIONAL_MEM=y
-CONFIG_HOTPLUG_CPU=y
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_KEXEC=y
-# CONFIG_RELOCATABLE is not set
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_FA_DUMP is not set
-# CONFIG_PRESERVE_FA_DUMP is not set
-# CONFIG_OPAL_CORE is not set
-CONFIG_IRQ_ALL_CPUS=y
-CONFIG_NUMA=y
-CONFIG_NODES_SHIFT=8
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-CONFIG_HAVE_MEMORYLESS_NODES=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_SYS_SUPPORTS_HUGETLBFS=y
-CONFIG_ILLEGAL_POINTER_VALUE=0x5deadbeef0000000
-CONFIG_ARCH_MEMORY_PROBE=y
-CONFIG_NODES_SPAN_OTHER_NODES=y
-# CONFIG_PPC_4K_PAGES is not set
-CONFIG_PPC_64K_PAGES=y
-CONFIG_PPC_PAGE_SHIFT=16
-CONFIG_THREAD_SHIFT=14
-CONFIG_ETEXT_SHIFT=16
-CONFIG_DATA_SHIFT=16
-CONFIG_FORCE_MAX_ZONEORDER=9
-CONFIG_PPC_SUBPAGE_PROT=y
-CONFIG_PPC_COPRO_BASE=y
-CONFIG_SCHED_SMT=y
-CONFIG_PPC_DENORMALISATION=y
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_CMDLINE=""
-CONFIG_EXTRA_TARGETS=""
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_HIBERNATION is not set
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP_SMP_NONZERO_CPU=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-# CONFIG_ENERGY_MODEL is not set
-CONFIG_SECCOMP=y
-CONFIG_PPC_MEM_KEYS=y
-# end of Kernel options
-
-CONFIG_ISA_DMA_API=y
-
-#
-# Bus options
-#
-CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_FSL_LBC is not set
-# end of Bus options
-
-CONFIG_PAGE_OFFSET=0xc000000000000000
-CONFIG_KERNEL_START=0xc000000000000000
-CONFIG_PHYSICAL_START=0x00000000
-CONFIG_ARCH_RANDOM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_VFIO=y
-CONFIG_KVM_COMPAT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_VCPU_ASYNC_IOCTL=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
-CONFIG_KVM_BOOK3S_HANDLER=y
-CONFIG_KVM_BOOK3S_64_HANDLER=y
-CONFIG_KVM_BOOK3S_HV_POSSIBLE=y
-CONFIG_KVM_BOOK3S_64=m
-CONFIG_KVM_BOOK3S_64_HV=m
-# CONFIG_KVM_BOOK3S_64_PR is not set
-# CONFIG_KVM_BOOK3S_HV_EXIT_TIMING is not set
-CONFIG_KVM_XICS=y
-CONFIG_KVM_XIVE=y
-CONFIG_VHOST_NET=m
-CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-
-#
-# General architecture-dependent options
-#
-CONFIG_CRASH_CORE=y
-CONFIG_KEXEC_CORE=y
-CONFIG_OPROFILE=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_OPTPROBES=y
-CONFIG_UPROBES=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_KRETPROBES=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_KPROBES_ON_FTRACE=y
-CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_HAVE_ASM_MODVERSIONS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_NMI_WATCHDOG=y
-CONFIG_HAVE_HARDLOCKUP_DETECTOR_ARCH=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_HAVE_MMU_GATHER_PAGE_SIZE=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
-CONFIG_ARCH_HAS_SCALED_CPUTIME=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_HUGE_VMAP=y
-CONFIG_HAVE_ARCH_SOFT_DIRTY=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_ARCH_MMAP_RND_BITS=14
-CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=7
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_HAVE_RELIABLE_STACKTRACE=y
-CONFIG_HAVE_ARCH_NVRAM_OPS=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGSUSPEND=y
-CONFIG_COMPAT_OLD_SIGACTION=y
-CONFIG_64BIT_TIME=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
-CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
-# CONFIG_STRICT_KERNEL_RWX is not set
-CONFIG_ARCH_HAS_PHYS_TO_DMA=y
-# CONFIG_REFCOUNT_FULL is not set
-# CONFIG_LOCK_EVENT_COUNTS is not set
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# end of GCOV-based kernel profiling
-
-CONFIG_PLUGIN_HOSTCC=""
-CONFIG_HAVE_GCC_PLUGINS=y
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
-CONFIG_ASM_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-# CONFIG_BLK_DEV_ZONED is not set
-# CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_WBT is not set
-CONFIG_BLK_DEBUG_FS=y
-# CONFIG_BLK_SED_OPAL is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AIX_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_CMDLINE_PARTITION is not set
-# end of Partition Types
-
-CONFIG_BLOCK_COMPAT=y
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_MQ_RDMA=y
-CONFIG_BLK_PM=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-# CONFIG_IOSCHED_BFQ is not set
-# end of IO Schedulers
-
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=m
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_HAS_MMIOWB=y
-CONFIG_MMIOWB=y
-CONFIG_FREEZER=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_ELFCORE=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_FAST_GUP=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_MEMORY_ISOLATION=y
-CONFIG_HAVE_BOOTMEM_INFO_NODE=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_ARCH_ENABLE_THP_MIGRATION=y
-CONFIG_CONTIG_ALLOC=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-# CONFIG_MEMORY_FAILURE is not set
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
-# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_AREAS=7
-# CONFIG_ZPOOL is not set
-# CONFIG_ZBUD is not set
-# CONFIG_ZSMALLOC is not set
-# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_ARCH_HAS_PTE_DEVMAP=y
-# CONFIG_ZONE_DEVICE is not set
-CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
-CONFIG_ARCH_HAS_PKEYS=y
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
-# CONFIG_READ_ONLY_THP_FOR_FS is not set
-CONFIG_ARCH_HAS_PTE_SPECIAL=y
-CONFIG_ARCH_HAS_HUGEPD=y
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_NET_INGRESS=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_DIAG is not set
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-# CONFIG_UNIX_DIAG is not set
-# CONFIG_TLS is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-CONFIG_XFRM_INTERFACE=m
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-# CONFIG_SMC is not set
-CONFIG_XDP_SOCKETS=y
-# CONFIG_XDP_SOCKETS_DIAG is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE_COMMON=y
-# CONFIG_IP_MROUTE is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_NET_IPVTI is not set
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-CONFIG_NET_FOU_IP_TUNNELS=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-# CONFIG_INET_ESP_OFFLOAD is not set
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-# CONFIG_INET_UDP_DIAG is not set
-# CONFIG_INET_RAW_DIAG is not set
-CONFIG_INET_DIAG_DESTROY=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=m
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-# CONFIG_INET6_ESP_OFFLOAD is not set
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_FOU=m
-CONFIG_IPV6_FOU_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_NETLABEL is not set
-# CONFIG_NETWORK_SECMARK is not set
-CONFIG_NET_PTP_CLASSIFY=y
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_FAMILY_BRIDGE=y
-CONFIG_NETFILTER_FAMILY_ARP=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK_OSF=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-# CONFIG_NF_LOG_NETDEV is not set
-CONFIG_NETFILTER_CONNCOUNT=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_PROCFS=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=y
-CONFIG_NF_NAT_MASQUERADE=y
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_SET=m
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_NUMGEN=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_FLOW_OFFLOAD=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CONNLIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_TUNNEL=m
-# CONFIG_NFT_OBJREF is not set
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_FIB=m
-CONFIG_NFT_FIB_INET=m
-# CONFIG_NFT_XFRM is not set
-CONFIG_NFT_SOCKET=m
-CONFIG_NFT_OSF=m
-CONFIG_NFT_TPROXY=m
-# CONFIG_NFT_SYNPROXY is not set
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_FIB_NETDEV=m
-CONFIG_NF_FLOW_TABLE_INET=m
-CONFIG_NF_FLOW_TABLE=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-# end of Core Netfilter Configuration
-
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_MH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS MH scheduler
-#
-CONFIG_IP_VS_MH_TAB_INDEX=12
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_SOCKET_IPV4=m
-CONFIG_NF_TPROXY_IPV4=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_FLOW_TABLE_IPV4=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-# CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# end of IP: Netfilter Configuration
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_SOCKET_IPV6=m
-CONFIG_NF_TPROXY_IPV6=m
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_FIB_IPV6=m
-CONFIG_NF_FLOW_TABLE_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_SRH=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-# CONFIG_IP6_NF_SECURITY is not set
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-# end of IPv6: Netfilter Configuration
-
-CONFIG_NF_DEFRAG_IPV6=m
-# CONFIG_NF_TABLES_BRIDGE is not set
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
-# CONFIG_BPFILTER is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_L2TP is not set
-CONFIG_STP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_BRIDGE_VLAN_FILTERING is not set
-CONFIG_HAVE_NET_DSA=y
-# CONFIG_NET_DSA is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-# CONFIG_VLAN_8021Q_MVRP is not set
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-# CONFIG_LLC2 is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_PHONET is not set
-# CONFIG_6LOWPAN is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_NET_SCHED is not set
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-# CONFIG_BATMAN_ADV is not set
-# CONFIG_OPENVSWITCH is not set
-# CONFIG_VSOCKETS is not set
-# CONFIG_NETLINK_DIAG is not set
-# CONFIG_MPLS is not set
-# CONFIG_NET_NSH is not set
-# CONFIG_HSR is not set
-# CONFIG_NET_SWITCHDEV is not set
-CONFIG_NET_L3_MASTER_DEV=y
-CONFIG_NET_NCSI=y
-# CONFIG_NCSI_OEM_CMD_GET_MAC is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-# CONFIG_CGROUP_NET_PRIO is not set
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-# CONFIG_BPF_JIT is not set
-# CONFIG_BPF_STREAM_PARSER is not set
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_DROP_MONITOR is not set
-# end of Network testing
-# end of Networking options
-
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AF_KCM is not set
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-# CONFIG_CFG80211 is not set
-
-#
-# CFG80211 needs to be enabled for MAC80211
-#
-CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-CONFIG_NET_9P_RDMA=m
-# CONFIG_NET_9P_DEBUG is not set
-# CONFIG_CAIF is not set
-# CONFIG_CEPH_LIB is not set
-# CONFIG_NFC is not set
-# CONFIG_PSAMPLE is not set
-# CONFIG_NET_IFE is not set
-CONFIG_LWTUNNEL=y
-CONFIG_LWTUNNEL_BPF=y
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-CONFIG_NET_DEVLINK=y
-CONFIG_FAILOVER=m
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-CONFIG_HAVE_PCI=y
-CONFIG_FORCE_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_SYSCALL=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCIEAER=y
-# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-# CONFIG_PCIE_DPC is not set
-CONFIG_PCIE_PTM=y
-# CONFIG_PCIE_BW is not set
-CONFIG_PCI_MSI=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-CONFIG_PCI_STUB=m
-CONFIG_PCI_PF_STUB=m
-CONFIG_PCI_ATS=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_SHPC=y
-CONFIG_HOTPLUG_PCI_POWERNV=y
-CONFIG_HOTPLUG_PCI_RPA=m
-CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
-
-#
-# PCI controller drivers
-#
-
-#
-# Cadence PCIe controllers support
-#
-CONFIG_PCIE_CADENCE=y
-CONFIG_PCIE_CADENCE_HOST=y
-# end of Cadence PCIe controllers support
-
-# CONFIG_PCI_FTPCI100 is not set
-# CONFIG_PCI_HOST_GENERIC is not set
-# CONFIG_PCIE_XILINX is not set
-
-#
-# DesignWare PCI Core Support
-#
-# end of DesignWare PCI Core Support
-# end of PCI controller drivers
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-# end of PCI Endpoint
-
-#
-# PCI switch controller drivers
-#
-CONFIG_PCI_SW_SWITCHTEC=m
-# end of PCI switch controller drivers
-
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
-# CONFIG_RAPIDIO is not set
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=y
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
-# end of Firmware loader
-
-CONFIG_ALLOW_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-# CONFIG_SIMPLE_PM_BUS is not set
-# end of Bus devices
-
-# CONFIG_CONNECTOR is not set
-# CONFIG_GNSS is not set
-CONFIG_MTD=y
-# CONFIG_MTD_TESTS is not set
-
-#
-# Partition parsers
-#
-# CONFIG_MTD_AR7_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_OF_PARTS=y
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# end of Partition parsers
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-# CONFIG_SM_FTL is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_SWAP is not set
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-# end of RAM/ROM/Flash chip drivers
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_PLATRAM is not set
-# end of Mapping drivers for chip access
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_POWERNV_FLASH=y
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOCG3 is not set
-# end of Self-contained MTD device drivers
-
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_RAW_NAND is not set
-
-#
-# LPDDR & LPDDR2 PCM memory drivers
-#
-# CONFIG_MTD_LPDDR is not set
-# end of LPDDR & LPDDR2 PCM memory drivers
-
-# CONFIG_MTD_UBI is not set
-# CONFIG_MTD_HYPERBUS is not set
-CONFIG_DTC=y
-CONFIG_OF=y
-# CONFIG_OF_UNITTEST is not set
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_DYNAMIC=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
-CONFIG_OF_MDIO=y
-CONFIG_OF_RESERVED_MEM=y
-# CONFIG_OF_OVERLAY is not set
-CONFIG_OF_DMA_DEFAULT_COHERENT=y
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-# CONFIG_PARPORT_SERIAL is not set
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-# CONFIG_PARPORT_PC_PCMCIA is not set
-# CONFIG_PARPORT_AX88796 is not set
-# CONFIG_PARPORT_1284 is not set
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_NULL_BLK is not set
-CONFIG_BLK_DEV_FD=m
-CONFIG_CDROM=y
-# CONFIG_PARIDE is not set
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
-# CONFIG_BLK_DEV_UMEM is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_DRBD is not set
-CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_SKD is not set
-# CONFIG_BLK_DEV_SX8 is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=65536
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-CONFIG_VIRTIO_BLK=m
-# CONFIG_VIRTIO_BLK_SCSI is not set
-# CONFIG_BLK_DEV_RBD is not set
-# CONFIG_BLK_DEV_RSXX is not set
-
-#
-# NVME Support
-#
-CONFIG_NVME_CORE=m
-CONFIG_BLK_DEV_NVME=m
-CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_FABRICS=m
-CONFIG_NVME_RDMA=m
-# CONFIG_NVME_FC is not set
-# CONFIG_NVME_TCP is not set
-CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_LOOP=m
-CONFIG_NVME_TARGET_RDMA=m
-# CONFIG_NVME_TARGET_FC is not set
-# CONFIG_NVME_TARGET_TCP is not set
-# end of NVME Support
-
-#
-# Misc devices
-#
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_DUMMY_IRQ is not set
-CONFIG_IBMVMC=m
-# CONFIG_PHANTOM is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_APDS9802ALS is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISL29020 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_BH1770 is not set
-# CONFIG_SENSORS_APDS990X is not set
-# CONFIG_HMC6352 is not set
-# CONFIG_DS1682 is not set
-# CONFIG_SRAM is not set
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_XILINX_SDFEC is not set
-CONFIG_MISC_RTSX=m
-CONFIG_PVPANIC=m
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_IDT_89HPESX is not set
-# CONFIG_EEPROM_EE1004 is not set
-# end of EEPROM support
-
-# CONFIG_CB710_CORE is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# end of Texas Instruments shared transport line discipline
-
-# CONFIG_SENSORS_LIS3_I2C is not set
-# CONFIG_ALTERA_STAPL is not set
-
-#
-# Intel MIC & related support
-#
-
-#
-# Intel MIC Bus Driver
-#
-
-#
-# SCIF Bus Driver
-#
-
-#
-# VOP Bus Driver
-#
-# CONFIG_VOP_BUS is not set
-
-#
-# Intel MIC Host Driver
-#
-
-#
-# Intel MIC Card Driver
-#
-
-#
-# SCIF Driver
-#
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-
-#
-# VOP Driver
-#
-# end of Intel MIC & related support
-
-# CONFIG_GENWQE is not set
-# CONFIG_ECHO is not set
-CONFIG_CXL_BASE=y
-CONFIG_CXL_AFU_DRIVER_OPS=y
-CONFIG_CXL_LIB=y
-CONFIG_CXL=m
-CONFIG_OCXL_BASE=y
-CONFIG_OCXL=m
-# CONFIG_MISC_ALCOR_PCI is not set
-CONFIG_MISC_RTSX_PCI=m
-CONFIG_MISC_RTSX_USB=m
-# CONFIG_HABANA_AI is not set
-# end of Misc devices
-
-CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
-
-#
-# Please see Documentation/ide/ide.rst for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-# CONFIG_IDE_GD_ATA is not set
-# CONFIG_IDE_GD_ATAPI is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_DELKIN is not set
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-# CONFIG_BLK_DEV_PLATFORM is not set
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=m
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_PIIX is not set
-# CONFIG_BLK_DEV_IT8172 is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_PDC202XX_OLD is not set
-# CONFIG_BLK_DEV_PDC202XX_NEW is not set
-# CONFIG_BLK_DEV_SVWKS is not set
-# CONFIG_BLK_DEV_SIIMAGE is not set
-# CONFIG_BLK_DEV_SL82C105 is not set
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-# CONFIG_BLK_DEV_VIA82CXXX is not set
-# CONFIG_BLK_DEV_TC86C001 is not set
-CONFIG_BLK_DEV_IDEDMA=y
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=y
-# CONFIG_CHR_DEV_SCH is not set
-CONFIG_SCSI_CONSTANTS=y
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=y
-CONFIG_SCSI_FC_ATTRS=y
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-# CONFIG_SCSI_SAS_LIBSAS is not set
-CONFIG_SCSI_SRP_ATTRS=y
-# end of SCSI Transports
-
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_ISCSI_TCP is not set
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_BE2ISCSI=m
-CONFIG_CXLFLASH=m
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_HPSA is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_ACARD is not set
-CONFIG_SCSI_AACRAID=m
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVUMI is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_ESAS2R is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_SMARTPQI=m
-# CONFIG_SCSI_UFSHCD is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_MYRB is not set
-# CONFIG_SCSI_MYRS is not set
-# CONFIG_LIBFC is not set
-# CONFIG_SCSI_SNIC is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_FDOMAIN_PCI is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_IBMVSCSI=m
-CONFIG_SCSI_IBMVFC=m
-CONFIG_SCSI_IBMVFC_TRACE=y
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_PPA is not set
-# CONFIG_SCSI_IMM is not set
-# CONFIG_SCSI_STEX is not set
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-CONFIG_SCSI_IPR_DUMP=y
-# CONFIG_SCSI_QLOGIC_1280 is not set
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_AM53C974 is not set
-# CONFIG_SCSI_WD719X is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_PMCRAID is not set
-# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_BFA_FC is not set
-CONFIG_SCSI_VIRTIO=m
-# CONFIG_SCSI_CHELSIO_FCOE is not set
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-CONFIG_SCSI_DH=y
-CONFIG_SCSI_DH_RDAC=m
-# CONFIG_SCSI_DH_HP_SW is not set
-# CONFIG_SCSI_DH_EMC is not set
-CONFIG_SCSI_DH_ALUA=m
-# end of SCSI device support
-
-CONFIG_ATA=m
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=3
-# CONFIG_SATA_AHCI_PLATFORM is not set
-# CONFIG_AHCI_CEVA is not set
-# CONFIG_AHCI_QORIQ is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_ACARD_AHCI is not set
-# CONFIG_SATA_SIL24 is not set
-# CONFIG_ATA_SFF is not set
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_AUTODETECT=y
-CONFIG_MD_LINEAR=y
-CONFIG_MD_RAID0=y
-CONFIG_MD_RAID1=y
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-# CONFIG_BCACHE is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=y
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_UNSTRIPED=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-# CONFIG_DM_CACHE is not set
-CONFIG_DM_WRITECACHE=m
-# CONFIG_DM_ERA is not set
-# CONFIG_DM_CLONE is not set
-CONFIG_DM_MIRROR=m
-# CONFIG_DM_LOG_USERSPACE is not set
-# CONFIG_DM_RAID is not set
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-# CONFIG_DM_DELAY is not set
-# CONFIG_DM_DUST is not set
-# CONFIG_DM_INIT is not set
-CONFIG_DM_UEVENT=y
-# CONFIG_DM_FLAKEY is not set
-# CONFIG_DM_VERITY is not set
-# CONFIG_DM_SWITCH is not set
-# CONFIG_DM_LOG_WRITES is not set
-CONFIG_DM_INTEGRITY=m
-# CONFIG_TARGET_CORE is not set
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_NOSY is not set
-# end of IEEE 1394 (FireWire) support
-
-# CONFIG_MACINTOSH_DRIVERS is not set
-CONFIG_NETDEVICES=y
-CONFIG_MII=y
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-# CONFIG_EQUALIZER is not set
-# CONFIG_NET_FC is not set
-# CONFIG_NET_TEAM is not set
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=m
-# CONFIG_IPVTAP is not set
-CONFIG_VXLAN=m
-# CONFIG_GENEVE is not set
-# CONFIG_GTP is not set
-CONFIG_MACSEC=m
-CONFIG_NETCONSOLE=m
-# CONFIG_NETCONSOLE_DYNAMIC is not set
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_TUN=m
-CONFIG_TAP=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-# CONFIG_NLMON is not set
-# CONFIG_ARCNET is not set
-
-#
-# CAIF transport drivers
-#
-
-#
-# Distributed Switch Architecture drivers
-#
-# end of Distributed Switch Architecture drivers
-
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-# CONFIG_PCMCIA_3C574 is not set
-# CONFIG_PCMCIA_3C589 is not set
-CONFIG_VORTEX=y
-# CONFIG_TYPHOON is not set
-CONFIG_NET_VENDOR_ADAPTEC=y
-# CONFIG_ADAPTEC_STARFIRE is not set
-CONFIG_NET_VENDOR_AGERE=y
-# CONFIG_ET131X is not set
-CONFIG_NET_VENDOR_ALACRITECH=y
-# CONFIG_SLICOSS is not set
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-CONFIG_ACENIC_OMIT_TIGON_I=y
-# CONFIG_ALTERA_TSE is not set
-# CONFIG_NET_VENDOR_AMAZON is not set
-CONFIG_NET_VENDOR_AMD=y
-# CONFIG_AMD8111_ETH is not set
-CONFIG_PCNET32=y
-# CONFIG_PCMCIA_NMCLAN is not set
-CONFIG_NET_VENDOR_AQUANTIA=y
-CONFIG_NET_VENDOR_ARC=y
-CONFIG_NET_VENDOR_ATHEROS=y
-# CONFIG_ATL2 is not set
-# CONFIG_ATL1 is not set
-# CONFIG_ATL1E is not set
-# CONFIG_ATL1C is not set
-# CONFIG_ALX is not set
-# CONFIG_NET_VENDOR_AURORA is not set
-CONFIG_NET_VENDOR_BROADCOM=y
-# CONFIG_B44 is not set
-# CONFIG_BCMGENET is not set
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_TIGON3=m
-CONFIG_TIGON3_HWMON=y
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-# CONFIG_SYSTEMPORT is not set
-# CONFIG_BNXT is not set
-CONFIG_NET_VENDOR_BROCADE=y
-# CONFIG_BNA is not set
-CONFIG_NET_VENDOR_CADENCE=y
-# CONFIG_NET_VENDOR_CAVIUM is not set
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-# CONFIG_CHELSIO_T1_1G is not set
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-# CONFIG_CHELSIO_T4VF is not set
-CONFIG_CHELSIO_LIB=m
-CONFIG_NET_VENDOR_CISCO=y
-# CONFIG_ENIC is not set
-# CONFIG_NET_VENDOR_CORTINA is not set
-# CONFIG_DNET is not set
-CONFIG_NET_VENDOR_DEC=y
-# CONFIG_NET_TULIP is not set
-CONFIG_NET_VENDOR_DLINK=y
-# CONFIG_DL2K is not set
-# CONFIG_SUNDANCE is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET_BE2=y
-CONFIG_BE2NET_BE3=y
-CONFIG_BE2NET_LANCER=y
-CONFIG_BE2NET_SKYHAWK=y
-CONFIG_NET_VENDOR_EZCHIP=y
-# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-# CONFIG_PCMCIA_FMVJ18X is not set
-CONFIG_NET_VENDOR_GOOGLE=y
-# CONFIG_GVE is not set
-CONFIG_NET_VENDOR_HP=y
-# CONFIG_HP100 is not set
-CONFIG_NET_VENDOR_HUAWEI=y
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_NET_VENDOR_IBM=y
-CONFIG_IBMVETH=m
-CONFIG_IBMVNIC=m
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=y
-CONFIG_E1000=y
-CONFIG_E1000E=y
-# CONFIG_IGB is not set
-# CONFIG_IGBVF is not set
-CONFIG_IXGB=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
-# CONFIG_IXGBEVF is not set
-CONFIG_I40E=m
-# CONFIG_I40EVF is not set
-CONFIG_ICE=m
-# CONFIG_FM10K is not set
-# CONFIG_IGC is not set
-# CONFIG_JME is not set
-CONFIG_NET_VENDOR_MARVELL=y
-# CONFIG_MVMDIO is not set
-# CONFIG_SKGE is not set
-# CONFIG_SKY2 is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX4_CORE_GEN2=y
-# CONFIG_MLX5_CORE is not set
-# CONFIG_MLXSW_CORE is not set
-# CONFIG_MLXFW is not set
-CONFIG_NET_VENDOR_MICREL=y
-# CONFIG_KS8851_MLL is not set
-# CONFIG_KSZ884X_PCI is not set
-CONFIG_NET_VENDOR_MICROCHIP=y
-# CONFIG_LAN743X is not set
-# CONFIG_NET_VENDOR_MICROSEMI is not set
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-# CONFIG_FEALNX is not set
-CONFIG_NET_VENDOR_NATSEMI=y
-# CONFIG_NATSEMI is not set
-# CONFIG_NS83820 is not set
-CONFIG_NET_VENDOR_NETERION=y
-CONFIG_S2IO=m
-# CONFIG_VXGE is not set
-CONFIG_NET_VENDOR_NETRONOME=y
-CONFIG_NFP=m
-# CONFIG_NFP_DEBUG is not set
-# CONFIG_NET_VENDOR_NI is not set
-CONFIG_NET_VENDOR_8390=y
-# CONFIG_PCMCIA_AXNET is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_PCMCIA_PCNET is not set
-CONFIG_NET_VENDOR_NVIDIA=y
-# CONFIG_FORCEDETH is not set
-CONFIG_NET_VENDOR_OKI=y
-# CONFIG_ETHOC is not set
-CONFIG_NET_VENDOR_PACKET_ENGINES=y
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-CONFIG_NET_VENDOR_PENSANDO=y
-# CONFIG_IONIC is not set
-CONFIG_NET_VENDOR_QLOGIC=y
-# CONFIG_QLA3XXX is not set
-# CONFIG_QLCNIC is not set
-CONFIG_NETXEN_NIC=m
-# CONFIG_QED is not set
-# CONFIG_NET_VENDOR_QUALCOMM is not set
-CONFIG_NET_VENDOR_RDC=y
-# CONFIG_R6040 is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
-CONFIG_NET_VENDOR_RENESAS=y
-# CONFIG_NET_VENDOR_ROCKER is not set
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SOLARFLARE=y
-# CONFIG_SFC is not set
-# CONFIG_SFC_FALCON is not set
-CONFIG_NET_VENDOR_SILAN=y
-# CONFIG_SC92031 is not set
-CONFIG_NET_VENDOR_SIS=y
-# CONFIG_SIS900 is not set
-# CONFIG_SIS190 is not set
-CONFIG_NET_VENDOR_SMSC=y
-# CONFIG_PCMCIA_SMC91C92 is not set
-# CONFIG_EPIC100 is not set
-# CONFIG_SMSC911X is not set
-# CONFIG_SMSC9420 is not set
-# CONFIG_NET_VENDOR_SOCIONEXT is not set
-CONFIG_NET_VENDOR_STMICRO=y
-# CONFIG_STMMAC_ETH is not set
-CONFIG_NET_VENDOR_SUN=y
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
-# CONFIG_NIU is not set
-CONFIG_NET_VENDOR_SYNOPSYS=y
-# CONFIG_DWC_XLGMAC is not set
-CONFIG_NET_VENDOR_TEHUTI=y
-# CONFIG_TEHUTI is not set
-CONFIG_NET_VENDOR_TI=y
-# CONFIG_TI_CPSW_PHY_SEL is not set
-# CONFIG_TLAN is not set
-CONFIG_NET_VENDOR_VIA=y
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_VELOCITY is not set
-CONFIG_NET_VENDOR_WIZNET=y
-# CONFIG_WIZNET_W5100 is not set
-# CONFIG_WIZNET_W5300 is not set
-# CONFIG_NET_VENDOR_XILINX is not set
-CONFIG_NET_VENDOR_XIRCOM=y
-# CONFIG_PCMCIA_XIRC2PS is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_BUS=y
-# CONFIG_MDIO_BCM_UNIMAC is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
-# CONFIG_MDIO_HISI_FEMAC is not set
-# CONFIG_MDIO_MSCC_MIIM is not set
-# CONFIG_MDIO_OCTEON is not set
-# CONFIG_MDIO_THUNDER is not set
-CONFIG_PHYLIB=y
-CONFIG_SWPHY=y
-
-#
-# MII PHY device drivers
-#
-# CONFIG_ADIN_PHY is not set
-# CONFIG_AMD_PHY is not set
-# CONFIG_AQUANTIA_PHY is not set
-# CONFIG_AX88796B_PHY is not set
-# CONFIG_AT803X_PHY is not set
-# CONFIG_BCM7XXX_PHY is not set
-# CONFIG_BCM87XX_PHY is not set
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CORTINA_PHY is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DP83822_PHY is not set
-# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DP83848_PHY is not set
-# CONFIG_DP83867_PHY is not set
-CONFIG_FIXED_PHY=y
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_INTEL_XWAY_PHY is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MARVELL_10G_PHY is not set
-# CONFIG_MICREL_PHY is not set
-# CONFIG_MICROCHIP_PHY is not set
-# CONFIG_MICROCHIP_T1_PHY is not set
-# CONFIG_MICROSEMI_PHY is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NXP_TJA11XX_PHY is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_REALTEK_PHY is not set
-CONFIG_RENESAS_PHY=m
-# CONFIG_ROCKCHIP_PHY is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_STE10XP is not set
-# CONFIG_TERANETICS_PHY is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_XILINX_GMII2RGMII is not set
-# CONFIG_PLIP is not set
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-# CONFIG_PPP_FILTER is not set
-# CONFIG_PPP_MPPE is not set
-# CONFIG_PPP_MULTILINK is not set
-CONFIG_PPPOE=m
-# CONFIG_PPTP is not set
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-# CONFIG_SLIP is not set
-CONFIG_SLHC=m
-
-#
-# Host-side USB support is needed for USB Network Adapter support
-#
-CONFIG_USB_NET_DRIVERS=m
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_RTL8152 is not set
-# CONFIG_USB_LAN78XX is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_IPHETH is not set
-# CONFIG_WLAN is not set
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
-# CONFIG_WAN is not set
-# CONFIG_NETDEVSIM is not set
-CONFIG_NET_FAILOVER=m
-# CONFIG_ISDN is not set
-# CONFIG_NVM is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_LEDS=m
-CONFIG_INPUT_FF_MEMLESS=m
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_MATRIXKMAP is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=m
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ADP5589 is not set
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_QT1050 is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_QT2160 is not set
-# CONFIG_KEYBOARD_DLINK_DIR685 is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_TCA8418 is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_MPR121 is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
-# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_CAP11XX is not set
-CONFIG_INPUT_MOUSE=y
-# CONFIG_MOUSE_PS2 is not set
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_BCM5974 is not set
-# CONFIG_MOUSE_CYAPA is not set
-# CONFIG_MOUSE_ELAN_I2C is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MOUSE_SYNAPTICS_USB is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_AD714X is not set
-# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-# CONFIG_INPUT_BMA150 is not set
-# CONFIG_INPUT_E3X0_BUTTON is not set
-# CONFIG_INPUT_MSM_VIBRATOR is not set
-# CONFIG_INPUT_PCSPKR is not set
-# CONFIG_INPUT_MMA8450 is not set
-# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-# CONFIG_INPUT_KXTJ9 is not set
-# CONFIG_INPUT_POWERMATE is not set
-# CONFIG_INPUT_YEALINK is not set
-# CONFIG_INPUT_CM109 is not set
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_PCF8574 is not set
-# CONFIG_INPUT_ADXL34X is not set
-# CONFIG_INPUT_IMS_PCU is not set
-# CONFIG_INPUT_CMA3000 is not set
-# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
-# CONFIG_INPUT_DRV2665_HAPTICS is not set
-# CONFIG_INPUT_DRV2667_HAPTICS is not set
-# CONFIG_RMI4_CORE is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
-CONFIG_SERIO_I8042=y
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SERIO_PARKBD is not set
-# CONFIG_SERIO_PCIPS2 is not set
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
-# CONFIG_SERIO_XILINX_XPS_PS2 is not set
-# CONFIG_SERIO_ALTERA_PS2 is not set
-# CONFIG_SERIO_PS2MULT is not set
-# CONFIG_SERIO_ARC_PS2 is not set
-# CONFIG_SERIO_APBPS2 is not set
-# CONFIG_USERIO is not set
-# CONFIG_GAMEPORT is not set
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_N_GSM is not set
-# CONFIG_TRACE_SINK is not set
-# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
-# CONFIG_NULL_TTY is not set
-# CONFIG_LDISC_AUTOLOAD is not set
-CONFIG_DEVMEM=y
-CONFIG_DEVKMEM=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
-# CONFIG_SERIAL_8250_FINTEK is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_EXAR=y
-# CONFIG_SERIAL_8250_CS is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SERIAL_8250_ASPEED_VUART is not set
-CONFIG_SERIAL_8250_FSL=y
-# CONFIG_SERIAL_8250_DW is not set
-# CONFIG_SERIAL_8250_RT288X is not set
-# CONFIG_SERIAL_OF_PLATFORM is not set
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_SERIAL_ICOM is not set
-CONFIG_SERIAL_JSM=m
-# CONFIG_SERIAL_SIFIVE is not set
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
-# CONFIG_SERIAL_ARC is not set
-# CONFIG_SERIAL_RP2 is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_FSL_LINFLEXUART is not set
-# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
-# end of Serial drivers
-
-# CONFIG_SERIAL_DEV_BUS is not set
-# CONFIG_PRINTER is not set
-# CONFIG_PPDEV is not set
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_CONSOLE=y
-CONFIG_HVC_OLD_HVSI=y
-CONFIG_HVC_OPAL=y
-CONFIG_HVC_RTAS=y
-# CONFIG_HVC_UDBG is not set
-CONFIG_HVCS=y
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IBM_BSR=m
-CONFIG_POWERNV_OP_PANEL=m
-CONFIG_IPMI_HANDLER=y
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=y
-# CONFIG_IPMI_SI is not set
-# CONFIG_IPMI_SSIF is not set
-CONFIG_IPMI_POWERNV=y
-# CONFIG_IPMI_WATCHDOG is not set
-# CONFIG_IPMI_POWEROFF is not set
-CONFIG_HW_RANDOM=m
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_PSERIES=m
-CONFIG_HW_RANDOM_POWERNV=m
-CONFIG_NVRAM=y
-# CONFIG_APPLICOM is not set
-
-#
-# PCMCIA character devices
-#
-# CONFIG_SYNCLINK_CS is not set
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_SCR24X is not set
-# CONFIG_IPWIRELESS is not set
-# end of PCMCIA character devices
-
-CONFIG_RAW_DRIVER=y
-CONFIG_MAX_RAW_DEVS=1024
-# CONFIG_HANGCHECK_TIMER is not set
-# CONFIG_TCG_TPM is not set
-CONFIG_DEVPORT=y
-# CONFIG_XILLYBUS is not set
-# end of Character devices
-
-CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-# CONFIG_I2C_CHARDEV is not set
-# CONFIG_I2C_MUX is not set
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOBIT=y
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_NVIDIA_GPU is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_DESIGNWARE_PCI is not set
-# CONFIG_I2C_MPC is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_XILINX is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-# CONFIG_I2C_DIOLAN_U2C is not set
-# CONFIG_I2C_PARPORT is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_OPAL=y
-# end of I2C Hardware Bus support
-
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_SLAVE is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# end of I2C support
-
-# CONFIG_I3C is not set
-# CONFIG_SPI is not set
-# CONFIG_SPMI is not set
-# CONFIG_HSI is not set
-CONFIG_PPS=y
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-# CONFIG_PPS_CLIENT_LDISC is not set
-# CONFIG_PPS_CLIENT_PARPORT is not set
-# CONFIG_PPS_CLIENT_GPIO is not set
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=y
-
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-# end of PTP clock support
-
-# CONFIG_PINCTRL is not set
-# CONFIG_GPIOLIB is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_AVS is not set
-# CONFIG_POWER_RESET is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_POWER_SUPPLY_HWMON=y
-# CONFIG_PDA_POWER is not set
-# CONFIG_TEST_POWER is not set
-# CONFIG_CHARGER_ADP5061 is not set
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_CHARGER_SBS is not set
-# CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
-# CONFIG_CHARGER_BQ2415X is not set
-# CONFIG_CHARGER_SMB347 is not set
-# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-CONFIG_HWMON=y
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADT7410 is not set
-# CONFIG_SENSORS_ADT7411 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_AS370 is not set
-# CONFIG_SENSORS_ASC7621 is not set
-# CONFIG_SENSORS_ASPEED is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_DS620 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_G762 is not set
-# CONFIG_SENSORS_HIH6130 is not set
-# CONFIG_SENSORS_IBMAEM is not set
-# CONFIG_SENSORS_IBMPEX is not set
-CONFIG_SENSORS_IBMPOWERNV=y
-# CONFIG_SENSORS_JC42 is not set
-# CONFIG_SENSORS_POWR1220 is not set
-# CONFIG_SENSORS_LINEAGE is not set
-# CONFIG_SENSORS_LTC2945 is not set
-# CONFIG_SENSORS_LTC2990 is not set
-# CONFIG_SENSORS_LTC4151 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4222 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_LTC4260 is not set
-# CONFIG_SENSORS_LTC4261 is not set
-# CONFIG_SENSORS_MAX16065 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX1668 is not set
-# CONFIG_SENSORS_MAX197 is not set
-# CONFIG_SENSORS_MAX6621 is not set
-# CONFIG_SENSORS_MAX6639 is not set
-# CONFIG_SENSORS_MAX6642 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6697 is not set
-# CONFIG_SENSORS_MAX31790 is not set
-# CONFIG_SENSORS_MCP3021 is not set
-# CONFIG_SENSORS_TC654 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
-# CONFIG_SENSORS_LM95234 is not set
-# CONFIG_SENSORS_LM95241 is not set
-# CONFIG_SENSORS_LM95245 is not set
-# CONFIG_SENSORS_NTC_THERMISTOR is not set
-# CONFIG_SENSORS_NCT7802 is not set
-# CONFIG_SENSORS_NCT7904 is not set
-# CONFIG_SENSORS_NPCM7XX is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_PMBUS is not set
-# CONFIG_SENSORS_SHT21 is not set
-# CONFIG_SENSORS_SHT3x is not set
-# CONFIG_SENSORS_SHTC1 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_EMC1403 is not set
-# CONFIG_SENSORS_EMC2103 is not set
-# CONFIG_SENSORS_EMC6W201 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_STTS751 is not set
-# CONFIG_SENSORS_SMM665 is not set
-# CONFIG_SENSORS_ADC128D818 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_AMC6821 is not set
-# CONFIG_SENSORS_INA209 is not set
-# CONFIG_SENSORS_INA2XX is not set
-# CONFIG_SENSORS_INA3221 is not set
-# CONFIG_SENSORS_TC74 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP102 is not set
-# CONFIG_SENSORS_TMP103 is not set
-# CONFIG_SENSORS_TMP108 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83773G is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83795 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-# CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB is not set
-CONFIG_BCMA_POSSIBLE=y
-# CONFIG_BCMA is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=m
-# CONFIG_MFD_ACT8945A is not set
-# CONFIG_MFD_AS3711 is not set
-# CONFIG_MFD_AS3722 is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
-# CONFIG_MFD_ATMEL_HLCDC is not set
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_MADERA is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_MFD_DA9052_I2C is not set
-# CONFIG_MFD_DA9055 is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-# CONFIG_MFD_HI6421_PMIC is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_LPC_ICH is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77620 is not set
-# CONFIG_MFD_MAX77650 is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX77843 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MAX8925 is not set
-# CONFIG_MFD_MAX8997 is not set
-# CONFIG_MFD_MAX8998 is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_MENF21BMC is not set
-# CONFIG_MFD_VIPERBOARD is not set
-# CONFIG_MFD_RETU is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_RC5T583 is not set
-# CONFIG_MFD_RK808 is not set
-# CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_SEC_CORE is not set
-# CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_SKY81452 is not set
-# CONFIG_MFD_SMSC is not set
-# CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SYSCON is not set
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_LP8788 is not set
-# CONFIG_MFD_TI_LMU is not set
-# CONFIG_MFD_PALMAS is not set
-# CONFIG_TPS6105X is not set
-# CONFIG_TPS6507X is not set
-# CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_TPS65090 is not set
-# CONFIG_MFD_TPS65217 is not set
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TI_LP87565 is not set
-# CONFIG_MFD_TPS65218 is not set
-# CONFIG_MFD_TPS6586X is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_TPS80031 is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_TWL6040_CORE is not set
-# CONFIG_MFD_WL1273_CORE is not set
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_TC3589X is not set
-# CONFIG_MFD_TQMX86 is not set
-# CONFIG_MFD_VX855 is not set
-# CONFIG_MFD_LOCHNAGAR is not set
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM831X_I2C is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MFD_ROHM_BD718XX is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
-# CONFIG_MFD_STPMIC1 is not set
-# CONFIG_MFD_STMFX is not set
-# end of Multifunction device drivers
-
-# CONFIG_REGULATOR is not set
-CONFIG_CEC_CORE=y
-CONFIG_RC_CORE=y
-CONFIG_RC_MAP=y
-# CONFIG_LIRC is not set
-# CONFIG_RC_DECODERS is not set
-# CONFIG_RC_DEVICES is not set
-# CONFIG_MEDIA_SUPPORT is not set
-
-#
-# Graphics support
-#
-# CONFIG_AGP is not set
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_DRM=y
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DEBUG_MM is not set
-# CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_KMS_HELPER=y
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-CONFIG_DRM_DP_CEC=y
-CONFIG_DRM_TTM=y
-CONFIG_DRM_VRAM_HELPER=y
-CONFIG_DRM_VM=y
-CONFIG_DRM_SCHED=m
-
-#
-# I2C encoder or helper chips
-#
-# CONFIG_DRM_I2C_CH7006 is not set
-# CONFIG_DRM_I2C_SIL164 is not set
-# CONFIG_DRM_I2C_NXP_TDA998X is not set
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# end of I2C encoder or helper chips
-
-#
-# ARM devices
-#
-# end of ARM devices
-
-CONFIG_DRM_RADEON=m
-# CONFIG_DRM_RADEON_USERPTR is not set
-CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
-# CONFIG_DRM_AMDGPU_CIK is not set
-# CONFIG_DRM_AMDGPU_USERPTR is not set
-# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
-
-#
-# ACP (Audio CoProcessor) Configuration
-#
-# CONFIG_DRM_AMD_ACP is not set
-# end of ACP (Audio CoProcessor) Configuration
-
-#
-# Display Engine Configuration
-#
-CONFIG_DRM_AMD_DC=y
-# CONFIG_DEBUG_KERNEL_DC is not set
-# end of Display Engine Configuration
-
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-# CONFIG_NOUVEAU_DEBUG_MMU is not set
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-# CONFIG_DRM_VGEM is not set
-# CONFIG_DRM_VKMS is not set
-CONFIG_DRM_ATI_PCIGART=y
-# CONFIG_DRM_UDL is not set
-CONFIG_DRM_AST=y
-# CONFIG_DRM_MGAG200 is not set
-# CONFIG_DRM_CIRRUS_QEMU is not set
-# CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_LVDS is not set
-CONFIG_DRM_QXL=m
-# CONFIG_DRM_BOCHS is not set
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-# CONFIG_DRM_PANEL_LVDS is not set
-# CONFIG_DRM_PANEL_SIMPLE is not set
-# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
-# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
-# end of Display Panels
-
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_PANEL_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-# CONFIG_DRM_ANALOGIX_ANX78XX is not set
-# CONFIG_DRM_CDNS_DSI is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
-# CONFIG_DRM_LVDS_ENCODER is not set
-# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
-# CONFIG_DRM_NXP_PTN3460 is not set
-# CONFIG_DRM_PARADE_PS8622 is not set
-# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SII902X is not set
-# CONFIG_DRM_SII9234 is not set
-# CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TOSHIBA_TC358764 is not set
-# CONFIG_DRM_TOSHIBA_TC358767 is not set
-# CONFIG_DRM_TI_TFP410 is not set
-# CONFIG_DRM_TI_SN65DSI86 is not set
-# CONFIG_DRM_I2C_ADV7511 is not set
-# end of Display Interface Bridges
-
-# CONFIG_DRM_ETNAVIV is not set
-# CONFIG_DRM_ARCPGU is not set
-# CONFIG_DRM_GM12U320 is not set
-CONFIG_DRM_LEGACY=y
-# CONFIG_DRM_TDFX is not set
-# CONFIG_DRM_R128 is not set
-# CONFIG_DRM_MGA is not set
-# CONFIG_DRM_VIA is not set
-# CONFIG_DRM_SAVAGE is not set
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_DDC=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=y
-CONFIG_FB_SYS_COPYAREA=y
-CONFIG_FB_SYS_IMAGEBLIT=y
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=y
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_MACMODES=y
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-CONFIG_FB_OF=y
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_OPENCORES is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-CONFIG_FB_MATROX=y
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-# CONFIG_FB_MATROX_I2C is not set
-CONFIG_FB_RADEON=y
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_UDL is not set
-CONFIG_FB_IBM_GXT4500=y
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_SIMPLE is not set
-# CONFIG_FB_SM712 is not set
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-# CONFIG_BACKLIGHT_PM8941_WLED is not set
-# CONFIG_BACKLIGHT_ADP8860 is not set
-# CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_LV5207LP is not set
-# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_ARCXCNN is not set
-# end of Backlight & LCD device support
-
-CONFIG_HDMI=y
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
-# end of Console display driver support
-
-# CONFIG_LOGO is not set
-# end of Graphics support
-
-CONFIG_SOUND=y
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=y
-CONFIG_SND_TIMER=y
-CONFIG_SND_PCM=y
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_JACK_INPUT_DEV=y
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=y
-CONFIG_SND_PCM_OSS=y
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_PCM_TIMER=y
-# CONFIG_SND_HRTIMER is not set
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=32
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_PROC_FS=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-# CONFIG_SND_SEQUENCER is not set
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-CONFIG_SND_DUMMY=m
-CONFIG_SND_ALOOP=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-# CONFIG_SND_AC97_POWER_SAVE is not set
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_FM801=m
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-
-#
-# HD-Audio
-#
-CONFIG_SND_HDA=y
-CONFIG_SND_HDA_INTEL=y
-# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
-# CONFIG_SND_HDA_HWDEP is not set
-CONFIG_SND_HDA_RECONFIG=y
-# CONFIG_SND_HDA_INPUT_BEEP is not set
-# CONFIG_SND_HDA_PATCH_LOADER is not set
-CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_CODEC_ANALOG=y
-CONFIG_SND_HDA_CODEC_SIGMATEL=y
-CONFIG_SND_HDA_CODEC_VIA=y
-CONFIG_SND_HDA_CODEC_HDMI=y
-CONFIG_SND_HDA_CODEC_CIRRUS=y
-CONFIG_SND_HDA_CODEC_CONEXANT=y
-CONFIG_SND_HDA_CODEC_CA0110=y
-CONFIG_SND_HDA_CODEC_CA0132=y
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CMEDIA=y
-CONFIG_SND_HDA_CODEC_SI3054=y
-CONFIG_SND_HDA_GENERIC=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-# end of HD-Audio
-
-CONFIG_SND_HDA_CORE=y
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_COMPONENT=y
-CONFIG_SND_HDA_PREALLOC_SIZE=64
-CONFIG_SND_PPC=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
-CONFIG_SND_BCD2000=m
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_PCMCIA=y
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_PDAUDIOCF is not set
-# CONFIG_SND_SOC is not set
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=m
-# CONFIG_HID_BATTERY_STRENGTH is not set
-# CONFIG_HIDRAW is not set
-# CONFIG_UHID is not set
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-# CONFIG_HID_ACCUTOUCH is not set
-# CONFIG_HID_ACRUX is not set
-CONFIG_HID_APPLE=m
-# CONFIG_HID_APPLEIR is not set
-# CONFIG_HID_ASUS is not set
-# CONFIG_HID_AUREAL is not set
-CONFIG_HID_BELKIN=m
-# CONFIG_HID_BETOP_FF is not set
-# CONFIG_HID_BIGBEN_FF is not set
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-# CONFIG_HID_CORSAIR is not set
-CONFIG_HID_COUGAR=m
-# CONFIG_HID_MACALLY is not set
-# CONFIG_HID_PRODIKEYS is not set
-# CONFIG_HID_CMEDIA is not set
-# CONFIG_HID_CREATIVE_SB0540 is not set
-CONFIG_HID_CYPRESS=m
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-CONFIG_HID_ELAN=m
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-CONFIG_HID_EZKEY=m
-# CONFIG_HID_GEMBIRD is not set
-# CONFIG_HID_GFRM is not set
-# CONFIG_HID_HOLTEK is not set
-# CONFIG_HID_GT683R is not set
-# CONFIG_HID_KEYTOUCH is not set
-# CONFIG_HID_KYE is not set
-CONFIG_HID_UCLOGIC=m
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_VIEWSONIC is not set
-CONFIG_HID_GYRATION=m
-# CONFIG_HID_ICADE is not set
-CONFIG_HID_ITE=m
-CONFIG_HID_JABRA=m
-# CONFIG_HID_TWINHAN is not set
-CONFIG_HID_KENSINGTON=m
-# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_LED is not set
-# CONFIG_HID_LENOVO is not set
-CONFIG_HID_LOGITECH=m
-# CONFIG_HID_LOGITECH_HIDPP is not set
-# CONFIG_LOGITECH_FF is not set
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGIG940_FF is not set
-# CONFIG_LOGIWHEELS_FF is not set
-# CONFIG_HID_MAGICMOUSE is not set
-# CONFIG_HID_MALTRON is not set
-# CONFIG_HID_MAYFLASH is not set
-# CONFIG_HID_REDRAGON is not set
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-# CONFIG_HID_MULTITOUCH is not set
-# CONFIG_HID_NTI is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
-CONFIG_HID_PANTHERLORD=m
-# CONFIG_PANTHERLORD_FF is not set
-# CONFIG_HID_PENMOUNT is not set
-CONFIG_HID_PETALYNX=m
-# CONFIG_HID_PICOLCD is not set
-# CONFIG_HID_PLANTRONICS is not set
-# CONFIG_HID_PRIMAX is not set
-# CONFIG_HID_RETRODE is not set
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_SAITEK is not set
-CONFIG_HID_SAMSUNG=m
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SPEEDLINK is not set
-# CONFIG_HID_STEAM is not set
-# CONFIG_HID_STEELSERIES is not set
-CONFIG_HID_SUNPLUS=m
-# CONFIG_HID_RMI is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_THINGM is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_UDRAW_PS3 is not set
-# CONFIG_HID_U2FZERO is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_WIIMOTE is not set
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HID_ZYDACRON is not set
-# CONFIG_HID_SENSOR_HUB is not set
-# CONFIG_HID_ALPS is not set
-# end of Special HID drivers
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
-# end of USB HID support
-
-#
-# I2C HID support
-#
-# CONFIG_I2C_HID is not set
-# end of I2C HID support
-# end of HID support
-
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
-# CONFIG_USB_ULPI_BUS is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-CONFIG_USB_PCI=y
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_MON=m
-
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=m
-# CONFIG_USB_EHCI_FSL is not set
-# CONFIG_USB_EHCI_HCD_PPC_OF is not set
-# CONFIG_USB_EHCI_HCD_PLATFORM is not set
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_FOTG210_HCD is not set
-CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_OHCI_HCD_PPC_OF_BE is not set
-# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
-CONFIG_USB_OHCI_HCD_PCI=m
-# CONFIG_USB_OHCI_HCD_PLATFORM is not set
-# CONFIG_USB_UHCI_HCD is not set
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_TMC is not set
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_REALTEK is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-# CONFIG_USB_UAS is not set
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USBIP_CORE is not set
-# CONFIG_USB_CDNS3 is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_ISP1760 is not set
-
-#
-# USB port drivers
-#
-# CONFIG_USB_USS720 is not set
-# CONFIG_USB_SERIAL is not set
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_YUREX is not set
-# CONFIG_USB_EZUSB_FX2 is not set
-# CONFIG_USB_HUB_USB251XB is not set
-# CONFIG_USB_HSIC_USB3503 is not set
-# CONFIG_USB_HSIC_USB4604 is not set
-# CONFIG_USB_LINK_LAYER_TEST is not set
-# CONFIG_USB_CHAOSKEY is not set
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_USB_ISP1301 is not set
-# end of USB Physical Layer drivers
-
-# CONFIG_USB_GADGET is not set
-CONFIG_TYPEC=m
-CONFIG_TYPEC_TCPM=m
-CONFIG_TYPEC_TCPCI=m
-# CONFIG_TYPEC_RT1711H is not set
-CONFIG_TYPEC_FUSB302=m
-# CONFIG_TYPEC_UCSI is not set
-CONFIG_TYPEC_TPS6598X=m
-
-#
-# USB Type-C Multiplexer/DeMultiplexer Switch support
-#
-CONFIG_TYPEC_MUX_PI3USB30532=m
-# end of USB Type-C Multiplexer/DeMultiplexer Switch support
-
-#
-# USB Type-C Alternate Mode drivers
-#
-CONFIG_TYPEC_DP_ALTMODE=m
-# CONFIG_TYPEC_NVIDIA_ALTMODE is not set
-# end of USB Type-C Alternate Mode drivers
-
-CONFIG_USB_ROLE_SWITCH=m
-# CONFIG_MMC is not set
-# CONFIG_MEMSTICK is not set
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
-# CONFIG_LEDS_CLASS_FLASH is not set
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
-
-#
-# LED drivers
-#
-# CONFIG_LEDS_AN30259A is not set
-# CONFIG_LEDS_BCM6328 is not set
-# CONFIG_LEDS_BCM6358 is not set
-# CONFIG_LEDS_LM3530 is not set
-# CONFIG_LEDS_LM3532 is not set
-# CONFIG_LEDS_LM3642 is not set
-CONFIG_LEDS_LM3692X=m
-# CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_LP3944 is not set
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_LP5523 is not set
-# CONFIG_LEDS_LP5562 is not set
-# CONFIG_LEDS_LP8501 is not set
-# CONFIG_LEDS_LP8860 is not set
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_BD2802 is not set
-# CONFIG_LEDS_TCA6507 is not set
-# CONFIG_LEDS_TLC591XX is not set
-# CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_IS31FL319X is not set
-# CONFIG_LEDS_IS31FL32XX is not set
-
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-# CONFIG_LEDS_BLINKM is not set
-CONFIG_LEDS_POWERNV=m
-# CONFIG_LEDS_MLXREG is not set
-# CONFIG_LEDS_USER is not set
-# CONFIG_LEDS_TI_LMU_COMMON is not set
-
-#
-# LED Triggers
-#
-# CONFIG_LEDS_TRIGGERS is not set
-# CONFIG_ACCESSIBILITY is not set
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_CXGB3=m
-CONFIG_INFINIBAND_CXGB4=m
-# CONFIG_INFINIBAND_EFA is not set
-# CONFIG_INFINIBAND_I40IW is not set
-CONFIG_MLX4_INFINIBAND=m
-# CONFIG_INFINIBAND_OCRDMA is not set
-CONFIG_RDMA_RXE=m
-# CONFIG_RDMA_SIW is not set
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-# CONFIG_EDAC is not set
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_NVMEM=y
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-# CONFIG_RTC_DRV_TEST is not set
-
-#
-# I2C RTC drivers
-#
-# CONFIG_RTC_DRV_ABB5ZES3 is not set
-# CONFIG_RTC_DRV_ABEOZ9 is not set
-# CONFIG_RTC_DRV_ABX80X is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_ISL12022 is not set
-# CONFIG_RTC_DRV_ISL12026 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_PCF8523 is not set
-# CONFIG_RTC_DRV_PCF85063 is not set
-# CONFIG_RTC_DRV_PCF85363 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_BQ32K is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_RX8010 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_EM3027 is not set
-# CONFIG_RTC_DRV_RV3028 is not set
-# CONFIG_RTC_DRV_RV8803 is not set
-# CONFIG_RTC_DRV_SD3078 is not set
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_I2C_AND_SPI=y
-
-#
-# SPI and I2C RTC drivers
-#
-# CONFIG_RTC_DRV_DS3232 is not set
-# CONFIG_RTC_DRV_PCF2127 is not set
-# CONFIG_RTC_DRV_RV3029C2 is not set
-
-#
-# Platform RTC drivers
-#
-# CONFIG_RTC_DRV_CMOS is not set
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1685_FAMILY is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS2404 is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_MSM6242 is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-# CONFIG_RTC_DRV_RP5C01 is not set
-# CONFIG_RTC_DRV_V3020 is not set
-CONFIG_RTC_DRV_OPAL=y
-# CONFIG_RTC_DRV_ZYNQMP is not set
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_GENERIC=m
-# CONFIG_RTC_DRV_CADENCE is not set
-# CONFIG_RTC_DRV_FTRTC010 is not set
-# CONFIG_RTC_DRV_SNVS is not set
-# CONFIG_RTC_DRV_R7301 is not set
-
-#
-# HID Sensor RTC drivers
-#
-# CONFIG_DMADEVICES is not set
-
-#
-# DMABUF options
-#
-CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
-# CONFIG_DMABUF_SELFTESTS is not set
-# end of DMABUF options
-
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_PANEL is not set
-CONFIG_UIO=m
-# CONFIG_UIO_CIF is not set
-# CONFIG_UIO_PDRV_GENIRQ is not set
-# CONFIG_UIO_DMEM_GENIRQ is not set
-# CONFIG_UIO_AEC is not set
-# CONFIG_UIO_SERCOS3 is not set
-# CONFIG_UIO_PCI_GENERIC is not set
-# CONFIG_UIO_NETX is not set
-# CONFIG_UIO_PRUSS is not set
-# CONFIG_UIO_MF624 is not set
-# CONFIG_VFIO is not set
-CONFIG_IRQ_BYPASS_MANAGER=y
-# CONFIG_VIRT_DRIVERS is not set
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
-# CONFIG_VIRTIO_INPUT is not set
-# CONFIG_VIRTIO_MMIO is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-# end of Microsoft Hyper-V guest support
-
-# CONFIG_GREYBUS is not set
-# CONFIG_STAGING is not set
-# CONFIG_HWSPINLOCK is not set
-
-#
-# Clock Source drivers
-#
-CONFIG_I8253_LOCK=y
-CONFIG_CLKBLD_I8253=y
-# end of Clock Source drivers
-
-# CONFIG_MAILBOX is not set
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-# end of Generic IOMMU Pagetable Support
-
-# CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_OF_IOMMU=y
-CONFIG_SPAPR_TCE_IOMMU=y
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-CONFIG_RPMSG=m
-# CONFIG_RPMSG_CHAR is not set
-CONFIG_RPMSG_VIRTIO=m
-# end of Rpmsg drivers
-
-# CONFIG_SOUNDWIRE is not set
-
-#
-# SOC (System On Chip) specific Drivers
-#
-
-#
-# Amlogic SoC drivers
-#
-# end of Amlogic SoC drivers
-
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-# end of i.MX SoC drivers
-
-#
-# Qualcomm SoC drivers
-#
-# end of Qualcomm SoC drivers
-
-# CONFIG_SOC_TI is not set
-
-#
-# Xilinx SoC drivers
-#
-# CONFIG_XILINX_VCU is not set
-# end of Xilinx SoC drivers
-# end of SOC (System On Chip) specific Drivers
-
-# CONFIG_PM_DEVFREQ is not set
-# CONFIG_EXTCON is not set
-# CONFIG_MEMORY is not set
-# CONFIG_IIO is not set
-# CONFIG_NTB is not set
-# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
-
-#
-# IRQ chip support
-#
-CONFIG_IRQCHIP=y
-# CONFIG_AL_FIC is not set
-# end of IRQ chip support
-
-# CONFIG_IPACK_BUS is not set
-# CONFIG_RESET_CONTROLLER is not set
-
-#
-# PHY Subsystem
-#
-# CONFIG_GENERIC_PHY is not set
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_CADENCE_DP is not set
-# CONFIG_PHY_CADENCE_DPHY is not set
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# end of PHY Subsystem
-
-# CONFIG_POWERCAP is not set
-# CONFIG_MCB is not set
-
-#
-# Performance monitor support
-#
-# end of Performance monitor support
-
-CONFIG_RAS=y
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-# end of Android
-
-# CONFIG_LIBNVDIMM is not set
-CONFIG_DAX=y
-# CONFIG_DEV_DAX is not set
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SYSFS=y
-
-#
-# HW tracing support
-#
-# CONFIG_STM is not set
-# CONFIG_INTEL_TH is not set
-# end of HW tracing support
-
-# CONFIG_FPGA is not set
-# CONFIG_FSI is not set
-# CONFIG_SIOX is not set
-# CONFIG_SLIMBUS is not set
-# CONFIG_INTERCONNECT is not set
-# CONFIG_COUNTER is not set
-# end of Device Drivers
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-# CONFIG_VALIDATE_FS_PARSER is not set
-CONFIG_FS_IOMAP=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=y
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=y
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_XFS_FS=m
-# CONFIG_XFS_QUOTA is not set
-CONFIG_XFS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
-CONFIG_XFS_ONLINE_SCRUB=y
-# CONFIG_XFS_ONLINE_REPAIR is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_FS_REF_VERIFY is not set
-CONFIG_NILFS2_FS=m
-# CONFIG_F2FS_FS is not set
-# CONFIG_FS_DAX is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_EXPORTFS_BLOCK_OPS=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_MANDATORY_FILE_LOCKING is not set
-CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
-# CONFIG_QUOTA is not set
-CONFIG_AUTOFS4_FS=m
-CONFIG_AUTOFS_FS=m
-CONFIG_FUSE_FS=m
-# CONFIG_CUSE is not set
-CONFIG_VIRTIO_FS=m
-CONFIG_OVERLAY_FS=m
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
-# CONFIG_OVERLAY_FS_INDEX is not set
-# CONFIG_OVERLAY_FS_XINO_AUTO is not set
-# CONFIG_OVERLAY_FS_METACOPY is not set
-
-#
-# Caches
-#
-# CONFIG_FSCACHE is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-# CONFIG_JOLIET is not set
-# CONFIG_ZISOFS is not set
-CONFIG_UDF_FS=m
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_FAT_DEFAULT_UTF8 is not set
-# CONFIG_NTFS_FS is not set
-# end of DOS/FAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PROC_CHILDREN is not set
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
-CONFIG_CONFIGFS_FS=m
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ORANGEFS_FS is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_ECRYPT_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-# CONFIG_CRAMFS is not set
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_FILE_CACHE=y
-# CONFIG_SQUASHFS_FILE_DIRECT is not set
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-# CONFIG_SQUASHFS_LZ4 is not set
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZSTD is not set
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_PSTORE=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=y
-# CONFIG_PSTORE_LZO_COMPRESS is not set
-# CONFIG_PSTORE_LZ4_COMPRESS is not set
-# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
-# CONFIG_PSTORE_842_COMPRESS is not set
-# CONFIG_PSTORE_ZSTD_COMPRESS is not set
-CONFIG_PSTORE_COMPRESS=y
-CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
-CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-# CONFIG_PSTORE_RAM is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-# CONFIG_EROFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
-# CONFIG_NFS_V4_1_MIGRATION is not set
-CONFIG_NFS_V4_SECURITY_LABEL=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_BLOCKLAYOUT=y
-CONFIG_NFSD_SCSILAYOUT=y
-CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFSD_V4_SECURITY_LABEL is not set
-CONFIG_GRACE_PERIOD=m
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
-# CONFIG_SUNRPC_DEBUG is not set
-CONFIG_SUNRPC_XPRT_RDMA=m
-# CONFIG_CEPH_FS is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_UPCALL is not set
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_DEBUG=y
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
-# CONFIG_CIFS_SMB_DIRECT is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-CONFIG_9P_FS=m
-CONFIG_9P_FS_POSIX_ACL=y
-# CONFIG_9P_FS_SECURITY is not set
-CONFIG_NLS=m
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-# CONFIG_DLM is not set
-# CONFIG_UNICODE is not set
-# end of File systems
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_COMPAT=y
-# CONFIG_KEYS_REQUEST_CACHE is not set
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_KEY_DH_OPERATIONS=y
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_INFINIBAND is not set
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_HARDENED_USERCOPY_FALLBACK=y
-# CONFIG_FORTIFY_SOURCE is not set
-# CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_HASH=y
-CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
-# CONFIG_SECURITY_APPARMOR_DEBUG is not set
-# CONFIG_SECURITY_LOADPIN is not set
-CONFIG_SECURITY_YAMA=y
-# CONFIG_SECURITY_SAFESETID is not set
-# CONFIG_SECURITY_LOCKDOWN_LSM is not set
-# CONFIG_INTEGRITY is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=m
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_KPP=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
-# CONFIG_CRYPTO_CRYPTD is not set
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ENGINE=m
-
-#
-# Public-key cryptography
-#
-# CONFIG_CRYPTO_RSA is not set
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECC=m
-CONFIG_CRYPTO_ECDH=m
-# CONFIG_CRYPTO_ECRDSA is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
-CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CFB=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_OFB is not set
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=y
-# CONFIG_CRYPTO_KEYWRAP is not set
-# CONFIG_CRYPTO_ADIANTUM is not set
-CONFIG_CRYPTO_ESSIV=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_VMAC is not set
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
-CONFIG_CRYPTO_CRC32=m
-# CONFIG_CRYPTO_XXHASH is not set
-CONFIG_CRYPTO_CRCT10DIF=y
-# CONFIG_CRYPTO_CRCT10DIF_VPMSUM is not set
-CONFIG_CRYPTO_GHASH=m
-# CONFIG_CRYPTO_POLY1305 is not set
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=m
-# CONFIG_CRYPTO_MD5_PPC is not set
-CONFIG_CRYPTO_MICHAEL_MIC=m
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-CONFIG_CRYPTO_SHA1=y
-# CONFIG_CRYPTO_SHA1_PPC is not set
-CONFIG_CRYPTO_LIB_SHA256=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-# CONFIG_CRYPTO_CAMELLIA is not set
-CONFIG_CRYPTO_CAST_COMMON=m
-# CONFIG_CRYPTO_CAST5 is not set
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_FCRYPT is not set
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-# CONFIG_CRYPTO_CHACHA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=m
-# CONFIG_CRYPTO_842 is not set
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-CONFIG_CRYPTO_ZSTD=m
-
-#
-# Random Number Generation
-#
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_DRBG_MENU=m
-CONFIG_CRYPTO_DRBG_HMAC=y
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-CONFIG_CRYPTO_DRBG=m
-CONFIG_CRYPTO_JITTERENTROPY=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_NX=y
-CONFIG_CRYPTO_DEV_NX_COMPRESS=y
-CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=y
-CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=y
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
-# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
-# CONFIG_CRYPTO_DEV_VMX is not set
-# CONFIG_CRYPTO_DEV_CHELSIO is not set
-CONFIG_CRYPTO_DEV_VIRTIO=m
-# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
-# CONFIG_CRYPTO_DEV_CCREE is not set
-# CONFIG_ASYMMETRIC_KEY_TYPE is not set
-
-#
-# Certificates for signature checking
-#
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-# end of Certificates for signature checking
-
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_RAID6_PQ_BENCHMARK=y
-# CONFIG_PACKING is not set
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-# CONFIG_CORDIC is not set
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=m
-# CONFIG_CRC4 is not set
-# CONFIG_CRC7 is not set
-CONFIG_LIBCRC32C=m
-# CONFIG_CRC8 is not set
-CONFIG_XXHASH=y
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_842_DECOMPRESS=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=m
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_COMPRESS=m
-CONFIG_ZSTD_DECOMPRESS=m
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_INTERVAL_TREE=y
-CONFIG_XARRAY_MULTI=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_DMA_DECLARE_COHERENT=y
-CONFIG_DMA_VIRT_OPS=y
-CONFIG_SWIOTLB=y
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_IOMMU_HELPER=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_CLZ_TAB=y
-CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=y
-CONFIG_DIMLIB=y
-CONFIG_LIBFDT=y
-CONFIG_OID_REGISTRY=m
-CONFIG_FONT_SUPPORT=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-CONFIG_SG_POOL=y
-CONFIG_ARCH_HAS_PMEM_API=y
-CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
-CONFIG_ARCH_HAS_UACCESS_MCSAFE=y
-CONFIG_SBITMAP=y
-# CONFIG_STRING_SELFTEST is not set
-# end of Library routines
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-# CONFIG_PRINTK_TIME is not set
-# CONFIG_PRINTK_CALLER is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=3
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_DYNAMIC_DEBUG is not set
-# end of printk and dmesg options
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=2048
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_INSTALL is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# end of Compile-time checks and compiler options
-
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_MAGIC_SYSRQ_SERIAL=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_OWNER is not set
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-CONFIG_DEBUG_STACK_USAGE=y
-# CONFIG_DEBUG_VM is not set
-CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-CONFIG_CC_HAS_KASAN_GENERIC=y
-CONFIG_KASAN_STACK=1
-# end of Memory Debugging
-
-CONFIG_ARCH_HAS_KCOV=y
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Lockups and Hangs
-#
-CONFIG_LOCKUP_DETECTOR=y
-# CONFIG_SOFTLOCKUP_DETECTOR is not set
-CONFIG_HARDLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-# CONFIG_WQ_WATCHDOG is not set
-# end of Debug Lockups and Hangs
-
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-CONFIG_SCHEDSTATS=y
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-# end of Lock Debugging (spinlocks, mutexes, etc...)
-
-CONFIG_STACKTRACE=y
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# end of RCU Debugging
-
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-CONFIG_FUNCTION_ERROR_INJECTION=y
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_LATENCYTOP=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACER_MAX_TRACE=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_PREEMPTIRQ_EVENTS is not set
-# CONFIG_IRQSOFF_TRACER is not set
-CONFIG_SCHED_TRACER=y
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-CONFIG_TRACER_SNAPSHOT=y
-# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_KPROBE_EVENTS=y
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-# CONFIG_BPF_KPROBE_OVERRIDE is not set
-# CONFIG_FTRACE_STARTUP_TEST is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_RUNTIME_TESTING_MENU is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_IO_STRICT_DEVMEM=y
-# CONFIG_PPC_DISABLE_WERROR is not set
-CONFIG_PPC_WERROR=y
-CONFIG_PRINT_STACK_DEPTH=64
-# CONFIG_HCALL_STATS is not set
-# CONFIG_PPC_EMULATED_STATS is not set
-CONFIG_CODE_PATCHING_SELFTEST=y
-CONFIG_JUMP_LABEL_FEATURE_CHECKS=y
-# CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG is not set
-CONFIG_FTR_FIXUP_SELFTEST=y
-CONFIG_MSI_BITMAP_SELFTEST=y
-# CONFIG_PPC_IRQ_SOFT_MASK_DEBUG is not set
-CONFIG_XMON=y
-# CONFIG_XMON_DEFAULT is not set
-CONFIG_XMON_DISASSEMBLY=y
-CONFIG_XMON_DEFAULT_RO_MODE=y
-CONFIG_DEBUGGER=y
-# CONFIG_BOOTX_TEXT is not set
-# CONFIG_PPC_EARLY_DEBUG is not set
-# CONFIG_PPC_PTDUMP is not set
-# CONFIG_PPC_FAST_ENDIAN_SWITCH is not set
-# end of Kernel hacking
diff --git a/main/linux-lts/config-lts.s390x b/main/linux-lts/config-lts.s390x
deleted file mode 100644
index b8f2fd66389..00000000000
--- a/main/linux-lts/config-lts.s390x
+++ /dev/null
@@ -1,3503 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.4.23 Kernel Configuration
-#
-
-#
-# Compiler: gcc (Alpine 9.2.0) 9.2.0
-#
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-CONFIG_THREAD_INFO_IN_TASK=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-# CONFIG_HEADER_TEST is not set
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT=""
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_HAVE_KERNEL_UNCOMPRESSED=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-# CONFIG_KERNEL_UNCOMPRESSED is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-# CONFIG_USELIB is not set
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_SPARSE_IRQ=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
-# end of IRQ subsystem
-
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-# end of Timers subsystem
-
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_PSI=y
-CONFIG_PSI_DEFAULT_DISABLED=y
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-CONFIG_IKCONFIG=m
-CONFIG_IKCONFIG_PROC=y
-# CONFIG_IKHEADERS is not set
-CONFIG_LOG_BUF_SHIFT=17
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-
-#
-# Scheduler features
-#
-# end of Scheduler features
-
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_NUMA_BALANCING=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_CGROUPS=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
-CONFIG_CGROUP_FREEZER=y
-# CONFIG_CGROUP_HUGETLB is not set
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-# CONFIG_CHECKPOINT_RESTORE is not set
-CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_MULTIUSER=y
-# CONFIG_SGETMASK_SYSCALL is not set
-# CONFIG_SYSFS_SYSCALL is not set
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_FHANDLE=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_HAVE_FUTEX_CMPXCHG=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
-# CONFIG_USERFAULTFD is not set
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-# CONFIG_PC104 is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_SLAB_FREELIST_RANDOM=y
-# CONFIG_SLAB_FREELIST_HARDENED is not set
-# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-# end of General setup
-
-CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
-CONFIG_CPU_BIG_ENDIAN=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_PGSTE=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_NO_IOPORT_MAP=y
-CONFIG_PCI_QUIRKS=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_S390=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_PGTABLE_LEVELS=5
-CONFIG_HAVE_LIVEPATCH=y
-CONFIG_LIVEPATCH=y
-
-#
-# Processor type and features
-#
-CONFIG_HAVE_MARCH_Z900_FEATURES=y
-CONFIG_HAVE_MARCH_Z990_FEATURES=y
-CONFIG_HAVE_MARCH_Z9_109_FEATURES=y
-CONFIG_HAVE_MARCH_Z10_FEATURES=y
-CONFIG_HAVE_MARCH_Z196_FEATURES=y
-# CONFIG_MARCH_Z900 is not set
-# CONFIG_MARCH_Z990 is not set
-# CONFIG_MARCH_Z9_109 is not set
-# CONFIG_MARCH_Z10 is not set
-CONFIG_MARCH_Z196=y
-# CONFIG_MARCH_ZEC12 is not set
-# CONFIG_MARCH_Z13 is not set
-# CONFIG_MARCH_Z14 is not set
-# CONFIG_MARCH_Z15 is not set
-CONFIG_MARCH_ZEC12_TUNE=y
-# CONFIG_TUNE_DEFAULT is not set
-# CONFIG_TUNE_Z900 is not set
-# CONFIG_TUNE_Z990 is not set
-# CONFIG_TUNE_Z9_109 is not set
-# CONFIG_TUNE_Z10 is not set
-# CONFIG_TUNE_Z196 is not set
-CONFIG_TUNE_ZEC12=y
-# CONFIG_TUNE_Z13 is not set
-# CONFIG_TUNE_Z14 is not set
-# CONFIG_TUNE_Z15 is not set
-CONFIG_64BIT=y
-CONFIG_COMPAT=y
-CONFIG_COMPAT_VDSO=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=256
-CONFIG_HOTPLUG_CPU=y
-CONFIG_NODES_SPAN_OTHER_NODES=y
-CONFIG_NUMA=y
-CONFIG_NODES_SHIFT=4
-
-#
-# Select NUMA modes
-#
-CONFIG_NUMA_EMU=y
-CONFIG_EMU_SIZE=0x10000000
-# end of Select NUMA modes
-
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_BOOK=y
-CONFIG_SCHED_DRAWER=y
-CONFIG_SCHED_TOPOLOGY=y
-CONFIG_HZ_100=y
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=100
-CONFIG_SCHED_HRTICK=y
-CONFIG_KEXEC=y
-# CONFIG_KEXEC_FILE is not set
-CONFIG_ARCH_RANDOM=y
-# CONFIG_KERNEL_NOBP is not set
-CONFIG_EXPOLINE=y
-# CONFIG_EXPOLINE_OFF is not set
-CONFIG_EXPOLINE_AUTO=y
-# CONFIG_EXPOLINE_FULL is not set
-CONFIG_RELOCATABLE=y
-CONFIG_RANDOMIZE_BASE=y
-# end of Processor type and features
-
-#
-# Memory setup
-#
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_FORCE_MAX_ZONEORDER=9
-CONFIG_MAX_PHYSMEM_BITS=46
-CONFIG_PACK_STACK=y
-# CONFIG_WARN_DYNAMIC_STACK is not set
-# end of Memory setup
-
-#
-# I/O subsystem
-#
-CONFIG_QDIO=y
-CONFIG_PCI_NR_FUNCTIONS=64
-CONFIG_HAS_IOMEM=y
-CONFIG_CHSC_SCH=m
-CONFIG_SCM_BUS=y
-CONFIG_EADM_SCH=m
-# end of I/O subsystem
-
-#
-# Dump support
-#
-# CONFIG_CRASH_DUMP is not set
-# end of Dump support
-
-CONFIG_SECCOMP=y
-
-#
-# Power Management
-#
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_ARCH_SAVE_PAGE_KEYS=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_ADVANCED_DEBUG=y
-CONFIG_PM_SLEEP_DEBUG=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-# end of Power Management
-
-CONFIG_CCW=y
-CONFIG_HAVE_PNETID=m
-
-#
-# Virtualization
-#
-# CONFIG_PROTECTED_VIRTUALIZATION_GUEST is not set
-CONFIG_PFAULT=y
-CONFIG_CMM=m
-CONFIG_CMM_IUCV=y
-CONFIG_APPLDATA_BASE=y
-CONFIG_APPLDATA_MEM=m
-CONFIG_APPLDATA_OS=m
-CONFIG_APPLDATA_NET_SUM=m
-CONFIG_S390_HYPFS_FS=y
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_KVM_ASYNC_PF_SYNC=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_KVM_VFIO=y
-CONFIG_HAVE_KVM_INVALID_WAKEUPS=y
-CONFIG_HAVE_KVM_VCPU_ASYNC_IOCTL=y
-CONFIG_HAVE_KVM_NO_POLL=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
-# CONFIG_KVM_S390_UCONTROL is not set
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-CONFIG_S390_GUEST=y
-# end of Virtualization
-
-#
-# General architecture-dependent options
-#
-CONFIG_CRASH_CORE=y
-CONFIG_KEXEC_CORE=y
-CONFIG_OPROFILE=m
-CONFIG_HAVE_OPROFILE=y
-CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_UPROBES=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_KRETPROBES=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_HAS_SET_MEMORY=y
-CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
-CONFIG_HAVE_ASM_MODVERSIONS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
-CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_HAVE_MMU_GATHER_NO_GATHER=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
-CONFIG_ARCH_HAS_SCALED_CPUTIME=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_SOFT_DIRTY=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_CLONE_BACKWARDS2=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_OLD_SIGACTION=y
-CONFIG_COMPAT_OLD_SIGACTION=y
-CONFIG_64BIT_TIME=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_HAVE_ARCH_VMAP_STACK=y
-CONFIG_VMAP_STACK=y
-CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-# CONFIG_REFCOUNT_FULL is not set
-# CONFIG_LOCK_EVENT_COUNTS is not set
-CONFIG_ARCH_HAS_MEM_ENCRYPT=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# end of GCOV-based kernel profiling
-
-CONFIG_PLUGIN_HOSTCC=""
-CONFIG_HAVE_GCC_PLUGINS=y
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
-CONFIG_ASM_MODVERSIONS=y
-CONFIG_MODULE_REL_CRCS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-# CONFIG_BLK_DEV_ZONED is not set
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
-# CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_WBT is not set
-CONFIG_BLK_CGROUP_IOLATENCY=y
-# CONFIG_BLK_CGROUP_IOCOST is not set
-CONFIG_BLK_DEBUG_FS=y
-# CONFIG_BLK_SED_OPAL is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AIX_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_IBM_PARTITION=y
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_CMDLINE_PARTITION is not set
-# end of Partition Types
-
-CONFIG_BLOCK_COMPAT=y
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_MQ_RDMA=y
-CONFIG_BLK_PM=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-# CONFIG_IOSCHED_BFQ is not set
-# end of IO Schedulers
-
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=m
-CONFIG_ARCH_INLINE_SPIN_TRYLOCK=y
-CONFIG_ARCH_INLINE_SPIN_TRYLOCK_BH=y
-CONFIG_ARCH_INLINE_SPIN_LOCK=y
-CONFIG_ARCH_INLINE_SPIN_LOCK_BH=y
-CONFIG_ARCH_INLINE_SPIN_LOCK_IRQ=y
-CONFIG_ARCH_INLINE_SPIN_LOCK_IRQSAVE=y
-CONFIG_ARCH_INLINE_SPIN_UNLOCK=y
-CONFIG_ARCH_INLINE_SPIN_UNLOCK_BH=y
-CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE=y
-CONFIG_ARCH_INLINE_READ_TRYLOCK=y
-CONFIG_ARCH_INLINE_READ_LOCK=y
-CONFIG_ARCH_INLINE_READ_LOCK_BH=y
-CONFIG_ARCH_INLINE_READ_LOCK_IRQ=y
-CONFIG_ARCH_INLINE_READ_LOCK_IRQSAVE=y
-CONFIG_ARCH_INLINE_READ_UNLOCK=y
-CONFIG_ARCH_INLINE_READ_UNLOCK_BH=y
-CONFIG_ARCH_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_ARCH_INLINE_READ_UNLOCK_IRQRESTORE=y
-CONFIG_ARCH_INLINE_WRITE_TRYLOCK=y
-CONFIG_ARCH_INLINE_WRITE_LOCK=y
-CONFIG_ARCH_INLINE_WRITE_LOCK_BH=y
-CONFIG_ARCH_INLINE_WRITE_LOCK_IRQ=y
-CONFIG_ARCH_INLINE_WRITE_LOCK_IRQSAVE=y
-CONFIG_ARCH_INLINE_WRITE_UNLOCK=y
-CONFIG_ARCH_INLINE_WRITE_UNLOCK_BH=y
-CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE=y
-CONFIG_INLINE_SPIN_TRYLOCK=y
-CONFIG_INLINE_SPIN_TRYLOCK_BH=y
-CONFIG_INLINE_SPIN_LOCK=y
-CONFIG_INLINE_SPIN_LOCK_BH=y
-CONFIG_INLINE_SPIN_LOCK_IRQ=y
-CONFIG_INLINE_SPIN_LOCK_IRQSAVE=y
-CONFIG_INLINE_SPIN_UNLOCK_BH=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE=y
-CONFIG_INLINE_READ_TRYLOCK=y
-CONFIG_INLINE_READ_LOCK=y
-CONFIG_INLINE_READ_LOCK_BH=y
-CONFIG_INLINE_READ_LOCK_IRQ=y
-CONFIG_INLINE_READ_LOCK_IRQSAVE=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_BH=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK_IRQRESTORE=y
-CONFIG_INLINE_WRITE_TRYLOCK=y
-CONFIG_INLINE_WRITE_LOCK=y
-CONFIG_INLINE_WRITE_LOCK_BH=y
-CONFIG_INLINE_WRITE_LOCK_IRQ=y
-CONFIG_INLINE_WRITE_LOCK_IRQSAVE=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_BH=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
-CONFIG_FREEZER=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_ARCH_BINFMT_ELF_STATE=y
-CONFIG_ELFCORE=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_SPARSEMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_MEMBLOCK_PHYS_MAP=y
-CONFIG_HAVE_FAST_GUP=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_MEMORY_ISOLATION=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_CONTIG_ALLOC=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_BOUNCE=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
-# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
-CONFIG_CMA=y
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_AREAS=7
-CONFIG_ZPOOL=m
-CONFIG_ZBUD=y
-CONFIG_Z3FOLD=m
-CONFIG_ZSMALLOC=y
-# CONFIG_PGTABLE_MAPPING is not set
-# CONFIG_ZSMALLOC_STAT is not set
-# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
-# CONFIG_READ_ONLY_THP_FOR_FS is not set
-CONFIG_ARCH_HAS_PTE_SPECIAL=y
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_EGRESS=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=m
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-CONFIG_UNIX_DIAG=m
-# CONFIG_TLS is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-CONFIG_XFRM_INTERFACE=m
-CONFIG_XFRM_SUB_POLICY=y
-CONFIG_XFRM_MIGRATE=y
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_IUCV=y
-CONFIG_AFIUCV=m
-# CONFIG_SMC is not set
-# CONFIG_XDP_SOCKETS is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE_COMMON=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-CONFIG_NET_FOU_IP_TUNNELS=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-# CONFIG_INET_ESP_OFFLOAD is not set
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-# CONFIG_INET_RAW_DIAG is not set
-CONFIG_INET_DIAG_DESTROY=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_NV=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_TCP_CONG_DCTCP=m
-CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-# CONFIG_INET6_ESP_OFFLOAD is not set
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_FOU=m
-CONFIG_IPV6_FOU_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-CONFIG_NETLABEL=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NET_PTP_CLASSIFY=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_FAMILY_BRIDGE=y
-CONFIG_NETFILTER_FAMILY_ARP=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK_OSF=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-# CONFIG_NF_LOG_NETDEV is not set
-CONFIG_NETFILTER_CONNCOUNT=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_PROCFS=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=y
-CONFIG_NF_NAT_MASQUERADE=y
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_SET=m
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_NUMGEN=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_FLOW_OFFLOAD=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CONNLIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_TUNNEL=m
-# CONFIG_NFT_OBJREF is not set
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_FIB=m
-CONFIG_NFT_FIB_INET=m
-# CONFIG_NFT_XFRM is not set
-CONFIG_NFT_SOCKET=m
-CONFIG_NFT_OSF=m
-CONFIG_NFT_TPROXY=m
-# CONFIG_NFT_SYNPROXY is not set
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_FIB_NETDEV=m
-CONFIG_NF_FLOW_TABLE_INET=m
-CONFIG_NF_FLOW_TABLE=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-# end of Core Netfilter Configuration
-
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_MH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS MH scheduler
-#
-CONFIG_IP_VS_MH_TAB_INDEX=12
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_SOCKET_IPV4=m
-CONFIG_NF_TPROXY_IPV4=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_FLOW_TABLE_IPV4=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# end of IP: Netfilter Configuration
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_SOCKET_IPV6=m
-CONFIG_NF_TPROXY_IPV6=m
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_FIB_IPV6=m
-CONFIG_NF_FLOW_TABLE_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_SRH=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-# end of IPv6: Netfilter Configuration
-
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_TABLES_BRIDGE=m
-# CONFIG_NFT_BRIDGE_META is not set
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-# CONFIG_BPFILTER is not set
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-# end of DCCP CCIDs Configuration
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-# end of DCCP Kernel Hacking
-
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-CONFIG_INET_SCTP_DIAG=m
-CONFIG_RDS=m
-CONFIG_RDS_RDMA=m
-CONFIG_RDS_TCP=m
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-CONFIG_TIPC_MEDIA_IB=y
-CONFIG_TIPC_MEDIA_UDP=y
-CONFIG_TIPC_DIAG=m
-# CONFIG_ATM is not set
-CONFIG_L2TP=m
-CONFIG_L2TP_DEBUGFS=m
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_GARP=m
-CONFIG_MRP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-# CONFIG_LLC2 is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_PHONET is not set
-# CONFIG_6LOWPAN is not set
-# CONFIG_IEEE802154 is not set
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_CBS=m
-# CONFIG_NET_SCH_ETF is not set
-# CONFIG_NET_SCH_TAPRIO is not set
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-# CONFIG_NET_SCH_SKBPRIO is not set
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-# CONFIG_NET_SCH_CAKE is not set
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-# CONFIG_NET_SCH_DEFAULT is not set
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_MATCHALL=y
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_IPT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-# CONFIG_NET_ACT_SAMPLE is not set
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-# CONFIG_NET_ACT_MPLS is not set
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_ACT_CTINFO is not set
-CONFIG_NET_ACT_SKBMOD=m
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_TUNNEL_KEY=m
-# CONFIG_NET_ACT_CT is not set
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IFE_SKBTCINDEX=m
-# CONFIG_NET_TC_SKB_EXT is not set
-CONFIG_NET_SCH_FIFO=y
-CONFIG_DCB=y
-CONFIG_DNS_RESOLVER=m
-CONFIG_BATMAN_ADV=m
-# CONFIG_BATMAN_ADV_BATMAN_V is not set
-CONFIG_BATMAN_ADV_BLA=y
-CONFIG_BATMAN_ADV_DAT=y
-CONFIG_BATMAN_ADV_NC=y
-CONFIG_BATMAN_ADV_MCAST=y
-CONFIG_BATMAN_ADV_DEBUGFS=y
-# CONFIG_BATMAN_ADV_DEBUG is not set
-CONFIG_BATMAN_ADV_SYSFS=y
-# CONFIG_BATMAN_ADV_TRACING is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_OPENVSWITCH_GENEVE=m
-# CONFIG_VSOCKETS is not set
-CONFIG_NETLINK_DIAG=m
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=y
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_NET_NSH=m
-# CONFIG_HSR is not set
-# CONFIG_NET_SWITCHDEV is not set
-CONFIG_NET_L3_MASTER_DEV=y
-CONFIG_NET_NCSI=y
-# CONFIG_NCSI_OEM_CMD_GET_MAC is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-# CONFIG_BPF_STREAM_PARSER is not set
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-# CONFIG_NET_DROP_MONITOR is not set
-# end of Network testing
-# end of Networking options
-
-# CONFIG_CAN is not set
-CONFIG_AF_RXRPC=m
-CONFIG_AF_RXRPC_IPV6=y
-# CONFIG_AF_RXRPC_INJECT_LOSS is not set
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=y
-CONFIG_AF_KCM=m
-CONFIG_STREAM_PARSER=y
-CONFIG_FIB_RULES=y
-# CONFIG_WIMAX is not set
-CONFIG_RFKILL=m
-CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_GPIO=m
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-CONFIG_NET_9P_RDMA=m
-# CONFIG_NET_9P_DEBUG is not set
-# CONFIG_CAIF is not set
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
-# CONFIG_NFC is not set
-# CONFIG_PSAMPLE is not set
-CONFIG_NET_IFE=m
-CONFIG_LWTUNNEL=y
-CONFIG_LWTUNNEL_BPF=y
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-CONFIG_NET_DEVLINK=y
-CONFIG_FAILOVER=m
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-CONFIG_HAVE_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCIEAER=y
-# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-# CONFIG_PCIE_DPC is not set
-CONFIG_PCIE_PTM=y
-# CONFIG_PCIE_BW is not set
-CONFIG_PCI_MSI=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-CONFIG_PCI_STUB=m
-CONFIG_PCI_PF_STUB=m
-CONFIG_PCI_ATS=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_SHPC=y
-CONFIG_HOTPLUG_PCI_S390=y
-
-#
-# PCI controller drivers
-#
-
-#
-# Cadence PCIe controllers support
-#
-# end of Cadence PCIe controllers support
-
-#
-# DesignWare PCI Core Support
-#
-# end of DesignWare PCI Core Support
-# end of PCI controller drivers
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-# end of PCI Endpoint
-
-#
-# PCI switch controller drivers
-#
-CONFIG_PCI_SW_SWITCHTEC=m
-# end of PCI switch controller drivers
-
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
-# CONFIG_RAPIDIO is not set
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-# CONFIG_DEVTMPFS_MOUNT is not set
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=y
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
-# end of Firmware loader
-
-CONFIG_ALLOW_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_SYS_HYPERVISOR=y
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-# end of Bus devices
-
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-# CONFIG_GNSS is not set
-CONFIG_MTD=m
-# CONFIG_MTD_TESTS is not set
-
-#
-# Partition parsers
-#
-CONFIG_MTD_AR7_PARTS=m
-# CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# end of Partition parsers
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-# CONFIG_SM_FTL is not set
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_SWAP=m
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_RAM=m
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-# end of RAM/ROM/Flash chip drivers
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_PHYSMAP is not set
-CONFIG_MTD_INTEL_VR_NOR=m
-CONFIG_MTD_PLATRAM=m
-# end of Mapping drivers for chip access
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOCG3 is not set
-# end of Self-contained MTD device drivers
-
-CONFIG_MTD_ONENAND=m
-CONFIG_MTD_ONENAND_VERIFY_WRITE=y
-# CONFIG_MTD_ONENAND_GENERIC is not set
-# CONFIG_MTD_ONENAND_OTP is not set
-CONFIG_MTD_ONENAND_2X_PROGRAM=y
-# CONFIG_MTD_RAW_NAND is not set
-
-#
-# LPDDR & LPDDR2 PCM memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-# end of LPDDR & LPDDR2 PCM memory drivers
-
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_MTD_UBI_GLUEBI is not set
-CONFIG_MTD_UBI_BLOCK=y
-# CONFIG_MTD_HYPERBUS is not set
-# CONFIG_OF is not set
-# CONFIG_PARPORT is not set
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_NULL_BLK=m
-CONFIG_CDROM=m
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_WRITEBACK is not set
-# CONFIG_ZRAM_MEMORY_TRACKING is not set
-# CONFIG_BLK_DEV_UMEM is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_SKD=m
-# CONFIG_BLK_DEV_SX8 is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=32768
-# CONFIG_CDROM_PKTCDVD is not set
-CONFIG_ATA_OVER_ETH=m
-
-#
-# S/390 block device drivers
-#
-CONFIG_BLK_DEV_XPRAM=m
-CONFIG_DCSSBLK=m
-CONFIG_DASD=m
-CONFIG_DASD_PROFILE=y
-CONFIG_DASD_ECKD=m
-CONFIG_DASD_FBA=m
-CONFIG_DASD_DIAG=m
-CONFIG_DASD_EER=y
-CONFIG_SCM_BLOCK=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_VIRTIO_BLK_SCSI is not set
-CONFIG_BLK_DEV_RBD=m
-CONFIG_BLK_DEV_RSXX=m
-
-#
-# NVME Support
-#
-CONFIG_NVME_CORE=m
-CONFIG_BLK_DEV_NVME=m
-CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_FABRICS=m
-CONFIG_NVME_RDMA=m
-# CONFIG_NVME_FC is not set
-# CONFIG_NVME_TCP is not set
-CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_LOOP=m
-CONFIG_NVME_TARGET_RDMA=m
-# CONFIG_NVME_TARGET_FC is not set
-# CONFIG_NVME_TARGET_TCP is not set
-# end of NVME Support
-
-#
-# Misc devices
-#
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_SRAM is not set
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_XILINX_SDFEC is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_93CX6=m
-# end of EEPROM support
-
-# CONFIG_CB710_CORE is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_TI_ST is not set
-# end of Texas Instruments shared transport line discipline
-
-#
-# Altera FPGA firmware download module (requires I2C)
-#
-
-#
-# Intel MIC & related support
-#
-
-#
-# Intel MIC Bus Driver
-#
-
-#
-# SCIF Bus Driver
-#
-
-#
-# VOP Bus Driver
-#
-# CONFIG_VOP_BUS is not set
-
-#
-# Intel MIC Host Driver
-#
-
-#
-# Intel MIC Card Driver
-#
-
-#
-# SCIF Driver
-#
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-
-#
-# VOP Driver
-#
-# end of Intel MIC & related support
-
-# CONFIG_GENWQE is not set
-# CONFIG_ECHO is not set
-# CONFIG_MISC_ALCOR_PCI is not set
-# CONFIG_MISC_RTSX_PCI is not set
-# CONFIG_HABANA_AI is not set
-# end of Misc devices
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-# end of SCSI Transports
-
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-# CONFIG_SCSI_CXGB3_ISCSI is not set
-# CONFIG_SCSI_CXGB4_ISCSI is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_SCSI_BNX2X_FCOE is not set
-# CONFIG_BE2ISCSI is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_HPSA is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVUMI is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_ESAS2R is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_MPT3SAS is not set
-# CONFIG_SCSI_MPT2SAS is not set
-# CONFIG_SCSI_UFSHCD is not set
-CONFIG_SCSI_HPTIOP=m
-# CONFIG_SCSI_MYRB is not set
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_SCSI_SNIC=m
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_FDOMAIN_PCI is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-CONFIG_SCSI_STEX=m
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_AM53C974 is not set
-# CONFIG_SCSI_WD719X is not set
-CONFIG_SCSI_DEBUG=m
-CONFIG_ZFCP=m
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_VIRTIO=m
-CONFIG_SCSI_CHELSIO_FCOE=m
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-CONFIG_SCSI_DH=y
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-# end of SCSI device support
-
-# CONFIG_ATA is not set
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-# CONFIG_MD_CLUSTER is not set
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_UNSTRIPED=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_WRITECACHE=m
-CONFIG_DM_ERA=m
-# CONFIG_DM_CLONE is not set
-CONFIG_DM_MIRROR=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-# CONFIG_DM_DUST is not set
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
-CONFIG_DM_VERITY_FEC=y
-CONFIG_DM_SWITCH=m
-CONFIG_DM_LOG_WRITES=m
-CONFIG_DM_INTEGRITY=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_TCM_USER2=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_NOSY is not set
-# end of IEEE 1394 (FireWire) support
-
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-# CONFIG_NET_FC is not set
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=m
-# CONFIG_IPVTAP is not set
-CONFIG_VXLAN=m
-CONFIG_GENEVE=m
-# CONFIG_GTP is not set
-CONFIG_MACSEC=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_TUN=m
-CONFIG_TAP=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_NET_VRF=m
-# CONFIG_ARCNET is not set
-
-#
-# CAIF transport drivers
-#
-CONFIG_ETHERNET=y
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
-# CONFIG_NET_VENDOR_AGERE is not set
-CONFIG_NET_VENDOR_ALACRITECH=y
-# CONFIG_SLICOSS is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
-# CONFIG_ALTERA_TSE is not set
-# CONFIG_NET_VENDOR_AMAZON is not set
-# CONFIG_NET_VENDOR_AMD is not set
-CONFIG_NET_VENDOR_AQUANTIA=y
-# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_VENDOR_AURORA is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
-# CONFIG_NET_VENDOR_CADENCE is not set
-# CONFIG_NET_VENDOR_CAVIUM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CISCO is not set
-# CONFIG_NET_VENDOR_CORTINA is not set
-# CONFIG_DNET is not set
-# CONFIG_NET_VENDOR_DEC is not set
-# CONFIG_NET_VENDOR_DLINK is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_BE2NET_BE2=y
-CONFIG_BE2NET_BE3=y
-CONFIG_BE2NET_LANCER=y
-CONFIG_BE2NET_SKYHAWK=y
-# CONFIG_NET_VENDOR_EZCHIP is not set
-CONFIG_NET_VENDOR_FUJITSU=y
-# CONFIG_PCMCIA_FMVJ18X is not set
-CONFIG_NET_VENDOR_GOOGLE=y
-# CONFIG_GVE is not set
-# CONFIG_NET_VENDOR_HP is not set
-CONFIG_NET_VENDOR_HUAWEI=y
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_JME is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-# CONFIG_MLX4_EN is not set
-CONFIG_MLX4_CORE=m
-# CONFIG_MLX4_DEBUG is not set
-# CONFIG_MLX4_CORE_GEN2 is not set
-# CONFIG_MLX5_CORE is not set
-# CONFIG_MLXSW_CORE is not set
-# CONFIG_MLXFW is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-CONFIG_NET_VENDOR_MICROCHIP=y
-# CONFIG_LAN743X is not set
-# CONFIG_NET_VENDOR_MICROSEMI is not set
-# CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_NETERION is not set
-# CONFIG_NET_VENDOR_NETRONOME is not set
-# CONFIG_NET_VENDOR_NI is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
-# CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_ETHOC is not set
-# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
-CONFIG_NET_VENDOR_PENSANDO=y
-# CONFIG_IONIC is not set
-# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_QUALCOMM is not set
-# CONFIG_NET_VENDOR_RDC is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
-# CONFIG_NET_VENDOR_RENESAS is not set
-# CONFIG_NET_VENDOR_ROCKER is not set
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-CONFIG_NET_VENDOR_SOLARFLARE=y
-# CONFIG_SFC is not set
-# CONFIG_SFC_FALCON is not set
-# CONFIG_NET_VENDOR_SILAN is not set
-# CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_SOCIONEXT is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SUN is not set
-# CONFIG_NET_VENDOR_SYNOPSYS is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_NET_VENDOR_TI is not set
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-CONFIG_NET_VENDOR_XIRCOM=y
-# CONFIG_PCMCIA_XIRC2PS is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_MDIO_DEVICE=m
-CONFIG_MDIO_BUS=m
-# CONFIG_MDIO_BCM_UNIMAC is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MDIO_MSCC_MIIM is not set
-# CONFIG_MDIO_THUNDER is not set
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-# CONFIG_ADIN_PHY is not set
-CONFIG_AMD_PHY=m
-CONFIG_AQUANTIA_PHY=m
-# CONFIG_AX88796B_PHY is not set
-CONFIG_AT803X_PHY=m
-# CONFIG_BCM7XXX_PHY is not set
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_CICADA_PHY=m
-# CONFIG_CORTINA_PHY is not set
-CONFIG_DAVICOM_PHY=m
-# CONFIG_DP83822_PHY is not set
-# CONFIG_DP83TC811_PHY is not set
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-# CONFIG_FIXED_PHY is not set
-CONFIG_ICPLUS_PHY=m
-CONFIG_INTEL_XWAY_PHY=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_MARVELL_PHY=m
-# CONFIG_MARVELL_10G_PHY is not set
-CONFIG_MICREL_PHY=m
-CONFIG_MICROCHIP_PHY=m
-# CONFIG_MICROCHIP_T1_PHY is not set
-CONFIG_MICROSEMI_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_REALTEK_PHY=m
-# CONFIG_RENESAS_PHY is not set
-# CONFIG_ROCKCHIP_PHY is not set
-CONFIG_SMSC_PHY=m
-CONFIG_STE10XP=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_VITESSE_PHY=m
-# CONFIG_XILINX_GMII2RGMII is not set
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-# CONFIG_PPP_FILTER is not set
-CONFIG_PPP_MPPE=m
-# CONFIG_PPP_MULTILINK is not set
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-# CONFIG_SLIP is not set
-CONFIG_SLHC=m
-
-#
-# S/390 network device drivers
-#
-CONFIG_LCS=m
-CONFIG_CTCM=m
-CONFIG_NETIUCV=m
-CONFIG_SMSGIUCV=m
-CONFIG_SMSGIUCV_EVENT=m
-CONFIG_QETH=m
-CONFIG_QETH_L2=m
-CONFIG_QETH_L3=m
-CONFIG_CCWGROUP=m
-# end of S/390 network device drivers
-
-#
-# Host-side USB support is needed for USB Network Adapter support
-#
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
-# CONFIG_WAN is not set
-# CONFIG_VMXNET3 is not set
-# CONFIG_NETDEVSIM is not set
-CONFIG_NET_FAILOVER=m
-# CONFIG_NVM is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_MATRIXKMAP is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-CONFIG_INPUT_EVBUG=m
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-# CONFIG_RMI4_CORE is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_LIBPS2 is not set
-# CONFIG_SERIO_RAW is not set
-# CONFIG_SERIO_ALTERA_PS2 is not set
-# CONFIG_SERIO_PS2MULT is not set
-# CONFIG_SERIO_ARC_PS2 is not set
-# CONFIG_SERIO_GPIO_PS2 is not set
-# CONFIG_USERIO is not set
-# CONFIG_GAMEPORT is not set
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-CONFIG_NOZOMI=m
-CONFIG_N_GSM=m
-CONFIG_TRACE_ROUTER=m
-CONFIG_TRACE_SINK=m
-# CONFIG_NULL_TTY is not set
-# CONFIG_LDISC_AUTOLOAD is not set
-CONFIG_DEVMEM=y
-CONFIG_DEVKMEM=y
-
-#
-# Serial drivers
-#
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_CORE=m
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_ARC is not set
-CONFIG_SERIAL_RP2=m
-CONFIG_SERIAL_RP2_NR_UARTS=32
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_FSL_LINFLEXUART is not set
-# end of Serial drivers
-
-# CONFIG_SERIAL_DEV_BUS is not set
-CONFIG_TTY_PRINTK=m
-CONFIG_TTY_PRINTK_LEVEL=6
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IUCV=y
-CONFIG_VIRTIO_CONSOLE=y
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_HW_RANDOM=m
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_S390=m
-# CONFIG_APPLICOM is not set
-
-#
-# PCMCIA character devices
-#
-# CONFIG_SYNCLINK_CS is not set
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
-# CONFIG_SCR24X is not set
-# CONFIG_IPWIRELESS is not set
-# end of PCMCIA character devices
-
-# CONFIG_RAW_DRIVER is not set
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_HW_RANDOM_TPM=y
-# CONFIG_TCG_VTPM_PROXY is not set
-CONFIG_DEVPORT=y
-
-#
-# S/390 character device drivers
-#
-CONFIG_TN3270=y
-CONFIG_TN3270_TTY=y
-CONFIG_TN3270_FS=y
-CONFIG_TN3270_CONSOLE=y
-CONFIG_TN3215=y
-CONFIG_TN3215_CONSOLE=y
-CONFIG_CCW_CONSOLE=y
-CONFIG_SCLP_TTY=y
-CONFIG_SCLP_CONSOLE=y
-CONFIG_SCLP_VT220_TTY=y
-CONFIG_SCLP_VT220_CONSOLE=y
-CONFIG_HMC_DRV=m
-CONFIG_SCLP_OFB=y
-CONFIG_S390_TAPE=m
-
-#
-# S/390 tape hardware support
-#
-CONFIG_S390_TAPE_34XX=m
-CONFIG_S390_TAPE_3590=m
-CONFIG_VMLOGRDR=m
-CONFIG_VMCP=y
-CONFIG_VMCP_CMA_SIZE=4
-CONFIG_MONREADER=m
-CONFIG_MONWRITER=m
-CONFIG_S390_VMUR=m
-# CONFIG_XILLYBUS is not set
-# end of Character devices
-
-CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-# end of I2C support
-
-# CONFIG_I3C is not set
-# CONFIG_SPI is not set
-# CONFIG_SPMI is not set
-# CONFIG_HSI is not set
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-# CONFIG_PPS_CLIENT_LDISC is not set
-# CONFIG_PPS_CLIENT_GPIO is not set
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=m
-# CONFIG_DP83640_PHY is not set
-# end of PTP clock support
-
-# CONFIG_PINCTRL is not set
-CONFIG_GPIOLIB=y
-CONFIG_GPIOLIB_FASTPATH_LIMIT=512
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-
-#
-# Memory mapped GPIO drivers
-#
-# CONFIG_GPIO_DWAPB is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_MB86S7X is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GPIO_AMD_FCH is not set
-# end of Memory mapped GPIO drivers
-
-#
-# MFD GPIO expanders
-#
-# end of MFD GPIO expanders
-
-#
-# PCI GPIO expanders
-#
-# CONFIG_GPIO_BT8XX is not set
-# CONFIG_GPIO_PCI_IDIO_16 is not set
-# CONFIG_GPIO_PCIE_IDIO_24 is not set
-# CONFIG_GPIO_RDC321X is not set
-# end of PCI GPIO expanders
-
-# CONFIG_GPIO_MOCKUP is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_AVS is not set
-# CONFIG_POWER_RESET is not set
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_HWMON is not set
-# CONFIG_THERMAL is not set
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
-CONFIG_WATCHDOG_OPEN_TIMEOUT=0
-CONFIG_WATCHDOG_SYSFS=y
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-# CONFIG_XILINX_WATCHDOG is not set
-# CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_DW_WATCHDOG is not set
-# CONFIG_MAX63XX_WATCHDOG is not set
-# CONFIG_ALIM7101_WDT is not set
-# CONFIG_I6300ESB_WDT is not set
-# CONFIG_MEN_A21_WDT is not set
-CONFIG_DIAG288_WATCHDOG=m
-
-#
-# PCI-based Watchdog Cards
-#
-# CONFIG_PCIPCWATCHDOG is not set
-# CONFIG_WDTPCI is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB is not set
-CONFIG_BCMA_POSSIBLE=y
-# CONFIG_BCMA is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_MADERA is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_LPC_ICH is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_SYSCON is not set
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_TQMX86 is not set
-# CONFIG_MFD_VX855 is not set
-# end of Multifunction device drivers
-
-# CONFIG_REGULATOR is not set
-CONFIG_RC_CORE=y
-CONFIG_RC_MAP=y
-# CONFIG_LIRC is not set
-# CONFIG_RC_DECODERS is not set
-# CONFIG_RC_DEVICES is not set
-# CONFIG_MEDIA_SUPPORT is not set
-
-#
-# Graphics support
-#
-# CONFIG_DRM is not set
-# CONFIG_DRM_DP_CEC is not set
-
-#
-# ARM devices
-#
-# end of ARM devices
-
-#
-# ACP (Audio CoProcessor) Configuration
-#
-# end of ACP (Audio CoProcessor) Configuration
-
-#
-# Frame buffer Devices
-#
-# CONFIG_FB is not set
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
-# end of Backlight & LCD device support
-
-#
-# Console display driver support
-#
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-# end of Console display driver support
-# end of Graphics support
-
-# CONFIG_SOUND is not set
-
-#
-# HID support
-#
-# CONFIG_HID is not set
-# end of HID support
-
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_MMC is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_NEW_LEDS is not set
-# CONFIG_ACCESSIBILITY is not set
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
-# CONFIG_INFINIBAND_MTHCA is not set
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_INFINIBAND_OCRDMA=m
-# CONFIG_INFINIBAND_BNXT_RE is not set
-CONFIG_RDMA_RXE=m
-# CONFIG_RDMA_SIW is not set
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SRPT=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_ISERT=m
-# CONFIG_DMADEVICES is not set
-
-#
-# DMABUF options
-#
-CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
-# CONFIG_DMABUF_SELFTESTS is not set
-# end of DMABUF options
-
-# CONFIG_AUXDISPLAY is not set
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-# CONFIG_UIO_PDRV_GENIRQ is not set
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-# CONFIG_UIO_PRUSS is not set
-CONFIG_UIO_MF624=m
-# CONFIG_VFIO is not set
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-# CONFIG_VIRTIO_MMIO is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-# end of Microsoft Hyper-V guest support
-
-# CONFIG_GREYBUS is not set
-# CONFIG_STAGING is not set
-# CONFIG_HWSPINLOCK is not set
-
-#
-# Clock Source drivers
-#
-# end of Clock Source drivers
-
-# CONFIG_MAILBOX is not set
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-# end of Generic IOMMU Pagetable Support
-
-# CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_S390_IOMMU=y
-# CONFIG_S390_CCW_IOMMU is not set
-# CONFIG_S390_AP_IOMMU is not set
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-CONFIG_RPMSG=m
-# CONFIG_RPMSG_CHAR is not set
-CONFIG_RPMSG_VIRTIO=m
-# end of Rpmsg drivers
-
-#
-# SOC (System On Chip) specific Drivers
-#
-
-#
-# Amlogic SoC drivers
-#
-# end of Amlogic SoC drivers
-
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-# end of i.MX SoC drivers
-
-#
-# Qualcomm SoC drivers
-#
-# end of Qualcomm SoC drivers
-
-# CONFIG_SOC_TI is not set
-
-#
-# Xilinx SoC drivers
-#
-# CONFIG_XILINX_VCU is not set
-# end of Xilinx SoC drivers
-# end of SOC (System On Chip) specific Drivers
-
-# CONFIG_PM_DEVFREQ is not set
-# CONFIG_EXTCON is not set
-# CONFIG_MEMORY is not set
-# CONFIG_IIO is not set
-# CONFIG_NTB is not set
-# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
-
-#
-# IRQ chip support
-#
-# end of IRQ chip support
-
-# CONFIG_IPACK_BUS is not set
-# CONFIG_RESET_CONTROLLER is not set
-
-#
-# PHY Subsystem
-#
-# CONFIG_GENERIC_PHY is not set
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# end of PHY Subsystem
-
-# CONFIG_POWERCAP is not set
-# CONFIG_MCB is not set
-
-#
-# Performance monitor support
-#
-# end of Performance monitor support
-
-CONFIG_RAS=y
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-# end of Android
-
-# CONFIG_LIBNVDIMM is not set
-CONFIG_DAX_DRIVER=y
-CONFIG_DAX=y
-CONFIG_DEV_DAX=m
-CONFIG_DEV_DAX_KMEM=m
-# CONFIG_NVMEM is not set
-
-#
-# HW tracing support
-#
-CONFIG_STM=m
-# CONFIG_STM_PROTO_BASIC is not set
-# CONFIG_STM_PROTO_SYS_T is not set
-CONFIG_STM_DUMMY=m
-CONFIG_STM_SOURCE_CONSOLE=m
-CONFIG_STM_SOURCE_HEARTBEAT=m
-# CONFIG_STM_SOURCE_FTRACE is not set
-# CONFIG_INTEL_TH is not set
-# end of HW tracing support
-
-# CONFIG_FPGA is not set
-# CONFIG_SIOX is not set
-# CONFIG_SLIMBUS is not set
-# CONFIG_INTERCONNECT is not set
-# CONFIG_COUNTER is not set
-# end of Device Drivers
-
-#
-# File systems
-#
-# CONFIG_VALIDATE_FS_PARSER is not set
-CONFIG_FS_IOMAP=y
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_USE_FOR_EXT2=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=y
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-CONFIG_XFS_ONLINE_SCRUB=y
-# CONFIG_XFS_ONLINE_REPAIR is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_FS_REF_VERIFY is not set
-CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-CONFIG_F2FS_FS_SECURITY=y
-# CONFIG_F2FS_CHECK_FS is not set
-# CONFIG_F2FS_IO_TRACE is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-CONFIG_FS_DAX=y
-CONFIG_FS_DAX_LIMITED=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_EXPORTFS_BLOCK_OPS=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_MANDATORY_FILE_LOCKING is not set
-CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_FANOTIFY=y
-# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_PRINT_QUOTA_WARNING=y
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_AUTOFS_FS=m
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_VIRTIO_FS=m
-CONFIG_OVERLAY_FS=m
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
-# CONFIG_OVERLAY_FS_INDEX is not set
-# CONFIG_OVERLAY_FS_XINO_AUTO is not set
-# CONFIG_OVERLAY_FS_METACOPY is not set
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
-# CONFIG_FSCACHE_DEBUG is not set
-CONFIG_FSCACHE_OBJECT_LIST=y
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_FAT_DEFAULT_UTF8 is not set
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-# end of DOS/FAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_PROC_CHILDREN=y
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
-CONFIG_CONFIGFS_FS=m
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_ORANGEFS_FS=m
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-CONFIG_ECRYPT_FS=m
-CONFIG_ECRYPT_FS_MESSAGING=y
-# CONFIG_HFS_FS is not set
-CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-# CONFIG_UBIFS_FS is not set
-# CONFIG_CRAMFS is not set
-CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_FILE_CACHE=y
-# CONFIG_SQUASHFS_FILE_DIRECT is not set
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-# CONFIG_SQUASHFS_LZ4 is not set
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZSTD is not set
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_PSTORE is not set
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-# CONFIG_EROFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
-CONFIG_NFS_SWAP=y
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
-# CONFIG_NFS_V4_1_MIGRATION is not set
-CONFIG_NFS_V4_SECURITY_LABEL=y
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFS_DEBUG=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_BLOCKLAYOUT=y
-CONFIG_NFSD_SCSILAYOUT=y
-CONFIG_NFSD_FLEXFILELAYOUT=y
-CONFIG_NFSD_V4_SECURITY_LABEL=y
-CONFIG_GRACE_PERIOD=m
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_SUNRPC_SWAP=y
-CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
-CONFIG_SUNRPC_DEBUG=y
-CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CEPH_FS_POSIX_ACL=y
-# CONFIG_CEPH_FS_SECURITY_LABEL is not set
-CONFIG_CIFS=m
-CONFIG_CIFS_STATS2=y
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-CONFIG_CIFS_WEAK_PW_HASH=y
-CONFIG_CIFS_UPCALL=y
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_DEBUG=y
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
-CONFIG_CIFS_DFS_UPCALL=y
-# CONFIG_CIFS_SMB_DIRECT is not set
-CONFIG_CIFS_FSCACHE=y
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-# CONFIG_9P_FS_SECURITY is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-# CONFIG_UNICODE is not set
-# end of File systems
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_COMPAT=y
-# CONFIG_KEYS_REQUEST_CACHE is not set
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=y
-CONFIG_KEY_DH_OPERATIONS=y
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_INFINIBAND is not set
-CONFIG_SECURITY_NETWORK_XFRM=y
-CONFIG_SECURITY_PATH=y
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_HARDENED_USERCOPY_FALLBACK=y
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
-CONFIG_FORTIFY_SOURCE=y
-# CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-# CONFIG_SECURITY_APPARMOR is not set
-# CONFIG_SECURITY_LOADPIN is not set
-CONFIG_SECURITY_YAMA=y
-# CONFIG_SECURITY_SAFESETID is not set
-# CONFIG_SECURITY_LOCKDOWN_LSM is not set
-CONFIG_INTEGRITY=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
-CONFIG_INTEGRITY_AUDIT=y
-# CONFIG_IMA is not set
-# CONFIG_EVM is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=m
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_KPP=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ENGINE=m
-
-#
-# Public-key cryptography
-#
-# CONFIG_CRYPTO_RSA is not set
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECC=m
-CONFIG_CRYPTO_ECDH=m
-# CONFIG_CRYPTO_ECRDSA is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CFB=m
-CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=m
-# CONFIG_CRYPTO_OFB is not set
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m
-# CONFIG_CRYPTO_ADIANTUM is not set
-CONFIG_CRYPTO_ESSIV=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32=m
-# CONFIG_CRYPTO_XXHASH is not set
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_LZO=m
-# CONFIG_CRYPTO_842 is not set
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-CONFIG_CRYPTO_ZSTD=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=y
-CONFIG_CRYPTO_DRBG_HMAC=y
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-CONFIG_CRYPTO_DRBG=y
-CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
-CONFIG_CRYPTO_HASH_INFO=y
-CONFIG_CRYPTO_HW=y
-CONFIG_ZCRYPT=m
-CONFIG_ZCRYPT_MULTIDEVNODES=y
-CONFIG_PKEY=m
-CONFIG_CRYPTO_PAES_S390=m
-CONFIG_CRYPTO_SHA1_S390=m
-CONFIG_CRYPTO_SHA256_S390=m
-CONFIG_CRYPTO_SHA512_S390=m
-# CONFIG_CRYPTO_SHA3_256_S390 is not set
-# CONFIG_CRYPTO_SHA3_512_S390 is not set
-CONFIG_CRYPTO_DES_S390=m
-CONFIG_CRYPTO_AES_S390=m
-CONFIG_S390_PRNG=m
-CONFIG_CRYPTO_GHASH_S390=m
-CONFIG_CRYPTO_CRC32_S390=m
-# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
-CONFIG_CRYPTO_DEV_VIRTIO=m
-# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
-CONFIG_ASYMMETRIC_KEY_TYPE=y
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
-# CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE is not set
-CONFIG_X509_CERTIFICATE_PARSER=m
-# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set
-CONFIG_PKCS7_MESSAGE_PARSER=m
-
-#
-# Certificates for signature checking
-#
-# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-# end of Certificates for signature checking
-
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_RAID6_PQ_BENCHMARK=y
-# CONFIG_PACKING is not set
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_CORDIC=m
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_CRC_CCITT=y
-CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=m
-# CONFIG_CRC4 is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_XXHASH=y
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_COMPRESS=m
-CONFIG_ZSTD_DECOMPRESS=m
-CONFIG_XZ_DEC=y
-# CONFIG_XZ_DEC_X86 is not set
-# CONFIG_XZ_DEC_POWERPC is not set
-# CONFIG_XZ_DEC_IA64 is not set
-# CONFIG_XZ_DEC_ARM is not set
-# CONFIG_XZ_DEC_ARMTHUMB is not set
-# CONFIG_XZ_DEC_SPARC is not set
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_INTERVAL_TREE=y
-CONFIG_XARRAY_MULTI=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_DMA=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
-CONFIG_DMA_VIRT_OPS=y
-CONFIG_SWIOTLB=y
-# CONFIG_DMA_CMA is not set
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_IOMMU_HELPER=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
-CONFIG_CLZ_TAB=y
-CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=y
-CONFIG_DIMLIB=y
-CONFIG_OID_REGISTRY=m
-CONFIG_SG_POOL=y
-CONFIG_ARCH_STACKWALK=y
-CONFIG_SBITMAP=y
-# CONFIG_STRING_SELFTEST is not set
-# end of Library routines
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-# CONFIG_PRINTK_CALLER is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=3
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_DYNAMIC_DEBUG is not set
-# end of printk and dmesg options
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1280
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_INSTALL is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# end of Compile-time checks and compiler options
-
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_MAGIC_SYSRQ_SERIAL=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_OWNER is not set
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=16000
-# CONFIG_DEBUG_KMEMLEAK_TEST is not set
-CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
-CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN=y
-# CONFIG_DEBUG_STACK_USAGE is not set
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_VM_VMACACHE=y
-CONFIG_DEBUG_VM_RB=y
-# CONFIG_DEBUG_VM_PGFLAGS is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_ARCH_KASAN=y
-CONFIG_CC_HAS_KASAN_GENERIC=y
-# CONFIG_KASAN is not set
-CONFIG_KASAN_STACK=1
-# end of Memory Debugging
-
-CONFIG_ARCH_HAS_KCOV=y
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
-CONFIG_DEBUG_SHIRQ=y
-
-#
-# Debug Lockups and Hangs
-#
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_WQ_WATCHDOG is not set
-# end of Debug Lockups and Hangs
-
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-CONFIG_SCHEDSTATS=y
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-# end of Lock Debugging (spinlocks, mutexes, etc...)
-
-CONFIG_STACKTRACE=y
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# end of RCU Debugging
-
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_LATENCYTOP=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_FENTRY=y
-CONFIG_HAVE_NOP_MCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_PREEMPTIRQ_EVENTS is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_KPROBE_EVENTS=y
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_FTRACE_STARTUP_TEST is not set
-CONFIG_TRACING_MAP=y
-CONFIG_HIST_TRIGGERS=y
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_RUNTIME_TESTING_MENU is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-# CONFIG_SAMPLES is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_IO_STRICT_DEVMEM=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_S390_PTDUMP=y
-CONFIG_EARLY_PRINTK=y
-# end of Kernel hacking
diff --git a/main/linux-lts/config-lts.x86 b/main/linux-lts/config-lts.x86
deleted file mode 100644
index c7fd66344c4..00000000000
--- a/main/linux-lts/config-lts.x86
+++ /dev/null
@@ -1,8563 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.23 Kernel Configuration
-#
-
-#
-# Compiler: gcc (Alpine 9.2.0) 9.2.0
-#
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-CONFIG_THREAD_INFO_IN_TASK=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-# CONFIG_HEADER_TEST is not set
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT=""
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-# CONFIG_CROSS_MEMORY_ATTACH is not set
-# CONFIG_USELIB is not set
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
-CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
-# end of IRQ subsystem
-
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_ARCH_CLOCKSOURCE_INIT=y
-CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-# end of Timers subsystem
-
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-CONFIG_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_SCHED_AVG_IRQ=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_PSI=y
-CONFIG_PSI_DEFAULT_DISABLED=y
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-CONFIG_IKCONFIG=m
-CONFIG_IKCONFIG_PROC=y
-# CONFIG_IKHEADERS is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-
-#
-# Scheduler features
-#
-# CONFIG_UCLAMP_TASK is not set
-# end of Scheduler features
-
-CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
-CONFIG_CGROUPS=y
-# CONFIG_MEMCG is not set
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-# CONFIG_CFS_BANDWIDTH is not set
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
-CONFIG_CGROUP_FREEZER=y
-# CONFIG_CPUSETS is not set
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-# CONFIG_CGROUP_PERF is not set
-CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-# CONFIG_CHECKPOINT_RESTORE is not set
-CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_MULTIUSER=y
-# CONFIG_SGETMASK_SYSCALL is not set
-# CONFIG_SYSFS_SYSCALL is not set
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_FHANDLE=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
-# CONFIG_USERFAULTFD is not set
-CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-# CONFIG_PC104 is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_SLAB_FREELIST_RANDOM=y
-# CONFIG_SLAB_FREELIST_HARDENED is not set
-# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_SYSTEM_DATA_VERIFICATION=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-# end of General setup
-
-# CONFIG_64BIT is not set
-CONFIG_X86_32=y
-CONFIG_FORCE_DYNAMIC_FTRACE=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf32-i386"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_BITS_MAX=16
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_BUG=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_X86_32_SMP=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=2
-CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
-
-#
-# Processor type and features
-#
-CONFIG_ZONE_DMA=y
-CONFIG_SMP=y
-CONFIG_X86_FEATURE_NAMES=y
-CONFIG_X86_MPPARSE=y
-# CONFIG_GOLDFISH is not set
-CONFIG_RETPOLINE=y
-# CONFIG_X86_CPU_RESCTRL is not set
-CONFIG_X86_BIGSMP=y
-CONFIG_X86_EXTENDED_PLATFORM=y
-# CONFIG_X86_GOLDFISH is not set
-# CONFIG_X86_INTEL_MID is not set
-CONFIG_X86_INTEL_LPSS=y
-CONFIG_X86_AMD_PLATFORM_DEVICE=y
-CONFIG_IOSF_MBI=y
-# CONFIG_IOSF_MBI_DEBUG is not set
-# CONFIG_X86_RDC321X is not set
-# CONFIG_X86_32_NON_STANDARD is not set
-# CONFIG_X86_32_IRIS is not set
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_DEBUG is not set
-# CONFIG_PARAVIRT_SPINLOCKS is not set
-CONFIG_X86_HV_CALLBACK_VECTOR=y
-CONFIG_KVM_GUEST=y
-CONFIG_ARCH_CPUIDLE_HALTPOLL=y
-# CONFIG_PVH is not set
-# CONFIG_KVM_DEBUG_FS is not set
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_M486 is not set
-CONFIG_M586=y
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MELAN is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_X86_GENERIC=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_F00F_BUG=y
-CONFIG_X86_ALIGNMENT_16=y
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=4
-# CONFIG_PROCESSOR_SELECT is not set
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_CYRIX_32=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_HYGON=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
-CONFIG_CPU_SUP_ZHAOXIN=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_NR_CPUS_RANGE_BEGIN=2
-CONFIG_NR_CPUS_RANGE_END=64
-CONFIG_NR_CPUS_DEFAULT=32
-CONFIG_NR_CPUS=64
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_MC_PRIO=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
-# CONFIG_X86_MCE is not set
-
-#
-# Performance monitoring
-#
-CONFIG_PERF_EVENTS_INTEL_UNCORE=y
-CONFIG_PERF_EVENTS_INTEL_RAPL=m
-CONFIG_PERF_EVENTS_INTEL_CSTATE=m
-CONFIG_PERF_EVENTS_AMD_POWER=m
-# end of Performance monitoring
-
-# CONFIG_X86_LEGACY_VM86 is not set
-# CONFIG_X86_16BIT is not set
-CONFIG_TOSHIBA=m
-CONFIG_I8K=m
-CONFIG_X86_REBOOTFIXUPS=y
-CONFIG_MICROCODE=y
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_3G_OPT is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_HIGHMEM=y
-# CONFIG_X86_CPA_STATISTICS is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ILLEGAL_POINTER_VALUE=0
-# CONFIG_HIGHPTE is not set
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW=64
-CONFIG_MATH_EMULATION=y
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
-CONFIG_X86_INTEL_UMIP=y
-# CONFIG_X86_INTEL_TSX_MODE_OFF is not set
-# CONFIG_X86_INTEL_TSX_MODE_ON is not set
-CONFIG_X86_INTEL_TSX_MODE_AUTO=y
-CONFIG_EFI=y
-CONFIG_EFI_STUB=y
-CONFIG_SECCOMP=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-CONFIG_HZ_300=y
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=300
-CONFIG_SCHED_HRTICK=y
-# CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_MODIFY_LDT_SYSCALL=y
-# end of Processor type and features
-
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_CLK=y
-CONFIG_PM_GENERIC_DOMAINS=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-# CONFIG_ENERGY_MODEL is not set
-CONFIG_ARCH_SUPPORTS_ACPI=y
-CONFIG_ACPI=y
-CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
-CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
-CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
-# CONFIG_ACPI_DEBUGGER is not set
-CONFIG_ACPI_SPCR_TABLE=y
-CONFIG_ACPI_SLEEP=y
-# CONFIG_ACPI_PROCFS_POWER is not set
-CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
-CONFIG_ACPI_EC_DEBUGFS=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_TAD=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_CPU_FREQ_PSS=y
-CONFIG_ACPI_PROCESSOR_CSTATE=y
-CONFIG_ACPI_PROCESSOR_IDLE=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
-CONFIG_ACPI_THERMAL=m
-CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
-CONFIG_ACPI_TABLE_UPGRADE=y
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HOTPLUG_IOAPIC=y
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=m
-# CONFIG_ACPI_CUSTOM_METHOD is not set
-# CONFIG_ACPI_BGRT is not set
-# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
-CONFIG_HAVE_ACPI_APEI=y
-CONFIG_HAVE_ACPI_APEI_NMI=y
-CONFIG_ACPI_APEI=y
-# CONFIG_ACPI_APEI_GHES is not set
-# CONFIG_ACPI_APEI_PCIEAER is not set
-# CONFIG_ACPI_APEI_EINJ is not set
-CONFIG_ACPI_APEI_ERST_DEBUG=y
-CONFIG_DPTF_POWER=m
-CONFIG_ACPI_WATCHDOG=y
-CONFIG_PMIC_OPREGION=y
-# CONFIG_CHT_DC_TI_PMIC_OPREGION is not set
-CONFIG_ACPI_CONFIGFS=m
-CONFIG_X86_PM_TIMER=y
-# CONFIG_SFI is not set
-# CONFIG_APM is not set
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-
-#
-# CPU frequency scaling drivers
-#
-CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ_CPB=y
-# CONFIG_X86_POWERNOW_K6 is not set
-# CONFIG_X86_POWERNOW_K7 is not set
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-# CONFIG_X86_GX_SUSPMOD is not set
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-# CONFIG_X86_SPEEDSTEP_ICH is not set
-# CONFIG_X86_SPEEDSTEP_SMI is not set
-CONFIG_X86_P4_CLOCKMOD=m
-# CONFIG_X86_CPUFREQ_NFORCE2 is not set
-# CONFIG_X86_LONGRUN is not set
-# CONFIG_X86_LONGHAUL is not set
-CONFIG_X86_E_POWERSAVER=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-# end of CPU Frequency scaling
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
-# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set
-CONFIG_HALTPOLL_CPUIDLE=y
-# end of CPU Idle
-
-CONFIG_INTEL_IDLE=y
-# end of Power management and ACPI options
-
-#
-# Bus options (PCI etc.)
-#
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_CNB20LE_QUIRK=y
-# CONFIG_ISA_BUS is not set
-CONFIG_ISA_DMA_API=y
-# CONFIG_ISA is not set
-CONFIG_SCx200=m
-CONFIG_SCx200HR_TIMER=m
-# CONFIG_OLPC is not set
-CONFIG_ALIX=y
-CONFIG_NET5501=y
-CONFIG_GEOS=y
-CONFIG_AMD_NB=y
-# CONFIG_X86_SYSFB is not set
-# end of Bus options (PCI etc.)
-
-#
-# Binary Emulations
-#
-CONFIG_COMPAT_32=y
-# end of Binary Emulations
-
-CONFIG_HAVE_ATOMIC_IOMAP=y
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-# CONFIG_EDD_OFF is not set
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DMIID=y
-# CONFIG_DMI_SYSFS is not set
-CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
-# CONFIG_ISCSI_IBFT is not set
-CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-# CONFIG_EFI_FAKE_MEMMAP is not set
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-# CONFIG_EFI_BOOTLOADER_CONTROL is not set
-CONFIG_EFI_CAPSULE_LOADER=y
-CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH=y
-# CONFIG_EFI_TEST is not set
-CONFIG_APPLE_PROPERTIES=y
-# CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_EFI_RCI2_TABLE is not set
-# end of EFI (Extensible Firmware Interface) Support
-
-CONFIG_UEFI_CPER=y
-CONFIG_UEFI_CPER_X86=y
-CONFIG_EFI_DEV_PATH_PARSER=y
-CONFIG_EFI_EARLYCON=y
-
-#
-# Tegra firmware driver
-#
-# end of Tegra firmware driver
-# end of Firmware Drivers
-
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_KVM_VFIO=y
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_NO_POLL=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-# CONFIG_KVM_MMU_AUDIT is not set
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_VSOCK=m
-CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-
-#
-# General architecture-dependent options
-#
-CONFIG_HOTPLUG_SMT=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-CONFIG_HAVE_OPROFILE=y
-CONFIG_OPROFILE_NMI_TIMER=y
-CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_OPTPROBES=y
-CONFIG_KPROBES_ON_FTRACE=y
-CONFIG_UPROBES=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_KRETPROBES=y
-CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_KPROBES_ON_FTRACE=y
-CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_HAS_SET_MEMORY=y
-CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
-CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
-CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
-CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_HAVE_ASM_MODVERSIONS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
-CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_ARCH_STACKLEAK=y
-CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_MOVE_PMD=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=8
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_ISA_BUS_API=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_OLD_SIGACTION=y
-CONFIG_64BIT_TIME=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_ARCH_HAS_REFCOUNT=y
-# CONFIG_REFCOUNT_FULL is not set
-CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
-# CONFIG_LOCK_EVENT_COUNTS is not set
-CONFIG_ARCH_HAS_MEM_ENCRYPT=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# end of GCOV-based kernel profiling
-
-CONFIG_PLUGIN_HOSTCC=""
-CONFIG_HAVE_GCC_PLUGINS=y
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
-CONFIG_ASM_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-# CONFIG_BLK_DEV_ZONED is not set
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
-# CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_WBT is not set
-CONFIG_BLK_CGROUP_IOLATENCY=y
-# CONFIG_BLK_CGROUP_IOCOST is not set
-CONFIG_BLK_DEBUG_FS=y
-# CONFIG_BLK_SED_OPAL is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AIX_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_CMDLINE_PARTITION is not set
-# end of Partition Types
-
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_MQ_RDMA=y
-CONFIG_BLK_PM=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-# CONFIG_IOSCHED_BFQ is not set
-# end of IO Schedulers
-
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-CONFIG_QUEUED_SPINLOCKS=y
-CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
-CONFIG_FREEZER=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_ELFCORE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_SPARSEMEM_STATIC=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_FAST_GUP=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
-# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
-# CONFIG_CMA is not set
-CONFIG_ZPOOL=m
-# CONFIG_ZBUD is not set
-CONFIG_Z3FOLD=m
-CONFIG_ZSMALLOC=y
-# CONFIG_PGTABLE_MAPPING is not set
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-# CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_FRAME_VECTOR=y
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
-# CONFIG_READ_ONLY_THP_FOR_FS is not set
-CONFIG_ARCH_HAS_PTE_SPECIAL=y
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_EGRESS=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=m
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-CONFIG_UNIX_DIAG=m
-# CONFIG_TLS is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-CONFIG_XFRM_INTERFACE=m
-CONFIG_XFRM_SUB_POLICY=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_SMC is not set
-CONFIG_XDP_SOCKETS=y
-# CONFIG_XDP_SOCKETS_DIAG is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=y
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE_COMMON=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-# CONFIG_IP_PIMSM_V1 is not set
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-CONFIG_NET_FOU_IP_TUNNELS=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-# CONFIG_INET_ESP_OFFLOAD is not set
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-# CONFIG_INET_RAW_DIAG is not set
-CONFIG_INET_DIAG_DESTROY=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_NV=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_TCP_CONG_DCTCP=m
-CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-# CONFIG_INET6_ESP_OFFLOAD is not set
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_FOU=m
-CONFIG_IPV6_FOU_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_NETLABEL is not set
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NET_PTP_CLASSIFY=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_FAMILY_BRIDGE=y
-CONFIG_NETFILTER_FAMILY_ARP=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK_OSF=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-# CONFIG_NF_LOG_NETDEV is not set
-CONFIG_NETFILTER_CONNCOUNT=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_PROCFS=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=y
-CONFIG_NF_NAT_MASQUERADE=y
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_SET=m
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_NUMGEN=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_FLOW_OFFLOAD=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CONNLIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_TUNNEL=m
-# CONFIG_NFT_OBJREF is not set
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_FIB=m
-CONFIG_NFT_FIB_INET=m
-# CONFIG_NFT_XFRM is not set
-CONFIG_NFT_SOCKET=m
-CONFIG_NFT_OSF=m
-CONFIG_NFT_TPROXY=m
-# CONFIG_NFT_SYNPROXY is not set
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_FIB_NETDEV=m
-CONFIG_NF_FLOW_TABLE_INET=m
-CONFIG_NF_FLOW_TABLE=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-# end of Core Netfilter Configuration
-
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_MH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS MH scheduler
-#
-CONFIG_IP_VS_MH_TAB_INDEX=12
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_SOCKET_IPV4=m
-CONFIG_NF_TPROXY_IPV4=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_FLOW_TABLE_IPV4=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-# CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# end of IP: Netfilter Configuration
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_SOCKET_IPV6=m
-CONFIG_NF_TPROXY_IPV6=m
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_FIB_IPV6=m
-CONFIG_NF_FLOW_TABLE_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_SRH=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-# CONFIG_IP6_NF_SECURITY is not set
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-# end of IPv6: Netfilter Configuration
-
-CONFIG_NF_DEFRAG_IPV6=m
-
-#
-# DECnet: Netfilter Configuration
-#
-CONFIG_DECNET_NF_GRABULATOR=m
-# end of DECnet: Netfilter Configuration
-
-CONFIG_NF_TABLES_BRIDGE=m
-# CONFIG_NFT_BRIDGE_META is not set
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-# CONFIG_BPFILTER is not set
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-# end of DCCP CCIDs Configuration
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-# end of DCCP Kernel Hacking
-
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-CONFIG_INET_SCTP_DIAG=m
-CONFIG_RDS=m
-# CONFIG_RDS_RDMA is not set
-# CONFIG_RDS_TCP is not set
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-# CONFIG_TIPC_MEDIA_IB is not set
-CONFIG_TIPC_MEDIA_UDP=y
-CONFIG_TIPC_DIAG=m
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-# CONFIG_L2TP_DEBUGFS is not set
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_MRP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_HAVE_NET_DSA=y
-CONFIG_NET_DSA=m
-# CONFIG_NET_DSA_TAG_8021Q is not set
-CONFIG_NET_DSA_TAG_BRCM_COMMON=m
-CONFIG_NET_DSA_TAG_BRCM=m
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
-# CONFIG_NET_DSA_TAG_GSWIP is not set
-CONFIG_NET_DSA_TAG_DSA=m
-CONFIG_NET_DSA_TAG_EDSA=m
-# CONFIG_NET_DSA_TAG_MTK is not set
-# CONFIG_NET_DSA_TAG_KSZ is not set
-CONFIG_NET_DSA_TAG_QCA=m
-# CONFIG_NET_DSA_TAG_LAN9303 is not set
-# CONFIG_NET_DSA_TAG_SJA1105 is not set
-CONFIG_NET_DSA_TAG_TRAILER=m
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q_MVRP=y
-CONFIG_DECNET=m
-CONFIG_DECNET_ROUTER=y
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_X25=m
-CONFIG_LAPB=m
-CONFIG_PHONET=m
-CONFIG_6LOWPAN=m
-# CONFIG_6LOWPAN_DEBUGFS is not set
-CONFIG_6LOWPAN_NHC=m
-CONFIG_6LOWPAN_NHC_DEST=m
-CONFIG_6LOWPAN_NHC_FRAGMENT=m
-CONFIG_6LOWPAN_NHC_HOP=m
-CONFIG_6LOWPAN_NHC_IPV6=m
-CONFIG_6LOWPAN_NHC_MOBILITY=m
-CONFIG_6LOWPAN_NHC_ROUTING=m
-CONFIG_6LOWPAN_NHC_UDP=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
-CONFIG_6LOWPAN_GHC_UDP=m
-CONFIG_6LOWPAN_GHC_ICMPV6=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
-CONFIG_IEEE802154=m
-# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
-CONFIG_IEEE802154_SOCKET=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_CBS=m
-CONFIG_NET_SCH_ETF=m
-# CONFIG_NET_SCH_TAPRIO is not set
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_SKBPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_CAKE=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-# CONFIG_NET_SCH_DEFAULT is not set
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-# CONFIG_NET_CLS_CGROUP is not set
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_MATCHALL=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_IPT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-# CONFIG_NET_ACT_SAMPLE is not set
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-# CONFIG_NET_ACT_MPLS is not set
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_ACT_CTINFO is not set
-CONFIG_NET_ACT_SKBMOD=m
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_TUNNEL_KEY=m
-# CONFIG_NET_ACT_CT is not set
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IFE_SKBTCINDEX=m
-# CONFIG_NET_TC_SKB_EXT is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-# CONFIG_BATMAN_ADV is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
-CONFIG_VSOCKETS_DIAG=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
-# CONFIG_HYPERV_VSOCKETS is not set
-CONFIG_NETLINK_DIAG=y
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_NET_NSH=m
-# CONFIG_HSR is not set
-CONFIG_NET_SWITCHDEV=y
-CONFIG_NET_L3_MASTER_DEV=y
-CONFIG_NET_NCSI=y
-# CONFIG_NCSI_OEM_CMD_GET_MAC is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-# CONFIG_BPF_STREAM_PARSER is not set
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-# CONFIG_NET_DROP_MONITOR is not set
-# end of Network testing
-# end of Networking options
-
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-# CONFIG_BT_6LOWPAN is not set
-CONFIG_BT_LEDS=y
-# CONFIG_BT_SELFTEST is not set
-# CONFIG_BT_DEBUGFS is not set
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
-CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIVHCI=m
-# CONFIG_BT_MRVL is not set
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
-# CONFIG_BT_MTKSDIO is not set
-CONFIG_BT_HCIRSI=m
-# end of Bluetooth device drivers
-
-CONFIG_AF_RXRPC=m
-CONFIG_AF_RXRPC_IPV6=y
-# CONFIG_AF_RXRPC_INJECT_LOSS is not set
-# CONFIG_AF_RXRPC_DEBUG is not set
-# CONFIG_RXKAD is not set
-# CONFIG_AF_KCM is not set
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
-CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
-CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_CFG80211_CRDA_SUPPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-# CONFIG_MAC80211_MESH is not set
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-# CONFIG_RFKILL_INPUT is not set
-CONFIG_RFKILL_GPIO=m
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-CONFIG_NET_9P_RDMA=m
-# CONFIG_NET_9P_DEBUG is not set
-# CONFIG_CAIF is not set
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
-CONFIG_NFC=m
-CONFIG_NFC_DIGITAL=m
-CONFIG_NFC_NCI=m
-CONFIG_NFC_NCI_SPI=m
-CONFIG_NFC_NCI_UART=m
-CONFIG_NFC_HCI=m
-CONFIG_NFC_SHDLC=y
-
-#
-# Near Field Communication (NFC) devices
-#
-CONFIG_NFC_TRF7970A=m
-CONFIG_NFC_MEI_PHY=m
-CONFIG_NFC_SIM=m
-CONFIG_NFC_PORT100=m
-CONFIG_NFC_FDP=m
-CONFIG_NFC_FDP_I2C=m
-CONFIG_NFC_PN544=m
-CONFIG_NFC_PN544_I2C=m
-CONFIG_NFC_PN544_MEI=m
-CONFIG_NFC_PN533=m
-CONFIG_NFC_PN533_USB=m
-CONFIG_NFC_PN533_I2C=m
-CONFIG_NFC_MICROREAD=m
-CONFIG_NFC_MICROREAD_I2C=m
-CONFIG_NFC_MICROREAD_MEI=m
-CONFIG_NFC_MRVL=m
-CONFIG_NFC_MRVL_USB=m
-CONFIG_NFC_MRVL_UART=m
-CONFIG_NFC_MRVL_I2C=m
-CONFIG_NFC_MRVL_SPI=m
-CONFIG_NFC_ST21NFCA=m
-CONFIG_NFC_ST21NFCA_I2C=m
-CONFIG_NFC_ST_NCI=m
-CONFIG_NFC_ST_NCI_I2C=m
-CONFIG_NFC_ST_NCI_SPI=m
-# CONFIG_NFC_NXP_NCI is not set
-CONFIG_NFC_S3FWRN5=m
-CONFIG_NFC_S3FWRN5_I2C=m
-# CONFIG_NFC_ST95HF is not set
-# end of Near Field Communication (NFC) devices
-
-# CONFIG_PSAMPLE is not set
-CONFIG_NET_IFE=m
-CONFIG_LWTUNNEL=y
-CONFIG_LWTUNNEL_BPF=y
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-CONFIG_NET_DEVLINK=y
-CONFIG_PAGE_POOL=y
-CONFIG_FAILOVER=m
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-CONFIG_HAVE_EISA=y
-# CONFIG_EISA is not set
-CONFIG_HAVE_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCIEAER=y
-# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-# CONFIG_PCIE_DPC is not set
-CONFIG_PCIE_PTM=y
-# CONFIG_PCIE_BW is not set
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-CONFIG_PCI_STUB=m
-CONFIG_PCI_PF_STUB=m
-CONFIG_PCI_ATS=y
-CONFIG_PCI_LOCKLESS_CONFIG=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_LABEL=y
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_COMPAQ is not set
-# CONFIG_HOTPLUG_PCI_IBM is not set
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_SHPC=y
-
-#
-# PCI controller drivers
-#
-
-#
-# Cadence PCIe controllers support
-#
-# end of Cadence PCIe controllers support
-
-#
-# DesignWare PCI Core Support
-#
-# CONFIG_PCIE_DW_PLAT_HOST is not set
-# CONFIG_PCI_MESON is not set
-# end of DesignWare PCI Core Support
-# end of PCI controller drivers
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-# end of PCI Endpoint
-
-#
-# PCI switch controller drivers
-#
-CONFIG_PCI_SW_SWITCHTEC=m
-# end of PCI switch controller drivers
-
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
-# CONFIG_RAPIDIO is not set
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=y
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
-# end of Firmware loader
-
-CONFIG_WANT_DEV_COREDUMP=y
-# CONFIG_ALLOW_DEV_COREDUMP is not set
-# CONFIG_DEBUG_DRIVER is not set
-CONFIG_DEBUG_DEVRES=y
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_SPI=m
-CONFIG_REGMAP_IRQ=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-# end of Bus devices
-
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_GNSS=m
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-
-#
-# Partition parsers
-#
-CONFIG_MTD_AR7_PARTS=m
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# end of Partition parsers
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-CONFIG_SM_FTL=m
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_SWAP=m
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-# end of RAM/ROM/Flash chip drivers
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP_GPIO_ADDR is not set
-CONFIG_MTD_SBC_GXX=m
-# CONFIG_MTD_SCx200_DOCFLASH is not set
-CONFIG_MTD_AMD76XROM=m
-CONFIG_MTD_ICHXROM=m
-CONFIG_MTD_ESB2ROM=m
-CONFIG_MTD_CK804XROM=m
-CONFIG_MTD_SCB2_FLASH=m
-CONFIG_MTD_NETtel=m
-CONFIG_MTD_L440GX=m
-CONFIG_MTD_PCI=m
-CONFIG_MTD_PCMCIA=m
-# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
-CONFIG_MTD_INTEL_VR_NOR=m
-CONFIG_MTD_PLATRAM=m
-# end of Mapping drivers for chip access
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-CONFIG_MTD_PMC551_BUGFIX=y
-# CONFIG_MTD_PMC551_DEBUG is not set
-CONFIG_MTD_DATAFLASH=m
-# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
-# CONFIG_MTD_DATAFLASH_OTP is not set
-# CONFIG_MTD_MCHP23K256 is not set
-# CONFIG_MTD_SST25L is not set
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOCG3 is not set
-# end of Self-contained MTD device drivers
-
-CONFIG_MTD_ONENAND=m
-# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND_GENERIC is not set
-CONFIG_MTD_ONENAND_OTP=y
-CONFIG_MTD_ONENAND_2X_PROGRAM=y
-CONFIG_MTD_NAND_ECC_SW_HAMMING=m
-# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_RAW_NAND is not set
-# CONFIG_MTD_SPI_NAND is not set
-
-#
-# LPDDR & LPDDR2 PCM memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-# end of LPDDR & LPDDR2 PCM memory drivers
-
-# CONFIG_MTD_SPI_NOR is not set
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_BLOCK is not set
-# CONFIG_MTD_HYPERBUS is not set
-# CONFIG_OF is not set
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-CONFIG_PARPORT_AX88796=m
-# CONFIG_PARPORT_1284 is not set
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_NULL_BLK is not set
-CONFIG_BLK_DEV_FD=m
-CONFIG_CDROM=m
-# CONFIG_PARIDE is not set
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_WRITEBACK is not set
-# CONFIG_ZRAM_MEMORY_TRACKING is not set
-CONFIG_BLK_DEV_UMEM=m
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_VIRTIO_BLK_SCSI is not set
-# CONFIG_BLK_DEV_RBD is not set
-CONFIG_BLK_DEV_RSXX=m
-
-#
-# NVME Support
-#
-CONFIG_NVME_CORE=m
-CONFIG_BLK_DEV_NVME=m
-CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_FABRICS=m
-CONFIG_NVME_RDMA=m
-# CONFIG_NVME_FC is not set
-# CONFIG_NVME_TCP is not set
-CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_LOOP=m
-CONFIG_NVME_TARGET_RDMA=m
-# CONFIG_NVME_TARGET_FC is not set
-# CONFIG_NVME_TARGET_TCP is not set
-# end of NVME Support
-
-#
-# Misc devices
-#
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT_SPI=m
-# CONFIG_DUMMY_IRQ is not set
-CONFIG_IBM_ASM=m
-CONFIG_PHANTOM=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_CS5535_MFGPT=m
-CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
-CONFIG_CS5535_CLOCK_EVENT_SRC=m
-CONFIG_HP_ILO=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-CONFIG_VMWARE_BALLOON=m
-CONFIG_PCH_PHUB=m
-# CONFIG_LATTICE_ECP3_CONFIG is not set
-# CONFIG_SRAM is not set
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_XILINX_SDFEC is not set
-CONFIG_MISC_RTSX=m
-CONFIG_PVPANIC=m
-CONFIG_C2PORT=m
-CONFIG_C2PORT_DURAMAR_2150=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_AT25=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_EEPROM_93XX46=m
-# CONFIG_EEPROM_IDT_89HPESX is not set
-# CONFIG_EEPROM_EE1004 is not set
-# end of EEPROM support
-
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-# end of Texas Instruments shared transport line discipline
-
-CONFIG_SENSORS_LIS3_I2C=m
-
-#
-# Altera FPGA firmware download module (requires I2C)
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_INTEL_MEI_TXE=m
-# CONFIG_INTEL_MEI_HDCP is not set
-CONFIG_VMWARE_VMCI=m
-
-#
-# Intel MIC & related support
-#
-
-#
-# Intel MIC Bus Driver
-#
-
-#
-# SCIF Bus Driver
-#
-
-#
-# VOP Bus Driver
-#
-# CONFIG_VOP_BUS is not set
-
-#
-# Intel MIC Host Driver
-#
-
-#
-# Intel MIC Card Driver
-#
-
-#
-# SCIF Driver
-#
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-
-#
-# VOP Driver
-#
-# end of Intel MIC & related support
-
-# CONFIG_ECHO is not set
-# CONFIG_MISC_ALCOR_PCI is not set
-CONFIG_MISC_RTSX_PCI=m
-CONFIG_MISC_RTSX_USB=m
-# CONFIG_HABANA_AI is not set
-# end of Misc devices
-
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_SCAN_ASYNC=y
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-# end of SCSI Transports
-
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
-CONFIG_AIC7XXX_DEBUG_ENABLE=y
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
-CONFIG_AIC79XX_DEBUG_ENABLE=y
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-CONFIG_SCSI_MVSAS_DEBUG=y
-CONFIG_SCSI_MVSAS_TASKLET=y
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ESAS2R=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_SMARTPQI=m
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
-# CONFIG_SCSI_UFS_BSG is not set
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_FLASHPOINT is not set
-# CONFIG_SCSI_MYRB is not set
-# CONFIG_SCSI_MYRS is not set
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-# CONFIG_SCSI_SNIC is not set
-CONFIG_SCSI_DMX3191D=m
-# CONFIG_SCSI_FDOMAIN_PCI is not set
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-# CONFIG_SCSI_PPA is not set
-# CONFIG_SCSI_IMM is not set
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
-# CONFIG_TCM_QLA2XXX_DEBUG is not set
-CONFIG_SCSI_QLA_ISCSI=m
-# CONFIG_QEDI is not set
-# CONFIG_QEDF is not set
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_AM53C974=m
-# CONFIG_SCSI_NSP32 is not set
-CONFIG_SCSI_WD719X=m
-CONFIG_SCSI_DEBUG=m
-# CONFIG_SCSI_PMCRAID is not set
-CONFIG_SCSI_PM8001=m
-# CONFIG_SCSI_BFA_FC is not set
-CONFIG_SCSI_VIRTIO=m
-# CONFIG_SCSI_CHELSIO_FCOE is not set
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-# CONFIG_SCSI_DH is not set
-# end of SCSI device support
-
-CONFIG_ATA=m
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-# CONFIG_SATA_ZPODD is not set
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=3
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_SIL24=m
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SX4=m
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=m
-# CONFIG_SATA_DWC is not set
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-# CONFIG_PATA_CS5535 is not set
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3=m
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_SC1200=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PLATFORM=m
-CONFIG_PATA_RZ1000=m
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_PATA_ACPI=m
-CONFIG_ATA_GENERIC=m
-CONFIG_PATA_LEGACY=m
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-# CONFIG_MD_AUTODETECT is not set
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-# CONFIG_MD_CLUSTER is not set
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_UNSTRIPED=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_WRITECACHE=m
-# CONFIG_DM_ERA is not set
-# CONFIG_DM_CLONE is not set
-CONFIG_DM_MIRROR=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-# CONFIG_DM_DUST is not set
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
-CONFIG_DM_VERITY_FEC=y
-CONFIG_DM_SWITCH=m
-CONFIG_DM_LOG_WRITES=m
-CONFIG_DM_INTEGRITY=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_TCM_USER2=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_ISCSI_TARGET_CXGB4=m
-CONFIG_SBP_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-# end of IEEE 1394 (FireWire) support
-
-# CONFIG_MACINTOSH_DRIVERS is not set
-CONFIG_NETDEVICES=y
-CONFIG_MII=m
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-# CONFIG_NET_FC is not set
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=m
-# CONFIG_IPVTAP is not set
-CONFIG_VXLAN=m
-CONFIG_GENEVE=m
-# CONFIG_GTP is not set
-CONFIG_MACSEC=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NTB_NETDEV=m
-CONFIG_TUN=m
-CONFIG_TAP=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_NET_VRF=m
-# CONFIG_VSOCKMON is not set
-CONFIG_SUNGEM_PHY=m
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-CONFIG_ARCNET_COM90xx=m
-CONFIG_ARCNET_COM90xxIO=m
-CONFIG_ARCNET_RIM_I=m
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_ARCNET_COM20020_CS=m
-CONFIG_ATM_DRIVERS=y
-CONFIG_ATM_DUMMY=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-CONFIG_ATM_FORE200E_USE_TASKLET=y
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-CONFIG_ATM_HE_USE_SUNI=y
-CONFIG_ATM_SOLOS=m
-
-#
-# CAIF transport drivers
-#
-
-#
-# Distributed Switch Architecture drivers
-#
-CONFIG_B53=m
-CONFIG_B53_SPI_DRIVER=m
-CONFIG_B53_MDIO_DRIVER=m
-CONFIG_B53_MMAP_DRIVER=m
-CONFIG_B53_SRAB_DRIVER=m
-# CONFIG_B53_SERDES is not set
-CONFIG_NET_DSA_BCM_SF2=m
-# CONFIG_NET_DSA_LOOP is not set
-# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_MT7530 is not set
-CONFIG_NET_DSA_MV88E6060=m
-# CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set
-# CONFIG_NET_DSA_MICROCHIP_KSZ8795 is not set
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
-CONFIG_NET_DSA_MV88E6XXX_PTP=y
-# CONFIG_NET_DSA_SJA1105 is not set
-CONFIG_NET_DSA_QCA8K=m
-CONFIG_NET_DSA_REALTEK_SMI=m
-# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
-# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
-# end of Distributed Switch Architecture drivers
-
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_AGERE=y
-CONFIG_ET131X=m
-CONFIG_NET_VENDOR_ALACRITECH=y
-# CONFIG_SLICOSS is not set
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_ALTERA_TSE=m
-CONFIG_NET_VENDOR_AMAZON=y
-CONFIG_ENA_ETHERNET=m
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_AMD8111_ETH=m
-CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
-# CONFIG_AMD_XGBE is not set
-CONFIG_NET_VENDOR_AQUANTIA=y
-CONFIG_NET_VENDOR_ARC=y
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_ALX=m
-# CONFIG_NET_VENDOR_AURORA is not set
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_BCMGENET=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_TIGON3=m
-CONFIG_TIGON3_HWMON=y
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-# CONFIG_SYSTEMPORT is not set
-CONFIG_BNXT=m
-CONFIG_BNXT_SRIOV=y
-CONFIG_BNXT_FLOWER_OFFLOAD=y
-CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
-CONFIG_NET_VENDOR_CADENCE=y
-CONFIG_MACB=m
-CONFIG_MACB_USE_HWSTAMP=y
-# CONFIG_MACB_PCI is not set
-# CONFIG_NET_VENDOR_CAVIUM is not set
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_CHELSIO_LIB=m
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-# CONFIG_NET_VENDOR_CORTINA is not set
-# CONFIG_CX_ECAT is not set
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET_BE2=y
-CONFIG_BE2NET_BE3=y
-CONFIG_BE2NET_LANCER=y
-CONFIG_BE2NET_SKYHAWK=y
-CONFIG_NET_VENDOR_EZCHIP=y
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_NET_VENDOR_GOOGLE=y
-# CONFIG_GVE is not set
-CONFIG_NET_VENDOR_HP=y
-CONFIG_HP100=m
-CONFIG_NET_VENDOR_HUAWEI=y
-# CONFIG_HINIC is not set
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_E1000E_HWTS=y
-CONFIG_IGB=m
-CONFIG_IGB_HWMON=y
-CONFIG_IGBVF=m
-CONFIG_IXGB=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBEVF=m
-CONFIG_I40E=m
-# CONFIG_I40EVF is not set
-CONFIG_ICE=m
-# CONFIG_FM10K is not set
-# CONFIG_IGC is not set
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-# CONFIG_MVMDIO is not set
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX4_CORE_GEN2=y
-CONFIG_MLX5_CORE=m
-# CONFIG_MLX5_FPGA is not set
-# CONFIG_MLX5_CORE_EN is not set
-# CONFIG_MLXSW_CORE is not set
-# CONFIG_MLXFW is not set
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MICROCHIP=y
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-CONFIG_ENCX24J600=m
-CONFIG_LAN743X=m
-# CONFIG_NET_VENDOR_MICROSEMI is not set
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_NETERION=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_NETRONOME=y
-CONFIG_NFP=m
-# CONFIG_NFP_APP_FLOWER is not set
-# CONFIG_NFP_APP_ABM_NIC is not set
-# CONFIG_NFP_DEBUG is not set
-# CONFIG_NET_VENDOR_NI is not set
-CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
-CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=m
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_PCH_GBE=m
-CONFIG_ETHOC=m
-CONFIG_NET_VENDOR_PACKET_ENGINES=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_PENSANDO=y
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLCNIC_HWMON=y
-CONFIG_NETXEN_NIC=m
-CONFIG_QED=m
-CONFIG_QED_SRIOV=y
-CONFIG_QEDE=m
-# CONFIG_NET_VENDOR_QUALCOMM is not set
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_ATP=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-# CONFIG_8139TOO_8129 is not set
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
-CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_ROCKER=y
-CONFIG_ROCKER=m
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SOLARFLARE=y
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_SFC_MCDI_LOGGING=y
-# CONFIG_SFC_FALCON is not set
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_EPIC100=m
-CONFIG_SMSC911X=m
-CONFIG_SMSC9420=m
-# CONFIG_NET_VENDOR_SOCIONEXT is not set
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_SELFTESTS is not set
-# CONFIG_STMMAC_PLATFORM is not set
-# CONFIG_STMMAC_PCI is not set
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_SYNOPSYS=y
-# CONFIG_DWC_XLGMAC is not set
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-# CONFIG_TI_CPSW_PHY_SEL is not set
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_WIZNET_W5100_SPI=m
-CONFIG_NET_VENDOR_XILINX=y
-# CONFIG_XILINX_AXI_EMAC is not set
-# CONFIG_XILINX_LL_TEMAC is not set
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_FDDI=y
-CONFIG_DEFXX=m
-# CONFIG_DEFXX_MMIO is not set
-CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
-CONFIG_NET_SB1000=m
-CONFIG_MDIO_DEVICE=m
-CONFIG_MDIO_BUS=m
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_GPIO=m
-CONFIG_MDIO_I2C=m
-# CONFIG_MDIO_MSCC_MIIM is not set
-CONFIG_PHYLINK=m
-CONFIG_PHYLIB=m
-CONFIG_SWPHY=y
-# CONFIG_LED_TRIGGER_PHY is not set
-
-#
-# MII PHY device drivers
-#
-CONFIG_SFP=m
-# CONFIG_ADIN_PHY is not set
-CONFIG_AMD_PHY=m
-CONFIG_AQUANTIA_PHY=m
-# CONFIG_AX88796B_PHY is not set
-CONFIG_AT803X_PHY=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_CICADA_PHY=m
-# CONFIG_CORTINA_PHY is not set
-CONFIG_DAVICOM_PHY=m
-CONFIG_DP83822_PHY=m
-# CONFIG_DP83TC811_PHY is not set
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_FIXED_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_INTEL_XWAY_PHY=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_MARVELL_PHY=m
-# CONFIG_MARVELL_10G_PHY is not set
-CONFIG_MICREL_PHY=m
-CONFIG_MICROCHIP_PHY=m
-# CONFIG_MICROCHIP_T1_PHY is not set
-CONFIG_MICROSEMI_PHY=m
-CONFIG_NATIONAL_PHY=m
-# CONFIG_NXP_TJA11XX_PHY is not set
-CONFIG_QSEMI_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_RENESAS_PHY=m
-# CONFIG_ROCKCHIP_PHY is not set
-CONFIG_SMSC_PHY=m
-CONFIG_STE10XP=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_XILINX_GMII2RGMII=m
-CONFIG_MICREL_KS8995MA=m
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-CONFIG_SLIP_MODE_SLIP6=y
-
-#
-# Host-side USB support is needed for USB Network Adapter support
-#
-CONFIG_USB_NET_DRIVERS=m
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SR9700=m
-# CONFIG_USB_NET_SR9800 is not set
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_USB_NET_CH9200=m
-# CONFIG_USB_NET_AQC111 is not set
-CONFIG_WLAN=y
-# CONFIG_WIRELESS_WDS is not set
-# CONFIG_WLAN_VENDOR_ADMTEK is not set
-CONFIG_ATH_COMMON=m
-CONFIG_WLAN_VENDOR_ATH=y
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_AHB=y
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_DYNACK is not set
-# CONFIG_ATH9K_WOW is not set
-CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
-CONFIG_ATH9K_PCOEM=y
-# CONFIG_ATH9K_PCI_NO_EEPROM is not set
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-# CONFIG_ATH9K_HWRNG is not set
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-CONFIG_CARL9170_HWRNG=y
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-CONFIG_ATH6KL_DEBUG=y
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-# CONFIG_WIL6210_TRACING is not set
-CONFIG_WIL6210_DEBUGFS=y
-CONFIG_ATH10K=m
-CONFIG_ATH10K_CE=y
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH10K_SDIO is not set
-# CONFIG_ATH10K_USB is not set
-# CONFIG_ATH10K_DEBUG is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_TRACING is not set
-CONFIG_WCN36XX=m
-# CONFIG_WCN36XX_DEBUGFS is not set
-# CONFIG_WLAN_VENDOR_ATMEL is not set
-CONFIG_WLAN_VENDOR_BROADCOM=y
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_DEBUG=y
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMFMAC_PCIE=y
-# CONFIG_BRCM_TRACING is not set
-# CONFIG_BRCMDBG is not set
-CONFIG_WLAN_VENDOR_CISCO=y
-CONFIG_AIRO=m
-CONFIG_AIRO_CS=m
-CONFIG_WLAN_VENDOR_INTEL=y
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-
-#
-# iwl3945 / iwl4965 Debugging Options
-#
-# CONFIG_IWLEGACY_DEBUG is not set
-# end of iwl3945 / iwl4965 Debugging Options
-
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLDVM=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-# CONFIG_IWLWIFI_BCAST_FILTERING is not set
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-# CONFIG_IWLWIFI_DEVICE_TRACING is not set
-# end of Debugging Options
-
-CONFIG_WLAN_VENDOR_INTERSIL=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_HERMES=m
-# CONFIG_HERMES_PRISM is not set
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_SPI=m
-# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
-CONFIG_P54_LEDS=y
-CONFIG_PRISM54=m
-CONFIG_WLAN_VENDOR_MARVELL=y
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_SPI=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_MWL8K=m
-CONFIG_WLAN_VENDOR_MEDIATEK=y
-CONFIG_MT7601U=m
-CONFIG_MT76_CORE=m
-CONFIG_MT76_LEDS=y
-CONFIG_MT76_USB=m
-CONFIG_MT76x02_LIB=m
-CONFIG_MT76x02_USB=m
-CONFIG_MT76x0_COMMON=m
-CONFIG_MT76x0U=m
-# CONFIG_MT76x0E is not set
-CONFIG_MT76x2_COMMON=m
-CONFIG_MT76x2E=m
-CONFIG_MT76x2U=m
-# CONFIG_MT7603E is not set
-# CONFIG_MT7615E is not set
-CONFIG_WLAN_VENDOR_RALINK=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-# CONFIG_RT2800PCI_RT35XX is not set
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-# CONFIG_RT2800USB_RT35XX is not set
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WLAN_VENDOR_REALTEK=y
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8821AE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL8XXXU=m
-# CONFIG_RTL8XXXU_UNTESTED is not set
-CONFIG_RTW88=m
-CONFIG_RTW88_CORE=m
-CONFIG_RTW88_PCI=m
-CONFIG_RTW88_8822BE=y
-CONFIG_RTW88_8822CE=y
-# CONFIG_RTW88_DEBUG is not set
-# CONFIG_RTW88_DEBUGFS is not set
-CONFIG_WLAN_VENDOR_RSI=y
-CONFIG_RSI_91X=m
-CONFIG_RSI_DEBUGFS=y
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-CONFIG_RSI_COEX=y
-CONFIG_WLAN_VENDOR_ST=y
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CW1200_WLAN_SPI=m
-CONFIG_WLAN_VENDOR_TI=y
-CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_WLAN_VENDOR_ZYDAS=y
-CONFIG_USB_ZD1201=m
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_WLAN_VENDOR_QUANTENNA=y
-# CONFIG_QTNFMAC_PCIE is not set
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_MAC80211_HWSIM=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_VIRT_WIFI=m
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-# end of WiMAX Wireless Broadband devices
-
-CONFIG_WAN=y
-CONFIG_LANMEDIA=m
-CONFIG_HDLC=m
-CONFIG_HDLC_RAW=m
-CONFIG_HDLC_RAW_ETH=m
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC_PPP=m
-CONFIG_HDLC_X25=m
-CONFIG_PCI200SYN=m
-CONFIG_WANXL=m
-# CONFIG_WANXL_BUILD_FIRMWARE is not set
-CONFIG_PC300TOO=m
-CONFIG_FARSYNC=m
-CONFIG_DLCI=m
-CONFIG_DLCI_MAX=8
-CONFIG_LAPBETHER=m
-CONFIG_X25_ASY=m
-CONFIG_SBNI=m
-CONFIG_SBNI_MULTILINE=y
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKELB=m
-CONFIG_IEEE802154_AT86RF230=m
-# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
-# CONFIG_IEEE802154_MRF24J40 is not set
-CONFIG_IEEE802154_CC2520=m
-CONFIG_IEEE802154_ATUSB=m
-CONFIG_IEEE802154_ADF7242=m
-# CONFIG_IEEE802154_CA8210 is not set
-CONFIG_IEEE802154_MCR20A=m
-# CONFIG_IEEE802154_HWSIM is not set
-CONFIG_VMXNET3=m
-CONFIG_FUJITSU_ES=m
-CONFIG_THUNDERBOLT_NET=m
-CONFIG_HYPERV_NET=m
-# CONFIG_NETDEVSIM is not set
-CONFIG_NET_FAILOVER=m
-CONFIG_ISDN=y
-CONFIG_ISDN_CAPI=m
-# CONFIG_CAPI_TRACE is not set
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-# CONFIG_MISDN_SPEEDFAX is not set
-# CONFIG_MISDN_INFINEON is not set
-# CONFIG_MISDN_W6692 is not set
-# CONFIG_MISDN_NETJET is not set
-CONFIG_MISDN_IPAC=m
-# CONFIG_NVM is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_LEDS=m
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-# CONFIG_INPUT_MATRIXKMAP is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-CONFIG_INPUT_EVBUG=m
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADC=m
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ADP5589 is not set
-CONFIG_KEYBOARD_APPLESPI=m
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_QT1050 is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_QT2160 is not set
-# CONFIG_KEYBOARD_DLINK_DIR685 is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-CONFIG_KEYBOARD_GPIO_POLLED=m
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_TCA8418 is not set
-# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_MPR121 is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-# CONFIG_MOUSE_PS2_BYD is not set
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
-CONFIG_MOUSE_PS2_CYPRESS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
-# CONFIG_MOUSE_PS2_SENTELIC is not set
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_PS2_FOCALTECH=y
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MOUSE_PS2_SMBUS=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_DB9 is not set
-# CONFIG_JOYSTICK_GAMECON is not set
-# CONFIG_JOYSTICK_TURBOGRAFX is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_WALKERA0701 is not set
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_INPUT_TABLET is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_PROPERTIES=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879_SPI=m
-CONFIG_TOUCHSCREEN_ADC=m
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
-# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
-CONFIG_TOUCHSCREEN_BU21013=m
-# CONFIG_TOUCHSCREEN_BU21029 is not set
-CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
-# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
-# CONFIG_TOUCHSCREEN_EXC3000 is not set
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GOODIX=m
-# CONFIG_TOUCHSCREEN_HIDEEP is not set
-# CONFIG_TOUCHSCREEN_ILI210X is not set
-# CONFIG_TOUCHSCREEN_S6SY761 is not set
-CONFIG_TOUCHSCREEN_GUNZE=m
-# CONFIG_TOUCHSCREEN_EKTF2127 is not set
-CONFIG_TOUCHSCREEN_ELAN=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
-# CONFIG_TOUCHSCREEN_MAX11801 is not set
-# CONFIG_TOUCHSCREEN_MCS5000 is not set
-# CONFIG_TOUCHSCREEN_MMS114 is not set
-# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-# CONFIG_TOUCHSCREEN_USB_EASYTOUCH is not set
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-CONFIG_TOUCHSCREEN_TSC200X_CORE=m
-CONFIG_TOUCHSCREEN_TSC2004=m
-# CONFIG_TOUCHSCREEN_TSC2005 is not set
-CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
-CONFIG_TOUCHSCREEN_RM_TS=m
-CONFIG_TOUCHSCREEN_SILEAD=m
-CONFIG_TOUCHSCREEN_SIS_I2C=m
-CONFIG_TOUCHSCREEN_ST1232=m
-# CONFIG_TOUCHSCREEN_STMFTS is not set
-# CONFIG_TOUCHSCREEN_SUR40 is not set
-CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
-# CONFIG_TOUCHSCREEN_SX8654 is not set
-CONFIG_TOUCHSCREEN_TPS6507X=m
-# CONFIG_TOUCHSCREEN_ZET6223 is not set
-CONFIG_TOUCHSCREEN_ZFORCE=m
-CONFIG_TOUCHSCREEN_ROHM_BU21023=m
-# CONFIG_TOUCHSCREEN_IQS5XX is not set
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_AD714X_SPI=m
-# CONFIG_INPUT_BMA150 is not set
-CONFIG_INPUT_E3X0_BUTTON=m
-# CONFIG_INPUT_MSM_VIBRATOR is not set
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_APANEL=m
-# CONFIG_INPUT_GP2A is not set
-# CONFIG_INPUT_GPIO_BEEPER is not set
-# CONFIG_INPUT_GPIO_DECODER is not set
-# CONFIG_INPUT_GPIO_VIBRA is not set
-# CONFIG_INPUT_WISTRON_BTNS is not set
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_REGULATOR_HAPTIC=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-# CONFIG_INPUT_PWM_BEEPER is not set
-# CONFIG_INPUT_PWM_VIBRA is not set
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
-# CONFIG_INPUT_IMS_PCU is not set
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
-# CONFIG_INPUT_DRV260X_HAPTICS is not set
-CONFIG_INPUT_DRV2665_HAPTICS=m
-# CONFIG_INPUT_DRV2667_HAPTICS is not set
-CONFIG_RMI4_CORE=m
-CONFIG_RMI4_I2C=m
-CONFIG_RMI4_SPI=m
-# CONFIG_RMI4_SMB is not set
-CONFIG_RMI4_F03=y
-CONFIG_RMI4_F03_SERIO=m
-CONFIG_RMI4_2D_SENSOR=y
-CONFIG_RMI4_F11=y
-CONFIG_RMI4_F12=y
-CONFIG_RMI4_F30=y
-# CONFIG_RMI4_F34 is not set
-# CONFIG_RMI4_F54 is not set
-# CONFIG_RMI4_F55 is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-# CONFIG_SERIO_ARC_PS2 is not set
-CONFIG_HYPERV_KEYBOARD=m
-# CONFIG_SERIO_GPIO_PS2 is not set
-# CONFIG_USERIO is not set
-# CONFIG_GAMEPORT is not set
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-CONFIG_MOXA_INTELLIO=m
-CONFIG_MOXA_SMARTIO=m
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_SYNCLINK_GT=m
-CONFIG_NOZOMI=m
-CONFIG_ISI=m
-CONFIG_N_HDLC=m
-# CONFIG_N_GSM is not set
-# CONFIG_TRACE_SINK is not set
-# CONFIG_NULL_TTY is not set
-# CONFIG_LDISC_AUTOLOAD is not set
-CONFIG_DEVMEM=y
-# CONFIG_DEVKMEM is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-CONFIG_SERIAL_8250_PNP=y
-# CONFIG_SERIAL_8250_FINTEK is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_EXAR=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=16
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_8250_DWLIB=y
-# CONFIG_SERIAL_8250_DW is not set
-# CONFIG_SERIAL_8250_RT288X is not set
-CONFIG_SERIAL_8250_LPSS=m
-CONFIG_SERIAL_8250_MID=m
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_MAX3100=m
-# CONFIG_SERIAL_MAX310X is not set
-# CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
-# CONFIG_SERIAL_TIMBERDALE is not set
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_IFX6X60=m
-# CONFIG_SERIAL_PCH_UART is not set
-CONFIG_SERIAL_ARC=m
-CONFIG_SERIAL_ARC_NR_PORTS=1
-# CONFIG_SERIAL_RP2 is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_FSL_LINFLEXUART is not set
-# end of Serial drivers
-
-CONFIG_SERIAL_MCTRL_GPIO=y
-# CONFIG_SERIAL_DEV_BUS is not set
-# CONFIG_TTY_PRINTK is not set
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_DMI_DECODE=y
-CONFIG_IPMI_PLAT_DATA=y
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_SSIF=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-# CONFIG_IPMB_DEVICE_INTERFACE is not set
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_GEODE=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_NVRAM=m
-CONFIG_APPLICOM=m
-# CONFIG_SONYPI is not set
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-# CONFIG_SCR24X is not set
-CONFIG_IPWIRELESS=m
-# end of PCMCIA character devices
-
-CONFIG_MWAVE=m
-# CONFIG_SCx200_GPIO is not set
-# CONFIG_PC8736x_GPIO is not set
-# CONFIG_NSC_GPIO is not set
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=256
-CONFIG_HPET=y
-# CONFIG_HPET_MMAP is not set
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_HW_RANDOM_TPM=y
-CONFIG_TCG_TIS_CORE=m
-CONFIG_TCG_TIS=m
-# CONFIG_TCG_TIS_SPI is not set
-# CONFIG_TCG_TIS_I2C_ATMEL is not set
-# CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C_NUVOTON is not set
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
-CONFIG_TCG_CRB=m
-# CONFIG_TCG_VTPM_PROXY is not set
-# CONFIG_TCG_TIS_ST33ZP24_I2C is not set
-# CONFIG_TCG_TIS_ST33ZP24_SPI is not set
-CONFIG_TELCLOCK=m
-CONFIG_DEVPORT=y
-# CONFIG_XILLYBUS is not set
-# end of Character devices
-
-CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_GPIO=m
-# CONFIG_I2C_MUX_LTC4306 is not set
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-# CONFIG_I2C_MUX_REG is not set
-# CONFIG_I2C_MUX_MLXCPLD is not set
-# end of Multiplexer I2C Chip support
-
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-# CONFIG_I2C_AMD_MP2 is not set
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_ISMT=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-# CONFIG_I2C_NVIDIA_GPU is not set
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_CBUS_GPIO is not set
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
-# CONFIG_I2C_DESIGNWARE_SLAVE is not set
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
-CONFIG_I2C_EG20T=m
-# CONFIG_I2C_EMEV2 is not set
-CONFIG_I2C_GPIO=m
-# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_XILINX=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-# CONFIG_SCx200_ACB is not set
-# end of I2C Hardware Bus support
-
-CONFIG_I2C_STUB=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SLAVE_EEPROM=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# end of I2C support
-
-# CONFIG_I3C is not set
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_MEM=y
-
-#
-# SPI Master Controller Drivers
-#
-# CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_AXI_SPI_ENGINE is not set
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-# CONFIG_SPI_CADENCE is not set
-CONFIG_SPI_DESIGNWARE=m
-CONFIG_SPI_DW_PCI=m
-# CONFIG_SPI_DW_MID_DMA is not set
-# CONFIG_SPI_DW_MMIO is not set
-# CONFIG_SPI_NXP_FLEXSPI is not set
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_LM70_LLP=m
-# CONFIG_SPI_OC_TINY is not set
-CONFIG_SPI_PXA2XX=m
-CONFIG_SPI_PXA2XX_PCI=m
-# CONFIG_SPI_ROCKCHIP is not set
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_SIFIVE is not set
-# CONFIG_SPI_MXIC is not set
-# CONFIG_SPI_TOPCLIFF_PCH is not set
-CONFIG_SPI_XCOMM=m
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_ZYNQMP_GQSPI is not set
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=m
-# CONFIG_SPI_LOOPBACK_TEST is not set
-CONFIG_SPI_TLE62X0=m
-# CONFIG_SPI_SLAVE is not set
-# CONFIG_SPMI is not set
-# CONFIG_HSI is not set
-CONFIG_PPS=y
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-CONFIG_PPS_CLIENT_LDISC=m
-# CONFIG_PPS_CLIENT_PARPORT is not set
-# CONFIG_PPS_CLIENT_GPIO is not set
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=y
-CONFIG_DP83640_PHY=m
-CONFIG_PTP_1588_CLOCK_PCH=m
-CONFIG_PTP_1588_CLOCK_KVM=m
-# end of PTP clock support
-
-CONFIG_PINCTRL=y
-CONFIG_PINMUX=y
-CONFIG_PINCONF=y
-CONFIG_GENERIC_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
-CONFIG_PINCTRL_AMD=y
-# CONFIG_PINCTRL_MCP23S08 is not set
-CONFIG_PINCTRL_BAYTRAIL=y
-CONFIG_PINCTRL_CHERRYVIEW=m
-CONFIG_PINCTRL_INTEL=m
-# CONFIG_PINCTRL_BROXTON is not set
-# CONFIG_PINCTRL_CANNONLAKE is not set
-CONFIG_PINCTRL_CEDARFORK=m
-# CONFIG_PINCTRL_DENVERTON is not set
-# CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_ICELAKE=m
-# CONFIG_PINCTRL_LEWISBURG is not set
-CONFIG_PINCTRL_SUNRISEPOINT=m
-CONFIG_GPIOLIB=y
-CONFIG_GPIOLIB_FASTPATH_LIMIT=512
-CONFIG_GPIO_ACPI=y
-CONFIG_GPIOLIB_IRQCHIP=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO drivers
-#
-# CONFIG_GPIO_AMDPT is not set
-# CONFIG_GPIO_DWAPB is not set
-# CONFIG_GPIO_EXAR is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-CONFIG_GPIO_ICH=m
-# CONFIG_GPIO_LYNXPOINT is not set
-# CONFIG_GPIO_MB86S7X is not set
-CONFIG_GPIO_VX855=m
-# CONFIG_GPIO_XILINX is not set
-CONFIG_GPIO_AMD_FCH=m
-# end of Memory mapped GPIO drivers
-
-#
-# Port-mapped I/O GPIO drivers
-#
-# CONFIG_GPIO_F7188X is not set
-# CONFIG_GPIO_IT87 is not set
-CONFIG_GPIO_SCH=m
-# CONFIG_GPIO_SCH311X is not set
-CONFIG_GPIO_WINBOND=m
-CONFIG_GPIO_WS16C48=m
-# end of Port-mapped I/O GPIO drivers
-
-#
-# I2C GPIO expanders
-#
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-# CONFIG_GPIO_TPIC2810 is not set
-# end of I2C GPIO expanders
-
-#
-# MFD GPIO expanders
-#
-CONFIG_GPIO_CS5535=m
-CONFIG_GPIO_JANZ_TTL=m
-CONFIG_GPIO_UCB1400=m
-# end of MFD GPIO expanders
-
-#
-# PCI GPIO expanders
-#
-CONFIG_GPIO_AMD8111=m
-# CONFIG_GPIO_BT8XX is not set
-CONFIG_GPIO_ML_IOH=m
-# CONFIG_GPIO_PCH is not set
-# CONFIG_GPIO_PCI_IDIO_16 is not set
-# CONFIG_GPIO_PCIE_IDIO_24 is not set
-CONFIG_GPIO_RDC321X=m
-# end of PCI GPIO expanders
-
-#
-# SPI GPIO expanders
-#
-# CONFIG_GPIO_MAX3191X is not set
-CONFIG_GPIO_MAX7301=m
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_PISOSR is not set
-# CONFIG_GPIO_XRA1403 is not set
-# end of SPI GPIO expanders
-
-#
-# USB GPIO expanders
-#
-# end of USB GPIO expanders
-
-# CONFIG_GPIO_MOCKUP is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_AVS is not set
-# CONFIG_POWER_RESET is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-# CONFIG_PDA_POWER is not set
-CONFIG_GENERIC_ADC_BATTERY=m
-# CONFIG_TEST_POWER is not set
-# CONFIG_CHARGER_ADP5061 is not set
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_CHARGER_SBS is not set
-# CONFIG_MANAGER_SBS is not set
-# CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_ISP1704 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# CONFIG_CHARGER_GPIO is not set
-# CONFIG_CHARGER_MANAGER is not set
-# CONFIG_CHARGER_LT3651 is not set
-# CONFIG_CHARGER_BQ2415X is not set
-# CONFIG_CHARGER_BQ24190 is not set
-# CONFIG_CHARGER_BQ24257 is not set
-# CONFIG_CHARGER_BQ24735 is not set
-# CONFIG_CHARGER_BQ25890 is not set
-# CONFIG_CHARGER_SMB347 is not set
-# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_CHARGER_RT9455 is not set
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7314=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_ADT7310=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-# CONFIG_SENSORS_AS370 is not set
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_ASB100=m
-# CONFIG_SENSORS_ASPEED is not set
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_DELL_SMM=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_FTSTEUTATES=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-# CONFIG_SENSORS_HIH6130 is not set
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-# CONFIG_SENSORS_IIO_HWMON is not set
-CONFIG_SENSORS_I5500=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC2990=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX1111=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX31722=m
-# CONFIG_SENSORS_MAX6621 is not set
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_MLXREG_FAN=m
-# CONFIG_SENSORS_TC654 is not set
-CONFIG_SENSORS_ADCXX=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM70=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_NPCM7XX=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-# CONFIG_SENSORS_IBM_CFFPS is not set
-# CONFIG_SENSORS_INSPUR_IPSPS is not set
-# CONFIG_SENSORS_IR35221 is not set
-# CONFIG_SENSORS_IR38064 is not set
-# CONFIG_SENSORS_IRPS5401 is not set
-# CONFIG_SENSORS_ISL68137 is not set
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-# CONFIG_SENSORS_LTC2978_REGULATOR is not set
-CONFIG_SENSORS_LTC3815=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX20751=m
-# CONFIG_SENSORS_MAX31785 is not set
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-# CONFIG_SENSORS_PXE1610 is not set
-CONFIG_SENSORS_TPS40422=m
-# CONFIG_SENSORS_TPS53679 is not set
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHT3x=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-# CONFIG_SENSORS_STTS751 is not set
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADS7871=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_INA209=m
-# CONFIG_SENSORS_INA2XX is not set
-CONFIG_SENSORS_INA3221=m
-# CONFIG_SENSORS_TC74 is not set
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-# CONFIG_SENSORS_TMP108 is not set
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83773G=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-CONFIG_SENSORS_W83795_FANCTRL=y
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_THERMAL=y
-CONFIG_THERMAL_STATISTICS=y
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-CONFIG_THERMAL_WRITABLE_TRIPS=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
-CONFIG_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
-# CONFIG_CLOCK_THERMAL is not set
-# CONFIG_DEVFREQ_THERMAL is not set
-# CONFIG_THERMAL_EMULATION is not set
-
-#
-# Intel thermal drivers
-#
-# CONFIG_INTEL_POWERCLAMP is not set
-CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
-CONFIG_INTEL_SOC_DTS_THERMAL=m
-
-#
-# ACPI INT340X thermal drivers
-#
-CONFIG_INT340X_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
-CONFIG_INT3406_THERMAL=m
-# end of ACPI INT340X thermal drivers
-
-CONFIG_INTEL_PCH_THERMAL=m
-# end of Intel thermal drivers
-
-CONFIG_GENERIC_ADC_THERMAL=m
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
-CONFIG_WATCHDOG_OPEN_TIMEOUT=0
-CONFIG_WATCHDOG_SYSFS=y
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_WDAT_WDT=m
-# CONFIG_XILINX_WATCHDOG is not set
-# CONFIG_ZIIRAVE_WATCHDOG is not set
-# CONFIG_MLX_WDT is not set
-# CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_DW_WATCHDOG is not set
-CONFIG_MAX63XX_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_EBC_C384_WDT=m
-CONFIG_F71808E_WDT=m
-CONFIG_SP5100_TCO=m
-CONFIG_GEODE_WDT=m
-# CONFIG_SBC_FITPC2_WATCHDOG is not set
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_IE6XX_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-# CONFIG_HP_WATCHDOG is not set
-CONFIG_SC1200_WDT=m
-# CONFIG_SCx200_WDT is not set
-CONFIG_PC87413_WDT=m
-CONFIG_NV_TCO=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-# CONFIG_SBC7240_WDT is not set
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-# CONFIG_TQMX86_WDT is not set
-CONFIG_VIA_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_INTEL_MEI_WDT=m
-# CONFIG_NI903X_WDT is not set
-# CONFIG_NIC7018_WDT is not set
-# CONFIG_MEN_A21_WDT is not set
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-# CONFIG_SSB_DRIVER_GPIO is not set
-CONFIG_BCMA_POSSIBLE=y
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_HOST_SOC is not set
-CONFIG_BCMA_DRIVER_PCI=y
-CONFIG_BCMA_DRIVER_GMAC_CMN=y
-CONFIG_BCMA_DRIVER_GPIO=y
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=m
-CONFIG_MFD_CS5535=m
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_MADERA is not set
-# CONFIG_MFD_DA9052_SPI is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_MC13XXX_SPI is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-CONFIG_HTC_PASIC3=m
-# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
-CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
-CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
-CONFIG_MFD_JANZ_CMODIO=m
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_MENF21BMC is not set
-# CONFIG_EZX_PCAP is not set
-# CONFIG_MFD_VIPERBOARD is not set
-# CONFIG_MFD_RETU is not set
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_SI476X_CORE is not set
-CONFIG_MFD_SM501=m
-# CONFIG_MFD_SM501_GPIO is not set
-# CONFIG_MFD_SKY81452 is not set
-CONFIG_ABX500_CORE=y
-# CONFIG_MFD_SYSCON is not set
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_TI_LMU is not set
-# CONFIG_TPS6105X is not set
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-# CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-CONFIG_MFD_WL1273_CORE=m
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_TIMBERDALE is not set
-# CONFIG_MFD_TQMX86 is not set
-CONFIG_MFD_VX855=m
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_MFD_WM8994 is not set
-# end of Multifunction device drivers
-
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-# CONFIG_REGULATOR_88PG86X is not set
-# CONFIG_REGULATOR_ACT8865 is not set
-# CONFIG_REGULATOR_AD5398 is not set
-# CONFIG_REGULATOR_DA9210 is not set
-# CONFIG_REGULATOR_DA9211 is not set
-# CONFIG_REGULATOR_FAN53555 is not set
-# CONFIG_REGULATOR_GPIO is not set
-# CONFIG_REGULATOR_ISL9305 is not set
-# CONFIG_REGULATOR_ISL6271A is not set
-# CONFIG_REGULATOR_LP3971 is not set
-# CONFIG_REGULATOR_LP3972 is not set
-# CONFIG_REGULATOR_LP872X is not set
-# CONFIG_REGULATOR_LP8755 is not set
-# CONFIG_REGULATOR_LTC3589 is not set
-# CONFIG_REGULATOR_LTC3676 is not set
-# CONFIG_REGULATOR_MAX1586 is not set
-# CONFIG_REGULATOR_MAX8649 is not set
-# CONFIG_REGULATOR_MAX8660 is not set
-# CONFIG_REGULATOR_MAX8952 is not set
-# CONFIG_REGULATOR_MT6311 is not set
-# CONFIG_REGULATOR_PCF50633 is not set
-# CONFIG_REGULATOR_PFUZE100 is not set
-# CONFIG_REGULATOR_PV88060 is not set
-# CONFIG_REGULATOR_PV88080 is not set
-# CONFIG_REGULATOR_PV88090 is not set
-# CONFIG_REGULATOR_PWM is not set
-# CONFIG_REGULATOR_SLG51000 is not set
-# CONFIG_REGULATOR_TPS51632 is not set
-# CONFIG_REGULATOR_TPS62360 is not set
-# CONFIG_REGULATOR_TPS65023 is not set
-# CONFIG_REGULATOR_TPS6507X is not set
-# CONFIG_REGULATOR_TPS65132 is not set
-# CONFIG_REGULATOR_TPS6524X is not set
-CONFIG_CEC_CORE=y
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_LIRC=y
-CONFIG_RC_DECODERS=y
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_SHARP_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_XMP_DECODER=m
-CONFIG_IR_IMON_DECODER=m
-# CONFIG_IR_RCMM_DECODER is not set
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_IMON=m
-CONFIG_IR_IMON_RAW=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_IR_IGORPLUGUSB=m
-CONFIG_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_SERIAL=m
-# CONFIG_IR_SERIAL_TRANSMITTER is not set
-# CONFIG_IR_SIR is not set
-# CONFIG_RC_XBOX_DVD is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-# CONFIG_MEDIA_SDR_SUPPORT is not set
-# CONFIG_MEDIA_CEC_SUPPORT is not set
-CONFIG_MEDIA_CONTROLLER=y
-# CONFIG_MEDIA_CONTROLLER_DVB is not set
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L2_I2C=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_FLASH_LED_CLASS=m
-CONFIG_V4L2_FWNODE=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_DVB_CORE=m
-# CONFIG_DVB_MMAP is not set
-CONFIG_DVB_NET=y
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
-# CONFIG_DVB_ULE_DEBUG is not set
-
-#
-# Media drivers
-#
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-# CONFIG_USB_GSPCA_KONICA is not set
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-# CONFIG_USB_GSPCA_SPCA1528 is not set
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
-CONFIG_USB_GSPCA_ZC3XX=m
-# CONFIG_USB_PWC is not set
-# CONFIG_VIDEO_CPIA2 is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_VIDEO_USBTV=m
-
-#
-# Analog TV USB devices
-#
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_USBVISION is not set
-# CONFIG_VIDEO_STK1160_COMMON is not set
-# CONFIG_VIDEO_GO7007 is not set
-
-#
-# Analog/digital TV USB devices
-#
-# CONFIG_VIDEO_AU0828 is not set
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_DIB3000MC=m
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-# CONFIG_DVB_USB_CXUSB_ANALOG is not set
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_DVBSKY=m
-# CONFIG_DVB_USB_ZD1301 is not set
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-# CONFIG_SMS_USB_DRV is not set
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-# CONFIG_DVB_AS102 is not set
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-# CONFIG_VIDEO_EM28XX_DVB is not set
-CONFIG_VIDEO_EM28XX_RC=m
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-#
-# Media capture support
-#
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SOLO6X10=m
-# CONFIG_VIDEO_TW5864 is not set
-# CONFIG_VIDEO_TW68 is not set
-CONFIG_VIDEO_TW686X=m
-
-#
-# Media capture/analog TV support
-#
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_DT3155 is not set
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_ENABLE_VP3054=y
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7164=m
-# CONFIG_VIDEO_COBALT is not set
-
-#
-# Media digital TV PCI Adapters
-#
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-# CONFIG_DVB_PT3 is not set
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_DDBRIDGE=m
-# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
-CONFIG_DVB_SMIPCIE=m
-CONFIG_DVB_NETUP_UNIDVB=m
-CONFIG_VIDEO_IPU3_CIO2=m
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_VIDEO_SH_VEU is not set
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_DVB_PLATFORM_DRIVERS is not set
-
-#
-# Supported MMC/SDIO adapters
-#
-# CONFIG_SMS_SDIO_DRV is not set
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_V4L2=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-
-#
-# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
-#
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# I2C Encoders, decoders, sensors and other helper chips
-#
-
-#
-# Audio decoders, processors and mixers
-#
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA1997X is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS3308=m
-CONFIG_VIDEO_CS5345=m
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_UDA1342 is not set
-CONFIG_VIDEO_WM8775=m
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_SONY_BTF_MPX is not set
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7183 is not set
-# CONFIG_VIDEO_ADV7604 is not set
-# CONFIG_VIDEO_ADV7842 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_ML86V7667 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-CONFIG_VIDEO_SAA711X=m
-# CONFIG_VIDEO_TC358743 is not set
-# CONFIG_VIDEO_TVP514X is not set
-CONFIG_VIDEO_TVP5150=m
-# CONFIG_VIDEO_TVP7002 is not set
-# CONFIG_VIDEO_TW2804 is not set
-# CONFIG_VIDEO_TW9903 is not set
-# CONFIG_VIDEO_TW9906 is not set
-# CONFIG_VIDEO_TW9910 is not set
-# CONFIG_VIDEO_VPX3220 is not set
-
-#
-# Video and audio decoders
-#
-# CONFIG_VIDEO_SAA717X is not set
-CONFIG_VIDEO_CX25840=m
-
-#
-# Video encoders
-#
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV7393 is not set
-# CONFIG_VIDEO_ADV7511 is not set
-# CONFIG_VIDEO_AD9389B is not set
-# CONFIG_VIDEO_AK881X is not set
-# CONFIG_VIDEO_THS8200 is not set
-
-#
-# Camera sensor devices
-#
-# CONFIG_VIDEO_IMX214 is not set
-# CONFIG_VIDEO_IMX258 is not set
-# CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX319 is not set
-# CONFIG_VIDEO_IMX355 is not set
-CONFIG_VIDEO_OV2640=m
-# CONFIG_VIDEO_OV2659 is not set
-# CONFIG_VIDEO_OV2680 is not set
-# CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV5647 is not set
-# CONFIG_VIDEO_OV6650 is not set
-# CONFIG_VIDEO_OV5670 is not set
-# CONFIG_VIDEO_OV5675 is not set
-# CONFIG_VIDEO_OV5695 is not set
-# CONFIG_VIDEO_OV7251 is not set
-# CONFIG_VIDEO_OV772X is not set
-# CONFIG_VIDEO_OV7640 is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OV7740 is not set
-# CONFIG_VIDEO_OV8856 is not set
-# CONFIG_VIDEO_OV9640 is not set
-# CONFIG_VIDEO_OV9650 is not set
-# CONFIG_VIDEO_OV13858 is not set
-# CONFIG_VIDEO_VS6624 is not set
-# CONFIG_VIDEO_MT9M001 is not set
-# CONFIG_VIDEO_MT9M032 is not set
-# CONFIG_VIDEO_MT9M111 is not set
-# CONFIG_VIDEO_MT9P031 is not set
-# CONFIG_VIDEO_MT9T001 is not set
-# CONFIG_VIDEO_MT9T112 is not set
-CONFIG_VIDEO_MT9V011=m
-# CONFIG_VIDEO_MT9V032 is not set
-# CONFIG_VIDEO_MT9V111 is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_VIDEO_M5MOLS is not set
-# CONFIG_VIDEO_RJ54N1 is not set
-# CONFIG_VIDEO_S5K6AA is not set
-# CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_S5K4ECGX is not set
-# CONFIG_VIDEO_S5K5BAF is not set
-# CONFIG_VIDEO_SMIAPP is not set
-# CONFIG_VIDEO_ET8EK8 is not set
-# CONFIG_VIDEO_S5C73M3 is not set
-
-#
-# Lens drivers
-#
-# CONFIG_VIDEO_AD5820 is not set
-# CONFIG_VIDEO_AK7375 is not set
-# CONFIG_VIDEO_DW9714 is not set
-# CONFIG_VIDEO_DW9807_VCM is not set
-
-#
-# Flash devices
-#
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_LM3560 is not set
-# CONFIG_VIDEO_LM3646 is not set
-
-#
-# Video improvement chips
-#
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-
-#
-# Audio/Video compression chips
-#
-CONFIG_VIDEO_SAA6752HS=m
-
-#
-# SDR tuner chips
-#
-
-#
-# Miscellaneous helper chips
-#
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_I2C is not set
-# CONFIG_VIDEO_ST_MIPID02 is not set
-# end of I2C Encoders, decoders, sensors and other helper chips
-
-#
-# SPI helper chips
-#
-# CONFIG_VIDEO_GS1662 is not set
-# end of SPI helper chips
-
-#
-# Media SPI Adapters
-#
-CONFIG_CXD2880_SPI_DRV=m
-# end of Media SPI Adapters
-
-CONFIG_MEDIA_TUNER=m
-
-#
-# Customize TV tuners
-#
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA18250=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_MSI001 is not set
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_M88RS6000T=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-# CONFIG_MEDIA_TUNER_MXL301RF is not set
-# CONFIG_MEDIA_TUNER_QM1D1C0042 is not set
-CONFIG_MEDIA_TUNER_QM1D1B0004=m
-# end of Customize TV tuners
-
-#
-# Customise DVB Frontends
-#
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV0910=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_STV6111=m
-CONFIG_DVB_MXL5XX=m
-CONFIG_DVB_M88DS3103=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_SI2165=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-
-#
-# DVB-S (satellite) frontends
-#
-# CONFIG_DVB_CX24110 is not set
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24117=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_TS2020=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-# CONFIG_DVB_SP887X is not set
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-# CONFIG_DVB_S5H1432 is not set
-# CONFIG_DVB_DRXD is not set
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-# CONFIG_DVB_DIB9000 is not set
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_CXD2841ER=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_SI2168=m
-# CONFIG_DVB_ZD1301_DEMOD is not set
-CONFIG_DVB_GP8PSK_FE=m
-# CONFIG_DVB_CXD2880 is not set
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-# CONFIG_DVB_OR51211 is not set
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT3306A=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1409=m
-# CONFIG_DVB_AU8522_DTV is not set
-# CONFIG_DVB_AU8522_V4L is not set
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-# CONFIG_DVB_S921 is not set
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_TC90522=m
-# CONFIG_DVB_MN88443X is not set
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-# CONFIG_DVB_DRX39XYJ is not set
-CONFIG_DVB_LNBH25=m
-# CONFIG_DVB_LNBH29 is not set
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-# CONFIG_DVB_LGS8GL5 is not set
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_HORUS3A=m
-CONFIG_DVB_ASCOT2E=m
-CONFIG_DVB_HELENE=m
-
-#
-# Common Interface (EN50221) controller drivers
-#
-CONFIG_DVB_CXD2099=m
-CONFIG_DVB_SP2=m
-
-#
-# Tools to develop new frontends
-#
-CONFIG_DVB_DUMMY_FE=m
-# end of Customise DVB Frontends
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-# CONFIG_AGP_ALI is not set
-# CONFIG_AGP_ATI is not set
-# CONFIG_AGP_AMD is not set
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-# CONFIG_AGP_NVIDIA is not set
-CONFIG_AGP_SIS=m
-# CONFIG_AGP_SWORKS is not set
-CONFIG_AGP_VIA=m
-# CONFIG_AGP_EFFICEON is not set
-CONFIG_INTEL_GTT=m
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM=m
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_DP_AUX_CHARDEV=y
-# CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-CONFIG_DRM_DP_CEC=y
-CONFIG_DRM_TTM=m
-CONFIG_DRM_VRAM_HELPER=m
-CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_VM=y
-CONFIG_DRM_SCHED=m
-
-#
-# I2C encoder or helper chips
-#
-# CONFIG_DRM_I2C_CH7006 is not set
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# end of I2C encoder or helper chips
-
-#
-# ARM devices
-#
-# end of ARM devices
-
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_USERPTR=y
-CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
-# CONFIG_DRM_AMDGPU_CIK is not set
-# CONFIG_DRM_AMDGPU_USERPTR is not set
-# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
-
-#
-# ACP (Audio CoProcessor) Configuration
-#
-CONFIG_DRM_AMD_ACP=y
-# end of ACP (Audio CoProcessor) Configuration
-
-#
-# Display Engine Configuration
-#
-CONFIG_DRM_AMD_DC=y
-CONFIG_DRM_AMD_DC_DCN1_0=y
-CONFIG_DRM_AMD_DC_DCN2_0=y
-# CONFIG_DRM_AMD_DC_DCN2_1 is not set
-CONFIG_DRM_AMD_DC_DSC_SUPPORT=y
-# CONFIG_DEBUG_KERNEL_DC is not set
-# end of Display Engine Configuration
-
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-# CONFIG_NOUVEAU_DEBUG_MMU is not set
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_I915=m
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_FORCE_PROBE=""
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_USERPTR=y
-
-#
-# drm/i915 Debugging
-#
-# CONFIG_DRM_I915_WERROR is not set
-# CONFIG_DRM_I915_DEBUG is not set
-# CONFIG_DRM_I915_DEBUG_MMIO is not set
-# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
-# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
-# CONFIG_DRM_I915_DEBUG_GUC is not set
-# CONFIG_DRM_I915_SELFTEST is not set
-# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
-# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
-# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
-# end of drm/i915 Debugging
-
-#
-# drm/i915 Profile Guided Optimisation
-#
-CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
-CONFIG_DRM_I915_SPIN_REQUEST=5
-# end of drm/i915 Profile Guided Optimisation
-
-CONFIG_DRM_VGEM=m
-# CONFIG_DRM_VKMS is not set
-CONFIG_DRM_ATI_PCIGART=y
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_GMA3600=y
-# CONFIG_DRM_UDL is not set
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_QXL=m
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
-# end of Display Panels
-
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_PANEL_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-CONFIG_DRM_ANALOGIX_ANX78XX=m
-# end of Display Interface Bridges
-
-# CONFIG_DRM_ETNAVIV is not set
-# CONFIG_DRM_GM12U320 is not set
-# CONFIG_TINYDRM_HX8357D is not set
-# CONFIG_TINYDRM_ILI9225 is not set
-# CONFIG_TINYDRM_ILI9341 is not set
-# CONFIG_TINYDRM_MI0283QT is not set
-# CONFIG_TINYDRM_REPAPER is not set
-# CONFIG_TINYDRM_ST7586 is not set
-# CONFIG_TINYDRM_ST7735R is not set
-# CONFIG_DRM_VBOXVIDEO is not set
-CONFIG_DRM_LEGACY=y
-# CONFIG_DRM_TDFX is not set
-# CONFIG_DRM_R128 is not set
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_MGA is not set
-# CONFIG_DRM_SIS is not set
-# CONFIG_DRM_VIA is not set
-# CONFIG_DRM_SAVAGE is not set
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FB_DDC=m
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_HECUBA=m
-CONFIG_FB_SVGALIB=m
-CONFIG_FB_BACKLIGHT=m
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_PM2=m
-CONFIG_FB_PM2_FIFO_DISCONNECT=y
-CONFIG_FB_CYBER2000=m
-CONFIG_FB_CYBER2000_DDC=y
-CONFIG_FB_ARC=m
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_UVESA=m
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
-CONFIG_FB_N411=m
-CONFIG_FB_HGA=m
-# CONFIG_FB_OPENCORES is not set
-CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-# CONFIG_FB_I740 is not set
-# CONFIG_FB_I810 is not set
-CONFIG_FB_LE80578=m
-CONFIG_FB_CARILLO_RANCH=m
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
-CONFIG_FB_S3_DDC=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_VIA=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-CONFIG_FB_VIA_X_COMPATIBILITY=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-CONFIG_FB_ARK=m
-CONFIG_FB_PM3=m
-CONFIG_FB_CARMINE=m
-CONFIG_FB_CARMINE_DRAM_EVAL=y
-# CONFIG_CARMINE_DRAM_CUSTOM is not set
-CONFIG_FB_GEODE=y
-CONFIG_FB_GEODE_LX=m
-CONFIG_FB_GEODE_GX=m
-CONFIG_FB_GEODE_GX1=m
-CONFIG_FB_SM501=m
-CONFIG_FB_SMSCUFX=m
-CONFIG_FB_UDL=m
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_METRONOME=m
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-CONFIG_FB_MB862XX_I2C=y
-CONFIG_FB_HYPERV=m
-CONFIG_FB_SIMPLE=y
-# CONFIG_FB_SM712 is not set
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LMS283GF05=m
-CONFIG_LCD_LTV350QV=m
-# CONFIG_LCD_ILI922X is not set
-CONFIG_LCD_ILI9320=m
-CONFIG_LCD_TDO24M=m
-CONFIG_LCD_VGG2432A4=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_AMS369FG06=m
-CONFIG_LCD_LMS501KF03=m
-CONFIG_LCD_HX8357=m
-# CONFIG_LCD_OTM3225A is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_PWM=m
-# CONFIG_BACKLIGHT_APPLE is not set
-# CONFIG_BACKLIGHT_PM8941_WLED is not set
-CONFIG_BACKLIGHT_SAHARA=m
-CONFIG_BACKLIGHT_ADP8860=m
-# CONFIG_BACKLIGHT_ADP8870 is not set
-CONFIG_BACKLIGHT_PCF50633=m
-# CONFIG_BACKLIGHT_LM3630A is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_OT200 is not set
-# CONFIG_BACKLIGHT_GPIO is not set
-# CONFIG_BACKLIGHT_LV5207LP is not set
-# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_ARCXCNN is not set
-# end of Backlight & LCD device support
-
-CONFIG_VGASTATE=m
-CONFIG_HDMI=y
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
-# end of Console display driver support
-
-# CONFIG_LOGO is not set
-# end of Graphics support
-
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_PCM_ELD=y
-CONFIG_SND_PCM_IEC958=y
-CONFIG_SND_HWDEP=m
-CONFIG_SND_SEQ_DEVICE=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_COMPRESS_OFFLOAD=m
-CONFIG_SND_JACK=y
-CONFIG_SND_JACK_INPUT_DEV=y
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_PCM_TIMER=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=32
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_PROC_FS=y
-# CONFIG_SND_VERBOSE_PROCFS is not set
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_SEQUENCER_OSS=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_SEQ_MIDI_EVENT=m
-CONFIG_SND_SEQ_MIDI=m
-CONFIG_SND_SEQ_MIDI_EMUL=m
-CONFIG_SND_SEQ_VIRMIDI=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-CONFIG_SND_PCSP=m
-CONFIG_SND_DUMMY=m
-# CONFIG_SND_ALOOP is not set
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_FM801=m
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-# CONFIG_SND_SIS7019 is not set
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-
-#
-# HD-Audio
-#
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_INTEL=m
-# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=0
-# CONFIG_SND_HDA_PATCH_LOADER is not set
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-# end of HD-Audio
-
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_COMPONENT=y
-CONFIG_SND_HDA_I915=y
-CONFIG_SND_HDA_EXT_CORE=m
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
-CONFIG_SND_INTEL_NHLT=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-# CONFIG_SND_USB_CAIAQ_INPUT is not set
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
-# CONFIG_SND_BCD2000 is not set
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_DICE=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_BEBOB=m
-# CONFIG_SND_FIREWIRE_DIGI00X is not set
-# CONFIG_SND_FIREWIRE_TASCAM is not set
-# CONFIG_SND_FIREWIRE_MOTU is not set
-# CONFIG_SND_FIREFACE is not set
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_COMPRESS=y
-CONFIG_SND_SOC_TOPOLOGY=y
-CONFIG_SND_SOC_ACPI=m
-CONFIG_SND_SOC_AMD_ACP=m
-CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
-CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
-# CONFIG_SND_SOC_AMD_ACP3x is not set
-# CONFIG_SND_ATMEL_SOC is not set
-# CONFIG_SND_DESIGNWARE_I2S is not set
-
-#
-# SoC Audio for Freescale CPUs
-#
-
-#
-# Common SoC Audio options for Freescale CPUs:
-#
-# CONFIG_SND_SOC_FSL_ASRC is not set
-# CONFIG_SND_SOC_FSL_SAI is not set
-# CONFIG_SND_SOC_FSL_AUDMIX is not set
-# CONFIG_SND_SOC_FSL_SSI is not set
-# CONFIG_SND_SOC_FSL_SPDIF is not set
-# CONFIG_SND_SOC_FSL_ESAI is not set
-# CONFIG_SND_SOC_FSL_MICFIL is not set
-# CONFIG_SND_SOC_IMX_AUDMUX is not set
-# end of SoC Audio for Freescale CPUs
-
-# CONFIG_SND_I2S_HI6210_I2S is not set
-# CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
-CONFIG_SND_SST_IPC=m
-CONFIG_SND_SST_IPC_PCI=m
-CONFIG_SND_SST_IPC_ACPI=m
-CONFIG_SND_SOC_INTEL_SST_ACPI=m
-CONFIG_SND_SOC_INTEL_SST=m
-CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
-CONFIG_SND_SOC_INTEL_HASWELL=m
-CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
-CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
-CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
-CONFIG_SND_SOC_INTEL_SKYLAKE=m
-CONFIG_SND_SOC_INTEL_SKL=m
-CONFIG_SND_SOC_INTEL_APL=m
-CONFIG_SND_SOC_INTEL_KBL=m
-CONFIG_SND_SOC_INTEL_GLK=m
-CONFIG_SND_SOC_INTEL_CNL=m
-CONFIG_SND_SOC_INTEL_CFL=m
-# CONFIG_SND_SOC_INTEL_CML_H is not set
-# CONFIG_SND_SOC_INTEL_CML_LP is not set
-CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
-# CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC is not set
-CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
-CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
-CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_HASWELL_MACH is not set
-CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
-CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
-CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
-CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
-CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
-CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
-# CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH is not set
-CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
-# CONFIG_SND_SOC_INTEL_SKL_RT286_MACH is not set
-CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
-CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
-CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m
-CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
-CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH is not set
-CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
-# CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH is not set
-CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
-# CONFIG_SND_SOC_MTK_BTCVSD is not set
-# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
-
-#
-# STMicroelectronics STM32 SOC audio support
-#
-# end of STMicroelectronics STM32 SOC audio support
-
-# CONFIG_SND_SOC_XILINX_I2S is not set
-# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
-# CONFIG_SND_SOC_XILINX_SPDIF is not set
-# CONFIG_SND_SOC_XTFPGA_I2S is not set
-# CONFIG_ZX_TDM is not set
-CONFIG_SND_SOC_I2C_AND_SPI=m
-
-#
-# CODEC drivers
-#
-# CONFIG_SND_SOC_AC97_CODEC is not set
-# CONFIG_SND_SOC_ADAU1701 is not set
-# CONFIG_SND_SOC_ADAU1761_I2C is not set
-# CONFIG_SND_SOC_ADAU1761_SPI is not set
-CONFIG_SND_SOC_ADAU7002=m
-# CONFIG_SND_SOC_AK4104 is not set
-# CONFIG_SND_SOC_AK4118 is not set
-CONFIG_SND_SOC_AK4458=m
-# CONFIG_SND_SOC_AK4554 is not set
-# CONFIG_SND_SOC_AK4613 is not set
-# CONFIG_SND_SOC_AK4642 is not set
-# CONFIG_SND_SOC_AK5386 is not set
-CONFIG_SND_SOC_AK5558=m
-# CONFIG_SND_SOC_ALC5623 is not set
-CONFIG_SND_SOC_BD28623=m
-# CONFIG_SND_SOC_BT_SCO is not set
-# CONFIG_SND_SOC_CS35L32 is not set
-# CONFIG_SND_SOC_CS35L33 is not set
-# CONFIG_SND_SOC_CS35L34 is not set
-# CONFIG_SND_SOC_CS35L35 is not set
-# CONFIG_SND_SOC_CS35L36 is not set
-# CONFIG_SND_SOC_CS42L42 is not set
-# CONFIG_SND_SOC_CS42L51_I2C is not set
-# CONFIG_SND_SOC_CS42L52 is not set
-# CONFIG_SND_SOC_CS42L56 is not set
-# CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS4265 is not set
-# CONFIG_SND_SOC_CS4270 is not set
-# CONFIG_SND_SOC_CS4271_I2C is not set
-# CONFIG_SND_SOC_CS4271_SPI is not set
-# CONFIG_SND_SOC_CS42XX8_I2C is not set
-# CONFIG_SND_SOC_CS43130 is not set
-# CONFIG_SND_SOC_CS4341 is not set
-# CONFIG_SND_SOC_CS4349 is not set
-# CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_CX2072X is not set
-CONFIG_SND_SOC_DA7219=m
-CONFIG_SND_SOC_DMIC=m
-CONFIG_SND_SOC_HDMI_CODEC=m
-# CONFIG_SND_SOC_ES7134 is not set
-# CONFIG_SND_SOC_ES7241 is not set
-# CONFIG_SND_SOC_ES8316 is not set
-# CONFIG_SND_SOC_ES8328_I2C is not set
-# CONFIG_SND_SOC_ES8328_SPI is not set
-# CONFIG_SND_SOC_GTM601 is not set
-CONFIG_SND_SOC_HDAC_HDMI=m
-# CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_MAX98088 is not set
-CONFIG_SND_SOC_MAX98357A=m
-# CONFIG_SND_SOC_MAX98504 is not set
-CONFIG_SND_SOC_MAX9867=m
-# CONFIG_SND_SOC_MAX98927 is not set
-CONFIG_SND_SOC_MAX98373=m
-# CONFIG_SND_SOC_MAX9860 is not set
-# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
-# CONFIG_SND_SOC_PCM1681 is not set
-CONFIG_SND_SOC_PCM1789=m
-CONFIG_SND_SOC_PCM1789_I2C=m
-# CONFIG_SND_SOC_PCM179X_I2C is not set
-# CONFIG_SND_SOC_PCM179X_SPI is not set
-CONFIG_SND_SOC_PCM186X=m
-CONFIG_SND_SOC_PCM186X_I2C=m
-CONFIG_SND_SOC_PCM186X_SPI=m
-# CONFIG_SND_SOC_PCM3060_I2C is not set
-# CONFIG_SND_SOC_PCM3060_SPI is not set
-# CONFIG_SND_SOC_PCM3168A_I2C is not set
-# CONFIG_SND_SOC_PCM3168A_SPI is not set
-# CONFIG_SND_SOC_PCM512x_I2C is not set
-# CONFIG_SND_SOC_PCM512x_SPI is not set
-# CONFIG_SND_SOC_RK3328 is not set
-CONFIG_SND_SOC_RL6231=m
-CONFIG_SND_SOC_RL6347A=m
-CONFIG_SND_SOC_RT286=m
-CONFIG_SND_SOC_RT298=m
-# CONFIG_SND_SOC_RT5616 is not set
-# CONFIG_SND_SOC_RT5631 is not set
-CONFIG_SND_SOC_RT5640=m
-CONFIG_SND_SOC_RT5645=m
-CONFIG_SND_SOC_RT5651=m
-CONFIG_SND_SOC_RT5670=m
-CONFIG_SND_SOC_RT5677=m
-CONFIG_SND_SOC_RT5677_SPI=m
-CONFIG_SND_SOC_RT5682=m
-# CONFIG_SND_SOC_SGTL5000 is not set
-CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
-# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
-CONFIG_SND_SOC_SPDIF=m
-# CONFIG_SND_SOC_SSM2305 is not set
-# CONFIG_SND_SOC_SSM2602_SPI is not set
-# CONFIG_SND_SOC_SSM2602_I2C is not set
-CONFIG_SND_SOC_SSM4567=m
-# CONFIG_SND_SOC_STA32X is not set
-# CONFIG_SND_SOC_STA350 is not set
-# CONFIG_SND_SOC_STI_SAS is not set
-# CONFIG_SND_SOC_TAS2552 is not set
-# CONFIG_SND_SOC_TAS5086 is not set
-# CONFIG_SND_SOC_TAS571X is not set
-# CONFIG_SND_SOC_TAS5720 is not set
-CONFIG_SND_SOC_TAS6424=m
-CONFIG_SND_SOC_TDA7419=m
-# CONFIG_SND_SOC_TFA9879 is not set
-# CONFIG_SND_SOC_TLV320AIC23_I2C is not set
-# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
-# CONFIG_SND_SOC_TLV320AIC31XX is not set
-CONFIG_SND_SOC_TLV320AIC32X4=m
-CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
-CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
-# CONFIG_SND_SOC_TLV320AIC3X is not set
-# CONFIG_SND_SOC_TS3A227E is not set
-CONFIG_SND_SOC_TSCS42XX=m
-# CONFIG_SND_SOC_TSCS454 is not set
-# CONFIG_SND_SOC_UDA1334 is not set
-# CONFIG_SND_SOC_WM8510 is not set
-# CONFIG_SND_SOC_WM8523 is not set
-# CONFIG_SND_SOC_WM8524 is not set
-# CONFIG_SND_SOC_WM8580 is not set
-# CONFIG_SND_SOC_WM8711 is not set
-# CONFIG_SND_SOC_WM8728 is not set
-# CONFIG_SND_SOC_WM8731 is not set
-# CONFIG_SND_SOC_WM8737 is not set
-# CONFIG_SND_SOC_WM8741 is not set
-# CONFIG_SND_SOC_WM8750 is not set
-# CONFIG_SND_SOC_WM8753 is not set
-# CONFIG_SND_SOC_WM8770 is not set
-# CONFIG_SND_SOC_WM8776 is not set
-# CONFIG_SND_SOC_WM8782 is not set
-# CONFIG_SND_SOC_WM8804_I2C is not set
-# CONFIG_SND_SOC_WM8804_SPI is not set
-# CONFIG_SND_SOC_WM8903 is not set
-# CONFIG_SND_SOC_WM8904 is not set
-# CONFIG_SND_SOC_WM8960 is not set
-# CONFIG_SND_SOC_WM8962 is not set
-# CONFIG_SND_SOC_WM8974 is not set
-# CONFIG_SND_SOC_WM8978 is not set
-# CONFIG_SND_SOC_WM8985 is not set
-# CONFIG_SND_SOC_ZX_AUD96P22 is not set
-CONFIG_SND_SOC_MAX9759=m
-# CONFIG_SND_SOC_MT6351 is not set
-# CONFIG_SND_SOC_MT6358 is not set
-# CONFIG_SND_SOC_NAU8540 is not set
-# CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8822 is not set
-CONFIG_SND_SOC_NAU8824=m
-CONFIG_SND_SOC_NAU8825=m
-# CONFIG_SND_SOC_TPA6130A2 is not set
-# end of CODEC drivers
-
-CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_CARD=m
-CONFIG_SND_X86=y
-# CONFIG_HDMI_LPE_AUDIO is not set
-CONFIG_SND_SYNTH_EMUX=m
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=m
-CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACCUTOUCH is not set
-# CONFIG_HID_ACRUX is not set
-CONFIG_HID_APPLE=m
-# CONFIG_HID_APPLEIR is not set
-CONFIG_HID_ASUS=m
-# CONFIG_HID_AUREAL is not set
-# CONFIG_HID_BELKIN is not set
-CONFIG_HID_BETOP_FF=m
-# CONFIG_HID_BIGBEN_FF is not set
-CONFIG_HID_CHERRY=m
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_CORSAIR is not set
-CONFIG_HID_COUGAR=m
-# CONFIG_HID_MACALLY is not set
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CMEDIA=m
-# CONFIG_HID_CP2112 is not set
-# CONFIG_HID_CREATIVE_SB0540 is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-CONFIG_HID_ELAN=m
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GEMBIRD is not set
-# CONFIG_HID_GFRM is not set
-# CONFIG_HID_HOLTEK is not set
-CONFIG_HID_GT683R=m
-CONFIG_HID_KEYTOUCH=m
-# CONFIG_HID_KYE is not set
-CONFIG_HID_UCLOGIC=m
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_VIEWSONIC is not set
-# CONFIG_HID_GYRATION is not set
-CONFIG_HID_ICADE=m
-# CONFIG_HID_ITE is not set
-CONFIG_HID_JABRA=m
-# CONFIG_HID_TWINHAN is not set
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LED=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-# CONFIG_HID_MALTRON is not set
-# CONFIG_HID_MAYFLASH is not set
-# CONFIG_HID_REDRAGON is not set
-CONFIG_HID_MICROSOFT=m
-# CONFIG_HID_MONTEREY is not set
-CONFIG_HID_MULTITOUCH=m
-# CONFIG_HID_NTI is not set
-# CONFIG_HID_NTRIG is not set
-CONFIG_HID_ORTEK=m
-# CONFIG_HID_PANTHERLORD is not set
-CONFIG_HID_PENMOUNT=m
-# CONFIG_HID_PETALYNX is not set
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PLANTRONICS=m
-CONFIG_HID_PRIMAX=m
-# CONFIG_HID_RETRODE is not set
-CONFIG_HID_ROCCAT=m
-# CONFIG_HID_SAITEK is not set
-# CONFIG_HID_SAMSUNG is not set
-CONFIG_HID_SONY=m
-CONFIG_SONY_FF=y
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEAM=m
-# CONFIG_HID_STEELSERIES is not set
-# CONFIG_HID_SUNPLUS is not set
-CONFIG_HID_RMI=m
-# CONFIG_HID_GREENASIA is not set
-CONFIG_HID_HYPERV_MOUSE=m
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-CONFIG_HID_THINGM=m
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_UDRAW_PS3 is not set
-# CONFIG_HID_U2FZERO is not set
-# CONFIG_HID_WACOM is not set
-CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-# CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
-CONFIG_HID_ALPS=m
-# end of Special HID drivers
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# end of USB HID Boot Protocol drivers
-# end of USB HID support
-
-#
-# I2C HID support
-#
-CONFIG_I2C_HID=m
-# end of I2C HID support
-# end of HID support
-
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
-# CONFIG_USB_LED_TRIG is not set
-# CONFIG_USB_ULPI_BUS is not set
-# CONFIG_USB_CONN_GPIO is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-CONFIG_USB_PCI=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG_FSM is not set
-CONFIG_USB_LEDS_TRIGGER_USBPORT=m
-CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_MON=m
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-CONFIG_USB_EHCI_PCI=m
-# CONFIG_USB_EHCI_FSL is not set
-CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-# CONFIG_USB_FOTG210_HCD is not set
-# CONFIG_USB_MAX3421_HCD is not set
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_SSB=y
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_HCD_ISO=y
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-# CONFIG_USB_HCD_BCMA is not set
-CONFIG_USB_HCD_SSB=m
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_VHCI_HC_PORTS=8
-CONFIG_USBIP_VHCI_NR_HCS=1
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-# CONFIG_USB_CDNS3 is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_ISP1760 is not set
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-# CONFIG_USB_SERIAL_F81232 is not set
-# CONFIG_USB_SERIAL_F8153X is not set
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-# CONFIG_USB_SERIAL_MXUPORT is not set
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-# CONFIG_USB_SERIAL_WISHBONE is not set
-# CONFIG_USB_SERIAL_SSU100 is not set
-CONFIG_USB_SERIAL_QT2=m
-# CONFIG_USB_SERIAL_UPD78F0730 is not set
-CONFIG_USB_SERIAL_DEBUG=m
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-# CONFIG_USB_LEGOTOWER is not set
-CONFIG_USB_LCD=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-# CONFIG_USB_APPLEDISPLAY is not set
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_LD=m
-# CONFIG_USB_TRANCEVIBRATOR is not set
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-CONFIG_USB_ISIGHTFW=m
-# CONFIG_USB_YUREX is not set
-CONFIG_USB_EZUSB_FX2=m
-# CONFIG_USB_HUB_USB251XB is not set
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_HSIC_USB4604=m
-# CONFIG_USB_LINK_LAYER_TEST is not set
-CONFIG_USB_CHAOSKEY=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-
-#
-# USB Physical Layer drivers
-#
-CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_USB_GPIO_VBUS=m
-# CONFIG_USB_ISP1301 is not set
-# end of USB Physical Layer drivers
-
-# CONFIG_USB_GADGET is not set
-CONFIG_TYPEC=m
-# CONFIG_TYPEC_TCPM is not set
-# CONFIG_TYPEC_UCSI is not set
-CONFIG_TYPEC_TPS6598X=m
-
-#
-# USB Type-C Multiplexer/DeMultiplexer Switch support
-#
-CONFIG_TYPEC_MUX_PI3USB30532=m
-# end of USB Type-C Multiplexer/DeMultiplexer Switch support
-
-#
-# USB Type-C Alternate Mode drivers
-#
-CONFIG_TYPEC_DP_ALTMODE=m
-# CONFIG_TYPEC_NVIDIA_ALTMODE is not set
-# end of USB Type-C Alternate Mode drivers
-
-CONFIG_USB_ROLE_SWITCH=m
-CONFIG_USB_ROLES_INTEL_XHCI=m
-CONFIG_MMC=m
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_SDIO_UART=m
-CONFIG_MMC_TEST=m
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_SDHCI_F_SDH30=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-# CONFIG_MMC_SPI is not set
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-# CONFIG_MMC_USHC is not set
-# CONFIG_MMC_USDHI6ROL0 is not set
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_CQHCI=m
-CONFIG_MMC_TOSHIBA_PCI=m
-CONFIG_MMC_MTK=m
-# CONFIG_MMC_SDHCI_XENON is not set
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-# CONFIG_MS_BLOCK is not set
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_CLASS_FLASH=m
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
-
-#
-# LED drivers
-#
-CONFIG_LEDS_APU=m
-# CONFIG_LEDS_AS3645A is not set
-CONFIG_LEDS_LM3530=m
-# CONFIG_LEDS_LM3532 is not set
-# CONFIG_LEDS_LM3642 is not set
-CONFIG_LEDS_LM3601X=m
-# CONFIG_LEDS_PCA9532 is not set
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP3952=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-# CONFIG_LEDS_LP8501 is not set
-CONFIG_LEDS_CLEVO_MAIL=m
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_DAC124S085 is not set
-# CONFIG_LEDS_PWM is not set
-CONFIG_LEDS_REGULATOR=m
-# CONFIG_LEDS_BD2802 is not set
-CONFIG_LEDS_INTEL_SS4200=m
-# CONFIG_LEDS_TCA6507 is not set
-CONFIG_LEDS_TLC591XX=m
-# CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_OT200 is not set
-
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_MLXCPLD=m
-CONFIG_LEDS_MLXREG=m
-# CONFIG_LEDS_USER is not set
-# CONFIG_LEDS_NIC78BX is not set
-# CONFIG_LEDS_TI_LMU_COMMON is not set
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_DISK=y
-CONFIG_LEDS_TRIGGER_MTD=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-# CONFIG_LEDS_TRIGGER_CPU is not set
-CONFIG_LEDS_TRIGGER_ACTIVITY=m
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_LEDS_TRIGGER_PANIC=y
-CONFIG_LEDS_TRIGGER_NETDEV=m
-# CONFIG_LEDS_TRIGGER_PATTERN is not set
-CONFIG_LEDS_TRIGGER_AUDIO=m
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
-CONFIG_INFINIBAND_MTHCA=m
-# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
-CONFIG_INFINIBAND_CXGB3=m
-CONFIG_INFINIBAND_CXGB4=m
-CONFIG_INFINIBAND_I40IW=m
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_MLX5_INFINIBAND=m
-# CONFIG_INFINIBAND_OCRDMA is not set
-# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
-# CONFIG_INFINIBAND_USNIC is not set
-CONFIG_RDMA_RXE=m
-# CONFIG_RDMA_SIW is not set
-CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
-# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SRPT=m
-CONFIG_INFINIBAND_ISER=m
-# CONFIG_INFINIBAND_ISERT is not set
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-# CONFIG_EDAC is not set
-CONFIG_RTC_LIB=y
-CONFIG_RTC_MC146818_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_NVMEM=y
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-# CONFIG_RTC_DRV_ABB5ZES3 is not set
-# CONFIG_RTC_DRV_ABEOZ9 is not set
-CONFIG_RTC_DRV_ABX80X=m
-CONFIG_RTC_DRV_DS1307=m
-# CONFIG_RTC_DRV_DS1307_CENTURY is not set
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1374_WDT=y
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-# CONFIG_RTC_DRV_ISL12022 is not set
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF85063=m
-# CONFIG_RTC_DRV_PCF85363 is not set
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8010=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
-# CONFIG_RTC_DRV_RV3028 is not set
-CONFIG_RTC_DRV_RV8803=m
-# CONFIG_RTC_DRV_SD3078 is not set
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_DRV_M41T93=m
-CONFIG_RTC_DRV_M41T94=m
-# CONFIG_RTC_DRV_DS1302 is not set
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1343=m
-CONFIG_RTC_DRV_DS1347=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_MAX6916=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RX4581=m
-# CONFIG_RTC_DRV_RX6110 is not set
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_PCF2123=m
-CONFIG_RTC_DRV_MCP795=m
-CONFIG_RTC_I2C_AND_SPI=m
-
-#
-# SPI and I2C RTC drivers
-#
-# CONFIG_RTC_DRV_DS3232 is not set
-CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_RV3029C2=m
-CONFIG_RTC_DRV_RV3029_HWMON=y
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1685_FAMILY=m
-CONFIG_RTC_DRV_DS1685=y
-# CONFIG_RTC_DRV_DS1689 is not set
-# CONFIG_RTC_DRV_DS17285 is not set
-# CONFIG_RTC_DRV_DS17485 is not set
-# CONFIG_RTC_DRV_DS17885 is not set
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_PCF50633=m
-
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_FTRTC010 is not set
-
-#
-# HID Sensor RTC drivers
-#
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_VIRTUAL_CHANNELS=m
-CONFIG_DMA_ACPI=y
-# CONFIG_ALTERA_MSGDMA is not set
-# CONFIG_INTEL_IDMA64 is not set
-CONFIG_PCH_DMA=m
-CONFIG_QCOM_HIDMA_MGMT=m
-# CONFIG_QCOM_HIDMA is not set
-CONFIG_DW_DMAC_CORE=m
-# CONFIG_DW_DMAC is not set
-CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
-CONFIG_HSU_DMA=m
-
-#
-# DMA Clients
-#
-# CONFIG_ASYNC_TX_DMA is not set
-CONFIG_DMATEST=m
-CONFIG_DMA_ENGINE_RAID=y
-
-#
-# DMABUF options
-#
-CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
-# CONFIG_DMABUF_SELFTESTS is not set
-# end of DMABUF options
-
-CONFIG_AUXDISPLAY=y
-# CONFIG_HD44780 is not set
-CONFIG_KS0108=m
-CONFIG_KS0108_PORT=0x378
-CONFIG_KS0108_DELAY=2
-CONFIG_CFAG12864B=m
-CONFIG_CFAG12864B_RATE=20
-# CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_PARPORT_PANEL is not set
-# CONFIG_CHARLCD_BL_OFF is not set
-# CONFIG_CHARLCD_BL_ON is not set
-CONFIG_CHARLCD_BL_FLASH=y
-# CONFIG_PANEL is not set
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV_GENIRQ=m
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-# CONFIG_UIO_PRUSS is not set
-# CONFIG_UIO_MF624 is not set
-# CONFIG_UIO_HV_GENERIC is not set
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO_VIRQFD=m
-CONFIG_VFIO=m
-# CONFIG_VFIO_NOIOMMU is not set
-CONFIG_VFIO_PCI=m
-CONFIG_VFIO_PCI_VGA=y
-CONFIG_VFIO_PCI_MMAP=y
-CONFIG_VFIO_PCI_INTX=y
-CONFIG_VFIO_PCI_IGD=y
-# CONFIG_VFIO_MDEV is not set
-CONFIG_IRQ_BYPASS_MANAGER=m
-CONFIG_VIRT_DRIVERS=y
-# CONFIG_VBOXGUEST is not set
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_HYPERV=m
-CONFIG_HYPERV_TIMER=y
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
-# end of Microsoft Hyper-V guest support
-
-# CONFIG_GREYBUS is not set
-CONFIG_STAGING=y
-# CONFIG_PRISM2_USB is not set
-# CONFIG_COMEDI is not set
-# CONFIG_RTL8192U is not set
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-# CONFIG_RTL8192E is not set
-CONFIG_RTL8723BS=m
-# CONFIG_R8712U is not set
-# CONFIG_R8188EU is not set
-# CONFIG_RTS5208 is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-
-#
-# IIO staging drivers
-#
-
-#
-# Accelerometers
-#
-# CONFIG_ADIS16203 is not set
-# CONFIG_ADIS16240 is not set
-# end of Accelerometers
-
-#
-# Analog to digital converters
-#
-# CONFIG_AD7816 is not set
-# CONFIG_AD7192 is not set
-# CONFIG_AD7280 is not set
-# end of Analog to digital converters
-
-#
-# Analog digital bi-direction converters
-#
-# CONFIG_ADT7316 is not set
-# end of Analog digital bi-direction converters
-
-#
-# Capacitance to digital converters
-#
-# CONFIG_AD7150 is not set
-# CONFIG_AD7746 is not set
-# end of Capacitance to digital converters
-
-#
-# Direct Digital Synthesis
-#
-# CONFIG_AD9832 is not set
-# CONFIG_AD9834 is not set
-# end of Direct Digital Synthesis
-
-#
-# Network Analyzer, Impedance Converters
-#
-# CONFIG_AD5933 is not set
-# end of Network Analyzer, Impedance Converters
-
-#
-# Active energy metering IC
-#
-# CONFIG_ADE7854 is not set
-# end of Active energy metering IC
-
-#
-# Resolver to digital converters
-#
-# CONFIG_AD2S1210 is not set
-# end of Resolver to digital converters
-# end of IIO staging drivers
-
-# CONFIG_FB_SM750 is not set
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-# CONFIG_SPEAKUP_SYNTH_DUMMY is not set
-# end of Speakup console speech
-
-# CONFIG_STAGING_MEDIA is not set
-
-#
-# Android
-#
-# end of Android
-
-# CONFIG_LTE_GDM724X is not set
-# CONFIG_FIREWIRE_SERIAL is not set
-# CONFIG_GS_FPGABOOT is not set
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_WILC1000_SDIO is not set
-# CONFIG_WILC1000_SPI is not set
-# CONFIG_MOST is not set
-# CONFIG_KS7010 is not set
-# CONFIG_PI433 is not set
-
-#
-# Gasket devices
-#
-# end of Gasket devices
-
-# CONFIG_FIELDBUS_DEV is not set
-# CONFIG_KPC2000 is not set
-
-#
-# ISDN CAPI drivers
-#
-# CONFIG_CAPI_AVM is not set
-# CONFIG_ISDN_DRV_GIGASET is not set
-# CONFIG_HYSDN is not set
-# end of ISDN CAPI drivers
-
-# CONFIG_USB_WUSB_CBAF is not set
-# CONFIG_UWB is not set
-CONFIG_EXFAT_FS=m
-CONFIG_EXFAT_DONT_MOUNT_VFAT=y
-CONFIG_EXFAT_DISCARD=y
-# CONFIG_EXFAT_DELAYED_SYNC is not set
-# CONFIG_EXFAT_KERNEL_DEBUG is not set
-# CONFIG_EXFAT_DEBUG_MSG is not set
-CONFIG_EXFAT_DEFAULT_CODEPAGE=437
-CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_QLGE is not set
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACER_WIRELESS=m
-CONFIG_ACERHDF=m
-CONFIG_ALIENWARE_WMI=m
-CONFIG_ASUS_LAPTOP=m
-# CONFIG_DCDBAS is not set
-CONFIG_DELL_SMBIOS=m
-CONFIG_DELL_SMBIOS_WMI=y
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
-CONFIG_DELL_WMI_DESCRIPTOR=m
-CONFIG_DELL_WMI_AIO=m
-# CONFIG_DELL_WMI_LED is not set
-CONFIG_DELL_SMO8800=m
-CONFIG_DELL_RBTN=m
-CONFIG_DELL_RBU=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_TABLET is not set
-CONFIG_AMILO_RFKILL=m
-CONFIG_GPD_POCKET_FAN=m
-# CONFIG_TC1100_WMI is not set
-CONFIG_HP_ACCEL=m
-CONFIG_HP_WIRELESS=m
-CONFIG_HP_WMI=m
-# CONFIG_LG_LAPTOP is not set
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-# CONFIG_SONYPI_COMPAT is not set
-CONFIG_IDEAPAD_LAPTOP=m
-# CONFIG_SURFACE3_WMI is not set
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_SENSORS_HDAPS=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
-CONFIG_ASUS_WIRELESS=m
-CONFIG_ACPI_WMI=m
-CONFIG_WMI_BMOF=m
-CONFIG_INTEL_WMI_THUNDERBOLT=m
-# CONFIG_XIAOMI_WMI is not set
-CONFIG_MSI_WMI=m
-# CONFIG_PEAQ_WMI is not set
-# CONFIG_TOPSTAR_LAPTOP is not set
-# CONFIG_ACPI_TOSHIBA is not set
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_TOSHIBA_HAPS=m
-# CONFIG_TOSHIBA_WMI is not set
-CONFIG_ACPI_CMPC=m
-# CONFIG_INTEL_INT0002_VGPIO is not set
-CONFIG_INTEL_HID_EVENT=m
-CONFIG_INTEL_VBTN=m
-CONFIG_INTEL_IPS=m
-CONFIG_INTEL_PMC_CORE=y
-# CONFIG_IBM_RTL is not set
-# CONFIG_SAMSUNG_LAPTOP is not set
-CONFIG_MXM_WMI=m
-CONFIG_INTEL_OAKTRAIL=m
-# CONFIG_SAMSUNG_Q10 is not set
-# CONFIG_APPLE_GMUX is not set
-# CONFIG_INTEL_RST is not set
-# CONFIG_INTEL_SMARTCONNECT is not set
-# CONFIG_INTEL_PMC_IPC is not set
-# CONFIG_SURFACE_PRO3_BUTTON is not set
-CONFIG_INTEL_PUNIT_IPC=m
-CONFIG_MLX_PLATFORM=m
-CONFIG_INTEL_CHTDC_TI_PWRBTN=m
-CONFIG_I2C_MULTI_INSTANTIATE=m
-CONFIG_INTEL_ATOMISP2_PM=m
-# CONFIG_HUAWEI_WMI is not set
-CONFIG_PCENGINES_APU2=m
-CONFIG_PMC_ATOM=y
-# CONFIG_MFD_CROS_EC is not set
-CONFIG_CHROME_PLATFORMS=y
-CONFIG_CHROMEOS_LAPTOP=m
-CONFIG_CHROMEOS_PSTORE=m
-# CONFIG_CHROMEOS_TBMC is not set
-# CONFIG_CROS_EC is not set
-CONFIG_CROS_KBD_LED_BACKLIGHT=m
-CONFIG_MELLANOX_PLATFORM=y
-CONFIG_MLXREG_HOTPLUG=m
-CONFIG_MLXREG_IO=m
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-
-#
-# Common Clock Framework
-#
-# CONFIG_COMMON_CLK_MAX9485 is not set
-# CONFIG_COMMON_CLK_SI5341 is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-CONFIG_COMMON_CLK_SI544=m
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_PWM is not set
-# end of Common Clock Framework
-
-# CONFIG_HWSPINLOCK is not set
-
-#
-# Clock Source drivers
-#
-CONFIG_CLKSRC_I8253=y
-CONFIG_CLKEVT_I8253=y
-CONFIG_I8253_LOCK=y
-CONFIG_CLKBLD_I8253=y
-# end of Clock Source drivers
-
-# CONFIG_MAILBOX is not set
-CONFIG_IOMMU_IOVA=y
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-# end of Generic IOMMU Pagetable Support
-
-# CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_DMAR_TABLE=y
-CONFIG_INTEL_IOMMU=y
-# CONFIG_INTEL_IOMMU_SVM is not set
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-CONFIG_HYPERV_IOMMU=y
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-CONFIG_RPMSG=m
-# CONFIG_RPMSG_CHAR is not set
-CONFIG_RPMSG_VIRTIO=m
-# end of Rpmsg drivers
-
-CONFIG_SOUNDWIRE=y
-
-#
-# SoundWire Devices
-#
-CONFIG_SOUNDWIRE_CADENCE=m
-CONFIG_SOUNDWIRE_INTEL=m
-
-#
-# SOC (System On Chip) specific Drivers
-#
-
-#
-# Amlogic SoC drivers
-#
-# end of Amlogic SoC drivers
-
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-# end of i.MX SoC drivers
-
-#
-# Qualcomm SoC drivers
-#
-# end of Qualcomm SoC drivers
-
-# CONFIG_SOC_TI is not set
-
-#
-# Xilinx SoC drivers
-#
-CONFIG_XILINX_VCU=m
-# end of Xilinx SoC drivers
-# end of SOC (System On Chip) specific Drivers
-
-CONFIG_PM_DEVFREQ=y
-
-#
-# DEVFREQ Governors
-#
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
-CONFIG_DEVFREQ_GOV_PERFORMANCE=m
-CONFIG_DEVFREQ_GOV_POWERSAVE=m
-CONFIG_DEVFREQ_GOV_USERSPACE=m
-# CONFIG_DEVFREQ_GOV_PASSIVE is not set
-
-#
-# DEVFREQ Drivers
-#
-# CONFIG_PM_DEVFREQ_EVENT is not set
-CONFIG_EXTCON=y
-
-#
-# Extcon Device Drivers
-#
-# CONFIG_EXTCON_ADC_JACK is not set
-# CONFIG_EXTCON_FSA9480 is not set
-CONFIG_EXTCON_GPIO=m
-# CONFIG_EXTCON_INTEL_INT3496 is not set
-# CONFIG_EXTCON_MAX3355 is not set
-# CONFIG_EXTCON_PTN5150 is not set
-# CONFIG_EXTCON_RT8973A is not set
-# CONFIG_EXTCON_SM5502 is not set
-# CONFIG_EXTCON_USB_GPIO is not set
-CONFIG_MEMORY=y
-CONFIG_IIO=m
-CONFIG_IIO_BUFFER=y
-CONFIG_IIO_BUFFER_CB=m
-# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
-# CONFIG_IIO_CONFIGFS is not set
-CONFIG_IIO_TRIGGER=y
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-# CONFIG_IIO_SW_DEVICE is not set
-# CONFIG_IIO_SW_TRIGGER is not set
-
-#
-# Accelerometers
-#
-# CONFIG_ADIS16201 is not set
-# CONFIG_ADIS16209 is not set
-# CONFIG_ADXL372_SPI is not set
-# CONFIG_ADXL372_I2C is not set
-# CONFIG_BMA180 is not set
-# CONFIG_BMA220 is not set
-# CONFIG_BMC150_ACCEL is not set
-# CONFIG_DA280 is not set
-# CONFIG_DA311 is not set
-# CONFIG_DMARD09 is not set
-# CONFIG_DMARD10 is not set
-CONFIG_HID_SENSOR_ACCEL_3D=m
-# CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_KXSD9 is not set
-# CONFIG_KXCJK1013 is not set
-# CONFIG_MC3230 is not set
-# CONFIG_MMA7455_I2C is not set
-# CONFIG_MMA7455_SPI is not set
-# CONFIG_MMA7660 is not set
-# CONFIG_MMA8452 is not set
-# CONFIG_MMA9551 is not set
-# CONFIG_MMA9553 is not set
-# CONFIG_MXC4005 is not set
-# CONFIG_MXC6255 is not set
-# CONFIG_SCA3000 is not set
-# CONFIG_STK8312 is not set
-# CONFIG_STK8BA50 is not set
-# end of Accelerometers
-
-#
-# Analog to digital converters
-#
-# CONFIG_AD7124 is not set
-# CONFIG_AD7266 is not set
-# CONFIG_AD7291 is not set
-# CONFIG_AD7298 is not set
-# CONFIG_AD7476 is not set
-# CONFIG_AD7606_IFACE_PARALLEL is not set
-# CONFIG_AD7606_IFACE_SPI is not set
-# CONFIG_AD7766 is not set
-# CONFIG_AD7768_1 is not set
-# CONFIG_AD7780 is not set
-# CONFIG_AD7791 is not set
-# CONFIG_AD7793 is not set
-# CONFIG_AD7887 is not set
-# CONFIG_AD7923 is not set
-# CONFIG_AD7949 is not set
-# CONFIG_AD799X is not set
-# CONFIG_CC10001_ADC is not set
-# CONFIG_HI8435 is not set
-# CONFIG_HX711 is not set
-# CONFIG_INA2XX_ADC is not set
-# CONFIG_LTC2471 is not set
-# CONFIG_LTC2485 is not set
-# CONFIG_LTC2497 is not set
-# CONFIG_MAX1027 is not set
-# CONFIG_MAX11100 is not set
-# CONFIG_MAX1118 is not set
-# CONFIG_MAX1363 is not set
-# CONFIG_MAX9611 is not set
-# CONFIG_MCP320X is not set
-# CONFIG_MCP3422 is not set
-# CONFIG_MCP3911 is not set
-# CONFIG_NAU7802 is not set
-# CONFIG_TI_ADC081C is not set
-# CONFIG_TI_ADC0832 is not set
-# CONFIG_TI_ADC084S021 is not set
-# CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC108S102 is not set
-# CONFIG_TI_ADC128S052 is not set
-# CONFIG_TI_ADC161S626 is not set
-# CONFIG_TI_ADS1015 is not set
-# CONFIG_TI_ADS7950 is not set
-# CONFIG_TI_TLC4541 is not set
-# CONFIG_XILINX_XADC is not set
-# end of Analog to digital converters
-
-#
-# Analog Front Ends
-#
-# end of Analog Front Ends
-
-#
-# Amplifiers
-#
-# CONFIG_AD8366 is not set
-# end of Amplifiers
-
-#
-# Chemical Sensors
-#
-# CONFIG_ATLAS_PH_SENSOR is not set
-# CONFIG_BME680 is not set
-# CONFIG_CCS811 is not set
-# CONFIG_IAQCORE is not set
-# CONFIG_SENSIRION_SGP30 is not set
-# CONFIG_SPS30 is not set
-# CONFIG_VZ89X is not set
-# end of Chemical Sensors
-
-#
-# Hid Sensor IIO Common
-#
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-# end of Hid Sensor IIO Common
-
-#
-# SSP Sensor Common
-#
-# CONFIG_IIO_SSP_SENSORHUB is not set
-# end of SSP Sensor Common
-
-#
-# Digital to analog converters
-#
-# CONFIG_AD5064 is not set
-# CONFIG_AD5360 is not set
-# CONFIG_AD5380 is not set
-# CONFIG_AD5421 is not set
-# CONFIG_AD5446 is not set
-# CONFIG_AD5449 is not set
-# CONFIG_AD5592R is not set
-# CONFIG_AD5593R is not set
-# CONFIG_AD5504 is not set
-# CONFIG_AD5624R_SPI is not set
-# CONFIG_LTC1660 is not set
-# CONFIG_LTC2632 is not set
-# CONFIG_AD5686_SPI is not set
-# CONFIG_AD5696_I2C is not set
-# CONFIG_AD5755 is not set
-# CONFIG_AD5758 is not set
-# CONFIG_AD5761 is not set
-# CONFIG_AD5764 is not set
-# CONFIG_AD5791 is not set
-# CONFIG_AD7303 is not set
-# CONFIG_AD8801 is not set
-# CONFIG_DS4424 is not set
-# CONFIG_M62332 is not set
-# CONFIG_MAX517 is not set
-# CONFIG_MCP4725 is not set
-# CONFIG_MCP4922 is not set
-# CONFIG_TI_DAC082S085 is not set
-# CONFIG_TI_DAC5571 is not set
-# CONFIG_TI_DAC7311 is not set
-# CONFIG_TI_DAC7612 is not set
-# end of Digital to analog converters
-
-#
-# IIO dummy driver
-#
-# end of IIO dummy driver
-
-#
-# Frequency Synthesizers DDS/PLL
-#
-
-#
-# Clock Generator/Distribution
-#
-# CONFIG_AD9523 is not set
-# end of Clock Generator/Distribution
-
-#
-# Phase-Locked Loop (PLL) frequency synthesizers
-#
-# CONFIG_ADF4350 is not set
-# CONFIG_ADF4371 is not set
-# end of Phase-Locked Loop (PLL) frequency synthesizers
-# end of Frequency Synthesizers DDS/PLL
-
-#
-# Digital gyroscope sensors
-#
-# CONFIG_ADIS16080 is not set
-# CONFIG_ADIS16130 is not set
-# CONFIG_ADIS16136 is not set
-# CONFIG_ADIS16260 is not set
-# CONFIG_ADXRS450 is not set
-# CONFIG_BMG160 is not set
-# CONFIG_FXAS21002C is not set
-CONFIG_HID_SENSOR_GYRO_3D=m
-# CONFIG_MPU3050_I2C is not set
-# CONFIG_IIO_ST_GYRO_3AXIS is not set
-# CONFIG_ITG3200 is not set
-# end of Digital gyroscope sensors
-
-#
-# Health Sensors
-#
-
-#
-# Heart Rate Monitors
-#
-# CONFIG_AFE4403 is not set
-# CONFIG_AFE4404 is not set
-# CONFIG_MAX30100 is not set
-# CONFIG_MAX30102 is not set
-# end of Heart Rate Monitors
-# end of Health Sensors
-
-#
-# Humidity sensors
-#
-# CONFIG_AM2315 is not set
-# CONFIG_DHT11 is not set
-# CONFIG_HDC100X is not set
-CONFIG_HID_SENSOR_HUMIDITY=m
-# CONFIG_HTS221 is not set
-# CONFIG_HTU21 is not set
-# CONFIG_SI7005 is not set
-# CONFIG_SI7020 is not set
-# end of Humidity sensors
-
-#
-# Inertial measurement units
-#
-# CONFIG_ADIS16400 is not set
-# CONFIG_ADIS16460 is not set
-# CONFIG_ADIS16480 is not set
-# CONFIG_BMI160_I2C is not set
-# CONFIG_BMI160_SPI is not set
-# CONFIG_KMX61 is not set
-# CONFIG_INV_MPU6050_I2C is not set
-# CONFIG_INV_MPU6050_SPI is not set
-# CONFIG_IIO_ST_LSM6DSX is not set
-# end of Inertial measurement units
-
-#
-# Light sensors
-#
-# CONFIG_ACPI_ALS is not set
-# CONFIG_ADJD_S311 is not set
-# CONFIG_AL3320A is not set
-# CONFIG_APDS9300 is not set
-# CONFIG_APDS9960 is not set
-# CONFIG_BH1750 is not set
-# CONFIG_BH1780 is not set
-# CONFIG_CM32181 is not set
-# CONFIG_CM3232 is not set
-# CONFIG_CM3323 is not set
-# CONFIG_CM36651 is not set
-# CONFIG_GP2AP020A00F is not set
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
-# CONFIG_ISL29125 is not set
-CONFIG_HID_SENSOR_ALS=m
-CONFIG_HID_SENSOR_PROX=m
-# CONFIG_JSA1212 is not set
-# CONFIG_RPR0521 is not set
-# CONFIG_LTR501 is not set
-# CONFIG_LV0104CS is not set
-# CONFIG_MAX44000 is not set
-# CONFIG_MAX44009 is not set
-# CONFIG_NOA1305 is not set
-# CONFIG_OPT3001 is not set
-# CONFIG_PA12203001 is not set
-# CONFIG_SI1133 is not set
-# CONFIG_SI1145 is not set
-# CONFIG_STK3310 is not set
-# CONFIG_ST_UVIS25 is not set
-# CONFIG_TCS3414 is not set
-# CONFIG_TCS3472 is not set
-# CONFIG_SENSORS_TSL2563 is not set
-# CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
-# CONFIG_TSL4531 is not set
-# CONFIG_US5182D is not set
-# CONFIG_VCNL4000 is not set
-# CONFIG_VCNL4035 is not set
-# CONFIG_VEML6070 is not set
-# CONFIG_VL6180 is not set
-# CONFIG_ZOPT2201 is not set
-# end of Light sensors
-
-#
-# Magnetometer sensors
-#
-# CONFIG_AK8975 is not set
-# CONFIG_AK09911 is not set
-# CONFIG_BMC150_MAGN_I2C is not set
-# CONFIG_BMC150_MAGN_SPI is not set
-# CONFIG_MAG3110 is not set
-CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
-# CONFIG_MMC35240 is not set
-# CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_SENSORS_HMC5843_I2C is not set
-# CONFIG_SENSORS_HMC5843_SPI is not set
-# CONFIG_SENSORS_RM3100_I2C is not set
-# CONFIG_SENSORS_RM3100_SPI is not set
-# end of Magnetometer sensors
-
-#
-# Multiplexers
-#
-# end of Multiplexers
-
-#
-# Inclinometer sensors
-#
-CONFIG_HID_SENSOR_INCLINOMETER_3D=m
-CONFIG_HID_SENSOR_DEVICE_ROTATION=m
-# end of Inclinometer sensors
-
-#
-# Triggers - standalone
-#
-# CONFIG_IIO_INTERRUPT_TRIGGER is not set
-# CONFIG_IIO_SYSFS_TRIGGER is not set
-# end of Triggers - standalone
-
-#
-# Digital potentiometers
-#
-# CONFIG_AD5272 is not set
-# CONFIG_DS1803 is not set
-# CONFIG_MAX5432 is not set
-# CONFIG_MAX5481 is not set
-# CONFIG_MAX5487 is not set
-# CONFIG_MCP4018 is not set
-# CONFIG_MCP4131 is not set
-# CONFIG_MCP4531 is not set
-# CONFIG_MCP41010 is not set
-# CONFIG_TPL0102 is not set
-# end of Digital potentiometers
-
-#
-# Digital potentiostats
-#
-# CONFIG_LMP91000 is not set
-# end of Digital potentiostats
-
-#
-# Pressure sensors
-#
-# CONFIG_ABP060MG is not set
-# CONFIG_BMP280 is not set
-# CONFIG_DPS310 is not set
-CONFIG_HID_SENSOR_PRESS=m
-# CONFIG_HP03 is not set
-# CONFIG_MPL115_I2C is not set
-# CONFIG_MPL115_SPI is not set
-# CONFIG_MPL3115 is not set
-# CONFIG_MS5611 is not set
-# CONFIG_MS5637 is not set
-# CONFIG_IIO_ST_PRESS is not set
-# CONFIG_T5403 is not set
-# CONFIG_HP206C is not set
-# CONFIG_ZPA2326 is not set
-# end of Pressure sensors
-
-#
-# Lightning sensors
-#
-# CONFIG_AS3935 is not set
-# end of Lightning sensors
-
-#
-# Proximity and distance sensors
-#
-# CONFIG_ISL29501 is not set
-# CONFIG_LIDAR_LITE_V2 is not set
-# CONFIG_MB1232 is not set
-# CONFIG_RFD77402 is not set
-# CONFIG_SRF04 is not set
-# CONFIG_SX9500 is not set
-# CONFIG_SRF08 is not set
-# CONFIG_VL53L0X_I2C is not set
-# end of Proximity and distance sensors
-
-#
-# Resolver to digital converters
-#
-# CONFIG_AD2S90 is not set
-# CONFIG_AD2S1200 is not set
-# end of Resolver to digital converters
-
-#
-# Temperature sensors
-#
-# CONFIG_MAXIM_THERMOCOUPLE is not set
-CONFIG_HID_SENSOR_TEMP=m
-# CONFIG_MLX90614 is not set
-# CONFIG_MLX90632 is not set
-# CONFIG_TMP006 is not set
-# CONFIG_TMP007 is not set
-# CONFIG_TSYS01 is not set
-# CONFIG_TSYS02D is not set
-# CONFIG_MAX31856 is not set
-# end of Temperature sensors
-
-CONFIG_NTB=m
-# CONFIG_NTB_MSI is not set
-# CONFIG_NTB_IDT is not set
-CONFIG_NTB_SWITCHTEC=m
-CONFIG_NTB_PINGPONG=m
-# CONFIG_NTB_TOOL is not set
-CONFIG_NTB_PERF=m
-CONFIG_NTB_TRANSPORT=m
-# CONFIG_VME_BUS is not set
-CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
-CONFIG_PWM_LPSS=m
-CONFIG_PWM_LPSS_PCI=m
-CONFIG_PWM_LPSS_PLATFORM=m
-CONFIG_PWM_PCA9685=m
-
-#
-# IRQ chip support
-#
-# end of IRQ chip support
-
-# CONFIG_IPACK_BUS is not set
-CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_TI_SYSCON is not set
-
-#
-# PHY Subsystem
-#
-CONFIG_GENERIC_PHY=y
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_CPCAP_USB is not set
-# end of PHY Subsystem
-
-# CONFIG_POWERCAP is not set
-# CONFIG_MCB is not set
-
-#
-# Performance monitor support
-#
-# end of Performance monitor support
-
-CONFIG_RAS=y
-CONFIG_THUNDERBOLT=m
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-# end of Android
-
-CONFIG_DAX=m
-CONFIG_DEV_DAX=m
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SYSFS=y
-
-#
-# HW tracing support
-#
-# CONFIG_STM is not set
-# CONFIG_INTEL_TH is not set
-# end of HW tracing support
-
-# CONFIG_FPGA is not set
-CONFIG_PM_OPP=y
-# CONFIG_SIOX is not set
-# CONFIG_SLIMBUS is not set
-# CONFIG_INTERCONNECT is not set
-# CONFIG_COUNTER is not set
-# end of Device Drivers
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-# CONFIG_VALIDATE_FS_PARSER is not set
-CONFIG_FS_IOMAP=y
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-# CONFIG_REISERFS_FS_SECURITY is not set
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-CONFIG_XFS_ONLINE_SCRUB=y
-# CONFIG_XFS_ONLINE_REPAIR is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-# CONFIG_OCFS2_FS_STATS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_FS_REF_VERIFY is not set
-CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=m
-# CONFIG_F2FS_STAT_FS is not set
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-# CONFIG_F2FS_FS_SECURITY is not set
-# CONFIG_F2FS_CHECK_FS is not set
-# CONFIG_F2FS_IO_TRACE is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_FS_DAX is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_EXPORTFS_BLOCK_OPS=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_MANDATORY_FILE_LOCKING is not set
-CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_DNOTIFY is not set
-CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_AUTOFS_FS=m
-CONFIG_FUSE_FS=m
-# CONFIG_CUSE is not set
-CONFIG_VIRTIO_FS=m
-CONFIG_OVERLAY_FS=m
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
-# CONFIG_OVERLAY_FS_INDEX is not set
-# CONFIG_OVERLAY_FS_XINO_AUTO is not set
-# CONFIG_OVERLAY_FS_METACOPY is not set
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_FAT_DEFAULT_UTF8 is not set
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-# end of DOS/FAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-# CONFIG_PROC_KCORE is not set
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PROC_CHILDREN is not set
-CONFIG_PROC_PID_ARCH_STATUS=y
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-# CONFIG_HUGETLBFS is not set
-CONFIG_MEMFD_CREATE=y
-CONFIG_CONFIGFS_FS=m
-CONFIG_EFIVAR_FS=m
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_ORANGEFS_FS=m
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-CONFIG_EFS_FS=m
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_FS_XATTR=y
-CONFIG_JFFS2_FS_POSIX_ACL=y
-CONFIG_JFFS2_FS_SECURITY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RTIME=y
-CONFIG_JFFS2_RUBIN=y
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-CONFIG_UBIFS_FS=m
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
-# CONFIG_UBIFS_ATIME_SUPPORT is not set
-CONFIG_UBIFS_FS_XATTR=y
-CONFIG_UBIFS_FS_SECURITY=y
-# CONFIG_UBIFS_FS_AUTHENTICATION is not set
-# CONFIG_CRAMFS is not set
-CONFIG_SQUASHFS=m
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZSTD is not set
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-CONFIG_HPFS_FS=m
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-CONFIG_ROMFS_FS=m
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
-# CONFIG_ROMFS_BACKED_BY_MTD is not set
-# CONFIG_ROMFS_BACKED_BY_BOTH is not set
-CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_PSTORE=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=y
-# CONFIG_PSTORE_LZO_COMPRESS is not set
-# CONFIG_PSTORE_LZ4_COMPRESS is not set
-# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
-# CONFIG_PSTORE_842_COMPRESS is not set
-# CONFIG_PSTORE_ZSTD_COMPRESS is not set
-CONFIG_PSTORE_COMPRESS=y
-CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
-CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-# CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-# CONFIG_EROFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
-# CONFIG_NFS_V4_1_MIGRATION is not set
-CONFIG_NFS_V4_SECURITY_LABEL=y
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_BLOCKLAYOUT=y
-CONFIG_NFSD_SCSILAYOUT=y
-CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFSD_V4_SECURITY_LABEL is not set
-CONFIG_GRACE_PERIOD=m
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
-# CONFIG_SUNRPC_DEBUG is not set
-CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CEPH_FS_POSIX_ACL=y
-# CONFIG_CEPH_FS_SECURITY_LABEL is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_UPCALL is not set
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_DEBUG=y
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
-CONFIG_CIFS_DFS_UPCALL=y
-# CONFIG_CIFS_SMB_DIRECT is not set
-CONFIG_CIFS_FSCACHE=y
-CONFIG_CODA_FS=m
-# CONFIG_AFS_FS is not set
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-# CONFIG_9P_FS_SECURITY is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-# CONFIG_UNICODE is not set
-# end of File systems
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_KEYS_REQUEST_CACHE is not set
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_KEY_DH_OPERATIONS=y
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_INFINIBAND is not set
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-# CONFIG_INTEL_TXT is not set
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_HARDENED_USERCOPY_FALLBACK=y
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
-CONFIG_FORTIFY_SOURCE=y
-# CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_HASH=y
-CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
-# CONFIG_SECURITY_APPARMOR_DEBUG is not set
-# CONFIG_SECURITY_LOADPIN is not set
-CONFIG_SECURITY_YAMA=y
-# CONFIG_SECURITY_SAFESETID is not set
-# CONFIG_SECURITY_LOCKDOWN_LSM is not set
-# CONFIG_INTEGRITY is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=m
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_KPP=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_SIMD=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-CONFIG_CRYPTO_ENGINE=m
-
-#
-# Public-key cryptography
-#
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECC=m
-CONFIG_CRYPTO_ECDH=m
-# CONFIG_CRYPTO_ECRDSA is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CFB=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=m
-# CONFIG_CRYPTO_OFB is not set
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m
-# CONFIG_CRYPTO_ADIANTUM is not set
-CONFIG_CRYPTO_ESSIV=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32C_INTEL=m
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-# CONFIG_CRYPTO_XXHASH is not set
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_586=m
-CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_586=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=m
-# CONFIG_CRYPTO_842 is not set
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-CONFIG_CRYPTO_ZSTD=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=m
-CONFIG_CRYPTO_DRBG_HMAC=y
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-CONFIG_CRYPTO_DRBG=m
-CONFIG_CRYPTO_JITTERENTROPY=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
-CONFIG_CRYPTO_HASH_INFO=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_GEODE=m
-CONFIG_CRYPTO_DEV_HIFN_795X=m
-CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_SP_CCP=y
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
-CONFIG_CRYPTO_DEV_QAT=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
-CONFIG_CRYPTO_DEV_QAT_C3XXX=m
-CONFIG_CRYPTO_DEV_QAT_C62X=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
-CONFIG_CRYPTO_DEV_QAT_C62XVF=m
-CONFIG_CRYPTO_DEV_CHELSIO=m
-CONFIG_CRYPTO_DEV_VIRTIO=m
-# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
-CONFIG_ASYMMETRIC_KEY_TYPE=y
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-# CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE is not set
-CONFIG_X509_CERTIFICATE_PARSER=y
-CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
-CONFIG_PKCS7_MESSAGE_PARSER=y
-# CONFIG_PKCS7_TEST_KEY is not set
-CONFIG_SIGNED_PE_FILE_VERIFICATION=y
-
-#
-# Certificates for signature checking
-#
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
-CONFIG_SECONDARY_TRUSTED_KEYRING=y
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-# end of Certificates for signature checking
-
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_RAID6_PQ_BENCHMARK=y
-# CONFIG_PACKING is not set
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_CORDIC=m
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=m
-# CONFIG_CRC4 is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_XXHASH=y
-CONFIG_AUDIT_GENERIC=y
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_COMPRESS=m
-CONFIG_ZSTD_DECOMPRESS=m
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_INTERVAL_TREE=y
-CONFIG_XARRAY_MULTI=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_DMA_VIRT_OPS=y
-CONFIG_SWIOTLB=y
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
-CONFIG_CLZ_TAB=y
-CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=y
-CONFIG_DIMLIB=y
-CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=y
-CONFIG_HAVE_GENERIC_VDSO=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_GENERIC_VDSO_32=y
-CONFIG_FONT_SUPPORT=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-CONFIG_SG_POOL=y
-CONFIG_ARCH_STACKWALK=y
-CONFIG_SBITMAP=y
-# CONFIG_STRING_SELFTEST is not set
-# end of Library routines
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-# CONFIG_PRINTK_CALLER is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=3
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# end of printk and dmesg options
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_INSTALL is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# end of Compile-time checks and compiler options
-
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_MAGIC_SYSRQ_SERIAL=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_OWNER is not set
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=16000
-# CONFIG_DEBUG_KMEMLEAK_TEST is not set
-CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
-CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN=y
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-CONFIG_CC_HAS_KASAN_GENERIC=y
-CONFIG_KASAN_STACK=1
-# end of Memory Debugging
-
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-CONFIG_DEBUG_SHIRQ=y
-
-#
-# Debug Lockups and Hangs
-#
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_SOFTLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_HARDLOCKUP_DETECTOR_PERF=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_WQ_WATCHDOG is not set
-# end of Debug Lockups and Hangs
-
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-CONFIG_SCHEDSTATS=y
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-# end of Lock Debugging (spinlocks, mutexes, etc...)
-
-CONFIG_STACKTRACE=y
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# end of RCU Debugging
-
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-CONFIG_FUNCTION_ERROR_INJECTION=y
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_LATENCYTOP=y
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_FENTRY=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_PREEMPTIRQ_EVENTS is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_KPROBE_EVENTS=y
-# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-# CONFIG_BPF_KPROBE_OVERRIDE is not set
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_FTRACE_STARTUP_TEST is not set
-CONFIG_MMIOTRACE=y
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_MMIOTRACE_TEST is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_RUNTIME_TESTING_MENU is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_IO_STRICT_DEVMEM=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_X86_VERBOSE_BOOTUP is not set
-# CONFIG_EARLY_PRINTK is not set
-# CONFIG_X86_PTDUMP is not set
-# CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_DEBUG_WX is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-CONFIG_X86_DECODER_SELFTEST=y
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-# CONFIG_DEBUG_ENTRY is not set
-CONFIG_DEBUG_NMI_SELFTEST=y
-CONFIG_X86_DEBUG_FPU=y
-# CONFIG_PUNIT_ATOM_DEBUG is not set
-CONFIG_UNWINDER_FRAME_POINTER=y
-# CONFIG_UNWINDER_GUESS is not set
-# end of Kernel hacking
diff --git a/main/linux-lts/config-lts.x86_64 b/main/linux-lts/config-lts.x86_64
deleted file mode 100644
index 13cb5795deb..00000000000
--- a/main/linux-lts/config-lts.x86_64
+++ /dev/null
@@ -1,8741 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.4.23 Kernel Configuration
-#
-
-#
-# Compiler: gcc (Alpine 9.2.0) 9.2.0
-#
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-CONFIG_THREAD_INFO_IN_TASK=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-# CONFIG_HEADER_TEST is not set
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT=""
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-# CONFIG_CROSS_MEMORY_ATTACH is not set
-# CONFIG_USELIB is not set
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
-CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
-# end of IRQ subsystem
-
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_ARCH_CLOCKSOURCE_INIT=y
-CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-# end of Timers subsystem
-
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-CONFIG_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_SCHED_AVG_IRQ=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_PSI=y
-CONFIG_PSI_DEFAULT_DISABLED=y
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-CONFIG_IKCONFIG=m
-CONFIG_IKCONFIG_PROC=y
-# CONFIG_IKHEADERS is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-
-#
-# Scheduler features
-#
-# CONFIG_UCLAMP_TASK is not set
-# end of Scheduler features
-
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
-CONFIG_ARCH_SUPPORTS_INT128=y
-# CONFIG_NUMA_BALANCING is not set
-CONFIG_CGROUPS=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CPUSETS=y
-# CONFIG_PROC_PID_CPUSET is not set
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-# CONFIG_CGROUP_PERF is not set
-CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-# CONFIG_CHECKPOINT_RESTORE is not set
-CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_MULTIUSER=y
-# CONFIG_SGETMASK_SYSCALL is not set
-# CONFIG_SYSFS_SYSCALL is not set
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_FHANDLE=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
-# CONFIG_USERFAULTFD is not set
-CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-# CONFIG_PC104 is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_SLAB_FREELIST_RANDOM=y
-# CONFIG_SLAB_FREELIST_HARDENED is not set
-CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_SYSTEM_DATA_VERIFICATION=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-# end of General setup
-
-CONFIG_64BIT=y
-CONFIG_X86_64=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MIN=28
-CONFIG_ARCH_MMAP_RND_BITS_MAX=32
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ZONE_DMA32=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_X86_64_SMP=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=4
-CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
-
-#
-# Processor type and features
-#
-CONFIG_ZONE_DMA=y
-CONFIG_SMP=y
-CONFIG_X86_FEATURE_NAMES=y
-CONFIG_X86_X2APIC=y
-CONFIG_X86_MPPARSE=y
-# CONFIG_GOLDFISH is not set
-CONFIG_RETPOLINE=y
-# CONFIG_X86_CPU_RESCTRL is not set
-CONFIG_X86_EXTENDED_PLATFORM=y
-# CONFIG_X86_NUMACHIP is not set
-# CONFIG_X86_VSMP is not set
-# CONFIG_X86_UV is not set
-# CONFIG_X86_GOLDFISH is not set
-# CONFIG_X86_INTEL_MID is not set
-CONFIG_X86_INTEL_LPSS=y
-CONFIG_X86_AMD_PLATFORM_DEVICE=y
-CONFIG_IOSF_MBI=y
-# CONFIG_IOSF_MBI_DEBUG is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-CONFIG_PARAVIRT_XXL=y
-# CONFIG_PARAVIRT_DEBUG is not set
-# CONFIG_PARAVIRT_SPINLOCKS is not set
-CONFIG_X86_HV_CALLBACK_VECTOR=y
-CONFIG_XEN=y
-CONFIG_XEN_PV=y
-CONFIG_XEN_PV_SMP=y
-CONFIG_XEN_DOM0=y
-CONFIG_XEN_PVHVM=y
-CONFIG_XEN_PVHVM_SMP=y
-CONFIG_XEN_512GB=y
-CONFIG_XEN_SAVE_RESTORE=y
-# CONFIG_XEN_DEBUG_FS is not set
-CONFIG_XEN_PVH=y
-CONFIG_KVM_GUEST=y
-CONFIG_ARCH_CPUIDLE_HALTPOLL=y
-CONFIG_PVH=y
-# CONFIG_KVM_DEBUG_FS is not set
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_JAILHOUSE_GUEST is not set
-# CONFIG_ACRN_GUEST is not set
-# CONFIG_MK8 is not set
-# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=64
-CONFIG_X86_DEBUGCTLMSR=y
-# CONFIG_PROCESSOR_SELECT is not set
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_HYGON=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_ZHAOXIN=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_GART_IOMMU=y
-# CONFIG_CALGARY_IOMMU is not set
-# CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS_RANGE_BEGIN=2
-CONFIG_NR_CPUS_RANGE_END=512
-CONFIG_NR_CPUS_DEFAULT=64
-CONFIG_NR_CPUS=256
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_MC_PRIO=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
-CONFIG_X86_MCE=y
-# CONFIG_X86_MCELOG_LEGACY is not set
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-CONFIG_X86_MCE_THRESHOLD=y
-# CONFIG_X86_MCE_INJECT is not set
-CONFIG_X86_THERMAL_VECTOR=y
-
-#
-# Performance monitoring
-#
-CONFIG_PERF_EVENTS_INTEL_UNCORE=y
-CONFIG_PERF_EVENTS_INTEL_RAPL=m
-CONFIG_PERF_EVENTS_INTEL_CSTATE=m
-CONFIG_PERF_EVENTS_AMD_POWER=m
-# end of Performance monitoring
-
-# CONFIG_X86_16BIT is not set
-CONFIG_X86_VSYSCALL_EMULATION=y
-CONFIG_I8K=m
-CONFIG_MICROCODE=y
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-# CONFIG_X86_5LEVEL is not set
-CONFIG_X86_DIRECT_GBPAGES=y
-# CONFIG_X86_CPA_STATISTICS is not set
-# CONFIG_AMD_MEM_ENCRYPT is not set
-CONFIG_NUMA=y
-CONFIG_AMD_NUMA=y
-CONFIG_X86_64_ACPI_NUMA=y
-CONFIG_NODES_SPAN_OTHER_NODES=y
-# CONFIG_NUMA_EMU is not set
-CONFIG_NODES_SHIFT=6
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_X86_PMEM_LEGACY_DEVICE=y
-CONFIG_X86_PMEM_LEGACY=y
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW=64
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_ARCH_RANDOM=y
-CONFIG_X86_SMAP=y
-CONFIG_X86_INTEL_UMIP=y
-# CONFIG_X86_INTEL_MPX is not set
-CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
-# CONFIG_X86_INTEL_TSX_MODE_OFF is not set
-# CONFIG_X86_INTEL_TSX_MODE_ON is not set
-CONFIG_X86_INTEL_TSX_MODE_AUTO=y
-CONFIG_EFI=y
-CONFIG_EFI_STUB=y
-# CONFIG_EFI_MIXED is not set
-CONFIG_SECCOMP=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-CONFIG_HZ_300=y
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=300
-CONFIG_SCHED_HRTICK=y
-# CONFIG_KEXEC is not set
-# CONFIG_KEXEC_FILE is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_DYNAMIC_MEMORY_LAYOUT=y
-CONFIG_RANDOMIZE_MEMORY=y
-CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_LEGACY_VSYSCALL_EMULATE is not set
-# CONFIG_LEGACY_VSYSCALL_XONLY is not set
-CONFIG_LEGACY_VSYSCALL_NONE=y
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_MODIFY_LDT_SYSCALL=y
-CONFIG_HAVE_LIVEPATCH=y
-CONFIG_LIVEPATCH=y
-# end of Processor type and features
-
-CONFIG_ARCH_HAS_ADD_PAGES=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_ARCH_ENABLE_THP_MIGRATION=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_CLK=y
-CONFIG_PM_GENERIC_DOMAINS=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-# CONFIG_ENERGY_MODEL is not set
-CONFIG_ARCH_SUPPORTS_ACPI=y
-CONFIG_ACPI=y
-CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
-CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
-CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
-# CONFIG_ACPI_DEBUGGER is not set
-CONFIG_ACPI_SPCR_TABLE=y
-CONFIG_ACPI_LPIT=y
-CONFIG_ACPI_SLEEP=y
-# CONFIG_ACPI_PROCFS_POWER is not set
-CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
-CONFIG_ACPI_EC_DEBUGFS=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_TAD=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_CPU_FREQ_PSS=y
-CONFIG_ACPI_PROCESSOR_CSTATE=y
-CONFIG_ACPI_PROCESSOR_IDLE=y
-CONFIG_ACPI_CPPC_LIB=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_NUMA=y
-CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
-CONFIG_ACPI_TABLE_UPGRADE=y
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HOTPLUG_IOAPIC=y
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=m
-# CONFIG_ACPI_CUSTOM_METHOD is not set
-CONFIG_ACPI_BGRT=y
-# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
-# CONFIG_ACPI_NFIT is not set
-# CONFIG_ACPI_HMAT is not set
-CONFIG_HAVE_ACPI_APEI=y
-CONFIG_HAVE_ACPI_APEI_NMI=y
-CONFIG_ACPI_APEI=y
-# CONFIG_ACPI_APEI_GHES is not set
-CONFIG_ACPI_APEI_PCIEAER=y
-# CONFIG_ACPI_APEI_EINJ is not set
-CONFIG_ACPI_APEI_ERST_DEBUG=y
-CONFIG_DPTF_POWER=m
-CONFIG_ACPI_WATCHDOG=y
-CONFIG_ACPI_EXTLOG=y
-CONFIG_ACPI_ADXL=y
-CONFIG_PMIC_OPREGION=y
-# CONFIG_CHT_DC_TI_PMIC_OPREGION is not set
-CONFIG_ACPI_CONFIGFS=m
-CONFIG_X86_PM_TIMER=y
-# CONFIG_SFI is not set
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-
-#
-# CPU frequency scaling drivers
-#
-CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ_CPB=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_AMD_FREQ_SENSITIVITY=m
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_P4_CLOCKMOD=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-# end of CPU Frequency scaling
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
-# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set
-CONFIG_HALTPOLL_CPUIDLE=y
-# end of CPU Idle
-
-CONFIG_INTEL_IDLE=y
-# end of Power management and ACPI options
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_XEN=y
-CONFIG_MMCONF_FAM10H=y
-CONFIG_PCI_CNB20LE_QUIRK=y
-# CONFIG_ISA_BUS is not set
-CONFIG_ISA_DMA_API=y
-CONFIG_AMD_NB=y
-# CONFIG_X86_SYSFB is not set
-# end of Bus options (PCI etc.)
-
-#
-# Binary Emulations
-#
-CONFIG_IA32_EMULATION=y
-# CONFIG_X86_X32 is not set
-CONFIG_COMPAT_32=y
-CONFIG_COMPAT=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_SYSVIPC_COMPAT=y
-# end of Binary Emulations
-
-CONFIG_X86_DEV_DMA_OPS=y
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-# CONFIG_EDD_OFF is not set
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DMIID=y
-# CONFIG_DMI_SYSFS is not set
-CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
-# CONFIG_ISCSI_IBFT is not set
-CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-# CONFIG_EFI_FAKE_MEMMAP is not set
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-# CONFIG_EFI_BOOTLOADER_CONTROL is not set
-# CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_TEST is not set
-CONFIG_APPLE_PROPERTIES=y
-# CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_EFI_RCI2_TABLE is not set
-# end of EFI (Extensible Firmware Interface) Support
-
-CONFIG_UEFI_CPER=y
-CONFIG_UEFI_CPER_X86=y
-CONFIG_EFI_DEV_PATH_PARSER=y
-CONFIG_EFI_EARLYCON=y
-
-#
-# Tegra firmware driver
-#
-# end of Tegra firmware driver
-# end of Firmware Drivers
-
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_KVM_VFIO=y
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_KVM_COMPAT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_NO_POLL=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_AMD_SEV=y
-# CONFIG_KVM_MMU_AUDIT is not set
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_VSOCK=m
-CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-
-#
-# General architecture-dependent options
-#
-CONFIG_HOTPLUG_SMT=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-CONFIG_HAVE_OPROFILE=y
-CONFIG_OPROFILE_NMI_TIMER=y
-CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_OPTPROBES=y
-CONFIG_KPROBES_ON_FTRACE=y
-CONFIG_UPROBES=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_KRETPROBES=y
-CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_KPROBES_ON_FTRACE=y
-CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_HAS_SET_MEMORY=y
-CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
-CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
-CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
-CONFIG_HAVE_ASM_MODVERSIONS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
-CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_ARCH_STACKLEAK=y
-CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_MOVE_PMD=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
-CONFIG_HAVE_ARCH_HUGE_VMAP=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_HAVE_ARCH_SOFT_DIRTY=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=28
-CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
-CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_HAVE_STACK_VALIDATION=y
-CONFIG_HAVE_RELIABLE_STACKTRACE=y
-CONFIG_ISA_BUS_API=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_COMPAT_OLD_SIGACTION=y
-CONFIG_64BIT_TIME=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_HAVE_ARCH_VMAP_STACK=y
-CONFIG_VMAP_STACK=y
-CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_ARCH_HAS_REFCOUNT=y
-# CONFIG_REFCOUNT_FULL is not set
-CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
-# CONFIG_LOCK_EVENT_COUNTS is not set
-CONFIG_ARCH_HAS_MEM_ENCRYPT=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# end of GCOV-based kernel profiling
-
-CONFIG_PLUGIN_HOSTCC=""
-CONFIG_HAVE_GCC_PLUGINS=y
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
-CONFIG_ASM_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-# CONFIG_BLK_DEV_ZONED is not set
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
-# CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_WBT is not set
-CONFIG_BLK_CGROUP_IOLATENCY=y
-# CONFIG_BLK_CGROUP_IOCOST is not set
-CONFIG_BLK_DEBUG_FS=y
-# CONFIG_BLK_SED_OPAL is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AIX_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_CMDLINE_PARTITION is not set
-# end of Partition Types
-
-CONFIG_BLOCK_COMPAT=y
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_MQ_RDMA=y
-CONFIG_BLK_PM=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-# CONFIG_IOSCHED_BFQ is not set
-# end of IO Schedulers
-
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-CONFIG_QUEUED_SPINLOCKS=y
-CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
-CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
-CONFIG_FREEZER=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_ELFCORE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_FAST_GUP=y
-# CONFIG_MEMORY_HOTPLUG is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-# CONFIG_MEMORY_FAILURE is not set
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-CONFIG_ARCH_WANTS_THP_SWAP=y
-CONFIG_THP_SWAP=y
-CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
-# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
-# CONFIG_CMA is not set
-CONFIG_ZPOOL=m
-# CONFIG_ZBUD is not set
-CONFIG_Z3FOLD=m
-CONFIG_ZSMALLOC=y
-# CONFIG_PGTABLE_MAPPING is not set
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_ARCH_HAS_PTE_DEVMAP=y
-CONFIG_FRAME_VECTOR=y
-CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
-CONFIG_ARCH_HAS_PKEYS=y
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
-# CONFIG_READ_ONLY_THP_FOR_FS is not set
-CONFIG_ARCH_HAS_PTE_SPECIAL=y
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_COMPAT_NETLINK_MESSAGES=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_EGRESS=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=m
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-CONFIG_UNIX_DIAG=m
-# CONFIG_TLS is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-CONFIG_XFRM_INTERFACE=m
-CONFIG_XFRM_SUB_POLICY=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_SMC is not set
-CONFIG_XDP_SOCKETS=y
-# CONFIG_XDP_SOCKETS_DIAG is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=y
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE_COMMON=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-# CONFIG_IP_PIMSM_V1 is not set
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-CONFIG_NET_FOU_IP_TUNNELS=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-# CONFIG_INET_ESP_OFFLOAD is not set
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-# CONFIG_INET_RAW_DIAG is not set
-CONFIG_INET_DIAG_DESTROY=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_NV=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_TCP_CONG_DCTCP=m
-CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-# CONFIG_INET6_ESP_OFFLOAD is not set
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_FOU=m
-CONFIG_IPV6_FOU_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_NETLABEL is not set
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NET_PTP_CLASSIFY=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_FAMILY_BRIDGE=y
-CONFIG_NETFILTER_FAMILY_ARP=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK_OSF=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-# CONFIG_NF_LOG_NETDEV is not set
-CONFIG_NETFILTER_CONNCOUNT=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_PROCFS=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=y
-CONFIG_NF_NAT_MASQUERADE=y
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_SET=m
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_NUMGEN=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_FLOW_OFFLOAD=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CONNLIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_TUNNEL=m
-# CONFIG_NFT_OBJREF is not set
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_FIB=m
-CONFIG_NFT_FIB_INET=m
-# CONFIG_NFT_XFRM is not set
-CONFIG_NFT_SOCKET=m
-CONFIG_NFT_OSF=m
-CONFIG_NFT_TPROXY=m
-# CONFIG_NFT_SYNPROXY is not set
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_FIB_NETDEV=m
-CONFIG_NF_FLOW_TABLE_INET=m
-CONFIG_NF_FLOW_TABLE=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-# end of Core Netfilter Configuration
-
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_MH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS MH scheduler
-#
-CONFIG_IP_VS_MH_TAB_INDEX=12
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_SOCKET_IPV4=m
-CONFIG_NF_TPROXY_IPV4=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_FLOW_TABLE_IPV4=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-# CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# end of IP: Netfilter Configuration
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_SOCKET_IPV6=m
-CONFIG_NF_TPROXY_IPV6=m
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_FIB_IPV6=m
-CONFIG_NF_FLOW_TABLE_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_SRH=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-# CONFIG_IP6_NF_SECURITY is not set
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-# end of IPv6: Netfilter Configuration
-
-CONFIG_NF_DEFRAG_IPV6=m
-
-#
-# DECnet: Netfilter Configuration
-#
-CONFIG_DECNET_NF_GRABULATOR=m
-# end of DECnet: Netfilter Configuration
-
-CONFIG_NF_TABLES_BRIDGE=m
-# CONFIG_NFT_BRIDGE_META is not set
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-# CONFIG_BPFILTER is not set
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-# end of DCCP CCIDs Configuration
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-# end of DCCP Kernel Hacking
-
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-CONFIG_INET_SCTP_DIAG=m
-CONFIG_RDS=m
-# CONFIG_RDS_RDMA is not set
-# CONFIG_RDS_TCP is not set
-# CONFIG_RDS_DEBUG is not set
-CONFIG_TIPC=m
-# CONFIG_TIPC_MEDIA_IB is not set
-CONFIG_TIPC_MEDIA_UDP=y
-CONFIG_TIPC_DIAG=m
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_L2TP=m
-# CONFIG_L2TP_DEBUGFS is not set
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_MRP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_HAVE_NET_DSA=y
-CONFIG_NET_DSA=m
-# CONFIG_NET_DSA_TAG_8021Q is not set
-CONFIG_NET_DSA_TAG_BRCM_COMMON=m
-CONFIG_NET_DSA_TAG_BRCM=m
-CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
-# CONFIG_NET_DSA_TAG_GSWIP is not set
-CONFIG_NET_DSA_TAG_DSA=m
-CONFIG_NET_DSA_TAG_EDSA=m
-# CONFIG_NET_DSA_TAG_MTK is not set
-# CONFIG_NET_DSA_TAG_KSZ is not set
-CONFIG_NET_DSA_TAG_QCA=m
-# CONFIG_NET_DSA_TAG_LAN9303 is not set
-# CONFIG_NET_DSA_TAG_SJA1105 is not set
-CONFIG_NET_DSA_TAG_TRAILER=m
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q_MVRP=y
-CONFIG_DECNET=m
-CONFIG_DECNET_ROUTER=y
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_X25=m
-CONFIG_LAPB=m
-CONFIG_PHONET=m
-CONFIG_6LOWPAN=m
-# CONFIG_6LOWPAN_DEBUGFS is not set
-CONFIG_6LOWPAN_NHC=m
-CONFIG_6LOWPAN_NHC_DEST=m
-CONFIG_6LOWPAN_NHC_FRAGMENT=m
-CONFIG_6LOWPAN_NHC_HOP=m
-CONFIG_6LOWPAN_NHC_IPV6=m
-CONFIG_6LOWPAN_NHC_MOBILITY=m
-CONFIG_6LOWPAN_NHC_ROUTING=m
-CONFIG_6LOWPAN_NHC_UDP=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
-CONFIG_6LOWPAN_GHC_UDP=m
-CONFIG_6LOWPAN_GHC_ICMPV6=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
-CONFIG_IEEE802154=m
-# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
-CONFIG_IEEE802154_SOCKET=m
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_CBS=m
-CONFIG_NET_SCH_ETF=m
-# CONFIG_NET_SCH_TAPRIO is not set
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_SKBPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_CAKE=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-# CONFIG_NET_SCH_DEFAULT is not set
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-# CONFIG_NET_CLS_CGROUP is not set
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_MATCHALL=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_IPT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-# CONFIG_NET_ACT_SAMPLE is not set
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-# CONFIG_NET_ACT_MPLS is not set
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_ACT_CTINFO is not set
-CONFIG_NET_ACT_SKBMOD=m
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_TUNNEL_KEY=m
-# CONFIG_NET_ACT_CT is not set
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IFE_SKBTCINDEX=m
-# CONFIG_NET_TC_SKB_EXT is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-# CONFIG_BATMAN_ADV is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
-CONFIG_VSOCKETS_DIAG=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
-# CONFIG_HYPERV_VSOCKETS is not set
-CONFIG_NETLINK_DIAG=y
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_NET_NSH=m
-# CONFIG_HSR is not set
-CONFIG_NET_SWITCHDEV=y
-CONFIG_NET_L3_MASTER_DEV=y
-CONFIG_NET_NCSI=y
-# CONFIG_NCSI_OEM_CMD_GET_MAC is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-# CONFIG_BPF_STREAM_PARSER is not set
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-# CONFIG_NET_DROP_MONITOR is not set
-# end of Network testing
-# end of Networking options
-
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-# CONFIG_BT_6LOWPAN is not set
-CONFIG_BT_LEDS=y
-# CONFIG_BT_SELFTEST is not set
-# CONFIG_BT_DEBUGFS is not set
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
-CONFIG_BT_HCIBTUSB_BCM=y
-# CONFIG_BT_HCIBTUSB_MTK is not set
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
-# CONFIG_BT_MTKSDIO is not set
-CONFIG_BT_HCIRSI=m
-# end of Bluetooth device drivers
-
-CONFIG_AF_RXRPC=m
-CONFIG_AF_RXRPC_IPV6=y
-# CONFIG_AF_RXRPC_INJECT_LOSS is not set
-# CONFIG_AF_RXRPC_DEBUG is not set
-# CONFIG_RXKAD is not set
-# CONFIG_AF_KCM is not set
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
-CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
-CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
-CONFIG_CFG80211_DEFAULT_PS=y
-# CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_CFG80211_CRDA_SUPPORT=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_CFG80211_WEXT_EXPORT=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
-# CONFIG_MAC80211_MESH is not set
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_MESSAGE_TRACING is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-# CONFIG_RFKILL_INPUT is not set
-CONFIG_RFKILL_GPIO=m
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_XEN is not set
-CONFIG_NET_9P_RDMA=m
-# CONFIG_NET_9P_DEBUG is not set
-# CONFIG_CAIF is not set
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
-CONFIG_NFC=m
-CONFIG_NFC_DIGITAL=m
-CONFIG_NFC_NCI=m
-CONFIG_NFC_NCI_SPI=m
-CONFIG_NFC_NCI_UART=m
-CONFIG_NFC_HCI=m
-CONFIG_NFC_SHDLC=y
-
-#
-# Near Field Communication (NFC) devices
-#
-CONFIG_NFC_TRF7970A=m
-CONFIG_NFC_MEI_PHY=m
-CONFIG_NFC_SIM=m
-CONFIG_NFC_PORT100=m
-CONFIG_NFC_FDP=m
-CONFIG_NFC_FDP_I2C=m
-CONFIG_NFC_PN544=m
-CONFIG_NFC_PN544_I2C=m
-CONFIG_NFC_PN544_MEI=m
-CONFIG_NFC_PN533=m
-CONFIG_NFC_PN533_USB=m
-CONFIG_NFC_PN533_I2C=m
-CONFIG_NFC_MICROREAD=m
-CONFIG_NFC_MICROREAD_I2C=m
-CONFIG_NFC_MICROREAD_MEI=m
-CONFIG_NFC_MRVL=m
-CONFIG_NFC_MRVL_USB=m
-CONFIG_NFC_MRVL_UART=m
-CONFIG_NFC_MRVL_I2C=m
-CONFIG_NFC_MRVL_SPI=m
-CONFIG_NFC_ST21NFCA=m
-CONFIG_NFC_ST21NFCA_I2C=m
-CONFIG_NFC_ST_NCI=m
-CONFIG_NFC_ST_NCI_I2C=m
-CONFIG_NFC_ST_NCI_SPI=m
-# CONFIG_NFC_NXP_NCI is not set
-CONFIG_NFC_S3FWRN5=m
-CONFIG_NFC_S3FWRN5_I2C=m
-# CONFIG_NFC_ST95HF is not set
-# end of Near Field Communication (NFC) devices
-
-# CONFIG_PSAMPLE is not set
-CONFIG_NET_IFE=m
-CONFIG_LWTUNNEL=y
-CONFIG_LWTUNNEL_BPF=y
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-CONFIG_NET_DEVLINK=y
-CONFIG_PAGE_POOL=y
-CONFIG_FAILOVER=m
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-CONFIG_HAVE_EISA=y
-# CONFIG_EISA is not set
-CONFIG_HAVE_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_PCIEAER=y
-# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-# CONFIG_PCIE_DPC is not set
-CONFIG_PCIE_PTM=y
-# CONFIG_PCIE_BW is not set
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-CONFIG_PCI_STUB=m
-CONFIG_PCI_PF_STUB=m
-CONFIG_XEN_PCIDEV_FRONTEND=m
-CONFIG_PCI_ATS=y
-CONFIG_PCI_LOCKLESS_CONFIG=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_LABEL=y
-CONFIG_PCI_HYPERV=m
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_SHPC=y
-
-#
-# PCI controller drivers
-#
-
-#
-# Cadence PCIe controllers support
-#
-# end of Cadence PCIe controllers support
-
-CONFIG_VMD=m
-CONFIG_PCI_HYPERV_INTERFACE=m
-
-#
-# DesignWare PCI Core Support
-#
-# CONFIG_PCIE_DW_PLAT_HOST is not set
-# CONFIG_PCI_MESON is not set
-# end of DesignWare PCI Core Support
-# end of PCI controller drivers
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-# end of PCI Endpoint
-
-#
-# PCI switch controller drivers
-#
-CONFIG_PCI_SW_SWITCHTEC=m
-# end of PCI switch controller drivers
-
-CONFIG_PCCARD=m
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_PCCARD_NONSTATIC=y
-# CONFIG_RAPIDIO is not set
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=y
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
-# end of Firmware loader
-
-CONFIG_WANT_DEV_COREDUMP=y
-# CONFIG_ALLOW_DEV_COREDUMP is not set
-# CONFIG_DEBUG_DRIVER is not set
-CONFIG_DEBUG_DEVRES=y
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_SYS_HYPERVISOR=y
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_SPI=m
-CONFIG_REGMAP_IRQ=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-# end of Bus devices
-
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-CONFIG_GNSS=m
-CONFIG_MTD=m
-CONFIG_MTD_TESTS=m
-
-#
-# Partition parsers
-#
-CONFIG_MTD_AR7_PARTS=m
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# end of Partition parsers
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-CONFIG_NFTL_RW=y
-CONFIG_INFTL=m
-CONFIG_RFD_FTL=m
-CONFIG_SSFDC=m
-CONFIG_SM_FTL=m
-CONFIG_MTD_OOPS=m
-CONFIG_MTD_SWAP=m
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-CONFIG_MTD_RAM=m
-CONFIG_MTD_ROM=m
-CONFIG_MTD_ABSENT=m
-# end of RAM/ROM/Flash chip drivers
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP_GPIO_ADDR is not set
-CONFIG_MTD_SBC_GXX=m
-CONFIG_MTD_AMD76XROM=m
-CONFIG_MTD_ICHXROM=m
-CONFIG_MTD_ESB2ROM=m
-CONFIG_MTD_CK804XROM=m
-CONFIG_MTD_SCB2_FLASH=m
-CONFIG_MTD_NETtel=m
-CONFIG_MTD_L440GX=m
-CONFIG_MTD_PCI=m
-CONFIG_MTD_PCMCIA=m
-# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
-CONFIG_MTD_INTEL_VR_NOR=m
-CONFIG_MTD_PLATRAM=m
-# end of Mapping drivers for chip access
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-CONFIG_MTD_PMC551_BUGFIX=y
-# CONFIG_MTD_PMC551_DEBUG is not set
-CONFIG_MTD_DATAFLASH=m
-# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
-# CONFIG_MTD_DATAFLASH_OTP is not set
-# CONFIG_MTD_MCHP23K256 is not set
-# CONFIG_MTD_SST25L is not set
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLOCK2MTD=m
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOCG3 is not set
-# end of Self-contained MTD device drivers
-
-CONFIG_MTD_ONENAND=m
-# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND_GENERIC is not set
-CONFIG_MTD_ONENAND_OTP=y
-CONFIG_MTD_ONENAND_2X_PROGRAM=y
-CONFIG_MTD_NAND_ECC_SW_HAMMING=m
-# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_RAW_NAND is not set
-# CONFIG_MTD_SPI_NAND is not set
-
-#
-# LPDDR & LPDDR2 PCM memory drivers
-#
-CONFIG_MTD_LPDDR=m
-CONFIG_MTD_QINFO_PROBE=m
-# end of LPDDR & LPDDR2 PCM memory drivers
-
-# CONFIG_MTD_SPI_NOR is not set
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_BLOCK is not set
-# CONFIG_MTD_HYPERBUS is not set
-# CONFIG_OF is not set
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-CONFIG_PARPORT_AX88796=m
-# CONFIG_PARPORT_1284 is not set
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_NULL_BLK is not set
-CONFIG_BLK_DEV_FD=m
-CONFIG_CDROM=m
-# CONFIG_PARIDE is not set
-CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_WRITEBACK is not set
-# CONFIG_ZRAM_MEMORY_TRACKING is not set
-CONFIG_BLK_DEV_UMEM=m
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_SKD=m
-CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_BLKDEV_BACKEND=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_VIRTIO_BLK_SCSI is not set
-# CONFIG_BLK_DEV_RBD is not set
-CONFIG_BLK_DEV_RSXX=m
-
-#
-# NVME Support
-#
-CONFIG_NVME_CORE=m
-CONFIG_BLK_DEV_NVME=m
-CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_FABRICS=m
-CONFIG_NVME_RDMA=m
-# CONFIG_NVME_FC is not set
-# CONFIG_NVME_TCP is not set
-CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_LOOP=m
-CONFIG_NVME_TARGET_RDMA=m
-# CONFIG_NVME_TARGET_FC is not set
-# CONFIG_NVME_TARGET_TCP is not set
-# end of NVME Support
-
-#
-# Misc devices
-#
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_AD525X_DPOT=m
-CONFIG_AD525X_DPOT_I2C=m
-CONFIG_AD525X_DPOT_SPI=m
-# CONFIG_DUMMY_IRQ is not set
-CONFIG_IBM_ASM=m
-CONFIG_PHANTOM=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_HP_ILO=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29003=m
-CONFIG_ISL29020=m
-CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_HMC6352=m
-CONFIG_DS1682=m
-CONFIG_VMWARE_BALLOON=m
-# CONFIG_LATTICE_ECP3_CONFIG is not set
-# CONFIG_SRAM is not set
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_XILINX_SDFEC is not set
-CONFIG_MISC_RTSX=m
-CONFIG_PVPANIC=m
-CONFIG_C2PORT=m
-CONFIG_C2PORT_DURAMAR_2150=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_AT25=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_EEPROM_93XX46=m
-# CONFIG_EEPROM_IDT_89HPESX is not set
-# CONFIG_EEPROM_EE1004 is not set
-# end of EEPROM support
-
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-
-#
-# Texas Instruments shared transport line discipline
-#
-CONFIG_TI_ST=m
-# end of Texas Instruments shared transport line discipline
-
-CONFIG_SENSORS_LIS3_I2C=m
-
-#
-# Altera FPGA firmware download module (requires I2C)
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=m
-CONFIG_INTEL_MEI_TXE=m
-# CONFIG_INTEL_MEI_HDCP is not set
-CONFIG_VMWARE_VMCI=m
-
-#
-# Intel MIC & related support
-#
-
-#
-# Intel MIC Bus Driver
-#
-CONFIG_INTEL_MIC_BUS=m
-
-#
-# SCIF Bus Driver
-#
-# CONFIG_SCIF_BUS is not set
-
-#
-# VOP Bus Driver
-#
-CONFIG_VOP_BUS=m
-
-#
-# Intel MIC Host Driver
-#
-
-#
-# Intel MIC Card Driver
-#
-
-#
-# SCIF Driver
-#
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-
-#
-# VOP Driver
-#
-CONFIG_VOP=m
-CONFIG_VHOST_RING=m
-# end of Intel MIC & related support
-
-# CONFIG_GENWQE is not set
-# CONFIG_ECHO is not set
-# CONFIG_MISC_ALCOR_PCI is not set
-CONFIG_MISC_RTSX_PCI=m
-CONFIG_MISC_RTSX_USB=m
-# CONFIG_HABANA_AI is not set
-# end of Misc devices
-
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_SCAN_ASYNC=y
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-# end of SCSI Transports
-
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_ISCSI_BOOT_SYSFS=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_CXGB4_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_BNX2X_FCOE=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_HPSA=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_3W_SAS=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
-CONFIG_AIC7XXX_DEBUG_ENABLE=y
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
-CONFIG_AIC79XX_DEBUG_ENABLE=y
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-CONFIG_SCSI_MVSAS_DEBUG=y
-CONFIG_SCSI_MVSAS_TASKLET=y
-CONFIG_SCSI_MVUMI=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ESAS2R=m
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT3SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_SMARTPQI=m
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
-# CONFIG_SCSI_UFS_BSG is not set
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_FLASHPOINT is not set
-# CONFIG_SCSI_MYRB is not set
-# CONFIG_SCSI_MYRS is not set
-CONFIG_VMWARE_PVSCSI=m
-CONFIG_XEN_SCSI_FRONTEND=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-# CONFIG_SCSI_SNIC is not set
-CONFIG_SCSI_DMX3191D=m
-# CONFIG_SCSI_FDOMAIN_PCI is not set
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_ISCI=m
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-# CONFIG_SCSI_PPA is not set
-# CONFIG_SCSI_IMM is not set
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-CONFIG_SCSI_IPR_TRACE=y
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
-# CONFIG_TCM_QLA2XXX_DEBUG is not set
-CONFIG_SCSI_QLA_ISCSI=m
-# CONFIG_QEDI is not set
-# CONFIG_QEDF is not set
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_WD719X=m
-CONFIG_SCSI_DEBUG=m
-# CONFIG_SCSI_PMCRAID is not set
-CONFIG_SCSI_PM8001=m
-# CONFIG_SCSI_BFA_FC is not set
-CONFIG_SCSI_VIRTIO=m
-# CONFIG_SCSI_CHELSIO_FCOE is not set
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-# CONFIG_SCSI_DH is not set
-# end of SCSI device support
-
-CONFIG_ATA=m
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-# CONFIG_SATA_ZPODD is not set
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=3
-CONFIG_SATA_AHCI_PLATFORM=m
-CONFIG_SATA_INIC162X=m
-CONFIG_SATA_ACARD_AHCI=m
-CONFIG_SATA_SIL24=m
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SX4=m
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=m
-# CONFIG_SATA_DWC is not set
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3=m
-CONFIG_PATA_HPT3X3_DMA=y
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PLATFORM=m
-CONFIG_PATA_RZ1000=m
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_PATA_ACPI=m
-CONFIG_ATA_GENERIC=m
-CONFIG_PATA_LEGACY=m
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-# CONFIG_MD_AUTODETECT is not set
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-# CONFIG_MD_CLUSTER is not set
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_UNSTRIPED=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_WRITECACHE=m
-# CONFIG_DM_ERA is not set
-# CONFIG_DM_CLONE is not set
-CONFIG_DM_MIRROR=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-# CONFIG_DM_DUST is not set
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
-CONFIG_DM_VERITY_FEC=y
-CONFIG_DM_SWITCH=m
-CONFIG_DM_LOG_WRITES=m
-CONFIG_DM_INTEGRITY=m
-CONFIG_TARGET_CORE=m
-CONFIG_TCM_IBLOCK=m
-CONFIG_TCM_FILEIO=m
-CONFIG_TCM_PSCSI=m
-CONFIG_TCM_USER2=m
-CONFIG_LOOPBACK_TARGET=m
-CONFIG_TCM_FC=m
-CONFIG_ISCSI_TARGET=m
-CONFIG_ISCSI_TARGET_CXGB4=m
-CONFIG_SBP_TARGET=m
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-CONFIG_FIREWIRE_NOSY=m
-# end of IEEE 1394 (FireWire) support
-
-# CONFIG_MACINTOSH_DRIVERS is not set
-CONFIG_NETDEVICES=y
-CONFIG_MII=m
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-CONFIG_EQUALIZER=m
-# CONFIG_NET_FC is not set
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=m
-# CONFIG_IPVTAP is not set
-CONFIG_VXLAN=m
-CONFIG_GENEVE=m
-# CONFIG_GTP is not set
-CONFIG_MACSEC=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NTB_NETDEV=m
-CONFIG_TUN=m
-CONFIG_TAP=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_NET_VRF=m
-# CONFIG_VSOCKMON is not set
-CONFIG_SUNGEM_PHY=m
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-CONFIG_ARCNET_COM90xx=m
-CONFIG_ARCNET_COM90xxIO=m
-CONFIG_ARCNET_RIM_I=m
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_ARCNET_COM20020_CS=m
-CONFIG_ATM_DRIVERS=y
-CONFIG_ATM_DUMMY=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-CONFIG_ATM_FORE200E_USE_TASKLET=y
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-CONFIG_ATM_HE_USE_SUNI=y
-CONFIG_ATM_SOLOS=m
-
-#
-# CAIF transport drivers
-#
-
-#
-# Distributed Switch Architecture drivers
-#
-CONFIG_B53=m
-CONFIG_B53_SPI_DRIVER=m
-CONFIG_B53_MDIO_DRIVER=m
-CONFIG_B53_MMAP_DRIVER=m
-CONFIG_B53_SRAB_DRIVER=m
-# CONFIG_B53_SERDES is not set
-CONFIG_NET_DSA_BCM_SF2=m
-# CONFIG_NET_DSA_LOOP is not set
-# CONFIG_NET_DSA_LANTIQ_GSWIP is not set
-# CONFIG_NET_DSA_MT7530 is not set
-CONFIG_NET_DSA_MV88E6060=m
-# CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set
-# CONFIG_NET_DSA_MICROCHIP_KSZ8795 is not set
-CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
-CONFIG_NET_DSA_MV88E6XXX_PTP=y
-# CONFIG_NET_DSA_SJA1105 is not set
-CONFIG_NET_DSA_QCA8K=m
-CONFIG_NET_DSA_REALTEK_SMI=m
-# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
-# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
-# end of Distributed Switch Architecture drivers
-
-CONFIG_ETHERNET=y
-CONFIG_MDIO=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_3C589=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_NET_VENDOR_AGERE=y
-# CONFIG_ET131X is not set
-CONFIG_NET_VENDOR_ALACRITECH=y
-# CONFIG_SLICOSS is not set
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_ALTERA_TSE=m
-CONFIG_NET_VENDOR_AMAZON=y
-CONFIG_ENA_ETHERNET=m
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_AMD8111_ETH=m
-CONFIG_PCNET32=m
-CONFIG_PCMCIA_NMCLAN=m
-# CONFIG_AMD_XGBE is not set
-CONFIG_NET_VENDOR_AQUANTIA=y
-CONFIG_AQTION=m
-CONFIG_NET_VENDOR_ARC=y
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_ALX=m
-# CONFIG_NET_VENDOR_AURORA is not set
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_BCMGENET=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_TIGON3=m
-CONFIG_TIGON3_HWMON=y
-CONFIG_BNX2X=m
-CONFIG_BNX2X_SRIOV=y
-# CONFIG_SYSTEMPORT is not set
-CONFIG_BNXT=m
-CONFIG_BNXT_SRIOV=y
-CONFIG_BNXT_FLOWER_OFFLOAD=y
-CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
-CONFIG_NET_VENDOR_CADENCE=y
-CONFIG_MACB=m
-CONFIG_MACB_USE_HWSTAMP=y
-# CONFIG_MACB_PCI is not set
-# CONFIG_NET_VENDOR_CAVIUM is not set
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_CHELSIO_LIB=m
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_ENIC=m
-# CONFIG_NET_VENDOR_CORTINA is not set
-# CONFIG_CX_ECAT is not set
-CONFIG_DNET=m
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DL2K=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_BE2NET=m
-CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET_BE2=y
-CONFIG_BE2NET_BE3=y
-CONFIG_BE2NET_LANCER=y
-CONFIG_BE2NET_SKYHAWK=y
-CONFIG_NET_VENDOR_EZCHIP=y
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_NET_VENDOR_GOOGLE=y
-# CONFIG_GVE is not set
-CONFIG_NET_VENDOR_HP=y
-CONFIG_HP100=m
-CONFIG_NET_VENDOR_HUAWEI=y
-# CONFIG_HINIC is not set
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_E1000E_HWTS=y
-CONFIG_IGB=m
-CONFIG_IGB_HWMON=y
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_IXGB=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_HWMON=y
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_I40E=m
-# CONFIG_I40EVF is not set
-CONFIG_ICE=m
-# CONFIG_FM10K is not set
-# CONFIG_IGC is not set
-CONFIG_JME=m
-CONFIG_NET_VENDOR_MARVELL=y
-# CONFIG_MVMDIO is not set
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKGE_GENESIS=y
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_MLX4_CORE_GEN2=y
-CONFIG_MLX5_CORE=m
-# CONFIG_MLX5_FPGA is not set
-CONFIG_MLX5_CORE_EN=y
-CONFIG_MLX5_EN_ARFS=y
-CONFIG_MLX5_EN_RXNFC=y
-CONFIG_MLX5_MPFS=y
-CONFIG_MLX5_ESWITCH=y
-# CONFIG_MLX5_CORE_IPOIB is not set
-CONFIG_MLX5_SW_STEERING=y
-# CONFIG_MLXSW_CORE is not set
-# CONFIG_MLXFW is not set
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_NET_VENDOR_MICROCHIP=y
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-CONFIG_ENCX24J600=m
-CONFIG_LAN743X=m
-# CONFIG_NET_VENDOR_MICROSEMI is not set
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_FEALNX=m
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NATSEMI=m
-CONFIG_NS83820=m
-CONFIG_NET_VENDOR_NETERION=y
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_NET_VENDOR_NETRONOME=y
-CONFIG_NFP=m
-# CONFIG_NFP_APP_FLOWER is not set
-# CONFIG_NFP_APP_ABM_NIC is not set
-# CONFIG_NFP_DEBUG is not set
-# CONFIG_NET_VENDOR_NI is not set
-CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_AXNET=m
-CONFIG_NE2K_PCI=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=m
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_ETHOC=m
-CONFIG_NET_VENDOR_PACKET_ENGINES=y
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_NET_VENDOR_PENSANDO=y
-# CONFIG_IONIC is not set
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_QLA3XXX=m
-CONFIG_QLCNIC=m
-CONFIG_QLCNIC_SRIOV=y
-CONFIG_QLCNIC_HWMON=y
-CONFIG_NETXEN_NIC=m
-CONFIG_QED=m
-CONFIG_QED_SRIOV=y
-CONFIG_QEDE=m
-# CONFIG_NET_VENDOR_QUALCOMM is not set
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_R6040=m
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_ATP=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-# CONFIG_8139TOO_8129 is not set
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=m
-CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_ROCKER=y
-CONFIG_ROCKER=m
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SOLARFLARE=y
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_SFC_MCDI_LOGGING=y
-# CONFIG_SFC_FALCON is not set
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_EPIC100=m
-CONFIG_SMSC911X=m
-CONFIG_SMSC9420=m
-# CONFIG_NET_VENDOR_SOCIONEXT is not set
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_STMMAC_ETH=m
-# CONFIG_STMMAC_SELFTESTS is not set
-# CONFIG_STMMAC_PLATFORM is not set
-# CONFIG_STMMAC_PCI is not set
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NIU=m
-CONFIG_NET_VENDOR_SYNOPSYS=y
-# CONFIG_DWC_XLGMAC is not set
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_TEHUTI=m
-CONFIG_NET_VENDOR_TI=y
-# CONFIG_TI_CPSW_PHY_SEL is not set
-CONFIG_TLAN=m
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_NET_VENDOR_WIZNET=y
-CONFIG_WIZNET_W5100=m
-CONFIG_WIZNET_W5300=m
-# CONFIG_WIZNET_BUS_DIRECT is not set
-# CONFIG_WIZNET_BUS_INDIRECT is not set
-CONFIG_WIZNET_BUS_ANY=y
-CONFIG_WIZNET_W5100_SPI=m
-CONFIG_NET_VENDOR_XILINX=y
-# CONFIG_XILINX_AXI_EMAC is not set
-# CONFIG_XILINX_LL_TEMAC is not set
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_FDDI=y
-CONFIG_DEFXX=m
-# CONFIG_DEFXX_MMIO is not set
-CONFIG_SKFP=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-# CONFIG_ROADRUNNER_LARGE_RINGS is not set
-CONFIG_NET_SB1000=m
-CONFIG_MDIO_DEVICE=m
-CONFIG_MDIO_BUS=m
-CONFIG_MDIO_BCM_UNIMAC=m
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_CAVIUM=m
-CONFIG_MDIO_GPIO=m
-CONFIG_MDIO_I2C=m
-# CONFIG_MDIO_MSCC_MIIM is not set
-CONFIG_MDIO_THUNDER=m
-CONFIG_PHYLINK=m
-CONFIG_PHYLIB=m
-CONFIG_SWPHY=y
-# CONFIG_LED_TRIGGER_PHY is not set
-
-#
-# MII PHY device drivers
-#
-CONFIG_SFP=m
-# CONFIG_ADIN_PHY is not set
-CONFIG_AMD_PHY=m
-CONFIG_AQUANTIA_PHY=m
-# CONFIG_AX88796B_PHY is not set
-CONFIG_AT803X_PHY=m
-CONFIG_BCM7XXX_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_CICADA_PHY=m
-# CONFIG_CORTINA_PHY is not set
-CONFIG_DAVICOM_PHY=m
-CONFIG_DP83822_PHY=m
-# CONFIG_DP83TC811_PHY is not set
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
-CONFIG_FIXED_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_INTEL_XWAY_PHY=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_MARVELL_PHY=m
-# CONFIG_MARVELL_10G_PHY is not set
-CONFIG_MICREL_PHY=m
-CONFIG_MICROCHIP_PHY=m
-# CONFIG_MICROCHIP_T1_PHY is not set
-CONFIG_MICROSEMI_PHY=m
-CONFIG_NATIONAL_PHY=m
-# CONFIG_NXP_TJA11XX_PHY is not set
-CONFIG_QSEMI_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_RENESAS_PHY=m
-# CONFIG_ROCKCHIP_PHY is not set
-CONFIG_SMSC_PHY=m
-CONFIG_STE10XP=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_XILINX_GMII2RGMII=m
-CONFIG_MICREL_KS8995MA=m
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOATM=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-CONFIG_SLIP_MODE_SLIP6=y
-
-#
-# Host-side USB support is needed for USB Network Adapter support
-#
-CONFIG_USB_NET_DRIVERS=m
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SR9700=m
-# CONFIG_USB_NET_SR9800 is not set
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_USB_NET_CH9200=m
-# CONFIG_USB_NET_AQC111 is not set
-CONFIG_WLAN=y
-# CONFIG_WIRELESS_WDS is not set
-# CONFIG_WLAN_VENDOR_ADMTEK is not set
-CONFIG_ATH_COMMON=m
-CONFIG_WLAN_VENDOR_ATH=y
-# CONFIG_ATH_DEBUG is not set
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-# CONFIG_ATH5K_TRACER is not set
-CONFIG_ATH5K_PCI=y
-CONFIG_ATH9K_HW=m
-CONFIG_ATH9K_COMMON=m
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
-CONFIG_ATH9K=m
-CONFIG_ATH9K_PCI=y
-CONFIG_ATH9K_AHB=y
-# CONFIG_ATH9K_DEBUGFS is not set
-# CONFIG_ATH9K_DYNACK is not set
-# CONFIG_ATH9K_WOW is not set
-CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
-CONFIG_ATH9K_PCOEM=y
-# CONFIG_ATH9K_PCI_NO_EEPROM is not set
-CONFIG_ATH9K_HTC=m
-# CONFIG_ATH9K_HTC_DEBUGFS is not set
-# CONFIG_ATH9K_HWRNG is not set
-CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
-CONFIG_CARL9170_WPC=y
-CONFIG_CARL9170_HWRNG=y
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
-CONFIG_ATH6KL_USB=m
-CONFIG_ATH6KL_DEBUG=y
-# CONFIG_ATH6KL_TRACING is not set
-CONFIG_AR5523=m
-CONFIG_WIL6210=m
-CONFIG_WIL6210_ISR_COR=y
-# CONFIG_WIL6210_TRACING is not set
-CONFIG_WIL6210_DEBUGFS=y
-CONFIG_ATH10K=m
-CONFIG_ATH10K_CE=y
-CONFIG_ATH10K_PCI=m
-# CONFIG_ATH10K_SDIO is not set
-# CONFIG_ATH10K_USB is not set
-# CONFIG_ATH10K_DEBUG is not set
-# CONFIG_ATH10K_DEBUGFS is not set
-# CONFIG_ATH10K_TRACING is not set
-CONFIG_WCN36XX=m
-# CONFIG_WCN36XX_DEBUGFS is not set
-# CONFIG_WLAN_VENDOR_ATMEL is not set
-CONFIG_WLAN_VENDOR_BROADCOM=y
-CONFIG_B43=m
-CONFIG_B43_BCMA=y
-CONFIG_B43_SSB=y
-CONFIG_B43_BUSES_BCMA_AND_SSB=y
-# CONFIG_B43_BUSES_BCMA is not set
-# CONFIG_B43_BUSES_SSB is not set
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_G=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_PHY_HT=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-CONFIG_B43LEGACY_DEBUG=y
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMFMAC_PCIE=y
-# CONFIG_BRCM_TRACING is not set
-# CONFIG_BRCMDBG is not set
-CONFIG_WLAN_VENDOR_CISCO=y
-CONFIG_AIRO=m
-CONFIG_AIRO_CS=m
-CONFIG_WLAN_VENDOR_INTEL=y
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLEGACY=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-
-#
-# iwl3945 / iwl4965 Debugging Options
-#
-# CONFIG_IWLEGACY_DEBUG is not set
-# end of iwl3945 / iwl4965 Debugging Options
-
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLDVM=m
-CONFIG_IWLMVM=m
-CONFIG_IWLWIFI_OPMODE_MODULAR=y
-# CONFIG_IWLWIFI_BCAST_FILTERING is not set
-
-#
-# Debugging Options
-#
-# CONFIG_IWLWIFI_DEBUG is not set
-# CONFIG_IWLWIFI_DEVICE_TRACING is not set
-# end of Debugging Options
-
-CONFIG_WLAN_VENDOR_INTERSIL=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_HERMES=m
-# CONFIG_HERMES_PRISM is not set
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_ORINOCO_USB=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_SPI=m
-# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
-CONFIG_P54_LEDS=y
-CONFIG_PRISM54=m
-CONFIG_WLAN_VENDOR_MARVELL=y
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_SPI=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_MWL8K=m
-CONFIG_WLAN_VENDOR_MEDIATEK=y
-CONFIG_MT7601U=m
-CONFIG_MT76_CORE=m
-CONFIG_MT76_LEDS=y
-CONFIG_MT76_USB=m
-CONFIG_MT76x02_LIB=m
-CONFIG_MT76x02_USB=m
-CONFIG_MT76x0_COMMON=m
-CONFIG_MT76x0U=m
-# CONFIG_MT76x0E is not set
-CONFIG_MT76x2_COMMON=m
-CONFIG_MT76x2E=m
-CONFIG_MT76x2U=m
-# CONFIG_MT7603E is not set
-# CONFIG_MT7615E is not set
-CONFIG_WLAN_VENDOR_RALINK=y
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT33XX=y
-# CONFIG_RT2800PCI_RT35XX is not set
-CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800PCI_RT3290=y
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-# CONFIG_RT2800USB_RT35XX is not set
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-CONFIG_RT2800USB_UNKNOWN=y
-CONFIG_RT2800_LIB=m
-CONFIG_RT2800_LIB_MMIO=m
-CONFIG_RT2X00_LIB_MMIO=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WLAN_VENDOR_REALTEK=y
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_RTL_CARDS=m
-CONFIG_RTL8192CE=m
-CONFIG_RTL8192SE=m
-CONFIG_RTL8192DE=m
-CONFIG_RTL8723AE=m
-CONFIG_RTL8723BE=m
-CONFIG_RTL8188EE=m
-CONFIG_RTL8192EE=m
-CONFIG_RTL8821AE=m
-CONFIG_RTL8192CU=m
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_PCI=m
-CONFIG_RTLWIFI_USB=m
-# CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_RTL8192C_COMMON=m
-CONFIG_RTL8723_COMMON=m
-CONFIG_RTLBTCOEXIST=m
-CONFIG_RTL8XXXU=m
-# CONFIG_RTL8XXXU_UNTESTED is not set
-CONFIG_RTW88=m
-CONFIG_RTW88_CORE=m
-CONFIG_RTW88_PCI=m
-CONFIG_RTW88_8822BE=y
-CONFIG_RTW88_8822CE=y
-# CONFIG_RTW88_DEBUG is not set
-# CONFIG_RTW88_DEBUGFS is not set
-CONFIG_WLAN_VENDOR_RSI=y
-CONFIG_RSI_91X=m
-CONFIG_RSI_DEBUGFS=y
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
-CONFIG_RSI_COEX=y
-CONFIG_WLAN_VENDOR_ST=y
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_CW1200_WLAN_SPI=m
-CONFIG_WLAN_VENDOR_TI=y
-CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX=m
-CONFIG_WL18XX=m
-CONFIG_WLCORE=m
-CONFIG_WLCORE_SDIO=m
-CONFIG_WILINK_PLATFORM_DATA=y
-CONFIG_WLAN_VENDOR_ZYDAS=y
-CONFIG_USB_ZD1201=m
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_WLAN_VENDOR_QUANTENNA=y
-# CONFIG_QTNFMAC_PCIE is not set
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_MAC80211_HWSIM=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_VIRT_WIFI=m
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-# end of WiMAX Wireless Broadband devices
-
-# CONFIG_WAN is not set
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKELB=m
-# CONFIG_IEEE802154_AT86RF230 is not set
-# CONFIG_IEEE802154_MRF24J40 is not set
-CONFIG_IEEE802154_CC2520=m
-CONFIG_IEEE802154_ATUSB=m
-CONFIG_IEEE802154_ADF7242=m
-# CONFIG_IEEE802154_CA8210 is not set
-CONFIG_IEEE802154_MCR20A=m
-# CONFIG_IEEE802154_HWSIM is not set
-CONFIG_XEN_NETDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_BACKEND=m
-CONFIG_VMXNET3=m
-CONFIG_FUJITSU_ES=m
-CONFIG_THUNDERBOLT_NET=m
-CONFIG_HYPERV_NET=m
-# CONFIG_NETDEVSIM is not set
-CONFIG_NET_FAILOVER=m
-CONFIG_ISDN=y
-CONFIG_ISDN_CAPI=m
-# CONFIG_CAPI_TRACE is not set
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-# CONFIG_MISDN_SPEEDFAX is not set
-# CONFIG_MISDN_INFINEON is not set
-# CONFIG_MISDN_W6692 is not set
-# CONFIG_MISDN_NETJET is not set
-CONFIG_MISDN_IPAC=m
-# CONFIG_NVM is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_LEDS=m
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-CONFIG_INPUT_SPARSEKMAP=m
-# CONFIG_INPUT_MATRIXKMAP is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-CONFIG_INPUT_EVBUG=m
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ADC is not set
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ADP5589 is not set
-CONFIG_KEYBOARD_APPLESPI=m
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_QT1050 is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_QT2160 is not set
-# CONFIG_KEYBOARD_DLINK_DIR685 is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-CONFIG_KEYBOARD_GPIO_POLLED=m
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_TCA8418 is not set
-# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_MPR121 is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-# CONFIG_MOUSE_PS2_BYD is not set
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
-CONFIG_MOUSE_PS2_CYPRESS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
-# CONFIG_MOUSE_PS2_SENTELIC is not set
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_PS2_FOCALTECH=y
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MOUSE_PS2_SMBUS=y
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_CYAPA=m
-CONFIG_MOUSE_ELAN_I2C=m
-CONFIG_MOUSE_ELAN_I2C_I2C=y
-CONFIG_MOUSE_ELAN_I2C_SMBUS=y
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_MOUSE_SYNAPTICS_USB=m
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_DB9 is not set
-# CONFIG_JOYSTICK_GAMECON is not set
-# CONFIG_JOYSTICK_TURBOGRAFX is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_JOYSTICK_WALKERA0701 is not set
-# CONFIG_JOYSTICK_PSXPAD_SPI is not set
-# CONFIG_JOYSTICK_PXRC is not set
-# CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_INPUT_TABLET is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_PROPERTIES=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879_SPI=m
-# CONFIG_TOUCHSCREEN_ADC is not set
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
-# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
-CONFIG_TOUCHSCREEN_BU21013=m
-# CONFIG_TOUCHSCREEN_BU21029 is not set
-CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
-CONFIG_TOUCHSCREEN_CY8CTMG110=m
-# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
-# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
-CONFIG_TOUCHSCREEN_DYNAPRO=m
-CONFIG_TOUCHSCREEN_HAMPSHIRE=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
-# CONFIG_TOUCHSCREEN_EXC3000 is not set
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GOODIX=m
-# CONFIG_TOUCHSCREEN_HIDEEP is not set
-# CONFIG_TOUCHSCREEN_ILI210X is not set
-# CONFIG_TOUCHSCREEN_S6SY761 is not set
-CONFIG_TOUCHSCREEN_GUNZE=m
-# CONFIG_TOUCHSCREEN_EKTF2127 is not set
-CONFIG_TOUCHSCREEN_ELAN=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
-# CONFIG_TOUCHSCREEN_MAX11801 is not set
-# CONFIG_TOUCHSCREEN_MCS5000 is not set
-# CONFIG_TOUCHSCREEN_MMS114 is not set
-# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
-CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_ELO=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
-CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
-CONFIG_TOUCHSCREEN_USB_NEXIO=y
-# CONFIG_TOUCHSCREEN_USB_EASYTOUCH is not set
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
-CONFIG_TOUCHSCREEN_TSC200X_CORE=m
-CONFIG_TOUCHSCREEN_TSC2004=m
-# CONFIG_TOUCHSCREEN_TSC2005 is not set
-CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
-CONFIG_TOUCHSCREEN_RM_TS=m
-CONFIG_TOUCHSCREEN_SILEAD=m
-CONFIG_TOUCHSCREEN_SIS_I2C=m
-CONFIG_TOUCHSCREEN_ST1232=m
-# CONFIG_TOUCHSCREEN_STMFTS is not set
-# CONFIG_TOUCHSCREEN_SUR40 is not set
-CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
-# CONFIG_TOUCHSCREEN_SX8654 is not set
-CONFIG_TOUCHSCREEN_TPS6507X=m
-# CONFIG_TOUCHSCREEN_ZET6223 is not set
-CONFIG_TOUCHSCREEN_ZFORCE=m
-CONFIG_TOUCHSCREEN_ROHM_BU21023=m
-# CONFIG_TOUCHSCREEN_IQS5XX is not set
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AD714X=m
-CONFIG_INPUT_AD714X_I2C=m
-CONFIG_INPUT_AD714X_SPI=m
-# CONFIG_INPUT_BMA150 is not set
-CONFIG_INPUT_E3X0_BUTTON=m
-# CONFIG_INPUT_MSM_VIBRATOR is not set
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_APANEL=m
-# CONFIG_INPUT_GP2A is not set
-# CONFIG_INPUT_GPIO_BEEPER is not set
-# CONFIG_INPUT_GPIO_DECODER is not set
-# CONFIG_INPUT_GPIO_VIBRA is not set
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_KXTJ9=m
-# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_REGULATOR_HAPTIC=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_PCF8574=m
-# CONFIG_INPUT_PWM_BEEPER is not set
-# CONFIG_INPUT_PWM_VIBRA is not set
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_ADXL34X=m
-CONFIG_INPUT_ADXL34X_I2C=m
-CONFIG_INPUT_ADXL34X_SPI=m
-# CONFIG_INPUT_IMS_PCU is not set
-CONFIG_INPUT_CMA3000=m
-CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
-CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
-# CONFIG_INPUT_DRV260X_HAPTICS is not set
-CONFIG_INPUT_DRV2665_HAPTICS=m
-# CONFIG_INPUT_DRV2667_HAPTICS is not set
-CONFIG_RMI4_CORE=m
-CONFIG_RMI4_I2C=m
-CONFIG_RMI4_SPI=m
-CONFIG_RMI4_SMB=m
-CONFIG_RMI4_F03=y
-CONFIG_RMI4_F03_SERIO=m
-CONFIG_RMI4_2D_SENSOR=y
-CONFIG_RMI4_F11=y
-CONFIG_RMI4_F12=y
-CONFIG_RMI4_F30=y
-# CONFIG_RMI4_F34 is not set
-# CONFIG_RMI4_F54 is not set
-CONFIG_RMI4_F55=y
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_SERIO_ALTERA_PS2=m
-CONFIG_SERIO_PS2MULT=m
-# CONFIG_SERIO_ARC_PS2 is not set
-CONFIG_HYPERV_KEYBOARD=m
-# CONFIG_SERIO_GPIO_PS2 is not set
-# CONFIG_USERIO is not set
-# CONFIG_GAMEPORT is not set
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-CONFIG_MOXA_INTELLIO=m
-CONFIG_MOXA_SMARTIO=m
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_SYNCLINK_GT=m
-CONFIG_NOZOMI=m
-CONFIG_ISI=m
-CONFIG_N_HDLC=m
-# CONFIG_N_GSM is not set
-# CONFIG_TRACE_SINK is not set
-# CONFIG_NULL_TTY is not set
-# CONFIG_LDISC_AUTOLOAD is not set
-CONFIG_DEVMEM=y
-# CONFIG_DEVKMEM is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-CONFIG_SERIAL_8250_PNP=y
-# CONFIG_SERIAL_8250_FINTEK is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_EXAR=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=16
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_8250_DWLIB=y
-# CONFIG_SERIAL_8250_DW is not set
-# CONFIG_SERIAL_8250_RT288X is not set
-CONFIG_SERIAL_8250_LPSS=m
-CONFIG_SERIAL_8250_MID=m
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_MAX3100=m
-# CONFIG_SERIAL_MAX310X is not set
-# CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_IFX6X60=m
-CONFIG_SERIAL_ARC=m
-CONFIG_SERIAL_ARC_NR_PORTS=1
-# CONFIG_SERIAL_RP2 is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_FSL_LINFLEXUART is not set
-# end of Serial drivers
-
-CONFIG_SERIAL_MCTRL_GPIO=y
-# CONFIG_SERIAL_DEV_BUS is not set
-# CONFIG_TTY_PRINTK is not set
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_HVC_XEN_FRONTEND=y
-CONFIG_VIRTIO_CONSOLE=m
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_DMI_DECODE=y
-CONFIG_IPMI_PLAT_DATA=y
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_SSIF=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-# CONFIG_IPMB_DEVICE_INTERFACE is not set
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_NVRAM=m
-CONFIG_APPLICOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-# CONFIG_SCR24X is not set
-CONFIG_IPWIRELESS=m
-# end of PCMCIA character devices
-
-CONFIG_MWAVE=m
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=256
-CONFIG_HPET=y
-# CONFIG_HPET_MMAP is not set
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_HW_RANDOM_TPM=y
-CONFIG_TCG_TIS_CORE=m
-CONFIG_TCG_TIS=m
-# CONFIG_TCG_TIS_SPI is not set
-# CONFIG_TCG_TIS_I2C_ATMEL is not set
-# CONFIG_TCG_TIS_I2C_INFINEON is not set
-# CONFIG_TCG_TIS_I2C_NUVOTON is not set
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
-CONFIG_TCG_XEN=m
-CONFIG_TCG_CRB=m
-# CONFIG_TCG_VTPM_PROXY is not set
-# CONFIG_TCG_TIS_ST33ZP24_I2C is not set
-# CONFIG_TCG_TIS_ST33ZP24_SPI is not set
-CONFIG_TELCLOCK=m
-CONFIG_DEVPORT=y
-# CONFIG_XILLYBUS is not set
-# end of Character devices
-
-CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_MUX_GPIO=m
-# CONFIG_I2C_MUX_LTC4306 is not set
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-# CONFIG_I2C_MUX_REG is not set
-# CONFIG_I2C_MUX_MLXCPLD is not set
-# end of Multiplexer I2C Chip support
-
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_SMBUS=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-# CONFIG_I2C_AMD_MP2 is not set
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_ISMT=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-# CONFIG_I2C_NVIDIA_GPU is not set
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_CBUS_GPIO is not set
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
-# CONFIG_I2C_DESIGNWARE_SLAVE is not set
-CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
-# CONFIG_I2C_EMEV2 is not set
-CONFIG_I2C_GPIO=m
-# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_XILINX=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-
-#
-# Other I2C/SMBus bus drivers
-#
-# CONFIG_I2C_MLXCPLD is not set
-# end of I2C Hardware Bus support
-
-CONFIG_I2C_STUB=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SLAVE_EEPROM=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# end of I2C support
-
-# CONFIG_I3C is not set
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_MEM=y
-
-#
-# SPI Master Controller Drivers
-#
-# CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_AXI_SPI_ENGINE is not set
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-# CONFIG_SPI_CADENCE is not set
-CONFIG_SPI_DESIGNWARE=m
-CONFIG_SPI_DW_PCI=m
-# CONFIG_SPI_DW_MID_DMA is not set
-# CONFIG_SPI_DW_MMIO is not set
-# CONFIG_SPI_NXP_FLEXSPI is not set
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_LM70_LLP=m
-# CONFIG_SPI_OC_TINY is not set
-CONFIG_SPI_PXA2XX=m
-CONFIG_SPI_PXA2XX_PCI=m
-# CONFIG_SPI_ROCKCHIP is not set
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_SIFIVE is not set
-# CONFIG_SPI_MXIC is not set
-CONFIG_SPI_XCOMM=m
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_ZYNQMP_GQSPI is not set
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=m
-# CONFIG_SPI_LOOPBACK_TEST is not set
-CONFIG_SPI_TLE62X0=m
-# CONFIG_SPI_SLAVE is not set
-# CONFIG_SPMI is not set
-# CONFIG_HSI is not set
-CONFIG_PPS=y
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-CONFIG_PPS_CLIENT_LDISC=m
-# CONFIG_PPS_CLIENT_PARPORT is not set
-# CONFIG_PPS_CLIENT_GPIO is not set
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=y
-CONFIG_DP83640_PHY=m
-CONFIG_PTP_1588_CLOCK_KVM=m
-# end of PTP clock support
-
-CONFIG_PINCTRL=y
-CONFIG_PINMUX=y
-CONFIG_PINCONF=y
-CONFIG_GENERIC_PINCONF=y
-# CONFIG_DEBUG_PINCTRL is not set
-CONFIG_PINCTRL_AMD=y
-# CONFIG_PINCTRL_MCP23S08 is not set
-CONFIG_PINCTRL_BAYTRAIL=y
-CONFIG_PINCTRL_CHERRYVIEW=m
-CONFIG_PINCTRL_INTEL=m
-# CONFIG_PINCTRL_BROXTON is not set
-CONFIG_PINCTRL_CANNONLAKE=m
-CONFIG_PINCTRL_CEDARFORK=m
-# CONFIG_PINCTRL_DENVERTON is not set
-# CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_ICELAKE=m
-# CONFIG_PINCTRL_LEWISBURG is not set
-CONFIG_PINCTRL_SUNRISEPOINT=m
-CONFIG_GPIOLIB=y
-CONFIG_GPIOLIB_FASTPATH_LIMIT=512
-CONFIG_GPIO_ACPI=y
-CONFIG_GPIOLIB_IRQCHIP=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_MAX730X=m
-
-#
-# Memory mapped GPIO drivers
-#
-# CONFIG_GPIO_AMDPT is not set
-# CONFIG_GPIO_DWAPB is not set
-# CONFIG_GPIO_EXAR is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-CONFIG_GPIO_ICH=m
-# CONFIG_GPIO_LYNXPOINT is not set
-# CONFIG_GPIO_MB86S7X is not set
-CONFIG_GPIO_VX855=m
-# CONFIG_GPIO_XILINX is not set
-CONFIG_GPIO_AMD_FCH=m
-# end of Memory mapped GPIO drivers
-
-#
-# Port-mapped I/O GPIO drivers
-#
-# CONFIG_GPIO_F7188X is not set
-# CONFIG_GPIO_IT87 is not set
-CONFIG_GPIO_SCH=m
-# CONFIG_GPIO_SCH311X is not set
-CONFIG_GPIO_WINBOND=m
-CONFIG_GPIO_WS16C48=m
-# end of Port-mapped I/O GPIO drivers
-
-#
-# I2C GPIO expanders
-#
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-# CONFIG_GPIO_TPIC2810 is not set
-# end of I2C GPIO expanders
-
-#
-# MFD GPIO expanders
-#
-CONFIG_GPIO_JANZ_TTL=m
-CONFIG_GPIO_UCB1400=m
-# end of MFD GPIO expanders
-
-#
-# PCI GPIO expanders
-#
-CONFIG_GPIO_AMD8111=m
-CONFIG_GPIO_BT8XX=m
-CONFIG_GPIO_ML_IOH=m
-# CONFIG_GPIO_PCI_IDIO_16 is not set
-# CONFIG_GPIO_PCIE_IDIO_24 is not set
-CONFIG_GPIO_RDC321X=m
-# end of PCI GPIO expanders
-
-#
-# SPI GPIO expanders
-#
-# CONFIG_GPIO_MAX3191X is not set
-CONFIG_GPIO_MAX7301=m
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_PISOSR is not set
-# CONFIG_GPIO_XRA1403 is not set
-# end of SPI GPIO expanders
-
-#
-# USB GPIO expanders
-#
-# end of USB GPIO expanders
-
-# CONFIG_GPIO_MOCKUP is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_AVS is not set
-# CONFIG_POWER_RESET is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-# CONFIG_PDA_POWER is not set
-CONFIG_GENERIC_ADC_BATTERY=m
-# CONFIG_TEST_POWER is not set
-# CONFIG_CHARGER_ADP5061 is not set
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_CHARGER_SBS is not set
-# CONFIG_MANAGER_SBS is not set
-# CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_PCF50633 is not set
-# CONFIG_CHARGER_ISP1704 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# CONFIG_CHARGER_GPIO is not set
-# CONFIG_CHARGER_MANAGER is not set
-# CONFIG_CHARGER_LT3651 is not set
-# CONFIG_CHARGER_BQ2415X is not set
-# CONFIG_CHARGER_BQ24190 is not set
-# CONFIG_CHARGER_BQ24257 is not set
-# CONFIG_CHARGER_BQ24735 is not set
-# CONFIG_CHARGER_BQ25890 is not set
-# CONFIG_CHARGER_SMB347 is not set
-# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_CHARGER_RT9455 is not set
-CONFIG_HWMON=m
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7314=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7X10=m
-CONFIG_SENSORS_ADT7310=m
-CONFIG_SENSORS_ADT7410=m
-CONFIG_SENSORS_ADT7411=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7475=m
-# CONFIG_SENSORS_AS370 is not set
-CONFIG_SENSORS_ASC7621=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_FAM15H_POWER=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_ASB100=m
-# CONFIG_SENSORS_ASPEED is not set
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS620=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_DELL_SMM=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_FTSTEUTATES=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_G762=m
-# CONFIG_SENSORS_HIH6130 is not set
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-# CONFIG_SENSORS_IIO_HWMON is not set
-CONFIG_SENSORS_I5500=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_JC42=m
-CONFIG_SENSORS_POWR1220=m
-CONFIG_SENSORS_LINEAGE=m
-CONFIG_SENSORS_LTC2945=m
-CONFIG_SENSORS_LTC2990=m
-CONFIG_SENSORS_LTC4151=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4222=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LTC4260=m
-CONFIG_SENSORS_LTC4261=m
-CONFIG_SENSORS_MAX1111=m
-CONFIG_SENSORS_MAX16065=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX1668=m
-CONFIG_SENSORS_MAX197=m
-CONFIG_SENSORS_MAX31722=m
-# CONFIG_SENSORS_MAX6621 is not set
-CONFIG_SENSORS_MAX6639=m
-CONFIG_SENSORS_MAX6642=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_MAX6697=m
-CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_MLXREG_FAN=m
-# CONFIG_SENSORS_TC654 is not set
-CONFIG_SENSORS_ADCXX=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM70=m
-CONFIG_SENSORS_LM73=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LM95234=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_LM95245=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_NCT6683=m
-CONFIG_SENSORS_NCT6775=m
-CONFIG_SENSORS_NCT7802=m
-CONFIG_SENSORS_NCT7904=m
-CONFIG_SENSORS_NPCM7XX=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_PMBUS=m
-CONFIG_SENSORS_PMBUS=m
-CONFIG_SENSORS_ADM1275=m
-# CONFIG_SENSORS_IBM_CFFPS is not set
-# CONFIG_SENSORS_INSPUR_IPSPS is not set
-# CONFIG_SENSORS_IR35221 is not set
-# CONFIG_SENSORS_IR38064 is not set
-# CONFIG_SENSORS_IRPS5401 is not set
-# CONFIG_SENSORS_ISL68137 is not set
-CONFIG_SENSORS_LM25066=m
-CONFIG_SENSORS_LTC2978=m
-# CONFIG_SENSORS_LTC2978_REGULATOR is not set
-CONFIG_SENSORS_LTC3815=m
-CONFIG_SENSORS_MAX16064=m
-CONFIG_SENSORS_MAX20751=m
-# CONFIG_SENSORS_MAX31785 is not set
-CONFIG_SENSORS_MAX34440=m
-CONFIG_SENSORS_MAX8688=m
-# CONFIG_SENSORS_PXE1610 is not set
-CONFIG_SENSORS_TPS40422=m
-# CONFIG_SENSORS_TPS53679 is not set
-CONFIG_SENSORS_UCD9000=m
-CONFIG_SENSORS_UCD9200=m
-CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SHT21=m
-CONFIG_SENSORS_SHT3x=m
-CONFIG_SENSORS_SHTC1=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_EMC1403=m
-CONFIG_SENSORS_EMC2103=m
-CONFIG_SENSORS_EMC6W201=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
-CONFIG_SENSORS_SCH5627=m
-CONFIG_SENSORS_SCH5636=m
-# CONFIG_SENSORS_STTS751 is not set
-CONFIG_SENSORS_SMM665=m
-CONFIG_SENSORS_ADC128D818=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_ADS7871=m
-CONFIG_SENSORS_AMC6821=m
-CONFIG_SENSORS_INA209=m
-# CONFIG_SENSORS_INA2XX is not set
-CONFIG_SENSORS_INA3221=m
-# CONFIG_SENSORS_TC74 is not set
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP102=m
-CONFIG_SENSORS_TMP103=m
-# CONFIG_SENSORS_TMP108 is not set
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83773G=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83795=m
-CONFIG_SENSORS_W83795_FANCTRL=y
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-# CONFIG_SENSORS_XGENE is not set
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_ATK0110=m
-CONFIG_THERMAL=y
-CONFIG_THERMAL_STATISTICS=y
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-CONFIG_THERMAL_WRITABLE_TRIPS=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
-CONFIG_THERMAL_GOV_FAIR_SHARE=y
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
-# CONFIG_CLOCK_THERMAL is not set
-# CONFIG_DEVFREQ_THERMAL is not set
-# CONFIG_THERMAL_EMULATION is not set
-
-#
-# Intel thermal drivers
-#
-CONFIG_INTEL_POWERCLAMP=m
-CONFIG_X86_PKG_TEMP_THERMAL=m
-CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
-CONFIG_INTEL_SOC_DTS_THERMAL=m
-
-#
-# ACPI INT340X thermal drivers
-#
-CONFIG_INT340X_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
-CONFIG_INT3406_THERMAL=m
-# end of ACPI INT340X thermal drivers
-
-CONFIG_INTEL_PCH_THERMAL=m
-# end of Intel thermal drivers
-
-CONFIG_GENERIC_ADC_THERMAL=m
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
-CONFIG_WATCHDOG_OPEN_TIMEOUT=0
-CONFIG_WATCHDOG_SYSFS=y
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_WDAT_WDT=m
-# CONFIG_XILINX_WATCHDOG is not set
-# CONFIG_ZIIRAVE_WATCHDOG is not set
-# CONFIG_MLX_WDT is not set
-# CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_DW_WATCHDOG is not set
-CONFIG_MAX63XX_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_EBC_C384_WDT=m
-CONFIG_F71808E_WDT=m
-CONFIG_SP5100_TCO=m
-# CONFIG_SBC_FITPC2_WATCHDOG is not set
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_IE6XX_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-# CONFIG_HP_WATCHDOG is not set
-CONFIG_SC1200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_NV_TCO=m
-CONFIG_60XX_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-# CONFIG_TQMX86_WDT is not set
-CONFIG_VIA_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-CONFIG_INTEL_MEI_WDT=m
-# CONFIG_NI903X_WDT is not set
-# CONFIG_NIC7018_WDT is not set
-# CONFIG_MEN_A21_WDT is not set
-CONFIG_XEN_WDT=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-# CONFIG_SSB_DRIVER_GPIO is not set
-CONFIG_BCMA_POSSIBLE=y
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_HOST_SOC is not set
-CONFIG_BCMA_DRIVER_PCI=y
-CONFIG_BCMA_DRIVER_GMAC_CMN=y
-CONFIG_BCMA_DRIVER_GPIO=y
-# CONFIG_BCMA_DEBUG is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=m
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_MADERA is not set
-# CONFIG_MFD_DA9052_SPI is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_MC13XXX_SPI is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-CONFIG_HTC_PASIC3=m
-# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
-CONFIG_LPC_ICH=m
-CONFIG_LPC_SCH=m
-CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
-CONFIG_MFD_JANZ_CMODIO=m
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_MENF21BMC is not set
-# CONFIG_EZX_PCAP is not set
-# CONFIG_MFD_VIPERBOARD is not set
-# CONFIG_MFD_RETU is not set
-CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_SI476X_CORE is not set
-CONFIG_MFD_SM501=m
-# CONFIG_MFD_SM501_GPIO is not set
-# CONFIG_MFD_SKY81452 is not set
-CONFIG_ABX500_CORE=y
-# CONFIG_MFD_SYSCON is not set
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_TI_LMU is not set
-# CONFIG_TPS6105X is not set
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-# CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-CONFIG_MFD_WL1273_CORE=m
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_TQMX86 is not set
-CONFIG_MFD_VX855=m
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_MFD_WM8994 is not set
-# end of Multifunction device drivers
-
-CONFIG_REGULATOR=y
-# CONFIG_REGULATOR_DEBUG is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-# CONFIG_REGULATOR_88PG86X is not set
-# CONFIG_REGULATOR_ACT8865 is not set
-# CONFIG_REGULATOR_AD5398 is not set
-# CONFIG_REGULATOR_DA9210 is not set
-# CONFIG_REGULATOR_DA9211 is not set
-# CONFIG_REGULATOR_FAN53555 is not set
-# CONFIG_REGULATOR_GPIO is not set
-# CONFIG_REGULATOR_ISL9305 is not set
-# CONFIG_REGULATOR_ISL6271A is not set
-# CONFIG_REGULATOR_LP3971 is not set
-# CONFIG_REGULATOR_LP3972 is not set
-# CONFIG_REGULATOR_LP872X is not set
-# CONFIG_REGULATOR_LP8755 is not set
-# CONFIG_REGULATOR_LTC3589 is not set
-# CONFIG_REGULATOR_LTC3676 is not set
-# CONFIG_REGULATOR_MAX1586 is not set
-# CONFIG_REGULATOR_MAX8649 is not set
-# CONFIG_REGULATOR_MAX8660 is not set
-# CONFIG_REGULATOR_MAX8952 is not set
-# CONFIG_REGULATOR_MT6311 is not set
-# CONFIG_REGULATOR_PCF50633 is not set
-# CONFIG_REGULATOR_PFUZE100 is not set
-# CONFIG_REGULATOR_PV88060 is not set
-# CONFIG_REGULATOR_PV88080 is not set
-# CONFIG_REGULATOR_PV88090 is not set
-# CONFIG_REGULATOR_PWM is not set
-# CONFIG_REGULATOR_SLG51000 is not set
-# CONFIG_REGULATOR_TPS51632 is not set
-# CONFIG_REGULATOR_TPS62360 is not set
-# CONFIG_REGULATOR_TPS65023 is not set
-# CONFIG_REGULATOR_TPS6507X is not set
-# CONFIG_REGULATOR_TPS65132 is not set
-# CONFIG_REGULATOR_TPS6524X is not set
-CONFIG_CEC_CORE=y
-CONFIG_RC_CORE=m
-CONFIG_RC_MAP=m
-CONFIG_LIRC=y
-CONFIG_RC_DECODERS=y
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_SANYO_DECODER=m
-CONFIG_IR_SHARP_DECODER=m
-CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_XMP_DECODER=m
-CONFIG_IR_IMON_DECODER=m
-# CONFIG_IR_RCMM_DECODER is not set
-CONFIG_RC_DEVICES=y
-CONFIG_RC_ATI_REMOTE=m
-CONFIG_IR_ENE=m
-CONFIG_IR_IMON=m
-CONFIG_IR_IMON_RAW=m
-CONFIG_IR_MCEUSB=m
-CONFIG_IR_ITE_CIR=m
-CONFIG_IR_FINTEK=m
-CONFIG_IR_NUVOTON=m
-CONFIG_IR_REDRAT3=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-CONFIG_IR_IGORPLUGUSB=m
-CONFIG_IR_IGUANA=m
-CONFIG_IR_TTUSBIR=m
-CONFIG_RC_LOOPBACK=m
-CONFIG_IR_SERIAL=m
-# CONFIG_IR_SERIAL_TRANSMITTER is not set
-# CONFIG_IR_SIR is not set
-# CONFIG_RC_XBOX_DVD is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-# CONFIG_MEDIA_RADIO_SUPPORT is not set
-# CONFIG_MEDIA_SDR_SUPPORT is not set
-# CONFIG_MEDIA_CEC_SUPPORT is not set
-CONFIG_MEDIA_CONTROLLER=y
-# CONFIG_MEDIA_CONTROLLER_DVB is not set
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L2_I2C=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_FLASH_LED_CLASS=m
-CONFIG_V4L2_FWNODE=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_DVB_CORE=m
-# CONFIG_DVB_MMAP is not set
-CONFIG_DVB_NET=y
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
-# CONFIG_DVB_ULE_DEBUG is not set
-
-#
-# Media drivers
-#
-CONFIG_MEDIA_USB_SUPPORT=y
-
-#
-# Webcam devices
-#
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_BENQ=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_CPIA1=m
-CONFIG_USB_GSPCA_DTCS033=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_JL2005BCD=m
-CONFIG_USB_GSPCA_KINECT=m
-# CONFIG_USB_GSPCA_KONICA is not set
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_NW80X=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_OV534_9=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7302=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SE401=m
-CONFIG_USB_GSPCA_SN9C2028=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-# CONFIG_USB_GSPCA_SPCA1528 is not set
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_SQ930X=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_STK1135=m
-CONFIG_USB_GSPCA_STV0680=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TOPRO=m
-CONFIG_USB_GSPCA_TOUPTEK=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_VICAM=m
-# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
-CONFIG_USB_GSPCA_ZC3XX=m
-# CONFIG_USB_PWC is not set
-# CONFIG_VIDEO_CPIA2 is not set
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_VIDEO_USBTV=m
-
-#
-# Analog TV USB devices
-#
-# CONFIG_VIDEO_PVRUSB2 is not set
-# CONFIG_VIDEO_HDPVR is not set
-# CONFIG_VIDEO_USBVISION is not set
-# CONFIG_VIDEO_STK1160_COMMON is not set
-# CONFIG_VIDEO_GO7007 is not set
-
-#
-# Analog/digital TV USB devices
-#
-# CONFIG_VIDEO_AU0828 is not set
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-
-#
-# Digital TV USB devices
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_DIB3000MC=m
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-# CONFIG_DVB_USB_CXUSB_ANALOG is not set
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_PCTV452E=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AZ6027=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
-CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_AF9035=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_AZ6007=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_MXL111SF=m
-CONFIG_DVB_USB_RTL28XXU=m
-CONFIG_DVB_USB_DVBSKY=m
-# CONFIG_DVB_USB_ZD1301 is not set
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-# CONFIG_SMS_USB_DRV is not set
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
-# CONFIG_DVB_AS102 is not set
-
-#
-# Webcam, TV (analog/digital) USB devices
-#
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_V4L2=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-# CONFIG_VIDEO_EM28XX_DVB is not set
-CONFIG_VIDEO_EM28XX_RC=m
-CONFIG_MEDIA_PCI_SUPPORT=y
-
-#
-# Media capture support
-#
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SOLO6X10=m
-# CONFIG_VIDEO_TW5864 is not set
-# CONFIG_VIDEO_TW68 is not set
-CONFIG_VIDEO_TW686X=m
-
-#
-# Media capture/analog TV support
-#
-# CONFIG_VIDEO_IVTV is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_DT3155 is not set
-
-#
-# Media capture/analog/hybrid TV support
-#
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_ENABLE_VP3054=y
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7164=m
-# CONFIG_VIDEO_COBALT is not set
-
-#
-# Media digital TV PCI Adapters
-#
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
-CONFIG_DVB_PLUTO2=m
-CONFIG_DVB_DM1105=m
-CONFIG_DVB_PT1=m
-# CONFIG_DVB_PT3 is not set
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
-CONFIG_DVB_NGENE=m
-CONFIG_DVB_DDBRIDGE=m
-# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
-CONFIG_DVB_SMIPCIE=m
-CONFIG_DVB_NETUP_UNIDVB=m
-CONFIG_VIDEO_IPU3_CIO2=m
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_VIDEO_SH_VEU is not set
-# CONFIG_V4L_TEST_DRIVERS is not set
-# CONFIG_DVB_PLATFORM_DRIVERS is not set
-
-#
-# Supported MMC/SDIO adapters
-#
-# CONFIG_SMS_SDIO_DRV is not set
-
-#
-# Supported FireWire (IEEE 1394) Adapters
-#
-CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_INPUT=y
-CONFIG_VIDEO_CX2341X=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_CYPRESS_FIRMWARE=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_V4L2=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEOBUF2_DMA_SG=m
-CONFIG_VIDEOBUF2_DVB=m
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-
-#
-# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
-#
-CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
-CONFIG_MEDIA_ATTACH=y
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# I2C Encoders, decoders, sensors and other helper chips
-#
-
-#
-# Audio decoders, processors and mixers
-#
-# CONFIG_VIDEO_TVAUDIO is not set
-# CONFIG_VIDEO_TDA7432 is not set
-# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA1997X is not set
-# CONFIG_VIDEO_TEA6415C is not set
-# CONFIG_VIDEO_TEA6420 is not set
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS3308=m
-CONFIG_VIDEO_CS5345=m
-# CONFIG_VIDEO_CS53L32A is not set
-# CONFIG_VIDEO_TLV320AIC23B is not set
-# CONFIG_VIDEO_UDA1342 is not set
-CONFIG_VIDEO_WM8775=m
-# CONFIG_VIDEO_WM8739 is not set
-# CONFIG_VIDEO_VP27SMPX is not set
-# CONFIG_VIDEO_SONY_BTF_MPX is not set
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-# CONFIG_VIDEO_ADV7180 is not set
-# CONFIG_VIDEO_ADV7183 is not set
-# CONFIG_VIDEO_ADV7604 is not set
-# CONFIG_VIDEO_ADV7842 is not set
-# CONFIG_VIDEO_BT819 is not set
-# CONFIG_VIDEO_BT856 is not set
-# CONFIG_VIDEO_BT866 is not set
-# CONFIG_VIDEO_KS0127 is not set
-# CONFIG_VIDEO_ML86V7667 is not set
-# CONFIG_VIDEO_SAA7110 is not set
-CONFIG_VIDEO_SAA711X=m
-# CONFIG_VIDEO_TC358743 is not set
-# CONFIG_VIDEO_TVP514X is not set
-CONFIG_VIDEO_TVP5150=m
-# CONFIG_VIDEO_TVP7002 is not set
-# CONFIG_VIDEO_TW2804 is not set
-# CONFIG_VIDEO_TW9903 is not set
-# CONFIG_VIDEO_TW9906 is not set
-# CONFIG_VIDEO_TW9910 is not set
-# CONFIG_VIDEO_VPX3220 is not set
-
-#
-# Video and audio decoders
-#
-# CONFIG_VIDEO_SAA717X is not set
-CONFIG_VIDEO_CX25840=m
-
-#
-# Video encoders
-#
-# CONFIG_VIDEO_SAA7127 is not set
-# CONFIG_VIDEO_SAA7185 is not set
-# CONFIG_VIDEO_ADV7170 is not set
-# CONFIG_VIDEO_ADV7175 is not set
-# CONFIG_VIDEO_ADV7343 is not set
-# CONFIG_VIDEO_ADV7393 is not set
-# CONFIG_VIDEO_ADV7511 is not set
-# CONFIG_VIDEO_AD9389B is not set
-# CONFIG_VIDEO_AK881X is not set
-# CONFIG_VIDEO_THS8200 is not set
-
-#
-# Camera sensor devices
-#
-# CONFIG_VIDEO_IMX214 is not set
-# CONFIG_VIDEO_IMX258 is not set
-# CONFIG_VIDEO_IMX274 is not set
-# CONFIG_VIDEO_IMX319 is not set
-# CONFIG_VIDEO_IMX355 is not set
-CONFIG_VIDEO_OV2640=m
-# CONFIG_VIDEO_OV2659 is not set
-# CONFIG_VIDEO_OV2680 is not set
-# CONFIG_VIDEO_OV2685 is not set
-# CONFIG_VIDEO_OV5647 is not set
-# CONFIG_VIDEO_OV6650 is not set
-# CONFIG_VIDEO_OV5670 is not set
-# CONFIG_VIDEO_OV5675 is not set
-# CONFIG_VIDEO_OV5695 is not set
-# CONFIG_VIDEO_OV7251 is not set
-# CONFIG_VIDEO_OV772X is not set
-# CONFIG_VIDEO_OV7640 is not set
-# CONFIG_VIDEO_OV7670 is not set
-# CONFIG_VIDEO_OV7740 is not set
-# CONFIG_VIDEO_OV8856 is not set
-# CONFIG_VIDEO_OV9640 is not set
-# CONFIG_VIDEO_OV9650 is not set
-# CONFIG_VIDEO_OV13858 is not set
-# CONFIG_VIDEO_VS6624 is not set
-# CONFIG_VIDEO_MT9M001 is not set
-# CONFIG_VIDEO_MT9M032 is not set
-# CONFIG_VIDEO_MT9M111 is not set
-# CONFIG_VIDEO_MT9P031 is not set
-# CONFIG_VIDEO_MT9T001 is not set
-# CONFIG_VIDEO_MT9T112 is not set
-CONFIG_VIDEO_MT9V011=m
-# CONFIG_VIDEO_MT9V032 is not set
-# CONFIG_VIDEO_MT9V111 is not set
-# CONFIG_VIDEO_SR030PC30 is not set
-# CONFIG_VIDEO_NOON010PC30 is not set
-# CONFIG_VIDEO_M5MOLS is not set
-# CONFIG_VIDEO_RJ54N1 is not set
-# CONFIG_VIDEO_S5K6AA is not set
-# CONFIG_VIDEO_S5K6A3 is not set
-# CONFIG_VIDEO_S5K4ECGX is not set
-# CONFIG_VIDEO_S5K5BAF is not set
-# CONFIG_VIDEO_SMIAPP is not set
-# CONFIG_VIDEO_ET8EK8 is not set
-# CONFIG_VIDEO_S5C73M3 is not set
-
-#
-# Lens drivers
-#
-# CONFIG_VIDEO_AD5820 is not set
-# CONFIG_VIDEO_AK7375 is not set
-# CONFIG_VIDEO_DW9714 is not set
-# CONFIG_VIDEO_DW9807_VCM is not set
-
-#
-# Flash devices
-#
-# CONFIG_VIDEO_ADP1653 is not set
-# CONFIG_VIDEO_LM3560 is not set
-# CONFIG_VIDEO_LM3646 is not set
-
-#
-# Video improvement chips
-#
-# CONFIG_VIDEO_UPD64031A is not set
-# CONFIG_VIDEO_UPD64083 is not set
-
-#
-# Audio/Video compression chips
-#
-CONFIG_VIDEO_SAA6752HS=m
-
-#
-# SDR tuner chips
-#
-
-#
-# Miscellaneous helper chips
-#
-# CONFIG_VIDEO_THS7303 is not set
-# CONFIG_VIDEO_M52790 is not set
-# CONFIG_VIDEO_I2C is not set
-# CONFIG_VIDEO_ST_MIPID02 is not set
-# end of I2C Encoders, decoders, sensors and other helper chips
-
-#
-# SPI helper chips
-#
-# CONFIG_VIDEO_GS1662 is not set
-# end of SPI helper chips
-
-#
-# Media SPI Adapters
-#
-CONFIG_CXD2880_SPI_DRV=m
-# end of Media SPI Adapters
-
-CONFIG_MEDIA_TUNER=m
-
-#
-# Customize TV tuners
-#
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA18250=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_MSI001 is not set
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2063=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_XC4000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_MEDIA_TUNER_MAX2165=m
-CONFIG_MEDIA_TUNER_TDA18218=m
-CONFIG_MEDIA_TUNER_FC0011=m
-CONFIG_MEDIA_TUNER_FC0012=m
-CONFIG_MEDIA_TUNER_FC0013=m
-CONFIG_MEDIA_TUNER_TDA18212=m
-CONFIG_MEDIA_TUNER_E4000=m
-CONFIG_MEDIA_TUNER_FC2580=m
-CONFIG_MEDIA_TUNER_M88RS6000T=m
-CONFIG_MEDIA_TUNER_TUA9001=m
-CONFIG_MEDIA_TUNER_SI2157=m
-CONFIG_MEDIA_TUNER_IT913X=m
-CONFIG_MEDIA_TUNER_R820T=m
-# CONFIG_MEDIA_TUNER_MXL301RF is not set
-# CONFIG_MEDIA_TUNER_QM1D1C0042 is not set
-CONFIG_MEDIA_TUNER_QM1D1B0004=m
-# end of Customize TV tuners
-
-#
-# Customise DVB Frontends
-#
-
-#
-# Multistandard (satellite) frontends
-#
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV0910=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_STV6111=m
-CONFIG_DVB_MXL5XX=m
-CONFIG_DVB_M88DS3103=m
-
-#
-# Multistandard (cable + terrestrial) frontends
-#
-CONFIG_DVB_DRXK=m
-CONFIG_DVB_TDA18271C2DD=m
-CONFIG_DVB_SI2165=m
-CONFIG_DVB_MN88472=m
-CONFIG_DVB_MN88473=m
-
-#
-# DVB-S (satellite) frontends
-#
-# CONFIG_DVB_CX24110 is not set
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_CX24117=m
-CONFIG_DVB_CX24120=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_TS2020=m
-CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
-CONFIG_DVB_TDA10071=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-# CONFIG_DVB_SP887X is not set
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-# CONFIG_DVB_S5H1432 is not set
-# CONFIG_DVB_DRXD is not set
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-# CONFIG_DVB_DIB9000 is not set
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_EC100=m
-CONFIG_DVB_STV0367=m
-CONFIG_DVB_CXD2820R=m
-CONFIG_DVB_CXD2841ER=m
-CONFIG_DVB_RTL2830=m
-CONFIG_DVB_RTL2832=m
-CONFIG_DVB_SI2168=m
-# CONFIG_DVB_ZD1301_DEMOD is not set
-CONFIG_DVB_GP8PSK_FE=m
-# CONFIG_DVB_CXD2880 is not set
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
-#
-CONFIG_DVB_NXT200X=m
-# CONFIG_DVB_OR51211 is not set
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_LGDT3306A=m
-CONFIG_DVB_LG2160=m
-CONFIG_DVB_S5H1409=m
-# CONFIG_DVB_AU8522_DTV is not set
-# CONFIG_DVB_AU8522_V4L is not set
-CONFIG_DVB_S5H1411=m
-
-#
-# ISDB-T (terrestrial) frontends
-#
-# CONFIG_DVB_S921 is not set
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_MB86A20S=m
-
-#
-# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
-#
-CONFIG_DVB_TC90522=m
-# CONFIG_DVB_MN88443X is not set
-
-#
-# Digital terrestrial only tuners/PLL
-#
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_TUNER_DIB0090=m
-
-#
-# SEC control devices for DVB-S
-#
-# CONFIG_DVB_DRX39XYJ is not set
-CONFIG_DVB_LNBH25=m
-# CONFIG_DVB_LNBH29 is not set
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_LNBP22=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_A8293=m
-# CONFIG_DVB_LGS8GL5 is not set
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DVB_ATBM8830=m
-CONFIG_DVB_TDA665x=m
-CONFIG_DVB_IX2505V=m
-CONFIG_DVB_M88RS2000=m
-CONFIG_DVB_AF9033=m
-CONFIG_DVB_HORUS3A=m
-CONFIG_DVB_ASCOT2E=m
-CONFIG_DVB_HELENE=m
-
-#
-# Common Interface (EN50221) controller drivers
-#
-CONFIG_DVB_CXD2099=m
-CONFIG_DVB_SP2=m
-
-#
-# Tools to develop new frontends
-#
-CONFIG_DVB_DUMMY_FE=m
-# end of Customise DVB Frontends
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_VIA=m
-CONFIG_INTEL_GTT=m
-CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
-CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM=m
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_DP_AUX_CHARDEV=y
-# CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-CONFIG_DRM_DP_CEC=y
-CONFIG_DRM_TTM=m
-CONFIG_DRM_VRAM_HELPER=m
-CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_VM=y
-CONFIG_DRM_SCHED=m
-
-#
-# I2C encoder or helper chips
-#
-# CONFIG_DRM_I2C_CH7006 is not set
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I2C_NXP_TDA998X=m
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# end of I2C encoder or helper chips
-
-#
-# ARM devices
-#
-# end of ARM devices
-
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_RADEON_USERPTR=y
-CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
-# CONFIG_DRM_AMDGPU_CIK is not set
-# CONFIG_DRM_AMDGPU_USERPTR is not set
-# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
-
-#
-# ACP (Audio CoProcessor) Configuration
-#
-CONFIG_DRM_AMD_ACP=y
-# end of ACP (Audio CoProcessor) Configuration
-
-#
-# Display Engine Configuration
-#
-CONFIG_DRM_AMD_DC=y
-CONFIG_DRM_AMD_DC_DCN1_0=y
-CONFIG_DRM_AMD_DC_DCN2_0=y
-# CONFIG_DRM_AMD_DC_DCN2_1 is not set
-CONFIG_DRM_AMD_DC_DSC_SUPPORT=y
-# CONFIG_DEBUG_KERNEL_DC is not set
-# end of Display Engine Configuration
-
-# CONFIG_HSA_AMD is not set
-CONFIG_DRM_NOUVEAU=m
-CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT=y
-CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG_DEFAULT=3
-# CONFIG_NOUVEAU_DEBUG_MMU is not set
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_I915=m
-# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
-CONFIG_DRM_I915_FORCE_PROBE=""
-CONFIG_DRM_I915_CAPTURE_ERROR=y
-CONFIG_DRM_I915_COMPRESS_ERROR=y
-CONFIG_DRM_I915_USERPTR=y
-CONFIG_DRM_I915_GVT=y
-
-#
-# drm/i915 Debugging
-#
-# CONFIG_DRM_I915_WERROR is not set
-# CONFIG_DRM_I915_DEBUG is not set
-# CONFIG_DRM_I915_DEBUG_MMIO is not set
-# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
-# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
-# CONFIG_DRM_I915_DEBUG_GUC is not set
-# CONFIG_DRM_I915_SELFTEST is not set
-# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
-# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
-# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
-# end of drm/i915 Debugging
-
-#
-# drm/i915 Profile Guided Optimisation
-#
-CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
-CONFIG_DRM_I915_SPIN_REQUEST=5
-# end of drm/i915 Profile Guided Optimisation
-
-CONFIG_DRM_VGEM=m
-# CONFIG_DRM_VKMS is not set
-CONFIG_DRM_ATI_PCIGART=y
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_DRM_GMA500=m
-CONFIG_DRM_GMA600=y
-CONFIG_DRM_GMA3600=y
-# CONFIG_DRM_UDL is not set
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_QXL=m
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
-# end of Display Panels
-
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_PANEL_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-CONFIG_DRM_ANALOGIX_ANX78XX=m
-# end of Display Interface Bridges
-
-# CONFIG_DRM_ETNAVIV is not set
-# CONFIG_DRM_GM12U320 is not set
-# CONFIG_TINYDRM_HX8357D is not set
-# CONFIG_TINYDRM_ILI9225 is not set
-# CONFIG_TINYDRM_ILI9341 is not set
-# CONFIG_TINYDRM_MI0283QT is not set
-# CONFIG_TINYDRM_REPAPER is not set
-# CONFIG_TINYDRM_ST7586 is not set
-# CONFIG_TINYDRM_ST7735R is not set
-# CONFIG_DRM_XEN is not set
-# CONFIG_DRM_VBOXVIDEO is not set
-CONFIG_DRM_LEGACY=y
-# CONFIG_DRM_TDFX is not set
-# CONFIG_DRM_R128 is not set
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_MGA is not set
-# CONFIG_DRM_SIS is not set
-# CONFIG_DRM_VIA is not set
-# CONFIG_DRM_SAVAGE is not set
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FB_DDC=m
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_HECUBA=m
-CONFIG_FB_SVGALIB=m
-CONFIG_FB_BACKLIGHT=m
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_PM2=m
-CONFIG_FB_PM2_FIFO_DISCONNECT=y
-CONFIG_FB_CYBER2000=m
-CONFIG_FB_CYBER2000_DDC=y
-CONFIG_FB_ARC=m
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_UVESA=m
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
-CONFIG_FB_N411=m
-CONFIG_FB_HGA=m
-# CONFIG_FB_OPENCORES is not set
-CONFIG_FB_S1D13XXX=m
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-# CONFIG_FB_I740 is not set
-CONFIG_FB_LE80578=m
-CONFIG_FB_CARILLO_RANCH=m
-CONFIG_FB_INTEL=m
-# CONFIG_FB_INTEL_DEBUG is not set
-CONFIG_FB_INTEL_I2C=y
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
-CONFIG_FB_S3_DDC=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_VIA=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-CONFIG_FB_VIA_X_COMPATIBILITY=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-CONFIG_FB_ARK=m
-CONFIG_FB_PM3=m
-CONFIG_FB_CARMINE=m
-CONFIG_FB_CARMINE_DRAM_EVAL=y
-# CONFIG_CARMINE_DRAM_CUSTOM is not set
-CONFIG_FB_SM501=m
-CONFIG_FB_SMSCUFX=m
-CONFIG_FB_UDL=m
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_XEN_FBDEV_FRONTEND=m
-CONFIG_FB_METRONOME=m
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-CONFIG_FB_MB862XX_I2C=y
-CONFIG_FB_HYPERV=m
-CONFIG_FB_SIMPLE=y
-# CONFIG_FB_SM712 is not set
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LMS283GF05=m
-CONFIG_LCD_LTV350QV=m
-# CONFIG_LCD_ILI922X is not set
-CONFIG_LCD_ILI9320=m
-CONFIG_LCD_TDO24M=m
-CONFIG_LCD_VGG2432A4=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_LCD_AMS369FG06=m
-CONFIG_LCD_LMS501KF03=m
-CONFIG_LCD_HX8357=m
-# CONFIG_LCD_OTM3225A is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_PWM=m
-CONFIG_BACKLIGHT_APPLE=m
-# CONFIG_BACKLIGHT_PM8941_WLED is not set
-CONFIG_BACKLIGHT_SAHARA=m
-CONFIG_BACKLIGHT_ADP8860=m
-# CONFIG_BACKLIGHT_ADP8870 is not set
-CONFIG_BACKLIGHT_PCF50633=m
-# CONFIG_BACKLIGHT_LM3630A is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_GPIO is not set
-# CONFIG_BACKLIGHT_LV5207LP is not set
-# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_ARCXCNN is not set
-# end of Backlight & LCD device support
-
-CONFIG_VGASTATE=m
-CONFIG_HDMI=y
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
-# end of Console display driver support
-
-# CONFIG_LOGO is not set
-# end of Graphics support
-
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_PCM_ELD=y
-CONFIG_SND_PCM_IEC958=y
-CONFIG_SND_HWDEP=m
-CONFIG_SND_SEQ_DEVICE=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_COMPRESS_OFFLOAD=m
-CONFIG_SND_JACK=y
-CONFIG_SND_JACK_INPUT_DEV=y
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_PCM_TIMER=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_MAX_CARDS=32
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_PROC_FS=y
-# CONFIG_SND_VERBOSE_PROCFS is not set
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_SEQUENCER_OSS=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_SEQ_MIDI_EVENT=m
-CONFIG_SND_SEQ_MIDI=m
-CONFIG_SND_SEQ_MIDI_EMUL=m
-CONFIG_SND_SEQ_VIRMIDI=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-CONFIG_SND_PCSP=m
-CONFIG_SND_DUMMY=m
-# CONFIG_SND_ALOOP is not set
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ASIHPI=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_FM801=m
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-
-#
-# HD-Audio
-#
-CONFIG_SND_HDA=m
-CONFIG_SND_HDA_INTEL=m
-# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_BEEP_MODE=0
-# CONFIG_SND_HDA_PATCH_LOADER is not set
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CA0132_DSP=y
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-# end of HD-Audio
-
-CONFIG_SND_HDA_CORE=m
-CONFIG_SND_HDA_DSP_LOADER=y
-CONFIG_SND_HDA_COMPONENT=y
-CONFIG_SND_HDA_I915=y
-CONFIG_SND_HDA_EXT_CORE=m
-CONFIG_SND_HDA_PREALLOC_SIZE=4096
-CONFIG_SND_INTEL_NHLT=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-# CONFIG_SND_USB_CAIAQ_INPUT is not set
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
-# CONFIG_SND_BCD2000 is not set
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_VARIAX=m
-CONFIG_SND_FIREWIRE=y
-CONFIG_SND_FIREWIRE_LIB=m
-CONFIG_SND_DICE=m
-CONFIG_SND_OXFW=m
-CONFIG_SND_ISIGHT=m
-CONFIG_SND_FIREWORKS=m
-CONFIG_SND_BEBOB=m
-# CONFIG_SND_FIREWIRE_DIGI00X is not set
-# CONFIG_SND_FIREWIRE_TASCAM is not set
-# CONFIG_SND_FIREWIRE_MOTU is not set
-# CONFIG_SND_FIREFACE is not set
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_COMPRESS=y
-CONFIG_SND_SOC_TOPOLOGY=y
-CONFIG_SND_SOC_ACPI=m
-CONFIG_SND_SOC_AMD_ACP=m
-CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
-CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
-# CONFIG_SND_SOC_AMD_ACP3x is not set
-# CONFIG_SND_ATMEL_SOC is not set
-# CONFIG_SND_DESIGNWARE_I2S is not set
-
-#
-# SoC Audio for Freescale CPUs
-#
-
-#
-# Common SoC Audio options for Freescale CPUs:
-#
-# CONFIG_SND_SOC_FSL_ASRC is not set
-# CONFIG_SND_SOC_FSL_SAI is not set
-# CONFIG_SND_SOC_FSL_AUDMIX is not set
-# CONFIG_SND_SOC_FSL_SSI is not set
-# CONFIG_SND_SOC_FSL_SPDIF is not set
-# CONFIG_SND_SOC_FSL_ESAI is not set
-# CONFIG_SND_SOC_FSL_MICFIL is not set
-# CONFIG_SND_SOC_IMX_AUDMUX is not set
-# end of SoC Audio for Freescale CPUs
-
-# CONFIG_SND_I2S_HI6210_I2S is not set
-# CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
-CONFIG_SND_SST_IPC=m
-CONFIG_SND_SST_IPC_PCI=m
-CONFIG_SND_SST_IPC_ACPI=m
-CONFIG_SND_SOC_INTEL_SST_ACPI=m
-CONFIG_SND_SOC_INTEL_SST=m
-CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
-CONFIG_SND_SOC_INTEL_HASWELL=m
-CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
-CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
-CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
-CONFIG_SND_SOC_INTEL_SKYLAKE=m
-CONFIG_SND_SOC_INTEL_SKL=m
-CONFIG_SND_SOC_INTEL_APL=m
-CONFIG_SND_SOC_INTEL_KBL=m
-CONFIG_SND_SOC_INTEL_GLK=m
-CONFIG_SND_SOC_INTEL_CNL=m
-CONFIG_SND_SOC_INTEL_CFL=m
-# CONFIG_SND_SOC_INTEL_CML_H is not set
-# CONFIG_SND_SOC_INTEL_CML_LP is not set
-CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
-# CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC is not set
-CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
-CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
-CONFIG_SND_SOC_INTEL_MACH=y
-# CONFIG_SND_SOC_INTEL_HASWELL_MACH is not set
-CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
-CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
-CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
-CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
-CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
-CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
-# CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH is not set
-CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
-# CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH is not set
-# CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
-# CONFIG_SND_SOC_INTEL_SKL_RT286_MACH is not set
-CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
-CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
-CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m
-CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
-CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH is not set
-CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
-# CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH is not set
-# CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH is not set
-CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
-# CONFIG_SND_SOC_MTK_BTCVSD is not set
-# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
-
-#
-# STMicroelectronics STM32 SOC audio support
-#
-# end of STMicroelectronics STM32 SOC audio support
-
-# CONFIG_SND_SOC_XILINX_I2S is not set
-# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
-# CONFIG_SND_SOC_XILINX_SPDIF is not set
-# CONFIG_SND_SOC_XTFPGA_I2S is not set
-# CONFIG_ZX_TDM is not set
-CONFIG_SND_SOC_I2C_AND_SPI=m
-
-#
-# CODEC drivers
-#
-# CONFIG_SND_SOC_AC97_CODEC is not set
-# CONFIG_SND_SOC_ADAU1701 is not set
-# CONFIG_SND_SOC_ADAU1761_I2C is not set
-# CONFIG_SND_SOC_ADAU1761_SPI is not set
-CONFIG_SND_SOC_ADAU7002=m
-# CONFIG_SND_SOC_AK4104 is not set
-# CONFIG_SND_SOC_AK4118 is not set
-CONFIG_SND_SOC_AK4458=m
-# CONFIG_SND_SOC_AK4554 is not set
-# CONFIG_SND_SOC_AK4613 is not set
-# CONFIG_SND_SOC_AK4642 is not set
-# CONFIG_SND_SOC_AK5386 is not set
-CONFIG_SND_SOC_AK5558=m
-# CONFIG_SND_SOC_ALC5623 is not set
-CONFIG_SND_SOC_BD28623=m
-# CONFIG_SND_SOC_BT_SCO is not set
-# CONFIG_SND_SOC_CS35L32 is not set
-# CONFIG_SND_SOC_CS35L33 is not set
-# CONFIG_SND_SOC_CS35L34 is not set
-# CONFIG_SND_SOC_CS35L35 is not set
-# CONFIG_SND_SOC_CS35L36 is not set
-# CONFIG_SND_SOC_CS42L42 is not set
-# CONFIG_SND_SOC_CS42L51_I2C is not set
-# CONFIG_SND_SOC_CS42L52 is not set
-# CONFIG_SND_SOC_CS42L56 is not set
-# CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS4265 is not set
-# CONFIG_SND_SOC_CS4270 is not set
-# CONFIG_SND_SOC_CS4271_I2C is not set
-# CONFIG_SND_SOC_CS4271_SPI is not set
-# CONFIG_SND_SOC_CS42XX8_I2C is not set
-# CONFIG_SND_SOC_CS43130 is not set
-# CONFIG_SND_SOC_CS4341 is not set
-# CONFIG_SND_SOC_CS4349 is not set
-# CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_CX2072X is not set
-CONFIG_SND_SOC_DA7219=m
-CONFIG_SND_SOC_DMIC=m
-CONFIG_SND_SOC_HDMI_CODEC=m
-# CONFIG_SND_SOC_ES7134 is not set
-# CONFIG_SND_SOC_ES7241 is not set
-# CONFIG_SND_SOC_ES8316 is not set
-# CONFIG_SND_SOC_ES8328_I2C is not set
-# CONFIG_SND_SOC_ES8328_SPI is not set
-# CONFIG_SND_SOC_GTM601 is not set
-CONFIG_SND_SOC_HDAC_HDMI=m
-# CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_MAX98088 is not set
-CONFIG_SND_SOC_MAX98357A=m
-# CONFIG_SND_SOC_MAX98504 is not set
-CONFIG_SND_SOC_MAX9867=m
-# CONFIG_SND_SOC_MAX98927 is not set
-CONFIG_SND_SOC_MAX98373=m
-# CONFIG_SND_SOC_MAX9860 is not set
-# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
-# CONFIG_SND_SOC_PCM1681 is not set
-CONFIG_SND_SOC_PCM1789=m
-CONFIG_SND_SOC_PCM1789_I2C=m
-# CONFIG_SND_SOC_PCM179X_I2C is not set
-# CONFIG_SND_SOC_PCM179X_SPI is not set
-CONFIG_SND_SOC_PCM186X=m
-CONFIG_SND_SOC_PCM186X_I2C=m
-CONFIG_SND_SOC_PCM186X_SPI=m
-# CONFIG_SND_SOC_PCM3060_I2C is not set
-# CONFIG_SND_SOC_PCM3060_SPI is not set
-# CONFIG_SND_SOC_PCM3168A_I2C is not set
-# CONFIG_SND_SOC_PCM3168A_SPI is not set
-# CONFIG_SND_SOC_PCM512x_I2C is not set
-# CONFIG_SND_SOC_PCM512x_SPI is not set
-# CONFIG_SND_SOC_RK3328 is not set
-CONFIG_SND_SOC_RL6231=m
-CONFIG_SND_SOC_RL6347A=m
-CONFIG_SND_SOC_RT286=m
-CONFIG_SND_SOC_RT298=m
-# CONFIG_SND_SOC_RT5616 is not set
-# CONFIG_SND_SOC_RT5631 is not set
-CONFIG_SND_SOC_RT5640=m
-CONFIG_SND_SOC_RT5645=m
-CONFIG_SND_SOC_RT5651=m
-CONFIG_SND_SOC_RT5670=m
-CONFIG_SND_SOC_RT5677=m
-CONFIG_SND_SOC_RT5677_SPI=m
-CONFIG_SND_SOC_RT5682=m
-# CONFIG_SND_SOC_SGTL5000 is not set
-CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
-# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
-CONFIG_SND_SOC_SPDIF=m
-# CONFIG_SND_SOC_SSM2305 is not set
-# CONFIG_SND_SOC_SSM2602_SPI is not set
-# CONFIG_SND_SOC_SSM2602_I2C is not set
-CONFIG_SND_SOC_SSM4567=m
-# CONFIG_SND_SOC_STA32X is not set
-# CONFIG_SND_SOC_STA350 is not set
-# CONFIG_SND_SOC_STI_SAS is not set
-# CONFIG_SND_SOC_TAS2552 is not set
-# CONFIG_SND_SOC_TAS5086 is not set
-# CONFIG_SND_SOC_TAS571X is not set
-# CONFIG_SND_SOC_TAS5720 is not set
-CONFIG_SND_SOC_TAS6424=m
-CONFIG_SND_SOC_TDA7419=m
-# CONFIG_SND_SOC_TFA9879 is not set
-# CONFIG_SND_SOC_TLV320AIC23_I2C is not set
-# CONFIG_SND_SOC_TLV320AIC23_SPI is not set
-# CONFIG_SND_SOC_TLV320AIC31XX is not set
-CONFIG_SND_SOC_TLV320AIC32X4=m
-CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
-CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
-# CONFIG_SND_SOC_TLV320AIC3X is not set
-# CONFIG_SND_SOC_TS3A227E is not set
-CONFIG_SND_SOC_TSCS42XX=m
-# CONFIG_SND_SOC_TSCS454 is not set
-# CONFIG_SND_SOC_UDA1334 is not set
-# CONFIG_SND_SOC_WM8510 is not set
-# CONFIG_SND_SOC_WM8523 is not set
-# CONFIG_SND_SOC_WM8524 is not set
-# CONFIG_SND_SOC_WM8580 is not set
-# CONFIG_SND_SOC_WM8711 is not set
-# CONFIG_SND_SOC_WM8728 is not set
-# CONFIG_SND_SOC_WM8731 is not set
-# CONFIG_SND_SOC_WM8737 is not set
-# CONFIG_SND_SOC_WM8741 is not set
-# CONFIG_SND_SOC_WM8750 is not set
-# CONFIG_SND_SOC_WM8753 is not set
-# CONFIG_SND_SOC_WM8770 is not set
-# CONFIG_SND_SOC_WM8776 is not set
-# CONFIG_SND_SOC_WM8782 is not set
-# CONFIG_SND_SOC_WM8804_I2C is not set
-# CONFIG_SND_SOC_WM8804_SPI is not set
-# CONFIG_SND_SOC_WM8903 is not set
-# CONFIG_SND_SOC_WM8904 is not set
-# CONFIG_SND_SOC_WM8960 is not set
-# CONFIG_SND_SOC_WM8962 is not set
-# CONFIG_SND_SOC_WM8974 is not set
-# CONFIG_SND_SOC_WM8978 is not set
-# CONFIG_SND_SOC_WM8985 is not set
-# CONFIG_SND_SOC_ZX_AUD96P22 is not set
-CONFIG_SND_SOC_MAX9759=m
-# CONFIG_SND_SOC_MT6351 is not set
-# CONFIG_SND_SOC_MT6358 is not set
-# CONFIG_SND_SOC_NAU8540 is not set
-# CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8822 is not set
-CONFIG_SND_SOC_NAU8824=m
-CONFIG_SND_SOC_NAU8825=m
-# CONFIG_SND_SOC_TPA6130A2 is not set
-# end of CODEC drivers
-
-CONFIG_SND_SIMPLE_CARD_UTILS=m
-CONFIG_SND_SIMPLE_CARD=m
-CONFIG_SND_X86=y
-# CONFIG_HDMI_LPE_AUDIO is not set
-CONFIG_SND_SYNTH_EMUX=m
-# CONFIG_SND_XEN_FRONTEND is not set
-CONFIG_AC97_BUS=m
-
-#
-# HID support
-#
-CONFIG_HID=m
-CONFIG_HID_BATTERY_STRENGTH=y
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACCUTOUCH is not set
-# CONFIG_HID_ACRUX is not set
-CONFIG_HID_APPLE=m
-# CONFIG_HID_APPLEIR is not set
-CONFIG_HID_ASUS=m
-# CONFIG_HID_AUREAL is not set
-# CONFIG_HID_BELKIN is not set
-CONFIG_HID_BETOP_FF=m
-# CONFIG_HID_BIGBEN_FF is not set
-CONFIG_HID_CHERRY=m
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_CORSAIR is not set
-CONFIG_HID_COUGAR=m
-# CONFIG_HID_MACALLY is not set
-CONFIG_HID_PRODIKEYS=m
-CONFIG_HID_CMEDIA=m
-# CONFIG_HID_CP2112 is not set
-# CONFIG_HID_CREATIVE_SB0540 is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-CONFIG_HID_ELAN=m
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GEMBIRD is not set
-# CONFIG_HID_GFRM is not set
-# CONFIG_HID_HOLTEK is not set
-CONFIG_HID_GT683R=m
-CONFIG_HID_KEYTOUCH=m
-# CONFIG_HID_KYE is not set
-CONFIG_HID_UCLOGIC=m
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_VIEWSONIC is not set
-# CONFIG_HID_GYRATION is not set
-CONFIG_HID_ICADE=m
-# CONFIG_HID_ITE is not set
-CONFIG_HID_JABRA=m
-# CONFIG_HID_TWINHAN is not set
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_LED=m
-CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_HID_LOGITECH_HIDPP=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
-CONFIG_LOGIWHEELS_FF=y
-CONFIG_HID_MAGICMOUSE=m
-# CONFIG_HID_MALTRON is not set
-# CONFIG_HID_MAYFLASH is not set
-# CONFIG_HID_REDRAGON is not set
-CONFIG_HID_MICROSOFT=m
-# CONFIG_HID_MONTEREY is not set
-CONFIG_HID_MULTITOUCH=m
-# CONFIG_HID_NTI is not set
-# CONFIG_HID_NTRIG is not set
-CONFIG_HID_ORTEK=m
-# CONFIG_HID_PANTHERLORD is not set
-CONFIG_HID_PENMOUNT=m
-# CONFIG_HID_PETALYNX is not set
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PICOLCD_FB=y
-CONFIG_HID_PICOLCD_BACKLIGHT=y
-CONFIG_HID_PICOLCD_LCD=y
-CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_PICOLCD_CIR=y
-CONFIG_HID_PLANTRONICS=m
-CONFIG_HID_PRIMAX=m
-# CONFIG_HID_RETRODE is not set
-CONFIG_HID_ROCCAT=m
-# CONFIG_HID_SAITEK is not set
-# CONFIG_HID_SAMSUNG is not set
-CONFIG_HID_SONY=m
-CONFIG_SONY_FF=y
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_STEAM=m
-# CONFIG_HID_STEELSERIES is not set
-# CONFIG_HID_SUNPLUS is not set
-CONFIG_HID_RMI=m
-# CONFIG_HID_GREENASIA is not set
-CONFIG_HID_HYPERV_MOUSE=m
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-CONFIG_HID_THINGM=m
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_UDRAW_PS3 is not set
-# CONFIG_HID_U2FZERO is not set
-# CONFIG_HID_WACOM is not set
-CONFIG_HID_WIIMOTE=m
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-CONFIG_HID_ZYDACRON=m
-CONFIG_HID_SENSOR_HUB=m
-# CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
-CONFIG_HID_ALPS=m
-# end of Special HID drivers
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# end of USB HID Boot Protocol drivers
-# end of USB HID support
-
-#
-# I2C HID support
-#
-CONFIG_I2C_HID=m
-# end of I2C HID support
-
-#
-# Intel ISH HID support
-#
-CONFIG_INTEL_ISH_HID=m
-# CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set
-# end of Intel ISH HID support
-# end of HID support
-
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_LED_TRIG=y
-# CONFIG_USB_ULPI_BUS is not set
-# CONFIG_USB_CONN_GPIO is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-CONFIG_USB_PCI=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_OTG_FSM is not set
-CONFIG_USB_LEDS_TRIGGER_USBPORT=m
-CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_MON=m
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=m
-CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-CONFIG_USB_EHCI_PCI=m
-# CONFIG_USB_EHCI_FSL is not set
-CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-# CONFIG_USB_FOTG210_HCD is not set
-# CONFIG_USB_MAX3421_HCD is not set
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_SSB=y
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_HCD_ISO=y
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-# CONFIG_USB_HCD_BCMA is not set
-CONFIG_USB_HCD_SSB=m
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_REALTEK=m
-CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_VHCI_HC_PORTS=8
-CONFIG_USBIP_VHCI_NR_HCS=1
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-# CONFIG_USB_CDNS3 is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_ISP1760 is not set
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_SIMPLE=m
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-# CONFIG_USB_SERIAL_F81232 is not set
-# CONFIG_USB_SERIAL_F8153X is not set
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
-CONFIG_USB_SERIAL_MOS7840=m
-# CONFIG_USB_SERIAL_MXUPORT is not set
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QCAUX=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-CONFIG_USB_SERIAL_XSENS_MT=m
-# CONFIG_USB_SERIAL_WISHBONE is not set
-# CONFIG_USB_SERIAL_SSU100 is not set
-CONFIG_USB_SERIAL_QT2=m
-# CONFIG_USB_SERIAL_UPD78F0730 is not set
-CONFIG_USB_SERIAL_DEBUG=m
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-# CONFIG_USB_LEGOTOWER is not set
-CONFIG_USB_LCD=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-# CONFIG_USB_APPLEDISPLAY is not set
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
-CONFIG_USB_LD=m
-# CONFIG_USB_TRANCEVIBRATOR is not set
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-CONFIG_USB_ISIGHTFW=m
-# CONFIG_USB_YUREX is not set
-CONFIG_USB_EZUSB_FX2=m
-# CONFIG_USB_HUB_USB251XB is not set
-CONFIG_USB_HSIC_USB3503=m
-CONFIG_USB_HSIC_USB4604=m
-# CONFIG_USB_LINK_LAYER_TEST is not set
-CONFIG_USB_CHAOSKEY=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-
-#
-# USB Physical Layer drivers
-#
-CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_USB_GPIO_VBUS=m
-# CONFIG_USB_ISP1301 is not set
-# end of USB Physical Layer drivers
-
-# CONFIG_USB_GADGET is not set
-CONFIG_TYPEC=m
-# CONFIG_TYPEC_TCPM is not set
-# CONFIG_TYPEC_UCSI is not set
-CONFIG_TYPEC_TPS6598X=m
-
-#
-# USB Type-C Multiplexer/DeMultiplexer Switch support
-#
-CONFIG_TYPEC_MUX_PI3USB30532=m
-# end of USB Type-C Multiplexer/DeMultiplexer Switch support
-
-#
-# USB Type-C Alternate Mode drivers
-#
-CONFIG_TYPEC_DP_ALTMODE=m
-# CONFIG_TYPEC_NVIDIA_ALTMODE is not set
-# end of USB Type-C Alternate Mode drivers
-
-CONFIG_USB_ROLE_SWITCH=m
-CONFIG_USB_ROLES_INTEL_XHCI=m
-CONFIG_MMC=m
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_SDIO_UART=m
-CONFIG_MMC_TEST=m
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_SDHCI_F_SDH30=m
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-# CONFIG_MMC_SPI is not set
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-# CONFIG_MMC_USHC is not set
-# CONFIG_MMC_USDHI6ROL0 is not set
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MMC_REALTEK_USB=m
-CONFIG_MMC_CQHCI=m
-CONFIG_MMC_TOSHIBA_PCI=m
-CONFIG_MMC_MTK=m
-# CONFIG_MMC_SDHCI_XENON is not set
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-# CONFIG_MS_BLOCK is not set
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_MEMSTICK_R592=m
-CONFIG_MEMSTICK_REALTEK_PCI=m
-CONFIG_MEMSTICK_REALTEK_USB=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_CLASS_FLASH=m
-# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
-
-#
-# LED drivers
-#
-CONFIG_LEDS_APU=m
-# CONFIG_LEDS_AS3645A is not set
-CONFIG_LEDS_LM3530=m
-# CONFIG_LEDS_LM3532 is not set
-# CONFIG_LEDS_LM3642 is not set
-CONFIG_LEDS_LM3601X=m
-# CONFIG_LEDS_PCA9532 is not set
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_LP3952=m
-CONFIG_LEDS_LP55XX_COMMON=m
-CONFIG_LEDS_LP5521=m
-CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LP5562=m
-# CONFIG_LEDS_LP8501 is not set
-CONFIG_LEDS_CLEVO_MAIL=m
-# CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_DAC124S085 is not set
-# CONFIG_LEDS_PWM is not set
-CONFIG_LEDS_REGULATOR=m
-# CONFIG_LEDS_BD2802 is not set
-CONFIG_LEDS_INTEL_SS4200=m
-# CONFIG_LEDS_TCA6507 is not set
-# CONFIG_LEDS_TLC591XX is not set
-# CONFIG_LEDS_LM355x is not set
-
-#
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
-#
-CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_MLXCPLD=m
-CONFIG_LEDS_MLXREG=m
-# CONFIG_LEDS_USER is not set
-# CONFIG_LEDS_NIC78BX is not set
-# CONFIG_LEDS_TI_LMU_COMMON is not set
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_ONESHOT=m
-CONFIG_LEDS_TRIGGER_DISK=y
-CONFIG_LEDS_TRIGGER_MTD=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-# CONFIG_LEDS_TRIGGER_CPU is not set
-CONFIG_LEDS_TRIGGER_ACTIVITY=m
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_LEDS_TRIGGER_TRANSIENT=m
-CONFIG_LEDS_TRIGGER_CAMERA=m
-CONFIG_LEDS_TRIGGER_PANIC=y
-CONFIG_LEDS_TRIGGER_NETDEV=m
-# CONFIG_LEDS_TRIGGER_PATTERN is not set
-CONFIG_LEDS_TRIGGER_AUDIO=m
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
-CONFIG_INFINIBAND_MTHCA=m
-# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
-# CONFIG_INFINIBAND_QIB is not set
-CONFIG_INFINIBAND_CXGB3=m
-CONFIG_INFINIBAND_CXGB4=m
-# CONFIG_INFINIBAND_EFA is not set
-CONFIG_INFINIBAND_I40IW=m
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_MLX5_INFINIBAND=m
-# CONFIG_INFINIBAND_OCRDMA is not set
-# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
-# CONFIG_INFINIBAND_USNIC is not set
-CONFIG_INFINIBAND_HFI1=m
-# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
-# CONFIG_SDMA_VERBOSITY is not set
-# CONFIG_INFINIBAND_QEDR is not set
-CONFIG_INFINIBAND_RDMAVT=m
-CONFIG_RDMA_RXE=m
-# CONFIG_RDMA_SIW is not set
-CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_CM is not set
-# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_SRPT=m
-CONFIG_INFINIBAND_ISER=m
-# CONFIG_INFINIBAND_ISERT is not set
-# CONFIG_INFINIBAND_OPA_VNIC is not set
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_EDAC=y
-CONFIG_EDAC_LEGACY_SYSFS=y
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=y
-CONFIG_EDAC_AMD64=m
-# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
-CONFIG_EDAC_E752X=m
-CONFIG_EDAC_I82975X=m
-CONFIG_EDAC_I3000=m
-CONFIG_EDAC_I3200=m
-CONFIG_EDAC_IE31200=m
-CONFIG_EDAC_X38=m
-CONFIG_EDAC_I5400=m
-CONFIG_EDAC_I7CORE=m
-CONFIG_EDAC_I5000=m
-CONFIG_EDAC_I5100=m
-CONFIG_EDAC_I7300=m
-CONFIG_EDAC_SBRIDGE=m
-CONFIG_EDAC_SKX=m
-# CONFIG_EDAC_I10NM is not set
-CONFIG_EDAC_PND2=m
-CONFIG_RTC_LIB=y
-CONFIG_RTC_MC146818_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_NVMEM=y
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-# CONFIG_RTC_DRV_ABB5ZES3 is not set
-# CONFIG_RTC_DRV_ABEOZ9 is not set
-CONFIG_RTC_DRV_ABX80X=m
-CONFIG_RTC_DRV_DS1307=m
-# CONFIG_RTC_DRV_DS1307_CENTURY is not set
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1374_WDT=y
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-# CONFIG_RTC_DRV_ISL12022 is not set
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF85063=m
-# CONFIG_RTC_DRV_PCF85363 is not set
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8010=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-CONFIG_RTC_DRV_EM3027=m
-# CONFIG_RTC_DRV_RV3028 is not set
-CONFIG_RTC_DRV_RV8803=m
-# CONFIG_RTC_DRV_SD3078 is not set
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_DRV_M41T93=m
-CONFIG_RTC_DRV_M41T94=m
-# CONFIG_RTC_DRV_DS1302 is not set
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1343=m
-CONFIG_RTC_DRV_DS1347=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_MAX6916=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RX4581=m
-# CONFIG_RTC_DRV_RX6110 is not set
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_PCF2123=m
-CONFIG_RTC_DRV_MCP795=m
-CONFIG_RTC_I2C_AND_SPI=m
-
-#
-# SPI and I2C RTC drivers
-#
-# CONFIG_RTC_DRV_DS3232 is not set
-CONFIG_RTC_DRV_PCF2127=m
-CONFIG_RTC_DRV_RV3029C2=m
-CONFIG_RTC_DRV_RV3029_HWMON=y
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1685_FAMILY=m
-CONFIG_RTC_DRV_DS1685=y
-# CONFIG_RTC_DRV_DS1689 is not set
-# CONFIG_RTC_DRV_DS17285 is not set
-# CONFIG_RTC_DRV_DS17485 is not set
-# CONFIG_RTC_DRV_DS17885 is not set
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_PCF50633=m
-
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_FTRTC010 is not set
-
-#
-# HID Sensor RTC drivers
-#
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_VIRTUAL_CHANNELS=m
-CONFIG_DMA_ACPI=y
-# CONFIG_ALTERA_MSGDMA is not set
-CONFIG_INTEL_IDMA64=m
-CONFIG_INTEL_IOATDMA=m
-CONFIG_INTEL_MIC_X100_DMA=m
-CONFIG_QCOM_HIDMA_MGMT=m
-# CONFIG_QCOM_HIDMA is not set
-CONFIG_DW_DMAC_CORE=m
-# CONFIG_DW_DMAC is not set
-CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
-CONFIG_HSU_DMA=m
-
-#
-# DMA Clients
-#
-# CONFIG_ASYNC_TX_DMA is not set
-CONFIG_DMATEST=m
-CONFIG_DMA_ENGINE_RAID=y
-
-#
-# DMABUF options
-#
-CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
-# CONFIG_DMABUF_SELFTESTS is not set
-# end of DMABUF options
-
-CONFIG_DCA=m
-CONFIG_AUXDISPLAY=y
-# CONFIG_HD44780 is not set
-CONFIG_KS0108=m
-CONFIG_KS0108_PORT=0x378
-CONFIG_KS0108_DELAY=2
-CONFIG_CFAG12864B=m
-CONFIG_CFAG12864B_RATE=20
-# CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_PARPORT_PANEL is not set
-# CONFIG_CHARLCD_BL_OFF is not set
-# CONFIG_CHARLCD_BL_ON is not set
-CONFIG_CHARLCD_BL_FLASH=y
-# CONFIG_PANEL is not set
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV_GENIRQ=m
-# CONFIG_UIO_DMEM_GENIRQ is not set
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_NETX=m
-# CONFIG_UIO_PRUSS is not set
-# CONFIG_UIO_MF624 is not set
-# CONFIG_UIO_HV_GENERIC is not set
-CONFIG_VFIO_IOMMU_TYPE1=m
-CONFIG_VFIO_VIRQFD=m
-CONFIG_VFIO=m
-# CONFIG_VFIO_NOIOMMU is not set
-CONFIG_VFIO_PCI=m
-CONFIG_VFIO_PCI_VGA=y
-CONFIG_VFIO_PCI_MMAP=y
-CONFIG_VFIO_PCI_INTX=y
-CONFIG_VFIO_PCI_IGD=y
-# CONFIG_VFIO_MDEV is not set
-CONFIG_IRQ_BYPASS_MANAGER=m
-CONFIG_VIRT_DRIVERS=y
-# CONFIG_VBOXGUEST is not set
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-# CONFIG_VIRTIO_PMEM is not set
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
-# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_HYPERV=m
-CONFIG_HYPERV_TIMER=y
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
-# end of Microsoft Hyper-V guest support
-
-#
-# Xen driver support
-#
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
-CONFIG_XEN_DEV_EVTCHN=m
-CONFIG_XEN_BACKEND=y
-CONFIG_XENFS=m
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_XENBUS_FRONTEND=y
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-# CONFIG_XEN_GRANT_DMA_ALLOC is not set
-CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_PCIDEV_BACKEND=m
-CONFIG_XEN_PVCALLS_FRONTEND=m
-# CONFIG_XEN_PVCALLS_BACKEND is not set
-CONFIG_XEN_SCSI_BACKEND=m
-CONFIG_XEN_PRIVCMD=m
-CONFIG_XEN_ACPI_PROCESSOR=m
-# CONFIG_XEN_MCE_LOG is not set
-CONFIG_XEN_HAVE_PVMMU=y
-CONFIG_XEN_EFI=y
-CONFIG_XEN_AUTO_XLATE=y
-CONFIG_XEN_ACPI=y
-# CONFIG_XEN_SYMS is not set
-CONFIG_XEN_HAVE_VPMU=y
-# end of Xen driver support
-
-# CONFIG_GREYBUS is not set
-CONFIG_STAGING=y
-# CONFIG_PRISM2_USB is not set
-# CONFIG_COMEDI is not set
-# CONFIG_RTL8192U is not set
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-# CONFIG_RTL8192E is not set
-CONFIG_RTL8723BS=m
-# CONFIG_R8712U is not set
-# CONFIG_R8188EU is not set
-# CONFIG_RTS5208 is not set
-# CONFIG_VT6655 is not set
-# CONFIG_VT6656 is not set
-
-#
-# IIO staging drivers
-#
-
-#
-# Accelerometers
-#
-# CONFIG_ADIS16203 is not set
-# CONFIG_ADIS16240 is not set
-# end of Accelerometers
-
-#
-# Analog to digital converters
-#
-# CONFIG_AD7816 is not set
-# CONFIG_AD7192 is not set
-# CONFIG_AD7280 is not set
-# end of Analog to digital converters
-
-#
-# Analog digital bi-direction converters
-#
-# CONFIG_ADT7316 is not set
-# end of Analog digital bi-direction converters
-
-#
-# Capacitance to digital converters
-#
-# CONFIG_AD7150 is not set
-# CONFIG_AD7746 is not set
-# end of Capacitance to digital converters
-
-#
-# Direct Digital Synthesis
-#
-# CONFIG_AD9832 is not set
-# CONFIG_AD9834 is not set
-# end of Direct Digital Synthesis
-
-#
-# Network Analyzer, Impedance Converters
-#
-# CONFIG_AD5933 is not set
-# end of Network Analyzer, Impedance Converters
-
-#
-# Active energy metering IC
-#
-# CONFIG_ADE7854 is not set
-# end of Active energy metering IC
-
-#
-# Resolver to digital converters
-#
-# CONFIG_AD2S1210 is not set
-# end of Resolver to digital converters
-# end of IIO staging drivers
-
-# CONFIG_FB_SM750 is not set
-
-#
-# Speakup console speech
-#
-CONFIG_SPEAKUP=m
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m
-CONFIG_SPEAKUP_SYNTH_APOLLO=m
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m
-CONFIG_SPEAKUP_SYNTH_BNS=m
-CONFIG_SPEAKUP_SYNTH_DECTLK=m
-CONFIG_SPEAKUP_SYNTH_DECEXT=m
-CONFIG_SPEAKUP_SYNTH_LTLK=m
-CONFIG_SPEAKUP_SYNTH_SOFT=m
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m
-CONFIG_SPEAKUP_SYNTH_TXPRT=m
-# CONFIG_SPEAKUP_SYNTH_DUMMY is not set
-# end of Speakup console speech
-
-# CONFIG_STAGING_MEDIA is not set
-
-#
-# Android
-#
-CONFIG_ASHMEM=y
-# CONFIG_ANDROID_VSOC is not set
-# CONFIG_ION is not set
-# end of Android
-
-# CONFIG_LTE_GDM724X is not set
-# CONFIG_FIREWIRE_SERIAL is not set
-# CONFIG_GS_FPGABOOT is not set
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_WILC1000_SDIO is not set
-# CONFIG_WILC1000_SPI is not set
-# CONFIG_MOST is not set
-# CONFIG_KS7010 is not set
-# CONFIG_PI433 is not set
-
-#
-# Gasket devices
-#
-# CONFIG_STAGING_GASKET_FRAMEWORK is not set
-# end of Gasket devices
-
-# CONFIG_FIELDBUS_DEV is not set
-# CONFIG_KPC2000 is not set
-
-#
-# ISDN CAPI drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_CAPI=y
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-# end of ISDN CAPI drivers
-
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_I1480U=m
-CONFIG_EXFAT_FS=m
-CONFIG_EXFAT_DONT_MOUNT_VFAT=y
-CONFIG_EXFAT_DISCARD=y
-# CONFIG_EXFAT_DELAYED_SYNC is not set
-# CONFIG_EXFAT_KERNEL_DEBUG is not set
-# CONFIG_EXFAT_DEBUG_MSG is not set
-CONFIG_EXFAT_DEFAULT_CODEPAGE=437
-CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
-CONFIG_QLGE=m
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACER_WIRELESS=m
-CONFIG_ACERHDF=m
-CONFIG_ALIENWARE_WMI=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_DCDBAS=m
-CONFIG_DELL_SMBIOS=m
-CONFIG_DELL_SMBIOS_WMI=y
-CONFIG_DELL_SMBIOS_SMM=y
-CONFIG_DELL_LAPTOP=m
-CONFIG_DELL_WMI=m
-CONFIG_DELL_WMI_DESCRIPTOR=m
-CONFIG_DELL_WMI_AIO=m
-# CONFIG_DELL_WMI_LED is not set
-CONFIG_DELL_SMO8800=m
-CONFIG_DELL_RBTN=m
-CONFIG_DELL_RBU=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_TABLET is not set
-CONFIG_AMILO_RFKILL=m
-CONFIG_GPD_POCKET_FAN=m
-CONFIG_HP_ACCEL=m
-CONFIG_HP_WIRELESS=m
-CONFIG_HP_WMI=m
-# CONFIG_LG_LAPTOP is not set
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-# CONFIG_SONYPI_COMPAT is not set
-CONFIG_IDEAPAD_LAPTOP=m
-# CONFIG_SURFACE3_WMI is not set
-CONFIG_THINKPAD_ACPI=m
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_SENSORS_HDAPS=m
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ASUS_WMI=m
-CONFIG_ASUS_NB_WMI=m
-CONFIG_EEEPC_WMI=m
-CONFIG_ASUS_WIRELESS=m
-CONFIG_ACPI_WMI=m
-CONFIG_WMI_BMOF=m
-CONFIG_INTEL_WMI_THUNDERBOLT=m
-# CONFIG_XIAOMI_WMI is not set
-CONFIG_MSI_WMI=m
-# CONFIG_PEAQ_WMI is not set
-# CONFIG_TOPSTAR_LAPTOP is not set
-# CONFIG_ACPI_TOSHIBA is not set
-CONFIG_TOSHIBA_BT_RFKILL=m
-CONFIG_TOSHIBA_HAPS=m
-# CONFIG_TOSHIBA_WMI is not set
-CONFIG_ACPI_CMPC=m
-# CONFIG_INTEL_INT0002_VGPIO is not set
-CONFIG_INTEL_HID_EVENT=m
-CONFIG_INTEL_VBTN=m
-# CONFIG_INTEL_IPS is not set
-CONFIG_INTEL_PMC_CORE=y
-# CONFIG_IBM_RTL is not set
-# CONFIG_SAMSUNG_LAPTOP is not set
-CONFIG_MXM_WMI=m
-CONFIG_INTEL_OAKTRAIL=m
-# CONFIG_SAMSUNG_Q10 is not set
-CONFIG_APPLE_GMUX=m
-# CONFIG_INTEL_RST is not set
-# CONFIG_INTEL_SMARTCONNECT is not set
-# CONFIG_INTEL_PMC_IPC is not set
-# CONFIG_SURFACE_PRO3_BUTTON is not set
-CONFIG_INTEL_PUNIT_IPC=m
-CONFIG_MLX_PLATFORM=m
-# CONFIG_INTEL_TURBO_MAX_3 is not set
-CONFIG_INTEL_CHTDC_TI_PWRBTN=m
-CONFIG_I2C_MULTI_INSTANTIATE=m
-CONFIG_INTEL_ATOMISP2_PM=m
-# CONFIG_HUAWEI_WMI is not set
-CONFIG_PCENGINES_APU2=m
-
-#
-# Intel Speed Select Technology interface support
-#
-# CONFIG_INTEL_SPEED_SELECT_INTERFACE is not set
-# end of Intel Speed Select Technology interface support
-
-CONFIG_PMC_ATOM=y
-# CONFIG_MFD_CROS_EC is not set
-CONFIG_CHROME_PLATFORMS=y
-CONFIG_CHROMEOS_LAPTOP=m
-CONFIG_CHROMEOS_PSTORE=m
-# CONFIG_CHROMEOS_TBMC is not set
-# CONFIG_CROS_EC is not set
-CONFIG_CROS_KBD_LED_BACKLIGHT=m
-CONFIG_MELLANOX_PLATFORM=y
-CONFIG_MLXREG_HOTPLUG=m
-CONFIG_MLXREG_IO=m
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-
-#
-# Common Clock Framework
-#
-# CONFIG_COMMON_CLK_MAX9485 is not set
-# CONFIG_COMMON_CLK_SI5341 is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-CONFIG_COMMON_CLK_SI544=m
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_PWM is not set
-# end of Common Clock Framework
-
-# CONFIG_HWSPINLOCK is not set
-
-#
-# Clock Source drivers
-#
-CONFIG_CLKEVT_I8253=y
-CONFIG_I8253_LOCK=y
-CONFIG_CLKBLD_I8253=y
-# end of Clock Source drivers
-
-CONFIG_MAILBOX=y
-CONFIG_PCC=y
-# CONFIG_ALTERA_MBOX is not set
-CONFIG_IOMMU_IOVA=y
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-# end of Generic IOMMU Pagetable Support
-
-# CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_AMD_IOMMU=y
-CONFIG_AMD_IOMMU_V2=m
-CONFIG_DMAR_TABLE=y
-CONFIG_INTEL_IOMMU=y
-# CONFIG_INTEL_IOMMU_SVM is not set
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-CONFIG_IRQ_REMAP=y
-CONFIG_HYPERV_IOMMU=y
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-CONFIG_RPMSG=m
-# CONFIG_RPMSG_CHAR is not set
-# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
-CONFIG_RPMSG_VIRTIO=m
-# end of Rpmsg drivers
-
-CONFIG_SOUNDWIRE=y
-
-#
-# SoundWire Devices
-#
-CONFIG_SOUNDWIRE_CADENCE=m
-CONFIG_SOUNDWIRE_INTEL=m
-
-#
-# SOC (System On Chip) specific Drivers
-#
-
-#
-# Amlogic SoC drivers
-#
-# end of Amlogic SoC drivers
-
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-# end of i.MX SoC drivers
-
-#
-# Qualcomm SoC drivers
-#
-# end of Qualcomm SoC drivers
-
-# CONFIG_SOC_TI is not set
-
-#
-# Xilinx SoC drivers
-#
-CONFIG_XILINX_VCU=m
-# end of Xilinx SoC drivers
-# end of SOC (System On Chip) specific Drivers
-
-CONFIG_PM_DEVFREQ=y
-
-#
-# DEVFREQ Governors
-#
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
-CONFIG_DEVFREQ_GOV_PERFORMANCE=m
-CONFIG_DEVFREQ_GOV_POWERSAVE=m
-CONFIG_DEVFREQ_GOV_USERSPACE=m
-# CONFIG_DEVFREQ_GOV_PASSIVE is not set
-
-#
-# DEVFREQ Drivers
-#
-# CONFIG_PM_DEVFREQ_EVENT is not set
-CONFIG_EXTCON=y
-
-#
-# Extcon Device Drivers
-#
-# CONFIG_EXTCON_ADC_JACK is not set
-# CONFIG_EXTCON_FSA9480 is not set
-CONFIG_EXTCON_GPIO=m
-# CONFIG_EXTCON_INTEL_INT3496 is not set
-# CONFIG_EXTCON_MAX3355 is not set
-# CONFIG_EXTCON_PTN5150 is not set
-# CONFIG_EXTCON_RT8973A is not set
-# CONFIG_EXTCON_SM5502 is not set
-# CONFIG_EXTCON_USB_GPIO is not set
-CONFIG_MEMORY=y
-CONFIG_IIO=m
-CONFIG_IIO_BUFFER=y
-# CONFIG_IIO_BUFFER_CB is not set
-# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
-CONFIG_IIO_KFIFO_BUF=m
-CONFIG_IIO_TRIGGERED_BUFFER=m
-# CONFIG_IIO_CONFIGFS is not set
-CONFIG_IIO_TRIGGER=y
-CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
-# CONFIG_IIO_SW_DEVICE is not set
-# CONFIG_IIO_SW_TRIGGER is not set
-
-#
-# Accelerometers
-#
-# CONFIG_ADIS16201 is not set
-# CONFIG_ADIS16209 is not set
-# CONFIG_ADXL372_SPI is not set
-# CONFIG_ADXL372_I2C is not set
-# CONFIG_BMA180 is not set
-# CONFIG_BMA220 is not set
-# CONFIG_BMC150_ACCEL is not set
-# CONFIG_DA280 is not set
-# CONFIG_DA311 is not set
-# CONFIG_DMARD09 is not set
-# CONFIG_DMARD10 is not set
-CONFIG_HID_SENSOR_ACCEL_3D=m
-# CONFIG_IIO_ST_ACCEL_3AXIS is not set
-# CONFIG_KXSD9 is not set
-# CONFIG_KXCJK1013 is not set
-# CONFIG_MC3230 is not set
-# CONFIG_MMA7455_I2C is not set
-# CONFIG_MMA7455_SPI is not set
-# CONFIG_MMA7660 is not set
-# CONFIG_MMA8452 is not set
-# CONFIG_MMA9551 is not set
-# CONFIG_MMA9553 is not set
-# CONFIG_MXC4005 is not set
-# CONFIG_MXC6255 is not set
-# CONFIG_SCA3000 is not set
-# CONFIG_STK8312 is not set
-# CONFIG_STK8BA50 is not set
-# end of Accelerometers
-
-#
-# Analog to digital converters
-#
-# CONFIG_AD7124 is not set
-# CONFIG_AD7266 is not set
-# CONFIG_AD7291 is not set
-# CONFIG_AD7298 is not set
-# CONFIG_AD7476 is not set
-# CONFIG_AD7606_IFACE_PARALLEL is not set
-# CONFIG_AD7606_IFACE_SPI is not set
-# CONFIG_AD7766 is not set
-# CONFIG_AD7768_1 is not set
-# CONFIG_AD7780 is not set
-# CONFIG_AD7791 is not set
-# CONFIG_AD7793 is not set
-# CONFIG_AD7887 is not set
-# CONFIG_AD7923 is not set
-# CONFIG_AD7949 is not set
-# CONFIG_AD799X is not set
-# CONFIG_CC10001_ADC is not set
-# CONFIG_HI8435 is not set
-# CONFIG_HX711 is not set
-# CONFIG_INA2XX_ADC is not set
-# CONFIG_LTC2471 is not set
-# CONFIG_LTC2485 is not set
-# CONFIG_LTC2497 is not set
-# CONFIG_MAX1027 is not set
-# CONFIG_MAX11100 is not set
-# CONFIG_MAX1118 is not set
-# CONFIG_MAX1363 is not set
-# CONFIG_MAX9611 is not set
-# CONFIG_MCP320X is not set
-# CONFIG_MCP3422 is not set
-# CONFIG_MCP3911 is not set
-# CONFIG_NAU7802 is not set
-# CONFIG_TI_ADC081C is not set
-# CONFIG_TI_ADC0832 is not set
-# CONFIG_TI_ADC084S021 is not set
-# CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC108S102 is not set
-# CONFIG_TI_ADC128S052 is not set
-# CONFIG_TI_ADC161S626 is not set
-# CONFIG_TI_ADS1015 is not set
-# CONFIG_TI_ADS7950 is not set
-# CONFIG_TI_TLC4541 is not set
-# CONFIG_XILINX_XADC is not set
-# end of Analog to digital converters
-
-#
-# Analog Front Ends
-#
-# end of Analog Front Ends
-
-#
-# Amplifiers
-#
-# CONFIG_AD8366 is not set
-# end of Amplifiers
-
-#
-# Chemical Sensors
-#
-# CONFIG_ATLAS_PH_SENSOR is not set
-# CONFIG_BME680 is not set
-# CONFIG_CCS811 is not set
-# CONFIG_IAQCORE is not set
-# CONFIG_SENSIRION_SGP30 is not set
-# CONFIG_SPS30 is not set
-# CONFIG_VZ89X is not set
-# end of Chemical Sensors
-
-#
-# Hid Sensor IIO Common
-#
-CONFIG_HID_SENSOR_IIO_COMMON=m
-CONFIG_HID_SENSOR_IIO_TRIGGER=m
-# end of Hid Sensor IIO Common
-
-#
-# SSP Sensor Common
-#
-# CONFIG_IIO_SSP_SENSORS_COMMONS is not set
-CONFIG_IIO_SSP_SENSORHUB=m
-# end of SSP Sensor Common
-
-#
-# Digital to analog converters
-#
-# CONFIG_AD5064 is not set
-# CONFIG_AD5360 is not set
-# CONFIG_AD5380 is not set
-# CONFIG_AD5421 is not set
-# CONFIG_AD5446 is not set
-# CONFIG_AD5449 is not set
-# CONFIG_AD5592R is not set
-# CONFIG_AD5593R is not set
-# CONFIG_AD5504 is not set
-# CONFIG_AD5624R_SPI is not set
-# CONFIG_LTC1660 is not set
-# CONFIG_LTC2632 is not set
-# CONFIG_AD5686_SPI is not set
-# CONFIG_AD5696_I2C is not set
-# CONFIG_AD5755 is not set
-# CONFIG_AD5758 is not set
-# CONFIG_AD5761 is not set
-# CONFIG_AD5764 is not set
-# CONFIG_AD5791 is not set
-# CONFIG_AD7303 is not set
-# CONFIG_AD8801 is not set
-# CONFIG_DS4424 is not set
-# CONFIG_M62332 is not set
-# CONFIG_MAX517 is not set
-# CONFIG_MCP4725 is not set
-# CONFIG_MCP4922 is not set
-# CONFIG_TI_DAC082S085 is not set
-# CONFIG_TI_DAC5571 is not set
-# CONFIG_TI_DAC7311 is not set
-# CONFIG_TI_DAC7612 is not set
-# end of Digital to analog converters
-
-#
-# IIO dummy driver
-#
-# end of IIO dummy driver
-
-#
-# Frequency Synthesizers DDS/PLL
-#
-
-#
-# Clock Generator/Distribution
-#
-# CONFIG_AD9523 is not set
-# end of Clock Generator/Distribution
-
-#
-# Phase-Locked Loop (PLL) frequency synthesizers
-#
-# CONFIG_ADF4350 is not set
-# CONFIG_ADF4371 is not set
-# end of Phase-Locked Loop (PLL) frequency synthesizers
-# end of Frequency Synthesizers DDS/PLL
-
-#
-# Digital gyroscope sensors
-#
-# CONFIG_ADIS16080 is not set
-# CONFIG_ADIS16130 is not set
-# CONFIG_ADIS16136 is not set
-# CONFIG_ADIS16260 is not set
-# CONFIG_ADXRS450 is not set
-# CONFIG_BMG160 is not set
-# CONFIG_FXAS21002C is not set
-CONFIG_HID_SENSOR_GYRO_3D=m
-# CONFIG_MPU3050_I2C is not set
-# CONFIG_IIO_ST_GYRO_3AXIS is not set
-# CONFIG_ITG3200 is not set
-# end of Digital gyroscope sensors
-
-#
-# Health Sensors
-#
-
-#
-# Heart Rate Monitors
-#
-# CONFIG_AFE4403 is not set
-# CONFIG_AFE4404 is not set
-# CONFIG_MAX30100 is not set
-# CONFIG_MAX30102 is not set
-# end of Heart Rate Monitors
-# end of Health Sensors
-
-#
-# Humidity sensors
-#
-# CONFIG_AM2315 is not set
-# CONFIG_DHT11 is not set
-# CONFIG_HDC100X is not set
-CONFIG_HID_SENSOR_HUMIDITY=m
-# CONFIG_HTS221 is not set
-# CONFIG_HTU21 is not set
-# CONFIG_SI7005 is not set
-# CONFIG_SI7020 is not set
-# end of Humidity sensors
-
-#
-# Inertial measurement units
-#
-# CONFIG_ADIS16400 is not set
-# CONFIG_ADIS16460 is not set
-# CONFIG_ADIS16480 is not set
-# CONFIG_BMI160_I2C is not set
-# CONFIG_BMI160_SPI is not set
-# CONFIG_KMX61 is not set
-# CONFIG_INV_MPU6050_I2C is not set
-# CONFIG_INV_MPU6050_SPI is not set
-# CONFIG_IIO_ST_LSM6DSX is not set
-# end of Inertial measurement units
-
-#
-# Light sensors
-#
-# CONFIG_ACPI_ALS is not set
-# CONFIG_ADJD_S311 is not set
-# CONFIG_AL3320A is not set
-# CONFIG_APDS9300 is not set
-# CONFIG_APDS9960 is not set
-# CONFIG_BH1750 is not set
-# CONFIG_BH1780 is not set
-# CONFIG_CM32181 is not set
-# CONFIG_CM3232 is not set
-# CONFIG_CM3323 is not set
-# CONFIG_CM36651 is not set
-# CONFIG_GP2AP020A00F is not set
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
-# CONFIG_ISL29125 is not set
-CONFIG_HID_SENSOR_ALS=m
-CONFIG_HID_SENSOR_PROX=m
-# CONFIG_JSA1212 is not set
-# CONFIG_RPR0521 is not set
-# CONFIG_LTR501 is not set
-# CONFIG_LV0104CS is not set
-# CONFIG_MAX44000 is not set
-# CONFIG_MAX44009 is not set
-# CONFIG_NOA1305 is not set
-# CONFIG_OPT3001 is not set
-# CONFIG_PA12203001 is not set
-# CONFIG_SI1133 is not set
-# CONFIG_SI1145 is not set
-# CONFIG_STK3310 is not set
-# CONFIG_ST_UVIS25 is not set
-# CONFIG_TCS3414 is not set
-# CONFIG_TCS3472 is not set
-# CONFIG_SENSORS_TSL2563 is not set
-# CONFIG_TSL2583 is not set
-# CONFIG_TSL2772 is not set
-# CONFIG_TSL4531 is not set
-# CONFIG_US5182D is not set
-# CONFIG_VCNL4000 is not set
-# CONFIG_VCNL4035 is not set
-# CONFIG_VEML6070 is not set
-# CONFIG_VL6180 is not set
-# CONFIG_ZOPT2201 is not set
-# end of Light sensors
-
-#
-# Magnetometer sensors
-#
-# CONFIG_AK8975 is not set
-# CONFIG_AK09911 is not set
-# CONFIG_BMC150_MAGN_I2C is not set
-# CONFIG_BMC150_MAGN_SPI is not set
-# CONFIG_MAG3110 is not set
-CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
-# CONFIG_MMC35240 is not set
-# CONFIG_IIO_ST_MAGN_3AXIS is not set
-# CONFIG_SENSORS_HMC5843_I2C is not set
-# CONFIG_SENSORS_HMC5843_SPI is not set
-# CONFIG_SENSORS_RM3100_I2C is not set
-# CONFIG_SENSORS_RM3100_SPI is not set
-# end of Magnetometer sensors
-
-#
-# Multiplexers
-#
-# end of Multiplexers
-
-#
-# Inclinometer sensors
-#
-CONFIG_HID_SENSOR_INCLINOMETER_3D=m
-CONFIG_HID_SENSOR_DEVICE_ROTATION=m
-# end of Inclinometer sensors
-
-#
-# Triggers - standalone
-#
-# CONFIG_IIO_INTERRUPT_TRIGGER is not set
-# CONFIG_IIO_SYSFS_TRIGGER is not set
-# end of Triggers - standalone
-
-#
-# Digital potentiometers
-#
-# CONFIG_AD5272 is not set
-# CONFIG_DS1803 is not set
-# CONFIG_MAX5432 is not set
-# CONFIG_MAX5481 is not set
-# CONFIG_MAX5487 is not set
-# CONFIG_MCP4018 is not set
-# CONFIG_MCP4131 is not set
-# CONFIG_MCP4531 is not set
-# CONFIG_MCP41010 is not set
-# CONFIG_TPL0102 is not set
-# end of Digital potentiometers
-
-#
-# Digital potentiostats
-#
-# CONFIG_LMP91000 is not set
-# end of Digital potentiostats
-
-#
-# Pressure sensors
-#
-# CONFIG_ABP060MG is not set
-# CONFIG_BMP280 is not set
-# CONFIG_DPS310 is not set
-CONFIG_HID_SENSOR_PRESS=m
-# CONFIG_HP03 is not set
-# CONFIG_MPL115_I2C is not set
-# CONFIG_MPL115_SPI is not set
-# CONFIG_MPL3115 is not set
-# CONFIG_MS5611 is not set
-# CONFIG_MS5637 is not set
-# CONFIG_IIO_ST_PRESS is not set
-# CONFIG_T5403 is not set
-# CONFIG_HP206C is not set
-# CONFIG_ZPA2326 is not set
-# end of Pressure sensors
-
-#
-# Lightning sensors
-#
-# CONFIG_AS3935 is not set
-# end of Lightning sensors
-
-#
-# Proximity and distance sensors
-#
-# CONFIG_ISL29501 is not set
-# CONFIG_LIDAR_LITE_V2 is not set
-# CONFIG_MB1232 is not set
-# CONFIG_RFD77402 is not set
-# CONFIG_SRF04 is not set
-# CONFIG_SX9500 is not set
-# CONFIG_SRF08 is not set
-# CONFIG_VL53L0X_I2C is not set
-# end of Proximity and distance sensors
-
-#
-# Resolver to digital converters
-#
-# CONFIG_AD2S90 is not set
-# CONFIG_AD2S1200 is not set
-# end of Resolver to digital converters
-
-#
-# Temperature sensors
-#
-# CONFIG_MAXIM_THERMOCOUPLE is not set
-CONFIG_HID_SENSOR_TEMP=m
-# CONFIG_MLX90614 is not set
-# CONFIG_MLX90632 is not set
-# CONFIG_TMP006 is not set
-# CONFIG_TMP007 is not set
-# CONFIG_TSYS01 is not set
-# CONFIG_TSYS02D is not set
-# CONFIG_MAX31856 is not set
-# end of Temperature sensors
-
-CONFIG_NTB=m
-# CONFIG_NTB_MSI is not set
-CONFIG_NTB_AMD=m
-# CONFIG_NTB_IDT is not set
-CONFIG_NTB_INTEL=m
-CONFIG_NTB_SWITCHTEC=m
-CONFIG_NTB_PINGPONG=m
-# CONFIG_NTB_TOOL is not set
-CONFIG_NTB_PERF=m
-CONFIG_NTB_TRANSPORT=m
-# CONFIG_VME_BUS is not set
-CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
-CONFIG_PWM_LPSS=m
-CONFIG_PWM_LPSS_PCI=m
-CONFIG_PWM_LPSS_PLATFORM=m
-CONFIG_PWM_PCA9685=m
-
-#
-# IRQ chip support
-#
-# end of IRQ chip support
-
-# CONFIG_IPACK_BUS is not set
-CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_TI_SYSCON is not set
-
-#
-# PHY Subsystem
-#
-CONFIG_GENERIC_PHY=y
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_CPCAP_USB is not set
-# end of PHY Subsystem
-
-# CONFIG_POWERCAP is not set
-# CONFIG_MCB is not set
-
-#
-# Performance monitor support
-#
-# end of Performance monitor support
-
-CONFIG_RAS=y
-CONFIG_THUNDERBOLT=m
-
-#
-# Android
-#
-CONFIG_ANDROID=y
-CONFIG_ANDROID_BINDER_IPC=y
-# CONFIG_ANDROID_BINDERFS is not set
-CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
-CONFIG_ANDROID_BINDER_IPC_SELFTEST=y
-# end of Android
-
-CONFIG_LIBNVDIMM=y
-CONFIG_BLK_DEV_PMEM=m
-CONFIG_ND_BLK=y
-CONFIG_ND_CLAIM=y
-CONFIG_ND_BTT=y
-CONFIG_BTT=y
-CONFIG_DAX_DRIVER=y
-CONFIG_DAX=y
-CONFIG_DEV_DAX=m
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SYSFS=y
-
-#
-# HW tracing support
-#
-# CONFIG_STM is not set
-# CONFIG_INTEL_TH is not set
-# end of HW tracing support
-
-# CONFIG_FPGA is not set
-CONFIG_PM_OPP=y
-CONFIG_UNISYS_VISORBUS=m
-# CONFIG_SIOX is not set
-# CONFIG_SLIMBUS is not set
-# CONFIG_INTERCONNECT is not set
-# CONFIG_COUNTER is not set
-# end of Device Drivers
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-# CONFIG_VALIDATE_FS_PARSER is not set
-CONFIG_FS_IOMAP=y
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-# CONFIG_REISERFS_FS_SECURITY is not set
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-CONFIG_XFS_ONLINE_SCRUB=y
-# CONFIG_XFS_ONLINE_REPAIR is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-# CONFIG_OCFS2_FS_STATS is not set
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_FS_REF_VERIFY is not set
-CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=m
-# CONFIG_F2FS_STAT_FS is not set
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-# CONFIG_F2FS_FS_SECURITY is not set
-# CONFIG_F2FS_CHECK_FS is not set
-# CONFIG_F2FS_IO_TRACE is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_FS_DAX is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_EXPORTFS_BLOCK_OPS=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_MANDATORY_FILE_LOCKING is not set
-CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_DNOTIFY is not set
-CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_QUOTACTL_COMPAT=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_AUTOFS_FS=m
-CONFIG_FUSE_FS=m
-# CONFIG_CUSE is not set
-CONFIG_VIRTIO_FS=m
-CONFIG_OVERLAY_FS=m
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
-# CONFIG_OVERLAY_FS_INDEX is not set
-# CONFIG_OVERLAY_FS_XINO_AUTO is not set
-# CONFIG_OVERLAY_FS_METACOPY is not set
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_FAT_DEFAULT_UTF8 is not set
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-# end of DOS/FAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-# CONFIG_PROC_KCORE is not set
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PROC_CHILDREN is not set
-CONFIG_PROC_PID_ARCH_STATUS=y
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-# CONFIG_HUGETLBFS is not set
-CONFIG_MEMFD_CREATE=y
-CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
-CONFIG_CONFIGFS_FS=m
-CONFIG_EFIVAR_FS=m
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_ORANGEFS_FS=m
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-CONFIG_EFS_FS=m
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_FS_XATTR=y
-CONFIG_JFFS2_FS_POSIX_ACL=y
-CONFIG_JFFS2_FS_SECURITY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RTIME=y
-CONFIG_JFFS2_RUBIN=y
-# CONFIG_JFFS2_CMODE_NONE is not set
-CONFIG_JFFS2_CMODE_PRIORITY=y
-# CONFIG_JFFS2_CMODE_SIZE is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-CONFIG_UBIFS_FS=m
-# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_ZSTD=y
-# CONFIG_UBIFS_ATIME_SUPPORT is not set
-CONFIG_UBIFS_FS_XATTR=y
-CONFIG_UBIFS_FS_SECURITY=y
-# CONFIG_UBIFS_FS_AUTHENTICATION is not set
-# CONFIG_CRAMFS is not set
-CONFIG_SQUASHFS=m
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZSTD is not set
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-CONFIG_HPFS_FS=m
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-CONFIG_ROMFS_FS=m
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
-# CONFIG_ROMFS_BACKED_BY_MTD is not set
-# CONFIG_ROMFS_BACKED_BY_BOTH is not set
-CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_PSTORE=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=y
-# CONFIG_PSTORE_LZO_COMPRESS is not set
-# CONFIG_PSTORE_LZ4_COMPRESS is not set
-# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
-# CONFIG_PSTORE_842_COMPRESS is not set
-# CONFIG_PSTORE_ZSTD_COMPRESS is not set
-CONFIG_PSTORE_COMPRESS=y
-CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
-CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-# CONFIG_PSTORE_FTRACE is not set
-CONFIG_PSTORE_RAM=m
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-# CONFIG_EROFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
-# CONFIG_NFS_V4_1_MIGRATION is not set
-CONFIG_NFS_V4_SECURITY_LABEL=y
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_BLOCKLAYOUT=y
-CONFIG_NFSD_SCSILAYOUT=y
-CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFSD_V4_SECURITY_LABEL is not set
-CONFIG_GRACE_PERIOD=m
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
-# CONFIG_SUNRPC_DEBUG is not set
-CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CEPH_FS_POSIX_ACL=y
-# CONFIG_CEPH_FS_SECURITY_LABEL is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_UPCALL is not set
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_DEBUG=y
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
-CONFIG_CIFS_DFS_UPCALL=y
-# CONFIG_CIFS_SMB_DIRECT is not set
-CONFIG_CIFS_FSCACHE=y
-CONFIG_CODA_FS=m
-# CONFIG_AFS_FS is not set
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-# CONFIG_9P_FS_SECURITY is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-# CONFIG_UNICODE is not set
-# end of File systems
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_COMPAT=y
-# CONFIG_KEYS_REQUEST_CACHE is not set
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-CONFIG_TRUSTED_KEYS=m
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_KEY_DH_OPERATIONS=y
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_PAGE_TABLE_ISOLATION=y
-# CONFIG_SECURITY_INFINIBAND is not set
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-# CONFIG_INTEL_TXT is not set
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_HARDENED_USERCOPY_FALLBACK=y
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
-CONFIG_FORTIFY_SOURCE=y
-# CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_HASH=y
-CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
-# CONFIG_SECURITY_APPARMOR_DEBUG is not set
-# CONFIG_SECURITY_LOADPIN is not set
-CONFIG_SECURITY_YAMA=y
-# CONFIG_SECURITY_SAFESETID is not set
-# CONFIG_SECURITY_LOCKDOWN_LSM is not set
-# CONFIG_INTEGRITY is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=m
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_KPP=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_SIMD=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-CONFIG_CRYPTO_ENGINE=m
-
-#
-# Public-key cryptography
-#
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECC=m
-CONFIG_CRYPTO_ECDH=m
-# CONFIG_CRYPTO_ECRDSA is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CFB=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=m
-# CONFIG_CRYPTO_OFB is not set
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m
-CONFIG_CRYPTO_NHPOLY1305=m
-CONFIG_CRYPTO_NHPOLY1305_SSE2=m
-CONFIG_CRYPTO_NHPOLY1305_AVX2=m
-# CONFIG_CRYPTO_ADIANTUM is not set
-CONFIG_CRYPTO_ESSIV=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32C_INTEL=m
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-# CONFIG_CRYPTO_XXHASH is not set
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_POLY1305_X86_64=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_SSSE3=m
-CONFIG_CRYPTO_SHA256_SSSE3=m
-CONFIG_CRYPTO_SHA512_SSSE3=m
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_BLOWFISH_X86_64=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAMELLIA_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST5_AVX_X86_64=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_CAST6_AVX_X86_64=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DES3_EDE_X86_64 is not set
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_CHACHA20_X86_64=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
-CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_X86_64=m
-CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=m
-# CONFIG_CRYPTO_842 is not set
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-CONFIG_CRYPTO_ZSTD=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=m
-CONFIG_CRYPTO_DRBG_HMAC=y
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-CONFIG_CRYPTO_DRBG=m
-CONFIG_CRYPTO_JITTERENTROPY=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
-CONFIG_CRYPTO_HASH_INFO=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_SP_CCP=y
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-CONFIG_CRYPTO_DEV_SP_PSP=y
-# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
-CONFIG_CRYPTO_DEV_QAT=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
-CONFIG_CRYPTO_DEV_QAT_C3XXX=m
-CONFIG_CRYPTO_DEV_QAT_C62X=m
-CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
-CONFIG_CRYPTO_DEV_QAT_C62XVF=m
-# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
-CONFIG_CRYPTO_DEV_CHELSIO=m
-CONFIG_CRYPTO_DEV_VIRTIO=m
-# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
-CONFIG_ASYMMETRIC_KEY_TYPE=y
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-# CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE is not set
-CONFIG_X509_CERTIFICATE_PARSER=y
-CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
-CONFIG_PKCS7_MESSAGE_PARSER=y
-# CONFIG_PKCS7_TEST_KEY is not set
-CONFIG_SIGNED_PE_FILE_VERIFICATION=y
-
-#
-# Certificates for signature checking
-#
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
-CONFIG_SECONDARY_TRUSTED_KEYRING=y
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-# end of Certificates for signature checking
-
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_RAID6_PQ_BENCHMARK=y
-# CONFIG_PACKING is not set
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_CORDIC=m
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=m
-# CONFIG_CRC4 is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_XXHASH=y
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_COMPRESS=m
-CONFIG_ZSTD_DECOMPRESS=m
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_BTREE=y
-CONFIG_INTERVAL_TREE=y
-CONFIG_XARRAY_MULTI=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_DMA_VIRT_OPS=y
-CONFIG_SWIOTLB=y
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_IOMMU_HELPER=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
-CONFIG_CLZ_TAB=y
-CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=y
-CONFIG_DIMLIB=y
-CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=y
-CONFIG_HAVE_GENERIC_VDSO=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_FONT_SUPPORT=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-CONFIG_SG_POOL=y
-CONFIG_ARCH_HAS_PMEM_API=y
-CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
-CONFIG_ARCH_HAS_UACCESS_MCSAFE=y
-CONFIG_ARCH_STACKWALK=y
-CONFIG_SBITMAP=y
-# CONFIG_STRING_SELFTEST is not set
-# end of Library routines
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-# CONFIG_PRINTK_CALLER is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=3
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# end of printk and dmesg options
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1280
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_INSTALL is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_STACK_VALIDATION=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# end of Compile-time checks and compiler options
-
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_MAGIC_SYSRQ_SERIAL=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_OWNER is not set
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=16000
-# CONFIG_DEBUG_KMEMLEAK_TEST is not set
-CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
-CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN=y
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_ARCH_KASAN=y
-CONFIG_CC_HAS_KASAN_GENERIC=y
-# CONFIG_KASAN is not set
-CONFIG_KASAN_STACK=1
-# end of Memory Debugging
-
-CONFIG_ARCH_HAS_KCOV=y
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
-CONFIG_DEBUG_SHIRQ=y
-
-#
-# Debug Lockups and Hangs
-#
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_SOFTLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_HARDLOCKUP_DETECTOR_PERF=y
-CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_WQ_WATCHDOG is not set
-# end of Debug Lockups and Hangs
-
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-CONFIG_SCHEDSTATS=y
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-# end of Lock Debugging (spinlocks, mutexes, etc...)
-
-CONFIG_STACKTRACE=y
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# end of RCU Debugging
-
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-CONFIG_FUNCTION_ERROR_INJECTION=y
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_LATENCYTOP=y
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_FENTRY=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_PREEMPTIRQ_EVENTS is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_KPROBE_EVENTS=y
-# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
-# CONFIG_FUNCTION_PROFILER is not set
-# CONFIG_BPF_KPROBE_OVERRIDE is not set
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_FTRACE_STARTUP_TEST is not set
-CONFIG_MMIOTRACE=y
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_MMIOTRACE_TEST is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_RUNTIME_TESTING_MENU is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_IO_STRICT_DEVMEM=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_X86_VERBOSE_BOOTUP is not set
-# CONFIG_EARLY_PRINTK is not set
-# CONFIG_X86_PTDUMP is not set
-# CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_DEBUG_WX is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_IOMMU_DEBUG is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-CONFIG_X86_DECODER_SELFTEST=y
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-# CONFIG_DEBUG_ENTRY is not set
-CONFIG_DEBUG_NMI_SELFTEST=y
-CONFIG_X86_DEBUG_FPU=y
-# CONFIG_PUNIT_ATOM_DEBUG is not set
-CONFIG_UNWINDER_ORC=y
-# CONFIG_UNWINDER_FRAME_POINTER is not set
-# CONFIG_UNWINDER_GUESS is not set
-# end of Kernel hacking
diff --git a/main/linux-lts/config-virt.aarch64 b/main/linux-lts/config-virt.aarch64
deleted file mode 100644
index c3cd2059e86..00000000000
--- a/main/linux-lts/config-virt.aarch64
+++ /dev/null
@@ -1,4858 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.23 Kernel Configuration
-#
-
-#
-# Compiler: gcc (Alpine 9.2.0) 9.2.0
-#
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-CONFIG_THREAD_INFO_IN_TASK=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-# CONFIG_HEADER_TEST is not set
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT=""
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_USELIB=y
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_IRQ_MSI_IOMMU=y
-CONFIG_HANDLE_DOMAIN_IRQ=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
-# end of IRQ subsystem
-
-CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_ARCH_HAS_TICK_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-# end of Timers subsystem
-
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-# CONFIG_IKCONFIG is not set
-# CONFIG_IKHEADERS is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-CONFIG_GENERIC_SCHED_CLOCK=y
-
-#
-# Scheduler features
-#
-# end of Scheduler features
-
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_ARCH_SUPPORTS_INT128=y
-CONFIG_NUMA_BALANCING=y
-CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
-CONFIG_CGROUPS=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_HUGETLB=y
-CONFIG_CPUSETS=y
-# CONFIG_PROC_PID_CPUSET is not set
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-# CONFIG_CHECKPOINT_RESTORE is not set
-CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_RELAY is not set
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_MULTIUSER=y
-# CONFIG_SGETMASK_SYSCALL is not set
-# CONFIG_SYSFS_SYSCALL is not set
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_FHANDLE=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
-# CONFIG_USERFAULTFD is not set
-CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-# CONFIG_PC104 is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_SLAB_FREELIST_RANDOM=y
-# CONFIG_SLAB_FREELIST_HARDENED is not set
-CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_SYSTEM_DATA_VERIFICATION=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-# end of General setup
-
-CONFIG_ARM64=y
-CONFIG_64BIT=y
-CONFIG_MMU=y
-CONFIG_ARM64_PAGE_SHIFT=12
-CONFIG_ARM64_CONT_SHIFT=4
-CONFIG_ARCH_MMAP_RND_BITS_MIN=18
-CONFIG_ARCH_MMAP_RND_BITS_MAX=33
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CSUM=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_SMP=y
-CONFIG_KERNEL_MODE_NEON=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=4
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-
-#
-# Platform selection
-#
-# CONFIG_ARCH_ACTIONS is not set
-# CONFIG_ARCH_AGILEX is not set
-# CONFIG_ARCH_SUNXI is not set
-CONFIG_ARCH_ALPINE=y
-# CONFIG_ARCH_BCM2835 is not set
-# CONFIG_ARCH_BCM_IPROC is not set
-# CONFIG_ARCH_BERLIN is not set
-# CONFIG_ARCH_BITMAIN is not set
-# CONFIG_ARCH_BRCMSTB is not set
-# CONFIG_ARCH_EXYNOS is not set
-# CONFIG_ARCH_K3 is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
-# CONFIG_ARCH_LG1K is not set
-CONFIG_ARCH_HISI=y
-# CONFIG_ARCH_MEDIATEK is not set
-# CONFIG_ARCH_MESON is not set
-# CONFIG_ARCH_MVEBU is not set
-# CONFIG_ARCH_MXC is not set
-CONFIG_ARCH_QCOM=y
-# CONFIG_ARCH_REALTEK is not set
-# CONFIG_ARCH_RENESAS is not set
-# CONFIG_ARCH_ROCKCHIP is not set
-CONFIG_ARCH_SEATTLE=y
-# CONFIG_ARCH_STRATIX10 is not set
-# CONFIG_ARCH_SYNQUACER is not set
-# CONFIG_ARCH_TEGRA is not set
-# CONFIG_ARCH_SPRD is not set
-CONFIG_ARCH_THUNDER=y
-CONFIG_ARCH_THUNDER2=y
-# CONFIG_ARCH_UNIPHIER is not set
-CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARCH_XGENE=y
-# CONFIG_ARCH_ZX is not set
-# CONFIG_ARCH_ZYNQMP is not set
-# end of Platform selection
-
-#
-# Kernel Features
-#
-
-#
-# ARM errata workarounds via the alternatives framework
-#
-CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
-CONFIG_ARM64_ERRATUM_826319=y
-CONFIG_ARM64_ERRATUM_827319=y
-CONFIG_ARM64_ERRATUM_824069=y
-CONFIG_ARM64_ERRATUM_819472=y
-CONFIG_ARM64_ERRATUM_832075=y
-CONFIG_ARM64_ERRATUM_834220=y
-CONFIG_ARM64_ERRATUM_843419=y
-CONFIG_ARM64_ERRATUM_1024718=y
-CONFIG_ARM64_ERRATUM_1165522=y
-CONFIG_ARM64_ERRATUM_1286807=y
-CONFIG_ARM64_ERRATUM_1463225=y
-CONFIG_CAVIUM_ERRATUM_22375=y
-CONFIG_CAVIUM_ERRATUM_23144=y
-CONFIG_CAVIUM_ERRATUM_23154=y
-CONFIG_CAVIUM_ERRATUM_27456=y
-CONFIG_CAVIUM_ERRATUM_30115=y
-CONFIG_CAVIUM_TX2_ERRATUM_219=y
-CONFIG_QCOM_FALKOR_ERRATUM_1003=y
-CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
-CONFIG_QCOM_FALKOR_ERRATUM_1009=y
-CONFIG_QCOM_QDF2400_ERRATUM_0065=y
-CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
-CONFIG_HISILICON_ERRATUM_161600802=y
-CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
-CONFIG_FUJITSU_ERRATUM_010001=y
-# end of ARM errata workarounds via the alternatives framework
-
-CONFIG_ARM64_4K_PAGES=y
-# CONFIG_ARM64_16K_PAGES is not set
-# CONFIG_ARM64_64K_PAGES is not set
-# CONFIG_ARM64_VA_BITS_39 is not set
-CONFIG_ARM64_VA_BITS_48=y
-CONFIG_ARM64_VA_BITS=48
-CONFIG_ARM64_PA_BITS_48=y
-CONFIG_ARM64_PA_BITS=48
-# CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_SMT=y
-CONFIG_NR_CPUS=4096
-CONFIG_HOTPLUG_CPU=y
-CONFIG_NUMA=y
-CONFIG_NODES_SHIFT=2
-CONFIG_USE_PERCPU_NUMA_NODE_ID=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_HOLES_IN_ZONE=y
-CONFIG_HZ_100=y
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=100
-CONFIG_SCHED_HRTICK=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
-CONFIG_SYS_SUPPORTS_HUGETLBFS=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_SECCOMP=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-# CONFIG_KEXEC is not set
-# CONFIG_KEXEC_FILE is not set
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_XEN is not set
-CONFIG_FORCE_MAX_ZONEORDER=11
-CONFIG_UNMAP_KERNEL_AT_EL0=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
-CONFIG_HARDEN_EL2_VECTORS=y
-CONFIG_ARM64_SSBD=y
-CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
-CONFIG_ARM64_TAGGED_ADDR_ABI=y
-# CONFIG_COMPAT is not set
-
-#
-# ARMv8.1 architectural features
-#
-CONFIG_ARM64_HW_AFDBM=y
-CONFIG_ARM64_PAN=y
-# CONFIG_ARM64_LSE_ATOMICS is not set
-CONFIG_ARM64_VHE=y
-# end of ARMv8.1 architectural features
-
-#
-# ARMv8.2 architectural features
-#
-CONFIG_ARM64_UAO=y
-# CONFIG_ARM64_PMEM is not set
-CONFIG_ARM64_RAS_EXTN=y
-CONFIG_ARM64_CNP=y
-# end of ARMv8.2 architectural features
-
-#
-# ARMv8.3 architectural features
-#
-CONFIG_ARM64_PTR_AUTH=y
-# end of ARMv8.3 architectural features
-
-CONFIG_ARM64_SVE=y
-CONFIG_ARM64_MODULE_PLTS=y
-# CONFIG_ARM64_PSEUDO_NMI is not set
-# CONFIG_RANDOMIZE_BASE is not set
-# end of Kernel Features
-
-#
-# Boot options
-#
-CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
-CONFIG_CMDLINE=""
-# CONFIG_CMDLINE_FORCE is not set
-CONFIG_EFI_STUB=y
-CONFIG_EFI=y
-CONFIG_DMI=y
-# end of Boot options
-
-CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
-
-#
-# Power management options
-#
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_CLK=y
-CONFIG_PM_GENERIC_DOMAINS=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_GENERIC_DOMAINS_OF=y
-CONFIG_CPU_PM=y
-# CONFIG_ENERGY_MODEL is not set
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_HIBERNATION_HEADER=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# end of Power management options
-
-#
-# CPU Power Management
-#
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
-CONFIG_DT_IDLE_STATES=y
-
-#
-# ARM CPU Idle Drivers
-#
-CONFIG_ARM_CPUIDLE=y
-# CONFIG_ARM_PSCI_CPUIDLE is not set
-# end of ARM CPU Idle Drivers
-# end of CPU Idle
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
-
-#
-# CPU frequency scaling drivers
-#
-# CONFIG_CPUFREQ_DT is not set
-CONFIG_ACPI_CPPC_CPUFREQ=y
-# CONFIG_ARM_QCOM_CPUFREQ_HW is not set
-# CONFIG_QORIQ_CPUFREQ is not set
-# end of CPU Frequency scaling
-# end of CPU Power Management
-
-#
-# Firmware Drivers
-#
-# CONFIG_ARM_SCMI_PROTOCOL is not set
-CONFIG_ARM_SCPI_PROTOCOL=m
-CONFIG_ARM_SCPI_POWER_DOMAIN=m
-# CONFIG_ARM_SDE_INTERFACE is not set
-# CONFIG_FIRMWARE_MEMMAP is not set
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=m
-# CONFIG_ISCSI_IBFT is not set
-CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
-CONFIG_HAVE_ARM_SMCCC=y
-CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_PSCI_CHECKER is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-CONFIG_EFI_PARAMS_FROM_FDT=y
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_ARMSTUB=y
-CONFIG_EFI_ARMSTUB_DTB_LOADER=y
-# CONFIG_EFI_BOOTLOADER_CONTROL is not set
-# CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_TEST is not set
-# CONFIG_RESET_ATTACK_MITIGATION is not set
-# end of EFI (Extensible Firmware Interface) Support
-
-CONFIG_UEFI_CPER=y
-CONFIG_UEFI_CPER_ARM=y
-CONFIG_EFI_EARLYCON=y
-
-#
-# Tegra firmware driver
-#
-# end of Tegra firmware driver
-# end of Firmware Drivers
-
-CONFIG_ARCH_SUPPORTS_ACPI=y
-CONFIG_ACPI=y
-CONFIG_ACPI_GENERIC_GSI=y
-CONFIG_ACPI_CCA_REQUIRED=y
-# CONFIG_ACPI_DEBUGGER is not set
-CONFIG_ACPI_SPCR_TABLE=y
-# CONFIG_ACPI_EC_DEBUGFS is not set
-CONFIG_ACPI_AC=y
-CONFIG_ACPI_BATTERY=y
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=m
-# CONFIG_ACPI_TAD is not set
-# CONFIG_ACPI_DOCK is not set
-CONFIG_ACPI_PROCESSOR_IDLE=y
-CONFIG_ACPI_MCFG=y
-CONFIG_ACPI_CPPC_LIB=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_NUMA=y
-CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
-CONFIG_ACPI_TABLE_UPGRADE=y
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HED=y
-# CONFIG_ACPI_CUSTOM_METHOD is not set
-# CONFIG_ACPI_BGRT is not set
-CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
-# CONFIG_ACPI_HMAT is not set
-CONFIG_HAVE_ACPI_APEI=y
-CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=y
-CONFIG_ACPI_APEI_SEA=y
-CONFIG_ACPI_APEI_EINJ=m
-# CONFIG_ACPI_APEI_ERST_DEBUG is not set
-# CONFIG_PMIC_OPREGION is not set
-# CONFIG_ACPI_CONFIGFS is not set
-CONFIG_ACPI_IORT=y
-CONFIG_ACPI_GTDT=y
-CONFIG_ACPI_PPTT=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_MMIO=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_KVM_VFIO=y
-CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
-CONFIG_IRQ_BYPASS_MANAGER=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
-CONFIG_KVM_ARM_HOST=y
-CONFIG_KVM_INDIRECT_VECTORS=y
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_VSOCK=m
-CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-CONFIG_ARM64_CRYPTO=y
-CONFIG_CRYPTO_SHA256_ARM64=m
-CONFIG_CRYPTO_SHA512_ARM64=m
-CONFIG_CRYPTO_SHA1_ARM64_CE=m
-CONFIG_CRYPTO_SHA2_ARM64_CE=m
-CONFIG_CRYPTO_SHA512_ARM64_CE=m
-CONFIG_CRYPTO_SHA3_ARM64=m
-CONFIG_CRYPTO_SM3_ARM64_CE=m
-CONFIG_CRYPTO_SM4_ARM64_CE=m
-CONFIG_CRYPTO_GHASH_ARM64_CE=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64=m
-CONFIG_CRYPTO_AES_ARM64_CE=m
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
-CONFIG_CRYPTO_CHACHA20_NEON=m
-CONFIG_CRYPTO_NHPOLY1305_NEON=m
-CONFIG_CRYPTO_AES_ARM64_BS=m
-
-#
-# General architecture-dependent options
-#
-CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_UPROBES=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_KRETPROBES=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_HAS_KEEPINITRD=y
-CONFIG_ARCH_HAS_SET_MEMORY=y
-CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
-CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
-CONFIG_HAVE_ASM_MODVERSIONS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
-CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_ARCH_STACKLEAK=y
-CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_HUGE_VMAP=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_ARCH_MMAP_RND_BITS=18
-CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_64BIT_TIME=y
-CONFIG_HAVE_ARCH_VMAP_STACK=y
-CONFIG_VMAP_STACK=y
-CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_REFCOUNT_FULL=y
-CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
-# CONFIG_LOCK_EVENT_COUNTS is not set
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# end of GCOV-based kernel profiling
-
-CONFIG_PLUGIN_HOSTCC=""
-CONFIG_HAVE_GCC_PLUGINS=y
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULE_SIG_FORMAT=y
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
-CONFIG_ASM_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULE_SIG=y
-# CONFIG_MODULE_SIG_FORCE is not set
-CONFIG_MODULE_SIG_ALL=y
-CONFIG_MODULE_SIG_SHA1=y
-# CONFIG_MODULE_SIG_SHA224 is not set
-# CONFIG_MODULE_SIG_SHA256 is not set
-# CONFIG_MODULE_SIG_SHA384 is not set
-# CONFIG_MODULE_SIG_SHA512 is not set
-CONFIG_MODULE_SIG_HASH="sha1"
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-# CONFIG_BLK_DEV_ZONED is not set
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
-# CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_WBT is not set
-# CONFIG_BLK_CGROUP_IOLATENCY is not set
-# CONFIG_BLK_CGROUP_IOCOST is not set
-CONFIG_BLK_DEBUG_FS=y
-# CONFIG_BLK_SED_OPAL is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AIX_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_CMDLINE_PARTITION is not set
-# end of Partition Types
-
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_PM=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-# CONFIG_IOSCHED_BFQ is not set
-# end of IO Schedulers
-
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=y
-CONFIG_ARCH_INLINE_SPIN_TRYLOCK=y
-CONFIG_ARCH_INLINE_SPIN_TRYLOCK_BH=y
-CONFIG_ARCH_INLINE_SPIN_LOCK=y
-CONFIG_ARCH_INLINE_SPIN_LOCK_BH=y
-CONFIG_ARCH_INLINE_SPIN_LOCK_IRQ=y
-CONFIG_ARCH_INLINE_SPIN_LOCK_IRQSAVE=y
-CONFIG_ARCH_INLINE_SPIN_UNLOCK=y
-CONFIG_ARCH_INLINE_SPIN_UNLOCK_BH=y
-CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE=y
-CONFIG_ARCH_INLINE_READ_LOCK=y
-CONFIG_ARCH_INLINE_READ_LOCK_BH=y
-CONFIG_ARCH_INLINE_READ_LOCK_IRQ=y
-CONFIG_ARCH_INLINE_READ_LOCK_IRQSAVE=y
-CONFIG_ARCH_INLINE_READ_UNLOCK=y
-CONFIG_ARCH_INLINE_READ_UNLOCK_BH=y
-CONFIG_ARCH_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_ARCH_INLINE_READ_UNLOCK_IRQRESTORE=y
-CONFIG_ARCH_INLINE_WRITE_LOCK=y
-CONFIG_ARCH_INLINE_WRITE_LOCK_BH=y
-CONFIG_ARCH_INLINE_WRITE_LOCK_IRQ=y
-CONFIG_ARCH_INLINE_WRITE_LOCK_IRQSAVE=y
-CONFIG_ARCH_INLINE_WRITE_UNLOCK=y
-CONFIG_ARCH_INLINE_WRITE_UNLOCK_BH=y
-CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE=y
-CONFIG_INLINE_SPIN_TRYLOCK=y
-CONFIG_INLINE_SPIN_TRYLOCK_BH=y
-CONFIG_INLINE_SPIN_LOCK=y
-CONFIG_INLINE_SPIN_LOCK_BH=y
-CONFIG_INLINE_SPIN_LOCK_IRQ=y
-CONFIG_INLINE_SPIN_LOCK_IRQSAVE=y
-CONFIG_INLINE_SPIN_UNLOCK_BH=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE=y
-CONFIG_INLINE_READ_LOCK=y
-CONFIG_INLINE_READ_LOCK_BH=y
-CONFIG_INLINE_READ_LOCK_IRQ=y
-CONFIG_INLINE_READ_LOCK_IRQSAVE=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_BH=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK_IRQRESTORE=y
-CONFIG_INLINE_WRITE_LOCK=y
-CONFIG_INLINE_WRITE_LOCK_BH=y
-CONFIG_INLINE_WRITE_LOCK_IRQ=y
-CONFIG_INLINE_WRITE_LOCK_IRQSAVE=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_BH=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-CONFIG_QUEUED_SPINLOCKS=y
-CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
-CONFIG_FREEZER=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_ELFCORE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_FAST_GUP=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-# CONFIG_MEMORY_HOTPLUG is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-# CONFIG_MEMORY_FAILURE is not set
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
-CONFIG_CLEANCACHE=y
-CONFIG_FRONTSWAP=y
-# CONFIG_CMA is not set
-# CONFIG_ZSWAP is not set
-CONFIG_ZPOOL=m
-# CONFIG_ZBUD is not set
-CONFIG_Z3FOLD=m
-CONFIG_ZSMALLOC=y
-# CONFIG_PGTABLE_MAPPING is not set
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_ARCH_HAS_PTE_DEVMAP=y
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
-# CONFIG_READ_ONLY_THP_FOR_FS is not set
-CONFIG_ARCH_HAS_PTE_SPECIAL=y
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_EGRESS=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=m
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-CONFIG_UNIX_DIAG=m
-# CONFIG_TLS is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-CONFIG_XFRM_INTERFACE=m
-CONFIG_XFRM_SUB_POLICY=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_XDP_SOCKETS=y
-# CONFIG_XDP_SOCKETS_DIAG is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE_COMMON=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-# CONFIG_IP_PIMSM_V1 is not set
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-CONFIG_NET_FOU_IP_TUNNELS=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-# CONFIG_INET_ESP_OFFLOAD is not set
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-# CONFIG_INET_RAW_DIAG is not set
-# CONFIG_INET_DIAG_DESTROY is not set
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_NV=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_TCP_CONG_DCTCP=m
-CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-# CONFIG_INET6_ESP_OFFLOAD is not set
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_FOU=m
-CONFIG_IPV6_FOU_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NET_PTP_CLASSIFY=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_FAMILY_BRIDGE=y
-CONFIG_NETFILTER_FAMILY_ARP=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK_OSF=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-# CONFIG_NF_LOG_NETDEV is not set
-CONFIG_NETFILTER_CONNCOUNT=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_PROCFS=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=y
-CONFIG_NF_NAT_MASQUERADE=y
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_SET=m
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_NUMGEN=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_FLOW_OFFLOAD=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CONNLIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_TUNNEL=m
-CONFIG_NFT_OBJREF=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_FIB=m
-CONFIG_NFT_FIB_INET=m
-# CONFIG_NFT_XFRM is not set
-CONFIG_NFT_SOCKET=m
-CONFIG_NFT_OSF=m
-CONFIG_NFT_TPROXY=m
-# CONFIG_NFT_SYNPROXY is not set
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_FIB_NETDEV=m
-CONFIG_NF_FLOW_TABLE_INET=m
-CONFIG_NF_FLOW_TABLE=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-# end of Core Netfilter Configuration
-
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_MH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS MH scheduler
-#
-CONFIG_IP_VS_MH_TAB_INDEX=12
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_SOCKET_IPV4=m
-CONFIG_NF_TPROXY_IPV4=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_FLOW_TABLE_IPV4=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# end of IP: Netfilter Configuration
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_SOCKET_IPV6=m
-CONFIG_NF_TPROXY_IPV6=m
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_FIB_IPV6=m
-CONFIG_NF_FLOW_TABLE_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_SRH=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-# end of IPv6: Netfilter Configuration
-
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_TABLES_BRIDGE=m
-# CONFIG_NFT_BRIDGE_META is not set
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-# CONFIG_BPFILTER is not set
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-# end of DCCP CCIDs Configuration
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-# end of DCCP Kernel Hacking
-
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-CONFIG_INET_SCTP_DIAG=m
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-CONFIG_L2TP=m
-# CONFIG_L2TP_DEBUGFS is not set
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_GARP=m
-CONFIG_MRP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_HAVE_NET_DSA=y
-# CONFIG_NET_DSA is not set
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_PHONET is not set
-# CONFIG_6LOWPAN is not set
-# CONFIG_IEEE802154 is not set
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_CBS=m
-CONFIG_NET_SCH_ETF=m
-# CONFIG_NET_SCH_TAPRIO is not set
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_SKBPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_CAKE=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-# CONFIG_NET_SCH_DEFAULT is not set
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_MATCHALL=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_IPT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-# CONFIG_NET_ACT_SAMPLE is not set
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-# CONFIG_NET_ACT_MPLS is not set
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_ACT_CTINFO is not set
-CONFIG_NET_ACT_SKBMOD=m
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_TUNNEL_KEY=m
-# CONFIG_NET_ACT_CT is not set
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IFE_SKBTCINDEX=m
-# CONFIG_NET_TC_SKB_EXT is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=m
-# CONFIG_BATMAN_ADV is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
-CONFIG_VSOCKETS_DIAG=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
-CONFIG_NETLINK_DIAG=m
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_NET_NSH=m
-# CONFIG_HSR is not set
-# CONFIG_NET_SWITCHDEV is not set
-CONFIG_NET_L3_MASTER_DEV=y
-# CONFIG_QRTR is not set
-# CONFIG_NET_NCSI is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-# CONFIG_BPF_STREAM_PARSER is not set
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-# CONFIG_NET_DROP_MONITOR is not set
-# end of Network testing
-# end of Networking options
-
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AF_KCM is not set
-CONFIG_FIB_RULES=y
-# CONFIG_WIRELESS is not set
-# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
-# CONFIG_NET_9P is not set
-# CONFIG_CAIF is not set
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
-# CONFIG_NFC is not set
-# CONFIG_PSAMPLE is not set
-CONFIG_NET_IFE=m
-CONFIG_LWTUNNEL=y
-CONFIG_LWTUNNEL_BPF=y
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-CONFIG_FAILOVER=m
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-CONFIG_ARM_AMBA=y
-CONFIG_HAVE_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_DOMAINS_GENERIC=y
-CONFIG_PCI_SYSCALL=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-# CONFIG_PCIEAER is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-# CONFIG_PCIE_PTM is not set
-# CONFIG_PCIE_BW is not set
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-CONFIG_PCI_STUB=m
-CONFIG_PCI_PF_STUB=m
-CONFIG_PCI_ATS=y
-CONFIG_PCI_ECAM=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_LABEL=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-# CONFIG_HOTPLUG_PCI_SHPC is not set
-
-#
-# PCI controller drivers
-#
-
-#
-# Cadence PCIe controllers support
-#
-# CONFIG_PCIE_CADENCE_HOST is not set
-# end of Cadence PCIe controllers support
-
-# CONFIG_PCI_FTPCI100 is not set
-CONFIG_PCI_HOST_COMMON=y
-CONFIG_PCI_HOST_GENERIC=y
-# CONFIG_PCIE_XILINX is not set
-CONFIG_PCI_XGENE=y
-CONFIG_PCI_XGENE_MSI=y
-# CONFIG_PCIE_ALTERA is not set
-CONFIG_PCI_HOST_THUNDER_PEM=y
-CONFIG_PCI_HOST_THUNDER_ECAM=y
-
-#
-# DesignWare PCI Core Support
-#
-CONFIG_PCIE_DW=y
-CONFIG_PCIE_DW_HOST=y
-# CONFIG_PCIE_DW_PLAT_HOST is not set
-CONFIG_PCI_HISI=y
-# CONFIG_PCIE_QCOM is not set
-# CONFIG_PCIE_KIRIN is not set
-# CONFIG_PCIE_HISI_STB is not set
-# CONFIG_PCI_MESON is not set
-# CONFIG_PCIE_AL is not set
-# end of DesignWare PCI Core Support
-# end of PCI controller drivers
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-# end of PCI Endpoint
-
-#
-# PCI switch controller drivers
-#
-# CONFIG_PCI_SW_SWITCHTEC is not set
-# end of PCI switch controller drivers
-
-# CONFIG_PCCARD is not set
-# CONFIG_RAPIDIO is not set
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=m
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
-# end of Firmware loader
-
-CONFIG_ALLOW_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_MMIO=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
-CONFIG_GENERIC_ARCH_TOPOLOGY=y
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-# CONFIG_BRCMSTB_GISB_ARB is not set
-# CONFIG_HISILICON_LPC is not set
-CONFIG_QCOM_EBI2=y
-# CONFIG_SIMPLE_PM_BUS is not set
-CONFIG_VEXPRESS_CONFIG=y
-# end of Bus devices
-
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-# CONFIG_GNSS is not set
-CONFIG_MTD=m
-# CONFIG_MTD_TESTS is not set
-
-#
-# Partition parsers
-#
-# CONFIG_MTD_AR7_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_OF_PARTS=m
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# end of Partition parsers
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-# CONFIG_SM_FTL is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_SWAP is not set
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-# end of RAM/ROM/Flash chip drivers
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP_OF is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_PLATRAM is not set
-# end of Mapping drivers for chip access
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOCG3 is not set
-# end of Self-contained MTD device drivers
-
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_RAW_NAND is not set
-
-#
-# LPDDR & LPDDR2 PCM memory drivers
-#
-# CONFIG_MTD_LPDDR is not set
-# end of LPDDR & LPDDR2 PCM memory drivers
-
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_BLOCK is not set
-# CONFIG_MTD_HYPERBUS is not set
-CONFIG_DTC=y
-CONFIG_OF=y
-# CONFIG_OF_UNITTEST is not set
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_DYNAMIC=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
-CONFIG_OF_MDIO=m
-CONFIG_OF_RESERVED_MEM=y
-CONFIG_OF_RESOLVE=y
-CONFIG_OF_OVERLAY=y
-CONFIG_OF_NUMA=y
-# CONFIG_PARPORT is not set
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_NULL_BLK is not set
-CONFIG_CDROM=m
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_WRITEBACK is not set
-# CONFIG_ZRAM_MEMORY_TRACKING is not set
-# CONFIG_BLK_DEV_UMEM is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_SKD is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-CONFIG_VIRTIO_BLK=m
-# CONFIG_VIRTIO_BLK_SCSI is not set
-CONFIG_BLK_DEV_RBD=m
-# CONFIG_BLK_DEV_RSXX is not set
-
-#
-# NVME Support
-#
-CONFIG_NVME_CORE=m
-CONFIG_BLK_DEV_NVME=m
-CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_FABRICS=m
-# CONFIG_NVME_FC is not set
-# CONFIG_NVME_TCP is not set
-CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_LOOP=m
-# CONFIG_NVME_TARGET_FC is not set
-# CONFIG_NVME_TARGET_TCP is not set
-# end of NVME Support
-
-#
-# Misc devices
-#
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_QCOM_FASTRPC is not set
-# CONFIG_APDS9802ALS is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISL29020 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_BH1770 is not set
-# CONFIG_SENSORS_APDS990X is not set
-# CONFIG_HMC6352 is not set
-# CONFIG_DS1682 is not set
-# CONFIG_SRAM is not set
-CONFIG_VEXPRESS_SYSCFG=y
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_XILINX_SDFEC is not set
-CONFIG_PVPANIC=m
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_IDT_89HPESX is not set
-# CONFIG_EEPROM_EE1004 is not set
-# end of EEPROM support
-
-# CONFIG_CB710_CORE is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_TI_ST is not set
-# end of Texas Instruments shared transport line discipline
-
-# CONFIG_SENSORS_LIS3_I2C is not set
-
-#
-# Altera FPGA firmware download module (requires I2C)
-#
-# CONFIG_ALTERA_STAPL is not set
-
-#
-# Intel MIC & related support
-#
-
-#
-# Intel MIC Bus Driver
-#
-
-#
-# SCIF Bus Driver
-#
-
-#
-# VOP Bus Driver
-#
-# CONFIG_VOP_BUS is not set
-
-#
-# Intel MIC Host Driver
-#
-
-#
-# Intel MIC Card Driver
-#
-
-#
-# SCIF Driver
-#
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-
-#
-# VOP Driver
-#
-# end of Intel MIC & related support
-
-# CONFIG_GENWQE is not set
-# CONFIG_ECHO is not set
-# CONFIG_MISC_ALCOR_PCI is not set
-# CONFIG_MISC_RTSX_PCI is not set
-# CONFIG_MISC_RTSX_USB is not set
-# CONFIG_HABANA_AI is not set
-# end of Misc devices
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-# CONFIG_CHR_DEV_ST is not set
-CONFIG_BLK_DEV_SR=m
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_SCAN_ASYNC=y
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-# end of SCSI Transports
-
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-# CONFIG_ISCSI_BOOT_SYSFS is not set
-# CONFIG_SCSI_CXGB3_ISCSI is not set
-# CONFIG_SCSI_CXGB4_ISCSI is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_BE2ISCSI is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_HPSA is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_HISI_SAS is not set
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVUMI is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_ESAS2R is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_MPT3SAS is not set
-# CONFIG_SCSI_MPT2SAS is not set
-# CONFIG_SCSI_SMARTPQI is not set
-# CONFIG_SCSI_UFSHCD is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_MYRB is not set
-# CONFIG_SCSI_MYRS is not set
-# CONFIG_LIBFC is not set
-# CONFIG_SCSI_SNIC is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_FDOMAIN_PCI is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_AM53C974 is not set
-# CONFIG_SCSI_WD719X is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_PMCRAID is not set
-# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_BFA_FC is not set
-CONFIG_SCSI_VIRTIO=m
-# CONFIG_SCSI_CHELSIO_FCOE is not set
-# CONFIG_SCSI_DH is not set
-# end of SCSI device support
-
-CONFIG_HAVE_PATA_PLATFORM=y
-CONFIG_ATA=m
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-# CONFIG_SATA_ZPODD is not set
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=0
-# CONFIG_SATA_AHCI_PLATFORM is not set
-# CONFIG_AHCI_CEVA is not set
-# CONFIG_AHCI_QORIQ is not set
-# CONFIG_SATA_AHCI_SEATTLE is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_ACARD_AHCI is not set
-# CONFIG_SATA_SIL24 is not set
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-# CONFIG_PDC_ADMA is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SX4 is not set
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=m
-# CONFIG_SATA_DWC is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-
-#
-# PATA SFF controllers with BMDMA
-#
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_ATP867X is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TOSHIBA is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-
-#
-# PIO-only SFF controllers
-#
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_RZ1000 is not set
-
-#
-# Generic fallback / legacy drivers
-#
-# CONFIG_PATA_ACPI is not set
-CONFIG_ATA_GENERIC=m
-# CONFIG_PATA_LEGACY is not set
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-# CONFIG_MD_AUTODETECT is not set
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_MD_CLUSTER=m
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_UNSTRIPED=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_WRITECACHE=m
-CONFIG_DM_ERA=m
-# CONFIG_DM_CLONE is not set
-CONFIG_DM_MIRROR=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-# CONFIG_DM_DUST is not set
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
-CONFIG_DM_VERITY_FEC=y
-CONFIG_DM_SWITCH=m
-CONFIG_DM_LOG_WRITES=m
-CONFIG_DM_INTEGRITY=m
-CONFIG_TARGET_CORE=m
-# CONFIG_TCM_IBLOCK is not set
-# CONFIG_TCM_FILEIO is not set
-# CONFIG_TCM_PSCSI is not set
-# CONFIG_LOOPBACK_TARGET is not set
-# CONFIG_ISCSI_TARGET is not set
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_NOSY is not set
-# end of IEEE 1394 (FireWire) support
-
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-# CONFIG_EQUALIZER is not set
-# CONFIG_NET_FC is not set
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=m
-CONFIG_IPVTAP=m
-CONFIG_VXLAN=m
-CONFIG_GENEVE=m
-# CONFIG_GTP is not set
-CONFIG_MACSEC=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_TUN=m
-CONFIG_TAP=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_NET_VRF=m
-# CONFIG_VSOCKMON is not set
-# CONFIG_ARCNET is not set
-
-#
-# CAIF transport drivers
-#
-
-#
-# Distributed Switch Architecture drivers
-#
-# end of Distributed Switch Architecture drivers
-
-CONFIG_ETHERNET=y
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
-# CONFIG_NET_VENDOR_AGERE is not set
-# CONFIG_NET_VENDOR_ALACRITECH is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
-# CONFIG_ALTERA_TSE is not set
-CONFIG_NET_VENDOR_AMAZON=y
-# CONFIG_ENA_ETHERNET is not set
-# CONFIG_NET_VENDOR_AMD is not set
-# CONFIG_NET_XGENE is not set
-# CONFIG_NET_XGENE_V2 is not set
-# CONFIG_NET_VENDOR_AQUANTIA is not set
-# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_VENDOR_AURORA is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
-# CONFIG_NET_VENDOR_CADENCE is not set
-# CONFIG_NET_VENDOR_CAVIUM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CISCO is not set
-# CONFIG_NET_VENDOR_CORTINA is not set
-# CONFIG_DNET is not set
-# CONFIG_NET_VENDOR_DEC is not set
-# CONFIG_NET_VENDOR_DLINK is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
-# CONFIG_NET_VENDOR_EZCHIP is not set
-CONFIG_NET_VENDOR_GOOGLE=y
-# CONFIG_GVE is not set
-# CONFIG_NET_VENDOR_HISILICON is not set
-# CONFIG_NET_VENDOR_HP is not set
-# CONFIG_NET_VENDOR_HUAWEI is not set
-# CONFIG_NET_VENDOR_I825XX is not set
-CONFIG_NET_VENDOR_INTEL=y
-# CONFIG_E100 is not set
-CONFIG_E1000=m
-# CONFIG_E1000E is not set
-# CONFIG_IGB is not set
-# CONFIG_IGBVF is not set
-# CONFIG_IXGB is not set
-# CONFIG_IXGBE is not set
-CONFIG_IXGBEVF=m
-# CONFIG_I40E is not set
-# CONFIG_I40EVF is not set
-# CONFIG_ICE is not set
-# CONFIG_FM10K is not set
-# CONFIG_IGC is not set
-# CONFIG_JME is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-CONFIG_NET_VENDOR_MICROCHIP=y
-# CONFIG_LAN743X is not set
-# CONFIG_NET_VENDOR_MICROSEMI is not set
-# CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_NETERION is not set
-# CONFIG_NET_VENDOR_NETRONOME is not set
-# CONFIG_NET_VENDOR_NI is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
-# CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_ETHOC is not set
-# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
-CONFIG_NET_VENDOR_PENSANDO=y
-# CONFIG_IONIC is not set
-# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_QUALCOMM is not set
-# CONFIG_NET_VENDOR_RDC is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
-# CONFIG_NET_VENDOR_RENESAS is not set
-# CONFIG_NET_VENDOR_ROCKER is not set
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SOLARFLARE is not set
-# CONFIG_NET_VENDOR_SILAN is not set
-# CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_SOCIONEXT is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SUN is not set
-# CONFIG_NET_VENDOR_SYNOPSYS is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_NET_VENDOR_TI is not set
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_NET_SB1000 is not set
-CONFIG_MDIO_DEVICE=m
-CONFIG_MDIO_BUS=m
-# CONFIG_MDIO_BCM_UNIMAC is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
-# CONFIG_MDIO_HISI_FEMAC is not set
-# CONFIG_MDIO_MSCC_MIIM is not set
-# CONFIG_MDIO_OCTEON is not set
-# CONFIG_MDIO_THUNDER is not set
-# CONFIG_MDIO_XGENE is not set
-CONFIG_PHYLIB=m
-CONFIG_SWPHY=y
-
-#
-# MII PHY device drivers
-#
-# CONFIG_ADIN_PHY is not set
-# CONFIG_AMD_PHY is not set
-# CONFIG_AQUANTIA_PHY is not set
-# CONFIG_AX88796B_PHY is not set
-# CONFIG_AT803X_PHY is not set
-# CONFIG_BCM7XXX_PHY is not set
-# CONFIG_BCM87XX_PHY is not set
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CORTINA_PHY is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DP83822_PHY is not set
-# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DP83848_PHY is not set
-# CONFIG_DP83867_PHY is not set
-CONFIG_FIXED_PHY=m
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_INTEL_XWAY_PHY is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MARVELL_10G_PHY is not set
-# CONFIG_MICREL_PHY is not set
-# CONFIG_MICROCHIP_PHY is not set
-# CONFIG_MICROCHIP_T1_PHY is not set
-# CONFIG_MICROSEMI_PHY is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NXP_TJA11XX_PHY is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_RENESAS_PHY is not set
-# CONFIG_ROCKCHIP_PHY is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_STE10XP is not set
-# CONFIG_TERANETICS_PHY is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_XILINX_GMII2RGMII is not set
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-# CONFIG_PPP_FILTER is not set
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPPOE is not set
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-CONFIG_SLIP_MODE_SLIP6=y
-
-#
-# Host-side USB support is needed for USB Network Adapter support
-#
-# CONFIG_USB_NET_DRIVERS is not set
-# CONFIG_WLAN is not set
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
-# CONFIG_WAN is not set
-CONFIG_VMXNET3=m
-# CONFIG_FUJITSU_ES is not set
-# CONFIG_NETDEVSIM is not set
-CONFIG_NET_FAILOVER=m
-# CONFIG_ISDN is not set
-# CONFIG_NVM is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_MATRIXKMAP is not set
-
-#
-# Userland interfaces
-#
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-# CONFIG_RMI4_CORE is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=m
-# CONFIG_SERIO_AMBAKMI is not set
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_LIBPS2 is not set
-# CONFIG_SERIO_RAW is not set
-# CONFIG_SERIO_ALTERA_PS2 is not set
-# CONFIG_SERIO_PS2MULT is not set
-# CONFIG_SERIO_ARC_PS2 is not set
-# CONFIG_SERIO_APBPS2 is not set
-# CONFIG_SERIO_GPIO_PS2 is not set
-# CONFIG_USERIO is not set
-# CONFIG_GAMEPORT is not set
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_N_GSM is not set
-# CONFIG_TRACE_SINK is not set
-# CONFIG_NULL_TTY is not set
-# CONFIG_LDISC_AUTOLOAD is not set
-CONFIG_DEVMEM=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-CONFIG_SERIAL_8250_PNP=y
-# CONFIG_SERIAL_8250_FINTEK is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_EXAR=y
-CONFIG_SERIAL_8250_NR_UARTS=16
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-# CONFIG_SERIAL_8250_ASPEED_VUART is not set
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_8250_FSL=y
-# CONFIG_SERIAL_8250_DW is not set
-# CONFIG_SERIAL_8250_RT288X is not set
-# CONFIG_SERIAL_OF_PLATFORM is not set
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_AMBA_PL010 is not set
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
-# CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_MSM is not set
-# CONFIG_SERIAL_SIFIVE is not set
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
-# CONFIG_SERIAL_ARC is not set
-# CONFIG_SERIAL_RP2 is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_FSL_LINFLEXUART is not set
-# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
-# end of Serial drivers
-
-CONFIG_SERIAL_MCTRL_GPIO=y
-# CONFIG_SERIAL_DEV_BUS is not set
-# CONFIG_TTY_PRINTK is not set
-CONFIG_HVC_DRIVER=y
-# CONFIG_HVC_DCC is not set
-CONFIG_VIRTIO_CONSOLE=m
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_HISI=m
-CONFIG_HW_RANDOM_XGENE=m
-CONFIG_HW_RANDOM_CAVIUM=m
-# CONFIG_APPLICOM is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_DEVPORT is not set
-# CONFIG_XILLYBUS is not set
-# end of Character devices
-
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-# CONFIG_I2C_MUX_GPIO is not set
-# CONFIG_I2C_MUX_GPMUX is not set
-# CONFIG_I2C_MUX_LTC4306 is not set
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-CONFIG_I2C_MUX_PINCTRL=m
-# CONFIG_I2C_MUX_REG is not set
-# CONFIG_I2C_DEMUX_PINCTRL is not set
-# CONFIG_I2C_MUX_MLXCPLD is not set
-# end of Multiplexer I2C Chip support
-
-# CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_SMBUS=m
-
-#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ALGOPCA=m
-# end of I2C Algorithms
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_AMD_MP2 is not set
-# CONFIG_I2C_HIX5HD2 is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C_PIIX4 is not set
-CONFIG_I2C_NFORCE2=m
-# CONFIG_I2C_NVIDIA_GPU is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-
-#
-# ACPI drivers
-#
-# CONFIG_I2C_SCMI is not set
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_CADENCE is not set
-# CONFIG_I2C_CBUS_GPIO is not set
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_DESIGNWARE_PCI is not set
-# CONFIG_I2C_EMEV2 is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_NOMADIK is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_QUP is not set
-# CONFIG_I2C_RK3X is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_VERSATILE is not set
-# CONFIG_I2C_THUNDERX is not set
-# CONFIG_I2C_XILINX is not set
-# CONFIG_I2C_XLP9XX is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-# CONFIG_I2C_DIOLAN_U2C is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-
-#
-# Other I2C/SMBus bus drivers
-#
-# CONFIG_I2C_XGENE_SLIMPRO is not set
-# end of I2C Hardware Bus support
-
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_SLAVE is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# end of I2C support
-
-# CONFIG_I3C is not set
-# CONFIG_SPI is not set
-# CONFIG_SPMI is not set
-# CONFIG_HSI is not set
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-# CONFIG_PPS_CLIENT_LDISC is not set
-# CONFIG_PPS_CLIENT_GPIO is not set
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=m
-CONFIG_DP83640_PHY=m
-# end of PTP clock support
-
-CONFIG_PINCTRL=y
-# CONFIG_DEBUG_PINCTRL is not set
-# CONFIG_PINCTRL_AMD is not set
-# CONFIG_PINCTRL_MCP23S08 is not set
-# CONFIG_PINCTRL_SINGLE is not set
-# CONFIG_PINCTRL_STMFX is not set
-# CONFIG_PINCTRL_OCELOT is not set
-# CONFIG_PINCTRL_APQ8064 is not set
-# CONFIG_PINCTRL_APQ8084 is not set
-# CONFIG_PINCTRL_IPQ4019 is not set
-# CONFIG_PINCTRL_IPQ8064 is not set
-# CONFIG_PINCTRL_IPQ8074 is not set
-# CONFIG_PINCTRL_MSM8660 is not set
-# CONFIG_PINCTRL_MSM8960 is not set
-# CONFIG_PINCTRL_MDM9615 is not set
-# CONFIG_PINCTRL_MSM8X74 is not set
-# CONFIG_PINCTRL_MSM8916 is not set
-# CONFIG_PINCTRL_MSM8994 is not set
-# CONFIG_PINCTRL_MSM8996 is not set
-# CONFIG_PINCTRL_MSM8998 is not set
-# CONFIG_PINCTRL_QCS404 is not set
-# CONFIG_PINCTRL_QDF2XXX is not set
-# CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
-# CONFIG_PINCTRL_SC7180 is not set
-# CONFIG_PINCTRL_SDM660 is not set
-# CONFIG_PINCTRL_SDM845 is not set
-# CONFIG_PINCTRL_SM8150 is not set
-CONFIG_GPIOLIB=y
-CONFIG_GPIOLIB_FASTPATH_LIMIT=512
-CONFIG_OF_GPIO=y
-CONFIG_GPIO_ACPI=y
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_GPIO_SYSFS is not set
-
-#
-# Memory mapped GPIO drivers
-#
-# CONFIG_GPIO_74XX_MMIO is not set
-# CONFIG_GPIO_ALTERA is not set
-# CONFIG_GPIO_AMDPT is not set
-# CONFIG_GPIO_CADENCE is not set
-# CONFIG_GPIO_DWAPB is not set
-# CONFIG_GPIO_EXAR is not set
-# CONFIG_GPIO_FTGPIO010 is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_HLWD is not set
-# CONFIG_GPIO_MB86S7X is not set
-# CONFIG_GPIO_PL061 is not set
-# CONFIG_GPIO_THUNDERX is not set
-# CONFIG_GPIO_XGENE is not set
-# CONFIG_GPIO_XGENE_SB is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GPIO_XLP is not set
-# CONFIG_GPIO_AMD_FCH is not set
-# end of Memory mapped GPIO drivers
-
-#
-# I2C GPIO expanders
-#
-# CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_ADNP is not set
-# CONFIG_GPIO_GW_PLD is not set
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_TPIC2810 is not set
-# end of I2C GPIO expanders
-
-#
-# MFD GPIO expanders
-#
-# end of MFD GPIO expanders
-
-#
-# PCI GPIO expanders
-#
-# CONFIG_GPIO_BT8XX is not set
-# CONFIG_GPIO_PCI_IDIO_16 is not set
-# CONFIG_GPIO_PCIE_IDIO_24 is not set
-# CONFIG_GPIO_RDC321X is not set
-# end of PCI GPIO expanders
-
-#
-# USB GPIO expanders
-#
-# end of USB GPIO expanders
-
-# CONFIG_GPIO_MOCKUP is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_AVS is not set
-CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_GPIO is not set
-# CONFIG_POWER_RESET_GPIO_RESTART is not set
-# CONFIG_POWER_RESET_HISI is not set
-# CONFIG_POWER_RESET_MSM is not set
-# CONFIG_POWER_RESET_LTC2952 is not set
-# CONFIG_POWER_RESET_RESTART is not set
-CONFIG_POWER_RESET_VEXPRESS=y
-# CONFIG_POWER_RESET_XGENE is not set
-# CONFIG_POWER_RESET_SYSCON is not set
-# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
-# CONFIG_NVMEM_REBOOT_MODE is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-# CONFIG_PDA_POWER is not set
-# CONFIG_TEST_POWER is not set
-# CONFIG_CHARGER_ADP5061 is not set
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_CHARGER_SBS is not set
-# CONFIG_MANAGER_SBS is not set
-# CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# CONFIG_CHARGER_GPIO is not set
-# CONFIG_CHARGER_LT3651 is not set
-# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
-# CONFIG_CHARGER_BQ2415X is not set
-# CONFIG_CHARGER_BQ24735 is not set
-# CONFIG_CHARGER_BQ25890 is not set
-# CONFIG_CHARGER_SMB347 is not set
-# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_CHARGER_RT9455 is not set
-CONFIG_HWMON=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADT7410 is not set
-# CONFIG_SENSORS_ADT7411 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_AS370 is not set
-# CONFIG_SENSORS_ASC7621 is not set
-# CONFIG_SENSORS_ARM_SCPI is not set
-# CONFIG_SENSORS_ASPEED is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_DS620 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_G762 is not set
-# CONFIG_SENSORS_GPIO_FAN is not set
-# CONFIG_SENSORS_HIH6130 is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_JC42 is not set
-# CONFIG_SENSORS_POWR1220 is not set
-# CONFIG_SENSORS_LINEAGE is not set
-# CONFIG_SENSORS_LTC2945 is not set
-# CONFIG_SENSORS_LTC2990 is not set
-# CONFIG_SENSORS_LTC4151 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4222 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_LTC4260 is not set
-# CONFIG_SENSORS_LTC4261 is not set
-# CONFIG_SENSORS_MAX16065 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX1668 is not set
-# CONFIG_SENSORS_MAX197 is not set
-# CONFIG_SENSORS_MAX6621 is not set
-# CONFIG_SENSORS_MAX6639 is not set
-# CONFIG_SENSORS_MAX6642 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6697 is not set
-# CONFIG_SENSORS_MAX31790 is not set
-# CONFIG_SENSORS_MCP3021 is not set
-# CONFIG_SENSORS_TC654 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
-# CONFIG_SENSORS_LM95234 is not set
-# CONFIG_SENSORS_LM95241 is not set
-# CONFIG_SENSORS_LM95245 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_NTC_THERMISTOR is not set
-# CONFIG_SENSORS_NCT6683 is not set
-# CONFIG_SENSORS_NCT6775 is not set
-# CONFIG_SENSORS_NCT7802 is not set
-# CONFIG_SENSORS_NCT7904 is not set
-# CONFIG_SENSORS_NPCM7XX is not set
-# CONFIG_SENSORS_OCC_P8_I2C is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_PMBUS is not set
-# CONFIG_SENSORS_PWM_FAN is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_SHT21 is not set
-# CONFIG_SENSORS_SHT3x is not set
-# CONFIG_SENSORS_SHTC1 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_EMC1403 is not set
-# CONFIG_SENSORS_EMC2103 is not set
-# CONFIG_SENSORS_EMC6W201 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_STTS751 is not set
-# CONFIG_SENSORS_SMM665 is not set
-# CONFIG_SENSORS_ADC128D818 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_AMC6821 is not set
-# CONFIG_SENSORS_INA209 is not set
-# CONFIG_SENSORS_INA2XX is not set
-# CONFIG_SENSORS_INA3221 is not set
-# CONFIG_SENSORS_TC74 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP102 is not set
-# CONFIG_SENSORS_TMP103 is not set
-# CONFIG_SENSORS_TMP108 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_VEXPRESS is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83773G is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83795 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_XGENE is not set
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_THERMAL=y
-# CONFIG_THERMAL_STATISTICS is not set
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-# CONFIG_THERMAL_OF is not set
-# CONFIG_THERMAL_WRITABLE_TRIPS is not set
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
-# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
-CONFIG_THERMAL_GOV_STEP_WISE=y
-# CONFIG_THERMAL_GOV_BANG_BANG is not set
-# CONFIG_THERMAL_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
-# CONFIG_THERMAL_EMULATION is not set
-# CONFIG_THERMAL_MMIO is not set
-CONFIG_HISI_THERMAL=m
-
-#
-# Qualcomm thermal drivers
-#
-# end of Qualcomm thermal drivers
-
-# CONFIG_WATCHDOG is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB is not set
-CONFIG_BCMA_POSSIBLE=y
-# CONFIG_BCMA is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_ACT8945A is not set
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
-# CONFIG_MFD_ATMEL_HLCDC is not set
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_MADERA is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-# CONFIG_MFD_HI6421_PMIC is not set
-# CONFIG_MFD_HI655X_PMIC is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_LPC_ICH is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77650 is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_MENF21BMC is not set
-# CONFIG_MFD_VIPERBOARD is not set
-# CONFIG_MFD_RETU is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_QCOM_RPM is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_RK808 is not set
-# CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_SKY81452 is not set
-# CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_SYSCON is not set
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_TI_LMU is not set
-# CONFIG_TPS6105X is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TPS6507X is not set
-# CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_TPS65217 is not set
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TI_LP87565 is not set
-# CONFIG_MFD_TPS65218 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_WL1273_CORE is not set
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_TQMX86 is not set
-# CONFIG_MFD_VX855 is not set
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MFD_STMFX is not set
-# CONFIG_MFD_VEXPRESS_SYSREG is not set
-# end of Multifunction device drivers
-
-# CONFIG_REGULATOR is not set
-# CONFIG_RC_CORE is not set
-# CONFIG_MEDIA_SUPPORT is not set
-
-#
-# Graphics support
-#
-# CONFIG_VGA_ARB is not set
-CONFIG_DRM=m
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-# CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_TTM=m
-CONFIG_DRM_VRAM_HELPER=m
-CONFIG_DRM_GEM_SHMEM_HELPER=y
-
-#
-# I2C encoder or helper chips
-#
-# CONFIG_DRM_I2C_CH7006 is not set
-# CONFIG_DRM_I2C_SIL164 is not set
-# CONFIG_DRM_I2C_NXP_TDA998X is not set
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# end of I2C encoder or helper chips
-
-#
-# ARM devices
-#
-# CONFIG_DRM_HDLCD is not set
-# CONFIG_DRM_MALI_DISPLAY is not set
-# CONFIG_DRM_KOMEDA is not set
-# end of ARM devices
-
-# CONFIG_DRM_RADEON is not set
-# CONFIG_DRM_AMDGPU is not set
-
-#
-# ACP (Audio CoProcessor) Configuration
-#
-# end of ACP (Audio CoProcessor) Configuration
-
-# CONFIG_DRM_NOUVEAU is not set
-# CONFIG_DRM_VGEM is not set
-# CONFIG_DRM_VKMS is not set
-# CONFIG_DRM_UDL is not set
-# CONFIG_DRM_AST is not set
-# CONFIG_DRM_MGAG200 is not set
-CONFIG_DRM_CIRRUS_QEMU=m
-# CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_LVDS is not set
-CONFIG_DRM_RCAR_WRITEBACK=y
-CONFIG_DRM_QXL=m
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
-# CONFIG_DRM_MSM is not set
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-# CONFIG_DRM_PANEL_LVDS is not set
-# CONFIG_DRM_PANEL_SIMPLE is not set
-# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
-# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
-# end of Display Panels
-
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_PANEL_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-# CONFIG_DRM_ANALOGIX_ANX78XX is not set
-# CONFIG_DRM_CDNS_DSI is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
-# CONFIG_DRM_LVDS_ENCODER is not set
-# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
-# CONFIG_DRM_NXP_PTN3460 is not set
-# CONFIG_DRM_PARADE_PS8622 is not set
-# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SII902X is not set
-# CONFIG_DRM_SII9234 is not set
-# CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TOSHIBA_TC358764 is not set
-# CONFIG_DRM_TOSHIBA_TC358767 is not set
-# CONFIG_DRM_TI_TFP410 is not set
-# CONFIG_DRM_TI_SN65DSI86 is not set
-# CONFIG_DRM_I2C_ADV7511 is not set
-# end of Display Interface Bridges
-
-# CONFIG_DRM_ETNAVIV is not set
-# CONFIG_DRM_ARCPGU is not set
-# CONFIG_DRM_HISI_HIBMC is not set
-# CONFIG_DRM_HISI_KIRIN is not set
-# CONFIG_DRM_MXSFB is not set
-# CONFIG_DRM_GM12U320 is not set
-# CONFIG_DRM_PL111 is not set
-# CONFIG_DRM_LIMA is not set
-# CONFIG_DRM_PANFROST is not set
-# CONFIG_DRM_LEGACY is not set
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=m
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_IMAGEBLIT=m
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_BACKLIGHT=m
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-CONFIG_FB_ARMCLCD=m
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_UVESA is not set
-# CONFIG_FB_OPENCORES is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-CONFIG_FB_SSD1307=m
-# CONFIG_FB_SM712 is not set
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-# CONFIG_LCD_CLASS_DEVICE is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-# CONFIG_BACKLIGHT_GENERIC is not set
-# CONFIG_BACKLIGHT_PWM is not set
-# CONFIG_BACKLIGHT_PM8941_WLED is not set
-# CONFIG_BACKLIGHT_ADP8860 is not set
-# CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_LM3630A is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_GPIO is not set
-# CONFIG_BACKLIGHT_LV5207LP is not set
-# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_ARCXCNN is not set
-# end of Backlight & LCD device support
-
-CONFIG_VIDEOMODE_HELPERS=y
-CONFIG_HDMI=y
-
-#
-# Console display driver support
-#
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# end of Console display driver support
-
-# CONFIG_LOGO is not set
-# end of Graphics support
-
-# CONFIG_SOUND is not set
-
-#
-# HID support
-#
-CONFIG_HID=m
-# CONFIG_HID_BATTERY_STRENGTH is not set
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACCUTOUCH is not set
-# CONFIG_HID_ACRUX is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_APPLEIR is not set
-# CONFIG_HID_AUREAL is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BETOP_FF is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_COUGAR is not set
-# CONFIG_HID_MACALLY is not set
-# CONFIG_HID_CMEDIA is not set
-# CONFIG_HID_CP2112 is not set
-# CONFIG_HID_CREATIVE_SB0540 is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GEMBIRD is not set
-# CONFIG_HID_GFRM is not set
-# CONFIG_HID_HOLTEK is not set
-# CONFIG_HID_KEYTOUCH is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_UCLOGIC is not set
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_VIEWSONIC is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_ICADE is not set
-# CONFIG_HID_ITE is not set
-# CONFIG_HID_JABRA is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_LENOVO is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MAGICMOUSE is not set
-# CONFIG_HID_MALTRON is not set
-# CONFIG_HID_MAYFLASH is not set
-# CONFIG_HID_REDRAGON is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_MULTITOUCH is not set
-# CONFIG_HID_NTI is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PENMOUNT is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PICOLCD is not set
-# CONFIG_HID_PLANTRONICS is not set
-# CONFIG_HID_PRIMAX is not set
-# CONFIG_HID_RETRODE is not set
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_SAITEK is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SPEEDLINK is not set
-# CONFIG_HID_STEAM is not set
-# CONFIG_HID_STEELSERIES is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_RMI is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_UDRAW_PS3 is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HID_ZYDACRON is not set
-# CONFIG_HID_SENSOR_HUB is not set
-# CONFIG_HID_ALPS is not set
-# end of Special HID drivers
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-# end of USB HID Boot Protocol drivers
-# end of USB HID support
-
-#
-# I2C HID support
-#
-# CONFIG_I2C_HID is not set
-# end of I2C HID support
-# end of HID support
-
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
-# CONFIG_USB_ULPI_BUS is not set
-# CONFIG_USB_CONN_GPIO is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-CONFIG_USB_PCI=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_MON=m
-
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=m
-# CONFIG_USB_XHCI_PLATFORM is not set
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-CONFIG_USB_EHCI_PCI=m
-# CONFIG_USB_EHCI_FSL is not set
-CONFIG_USB_EHCI_HCD_PLATFORM=m
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_FOTG210_HCD is not set
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_UHCI_HCD=m
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_TMC is not set
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_REALTEK is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-CONFIG_USB_UAS=m
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USBIP_CORE is not set
-# CONFIG_USB_CDNS3 is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_ISP1760 is not set
-
-#
-# USB port drivers
-#
-# CONFIG_USB_SERIAL is not set
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_YUREX is not set
-# CONFIG_USB_EZUSB_FX2 is not set
-# CONFIG_USB_HUB_USB251XB is not set
-# CONFIG_USB_HSIC_USB3503 is not set
-# CONFIG_USB_HSIC_USB4604 is not set
-# CONFIG_USB_LINK_LAYER_TEST is not set
-# CONFIG_USB_CHAOSKEY is not set
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_ISP1301 is not set
-# CONFIG_USB_ULPI is not set
-# end of USB Physical Layer drivers
-
-# CONFIG_USB_GADGET is not set
-# CONFIG_TYPEC is not set
-# CONFIG_USB_ROLE_SWITCH is not set
-# CONFIG_MMC is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_NEW_LEDS is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_INFINIBAND is not set
-CONFIG_EDAC_SUPPORT=y
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_NVMEM=y
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-# CONFIG_RTC_DRV_TEST is not set
-
-#
-# I2C RTC drivers
-#
-# CONFIG_RTC_DRV_ABB5ZES3 is not set
-# CONFIG_RTC_DRV_ABEOZ9 is not set
-# CONFIG_RTC_DRV_ABX80X is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_ISL12022 is not set
-# CONFIG_RTC_DRV_ISL12026 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_PCF8523 is not set
-# CONFIG_RTC_DRV_PCF85063 is not set
-# CONFIG_RTC_DRV_PCF85363 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_BQ32K is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_RX8010 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_EM3027 is not set
-# CONFIG_RTC_DRV_RV3028 is not set
-# CONFIG_RTC_DRV_RV8803 is not set
-# CONFIG_RTC_DRV_SD3078 is not set
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_I2C_AND_SPI=m
-
-#
-# SPI and I2C RTC drivers
-#
-# CONFIG_RTC_DRV_DS3232 is not set
-# CONFIG_RTC_DRV_PCF2127 is not set
-# CONFIG_RTC_DRV_RV3029C2 is not set
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1685_FAMILY=m
-CONFIG_RTC_DRV_DS1685=y
-# CONFIG_RTC_DRV_DS1689 is not set
-# CONFIG_RTC_DRV_DS17285 is not set
-# CONFIG_RTC_DRV_DS17485 is not set
-# CONFIG_RTC_DRV_DS17885 is not set
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_EFI=y
-CONFIG_RTC_DRV_STK17TA8=m
-# CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-# CONFIG_RTC_DRV_ZYNQMP is not set
-
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_PL030 is not set
-CONFIG_RTC_DRV_PL031=y
-# CONFIG_RTC_DRV_CADENCE is not set
-# CONFIG_RTC_DRV_FTRTC010 is not set
-# CONFIG_RTC_DRV_SNVS is not set
-# CONFIG_RTC_DRV_XGENE is not set
-# CONFIG_RTC_DRV_R7301 is not set
-
-#
-# HID Sensor RTC drivers
-#
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_ACPI=y
-CONFIG_DMA_OF=y
-# CONFIG_ALTERA_MSGDMA is not set
-# CONFIG_AMBA_PL08X is not set
-# CONFIG_BCM_SBA_RAID is not set
-# CONFIG_DW_AXI_DMAC is not set
-# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_QDMA is not set
-# CONFIG_INTEL_IDMA64 is not set
-# CONFIG_K3_DMA is not set
-# CONFIG_MV_XOR_V2 is not set
-# CONFIG_PL330_DMA is not set
-# CONFIG_XGENE_DMA is not set
-# CONFIG_XILINX_DMA is not set
-# CONFIG_XILINX_ZYNQMP_DMA is not set
-# CONFIG_QCOM_BAM_DMA is not set
-CONFIG_QCOM_HIDMA_MGMT=m
-CONFIG_QCOM_HIDMA=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
-
-#
-# DMA Clients
-#
-# CONFIG_ASYNC_TX_DMA is not set
-# CONFIG_DMATEST is not set
-
-#
-# DMABUF options
-#
-CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
-# CONFIG_DMABUF_SELFTESTS is not set
-# end of DMABUF options
-
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
-# CONFIG_VFIO is not set
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-
-#
-# Microsoft Hyper-V guest support
-#
-# end of Microsoft Hyper-V guest support
-
-# CONFIG_GREYBUS is not set
-# CONFIG_STAGING is not set
-# CONFIG_GOLDFISH is not set
-# CONFIG_MFD_CROS_EC is not set
-# CONFIG_CHROME_PLATFORMS is not set
-# CONFIG_MELLANOX_PLATFORM is not set
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-
-#
-# Common Clock Framework
-#
-CONFIG_COMMON_CLK_VERSATILE=y
-# CONFIG_CLK_SP810 is not set
-# CONFIG_CLK_VEXPRESS_OSC is not set
-# CONFIG_CLK_HSDK is not set
-# CONFIG_COMMON_CLK_MAX9485 is not set
-# CONFIG_COMMON_CLK_SCPI is not set
-# CONFIG_COMMON_CLK_SI5341 is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-# CONFIG_COMMON_CLK_SI514 is not set
-# CONFIG_COMMON_CLK_SI544 is not set
-# CONFIG_COMMON_CLK_SI570 is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CDCE925 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_CLK_QORIQ is not set
-# CONFIG_COMMON_CLK_XGENE is not set
-# CONFIG_COMMON_CLK_PWM is not set
-# CONFIG_COMMON_CLK_VC5 is not set
-# CONFIG_COMMON_CLK_FIXED_MMIO is not set
-# CONFIG_COMMON_CLK_HI3516CV300 is not set
-# CONFIG_COMMON_CLK_HI3519 is not set
-# CONFIG_COMMON_CLK_HI3660 is not set
-CONFIG_COMMON_CLK_HI3670=y
-# CONFIG_COMMON_CLK_HI3798CV200 is not set
-# CONFIG_COMMON_CLK_HI6220 is not set
-# CONFIG_RESET_HISI is not set
-# CONFIG_COMMON_CLK_QCOM is not set
-# end of Common Clock Framework
-
-# CONFIG_HWSPINLOCK is not set
-
-#
-# Clock Source drivers
-#
-CONFIG_TIMER_OF=y
-CONFIG_TIMER_ACPI=y
-CONFIG_TIMER_PROBE=y
-CONFIG_CLKSRC_MMIO=y
-CONFIG_ARM_ARCH_TIMER=y
-CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
-CONFIG_FSL_ERRATUM_A008585=y
-CONFIG_HISILICON_ERRATUM_161010101=y
-CONFIG_ARM64_ERRATUM_858921=y
-CONFIG_ARM_TIMER_SP804=y
-# end of Clock Source drivers
-
-CONFIG_MAILBOX=y
-CONFIG_ARM_MHU=m
-# CONFIG_PLATFORM_MHU is not set
-# CONFIG_PL320_MBOX is not set
-CONFIG_PCC=y
-# CONFIG_ALTERA_MBOX is not set
-CONFIG_HI3660_MBOX=y
-CONFIG_HI6220_MBOX=y
-# CONFIG_MAILBOX_TEST is not set
-# CONFIG_QCOM_APCS_IPC is not set
-CONFIG_XGENE_SLIMPRO_MBOX=m
-CONFIG_IOMMU_IOVA=y
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-CONFIG_IOMMU_IO_PGTABLE=y
-CONFIG_IOMMU_IO_PGTABLE_LPAE=y
-# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
-# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
-# end of Generic IOMMU Pagetable Support
-
-# CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_OF_IOMMU=y
-CONFIG_IOMMU_DMA=y
-CONFIG_ARM_SMMU=y
-CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
-CONFIG_ARM_SMMU_V3=y
-# CONFIG_QCOM_IOMMU is not set
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-CONFIG_RPMSG=m
-# CONFIG_RPMSG_CHAR is not set
-# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
-CONFIG_RPMSG_VIRTIO=m
-# end of Rpmsg drivers
-
-# CONFIG_SOUNDWIRE is not set
-
-#
-# SOC (System On Chip) specific Drivers
-#
-
-#
-# Amlogic SoC drivers
-#
-# end of Amlogic SoC drivers
-
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-# CONFIG_SOC_BRCMSTB is not set
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-# end of i.MX SoC drivers
-
-#
-# Qualcomm SoC drivers
-#
-# CONFIG_QCOM_AOSS_QMP is not set
-# CONFIG_QCOM_COMMAND_DB is not set
-# CONFIG_QCOM_GENI_SE is not set
-# CONFIG_QCOM_GSBI is not set
-# CONFIG_QCOM_LLCC is not set
-# CONFIG_QCOM_RMTFS_MEM is not set
-# CONFIG_QCOM_RPMH is not set
-# CONFIG_QCOM_SMD_RPM is not set
-# CONFIG_QCOM_WCNSS_CTRL is not set
-# CONFIG_QCOM_APR is not set
-# end of Qualcomm SoC drivers
-
-# CONFIG_SOC_TI is not set
-
-#
-# Xilinx SoC drivers
-#
-# CONFIG_XILINX_VCU is not set
-# end of Xilinx SoC drivers
-# end of SOC (System On Chip) specific Drivers
-
-# CONFIG_PM_DEVFREQ is not set
-# CONFIG_EXTCON is not set
-# CONFIG_MEMORY is not set
-# CONFIG_IIO is not set
-# CONFIG_NTB is not set
-# CONFIG_VME_BUS is not set
-CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
-# CONFIG_PWM_FSL_FTM is not set
-# CONFIG_PWM_HIBVT is not set
-# CONFIG_PWM_PCA9685 is not set
-
-#
-# IRQ chip support
-#
-CONFIG_IRQCHIP=y
-CONFIG_ARM_GIC=y
-CONFIG_ARM_GIC_MAX_NR=1
-CONFIG_ARM_GIC_V2M=y
-CONFIG_ARM_GIC_V3=y
-CONFIG_ARM_GIC_V3_ITS=y
-CONFIG_ARM_GIC_V3_ITS_PCI=y
-CONFIG_ALPINE_MSI=y
-# CONFIG_AL_FIC is not set
-CONFIG_HISILICON_IRQ_MBIGEN=y
-CONFIG_PARTITION_PERCPU=y
-# CONFIG_QCOM_IRQ_COMBINER is not set
-# CONFIG_QCOM_PDC is not set
-# end of IRQ chip support
-
-# CONFIG_IPACK_BUS is not set
-CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_QCOM_AOSS is not set
-# CONFIG_RESET_QCOM_PDC is not set
-# CONFIG_RESET_TI_SYSCON is not set
-CONFIG_COMMON_RESET_HI3660=y
-CONFIG_COMMON_RESET_HI6220=m
-
-#
-# PHY Subsystem
-#
-# CONFIG_GENERIC_PHY is not set
-# CONFIG_PHY_XGENE is not set
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_CADENCE_DP is not set
-# CONFIG_PHY_CADENCE_DPHY is not set
-# CONFIG_PHY_CADENCE_SIERRA is not set
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-# CONFIG_PHY_HI6220_USB is not set
-# CONFIG_PHY_HI3660_USB is not set
-# CONFIG_PHY_HISTB_COMBPHY is not set
-# CONFIG_PHY_HISI_INNO_USB2 is not set
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_MAPPHONE_MDM6600 is not set
-# CONFIG_PHY_QCOM_APQ8064_SATA is not set
-# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
-# CONFIG_PHY_QCOM_PCIE2 is not set
-# CONFIG_PHY_QCOM_QMP is not set
-# CONFIG_PHY_QCOM_QUSB2 is not set
-# CONFIG_PHY_QCOM_UFS is not set
-# end of PHY Subsystem
-
-# CONFIG_POWERCAP is not set
-# CONFIG_MCB is not set
-
-#
-# Performance monitor support
-#
-# CONFIG_ARM_CCI_PMU is not set
-# CONFIG_ARM_CCN is not set
-# CONFIG_ARM_PMU is not set
-# CONFIG_ARM_SMMU_V3_PMU is not set
-# CONFIG_ARM_DSU_PMU is not set
-# CONFIG_HISI_PMU is not set
-# CONFIG_QCOM_L2_PMU is not set
-# CONFIG_QCOM_L3_PMU is not set
-CONFIG_THUNDERX2_PMU=m
-# CONFIG_XGENE_PMU is not set
-# CONFIG_ARM_SPE_PMU is not set
-# end of Performance monitor support
-
-# CONFIG_RAS is not set
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-# end of Android
-
-# CONFIG_LIBNVDIMM is not set
-CONFIG_DAX=y
-# CONFIG_DEV_DAX is not set
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SYSFS=y
-# CONFIG_QCOM_QFPROM is not set
-
-#
-# HW tracing support
-#
-# CONFIG_STM is not set
-# CONFIG_INTEL_TH is not set
-# end of HW tracing support
-
-# CONFIG_FPGA is not set
-# CONFIG_FSI is not set
-# CONFIG_TEE is not set
-# CONFIG_SIOX is not set
-# CONFIG_SLIMBUS is not set
-# CONFIG_INTERCONNECT is not set
-# CONFIG_COUNTER is not set
-# end of Device Drivers
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-# CONFIG_VALIDATE_FS_PARSER is not set
-CONFIG_FS_IOMAP=y
-# CONFIG_EXT2_FS is not set
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_USE_FOR_EXT2=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-# CONFIG_REISERFS_FS_SECURITY is not set
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-CONFIG_XFS_ONLINE_SCRUB=y
-# CONFIG_XFS_ONLINE_REPAIR is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_FS_REF_VERIFY is not set
-CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-# CONFIG_F2FS_FS_SECURITY is not set
-# CONFIG_F2FS_CHECK_FS is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_FS_DAX is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_EXPORTFS_BLOCK_OPS=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_MANDATORY_FILE_LOCKING is not set
-CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_DNOTIFY is not set
-CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_AUTOFS_FS=m
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_VIRTIO_FS=m
-CONFIG_OVERLAY_FS=m
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
-# CONFIG_OVERLAY_FS_INDEX is not set
-# CONFIG_OVERLAY_FS_XINO_AUTO is not set
-# CONFIG_OVERLAY_FS_METACOPY is not set
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_FAT_DEFAULT_UTF8 is not set
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-# end of DOS/FAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-# CONFIG_PROC_KCORE is not set
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PROC_CHILDREN is not set
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
-CONFIG_CONFIGFS_FS=m
-CONFIG_EFIVAR_FS=m
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ORANGEFS_FS is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-# CONFIG_UBIFS_FS is not set
-CONFIG_CRAMFS=m
-# CONFIG_CRAMFS_BLOCKDEV is not set
-# CONFIG_CRAMFS_MTD is not set
-CONFIG_SQUASHFS=m
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZSTD is not set
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-CONFIG_ROMFS_FS=m
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
-# CONFIG_ROMFS_BACKED_BY_MTD is not set
-# CONFIG_ROMFS_BACKED_BY_BOTH is not set
-CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_PSTORE=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=y
-# CONFIG_PSTORE_LZO_COMPRESS is not set
-# CONFIG_PSTORE_LZ4_COMPRESS is not set
-# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
-# CONFIG_PSTORE_842_COMPRESS is not set
-# CONFIG_PSTORE_ZSTD_COMPRESS is not set
-CONFIG_PSTORE_COMPRESS=y
-CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
-CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-CONFIG_PSTORE_RAM=m
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-# CONFIG_EROFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
-# CONFIG_NFS_V4_1_MIGRATION is not set
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_BLOCKLAYOUT=y
-CONFIG_NFSD_SCSILAYOUT=y
-CONFIG_NFSD_FLEXFILELAYOUT=y
-CONFIG_GRACE_PERIOD=m
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
-# CONFIG_SUNRPC_DEBUG is not set
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CEPH_FS_POSIX_ACL=y
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_UPCALL is not set
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_DEBUG=y
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_FSCACHE=y
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-# CONFIG_UNICODE is not set
-# end of File systems
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_KEYS_REQUEST_CACHE is not set
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_KEY_DH_OPERATIONS=y
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-# CONFIG_SECURITY is not set
-CONFIG_SECURITYFS=y
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_HARDENED_USERCOPY_FALLBACK=y
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
-# CONFIG_FORTIFY_SOURCE is not set
-# CONFIG_STATIC_USERMODEHELPER is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_KPP=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_SIMD=m
-CONFIG_CRYPTO_ENGINE=m
-
-#
-# Public-key cryptography
-#
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECC=m
-CONFIG_CRYPTO_ECDH=m
-# CONFIG_CRYPTO_ECRDSA is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128_SIMD=y
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CFB=m
-CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=m
-# CONFIG_CRYPTO_OFB is not set
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m
-CONFIG_CRYPTO_NHPOLY1305=m
-# CONFIG_CRYPTO_ADIANTUM is not set
-CONFIG_CRYPTO_ESSIV=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32=m
-# CONFIG_CRYPTO_XXHASH is not set
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_GHASH=y
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=y
-# CONFIG_CRYPTO_842 is not set
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-CONFIG_CRYPTO_ZSTD=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=y
-CONFIG_CRYPTO_DRBG_HMAC=y
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-CONFIG_CRYPTO_DRBG=y
-CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
-CONFIG_CRYPTO_HASH_INFO=y
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_SP_CCP=y
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
-CONFIG_CRYPTO_DEV_CPT=m
-CONFIG_CAVIUM_CPT=m
-# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
-# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
-# CONFIG_CRYPTO_DEV_QCE is not set
-CONFIG_CRYPTO_DEV_QCOM_RNG=m
-CONFIG_CRYPTO_DEV_VIRTIO=m
-# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
-# CONFIG_CRYPTO_DEV_CCREE is not set
-# CONFIG_CRYPTO_DEV_HISI_SEC is not set
-# CONFIG_CRYPTO_DEV_HISI_ZIP is not set
-CONFIG_ASYMMETRIC_KEY_TYPE=y
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-CONFIG_X509_CERTIFICATE_PARSER=y
-# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set
-CONFIG_PKCS7_MESSAGE_PARSER=y
-# CONFIG_PKCS7_TEST_KEY is not set
-# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
-
-#
-# Certificates for signature checking
-#
-CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
-CONFIG_SECONDARY_TRUSTED_KEYRING=y
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-# end of Certificates for signature checking
-
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_RAID6_PQ_BENCHMARK=y
-# CONFIG_PACKING is not set
-CONFIG_BITREVERSE=y
-CONFIG_HAVE_ARCH_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_CORDIC=m
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
-# CONFIG_INDIRECT_PIO is not set
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=m
-# CONFIG_CRC4 is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_XXHASH=y
-CONFIG_AUDIT_GENERIC=y
-CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_COMPRESS=m
-CONFIG_ZSTD_DECOMPRESS=m
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_XARRAY_MULTI=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_DMA_DECLARE_COHERENT=y
-CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
-CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
-CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
-CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
-CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
-CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y
-CONFIG_SWIOTLB=y
-CONFIG_DMA_REMAP=y
-CONFIG_DMA_DIRECT_REMAP=y
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
-CONFIG_CLZ_TAB=y
-CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=y
-CONFIG_LIBFDT=y
-CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=y
-CONFIG_HAVE_GENERIC_VDSO=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_FONT_SUPPORT=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-CONFIG_SG_POOL=y
-CONFIG_SBITMAP=y
-# CONFIG_STRING_SELFTEST is not set
-# end of Library routines
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-# CONFIG_PRINTK_CALLER is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=3
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# end of printk and dmesg options
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1280
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_INSTALL is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# end of Compile-time checks and compiler options
-
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_MAGIC_SYSRQ_SERIAL=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_OWNER is not set
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_ARCH_KASAN=y
-CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
-CONFIG_CC_HAS_KASAN_GENERIC=y
-# CONFIG_KASAN is not set
-CONFIG_KASAN_STACK=1
-# end of Memory Debugging
-
-CONFIG_ARCH_HAS_KCOV=y
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
-CONFIG_DEBUG_SHIRQ=y
-
-#
-# Debug Lockups and Hangs
-#
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_SOFTLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-# CONFIG_WQ_WATCHDOG is not set
-# end of Debug Lockups and Hangs
-
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-CONFIG_SCHEDSTATS=y
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-# end of Lock Debugging (spinlocks, mutexes, etc...)
-
-CONFIG_STACKTRACE=y
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_HAVE_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# end of RCU Debugging
-
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-CONFIG_FUNCTION_ERROR_INJECTION=y
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_TRACING=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_PREEMPTIRQ_EVENTS is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_ENABLE_DEFAULT_TRACERS is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_KPROBE_EVENTS=y
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-# CONFIG_BPF_KPROBE_OVERRIDE is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_RUNTIME_TESTING_MENU is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_IO_STRICT_DEVMEM=y
-# CONFIG_ARM64_PTDUMP_DEBUGFS is not set
-# CONFIG_PID_IN_CONTEXTIDR is not set
-# CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
-# CONFIG_DEBUG_WX is not set
-# CONFIG_DEBUG_ALIGN_RODATA is not set
-# CONFIG_ARM64_RELOC_TEST is not set
-# CONFIG_CORESIGHT is not set
-# end of Kernel hacking
diff --git a/main/linux-lts/config-virt.armv7 b/main/linux-lts/config-virt.armv7
deleted file mode 100644
index 9bf15f6d9a3..00000000000
--- a/main/linux-lts/config-virt.armv7
+++ /dev/null
@@ -1,4693 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.4.23 Kernel Configuration
-#
-
-#
-# Compiler: gcc (Alpine 9.2.0) 9.2.0
-#
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-# CONFIG_HEADER_TEST is not set
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT=""
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_USELIB=y
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_HANDLE_DOMAIN_IRQ=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
-# end of IRQ subsystem
-
-CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_ARCH_HAS_TICK_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-# end of Timers subsystem
-
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-# CONFIG_IKCONFIG is not set
-# CONFIG_IKHEADERS is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-CONFIG_GENERIC_SCHED_CLOCK=y
-
-#
-# Scheduler features
-#
-# end of Scheduler features
-
-CONFIG_CGROUPS=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CPUSETS=y
-# CONFIG_PROC_PID_CPUSET is not set
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-# CONFIG_CHECKPOINT_RESTORE is not set
-CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_RELAY is not set
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_HAVE_UID16=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_MULTIUSER=y
-# CONFIG_SGETMASK_SYSCALL is not set
-# CONFIG_SYSFS_SYSCALL is not set
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_FHANDLE=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
-# CONFIG_USERFAULTFD is not set
-CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_PERF_USE_VMALLOC=y
-# CONFIG_PC104 is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_SLAB_FREELIST_RANDOM=y
-# CONFIG_SLAB_FREELIST_HARDENED is not set
-CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_SYSTEM_DATA_VERIFICATION=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-# end of General setup
-
-CONFIG_ARM=y
-CONFIG_ARM_HAS_SG_CHAIN=y
-CONFIG_ARM_DMA_USE_IOMMU=y
-CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_HAVE_PROC_CPU=y
-CONFIG_NO_IOPORT_MAP=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_GENERIC_BUG=y
-CONFIG_PGTABLE_LEVELS=2
-
-#
-# System Type
-#
-CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_BITS_MAX=16
-CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_S3C24XX is not set
-# CONFIG_ARCH_OMAP1 is not set
-
-#
-# Multiple platform selection
-#
-
-#
-# CPU Core family selection
-#
-# CONFIG_ARCH_MULTI_V6 is not set
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MULTI_V6_V7=y
-# end of Multiple platform selection
-
-# CONFIG_ARCH_VIRT is not set
-# CONFIG_ARCH_ACTIONS is not set
-CONFIG_ARCH_ALPINE=y
-# CONFIG_ARCH_ARTPEC is not set
-# CONFIG_ARCH_ASPEED is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BCM is not set
-# CONFIG_ARCH_BERLIN is not set
-# CONFIG_ARCH_DIGICOLOR is not set
-# CONFIG_ARCH_EXYNOS is not set
-# CONFIG_ARCH_HIGHBANK is not set
-CONFIG_ARCH_HISI=y
-
-#
-# Hisilicon platform type
-#
-# CONFIG_ARCH_HI3xxx is not set
-# CONFIG_ARCH_HIP01 is not set
-# CONFIG_ARCH_HIP04 is not set
-# CONFIG_ARCH_HIX5HD2 is not set
-# end of Hisilicon platform type
-
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_KEYSTONE is not set
-# CONFIG_ARCH_MEDIATEK is not set
-# CONFIG_ARCH_MESON is not set
-# CONFIG_ARCH_MILBEAUT is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_MVEBU is not set
-# CONFIG_ARCH_NPCM is not set
-
-#
-# TI OMAP/AM/DM/DRA Family
-#
-# CONFIG_ARCH_OMAP3 is not set
-# CONFIG_ARCH_OMAP4 is not set
-# CONFIG_SOC_OMAP5 is not set
-# CONFIG_SOC_AM33XX is not set
-# CONFIG_SOC_AM43XX is not set
-# CONFIG_SOC_DRA7XX is not set
-# end of TI OMAP/AM/DM/DRA Family
-
-# CONFIG_ARCH_SIRF is not set
-CONFIG_ARCH_QCOM=y
-# CONFIG_ARCH_MSM8X60 is not set
-# CONFIG_ARCH_MSM8960 is not set
-# CONFIG_ARCH_MSM8974 is not set
-# CONFIG_ARCH_MDM9615 is not set
-# CONFIG_ARCH_RDA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_S5PV210 is not set
-# CONFIG_ARCH_RENESAS is not set
-# CONFIG_ARCH_SOCFPGA is not set
-# CONFIG_PLAT_SPEAR is not set
-# CONFIG_ARCH_STI is not set
-# CONFIG_ARCH_STM32 is not set
-# CONFIG_ARCH_SUNXI is not set
-# CONFIG_ARCH_TANGO is not set
-# CONFIG_ARCH_TEGRA is not set
-# CONFIG_ARCH_UNIPHIER is not set
-# CONFIG_ARCH_U8500 is not set
-CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
-# CONFIG_ARCH_VEXPRESS_SPC is not set
-# CONFIG_ARCH_WM8850 is not set
-# CONFIG_ARCH_ZX is not set
-# CONFIG_ARCH_ZYNQ is not set
-CONFIG_PLAT_VERSATILE=y
-
-#
-# Processor Type
-#
-CONFIG_CPU_V7=y
-CONFIG_CPU_THUMB_CAPABLE=y
-CONFIG_CPU_32v6K=y
-CONFIG_CPU_32v7=y
-CONFIG_CPU_ABRT_EV7=y
-CONFIG_CPU_PABRT_V7=y
-CONFIG_CPU_CACHE_V7=y
-CONFIG_CPU_CACHE_VIPT=y
-CONFIG_CPU_COPY_V6=y
-CONFIG_CPU_TLB_V7=y
-CONFIG_CPU_HAS_ASID=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-
-#
-# Processor Features
-#
-# CONFIG_ARM_LPAE is not set
-CONFIG_ARM_THUMB=y
-# CONFIG_ARM_THUMBEE is not set
-CONFIG_ARM_VIRT_EXT=y
-CONFIG_SWP_EMULATE=y
-# CONFIG_CPU_BIG_ENDIAN is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
-# CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND is not set
-# CONFIG_CPU_BPREDICT_DISABLE is not set
-CONFIG_CPU_SPECTRE=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_VDSO=y
-CONFIG_OUTER_CACHE=y
-CONFIG_OUTER_CACHE_SYNC=y
-CONFIG_MIGHT_HAVE_CACHE_L2X0=y
-CONFIG_CACHE_L2X0=y
-# CONFIG_CACHE_L2X0_PMU is not set
-# CONFIG_PL310_ERRATA_588369 is not set
-# CONFIG_PL310_ERRATA_727915 is not set
-CONFIG_PL310_ERRATA_753970=y
-# CONFIG_PL310_ERRATA_769419 is not set
-CONFIG_ARM_L1_CACHE_SHIFT_6=y
-CONFIG_ARM_L1_CACHE_SHIFT=6
-CONFIG_ARM_DMA_MEM_BUFFERABLE=y
-CONFIG_ARM_HEAVY_MB=y
-CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
-# CONFIG_DEBUG_ALIGN_RODATA is not set
-# CONFIG_ARM_ERRATA_430973 is not set
-CONFIG_ARM_ERRATA_643719=y
-CONFIG_ARM_ERRATA_720789=y
-# CONFIG_ARM_ERRATA_754322 is not set
-# CONFIG_ARM_ERRATA_754327 is not set
-# CONFIG_ARM_ERRATA_764369 is not set
-# CONFIG_ARM_ERRATA_775420 is not set
-# CONFIG_ARM_ERRATA_798181 is not set
-# CONFIG_ARM_ERRATA_773022 is not set
-# CONFIG_ARM_ERRATA_818325_852422 is not set
-# CONFIG_ARM_ERRATA_821420 is not set
-# CONFIG_ARM_ERRATA_825619 is not set
-# CONFIG_ARM_ERRATA_857271 is not set
-# CONFIG_ARM_ERRATA_852421 is not set
-# CONFIG_ARM_ERRATA_852423 is not set
-# CONFIG_ARM_ERRATA_857272 is not set
-# end of System Type
-
-#
-# Bus support
-#
-# CONFIG_ARM_ERRATA_814220 is not set
-# end of Bus support
-
-#
-# Kernel Features
-#
-CONFIG_HAVE_SMP=y
-CONFIG_SMP=y
-CONFIG_SMP_ON_UP=y
-CONFIG_ARM_CPU_TOPOLOGY=y
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_SMT=y
-CONFIG_HAVE_ARM_SCU=y
-CONFIG_HAVE_ARM_ARCH_TIMER=y
-CONFIG_HAVE_ARM_TWD=y
-# CONFIG_MCPM is not set
-# CONFIG_BIG_LITTLE is not set
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_3G_OPT is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_NR_CPUS=32
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_ARM_PSCI is not set
-CONFIG_ARCH_NR_GPIO=0
-CONFIG_HZ_FIXED=0
-CONFIG_HZ_100=y
-# CONFIG_HZ_200 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_500 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=100
-CONFIG_SCHED_HRTICK=y
-# CONFIG_THUMB2_KERNEL is not set
-CONFIG_ARM_PATCH_IDIV=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_HAVE_ARCH_PFN_VALID=y
-# CONFIG_HIGHMEM is not set
-CONFIG_CPU_SW_DOMAIN_PAN=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ARM_MODULE_PLTS=y
-CONFIG_FORCE_MAX_ZONEORDER=11
-CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_UACCESS_WITH_MEMCPY is not set
-CONFIG_SECCOMP=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-# CONFIG_XEN is not set
-# end of Kernel Features
-
-#
-# Boot options
-#
-CONFIG_USE_OF=y
-CONFIG_ATAGS=y
-# CONFIG_DEPRECATED_PARAM_STRUCT is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-# CONFIG_ARM_APPENDED_DTB is not set
-CONFIG_CMDLINE=""
-# CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_AUTO_ZRELADDR=y
-CONFIG_EFI_STUB=y
-CONFIG_EFI=y
-CONFIG_DMI=y
-# end of Boot options
-
-#
-# CPU Power Management
-#
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
-
-#
-# CPU frequency scaling drivers
-#
-# CONFIG_CPUFREQ_DT is not set
-# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
-# CONFIG_ARM_QCOM_CPUFREQ_HW is not set
-# CONFIG_QORIQ_CPUFREQ is not set
-# end of CPU Frequency scaling
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
-CONFIG_DT_IDLE_STATES=y
-
-#
-# ARM CPU Idle Drivers
-#
-CONFIG_ARM_CPUIDLE=y
-# end of ARM CPU Idle Drivers
-# end of CPU Idle
-# end of CPU Power Management
-
-#
-# Floating point emulation
-#
-
-#
-# At least one emulation must be selected
-#
-# CONFIG_VFP is not set
-# end of Floating point emulation
-
-#
-# Power management options
-#
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-# CONFIG_APM_EMULATION is not set
-CONFIG_PM_CLK=y
-CONFIG_PM_GENERIC_DOMAINS=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_GENERIC_DOMAINS_OF=y
-CONFIG_CPU_PM=y
-# CONFIG_ENERGY_MODEL is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-# end of Power management options
-
-#
-# Firmware Drivers
-#
-# CONFIG_ARM_SCMI_PROTOCOL is not set
-CONFIG_ARM_SCPI_PROTOCOL=m
-CONFIG_ARM_SCPI_POWER_DOMAIN=m
-# CONFIG_FIRMWARE_MEMMAP is not set
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=m
-CONFIG_QCOM_SCM=y
-CONFIG_QCOM_SCM_32=y
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
-# CONFIG_TRUSTED_FOUNDATIONS is not set
-CONFIG_HAVE_ARM_SMCCC=y
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-CONFIG_EFI_PARAMS_FROM_FDT=y
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_ARMSTUB=y
-CONFIG_EFI_ARMSTUB_DTB_LOADER=y
-# CONFIG_EFI_BOOTLOADER_CONTROL is not set
-# CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_TEST is not set
-# CONFIG_RESET_ATTACK_MITIGATION is not set
-# end of EFI (Extensible Firmware Interface) Support
-
-#
-# Tegra firmware driver
-#
-# end of Tegra firmware driver
-# end of Firmware Drivers
-
-CONFIG_ARM_CRYPTO=y
-CONFIG_CRYPTO_SHA1_ARM=m
-CONFIG_CRYPTO_SHA256_ARM=m
-CONFIG_CRYPTO_SHA512_ARM=m
-CONFIG_CRYPTO_AES_ARM=m
-CONFIG_VIRTUALIZATION=y
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_VSOCK=m
-CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-
-#
-# General architecture-dependent options
-#
-# CONFIG_OPROFILE is not set
-CONFIG_HAVE_OPROFILE=y
-CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_OPTPROBES=y
-CONFIG_UPROBES=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_KRETPROBES=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_HAS_KEEPINITRD=y
-CONFIG_ARCH_HAS_SET_MEMORY=y
-CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
-CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=8
-CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_OLD_SIGACTION=y
-CONFIG_64BIT_TIME=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
-CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
-CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_ARCH_HAS_PHYS_TO_DMA=y
-CONFIG_REFCOUNT_FULL=y
-# CONFIG_LOCK_EVENT_COUNTS is not set
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# end of GCOV-based kernel profiling
-
-CONFIG_PLUGIN_HOSTCC=""
-CONFIG_HAVE_GCC_PLUGINS=y
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULE_SIG_FORMAT=y
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULE_SIG=y
-# CONFIG_MODULE_SIG_FORCE is not set
-CONFIG_MODULE_SIG_ALL=y
-CONFIG_MODULE_SIG_SHA1=y
-# CONFIG_MODULE_SIG_SHA224 is not set
-# CONFIG_MODULE_SIG_SHA256 is not set
-# CONFIG_MODULE_SIG_SHA384 is not set
-# CONFIG_MODULE_SIG_SHA512 is not set
-CONFIG_MODULE_SIG_HASH="sha1"
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-# CONFIG_BLK_DEV_ZONED is not set
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
-# CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_WBT is not set
-# CONFIG_BLK_CGROUP_IOLATENCY is not set
-# CONFIG_BLK_CGROUP_IOCOST is not set
-CONFIG_BLK_DEBUG_FS=y
-# CONFIG_BLK_SED_OPAL is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AIX_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_CMDLINE_PARTITION is not set
-# end of Partition Types
-
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_PM=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-# CONFIG_IOSCHED_BFQ is not set
-# end of IO Schedulers
-
-CONFIG_PADATA=y
-CONFIG_ASN1=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_FREEZER=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_ELF_FDPIC is not set
-CONFIG_ELFCORE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_ARCH_HAS_BINFMT_FLAT=y
-# CONFIG_BINFMT_FLAT is not set
-CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_CLEANCACHE=y
-CONFIG_FRONTSWAP=y
-# CONFIG_CMA is not set
-# CONFIG_ZSWAP is not set
-CONFIG_ZPOOL=m
-# CONFIG_ZBUD is not set
-CONFIG_Z3FOLD=m
-CONFIG_ZSMALLOC=y
-# CONFIG_PGTABLE_MAPPING is not set
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-# CONFIG_IDLE_PAGE_TRACKING is not set
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_EGRESS=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=m
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-CONFIG_UNIX_DIAG=m
-# CONFIG_TLS is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-CONFIG_XFRM_INTERFACE=m
-CONFIG_XFRM_SUB_POLICY=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_XDP_SOCKETS=y
-# CONFIG_XDP_SOCKETS_DIAG is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE_COMMON=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-# CONFIG_IP_PIMSM_V1 is not set
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-CONFIG_NET_FOU_IP_TUNNELS=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-# CONFIG_INET_ESP_OFFLOAD is not set
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-# CONFIG_INET_RAW_DIAG is not set
-# CONFIG_INET_DIAG_DESTROY is not set
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_NV=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_TCP_CONG_DCTCP=m
-CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-# CONFIG_INET6_ESP_OFFLOAD is not set
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_FOU=m
-CONFIG_IPV6_FOU_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NET_PTP_CLASSIFY=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_FAMILY_BRIDGE=y
-CONFIG_NETFILTER_FAMILY_ARP=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK_OSF=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-# CONFIG_NF_LOG_NETDEV is not set
-CONFIG_NETFILTER_CONNCOUNT=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_PROCFS=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=y
-CONFIG_NF_NAT_MASQUERADE=y
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_SET=m
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_NUMGEN=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_FLOW_OFFLOAD=m
-CONFIG_NFT_COUNTER=m
-CONFIG_NFT_CONNLIMIT=m
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-CONFIG_NFT_TUNNEL=m
-CONFIG_NFT_OBJREF=m
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_FIB=m
-CONFIG_NFT_FIB_INET=m
-# CONFIG_NFT_XFRM is not set
-CONFIG_NFT_SOCKET=m
-CONFIG_NFT_OSF=m
-CONFIG_NFT_TPROXY=m
-# CONFIG_NFT_SYNPROXY is not set
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_FIB_NETDEV=m
-CONFIG_NF_FLOW_TABLE_INET=m
-CONFIG_NF_FLOW_TABLE=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-# end of Core Netfilter Configuration
-
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_MH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS MH scheduler
-#
-CONFIG_IP_VS_MH_TAB_INDEX=12
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_SOCKET_IPV4=m
-CONFIG_NF_TPROXY_IPV4=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_FLOW_TABLE_IPV4=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# end of IP: Netfilter Configuration
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_SOCKET_IPV6=m
-CONFIG_NF_TPROXY_IPV6=m
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_FIB_IPV6=m
-CONFIG_NF_FLOW_TABLE_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_SRH=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-# end of IPv6: Netfilter Configuration
-
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_TABLES_BRIDGE=m
-# CONFIG_NFT_BRIDGE_META is not set
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-# CONFIG_BPFILTER is not set
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-# end of DCCP CCIDs Configuration
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-# end of DCCP Kernel Hacking
-
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-CONFIG_INET_SCTP_DIAG=m
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-CONFIG_L2TP=m
-# CONFIG_L2TP_DEBUGFS is not set
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_GARP=m
-CONFIG_MRP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_HAVE_NET_DSA=y
-# CONFIG_NET_DSA is not set
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_PHONET is not set
-# CONFIG_6LOWPAN is not set
-# CONFIG_IEEE802154 is not set
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_CBS=m
-CONFIG_NET_SCH_ETF=m
-# CONFIG_NET_SCH_TAPRIO is not set
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-CONFIG_NET_SCH_SKBPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_CAKE=m
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-# CONFIG_NET_SCH_DEFAULT is not set
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_MATCHALL=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_IPT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-# CONFIG_NET_ACT_SAMPLE is not set
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-# CONFIG_NET_ACT_MPLS is not set
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_ACT_CTINFO is not set
-CONFIG_NET_ACT_SKBMOD=m
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_TUNNEL_KEY=m
-# CONFIG_NET_ACT_CT is not set
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IFE_SKBTCINDEX=m
-# CONFIG_NET_TC_SKB_EXT is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=m
-# CONFIG_BATMAN_ADV is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
-CONFIG_VSOCKETS_DIAG=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
-CONFIG_NETLINK_DIAG=m
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_NET_NSH=m
-# CONFIG_HSR is not set
-# CONFIG_NET_SWITCHDEV is not set
-CONFIG_NET_L3_MASTER_DEV=y
-# CONFIG_QRTR is not set
-# CONFIG_NET_NCSI is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-# CONFIG_BPF_STREAM_PARSER is not set
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-# CONFIG_NET_DROP_MONITOR is not set
-# end of Network testing
-# end of Networking options
-
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AF_KCM is not set
-CONFIG_FIB_RULES=y
-# CONFIG_WIRELESS is not set
-# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
-# CONFIG_NET_9P is not set
-# CONFIG_CAIF is not set
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
-# CONFIG_NFC is not set
-# CONFIG_PSAMPLE is not set
-CONFIG_NET_IFE=m
-CONFIG_LWTUNNEL=y
-CONFIG_LWTUNNEL_BPF=y
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-CONFIG_FAILOVER=m
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-CONFIG_ARM_AMBA=y
-CONFIG_HAVE_PCI=y
-CONFIG_FORCE_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_DOMAINS_GENERIC=y
-CONFIG_PCI_SYSCALL=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-# CONFIG_PCIEAER is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-# CONFIG_PCIE_PTM is not set
-# CONFIG_PCIE_BW is not set
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-CONFIG_PCI_STUB=m
-CONFIG_PCI_PF_STUB=m
-CONFIG_PCI_ATS=y
-CONFIG_PCI_ECAM=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_LABEL=y
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-# CONFIG_HOTPLUG_PCI_SHPC is not set
-
-#
-# PCI controller drivers
-#
-
-#
-# Cadence PCIe controllers support
-#
-# CONFIG_PCIE_CADENCE_HOST is not set
-# end of Cadence PCIe controllers support
-
-# CONFIG_PCI_FTPCI100 is not set
-CONFIG_PCI_HOST_COMMON=y
-CONFIG_PCI_HOST_GENERIC=y
-# CONFIG_PCIE_XILINX is not set
-# CONFIG_PCI_V3_SEMI is not set
-# CONFIG_PCIE_ALTERA is not set
-
-#
-# DesignWare PCI Core Support
-#
-# CONFIG_PCIE_DW_PLAT_HOST is not set
-# CONFIG_PCI_LAYERSCAPE is not set
-# CONFIG_PCIE_QCOM is not set
-# CONFIG_PCIE_HISI_STB is not set
-# CONFIG_PCI_MESON is not set
-# end of DesignWare PCI Core Support
-# end of PCI controller drivers
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-# end of PCI Endpoint
-
-#
-# PCI switch controller drivers
-#
-# CONFIG_PCI_SW_SWITCHTEC is not set
-# end of PCI switch controller drivers
-
-# CONFIG_PCCARD is not set
-# CONFIG_RAPIDIO is not set
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=m
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_FW_LOADER_USER_HELPER=y
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
-# end of Firmware loader
-
-CONFIG_ALLOW_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_MMIO=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
-CONFIG_GENERIC_ARCH_TOPOLOGY=y
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-# CONFIG_BRCMSTB_GISB_ARB is not set
-CONFIG_QCOM_EBI2=y
-# CONFIG_SIMPLE_PM_BUS is not set
-CONFIG_VEXPRESS_CONFIG=y
-# end of Bus devices
-
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-# CONFIG_GNSS is not set
-CONFIG_MTD=m
-# CONFIG_MTD_TESTS is not set
-
-#
-# Partition parsers
-#
-# CONFIG_MTD_AR7_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_OF_PARTS=m
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# end of Partition parsers
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-# CONFIG_SM_FTL is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_SWAP is not set
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_GEN_PROBE=m
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-CONFIG_MTD_CFI_UTIL=m
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-# end of RAM/ROM/Flash chip drivers
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_PHYSMAP=m
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP_OF is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-# CONFIG_MTD_PLATRAM is not set
-# end of Mapping drivers for chip access
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOCG3 is not set
-# end of Self-contained MTD device drivers
-
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_RAW_NAND is not set
-
-#
-# LPDDR & LPDDR2 PCM memory drivers
-#
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_LPDDR2_NVM is not set
-# end of LPDDR & LPDDR2 PCM memory drivers
-
-CONFIG_MTD_UBI=m
-CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_LIMIT=20
-# CONFIG_MTD_UBI_FASTMAP is not set
-# CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_BLOCK is not set
-# CONFIG_MTD_HYPERBUS is not set
-CONFIG_DTC=y
-CONFIG_OF=y
-# CONFIG_OF_UNITTEST is not set
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_DYNAMIC=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
-CONFIG_OF_MDIO=m
-CONFIG_OF_RESERVED_MEM=y
-CONFIG_OF_RESOLVE=y
-CONFIG_OF_OVERLAY=y
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-# CONFIG_PARPORT is not set
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_NULL_BLK is not set
-CONFIG_CDROM=m
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_WRITEBACK is not set
-# CONFIG_ZRAM_MEMORY_TRACKING is not set
-# CONFIG_BLK_DEV_UMEM is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-CONFIG_VIRTIO_BLK=m
-# CONFIG_VIRTIO_BLK_SCSI is not set
-CONFIG_BLK_DEV_RBD=m
-# CONFIG_BLK_DEV_RSXX is not set
-
-#
-# NVME Support
-#
-CONFIG_NVME_CORE=m
-CONFIG_BLK_DEV_NVME=m
-CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_FABRICS=m
-# CONFIG_NVME_FC is not set
-# CONFIG_NVME_TCP is not set
-CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_LOOP=m
-# CONFIG_NVME_TARGET_FC is not set
-# CONFIG_NVME_TARGET_TCP is not set
-# end of NVME Support
-
-#
-# Misc devices
-#
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_QCOM_FASTRPC is not set
-# CONFIG_APDS9802ALS is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISL29020 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_BH1770 is not set
-# CONFIG_SENSORS_APDS990X is not set
-# CONFIG_HMC6352 is not set
-# CONFIG_DS1682 is not set
-# CONFIG_SRAM is not set
-CONFIG_VEXPRESS_SYSCFG=y
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_XILINX_SDFEC is not set
-CONFIG_PVPANIC=m
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_IDT_89HPESX is not set
-# CONFIG_EEPROM_EE1004 is not set
-# end of EEPROM support
-
-# CONFIG_CB710_CORE is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_TI_ST is not set
-# end of Texas Instruments shared transport line discipline
-
-# CONFIG_SENSORS_LIS3_I2C is not set
-
-#
-# Altera FPGA firmware download module (requires I2C)
-#
-# CONFIG_ALTERA_STAPL is not set
-
-#
-# Intel MIC & related support
-#
-
-#
-# Intel MIC Bus Driver
-#
-
-#
-# SCIF Bus Driver
-#
-
-#
-# VOP Bus Driver
-#
-# CONFIG_VOP_BUS is not set
-
-#
-# Intel MIC Host Driver
-#
-
-#
-# Intel MIC Card Driver
-#
-
-#
-# SCIF Driver
-#
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-
-#
-# VOP Driver
-#
-# end of Intel MIC & related support
-
-# CONFIG_ECHO is not set
-# CONFIG_MISC_ALCOR_PCI is not set
-# CONFIG_MISC_RTSX_PCI is not set
-# CONFIG_MISC_RTSX_USB is not set
-# CONFIG_HABANA_AI is not set
-# end of Misc devices
-
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=m
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-# CONFIG_CHR_DEV_ST is not set
-CONFIG_BLK_DEV_SR=m
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_SCAN_ASYNC=y
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-# end of SCSI Transports
-
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-# CONFIG_ISCSI_BOOT_SYSFS is not set
-# CONFIG_SCSI_CXGB3_ISCSI is not set
-# CONFIG_SCSI_CXGB4_ISCSI is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_BE2ISCSI is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_HPSA is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVUMI is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_ESAS2R is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_MPT3SAS is not set
-# CONFIG_SCSI_MPT2SAS is not set
-# CONFIG_SCSI_SMARTPQI is not set
-# CONFIG_SCSI_UFSHCD is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_MYRB is not set
-# CONFIG_SCSI_MYRS is not set
-# CONFIG_LIBFC is not set
-# CONFIG_SCSI_SNIC is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_FDOMAIN_PCI is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_AM53C974 is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_WD719X is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_PMCRAID is not set
-# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_BFA_FC is not set
-CONFIG_SCSI_VIRTIO=m
-# CONFIG_SCSI_CHELSIO_FCOE is not set
-# CONFIG_SCSI_DH is not set
-# end of SCSI device support
-
-CONFIG_HAVE_PATA_PLATFORM=y
-CONFIG_ATA=m
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_MOBILE_LPM_POLICY=0
-# CONFIG_SATA_AHCI_PLATFORM is not set
-# CONFIG_AHCI_CEVA is not set
-# CONFIG_AHCI_QORIQ is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_ACARD_AHCI is not set
-# CONFIG_SATA_SIL24 is not set
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-# CONFIG_PDC_ADMA is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SX4 is not set
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=m
-# CONFIG_SATA_DWC is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-
-#
-# PATA SFF controllers with BMDMA
-#
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_ATP867X is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TOSHIBA is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-
-#
-# PIO-only SFF controllers
-#
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_RZ1000 is not set
-
-#
-# Generic fallback / legacy drivers
-#
-CONFIG_ATA_GENERIC=m
-# CONFIG_PATA_LEGACY is not set
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-# CONFIG_MD_AUTODETECT is not set
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_MD_CLUSTER=m
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_UNSTRIPED=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_WRITECACHE=m
-CONFIG_DM_ERA=m
-# CONFIG_DM_CLONE is not set
-CONFIG_DM_MIRROR=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-# CONFIG_DM_DUST is not set
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
-CONFIG_DM_VERITY_FEC=y
-CONFIG_DM_SWITCH=m
-CONFIG_DM_LOG_WRITES=m
-CONFIG_DM_INTEGRITY=m
-CONFIG_TARGET_CORE=m
-# CONFIG_TCM_IBLOCK is not set
-# CONFIG_TCM_FILEIO is not set
-# CONFIG_TCM_PSCSI is not set
-# CONFIG_LOOPBACK_TARGET is not set
-# CONFIG_ISCSI_TARGET is not set
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_NOSY is not set
-# end of IEEE 1394 (FireWire) support
-
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-# CONFIG_EQUALIZER is not set
-# CONFIG_NET_FC is not set
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=m
-CONFIG_IPVTAP=m
-CONFIG_VXLAN=m
-CONFIG_GENEVE=m
-# CONFIG_GTP is not set
-CONFIG_MACSEC=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_TUN=m
-CONFIG_TAP=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_NET_VRF=m
-# CONFIG_VSOCKMON is not set
-# CONFIG_ARCNET is not set
-
-#
-# CAIF transport drivers
-#
-
-#
-# Distributed Switch Architecture drivers
-#
-# end of Distributed Switch Architecture drivers
-
-CONFIG_ETHERNET=y
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
-# CONFIG_NET_VENDOR_AGERE is not set
-# CONFIG_NET_VENDOR_ALACRITECH is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
-# CONFIG_ALTERA_TSE is not set
-CONFIG_NET_VENDOR_AMAZON=y
-# CONFIG_ENA_ETHERNET is not set
-# CONFIG_NET_VENDOR_AMD is not set
-# CONFIG_NET_VENDOR_AQUANTIA is not set
-# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_VENDOR_AURORA is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
-# CONFIG_NET_VENDOR_CADENCE is not set
-# CONFIG_NET_VENDOR_CAVIUM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CIRRUS is not set
-# CONFIG_NET_VENDOR_CISCO is not set
-# CONFIG_NET_VENDOR_CORTINA is not set
-# CONFIG_DM9000 is not set
-# CONFIG_DNET is not set
-# CONFIG_NET_VENDOR_DEC is not set
-# CONFIG_NET_VENDOR_DLINK is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
-# CONFIG_NET_VENDOR_EZCHIP is not set
-# CONFIG_NET_VENDOR_FARADAY is not set
-CONFIG_NET_VENDOR_GOOGLE=y
-# CONFIG_GVE is not set
-# CONFIG_NET_VENDOR_HISILICON is not set
-# CONFIG_NET_VENDOR_HP is not set
-# CONFIG_NET_VENDOR_HUAWEI is not set
-# CONFIG_NET_VENDOR_I825XX is not set
-CONFIG_NET_VENDOR_INTEL=y
-# CONFIG_E100 is not set
-CONFIG_E1000=m
-# CONFIG_E1000E is not set
-# CONFIG_IGB is not set
-# CONFIG_IGBVF is not set
-# CONFIG_IXGB is not set
-# CONFIG_IXGBE is not set
-CONFIG_IXGBEVF=m
-# CONFIG_I40E is not set
-# CONFIG_I40EVF is not set
-# CONFIG_ICE is not set
-# CONFIG_FM10K is not set
-# CONFIG_IGC is not set
-# CONFIG_JME is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-CONFIG_NET_VENDOR_MICROCHIP=y
-# CONFIG_LAN743X is not set
-# CONFIG_NET_VENDOR_MICROSEMI is not set
-# CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_NETERION is not set
-# CONFIG_NET_VENDOR_NETRONOME is not set
-# CONFIG_NET_VENDOR_NI is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
-# CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_ETHOC is not set
-# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
-CONFIG_NET_VENDOR_PENSANDO=y
-# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_QUALCOMM is not set
-# CONFIG_NET_VENDOR_RDC is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
-# CONFIG_NET_VENDOR_RENESAS is not set
-# CONFIG_NET_VENDOR_ROCKER is not set
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SOLARFLARE is not set
-# CONFIG_NET_VENDOR_SILAN is not set
-# CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_SOCIONEXT is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SUN is not set
-# CONFIG_NET_VENDOR_SYNOPSYS is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_NET_VENDOR_TI is not set
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_NET_VENDOR_XILINX is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_MDIO_DEVICE=m
-CONFIG_MDIO_BUS=m
-# CONFIG_MDIO_BCM_UNIMAC is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
-# CONFIG_MDIO_HISI_FEMAC is not set
-# CONFIG_MDIO_MSCC_MIIM is not set
-CONFIG_PHYLIB=m
-CONFIG_SWPHY=y
-
-#
-# MII PHY device drivers
-#
-# CONFIG_ADIN_PHY is not set
-# CONFIG_AMD_PHY is not set
-# CONFIG_AQUANTIA_PHY is not set
-# CONFIG_AX88796B_PHY is not set
-# CONFIG_AT803X_PHY is not set
-# CONFIG_BCM7XXX_PHY is not set
-# CONFIG_BCM87XX_PHY is not set
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CORTINA_PHY is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DP83822_PHY is not set
-# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DP83848_PHY is not set
-# CONFIG_DP83867_PHY is not set
-CONFIG_FIXED_PHY=m
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_INTEL_XWAY_PHY is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MARVELL_10G_PHY is not set
-# CONFIG_MICREL_PHY is not set
-# CONFIG_MICROCHIP_PHY is not set
-# CONFIG_MICROCHIP_T1_PHY is not set
-# CONFIG_MICROSEMI_PHY is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NXP_TJA11XX_PHY is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_RENESAS_PHY is not set
-# CONFIG_ROCKCHIP_PHY is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_STE10XP is not set
-# CONFIG_TERANETICS_PHY is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_XILINX_GMII2RGMII is not set
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-# CONFIG_PPP_FILTER is not set
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPPOE is not set
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-CONFIG_SLIP_MODE_SLIP6=y
-
-#
-# Host-side USB support is needed for USB Network Adapter support
-#
-# CONFIG_USB_NET_DRIVERS is not set
-# CONFIG_WLAN is not set
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
-# CONFIG_WAN is not set
-CONFIG_VMXNET3=m
-# CONFIG_NETDEVSIM is not set
-CONFIG_NET_FAILOVER=m
-# CONFIG_ISDN is not set
-# CONFIG_NVM is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_MATRIXKMAP is not set
-
-#
-# Userland interfaces
-#
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-# CONFIG_RMI4_CORE is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=m
-# CONFIG_SERIO_AMBAKMI is not set
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_LIBPS2 is not set
-# CONFIG_SERIO_RAW is not set
-# CONFIG_SERIO_ALTERA_PS2 is not set
-# CONFIG_SERIO_PS2MULT is not set
-# CONFIG_SERIO_ARC_PS2 is not set
-# CONFIG_SERIO_APBPS2 is not set
-# CONFIG_SERIO_GPIO_PS2 is not set
-# CONFIG_USERIO is not set
-# CONFIG_GAMEPORT is not set
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_N_GSM is not set
-# CONFIG_TRACE_SINK is not set
-# CONFIG_NULL_TTY is not set
-# CONFIG_LDISC_AUTOLOAD is not set
-CONFIG_DEVMEM=y
-# CONFIG_DEVKMEM is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-# CONFIG_SERIAL_8250_FINTEK is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_EXAR=y
-CONFIG_SERIAL_8250_NR_UARTS=16
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-# CONFIG_SERIAL_8250_ASPEED_VUART is not set
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_8250_FSL=y
-# CONFIG_SERIAL_8250_DW is not set
-# CONFIG_SERIAL_8250_EM is not set
-# CONFIG_SERIAL_8250_RT288X is not set
-# CONFIG_SERIAL_OF_PLATFORM is not set
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_AMBA_PL010 is not set
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
-# CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_SERIAL_JSM is not set
-# CONFIG_SERIAL_MSM is not set
-# CONFIG_SERIAL_SIFIVE is not set
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
-# CONFIG_SERIAL_BCM63XX is not set
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
-# CONFIG_SERIAL_ARC is not set
-# CONFIG_SERIAL_RP2 is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_FSL_LINFLEXUART is not set
-# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
-# CONFIG_SERIAL_ST_ASC is not set
-# end of Serial drivers
-
-CONFIG_SERIAL_MCTRL_GPIO=y
-# CONFIG_SERIAL_DEV_BUS is not set
-# CONFIG_TTY_PRINTK is not set
-CONFIG_HVC_DRIVER=y
-# CONFIG_HVC_DCC is not set
-CONFIG_VIRTIO_CONSOLE=m
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_HW_RANDOM=m
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_HISI=m
-# CONFIG_APPLICOM is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_DEVPORT is not set
-# CONFIG_XILLYBUS is not set
-# end of Character devices
-
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
-# CONFIG_I2C_MUX_GPIO is not set
-# CONFIG_I2C_MUX_GPMUX is not set
-# CONFIG_I2C_MUX_LTC4306 is not set
-CONFIG_I2C_MUX_PCA9541=m
-CONFIG_I2C_MUX_PCA954x=m
-CONFIG_I2C_MUX_PINCTRL=m
-# CONFIG_I2C_MUX_REG is not set
-# CONFIG_I2C_DEMUX_PINCTRL is not set
-# CONFIG_I2C_MUX_MLXCPLD is not set
-# end of Multiplexer I2C Chip support
-
-# CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_SMBUS=m
-
-#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ALGOPCA=m
-# end of I2C Algorithms
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_HIX5HD2 is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C_PIIX4 is not set
-CONFIG_I2C_NFORCE2=m
-# CONFIG_I2C_NVIDIA_GPU is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_CBUS_GPIO is not set
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_DESIGNWARE_PCI is not set
-# CONFIG_I2C_EMEV2 is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_NOMADIK is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_QUP is not set
-# CONFIG_I2C_RK3X is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_VERSATILE is not set
-# CONFIG_I2C_XILINX is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-# CONFIG_I2C_DIOLAN_U2C is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-
-#
-# Other I2C/SMBus bus drivers
-#
-# end of I2C Hardware Bus support
-
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_SLAVE is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# end of I2C support
-
-# CONFIG_I3C is not set
-# CONFIG_SPI is not set
-# CONFIG_SPMI is not set
-# CONFIG_HSI is not set
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-# CONFIG_PPS_CLIENT_LDISC is not set
-# CONFIG_PPS_CLIENT_GPIO is not set
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=m
-CONFIG_DP83640_PHY=m
-# end of PTP clock support
-
-CONFIG_PINCTRL=y
-# CONFIG_DEBUG_PINCTRL is not set
-# CONFIG_PINCTRL_AMD is not set
-# CONFIG_PINCTRL_MCP23S08 is not set
-# CONFIG_PINCTRL_SINGLE is not set
-# CONFIG_PINCTRL_STMFX is not set
-# CONFIG_PINCTRL_OCELOT is not set
-# CONFIG_PINCTRL_APQ8064 is not set
-# CONFIG_PINCTRL_APQ8084 is not set
-# CONFIG_PINCTRL_IPQ4019 is not set
-# CONFIG_PINCTRL_IPQ8064 is not set
-# CONFIG_PINCTRL_IPQ8074 is not set
-# CONFIG_PINCTRL_MSM8660 is not set
-# CONFIG_PINCTRL_MSM8960 is not set
-# CONFIG_PINCTRL_MDM9615 is not set
-# CONFIG_PINCTRL_MSM8X74 is not set
-# CONFIG_PINCTRL_MSM8916 is not set
-# CONFIG_PINCTRL_MSM8994 is not set
-# CONFIG_PINCTRL_MSM8996 is not set
-# CONFIG_PINCTRL_MSM8998 is not set
-# CONFIG_PINCTRL_QCS404 is not set
-# CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
-# CONFIG_PINCTRL_SC7180 is not set
-# CONFIG_PINCTRL_SDM660 is not set
-# CONFIG_PINCTRL_SDM845 is not set
-# CONFIG_PINCTRL_SM8150 is not set
-CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIOLIB_FASTPATH_LIMIT=512
-CONFIG_OF_GPIO=y
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_GPIO_SYSFS is not set
-CONFIG_GPIO_GENERIC=y
-
-#
-# Memory mapped GPIO drivers
-#
-# CONFIG_GPIO_74XX_MMIO is not set
-# CONFIG_GPIO_ALTERA is not set
-# CONFIG_GPIO_CADENCE is not set
-# CONFIG_GPIO_DWAPB is not set
-# CONFIG_GPIO_EXAR is not set
-# CONFIG_GPIO_FTGPIO010 is not set
-CONFIG_GPIO_GENERIC_PLATFORM=y
-# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_HLWD is not set
-# CONFIG_GPIO_MB86S7X is not set
-# CONFIG_GPIO_MPC8XXX is not set
-# CONFIG_GPIO_PL061 is not set
-# CONFIG_GPIO_SAMA5D2_PIOBU is not set
-# CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GPIO_ZEVIO is not set
-# CONFIG_GPIO_AMD_FCH is not set
-# end of Memory mapped GPIO drivers
-
-#
-# I2C GPIO expanders
-#
-# CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_ADNP is not set
-# CONFIG_GPIO_GW_PLD is not set
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_TPIC2810 is not set
-# end of I2C GPIO expanders
-
-#
-# MFD GPIO expanders
-#
-# CONFIG_HTC_EGPIO is not set
-# end of MFD GPIO expanders
-
-#
-# PCI GPIO expanders
-#
-# CONFIG_GPIO_BT8XX is not set
-# CONFIG_GPIO_PCI_IDIO_16 is not set
-# CONFIG_GPIO_PCIE_IDIO_24 is not set
-# CONFIG_GPIO_RDC321X is not set
-# end of PCI GPIO expanders
-
-#
-# USB GPIO expanders
-#
-# end of USB GPIO expanders
-
-# CONFIG_GPIO_MOCKUP is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_AVS is not set
-CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_BRCMKONA is not set
-# CONFIG_POWER_RESET_BRCMSTB is not set
-# CONFIG_POWER_RESET_GPIO is not set
-# CONFIG_POWER_RESET_GPIO_RESTART is not set
-CONFIG_POWER_RESET_HISI=y
-# CONFIG_POWER_RESET_MSM is not set
-# CONFIG_POWER_RESET_LTC2952 is not set
-# CONFIG_POWER_RESET_RESTART is not set
-# CONFIG_POWER_RESET_VERSATILE is not set
-CONFIG_POWER_RESET_VEXPRESS=y
-# CONFIG_POWER_RESET_SYSCON is not set
-# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
-# CONFIG_SYSCON_REBOOT_MODE is not set
-# CONFIG_NVMEM_REBOOT_MODE is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-# CONFIG_PDA_POWER is not set
-# CONFIG_TEST_POWER is not set
-# CONFIG_CHARGER_ADP5061 is not set
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_CHARGER_SBS is not set
-# CONFIG_MANAGER_SBS is not set
-# CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# CONFIG_CHARGER_GPIO is not set
-# CONFIG_CHARGER_LT3651 is not set
-# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
-# CONFIG_CHARGER_BQ2415X is not set
-# CONFIG_CHARGER_BQ24735 is not set
-# CONFIG_CHARGER_BQ25890 is not set
-# CONFIG_CHARGER_SMB347 is not set
-# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_CHARGER_RT9455 is not set
-CONFIG_HWMON=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADT7410 is not set
-# CONFIG_SENSORS_ADT7411 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_AS370 is not set
-# CONFIG_SENSORS_ASC7621 is not set
-# CONFIG_SENSORS_ARM_SCPI is not set
-# CONFIG_SENSORS_ASPEED is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_DS620 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_G762 is not set
-# CONFIG_SENSORS_GPIO_FAN is not set
-# CONFIG_SENSORS_HIH6130 is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_JC42 is not set
-# CONFIG_SENSORS_POWR1220 is not set
-# CONFIG_SENSORS_LINEAGE is not set
-# CONFIG_SENSORS_LTC2945 is not set
-# CONFIG_SENSORS_LTC2990 is not set
-# CONFIG_SENSORS_LTC4151 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4222 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_LTC4260 is not set
-# CONFIG_SENSORS_LTC4261 is not set
-# CONFIG_SENSORS_MAX16065 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX1668 is not set
-# CONFIG_SENSORS_MAX197 is not set
-# CONFIG_SENSORS_MAX6621 is not set
-# CONFIG_SENSORS_MAX6639 is not set
-# CONFIG_SENSORS_MAX6642 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6697 is not set
-# CONFIG_SENSORS_MAX31790 is not set
-# CONFIG_SENSORS_MCP3021 is not set
-# CONFIG_SENSORS_TC654 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
-# CONFIG_SENSORS_LM95234 is not set
-# CONFIG_SENSORS_LM95241 is not set
-# CONFIG_SENSORS_LM95245 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_NTC_THERMISTOR is not set
-# CONFIG_SENSORS_NCT6683 is not set
-# CONFIG_SENSORS_NCT6775 is not set
-# CONFIG_SENSORS_NCT7802 is not set
-# CONFIG_SENSORS_NCT7904 is not set
-# CONFIG_SENSORS_NPCM7XX is not set
-# CONFIG_SENSORS_OCC_P8_I2C is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_PMBUS is not set
-# CONFIG_SENSORS_PWM_FAN is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_SHT21 is not set
-# CONFIG_SENSORS_SHT3x is not set
-# CONFIG_SENSORS_SHTC1 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_EMC1403 is not set
-# CONFIG_SENSORS_EMC2103 is not set
-# CONFIG_SENSORS_EMC6W201 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_STTS751 is not set
-# CONFIG_SENSORS_SMM665 is not set
-# CONFIG_SENSORS_ADC128D818 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_AMC6821 is not set
-# CONFIG_SENSORS_INA209 is not set
-# CONFIG_SENSORS_INA2XX is not set
-# CONFIG_SENSORS_INA3221 is not set
-# CONFIG_SENSORS_TC74 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP102 is not set
-# CONFIG_SENSORS_TMP103 is not set
-# CONFIG_SENSORS_TMP108 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_VEXPRESS is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83773G is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83795 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
-CONFIG_THERMAL=y
-# CONFIG_THERMAL_STATISTICS is not set
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-# CONFIG_THERMAL_OF is not set
-# CONFIG_THERMAL_WRITABLE_TRIPS is not set
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
-# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
-CONFIG_THERMAL_GOV_STEP_WISE=y
-# CONFIG_THERMAL_GOV_BANG_BANG is not set
-# CONFIG_THERMAL_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
-# CONFIG_THERMAL_EMULATION is not set
-# CONFIG_THERMAL_MMIO is not set
-CONFIG_HISI_THERMAL=m
-
-#
-# Qualcomm thermal drivers
-#
-# end of Qualcomm thermal drivers
-
-# CONFIG_WATCHDOG is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB is not set
-CONFIG_BCMA_POSSIBLE=y
-# CONFIG_BCMA is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-# CONFIG_MFD_ACT8945A is not set
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
-# CONFIG_MFD_ATMEL_HLCDC is not set
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_MADERA is not set
-# CONFIG_MFD_ASIC3 is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-# CONFIG_MFD_HI6421_PMIC is not set
-# CONFIG_MFD_HI655X_PMIC is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_LPC_ICH is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77650 is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_MENF21BMC is not set
-# CONFIG_MFD_VIPERBOARD is not set
-# CONFIG_MFD_RETU is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_PM8XXX is not set
-# CONFIG_MFD_QCOM_RPM is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_RK808 is not set
-# CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_SKY81452 is not set
-# CONFIG_ABX500_CORE is not set
-CONFIG_MFD_SYSCON=y
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_TI_LMU is not set
-# CONFIG_TPS6105X is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TPS6507X is not set
-# CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_TPS65217 is not set
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TI_LP87565 is not set
-# CONFIG_MFD_TPS65218 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_WL1273_CORE is not set
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_T7L66XB is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
-# CONFIG_MFD_TQMX86 is not set
-# CONFIG_MFD_VX855 is not set
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MFD_STMFX is not set
-CONFIG_MFD_VEXPRESS_SYSREG=y
-# end of Multifunction device drivers
-
-# CONFIG_REGULATOR is not set
-# CONFIG_RC_CORE is not set
-# CONFIG_MEDIA_SUPPORT is not set
-
-#
-# Graphics support
-#
-# CONFIG_VGA_ARB is not set
-# CONFIG_IMX_IPUV3_CORE is not set
-CONFIG_DRM=m
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-# CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_TTM=m
-CONFIG_DRM_VRAM_HELPER=m
-CONFIG_DRM_GEM_SHMEM_HELPER=y
-
-#
-# I2C encoder or helper chips
-#
-# CONFIG_DRM_I2C_CH7006 is not set
-# CONFIG_DRM_I2C_SIL164 is not set
-# CONFIG_DRM_I2C_NXP_TDA998X is not set
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# end of I2C encoder or helper chips
-
-#
-# ARM devices
-#
-# CONFIG_DRM_HDLCD is not set
-# CONFIG_DRM_MALI_DISPLAY is not set
-# CONFIG_DRM_KOMEDA is not set
-# end of ARM devices
-
-# CONFIG_DRM_RADEON is not set
-# CONFIG_DRM_AMDGPU is not set
-
-#
-# ACP (Audio CoProcessor) Configuration
-#
-# end of ACP (Audio CoProcessor) Configuration
-
-# CONFIG_DRM_NOUVEAU is not set
-# CONFIG_DRM_VGEM is not set
-# CONFIG_DRM_VKMS is not set
-# CONFIG_DRM_EXYNOS is not set
-# CONFIG_DRM_UDL is not set
-# CONFIG_DRM_AST is not set
-# CONFIG_DRM_MGAG200 is not set
-CONFIG_DRM_CIRRUS_QEMU=m
-# CONFIG_DRM_ARMADA is not set
-# CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_LVDS is not set
-# CONFIG_DRM_OMAP is not set
-# CONFIG_DRM_TILCDC is not set
-CONFIG_DRM_QXL=m
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
-# CONFIG_DRM_MSM is not set
-# CONFIG_DRM_FSL_DCU is not set
-# CONFIG_DRM_STM is not set
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-# CONFIG_DRM_PANEL_ARM_VERSATILE is not set
-# CONFIG_DRM_PANEL_LVDS is not set
-# CONFIG_DRM_PANEL_SIMPLE is not set
-# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
-# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
-# end of Display Panels
-
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_PANEL_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-# CONFIG_DRM_ANALOGIX_ANX78XX is not set
-# CONFIG_DRM_CDNS_DSI is not set
-# CONFIG_DRM_DUMB_VGA_DAC is not set
-# CONFIG_DRM_LVDS_ENCODER is not set
-# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
-# CONFIG_DRM_NXP_PTN3460 is not set
-# CONFIG_DRM_PARADE_PS8622 is not set
-# CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SII902X is not set
-# CONFIG_DRM_SII9234 is not set
-# CONFIG_DRM_THINE_THC63LVD1024 is not set
-# CONFIG_DRM_TOSHIBA_TC358764 is not set
-# CONFIG_DRM_TOSHIBA_TC358767 is not set
-# CONFIG_DRM_TI_TFP410 is not set
-# CONFIG_DRM_TI_SN65DSI86 is not set
-# CONFIG_DRM_I2C_ADV7511 is not set
-# end of Display Interface Bridges
-
-# CONFIG_DRM_STI is not set
-# CONFIG_DRM_ETNAVIV is not set
-# CONFIG_DRM_ARCPGU is not set
-# CONFIG_DRM_MXSFB is not set
-# CONFIG_DRM_GM12U320 is not set
-# CONFIG_DRM_PL111 is not set
-# CONFIG_DRM_LIMA is not set
-# CONFIG_DRM_PANFROST is not set
-# CONFIG_DRM_LEGACY is not set
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=m
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_IMAGEBLIT=m
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_BACKLIGHT=m
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-CONFIG_FB_ARMCLCD=m
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_UVESA is not set
-# CONFIG_FB_OPENCORES is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-CONFIG_FB_SSD1307=m
-# CONFIG_FB_SM712 is not set
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-# CONFIG_LCD_CLASS_DEVICE is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-# CONFIG_BACKLIGHT_GENERIC is not set
-# CONFIG_BACKLIGHT_PWM is not set
-# CONFIG_BACKLIGHT_PM8941_WLED is not set
-# CONFIG_BACKLIGHT_ADP8860 is not set
-# CONFIG_BACKLIGHT_ADP8870 is not set
-# CONFIG_BACKLIGHT_LM3630A is not set
-# CONFIG_BACKLIGHT_LM3639 is not set
-# CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_GPIO is not set
-# CONFIG_BACKLIGHT_LV5207LP is not set
-# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_ARCXCNN is not set
-# end of Backlight & LCD device support
-
-CONFIG_VIDEOMODE_HELPERS=y
-CONFIG_HDMI=y
-
-#
-# Console display driver support
-#
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# end of Console display driver support
-
-# CONFIG_LOGO is not set
-# end of Graphics support
-
-# CONFIG_SOUND is not set
-
-#
-# HID support
-#
-CONFIG_HID=m
-# CONFIG_HID_BATTERY_STRENGTH is not set
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACCUTOUCH is not set
-# CONFIG_HID_ACRUX is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_APPLEIR is not set
-# CONFIG_HID_AUREAL is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BETOP_FF is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_COUGAR is not set
-# CONFIG_HID_MACALLY is not set
-# CONFIG_HID_CMEDIA is not set
-# CONFIG_HID_CP2112 is not set
-# CONFIG_HID_CREATIVE_SB0540 is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GEMBIRD is not set
-# CONFIG_HID_GFRM is not set
-# CONFIG_HID_HOLTEK is not set
-# CONFIG_HID_KEYTOUCH is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_UCLOGIC is not set
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_VIEWSONIC is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_ICADE is not set
-# CONFIG_HID_ITE is not set
-# CONFIG_HID_JABRA is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_LENOVO is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MAGICMOUSE is not set
-# CONFIG_HID_MALTRON is not set
-# CONFIG_HID_MAYFLASH is not set
-# CONFIG_HID_REDRAGON is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_MULTITOUCH is not set
-# CONFIG_HID_NTI is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PENMOUNT is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PICOLCD is not set
-# CONFIG_HID_PLANTRONICS is not set
-# CONFIG_HID_PRIMAX is not set
-# CONFIG_HID_RETRODE is not set
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_SAITEK is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SPEEDLINK is not set
-# CONFIG_HID_STEAM is not set
-# CONFIG_HID_STEELSERIES is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_RMI is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_UDRAW_PS3 is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HID_ZYDACRON is not set
-# CONFIG_HID_SENSOR_HUB is not set
-# CONFIG_HID_ALPS is not set
-# end of Special HID drivers
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-# end of USB HID Boot Protocol drivers
-# end of USB HID support
-
-#
-# I2C HID support
-#
-# CONFIG_I2C_HID is not set
-# end of I2C HID support
-# end of HID support
-
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
-# CONFIG_USB_ULPI_BUS is not set
-# CONFIG_USB_CONN_GPIO is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-CONFIG_USB_PCI=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_MON=m
-
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=m
-# CONFIG_USB_XHCI_PLATFORM is not set
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-CONFIG_USB_EHCI_PCI=m
-# CONFIG_USB_EHCI_FSL is not set
-CONFIG_USB_EHCI_HCD_PLATFORM=m
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_FOTG210_HCD is not set
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_UHCI_HCD=m
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_TMC is not set
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_REALTEK is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-CONFIG_USB_UAS=m
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USBIP_CORE is not set
-# CONFIG_USB_CDNS3 is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_ISP1760 is not set
-
-#
-# USB port drivers
-#
-# CONFIG_USB_SERIAL is not set
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_YUREX is not set
-# CONFIG_USB_EZUSB_FX2 is not set
-# CONFIG_USB_HUB_USB251XB is not set
-# CONFIG_USB_HSIC_USB3503 is not set
-# CONFIG_USB_HSIC_USB4604 is not set
-# CONFIG_USB_LINK_LAYER_TEST is not set
-# CONFIG_USB_CHAOSKEY is not set
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_ISP1301 is not set
-# CONFIG_USB_ULPI is not set
-# end of USB Physical Layer drivers
-
-# CONFIG_USB_GADGET is not set
-# CONFIG_TYPEC is not set
-# CONFIG_USB_ROLE_SWITCH is not set
-# CONFIG_MMC is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_NEW_LEDS is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_INFINIBAND is not set
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_NVMEM=y
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-# CONFIG_RTC_DRV_TEST is not set
-
-#
-# I2C RTC drivers
-#
-# CONFIG_RTC_DRV_ABB5ZES3 is not set
-# CONFIG_RTC_DRV_ABEOZ9 is not set
-# CONFIG_RTC_DRV_ABX80X is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_HYM8563 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_ISL12022 is not set
-# CONFIG_RTC_DRV_ISL12026 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_PCF8523 is not set
-# CONFIG_RTC_DRV_PCF85063 is not set
-# CONFIG_RTC_DRV_PCF85363 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_BQ32K is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_RX8010 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_EM3027 is not set
-# CONFIG_RTC_DRV_RV3028 is not set
-# CONFIG_RTC_DRV_RV8803 is not set
-# CONFIG_RTC_DRV_SD3078 is not set
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_I2C_AND_SPI=m
-
-#
-# SPI and I2C RTC drivers
-#
-# CONFIG_RTC_DRV_DS3232 is not set
-# CONFIG_RTC_DRV_PCF2127 is not set
-# CONFIG_RTC_DRV_RV3029C2 is not set
-
-#
-# Platform RTC drivers
-#
-# CONFIG_RTC_DRV_CMOS is not set
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1685_FAMILY=m
-CONFIG_RTC_DRV_DS1685=y
-# CONFIG_RTC_DRV_DS1689 is not set
-# CONFIG_RTC_DRV_DS17285 is not set
-# CONFIG_RTC_DRV_DS17485 is not set
-# CONFIG_RTC_DRV_DS17885 is not set
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_EFI=y
-CONFIG_RTC_DRV_STK17TA8=m
-# CONFIG_RTC_DRV_M48T86 is not set
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-# CONFIG_RTC_DRV_ZYNQMP is not set
-
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_PL030 is not set
-CONFIG_RTC_DRV_PL031=y
-# CONFIG_RTC_DRV_CADENCE is not set
-# CONFIG_RTC_DRV_FTRTC010 is not set
-# CONFIG_RTC_DRV_SNVS is not set
-# CONFIG_RTC_DRV_R7301 is not set
-
-#
-# HID Sensor RTC drivers
-#
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_OF=y
-# CONFIG_ALTERA_MSGDMA is not set
-# CONFIG_AMBA_PL08X is not set
-# CONFIG_DW_AXI_DMAC is not set
-# CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_QDMA is not set
-# CONFIG_INTEL_IDMA64 is not set
-# CONFIG_K3_DMA is not set
-# CONFIG_NBPFAXI_DMA is not set
-# CONFIG_PL330_DMA is not set
-# CONFIG_QCOM_BAM_DMA is not set
-CONFIG_QCOM_HIDMA_MGMT=m
-CONFIG_QCOM_HIDMA=m
-CONFIG_DW_DMAC_CORE=m
-CONFIG_DW_DMAC=m
-CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
-
-#
-# DMA Clients
-#
-# CONFIG_ASYNC_TX_DMA is not set
-# CONFIG_DMATEST is not set
-
-#
-# DMABUF options
-#
-CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
-# CONFIG_DMABUF_SELFTESTS is not set
-# end of DMABUF options
-
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
-# CONFIG_VFIO is not set
-CONFIG_VIRT_DRIVERS=y
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-
-#
-# Microsoft Hyper-V guest support
-#
-# end of Microsoft Hyper-V guest support
-
-# CONFIG_GREYBUS is not set
-# CONFIG_STAGING is not set
-# CONFIG_GOLDFISH is not set
-# CONFIG_MFD_CROS_EC is not set
-# CONFIG_CHROME_PLATFORMS is not set
-# CONFIG_MELLANOX_PLATFORM is not set
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-
-#
-# Common Clock Framework
-#
-CONFIG_ICST=y
-CONFIG_COMMON_CLK_VERSATILE=y
-# CONFIG_CLK_SP810 is not set
-# CONFIG_CLK_VEXPRESS_OSC is not set
-# CONFIG_CLK_HSDK is not set
-# CONFIG_COMMON_CLK_MAX9485 is not set
-# CONFIG_COMMON_CLK_SCPI is not set
-# CONFIG_COMMON_CLK_SI5341 is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-# CONFIG_COMMON_CLK_SI514 is not set
-# CONFIG_COMMON_CLK_SI544 is not set
-# CONFIG_COMMON_CLK_SI570 is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CDCE925 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_CLK_QORIQ is not set
-# CONFIG_COMMON_CLK_PWM is not set
-# CONFIG_COMMON_CLK_VC5 is not set
-# CONFIG_COMMON_CLK_FIXED_MMIO is not set
-# CONFIG_COMMON_CLK_HI3516CV300 is not set
-# CONFIG_COMMON_CLK_HI3519 is not set
-# CONFIG_COMMON_CLK_HI3660 is not set
-CONFIG_COMMON_CLK_HI3670=y
-# CONFIG_COMMON_CLK_HI3798CV200 is not set
-# CONFIG_COMMON_CLK_HI6220 is not set
-# CONFIG_RESET_HISI is not set
-# CONFIG_COMMON_CLK_QCOM is not set
-# end of Common Clock Framework
-
-# CONFIG_HWSPINLOCK is not set
-
-#
-# Clock Source drivers
-#
-CONFIG_TIMER_OF=y
-CONFIG_TIMER_PROBE=y
-CONFIG_CLKSRC_MMIO=y
-CONFIG_ARM_ARCH_TIMER=y
-CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-CONFIG_ARM_GLOBAL_TIMER=y
-CONFIG_ARM_TIMER_SP804=y
-CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
-CONFIG_CLKSRC_VERSATILE=y
-# end of Clock Source drivers
-
-CONFIG_MAILBOX=y
-CONFIG_ARM_MHU=m
-# CONFIG_PLATFORM_MHU is not set
-# CONFIG_PL320_MBOX is not set
-# CONFIG_ALTERA_MBOX is not set
-CONFIG_HI3660_MBOX=y
-CONFIG_HI6220_MBOX=y
-# CONFIG_MAILBOX_TEST is not set
-# CONFIG_QCOM_APCS_IPC is not set
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-CONFIG_IOMMU_IO_PGTABLE=y
-CONFIG_IOMMU_IO_PGTABLE_LPAE=y
-# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
-# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
-# end of Generic IOMMU Pagetable Support
-
-# CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_OF_IOMMU=y
-CONFIG_ARM_SMMU=y
-CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
-# CONFIG_QCOM_IOMMU is not set
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-CONFIG_RPMSG=m
-# CONFIG_RPMSG_CHAR is not set
-# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
-CONFIG_RPMSG_VIRTIO=m
-# end of Rpmsg drivers
-
-# CONFIG_SOUNDWIRE is not set
-
-#
-# SOC (System On Chip) specific Drivers
-#
-
-#
-# Amlogic SoC drivers
-#
-# end of Amlogic SoC drivers
-
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-# CONFIG_SOC_BRCMSTB is not set
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-# end of i.MX SoC drivers
-
-#
-# Qualcomm SoC drivers
-#
-# CONFIG_QCOM_AOSS_QMP is not set
-# CONFIG_QCOM_COMMAND_DB is not set
-# CONFIG_QCOM_GENI_SE is not set
-# CONFIG_QCOM_GSBI is not set
-# CONFIG_QCOM_LLCC is not set
-# CONFIG_QCOM_PM is not set
-# CONFIG_QCOM_RMTFS_MEM is not set
-# CONFIG_QCOM_SMD_RPM is not set
-# CONFIG_QCOM_WCNSS_CTRL is not set
-# CONFIG_QCOM_APR is not set
-# end of Qualcomm SoC drivers
-
-# CONFIG_SOC_TI is not set
-
-#
-# Xilinx SoC drivers
-#
-# CONFIG_XILINX_VCU is not set
-# end of Xilinx SoC drivers
-# end of SOC (System On Chip) specific Drivers
-
-# CONFIG_PM_DEVFREQ is not set
-# CONFIG_EXTCON is not set
-# CONFIG_MEMORY is not set
-# CONFIG_IIO is not set
-# CONFIG_NTB is not set
-# CONFIG_VME_BUS is not set
-CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
-# CONFIG_PWM_FSL_FTM is not set
-# CONFIG_PWM_HIBVT is not set
-# CONFIG_PWM_PCA9685 is not set
-
-#
-# IRQ chip support
-#
-CONFIG_IRQCHIP=y
-CONFIG_ARM_GIC=y
-CONFIG_ARM_GIC_MAX_NR=1
-CONFIG_ALPINE_MSI=y
-# CONFIG_AL_FIC is not set
-# CONFIG_QCOM_PDC is not set
-# end of IRQ chip support
-
-# CONFIG_IPACK_BUS is not set
-CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_QCOM_AOSS is not set
-# CONFIG_RESET_QCOM_PDC is not set
-# CONFIG_RESET_TI_SYSCON is not set
-CONFIG_COMMON_RESET_HI3660=y
-CONFIG_COMMON_RESET_HI6220=m
-
-#
-# PHY Subsystem
-#
-# CONFIG_GENERIC_PHY is not set
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_CADENCE_DP is not set
-# CONFIG_PHY_CADENCE_DPHY is not set
-# CONFIG_PHY_CADENCE_SIERRA is not set
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_MAPPHONE_MDM6600 is not set
-# CONFIG_PHY_OCELOT_SERDES is not set
-# CONFIG_PHY_QCOM_APQ8064_SATA is not set
-# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
-# CONFIG_PHY_QCOM_PCIE2 is not set
-# CONFIG_PHY_QCOM_QMP is not set
-# CONFIG_PHY_QCOM_QUSB2 is not set
-# CONFIG_PHY_QCOM_UFS is not set
-# end of PHY Subsystem
-
-# CONFIG_POWERCAP is not set
-# CONFIG_MCB is not set
-
-#
-# Performance monitor support
-#
-# CONFIG_ARM_CCI_PMU is not set
-# CONFIG_ARM_CCN is not set
-# CONFIG_ARM_PMU is not set
-# end of Performance monitor support
-
-# CONFIG_RAS is not set
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-# end of Android
-
-CONFIG_DAX=y
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SYSFS=y
-# CONFIG_QCOM_QFPROM is not set
-
-#
-# HW tracing support
-#
-# CONFIG_STM is not set
-# CONFIG_INTEL_TH is not set
-# end of HW tracing support
-
-# CONFIG_FPGA is not set
-# CONFIG_FSI is not set
-# CONFIG_TEE is not set
-# CONFIG_SIOX is not set
-# CONFIG_SLIMBUS is not set
-# CONFIG_INTERCONNECT is not set
-# CONFIG_COUNTER is not set
-# end of Device Drivers
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-# CONFIG_VALIDATE_FS_PARSER is not set
-CONFIG_FS_IOMAP=y
-# CONFIG_EXT2_FS is not set
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_USE_FOR_EXT2=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-# CONFIG_REISERFS_FS_SECURITY is not set
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-CONFIG_XFS_ONLINE_SCRUB=y
-# CONFIG_XFS_ONLINE_REPAIR is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_FS_REF_VERIFY is not set
-CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-# CONFIG_F2FS_FS_SECURITY is not set
-# CONFIG_F2FS_CHECK_FS is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_EXPORTFS_BLOCK_OPS=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_MANDATORY_FILE_LOCKING is not set
-CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_DNOTIFY is not set
-CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_AUTOFS_FS=m
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_VIRTIO_FS=m
-CONFIG_OVERLAY_FS=m
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
-# CONFIG_OVERLAY_FS_INDEX is not set
-# CONFIG_OVERLAY_FS_XINO_AUTO is not set
-# CONFIG_OVERLAY_FS_METACOPY is not set
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_FAT_DEFAULT_UTF8 is not set
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-# end of DOS/FAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PROC_CHILDREN is not set
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_CONFIGFS_FS=m
-CONFIG_EFIVAR_FS=m
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ORANGEFS_FS is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-# CONFIG_UBIFS_FS is not set
-CONFIG_CRAMFS=m
-# CONFIG_CRAMFS_BLOCKDEV is not set
-# CONFIG_CRAMFS_MTD is not set
-CONFIG_SQUASHFS=m
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZSTD is not set
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-CONFIG_ROMFS_FS=m
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
-# CONFIG_ROMFS_BACKED_BY_MTD is not set
-# CONFIG_ROMFS_BACKED_BY_BOTH is not set
-CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_PSTORE=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=y
-# CONFIG_PSTORE_LZO_COMPRESS is not set
-# CONFIG_PSTORE_LZ4_COMPRESS is not set
-# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
-# CONFIG_PSTORE_842_COMPRESS is not set
-# CONFIG_PSTORE_ZSTD_COMPRESS is not set
-CONFIG_PSTORE_COMPRESS=y
-CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
-CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-CONFIG_PSTORE_RAM=m
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-# CONFIG_EROFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
-# CONFIG_NFS_V4_1_MIGRATION is not set
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_BLOCKLAYOUT=y
-CONFIG_NFSD_SCSILAYOUT=y
-CONFIG_NFSD_FLEXFILELAYOUT=y
-CONFIG_GRACE_PERIOD=m
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
-# CONFIG_SUNRPC_DEBUG is not set
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CEPH_FS_POSIX_ACL=y
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_UPCALL is not set
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_DEBUG=y
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_FSCACHE=y
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-# CONFIG_UNICODE is not set
-# end of File systems
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_KEYS_REQUEST_CACHE is not set
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_KEY_DH_OPERATIONS=y
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-# CONFIG_SECURITY is not set
-CONFIG_SECURITYFS=y
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_HARDENED_USERCOPY_FALLBACK=y
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
-# CONFIG_FORTIFY_SOURCE is not set
-# CONFIG_STATIC_USERMODEHELPER is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_KPP=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ENGINE=m
-
-#
-# Public-key cryptography
-#
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECC=m
-CONFIG_CRYPTO_ECDH=m
-# CONFIG_CRYPTO_ECRDSA is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CFB=m
-CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=m
-# CONFIG_CRYPTO_OFB is not set
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m
-# CONFIG_CRYPTO_ADIANTUM is not set
-CONFIG_CRYPTO_ESSIV=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32=m
-# CONFIG_CRYPTO_XXHASH is not set
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_GHASH=y
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=y
-# CONFIG_CRYPTO_842 is not set
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-CONFIG_CRYPTO_ZSTD=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=y
-CONFIG_CRYPTO_DRBG_HMAC=y
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-CONFIG_CRYPTO_DRBG=y
-CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
-CONFIG_CRYPTO_HASH_INFO=y
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
-# CONFIG_CRYPTO_DEV_QCE is not set
-CONFIG_CRYPTO_DEV_QCOM_RNG=m
-CONFIG_CRYPTO_DEV_VIRTIO=m
-# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
-# CONFIG_CRYPTO_DEV_CCREE is not set
-CONFIG_ASYMMETRIC_KEY_TYPE=y
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-CONFIG_X509_CERTIFICATE_PARSER=y
-# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set
-CONFIG_PKCS7_MESSAGE_PARSER=y
-# CONFIG_PKCS7_TEST_KEY is not set
-# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
-
-#
-# Certificates for signature checking
-#
-CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
-CONFIG_SECONDARY_TRUSTED_KEYRING=y
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-# end of Certificates for signature checking
-
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_RAID6_PQ_BENCHMARK=y
-# CONFIG_PACKING is not set
-CONFIG_BITREVERSE=y
-CONFIG_HAVE_ARCH_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_CORDIC=m
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=m
-# CONFIG_CRC4 is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_XXHASH=y
-CONFIG_AUDIT_GENERIC=y
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_COMPRESS=m
-CONFIG_ZSTD_DECOMPRESS=m
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_DMA=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_DMA_DECLARE_COHERENT=y
-CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
-CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
-CONFIG_DMA_REMAP=y
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
-CONFIG_CLZ_TAB=y
-CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=y
-CONFIG_LIBFDT=y
-CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=y
-CONFIG_FONT_SUPPORT=m
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-CONFIG_SG_POOL=y
-CONFIG_SBITMAP=y
-# CONFIG_STRING_SELFTEST is not set
-# end of Library routines
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-# CONFIG_PRINTK_CALLER is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=3
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# end of printk and dmesg options
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1280
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_INSTALL is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# end of Compile-time checks and compiler options
-
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_MAGIC_SYSRQ_SERIAL=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_PAGE_OWNER is not set
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_CC_HAS_KASAN_GENERIC=y
-CONFIG_KASAN_STACK=1
-# end of Memory Debugging
-
-CONFIG_ARCH_HAS_KCOV=y
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
-CONFIG_DEBUG_SHIRQ=y
-
-#
-# Debug Lockups and Hangs
-#
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_SOFTLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-# CONFIG_WQ_WATCHDOG is not set
-# end of Debug Lockups and Hangs
-
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-CONFIG_SCHEDSTATS=y
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-# end of Lock Debugging (spinlocks, mutexes, etc...)
-
-CONFIG_STACKTRACE=y
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# end of RCU Debugging
-
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_TRACING=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_PREEMPTIRQ_EVENTS is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_ENABLE_DEFAULT_TRACERS is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_KPROBE_EVENTS=y
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_RUNTIME_TESTING_MENU is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-# CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_IO_STRICT_DEVMEM=y
-# CONFIG_ARM_PTDUMP_DEBUGFS is not set
-# CONFIG_DEBUG_WX is not set
-# CONFIG_UNWINDER_FRAME_POINTER is not set
-CONFIG_UNWINDER_ARM=y
-CONFIG_ARM_UNWIND=y
-# CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_LL is not set
-CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
-CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
-# CONFIG_ARM_KPROBES_TEST is not set
-# CONFIG_PID_IN_CONTEXTIDR is not set
-# CONFIG_CORESIGHT is not set
-# end of Kernel hacking
diff --git a/main/linux-lts/config-virt.x86 b/main/linux-lts/config-virt.x86
deleted file mode 100644
index 2acf0d91e1a..00000000000
--- a/main/linux-lts/config-virt.x86
+++ /dev/null
@@ -1,4548 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.23 Kernel Configuration
-#
-
-#
-# Compiler: gcc (Alpine 9.2.0) 9.2.0
-#
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-CONFIG_THREAD_INFO_IN_TASK=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-# CONFIG_HEADER_TEST is not set
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT=""
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_USELIB=y
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
-CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
-# end of IRQ subsystem
-
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_ARCH_CLOCKSOURCE_INIT=y
-CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-# end of Timers subsystem
-
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-CONFIG_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_SCHED_AVG_IRQ=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-CONFIG_IKCONFIG=m
-CONFIG_IKCONFIG_PROC=y
-# CONFIG_IKHEADERS is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-
-#
-# Scheduler features
-#
-# end of Scheduler features
-
-CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
-CONFIG_CGROUPS=y
-# CONFIG_MEMCG is not set
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-# CONFIG_CFS_BANDWIDTH is not set
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
-CONFIG_CGROUP_FREEZER=y
-# CONFIG_CPUSETS is not set
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-# CONFIG_CGROUP_PERF is not set
-CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-# CONFIG_CHECKPOINT_RESTORE is not set
-CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_RELAY is not set
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_MULTIUSER=y
-# CONFIG_SGETMASK_SYSCALL is not set
-# CONFIG_SYSFS_SYSCALL is not set
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_FHANDLE=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-# CONFIG_PCSPKR_PLATFORM is not set
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
-# CONFIG_USERFAULTFD is not set
-CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-# CONFIG_PC104 is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_SLAB_FREELIST_RANDOM=y
-# CONFIG_SLAB_FREELIST_HARDENED is not set
-# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_SYSTEM_DATA_VERIFICATION=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-# end of General setup
-
-# CONFIG_64BIT is not set
-CONFIG_X86_32=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf32-i386"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_BITS_MAX=16
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_BUG=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_X86_32_SMP=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=2
-CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
-
-#
-# Processor type and features
-#
-CONFIG_ZONE_DMA=y
-CONFIG_SMP=y
-CONFIG_X86_FEATURE_NAMES=y
-# CONFIG_X86_MPPARSE is not set
-# CONFIG_GOLDFISH is not set
-CONFIG_RETPOLINE=y
-# CONFIG_X86_CPU_RESCTRL is not set
-CONFIG_X86_BIGSMP=y
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-# CONFIG_X86_INTEL_LPSS is not set
-# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
-# CONFIG_IOSF_MBI is not set
-# CONFIG_X86_32_IRIS is not set
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_DEBUG is not set
-CONFIG_PARAVIRT_SPINLOCKS=y
-CONFIG_X86_HV_CALLBACK_VECTOR=y
-CONFIG_KVM_GUEST=y
-CONFIG_ARCH_CPUIDLE_HALTPOLL=y
-# CONFIG_PVH is not set
-# CONFIG_KVM_DEBUG_FS is not set
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
-CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-CONFIG_M586TSC=y
-# CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MELAN is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_X86_GENERIC=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_F00F_BUG=y
-CONFIG_X86_ALIGNMENT_16=y
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
-# CONFIG_PROCESSOR_SELECT is not set
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_CYRIX_32=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_HYGON=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
-CONFIG_CPU_SUP_ZHAOXIN=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_NR_CPUS_RANGE_BEGIN=2
-CONFIG_NR_CPUS_RANGE_END=64
-CONFIG_NR_CPUS_DEFAULT=32
-CONFIG_NR_CPUS=64
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_MC_PRIO=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
-# CONFIG_X86_MCE is not set
-
-#
-# Performance monitoring
-#
-CONFIG_PERF_EVENTS_INTEL_UNCORE=y
-# CONFIG_PERF_EVENTS_INTEL_RAPL is not set
-# CONFIG_PERF_EVENTS_INTEL_CSTATE is not set
-# CONFIG_PERF_EVENTS_AMD_POWER is not set
-# end of Performance monitoring
-
-# CONFIG_X86_LEGACY_VM86 is not set
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX32=y
-# CONFIG_TOSHIBA is not set
-# CONFIG_I8K is not set
-# CONFIG_X86_REBOOTFIXUPS is not set
-# CONFIG_MICROCODE is not set
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_3G_OPT is not set
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_HIGHMEM=y
-# CONFIG_X86_CPA_STATISTICS is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ILLEGAL_POINTER_VALUE=0
-# CONFIG_HIGHPTE is not set
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW=64
-# CONFIG_MATH_EMULATION is not set
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_ARCH_RANDOM=y
-# CONFIG_X86_SMAP is not set
-CONFIG_X86_INTEL_UMIP=y
-# CONFIG_X86_INTEL_TSX_MODE_OFF is not set
-# CONFIG_X86_INTEL_TSX_MODE_ON is not set
-CONFIG_X86_INTEL_TSX_MODE_AUTO=y
-# CONFIG_EFI is not set
-CONFIG_SECCOMP=y
-CONFIG_HZ_100=y
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=100
-CONFIG_SCHED_HRTICK=y
-# CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_MODIFY_LDT_SYSCALL=y
-# end of Processor type and features
-
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-# CONFIG_HIBERNATION is not set
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_CLK=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-# CONFIG_ENERGY_MODEL is not set
-CONFIG_ARCH_SUPPORTS_ACPI=y
-CONFIG_ACPI=y
-CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
-CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
-CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
-# CONFIG_ACPI_DEBUGGER is not set
-CONFIG_ACPI_SPCR_TABLE=y
-CONFIG_ACPI_SLEEP=y
-# CONFIG_ACPI_PROCFS_POWER is not set
-# CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set
-CONFIG_ACPI_EC_DEBUGFS=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=m
-# CONFIG_ACPI_TAD is not set
-# CONFIG_ACPI_DOCK is not set
-CONFIG_ACPI_CPU_FREQ_PSS=y
-CONFIG_ACPI_PROCESSOR_CSTATE=y
-CONFIG_ACPI_PROCESSOR_IDLE=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_CUSTOM_DSDT_FILE=""
-CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HOTPLUG_IOAPIC=y
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=m
-# CONFIG_ACPI_CUSTOM_METHOD is not set
-# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
-CONFIG_HAVE_ACPI_APEI=y
-CONFIG_HAVE_ACPI_APEI_NMI=y
-CONFIG_ACPI_APEI=y
-# CONFIG_ACPI_APEI_GHES is not set
-# CONFIG_ACPI_APEI_EINJ is not set
-CONFIG_ACPI_APEI_ERST_DEBUG=y
-# CONFIG_DPTF_POWER is not set
-# CONFIG_PMIC_OPREGION is not set
-# CONFIG_ACPI_CONFIGFS is not set
-CONFIG_X86_PM_TIMER=y
-# CONFIG_SFI is not set
-# CONFIG_APM is not set
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_STAT is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
-
-#
-# CPU frequency scaling drivers
-#
-CONFIG_X86_INTEL_PSTATE=y
-# CONFIG_X86_PCC_CPUFREQ is not set
-# CONFIG_X86_ACPI_CPUFREQ is not set
-# CONFIG_X86_POWERNOW_K6 is not set
-# CONFIG_X86_POWERNOW_K7 is not set
-# CONFIG_X86_GX_SUSPMOD is not set
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-# CONFIG_X86_SPEEDSTEP_ICH is not set
-# CONFIG_X86_SPEEDSTEP_SMI is not set
-# CONFIG_X86_P4_CLOCKMOD is not set
-# CONFIG_X86_CPUFREQ_NFORCE2 is not set
-# CONFIG_X86_LONGRUN is not set
-# CONFIG_X86_LONGHAUL is not set
-# CONFIG_X86_E_POWERSAVER is not set
-
-#
-# shared options
-#
-# end of CPU Frequency scaling
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
-# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set
-CONFIG_HALTPOLL_CPUIDLE=y
-# end of CPU Idle
-
-# CONFIG_INTEL_IDLE is not set
-# end of Power management and ACPI options
-
-#
-# Bus options (PCI etc.)
-#
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_CNB20LE_QUIRK=y
-# CONFIG_ISA_BUS is not set
-CONFIG_ISA_DMA_API=y
-# CONFIG_ISA is not set
-CONFIG_SCx200=m
-CONFIG_SCx200HR_TIMER=m
-# CONFIG_OLPC is not set
-# CONFIG_ALIX is not set
-# CONFIG_NET5501 is not set
-# CONFIG_GEOS is not set
-CONFIG_AMD_NB=y
-# CONFIG_X86_SYSFB is not set
-# end of Bus options (PCI etc.)
-
-#
-# Binary Emulations
-#
-CONFIG_COMPAT_32=y
-# end of Binary Emulations
-
-CONFIG_HAVE_ATOMIC_IOMAP=y
-
-#
-# Firmware Drivers
-#
-# CONFIG_EDD is not set
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DMIID=y
-# CONFIG_DMI_SYSFS is not set
-CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
-# CONFIG_ISCSI_IBFT is not set
-CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-CONFIG_UEFI_CPER=y
-CONFIG_UEFI_CPER_X86=y
-CONFIG_EFI_EARLYCON=y
-
-#
-# Tegra firmware driver
-#
-# end of Tegra firmware driver
-# end of Firmware Drivers
-
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_KVM_VFIO=y
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_NO_POLL=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-# CONFIG_KVM_MMU_AUDIT is not set
-CONFIG_VHOST_NET=m
-# CONFIG_VHOST_VSOCK is not set
-CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-
-#
-# General architecture-dependent options
-#
-CONFIG_HOTPLUG_SMT=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-CONFIG_HAVE_OPROFILE=y
-CONFIG_OPROFILE_NMI_TIMER=y
-CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_OPTPROBES=y
-CONFIG_UPROBES=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_KRETPROBES=y
-CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_KPROBES_ON_FTRACE=y
-CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_HAS_SET_MEMORY=y
-CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
-CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
-CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
-CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_HAVE_ASM_MODVERSIONS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
-CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_ARCH_STACKLEAK=y
-CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_MOVE_PMD=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=8
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_OLD_SIGACTION=y
-CONFIG_64BIT_TIME=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_ARCH_HAS_REFCOUNT=y
-# CONFIG_REFCOUNT_FULL is not set
-CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
-# CONFIG_LOCK_EVENT_COUNTS is not set
-CONFIG_ARCH_HAS_MEM_ENCRYPT=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# end of GCOV-based kernel profiling
-
-CONFIG_PLUGIN_HOSTCC=""
-CONFIG_HAVE_GCC_PLUGINS=y
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULE_SIG_FORMAT=y
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
-CONFIG_ASM_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULE_SIG=y
-# CONFIG_MODULE_SIG_FORCE is not set
-CONFIG_MODULE_SIG_ALL=y
-CONFIG_MODULE_SIG_SHA1=y
-# CONFIG_MODULE_SIG_SHA224 is not set
-# CONFIG_MODULE_SIG_SHA256 is not set
-# CONFIG_MODULE_SIG_SHA384 is not set
-# CONFIG_MODULE_SIG_SHA512 is not set
-CONFIG_MODULE_SIG_HASH="sha1"
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-# CONFIG_BLK_DEV_ZONED is not set
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
-# CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_WBT is not set
-CONFIG_BLK_CGROUP_IOLATENCY=y
-# CONFIG_BLK_CGROUP_IOCOST is not set
-CONFIG_BLK_DEBUG_FS=y
-# CONFIG_BLK_SED_OPAL is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AIX_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_CMDLINE_PARTITION is not set
-# end of Partition Types
-
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_PM=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-# CONFIG_IOSCHED_BFQ is not set
-# end of IO Schedulers
-
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-CONFIG_QUEUED_SPINLOCKS=y
-CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
-CONFIG_FREEZER=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_ELFCORE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_SPARSEMEM_STATIC=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_FAST_GUP=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
-CONFIG_CLEANCACHE=y
-# CONFIG_FRONTSWAP is not set
-# CONFIG_CMA is not set
-CONFIG_ZPOOL=m
-# CONFIG_ZBUD is not set
-CONFIG_Z3FOLD=m
-CONFIG_ZSMALLOC=y
-# CONFIG_PGTABLE_MAPPING is not set
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-# CONFIG_IDLE_PAGE_TRACKING is not set
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
-CONFIG_ARCH_HAS_PTE_SPECIAL=y
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_EGRESS=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=m
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-CONFIG_UNIX_DIAG=m
-# CONFIG_TLS is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-CONFIG_XFRM_INTERFACE=m
-CONFIG_XFRM_SUB_POLICY=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_XDP_SOCKETS=y
-# CONFIG_XDP_SOCKETS_DIAG is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=y
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE_COMMON=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-# CONFIG_IP_PIMSM_V1 is not set
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-CONFIG_NET_FOU_IP_TUNNELS=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-# CONFIG_INET_ESP_OFFLOAD is not set
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-# CONFIG_INET_RAW_DIAG is not set
-CONFIG_INET_DIAG_DESTROY=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_NV=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_TCP_CONG_DCTCP=m
-CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-# CONFIG_INET6_ESP_OFFLOAD is not set
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_FOU=m
-CONFIG_IPV6_FOU_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NET_PTP_CLASSIFY=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_FAMILY_BRIDGE=y
-CONFIG_NETFILTER_FAMILY_ARP=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK_OSF=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-# CONFIG_NF_LOG_NETDEV is not set
-CONFIG_NETFILTER_CONNCOUNT=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_PROCFS=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-# CONFIG_NF_CONNTRACK_TIMEOUT is not set
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=y
-CONFIG_NF_NAT_MASQUERADE=y
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_SET=m
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_NUMGEN=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_FLOW_OFFLOAD=m
-CONFIG_NFT_COUNTER=m
-# CONFIG_NFT_CONNLIMIT is not set
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-# CONFIG_NFT_TUNNEL is not set
-# CONFIG_NFT_OBJREF is not set
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_FIB=m
-CONFIG_NFT_FIB_INET=m
-# CONFIG_NFT_XFRM is not set
-# CONFIG_NFT_SOCKET is not set
-# CONFIG_NFT_OSF is not set
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_SYNPROXY is not set
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_FIB_NETDEV=m
-CONFIG_NF_FLOW_TABLE_INET=m
-CONFIG_NF_FLOW_TABLE=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-# end of Core Netfilter Configuration
-
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-# CONFIG_IP_VS_MH is not set
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS MH scheduler
-#
-CONFIG_IP_VS_MH_TAB_INDEX=12
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_SOCKET_IPV4=m
-CONFIG_NF_TPROXY_IPV4=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_FLOW_TABLE_IPV4=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# end of IP: Netfilter Configuration
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_SOCKET_IPV6=m
-CONFIG_NF_TPROXY_IPV6=m
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_FIB_IPV6=m
-CONFIG_NF_FLOW_TABLE_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_SRH=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-# end of IPv6: Netfilter Configuration
-
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_TABLES_BRIDGE=m
-# CONFIG_NFT_BRIDGE_META is not set
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-# CONFIG_BPFILTER is not set
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-# end of DCCP CCIDs Configuration
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-# end of DCCP Kernel Hacking
-
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-CONFIG_INET_SCTP_DIAG=m
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-CONFIG_L2TP=m
-# CONFIG_L2TP_DEBUGFS is not set
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_MRP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_HAVE_NET_DSA=y
-# CONFIG_NET_DSA is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_PHONET is not set
-# CONFIG_6LOWPAN is not set
-# CONFIG_IEEE802154 is not set
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_CBS=m
-# CONFIG_NET_SCH_ETF is not set
-# CONFIG_NET_SCH_TAPRIO is not set
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-# CONFIG_NET_SCH_SKBPRIO is not set
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-# CONFIG_NET_SCH_CAKE is not set
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-# CONFIG_NET_SCH_DEFAULT is not set
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-# CONFIG_NET_CLS_CGROUP is not set
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_MATCHALL=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_IPT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-# CONFIG_NET_ACT_SAMPLE is not set
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-# CONFIG_NET_ACT_MPLS is not set
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_ACT_CTINFO is not set
-CONFIG_NET_ACT_SKBMOD=m
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_TUNNEL_KEY=m
-# CONFIG_NET_ACT_CT is not set
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IFE_SKBTCINDEX=m
-# CONFIG_NET_TC_SKB_EXT is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-# CONFIG_BATMAN_ADV is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
-CONFIG_VSOCKETS_DIAG=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
-# CONFIG_HYPERV_VSOCKETS is not set
-CONFIG_NETLINK_DIAG=m
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_NET_NSH=m
-# CONFIG_HSR is not set
-# CONFIG_NET_SWITCHDEV is not set
-CONFIG_NET_L3_MASTER_DEV=y
-# CONFIG_NET_NCSI is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-# CONFIG_BPF_STREAM_PARSER is not set
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-# CONFIG_NET_DROP_MONITOR is not set
-# end of Network testing
-# end of Networking options
-
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AF_KCM is not set
-CONFIG_FIB_RULES=y
-# CONFIG_WIRELESS is not set
-# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_DEBUG is not set
-# CONFIG_CAIF is not set
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
-# CONFIG_NFC is not set
-# CONFIG_PSAMPLE is not set
-CONFIG_NET_IFE=m
-CONFIG_LWTUNNEL=y
-CONFIG_LWTUNNEL_BPF=y
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-CONFIG_FAILOVER=m
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-CONFIG_HAVE_EISA=y
-# CONFIG_EISA is not set
-CONFIG_HAVE_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-# CONFIG_PCIEAER is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-# CONFIG_PCIE_PTM is not set
-# CONFIG_PCIE_BW is not set
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-CONFIG_PCI_STUB=m
-# CONFIG_PCI_PF_STUB is not set
-CONFIG_PCI_ATS=y
-CONFIG_PCI_LOCKLESS_CONFIG=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_LABEL=y
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_COMPAQ is not set
-# CONFIG_HOTPLUG_PCI_IBM is not set
-CONFIG_HOTPLUG_PCI_ACPI=y
-# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-# CONFIG_HOTPLUG_PCI_SHPC is not set
-
-#
-# PCI controller drivers
-#
-
-#
-# Cadence PCIe controllers support
-#
-# end of Cadence PCIe controllers support
-
-#
-# DesignWare PCI Core Support
-#
-# CONFIG_PCIE_DW_PLAT_HOST is not set
-# CONFIG_PCI_MESON is not set
-# end of DesignWare PCI Core Support
-# end of PCI controller drivers
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-# end of PCI Endpoint
-
-#
-# PCI switch controller drivers
-#
-# CONFIG_PCI_SW_SWITCHTEC is not set
-# end of PCI switch controller drivers
-
-# CONFIG_PCCARD is not set
-# CONFIG_RAPIDIO is not set
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_STANDALONE is not set
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=m
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
-# end of Firmware loader
-
-CONFIG_ALLOW_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-# end of Bus devices
-
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-# CONFIG_GNSS is not set
-# CONFIG_MTD is not set
-# CONFIG_OF is not set
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-# CONFIG_PARPORT is not set
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_NULL_BLK is not set
-CONFIG_BLK_DEV_FD=m
-CONFIG_CDROM=m
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_WRITEBACK is not set
-# CONFIG_ZRAM_MEMORY_TRACKING is not set
-# CONFIG_BLK_DEV_UMEM is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-CONFIG_VIRTIO_BLK=m
-# CONFIG_VIRTIO_BLK_SCSI is not set
-CONFIG_BLK_DEV_RBD=m
-# CONFIG_BLK_DEV_RSXX is not set
-
-#
-# NVME Support
-#
-CONFIG_NVME_CORE=m
-CONFIG_BLK_DEV_NVME=m
-CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_FABRICS=m
-# CONFIG_NVME_FC is not set
-# CONFIG_NVME_TCP is not set
-CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_LOOP=m
-# CONFIG_NVME_TARGET_FC is not set
-# CONFIG_NVME_TARGET_TCP is not set
-# end of NVME Support
-
-#
-# Misc devices
-#
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_IBM_ASM is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_APDS9802ALS is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISL29020 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_BH1770 is not set
-# CONFIG_SENSORS_APDS990X is not set
-# CONFIG_HMC6352 is not set
-# CONFIG_DS1682 is not set
-CONFIG_VMWARE_BALLOON=m
-# CONFIG_PCH_PHUB is not set
-# CONFIG_SRAM is not set
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_XILINX_SDFEC is not set
-CONFIG_PVPANIC=m
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_IDT_89HPESX is not set
-# CONFIG_EEPROM_EE1004 is not set
-# end of EEPROM support
-
-# CONFIG_CB710_CORE is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# end of Texas Instruments shared transport line discipline
-
-# CONFIG_SENSORS_LIS3_I2C is not set
-
-#
-# Altera FPGA firmware download module (requires I2C)
-#
-# CONFIG_ALTERA_STAPL is not set
-# CONFIG_INTEL_MEI is not set
-# CONFIG_INTEL_MEI_ME is not set
-# CONFIG_INTEL_MEI_TXE is not set
-CONFIG_VMWARE_VMCI=m
-
-#
-# Intel MIC & related support
-#
-
-#
-# Intel MIC Bus Driver
-#
-
-#
-# SCIF Bus Driver
-#
-
-#
-# VOP Bus Driver
-#
-# CONFIG_VOP_BUS is not set
-
-#
-# Intel MIC Host Driver
-#
-
-#
-# Intel MIC Card Driver
-#
-
-#
-# SCIF Driver
-#
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-
-#
-# VOP Driver
-#
-# end of Intel MIC & related support
-
-# CONFIG_ECHO is not set
-# CONFIG_MISC_ALCOR_PCI is not set
-# CONFIG_MISC_RTSX_PCI is not set
-# CONFIG_MISC_RTSX_USB is not set
-# CONFIG_HABANA_AI is not set
-# end of Misc devices
-
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-# CONFIG_CHR_DEV_ST is not set
-CONFIG_BLK_DEV_SR=m
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_SCAN_ASYNC=y
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-# end of SCSI Transports
-
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-# CONFIG_ISCSI_BOOT_SYSFS is not set
-# CONFIG_SCSI_CXGB3_ISCSI is not set
-# CONFIG_SCSI_CXGB4_ISCSI is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_BE2ISCSI is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_HPSA is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVUMI is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_ESAS2R is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_MPT3SAS is not set
-# CONFIG_SCSI_MPT2SAS is not set
-# CONFIG_SCSI_SMARTPQI is not set
-# CONFIG_SCSI_UFSHCD is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_MYRB is not set
-# CONFIG_SCSI_MYRS is not set
-CONFIG_VMWARE_PVSCSI=y
-CONFIG_HYPERV_STORAGE=m
-# CONFIG_LIBFC is not set
-# CONFIG_SCSI_SNIC is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_FDOMAIN_PCI is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_ISCI is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_AM53C974 is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_WD719X is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_PMCRAID is not set
-# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_BFA_FC is not set
-CONFIG_SCSI_VIRTIO=m
-# CONFIG_SCSI_CHELSIO_FCOE is not set
-# CONFIG_SCSI_DH is not set
-# end of SCSI device support
-
-CONFIG_ATA=y
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-# CONFIG_SATA_ZPODD is not set
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=y
-CONFIG_SATA_MOBILE_LPM_POLICY=0
-# CONFIG_SATA_AHCI_PLATFORM is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_ACARD_AHCI is not set
-# CONFIG_SATA_SIL24 is not set
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-# CONFIG_PDC_ADMA is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SX4 is not set
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=y
-# CONFIG_SATA_DWC is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-
-#
-# PATA SFF controllers with BMDMA
-#
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_ATP867X is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
-# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CS5536 is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TOSHIBA is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-
-#
-# PIO-only SFF controllers
-#
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_RZ1000 is not set
-
-#
-# Generic fallback / legacy drivers
-#
-# CONFIG_PATA_ACPI is not set
-CONFIG_ATA_GENERIC=m
-# CONFIG_PATA_LEGACY is not set
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-# CONFIG_MD_AUTODETECT is not set
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-# CONFIG_MD_CLUSTER is not set
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_UNSTRIPED=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_WRITECACHE=m
-# CONFIG_DM_ERA is not set
-# CONFIG_DM_CLONE is not set
-CONFIG_DM_MIRROR=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-# CONFIG_DM_DUST is not set
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
-CONFIG_DM_VERITY_FEC=y
-CONFIG_DM_SWITCH=m
-CONFIG_DM_LOG_WRITES=m
-CONFIG_DM_INTEGRITY=m
-# CONFIG_TARGET_CORE is not set
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_NOSY is not set
-# end of IEEE 1394 (FireWire) support
-
-# CONFIG_MACINTOSH_DRIVERS is not set
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-# CONFIG_EQUALIZER is not set
-# CONFIG_NET_FC is not set
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=m
-# CONFIG_IPVTAP is not set
-CONFIG_VXLAN=m
-CONFIG_GENEVE=m
-# CONFIG_GTP is not set
-CONFIG_MACSEC=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_TUN=m
-CONFIG_TAP=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_NET_VRF=m
-# CONFIG_ARCNET is not set
-
-#
-# CAIF transport drivers
-#
-
-#
-# Distributed Switch Architecture drivers
-#
-# end of Distributed Switch Architecture drivers
-
-CONFIG_ETHERNET=y
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
-# CONFIG_NET_VENDOR_AGERE is not set
-CONFIG_NET_VENDOR_ALACRITECH=y
-# CONFIG_SLICOSS is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
-# CONFIG_ALTERA_TSE is not set
-CONFIG_NET_VENDOR_AMAZON=y
-CONFIG_ENA_ETHERNET=m
-# CONFIG_NET_VENDOR_AMD is not set
-CONFIG_NET_VENDOR_AQUANTIA=y
-# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_VENDOR_AURORA is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
-# CONFIG_NET_VENDOR_CADENCE is not set
-# CONFIG_NET_VENDOR_CAVIUM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CISCO is not set
-# CONFIG_NET_VENDOR_CORTINA is not set
-# CONFIG_CX_ECAT is not set
-# CONFIG_DNET is not set
-# CONFIG_NET_VENDOR_DEC is not set
-# CONFIG_NET_VENDOR_DLINK is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
-# CONFIG_NET_VENDOR_EZCHIP is not set
-CONFIG_NET_VENDOR_GOOGLE=y
-# CONFIG_GVE is not set
-# CONFIG_NET_VENDOR_HP is not set
-CONFIG_NET_VENDOR_HUAWEI=y
-# CONFIG_HINIC is not set
-# CONFIG_NET_VENDOR_I825XX is not set
-CONFIG_NET_VENDOR_INTEL=y
-# CONFIG_E100 is not set
-CONFIG_E1000=m
-# CONFIG_E1000E is not set
-# CONFIG_IGB is not set
-# CONFIG_IGBVF is not set
-# CONFIG_IXGB is not set
-# CONFIG_IXGBE is not set
-CONFIG_IXGBEVF=m
-# CONFIG_I40E is not set
-# CONFIG_I40EVF is not set
-# CONFIG_ICE is not set
-# CONFIG_FM10K is not set
-# CONFIG_IGC is not set
-# CONFIG_JME is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-CONFIG_NET_VENDOR_MICROCHIP=y
-# CONFIG_LAN743X is not set
-# CONFIG_NET_VENDOR_MICROSEMI is not set
-# CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_NETERION is not set
-# CONFIG_NET_VENDOR_NETRONOME is not set
-# CONFIG_NET_VENDOR_NI is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
-# CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_ETHOC is not set
-# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
-CONFIG_NET_VENDOR_PENSANDO=y
-# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_QUALCOMM is not set
-# CONFIG_NET_VENDOR_RDC is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
-# CONFIG_NET_VENDOR_RENESAS is not set
-# CONFIG_NET_VENDOR_ROCKER is not set
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-CONFIG_NET_VENDOR_SOLARFLARE=y
-# CONFIG_SFC is not set
-# CONFIG_SFC_FALCON is not set
-# CONFIG_NET_VENDOR_SILAN is not set
-# CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_SOCIONEXT is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SUN is not set
-# CONFIG_NET_VENDOR_SYNOPSYS is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_NET_VENDOR_TI is not set
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-CONFIG_NET_VENDOR_XILINX=y
-# CONFIG_XILINX_AXI_EMAC is not set
-# CONFIG_XILINX_LL_TEMAC is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_NET_SB1000 is not set
-CONFIG_MDIO_DEVICE=m
-CONFIG_MDIO_BUS=m
-# CONFIG_MDIO_BCM_UNIMAC is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MDIO_MSCC_MIIM is not set
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-# CONFIG_ADIN_PHY is not set
-# CONFIG_AMD_PHY is not set
-# CONFIG_AQUANTIA_PHY is not set
-# CONFIG_AX88796B_PHY is not set
-# CONFIG_AT803X_PHY is not set
-# CONFIG_BCM7XXX_PHY is not set
-# CONFIG_BCM87XX_PHY is not set
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CORTINA_PHY is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DP83822_PHY is not set
-# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DP83848_PHY is not set
-# CONFIG_DP83867_PHY is not set
-# CONFIG_FIXED_PHY is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_INTEL_XWAY_PHY is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MARVELL_10G_PHY is not set
-# CONFIG_MICREL_PHY is not set
-# CONFIG_MICROCHIP_PHY is not set
-# CONFIG_MICROCHIP_T1_PHY is not set
-# CONFIG_MICROSEMI_PHY is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NXP_TJA11XX_PHY is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_RENESAS_PHY is not set
-# CONFIG_ROCKCHIP_PHY is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_STE10XP is not set
-# CONFIG_TERANETICS_PHY is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_XILINX_GMII2RGMII is not set
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-# CONFIG_PPP_FILTER is not set
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPPOE is not set
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-CONFIG_SLIP_MODE_SLIP6=y
-
-#
-# Host-side USB support is needed for USB Network Adapter support
-#
-# CONFIG_USB_NET_DRIVERS is not set
-# CONFIG_WLAN is not set
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
-# CONFIG_WAN is not set
-CONFIG_VMXNET3=m
-# CONFIG_FUJITSU_ES is not set
-CONFIG_HYPERV_NET=m
-# CONFIG_NETDEVSIM is not set
-CONFIG_NET_FAILOVER=m
-# CONFIG_ISDN is not set
-# CONFIG_NVM is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_MATRIXKMAP is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ADP5589 is not set
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_QT1050 is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_QT2160 is not set
-# CONFIG_KEYBOARD_DLINK_DIR685 is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_TCA8418 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_MPR121 is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-# CONFIG_MOUSE_PS2_ALPS is not set
-# CONFIG_MOUSE_PS2_BYD is not set
-# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
-# CONFIG_MOUSE_PS2_SYNAPTICS is not set
-CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
-# CONFIG_MOUSE_PS2_CYPRESS is not set
-# CONFIG_MOUSE_PS2_LIFEBOOK is not set
-# CONFIG_MOUSE_PS2_TRACKPOINT is not set
-# CONFIG_MOUSE_PS2_ELANTECH is not set
-# CONFIG_MOUSE_PS2_SENTELIC is not set
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-# CONFIG_MOUSE_PS2_FOCALTECH is not set
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MOUSE_PS2_SMBUS=y
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_BCM5974 is not set
-# CONFIG_MOUSE_CYAPA is not set
-# CONFIG_MOUSE_ELAN_I2C is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MOUSE_SYNAPTICS_USB is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-# CONFIG_RMI4_CORE is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
-CONFIG_SERIO_I8042=y
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
-# CONFIG_SERIO_ALTERA_PS2 is not set
-# CONFIG_SERIO_PS2MULT is not set
-# CONFIG_SERIO_ARC_PS2 is not set
-CONFIG_HYPERV_KEYBOARD=m
-# CONFIG_USERIO is not set
-# CONFIG_GAMEPORT is not set
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_N_GSM is not set
-# CONFIG_TRACE_SINK is not set
-# CONFIG_NULL_TTY is not set
-# CONFIG_LDISC_AUTOLOAD is not set
-CONFIG_DEVMEM=y
-# CONFIG_DEVKMEM is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-CONFIG_SERIAL_8250_PNP=y
-# CONFIG_SERIAL_8250_FINTEK is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_EXAR=y
-CONFIG_SERIAL_8250_NR_UARTS=16
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
-# CONFIG_SERIAL_8250_DW is not set
-# CONFIG_SERIAL_8250_RT288X is not set
-# CONFIG_SERIAL_8250_LPSS is not set
-# CONFIG_SERIAL_8250_MID is not set
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
-CONFIG_SERIAL_TIMBERDALE=m
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-CONFIG_SERIAL_PCH_UART=m
-# CONFIG_SERIAL_ARC is not set
-# CONFIG_SERIAL_RP2 is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_FSL_LINFLEXUART is not set
-# end of Serial drivers
-
-# CONFIG_SERIAL_DEV_BUS is not set
-# CONFIG_TTY_PRINTK is not set
-CONFIG_HVC_DRIVER=y
-CONFIG_VIRTIO_CONSOLE=m
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_HW_RANDOM=m
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_INTEL is not set
-# CONFIG_HW_RANDOM_AMD is not set
-# CONFIG_HW_RANDOM_GEODE is not set
-# CONFIG_HW_RANDOM_VIA is not set
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_NVRAM=m
-# CONFIG_APPLICOM is not set
-# CONFIG_SONYPI is not set
-# CONFIG_MWAVE is not set
-# CONFIG_SCx200_GPIO is not set
-# CONFIG_PC8736x_GPIO is not set
-# CONFIG_NSC_GPIO is not set
-# CONFIG_RAW_DRIVER is not set
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-# CONFIG_HPET_MMAP_DEFAULT is not set
-CONFIG_HANGCHECK_TIMER=m
-# CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
-CONFIG_DEVPORT=y
-# CONFIG_XILLYBUS is not set
-# end of Character devices
-
-CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-# CONFIG_I2C_MUX_LTC4306 is not set
-CONFIG_I2C_MUX_PCA9541=m
-# CONFIG_I2C_MUX_REG is not set
-# CONFIG_I2C_MUX_MLXCPLD is not set
-# end of Multiplexer I2C Chip support
-
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOBIT=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_AMD_MP2 is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C_ISMT is not set
-CONFIG_I2C_PIIX4=m
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_NVIDIA_GPU is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-
-#
-# ACPI drivers
-#
-# CONFIG_I2C_SCMI is not set
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_DESIGNWARE_PCI is not set
-# CONFIG_I2C_EG20T is not set
-# CONFIG_I2C_EMEV2 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_XILINX is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-# CONFIG_I2C_DIOLAN_U2C is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-
-#
-# Other I2C/SMBus bus drivers
-#
-# CONFIG_SCx200_ACB is not set
-# end of I2C Hardware Bus support
-
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_SLAVE is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# end of I2C support
-
-# CONFIG_I3C is not set
-# CONFIG_SPI is not set
-# CONFIG_SPMI is not set
-# CONFIG_HSI is not set
-CONFIG_PPS=y
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-# CONFIG_PPS_CLIENT_LDISC is not set
-# CONFIG_PPS_CLIENT_GPIO is not set
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=y
-# CONFIG_DP83640_PHY is not set
-# CONFIG_PTP_1588_CLOCK_PCH is not set
-CONFIG_PTP_1588_CLOCK_KVM=m
-# end of PTP clock support
-
-# CONFIG_PINCTRL is not set
-# CONFIG_GPIOLIB is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_AVS is not set
-# CONFIG_POWER_RESET is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-# CONFIG_PDA_POWER is not set
-# CONFIG_TEST_POWER is not set
-# CONFIG_CHARGER_ADP5061 is not set
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_CHARGER_SBS is not set
-# CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# CONFIG_CHARGER_BQ2415X is not set
-# CONFIG_CHARGER_SMB347 is not set
-# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-CONFIG_HWMON=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADT7410 is not set
-# CONFIG_SENSORS_ADT7411 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_AS370 is not set
-# CONFIG_SENSORS_ASC7621 is not set
-# CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_K10TEMP is not set
-# CONFIG_SENSORS_FAM15H_POWER is not set
-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ASPEED is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_DS620 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_DELL_SMM is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_FTSTEUTATES is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_G762 is not set
-# CONFIG_SENSORS_HIH6130 is not set
-# CONFIG_SENSORS_I5500 is not set
-# CONFIG_SENSORS_CORETEMP is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_JC42 is not set
-# CONFIG_SENSORS_POWR1220 is not set
-# CONFIG_SENSORS_LINEAGE is not set
-# CONFIG_SENSORS_LTC2945 is not set
-# CONFIG_SENSORS_LTC2990 is not set
-# CONFIG_SENSORS_LTC4151 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4222 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_LTC4260 is not set
-# CONFIG_SENSORS_LTC4261 is not set
-# CONFIG_SENSORS_MAX16065 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX1668 is not set
-# CONFIG_SENSORS_MAX197 is not set
-# CONFIG_SENSORS_MAX6621 is not set
-# CONFIG_SENSORS_MAX6639 is not set
-# CONFIG_SENSORS_MAX6642 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6697 is not set
-# CONFIG_SENSORS_MAX31790 is not set
-# CONFIG_SENSORS_MCP3021 is not set
-# CONFIG_SENSORS_TC654 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
-# CONFIG_SENSORS_LM95234 is not set
-# CONFIG_SENSORS_LM95241 is not set
-# CONFIG_SENSORS_LM95245 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_NTC_THERMISTOR is not set
-# CONFIG_SENSORS_NCT6683 is not set
-# CONFIG_SENSORS_NCT6775 is not set
-# CONFIG_SENSORS_NCT7802 is not set
-# CONFIG_SENSORS_NCT7904 is not set
-# CONFIG_SENSORS_NPCM7XX is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_PMBUS is not set
-# CONFIG_SENSORS_SHT21 is not set
-# CONFIG_SENSORS_SHT3x is not set
-# CONFIG_SENSORS_SHTC1 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_EMC1403 is not set
-# CONFIG_SENSORS_EMC2103 is not set
-# CONFIG_SENSORS_EMC6W201 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SCH5627 is not set
-# CONFIG_SENSORS_SCH5636 is not set
-# CONFIG_SENSORS_STTS751 is not set
-# CONFIG_SENSORS_SMM665 is not set
-# CONFIG_SENSORS_ADC128D818 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_AMC6821 is not set
-# CONFIG_SENSORS_INA209 is not set
-# CONFIG_SENSORS_INA2XX is not set
-# CONFIG_SENSORS_INA3221 is not set
-# CONFIG_SENSORS_TC74 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP102 is not set
-# CONFIG_SENSORS_TMP103 is not set
-# CONFIG_SENSORS_TMP108 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_VIA_CPUTEMP is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83773G is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83795 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-# CONFIG_SENSORS_ATK0110 is not set
-CONFIG_THERMAL=y
-# CONFIG_THERMAL_STATISTICS is not set
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-# CONFIG_THERMAL_WRITABLE_TRIPS is not set
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
-# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
-CONFIG_THERMAL_GOV_STEP_WISE=y
-# CONFIG_THERMAL_GOV_BANG_BANG is not set
-# CONFIG_THERMAL_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
-# CONFIG_THERMAL_EMULATION is not set
-
-#
-# Intel thermal drivers
-#
-# CONFIG_INTEL_POWERCLAMP is not set
-# CONFIG_INTEL_SOC_DTS_THERMAL is not set
-
-#
-# ACPI INT340X thermal drivers
-#
-# CONFIG_INT340X_THERMAL is not set
-# end of ACPI INT340X thermal drivers
-
-# CONFIG_INTEL_PCH_THERMAL is not set
-# end of Intel thermal drivers
-
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
-CONFIG_WATCHDOG_OPEN_TIMEOUT=0
-CONFIG_WATCHDOG_SYSFS=y
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
-
-#
-# Watchdog Device Drivers
-#
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_WDAT_WDT is not set
-# CONFIG_XILINX_WATCHDOG is not set
-# CONFIG_ZIIRAVE_WATCHDOG is not set
-# CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_DW_WATCHDOG is not set
-# CONFIG_MAX63XX_WATCHDOG is not set
-# CONFIG_ACQUIRE_WDT is not set
-# CONFIG_ADVANTECH_WDT is not set
-# CONFIG_ALIM1535_WDT is not set
-# CONFIG_ALIM7101_WDT is not set
-# CONFIG_EBC_C384_WDT is not set
-# CONFIG_F71808E_WDT is not set
-# CONFIG_SP5100_TCO is not set
-# CONFIG_SBC_FITPC2_WATCHDOG is not set
-# CONFIG_EUROTECH_WDT is not set
-# CONFIG_IB700_WDT is not set
-# CONFIG_IBMASR is not set
-# CONFIG_WAFER_WDT is not set
-CONFIG_I6300ESB_WDT=m
-# CONFIG_IE6XX_WDT is not set
-# CONFIG_ITCO_WDT is not set
-# CONFIG_IT8712F_WDT is not set
-# CONFIG_IT87_WDT is not set
-# CONFIG_HP_WATCHDOG is not set
-# CONFIG_SC1200_WDT is not set
-# CONFIG_SCx200_WDT is not set
-# CONFIG_PC87413_WDT is not set
-# CONFIG_NV_TCO is not set
-# CONFIG_60XX_WDT is not set
-# CONFIG_SBC8360_WDT is not set
-# CONFIG_SBC7240_WDT is not set
-# CONFIG_CPU5_WDT is not set
-# CONFIG_SMSC_SCH311X_WDT is not set
-# CONFIG_SMSC37B787_WDT is not set
-# CONFIG_TQMX86_WDT is not set
-# CONFIG_VIA_WDT is not set
-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
-# CONFIG_MACHZ_WDT is not set
-# CONFIG_SBC_EPX_C3_WATCHDOG is not set
-# CONFIG_NI903X_WDT is not set
-# CONFIG_NIC7018_WDT is not set
-
-#
-# PCI-based Watchdog Cards
-#
-# CONFIG_PCIPCWATCHDOG is not set
-# CONFIG_WDTPCI is not set
-
-#
-# USB-based Watchdog Cards
-#
-# CONFIG_USBPCWATCHDOG is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB is not set
-CONFIG_BCMA_POSSIBLE=y
-# CONFIG_BCMA is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_CS5535 is not set
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_MADERA is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
-# CONFIG_LPC_ICH is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_MFD_INTEL_LPSS_ACPI is not set
-# CONFIG_MFD_INTEL_LPSS_PCI is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_MENF21BMC is not set
-# CONFIG_MFD_VIPERBOARD is not set
-# CONFIG_MFD_RETU is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_SKY81452 is not set
-# CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_SYSCON is not set
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_TI_LMU is not set
-# CONFIG_TPS6105X is not set
-# CONFIG_TPS6507X is not set
-# CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_WL1273_CORE is not set
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_TQMX86 is not set
-# CONFIG_MFD_VX855 is not set
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_WM8994 is not set
-# end of Multifunction device drivers
-
-# CONFIG_REGULATOR is not set
-CONFIG_RC_CORE=y
-CONFIG_RC_MAP=y
-# CONFIG_LIRC is not set
-# CONFIG_RC_DECODERS is not set
-# CONFIG_RC_DEVICES is not set
-# CONFIG_MEDIA_SUPPORT is not set
-
-#
-# Graphics support
-#
-# CONFIG_AGP is not set
-# CONFIG_VGA_ARB is not set
-CONFIG_DRM=m
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-# CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_TTM=m
-CONFIG_DRM_VRAM_HELPER=m
-CONFIG_DRM_GEM_SHMEM_HELPER=y
-
-#
-# I2C encoder or helper chips
-#
-# CONFIG_DRM_I2C_CH7006 is not set
-# CONFIG_DRM_I2C_SIL164 is not set
-# CONFIG_DRM_I2C_NXP_TDA998X is not set
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# end of I2C encoder or helper chips
-
-#
-# ARM devices
-#
-# end of ARM devices
-
-# CONFIG_DRM_RADEON is not set
-# CONFIG_DRM_AMDGPU is not set
-
-#
-# ACP (Audio CoProcessor) Configuration
-#
-# end of ACP (Audio CoProcessor) Configuration
-
-# CONFIG_DRM_NOUVEAU is not set
-# CONFIG_DRM_I915 is not set
-# CONFIG_DRM_VGEM is not set
-# CONFIG_DRM_VKMS is not set
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
-# CONFIG_DRM_GMA500 is not set
-# CONFIG_DRM_UDL is not set
-# CONFIG_DRM_AST is not set
-# CONFIG_DRM_MGAG200 is not set
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_QXL=m
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-# end of Display Panels
-
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_PANEL_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-# CONFIG_DRM_ANALOGIX_ANX78XX is not set
-# end of Display Interface Bridges
-
-# CONFIG_DRM_ETNAVIV is not set
-# CONFIG_DRM_GM12U320 is not set
-# CONFIG_DRM_VBOXVIDEO is not set
-# CONFIG_DRM_LEGACY is not set
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=m
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_IMAGEBLIT=m
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ARC is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_UVESA=m
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_OPENCORES is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-CONFIG_FB_HYPERV=m
-# CONFIG_FB_SM712 is not set
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
-# end of Backlight & LCD device support
-
-CONFIG_VGASTATE=m
-CONFIG_HDMI=y
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# end of Console display driver support
-
-# CONFIG_LOGO is not set
-# end of Graphics support
-
-# CONFIG_SOUND is not set
-
-#
-# HID support
-#
-CONFIG_HID=m
-# CONFIG_HID_BATTERY_STRENGTH is not set
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACCUTOUCH is not set
-# CONFIG_HID_ACRUX is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_APPLEIR is not set
-# CONFIG_HID_AUREAL is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BETOP_FF is not set
-CONFIG_HID_CHERRY=m
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_COUGAR is not set
-# CONFIG_HID_MACALLY is not set
-# CONFIG_HID_CMEDIA is not set
-# CONFIG_HID_CREATIVE_SB0540 is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GEMBIRD is not set
-# CONFIG_HID_GFRM is not set
-# CONFIG_HID_HOLTEK is not set
-# CONFIG_HID_KEYTOUCH is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_UCLOGIC is not set
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_VIEWSONIC is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_ICADE is not set
-# CONFIG_HID_ITE is not set
-# CONFIG_HID_JABRA is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_LENOVO is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MAGICMOUSE is not set
-# CONFIG_HID_MALTRON is not set
-# CONFIG_HID_MAYFLASH is not set
-# CONFIG_HID_REDRAGON is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_MULTITOUCH is not set
-# CONFIG_HID_NTI is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PENMOUNT is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PICOLCD is not set
-# CONFIG_HID_PLANTRONICS is not set
-# CONFIG_HID_PRIMAX is not set
-# CONFIG_HID_RETRODE is not set
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_SAITEK is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SPEEDLINK is not set
-# CONFIG_HID_STEAM is not set
-# CONFIG_HID_STEELSERIES is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_RMI is not set
-# CONFIG_HID_GREENASIA is not set
-CONFIG_HID_HYPERV_MOUSE=m
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_UDRAW_PS3 is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HID_ZYDACRON is not set
-# CONFIG_HID_SENSOR_HUB is not set
-# CONFIG_HID_ALPS is not set
-# end of Special HID drivers
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-# end of USB HID Boot Protocol drivers
-# end of USB HID support
-
-#
-# I2C HID support
-#
-# CONFIG_I2C_HID is not set
-# end of I2C HID support
-# end of HID support
-
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
-# CONFIG_USB_ULPI_BUS is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-CONFIG_USB_PCI=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-# CONFIG_USB_DEFAULT_PERSIST is not set
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_MON=m
-
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=m
-# CONFIG_USB_XHCI_PLATFORM is not set
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-CONFIG_USB_EHCI_PCI=m
-# CONFIG_USB_EHCI_FSL is not set
-CONFIG_USB_EHCI_HCD_PLATFORM=m
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_FOTG210_HCD is not set
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_UHCI_HCD=m
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_TMC is not set
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_REALTEK is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-CONFIG_USB_UAS=m
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USBIP_CORE is not set
-# CONFIG_USB_CDNS3 is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_ISP1760 is not set
-
-#
-# USB port drivers
-#
-# CONFIG_USB_SERIAL is not set
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_YUREX is not set
-# CONFIG_USB_EZUSB_FX2 is not set
-# CONFIG_USB_HUB_USB251XB is not set
-# CONFIG_USB_HSIC_USB3503 is not set
-# CONFIG_USB_HSIC_USB4604 is not set
-# CONFIG_USB_LINK_LAYER_TEST is not set
-# CONFIG_USB_CHAOSKEY is not set
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_USB_ISP1301 is not set
-# end of USB Physical Layer drivers
-
-# CONFIG_USB_GADGET is not set
-# CONFIG_TYPEC is not set
-# CONFIG_USB_ROLE_SWITCH is not set
-# CONFIG_MMC is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_NEW_LEDS is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_INFINIBAND is not set
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_RTC_LIB=y
-CONFIG_RTC_MC146818_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_NVMEM=y
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-# CONFIG_RTC_DRV_ABB5ZES3 is not set
-# CONFIG_RTC_DRV_ABEOZ9 is not set
-# CONFIG_RTC_DRV_ABX80X is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_ISL12022 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_PCF8523 is not set
-# CONFIG_RTC_DRV_PCF85063 is not set
-# CONFIG_RTC_DRV_PCF85363 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_BQ32K is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_RX8010 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_EM3027 is not set
-# CONFIG_RTC_DRV_RV3028 is not set
-# CONFIG_RTC_DRV_RV8803 is not set
-# CONFIG_RTC_DRV_SD3078 is not set
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_I2C_AND_SPI=m
-
-#
-# SPI and I2C RTC drivers
-#
-# CONFIG_RTC_DRV_DS3232 is not set
-# CONFIG_RTC_DRV_PCF2127 is not set
-# CONFIG_RTC_DRV_RV3029C2 is not set
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1685_FAMILY is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS2404 is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_MSM6242 is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-# CONFIG_RTC_DRV_RP5C01 is not set
-# CONFIG_RTC_DRV_V3020 is not set
-
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_FTRTC010 is not set
-
-#
-# HID Sensor RTC drivers
-#
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_ACPI=y
-# CONFIG_ALTERA_MSGDMA is not set
-# CONFIG_INTEL_IDMA64 is not set
-CONFIG_PCH_DMA=m
-# CONFIG_QCOM_HIDMA_MGMT is not set
-CONFIG_QCOM_HIDMA=m
-# CONFIG_DW_DMAC is not set
-# CONFIG_DW_DMAC_PCI is not set
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
-
-#
-# DMA Clients
-#
-# CONFIG_ASYNC_TX_DMA is not set
-# CONFIG_DMATEST is not set
-
-#
-# DMABUF options
-#
-CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
-# CONFIG_DMABUF_SELFTESTS is not set
-# end of DMABUF options
-
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
-# CONFIG_VFIO is not set
-CONFIG_IRQ_BYPASS_MANAGER=m
-CONFIG_VIRT_DRIVERS=y
-# CONFIG_VBOXGUEST is not set
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_HYPERV=m
-CONFIG_HYPERV_TIMER=y
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
-# end of Microsoft Hyper-V guest support
-
-# CONFIG_GREYBUS is not set
-# CONFIG_STAGING is not set
-# CONFIG_X86_PLATFORM_DEVICES is not set
-CONFIG_PMC_ATOM=y
-# CONFIG_MFD_CROS_EC is not set
-# CONFIG_CHROME_PLATFORMS is not set
-# CONFIG_MELLANOX_PLATFORM is not set
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-
-#
-# Common Clock Framework
-#
-# CONFIG_COMMON_CLK_MAX9485 is not set
-# CONFIG_COMMON_CLK_SI5341 is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-# CONFIG_COMMON_CLK_SI544 is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# end of Common Clock Framework
-
-# CONFIG_HWSPINLOCK is not set
-
-#
-# Clock Source drivers
-#
-CONFIG_CLKSRC_I8253=y
-CONFIG_CLKEVT_I8253=y
-CONFIG_CLKBLD_I8253=y
-# end of Clock Source drivers
-
-# CONFIG_MAILBOX is not set
-CONFIG_IOMMU_IOVA=y
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-# end of Generic IOMMU Pagetable Support
-
-# CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_DMAR_TABLE=y
-CONFIG_INTEL_IOMMU=y
-# CONFIG_INTEL_IOMMU_SVM is not set
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-CONFIG_HYPERV_IOMMU=y
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-CONFIG_RPMSG=m
-# CONFIG_RPMSG_CHAR is not set
-CONFIG_RPMSG_VIRTIO=m
-# end of Rpmsg drivers
-
-# CONFIG_SOUNDWIRE is not set
-
-#
-# SOC (System On Chip) specific Drivers
-#
-
-#
-# Amlogic SoC drivers
-#
-# end of Amlogic SoC drivers
-
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-# end of i.MX SoC drivers
-
-#
-# Qualcomm SoC drivers
-#
-# end of Qualcomm SoC drivers
-
-# CONFIG_SOC_TI is not set
-
-#
-# Xilinx SoC drivers
-#
-# CONFIG_XILINX_VCU is not set
-# end of Xilinx SoC drivers
-# end of SOC (System On Chip) specific Drivers
-
-# CONFIG_PM_DEVFREQ is not set
-# CONFIG_EXTCON is not set
-CONFIG_MEMORY=y
-# CONFIG_IIO is not set
-# CONFIG_NTB is not set
-# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
-
-#
-# IRQ chip support
-#
-# end of IRQ chip support
-
-# CONFIG_IPACK_BUS is not set
-# CONFIG_RESET_CONTROLLER is not set
-
-#
-# PHY Subsystem
-#
-# CONFIG_GENERIC_PHY is not set
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# end of PHY Subsystem
-
-# CONFIG_POWERCAP is not set
-# CONFIG_MCB is not set
-
-#
-# Performance monitor support
-#
-# end of Performance monitor support
-
-# CONFIG_RAS is not set
-# CONFIG_THUNDERBOLT is not set
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-# end of Android
-
-CONFIG_DAX=m
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SYSFS=y
-
-#
-# HW tracing support
-#
-# CONFIG_STM is not set
-# CONFIG_INTEL_TH is not set
-# end of HW tracing support
-
-# CONFIG_FPGA is not set
-# CONFIG_SIOX is not set
-# CONFIG_SLIMBUS is not set
-# CONFIG_INTERCONNECT is not set
-# CONFIG_COUNTER is not set
-# end of Device Drivers
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-# CONFIG_VALIDATE_FS_PARSER is not set
-CONFIG_FS_IOMAP=y
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-# CONFIG_REISERFS_FS_SECURITY is not set
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-CONFIG_XFS_ONLINE_SCRUB=y
-# CONFIG_XFS_ONLINE_REPAIR is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_FS_REF_VERIFY is not set
-CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-# CONFIG_F2FS_FS_SECURITY is not set
-# CONFIG_F2FS_CHECK_FS is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_FS_DAX is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_EXPORTFS_BLOCK_OPS=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_MANDATORY_FILE_LOCKING is not set
-CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_DNOTIFY is not set
-CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_AUTOFS_FS=m
-CONFIG_FUSE_FS=m
-# CONFIG_CUSE is not set
-CONFIG_VIRTIO_FS=m
-CONFIG_OVERLAY_FS=m
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
-# CONFIG_OVERLAY_FS_INDEX is not set
-# CONFIG_OVERLAY_FS_XINO_AUTO is not set
-# CONFIG_OVERLAY_FS_METACOPY is not set
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_FAT_DEFAULT_UTF8 is not set
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-# end of DOS/FAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-# CONFIG_PROC_KCORE is not set
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PROC_CHILDREN is not set
-CONFIG_PROC_PID_ARCH_STATUS=y
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-# CONFIG_HUGETLBFS is not set
-CONFIG_MEMFD_CREATE=y
-CONFIG_CONFIGFS_FS=m
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ORANGEFS_FS is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-CONFIG_EFS_FS=m
-CONFIG_CRAMFS=m
-# CONFIG_CRAMFS_BLOCKDEV is not set
-CONFIG_SQUASHFS=m
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZSTD is not set
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-CONFIG_HPFS_FS=m
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-CONFIG_ROMFS_FS=m
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
-CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_PSTORE=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=y
-# CONFIG_PSTORE_LZO_COMPRESS is not set
-# CONFIG_PSTORE_LZ4_COMPRESS is not set
-# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
-# CONFIG_PSTORE_842_COMPRESS is not set
-# CONFIG_PSTORE_ZSTD_COMPRESS is not set
-CONFIG_PSTORE_COMPRESS=y
-CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
-CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-CONFIG_PSTORE_RAM=m
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-# CONFIG_EROFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
-# CONFIG_NFS_V4_1_MIGRATION is not set
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_BLOCKLAYOUT=y
-CONFIG_NFSD_SCSILAYOUT=y
-CONFIG_NFSD_FLEXFILELAYOUT=y
-CONFIG_GRACE_PERIOD=m
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
-# CONFIG_SUNRPC_DEBUG is not set
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CEPH_FS_POSIX_ACL=y
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_UPCALL is not set
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_DEBUG=y
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_FSCACHE=y
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-# CONFIG_9P_FS_SECURITY is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-# CONFIG_UNICODE is not set
-# end of File systems
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_KEYS_REQUEST_CACHE is not set
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_KEY_DH_OPERATIONS=y
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-# CONFIG_SECURITY is not set
-CONFIG_SECURITYFS=y
-# CONFIG_INTEL_TXT is not set
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_HARDENED_USERCOPY_FALLBACK=y
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
-# CONFIG_FORTIFY_SOURCE is not set
-# CONFIG_STATIC_USERMODEHELPER is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=m
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_KPP=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_SIMD=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-CONFIG_CRYPTO_ENGINE=m
-
-#
-# Public-key cryptography
-#
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-# CONFIG_CRYPTO_ECDH is not set
-# CONFIG_CRYPTO_ECRDSA is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CFB=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=m
-# CONFIG_CRYPTO_OFB is not set
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m
-# CONFIG_CRYPTO_ADIANTUM is not set
-CONFIG_CRYPTO_ESSIV=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32C_INTEL=m
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-# CONFIG_CRYPTO_XXHASH is not set
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_586=m
-CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_586=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=m
-# CONFIG_CRYPTO_842 is not set
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-CONFIG_CRYPTO_ZSTD=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=m
-CONFIG_CRYPTO_DRBG_HMAC=y
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-CONFIG_CRYPTO_DRBG=m
-CONFIG_CRYPTO_JITTERENTROPY=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
-CONFIG_CRYPTO_HASH_INFO=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_GEODE=m
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_SP_CCP=y
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
-CONFIG_CRYPTO_DEV_QAT=m
-# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
-# CONFIG_CRYPTO_DEV_QAT_C3XXX is not set
-# CONFIG_CRYPTO_DEV_QAT_C62X is not set
-CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
-# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
-CONFIG_CRYPTO_DEV_VIRTIO=m
-# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
-CONFIG_ASYMMETRIC_KEY_TYPE=y
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-CONFIG_X509_CERTIFICATE_PARSER=y
-# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set
-CONFIG_PKCS7_MESSAGE_PARSER=y
-# CONFIG_PKCS7_TEST_KEY is not set
-# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
-
-#
-# Certificates for signature checking
-#
-CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
-# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-# end of Certificates for signature checking
-
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_RAID6_PQ_BENCHMARK=y
-# CONFIG_PACKING is not set
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_CORDIC=m
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=m
-# CONFIG_CRC4 is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_XXHASH=y
-CONFIG_AUDIT_GENERIC=y
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=m
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_COMPRESS=m
-CONFIG_ZSTD_DECOMPRESS=m
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_SWIOTLB=y
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
-CONFIG_CLZ_TAB=y
-CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=y
-CONFIG_DIMLIB=y
-CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=m
-CONFIG_HAVE_GENERIC_VDSO=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_GENERIC_VDSO_32=y
-CONFIG_FONT_SUPPORT=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-CONFIG_SG_POOL=y
-CONFIG_ARCH_STACKWALK=y
-CONFIG_SBITMAP=y
-# CONFIG_STRING_SELFTEST is not set
-# end of Library routines
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-# CONFIG_PRINTK_CALLER is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=3
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# end of printk and dmesg options
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_INSTALL is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# end of Compile-time checks and compiler options
-
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_MAGIC_SYSRQ_SERIAL=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_OWNER is not set
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
-CONFIG_DEBUG_RODATA_TEST=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-CONFIG_CC_HAS_KASAN_GENERIC=y
-CONFIG_KASAN_STACK=1
-# end of Memory Debugging
-
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-CONFIG_DEBUG_SHIRQ=y
-
-#
-# Debug Lockups and Hangs
-#
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_SOFTLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_HARDLOCKUP_DETECTOR_PERF=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_WQ_WATCHDOG is not set
-# end of Debug Lockups and Hangs
-
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-CONFIG_SCHEDSTATS=y
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-# end of Lock Debugging (spinlocks, mutexes, etc...)
-
-CONFIG_STACKTRACE=y
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# end of RCU Debugging
-
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-CONFIG_FUNCTION_ERROR_INJECTION=y
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_LATENCYTOP=y
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_PREEMPTIRQ_EVENTS is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_ENABLE_DEFAULT_TRACERS is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_KPROBE_EVENTS=y
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-# CONFIG_BPF_KPROBE_OVERRIDE is not set
-# CONFIG_MMIOTRACE is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_RUNTIME_TESTING_MENU is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_IO_STRICT_DEVMEM=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_X86_VERBOSE_BOOTUP is not set
-# CONFIG_EARLY_PRINTK is not set
-# CONFIG_X86_PTDUMP is not set
-# CONFIG_DEBUG_WX is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-# CONFIG_X86_DECODER_SELFTEST is not set
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-# CONFIG_DEBUG_ENTRY is not set
-CONFIG_DEBUG_NMI_SELFTEST=y
-CONFIG_X86_DEBUG_FPU=y
-# CONFIG_PUNIT_ATOM_DEBUG is not set
-CONFIG_UNWINDER_FRAME_POINTER=y
-# CONFIG_UNWINDER_GUESS is not set
-# end of Kernel hacking
diff --git a/main/linux-lts/config-virt.x86_64 b/main/linux-lts/config-virt.x86_64
deleted file mode 100644
index d0186b3073f..00000000000
--- a/main/linux-lts/config-virt.x86_64
+++ /dev/null
@@ -1,4728 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.4.23 Kernel Configuration
-#
-
-#
-# Compiler: gcc (Alpine 9.2.0) 9.2.0
-#
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-CONFIG_THREAD_INFO_IN_TASK=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-# CONFIG_HEADER_TEST is not set
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT=""
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_XZ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_BZIP2 is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
-# CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_USELIB=y
-CONFIG_AUDIT=y
-CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
-CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_SPARSE_IRQ=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
-# end of IRQ subsystem
-
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_ARCH_CLOCKSOURCE_INIT=y
-CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ_COMMON=y
-# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-# end of Timers subsystem
-
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-CONFIG_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_SCHED_AVG_IRQ=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-CONFIG_IKCONFIG=m
-CONFIG_IKCONFIG_PROC=y
-# CONFIG_IKHEADERS is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-
-#
-# Scheduler features
-#
-# end of Scheduler features
-
-CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
-CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
-CONFIG_ARCH_SUPPORTS_INT128=y
-CONFIG_CGROUPS=y
-CONFIG_PAGE_COUNTER=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-# CONFIG_MEMCG_SWAP_ENABLED is not set
-CONFIG_MEMCG_KMEM=y
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_WRITEBACK=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_CFS_BANDWIDTH=y
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_HUGETLB=y
-CONFIG_CPUSETS=y
-# CONFIG_PROC_PID_CPUSET is not set
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_CGROUP_PERF=y
-CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-# CONFIG_CHECKPOINT_RESTORE is not set
-CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_RELAY is not set
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_RD_LZ4=y
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_HAVE_UID16=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_MULTIUSER=y
-# CONFIG_SGETMASK_SYSCALL is not set
-# CONFIG_SYSFS_SYSCALL is not set
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_FHANDLE=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-# CONFIG_PCSPKR_PLATFORM is not set
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
-# CONFIG_USERFAULTFD is not set
-CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_HAVE_PERF_EVENTS=y
-# CONFIG_PC104 is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-CONFIG_SLAB_FREELIST_RANDOM=y
-# CONFIG_SLAB_FREELIST_HARDENED is not set
-# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
-CONFIG_SLUB_CPU_PARTIAL=y
-CONFIG_SYSTEM_DATA_VERIFICATION=y
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-# end of General setup
-
-CONFIG_64BIT=y
-CONFIG_X86_64=y
-CONFIG_X86=y
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MIN=28
-CONFIG_ARCH_MMAP_RND_BITS_MAX=32
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
-CONFIG_ZONE_DMA32=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_X86_64_SMP=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=4
-CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
-
-#
-# Processor type and features
-#
-CONFIG_ZONE_DMA=y
-CONFIG_SMP=y
-CONFIG_X86_FEATURE_NAMES=y
-CONFIG_X86_X2APIC=y
-# CONFIG_X86_MPPARSE is not set
-# CONFIG_GOLDFISH is not set
-CONFIG_RETPOLINE=y
-# CONFIG_X86_CPU_RESCTRL is not set
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-# CONFIG_X86_INTEL_LPSS is not set
-# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
-# CONFIG_IOSF_MBI is not set
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-CONFIG_PARAVIRT_XXL=y
-# CONFIG_PARAVIRT_DEBUG is not set
-CONFIG_PARAVIRT_SPINLOCKS=y
-CONFIG_X86_HV_CALLBACK_VECTOR=y
-CONFIG_XEN=y
-CONFIG_XEN_PV=y
-CONFIG_XEN_PV_SMP=y
-CONFIG_XEN_DOM0=y
-CONFIG_XEN_PVHVM=y
-CONFIG_XEN_PVHVM_SMP=y
-CONFIG_XEN_512GB=y
-CONFIG_XEN_SAVE_RESTORE=y
-# CONFIG_XEN_DEBUG_FS is not set
-CONFIG_XEN_PVH=y
-CONFIG_KVM_GUEST=y
-CONFIG_ARCH_CPUIDLE_HALTPOLL=y
-CONFIG_PVH=y
-# CONFIG_KVM_DEBUG_FS is not set
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
-CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_JAILHOUSE_GUEST is not set
-# CONFIG_ACRN_GUEST is not set
-# CONFIG_MK8 is not set
-# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-CONFIG_GENERIC_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=64
-CONFIG_X86_DEBUGCTLMSR=y
-# CONFIG_PROCESSOR_SELECT is not set
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_HYGON=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_ZHAOXIN=y
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-# CONFIG_GART_IOMMU is not set
-# CONFIG_CALGARY_IOMMU is not set
-# CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS_RANGE_BEGIN=2
-CONFIG_NR_CPUS_RANGE_END=512
-CONFIG_NR_CPUS_DEFAULT=64
-CONFIG_NR_CPUS=256
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_MC_PRIO=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
-# CONFIG_X86_MCE is not set
-
-#
-# Performance monitoring
-#
-CONFIG_PERF_EVENTS_INTEL_UNCORE=y
-# CONFIG_PERF_EVENTS_INTEL_RAPL is not set
-# CONFIG_PERF_EVENTS_INTEL_CSTATE is not set
-# CONFIG_PERF_EVENTS_AMD_POWER is not set
-# end of Performance monitoring
-
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX64=y
-CONFIG_X86_VSYSCALL_EMULATION=y
-# CONFIG_I8K is not set
-# CONFIG_MICROCODE is not set
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-# CONFIG_X86_5LEVEL is not set
-CONFIG_X86_DIRECT_GBPAGES=y
-# CONFIG_X86_CPA_STATISTICS is not set
-# CONFIG_AMD_MEM_ENCRYPT is not set
-# CONFIG_NUMA is not set
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_MEMORY_PROBE=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-# CONFIG_X86_PMEM_LEGACY is not set
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW=64
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_ARCH_RANDOM=y
-# CONFIG_X86_SMAP is not set
-CONFIG_X86_INTEL_UMIP=y
-# CONFIG_X86_INTEL_MPX is not set
-# CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is not set
-CONFIG_X86_INTEL_TSX_MODE_OFF=y
-# CONFIG_X86_INTEL_TSX_MODE_ON is not set
-# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
-CONFIG_EFI=y
-CONFIG_EFI_STUB=y
-# CONFIG_EFI_MIXED is not set
-CONFIG_SECCOMP=y
-CONFIG_HZ_100=y
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=100
-CONFIG_SCHED_HRTICK=y
-# CONFIG_KEXEC is not set
-# CONFIG_KEXEC_FILE is not set
-# CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_DYNAMIC_MEMORY_LAYOUT=y
-CONFIG_RANDOMIZE_MEMORY=y
-CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
-# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_LEGACY_VSYSCALL_EMULATE is not set
-# CONFIG_LEGACY_VSYSCALL_XONLY is not set
-CONFIG_LEGACY_VSYSCALL_NONE=y
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_MODIFY_LDT_SYSCALL=y
-CONFIG_HAVE_LIVEPATCH=y
-# end of Processor type and features
-
-CONFIG_ARCH_HAS_ADD_PAGES=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
-CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SUSPEND_SKIP_SYNC is not set
-CONFIG_HIBERNATE_CALLBACKS=y
-# CONFIG_HIBERNATION is not set
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_CLK=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-# CONFIG_ENERGY_MODEL is not set
-CONFIG_ARCH_SUPPORTS_ACPI=y
-CONFIG_ACPI=y
-CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
-CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
-CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
-# CONFIG_ACPI_DEBUGGER is not set
-CONFIG_ACPI_SPCR_TABLE=y
-CONFIG_ACPI_LPIT=y
-CONFIG_ACPI_SLEEP=y
-# CONFIG_ACPI_PROCFS_POWER is not set
-# CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set
-CONFIG_ACPI_EC_DEBUGFS=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=m
-# CONFIG_ACPI_TAD is not set
-# CONFIG_ACPI_DOCK is not set
-CONFIG_ACPI_CPU_FREQ_PSS=y
-CONFIG_ACPI_PROCESSOR_CSTATE=y
-CONFIG_ACPI_PROCESSOR_IDLE=y
-CONFIG_ACPI_CPPC_LIB=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
-# CONFIG_ACPI_TABLE_UPGRADE is not set
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HOTPLUG_MEMORY=y
-CONFIG_ACPI_HOTPLUG_IOAPIC=y
-CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=m
-# CONFIG_ACPI_CUSTOM_METHOD is not set
-CONFIG_ACPI_BGRT=y
-# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
-# CONFIG_ACPI_NFIT is not set
-CONFIG_HAVE_ACPI_APEI=y
-CONFIG_HAVE_ACPI_APEI_NMI=y
-CONFIG_ACPI_APEI=y
-# CONFIG_ACPI_APEI_GHES is not set
-# CONFIG_ACPI_APEI_EINJ is not set
-CONFIG_ACPI_APEI_ERST_DEBUG=y
-# CONFIG_DPTF_POWER is not set
-# CONFIG_PMIC_OPREGION is not set
-# CONFIG_ACPI_CONFIGFS is not set
-CONFIG_X86_PM_TIMER=y
-# CONFIG_SFI is not set
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_STAT is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set
-
-#
-# CPU frequency scaling drivers
-#
-CONFIG_X86_INTEL_PSTATE=y
-# CONFIG_X86_PCC_CPUFREQ is not set
-# CONFIG_X86_ACPI_CPUFREQ is not set
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-# CONFIG_X86_P4_CLOCKMOD is not set
-
-#
-# shared options
-#
-# end of CPU Frequency scaling
-
-#
-# CPU Idle
-#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
-# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set
-CONFIG_HALTPOLL_CPUIDLE=y
-# end of CPU Idle
-
-# CONFIG_INTEL_IDLE is not set
-# end of Power management and ACPI options
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_XEN=y
-CONFIG_MMCONF_FAM10H=y
-CONFIG_PCI_CNB20LE_QUIRK=y
-# CONFIG_ISA_BUS is not set
-CONFIG_ISA_DMA_API=y
-CONFIG_AMD_NB=y
-CONFIG_X86_SYSFB=y
-# end of Bus options (PCI etc.)
-
-#
-# Binary Emulations
-#
-CONFIG_IA32_EMULATION=y
-# CONFIG_X86_X32 is not set
-CONFIG_COMPAT_32=y
-CONFIG_COMPAT=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_SYSVIPC_COMPAT=y
-# end of Binary Emulations
-
-#
-# Firmware Drivers
-#
-# CONFIG_EDD is not set
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_DMIID=y
-# CONFIG_DMI_SYSFS is not set
-CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
-# CONFIG_ISCSI_IBFT is not set
-CONFIG_FW_CFG_SYSFS=m
-# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=m
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
-# CONFIG_EFI_FAKE_MEMMAP is not set
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-# CONFIG_EFI_BOOTLOADER_CONTROL is not set
-# CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_TEST is not set
-# CONFIG_APPLE_PROPERTIES is not set
-# CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_EFI_RCI2_TABLE is not set
-# end of EFI (Extensible Firmware Interface) Support
-
-CONFIG_UEFI_CPER=y
-CONFIG_UEFI_CPER_X86=y
-CONFIG_EFI_EARLYCON=y
-
-#
-# Tegra firmware driver
-#
-# end of Tegra firmware driver
-# end of Firmware Drivers
-
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_HAVE_KVM_IRQ_ROUTING=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_ASYNC_PF=y
-CONFIG_HAVE_KVM_MSI=y
-CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
-CONFIG_KVM_VFIO=y
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_KVM_COMPAT=y
-CONFIG_HAVE_KVM_IRQ_BYPASS=y
-CONFIG_HAVE_KVM_NO_POLL=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_KVM_AMD_SEV=y
-# CONFIG_KVM_MMU_AUDIT is not set
-CONFIG_VHOST_NET=m
-# CONFIG_VHOST_SCSI is not set
-# CONFIG_VHOST_VSOCK is not set
-CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
-
-#
-# General architecture-dependent options
-#
-CONFIG_HOTPLUG_SMT=y
-CONFIG_OPROFILE=m
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-CONFIG_HAVE_OPROFILE=y
-CONFIG_OPROFILE_NMI_TIMER=y
-CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_OPTPROBES=y
-CONFIG_UPROBES=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_KRETPROBES=y
-CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPTPROBES=y
-CONFIG_HAVE_KPROBES_ON_FTRACE=y
-CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
-CONFIG_ARCH_HAS_SET_MEMORY=y
-CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
-CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
-CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
-CONFIG_HAVE_ASM_MODVERSIONS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-CONFIG_HAVE_PERF_EVENTS_NMI=y
-CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
-CONFIG_HAVE_PERF_REGS=y
-CONFIG_HAVE_PERF_USER_STACK_DUMP=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
-CONFIG_HAVE_RCU_TABLE_FREE=y
-CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_CMPXCHG_LOCAL=y
-CONFIG_HAVE_CMPXCHG_DOUBLE=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_ARCH_STACKLEAK=y
-CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_MOVE_PMD=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
-CONFIG_HAVE_ARCH_HUGE_VMAP=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_HAVE_ARCH_SOFT_DIRTY=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=28
-CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
-CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_HAVE_STACK_VALIDATION=y
-CONFIG_HAVE_RELIABLE_STACKTRACE=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_COMPAT_OLD_SIGACTION=y
-CONFIG_64BIT_TIME=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_HAVE_ARCH_VMAP_STACK=y
-CONFIG_VMAP_STACK=y
-CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
-CONFIG_STRICT_KERNEL_RWX=y
-CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
-CONFIG_STRICT_MODULE_RWX=y
-CONFIG_ARCH_HAS_REFCOUNT=y
-# CONFIG_REFCOUNT_FULL is not set
-CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
-# CONFIG_LOCK_EVENT_COUNTS is not set
-CONFIG_ARCH_HAS_MEM_ENCRYPT=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-# end of GCOV-based kernel profiling
-
-CONFIG_PLUGIN_HOSTCC=""
-CONFIG_HAVE_GCC_PLUGINS=y
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULE_SIG_FORMAT=y
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
-CONFIG_ASM_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULE_SIG=y
-# CONFIG_MODULE_SIG_FORCE is not set
-CONFIG_MODULE_SIG_ALL=y
-CONFIG_MODULE_SIG_SHA1=y
-# CONFIG_MODULE_SIG_SHA224 is not set
-# CONFIG_MODULE_SIG_SHA256 is not set
-# CONFIG_MODULE_SIG_SHA384 is not set
-# CONFIG_MODULE_SIG_SHA512 is not set
-CONFIG_MODULE_SIG_HASH="sha1"
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_MODULES_TREE_LOOKUP=y
-CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
-CONFIG_BLK_DEV_BSG=y
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-# CONFIG_BLK_DEV_ZONED is not set
-CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_THROTTLING_LOW is not set
-# CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_WBT is not set
-CONFIG_BLK_CGROUP_IOLATENCY=y
-# CONFIG_BLK_CGROUP_IOCOST is not set
-CONFIG_BLK_DEBUG_FS=y
-# CONFIG_BLK_SED_OPAL is not set
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_AIX_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_KARMA_PARTITION is not set
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_CMDLINE_PARTITION is not set
-# end of Partition Types
-
-CONFIG_BLOCK_COMPAT=y
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_MQ_VIRTIO=y
-CONFIG_BLK_PM=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-# CONFIG_IOSCHED_BFQ is not set
-# end of IO Schedulers
-
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_PADATA=y
-CONFIG_ASN1=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-CONFIG_QUEUED_SPINLOCKS=y
-CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
-CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
-CONFIG_FREEZER=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_ELFCORE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_FAST_GUP=y
-CONFIG_MEMORY_ISOLATION=y
-CONFIG_HAVE_BOOTMEM_INFO_NODE=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTPLUG_SPARSE=y
-CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MEMORY_BALLOON=y
-CONFIG_BALLOON_COMPACTION=y
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_CONTIG_ALLOC=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
-CONFIG_ARCH_WANTS_THP_SWAP=y
-CONFIG_CLEANCACHE=y
-# CONFIG_FRONTSWAP is not set
-# CONFIG_CMA is not set
-CONFIG_ZPOOL=m
-# CONFIG_ZBUD is not set
-CONFIG_Z3FOLD=m
-CONFIG_ZSMALLOC=y
-# CONFIG_PGTABLE_MAPPING is not set
-# CONFIG_ZSMALLOC_STAT is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
-# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
-CONFIG_ARCH_HAS_PTE_DEVMAP=y
-# CONFIG_ZONE_DEVICE is not set
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
-CONFIG_ARCH_HAS_PTE_SPECIAL=y
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_EGRESS=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=m
-CONFIG_PACKET_DIAG=m
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-CONFIG_UNIX_DIAG=m
-# CONFIG_TLS is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
-CONFIG_XFRM_USER=m
-CONFIG_XFRM_INTERFACE=m
-CONFIG_XFRM_SUB_POLICY=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_XDP_SOCKETS=y
-# CONFIG_XDP_SOCKETS_DIAG is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=y
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE_COMMON=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-# CONFIG_IP_PIMSM_V1 is not set
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-CONFIG_NET_FOU=m
-CONFIG_NET_FOU_IP_TUNNELS=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-# CONFIG_INET_ESP_OFFLOAD is not set
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-# CONFIG_INET_RAW_DIAG is not set
-CONFIG_INET_DIAG_DESTROY=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_NV=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_TCP_CONG_DCTCP=m
-CONFIG_TCP_CONG_CDG=m
-CONFIG_TCP_CONG_BBR=m
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-# CONFIG_INET6_ESP_OFFLOAD is not set
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_IPV6_ILA=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_VTI=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_FOU=m
-CONFIG_IPV6_FOU_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-# CONFIG_IPV6_SEG6_LWTUNNEL is not set
-# CONFIG_IPV6_SEG6_HMAC is not set
-# CONFIG_NETLABEL is not set
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NET_PTP_CLASSIFY=y
-CONFIG_NETWORK_PHY_TIMESTAMPING=y
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_FAMILY_BRIDGE=y
-CONFIG_NETFILTER_FAMILY_ARP=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK_OSF=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-# CONFIG_NF_LOG_NETDEV is not set
-CONFIG_NETFILTER_CONNCOUNT=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_PROCFS=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-CONFIG_NF_CT_NETLINK_HELPER=m
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=y
-CONFIG_NF_NAT_MASQUERADE=y
-CONFIG_NETFILTER_SYNPROXY=m
-CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_SET=m
-CONFIG_NF_TABLES_INET=y
-CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_NUMGEN=m
-CONFIG_NFT_CT=m
-CONFIG_NFT_FLOW_OFFLOAD=m
-CONFIG_NFT_COUNTER=m
-# CONFIG_NFT_CONNLIMIT is not set
-CONFIG_NFT_LOG=m
-CONFIG_NFT_LIMIT=m
-CONFIG_NFT_MASQ=m
-CONFIG_NFT_REDIR=m
-CONFIG_NFT_NAT=m
-# CONFIG_NFT_TUNNEL is not set
-# CONFIG_NFT_OBJREF is not set
-CONFIG_NFT_QUEUE=m
-CONFIG_NFT_QUOTA=m
-CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
-CONFIG_NFT_HASH=m
-CONFIG_NFT_FIB=m
-CONFIG_NFT_FIB_INET=m
-# CONFIG_NFT_XFRM is not set
-# CONFIG_NFT_SOCKET is not set
-# CONFIG_NFT_OSF is not set
-# CONFIG_NFT_TPROXY is not set
-# CONFIG_NFT_SYNPROXY is not set
-CONFIG_NF_DUP_NETDEV=m
-CONFIG_NFT_DUP_NETDEV=m
-CONFIG_NFT_FWD_NETDEV=m
-CONFIG_NFT_FIB_NETDEV=m
-CONFIG_NF_FLOW_TABLE_INET=m
-CONFIG_NF_FLOW_TABLE=m
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_BPF=m
-CONFIG_NETFILTER_XT_MATCH_CGROUP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-# end of Core Netfilter Configuration
-
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-CONFIG_IP_SET_HASH_IPMARK=m
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
-CONFIG_IP_SET_HASH_MAC=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
-CONFIG_IP_SET_HASH_NET=m
-CONFIG_IP_SET_HASH_NETNET=m
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_FO=m
-CONFIG_IP_VS_OVF=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-# CONFIG_IP_VS_MH is not set
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS MH scheduler
-#
-CONFIG_IP_VS_MH_TAB_INDEX=12
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_SOCKET_IPV4=m
-CONFIG_NF_TPROXY_IPV4=m
-CONFIG_NF_TABLES_IPV4=y
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NF_TABLES_ARP=y
-CONFIG_NF_FLOW_TABLE_IPV4=m
-CONFIG_NF_DUP_IPV4=m
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-# CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-# end of IP: Netfilter Configuration
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_SOCKET_IPV6=m
-CONFIG_NF_TPROXY_IPV6=m
-CONFIG_NF_TABLES_IPV6=y
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_FIB_IPV6=m
-CONFIG_NF_FLOW_TABLE_IPV6=m
-CONFIG_NF_DUP_IPV6=m
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_SRH=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_SYNPROXY=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-# CONFIG_IP6_NF_SECURITY is not set
-CONFIG_IP6_NF_NAT=m
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_IP6_NF_TARGET_NPT=m
-# end of IPv6: Netfilter Configuration
-
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_TABLES_BRIDGE=m
-# CONFIG_NFT_BRIDGE_META is not set
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-# CONFIG_BPFILTER is not set
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_TFRC_LIB=y
-# end of DCCP CCIDs Configuration
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-# end of DCCP Kernel Hacking
-
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_OBJCNT is not set
-CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
-# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
-CONFIG_SCTP_COOKIE_HMAC_MD5=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-CONFIG_INET_SCTP_DIAG=m
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-CONFIG_L2TP=m
-# CONFIG_L2TP_DEBUGFS is not set
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_MRP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_HAVE_NET_DSA=y
-# CONFIG_NET_DSA is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-CONFIG_VLAN_8021Q_MVRP=y
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_PHONET is not set
-# CONFIG_6LOWPAN is not set
-# CONFIG_IEEE802154 is not set
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_CBS=m
-# CONFIG_NET_SCH_ETF is not set
-# CONFIG_NET_SCH_TAPRIO is not set
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_MQPRIO=m
-# CONFIG_NET_SCH_SKBPRIO is not set
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-# CONFIG_NET_SCH_CAKE is not set
-CONFIG_NET_SCH_FQ=m
-CONFIG_NET_SCH_HHF=m
-CONFIG_NET_SCH_PIE=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_PLUG=m
-# CONFIG_NET_SCH_DEFAULT is not set
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=m
-CONFIG_NET_CLS_MATCHALL=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_IPT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-# CONFIG_NET_ACT_SAMPLE is not set
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_ACT_CSUM=m
-# CONFIG_NET_ACT_MPLS is not set
-CONFIG_NET_ACT_VLAN=m
-CONFIG_NET_ACT_BPF=m
-CONFIG_NET_ACT_CONNMARK=m
-# CONFIG_NET_ACT_CTINFO is not set
-CONFIG_NET_ACT_SKBMOD=m
-CONFIG_NET_ACT_IFE=m
-CONFIG_NET_ACT_TUNNEL_KEY=m
-# CONFIG_NET_ACT_CT is not set
-CONFIG_NET_IFE_SKBMARK=m
-CONFIG_NET_IFE_SKBPRIO=m
-CONFIG_NET_IFE_SKBTCINDEX=m
-# CONFIG_NET_TC_SKB_EXT is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-CONFIG_DNS_RESOLVER=y
-# CONFIG_BATMAN_ADV is not set
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=m
-CONFIG_OPENVSWITCH_VXLAN=m
-CONFIG_OPENVSWITCH_GENEVE=m
-CONFIG_VSOCKETS=m
-CONFIG_VSOCKETS_DIAG=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS=m
-CONFIG_VIRTIO_VSOCKETS_COMMON=m
-# CONFIG_HYPERV_VSOCKETS is not set
-CONFIG_NETLINK_DIAG=y
-CONFIG_MPLS=y
-CONFIG_NET_MPLS_GSO=m
-CONFIG_MPLS_ROUTING=m
-CONFIG_MPLS_IPTUNNEL=m
-CONFIG_NET_NSH=m
-# CONFIG_HSR is not set
-# CONFIG_NET_SWITCHDEV is not set
-CONFIG_NET_L3_MASTER_DEV=y
-# CONFIG_NET_NCSI is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_CGROUP_NET_CLASSID=y
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-# CONFIG_BPF_STREAM_PARSER is not set
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-# CONFIG_NET_DROP_MONITOR is not set
-# end of Network testing
-# end of Networking options
-
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AF_KCM is not set
-CONFIG_FIB_RULES=y
-# CONFIG_WIRELESS is not set
-# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_XEN is not set
-# CONFIG_NET_9P_DEBUG is not set
-# CONFIG_CAIF is not set
-CONFIG_CEPH_LIB=m
-# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
-# CONFIG_NFC is not set
-# CONFIG_PSAMPLE is not set
-CONFIG_NET_IFE=m
-CONFIG_LWTUNNEL=y
-CONFIG_LWTUNNEL_BPF=y
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-CONFIG_FAILOVER=m
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-CONFIG_HAVE_EISA=y
-# CONFIG_EISA is not set
-CONFIG_HAVE_PCI=y
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-# CONFIG_PCIEAER is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIE_PME=y
-# CONFIG_PCIE_PTM is not set
-# CONFIG_PCIE_BW is not set
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PCI_QUIRKS=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
-CONFIG_PCI_STUB=m
-# CONFIG_PCI_PF_STUB is not set
-CONFIG_XEN_PCIDEV_FRONTEND=y
-CONFIG_PCI_ATS=y
-CONFIG_PCI_LOCKLESS_CONFIG=y
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
-CONFIG_PCI_LABEL=y
-CONFIG_PCI_HYPERV=m
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-# CONFIG_HOTPLUG_PCI_SHPC is not set
-
-#
-# PCI controller drivers
-#
-
-#
-# Cadence PCIe controllers support
-#
-# end of Cadence PCIe controllers support
-
-# CONFIG_VMD is not set
-CONFIG_PCI_HYPERV_INTERFACE=m
-
-#
-# DesignWare PCI Core Support
-#
-# CONFIG_PCIE_DW_PLAT_HOST is not set
-# CONFIG_PCI_MESON is not set
-# end of DesignWare PCI Core Support
-# end of PCI controller drivers
-
-#
-# PCI Endpoint
-#
-# CONFIG_PCI_ENDPOINT is not set
-# end of PCI Endpoint
-
-#
-# PCI switch controller drivers
-#
-# CONFIG_PCI_SW_SWITCHTEC is not set
-# end of PCI switch controller drivers
-
-# CONFIG_PCCARD is not set
-# CONFIG_RAPIDIO is not set
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=m
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
-# end of Firmware loader
-
-CONFIG_ALLOW_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_SYS_HYPERVISOR=y
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DMA_FENCE_TRACE is not set
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-# end of Bus devices
-
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-# CONFIG_GNSS is not set
-# CONFIG_MTD is not set
-# CONFIG_OF is not set
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-# CONFIG_PARPORT is not set
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-
-#
-# Protocols
-#
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_NULL_BLK is not set
-CONFIG_BLK_DEV_FD=m
-CONFIG_CDROM=m
-# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
-CONFIG_ZRAM=m
-# CONFIG_ZRAM_WRITEBACK is not set
-# CONFIG_ZRAM_MEMORY_TRACKING is not set
-# CONFIG_BLK_DEV_UMEM is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_DRBD=m
-# CONFIG_DRBD_FAULT_INJECTION is not set
-CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_SKD is not set
-# CONFIG_BLK_DEV_SX8 is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_BLKDEV_BACKEND=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_VIRTIO_BLK_SCSI is not set
-CONFIG_BLK_DEV_RBD=m
-# CONFIG_BLK_DEV_RSXX is not set
-
-#
-# NVME Support
-#
-CONFIG_NVME_CORE=m
-CONFIG_BLK_DEV_NVME=m
-CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_FABRICS=m
-# CONFIG_NVME_FC is not set
-# CONFIG_NVME_TCP is not set
-CONFIG_NVME_TARGET=m
-CONFIG_NVME_TARGET_LOOP=m
-# CONFIG_NVME_TARGET_FC is not set
-# CONFIG_NVME_TARGET_TCP is not set
-# end of NVME Support
-
-#
-# Misc devices
-#
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_IBM_ASM is not set
-# CONFIG_PHANTOM is not set
-# CONFIG_TIFM_CORE is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_HP_ILO is not set
-# CONFIG_APDS9802ALS is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISL29020 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_BH1770 is not set
-# CONFIG_SENSORS_APDS990X is not set
-# CONFIG_HMC6352 is not set
-# CONFIG_DS1682 is not set
-CONFIG_VMWARE_BALLOON=m
-# CONFIG_SRAM is not set
-# CONFIG_PCI_ENDPOINT_TEST is not set
-# CONFIG_XILINX_SDFEC is not set
-# CONFIG_PVPANIC is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_IDT_89HPESX is not set
-# CONFIG_EEPROM_EE1004 is not set
-# end of EEPROM support
-
-# CONFIG_CB710_CORE is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# end of Texas Instruments shared transport line discipline
-
-# CONFIG_SENSORS_LIS3_I2C is not set
-
-#
-# Altera FPGA firmware download module (requires I2C)
-#
-# CONFIG_ALTERA_STAPL is not set
-# CONFIG_INTEL_MEI is not set
-# CONFIG_INTEL_MEI_ME is not set
-# CONFIG_INTEL_MEI_TXE is not set
-CONFIG_VMWARE_VMCI=m
-
-#
-# Intel MIC & related support
-#
-
-#
-# Intel MIC Bus Driver
-#
-# CONFIG_INTEL_MIC_BUS is not set
-
-#
-# SCIF Bus Driver
-#
-# CONFIG_SCIF_BUS is not set
-
-#
-# VOP Bus Driver
-#
-# CONFIG_VOP_BUS is not set
-
-#
-# Intel MIC Host Driver
-#
-
-#
-# Intel MIC Card Driver
-#
-
-#
-# SCIF Driver
-#
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-
-#
-# VOP Driver
-#
-# end of Intel MIC & related support
-
-# CONFIG_GENWQE is not set
-# CONFIG_ECHO is not set
-# CONFIG_MISC_ALCOR_PCI is not set
-# CONFIG_MISC_RTSX_PCI is not set
-# CONFIG_MISC_RTSX_USB is not set
-# CONFIG_HABANA_AI is not set
-# end of Misc devices
-
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-# CONFIG_CHR_DEV_ST is not set
-CONFIG_BLK_DEV_SR=m
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-CONFIG_SCSI_SCAN_ASYNC=y
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-CONFIG_SCSI_SRP_ATTRS=m
-# end of SCSI Transports
-
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-# CONFIG_ISCSI_BOOT_SYSFS is not set
-# CONFIG_SCSI_CXGB3_ISCSI is not set
-# CONFIG_SCSI_CXGB4_ISCSI is not set
-# CONFIG_SCSI_BNX2_ISCSI is not set
-# CONFIG_BE2ISCSI is not set
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_HPSA is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_3W_SAS is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_MVUMI is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_SCSI_ESAS2R is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_MPT3SAS is not set
-# CONFIG_SCSI_MPT2SAS is not set
-# CONFIG_SCSI_SMARTPQI is not set
-# CONFIG_SCSI_UFSHCD is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_MYRB is not set
-# CONFIG_SCSI_MYRS is not set
-CONFIG_VMWARE_PVSCSI=y
-CONFIG_XEN_SCSI_FRONTEND=m
-CONFIG_HYPERV_STORAGE=m
-# CONFIG_LIBFC is not set
-# CONFIG_SCSI_SNIC is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_FDOMAIN_PCI is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_ISCI is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_AM53C974 is not set
-# CONFIG_SCSI_WD719X is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_PMCRAID is not set
-# CONFIG_SCSI_PM8001 is not set
-# CONFIG_SCSI_BFA_FC is not set
-CONFIG_SCSI_VIRTIO=m
-# CONFIG_SCSI_CHELSIO_FCOE is not set
-# CONFIG_SCSI_DH is not set
-# end of SCSI device support
-
-CONFIG_ATA=y
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-# CONFIG_SATA_ZPODD is not set
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_SATA_AHCI=y
-CONFIG_SATA_MOBILE_LPM_POLICY=0
-# CONFIG_SATA_AHCI_PLATFORM is not set
-# CONFIG_SATA_INIC162X is not set
-# CONFIG_SATA_ACARD_AHCI is not set
-# CONFIG_SATA_SIL24 is not set
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-# CONFIG_PDC_ADMA is not set
-# CONFIG_SATA_QSTOR is not set
-# CONFIG_SATA_SX4 is not set
-CONFIG_ATA_BMDMA=y
-
-#
-# SATA SFF controllers with BMDMA
-#
-CONFIG_ATA_PIIX=y
-# CONFIG_SATA_DWC is not set
-# CONFIG_SATA_MV is not set
-# CONFIG_SATA_NV is not set
-# CONFIG_SATA_PROMISE is not set
-# CONFIG_SATA_SIL is not set
-# CONFIG_SATA_SIS is not set
-# CONFIG_SATA_SVW is not set
-# CONFIG_SATA_ULI is not set
-# CONFIG_SATA_VIA is not set
-# CONFIG_SATA_VITESSE is not set
-
-#
-# PATA SFF controllers with BMDMA
-#
-# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
-# CONFIG_PATA_ARTOP is not set
-# CONFIG_PATA_ATIIXP is not set
-# CONFIG_PATA_ATP867X is not set
-# CONFIG_PATA_CMD64X is not set
-# CONFIG_PATA_CYPRESS is not set
-# CONFIG_PATA_EFAR is not set
-# CONFIG_PATA_HPT366 is not set
-# CONFIG_PATA_HPT37X is not set
-# CONFIG_PATA_HPT3X2N is not set
-# CONFIG_PATA_HPT3X3 is not set
-# CONFIG_PATA_IT8213 is not set
-# CONFIG_PATA_IT821X is not set
-# CONFIG_PATA_JMICRON is not set
-# CONFIG_PATA_MARVELL is not set
-# CONFIG_PATA_NETCELL is not set
-# CONFIG_PATA_NINJA32 is not set
-# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
-# CONFIG_PATA_OPTIDMA is not set
-# CONFIG_PATA_PDC2027X is not set
-# CONFIG_PATA_PDC_OLD is not set
-# CONFIG_PATA_RADISYS is not set
-# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
-# CONFIG_PATA_SIS is not set
-# CONFIG_PATA_TOSHIBA is not set
-# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
-# CONFIG_PATA_WINBOND is not set
-
-#
-# PIO-only SFF controllers
-#
-# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_MPIIX is not set
-# CONFIG_PATA_NS87410 is not set
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PLATFORM is not set
-# CONFIG_PATA_RZ1000 is not set
-
-#
-# Generic fallback / legacy drivers
-#
-# CONFIG_PATA_ACPI is not set
-CONFIG_ATA_GENERIC=m
-# CONFIG_PATA_LEGACY is not set
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-# CONFIG_MD_AUTODETECT is not set
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-# CONFIG_MD_CLUSTER is not set
-CONFIG_BCACHE=m
-# CONFIG_BCACHE_DEBUG is not set
-# CONFIG_BCACHE_CLOSURES_DEBUG is not set
-CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
-CONFIG_DM_BIO_PRISON=m
-CONFIG_DM_PERSISTENT_DATA=m
-CONFIG_DM_UNSTRIPED=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_WRITECACHE=m
-# CONFIG_DM_ERA is not set
-# CONFIG_DM_CLONE is not set
-CONFIG_DM_MIRROR=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_RAID=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-# CONFIG_DM_DUST is not set
-CONFIG_DM_UEVENT=y
-CONFIG_DM_FLAKEY=m
-CONFIG_DM_VERITY=m
-# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
-CONFIG_DM_VERITY_FEC=y
-CONFIG_DM_SWITCH=m
-CONFIG_DM_LOG_WRITES=m
-CONFIG_DM_INTEGRITY=m
-CONFIG_TARGET_CORE=m
-# CONFIG_TCM_IBLOCK is not set
-# CONFIG_TCM_FILEIO is not set
-# CONFIG_TCM_PSCSI is not set
-# CONFIG_LOOPBACK_TARGET is not set
-# CONFIG_ISCSI_TARGET is not set
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_FIREWIRE is not set
-# CONFIG_FIREWIRE_NOSY is not set
-# end of IEEE 1394 (FireWire) support
-
-# CONFIG_MACINTOSH_DRIVERS is not set
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-# CONFIG_EQUALIZER is not set
-# CONFIG_NET_FC is not set
-CONFIG_IFB=m
-CONFIG_NET_TEAM=m
-CONFIG_NET_TEAM_MODE_BROADCAST=m
-CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-CONFIG_NET_TEAM_MODE_RANDOM=m
-CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
-CONFIG_NET_TEAM_MODE_LOADBALANCE=m
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=m
-# CONFIG_IPVTAP is not set
-CONFIG_VXLAN=m
-CONFIG_GENEVE=m
-# CONFIG_GTP is not set
-CONFIG_MACSEC=m
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_TUN=m
-CONFIG_TAP=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-CONFIG_VIRTIO_NET=m
-CONFIG_NLMON=m
-CONFIG_NET_VRF=m
-# CONFIG_ARCNET is not set
-
-#
-# CAIF transport drivers
-#
-
-#
-# Distributed Switch Architecture drivers
-#
-# end of Distributed Switch Architecture drivers
-
-CONFIG_ETHERNET=y
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
-# CONFIG_NET_VENDOR_AGERE is not set
-# CONFIG_NET_VENDOR_ALACRITECH is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
-# CONFIG_ALTERA_TSE is not set
-CONFIG_NET_VENDOR_AMAZON=y
-CONFIG_ENA_ETHERNET=m
-# CONFIG_NET_VENDOR_AMD is not set
-# CONFIG_NET_VENDOR_AQUANTIA is not set
-# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_VENDOR_AURORA is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
-# CONFIG_NET_VENDOR_CADENCE is not set
-# CONFIG_NET_VENDOR_CAVIUM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CISCO is not set
-# CONFIG_NET_VENDOR_CORTINA is not set
-# CONFIG_CX_ECAT is not set
-# CONFIG_DNET is not set
-# CONFIG_NET_VENDOR_DEC is not set
-# CONFIG_NET_VENDOR_DLINK is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
-# CONFIG_NET_VENDOR_EZCHIP is not set
-CONFIG_NET_VENDOR_GOOGLE=y
-# CONFIG_GVE is not set
-# CONFIG_NET_VENDOR_HP is not set
-# CONFIG_NET_VENDOR_HUAWEI is not set
-# CONFIG_NET_VENDOR_I825XX is not set
-CONFIG_NET_VENDOR_INTEL=y
-# CONFIG_E100 is not set
-CONFIG_E1000=m
-# CONFIG_E1000E is not set
-# CONFIG_IGB is not set
-# CONFIG_IGBVF is not set
-# CONFIG_IXGB is not set
-# CONFIG_IXGBE is not set
-CONFIG_IXGBEVF=m
-# CONFIG_I40E is not set
-# CONFIG_I40EVF is not set
-# CONFIG_ICE is not set
-# CONFIG_FM10K is not set
-# CONFIG_IGC is not set
-# CONFIG_JME is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-CONFIG_NET_VENDOR_MICROCHIP=y
-# CONFIG_LAN743X is not set
-# CONFIG_NET_VENDOR_MICROSEMI is not set
-# CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_NETERION is not set
-# CONFIG_NET_VENDOR_NETRONOME is not set
-# CONFIG_NET_VENDOR_NI is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
-# CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_ETHOC is not set
-# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
-CONFIG_NET_VENDOR_PENSANDO=y
-# CONFIG_IONIC is not set
-# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_QUALCOMM is not set
-# CONFIG_NET_VENDOR_RDC is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
-# CONFIG_NET_VENDOR_RENESAS is not set
-# CONFIG_NET_VENDOR_ROCKER is not set
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SOLARFLARE is not set
-# CONFIG_NET_VENDOR_SILAN is not set
-# CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_SOCIONEXT is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SUN is not set
-# CONFIG_NET_VENDOR_SYNOPSYS is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_NET_VENDOR_TI is not set
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-CONFIG_NET_VENDOR_XILINX=y
-# CONFIG_XILINX_AXI_EMAC is not set
-# CONFIG_XILINX_LL_TEMAC is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-# CONFIG_NET_SB1000 is not set
-CONFIG_MDIO_DEVICE=m
-CONFIG_MDIO_BUS=m
-# CONFIG_MDIO_BCM_UNIMAC is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MDIO_MSCC_MIIM is not set
-# CONFIG_MDIO_THUNDER is not set
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-# CONFIG_ADIN_PHY is not set
-# CONFIG_AMD_PHY is not set
-# CONFIG_AQUANTIA_PHY is not set
-# CONFIG_AX88796B_PHY is not set
-# CONFIG_AT803X_PHY is not set
-# CONFIG_BCM7XXX_PHY is not set
-# CONFIG_BCM87XX_PHY is not set
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_CORTINA_PHY is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DP83822_PHY is not set
-# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DP83848_PHY is not set
-# CONFIG_DP83867_PHY is not set
-# CONFIG_FIXED_PHY is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_INTEL_XWAY_PHY is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_MARVELL_10G_PHY is not set
-# CONFIG_MICREL_PHY is not set
-# CONFIG_MICROCHIP_PHY is not set
-# CONFIG_MICROCHIP_T1_PHY is not set
-# CONFIG_MICROSEMI_PHY is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NXP_TJA11XX_PHY is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_RENESAS_PHY is not set
-# CONFIG_ROCKCHIP_PHY is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_STE10XP is not set
-# CONFIG_TERANETICS_PHY is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_XILINX_GMII2RGMII is not set
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-# CONFIG_PPP_FILTER is not set
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-# CONFIG_PPPOE is not set
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-CONFIG_SLIP_MODE_SLIP6=y
-
-#
-# Host-side USB support is needed for USB Network Adapter support
-#
-# CONFIG_USB_NET_DRIVERS is not set
-# CONFIG_WLAN is not set
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
-# CONFIG_WAN is not set
-CONFIG_XEN_NETDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_BACKEND=m
-CONFIG_VMXNET3=m
-# CONFIG_FUJITSU_ES is not set
-CONFIG_HYPERV_NET=m
-# CONFIG_NETDEVSIM is not set
-CONFIG_NET_FAILOVER=m
-# CONFIG_ISDN is not set
-# CONFIG_NVM is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_MATRIXKMAP is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ADP5588 is not set
-# CONFIG_KEYBOARD_ADP5589 is not set
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_QT1050 is not set
-# CONFIG_KEYBOARD_QT1070 is not set
-# CONFIG_KEYBOARD_QT2160 is not set
-# CONFIG_KEYBOARD_DLINK_DIR685 is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_TCA6416 is not set
-# CONFIG_KEYBOARD_TCA8418 is not set
-# CONFIG_KEYBOARD_LM8333 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_MCS is not set
-# CONFIG_KEYBOARD_MPR121 is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_SAMSUNG is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-# CONFIG_MOUSE_PS2_ALPS is not set
-# CONFIG_MOUSE_PS2_BYD is not set
-# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
-# CONFIG_MOUSE_PS2_SYNAPTICS is not set
-CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
-# CONFIG_MOUSE_PS2_CYPRESS is not set
-# CONFIG_MOUSE_PS2_LIFEBOOK is not set
-# CONFIG_MOUSE_PS2_TRACKPOINT is not set
-# CONFIG_MOUSE_PS2_ELANTECH is not set
-# CONFIG_MOUSE_PS2_SENTELIC is not set
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-# CONFIG_MOUSE_PS2_FOCALTECH is not set
-CONFIG_MOUSE_PS2_VMMOUSE=y
-CONFIG_MOUSE_PS2_SMBUS=y
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_BCM5974 is not set
-# CONFIG_MOUSE_CYAPA is not set
-# CONFIG_MOUSE_ELAN_I2C is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-# CONFIG_MOUSE_SYNAPTICS_USB is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_AD714X is not set
-# CONFIG_INPUT_BMA150 is not set
-# CONFIG_INPUT_E3X0_BUTTON is not set
-# CONFIG_INPUT_MSM_VIBRATOR is not set
-# CONFIG_INPUT_MMA8450 is not set
-# CONFIG_INPUT_ATLAS_BTNS is not set
-# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-# CONFIG_INPUT_KXTJ9 is not set
-# CONFIG_INPUT_POWERMATE is not set
-# CONFIG_INPUT_YEALINK is not set
-# CONFIG_INPUT_CM109 is not set
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_PCF8574 is not set
-# CONFIG_INPUT_ADXL34X is not set
-# CONFIG_INPUT_CMA3000 is not set
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
-# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
-# CONFIG_INPUT_DRV2665_HAPTICS is not set
-# CONFIG_INPUT_DRV2667_HAPTICS is not set
-# CONFIG_RMI4_CORE is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
-CONFIG_SERIO_I8042=y
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
-# CONFIG_SERIO_ALTERA_PS2 is not set
-# CONFIG_SERIO_PS2MULT is not set
-# CONFIG_SERIO_ARC_PS2 is not set
-CONFIG_HYPERV_KEYBOARD=m
-# CONFIG_USERIO is not set
-# CONFIG_GAMEPORT is not set
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_NOZOMI is not set
-# CONFIG_N_GSM is not set
-# CONFIG_TRACE_SINK is not set
-# CONFIG_NULL_TTY is not set
-# CONFIG_LDISC_AUTOLOAD is not set
-CONFIG_DEVMEM=y
-# CONFIG_DEVKMEM is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-CONFIG_SERIAL_8250_PNP=y
-# CONFIG_SERIAL_8250_FINTEK is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_EXAR=y
-CONFIG_SERIAL_8250_NR_UARTS=16
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-# CONFIG_SERIAL_8250_DETECT_IRQ is not set
-CONFIG_SERIAL_8250_RSA=y
-# CONFIG_SERIAL_8250_DW is not set
-# CONFIG_SERIAL_8250_RT288X is not set
-# CONFIG_SERIAL_8250_LPSS is not set
-# CONFIG_SERIAL_8250_MID is not set
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
-CONFIG_SERIAL_ALTERA_JTAGUART=m
-CONFIG_SERIAL_ALTERA_UART=m
-CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
-CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
-# CONFIG_SERIAL_ARC is not set
-# CONFIG_SERIAL_RP2 is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_FSL_LINFLEXUART is not set
-# end of Serial drivers
-
-# CONFIG_SERIAL_DEV_BUS is not set
-# CONFIG_TTY_PRINTK is not set
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_HVC_XEN_FRONTEND=y
-CONFIG_VIRTIO_CONSOLE=m
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_HW_RANDOM=m
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_INTEL is not set
-# CONFIG_HW_RANDOM_AMD is not set
-# CONFIG_HW_RANDOM_VIA is not set
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_NVRAM=m
-# CONFIG_APPLICOM is not set
-# CONFIG_MWAVE is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_HPET is not set
-CONFIG_HANGCHECK_TIMER=m
-# CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
-CONFIG_DEVPORT=y
-# CONFIG_XILLYBUS is not set
-# end of Character devices
-
-CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_MUX=m
-
-#
-# Multiplexer I2C Chip support
-#
-# CONFIG_I2C_MUX_LTC4306 is not set
-CONFIG_I2C_MUX_PCA9541=m
-# CONFIG_I2C_MUX_REG is not set
-# CONFIG_I2C_MUX_MLXCPLD is not set
-# end of Multiplexer I2C Chip support
-
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOBIT=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_AMD_MP2 is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_ISCH is not set
-# CONFIG_I2C_ISMT is not set
-CONFIG_I2C_PIIX4=m
-# CONFIG_I2C_NFORCE2 is not set
-# CONFIG_I2C_NVIDIA_GPU is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_SIS630 is not set
-# CONFIG_I2C_SIS96X is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-
-#
-# ACPI drivers
-#
-# CONFIG_I2C_SCMI is not set
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_DESIGNWARE_PCI is not set
-# CONFIG_I2C_EMEV2 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_XILINX is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-# CONFIG_I2C_DIOLAN_U2C is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-
-#
-# Other I2C/SMBus bus drivers
-#
-# CONFIG_I2C_MLXCPLD is not set
-# end of I2C Hardware Bus support
-
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_SLAVE is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# end of I2C support
-
-# CONFIG_I3C is not set
-# CONFIG_SPI is not set
-# CONFIG_SPMI is not set
-# CONFIG_HSI is not set
-CONFIG_PPS=y
-# CONFIG_PPS_DEBUG is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-# CONFIG_PPS_CLIENT_LDISC is not set
-# CONFIG_PPS_CLIENT_GPIO is not set
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=y
-# CONFIG_DP83640_PHY is not set
-CONFIG_PTP_1588_CLOCK_KVM=m
-# end of PTP clock support
-
-# CONFIG_PINCTRL is not set
-# CONFIG_GPIOLIB is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_AVS is not set
-# CONFIG_POWER_RESET is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-# CONFIG_PDA_POWER is not set
-# CONFIG_TEST_POWER is not set
-# CONFIG_CHARGER_ADP5061 is not set
-# CONFIG_BATTERY_DS2780 is not set
-# CONFIG_BATTERY_DS2781 is not set
-# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_SBS is not set
-# CONFIG_CHARGER_SBS is not set
-# CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_LP8727 is not set
-# CONFIG_CHARGER_BQ2415X is not set
-# CONFIG_CHARGER_SMB347 is not set
-# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-CONFIG_HWMON=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADT7410 is not set
-# CONFIG_SENSORS_ADT7411 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_AS370 is not set
-# CONFIG_SENSORS_ASC7621 is not set
-# CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_K10TEMP is not set
-# CONFIG_SENSORS_FAM15H_POWER is not set
-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ASPEED is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_DS620 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_DELL_SMM is not set
-# CONFIG_SENSORS_I5K_AMB is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FSCHMD is not set
-# CONFIG_SENSORS_FTSTEUTATES is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_G762 is not set
-# CONFIG_SENSORS_HIH6130 is not set
-# CONFIG_SENSORS_I5500 is not set
-# CONFIG_SENSORS_CORETEMP is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_JC42 is not set
-# CONFIG_SENSORS_POWR1220 is not set
-# CONFIG_SENSORS_LINEAGE is not set
-# CONFIG_SENSORS_LTC2945 is not set
-# CONFIG_SENSORS_LTC2990 is not set
-# CONFIG_SENSORS_LTC4151 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4222 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_LTC4260 is not set
-# CONFIG_SENSORS_LTC4261 is not set
-# CONFIG_SENSORS_MAX16065 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX1668 is not set
-# CONFIG_SENSORS_MAX197 is not set
-# CONFIG_SENSORS_MAX6621 is not set
-# CONFIG_SENSORS_MAX6639 is not set
-# CONFIG_SENSORS_MAX6642 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6697 is not set
-# CONFIG_SENSORS_MAX31790 is not set
-# CONFIG_SENSORS_MCP3021 is not set
-# CONFIG_SENSORS_TC654 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
-# CONFIG_SENSORS_LM95234 is not set
-# CONFIG_SENSORS_LM95241 is not set
-# CONFIG_SENSORS_LM95245 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_NTC_THERMISTOR is not set
-# CONFIG_SENSORS_NCT6683 is not set
-# CONFIG_SENSORS_NCT6775 is not set
-# CONFIG_SENSORS_NCT7802 is not set
-# CONFIG_SENSORS_NCT7904 is not set
-# CONFIG_SENSORS_NPCM7XX is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_PMBUS is not set
-# CONFIG_SENSORS_SHT21 is not set
-# CONFIG_SENSORS_SHT3x is not set
-# CONFIG_SENSORS_SHTC1 is not set
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_EMC1403 is not set
-# CONFIG_SENSORS_EMC2103 is not set
-# CONFIG_SENSORS_EMC6W201 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SCH5627 is not set
-# CONFIG_SENSORS_SCH5636 is not set
-# CONFIG_SENSORS_STTS751 is not set
-# CONFIG_SENSORS_SMM665 is not set
-# CONFIG_SENSORS_ADC128D818 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_AMC6821 is not set
-# CONFIG_SENSORS_INA209 is not set
-# CONFIG_SENSORS_INA2XX is not set
-# CONFIG_SENSORS_INA3221 is not set
-# CONFIG_SENSORS_TC74 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP102 is not set
-# CONFIG_SENSORS_TMP103 is not set
-# CONFIG_SENSORS_TMP108 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
-# CONFIG_SENSORS_VIA_CPUTEMP is not set
-# CONFIG_SENSORS_VIA686A is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_VT8231 is not set
-# CONFIG_SENSORS_W83773G is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83795 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_SENSORS_XGENE is not set
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ACPI_POWER=m
-# CONFIG_SENSORS_ATK0110 is not set
-CONFIG_THERMAL=y
-# CONFIG_THERMAL_STATISTICS is not set
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-# CONFIG_THERMAL_WRITABLE_TRIPS is not set
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
-# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
-CONFIG_THERMAL_GOV_STEP_WISE=y
-# CONFIG_THERMAL_GOV_BANG_BANG is not set
-# CONFIG_THERMAL_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
-# CONFIG_THERMAL_EMULATION is not set
-
-#
-# Intel thermal drivers
-#
-# CONFIG_INTEL_POWERCLAMP is not set
-# CONFIG_INTEL_SOC_DTS_THERMAL is not set
-
-#
-# ACPI INT340X thermal drivers
-#
-# CONFIG_INT340X_THERMAL is not set
-# end of ACPI INT340X thermal drivers
-
-# CONFIG_INTEL_PCH_THERMAL is not set
-# end of Intel thermal drivers
-
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
-CONFIG_WATCHDOG_OPEN_TIMEOUT=0
-CONFIG_WATCHDOG_SYSFS=y
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
-
-#
-# Watchdog Device Drivers
-#
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_WDAT_WDT is not set
-# CONFIG_XILINX_WATCHDOG is not set
-# CONFIG_ZIIRAVE_WATCHDOG is not set
-# CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_DW_WATCHDOG is not set
-# CONFIG_MAX63XX_WATCHDOG is not set
-# CONFIG_ACQUIRE_WDT is not set
-# CONFIG_ADVANTECH_WDT is not set
-# CONFIG_ALIM1535_WDT is not set
-# CONFIG_ALIM7101_WDT is not set
-# CONFIG_EBC_C384_WDT is not set
-# CONFIG_F71808E_WDT is not set
-# CONFIG_SP5100_TCO is not set
-# CONFIG_SBC_FITPC2_WATCHDOG is not set
-# CONFIG_EUROTECH_WDT is not set
-# CONFIG_IB700_WDT is not set
-# CONFIG_IBMASR is not set
-# CONFIG_WAFER_WDT is not set
-CONFIG_I6300ESB_WDT=m
-# CONFIG_IE6XX_WDT is not set
-# CONFIG_ITCO_WDT is not set
-# CONFIG_IT8712F_WDT is not set
-# CONFIG_IT87_WDT is not set
-# CONFIG_HP_WATCHDOG is not set
-# CONFIG_SC1200_WDT is not set
-# CONFIG_PC87413_WDT is not set
-# CONFIG_NV_TCO is not set
-# CONFIG_60XX_WDT is not set
-# CONFIG_CPU5_WDT is not set
-# CONFIG_SMSC_SCH311X_WDT is not set
-# CONFIG_SMSC37B787_WDT is not set
-# CONFIG_TQMX86_WDT is not set
-# CONFIG_VIA_WDT is not set
-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
-# CONFIG_MACHZ_WDT is not set
-# CONFIG_SBC_EPX_C3_WATCHDOG is not set
-# CONFIG_NI903X_WDT is not set
-# CONFIG_NIC7018_WDT is not set
-# CONFIG_XEN_WDT is not set
-
-#
-# PCI-based Watchdog Cards
-#
-# CONFIG_PCIPCWATCHDOG is not set
-# CONFIG_WDTPCI is not set
-
-#
-# USB-based Watchdog Cards
-#
-# CONFIG_USBPCWATCHDOG is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB is not set
-CONFIG_BCMA_POSSIBLE=y
-# CONFIG_BCMA is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_MADERA is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
-# CONFIG_LPC_ICH is not set
-# CONFIG_LPC_SCH is not set
-# CONFIG_MFD_INTEL_LPSS_ACPI is not set
-# CONFIG_MFD_INTEL_LPSS_PCI is not set
-# CONFIG_MFD_JANZ_CMODIO is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_MENF21BMC is not set
-# CONFIG_MFD_VIPERBOARD is not set
-# CONFIG_MFD_RETU is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_RDC321X is not set
-# CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_SKY81452 is not set
-# CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_SYSCON is not set
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_TI_LMU is not set
-# CONFIG_TPS6105X is not set
-# CONFIG_TPS6507X is not set
-# CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_WL1273_CORE is not set
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_TQMX86 is not set
-# CONFIG_MFD_VX855 is not set
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_WM8994 is not set
-# end of Multifunction device drivers
-
-# CONFIG_REGULATOR is not set
-# CONFIG_RC_CORE is not set
-# CONFIG_MEDIA_SUPPORT is not set
-
-#
-# Graphics support
-#
-# CONFIG_AGP is not set
-# CONFIG_VGA_ARB is not set
-CONFIG_DRM=m
-# CONFIG_DRM_DP_AUX_CHARDEV is not set
-# CONFIG_DRM_DEBUG_SELFTEST is not set
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_FBDEV_OVERALLOC=100
-# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-# CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_TTM=m
-CONFIG_DRM_VRAM_HELPER=m
-CONFIG_DRM_GEM_SHMEM_HELPER=y
-
-#
-# I2C encoder or helper chips
-#
-# CONFIG_DRM_I2C_CH7006 is not set
-# CONFIG_DRM_I2C_SIL164 is not set
-# CONFIG_DRM_I2C_NXP_TDA998X is not set
-# CONFIG_DRM_I2C_NXP_TDA9950 is not set
-# end of I2C encoder or helper chips
-
-#
-# ARM devices
-#
-# end of ARM devices
-
-# CONFIG_DRM_RADEON is not set
-# CONFIG_DRM_AMDGPU is not set
-
-#
-# ACP (Audio CoProcessor) Configuration
-#
-# end of ACP (Audio CoProcessor) Configuration
-
-# CONFIG_DRM_NOUVEAU is not set
-# CONFIG_DRM_I915 is not set
-# CONFIG_DRM_VGEM is not set
-# CONFIG_DRM_VKMS is not set
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
-# CONFIG_DRM_GMA500 is not set
-# CONFIG_DRM_UDL is not set
-# CONFIG_DRM_AST is not set
-# CONFIG_DRM_MGAG200 is not set
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_QXL=m
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
-CONFIG_DRM_PANEL=y
-
-#
-# Display Panels
-#
-# end of Display Panels
-
-CONFIG_DRM_BRIDGE=y
-CONFIG_DRM_PANEL_BRIDGE=y
-
-#
-# Display Interface Bridges
-#
-# CONFIG_DRM_ANALOGIX_ANX78XX is not set
-# end of Display Interface Bridges
-
-# CONFIG_DRM_ETNAVIV is not set
-# CONFIG_DRM_GM12U320 is not set
-# CONFIG_DRM_XEN is not set
-# CONFIG_DRM_VBOXVIDEO is not set
-# CONFIG_DRM_LEGACY is not set
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
-
-#
-# Frame buffer Devices
-#
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_NOTIFY=y
-CONFIG_FB=m
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_IMAGEBLIT=m
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ARC is not set
-CONFIG_FB_VGA16=m
-CONFIG_FB_UVESA=m
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_OPENCORES is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_I740 is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_UDL is not set
-# CONFIG_FB_IBM_GXT4500 is not set
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_XEN_FBDEV_FRONTEND=m
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-CONFIG_FB_HYPERV=m
-# CONFIG_FB_SM712 is not set
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
-# end of Backlight & LCD device support
-
-CONFIG_VGASTATE=m
-CONFIG_HDMI=y
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_DUMMY_CONSOLE_COLUMNS=80
-CONFIG_DUMMY_CONSOLE_ROWS=25
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# end of Console display driver support
-
-# CONFIG_LOGO is not set
-# end of Graphics support
-
-# CONFIG_SOUND is not set
-
-#
-# HID support
-#
-CONFIG_HID=m
-# CONFIG_HID_BATTERY_STRENGTH is not set
-CONFIG_HIDRAW=y
-CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
-
-#
-# Special HID drivers
-#
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_ACCUTOUCH is not set
-# CONFIG_HID_ACRUX is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_APPLEIR is not set
-# CONFIG_HID_AUREAL is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_BETOP_FF is not set
-CONFIG_HID_CHERRY=m
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_COUGAR is not set
-# CONFIG_HID_MACALLY is not set
-# CONFIG_HID_CMEDIA is not set
-# CONFIG_HID_CREATIVE_SB0540 is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_ELECOM is not set
-# CONFIG_HID_ELO is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GEMBIRD is not set
-# CONFIG_HID_GFRM is not set
-# CONFIG_HID_HOLTEK is not set
-# CONFIG_HID_KEYTOUCH is not set
-# CONFIG_HID_KYE is not set
-# CONFIG_HID_UCLOGIC is not set
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_VIEWSONIC is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_ICADE is not set
-# CONFIG_HID_ITE is not set
-# CONFIG_HID_JABRA is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_KENSINGTON is not set
-# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_LENOVO is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MAGICMOUSE is not set
-# CONFIG_HID_MALTRON is not set
-# CONFIG_HID_MAYFLASH is not set
-# CONFIG_HID_REDRAGON is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_MULTITOUCH is not set
-# CONFIG_HID_NTI is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PENMOUNT is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PICOLCD is not set
-# CONFIG_HID_PLANTRONICS is not set
-# CONFIG_HID_PRIMAX is not set
-# CONFIG_HID_RETRODE is not set
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_SAITEK is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SPEEDLINK is not set
-# CONFIG_HID_STEAM is not set
-# CONFIG_HID_STEELSERIES is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_RMI is not set
-# CONFIG_HID_GREENASIA is not set
-CONFIG_HID_HYPERV_MOUSE=m
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_TIVO is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_UDRAW_PS3 is not set
-# CONFIG_HID_WACOM is not set
-# CONFIG_HID_XINMO is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HID_ZYDACRON is not set
-# CONFIG_HID_SENSOR_HUB is not set
-# CONFIG_HID_ALPS is not set
-# end of Special HID drivers
-
-#
-# USB HID support
-#
-CONFIG_USB_HID=m
-# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-# end of USB HID Boot Protocol drivers
-# end of USB HID support
-
-#
-# I2C HID support
-#
-# CONFIG_I2C_HID is not set
-# end of I2C HID support
-
-#
-# Intel ISH HID support
-#
-# CONFIG_INTEL_ISH_HID is not set
-# end of Intel ISH HID support
-# end of HID support
-
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
-# CONFIG_USB_ULPI_BUS is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
-CONFIG_USB_PCI=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_OTG is not set
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_MON=m
-
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=m
-# CONFIG_USB_XHCI_PLATFORM is not set
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-CONFIG_USB_EHCI_PCI=m
-# CONFIG_USB_EHCI_FSL is not set
-CONFIG_USB_EHCI_HCD_PLATFORM=m
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_FOTG210_HCD is not set
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_UHCI_HCD=m
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_USB_TMC is not set
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_REALTEK is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-CONFIG_USB_UAS=m
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USBIP_CORE is not set
-# CONFIG_USB_CDNS3 is not set
-# CONFIG_USB_MUSB_HDRC is not set
-# CONFIG_USB_DWC3 is not set
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_ISP1760 is not set
-
-#
-# USB port drivers
-#
-# CONFIG_USB_SERIAL is not set
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_YUREX is not set
-# CONFIG_USB_EZUSB_FX2 is not set
-# CONFIG_USB_HUB_USB251XB is not set
-# CONFIG_USB_HSIC_USB3503 is not set
-# CONFIG_USB_HSIC_USB4604 is not set
-# CONFIG_USB_LINK_LAYER_TEST is not set
-# CONFIG_USB_CHAOSKEY is not set
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_USB_ISP1301 is not set
-# end of USB Physical Layer drivers
-
-# CONFIG_USB_GADGET is not set
-# CONFIG_TYPEC is not set
-# CONFIG_USB_ROLE_SWITCH is not set
-# CONFIG_MMC is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_NEW_LEDS is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_INFINIBAND is not set
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_RTC_LIB=y
-CONFIG_RTC_MC146818_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-CONFIG_RTC_NVMEM=y
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-# CONFIG_RTC_DRV_ABB5ZES3 is not set
-# CONFIG_RTC_DRV_ABEOZ9 is not set
-# CONFIG_RTC_DRV_ABX80X is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_ISL12022 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-# CONFIG_RTC_DRV_PCF8523 is not set
-# CONFIG_RTC_DRV_PCF85063 is not set
-# CONFIG_RTC_DRV_PCF85363 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_BQ32K is not set
-# CONFIG_RTC_DRV_S35390A is not set
-# CONFIG_RTC_DRV_FM3130 is not set
-# CONFIG_RTC_DRV_RX8010 is not set
-# CONFIG_RTC_DRV_RX8581 is not set
-# CONFIG_RTC_DRV_RX8025 is not set
-# CONFIG_RTC_DRV_EM3027 is not set
-# CONFIG_RTC_DRV_RV3028 is not set
-# CONFIG_RTC_DRV_RV8803 is not set
-# CONFIG_RTC_DRV_SD3078 is not set
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_I2C_AND_SPI=m
-
-#
-# SPI and I2C RTC drivers
-#
-# CONFIG_RTC_DRV_DS3232 is not set
-# CONFIG_RTC_DRV_PCF2127 is not set
-# CONFIG_RTC_DRV_RV3029C2 is not set
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_DS1286 is not set
-# CONFIG_RTC_DRV_DS1511 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1685_FAMILY is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_DS2404 is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_M48T35 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_MSM6242 is not set
-# CONFIG_RTC_DRV_BQ4802 is not set
-# CONFIG_RTC_DRV_RP5C01 is not set
-# CONFIG_RTC_DRV_V3020 is not set
-
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_FTRTC010 is not set
-
-#
-# HID Sensor RTC drivers
-#
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_ACPI=y
-# CONFIG_ALTERA_MSGDMA is not set
-# CONFIG_INTEL_IDMA64 is not set
-CONFIG_INTEL_IOATDMA=m
-# CONFIG_QCOM_HIDMA_MGMT is not set
-CONFIG_QCOM_HIDMA=m
-# CONFIG_DW_DMAC is not set
-# CONFIG_DW_DMAC_PCI is not set
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
-
-#
-# DMA Clients
-#
-# CONFIG_ASYNC_TX_DMA is not set
-# CONFIG_DMATEST is not set
-CONFIG_DMA_ENGINE_RAID=y
-
-#
-# DMABUF options
-#
-CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
-# CONFIG_DMABUF_SELFTESTS is not set
-# end of DMABUF options
-
-CONFIG_DCA=m
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
-# CONFIG_VFIO is not set
-CONFIG_IRQ_BYPASS_MANAGER=m
-CONFIG_VIRT_DRIVERS=y
-# CONFIG_VBOXGUEST is not set
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
-CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_HYPERV=m
-CONFIG_HYPERV_TIMER=y
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_BALLOON=m
-# end of Microsoft Hyper-V guest support
-
-#
-# Xen driver support
-#
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
-CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512
-CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
-CONFIG_XEN_DEV_EVTCHN=m
-CONFIG_XEN_BACKEND=y
-CONFIG_XENFS=y
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_XENBUS_FRONTEND=y
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-# CONFIG_XEN_GRANT_DMA_ALLOC is not set
-CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_PCIDEV_BACKEND=m
-CONFIG_XEN_PVCALLS_FRONTEND=m
-# CONFIG_XEN_PVCALLS_BACKEND is not set
-CONFIG_XEN_SCSI_BACKEND=m
-CONFIG_XEN_PRIVCMD=y
-CONFIG_XEN_ACPI_PROCESSOR=m
-CONFIG_XEN_HAVE_PVMMU=y
-CONFIG_XEN_EFI=y
-CONFIG_XEN_AUTO_XLATE=y
-CONFIG_XEN_ACPI=y
-# CONFIG_XEN_SYMS is not set
-CONFIG_XEN_HAVE_VPMU=y
-# end of Xen driver support
-
-# CONFIG_GREYBUS is not set
-# CONFIG_STAGING is not set
-# CONFIG_X86_PLATFORM_DEVICES is not set
-CONFIG_PMC_ATOM=y
-# CONFIG_MFD_CROS_EC is not set
-# CONFIG_CHROME_PLATFORMS is not set
-# CONFIG_MELLANOX_PLATFORM is not set
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-
-#
-# Common Clock Framework
-#
-# CONFIG_COMMON_CLK_MAX9485 is not set
-# CONFIG_COMMON_CLK_SI5341 is not set
-# CONFIG_COMMON_CLK_SI5351 is not set
-# CONFIG_COMMON_CLK_SI544 is not set
-# CONFIG_COMMON_CLK_CDCE706 is not set
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# end of Common Clock Framework
-
-# CONFIG_HWSPINLOCK is not set
-
-#
-# Clock Source drivers
-#
-CONFIG_CLKEVT_I8253=y
-CONFIG_CLKBLD_I8253=y
-# end of Clock Source drivers
-
-CONFIG_MAILBOX=y
-CONFIG_PCC=y
-# CONFIG_ALTERA_MBOX is not set
-CONFIG_IOMMU_IOVA=y
-CONFIG_IOMMU_API=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# Generic IOMMU Pagetable Support
-#
-# end of Generic IOMMU Pagetable Support
-
-# CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-# CONFIG_AMD_IOMMU is not set
-CONFIG_DMAR_TABLE=y
-CONFIG_INTEL_IOMMU=y
-# CONFIG_INTEL_IOMMU_SVM is not set
-# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
-CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-CONFIG_IRQ_REMAP=y
-CONFIG_HYPERV_IOMMU=y
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-CONFIG_RPMSG=m
-# CONFIG_RPMSG_CHAR is not set
-# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
-CONFIG_RPMSG_VIRTIO=m
-# end of Rpmsg drivers
-
-# CONFIG_SOUNDWIRE is not set
-
-#
-# SOC (System On Chip) specific Drivers
-#
-
-#
-# Amlogic SoC drivers
-#
-# end of Amlogic SoC drivers
-
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-# end of i.MX SoC drivers
-
-#
-# Qualcomm SoC drivers
-#
-# end of Qualcomm SoC drivers
-
-# CONFIG_SOC_TI is not set
-
-#
-# Xilinx SoC drivers
-#
-# CONFIG_XILINX_VCU is not set
-# end of Xilinx SoC drivers
-# end of SOC (System On Chip) specific Drivers
-
-# CONFIG_PM_DEVFREQ is not set
-# CONFIG_EXTCON is not set
-CONFIG_MEMORY=y
-# CONFIG_IIO is not set
-# CONFIG_NTB is not set
-# CONFIG_VME_BUS is not set
-# CONFIG_PWM is not set
-
-#
-# IRQ chip support
-#
-# end of IRQ chip support
-
-# CONFIG_IPACK_BUS is not set
-# CONFIG_RESET_CONTROLLER is not set
-
-#
-# PHY Subsystem
-#
-# CONFIG_GENERIC_PHY is not set
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# end of PHY Subsystem
-
-# CONFIG_POWERCAP is not set
-# CONFIG_MCB is not set
-
-#
-# Performance monitor support
-#
-# end of Performance monitor support
-
-# CONFIG_RAS is not set
-# CONFIG_THUNDERBOLT is not set
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-# end of Android
-
-# CONFIG_LIBNVDIMM is not set
-CONFIG_DAX=m
-CONFIG_NVMEM=y
-CONFIG_NVMEM_SYSFS=y
-
-#
-# HW tracing support
-#
-# CONFIG_STM is not set
-# CONFIG_INTEL_TH is not set
-# end of HW tracing support
-
-# CONFIG_FPGA is not set
-# CONFIG_UNISYS_VISORBUS is not set
-# CONFIG_SIOX is not set
-# CONFIG_SLIMBUS is not set
-# CONFIG_INTERCONNECT is not set
-# CONFIG_COUNTER is not set
-# end of Device Drivers
-
-#
-# File systems
-#
-CONFIG_DCACHE_WORD_ACCESS=y
-# CONFIG_VALIDATE_FS_PARSER is not set
-CONFIG_FS_IOMAP=y
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-# CONFIG_REISERFS_FS_SECURITY is not set
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-CONFIG_XFS_ONLINE_SCRUB=y
-# CONFIG_XFS_ONLINE_REPAIR is not set
-# CONFIG_XFS_WARN is not set
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-CONFIG_OCFS2_DEBUG_MASKLOG=y
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-# CONFIG_BTRFS_DEBUG is not set
-# CONFIG_BTRFS_ASSERT is not set
-# CONFIG_BTRFS_FS_REF_VERIFY is not set
-CONFIG_NILFS2_FS=m
-CONFIG_F2FS_FS=m
-CONFIG_F2FS_STAT_FS=y
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_FS_POSIX_ACL=y
-# CONFIG_F2FS_FS_SECURITY is not set
-# CONFIG_F2FS_CHECK_FS is not set
-# CONFIG_F2FS_FAULT_INJECTION is not set
-# CONFIG_FS_DAX is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-CONFIG_EXPORTFS_BLOCK_OPS=y
-CONFIG_FILE_LOCKING=y
-# CONFIG_MANDATORY_FILE_LOCKING is not set
-CONFIG_FS_ENCRYPTION=y
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-# CONFIG_DNOTIFY is not set
-CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-# CONFIG_QUOTA_DEBUG is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-CONFIG_QUOTACTL_COMPAT=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_AUTOFS_FS=m
-CONFIG_FUSE_FS=m
-# CONFIG_CUSE is not set
-CONFIG_VIRTIO_FS=m
-CONFIG_OVERLAY_FS=m
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
-# CONFIG_OVERLAY_FS_INDEX is not set
-# CONFIG_OVERLAY_FS_XINO_AUTO is not set
-# CONFIG_OVERLAY_FS_METACOPY is not set
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
-# CONFIG_FAT_DEFAULT_UTF8 is not set
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-# end of DOS/FAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-# CONFIG_PROC_KCORE is not set
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PROC_CHILDREN is not set
-CONFIG_PROC_PID_ARCH_STATUS=y
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
-CONFIG_CONFIGFS_FS=m
-CONFIG_EFIVAR_FS=m
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ORANGEFS_FS is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-CONFIG_ECRYPT_FS=m
-# CONFIG_ECRYPT_FS_MESSAGING is not set
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-CONFIG_EFS_FS=m
-CONFIG_CRAMFS=m
-# CONFIG_CRAMFS_BLOCKDEV is not set
-CONFIG_SQUASHFS=m
-# CONFIG_SQUASHFS_FILE_CACHE is not set
-CONFIG_SQUASHFS_FILE_DIRECT=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZSTD is not set
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-CONFIG_MINIX_FS=m
-CONFIG_OMFS_FS=m
-CONFIG_HPFS_FS=m
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-CONFIG_ROMFS_FS=m
-CONFIG_ROMFS_BACKED_BY_BLOCK=y
-CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_PSTORE=y
-CONFIG_PSTORE_DEFLATE_COMPRESS=y
-# CONFIG_PSTORE_LZO_COMPRESS is not set
-# CONFIG_PSTORE_LZ4_COMPRESS is not set
-# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
-# CONFIG_PSTORE_842_COMPRESS is not set
-# CONFIG_PSTORE_ZSTD_COMPRESS is not set
-CONFIG_PSTORE_COMPRESS=y
-CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
-CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
-# CONFIG_PSTORE_CONSOLE is not set
-# CONFIG_PSTORE_PMSG is not set
-CONFIG_PSTORE_RAM=m
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-# CONFIG_EROFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V2=m
-CONFIG_NFS_V3=m
-# CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
-CONFIG_NFS_V4_1=y
-CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=m
-CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
-CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
-# CONFIG_NFS_V4_1_MIGRATION is not set
-CONFIG_NFS_V4_SECURITY_LABEL=y
-CONFIG_NFS_FSCACHE=y
-# CONFIG_NFS_USE_LEGACY_DNS is not set
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
-CONFIG_NFSD_BLOCKLAYOUT=y
-CONFIG_NFSD_SCSILAYOUT=y
-CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFSD_V4_SECURITY_LABEL is not set
-CONFIG_GRACE_PERIOD=m
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
-# CONFIG_SUNRPC_DEBUG is not set
-CONFIG_CEPH_FS=m
-CONFIG_CEPH_FSCACHE=y
-CONFIG_CEPH_FS_POSIX_ACL=y
-# CONFIG_CEPH_FS_SECURITY_LABEL is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_UPCALL is not set
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-CONFIG_CIFS_DEBUG=y
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
-CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_FSCACHE=y
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-# CONFIG_9P_FS_SECURITY is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_MAC_ROMAN=m
-CONFIG_NLS_MAC_CELTIC=m
-CONFIG_NLS_MAC_CENTEURO=m
-CONFIG_NLS_MAC_CROATIAN=m
-CONFIG_NLS_MAC_CYRILLIC=m
-CONFIG_NLS_MAC_GAELIC=m
-CONFIG_NLS_MAC_GREEK=m
-CONFIG_NLS_MAC_ICELAND=m
-CONFIG_NLS_MAC_INUIT=m
-CONFIG_NLS_MAC_ROMANIAN=m
-CONFIG_NLS_MAC_TURKISH=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-# CONFIG_UNICODE is not set
-# end of File systems
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-CONFIG_KEYS_COMPAT=y
-# CONFIG_KEYS_REQUEST_CACHE is not set
-# CONFIG_PERSISTENT_KEYRINGS is not set
-# CONFIG_BIG_KEYS is not set
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_KEY_DH_OPERATIONS=y
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_PAGE_TABLE_ISOLATION=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-# CONFIG_INTEL_TXT is not set
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_HARDENED_USERCOPY_FALLBACK=y
-# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
-CONFIG_FORTIFY_SOURCE=y
-# CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_HASH=y
-CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
-# CONFIG_SECURITY_APPARMOR_DEBUG is not set
-# CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
-# CONFIG_SECURITY_SAFESETID is not set
-CONFIG_SECURITY_LOCKDOWN_LSM=y
-# CONFIG_SECURITY_LOCKDOWN_LSM_EARLY is not set
-CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
-# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
-# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
-CONFIG_INTEGRITY=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
-CONFIG_INTEGRITY_AUDIT=y
-# CONFIG_IMA is not set
-# CONFIG_EVM is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=m
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_KPP=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_SIMD=m
-CONFIG_CRYPTO_GLUE_HELPER_X86=m
-CONFIG_CRYPTO_ENGINE=m
-
-#
-# Public-key cryptography
-#
-CONFIG_CRYPTO_RSA=y
-CONFIG_CRYPTO_DH=y
-CONFIG_CRYPTO_ECC=m
-CONFIG_CRYPTO_ECDH=m
-# CONFIG_CRYPTO_ECRDSA is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CFB=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_LRW=m
-# CONFIG_CRYPTO_OFB is not set
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_KEYWRAP=m
-# CONFIG_CRYPTO_NHPOLY1305_SSE2 is not set
-# CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set
-# CONFIG_CRYPTO_ADIANTUM is not set
-CONFIG_CRYPTO_ESSIV=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_CMAC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32C_INTEL=m
-CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRC32_PCLMUL=m
-# CONFIG_CRYPTO_XXHASH is not set
-CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_POLY1305=m
-CONFIG_CRYPTO_POLY1305_X86_64=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_SSSE3=m
-CONFIG_CRYPTO_SHA256_SSSE3=m
-CONFIG_CRYPTO_SHA512_SSSE3=m
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_STREEBOG is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
-CONFIG_CRYPTO_AES_NI_INTEL=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_BLOWFISH_COMMON=m
-CONFIG_CRYPTO_BLOWFISH_X86_64=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAMELLIA_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
-CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
-CONFIG_CRYPTO_CAST_COMMON=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST5_AVX_X86_64=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_CAST6_AVX_X86_64=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_DES3_EDE_X86_64 is not set
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_CHACHA20=m
-CONFIG_CRYPTO_CHACHA20_X86_64=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
-CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
-CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_X86_64=m
-CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
-CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=m
-# CONFIG_CRYPTO_842 is not set
-CONFIG_CRYPTO_LZ4=m
-CONFIG_CRYPTO_LZ4HC=m
-CONFIG_CRYPTO_ZSTD=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=m
-CONFIG_CRYPTO_DRBG_HMAC=y
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-CONFIG_CRYPTO_DRBG=m
-CONFIG_CRYPTO_JITTERENTROPY=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_USER_API_RNG=m
-CONFIG_CRYPTO_USER_API_AEAD=m
-# CONFIG_CRYPTO_STATS is not set
-CONFIG_CRYPTO_HASH_INFO=y
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
-CONFIG_CRYPTO_DEV_CCP=y
-CONFIG_CRYPTO_DEV_CCP_DD=m
-CONFIG_CRYPTO_DEV_SP_CCP=y
-CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
-CONFIG_CRYPTO_DEV_SP_PSP=y
-# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
-CONFIG_CRYPTO_DEV_QAT=m
-# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set
-# CONFIG_CRYPTO_DEV_QAT_C3XXX is not set
-# CONFIG_CRYPTO_DEV_QAT_C62X is not set
-CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
-# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
-# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
-CONFIG_CRYPTO_DEV_VIRTIO=m
-# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
-CONFIG_ASYMMETRIC_KEY_TYPE=y
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-CONFIG_X509_CERTIFICATE_PARSER=y
-# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set
-CONFIG_PKCS7_MESSAGE_PARSER=y
-# CONFIG_PKCS7_TEST_KEY is not set
-# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
-
-#
-# Certificates for signature checking
-#
-CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
-CONFIG_SYSTEM_TRUSTED_KEYRING=y
-CONFIG_SYSTEM_TRUSTED_KEYS=""
-# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
-CONFIG_SECONDARY_TRUSTED_KEYRING=y
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
-# end of Certificates for signature checking
-
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_RAID6_PQ=m
-CONFIG_RAID6_PQ_BENCHMARK=y
-# CONFIG_PACKING is not set
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_NET_UTILS=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_CORDIC=m
-CONFIG_RATIONAL=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=m
-# CONFIG_CRC4 is not set
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_CRC8=m
-CONFIG_XXHASH=y
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_COMPRESS=m
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_LZ4_COMPRESS=m
-CONFIG_LZ4HC_COMPRESS=m
-CONFIG_LZ4_DECOMPRESS=y
-CONFIG_ZSTD_COMPRESS=m
-CONFIG_ZSTD_DECOMPRESS=m
-CONFIG_XZ_DEC=y
-CONFIG_XZ_DEC_X86=y
-CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_XZ_DEC_SPARC=y
-CONFIG_XZ_DEC_BCJ=y
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZ4=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_SWIOTLB=y
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
-CONFIG_NLATTR=y
-CONFIG_LRU_CACHE=m
-CONFIG_CLZ_TAB=y
-CONFIG_IRQ_POLL=y
-CONFIG_MPILIB=y
-CONFIG_DIMLIB=y
-CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=y
-CONFIG_HAVE_GENERIC_VDSO=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_FONT_SUPPORT=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-CONFIG_SG_POOL=y
-CONFIG_ARCH_HAS_PMEM_API=y
-CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
-CONFIG_ARCH_STACKWALK=y
-CONFIG_SBITMAP=y
-# CONFIG_STRING_SELFTEST is not set
-# end of Library routines
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-# CONFIG_PRINTK_CALLER is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=3
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# end of printk and dmesg options
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1280
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_INSTALL is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-CONFIG_STACK_VALIDATION=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# end of Compile-time checks and compiler options
-
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_MAGIC_SYSRQ_SERIAL=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_OWNER is not set
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_PAGE_REF is not set
-CONFIG_DEBUG_RODATA_TEST=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_ARCH_KASAN=y
-CONFIG_CC_HAS_KASAN_GENERIC=y
-# CONFIG_KASAN is not set
-CONFIG_KASAN_STACK=1
-# end of Memory Debugging
-
-CONFIG_ARCH_HAS_KCOV=y
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_KCOV is not set
-CONFIG_DEBUG_SHIRQ=y
-
-#
-# Debug Lockups and Hangs
-#
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_SOFTLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_HARDLOCKUP_DETECTOR_PERF=y
-CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
-# CONFIG_DETECT_HUNG_TASK is not set
-# CONFIG_WQ_WATCHDOG is not set
-# end of Debug Lockups and Hangs
-
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHED_INFO=y
-CONFIG_SCHEDSTATS=y
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-# end of Lock Debugging (spinlocks, mutexes, etc...)
-
-CONFIG_STACKTRACE=y
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_LIST=y
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# end of RCU Debugging
-
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-CONFIG_FUNCTION_ERROR_INJECTION=y
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_LATENCYTOP=y
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_FENTRY=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACE_CLOCK=y
-CONFIG_RING_BUFFER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-# CONFIG_FUNCTION_TRACER is not set
-# CONFIG_PREEMPTIRQ_EVENTS is not set
-# CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_SCHED_TRACER is not set
-# CONFIG_HWLAT_TRACER is not set
-# CONFIG_ENABLE_DEFAULT_TRACERS is not set
-# CONFIG_FTRACE_SYSCALLS is not set
-# CONFIG_TRACER_SNAPSHOT is not set
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_STACK_TRACER is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-CONFIG_KPROBE_EVENTS=y
-CONFIG_UPROBE_EVENTS=y
-CONFIG_BPF_EVENTS=y
-CONFIG_DYNAMIC_EVENTS=y
-CONFIG_PROBE_EVENTS=y
-# CONFIG_BPF_KPROBE_OVERRIDE is not set
-# CONFIG_MMIOTRACE is not set
-# CONFIG_HIST_TRIGGERS is not set
-# CONFIG_TRACEPOINT_BENCHMARK is not set
-# CONFIG_RING_BUFFER_BENCHMARK is not set
-# CONFIG_RING_BUFFER_STARTUP_TEST is not set
-# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
-# CONFIG_TRACE_EVAL_MAP_FILE is not set
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_RUNTIME_TESTING_MENU is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_IO_STRICT_DEVMEM=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_X86_VERBOSE_BOOTUP is not set
-# CONFIG_EARLY_PRINTK is not set
-# CONFIG_X86_PTDUMP is not set
-# CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_DEBUG_WX is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_DEBUG_TLBFLUSH is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-# CONFIG_X86_DECODER_SELFTEST is not set
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-# CONFIG_DEBUG_ENTRY is not set
-CONFIG_DEBUG_NMI_SELFTEST=y
-CONFIG_X86_DEBUG_FPU=y
-# CONFIG_PUNIT_ATOM_DEBUG is not set
-CONFIG_UNWINDER_ORC=y
-# CONFIG_UNWINDER_FRAME_POINTER is not set
-# CONFIG_UNWINDER_GUESS is not set
-# end of Kernel hacking
diff --git a/main/linux-lts/lts.aarch64.config b/main/linux-lts/lts.aarch64.config
new file mode 100644
index 00000000000..947b3335f2d
--- /dev/null
+++ b/main/linux-lts/lts.aarch64.config
@@ -0,0 +1,2965 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+# CONFIG_CROSS_MEMORY_ATTACH is not set
+CONFIG_NO_HZ_FULL=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_PREEMPT_DYNAMIC=y
+CONFIG_SCHED_CORE=y
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_MEMCG=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+# CONFIG_PROC_PID_CPUSET is not set
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_NAMESPACES=y
+CONFIG_USER_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+# CONFIG_SYSFS_SYSCALL is not set
+# CONFIG_FHANDLE is not set
+CONFIG_PROFILING=y
+CONFIG_KEXEC=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_ARCH_APPLE=y
+CONFIG_ARCH_BCM=y
+CONFIG_ARCH_BCM2835=y
+CONFIG_ARCH_BERLIN=y
+CONFIG_ARCH_EXYNOS=y
+CONFIG_ARCH_HISI=y
+CONFIG_ARCH_MEDIATEK=y
+CONFIG_ARCH_MESON=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_ARCH_QCOM=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_ARCH_SEATTLE=y
+CONFIG_ARCH_SYNQUACER=y
+CONFIG_ARCH_TEGRA=y
+CONFIG_ARCH_SPRD=y
+CONFIG_ARCH_THUNDER=y
+CONFIG_ARCH_THUNDER2=y
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARCH_XGENE=y
+CONFIG_ARCH_ZYNQMP=y
+CONFIG_ARM64_VA_BITS_48=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
+CONFIG_NUMA=y
+CONFIG_NODES_SHIFT=9
+CONFIG_HZ_300=y
+CONFIG_XEN=y
+CONFIG_COMPAT=y
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_SWP_EMULATION=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
+CONFIG_HIBERNATION=y
+# CONFIG_HIBERNATION_SNAPSHOT_DEV is not set
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+CONFIG_CPUFREQ_DT=m
+CONFIG_ARM_ARMADA_37XX_CPUFREQ=m
+CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
+CONFIG_ARM_SCMI_CPUFREQ=m
+CONFIG_ARM_TEGRA186_CPUFREQ=m
+CONFIG_ARM_TEGRA194_CPUFREQ=m
+CONFIG_ACPI=y
+CONFIG_ACPI_EC_DEBUGFS=y
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_TINY_POWER_BUTTON=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_TAD=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_CONFIGFS=m
+CONFIG_PMIC_OPREGION=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=y
+CONFIG_KPROBES=y
+CONFIG_ARCH_MMAP_RND_BITS=24
+CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
+CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_SHA256=y
+CONFIG_MODULE_COMPRESS_GZIP=y
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BLK_CGROUP_IOLATENCY=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_MAC_PARTITION=y
+CONFIG_LDM_PARTITION=y
+CONFIG_IOSCHED_BFQ=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_ZSWAP=y
+CONFIG_ZSMALLOC=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_KSM=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_CMA_AREAS=7
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+CONFIG_NET=y
+CONFIG_PACKET=m
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_STATISTICS=y
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_XDP_SOCKETS=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=y
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=m
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_MPTCP=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NF_FLOW_TABLE_PROCFS=y
+CONFIG_NETFILTER_XT_SET=m
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_PE_SIP=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_RDS=m
+CONFIG_TIPC=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+CONFIG_L2TP=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_NET_DSA=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+CONFIG_6LOWPAN_DEBUGFS=y
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
+CONFIG_6LOWPAN_GHC_UDP=m
+CONFIG_6LOWPAN_GHC_ICMPV6=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+CONFIG_DNS_RESOLVER=y
+CONFIG_OPENVSWITCH=m
+CONFIG_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_HYPERV_VSOCKETS=m
+CONFIG_NETLINK_DIAG=y
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NCSI=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_NET_PKTGEN=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_LEDS=y
+# CONFIG_BT_DEBUGFS is not set
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_QCOMSMD=m
+CONFIG_BT_VIRTIO=m
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_CFG80211=m
+CONFIG_MAC80211=m
+CONFIG_RFKILL=m
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_XEN=m
+CONFIG_NET_9P_RDMA=m
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_NCI_SPI=m
+CONFIG_NFC_NCI_UART=m
+CONFIG_NFC_HCI=m
+CONFIG_NFC_SHDLC=y
+CONFIG_NFC_TRF7970A=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_FDP=m
+CONFIG_NFC_FDP_I2C=m
+CONFIG_NFC_PN544_I2C=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
+CONFIG_NFC_MICROREAD_I2C=m
+CONFIG_NFC_MRVL_USB=m
+CONFIG_NFC_MRVL_UART=m
+CONFIG_NFC_MRVL_I2C=m
+CONFIG_NFC_MRVL_SPI=m
+CONFIG_NFC_ST21NFCA_I2C=m
+CONFIG_NFC_ST_NCI_I2C=m
+CONFIG_NFC_ST_NCI_SPI=m
+CONFIG_NFC_S3FWRN5_I2C=m
+CONFIG_PCI=y
+CONFIG_PCIE_PTM=y
+CONFIG_PCI_STUB=m
+CONFIG_PCI_PF_STUB=m
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+CONFIG_PCI_HYPERV=m
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_PCI_AARDVARK=y
+CONFIG_PCIE_APPLE=m
+CONFIG_PCIE_BRCMSTB=m
+CONFIG_PCI_HOST_THUNDER_PEM=y
+CONFIG_PCI_HOST_THUNDER_ECAM=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCIE_ROCKCHIP_HOST=y
+CONFIG_PCI_XGENE=y
+CONFIG_PCIE_XILINX=y
+CONFIG_PCIE_HISI_STB=y
+CONFIG_PCIE_ARMADA_8K=y
+CONFIG_PCIE_DW_PLAT_HOST=y
+CONFIG_PCIE_QCOM=y
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DEVTMPFS_SAFE=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+CONFIG_FW_LOADER_COMPRESS=y
+# CONFIG_FW_LOADER_COMPRESS_XZ is not set
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
+# CONFIG_ALLOW_DEV_COREDUMP is not set
+CONFIG_DEBUG_DEVRES=y
+CONFIG_HISILICON_LPC=y
+# CONFIG_QCOM_EBI2 is not set
+CONFIG_SUNXI_RSB=m
+CONFIG_TEGRA_ACONNECT=m
+CONFIG_CONNECTOR=y
+CONFIG_ARM_SCMI_PROTOCOL=y
+CONFIG_ARM_SCMI_POWER_DOMAIN=m
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_RASPBERRYPI_FIRMWARE=y
+CONFIG_FW_CFG_SYSFS=m
+CONFIG_SYSFB_SIMPLEFB=y
+CONFIG_TURRIS_MOX_RWTM=m
+CONFIG_EFI_VARS_PSTORE=m
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_EFI_ZBOOT=y
+CONFIG_MTD=m
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+CONFIG_MTD_DATAFLASH=m
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTD_BLOCK2MTD=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_SPI_NAND=m
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_UBI=m
+CONFIG_OF_OVERLAY=y
+CONFIG_PARPORT=m
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZ4=y
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_DRBD=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_TCP=m
+CONFIG_NVME_APPLE=m
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+CONFIG_PHANTOM=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_C2PORT=m
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93XX46=m
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_ISCSI_TCP=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_HISI_SAS=m
+CONFIG_SCSI_HISI_SAS_PCI=m
+CONFIG_SCSI_MVSAS=m
+CONFIG_SCSI_MVSAS_TASKLET=y
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_WD719X=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_ATA=m
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=3
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_AHCI_CEVA=m
+CONFIG_AHCI_MVEBU=m
+CONFIG_AHCI_SUNXI=m
+CONFIG_AHCI_TEGRA=m
+CONFIG_AHCI_XGENE=m
+CONFIG_SATA_AHCI_SEATTLE=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_RZ1000=m
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=m
+CONFIG_PATA_LEGACY=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+# CONFIG_MD_AUTODETECT is not set
+CONFIG_MD_LINEAR=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BCACHE=m
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_FEC=y
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_CTL=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+CONFIG_EQUALIZER=m
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NTB_NETDEV=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_IDT77252=m
+CONFIG_ATM_IA=m
+CONFIG_ATM_FORE200E=m
+CONFIG_ATM_FORE200E_USE_TASKLET=y
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
+CONFIG_NET_DSA_BCM_SF2=m
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_PTP=y
+CONFIG_NET_DSA_QCA8K=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_ACENIC=m
+CONFIG_ALTERA_TSE=m
+CONFIG_ENA_ETHERNET=m
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
+CONFIG_AMD_XGBE=m
+CONFIG_NET_XGENE=m
+CONFIG_NET_XGENE_V2=m
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_B44=m
+CONFIG_BCMGENET=m
+CONFIG_TIGON3=m
+CONFIG_BNX2X=m
+CONFIG_SYSTEMPORT=m
+CONFIG_BNXT=m
+CONFIG_MACB=m
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_LIQUIDIO=m
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_ENIC=m
+# CONFIG_NET_VENDOR_CORTINA is not set
+CONFIG_DNET=m
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_TULIP=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+CONFIG_BE2NET=m
+CONFIG_GVE=m
+CONFIG_HIX5HD2_GMAC=m
+CONFIG_HISI_FEMAC=m
+CONFIG_HIP04_ETH=m
+CONFIG_HNS_DSAF=m
+CONFIG_HNS_ENET=m
+CONFIG_HINIC=m
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGBVF=m
+CONFIG_IXGBE=m
+CONFIG_IXGBEVF=m
+CONFIG_I40E=m
+CONFIG_ICE=m
+CONFIG_JME=m
+# CONFIG_NET_VENDOR_LITEX is not set
+CONFIG_MVNETA=m
+CONFIG_PXA168_ETH=m
+CONFIG_SKGE=m
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_CORE_EN=y
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_ENC28J60=m
+CONFIG_ENCX24J600=m
+# CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_MICROSOFT is not set
+CONFIG_MYRI10GE=m
+CONFIG_FEALNX=m
+# CONFIG_NET_VENDOR_NI is not set
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_S2IO=m
+CONFIG_NFP=m
+# CONFIG_NFP_APP_FLOWER is not set
+# CONFIG_NFP_APP_ABM_NIC is not set
+CONFIG_NE2K_PCI=m
+CONFIG_FORCEDETH=m
+CONFIG_ETHOC=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QEDE=m
+CONFIG_BNA=m
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+CONFIG_R6040=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_R8169=m
+CONFIG_ROCKER=m
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+CONFIG_SC92031=m
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_SFC=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+CONFIG_SNI_NETSEC=m
+CONFIG_STMMAC_ETH=m
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_TEHUTI=m
+CONFIG_TLAN=m
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_VELOCITY=m
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+CONFIG_WIZNET_W5100_SPI=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+CONFIG_NET_SB1000=m
+CONFIG_PHYLIB=y
+CONFIG_SFP=m
+CONFIG_AMD_PHY=m
+CONFIG_MESON_GXL_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_AT803X_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_ROCKCHIP_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+CONFIG_MDIO_XGENE=y
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_HISI_FEMAC=m
+CONFIG_MDIO_OCTEON=m
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+# CONFIG_WLAN_VENDOR_ADMTEK is not set
+CONFIG_ATH5K=m
+CONFIG_ATH9K=m
+CONFIG_ATH9K_AHB=y
+CONFIG_ATH9K_HTC=m
+CONFIG_CARL9170=m
+CONFIG_CARL9170_HWRNG=y
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+CONFIG_ATH6KL_DEBUG=y
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+CONFIG_WCN36XX=m
+CONFIG_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_WLAN_VENDOR_ATMEL is not set
+CONFIG_B43=m
+CONFIG_B43_SDIO=y
+CONFIG_B43LEGACY=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+# CONFIG_WLAN_VENDOR_CISCO is not set
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_MWL8K=m
+CONFIG_MT7601U=m
+CONFIG_MT76x0U=m
+CONFIG_MT76x2E=m
+CONFIG_MT76x2U=m
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+# CONFIG_RT2800PCI_RT35XX is not set
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+# CONFIG_RT2800USB_RT35XX is not set
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8XXXU=m
+CONFIG_RTL8XXXU_UNTESTED=y
+CONFIG_RSI_91X=m
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE_SPI=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_WAN=y
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+CONFIG_HDLC_X25=m
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+CONFIG_PC300TOO=m
+CONFIG_FARSYNC=m
+CONFIG_LAPBETHER=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_CC2520=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+CONFIG_IEEE802154_MCR20A=m
+CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_VMXNET3=m
+CONFIG_FUJITSU_ES=m
+CONFIG_USB4_NET=m
+CONFIG_HYPERV_NET=m
+CONFIG_ISDN=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_INPUT_LEDS=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVBUG=m
+CONFIG_KEYBOARD_ADC=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TEGRA=m
+CONFIG_KEYBOARD_OMAP4=m
+CONFIG_KEYBOARD_CROS_EC=m
+CONFIG_MOUSE_PS2=m
+# CONFIG_MOUSE_PS2_BYD is not set
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ADC=m
+CONFIG_TOUCHSCREEN_AR1021_I2C=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELAN=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+# CONFIG_TOUCHSCREEN_USB_EASYTOUCH is not set
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_INPUT_HISI_POWERKEY=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_AMBAKMI=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LDISC_AUTOLOAD is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_8250_BCM2835AUX=m
+CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_8250_TEGRA=m
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SERIAL_AMBA_PL010=y
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_MESON=y
+CONFIG_SERIAL_MESON_CONSOLE=y
+CONFIG_SERIAL_SAMSUNG=y
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_QCOM_GENI=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_XILINX_PS_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_MVEBU_UART=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_N_HDLC=m
+CONFIG_NOZOMI=m
+CONFIG_PRINTER=m
+CONFIG_PPDEV=m
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_VIRTIO=m
+# CONFIG_HW_RANDOM_EXYNOS is not set
+CONFIG_APPLICOM=m
+CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS_SPI=m
+CONFIG_TCG_TIS_SPI_CR50=y
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_XEN=m
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_SCMI=m
+CONFIG_I2C_BCM2835=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_MESON=m
+CONFIG_I2C_MV64XXX=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_QCOM_GENI=m
+CONFIG_I2C_RK3X=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_SYNQUACER=m
+CONFIG_I2C_TEGRA=m
+CONFIG_I2C_VERSATILE=m
+CONFIG_I2C_THUNDERX=m
+CONFIG_I2C_XILINX=m
+CONFIG_I2C_XLP9XX=m
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_CROS_EC_TUNNEL=m
+CONFIG_I2C_XGENE_SLIMPRO=m
+CONFIG_I2C_VIRTIO=m
+CONFIG_I2C_STUB=m
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+CONFIG_SPI=y
+CONFIG_SPI_BCM2835=m
+CONFIG_SPI_BCM2835AUX=m
+CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DW_PCI=m
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_MESON_SPICC=m
+CONFIG_SPI_MESON_SPIFC=m
+CONFIG_SPI_ORION=m
+CONFIG_SPI_ROCKCHIP=m
+CONFIG_SPI_SUN6I=m
+CONFIG_SPI_THUNDERX=m
+CONFIG_SPI_XCOMM=m
+CONFIG_SPI_XLP=m
+CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_TLE62X0=m
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_DP83640_PHY=m
+CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PINCTRL_APPLE_GPIO=m
+CONFIG_PINCTRL_AXP209=m
+# CONFIG_PINCTRL_MT7622 is not set
+CONFIG_PINCTRL_MSM=y
+CONFIG_PINCTRL_MSM8996=m
+CONFIG_PINCTRL_MSM8998=m
+CONFIG_PINCTRL_SDM845=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MB86S7X=m
+CONFIG_GPIO_PL061=m
+CONFIG_GPIO_TEGRA186=m
+CONFIG_GPIO_THUNDERX=y
+CONFIG_GPIO_XGENE=y
+CONFIG_GPIO_XGENE_SB=m
+CONFIG_GPIO_XLP=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_GPIO_BT8XX=m
+CONFIG_GPIO_RDC321X=m
+CONFIG_GPIO_MAX7301=m
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
+CONFIG_POWER_RESET_RESTART=y
+CONFIG_POWER_RESET_VEXPRESS=y
+CONFIG_POWER_RESET_XGENE=y
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
+CONFIG_GENERIC_ADC_BATTERY=m
+CONFIG_BATTERY_AXP20X=m
+CONFIG_CHARGER_CROS_USBPD=m
+CONFIG_HWMON=m
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_ARM_SCMI=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FTSTEUTATES=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2990=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX31722=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_LTC3815=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX20751=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_TPS40422=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_RASPBERRYPI_HWMON=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
+CONFIG_SENSORS_SHTC1=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_ADC128D818=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA3221=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83773G=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+CONFIG_SENSORS_W83795_FANCTRL=y
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_XGENE=m
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_THERMAL_STATISTICS=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_ROCKCHIP_THERMAL=m
+CONFIG_ARMADA_THERMAL=m
+CONFIG_BCM2711_THERMAL=m
+CONFIG_BCM2835_THERMAL=m
+CONFIG_TEGRA_BPMP_THERMAL=m
+CONFIG_GENERIC_ADC_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_SYSFS=y
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_WDAT_WDT=m
+CONFIG_ARM_SBSA_WATCHDOG=m
+CONFIG_SUNXI_WATCHDOG=m
+CONFIG_MAX63XX_WATCHDOG=m
+CONFIG_MESON_GXBB_WATCHDOG=m
+CONFIG_MESON_WATCHDOG=m
+CONFIG_APPLE_WATCHDOG=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_BCM2835_WDT=m
+CONFIG_XEN_WDT=m
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+CONFIG_USBPCWATCHDOG=m
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+CONFIG_MFD_AC100=m
+CONFIG_MFD_AXP20X_RSB=m
+CONFIG_MFD_HI655X_PMIC=m
+CONFIG_LPC_ICH=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_MFD_SM501=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_VX855=m
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_HI655X=m
+CONFIG_REGULATOR_QCOM_RPMH=m
+CONFIG_REGULATOR_QCOM_SMD_RPM=m
+CONFIG_REGULATOR_SY8106A=m
+CONFIG_RC_CORE=m
+CONFIG_RC_DECODERS=y
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_IR_ENE=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_GPIO_CIR=m
+CONFIG_IR_HIX5HD2=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_MESON=m
+CONFIG_IR_MESON_TX=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_SUNXI=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_RC_LOOPBACK=m
+# CONFIG_MEDIA_CEC_SUPPORT is not set
+CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_V4L2_FLASH_LED_CLASS=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_MEDIA_USB_SUPPORT=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+CONFIG_VIDEO_SOLO6X10=m
+CONFIG_VIDEO_TW686X=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+CONFIG_DVB_DDBRIDGE=m
+CONFIG_DVB_DM1105=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_SMIPCIE=m
+# CONFIG_RADIO_ADAPTERS is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_ROCKCHIP_RGA=m
+CONFIG_DVB_FIREDTV=m
+CONFIG_CXD2880_SPI_DRV=m
+CONFIG_DVB_DUMMY_FE=m
+CONFIG_AUXDISPLAY=y
+CONFIG_DRM=m
+CONFIG_DRM_DP_AUX_CHARDEV=y
+CONFIG_DRM_DP_CEC=y
+# CONFIG_DRM_I2C_CH7006 is not set
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_HDLCD=m
+CONFIG_DRM_MALI_DISPLAY=m
+CONFIG_DRM_KOMEDA=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_USERPTR=y
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+CONFIG_DRM_AMDGPU_USERPTR=y
+CONFIG_DRM_AMD_ACP=y
+CONFIG_DRM_AMD_DC_SI=y
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_VGEM=m
+CONFIG_DRM_EXYNOS=m
+CONFIG_DRM_EXYNOS_FIMD=y
+CONFIG_DRM_EXYNOS5433_DECON=y
+CONFIG_DRM_EXYNOS7_DECON=y
+CONFIG_DRM_EXYNOS_MIXER=y
+CONFIG_DRM_EXYNOS_VIDI=y
+CONFIG_DRM_EXYNOS_DPI=y
+CONFIG_DRM_EXYNOS_DSI=y
+CONFIG_DRM_EXYNOS_HDMI=y
+CONFIG_DRM_EXYNOS_MIC=y
+CONFIG_DRM_EXYNOS_FIMC=y
+CONFIG_DRM_EXYNOS_ROTATOR=y
+CONFIG_DRM_EXYNOS_SCALER=y
+CONFIG_DRM_EXYNOS_GSC=y
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_SUN4I=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_MSM=m
+# CONFIG_DRM_MSM_DSI_28NM_8960_PHY is not set
+CONFIG_DRM_TEGRA=m
+CONFIG_DRM_PANEL_ARM_VERSATILE=m
+CONFIG_DRM_PANEL_ILITEK_IL9322=m
+CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
+CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
+CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
+CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
+CONFIG_DRM_SII9234=m
+CONFIG_DRM_ANALOGIX_ANX6345=m
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
+CONFIG_DRM_DW_HDMI_CEC=m
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_HISI_KIRIN=m
+CONFIG_DRM_MESON=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_GM12U320=m
+CONFIG_DRM_SIMPLEDRM=m
+CONFIG_DRM_PL111=m
+CONFIG_DRM_LIMA=m
+CONFIG_DRM_PANFROST=m
+CONFIG_DRM_TIDSS=m
+CONFIG_DRM_GUD=m
+CONFIG_DRM_HYPERV=m
+CONFIG_FB=y
+CONFIG_FB_EFI=y
+CONFIG_XEN_FBDEV_FRONTEND=m
+CONFIG_FB_TILEBLITTING=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_AMS369FG06=m
+CONFIG_LCD_LMS501KF03=m
+CONFIG_LCD_HX8357=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_PCF50633=m
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+CONFIG_SOUND=m
+CONFIG_SND=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_HRTIMER=m
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_SEQUENCER_OSS=m
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_BT87X=m
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_FM801=m
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_TEGRA=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=0
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_PREALLOC_SIZE=4096
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
+CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_BCM2835_SOC_I2S=m
+CONFIG_SND_DESIGNWARE_I2S=m
+CONFIG_SND_MESON_AXG_SOUND_CARD=m
+CONFIG_SND_MESON_GX_SOUND_CARD=m
+CONFIG_SND_SOC_AK4458=m
+CONFIG_SND_SOC_AK5558=m
+CONFIG_SND_SOC_BD28623=m
+CONFIG_SND_SOC_CROS_EC_CODEC=m
+# CONFIG_SND_SOC_DMIC is not set
+CONFIG_SND_SOC_MAX9867=m
+CONFIG_SND_SOC_PCM1789_I2C=m
+CONFIG_SND_SOC_PCM186X_I2C=m
+CONFIG_SND_SOC_PCM186X_SPI=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+CONFIG_SND_SOC_TAS6424=m
+CONFIG_SND_SOC_TDA7419=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
+CONFIG_SND_SOC_TSCS42XX=m
+CONFIG_SND_SOC_MAX9759=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_VIRTIO=m
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_ASUS=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_JABRA=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MAYFLASH=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PLAYSTATION=m
+CONFIG_PLAYSTATION_FF=y
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+CONFIG_HID_RMI=m
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_ALPS=m
+CONFIG_USB_HIDDEV=y
+CONFIG_I2C_HID_ACPI=m
+CONFIG_I2C_HID_OF=m
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_OTG=y
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_MON=m
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_MVEBU=m
+CONFIG_USB_XHCI_TEGRA=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_SSB=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_HCD_ISO=y
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_XEN_HCD=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_TMC=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_HOST=m
+CONFIG_USB_MTU3=m
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_DWC3=m
+CONFIG_USB_DWC2=m
+CONFIG_USB_DWC2_PCI=m
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_ISP1760=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_XR=m
+CONFIG_USB_SERIAL_DEBUG=m
+CONFIG_USB_USS720=m
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_APPLE_MFI_FASTCHARGE=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_LD=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_USB_GADGET=m
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_MUX_PI3USB30532=m
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_MMC=m
+# CONFIG_PWRSEQ_EMMC is not set
+# CONFIG_PWRSEQ_SIMPLE is not set
+CONFIG_SDIO_UART=m
+CONFIG_MMC_TEST=m
+CONFIG_MMC_ARMMMCI=m
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_OF_ARASAN=m
+CONFIG_MMC_SDHCI_OF_AT91=m
+CONFIG_MMC_SDHCI_TEGRA=m
+CONFIG_MMC_SDHCI_PXAV3=m
+CONFIG_MMC_SDHCI_F_SDH30=m
+CONFIG_MMC_SDHCI_IPROC=m
+CONFIG_MMC_MESON_GX=m
+CONFIG_MMC_MESON_MX_SDIO=m
+CONFIG_MMC_SDHCI_MSM=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_CAVIUM_THUNDERX=m
+CONFIG_MMC_DW=m
+CONFIG_MMC_DW_EXYNOS=m
+CONFIG_MMC_DW_HI3798CV200=m
+CONFIG_MMC_DW_K3=m
+CONFIG_MMC_DW_PCI=m
+CONFIG_MMC_DW_ROCKCHIP=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_SUNXI=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_BCM2835=m
+CONFIG_MMC_MTK=m
+CONFIG_MMC_SDHCI_XENON=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_MEMSTICK=m
+CONFIG_MSPRO_BLOCK=m
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS_FLASH=m
+CONFIG_LEDS_CLASS_MULTICOLOR=m
+CONFIG_LEDS_CR0014114=m
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3692X=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_MLXREG=m
+CONFIG_LEDS_LM3601X=m
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_IRDMA=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
+CONFIG_RDMA_RXE=m
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_EDAC=y
+CONFIG_EDAC_THUNDERX=m
+CONFIG_EDAC_XGENE=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_AC100=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1374_WDT=y
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12026=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV8803=m
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1343=m
+CONFIG_RTC_DRV_DS1347=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6916=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_PCF2123=m
+CONFIG_RTC_DRV_MCP795=m
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_EFI=y
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_CROS_EC=m
+CONFIG_RTC_DRV_SUN6I=y
+CONFIG_RTC_DRV_MV=m
+CONFIG_RTC_DRV_ARMADA38X=m
+CONFIG_RTC_DRV_XGENE=m
+CONFIG_DMADEVICES=y
+CONFIG_DMA_BCM2835=m
+CONFIG_FSL_EDMA=m
+CONFIG_INTEL_IDMA64=m
+CONFIG_MV_XOR=y
+CONFIG_PL330_DMA=m
+CONFIG_TEGRA210_ADMA=y
+CONFIG_XGENE_DMA=m
+CONFIG_QCOM_BAM_DMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_DW_DMAC_PCI=m
+CONFIG_DMATEST=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PLATFORM=m
+CONFIG_VFIO_AMBA=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_VDPA=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_VDPA=m
+CONFIG_VDPA_USER=m
+CONFIG_IFCVF=m
+CONFIG_MLX5_VDPA_NET=m
+CONFIG_VP_VDPA=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_VDPA=m
+CONFIG_VHOST_CROSS_ENDIAN_LEGACY=y
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XENFS=m
+CONFIG_XEN_PVCALLS_FRONTEND=m
+CONFIG_XEN_SCSI_BACKEND=m
+CONFIG_XEN_VIRTIO=y
+CONFIG_STAGING=y
+CONFIG_RTLLIB=m
+CONFIG_R8712U=m
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_ACPI=m
+CONFIG_CHROMEOS_TBMC=m
+CONFIG_CROS_EC=m
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_SPI=m
+CONFIG_CHROMEOS_PRIVACY_SCREEN=m
+# CONFIG_COMMON_CLK_HI655X is not set
+CONFIG_COMMON_CLK_SCMI=m
+CONFIG_COMMON_CLK_SI544=m
+CONFIG_CLK_RASPBERRYPI=m
+# CONFIG_COMMON_CLK_HI3519 is not set
+# CONFIG_STUB_CLK_HI6220 is not set
+# CONFIG_COMMON_CLK_MT2712 is not set
+# CONFIG_COMMON_CLK_MT7622 is not set
+# CONFIG_COMMON_CLK_MT8173 is not set
+# CONFIG_COMMON_CLK_MT8183_AUDIOSYS is not set
+# CONFIG_COMMON_CLK_MT8183_CAMSYS is not set
+# CONFIG_COMMON_CLK_MT8183_IMGSYS is not set
+# CONFIG_COMMON_CLK_MT8183_IPU_CORE0 is not set
+# CONFIG_COMMON_CLK_MT8183_IPU_CORE1 is not set
+# CONFIG_COMMON_CLK_MT8183_IPU_ADL is not set
+# CONFIG_COMMON_CLK_MT8183_IPU_CONN is not set
+# CONFIG_COMMON_CLK_MT8183_MFGCFG is not set
+# CONFIG_COMMON_CLK_MT8183_MMSYS is not set
+# CONFIG_COMMON_CLK_MT8183_VDECSYS is not set
+# CONFIG_COMMON_CLK_MT8183_VENCSYS is not set
+# CONFIG_EXYNOS_AUDSS_CLK_CON is not set
+# CONFIG_SPRD_COMMON_CLK is not set
+# CONFIG_SUN8I_H3_CCU is not set
+CONFIG_XILINX_VCU=m
+# CONFIG_COMMON_CLK_ZYNQMP is not set
+# CONFIG_SPRD_TIMER is not set
+CONFIG_ARM_MHU=m
+CONFIG_PLATFORM_MHU=m
+CONFIG_PL320_MBOX=y
+CONFIG_ROCKCHIP_MBOX=y
+CONFIG_PCC=y
+CONFIG_BCM2835_MBOX=y
+CONFIG_HI6220_MBOX=m
+CONFIG_XGENE_SLIMPRO_MBOX=y
+CONFIG_SUN6I_MSGBOX=m
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+CONFIG_ROCKCHIP_IOMMU=y
+CONFIG_ARM_SMMU=y
+CONFIG_ARM_SMMU_V3=y
+CONFIG_VIRTIO_IOMMU=m
+CONFIG_RPMSG_VIRTIO=m
+CONFIG_SOUNDWIRE=y
+CONFIG_RASPBERRYPI_POWER=y
+CONFIG_QCOM_COMMAND_DB=y
+CONFIG_QCOM_GENI_SE=m
+CONFIG_QCOM_LLCC=m
+CONFIG_QCOM_RMTFS_MEM=m
+CONFIG_QCOM_RPMH=y
+CONFIG_QCOM_SMD_RPM=m
+CONFIG_QCOM_WCNSS_CTRL=m
+CONFIG_ROCKCHIP_IODOMAIN=m
+CONFIG_ROCKCHIP_PM_DOMAINS=y
+CONFIG_ARCH_TEGRA_132_SOC=y
+CONFIG_ARCH_TEGRA_210_SOC=y
+CONFIG_ARCH_TEGRA_194_SOC=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=m
+CONFIG_DEVFREQ_GOV_POWERSAVE=m
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+CONFIG_ARM_RK3399_DMC_DEVFREQ=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_USBC_CROS_EC=m
+CONFIG_MEMORY=y
+CONFIG_IIO=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
+CONFIG_AXP20X_ADC=m
+CONFIG_ROCKCHIP_SARADC=m
+CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+CONFIG_IIO_CROS_EC_SENSORS=m
+CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=m
+CONFIG_HID_SENSOR_GYRO_3D=m
+CONFIG_HID_SENSOR_HUMIDITY=m
+CONFIG_IIO_CROS_EC_LIGHT_PROX=m
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+CONFIG_IIO_CROS_EC_BARO=m
+CONFIG_HID_SENSOR_PRESS=m
+CONFIG_HID_SENSOR_TEMP=m
+CONFIG_NTB=m
+CONFIG_NTB_SWITCHTEC=m
+CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_PERF=m
+CONFIG_NTB_TRANSPORT=m
+CONFIG_PWM=y
+CONFIG_PWM_APPLE=m
+CONFIG_PWM_BCM2835=m
+CONFIG_PWM_CROS_EC=m
+CONFIG_PWM_MESON=m
+CONFIG_PWM_PCA9685=m
+CONFIG_PWM_RASPBERRYPI_POE=m
+CONFIG_PWM_ROCKCHIP=m
+CONFIG_PWM_SUN4I=m
+CONFIG_QCOM_PDC=y
+CONFIG_RESET_BERLIN=y
+CONFIG_RESET_QCOM_AOSS=y
+CONFIG_COMMON_RESET_HI6220=m
+CONFIG_PHY_XGENE=m
+CONFIG_PHY_SUN4I_USB=m
+CONFIG_PHY_SUN9I_USB=m
+CONFIG_PHY_SUN50I_USB3=m
+CONFIG_PHY_HI6220_USB=m
+CONFIG_PHY_HISTB_COMBPHY=m
+CONFIG_PHY_HISI_INNO_USB2=m
+CONFIG_PHY_ROCKCHIP_DP=m
+CONFIG_PHY_ROCKCHIP_EMMC=m
+CONFIG_PHY_ROCKCHIP_INNO_USB2=m
+CONFIG_PHY_ROCKCHIP_PCIE=m
+CONFIG_PHY_ROCKCHIP_TYPEC=m
+CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_TEGRA_XUSB=m
+CONFIG_ARM_CCI_PMU=y
+# CONFIG_ARM_CCI400_PMU is not set
+CONFIG_ARM_DSU_PMU=m
+CONFIG_XGENE_PMU=y
+CONFIG_ARM_SPE_PMU=m
+CONFIG_APPLE_M1_CPU_PMU=y
+CONFIG_HISI_PMU=y
+CONFIG_RAS=y
+CONFIG_USB4=m
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_OF_PMEM=m
+CONFIG_DEV_DAX=m
+CONFIG_NVMEM_MESON_EFUSE=m
+CONFIG_NVMEM_MESON_MX_EFUSE=m
+CONFIG_NVMEM_RMEM=m
+CONFIG_NVMEM_SUNXI_SID=m
+CONFIG_SLIMBUS=m
+CONFIG_SLIM_QCOM_CTRL=m
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_REISERFS_FS=m
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+CONFIG_XFS_ONLINE_SCRUB=y
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+# CONFIG_OCFS2_FS_STATS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+# CONFIG_F2FS_STAT_FS is not set
+CONFIG_F2FS_UNFAIR_RWSEM=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
+# CONFIG_DNOTIFY is not set
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_CACHEFILES=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
+CONFIG_NTFS_FS=m
+CONFIG_NTFS_RW=y
+CONFIG_NTFS3_FS=m
+CONFIG_NTFS3_LZX_XPRESS=y
+CONFIG_NTFS3_FS_POSIX_ACL=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_INODE64=y
+CONFIG_HUGETLBFS=y
+CONFIG_ORANGEFS_FS=m
+CONFIG_ECRYPT_FS=m
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RUBIN=y
+CONFIG_UBIFS_FS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_ROMFS_FS=m
+CONFIG_PSTORE=y
+CONFIG_PSTORE_RAM=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+CONFIG_NFS_FS=m
+CONFIG_NFS_V4=m
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_NFS_FSCACHE=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+CONFIG_CIFS_FSCACHE=y
+CONFIG_SMB_SERVER=m
+CONFIG_SMB_SERVER_SMBDIRECT=y
+CONFIG_CODA_FS=m
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_DLM=m
+CONFIG_KEYS_REQUEST_CACHE=y
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_FORTIFY_SOURCE=y
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_LANDLOCK=y
+# CONFIG_INTEGRITY is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity"
+CONFIG_GCC_PLUGIN_STACKLEAK=y
+CONFIG_STACKLEAK_RUNTIME_DISABLE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_ZERO_CALL_USED_REGS=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_TI=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_HCTR2=m
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+# CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
+CONFIG_CRYPTO_NHPOLY1305_NEON=m
+CONFIG_CRYPTO_GHASH_ARM64_CE=m
+CONFIG_CRYPTO_SHA1_ARM64_CE=m
+CONFIG_CRYPTO_SHA2_ARM64_CE=m
+CONFIG_CRYPTO_SHA512_ARM64_CE=m
+CONFIG_CRYPTO_SHA3_ARM64=m
+CONFIG_CRYPTO_SM3_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
+CONFIG_CRYPTO_AES_ARM64_BS=m
+CONFIG_CRYPTO_SM4_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
+CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_SUN8I_CE=m
+CONFIG_CRYPTO_DEV_S5P=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CAVIUM_CPT=m
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+CONFIG_CRYPTO_DEV_MARVELL_CESA=m
+CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=m
+CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m
+CONFIG_CRYPTO_DEV_QCE=m
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
+CONFIG_CRYPTO_DEV_ROCKCHIP=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
+CONFIG_SIGNED_PE_FILE_VERIFICATION=y
+CONFIG_SECONDARY_TRUSTED_KEYRING=y
+CONFIG_CRC_T10DIF=y
+CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_QUIET=3
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_INFO_DWARF5=y
+CONFIG_DEBUG_INFO_BTF=y
+CONFIG_FRAME_WARN=1280
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_SLUB_DEBUG is not set
+CONFIG_DEBUG_KMEMLEAK=y
+CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
+CONFIG_KFENCE=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_LIST=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+CONFIG_LATENCYTOP=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_HWLAT_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_IO_STRICT_DEVMEM=y
+# CONFIG_RUNTIME_TESTING_MENU is not set
diff --git a/main/linux-lts/lts.armv7.config b/main/linux-lts/lts.armv7.config
new file mode 100644
index 00000000000..b05c5b47100
--- /dev/null
+++ b/main/linux-lts/lts.armv7.config
@@ -0,0 +1,2242 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ_FULL=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_SCHED_CORE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_MEMCG=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_BPF=y
+CONFIG_NAMESPACES=y
+CONFIG_USER_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+# CONFIG_SYSFS_SYSCALL is not set
+CONFIG_PROFILING=y
+CONFIG_ARCH_VIRT=y
+CONFIG_ARCH_BCM=y
+CONFIG_ARCH_BCM2835=y
+CONFIG_ARCH_EXYNOS=y
+# CONFIG_ARCH_EXYNOS3 is not set
+CONFIG_ARCH_MXC=y
+CONFIG_SOC_IMX51=y
+CONFIG_SOC_IMX53=y
+CONFIG_SOC_IMX6Q=y
+CONFIG_SOC_IMX6SL=y
+CONFIG_SOC_IMX6SX=y
+CONFIG_SOC_IMX6UL=y
+CONFIG_SOC_IMX7D=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_MACH_ARMADA_38X=y
+CONFIG_SOC_AM33XX=y
+CONFIG_ARCH_QCOM=y
+CONFIG_ARCH_MSM8X60=y
+CONFIG_ARCH_MSM8960=y
+CONFIG_ARCH_MSM8974=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_ARCH_TEGRA=y
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARCH_VEXPRESS_DCSCB=y
+CONFIG_ARCH_VEXPRESS_TC2_PM=y
+CONFIG_ARCH_ZYNQ=y
+CONFIG_ARM_THUMBEE=y
+CONFIG_CACHE_L2X0_PMU=y
+CONFIG_PL310_ERRATA_588369=y
+CONFIG_PL310_ERRATA_727915=y
+CONFIG_ARM_ERRATA_430973=y
+CONFIG_ARM_ERRATA_754327=y
+CONFIG_ARM_ERRATA_798181=y
+CONFIG_ARM_ERRATA_773022=y
+CONFIG_ARM_ERRATA_818325_852422=y
+CONFIG_ARM_ERRATA_821420=y
+CONFIG_ARM_ERRATA_825619=y
+CONFIG_ARM_ERRATA_852421=y
+CONFIG_ARM_ERRATA_852423=y
+CONFIG_SMP=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
+CONFIG_VMSPLIT_2G=y
+# CONFIG_HIGHPTE is not set
+# CONFIG_CPU_SW_DOMAIN_PAN is not set
+# CONFIG_ARM_MODULE_PLTS is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_ZBOOT_ROM_TEXT=0
+CONFIG_ZBOOT_ROM_BSS=0
+CONFIG_EFI=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+CONFIG_CPUFREQ_DT=m
+CONFIG_ARM_IMX6Q_CPUFREQ=y
+# CONFIG_ARM_TI_CPUFREQ is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_ARM_MVEBU_V7_CPUIDLE=y
+CONFIG_KERNEL_MODE_NEON=y
+CONFIG_HIBERNATION=y
+# CONFIG_HIBERNATION_SNAPSHOT_DEV is not set
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_KPROBES=y
+CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_SHA256=y
+CONFIG_MODULE_COMPRESS_GZIP=y
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BLK_CGROUP_IOLATENCY=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_IOSCHED_BFQ=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_ZSWAP=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_KSM=y
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+CONFIG_NET=y
+CONFIG_PACKET=m
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_STATISTICS=y
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_XDP_SOCKETS=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=m
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_NETLABEL=y
+CONFIG_MPTCP=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NF_FLOW_TABLE_PROCFS=y
+CONFIG_NETFILTER_XT_SET=m
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_PE_SIP=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_BPFILTER=y
+CONFIG_IP_DCCP=m
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_RDS=m
+CONFIG_TIPC=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+CONFIG_L2TP=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_TRAILER=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
+CONFIG_6LOWPAN_GHC_UDP=m
+CONFIG_6LOWPAN_GHC_ICMPV6=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+CONFIG_DNS_RESOLVER=y
+CONFIG_OPENVSWITCH=m
+CONFIG_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NCSI=y
+CONFIG_NET_PKTGEN=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+CONFIG_BT_6LOWPAN=m
+CONFIG_BT_LEDS=y
+# CONFIG_BT_DEBUGFS is not set
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_QCOMSMD=m
+CONFIG_BT_VIRTIO=m
+CONFIG_AF_RXRPC=m
+CONFIG_CFG80211=m
+CONFIG_NL80211_TESTMODE=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_MAC80211=m
+CONFIG_MAC80211_MESH=y
+CONFIG_RFKILL=m
+CONFIG_RFKILL_INPUT=y
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_NCI_SPI=m
+CONFIG_NFC_NCI_UART=m
+CONFIG_NFC_HCI=m
+CONFIG_NFC_SHDLC=y
+CONFIG_NFC_TRF7970A=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_FDP=m
+CONFIG_NFC_FDP_I2C=m
+CONFIG_NFC_PN544_I2C=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
+CONFIG_NFC_MICROREAD_I2C=m
+CONFIG_NFC_MRVL_USB=m
+CONFIG_NFC_MRVL_UART=m
+CONFIG_NFC_MRVL_I2C=m
+CONFIG_NFC_MRVL_SPI=m
+CONFIG_NFC_ST21NFCA_I2C=m
+CONFIG_NFC_ST_NCI_I2C=m
+CONFIG_NFC_ST_NCI_SPI=m
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
+CONFIG_NFC_S3FWRN5_I2C=m
+CONFIG_NFC_ST95HF=m
+CONFIG_PSAMPLE=m
+CONFIG_PCI=y
+CONFIG_PCI_MVEBU=m
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DEVTMPFS_SAFE=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+CONFIG_FW_LOADER_COMPRESS=y
+# CONFIG_FW_LOADER_COMPRESS_XZ is not set
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
+# CONFIG_ALLOW_DEV_COREDUMP is not set
+CONFIG_DEBUG_DEVRES=y
+# CONFIG_QCOM_EBI2 is not set
+CONFIG_CONNECTOR=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_SYSFB_SIMPLEFB=y
+CONFIG_EFI_VARS_PSTORE=m
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_MTD=m
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+CONFIG_MTD_PLATRAM=m
+CONFIG_MTD_DATAFLASH=m
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTD_BLOCK2MTD=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_SPI_NAND=m
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_SPI_NOR=m
+# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
+CONFIG_MTD_UBI=m
+CONFIG_OF_OVERLAY=y
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZ4=y
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_DRBD=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
+CONFIG_NVME_TCP=m
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_C2PORT=m
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93XX46=m
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_ALTERA_STAPL=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_RAID_ATTRS=m
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_ATA=m
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_AHCI_IMX=m
+CONFIG_AHCI_MVEBU=m
+CONFIG_AHCI_SUNXI=m
+CONFIG_SATA_MV=m
+CONFIG_PATA_IMX=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+# CONFIG_MD_AUTODETECT is not set
+CONFIG_MD_LINEAR=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BCACHE=m
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_FEC=y
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_NETDEVICES=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+CONFIG_EQUALIZER=m
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_VXLAN=m
+CONFIG_BAREUDP=m
+CONFIG_GTP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NET_VRF=m
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_B53=m
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
+CONFIG_B53_SERDES=m
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_SUN4I_EMAC=m
+CONFIG_ALTERA_TSE=m
+# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_B44=m
+CONFIG_BCMGENET=m
+CONFIG_MACB=m
+# CONFIG_NET_VENDOR_CAVIUM is not set
+# CONFIG_NET_VENDOR_CORTINA is not set
+CONFIG_DNET=m
+CONFIG_FEC=m
+CONFIG_FSL_PQ_MDIO=m
+CONFIG_FSL_XGMAC_MDIO=m
+# CONFIG_NET_VENDOR_HISILICON is not set
+# CONFIG_NET_VENDOR_LITEX is not set
+CONFIG_MV643XX_ETH=m
+CONFIG_MVNETA_BM_ENABLE=m
+CONFIG_MVNETA=m
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_ENC28J60=m
+CONFIG_ENCX24J600=m
+# CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_MICROSOFT is not set
+# CONFIG_NET_VENDOR_NI is not set
+CONFIG_ETHOC=m
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+CONFIG_STMMAC_ETH=m
+CONFIG_DWMAC_DWC_QOS_ETH=m
+CONFIG_TI_CPSW_PHY_SEL=y
+CONFIG_TI_CPSW=m
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+CONFIG_WIZNET_W5100_SPI=m
+CONFIG_PHYLIB=y
+CONFIG_SFP=m
+CONFIG_AMD_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+CONFIG_MDIO_GPIO=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+# CONFIG_WLAN_VENDOR_ADMTEK is not set
+CONFIG_ATH9K=m
+CONFIG_ATH9K_AHB=y
+# CONFIG_ATH9K_PCOEM is not set
+CONFIG_ATH9K_HTC=m
+CONFIG_CARL9170=m
+CONFIG_CARL9170_HWRNG=y
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+CONFIG_ATH6KL_DEBUG=y
+CONFIG_AR5523=m
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+# CONFIG_WLAN_VENDOR_ATMEL is not set
+CONFIG_B43=m
+CONFIG_B43_SDIO=y
+CONFIG_B43LEGACY=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_USB=y
+# CONFIG_WLAN_VENDOR_CISCO is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_SPI=m
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_MT7601U=m
+CONFIG_MT76x0U=m
+CONFIG_MT76x2U=m
+CONFIG_RT2X00=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+# CONFIG_RT2800USB_RT35XX is not set
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RTL8187=m
+CONFIG_RTL8192CU=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8XXXU=m
+CONFIG_RTL8XXXU_UNTESTED=y
+CONFIG_RSI_91X=m
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE_SPI=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_WAN=y
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+CONFIG_HDLC_X25=m
+CONFIG_LAPBETHER=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_MRF24J40=m
+CONFIG_IEEE802154_CC2520=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+CONFIG_IEEE802154_MCR20A=m
+CONFIG_INPUT_LEDS=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVBUG=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_PMIC8XXX=m
+CONFIG_KEYBOARD_BCM=m
+# CONFIG_MOUSE_PS2 is not set
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+# CONFIG_TOUCHSCREEN_USB_EASYTOUCH is not set
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TS4800=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_SUN4I=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_PM8XXX_VIBRATOR=m
+CONFIG_INPUT_PMIC8XXX_PWRKEY=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_GPIO_BEEPER=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_PWM_BEEPER=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LEGACY_TIOCSTI is not set
+# CONFIG_LDISC_AUTOLOAD is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=8
+CONFIG_SERIAL_8250_RUNTIME_UARTS=8
+CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SERIAL_AMBA_PL010=y
+CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_SAMSUNG=y
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_MSM=y
+CONFIG_SERIAL_MSM_CONSOLE=y
+CONFIG_SERIAL_OMAP=y
+CONFIG_SERIAL_OMAP_CONSOLE=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_N_HDLC=m
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS_SPI=m
+CONFIG_TCG_TIS_SPI_CR50=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_BRCMSTB=m
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_IMX=m
+CONFIG_I2C_MV64XXX=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_QUP=m
+CONFIG_I2C_S3C2410=y
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIRTIO=m
+CONFIG_I2C_STUB=m
+CONFIG_I2C_SLAVE_EEPROM=m
+CONFIG_SPI=y
+CONFIG_SPI_CADENCE=m
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_FSL_QUADSPI=m
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_IMX=m
+CONFIG_SPI_ORION=m
+CONFIG_SPI_QUP=m
+CONFIG_SPI_S3C64XX=m
+CONFIG_SPI_SUN4I=m
+CONFIG_SPI_XCOMM=m
+CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_TLE62X0=m
+CONFIG_SPMI=m
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PINCTRL_AXP209=m
+CONFIG_PINCTRL_SINGLE=y
+CONFIG_PINCTRL_MSM=y
+CONFIG_PINCTRL_APQ8064=m
+CONFIG_PINCTRL_APQ8084=m
+CONFIG_PINCTRL_IPQ8064=m
+CONFIG_PINCTRL_MSM8660=m
+CONFIG_PINCTRL_MSM8960=m
+CONFIG_PINCTRL_MSM8916=m
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
+CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_74XX_MMIO=m
+CONFIG_GPIO_ALTERA=m
+CONFIG_GPIO_MXC=y
+CONFIG_GPIO_PL061=y
+CONFIG_GPIO_SYSCON=m
+CONFIG_GPIO_TS4800=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_TPS65218=m
+CONFIG_GPIO_74X164=m
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_VIRTIO=m
+CONFIG_POWER_RESET_GPIO_RESTART=y
+CONFIG_POWER_RESET_MSM=y
+CONFIG_POWER_RESET_QCOM_PON=m
+CONFIG_POWER_RESET_VERSATILE=y
+CONFIG_CHARGER_AXP20X=m
+CONFIG_BATTERY_AXP20X=m
+CONFIG_AXP20X_POWER=m
+CONFIG_CHARGER_TPS65217=m
+CONFIG_HWMON=m
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FTSTEUTATES=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2990=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX31722=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_MLXREG_FAN=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_LTC3815=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX20751=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_TPS40422=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_PWM_FAN=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
+CONFIG_SENSORS_SHTC1=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_ADC128D818=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA3221=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_W83773G=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+CONFIG_SENSORS_W83795_FANCTRL=y
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_THERMAL_STATISTICS=y
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_ARMADA_THERMAL=m
+# CONFIG_TI_SOC_THERMAL is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+CONFIG_WATCHDOG_SYSFS=y
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_GPIO_WATCHDOG=m
+CONFIG_XILINX_WATCHDOG=m
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_S3C2410_WATCHDOG=m
+CONFIG_OMAP_WATCHDOG=m
+CONFIG_ORION_WATCHDOG=m
+CONFIG_SUNXI_WATCHDOG=m
+CONFIG_QCOM_WDT=m
+CONFIG_USBPCWATCHDOG=m
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+CONFIG_MFD_ATMEL_HLCDC=m
+CONFIG_MFD_AC100=m
+CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_AXP20X_RSB=m
+CONFIG_MFD_DLN2=m
+CONFIG_MFD_MC13XXX_SPI=m
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_MFD_MAX77686=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_MFD_PM8XXX=m
+CONFIG_MFD_SPMI_PMIC=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65217=m
+CONFIG_MFD_TPS65218=m
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_REGULATOR_ANATOP=y
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_DA9211=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_REGULATOR_LTC3589=m
+CONFIG_REGULATOR_MAX77686=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_PV88060=m
+CONFIG_REGULATOR_PV88090=m
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_QCOM_SMD_RPM=m
+CONFIG_REGULATOR_TPS65217=m
+CONFIG_REGULATOR_TPS65218=m
+CONFIG_RC_CORE=m
+CONFIG_RC_DECODERS=y
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_IR_GPIO_CIR=m
+CONFIG_IR_HIX5HD2=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_SUNXI=m
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_RC_LOOPBACK=m
+# CONFIG_MEDIA_CEC_SUPPORT is not set
+CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_V4L2_FLASH_LED_CLASS=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_MEDIA_USB_SUPPORT=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_S2255=m
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+# CONFIG_RADIO_ADAPTERS is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+CONFIG_CXD2880_SPI_DRV=m
+CONFIG_AUXDISPLAY=y
+CONFIG_IMX_IPUV3_CORE=m
+CONFIG_DRM=m
+CONFIG_DRM_DP_AUX_CHARDEV=y
+CONFIG_DRM_DP_CEC=y
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_HDLCD=m
+CONFIG_DRM_MALI_DISPLAY=m
+CONFIG_DRM_KOMEDA=m
+CONFIG_DRM_VGEM=m
+CONFIG_DRM_EXYNOS=m
+CONFIG_DRM_EXYNOS_FIMD=y
+CONFIG_DRM_EXYNOS5433_DECON=y
+CONFIG_DRM_EXYNOS7_DECON=y
+CONFIG_DRM_EXYNOS_MIXER=y
+CONFIG_DRM_EXYNOS_VIDI=y
+CONFIG_DRM_EXYNOS_DPI=y
+CONFIG_DRM_EXYNOS_DSI=y
+CONFIG_DRM_EXYNOS_HDMI=y
+CONFIG_DRM_EXYNOS_MIC=y
+CONFIG_DRM_EXYNOS_FIMC=y
+CONFIG_DRM_EXYNOS_ROTATOR=y
+CONFIG_DRM_EXYNOS_SCALER=y
+CONFIG_DRM_UDL=m
+CONFIG_DRM_ARMADA=m
+CONFIG_DRM_SUN4I=m
+CONFIG_DRM_SUN4I_HDMI_CEC=y
+CONFIG_DRM_OMAP=m
+CONFIG_OMAP5_DSS_HDMI=y
+CONFIG_OMAP2_DSS_SDI=y
+CONFIG_OMAP2_DSS_DSI=y
+CONFIG_DRM_TILCDC=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_MSM=m
+CONFIG_DRM_TEGRA=m
+CONFIG_DRM_TEGRA_STAGING=y
+CONFIG_DRM_PANEL_ARM_VERSATILE=m
+CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_ILITEK_IL9322=m
+CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
+CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
+CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
+CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
+CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
+CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
+CONFIG_DRM_SII9234=m
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_ADV7511_AUDIO=y
+CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
+CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
+CONFIG_DRM_DW_HDMI_CEC=m
+CONFIG_DRM_IMX=m
+CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
+CONFIG_DRM_IMX_TVE=m
+CONFIG_DRM_IMX_LDB=m
+CONFIG_DRM_IMX_HDMI=m
+CONFIG_DRM_V3D=m
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_MXSFB=m
+CONFIG_DRM_GM12U320=m
+CONFIG_DRM_SIMPLEDRM=m
+CONFIG_DRM_TVE200=m
+CONFIG_DRM_LIMA=m
+CONFIG_DRM_PANFROST=m
+CONFIG_DRM_TIDSS=m
+CONFIG_DRM_GUD=m
+CONFIG_FB=y
+CONFIG_FB_EFI=y
+CONFIG_FB_TILEBLITTING=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_AMS369FG06=m
+CONFIG_LCD_LMS501KF03=m
+CONFIG_LCD_HX8357=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_PCF50633=m
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+CONFIG_SOUND=m
+CONFIG_SND=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=8
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_SEQUENCER_OSS=m
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_HDA_PREALLOC_SIZE=4096
+CONFIG_SND_ARMAACI=m
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_SOC_FSL_ASRC=m
+CONFIG_SND_IMX_SOC=m
+CONFIG_SND_SOC_EUKREA_TLV320=m
+CONFIG_SND_SOC_IMX_ES8328=m
+CONFIG_SND_SOC_IMX_SGTL5000=m
+CONFIG_SND_SOC_IMX_SPDIF=m
+CONFIG_SND_SOC_FSL_ASOC_CARD=m
+CONFIG_SND_SOC_QCOM=m
+CONFIG_SND_SOC_STORM=m
+CONFIG_SND_SOC_SAMSUNG=m
+CONFIG_SND_SOC_ODROID=m
+CONFIG_SND_SUN4I_CODEC=m
+CONFIG_SND_SUN4I_I2S=m
+CONFIG_SND_SUN4I_SPDIF=m
+CONFIG_SND_SOC_OMAP_HDMI=m
+CONFIG_SND_SOC_XTFPGA_I2S=m
+CONFIG_SND_SOC_ADAU7002=m
+CONFIG_SND_SOC_AK4458=m
+CONFIG_SND_SOC_AK5558=m
+CONFIG_SND_SOC_BD28623=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
+CONFIG_SND_SOC_MAX9867=m
+CONFIG_SND_SOC_PCM1789_I2C=m
+CONFIG_SND_SOC_PCM186X_I2C=m
+CONFIG_SND_SOC_PCM186X_SPI=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_TAS6424=m
+CONFIG_SND_SOC_TDA7419=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
+CONFIG_SND_SOC_TSCS42XX=m
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_MAX9759=m
+CONFIG_SND_SOC_NAU8822=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_VIRTIO=m
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_ASUS=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_JABRA=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MAYFLASH=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+CONFIG_HID_RMI=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_ALPS=m
+CONFIG_USB_HIDDEV=y
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_OTG=y
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_MON=m
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_MVEBU=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_EXYNOS=m
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_EXYNOS=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_HCD_ISO=y
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_HCD_SSB=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_TMC=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_HOST=m
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_SUNXI=m
+CONFIG_USB_MUSB_DSPS=m
+CONFIG_USB_TI_CPPI41_DMA=y
+CONFIG_USB_DWC2=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_XR=m
+CONFIG_USB_SERIAL_DEBUG=m
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_LD=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_AM335X_PHY_USB=m
+CONFIG_USB_GADGET=m
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_MUX_PI3USB30532=m
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_MMC=m
+# CONFIG_PWRSEQ_SIMPLE is not set
+CONFIG_SDIO_UART=m
+CONFIG_MMC_TEST=m
+CONFIG_MMC_ARMMMCI=m
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_OF_ARASAN=m
+CONFIG_MMC_SDHCI_OF_AT91=m
+CONFIG_MMC_SDHCI_OF_ESDHC=m
+CONFIG_MMC_SDHCI_ESDHC_IMX=m
+CONFIG_MMC_SDHCI_S3C=m
+CONFIG_MMC_SDHCI_PXAV3=m
+CONFIG_MMC_SDHCI_S3C_DMA=y
+CONFIG_MMC_SDHCI_F_SDH30=m
+CONFIG_MMC_OMAP_HS=m
+CONFIG_MMC_SDHCI_MSM=m
+CONFIG_MMC_MXC=m
+CONFIG_MMC_MVSDIO=m
+CONFIG_MMC_DW=m
+CONFIG_MMC_DW_EXYNOS=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_SUNXI=m
+CONFIG_MMC_MTK=m
+CONFIG_MMC_SDHCI_OMAP=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_MEMSTICK=m
+CONFIG_MSPRO_BLOCK=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS_FLASH=m
+CONFIG_LEDS_CLASS_MULTICOLOR=m
+CONFIG_LEDS_BCM6328=m
+CONFIG_LEDS_BCM6358=m
+CONFIG_LEDS_CR0014114=m
+CONFIG_LEDS_TURRIS_OMNIA=m
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3692X=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_SYSCON=y
+CONFIG_LEDS_PM8058=m
+CONFIG_LEDS_MLXREG=m
+CONFIG_LEDS_AAT1290=m
+CONFIG_LEDS_LM3601X=m
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+CONFIG_RTC_DRV_AC100=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_MAX77686=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12026=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV8803=m
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6916=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_PCF2123=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_EFI=y
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_IMXDI=m
+CONFIG_RTC_DRV_S3C=m
+CONFIG_RTC_DRV_PL030=m
+CONFIG_RTC_DRV_PL031=m
+CONFIG_RTC_DRV_SUNXI=m
+CONFIG_RTC_DRV_ARMADA38X=m
+CONFIG_RTC_DRV_PM8XXX=m
+CONFIG_RTC_DRV_MXC=m
+CONFIG_RTC_DRV_MXC_V2=m
+CONFIG_RTC_DRV_SNVS=m
+CONFIG_DMADEVICES=y
+CONFIG_DMA_SUN4I=m
+CONFIG_IMX_DMA=m
+CONFIG_IMX_SDMA=m
+CONFIG_PL330_DMA=m
+CONFIG_QCOM_BAM_DMA=m
+CONFIG_DMATEST=m
+CONFIG_UIO=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PLATFORM=m
+CONFIG_VFIO_AMBA=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+# CONFIG_VHOST_MENU is not set
+CONFIG_STAGING=y
+CONFIG_RTLLIB=m
+CONFIG_R8712U=m
+CONFIG_MELLANOX_PLATFORM=y
+CONFIG_MLXREG_HOTPLUG=m
+CONFIG_MLXREG_IO=m
+# CONFIG_CLK_SP810 is not set
+CONFIG_COMMON_CLK_MAX77686=m
+CONFIG_COMMON_CLK_SI544=m
+CONFIG_CLK_BCM2711_DVP=m
+# CONFIG_SUN6I_A31_CCU is not set
+# CONFIG_SUN8I_A23_CCU is not set
+# CONFIG_SUN8I_A33_CCU is not set
+# CONFIG_SUN8I_DE2_CCU is not set
+CONFIG_XILINX_VCU=m
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+CONFIG_RPMSG_VIRTIO=m
+CONFIG_QCOM_COMMAND_DB=y
+CONFIG_QCOM_GSBI=m
+CONFIG_QCOM_RMTFS_MEM=m
+CONFIG_QCOM_SMD_RPM=m
+CONFIG_QCOM_WCNSS_CTRL=m
+CONFIG_SOC_TI=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=m
+CONFIG_DEVFREQ_GOV_POWERSAVE=m
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_IIO=m
+CONFIG_AXP20X_ADC=m
+CONFIG_TI_AM335X_ADC=m
+CONFIG_PWM=y
+CONFIG_PWM_SAMSUNG=m
+CONFIG_PWM_SUN4I=m
+CONFIG_QCOM_PDC=y
+CONFIG_PHY_SUN4I_USB=m
+CONFIG_PHY_SUN9I_USB=m
+CONFIG_PHY_MVEBU_A38X_COMPHY=m
+CONFIG_PHY_QCOM_APQ8064_SATA=m
+CONFIG_PHY_QCOM_IPQ806X_SATA=m
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
+CONFIG_MCB=m
+CONFIG_ARM_CCI_PMU=y
+CONFIG_ARM_CCN=y
+CONFIG_RAS=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_DAX=m
+CONFIG_NVMEM_IMX_OCOTP=y
+CONFIG_NVMEM_RMEM=m
+CONFIG_NVMEM_SNVS_LPGPR=m
+CONFIG_NVMEM_SUNXI_SID=m
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_REISERFS_FS=m
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+CONFIG_XFS_ONLINE_SCRUB=y
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+# CONFIG_OCFS2_FS_STATS is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+# CONFIG_F2FS_STAT_FS is not set
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_UNFAIR_RWSEM=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
+# CONFIG_DNOTIFY is not set
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_QFMT_V2=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_CACHEFILES=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
+CONFIG_NTFS_FS=m
+CONFIG_NTFS_RW=y
+CONFIG_NTFS3_FS=m
+CONFIG_NTFS3_LZX_XPRESS=y
+CONFIG_NTFS3_FS_POSIX_ACL=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_ORANGEFS_FS=m
+CONFIG_ECRYPT_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RUBIN=y
+CONFIG_UBIFS_FS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
+CONFIG_MINIX_FS=m
+CONFIG_ROMFS_FS=m
+CONFIG_PSTORE=y
+CONFIG_PSTORE_RAM=m
+CONFIG_UFS_FS=m
+CONFIG_UFS_FS_WRITE=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V4=m
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_NFS_FSCACHE=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+CONFIG_CIFS_FSCACHE=y
+CONFIG_SMB_SERVER=m
+CONFIG_CODA_FS=m
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_DLM=m
+CONFIG_KEYS_REQUEST_CACHE=y
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_FORTIFY_SOURCE=y
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_LANDLOCK=y
+# CONFIG_INTEGRITY is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity"
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_ZERO_CALL_USED_REGS=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_HCTR2=m
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+# CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
+CONFIG_CRYPTO_NHPOLY1305_NEON=m
+CONFIG_CRYPTO_BLAKE2B_NEON=m
+CONFIG_CRYPTO_SHA1_ARM_NEON=m
+CONFIG_CRYPTO_SHA256_ARM=m
+CONFIG_CRYPTO_SHA512_ARM=m
+CONFIG_CRYPTO_AES_ARM=m
+CONFIG_CRYPTO_AES_ARM_BS=m
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_FSL_CAAM=m
+CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
+CONFIG_CRYPTO_DEV_MXS_DCP=m
+CONFIG_CRYPTO_DEV_MARVELL_CESA=m
+CONFIG_CRYPTO_DEV_QCE=m
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_SIGNED_PE_FILE_VERIFICATION=y
+CONFIG_SECONDARY_TRUSTED_KEYRING=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CMA_SIZE_MBYTES=48
+CONFIG_IRQ_POLL=y
+CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_QUIET=3
+CONFIG_DYNAMIC_DEBUG=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO_DWARF5=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_SLUB_DEBUG is not set
+CONFIG_DEBUG_KMEMLEAK=y
+CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+CONFIG_LATENCYTOP=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_IO_STRICT_DEVMEM=y
+# CONFIG_RUNTIME_TESTING_MENU is not set
diff --git a/main/linux-lts/lts.loongarch64.config b/main/linux-lts/lts.loongarch64.config
new file mode 100644
index 00000000000..42e75625d78
--- /dev/null
+++ b/main/linux-lts/lts.loongarch64.config
@@ -0,0 +1,885 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_PREEMPT=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_NUMA_BALANCING=y
+CONFIG_MEMCG=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_NAMESPACES=y
+CONFIG_USER_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_PERF_EVENTS=y
+CONFIG_KEXEC=y
+CONFIG_CRASH_DUMP=y
+CONFIG_NUMA=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_HIBERNATION=y
+CONFIG_ACPI_SPCR_TABLE=y
+CONFIG_ACPI_TAD=y
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_JUMP_LABEL=y
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_UNIXWARE_DISKLABEL=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BINFMT_MISC=m
+CONFIG_ZSWAP=y
+CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y
+CONFIG_Z3FOLD=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_KSM=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_USERFAULTFD=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_TLS=m
+CONFIG_TLS_DEVICE=y
+CONFIG_XFRM_USER=y
+CONFIG_NET_KEY=y
+CONFIG_XDP_SOCKETS=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_INET_ESP=m
+CONFIG_INET_UDP_DIAG=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BBR=m
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_INET6_ESP=m
+CONFIG_IPV6_MROUTE=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_TABLES=m
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NETFILTER_XT_SET=m
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_IP6_NF_IPTABLES=y
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_FILTER=y
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BPFILTER=y
+CONFIG_RDS=y
+CONFIG_L2TP=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_LLC2=m
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_OPENVSWITCH=m
+CONFIG_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_NETLINK_DIAG=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_BPF_STREAM_PARSER=y
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
+CONFIG_BT_HCIBTUSB_MTK=y
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_VIRTIO=m
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT=y
+CONFIG_MAC80211=m
+CONFIG_RFKILL=m
+CONFIG_RFKILL_INPUT=y
+CONFIG_NET_9P=y
+CONFIG_NET_9P_VIRTIO=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIEASPM is not set
+CONFIG_PCI_IOV=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_SHPC=y
+CONFIG_PCCARD=m
+CONFIG_YENTA=m
+CONFIG_RAPIDIO=y
+CONFIG_RAPIDIO_TSI721=y
+CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS=y
+CONFIG_RAPIDIO_ENUM_BASIC=m
+CONFIG_RAPIDIO_CHMAN=m
+CONFIG_RAPIDIO_MPORT_CDEV=m
+CONFIG_UEVENT_HELPER=y
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_FW_LOADER_COMPRESS=y
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
+CONFIG_EFI_ZBOOT=y
+CONFIG_EFI_CAPSULE_LOADER=m
+CONFIG_EFI_TEST=m
+CONFIG_MTD=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_PARPORT=y
+CONFIG_PARPORT_PC=y
+CONFIG_PARPORT_SERIAL=y
+CONFIG_PARPORT_PC_FIFO=y
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_ZSTD=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_DRBD=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_VIRTIO_BLK=y
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_NVME=y
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_FC=m
+CONFIG_NVME_TCP=m
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_PASSTHRU=y
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
+CONFIG_NVME_TARGET_TCP=m
+CONFIG_EEPROM_AT24=m
+CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_ISCSI_TCP=m
+CONFIG_SCSI_MVSAS=y
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_MVSAS_TASKLET=y
+CONFIG_SCSI_MVUMI=y
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=y
+CONFIG_MEGARAID_MAILBOX=y
+CONFIG_MEGARAID_LEGACY=y
+CONFIG_MEGARAID_SAS=y
+CONFIG_SCSI_MPT2SAS=y
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_ATA=y
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_AHCI_DWC=y
+CONFIG_PATA_ATIIXP=y
+CONFIG_PATA_PCMCIA=m
+CONFIG_MD=y
+CONFIG_MD_LINEAR=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_BCACHE=m
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_NETDEVICES=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=y
+CONFIG_WIREGUARD=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_VXLAN=y
+CONFIG_RIONET=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_AGERE is not set
+# CONFIG_NET_VENDOR_ALACRITECH is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
+# CONFIG_NET_VENDOR_AMAZON is not set
+# CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_VENDOR_AQUANTIA is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
+CONFIG_BNX2=y
+# CONFIG_NET_VENDOR_CAVIUM is not set
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_EZCHIP is not set
+# CONFIG_NET_VENDOR_I825XX is not set
+CONFIG_E1000=y
+CONFIG_E1000E=y
+CONFIG_IGB=y
+CONFIG_IXGBE=y
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NETRONOME is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_R8169=y
+# CONFIG_NET_VENDOR_RENESAS is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+CONFIG_STMMAC_ETH=y
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VIA is not set
+CONFIG_NGBE=y
+CONFIG_TXGBE=y
+# CONFIG_NET_VENDOR_WIZNET is not set
+# CONFIG_NET_VENDOR_XILINX is not set
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+# CONFIG_USB_NET_AX8817X is not set
+# CONFIG_USB_NET_AX88179_178A is not set
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_BELKIN is not set
+# CONFIG_USB_ARMLINUX is not set
+# CONFIG_USB_NET_ZAURUS is not set
+CONFIG_ATH9K=m
+CONFIG_ATH9K_HTC=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_HOSTAP=m
+CONFIG_MT7601U=m
+CONFIG_RT2X00=m
+CONFIG_RT2800USB=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8XXXU=m
+CONFIG_RTW88=m
+CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8821CE=m
+CONFIG_RTW89=m
+CONFIG_RTW89_8852AE=m
+CONFIG_RTW89_8852CE=m
+CONFIG_ZD1211RW=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_XTKBD=m
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=m
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_RAW=m
+CONFIG_LEGACY_PTY_COUNT=16
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_RUNTIME_UARTS=16
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_PRINTER=m
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_PIIX4=y
+CONFIG_I2C_GPIO=y
+CONFIG_I2C_LS2X=y
+CONFIG_SPI=y
+CONFIG_SPI_LOONGSON_PCI=m
+CONFIG_SPI_LOONGSON_PLATFORM=m
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_LOONGSON2=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_LOONGSON_64BIT=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_RESTART=y
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
+CONFIG_SYSCON_REBOOT_MODE=y
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_W83795=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_LOONGSON2_THERMAL=m
+CONFIG_RC_CORE=m
+CONFIG_LIRC=y
+CONFIG_RC_DECODERS=y
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_USB_SUPPORT=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_DRM=y
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_USERPTR=y
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+CONFIG_DRM_AMDGPU_USERPTR=y
+CONFIG_DRM_AST=y
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_LOONGSON=y
+CONFIG_FB=y
+CONFIG_FB_EFI=y
+CONFIG_FB_RADEON=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_LCD_PLATFORM=m
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_LOGO=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_BT87X=m
+CONFIG_SND_BT87X_OVERCLOCK=y
+CONFIG_SND_HDA_INTEL=y
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_A4TECH=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_USB_HIDDEV=y
+CONFIG_USB=y
+CONFIG_USB_OTG=y
+CONFIG_USB_MON=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_USB_UAS=m
+CONFIG_USB_DWC2=y
+CONFIG_USB_DWC2_HOST=y
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_GADGET=y
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_TCPCI=m
+CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_ACPI=m
+CONFIG_INFINIBAND=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_EFI=y
+CONFIG_RTC_DRV_LOONGSON=y
+CONFIG_DMADEVICES=y
+CONFIG_UIO=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_COMEDI=m
+CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADL_PCI6208=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
+CONFIG_COMEDI_ADL_PCI8164=m
+CONFIG_COMEDI_ADL_PCI9111=m
+CONFIG_COMEDI_ADL_PCI9118=m
+CONFIG_COMEDI_ADV_PCI1710=m
+CONFIG_COMEDI_ADV_PCI1720=m
+CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
+CONFIG_COMEDI_ADV_PCI1760=m
+CONFIG_COMEDI_ADV_PCI_DIO=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
+CONFIG_COMEDI_NI_PCIDIO=m
+CONFIG_COMEDI_NI_PCIMIO=m
+CONFIG_STAGING=y
+CONFIG_COMMON_CLK_LOONGSON2=y
+CONFIG_LOONGSON2_GUTS=y
+CONFIG_LOONGSON2_PM=y
+CONFIG_PM_DEVFREQ=y
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_PWM=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_BTRFS_FS=y
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_AUTOFS_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=y
+CONFIG_OVERLAY_FS_INDEX=y
+CONFIG_OVERLAY_FS_XINO_AUTO=y
+CONFIG_OVERLAY_FS_METACOPY=y
+CONFIG_FSCACHE=y
+CONFIG_CACHEFILES=m
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=y
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=936
+CONFIG_FAT_DEFAULT_IOCHARSET="gb2312"
+CONFIG_EXFAT_FS=m
+CONFIG_NTFS3_FS=m
+CONFIG_NTFS3_64BIT_CLUSTER=y
+CONFIG_NTFS3_LZX_XPRESS=y
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_HUGETLBFS=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_ORANGEFS_FS=m
+CONFIG_ECRYPT_FS=m
+CONFIG_ECRYPT_FS_MESSAGING=y
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_UBIFS_FS=m
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_MINIX_FS=m
+CONFIG_ROMFS_FS=m
+CONFIG_PSTORE=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_ZIP_LZMA=y
+CONFIG_EROFS_FS_PCPU_KTHREAD=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_ROOT_NFS=y
+CONFIG_NFSD=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CEPH_FS_SECURITY_LABEL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_DEBUG is not set
+CONFIG_9P_FS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_936=y
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_UTF8=y
+CONFIG_DLM=m
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_SECURITY=y
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_YAMA=y
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_CRYPTO_USER=m
+# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_CRC32_LOONGARCH=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_PRINTK_TIME=y
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_FS=y
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_SCHEDSTATS=y
+# CONFIG_FTRACE is not set
diff --git a/main/linux-lts/lts.ppc64le.config b/main/linux-lts/lts.ppc64le.config
new file mode 100644
index 00000000000..0e3c524d17e
--- /dev/null
+++ b/main/linux-lts/lts.ppc64le.config
@@ -0,0 +1,883 @@
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ_FULL=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_SCHED_CORE=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_CGROUPS=y
+CONFIG_MEMCG=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_USER_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_PROFILING=y
+CONFIG_KEXEC=y
+CONFIG_PPC64=y
+CONFIG_POWER8_CPU=y
+CONFIG_NR_CPUS=2048
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_COMPAT=y
+CONFIG_OPAL_PRD=y
+# CONFIG_PPC_SPLPAR is not set
+CONFIG_RTAS_FLASH=m
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+CONFIG_HZ_100=y
+CONFIG_PPC_TRANSACTIONAL_MEM=y
+CONFIG_IRQ_ALL_CPUS=y
+CONFIG_PPC_SUBPAGE_PROT=y
+CONFIG_SCHED_SMT=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM_BOOK3S_64=m
+CONFIG_KVM_BOOK3S_64_HV=m
+CONFIG_KPROBES=y
+CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_SHA256=y
+CONFIG_MODULE_COMPRESS_GZIP=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BINFMT_MISC=m
+CONFIG_ZSWAP=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_KSM=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_CMA_AREAS=7
+CONFIG_MEM_SOFT_DIRTY=y
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_TLS=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+CONFIG_NET_KEY=m
+CONFIG_XDP_SOCKETS=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_IPV6=m
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_MPTCP=y
+CONFIG_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NF_FLOW_TABLE_PROCFS=y
+CONFIG_NETFILTER_XT_SET=m
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_PE_SIP=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+CONFIG_DNS_RESOLVER=y
+CONFIG_OPENVSWITCH=m
+CONFIG_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NCSI=y
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+CONFIG_PCIE_PTM=y
+CONFIG_PCI_STUB=m
+CONFIG_PCI_PF_STUB=m
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_SHPC=y
+CONFIG_HOTPLUG_PCI_POWERNV=y
+CONFIG_HOTPLUG_PCI_RPA=m
+CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
+CONFIG_PCI_SW_SWITCHTEC=m
+CONFIG_PCCARD=m
+CONFIG_YENTA=m
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DEVTMPFS_SAFE=y
+CONFIG_FW_LOADER_COMPRESS=y
+# CONFIG_FW_LOADER_COMPRESS_XZ is not set
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_POWERNV_FLASH=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_BLK_DEV_FD=m
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_TCP=m
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_IBMVMC=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_FC_ATTRS=y
+CONFIG_SCSI_SRP_ATTRS=y
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_BE2ISCSI=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_IBMVSCSI=m
+CONFIG_SCSI_IBMVFC=m
+CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_ATA=m
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=3
+# CONFIG_ATA_SFF is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_INTEGRITY=m
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_VXLAN=m
+CONFIG_BAREUDP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_VORTEX=y
+CONFIG_ACENIC=m
+CONFIG_ACENIC_OMIT_TIGON_I=y
+# CONFIG_NET_VENDOR_AMAZON is not set
+CONFIG_PCNET32=y
+CONFIG_TIGON3=m
+CONFIG_BNX2X=m
+# CONFIG_NET_VENDOR_CAVIUM is not set
+CONFIG_CHELSIO_T1=m
+# CONFIG_NET_VENDOR_CORTINA is not set
+CONFIG_BE2NET=m
+CONFIG_IBMVETH=m
+CONFIG_IBMVNIC=m
+CONFIG_E100=y
+CONFIG_E1000=y
+CONFIG_E1000E=y
+CONFIG_IXGBE=m
+CONFIG_I40E=m
+CONFIG_ICE=m
+# CONFIG_NET_VENDOR_LITEX is not set
+CONFIG_MLX4_EN=m
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_FPGA=y
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_CORE_IPOIB=y
+# CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_MICROSOFT is not set
+CONFIG_MYRI10GE=m
+# CONFIG_NET_VENDOR_NI is not set
+CONFIG_S2IO=m
+CONFIG_NFP=m
+CONFIG_NETXEN_NIC=m
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_REALTEK is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+# CONFIG_NET_VENDOR_XILINX is not set
+CONFIG_PHYLIB=y
+CONFIG_RENESAS_PHY=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPPOE=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+# CONFIG_WLAN is not set
+CONFIG_INPUT_LEDS=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_MOUSE_PS2 is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_LEGACY_TIOCSTI is not set
+# CONFIG_LDISC_AUTOLOAD is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_HVC_CONSOLE=y
+CONFIG_HVC_OLD_HVSI=y
+CONFIG_HVC_RTAS=y
+CONFIG_HVCS=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IBM_BSR=m
+CONFIG_IPMI_HANDLER=y
+CONFIG_IPMI_DEVICE_INTERFACE=y
+CONFIG_IPMI_POWERNV=y
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_RC_CORE=y
+CONFIG_DRM=y
+CONFIG_DRM_DP_CEC=y
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_AST=y
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_SIMPLEDRM=m
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_TILEBLITTING=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_BT87X=m
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_FM801=m
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_HDA_INTEL=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CA0132=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_VIRTIO=m
+CONFIG_HID=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_JABRA=m
+# CONFIG_HID_REDRAGON is not set
+CONFIG_HID_PANTHERLORD=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_USB=m
+CONFIG_USB_MON=m
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+# CONFIG_USB_EHCI_HCD_PPC_OF is not set
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_STORAGE=m
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_TCPCI=m
+CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_MUX_PI3USB30532=m
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_LEDS_LM3692X=m
+CONFIG_LEDS_POWERNV=m
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_IRDMA=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_RDMA_RXE=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_GENERIC=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_VDPA=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VDPA=m
+CONFIG_VDPA_USER=m
+CONFIG_IFCVF=m
+CONFIG_MLX5_VDPA_NET=m
+CONFIG_VP_VDPA=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_VDPA=m
+CONFIG_VHOST_CROSS_ENDIAN_LEGACY=y
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+CONFIG_RPMSG_VIRTIO=m
+CONFIG_LIBNVDIMM=y
+CONFIG_NVMEM_RMEM=m
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_REISERFS_FS=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_ONLINE_SCRUB=y
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
+CONFIG_ISO9660_FS=m
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
+CONFIG_NTFS3_FS=m
+CONFIG_NTFS3_LZX_XPRESS=y
+CONFIG_NTFS3_FS_POSIX_ACL=y
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_INODE64=y
+CONFIG_HUGETLBFS=y
+CONFIG_CONFIGFS_FS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
+CONFIG_PSTORE=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_SWN_UPCALL=y
+CONFIG_SMB_SERVER=m
+CONFIG_SMB_SERVER_SMBDIRECT=y
+CONFIG_9P_FS=m
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_LANDLOCK=y
+# CONFIG_INTEGRITY is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity"
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_ZERO_CALL_USED_REGS=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_HCTR2=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+# CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
+CONFIG_CRYPTO_DEV_NX=y
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_CONSOLE_LOGLEVEL_QUIET=3
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_WX=y
+CONFIG_DEBUG_STACK_USAGE=y
+CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_RCU_TRACE is not set
+CONFIG_LATENCYTOP=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_CODE_PATCHING_SELFTEST=y
+CONFIG_FTR_FIXUP_SELFTEST=y
+CONFIG_MSI_BITMAP_SELFTEST=y
+CONFIG_XMON=y
+# CONFIG_RUNTIME_TESTING_MENU is not set
diff --git a/main/linux-lts/lts.s390x.config b/main/linux-lts/lts.s390x.config
new file mode 100644
index 00000000000..51d0f5ce571
--- /dev/null
+++ b/main/linux-lts/lts.s390x.config
@@ -0,0 +1,1041 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_AUDIT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_SCHED_CORE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_MEMCG=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_NAMESPACES=y
+CONFIG_USER_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+# CONFIG_SYSFS_SYSCALL is not set
+CONFIG_PROFILING=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_LIVEPATCH=y
+CONFIG_NR_CPUS=256
+CONFIG_NUMA=y
+CONFIG_HZ_100=y
+CONFIG_PCI_NR_FUNCTIONS=64
+CONFIG_CMM=m
+CONFIG_APPLDATA_BASE=y
+CONFIG_KPROBES=y
+CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
+CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_SHA256=y
+CONFIG_MODULE_COMPRESS_GZIP=y
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BLK_CGROUP_IOLATENCY=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_IBM_PARTITION=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BINFMT_MISC=m
+CONFIG_ZSWAP=y
+CONFIG_ZSMALLOC=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_KSM=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_CMA_AREAS=7
+CONFIG_MEM_SOFT_DIRTY=y
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+CONFIG_NET=y
+CONFIG_PACKET=m
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=m
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_NETLABEL=y
+CONFIG_MPTCP=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NF_FLOW_TABLE_PROCFS=y
+CONFIG_NETFILTER_XT_SET=m
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_PE_SIP=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=y
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+CONFIG_DCB=y
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_BATMAN_V is not set
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_OPENVSWITCH=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_NET_MPLS_GSO=y
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NCSI=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_NET_PKTGEN=m
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_RXKAD=y
+CONFIG_AF_KCM=m
+CONFIG_RFKILL=m
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_PCI=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+CONFIG_PCIE_PTM=y
+CONFIG_PCI_STUB=m
+CONFIG_PCI_PF_STUB=m
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_SHPC=y
+CONFIG_HOTPLUG_PCI_S390=y
+CONFIG_PCI_SW_SWITCHTEC=m
+CONFIG_PCCARD=m
+CONFIG_YENTA=m
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_SAFE=y
+CONFIG_FW_LOADER_COMPRESS=y
+# CONFIG_FW_LOADER_COMPRESS_XZ is not set
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
+CONFIG_CONNECTOR=y
+CONFIG_MTD=m
+CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZ4=y
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_DRBD=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=32768
+CONFIG_ATA_OVER_ETH=m
+CONFIG_DASD=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_TCP=m
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_PCI=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=m
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_SCSI_SNIC=m
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_ZFCP=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_MD=y
+CONFIG_MD_LINEAR=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BCACHE=m
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_ERA=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_FEC=y
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_NETDEVICES=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+CONFIG_EQUALIZER=m
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_AGERE is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
+# CONFIG_NET_VENDOR_AMAZON is not set
+# CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CADENCE is not set
+# CONFIG_NET_VENDOR_CAVIUM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_NET_VENDOR_CORTINA is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EZCHIP is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_LITEX is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_MLX4_DEBUG is not set
+# CONFIG_MLX4_CORE_GEN2 is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_MICROSOFT is not set
+# CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_NET_VENDOR_NI is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NETERION is not set
+# CONFIG_NET_VENDOR_NETRONOME is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
+# CONFIG_NET_VENDOR_REALTEK is not set
+# CONFIG_NET_VENDOR_RENESAS is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_PHYLIB=m
+CONFIG_AMD_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_QETH=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVBUG=m
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_VT_HW_CONSOLE_BINDING=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LEGACY_TIOCSTI is not set
+# CONFIG_LDISC_AUTOLOAD is not set
+CONFIG_SERIAL_RP2=m
+CONFIG_N_GSM=m
+CONFIG_NOZOMI=m
+CONFIG_TTY_PRINTK=m
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+CONFIG_TN3270_FS=y
+CONFIG_SCLP_OFB=y
+CONFIG_PTP_1588_CLOCK=m
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+CONFIG_WATCHDOG_SYSFS=y
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_DIAG288_WATCHDOG=m
+CONFIG_RC_CORE=y
+# CONFIG_HID is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_RDMA_RXE=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_SYNC_FILE=y
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_UIO_MF624=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_RPMSG_VIRTIO=m
+CONFIG_LIBNVDIMM=y
+CONFIG_DEV_DAX=m
+# CONFIG_NVMEM is not set
+CONFIG_STM=m
+CONFIG_STM_DUMMY=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_HEARTBEAT=m
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_REISERFS_FS=m
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+CONFIG_XFS_ONLINE_SCRUB=y
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_FS_SECURITY=y
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_UNFAIR_RWSEM=y
+CONFIG_FS_DAX=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_CACHEFILES=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
+CONFIG_NTFS_FS=m
+CONFIG_NTFS_RW=y
+CONFIG_NTFS3_FS=m
+CONFIG_NTFS3_LZX_XPRESS=y
+CONFIG_NTFS3_FS_POSIX_ACL=y
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_HUGETLBFS=y
+CONFIG_ORANGEFS_FS=m
+CONFIG_ECRYPT_FS=m
+CONFIG_ECRYPT_FS_MESSAGING=y
+CONFIG_HFSPLUS_FS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_NFS_FSCACHE=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CIFS=m
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+CONFIG_CIFS_FSCACHE=y
+CONFIG_SMB_SERVER=m
+CONFIG_SMB_SERVER_SMBDIRECT=y
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_DLM=m
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=y
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_FORTIFY_SOURCE=y
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_LANDLOCK=y
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity"
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_ZERO_CALL_USED_REGS=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_HCTR2=m
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=m
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_CRC32_S390=m
+CONFIG_CRYPTO_SHA512_S390=m
+CONFIG_CRYPTO_SHA1_S390=m
+CONFIG_CRYPTO_SHA256_S390=m
+CONFIG_CRYPTO_GHASH_S390=m
+CONFIG_CRYPTO_AES_S390=m
+CONFIG_CRYPTO_DES_S390=m
+CONFIG_ZCRYPT=m
+CONFIG_PKEY=m
+CONFIG_CRYPTO_PAES_S390=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CORDIC=m
+CONFIG_CRC_CCITT=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC7=m
+CONFIG_CRC8=m
+# CONFIG_XZ_DEC_X86 is not set
+# CONFIG_XZ_DEC_POWERPC is not set
+# CONFIG_XZ_DEC_IA64 is not set
+# CONFIG_XZ_DEC_ARM is not set
+# CONFIG_XZ_DEC_ARMTHUMB is not set
+# CONFIG_XZ_DEC_SPARC is not set
+CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_QUIET=3
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_INFO_DWARF5=y
+CONFIG_DEBUG_INFO_BTF=y
+CONFIG_FRAME_WARN=1280
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_WX=y
+CONFIG_DEBUG_KMEMLEAK=y
+CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
+CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_VM_RB=y
+# CONFIG_DEBUG_VM_PGTABLE is not set
+CONFIG_KFENCE=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_LIST=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+CONFIG_LATENCYTOP=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_HIST_TRIGGERS=y
+CONFIG_IO_STRICT_DEVMEM=y
+# CONFIG_RUNTIME_TESTING_MENU is not set
diff --git a/main/linux-lts/lts.x86.config b/main/linux-lts/lts.x86.config
new file mode 100644
index 00000000000..4ac1b89ea07
--- /dev/null
+++ b/main/linux-lts/lts.x86.config
@@ -0,0 +1,2909 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_SCHED_CORE=y
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_MEMCG=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_BPF=y
+CONFIG_NAMESPACES=y
+CONFIG_USER_NS=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+# CONFIG_SGETMASK_SYSCALL is not set
+# CONFIG_SYSFS_SYSCALL is not set
+CONFIG_PROFILING=y
+# CONFIG_64BIT is not set
+CONFIG_SMP=y
+CONFIG_X86_BIGSMP=y
+CONFIG_X86_INTEL_LPSS=y
+CONFIG_X86_AMD_PLATFORM_DEVICE=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_M586=y
+CONFIG_X86_GENERIC=y
+CONFIG_HPET_TIMER=y
+CONFIG_NR_CPUS=64
+# CONFIG_X86_MCE is not set
+CONFIG_PERF_EVENTS_INTEL_RAPL=m
+CONFIG_PERF_EVENTS_INTEL_CSTATE=m
+CONFIG_PERF_EVENTS_AMD_POWER=m
+CONFIG_PERF_EVENTS_AMD_UNCORE=m
+# CONFIG_X86_16BIT is not set
+CONFIG_TOSHIBA=m
+CONFIG_X86_REBOOTFIXUPS=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+CONFIG_X86_INTEL_TSX_MODE_AUTO=y
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_HZ_300=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HIBERNATION=y
+# CONFIG_HIBERNATION_SNAPSHOT_DEV is not set
+CONFIG_ACPI_EC_DEBUGFS=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_TINY_POWER_BUTTON=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_TAD=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_ERST_DEBUG=y
+CONFIG_ACPI_CONFIGFS=m
+CONFIG_PMIC_OPREGION=y
+CONFIG_XPOWER_PMIC_OPREGION=y
+CONFIG_BXT_WC_PMIC_OPREGION=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_AMD_PSTATE=y
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_X86_E_POWERSAVER=m
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_INTEL_IDLE=y
+CONFIG_PCI_CNB20LE_QUIRK=y
+CONFIG_SCx200=m
+CONFIG_ALIX=y
+CONFIG_NET5501=y
+CONFIG_GEOS=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KPROBES=y
+CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_SHA256=y
+CONFIG_MODULE_COMPRESS_GZIP=y
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BLK_CGROUP_IOLATENCY=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_IOSCHED_BFQ=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_ZSWAP=y
+CONFIG_ZSMALLOC=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_KSM=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+CONFIG_NET=y
+CONFIG_PACKET=m
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_STATISTICS=y
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_XDP_SOCKETS=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=y
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=m
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_MPTCP=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NF_FLOW_TABLE_PROCFS=y
+CONFIG_NETFILTER_XT_SET=m
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_PE_SIP=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_RDS=m
+CONFIG_TIPC=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+CONFIG_L2TP=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_NET_DSA=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
+CONFIG_6LOWPAN_GHC_UDP=m
+CONFIG_6LOWPAN_GHC_ICMPV6=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+CONFIG_DNS_RESOLVER=y
+CONFIG_OPENVSWITCH=m
+CONFIG_VSOCKETS=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_HYPERV_VSOCKETS=m
+CONFIG_NETLINK_DIAG=y
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NCSI=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_NET_PKTGEN=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_LEDS=y
+# CONFIG_BT_DEBUGFS is not set
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_VIRTIO=m
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_CFG80211=m
+CONFIG_MAC80211=m
+CONFIG_RFKILL=m
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_RDMA=m
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_NCI_SPI=m
+CONFIG_NFC_NCI_UART=m
+CONFIG_NFC_HCI=m
+CONFIG_NFC_SHDLC=y
+CONFIG_NFC_TRF7970A=m
+CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_FDP=m
+CONFIG_NFC_FDP_I2C=m
+CONFIG_NFC_PN544_I2C=m
+CONFIG_NFC_PN544_MEI=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
+CONFIG_NFC_MICROREAD_I2C=m
+CONFIG_NFC_MICROREAD_MEI=m
+CONFIG_NFC_MRVL_USB=m
+CONFIG_NFC_MRVL_UART=m
+CONFIG_NFC_MRVL_I2C=m
+CONFIG_NFC_MRVL_SPI=m
+CONFIG_NFC_ST21NFCA_I2C=m
+CONFIG_NFC_ST_NCI_I2C=m
+CONFIG_NFC_ST_NCI_SPI=m
+CONFIG_NFC_S3FWRN5_I2C=m
+CONFIG_PCI=y
+CONFIG_PCIEAER=y
+CONFIG_PCIE_PTM=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_STUB=m
+CONFIG_PCI_PF_STUB=m
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
+CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
+CONFIG_HOTPLUG_PCI_SHPC=y
+CONFIG_PCCARD=m
+CONFIG_YENTA=m
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DEVTMPFS_SAFE=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+CONFIG_FW_LOADER_COMPRESS=y
+# CONFIG_FW_LOADER_COMPRESS_XZ is not set
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
+# CONFIG_ALLOW_DEV_COREDUMP is not set
+CONFIG_DEBUG_DEVRES=y
+CONFIG_CONNECTOR=y
+CONFIG_EDD=m
+CONFIG_FW_CFG_SYSFS=m
+CONFIG_SYSFB_SIMPLEFB=y
+CONFIG_EFI_VARS_PSTORE=m
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_GNSS=m
+CONFIG_MTD=m
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+CONFIG_MTD_DATAFLASH=m
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTD_BLOCK2MTD=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_UBI=m
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+CONFIG_BLK_DEV_FD=m
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZ4=y
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_DRBD=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_TCP=m
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_PCH_PHUB=m
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93XX46=m
+CONFIG_EEPROM_EE1004=m
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_INTEL_MEI_TXE=m
+CONFIG_INTEL_MEI_HDCP=m
+CONFIG_VMWARE_VMCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_ISCSI_TCP=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+CONFIG_SCSI_MVSAS_TASKLET=y
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+CONFIG_SCSI_EFCT=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_WD719X=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_ATA=m
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=3
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+CONFIG_PATA_CS5536=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_RZ1000=m
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=m
+CONFIG_PATA_LEGACY=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+# CONFIG_MD_AUTODETECT is not set
+CONFIG_MD_LINEAR=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BCACHE=m
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_FEC=y
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_CTL=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+CONFIG_EQUALIZER=m
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NTB_NETDEV=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+CONFIG_MHI_NET=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_IDT77252=m
+CONFIG_ATM_IA=m
+CONFIG_ATM_FORE200E=m
+CONFIG_ATM_FORE200E_USE_TASKLET=y
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
+CONFIG_NET_DSA_BCM_SF2=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_PTP=y
+CONFIG_NET_DSA_QCA8K=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_ET131X=m
+CONFIG_ACENIC=m
+CONFIG_ALTERA_TSE=m
+CONFIG_ENA_ETHERNET=m
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_B44=m
+CONFIG_BCMGENET=m
+CONFIG_TIGON3=m
+CONFIG_BNX2X=m
+CONFIG_BNXT=m
+CONFIG_MACB=m
+# CONFIG_NET_VENDOR_CAVIUM is not set
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_ENIC=m
+# CONFIG_NET_VENDOR_CORTINA is not set
+CONFIG_DNET=m
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_TULIP=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+CONFIG_BE2NET=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_GVE=m
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGBVF=m
+CONFIG_IXGBE=m
+CONFIG_IXGBEVF=m
+CONFIG_I40E=m
+CONFIG_I40EVF=m
+CONFIG_ICE=m
+CONFIG_JME=m
+CONFIG_SKGE=m
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_CORE_EN=y
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_ENC28J60=m
+CONFIG_ENCX24J600=m
+CONFIG_LAN743X=m
+# CONFIG_NET_VENDOR_MICROSEMI is not set
+CONFIG_MYRI10GE=m
+CONFIG_FEALNX=m
+# CONFIG_NET_VENDOR_NI is not set
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_S2IO=m
+CONFIG_NFP=m
+# CONFIG_NFP_APP_FLOWER is not set
+# CONFIG_NFP_APP_ABM_NIC is not set
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_FORCEDETH=m
+CONFIG_PCH_GBE=m
+CONFIG_ETHOC=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QEDE=m
+CONFIG_BNA=m
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+CONFIG_R6040=m
+CONFIG_ATP=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_R8169=m
+CONFIG_ROCKER=m
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+CONFIG_SC92031=m
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_SFC=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_PLATFORM is not set
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_TEHUTI=m
+CONFIG_TLAN=m
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_VELOCITY=m
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+CONFIG_WIZNET_W5100_SPI=m
+CONFIG_XILINX_EMACLITE=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+CONFIG_NET_SB1000=m
+CONFIG_SFP=m
+CONFIG_AMD_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_88X2222_PHY=m
+CONFIG_MAXLINEAR_GPHY=m
+CONFIG_MEDIATEK_GE_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_MOTORCOMM_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_C45_TJA11XX_PHY=m
+CONFIG_AT803X_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_PLIP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+# CONFIG_WLAN_VENDOR_ADMTEK is not set
+CONFIG_ATH5K=m
+CONFIG_ATH9K=m
+CONFIG_ATH9K_AHB=y
+CONFIG_ATH9K_HTC=m
+CONFIG_CARL9170=m
+CONFIG_CARL9170_HWRNG=y
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+CONFIG_ATH6KL_DEBUG=y
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+CONFIG_WCN36XX=m
+CONFIG_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_WLAN_VENDOR_ATMEL is not set
+CONFIG_B43=m
+CONFIG_B43_SDIO=y
+CONFIG_B43LEGACY=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+CONFIG_AIRO=m
+CONFIG_AIRO_CS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_MWL8K=m
+CONFIG_MT7601U=m
+CONFIG_MT76x0U=m
+CONFIG_MT76x2E=m
+CONFIG_MT76x2U=m
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+# CONFIG_RT2800PCI_RT35XX is not set
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+# CONFIG_RT2800USB_RT35XX is not set
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8XXXU=m
+CONFIG_RTL8XXXU_UNTESTED=y
+CONFIG_RTW88=m
+CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8821CE=m
+CONFIG_RSI_91X=m
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_VIRT_WIFI=m
+CONFIG_WAN=y
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+CONFIG_HDLC_X25=m
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+CONFIG_PC300TOO=m
+CONFIG_FARSYNC=m
+CONFIG_LAPBETHER=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+CONFIG_IEEE802154_CC2520=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+CONFIG_IEEE802154_MCR20A=m
+CONFIG_VMXNET3=m
+CONFIG_FUJITSU_ES=m
+CONFIG_USB4_NET=m
+CONFIG_HYPERV_NET=m
+CONFIG_ISDN=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_INPUT_LEDS=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVBUG=m
+CONFIG_KEYBOARD_ADC=m
+CONFIG_KEYBOARD_APPLESPI=m
+CONFIG_MOUSE_PS2=m
+# CONFIG_MOUSE_PS2_BYD is not set
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_VMMOUSE=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ADC=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELAN=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+# CONFIG_TOUCHSCREEN_USB_EASYTOUCH is not set
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LEGACY_TIOCSTI is not set
+# CONFIG_LDISC_AUTOLOAD is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_8250_LPSS=m
+CONFIG_SERIAL_8250_MID=m
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_IPWIRELESS=m
+CONFIG_SERIAL_DEV_BUS=m
+CONFIG_PRINTER=m
+CONFIG_PPDEV=m
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_APPLICOM=m
+CONFIG_MWAVE=m
+CONFIG_HPET=y
+# CONFIG_HPET_MMAP is not set
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_SPI=m
+CONFIG_TCG_TIS_SPI_CR50=y
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_CRB=m
+CONFIG_TELCLOCK=m
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_SCMI=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_EG20T=m
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIRTIO=m
+CONFIG_I2C_STUB=m
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+CONFIG_SPI=y
+CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DW_PCI=m
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_XCOMM=m
+CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_TLE62X0=m
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_DP83640_PHY=m
+CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_PINCTRL_CHERRYVIEW=y
+CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_GEMINILAKE=m
+CONFIG_PINCTRL_ICELAKE=m
+CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_PINCTRL_TIGERLAKE=m
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_ICH=m
+CONFIG_GPIO_VX855=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_WINBOND=m
+CONFIG_GPIO_WS16C48=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_GPIO_WHISKEY_COVE=m
+CONFIG_GPIO_AMD8111=m
+CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_RDC321X=m
+CONFIG_GPIO_MAX7301=m
+CONFIG_GENERIC_ADC_BATTERY=m
+CONFIG_AXP288_CHARGER=m
+CONFIG_AXP288_FUEL_GAUGE=m
+CONFIG_HWMON=m
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_CORSAIR_PSU=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_FTSTEUTATES=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2990=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX31722=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_MLXREG_FAN=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_LTC3815=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX20751=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_TPS40422=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
+CONFIG_SENSORS_SHTC1=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_ADC128D818=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA3221=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83773G=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+CONFIG_SENSORS_W83795_FANCTRL=y
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL_NETLINK=y
+CONFIG_THERMAL_STATISTICS=y
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_INTEL_SOC_DTS_THERMAL=m
+CONFIG_INTEL_BXT_PMIC_THERMAL=m
+CONFIG_INTEL_PCH_THERMAL=m
+CONFIG_GENERIC_ADC_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+CONFIG_WATCHDOG_SYSFS=y
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_WDAT_WDT=m
+CONFIG_MAX63XX_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_EBC_C384_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_GEODE_WDT=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_VIA_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_INTEL_MEI_WDT=m
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+CONFIG_MFD_CS5535=m
+CONFIG_MFD_AXP20X_I2C=m
+CONFIG_LPC_ICH=m
+CONFIG_INTEL_SOC_PMIC_BXTWC=m
+CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_PMC_BXT=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_MFD_SM501=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_RC_CORE=m
+CONFIG_LIRC=y
+CONFIG_RC_DECODERS=y
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_IR_ENE=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_SERIAL=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_RC_LOOPBACK=m
+# CONFIG_MEDIA_CEC_SUPPORT is not set
+CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_V4L2_FLASH_LED_CLASS=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_MEDIA_USB_SUPPORT=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+CONFIG_VIDEO_SOLO6X10=m
+CONFIG_VIDEO_TW686X=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+CONFIG_DVB_DDBRIDGE=m
+CONFIG_DVB_DM1105=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_SMIPCIE=m
+CONFIG_VIDEO_IPU3_CIO2=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_DVB_FIREDTV=m
+CONFIG_CXD2880_SPI_DRV=m
+CONFIG_DVB_DUMMY_FE=m
+CONFIG_AUXDISPLAY=y
+CONFIG_KS0108=m
+CONFIG_CFAG12864B=m
+CONFIG_AGP=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_DP_AUX_CHARDEV=y
+CONFIG_DRM_DP_CEC=y
+# CONFIG_DRM_I2C_CH7006 is not set
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_USERPTR=y
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+CONFIG_DRM_AMDGPU_USERPTR=y
+CONFIG_DRM_AMD_ACP=y
+CONFIG_DRM_AMD_DC_SI=y
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_VGEM=m
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_SIMPLEDRM=m
+CONFIG_DRM_VBOXVIDEO=m
+CONFIG_DRM_GUD=m
+CONFIG_DRM_HYPERV=m
+CONFIG_FB=y
+CONFIG_FB_EFI=y
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_TILEBLITTING=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_AMS369FG06=m
+CONFIG_LCD_LMS501KF03=m
+CONFIG_LCD_HX8357=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_PCF50633=m
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+CONFIG_SOUND=m
+CONFIG_SND=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_HRTIMER=m
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_SEQUENCER_OSS=m
+CONFIG_SND_PCSP=m
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_FM801=m
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=0
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CS8409=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
+CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_SOC_INTEL_CATPT=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
+CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
+CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
+CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
+CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_HDA_LINK=y
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_SOC_AK4458=m
+CONFIG_SND_SOC_AK5558=m
+CONFIG_SND_SOC_BD28623=m
+CONFIG_SND_SOC_MAX9867=m
+CONFIG_SND_SOC_PCM1789_I2C=m
+CONFIG_SND_SOC_PCM186X_I2C=m
+CONFIG_SND_SOC_PCM186X_SPI=m
+CONFIG_SND_SOC_RT1316_SDW=m
+CONFIG_SND_SOC_RT711_SDCA_SDW=m
+CONFIG_SND_SOC_RT715_SDCA_SDW=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+CONFIG_SND_SOC_SIMPLE_MUX=m
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_TAS6424=m
+CONFIG_SND_SOC_TDA7419=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
+CONFIG_SND_SOC_TSCS42XX=m
+CONFIG_SND_SOC_MAX9759=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_HDMI_LPE_AUDIO=m
+CONFIG_SND_VIRTIO=m
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_ASUS=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_JABRA=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MAYFLASH=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+CONFIG_HID_RMI=m
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_ALPS=m
+CONFIG_USB_HIDDEV=y
+CONFIG_I2C_HID_ACPI=m
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_MON=m
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_SSB=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_HCD_ISO=y
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_TMC=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_HOST=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_XR=m
+CONFIG_USB_SERIAL_DEBUG=m
+CONFIG_USB_USS720=m
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_APPLE_MFI_FASTCHARGE=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_LD=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_MUX_PI3USB30532=m
+CONFIG_TYPEC_MUX_INTEL_PMC=m
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_MMC=m
+CONFIG_SDIO_UART=m
+CONFIG_MMC_TEST=m
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_F_SDH30=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_HSQ=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_MTK=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_MEMSTICK=m
+CONFIG_MSPRO_BLOCK=m
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS_FLASH=m
+CONFIG_LEDS_APU=m
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_MLXCPLD=m
+CONFIG_LEDS_MLXREG=m
+CONFIG_LEDS_LM3601X=m
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1374_WDT=y
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV8803=m
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1343=m
+CONFIG_RTC_DRV_DS1347=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6916=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_PCF2123=m
+CONFIG_RTC_DRV_MCP795=m
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_DMADEVICES=y
+CONFIG_PCH_DMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_DMATEST=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VBOXGUEST=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_VDPA=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_VDPA=m
+CONFIG_VDPA_USER=m
+CONFIG_IFCVF=m
+CONFIG_MLX5_VDPA_NET=m
+CONFIG_VP_VDPA=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_VDPA=m
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+CONFIG_STAGING=y
+CONFIG_RTLLIB=m
+CONFIG_RTL8723BS=m
+CONFIG_R8712U=m
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_ACPI=m
+CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_CHROMEOS_PSTORE=m
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CHROMEOS_PRIVACY_SCREEN=m
+CONFIG_MELLANOX_PLATFORM=y
+CONFIG_MLXREG_HOTPLUG=m
+CONFIG_MLXREG_IO=m
+CONFIG_GIGABYTE_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ACER_WIRELESS=m
+CONFIG_ACER_WMI=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_ASUS_WIRELESS=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_EEEPC_WMI=m
+CONFIG_X86_PLATFORM_DRIVERS_DELL=y
+# CONFIG_DCDBAS is not set
+CONFIG_DELL_WMI_PRIVACY=y
+# CONFIG_DELL_WMI_LED is not set
+CONFIG_AMILO_RFKILL=m
+CONFIG_FUJITSU_LAPTOP=m
+CONFIG_GPD_POCKET_FAN=m
+CONFIG_WIRELESS_HOTKEY=y
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_SENSORS_HDAPS=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_LMI=m
+CONFIG_INTEL_ATOMISP2_PM=m
+CONFIG_INTEL_SAR_INT1092=m
+CONFIG_INTEL_SKL_INT3472=m
+CONFIG_INTEL_PMC_CORE=y
+CONFIG_INTEL_WMI_THUNDERBOLT=m
+CONFIG_INTEL_HID_EVENT=m
+CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_OAKTRAIL=m
+CONFIG_INTEL_BXTWC_PMIC_TMU=m
+CONFIG_INTEL_PUNIT_IPC=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_MSI_WMI=m
+CONFIG_PCENGINES_APU2=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_TOSHIBA_HAPS=m
+CONFIG_ACPI_CMPC=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_MLX_PLATFORM=m
+CONFIG_INTEL_IPS=m
+CONFIG_COMMON_CLK_SI544=m
+CONFIG_XILINX_VCU=m
+CONFIG_INTEL_IOMMU=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+CONFIG_VIRTIO_IOMMU=m
+CONFIG_RPMSG_VIRTIO=m
+CONFIG_SOUNDWIRE=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=m
+CONFIG_DEVFREQ_GOV_POWERSAVE=m
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+CONFIG_EXTCON_AXP288=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_MEMORY=y
+CONFIG_IIO=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_AXP288_ADC=m
+CONFIG_HID_SENSOR_GYRO_3D=m
+CONFIG_HID_SENSOR_HUMIDITY=m
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+CONFIG_HID_SENSOR_PRESS=m
+CONFIG_HID_SENSOR_TEMP=m
+CONFIG_NTB=m
+CONFIG_NTB_SWITCHTEC=m
+CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_PERF=m
+CONFIG_NTB_TRANSPORT=m
+CONFIG_PWM=y
+CONFIG_PWM_LPSS_PCI=m
+CONFIG_PWM_LPSS_PLATFORM=m
+CONFIG_PWM_PCA9685=m
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL=m
+CONFIG_USB4=m
+CONFIG_NVMEM_RMEM=m
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_REISERFS_FS=m
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+CONFIG_XFS_ONLINE_SCRUB=y
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+# CONFIG_OCFS2_FS_STATS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+# CONFIG_F2FS_STAT_FS is not set
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_UNFAIR_RWSEM=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
+# CONFIG_DNOTIFY is not set
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_CACHEFILES=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
+CONFIG_NTFS_FS=m
+CONFIG_NTFS_RW=y
+CONFIG_NTFS3_FS=m
+CONFIG_NTFS3_LZX_XPRESS=y
+CONFIG_NTFS3_FS_POSIX_ACL=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_ORANGEFS_FS=m
+CONFIG_ECRYPT_FS=m
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RUBIN=y
+CONFIG_UBIFS_FS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_ROMFS_FS=m
+CONFIG_PSTORE_RAM=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+CONFIG_VBOXSF_FS=m
+CONFIG_NFS_FS=m
+CONFIG_NFS_V4=m
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_NFS_FSCACHE=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+CONFIG_CIFS_FSCACHE=y
+CONFIG_SMB_SERVER=m
+CONFIG_SMB_SERVER_SMBDIRECT=y
+CONFIG_CODA_FS=m
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_DLM=m
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_FORTIFY_SOURCE=y
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_LANDLOCK=y
+# CONFIG_INTEGRITY is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity"
+CONFIG_GCC_PLUGIN_STACKLEAK=y
+CONFIG_STACKLEAK_RUNTIME_DISABLE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_ZERO_CALL_USED_REGS=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_HCTR2=m
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+# CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
+CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_SERPENT_SSE2_586=m
+CONFIG_CRYPTO_TWOFISH_586=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_GEODE=m
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+CONFIG_CRYPTO_DEV_QAT_C3XXX=m
+CONFIG_CRYPTO_DEV_QAT_C62X=m
+CONFIG_CRYPTO_DEV_QAT_4XXX=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
+CONFIG_CRYPTO_DEV_QAT_C62XVF=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_SIGNED_PE_FILE_VERIFICATION=y
+CONFIG_SECONDARY_TRUSTED_KEYRING=y
+CONFIG_CRC_T10DIF=y
+CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_QUIET=3
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_INFO_DWARF5=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_SLUB_DEBUG is not set
+CONFIG_DEBUG_KMEMLEAK=y
+CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
+CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_KFENCE=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+# CONFIG_DETECT_HUNG_TASK is not set
+CONFIG_DEBUG_LIST=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+CONFIG_LATENCYTOP=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_MMIOTRACE=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_IO_STRICT_DEVMEM=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+# CONFIG_EARLY_PRINTK is not set
+CONFIG_X86_DECODER_SELFTEST=y
+CONFIG_DEBUG_NMI_SELFTEST=y
+# CONFIG_RUNTIME_TESTING_MENU is not set
diff --git a/main/linux-lts/lts.x86_64.config b/main/linux-lts/lts.x86_64.config
new file mode 100644
index 00000000000..2a7b1e023f0
--- /dev/null
+++ b/main/linux-lts/lts.x86_64.config
@@ -0,0 +1,3241 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ_FULL=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_SCHED_CORE=y
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_MEMCG=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+# CONFIG_PROC_PID_CPUSET is not set
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_NAMESPACES=y
+CONFIG_USER_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+# CONFIG_SGETMASK_SYSCALL is not set
+# CONFIG_SYSFS_SYSCALL is not set
+CONFIG_PROFILING=y
+CONFIG_KEXEC=y
+CONFIG_SMP=y
+CONFIG_X86_CPU_RESCTRL=y
+CONFIG_X86_INTEL_LPSS=y
+CONFIG_X86_AMD_PLATFORM_DEVICE=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_XEN=y
+CONFIG_XEN_PVH=y
+CONFIG_INTEL_TDX_GUEST=y
+CONFIG_GART_IOMMU=y
+CONFIG_NR_CPUS=256
+CONFIG_PERF_EVENTS_INTEL_RAPL=m
+CONFIG_PERF_EVENTS_INTEL_CSTATE=m
+CONFIG_PERF_EVENTS_AMD_POWER=m
+CONFIG_PERF_EVENTS_AMD_UNCORE=m
+CONFIG_PERF_EVENTS_AMD_BRS=y
+# CONFIG_X86_16BIT is not set
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+# CONFIG_X86_5LEVEL is not set
+CONFIG_NUMA=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_X86_INTEL_TSX_MODE_AUTO=y
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_EFI_MIXED=y
+CONFIG_HZ_300=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_LEGACY_VSYSCALL_NONE=y
+CONFIG_LIVEPATCH=y
+CONFIG_HIBERNATION=y
+# CONFIG_HIBERNATION_SNAPSHOT_DEV is not set
+CONFIG_ACPI_EC_DEBUGFS=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_TINY_POWER_BUTTON=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_TAD=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_BGRT=y
+CONFIG_ACPI_NFIT=m
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_ERST_DEBUG=y
+CONFIG_ACPI_EXTLOG=y
+CONFIG_ACPI_CONFIGFS=m
+CONFIG_PMIC_OPREGION=y
+CONFIG_BYTCRC_PMIC_OPREGION=y
+CONFIG_XPOWER_PMIC_OPREGION=y
+CONFIG_BXT_WC_PMIC_OPREGION=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_AMD_PSTATE=y
+CONFIG_X86_AMD_PSTATE_UT=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_INTEL_IDLE=y
+CONFIG_PCI_CNB20LE_QUIRK=y
+CONFIG_IA32_EMULATION=y
+CONFIG_KVM=m
+# CONFIG_KVM_WERROR is not set
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KPROBES=y
+CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
+CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_SHA256=y
+CONFIG_MODULE_COMPRESS_GZIP=y
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BLK_CGROUP_IOLATENCY=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_MAC_PARTITION=y
+CONFIG_LDM_PARTITION=y
+CONFIG_IOSCHED_BFQ=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_ZSWAP=y
+CONFIG_ZSMALLOC=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_KSM=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_MEM_SOFT_DIRTY=y
+CONFIG_ZONE_DEVICE=y
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+CONFIG_NET=y
+CONFIG_PACKET=m
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_STATISTICS=y
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_XDP_SOCKETS=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=y
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=m
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_MPTCP=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NF_FLOW_TABLE_PROCFS=y
+CONFIG_NETFILTER_XT_SET=m
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_PE_SIP=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_RDS=m
+CONFIG_TIPC=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+CONFIG_L2TP=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_RTL8_4=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
+CONFIG_6LOWPAN_GHC_UDP=m
+CONFIG_6LOWPAN_GHC_ICMPV6=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
+CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+CONFIG_DNS_RESOLVER=y
+CONFIG_OPENVSWITCH=m
+CONFIG_VSOCKETS=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_HYPERV_VSOCKETS=m
+CONFIG_NETLINK_DIAG=y
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NCSI=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_NET_PKTGEN=m
+CONFIG_CAN=y
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_LEDS=y
+# CONFIG_BT_DEBUGFS is not set
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
+CONFIG_BT_HCIBTUSB_MTK=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_VIRTIO=m
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_CFG80211=m
+CONFIG_MAC80211=m
+CONFIG_RFKILL=m
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_XEN=m
+CONFIG_NET_9P_RDMA=m
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_NCI_SPI=m
+CONFIG_NFC_NCI_UART=m
+CONFIG_NFC_HCI=m
+CONFIG_NFC_SHDLC=y
+CONFIG_NFC_TRF7970A=m
+CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_FDP=m
+CONFIG_NFC_FDP_I2C=m
+CONFIG_NFC_PN544_I2C=m
+CONFIG_NFC_PN544_MEI=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
+CONFIG_NFC_MICROREAD_I2C=m
+CONFIG_NFC_MICROREAD_MEI=m
+CONFIG_NFC_MRVL_USB=m
+CONFIG_NFC_MRVL_UART=m
+CONFIG_NFC_MRVL_I2C=m
+CONFIG_NFC_MRVL_SPI=m
+CONFIG_NFC_ST21NFCA_I2C=m
+CONFIG_NFC_ST_NCI_I2C=m
+CONFIG_NFC_ST_NCI_SPI=m
+CONFIG_NFC_S3FWRN5_I2C=m
+CONFIG_PCI=y
+CONFIG_PCIEAER=y
+CONFIG_PCIE_PTM=y
+CONFIG_PCI_STUB=m
+CONFIG_PCI_PF_STUB=m
+CONFIG_XEN_PCIDEV_FRONTEND=m
+CONFIG_PCI_P2PDMA=y
+CONFIG_PCI_HYPERV=m
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
+CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
+CONFIG_HOTPLUG_PCI_SHPC=y
+CONFIG_VMD=m
+CONFIG_PCCARD=m
+CONFIG_YENTA=m
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DEVTMPFS_SAFE=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+CONFIG_FW_LOADER_COMPRESS=y
+# CONFIG_FW_LOADER_COMPRESS_XZ is not set
+CONFIG_FW_LOADER_COMPRESS_ZSTD=y
+# CONFIG_ALLOW_DEV_COREDUMP is not set
+CONFIG_DEBUG_DEVRES=y
+CONFIG_CONNECTOR=y
+CONFIG_EDD=m
+CONFIG_FW_CFG_SYSFS=m
+CONFIG_SYSFB_SIMPLEFB=y
+CONFIG_EFI_VARS_PSTORE=m
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_GNSS=m
+CONFIG_MTD=m
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+CONFIG_MTD_PMC551=m
+CONFIG_MTD_PMC551_BUGFIX=y
+CONFIG_MTD_DATAFLASH=m
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTD_BLOCK2MTD=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_OTP=y
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_NAND_ECC_MXIC=y
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_UBI=m
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+CONFIG_BLK_DEV_FD=m
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZ4=y
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_DRBD=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_UBLK=m
+CONFIG_BLK_DEV_RNBD_CLIENT=m
+CONFIG_BLK_DEV_RNBD_SERVER=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_TCP=m
+CONFIG_NVME_AUTH=y
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_AUTH=y
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93XX46=m
+CONFIG_EEPROM_EE1004=m
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_INTEL_MEI_TXE=m
+CONFIG_INTEL_MEI_GSC=m
+CONFIG_INTEL_MEI_HDCP=m
+CONFIG_INTEL_MEI_PXP=m
+CONFIG_VMWARE_VMCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_ISCSI_TCP=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+CONFIG_SCSI_MVSAS_TASKLET=y
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+CONFIG_SCSI_EFCT=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_WD719X=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_ATA=m
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=3
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+CONFIG_PATA_HPT3X3_DMA=y
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_RZ1000=m
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=m
+CONFIG_PATA_LEGACY=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+# CONFIG_MD_AUTODETECT is not set
+CONFIG_MD_LINEAR=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BCACHE=m
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_FEC=y
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_CTL=m
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+CONFIG_EQUALIZER=m
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_AMT=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NTB_NETDEV=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+CONFIG_MHI_NET=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_IDT77252=m
+CONFIG_ATM_IA=m
+CONFIG_ATM_FORE200E=m
+CONFIG_ATM_FORE200E_USE_TASKLET=y
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
+CONFIG_NET_DSA_BCM_SF2=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_PTP=y
+CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_ACENIC=m
+CONFIG_ALTERA_TSE=m
+CONFIG_ENA_ETHERNET=m
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_AMD_XGBE=m
+CONFIG_AQTION=m
+CONFIG_SPI_AX88796C=m
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_B44=m
+CONFIG_BCMGENET=m
+CONFIG_TIGON3=m
+CONFIG_BNX2X=m
+CONFIG_BNXT=m
+CONFIG_MACB=m
+# CONFIG_NET_VENDOR_CAVIUM is not set
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_ENIC=m
+# CONFIG_NET_VENDOR_CORTINA is not set
+CONFIG_DM9051=m
+CONFIG_DNET=m
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_TULIP=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+CONFIG_BE2NET=m
+CONFIG_TSNEP=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_FUN_ETH=m
+CONFIG_GVE=m
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGBVF=m
+CONFIG_IXGBE=m
+CONFIG_IXGBEVF=m
+CONFIG_I40E=m
+CONFIG_I40EVF=m
+CONFIG_ICE=m
+CONFIG_IGC=m
+CONFIG_JME=m
+CONFIG_SKGE=m
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+CONFIG_OCTEON_EP=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_CORE_EN=y
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_ENC28J60=m
+CONFIG_ENCX24J600=m
+CONFIG_LAN743X=m
+# CONFIG_NET_VENDOR_MICROSEMI is not set
+CONFIG_MICROSOFT_MANA=m
+CONFIG_MYRI10GE=m
+CONFIG_FEALNX=m
+# CONFIG_NET_VENDOR_NI is not set
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_S2IO=m
+CONFIG_NFP=m
+# CONFIG_NFP_APP_FLOWER is not set
+# CONFIG_NFP_APP_ABM_NIC is not set
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_FORCEDETH=m
+CONFIG_ETHOC=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QEDE=m
+CONFIG_BNA=m
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+CONFIG_R6040=m
+CONFIG_ATP=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_R8169=m
+CONFIG_ROCKER=m
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+CONFIG_SC92031=m
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_SFC=m
+CONFIG_SFC_SIENA=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_PLATFORM is not set
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_TEHUTI=m
+CONFIG_TLAN=m
+CONFIG_MSE102X=m
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_VELOCITY=m
+CONFIG_NGBE=m
+CONFIG_TXGBE=m
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+CONFIG_WIZNET_W5100_SPI=m
+CONFIG_XILINX_EMACLITE=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+CONFIG_NET_SB1000=m
+CONFIG_AMD_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_88X2222_PHY=m
+CONFIG_MAXLINEAR_GPHY=m
+CONFIG_MEDIATEK_GE_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_MOTORCOMM_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_C45_TJA11XX_PHY=m
+CONFIG_AT803X_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_VXCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_PEAK_PCIEFD=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PLX_PCI=m
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+CONFIG_CAN_MCBA_USB=m
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_UCAN=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_THUNDER=m
+CONFIG_PLIP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+# CONFIG_WLAN_VENDOR_ADMTEK is not set
+CONFIG_ATH5K=m
+CONFIG_ATH9K=m
+CONFIG_ATH9K_AHB=y
+CONFIG_ATH9K_HTC=m
+CONFIG_CARL9170=m
+CONFIG_CARL9170_HWRNG=y
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+CONFIG_ATH6KL_DEBUG=y
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+CONFIG_WCN36XX=m
+CONFIG_ATH11K=m
+CONFIG_ATH11K_PCI=m
+# CONFIG_WLAN_VENDOR_ATMEL is not set
+CONFIG_B43=m
+CONFIG_B43_SDIO=y
+CONFIG_B43LEGACY=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+CONFIG_AIRO=m
+CONFIG_AIRO_CS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_MWL8K=m
+CONFIG_MT7601U=m
+CONFIG_MT76x0U=m
+CONFIG_MT76x2E=m
+CONFIG_MT76x2U=m
+CONFIG_MT7921E=m
+CONFIG_MT7921S=m
+CONFIG_MT7921U=m
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+# CONFIG_RT2800PCI_RT35XX is not set
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+# CONFIG_RT2800USB_RT35XX is not set
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8XXXU=m
+CONFIG_RTL8XXXU_UNTESTED=y
+CONFIG_RTW88=m
+CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8821CE=m
+CONFIG_RTW89=m
+CONFIG_RTW89_8852AE=m
+CONFIG_RTW89_8852CE=m
+CONFIG_RSI_91X=m
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_VIRT_WIFI=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_CC2520=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+CONFIG_IEEE802154_MCR20A=m
+CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_VMXNET3=m
+CONFIG_FUJITSU_ES=m
+CONFIG_USB4_NET=m
+CONFIG_HYPERV_NET=m
+CONFIG_ISDN=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_INPUT_LEDS=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVBUG=m
+CONFIG_KEYBOARD_APPLESPI=m
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_CROS_EC=m
+CONFIG_KEYBOARD_CYPRESS_SF=m
+CONFIG_MOUSE_PS2=m
+# CONFIG_MOUSE_PS2_BYD is not set
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_VMMOUSE=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELAN=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_IMAGIS=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+# CONFIG_TOUCHSCREEN_USB_EASYTOUCH is not set
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
+CONFIG_TOUCHSCREEN_COLIBRI_VF50=m
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_IBM_PANEL=m
+CONFIG_INPUT_IQS7222=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_RMI4_SMB=m
+CONFIG_RMI4_F55=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LDISC_AUTOLOAD is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_FINTEK=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_8250_LPSS=m
+CONFIG_SERIAL_8250_MID=m
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_N_HDLC=m
+CONFIG_IPWIRELESS=m
+CONFIG_NOZOMI=m
+CONFIG_RPMSG_TTY=m
+CONFIG_SERIAL_DEV_BUS=m
+CONFIG_PRINTER=m
+CONFIG_PPDEV=m
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_IPMB=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_BA431=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_XIPHERA=m
+CONFIG_APPLICOM=m
+CONFIG_MWAVE=m
+CONFIG_HPET=y
+# CONFIG_HPET_MMAP is not set
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_SPI=m
+CONFIG_TCG_TIS_SPI_CR50=y
+CONFIG_TCG_TIS_I2C=m
+CONFIG_TCG_TIS_I2C_CR50=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_XEN=m
+CONFIG_TCG_CRB=m
+CONFIG_TELCLOCK=m
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_SCMI=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
+CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PCI1XXXX=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_CROS_EC_TUNNEL=m
+CONFIG_I2C_VIRTIO=m
+CONFIG_I2C_STUB=m
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+CONFIG_SPI=y
+CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DW_PCI=m
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_MICROCHIP_CORE=m
+CONFIG_SPI_MICROCHIP_CORE_QSPI=m
+CONFIG_SPI_XCOMM=m
+CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_TLE62X0=m
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_DP83640_PHY=m
+CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_VMW=m
+CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_CY8C95X0=m
+CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_PINCTRL_CHERRYVIEW=y
+CONFIG_PINCTRL_ALDERLAKE=m
+CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_CANNONLAKE=m
+CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_ELKHARTLAKE=m
+CONFIG_PINCTRL_GEMINILAKE=m
+CONFIG_PINCTRL_ICELAKE=m
+CONFIG_PINCTRL_JASPERLAKE=m
+CONFIG_PINCTRL_METEORLAKE=m
+CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_PINCTRL_TIGERLAKE=m
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_ICH=m
+CONFIG_GPIO_VX855=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_WINBOND=m
+CONFIG_GPIO_WS16C48=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_GPIO_WHISKEY_COVE=m
+CONFIG_GPIO_AMD8111=m
+CONFIG_GPIO_BT8XX=m
+CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_RDC321X=m
+CONFIG_GPIO_MAX7301=m
+CONFIG_GENERIC_ADC_BATTERY=m
+CONFIG_AXP288_CHARGER=m
+CONFIG_AXP288_FUEL_GAUGE=m
+CONFIG_CHARGER_CROS_USBPD=m
+CONFIG_CHARGER_WILCO=m
+CONFIG_BATTERY_UG3105=m
+CONFIG_HWMON=m
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_CORSAIR_PSU=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_FTSTEUTATES=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2990=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX31722=m
+CONFIG_SENSORS_MAX31760=m
+CONFIG_SENSORS_MAX6620=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_MLXREG_FAN=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NCT6775_I2C=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_NZXT_SMART2=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_DELTA_AHE50DC_FAN=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LM25066_REGULATOR=y
+CONFIG_SENSORS_LT7182S=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_LTC3815=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX20751=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_MP5023=m
+CONFIG_SENSORS_PLI1209BC=m
+CONFIG_SENSORS_TPS40422=m
+CONFIG_SENSORS_TPS546D24=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_XDPE152=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
+CONFIG_SENSORS_SHTC1=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC2305=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_ADC128D818=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA238=m
+CONFIG_SENSORS_INA3221=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_TMP464=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83773G=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+CONFIG_SENSORS_W83795_FANCTRL=y
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_SENSORS_ASUS_WMI=m
+CONFIG_SENSORS_ASUS_EC=m
+CONFIG_THERMAL_STATISTICS=y
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_INTEL_SOC_DTS_THERMAL=m
+CONFIG_INT340X_THERMAL=m
+CONFIG_INT3406_THERMAL=m
+CONFIG_INTEL_BXT_PMIC_THERMAL=m
+CONFIG_INTEL_PCH_THERMAL=m
+CONFIG_INTEL_TCC_COOLING=m
+CONFIG_INTEL_HFI_THERMAL=y
+CONFIG_GENERIC_ADC_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+CONFIG_WATCHDOG_SYSFS=y
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_WDAT_WDT=m
+CONFIG_MAX63XX_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_EBC_C384_WDT=m
+CONFIG_EXAR_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_VIA_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_INTEL_MEI_WDT=m
+CONFIG_XEN_WDT=m
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+CONFIG_MFD_AXP20X_I2C=m
+CONFIG_LPC_ICH=m
+CONFIG_INTEL_SOC_PMIC=y
+CONFIG_INTEL_SOC_PMIC_BXTWC=m
+CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_PMC_BXT=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_MT6370=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_MFD_SY7636A=m
+CONFIG_MFD_RT5120=m
+CONFIG_MFD_SM501=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_ARIZONA_I2C=m
+CONFIG_MFD_ARIZONA_SPI=m
+CONFIG_MFD_WM5102=y
+CONFIG_REGULATOR_RT5190A=m
+CONFIG_REGULATOR_RT5759=m
+CONFIG_REGULATOR_TPS68470=m
+CONFIG_RC_CORE=m
+CONFIG_LIRC=y
+CONFIG_RC_DECODERS=y
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_IR_ENE=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_SERIAL=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_RC_LOOPBACK=m
+# CONFIG_MEDIA_CEC_SUPPORT is not set
+CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_V4L2_FLASH_LED_CLASS=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_MEDIA_USB_SUPPORT=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+CONFIG_VIDEO_SOLO6X10=m
+CONFIG_VIDEO_TW686X=m
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+CONFIG_DVB_DDBRIDGE=m
+CONFIG_DVB_DM1105=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_SMIPCIE=m
+CONFIG_VIDEO_IPU3_CIO2=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_CADENCE_CSI2RX=m
+CONFIG_VIDEO_CADENCE_CSI2TX=m
+CONFIG_DVB_FIREDTV=m
+CONFIG_VIDEO_AR0521=m
+CONFIG_VIDEO_HI846=m
+CONFIG_VIDEO_HI847=m
+CONFIG_VIDEO_OG01A1B=m
+CONFIG_VIDEO_OV08D10=m
+CONFIG_VIDEO_OV13B10=m
+CONFIG_VIDEO_OV5693=m
+CONFIG_CXD2880_SPI_DRV=m
+CONFIG_DVB_DUMMY_FE=m
+CONFIG_AUXDISPLAY=y
+CONFIG_KS0108=m
+CONFIG_CFAG12864B=m
+CONFIG_HT16K33=m
+CONFIG_AGP=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_DP_AUX_CHARDEV=y
+CONFIG_DRM_DP_CEC=y
+# CONFIG_DRM_I2C_CH7006 is not set
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_USERPTR=y
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+CONFIG_DRM_AMD_ACP=y
+CONFIG_DRM_AMD_DC_SI=y
+CONFIG_HSA_AMD=y
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_I915=m
+CONFIG_DRM_VGEM=m
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_PANEL_MIPI_DBI=m
+CONFIG_DRM_SIMPLEDRM=m
+CONFIG_TINYDRM_ILI9163=m
+CONFIG_DRM_VBOXVIDEO=m
+CONFIG_DRM_GUD=m
+CONFIG_DRM_SSD130X=m
+CONFIG_DRM_HYPERV=m
+CONFIG_FB=y
+CONFIG_FB_EFI=y
+# CONFIG_XEN_FBDEV_FRONTEND is not set
+CONFIG_FB_TILEBLITTING=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_AMS369FG06=m
+CONFIG_LCD_LMS501KF03=m
+CONFIG_LCD_HX8357=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_PCF50633=m
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+CONFIG_SOUND=m
+CONFIG_SND=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_HRTIMER=m
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_VERBOSE_PROCFS is not set
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_SEQUENCER_OSS=m
+CONFIG_SND_PCSP=m
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_FM801=m
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=0
+CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m
+CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CS8409=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
+CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_SOC_AMD_ST_ES8336_MACH=m
+CONFIG_SND_SOC_AMD_RENOIR=m
+CONFIG_SND_SOC_AMD_RENOIR_MACH=m
+CONFIG_SND_SOC_AMD_ACP5x=m
+CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
+CONFIG_SND_SOC_AMD_ACP6x=m
+CONFIG_SND_SOC_AMD_ACP_COMMON=m
+CONFIG_SND_SOC_AMD_ACP_PCI=m
+CONFIG_SND_AMD_ASOC_RENOIR=m
+CONFIG_SND_AMD_ASOC_REMBRANDT=m
+CONFIG_SND_SOC_AMD_SOF_MACH=m
+CONFIG_SND_SOC_AMD_RPL_ACP6x=m
+CONFIG_SND_SOC_AMD_PS=m
+CONFIG_SND_DESIGNWARE_I2S=m
+CONFIG_SND_SOC_INTEL_CATPT=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
+CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_INTEL_CML_H=m
+CONFIG_SND_SOC_INTEL_CML_LP=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
+CONFIG_SND_SOC_INTEL_AVS=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m
+CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
+CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
+CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
+CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m
+CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH=m
+CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m
+CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m
+CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_HDA_LINK=y
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_SOC_AK4458=m
+CONFIG_SND_SOC_AK5558=m
+CONFIG_SND_SOC_AW8738=m
+CONFIG_SND_SOC_BD28623=m
+CONFIG_SND_SOC_CROS_EC_CODEC=m
+CONFIG_SND_SOC_CS35L45_SPI=m
+CONFIG_SND_SOC_CS35L45_I2C=m
+CONFIG_SND_SOC_MAX9867=m
+CONFIG_SND_SOC_MAX98520=m
+CONFIG_SND_SOC_MAX98396=m
+CONFIG_SND_SOC_PCM1789_I2C=m
+CONFIG_SND_SOC_PCM186X_I2C=m
+CONFIG_SND_SOC_PCM186X_SPI=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+CONFIG_SND_SOC_SIMPLE_MUX=m
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_TAS2780=m
+CONFIG_SND_SOC_TAS5805M=m
+CONFIG_SND_SOC_TAS6424=m
+CONFIG_SND_SOC_TDA7419=m
+CONFIG_SND_SOC_TLV320ADC3XXX=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
+CONFIG_SND_SOC_TSCS42XX=m
+CONFIG_SND_SOC_WM8731_I2C=m
+CONFIG_SND_SOC_WM8731_SPI=m
+CONFIG_SND_SOC_WM8940=m
+CONFIG_SND_SOC_WSA883X=m
+CONFIG_SND_SOC_MAX9759=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_HDMI_LPE_AUDIO=m
+CONFIG_SND_VIRTIO=m
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_APPLE=m
+CONFIG_HID_ASUS=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_XIAOMI=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_JABRA=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LETSKETCH=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MAYFLASH=m
+CONFIG_HID_MEGAWORLD_FF=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NINTENDO=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PLAYSTATION=m
+CONFIG_PLAYSTATION_FF=y
+CONFIG_HID_PXRC=m
+CONFIG_HID_RAZER=m
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SEMITEK=m
+CONFIG_HID_SIGMAMICRO=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+CONFIG_HID_RMI=m
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_TOPRE=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_ALPS=m
+CONFIG_USB_HIDDEV=y
+CONFIG_I2C_HID_ACPI=m
+CONFIG_INTEL_ISH_HID=m
+CONFIG_AMD_SFH_HID=m
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_MON=m
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_SSB=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_HCD_ISO=y
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_XEN_HCD=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_TMC=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_HOST=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_XR=m
+CONFIG_USB_SERIAL_DEBUG=m
+CONFIG_USB_USS720=m
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_APPLE_MFI_FASTCHARGE=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_LD=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_RT1719=m
+CONFIG_TYPEC_WUSB3801=m
+CONFIG_TYPEC_MUX_FSA4480=m
+CONFIG_TYPEC_MUX_PI3USB30532=m
+CONFIG_TYPEC_MUX_INTEL_PMC=m
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_MMC=m
+CONFIG_SDIO_UART=m
+CONFIG_MMC_TEST=m
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_F_SDH30=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_HSQ=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_MTK=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFS_HWMON=y
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_CDNS_PLATFORM=m
+CONFIG_MEMSTICK=m
+CONFIG_MSPRO_BLOCK=m
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS_FLASH=m
+CONFIG_LEDS_CLASS_MULTICOLOR=m
+CONFIG_LEDS_APU=m
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_MLXCPLD=m
+CONFIG_LEDS_MLXREG=m
+CONFIG_LEDS_LM3601X=m
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_ERDMA=m
+CONFIG_INFINIBAND_HFI1=m
+CONFIG_INFINIBAND_IRDMA=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
+CONFIG_INFINIBAND_RDMAVT=m
+CONFIG_RDMA_RXE=m
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_RTRS_CLIENT=m
+CONFIG_INFINIBAND_RTRS_SERVER=m
+CONFIG_EDAC=y
+CONFIG_EDAC_AMD64=m
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_I82975X=m
+CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I3200=m
+CONFIG_EDAC_IE31200=m
+CONFIG_EDAC_X38=m
+CONFIG_EDAC_I5400=m
+CONFIG_EDAC_I7CORE=m
+CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I7300=m
+CONFIG_EDAC_SBRIDGE=m
+CONFIG_EDAC_SKX=m
+CONFIG_EDAC_PND2=m
+CONFIG_EDAC_IGEN6=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1374_WDT=y
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV8803=m
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1343=m
+CONFIG_RTC_DRV_DS1347=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6916=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_PCF2123=m
+CONFIG_RTC_DRV_MCP795=m
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_CROS_EC=m
+CONFIG_DMADEVICES=y
+CONFIG_INTEL_IDMA64=m
+CONFIG_INTEL_IOATDMA=m
+CONFIG_AMD_PTDMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_DMATEST=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_MLX5_VFIO_PCI=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VBOXGUEST=m
+CONFIG_NITRO_ENCLAVES=m
+CONFIG_EFI_SECRET=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_VDPA=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MEM=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_VDPA=m
+CONFIG_VDPA_USER=m
+CONFIG_IFCVF=m
+CONFIG_MLX5_VDPA_NET=m
+CONFIG_VP_VDPA=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_VDPA=m
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XENFS=m
+CONFIG_XEN_PVCALLS_FRONTEND=m
+CONFIG_XEN_SCSI_BACKEND=m
+# CONFIG_XEN_SYMS is not set
+CONFIG_XEN_VIRTIO=y
+CONFIG_STAGING=y
+CONFIG_RTLLIB=m
+CONFIG_RTL8723BS=m
+CONFIG_R8712U=m
+CONFIG_STAGING_MEDIA=y
+CONFIG_INTEL_ATOMISP=y
+CONFIG_QLGE=m
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_ACPI=m
+CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_CHROMEOS_PSTORE=m
+CONFIG_CHROMEOS_TBMC=m
+CONFIG_CROS_EC=m
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_ISHTP=m
+CONFIG_CROS_EC_SPI=m
+CONFIG_CROS_EC_LPC=m
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CHROMEOS_PRIVACY_SCREEN=m
+CONFIG_WILCO_EC=m
+CONFIG_WILCO_EC_DEBUGFS=m
+CONFIG_WILCO_EC_EVENTS=m
+CONFIG_WILCO_EC_TELEMETRY=m
+CONFIG_MELLANOX_PLATFORM=y
+CONFIG_MLXREG_HOTPLUG=m
+CONFIG_MLXREG_IO=m
+CONFIG_MLXREG_LC=m
+CONFIG_NVSW_SN2201=m
+CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m
+CONFIG_GIGABYTE_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ACER_WIRELESS=m
+CONFIG_ACER_WMI=m
+CONFIG_AMD_PMF=m
+CONFIG_AMD_PMC=m
+CONFIG_AMD_HSMP=m
+CONFIG_APPLE_GMUX=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_ASUS_WIRELESS=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_ASUS_TF103C_DOCK=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_EEEPC_WMI=m
+CONFIG_X86_PLATFORM_DRIVERS_DELL=y
+CONFIG_DELL_WMI_PRIVACY=y
+# CONFIG_DELL_WMI_LED is not set
+CONFIG_AMILO_RFKILL=m
+CONFIG_FUJITSU_LAPTOP=m
+CONFIG_GPD_POCKET_FAN=m
+CONFIG_WIRELESS_HOTKEY=m
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_SENSORS_HDAPS=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_LMI=m
+CONFIG_INTEL_SAR_INT1092=m
+CONFIG_INTEL_SKL_INT3472=m
+CONFIG_INTEL_PMC_CORE=y
+CONFIG_INTEL_TELEMETRY=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
+CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+CONFIG_INTEL_HID_EVENT=m
+CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_OAKTRAIL=m
+CONFIG_INTEL_BXTWC_PMIC_TMU=m
+CONFIG_INTEL_ISHTP_ECLITE=m
+CONFIG_INTEL_PUNIT_IPC=m
+CONFIG_INTEL_VSEC=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_MSI_WMI=m
+CONFIG_PCENGINES_APU2=m
+CONFIG_BARCO_P50_GPIO=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_TOSHIBA_HAPS=m
+CONFIG_ACPI_CMPC=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SYSTEM76_ACPI=m
+CONFIG_SERIAL_MULTI_INSTANTIATE=m
+CONFIG_MLX_PLATFORM=m
+CONFIG_X86_ANDROID_TABLETS=m
+CONFIG_WINMATE_FM07_KEYS=m
+CONFIG_COMMON_CLK_SI544=m
+CONFIG_COMMON_CLK_TPS68470=m
+CONFIG_XILINX_VCU=m
+CONFIG_AMD_IOMMU=y
+CONFIG_INTEL_IOMMU=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+CONFIG_IRQ_REMAP=y
+CONFIG_VIRTIO_IOMMU=m
+CONFIG_RPMSG_CTRL=m
+CONFIG_RPMSG_VIRTIO=m
+CONFIG_SOUNDWIRE=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=m
+CONFIG_DEVFREQ_GOV_POWERSAVE=m
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+CONFIG_EXTCON_AXP288=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_USBC_CROS_EC=m
+CONFIG_MEMORY=y
+CONFIG_IIO=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
+CONFIG_MSA311=m
+CONFIG_AXP288_ADC=m
+CONFIG_ENVELOPE_DETECTOR=m
+CONFIG_MAX11205=m
+CONFIG_RICHTEK_RTQ6056=m
+CONFIG_SD_ADC_MODULATOR=m
+CONFIG_TI_ADS8344=m
+CONFIG_IIO_RESCALE=m
+CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+CONFIG_IIO_CROS_EC_SENSORS=m
+CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=m
+CONFIG_IIO_SSP_SENSORHUB=m
+CONFIG_LTC2688=m
+CONFIG_DPOT_DAC=m
+CONFIG_HID_SENSOR_GYRO_3D=m
+CONFIG_HID_SENSOR_HUMIDITY=m
+CONFIG_CM32181=m
+CONFIG_CM3605=m
+CONFIG_IIO_CROS_EC_LIGHT_PROX=m
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+CONFIG_LTRF216A=m
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+CONFIG_IIO_MUX=m
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+CONFIG_IIO_CROS_EC_BARO=m
+CONFIG_HID_SENSOR_PRESS=m
+CONFIG_SX9324=m
+CONFIG_SX9360=m
+CONFIG_HID_SENSOR_TEMP=m
+CONFIG_MAX31865=m
+CONFIG_NTB=m
+CONFIG_NTB_AMD=m
+CONFIG_NTB_INTEL=m
+CONFIG_NTB_SWITCHTEC=m
+CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_PERF=m
+CONFIG_NTB_TRANSPORT=m
+CONFIG_PWM=y
+CONFIG_PWM_CRC=y
+CONFIG_PWM_CROS_EC=m
+CONFIG_PWM_DWC=m
+CONFIG_PWM_LPSS_PCI=m
+CONFIG_PWM_LPSS_PLATFORM=m
+CONFIG_PWM_PCA9685=m
+CONFIG_RESET_TI_TPS380X=m
+CONFIG_INTEL_RAPL=m
+CONFIG_USB4=m
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_DEV_DAX=m
+CONFIG_NVMEM_RMEM=m
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_REISERFS_FS=m
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+CONFIG_XFS_ONLINE_SCRUB=y
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+# CONFIG_OCFS2_FS_STATS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+# CONFIG_F2FS_STAT_FS is not set
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_UNFAIR_RWSEM=y
+CONFIG_FS_DAX=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
+# CONFIG_DNOTIFY is not set
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_CACHEFILES=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
+CONFIG_NTFS_FS=m
+CONFIG_NTFS_RW=y
+CONFIG_NTFS3_FS=m
+CONFIG_NTFS3_LZX_XPRESS=y
+CONFIG_NTFS3_FS_POSIX_ACL=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_INODE64=y
+CONFIG_HUGETLBFS=y
+CONFIG_ORANGEFS_FS=m
+CONFIG_ECRYPT_FS=m
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RUBIN=y
+CONFIG_UBIFS_FS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_ROMFS_FS=m
+CONFIG_PSTORE_RAM=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+CONFIG_VBOXSF_FS=m
+CONFIG_NFS_FS=m
+CONFIG_NFS_V4=m
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_NFS_FSCACHE=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+CONFIG_CIFS_FSCACHE=y
+CONFIG_SMB_SERVER=m
+CONFIG_SMB_SERVER_SMBDIRECT=y
+CONFIG_CODA_FS=m
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_DLM=m
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_FORTIFY_SOURCE=y
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_LANDLOCK=y
+# CONFIG_INTEGRITY is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity"
+CONFIG_GCC_PLUGIN_STACKLEAK=y
+CONFIG_STACKLEAK_RUNTIME_DISABLE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_ZERO_CALL_USED_REGS=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_HCTR2=m
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+# CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
+CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
+CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
+CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
+CONFIG_CRYPTO_NHPOLY1305_SSE2=m
+CONFIG_CRYPTO_NHPOLY1305_AVX2=m
+CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+CONFIG_CRYPTO_DEV_QAT_C3XXX=m
+CONFIG_CRYPTO_DEV_QAT_C62X=m
+CONFIG_CRYPTO_DEV_QAT_4XXX=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
+CONFIG_CRYPTO_DEV_QAT_C62XVF=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_SIGNED_PE_FILE_VERIFICATION=y
+CONFIG_SECONDARY_TRUSTED_KEYRING=y
+CONFIG_CRC_T10DIF=y
+CONFIG_XZ_DEC_MICROLZMA=y
+CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_QUIET=3
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_INFO_DWARF5=y
+CONFIG_DEBUG_INFO_BTF=y
+CONFIG_FRAME_WARN=1280
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_SLUB_DEBUG is not set
+CONFIG_DEBUG_KMEMLEAK=y
+CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
+CONFIG_KFENCE=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+# CONFIG_DETECT_HUNG_TASK is not set
+CONFIG_DEBUG_LIST=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+CONFIG_LATENCYTOP=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_MMIOTRACE=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_IO_STRICT_DEVMEM=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+# CONFIG_EARLY_PRINTK is not set
+CONFIG_X86_DECODER_SELFTEST=y
+CONFIG_DEBUG_NMI_SELFTEST=y
+# CONFIG_RUNTIME_TESTING_MENU is not set
diff --git a/main/linux-lts/virt.aarch64.config b/main/linux-lts/virt.aarch64.config
new file mode 100644
index 00000000000..beae57a663f
--- /dev/null
+++ b/main/linux-lts/virt.aarch64.config
@@ -0,0 +1,1090 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_USELIB=y
+CONFIG_AUDIT=y
+CONFIG_NO_HZ_FULL=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_PREEMPT_DYNAMIC=y
+CONFIG_SCHED_CORE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_MEMCG=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+# CONFIG_PROC_PID_CPUSET is not set
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_NAMESPACES=y
+CONFIG_USER_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+# CONFIG_SYSFS_SYSCALL is not set
+CONFIG_KALLSYMS_ALL=y
+CONFIG_PROFILING=y
+CONFIG_KEXEC=y
+CONFIG_ARCH_ALPINE=y
+CONFIG_ARCH_HISI=y
+CONFIG_ARCH_QCOM=y
+CONFIG_ARCH_SEATTLE=y
+CONFIG_ARCH_THUNDER=y
+CONFIG_ARCH_THUNDER2=y
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARCH_XGENE=y
+CONFIG_ARM64_VA_BITS_48=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
+CONFIG_NR_CPUS=4096
+CONFIG_NUMA=y
+CONFIG_NODES_SHIFT=2
+CONFIG_HZ_100=y
+CONFIG_COMPAT=y
+CONFIG_ARMV8_DEPRECATED=y
+CONFIG_SWP_EMULATION=y
+CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
+CONFIG_HIBERNATION=y
+# CONFIG_HIBERNATION_SNAPSHOT_DEV is not set
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_ACPI_CPPC_CPUFREQ=y
+CONFIG_ACPI=y
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_TINY_POWER_BUTTON=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_THERMAL=m
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=y
+CONFIG_KPROBES=y
+CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
+CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_SHA256=y
+CONFIG_MODULE_COMPRESS_GZIP=y
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_IOSCHED_BFQ=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_ZSWAP=y
+CONFIG_Z3FOLD=m
+CONFIG_ZSMALLOC=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_KSM=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+CONFIG_NET=y
+CONFIG_PACKET=m
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_STATISTICS=y
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_XDP_SOCKETS=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=m
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_MPTCP=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NF_FLOW_TABLE_PROCFS=y
+CONFIG_NETFILTER_XT_SET=m
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_PE_SIP=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_L2TP=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_LLC2=m
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+CONFIG_OPENVSWITCH=m
+CONFIG_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_HYPERV_VSOCKETS=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_NET_PKTGEN=m
+# CONFIG_WIRELESS is not set
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_PCI=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCI_STUB=m
+CONFIG_PCI_PF_STUB=m
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+CONFIG_PCI_HYPERV=m
+# CONFIG_VGA_ARB is not set
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_PCI_HOST_THUNDER_PEM=y
+CONFIG_PCI_HOST_THUNDER_ECAM=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCI_XGENE=y
+CONFIG_PCI_HISI=y
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DEVTMPFS_SAFE=y
+CONFIG_FW_LOADER=m
+CONFIG_FW_LOADER_USER_HELPER=y
+CONFIG_CONNECTOR=y
+CONFIG_ARM_SCPI_PROTOCOL=m
+CONFIG_DMI_SYSFS=m
+CONFIG_FW_CFG_SYSFS=m
+CONFIG_SYSFB_SIMPLEFB=y
+CONFIG_EFI_VARS_PSTORE=m
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_EFI_ZBOOT=y
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
+# CONFIG_ARM_SMCCC_SOC_ID is not set
+CONFIG_MTD=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_CFI=m
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_PHYSMAP=m
+CONFIG_MTD_UBI=m
+CONFIG_OF_OVERLAY=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZ4=y
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_DRBD=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+CONFIG_RAID_ATTRS=m
+CONFIG_BLK_DEV_SD=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_ISCSI_TCP=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_SCSI_EFCT=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_ATA=m
+CONFIG_SATA_AHCI=m
+CONFIG_ATA_PIIX=m
+CONFIG_ATA_GENERIC=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+# CONFIG_MD_AUTODETECT is not set
+CONFIG_MD_LINEAR=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_MD_CLUSTER=m
+CONFIG_BCACHE=m
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_ERA=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_FEC=y
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_TARGET_CORE=m
+CONFIG_NETDEVICES=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_AGERE is not set
+# CONFIG_NET_VENDOR_ALACRITECH is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
+CONFIG_ENA_ETHERNET=m
+# CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_VENDOR_AQUANTIA is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CADENCE is not set
+# CONFIG_NET_VENDOR_CAVIUM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_NET_VENDOR_CORTINA is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_EZCHIP is not set
+CONFIG_GVE=m
+# CONFIG_NET_VENDOR_HISILICON is not set
+# CONFIG_NET_VENDOR_HUAWEI is not set
+# CONFIG_NET_VENDOR_I825XX is not set
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IXGBEVF=m
+# CONFIG_NET_VENDOR_LITEX is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+CONFIG_MLX4_EN=m
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_CORE_EN=y
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_MICROSOFT is not set
+# CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_NET_VENDOR_NI is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NETERION is not set
+# CONFIG_NET_VENDOR_NETRONOME is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
+# CONFIG_NET_VENDOR_REALTEK is not set
+# CONFIG_NET_VENDOR_RENESAS is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+# CONFIG_NET_VENDOR_XILINX is not set
+CONFIG_PHYLIB=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+# CONFIG_USB_NET_DRIVERS is not set
+# CONFIG_WLAN is not set
+CONFIG_VMXNET3=m
+CONFIG_HYPERV_NET=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_SERIO_SERPORT=m
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LEGACY_TIOCSTI is not set
+# CONFIG_LDISC_AUTOLOAD is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_VIRTIO=m
+# CONFIG_DEVPORT is not set
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_PINCTRL=m
+# CONFIG_I2C_HELPER_AUTO is not set
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOPCF=m
+CONFIG_I2C_ALGOPCA=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_VIRTIO=m
+CONFIG_PTP_1588_CLOCK=m
+CONFIG_DP83640_PHY=m
+CONFIG_GPIO_PL061=m
+CONFIG_POWER_RESET_VEXPRESS=y
+CONFIG_HWMON=m
+CONFIG_SENSORS_ACPI_POWER=m
+# CONFIG_THERMAL_OF is not set
+CONFIG_HISI_THERMAL=m
+# CONFIG_MFD_VEXPRESS_SYSREG is not set
+CONFIG_DRM=m
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_SIMPLEDRM=m
+CONFIG_DRM_HYPERV=m
+CONFIG_FB=m
+CONFIG_FB_TILEBLITTING=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_USB=m
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_MON=m
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_UAS=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_EFI=y
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_PL031=y
+CONFIG_DMADEVICES=y
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_VDPA=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MEM=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_VDPA=m
+CONFIG_VDPA_USER=m
+CONFIG_IFCVF=m
+CONFIG_VP_VDPA=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_VDPA=m
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+# CONFIG_SURFACE_PLATFORMS is not set
+# CONFIG_CLK_VEXPRESS_OSC is not set
+# CONFIG_COMMON_CLK_XGENE is not set
+# CONFIG_COMMON_CLK_HI3516CV300 is not set
+# CONFIG_COMMON_CLK_HI3519 is not set
+# CONFIG_COMMON_CLK_HI3559A is not set
+# CONFIG_COMMON_CLK_HI3660 is not set
+# CONFIG_COMMON_CLK_HI3798CV200 is not set
+# CONFIG_COMMON_CLK_HI6220 is not set
+CONFIG_ARM_MHU=m
+CONFIG_XGENE_SLIMPRO_MBOX=m
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+CONFIG_ARM_SMMU=y
+CONFIG_ARM_SMMU_V3=y
+CONFIG_VIRTIO_IOMMU=m
+CONFIG_RPMSG_VIRTIO=m
+CONFIG_PWM=y
+CONFIG_RESET_CONTROLLER=y
+CONFIG_COMMON_RESET_HI6220=m
+# CONFIG_ARM_PMU is not set
+CONFIG_LIBNVDIMM=y
+CONFIG_NVMEM_RMEM=m
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_REISERFS_FS=m
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+CONFIG_XFS_ONLINE_SCRUB=y
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_UNFAIR_RWSEM=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
+# CONFIG_DNOTIFY is not set
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_CACHEFILES=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
+CONFIG_NTFS_FS=m
+CONFIG_NTFS_RW=y
+CONFIG_NTFS3_FS=m
+CONFIG_NTFS3_LZX_XPRESS=y
+CONFIG_NTFS3_FS_POSIX_ACL=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_INODE64=y
+CONFIG_HUGETLBFS=y
+CONFIG_ECRYPT_FS=m
+CONFIG_CRAMFS=m
+# CONFIG_CRAMFS_BLOCKDEV is not set
+# CONFIG_CRAMFS_MTD is not set
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
+CONFIG_ROMFS_FS=m
+CONFIG_PSTORE_RAM=m
+CONFIG_NFS_FS=m
+CONFIG_NFS_V4=m
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_NFS_FSCACHE=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+CONFIG_CIFS_FSCACHE=y
+CONFIG_SMB_SERVER=m
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_DLM=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_SECURITY_LANDLOCK=y
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity"
+CONFIG_GCC_PLUGIN_STACKLEAK=y
+CONFIG_STACKLEAK_RUNTIME_DISABLE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_ZERO_CALL_USED_REGS=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_HCTR2=m
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+# CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
+CONFIG_CRYPTO_NHPOLY1305_NEON=m
+CONFIG_CRYPTO_GHASH_ARM64_CE=m
+CONFIG_CRYPTO_SHA1_ARM64_CE=m
+CONFIG_CRYPTO_SHA2_ARM64_CE=m
+CONFIG_CRYPTO_SHA512_ARM64_CE=m
+CONFIG_CRYPTO_SHA3_ARM64=m
+CONFIG_CRYPTO_SM3_NEON=m
+CONFIG_CRYPTO_SM3_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
+CONFIG_CRYPTO_AES_ARM64_BS=m
+CONFIG_CRYPTO_SM4_ARM64_CE=m
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
+CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CAVIUM_CPT=m
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_SECONDARY_TRUSTED_KEYRING=y
+CONFIG_CORDIC=m
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC7=m
+CONFIG_CRC8=m
+CONFIG_IRQ_POLL=y
+CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_QUIET=3
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_INFO_DWARF5=y
+CONFIG_DEBUG_INFO_BTF=y
+CONFIG_FRAME_WARN=1280
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_SLUB_DEBUG is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_KFENCE=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+CONFIG_SCHEDSTATS=y
+CONFIG_DEBUG_LIST=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_IO_STRICT_DEVMEM=y
+# CONFIG_RUNTIME_TESTING_MENU is not set
diff --git a/main/linux-lts/virt.armv7.config b/main/linux-lts/virt.armv7.config
new file mode 100644
index 00000000000..ba095005772
--- /dev/null
+++ b/main/linux-lts/virt.armv7.config
@@ -0,0 +1,1026 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_USELIB=y
+CONFIG_AUDIT=y
+CONFIG_NO_HZ_FULL=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_SCHED_CORE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_MEMCG=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
+# CONFIG_PROC_PID_CPUSET is not set
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_NAMESPACES=y
+CONFIG_USER_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+# CONFIG_SYSFS_SYSCALL is not set
+CONFIG_KALLSYMS_ALL=y
+CONFIG_PROFILING=y
+CONFIG_ARCH_VIRT=y
+CONFIG_ARCH_ALPINE=y
+CONFIG_ARCH_HISI=y
+CONFIG_ARCH_QCOM=y
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARM_LPAE=y
+# CONFIG_DEBUG_ALIGN_RODATA is not set
+CONFIG_SMP=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
+CONFIG_NR_CPUS=32
+CONFIG_HIGHMEM=y
+CONFIG_PARAVIRT=y
+CONFIG_EFI=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_ARM_CPUIDLE=y
+CONFIG_VFP=y
+CONFIG_NEON=y
+CONFIG_KERNEL_MODE_NEON=y
+CONFIG_HIBERNATION=y
+# CONFIG_HIBERNATION_SNAPSHOT_DEV is not set
+CONFIG_KPROBES=y
+CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_SHA256=y
+CONFIG_MODULE_COMPRESS_GZIP=y
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_IOSCHED_BFQ=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_ZSWAP=y
+CONFIG_Z3FOLD=m
+CONFIG_ZSMALLOC=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_KSM=y
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+CONFIG_NET=y
+CONFIG_PACKET=m
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_STATISTICS=y
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_XDP_SOCKETS=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=m
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_MPTCP=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NF_FLOW_TABLE_PROCFS=y
+CONFIG_NETFILTER_XT_SET=m
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_PE_SIP=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_L2TP=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_LLC2=m
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+CONFIG_OPENVSWITCH=m
+CONFIG_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_NET_PKTGEN=m
+# CONFIG_WIRELESS is not set
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCI_STUB=m
+CONFIG_PCI_PF_STUB=m
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+# CONFIG_VGA_ARB is not set
+CONFIG_HOTPLUG_PCI=y
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DEVTMPFS_SAFE=y
+CONFIG_FW_LOADER=m
+CONFIG_FW_LOADER_USER_HELPER=y
+CONFIG_CONNECTOR=y
+CONFIG_ARM_SCPI_PROTOCOL=m
+CONFIG_DMI_SYSFS=m
+CONFIG_SYSFB_SIMPLEFB=y
+CONFIG_EFI_VARS_PSTORE=m
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_MTD=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_CFI=m
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_PHYSMAP=m
+CONFIG_MTD_UBI=m
+CONFIG_OF_OVERLAY=y
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZ4=y
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_DRBD=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+CONFIG_RAID_ATTRS=m
+CONFIG_BLK_DEV_SD=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_ISCSI_TCP=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_SCSI_EFCT=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_ATA=m
+CONFIG_SATA_AHCI=m
+CONFIG_ATA_PIIX=m
+CONFIG_ATA_GENERIC=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+# CONFIG_MD_AUTODETECT is not set
+CONFIG_MD_LINEAR=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_MD_CLUSTER=m
+CONFIG_BCACHE=m
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_ERA=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_FEC=y
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_TARGET_CORE=m
+CONFIG_NETDEVICES=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_AGERE is not set
+# CONFIG_NET_VENDOR_ALACRITECH is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
+# CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_VENDOR_AQUANTIA is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CADENCE is not set
+# CONFIG_NET_VENDOR_CAVIUM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_NET_VENDOR_CORTINA is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_EZCHIP is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_HISILICON is not set
+# CONFIG_NET_VENDOR_HUAWEI is not set
+# CONFIG_NET_VENDOR_I825XX is not set
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IXGBEVF=m
+# CONFIG_NET_VENDOR_LITEX is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_MICROSOFT is not set
+# CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_NET_VENDOR_NI is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NETERION is not set
+# CONFIG_NET_VENDOR_NETRONOME is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
+# CONFIG_NET_VENDOR_REALTEK is not set
+# CONFIG_NET_VENDOR_RENESAS is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+# CONFIG_NET_VENDOR_XILINX is not set
+CONFIG_PHYLIB=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+# CONFIG_USB_NET_DRIVERS is not set
+# CONFIG_WLAN is not set
+CONFIG_VMXNET3=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_SERIO_SERPORT=m
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LEGACY_TIOCSTI is not set
+# CONFIG_LDISC_AUTOLOAD is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_VIRTIO=m
+# CONFIG_DEVPORT is not set
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_PINCTRL=m
+# CONFIG_I2C_HELPER_AUTO is not set
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOPCF=m
+CONFIG_I2C_ALGOPCA=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_VIRTIO=m
+CONFIG_PTP_1588_CLOCK=m
+CONFIG_DP83640_PHY=m
+CONFIG_GPIO_PL061=y
+CONFIG_GPIO_VIRTIO=m
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
+CONFIG_HWMON=m
+CONFIG_THERMAL=y
+# CONFIG_THERMAL_OF is not set
+CONFIG_HISI_THERMAL=m
+CONFIG_DRM=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_SIMPLEDRM=m
+CONFIG_FB=m
+CONFIG_FB_TILEBLITTING=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_USB=m
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_MON=m
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_UAS=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_EFI=y
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_PL031=y
+CONFIG_DMADEVICES=y
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_VDPA=m
+CONFIG_VIRTIO_PMEM=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_VDPA=m
+CONFIG_VDPA_USER=m
+CONFIG_IFCVF=m
+CONFIG_VP_VDPA=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_VDPA=m
+# CONFIG_CLK_SP810 is not set
+# CONFIG_CLK_VEXPRESS_OSC is not set
+# CONFIG_COMMON_CLK_HI3516CV300 is not set
+# CONFIG_COMMON_CLK_HI3519 is not set
+# CONFIG_COMMON_CLK_HI3660 is not set
+# CONFIG_COMMON_CLK_HI3798CV200 is not set
+# CONFIG_COMMON_CLK_HI6220 is not set
+CONFIG_MAILBOX=y
+CONFIG_ARM_MHU=m
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+CONFIG_ARM_SMMU=y
+CONFIG_RPMSG_VIRTIO=m
+CONFIG_PWM=y
+CONFIG_COMMON_RESET_HI6220=m
+# CONFIG_ARM_PMU is not set
+CONFIG_LIBNVDIMM=y
+CONFIG_NVMEM_RMEM=m
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_REISERFS_FS=m
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+CONFIG_XFS_ONLINE_SCRUB=y
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_UNFAIR_RWSEM=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
+# CONFIG_DNOTIFY is not set
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_CACHEFILES=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
+CONFIG_NTFS_FS=m
+CONFIG_NTFS_RW=y
+CONFIG_NTFS3_FS=m
+CONFIG_NTFS3_LZX_XPRESS=y
+CONFIG_NTFS3_FS_POSIX_ACL=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_ECRYPT_FS=m
+CONFIG_CRAMFS=m
+# CONFIG_CRAMFS_BLOCKDEV is not set
+# CONFIG_CRAMFS_MTD is not set
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
+CONFIG_ROMFS_FS=m
+CONFIG_PSTORE=y
+CONFIG_PSTORE_RAM=m
+CONFIG_NFS_FS=m
+CONFIG_NFS_V4=m
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_NFS_FSCACHE=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+CONFIG_CIFS_FSCACHE=y
+CONFIG_SMB_SERVER=m
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_DLM=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_SECURITY_LANDLOCK=y
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity"
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_ZERO_CALL_USED_REGS=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_HCTR2=m
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+# CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
+CONFIG_CRYPTO_SHA1_ARM=m
+CONFIG_CRYPTO_SHA256_ARM=m
+CONFIG_CRYPTO_SHA512_ARM=m
+CONFIG_CRYPTO_AES_ARM=m
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_SECONDARY_TRUSTED_KEYRING=y
+CONFIG_CORDIC=m
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC7=m
+CONFIG_CRC8=m
+CONFIG_IRQ_POLL=y
+CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_QUIET=3
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_INFO_DWARF5=y
+CONFIG_FRAME_WARN=1280
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_SLUB_DEBUG is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+CONFIG_SCHEDSTATS=y
+CONFIG_DEBUG_LIST=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_IO_STRICT_DEVMEM=y
+# CONFIG_RUNTIME_TESTING_MENU is not set
diff --git a/main/linux-lts/virt.ppc64le.config b/main/linux-lts/virt.ppc64le.config
new file mode 100644
index 00000000000..31471bd4b91
--- /dev/null
+++ b/main/linux-lts/virt.ppc64le.config
@@ -0,0 +1,1017 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_USELIB=y
+CONFIG_AUDIT=y
+CONFIG_NO_HZ_FULL=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_SCHED_CORE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_MEMCG=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+# CONFIG_PROC_PID_CPUSET is not set
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_NAMESPACES=y
+CONFIG_USER_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+# CONFIG_SGETMASK_SYSCALL is not set
+# CONFIG_SYSFS_SYSCALL is not set
+# CONFIG_PCSPKR_PLATFORM is not set
+CONFIG_KALLSYMS_ALL=y
+CONFIG_PROFILING=y
+CONFIG_KEXEC=y
+CONFIG_PPC64=y
+CONFIG_POWER8_CPU=y
+CONFIG_NR_CPUS=4096
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_COMPAT=y
+# CONFIG_PPC_POWERNV is not set
+# CONFIG_PPC_SPLPAR is not set
+CONFIG_PSERIES_ENERGY=m
+CONFIG_PPC_SVM=y
+CONFIG_KVM_GUEST=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_HALTPOLL=y
+CONFIG_HZ_100=y
+CONFIG_PPC_TRANSACTIONAL_MEM=y
+# CONFIG_PPC_QUEUED_SPINLOCKS is not set
+CONFIG_PPC64_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_IRQ_ALL_CPUS=y
+CONFIG_PPC_SUBPAGE_PROT=y
+CONFIG_SCHED_SMT=y
+CONFIG_HIBERNATION=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM_BOOK3S_64=m
+CONFIG_KPROBES=y
+CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_SHA256=y
+CONFIG_MODULE_COMPRESS_GZIP=y
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_IOSCHED_BFQ=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_ZSWAP=y
+CONFIG_Z3FOLD=m
+CONFIG_ZSMALLOC=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_KSM=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_MEM_SOFT_DIRTY=y
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+CONFIG_NET=y
+CONFIG_PACKET=m
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_STATISTICS=y
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_XDP_SOCKETS=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=m
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_MPTCP=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NF_FLOW_TABLE_PROCFS=y
+CONFIG_NETFILTER_XT_SET=m
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_PE_SIP=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_L2TP=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_LLC2=m
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+CONFIG_OPENVSWITCH=m
+CONFIG_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_NET_PKTGEN=m
+# CONFIG_WIRELESS is not set
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCI_STUB=m
+CONFIG_PCI_PF_STUB=m
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+# CONFIG_VGA_ARB is not set
+CONFIG_HOTPLUG_PCI=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DEVTMPFS_SAFE=y
+CONFIG_FW_LOADER=m
+CONFIG_FW_LOADER_USER_HELPER=y
+CONFIG_CONNECTOR=y
+CONFIG_MTD=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_CFI=m
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_PHYSMAP=m
+CONFIG_MTD_UBI=m
+CONFIG_OF_OVERLAY=y
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZ4=y
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_DRBD=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_IBMVMC=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+CONFIG_RAID_ATTRS=m
+CONFIG_BLK_DEV_SD=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_ISCSI_TCP=m
+CONFIG_SCSI_IBMVSCSI=m
+CONFIG_SCSI_IBMVFC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_ATA=m
+CONFIG_SATA_AHCI=m
+CONFIG_ATA_PIIX=m
+CONFIG_ATA_GENERIC=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+# CONFIG_MD_AUTODETECT is not set
+CONFIG_MD_LINEAR=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_MD_CLUSTER=m
+CONFIG_BCACHE=m
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_ERA=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_FEC=y
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_TARGET_CORE=m
+CONFIG_NETDEVICES=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_AGERE is not set
+# CONFIG_NET_VENDOR_ALACRITECH is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
+CONFIG_ENA_ETHERNET=m
+# CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_VENDOR_AQUANTIA is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CADENCE is not set
+# CONFIG_NET_VENDOR_CAVIUM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_NET_VENDOR_CORTINA is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_EZCHIP is not set
+# CONFIG_NET_VENDOR_HUAWEI is not set
+# CONFIG_NET_VENDOR_I825XX is not set
+# CONFIG_NET_VENDOR_IBM is not set
+CONFIG_E1000=m
+CONFIG_IXGBEVF=m
+# CONFIG_NET_VENDOR_LITEX is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_MICROSOFT is not set
+# CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_NET_VENDOR_NI is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NETERION is not set
+# CONFIG_NET_VENDOR_NETRONOME is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
+# CONFIG_NET_VENDOR_REALTEK is not set
+# CONFIG_NET_VENDOR_RENESAS is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+# CONFIG_NET_VENDOR_XILINX is not set
+CONFIG_PHYLIB=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+# CONFIG_USB_NET_DRIVERS is not set
+# CONFIG_WLAN is not set
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_SERIO_SERPORT=m
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LEGACY_TIOCSTI is not set
+# CONFIG_LDISC_AUTOLOAD is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_HVC_CONSOLE=y
+CONFIG_HVCS=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_IBM_BSR=m
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+# CONFIG_DEVPORT is not set
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_PINCTRL=m
+# CONFIG_I2C_HELPER_AUTO is not set
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOPCF=m
+CONFIG_I2C_ALGOPCA=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_VIRTIO=m
+CONFIG_PTP_1588_CLOCK=m
+CONFIG_DP83640_PHY=m
+CONFIG_PINCTRL=y
+CONFIG_GPIOLIB=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_SUPPLY=y
+CONFIG_HWMON=m
+CONFIG_THERMAL=y
+# CONFIG_THERMAL_OF is not set
+CONFIG_DRM=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_SIMPLEDRM=m
+CONFIG_FB=m
+CONFIG_FB_TILEBLITTING=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_USB=m
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_MON=m
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_UAS=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_GENERIC=m
+CONFIG_DMADEVICES=y
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_VDPA=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_VDPA=m
+CONFIG_VDPA_USER=m
+CONFIG_IFCVF=m
+CONFIG_VP_VDPA=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST_VDPA=m
+CONFIG_MAILBOX=y
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+CONFIG_RPMSG_VIRTIO=m
+CONFIG_PWM=y
+CONFIG_RESET_CONTROLLER=y
+CONFIG_LIBNVDIMM=y
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_REISERFS_FS=m
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+CONFIG_XFS_ONLINE_SCRUB=y
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_UNFAIR_RWSEM=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
+# CONFIG_DNOTIFY is not set
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_CACHEFILES=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
+CONFIG_NTFS_FS=m
+CONFIG_NTFS3_FS=m
+CONFIG_NTFS3_LZX_XPRESS=y
+CONFIG_NTFS3_FS_POSIX_ACL=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_INODE64=y
+CONFIG_HUGETLBFS=y
+CONFIG_ECRYPT_FS=m
+CONFIG_CRAMFS=m
+# CONFIG_CRAMFS_BLOCKDEV is not set
+# CONFIG_CRAMFS_MTD is not set
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
+CONFIG_ROMFS_FS=m
+CONFIG_PSTORE=y
+CONFIG_PSTORE_RAM=m
+CONFIG_NFS_FS=m
+CONFIG_NFS_V4=m
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_NFS_FSCACHE=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+CONFIG_CIFS_FSCACHE=y
+CONFIG_SMB_SERVER=m
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_DLM=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_SECURITY_LANDLOCK=y
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity"
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_ZERO_CALL_USED_REGS=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_HCTR2=m
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+# CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
+CONFIG_CRYPTO_CRC32C_VPMSUM=m
+CONFIG_CRYPTO_CRCT10DIF_VPMSUM=m
+CONFIG_CRYPTO_MD5_PPC=m
+CONFIG_CRYPTO_SHA1_PPC=m
+CONFIG_CRYPTO_DEV_NX=y
+CONFIG_CRYPTO_DEV_NX_COMPRESS=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_SECONDARY_TRUSTED_KEYRING=y
+CONFIG_CORDIC=m
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC7=m
+CONFIG_CRC8=m
+CONFIG_IRQ_POLL=y
+CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_QUIET=3
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_FRAME_WARN=1280
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_SLUB_DEBUG is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_SCHEDSTATS=y
+CONFIG_DEBUG_LIST=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_IO_STRICT_DEVMEM=y
+# CONFIG_RUNTIME_TESTING_MENU is not set
diff --git a/main/linux-lts/virt.x86.config b/main/linux-lts/virt.x86.config
new file mode 100644
index 00000000000..f060ccb5b34
--- /dev/null
+++ b/main/linux-lts/virt.x86.config
@@ -0,0 +1,1059 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_AUDIT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_SCHED_CORE=y
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_MEMCG=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_BPF=y
+CONFIG_NAMESPACES=y
+CONFIG_USER_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+# CONFIG_SGETMASK_SYSCALL is not set
+# CONFIG_SYSFS_SYSCALL is not set
+# CONFIG_PCSPKR_PLATFORM is not set
+CONFIG_PROFILING=y
+# CONFIG_64BIT is not set
+CONFIG_SMP=y
+# CONFIG_X86_MPPARSE is not set
+CONFIG_X86_BIGSMP=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT_SPINLOCKS=y
+CONFIG_XEN=y
+CONFIG_XEN_PVH=y
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_X86_GENERIC=y
+CONFIG_HPET_TIMER=y
+CONFIG_NR_CPUS=64
+# CONFIG_X86_MCE is not set
+# CONFIG_PERF_EVENTS_INTEL_RAPL is not set
+# CONFIG_PERF_EVENTS_INTEL_CSTATE is not set
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+CONFIG_HIGHMEM64G=y
+CONFIG_X86_INTEL_TSX_MODE_AUTO=y
+CONFIG_HZ_100=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
+# CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set
+CONFIG_ACPI_EC_DEBUGFS=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_TINY_POWER_BUTTON=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_ERST_DEBUG=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+CONFIG_X86_AMD_PSTATE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_PCI_CNB20LE_QUIRK=y
+CONFIG_SCx200=m
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KPROBES=y
+CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
+CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SIG=y
+CONFIG_MODULE_SIG_SHA256=y
+CONFIG_MODULE_COMPRESS_GZIP=y
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BLK_CGROUP_IOLATENCY=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_IOSCHED_BFQ=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_ZSWAP=y
+CONFIG_ZSMALLOC=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_NET=y
+CONFIG_PACKET=m
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_STATISTICS=y
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_XDP_SOCKETS=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=y
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=m
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_MPTCP=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NF_FLOW_TABLE_PROCFS=y
+CONFIG_NETFILTER_XT_SET=m
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_PE_SIP=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_L2TP=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_LLC2=m
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+CONFIG_DNS_RESOLVER=y
+CONFIG_OPENVSWITCH=m
+CONFIG_VSOCKETS=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_HYPERV_VSOCKETS=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_NET_PKTGEN=m
+# CONFIG_WIRELESS is not set
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_XEN=m
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_PCI=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_STUB=m
+# CONFIG_VGA_ARB is not set
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DEVTMPFS_SAFE=y
+# CONFIG_STANDALONE is not set
+CONFIG_FW_LOADER=m
+CONFIG_CONNECTOR=y
+CONFIG_FW_CFG_SYSFS=m
+CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+CONFIG_BLK_DEV_FD=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZ4=y
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_DRBD=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_VMWARE_VMCI=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+CONFIG_RAID_ATTRS=m
+CONFIG_BLK_DEV_SD=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_ISCSI_TCP=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_VMWARE_PVSCSI=y
+CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_ATA=y
+CONFIG_SATA_AHCI=y
+CONFIG_ATA_PIIX=y
+CONFIG_ATA_GENERIC=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+# CONFIG_MD_AUTODETECT is not set
+CONFIG_MD_LINEAR=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BCACHE=m
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_FEC=y
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_CTL=m
+CONFIG_NETDEVICES=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_AGERE is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
+CONFIG_ENA_ETHERNET=m
+# CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CADENCE is not set
+# CONFIG_NET_VENDOR_CAVIUM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_NET_VENDOR_CORTINA is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_EZCHIP is not set
+CONFIG_GVE=m
+# CONFIG_NET_VENDOR_I825XX is not set
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IXGBEVF=m
+CONFIG_I40EVF=m
+# CONFIG_NET_VENDOR_LITEX is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+CONFIG_MLX4_EN=m
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_CORE_EN=y
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_MICROSOFT is not set
+# CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_NET_VENDOR_NI is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NETERION is not set
+# CONFIG_NET_VENDOR_NETRONOME is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
+# CONFIG_NET_VENDOR_REALTEK is not set
+# CONFIG_NET_VENDOR_RENESAS is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_PHYLIB=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+# CONFIG_USB_NET_DRIVERS is not set
+# CONFIG_WLAN is not set
+CONFIG_VMXNET3=m
+CONFIG_HYPERV_NET=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_EVDEV=m
+CONFIG_MOUSE_PS2=m
+# CONFIG_MOUSE_PS2_ALPS is not set
+# CONFIG_MOUSE_PS2_BYD is not set
+# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
+# CONFIG_MOUSE_PS2_CYPRESS is not set
+# CONFIG_MOUSE_PS2_LIFEBOOK is not set
+# CONFIG_MOUSE_PS2_TRACKPOINT is not set
+# CONFIG_MOUSE_PS2_FOCALTECH is not set
+CONFIG_MOUSE_PS2_VMMOUSE=y
+# CONFIG_SERIO_SERPORT is not set
+CONFIG_SERIO_PCIPS2=m
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LEGACY_TIOCSTI is not set
+# CONFIG_LDISC_AUTOLOAD is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+# CONFIG_SERIAL_8250_LPSS is not set
+# CONFIG_SERIAL_8250_MID is not set
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_TIMBERDALE=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_PCH_UART=m
+CONFIG_VIRTIO_CONSOLE=y
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_AMD is not set
+# CONFIG_HW_RANDOM_GEODE is not set
+# CONFIG_HW_RANDOM_VIA is not set
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+CONFIG_HPET=y
+# CONFIG_HPET_MMAP_DEFAULT is not set
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_VIRTIO=m
+CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_HWMON=m
+CONFIG_SENSORS_ACPI_POWER=m
+# CONFIG_X86_PKG_TEMP_THERMAL is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+CONFIG_WATCHDOG_SYSFS=y
+CONFIG_I6300ESB_WDT=m
+CONFIG_RC_CORE=y
+CONFIG_DRM=m
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_SIMPLEDRM=m
+CONFIG_DRM_XEN_FRONTEND=m
+CONFIG_DRM_VBOXVIDEO=m
+CONFIG_DRM_HYPERV=m
+CONFIG_FB=m
+CONFIG_FB_TILEBLITTING=y
+CONFIG_SOUND=y
+CONFIG_SND=m
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_GENERIC=m
+# CONFIG_SND_USB is not set
+CONFIG_SND_VIRTIO=m
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_USB=m
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+# CONFIG_USB_DEFAULT_PERSIST is not set
+CONFIG_USB_MON=m
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_XEN_HCD=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_UAS=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+CONFIG_DMADEVICES=y
+CONFIG_PCH_DMA=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VBOXGUEST=m
+CONFIG_NITRO_ENCLAVES=m
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_VDPA=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_VDPA=m
+CONFIG_VDPA_USER=m
+CONFIG_IFCVF=m
+CONFIG_VP_VDPA=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_VDPA=m
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+CONFIG_XEN_VIRTIO=y
+# CONFIG_SURFACE_PLATFORMS is not set
+# CONFIG_X86_PLATFORM_DEVICES is not set
+CONFIG_INTEL_IOMMU=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+CONFIG_VIRTIO_IOMMU=m
+CONFIG_RPMSG_VIRTIO=m
+CONFIG_MEMORY=y
+CONFIG_NVMEM_RMEM=m
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_REISERFS_FS=m
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+CONFIG_XFS_ONLINE_SCRUB=y
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_UNFAIR_RWSEM=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
+# CONFIG_DNOTIFY is not set
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_CACHEFILES=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
+CONFIG_NTFS_FS=m
+CONFIG_NTFS_RW=y
+CONFIG_NTFS3_FS=m
+CONFIG_NTFS3_LZX_XPRESS=y
+CONFIG_NTFS3_FS_POSIX_ACL=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_CONFIGFS_FS=m
+CONFIG_ECRYPT_FS=m
+CONFIG_EFS_FS=m
+CONFIG_CRAMFS=m
+# CONFIG_CRAMFS_BLOCKDEV is not set
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
+CONFIG_ROMFS_FS=m
+CONFIG_PSTORE_RAM=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+CONFIG_VBOXSF_FS=m
+CONFIG_NFS_FS=m
+CONFIG_NFS_V4=m
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_NFS_FSCACHE=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+CONFIG_CIFS_FSCACHE=y
+CONFIG_SMB_SERVER=m
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_DLM=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_SECURITY_LANDLOCK=y
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity"
+CONFIG_GCC_PLUGIN_STACKLEAK=y
+CONFIG_STACKLEAK_RUNTIME_DISABLE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_ZERO_CALL_USED_REGS=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_HCTR2=m
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+# CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
+CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_SERPENT_SSE2_586=m
+CONFIG_CRYPTO_TWOFISH_586=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_GEODE=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_QAT_4XXX=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CORDIC=m
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC7=m
+CONFIG_IRQ_POLL=y
+CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_QUIET=3
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_INFO_DWARF5=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_SLUB_DEBUG is not set
+CONFIG_DEBUG_RODATA_TEST=y
+CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_KFENCE=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+# CONFIG_DETECT_HUNG_TASK is not set
+CONFIG_DEBUG_LIST=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+CONFIG_LATENCYTOP=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_IO_STRICT_DEVMEM=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+# CONFIG_EARLY_PRINTK is not set
+CONFIG_DEBUG_NMI_SELFTEST=y
+# CONFIG_RUNTIME_TESTING_MENU is not set
diff --git a/main/linux-lts/virt.x86_64.config b/main/linux-lts/virt.x86_64.config
new file mode 100644
index 00000000000..a512e800e6d
--- /dev/null
+++ b/main/linux-lts/virt.x86_64.config
@@ -0,0 +1,1102 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ_FULL=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_SCHED_CORE=y
+CONFIG_IRQ_TIME_ACCOUNTING=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+CONFIG_IKCONFIG=m
+CONFIG_IKCONFIG_PROC=y
+CONFIG_MEMCG=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+# CONFIG_PROC_PID_CPUSET is not set
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_NAMESPACES=y
+CONFIG_USER_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EXPERT=y
+# CONFIG_SGETMASK_SYSCALL is not set
+# CONFIG_SYSFS_SYSCALL is not set
+# CONFIG_PCSPKR_PLATFORM is not set
+CONFIG_PROFILING=y
+CONFIG_KEXEC=y
+CONFIG_SMP=y
+# CONFIG_X86_MPPARSE is not set
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT_SPINLOCKS=y
+CONFIG_XEN=y
+CONFIG_XEN_PVH=y
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_NR_CPUS=256
+# CONFIG_X86_MCE is not set
+# CONFIG_PERF_EVENTS_INTEL_RAPL is not set
+# CONFIG_PERF_EVENTS_INTEL_CSTATE is not set
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+# CONFIG_X86_5LEVEL is not set
+CONFIG_ARCH_MEMORY_PROBE=y
+# CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is not set
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_HZ_100=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_LEGACY_VSYSCALL_NONE=y
+# CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set
+CONFIG_ACPI_EC_DEBUGFS=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_TINY_POWER_BUTTON=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_TABLE_UPGRADE is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_BGRT=y
+CONFIG_ACPI_NFIT=m
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_ERST_DEBUG=y
+# CONFIG_ACPI_PRMT is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+CONFIG_X86_AMD_PSTATE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_PCI_CNB20LE_QUIRK=y
+CONFIG_IA32_EMULATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KPROBES=y
+CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
+CONFIG_GCC_PLUGIN_LATENT_ENTROPY=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SIG_SHA256=y
+CONFIG_MODULE_COMPRESS_GZIP=y
+CONFIG_BLK_DEV_THROTTLING=y
+CONFIG_BLK_CGROUP_IOLATENCY=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_IOSCHED_BFQ=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_ZSWAP=y
+CONFIG_ZSMALLOC=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_MEM_SOFT_DIRTY=y
+CONFIG_LRU_GEN=y
+CONFIG_LRU_GEN_ENABLED=y
+CONFIG_NET=y
+CONFIG_PACKET=m
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_STATISTICS=y
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_XDP_SOCKETS=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=y
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=m
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_MPTCP=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NF_FLOW_TABLE_PROCFS=y
+CONFIG_NETFILTER_XT_SET=m
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_PE_SIP=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_L2TP=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_LLC2=m
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_FQ_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+CONFIG_DNS_RESOLVER=y
+CONFIG_OPENVSWITCH=m
+CONFIG_VSOCKETS=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_HYPERV_VSOCKETS=m
+CONFIG_NETLINK_DIAG=y
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_NET_PKTGEN=m
+# CONFIG_WIRELESS is not set
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_XEN=m
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_PCI=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_STUB=m
+CONFIG_PCI_HYPERV=m
+# CONFIG_VGA_ARB is not set
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DEVTMPFS_SAFE=y
+CONFIG_FW_LOADER=m
+CONFIG_CONNECTOR=y
+CONFIG_FW_CFG_SYSFS=m
+CONFIG_SYSFB_SIMPLEFB=y
+CONFIG_EFI_VARS_PSTORE=m
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+CONFIG_BLK_DEV_FD=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZ4=y
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_DRBD=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_VMWARE_VMCI=m
+CONFIG_PVPANIC=y
+CONFIG_PVPANIC_MMIO=m
+CONFIG_PVPANIC_PCI=m
+CONFIG_RAID_ATTRS=m
+CONFIG_BLK_DEV_SD=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_CHR_DEV_SG=m
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_ISCSI_TCP=m
+CONFIG_VMWARE_PVSCSI=y
+CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_ATA=y
+CONFIG_SATA_AHCI=y
+CONFIG_ATA_PIIX=y
+CONFIG_ATA_GENERIC=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+# CONFIG_MD_AUTODETECT is not set
+CONFIG_MD_LINEAR=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BCACHE=m
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_MULTIPATH_IOA=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_FEC=y
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_TARGET_CORE=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_CTL=m
+CONFIG_NETDEVICES=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_WIREGUARD=m
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_AGERE is not set
+# CONFIG_NET_VENDOR_ALACRITECH is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
+CONFIG_ENA_ETHERNET=m
+# CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_VENDOR_AQUANTIA is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CADENCE is not set
+# CONFIG_NET_VENDOR_CAVIUM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_NET_VENDOR_CORTINA is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_EZCHIP is not set
+CONFIG_GVE=m
+# CONFIG_NET_VENDOR_HUAWEI is not set
+# CONFIG_NET_VENDOR_I825XX is not set
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IXGBEVF=m
+CONFIG_I40EVF=m
+# CONFIG_NET_VENDOR_LITEX is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+CONFIG_MLX4_EN=m
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_CORE_EN=y
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_MICROSOFT is not set
+# CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_NET_VENDOR_NI is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NETERION is not set
+# CONFIG_NET_VENDOR_NETRONOME is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
+# CONFIG_NET_VENDOR_REALTEK is not set
+# CONFIG_NET_VENDOR_RENESAS is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_PHYLIB=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+# CONFIG_USB_NET_DRIVERS is not set
+# CONFIG_WLAN is not set
+CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_VMXNET3=m
+CONFIG_HYPERV_NET=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_EVDEV=m
+CONFIG_MOUSE_PS2=m
+# CONFIG_MOUSE_PS2_ALPS is not set
+# CONFIG_MOUSE_PS2_BYD is not set
+# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
+# CONFIG_MOUSE_PS2_CYPRESS is not set
+# CONFIG_MOUSE_PS2_LIFEBOOK is not set
+# CONFIG_MOUSE_PS2_TRACKPOINT is not set
+# CONFIG_MOUSE_PS2_FOCALTECH is not set
+CONFIG_MOUSE_PS2_VMMOUSE=y
+CONFIG_INPUT_MISC=y
+# CONFIG_SERIO_SERPORT is not set
+CONFIG_SERIO_PCIPS2=m
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LEGACY_TIOCSTI is not set
+# CONFIG_LDISC_AUTOLOAD is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=16
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+# CONFIG_SERIAL_8250_LPSS is not set
+# CONFIG_SERIAL_8250_MID is not set
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_VIRTIO_CONSOLE=y
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_AMD is not set
+# CONFIG_HW_RANDOM_VIA is not set
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_VIRTIO=m
+CONFIG_PTP_1588_CLOCK_KVM=m
+CONFIG_PTP_1588_CLOCK_VMW=m
+CONFIG_HWMON=m
+CONFIG_SENSORS_ACPI_POWER=m
+# CONFIG_X86_PKG_TEMP_THERMAL is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+CONFIG_WATCHDOG_SYSFS=y
+CONFIG_I6300ESB_WDT=m
+CONFIG_XEN_WDT=m
+CONFIG_DRM=m
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_MKSSTATS=y
+CONFIG_DRM_QXL=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_SIMPLEDRM=m
+CONFIG_DRM_XEN_FRONTEND=m
+CONFIG_DRM_VBOXVIDEO=m
+CONFIG_DRM_HYPERV=m
+CONFIG_FB=m
+# CONFIG_XEN_FBDEV_FRONTEND is not set
+CONFIG_SOUND=y
+CONFIG_SND=m
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_GENERIC=m
+# CONFIG_SND_USB is not set
+CONFIG_SND_VIRTIO=m
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_USB=m
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_MON=m
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_XEN_HCD=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_UAS=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+CONFIG_DMADEVICES=y
+CONFIG_INTEL_IOATDMA=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VBOXGUEST=m
+CONFIG_NITRO_ENCLAVES=m
+CONFIG_EFI_SECRET=m
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_VDPA=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MEM=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_VDPA=m
+CONFIG_IFCVF=m
+CONFIG_VP_VDPA=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_VDPA=m
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_PVCALLS_FRONTEND=m
+CONFIG_XEN_SCSI_BACKEND=m
+# CONFIG_XEN_SYMS is not set
+CONFIG_XEN_VIRTIO=y
+# CONFIG_SURFACE_PLATFORMS is not set
+# CONFIG_X86_PLATFORM_DEVICES is not set
+CONFIG_INTEL_IOMMU=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+CONFIG_IRQ_REMAP=y
+CONFIG_VIRTIO_IOMMU=m
+CONFIG_RPMSG_VIRTIO=m
+CONFIG_MEMORY=y
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_DAX=y
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_REISERFS_FS=m
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+CONFIG_XFS_ONLINE_SCRUB=y
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_FS_COMPRESSION=y
+CONFIG_F2FS_UNFAIR_RWSEM=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
+# CONFIG_DNOTIFY is not set
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_CACHEFILES=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
+CONFIG_NTFS_FS=m
+CONFIG_NTFS_RW=y
+CONFIG_NTFS3_FS=m
+CONFIG_NTFS3_LZX_XPRESS=y
+CONFIG_NTFS3_FS_POSIX_ACL=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_INODE64=y
+CONFIG_HUGETLBFS=y
+CONFIG_ECRYPT_FS=m
+CONFIG_EFS_FS=m
+CONFIG_CRAMFS=m
+# CONFIG_CRAMFS_BLOCKDEV is not set
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
+CONFIG_ROMFS_FS=m
+CONFIG_PSTORE_RAM=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+CONFIG_VBOXSF_FS=m
+CONFIG_NFS_FS=m
+CONFIG_NFS_V4=m
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_NFS_FSCACHE=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SWN_UPCALL=y
+CONFIG_CIFS_FSCACHE=y
+CONFIG_SMB_SERVER=m
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_DLM=m
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SECURITY=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_FORTIFY_SOURCE=y
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_LOCKDOWN_LSM=y
+CONFIG_SECURITY_LANDLOCK=y
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity"
+CONFIG_GCC_PLUGIN_STACKLEAK=y
+CONFIG_STACKLEAK_RUNTIME_DISABLE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_ZERO_CALL_USED_REGS=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_CURVE25519=m
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_HCTR2=m
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+# CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
+CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
+CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
+CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
+CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_QAT_4XXX=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_SECONDARY_TRUSTED_KEYRING=y
+CONFIG_CORDIC=m
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC7=m
+CONFIG_IRQ_POLL=y
+CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_QUIET=3
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_INFO_DWARF5=y
+CONFIG_DEBUG_INFO_BTF=y
+CONFIG_FRAME_WARN=1280
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_SLUB_DEBUG is not set
+CONFIG_DEBUG_RODATA_TEST=y
+CONFIG_KFENCE=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+# CONFIG_DETECT_HUNG_TASK is not set
+CONFIG_DEBUG_LIST=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+CONFIG_LATENCYTOP=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_IO_STRICT_DEVMEM=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+# CONFIG_EARLY_PRINTK is not set
+CONFIG_DEBUG_NMI_SELFTEST=y
+# CONFIG_RUNTIME_TESTING_MENU is not set
diff --git a/main/linux-octeon/APKBUILD b/main/linux-octeon/APKBUILD
deleted file mode 100644
index 8da6baa4d8d..00000000000
--- a/main/linux-octeon/APKBUILD
+++ /dev/null
@@ -1,217 +0,0 @@
-# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
-
-_flavor=octeon
-pkgname=linux-${_flavor}
-pkgver=5.4.28
-case $pkgver in
-	*.*.*)	_kernver=${pkgver%.*};;
-	*.*) _kernver=$pkgver;;
-esac
-pkgrel=0
-pkgdesc="Linux lts kernel (for Octeon)"
-url="http://kernel.org"
-depends="mkinitfs"
-_depends_dev="perl gmp-dev elfutils-dev bash flex bison"
-makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware-any openssl-dev
-	diffutils"
-options="!strip"
-_config=${config:-config-lts.${CARCH}}
-install=
-source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
-	octeon-rd_name.patch
-	octeon-disable-devicetree-deprecation-warning.patch
-	ubnt-e200-sdio-underclock.patch
-
-	config-octeon.mips64
-	"
-subpackages="$pkgname-dev:_dev:$CBUILD_ARCH"
-_flavors=
-for _i in $source; do
-	case $_i in
-	config-*.$CARCH)
-		_f=${_i%.$CARCH}
-		_f=${_f#config-}
-		_flavors="$_flavors ${_f}"
-		if [ "linux-$_f" != "$pkgname" ]; then
-			subpackages="$subpackages linux-${_f}::$CBUILD_ARCH linux-${_f}-dev:_dev:$CBUILD_ARCH"
-		fi
-		;;
-	esac
-done
-
-if [ "${pkgver%.0}" = "$pkgver" ]; then
-	source="$source
-	https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz"
-fi
-arch="mips64 mips64el"
-license="GPL-2.0"
-
-_carch=${CARCH}
-case "$_carch" in
-aarch64*) _carch="arm64" ;;
-arm*) _carch="arm" ;;
-mips*) _carch="mips" ;;
-ppc*) _carch="powerpc" ;;
-s390*) _carch="s390" ;;
-esac
-
-prepare() {
-	local _patch_failed=
-	cd "$srcdir"/linux-$_kernver
-	if [ "$_kernver" != "$pkgver" ]; then
-		msg "Applying patch-$pkgver.xz"
-		unxz -c < "$srcdir"/patch-$pkgver.xz | patch -p1 -N
-	fi
-
-	# first apply patches in specified order
-	for i in $source; do
-		case $i in
-		*.patch)
-			msg "Applying $i..."
-			if ! patch -s -p1 -N -i "$srcdir"/$i; then
-				echo $i >>failed
-				_patch_failed=1
-			fi
-			;;
-		esac
-	done
-
-	if ! [ -z "$_patch_failed" ]; then
-		error "The following patches failed:"
-		cat failed
-		return 1
-	fi
-
-	# remove localversion from patch if any
-	rm -f localversion*
-	oldconfig
-}
-
-oldconfig() {
-	for i in $_flavors; do
-		local _config=config-$i.${CARCH}
-		local _builddir="$srcdir"/build-$i.$CARCH
-		mkdir -p "$_builddir"
-		echo "-$pkgrel-$i" > "$_builddir"/localversion-alpine \
-			|| return 1
-
-		cp "$srcdir"/$_config "$_builddir"/.config
-		make -C "$srcdir"/linux-$_kernver \
-			O="$_builddir" \
-			ARCH="$_carch" \
-			listnewconfig oldconfig
-	done
-}
-
-build() {
-	unset LDFLAGS
-	export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
-	for i in $_flavors; do
-		cd "$srcdir"/build-$i.$CARCH
-		make ARCH="$_carch" CC="${CC:-gcc}" \
-			KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine"
-	done
-}
-
-_package() {
-	local _buildflavor="$1" _outdir="$2"
-	local _abi_release=${pkgver}-${pkgrel}-${_buildflavor}
-	export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
-
-	cd "$srcdir"/build-$_buildflavor.$CARCH
-	# modules_install seems to regenerate a defect Modules.symvers on s390x. Work
-	# around it by backing it up and restore it after modules_install
-	cp Module.symvers Module.symvers.backup
-
-	mkdir -p "$_outdir"/boot "$_outdir"/lib/modules
-
-	local _install
-	case "$CARCH" in
-		arm*|aarch64) _install="zinstall dtbs_install";;
-		*) _install=install;;
-	esac
-
-	make -j1 modules_install $_install \
-		ARCH="$_carch" \
-		INSTALL_MOD_PATH="$_outdir" \
-		INSTALL_PATH="$_outdir"/boot \
-		INSTALL_DTBS_PATH="$_outdir/boot/dtbs-$_flavor"
-
-	cp Module.symvers.backup Module.symvers
-
-	rm -f "$_outdir"/lib/modules/${_abi_release}/build \
-		"$_outdir"/lib/modules/${_abi_release}/source
-	rm -rf "$_outdir"/lib/firmware
-
-	install -D include/config/kernel.release \
-		"$_outdir"/usr/share/kernel/$_buildflavor/kernel.release
-
-	mv "$_outdir"/boot/vmlinux* "$_outdir"/boot/vmlinux.64
-	md5sum "$_outdir"/boot/vmlinux.64 | cut -c1-32 > "$_outdir"/boot/vmlinux.64.md5
-}
-
-# main flavor installs in $pkgdir
-package() {
-	depends="$depends linux-firmware-any"
-
-	_package octeon "$pkgdir"
-}
-
-_dev() {
-	local _flavor=$(echo $subpkgname | sed -E 's/(^linux-|-dev$)//g')
-	local _abi_release=${pkgver}-${pkgrel}-$_flavor
-	# copy the only the parts that we really need for build 3rd party
-	# kernel modules and install those as /usr/src/linux-headers,
-	# simlar to what ubuntu does
-	#
-	# this way you dont need to install the 300-400 kernel sources to
-	# build a tiny kernel module
-	#
-	pkgdesc="Headers and script for third party modules for $_flavor kernel"
-	depends="$_depends_dev"
-	local dir="$subpkgdir"/usr/src/linux-headers-${_abi_release}
-	export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
-
-	# first we import config, run prepare to set up for building
-	# external modules, and create the scripts
-	mkdir -p "$dir"
-	cp "$srcdir"/config-$_flavor.${CARCH} "$dir"/.config
-	echo "-$pkgrel-$_flavor" > "$dir"/localversion-alpine
-
-	make -j1 -C "$srcdir"/linux-$_kernver O="$dir" ARCH="$_carch" \
-		syncconfig prepare modules_prepare scripts
-
-	# remove the stuff that points to real sources. we want 3rd party
-	# modules to believe this is the soruces
-	rm "$dir"/Makefile "$dir"/source
-
-	# copy the needed stuff from real sources
-	#
-	# this is taken from ubuntu kernel build script
-	# http://kernel.ubuntu.com/git/ubuntu/ubuntu-zesty.git/tree/debian/rules.d/3-binary-indep.mk
-	cd "$srcdir"/linux-$_kernver
-	find .  -path './include/*' -prune \
-		-o -path './scripts/*' -prune -o -type f \
-		\( -name 'Makefile*' -o -name 'Kconfig*' -o -name 'Kbuild*' -o \
-		   -name '*.sh' -o -name '*.pl' -o -name '*.lds' -o -name 'Platform' \) \
-		-print | cpio -pdm "$dir"
-
-	cp -a scripts include "$dir"
-
-	find $(find arch -name include -type d -print) -type f \
-		| cpio -pdm "$dir"
-
-	install -Dm644 "$srcdir"/build-$_flavor.$CARCH/Module.symvers \
-		"$dir"/Module.symvers
-
-	mkdir -p "$subpkgdir"/lib/modules/${_abi_release}
-	ln -sf /usr/src/linux-headers-${_abi_release} \
-		"$subpkgdir"/lib/modules/${_abi_release}/build
-}
-
-sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f  linux-5.4.tar.xz
-39d145b7afd3297d9572e7c37eb40b58c3b0d7f30cc361bdf6c89e6bb54a6072f79dea979f4b4fc24d06fe06c406d10949cbf79d373e1ba82514a2f1bb0a6255  octeon-rd_name.patch
-a2c0d901188570ebba6917b727cdb4823bda5dbe29a559ed2055db21b4f5dd4990f623b94f07072bcbf69647f250afb52d1771d706bdc072e2cfb00003e257b4  octeon-disable-devicetree-deprecation-warning.patch
-c227cd4a0c9712a75d62211becb8591fccd15a93ae4483835f1ec69aabca51aaf8254c37e6315bbd5a08b1f521b369269bfe973700eb993ec6a629b7167e75f7  ubnt-e200-sdio-underclock.patch
-2c62807a07bcf5a967b4db42a9f74799ca35e6757509978607770ac4a7fd750751e015ed98ccf95b612fc7c7afbe252bbc352135e616a8e4b0a832bcaf2b1fc8  config-octeon.mips64
-883aa429e22a3b2623b52ee4c376f15c128baff3377873e0515231902e46701e4928699dc3404eaed73ab7d333cb2a32ebebf35d727a22d3dac11b5680d4db36  patch-5.4.28.xz"
diff --git a/main/linux-octeon/config-octeon.mips64 b/main/linux-octeon/config-octeon.mips64
deleted file mode 100644
index fb2fe954aee..00000000000
--- a/main/linux-octeon/config-octeon.mips64
+++ /dev/null
@@ -1,3234 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/mips 5.4.28 Kernel Configuration
-#
-
-#
-# Compiler: gcc (Alpine 9.2.0) 9.2.0
-#
-CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
-CONFIG_CLANG_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_HAS_ASM_GOTO=y
-CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
-CONFIG_IRQ_WORK=y
-CONFIG_BUILDTIME_EXTABLE_SORT=y
-
-#
-# General setup
-#
-CONFIG_INIT_ENV_ARG_LIMIT=32
-# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT=""
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-# CONFIG_CROSS_MEMORY_ATTACH is not set
-# CONFIG_USELIB is not set
-# CONFIG_AUDIT is not set
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_HANDLE_DOMAIN_IRQ=y
-CONFIG_IRQ_FORCED_THREADING=y
-# end of IRQ subsystem
-
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-
-#
-# Timers subsystem
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_HZ_PERIODIC=y
-# CONFIG_NO_HZ_IDLE is not set
-# CONFIG_NO_HZ_FULL is not set
-# CONFIG_NO_HZ is not set
-CONFIG_HIGH_RES_TIMERS=y
-# end of Timers subsystem
-
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-
-#
-# CPU/Task time and stats accounting
-#
-CONFIG_TICK_CPU_ACCOUNTING=y
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_PSI is not set
-# end of CPU/Task time and stats accounting
-
-CONFIG_CPU_ISOLATION=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_RCU_EXPERT is not set
-CONFIG_SRCU=y
-CONFIG_TREE_SRCU=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_RCU_NEED_SEGCBLIST=y
-# end of RCU Subsystem
-
-# CONFIG_IKCONFIG is not set
-# CONFIG_IKHEADERS is not set
-CONFIG_LOG_BUF_SHIFT=16
-CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-
-#
-# Scheduler features
-#
-# end of Scheduler features
-
-CONFIG_CGROUPS=y
-# CONFIG_MEMCG is not set
-# CONFIG_BLK_CGROUP is not set
-# CONFIG_CGROUP_SCHED is not set
-# CONFIG_CGROUP_PIDS is not set
-# CONFIG_CGROUP_RDMA is not set
-# CONFIG_CGROUP_FREEZER is not set
-# CONFIG_CGROUP_HUGETLB is not set
-# CONFIG_CPUSETS is not set
-# CONFIG_CGROUP_DEVICE is not set
-# CONFIG_CGROUP_CPUACCT is not set
-CONFIG_CGROUP_BPF=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_SOCK_CGROUP_DATA=y
-CONFIG_NAMESPACES=y
-# CONFIG_UTS_NS is not set
-# CONFIG_IPC_NS is not set
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
-CONFIG_NET_NS=y
-# CONFIG_CHECKPOINT_RESTORE is not set
-# CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SYSFS_DEPRECATED is not set
-# CONFIG_RELAY is not set
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
-# CONFIG_LD_DEAD_CODE_DATA_ELIMINATION is not set
-CONFIG_SYSCTL=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_BPF=y
-CONFIG_EXPERT=y
-CONFIG_MULTIUSER=y
-CONFIG_SGETMASK_SYSCALL=y
-CONFIG_SYSFS_SYSCALL=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_FHANDLE=y
-CONFIG_POSIX_TIMERS=y
-CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_FUTEX_PI=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_IO_URING=y
-CONFIG_ADVISE_SYSCALLS=y
-CONFIG_MEMBARRIER=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
-# CONFIG_USERFAULTFD is not set
-CONFIG_RSEQ=y
-# CONFIG_DEBUG_RSEQ is not set
-CONFIG_EMBEDDED=y
-CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_PERF_USE_VMALLOC=y
-# CONFIG_PC104 is not set
-
-#
-# Kernel Performance Events And Counters
-#
-# CONFIG_PERF_EVENTS is not set
-# end of Kernel Performance Events And Counters
-
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
-# CONFIG_SLOB is not set
-CONFIG_SLAB_MERGE_DEFAULT=y
-# CONFIG_SLAB_FREELIST_RANDOM is not set
-# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
-# CONFIG_PROFILING is not set
-# end of General setup
-
-CONFIG_MIPS=y
-
-#
-# Machine selection
-#
-# CONFIG_MIPS_GENERIC is not set
-# CONFIG_MIPS_ALCHEMY is not set
-# CONFIG_AR7 is not set
-# CONFIG_ATH25 is not set
-# CONFIG_ATH79 is not set
-# CONFIG_BMIPS_GENERIC is not set
-# CONFIG_BCM47XX is not set
-# CONFIG_BCM63XX is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_INGENIC is not set
-# CONFIG_LANTIQ is not set
-# CONFIG_LASAT is not set
-# CONFIG_MACH_LOONGSON32 is not set
-# CONFIG_MACH_LOONGSON64 is not set
-# CONFIG_MACH_PISTACHIO is not set
-# CONFIG_MIPS_MALTA is not set
-# CONFIG_MACH_PIC32 is not set
-# CONFIG_NEC_MARKEINS is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set
-# CONFIG_PMC_MSP is not set
-# CONFIG_RALINK is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SNI_RM is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MIKROTIK_RB532 is not set
-CONFIG_CAVIUM_OCTEON_SOC=y
-# CONFIG_NLM_XLR_BOARD is not set
-# CONFIG_NLM_XLP_BOARD is not set
-# CONFIG_MIPS_PARAVIRT is not set
-CONFIG_CAVIUM_CN63XXP1=y
-CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=3
-CONFIG_CAVIUM_OCTEON_LOCK_L2=y
-CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB=y
-CONFIG_CAVIUM_OCTEON_LOCK_L2_EXCEPTION=y
-CONFIG_CAVIUM_OCTEON_LOCK_L2_LOW_LEVEL_INTERRUPT=y
-CONFIG_CAVIUM_OCTEON_LOCK_L2_INTERRUPT=y
-CONFIG_CAVIUM_OCTEON_LOCK_L2_MEMCPY=y
-# CONFIG_OCTEON_ILM is not set
-# end of Machine selection
-
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_CEVT_R4K=y
-CONFIG_ARCH_SUPPORTS_UPROBES=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_SYS_SUPPORTS_HOTPLUG_CPU=y
-CONFIG_HOLES_IN_ZONE=y
-CONFIG_SYS_SUPPORTS_RELOCATABLE=y
-CONFIG_MIPS_EBPF_JIT=y
-CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_CPU_LITTLE_ENDIAN is not set
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-CONFIG_SYS_SUPPORTS_HUGETLBFS=y
-CONFIG_MIPS_HUGE_TLB_SUPPORT=y
-CONFIG_MIPS_SPRAM=y
-CONFIG_MIPS_L1_CACHE_SHIFT_7=y
-CONFIG_MIPS_L1_CACHE_SHIFT=7
-
-#
-# CPU selection
-#
-CONFIG_CPU_CAVIUM_OCTEON=y
-CONFIG_SYS_HAS_CPU_CAVIUM_OCTEON=y
-CONFIG_WEAK_ORDERING=y
-# end of CPU selection
-
-CONFIG_CPU_MIPSR2=y
-CONFIG_TARGET_ISA_REV=2
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HUGEPAGES=y
-CONFIG_MIPS_PGD_C0_CONTEXT=y
-CONFIG_HARDWARE_WATCHPOINTS=y
-
-#
-# Kernel type
-#
-CONFIG_64BIT=y
-# CONFIG_MIPS_VA_BITS_48 is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-# CONFIG_PAGE_SIZE_32KB is not set
-# CONFIG_PAGE_SIZE_64KB is not set
-CONFIG_FORCE_MAX_ZONEORDER=14
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_GENERIC_DUMP_TLB=y
-CONFIG_MIPS_FP_SUPPORT=y
-CONFIG_CPU_R4K_FPU=y
-CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y
-CONFIG_CPU_HAS_RIXI=y
-CONFIG_CPU_HAS_LOAD_STORE_LR=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_MIPS_ASID_SHIFT=0
-CONFIG_MIPS_ASID_BITS=8
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-# CONFIG_RELOCATABLE is not set
-CONFIG_SMP=y
-CONFIG_HOTPLUG_CPU=y
-CONFIG_SYS_SUPPORTS_SMP=y
-CONFIG_NR_CPUS_DEFAULT_64=y
-CONFIG_NR_CPUS=256
-CONFIG_MIPS_NR_CPU_NR_MAP_1024=y
-CONFIG_MIPS_NR_CPU_NR_MAP=1024
-# CONFIG_HZ_24 is not set
-# CONFIG_HZ_48 is not set
-CONFIG_HZ_100=y
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_1000 is not set
-# CONFIG_HZ_1024 is not set
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_HZ=100
-CONFIG_SCHED_HRTICK=y
-CONFIG_KEXEC=y
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_SECCOMP is not set
-# CONFIG_MIPS_O32_FP64_SUPPORT is not set
-CONFIG_USE_OF=y
-CONFIG_BUILTIN_DTB=y
-CONFIG_MIPS_NO_APPENDED_DTB=y
-# CONFIG_MIPS_ELF_APPENDED_DTB is not set
-# CONFIG_MIPS_RAW_APPENDED_DTB is not set
-# CONFIG_MIPS_CMDLINE_FROM_DTB is not set
-# CONFIG_MIPS_CMDLINE_DTB_EXTEND is not set
-CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y
-# CONFIG_MIPS_CMDLINE_BUILTIN_EXTEND is not set
-# end of Kernel type
-
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_PGTABLE_LEVELS=3
-
-#
-# Bus options (PCI, PCMCIA, EISA, ISA, TC)
-#
-CONFIG_PCI_DRIVERS_LEGACY=y
-CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MIN=12
-CONFIG_ARCH_MMAP_RND_BITS_MAX=18
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15
-CONFIG_ZONE_DMA32=y
-# end of Bus options (PCI, PCMCIA, EISA, ISA, TC)
-
-CONFIG_MIPS32_COMPAT=y
-CONFIG_COMPAT=y
-CONFIG_SYSVIPC_COMPAT=y
-CONFIG_MIPS32_O32=y
-CONFIG_MIPS32_N32=y
-CONFIG_BINFMT_ELF32=y
-
-#
-# Power management options
-#
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_SUSPEND is not set
-# CONFIG_HIBERNATION is not set
-# CONFIG_PM is not set
-# end of Power management options
-
-#
-# CPU Power Management
-#
-
-#
-# CPU Idle
-#
-# CONFIG_CPU_IDLE is not set
-# end of CPU Idle
-# end of CPU Power Management
-
-#
-# Firmware Drivers
-#
-# CONFIG_FIRMWARE_MEMMAP is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-CONFIG_EFI_EARLYCON=y
-
-#
-# Tegra firmware driver
-#
-# end of Tegra firmware driver
-# end of Firmware Drivers
-
-CONFIG_HAVE_KVM=y
-# CONFIG_VIRTUALIZATION is not set
-
-#
-# General architecture-dependent options
-#
-CONFIG_CRASH_CORE=y
-CONFIG_KEXEC_CORE=y
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
-CONFIG_JUMP_LABEL=y
-# CONFIG_STATIC_KEYS_SELFTEST is not set
-CONFIG_ARCH_USE_BUILTIN_BSWAP=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_NMI=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_HAVE_ASM_MODVERSIONS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_RSEQ=y
-CONFIG_HAVE_ARCH_JUMP_LABEL=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
-CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_HAVE_STACKPROTECTOR=y
-CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
-CONFIG_STACKPROTECTOR=y
-CONFIG_STACKPROTECTOR_STRONG=y
-CONFIG_HAVE_CONTEXT_TRACKING=y
-CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
-CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=12
-CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
-CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
-CONFIG_HAVE_COPY_THREAD_TLS=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_64BIT_TIME=y
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_ARCH_HAS_PHYS_TO_DMA=y
-# CONFIG_REFCOUNT_FULL is not set
-CONFIG_HAVE_ARCH_COMPILER_H=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
-
-#
-# GCOV-based kernel profiling
-#
-# end of GCOV-based kernel profiling
-
-CONFIG_PLUGIN_HOSTCC=""
-# end of General architecture-dependent options
-
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-# CONFIG_MODULE_SIG is not set
-# CONFIG_MODULE_COMPRESS is not set
-# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_TRIM_UNUSED_KSYMS is not set
-CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_BSGLIB is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_ZONED is not set
-# CONFIG_BLK_CMDLINE_PARSER is not set
-# CONFIG_BLK_WBT is not set
-# CONFIG_BLK_SED_OPAL is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# end of Partition Types
-
-CONFIG_BLOCK_COMPAT=y
-
-#
-# IO Schedulers
-#
-CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=y
-# CONFIG_IOSCHED_BFQ is not set
-# end of IO Schedulers
-
-CONFIG_ASN1=m
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
-CONFIG_QUEUED_SPINLOCKS=y
-CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_RWLOCKS=y
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_ARCH_BINFMT_ELF_STATE=y
-CONFIG_ELFCORE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_SCRIPT=y
-# CONFIG_BINFMT_MISC is not set
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_STATIC=y
-CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
-CONFIG_HAVE_FAST_GUP=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_COMPACTION=y
-CONFIG_MIGRATION=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
-# CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
-# CONFIG_CMA is not set
-# CONFIG_ZPOOL is not set
-# CONFIG_ZBUD is not set
-# CONFIG_ZSMALLOC is not set
-# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
-# CONFIG_IDLE_PAGE_TRACKING is not set
-# CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
-CONFIG_ARCH_HAS_PTE_SPECIAL=y
-# end of Memory Management options
-
-CONFIG_NET=y
-CONFIG_NET_INGRESS=y
-CONFIG_NET_EGRESS=y
-CONFIG_SKB_EXTENSIONS=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_DIAG is not set
-CONFIG_UNIX=y
-CONFIG_UNIX_SCM=y
-# CONFIG_UNIX_DIAG is not set
-# CONFIG_TLS is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_OFFLOAD=y
-CONFIG_XFRM_ALGO=y
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_INTERFACE is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-CONFIG_XFRM_STATISTICS=y
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=y
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_XDP_SOCKETS=y
-CONFIG_XDP_SOCKETS_DIAG=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-# CONFIG_IP_FIB_TRIE_STATS is not set
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_CLASSID=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IP_TUNNEL=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE_COMMON=y
-CONFIG_IP_MROUTE=y
-# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-CONFIG_NET_IPVTI=m
-CONFIG_NET_UDP_TUNNEL=m
-# CONFIG_NET_FOU is not set
-# CONFIG_NET_FOU_IP_TUNNELS is not set
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_ESP_OFFLOAD=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_INET_UDP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
-# CONFIG_INET_DIAG_DESTROY is not set
-CONFIG_TCP_CONG_ADVANCED=y
-# CONFIG_TCP_CONG_BIC is not set
-CONFIG_TCP_CONG_CUBIC=y
-# CONFIG_TCP_CONG_WESTWOOD is not set
-# CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_TCP_CONG_HSTCP is not set
-# CONFIG_TCP_CONG_HYBLA is not set
-# CONFIG_TCP_CONG_VEGAS is not set
-# CONFIG_TCP_CONG_NV is not set
-# CONFIG_TCP_CONG_SCALABLE is not set
-# CONFIG_TCP_CONG_LP is not set
-# CONFIG_TCP_CONG_VENO is not set
-# CONFIG_TCP_CONG_YEAH is not set
-# CONFIG_TCP_CONG_ILLINOIS is not set
-# CONFIG_TCP_CONG_DCTCP is not set
-# CONFIG_TCP_CONG_CDG is not set
-# CONFIG_TCP_CONG_BBR is not set
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_ESP_OFFLOAD=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-# CONFIG_IPV6_ILA is not set
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-# CONFIG_IPV6_VTI is not set
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_GRE=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-CONFIG_IPV6_PIMSM_V2=y
-CONFIG_IPV6_SEG6_LWTUNNEL=y
-CONFIG_IPV6_SEG6_HMAC=y
-# CONFIG_NETLABEL is not set
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NET_PTP_CLASSIFY=y
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=m
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_FAMILY_BRIDGE=y
-CONFIG_NETFILTER_FAMILY_ARP=y
-CONFIG_NETFILTER_NETLINK_ACCT=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NETFILTER_NETLINK_OSF=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-CONFIG_NF_LOG_NETDEV=m
-CONFIG_NETFILTER_CONNCOUNT=m
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-# CONFIG_NF_CONNTRACK_ZONES is not set
-# CONFIG_NF_CONNTRACK_PROCFS is not set
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=y
-# CONFIG_NF_CT_PROTO_DCCP is not set
-CONFIG_NF_CT_PROTO_GRE=y
-# CONFIG_NF_CT_PROTO_SCTP is not set
-# CONFIG_NF_CT_PROTO_UDPLITE is not set
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_BROADCAST=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_SNMP=m
-CONFIG_NF_CONNTRACK_PPTP=m
-# CONFIG_NF_CONNTRACK_SANE is not set
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NF_CT_NETLINK_TIMEOUT=m
-# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=y
-CONFIG_NF_NAT_MASQUERADE=y
-# CONFIG_NF_TABLES is not set
-CONFIG_NETFILTER_XTABLES=m
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=m
-CONFIG_NETFILTER_XT_CONNMARK=m
-CONFIG_NETFILTER_XT_SET=m
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_HMARK=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_LOG=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_NAT=m
-CONFIG_NETFILTER_XT_TARGET_NETMAP=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
-CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
-# CONFIG_NETFILTER_XT_TARGET_TEE is not set
-# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-# CONFIG_NETFILTER_XT_MATCH_BPF is not set
-# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set
-# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-# CONFIG_NETFILTER_XT_MATCH_CPU is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ECN=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_L2TP=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-# end of Core Netfilter Configuration
-
-CONFIG_IP_SET=m
-CONFIG_IP_SET_MAX=256
-CONFIG_IP_SET_BITMAP_IP=m
-CONFIG_IP_SET_BITMAP_IPMAC=m
-CONFIG_IP_SET_BITMAP_PORT=m
-CONFIG_IP_SET_HASH_IP=m
-# CONFIG_IP_SET_HASH_IPMARK is not set
-CONFIG_IP_SET_HASH_IPPORT=m
-CONFIG_IP_SET_HASH_IPPORTIP=m
-CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_IPMAC=m
-CONFIG_IP_SET_HASH_MAC=m
-# CONFIG_IP_SET_HASH_NETPORTNET is not set
-CONFIG_IP_SET_HASH_NET=m
-# CONFIG_IP_SET_HASH_NETNET is not set
-CONFIG_IP_SET_HASH_NETPORT=m
-CONFIG_IP_SET_HASH_NETIFACE=m
-CONFIG_IP_SET_LIST_SET=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-# CONFIG_IP_VS_PROTO_SCTP is not set
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-# CONFIG_IP_VS_FO is not set
-# CONFIG_IP_VS_OVF is not set
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_MH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS SH scheduler
-#
-CONFIG_IP_VS_SH_TAB_BITS=8
-
-#
-# IPVS MH scheduler
-#
-CONFIG_IP_VS_MH_TAB_INDEX=12
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IP_VS_NFCT=y
-CONFIG_IP_VS_PE_SIP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_SOCKET_IPV4=m
-CONFIG_NF_TPROXY_IPV4=m
-# CONFIG_NF_DUP_IPV4 is not set
-# CONFIG_NF_LOG_ARP is not set
-CONFIG_NF_LOG_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_RPFILTER=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-# CONFIG_IP_NF_TARGET_SYNPROXY is not set
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-# CONFIG_IP_NF_SECURITY is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# end of IP: Netfilter Configuration
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_SOCKET_IPV6=m
-CONFIG_NF_TPROXY_IPV6=m
-# CONFIG_NF_DUP_IPV6 is not set
-CONFIG_NF_REJECT_IPV6=m
-CONFIG_NF_LOG_IPV6=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RPFILTER=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_SRH=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-# CONFIG_IP6_NF_SECURITY is not set
-# CONFIG_IP6_NF_NAT is not set
-# end of IPv6: Netfilter Configuration
-
-CONFIG_NF_DEFRAG_IPV6=m
-CONFIG_NF_CONNTRACK_BRIDGE=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_BPFILTER=y
-CONFIG_BPFILTER_UMH=m
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-CONFIG_L2TP=m
-CONFIG_L2TP_V3=y
-CONFIG_L2TP_IP=m
-CONFIG_L2TP_ETH=m
-CONFIG_STP=m
-CONFIG_GARP=m
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_HAVE_NET_DSA=y
-# CONFIG_NET_DSA is not set
-CONFIG_VLAN_8021Q=m
-CONFIG_VLAN_8021Q_GVRP=y
-# CONFIG_VLAN_8021Q_MVRP is not set
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-# CONFIG_LLC2 is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_PHONET is not set
-# CONFIG_6LOWPAN is not set
-# CONFIG_IEEE802154 is not set
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_PRIO=m
-# CONFIG_NET_SCH_MULTIQ is not set
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFB=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_CBS=m
-CONFIG_NET_SCH_ETF=m
-CONFIG_NET_SCH_TAPRIO=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-# CONFIG_NET_SCH_MQPRIO is not set
-CONFIG_NET_SCH_SKBPRIO=m
-CONFIG_NET_SCH_CHOKE=m
-CONFIG_NET_SCH_QFQ=m
-CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
-CONFIG_NET_SCH_CAKE=m
-# CONFIG_NET_SCH_FQ is not set
-# CONFIG_NET_SCH_HHF is not set
-# CONFIG_NET_SCH_PIE is not set
-CONFIG_NET_SCH_INGRESS=m
-# CONFIG_NET_SCH_PLUG is not set
-# CONFIG_NET_SCH_DEFAULT is not set
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_PERF=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-# CONFIG_NET_CLS_CGROUP is not set
-# CONFIG_NET_CLS_BPF is not set
-# CONFIG_NET_CLS_FLOWER is not set
-# CONFIG_NET_CLS_MATCHALL is not set
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_EMATCH_IPSET=m
-CONFIG_NET_EMATCH_IPT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_SAMPLE=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-# CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_ACT_SKBEDIT is not set
-# CONFIG_NET_ACT_CSUM is not set
-CONFIG_NET_ACT_MPLS=m
-# CONFIG_NET_ACT_VLAN is not set
-# CONFIG_NET_ACT_BPF is not set
-# CONFIG_NET_ACT_CONNMARK is not set
-CONFIG_NET_ACT_CTINFO=m
-# CONFIG_NET_ACT_SKBMOD is not set
-# CONFIG_NET_ACT_IFE is not set
-# CONFIG_NET_ACT_TUNNEL_KEY is not set
-CONFIG_NET_ACT_CT=m
-# CONFIG_NET_TC_SKB_EXT is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-# CONFIG_BATMAN_ADV is not set
-# CONFIG_OPENVSWITCH is not set
-# CONFIG_VSOCKETS is not set
-# CONFIG_NETLINK_DIAG is not set
-# CONFIG_MPLS is not set
-# CONFIG_NET_NSH is not set
-# CONFIG_HSR is not set
-# CONFIG_NET_SWITCHDEV is not set
-CONFIG_NET_L3_MASTER_DEV=y
-# CONFIG_NET_NCSI is not set
-CONFIG_RPS=y
-CONFIG_RFS_ACCEL=y
-CONFIG_XPS=y
-# CONFIG_CGROUP_NET_PRIO is not set
-# CONFIG_CGROUP_NET_CLASSID is not set
-CONFIG_NET_RX_BUSY_POLL=y
-CONFIG_BQL=y
-CONFIG_BPF_JIT=y
-CONFIG_BPF_STREAM_PARSER=y
-CONFIG_NET_FLOW_LIMIT=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# end of Network testing
-# end of Networking options
-
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AF_KCM is not set
-CONFIG_STREAM_PARSER=y
-CONFIG_FIB_RULES=y
-# CONFIG_WIRELESS is not set
-# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
-# CONFIG_NET_9P is not set
-# CONFIG_CAIF is not set
-# CONFIG_CEPH_LIB is not set
-# CONFIG_NFC is not set
-CONFIG_PSAMPLE=m
-CONFIG_NET_IFE=m
-CONFIG_LWTUNNEL=y
-CONFIG_LWTUNNEL_BPF=y
-CONFIG_DST_CACHE=y
-CONFIG_GRO_CELLS=y
-CONFIG_NET_SOCK_MSG=y
-# CONFIG_FAILOVER is not set
-CONFIG_HAVE_EBPF_JIT=y
-
-#
-# Device Drivers
-#
-CONFIG_HAVE_PCI=y
-# CONFIG_PCI is not set
-# CONFIG_PCCARD is not set
-CONFIG_HAVE_RAPIDIO=y
-# CONFIG_RAPIDIO is not set
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-
-#
-# Firmware loader
-#
-CONFIG_FW_LOADER=m
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
-# CONFIG_FW_LOADER_COMPRESS is not set
-# end of Firmware loader
-
-CONFIG_ALLOW_DEV_COREDUMP=y
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
-# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-# end of Generic Driver Options
-
-#
-# Bus devices
-#
-# CONFIG_BRCMSTB_GISB_ARB is not set
-# CONFIG_MOXTET is not set
-# CONFIG_MIPS_CDMM is not set
-# end of Bus devices
-
-# CONFIG_CONNECTOR is not set
-# CONFIG_GNSS is not set
-CONFIG_MTD=y
-# CONFIG_MTD_TESTS is not set
-
-#
-# Partition parsers
-#
-# CONFIG_MTD_AR7_PARTS is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_OF_PARTS is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# end of Partition parsers
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=y
-# CONFIG_MTD_BLOCK is not set
-CONFIG_MTD_BLOCK_RO=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-# CONFIG_SM_FTL is not set
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_SWAP is not set
-# CONFIG_MTD_PARTITIONED_MASTER is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=y
-CONFIG_MTD_JEDECPROBE=y
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-# end of RAM/ROM/Flash chip drivers
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_PHYSMAP_OF is not set
-# CONFIG_MTD_PHYSMAP_GPIO_ADDR is not set
-# CONFIG_MTD_PLATRAM is not set
-# end of Mapping drivers for chip access
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_MCHP23K256 is not set
-# CONFIG_MTD_SST25L is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOCG3 is not set
-# end of Self-contained MTD device drivers
-
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_RAW_NAND is not set
-# CONFIG_MTD_SPI_NAND is not set
-
-#
-# LPDDR & LPDDR2 PCM memory drivers
-#
-# CONFIG_MTD_LPDDR is not set
-# end of LPDDR & LPDDR2 PCM memory drivers
-
-CONFIG_MTD_SPI_NOR=y
-CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
-# CONFIG_SPI_MTK_QUADSPI is not set
-# CONFIG_MTD_UBI is not set
-# CONFIG_MTD_HYPERBUS is not set
-CONFIG_DTC=y
-CONFIG_OF=y
-# CONFIG_OF_UNITTEST is not set
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
-CONFIG_OF_MDIO=y
-CONFIG_OF_RESERVED_MEM=y
-# CONFIG_OF_OVERLAY is not set
-# CONFIG_PARPORT is not set
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_NULL_BLK is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_DRBD is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_BLK_DEV_RBD is not set
-
-#
-# NVME Support
-#
-# CONFIG_NVME_FC is not set
-# CONFIG_NVME_TARGET is not set
-# end of NVME Support
-
-#
-# Misc devices
-#
-# CONFIG_AD525X_DPOT is not set
-# CONFIG_DUMMY_IRQ is not set
-# CONFIG_ICS932S401 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_APDS9802ALS is not set
-# CONFIG_ISL29003 is not set
-# CONFIG_ISL29020 is not set
-# CONFIG_SENSORS_TSL2550 is not set
-# CONFIG_SENSORS_BH1770 is not set
-# CONFIG_SENSORS_APDS990X is not set
-# CONFIG_HMC6352 is not set
-# CONFIG_DS1682 is not set
-# CONFIG_LATTICE_ECP3_CONFIG is not set
-# CONFIG_SRAM is not set
-# CONFIG_XILINX_SDFEC is not set
-# CONFIG_PVPANIC is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-# CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_MAX6875 is not set
-# CONFIG_EEPROM_93CX6 is not set
-# CONFIG_EEPROM_93XX46 is not set
-# CONFIG_EEPROM_IDT_89HPESX is not set
-# CONFIG_EEPROM_EE1004 is not set
-# end of EEPROM support
-
-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_TI_ST is not set
-# end of Texas Instruments shared transport line discipline
-
-# CONFIG_SENSORS_LIS3_SPI is not set
-# CONFIG_SENSORS_LIS3_I2C is not set
-# CONFIG_ALTERA_STAPL is not set
-
-#
-# Intel MIC & related support
-#
-
-#
-# Intel MIC Bus Driver
-#
-
-#
-# SCIF Bus Driver
-#
-
-#
-# VOP Bus Driver
-#
-# CONFIG_VOP_BUS is not set
-
-#
-# Intel MIC Host Driver
-#
-
-#
-# Intel MIC Card Driver
-#
-
-#
-# SCIF Driver
-#
-
-#
-# Intel MIC Coprocessor State Management (COSM) Drivers
-#
-
-#
-# VOP Driver
-#
-# end of Intel MIC & related support
-
-# CONFIG_ECHO is not set
-# CONFIG_MISC_RTSX_USB is not set
-# end of Misc devices
-
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-# CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-
-#
-# SCSI Transports
-#
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# end of SCSI Transports
-
-# CONFIG_SCSI_LOWLEVEL is not set
-# CONFIG_SCSI_DH is not set
-# end of SCSI device support
-
-# CONFIG_ATA is not set
-# CONFIG_MD is not set
-# CONFIG_TARGET_CORE is not set
-CONFIG_NETDEVICES=y
-CONFIG_MII=m
-CONFIG_NET_CORE=y
-CONFIG_BONDING=m
-CONFIG_DUMMY=m
-# CONFIG_EQUALIZER is not set
-CONFIG_IFB=m
-# CONFIG_NET_TEAM is not set
-CONFIG_MACVLAN=m
-# CONFIG_MACVTAP is not set
-CONFIG_IPVLAN_L3S=y
-CONFIG_IPVLAN=m
-CONFIG_IPVTAP=m
-# CONFIG_VXLAN is not set
-# CONFIG_GENEVE is not set
-# CONFIG_GTP is not set
-# CONFIG_MACSEC is not set
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_TUN=m
-CONFIG_TAP=m
-# CONFIG_TUN_VNET_CROSS_LE is not set
-CONFIG_VETH=m
-# CONFIG_NLMON is not set
-CONFIG_NET_VRF=m
-
-#
-# CAIF transport drivers
-#
-
-#
-# Distributed Switch Architecture drivers
-#
-# end of Distributed Switch Architecture drivers
-
-CONFIG_ETHERNET=y
-# CONFIG_NET_VENDOR_ALACRITECH is not set
-# CONFIG_ALTERA_TSE is not set
-# CONFIG_NET_VENDOR_AMAZON is not set
-# CONFIG_NET_VENDOR_AQUANTIA is not set
-# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_VENDOR_AURORA is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CADENCE is not set
-CONFIG_NET_VENDOR_CAVIUM=y
-# CONFIG_OCTEON_MGMT_ETHERNET is not set
-# CONFIG_NET_VENDOR_CORTINA is not set
-# CONFIG_DM9000 is not set
-# CONFIG_DNET is not set
-# CONFIG_NET_VENDOR_EZCHIP is not set
-# CONFIG_NET_VENDOR_GOOGLE is not set
-# CONFIG_NET_VENDOR_HUAWEI is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_MICROSEMI is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_NETRONOME is not set
-# CONFIG_NET_VENDOR_NI is not set
-# CONFIG_ETHOC is not set
-# CONFIG_NET_VENDOR_PENSANDO is not set
-# CONFIG_NET_VENDOR_QUALCOMM is not set
-# CONFIG_NET_VENDOR_RENESAS is not set
-# CONFIG_NET_VENDOR_ROCKER is not set
-# CONFIG_NET_VENDOR_SAMSUNG is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SOLARFLARE is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_SOCIONEXT is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SYNOPSYS is not set
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_NET_VENDOR_XILINX is not set
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_BUS=y
-# CONFIG_MDIO_BCM_UNIMAC is not set
-# CONFIG_MDIO_BITBANG is not set
-CONFIG_MDIO_BUS_MUX=m
-CONFIG_MDIO_BUS_MUX_GPIO=m
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
-CONFIG_MDIO_CAVIUM=y
-# CONFIG_MDIO_HISI_FEMAC is not set
-# CONFIG_MDIO_MSCC_MIIM is not set
-CONFIG_MDIO_OCTEON=y
-CONFIG_PHYLIB=y
-CONFIG_SWPHY=y
-
-#
-# MII PHY device drivers
-#
-# CONFIG_ADIN_PHY is not set
-# CONFIG_AMD_PHY is not set
-# CONFIG_AQUANTIA_PHY is not set
-# CONFIG_AX88796B_PHY is not set
-CONFIG_AT803X_PHY=m
-# CONFIG_BCM7XXX_PHY is not set
-# CONFIG_BCM87XX_PHY is not set
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_CICADA_PHY is not set
-CONFIG_CORTINA_PHY=m
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_DP83822_PHY is not set
-# CONFIG_DP83TC811_PHY is not set
-# CONFIG_DP83848_PHY is not set
-# CONFIG_DP83867_PHY is not set
-CONFIG_FIXED_PHY=y
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_INTEL_XWAY_PHY is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_MARVELL_PHY is not set
-CONFIG_MARVELL_10G_PHY=m
-# CONFIG_MICREL_PHY is not set
-# CONFIG_MICROCHIP_PHY is not set
-# CONFIG_MICROCHIP_T1_PHY is not set
-# CONFIG_MICROSEMI_PHY is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_NXP_TJA11XX_PHY is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_RENESAS_PHY is not set
-# CONFIG_ROCKCHIP_PHY is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_STE10XP is not set
-# CONFIG_TERANETICS_PHY is not set
-CONFIG_VITESSE_PHY=m
-# CONFIG_XILINX_GMII2RGMII is not set
-# CONFIG_MICREL_KS8995MA is not set
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOL2TP=m
-CONFIG_PPP_ASYNC=m
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_SLIP is not set
-CONFIG_SLHC=m
-CONFIG_USB_NET_DRIVERS=y
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-# CONFIG_USB_LAN78XX is not set
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-# CONFIG_USB_NET_CDC_EEM is not set
-CONFIG_USB_NET_CDC_NCM=m
-# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set
-# CONFIG_USB_NET_CDC_MBIM is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_SR9700 is not set
-# CONFIG_USB_NET_SR9800 is not set
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-# CONFIG_USB_NET_GL620A is not set
-CONFIG_USB_NET_NET1080=m
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
-CONFIG_USB_NET_CDC_SUBSET=m
-# CONFIG_USB_ALI_M5632 is not set
-# CONFIG_USB_AN2720 is not set
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_KC2190 is not set
-CONFIG_USB_NET_ZAURUS=m
-# CONFIG_USB_NET_CX82310_ETH is not set
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-# CONFIG_USB_VL600 is not set
-# CONFIG_USB_NET_CH9200 is not set
-# CONFIG_USB_NET_AQC111 is not set
-# CONFIG_WLAN is not set
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
-# CONFIG_WAN is not set
-# CONFIG_NET_FAILOVER is not set
-# CONFIG_ISDN is not set
-# CONFIG_NVM is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_INPUT_SPARSEKMAP is not set
-# CONFIG_INPUT_MATRIXKMAP is not set
-
-#
-# Userland interfaces
-#
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-# CONFIG_RMI4_CORE is not set
-
-#
-# Hardware I/O ports
-#
-# CONFIG_SERIO is not set
-# CONFIG_GAMEPORT is not set
-# end of Hardware I/O ports
-# end of Input device support
-
-#
-# Character devices
-#
-CONFIG_TTY=y
-# CONFIG_VT is not set
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-# CONFIG_N_GSM is not set
-# CONFIG_TRACE_SINK is not set
-# CONFIG_NULL_TTY is not set
-CONFIG_LDISC_AUTOLOAD=y
-CONFIG_DEVMEM=y
-CONFIG_DEVKMEM=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-# CONFIG_SERIAL_8250_FINTEK is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=6
-CONFIG_SERIAL_8250_RUNTIME_UARTS=6
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SERIAL_8250_ASPEED_VUART is not set
-CONFIG_SERIAL_8250_DWLIB=y
-CONFIG_SERIAL_8250_DW=y
-# CONFIG_SERIAL_8250_RT288X is not set
-# CONFIG_SERIAL_8250_INGENIC is not set
-# CONFIG_SERIAL_OF_PLATFORM is not set
-
-#
-# Non-8250 serial port support
-#
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_MAX310X is not set
-# CONFIG_SERIAL_UARTLITE is not set
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-# CONFIG_SERIAL_SIFIVE is not set
-# CONFIG_SERIAL_SCCNXP is not set
-# CONFIG_SERIAL_SC16IS7XX is not set
-# CONFIG_SERIAL_BCM63XX is not set
-# CONFIG_SERIAL_ALTERA_JTAGUART is not set
-# CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_IFX6X60 is not set
-# CONFIG_SERIAL_XILINX_PS_UART is not set
-# CONFIG_SERIAL_ARC is not set
-# CONFIG_SERIAL_FSL_LPUART is not set
-# CONFIG_SERIAL_FSL_LINFLEXUART is not set
-# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
-# end of Serial drivers
-
-CONFIG_SERIAL_MCTRL_GPIO=y
-CONFIG_SERIAL_DEV_BUS=m
-# CONFIG_TTY_PRINTK is not set
-# CONFIG_IPMI_HANDLER is not set
-CONFIG_HW_RANDOM=m
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-CONFIG_HW_RANDOM_OCTEON=m
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_XILLYBUS is not set
-# end of Character devices
-
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-# CONFIG_I2C_CHARDEV is not set
-# CONFIG_I2C_MUX is not set
-CONFIG_I2C_HELPER_AUTO=y
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-# CONFIG_I2C_CBUS_GPIO is not set
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_IMG is not set
-# CONFIG_I2C_JZ4780 is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_SIMTEC is not set
-CONFIG_I2C_OCTEON=y
-# CONFIG_I2C_XILINX is not set
-
-#
-# External I2C/SMBus adapter drivers
-#
-# CONFIG_I2C_DIOLAN_U2C is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-
-#
-# Other I2C/SMBus bus drivers
-#
-# end of I2C Hardware Bus support
-
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_SLAVE is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# end of I2C support
-
-# CONFIG_I3C is not set
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_MEM=y
-
-#
-# SPI Master Controller Drivers
-#
-# CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_AXI_SPI_ENGINE is not set
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_CADENCE is not set
-# CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_NXP_FLEXSPI is not set
-# CONFIG_SPI_GPIO is not set
-# CONFIG_SPI_IMG_SPFI is not set
-# CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_OC_TINY is not set
-CONFIG_SPI_OCTEON=y
-# CONFIG_SPI_ROCKCHIP is not set
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_SIFIVE is not set
-# CONFIG_SPI_MXIC is not set
-# CONFIG_SPI_XCOMM is not set
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_ZYNQMP_GQSPI is not set
-
-#
-# SPI Protocol Masters
-#
-# CONFIG_SPI_SPIDEV is not set
-# CONFIG_SPI_LOOPBACK_TEST is not set
-# CONFIG_SPI_TLE62X0 is not set
-# CONFIG_SPI_SLAVE is not set
-# CONFIG_SPMI is not set
-# CONFIG_HSI is not set
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-# CONFIG_NTP_PPS is not set
-
-#
-# PPS clients support
-#
-# CONFIG_PPS_CLIENT_KTIMER is not set
-# CONFIG_PPS_CLIENT_LDISC is not set
-# CONFIG_PPS_CLIENT_GPIO is not set
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-CONFIG_PTP_1588_CLOCK=m
-
-#
-# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
-#
-# end of PTP clock support
-
-# CONFIG_PINCTRL is not set
-CONFIG_GPIOLIB=y
-CONFIG_GPIOLIB_FASTPATH_LIMIT=512
-CONFIG_OF_GPIO=y
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_GPIO_SYSFS is not set
-
-#
-# Memory mapped GPIO drivers
-#
-# CONFIG_GPIO_74XX_MMIO is not set
-# CONFIG_GPIO_ALTERA is not set
-# CONFIG_GPIO_CADENCE is not set
-# CONFIG_GPIO_DWAPB is not set
-# CONFIG_GPIO_FTGPIO010 is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_HLWD is not set
-# CONFIG_GPIO_MB86S7X is not set
-CONFIG_GPIO_OCTEON=y
-# CONFIG_GPIO_XILINX is not set
-# CONFIG_GPIO_AMD_FCH is not set
-# end of Memory mapped GPIO drivers
-
-#
-# I2C GPIO expanders
-#
-# CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_ADNP is not set
-# CONFIG_GPIO_GW_PLD is not set
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_TPIC2810 is not set
-# end of I2C GPIO expanders
-
-#
-# MFD GPIO expanders
-#
-# end of MFD GPIO expanders
-
-#
-# SPI GPIO expanders
-#
-# CONFIG_GPIO_74X164 is not set
-# CONFIG_GPIO_MAX3191X is not set
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_PISOSR is not set
-# CONFIG_GPIO_XRA1403 is not set
-# end of SPI GPIO expanders
-
-#
-# USB GPIO expanders
-#
-# end of USB GPIO expanders
-
-# CONFIG_GPIO_MOCKUP is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_AVS is not set
-# CONFIG_POWER_RESET is not set
-# CONFIG_POWER_SUPPLY is not set
-CONFIG_HWMON=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-# CONFIG_SENSORS_AD7314 is not set
-# CONFIG_SENSORS_AD7414 is not set
-# CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1029 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ADT7310 is not set
-# CONFIG_SENSORS_ADT7410 is not set
-# CONFIG_SENSORS_ADT7411 is not set
-# CONFIG_SENSORS_ADT7462 is not set
-# CONFIG_SENSORS_ADT7470 is not set
-# CONFIG_SENSORS_ADT7475 is not set
-# CONFIG_SENSORS_AS370 is not set
-# CONFIG_SENSORS_ASC7621 is not set
-# CONFIG_SENSORS_ASPEED is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_DS620 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
-# CONFIG_SENSORS_F75375S is not set
-# CONFIG_SENSORS_FTSTEUTATES is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_G760A is not set
-# CONFIG_SENSORS_G762 is not set
-# CONFIG_SENSORS_GPIO_FAN is not set
-# CONFIG_SENSORS_HIH6130 is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_JC42 is not set
-# CONFIG_SENSORS_POWR1220 is not set
-# CONFIG_SENSORS_LINEAGE is not set
-# CONFIG_SENSORS_LTC2945 is not set
-# CONFIG_SENSORS_LTC2990 is not set
-# CONFIG_SENSORS_LTC4151 is not set
-# CONFIG_SENSORS_LTC4215 is not set
-# CONFIG_SENSORS_LTC4222 is not set
-# CONFIG_SENSORS_LTC4245 is not set
-# CONFIG_SENSORS_LTC4260 is not set
-# CONFIG_SENSORS_LTC4261 is not set
-# CONFIG_SENSORS_MAX1111 is not set
-# CONFIG_SENSORS_MAX16065 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_MAX1668 is not set
-# CONFIG_SENSORS_MAX197 is not set
-# CONFIG_SENSORS_MAX31722 is not set
-# CONFIG_SENSORS_MAX6621 is not set
-# CONFIG_SENSORS_MAX6639 is not set
-# CONFIG_SENSORS_MAX6642 is not set
-# CONFIG_SENSORS_MAX6650 is not set
-# CONFIG_SENSORS_MAX6697 is not set
-# CONFIG_SENSORS_MAX31790 is not set
-# CONFIG_SENSORS_MCP3021 is not set
-# CONFIG_SENSORS_TC654 is not set
-# CONFIG_SENSORS_ADCXX is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM70 is not set
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
-# CONFIG_SENSORS_LM95234 is not set
-# CONFIG_SENSORS_LM95241 is not set
-# CONFIG_SENSORS_LM95245 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_NTC_THERMISTOR is not set
-# CONFIG_SENSORS_NCT6683 is not set
-# CONFIG_SENSORS_NCT6775 is not set
-# CONFIG_SENSORS_NCT7802 is not set
-# CONFIG_SENSORS_NCT7904 is not set
-# CONFIG_SENSORS_NPCM7XX is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_PMBUS is not set
-# CONFIG_SENSORS_SHT15 is not set
-# CONFIG_SENSORS_SHT21 is not set
-# CONFIG_SENSORS_SHT3x is not set
-# CONFIG_SENSORS_SHTC1 is not set
-# CONFIG_SENSORS_DME1737 is not set
-# CONFIG_SENSORS_EMC1403 is not set
-# CONFIG_SENSORS_EMC2103 is not set
-# CONFIG_SENSORS_EMC6W201 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47M192 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SCH5627 is not set
-# CONFIG_SENSORS_SCH5636 is not set
-# CONFIG_SENSORS_STTS751 is not set
-# CONFIG_SENSORS_SMM665 is not set
-# CONFIG_SENSORS_ADC128D818 is not set
-# CONFIG_SENSORS_ADS7828 is not set
-# CONFIG_SENSORS_ADS7871 is not set
-# CONFIG_SENSORS_AMC6821 is not set
-# CONFIG_SENSORS_INA209 is not set
-# CONFIG_SENSORS_INA2XX is not set
-# CONFIG_SENSORS_INA3221 is not set
-# CONFIG_SENSORS_TC74 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP102 is not set
-# CONFIG_SENSORS_TMP103 is not set
-# CONFIG_SENSORS_TMP108 is not set
-# CONFIG_SENSORS_TMP401 is not set
-CONFIG_SENSORS_TMP421=m
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_W83773G is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83791D is not set
-# CONFIG_SENSORS_W83792D is not set
-# CONFIG_SENSORS_W83793 is not set
-# CONFIG_SENSORS_W83795 is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83L786NG is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_THERMAL is not set
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_CORE=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
-CONFIG_WATCHDOG_OPEN_TIMEOUT=0
-# CONFIG_WATCHDOG_SYSFS is not set
-
-#
-# Watchdog Pretimeout Governors
-#
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
-
-#
-# Watchdog Device Drivers
-#
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_GPIO_WATCHDOG is not set
-# CONFIG_XILINX_WATCHDOG is not set
-# CONFIG_ZIIRAVE_WATCHDOG is not set
-# CONFIG_CADENCE_WATCHDOG is not set
-# CONFIG_DW_WATCHDOG is not set
-# CONFIG_MAX63XX_WATCHDOG is not set
-CONFIG_OCTEON_WDT=y
-# CONFIG_IMGPDC_WDT is not set
-# CONFIG_MEN_A21_WDT is not set
-
-#
-# USB-based Watchdog Cards
-#
-# CONFIG_USBPCWATCHDOG is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB is not set
-CONFIG_BCMA_POSSIBLE=y
-# CONFIG_BCMA is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_ACT8945A is not set
-# CONFIG_MFD_AS3711 is not set
-# CONFIG_MFD_AS3722 is not set
-# CONFIG_PMIC_ADP5520 is not set
-# CONFIG_MFD_AAT2870_CORE is not set
-# CONFIG_MFD_ATMEL_FLEXCOM is not set
-# CONFIG_MFD_ATMEL_HLCDC is not set
-# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_AXP20X_I2C is not set
-# CONFIG_MFD_MADERA is not set
-# CONFIG_PMIC_DA903X is not set
-# CONFIG_MFD_DA9052_SPI is not set
-# CONFIG_MFD_DA9052_I2C is not set
-# CONFIG_MFD_DA9055 is not set
-# CONFIG_MFD_DA9062 is not set
-# CONFIG_MFD_DA9063 is not set
-# CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
-# CONFIG_MFD_MC13XXX_SPI is not set
-# CONFIG_MFD_MC13XXX_I2C is not set
-# CONFIG_MFD_HI6421_PMIC is not set
-# CONFIG_HTC_PASIC3 is not set
-# CONFIG_HTC_I2CPLD is not set
-# CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_88PM800 is not set
-# CONFIG_MFD_88PM805 is not set
-# CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_MAX14577 is not set
-# CONFIG_MFD_MAX77620 is not set
-# CONFIG_MFD_MAX77650 is not set
-# CONFIG_MFD_MAX77686 is not set
-# CONFIG_MFD_MAX77693 is not set
-# CONFIG_MFD_MAX77843 is not set
-# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_MAX8925 is not set
-# CONFIG_MFD_MAX8997 is not set
-# CONFIG_MFD_MAX8998 is not set
-# CONFIG_MFD_MT6397 is not set
-# CONFIG_MFD_MENF21BMC is not set
-# CONFIG_EZX_PCAP is not set
-# CONFIG_MFD_CPCAP is not set
-# CONFIG_MFD_VIPERBOARD is not set
-# CONFIG_MFD_RETU is not set
-# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_RT5033 is not set
-# CONFIG_MFD_RC5T583 is not set
-# CONFIG_MFD_RK808 is not set
-# CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_SEC_CORE is not set
-# CONFIG_MFD_SI476X_CORE is not set
-# CONFIG_MFD_SM501 is not set
-# CONFIG_MFD_SKY81452 is not set
-# CONFIG_MFD_SMSC is not set
-# CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_SYSCON is not set
-# CONFIG_MFD_TI_AM335X_TSCADC is not set
-# CONFIG_MFD_LP3943 is not set
-# CONFIG_MFD_LP8788 is not set
-# CONFIG_MFD_TI_LMU is not set
-# CONFIG_MFD_PALMAS is not set
-# CONFIG_TPS6105X is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TPS6507X is not set
-# CONFIG_MFD_TPS65086 is not set
-# CONFIG_MFD_TPS65090 is not set
-# CONFIG_MFD_TPS65217 is not set
-# CONFIG_MFD_TI_LP873X is not set
-# CONFIG_MFD_TI_LP87565 is not set
-# CONFIG_MFD_TPS65218 is not set
-# CONFIG_MFD_TPS6586X is not set
-# CONFIG_MFD_TPS65910 is not set
-# CONFIG_MFD_TPS65912_I2C is not set
-# CONFIG_MFD_TPS65912_SPI is not set
-# CONFIG_MFD_TPS80031 is not set
-# CONFIG_TWL4030_CORE is not set
-# CONFIG_TWL6040_CORE is not set
-# CONFIG_MFD_WL1273_CORE is not set
-# CONFIG_MFD_LM3533 is not set
-# CONFIG_MFD_TC3589X is not set
-# CONFIG_MFD_TQMX86 is not set
-# CONFIG_MFD_LOCHNAGAR is not set
-# CONFIG_MFD_ARIZONA_I2C is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
-# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM831X_I2C is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8994 is not set
-# CONFIG_MFD_ROHM_BD718XX is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
-# CONFIG_MFD_STPMIC1 is not set
-# CONFIG_MFD_STMFX is not set
-# CONFIG_RAVE_SP_CORE is not set
-# end of Multifunction device drivers
-
-# CONFIG_REGULATOR is not set
-# CONFIG_RC_CORE is not set
-# CONFIG_MEDIA_SUPPORT is not set
-
-#
-# Graphics support
-#
-# CONFIG_DRM is not set
-# CONFIG_DRM_DP_CEC is not set
-
-#
-# ARM devices
-#
-# end of ARM devices
-
-#
-# ACP (Audio CoProcessor) Configuration
-#
-# end of ACP (Audio CoProcessor) Configuration
-
-#
-# Frame buffer Devices
-#
-# CONFIG_FB is not set
-# end of Frame buffer Devices
-
-#
-# Backlight & LCD device support
-#
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
-# end of Backlight & LCD device support
-# end of Graphics support
-
-# CONFIG_SOUND is not set
-
-#
-# HID support
-#
-# CONFIG_HID is not set
-
-#
-# USB HID support
-#
-# CONFIG_USB_HID is not set
-# CONFIG_HID_PID is not set
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-# end of USB HID Boot Protocol drivers
-# end of USB HID support
-
-#
-# I2C HID support
-#
-# CONFIG_I2C_HID is not set
-# end of I2C HID support
-# end of HID support
-
-CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
-# CONFIG_USB_ULPI_BUS is not set
-# CONFIG_USB_CONN_GPIO is not set
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEFAULT_PERSIST=y
-CONFIG_USB_DYNAMIC_MINORS=y
-# CONFIG_USB_OTG_WHITELIST is not set
-# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_AUTOSUSPEND_DELAY=2
-CONFIG_USB_MON=y
-
-#
-# USB Host Controller Drivers
-#
-# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
-# CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PLATFORM=y
-CONFIG_USB_EHCI_HCD=y
-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_EHCI_FSL is not set
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_OCTEON_EHCI=y
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_FOTG210_HCD is not set
-# CONFIG_USB_MAX3421_HCD is not set
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_HCD_PLATFORM=y
-CONFIG_USB_OCTEON_OHCI=y
-# CONFIG_USB_SL811_HCD is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_HCD_TEST_MODE is not set
-
-#
-# USB Device Class drivers
-#
-# CONFIG_USB_ACM is not set
-# CONFIG_USB_PRINTER is not set
-CONFIG_USB_WDM=m
-# CONFIG_USB_TMC is not set
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=y
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_REALTEK is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-# CONFIG_USB_STORAGE_ENE_UB6250 is not set
-# CONFIG_USB_UAS is not set
-
-#
-# USB Imaging devices
-#
-# CONFIG_USB_MDC800 is not set
-# CONFIG_USB_MICROTEK is not set
-# CONFIG_USBIP_CORE is not set
-# CONFIG_USB_CDNS3 is not set
-# CONFIG_USB_MUSB_HDRC is not set
-CONFIG_USB_DWC3=y
-CONFIG_USB_DWC3_HOST=y
-
-#
-# Platform Glue Driver Support
-#
-# CONFIG_USB_DWC2 is not set
-# CONFIG_USB_CHIPIDEA is not set
-# CONFIG_USB_ISP1760 is not set
-
-#
-# USB port drivers
-#
-# CONFIG_USB_SERIAL is not set
-
-#
-# USB Miscellaneous drivers
-#
-# CONFIG_USB_EMI62 is not set
-# CONFIG_USB_EMI26 is not set
-# CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_LEGOTOWER is not set
-# CONFIG_USB_LCD is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
-# CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_IDMOUSE is not set
-# CONFIG_USB_FTDI_ELAN is not set
-# CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_SISUSBVGA is not set
-# CONFIG_USB_LD is not set
-# CONFIG_USB_TRANCEVIBRATOR is not set
-# CONFIG_USB_IOWARRIOR is not set
-# CONFIG_USB_TEST is not set
-# CONFIG_USB_EHSET_TEST_FIXTURE is not set
-# CONFIG_USB_ISIGHTFW is not set
-# CONFIG_USB_YUREX is not set
-# CONFIG_USB_EZUSB_FX2 is not set
-# CONFIG_USB_HUB_USB251XB is not set
-# CONFIG_USB_HSIC_USB3503 is not set
-# CONFIG_USB_HSIC_USB4604 is not set
-# CONFIG_USB_LINK_LAYER_TEST is not set
-# CONFIG_USB_CHAOSKEY is not set
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_ISP1301 is not set
-# end of USB Physical Layer drivers
-
-# CONFIG_USB_GADGET is not set
-# CONFIG_TYPEC is not set
-# CONFIG_USB_ROLE_SWITCH is not set
-CONFIG_MMC=y
-CONFIG_PWRSEQ_EMMC=y
-CONFIG_PWRSEQ_SIMPLE=y
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_MINORS=8
-# CONFIG_SDIO_UART is not set
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_SDHCI=y
-# CONFIG_MMC_SDHCI_PLTFM is not set
-# CONFIG_MMC_SPI is not set
-CONFIG_MMC_CAVIUM_OCTEON=y
-# CONFIG_MMC_DW is not set
-# CONFIG_MMC_JZ4740 is not set
-# CONFIG_MMC_VUB300 is not set
-# CONFIG_MMC_USHC is not set
-# CONFIG_MMC_USDHI6ROL0 is not set
-# CONFIG_MMC_CQHCI is not set
-# CONFIG_MMC_MTK is not set
-# CONFIG_MEMSTICK is not set
-# CONFIG_NEW_LEDS is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_INFINIBAND is not set
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_RTC_LIB=y
-# CONFIG_RTC_CLASS is not set
-# CONFIG_DMADEVICES is not set
-
-#
-# DMABUF options
-#
-# CONFIG_SYNC_FILE is not set
-# end of DMABUF options
-
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
-# CONFIG_VIRT_DRIVERS is not set
-# CONFIG_VIRTIO_MENU is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-# end of Microsoft Hyper-V guest support
-
-# CONFIG_GREYBUS is not set
-CONFIG_STAGING=y
-# CONFIG_COMEDI is not set
-CONFIG_OCTEON_ETHERNET=y
-CONFIG_OCTEON_USB=y
-
-#
-# Speakup console speech
-#
-# end of Speakup console speech
-
-# CONFIG_STAGING_MEDIA is not set
-
-#
-# Android
-#
-# end of Android
-
-# CONFIG_LTE_GDM724X is not set
-# CONFIG_GS_FPGABOOT is not set
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_MOST is not set
-# CONFIG_PI433 is not set
-
-#
-# Gasket devices
-#
-# end of Gasket devices
-
-# CONFIG_XIL_AXIS_FIFO is not set
-# CONFIG_FIELDBUS_DEV is not set
-# CONFIG_USB_WUSB_CBAF is not set
-# CONFIG_UWB is not set
-# CONFIG_EXFAT_FS is not set
-CONFIG_MIPS_PLATFORM_DEVICES=y
-# CONFIG_GOLDFISH is not set
-# CONFIG_HWSPINLOCK is not set
-
-#
-# Clock Source drivers
-#
-# end of Clock Source drivers
-
-# CONFIG_MAILBOX is not set
-# CONFIG_IOMMU_SUPPORT is not set
-
-#
-# Remoteproc drivers
-#
-# CONFIG_REMOTEPROC is not set
-# end of Remoteproc drivers
-
-#
-# Rpmsg drivers
-#
-# CONFIG_RPMSG_VIRTIO is not set
-# end of Rpmsg drivers
-
-# CONFIG_SOUNDWIRE is not set
-
-#
-# SOC (System On Chip) specific Drivers
-#
-
-#
-# Amlogic SoC drivers
-#
-# end of Amlogic SoC drivers
-
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
-#
-# Broadcom SoC drivers
-#
-# end of Broadcom SoC drivers
-
-#
-# NXP/Freescale QorIQ SoC drivers
-#
-# end of NXP/Freescale QorIQ SoC drivers
-
-#
-# i.MX SoC drivers
-#
-# end of i.MX SoC drivers
-
-#
-# Qualcomm SoC drivers
-#
-# end of Qualcomm SoC drivers
-
-# CONFIG_SOC_TI is not set
-
-#
-# Xilinx SoC drivers
-#
-# CONFIG_XILINX_VCU is not set
-# end of Xilinx SoC drivers
-# end of SOC (System On Chip) specific Drivers
-
-# CONFIG_PM_DEVFREQ is not set
-# CONFIG_EXTCON is not set
-# CONFIG_MEMORY is not set
-# CONFIG_IIO is not set
-# CONFIG_PWM is not set
-
-#
-# IRQ chip support
-#
-CONFIG_IRQCHIP=y
-# CONFIG_AL_FIC is not set
-# CONFIG_INGENIC_TCU_IRQ is not set
-# end of IRQ chip support
-
-# CONFIG_IPACK_BUS is not set
-# CONFIG_RESET_CONTROLLER is not set
-
-#
-# PHY Subsystem
-#
-# CONFIG_GENERIC_PHY is not set
-# CONFIG_BCM_KONA_USB2_PHY is not set
-# CONFIG_PHY_CADENCE_DP is not set
-# CONFIG_PHY_CADENCE_DPHY is not set
-# CONFIG_PHY_FSL_IMX8MQ_USB is not set
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-# CONFIG_PHY_PXA_28NM_HSIC is not set
-# CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_MAPPHONE_MDM6600 is not set
-# end of PHY Subsystem
-
-# CONFIG_POWERCAP is not set
-# CONFIG_MCB is not set
-# CONFIG_RAS is not set
-
-#
-# Android
-#
-# CONFIG_ANDROID is not set
-# end of Android
-
-# CONFIG_LIBNVDIMM is not set
-# CONFIG_DAX is not set
-# CONFIG_NVMEM is not set
-
-#
-# HW tracing support
-#
-# CONFIG_STM is not set
-# CONFIG_INTEL_TH is not set
-# end of HW tracing support
-
-# CONFIG_FPGA is not set
-# CONFIG_FSI is not set
-# CONFIG_SIOX is not set
-# CONFIG_SLIMBUS is not set
-# CONFIG_INTERCONNECT is not set
-# CONFIG_COUNTER is not set
-# end of Device Drivers
-
-#
-# File systems
-#
-# CONFIG_VALIDATE_FS_PARSER is not set
-CONFIG_FS_IOMAP=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=y
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_NILFS2_FS is not set
-# CONFIG_F2FS_FS is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=y
-# CONFIG_EXPORTFS_BLOCK_OPS is not set
-CONFIG_FILE_LOCKING=y
-CONFIG_MANDATORY_FILE_LOCKING=y
-# CONFIG_FS_ENCRYPTION is not set
-# CONFIG_FS_VERITY is not set
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
-# CONFIG_QUOTA is not set
-CONFIG_AUTOFS4_FS=y
-CONFIG_AUTOFS_FS=y
-# CONFIG_FUSE_FS is not set
-CONFIG_OVERLAY_FS=y
-# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
-# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
-# CONFIG_OVERLAY_FS_INDEX is not set
-# CONFIG_OVERLAY_FS_XINO_AUTO is not set
-# CONFIG_OVERLAY_FS_METACOPY is not set
-
-#
-# Caches
-#
-# CONFIG_FSCACHE is not set
-# end of Caches
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-# end of CD-ROM/DVD Filesystems
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=y
-# CONFIG_MSDOS_FS is not set
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_FAT_DEFAULT_UTF8 is not set
-# CONFIG_NTFS_FS is not set
-# end of DOS/FAT/NT Filesystems
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PROC_CHILDREN is not set
-CONFIG_KERNFS=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_CONFIGFS_FS=m
-# end of Pseudo filesystems
-
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ORANGEFS_FS is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-# CONFIG_CRAMFS is not set
-CONFIG_SQUASHFS=y
-CONFIG_SQUASHFS_FILE_CACHE=y
-# CONFIG_SQUASHFS_FILE_DIRECT is not set
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
-# CONFIG_SQUASHFS_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_XATTR=y
-CONFIG_SQUASHFS_ZLIB=y
-# CONFIG_SQUASHFS_LZ4 is not set
-CONFIG_SQUASHFS_LZO=y
-CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZSTD is not set
-# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX6FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_PSTORE is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-# CONFIG_EROFS_FS is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=y
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_MAC_ROMAN is not set
-# CONFIG_NLS_MAC_CELTIC is not set
-# CONFIG_NLS_MAC_CENTEURO is not set
-# CONFIG_NLS_MAC_CROATIAN is not set
-# CONFIG_NLS_MAC_CYRILLIC is not set
-# CONFIG_NLS_MAC_GAELIC is not set
-# CONFIG_NLS_MAC_GREEK is not set
-# CONFIG_NLS_MAC_ICELAND is not set
-# CONFIG_NLS_MAC_INUIT is not set
-# CONFIG_NLS_MAC_ROMANIAN is not set
-# CONFIG_NLS_MAC_TURKISH is not set
-# CONFIG_NLS_UTF8 is not set
-# CONFIG_DLM is not set
-# CONFIG_UNICODE is not set
-# end of File systems
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
-# CONFIG_SECURITYFS is not set
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
-# CONFIG_SECURITY_PATH is not set
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-# CONFIG_HARDENED_USERCOPY is not set
-# CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-# CONFIG_SECURITY_APPARMOR is not set
-# CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
-# CONFIG_SECURITY_SAFESETID is not set
-# CONFIG_SECURITY_LOCKDOWN_LSM is not set
-CONFIG_INTEGRITY=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
-# CONFIG_IMA is not set
-# CONFIG_EVM is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
-
-#
-# Kernel hardening options
-#
-
-#
-# Memory initialization
-#
-CONFIG_INIT_STACK_NONE=y
-# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
-# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
-# end of Memory initialization
-# end of Kernel hardening options
-# end of Security options
-
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=m
-CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-# CONFIG_CRYPTO_USER is not set
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_NULL2=y
-# CONFIG_CRYPTO_PCRYPT is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-CONFIG_CRYPTO_AUTHENC=m
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Public-key cryptography
-#
-# CONFIG_CRYPTO_RSA is not set
-# CONFIG_CRYPTO_DH is not set
-# CONFIG_CRYPTO_ECDH is not set
-# CONFIG_CRYPTO_ECRDSA is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-# CONFIG_CRYPTO_CCM is not set
-CONFIG_CRYPTO_GCM=m
-# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
-# CONFIG_CRYPTO_AEGIS128 is not set
-CONFIG_CRYPTO_SEQIV=m
-CONFIG_CRYPTO_ECHAINIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=y
-# CONFIG_CRYPTO_CFB is not set
-CONFIG_CRYPTO_CTR=m
-# CONFIG_CRYPTO_CTS is not set
-CONFIG_CRYPTO_ECB=y
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_OFB is not set
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-# CONFIG_CRYPTO_KEYWRAP is not set
-# CONFIG_CRYPTO_ADIANTUM is not set
-# CONFIG_CRYPTO_ESSIV is not set
-
-#
-# Hash modes
-#
-# CONFIG_CRYPTO_CMAC is not set
-CONFIG_CRYPTO_HMAC=y
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_VMAC is not set
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_CRC32 is not set
-# CONFIG_CRYPTO_XXHASH is not set
-# CONFIG_CRYPTO_CRCT10DIF is not set
-CONFIG_CRYPTO_GHASH=m
-# CONFIG_CRYPTO_POLY1305 is not set
-# CONFIG_CRYPTO_MD4 is not set
-CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_MD5_OCTEON is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-CONFIG_CRYPTO_SHA1=m
-# CONFIG_CRYPTO_SHA1_OCTEON is not set
-CONFIG_CRYPTO_LIB_SHA256=m
-CONFIG_CRYPTO_SHA256=m
-# CONFIG_CRYPTO_SHA256_OCTEON is not set
-CONFIG_CRYPTO_SHA512=m
-# CONFIG_CRYPTO_SHA512_OCTEON is not set
-# CONFIG_CRYPTO_SHA3 is not set
-# CONFIG_CRYPTO_SM3 is not set
-# CONFIG_CRYPTO_STREEBOG is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_WP512 is not set
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARC4=m
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-CONFIG_CRYPTO_LIB_DES=y
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_CHACHA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SM4 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=m
-# CONFIG_CRYPTO_LZO is not set
-# CONFIG_CRYPTO_842 is not set
-# CONFIG_CRYPTO_LZ4 is not set
-# CONFIG_CRYPTO_LZ4HC is not set
-# CONFIG_CRYPTO_ZSTD is not set
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=m
-CONFIG_CRYPTO_DRBG_HMAC=y
-# CONFIG_CRYPTO_DRBG_HASH is not set
-# CONFIG_CRYPTO_DRBG_CTR is not set
-CONFIG_CRYPTO_DRBG=m
-CONFIG_CRYPTO_JITTERENTROPY=m
-CONFIG_CRYPTO_USER_API=m
-CONFIG_CRYPTO_USER_API_HASH=m
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-# CONFIG_CRYPTO_USER_API_RNG is not set
-# CONFIG_CRYPTO_USER_API_AEAD is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
-# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
-# CONFIG_CRYPTO_DEV_IMGTEC_HASH is not set
-# CONFIG_CRYPTO_DEV_SAFEXCEL is not set
-# CONFIG_CRYPTO_DEV_CCREE is not set
-
-#
-# Certificates for signature checking
-#
-# end of Certificates for signature checking
-
-#
-# Library routines
-#
-# CONFIG_PACKING is not set
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_NET_UTILS=y
-# CONFIG_CORDIC is not set
-CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
-# CONFIG_CRC_ITU_T is not set
-CONFIG_CRC32=y
-# CONFIG_CRC32_SELFTEST is not set
-CONFIG_CRC32_SLICEBY8=y
-# CONFIG_CRC32_SLICEBY4 is not set
-# CONFIG_CRC32_SARWATE is not set
-# CONFIG_CRC32_BIT is not set
-# CONFIG_CRC64 is not set
-# CONFIG_CRC4 is not set
-# CONFIG_CRC7 is not set
-CONFIG_LIBCRC32C=m
-# CONFIG_CRC8 is not set
-# CONFIG_RANDOM32_SELFTEST is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_XZ_DEC=y
-# CONFIG_XZ_DEC_X86 is not set
-# CONFIG_XZ_DEC_POWERPC is not set
-# CONFIG_XZ_DEC_IA64 is not set
-# CONFIG_XZ_DEC_ARM is not set
-# CONFIG_XZ_DEC_ARMTHUMB is not set
-# CONFIG_XZ_DEC_SPARC is not set
-# CONFIG_XZ_DEC_TEST is not set
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAS_DMA=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_DMA_DECLARE_COHERENT=y
-CONFIG_SWIOTLB=y
-# CONFIG_DMA_API_DEBUG is not set
-CONFIG_SGL_ALLOC=y
-CONFIG_CPU_RMAP=y
-CONFIG_DQL=y
-CONFIG_NLATTR=y
-# CONFIG_IRQ_POLL is not set
-CONFIG_LIBFDT=y
-CONFIG_HAVE_GENERIC_VDSO=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FONT_8x16=y
-CONFIG_FONT_AUTOSELECT=y
-CONFIG_SG_POOL=y
-CONFIG_SBITMAP=y
-# CONFIG_STRING_SELFTEST is not set
-# end of Library routines
-
-CONFIG_GENERIC_LIB_ASHLDI3=y
-CONFIG_GENERIC_LIB_ASHRDI3=y
-CONFIG_GENERIC_LIB_LSHRDI3=y
-CONFIG_GENERIC_LIB_CMPDI2=y
-CONFIG_GENERIC_LIB_UCMPDI2=y
-
-#
-# Kernel hacking
-#
-
-#
-# printk and dmesg options
-#
-CONFIG_PRINTK_TIME=y
-# CONFIG_PRINTK_CALLER is not set
-CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
-CONFIG_CONSOLE_LOGLEVEL_QUIET=4
-CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# end of printk and dmesg options
-
-#
-# Compile-time checks and compiler options
-#
-# CONFIG_DEBUG_INFO is not set
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=2048
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_READABLE_ASM is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_INSTALL is not set
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# end of Compile-time checks and compiler options
-
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
-CONFIG_MAGIC_SYSRQ_SERIAL=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MISC=y
-
-#
-# Memory Debugging
-#
-# CONFIG_PAGE_EXTENSION is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_PAGE_OWNER is not set
-# CONFIG_PAGE_POISONING is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SLAB is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-CONFIG_CC_HAS_KASAN_GENERIC=y
-CONFIG_KASAN_STACK=1
-# end of Memory Debugging
-
-CONFIG_CC_HAS_SANCOV_TRACE_PC=y
-# CONFIG_DEBUG_SHIRQ is not set
-
-#
-# Debug Lockups and Hangs
-#
-# CONFIG_SOFTLOCKUP_DETECTOR is not set
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=1
-# CONFIG_WQ_WATCHDOG is not set
-# end of Debug Lockups and Hangs
-
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_PANIC_TIMEOUT=0
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_STACK_END_CHECK is not set
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_RWSEMS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_LOCK_TORTURE_TEST is not set
-# CONFIG_WW_MUTEX_SELFTEST is not set
-# end of Lock Debugging (spinlocks, mutexes, etc...)
-
-# CONFIG_STACKTRACE is not set
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_PLIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-
-#
-# RCU Debugging
-#
-# CONFIG_RCU_PERF_TEST is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_RCU_TRACE is not set
-# CONFIG_RCU_EQS_DEBUG is not set
-# end of RCU Debugging
-
-# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
-# CONFIG_NOTIFIER_ERROR_INJECTION is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_FTRACE is not set
-CONFIG_RUNTIME_TESTING_MENU=y
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_TEST_SORT is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_RBTREE_TEST is not set
-# CONFIG_REED_SOLOMON_TEST is not set
-# CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_PERCPU_TEST is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-# CONFIG_TEST_HEXDUMP is not set
-# CONFIG_TEST_STRING_HELPERS is not set
-# CONFIG_TEST_STRSCPY is not set
-# CONFIG_TEST_KSTRTOX is not set
-# CONFIG_TEST_PRINTF is not set
-# CONFIG_TEST_BITMAP is not set
-# CONFIG_TEST_BITFIELD is not set
-# CONFIG_TEST_UUID is not set
-# CONFIG_TEST_XARRAY is not set
-# CONFIG_TEST_OVERFLOW is not set
-# CONFIG_TEST_RHASHTABLE is not set
-# CONFIG_TEST_HASH is not set
-# CONFIG_TEST_IDA is not set
-# CONFIG_TEST_LKM is not set
-# CONFIG_TEST_VMALLOC is not set
-# CONFIG_TEST_USER_COPY is not set
-# CONFIG_TEST_BPF is not set
-# CONFIG_TEST_BLACKHOLE_DEV is not set
-# CONFIG_FIND_BIT_BENCHMARK is not set
-# CONFIG_TEST_FIRMWARE is not set
-# CONFIG_TEST_SYSCTL is not set
-# CONFIG_TEST_UDELAY is not set
-# CONFIG_TEST_STATIC_KEYS is not set
-# CONFIG_TEST_KMOD is not set
-# CONFIG_TEST_MEMCAT_P is not set
-# CONFIG_TEST_STACKINIT is not set
-# CONFIG_TEST_MEMINIT is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_BUG_ON_DATA_CORRUPTION is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_UBSAN is not set
-CONFIG_UBSAN_ALIGNMENT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="rootwait rootflags=data=journal"
-# CONFIG_CMDLINE_OVERRIDE is not set
-# end of Kernel hacking
diff --git a/main/linux-octeon/octeon-disable-devicetree-deprecation-warning.patch b/main/linux-octeon/octeon-disable-devicetree-deprecation-warning.patch
deleted file mode 100644
index 39e55e9c43e..00000000000
--- a/main/linux-octeon/octeon-disable-devicetree-deprecation-warning.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Disable device tree deprecation warnings, they're burned into ROM and we
-cannot do anything about them.
-
-diff -urN linux-5.4.orig/arch/mips/cavium-octeon/executive/cvmx-helper-board.c linux-5.4/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
---- linux-5.4.orig/arch/mips/cavium-octeon/executive/cvmx-helper-board.c	2019-12-22 15:48:45.702104526 +0000
-+++ linux-5.4/arch/mips/cavium-octeon/executive/cvmx-helper-board.c	2019-12-22 15:49:50.470135827 +0000
-@@ -211,8 +211,10 @@
- {
- 	cvmx_helper_link_info_t result;
- 
-+#if 0
- 	WARN(!octeon_is_simulation(),
- 	     "Using deprecated link status - please update your DT");
-+#endif
- 
- 	/* Unless we fix it later, all links are defaulted to down */
- 	result.u64 = 0;
-diff -urN linux-5.4.orig/arch/mips/cavium-octeon/executive/cvmx-helper.c linux-5.4/arch/mips/cavium-octeon/executive/cvmx-helper.c
---- linux-5.4.orig/arch/mips/cavium-octeon/executive/cvmx-helper.c	2019-12-22 15:48:45.702104526 +0000
-+++ linux-5.4/arch/mips/cavium-octeon/executive/cvmx-helper.c	2019-12-22 15:50:37.328711499 +0000
-@@ -1100,7 +1100,9 @@
- 		if (index == 0)
- 			result = __cvmx_helper_rgmii_link_get(ipd_port);
- 		else {
-+#if 0
- 			WARN(1, "Using deprecated link status - please update your DT");
-+#endif
- 			result.s.full_duplex = 1;
- 			result.s.link_up = 1;
- 			result.s.speed = 1000;
diff --git a/main/linux-octeon/octeon-rd_name.patch b/main/linux-octeon/octeon-rd_name.patch
deleted file mode 100644
index 02fea130c24..00000000000
--- a/main/linux-octeon/octeon-rd_name.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From: David Daney <david.daney@cavium.com>
-
-If 'rd_name=xxx' is passed to the kernel, the named block with name
-'xxx' is used for the initrd.
-
-Signed-off-by: David Daney <david.daney@cavium.com>
-Signed-off-by: Leonid Rosenboim <lrosenboim@caviumnetworks.com>
-Signed-off-by: Aleksey Makarov <aleksey.makarov@auriga.com>
-Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
-[forward porting to 5.4]
-
---- a/arch/mips/cavium-octeon/setup.c
-+++ b/arch/mips/cavium-octeon/setup.c
-@@ -28,6 +28,7 @@
- #include <linux/of_fdt.h>
- #include <linux/libfdt.h>
- #include <linux/kexec.h>
-+#include <linux/initrd.h>
- 
- #include <asm/processor.h>
- #include <asm/reboot.h>
-@@ -298,6 +299,9 @@
- 
- extern asmlinkage void handle_int(void);
- 
-+/* If an initrd named block is specified, its name goes here. */
-+static char rd_name[64] __initdata;
-+
- /**
-  * Return non zero if we are currently running in the Octeon simulator
-  *
-@@ -877,6 +881,10 @@
- 				max_memory = 32ull << 30;
- 			if (*p == '@')
- 				reserve_low_mem = memparse(p + 1, &p);
-+		} else if (strncmp(arg, "rd_name=", 8) == 0) {
-+			strncpy(rd_name, arg + 8, sizeof(rd_name));
-+			rd_name[sizeof(rd_name) - 1] = 0;
-+			goto append_arg;
- #ifdef CONFIG_KEXEC
- 		} else if (strncmp(arg, "crashkernel=", 12) == 0) {
- 			crashk_size = memparse(arg+12, &p);
-@@ -889,11 +897,15 @@
- 			 * parse_crashkernel(arg, sysinfo->system_dram_size,
- 			 *		  &crashk_size, &crashk_base);
- 			 */
-+			goto append_arg;
- #endif
--		} else if (strlen(arcs_cmdline) + strlen(arg) + 1 <
--			   sizeof(arcs_cmdline) - 1) {
--			strcat(arcs_cmdline, " ");
--			strcat(arcs_cmdline, arg);
-+		} else {
-+append_arg:
-+			if (strlen(arcs_cmdline) + strlen(arg) + 1
-+				< sizeof(arcs_cmdline) - 1) {
-+				strcat(arcs_cmdline, " ");
-+				strcat(arcs_cmdline, arg);
-+			}
- 		}
- 	}
- 
-@@ -978,6 +990,23 @@
- 
- 	total = 0;
- 	crashk_end = 0;
-+
-+#ifdef CONFIG_BLK_DEV_INITRD
-+
-+	if (rd_name[0]) {
-+		const struct cvmx_bootmem_named_block_desc *initrd_block;
-+
-+		initrd_block = cvmx_bootmem_find_named_block(rd_name);
-+		if (initrd_block != NULL) {
-+			initrd_start = initrd_block->base_addr + PAGE_OFFSET;
-+			initrd_end = initrd_start + initrd_block->size;
-+			add_memory_region(initrd_block->base_addr,
-+				initrd_block->size, BOOT_MEM_INIT_RAM);
-+			initrd_in_reserved = 1;
-+			total += initrd_block->size;
-+		}
-+	}
-+#endif
- 
- 	/*
- 	 * The Mips memory init uses the first memory location for
---- a/arch/mips/include/asm/bootinfo.h
-+++ b/arch/mips/include/asm/bootinfo.h
-@@ -167,4 +167,8 @@
- #endif /* CONFIG_RELOCATABLE */
- #endif /* CONFIG_USE_OF */
- 
-+#ifdef CONFIG_BLK_DEV_INITRD
-+extern bool initrd_in_reserved;
-+#endif
-+
- #endif /* _ASM_BOOTINFO_H */
---- a/arch/mips/kernel/setup.c
-+++ b/arch/mips/kernel/setup.c
-@@ -63,6 +63,10 @@
- 
- EXPORT_SYMBOL(mips_machtype);
- 
-+#ifdef CONFIG_BLK_DEV_INITRD
-+bool initrd_in_reserved;
-+#endif
-+
- static char __initdata command_line[COMMAND_LINE_SIZE];
- char __initdata arcs_cmdline[COMMAND_LINE_SIZE];
- 
-@@ -310,6 +314,12 @@
- 	 * will reserve the area used for the initrd.
- 	 */
- 	init_initrd();
-+
-+#ifdef CONFIG_BLK_DEV_INITRD
-+	if (initrd_in_reserved) {
-+		pr_info("Initramfs image loaded from rd_name= parameter.\n");
-+	}
-+#endif
- 
- 	/* Reserve memory occupied by kernel. */
- 	memblock_reserve(__pa_symbol(&_text),
diff --git a/main/linux-octeon/ubnt-e200-sdio-underclock.patch b/main/linux-octeon/ubnt-e200-sdio-underclock.patch
deleted file mode 100644
index 423917ac52e..00000000000
--- a/main/linux-octeon/ubnt-e200-sdio-underclock.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Underclock the SDIO bus on E200 devices.
-
-Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
-Upstream-status: Not yet submitted
-
---- a/arch/mips/cavium-octeon/octeon-platform.c
-+++ b/arch/mips/cavium-octeon/octeon-platform.c
-@@ -760,6 +760,28 @@
- 	}
- }
- 
-+int __init alpine_prune_device_tree(void)
-+{
-+	if (fdt_check_header(initial_boot_params))
-+		panic("Corrupt Device Tree.");
-+
-+	/* UBNT underclocks the SDIO bus on E200.  We do the same here. */
-+	if (octeon_bootinfo->board_type == CVMX_BOARD_TYPE_UBNT_E200 || octeon_bootinfo->board_type == CVMX_BOARD_TYPE_UBNT_E220) {
-+		int mmc_slot0;
-+		u32 freq = 26000000;
-+
-+		pr_info("UBNT E200 board detected, underclocking SDIO bus.\n");
-+
-+		mmc_slot0 = fdt_path_offset(initial_boot_params, "/soc/mmc/mmc-slot@0");
-+		if (mmc_slot0 > 0) {
-+			fdt_setprop_inplace_cell(initial_boot_params, mmc_slot0,
-+				"spi-max-frequency", freq);
-+		}
-+	}
-+
-+	return 0;
-+}
-+
- int __init octeon_prune_device_tree(void)
- {
- 	int i, max_port, uart_mask;
---- a/arch/mips/cavium-octeon/setup.c
-+++ b/arch/mips/cavium-octeon/setup.c
-@@ -1184,6 +1184,7 @@
- }
- 
- void __init octeon_fill_mac_addresses(void);
-+int alpine_prune_device_tree(void);
- 
- void __init device_tree_init(void)
- {
-@@ -1219,6 +1220,9 @@
- 		octeon_prune_device_tree();
- 		pr_info("Using internal Device Tree.\n");
- 	}
-+
-+	alpine_prune_device_tree();
-+
- 	if (fill_mac)
- 		octeon_fill_mac_addresses();
- 	unflatten_and_copy_device_tree();
---- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
-+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
-@@ -295,6 +295,9 @@
- 	 */
- 	CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001,
- 	CVMX_BOARD_TYPE_UBNT_E100 = 20002,
-+	CVMX_BOARD_TYPE_UBNT_E200 = 20003,
-+	CVMX_BOARD_TYPE_UBNT_E120 = 20004,
-+	CVMX_BOARD_TYPE_UBNT_E220 = 20005,
- 	CVMX_BOARD_TYPE_CUST_DSR1000N = 20006,
- 	CVMX_BOARD_TYPE_KONTRON_S1901 = 21901,
- 	CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
-@@ -396,6 +399,9 @@
- 		    /* Customer private range */
- 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN)
- 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100)
-+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E200)
-+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E120)
-+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E220)
- 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N)
- 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KONTRON_S1901)
- 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
diff --git a/main/linux-pam/APKBUILD b/main/linux-pam/APKBUILD
index 1127799afd4..7b8209a277b 100644
--- a/main/linux-pam/APKBUILD
+++ b/main/linux-pam/APKBUILD
@@ -1,23 +1,30 @@
 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=linux-pam
-pkgver=1.3.1
-pkgrel=3
+pkgver=1.6.0
+pkgrel=0
 pkgdesc="Linux PAM (Pluggable Authentication Modules for Linux)"
 url="https://www.kernel.org/pub/linux/libs/pam"
 arch="all"
 license="BSD-3-Clause"
 depends_dev="gettext-dev"
-makedepends="$depends_dev bison flex-dev autoconf automake libtool"
+makedepends="
+	$depends_dev
+	autoconf
+	automake
+	bison
+	flex-dev
+	libtool
+	linux-headers
+	utmps-dev
+	"
 options="suid !check"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-dev $pkgname-manual::noarch $pkgname-doc"
 source="
 	https://github.com/linux-pam/linux-pam/releases/download/v$pkgver/Linux-PAM-$pkgver.tar.xz
-	fix-compat.patch
-	libpam-fix-build-with-eglibc-2.16.patch
-	musl-fix_uint.patch
-	musl-fix-pam_exec.patch
+	https://github.com/linux-pam/linux-pam/releases/download/v$pkgver/Linux-PAM-$pkgver-docs.tar.xz
+	pam_namespace.patch
 
 	base-auth.pamd
 	base-account.pamd
@@ -25,22 +32,20 @@ source="
 	base-session.pamd
 	base-session-noninteractive.pamd
 	other.pamd
-	system-local-login.pamd
-	system-login.pamd
+	login.pamd
 	su.pamd
 	"
-
 builddir="$srcdir"/Linux-PAM-$pkgver
-prepare() {
-	default_prepare
-	# disable insecure modules
-	sed -e 's/pam_rhosts//g' -i modules/Makefile.am
 
-	autoreconf -vif
-}
+# secfixes:
+#   1.6.0-r0:
+#     - CVE-2024-22365
+#   1.5.1-r0:
+#     - CVE-2020-27780
 
 build() {
-	[ "$CLIBC" = "musl" ] && export ac_cv_search_crypt=no
+	export CFLAGS="$CFLAGS -flto=auto $(pkg-config --cflags utmps)"
+	export LDFLAGS="$LDFLAGS $(pkg-config --libs utmps)"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -51,7 +56,8 @@ build() {
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
 		--disable-nls \
-		--disable-db
+		--disable-db \
+		--disable-examples
 	make
 }
 
@@ -59,32 +65,44 @@ package() {
 	make DESTDIR="$pkgdir" install
 
 	# install our pam.d files
-	mkdir "$pkgdir"/etc/pam.d
-	for i in $source; do
-		case $i in
-		*.pamd)
-			basename=$(echo $i | cut -d. -f1)
-			cp "$srcdir"/$i "$pkgdir"/etc/pam.d/"$basename"
-			;;
-		esac
-	done
+	install -Dm644 "$srcdir"/base-auth.pamd "$pkgdir"/etc/pam.d/base-auth
+	install -Dm644 "$srcdir"/base-password.pamd "$pkgdir"/etc/pam.d/base-password
+	install -Dm644 "$srcdir"/base-account.pamd "$pkgdir"/etc/pam.d/base-account
+	install -Dm644 "$srcdir"/base-session.pamd "$pkgdir"/etc/pam.d/base-session
+	install -Dm644 "$srcdir"/base-session-noninteractive.pamd \
+		"$pkgdir"/etc/pam.d/base-session-noninteractive
+	install -Dm644 "$srcdir"/other.pamd "$pkgdir"/etc/pam.d/other
+	install -Dm644 "$srcdir"/login.pamd "$pkgdir"/etc/pam.d/login
+	install -Dm644 "$srcdir"/su.pamd "$pkgdir"/etc/pam.d/su
 
-	# delete pointless libtool archives.
+	# make "unix_chkpwd" shadow group and enable g+s
 	chgrp shadow "$pkgdir"/sbin/unix_chkpwd \
 		&& chmod g+s "$pkgdir"/sbin/unix_chkpwd
+
+	# wrong dir due to libdir
+	mkdir -p "$pkgdir"/usr/lib
+	mv "$pkgdir"/lib/pkgconfig "$pkgdir"/usr/lib/pkgconfig
+
+	# we don't ship systemd
+	rm -r "$pkgdir"/usr/lib/systemd
+}
+
+manual() {
+	pkgdesc="$pkgdesc (manual)"
+
+	amove usr/share/doc/Linux-PAM
 }
 
-sha512sums="6bc8e2a5b64686f0a23846221c5228c88418ba485b17c53b3a12f91262b5bb73566d6b6a5daa1f63bbae54310aee918b987e44a72ce809b4e7c668f0fadfe08e  Linux-PAM-1.3.1.tar.xz
-52b97e23084f7b835ce1fa441663f91a50ea797cb38ba2c6662bcdaf0d25ba487118442674ac347fb17353af126dd6b3b696612faa56cac428dd842d14e1c90d  fix-compat.patch
-24ec4c755b4034189ea05b1af69269e094964efd745b470a6ccb268e80550b56c96027214e918168aa942aa426bfe0b1487801e95ef2bf0c488f47eb49f1d9e1  libpam-fix-build-with-eglibc-2.16.patch
-e5be6afc369f5d3816919537f89cd0ec005573dca9441937cbc3362fd58f74c993c47b80792203dc18eba34fd8bd1deafadb6543e0df4d93f92b0fb9eed01313  musl-fix_uint.patch
-08323428e13f65300d7638233fd8ab25c582a08ffe0a282ed43f69ccb428dea9eb185da3ae9dd2634f021c16592f194f99348758bd9e761c29435652b544f543  musl-fix-pam_exec.patch
-ea6a10957ba9ec50d982bfabafb35060426ac797936f874097b4fa7620b89fd2ba3be9757401f9b787956fb23879d8ef73676f7703e75fcef3dca0b9559c4167  base-auth.pamd
-85462201a4044c7e170e617d39b0eceb4790abc6c0504999117548030a16d80a9d2078d1ad97690d7d346e6374201f0c52e792ccb08ce2b1c4bbf0cc2be96f5b  base-account.pamd
-8223b815148c3b9b874d2c283840f6428c266e56c7cf49ce8fc508c4945ae31c837bef96dab17f64a60812d1c9cd0055cf0a50d7951d23070b69bd2e5bb9666d  base-password.pamd
-6e262f1b1bb4cc01f43c0c3cb72136ebd976d25cb27ca35fd8a76b3dfd57e9938e359d20671f4077ad75b1d38cb944596539220a44d9b6b92cc234605a95ada1  base-session.pamd
-444e20046843057b17c0aac14d2b71a68923b989b3d8b478bbf684698673683186e928e5ca2e6cb9a1c76abc4248044a0e10ef6b06b3f51857106796ecce250d  base-session-noninteractive.pamd
-d103ba06b2c4929171e09c845f9866539220cd20d8d56a03d25850342ef5eabe281e958dfe1eaefd550c00f9440e8700c1d74c88c3001f933134ca6fd7cb9b7b  other.pamd
-83cc3d84ef5afded9afd4d347132901b9adcbd8b21be45b80d010370a2082e8388a713eb78d052944bc47b07fd7383edf18e2674d9d0545215cc45e14a2e14b1  system-local-login.pamd
-80b8b8153f7537190a5f6dc965169e5ab4b535a01024e554b14aa99ec5f6428740da54087e4c186978a3df0f9a5b62d37ae5cd35dd69a31c1d5ba71166b1f1a6  system-login.pamd
-b512d691f2a6b11fc329bf91dd05ca9c589bbd444308b27d3c87c75262dedf6afc68a9739229249a4bd3d0c43cb1f871eecbb93c4fe559e0f38bdabbffd06ad7  su.pamd"
+sha512sums="
+7af07edb71a79275ad7f7f3bd82a4619b12a23a10f5fb2e5d810c6aadb718fd739ed17ca336c3420945d48d326e91874d8e45cfc5a4bf01a0cc5f9663bd2a0ad  Linux-PAM-1.6.0.tar.xz
+e21d939c71edfccfce5378fce0b317b7deadffa21a84b11164baa10bdf129354f01291d15df2e0a2db5e21b47578be8ddca477cb95f735b3cc10d32972df46de  Linux-PAM-1.6.0-docs.tar.xz
+e9593ffb9bc29368c8e12fef770562bffd84001053bee5c4b0b859d4b39c675a13c1f9b689c619b78f61eee23a152e5a64ece4cca81d4306049a9108167cc708  pam_namespace.patch
+988e4ba32fe6b7adeb4898c784eb40d6f88f3fca78ead82b61686f0e1597f306abb3ee338aa2e4cf2db0191b8c1a7e319332e7f6d6aed3ab381f71c0a3355de9  base-auth.pamd
+5d3e960ead44dcb2b3f732825482eefab9a9ffa4d4d5fc1d30cbf2fe8c5c896f1114a0ad3a6c606fa9fbf5c43400388f4ee8d7fca8110721eabfc9691004756b  base-account.pamd
+b3a900d6067ba04faa8016d9408da75917e8c0502020a4048bba1de2ca54c705c4d5f8307e759080fd5a9d5f3522f52a708803f1f01627eac56d9d7c6d363d13  base-password.pamd
+d963071b93c1178a15142db1929bd8cc5c46654fa68e299c4bcf1d4325adbc541195df7c034221daf6cc7f8937d771b5707acbdd36eee98a36180ee07529138d  base-session.pamd
+2f18114b8a6a78ed798646962526876f3536b4759c00dce339e21f0695ea71d0917c048dc852c3d1c79bd17cd19dc513a3c6463abaffcff3f792b906cec98ede  base-session-noninteractive.pamd
+299bb3791652174a4d836d60f146200bb692ad80c20c18e6e872543ac8885156ff1a7ca00acaf55b89672fa98f00b8df53879c9ab1913a9cc91f620163dd50be  other.pamd
+ae3a807bc121eb59b54f5e53ff8efdde972610cf7463b6a38bccbc89b49954aa2e0a8693919b01f8bc7a956ba58c97de34a28963bc14f526b70b3073d64427b5  login.pamd
+a71ac72a21a5d18612365b2b0a4a0da1f9d1101a30d3f5d97f479f6378c3a0fbc219617000448c8b5a0ab2597f2e4944202b13a69624dbe849bf9ea39d00ca22  su.pamd
+"
diff --git a/main/linux-pam/base-account.pamd b/main/linux-pam/base-account.pamd
index 591092944d2..68749cc17f7 100644
--- a/main/linux-pam/base-account.pamd
+++ b/main/linux-pam/base-account.pamd
@@ -1,3 +1,4 @@
 # basic PAM configuration for Alpine.
 
-account		required	pam_unix.so
+account required pam_unix.so
+account required pam_nologin.so
diff --git a/main/linux-pam/base-auth.pamd b/main/linux-pam/base-auth.pamd
index 8955a71f056..0fdf9de9503 100644
--- a/main/linux-pam/base-auth.pamd
+++ b/main/linux-pam/base-auth.pamd
@@ -1,15 +1,8 @@
 # basic PAM configuration for Alpine.
-auth	required	pam_env.so
-auth	required	pam_unix.so	nullok_secure
-auth	required	pam_nologin.so	successok
 
-auth	sufficient	pam_unix.so	nullok try_first_pass
+auth required pam_unix.so nullok
+auth required pam_nologin.so
+auth required pam_env.so
 
-account	required	pam_nologin.so
-account	sufficient	pam_unix.so
-
-password	sufficient	pam_unix.so	nullok sha512 shadow try_first_pass use_authtok
-
--session	optional	pam_loginuid.so
--session	optional	pam_elogind.so
-session	sufficient	pam_unix.so
+-auth optional pam_gnome_keyring.so
+-auth optional pam_kwallet5.so
diff --git a/main/linux-pam/base-password.pamd b/main/linux-pam/base-password.pamd
index a146a93fe5b..c249f8357fa 100644
--- a/main/linux-pam/base-password.pamd
+++ b/main/linux-pam/base-password.pamd
@@ -1,3 +1,7 @@
 # basic PAM configuration for Alpine.
 
-password	required	pam_unix.so	nullok obscure md5 sha512
+password required pam_unix.so nullok sha512 shadow
+
+# desktop keyrings
+-password optional pam_gnome_keyring.so use_authtok
+-password optional pam_kwallet5.so
diff --git a/main/linux-pam/base-session-noninteractive.pamd b/main/linux-pam/base-session-noninteractive.pamd
index 85e07d59436..0ad3695249f 100644
--- a/main/linux-pam/base-session-noninteractive.pamd
+++ b/main/linux-pam/base-session-noninteractive.pamd
@@ -1,4 +1,5 @@
 # basic PAM configuration for Alpine.
 
-session		required	pam_limits.so
-session		required	pam_unix.so
+session required pam_env.so
+session required pam_limits.so
+session required pam_unix.so
diff --git a/main/linux-pam/base-session.pamd b/main/linux-pam/base-session.pamd
index 3804699b260..ef6c5580f0e 100644
--- a/main/linux-pam/base-session.pamd
+++ b/main/linux-pam/base-session.pamd
@@ -1,5 +1,14 @@
 # basic PAM configuration for Alpine.
 
-session		include		base-session-noninteractive
-session		required	pam_motd.so
--session	optional	pam_elogind.so
+session include base-session-noninteractive
+
+# potential providers that set up session stuff / a XDG_RUNTIME_DIR
+-session optional pam_rundir.so
+-session optional pam_elogind.so
+-session optional pam_ck_connector.so
+-session optional pam_turnstile.so
+-session optional pam_dumb_runtime_dir.so
+
+# desktop keyrings
+-session optional pam_gnome_keyring.so auto_start
+-session optional pam_kwallet5.so auto_start
diff --git a/main/linux-pam/fix-compat.patch b/main/linux-pam/fix-compat.patch
deleted file mode 100644
index 4096c3a4755..00000000000
--- a/main/linux-pam/fix-compat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- Linux-PAM-1.1.6.orig/modules/pam_lastlog/pam_lastlog.c
-+++ Linux-PAM-1.1.6/modules/pam_lastlog/pam_lastlog.c
-@@ -10,6 +10,7 @@
- 
- #include "config.h"
- 
-+#include <paths.h>
- #include <fcntl.h>
- #include <time.h>
- #include <errno.h>
-@@ -48,6 +49,10 @@
- 
- #ifndef _PATH_BTMP
- # define _PATH_BTMP "/var/log/btmp"
-+#endif
-+
-+#ifndef __GLIBC__
-+#define logwtmp(args...)
- #endif
- 
- /* XXX - time before ignoring lock. Is 1 sec enough? */
diff --git a/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch b/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch
deleted file mode 100644
index 938e92d290e..00000000000
--- a/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/modules/pam_unix/pam_unix_acct.c
-+++ b/modules/pam_unix/pam_unix_acct.c
-@@ -48,6 +48,7 @@
- #include <time.h>		/* for time() */
- #include <errno.h>
- #include <sys/wait.h>
-+#include <sys/resource.h>
- 
- #include <security/_pam_macros.h>
- 
diff --git a/main/linux-pam/login.pamd b/main/linux-pam/login.pamd
new file mode 100644
index 00000000000..300d3831a64
--- /dev/null
+++ b/main/linux-pam/login.pamd
@@ -0,0 +1,6 @@
+# "login" that is required by pam-enabled util-linux-login/shadow-login
+
+auth      include    base-auth
+account   include    base-account
+password  include    base-password
+session   include    base-session
diff --git a/main/linux-pam/musl-fix-pam_exec.patch b/main/linux-pam/musl-fix-pam_exec.patch
deleted file mode 100644
index 760660fa0c2..00000000000
--- a/main/linux-pam/musl-fix-pam_exec.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/modules/pam_exec/pam_exec.c b/modules/pam_exec/pam_exec.c
-index 52dc681..4ed6e34 100644
---- a/modules/pam_exec/pam_exec.c
-+++ b/modules/pam_exec/pam_exec.c
-@@ -103,11 +103,14 @@ call_exec (const char *pam_type, pam_handle_t *pamh,
-   int optargc;
-   const char *logfile = NULL;
-   const char *authtok = NULL;
-+  char authtok_buf[PAM_MAX_RESP_SIZE+1];
-+
-   pid_t pid;
-   int fds[2];
-   int stdout_fds[2];
-   FILE *stdout_file = NULL;
- 
-+  memset(authtok_buf, 0, sizeof(authtok_buf));
-   if (argc < 1) {
-     pam_syslog (pamh, LOG_ERR,
- 		"This module needs at least one argument");
-@@ -180,12 +183,12 @@ call_exec (const char *pam_type, pam_handle_t *pamh,
- 	      if (resp)
- 		{
- 		  pam_set_item (pamh, PAM_AUTHTOK, resp);
--		  authtok = strndupa (resp, PAM_MAX_RESP_SIZE);
-+		  authtok = strncpy(authtok_buf, resp, sizeof(authtok_buf));
- 		  _pam_drop (resp);
- 		}
- 	    }
- 	  else
--	    authtok = strndupa (void_pass, PAM_MAX_RESP_SIZE);
-+	    authtok = strncpy(authtok_buf, void_pass, sizeof(authtok_buf));
- 
- 	  if (pipe(fds) != 0)
- 	    {
-
diff --git a/main/linux-pam/musl-fix_uint.patch b/main/linux-pam/musl-fix_uint.patch
deleted file mode 100644
index c4a0fdfa8ba..00000000000
--- a/main/linux-pam/musl-fix_uint.patch
+++ /dev/null
@@ -1,285 +0,0 @@
-u_intX_t is a glibcism this fixes the issue of compiling against musl libc by using ISO C99 uintX_t types instead.
-
-Can be deleted at next release 1.3.1+ since it has been merged upstream - https://github.com/linux-pam/linux-pam/pull/175
-
---- a/libpamc/include/security/pam_client.h
-+++ b/libpamc/include/security/pam_client.h
-@@ -16,6 +16,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <stdio.h>
-+#include <stdint.h>
- #include <sys/types.h>
- 
- /* opaque agent handling structure */
-@@ -23,7 +24,7 @@
- typedef struct pamc_handle_s *pamc_handle_t;
- 
- /* binary prompt structure pointer */
--typedef struct { u_int32_t length; u_int8_t control; } *pamc_bp_t;
-+typedef struct { uint32_t length; uint8_t control; } *pamc_bp_t;
- 
- /*
-  * functions provided by libpamc
-@@ -90,10 +91,10 @@
- # define PAM_BP_FREE        free
- #endif /* PAM_BP_FREE */
- 
--#define __PAM_BP_WOCTET(x,y)  (*((y) + (u_int8_t *)(x)))
--#define __PAM_BP_ROCTET(x,y)  (*((y) + (const u_int8_t *)(x)))
-+#define __PAM_BP_WOCTET(x,y)  (*((y) + (uint8_t *)(x)))
-+#define __PAM_BP_ROCTET(x,y)  (*((y) + (const uint8_t *)(x)))
- 
--#define PAM_BP_MIN_SIZE       (sizeof(u_int32_t) + sizeof(u_int8_t))
-+#define PAM_BP_MIN_SIZE       (sizeof(uint32_t) + sizeof(uint8_t))
- #define PAM_BP_MAX_LENGTH     0x20000                   /* an advisory limit */
- #define PAM_BP_WCONTROL(x)    (__PAM_BP_WOCTET(x,4))
- #define PAM_BP_RCONTROL(x)    (__PAM_BP_ROCTET(x,4))
-@@ -102,8 +103,8 @@
- 			       (__PAM_BP_ROCTET(x,2)<< 8)+      \
- 			       (__PAM_BP_ROCTET(x,3)    ))
- #define PAM_BP_LENGTH(x)      (PAM_BP_SIZE(x) - PAM_BP_MIN_SIZE)
--#define PAM_BP_WDATA(x)       (PAM_BP_MIN_SIZE + (u_int8_t *) (x))
--#define PAM_BP_RDATA(x)       (PAM_BP_MIN_SIZE + (const u_int8_t *) (x))
-+#define PAM_BP_WDATA(x)       (PAM_BP_MIN_SIZE + (uint8_t *) (x))
-+#define PAM_BP_RDATA(x)       (PAM_BP_MIN_SIZE + (const uint8_t *) (x))
- 
- /* Note, this macro always '\0' terminates renewed packets */
- 
-@@ -111,13 +112,13 @@
- do {                                                                       \
-     if (old_p) {                                                           \
- 	if (*(old_p)) {                                                    \
--	    u_int32_t __size;                                              \
-+	    uint32_t __size;                                              \
-             __size = PAM_BP_SIZE(*(old_p));                                \
- 	    memset(*(old_p), 0, __size);                                   \
- 	    PAM_BP_FREE(*(old_p));                                         \
- 	}                                                                  \
- 	if (cntrl) {                                                       \
--	    u_int32_t __size;                                              \
-+	    uint32_t __size;                                              \
-                                                                            \
- 	    __size = PAM_BP_MIN_SIZE + data_length;                        \
- 	    if ((*(old_p) = PAM_BP_CALLOC(1, 1+__size))) {                 \
-@@ -140,7 +141,7 @@
- #define PAM_BP_FILL(prmpt, offset, length, data)                           \
- do {                                                                       \
-     size_t bp_length;                                                      \
--    u_int8_t *prompt = (u_int8_t *) (prmpt);                               \
-+    uint8_t *prompt = (uint8_t *) (prmpt);                               \
-     bp_length = PAM_BP_LENGTH(prompt);                                     \
-     if (bp_length < ((length)+(offset))) {                                 \
- 	PAM_BP_ASSERT("attempt to write over end of prompt");              \
-@@ -151,7 +152,7 @@
- #define PAM_BP_EXTRACT(prmpt, offset, length, data)                        \
- do {                                                                       \
-     size_t __bp_length;                                                    \
--    const u_int8_t *__prompt = (const u_int8_t *) (prmpt);                 \
-+    const uint8_t *__prompt = (const uint8_t *) (prmpt);                 \
-     __bp_length = PAM_BP_LENGTH(__prompt);                                 \
-     if (((offset) < 0) || (__bp_length < ((length)+(offset)))              \
- 	|| ((length) < 0)) {                                               \
-
---- a/libpamc/libpamc.h
-+++ b/libpamc/libpamc.h
-@@ -16,6 +16,7 @@
- #include <sys/types.h>
- #include <dirent.h>
- #include <sys/wait.h>
-+#include <stdint.h>
- #include <stdlib.h>
- #include <errno.h>
- #include <ctype.h>
-
---- a/libpamc/pamc_converse.c
-+++ b/libpamc/pamc_converse.c
-@@ -34,8 +34,8 @@
- 
- int pamc_converse(pamc_handle_t pch, pamc_bp_t *prompt_p)
- {
--    u_int32_t size, offset=0;
--    u_int8_t control, raw[PAM_BP_MIN_SIZE];
-+    uint32_t size, offset=0;
-+    uint8_t control, raw[PAM_BP_MIN_SIZE];
- 
-     D(("called"));
- 
-@@ -110,7 +110,7 @@
-     /* pump all of the prompt into the agent */
-     do {
- 	int rval = write(pch->current->writer,
--			 offset + (const u_int8_t *) (*prompt_p),
-+			 offset + (const uint8_t *) (*prompt_p),
- 			 size - offset);
- 	if (rval == -1) {
- 	    switch (errno) {
-@@ -172,7 +172,7 @@
-        value from the previous loop */
- 
-     while (offset < size) {
--	int rval = read(pch->current->reader, offset + (u_int8_t *) *prompt_p,
-+	int rval = read(pch->current->reader, offset + (uint8_t *) *prompt_p,
- 			size-offset);
- 
- 	if (rval == -1) {
-
---- a/libpamc/test/regress/test.libpamc.c
-+++ b/libpamc/test/regress/test.libpamc.c
-@@ -5,6 +5,7 @@
-  */
- 
- #include <stdio.h>
-+#include <stdint.h>
- #include <string.h>
- #include <security/pam_client.h>
- #include <ctype.h>
-@@ -157,7 +158,7 @@
-     return temp_packet.buffer;
- }
- 
--void packet_to_prompt(pamc_bp_t *prompt_p, u_int8_t control,
-+void packet_to_prompt(pamc_bp_t *prompt_p, uint8_t control,
- 		      struct internal_packet *packet)
- {
-     PAM_BP_RENEW(prompt_p, control, packet->at);
-
---- a/modules/pam_timestamp/sha1.c
-+++ b/modules/pam_timestamp/sha1.c
-@@ -56,34 +56,34 @@
- 	   0, 0, 0, 0, 0, 0, 0, 0,     0, 0, 0, 0, 0, 0, 0, 0,
- };
- 
--static u_int32_t
--F(u_int32_t b, u_int32_t c, u_int32_t d)
-+static uint32_t
-+F(uint32_t b, uint32_t c, uint32_t d)
- {
- 	return (b & c) | ((~b) & d);
- }
- 
--static u_int32_t
--G(u_int32_t b, u_int32_t c, u_int32_t d)
-+static uint32_t
-+G(uint32_t b, uint32_t c, uint32_t d)
- {
- 	return b ^ c ^ d;
- }
- 
--static u_int32_t
--H(u_int32_t b, u_int32_t c, u_int32_t d)
-+static uint32_t
-+H(uint32_t b, uint32_t c, uint32_t d)
- {
- 	return (b & c) | (b & d) | (c & d);
- }
- 
--static u_int32_t
--RL(u_int32_t n, u_int32_t s)
-+static uint32_t
-+RL(uint32_t n, uint32_t s)
- {
- 	return (n << s) | (n >> (32 - s));
- }
- 
--static u_int32_t
--sha1_round(u_int32_t (*FUNC)(u_int32_t, u_int32_t, u_int32_t),
--      u_int32_t a, u_int32_t b, u_int32_t c, u_int32_t d, u_int32_t e,
--      u_int32_t i, u_int32_t n)
-+static uint32_t
-+sha1_round(uint32_t (*FUNC)(uint32_t, uint32_t, uint32_t),
-+      uint32_t a, uint32_t b, uint32_t c, uint32_t d, uint32_t e,
-+      uint32_t i, uint32_t n)
- {
- 	return RL(a, 5) + FUNC(b, c, d) + e + i + n;
- }
-@@ -100,10 +100,10 @@
- }
- 
- static void
--sha1_process(struct sha1_context *ctx, u_int32_t buffer[SHA1_BLOCK_SIZE / 4])
-+sha1_process(struct sha1_context *ctx, uint32_t buffer[SHA1_BLOCK_SIZE / 4])
- {
--	u_int32_t a, b, c, d, e, temp;
--	u_int32_t data[80];
-+	uint32_t a, b, c, d, e, temp;
-+	uint32_t data[80];
- 	int i;
- 
- 	for (i = 0; i < 16; i++) {
-@@ -150,14 +150,14 @@
- sha1_update(struct sha1_context *ctx, const unsigned char *data, size_t length)
- {
- 	size_t i = 0, l = length, c, t;
--	u_int32_t count = 0;
-+	uint32_t count = 0;
- 
- 	/* Process any pending + data blocks. */
- 	while (l + ctx->pending_count >= SHA1_BLOCK_SIZE) {
- 		c = ctx->pending_count;
- 		t = SHA1_BLOCK_SIZE - c;
- 		memcpy(ctx->pending + c, &data[i], t);
--		sha1_process(ctx, (u_int32_t*) ctx->pending);
-+		sha1_process(ctx, (uint32_t*) ctx->pending);
- 		i += t;
- 		l -= t;
- 		ctx->pending_count = 0;
-@@ -188,7 +188,7 @@
- 
- 	/* Output the sum. */
- 	if (out != NULL) {
--		u_int32_t c;
-+		uint32_t c;
- 		memcpy(&ctx2, ctx, sizeof(ctx2));
- 
- 		/* Pad this block. */
-@@ -197,10 +197,10 @@
- 		       padding, SHA1_BLOCK_SIZE - c);
- 
- 		/* Do we need to process two blocks now? */
--		if (c >= (SHA1_BLOCK_SIZE - (sizeof(u_int32_t) * 2))) {
-+		if (c >= (SHA1_BLOCK_SIZE - (sizeof(uint32_t) * 2))) {
- 			/* Process this block. */
- 			sha1_process(&ctx2,
--				    (u_int32_t*) ctx2.pending);
-+				    (uint32_t*) ctx2.pending);
- 			/* Set up another block. */
- 			ctx2.pending_count = 0;
- 			memset(ctx2.pending, 0, SHA1_BLOCK_SIZE);
-@@ -218,10 +218,10 @@
- 		ctx2.counts[0] = htonl(ctx2.counts[0]);
- 		ctx2.counts[1] = htonl(ctx2.counts[1]);
- 		memcpy(ctx2.pending + 56,
--		       &ctx2.counts[1], sizeof(u_int32_t));
-+		       &ctx2.counts[1], sizeof(uint32_t));
- 		memcpy(ctx2.pending + 60,
--		       &ctx2.counts[0], sizeof(u_int32_t));
--		sha1_process(&ctx2, (u_int32_t*) ctx2.pending);
-+		       &ctx2.counts[0], sizeof(uint32_t));
-+		sha1_process(&ctx2, (uint32_t*) ctx2.pending);
- 
- 		/* Output the data. */
- 		out[ 3] = (ctx2.a >>  0) & 0xff;
-
---- a/modules/pam_timestamp/sha1.h
-+++ b/modules/pam_timestamp/sha1.h
-@@ -38,6 +38,7 @@
- #ifndef pam_timestamp_sha1_h
- #define pam_timestamp_sha1_h
- 
-+#include <stdint.h>
- #include <sys/types.h>
- 
- #define SHA1_BLOCK_SIZE 64
-@@ -45,9 +46,9 @@
- struct sha1_context {
- 	size_t count;
- 	unsigned char pending[SHA1_BLOCK_SIZE];
--	u_int32_t counts[2];
-+	uint32_t counts[2];
- 	size_t pending_count;
--	u_int32_t a, b, c, d, e;
-+	uint32_t a, b, c, d, e;
- };
- 
- #define SHA1_OUTPUT_SIZE 20
diff --git a/main/linux-pam/other.pamd b/main/linux-pam/other.pamd
index 8c9797e7184..c64c363af90 100644
--- a/main/linux-pam/other.pamd
+++ b/main/linux-pam/other.pamd
@@ -1,6 +1,6 @@
-# basic PAM configuration for Alpine.
-
-auth		include		base-auth
-account		include		base-account
-password	include		base-password
-session		include		base-session-noninteractive
+#%PAM-1.0
+# default config for any service don't specified
+auth     include    base-auth
+account  include    base-account
+password include    base-password
+session  include    base-session-noninteractive
diff --git a/main/linux-pam/pam_namespace.patch b/main/linux-pam/pam_namespace.patch
new file mode 100644
index 00000000000..a0fad12b024
--- /dev/null
+++ b/main/linux-pam/pam_namespace.patch
@@ -0,0 +1,39 @@
+From cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 Mon Sep 17 00:00:00 2001
+From: Jacob Heider <jacob@pkgx.dev>
+Date: Wed, 17 Jan 2024 11:49:26 -0500
+Subject: [PATCH] pam_namespace: include stdint.h
+
+pam_namespace.c makes use of SIZE_MAX but doesn't include stdint.h,
+resulting in the following build failures on 1.6.0:
+
+  pam_namespace.c: In function 'process_line':
+  pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function)
+    649 |         if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) {
+        |                                         ^~~~~~~~
+  pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header '<stdint.h>'; did you forget to '#include <stdint.h>'?
+     40 | #include "argv_parse.h"
+    +++ |+#include <stdint.h>
+     41 |
+  pam_namespace.c:649:41: note: each undeclared identifier is reported only once for each function it appears in
+    649 |         if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) {
+        |                                         ^~~~~~~~
+
+Fixes: v1.6.0~100 ("pam_namespace: validate amount of uids in config")
+Resolves: https://github.com/linux-pam/linux-pam/issues/733
+---
+ modules/pam_namespace/pam_namespace.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c
+index f72d67189..b16731c22 100644
+--- a/modules/pam_namespace/pam_namespace.c
++++ b/modules/pam_namespace/pam_namespace.c
+@@ -34,6 +34,8 @@
+ 
+ #define _ATFILE_SOURCE
+ 
++#include "config.h"
++#include <stdint.h>
+ #include "pam_cc_compat.h"
+ #include "pam_inline.h"
+ #include "pam_namespace.h"
diff --git a/main/linux-pam/su.pamd b/main/linux-pam/su.pamd
index 84f2ae7ea90..0c0ef1699e1 100644
--- a/main/linux-pam/su.pamd
+++ b/main/linux-pam/su.pamd
@@ -1,6 +1,6 @@
 # basic PAM configuration for Alpine.
-auth		sufficient	pam_rootok.so
-auth		include		base-auth
-account		include		base-account
-password	include		base-password
-session		include		base-session-noninteractive
+auth        sufficient     pam_rootok.so
+auth        include        base-auth
+account     include        base-account
+password    include        base-password
+session     include        base-session-noninteractive
diff --git a/main/linux-pam/system-local-login.pamd b/main/linux-pam/system-local-login.pamd
deleted file mode 100644
index 347b8155b86..00000000000
--- a/main/linux-pam/system-local-login.pamd
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-
-auth      include   system-login
-account   include   system-login
-password  include   system-login
-session   include   system-login
diff --git a/main/linux-pam/system-login.pamd b/main/linux-pam/system-login.pamd
deleted file mode 100644
index a143189e694..00000000000
--- a/main/linux-pam/system-login.pamd
+++ /dev/null
@@ -1,21 +0,0 @@
-#%PAM-1.0
-
-auth       required   pam_tally.so         onerr=succeed file=/var/log/faillog
-auth       required   pam_shells.so
-auth       requisite  pam_nologin.so
-auth       include    base-auth
-
-account    required   pam_access.so
-account    required   pam_nologin.so
-account    include    base-auth
-
-password   include    base-auth
-
-session    optional   pam_loginuid.so
-session    include    base-auth
-session    optional   pam_motd.so          motd=/etc/motd
-session    optional   pam_mail.so          dir=/var/mail standard quiet
--session   optional   pam_elogind.so
--session   optional   pam_ck_connector.so  nox11
-session    required   pam_env.so
-session    required   pam_lastlog.so       silent
diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD
index dd6ed5f81bd..d95b8fa14aa 100644
--- a/main/linux-rpi/APKBUILD
+++ b/main/linux-rpi/APKBUILD
@@ -1,50 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
 pkgname=linux-rpi
-pkgver=5.4.28
+pkgver=6.6.21
 case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
-*.*)	_kernver=${pkgver};;
+*.*)	_kernver=$pkgver;;
 esac
 pkgrel=0
 pkgdesc="Linux kernel with Raspberry Pi patches"
 url=https://github.com/raspberrypi/linux
-depends="mkinitfs"
-_depends_dev="perl gmp-dev elfutils-dev bash"
-makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware
-	bison flex openssl-dev
+depends="initramfs-generator linux-firmware-brcm"
+_depends_dev="perl gmp-dev elfutils-dev bash mpc1-dev mpfr-dev"
+makedepends="$_depends_dev gcc>=13.1.1_git20230603 sed installkernel bc linux-headers linux-firmware
+	bison flex openssl-dev>3 findutils xz
 "
 options="!strip !check"
-_rpi_repo="git://github.com/raspberrypi/linux.git"
-_linux_repo="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git"
-source="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-$_kernver.tar.xz
-	https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-$pkgver.xz
+_rpi_repo="https://github.com/raspberrypi/linux.git"
+_linux_repo="https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git"
+source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
+	https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz
 	https://dev.alpinelinux.org/archive/rpi-patches/rpi-$pkgver-alpine.patch
 
-	issue-4973.patch
-
-	config-changes-rpi.armhf
-	config-changes-rpi.armv7
-	config-changes-rpi.aarch64
-	config-changes-rpi2.armhf
-	config-changes-rpi2.armv7
-	config-changes-rpi4.armv7
-	config-changes-rpi4.aarch64
+	common-changes.config
 	"
-subpackages=""
 arch="armhf armv7 aarch64"
-license="GPL-2.0"
-_flavors=
-for _i in $source; do
-	case $_i in
-	config-*.$CARCH)
-		_f=${_i%.$CARCH}
-		_f=${_f#config-changes-}
-		_flavors="$_flavors ${_f}"
-		[ "linux-$_f" != "$pkgname" ] && subpackages="$subpackages linux-${_f}::$CBUILD_ARCH"
-		subpackages="$subpackages linux-${_f}-dev:_dev:$CBUILD_ARCH"
-		;;
-	esac
+license="GPL-2.0-only"
+_flavors="rpi"
+
+for _f in $_flavors; do
+	if [ "linux-$_f" != "$pkgname" ]; then
+		subpackages="$subpackages linux-$_f::$CBUILD_ARCH"
+	fi
+	subpackages="$subpackages linux-$_f-dev:_dev:$CBUILD_ARCH"
 done
 
 case "$CARCH" in
@@ -84,12 +71,12 @@ prepare() {
 
 	local flavor=
 	for flavor in $_flavors; do
-		local builddir="$srcdir"/build-$flavor
-		mkdir -p "$builddir"
-		echo "-$pkgrel-$flavor" > "$builddir"/localversion-alpine
+		local _builddir="$srcdir"/build-$flavor.$CARCH
+		mkdir -p "$_builddir"
+		echo "-$pkgrel-$flavor" > "$_builddir"/localversion-alpine
 		_genconfig $flavor
 		make -C "$srcdir"/linux-$_kernver \
-			O="$builddir" \
+			O="$_builddir" \
 			ARCH="$_carch" \
 			olddefconfig
 		_verifyconfig $flavor
@@ -97,18 +84,17 @@ prepare() {
 }
 
 # generate config from defconfig and apply local changes.
-# config-changes-$flavor.$CARCH holds a list of = delimited
+# common-changes.config holds a list of = delimited
 # config command and values used by kernel scripts/config script.
 _genconfig() {
 	local flavor=$1 defconfig=
-	local builddir="$srcdir"/build-$flavor
+	local builddir="$srcdir"/build-$flavor.$CARCH
 	local defconfig=
-	case $flavor in
-		rpi) defconfig=bcmrpi_defconfig
-		[ "$CARCH" = "aarch64" ] && defconfig=bcmrpi3_defconfig ;;
-		rpi2) defconfig=bcm2709_defconfig ;;
-		rpi4) defconfig=bcm2711_defconfig ;;
-		*) die "Unknown flavor: $flavor" ;;
+	case "$CARCH" in
+		armhf) defconfig=bcmrpi_defconfig;;
+		armv7) defconfig=bcm2709_defconfig;;
+		aarch64) defconfig=bcm2711_defconfig;;
+		*) die "Unknown CARCH: $CARCH" ;;
 	esac
 
 	cp "$srcdir"/linux-$_kernver/arch/$_carch/configs/$defconfig \
@@ -132,14 +118,14 @@ _genconfig() {
 		msg "[$flavor] $cmd: $option $str"
 		"$srcdir"/linux-$_kernver/scripts/config \
 			--file "$builddir"/.config \
-			--${cmd} "$option" "${str//\"/}"
-	done < "$srcdir"/config-changes-$flavor.${CARCH}
+			--$cmd "$option" "${str//\"/}"
+	done < "$srcdir"/common-changes.config
 }
 
 # verify if options are set to correct value
 _verifyconfig() {
 	local flavor=$1
-	local builddir="$srcdir"/build-$flavor
+	local builddir="$srcdir"/build-$flavor.$CARCH
 	while read line; do
 		[ ${line:0:1} = "#" ] && continue
 		local option=${line%%=*} str= invert=
@@ -154,13 +140,16 @@ _verifyconfig() {
 		esac
 		grep -q $invert "^$str" "$builddir"/.config || \
 			die "Config: $option not properly set!"
-	done < "$srcdir"/config-changes-$flavor.${CARCH}
+	done < "$srcdir"/common-changes.config
 }
 
 build() {
 	unset LDFLAGS
+	# for some reason these sometimes leak into the kernel build,
+	# -Werror=format-security breaks some stuff
+	unset CFLAGS CPPFLAGS CXXFLAGS
 	for i in $_flavors; do
-		cd "$srcdir"/build-$i
+		cd "$srcdir"/build-$i.$CARCH
 		local _kver=$(make kernelversion)
 		if [ "$_kver" != "$pkgver" ]; then
 			error "Version in Makefile ($_kver) does not correspond with pkgver ($pkgver)"
@@ -173,10 +162,10 @@ build() {
 
 _package() {
 	local _buildflavor="$1" _outdir="$2"
-	local _abi_release=${pkgver}-${pkgrel}-${_buildflavor}
-
-	cd "$srcdir"/build-$_buildflavor
+	local _builddir="$srcdir"/build-$_buildflavor.$CARCH
 
+	cd "$_builddir"
+	local _abi_release="$(make -s kernelrelease)"
 	mkdir -p "$_outdir"/boot "$_outdir"/lib/modules
 
 	local _install
@@ -192,26 +181,28 @@ _package() {
 		;;
 	esac
 
-	cd "$srcdir"/build-$_buildflavor
 	# modules_install seems to regenerate a defect Modules.symvers. Work
 	# around it by backing it up and restore it after modules_install
 	cp Module.symvers Module.symvers.backup
 
-	local INSTALL_DTBS_PATH="$_outdir"/boot/dtbs-$_buildflavor
-	make -j1 modules_install $_install \
+	local INSTALL_DTBS_PATH="$_outdir"/boot
+	make modules_install $_install \
 		ARCH="$_carch" \
 		INSTALL_MOD_PATH="$_outdir" \
 		INSTALL_PATH="$_outdir"/boot \
 		INSTALL_DTBS_PATH="$INSTALL_DTBS_PATH"
 	cp Module.symvers.backup Module.symvers
 
-	rm -f "$_outdir"/lib/modules/${_abi_release}/build \
-		"$_outdir"/lib/modules/${_abi_release}/source
+	rm -f "$_outdir"/lib/modules/$_abi_release/build \
+		"$_outdir"/lib/modules/$_abi_release/source
 	rm -rf "$_outdir"/lib/firmware
 
-	install -D include/config/kernel.release \
+	install -D -m644 include/config/kernel.release \
 		"$_outdir"/usr/share/kernel/$_buildflavor/kernel.release
 
+	# allow the initramfs generators to know the package name the kernel came from
+	echo "${subpkgname:-$pkgname}" > "$_outdir"/lib/modules/$_abi_release/pkgname
+
 	if [ "$CARCH" = "aarch64" ]; then
 		mv -f "$INSTALL_DTBS_PATH"/broadcom/*.dtb \
 			"$INSTALL_DTBS_PATH"
@@ -219,44 +210,28 @@ _package() {
 	fi
 }
 
-genpatch() {
-	local RPI_REPO_PATH="$HOME/repositories/linux-rpi"
-	msg "Checking out/pulling the Linux kernel git repository.."
-	mkdir -p "$RPI_REPO_PATH" && cd "$RPI_REPO_PATH"
-	git clone "$_linux_repo" "$RPI_REPO_PATH" 2>/dev/null || git pull
-	msg "Fetching raspberry git repository.."
-	git remote add rpi "$_rpi_repo" 2>/dev/null || true
-	git fetch rpi
-	msg "Generating rpi patch: rpi-$pkgver.patch"
-	mkdir -p "$srcdir"
-	git diff v$pkgver remotes/rpi/rpi-${pkgver%.*}.y > \
-		"$srcdir"/rpi-$pkgver.patch
-	msg "Sending patch to dev.alpinelinux.org.."
-	scp "$srcdir"/rpi-$pkgver.patch \
-		dev.alpinelinux.org:/archive/rpi-patches/rpi-$pkgver.patch
-	cd "$startdir" && abuild checksum
-}
-
 # main flavor installs in $pkgdir
 package() {
-	depends="$depends linux-firmware-brcm"
+	case "$CARCH" in
+	armv7)
+		provides="linux-rpi2=$pkgver-r$pkgrel"  # for backward compatibility
+		replaces="linux-rpi2"  # for backward compatibility
+	;;
+	aarch64)
+		provides="linux-rpi4=$pkgver-r$pkgrel"  # for backward compatibility
+		replaces="linux-rpi4"  # for backward compatibility
+	;;
+	esac
 	_package rpi "$pkgdir"
 }
 
-# subflavors install in $subpkgdir
-rpi2() {
-	depends="$depends linux-firmware-brcm"
-	_package rpi2 "$subpkgdir"
-}
-
-rpi4() {
-	depends="$depends linux-firmware-brcm"
-	_package rpi4 "$subpkgdir"
-}
 
 _dev() {
 	local _flavor=$(echo $subpkgname | sed -E 's/(^linux-|-dev$)//g')
-	local _abi_release=${pkgver}-${pkgrel}-$_flavor
+	local _builddir="$srcdir"/build-$_flavor.$CARCH
+
+	cd "$_builddir"
+	local _abi_release="$(make -s kernelrelease)"
 	# copy the only the parts that we really need for build 3rd party
 	# kernel modules and install those as /usr/src/linux-headers,
 	# simlar to what ubuntu does
@@ -266,13 +241,33 @@ _dev() {
 	#
 	pkgdesc="Headers and script for third party modules for $_flavor kernel"
 	depends="$_depends_dev"
-	local dir="$subpkgdir"/usr/src/linux-headers-${_abi_release}
+
+	# handle backward compatibility with legacy flavors
+	case "$_flavor" in
+		rpi)
+			case "$CARCH" in
+				armv7)
+					provides="linux-rpi2-dev=$pkgver-r$pkgrel"
+					replaces="linux-rpi2-dev"
+				;;
+				aarch64)
+					provides="linux-rpi4-dev=$pkgver-r$pkgrel"
+					replaces="linux-rpi4-dev"
+				;;
+			esac
+			;;
+		*) die "Unknown flavor: $flavor" ;;
+	esac
+
+	local dir="$subpkgdir"/usr/src/linux-headers-$_abi_release
 
 	# first we import config, run prepare to set up for building
 	# external modules, and create the scripts
 	mkdir -p "$dir"
-	cp "$srcdir"/build-$_flavor/.config "$dir"/.config
-	make -j1 -C "$srcdir"/linux-$_kernver O="$dir" \
+	cp "$_builddir"/.config "$dir"/.config
+	echo "-$pkgrel-$_flavor" > "$dir"/localversion-alpine
+
+	make -j1 -C "$srcdir"/linux-$_kernver ARCH="$_carch" O="$dir" \
 		syncconfig prepare modules_prepare scripts
 
 	# remove the stuff that points to real sources. we want 3rd party
@@ -294,22 +289,17 @@ _dev() {
 	find $(find arch -name include -type d -print) -type f \
 		| cpio -pdm "$dir"
 
-	install -Dm644 "$srcdir"/build-$_flavor/Module.symvers \
+	install -Dm644 "$_builddir"/Module.symvers \
 		"$dir"/Module.symvers
 
-	mkdir -p "$subpkgdir"/lib/modules/${_abi_release}
-	ln -sf /usr/src/linux-headers-${_abi_release} \
-		"$subpkgdir"/lib/modules/${_abi_release}/build
+	mkdir -p "$subpkgdir"/lib/modules/$_abi_release
+	ln -sf /usr/src/linux-headers-$_abi_release \
+		"$subpkgdir"/lib/modules/$_abi_release/build
 }
 
-sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f  linux-5.4.tar.xz
-883aa429e22a3b2623b52ee4c376f15c128baff3377873e0515231902e46701e4928699dc3404eaed73ab7d333cb2a32ebebf35d727a22d3dac11b5680d4db36  patch-5.4.28.xz
-deadfb3939dd5d5226b8f4aa68d2658e5f385ed9248fd283ab4b6961ee0c89d9978e533e40c7c371d044c6d6560030b32ec70e2f864ffbae5b612cf8c39eb8e8  rpi-5.4.28-alpine.patch
-501c91bf2538a18102da59bbccc3097f9c3c90079acc0e946ff075074160c09b8a66934e5ce5470e170f0e4f93d114709a95230367426d0bb7ea02c4bdf4cc9b  issue-4973.patch
-bf827937d72085dcd886b8efdf0c930f825dd0778e1baccc535a78475f855a8d457b13647840e8d6e6d81035b856d9e747bb42b6d56ae4e53b73ed3212fc2f4d  config-changes-rpi.armhf
-bf827937d72085dcd886b8efdf0c930f825dd0778e1baccc535a78475f855a8d457b13647840e8d6e6d81035b856d9e747bb42b6d56ae4e53b73ed3212fc2f4d  config-changes-rpi.armv7
-bf827937d72085dcd886b8efdf0c930f825dd0778e1baccc535a78475f855a8d457b13647840e8d6e6d81035b856d9e747bb42b6d56ae4e53b73ed3212fc2f4d  config-changes-rpi.aarch64
-bf827937d72085dcd886b8efdf0c930f825dd0778e1baccc535a78475f855a8d457b13647840e8d6e6d81035b856d9e747bb42b6d56ae4e53b73ed3212fc2f4d  config-changes-rpi2.armhf
-bf827937d72085dcd886b8efdf0c930f825dd0778e1baccc535a78475f855a8d457b13647840e8d6e6d81035b856d9e747bb42b6d56ae4e53b73ed3212fc2f4d  config-changes-rpi2.armv7
-bf827937d72085dcd886b8efdf0c930f825dd0778e1baccc535a78475f855a8d457b13647840e8d6e6d81035b856d9e747bb42b6d56ae4e53b73ed3212fc2f4d  config-changes-rpi4.armv7
-bf827937d72085dcd886b8efdf0c930f825dd0778e1baccc535a78475f855a8d457b13647840e8d6e6d81035b856d9e747bb42b6d56ae4e53b73ed3212fc2f4d  config-changes-rpi4.aarch64"
+sha512sums="
+458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35  linux-6.6.tar.xz
+e7c8e640fc519d6c92cd13985a7e37d2c8fe0277b7386a9f861c39a6f164d815133b5fb02a691d43c7b79563b09d6ea78674af0ccecfef1b418f4d03bf52a9bc  patch-6.6.21.xz
+cd73e92fbd2fe47bd756eeaae06b3927813bca528c2aecc7e5833797f0bb1d24cd15dec762088b1faaa8ca9785d8d30027aa6b4a419d030a7f1c7d078c8d6486  rpi-6.6.21-alpine.patch
+f014a9b3574df17a3f6e0d8a2c48aef4239f33a062d64704fd56ecd596d090bb0413c8cb2abd6ec3ceeee09fa66243b6a3f7b405657edbd9c7a6407d6ec79fef  common-changes.config
+"
diff --git a/main/linux-rpi/common-changes.config b/main/linux-rpi/common-changes.config
new file mode 100644
index 00000000000..6cee621b9f4
--- /dev/null
+++ b/main/linux-rpi/common-changes.config
@@ -0,0 +1,34 @@
+# format is config=command
+# where command can be one of:
+# y,n,m,"<str>,<value>
+CONFIG_FUNCTION_TRACER=n
+CONFIG_STACK_TRACER=n
+CONFIG_ATM=n
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_PACKET=m
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_BATMAN_ADV=n
+CONFIG_INPUT_LEDS=m
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_IO_STRICT_DEVMEM=y
+CONFIG_ENCRYPTED_KEYS=m
+CONFIG_KEY_DH_OPERATIONS=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_LOCALVERSION=""
+CONFIG_IP_PNP=n
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_USB_DWC2=m
+CONFIG_USB_ETH=m
+CONFIG_RTC_DRV_DS1307=y
+CONFIG_I2C_BCM2835=y
+CONFIG_MEMCG=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
+CONFIG_PSI=y
diff --git a/main/linux-rpi/config-changes-rpi.aarch64 b/main/linux-rpi/config-changes-rpi.aarch64
deleted file mode 120000
index 514280e61ab..00000000000
--- a/main/linux-rpi/config-changes-rpi.aarch64
+++ /dev/null
@@ -1 +0,0 @@
-config-changes-rpi.armhf
\ No newline at end of file
diff --git a/main/linux-rpi/config-changes-rpi.armhf b/main/linux-rpi/config-changes-rpi.armhf
deleted file mode 100644
index a93c1913533..00000000000
--- a/main/linux-rpi/config-changes-rpi.armhf
+++ /dev/null
@@ -1,27 +0,0 @@
-# format is config=command
-# where command can be one of:
-# y,n,m,"<str>,<value>
-CONFIG_FUNCTION_TRACER=n
-CONFIG_STACK_TRACER=n
-CONFIG_ATM=n
-CONFIG_SLAB_FREELIST_RANDOM=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_SLAB_FREELIST_HARDENED=y
-CONFIG_PACKET=m
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_BATMAN_ADV=n
-CONFIG_INPUT_LEDS=m
-CONFIG_SQUASHFS_LZ4=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_IO_STRICT_DEVMEM=y
-CONFIG_ENCRYPTED_KEYS=m
-CONFIG_KEY_DH_OPERATIONS=y
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_LOCALVERSION=""
-CONFIG_IP_PNP=n
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_USB_DWC2=m
-CONFIG_USB_ETH=m
diff --git a/main/linux-rpi/config-changes-rpi.armv7 b/main/linux-rpi/config-changes-rpi.armv7
deleted file mode 120000
index 514280e61ab..00000000000
--- a/main/linux-rpi/config-changes-rpi.armv7
+++ /dev/null
@@ -1 +0,0 @@
-config-changes-rpi.armhf
\ No newline at end of file
diff --git a/main/linux-rpi/config-changes-rpi2.armhf b/main/linux-rpi/config-changes-rpi2.armhf
deleted file mode 120000
index 514280e61ab..00000000000
--- a/main/linux-rpi/config-changes-rpi2.armhf
+++ /dev/null
@@ -1 +0,0 @@
-config-changes-rpi.armhf
\ No newline at end of file
diff --git a/main/linux-rpi/config-changes-rpi2.armv7 b/main/linux-rpi/config-changes-rpi2.armv7
deleted file mode 120000
index 514280e61ab..00000000000
--- a/main/linux-rpi/config-changes-rpi2.armv7
+++ /dev/null
@@ -1 +0,0 @@
-config-changes-rpi.armhf
\ No newline at end of file
diff --git a/main/linux-rpi/config-changes-rpi4.aarch64 b/main/linux-rpi/config-changes-rpi4.aarch64
deleted file mode 120000
index 514280e61ab..00000000000
--- a/main/linux-rpi/config-changes-rpi4.aarch64
+++ /dev/null
@@ -1 +0,0 @@
-config-changes-rpi.armhf
\ No newline at end of file
diff --git a/main/linux-rpi/config-changes-rpi4.armv7 b/main/linux-rpi/config-changes-rpi4.armv7
deleted file mode 120000
index 514280e61ab..00000000000
--- a/main/linux-rpi/config-changes-rpi4.armv7
+++ /dev/null
@@ -1 +0,0 @@
-config-changes-rpi.armhf
\ No newline at end of file
diff --git a/main/linux-rpi/issue-4973.patch b/main/linux-rpi/issue-4973.patch
deleted file mode 100644
index 810c72e1909..00000000000
--- a/main/linux-rpi/issue-4973.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-https://bugs.alpinelinux.org/issues/4973
-https://github.com/raspberrypi/linux/issues/911
-https://github.com/raspberrypi/linux/pull/1135
-https://github.com/msperl/linux-rpi/commit/aef50a19f335ae3d2eb43ac5496c7f03930b394f
-
-This is not a proper fix, but as this is rasperry pi specific kernel,
-we've applied this workaround for now.
-
-From aef50a19f335ae3d2eb43ac5496c7f03930b394f Mon Sep 17 00:00:00 2001
-From: Martin Sperl <kernel@martin.sperl.org>
-Date: Tue, 15 Sep 2015 07:26:07 +0000
-Subject: [PATCH] mmc: spi: disable dma mapping code, as it does not work
-
-since:
-	commit 0589342c27944e50ebd7a54f5215002b6598b748
-	Author: Rob Herring <rob.herring@calxeda.com>
-	Date:   Tue Oct 29 23:36:46 2013 -0500
-
-	     of: set dma_mask to point to coherent_dma_mask
-
-	     Platform devices created by DT code don't initialize dma_mask pointer to
-	     anything. Set it to coherent_dma_mask by default if the architecture
-	     code has not set it.
-
-the mmc-spi driver no longer detects the sd-cards any longer.
-
-This patch disables the offending section in mmc_spi
-so that the driver works again and detects the sd card normally.
-
-There is no real negative impact as the spi-framework
-does no longer rely on driver-provided DMA mappings but
-maps the transfers transparently.
-
-Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
----
- drivers/mmc/host/mmc_spi.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
-index ae19d83..16946e2 100644
---- a/drivers/mmc/host/mmc_spi.c
-+++ b/drivers/mmc/host/mmc_spi.c
-@@ -1387,6 +1387,16 @@ static int mmc_spi_probe(struct spi_device *spi)
- 	if (!host->data)
- 		goto fail_nobuf1;
- 
-+	/* for some reason mmc_spi does not work with this enabled
-+	 * it is not needed anyway, as the SPI framework does DMA
-+	 * transfers now automatically
-+	 * the patch that introduced this was:
-+	 * commit 0589342c27944e50ebd7a54f5215002b6598b748
-+	 * Author: Rob Herring <rob.herring@calxeda.com>
-+	 * Date:   Tue Oct 29 23:36:46 2013 -0500
-+	 *      of: set dma_mask to point to coherent_dma_mask
-+	 */
-+#if 0
- 	if (spi->master->dev.parent->dma_mask) {
- 		struct device	*dev = spi->master->dev.parent;
- 
-@@ -1402,6 +1412,7 @@ static int mmc_spi_probe(struct spi_device *spi)
- 				host->data_dma, sizeof(*host->data),
- 				DMA_BIDIRECTIONAL);
- 	}
-+#endif
- 
- 	/* setup message for status/busy readback */
- 	spi_message_init(&host->readback);
diff --git a/main/lksctp-tools/APKBUILD b/main/lksctp-tools/APKBUILD
index c3c41d00da2..ff98edd6f21 100644
--- a/main/lksctp-tools/APKBUILD
+++ b/main/lksctp-tools/APKBUILD
@@ -1,29 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lksctp-tools
-pkgver=1.0.18
-pkgrel=1
+pkgver=1.0.19
+pkgrel=5
 pkgdesc="User-space access to Linux Kernel SCTP"
-url="http://lksctp.sourceforge.net"
+url="https://lksctp.sourceforge.net/"
 arch="all"
 options="!check"  # sctp_connectx in v4test fails on kernel 4.14
-license="GPL-2.0-only AND LGPL-2.1-or-later"
-makedepends="libtool automake autoconf linux-headers"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
+depends_dev="linux-headers"
+makedepends="$depends_dev libtool automake autoconf"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc lib${pkgname%-tools}:libs"
-source="$pkgname-$pkgver.tar.gz::https://github.com/sctp/$pkgname/archive/v$pkgver.tar.gz
-	header-install.patch
-	"
+source="$pkgname-$pkgver.tar.gz::https://github.com/sctp/lksctp-tools/archive/v$pkgver.tar.gz"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
-	if ! [ -e configure ]; then
-		./bootstrap
-	fi
+	autoreconf -fi
 }
 
 build() {
-	cd "$builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr
 	make
 }
@@ -35,7 +32,6 @@ check() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
@@ -45,5 +41,6 @@ libs() {
 	mv "$pkgdir"/usr/lib/lksctp-tools "$subpkgdir"/usr/lib
 }
 
-sha512sums="1d7275fadc0f2270865307cff2645810e9bab6c1a97e70be6115cace737334dbdd87a072fae25b89dd9cac2e05974556542de70ea8ef70b9e4f14873c82a5055  lksctp-tools-1.0.18.tar.gz
-0f26eba03b163e7f3d5dd9760e01734547603a69fb1fe93826c68503b13a175f7f848f9cfbcf79d5509823219c637c3155988a2ae29b080c508ee22b48da28f8  header-install.patch"
+sha512sums="
+e56a4b00206acfb88cab1b8fc7424a1a4996f67ef925c29a97395c44c57f2cbcb3fc36ec2648f5e5a5ce29d8d61ee1f7a5e7869e6bbd68bff85590b6ec521883  lksctp-tools-1.0.19.tar.gz
+"
diff --git a/main/lksctp-tools/header-install.patch b/main/lksctp-tools/header-install.patch
deleted file mode 100644
index 4cc1db493a8..00000000000
--- a/main/lksctp-tools/header-install.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 378560050a8f93786c590cc99a55461666205b61 Mon Sep 17 00:00:00 2001
-From: Xin Long <lucien.xin@gmail.com>
-Date: Fri, 24 Aug 2018 01:13:32 +0800
-Subject: [PATCH] build: fix netinet/sctp.h not to be installed
-
-After libcnetinet_HEADERS was set to sctp.h.in, netinet/sctp.h can
-no longer be installed into ${includedir}.
-
-Since "AC_CONFIG_HEADERS([src/include/netinet/sctp.h])" is already
-added into configure.ac, there's no need to generate sctp.h by
-automake.
-
-So we simply set libcnetinet_HEADERS back to sctp.h.
-
-Fixes: 9607dd85e70a ("netinet/sctp.h: dynamically build based on system setup")
-Signed-off-by: Xin Long <lucien.xin@gmail.com>
-Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
----
- src/include/netinet/Makefile.am | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/include/netinet/Makefile.am b/src/include/netinet/Makefile.am
-index ca0aac2..965db8c 100644
---- a/src/include/netinet/Makefile.am
-+++ b/src/include/netinet/Makefile.am
-@@ -11,5 +11,4 @@ libcnetinetdir = $(includedir)/netinet
- # API.
- include_HEADERS =
- 
--libcnetinet_HEADERS = sctp.h.in
--BUILT_SOURCES = sctp.h
-+libcnetinet_HEADERS = sctp.h
-
diff --git a/main/lld/APKBUILD b/main/lld/APKBUILD
new file mode 100644
index 00000000000..a7bd193d9a3
--- /dev/null
+++ b/main/lld/APKBUILD
@@ -0,0 +1,74 @@
+# Contributor: Eric Molitor <eric@molitor.org>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=lld
+pkgver=17.0.6
+pkgrel=0
+_llvmver=${pkgver%%.*}
+pkgdesc="The LLVM Linker"
+url="https://llvm.org/"
+arch="all"
+license="Apache-2.0"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+makedepends="
+	clang
+	cmake
+	compiler-rt
+	libedit-dev
+	libxml2-dev
+	llvm$_llvmver-dev
+	llvm$_llvmver-gtest
+	llvm$_llvmver-static
+	llvm$_llvmver-test-utils
+	llvm-libunwind-dev
+	patchelf
+	samurai
+	scudo-malloc
+	zlib-dev
+	"
+checkdepends="gtest-dev bash llvm$_llvmver-test-utils"
+subpackages="$pkgname-dbg $pkgname-libs $pkgname-dev $pkgname-doc"
+source="https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver//_/-}/lld-${pkgver//_/}.src.tar.xz
+	https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver//_/-}/cmake-${pkgver//_/}.src.tar.xz
+	"
+builddir="$srcdir/$pkgname-${pkgver//_/}.src"
+
+prepare() {
+	default_prepare
+	mv "$srcdir"/cmake-${pkgver//_/}.src "$srcdir"/cmake
+}
+
+build() {
+	CFLAGS="$CFLAGS -O2 -DNDEBUG -g1" \
+	CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG -g1" \
+	CC=clang CXX=clang++ \
+	cmake -B build -G Ninja -Wno-dev \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_SKIP_INSTALL_RPATH=ON \
+		-DBUILD_SHARED_LIBS=ON \
+		-DLLVM_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DLLVM_EXTERNAL_LIT=/usr/bin/lit \
+		-DLLD_BUILT_STANDALONE=ON \
+		-DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -Wl,-z,stack-size=2097152"
+	cmake --build build
+}
+
+check() {
+	ninja -C build check-lld
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+	install -Dm644 "$builddir"/docs/ld.lld.1 -t "$pkgdir"/usr/share/man/man1/
+
+	# we have the scudo allocator available, so link lld to it to
+	# significantly improve performance, especially in LTO contexts
+	patchelf --add-needed libscudo.so "$pkgdir"/usr/bin/lld
+}
+
+sha512sums="
+55955fc24b3fb87012486618cf227a1640ad9a6d607c898d890337aa8c28f3e6a9ed48a52bd0ed57f365f0dc5081a6b3a037cb65da9a9f2cbc53a1527cb8db60  lld-17.0.6.src.tar.xz
+b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a  cmake-17.0.6.src.tar.xz
+"
diff --git a/main/llvm-runtimes/APKBUILD b/main/llvm-runtimes/APKBUILD
new file mode 100644
index 00000000000..59fcd32db4a
--- /dev/null
+++ b/main/llvm-runtimes/APKBUILD
@@ -0,0 +1,153 @@
+# Contributor: Eric Molitor <eric@molitor.org>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=llvm-runtimes
+# Note: Update together with llvm.
+pkgver=17.0.6
+_llvmver=${pkgver%%.*}
+pkgrel=0
+pkgdesc="LLVM Runtimes"
+url="https://llvm.org/"
+arch="all"
+license="Apache-2.0"
+makedepends="
+	clang
+	cmake
+	linux-headers
+	llvm$_llvmver-dev
+	llvm$_llvmver-static
+	python3
+	samurai
+	"
+subpackages="
+	libc++:libcxx
+	libc++-static:libcxx_static
+	libc++-dev:libcxx_dev
+	compiler-rt:rt
+	llvm-libunwind:libunwind
+	llvm-libunwind-static:libunwind_static
+	llvm-libunwind-dev:libunwind_dev
+	"
+source="https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver//_/-}/llvm-project-${pkgver//_/}.src.tar.xz
+	armv6-arch.patch.noauto
+	compiler-rt-lsan-dtp-offset.patch
+	compiler-rt-ppc-fixes.patch
+	compiler-rt-sanitizer-supported-arch.patch
+	libunwind-link-libssp.patch
+	fix-msan-with-musl.patch
+	"
+builddir="$srcdir/llvm-project-${pkgver//_/}.src"
+options="!check"
+
+case "$CARCH" in
+# Sanitizers are broken on other arches.
+# Keep in sync with compiler-rt-sanitizer-supported-arch.patch.
+aarch64|ppc64le|x86_64)
+	_build_sanitizers='ON'
+	;;
+*)
+	_build_sanitizers='OFF'
+	;;
+esac
+
+prepare() {
+	default_prepare
+
+	case "$CARCH" in
+	armhf)
+		patch -Np1 < "$srcdir"/armv6-arch.patch.noauto
+		;;
+	esac
+}
+
+build() {
+	if [ "$CBUILD" != "$CHOST" ]; then
+		local crossopts="
+			-DCMAKE_SYSTEM_NAME=Linux
+			-DCMAKE_HOST_SYSTEM_NAME=Linux
+			-DLIBUNWIND_SYSROOT=$CBUILDROOT
+			"
+	fi
+
+	CC=clang \
+	CXX=clang++ \
+	CFLAGS="$CFLAGS -DNDEBUG" \
+	CXXFLAGS="$CXXFLAGS -DNDEBUG" \
+	cmake -B build -G Ninja -Wno-dev -S runtimes \
+		-DLLVM_ENABLE_RUNTIMES="compiler-rt;libunwind;libcxx;libcxxabi" \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DLIBCXX_HAS_MUSL_LIBC=ON \
+		-DLIBUNWIND_HAS_NODEFAULTLIBS_FLAG=OFF \
+		-DCOMPILER_RT_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DCOMPILER_RT_BUILD_SANITIZERS=$_build_sanitizers \
+		-DCOMPILER_RT_INSTALL_PATH="/usr/lib/llvm$_llvmver/lib/clang/$_llvmver" \
+		-DCOMPILER_RT_BUILD_GWP_ASAN=OFF \
+		-DCMAKE_VERBOSE_MAKEFILE=ON \
+		$crossopts
+	cmake --build build
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+
+	mkdir -p "$pkgdir"/usr/include/mach-o
+	cp libunwind/include/*.h "$pkgdir"/usr/include/
+	cp libunwind/include/mach-o/*.h "$pkgdir"/usr/include/mach-o/
+}
+
+libunwind() {
+	pkgdesc="LLVM libunwind library"
+	depends="!libunwind-dev"
+
+	amove usr/lib/libunwind.so.*
+}
+
+libunwind_static() {
+	pkgdesc="LLVM libunwind library (static)"
+
+	amove usr/lib/libunwind.a
+}
+
+libunwind_dev() {
+	pkgdesc="LLVM libunwind library (development files)"
+
+	amove usr/lib/libunwind.so
+	amove usr/include
+}
+
+rt() {
+	pkgdesc="LLVM compiler-rt runtime libraries"
+
+	amove usr/lib/llvm$_llvmver/lib/clang/$_llvmver
+}
+
+libcxx() {
+	pkgdesc="LLVM libc++ library"
+
+	amove usr/lib/libc++*.so.*
+}
+
+libcxx_static() {
+	pkgdesc="LLVM libc++ library (static libs)"
+
+	amove usr/lib/libc++*.a
+}
+
+libcxx_dev() {
+	pkgdesc="LLVM libc++ library (development files)"
+
+	amove usr/lib/libc++*.so
+	amove usr/include/c++
+}
+
+sha512sums="
+6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30  llvm-project-17.0.6.src.tar.xz
+5e7bbddbaea902e5ba5cd4db78bedbeef216f44fdd9b8f73efde6c09f40115c078649a109ffa61fefa0ee2f26655c038a48589ecac83068a47d60e9248c5dff1  armv6-arch.patch.noauto
+7c2cbd095b863f735842aaa8f0daecbf0282200fc58f1394139cee30d53c4a738757e38cbf0ec734398ee827e8a47314592bd7dc9768ef5c3664db682680e5a1  compiler-rt-lsan-dtp-offset.patch
+aaef886f71c5499da18ff18937404ab641cbc3a540ee9e4eed7ae6895970863e6d01ed598f8b2f1512936f33d6dd122cd7a00545afaf710a8026c729a3af720c  compiler-rt-ppc-fixes.patch
+448ad39865b1a86d69c80b6626500e16509834787944f0b402b3eb3b2d6d1c034073b4004b7e1eee6afdc21b553945e65943b79426105503012c4dfac1ee2e7b  compiler-rt-sanitizer-supported-arch.patch
+102d050172d1f20c273515b8ccf05ee7e756287f1d74529116ac061f0119da5ce4e5ea3d1a5d21c6395256b5d0538aa928302a6cf39ae59f41aa35929b265e2f  libunwind-link-libssp.patch
+4295d104f3615d0ccae3f17e60a8e00c7df5b899fb790c746033f48e76c2b020e312639e03148d6162ce471a3c3b45461a5a82ac4eed407fafc670223656b572  fix-msan-with-musl.patch
+"
diff --git a/main/llvm-runtimes/armv6-arch.patch.noauto b/main/llvm-runtimes/armv6-arch.patch.noauto
new file mode 100644
index 00000000000..7de1183a5a1
--- /dev/null
+++ b/main/llvm-runtimes/armv6-arch.patch.noauto
@@ -0,0 +1,18 @@
+the build system recognises armhf as armv7 (which it usually is..)
+but for us that is wrong. it compiles anyway since clang is a cross compiler.
+diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake
+index 0ad95d57f..795ca5deb 100644
+--- a/compiler-rt/cmake/base-config-ix.cmake
++++ b/compiler-rt/cmake/base-config-ix.cmake
+@@ -236,10 +236,7 @@ macro(test_targets)
+       if(WIN32)
+         test_target_arch(arm "" "" "")
+       else()
+-        test_target_arch(armv4t "" "-march=armv4t" "-mfloat-abi=soft")
+-        test_target_arch(armv6m "" "-march=armv6m" "-mfloat-abi=soft")
+-        test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft")
+-        test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard")
++        test_target_arch(armhf "" "-march=armv6zk" "-mfloat-abi=hard")
+       endif()
+     elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "avr")
+       test_target_arch(avr "__AVR__" "--target=avr")
diff --git a/main/llvm-runtimes/compiler-rt-lsan-dtp-offset.patch b/main/llvm-runtimes/compiler-rt-lsan-dtp-offset.patch
new file mode 100644
index 00000000000..a5617f56c05
--- /dev/null
+++ b/main/llvm-runtimes/compiler-rt-lsan-dtp-offset.patch
@@ -0,0 +1,70 @@
+more ppc64le sanitizer fixes
+From 01de315ff348fec5b7c17a6ae94ce517d23a2f0c Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Sat, 5 Nov 2022 23:39:29 +0100
+Subject: [PATCH] rudimentary lsan musl fixes on some archs (ppc64le)
+
+---
+ .../sanitizer_common/sanitizer_linux_libcdep.cpp  | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
+index d74851c43..f13fc84be 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
+@@ -29,6 +29,14 @@
+ #include "sanitizer_procmaps.h"
+ #include "sanitizer_solaris.h"
+ 
++#if defined(__powerpc__)
++#define DTP_OFFSET 0x8000
++#elif SANITIZER_RISCV64
++#define DTP_OFFSET 0x800
++#else
++#define DTP_OFFSET 0
++#endif
++
+ #if SANITIZER_NETBSD
+ #define _RTLD_SOURCE  // for __lwp_gettcb_fast() / __lwp_getprivate_fast()
+ #endif
+@@ -289,6 +297,7 @@ static uptr ThreadDescriptorSizeFallback() {
+   return val;
+ }
+ 
++#if SANITIZER_GLIBC
+ uptr ThreadDescriptorSize() {
+   uptr val = atomic_load_relaxed(&thread_descriptor_size);
+   if (val)
+@@ -303,6 +312,9 @@ uptr ThreadDescriptorSize() {
+   atomic_store_relaxed(&thread_descriptor_size, val);
+   return val;
+ }
++#else
++uptr ThreadDescriptorSize() { return 0; }
++#endif
+ 
+ #if defined(__mips__) || defined(__powerpc64__) || SANITIZER_RISCV64
+ // TlsPreTcbSize includes size of struct pthread_descr and size of tcb
+@@ -392,6 +404,7 @@ static int CollectStaticTlsBlocks(struct dl_phdr_info *info, size_t size,
+     begin = (uptr)__tls_get_addr(mod_and_off);
+ #endif
+   }
++  begin -= DTP_OFFSET;
+   for (unsigned i = 0; i != info->dlpi_phnum; ++i)
+     if (info->dlpi_phdr[i].p_type == PT_TLS) {
+       static_cast<InternalMmapVector<TlsBlock> *>(data)->push_back(
+@@ -542,9 +555,11 @@ static void GetTls(uptr *addr, uptr *size) {
+   else if (SANITIZER_FREEBSD)
+     *size += 128;  // RTLD_STATIC_TLS_EXTRA
+ #if defined(__mips__) || defined(__powerpc64__) || SANITIZER_RISCV64
++#if SANITIZER_GLIBC
+   const uptr pre_tcb_size = TlsPreTcbSize();
+   *addr -= pre_tcb_size;
+   *size += pre_tcb_size;
++#endif
+ #else
+   // arm and aarch64 reserve two words at TP, so this underestimates the range.
+   // However, this is sufficient for the purpose of finding the pointers to
+-- 
+2.38.1
+
diff --git a/main/llvm-runtimes/compiler-rt-ppc-fixes.patch b/main/llvm-runtimes/compiler-rt-ppc-fixes.patch
new file mode 100644
index 00000000000..6738ebc55c9
--- /dev/null
+++ b/main/llvm-runtimes/compiler-rt-ppc-fixes.patch
@@ -0,0 +1,118 @@
+fixes some sanitizers on ppc64le
+From 95fa3d049e35b141f0c2c3b3b0abb6c1b3702e46 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Wed, 6 Apr 2022 00:54:03 +0200
+Subject: [PATCH 07/19] compiler-rt: ppc sanitizer fixes
+
+---
+ .../lib/sanitizer_common/sanitizer_linux.cpp  |  4 ++
+ .../sanitizer_platform_limits_posix.cpp       |  2 +-
+ .../sanitizer_stoptheworld_linux_libcdep.cpp  |  2 +-
+ compiler-rt/lib/xray/xray_powerpc64.inc       | 37 ++++++++++++++++++-
+ 4 files changed, 42 insertions(+), 3 deletions(-)
+
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
+index 24c6acaa9..5d79dea48 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
+@@ -74,6 +74,10 @@
+ #include <sys/utsname.h>
+ #endif
+ 
++#if SANITIZER_LINUX && defined(__powerpc__)
++#include <asm/ptrace.h>
++#endif
++
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ #include <sys/personality.h>
+ #endif
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+index fc01498aa..2fd663d88 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -94,7 +94,7 @@
+ # include <utime.h>
+ # include <sys/ptrace.h>
+ #    if defined(__mips64) || defined(__aarch64__) || defined(__arm__) || \
+-        defined(__hexagon__) || defined(__loongarch__) ||SANITIZER_RISCV64
++        defined(__hexagon__) || defined(__loongarch__) || defined(__powerpc__) || SANITIZER_RISCV64
+ #      include <asm/ptrace.h>
+ #      ifdef __arm__
+ typedef struct user_fpregs elf_fpregset_t;
+diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp
+index 13b90ce9b..f8702753e 100644
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp
+@@ -31,7 +31,7 @@
+ #include <sys/types.h> // for pid_t
+ #include <sys/uio.h> // for iovec
+ #include <elf.h> // for NT_PRSTATUS
+-#if (defined(__aarch64__) || SANITIZER_RISCV64 || SANITIZER_LOONGARCH64) && \
++#if (defined(__aarch64__) || defined(__powerpc__) || SANITIZER_RISCV64 || SANITIZER_LOONGARCH64) && \
+      !SANITIZER_ANDROID
+ // GLIBC 2.20+ sys/user does not include asm/ptrace.h
+ # include <asm/ptrace.h>
+diff --git a/compiler-rt/lib/xray/xray_powerpc64.inc b/compiler-rt/lib/xray/xray_powerpc64.inc
+index 7e872b5b4..9616a09d8 100644
+--- a/compiler-rt/lib/xray/xray_powerpc64.inc
++++ b/compiler-rt/lib/xray/xray_powerpc64.inc
+@@ -12,7 +12,7 @@
+ 
+ #include <cstdint>
+ #include <mutex>
+-#ifdef __linux__
++#ifdef __GLIBC__
+ #include <sys/platform/ppc.h>
+ #elif defined(__FreeBSD__)
+ #include <sys/types.h>
+@@ -27,6 +27,14 @@ uint64_t __ppc_get_timebase_freq (void)
+   sysctlbyname("kern.timecounter.tc.timebase.frequency", &tb_freq, &length, nullptr, 0);
+   return tb_freq;
+ }
++#else
++#include <cctype>
++#include <cstdio>
++#include <cstring>
++#include <cstdlib>
++
++#define __ppc_get_timebase __builtin_ppc_get_timebase
++
+ #endif
+ 
+ #include "xray_defs.h"
+@@ -41,7 +48,35 @@ ALWAYS_INLINE uint64_t readTSC(uint8_t &CPU) XRAY_NEVER_INSTRUMENT {
+ inline uint64_t getTSCFrequency() XRAY_NEVER_INSTRUMENT {
+   static std::mutex M;
+   std::lock_guard<std::mutex> Guard(M);
++#ifdef __GLIBC__
+   return __ppc_get_timebase_freq();
++#else
++  /* FIXME: a less dirty implementation? */
++  static uint64_t base;
++  if (!base) {
++    FILE *f = fopen("/proc/cpuinfo", "rb");
++    if (f) {
++      ssize_t nr;
++      /* virtually always big enough to hold the line */
++      char buf[512];
++      while (fgets(buf, sizeof(buf), f)) {
++        char *ret = strstr(buf, "timebase");
++        if (!ret) {
++          continue;
++        }
++        ret += sizeof("timebase") - 1;
++        ret = strchr(ret, ':');
++        if (!ret) {
++          continue;
++        }
++        base = strtoul(ret + 1, nullptr, 10);
++        break;
++      }
++      fclose(f);
++    }
++  }
++  return base;
++#endif
+ }
+ 
+ inline bool probeRequiredCPUFeatures() XRAY_NEVER_INSTRUMENT {
diff --git a/main/llvm-runtimes/compiler-rt-sanitizer-supported-arch.patch b/main/llvm-runtimes/compiler-rt-sanitizer-supported-arch.patch
new file mode 100644
index 00000000000..c5ef4437cb9
--- /dev/null
+++ b/main/llvm-runtimes/compiler-rt-sanitizer-supported-arch.patch
@@ -0,0 +1,16 @@
+Sanitizer code is broken on armhf, armv7, s390x, x86, and probably riscv64,
+i.e. enable it only on x86_64, aarch64, and ppc64le.
+
+--- a/compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake
++++ b/compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake
+@@ -22,9 +22,7 @@
+   set(X86_64 x86_64 x86_64h)
+ endif()
+ 
+-set(ALL_SANITIZER_COMMON_SUPPORTED_ARCH ${X86} ${X86_64} ${PPC64} ${RISCV64}
+-    ${ARM32} ${ARM64} ${MIPS32} ${MIPS64} ${S390X} ${SPARC} ${SPARCV9}
+-    ${HEXAGON} ${LOONGARCH64})
++set(ALL_SANITIZER_COMMON_SUPPORTED_ARCH ${X86_64} ${ARM64} ${PPC64})
+ set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${RISCV64}
+     ${MIPS32} ${MIPS64} ${PPC64} ${S390X} ${SPARC} ${SPARCV9} ${HEXAGON})
+     ${LOONGARCH64})
diff --git a/main/llvm-runtimes/fix-msan-with-musl.patch b/main/llvm-runtimes/fix-msan-with-musl.patch
new file mode 100644
index 00000000000..1ca7896d889
--- /dev/null
+++ b/main/llvm-runtimes/fix-msan-with-musl.patch
@@ -0,0 +1,37 @@
+From 8904ed80c262e973c0da7758337f586c9854f38a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Thu, 15 Jun 2023 09:28:57 +0200
+Subject: [PATCH] msan: fix ifdef guard for getrlimit etc interceptors
+
+These interceptors need struct_ustat_sz, struct_rlimit64_sz, and
+struct_statvfs64_sz which are defined in the following file:
+
+	compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+
+However, these variables are only defined for GLIBC sanitizers.
+As such, if we attempt to use MSAN on a Linux system that does not
+utilize glibc (e.g. Alpine Linux) then we will get a linker error
+complaining about undefined references to __sanitizer::struct_rlimit64_sz
+and __sanitizer::struct_rlimit64_sz.
+
+This patch fixes this by only defining the interceptors that require
+these constants if SANITIZER_GLIBC is defined. Thereby aligning the
+macro guards of msan_interceptors.cpp with those of
+sanitizer_platform_limits_posix.cpp.
+---
+ compiler-rt/lib/msan/msan_interceptors.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/compiler-rt/lib/msan/msan_interceptors.cpp b/compiler-rt/lib/msan/msan_interceptors.cpp
+index 6f57c33ee..349eff549 100644
+--- a/compiler-rt/lib/msan/msan_interceptors.cpp
++++ b/compiler-rt/lib/msan/msan_interceptors.cpp
+@@ -822,7 +822,7 @@ INTERCEPTOR(int, getrlimit, int resource, void *rlim) {
+   INTERCEPTOR_GETRLIMIT_BODY(getrlimit, resource, rlim);
+ }
+ 
+-#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD
++#if SANITIZER_GLIBC
+ INTERCEPTOR(int, __getrlimit, int resource, void *rlim) {
+   INTERCEPTOR_GETRLIMIT_BODY(__getrlimit, resource, rlim);
+ }
diff --git a/main/llvm-runtimes/libunwind-link-libssp.patch b/main/llvm-runtimes/libunwind-link-libssp.patch
new file mode 100644
index 00000000000..11f9cef5f24
--- /dev/null
+++ b/main/llvm-runtimes/libunwind-link-libssp.patch
@@ -0,0 +1,22 @@
+diff --git a/libunwind/src/CMakeLists.txt b/libunwind/src/CMakeLists.txt
+index bb2ada9..478f5b8 100644
+--- a/libunwind/src/CMakeLists.txt
++++ b/libunwind/src/CMakeLists.txt
+@@ -126,7 +126,7 @@ if(CMAKE_C_COMPILER_ID STREQUAL MSVC)
+ else()
+   target_compile_options(unwind_shared_objects PRIVATE -fno-rtti)
+ endif()
+-target_link_libraries(unwind_shared_objects PRIVATE unwind-headers ${LIBUNWIND_LIBRARIES})
++target_link_libraries(unwind_shared_objects PRIVATE unwind-headers ${LIBUNWIND_LIBRARIES} -lssp_nonshared)
+ target_compile_options(unwind_shared_objects PUBLIC "${LIBUNWIND_ADDITIONAL_COMPILE_FLAGS}")
+ target_link_libraries(unwind_shared_objects PUBLIC "${LIBUNWIND_ADDITIONAL_LIBRARIES}")
+ set_target_properties(unwind_shared_objects
+@@ -166,7 +166,7 @@ if(CMAKE_C_COMPILER_ID STREQUAL MSVC)
+ else()
+   target_compile_options(unwind_static_objects PRIVATE -fno-rtti)
+ endif()
+-target_link_libraries(unwind_static_objects PRIVATE unwind-headers ${LIBUNWIND_LIBRARIES})
++target_link_libraries(unwind_static_objects PRIVATE unwind-headers ${LIBUNWIND_LIBRARIES} -lssp_nonshared)
+ target_compile_options(unwind_static_objects PUBLIC "${LIBUNWIND_ADDITIONAL_COMPILE_FLAGS}")
+ target_link_libraries(unwind_static_objects PUBLIC "${LIBUNWIND_ADDITIONAL_LIBRARIES}")
+ set_target_properties(unwind_static_objects
diff --git a/main/llvm10/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch b/main/llvm10/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
deleted file mode 100644
index 1bf2fbb6078..00000000000
--- a/main/llvm10/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f8e83c4c7866ae830abe9bec15cfe805dd825b6e Mon Sep 17 00:00:00 2001
-From: xentec <xentec@aix0.eu>
-Date: Tue, 12 Sep 2017 07:18:38 +0200
-Subject: [PATCH] Disable dynamic lib tests for musl's dlclose() is noop
-
----
- unittests/Support/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/unittests/Support/CMakeLists.txt b/unittests/Support/CMakeLists.txt
-index 641163e..4f508d9 100644
---- a/unittests/Support/CMakeLists.txt
-+++ b/unittests/Support/CMakeLists.txt
-@@ -75,4 +75,4 @@ set_source_files_properties(AlignOfTest.cpp PROPERTIES COMPILE_FLAGS -w)
- # ManagedStatic.cpp uses <pthread>.
- target_link_libraries(SupportTests LLVMTestingSupport ${LLVM_PTHREAD_LIB})
- 
--add_subdirectory(DynamicLibrary)
-+# add_subdirectory(DynamicLibrary)
--- 
-2.14.1
-
diff --git a/main/llvm10/APKBUILD b/main/llvm10/APKBUILD
deleted file mode 100644
index 46de6cb695a..00000000000
--- a/main/llvm10/APKBUILD
+++ /dev/null
@@ -1,249 +0,0 @@
-# Contributor: Rasmus Thomsen <oss@cogitri.dev>
-# Contributor: Martell Malone <martell@marinelayer.io>
-# Contributor: Travis Tilley <ttilley@gmail.com>
-# Contributor: Mitch Tishmack <mitch.tishmack@gmail.com>
-# Contributor: Jakub Jirutka <jakub@jirutka.cz>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
-_pkgname=llvm
-pkgver=10.0.0
-_majorver=${pkgver%%.*}
-pkgname=$_pkgname$_majorver
-pkgrel=0
-pkgdesc="Low Level Virtual Machine compiler system, version $_majorver"
-arch="all"
-url="https://llvm.org/"
-license="Apache-2.0"
-depends_dev="$pkgname=$pkgver-r$pkgrel"
-makedepends="binutils-dev chrpath cmake libffi-dev python3 zlib-dev
-	libxml2-dev py3-setuptools"
-# diffutils for diff: unrecognized option: strip-trailing-cr
-# coreutils for 'od' binary
-checkdepends="bash coreutils diffutils"
-subpackages="$pkgname-static $pkgname-libs $pkgname-dev $pkgname-test-utils:_test_utils"
-source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz
-	0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
-	fix-memory-mf_exec-on-aarch64.patch
-	fix-LLVMConfig-cmake-install-prefix.patch
-	python3-test.patch
-	"
-builddir="$srcdir/$_pkgname-$pkgver.src"
-
-# ARM has few failures in test suite that we don't care about currently and
-# also it takes forever to run them on the builder.
-# MIPS as well...
-case "$CARCH" in
-	arm*) options="$options !check";;
-	mips*) options="$options !check";;
-esac
-
-# Whether is this package the default (latest) LLVM version.
-_default_llvm="yes"
-
-if [ "$_default_llvm" = yes ]; then
-	provides="llvm=$pkgver-r$pkgrel"
-	replaces="llvm"
-fi
-
-# NOTE: It seems that there's no (sane) way how to change includedir, sharedir
-# etc. separately, just the CMAKE_INSTALL_PREFIX. Standard CMake variables and
-# even  LLVM-specific variables, that are related to these paths, actually
-# don't work (in llvm 3.7).
-#
-# When building a software that depends on LLVM, utility llvm-config should be
-# used to discover where is LLVM installed. It provides options to print
-# path of bindir, includedir, and libdir separately, but in its source, all
-# these paths are actually hard-coded against INSTALL_PREFIX. We can patch it
-# and move paths manually, but I'm really not sure what it may break...
-#
-# Also note that we should *not* add version suffix to files in llvm bindir!
-# It breaks build system of some software that depends on LLVM, because they
-# don't expect these files to have a sufix.
-#
-# So, we install all the LLVM files into /usr/lib/llvm$_majorver.
-# BTW, Fedora and Debian do the same thing.
-#
-_prefix="usr/lib/llvm$_majorver"
-
-prepare() {
-	default_prepare
-	mkdir -p "$builddir"/build
-
-	# Known broken test on musl
-	rm -v test/CodeGen/AArch64/wineh4.mir
-}
-
-build() {
-	cd "$builddir"/build
-
-	# Auto-detect it by guessing either.
-	local ffi_include_dir="$(pkg-config --cflags-only-I libffi | sed 's|^-I||g')"
-
-	cmake -Wno-dev \
-		-DCMAKE_BUILD_TYPE=MinSizeRel \
-		-DCMAKE_C_FLAGS_MINSIZEREL_INIT="$CFLAGS" \
-		-DCMAKE_CXX_FLAGS_MINSIZEREL_INIT="$CXXFLAGS" \
-		-DCMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT="$LDFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=/$_prefix \
-		-DFFI_INCLUDE_DIR="$ffi_include_dir" \
-		-DLLVM_BINUTILS_INCDIR=/usr/include \
-		-DLLVM_BUILD_DOCS=OFF \
-		-DLLVM_BUILD_EXAMPLES=OFF \
-		-DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \
-		-DLLVM_BUILD_LLVM_DYLIB=ON \
-		-DLLVM_BUILD_TESTS=ON \
-		-DLLVM_DEFAULT_TARGET_TRIPLE="$CBUILD" \
-		-DLLVM_ENABLE_ASSERTIONS=OFF \
-		-DLLVM_ENABLE_CXX1Y=ON \
-		-DLLVM_ENABLE_FFI=ON \
-		-DLLVM_ENABLE_LIBCXX=OFF \
-		-DLLVM_ENABLE_PIC=ON \
-		-DLLVM_ENABLE_RTTI=ON \
-		-DLLVM_ENABLE_SPHINX=OFF \
-		-DLLVM_ENABLE_TERMINFO=ON \
-		-DLLVM_ENABLE_ZLIB=ON \
-		-DLLVM_HOST_TRIPLE="$CHOST" \
-		-DLLVM_INCLUDE_EXAMPLES=OFF \
-		-DLLVM_LINK_LLVM_DYLIB=ON \
-		-DLLVM_APPEND_VC_REV=OFF \
-		"$builddir"
-
-	make llvm-tblgen
-	make
-
-	python3 ../utils/lit/setup.py build
-}
-
-check() {
-	cd "$builddir"/build
-
-	make check-llvm
-}
-
-package() {
-	cd "$builddir"/build
-
-	make DESTDIR="$pkgdir" install
-
-	cd "$pkgdir"/$_prefix
-
-	# Remove RPATHs.
-	file lib/*.so bin/* \
-		| awk -F: '$2~/ELF/{print $1}' \
-		| xargs -r chrpath -d
-
-	# Symlink files from /usr/lib/llvm*/bin to /usr/bin.
-	mkdir -p "$pkgdir"/usr/bin
-	local name newname path
-	for path in bin/*; do
-		name=${path##*/}
-		# Add version infix/suffix to the executable name.
-		case "$name" in
-			llvm-*) newname="llvm$_majorver-${name#llvm-}";;
-			*) newname="$name$_majorver";;
-		esac
-		# If this package provides=llvm (i.e. it's the default/latest
-		# llvm package), omit version infix/suffix.
-		if [ "$_default_llvm" = yes ]; then
-			newname=$name
-		fi
-		case "$name" in
-			FileCheck | obj2yaml | yaml2obj) continue;;
-		esac
-		ln -s ../lib/llvm$_majorver/bin/$name "$pkgdir"/usr/bin/$newname
-	done
-
-	# Move /usr/lib/$pkgname/include/ into /usr/include/$pkgname/
-	# and symlink it back.
-	mkdir "$pkgdir"/usr/include/
-	mv include "$pkgdir"/usr/include/$pkgname
-	ln -s ../../include/$pkgname include
-
-	# Move /usr/lib/$pkgname/lib/cmake/llvm/ into /usr/lib/cmake/$pkgname/
-	# and symlink it back.
-	mkdir "$pkgdir"/usr/lib/cmake/
-	mv lib/cmake/llvm "$pkgdir"/usr/lib/cmake/$pkgname
-	ln -s ../../../cmake/$pkgname lib/cmake/llvm
-}
-
-static() {
-	pkgdesc="LLVM $_majorver static libraries"
-	_common_subpkg
-
-	_mv "$pkgdir"/$_prefix/lib/*.a "$subpkgdir"/$_prefix/lib/
-}
-
-libs() {
-	pkgdesc="LLVM $_majorver runtime library"
-	local soname="libLLVM-$_majorver.so"
-	local soname2="libLLVM-$pkgver.so"
-
-	mkdir -p "$subpkgdir"
-	cd "$subpkgdir"
-
-	# libLLVM should be in /usr/lib. This is needed for binaries that are
-	# dynamically linked with libLLVM, so they can find it on default path.
-	_mv "$pkgdir"/$_prefix/lib/$soname usr/lib/
-	ln -s $soname usr/lib/$soname2
-
-	# And also symlink it back to the LLVM prefix.
-	mkdir -p $_prefix/lib
-	ln -s ../../$soname $_prefix/lib/$soname
-	ln -s ../../$soname $_prefix/lib/$soname2
-}
-
-dev() {
-	_common_subpkg
-	default_dev
-	cd "$subpkgdir"
-
-	_mv "$pkgdir"/$_prefix/lib $_prefix/
-	_mv "$pkgdir"/$_prefix/include $_prefix/
-
-	_mv "$pkgdir"/$_prefix/bin/llvm-config $_prefix/bin/
-
-	if [ "$_default_llvm" = yes ]; then
-		ln -sf llvm$_majorver/lib/LLVMgold.so usr/lib/
-		ln -sf llvm$_majorver/lib/libLTO.so usr/lib/
-		ln -sf llvm$_majorver usr/lib/cmake/llvm
-	fi
-}
-
-_test_utils() {
-	pkgdesc="LLVM $_majorver utilities for executing LLVM and Clang style test suites"
-	depends="python3 py3-setuptools"
-	_common_subpkg
-	replaces=""
-
-	local litver=$(python3 "$builddir"/utils/lit/setup.py --version 2>/dev/null \
-		| sed 's/\.dev.*$//')
-	test -n "$litver"
-	provides="$provides lit=$litver-r$pkgrel"
-
-	cd "$builddir"/build
-
-	install -D -m 755 bin/count "$subpkgdir"/$_prefix/bin/count
-	install -D -m 755 bin/FileCheck "$subpkgdir"/$_prefix/bin/FileCheck
-	install -D -m 755 bin/not "$subpkgdir"/$_prefix/bin/not
-
-	python3 ../utils/lit/setup.py install --prefix=/usr --root="$subpkgdir"
-	ln -s ../../../bin/lit "$subpkgdir"/$_prefix/bin/lit
-}
-
-_common_subpkg() {
-	if [ "$_default_llvm" = yes ]; then
-		replaces="llvm${subpkgname#$pkgname}"
-		provides="$replaces=$pkgver-r$pkgrel"
-	fi
-}
-
-_mv() {
-	local dest; for dest; do true; done  # get last argument
-	mkdir -p "$dest"
-	mv "$@"
-}
-
-sha512sums="7dc961aacee3a01ecc002ff2b688a2ef50661856d2abd5ecc90566ffcad7566e4976736cd339ea96592e452cd5a17aaceba9712b2effec805661cca8ff020ee7  llvm-10.0.0.src.tar.xz
-695502bd3b5454c2f5630c59a8cf5f8aeb0deac16a76a8a4df34849e1e35c12ed4234572a320fe4c7e96f974f572f429eb816c5aa3dcfb17057f550eac596495  0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
-64b9ecb246cc94ce7f617b3699b3306de0872a1a9b0ade88563330aa6f9a60742bb1d73f95743d0f033ea8b1535e2e612250c8f50bddf4419741ca18f40eca1d  fix-memory-mf_exec-on-aarch64.patch
-7d4825d16107e56a14b7b05be847f03d75e2e05952bea0742a1233b5b0441c9934d8058e612abb6471272884372d9bfd3348355fbd3c19cba82a554003cc3eec  fix-LLVMConfig-cmake-install-prefix.patch
-53cc0d13dd871e9b775bb4e7567de4f9a97d91b8246cd7ce74607fd88d6e3e2ab9455f5b4195bc7f9dbdedbc77d659d43e98ec0b7cd78cd395aaea6919510287  python3-test.patch"
diff --git a/main/llvm10/fix-LLVMConfig-cmake-install-prefix.patch b/main/llvm10/fix-LLVMConfig-cmake-install-prefix.patch
deleted file mode 100644
index b7e3dbe294e..00000000000
--- a/main/llvm10/fix-LLVMConfig-cmake-install-prefix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix LLVMConfig.cmake being generated to use correct LLVM_INSTALL_PREFIX
-(e.g. /usr/lib/llvm5).
-
-This is needed e.g. for building lldb.
-
---- a/cmake/modules/CMakeLists.txt
-+++ b/cmake/modules/CMakeLists.txt
-@@ -75,15 +75,7 @@
- 
- # Generate LLVMConfig.cmake for the install tree.
- set(LLVM_CONFIG_CODE "
--# Compute the installation prefix from this LLVMConfig.cmake file location.
--get_filename_component(LLVM_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)")
--# Construct the proper number of get_filename_component(... PATH)
--# calls to compute the installation prefix.
--string(REGEX REPLACE "/" ";" _count "${LLVM_INSTALL_PACKAGE_DIR}")
--foreach(p ${_count})
--  set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE}
--get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)")
--endforeach(p)
-+set(LLVM_INSTALL_PREFIX \"${CMAKE_INSTALL_PREFIX}\")")
- set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include")
- set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}")
- set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}")
diff --git a/main/llvm10/fix-memory-mf_exec-on-aarch64.patch b/main/llvm10/fix-memory-mf_exec-on-aarch64.patch
deleted file mode 100644
index a64a317ee6c..00000000000
--- a/main/llvm10/fix-memory-mf_exec-on-aarch64.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix failures in AllocationTests/MappedMemoryTest.* on aarch64:
-
-    Failing Tests (8):
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.AllocAndRelease/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.DuplicateNear/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.EnabledWrite/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.MultipleAllocAndRelease/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.SuccessiveNear/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.UnalignedNear/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroNear/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroSizeNear/3
-
-Upstream-Issue: https://bugs.llvm.org/show_bug.cgi?id=14278#c10
-
---- a/lib/Support/Unix/Memory.inc
-+++ b/lib/Support/Unix/Memory.inc
-@@ -59,7 +59,7 @@
-     return PROT_READ | PROT_WRITE | PROT_EXEC;
-   case llvm::sys::Memory::MF_EXEC:
- #if (defined(__FreeBSD__) || defined(__POWERPC__) || defined (__ppc__) || \
--     defined(_POWER) || defined(_ARCH_PPC))
-+     defined(_POWER) || defined(_ARCH_PPC) || (defined(__linux__) && defined(__aarch64__)))
-     // On PowerPC, having an executable page that has no read permission
-     // can have unintended consequences.  The function InvalidateInstruction-
-     // Cache uses instructions dcbf and icbi, both of which are treated by
diff --git a/main/llvm10/python3-test.patch b/main/llvm10/python3-test.patch
deleted file mode 100644
index 746313317e1..00000000000
--- a/main/llvm10/python3-test.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- llvm-7.0.1.src/test/BugPoint/compile-custom.ll.py.old	2014-03-13 00:10:37.000000000 +0000
-+++ llvm-7.0.1.src/test/BugPoint/compile-custom.ll.py	2019-03-10 03:48:48.600000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- import sys
- 
diff --git a/main/llvm14/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch b/main/llvm14/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
new file mode 100644
index 00000000000..b5a6e353247
--- /dev/null
+++ b/main/llvm14/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
@@ -0,0 +1,22 @@
+From f8e83c4c7866ae830abe9bec15cfe805dd825b6e Mon Sep 17 00:00:00 2001
+From: xentec <xentec@aix0.eu>
+Date: Tue, 12 Sep 2017 07:18:38 +0200
+Subject: [PATCH] Disable dynamic lib tests for musl's dlclose() is noop
+
+---
+ unittests/Support/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/unittests/Support/CMakeLists.txt b/unittests/Support/CMakeLists.txt
+index 641163e..4f508d9 100644
+--- a/unittests/Support/CMakeLists.txt
++++ b/unittests/Support/CMakeLists.txt
+@@ -124,5 +124,5 @@
+ 
+ if(NOT LLVM_INTEGRATED_CRT_ALLOC)
+   # The test doesn't pass when using a custom allocator, PR47881.
+-  add_subdirectory(DynamicLibrary)
++  # add_subdirectory(DynamicLibrary)
+ endif()
+
+
diff --git a/main/llvm14/APKBUILD b/main/llvm14/APKBUILD
new file mode 100644
index 00000000000..f9dea183863
--- /dev/null
+++ b/main/llvm14/APKBUILD
@@ -0,0 +1,320 @@
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
+# Contributor: Martell Malone <martell@marinelayer.io>
+# Contributor: Travis Tilley <ttilley@gmail.com>
+# Contributor: Mitch Tishmack <mitch.tishmack@gmail.com>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Contributor: Ariadne Conill <ariadne@dereferenced.org>
+# Contributor: omni <omni+alpine@hack.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+_pkgname=llvm
+pkgver=14.0.6
+_majorver=${pkgver%%.*}
+pkgname=$_pkgname$_majorver
+pkgrel=18
+pkgdesc="Low Level Virtual Machine compiler system, version $_majorver"
+arch="all !loongarch64 !riscv64"
+url="https://llvm.org/"
+license="Apache-2.0"
+install="$pkgname.pre-upgrade"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+# See https://gitlab.alpinelinux.org/alpine/aports/-/commit/51d2fba931fb2ef0046dea19405a9290c8735051#note_234651
+[ -z "$BOOTSTRAP" ] && depends_dev="$depends_dev $pkgname-test-utils=$pkgver-r$pkgrel"
+makedepends_host="binutils-dev libffi-dev zlib-dev libxml2-dev"
+makedepends_build="cmake chrpath python3 py3-setuptools samurai"
+# diffutils for diff: unrecognized option: strip-trailing-cr
+# coreutils for 'od' binary
+checkdepends="bash coreutils diffutils"
+subpackages="$pkgname-static $pkgname-libs $pkgname-dev $pkgname-test-utils:_test_utils"
+source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz
+	0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
+	allocscore.patch
+	fix-memory-mf_exec-on-aarch64.patch
+	install-prefix.patch
+	lfs64.patch
+	llvm-stack-size.patch
+	"
+builddir="$srcdir/$_pkgname-$pkgver.src"
+
+# Whether is this package the default (latest) LLVM version.
+_default_llvm="no"
+
+# If crosscompiling, we need llvm-tblgen on the build machine.
+if [ "$CBUILD" != "$CHOST" ]; then
+	_llvm_tblgen="llvm-tblgen"
+	if [ "$_default_llvm" = no ]; then
+		_llvm_tblgen="llvm$_majorver-tblgen"
+	fi
+	makedepends_build="$makedepends_build cmd:$_llvm_tblgen"
+	cmake_cross_options="
+		-DCMAKE_CROSSCOMPILING=ON
+		-DLLVM_TABLEGEN=/usr/bin/$_llvm_tblgen
+	"
+fi
+
+if [ "$_default_llvm" = yes ]; then
+	provides="llvm=$pkgver-r$pkgrel"
+	replaces="llvm"
+fi
+
+# explicit override for previous version as well
+replaces="llvm13"
+
+# NOTE: It seems that there's no (sane) way how to change includedir, sharedir
+# etc. separately, just the CMAKE_INSTALL_PREFIX. Standard CMake variables and
+# even  LLVM-specific variables, that are related to these paths, actually
+# don't work (in llvm 3.7).
+#
+# When building a software that depends on LLVM, utility llvm-config should be
+# used to discover where is LLVM installed. It provides options to print
+# path of bindir, includedir, and libdir separately, but in its source, all
+# these paths are actually hard-coded against INSTALL_PREFIX. We can patch it
+# and move paths manually, but I'm really not sure what it may break...
+#
+# Also note that we should *not* add version suffix to files in llvm bindir!
+# It breaks build system of some software that depends on LLVM, because they
+# don't expect these files to have a sufix.
+#
+# So, we install all the LLVM files into /usr/lib/llvm$_majorver.
+# BTW, Fedora and Debian do the same thing.
+#
+_prefix="usr/lib/llvm$_majorver"
+
+prepare() {
+	default_prepare
+
+	# Substitute python hashbangs with python3
+	find . -name '*.py' -type f -exec \
+		sed -i 's,^#!/usr/bin/env python$,#!/usr/bin/env python3,' {} +
+	find utils -type f -exec \
+		sed -i 's,^#!/usr/bin/env python$,#!/usr/bin/env python3,' {} +
+	find runtimes -type f -exec \
+		sed -i 's,^#!/usr/bin/env python$,#!/usr/bin/env python3,' {} +
+
+	# Known broken test on musl
+	rm -v test/CodeGen/AArch64/wineh4.mir
+	# https://github.com/llvm/llvm-project/issues/47657
+	rm -v test/ExecutionEngine/Interpreter/intrinsics.ll
+
+	case "$CARCH" in
+	x86) rm -v test/Object/macho-invalid.test \
+		test/tools/llvm-size/radix.test
+		;;
+	armv7) rm -v test/tools/llvm-readobj/ELF/dependent-libraries.test \
+		test/Object/macho-invalid.test \
+		test/tools/llvm-size/radix.test \
+		test/tools/llvm-dwarfdump/X86/prettyprint_types.s \
+		test/tools/llvm-dwarfdump/X86/simplified-template-names.s
+		;;
+	armhf) rm -v test/tools/llvm-readobj/ELF/dependent-libraries.test \
+		test/Object/macho-invalid.test \
+		test/tools/gold/X86/split-dwarf.ll \
+		test/tools/llvm-size/radix.test \
+		test/ExecutionEngine/frem.ll \
+		test/tools/llvm-dwarfdump/X86/prettyprint_types.s \
+		test/tools/llvm-dwarfdump/X86/simplified-template-names.s \
+		unittests/ExecutionEngine/Orc/OrcCAPITest.cpp
+		sed -i "/OrcCAPITest.cpp/d" \
+			unittests/ExecutionEngine/Orc/CMakeLists.txt
+		;;
+	esac
+
+	# Known broken codegen for Hexagon target, reported upstream.
+	# https://github.com/llvm/llvm-project/issues/48936
+	rm -v \
+		test/CodeGen/Hexagon/csr-stubs-spill-threshold.ll \
+		test/CodeGen/Hexagon/long-calls.ll \
+		test/CodeGen/Hexagon/mlong-calls.ll \
+		test/CodeGen/Hexagon/pic-regusage.ll \
+		test/CodeGen/Hexagon/runtime-stkchk.ll \
+		test/CodeGen/Hexagon/swp-memrefs-epilog.ll \
+		test/CodeGen/Hexagon/vararg-formal.ll \
+		test/tools/llvm-objcopy/MachO/universal-object.test \
+		test/DebugInfo/X86/vla-multi.ll
+
+	# XXX: fail when built with gcc13
+	rm -v \
+		test/CodeGen/X86/vector-interleaved-load-i32-stride-4.ll \
+		test/Transforms/SampleProfile/pseudo-probe-update-2.ll \
+		test/Transforms/SampleProfile/pseudo-probe-update.ll
+}
+
+build() {
+	# Auto-detect it by guessing either.
+	local ffi_include_dir="$(pkg-config --cflags-only-I libffi | sed 's|^-I||g')"
+	case "$CARCH" in
+		x86) LDFLAGS="$LDFLAGS -Wl,--no-keep-memory";; # avoid exhausting memory limit
+	esac
+
+	# NOTE: DO NOT change CMAKE_BUILD_TYPE! Buildmodes like None will enable
+	# debug assertions for LLVM!
+	cmake -B build -G Ninja -Wno-dev \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/$_prefix \
+		-DFFI_INCLUDE_DIR="$ffi_include_dir" \
+		-DLLVM_BINUTILS_INCDIR=/usr/include \
+		-DLLVM_BUILD_DOCS=OFF \
+		-DLLVM_BUILD_EXAMPLES=OFF \
+		-DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \
+		-DLLVM_BUILD_LLVM_DYLIB=ON \
+		-DLLVM_BUILD_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DLLVM_DEFAULT_TARGET_TRIPLE="$CBUILD" \
+		-DLLVM_ENABLE_ASSERTIONS=OFF \
+		-DLLVM_ENABLE_FFI=ON \
+		-DLLVM_ENABLE_LIBCXX=OFF \
+		-DLLVM_ENABLE_LIBEDIT=OFF \
+		-DLLVM_ENABLE_PIC=ON \
+		-DLLVM_ENABLE_RTTI=ON \
+		-DLLVM_ENABLE_SPHINX=OFF \
+		-DLLVM_ENABLE_TERMINFO=ON \
+		-DLLVM_ENABLE_ZLIB=ON \
+		-DLLVM_INSTALL_UTILS=ON \
+		-DLLVM_HOST_TRIPLE="$CHOST" \
+		-DLLVM_INCLUDE_EXAMPLES=OFF \
+		-DLLVM_LINK_LLVM_DYLIB=ON \
+		-DLLVM_APPEND_VC_REV=OFF \
+		-DLLVM_INCLUDE_BENCHMARKS=OFF \
+		$cmake_cross_options
+
+	cmake --build build --target llvm-tblgen
+	cmake --build build
+
+	python3 utils/lit/setup.py build
+}
+
+check() {
+	ninja -C build check-llvm
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+
+	cd "$pkgdir"/$_prefix
+
+	# Remove RPATHs.
+	file lib/*.so bin/* \
+		| awk -F: '$2~/ELF/{print $1}' \
+		| xargs -r chrpath -d
+
+	# Symlink files from /usr/lib/llvm*/bin to /usr/bin.
+	mkdir -p "$pkgdir"/usr/bin
+	local name newname path
+	for path in bin/*; do
+		name=${path##*/}
+		# Add version infix/suffix to the executable name.
+		case "$name" in
+			llvm-*) newname="llvm$_majorver-${name#llvm-}";;
+			*) newname="$name$_majorver";;
+		esac
+		# If this package provides=llvm (i.e. it's the default/latest
+		# llvm package), omit version infix/suffix.
+		if [ "$_default_llvm" = yes ]; then
+			newname=$name
+		fi
+		case "$name" in
+			FileCheck | obj2yaml | yaml2obj) continue;;
+		esac
+		ln -s ../lib/llvm$_majorver/bin/$name "$pkgdir"/usr/bin/$newname
+	done
+
+	mkdir -p "$pkgdir"/usr/include "$pkgdir"/usr/lib/cmake
+
+	# symlink include to /usr/include/llvm$_llvmver
+	ln -sfv ../lib/$pkgname/include "$pkgdir"/usr/include/$pkgname
+
+	# symlink cmake dir to system cmake
+	ln -sfv ../$pkgname/lib/cmake/llvm "$pkgdir"/usr/lib/cmake/$pkgname
+}
+
+static() {
+	pkgdesc="LLVM $_majorver static libraries"
+	_common_subpkg
+
+	_mv "$pkgdir"/$_prefix/lib/*.a "$subpkgdir"/$_prefix/lib/
+}
+
+libs() {
+	pkgdesc="LLVM $_majorver runtime library"
+	local soname="libLLVM-$_majorver.so"
+	local soname2="libLLVM-$pkgver.so"
+
+	mkdir -p "$subpkgdir"
+	cd "$subpkgdir"
+
+	# libLLVM should be in /usr/lib. This is needed for binaries that are
+	# dynamically linked with libLLVM, so they can find it on default path.
+	_mv "$pkgdir"/$_prefix/lib/$soname usr/lib/
+	ln -s $soname usr/lib/$soname2
+
+	# And also symlink it back to the LLVM prefix.
+	mkdir -p $_prefix/lib
+	ln -s ../../$soname $_prefix/lib/$soname
+	ln -s ../../$soname $_prefix/lib/$soname2
+}
+
+dev() {
+	_common_subpkg
+	default_dev
+	cd "$subpkgdir"
+
+	amove \
+		$_prefix/lib \
+		$_prefix/bin/llvm-config
+
+	# Move libLTO and LLVMgold back
+	_mv "$subpkgdir"/$_prefix/lib/libLTO.so.* \
+		"$subpkgdir"/$_prefix/lib/LLVMgold* \
+		"$pkgdir"/$_prefix/lib
+
+	if [ "$_default_llvm" = yes ]; then
+		ln -sf llvm$_majorver usr/lib/cmake/llvm
+		ln -sf llvm$_majorver/lib/LLVMgold.so "$subpkgdir"/usr/lib/
+		ln -sf llvm$_majorver/lib/libLTO.so "$subpkgdir"/usr/lib/
+	fi
+}
+
+_test_utils() {
+	pkgdesc="LLVM $_majorver utilities for executing LLVM and Clang style test suites"
+	depends="python3"
+	_common_subpkg
+	replaces=""
+
+	local litver=$(python3 "$builddir"/utils/lit/setup.py --version 2>/dev/null \
+		| sed 's/\.dev.*$//')
+	test -n "$litver"
+	provides="$provides lit=$litver-r$pkgrel"
+
+	amove usr/lib/$pkgname/bin/FileCheck \
+		usr/lib/$pkgname/bin/count \
+		usr/lib/$pkgname/bin/not \
+		usr/bin/count14 \
+		usr/bin/not14
+
+	cd "$builddir"/build
+
+	python3 ../utils/lit/setup.py install --root="$subpkgdir"
+	ln -s ../../../bin/lit "$subpkgdir"/$_prefix/bin/lit
+	ln -s ../../../bin/lit "$subpkgdir"/$_prefix/bin/llvm-lit
+}
+
+_common_subpkg() {
+	if [ "$_default_llvm" = yes ]; then
+		replaces="llvm${subpkgname#"$pkgname"}"
+		provides="$replaces=$pkgver-r$pkgrel"
+	fi
+}
+
+_mv() {
+	local dest; for dest; do true; done  # get last argument
+	mkdir -p "$dest"
+	mv "$@"
+}
+
+sha512sums="
+6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d  llvm-14.0.6.src.tar.xz
+6021b5a39843d645a8c63d558568f120d0d91a1ce209e46f0b980253fafb18dfc2078ef39cf63b0900f4313e3c5636320b3c179ff7a4e220d06aec2455063993  0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
+ed189ae609c73ab91c0973c3aeb334158370a1a2879f17fed93900f9225f34ca483aa1513d76b9f9f01d94221aa703642398fe7005f5fe878bf43d9ffbeac057  allocscore.patch
+dd5efd88abdd13db3b17bde8735c2ddb1ed1ac690a8ab06072e3e91f87d7ede924dcb513ee31b855d304fe43246619e5fa83fcbaeabb256b3b96ff4ebaf3b110  fix-memory-mf_exec-on-aarch64.patch
+7a87da5ee5f9d4db21974023eab88645610fdfae856e445f402169bc2aed74ab3861ad03974421aaa2312e24efb55bdbcd312146eb12b52f5c8c7515713bd40f  install-prefix.patch
+e288e8d3389536f1f040c0ae8a8eae168de8eedba6040efd5f477701e18529711329a279c6b86d5214ab44efaa6e27818d109be78891ee93e241a0ab1b3a0c5a  lfs64.patch
+c96cbd78a71d62e2ad273f0d2ef853644a5a80613e2519c49a9b7c04f684b106fb1dbb969626207bf16edb72c2dbfec23037b74716d5717263a1b86c60df52b4  llvm-stack-size.patch
+"
diff --git a/main/llvm14/allocscore.patch b/main/llvm14/allocscore.patch
new file mode 100644
index 00000000000..659afb6afab
--- /dev/null
+++ b/main/llvm14/allocscore.patch
@@ -0,0 +1,20 @@
+on x86, this fails with a float comparison error even though the floats are the
+same, because it does absolute eq
+--
+--- a/unittests/CodeGen/RegAllocScoreTest.cpp
++++ b/unittests/CodeGen/RegAllocScoreTest.cpp
+@@ -172,14 +172,5 @@
+   ASSERT_EQ(Freq2, TotalScore.loadStoreCounts());
+   ASSERT_EQ(Freq1, TotalScore.cheapRematCounts());
+   ASSERT_EQ(Freq2, TotalScore.expensiveRematCounts());
+-  ASSERT_EQ(TotalScore.getScore(),
+-            TotalScore.copyCounts() * CopyWeight +
+-                TotalScore.loadCounts() * LoadWeight +
+-                TotalScore.storeCounts() * StoreWeight +
+-                TotalScore.loadStoreCounts() * (LoadWeight + StoreWeight) +
+-                TotalScore.cheapRematCounts() * CheapRematWeight +
+-                TotalScore.expensiveRematCounts() * ExpensiveRematWeight
+-
+-  );
+ }
+ } // end namespace
diff --git a/main/llvm14/fix-memory-mf_exec-on-aarch64.patch b/main/llvm14/fix-memory-mf_exec-on-aarch64.patch
new file mode 100644
index 00000000000..c4166ed9a80
--- /dev/null
+++ b/main/llvm14/fix-memory-mf_exec-on-aarch64.patch
@@ -0,0 +1,25 @@
+Fix failures in AllocationTests/MappedMemoryTest.* on aarch64:
+
+    Failing Tests (8):
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.AllocAndRelease/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.DuplicateNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.EnabledWrite/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.MultipleAllocAndRelease/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.SuccessiveNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.UnalignedNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroSizeNear/3
+
+Upstream-Issue: https://bugs.llvm.org/show_bug.cgi?id=14278#c10
+
+--- a/lib/Support/Unix/Memory.inc
++++ b/lib/Support/Unix/Memory.inc
+@@ -58,7 +58,7 @@
+     return PROT_READ | PROT_WRITE | PROT_EXEC;
+   case llvm::sys::Memory::MF_EXEC:
+ #if (defined(__FreeBSD__) || defined(__POWERPC__) || defined (__ppc__) || \
+-     defined(_POWER) || defined(_ARCH_PPC))
++     defined(_POWER) || defined(_ARCH_PPC) || (defined(__linux__) && defined(__aarch64__)))
+     // On PowerPC, having an executable page that has no read permission
+     // can have unintended consequences.  The function InvalidateInstruction-
+     // Cache uses instructions dcbf and icbi, both of which are treated by
diff --git a/main/llvm14/install-prefix.patch b/main/llvm14/install-prefix.patch
new file mode 100644
index 00000000000..f7802cb8424
--- /dev/null
+++ b/main/llvm14/install-prefix.patch
@@ -0,0 +1,30 @@
+starting from llvm14 the install prefix breaks via symlinks;
+/usr/lib/llvm14/lib/cmake/llvm/LLVMConfig.cmake goes up 3 directories to find
+/usr/lib/llvm14/include as LLVM_INCLUDE_DIRS, but to even use this cmake folder
+at all it has to be symlinked to /usr/lib/cmake/llvm .. so the directory it
+instead uses is just /usr/include, which is not where the cmake includes are.
+this hardcodes them to the install prefix we pass via cmake, which should
+always be correct, and what cmake tries to autodetect anyway.
+
+also see: https://reviews.llvm.org/D29969
+
+--- a/cmake/modules/CMakeLists.txt
++++ b/cmake/modules/CMakeLists.txt
+@@ -41,6 +41,8 @@
+ #
+ 
+ set(LLVM_CONFIG_CODE "
++# this is wrong when automatically detected
++set(LLVM_INSTALL_PREFIX \"${CMAKE_INSTALL_PREFIX}\")
+ # LLVM_BUILD_* values available only from LLVM build tree.
+ set(LLVM_BUILD_BINARY_DIR \"${LLVM_BINARY_DIR}\")
+ set(LLVM_BUILD_LIBRARY_DIR \"${LLVM_LIBRARY_DIR}\")
+@@ -109,8 +111,6 @@
+ #
+ # Generate LLVMConfig.cmake for the install tree.
+ #
+-
+-find_prefix_from_config(LLVM_CONFIG_CODE LLVM_INSTALL_PREFIX "${LLVM_INSTALL_PACKAGE_DIR}")
+ 
+ extend_path(LLVM_CONFIG_MAIN_INCLUDE_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_INCLUDEDIR}")
+ # This is the same as the above because the handwritten and generated headers
diff --git a/main/llvm14/lfs64.patch b/main/llvm14/lfs64.patch
new file mode 100644
index 00000000000..5d1dfd15b32
--- /dev/null
+++ b/main/llvm14/lfs64.patch
@@ -0,0 +1,106 @@
+Patch-Source: https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67
+--
+From 5cd554303ead0f8891eee3cd6d25cb07f5a7bf67 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 4 Feb 2023 13:54:41 -0800
+Subject: [PATCH] cmake: Enable 64bit off_t on 32bit glibc systems
+
+Pass -D_FILE_OFFSET_BITS=64 to compiler flags on 32bit glibc based
+systems. This will make sure that 64bit versions of LFS functions are
+used e.g. seek will behave same as lseek64. Also revert [1] partially
+because this added a cmake test to detect lseek64 but then forgot to
+pass the needed macro to actual compile, this test was incomplete too
+since libc implementations like musl has 64bit off_t by default on 32bit
+systems and does not bundle[2] -D_LARGEFILE64_SOURCE under -D_GNU_SOURCE
+like glibc, which means the compile now fails on musl because the cmake
+check passes but we do not have _LARGEFILE64_SOURCE defined. Using the
+*64 function was transitional anyways so use -D_FILE_OFFSET_BITS=64
+instead
+
+[1] https://github.com/llvm/llvm-project/commit/8db7e5e4eed4c4e697dc3164f2c9351d8c3e942b
+[2] https://git.musl-libc.org/cgit/musl/commit/?id=25e6fee27f4a293728dd15b659170e7b9c7db9bc
+
+Reviewed By: MaskRay
+
+Differential Revision: https://reviews.llvm.org/D139752
+---
+ llvm/cmake/config-ix.cmake                                | 8 +++++---
+ llvm/include/llvm/Config/config.h.cmake                   | 3 ---
+ llvm/lib/Support/raw_ostream.cpp                          | 2 --
+ llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn | 2 --
+ utils/bazel/llvm_configs/config.h.cmake                   | 3 ---
+ 5 files changed, 5 insertions(+), 13 deletions(-)
+
+diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake
+index f959cd1f88484..b78c1b34ab8b9 100644
+--- a/cmake/config-ix.cmake
++++ b/cmake/config-ix.cmake
+@@ -284,9 +284,6 @@ check_symbol_exists(futimes sys/time.h HAVE_FUTIMES)
+ if( HAVE_SIGNAL_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*" AND NOT APPLE )
+   check_symbol_exists(sigaltstack signal.h HAVE_SIGALTSTACK)
+ endif()
+-set(CMAKE_REQUIRED_DEFINITIONS "-D_LARGEFILE64_SOURCE")
+-check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64)
+-set(CMAKE_REQUIRED_DEFINITIONS "")
+ check_symbol_exists(mallctl malloc_np.h HAVE_MALLCTL)
+ check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO)
+ check_symbol_exists(mallinfo2 malloc.h HAVE_MALLINFO2)
+@@ -340,6 +337,11 @@ check_symbol_exists(__GLIBC__ stdio.h LLVM_USING_GLIBC)
+ if( LLVM_USING_GLIBC )
+   add_compile_definitions(_GNU_SOURCE)
+   list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_GNU_SOURCE")
++# enable 64bit off_t on 32bit systems using glibc
++  if (CMAKE_SIZEOF_VOID_P EQUAL 4)
++    add_compile_definitions(_FILE_OFFSET_BITS=64)
++    list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_FILE_OFFSET_BITS=64")
++  endif()
+ endif()
+ 
+ # This check requires _GNU_SOURCE.
+diff --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake
+index 3543e6fc29944..29ac536b4c31b 100644
+--- a/include/llvm/Config/config.h.cmake
++++ b/include/llvm/Config/config.h.cmake
+@@ -128,9 +128,6 @@
+ /* Define to 1 if you have the <link.h> header file. */
+ #cmakedefine HAVE_LINK_H ${HAVE_LINK_H}
+ 
+-/* Define to 1 if you have the `lseek64' function. */
+-#cmakedefine HAVE_LSEEK64 ${HAVE_LSEEK64}
+-
+ /* Define to 1 if you have the <mach/mach.h> header file. */
+ #cmakedefine HAVE_MACH_MACH_H ${HAVE_MACH_MACH_H}
+ 
+diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
+index 92b15f14c62fd..8943c4478c7f2 100644
+--- a/lib/Support/raw_ostream.cpp
++++ b/lib/Support/raw_ostream.cpp
+@@ -802,8 +802,6 @@ uint64_t raw_fd_ostream::seek(uint64_t off) {
+   flush();
+ #ifdef _WIN32
+   pos = ::_lseeki64(FD, off, SEEK_SET);
+-#elif defined(HAVE_LSEEK64)
+-  pos = ::lseek64(FD, off, SEEK_SET);
+ #else
+   pos = ::lseek(FD, off, SEEK_SET);
+ #endif
+diff --git a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
+index 1d70d96bd6d76..393744f2d6c53 100644
+--- a/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
++++ b/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
+@@ -139,7 +139,6 @@ write_cmake_config("config") {
+     values += [
+       "HAVE_FUTIMENS=1",
+       "HAVE_LINK_H=1",
+-      "HAVE_LSEEK64=1",
+       "HAVE_MALLINFO=1",
+       "HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC=1",
+     ]
+@@ -147,7 +146,6 @@ write_cmake_config("config") {
+     values += [
+       "HAVE_FUTIMENS=",
+       "HAVE_LINK_H=",
+-      "HAVE_LSEEK64=",
+       "HAVE_MALLINFO=",
+       "HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC=",
+     ]
diff --git a/main/llvm14/llvm-stack-size.patch b/main/llvm14/llvm-stack-size.patch
new file mode 100644
index 00000000000..68f402f826b
--- /dev/null
+++ b/main/llvm14/llvm-stack-size.patch
@@ -0,0 +1,34 @@
+Patch-Source: https://github.com/chimera-linux/cports/blob/8c0359f31b9d888e59ced0320e93ca8ad79ba1f9/main/llvm/patches/0010-always-set-a-larger-stack-size-explicitly.patch
+From 18e09846d9333b554e3dfbbd768ada6643bf92c0 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Sat, 27 Nov 2021 01:03:28 +0100
+Subject: [PATCH 10/22] always set a larger stack size explicitly
+
+---
+ llvm/lib/Support/Threading.cpp | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/llvm/lib/Support/Threading.cpp b/llvm/lib/Support/Threading.cpp
+index 04a1a9e19..776badaad 100644
+--- a/lib/Support/Threading.cpp
++++ b/lib/Support/Threading.cpp
+@@ -82,16 +82,7 @@ unsigned llvm::ThreadPoolStrategy::compute_thread_count() const {
+ // keyword.
+ #include "llvm/Support/thread.h"
+ 
+-#if defined(__APPLE__)
+-  // Darwin's default stack size for threads except the main one is only 512KB,
+-  // which is not enough for some/many normal LLVM compilations. This implements
+-  // the same interface as std::thread but requests the same stack size as the
+-  // main thread (8MB) before creation.
+ const llvm::Optional<unsigned> llvm::thread::DefaultStackSize = 8 * 1024 * 1024;
+-#else
+-const llvm::Optional<unsigned> llvm::thread::DefaultStackSize = None;
+-#endif
+-
+ 
+ #endif
+ 
+-- 
+2.35.1
+
diff --git a/main/llvm14/llvm14.pre-upgrade b/main/llvm14/llvm14.pre-upgrade
new file mode 100644
index 00000000000..6967f800c89
--- /dev/null
+++ b/main/llvm14/llvm14.pre-upgrade
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+ver_old=$2
+
+if [ "$(apk version -t "$ver_old" '14.0.6-r10')" = '<' ]; then
+	# in 14.0.6-r10 we flipped the symlink/target dirs for include/cmake
+	# so we have to delete the symlink to allow apk to replace them..
+	# and only after an apk fix :/
+
+	# include
+	rm /usr/lib/llvm14/include
+
+	# cmake
+	rm /usr/lib/llvm14/lib/cmake/llvm
+fi
+
+exit 0
diff --git a/main/llvm15/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch b/main/llvm15/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
new file mode 100644
index 00000000000..e0cb43a2257
--- /dev/null
+++ b/main/llvm15/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
@@ -0,0 +1,22 @@
+From f8e83c4c7866ae830abe9bec15cfe805dd825b6e Mon Sep 17 00:00:00 2001
+From: xentec <xentec@aix0.eu>
+Date: Tue, 12 Sep 2017 07:18:38 +0200
+Subject: [PATCH] Disable dynamic lib tests for musl's dlclose() is noop
+
+---
+ unittests/Support/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/unittests/Support/CMakeLists.txt b/unittests/Support/CMakeLists.txt
+index 641163e..4f508d9 100644
+--- a/llvm/unittests/Support/CMakeLists.txt
++++ b/llvm/unittests/Support/CMakeLists.txt
+@@ -124,5 +124,5 @@
+ 
+ if(NOT LLVM_INTEGRATED_CRT_ALLOC)
+   # The test doesn't pass when using a custom allocator, PR47881.
+-  add_subdirectory(DynamicLibrary)
++  # add_subdirectory(DynamicLibrary)
+ endif()
+
+
diff --git a/main/llvm15/APKBUILD b/main/llvm15/APKBUILD
new file mode 100644
index 00000000000..7244736050f
--- /dev/null
+++ b/main/llvm15/APKBUILD
@@ -0,0 +1,328 @@
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
+# Contributor: Martell Malone <martell@marinelayer.io>
+# Contributor: Travis Tilley <ttilley@gmail.com>
+# Contributor: Mitch Tishmack <mitch.tishmack@gmail.com>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Contributor: Ariadne Conill <ariadne@dereferenced.org>
+# Contributor: omni <omni+alpine@hack.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+_pkgname=llvm
+pkgver=15.0.7
+_majorver=${pkgver%%.*}
+pkgname=$_pkgname$_majorver
+pkgrel=13
+pkgdesc="Low Level Virtual Machine compiler system, version $_majorver"
+arch="all"
+url="https://llvm.org/"
+license="Apache-2.0"
+install="$pkgname.pre-upgrade"
+depends_dev="$pkgname=$pkgver-r$pkgrel libffi-dev zlib-dev zstd-dev"
+# See https://gitlab.alpinelinux.org/alpine/aports/-/commit/51d2fba931fb2ef0046dea19405a9290c8735051#note_234651
+[ -z "$BOOTSTRAP" ] && depends_dev="$depends_dev $pkgname-test-utils=$pkgver-r$pkgrel"
+makedepends_host="$depends_dev binutils-dev libxml2-dev"
+makedepends_build="cmake chrpath python3 py3-setuptools samurai"
+# diffutils for diff: unrecognized option: strip-trailing-cr
+# coreutils for 'od' binary
+checkdepends="bash coreutils diffutils"
+subpackages="$pkgname-static $pkgname-libs $pkgname-dev $pkgname-test-utils:_test_utils"
+source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-project-$pkgver.src.tar.xz
+	0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
+	allocscore.patch
+	fix-memory-mf_exec-on-aarch64.patch
+	install-prefix.patch
+	lfs64.patch
+	llvm-stack-size.patch
+	rust-feature-tables.patch
+	"
+builddir="$srcdir/$_pkgname-project-$pkgver.src"
+
+# Whether is this package the default (latest) LLVM version.
+_default_llvm="no"
+
+# If crosscompiling, we need llvm-tblgen on the build machine.
+if [ "$CBUILD" != "$CHOST" ]; then
+	_llvm_tblgen="llvm-tblgen"
+	if [ "$_default_llvm" = no ]; then
+		_llvm_tblgen="llvm$_majorver-tblgen"
+	fi
+	makedepends_build="$makedepends_build cmd:$_llvm_tblgen"
+	cmake_cross_options="
+		-DCMAKE_CROSSCOMPILING=ON
+		-DLLVM_TABLEGEN=/usr/bin/$_llvm_tblgen
+	"
+fi
+
+if [ "$_default_llvm" = yes ]; then
+	provides="llvm=$pkgver-r$pkgrel"
+	replaces="llvm"
+fi
+
+# explicit override for previous version as well
+replaces="llvm14"
+
+# NOTE: It seems that there's no (sane) way how to change includedir, sharedir
+# etc. separately, just the CMAKE_INSTALL_PREFIX. Standard CMake variables and
+# even  LLVM-specific variables, that are related to these paths, actually
+# don't work (in llvm 3.7).
+#
+# When building a software that depends on LLVM, utility llvm-config should be
+# used to discover where is LLVM installed. It provides options to print
+# path of bindir, includedir, and libdir separately, but in its source, all
+# these paths are actually hard-coded against INSTALL_PREFIX. We can patch it
+# and move paths manually, but I'm really not sure what it may break...
+#
+# Also note that we should *not* add version suffix to files in llvm bindir!
+# It breaks build system of some software that depends on LLVM, because they
+# don't expect these files to have a sufix.
+#
+# So, we install all the LLVM files into /usr/lib/llvm$_majorver.
+# BTW, Fedora and Debian do the same thing.
+#
+_prefix="usr/lib/llvm$_majorver"
+
+prepare() {
+	default_prepare
+
+	cd llvm
+
+	# Known broken test on musl
+	rm -v test/CodeGen/AArch64/wineh4.mir
+	# https://github.com/llvm/llvm-project/issues/47657
+	rm -v test/ExecutionEngine/Interpreter/intrinsics.ll
+
+	case "$CARCH" in
+	x86)
+		rm -v test/Object/macho-invalid.test \
+			test/tools/llvm-size/radix.test \
+			unittests/Support/JSONTest.cpp
+		sed -i "/JSONTest.cpp/d" \
+			unittests/Support/CMakeLists.txt
+		;;
+	arm*)
+		rm -v test/tools/llvm-readobj/ELF/dependent-libraries.test \
+			test/Object/macho-invalid.test \
+			test/tools/llvm-size/radix.test \
+			test/tools/gold/X86/split-dwarf.ll \
+			test/ExecutionEngine/frem.ll \
+			test/tools/llvm-dwarfdump/X86/prettyprint_types.s \
+			test/tools/llvm-dwarfdump/X86/simplified-template-names.s \
+			unittests/ExecutionEngine/Orc/OrcCAPITest.cpp \
+			test/CodeGen/RISCV/rv32zbp.ll \
+			test/CodeGen/RISCV/rv64zbp.ll
+		sed -i "/OrcCAPITest.cpp/d" \
+			unittests/ExecutionEngine/Orc/CMakeLists.txt
+		;;
+	esac
+
+	# Known broken codegen for Hexagon target, reported upstream.
+	# https://github.com/llvm/llvm-project/issues/48936
+	rm -v \
+		test/CodeGen/Hexagon/csr-stubs-spill-threshold.ll \
+		test/CodeGen/Hexagon/long-calls.ll \
+		test/CodeGen/Hexagon/mlong-calls.ll \
+		test/CodeGen/Hexagon/pic-regusage.ll \
+		test/CodeGen/Hexagon/runtime-stkchk.ll \
+		test/CodeGen/Hexagon/swp-memrefs-epilog.ll \
+		test/CodeGen/Hexagon/vararg-formal.ll \
+		test/tools/llvm-objcopy/MachO/universal-object.test \
+		test/DebugInfo/X86/vla-multi.ll
+	# XXX: fail when built with gcc13
+	rm -v \
+		test/CodeGen/X86/vector-interleaved-load-i32-stride-4.ll \
+		test/Transforms/SampleProfile/pseudo-probe-update-2.ll \
+		test/Transforms/SampleProfile/pseudo-probe-update.ll
+}
+
+build() {
+	# Auto-detect it by guessing either.
+	local ffi_include_dir="$(pkg-config --cflags-only-I libffi | sed 's|^-I||g')"
+
+	# tries linking host libzstd in cross
+	if [ -n "$BOOTSTRAP" ]; then
+		local zstd=OFF
+	else
+		local zstd=ON
+	fi
+
+	# NOTE: DO NOT change CMAKE_BUILD_TYPE! Buildmodes like None will enable
+	# debug assertions for LLVM!
+	cmake -B build -G Ninja -Wno-dev -S llvm \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/$_prefix \
+		-DCMAKE_INSTALL_RPATH=/$_prefix \
+		\
+		-DLLVM_DEFAULT_TARGET_TRIPLE="$CBUILD" \
+		-DLLVM_HOST_TRIPLE="$CHOST" \
+		\
+		-DFFI_INCLUDE_DIR="$ffi_include_dir" \
+		-DLLVM_APPEND_VC_REV=OFF \
+		-DLLVM_BINUTILS_INCDIR=/usr/include \
+		-DLLVM_BUILD_DOCS=OFF \
+		-DLLVM_BUILD_EXAMPLES=OFF \
+		-DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \
+		-DLLVM_BUILD_LLVM_DYLIB=ON \
+		-DLLVM_BUILD_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DLLVM_ENABLE_ASSERTIONS=OFF \
+		-DLLVM_ENABLE_DUMP=ON \
+		-DLLVM_ENABLE_EH=ON \
+		-DLLVM_ENABLE_FFI=ON \
+		-DLLVM_ENABLE_LIBCXX=OFF \
+		-DLLVM_ENABLE_LIBEDIT=OFF \
+		-DLLVM_ENABLE_PIC=ON \
+		-DLLVM_ENABLE_RTTI=ON \
+		-DLLVM_ENABLE_SPHINX=OFF \
+		-DLLVM_ENABLE_TERMINFO=ON \
+		-DLLVM_ENABLE_ZLIB=ON \
+		-DLLVM_ENABLE_ZSTD=$zstd \
+		-DLLVM_INCLUDE_BENCHMARKS=OFF \
+		-DLLVM_INCLUDE_EXAMPLES=OFF \
+		-DLLVM_INSTALL_UTILS=ON \
+		-DLLVM_LINK_LLVM_DYLIB=ON \
+		$cmake_cross_options
+
+	cmake --build build
+
+	python3 llvm/utils/lit/setup.py build
+}
+
+check() {
+	LD_LIBRARY_PATH="$PWD/build/lib" \
+	ninja -C build check-llvm
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+
+	cd "$pkgdir"/$_prefix
+
+	# Symlink files from /usr/lib/llvm*/bin to /usr/bin.
+	mkdir -p "$pkgdir"/usr/bin
+	local name newname path
+	for path in bin/*; do
+		name=${path##*/}
+		# Add version infix/suffix to the executable name.
+		case "$name" in
+			llvm-*) newname="llvm$_majorver-${name#llvm-}";;
+			*) newname="$name$_majorver";;
+		esac
+		# If this package provides=llvm (i.e. it's the default/latest
+		# llvm package), omit version infix/suffix.
+		if [ "$_default_llvm" = yes ]; then
+			newname=$name
+		fi
+		case "$name" in
+			FileCheck | obj2yaml | yaml2obj) continue;;
+		esac
+		ln -s ../lib/llvm$_majorver/bin/$name "$pkgdir"/usr/bin/$newname
+	done
+
+	mkdir -p "$pkgdir"/usr/include "$pkgdir"/usr/lib/cmake
+
+	# symlink include to /usr/include/llvm$_llvmver
+	ln -sfv ../lib/$pkgname/include "$pkgdir"/usr/include/$pkgname
+
+	# symlink cmake dir to system cmake
+	ln -sfv ../$pkgname/lib/cmake/llvm "$pkgdir"/usr/lib/cmake/$pkgname
+}
+
+static() {
+	pkgdesc="LLVM $_majorver static libraries"
+	_common_subpkg
+
+	_mv "$pkgdir"/$_prefix/lib/*.a "$subpkgdir"/$_prefix/lib/
+}
+
+libs() {
+	pkgdesc="LLVM $_majorver runtime library"
+	local soname="libLLVM-$_majorver.so"
+	local soname2="libLLVM-$pkgver.so"
+
+	mkdir -p "$subpkgdir"
+	cd "$subpkgdir"
+
+	# libLLVM should be in /usr/lib. This is needed for binaries that are
+	# dynamically linked with libLLVM, so they can find it on default path.
+	_mv "$pkgdir"/$_prefix/lib/$soname usr/lib/
+	ln -s $soname usr/lib/$soname2
+
+	# And also symlink it back to the LLVM prefix.
+	mkdir -p $_prefix/lib
+	ln -s ../../$soname $_prefix/lib/$soname
+	ln -s ../../$soname $_prefix/lib/$soname2
+}
+
+dev() {
+	_common_subpkg
+	default_dev
+	cd "$subpkgdir"
+
+	amove \
+		$_prefix/lib \
+		$_prefix/bin/llvm-config
+
+	# Move libLTO and LLVMgold back
+	_mv "$subpkgdir"/$_prefix/lib/libLTO.so* \
+		"$subpkgdir"/$_prefix/lib/LLVMgold* \
+		"$pkgdir"/$_prefix/lib
+
+	if [ "$_default_llvm" = yes ]; then
+		ln -sf llvm$_majorver usr/lib/cmake/llvm
+		ln -sf llvm$_majorver/lib/LLVMgold.so "$pkgdir"/usr/lib/
+		ln -sf llvm$_majorver/lib/libLTO.so "$pkgdir"/usr/lib/
+	fi
+
+	# also add a suffix-version variant of llvm-config, as that's what things normally check for
+	mkdir -p "$subpkgdir"/usr/bin/
+	ln -sfv ../lib/llvm$_majorver/bin/llvm-config "$subpkgdir"/usr/bin/llvm-config-$_majorver
+}
+
+_test_utils() {
+	pkgdesc="LLVM $_majorver utilities for executing LLVM and Clang style test suites"
+	depends="python3"
+	_common_subpkg
+
+	local litver=$(python3 "$builddir"/llvm/utils/lit/setup.py --version 2>/dev/null \
+		| sed 's/\.dev.*$//')
+	test -n "$litver"
+	provides="$provides lit=$litver-r$pkgrel"
+
+	python3 "$builddir"/llvm/utils/lit/setup.py install --root="$subpkgdir"
+
+	amove usr/lib/$pkgname/bin/FileCheck \
+		usr/lib/$pkgname/bin/count \
+		usr/lib/$pkgname/bin/not
+
+	mv "$subpkgdir"/usr/bin/lit "$subpkgdir"/$_prefix/bin/lit
+	ln -s /$_prefix/bin/lit "$subpkgdir"/$_prefix/bin/llvm-lit
+
+	if [ "$_default_llvm" = yes ]; then
+		amove usr/bin/count usr/bin/not
+		ln -s /$_prefix/bin/lit "$subpkgdir"/usr/bin/lit
+	else
+		amove usr/bin/count$_majorver usr/bin/not$_majorver
+	fi
+}
+
+_common_subpkg() {
+	if [ "$_default_llvm" = yes ]; then
+		replaces="llvm${subpkgname#"$pkgname"}"
+		provides="$replaces=$pkgver-r$pkgrel"
+	fi
+}
+
+_mv() {
+	local dest; for dest; do true; done  # get last argument
+	mkdir -p "$dest"
+	mv "$@"
+}
+
+sha512sums="
+4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52  llvm-project-15.0.7.src.tar.xz
+84ed6b165445d0cdb59daa59f612a7d960bf67b13a1b19bdd2a19d46548013e756faca6b8249cb6c60354f3a9aaef46652e5f531944c71294e46d2f7bfd8b832  0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
+ef63d5e01440cff65c10b84b65099bbd539bae72065d5581a8d2409cf2d0d4410d5bb3f501273ab29ee65bf8f5d23653a074428c2711ff9209324de56b857f3f  allocscore.patch
+18a8270dec2c86e88dc2686de655f98c22fd26c71cd2d06d0de68029a1b363851a07b897694c5af0871805e2f59ecaab9363375e0223d27bbd04838462edf5c8  fix-memory-mf_exec-on-aarch64.patch
+ebc0be314c129ef38f00c8c2be9d589658cae89ac8cda109e35933b5044e775a3d370c0c584d3e501e4d43167b8523d8c5e5a85653d8ebe853571697ae40fb35  install-prefix.patch
+14439883c4967d99b496e6af9ad920afbeb9e12538ccc411329e7b39d319a216322f733f0d8511c4e2d7702015e5f552980bf586e95459cecf3c8cff5a245fd6  lfs64.patch
+18668bc5ba056b6f0cc2ef28db1d1a7a60d2ff67e8a741cbd704aba510128e6564f70a1bbc3140562445e03a83169f6cdf0ee4a6adba1a5009a689a7a3bb6541  llvm-stack-size.patch
+84d2cc5c0376d8a8a2bbc0891849c9421feaea5b38a329aecdb822c136f7ded7ab4c3b87838d8915e6eb54cfe89f3e88f3b81ae98733e9a58d935be74a3c456c  rust-feature-tables.patch
+"
diff --git a/main/llvm15/allocscore.patch b/main/llvm15/allocscore.patch
new file mode 100644
index 00000000000..5421c6b1ae8
--- /dev/null
+++ b/main/llvm15/allocscore.patch
@@ -0,0 +1,20 @@
+on x86, this fails with a float comparison error even though the floats are the
+same, because it does absolute eq
+--
+--- a/llvm/unittests/CodeGen/RegAllocScoreTest.cpp
++++ b/llvm/unittests/CodeGen/RegAllocScoreTest.cpp
+@@ -172,14 +172,5 @@
+   ASSERT_EQ(Freq2, TotalScore.loadStoreCounts());
+   ASSERT_EQ(Freq1, TotalScore.cheapRematCounts());
+   ASSERT_EQ(Freq2, TotalScore.expensiveRematCounts());
+-  ASSERT_EQ(TotalScore.getScore(),
+-            TotalScore.copyCounts() * CopyWeight +
+-                TotalScore.loadCounts() * LoadWeight +
+-                TotalScore.storeCounts() * StoreWeight +
+-                TotalScore.loadStoreCounts() * (LoadWeight + StoreWeight) +
+-                TotalScore.cheapRematCounts() * CheapRematWeight +
+-                TotalScore.expensiveRematCounts() * ExpensiveRematWeight
+-
+-  );
+ }
+ } // end namespace
diff --git a/main/llvm15/fix-memory-mf_exec-on-aarch64.patch b/main/llvm15/fix-memory-mf_exec-on-aarch64.patch
new file mode 100644
index 00000000000..8e8f1d3a2f3
--- /dev/null
+++ b/main/llvm15/fix-memory-mf_exec-on-aarch64.patch
@@ -0,0 +1,25 @@
+Fix failures in AllocationTests/MappedMemoryTest.* on aarch64:
+
+    Failing Tests (8):
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.AllocAndRelease/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.DuplicateNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.EnabledWrite/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.MultipleAllocAndRelease/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.SuccessiveNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.UnalignedNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroSizeNear/3
+
+Upstream-Issue: https://bugs.llvm.org/show_bug.cgi?id=14278#c10
+
+--- a/llvm/lib/Support/Unix/Memory.inc
++++ b/llvm/lib/Support/Unix/Memory.inc
+@@ -58,7 +58,7 @@
+     return PROT_READ | PROT_WRITE | PROT_EXEC;
+   case llvm::sys::Memory::MF_EXEC:
+ #if (defined(__FreeBSD__) || defined(__POWERPC__) || defined (__ppc__) || \
+-     defined(_POWER) || defined(_ARCH_PPC))
++     defined(_POWER) || defined(_ARCH_PPC) || (defined(__linux__) && defined(__aarch64__)))
+     // On PowerPC, having an executable page that has no read permission
+     // can have unintended consequences.  The function InvalidateInstruction-
+     // Cache uses instructions dcbf and icbi, both of which are treated by
diff --git a/main/llvm15/install-prefix.patch b/main/llvm15/install-prefix.patch
new file mode 100644
index 00000000000..90f6c3e62d2
--- /dev/null
+++ b/main/llvm15/install-prefix.patch
@@ -0,0 +1,31 @@
+starting from llvm14 the install prefix breaks via symlinks;
+/usr/lib/llvm14/lib/cmake/llvm/LLVMConfig.cmake goes up 3 directories to find
+/usr/lib/llvm14/include as LLVM_INCLUDE_DIRS, but to even use this cmake folder
+at all it has to be symlinked to /usr/lib/cmake/llvm .. so the directory it
+instead uses is just /usr/include, which is not where the cmake includes are.
+this hardcodes them to the install prefix we pass via cmake, which should
+always be correct, and what cmake tries to autodetect anyway.
+
+also see: https://reviews.llvm.org/D29969
+
+this is supposedly fixed now, but for some reason it still isn't
+--- a/llvm/cmake/modules/CMakeLists.txt
++++ b/llvm/cmake/modules/CMakeLists.txt
+@@ -41,6 +41,8 @@
+ #
+ 
+ set(LLVM_CONFIG_CODE "
++# this is wrong when automatically detected
++set(LLVM_INSTALL_PREFIX \"${CMAKE_INSTALL_PREFIX}\")
+ # LLVM_BUILD_* values available only from LLVM build tree.
+ set(LLVM_BUILD_BINARY_DIR \"${LLVM_BINARY_DIR}\")
+ set(LLVM_BUILD_LIBRARY_DIR \"${LLVM_LIBRARY_DIR}\")
+@@ -109,8 +111,6 @@
+ #
+ # Generate LLVMConfig.cmake for the install tree.
+ #
+-
+-find_prefix_from_config(LLVM_CONFIG_CODE LLVM_INSTALL_PREFIX "${LLVM_INSTALL_PACKAGE_DIR}")
+ 
+ extend_path(LLVM_CONFIG_MAIN_INCLUDE_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_INCLUDEDIR}")
+ # This is the same as the above because the handwritten and generated headers
diff --git a/main/llvm15/lfs64.patch b/main/llvm15/lfs64.patch
new file mode 100644
index 00000000000..6de47a2838f
--- /dev/null
+++ b/main/llvm15/lfs64.patch
@@ -0,0 +1,120 @@
+Patch-Source: https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67
+--
+From 5cd554303ead0f8891eee3cd6d25cb07f5a7bf67 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 4 Feb 2023 13:54:41 -0800
+Subject: [PATCH] cmake: Enable 64bit off_t on 32bit glibc systems
+
+Pass -D_FILE_OFFSET_BITS=64 to compiler flags on 32bit glibc based
+systems. This will make sure that 64bit versions of LFS functions are
+used e.g. seek will behave same as lseek64. Also revert [1] partially
+because this added a cmake test to detect lseek64 but then forgot to
+pass the needed macro to actual compile, this test was incomplete too
+since libc implementations like musl has 64bit off_t by default on 32bit
+systems and does not bundle[2] -D_LARGEFILE64_SOURCE under -D_GNU_SOURCE
+like glibc, which means the compile now fails on musl because the cmake
+check passes but we do not have _LARGEFILE64_SOURCE defined. Using the
+*64 function was transitional anyways so use -D_FILE_OFFSET_BITS=64
+instead
+
+[1] https://github.com/llvm/llvm-project/commit/8db7e5e4eed4c4e697dc3164f2c9351d8c3e942b
+[2] https://git.musl-libc.org/cgit/musl/commit/?id=25e6fee27f4a293728dd15b659170e7b9c7db9bc
+
+Reviewed By: MaskRay
+
+Differential Revision: https://reviews.llvm.org/D139752
+---
+ llvm/cmake/config-ix.cmake                                | 8 +++++---
+ llvm/include/llvm/Config/config.h.cmake                   | 3 ---
+ llvm/lib/Support/raw_ostream.cpp                          | 2 --
+ llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn | 2 --
+ utils/bazel/llvm_configs/config.h.cmake                   | 3 ---
+ 5 files changed, 5 insertions(+), 13 deletions(-)
+
+diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake
+index f959cd1f88484..b78c1b34ab8b9 100644
+--- a/llvm/cmake/config-ix.cmake
++++ b/llvm/cmake/config-ix.cmake
+@@ -284,9 +284,6 @@ check_symbol_exists(futimes sys/time.h HAVE_FUTIMES)
+ if( HAVE_SIGNAL_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*" AND NOT APPLE )
+   check_symbol_exists(sigaltstack signal.h HAVE_SIGALTSTACK)
+ endif()
+-set(CMAKE_REQUIRED_DEFINITIONS "-D_LARGEFILE64_SOURCE")
+-check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64)
+-set(CMAKE_REQUIRED_DEFINITIONS "")
+ check_symbol_exists(mallctl malloc_np.h HAVE_MALLCTL)
+ check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO)
+ check_symbol_exists(mallinfo2 malloc.h HAVE_MALLINFO2)
+@@ -340,6 +337,11 @@ check_symbol_exists(__GLIBC__ stdio.h LLVM_USING_GLIBC)
+ if( LLVM_USING_GLIBC )
+   add_compile_definitions(_GNU_SOURCE)
+   list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_GNU_SOURCE")
++# enable 64bit off_t on 32bit systems using glibc
++  if (CMAKE_SIZEOF_VOID_P EQUAL 4)
++    add_compile_definitions(_FILE_OFFSET_BITS=64)
++    list(APPEND CMAKE_REQUIRED_DEFINITIONS "-D_FILE_OFFSET_BITS=64")
++  endif()
+ endif()
+ 
+ # This check requires _GNU_SOURCE.
+diff --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake
+index 3543e6fc29944..29ac536b4c31b 100644
+--- a/llvm/include/llvm/Config/config.h.cmake
++++ b/llvm/include/llvm/Config/config.h.cmake
+@@ -128,9 +128,6 @@
+ /* Define to 1 if you have the <link.h> header file. */
+ #cmakedefine HAVE_LINK_H ${HAVE_LINK_H}
+ 
+-/* Define to 1 if you have the `lseek64' function. */
+-#cmakedefine HAVE_LSEEK64 ${HAVE_LSEEK64}
+-
+ /* Define to 1 if you have the <mach/mach.h> header file. */
+ #cmakedefine HAVE_MACH_MACH_H ${HAVE_MACH_MACH_H}
+ 
+diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp
+index 92b15f14c62fd..8943c4478c7f2 100644
+--- a/llvm/lib/Support/raw_ostream.cpp
++++ b/llvm/lib/Support/raw_ostream.cpp
+@@ -802,8 +802,6 @@ uint64_t raw_fd_ostream::seek(uint64_t off) {
+   flush();
+ #ifdef _WIN32
+   pos = ::_lseeki64(FD, off, SEEK_SET);
+-#elif defined(HAVE_LSEEK64)
+-  pos = ::lseek64(FD, off, SEEK_SET);
+ #else
+   pos = ::lseek(FD, off, SEEK_SET);
+ #endif
+diff --git a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
+index 1d70d96bd6d76..393744f2d6c53 100644
+--- a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
++++ b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
+@@ -139,7 +139,6 @@ write_cmake_config("config") {
+     values += [
+       "HAVE_FUTIMENS=1",
+       "HAVE_LINK_H=1",
+-      "HAVE_LSEEK64=1",
+       "HAVE_MALLINFO=1",
+       "HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC=1",
+     ]
+@@ -147,7 +146,6 @@ write_cmake_config("config") {
+     values += [
+       "HAVE_FUTIMENS=",
+       "HAVE_LINK_H=",
+-      "HAVE_LSEEK64=",
+       "HAVE_MALLINFO=",
+       "HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC=",
+     ]
+diff --git a/utils/bazel/llvm_configs/config.h.cmake b/utils/bazel/llvm_configs/config.h.cmake
+index 3543e6fc29944..29ac536b4c31b 100644
+--- a/utils/bazel/llvm_configs/config.h.cmake
++++ b/utils/bazel/llvm_configs/config.h.cmake
+@@ -128,9 +128,6 @@
+ /* Define to 1 if you have the <link.h> header file. */
+ #cmakedefine HAVE_LINK_H ${HAVE_LINK_H}
+ 
+-/* Define to 1 if you have the `lseek64' function. */
+-#cmakedefine HAVE_LSEEK64 ${HAVE_LSEEK64}
+-
+ /* Define to 1 if you have the <mach/mach.h> header file. */
+ #cmakedefine HAVE_MACH_MACH_H ${HAVE_MACH_MACH_H}
+ 
diff --git a/main/llvm15/llvm-stack-size.patch b/main/llvm15/llvm-stack-size.patch
new file mode 100644
index 00000000000..9803c0de191
--- /dev/null
+++ b/main/llvm15/llvm-stack-size.patch
@@ -0,0 +1,34 @@
+Patch-Source: https://github.com/chimera-linux/cports/blob/8c0359f31b9d888e59ced0320e93ca8ad79ba1f9/main/llvm/patches/0010-always-set-a-larger-stack-size-explicitly.patch
+From 18e09846d9333b554e3dfbbd768ada6643bf92c0 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Sat, 27 Nov 2021 01:03:28 +0100
+Subject: [PATCH 10/22] always set a larger stack size explicitly
+
+---
+ llvm/lib/Support/Threading.cpp | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/llvm/lib/Support/Threading.cpp b/llvm/lib/Support/Threading.cpp
+index 04a1a9e19..776badaad 100644
+--- a/llvm/lib/Support/Threading.cpp
++++ b/llvm/lib/Support/Threading.cpp
+@@ -82,16 +82,7 @@ unsigned llvm::ThreadPoolStrategy::compute_thread_count() const {
+ // keyword.
+ #include "llvm/Support/thread.h"
+ 
+-#if defined(__APPLE__)
+-  // Darwin's default stack size for threads except the main one is only 512KB,
+-  // which is not enough for some/many normal LLVM compilations. This implements
+-  // the same interface as std::thread but requests the same stack size as the
+-  // main thread (8MB) before creation.
+ const llvm::Optional<unsigned> llvm::thread::DefaultStackSize = 8 * 1024 * 1024;
+-#else
+-const llvm::Optional<unsigned> llvm::thread::DefaultStackSize = None;
+-#endif
+-
+ 
+ #endif
+ 
+-- 
+2.35.1
+
diff --git a/main/llvm15/llvm15.pre-upgrade b/main/llvm15/llvm15.pre-upgrade
new file mode 100644
index 00000000000..7da6e9fb754
--- /dev/null
+++ b/main/llvm15/llvm15.pre-upgrade
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+ver_old=$2
+
+if [ "$(apk version -t "$ver_old" '15.0.7-r1')" = '<' ]; then
+	# in 15.0.7-r1 we flipped the symlink/target dirs for include/cmake
+	# so we have to delete the symlink to allow apk to replace them..
+	# and only after an apk fix :/
+
+	# include
+	rm /usr/lib/llvm15/include
+
+	# cmake
+	rm /usr/lib/llvm15/lib/cmake/llvm
+fi
+
+exit 0
diff --git a/main/llvm15/rust-feature-tables.patch b/main/llvm15/rust-feature-tables.patch
new file mode 100644
index 00000000000..2068d51f2b9
--- /dev/null
+++ b/main/llvm15/rust-feature-tables.patch
@@ -0,0 +1,31 @@
+Patch-Source: https://github.com/rust-lang/llvm-project/commit/0a157fd7a5f61973ffddf96b3d445a718193eb1a
+From 0a157fd7a5f61973ffddf96b3d445a718193eb1a Mon Sep 17 00:00:00 2001
+From: Cameron Hart <cameron.hart@gmail.com>
+Date: Sun, 10 Jul 2016 23:55:53 +1000
+Subject: [PATCH] [rust] Add accessors for MCSubtargetInfo CPU and Feature
+ tables
+
+This is needed for `-C target-cpu=help` and `-C target-feature=help` in rustc
+---
+ llvm/include/llvm/MC/MCSubtargetInfo.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/llvm/include/llvm/MC/MCSubtargetInfo.h b/llvm/include/llvm/MC/MCSubtargetInfo.h
+index e1f0a86141e36..1e529bf4fb31e 100644
+--- a/llvm/include/llvm/MC/MCSubtargetInfo.h
++++ b/llvm/include/llvm/MC/MCSubtargetInfo.h
+@@ -230,6 +230,14 @@ class MCSubtargetInfo {
+     return Found != ProcDesc.end() && StringRef(Found->Key) == CPU;
+   }
+ 
++  ArrayRef<SubtargetSubTypeKV> getCPUTable() const {
++    return ProcDesc;
++  }
++
++  ArrayRef<SubtargetFeatureKV> getFeatureTable() const {
++    return ProcFeatures;
++  }
++
+   virtual unsigned getHwMode() const { return 0; }
+ 
+   /// Return the cache size in bytes for the given level of cache.
diff --git a/main/llvm16/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch b/main/llvm16/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
new file mode 100644
index 00000000000..e0cb43a2257
--- /dev/null
+++ b/main/llvm16/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
@@ -0,0 +1,22 @@
+From f8e83c4c7866ae830abe9bec15cfe805dd825b6e Mon Sep 17 00:00:00 2001
+From: xentec <xentec@aix0.eu>
+Date: Tue, 12 Sep 2017 07:18:38 +0200
+Subject: [PATCH] Disable dynamic lib tests for musl's dlclose() is noop
+
+---
+ unittests/Support/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/unittests/Support/CMakeLists.txt b/unittests/Support/CMakeLists.txt
+index 641163e..4f508d9 100644
+--- a/llvm/unittests/Support/CMakeLists.txt
++++ b/llvm/unittests/Support/CMakeLists.txt
+@@ -124,5 +124,5 @@
+ 
+ if(NOT LLVM_INTEGRATED_CRT_ALLOC)
+   # The test doesn't pass when using a custom allocator, PR47881.
+-  add_subdirectory(DynamicLibrary)
++  # add_subdirectory(DynamicLibrary)
+ endif()
+
+
diff --git a/main/llvm16/9001-CMake-Quote-variables-where-TARGET-may-be-a-value.patch b/main/llvm16/9001-CMake-Quote-variables-where-TARGET-may-be-a-value.patch
new file mode 100644
index 00000000000..5b68c006242
--- /dev/null
+++ b/main/llvm16/9001-CMake-Quote-variables-where-TARGET-may-be-a-value.patch
@@ -0,0 +1,143 @@
+From 7ccbee12658c375dfdf7ee274f6ee91d9cef680d Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 6 Jun 2023 02:08:01 +0100
+Subject: [PATCH 01/10] [CMake] Quote variables where "TARGET" may be a value
+
+In CMake, "TARGET" is a special keyword. But it's also an LLVM component, which
+means downstreams may request "target" or "TARGET" from CMake. Quote such input
+so "TARGET" is interpreted as a string rather than a keyword.
+
+This is a followup to 75a0502fe0053c72b57b61143a55600814d931fd (D150884).
+
+Fixes Meson's test suite and an issue which manifested identically to #61436
+but appears to have been a slightly different problem.
+
+Bug: https://github.com/mesonbuild/meson/issues/11642
+Bug: https://github.com/llvm/llvm-project/issues/61436
+
+Reviewed By: tstellar
+
+Differential Revision: https://reviews.llvm.org/D152121
+
+Gentoo-Component: llvm
+---
+ llvm/cmake/modules/LLVM-Config.cmake | 30 ++++++++++++++--------------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/llvm/cmake/modules/LLVM-Config.cmake b/llvm/cmake/modules/LLVM-Config.cmake
+index ae082c6ae520..96ccf20aa89b 100644
+--- a/llvm/cmake/modules/LLVM-Config.cmake
++++ b/llvm/cmake/modules/LLVM-Config.cmake
+@@ -134,7 +134,7 @@ function(llvm_expand_pseudo_components out_components)
+   endif()
+   foreach(c ${link_components})
+     # add codegen, asmprinter, asmparser, disassembler
+-    if(${c} IN_LIST LLVM_TARGETS_TO_BUILD)
++    if("${c}" IN_LIST LLVM_TARGETS_TO_BUILD)
+       if(LLVM${c}CodeGen IN_LIST LLVM_AVAILABLE_LIBS)
+         list(APPEND expanded_components "${c}CodeGen")
+       else()
+@@ -149,48 +149,48 @@ function(llvm_expand_pseudo_components out_components)
+           list(APPEND expanded_components "${c}${subcomponent}")
+         endif()
+       endforeach()
+-    elseif( c STREQUAL "nativecodegen" )
++    elseif("${c}" STREQUAL "nativecodegen" )
+       foreach(subcomponent IN ITEMS CodeGen Desc Info)
+         if(LLVM${LLVM_NATIVE_ARCH}${subcomponent} IN_LIST LLVM_AVAILABLE_LIBS)
+           list(APPEND expanded_components "${LLVM_NATIVE_ARCH}${subcomponent}")
+         endif()
+       endforeach()
+-    elseif( c STREQUAL "AllTargetsCodeGens" )
++    elseif("${c}" STREQUAL "AllTargetsCodeGens" )
+       # Link all the codegens from all the targets
+       foreach(t ${LLVM_TARGETS_TO_BUILD})
+         if( TARGET LLVM${t}CodeGen)
+           list(APPEND expanded_components "${t}CodeGen")
+         endif()
+       endforeach(t)
+-    elseif( c STREQUAL "AllTargetsAsmParsers" )
++    elseif("${c}" STREQUAL "AllTargetsAsmParsers" )
+       # Link all the asm parsers from all the targets
+       foreach(t ${LLVM_TARGETS_TO_BUILD})
+         if(LLVM${t}AsmParser IN_LIST LLVM_AVAILABLE_LIBS)
+           list(APPEND expanded_components "${t}AsmParser")
+         endif()
+       endforeach(t)
+-    elseif( c STREQUAL "AllTargetsDescs" )
++    elseif( "${c}" STREQUAL "AllTargetsDescs" )
+       # Link all the descs from all the targets
+       foreach(t ${LLVM_TARGETS_TO_BUILD})
+         if(LLVM${t}Desc IN_LIST LLVM_AVAILABLE_LIBS)
+           list(APPEND expanded_components "${t}Desc")
+         endif()
+       endforeach(t)
+-    elseif( c STREQUAL "AllTargetsDisassemblers" )
++    elseif("${c}" STREQUAL "AllTargetsDisassemblers" )
+       # Link all the disassemblers from all the targets
+       foreach(t ${LLVM_TARGETS_TO_BUILD})
+         if(LLVM${t}Disassembler IN_LIST LLVM_AVAILABLE_LIBS)
+           list(APPEND expanded_components "${t}Disassembler")
+         endif()
+       endforeach(t)
+-    elseif( c STREQUAL "AllTargetsInfos" )
++    elseif("${c}" STREQUAL "AllTargetsInfos" )
+       # Link all the infos from all the targets
+       foreach(t ${LLVM_TARGETS_TO_BUILD})
+         if(LLVM${t}Info IN_LIST LLVM_AVAILABLE_LIBS)
+           list(APPEND expanded_components "${t}Info")
+         endif()
+       endforeach(t)
+-    elseif( c STREQUAL "AllTargetsMCAs" )
++    elseif("${c}" STREQUAL "AllTargetsMCAs" )
+       # Link all the TargetMCAs from all the targets
+       foreach(t ${LLVM_TARGETS_TO_BUILD})
+         if( TARGET LLVM${t}TargetMCA )
+@@ -222,7 +222,7 @@ function(llvm_map_components_to_libnames out_libs)
+   # process target dependencies.
+   if(NOT LLVM_TARGETS_CONFIGURED)
+     foreach(c ${link_components})
+-      is_llvm_target_specifier(${c} iltl_result ALL_TARGETS)
++      is_llvm_target_specifier("${c}" iltl_result ALL_TARGETS)
+       if(iltl_result)
+         message(FATAL_ERROR "Specified target library before target registration is complete.")
+       endif()
+@@ -250,13 +250,13 @@ function(llvm_map_components_to_libnames out_libs)
+     if(c_rename)
+         set(c ${c_rename})
+     endif()
+-    if( c STREQUAL "native" )
++    if("${c}" STREQUAL "native" )
+       # already processed
+-    elseif( c STREQUAL "backend" )
++    elseif("${c}" STREQUAL "backend" )
+       # same case as in `native'.
+-    elseif( c STREQUAL "engine" )
++    elseif("${c}" STREQUAL "engine" )
+       # already processed
+-    elseif( c STREQUAL "all" )
++    elseif("${c}" STREQUAL "all" )
+       get_property(all_components GLOBAL PROPERTY LLVM_COMPONENT_LIBS)
+       list(APPEND expanded_components ${all_components})
+     else()
+@@ -265,7 +265,7 @@ function(llvm_map_components_to_libnames out_libs)
+       list(FIND capitalized_libs LLVM${capitalized} lib_idx)
+       if( lib_idx LESS 0 )
+         # The component is unknown. Maybe is an omitted target?
+-        is_llvm_target_library(${c} iltl_result OMITTED_TARGETS)
++        is_llvm_target_library("${c}" iltl_result OMITTED_TARGETS)
+         if(iltl_result)
+           # A missing library to a directly referenced omitted target would be bad.
+           message(FATAL_ERROR "Library '${c}' is a direct reference to a target library for an omitted target.")
+@@ -280,7 +280,7 @@ function(llvm_map_components_to_libnames out_libs)
+         list(GET LLVM_AVAILABLE_LIBS ${lib_idx} canonical_lib)
+         list(APPEND expanded_components ${canonical_lib})
+       endif( lib_idx LESS 0 )
+-    endif( c STREQUAL "native" )
++    endif("${c}" STREQUAL "native" )
+   endforeach(c)
+ 
+   set(${out_libs} ${expanded_components} PARENT_SCOPE)
+-- 
+2.41.0
+
diff --git a/main/llvm16/9002-LV-Convert-consecutive-ptr-uniforms.ll-to-use-opaque.patch b/main/llvm16/9002-LV-Convert-consecutive-ptr-uniforms.ll-to-use-opaque.patch
new file mode 100644
index 00000000000..f34f53a6af5
--- /dev/null
+++ b/main/llvm16/9002-LV-Convert-consecutive-ptr-uniforms.ll-to-use-opaque.patch
@@ -0,0 +1,557 @@
+From b4e62c8753a37cdb0dd9fbc693cd825fd69e5537 Mon Sep 17 00:00:00 2001
+From: Florian Hahn <flo@fhahn.com>
+Date: Fri, 17 Mar 2023 14:07:10 +0000
+Subject: [PATCH 02/10] [LV] Convert consecutive-ptr-uniforms.ll to use opaque
+ pointers (NFC).
+
+Gentoo-Component: llvm
+---
+ .../LoopVectorize/consecutive-ptr-uniforms.ll | 300 +++++++++---------
+ 1 file changed, 151 insertions(+), 149 deletions(-)
+
+diff --git a/llvm/test/Transforms/LoopVectorize/consecutive-ptr-uniforms.ll b/llvm/test/Transforms/LoopVectorize/consecutive-ptr-uniforms.ll
+index 40337e7da7a4..e4129747898b 100644
+--- a/llvm/test/Transforms/LoopVectorize/consecutive-ptr-uniforms.ll
++++ b/llvm/test/Transforms/LoopVectorize/consecutive-ptr-uniforms.ll
+@@ -1,6 +1,6 @@
+ ; REQUIRES: asserts
+-; RUN: opt -opaque-pointers=0 < %s -passes=loop-vectorize,instcombine -force-vector-width=4 -force-vector-interleave=1 -debug-only=loop-vectorize -disable-output -print-after=instcombine 2>&1 | FileCheck %s
+-; RUN: opt -opaque-pointers=0 < %s -passes=loop-vectorize,instcombine -force-vector-width=4 -force-vector-interleave=1 -enable-interleaved-mem-accesses -debug-only=loop-vectorize -disable-output -print-after=instcombine 2>&1 | FileCheck %s --check-prefix=INTER
++; RUN: opt %s -passes=loop-vectorize,instcombine -force-vector-width=4 -force-vector-interleave=1 -debug-only=loop-vectorize -disable-output -print-after=instcombine 2>&1 | FileCheck %s
++; RUN: opt %s -passes=loop-vectorize,instcombine -force-vector-width=4 -force-vector-interleave=1 -enable-interleaved-mem-accesses -debug-only=loop-vectorize -disable-output -print-after=instcombine 2>&1 | FileCheck %s --check-prefix=INTER
+ 
+ target datalayout = "e-m:e-i64:64-i128:128-n32:64-S128"
+ 
+@@ -11,23 +11,23 @@ target datalayout = "e-m:e-i64:64-i128:128-n32:64-S128"
+ ; Check that a forward consecutive pointer is recognized as uniform and remains
+ ; uniform after vectorization.
+ ;
+-; CHECK:     LV: Found uniform instruction: %tmp1 = getelementptr inbounds i32, i32* %a, i64 %i
++; CHECK:     LV: Found uniform instruction: %tmp1 = getelementptr inbounds i32, ptr %a, i64 %i
+ ; CHECK:     vector.body
+ ; CHECK:       %index = phi i64 [ 0, %vector.ph ], [ %index.next, %vector.body ]
+ ; CHECK-NOT:   getelementptr
+-; CHECK:       getelementptr inbounds i32, i32* %a, i64 %index
++; CHECK:       getelementptr inbounds i32, ptr %a, i64 %index
+ ; CHECK-NOT:   getelementptr
+ ; CHECK:       br i1 {{.*}}, label %middle.block, label %vector.body
+ ;
+-define i32 @consecutive_ptr_forward(i32* %a, i64 %n) {
++define i32 @consecutive_ptr_forward(ptr %a, i64 %n) {
+ entry:
+   br label %for.body
+ 
+ for.body:
+   %i = phi i64 [ %i.next, %for.body ], [ 0, %entry ]
+   %tmp0 = phi i32 [ %tmp3, %for.body ], [ 0, %entry ]
+-  %tmp1 = getelementptr inbounds i32, i32* %a, i64 %i
+-  %tmp2 = load i32, i32* %tmp1, align 8
++  %tmp1 = getelementptr inbounds i32, ptr %a, i64 %i
++  %tmp2 = load i32, ptr %tmp1, align 8
+   %tmp3 = add i32 %tmp0, %tmp2
+   %i.next = add nuw nsw i64 %i, 1
+   %cond = icmp slt i64 %i.next, %n
+@@ -43,25 +43,25 @@ for.end:
+ ; Check that a reverse consecutive pointer is recognized as uniform and remains
+ ; uniform after vectorization.
+ ;
+-; CHECK:     LV: Found uniform instruction: %tmp1 = getelementptr inbounds i32, i32* %a, i64 %i
++; CHECK:     LV: Found uniform instruction: %tmp1 = getelementptr inbounds i32, ptr %a, i64 %i
+ ; CHECK:     vector.body
+ ; CHECK:       %index = phi i64 [ 0, %vector.ph ], [ %index.next, %vector.body ]
+ ; CHECK:       %offset.idx = sub i64 %n, %index
+ ; CHECK-NOT:   getelementptr
+-; CHECK:       %[[G0:.+]] = getelementptr i32, i32* %a, i64 -3
+-; CHECK:       getelementptr i32, i32* %[[G0]], i64 %offset.idx
++; CHECK:       %[[G0:.+]] = getelementptr i32, ptr %a, i64 -3
++; CHECK:       getelementptr i32, ptr %[[G0]], i64 %offset.idx
+ ; CHECK-NOT:   getelementptr
+ ; CHECK:       br i1 {{.*}}, label %middle.block, label %vector.body
+ ;
+-define i32 @consecutive_ptr_reverse(i32* %a, i64 %n) {
++define i32 @consecutive_ptr_reverse(ptr %a, i64 %n) {
+ entry:
+   br label %for.body
+ 
+ for.body:
+   %i = phi i64 [ %i.next, %for.body ], [ %n, %entry ]
+   %tmp0 = phi i32 [ %tmp3, %for.body ], [ 0, %entry ]
+-  %tmp1 = getelementptr inbounds i32, i32* %a, i64 %i
+-  %tmp2 = load i32, i32* %tmp1, align 8
++  %tmp1 = getelementptr inbounds i32, ptr %a, i64 %i
++  %tmp2 = load i32, ptr %tmp1, align 8
+   %tmp3 = add i32 %tmp0, %tmp2
+   %i.next = add nsw i64 %i, -1
+   %cond = icmp sgt i64 %i.next, 0
+@@ -80,43 +80,43 @@ for.end:
+ ; interleaved memory accesses aren't enabled, the pointer should not be
+ ; recognized as uniform, and it should not be uniform after vectorization.
+ ;
+-; CHECK-NOT: LV: Found uniform instruction: %tmp1 = getelementptr inbounds %pair, %pair* %p, i64 %i, i32 0
+-; CHECK-NOT: LV: Found uniform instruction: %tmp2 = getelementptr inbounds %pair, %pair* %p, i64 %i, i32 1
++; CHECK-NOT: LV: Found uniform instruction: %tmp1 = getelementptr inbounds %pair, ptr %p, i64 %i, i32 0
++; CHECK-NOT: LV: Found uniform instruction: %tmp2 = getelementptr inbounds %pair, ptr %p, i64 %i, i32 1
+ ; CHECK:     vector.body
+ ; CHECK:       %index = phi i64 [ 0, %vector.ph ], [ %index.next, %vector.body ]
+ ; CHECK:       %[[I1:.+]] = or i64 %index, 1
+ ; CHECK:       %[[I2:.+]] = or i64 %index, 2
+ ; CHECK:       %[[I3:.+]] = or i64 %index, 3
+-; CHECK:       getelementptr inbounds %pair, %pair* %p, i64 %index, i32 0
+-; CHECK:       getelementptr inbounds %pair, %pair* %p, i64 %[[I1]], i32 0
+-; CHECK:       getelementptr inbounds %pair, %pair* %p, i64 %[[I2]], i32 0
+-; CHECK:       getelementptr inbounds %pair, %pair* %p, i64 %[[I3]], i32 0
+-; CHECK:       getelementptr inbounds %pair, %pair* %p, i64 %index, i32 1
+-; CHECK:       getelementptr inbounds %pair, %pair* %p, i64 %[[I1]], i32 1
+-; CHECK:       getelementptr inbounds %pair, %pair* %p, i64 %[[I2]], i32 1
+-; CHECK:       getelementptr inbounds %pair, %pair* %p, i64 %[[I3]], i32 1
++; CHECK:       getelementptr inbounds %pair, ptr %p, i64 %index, i32 0
++; CHECK:       getelementptr inbounds %pair, ptr %p, i64 %[[I1]], i32 0
++; CHECK:       getelementptr inbounds %pair, ptr %p, i64 %[[I2]], i32 0
++; CHECK:       getelementptr inbounds %pair, ptr %p, i64 %[[I3]], i32 0
++; CHECK:       getelementptr inbounds %pair, ptr %p, i64 %index, i32 1
++; CHECK:       getelementptr inbounds %pair, ptr %p, i64 %[[I1]], i32 1
++; CHECK:       getelementptr inbounds %pair, ptr %p, i64 %[[I2]], i32 1
++; CHECK:       getelementptr inbounds %pair, ptr %p, i64 %[[I3]], i32 1
+ ; CHECK:       br i1 {{.*}}, label %middle.block, label %vector.body
+ ;
+-; INTER:     LV: Found uniform instruction: %tmp1 = getelementptr inbounds %pair, %pair* %p, i64 %i, i32 0
+-; INTER:     LV: Found uniform instruction: %tmp2 = getelementptr inbounds %pair, %pair* %p, i64 %i, i32 1
++; INTER:     LV: Found uniform instruction: %tmp1 = getelementptr inbounds %pair, ptr %p, i64 %i, i32 0
++; INTER:     LV: Found uniform instruction: %tmp2 = getelementptr inbounds %pair, ptr %p, i64 %i, i32 1
+ ; INTER:     vector.body
+ ; INTER:       %index = phi i64 [ 0, %vector.ph ], [ %index.next, %vector.body ]
+ ; INTER-NOT:   getelementptr
+-; INTER:       getelementptr inbounds %pair, %pair* %p, i64 %index, i32 0
++; INTER:       getelementptr inbounds %pair, ptr %p, i64 %index, i32 0
+ ; INTER-NOT:   getelementptr
+ ; INTER:       br i1 {{.*}}, label %middle.block, label %vector.body
+ ;
+-define i32 @interleaved_access_forward(%pair* %p, i64 %n) {
++define i32 @interleaved_access_forward(ptr %p, i64 %n) {
+ entry:
+   br label %for.body
+ 
+ for.body:
+   %i = phi i64 [ %i.next, %for.body ], [ 0, %entry ]
+   %tmp0 = phi i32 [ %tmp6, %for.body ], [ 0, %entry ]
+-  %tmp1 = getelementptr inbounds %pair, %pair* %p, i64 %i, i32 0
+-  %tmp2 = getelementptr inbounds %pair, %pair* %p, i64 %i, i32 1
+-  %tmp3 = load i32, i32* %tmp1, align 8
+-  %tmp4 = load i32, i32* %tmp2, align 8
++  %tmp1 = getelementptr inbounds %pair, ptr %p, i64 %i, i32 0
++  %tmp2 = getelementptr inbounds %pair, ptr %p, i64 %i, i32 1
++  %tmp3 = load i32, ptr %tmp1, align 8
++  %tmp4 = load i32, ptr %tmp2, align 8
+   %tmp5 = add i32 %tmp3, %tmp4
+   %tmp6 = add i32 %tmp0, %tmp5
+   %i.next = add nuw nsw i64 %i, 1
+@@ -137,46 +137,46 @@ for.end:
+ ; recognized as uniform, and it should not be uniform after vectorization.
+ ;
+ ; recognized as uniform, and it should not be uniform after vectorization.
+-; CHECK-NOT: LV: Found uniform instruction: %tmp1 = getelementptr inbounds %pair, %pair* %p, i64 %i, i32 0
+-; CHECK-NOT: LV: Found uniform instruction: %tmp2 = getelementptr inbounds %pair, %pair* %p, i64 %i, i32 1
++; CHECK-NOT: LV: Found uniform instruction: %tmp1 = getelementptr inbounds %pair, ptr %p, i64 %i, i32 0
++; CHECK-NOT: LV: Found uniform instruction: %tmp2 = getelementptr inbounds %pair, ptr %p, i64 %i, i32 1
+ ; CHECK:     vector.body
+ ; CHECK:       %index = phi i64 [ 0, %vector.ph ], [ %index.next, %vector.body ]
+ ; CHECK:       %offset.idx = sub i64 %n, %index
+ ; CHECK:       %[[I1:.+]] = add i64 %offset.idx, -1
+ ; CHECK:       %[[I2:.+]] = add i64 %offset.idx, -2
+ ; CHECK:       %[[I3:.+]] = add i64 %offset.idx, -3
+-; CHECK:       getelementptr inbounds %pair, %pair* %p, i64 %offset.idx, i32 0
+-; CHECK:       getelementptr inbounds %pair, %pair* %p, i64 %[[I1]], i32 0
+-; CHECK:       getelementptr inbounds %pair, %pair* %p, i64 %[[I2]], i32 0
+-; CHECK:       getelementptr inbounds %pair, %pair* %p, i64 %[[I3]], i32 0
+-; CHECK:       getelementptr inbounds %pair, %pair* %p, i64 %offset.idx, i32 1
+-; CHECK:       getelementptr inbounds %pair, %pair* %p, i64 %[[I1]], i32 1
+-; CHECK:       getelementptr inbounds %pair, %pair* %p, i64 %[[I2]], i32 1
+-; CHECK:       getelementptr inbounds %pair, %pair* %p, i64 %[[I3]], i32 1
++; CHECK:       getelementptr inbounds %pair, ptr %p, i64 %offset.idx, i32 0
++; CHECK:       getelementptr inbounds %pair, ptr %p, i64 %[[I1]], i32 0
++; CHECK:       getelementptr inbounds %pair, ptr %p, i64 %[[I2]], i32 0
++; CHECK:       getelementptr inbounds %pair, ptr %p, i64 %[[I3]], i32 0
++; CHECK:       getelementptr inbounds %pair, ptr %p, i64 %offset.idx, i32 1
++; CHECK:       getelementptr inbounds %pair, ptr %p, i64 %[[I1]], i32 1
++; CHECK:       getelementptr inbounds %pair, ptr %p, i64 %[[I2]], i32 1
++; CHECK:       getelementptr inbounds %pair, ptr %p, i64 %[[I3]], i32 1
+ ; CHECK:       br i1 {{.*}}, label %middle.block, label %vector.body
+ ;
+-; INTER:     LV: Found uniform instruction: %tmp1 = getelementptr inbounds %pair, %pair* %p, i64 %i, i32 0
+-; INTER:     LV: Found uniform instruction: %tmp2 = getelementptr inbounds %pair, %pair* %p, i64 %i, i32 1
++; INTER:     LV: Found uniform instruction: %tmp1 = getelementptr inbounds %pair, ptr %p, i64 %i, i32 0
++; INTER:     LV: Found uniform instruction: %tmp2 = getelementptr inbounds %pair, ptr %p, i64 %i, i32 1
+ ; INTER:     vector.body
+ ; INTER:       %index = phi i64 [ 0, %vector.ph ], [ %index.next, %vector.body ]
+ ; INTER:       %offset.idx = sub i64 %n, %index
+ ; INTER-NOT:   getelementptr
+-; INTER:       %[[G0:.+]] = getelementptr inbounds %pair, %pair* %p, i64 %offset.idx, i32 0
+-; INTER:       getelementptr inbounds i32, i32* %[[G0]], i64 -6
++; INTER:       %[[G0:.+]] = getelementptr inbounds %pair, ptr %p, i64 %offset.idx, i32 0
++; INTER:       getelementptr inbounds i32, ptr %[[G0]], i64 -6
+ ; INTER-NOT:   getelementptr
+ ; INTER:       br i1 {{.*}}, label %middle.block, label %vector.body
+ ;
+-define i32 @interleaved_access_reverse(%pair* %p, i64 %n) {
++define i32 @interleaved_access_reverse(ptr %p, i64 %n) {
+ entry:
+   br label %for.body
+ 
+ for.body:
+   %i = phi i64 [ %i.next, %for.body ], [ %n, %entry ]
+   %tmp0 = phi i32 [ %tmp6, %for.body ], [ 0, %entry ]
+-  %tmp1 = getelementptr inbounds %pair, %pair* %p, i64 %i, i32 0
+-  %tmp2 = getelementptr inbounds %pair, %pair* %p, i64 %i, i32 1
+-  %tmp3 = load i32, i32* %tmp1, align 8
+-  %tmp4 = load i32, i32* %tmp2, align 8
++  %tmp1 = getelementptr inbounds %pair, ptr %p, i64 %i, i32 0
++  %tmp2 = getelementptr inbounds %pair, ptr %p, i64 %i, i32 1
++  %tmp3 = load i32, ptr %tmp1, align 8
++  %tmp4 = load i32, ptr %tmp2, align 8
+   %tmp5 = add i32 %tmp3, %tmp4
+   %tmp6 = add i32 %tmp0, %tmp5
+   %i.next = add nsw i64 %i, -1
+@@ -197,18 +197,17 @@ for.end:
+ ; as if it were uniform, the store is scalarized, making the pointer
+ ; non-uniform.
+ ;
+-; INTER-NOT: LV: Found uniform instruction: %tmp0 = getelementptr inbounds %pair, %pair* %p, i64 %i, i32 0
++; INTER-NOT: LV: Found uniform instruction: %tmp0 = getelementptr inbounds %pair, ptr %p, i64 %i, i32 0
+ ; INTER:     vector.body
+ ; INTER:       %index = phi i64 [ 0, %vector.ph ], [ %index.next, {{.*}} ]
+-; INTER:       %[[G0:.+]] = getelementptr inbounds %pair, %pair* %p, i64 %index, i32 0
+-; INTER:       %[[B0:.+]] = bitcast i32* %[[G0]] to <8 x i32>*
+-; INTER:       %wide.vec = load <8 x i32>, <8 x i32>* %[[B0]], align 8
++; INTER:       %[[G0:.+]] = getelementptr inbounds %pair, ptr %p, i64 %index, i32 0
++; INTER:       %wide.vec = load <8 x i32>, ptr %[[G0]], align 8
+ ; INTER:       %[[I1:.+]] = or i64 %index, 1
+-; INTER:       getelementptr inbounds %pair, %pair* %p, i64 %[[I1]], i32 0
++; INTER:       getelementptr inbounds %pair, ptr %p, i64 %[[I1]], i32 0
+ ; INTER:       %[[I2:.+]] = or i64 %index, 2
+-; INTER:       getelementptr inbounds %pair, %pair* %p, i64 %[[I2]], i32 0
++; INTER:       getelementptr inbounds %pair, ptr %p, i64 %[[I2]], i32 0
+ ; INTER:       %[[I3:.+]] = or i64 %index, 3
+-; INTER:       getelementptr inbounds %pair, %pair* %p, i64 %[[I3]], i32 0
++; INTER:       getelementptr inbounds %pair, ptr %p, i64 %[[I3]], i32 0
+ ; INTER:       br i1 {{.*}}, label %middle.block, label %vector.body
+ ;
+ define void @predicated_store(%pair *%p, i32 %x, i64 %n) {
+@@ -217,13 +216,13 @@ entry:
+ 
+ for.body:
+   %i  = phi i64 [ %i.next, %if.merge ], [ 0, %entry ]
+-  %tmp0 = getelementptr inbounds %pair, %pair* %p, i64 %i, i32 0
+-  %tmp1 = load i32, i32* %tmp0, align 8
++  %tmp0 = getelementptr inbounds %pair, ptr %p, i64 %i, i32 0
++  %tmp1 = load i32, ptr %tmp0, align 8
+   %tmp2 = icmp eq i32 %tmp1, %x
+   br i1 %tmp2, label %if.then, label %if.merge
+ 
+ if.then:
+-  store i32 %tmp1, i32* %tmp0, align 8
++  store i32 %tmp1, ptr %tmp0, align 8
+   br label %if.merge
+ 
+ if.merge:
+@@ -241,27 +240,27 @@ for.end:
+ ; as uniform and is not uniform after vectorization. The store is scalarized
+ ; because the stored type may required padding.
+ ;
+-; CHECK-NOT: LV: Found uniform instruction: %tmp1 = getelementptr inbounds x86_fp80, x86_fp80* %a, i64 %i
++; CHECK-NOT: LV: Found uniform instruction: %tmp1 = getelementptr inbounds x86_fp80, ptr %a, i64 %i
+ ; CHECK:     vector.body
+ ; CHECK:       %index = phi i64 [ 0, %vector.ph ], [ %index.next, %vector.body ]
+ ; CHECK:       %[[I1:.+]] = or i64 %index, 1
+ ; CHECK:       %[[I2:.+]] = or i64 %index, 2
+ ; CHECK:       %[[I3:.+]] = or i64 %index, 3
+-; CHECK:       getelementptr inbounds x86_fp80, x86_fp80* %a, i64 %index
+-; CHECK:       getelementptr inbounds x86_fp80, x86_fp80* %a, i64 %[[I1]]
+-; CHECK:       getelementptr inbounds x86_fp80, x86_fp80* %a, i64 %[[I2]]
+-; CHECK:       getelementptr inbounds x86_fp80, x86_fp80* %a, i64 %[[I3]]
++; CHECK:       getelementptr inbounds x86_fp80, ptr %a, i64 %index
++; CHECK:       getelementptr inbounds x86_fp80, ptr %a, i64 %[[I1]]
++; CHECK:       getelementptr inbounds x86_fp80, ptr %a, i64 %[[I2]]
++; CHECK:       getelementptr inbounds x86_fp80, ptr %a, i64 %[[I3]]
+ ; CHECK:       br i1 {{.*}}, label %middle.block, label %vector.body
+ ;
+-define void @irregular_type(x86_fp80* %a, i64 %n) {
++define void @irregular_type(ptr %a, i64 %n) {
+ entry:
+   br label %for.body
+ 
+ for.body:
+   %i = phi i64 [ 0, %entry ], [ %i.next, %for.body ]
+   %tmp0 = sitofp i32 1 to x86_fp80
+-  %tmp1 = getelementptr inbounds x86_fp80, x86_fp80* %a, i64 %i
+-  store x86_fp80 %tmp0, x86_fp80* %tmp1, align 16
++  %tmp1 = getelementptr inbounds x86_fp80, ptr %a, i64 %i
++  store x86_fp80 %tmp0, ptr %tmp1, align 16
+   %i.next = add i64 %i, 1
+   %cond = icmp slt i64 %i.next, %n
+   br i1 %cond, label %for.body, label %for.end
+@@ -275,23 +274,24 @@ for.end:
+ ; Check that a pointer induction variable is recognized as uniform and remains
+ ; uniform after vectorization.
+ ;
+-; CHECK:     LV: Found uniform instruction: %p = phi i32* [ %tmp03, %for.body ], [ %a, %entry ]
++; CHECK:     LV: Found uniform instruction: %p = phi ptr [ %tmp03, %for.body ], [ %a, %entry ]
+ ; CHECK:     vector.body
+ ; CHECK:       %index = phi i64 [ 0, %vector.ph ], [ %index.next, %vector.body ]
+ ; CHECK-NOT:   getelementptr
+-; CHECK:       %next.gep = getelementptr i32, i32* %a, i64 %index
++; CHECK:       [[SHL:%.+]] = shl i64 %index, 2
++; CHECK:       %next.gep = getelementptr i8, ptr %a, i64 [[SHL]]
+ ; CHECK-NOT:   getelementptr
+ ; CHECK:       br i1 {{.*}}, label %middle.block, label %vector.body
+ ;
+-define void @pointer_iv_uniform(i32* %a, i32 %x, i64 %n) {
++define void @pointer_iv_uniform(ptr %a, i32 %x, i64 %n) {
+ entry:
+   br label %for.body
+ 
+ for.body:
+   %i = phi i64 [ %i.next, %for.body ], [ 0, %entry ]
+-  %p = phi i32* [ %tmp03, %for.body ], [ %a, %entry ]
+-  store i32 %x, i32* %p, align 8
+-  %tmp03 = getelementptr inbounds i32, i32* %p, i32 1
++  %p = phi ptr [ %tmp03, %for.body ], [ %a, %entry ]
++  store i32 %x, ptr %p, align 8
++  %tmp03 = getelementptr inbounds i32, ptr %p, i32 1
+   %i.next = add nuw nsw i64 %i, 1
+   %cond = icmp slt i64 %i.next, %n
+   br i1 %cond, label %for.body, label %for.end
+@@ -307,42 +307,42 @@ for.end:
+ ; induction variable is used by getelementptr instructions that are non-uniform
+ ; due to scalarization of the stores.
+ ;
+-; INTER-NOT: LV: Found uniform instruction: %p = phi i32* [ %tmp03, %for.body ], [ %a, %entry ]
++; INTER-NOT: LV: Found uniform instruction: %p = phi ptr [ %tmp03, %for.body ], [ %a, %entry ]
+ ; INTER:     vector.body
+ ; INTER:       %index = phi i64 [ 0, %vector.ph ], [ %index.next, %vector.body ]
+-; INTER:       %[[I0:.+]] = shl i64 %index, 2
+-; INTER:       %next.gep = getelementptr i32, i32* %a, i64 %[[I0]]
+-; INTER:       %[[S1:.+]] = shl i64 %index, 2
+-; INTER:       %[[I1:.+]] = or i64 %[[S1]], 4
+-; INTER:       %next.gep2 = getelementptr i32, i32* %a, i64 %[[I1]]
+-; INTER:       %[[S2:.+]] = shl i64 %index, 2
+-; INTER:       %[[I2:.+]] = or i64 %[[S2]], 8
+-; INTER:       %next.gep3 = getelementptr i32, i32* %a, i64 %[[I2]]
+-; INTER:       %[[S3:.+]] = shl i64 %index, 2
+-; INTER:       %[[I3:.+]] = or i64 %[[S3]], 12
+-; INTER:       %next.gep4 = getelementptr i32, i32* %a, i64 %[[I3]]
++; INTER:       %[[I0:.+]] = shl i64 %index, 4
++; INTER:       %next.gep = getelementptr i8, ptr %a, i64 %[[I0]]
++; INTER:       %[[S1:.+]] = shl i64 %index, 4
++; INTER:       %[[I1:.+]] = or i64 %[[S1]], 16
++; INTER:       %next.gep2 = getelementptr i8, ptr %a, i64 %[[I1]]
++; INTER:       %[[S2:.+]] = shl i64 %index, 4
++; INTER:       %[[I2:.+]] = or i64 %[[S2]], 32
++; INTER:       %next.gep3 = getelementptr i8, ptr %a, i64 %[[I2]]
++; INTER:       %[[S3:.+]] = shl i64 %index, 4
++; INTER:       %[[I3:.+]] = or i64 %[[S3]], 48
++; INTER:       %next.gep4 = getelementptr i8, ptr %a, i64 %[[I3]]
+ ; INTER:       br i1 {{.*}}, label %middle.block, label %vector.body
+ ;
+-define void @pointer_iv_non_uniform_0(i32* %a, i64 %n) {
++define void @pointer_iv_non_uniform_0(ptr %a, i64 %n) {
+ entry:
+   br label %for.body
+ 
+ for.body:
+   %i = phi i64 [ %i.next, %for.body ], [ 0, %entry ]
+-  %p = phi i32* [ %tmp03, %for.body ], [ %a, %entry ]
+-  %tmp00 = load i32, i32* %p, align 8
+-  %tmp01 = getelementptr inbounds i32, i32* %p, i32 1
+-  %tmp02 = load i32, i32* %tmp01, align 8
+-  %tmp03 = getelementptr inbounds i32, i32* %p, i32 4
+-  %tmp04 = load i32, i32* %tmp03, align 8
+-  %tmp05 = getelementptr inbounds i32, i32* %p, i32 5
+-  %tmp06 = load i32, i32* %tmp05, align 8
++  %p = phi ptr [ %tmp03, %for.body ], [ %a, %entry ]
++  %tmp00 = load i32, ptr %p, align 8
++  %tmp01 = getelementptr inbounds i32, ptr %p, i32 1
++  %tmp02 = load i32, ptr %tmp01, align 8
++  %tmp03 = getelementptr inbounds i32, ptr %p, i32 4
++  %tmp04 = load i32, ptr %tmp03, align 8
++  %tmp05 = getelementptr inbounds i32, ptr %p, i32 5
++  %tmp06 = load i32, ptr %tmp05, align 8
+   %tmp07 = sub i32 %tmp04, %tmp00
+   %tmp08 = sub i32 %tmp02, %tmp02
+-  %tmp09 = getelementptr inbounds i32, i32* %p, i32 2
+-  store i32 %tmp07, i32* %tmp09, align 8
+-  %tmp10 = getelementptr inbounds i32, i32* %p, i32 3
+-  store i32 %tmp08, i32* %tmp10, align 8
++  %tmp09 = getelementptr inbounds i32, ptr %p, i32 2
++  store i32 %tmp07, ptr %tmp09, align 8
++  %tmp10 = getelementptr inbounds i32, ptr %p, i32 3
++  store i32 %tmp08, ptr %tmp10, align 8
+   %i.next = add nuw nsw i64 %i, 1
+   %cond = icmp slt i64 %i.next, %n
+   br i1 %cond, label %for.body, label %for.end
+@@ -357,28 +357,32 @@ for.end:
+ ; recognized as uniform and is not uniform after vectorization. The pointer
+ ; induction variable is used by a store that will be scalarized.
+ ;
+-; CHECK-NOT: LV: Found uniform instruction: %p = phi x86_fp80* [%tmp1, %for.body], [%a, %entry]
++; CHECK-NOT: LV: Found uniform instruction: %p = phi ptr [%tmp1, %for.body], [%a, %entry]
+ ; CHECK:     vector.body
+ ; CHECK:       %index = phi i64 [ 0, %vector.ph ], [ %index.next, %vector.body ]
+-; CHECK:       %next.gep = getelementptr x86_fp80, x86_fp80* %a, i64 %index
+-; CHECK:       %[[I1:.+]] = or i64 %index, 1
+-; CHECK:       %next.gep2 = getelementptr x86_fp80, x86_fp80* %a, i64 %[[I1]]
+-; CHECK:       %[[I2:.+]] = or i64 %index, 2
+-; CHECK:       %next.gep3 = getelementptr x86_fp80, x86_fp80* %a, i64 %[[I2]]
+-; CHECK:       %[[I3:.+]] = or i64 %index, 3
+-; CHECK:       %next.gep4 = getelementptr x86_fp80, x86_fp80* %a, i64 %[[I3]]
++; CHECK:       [[SHL1:%.+]] = shl i64 %index, 4
++; CHECK:       %next.gep = getelementptr i8, ptr %a, i64 [[SHL1]]
++; CHECK:       [[SHL2:%.+]] = shl i64 %index, 4
++; CHECK:       %[[I1:.+]] = or i64 [[SHL2]], 16
++; CHECK:       %next.gep2 = getelementptr i8, ptr %a, i64 %[[I1]]
++; CHECK:       [[SHL3:%.+]] = shl i64 %index, 4
++; CHECK:       %[[I2:.+]] = or i64 [[SHL3]], 32
++; CHECK:       %next.gep3 = getelementptr i8, ptr %a, i64 %[[I2]]
++; CHECK:       [[SHL4:%.+]] = shl i64 %index, 4
++; CHECK:       %[[I3:.+]] = or i64 [[SHL4]], 48
++; CHECK:       %next.gep4 = getelementptr i8, ptr %a, i64 %[[I3]]
+ ; CHECK:       br i1 {{.*}}, label %middle.block, label %vector.body
+ ;
+-define void @pointer_iv_non_uniform_1(x86_fp80* %a, i64 %n) {
++define void @pointer_iv_non_uniform_1(ptr %a, i64 %n) {
+ entry:
+   br label %for.body
+ 
+ for.body:
+   %i = phi i64 [ %i.next, %for.body ], [ 0, %entry ]
+-  %p = phi x86_fp80* [%tmp1, %for.body], [%a, %entry]
++  %p = phi ptr [%tmp1, %for.body], [%a, %entry]
+   %tmp0 = sitofp i32 1 to x86_fp80
+-  store x86_fp80 %tmp0, x86_fp80* %p, align 16
+-  %tmp1 = getelementptr inbounds x86_fp80, x86_fp80* %p, i32 1
++  store x86_fp80 %tmp0, ptr %p, align 16
++  %tmp1 = getelementptr inbounds x86_fp80, ptr %p, i32 1
+   %i.next = add i64 %i, 1
+   %cond = icmp slt i64 %i.next, %n
+   br i1 %cond, label %for.body, label %for.end
+@@ -394,32 +398,32 @@ for.end:
+ ; variable is not recognized as uniform and is not uniform after vectorization
+ ; because it is stored to memory.
+ ;
+-; CHECK-NOT: LV: Found uniform instruction: %p = phi i32* [ %tmp3, %for.body ], [ %a, %entry ]
+-; CHECK:     LV: Found uniform instruction: %q = phi i32** [ %tmp4, %for.body ], [ %b, %entry ]
++; CHECK-NOT: LV: Found uniform instruction: %p = phi ptr [ %tmp3, %for.body ], [ %a, %entry ]
++; CHECK:     LV: Found uniform instruction: %q = phi ptr [ %tmp4, %for.body ], [ %b, %entry ]
+ ; CHECK:     vector.body
+-; CHECK:       %pointer.phi = phi i32* [ %a, %vector.ph ], [ %ptr.ind, %vector.body ]
++; CHECK:       %pointer.phi = phi ptr [ %a, %vector.ph ], [ %ptr.ind, %vector.body ]
+ ; CHECK:       %index = phi i64 [ 0, %vector.ph ], [ %index.next, %vector.body ]
+-; CHECK:       %[[PTRVEC:.+]] = getelementptr i32, i32* %pointer.phi, <4 x i64> <i64 0, i64 1, i64 2, i64 3>
+-; CHECK:       %next.gep = getelementptr i32*, i32** %b, i64 %index
+-; CHECK:       %[[NEXTGEPBC:.+]] = bitcast i32** %next.gep to <4 x i32*>*
+-; CHECK:       store <4 x i32*> %[[PTRVEC]], <4 x i32*>* %[[NEXTGEPBC]], align 8
+-; CHECK:       %ptr.ind = getelementptr i32, i32* %pointer.phi, i64 4
++; CHECK:       %[[PTRVEC:.+]] = getelementptr i8, ptr %pointer.phi, <4 x i64> <i64 0, i64 4, i64 8, i64 12>
++; CHECK:       [[SHL:%.+]] = shl i64 %index, 3
++; CHECK:       %next.gep = getelementptr i8, ptr %b, i64 [[SHL]]
++; CHECK:       store <4 x ptr> %[[PTRVEC]], ptr %next.gep, align 8
++; CHECK:       %ptr.ind = getelementptr i8, ptr %pointer.phi, i64 16
+ ; CHECK:       br i1 {{.*}}, label %middle.block, label %vector.body
+ ;
+-define i32 @pointer_iv_mixed(i32* %a, i32** %b, i64 %n) {
++define i32 @pointer_iv_mixed(ptr %a, ptr %b, i64 %n) {
+ entry:
+   br label %for.body
+ 
+ for.body:
+   %i = phi i64 [ %i.next, %for.body ], [ 0, %entry ]
+-  %p = phi i32* [ %tmp3, %for.body ], [ %a, %entry ]
+-  %q = phi i32** [ %tmp4, %for.body ], [ %b, %entry ]
++  %p = phi ptr [ %tmp3, %for.body ], [ %a, %entry ]
++  %q = phi ptr [ %tmp4, %for.body ], [ %b, %entry ]
+   %tmp0 = phi i32 [ %tmp2, %for.body ], [ 0, %entry ]
+-  %tmp1 = load i32, i32* %p, align 8
++  %tmp1 = load i32, ptr %p, align 8
+   %tmp2 = add i32 %tmp1, %tmp0
+-  store i32* %p, i32** %q, align 8
+-  %tmp3 = getelementptr inbounds i32, i32* %p, i32 1
+-  %tmp4 = getelementptr inbounds i32*, i32** %q, i32 1
++  store ptr %p, ptr %q, align 8
++  %tmp3 = getelementptr inbounds i32, ptr %p, i32 1
++  %tmp4 = getelementptr inbounds ptr, ptr %q, i32 1
+   %i.next = add nuw nsw i64 %i, 1
+   %cond = icmp slt i64 %i.next, %n
+   br i1 %cond, label %for.body, label %for.end
+@@ -429,49 +433,47 @@ for.end:
+   ret i32 %tmp5
+ }
+ 
+-; INTER-LABEL: bitcast_pointer_operand
++; INTER-LABEL: pointer_operand_geps_with_different_indexed_types
+ ;
+ ; Check that a pointer operand having a user other than a memory access is
+-; recognized as uniform after vectorization. In this test case, %tmp1 is a
+-; bitcast that is used by a load and a getelementptr instruction (%tmp2). Once
+-; %tmp2 is marked uniform, %tmp1 should be marked uniform as well.
++; recognized as uniform after vectorization. In this test case, %tmp0 is a
++; GEP that is used by a load and a getelementptr instruction (%tmp2). Once
++; %tmp2 is marked uniform, %tmp0 should be marked uniform as well.
+ ;
+ ; INTER:       LV: Found uniform instruction: %cond = icmp slt i64 %i.next, %n
+-; INTER-NEXT:  LV: Found uniform instruction: %tmp2 = getelementptr inbounds i8, i8* %tmp1, i64 3
+-; INTER-NEXT:  LV: Found uniform instruction: %tmp6 = getelementptr inbounds i8, i8* %B, i64 %i
+-; INTER-NEXT:  LV: Found uniform instruction: %tmp1 = bitcast i64* %tmp0 to i8*
+-; INTER-NEXT:  LV: Found uniform instruction: %tmp0 = getelementptr inbounds i64, i64* %A, i64 %i
++; INTER-NEXT:  LV: Found uniform instruction: %tmp2 = getelementptr inbounds i8, ptr %tmp0, i64 3
++; INTER-NEXT:  LV: Found uniform instruction: %tmp6 = getelementptr inbounds i8, ptr %B, i64 %i
++; INTER-NEXT:  LV: Found uniform instruction: %tmp0 = getelementptr inbounds i64, ptr %A, i64 %i
+ ; INTER-NEXT:  LV: Found uniform instruction: %i = phi i64 [ 0, %entry ], [ %i.next, %for.body ]
+ ; INTER-NEXT:  LV: Found uniform instruction: %i.next = add nuw nsw i64 %i, 1
+-; INTER:       define void @bitcast_pointer_operand(
++; INTER:       define void @pointer_operand_geps_with_different_indexed_types(
+ ; INTER:       vector.body:
+ ; INTER-NEXT:    [[INDEX:%.*]] = phi i64 [ 0, %vector.ph ], [ [[INDEX_NEXT:%.*]], %vector.body ]
+-; INTER-NEXT:    [[TMP4:%.*]] = getelementptr inbounds i64, i64* %A, i64 [[INDEX]]
+-; INTER-NEXT:    [[TMP5:%.*]] = bitcast i64* [[TMP4]] to <32 x i8>*
+-; INTER-NEXT:    [[WIDE_VEC:%.*]] = load <32 x i8>, <32 x i8>* [[TMP5]], align 1
++; INTER-NEXT:    [[TMP4:%.*]] = getelementptr inbounds i64, ptr %A, i64 [[INDEX]]
++; INTER-NEXT:    [[TMP5:%.*]] = getelementptr inbounds i8, ptr [[TMP4]], i64 3
++; INTER-NEXT:    [[TMP6:%.*]] = getelementptr inbounds i8, ptr [[TMP5]], i64 -3
++; INTER-NEXT:    [[WIDE_VEC:%.*]] = load <32 x i8>, ptr [[TMP6]], align 1
+ ; INTER-NEXT:    [[STRIDED_VEC:%.*]] = shufflevector <32 x i8> [[WIDE_VEC]], <32 x i8> poison, <4 x i32> <i32 0, i32 8, i32 16, i32 24>
+ ; INTER-NEXT:    [[STRIDED_VEC5:%.*]] = shufflevector <32 x i8> [[WIDE_VEC]], <32 x i8> poison, <4 x i32> <i32 3, i32 11, i32 19, i32 27>
+ ; INTER-NEXT:    [[TMP6:%.*]] = xor <4 x i8> [[STRIDED_VEC5]], [[STRIDED_VEC]]
+-; INTER-NEXT:    [[TMP7:%.*]] = getelementptr inbounds i8, i8* %B, i64 [[INDEX]]
+-; INTER-NEXT:    [[TMP8:%.*]] = bitcast i8* [[TMP7]] to <4 x i8>*
+-; INTER-NEXT:    store <4 x i8> [[TMP6]], <4 x i8>* [[TMP8]], align 1
++; INTER-NEXT:    [[TMP7:%.*]] = getelementptr inbounds i8, ptr %B, i64 [[INDEX]]
++; INTER-NEXT:    store <4 x i8> [[TMP6]], ptr [[TMP7]], align 1
+ ; INTER-NEXT:    [[INDEX_NEXT]] = add nuw i64 [[INDEX]], 4
+ ; INTER:         br i1 {{.*}}, label %middle.block, label %vector.body
+ ;
+-define void @bitcast_pointer_operand(i64* %A, i8* %B, i64 %n) {
++define void @pointer_operand_geps_with_different_indexed_types(i64* %A, i8* %B, i64 %n) {
+ entry:
+   br label %for.body
+ 
+ for.body:
+   %i = phi i64 [ 0, %entry ], [ %i.next, %for.body ]
+-  %tmp0 = getelementptr inbounds i64, i64* %A, i64 %i
+-  %tmp1 = bitcast i64* %tmp0 to i8*
+-  %tmp2 = getelementptr inbounds i8, i8* %tmp1, i64 3
+-  %tmp3 = load i8, i8* %tmp2, align 1
+-  %tmp4 = load i8, i8* %tmp1, align 1
++  %tmp0 = getelementptr inbounds i64, ptr %A, i64 %i
++  %tmp2 = getelementptr inbounds i8, ptr %tmp0, i64 3
++  %tmp3 = load i8, ptr %tmp2, align 1
++  %tmp4 = load i8, ptr %tmp0, align 1
+   %tmp5 = xor i8 %tmp3, %tmp4
+-  %tmp6 = getelementptr inbounds i8, i8* %B, i64 %i
+-  store i8 %tmp5, i8* %tmp6
++  %tmp6 = getelementptr inbounds i8, ptr %B, i64 %i
++  store i8 %tmp5, ptr %tmp6
+   %i.next = add nuw nsw i64 %i, 1
+   %cond = icmp slt i64 %i.next, %n
+   br i1 %cond, label %for.body, label %for.end
+-- 
+2.41.0
+
diff --git a/main/llvm16/9003-LV-Add-test-where-pointer-is-incorrectly-marked-as-u.patch b/main/llvm16/9003-LV-Add-test-where-pointer-is-incorrectly-marked-as-u.patch
new file mode 100644
index 00000000000..e09e8be9018
--- /dev/null
+++ b/main/llvm16/9003-LV-Add-test-where-pointer-is-incorrectly-marked-as-u.patch
@@ -0,0 +1,55 @@
+From 3e4888751641fbbfb99b7579f0d5f4d3df567fbf Mon Sep 17 00:00:00 2001
+From: Florian Hahn <flo@fhahn.com>
+Date: Fri, 17 Mar 2023 14:23:56 +0000
+Subject: [PATCH 03/10] [LV] Add test where pointer is incorrectly marked as
+ uniform.
+
+Test for #61396.
+
+Gentoo-Component: llvm
+---
+ .../LoopVectorize/consecutive-ptr-uniforms.ll | 31 +++++++++++++++++++
+ 1 file changed, 31 insertions(+)
+
+diff --git a/llvm/test/Transforms/LoopVectorize/consecutive-ptr-uniforms.ll b/llvm/test/Transforms/LoopVectorize/consecutive-ptr-uniforms.ll
+index e4129747898b..8431972f78ee 100644
+--- a/llvm/test/Transforms/LoopVectorize/consecutive-ptr-uniforms.ll
++++ b/llvm/test/Transforms/LoopVectorize/consecutive-ptr-uniforms.ll
+@@ -481,3 +481,34 @@ for.body:
+ for.end:
+   ret void
+ }
++
++
++; FIXME: Currently %cur.ptr is incorrectly identified as uniform.
++
++; CHECK-LABEL: pr61396_pointer_used_as_both_stored_value_and_pointer_operand_by_store
++; CHECK:    LV: Found uniform instruction: %cur.ptr = getelementptr inbounds ptr, ptr %ary, i64 %iv
++
++; CHECK:       define void @pr61396_pointer_used_as_both_stored_value_and_pointer_operand_by_store(
++; CHECK:       vector.body:
++; CHECK-NEXT:    %index = phi i64 [ 0, %vector.ph ], [ %index.next, %vector.body ]
++; CHECK-NEXT:    [[GEP:%.+]] = getelementptr inbounds ptr, ptr %ary, i64 %index
++; CHECK-NEXT:    [[INS:%.+]] = insertelement <4 x ptr> poison, ptr [[GEP]], i64 0
++; CHECK-NEXT:    [[SPLAT:%.+]] = shufflevector <4 x ptr> %broadcast.splatinsert, <4 x ptr> poison, <4 x i32> zeroinitializer
++; CHECK-NEXT:    store <4 x ptr> [[SPLAT]], ptr [[GEP]], align 8
++;
++
++define void @pr61396_pointer_used_as_both_stored_value_and_pointer_operand_by_store(ptr %ary) {
++entry:
++  br label %loop
++
++loop:
++  %iv = phi i64 [ 0, %entry ], [ %iv.next, %loop ]
++  %cur.ptr = getelementptr inbounds ptr, ptr %ary, i64 %iv
++  store ptr %cur.ptr, ptr %cur.ptr, align 8
++  %iv.next = add nuw nsw i64 %iv, 1
++  %done = icmp eq i64 %iv, 10240
++  br i1 %done, label %exit, label %loop
++
++exit:
++  ret void
++}
+-- 
+2.41.0
+
diff --git a/main/llvm16/9004-LV-Don-t-consider-pointer-as-uniform-if-it-is-also-s.patch b/main/llvm16/9004-LV-Don-t-consider-pointer-as-uniform-if-it-is-also-s.patch
new file mode 100644
index 00000000000..be393247c58
--- /dev/null
+++ b/main/llvm16/9004-LV-Don-t-consider-pointer-as-uniform-if-it-is-also-s.patch
@@ -0,0 +1,129 @@
+From 13375bc7bbafc690823cbd9f284b70ac222d80bc Mon Sep 17 00:00:00 2001
+From: Florian Hahn <flo@fhahn.com>
+Date: Fri, 17 Mar 2023 16:26:07 +0000
+Subject: [PATCH 04/10] [LV] Don't consider pointer as uniform if it is also
+ stored.
+
+Update isVectorizedMemAccessUse to also check if the pointer is stored.
+This prevents LV to incorrectly consider a pointer as uniform if it is
+used as both pointer and stored by the same StoreInst.
+
+Fixes #61396.
+
+Gentoo-Component: llvm
+---
+ .../Transforms/Vectorize/LoopVectorize.cpp    | 16 +++++++++-----
+ .../LoopVectorize/consecutive-ptr-uniforms.ll | 13 +++++------
+ .../Transforms/LoopVectorize/opaque-ptr.ll    | 22 ++++++++-----------
+ 3 files changed, 25 insertions(+), 26 deletions(-)
+
+diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
+index 148f2c545b41..0bd519a6d945 100644
+--- a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
++++ b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
+@@ -4689,11 +4689,17 @@ void LoopVectorizationCostModel::collectLoopUniforms(ElementCount VF) {
+             WideningDecision == CM_Interleave);
+   };
+ 
+-
+   // Returns true if Ptr is the pointer operand of a memory access instruction
+-  // I, and I is known to not require scalarization.
++  // I, I is known to not require scalarization, and the pointer is not also
++  // stored.
+   auto isVectorizedMemAccessUse = [&](Instruction *I, Value *Ptr) -> bool {
+-    return getLoadStorePointerOperand(I) == Ptr && isUniformDecision(I, VF);
++    auto GetStoredValue = [I]() -> Value * {
++      if (!isa<StoreInst>(I))
++        return nullptr;
++      return I->getOperand(0);
++    };
++    return getLoadStorePointerOperand(I) == Ptr && isUniformDecision(I, VF) &&
++           GetStoredValue() != Ptr;
+   };
+ 
+   // Holds a list of values which are known to have at least one uniform use.
+@@ -4739,8 +4745,8 @@ void LoopVectorizationCostModel::collectLoopUniforms(ElementCount VF) {
+       if (isUniformMemOpUse(&I))
+         addToWorklistIfAllowed(&I);
+ 
+-      if (isUniformDecision(&I, VF)) {
+-        assert(isVectorizedMemAccessUse(&I, Ptr) && "consistency check");
++      if (isVectorizedMemAccessUse(&I, Ptr)) {
++        assert(isUniformDecision(&I, VF) && "consistency check");
+         HasUniformUse.insert(Ptr);
+       }
+     }
+diff --git a/llvm/test/Transforms/LoopVectorize/consecutive-ptr-uniforms.ll b/llvm/test/Transforms/LoopVectorize/consecutive-ptr-uniforms.ll
+index 8431972f78ee..29b2c4533e39 100644
+--- a/llvm/test/Transforms/LoopVectorize/consecutive-ptr-uniforms.ll
++++ b/llvm/test/Transforms/LoopVectorize/consecutive-ptr-uniforms.ll
+@@ -482,19 +482,16 @@ for.end:
+   ret void
+ }
+ 
+-
+-; FIXME: Currently %cur.ptr is incorrectly identified as uniform.
+-
+ ; CHECK-LABEL: pr61396_pointer_used_as_both_stored_value_and_pointer_operand_by_store
+-; CHECK:    LV: Found uniform instruction: %cur.ptr = getelementptr inbounds ptr, ptr %ary, i64 %iv
++; CHECK-NOT: LV: Found uniform instruction: %cur.ptr = getelementptr inbounds ptr, ptr %ary, i64 %iv
+ 
+ ; CHECK:       define void @pr61396_pointer_used_as_both_stored_value_and_pointer_operand_by_store(
+ ; CHECK:       vector.body:
+ ; CHECK-NEXT:    %index = phi i64 [ 0, %vector.ph ], [ %index.next, %vector.body ]
+-; CHECK-NEXT:    [[GEP:%.+]] = getelementptr inbounds ptr, ptr %ary, i64 %index
+-; CHECK-NEXT:    [[INS:%.+]] = insertelement <4 x ptr> poison, ptr [[GEP]], i64 0
+-; CHECK-NEXT:    [[SPLAT:%.+]] = shufflevector <4 x ptr> %broadcast.splatinsert, <4 x ptr> poison, <4 x i32> zeroinitializer
+-; CHECK-NEXT:    store <4 x ptr> [[SPLAT]], ptr [[GEP]], align 8
++; CHECK-NEXT:    [[VEC_IND:%.+]] = phi <4 x i64> [ <i64 0, i64 1, i64 2, i64 3>, %vector.ph ], [ %vec.ind.next, %vector.body ]
++; CHECK-NEXT:    [[GEP:%.+]] = getelementptr inbounds ptr, ptr %ary, <4 x i64> [[VEC_IND]]
++; CHECK-NEXT:    [[EXT:%.+]] = extractelement <4 x ptr> [[GEP]], i64 0
++; CHECK-NEXT:    store <4 x ptr> [[GEP]], ptr [[EXT]], align 8
+ ;
+ 
+ define void @pr61396_pointer_used_as_both_stored_value_and_pointer_operand_by_store(ptr %ary) {
+diff --git a/llvm/test/Transforms/LoopVectorize/opaque-ptr.ll b/llvm/test/Transforms/LoopVectorize/opaque-ptr.ll
+index 5ec653531379..bb58173f63e1 100644
+--- a/llvm/test/Transforms/LoopVectorize/opaque-ptr.ll
++++ b/llvm/test/Transforms/LoopVectorize/opaque-ptr.ll
+@@ -57,20 +57,16 @@ define void @store_pointer_induction(ptr %start, ptr %end) {
+ ; CHECK-NEXT:    [[IND_END:%.*]] = getelementptr i8, ptr [[START]], i64 [[TMP4]]
+ ; CHECK-NEXT:    br label [[VECTOR_BODY:%.*]]
+ ; CHECK:       vector.body:
++; CHECK-NEXT:    [[POINTER_PHI:%.*]] = phi ptr [ [[START]], [[VECTOR_PH]] ], [ [[PTR_IND:%.*]], [[VECTOR_BODY]] ]
+ ; CHECK-NEXT:    [[INDEX:%.*]] = phi i64 [ 0, [[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], [[VECTOR_BODY]] ]
+-; CHECK-NEXT:    [[TMP5:%.*]] = add i64 [[INDEX]], 0
+-; CHECK-NEXT:    [[TMP6:%.*]] = mul i64 [[TMP5]], 8
+-; CHECK-NEXT:    [[NEXT_GEP:%.*]] = getelementptr i8, ptr [[START]], i64 [[TMP6]]
+-; CHECK-NEXT:    [[TMP7:%.*]] = add i64 [[INDEX]], 1
+-; CHECK-NEXT:    [[TMP8:%.*]] = mul i64 [[TMP7]], 8
+-; CHECK-NEXT:    [[NEXT_GEP3:%.*]] = getelementptr i8, ptr [[START]], i64 [[TMP8]]
+-; CHECK-NEXT:    [[TMP9:%.*]] = insertelement <2 x ptr> poison, ptr [[NEXT_GEP]], i32 0
+-; CHECK-NEXT:    [[TMP10:%.*]] = insertelement <2 x ptr> [[TMP9]], ptr [[NEXT_GEP3]], i32 1
+-; CHECK-NEXT:    [[TMP11:%.*]] = getelementptr ptr, ptr [[NEXT_GEP]], i32 0
+-; CHECK-NEXT:    store <2 x ptr> [[TMP10]], ptr [[TMP11]], align 4
++; CHECK-NEXT:    [[TMP5:%.*]] = getelementptr i8, ptr [[POINTER_PHI]], <2 x i64> <i64 0, i64 8>
++; CHECK-NEXT:    [[TMP6:%.*]] = extractelement <2 x ptr> [[TMP5]], i32 0
++; CHECK-NEXT:    [[TMP7:%.*]] = getelementptr ptr, ptr [[TMP6]], i32 0
++; CHECK-NEXT:    store <2 x ptr> [[TMP5]], ptr [[TMP7]], align 4
+ ; CHECK-NEXT:    [[INDEX_NEXT]] = add nuw i64 [[INDEX]], 2
+-; CHECK-NEXT:    [[TMP12:%.*]] = icmp eq i64 [[INDEX_NEXT]], [[N_VEC]]
+-; CHECK-NEXT:    br i1 [[TMP12]], label [[MIDDLE_BLOCK:%.*]], label [[VECTOR_BODY]], !llvm.loop [[LOOP0:![0-9]+]]
++; CHECK-NEXT:    [[PTR_IND]] = getelementptr i8, ptr [[POINTER_PHI]], i64 16
++; CHECK-NEXT:    [[TMP8:%.*]] = icmp eq i64 [[INDEX_NEXT]], [[N_VEC]]
++; CHECK-NEXT:    br i1 [[TMP8]], label [[MIDDLE_BLOCK:%.*]], label [[VECTOR_BODY]], !llvm.loop [[LOOP0:![0-9]+]]
+ ; CHECK:       middle.block:
+ ; CHECK-NEXT:    [[CMP_N:%.*]] = icmp eq i64 [[TMP3]], [[N_VEC]]
+ ; CHECK-NEXT:    br i1 [[CMP_N]], label [[EXIT:%.*]], label [[SCALAR_PH]]
+@@ -82,7 +78,7 @@ define void @store_pointer_induction(ptr %start, ptr %end) {
+ ; CHECK-NEXT:    store ptr [[IV]], ptr [[IV]], align 4
+ ; CHECK-NEXT:    [[IV_NEXT]] = getelementptr inbounds ptr, ptr [[IV]], i32 1
+ ; CHECK-NEXT:    [[EXITCOND:%.*]] = icmp eq ptr [[IV_NEXT]], [[END]]
+-; CHECK-NEXT:    br i1 [[EXITCOND]], label [[EXIT]], label [[LOOP]], !llvm.loop [[LOOP2:![0-9]+]]
++; CHECK-NEXT:    br i1 [[EXITCOND]], label [[EXIT]], label [[LOOP]], !llvm.loop [[LOOP3:![0-9]+]]
+ ; CHECK:       exit:
+ ; CHECK-NEXT:    ret void
+ ;
+-- 
+2.41.0
+
diff --git a/main/llvm16/9011-AArch64CompressJumpTables-prevent-over-compression.patch b/main/llvm16/9011-AArch64CompressJumpTables-prevent-over-compression.patch
new file mode 100644
index 00000000000..01c6a234353
--- /dev/null
+++ b/main/llvm16/9011-AArch64CompressJumpTables-prevent-over-compression.patch
@@ -0,0 +1,165 @@
+From 957e85ce449ab281fbbdc99c5546b928d5b2fb7b Mon Sep 17 00:00:00 2001
+From: Paul Walker <paul.walker@arm.com>
+Date: Tue, 6 Jun 2023 18:21:16 +0100
+Subject: [PATCH] [AArch64CompressJumpTables] Prevent over-compression caused
+ by invalid alignment.
+
+AArch64CompressJumpTables assumes it can calculate exact block
+offsets. This assumption is bogus because getInstSizeInBytes()
+only returns an upper bound rather than an exact size. The
+assumption is also invalid when a block alignment is bigger than
+the function's alignment.
+
+To mitigate both scenarios this patch changes the algorithm to
+compute the maximum upper bound for all block offsets. This is
+pessimistic but safe because all offsets are treated as unsigned.
+
+Differential Revision: https://reviews.llvm.org/D150009
+
+(cherry picked from commit 31c485c99024edf267b505070f87473fd397eb6a)
+---
+ .../AArch64/AArch64CompressJumpTables.cpp     | 17 ++--
+ .../CodeGen/AArch64/jump-table-compress.mir   | 85 +++++++++++++++++++
+ 2 files changed, 94 insertions(+), 8 deletions(-)
+
+diff --git a/llvm/lib/Target/AArch64/AArch64CompressJumpTables.cpp b/llvm/lib/Target/AArch64/AArch64CompressJumpTables.cpp
+index 75abe9c53e3b..7d14d2d20bad 100644
+--- a/llvm/lib/Target/AArch64/AArch64CompressJumpTables.cpp
++++ b/llvm/lib/Target/AArch64/AArch64CompressJumpTables.cpp
+@@ -37,7 +37,7 @@ class AArch64CompressJumpTables : public MachineFunctionPass {
+   MachineFunction *MF;
+   SmallVector<int, 8> BlockInfo;
+ 
+-  /// Returns the size in instructions of the block \p MBB, or std::nullopt if
++  /// Returns the size of instructions in the block \p MBB, or std::nullopt if
+   /// we couldn't get a safe upper bound.
+   std::optional<int> computeBlockSize(MachineBasicBlock &MBB);
+ 
+@@ -88,19 +88,20 @@ bool AArch64CompressJumpTables::scanFunction() {
+   BlockInfo.clear();
+   BlockInfo.resize(MF->getNumBlockIDs());
+ 
++  // NOTE: BlockSize, Offset, OffsetAfterAlignment are all upper bounds.
++
+   unsigned Offset = 0;
+   for (MachineBasicBlock &MBB : *MF) {
+     const Align Alignment = MBB.getAlignment();
+-    unsigned AlignedOffset;
+-    if (Alignment == Align(1))
+-      AlignedOffset = Offset;
+-    else
+-      AlignedOffset = alignTo(Offset, Alignment);
+-    BlockInfo[MBB.getNumber()] = AlignedOffset;
++    unsigned OffsetAfterAlignment = Offset;
++    // We don't know the exact size of MBB so assume worse case padding.
++    if (Alignment > Align(4))
++      OffsetAfterAlignment += Alignment.value() - 4;
++    BlockInfo[MBB.getNumber()] = OffsetAfterAlignment;
+     auto BlockSize = computeBlockSize(MBB);
+     if (!BlockSize)
+       return false;
+-    Offset = AlignedOffset + *BlockSize;
++    Offset = OffsetAfterAlignment + *BlockSize;
+   }
+   return true;
+ }
+diff --git a/llvm/test/CodeGen/AArch64/jump-table-compress.mir b/llvm/test/CodeGen/AArch64/jump-table-compress.mir
+index a46b7c6ac9c0..375357f4fd5c 100644
+--- a/llvm/test/CodeGen/AArch64/jump-table-compress.mir
++++ b/llvm/test/CodeGen/AArch64/jump-table-compress.mir
+@@ -5,6 +5,7 @@
+   }
+ 
+   define void @test_inline_asm_no_compress() { ret void }
++  define void @test_bb_alignment_not_byte_compressable() { ret void }
+ 
+ ...
+ ---
+@@ -197,3 +198,87 @@ body:             |
+     RET undef $lr, implicit $w0
+ 
+ ...
++---
++name:            test_bb_alignment_not_byte_compressable
++alignment:       4
++tracksRegLiveness: true
++liveins:
++  - { reg: '$w0' }
++  - { reg: '$w1' }
++  - { reg: '$w2' }
++frameInfo:
++  maxAlignment:    1
++  maxCallFrameSize: 0
++machineFunctionInfo:
++  hasRedZone:      false
++jumpTable:
++  kind:            label-difference32
++  entries:
++    - id:              0
++      blocks:          [ '%bb.2', '%bb.4', '%bb.5', '%bb.6', '%bb.7', '%bb.8' ]
++body:             |
++  bb.0:
++    successors: %bb.3(0x12492492), %bb.1(0x6db6db6e)
++    liveins: $w0, $w1, $w2
++
++    dead $wzr = SUBSWri renamable $w0, 5, 0, implicit-def $nzcv
++    Bcc 8, %bb.3, implicit $nzcv
++
++  bb.1:
++    successors: %bb.2, %bb.4, %bb.5, %bb.6, %bb.7, %bb.8
++    liveins: $w0, $w1, $w2
++    ; Ensure there's no jump table compression when block alignments are bigger
++    ; than the function alignment because we don't known the padding length at
++    ; the point where compression is done.
++    ; CHECK-LABEL: test_bb_alignment_not_byte_compressable
++    ; CHECK-LABEL: bb.1
++    ; CHECK: JumpTableDest16
++    renamable $w8 = ORRWrs $wzr, killed renamable $w0, 0, implicit-def $x8
++    $x9 = ADRP target-flags(aarch64-page) %jump-table.0
++    renamable $x9 = ADDXri $x9, target-flags(aarch64-pageoff, aarch64-nc) %jump-table.0, 0
++    early-clobber renamable $x10, dead early-clobber renamable $x11 = JumpTableDest32 killed renamable $x9, killed renamable $x8, %jump-table.0
++    BR killed renamable $x10
++
++  bb.2:
++    liveins: $w1, $w2
++    $w0 = ADDWrs killed renamable $w2, killed renamable $w1, 0
++    RET undef $lr, implicit $w0
++
++  bb.3:
++    $w0 = MOVZWi 0, 0
++    RET undef $lr, implicit $w0
++
++  bb.4:
++    liveins: $w1, $w2
++
++    renamable $w0 = nsw MADDWrrr killed renamable $w2, killed renamable $w1, $wzr
++    RET undef $lr, implicit $w0
++
++  ; bb.5 is aligned to make it more that 256 instructions away from bb.1, which
++  ; means we can no longer assume the jump table will be byte indexable.
++  bb.5 (align 1024):
++    liveins: $w1, $w2
++
++    $w0 = SUBWrs killed renamable $w1, killed renamable $w2, 0
++    RET undef $lr, implicit $w0
++
++  bb.6:
++    liveins: $w1, $w2
++
++    $w0 = SUBWrs killed renamable $w2, killed renamable $w1, 0
++    RET undef $lr, implicit $w0
++
++  bb.7:
++    liveins: $w1, $w2
++
++    renamable $w0 = MADDWrrr killed renamable $w1, renamable $w1, killed renamable $w2
++    RET undef $lr, implicit $w0
++
++  bb.8:
++    liveins: $w1, $w2
++
++    renamable $w8 = nsw MADDWrrr renamable $w2, renamable $w2, $wzr
++    renamable $w0 = MADDWrrr killed renamable $w8, killed renamable $w2, killed renamable $w1
++    RET undef $lr, implicit $w0
++
++...
diff --git a/main/llvm16/APKBUILD b/main/llvm16/APKBUILD
new file mode 100644
index 00000000000..26cc29992c7
--- /dev/null
+++ b/main/llvm16/APKBUILD
@@ -0,0 +1,362 @@
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
+# Contributor: Martell Malone <martell@marinelayer.io>
+# Contributor: Travis Tilley <ttilley@gmail.com>
+# Contributor: Mitch Tishmack <mitch.tishmack@gmail.com>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Contributor: Ariadne Conill <ariadne@dereferenced.org>
+# Contributor: omni <omni+alpine@hack.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+_pkgname=llvm
+pkgver=16.0.6
+_majorver=${pkgver%%.*}
+pkgname=$_pkgname$_majorver
+pkgrel=8
+pkgdesc="Low Level Virtual Machine compiler system, version $_majorver"
+arch="all"
+url="https://llvm.org/"
+license="Apache-2.0"
+depends_dev="$pkgname=$pkgver-r$pkgrel libffi-dev zlib-dev zstd-dev"
+# See https://gitlab.alpinelinux.org/alpine/aports/-/commit/51d2fba931fb2ef0046dea19405a9290c8735051#note_234651
+[ -z "$BOOTSTRAP" ] && depends_dev="$depends_dev $pkgname-test-utils=$pkgver-r$pkgrel"
+makedepends_host="$depends_dev binutils-dev libxml2-dev"
+makedepends_build="cmake chrpath python3 py3-setuptools samurai"
+# diffutils for diff: unrecognized option: strip-trailing-cr
+# coreutils for 'od' binary
+checkdepends="bash coreutils diffutils"
+subpackages="$pkgname-static $pkgname-libs $pkgname-linker-tools:linktools $pkgname-dev $pkgname-test-utils-pyc $pkgname-test-utils:_test_utils"
+source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-project-$pkgver.src.tar.xz
+	0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
+	allocscore.patch
+	fix-memory-mf_exec-on-aarch64.patch
+	install-prefix.patch
+	llvm-stack-size.patch
+	ppc64le-miscompile.patch
+	rust-feature-tables.patch
+	9001-CMake-Quote-variables-where-TARGET-may-be-a-value.patch
+	9002-LV-Convert-consecutive-ptr-uniforms.ll-to-use-opaque.patch
+	9003-LV-Add-test-where-pointer-is-incorrectly-marked-as-u.patch
+	9004-LV-Don-t-consider-pointer-as-uniform-if-it-is-also-s.patch
+	9011-AArch64CompressJumpTables-prevent-over-compression.patch
+	LoongArch-Assume-no-op-addrspacecasts-by-default.patch
+	"
+builddir="$srcdir/$_pkgname-project-$pkgver.src"
+
+# Whether is this package the default (latest) LLVM version.
+_default_llvm="no"
+
+# If crosscompiling, we need llvm-tblgen on the build machine.
+if [ "$CBUILD" != "$CHOST" ]; then
+	_llvm_tblgen="llvm-tblgen"
+	if [ "$_default_llvm" = no ]; then
+		_llvm_tblgen="llvm$_majorver-tblgen"
+	fi
+	makedepends_build="$makedepends_build cmd:$_llvm_tblgen"
+	cmake_cross_options="
+		-DCMAKE_CROSSCOMPILING=ON
+		-DLLVM_TABLEGEN=/usr/bin/$_llvm_tblgen
+	"
+fi
+
+if [ "$_default_llvm" = yes ]; then
+	provides="llvm=$pkgver-r$pkgrel"
+	replaces="llvm"
+fi
+
+# explicit override for previous version as well
+replaces="llvm15"
+
+# NOTE: It seems that there's no (sane) way how to change includedir, sharedir
+# etc. separately, just the CMAKE_INSTALL_PREFIX. Standard CMake variables and
+# even  LLVM-specific variables, that are related to these paths, actually
+# don't work (in llvm 3.7).
+#
+# When building a software that depends on LLVM, utility llvm-config should be
+# used to discover where is LLVM installed. It provides options to print
+# path of bindir, includedir, and libdir separately, but in its source, all
+# these paths are actually hard-coded against INSTALL_PREFIX. We can patch it
+# and move paths manually, but I'm really not sure what it may break...
+#
+# Also note that we should *not* add version suffix to files in llvm bindir!
+# It breaks build system of some software that depends on LLVM, because they
+# don't expect these files to have a sufix.
+#
+# So, we install all the LLVM files into /usr/lib/llvm$_majorver.
+# BTW, Fedora and Debian do the same thing.
+#
+_prefix="usr/lib/llvm$_majorver"
+
+prepare() {
+	default_prepare
+
+	cd llvm
+
+	# Known broken test on musl
+	rm -v test/CodeGen/AArch64/wineh4.mir
+	# https://github.com/llvm/llvm-project/issues/47657
+	rm -v test/ExecutionEngine/Interpreter/intrinsics.ll
+
+	case "$CARCH" in
+	x86)
+		rm -v test/Object/macho-invalid.test \
+			test/tools/llvm-size/radix.test \
+			unittests/Support/JSONTest.cpp
+		sed -i "/JSONTest.cpp/d" \
+			unittests/Support/CMakeLists.txt
+		;;
+	arm*)
+		rm -v test/tools/llvm-readobj/ELF/dependent-libraries.test \
+			test/Object/macho-invalid.test \
+			test/tools/llvm-size/radix.test \
+			test/tools/gold/X86/split-dwarf.ll \
+			test/ExecutionEngine/frem.ll \
+			test/tools/llvm-dwarfdump/X86/prettyprint_types.s \
+			test/tools/llvm-dwarfdump/X86/simplified-template-names.s \
+			unittests/ExecutionEngine/Orc/OrcCAPITest.cpp
+		sed -i "/OrcCAPITest.cpp/d" \
+			unittests/ExecutionEngine/Orc/CMakeLists.txt
+		;;
+	esac
+
+	# Known broken codegen for Hexagon target, reported upstream.
+	# https://github.com/llvm/llvm-project/issues/48936
+	rm -v \
+		test/CodeGen/Hexagon/csr-stubs-spill-threshold.ll \
+		test/CodeGen/Hexagon/long-calls.ll \
+		test/CodeGen/Hexagon/mlong-calls.ll \
+		test/CodeGen/Hexagon/pic-regusage.ll \
+		test/CodeGen/Hexagon/runtime-stkchk.ll \
+		test/CodeGen/Hexagon/swp-memrefs-epilog.ll \
+		test/CodeGen/Hexagon/vararg-formal.ll \
+		test/tools/llvm-objcopy/MachO/universal-object.test \
+		test/DebugInfo/X86/vla-multi.ll
+
+	# XXX: why does this fail for me locally
+	rm -v \
+		test/tools/yaml2obj/ELF/header-elfdatanone.yaml
+
+	# XXX: fail when built with gcc13
+	rm -v \
+		test/CodeGen/X86/vector-interleaved-load-i32-stride-4.ll \
+		test/Transforms/SampleProfile/pseudo-probe-update-2.ll \
+		test/Transforms/SampleProfile/pseudo-probe-update.ll \
+		test/Transforms/LoopUnroll/peel-branch-weights.ll
+}
+
+build() {
+	# Auto-detect it by guessing either.
+	local ffi_include_dir="$(pkg-config --cflags-only-I libffi | sed 's|^-I||g')"
+
+	# tries linking host libzstd in cross
+	if [ -n "$BOOTSTRAP" ]; then
+		local zstd=OFF
+	else
+		local zstd=ON
+	fi
+
+	# NOTE: DO NOT change CMAKE_BUILD_TYPE! Buildmodes like None will enable
+	# debug assertions for LLVM!
+	cmake -B build -G Ninja -Wno-dev -S llvm \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/$_prefix \
+		-DCMAKE_INSTALL_RPATH=/$_prefix \
+		\
+		-DLLVM_DEFAULT_TARGET_TRIPLE="$CBUILD" \
+		-DLLVM_HOST_TRIPLE="$CHOST" \
+		\
+		-DFFI_INCLUDE_DIR="$ffi_include_dir" \
+		-DLLVM_APPEND_VC_REV=OFF \
+		-DLLVM_BINUTILS_INCDIR=/usr/include \
+		-DLLVM_BUILD_DOCS=OFF \
+		-DLLVM_BUILD_EXAMPLES=OFF \
+		-DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \
+		-DLLVM_BUILD_LLVM_DYLIB=ON \
+		-DLLVM_BUILD_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DLLVM_ENABLE_ASSERTIONS=OFF \
+		-DLLVM_ENABLE_DUMP=ON \
+		-DLLVM_ENABLE_EH=ON \
+		-DLLVM_ENABLE_FFI=ON \
+		-DLLVM_ENABLE_LIBCXX=OFF \
+		-DLLVM_ENABLE_LIBEDIT=OFF \
+		-DLLVM_ENABLE_PIC=ON \
+		-DLLVM_ENABLE_RTTI=ON \
+		-DLLVM_ENABLE_SPHINX=OFF \
+		-DLLVM_ENABLE_TERMINFO=ON \
+		-DLLVM_ENABLE_ZLIB=ON \
+		-DLLVM_ENABLE_ZSTD=$zstd \
+		-DLLVM_INCLUDE_BENCHMARKS=OFF \
+		-DLLVM_INCLUDE_EXAMPLES=OFF \
+		-DLLVM_INSTALL_UTILS=ON \
+		-DLLVM_LINK_LLVM_DYLIB=ON \
+		-DLLVM_USE_PERF=ON \
+		$cmake_cross_options
+
+	cmake --build build
+
+	python3 llvm/utils/lit/setup.py build
+}
+
+check() {
+	LD_LIBRARY_PATH="$PWD/build/lib" \
+	ninja -C build check-llvm
+}
+
+package() {
+	depends="$pkgname-linker-tools=$pkgver-r$pkgrel"
+	DESTDIR="$pkgdir" cmake --install build
+	python3 llvm/utils/lit/setup.py install --root="$pkgdir"
+
+	cd "$pkgdir"/$_prefix
+
+	# Symlink files from /usr/lib/llvm*/bin to /usr/bin.
+	mkdir -p "$pkgdir"/usr/bin
+	local name newname path
+	for path in bin/*; do
+		name=${path##*/}
+		# Add version infix/suffix to the executable name.
+		case "$name" in
+			llvm-*) newname="llvm$_majorver-${name#llvm-}";;
+			*) newname="$name$_majorver";;
+		esac
+		# If this package provides=llvm (i.e. it's the default/latest
+		# llvm package), omit version infix/suffix.
+		if [ "$_default_llvm" = yes ]; then
+			newname=$name
+		fi
+		case "$name" in
+			FileCheck | obj2yaml | yaml2obj) continue;;
+		esac
+		ln -s ../lib/llvm$_majorver/bin/$name "$pkgdir"/usr/bin/$newname
+	done
+
+	mkdir -p "$pkgdir"/usr/include "$pkgdir"/usr/lib/cmake
+
+	# symlink include to /usr/include/llvm$_llvmver
+	ln -sfv ../lib/$pkgname/include "$pkgdir"/usr/include/$pkgname
+
+	# symlink cmake dir to system cmake
+	ln -sfv ../$pkgname/lib/cmake/llvm "$pkgdir"/usr/lib/cmake/$pkgname
+}
+
+static() {
+	pkgdesc="LLVM $_majorver static libraries"
+	depends=""
+	_common_subpkg
+
+	_mv "$pkgdir"/$_prefix/lib/*.a "$subpkgdir"/$_prefix/lib/
+}
+
+libs() {
+	pkgdesc="LLVM $_majorver runtime library"
+	depends=""
+	local soname="libLLVM-$_majorver.so"
+	local soname2="libLLVM-$pkgver.so"
+
+	mkdir -p "$subpkgdir"
+	cd "$subpkgdir"
+
+	# libLLVM should be in /usr/lib. This is needed for binaries that are
+	# dynamically linked with libLLVM, so they can find it on default path.
+	_mv "$pkgdir"/$_prefix/lib/$soname usr/lib/
+	ln -s $soname usr/lib/$soname2
+
+	# And also symlink it back to the LLVM prefix.
+	mkdir -p $_prefix/lib
+	ln -s ../../$soname $_prefix/lib/$soname
+	ln -s ../../$soname $_prefix/lib/$soname2
+}
+
+linktools() {
+	_common_subpkg
+	pkgdesc="$pkgdesc (linker plugins)"
+
+	amove \
+		$_prefix/lib/libLTO.so* \
+		$_prefix/lib/LLVMgold* \
+
+	if [ "$_default_llvm" = yes ]; then
+		ln -sfv llvm$_majorver/lib/LLVMgold.so "$subpkgdir"/usr/lib/
+		ln -sfv llvm$_majorver/lib/libLTO.so "$subpkgdir"/usr/lib/
+
+		# for bfd to work with clang -flto, you need to put the linker plugin in the bfd dir too,
+		# not just usr/lib.
+		mkdir -p "$subpkgdir"/usr/lib/bfd-plugins/
+		ln -sfv ../llvm$_majorver/lib/LLVMgold.so "$subpkgdir"/usr/lib/bfd-plugins/
+	fi
+}
+
+dev() {
+	_common_subpkg
+	default_dev
+	cd "$subpkgdir"
+
+	amove \
+		$_prefix/lib \
+		$_prefix/bin/llvm-config
+
+	if [ "$_default_llvm" = yes ]; then
+		ln -sf llvm$_majorver usr/lib/cmake/llvm
+		ln -sf llvm$_majorver/lib/LLVMgold.so "$pkgdir"/usr/lib/
+		ln -sf llvm$_majorver/lib/libLTO.so "$pkgdir"/usr/lib/
+	fi
+
+	# also add a suffix-version variant of llvm-config, as that's what things normally check for
+	mkdir -p "$subpkgdir"/usr/bin/
+	ln -sfv ../lib/llvm$_majorver/bin/llvm-config "$subpkgdir"/usr/bin/llvm-config-$_majorver
+}
+
+_test_utils() {
+	pkgdesc="LLVM $_majorver utilities for executing LLVM and Clang style test suites"
+	depends="python3"
+	_common_subpkg
+
+	local litver=$(python3 "$builddir"/llvm/utils/lit/setup.py --version 2>/dev/null \
+		| sed 's/\.dev.*$//')
+	test -n "$litver"
+	provides="$provides lit=$litver-r$pkgrel"
+
+	amove usr/lib/$pkgname/bin/FileCheck \
+		usr/lib/$pkgname/bin/count \
+		usr/lib/$pkgname/bin/not \
+		usr/lib/python* \
+		usr/bin/lit
+
+	mv "$subpkgdir"/usr/bin/lit "$subpkgdir"/$_prefix/bin/lit
+	ln -s lit "$subpkgdir"/$_prefix/bin/llvm-lit
+
+	if [ "$_default_llvm" = yes ]; then
+		amove usr/bin/count usr/bin/not
+		ln -s ../lib/llvm$_majorver/bin/lit "$subpkgdir"/usr/bin/lit
+	else
+		amove usr/bin/count$_majorver usr/bin/not$_majorver
+	fi
+}
+
+_common_subpkg() {
+	if [ "$_default_llvm" = yes ]; then
+		replaces="llvm${subpkgname#"$pkgname"} llvm15${subpkgname#"$pkgname"}"
+		provides="llvm${subpkgname#"$pkgname"}=$pkgver-r$pkgrel"
+	fi
+}
+
+_mv() {
+	local dest; for dest; do true; done  # get last argument
+	mkdir -p "$dest"
+	mv "$@"
+}
+
+sha512sums="
+89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7  llvm-project-16.0.6.src.tar.xz
+84ed6b165445d0cdb59daa59f612a7d960bf67b13a1b19bdd2a19d46548013e756faca6b8249cb6c60354f3a9aaef46652e5f531944c71294e46d2f7bfd8b832  0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
+ef63d5e01440cff65c10b84b65099bbd539bae72065d5581a8d2409cf2d0d4410d5bb3f501273ab29ee65bf8f5d23653a074428c2711ff9209324de56b857f3f  allocscore.patch
+1826a6877d0c9e93c2d6ce0b4f83fe1118b9449f82f1919b37be5fc6d7c11ae22e0c02a7d3e6e23ce41bbb07df2ff08124aa9172e254ef2b12ecbc80d9a674a9  fix-memory-mf_exec-on-aarch64.patch
+ebc0be314c129ef38f00c8c2be9d589658cae89ac8cda109e35933b5044e775a3d370c0c584d3e501e4d43167b8523d8c5e5a85653d8ebe853571697ae40fb35  install-prefix.patch
+2123f01d8075a15cf8c2d8091fc8c92cb99807b1d654af13b436690ddb55f3e893a494593b3c92aeab26e50db4e0500ac688129ab6bc11e4765c0308b90db101  llvm-stack-size.patch
+f0d7262981ef94a7d08b69f732e69f0c7a76690b1b89442ef0ab17d5d3bb5bcc52ecb4ab8eae00cb710e142e1f8988d5d0e512d18aac6e215fc793cb52d11eb7  ppc64le-miscompile.patch
+84d2cc5c0376d8a8a2bbc0891849c9421feaea5b38a329aecdb822c136f7ded7ab4c3b87838d8915e6eb54cfe89f3e88f3b81ae98733e9a58d935be74a3c456c  rust-feature-tables.patch
+0783b831b9cde1a41a731d9d4414dbe396e138d5d4ba76bfc20c31cb054cc66daa5a74edb1bbbe401b0fde349e8bba05978470ccbc4c39cbaf03daff2b72d68b  9001-CMake-Quote-variables-where-TARGET-may-be-a-value.patch
+ed07e007536bd9be62098123bee69e19569084d8070a6582b2a55c951d394239c1d2e9d93238a1a4a1575f75161c6d92f9aba6907835d469ff94817d40d9421b  9002-LV-Convert-consecutive-ptr-uniforms.ll-to-use-opaque.patch
+92284100281c3384de1d5aa859feed418e5c94cdb9eeb4c8b3286095d0524023d50359648c2bbc547b2c2b8ce3629faed34472190d5d313e3ed746a05db2f73c  9003-LV-Add-test-where-pointer-is-incorrectly-marked-as-u.patch
+2b5ee9088124f9cbea08943392027f525f981b788e60606067c0731caed08ae8f946eed5844f1b23c94a765ed1397951d3080c7a249dc9a8341d4eedbb60544b  9004-LV-Don-t-consider-pointer-as-uniform-if-it-is-also-s.patch
+6881a8a49e12f2d168ffac188dbc8beca04756e28856591b71dd7e8695b633e54341d9b7b3c9858106b6917d80a3d4dae24442b323488b73edf2c301254fb52a  9011-AArch64CompressJumpTables-prevent-over-compression.patch
+f84c89577225c8c9c7feefe7e0ee446834421c4e222069800bac425d21699393330f29b5567e4e8ef2ee9925b5de89b67fa31abddcf930f7abe03b9403cb6968  LoongArch-Assume-no-op-addrspacecasts-by-default.patch
+"
diff --git a/main/llvm16/LoongArch-Assume-no-op-addrspacecasts-by-default.patch b/main/llvm16/LoongArch-Assume-no-op-addrspacecasts-by-default.patch
new file mode 100644
index 00000000000..ee912eb1e10
--- /dev/null
+++ b/main/llvm16/LoongArch-Assume-no-op-addrspacecasts-by-default.patch
@@ -0,0 +1,84 @@
+From 525b1a631e3d858df1cf5e9e64dace666dc851bb Mon Sep 17 00:00:00 2001
+From: WANG Rui <wangrui@loongson.cn>
+Date: Tue, 20 Feb 2024 17:41:36 +0800
+Subject: [PATCH] [LoongArch] Assume no-op addrspacecasts by default
+
+Fixes #82330
+---
+ .../Target/LoongArch/LoongArchTargetMachine.h |  5 ++
+ llvm/test/CodeGen/LoongArch/addrspacecast.ll  | 47 +++++++++++++++++++
+ 2 files changed, 52 insertions(+)
+ create mode 100644 llvm/test/CodeGen/LoongArch/addrspacecast.ll
+
+diff --git a/llvm/lib/Target/LoongArch/LoongArchTargetMachine.h b/llvm/lib/Target/LoongArch/LoongArchTargetMachine.h
+index 7d39d47e86b3..fa9bc7608e7d 100644
+--- a/llvm/lib/Target/LoongArch/LoongArchTargetMachine.h
++++ b/llvm/lib/Target/LoongArch/LoongArchTargetMachine.h
+@@ -45,6 +45,11 @@ public:
+   MachineFunctionInfo *
+   createMachineFunctionInfo(BumpPtrAllocator &Allocator, const Function &F,
+                             const TargetSubtargetInfo *STI) const override;
++
++  // Addrspacecasts are always noops.
++  bool isNoopAddrSpaceCast(unsigned SrcAS, unsigned DestAS) const override {
++    return true;
++  }
+ };
+ 
+ } // end namespace llvm
+diff --git a/llvm/test/CodeGen/LoongArch/addrspacecast.ll b/llvm/test/CodeGen/LoongArch/addrspacecast.ll
+new file mode 100644
+index 000000000000..2b90f32d0297
+--- /dev/null
++++ b/llvm/test/CodeGen/LoongArch/addrspacecast.ll
+@@ -0,0 +1,47 @@
++; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
++; RUN: llc -mtriple=loongarch32 -verify-machineinstrs < %s | FileCheck %s --check-prefix=LA32
++; RUN: llc -mtriple=loongarch64 -verify-machineinstrs < %s | FileCheck %s --check-prefix=LA64
++
++define void @cast0(ptr addrspace(1) %ptr) {
++; LA32-LABEL: cast0:
++; LA32:       # %bb.0:
++; LA32-NEXT:    st.w $zero, $a0, 0
++; LA32-NEXT:    ret
++;
++; LA64-LABEL: cast0:
++; LA64:       # %bb.0:
++; LA64-NEXT:    st.w $zero, $a0, 0
++; LA64-NEXT:    ret
++  %ptr0 = addrspacecast ptr addrspace(1) %ptr to ptr addrspace(0)
++  store i32 0, ptr %ptr0
++  ret void
++}
++
++define void @cast1(ptr %ptr) {
++; LA32-LABEL: cast1:
++; LA32:       # %bb.0:
++; LA32-NEXT:    addi.w $sp, $sp, -16
++; LA32-NEXT:    .cfi_def_cfa_offset 16
++; LA32-NEXT:    st.w $ra, $sp, 12 # 4-byte Folded Spill
++; LA32-NEXT:    .cfi_offset 1, -4
++; LA32-NEXT:    bl %plt(foo)
++; LA32-NEXT:    ld.w $ra, $sp, 12 # 4-byte Folded Reload
++; LA32-NEXT:    addi.w $sp, $sp, 16
++; LA32-NEXT:    ret
++;
++; LA64-LABEL: cast1:
++; LA64:       # %bb.0:
++; LA64-NEXT:    addi.d $sp, $sp, -16
++; LA64-NEXT:    .cfi_def_cfa_offset 16
++; LA64-NEXT:    st.d $ra, $sp, 8 # 8-byte Folded Spill
++; LA64-NEXT:    .cfi_offset 1, -8
++; LA64-NEXT:    bl %plt(foo)
++; LA64-NEXT:    ld.d $ra, $sp, 8 # 8-byte Folded Reload
++; LA64-NEXT:    addi.d $sp, $sp, 16
++; LA64-NEXT:    ret
++  %castptr = addrspacecast ptr %ptr to ptr addrspace(10)
++  call void @foo(ptr addrspace(10) %castptr)
++  ret void
++}
++
++declare void @foo(ptr addrspace(10))
+-- 
+2.27.0
+
diff --git a/main/llvm16/allocscore.patch b/main/llvm16/allocscore.patch
new file mode 100644
index 00000000000..5421c6b1ae8
--- /dev/null
+++ b/main/llvm16/allocscore.patch
@@ -0,0 +1,20 @@
+on x86, this fails with a float comparison error even though the floats are the
+same, because it does absolute eq
+--
+--- a/llvm/unittests/CodeGen/RegAllocScoreTest.cpp
++++ b/llvm/unittests/CodeGen/RegAllocScoreTest.cpp
+@@ -172,14 +172,5 @@
+   ASSERT_EQ(Freq2, TotalScore.loadStoreCounts());
+   ASSERT_EQ(Freq1, TotalScore.cheapRematCounts());
+   ASSERT_EQ(Freq2, TotalScore.expensiveRematCounts());
+-  ASSERT_EQ(TotalScore.getScore(),
+-            TotalScore.copyCounts() * CopyWeight +
+-                TotalScore.loadCounts() * LoadWeight +
+-                TotalScore.storeCounts() * StoreWeight +
+-                TotalScore.loadStoreCounts() * (LoadWeight + StoreWeight) +
+-                TotalScore.cheapRematCounts() * CheapRematWeight +
+-                TotalScore.expensiveRematCounts() * ExpensiveRematWeight
+-
+-  );
+ }
+ } // end namespace
diff --git a/main/llvm16/fix-memory-mf_exec-on-aarch64.patch b/main/llvm16/fix-memory-mf_exec-on-aarch64.patch
new file mode 100644
index 00000000000..6e0e0fcb69d
--- /dev/null
+++ b/main/llvm16/fix-memory-mf_exec-on-aarch64.patch
@@ -0,0 +1,27 @@
+Fix failures in AllocationTests/MappedMemoryTest.* on aarch64:
+
+    Failing Tests (8):
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.AllocAndRelease/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.DuplicateNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.EnabledWrite/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.MultipleAllocAndRelease/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.SuccessiveNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.UnalignedNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroSizeNear/3
+
+Upstream-Issue: https://bugs.llvm.org/show_bug.cgi?id=14278#c10
+
+diff --git a/llvm/lib/Support/Unix/Memory.inc b/llvm/lib/Support/Unix/Memory.inc
+index 4c8f6b2ea..6cddae13b 100644
+--- a/llvm/lib/Support/Unix/Memory.inc
++++ b/llvm/lib/Support/Unix/Memory.inc
+@@ -50,7 +50,7 @@ static int getPosixProtectionFlags(unsigned Flags) {
+       llvm::sys::Memory::MF_EXEC:
+     return PROT_READ | PROT_WRITE | PROT_EXEC;
+   case llvm::sys::Memory::MF_EXEC:
+-#if defined(__FreeBSD__) || defined(__powerpc__)
++#if defined(__FreeBSD__) || defined(__powerpc__) || (defined(__linux__) && defined(__aarch64__))
+     // On PowerPC, having an executable page that has no read permission
+     // can have unintended consequences.  The function InvalidateInstruction-
+     // Cache uses instructions dcbf and icbi, both of which are treated by
diff --git a/main/llvm16/install-prefix.patch b/main/llvm16/install-prefix.patch
new file mode 100644
index 00000000000..90f6c3e62d2
--- /dev/null
+++ b/main/llvm16/install-prefix.patch
@@ -0,0 +1,31 @@
+starting from llvm14 the install prefix breaks via symlinks;
+/usr/lib/llvm14/lib/cmake/llvm/LLVMConfig.cmake goes up 3 directories to find
+/usr/lib/llvm14/include as LLVM_INCLUDE_DIRS, but to even use this cmake folder
+at all it has to be symlinked to /usr/lib/cmake/llvm .. so the directory it
+instead uses is just /usr/include, which is not where the cmake includes are.
+this hardcodes them to the install prefix we pass via cmake, which should
+always be correct, and what cmake tries to autodetect anyway.
+
+also see: https://reviews.llvm.org/D29969
+
+this is supposedly fixed now, but for some reason it still isn't
+--- a/llvm/cmake/modules/CMakeLists.txt
++++ b/llvm/cmake/modules/CMakeLists.txt
+@@ -41,6 +41,8 @@
+ #
+ 
+ set(LLVM_CONFIG_CODE "
++# this is wrong when automatically detected
++set(LLVM_INSTALL_PREFIX \"${CMAKE_INSTALL_PREFIX}\")
+ # LLVM_BUILD_* values available only from LLVM build tree.
+ set(LLVM_BUILD_BINARY_DIR \"${LLVM_BINARY_DIR}\")
+ set(LLVM_BUILD_LIBRARY_DIR \"${LLVM_LIBRARY_DIR}\")
+@@ -109,8 +111,6 @@
+ #
+ # Generate LLVMConfig.cmake for the install tree.
+ #
+-
+-find_prefix_from_config(LLVM_CONFIG_CODE LLVM_INSTALL_PREFIX "${LLVM_INSTALL_PACKAGE_DIR}")
+ 
+ extend_path(LLVM_CONFIG_MAIN_INCLUDE_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_INCLUDEDIR}")
+ # This is the same as the above because the handwritten and generated headers
diff --git a/main/llvm16/llvm-stack-size.patch b/main/llvm16/llvm-stack-size.patch
new file mode 100644
index 00000000000..0a053154242
--- /dev/null
+++ b/main/llvm16/llvm-stack-size.patch
@@ -0,0 +1,23 @@
+Patch-Source: https://github.com/chimera-linux/cports/blob/8c0359f31b9d888e59ced0320e93ca8ad79ba1f9/main/llvm/patches/0010-always-set-a-larger-stack-size-explicitly.patch
+From 18e09846d9333b554e3dfbbd768ada6643bf92c0 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Sat, 27 Nov 2021 01:03:28 +0100
+Subject: [PATCH 10/22] always set a larger stack size explicitly
+
+---
+ llvm/lib/Support/Threading.cpp | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/llvm/lib/Support/Threading.cpp b/llvm/lib/Support/Threading.cpp
+index 923935bbc..26594aac8 100644
+--- a/llvm/lib/Support/Threading.cpp
++++ b/llvm/lib/Support/Threading.cpp
+@@ -77,7 +77,7 @@ unsigned llvm::ThreadPoolStrategy::compute_thread_count() const {
+ // keyword.
+ #include "llvm/Support/thread.h"
+ 
+-#if defined(__APPLE__)
++#if 1
+   // Darwin's default stack size for threads except the main one is only 512KB,
+   // which is not enough for some/many normal LLVM compilations. This implements
+   // the same interface as std::thread but requests the same stack size as the
diff --git a/main/llvm16/ppc64le-miscompile.patch b/main/llvm16/ppc64le-miscompile.patch
new file mode 100644
index 00000000000..e98fc2841cd
--- /dev/null
+++ b/main/llvm16/ppc64le-miscompile.patch
@@ -0,0 +1,81 @@
+Patch-Source: https://github.com/llvm/llvm-project/commit/398d68f624d667a17727d346a2139a951a1ebce4
+--
+From 398d68f624d667a17727d346a2139a951a1ebce4 Mon Sep 17 00:00:00 2001
+From: Fangrui Song <i@maskray.me>
+Date: Mon, 24 Apr 2023 10:02:06 -0700
+Subject: [PATCH] [PPCMIPeephole] Fix incorrect compare elimination
+
+D38236 moves a redundant compare instruction from the loop body to the
+preheader.
+
+It has a bug: when `MBB1 == &MBB2`, there may be only one compare instruction in the
+loop. The code will lift the compare instruction to the preheader, failing to
+account for the change of the compare result in a tail call, leading to a miscompile.
+
+Suppress the compare elimination to fix https://github.com/llvm/llvm-project/issues/62294
+
+Reviewed By: #powerpc, nemanjai
+
+Differential Revision: https://reviews.llvm.org/D149030
+---
+ llvm/lib/Target/PowerPC/PPCMIPeephole.cpp    |  5 ++++-
+ llvm/test/CodeGen/PowerPC/cmp_elimination.ll | 23 ++++++++++++++++++++
+ 2 files changed, 27 insertions(+), 1 deletion(-)
+
+diff --git a/llvm/lib/Target/PowerPC/PPCMIPeephole.cpp b/llvm/lib/Target/PowerPC/PPCMIPeephole.cpp
+index b9cb0a29a9511..f1d1d2f3757f6 100644
+--- a/llvm/lib/Target/PowerPC/PPCMIPeephole.cpp
++++ b/llvm/lib/Target/PowerPC/PPCMIPeephole.cpp
+@@ -1315,7 +1315,7 @@ static bool eligibleForCompareElimination(MachineBasicBlock &MBB,
+     if (isEligibleBB(*Pred1MBB) && isEligibleForMoveCmp(*Pred2MBB)) {
+       // We assume Pred1MBB is the BB containing the compare to be merged and
+       // Pred2MBB is the BB to which we will append a compare instruction.
+-      // Hence we can proceed as is.
++      // Proceed as is if Pred1MBB is different from MBB.
+     }
+     else if (isEligibleBB(*Pred2MBB) && isEligibleForMoveCmp(*Pred1MBB)) {
+       // We need to swap Pred1MBB and Pred2MBB to canonicalize.
+@@ -1323,6 +1323,9 @@ static bool eligibleForCompareElimination(MachineBasicBlock &MBB,
+     }
+     else return false;
+ 
++    if (Pred1MBB == &MBB)
++      return false;
++
+     // Here, Pred2MBB is the BB to which we need to append a compare inst.
+     // We cannot move the compare instruction if operands are not available
+     // in Pred2MBB (i.e. defined in MBB by an instruction other than PHI).
+diff --git a/llvm/test/CodeGen/PowerPC/cmp_elimination.ll b/llvm/test/CodeGen/PowerPC/cmp_elimination.ll
+index 56af49f0c267e..871cc5df1f5fb 100644
+--- a/llvm/test/CodeGen/PowerPC/cmp_elimination.ll
++++ b/llvm/test/CodeGen/PowerPC/cmp_elimination.ll
+@@ -779,6 +779,29 @@ if.end3:
+   ret void
+ }
+ 
++;; The result of %cmp may change in a tail call. Don't lift %cmp to the entry block.
++; CHECK-LABEL: func_tailrecurse:
++; CHECK-NOT:     cmp
++; CHECK:       .LBB{{.*}}:
++; CHECK:         cmplw
++; CHECK:         blt
++define fastcc zeroext i32 @func_tailrecurse(i32 zeroext %a, i32 zeroext %b) {
++entry:
++  br label %tailrecurse
++
++tailrecurse:                                      ; preds = %tailrecurse, %entry
++  %a.tr = phi i32 [ %a, %entry ], [ %b.tr, %tailrecurse ]
++  %b.tr = phi i32 [ %b, %entry ], [ %a.tr, %tailrecurse ]
++  %cmp = icmp ult i32 %a.tr, %b.tr
++  %conv = zext i1 %cmp to i32
++  %ignore = call signext i32 (i32) @func(i32 %conv)
++  br i1 %cmp, label %tailrecurse, label %if.end
++
++if.end:                                           ; preds = %tailrecurse
++  %sub = sub nsw i32 %a.tr, %b.tr
++  ret i32 %sub
++}
++
+ declare void @dummy1()
+ declare void @dummy2()
+ declare void @dummy3()
diff --git a/main/llvm16/rust-feature-tables.patch b/main/llvm16/rust-feature-tables.patch
new file mode 100644
index 00000000000..2068d51f2b9
--- /dev/null
+++ b/main/llvm16/rust-feature-tables.patch
@@ -0,0 +1,31 @@
+Patch-Source: https://github.com/rust-lang/llvm-project/commit/0a157fd7a5f61973ffddf96b3d445a718193eb1a
+From 0a157fd7a5f61973ffddf96b3d445a718193eb1a Mon Sep 17 00:00:00 2001
+From: Cameron Hart <cameron.hart@gmail.com>
+Date: Sun, 10 Jul 2016 23:55:53 +1000
+Subject: [PATCH] [rust] Add accessors for MCSubtargetInfo CPU and Feature
+ tables
+
+This is needed for `-C target-cpu=help` and `-C target-feature=help` in rustc
+---
+ llvm/include/llvm/MC/MCSubtargetInfo.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/llvm/include/llvm/MC/MCSubtargetInfo.h b/llvm/include/llvm/MC/MCSubtargetInfo.h
+index e1f0a86141e36..1e529bf4fb31e 100644
+--- a/llvm/include/llvm/MC/MCSubtargetInfo.h
++++ b/llvm/include/llvm/MC/MCSubtargetInfo.h
+@@ -230,6 +230,14 @@ class MCSubtargetInfo {
+     return Found != ProcDesc.end() && StringRef(Found->Key) == CPU;
+   }
+ 
++  ArrayRef<SubtargetSubTypeKV> getCPUTable() const {
++    return ProcDesc;
++  }
++
++  ArrayRef<SubtargetFeatureKV> getFeatureTable() const {
++    return ProcFeatures;
++  }
++
+   virtual unsigned getHwMode() const { return 0; }
+ 
+   /// Return the cache size in bytes for the given level of cache.
diff --git a/main/llvm17/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch b/main/llvm17/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
new file mode 100644
index 00000000000..e0cb43a2257
--- /dev/null
+++ b/main/llvm17/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
@@ -0,0 +1,22 @@
+From f8e83c4c7866ae830abe9bec15cfe805dd825b6e Mon Sep 17 00:00:00 2001
+From: xentec <xentec@aix0.eu>
+Date: Tue, 12 Sep 2017 07:18:38 +0200
+Subject: [PATCH] Disable dynamic lib tests for musl's dlclose() is noop
+
+---
+ unittests/Support/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/unittests/Support/CMakeLists.txt b/unittests/Support/CMakeLists.txt
+index 641163e..4f508d9 100644
+--- a/llvm/unittests/Support/CMakeLists.txt
++++ b/llvm/unittests/Support/CMakeLists.txt
+@@ -124,5 +124,5 @@
+ 
+ if(NOT LLVM_INTEGRATED_CRT_ALLOC)
+   # The test doesn't pass when using a custom allocator, PR47881.
+-  add_subdirectory(DynamicLibrary)
++  # add_subdirectory(DynamicLibrary)
+ endif()
+
+
diff --git a/main/llvm17/0001-Revert-Pseudo-Probe-Make-.pseudo_probe-GC-able.patch b/main/llvm17/0001-Revert-Pseudo-Probe-Make-.pseudo_probe-GC-able.patch
new file mode 100644
index 00000000000..65891bcf577
--- /dev/null
+++ b/main/llvm17/0001-Revert-Pseudo-Probe-Make-.pseudo_probe-GC-able.patch
@@ -0,0 +1,132 @@
+From 2ddc4203c63972ec58b6118a6c55b0c7e0e087c0 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 27 Sep 2023 09:07:58 +0200
+Subject: [PATCH] Revert "[Pseudo Probe] Make .pseudo_probe GC-able"
+
+This reverts commit 62d861422317b3e94a97706f07e8f1abce9a8135.
+
+ref: https://github.com/llvm/llvm-project/issues/66776#issuecomment-1737051566
+---
+ llvm/lib/MC/MCObjectFileInfo.cpp              | 24 ++++-----
+ .../SampleProfile/pseudo-probe-emit.ll        | 54 ++-----------------
+ 2 files changed, 16 insertions(+), 62 deletions(-)
+
+diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp
+index 0b5109e41e71..7911e0c8c381 100644
+--- a/llvm/lib/MC/MCObjectFileInfo.cpp
++++ b/llvm/lib/MC/MCObjectFileInfo.cpp
+@@ -1172,20 +1172,18 @@ MCObjectFileInfo::getKCFITrapSection(const MCSection &TextSec) const {
+ 
+ MCSection *
+ MCObjectFileInfo::getPseudoProbeSection(const MCSection &TextSec) const {
+-  if (Ctx->getObjectFileType() != MCContext::IsELF)
+-    return PseudoProbeSection;
+-
+-  const auto &ElfSec = static_cast<const MCSectionELF &>(TextSec);
+-  unsigned Flags = ELF::SHF_LINK_ORDER;
+-  StringRef GroupName;
+-  if (const MCSymbol *Group = ElfSec.getGroup()) {
+-    GroupName = Group->getName();
+-    Flags |= ELF::SHF_GROUP;
++  if (Ctx->getObjectFileType() == MCContext::IsELF) {
++    const auto &ElfSec = static_cast<const MCSectionELF &>(TextSec);
++    // Create a separate section for probes that comes with a comdat function.
++    if (const MCSymbol *Group = ElfSec.getGroup()) {
++      auto *S = static_cast<MCSectionELF *>(PseudoProbeSection);
++      auto Flags = S->getFlags() | ELF::SHF_GROUP;
++      return Ctx->getELFSection(S->getName(), S->getType(), Flags,
++                                S->getEntrySize(), Group->getName(),
++                                /*IsComdat=*/true);
++    }
+   }
+-
+-  return Ctx->getELFSection(PseudoProbeSection->getName(), ELF::SHT_PROGBITS,
+-                            Flags, 0, GroupName, true, ElfSec.getUniqueID(),
+-                            cast<MCSymbolELF>(TextSec.getBeginSymbol()));
++  return PseudoProbeSection;
+ }
+ 
+ MCSection *
+diff --git a/llvm/test/Transforms/SampleProfile/pseudo-probe-emit.ll b/llvm/test/Transforms/SampleProfile/pseudo-probe-emit.ll
+index 13cfd820ae82..e56431b5abd1 100644
+--- a/llvm/test/Transforms/SampleProfile/pseudo-probe-emit.ll
++++ b/llvm/test/Transforms/SampleProfile/pseudo-probe-emit.ll
+@@ -5,12 +5,9 @@
+ ; RUN: llc %t -function-sections -filetype=asm -o %t1
+ ; RUN: FileCheck %s < %t1 --check-prefix=CHECK-ASM
+ ; RUN: llc %t -function-sections -filetype=obj -o %t2
+-; RUN: llvm-readelf -S -g %t2 | FileCheck %s --check-prefix=CHECK-SEC
++; RUN: llvm-objdump --section-headers  %t2 | FileCheck %s --check-prefix=CHECK-OBJ
+ ; RUN: llvm-mc %t1 -filetype=obj -o %t3
+-; RUN: llvm-readelf -S -g %t3 | FileCheck %s --check-prefix=CHECK-SEC
+-
+-; RUN: llc %t -function-sections -unique-section-names=0 -filetype=obj -o %t4
+-; RUN: llvm-readelf -S %t4 | FileCheck %s --check-prefix=CHECK-SEC2
++; RUN: llvm-objdump --section-headers  %t3 | FileCheck %s --check-prefix=CHECK-OBJ
+ 
+ ;; Check the generation of pseudoprobe intrinsic call.
+ 
+@@ -69,13 +66,6 @@ entry:
+   ret void
+ }
+ 
+-$foo3 = comdat any
+-
+-define void @foo3(i32 %x) comdat {
+-entry:
+-  ret void
+-}
+-
+ ; CHECK-IL: Function Attrs: nocallback nofree nosync nounwind willreturn memory(inaccessiblemem: readwrite)
+ ; CHECK-IL-NEXT: declare void @llvm.pseudoprobe(i64, i64, i32, i64)
+ 
+@@ -104,43 +94,9 @@ entry:
+ ; CHECK-ASM-NEXT: .byte 4
+ ; CHECK-ASM-NEXT: .ascii	"foo2"
+ 
+-; CHECK-SEC:       [Nr] Name               Type     {{.*}} ES Flg Lk Inf Al
+-; CHECK-SEC:       [ 3] .text.foo          PROGBITS {{.*}} 00  AX  0   0 16
+-; CHECK-SEC:       [ 5] .text.foo2         PROGBITS {{.*}} 00  AX  0   0 16
+-; CHECK-SEC:       [ 8] .text.foo3         PROGBITS {{.*}} 00  AXG 0   0 16
+-; CHECK-SEC-COUNT-3:    .pseudo_probe_desc PROGBITS
+-; CHECK-SEC:            .pseudo_probe      PROGBITS {{.*}} 00   L  3   0  1
+-; CHECK-SEC-NEXT:       .pseudo_probe      PROGBITS {{.*}} 00   L  5   0  1
+-; CHECK-SEC-NEXT:       .pseudo_probe      PROGBITS {{.*}} 00   LG 8   0  1
+-; CHECK-SEC-NOT:   .rela.pseudo_probe
+-
+-; CHECK-SEC:       COMDAT group section [    7] `.group' [foo3] contains 2 sections:
+-; CHECK-SEC-NEXT:     [Index]    Name
+-; CHECK-SEC-NEXT:     [    8]   .text.foo3
+-; CHECK-SEC-NEXT:     [   21]   .pseudo_probe
+-; CHECK-SEC-EMPTY:
+-; CHECK-SEC-NEXT:  COMDAT group section [   10] `.group' [.pseudo_probe_desc_foo] contains 1 sections:
+-; CHECK-SEC-NEXT:     [Index]    Name
+-; CHECK-SEC-NEXT:     [   11]   .pseudo_probe_desc
+-; CHECK-SEC-EMPTY:
+-; CHECK-SEC-NEXT:  COMDAT group section [   12] `.group' [.pseudo_probe_desc_foo2] contains 1 sections:
+-; CHECK-SEC-NEXT:     [Index]    Name
+-; CHECK-SEC-NEXT:     [   13]   .pseudo_probe_desc
+-; CHECK-SEC-EMPTY:
+-; CHECK-SEC-NEXT:  COMDAT group section [   14] `.group' [.pseudo_probe_desc_foo3] contains 1 sections:
+-; CHECK-SEC-NEXT:     [Index]    Name
+-; CHECK-SEC-NEXT:     [   15]   .pseudo_probe_desc
+-
+-
+-; CHECK-SEC2:      [Nr] Name               Type     {{.*}} ES Flg Lk Inf Al
+-; CHECK-SEC2:      [ 3] .text              PROGBITS {{.*}} 00  AX  0   0 16
+-; CHECK-SEC2:      [ 5] .text              PROGBITS {{.*}} 00  AX  0   0 16
+-; CHECK-SEC2:      [ 8] .text              PROGBITS {{.*}} 00  AXG 0   0 16
+-; CHECK-SEC2-COUNT-3:   .pseudo_probe_desc PROGBITS
+-; CHECK-SEC2:           .pseudo_probe      PROGBITS {{.*}} 00   L  3   0  1
+-; CHECK-SEC2-NEXT:      .pseudo_probe      PROGBITS {{.*}} 00   L  5   0  1
+-; CHECK-SEC2-NEXT:      .pseudo_probe      PROGBITS {{.*}} 00   LG 8   0  1
+-; CHECK-SEC2-NOT:  .rela.pseudo_probe
++; CHECK-OBJ-COUNT-2: .pseudo_probe_desc
++; CHECK-OBJ: .pseudo_probe
++; CHECK-OBJ-NOT: .rela.pseudo_probe
+ 
+ !llvm.dbg.cu = !{!0}
+ !llvm.module.flags = !{!9, !10}
+-- 
+2.42.0
+
diff --git a/main/llvm17/APKBUILD b/main/llvm17/APKBUILD
new file mode 100644
index 00000000000..2bcb80ee5f0
--- /dev/null
+++ b/main/llvm17/APKBUILD
@@ -0,0 +1,330 @@
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
+# Contributor: Martell Malone <martell@marinelayer.io>
+# Contributor: Travis Tilley <ttilley@gmail.com>
+# Contributor: Mitch Tishmack <mitch.tishmack@gmail.com>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Contributor: Ariadne Conill <ariadne@dereferenced.org>
+# Contributor: omni <omni+alpine@hack.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+_pkgname=llvm
+pkgver=17.0.6
+_majorver=${pkgver%%.*}
+_prevmajorver=$((_majorver - 1))
+pkgname=$_pkgname$_majorver
+pkgrel=1
+pkgdesc="Low Level Virtual Machine compiler system, version $_majorver"
+arch="all"
+url="https://llvm.org/"
+license="Apache-2.0"
+depends_dev="$pkgname=$pkgver-r$pkgrel libffi-dev zlib-dev zstd-dev"
+# See https://gitlab.alpinelinux.org/alpine/aports/-/commit/51d2fba931fb2ef0046dea19405a9290c8735051#note_234651
+[ -z "$BOOTSTRAP" ] && depends_dev="$depends_dev $pkgname-test-utils=$pkgver-r$pkgrel"
+makedepends_host="$depends_dev binutils-dev libxml2-dev"
+makedepends_build="cmake chrpath python3 py3-setuptools samurai"
+# diffutils for diff: unrecognized option: strip-trailing-cr
+# coreutils for 'od' binary
+checkdepends="bash coreutils diffutils"
+subpackages="
+	$pkgname-gtest:_gtest
+	$pkgname-static
+	$pkgname-libs
+	$pkgname-linker-tools:linktools
+	$pkgname-dev
+	$pkgname-test-utils-pyc
+	$pkgname-test-utils:_test_utils
+	"
+source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-project-$pkgver.src.tar.xz
+	0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
+	allocscore.patch
+	fix-memory-mf_exec-on-aarch64.patch
+	install-prefix.patch
+	llvm-stack-size.patch
+	rust-feature-tables.patch
+
+	0001-Revert-Pseudo-Probe-Make-.pseudo_probe-GC-able.patch
+	fix-hexagon-tests.patch
+	workaround-codegen-riscv-xtheadmempair-miscompile.patch
+	"
+builddir="$srcdir/$_pkgname-project-$pkgver.src"
+
+# Whether is this package the default (latest) LLVM version.
+_default_llvm="yes"
+
+# If crosscompiling, we need llvm-tblgen on the build machine.
+if [ "$CBUILD" != "$CHOST" ]; then
+	_llvm_tblgen="llvm-tblgen"
+	if [ "$_default_llvm" = no ]; then
+		_llvm_tblgen="llvm$_majorver-tblgen"
+	fi
+	makedepends_build="$makedepends_build cmd:$_llvm_tblgen"
+	cmake_cross_options="
+		-DCMAKE_CROSSCOMPILING=ON
+		-DLLVM_TABLEGEN=/usr/bin/$_llvm_tblgen
+	"
+fi
+
+if [ "$_default_llvm" = yes ]; then
+	provides="llvm=$pkgver-r$pkgrel"
+	replaces="llvm"
+fi
+
+# explicit override for previous version as well
+replaces="llvm16"
+
+# NOTE: It seems that there's no (sane) way how to change includedir, sharedir
+# etc. separately, just the CMAKE_INSTALL_PREFIX. Standard CMake variables and
+# even  LLVM-specific variables, that are related to these paths, actually
+# don't work (in llvm 3.7).
+#
+# When building a software that depends on LLVM, utility llvm-config should be
+# used to discover where is LLVM installed. It provides options to print
+# path of bindir, includedir, and libdir separately, but in its source, all
+# these paths are actually hard-coded against INSTALL_PREFIX. We can patch it
+# and move paths manually, but I'm really not sure what it may break...
+#
+# Also note that we should *not* add version suffix to files in llvm bindir!
+# It breaks build system of some software that depends on LLVM, because they
+# don't expect these files to have a sufix.
+#
+# So, we install all the LLVM files into /usr/lib/llvm$_majorver.
+# BTW, Fedora and Debian do the same thing.
+#
+_prefix="usr/lib/llvm$_majorver"
+
+prepare() {
+	default_prepare
+
+	cd llvm
+
+	# Known broken test on musl
+	rm -v test/CodeGen/AArch64/wineh4.mir
+	# https://github.com/llvm/llvm-project/issues/47657
+	rm -v test/ExecutionEngine/Interpreter/intrinsics.ll
+
+	case "$CARCH" in
+	x86|arm*)
+		rm -v test/Object/macho-invalid.test \
+			test/tools/llvm-size/radix.test \
+			test/ExecutionEngine/frem.ll
+		;;
+	esac
+}
+
+build() {
+	# Auto-detect it by guessing either.
+	local ffi_include_dir="$(pkg-config --cflags-only-I libffi | sed 's|^-I||g')"
+
+	local zstd=ON
+	# tries linking host libzstd in cross
+	if [ -n "$BOOTSTRAP" ]; then
+		zstd=OFF
+	fi
+
+	# NOTE: DO NOT change CMAKE_BUILD_TYPE! Buildmodes like None will enable
+	# debug assertions for LLVM!
+	cmake -B build -G Ninja -Wno-dev -S llvm \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/$_prefix \
+		-DCMAKE_INSTALL_RPATH=/$_prefix \
+		\
+		-DLLVM_DEFAULT_TARGET_TRIPLE="$CBUILD" \
+		-DLLVM_HOST_TRIPLE="$CHOST" \
+		\
+		-DFFI_INCLUDE_DIR="$ffi_include_dir" \
+		-DLLVM_APPEND_VC_REV=OFF \
+		-DLLVM_BINUTILS_INCDIR=/usr/include \
+		-DLLVM_BUILD_DOCS=OFF \
+		-DLLVM_BUILD_EXAMPLES=OFF \
+		-DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \
+		-DLLVM_BUILD_LLVM_DYLIB=ON \
+		-DLLVM_BUILD_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DLLVM_ENABLE_ASSERTIONS=OFF \
+		-DLLVM_ENABLE_DUMP=ON \
+		-DLLVM_ENABLE_EH=ON \
+		-DLLVM_ENABLE_FFI=ON \
+		-DLLVM_ENABLE_LIBCXX=OFF \
+		-DLLVM_ENABLE_LIBEDIT=OFF \
+		-DLLVM_ENABLE_PIC=ON \
+		-DLLVM_ENABLE_RTTI=ON \
+		-DLLVM_ENABLE_SPHINX=OFF \
+		-DLLVM_ENABLE_TERMINFO=ON \
+		-DLLVM_ENABLE_ZLIB=ON \
+		-DLLVM_ENABLE_ZSTD=$zstd \
+		-DLLVM_INCLUDE_BENCHMARKS=OFF \
+		-DLLVM_INCLUDE_EXAMPLES=OFF \
+		-DLLVM_INSTALL_GTEST=ON \
+		-DLLVM_INSTALL_UTILS=ON \
+		-DLLVM_LINK_LLVM_DYLIB=ON \
+		-DLLVM_USE_PERF=ON \
+		$cmake_cross_options
+
+	cmake --build build
+
+	python3 llvm/utils/lit/setup.py build
+}
+
+check() {
+	LD_LIBRARY_PATH="$PWD/build/lib" \
+	ninja -C build check-llvm
+}
+
+package() {
+	depends="$pkgname-linker-tools=$pkgver-r$pkgrel"
+	DESTDIR="$pkgdir" cmake --install build
+	python3 llvm/utils/lit/setup.py install --root="$pkgdir"
+
+	cd "$pkgdir"/$_prefix
+
+	# Symlink files from /usr/lib/llvm*/bin to /usr/bin.
+	mkdir -p "$pkgdir"/usr/bin
+	local name newname path
+	for path in bin/*; do
+		name=${path##*/}
+		# Add version infix/suffix to the executable name.
+		case "$name" in
+			llvm-*) newname="llvm$_majorver-${name#llvm-}";;
+			*) newname="$name$_majorver";;
+		esac
+		# If this package provides=llvm (i.e. it's the default/latest
+		# llvm package), omit version infix/suffix.
+		if [ "$_default_llvm" = yes ]; then
+			newname=$name
+		fi
+		case "$name" in
+			FileCheck | obj2yaml | yaml2obj) continue;;
+		esac
+		ln -s ../lib/llvm$_majorver/bin/$name "$pkgdir"/usr/bin/$newname
+	done
+
+	mkdir -p "$pkgdir"/usr/include "$pkgdir"/usr/lib/cmake
+
+	# symlink include to /usr/include/llvm$_llvmver
+	ln -sfv ../lib/$pkgname/include "$pkgdir"/usr/include/$pkgname
+
+	# symlink cmake dir to system cmake
+	ln -sfv ../$pkgname/lib/cmake/llvm "$pkgdir"/usr/lib/cmake/$pkgname
+}
+
+_gtest() {
+	pkgdesc="LLVM $_majorver gtest static libraries"
+	depends=""
+	_common_subpkg
+	amove "$_prefix"/lib/libLLVMTesting*.a \
+		"$_prefix"/lib/libllvm_gtest*.a \
+		"$_prefix"/include/llvm-gmock \
+		"$_prefix"/include/llvm-gtest
+}
+
+static() {
+	pkgdesc="LLVM $_majorver static libraries"
+	depends=""
+	_common_subpkg
+	amove "$_prefix"/lib/*.a
+}
+
+libs() {
+	pkgdesc="LLVM $_majorver runtime library"
+	depends=""
+	local soname="libLLVM-$_majorver.so"
+	local soname2="libLLVM-$pkgver.so"
+
+	mkdir -p "$subpkgdir"
+	cd "$subpkgdir"
+
+	# libLLVM should be in /usr/lib. This is needed for binaries that are
+	# dynamically linked with libLLVM, so they can find it on default path.
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/$_prefix/lib/$soname "$subpkgdir"/usr/lib/
+	ln -s $soname usr/lib/$soname2
+
+	# And also symlink it back to the LLVM prefix.
+	mkdir -p $_prefix/lib
+	ln -s ../../$soname $_prefix/lib/$soname
+	ln -s ../../$soname $_prefix/lib/$soname2
+}
+
+linktools() {
+	_common_subpkg
+	pkgdesc="$pkgdesc (linker plugins)"
+
+	amove \
+		$_prefix/lib/libLTO.so* \
+		$_prefix/lib/LLVMgold* \
+
+	if [ "$_default_llvm" = yes ]; then
+		ln -sfv llvm$_majorver/lib/LLVMgold.so "$subpkgdir"/usr/lib/
+		ln -sfv llvm$_majorver/lib/libLTO.so "$subpkgdir"/usr/lib/
+
+		# for bfd to work with clang -flto, you need to put the linker plugin in the bfd dir too,
+		# not just usr/lib.
+		mkdir -p "$subpkgdir"/usr/lib/bfd-plugins/
+		ln -sfv ../llvm$_majorver/lib/LLVMgold.so "$subpkgdir"/usr/lib/bfd-plugins/
+	fi
+}
+
+dev() {
+	_common_subpkg
+	default_dev
+	cd "$subpkgdir"
+
+	amove \
+		$_prefix/lib \
+		$_prefix/bin/llvm-config
+
+	if [ "$_default_llvm" = yes ]; then
+		ln -sf llvm$_majorver usr/lib/cmake/llvm
+		ln -sf llvm$_majorver/lib/LLVMgold.so "$pkgdir"/usr/lib/
+		ln -sf llvm$_majorver/lib/libLTO.so "$pkgdir"/usr/lib/
+	fi
+
+	# also add a suffix-version variant of llvm-config, as that's what things normally check for
+	mkdir -p "$subpkgdir"/usr/bin/
+	ln -sfv ../lib/llvm$_majorver/bin/llvm-config "$subpkgdir"/usr/bin/llvm-config-$_majorver
+}
+
+_test_utils() {
+	pkgdesc="LLVM $_majorver utilities for executing LLVM and Clang style test suites"
+	depends="python3"
+	_common_subpkg
+
+	local litver=$(python3 "$builddir"/llvm/utils/lit/setup.py --version 2>/dev/null \
+		| sed 's/\.dev.*$//')
+	test -n "$litver"
+	provides="$provides lit=$litver-r$pkgrel"
+
+	amove usr/lib/$pkgname/bin/FileCheck \
+		usr/lib/$pkgname/bin/count \
+		usr/lib/$pkgname/bin/not \
+		usr/lib/python* \
+		usr/bin/lit
+
+	mv "$subpkgdir"/usr/bin/lit "$subpkgdir"/$_prefix/bin/lit
+	ln -s lit "$subpkgdir"/$_prefix/bin/llvm-lit
+
+	if [ "$_default_llvm" = yes ]; then
+		amove usr/bin/count usr/bin/not
+		ln -s ../lib/llvm$_majorver/bin/lit "$subpkgdir"/usr/bin/lit
+	else
+		amove usr/bin/count$_majorver usr/bin/not$_majorver
+	fi
+}
+
+_common_subpkg() {
+	if [ "$_default_llvm" = yes ]; then
+		replaces="llvm${subpkgname#"$pkgname"} llvm${_prevmajorver}${subpkgname#"$pkgname"}"
+		provides="llvm${subpkgname#"$pkgname"}=$pkgver-r$pkgrel"
+	fi
+}
+
+sha512sums="
+6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30  llvm-project-17.0.6.src.tar.xz
+84ed6b165445d0cdb59daa59f612a7d960bf67b13a1b19bdd2a19d46548013e756faca6b8249cb6c60354f3a9aaef46652e5f531944c71294e46d2f7bfd8b832  0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
+ef63d5e01440cff65c10b84b65099bbd539bae72065d5581a8d2409cf2d0d4410d5bb3f501273ab29ee65bf8f5d23653a074428c2711ff9209324de56b857f3f  allocscore.patch
+1826a6877d0c9e93c2d6ce0b4f83fe1118b9449f82f1919b37be5fc6d7c11ae22e0c02a7d3e6e23ce41bbb07df2ff08124aa9172e254ef2b12ecbc80d9a674a9  fix-memory-mf_exec-on-aarch64.patch
+ebc0be314c129ef38f00c8c2be9d589658cae89ac8cda109e35933b5044e775a3d370c0c584d3e501e4d43167b8523d8c5e5a85653d8ebe853571697ae40fb35  install-prefix.patch
+2123f01d8075a15cf8c2d8091fc8c92cb99807b1d654af13b436690ddb55f3e893a494593b3c92aeab26e50db4e0500ac688129ab6bc11e4765c0308b90db101  llvm-stack-size.patch
+84d2cc5c0376d8a8a2bbc0891849c9421feaea5b38a329aecdb822c136f7ded7ab4c3b87838d8915e6eb54cfe89f3e88f3b81ae98733e9a58d935be74a3c456c  rust-feature-tables.patch
+58a4887feedb72f2aa286b396f91348a6730028c358686701c30e084dd968de9597d86373e118c865f0b495d201e094bb0a2cdc19ede49d9f60e34eb7b0b71dc  0001-Revert-Pseudo-Probe-Make-.pseudo_probe-GC-able.patch
+bd51d487c46472963a350cd90f7d7a5d8a4494467716f4e4e3d21ba6be5f65c0e84f173a5bb8468fb68325e75401f08110f8886320d5caa9acd339d795b254bc  fix-hexagon-tests.patch
+7367b26f263cb0d36a358b79fe41256b4e8632170f3955e00aeeac3ccc6c3ae5dc370d596370bcf8c6b847473f02445fd1de7e6af36de6bd34b87995736fbf16  workaround-codegen-riscv-xtheadmempair-miscompile.patch
+"
diff --git a/main/llvm17/allocscore.patch b/main/llvm17/allocscore.patch
new file mode 100644
index 00000000000..5421c6b1ae8
--- /dev/null
+++ b/main/llvm17/allocscore.patch
@@ -0,0 +1,20 @@
+on x86, this fails with a float comparison error even though the floats are the
+same, because it does absolute eq
+--
+--- a/llvm/unittests/CodeGen/RegAllocScoreTest.cpp
++++ b/llvm/unittests/CodeGen/RegAllocScoreTest.cpp
+@@ -172,14 +172,5 @@
+   ASSERT_EQ(Freq2, TotalScore.loadStoreCounts());
+   ASSERT_EQ(Freq1, TotalScore.cheapRematCounts());
+   ASSERT_EQ(Freq2, TotalScore.expensiveRematCounts());
+-  ASSERT_EQ(TotalScore.getScore(),
+-            TotalScore.copyCounts() * CopyWeight +
+-                TotalScore.loadCounts() * LoadWeight +
+-                TotalScore.storeCounts() * StoreWeight +
+-                TotalScore.loadStoreCounts() * (LoadWeight + StoreWeight) +
+-                TotalScore.cheapRematCounts() * CheapRematWeight +
+-                TotalScore.expensiveRematCounts() * ExpensiveRematWeight
+-
+-  );
+ }
+ } // end namespace
diff --git a/main/llvm17/fix-hexagon-tests.patch b/main/llvm17/fix-hexagon-tests.patch
new file mode 100644
index 00000000000..aef1470dbd9
--- /dev/null
+++ b/main/llvm17/fix-hexagon-tests.patch
@@ -0,0 +1,36 @@
+From 03160ed7b3c1be7884dae94635a4dcee787034ef Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 19 Sep 2023 17:13:42 +0200
+Subject: [PATCH] [Hexagon][test] Fix more tests on linux-musl
+
+-march=hexagon uses the default target triple and changes the arch part of
+hexagon. On linux-musl, this essentially becomes hexagon-unknown-linux-musl
+which has different code generation. Use -mtriple instead.
+
+Link: https://github.com/llvm/llvm-project/commit/944110353b970fc99de3f012292b4c29d4d91999
+Link: https://github.com/llvm/llvm-project/issues/48936
+---
+ llvm/test/CodeGen/Hexagon/swp-memrefs-epilog.ll | 2 +-
+ llvm/test/CodeGen/Hexagon/vararg-formal.ll      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/llvm/test/CodeGen/Hexagon/swp-memrefs-epilog.ll b/llvm/test/CodeGen/Hexagon/swp-memrefs-epilog.ll
+index 20e39dd08fd727a..bdb0ad459f6fb54 100644
+--- a/llvm/test/CodeGen/Hexagon/swp-memrefs-epilog.ll
++++ b/llvm/test/CodeGen/Hexagon/swp-memrefs-epilog.ll
+@@ -1,4 +1,4 @@
+-; RUN: llc -march=hexagon -O2 -fp-contract=fast < %s -pipeliner-experimental-cg=true | FileCheck %s
++; RUN: llc -mtriple=hexagon -O2 -fp-contract=fast < %s -pipeliner-experimental-cg=true | FileCheck %s
+ 
+ ; Test that the memoperands for instructions in the epilog are updated
+ ; correctly. Previously, the pipeliner updated the offset for the memoperands
+diff --git a/llvm/test/CodeGen/Hexagon/vararg-formal.ll b/llvm/test/CodeGen/Hexagon/vararg-formal.ll
+index 6bba65fcab16900..07a53c79020be0e 100644
+--- a/llvm/test/CodeGen/Hexagon/vararg-formal.ll
++++ b/llvm/test/CodeGen/Hexagon/vararg-formal.ll
+@@ -1,4 +1,4 @@
+-; RUN: llc -march=hexagon < %s | FileCheck %s
++; RUN: llc -mtriple=hexagon < %s | FileCheck %s
+ 
+ ; Make sure that the first formal argument is not loaded from memory.
+ ; CHECK-NOT: memw
diff --git a/main/llvm17/fix-memory-mf_exec-on-aarch64.patch b/main/llvm17/fix-memory-mf_exec-on-aarch64.patch
new file mode 100644
index 00000000000..6e0e0fcb69d
--- /dev/null
+++ b/main/llvm17/fix-memory-mf_exec-on-aarch64.patch
@@ -0,0 +1,27 @@
+Fix failures in AllocationTests/MappedMemoryTest.* on aarch64:
+
+    Failing Tests (8):
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.AllocAndRelease/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.DuplicateNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.EnabledWrite/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.MultipleAllocAndRelease/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.SuccessiveNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.UnalignedNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroSizeNear/3
+
+Upstream-Issue: https://bugs.llvm.org/show_bug.cgi?id=14278#c10
+
+diff --git a/llvm/lib/Support/Unix/Memory.inc b/llvm/lib/Support/Unix/Memory.inc
+index 4c8f6b2ea..6cddae13b 100644
+--- a/llvm/lib/Support/Unix/Memory.inc
++++ b/llvm/lib/Support/Unix/Memory.inc
+@@ -50,7 +50,7 @@ static int getPosixProtectionFlags(unsigned Flags) {
+       llvm::sys::Memory::MF_EXEC:
+     return PROT_READ | PROT_WRITE | PROT_EXEC;
+   case llvm::sys::Memory::MF_EXEC:
+-#if defined(__FreeBSD__) || defined(__powerpc__)
++#if defined(__FreeBSD__) || defined(__powerpc__) || (defined(__linux__) && defined(__aarch64__))
+     // On PowerPC, having an executable page that has no read permission
+     // can have unintended consequences.  The function InvalidateInstruction-
+     // Cache uses instructions dcbf and icbi, both of which are treated by
diff --git a/main/llvm17/install-prefix.patch b/main/llvm17/install-prefix.patch
new file mode 100644
index 00000000000..90f6c3e62d2
--- /dev/null
+++ b/main/llvm17/install-prefix.patch
@@ -0,0 +1,31 @@
+starting from llvm14 the install prefix breaks via symlinks;
+/usr/lib/llvm14/lib/cmake/llvm/LLVMConfig.cmake goes up 3 directories to find
+/usr/lib/llvm14/include as LLVM_INCLUDE_DIRS, but to even use this cmake folder
+at all it has to be symlinked to /usr/lib/cmake/llvm .. so the directory it
+instead uses is just /usr/include, which is not where the cmake includes are.
+this hardcodes them to the install prefix we pass via cmake, which should
+always be correct, and what cmake tries to autodetect anyway.
+
+also see: https://reviews.llvm.org/D29969
+
+this is supposedly fixed now, but for some reason it still isn't
+--- a/llvm/cmake/modules/CMakeLists.txt
++++ b/llvm/cmake/modules/CMakeLists.txt
+@@ -41,6 +41,8 @@
+ #
+ 
+ set(LLVM_CONFIG_CODE "
++# this is wrong when automatically detected
++set(LLVM_INSTALL_PREFIX \"${CMAKE_INSTALL_PREFIX}\")
+ # LLVM_BUILD_* values available only from LLVM build tree.
+ set(LLVM_BUILD_BINARY_DIR \"${LLVM_BINARY_DIR}\")
+ set(LLVM_BUILD_LIBRARY_DIR \"${LLVM_LIBRARY_DIR}\")
+@@ -109,8 +111,6 @@
+ #
+ # Generate LLVMConfig.cmake for the install tree.
+ #
+-
+-find_prefix_from_config(LLVM_CONFIG_CODE LLVM_INSTALL_PREFIX "${LLVM_INSTALL_PACKAGE_DIR}")
+ 
+ extend_path(LLVM_CONFIG_MAIN_INCLUDE_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_INCLUDEDIR}")
+ # This is the same as the above because the handwritten and generated headers
diff --git a/main/llvm17/llvm-stack-size.patch b/main/llvm17/llvm-stack-size.patch
new file mode 100644
index 00000000000..0a053154242
--- /dev/null
+++ b/main/llvm17/llvm-stack-size.patch
@@ -0,0 +1,23 @@
+Patch-Source: https://github.com/chimera-linux/cports/blob/8c0359f31b9d888e59ced0320e93ca8ad79ba1f9/main/llvm/patches/0010-always-set-a-larger-stack-size-explicitly.patch
+From 18e09846d9333b554e3dfbbd768ada6643bf92c0 Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Sat, 27 Nov 2021 01:03:28 +0100
+Subject: [PATCH 10/22] always set a larger stack size explicitly
+
+---
+ llvm/lib/Support/Threading.cpp | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/llvm/lib/Support/Threading.cpp b/llvm/lib/Support/Threading.cpp
+index 923935bbc..26594aac8 100644
+--- a/llvm/lib/Support/Threading.cpp
++++ b/llvm/lib/Support/Threading.cpp
+@@ -77,7 +77,7 @@ unsigned llvm::ThreadPoolStrategy::compute_thread_count() const {
+ // keyword.
+ #include "llvm/Support/thread.h"
+ 
+-#if defined(__APPLE__)
++#if 1
+   // Darwin's default stack size for threads except the main one is only 512KB,
+   // which is not enough for some/many normal LLVM compilations. This implements
+   // the same interface as std::thread but requests the same stack size as the
diff --git a/main/llvm17/rust-feature-tables.patch b/main/llvm17/rust-feature-tables.patch
new file mode 100644
index 00000000000..2068d51f2b9
--- /dev/null
+++ b/main/llvm17/rust-feature-tables.patch
@@ -0,0 +1,31 @@
+Patch-Source: https://github.com/rust-lang/llvm-project/commit/0a157fd7a5f61973ffddf96b3d445a718193eb1a
+From 0a157fd7a5f61973ffddf96b3d445a718193eb1a Mon Sep 17 00:00:00 2001
+From: Cameron Hart <cameron.hart@gmail.com>
+Date: Sun, 10 Jul 2016 23:55:53 +1000
+Subject: [PATCH] [rust] Add accessors for MCSubtargetInfo CPU and Feature
+ tables
+
+This is needed for `-C target-cpu=help` and `-C target-feature=help` in rustc
+---
+ llvm/include/llvm/MC/MCSubtargetInfo.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/llvm/include/llvm/MC/MCSubtargetInfo.h b/llvm/include/llvm/MC/MCSubtargetInfo.h
+index e1f0a86141e36..1e529bf4fb31e 100644
+--- a/llvm/include/llvm/MC/MCSubtargetInfo.h
++++ b/llvm/include/llvm/MC/MCSubtargetInfo.h
+@@ -230,6 +230,14 @@ class MCSubtargetInfo {
+     return Found != ProcDesc.end() && StringRef(Found->Key) == CPU;
+   }
+ 
++  ArrayRef<SubtargetSubTypeKV> getCPUTable() const {
++    return ProcDesc;
++  }
++
++  ArrayRef<SubtargetFeatureKV> getFeatureTable() const {
++    return ProcFeatures;
++  }
++
+   virtual unsigned getHwMode() const { return 0; }
+ 
+   /// Return the cache size in bytes for the given level of cache.
diff --git a/main/llvm17/workaround-codegen-riscv-xtheadmempair-miscompile.patch b/main/llvm17/workaround-codegen-riscv-xtheadmempair-miscompile.patch
new file mode 100644
index 00000000000..338af469817
--- /dev/null
+++ b/main/llvm17/workaround-codegen-riscv-xtheadmempair-miscompile.patch
@@ -0,0 +1,19 @@
+https://github.com/llvm/llvm-project/issues/62195#issuecomment-1770250844
+
+diff --git a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+index f030982cb815..fdc8987cb312 100644
+--- a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
++++ b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+@@ -1198,8 +1198,10 @@ RISCVTargetLowering::RISCVTargetLowering(const TargetMachine &TM,
+                          ISD::VP_GATHER, ISD::VP_SCATTER, ISD::SRA, ISD::SRL,
+                          ISD::SHL, ISD::STORE, ISD::SPLAT_VECTOR,
+                          ISD::CONCAT_VECTORS});
+-  if (Subtarget.hasVendorXTHeadMemPair())
+-    setTargetDAGCombine({ISD::LOAD, ISD::STORE});
++  if (Subtarget.hasVendorXTHeadMemPair()) {
++    setTargetDAGCombine(ISD::LOAD);
++    setTargetDAGCombine(ISD::STORE);
++  }
+   if (Subtarget.useRVVForFixedLengthVectors())
+     setTargetDAGCombine(ISD::BITCAST);
+ 
diff --git a/main/llvm9/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch b/main/llvm9/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
deleted file mode 100644
index 1bf2fbb6078..00000000000
--- a/main/llvm9/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f8e83c4c7866ae830abe9bec15cfe805dd825b6e Mon Sep 17 00:00:00 2001
-From: xentec <xentec@aix0.eu>
-Date: Tue, 12 Sep 2017 07:18:38 +0200
-Subject: [PATCH] Disable dynamic lib tests for musl's dlclose() is noop
-
----
- unittests/Support/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/unittests/Support/CMakeLists.txt b/unittests/Support/CMakeLists.txt
-index 641163e..4f508d9 100644
---- a/unittests/Support/CMakeLists.txt
-+++ b/unittests/Support/CMakeLists.txt
-@@ -75,4 +75,4 @@ set_source_files_properties(AlignOfTest.cpp PROPERTIES COMPILE_FLAGS -w)
- # ManagedStatic.cpp uses <pthread>.
- target_link_libraries(SupportTests LLVMTestingSupport ${LLVM_PTHREAD_LIB})
- 
--add_subdirectory(DynamicLibrary)
-+# add_subdirectory(DynamicLibrary)
--- 
-2.14.1
-
diff --git a/main/llvm9/APKBUILD b/main/llvm9/APKBUILD
deleted file mode 100644
index fb9803112c5..00000000000
--- a/main/llvm9/APKBUILD
+++ /dev/null
@@ -1,255 +0,0 @@
-# Contributor: Rasmus Thomsen <oss@cogitri.dev>
-# Contributor: Martell Malone <martell@marinelayer.io>
-# Contributor: Travis Tilley <ttilley@gmail.com>
-# Contributor: Mitch Tishmack <mitch.tishmack@gmail.com>
-# Contributor: Jakub Jirutka <jakub@jirutka.cz>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
-_pkgname=llvm
-pkgver=9.0.1
-_majorver=${pkgver%${pkgver##[0-9]}}
-pkgname=$_pkgname$_majorver
-pkgrel=1
-pkgdesc="Low Level Virtual Machine compiler system, version $_majorver"
-arch="all"
-url="https://llvm.org/"
-license="Apache-2.0"
-depends_dev="$pkgname=$pkgver-r$pkgrel"
-makedepends="binutils-dev chrpath cmake libffi-dev paxmark python3 zlib-dev
-	libxml2-dev py3-setuptools"
-checkdepends="bash coreutils" # coreutils for 'od' binary
-subpackages="$pkgname-static $pkgname-libs $pkgname-dev $pkgname-test-utils:_test_utils"
-source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-$pkgver.src.tar.xz
-	0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
-	fix-memory-mf_exec-on-aarch64.patch
-	fix-LLVMConfig-cmake-install-prefix.patch
-	python3-test.patch
-	"
-builddir="$srcdir/$_pkgname-$pkgver.src"
-
-# ARM has few failures in test suite that we don't care about currently and
-# also it takes forever to run them on the builder.
-# MIPS as well...
-case "$CARCH" in
-	arm*) options="$options !check";;
-	mips*) options="$options !check";;
-esac
-
-# Whether is this package the default (latest) LLVM version.
-_default_llvm="no"
-
-if [ "$_default_llvm" = yes ]; then
-	provides="llvm=$pkgver-r$pkgrel"
-	replaces="llvm"
-fi
-
-# NOTE: It seems that there's no (sane) way how to change includedir, sharedir
-# etc. separately, just the CMAKE_INSTALL_PREFIX. Standard CMake variables and
-# even  LLVM-specific variables, that are related to these paths, actually
-# don't work (in llvm 3.7).
-#
-# When building a software that depends on LLVM, utility llvm-config should be
-# used to discover where is LLVM installed. It provides options to print
-# path of bindir, includedir, and libdir separately, but in its source, all
-# these paths are actually hard-coded against INSTALL_PREFIX. We can patch it
-# and move paths manually, but I'm really not sure what it may break...
-#
-# Also note that we should *not* add version suffix to files in llvm bindir!
-# It breaks build system of some software that depends on LLVM, because they
-# don't expect these files to have a sufix.
-#
-# So, we install all the LLVM files into /usr/lib/llvm$_majorver.
-# BTW, Fedora and Debian do the same thing.
-#
-_prefix="usr/lib/llvm$_majorver"
-
-prepare() {
-	default_prepare
-	mkdir -p "$builddir"/build
-
-	# Known broken test on musl
-	rm -v test/CodeGen/AArch64/wineh4.mir
-}
-
-build() {
-	cd "$builddir"/build
-
-	# Auto-detect it by guessing either.
-	local ffi_include_dir="$(pkg-config --cflags-only-I libffi | sed 's|^-I||g')"
-
-	cmake -Wno-dev \
-		-DCMAKE_BUILD_TYPE=MinSizeRel \
-		-DCMAKE_C_FLAGS_MINSIZEREL_INIT="$CFLAGS" \
-		-DCMAKE_CXX_FLAGS_MINSIZEREL_INIT="$CXXFLAGS" \
-		-DCMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT="$LDFLAGS" \
-		-DCMAKE_INSTALL_PREFIX=/$_prefix \
-		-DFFI_INCLUDE_DIR="$ffi_include_dir" \
-		-DLLVM_BINUTILS_INCDIR=/usr/include \
-		-DLLVM_BUILD_DOCS=OFF \
-		-DLLVM_BUILD_EXAMPLES=OFF \
-		-DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \
-		-DLLVM_BUILD_LLVM_DYLIB=ON \
-		-DLLVM_BUILD_TESTS=ON \
-		-DLLVM_DEFAULT_TARGET_TRIPLE="$CBUILD" \
-		-DLLVM_ENABLE_ASSERTIONS=OFF \
-		-DLLVM_ENABLE_CXX1Y=ON \
-		-DLLVM_ENABLE_FFI=ON \
-		-DLLVM_ENABLE_LIBCXX=OFF \
-		-DLLVM_ENABLE_PIC=ON \
-		-DLLVM_ENABLE_RTTI=ON \
-		-DLLVM_ENABLE_SPHINX=OFF \
-		-DLLVM_ENABLE_TERMINFO=ON \
-		-DLLVM_ENABLE_ZLIB=ON \
-		-DLLVM_HOST_TRIPLE="$CHOST" \
-		-DLLVM_INCLUDE_EXAMPLES=OFF \
-		-DLLVM_LINK_LLVM_DYLIB=ON \
-		-DLLVM_APPEND_VC_REV=OFF \
-		"$builddir"
-
-	make llvm-tblgen
-	make
-
-	paxmark m \
-		bin/llvm-rtdyld \
-		bin/lli \
-		bin/lli-child-target \
-		unittests/ExecutionEngine/MCJIT/MCJITTests \
-		unittests/ExecutionEngine/Orc/OrcJITTests \
-		unittests/Support/SupportTests
-
-	python3 ../utils/lit/setup.py build
-}
-
-check() {
-	cd "$builddir"/build
-
-	make check-llvm
-}
-
-package() {
-	cd "$builddir"/build
-
-	make DESTDIR="$pkgdir" install
-
-	cd "$pkgdir"/$_prefix
-
-	# Remove RPATHs.
-	file lib/*.so bin/* \
-		| awk -F: '$2~/ELF/{print $1}' \
-		| xargs -r chrpath -d
-
-	# Symlink files from /usr/lib/llvm*/bin to /usr/bin.
-	mkdir -p "$pkgdir"/usr/bin
-	local name newname path
-	for path in bin/*; do
-		name=${path##*/}
-		# Add version infix/suffix to the executable name.
-		case "$name" in
-			llvm-*) newname="llvm$_majorver-${name#llvm-}";;
-			*) newname="$name$_majorver";;
-		esac
-		# If this package provides=llvm (i.e. it's the default/latest
-		# llvm package), omit version infix/suffix.
-		if [ "$_default_llvm" = yes ]; then
-			newname=$name
-		fi
-		case "$name" in
-			FileCheck | obj2yaml | yaml2obj) continue;;
-		esac
-		ln -s ../lib/llvm$_majorver/bin/$name "$pkgdir"/usr/bin/$newname
-	done
-
-	# Move /usr/lib/$pkgname/include/ into /usr/include/$pkgname/
-	# and symlink it back.
-	mkdir "$pkgdir"/usr/include/
-	mv include "$pkgdir"/usr/include/$pkgname
-	ln -s ../../include/$pkgname include
-
-	# Move /usr/lib/$pkgname/lib/cmake/llvm/ into /usr/lib/cmake/$pkgname/
-	# and symlink it back.
-	mkdir "$pkgdir"/usr/lib/cmake/
-	mv lib/cmake/llvm "$pkgdir"/usr/lib/cmake/$pkgname
-	ln -s ../../../cmake/$pkgname lib/cmake/llvm
-}
-
-static() {
-	pkgdesc="LLVM $_majorver static libraries"
-	_common_subpkg
-
-	_mv "$pkgdir"/$_prefix/lib/*.a "$subpkgdir"/$_prefix/lib/
-}
-
-libs() {
-	pkgdesc="LLVM $_majorver runtime library"
-	local soname="libLLVM-$_majorver.so"
-	local soname2="libLLVM-$pkgver.so"
-
-	mkdir -p "$subpkgdir"
-	cd "$subpkgdir"
-
-	# libLLVM should be in /usr/lib. This is needed for binaries that are
-	# dynamically linked with libLLVM, so they can find it on default path.
-	_mv "$pkgdir"/$_prefix/lib/$soname usr/lib/
-	ln -s $soname usr/lib/$soname2
-
-	# And also symlink it back to the LLVM prefix.
-	mkdir -p $_prefix/lib
-	ln -s ../../$soname $_prefix/lib/$soname
-	ln -s ../../$soname $_prefix/lib/$soname2
-}
-
-dev() {
-	_common_subpkg
-	default_dev
-	cd "$subpkgdir"
-
-	_mv "$pkgdir"/$_prefix/lib $_prefix/
-	_mv "$pkgdir"/$_prefix/include $_prefix/
-
-	_mv "$pkgdir"/$_prefix/bin/llvm-config $_prefix/bin/
-
-	if [ "$_default_llvm" = yes ]; then
-		ln -sf llvm$_majorver/lib/LLVMgold.so usr/lib/
-		ln -sf llvm$_majorver/lib/libLTO.so usr/lib/
-		ln -sf llvm$_majorver usr/lib/cmake/llvm
-	fi
-}
-
-_test_utils() {
-	pkgdesc="LLVM $_majorver utilities for executing LLVM and Clang style test suites"
-	depends="python3 py3-setuptools"
-	_common_subpkg
-	replaces=""
-
-	local litver=$(python3 "$builddir"/utils/lit/setup.py --version 2>/dev/null \
-		| sed 's/\.dev.*$//')
-	test -n "$litver"
-	provides="$provides lit=$litver-r$pkgrel"
-
-	cd "$builddir"/build
-
-	install -D -m 755 bin/count "$subpkgdir"/$_prefix/bin/count
-	install -D -m 755 bin/FileCheck "$subpkgdir"/$_prefix/bin/FileCheck
-	install -D -m 755 bin/not "$subpkgdir"/$_prefix/bin/not
-
-	python3 ../utils/lit/setup.py install --prefix=/usr --root="$subpkgdir"
-	ln -s ../../../bin/lit "$subpkgdir"/$_prefix/bin/lit
-}
-
-_common_subpkg() {
-	if [ "$_default_llvm" = yes ]; then
-		replaces="llvm${subpkgname#$pkgname}"
-		provides="$replaces=$pkgver-r$pkgrel"
-	fi
-}
-
-_mv() {
-	local dest; for dest; do true; done  # get last argument
-	mkdir -p "$dest"
-	mv "$@"
-}
-
-sha512sums="bfb6960a4dd1e18f4005f324f478a781c69e8ec7c20569d9b243fcb9372dc7733b254f26c683373537990cc9c109c78eaf0f65449629ee17caca1bce9b9ccccd  llvm-9.0.1.src.tar.xz
-695502bd3b5454c2f5630c59a8cf5f8aeb0deac16a76a8a4df34849e1e35c12ed4234572a320fe4c7e96f974f572f429eb816c5aa3dcfb17057f550eac596495  0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch
-64b9ecb246cc94ce7f617b3699b3306de0872a1a9b0ade88563330aa6f9a60742bb1d73f95743d0f033ea8b1535e2e612250c8f50bddf4419741ca18f40eca1d  fix-memory-mf_exec-on-aarch64.patch
-7d4825d16107e56a14b7b05be847f03d75e2e05952bea0742a1233b5b0441c9934d8058e612abb6471272884372d9bfd3348355fbd3c19cba82a554003cc3eec  fix-LLVMConfig-cmake-install-prefix.patch
-53cc0d13dd871e9b775bb4e7567de4f9a97d91b8246cd7ce74607fd88d6e3e2ab9455f5b4195bc7f9dbdedbc77d659d43e98ec0b7cd78cd395aaea6919510287  python3-test.patch"
diff --git a/main/llvm9/fix-LLVMConfig-cmake-install-prefix.patch b/main/llvm9/fix-LLVMConfig-cmake-install-prefix.patch
deleted file mode 100644
index b7e3dbe294e..00000000000
--- a/main/llvm9/fix-LLVMConfig-cmake-install-prefix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix LLVMConfig.cmake being generated to use correct LLVM_INSTALL_PREFIX
-(e.g. /usr/lib/llvm5).
-
-This is needed e.g. for building lldb.
-
---- a/cmake/modules/CMakeLists.txt
-+++ b/cmake/modules/CMakeLists.txt
-@@ -75,15 +75,7 @@
- 
- # Generate LLVMConfig.cmake for the install tree.
- set(LLVM_CONFIG_CODE "
--# Compute the installation prefix from this LLVMConfig.cmake file location.
--get_filename_component(LLVM_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)")
--# Construct the proper number of get_filename_component(... PATH)
--# calls to compute the installation prefix.
--string(REGEX REPLACE "/" ";" _count "${LLVM_INSTALL_PACKAGE_DIR}")
--foreach(p ${_count})
--  set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE}
--get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)")
--endforeach(p)
-+set(LLVM_INSTALL_PREFIX \"${CMAKE_INSTALL_PREFIX}\")")
- set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include")
- set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}")
- set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}")
diff --git a/main/llvm9/fix-memory-mf_exec-on-aarch64.patch b/main/llvm9/fix-memory-mf_exec-on-aarch64.patch
deleted file mode 100644
index a64a317ee6c..00000000000
--- a/main/llvm9/fix-memory-mf_exec-on-aarch64.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix failures in AllocationTests/MappedMemoryTest.* on aarch64:
-
-    Failing Tests (8):
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.AllocAndRelease/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.DuplicateNear/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.EnabledWrite/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.MultipleAllocAndRelease/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.SuccessiveNear/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.UnalignedNear/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroNear/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroSizeNear/3
-
-Upstream-Issue: https://bugs.llvm.org/show_bug.cgi?id=14278#c10
-
---- a/lib/Support/Unix/Memory.inc
-+++ b/lib/Support/Unix/Memory.inc
-@@ -59,7 +59,7 @@
-     return PROT_READ | PROT_WRITE | PROT_EXEC;
-   case llvm::sys::Memory::MF_EXEC:
- #if (defined(__FreeBSD__) || defined(__POWERPC__) || defined (__ppc__) || \
--     defined(_POWER) || defined(_ARCH_PPC))
-+     defined(_POWER) || defined(_ARCH_PPC) || (defined(__linux__) && defined(__aarch64__)))
-     // On PowerPC, having an executable page that has no read permission
-     // can have unintended consequences.  The function InvalidateInstruction-
-     // Cache uses instructions dcbf and icbi, both of which are treated by
diff --git a/main/llvm9/python3-test.patch b/main/llvm9/python3-test.patch
deleted file mode 100644
index 746313317e1..00000000000
--- a/main/llvm9/python3-test.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- llvm-7.0.1.src/test/BugPoint/compile-custom.ll.py.old	2014-03-13 00:10:37.000000000 +0000
-+++ llvm-7.0.1.src/test/BugPoint/compile-custom.ll.py	2019-03-10 03:48:48.600000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- import sys
- 
diff --git a/main/lm-sensors/APKBUILD b/main/lm-sensors/APKBUILD
index a795471ce30..94f445f6e6c 100644
--- a/main/lm-sensors/APKBUILD
+++ b/main/lm-sensors/APKBUILD
@@ -1,19 +1,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lm-sensors
 pkgver=3.6.0
-pkgrel=0
+pkgrel=5
 _ver=${pkgver//./-}
 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring."
 url="https://github.com/lm-sensors/lm-sensors"
 arch="all"
-provides="lm_sensors"
+provides="lm_sensors=$pkgver-r$pkgrel"
 options="!check"  # No test suite.
 license="LGPL-2.1-or-later AND GPL-2.0-or-later"  # libs are LGPL, binaries are GPL
-depends="bash sysfsutils"
-makedepends="perl rrdtool-dev bison flex"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-detect $pkgname-sensord
-	$pkgname-sensord-openrc:sensord_openrc"
-#install=sensors.install
+depends="sysfsutils"
+makedepends="bash perl rrdtool-dev bison flex"
+subpackages="
+	$pkgname-detect
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-fancontrol
+	$pkgname-fancontrol-openrc:fancontrol_openrc
+	$pkgname-libs
+	$pkgname-sensord
+	$pkgname-sensord-openrc:sensord_openrc
+	"
+install="$pkgname.post-upgrade"
 
 source="$pkgname-$pkgver.tar.gz::https://github.com/lm-sensors/lm-sensors/archive/V$_ver.tar.gz
 	sensors-detect-alpine.patch
@@ -24,7 +32,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/lm-sensors/lm-sensors/archiv
 builddir="$srcdir"/$pkgname-$_ver
 
 prepare() {
-	cd "$builddir"
 	sed -i -e 's:^# \(PROG_EXTRA\):\1:' Makefile
 	# Respect LDFLAGS
 	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile
@@ -38,20 +45,15 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	export CFLAGS="$CFLAGS -fno-stack-protector"
 	make PREFIX=/usr user
 }
 
 package() {
-	cd "$builddir"
 	make PROG_EXTRA:=sensord user_install \
 		PREFIX=/usr \
 		MANDIR=/usr/share/man \
 		DESTDIR="$pkgdir"
-
-	cd "$srcdir"
-	install -Dm755 fancontrol.initd "$pkgdir"/etc/init.d/fancontrol
 }
 
 detect() {
@@ -63,6 +65,19 @@ detect() {
 	mv usr/sbin/sensors-detect "$subpkgdir"/usr/bin/
 }
 
+fancontrol() {
+	arch="noarch"
+	depends="bash"
+	pkgdesc="fancontrol daemon"
+	amove usr/sbin/fancontrol usr/sbin/pwmconfig
+}
+
+fancontrol_openrc() {
+	pkgdesc="fancontrol daemon (OpenRC init scripts)"
+	install_if="$pkgname-fancontrol=$pkgver-r$pkgrel openrc"
+	install -Dm755 "$srcdir"/fancontrol.initd "$subpkgdir"/etc/init.d/fancontrol
+}
+
 sensord() {
 	pkgdesc="sensord daemon"
 	cd "$builddir"
@@ -74,11 +89,13 @@ sensord_openrc() {
 	pkgdesc="sensord daemon (OpenRC init scripts)"
 	install_if="$pkgname-sensord=$pkgver-r$pkgrel openrc"
 	install -Dm755 "$srcdir"/sensord.initd "$subpkgdir"/etc/init.d/sensord
-	install -Dm755 "$srcdir"/sensord.confd "$subpkgdir"/etc/conf.d/sensord
+	install -Dm644 "$srcdir"/sensord.confd "$subpkgdir"/etc/conf.d/sensord
 }
 
-sha512sums="4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf  lm-sensors-3.6.0.tar.gz
+sha512sums="
+4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf  lm-sensors-3.6.0.tar.gz
 794cf2aaa2a9e809c6b67f4c888a89064bba3e5b9333a9f0101a92372c25012e506fa48e86523f57cf30e5c2a808bc38058fd8640c870ea6b48faab44794cfbb  sensors-detect-alpine.patch
 04756c3844033dc7897e1348181140a43f8470c1bb863f1524b21bbe6be2f13fbf17ac3a68270c96a70d8c148124fea569d1ef75619bbe383e15ec705ea18b21  fancontrol.initd
 a77d81ab7ded085ba19e4c637e93268f889ccb8ce9e008a210ae135cb6e2140be07e5d455cf7fcc1084fd57cfbfb3f2bb37207123aebe9566f78b5183806fd7d  sensord.confd
-9a19874c158e82ab076ed5fb96a40d4bfb4957bfd5a2ce66aa207c06e577bc1b048336c0046a9f856f6d00dc10e68a0dc9726f6e726a8f7bfd50c4043ee1e26a  sensord.initd"
+9a19874c158e82ab076ed5fb96a40d4bfb4957bfd5a2ce66aa207c06e577bc1b048336c0046a9f856f6d00dc10e68a0dc9726f6e726a8f7bfd50c4043ee1e26a  sensord.initd
+"
diff --git a/main/lm-sensors/lm-sensors.post-upgrade b/main/lm-sensors/lm-sensors.post-upgrade
new file mode 100644
index 00000000000..47c720c2aeb
--- /dev/null
+++ b/main/lm-sensors/lm-sensors.post-upgrade
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+ver_old=$2
+
+# In 3.6.0-4 fancontrol and pwmconfig moved to the
+# lm-sensors-fancontrol subpackage.
+
+if [ "$(apk version -t "$ver_old" '3.6.0-r4')" = '<' ]; then
+	echo "fancontrol & pwmconfig have moved to the lm-sensors-fancontrol subpackage"
+fi
+
+exit 0
diff --git a/main/lmdb/APKBUILD b/main/lmdb/APKBUILD
index 4d7e4ec5616..94b4d0e687c 100644
--- a/main/lmdb/APKBUILD
+++ b/main/lmdb/APKBUILD
@@ -1,47 +1,36 @@
 # Contributor: Olivier Mauras <olivier@mauras.ch>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lmdb
-pkgver=0.9.24
-pkgrel=1
+pkgver=0.9.32
+pkgrel=0
 pkgdesc="Lightning Memory-Mapped Database"
-url="https://symas.com/mdb"
+url="https://symas.com/lmdb/"
 arch="all"
 license="OLDAP-2.8"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
-source="https://github.com/LMDB/lmdb/archive/LMDB_$pkgver.tar.gz
+source="https://git.openldap.org/openldap/openldap/-/archive/LMDB_$pkgver/openldap-LMDB_$pkgver.tar.gz
 	lmdb-make.patch
-	cacheflush.patch
+	lmdb.pc
 	"
-builddir="$srcdir/$pkgname-LMDB_$pkgver/libraries/liblmdb"
+builddir="$srcdir/openldap-LMDB_$pkgver/libraries/liblmdb"
+
+prepare() {
+	default_prepare
+	sed -i "s|@@VERSION@@|$pkgver|" -i "$srcdir"/*.pc
+}
 
 build() {
-	cd "$builddir"
-	make CFLAGS+="-fPIC"
+	make CC="${CC:-cc}" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS -O2 -fPIC"
 }
 
 check() {
-	cd "$builddir"
 	LD_LIBRARY_PATH="$PWD" make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" prefix=/usr install
 
-	mkdir -p "$pkgdir"/usr/lib/pkgconfig
-	cat >"$pkgdir"/usr/lib/pkgconfig/lmdb.pc <<-EOF
-	prefix=/usr
-	exec_prefix=\${prefix}
-	libdir=\${exec_prefix}/lib
-	includedir=\${prefix}/include
-
-	Name: liblmdb
-	Description: Lightning Memory-mapped key-value database
-	URL: http://symas.com/mdb/
-	Version: $pkgver
-	Libs: -L\${libdir} -llmdb
-	Cflags: -I\${includedir}
-	EOF
+	install -Dm0644 "$srcdir"/*.pc -t "$pkgdir"/usr/lib/pkgconfig
 }
 
 tools() {
@@ -49,6 +38,8 @@ tools() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
 }
 
-sha512sums="c3a96c27f13c072ef5861bcea045d82f0a220dbd938579411ea6c38ac0696b3620c71f1e2cc56d31db5105f3533da95aba1ac34653d8bdcfa4f2f1fb831cccb1  LMDB_0.9.24.tar.gz
-1ae28e850a32694f81cb7bf4abaab9cd96ef6c963de91f96810de3afee4da41102e310a6fb0ed889e9e9e04e00342f25272c04a8b483615dccfc039e34538594  lmdb-make.patch
-f30b5f60ad3788abe3caa91a787c00190d6cceef5d20339624ce3d128f59de1a65d6913ab28f938c52237c40cbaef8a2bff2be7158da32f8c4562aa240fd11a2  cacheflush.patch"
+sha512sums="
+b249e598e6e54e39d664525ecfef96b05b2ad7838530026edd2f3bb0069f4e7d8d058dbbb51ccd9bac5b6d7838adba31ae60639bbfe74cd370489adf394bca72  openldap-LMDB_0.9.32.tar.gz
+2d964e250894cecd00a6b4f2f3dd3797ee1434c4299fcea0a4255f5f09cdfa2fe21bfb74d9e0816d79fd44bfa309697f1eb2709268a5376593bde901463852cf  lmdb-make.patch
+0cc194beedd8c1adc7cc1390eb131c800142c14120e47fc744d84f8225efecfa8d4854f4ed26021166b4b7cb021ffc4f068e0009958b1ce6247941fce9658233  lmdb.pc
+"
diff --git a/main/lmdb/cacheflush.patch b/main/lmdb/cacheflush.patch
deleted file mode 100644
index 281a03124c1..00000000000
--- a/main/lmdb/cacheflush.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/mdb.c
-+++ b/mdb.c
-@@ -77,8 +77,7 @@
- 
- #if defined(__mips) && defined(__linux)
- /* MIPS has cache coherency issues, requires explicit cache control */
--#include <asm/cachectl.h>
--extern int cacheflush(char *addr, int nbytes, int cache);
-+#include <sys/cachectl.h>
- #define CACHEFLUSH(addr, bytes, cache)	cacheflush(addr, bytes, cache)
- #else
- #define CACHEFLUSH(addr, bytes, cache)
diff --git a/main/lmdb/lmdb-make.patch b/main/lmdb/lmdb-make.patch
index e053b796e82..55326749423 100644
--- a/main/lmdb/lmdb-make.patch
+++ b/main/lmdb/lmdb-make.patch
@@ -41,7 +41,7 @@ index f254511..949d9ae 100644
  
  test:	all
  	rm -rf testdb && mkdir testdb
-@@ -64,20 +68,24 @@ test:	all
+@@ -64,21 +68,25 @@ test:	all
  liblmdb.a:	mdb.o midl.o
  	$(AR) rs $@ mdb.o midl.o
  
@@ -64,6 +64,7 @@ index f254511..949d9ae 100644
 -mtest4:	mtest4.o liblmdb.a
 -mtest5:	mtest5.o liblmdb.a
 -mtest6:	mtest6.o liblmdb.a
+-mplay:	mplay.o liblmdb.a
 +	$(CC) $(LDFLAGS) -pthread -shared -Wl,-soname,liblmdb$(SOEXT).$(SOVER_MAJ) -o $@ mdb.lo midl.lo $(SOLIBS)
 +
 +mdb_stat: mdb_stat.o liblmdb.so
@@ -76,6 +77,7 @@ index f254511..949d9ae 100644
 +mtest4:	mtest4.o liblmdb.so
 +mtest5:	mtest5.o liblmdb.so
 +mtest6:	mtest6.o liblmdb.so
++mplay:	mplay.o liblmdb.so
  
  mdb.o: mdb.c lmdb.h midl.h
  	$(CC) $(CFLAGS) $(CPPFLAGS) -c mdb.c
diff --git a/main/lmdb/lmdb.pc b/main/lmdb/lmdb.pc
new file mode 100644
index 00000000000..3362f2c865e
--- /dev/null
+++ b/main/lmdb/lmdb.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: liblmdb
+Description: Lightning Memory-mapped key-value database
+URL: http://symas.com/mdb/
+Version: @@VERSION@@
+Libs: -L${libdir} -llmdb
+Cflags: -I${includedir}
diff --git a/main/lockfile-progs/APKBUILD b/main/lockfile-progs/APKBUILD
index e008659b90d..95437e9dd7f 100644
--- a/main/lockfile-progs/APKBUILD
+++ b/main/lockfile-progs/APKBUILD
@@ -1,40 +1,38 @@
 # Contributor: Duane Hughes <duanejevon@gmail.com
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lockfile-progs
-pkgver=0.1.18
-pkgrel=1
+pkgver=0.1.19
+pkgrel=3
 pkgdesc="Programs for locking and unlocking files and mailboxes"
 url="https://packages.debian.org/sid/lockfile-progs"
 arch="all"
-license="GPL-2.0-only"
+license="GPL-2.0-or-later"
 makedepends="liblockfile-dev"
 subpackages="$pkgname-doc"
-source="http://ftp.debian.org/debian/pool/main/l/lockfile-progs/lockfile-progs_$pkgver.tar.gz"
+source="https://deb.debian.org/debian/pool/main/l/lockfile-progs/lockfile-progs_$pkgver.tar.gz"
 
 prepare() {
-	cd "$builddir"
+	default_prepare
 	# allow us to verride CFLAGS by using 'CFLAGS ?= ...' instead of
 	# 'CFLAGS := ...' in the Makefile
 	sed -i -e '/^CFLAGS/s/:=/?=/' Makefile
 }
 
 build() {
-	cd "$builddir"
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
-
 	install -d "$pkgdir"/usr/bin
 	install -d "$pkgdir"/usr/share/man
 	install -m 755 "$builddir"/bin/* "$pkgdir"/usr/bin
 	install -m 644 "$builddir"/man/* "$pkgdir"/usr/share/man
 }
 
-sha512sums="08ef12fd6d586a43b390ead013aa7401beeda68e1d681b3d168d36530e383de8f10c8f9f53fec281f02ef39290b64b0abb9f543fde7b30061204523e6e8ec6e3  lockfile-progs_0.1.18.tar.gz"
+sha512sums="
+7ec20466bee9278562ad764d07048fa5ed14003e18a0147f201020a3eb14e3d14aad5a3a89682ce358c80770dc2b944fc5b453d6afae2dbf2f58d1b756d80303  lockfile-progs_0.1.19.tar.gz
+"
diff --git a/main/log4cplus/APKBUILD b/main/log4cplus/APKBUILD
new file mode 100644
index 00000000000..e2068c2dd63
--- /dev/null
+++ b/main/log4cplus/APKBUILD
@@ -0,0 +1,54 @@
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=log4cplus
+pkgver=2.1.1
+pkgrel=0
+pkgdesc="Logging Framework for C++"
+url="https://github.com/log4cplus/log4cplus"
+arch="all"
+license="Apache-2.0 AND BSD-2-Clause"
+checkdepends="findutils"
+subpackages="
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-unicode
+	"
+source="https://github.com/log4cplus/log4cplus/releases/download/REL_${pkgver//./_}/log4cplus-$pkgver.tar.xz"
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--disable-implicit-initialization \
+		--enable-lto \
+		--enable-static \
+		--with-working-c-locale
+	make
+}
+
+check() {
+	make check || {
+		find . -name testsuite.log -type f -ls \
+			-printf '%P {{{\n' \
+			-exec cat -v -n '{}' ';' \
+			-printf '}}} %P\n'
+		return 1
+	}
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+unicode() {
+	pkgdesc="$pkgdesc (Unicode)"
+
+	amove ./usr/lib/liblog4cplusU*
+}
+
+sha512sums="
+7cb03b7e230c3ec775eaf91ed32860e8d5e8015fa07713312c7febd379ec5a05758ef861b8cddf7a8776c8981c0948dff0baccf0aa9ce07540de7e2864669b74  log4cplus-2.1.1.tar.xz
+"
diff --git a/main/logcheck/APKBUILD b/main/logcheck/APKBUILD
index d15e7d04e0b..5d58df569a2 100644
--- a/main/logcheck/APKBUILD
+++ b/main/logcheck/APKBUILD
@@ -1,29 +1,26 @@
 # Contributor: Duane Hughes <duanejevon@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=logcheck
-pkgver=1.3.20
-pkgrel=1
+pkgver=1.4.3
+pkgrel=0
 pkgdesc="Bash scripts used to monitor system log files for anomalies"
 options="!check" # Requires writing to root owned paths but can't run as root
-url="http://packages.debian.org/source/sid/logcheck"
+url="https://packages.debian.org/source/sid/logcheck"
 arch="noarch"
 license="GPL-2.0-or-later"
-depends="lockfile-progs"
+depends="
+	bash
+	lockfile-progs
+	perl
+	"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc"
 pkgusers="logcheck"
-source="http://ftp.debian.org/debian/pool/main/l/logcheck/${pkgname}_$pkgver.tar.xz
-	logcheck.cron.d"
-
-builddir="$srcdir"/$pkgname
-
-build() {
-	cd "$builddir"
-	return 0
-}
+source="https://deb.debian.org/debian/pool/main/l/logcheck/logcheck_$pkgver.tar.xz
+	logcheck.cron.d
+	"
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	mkdir -p "$pkgdir"/var/lib/$pkgname
 	mkdir -p "$pkgdir"/var/lock/$pkgname
@@ -34,5 +31,7 @@ package() {
 	chown -R $pkgusers "$pkgdir"/etc/logcheck "$pkgdir"/var/lock/logcheck "$pkgdir"/var/lib/logcheck
 }
 
-sha512sums="deeee10c62f74c44a26e579cf0f11022d92917269dcad0fee27ab92a618746dc7ef76255fa96e0bf60ae0cd5fa2be758937f9b2807a5a179942701f58dead758  logcheck_1.3.20.tar.xz
-a177388f18c220323eea6f5413f76873e6ad2a2334f58a05727c7b94a793fcb98bd605cefc6fe44aca6afe5c50a9ef851abcc439aefe5b7545d5d6bb584c0a8b  logcheck.cron.d"
+sha512sums="
+e6c3ef20b44e23099a6b9054f210c8baead6f6a6a84d2d2f0bc465ef95bdf9b267a85f59ec876d1854e0e76f1fb4263a30036caf84b4c8bff15763fb6f9ff6a2  logcheck_1.4.3.tar.xz
+a177388f18c220323eea6f5413f76873e6ad2a2334f58a05727c7b94a793fcb98bd605cefc6fe44aca6afe5c50a9ef851abcc439aefe5b7545d5d6bb584c0a8b  logcheck.cron.d
+"
diff --git a/main/logrotate/APKBUILD b/main/logrotate/APKBUILD
index 3126b45d284..bdffa5bd47b 100644
--- a/main/logrotate/APKBUILD
+++ b/main/logrotate/APKBUILD
@@ -1,18 +1,25 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=logrotate
-pkgver=3.16.0
-pkgrel=0
+pkgver=3.21.0
+pkgrel=1
 pkgdesc="Tool to rotate logfiles"
 url="https://github.com/logrotate/logrotate"
 arch="all"
 license="GPL-2.0-or-later"
-makedepends="popt-dev autoconf automake libtool"
-subpackages="$pkgname-doc $pkgname-openrc"
-source="$url/releases/download/$pkgver/$pkgname-$pkgver.tar.xz
+install="$pkgname.post-upgrade"
+makedepends="popt-dev autoconf automake acl-dev libtool"
+checkdepends="coreutils"
+subpackages="$pkgname-doc $pkgname-openrc $pkgname-syslog"
+source="https://github.com/logrotate/logrotate/releases/download/$pkgver/logrotate-$pkgver.tar.xz
 	logrotate.cron
 	logrotate.conf
-	logrotate.confd"
+	logrotate.confd
+	syslog"
+
+# secfixes:
+#   3.20.1-r0:
+#     - CVE-2022-1348
 
 prepare() {
 	default_prepare
@@ -27,10 +34,15 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--localstatedir=/var
+		--localstatedir=/var \
+		--with-acl
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
 	make DESTDIR="$pkgdir" install
 
@@ -44,7 +56,16 @@ package() {
 		"$pkgdir"/etc/conf.d/logrotate
 }
 
-sha512sums="2f6afbd6f14a693e3571aa813ed94b85a041a00e31bb274ee0f3055d0eeeb7e79a202eed0d63c0bd5818e96d70855f252b15f70f4320372c9814809153739070  logrotate-3.16.0.tar.xz
+syslog() {
+	pkgdesc="Rotation for the main syslog file"
+	depends=$pkgname
+	install -D -m 644 syslog "$subpkgdir"/etc/logrotate.d/syslog
+}
+
+sha512sums="
+c576df7d2bc1a1db2f99befdd0ea627aef2d97bdcd4a7cdea76870623ba92fb1f04f1af6d15b75e4a9085f4aef2ae5e9843c4094cdd01e24d89872ccaf9c0d4a  logrotate-3.21.0.tar.xz
 f4d708594fb2b240cfc2928f38a180d27c2cecb9867e048dc29a32c0147244db4d2f6d92e7bff27e1f2623537587db87b2f8fc9bb988f98eff0c98f79f5a5bf2  logrotate.cron
-9e6a1d024b1cf1ddb8b631fdc1379bfecbfeb1af873930d2a19d32313b26881926df5c21b47b55ada2b6012be981ec2d6d8fa2f249a68b61fd2c97c32f52a957  logrotate.conf
-be9f0043b594d26b4f64e07a2188d19c3c43af75ef726305e4d98f744fc16cee9f280227116858e2f5b781c0a7b58e0209d7e9ab1285dfa7ba55a9dfda700229  logrotate.confd"
+e91c1648a088410d1f5ad16d05b67e316977be5cc0cbbb21a4e1fda2267415fb7945553aa4b4a4701d658fd6bfe35e3d9a304e0cf2a9c7f1be5a5753c3dbc7cb  logrotate.conf
+be9f0043b594d26b4f64e07a2188d19c3c43af75ef726305e4d98f744fc16cee9f280227116858e2f5b781c0a7b58e0209d7e9ab1285dfa7ba55a9dfda700229  logrotate.confd
+db8792e407635ea272a1caab2d25d59b3180443057ec2b624fdd7f115cb904afb192690eb1c88b1fb25712189fc4e44cebd77bc5236abdc323c5c526841dccf7  syslog
+"
diff --git a/main/logrotate/logrotate.conf b/main/logrotate/logrotate.conf
index ba75a0c2cb8..30cf9c99049 100644
--- a/main/logrotate/logrotate.conf
+++ b/main/logrotate/logrotate.conf
@@ -17,9 +17,6 @@ tabooext + .apk-new
 # uncomment this if you want your log files compressed
 compress
 
-# main log file
-/var/log/messages {}
-
 # apk packages drop log rotation information into this directory
 include /etc/logrotate.d
 
diff --git a/main/logrotate/logrotate.post-upgrade b/main/logrotate/logrotate.post-upgrade
new file mode 100644
index 00000000000..a3c4750d7e5
--- /dev/null
+++ b/main/logrotate/logrotate.post-upgrade
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+ver_old=$2
+
+if [ "$(apk version -t "$ver_old" '3.20.1-r1')" = '<' ]; then
+        # need to remove world permissions from status file, to dodge
+        # error: state file /var/lib/logrotate.status is world-readable
+        # 640 matches the spec file
+        chmod 640 /var/lib/logrotate.status
+fi
+
+exit 0
diff --git a/main/logrotate/syslog b/main/logrotate/syslog
new file mode 100644
index 00000000000..6eb4e73fccc
--- /dev/null
+++ b/main/logrotate/syslog
@@ -0,0 +1 @@
+/var/log/messages {}
diff --git a/main/logtail/APKBUILD b/main/logtail/APKBUILD
index 4a05ac54f72..d21f2e78d25 100644
--- a/main/logtail/APKBUILD
+++ b/main/logtail/APKBUILD
@@ -10,36 +10,25 @@
 # offical package project name is 'logtail-v3'
 # At the risk of being technically incorrect we call this package logtail
 pkgname=logtail
-pkgver=3.21
-pkgrel=0
-pkgdesc="Print new lines in log file since the last run (sf.net $pkgname-v3 ver)"
-url="http://logtail-v3.sourceforge.net/"
+pkgver=3.22
+pkgrel=3
+pkgdesc="Print new lines in log file since the last run (sf.net logtail-v3 ver)"
+url="https://logtail-v3.sourceforge.net/"
 arch="all"
-license="GPL-2.0"
-depends=""
-makedepends=""
-subpackages=""
-source="https://downloads.sourceforge.net/$pkgname-v3/$pkgname-v$pkgver.zip"
+license="GPL-2.0-or-later"
+options="!check" # no tests
+source="https://downloads.sourceforge.net/logtail-v3/logtail-v$pkgver.zip"
 
-
-prepare() {
-	local i
-	cd "$srcdir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p0 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build () {
+build() {
 	cd "$srcdir"
 	cc -D_OS_UNIX -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -o logtail logtail-v$pkgver.c
 }
 
 package() {
 	cd "$srcdir"
-	install -Dm755 logtail "$pkgdir"/usr/bin/logtail || return 1
+	install -Dm755 logtail "$pkgdir"/usr/bin/logtail
 }
 
-sha512sums="084d85db26b5f94d3a187d47ca31e91d39ba789eb3e19dfcbda406a693037bb8316419e37ad7ffdf37c034476cc624e8a28092fcea18190032605eae98891127  logtail-v3.21.zip"
+sha512sums="
+591f1a2c9e37952ec2e2e1e53189ad9b0b74bd77f44a688b8d439420830a6835f27e52ea47f7a670811bd3a80f6a313783410724577f54d52190a698576025d2  logtail-v3.22.zip
+"
diff --git a/main/lsof/APKBUILD b/main/lsof/APKBUILD
index 4548d582005..832bcd5c7fa 100644
--- a/main/lsof/APKBUILD
+++ b/main/lsof/APKBUILD
@@ -1,33 +1,47 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lsof
-pkgver=4.93.2
+pkgver=4.99.3
 pkgrel=0
 pkgdesc="LiSt Open Files"
-url="https://people.freebsd.org/~abe"
+url="https://github.com/lsof-org/lsof"
 arch="all"
-license="lsof"
+license="custom"
 subpackages="$pkgname-doc"
-makedepends="linux-headers"
-source="https://fossies.org/linux/misc/lsof-$pkgver.tar.xz"
+makedepends="bash linux-headers perl"
+source="https://github.com/lsof-org/lsof/archive/$pkgver/lsof-$pkgver.tar.gz
+	hassecurity.patch
+	"
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 
-	sed -i "s|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|" \
-		dialects/linux/machine.h
+	# This test is skipped on other architectures where unshare
+	# returns "Operation not permitted", but on ppc64le unshare
+	# returns "Function not implemented" causing a fail instead
+	case "$CARCH" in
+	ppc64le)
+		rm -v lib/dialects/linux/tests/case-20-mmap.bash
+		;;
+	esac
 }
 
 build() {
-	cd "$builddir"
 	./Configure -n linux
 	make
 }
 
+check() {
+	(cd tests && ./Add2TestDB)
+	make check
+}
+
 package() {
-	cd "$builddir"
-	install -Dm0755 lsof "$pkgdir"/usr/bin/lsof
+	install -Dm0755 lsof -t "$pkgdir"/usr/bin/
 	install -Dm0644 Lsof.8 "$pkgdir"/usr/share/man/man8/lsof.8
+	install -Dm0644 COPYING -t "$pkgdir"/usr/share/licenses/$pkgname/
 }
 
-sha512sums="9ce751092bec5d2dccb79d92aa1d7c541819e0e24e56bd0a3ec0513bd7a403c3abb85a68aa5283f84aa44b4f71742ed18f5437cc039c13ce886bf22facd1557a  lsof-4.93.2.tar.xz"
+sha512sums="
+eed9cddecf93cf55e8106a0409d254feca8c5c40792d7dad4b34cbe7c9caec00b7a7b9526465362bf3448efef219fd6e309051455d20fd0945391e915a43bc93  lsof-4.99.3.tar.gz
+379c24df3bcad88bd35c2d9331064312e9faa0e6426479b3e3d3edd377860007ba3af2a0b4b0b998f0146bfd7d067dc4ee7d6f32a6f5e352afc875f6298ab1c2  hassecurity.patch
+"
diff --git a/main/lsof/hassecurity.patch b/main/lsof/hassecurity.patch
new file mode 100644
index 00000000000..5e758d8a85d
--- /dev/null
+++ b/main/lsof/hassecurity.patch
@@ -0,0 +1,11 @@
+--- a/lib/dialects/linux/machine.h
++++ b/lib/dialects/linux/machine.h
+@@ -390,7 +390,7 @@
+  * (the one that its user logged on with) of the lsof process.
+  */
+ 
+-/* #define	HASSECURITY	1 */
++#define	HASSECURITY	1
+ 
+ /*
+  * If HASSECURITY is defined, define HASNOSOCKSECURITY to allow users
diff --git a/main/lsyncd/APKBUILD b/main/lsyncd/APKBUILD
index 616fa4c9d49..6d31a4d47b7 100644
--- a/main/lsyncd/APKBUILD
+++ b/main/lsyncd/APKBUILD
@@ -1,49 +1,56 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lsyncd
-pkgver=2.2.3
+pkgver=2.3.1
 pkgrel=1
-_luaver=5.3
+_luaver=5.4
 pkgdesc="Live Syncing (Mirror) Daemon"
-url="https://github.com/axkibe/lsyncd"
+url="https://github.com/lsyncd/lsyncd"
 arch="all"
 license="GPL-2.0-or-later"
 depends="rsync"
-makedepends="$depends_dev cmake lua$_luaver lua$_luaver-dev"
+makedepends="$depends_dev cmake lua$_luaver lua$_luaver-dev samurai"
 options="!check" # needs passwordless ssh access to localhost
 subpackages="$pkgname-doc $pkgname-openrc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/axkibe/lsyncd/archive/release-$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/lsyncd/lsyncd/archive/release-$pkgver.tar.gz
 	fix-realpath.patch
-	fix-mandir.patch
 	lpostcmd.patch
+	fix-mandir.patch
+	lua5.4.patch
 	$pkgname.initd
 	"
 builddir="$srcdir"/lsyncd-release-$pkgver
 
+prepare() {
+	default_prepare
+	rm -R "$builddir"/tests
+}
+
 build() {
-	cd "$builddir"
-	cmake -DCMAKE_INSTALL_PREFIX=/usr \
+	cmake -B build -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DLUA_COMPILER=/usr/bin/luac$_luaver \
 		-DLUA_EXECUTABLE=/usr/bin/lua$_luaver \
 		-DLUA_INCLUDE_DIR=/usr/include/lua$_luaver \
 		-DLUA_LIBRARY=/usr/lib/lua$_luaver/liblua.so
-	make
+	cmake --build build
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 	mkdir -p "$pkgdir/etc/lsyncd"
 	cp "$builddir"/examples/*.lua \
 		"$pkgdir"/etc/lsyncd/
 	install -Dm755 "$srcdir/$pkgname.initd" \
 		"$pkgdir/etc/init.d/$pkgname"
-
 }
 
-sha512sums="2193a342f8aa7d8cfb55378c9c59ca61d2d8e4026263fd6e6560c730c712cef1f189305a3f9bca58f5b9c9ffae5af12e1d75e5355d5bdae86a47ad9595b8169a  lsyncd-2.2.3.tar.gz
+sha512sums="
+195cc46e00c58301aca6afb027eb0ad663254b3028bcf3e5d4fb7709bbcf2a6eb8ba9a39cae62c951eb4562795e0a147efb1ddcdd22a0b46742ec7c17f478fbe  lsyncd-2.3.1.tar.gz
 2cebaf59d960321c2eda4ef1e0d850f62eb7eedb7ba8922a5db33a7f78c769d1a52839fbb597ae06ba576632e2abc7b92a6ba2eaf58b71b93bc877db83e25576  fix-realpath.patch
-6283f973768467942a69cb4fd835cfef81ffd1d9acccdea21b1f40730f67d5ff0e8db33772f28be2a6abb352c9596a01dbf215aa228072f7439b69ad8c691c61  fix-mandir.patch
 047ee8b2fae169e444c81e9b3ce0ef38713a114877cc38f6aee0594cd64c7b7d99d22ac81fe5e6ac87767956e8757731374a179800ec57fe664f058788ba482b  lpostcmd.patch
-441b76ec944d9d74100dfca55efe871e9092b37cd49ec79a2a94e281dc0326b4def1645a827f7d3edcddc95d6e74c99621b62991396fb3693b1832c42fd86cdc  lsyncd.initd"
+8bf810537085cf5b0408bb50e29fe1d197bc56d4dcfc8ed34c05d3a8fa2bf89c7d8091a53eda0818aa92a2db9714562186618ddb7b4fef94ebdc2d200d95387e  fix-mandir.patch
+94b58b465dd8c0c84dfa033326e7acf2a5d2f37179eea07d14fd964a49016e256b2046cf16d5d50fb3b5ea71dd1e7dea21b10e860b613a46ddf3b853180ddcb4  lua5.4.patch
+441b76ec944d9d74100dfca55efe871e9092b37cd49ec79a2a94e281dc0326b4def1645a827f7d3edcddc95d6e74c99621b62991396fb3693b1832c42fd86cdc  lsyncd.initd
+"
diff --git a/main/lsyncd/fix-mandir.patch b/main/lsyncd/fix-mandir.patch
index 6eceefe36a3..e125ec5d684 100644
--- a/main/lsyncd/fix-mandir.patch
+++ b/main/lsyncd/fix-mandir.patch
@@ -1,9 +1,11 @@
---- ./CMakeLists.txt.orig
-+++ ./CMakeLists.txt
-@@ -107,5 +107,5 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -127,6 +127,6 @@
  target_link_libraries( lsyncd ${LUA_LIBRARIES} )
  
  install( TARGETS lsyncd RUNTIME DESTINATION bin )
--install( FILES doc/manpage/lsyncd.1 DESTINATION man )
-+install( FILES doc/manpage/lsyncd.1 DESTINATION share/man/man1 )
- 
+-install( FILES docs/manpage/lsyncd.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT man )
++install( FILES docs/manpage/lsyncd.1 DESTINATION share/man/man1 COMPONENT man )
+-install( DIRECTORY examples DESTINATION doc )
++install( DIRECTORY examples DESTINATION share/doc )
+ install( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION doc OPTIONAL)
diff --git a/main/lsyncd/lua5.4.patch b/main/lsyncd/lua5.4.patch
new file mode 100644
index 00000000000..b305d413161
--- /dev/null
+++ b/main/lsyncd/lua5.4.patch
@@ -0,0 +1,10 @@
+--- a/lsyncd.h
++++ b/lsyncd.h
+@@ -19,6 +19,7 @@
+ 
+ #define LUA_COMPAT_ALL
+ #define LUA_COMPAT_5_1
++#define LUA_COMPAT_5_3
+ 
+ // includes needed for headerfile
+ #include "config.h"
diff --git a/main/ltrace/APKBUILD b/main/ltrace/APKBUILD
index 1913e0c28c2..882c157be1c 100644
--- a/main/ltrace/APKBUILD
+++ b/main/ltrace/APKBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ltrace
 pkgver=0.7.3
-pkgrel=4
+pkgrel=6
 pkgdesc="Tracks runtime library calls in dynamically linked programs"
 url="https://www.ltrace.org/"
-arch="all !aarch64"
+arch="all !riscv64"
 options="!check"  # Test suite has glibc stuff hardcoded.
 license="GPL-2.0-or-later"
 makedepends="linux-headers elfutils-dev autoconf automake"
@@ -14,7 +14,8 @@ subpackages="$pkgname-doc"
 source="https://www.ltrace.org/ltrace_0.7.3.orig.tar.bz2
 	musl.patch
 	add_ppc64le.patch
-	mips.patch"
+	mips.patch
+	ltrace_aarch64.patch"
 
 prepare() {
 	default_prepare
@@ -38,4 +39,5 @@ package() {
 sha512sums="a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d  ltrace_0.7.3.orig.tar.bz2
 c53e05471c52e161a7f7389994c6467e8f3671c5d8478546bc1897f067c62aeab848d728295f339a241a3fc186e180d47bcc2872a6335877c3813b1b62834698  musl.patch
 987c6d18bdb559e8fe739f09cfb0b567dafcf79b2bd5db7ca32ebb205f3b1d74a8008576e4d73ea90873c1ab9bed17d96ddb7ad8752bf0a160ea0638c955eb1f  add_ppc64le.patch
-9cacf203143010cb09b480384b57543c16bdd2c1e0d32935385ce3a4af1df5d3ba4f2fa3e6053609aa4028957f60e10e365d241d387c5de1e82532942ca7eb0b  mips.patch"
+9cacf203143010cb09b480384b57543c16bdd2c1e0d32935385ce3a4af1df5d3ba4f2fa3e6053609aa4028957f60e10e365d241d387c5de1e82532942ca7eb0b  mips.patch
+23fd7e6afc0ab8ab00de46077c624ed2089761dbdc127f80594fbd5ca16053d8f9e8073bb05f6a05941bf89afddf1ee27bacb6f3ca1df29ecb1f2d6a59e27cf2  ltrace_aarch64.patch"
diff --git a/main/ltrace/ltrace_aarch64.patch b/main/ltrace/ltrace_aarch64.patch
new file mode 100644
index 00000000000..92305ee0798
--- /dev/null
+++ b/main/ltrace/ltrace_aarch64.patch
@@ -0,0 +1,1984 @@
+diff -aurN a/configure.ac b/configure.ac
+--- a/configure.ac	2020-05-18 05:41:09.467574845 +0000
++++ b/configure.ac	2020-05-18 06:02:08.784819893 +0000
+@@ -40,6 +40,7 @@
+ 
+ case "${host_cpu}" in
+     arm*|sa110)		HOST_CPU="arm" ;;
++    aarch64)		HOST_CPU="aarch64" ;;
+     cris*)		HOST_CPU="cris" ;;
+     mips*)		HOST_CPU="mips" ;;
+     powerpc|powerpc64)	HOST_CPU="ppc" ;;
+@@ -156,6 +157,7 @@
+ if test x"$enable_libunwind" = xyes; then
+   case "${host_cpu}" in
+       arm*|sa110)         UNWIND_ARCH="arm" ;;
++      aarch64)            UNWIND_ARCH="aarch64" ;;
+       i?86)               UNWIND_ARCH="x86" ;;
+       powerpc)            UNWIND_ARCH="ppc32" ;;
+       powerpc64)          UNWIND_ARCH="ppc64" ;;
+@@ -311,6 +313,7 @@
+ 	sysdeps/linux-gnu/Makefile
+ 	sysdeps/linux-gnu/alpha/Makefile
+ 	sysdeps/linux-gnu/arm/Makefile
++	sysdeps/linux-gnu/aarch64/Makefile
+ 	sysdeps/linux-gnu/cris/Makefile
+ 	sysdeps/linux-gnu/ia64/Makefile
+ 	sysdeps/linux-gnu/m68k/Makefile
+diff -aurN a/sysdeps/linux-gnu/aarch64/arch.h b/sysdeps/linux-gnu/aarch64/arch.h
+--- a/sysdeps/linux-gnu/aarch64/arch.h	1970-01-01 00:00:00.000000000 +0000
++++ b/sysdeps/linux-gnu/aarch64/arch.h	2020-05-18 05:46:59.521800452 +0000
+@@ -0,0 +1,37 @@
++/*
++ * This file is part of ltrace.
++ * Copyright (C) 2014 Petr Machata, Red Hat, Inc.
++ *
++ * This program 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 of the
++ * License, or (at your option) any later version.
++ *
++ * This program 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., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ */
++#ifndef LTRACE_AARCH64_ARCH_H
++#define LTRACE_AARCH64_ARCH_H
++
++/* | 31                 21 | 20       5 | 4       0 | *
++ * | 1 1 0 1 0 1 0 0 0 0 1 |    imm16   | 0 0 0 0 0 | */
++#define BREAKPOINT_VALUE { 0xd4, 0x20, 0, 0 }
++#define BREAKPOINT_LENGTH 4
++#define DECR_PC_AFTER_BREAK 0
++
++#define LT_ELFCLASS	ELFCLASS64
++#define LT_ELF_MACHINE	EM_AARCH64
++
++#define ARCH_HAVE_FETCH_ARG
++#define ARCH_ENDIAN_BIG
++#define ARCH_HAVE_SIZEOF
++#define ARCH_HAVE_ALIGNOF
++
++#endif /* LTRACE_AARCH64_ARCH_H */
+diff -aurN a/sysdeps/linux-gnu/aarch64/fetch.c b/sysdeps/linux-gnu/aarch64/fetch.c
+--- a/sysdeps/linux-gnu/aarch64/fetch.c	1970-01-01 00:00:00.000000000 +0000
++++ b/sysdeps/linux-gnu/aarch64/fetch.c	2020-05-18 05:46:59.521800452 +0000
+@@ -0,0 +1,368 @@
++/*
++ * This file is part of ltrace.
++ * Copyright (C) 2014 Petr Machata, Red Hat, Inc.
++ *
++ * This program 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 of the
++ * License, or (at your option) any later version.
++ *
++ * This program 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., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ */
++
++#include <sys/ptrace.h>
++#include <asm/ptrace.h>
++#include <stdlib.h>
++#include <string.h>
++#include <stdint.h>
++
++#include "fetch.h"
++#include "proc.h"
++#include "type.h"
++#include "value.h"
++#include "stdlib.h"
++#include "stdio.h"
++
++int aarch64_read_gregs(struct Process *proc, struct user_pt_regs *regs);
++int aarch64_read_fregs(struct Process *proc, struct user_fpsimd_state *regs);
++
++
++struct fetch_context
++{
++	struct user_pt_regs gregs;
++	struct user_fpsimd_state fpregs;
++	arch_addr_t nsaa;
++	unsigned ngrn;
++	unsigned nsrn;
++	arch_addr_t x8;
++};
++
++static int
++context_init(struct fetch_context *context, struct Process *proc)
++{
++	if (aarch64_read_gregs(proc, &context->gregs) < 0
++	    || aarch64_read_fregs(proc, &context->fpregs) < 0)
++		return -1;
++
++	context->ngrn = 0;
++	context->nsrn = 0;
++	/* XXX double cast */
++	context->nsaa = (arch_addr_t) (uintptr_t) context->gregs.sp;
++	context->x8 = 0;
++
++	return 0;
++}
++
++struct fetch_context *
++arch_fetch_arg_clone(struct Process *proc, struct fetch_context *context)
++{
++	struct fetch_context *ret = malloc(sizeof(*ret));
++	if (ret == NULL)
++		return NULL;
++	return memcpy(ret, context, sizeof(*ret));
++}
++
++static void
++fetch_next_gpr(struct fetch_context *context, unsigned char *buf)
++{
++	uint64_t u = context->gregs.regs[context->ngrn++];
++	memcpy(buf, &u, 8);
++}
++
++static int
++fetch_gpr(struct fetch_context *context, struct value *value, size_t sz)
++{
++	if (sz < 8)
++		sz = 8;
++
++	unsigned char *buf = value_reserve(value, sz);
++	if (buf == NULL)
++		return -1;
++
++	size_t i;
++	for (i = 0; i < sz; i += 8)
++		fetch_next_gpr(context, buf + i);
++
++	return 0;
++}
++
++static void
++fetch_next_sse(struct fetch_context *context, unsigned char *buf, size_t sz)
++{
++	__int128 u = context->fpregs.vregs[context->nsrn++];
++	memcpy(buf, &u, sz);
++}
++
++static int
++fetch_sse(struct fetch_context *context, struct value *value, size_t sz)
++{
++	unsigned char *buf = value_reserve(value, sz);
++	if (buf == NULL)
++		return -1;
++
++	fetch_next_sse(context, buf, sz);
++	return 0;
++}
++
++static int
++fetch_hfa(struct fetch_context *context,
++	  struct value *value, struct arg_type_info *hfa_t, size_t count)
++{
++	size_t sz = type_sizeof(value->inferior, hfa_t);
++	unsigned char *buf = value_reserve(value, sz * count);
++	if (buf == NULL)
++		return -1;
++
++	size_t i;
++	for (i = 0; i < count; ++i) {
++		fetch_next_sse(context, buf, sz);
++		buf += sz;
++	}
++	return 0;
++}
++
++static int
++fetch_stack(struct fetch_context *context, struct value *value,
++	    size_t align, size_t sz)
++{
++	if (align < 8)
++		align = 8;
++	size_t amount = ((sz + align - 1) / align) * align;
++
++	/* XXX double casts */
++	uintptr_t sp = (uintptr_t) context->nsaa;
++	sp = ((sp + align - 1) / align) * align;
++
++	value_in_inferior(value, (arch_addr_t) sp);
++
++	sp += amount;
++	context->nsaa = (arch_addr_t) sp;
++
++	return 0;
++}
++
++enum convert_method {
++	CVT_ERR = -1,
++	CVT_NOP = 0,
++	CVT_BYREF,
++};
++
++enum fetch_method {
++	FETCH_NOP,
++	FETCH_STACK,
++	FETCH_GPR,
++	FETCH_SSE,
++	FETCH_HFA,
++};
++
++struct fetch_script {
++	enum convert_method c;
++	enum fetch_method f;
++	size_t sz;
++	struct arg_type_info *hfa_t;
++	size_t count;
++};
++
++static struct fetch_script
++pass_arg(struct fetch_context const *context,
++	 struct Process *proc, struct arg_type_info *info)
++{
++	enum fetch_method cvt = CVT_NOP;
++
++	size_t sz = type_sizeof(proc, info);
++	if (sz == (size_t) -1)
++		return (struct fetch_script) { CVT_ERR, FETCH_NOP, sz };
++
++	switch (info->type) {
++	case ARGTYPE_VOID:
++		return (struct fetch_script) { cvt, FETCH_NOP, sz };
++
++	case ARGTYPE_STRUCT:
++	case ARGTYPE_ARRAY:;
++		size_t count;
++		struct arg_type_info *hfa_t = type_get_hfa_type(info, &count);
++		if (hfa_t != NULL && count <= 4) {
++			if (context->nsrn + count <= 8)
++				return (struct fetch_script)
++					{ cvt, FETCH_HFA, sz, hfa_t, count };
++			return (struct fetch_script)
++				{ cvt, FETCH_STACK, sz, hfa_t, count };
++		}
++
++		if (sz <= 16) {
++			size_t count = sz / 8;
++			if (context->ngrn + count <= 8)
++				return (struct fetch_script)
++					{ cvt, FETCH_GPR, sz };
++		}
++
++		cvt = CVT_BYREF;
++		sz = 8;
++		/* Fall through.  */
++
++	case ARGTYPE_POINTER:
++	case ARGTYPE_INT:
++	case ARGTYPE_UINT:
++	case ARGTYPE_LONG:
++	case ARGTYPE_ULONG:
++	case ARGTYPE_CHAR:
++	case ARGTYPE_SHORT:
++	case ARGTYPE_USHORT:
++		if (context->ngrn < 8 && sz <= 8)
++			return (struct fetch_script) { cvt, FETCH_GPR, sz };
++		/* We don't support types wider than 8 bytes as of
++		 * now.  */
++		assert(sz <= 8);
++
++		return (struct fetch_script) { cvt, FETCH_STACK, sz };
++
++	case ARGTYPE_FLOAT:
++	case ARGTYPE_DOUBLE:
++		if (context->nsrn < 8) {
++			/* ltrace doesn't support float128.  */
++			assert(sz <= 8);
++			return (struct fetch_script) { cvt, FETCH_SSE, sz };
++		}
++
++		return (struct fetch_script) { cvt, FETCH_STACK, sz };
++	}
++
++	assert(! "Failed to allocate argument.");
++	abort();
++}
++
++static int
++convert_arg(struct value *value, struct fetch_script how)
++{
++	switch (how.c) {
++	case CVT_NOP:
++		return 0;
++	case CVT_BYREF:
++		return value_pass_by_reference(value);
++	case CVT_ERR:
++		return -1;
++	}
++
++	assert(! "Don't know how to convert argument.");
++	abort();
++}
++
++static int
++fetch_arg(struct fetch_context *context,
++	  struct Process *proc, struct arg_type_info *info,
++	  struct value *value, struct fetch_script how)
++{
++	if (convert_arg(value, how) < 0)
++		return -1;
++
++	switch (how.f) {
++	case FETCH_NOP:
++		return 0;
++
++	case FETCH_STACK:
++		if (how.hfa_t != NULL && how.count != 0 && how.count <= 8)
++			context->nsrn = 8;
++		return fetch_stack(context, value,
++				   type_alignof(proc, info), how.sz);
++
++	case FETCH_GPR:
++		return fetch_gpr(context, value, how.sz);
++
++	case FETCH_SSE:
++		return fetch_sse(context, value, how.sz);
++
++	case FETCH_HFA:
++		return fetch_hfa(context, value, how.hfa_t, how.count);
++	}
++
++	assert(! "Don't know how to fetch argument.");
++	abort();
++}
++
++struct fetch_context *
++arch_fetch_arg_init(enum tof type, struct Process *proc,
++		    struct arg_type_info *ret_info)
++{
++	struct fetch_context *context = malloc(sizeof *context);
++	if (context == NULL || context_init(context, proc) < 0) {
++	fail:
++		free(context);
++		return NULL;
++	}
++
++	/* There's a provision in ARMv8 parameter passing convention
++	 * for returning types that, if passed as first argument to a
++	 * function, would be passed on stack.  For those types, x8
++	 * contains an address where the return argument should be
++	 * placed.  The callee doesn't need to preserve the value of
++	 * x8, so we need to fetch it now.
++	 *
++	 * To my knowledge, there are currently no types where this
++	 * holds, but the code is here, utterly untested.  */
++
++	struct fetch_script how = pass_arg(context, proc, ret_info);
++	if (how.c == CVT_ERR)
++		goto fail;
++	if (how.c == CVT_NOP && how.f == FETCH_STACK) {
++		/* XXX double cast.  */
++		context->x8 = (arch_addr_t) (uintptr_t) context->gregs.regs[8];
++		/* See the comment above about the assert.  */
++		assert(! "Unexpected: first argument passed on stack.");
++		abort();
++	}
++
++	return context;
++}
++
++int
++arch_fetch_arg_next(struct fetch_context *context, enum tof type,
++		    struct Process *proc, struct arg_type_info *info,
++		    struct value *value)
++{
++	return fetch_arg(context, proc, info, value,
++			 pass_arg(context, proc, info));
++}
++
++int
++arch_fetch_retval(struct fetch_context *context, enum tof type,
++		  struct Process *proc, struct arg_type_info *info,
++		  struct value *value)
++{
++	if (context->x8 != 0) {
++		value_in_inferior(value, context->x8);
++		return 0;
++	}
++
++	if (context_init(context, proc) < 0)
++		return -1;
++
++	return fetch_arg(context, proc, info, value,
++			 pass_arg(context, proc, info));
++}
++
++void
++arch_fetch_arg_done(struct fetch_context *context)
++{
++	if (context != NULL)
++		free(context);
++}
++
++size_t
++arch_type_sizeof(struct Process *proc, struct arg_type_info *arg)
++{
++	return (size_t) -2;
++}
++
++size_t
++arch_type_alignof(struct Process *proc, struct arg_type_info *arg)
++{
++	return (size_t) -2;
++}
+diff -aurN a/sysdeps/linux-gnu/aarch64/Makefile.am b/sysdeps/linux-gnu/aarch64/Makefile.am
+--- a/sysdeps/linux-gnu/aarch64/Makefile.am	1970-01-01 00:00:00.000000000 +0000
++++ b/sysdeps/linux-gnu/aarch64/Makefile.am	2020-05-18 05:46:59.521800452 +0000
+@@ -0,0 +1,25 @@
++# This file is part of ltrace.
++# Copyright (C) 2014 Petr Machata, Red Hat, Inc.
++#
++# This program 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 of the
++# License, or (at your option) any later version.
++#
++# This program 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., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301 USA
++
++noinst_LTLIBRARIES = ../libcpu.la
++
++___libcpu_la_SOURCES = fetch.c plt.c regs.c trace.c
++
++noinst_HEADERS = arch.h ptrace.h signalent.h syscallent.h
++
++MAINTAINERCLEANFILES = Makefile.in
+diff -aurN a/sysdeps/linux-gnu/aarch64/plt.c b/sysdeps/linux-gnu/aarch64/plt.c
+--- a/sysdeps/linux-gnu/aarch64/plt.c	1970-01-01 00:00:00.000000000 +0000
++++ b/sysdeps/linux-gnu/aarch64/plt.c	2020-05-18 05:46:59.521800452 +0000
+@@ -0,0 +1,38 @@
++/*
++ * This file is part of ltrace.
++ * Copyright (C) 2014 Petr Machata, Red Hat, Inc.
++ *
++ * This program 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 of the
++ * License, or (at your option) any later version.
++ *
++ * This program 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., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ */
++
++#include <gelf.h>
++
++#include "backend.h"
++#include "proc.h"
++#include "library.h"
++#include "ltrace-elf.h"
++
++arch_addr_t
++sym2addr(struct Process *proc, struct library_symbol *sym)
++{
++	return sym->enter_addr;
++}
++
++GElf_Addr
++arch_plt_sym_val(struct ltelf *lte, size_t ndx, GElf_Rela *rela)
++{
++	return lte->plt_addr + 32 + ndx * 16;
++}
+diff -aurN a/sysdeps/linux-gnu/aarch64/ptrace.h b/sysdeps/linux-gnu/aarch64/ptrace.h
+--- a/sysdeps/linux-gnu/aarch64/ptrace.h	1970-01-01 00:00:00.000000000 +0000
++++ b/sysdeps/linux-gnu/aarch64/ptrace.h	2020-05-18 05:46:59.521800452 +0000
+@@ -0,0 +1,22 @@
++/*
++ * This file is part of ltrace.
++ * Copyright (C) 2014 Petr Machata, Red Hat, Inc.
++ *
++ * This program 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 of the
++ * License, or (at your option) any later version.
++ *
++ * This program 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., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ */
++
++#include <sys/ptrace.h>
++#include <asm/ptrace.h>
+diff -aurN a/sysdeps/linux-gnu/aarch64/regs.c b/sysdeps/linux-gnu/aarch64/regs.c
+--- a/sysdeps/linux-gnu/aarch64/regs.c	1970-01-01 00:00:00.000000000 +0000
++++ b/sysdeps/linux-gnu/aarch64/regs.c	2020-05-18 05:46:59.521800452 +0000
+@@ -0,0 +1,131 @@
++/*
++ * This file is part of ltrace.
++ * Copyright (C) 2014 Petr Machata, Red Hat, Inc.
++ *
++ * This program 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 of the
++ * License, or (at your option) any later version.
++ *
++ * This program 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., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ */
++
++#include <sys/ptrace.h>
++#include <asm/ptrace.h>
++#include <linux/uio.h>
++#include <assert.h>
++#include <stdlib.h>
++#include <stdio.h>
++
++#include "backend.h"
++#include "proc.h"
++
++#define PC_OFF (32 * 4)
++
++int
++aarch64_read_gregs(struct Process *proc, struct user_pt_regs *regs)
++{
++	*regs = (struct user_pt_regs) {};
++	struct iovec iovec;
++	iovec.iov_base = regs;
++	iovec.iov_len = sizeof *regs;
++	return ptrace(PTRACE_GETREGSET, proc->pid, NT_PRSTATUS, &iovec) < 0
++		? -1 : 0;
++}
++
++int
++aarch64_write_gregs(struct Process *proc, struct user_pt_regs *regs)
++{
++	struct iovec iovec;
++	iovec.iov_base = regs;
++	iovec.iov_len = sizeof *regs;
++	return ptrace(PTRACE_SETREGSET, proc->pid, NT_PRSTATUS, &iovec) < 0
++		? -1 : 0;
++}
++
++int
++aarch64_read_fregs(struct Process *proc, struct user_fpsimd_state *regs)
++{
++	*regs = (struct user_fpsimd_state) {};
++	struct iovec iovec;
++	iovec.iov_base = regs;
++	iovec.iov_len = sizeof *regs;
++	return ptrace(PTRACE_GETREGSET, proc->pid, NT_FPREGSET, &iovec) < 0
++		? -1 : 0;
++}
++
++arch_addr_t
++get_instruction_pointer(struct Process *proc)
++{
++	struct user_pt_regs regs;
++	if (aarch64_read_gregs(proc, &regs) < 0) {
++		fprintf(stderr, "get_instruction_pointer: "
++			"Couldn't read registers of %d.\n", proc->pid);
++		return 0;
++	}
++
++	/* 
++	char buf[128];
++	sprintf(buf, "cat /proc/%d/maps", proc->pid);
++	system(buf);
++	*/
++
++	/* XXX double cast */
++	return (arch_addr_t) (uintptr_t) regs.pc;
++}
++
++void
++set_instruction_pointer(struct Process *proc, arch_addr_t addr)
++{
++	struct user_pt_regs regs;
++	if (aarch64_read_gregs(proc, &regs) < 0) {
++		fprintf(stderr, "get_instruction_pointer: "
++			"Couldn't read registers of %d.\n", proc->pid);
++		return;
++	}
++
++	/* XXX double cast */
++	regs.pc = (uint64_t) (uintptr_t) addr;
++
++	if (aarch64_write_gregs(proc, &regs) < 0) {
++		fprintf(stderr, "get_instruction_pointer: "
++			"Couldn't write registers of %d.\n", proc->pid);
++		return;
++	}
++}
++
++arch_addr_t
++get_stack_pointer(struct Process *proc)
++{
++	struct user_pt_regs regs;
++	if (aarch64_read_gregs(proc, &regs) < 0) {
++		fprintf(stderr, "get_stack_pointer: "
++			"Couldn't read registers of %d.\n", proc->pid);
++		return 0;
++	}
++
++	/* XXX double cast */
++	return (arch_addr_t) (uintptr_t) regs.sp;
++}
++
++arch_addr_t
++get_return_addr(struct Process *proc, arch_addr_t stack_pointer)
++{
++	struct user_pt_regs regs;
++	if (aarch64_read_gregs(proc, &regs) < 0) {
++		fprintf(stderr, "get_return_addr: "
++			"Couldn't read registers of %d.\n", proc->pid);
++		return 0;
++	}
++
++	/* XXX double cast */
++	return (arch_addr_t) (uintptr_t) regs.regs[30];
++}
+diff -aurN a/sysdeps/linux-gnu/aarch64/signalent.h b/sysdeps/linux-gnu/aarch64/signalent.h
+--- a/sysdeps/linux-gnu/aarch64/signalent.h	1970-01-01 00:00:00.000000000 +0000
++++ b/sysdeps/linux-gnu/aarch64/signalent.h	2020-05-18 05:46:59.521800452 +0000
+@@ -0,0 +1,52 @@
++/*
++ * This file is part of ltrace.
++ * Copyright (C) 2006 Ian Wienand
++ *
++ * This program 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 of the
++ * License, or (at your option) any later version.
++ *
++ * This program 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., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ */
++
++	"SIG_0",			/* 0 */
++	"SIGHUP",			/* 1 */
++	"SIGINT",			/* 2 */
++	"SIGQUIT",			/* 3 */
++	"SIGILL",			/* 4 */
++	"SIGTRAP",			/* 5 */
++	"SIGABRT",			/* 6 */
++	"SIGBUS",			/* 7 */
++	"SIGFPE",			/* 8 */
++	"SIGKILL",			/* 9 */
++	"SIGUSR1",			/* 10 */
++	"SIGSEGV",			/* 11 */
++	"SIGUSR2",			/* 12 */
++	"SIGPIPE",			/* 13 */
++	"SIGALRM",			/* 14 */
++	"SIGTERM",			/* 15 */
++	"SIGSTKFLT",			/* 16 */
++	"SIGCHLD",			/* 17 */
++	"SIGCONT",			/* 18 */
++	"SIGSTOP",			/* 19 */
++	"SIGTSTP",			/* 20 */
++	"SIGTTIN",			/* 21 */
++	"SIGTTOU",			/* 22 */
++	"SIGURG",			/* 23 */
++	"SIGXCPU",			/* 24 */
++	"SIGXFSZ",			/* 25 */
++	"SIGVTALRM",			/* 26 */
++	"SIGPROF",			/* 27 */
++	"SIGWINCH",			/* 28 */
++	"SIGIO",			/* 29 */
++	"SIGPWR",			/* 30 */
++	"SIGSYS",			/* 31 */
+diff -aurN a/sysdeps/linux-gnu/aarch64/syscallent.h b/sysdeps/linux-gnu/aarch64/syscallent.h
+--- a/sysdeps/linux-gnu/aarch64/syscallent.h	1970-01-01 00:00:00.000000000 +0000
++++ b/sysdeps/linux-gnu/aarch64/syscallent.h	2020-05-18 05:46:59.521800452 +0000
+@@ -0,0 +1,1100 @@
++/*
++ * This file is part of ltrace.
++ * Copyright (C) 2014 Petr Machata, Red Hat, Inc.
++ *
++ * This program 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 of the
++ * License, or (at your option) any later version.
++ *
++ * This program 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., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ */
++
++	"io_setup",                        /* 0 */
++	"io_destroy",                      /* 1 */
++	"io_submit",                       /* 2 */
++	"io_cancel",                       /* 3 */
++	"io_getevents",                    /* 4 */
++	"setxattr",                        /* 5 */
++	"lsetxattr",                       /* 6 */
++	"fsetxattr",                       /* 7 */
++	"getxattr",                        /* 8 */
++	"lgetxattr",                       /* 9 */
++	"fgetxattr",                       /* 10 */
++	"listxattr",                       /* 11 */
++	"llistxattr",                      /* 12 */
++	"flistxattr",                      /* 13 */
++	"removexattr",                     /* 14 */
++	"lremovexattr",                    /* 15 */
++	"fremovexattr",                    /* 16 */
++	"getcwd",                          /* 17 */
++	"lookup_dcookie",                  /* 18 */
++	"eventfd2",                        /* 19 */
++	"epoll_create1",                   /* 20 */
++	"epoll_ctl",                       /* 21 */
++	"epoll_pwait",                     /* 22 */
++	"dup",                             /* 23 */
++	"dup3",                            /* 24 */
++	"fcntl",                           /* 25 */
++	"inotify_init1",                   /* 26 */
++	"inotify_add_watch",               /* 27 */
++	"inotify_rm_watch",                /* 28 */
++	"ioctl",                           /* 29 */
++	"ioprio_set",                      /* 30 */
++	"ioprio_get",                      /* 31 */
++	"flock",                           /* 32 */
++	"mknodat",                         /* 33 */
++	"mkdirat",                         /* 34 */
++	"unlinkat",                        /* 35 */
++	"symlinkat",                       /* 36 */
++	"linkat",                          /* 37 */
++	"renameat",                        /* 38 */
++	"umount2",                         /* 39 */
++	"mount",                           /* 40 */
++	"pivot_root",                      /* 41 */
++	"nfsservctl",                      /* 42 */
++	"statfs",                          /* 43 */
++	"fstatfs",                         /* 44 */
++	"truncate",                        /* 45 */
++	"ftruncate",                       /* 46 */
++	"fallocate",                       /* 47 */
++	"faccessat",                       /* 48 */
++	"chdir",                           /* 49 */
++	"fchdir",                          /* 50 */
++	"chroot",                          /* 51 */
++	"fchmod",                          /* 52 */
++	"fchmodat",                        /* 53 */
++	"fchownat",                        /* 54 */
++	"fchown",                          /* 55 */
++	"openat",                          /* 56 */
++	"close",                           /* 57 */
++	"vhangup",                         /* 58 */
++	"pipe2",                           /* 59 */
++	"quotactl",                        /* 60 */
++	"getdents64",                      /* 61 */
++	"lseek",                           /* 62 */
++	"read",                            /* 63 */
++	"write",                           /* 64 */
++	"readv",                           /* 65 */
++	"writev",                          /* 66 */
++	"pread64",                         /* 67 */
++	"pwrite64",                        /* 68 */
++	"preadv",                          /* 69 */
++	"pwritev",                         /* 70 */
++	"sendfile",                        /* 71 */
++	"pselect6",                        /* 72 */
++	"ppoll",                           /* 73 */
++	"signalfd4",                       /* 74 */
++	"vmsplice",                        /* 75 */
++	"splice",                          /* 76 */
++	"tee",                             /* 77 */
++	"readlinkat",                      /* 78 */
++	"fstatat",                         /* 79 */
++	"fstat",                           /* 80 */
++	"sync",                            /* 81 */
++	"fsync",                           /* 82 */
++	"fdatasync",                       /* 83 */
++	"sync_file_range",                 /* 84 */
++	"timerfd_create",                  /* 85 */
++	"timerfd_settime",                 /* 86 */
++	"timerfd_gettime",                 /* 87 */
++	"utimensat",                       /* 88 */
++	"acct",                            /* 89 */
++	"capget",                          /* 90 */
++	"capset",                          /* 91 */
++	"personality",                     /* 92 */
++	"exit",                            /* 93 */
++	"exit_group",                      /* 94 */
++	"waitid",                          /* 95 */
++	"set_tid_address",                 /* 96 */
++	"unshare",                         /* 97 */
++	"futex",                           /* 98 */
++	"set_robust_list",                 /* 99 */
++	"get_robust_list",                 /* 100 */
++	"nanosleep",                       /* 101 */
++	"getitimer",                       /* 102 */
++	"setitimer",                       /* 103 */
++	"kexec_load",                      /* 104 */
++	"init_module",                     /* 105 */
++	"delete_module",                   /* 106 */
++	"timer_create",                    /* 107 */
++	"timer_gettime",                   /* 108 */
++	"timer_getoverrun",                /* 109 */
++	"timer_settime",                   /* 110 */
++	"timer_delete",                    /* 111 */
++	"clock_settime",                   /* 112 */
++	"clock_gettime",                   /* 113 */
++	"clock_getres",                    /* 114 */
++	"clock_nanosleep",                 /* 115 */
++	"syslog",                          /* 116 */
++	"ptrace",                          /* 117 */
++	"sched_setparam",                  /* 118 */
++	"sched_setscheduler",              /* 119 */
++	"sched_getscheduler",              /* 120 */
++	"sched_getparam",                  /* 121 */
++	"sched_setaffinity",               /* 122 */
++	"sched_getaffinity",               /* 123 */
++	"sched_yield",                     /* 124 */
++	"sched_get_priority_max",          /* 125 */
++	"sched_get_priority_min",          /* 126 */
++	"sched_rr_get_interval",           /* 127 */
++	"restart_syscall",                 /* 128 */
++	"kill",                            /* 129 */
++	"tkill",                           /* 130 */
++	"tgkill",                          /* 131 */
++	"sigaltstack",                     /* 132 */
++	"rt_sigsuspend",                   /* 133 */
++	"rt_sigaction",                    /* 134 */
++	"rt_sigprocmask",                  /* 135 */
++	"rt_sigpending",                   /* 136 */
++	"rt_sigtimedwait",                 /* 137 */
++	"rt_sigqueueinfo",                 /* 138 */
++	"rt_sigreturn",                    /* 139 */
++	"setpriority",                     /* 140 */
++	"getpriority",                     /* 141 */
++	"reboot",                          /* 142 */
++	"setregid",                        /* 143 */
++	"setgid",                          /* 144 */
++	"setreuid",                        /* 145 */
++	"setuid",                          /* 146 */
++	"setresuid",                       /* 147 */
++	"getresuid",                       /* 148 */
++	"setresgid",                       /* 149 */
++	"getresgid",                       /* 150 */
++	"setfsuid",                        /* 151 */
++	"setfsgid",                        /* 152 */
++	"times",                           /* 153 */
++	"setpgid",                         /* 154 */
++	"getpgid",                         /* 155 */
++	"getsid",                          /* 156 */
++	"setsid",                          /* 157 */
++	"getgroups",                       /* 158 */
++	"setgroups",                       /* 159 */
++	"uname",                           /* 160 */
++	"sethostname",                     /* 161 */
++	"setdomainname",                   /* 162 */
++	"getrlimit",                       /* 163 */
++	"setrlimit",                       /* 164 */
++	"getrusage",                       /* 165 */
++	"umask",                           /* 166 */
++	"prctl",                           /* 167 */
++	"getcpu",                          /* 168 */
++	"gettimeofday",                    /* 169 */
++	"settimeofday",                    /* 170 */
++	"adjtimex",                        /* 171 */
++	"getpid",                          /* 172 */
++	"getppid",                         /* 173 */
++	"getuid",                          /* 174 */
++	"geteuid",                         /* 175 */
++	"getgid",                          /* 176 */
++	"getegid",                         /* 177 */
++	"gettid",                          /* 178 */
++	"sysinfo",                         /* 179 */
++	"mq_open",                         /* 180 */
++	"mq_unlink",                       /* 181 */
++	"mq_timedsend",                    /* 182 */
++	"mq_timedreceive",                 /* 183 */
++	"mq_notify",                       /* 184 */
++	"mq_getsetattr",                   /* 185 */
++	"msgget",                          /* 186 */
++	"msgctl",                          /* 187 */
++	"msgrcv",                          /* 188 */
++	"msgsnd",                          /* 189 */
++	"semget",                          /* 190 */
++	"semctl",                          /* 191 */
++	"semtimedop",                      /* 192 */
++	"semop",                           /* 193 */
++	"shmget",                          /* 194 */
++	"shmctl",                          /* 195 */
++	"shmat",                           /* 196 */
++	"shmdt",                           /* 197 */
++	"socket",                          /* 198 */
++	"socketpair",                      /* 199 */
++	"bind",                            /* 200 */
++	"listen",                          /* 201 */
++	"accept",                          /* 202 */
++	"connect",                         /* 203 */
++	"getsockname",                     /* 204 */
++	"getpeername",                     /* 205 */
++	"sendto",                          /* 206 */
++	"recvfrom",                        /* 207 */
++	"setsockopt",                      /* 208 */
++	"getsockopt",                      /* 209 */
++	"shutdown",                        /* 210 */
++	"sendmsg",                         /* 211 */
++	"recvmsg",                         /* 212 */
++	"readahead",                       /* 213 */
++	"brk",                             /* 214 */
++	"munmap",                          /* 215 */
++	"mremap",                          /* 216 */
++	"add_key",                         /* 217 */
++	"request_key",                     /* 218 */
++	"keyctl",                          /* 219 */
++	"clone",                           /* 220 */
++	"execve",                          /* 221 */
++	"mmap",                            /* 222 */
++	"fadvise64",                       /* 223 */
++	"swapon",                          /* 224 */
++	"swapoff",                         /* 225 */
++	"mprotect",                        /* 226 */
++	"msync",                           /* 227 */
++	"mlock",                           /* 228 */
++	"munlock",                         /* 229 */
++	"mlockall",                        /* 230 */
++	"munlockall",                      /* 231 */
++	"mincore",                         /* 232 */
++	"madvise",                         /* 233 */
++	"remap_file_pages",                /* 234 */
++	"mbind",                           /* 235 */
++	"get_mempolicy",                   /* 236 */
++	"set_mempolicy",                   /* 237 */
++	"migrate_pages",                   /* 238 */
++	"move_pages",                      /* 239 */
++	"rt_tgsigqueueinfo",               /* 240 */
++	"perf_event_open",                 /* 241 */
++	"accept4",                         /* 242 */
++	"recvmmsg",                        /* 243 */
++	"arch_specific_syscall",           /* 244 */
++	"245",                             /* 245 */
++	"246",                             /* 246 */
++	"247",                             /* 247 */
++	"248",                             /* 248 */
++	"249",                             /* 249 */
++	"250",                             /* 250 */
++	"251",                             /* 251 */
++	"252",                             /* 252 */
++	"253",                             /* 253 */
++	"254",                             /* 254 */
++	"255",                             /* 255 */
++	"256",                             /* 256 */
++	"257",                             /* 257 */
++	"258",                             /* 258 */
++	"259",                             /* 259 */
++	"wait4",                           /* 260 */
++	"prlimit64",                       /* 261 */
++	"fanotify_init",                   /* 262 */
++	"fanotify_mark",                   /* 263 */
++	"name_to_handle_at",               /* 264 */
++	"open_by_handle_at",               /* 265 */
++	"clock_adjtime",                   /* 266 */
++	"syncfs",                          /* 267 */
++	"setns",                           /* 268 */
++	"sendmmsg",                        /* 269 */
++	"process_vm_readv",                /* 270 */
++	"process_vm_writev",               /* 271 */
++	"kcmp",                            /* 272 */
++	"finit_module",                    /* 273 */
++	"syscalls",                        /* 274 */
++	"275",                             /* 275 */
++	"276",                             /* 276 */
++	"277",                             /* 277 */
++	"278",                             /* 278 */
++	"279",                             /* 279 */
++	"280",                             /* 280 */
++	"281",                             /* 281 */
++	"282",                             /* 282 */
++	"283",                             /* 283 */
++	"284",                             /* 284 */
++	"285",                             /* 285 */
++	"286",                             /* 286 */
++	"287",                             /* 287 */
++	"288",                             /* 288 */
++	"289",                             /* 289 */
++	"290",                             /* 290 */
++	"291",                             /* 291 */
++	"292",                             /* 292 */
++	"293",                             /* 293 */
++	"294",                             /* 294 */
++	"295",                             /* 295 */
++	"296",                             /* 296 */
++	"297",                             /* 297 */
++	"298",                             /* 298 */
++	"299",                             /* 299 */
++	"300",                             /* 300 */
++	"301",                             /* 301 */
++	"302",                             /* 302 */
++	"303",                             /* 303 */
++	"304",                             /* 304 */
++	"305",                             /* 305 */
++	"306",                             /* 306 */
++	"307",                             /* 307 */
++	"308",                             /* 308 */
++	"309",                             /* 309 */
++	"310",                             /* 310 */
++	"311",                             /* 311 */
++	"312",                             /* 312 */
++	"313",                             /* 313 */
++	"314",                             /* 314 */
++	"315",                             /* 315 */
++	"316",                             /* 316 */
++	"317",                             /* 317 */
++	"318",                             /* 318 */
++	"319",                             /* 319 */
++	"320",                             /* 320 */
++	"321",                             /* 321 */
++	"322",                             /* 322 */
++	"323",                             /* 323 */
++	"324",                             /* 324 */
++	"325",                             /* 325 */
++	"326",                             /* 326 */
++	"327",                             /* 327 */
++	"328",                             /* 328 */
++	"329",                             /* 329 */
++	"330",                             /* 330 */
++	"331",                             /* 331 */
++	"332",                             /* 332 */
++	"333",                             /* 333 */
++	"334",                             /* 334 */
++	"335",                             /* 335 */
++	"336",                             /* 336 */
++	"337",                             /* 337 */
++	"338",                             /* 338 */
++	"339",                             /* 339 */
++	"340",                             /* 340 */
++	"341",                             /* 341 */
++	"342",                             /* 342 */
++	"343",                             /* 343 */
++	"344",                             /* 344 */
++	"345",                             /* 345 */
++	"346",                             /* 346 */
++	"347",                             /* 347 */
++	"348",                             /* 348 */
++	"349",                             /* 349 */
++	"350",                             /* 350 */
++	"351",                             /* 351 */
++	"352",                             /* 352 */
++	"353",                             /* 353 */
++	"354",                             /* 354 */
++	"355",                             /* 355 */
++	"356",                             /* 356 */
++	"357",                             /* 357 */
++	"358",                             /* 358 */
++	"359",                             /* 359 */
++	"360",                             /* 360 */
++	"361",                             /* 361 */
++	"362",                             /* 362 */
++	"363",                             /* 363 */
++	"364",                             /* 364 */
++	"365",                             /* 365 */
++	"366",                             /* 366 */
++	"367",                             /* 367 */
++	"368",                             /* 368 */
++	"369",                             /* 369 */
++	"370",                             /* 370 */
++	"371",                             /* 371 */
++	"372",                             /* 372 */
++	"373",                             /* 373 */
++	"374",                             /* 374 */
++	"375",                             /* 375 */
++	"376",                             /* 376 */
++	"377",                             /* 377 */
++	"378",                             /* 378 */
++	"379",                             /* 379 */
++	"380",                             /* 380 */
++	"381",                             /* 381 */
++	"382",                             /* 382 */
++	"383",                             /* 383 */
++	"384",                             /* 384 */
++	"385",                             /* 385 */
++	"386",                             /* 386 */
++	"387",                             /* 387 */
++	"388",                             /* 388 */
++	"389",                             /* 389 */
++	"390",                             /* 390 */
++	"391",                             /* 391 */
++	"392",                             /* 392 */
++	"393",                             /* 393 */
++	"394",                             /* 394 */
++	"395",                             /* 395 */
++	"396",                             /* 396 */
++	"397",                             /* 397 */
++	"398",                             /* 398 */
++	"399",                             /* 399 */
++	"400",                             /* 400 */
++	"401",                             /* 401 */
++	"402",                             /* 402 */
++	"403",                             /* 403 */
++	"404",                             /* 404 */
++	"405",                             /* 405 */
++	"406",                             /* 406 */
++	"407",                             /* 407 */
++	"408",                             /* 408 */
++	"409",                             /* 409 */
++	"410",                             /* 410 */
++	"411",                             /* 411 */
++	"412",                             /* 412 */
++	"413",                             /* 413 */
++	"414",                             /* 414 */
++	"415",                             /* 415 */
++	"416",                             /* 416 */
++	"417",                             /* 417 */
++	"418",                             /* 418 */
++	"419",                             /* 419 */
++	"420",                             /* 420 */
++	"421",                             /* 421 */
++	"422",                             /* 422 */
++	"423",                             /* 423 */
++	"424",                             /* 424 */
++	"425",                             /* 425 */
++	"426",                             /* 426 */
++	"427",                             /* 427 */
++	"428",                             /* 428 */
++	"429",                             /* 429 */
++	"430",                             /* 430 */
++	"431",                             /* 431 */
++	"432",                             /* 432 */
++	"433",                             /* 433 */
++	"434",                             /* 434 */
++	"435",                             /* 435 */
++	"436",                             /* 436 */
++	"437",                             /* 437 */
++	"438",                             /* 438 */
++	"439",                             /* 439 */
++	"440",                             /* 440 */
++	"441",                             /* 441 */
++	"442",                             /* 442 */
++	"443",                             /* 443 */
++	"444",                             /* 444 */
++	"445",                             /* 445 */
++	"446",                             /* 446 */
++	"447",                             /* 447 */
++	"448",                             /* 448 */
++	"449",                             /* 449 */
++	"450",                             /* 450 */
++	"451",                             /* 451 */
++	"452",                             /* 452 */
++	"453",                             /* 453 */
++	"454",                             /* 454 */
++	"455",                             /* 455 */
++	"456",                             /* 456 */
++	"457",                             /* 457 */
++	"458",                             /* 458 */
++	"459",                             /* 459 */
++	"460",                             /* 460 */
++	"461",                             /* 461 */
++	"462",                             /* 462 */
++	"463",                             /* 463 */
++	"464",                             /* 464 */
++	"465",                             /* 465 */
++	"466",                             /* 466 */
++	"467",                             /* 467 */
++	"468",                             /* 468 */
++	"469",                             /* 469 */
++	"470",                             /* 470 */
++	"471",                             /* 471 */
++	"472",                             /* 472 */
++	"473",                             /* 473 */
++	"474",                             /* 474 */
++	"475",                             /* 475 */
++	"476",                             /* 476 */
++	"477",                             /* 477 */
++	"478",                             /* 478 */
++	"479",                             /* 479 */
++	"480",                             /* 480 */
++	"481",                             /* 481 */
++	"482",                             /* 482 */
++	"483",                             /* 483 */
++	"484",                             /* 484 */
++	"485",                             /* 485 */
++	"486",                             /* 486 */
++	"487",                             /* 487 */
++	"488",                             /* 488 */
++	"489",                             /* 489 */
++	"490",                             /* 490 */
++	"491",                             /* 491 */
++	"492",                             /* 492 */
++	"493",                             /* 493 */
++	"494",                             /* 494 */
++	"495",                             /* 495 */
++	"496",                             /* 496 */
++	"497",                             /* 497 */
++	"498",                             /* 498 */
++	"499",                             /* 499 */
++	"500",                             /* 500 */
++	"501",                             /* 501 */
++	"502",                             /* 502 */
++	"503",                             /* 503 */
++	"504",                             /* 504 */
++	"505",                             /* 505 */
++	"506",                             /* 506 */
++	"507",                             /* 507 */
++	"508",                             /* 508 */
++	"509",                             /* 509 */
++	"510",                             /* 510 */
++	"511",                             /* 511 */
++	"512",                             /* 512 */
++	"513",                             /* 513 */
++	"514",                             /* 514 */
++	"515",                             /* 515 */
++	"516",                             /* 516 */
++	"517",                             /* 517 */
++	"518",                             /* 518 */
++	"519",                             /* 519 */
++	"520",                             /* 520 */
++	"521",                             /* 521 */
++	"522",                             /* 522 */
++	"523",                             /* 523 */
++	"524",                             /* 524 */
++	"525",                             /* 525 */
++	"526",                             /* 526 */
++	"527",                             /* 527 */
++	"528",                             /* 528 */
++	"529",                             /* 529 */
++	"530",                             /* 530 */
++	"531",                             /* 531 */
++	"532",                             /* 532 */
++	"533",                             /* 533 */
++	"534",                             /* 534 */
++	"535",                             /* 535 */
++	"536",                             /* 536 */
++	"537",                             /* 537 */
++	"538",                             /* 538 */
++	"539",                             /* 539 */
++	"540",                             /* 540 */
++	"541",                             /* 541 */
++	"542",                             /* 542 */
++	"543",                             /* 543 */
++	"544",                             /* 544 */
++	"545",                             /* 545 */
++	"546",                             /* 546 */
++	"547",                             /* 547 */
++	"548",                             /* 548 */
++	"549",                             /* 549 */
++	"550",                             /* 550 */
++	"551",                             /* 551 */
++	"552",                             /* 552 */
++	"553",                             /* 553 */
++	"554",                             /* 554 */
++	"555",                             /* 555 */
++	"556",                             /* 556 */
++	"557",                             /* 557 */
++	"558",                             /* 558 */
++	"559",                             /* 559 */
++	"560",                             /* 560 */
++	"561",                             /* 561 */
++	"562",                             /* 562 */
++	"563",                             /* 563 */
++	"564",                             /* 564 */
++	"565",                             /* 565 */
++	"566",                             /* 566 */
++	"567",                             /* 567 */
++	"568",                             /* 568 */
++	"569",                             /* 569 */
++	"570",                             /* 570 */
++	"571",                             /* 571 */
++	"572",                             /* 572 */
++	"573",                             /* 573 */
++	"574",                             /* 574 */
++	"575",                             /* 575 */
++	"576",                             /* 576 */
++	"577",                             /* 577 */
++	"578",                             /* 578 */
++	"579",                             /* 579 */
++	"580",                             /* 580 */
++	"581",                             /* 581 */
++	"582",                             /* 582 */
++	"583",                             /* 583 */
++	"584",                             /* 584 */
++	"585",                             /* 585 */
++	"586",                             /* 586 */
++	"587",                             /* 587 */
++	"588",                             /* 588 */
++	"589",                             /* 589 */
++	"590",                             /* 590 */
++	"591",                             /* 591 */
++	"592",                             /* 592 */
++	"593",                             /* 593 */
++	"594",                             /* 594 */
++	"595",                             /* 595 */
++	"596",                             /* 596 */
++	"597",                             /* 597 */
++	"598",                             /* 598 */
++	"599",                             /* 599 */
++	"600",                             /* 600 */
++	"601",                             /* 601 */
++	"602",                             /* 602 */
++	"603",                             /* 603 */
++	"604",                             /* 604 */
++	"605",                             /* 605 */
++	"606",                             /* 606 */
++	"607",                             /* 607 */
++	"608",                             /* 608 */
++	"609",                             /* 609 */
++	"610",                             /* 610 */
++	"611",                             /* 611 */
++	"612",                             /* 612 */
++	"613",                             /* 613 */
++	"614",                             /* 614 */
++	"615",                             /* 615 */
++	"616",                             /* 616 */
++	"617",                             /* 617 */
++	"618",                             /* 618 */
++	"619",                             /* 619 */
++	"620",                             /* 620 */
++	"621",                             /* 621 */
++	"622",                             /* 622 */
++	"623",                             /* 623 */
++	"624",                             /* 624 */
++	"625",                             /* 625 */
++	"626",                             /* 626 */
++	"627",                             /* 627 */
++	"628",                             /* 628 */
++	"629",                             /* 629 */
++	"630",                             /* 630 */
++	"631",                             /* 631 */
++	"632",                             /* 632 */
++	"633",                             /* 633 */
++	"634",                             /* 634 */
++	"635",                             /* 635 */
++	"636",                             /* 636 */
++	"637",                             /* 637 */
++	"638",                             /* 638 */
++	"639",                             /* 639 */
++	"640",                             /* 640 */
++	"641",                             /* 641 */
++	"642",                             /* 642 */
++	"643",                             /* 643 */
++	"644",                             /* 644 */
++	"645",                             /* 645 */
++	"646",                             /* 646 */
++	"647",                             /* 647 */
++	"648",                             /* 648 */
++	"649",                             /* 649 */
++	"650",                             /* 650 */
++	"651",                             /* 651 */
++	"652",                             /* 652 */
++	"653",                             /* 653 */
++	"654",                             /* 654 */
++	"655",                             /* 655 */
++	"656",                             /* 656 */
++	"657",                             /* 657 */
++	"658",                             /* 658 */
++	"659",                             /* 659 */
++	"660",                             /* 660 */
++	"661",                             /* 661 */
++	"662",                             /* 662 */
++	"663",                             /* 663 */
++	"664",                             /* 664 */
++	"665",                             /* 665 */
++	"666",                             /* 666 */
++	"667",                             /* 667 */
++	"668",                             /* 668 */
++	"669",                             /* 669 */
++	"670",                             /* 670 */
++	"671",                             /* 671 */
++	"672",                             /* 672 */
++	"673",                             /* 673 */
++	"674",                             /* 674 */
++	"675",                             /* 675 */
++	"676",                             /* 676 */
++	"677",                             /* 677 */
++	"678",                             /* 678 */
++	"679",                             /* 679 */
++	"680",                             /* 680 */
++	"681",                             /* 681 */
++	"682",                             /* 682 */
++	"683",                             /* 683 */
++	"684",                             /* 684 */
++	"685",                             /* 685 */
++	"686",                             /* 686 */
++	"687",                             /* 687 */
++	"688",                             /* 688 */
++	"689",                             /* 689 */
++	"690",                             /* 690 */
++	"691",                             /* 691 */
++	"692",                             /* 692 */
++	"693",                             /* 693 */
++	"694",                             /* 694 */
++	"695",                             /* 695 */
++	"696",                             /* 696 */
++	"697",                             /* 697 */
++	"698",                             /* 698 */
++	"699",                             /* 699 */
++	"700",                             /* 700 */
++	"701",                             /* 701 */
++	"702",                             /* 702 */
++	"703",                             /* 703 */
++	"704",                             /* 704 */
++	"705",                             /* 705 */
++	"706",                             /* 706 */
++	"707",                             /* 707 */
++	"708",                             /* 708 */
++	"709",                             /* 709 */
++	"710",                             /* 710 */
++	"711",                             /* 711 */
++	"712",                             /* 712 */
++	"713",                             /* 713 */
++	"714",                             /* 714 */
++	"715",                             /* 715 */
++	"716",                             /* 716 */
++	"717",                             /* 717 */
++	"718",                             /* 718 */
++	"719",                             /* 719 */
++	"720",                             /* 720 */
++	"721",                             /* 721 */
++	"722",                             /* 722 */
++	"723",                             /* 723 */
++	"724",                             /* 724 */
++	"725",                             /* 725 */
++	"726",                             /* 726 */
++	"727",                             /* 727 */
++	"728",                             /* 728 */
++	"729",                             /* 729 */
++	"730",                             /* 730 */
++	"731",                             /* 731 */
++	"732",                             /* 732 */
++	"733",                             /* 733 */
++	"734",                             /* 734 */
++	"735",                             /* 735 */
++	"736",                             /* 736 */
++	"737",                             /* 737 */
++	"738",                             /* 738 */
++	"739",                             /* 739 */
++	"740",                             /* 740 */
++	"741",                             /* 741 */
++	"742",                             /* 742 */
++	"743",                             /* 743 */
++	"744",                             /* 744 */
++	"745",                             /* 745 */
++	"746",                             /* 746 */
++	"747",                             /* 747 */
++	"748",                             /* 748 */
++	"749",                             /* 749 */
++	"750",                             /* 750 */
++	"751",                             /* 751 */
++	"752",                             /* 752 */
++	"753",                             /* 753 */
++	"754",                             /* 754 */
++	"755",                             /* 755 */
++	"756",                             /* 756 */
++	"757",                             /* 757 */
++	"758",                             /* 758 */
++	"759",                             /* 759 */
++	"760",                             /* 760 */
++	"761",                             /* 761 */
++	"762",                             /* 762 */
++	"763",                             /* 763 */
++	"764",                             /* 764 */
++	"765",                             /* 765 */
++	"766",                             /* 766 */
++	"767",                             /* 767 */
++	"768",                             /* 768 */
++	"769",                             /* 769 */
++	"770",                             /* 770 */
++	"771",                             /* 771 */
++	"772",                             /* 772 */
++	"773",                             /* 773 */
++	"774",                             /* 774 */
++	"775",                             /* 775 */
++	"776",                             /* 776 */
++	"777",                             /* 777 */
++	"778",                             /* 778 */
++	"779",                             /* 779 */
++	"780",                             /* 780 */
++	"781",                             /* 781 */
++	"782",                             /* 782 */
++	"783",                             /* 783 */
++	"784",                             /* 784 */
++	"785",                             /* 785 */
++	"786",                             /* 786 */
++	"787",                             /* 787 */
++	"788",                             /* 788 */
++	"789",                             /* 789 */
++	"790",                             /* 790 */
++	"791",                             /* 791 */
++	"792",                             /* 792 */
++	"793",                             /* 793 */
++	"794",                             /* 794 */
++	"795",                             /* 795 */
++	"796",                             /* 796 */
++	"797",                             /* 797 */
++	"798",                             /* 798 */
++	"799",                             /* 799 */
++	"800",                             /* 800 */
++	"801",                             /* 801 */
++	"802",                             /* 802 */
++	"803",                             /* 803 */
++	"804",                             /* 804 */
++	"805",                             /* 805 */
++	"806",                             /* 806 */
++	"807",                             /* 807 */
++	"808",                             /* 808 */
++	"809",                             /* 809 */
++	"810",                             /* 810 */
++	"811",                             /* 811 */
++	"812",                             /* 812 */
++	"813",                             /* 813 */
++	"814",                             /* 814 */
++	"815",                             /* 815 */
++	"816",                             /* 816 */
++	"817",                             /* 817 */
++	"818",                             /* 818 */
++	"819",                             /* 819 */
++	"820",                             /* 820 */
++	"821",                             /* 821 */
++	"822",                             /* 822 */
++	"823",                             /* 823 */
++	"824",                             /* 824 */
++	"825",                             /* 825 */
++	"826",                             /* 826 */
++	"827",                             /* 827 */
++	"828",                             /* 828 */
++	"829",                             /* 829 */
++	"830",                             /* 830 */
++	"831",                             /* 831 */
++	"832",                             /* 832 */
++	"833",                             /* 833 */
++	"834",                             /* 834 */
++	"835",                             /* 835 */
++	"836",                             /* 836 */
++	"837",                             /* 837 */
++	"838",                             /* 838 */
++	"839",                             /* 839 */
++	"840",                             /* 840 */
++	"841",                             /* 841 */
++	"842",                             /* 842 */
++	"843",                             /* 843 */
++	"844",                             /* 844 */
++	"845",                             /* 845 */
++	"846",                             /* 846 */
++	"847",                             /* 847 */
++	"848",                             /* 848 */
++	"849",                             /* 849 */
++	"850",                             /* 850 */
++	"851",                             /* 851 */
++	"852",                             /* 852 */
++	"853",                             /* 853 */
++	"854",                             /* 854 */
++	"855",                             /* 855 */
++	"856",                             /* 856 */
++	"857",                             /* 857 */
++	"858",                             /* 858 */
++	"859",                             /* 859 */
++	"860",                             /* 860 */
++	"861",                             /* 861 */
++	"862",                             /* 862 */
++	"863",                             /* 863 */
++	"864",                             /* 864 */
++	"865",                             /* 865 */
++	"866",                             /* 866 */
++	"867",                             /* 867 */
++	"868",                             /* 868 */
++	"869",                             /* 869 */
++	"870",                             /* 870 */
++	"871",                             /* 871 */
++	"872",                             /* 872 */
++	"873",                             /* 873 */
++	"874",                             /* 874 */
++	"875",                             /* 875 */
++	"876",                             /* 876 */
++	"877",                             /* 877 */
++	"878",                             /* 878 */
++	"879",                             /* 879 */
++	"880",                             /* 880 */
++	"881",                             /* 881 */
++	"882",                             /* 882 */
++	"883",                             /* 883 */
++	"884",                             /* 884 */
++	"885",                             /* 885 */
++	"886",                             /* 886 */
++	"887",                             /* 887 */
++	"888",                             /* 888 */
++	"889",                             /* 889 */
++	"890",                             /* 890 */
++	"891",                             /* 891 */
++	"892",                             /* 892 */
++	"893",                             /* 893 */
++	"894",                             /* 894 */
++	"895",                             /* 895 */
++	"896",                             /* 896 */
++	"897",                             /* 897 */
++	"898",                             /* 898 */
++	"899",                             /* 899 */
++	"900",                             /* 900 */
++	"901",                             /* 901 */
++	"902",                             /* 902 */
++	"903",                             /* 903 */
++	"904",                             /* 904 */
++	"905",                             /* 905 */
++	"906",                             /* 906 */
++	"907",                             /* 907 */
++	"908",                             /* 908 */
++	"909",                             /* 909 */
++	"910",                             /* 910 */
++	"911",                             /* 911 */
++	"912",                             /* 912 */
++	"913",                             /* 913 */
++	"914",                             /* 914 */
++	"915",                             /* 915 */
++	"916",                             /* 916 */
++	"917",                             /* 917 */
++	"918",                             /* 918 */
++	"919",                             /* 919 */
++	"920",                             /* 920 */
++	"921",                             /* 921 */
++	"922",                             /* 922 */
++	"923",                             /* 923 */
++	"924",                             /* 924 */
++	"925",                             /* 925 */
++	"926",                             /* 926 */
++	"927",                             /* 927 */
++	"928",                             /* 928 */
++	"929",                             /* 929 */
++	"930",                             /* 930 */
++	"931",                             /* 931 */
++	"932",                             /* 932 */
++	"933",                             /* 933 */
++	"934",                             /* 934 */
++	"935",                             /* 935 */
++	"936",                             /* 936 */
++	"937",                             /* 937 */
++	"938",                             /* 938 */
++	"939",                             /* 939 */
++	"940",                             /* 940 */
++	"941",                             /* 941 */
++	"942",                             /* 942 */
++	"943",                             /* 943 */
++	"944",                             /* 944 */
++	"945",                             /* 945 */
++	"946",                             /* 946 */
++	"947",                             /* 947 */
++	"948",                             /* 948 */
++	"949",                             /* 949 */
++	"950",                             /* 950 */
++	"951",                             /* 951 */
++	"952",                             /* 952 */
++	"953",                             /* 953 */
++	"954",                             /* 954 */
++	"955",                             /* 955 */
++	"956",                             /* 956 */
++	"957",                             /* 957 */
++	"958",                             /* 958 */
++	"959",                             /* 959 */
++	"960",                             /* 960 */
++	"961",                             /* 961 */
++	"962",                             /* 962 */
++	"963",                             /* 963 */
++	"964",                             /* 964 */
++	"965",                             /* 965 */
++	"966",                             /* 966 */
++	"967",                             /* 967 */
++	"968",                             /* 968 */
++	"969",                             /* 969 */
++	"970",                             /* 970 */
++	"971",                             /* 971 */
++	"972",                             /* 972 */
++	"973",                             /* 973 */
++	"974",                             /* 974 */
++	"975",                             /* 975 */
++	"976",                             /* 976 */
++	"977",                             /* 977 */
++	"978",                             /* 978 */
++	"979",                             /* 979 */
++	"980",                             /* 980 */
++	"981",                             /* 981 */
++	"982",                             /* 982 */
++	"983",                             /* 983 */
++	"984",                             /* 984 */
++	"985",                             /* 985 */
++	"986",                             /* 986 */
++	"987",                             /* 987 */
++	"988",                             /* 988 */
++	"989",                             /* 989 */
++	"990",                             /* 990 */
++	"991",                             /* 991 */
++	"992",                             /* 992 */
++	"993",                             /* 993 */
++	"994",                             /* 994 */
++	"995",                             /* 995 */
++	"996",                             /* 996 */
++	"997",                             /* 997 */
++	"998",                             /* 998 */
++	"999",                             /* 999 */
++	"1000",                            /* 1000 */
++	"1001",                            /* 1001 */
++	"1002",                            /* 1002 */
++	"1003",                            /* 1003 */
++	"1004",                            /* 1004 */
++	"1005",                            /* 1005 */
++	"1006",                            /* 1006 */
++	"1007",                            /* 1007 */
++	"1008",                            /* 1008 */
++	"1009",                            /* 1009 */
++	"1010",                            /* 1010 */
++	"1011",                            /* 1011 */
++	"1012",                            /* 1012 */
++	"1013",                            /* 1013 */
++	"1014",                            /* 1014 */
++	"1015",                            /* 1015 */
++	"1016",                            /* 1016 */
++	"1017",                            /* 1017 */
++	"1018",                            /* 1018 */
++	"1019",                            /* 1019 */
++	"1020",                            /* 1020 */
++	"1021",                            /* 1021 */
++	"1022",                            /* 1022 */
++	"1023",                            /* 1023 */
++	"open",                            /* 1024 */
++	"link",                            /* 1025 */
++	"unlink",                          /* 1026 */
++	"mknod",                           /* 1027 */
++	"chmod",                           /* 1028 */
++	"chown",                           /* 1029 */
++	"mkdir",                           /* 1030 */
++	"rmdir",                           /* 1031 */
++	"lchown",                          /* 1032 */
++	"access",                          /* 1033 */
++	"rename",                          /* 1034 */
++	"readlink",                        /* 1035 */
++	"symlink",                         /* 1036 */
++	"utimes",                          /* 1037 */
++	"stat",                            /* 1038 */
++	"lstat",                           /* 1039 */
++	"pipe",                            /* 1040 */
++	"dup2",                            /* 1041 */
++	"epoll_create",                    /* 1042 */
++	"inotify_init",                    /* 1043 */
++	"eventfd",                         /* 1044 */
++	"signalfd",                        /* 1045 */
++	"sendfile",                        /* 1046 */
++	"ftruncate",                       /* 1047 */
++	"truncate",                        /* 1048 */
++	"stat",                            /* 1049 */
++	"lstat",                           /* 1050 */
++	"fstat",                           /* 1051 */
++	"fcntl",                           /* 1052 */
++	"fadvise64",                       /* 1053 */
++	"newfstatat",                      /* 1054 */
++	"fstatfs",                         /* 1055 */
++	"statfs",                          /* 1056 */
++	"lseek",                           /* 1057 */
++	"mmap",                            /* 1058 */
++	"alarm",                           /* 1059 */
++	"getpgrp",                         /* 1060 */
++	"pause",                           /* 1061 */
++	"time",                            /* 1062 */
++	"utime",                           /* 1063 */
++	"creat",                           /* 1064 */
++	"getdents",                        /* 1065 */
++	"futimesat",                       /* 1066 */
++	"select",                          /* 1067 */
++	"poll",                            /* 1068 */
++	"epoll_wait",                      /* 1069 */
++	"ustat",                           /* 1070 */
++	"vfork",                           /* 1071 */
++	"oldwait4",                        /* 1072 */
++	"recv",                            /* 1073 */
++	"send",                            /* 1074 */
++	"bdflush",                         /* 1075 */
++	"umount",                          /* 1076 */
++	"uselib",                          /* 1077 */
++	"_sysctl",                         /* 1078 */
++	"fork",                            /* 1079 */
+diff -aurN a/sysdeps/linux-gnu/aarch64/trace.c b/sysdeps/linux-gnu/aarch64/trace.c
+--- a/sysdeps/linux-gnu/aarch64/trace.c	1970-01-01 00:00:00.000000000 +0000
++++ b/sysdeps/linux-gnu/aarch64/trace.c	2020-05-18 05:46:59.521800452 +0000
+@@ -0,0 +1,84 @@
++/*
++ * This file is part of ltrace.
++ * Copyright (C) 2014 Petr Machata, Red Hat, Inc.
++ *
++ * This program 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 of the
++ * License, or (at your option) any later version.
++ *
++ * This program 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., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301 USA
++ */
++
++#include <sys/ptrace.h>
++#include <sys/types.h>
++#include <sys/wait.h>
++#include <asm/ptrace.h>
++#include <string.h>
++#include <stdio.h>
++#include <errno.h>
++
++#include "backend.h"
++#include "proc.h"
++
++void
++get_arch_dep(struct Process *proc)
++{
++}
++
++int aarch64_read_gregs(struct Process *proc, struct user_pt_regs *regs);
++
++/* The syscall instruction is:
++ * | 31                   21 | 20    5 | 4       0 |
++ * | 1 1 0 1 0 1 0 0 | 0 0 0 |  imm16  | 0 0 0 0 1 | */
++#define SVC_MASK  0xffe0001f
++#define SVC_VALUE 0xd4000001
++
++int
++syscall_p(struct Process *proc, int status, int *sysnum)
++{
++	if (WIFSTOPPED(status)
++	    && WSTOPSIG(status) == (SIGTRAP | proc->tracesysgood)) {
++
++		struct user_pt_regs regs;
++		if (aarch64_read_gregs(proc, &regs) < 0) {
++			fprintf(stderr, "syscall_p: "
++				"Couldn't read registers of %d.\n", proc->pid);
++			return -1;
++		}
++
++		errno = 0;
++		unsigned long insn = (unsigned long) ptrace(PTRACE_PEEKTEXT,
++							    proc->pid,
++							    regs.pc - 4, 0);
++		if (insn == -1UL && errno != 0) {
++			fprintf(stderr, "syscall_p: "
++				"Couldn't peek into %d: %s\n", proc->pid,
++				strerror(errno));
++			return -1;
++		}
++
++		insn &= 0xffffffffUL;
++		if ((insn & SVC_MASK) == SVC_VALUE) {
++			*sysnum = regs.regs[8];
++
++			size_t d1 = proc->callstack_depth - 1;
++			if (proc->callstack_depth > 0
++			    && proc->callstack[d1].is_syscall
++			    && proc->callstack[d1].c_un.syscall == *sysnum)
++				return 2;
++
++			return 1;
++		}
++	}
++
++	return 0;
++}
+diff -aurN a/type.c b/type.c
+--- a/type.c	2020-05-18 06:06:16.200629988 +0000
++++ b/type.c	2020-05-18 05:43:35.022160511 +0000
+@@ -536,6 +536,42 @@
+ }
+ 
+ struct arg_type_info *
++type_get_hfa_type(struct arg_type_info *info, size_t *countp)
++{
++        assert(info != NULL);
++        if (info->type != ARGTYPE_STRUCT
++            && info->type != ARGTYPE_ARRAY)
++                return NULL;
++
++        size_t n = type_aggregate_size(info);
++        if (n == (size_t)-1)
++                return NULL;
++
++        struct arg_type_info *ret = NULL;
++        *countp = 0;
++
++        while (n-- > 0) {
++                struct arg_type_info *emt = type_element(info, n);
++
++                size_t emt_count = 1;
++                if (emt->type == ARGTYPE_STRUCT || emt->type == ARGTYPE_ARRAY)
++                        emt = type_get_hfa_type(emt, &emt_count);
++                if (emt == NULL)
++                        return NULL;
++                if (ret == NULL) {
++                        if (emt->type != ARGTYPE_FLOAT
++                            && emt->type != ARGTYPE_DOUBLE)
++                                return NULL;
++                        ret = emt;
++                }
++                if (emt->type != ret->type)
++                        return NULL;
++                *countp += emt_count;
++        }
++        return ret;
++}
++
++struct arg_type_info *
+ type_get_fp_equivalent(struct arg_type_info *info)
+ {
+ 	/* Extract innermost structure.  Give up early if any
+diff -aurN a/type.h b/type.h
+--- a/type.h	2020-05-18 06:06:16.200629988 +0000
++++ b/type.h	2020-05-18 05:43:41.202270402 +0000
+@@ -106,6 +106,14 @@
+ void type_init_pointer(struct arg_type_info *info,
+ 		       struct arg_type_info *pointee_info, int own_info);
+ 
++/* If INFO is homogeneous floating-point aggregate, return the
++ * corresponding floating point type, and set *COUNTP to number of
++ * fields of the structure.  Otherwise return NULL.  INFO is a HFA if
++ * it's an aggregate whose each field is either a HFA, or a
++ * floating-point type.  */
++struct arg_type_info *type_get_hfa_type(struct arg_type_info *info,
++                                        size_t *countp);
++
+ /* Release any memory associated with INFO.  Doesn't free INFO
+  * itself.  */
+ void type_destroy(struct arg_type_info *info);
diff --git a/main/lttng-ust/APKBUILD b/main/lttng-ust/APKBUILD
index 77a56032583..a94d61a7464 100644
--- a/main/lttng-ust/APKBUILD
+++ b/main/lttng-ust/APKBUILD
@@ -1,15 +1,16 @@
 # Contributor: Michael Jeanson <mjeanson@efficios.com>
 # Maintainer: Michael Jeanson <mjeanson@efficios.com>
 pkgname=lttng-ust
-pkgver=2.11.0
+pkgver=2.13.6
 pkgrel=1
 pkgdesc="LTTng 2.0 Userspace Tracer"
 url="https://lttng.org"
 arch="all"
-license="LGPL-2.1-or-later"
-depends="python3"
-makedepends="userspace-rcu-dev>0.10 util-linux-dev linux-headers bash"
-subpackages="$pkgname-doc $pkgname-dev"
+license="LGPL-2.1-only AND GPL-2.0-only AND MIT"
+depends_dev="userspace-rcu-dev>0.10"
+makedepends="$depends_dev util-linux-dev linux-headers python3 py3-setuptools"
+checkdepends="bash"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-tools::noarch py3-lttng:pyagent"
 source="https://lttng.org/files/lttng-ust/lttng-ust-$pkgver.tar.bz2"
 
 build() {
@@ -18,8 +19,9 @@ build() {
 		--host=$CHOST \
 		--prefix=/usr \
 		--disable-static \
-		--disable-numa
-	make V=1
+		--disable-numa \
+		--enable-python-agent
+	make
 }
 
 check() {
@@ -32,4 +34,20 @@ package() {
 	sed -i 's|^#!/usr/bin/env python$|#!/usr/bin/env python3|' "$pkgdir"/usr/bin/lttng-gen-tp
 }
 
-sha512sums="fb7258961a7e913487806a7e0129c95becff8c631382b119ff1d78f95cdd7460ec24e62671642160fdb006a3a292b2b10f35c8424f0367ce7c6a41cbcca77a09  lttng-ust-2.11.0.tar.bz2"
+tools() {
+	pkgdesc="tools from lttng-ust"
+	depends="lttng-ust=$pkgver-r$pkgrel python3"
+
+	amove usr/bin
+}
+
+pyagent() {
+	pkgdesc="lttng-ust python agent"
+
+	amove usr/lib/python*
+	amove usr/lib/liblttng-ust-python-agent.*
+}
+
+sha512sums="
+15458f8dd0ad6fa96a9cf7569ffabadfddcaa70b822b69b39d4d7dfba3701c9489706b06f12f9d7e376147299fb3cfc6fe1213d46d510bdb7b3dc834271da55f  lttng-ust-2.13.6.tar.bz2
+"
diff --git a/main/lua-alt-getopt/APKBUILD b/main/lua-alt-getopt/APKBUILD
index 3c52faf20bb..881b0e293f8 100644
--- a/main/lua-alt-getopt/APKBUILD
+++ b/main/lua-alt-getopt/APKBUILD
@@ -1,45 +1,27 @@
-# Maintainer: Natanael Copa <ncopa@alpinlinux.org>
-_luaversions="5.1 5.2 5.3"
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-alt-getopt
-pkgver=0.7
-pkgrel=8
+pkgver=0.8.0
+pkgrel=1
 pkgdesc="Lua module for processing options similar to getopt_long(3)"
-url="https://github.com/LuaDist/alt-getopt"
+url="https://github.com/cheusov/lua-alt-getopt"
 arch="noarch"
 license="MIT"
-depends=""
-makedepends=
-install=
-subpackages=""
+source="$pkgname-$pkgver.tar.gz::https://github.com/cheusov/lua-alt-getopt/archive/$pkgver.tar.gz
+	"
+options="!check"
+
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-alt-getopt:split_${_v/./_}"
 done
-source="alt-getopt-$pkgver.tar.gz::https://github.com/LuaDist/alt-getopt/archive/$pkgver.tar.gz
-	lua5.2-compat.patch
-	"
-
-_builddir="$srcdir"/alt-getopt-$pkgver
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-}
 
 package() {
-	cd "$_builddir"
 	for _i in $_luaversions; do
 		mkdir -p "$pkgdir"/usr/share/lua/$_i
 		install -Dm644 alt_getopt.lua \
-			"$pkgdir"/usr/share/lua/$_i/alt_getopt.lua \
-			|| return 1
+			"$pkgdir"/usr/share/lua/$_i/alt_getopt.lua
 	done
 }
 
@@ -51,14 +33,13 @@ _split() {
 	for d in usr/lib/lua usr/share/lua; do
 		if [ -d "$pkgdir"/$d/$_ver ]; then
 			mkdir -p "$subpkgdir"/$d
-			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/ || return 1
+			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/
 		fi
 	done
 }
 
-
 for _v in $_luaversions; do
 	eval "split_${_v/./_}() { _split $_v; }"
 done
-sha512sums="8e7d1a2686a320a47199a71d09da1d3fad51bfa086dd6b1a95414325a24c66c4bef9ac9dd1ec9d866248a3b292a47e6c12cef47e88ce79a7f99bc5eaea68afc7  alt-getopt-0.7.tar.gz
-9c4f44c811e1dd6164fb332bb95c23cff63f3347ee2e130b4bac08683a394cd3578425716a7cd49873ee35344d40414f03f5a30130c6a8fa4f94cd78cb0004f9  lua5.2-compat.patch"
+
+sha512sums="1c0768e98793ee060a8a70bc47355abf5feac3b51d9844a26816267c0901df9f30c9ef3280766dec2c5b754123ca548c8f49cb294bf4f04c378c62ea377e09de  lua-alt-getopt-0.8.0.tar.gz"
diff --git a/main/lua-alt-getopt/lua5.2-compat.patch b/main/lua-alt-getopt/lua5.2-compat.patch
deleted file mode 100644
index 5ac65dba948..00000000000
--- a/main/lua-alt-getopt/lua5.2-compat.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 86eb438ffb3580e6f7e82c17929d59c914dd46cb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Peter=20Drahos=CC=8C?= <drahosp@gmail.com>
-Date: Wed, 16 May 2012 10:40:55 +0200
-Subject: [PATCH] Updated lua 5.2 compatibility
-
----
- CMakeLists.txt |  2 +-
- alt_getopt     |  2 +-
- alt_getopt.lua | 11 +++++++----
- dist.info      |  2 +-
- 4 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/alt_getopt b/alt_getopt
-index 4a48bf4..9fafee6 100755
---- a/alt_getopt
-+++ b/alt_getopt
-@@ -1,6 +1,6 @@
- #!/usr/bin/env lua
- 
--require "alt_getopt"
-+local alt_getopt = require "alt_getopt"
- 
- local long_opts = {
-    verbose = "v",
-diff --git a/alt_getopt.lua b/alt_getopt.lua
-index 7a6591a..efba5ac 100644
---- a/alt_getopt.lua
-+++ b/alt_getopt.lua
-@@ -21,8 +21,6 @@
- 
- local type, pairs, ipairs, io, os = type, pairs, ipairs, io, os
- 
--module ("alt_getopt")
--
- local function convert_short2long (opts)
-    local i = 1
-    local len = #opts
-@@ -61,7 +59,7 @@ local function canonize (options, opt)
-    return opt
- end
- 
--function get_ordered_opts (arg, sh_opts, long_opts)
-+local function get_ordered_opts (arg, sh_opts, long_opts)
-    local i      = 1
-    local count  = 1
-    local opts   = {}
-@@ -150,7 +148,7 @@ function get_ordered_opts (arg, sh_opts, long_opts)
-    return opts,i,optarg
- end
- 
--function get_opts (arg, sh_opts, long_opts)
-+local function get_opts (arg, sh_opts, long_opts)
-    local ret = {}
- 
-    local opts,optind,optarg = get_ordered_opts (arg, sh_opts, long_opts)
-@@ -164,3 +162,8 @@ function get_opts (arg, sh_opts, long_opts)
- 
-    return ret,optind
- end
-+
-+return {
-+    get_ordered_opts = get_ordered_opts,
-+    get_opts = get_opts,
-+}
-diff --git a/dist.info b/dist.info
-index 37f626a..02abf2a 100644
---- a/dist.info
-+++ b/dist.info
-@@ -1,7 +1,7 @@
- --- This file is part of LuaDist project
- 
- name = "alt-getopt"
--version = "0.7"
-+version = "0.7-1"
- 
- maintainer = "Peter Drahoš"
- desc = "Process application arguments the same way as getopt_long"
diff --git a/main/lua-aports/APKBUILD b/main/lua-aports/APKBUILD
index ff289a5c3bf..b5a244523fc 100644
--- a/main/lua-aports/APKBUILD
+++ b/main/lua-aports/APKBUILD
@@ -1,20 +1,22 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-aports
-pkgver=1.0.1
-pkgrel=0
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="Lua modules for parsing aports tree"
 url="https://dev.alpinelinux.org/archive/lua-aports/"
 arch="noarch"
 license="MIT"
 depends="lua5.2-cjson lua5.2-filesystem lua5.2-optarg lua5.2"
 replaces="abuild"
-source="https://dev.alpinelinux.org/archive/lua-aports/lua-aports-$pkgver.tar.xz
+source="$pkgname-$pkgver.tar.gz::https://gitlab.alpinelinux.org/alpine/lua-aports/-/archive/v$pkgver/lua-aports-v$pkgver.tar.gz
 	"
-builddir="$srcdir/$pkgname-$pkgver"
+builddir="$srcdir/$pkgname-v$pkgver"
+options="!check"
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e2368b0cb52712de1f698f208c3f30e72099dc640f963f931e5380704c03290e2425a0ff1cfbb181cc04cad586e932e03f9620f40978319c7b6fcd5cda1da342  lua-aports-1.0.1.tar.xz"
+sha512sums="
+961c54aba2078f6b9a6f40eeeab1d11c0f12f0f672f09860e8c93f9b378088ca8d0a6e1fc1c6936965744e1215874be526f95309a21a5d2fd52fb2688e09609b  lua-aports-1.1.0.tar.gz
+"
diff --git a/main/lua-asn1/APKBUILD b/main/lua-asn1/APKBUILD
index 7ce4e81a9d8..48125469852 100644
--- a/main/lua-asn1/APKBUILD
+++ b/main/lua-asn1/APKBUILD
@@ -1,36 +1,17 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
 pkgname=lua-asn1
 pkgver=2.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="ASN.1 framework for Lua"
 url=https://github.com/kunkku/lua-asn1
 arch=noarch
 license=MIT
 depends=lua-stringy
-makedepends=
-install=
-subpackages=
-source="$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz
-	"
-
-_builddir=$srcdir/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	:
-}
+source="$pkgname-$pkgver.tar.gz::https://github.com/kunkku/lua-asn1/archive/v$pkgver.tar.gz"
+options="!check"
 
 package() {
-	cd "$_builddir"
 	make install "ROOT_DIR=$pkgdir"
 }
 
diff --git a/main/lua-augeas/APKBUILD b/main/lua-augeas/APKBUILD
index 4bd1ab182ee..f38b974c2f3 100644
--- a/main/lua-augeas/APKBUILD
+++ b/main/lua-augeas/APKBUILD
@@ -1,49 +1,41 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 
 pkgname=lua-augeas
 pkgver=0.1.2
-pkgrel=4
+pkgrel=7
 pkgdesc="Lua bindings for Augeas"
-url="https://git.alpinelinux.org/cgit/lua-augeas/"
+url="https://git-old.alpinelinux.org/hosted/lua-augeas/"
 arch="all"
-license="LGPL"
-depends=""
-install=
+license="MIT"
 makedepends="augeas-dev"
-subpackages=""
 for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev"
 	subpackages="$subpackages lua$_i-augeas:split_${_i/./_}"
 done
 source="https://dev.alpinelinux.org/archive/lua-augeas/lua-augeas-$pkgver.tar.bz2
 	0001-support-for-Lua-5.2.patch"
+options="!check"
 
-_sdir="$srcdir"/lua-augeas-$pkgver
 prepare() {
-	cd "$_sdir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
 	for _i in $_luaversions; do
-		cp -r "$_sdir" "$srcdir"/build-$_i
+		cp -r "$builddir" "$srcdir"/build-$_i
 	done
 }
 
 build() {
 	for _i in $_luaversions; do
 		cd "$srcdir"/build-$_i
-		make LUAPC=lua$_i || return 1
+		make LUAPC=lua$_i
 	done
 }
 
 package() {
 	for _i in $_luaversions; do
 		install -D "$srcdir"/build-$_i/augeas.so \
-			"$pkgdir"/usr/lib/lua/$_i/augeas.so || return 1
+			"$pkgdir"/usr/lib/lua/$_i/augeas.so
 	done
 }
 
@@ -56,7 +48,7 @@ _split() {
 	for d in usr/lib/lua usr/share/lua; do
 		if [ -d "$pkgdir"/$d/$_ver ]; then
 			mkdir -p "$subpkgdir"/$d
-			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/ || return 1
+			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/
 		fi
 	done
 }
@@ -64,6 +56,7 @@ _split() {
 split_5_1() { _split 5.1; }
 split_5_2() { _split 5.2; }
 split_5_3() { _split 5.3; }
+split_5_4() { _split 5.4; }
 
 sha512sums="3ccbb32d4d71a9d390e814084a91fc26d51f25d31a1ff3a1e9927c494d196fdbc3954ae763b18e3b6e938bba9090773e4ac5fdb93ebc6d3293dc6be351485459  lua-augeas-0.1.2.tar.bz2
 35ce609c0f34d88b3cd3a2edc6b7bc4332de9b06ad9b57a2fcc54c655399ad8e426b224e064d86146ccc1258ae7cb58a33d6187e7d5f396888a1d5a61637c940  0001-support-for-Lua-5.2.patch"
diff --git a/main/lua-b64/APKBUILD b/main/lua-b64/APKBUILD
index 7c718ee187a..4419081ee87 100644
--- a/main/lua-b64/APKBUILD
+++ b/main/lua-b64/APKBUILD
@@ -1,19 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-b64
 pkgver=0.1
-pkgrel=2
+pkgrel=5
 pkgdesc="Lua base64 implementation with support for urlsafe"
 url="https://github.com/ncopa/lua-b64"
 arch="all"
 license="MIT"
 depends="lua"
-makedepends=""
-subpackages=""
-source="$pkgname-$pkgver.tar.gz::https://github.com/ncopa/$pkgname/archive/v$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/ncopa/lua-b64/archive/v$pkgver.tar.gz
 	0001-b64-fix-segfault-caused-by-signed-char.patch"
-builddir="$srcdir/$pkgname-$pkgver"
+options="!check"
 
-_luaversions="5.2 5.3"
+_luaversions="5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
diff --git a/main/lua-bit32/APKBUILD b/main/lua-bit32/APKBUILD
index 3256a9c0ba8..035cb722834 100644
--- a/main/lua-bit32/APKBUILD
+++ b/main/lua-bit32/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-bit32
 pkgver=5.3.0
-pkgrel=3
+pkgrel=5
 pkgdesc="A lua library providing bitwise operations"
 url="https://github.com/keplerproject/lua-compat-5.2"
 arch="all"
@@ -12,7 +12,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/keplerproject/lua-compat-5.2
 	"
 builddir="$srcdir/lua-compat-5.2-bitlib-$pkgver"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
@@ -20,11 +20,10 @@ for _v in $_luaversions; do
 done
 
 build() {
-    cd "$_builddir"
-    for _i in $_luaversions; do
-        msg "build for Lua $_i"
-        make -f "$srcdir"/Makefile LUAVER=$_i
-    done
+	for _i in $_luaversions; do
+		msg "build for Lua $_i"
+		make -f "$srcdir"/Makefile LUAVER=$_i
+	done
 }
 
 package() {
diff --git a/main/lua-busted/APKBUILD b/main/lua-busted/APKBUILD
new file mode 100644
index 00000000000..0329edf69c6
--- /dev/null
+++ b/main/lua-busted/APKBUILD
@@ -0,0 +1,86 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=lua-busted
+_pkgname=busted
+pkgver=2.2.0
+pkgrel=0
+pkgdesc="Elegant Lua unit testing"
+url="https://lunarmodules.github.io/busted/"
+arch="noarch"
+license="MIT"
+# Note: We have replaced dkjson with lua-cjson.
+depends="
+	lua-cjson
+	lua-cliargs
+	lua-luassert
+	lua-mediator
+	lua-penlight
+	lua-say
+	lua-system
+	lua-term
+	"
+checkdepends="luajit"
+source="$pkgname-$pkgver.tar.gz::https://github.com/lunarmodules/busted/archive/v$pkgver.tar.gz
+	use-cjson.patch"
+builddir="$srcdir/$_pkgname-$pkgver"
+# tests fail on x86_64 because cl_standalone.lua output is different, i don't know why --kaniini
+options="!check"
+
+_luaversions="5.1 5.2 5.3 5.4"
+for _v in $_luaversions; do
+	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
+	checkdepends="$checkdepends lua$_v"
+done
+
+prepare() {
+	default_prepare
+
+	local lver; for lver in $_luaversions jit; do
+		sed "s|/usr/bin/env lua|/usr/bin/lua$lver|" \
+			bin/busted > bin/busted-$lver
+	done
+}
+
+check() {
+	mv bin/busted bin/busted.orig
+
+	local lver; for lver in $_luaversions jit; do
+		# Some specs invokes bin/busted as subprocess, so we must
+		# ensure that it will run on the correct Lua version.
+		install -m 755 bin/busted-$lver bin/busted
+
+		msg "Running tests on lua$lver..."
+		lua$lver bin/busted spec
+	done
+
+	mv bin/busted.orig bin/busted
+}
+
+package() {
+	# Executable with shebang #!/usr/bin/env lua.
+	install -m 755 -D bin/busted "$pkgdir"/usr/bin/busted
+}
+
+_subpackage() {
+	local lver="${subpkgname:3:3}"
+	pkgdesc="$pkgdesc (for Lua $lver)"
+	depends="lua$lver ${depends//lua-/lua$lver-}"
+	install_if="$pkgname=$pkgver-r$pkgrel lua$lver"
+	local destdir="$subpkgdir/usr/share/lua/$lver/$_pkgname"
+	local rockdir="$subpkgdir/usr/lib/luarocks/rocks-$lver/$_pkgname/$pkgver-1"
+
+	cd "$builddir"
+
+	mkdir -p "$destdir"
+	cp -r busted/* "$destdir"
+
+	mkdir -p "$rockdir"
+	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
+
+	install -m 755 -D bin/busted-$lver "$subpkgdir"/usr/bin/busted-$lver
+}
+
+sha512sums="
+86789ddb93e1b7958a0a6f447ce17532a60d0af27df21159100d3ee8a98496ae30d5a22939e91cbbfac805df118be1ed571360f90a3b31b81d654e493e77b0b7  lua-busted-2.2.0.tar.gz
+8495713a5710d1b4369c992061ca5c424577c7cd487c73e9b045c7e4eb2a417b87955a5bd41b7ceb20cfb77f3331443b4bfeec179af973883dacae47f6988a2a  use-cjson.patch
+"
diff --git a/main/lua-busted/use-cjson.patch b/main/lua-busted/use-cjson.patch
new file mode 100644
index 00000000000..40c93df97e9
--- /dev/null
+++ b/main/lua-busted/use-cjson.patch
@@ -0,0 +1,8 @@
+--- a/busted/outputHandlers/json.lua 
++++ b/busted/outputHandlers/json.lua
+@@ -1,4 +1,4 @@
+-local json = require 'dkjson'
++local json = require 'cjson'
+ local io_write = io.write
+ local io_flush = io.flush
+ 
diff --git a/main/lua-cjson/APKBUILD b/main/lua-cjson/APKBUILD
index 57b70739500..b91db7b38b6 100644
--- a/main/lua-cjson/APKBUILD
+++ b/main/lua-cjson/APKBUILD
@@ -1,22 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-cjson
 pkgver=2.1.0
-pkgrel=8
+pkgrel=11
 pkgdesc="fast JSON parsing and encoding support for Lua"
 url="https://www.kyne.com.au/~mark/software/lua-cjson.php"
 arch="all"
 license="MIT"
-makedepends=""
-subpackages=""
-source="http://www.kyne.com.au/~mark/software/download/$pkgname-$pkgver.tar.gz
+source="http://www.kyne.com.au/~mark/software/download/lua-cjson-$pkgver.tar.gz
 	0001-Use-pkg-config-to-detect-cflags-or-fallback-to-LUA_I.patch
 	0002-lua53-integers.patch
 	0003-empty-array-metadata.patch
 	0004-Option-for-sorting-object-keys.patch
 	"
-builddir="$srcdir/$pkgname-$pkgver"
+options="!check"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
diff --git a/main/lua-cliargs/APKBUILD b/main/lua-cliargs/APKBUILD
new file mode 100644
index 00000000000..91630c7e672
--- /dev/null
+++ b/main/lua-cliargs/APKBUILD
@@ -0,0 +1,51 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=lua-cliargs
+_rockname=lua_cliargs
+pkgver=3.0.2
+pkgrel=0
+pkgdesc="A command-line argument parsing module for Lua"
+url="https://github.com/amireh/lua_cliargs"
+arch="noarch"
+license="MIT"
+checkdepends="
+	lua-busted
+	lua-cjson
+	lua-yaml
+	"
+source="https://github.com/amireh/lua_cliargs/archive/v$pkgver/$_rockname-$pkgver.tar.gz
+	support-cjson.patch
+	"
+builddir="$srcdir/$_rockname-$pkgver"
+options="!check"  # avoid circular dependency with lua-busted
+
+_luaversions="5.1 5.2 5.3 5.4"
+for _v in $_luaversions; do
+	checkdepends="$checkdepends lua$_v"
+	# for backward compatibility (Alpine <3.18)
+	provides="$provides lua$_v-cliargs=$pkgver-r$pkgrel"
+done
+
+check() {
+	local lver; for lver in $_luaversions jit; do
+		msg "Testing on lua$lver"
+		# from_ini - missing aport lua-inifile
+		lua$lver /usr/bin/busted --no-coverage --exclude-tags="from_ini"
+	done
+}
+
+package() {
+	local rockdir="$pkgdir/usr/lib/luarocks/rocks-common/$_rockname/$pkgver-1"
+	local luadir="$pkgdir/usr/share/lua/common"
+
+	mkdir -p "$luadir"
+	cp -r src/* "$luadir"/
+
+	mkdir -p "$rockdir"
+	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
+}
+
+sha512sums="
+3d9dac4723e8a41284eb28a7d1b5c400add91de055eb59645406929f5091c52bd71640b5f4914597b222b5ce7b43bbc918e4a34a69ce7bae726638bd2447abf8  lua_cliargs-3.0.2.tar.gz
+69c1d1118a9a4f270eb458c91c4cb73621e25d9ddede8b9a2892cf551b756abb328f705e69ff1e76b3e59af26dbe2852267e0c765db7d8e8e38f014797edc347  support-cjson.patch
+"
diff --git a/main/lua-cliargs/support-cjson.patch b/main/lua-cliargs/support-cjson.patch
new file mode 100644
index 00000000000..e8d952a0934
--- /dev/null
+++ b/main/lua-cliargs/support-cjson.patch
@@ -0,0 +1,27 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sun, 18 Dec 2022 19:43:00 +0100
+Subject: [PATCH] Add support for cjson
+
+--- a/src/cliargs/config_loader.lua
++++ b/src/cliargs/config_loader.lua
+@@ -36,14 +36,16 @@
+ 
+   --- Load configuration from a JSON file.
+   ---
+-  --- Requires the "dkjson"[1] module to be present on the system. Get it with:
++  --- Requires the "cjson"[1] or "dkjson"[2] module to be present on the system. Get it with:
+   ---
+-  ---     luarocks install dkjson
++  ---     luarocks install cjson
+   ---
+-  --- [1] http://dkolf.de/src/dkjson-lua.fsl/home
++  --- [1] https://www.kyne.com.au/~mark/software/lua-cjson.php
++  --- [2] http://dkolf.de/src/dkjson-lua.fsl/home
+   from_json = function(filepath)
+     local src, config, _, err
+-    local json = require 'dkjson'
++    local ok, json = pcall(require, 'cjson')
++    if not ok then json = require 'dkjson' end
+ 
+     src, err = read_file(filepath)
+ 
diff --git a/main/lua-cmsgpack/APKBUILD b/main/lua-cmsgpack/APKBUILD
index 6fcc025b05d..007b9b888f3 100644
--- a/main/lua-cmsgpack/APKBUILD
+++ b/main/lua-cmsgpack/APKBUILD
@@ -2,26 +2,20 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=lua-cmsgpack
 pkgver=0.4.0
-pkgrel=0
+pkgrel=2
 pkgdesc="MessagePack C implementation for Lua"
 url="https://github.com/antirez/lua-cmsgpack"
 arch="all"
 license="BSD-2-Clause"
-depends=""
-depends_dev=""
 makedepends="lua-dev"
-install=""
-subpackages=""
 source="lua-cmsgpack-$pkgver.tar.gz::https://github.com/antirez/lua-cmsgpack/archive/$pkgver.tar.gz"
-_builddir="$srcdir"/$pkgname-$pkgver
+options="!check"
 
 build() {
-	cd "$_builddir"
 	${CC:-gcc} $CFLAGS -fPIC $(pkg-config --cflags lua) -o cmsgpack.so -shared $LFDLAGS  $(pkg-config --libs lua) lua_cmsgpack.c
 }
 
 package() {
-	cd "$_builddir"
 	local dir=$( pkg-config --variable INSTALL_CMOD lua)
 	install -D cmsgpack.so "$pkgdir"/$dir/cmsgpack.so
 }
diff --git a/main/lua-cqueues/APKBUILD b/main/lua-cqueues/APKBUILD
index e066918af3f..ea8345a7b70 100644
--- a/main/lua-cqueues/APKBUILD
+++ b/main/lua-cqueues/APKBUILD
@@ -1,15 +1,15 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=lua-cqueues
 _pkgname=cqueues
-pkgver=20190813
-pkgrel=0
+pkgver=20200726
+pkgrel=5
 pkgdesc="Lua event loop using coroutines"
 url="http://25thandclement.com/~william/projects/cqueues.html"
 arch="all"
 license="MIT"
-makedepends="openssl-dev m4 bsd-compat-headers"
+makedepends="openssl-dev>3 m4 bsd-compat-headers"
 for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev"
 	subpackages="$subpackages lua$_i-$_pkgname:_package"
@@ -17,10 +17,9 @@ done
 source="cqueues-$pkgver.tar.gz::https://github.com/wahern/cqueues/archive/rel-$pkgver.tar.gz
 	"
 builddir="$srcdir/cqueues-rel-$pkgver"
+options="!check"
 
 build() {
-	cd "$builddir"
-
 	# Override the HAVE_* tests that depend on GLIBC. grep for "#define HAVE_" on new releases.
 	export CFLAGS="$CFLAGS -DHAVE_EVENTFD=1 -DHAVE_EPOLL_CREATE1=1 -DHAVE_PIPE2=1"
 
@@ -48,4 +47,4 @@ _package() {
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="454843759a45c39f7953f7054be25dfa8251861bea0572846e50224db377d830dfe4e3a5c63bc7f2da1dcdbdf5859dd67052cd635e0f1c3361a24bd8c0634971  cqueues-20190813.tar.gz"
+sha512sums="f2198a2a887bca445fe480949e05ecc94c3112827dbd65d2de0258316beee12f6052fa2670560daab708421e669dde0ac581b365af6bb94a3fc6f322c8bc7547  cqueues-20200726.tar.gz"
diff --git a/main/lua-curl/APKBUILD b/main/lua-curl/APKBUILD
index 45fc1c75daa..10d4afc5e68 100644
--- a/main/lua-curl/APKBUILD
+++ b/main/lua-curl/APKBUILD
@@ -1,19 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-curl
 _pkgname=Lua-cURLv3
-pkgver=0.3.11
-pkgrel=0
+pkgver=0.3.13
+pkgrel=1
 pkgdesc="Lua bindings to cURL library"
 url="https://github.com/Lua-cURL/Lua-cURLv3"
 arch="all"
 license="MIT"
 makedepends="curl-dev"
-subpackages=""
 source="$pkgname-$pkgver.tar.gz::https://github.com/Lua-cURL/$_pkgname/archive/v$pkgver.tar.gz"
 
 builddir="$srcdir/$_pkgname-$pkgver"
+options="!check"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
@@ -55,4 +55,4 @@ _subpackage() {
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="5b200463e481a1fdb6f05c87e25690bddc58e45e2c48e32eafaebd55d667771b1556aafa3f208ff5cb874dbe66b0850f52210cb60e223503ad22fe37b92b3b93  lua-curl-0.3.11.tar.gz"
+sha512sums="4283109e349b994e0d2349a45b37a95bab7a7fc115740a4ce078ff967485364714691eac3398db90bacb54584790d6ec778d845fb7ecc7716c0863c454216f05  lua-curl-0.3.13.tar.gz"
diff --git a/main/lua-dbi/APKBUILD b/main/lua-dbi/APKBUILD
index 96d5dceda5f..bb5c8f3fe18 100644
--- a/main/lua-dbi/APKBUILD
+++ b/main/lua-dbi/APKBUILD
@@ -2,19 +2,19 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=lua-dbi
 _pkgname=luadbi
-pkgver=0.7.2
-pkgrel=0
-pkgdesc="A database interface library for Lua"
+pkgver=0.7.3
+pkgrel=1
+pkgdesc="database interface library for Lua"
 url="https://github.com/mwild1/luadbi"
 arch="all"
 license="MIT"
-makedepends="mariadb-connector-c-dev postgresql-dev sqlite-dev"
+makedepends="mariadb-connector-c-dev libpq-dev sqlite-dev"
 _subpackages="$pkgname-mysql $pkgname-postgresql $pkgname-sqlite3"
-source="https://github.com/mwild1/$_pkgname/archive/v$pkgver/$_pkgname.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/mwild1/$_pkgname/archive/v$pkgver/$_pkgname.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 options="!check"  # provided tests require running DBs
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	for _subpkg in $_subpackages; do
@@ -56,4 +56,6 @@ _subpackage() {
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="891f99cbc8f1b5327ef820641a1608abf41410f2f28584b975cc3cf65154b9bebf6f1b9ca7d1818b9c965738ad700dd17ae042dfd2a7146cf755871ebae535b9  luadbi.tar.gz"
+sha512sums="
+1122bc9e83cf7071aff8685163a2dc387b40d2fb28aeb57e9c19e14afa6dcb0fb05fa76ea700f69751fdc79b0f1155235195d525041124fed5cefab0d50835bb  lua-dbi-0.7.3.tar.gz
+"
diff --git a/main/lua-discount/APKBUILD b/main/lua-discount/APKBUILD
index d564361d2b9..a2a70913123 100644
--- a/main/lua-discount/APKBUILD
+++ b/main/lua-discount/APKBUILD
@@ -1,31 +1,26 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=lua-discount
 pkgver=1.2.10.1
-pkgrel=4
+pkgrel=8
 pkgdesc="Markdown implementation in C for Lua"
-url="http://asbradbury.org/projects/lua-discount"
+url="https://asbradbury.org/projects/lua-discount"
 arch="all"
-license="BSD"
-depends=""
-subpackages=""
-makedepends=""
+license="custom" # BSD-based custom license
+subpackages="$pkgname-doc"
 for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev"
 	subpackages="$subpackages lua$_i-discount:split_${_i/./_}"
 done
-install=
-
-source="http://luaforge.net/frs/download.php/3758/lua-discount-1.2.10.1.tar.gz"
+source="https://dev.alpinelinux.org/archive/lua-discount/lua-discount-$pkgver.tar.gz"
+options="!check"
 
 build() {
 	cd "$srcdir"
 	for i in $_luaversions; do
 		cp -r $pkgname-$pkgver $i
-		(cd $i
-		make INCS="$(pkg-config --cflags lua$i)"
-		) || return 1
+		(cd $i; make INCS="$(pkg-config --cflags lua$i)")
 	done
 }
 
@@ -33,8 +28,9 @@ package() {
 	cd "$srcdir"
 	for i in $_luaversions; do
 		install -D -m644 $i/discount.so \
-			"$pkgdir"/usr/lib/lua/$i/discount.so || return 1
+			"$pkgdir"/usr/lib/lua/$i/discount.so
 	done
+	install -Dm644 "$builddir"/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 _split() {
@@ -43,12 +39,13 @@ _split() {
 	install_if="lua$_ver $pkgname=$pkgver-r$pkgrel"
 	depends=""
 	mkdir -p "$subpkgdir"/usr/lib/lua/
-	mv "$pkgdir"/usr/lib/lua/$_ver "$subpkgdir"/usr/lib/lua/ || return 1
+	mv "$pkgdir"/usr/lib/lua/$_ver "$subpkgdir"/usr/lib/lua/
 }
 
 for _v in $_luaversions; do
 	eval "split_${_v/./_}() { _split $_v; }"
 done
 
-
-sha512sums="84c26a19d97ca085c785d1916b05bc0c78a2b5a0965d7feeef9a545c4b69c71627791c5d560bcb529c9ed414ed2ebe99f253879d6eae593a5b6f93291d66d5b1  lua-discount-1.2.10.1.tar.gz"
+sha512sums="
+84c26a19d97ca085c785d1916b05bc0c78a2b5a0965d7feeef9a545c4b69c71627791c5d560bcb529c9ed414ed2ebe99f253879d6eae593a5b6f93291d66d5b1  lua-discount-1.2.10.1.tar.gz
+"
diff --git a/main/lua-dns/APKBUILD b/main/lua-dns/APKBUILD
index a15b2610fbe..f677e0cdfd1 100644
--- a/main/lua-dns/APKBUILD
+++ b/main/lua-dns/APKBUILD
@@ -1,17 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-dns
 pkgver=20080404
-pkgrel=2
+pkgrel=4
 pkgdesc="a DNS client library written in Lua using LuaSocket"
-url="http://ztact.com/software/dns.lua"
+url="https://github.com/abma/dns.lua"
 arch="noarch"
-license="GPL"
+license="Public Domain"
 depends="lua lua-socket"
-makedepends=
-install=
-subpackages=
 # Was found here: http://ztact.com/files/src/ztact-lua/
 source="dns.lua ztact.lua"
+options="!check"
 
 prepare() {
 	:
diff --git a/main/lua-evdev/APKBUILD b/main/lua-evdev/APKBUILD
index 14b62fae26f..e5082d43f4c 100644
--- a/main/lua-evdev/APKBUILD
+++ b/main/lua-evdev/APKBUILD
@@ -3,26 +3,26 @@ _luaversions="5.1 5.2 5.3"
 pkgname=lua-evdev
 _rockname=evdev
 pkgver=2.2.1
-pkgrel=1
+pkgrel=3
 pkgdesc="Lua module for reading input events"
 url="https://github.com/Tangent128/lua-evdev"
 arch="all"
 license="MIT"
-depends=""
 makedepends="linux-headers"
-subpackages=""
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_package"
 done
-source="$pkgname-$pkgver.tar.gz::https://github.com/Tangent128/$pkgname/archive/evdev-$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/Tangent128/lua-evdev/archive/evdev-$pkgver.tar.gz
+	time64.patch"
 builddir="$srcdir/$pkgname-evdev-$pkgver"
+options="!check"
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	local lver; for lver in $_luaversions; do
-		cp -r "$builddir" "$builddir-$lver" || return 1
+		cp -r "$builddir" "$builddir-$lver"
 	done
 }
 
@@ -31,7 +31,7 @@ build() {
 		msg "Building for Lua $lver..."
 
 		cd "$builddir-$lver"
-		make MYCFLAGS="$CFLAGS $(pkg-config --cflags lua$lver)" || return 1
+		make MYCFLAGS="$CFLAGS $(pkg-config --cflags lua$lver)"
 	done
 }
 
@@ -49,7 +49,7 @@ _package() {
 	cd "$builddir-$lver"
 
 	local f; for f in evdev.lua evdev/constants.lua; do
-		install -D $f "$subpkgdir"/usr/share/lua/$lver/$f || return 1
+		install -D $f "$subpkgdir"/usr/share/lua/$lver/$f
 	done
 	install -D evdev/core.so "$subpkgdir"/usr/lib/lua/$lver/evdev/core.so
 
@@ -57,4 +57,5 @@ _package() {
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="6d8bfb148013c780f7276c884e297b7d6ea55c0c257ac074c677b0dc6495a6087e0e1cb671d844b22d13c9a4c19c544d22a10f3ded5ad3580ccce33c74690871  lua-evdev-2.2.1.tar.gz"
+sha512sums="6d8bfb148013c780f7276c884e297b7d6ea55c0c257ac074c677b0dc6495a6087e0e1cb671d844b22d13c9a4c19c544d22a10f3ded5ad3580ccce33c74690871  lua-evdev-2.2.1.tar.gz
+6842d2fb223aa44ae799b0f2841d4847c3bbe83d64dc643cf843592a4e84bc0f734b745868985b3cb1977417c9afce2108b5a8c4e8c8d147529b9c4bee1b473e  time64.patch"
diff --git a/main/lua-evdev/time64.patch b/main/lua-evdev/time64.patch
new file mode 100644
index 00000000000..e440430c7cd
--- /dev/null
+++ b/main/lua-evdev/time64.patch
@@ -0,0 +1,12 @@
+diff -urN lua-evdev-evdev-2.2.1.orig/evdev/core.c lua-evdev-evdev-2.2.1/evdev/core.c
+--- lua-evdev-evdev-2.2.1.orig/evdev/core.c	2020-07-22 01:58:24.039086727 -0600
++++ lua-evdev-evdev-2.2.1/evdev/core.c	2020-07-22 01:58:48.622532514 -0600
+@@ -99,7 +99,7 @@
+ 	}
+ 
+ 	/* return: timestamp, event type, event code, event value */
+-	lua_pushnumber(L, evt.time.tv_sec + evt.time.tv_usec/1000000.0);
++	lua_pushnumber(L, evt.input_event_sec + evt.input_event_usec/1000000.0);
+ 	lua_pushinteger(L, evt.type);
+ 	lua_pushinteger(L, evt.code);
+ 	lua_pushinteger(L, evt.value);
diff --git a/main/lua-expat/APKBUILD b/main/lua-expat/APKBUILD
index b4c6ca75303..5489269f3bb 100644
--- a/main/lua-expat/APKBUILD
+++ b/main/lua-expat/APKBUILD
@@ -1,42 +1,36 @@
 # Contributor: Mika Havela <mika.havela@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=lua-expat
 _name=expat
-pkgver=1.3.0
-pkgrel=2
+pkgver=1.5.1
+pkgrel=1
 pkgdesc="SAX XML parser based on the Expat library"
-url="https://matthewwild.co.uk/projects/luaexpat/"
+url="https://lunarmodules.github.io/luaexpat/"
 arch="all"
 license="MIT"
-depends=""
 makedepends="expat-dev"
-install=
-subpackages=
-
 for _i in $_luaversions; do
-	makedepends="$makedepends lua${_i}-dev"
-	subpackages="$subpackages lua${_i}-$_name:_split${_i/./}"
+	makedepends="$makedepends lua$_i-dev"
+	subpackages="$subpackages lua$_i-$_name:_split${_i/./}"
 done
 
-source="http://matthewwild.co.uk/projects/luaexpat/luaexpat-$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/lunarmodules/luaexpat/archive/refs/tags/$pkgver.tar.gz"
+builddir="$srcdir/luaexpat-$pkgver"
+options="!check"
 
-_builddir="$srcdir"/luaexpat-1.3.0
 build() {
 	cd "$srcdir"
 	for _i in $_luaversions; do
-		cp -r "$_builddir" "$srcdir"/build-$_i || return 1
+		cp -r "$builddir" "$srcdir"/build-$_i
 		cd "$srcdir"/build-$_i
-		make LUA_V=$_i || return 1
+		make LUA_V=$_i
 	done
 }
 
 package() {
-	cd "$srcdir"
 	for _i in $_luaversions; do
-		(cd "$srcdir"/build-$_i && make install LUA_V=$_i \
-                        DESTDIR="$pkgdir") \
-			|| return 1
+		(cd "$srcdir"/build-$_i && make install LUA_V=$_i DESTDIR="$pkgdir")
 	done
 }
 
@@ -48,7 +42,7 @@ _split() {
 	for d in usr/lib/lua usr/share/lua; do
 		if [ -d "$pkgdir"/$d/$_ver ]; then
 			mkdir -p "$subpkgdir"/$d
-			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/ || return 1
+			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/
 		fi
 	done
 }
@@ -57,4 +51,6 @@ for _i in $_luaversions; do
 	eval "_split${_i/./}() { _split $_i; }"
 done
 
-sha512sums="91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae  luaexpat-1.3.0.tar.gz"
+sha512sums="
+45834b02d863a65c6de2ad3c5c671935ae512dd906233a647269438aeeb37c7bbd6e7166aefd8da72480b33e1aa79a86ed070ed8800a8e0f303ccc74918f3bb8  lua-expat-1.5.1.tar.gz
+"
diff --git a/main/lua-feedparser/APKBUILD b/main/lua-feedparser/APKBUILD
index e058599139e..2b27d9bf301 100644
--- a/main/lua-feedparser/APKBUILD
+++ b/main/lua-feedparser/APKBUILD
@@ -2,26 +2,25 @@
 pkgname=lua-feedparser
 _rockname=feedparser
 pkgver=0.71
-pkgrel=2
-pkgdesc="A decent RSS and Atom XML feed parser"
+pkgrel=3
+pkgdesc="decent RSS and Atom XML feed parser"
 url="https://github.com/slact/lua-feedparser"
 arch="noarch"
 license="BSD-3-Clause"
 depends="lua lua-expat"
-checkdepends="luajit"
 source="$pkgname-$pkgver.tar.gz::https://github.com/slact/lua-feedparser/archive/$pkgver.tar.gz"
 
 provides="$pkgname-common=$pkgver-r$pkgrel"  # for backward compatibility
 replaces="$pkgname-common"  # for backward compatibility
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	checkdepends="$checkdepends lua$_v"
 	provides="$provides lua$_v-${pkgname#lua-}=$pkgver-r$pkgrel"  # for backward compatibility
 done
 
 check() {
-	local lver; for lver in $_luaversions jit; do
+	local lver; for lver in $_luaversions; do
 		msg "Testing on Lua $lver"
 		make test LUA_BIN=lua$lver
 	done
@@ -38,4 +37,6 @@ package() {
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="8a65947b5472321fc162ec325c31e4d92e52e6cba6952c01c9941a7596403ed495ee464bfc32f5fdda3c58d33fae3a3b38882f7f22ecc16360c6603cd7ab4d4d  lua-feedparser-0.71.tar.gz"
+sha512sums="
+8a65947b5472321fc162ec325c31e4d92e52e6cba6952c01c9941a7596403ed495ee464bfc32f5fdda3c58d33fae3a3b38882f7f22ecc16360c6603cd7ab4d4d  lua-feedparser-0.71.tar.gz
+"
diff --git a/main/lua-file-magic/APKBUILD b/main/lua-file-magic/APKBUILD
index 4d8ae880ec4..a83e122a31c 100644
--- a/main/lua-file-magic/APKBUILD
+++ b/main/lua-file-magic/APKBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-file-magic
 pkgver=0.2
-pkgrel=1
+pkgrel=5
 pkgdesc="Lua binding to libmagic"
 url="https://github.com/ncopa/lua-file-magic"
 arch="all"
-license="LGPL"
+license="MIT"
 depends="lua"
 makedepends="file-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/ncopa/$pkgname/archive/v$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="$pkgname-$pkgver.tar.gz::https://github.com/ncopa/lua-file-magic/archive/v$pkgver.tar.gz"
+options="!check"
 
-_luaversions="5.2 5.3"
+_luaversions="5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
diff --git a/main/lua-filesize/APKBUILD b/main/lua-filesize/APKBUILD
index 7b0c695cadf..379fc6a5e2f 100644
--- a/main/lua-filesize/APKBUILD
+++ b/main/lua-filesize/APKBUILD
@@ -2,14 +2,15 @@
 _pkgname=filesize
 pkgname=lua-$_pkgname
 pkgver=0.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Generate human readable string describing the size of files"
 url="https://github.com/starius/lua-filesize"
 arch="all"
 license="MIT"
 source="$_pkgname-$pkgver.tar.gz::https://github.com/starius/lua-filesize/archive/$pkgver.tar.gz"
+options="!check"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-$_pkgname:split_${_v/./_}"
@@ -41,5 +42,6 @@ _split() {
 split_5_1() { _split 5.1 ; }
 split_5_2() { _split 5.2 ; }
 split_5_3() { _split 5.3 ; }
+split_5_4() { _split 5.4 ; }
 
 sha512sums="e1ea3d922b7e58e79a499d5e612367d22fa751348e8f253eef3145b5b440de1dcccaa2bbd66a28da6472dc73736c7de2798384355f88c77abf0501234bd261e3  filesize-0.1.1.tar.gz"
diff --git a/main/lua-filesystem/APKBUILD b/main/lua-filesystem/APKBUILD
index fc1eae10872..d9c2e6db168 100644
--- a/main/lua-filesystem/APKBUILD
+++ b/main/lua-filesystem/APKBUILD
@@ -1,19 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-filesystem
 _pkgname=luafilesystem
-pkgver=1.7.0.2
+pkgver=1.8.0
 _pkgver=${pkgver//./_}
 _rockver=${pkgver%.*}-${pkgver##*.}
-pkgrel=1
+pkgrel=4
 pkgdesc="Filesystem functions for Lua"
-url="http://keplerproject.github.io/luafilesystem/"
+url="https://lunarmodules.github.io/luafilesystem/"
 arch="all"
 license="MIT"
-checkdepends="luajit"
-source="$_pkgname-$pkgver.tar.gz::https://github.com/keplerproject/$_pkgname/archive/v$_pkgver.tar.gz"
+source="$_pkgname-$pkgver.tar.gz::https://github.com/lunarmodules/$_pkgname/archive/v$_pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$_pkgver"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
@@ -36,11 +35,11 @@ build() {
 }
 
 check() {
-	local lver; for lver in $_luaversions jit; do
+	local lver; for lver in $_luaversions; do
 		msg "Testing on lua$lver"
 
 		cd "$builddir-${lver/jit/5.1}"
-		LUA_CPATH=./src/?.so lua$lver tests/test.lua
+		LUA_CPATH="./src/?.so" lua$lver tests/test.lua
 	done
 }
 
@@ -54,7 +53,7 @@ _subpackage() {
 	depends="lua$lver"
 	install_if="$pkgname=$pkgver-r$pkgrel lua$lver"
 	local install_cmod=$(pkg-config --variable=INSTALL_CMOD lua$lver)
-	local rockdir="$subpkgdir/usr/lib/luarocks/rocks-$lver/$_rockname/$_rockver"
+	local rockdir="$subpkgdir/usr/lib/luarocks/rocks-$lver/$_pkgname/$_rockver"
 
 	make -C "$builddir-$lver" LUA_LIBDIR="$subpkgdir/$install_cmod" install
 
@@ -62,4 +61,6 @@ _subpackage() {
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="a1d4d077776e57cd878dbcd21656da141ea3686c587b5420a2b039aeaf086b7e7d05d531ee1cc2bbd7d06660d1315b09593e52143f6711f033ce8eecdc550511  luafilesystem-1.7.0.2.tar.gz"
+sha512sums="
+79d964f13ae43716281dc8521d2f128b22f2261234c443e242b857cfdf621e208bdf4512f8ba710baa113e9b3b71e2544609de65e2c483f569c243a5cf058247  luafilesystem-1.8.0.tar.gz
+"
diff --git a/main/lua-gversion/APKBUILD b/main/lua-gversion/APKBUILD
index 8b33432406c..61576851002 100644
--- a/main/lua-gversion/APKBUILD
+++ b/main/lua-gversion/APKBUILD
@@ -4,17 +4,17 @@ pkgname=lua-gversion
 _rockname=gversion
 _pkgname=gversion.lua
 pkgver=0.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Lua library for Gentoo-style versioning format"
 url="https://github.com/jirutka/gversion.lua"
 arch="noarch"
 license="MIT"
 depends="lua"
-provides=""
 source="$pkgname-$pkgver.tar.gz::https://github.com/jirutka/$_pkgname/archive/v$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
+options="!check"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	provides="$provides lua$_v-${pkgname#lua-}=$pkgver-r$pkgrel"  # for backward compatibility
 done
diff --git a/main/lua-hashids/APKBUILD b/main/lua-hashids/APKBUILD
index f27d459ac59..e303a635552 100644
--- a/main/lua-hashids/APKBUILD
+++ b/main/lua-hashids/APKBUILD
@@ -1,23 +1,18 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=lua-hashids
 pkgver=1.0.6
-pkgrel=1
-pkgdesc="A Lua implementation of hashids"
+pkgrel=4
+pkgdesc="Lua implementation of hashids"
 url="https://github.com/leihog/hashids.lua"
 arch="all"
 license="MIT"
-depends=""
-depends_dev=""
-makedepends=""
-install=""
-subpackages=""
 options="!check"
 source="hashids.lua-$pkgver.tar.gz::https://github.com/leihog/hashids.lua/archive/v$pkgver.tar.gz"
 
 builddir="$srcdir"/hashids.lua-$pkgver
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
diff --git a/main/lua-iconv/APKBUILD b/main/lua-iconv/APKBUILD
index 5731264b7c7..00697ce5a64 100644
--- a/main/lua-iconv/APKBUILD
+++ b/main/lua-iconv/APKBUILD
@@ -1,29 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=lua-iconv
 pkgver=7
-pkgrel=1
+pkgrel=4
 pkgdesc="Lua binding to the POSIX 'iconv' library"
 url="http://ittner.github.io/lua-iconv/"
 arch="all"
 license="MIT"
-depends=
-makedepends=""
 for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev"
 	subpackages="$subpackages lua$_i-iconv:split_${_i/./_}"
 done
-install=
-source="https://github.com/downloads/ittner/lua-iconv/lua-iconv-$pkgver.tar.gz
-	0001-lua-iconv-make-close-available-from-lua.patch"
+source="$pkgname-$pkgver-2.tar.gz::https://github.com/ittner/lua-iconv/archive/refs/tags/lua-iconv-$pkgver.tar.gz
+	0001-lua-iconv-make-close-available-from-lua.patch
+	"
+builddir="$srcdir/lua-iconv-lua-iconv-$pkgver"
+options="!check"
 
-_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$_builddir"
-	patch -p1 -i "$srcdir"/0001-lua-iconv-make-close-available-from-lua.patch
-	cd "$srcdir"
+	default_prepare
 	for _i in $_luaversions; do
-		cp -r $_builddir $_i || return 1
+		cp -r "$builddir" "$srcdir"/"$_i"
 	done
 }
 
@@ -32,16 +29,14 @@ build() {
 		msg "Build for Lua $_i"
 		cd "$srcdir"/$_i
 		make LUAPKG="lua$_i" \
-			CFLAGS="$CFLAGS $(pkg-config lua$_i --cflags)" \
-				|| return 1
+			CFLAGS="$CFLAGS $(pkg-config lua$_i --cflags)"
 	done
 }
 
 package() {
 	cd "$srcdir"
 	for _i in $_luaversions; do
-		install -D -s $_i/iconv.so "$pkgdir"/usr/lib/lua/$_i/iconv.so \
-			|| return 1
+		install -D -s $_i/iconv.so "$pkgdir"/usr/lib/lua/$_i/iconv.so
 	done
 }
 
@@ -50,7 +45,7 @@ _split() {
 	pkgdesc="$pkgdesc for Lua $_ver"
 	install_if="lua$_ver $pkgname=$pkgver-r$pkgrel"
 	depends=
-	mkdir -p "$subpkgdir/$d" || return 1
+	mkdir -p "$subpkgdir/$d"
 	mv "$pkgdir/$d/$1" "$subpkgdir/$d"
 }
 
@@ -58,5 +53,7 @@ for _v in $_luaversions; do
 	eval "split_${_v/./_}() { _split $_v; }"
 done
 
-sha512sums="03b537ba6050ca8e59e6a62474e837c0d6463d1da4610e6da820afc573659571f75de0c7507792e8b7348fd91623d7af7050ead18bd09ec0c7b89a742e024a57  lua-iconv-7.tar.gz
-472e6611638d57c6c99fcfe53defa9766d89c45f6eec5fb4dd31bd63a119901a99fa2219d38d66644d00c0fcfd006418ccb3ee5c0496f2397d3d76d05ae0cee9  0001-lua-iconv-make-close-available-from-lua.patch"
+sha512sums="
+7fae8be68878747a6bcb559d1548f7d0b330d519cdf306f6ec8250cb914ed971ba1a86fef20771a5add728d796c613c32544c20ba4f8b4315d20ee8ac39a607f  lua-iconv-7-2.tar.gz
+472e6611638d57c6c99fcfe53defa9766d89c45f6eec5fb4dd31bd63a119901a99fa2219d38d66644d00c0fcfd006418ccb3ee5c0496f2397d3d76d05ae0cee9  0001-lua-iconv-make-close-available-from-lua.patch
+"
diff --git a/main/lua-imlib2/APKBUILD b/main/lua-imlib2/APKBUILD
deleted file mode 100644
index aafb77c1ce5..00000000000
--- a/main/lua-imlib2/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=lua-imlib2
-pkgver=0.1
-pkgrel=2
-pkgdesc="A LUA binding to the Imlib2 image manipulation library"
-url="http://asbradbury.org/projects/lua-imlib2/"
-arch="all"
-license="MIT"
-depends=
-makedepends="lua-dev imlib2-dev"
-install=
-source="http://luaforge.net/frs/download.php/3042/lua-imlib2-$pkgver.tar.gz"
-
-
-_builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	cd "$_builddir"
-	# apply patches here
-}
-
-build() {
-	cd "$_builddir"
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	install -D limlib2.so "$pkgdir"/usr/lib/lua/5.1/limlib2.so
-	install -D imlib2.lua "$pkgdir"/usr/share/lua/5.1/imlib2.lua
-}
-
-sha512sums="0b902e3e1f6a94f94dd735549456aff7713a76f758162a0bca9aa01cab1cf8ddd4b159c10623bfb7d42d5d85e53dd474b523fd3fdc914e31ffe49c85f28141d6  lua-imlib2-0.1.tar.gz"
diff --git a/main/lua-inspect/APKBUILD b/main/lua-inspect/APKBUILD
index bd90124a95a..ae4788e188e 100644
--- a/main/lua-inspect/APKBUILD
+++ b/main/lua-inspect/APKBUILD
@@ -1,21 +1,21 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=lua-inspect
 _rockname=inspect
 _pkgname=inspect.lua
-pkgver=3.1.1
-pkgrel=1
+pkgver=3.1.3
+pkgrel=0
 pkgdesc="Human-readable representation of Lua tables"
 url="https://github.com/kikito/inspect.lua"
 arch="noarch"
 license="MIT"
 depends="lua"
-provides=""
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/kikito/$_pkgname/archive/v$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
+options="!check"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	provides="$provides lua$_v-${pkgname#lua-}=$pkgver-r$pkgrel"  # for backward compatibility
 done
@@ -23,8 +23,6 @@ done
 package() {
 	local rockdir="$pkgdir/usr/lib/luarocks/rocks-common/$_rockname/$pkgver-1"
 
-	cd "$builddir"
-
 	install -Dm644 "$builddir"/inspect.lua \
 		"$pkgdir"/usr/share/lua/common/inspect.lua
 	install -Dm644 README.md \
@@ -34,4 +32,6 @@ package() {
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="d9e6f605033b43ac07f6ab731b1c10f59ebd0a64bb3d6449cef39b2fc43d9ad0eb062a000f76bc9b25222a52a3b344ab3a8af7b6bfe3d92a52447faf5dfbcbbd  lua-inspect-3.1.1.tar.gz"
+sha512sums="
+bc0e93d4c56ce8e5a76d9b19b1376493d2be9e1280cabd8f1251729b2286f711030a13283771ec26e2107131c081d44435dbec70b172313b2493a6e346a1a6fb  lua-inspect-3.1.3.tar.gz
+"
diff --git a/main/lua-json4/APKBUILD b/main/lua-json4/APKBUILD
index 85b3e2ef90f..ffc5ccc08d2 100644
--- a/main/lua-json4/APKBUILD
+++ b/main/lua-json4/APKBUILD
@@ -2,17 +2,17 @@
 pkgname=lua-json4
 _rockname=json4lua
 pkgver=1.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="JSON encoding / decoding module for Lua (JSON4lua)"
 url="https://github.com/craigmj/json4lua"
 arch="noarch"
-license="GPL-2.0"
+license="MIT"
 depends="lua"
-provides=""
 source="$pkgname-$pkgver.tar.gz::https://github.com/craigmj/$_rockname/archive/$pkgver.tar.gz"
 builddir="$srcdir/$_rockname-$pkgver"
+options="!check"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	provides="$provides lua$_v-${pkgname#lua-}=$pkgver-r$pkgrel"  # for backward compatibility
 done
@@ -20,8 +20,6 @@ done
 package() {
 	local rockdir="$pkgdir/usr/lib/luarocks/rocks-common/$_rockname/$pkgver-1"
 
-	cd "$builddir"
-
 	install -D -m 644 json/json.lua "$pkgdir"/usr/share/lua/common/json.lua
 
 	mkdir -p "$rockdir"
diff --git a/main/lua-ldap/APKBUILD b/main/lua-ldap/APKBUILD
index aa76150790c..a69c85129b6 100644
--- a/main/lua-ldap/APKBUILD
+++ b/main/lua-ldap/APKBUILD
@@ -3,38 +3,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-ldap
 _pkgname=lualdap
-pkgver=1.2.3
-pkgrel=5
+pkgver=1.3.1
+pkgrel=1
 pkgdesc="Lua binding to LDAP"
-url="https://github.com/bdellegrazie/lualdap"
+url="https://github.com/lualdap/lualdap"
 arch="all"
 license="MIT"
-depends=""
+options="!check" # fails to detect correct builddir
 makedepends="openldap-dev"
-checkdepends="openldap openldap-back-bdb"
-subpackages=""
-source="$_pkgname-$pkgver.tar.gz::https://github.com/bdellegrazie/$_pkgname/archive/v$pkgver.tar.gz
-	fix-open_simple-segfault.patch
-	fix-anonymous-bind.patch
-	fix-search-iter.patch
-	script-to-run-test.lua-against-a-dummy-slapd.patch
-	update-test.lua-for-5.2.patch"
+checkdepends="openldap openldap-back-mdb lua-busted"
+source="$_pkgname-$pkgver.tar.gz::https://github.com/lualdap/lualdap/archive/v$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_package"
 done
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
-	cd "$builddir"
 	sed -i -e '/LUA_VERSION_NUM/d' config
 
 	local lver; for lver in $_luaversions; do
-		cp -r "$builddir" "$builddir-$lver" || return 1
+		cp -r "$builddir" "$builddir-$lver"
 	done
 }
 
@@ -43,8 +36,8 @@ build() {
 		msg "Building for Lua $lver..."
 
 		cd "$builddir-$lver"
-		make CFLAGS="-fPIC -ansi -Wall $(pkg-config --cflags lua$lver)" \
-			OPENLDAP_LIB="-lldap -llber" || return 1
+		make CFLAGS="$CFLAGS -fPIC -ansi -Wall $(pkg-config --cflags lua$lver)" \
+			OPENLDAP_LIB="-lldap -llber"
 	done
 }
 
@@ -53,7 +46,7 @@ check() {
 		msg "Testing with Lua $lver..."
 
 		cd "$builddir-$lver"
-		make LUA=lua$lver check || return 1
+		make LUA_CPATH="src/?.so.$V" LUA=lua$lver check
 	done
 }
 
@@ -70,8 +63,10 @@ _package() {
 	replaces="lua$lver-lualdap"  # for backward compatibility (v3.5)
 	[ "$lver" = "5.1" ] && replaces="${replaces:-} $pkgname"  # for backward compatibility (<v3.4)
 
+	mkdir -p "$subpkgdir/usr/lib/lua/$lver"
 	cd "$builddir-$lver"
 	make DESTDIR="$subpkgdir" \
+		LUA=lua$lver \
 		LUA_LIBDIR="$(pkg-config --variable=INSTALL_CMOD lua$lver)" \
 		install
 
@@ -79,9 +74,6 @@ _package() {
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="51934d18d1ee97a0130545e657497e51542eef97c338df14e7171f94a2d6395fceb00313e1e64e46e6cdeedf85a17c63284595fdf6fbce8b7abce29d28f1b4a7  lualdap-1.2.3.tar.gz
-f9f88ef13c8dd13064ca338720d461355cc4d32c03a7e597d7d7a0d9a8a20802bafe0dd479f8c341926fc714fb91489f0649c76675609b84d61ee0327fba8a56  fix-open_simple-segfault.patch
-733bbe09edba98f7a549d1e4083a45bf05e1ce9aeffea0416b42e22f1a9f3072a4b36dd56bfde78586edcaafeffcd4880cb72953aeb2952121c92afadd0c8816  fix-anonymous-bind.patch
-45170c06fe71bc61565fbdb960d74e59745dc91cbf52c760b8495890d9b02d8fa9361dc4c747d1257db8cb0dac16d97415db6fe69d6d17bb0b37b507aa60627e  fix-search-iter.patch
-59622fabc03dd669c554cd8a58a934b5990f482da59bd5b7c243e53a41fbaaa55933ebd345d0d5911c48665fa18f6fcb08e0d9d74a61602f80afe6cb0b20dc4a  script-to-run-test.lua-against-a-dummy-slapd.patch
-ffc0f08a141667db402b4b523f0de9893035bdbee5f8e68e48792cd7a29d549931ec4be0715b9f872992f492c1ac2e62c0e05552159571ffa05e5f507a1baf85  update-test.lua-for-5.2.patch"
+sha512sums="
+29d622ecf63214ac26ade71478c383e4f1b7468097bf19b99b8209b3f6cbb2078298a149d64ba8a7ca4abe97aa45550982792fa4ac0a8014f7daf709fe725e9f  lualdap-1.3.1.tar.gz
+"
diff --git a/main/lua-ldap/fix-anonymous-bind.patch b/main/lua-ldap/fix-anonymous-bind.patch
deleted file mode 100644
index 4c5babe8d01..00000000000
--- a/main/lua-ldap/fix-anonymous-bind.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Sun, 12 Mar 2017 15:16:19 +0100
-Subject: [PATCH] Fix anonymous bind
-
-Empty string should work for both ancient and the current OpenLDAP API
-(but I've tested only the current).
-
-Upstream-Issue: https://github.com/bdellegrazie/lualdap/pull/1
----
- src/lualdap.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lualdap.c b/src/lualdap.c
-index 5bc1bb9..6063a97 100644
---- a/src/lualdap.c
-+++ b/src/lualdap.c
-@@ -1003,7 +1003,7 @@ static int lualdap_initialize (lua_State *L) {
- static int lualdap_open_simple (lua_State *L) {
- 	ldap_pchar_t host = (ldap_pchar_t) luaL_checkstring (L, 1);
- 	ldap_pchar_t who = (ldap_pchar_t) luaL_optstring (L, 2, NULL);
--	const char *password = luaL_optstring (L, 3, NULL);
-+	const char *password = luaL_optstring (L, 3, "");
- 	int use_tls = lua_toboolean (L, 4);
- 	conn_data *conn = (conn_data *)lua_newuserdata (L, sizeof(conn_data));
- #if defined(LDAP_API_FEATURE_X_OPENLDAP) && LDAP_API_FEATURE_X_OPENLDAP >= 20300
diff --git a/main/lua-ldap/fix-open_simple-segfault.patch b/main/lua-ldap/fix-open_simple-segfault.patch
deleted file mode 100644
index 7a7ffdeb6d1..00000000000
--- a/main/lua-ldap/fix-open_simple-segfault.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Fri, 10 Mar 2017 00:28:52 +0100
-Subject: [PATCH] Fix segfault in lualdap_open_simple()
-
-Upstream-Issue: https://github.com/bdellegrazie/lualdap/pull/1
---- a/src/lualdap.c
-+++ b/src/lualdap.c
-@@ -1011,7 +1011,7 @@
- 	int use_tls = lua_toboolean (L, 4);
- 	conn_data *conn = (conn_data *)lua_newuserdata (L, sizeof(conn_data));
- #if defined(LDAP_API_FEATURE_X_OPENLDAP) && LDAP_API_FEATURE_X_OPENLDAP >= 20300
--	struct berval cred = { 0, NULL };
-+	struct berval *cred = NULL;
- 	char *host_with_schema = NULL;
- #endif
- 	int err;
-@@ -1045,12 +1045,9 @@
- 	}
- 	/* Bind to a server */
- #if defined(LDAP_API_FEATURE_X_OPENLDAP) && LDAP_API_FEATURE_X_OPENLDAP >= 20300
--	cred.bv_len = strlen(password);
--	cred.bv_val = malloc(cred.bv_len+1);
--	strcpy(cred.bv_val, password);
--	err = ldap_sasl_bind_s (conn->ld, who, LDAP_SASL_SIMPLE, &cred, NULL, NULL, NULL);
--	free(cred.bv_val);
--	memset(&cred, 0, sizeof(cred));
-+	cred = ber_bvstrdup(password);
-+	err = ldap_sasl_bind_s (conn->ld, who, LDAP_SASL_SIMPLE, cred, NULL, NULL, NULL);
-+	ber_bvfree(cred);
- #else
- 	err = ldap_bind_s (conn->ld, who, password, LDAP_AUTH_SIMPLE);
- #endif
diff --git a/main/lua-ldap/fix-search-iter.patch b/main/lua-ldap/fix-search-iter.patch
deleted file mode 100644
index 6c491ea19ab..00000000000
--- a/main/lua-ldap/fix-search-iter.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Fri, 10 Mar 2017 00:29:30 +0100
-Subject: [PATCH] Fix error when calling search result iterator
-
-This patch fixes error:
-
-    tests/test.lua:175: bad argument #1 to 'iter' (table expected, got no value)
-
-Upstream-Issue: https://github.com/bdellegrazie/lualdap/pull/1
---- a/src/lualdap.c
-+++ b/src/lualdap.c
-@@ -726,8 +726,6 @@
- 	int rc;
- 	int ret;
- 
--	luaL_checktype(L, 1, LUA_TTABLE);
--
- 	lua_rawgeti (L, LUA_REGISTRYINDEX, search->conn);
- 	conn = (conn_data *)lua_touserdata (L, -1); /* get connection */
- 
diff --git a/main/lua-ldap/script-to-run-test.lua-against-a-dummy-slapd.patch b/main/lua-ldap/script-to-run-test.lua-against-a-dummy-slapd.patch
deleted file mode 100644
index 9ec951bd288..00000000000
--- a/main/lua-ldap/script-to-run-test.lua-against-a-dummy-slapd.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From d69b83f1464a6326c426f0228bb98c626c7f64bd Mon Sep 17 00:00:00 2001
-From: Dan Callaghan <dcallagh@redhat.com>
-Date: Mon, 30 Jun 2014 11:27:56 +1000
-Subject: [PATCH] Add script to run test.lua against a dummy slapd
-
-Ported from https://src.fedoraproject.org/cgit/rpms/lua-ldap.git/tree/0002-script-to-run-test.lua-against-a-dummy-slapd.patch
-Upstream-Issue: https://github.com/bdellegrazie/lualdap/pull/2
----
- Makefile           |  3 ++
- tests/run-tests.sh | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 86 insertions(+)
- create mode 100755 tests/run-tests.sh
-
-diff --git a/Makefile b/Makefile
-index 72ee348..9bfa542 100644
---- a/Makefile
-+++ b/Makefile
-@@ -26,3 +26,6 @@ install: src/$(LIBNAME)
- 
- clean:
- 	rm -f $(OBJS) src/$(LIBNAME)
-+
-+check:
-+	LUA_CPATH="src/?.so.$V" sh tests/run-tests.sh
-diff --git a/tests/run-tests.sh b/tests/run-tests.sh
-new file mode 100755
-index 0000000..33949c1
---- /dev/null
-+++ b/tests/run-tests.sh
-@@ -0,0 +1,83 @@
-+#!/bin/sh
-+set -ex
-+
-+d=$(readlink -f "$(dirname $0)")
-+password=thepassword
-+
-+rm -rf "$d/slapd-config" "$d/slapd-data"
-+mkdir "$d/slapd-config" "$d/slapd-data"
-+
-+# populate slapd config
-+slapadd -F "$d/slapd-config" -n0 <<EOF
-+dn: cn=config
-+objectClass: olcGlobal
-+cn: config
-+olcPidFile: $d/slapd.pid
-+
-+dn: cn=schema,cn=config
-+objectClass: olcSchemaConfig
-+cn: schema
-+
-+dn: cn=module,cn=config
-+objectClass: olcModuleList
-+cn: module
-+olcModulepath: /usr/lib/openldap
-+olcModuleload: back_bdb.so
-+
-+include: file:///etc/openldap/schema/core.ldif
-+include: file:///etc/openldap/schema/cosine.ldif
-+include: file:///etc/openldap/schema/inetorgperson.ldif
-+include: file:///etc/openldap/schema/nis.ldif
-+
-+dn: olcDatabase=config,cn=config
-+objectClass: olcDatabaseConfig
-+olcDatabase: config
-+olcAccess: to * by * none
-+
-+dn: olcDatabase=bdb,cn=config
-+objectClass: olcDatabaseConfig
-+objectClass: olcBdbConfig
-+olcDatabase: bdb
-+olcSuffix: dc=example,dc=invalid
-+olcDbDirectory: $d/slapd-data
-+olcDbIndex: objectClass eq
-+olcAccess: to * by * write
-+#olcAccess: to * by users write
-+EOF
-+
-+# populate slapd data
-+slapadd -F "$d/slapd-config" -n1 <<EOF
-+dn: dc=example,dc=invalid
-+objectClass: top
-+objectClass: domain
-+
-+#dn: ou=users,dc=example,dc=invalid
-+#objectClass: top
-+#objectClass: organizationalUnit
-+#ou: users
-+
-+dn: uid=ldapuser,dc=example,dc=invalid
-+objectClass: top
-+objectClass: person
-+objectClass: organizationalperson
-+objectClass: inetorgperson
-+objectClass: posixAccount
-+cn: My LDAP User
-+givenName: My
-+sn: LDAP User
-+uid: ldapuser
-+uidNumber: 15549
-+gidNumber: 15549
-+homeDirectory: /home/lol
-+mail: ldapuser@example.invalid
-+userPassword: $(slappasswd -s "$password")
-+EOF
-+
-+slapd -F "$d/slapd-config" -h ldap://localhost:3899/
-+trap 'kill -TERM $(cat "$d/slapd.pid")' EXIT
-+
-+${LUA:-lua} tests/test.lua \
-+	localhost:3899 \
-+	dc=example,dc=invalid \
-+	uid=ldapuser,dc=example,dc=invalid \
-+	"$password"
-
diff --git a/main/lua-ldap/update-test.lua-for-5.2.patch b/main/lua-ldap/update-test.lua-for-5.2.patch
deleted file mode 100644
index 1d3ed51f2f2..00000000000
--- a/main/lua-ldap/update-test.lua-for-5.2.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 85891948cd7b6e9eed2c0e4b199de2a8d19a0824 Mon Sep 17 00:00:00 2001
-From: Dan Callaghan <dcallagh@redhat.com>
-Date: Mon, 30 Jun 2014 11:18:04 +1000
-Subject: [PATCH] update test.lua for 5.2
-
-Source: https://src.fedoraproject.org/cgit/rpms/lua-ldap.git/tree/0001-update-test.lua-for-5.2.patch
-Upstream-Issue: https://github.com/bdellegrazie/lualdap/pull/2
-diff --git a/lualdap/tests/test.lua b/lualdap/tests/test.lua
-index 2dce95b..76c8640 100755
---- a/tests/test.lua
-+++ b/tests/test.lua
-@@ -27,7 +27,7 @@ function print_attrs (dn, attrs)
- 		if tv == "string" then
- 			io.write (values)
- 		elseif tv == "table" then
--			local n = table.getn (values)
-+			local n = #values
- 			for i = 1, n-1 do
- 				io.write (values[i]..",")
- 			end
-@@ -77,7 +77,7 @@ function test_object (obj, objmethods)
- 	-- trying to set metatable.
- 	assert2 (false, pcall (setmetatable, ENV, {}))
- 	-- checking existence of object's methods.
--	for i = 1, table.getn (objmethods) do
-+	for i = 1, #objmethods do
- 		local method = obj[objmethods[i]]
- 		assert2 ("function", type(method))
- 		assert2 (false, pcall (method), "no 'self' parameter accepted")
-@@ -128,7 +128,7 @@ end
- -- checks return value which should be a function AND also its return value.
- ---------------------------------------------------------------------
- function check_future (ret, method, ...)
--	local ok, f = pcall (method, unpack (arg))
-+	local ok, f = pcall (method, ...)
- 	assert (ok, f)
- 	assert2 ("function", type(f))
- 	assert2 (ret, f())
-@@ -377,7 +377,7 @@ tests = {
- -- Main
- ---------------------------------------------------------------------
- 
--if table.getn(arg) < 1 then
-+if #arg < 1 then
- 	print (string.format ("Usage %s host[:port] base [who [password]]", arg[0]))
- 	os.exit()
- end
-@@ -390,7 +390,7 @@ PASSWORD = arg[4]
- require"lualdap"
- assert (type(lualdap)=="table", "couldn't load LDAP library")
- 
--for i = 1, table.getn (tests) do
-+for i = 1, #tests do
- 	local t = tests[i]
- 	io.write (t[1].." ...")
- 	t[2] ()
--- 
-1.9.3
-
diff --git a/main/lua-ldbus/APKBUILD b/main/lua-ldbus/APKBUILD
index 5c78342e531..cd997aacf49 100644
--- a/main/lua-ldbus/APKBUILD
+++ b/main/lua-ldbus/APKBUILD
@@ -3,71 +3,53 @@ _luaversions="5.1 5.2 5.3"
 pkgname=lua-ldbus
 pkgver=20150430
 _commitid=9f6db626600eb7e04000368da947e0c5cd175fb5
-pkgrel=2
+pkgrel=4
 pkgdesc="Lua D-Bus bindings"
 url="https://github.com/daurnimator/ldbus"
 arch="all"
 license="MIT"
-depends=""
-subpackages=""
 makedepends="dbus-dev"
-install=""
 source="ldbus-$pkgver.tar.gz::https://github.com/daurnimator/ldbus/archive/$_commitid.tar.gz
 	0001-fix-lua_State-usage-for-callbacks.patch
 	fix-makefile.patch
 	"
+options="!check" # no tests
 
 for _i in $_luaversions; do
-	makedepends="$makedepends lua${_i}-dev"
-	subpackages="$subpackages lua${_i}-ldbus:_split_${_i/./}"
+	makedepends="$makedepends lua$_i-dev"
+	subpackages="$subpackages lua$_i-ldbus:_package"
 done
 
-_builddir="$srcdir"/ldbus-$_commitid/src
-prepare() {
-	local i
-	cd "$srcdir"/ldbus-$_commitid
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/ldbus-$_commitid
 
 build() {
-	cd "$_builddir"
+	cd src
 	for _i in $_luaversions; do
 		msg "Build for Lua $_i"
-		make LUA_VERSION=$_i LUA_LIBDIR="$pkgdir"/usr/lib/lua/$_i all || return 1
+		make LUA_VERSION=$_i LUA_LIBDIR="$pkgdir"/usr/lib/lua/$_i all
 	done
 }
 
 package() {
-	cd "$_builddir"
+	cd src
 	for _i in $_luaversions; do
 		msg "Install for Lua $_i"
-		make LUA_VERSION=$_i LUA_LIBDIR="$pkgdir"/usr/lib/lua/$_i install || return 1
+		make LUA_VERSION=$_i LUA_LIBDIR="$pkgdir"/usr/lib/lua/$_i install
 	done
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
-_split() {
-	local d= _ver=$1
-	pkgdesc="$pkgdesc - for Lua $_ver"
-	depends=
-	install_if="lua$_ver $pkgname=$pkgver-r$pkgrel"
-	for d in usr/lib/lua usr/share/lua; do
-		if [ -d "$pkgdir"/$d/$_ver ]; then
-			mkdir -p "$subpkgdir"/$d
-			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/ || return 1
-		fi
-	done
-}
-
-for _i in $_luaversions; do
-	eval "_split_${_i/./}() { _split $_i; }"
-done
+_package() {
+	local lver=${subpkgname:3:3}
+	pkgdesc="$pkgdesc - for Lua $lver"
+	depends="lua$lver"
+	install_if="lua$lver $pkgname=$pkgver-r$pkgrel"
 
+	amove usr/lib/lua/$lver
+}
 
-sha512sums="cab609800b3d67bb6fd533b62179345430e822ad30c711bc8f35cb079353108339288eb7adc374a681bb4f42b66cfd025cff4591fd9cbef045acad41e72d3073  ldbus-20150430.tar.gz
+sha512sums="
+cab609800b3d67bb6fd533b62179345430e822ad30c711bc8f35cb079353108339288eb7adc374a681bb4f42b66cfd025cff4591fd9cbef045acad41e72d3073  ldbus-20150430.tar.gz
 77d631acfa58ad28868a7ccd8a3ec3f5e44357f0243cdf373037955b5961bc84094790d137a05a47b3cd26665d5afcfc1491b361dd895797fe317fe7e947a252  0001-fix-lua_State-usage-for-callbacks.patch
-ee9dfa64598cb856602d70f7d15b4783423799ed428ed3c2f6f28d1085dd14c34204cd38fa390574b982237858d0c8970f5f517827310d780afe2bd32e496380  fix-makefile.patch"
+ee9dfa64598cb856602d70f7d15b4783423799ed428ed3c2f6f28d1085dd14c34204cd38fa390574b982237858d0c8970f5f517827310d780afe2bd32e496380  fix-makefile.patch
+"
diff --git a/main/lua-luassert/APKBUILD b/main/lua-luassert/APKBUILD
new file mode 100644
index 00000000000..9c3dc949d91
--- /dev/null
+++ b/main/lua-luassert/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=lua-luassert
+_pkgname=luassert
+pkgver=1.9.0
+pkgrel=0
+pkgdesc="Assertion library for Lua"
+url="https://github.com/Olivine-Labs/luassert"
+arch="noarch"
+license="MIT"
+source="$pkgname-$pkgver.tar.gz::https://github.com/Olivine-Labs/$_pkgname/archive/v$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$pkgver"
+# This module needs lua-busted to run tests, but lua-busted depends on
+# lua-luassert and we wanna avoid circular dependencies.
+options="!check"
+
+_luaversions="5.1 5.2 5.3 5.4"
+for _v in $_luaversions; do
+	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
+done
+
+package() {
+	mkdir -p "$pkgdir"
+}
+
+_subpackage() {
+	local lver="${subpkgname:3:3}"
+	pkgdesc="$pkgdesc (for Lua $lver)"
+	depends="lua$lver lua$lver-say"
+	install_if="$pkgname=$pkgver-r$pkgrel lua$lver"
+	local destdir="$subpkgdir/usr/share/lua/$lver/$_pkgname"
+	local rockdir="$subpkgdir/usr/lib/luarocks/rocks-$lver/$_pkgname/$pkgver-1"
+
+	cd "$builddir"
+	mkdir -p "$destdir"
+	cp -r src/* "$destdir"/
+
+	mkdir -p "$rockdir"
+	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
+}
+
+sha512sums="
+267d31f0061376a4766c7e978bda9e4a2396c8bf959d4aaa347ad40bd286a3873441e38983e1e86ea07a1be7cf7c92d91248c4ba70d6dd4ec82f02c7f7638e9f  lua-luassert-1.9.0.tar.gz
+"
diff --git a/main/lua-luaxml/0001-Fix-error-where-TAG-should-be-xml.TAG.patch b/main/lua-luaxml/0001-Fix-error-where-TAG-should-be-xml.TAG.patch
deleted file mode 100644
index 8b6763b910d..00000000000
--- a/main/lua-luaxml/0001-Fix-error-where-TAG-should-be-xml.TAG.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5c266ff6effbb1c89c3798b7332ed21685cf6acb Mon Sep 17 00:00:00 2001
-From: Ted Trask <ttrask01@yahoo.com>
-Date: Wed, 30 Dec 2015 20:36:52 +0000
-Subject: [PATCH] Fix error where TAG should be xml.TAG
-
----
- LuaXml.lua | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/LuaXml.lua b/LuaXml.lua
-index 8a10a2d..2ebc0ae 100644
---- a/LuaXml.lua
-+++ b/LuaXml.lua
-@@ -8,9 +8,9 @@ xml.TAG = 0
- function xml.tag(var,tag)

- 	if base.type(var)~="table" then return end

- 	if base.type(tag)=="nil" then 

--		return var[TAG]

-+		return var[xml.TAG]

- 	end

--	var[TAG] = tag

-+	var[xml.TAG] = tag

- end

- 

- -- creates a new LuaXML object either by setting the metatable of an existing Lua table or by setting its tag

-@@ -21,7 +21,7 @@ function xml.new(arg)
- 	end

- 	local var={}

- 	base.setmetatable(var,{__index=xml, __tostring=xml.str})

--	if base.type(arg)=="string" then var[TAG]=arg end

-+	if base.type(arg)=="string" then var[xml.TAG]=arg end

- 	return var

- end

- 

-@@ -115,4 +115,4 @@ function xml.find(var, tag, attributeKey,attributeValue)
- 	end

- end

- 

--return xml
-\ No newline at end of file
-+return xml

--- 
-2.6.4
-
diff --git a/main/lua-luaxml/0001-XML-attributes.patch b/main/lua-luaxml/0001-XML-attributes.patch
new file mode 100644
index 00000000000..30d2b02f583
--- /dev/null
+++ b/main/lua-luaxml/0001-XML-attributes.patch
@@ -0,0 +1,55 @@
+From 0b7449ef614cd6514a7f81ebdc8f2171efee0ca9 Mon Sep 17 00:00:00 2001
+From: Alex Dowad <alexinbeijing@gmail.com>
+Date: Thu, 24 Feb 2022 14:58:01 +0200
+Subject: [PATCH] Be strict about handling of malformed XML attributes
+
+This code was written by Natanael Copa.
+---
+ LuaXML_lib.c | 11 ++++++++++-
+ unittest.lua |  8 ++++++++
+ 2 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/LuaXML_lib.c b/LuaXML_lib.c
+index 6c074de..ae330ee 100644
+--- a/LuaXML_lib.c
++++ b/LuaXML_lib.c
+@@ -671,8 +671,17 @@ int Xml_eval(lua_State *L) {
+ 				// parse tag header
+ 				size_t sepPos = find(token, "=", 0);
+ 				if (token[sepPos]) { // regular attribute (key="value")
+-					const char *aVal = token + sepPos + 2;
++					const char *aVal = token + sepPos + 1;
+ 					lua_pushlstring(L, token, sepPos);
++					size_t lenVal = strlen(aVal);
++
++					if (lenVal < 2 || ((aVal[0] != '"' && aVal[0] != '\'') || (aVal[lenVal-1] != '"' && aVal[lenVal-1] != '\'')))
++						luaL_error(L, "Malformed XML: attribute value not quoted in '%s'", token);
++
++					// strip quote chars
++					aVal++;
++					lenVal -= 2;
++
+ 					Xml_pushDecode(L, aVal, strlen(aVal) - 1);
+ 					lua_rawset(L, -3);
+ 				}
+diff --git a/unittest.lua b/unittest.lua
+index e179d91..1d16d7a 100644
+--- a/unittest.lua
++++ b/unittest.lua
+@@ -162,5 +162,13 @@ function TestXml:test_transform()
+ 	lu.assertEquals(test, expected)
+ end
+ 
++function TestXml:test_malformed_attribute()
++	-- malformed XML attribute
++	lu.assertErrorMsgContains("Malformed XML", xml.eval, "<a bad=0></a>")
++	lu.assertErrorMsgContains("Malformed XML", xml.eval, "<a bad=></a>")
++	lu.assertErrorMsgContains("Malformed XML", xml.eval, "<a bad='></a>")
++	lu.assertErrorMsgContains("Malformed XML", xml.eval, '<a bad="></a>')
++end
++
+ -- run test suite with verbose output
+ os.exit(lu.LuaUnit.run("-v"))
+-- 
+2.25.1
+
diff --git a/main/lua-luaxml/APKBUILD b/main/lua-luaxml/APKBUILD
index 93b686314dc..dbf37dcdf23 100644
--- a/main/lua-luaxml/APKBUILD
+++ b/main/lua-luaxml/APKBUILD
@@ -1,35 +1,30 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-luaxml
-_pkgname=luaxml
-pkgver=130610
+pkgver=2.0.0
 _pkgver=$pkgver-1
-pkgrel=5
+pkgrel=1
 pkgdesc="A minimal set of functions for the processing of XML data in Lua"
-url="https://github.com/LuaDist2/luaxml"
+url="https://github.com/n1tehawk/LuaXML"
 arch="all"
 license="MIT"
-makedepends=""
-subpackages=""
 replaces="lua-xml"
-source="$pkgname-$pkgver.tar.gz::https://github.com/LuaDist2/$_pkgname/archive/$_pkgver.tar.gz
-	0001-Fix-error-where-TAG-should-be-xml.TAG.patch"
-builddir="$srcdir/$_pkgname-$_pkgver"
 
-_luaversions="5.2 5.3"
+source="$pkgname-$pkgver.tar.gz::https://github.com/n1tehawk/LuaXML/archive/7cd4a7ab5db85222edb4c955d53e5674afd170b6.tar.gz
+	0001-XML-attributes.patch"
+builddir="$srcdir/LuaXML-7cd4a7ab5db85222edb4c955d53e5674afd170b6"
+
+_luaversions="5.2 5.3 5.4"
 for _v in $_luaversions; do
-	makedepends="$makedepends lua$_v-dev"
+	makedepends="$makedepends lua$_v-dev lua-unit"
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
+	checkdepends="$checkdepends lua$_v-unit"
 done
 
 prepare() {
-	default_prepare || return 1
-	cd "$builddir"
-
-	# Remove garbage.
-	rm -f *.dll *.so *.zip
+	default_prepare
 
 	local lver; for lver in $_luaversions; do
-		cp -r "$builddir" "$builddir-$lver" || return 1
+		cp -r "$builddir" "$builddir-$lver"
 	done
 }
 
@@ -40,9 +35,8 @@ build() {
 		make -C "$builddir-$lver" \
 			CFLAGS="$CFLAGS -fPIC" \
 			LFLAGS="$LDFLAGS -fPIC -shared" \
-			INCDIR=$(pkg-config --cflags lua$lver) \
-			LIBS=$(pkg-config --libs lua$lver) \
-			|| return 1
+			INCDIR="$(pkg-config --cflags lua$lver)" \
+			LIBS=""
 	done
 }
 
@@ -51,7 +45,8 @@ check() {
 		msg "Testing on Lua $lver"
 
 		cd "$builddir-$lver"
-		lua$lver test.lua || return 1
+		lua$lver test.lua
+		lua$lver unittest.lua
 	done
 }
 
@@ -65,18 +60,23 @@ _subpackage() {
 	depends="lua$lver"
 	replaces="lua$lver-xml"  # for backward compatibility
 	install_if="$pkgname=$pkgver-r$pkgrel lua$lver"
-	local rockdir="$subpkgdir/usr/lib/luarocks/rocks-$lver/$_pkgname/$_pkgver"
+	local rockdir="$subpkgdir/usr/lib/luarocks/rocks-$lver/luaxml/$_pkgver"
 
 	cd "$builddir-$lver"
 
 	install -m 755 -D LuaXML_lib.so \
-		"$subpkgdir"/usr/lib/lua/$lver/LuaXML_lib.so || return 1
-	install -m 755 -D LuaXml.lua \
+		"$subpkgdir"/usr/lib/lua/$lver/LuaXML_lib.so
+	install -m 755 -D LuaXML.lua \
+		"$subpkgdir"/usr/share/lua/$lver/LuaXML.lua
+	# For backward compatibility, provide both LuaXML.lua and LuaXml.lua
+	install -m 755 -D LuaXML.lua \
 		"$subpkgdir"/usr/share/lua/$lver/LuaXml.lua
 
 	mkdir -p "$rockdir"
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="aabac62b5e748c04cd3591e5c2e6b417909c7a9efa1ff6c3dd1f546a2387220eb7fa1ffa56d3be0718a84a6fed51f287b68c7d334661c66787f7024d76142dfc  lua-luaxml-130610.tar.gz
-60ba65a0d47065e2609ca4d5c8d994fc29b9d4c6b5b0a060fa7f83612c71937999648e48dd26063f6528811eb053fe912ee5b6c4465576912c9dacb9bb406cae  0001-Fix-error-where-TAG-should-be-xml.TAG.patch"
+sha512sums="
+584f8aa2c78411bc00d6f11973929c3629a401c312cf10382eb116f18b8d1b267fe2a3f99d7db7a1c8a20f5c963203e760263cccf5e949714a8b58e9412bb661  lua-luaxml-2.0.0.tar.gz
+64305a006b36aee1bb8dfcba97b7bff33aa2bcac9746ac39a0e18cbeedecfb1e6f249afd6b8c3dd28b88dd2eccee983f5c53e59db79506d1e72622fb7673d686  0001-XML-attributes.patch
+"
diff --git a/main/lua-lub/APKBUILD b/main/lua-lub/APKBUILD
index 9351ef5d71b..cb0cb6747ab 100644
--- a/main/lua-lub/APKBUILD
+++ b/main/lua-lub/APKBUILD
@@ -3,17 +3,17 @@
 pkgname=lua-lub
 _rockname=lub
 pkgver=1.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Lubyk base module for Lua"
 url="http://doc.lubyk.org/lub.html"
 arch="noarch"
 license="MIT"
 depends="lua lua-filesystem"
-provides=""
 source="$pkgname-$pkgver.tar.gz::https://github.com/lubyk/$_rockname/archive/REL-$pkgver.tar.gz"
 builddir="$srcdir/$_rockname-REL-$pkgver"
+options="!check"
 
-for _v in 5.1 5.2 5.3; do
+for _v in 5.1 5.2 5.3 5.4; do
 	provides="$provides lua$_v-$_rockname=$pkgver-r$pkgrel"
 done
 
diff --git a/main/lua-lustache/APKBUILD b/main/lua-lustache/APKBUILD
index af0a3d6744e..3f9293016d5 100644
--- a/main/lua-lustache/APKBUILD
+++ b/main/lua-lustache/APKBUILD
@@ -3,7 +3,7 @@ pkgname=lua-lustache
 _rockname=lustache
 pkgver=1.3.1
 _pkgver=$pkgver-0
-pkgrel=2
+pkgrel=3
 pkgdesc="Logic-less {{mustache}} templates with Lua"
 url="http://olivinelabs.com/lustache/"
 arch="noarch"
@@ -13,8 +13,9 @@ provides="$pkgname-common=$pkgver-r$pkgrel"  # for backward compatibility
 replaces="$pkgname-common"  # for backward compatibility
 source="$pkgname-$pkgver.tar.gz::https://github.com/Olivine-Labs/$_rockname/archive/v$_pkgver.tar.gz"
 builddir="$srcdir/$_rockname-$_pkgver"
+options="!check"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	provides="$provides lua$_v-${pkgname#lua-}=$pkgver-r$pkgrel"  # for backward compatibility
 done
diff --git a/main/lua-lxc/APKBUILD b/main/lua-lxc/APKBUILD
index ddc73e692e8..ffd582b7aed 100644
--- a/main/lua-lxc/APKBUILD
+++ b/main/lua-lxc/APKBUILD
@@ -2,27 +2,27 @@
 # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=lua-lxc
 pkgver=3.0.2
-pkgrel=0
+pkgrel=2
 pkgdesc="Lua bindings for LXC"
 url="https://linuxcontainers.org"
 arch="all"
-license="LGPL-2.1"
-depends=""
+license="LGPL-2.1-or-later"
 makedepends="lxc-dev automake autoconf libtool"
-install=""
 source="https://linuxcontainers.org/downloads/lxc/lua-lxc-$pkgver.tar.gz"
-builddir="$srcdir/lua-lxc-$pkgver"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
 done
 
-build() {
-	cd "$builddir"
+prepare() {
+	default_prepare
 	# configure will complain about missing automake randomly
 	./autogen.sh
+}
+
+build() {
 	local lver; for lver in $_luaversions; do
 		export LUA_VERSION=$lver
 		cp -r "$builddir" "$srcdir"/lua$lver
diff --git a/main/lua-lyaml/APKBUILD b/main/lua-lyaml/APKBUILD
index a4e2b72cf58..442c84c9f2c 100644
--- a/main/lua-lyaml/APKBUILD
+++ b/main/lua-lyaml/APKBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 _pkgname=lyaml
 pkgname=lua-$_pkgname
-pkgver=6.2.4
-pkgrel=0
+pkgver=6.2.8
+pkgrel=1
 pkgdesc="LibYAML binding for Lua"
 url="https://github.com/gvvaughan/lyaml"
 arch="all"
 license="MIT"
-makedepends="yaml-dev"
+makedepends="yaml-dev lua-stdlib-normalize"
 replaces="lua-yaml"
 source="$_pkgname-$pkgver.tar.gz::https://github.com/gvvaughan/lyaml/archive/v$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
+options="!check"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-$_pkgname:_subpackage"
@@ -49,4 +50,6 @@ _subpackage() {
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="92dea86a3b1d648093d2134ea4c558432b0861942aa141359d1ca9d7bc55f33a62bb38e12fd653d69139e0a6f0ea6202a9e8c57f750a065d35f0dd674eacaf8a  lyaml-6.2.4.tar.gz"
+sha512sums="
+d9166d89f2275a1050218425c1365d6bda42294ab2629c71da3a2007eac7e8018e13d6e69181ea204eb7f051a49533e4b67227468b161df1f3450a073e2dbeab  lyaml-6.2.8.tar.gz
+"
diff --git a/main/lua-lzlib/APKBUILD b/main/lua-lzlib/APKBUILD
index 6de31ac0570..b75c64198b4 100644
--- a/main/lua-lzlib/APKBUILD
+++ b/main/lua-lzlib/APKBUILD
@@ -1,45 +1,41 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 
 pkgname=lua-lzlib
 _name=lzlib
 pkgver=0.4.3
-pkgrel=0
+pkgrel=2
 pkgdesc="Lua bindings to the ZLib compression library"
 url="https://github.com/LuaDist/lzlib"
 arch="all"
 license="MIT"
-depends=""
 makedepends="zlib-dev"
-subpackages=
 for _i in $_luaversions; do
-        makedepends="$makedepends lua$_i-dev"
-        subpackages="$subpackages lua$_i-lzlib:_zlib_${_i/./_}"
+	makedepends="$makedepends lua$_i-dev"
+	subpackages="$subpackages lua$_i-lzlib:_zlib_${_i/./_}"
 done
-install=
 source="$pkgname-$pkgver.tar.gz::https://github.com/LuaDist/$_name/archive/$pkgver.tar.gz"
 
-_builddir="$srcdir"/$_name-$pkgver
+builddir="$srcdir"/$_name-$pkgver
+options="!check"
 
 prepare() {
-	cd "$_builddir"
-	# apply patches here
+	default_prepare
+
 	for _i in $_luaversions; do
-		cp -a "$_builddir" "$srcdir"/build-$_i || return 1
+		cp -a "$builddir" "$srcdir"/build-$_i
 	done
 }
 
 build() {
-	cd "$_builddir"
 	for _i in $_luaversions; do
 		cd "$srcdir"/build-$_i
 		msg "build for Lua $_i"
 		make \
 			CFLAGS="$CFLAGS $(pkg-config --cflags lua$_i)" \
-			LDFLAGS="$LDFLAGS $(pkg-config --libs lua$_i)" \
-			|| return 1
-        done
+			LDFLAGS="$LDFLAGS $(pkg-config --libs lua$_i)"
+	done
 }
 
 package() {
diff --git a/main/lua-lzmq/APKBUILD b/main/lua-lzmq/APKBUILD
index 7cb3abd7f52..48253608c11 100644
--- a/main/lua-lzmq/APKBUILD
+++ b/main/lua-lzmq/APKBUILD
@@ -4,17 +4,17 @@
 pkgname=lua-lzmq
 _pkgname=lzmq
 pkgver=0.4.4
-pkgrel=1
+pkgrel=5
 pkgdesc="Lua bindings to ZeroMQ"
 url="https://github.com/zeromq/lzmq"
 arch="all"
 license="MIT"
-depends=""
-makedepends="cmake zeromq-dev"
+makedepends="cmake samurai zeromq-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/zeromq/$_pkgname/archive/v$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
+options="!check"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-$_pkgname:_package"
@@ -24,17 +24,13 @@ build() {
 	local lver; for lver in $_luaversions; do
 		msg "Building for Lua $lver..."
 
-		mkdir -p "$builddir"/build/$lver
-		cd "$builddir"/build/$lver
-
-		cmake \
-			-DCMAKE_BUILD_TYPE=None \
+		cmake -B build/$lver -G Ninja \
+			-DCMAKE_BUILD_TYPE=MinSizeRel \
 			-DCMAKE_INSTALL_PREFIX=/usr \
 			-DCMAKE_C_FLAGS="$CFLAGS $(pkg-config --cflags lua$lver)" \
 			-DINSTALL_CMOD=/usr/lib/lua/$lver \
-			-DINSTALL_LMOD=/usr/share/lua/$lver \
-			"$builddir"
-		make
+			-DINSTALL_LMOD=/usr/share/lua/$lver
+		cmake --build build/$lver
 	done
 }
 
@@ -48,12 +44,13 @@ _package() {
 	install_if="lua$lver $pkgname=$pkgver-r$pkgrel"
 	local rockdir="$subpkgdir/usr/lib/luarocks/rocks-$lver/$_pkgname/$pkgver-1"
 
-	cd "$builddir"/build/$lver
-	make DESTDIR="$subpkgdir" install
+	DESTDIR="$subpkgdir" cmake --install "$builddir"/build/$lver
 	rm -Rf "$subpkgdir"/usr/share/lzmq
 
 	mkdir -p "$rockdir"
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="fd7e3e61755ec7e33b631a7fd28a3c34163ee696c5b92c6c271001f2ab5c2e41bca07e11580ba5aa1cd09031ed4f7f0e22f546f0ebcaa29b91598648b86d46fb  lua-lzmq-0.4.4.tar.gz"
+sha512sums="
+fd7e3e61755ec7e33b631a7fd28a3c34163ee696c5b92c6c271001f2ab5c2e41bca07e11580ba5aa1cd09031ed4f7f0e22f546f0ebcaa29b91598648b86d46fb  lua-lzmq-0.4.4.tar.gz
+"
diff --git a/main/lua-maxminddb/APKBUILD b/main/lua-maxminddb/APKBUILD
index 0d2a20fe07e..f96555b754b 100644
--- a/main/lua-maxminddb/APKBUILD
+++ b/main/lua-maxminddb/APKBUILD
@@ -1,42 +1,37 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 
 pkgname=lua-maxminddb
 pkgver=0.1
-pkgrel=1
+pkgrel=4
 pkgdesc="libmaxminddb bindings for Lua"
 url="https://github.com/fabled/lua-maxminddb"
 arch="all"
 license="MIT"
-depends=""
 makedepends="libmaxminddb-dev"
-subpackages=
 for _i in $_luaversions; do
 	depends="$depends lua$_i-maxminddb"
-        makedepends="$makedepends lua$_i-dev"
-        subpackages="$subpackages lua$_i-maxminddb:_maxminddb_${_i/./_}"
+	makedepends="$makedepends lua$_i-dev"
+	subpackages="$subpackages lua$_i-maxminddb:_maxminddb_${_i/./_}"
 done
-install=
 source="$pkgname-$pkgver.tar.gz::https://github.com/fabled/lua-maxminddb/archive/v$pkgver.tar.gz"
-
-_builddir="$srcdir"/lua-maxminddb-$pkgver
+options="!check"
 
 prepare() {
-	cd "$_builddir"
+	default_prepare
+
 	# apply patches here
 	for _i in $_luaversions; do
-		cp -a "$_builddir" "$srcdir"/build-$_i || return 1
+		cp -a "$builddir" "$srcdir"/build-$_i
 	done
 }
 
 build() {
-	cd "$_builddir"
 	for _i in $_luaversions; do
 		cd "$srcdir"/build-$_i
 		msg "build for Lua $_i"
-		make LUA_PKG="lua$_i" \
-			|| return 1
-        done
+		make LUA_PKG="lua$_i"
+	done
 }
 
 package() {
diff --git a/main/lua-md5/APKBUILD b/main/lua-md5/APKBUILD
index 4309884667c..595c1c63bb4 100644
--- a/main/lua-md5/APKBUILD
+++ b/main/lua-md5/APKBUILD
@@ -1,46 +1,46 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2 5.3"
-pkgname="lua-md5"
-_name="md5"
-pkgver=1.2
-pkgrel=3
+_luaversions="5.1 5.2 5.3 5.4"
+pkgname=lua-md5
+_name=md5
+pkgver=1.3
+pkgrel=2
 pkgdesc="Basic cryptographic facilities for Lua"
 url="https://github.com/keplerproject/md5"
 arch="all"
 license="MIT"
-depends=""
-makedepends=""
-subpackages=""
 for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev"
 	subpackages="$subpackages lua$_i-md5:split_${_i/./_}"
 done
-source="lua-md5-$pkgver.tar.gz::https://github.com/keplerproject/md5/archive/v$pkgver.tar.gz"
+source="lua-md5-$pkgver.tar.gz::https://github.com/keplerproject/md5/archive/$pkgver.tar.gz
+	create-libdir.patch
+	"
+
+builddir="$srcdir"/md5-$pkgver
+options="!check"
 
-_sdir="$srcdir"/md5-$pkgver
 prepare() {
-	cd "$_sdir"
-	sed -i -e "s:^PREFIX.*=.*:PREFIX =/usr:" \
-		config || return 1
-	rm src/*.o
+	default_prepare
+
+	sed -i -e "s:^PREFIX.*=.*:PREFIX =/usr:" config
 
 	for _i in $_luaversions; do
-		cp -r "$_sdir" "$srcdir"/build-$_i
-		sed -i -e "s/5.1/$_i/" "$srcdir"/build-$_i/config || return 1
+		cp -r "$builddir" "$srcdir"/build-$_i
+		sed -i -e "s/5.1/$_i/" "$srcdir"/build-$_i/config
 	done
 }
 
 build() {
 	for _i in $_luaversions; do
 		cd "$srcdir"/build-$_i
-		make CFLAGS="$CFLAGS $(pkg-config --cflags lua$_i)" || return 1
+		make CFLAGS="$CFLAGS $(pkg-config --cflags lua$_i)"
 	done
 }
 
 package() {
 	for _i in $_luaversions; do
 		cd "$srcdir"/build-$_i
-		make PREFIX="$pkgdir"/usr install
+		make PREFIX="$pkgdir"/usr LUA_SYS_VER=$_i install
 	done
 }
 
@@ -52,7 +52,7 @@ _split() {
 	for d in usr/lib/lua usr/share/lua; do
 		if [ -d "$pkgdir"/$d/$_ver ]; then
 			mkdir -p "$subpkgdir"/$d
-			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/ || return 1
+			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/
 		fi
 	done
 }
@@ -61,4 +61,5 @@ for _i in $_luaversions; do
 	eval "split_${_i/./_}() { _split $_i; }"
 done
 
-sha512sums="1d0925351b4b774581f78147b7dd44df649eec2bc8397db991149feaf1f16c8f26d4b0fce6d8463be656115cebf605339ba8da851bc50d1ae1da8033d4ed564d  lua-md5-1.2.tar.gz"
+sha512sums="eda222b89432228a03c603237a787d55b6d0251f53ee3da11aaf0369ff26e3497ed8479a295b659e02b3fee85c636cd5f8cc9fd68367bf4ed2d3edcbbc373903  lua-md5-1.3.tar.gz
+85d267a648f2aa764841a131082952a8605a7892f491e271ed83f0413c8a7fa9fa30d89928da63d89883eecddb89e67473b37daed7036f8a535a557d4e3f27d8  create-libdir.patch"
diff --git a/main/lua-md5/create-libdir.patch b/main/lua-md5/create-libdir.patch
new file mode 100644
index 00000000000..01ab1f08a4a
--- /dev/null
+++ b/main/lua-md5/create-libdir.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile b/Makefile
+index 2dcc453..85b4816 100644
+--- a/Makefile
++++ b/Makefile
+@@ -22,6 +22,7 @@ src/$(DES56_LIBNAME) : $(DES56_OBJS) $(COMPAT52_OBJS)
+ 	$(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(DES56_LIBNAME) $(DES56_OBJS) $(COMPAT52_OBJS)
+ 
+ install: src/$(MD5_LIBNAME) src/$(DES56_LIBNAME)
++	mkdir -p $(LUA_LIBDIR)
+ 	cp src/$(DES56_LIBNAME) $(LUA_LIBDIR)
+ 	mkdir -p $(LUA_LIBDIR)/md5
+ 	cp src/$(MD5_LIBNAME) $(LUA_LIBDIR)/md5/
diff --git a/main/lua-mediator/APKBUILD b/main/lua-mediator/APKBUILD
new file mode 100644
index 00000000000..1535099b3dc
--- /dev/null
+++ b/main/lua-mediator/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=lua-mediator
+_pkgname=mediator_lua
+pkgver=1.1.2
+_pkgver=$pkgver-0
+pkgrel=2
+pkgdesc="Mediator pattern implementation for pub-sub management"
+url="http://olivinelabs.com/mediator_lua/"
+arch="noarch"
+license="MIT"
+source="$_pkgname-$pkgver.tar.gz::https://github.com/Olivine-Labs/$_pkgname/archive/v$_pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$_pkgver"
+# This module needs lua-busted to run tests, but lua-busted depends on
+# lua-mediator and we wanna avoid circular dependencies.
+options="!check"
+
+_luaversions="5.1 5.2 5.3 5.4"
+for _v in $_luaversions; do
+	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
+done
+
+package() {
+	mkdir -p "$pkgdir"
+}
+
+_subpackage() {
+	local lver="${subpkgname:3:3}"
+	pkgdesc="$pkgdesc (for Lua $lver)"
+	depends="lua$lver"
+	install_if="$pkgname=$pkgver-r$pkgrel lua$lver"
+	local rockdir="$subpkgdir/usr/lib/luarocks/rocks-$lver/$_pkgname/$_pkgver"
+
+	cd "$builddir"
+	install -m 644 -D src/mediator.lua \
+		"$subpkgdir"/usr/share/lua/$lver/mediator.lua
+
+	mkdir -p "$rockdir"
+	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
+}
+
+sha512sums="116d08a96fa0bd540ac4d3cac61a529a634cba3621c6f2e917b405462bbc0e2ab5b170dc6819e470105cdedf958a382945819eaff4affa63bc057824c163c8a0  mediator_lua-1.1.2.tar.gz"
diff --git a/main/lua-microlight/APKBUILD b/main/lua-microlight/APKBUILD
index f889adb0e52..a17dbc979b8 100644
--- a/main/lua-microlight/APKBUILD
+++ b/main/lua-microlight/APKBUILD
@@ -1,17 +1,13 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=lua-microlight
 pkgver=1.1.1
-pkgrel=2
+pkgrel=4
 pkgdesc="a really compact set of general Lua functions"
-url="http://stevedonovan.github.com/microlight/"
+url="http://stevedonovan.github.io/microlight/"
 arch="noarch"
 license="MIT"
-depends=""
-install=""
-makedepends=""
-subpackages=""
 for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev"
 	subpackages="$subpackages lua$_i-microlight:split_${_i/./_}"
@@ -20,27 +16,17 @@ source="lua-microlight-$pkgver.tar.gz::https://github.com/stevedonovan/Microligh
 	fix-lua-5.3.patch
 	"
 
-_builddir="$srcdir"/Microlight-$pkgver
-
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/Microlight-$pkgver
+options="!check"
 
 build() {
-	cd "$_builddir"
+	mkdir -p "$pkgdir"
 }
 
 package() {
-	cd "$_builddir"
 	for _i in $_luaversions; do
-		install -Dm644 "$_builddir"/ml.lua \
-			"$pkgdir"/usr/share/lua/$_i/ml.lua || return 1
+		install -Dm644 "$builddir"/ml.lua \
+			"$pkgdir"/usr/share/lua/$_i/ml.lua
 	done
 }
 
@@ -52,7 +38,7 @@ _split() {
 	for d in usr/lib/lua usr/share/lua; do
 		if [ -d "$pkgdir"/$d/$_ver ]; then
 			mkdir -p "$subpkgdir"/$d
-			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/ || return 1
+			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/
 		fi
 	done
 }
@@ -61,5 +47,7 @@ for _i in $_luaversions; do
 	eval "split_${_i/./_}() { _split $_i; }"
 done
 
-sha512sums="debffab0c599754cb70852e82b2cb76af16dcefa7c1c4c54be1a0949d3f24312a72c9e9accd512a2f7d230259b7b7d18bc5919dbaff5458953236f9752582a45  lua-microlight-1.1.1.tar.gz
-c32722c5900e3851e542fbd4e0628dff160cd0de260e94287843c6155eee17a9c217ca52e7fffd375a6d2f66440f871fafa86ec4cb65f51f5c2d569d51139b0e  fix-lua-5.3.patch"
+sha512sums="
+debffab0c599754cb70852e82b2cb76af16dcefa7c1c4c54be1a0949d3f24312a72c9e9accd512a2f7d230259b7b7d18bc5919dbaff5458953236f9752582a45  lua-microlight-1.1.1.tar.gz
+c32722c5900e3851e542fbd4e0628dff160cd0de260e94287843c6155eee17a9c217ca52e7fffd375a6d2f66440f871fafa86ec4cb65f51f5c2d569d51139b0e  fix-lua-5.3.patch
+"
diff --git a/main/lua-mosquitto/0001-handle-lookup-errors-when-connecting.patch b/main/lua-mosquitto/0001-handle-lookup-errors-when-connecting.patch
new file mode 100644
index 00000000000..775c163782d
--- /dev/null
+++ b/main/lua-mosquitto/0001-handle-lookup-errors-when-connecting.patch
@@ -0,0 +1,49 @@
+From d1e530459cb45b4aace4a3e7258e83dbefff93bb Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Mon, 12 Jun 2023 15:54:59 +0200
+Subject: [PATCH] handle lookup errors when connecting
+
+Connect may result in lookup error, which was not handled. Solve this by
+use a default error handler which returns whatever mosquitto reports.
+
+This prevents us from missing errors.
+---
+ lua-mosquitto.c | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/lua-mosquitto.c b/lua-mosquitto.c
+index 7f298bd..bae378d 100644
+--- a/lua-mosquitto.c
++++ b/lua-mosquitto.c
+@@ -99,21 +99,20 @@ static int mosq__pstatus(lua_State *L, int mosq_errno) {
+ 			return luaL_error(L, mosquitto_strerror(mosq_errno));
+ 			break;
+ 
+-		case MOSQ_ERR_NO_CONN:
+-		case MOSQ_ERR_CONN_LOST:
+-		case MOSQ_ERR_PAYLOAD_SIZE:
++		case MOSQ_ERR_ERRNO:
+ 			lua_pushnil(L);
+-			lua_pushinteger(L, mosq_errno);
+-			lua_pushstring(L, mosquitto_strerror(mosq_errno));
++			lua_pushinteger(L, errno);
++			lua_pushstring(L, strerror(errno));
+ 			return 3;
+ 			break;
+ 
+-		case MOSQ_ERR_ERRNO:
++		default:
+ 			lua_pushnil(L);
+-			lua_pushinteger(L, errno);
+-			lua_pushstring(L, strerror(errno));
++			lua_pushinteger(L, mosq_errno);
++			lua_pushstring(L, mosquitto_strerror(mosq_errno));
+ 			return 3;
+ 			break;
++
+ 	}
+ 
+ 	return 0;
+-- 
+2.41.0
+
diff --git a/main/lua-mosquitto/APKBUILD b/main/lua-mosquitto/APKBUILD
index 8d817913c1f..84514174c64 100644
--- a/main/lua-mosquitto/APKBUILD
+++ b/main/lua-mosquitto/APKBUILD
@@ -1,15 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-mosquitto
-pkgver=0.3
-pkgrel=1
+pkgver=0.4.1
+pkgrel=3
 pkgdesc="Bindings to libmosquitto for Lua"
 url="https://github.com/flukso/lua-mosquitto"
 arch="all"
 license="MIT"
 makedepends="mosquitto-dev"
-source="lua-mosquitto-$pkgver.tar.gz::https://github.com/flukso/lua-mosquitto/archive/v$pkgver.tar.gz"
+source="lua-mosquitto-$pkgver.tar.gz::https://github.com/flukso/lua-mosquitto/archive/v$pkgver.tar.gz
+	checkinteger.patch
+	0001-handle-lookup-errors-when-connecting.patch
+	"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_package"
@@ -26,7 +29,17 @@ prepare() {
 build() {
 	local lver; for lver in $_luaversions; do
 		msg "Building for Lua $lver..."
-		make -C "$builddir-$lver" LUAPKGC=lua$lver
+		make -C "$builddir-$lver" LUAPKGC=lua$lver LUA_VERSION=$lver
+	done
+}
+
+check() {
+	local lver; for lver in $_luaversions; do
+		msg "Checking lua $lver build"
+		(
+		cd "$builddir-$lver"
+		lua$lver -e 'print(require("mosquitto").version())'
+		)
 	done
 }
 
@@ -42,12 +55,18 @@ _package() {
 	local rockdir="$subpkgdir/usr/lib/luarocks/rocks-$lver/$pkgname/$pkgver-1"
 
 	cd "$builddir-$lver"
+	msg "installig Lua $lver"
 	make install DESTDIR="$subpkgdir" \
 		LUA_LIBDIR=/usr/lib \
-		LUAPKGC=lua$lver
+		LUAPKGC=lua$lver \
+		LUA_VERSION=$lver
 
 	mkdir -p "$rockdir"
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="20e7602c7c5d8be8e69602513961f13b0a63a557bedca35400e9c5acda48c3600b124d211d70f135d0b97525a5bff844d4012f14a929539753256dd1f70e3004  lua-mosquitto-0.3.tar.gz"
+sha512sums="
+f94944d334142283006c3f079ced5284a1c41199fb9de7d7c4eb7c1a4fc412dc53f2f93cb5f08c54fec85c59fc8c2ee840111d4fbf0ff61a2254c8f83fa97e87  lua-mosquitto-0.4.1.tar.gz
+d564b6ffbc1ed79cdaeb53c8cb94db946d697fa97a9e36a68ef5300a3f7f53eeb5216ddb5941cf8610b31d9f29f8ca697790431284842e87d1d85be8637a519b  checkinteger.patch
+627ea37dfbfe2df93bfbd0d8918b1e0d0c8619c404b6009779dc2cf55dde519add76b0ca2320dfee7e1524b4ce89415523f8d327a97e7dceb575de2c92830793  0001-handle-lookup-errors-when-connecting.patch
+"
diff --git a/main/lua-mosquitto/checkinteger.patch b/main/lua-mosquitto/checkinteger.patch
new file mode 100644
index 00000000000..5430e94f1e2
--- /dev/null
+++ b/main/lua-mosquitto/checkinteger.patch
@@ -0,0 +1,13 @@
+diff --git a/lua-mosquitto.c b/lua-mosquitto.c
+index cb80452..2eaef28 100644
+--- a/lua-mosquitto.c
++++ b/lua-mosquitto.c
+@@ -539,7 +539,7 @@ static int ctx_threaded_set(lua_State *L)
+ static int ctx_option(lua_State *L)
+ {
+ 	ctx_t *ctx = ctx_check(L, 1);
+-	enum mosq_opt_t option = luaL_checkint(L, 2);
++	enum mosq_opt_t option = luaL_checkinteger(L, 2);
+ 	int type = lua_type(L, 3);
+ 	int rc;
+ 
diff --git a/main/lua-mqtt-publish/APKBUILD b/main/lua-mqtt-publish/APKBUILD
index fc33b985d3a..fdb74414a29 100644
--- a/main/lua-mqtt-publish/APKBUILD
+++ b/main/lua-mqtt-publish/APKBUILD
@@ -1,63 +1,43 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=lua-mqtt-publish
-pkgver=0.3
+pkgver=0.5
 pkgrel=0
 pkgdesc="Lua module for simple MQTT connect, publish and disconnect"
 url="https://github.com/ncopa/lua-mqtt-publish"
 arch="all"
 license="MIT"
-depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
-subpackages=""
+makedepends="lua-mosquitto" # so build order can be calculated
+options="!check"
 
 for _v in $_luaversions; do
-	subpackages="$subpackages lua$_v-mqtt-publish:split_${_v/./_}"
+	subpackages="$subpackages lua$_v-mqtt-publish:_split"
 done
 
-source="lua-mqtt-publish-$pkgver.tar.gz::https://github.com/ncopa/lua-mqtt-publish/archive/v$pkgver.tar.gz"
-
-_builddir="$srcdir"/lua-mqtt-publish-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	return 0
-}
+source="lua-mqtt-publish-$pkgver.tar.gz::https://github.com/ncopa/lua-mqtt-publish/archive/v$pkgver.tar.gz
+	"
 
 package() {
-	cd "$_builddir"
 	for i in $_luaversions; do
-		install -Dm644 "$_builddir"/mqtt/publish.lua \
-			"$pkgdir"/usr/share/lua/$i/mqtt/publish.lua || return 1
+		install -Dm644 "$builddir"/mqtt/publish.lua \
+			"$pkgdir"/usr/share/lua/$i/mqtt/publish.lua
 	done
 }
 
 _split() {
-	local d= _ver=$1
+	local d= _ver=${subpkgname#lua}; _ver=${_ver%%-*}
+	msg "_ver=$_ver"
 	pkgdesc="$pkgdesc for Lua $_ver"
 	install_if="lua$_ver $pkgname=$pkgver-r$pkgrel"
 	depends="lua$_ver-mosquitto"
 	for d in usr/lib/lua usr/share/lua; do
 		if [ -d "$pkgdir"/$d/$_ver ]; then
 			mkdir -p "$subpkgdir"/$d
-			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/ || return 1
+			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/
 		fi
 	done
 }
 
-
-for _v in $_luaversions; do
-	eval "split_${_v/./_}() { _split $_v; }"
-done
-
-sha512sums="ccbf87c53305e19a2dd04f07ac7b3d1fdae3ce0a6c726b89f357d3d5a68a73c0ce830d0ca47d57eaf1990224fcc97794720bdbc8e4e0caa408003cc33dce3b65  lua-mqtt-publish-0.3.tar.gz"
+sha512sums="
+89a2796d97b3d4ff210ec86f958fdef7459db7829ef99bb85a7055aa632197922a3a1a9b0b9e33ab973a00e053557463a7468af51702086024516496d090ace4  lua-mqtt-publish-0.5.tar.gz
+"
diff --git a/main/lua-openrc/APKBUILD b/main/lua-openrc/APKBUILD
index 3a49ea3d8a1..c8ac0e75eb5 100644
--- a/main/lua-openrc/APKBUILD
+++ b/main/lua-openrc/APKBUILD
@@ -1,16 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=lua-openrc
 pkgver=0.2
-pkgrel=3
+pkgrel=6
 pkgdesc="Lua module for OpenRC"
 url="https://github.com/ncopa/lua-openrc"
 arch="all"
-license="GPL"
-depends=""
-install=
+license="GPL-2.0-only"
 makedepends="openrc-dev bsd-compat-headers"
-subpackages=""
 for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev"
 	subpackages="$subpackages lua$_i-openrc:split_${_i/./_}:$CARCH"
@@ -18,33 +15,26 @@ done
 source="lua-openrc-$pkgver.tar.gz::https://github.com/ncopa/lua-openrc/archive/v$pkgver.tar.gz
 	0001-build-fix-for-openrc-0.14.patch
 	"
-
-
-_sdir="$srcdir"/$pkgname-$pkgver
+options="!check"
 
 prepare() {
-	cd "$_sdir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
 	for _i in $_luaversions; do
-		cp -r "$_sdir" "$srcdir"/build-$_i || return 1
+		cp -r "$builddir" "$srcdir"/build-$_i
 	done
 }
 
 build() {
 	for _i in $_luaversions; do
 		cd "$srcdir"/build-$_i
-		make LUA_VERSION=$_i || return 1
+		make LUA_VERSION=$_i
 	done
 }
 
 package() {
 	for _i in $_luaversions; do
 		install -Dm755 "$srcdir"/build-$_i/rc.so \
-			"$pkgdir"/usr/lib/lua/$_i/rc.so || return 1
+			"$pkgdir"/usr/lib/lua/$_i/rc.so
 	done
 }
 
@@ -56,7 +46,7 @@ _split() {
 	for d in usr/lib/lua usr/share/lua; do
 		if [ -d "$pkgdir"/$d/$_ver ]; then
 			mkdir -p "$subpkgdir"/$d
-			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/ || return 1
+			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/
 		fi
 	done
 }
diff --git a/main/lua-optarg/APKBUILD b/main/lua-optarg/APKBUILD
index f025cf848f5..c91e6a2d82f 100644
--- a/main/lua-optarg/APKBUILD
+++ b/main/lua-optarg/APKBUILD
@@ -1,21 +1,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-optarg
 _rockname=optarg
-pkgver=0.2
-pkgrel=1
+pkgver=0.4
+pkgrel=0
 pkgdesc="Simple command line option parser for Lua"
 url="https://github.com/ncopa/lua-optarg"
 arch="noarch"
 license="MIT"
-subpackages=""
-source="$pkgname-$pkgver.tar.gz::https://github.com/ncopa/$pkgname/archive/v$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="$pkgname-$pkgver.tar.gz::https://github.com/ncopa/lua-optarg/archive/$pkgver.tar.gz"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_package"
+	checkdepends="$checkdepends lua$_v-busted"
 done
 
+check() {
+	for _v in $_luaversions; do
+		msg "testing Lua $_v"
+		busted-$_v
+	done
+}
+
 package() {
 	mkdir -p "$pkgdir"
 }
@@ -34,4 +40,6 @@ _package() {
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="347d958020a3fbd7a0ba553eccc3ba54f0732636e6a880bd254065ae9634b6a9397b0e4f48a720a0597672da62652ec6998c455f2719622ae6e9c06896e5c573  lua-optarg-0.2.tar.gz"
+sha512sums="
+8aa26bbcd93651a6f1411b952b3ff6680e1ae534d76ea41e9e61a3d2c840b6525e9550277ab6f363f2ed550da3f82941f90747d793972745b15fe07ddf718c84  lua-optarg-0.4.tar.gz
+"
diff --git a/main/lua-ossl/APKBUILD b/main/lua-ossl/APKBUILD
index e62e8adf1a3..da6c9a0d5b3 100644
--- a/main/lua-ossl/APKBUILD
+++ b/main/lua-ossl/APKBUILD
@@ -2,16 +2,14 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=lua-ossl
 _pkgname=luaossl
-pkgver=20190731
+pkgver=20220711
 _ver=${pkgver%_git*}
 pkgrel=1
-pkgdesc="A comprehensive OpenSSL Lua module"
-url="http://25thandclement.com/~william/projects/luaossl.html"
+pkgdesc="comprehensive OpenSSL Lua module"
+url="https://25thandclement.com/~william/projects/luaossl.html"
 arch="all"
 license="MIT"
-makedepends="openssl-dev"
-subpackages=""
-checkdepends=""
+makedepends="openssl-dev>3"
 source="$_pkgname-$_ver.tar.gz::https://github.com/wahern/$_pkgname/archive/rel-$pkgver.tar.gz
 	0001-pkey.toPEM-opts-rename-const-array.patch
 	0002-pkey.toPEM-accept-table-arguments.patch
@@ -25,8 +23,9 @@ source="$_pkgname-$_ver.tar.gz::https://github.com/wahern/$_pkgname/archive/rel-
 	0010-pkey-PEM-password-callback.patch
 "
 builddir="$srcdir/$_pkgname-rel-$pkgver"
+options="!check" # https://gitlab.alpinelinux.org/alpine/aports/-/issues/15383
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_package"
@@ -34,8 +33,6 @@ for _v in $_luaversions; do
 done
 
 build() {
-	cd "$builddir"
-
 	make config prefix=/usr
 	local lver; for lver in $_luaversions; do
 		make openssl$lver
@@ -81,7 +78,8 @@ _package() {
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="09315deb0c40b59230d80262906cb9f067660242315544179ec5df57a028b088c56a4bb0b944e5975bccf86d521901eae36006c5623ec1159cfca94d05fb6890  luaossl-20190731.tar.gz
+sha512sums="
+13c51881218a5a9995d195d4781f6871f0dfe58f061b85dd997b98ec970a38302ac6b057b7987bff5f7719bfdb826aae09f602ea8db5e4b2d462648ad0236909  luaossl-20220711.tar.gz
 896fd302480b42829c79226d08c05e9ed7348ba441ac15a2d4e0d473486f1476b36bc296878d55e5678864e6161861ab2e178973f3e1d7f3c2d4a915a62c7471  0001-pkey.toPEM-opts-rename-const-array.patch
 9362910e3bc5e1f3110d2e6f49c086374a9277698c26917a2b43e312f81160f5330212a27915efc8cd969273452f7057bf4db9cdb8481728067d1b10e03230cd  0002-pkey.toPEM-accept-table-arguments.patch
 2a021ab500e1539ba7259ef38e1e015c3ecf561b31c7f344732cbf860525db8335acd61eaaa10049881b862f17064d640da6dedeeb94d92b3aeba32d822b575c  0003-pkey.toPEM-private-key-encryption.patch
@@ -91,4 +89,5 @@ sha512sums="09315deb0c40b59230d80262906cb9f067660242315544179ec5df57a028b088c56a
 9b992db5d0c33258e3858bd60c2a085669112089658600fe8b84be947d33ee858a0189fc5aef96565c226ebaf3ae9a326c23fb993c95c5f3ae0caa02844f2632  0007-pkey.new-accept-option-table.patch
 f8b3a1c4815f03180ca60df62e6be307c180a9d5225dcb6b78b5f6fc2d67f176756d02b1a8cd06e1909b0b0430ae876b5b1172b090ba9b8b9873169ad21b354f  0008-pkey.new-decryption.patch
 fc433f9e15479083f1d737247556a2404704727712604c43d0bc93d3d7269dc73e07acd09bfaa46dfade6756cb67bcbf586aadf58f9b48c6c39ecb659ed02640  0009-pkey.toPEM-use-password-callback.patch
-edcbf7110c838404bda83a4d15719264e798ddd18d2b550652d6e07218104f9bfbf33a6a08ab9baa2491a56c8723394663a06be669aee92d3b3ecd83cc5f0305  0010-pkey-PEM-password-callback.patch"
+edcbf7110c838404bda83a4d15719264e798ddd18d2b550652d6e07218104f9bfbf33a6a08ab9baa2491a56c8723394663a06be669aee92d3b3ecd83cc5f0305  0010-pkey-PEM-password-callback.patch
+"
diff --git a/main/lua-pc/APKBUILD b/main/lua-pc/APKBUILD
index 9380fd08708..c4108d8564f 100644
--- a/main/lua-pc/APKBUILD
+++ b/main/lua-pc/APKBUILD
@@ -1,16 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 
 pkgname=lua-pc
 _name=lpc
 pkgver=1.0.0
-pkgrel=9
+pkgrel=12
 pkgdesc="Lua Process Call"
 url="https://github.com/LuaDist/lpc"
 arch="all"
 license="MIT"
-makedepends=""
 depends="lua5.1-pc"
 source="https://dev.alpinelinux.org/archive/lpc/lpc-$pkgver.tar.gz
 	lpc-lua5.2-compat.patch
@@ -21,17 +20,13 @@ for _i in $_luaversions; do
 	subpackages="$subpackages lua$_i-pc:_pc_${_i/./_}"
 done
 
-_builddir="$srcdir/$_name-$pkgver"
+builddir="$srcdir/$_name-$pkgver"
+options="!check"
 
 prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-                *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-                esac
-	done
+	default_prepare
 	for _i in $_luaversions; do
-		cp -r "$_builddir" "$srcdir"/build-$_i
+		cp -r "$builddir" "$srcdir"/build-$_i
 	done
 }
 
@@ -39,8 +34,7 @@ build() {
 	for _i in $_luaversions; do
 		cd "$srcdir"/build-$_i
 		make LUA_PKGCONF="lua$_i" \
-			CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS -shared" \
-			|| return 1
+			CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS -shared"
 	done
 }
 
diff --git a/main/lua-penlight/APKBUILD b/main/lua-penlight/APKBUILD
index 2863b952006..fb3e62a23a3 100644
--- a/main/lua-penlight/APKBUILD
+++ b/main/lua-penlight/APKBUILD
@@ -1,26 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-penlight
 _rockname=penlight
-pkgver=1.7.0
+pkgver=1.13.1
 pkgrel=0
 pkgdesc="Lua libraries for extended operations on tables, lists and strings"
 options="!check" # Requires lua-coveralls
-url="http://stevedonovan.github.io/Penlight"
+url="https://lunarmodules.github.io/Penlight/"
 arch="noarch"
 license="MIT"
 depends="lua lua-filesystem"
 checkdepends="luajit"
 subpackages="$pkgname-doc"
-source="$_rockname-$pkgver.tar.gz::https://github.com/stevedonovan/Penlight/archive/$pkgver.tar.gz"
+source="https://github.com/lunarmodules/Penlight/archive/$pkgver/lua-penlight-$pkgver.tar.gz"
 builddir="$srcdir/Penlight-$pkgver"
 
 provides="$pkgname-shared=$pkgver-r$pkgrel"  # for backward compatibility
 replaces="$pkgname-shared"  # for backward compatibility
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	checkdepends="$checkdepends lua$_v"
-	provides="$provides lua$_v-${pkgname#lua-}=$pkgver-r$pkgrel"  # for backward compatibility
+	subpackages="$subpackages lua$_v-penlight:_split"
 done
 
 check() {
@@ -43,4 +43,18 @@ package() {
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="edeb09307c9feb5da6bccd82216a6ad71db988c433245d72d28abb6c555004f77eebba556928b0912937b29ef93e065ad491368041e17730610813de8e595d7d  penlight-1.7.0.tar.gz"
+_split() {
+	local _lua=${subpkgname%%-*}
+	local _ver=${_lua#lua}
+	pkgdesc="Lua $—ver libraries for extended operations on tables, lists and strings"
+	depends="$_lua-filesystem"
+	mkdir -p "$subpkgdir"/usr/share/lua/$_ver
+
+	# keep this so abuild pulls in the right dependency with the common
+	# files
+	ln -s ../common/pl "$subpkgdir"/usr/share/lua/$_ver/pl
+}
+
+sha512sums="
+de0a6a2f585f32bed234ef084d8fca9cee645eed3459aa3c39b885b46a05ae752b5c7ac3bb1957fef9519df2a11e250fc87d6d4d62ee6155be2742ad43a079fe  lua-penlight-1.13.1.tar.gz
+"
diff --git a/main/lua-posix/APKBUILD b/main/lua-posix/APKBUILD
index 63f36282aa6..eca1ce096c2 100644
--- a/main/lua-posix/APKBUILD
+++ b/main/lua-posix/APKBUILD
@@ -1,38 +1,30 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 
 pkgname=lua-posix
 _name=luaposix
-pkgver=33.4.0
-pkgrel=1
-pkgdesc="POSIX library for Lua $_luaver"
+pkgver=36.2.1
+pkgrel=0
+pkgdesc="POSIX library for Lua"
 url="https://github.com/luaposix/luaposix"
 arch="all"
 license="MIT"
-depends=""
-makedepends="perl automake autoconf linux-headers lua-bit32"
-subpackages="$pkgname-doc"
+makedepends="linux-headers lua-bit32"
 
 for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev lua$_i"
 	subpackages="$subpackages lua$_i-posix:_posix_${_i/./_}"
 done
-source="luaposix-$pkgver.tar.gz::https://github.com/luaposix/luaposix/archive/release-v$pkgver.tar.gz
-	"
+source="luaposix-$pkgver-2.tar.gz::https://github.com/luaposix/luaposix/archive/v$pkgver.tar.gz"
 
-_sdir="$srcdir"/$_name-release-v$pkgver
+builddir="$srcdir"/$_name-$pkgver
+options="!check"
 
 prepare() {
-	cd "$_sdir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	aclocal && autoconf && automake --add-missing || return 1
+	default_prepare
 	for _i in $_luaversions; do
-		cp -r "$_sdir" "$srcdir"/build-$_i
+		cp -r "$builddir" "$srcdir"/build-$_i
 	done
 }
 
@@ -40,20 +32,14 @@ build() {
 	for _i in $_luaversions; do
 		msg "build for Lua $_i"
 		cd "$srcdir"/build-$_i
-		LUA=lua$_i LUA_INCLUDE=$(pkg-config lua$_i --cflags) \
-			./configure --prefix=/usr \
-			--libdir=/usr/lib/lua/$_i \
-			--datadir=/usr/share/lua/$_i \
-			|| return 1
-		make || return 1
+		lua$_i build-aux/luke
 	done
 }
 
 package() {
 	for _i in $_luaversions; do
 		cd "$srcdir"/build-$_i
-		make DESTDIR="$pkgdir" luadir="/usr/share/lua/$_i" install \
-			|| return 1
+		lua$_i build-aux/luke install PREFIX="$pkgdir"/usr
 	done
 }
 
@@ -68,8 +54,7 @@ _split() {
 	for d in usr/lib/lua usr/share/lua; do
 		if [ -d "$pkgdir"/$d/$_ver ]; then
 			mkdir -p "$subpkgdir"/$d/$_ver
-			mv "$pkgdir"/$d/$_ver/$_f* "$subpkgdir"/$d/$_ver/ \
-				|| return 1
+			mv "$pkgdir"/$d/$_ver/$_f* "$subpkgdir"/$d/$_ver/
 			rmdir "$pkgdir"/$d/$_ver 2>/dev/null || true
 		fi
 	done
@@ -86,4 +71,6 @@ for _i in $_luaversions; do
 	eval "_posix_${_i/./_}() { _split_posix $_i; }"
 done
 
-sha512sums="3cb78ccb343a55e2bf5b182410e2050356379e8f7a86d42a79853db6198628cae85f9984854f99f41505cb7e4fbb5288e4a46633a6db459649837729af76044c  luaposix-33.4.0.tar.gz"
+sha512sums="
+cd7deeaa9179306f90bafdc6cfb2668cf42d5378e72e5baa09419198f2d42c5eab5d881e5584ac511f317bbfd850f2ad46b8cb743f1ae5e1a96f8153e03599d8  luaposix-36.2.1-2.tar.gz
+"
diff --git a/main/lua-posixtz/APKBUILD b/main/lua-posixtz/APKBUILD
index 44f9d11f603..f91608380be 100644
--- a/main/lua-posixtz/APKBUILD
+++ b/main/lua-posixtz/APKBUILD
@@ -1,25 +1,26 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=lua-posixtz
 pkgver=0.5
-pkgrel=1
+pkgrel=4
 pkgdesc="Lua module to extract POSIX timezone from tzdata"
 url="http://git.alpinelinux.org/cgit/posixtz.git/"
 arch="all"
-license="GPL-2.0"
+license="GPL-2.0-only"
 for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev"
 	subpackages="$subpackages lua$_i-posixtz:split_${_i/./_}"
 done
 source="https://dev.alpinelinux.org/archive/posixtz/posixtz-$pkgver.tar.xz"
 
-_sdir="$srcdir"/posixtz-$pkgver
+builddir="$srcdir"/posixtz-$pkgver
+options="!check"
 
 prepare() {
 	default_prepare
 	for _i in $_luaversions; do
-		cp -r "$_sdir" "$srcdir"/build-$_i
+		cp -r "$builddir" "$srcdir"/build-$_i
 	done
 }
 
diff --git a/main/lua-pty/APKBUILD b/main/lua-pty/APKBUILD
index 8747d2a233b..2a2dd2977db 100644
--- a/main/lua-pty/APKBUILD
+++ b/main/lua-pty/APKBUILD
@@ -3,15 +3,16 @@ pkgname=lua-pty
 _pkgname=lpty
 pkgver=1.2.2
 _rockver=1
-pkgrel=0
-pkgdesc="Lua module to control other programs via PTYs."
+pkgrel=3
+pkgdesc="Lua module to control other programs via PTYs"
 url="https://www.tset.de/lpty/"
 arch="all"
 license="MIT"
-source="http://www.tset.de/downloads/$_pkgname-$pkgver-$_rockver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver-$_rockver"
+source=$pkgname-$pkgver-1.tar.gz::https://codeberg.org/gnarz/lpty/archive/version_$pkgver.tar.gz
+builddir="$srcdir/lpty"
+options="!check"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
@@ -29,7 +30,7 @@ build() {
 	local lver; for lver in $_luaversions; do
 		msg "Building for Lua $lver..."
 
-		cd "$builddir-$lver"
+		cd "$builddir-$lver"/src
 		make CFLAGS="$CFLAGS -fPIC" \
 			LUA_INCDIR="$(pkg-config --variable=includedir lua$lver)" \
 			LUA_LIBDIR="$(pkg-config --variable=libdir lua$lver)" \
@@ -49,11 +50,13 @@ _subpackage() {
 	install_if="$pkgname=$pkgver-r$pkgrel lua$lver"
 	[ "$lver" = 5.1 ] && replaces="$pkgname"
 
-	cd "$builddir-$lver"
+	cd "$builddir-$lver"/src
 	make INST_DIR="$subpkgdir/usr" LUAVERSION=$lver install
 
 	mkdir -p "$rockdir"
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="6251f8394be53ab812bb3483fcd8280c9cf8d63590534864b439f5357a4c11507c3a7d6e03efa11018547435f7eede6ea5896a39f0d9ddaaf3f4f41f7827ba96  lpty-1.2.2-1.tar.gz"
+sha512sums="
+9a7ed46dabacf663eef03fb711b316acae5266c90c4e5ad1f9aa6857ab7402482c5c38b4ce706bae82622c6c343a56e9bbfcd03ef050983af2ed282bf0195097  lua-pty-1.2.2-1.tar.gz
+"
diff --git a/main/lua-resty-core/APKBUILD b/main/lua-resty-core/APKBUILD
index 22d974ce245..53ea84bbbe0 100644
--- a/main/lua-resty-core/APKBUILD
+++ b/main/lua-resty-core/APKBUILD
@@ -1,14 +1,15 @@
 # Contributor: Michael Pirogov <vbnet.ru@gmail.com>
 # Maintainer: Michael Pirogov <vbnet.ru@gmail.com>
 pkgname=lua-resty-core
-pkgver=0.1.17
-pkgrel=1
+pkgver=0.1.28
+pkgrel=0
 pkgdesc="New FFI-based API for lua-nginx-module"
 url="https://github.com/openresty/lua-resty-core"
-arch="noarch"
+# luajit
+arch="noarch !ppc64le !riscv64"
 license="BSD-2-Clause"
 depends="luajit lua-resty-lrucache"
-source="https://github.com/openresty/lua-resty-core/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
+source="https://github.com/openresty/lua-resty-core/archive/v$pkgver/lua-resty-core-$pkgver.tar.gz"
 options="!check"  # FIXME: tests require OpenResty and additional dependencies
 
 package() {
@@ -19,4 +20,6 @@ package() {
 		"$pkgdir"/usr/lib/luarocks/rocks-common/$pkgname/$pkgver-1
 }
 
-sha512sums="76313f33d3a5c3d5ba1ba202b6b6b02ad8155f6f25a55504ded14228263930b7049baf7475f72156b7192af66d20a7ea5d36b3561e4335c746d5baa5ba03b2ba  lua-resty-core-0.1.17.tar.gz"
+sha512sums="
+0f54f6eec0805ce31091ce11b065b98a3b286ca3523f5eaf8a85bd8ba229c362a90fa464d5b4b68f155b06011ebb071115e16fd35aa3dd33e316e84a7ec43593  lua-resty-core-0.1.28.tar.gz
+"
diff --git a/main/lua-resty-lrucache/APKBUILD b/main/lua-resty-lrucache/APKBUILD
index 01e349ab4ea..a1deb5d8b31 100644
--- a/main/lua-resty-lrucache/APKBUILD
+++ b/main/lua-resty-lrucache/APKBUILD
@@ -1,14 +1,15 @@
 # Contributor: Michael Pirogov <vbnet.ru@gmail.com>
 # Maintainer: Michael Pirogov <vbnet.ru@gmail.com>
 pkgname=lua-resty-lrucache
-pkgver=0.09
+pkgver=0.13
 pkgrel=1
 pkgdesc="Lua-land LRU Cache based on LuaJIT FFI"
 url="https://github.com/openresty/lua-resty-lrucache"
-arch="noarch"
+# luajit
+arch="noarch !ppc64le !riscv64 !loongarch64"
 license="BSD-2-Clause"
 depends="luajit"
-source="https://github.com/openresty/lua-resty-lrucache/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
+source="$pkgname-$pkgver-2.tar.gz::https://github.com/openresty/lua-resty-lrucache/archive/v$pkgver/lua-resty-lrucache-$pkgver.tar.gz"
 options="!check"  # FIXME: tests require OpenResty and additional dependencies
 
 package() {
@@ -19,4 +20,6 @@ package() {
 		"$pkgdir"/usr/lib/luarocks/rocks-common/$pkgname/$pkgver-1
 }
 
-sha512sums="0042f5459a5d994ad3837ceeba7884efe85d2ab7194c8b08d026418c7c81c948ae1de91628d29afde45dae44f326fc5fb295988f24e95e5398a52014af50e3e2  lua-resty-lrucache-0.09.tar.gz"
+sha512sums="
+d6491acdca5d7b02feef1bf7fafb31798ae3194ad759a9ba87e895ef4e71268a2785291504f73e07e6872bed0d30147ca5e2cd0a0250db11f0a361af43426dfe  lua-resty-lrucache-0.13-2.tar.gz
+"
diff --git a/main/lua-rex/APKBUILD b/main/lua-rex/APKBUILD
index 81015c922d3..a44988593ee 100644
--- a/main/lua-rex/APKBUILD
+++ b/main/lua-rex/APKBUILD
@@ -1,34 +1,37 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=lua-rex
-pkgver=2.9.0
-pkgrel=0
-pkgdesc="Lua bindings to regular expression library pcre and posix"
+pkgver=2.9.1
+pkgrel=3
+pkgdesc="Lua bindings to regular expression library pcre2 and posix"
+options="!check" # TODO: get testsuite
 url="http://lrexlib.luaforge.net/"
 arch="all"
 license="MIT"
-depends="lua-rex-pcre lua-rex-posix"
-makedepends="pcre-dev"
-install=
-subpackages="$pkgname-pcre:_pcre $pkgname-posix:_posix"
+depends="lua-rex-pcre2 lua-rex-posix"
+makedepends="pcre2-dev"
+subpackages="$pkgname-pcre2:_pcre2 $pkgname-posix:_posix"
 
 for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev lua$_i"
-	subpackages="$subpackages lua$_i-rex-pcre:_pcre_${_i/./_}
+	subpackages="$subpackages lua$_i-rex-pcre2:_pcre2_${_i/./_}
 		lua$_i-rex-posix:_posix_${_i/./_}"
 
-	eval "_pcre_${_i/./_}() { _split $_i pcre; }"
+	eval "_pcre2_${_i/./_}() { _split $_i pcre2; }"
 	eval "_posix_${_i/./_}() { _split $_i posix; }"
 done
 
 source="$pkgname-$pkgver.tar.gz::https://github.com/rrthomas/lrexlib/archive/rel-${pkgver//./-}.tar.gz"
 
-_builddir="$srcdir"/lrexlib-rel-${pkgver//./-}
+builddir="$srcdir"/lrexlib-rel-${pkgver//./-}
 
 prepare() {
+	default_prepare
+
 	local _ver
 	for _ver in $_luaversions; do
-		cp -r "$_builddir" "$srcdir"/build-$_ver
+		cp -r "$builddir" "$srcdir"/build-$_ver
 	done
 }
 
@@ -38,15 +41,15 @@ _build_variant() {
 	local _flags="$3"
 
 	${CC:-gcc} \
-		${CFLAGS} \
+		$CFLAGS \
 		$(pkg-config --cflags lua$_ver) \
 		-shared \
 		-fPIC \
 		-o $_obj.${pkgver%.*} \
 		$_flags \
 		-DVERSION=\"$pkgver\" \
-		-DLUA_COMPAT_5_2 || return 1
-	ln -s $_obj.${pkgver%.*} $_obj || return 1
+		-DLUA_COMPAT_5_2
+	ln -s $_obj.${pkgver%.*} $_obj
 }
 
 build() {
@@ -54,11 +57,13 @@ build() {
 	for _ver in $_luaversions; do
 		msg "build for Lua $_ver"
 		cd "$srcdir"/build-$_ver
-		_build_variant $_ver rex_pcre.so \
-			'src/common.c src/pcre/lpcre.c src/pcre/lpcre_f.c
-			-lpcre' || return 1
+		_build_variant $_ver rex_pcre2.so \
+			'src/common.c src/pcre2/lpcre2.c src/pcre2/lpcre2_f.c
+			-lpcre2-8 -DPCRE2_CODE_UNIT_WIDTH=8'
+
 		_build_variant $_ver rex_posix.so \
-			'src/common.c src/posix/lposix.c' || return 1
+			'src/common.c src/posix/lposix.c'
+
 	done
 }
 
@@ -66,8 +71,8 @@ package() {
 	mkdir -p "$pkgdir"
 }
 
-_pcre() {
-	pkgdesc="Lua bindings to pcre regular expressions library"
+_pcre2() {
+	pkgdesc="Lua bindings to pcre2 regular expressions library"
 	depends=
 	mkdir -p "$subpkgdir"
 }
@@ -84,9 +89,13 @@ _split() {
 	pkgdesc="Lua $_ver bindings to $_lib regular expressions library"
 	install_if="lua$_ver lua-rex-$_lib=$pkgver-r$pkgrel"
 	depends=
-	install -d "$subpkgdir"/usr/lib/lua/$_ver || return 1
+	install -d "$subpkgdir"/usr/lib/lua/$_ver
+
 	cp -a "$srcdir"/build-$_ver/rex_$_lib.so* \
-		"$subpkgdir"/usr/lib/lua/$_ver || return 1
+		"$subpkgdir"/usr/lib/lua/$_ver
+
 }
 
-sha512sums="f37e6170595f1ce90f0ccdddbb0fc3c3d93378bdd48467d38705a3a4aec2eff640756fe96105cbccbdb9448bdf7476a88ac46cbf5214877dfe289ef19176f568  lua-rex-2.9.0.tar.gz"
+sha512sums="
+05f9305b76791521f0fcc0010c96dc883542acf97597ad15d448fdaf3d2deb7dd09919c052b974c6de3cb7e3cf4980b73b51d4482c6e25dfaf055a62e46205b9  lua-rex-2.9.1.tar.gz
+"
diff --git a/main/lua-say/APKBUILD b/main/lua-say/APKBUILD
new file mode 100644
index 00000000000..7642d51198e
--- /dev/null
+++ b/main/lua-say/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=lua-say
+_rockname=say
+pkgver=1.4.1
+pkgrel=0
+pkgdesc="Lua string hashing library, useful for internationalization"
+url="https://github.com/Olivine-Labs/say"
+arch="noarch"
+license="MIT"
+source="$pkgname-$pkgver.tar.gz::https://github.com/Olivine-Labs/say/archive/v$pkgver.tar.gz"
+builddir="$srcdir/${pkgname#lua-}-$pkgver"
+# This module needs lua-busted to run tests, but lua-busted depends on
+# lua-say and we wanna avoid circular dependencies.
+options="!check"
+
+_luaversions="5.1 5.2 5.3 5.4"
+for _v in $_luaversions; do
+	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
+done
+
+package() {
+	mkdir -p "$pkgdir"
+}
+
+_subpackage() {
+	local lver="${subpkgname:3:3}"
+	pkgdesc="$pkgdesc (for Lua $lver)"
+	depends="lua$lver"
+	install_if="$pkgname=$pkgver-r$pkgrel lua$lver"
+	local rockdir="$subpkgdir/usr/lib/luarocks/rocks-$lver/$_rockname/$pkgver"
+
+	install -m 644 -D "$builddir"/src/say/init.lua \
+		"$subpkgdir"/usr/share/lua/$lver/say.lua
+
+	mkdir -p "$rockdir"
+	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
+}
+
+sha512sums="
+a6c3477859615d7ae0677ac7aa0cefe8bf6f43424812062b4a06145017952b176801431c5be920cb67f52c07cc3d374e8a6714233e2252a2bb6b7ed4c3e32f90  lua-say-1.4.1.tar.gz
+"
diff --git a/main/lua-schema/APKBUILD b/main/lua-schema/APKBUILD
new file mode 100644
index 00000000000..a19e369b5d7
--- /dev/null
+++ b/main/lua-schema/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
+pkgname=lua-schema
+_rockname=$pkgname
+_rockver=scm-1
+_commit=e3e504df922da6175dbb055b091710ae46a44a14
+pkgver=0_git20170304
+pkgrel=2
+pkgdesc="simple package to check LUA-data against schemata"
+url="https://github.com/sschoener/lua-schema"
+arch="noarch"
+license="MIT"
+makedepends="lua5.2 lua5.3 lua5.4"
+source="lua-schema-$_commit.tar.gz::https://github.com/sschoener/lua-schema/archive/$_commit.tar.gz"
+builddir="$srcdir/$pkgname-$_commit"
+options="!check"
+
+_luaversions="5.2 5.3 5.4"
+for _v in $_luaversions; do
+	provides="$provides lua$_v-${pkgname#lua-}=$pkgver-r$pkgrel"
+done
+
+package() {
+	local rockdir="$pkgdir/usr/lib/luarocks/rocks-common/$_rockname/$_rockver"
+
+	install -m 644 -D "$builddir"/schema.lua \
+		"$pkgdir"/usr/share/lua/common/schema.lua
+
+	mkdir -p "$rockdir"
+	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
+}
+
+sha512sums="
+b377b61fb68968f708790fe80eee5b8feb5da9b7141aab0e37bb36f3361e8438984b76bed6463deb420786bc63d84d3611456bc3237a58e8d73e3c4e2811f586  lua-schema-e3e504df922da6175dbb055b091710ae46a44a14.tar.gz
+"
diff --git a/main/lua-sec/APKBUILD b/main/lua-sec/APKBUILD
index b688878b9a0..0d5a87a988d 100644
--- a/main/lua-sec/APKBUILD
+++ b/main/lua-sec/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=lua-sec
-pkgver=0.9
+pkgver=1.3.2
 pkgrel=0
 pkgdesc="TLS/SSL Support for Lua"
 url="https://github.com/brunoos/luasec/wiki"
 arch="all"
 license="MIT"
-makedepends="openssl-dev"
+makedepends="openssl-dev>3"
 subpackages="$pkgname-doc"
 for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev"
@@ -17,10 +17,13 @@ done
 
 source="luasec-$pkgver.tar.gz::https://github.com/brunoos/luasec/archive/v$pkgver.tar.gz"
 
+builddir="$srcdir/luasec-$pkgver"
+options="!check"
+
 prepare() {
-	cd "$srcdir"
+	default_prepare
 	for _i in $_luaversions; do
-		cp -r "$srcdir"/luasec-$pkgver build-$_i
+		cp -r "$builddir" "$srcdir"/build-$_i
 	done
 }
 
@@ -63,4 +66,6 @@ _split() {
 	done
 }
 
-sha512sums="ea601016328232ca0ff12be72897eeedac88a78834a63e1c36d2828a3187039665a2c60597b5af1fa6917b6fe87cd292fbcdfabcd67bab968f587e038d52a933  luasec-0.9.tar.gz"
+sha512sums="
+8f0c4b5ff87c024685b23770e1d342467554b8dc19a1704076e184d9e84b966f171091c31d1da135ab009e850275adc2bf2720fc9f32c83ac23f0a42f13d311f  luasec-1.3.2.tar.gz
+"
diff --git a/main/lua-soap/APKBUILD b/main/lua-soap/APKBUILD
index dadb30fb42e..0084cb0eb04 100644
--- a/main/lua-soap/APKBUILD
+++ b/main/lua-soap/APKBUILD
@@ -3,41 +3,26 @@
 pkgname=lua-soap
 pkgver=3.0
 _pkgver=${pkgver/./_}
-pkgrel=0
+pkgrel=1
 pkgdesc="Lua library to ease the use of SOAP"
 url="http://tomasguisasola.github.io/luasoap/"
 arch="noarch"
 license="MIT"
 depends="lua-expat lua-socket"
-depends_dev=""
-makedepends="$depends_dev"
-install=""
-subpackages=""
 source="https://github.com/tomasguisasola/luasoap/archive/v$_pkgver.tar.gz"
-
-_builddir="$srcdir"/luasoap-$_pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/luasoap-$_pkgver
+options="!check"
 
 build() {
-	cd "$_builddir"
-	make || return 1
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make LUA_DIR="$pkgdir"/usr/share/lua/5.1 install || return 1
+	make LUA_DIR="$pkgdir"/usr/share/lua/5.1 install
 
 	# https://github.com/tomasguisasola/luasoap/issues/7
 	mv "$pkgdir"/usr/share/lua/5.1/soap/soap.lua \
-	   "$pkgdir"/usr/share/lua/5.1/soap.lua || return 1
+	   "$pkgdir"/usr/share/lua/5.1/soap.lua
 }
 
 sha512sums="de0fa591f5bc9bbf9740660edd4482289bca2139e60119cb5607304cd7afdf6b0d63aedf5c67386022d538a5f8d206323fada49e8ae268f297dec71eda2bc0ad  v3_0.tar.gz"
diff --git a/main/lua-socket/0001-Create-socket-on-first-sendto-if-family-agnostic-udp.patch b/main/lua-socket/0001-Create-socket-on-first-sendto-if-family-agnostic-udp.patch
deleted file mode 100644
index 61bae6fbf48..00000000000
--- a/main/lua-socket/0001-Create-socket-on-first-sendto-if-family-agnostic-udp.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3041a808c3797e3c87272d71666e7b2f7c7a9f46 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 25 Jan 2017 12:43:29 +0100
-Subject: [PATCH] Create socket on first sendto if family agnostic udp() was
- used
-
-Create socket and set family on first sendto() if udp() was created
-without address family.
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- src/udp.c | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/src/udp.c b/src/udp.c
-index ec97252..605c195 100644
---- a/src/udp.c
-+++ b/src/udp.c
-@@ -189,6 +189,27 @@ static int meth_sendto(lua_State *L) {
-         lua_pushstring(L, gai_strerror(err));
-         return 2;
-     }
-+
-+    /* create socket if on first sendto if AF_UNSPEC was set */
-+    if (udp->family == AF_UNSPEC && udp->sock == SOCKET_INVALID) {
-+        struct addrinfo *ap;
-+        const char *errstr = NULL;
-+        for (ap = ai; ap != NULL; ap = ap->ai_next) {
-+            errstr = inet_trycreate(&udp->sock, ap->ai_family, SOCK_DGRAM, 0);
-+            if (errstr == NULL) {
-+                socket_setnonblocking(&udp->sock);
-+                udp->family = ap->ai_family;
-+                break;
-+            }
-+        }
-+        if (errstr != NULL) {
-+            lua_pushnil(L);
-+            lua_pushstring(L, errstr);
-+            freeaddrinfo(ai);
-+            return 2;
-+        }
-+    }
-+
-     timeout_markstart(tm);
-     err = socket_sendto(&udp->sock, data, count, &sent, ai->ai_addr,
-         (socklen_t) ai->ai_addrlen, tm);
--- 
-2.11.0
-
diff --git a/main/lua-socket/APKBUILD b/main/lua-socket/APKBUILD
index de77aa12bf8..44b2845236e 100644
--- a/main/lua-socket/APKBUILD
+++ b/main/lua-socket/APKBUILD
@@ -1,28 +1,23 @@
 # Contributor: Mika Havela <mika.havela@gmail.com>
 # Maintainer: Mika Havela <mika.havela@gmail.com>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=lua-socket
-_name=luasocket
-pkgver=3.0_rc1_git20160306
-pkgrel=2
-_ver=${pkgver%_git*}
-_ver=${_ver/_rc/-rc}
+_pkgname=luasocket
+pkgver=3.1.0
+pkgrel=1
 pkgdesc="Networking library for Lua"
-url="http://luaforge.net/projects/luasocket/"
+url="https://lunarmodules.github.io/luasocket/"
 arch="all"
 license="MIT"
 for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev"
 	subpackages="$subpackages lua$_i-socket:split_${_i/./_}"
 done
-source="luasocket-$_ver.tar.gz::https://github.com/diegonehab/luasocket/archive/v$_ver.tar.gz
-	git.patch
+source="$pkgname-$pkgver.tar.gz::https://github.com/lunarmodules/luasocket/archive/refs/tags/v$pkgver.tar.gz
 	lua-cflags.patch
-	0001-Create-socket-on-first-sendto-if-family-agnostic-udp.patch
 	"
-
-# default_prepare assumes $_builddir
-builddir="$srcdir/$_name-$_ver"
+builddir="$srcdir/$_pkgname-$pkgver"
+options="!check"
 
 prepare() {
 	default_prepare
@@ -62,7 +57,7 @@ for _i in $_luaversions; do
 	eval "split_${_i/./_}() { _split $_i; }"
 done
 
-sha512sums="f6efce259aaacaa11472911471f8a13b118fe009b8953a82c6aa18b9ec829cd1293180904e56935cb130d36d267e3f27c91db2d78e03f7488f3e100571ed0540  luasocket-3.0-rc1.tar.gz
-45c80e488fedc879f0217bc8a654d80da003039f5d1ff21b0dea0eb769151787dbe793e44a3dfd72cb07ff2697eceaf4fc7b55b4634cd170fa71281f19f025a5  git.patch
-fb482ad22b5caa2054b25c86edc01d1a666035930f6b55e7d12704dd78b9c31343c39eab5f13958941180d819aa37470c75fe27f1b206a4b431fb589663e2685  lua-cflags.patch
-c45a12e17771a1b3b71154b5415421f524cd10b7969b4649a5f37b652cdc826721e117edb8fe64758d3520e59946e2f755b814f72cbb39ff42bf59bbcf9a64e9  0001-Create-socket-on-first-sendto-if-family-agnostic-udp.patch"
+sha512sums="
+1e9e98484740ec6538fe3d2b0dab74d31f052956ecf9ee3b60e229f2d0b13fcc6d4aaf74cd2a3e2ee330333dabb316fe6a43c60baaea26f0cc01069b6aa4519b  lua-socket-3.1.0.tar.gz
+66d9b84a756800bab813042bd2ca4d473aa963686ec769be9171babbe5707ba94f62e7a5d4c0d14b71036c37953ee6ca157b97452f2b0e4196ffb81fdd7d8d21  lua-cflags.patch
+"
diff --git a/main/lua-socket/git.patch b/main/lua-socket/git.patch
deleted file mode 100644
index d665fc2323d..00000000000
--- a/main/lua-socket/git.patch
+++ /dev/null
@@ -1,6609 +0,0 @@
-diff --git a/doc/http.html b/doc/http.html
-index cd41c0d..3b7a8b1 100644
---- a/doc/http.html
-+++ b/doc/http.html
-@@ -112,12 +112,15 @@ the HTTP module:
- </p>
- 
- <ul>
--<li> <tt>PORT</tt>: default port used for connections; 
--<li> <tt>PROXY</tt>: default proxy used for connections; 
-+<li> <tt>PROXY</tt>: default proxy used for connections;
- <li> <tt>TIMEOUT</tt>: sets the timeout for all I/O operations;
- <li> <tt>USERAGENT</tt>: default user agent reported to server.
- </ul>
- 
-+<p class=note id="post">
-+Note: These constants are global. Changing them will also
-+change the behavior other code that might be using LuaSocket.
-+</p>
- 
- <!-- http.request ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
-diff --git a/doc/mime.html b/doc/mime.html
-index ae136fd..8cb3507 100644
---- a/doc/mime.html
-+++ b/doc/mime.html
-@@ -72,34 +72,6 @@ local mime = require("mime")
- 
- <h3 id=high>High-level filters</h3>
- 
--<!-- normalize ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
--
--<p class=name id="normalize">
--mime.<b>normalize(</b>[marker]<b>)</b>
--</p>
--
--<p class=description>
--Converts most common end-of-line markers to a specific given marker. 
--</p>
--
--<p class=parameters>
--<tt>Marker</tt> is the new marker. It defaults to CRLF, the canonic 
--end-of-line marker defined by the MIME standard.
--</p>
--
--<p class=return>
--The function returns a filter that performs the conversion. 
--</p>
--
--<p class=note>
--Note: There is no perfect solution to this problem. Different end-of-line
--markers are an evil that will probably plague developers forever. 
--This function, however, will work perfectly for text created with any of
--the most common end-of-line markers, i.e. the Mac OS (CR), the Unix (LF), 
--or the DOS (CRLF) conventions. Even if the data has mixed end-of-line
--markers, the function will still work well, although it doesn't 
--guarantee that the number of empty lines will be correct.
--</p>
- 
- <!-- decode +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
-@@ -159,6 +131,35 @@ base64 = ltn12.filter.chain(
- )
- </pre>
- 
-+<!-- normalize ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+
-+<p class=name id="normalize">
-+mime.<b>normalize(</b>[marker]<b>)</b>
-+</p>
-+
-+<p class=description>
-+Converts most common end-of-line markers to a specific given marker. 
-+</p>
-+
-+<p class=parameters>
-+<tt>Marker</tt> is the new marker. It defaults to CRLF, the canonic 
-+end-of-line marker defined by the MIME standard.
-+</p>
-+
-+<p class=return>
-+The function returns a filter that performs the conversion. 
-+</p>
-+
-+<p class=note>
-+Note: There is no perfect solution to this problem. Different end-of-line
-+markers are an evil that will probably plague developers forever. 
-+This function, however, will work perfectly for text created with any of
-+the most common end-of-line markers, i.e. the Mac OS (CR), the Unix (LF), 
-+or the DOS (CRLF) conventions. Even if the data has mixed end-of-line
-+markers, the function will still work well, although it doesn't 
-+guarantee that the number of empty lines will be correct.
-+</p>
-+
- <!-- stuff +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
- <p class=name id="stuff">
-@@ -466,7 +467,7 @@ marker.
- <p>
- <small>
- Last modified by Diego Nehab on <br>
--Thu Apr 20 00:25:44 EDT 2006
-+Fri Mar  4 15:19:17 BRT 2016
- </small>
- </p>
- </center>
-diff --git a/doc/reference.css b/doc/reference.css
-index b1dd25d..04e38cf 100644
---- a/doc/reference.css
-+++ b/doc/reference.css
-@@ -2,6 +2,7 @@ body {
-     margin-left: 1em; 
-     margin-right: 1em; 
-     font-family: "Verdana", sans-serif; 
-+    background: #ffffff;
- }
- 
- tt {
-diff --git a/doc/reference.html b/doc/reference.html
-index e9bb5eb..287dc19 100644
---- a/doc/reference.html
-+++ b/doc/reference.html
-@@ -147,6 +147,7 @@ Support, Manual">
- <a href="socket.html#connect">connect</a>,
- <a href="socket.html#connect">connect4</a>,
- <a href="socket.html#connect">connect6</a>,
-+<a href="socket.html#datagramsize">_DATAGRAMSIZE</a>,
- <a href="socket.html#debug">_DEBUG</a>,
- <a href="dns.html#dns">dns</a>,
- <a href="socket.html#gettime">gettime</a>,
-@@ -158,11 +159,14 @@ Support, Manual">
- <a href="socket.html#skip">skip</a>,
- <a href="socket.html#sleep">sleep</a>,
- <a href="socket.html#setsize">_SETSIZE</a>,
-+<a href="socket.html#socketinvalid">_SOCKETINVALID</a>,
- <a href="socket.html#source">source</a>,
- <a href="tcp.html#socket.tcp">tcp</a>,
-+<a href="tcp.html#socket.tcp4">tcp4</a>,
- <a href="tcp.html#socket.tcp6">tcp6</a>,
- <a href="socket.html#try">try</a>,
- <a href="udp.html#socket.udp">udp</a>,
-+<a href="udp.html#socket.udp4">udp4</a>,
- <a href="udp.html#socket.udp6">udp6</a>,
- <a href="socket.html#version">_VERSION</a>.
- </blockquote>
-@@ -183,6 +187,7 @@ Support, Manual">
- <a href="tcp.html#getpeername">getpeername</a>,
- <a href="tcp.html#getsockname">getsockname</a>,
- <a href="tcp.html#getstats">getstats</a>,
-+<a href="tcp.html#gettimeout">gettimeout</a>,
- <a href="tcp.html#listen">listen</a>,
- <a href="tcp.html#receive">receive</a>,
- <a href="tcp.html#send">send</a>,
-@@ -203,6 +208,7 @@ Support, Manual">
- <a href="udp.html#getoption">getoption</a>,
- <a href="udp.html#getpeername">getpeername</a>,
- <a href="udp.html#getsockname">getsockname</a>,
-+<a href="udp.html#gettimeout">gettimeout</a>,
- <a href="udp.html#receive">receive</a>,
- <a href="udp.html#receivefrom">receivefrom</a>,
- <a href="udp.html#send">send</a>,
-diff --git a/doc/smtp.html b/doc/smtp.html
-index bbbff80..600ec37 100644
---- a/doc/smtp.html
-+++ b/doc/smtp.html
-@@ -114,6 +114,124 @@ the SMTP module:
- <li> <tt>ZONE</tt>: default time zone.
- </ul>
- 
-+<!-- message ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+
-+<p class=name id=message> 
-+smtp.<b>message(</b>mesgt<b>)</b>
-+</p>
-+
-+<p class=description>
-+Returns a <em>simple</em>
-+<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a> source that sends an SMTP message body, possibly multipart (arbitrarily deep). 
-+</p>
-+
-+<p class=parameters>
-+The only parameter of the function is a table describing the message.
-+<tt>Mesgt</tt> has the following form (notice the recursive structure):
-+</p>
-+
-+<blockquote>
-+<table summary="Mesgt table structure">
-+<tr><td><tt>
-+mesgt = {<br>
-+&nbsp;&nbsp;headers = <i>header-table</i>,<br>
-+&nbsp;&nbsp;body = <i>LTN12 source</i> or <i>string</i> or 
-+<i>multipart-mesgt</i><br>
-+}<br>
-+&nbsp;<br>
-+multipart-mesgt = {<br>
-+&nbsp;&nbsp;[preamble = <i>string</i>,]<br>
-+&nbsp;&nbsp;[1] = <i>mesgt</i>,<br>
-+&nbsp;&nbsp;[2] = <i>mesgt</i>,<br>
-+&nbsp;&nbsp;...<br>
-+&nbsp;&nbsp;[<i>n</i>] = <i>mesgt</i>,<br>
-+&nbsp;&nbsp;[epilogue = <i>string</i>,]<br>
-+}<br>
-+</tt></td></tr>
-+</table>
-+</blockquote>
-+
-+<p class=parameters>
-+For a simple message, all that is needed is a set of <tt>headers</tt>
-+and the <tt>body</tt>. The message <tt>body</tt> can be given as a string
-+or as a <em>simple</em> 
-+<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a> 
-+source. For multipart messages, the body is a table that
-+recursively defines each part as an independent message, plus an optional
-+<tt>preamble</tt> and <tt>epilogue</tt>.
-+</p>
-+
-+<p class=return> 
-+The function returns a <em>simple</em> 
-+<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a> 
-+source that produces the
-+message contents as defined by <tt>mesgt</tt>, chunk by chunk. 
-+Hopefully, the following
-+example will make things clear. When in doubt, refer to the appropriate RFC
-+as listed in the introduction.  </p>
-+
-+<pre class=example>
-+-- load the smtp support and its friends
-+local smtp = require("socket.smtp")
-+local mime = require("mime")
-+local ltn12 = require("ltn12")
-+
-+-- creates a source to send a message with two parts. The first part is 
-+-- plain text, the second part is a PNG image, encoded as base64.
-+source = smtp.message{
-+  headers = {
-+     -- Remember that headers are *ignored* by smtp.send. 
-+     from = "Sicrano de Oliveira &lt;sicrano@example.com&gt;",
-+     to = "Fulano da Silva &lt;fulano@example.com&gt;",
-+     subject = "Here is a message with attachments"
-+  },
-+  body = {
-+    preamble = "If your client doesn't understand attachments, \r\n" ..
-+               "it will still display the preamble and the epilogue.\r\n" ..
-+               "Preamble will probably appear even in a MIME enabled client.",
-+    -- first part: no headers means plain text, us-ascii.
-+    -- The mime.eol low-level filter normalizes end-of-line markers.
-+    [1] = { 
-+      body = mime.eol(0, [[
-+        Lines in a message body should always end with CRLF. 
-+        The smtp module will *NOT* perform translation. However, the 
-+        send function *DOES* perform SMTP stuffing, whereas the message
-+        function does *NOT*.
-+      ]])
-+    },
-+    -- second part: headers describe content to be a png image, 
-+    -- sent under the base64 transfer content encoding.
-+    -- notice that nothing happens until the message is actually sent. 
-+    -- small chunks are loaded into memory right before transmission and 
-+    -- translation happens on the fly.
-+    [2] = { 
-+      headers = {
-+        ["content-type"] = 'image/png; name="image.png"',
-+        ["content-disposition"] = 'attachment; filename="image.png"',
-+        ["content-description"] = 'a beautiful image',
-+        ["content-transfer-encoding"] = "BASE64"
-+      },
-+      body = ltn12.source.chain(
-+        ltn12.source.file(io.open("image.png", "rb")),
-+        ltn12.filter.chain(
-+          mime.encode("base64"),
-+          mime.wrap()
-+        )
-+      )
-+    },
-+    epilogue = "This might also show up, but after the attachments"
-+  }
-+}
-+
-+-- finally send it
-+r, e = smtp.send{
-+    from = "&lt;sicrano@example.com&gt;",
-+    rcpt = "&lt;fulano@example.com&gt;",
-+    source = source,
-+}
-+</pre>
-+
-+
- <!-- send +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
- <p class=name id=send> 
-@@ -275,123 +393,6 @@ r, e = smtp.send{
- }
- </pre>
- 
--<!-- message ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
--
--<p class=name id=message> 
--smtp.<b>message(</b>mesgt<b>)</b>
--</p>
--
--<p class=description>
--Returns a <em>simple</em>
--<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a> source that sends an SMTP message body, possibly multipart (arbitrarily deep). 
--</p>
--
--<p class=parameters>
--The only parameter of the function is a table describing the message.
--<tt>Mesgt</tt> has the following form (notice the recursive structure):
--</p>
--
--<blockquote>
--<table summary="Mesgt table structure">
--<tr><td><tt>
--mesgt = {<br>
--&nbsp;&nbsp;headers = <i>header-table</i>,<br>
--&nbsp;&nbsp;body = <i>LTN12 source</i> or <i>string</i> or 
--<i>multipart-mesgt</i><br>
--}<br>
--&nbsp;<br>
--multipart-mesgt = {<br>
--&nbsp;&nbsp;[preamble = <i>string</i>,]<br>
--&nbsp;&nbsp;[1] = <i>mesgt</i>,<br>
--&nbsp;&nbsp;[2] = <i>mesgt</i>,<br>
--&nbsp;&nbsp;...<br>
--&nbsp;&nbsp;[<i>n</i>] = <i>mesgt</i>,<br>
--&nbsp;&nbsp;[epilogue = <i>string</i>,]<br>
--}<br>
--</tt></td></tr>
--</table>
--</blockquote>
--
--<p class=parameters>
--For a simple message, all that is needed is a set of <tt>headers</tt>
--and the <tt>body</tt>. The message <tt>body</tt> can be given as a string
--or as a <em>simple</em> 
--<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a> 
--source. For multipart messages, the body is a table that
--recursively defines each part as an independent message, plus an optional
--<tt>preamble</tt> and <tt>epilogue</tt>.
--</p>
--
--<p class=return> 
--The function returns a <em>simple</em> 
--<a href="http://lua-users.org/wiki/FiltersSourcesAndSinks">LTN12</a> 
--source that produces the
--message contents as defined by <tt>mesgt</tt>, chunk by chunk. 
--Hopefully, the following
--example will make things clear. When in doubt, refer to the appropriate RFC
--as listed in the introduction.  </p>
--
--<pre class=example>
---- load the smtp support and its friends
--local smtp = require("socket.smtp")
--local mime = require("mime")
--local ltn12 = require("ltn12")
--
---- creates a source to send a message with two parts. The first part is 
---- plain text, the second part is a PNG image, encoded as base64.
--source = smtp.message{
--  headers = {
--     -- Remember that headers are *ignored* by smtp.send. 
--     from = "Sicrano de Oliveira &lt;sicrano@example.com&gt;",
--     to = "Fulano da Silva &lt;fulano@example.com&gt;",
--     subject = "Here is a message with attachments"
--  },
--  body = {
--    preamble = "If your client doesn't understand attachments, \r\n" ..
--               "it will still display the preamble and the epilogue.\r\n" ..
--               "Preamble will probably appear even in a MIME enabled client.",
--    -- first part: no headers means plain text, us-ascii.
--    -- The mime.eol low-level filter normalizes end-of-line markers.
--    [1] = { 
--      body = mime.eol(0, [[
--        Lines in a message body should always end with CRLF. 
--        The smtp module will *NOT* perform translation. However, the 
--        send function *DOES* perform SMTP stuffing, whereas the message
--        function does *NOT*.
--      ]])
--    },
--    -- second part: headers describe content to be a png image, 
--    -- sent under the base64 transfer content encoding.
--    -- notice that nothing happens until the message is actually sent. 
--    -- small chunks are loaded into memory right before transmission and 
--    -- translation happens on the fly.
--    [2] = { 
--      headers = {
--        ["content-type"] = 'image/png; name="image.png"',
--        ["content-disposition"] = 'attachment; filename="image.png"',
--        ["content-description"] = 'a beautiful image',
--        ["content-transfer-encoding"] = "BASE64"
--      },
--      body = ltn12.source.chain(
--        ltn12.source.file(io.open("image.png", "rb")),
--        ltn12.filter.chain(
--          mime.encode("base64"),
--          mime.wrap()
--        )
--      )
--    },
--    epilogue = "This might also show up, but after the attachments"
--  }
--}
--
---- finally send it
--r, e = smtp.send{
--    from = "&lt;sicrano@example.com&gt;",
--    rcpt = "&lt;fulano@example.com&gt;",
--    source = source,
--}
--</pre>
--
- <!-- footer +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
- <div class=footer>
-diff --git a/doc/socket.html b/doc/socket.html
-index b9303cb..35f8391 100644
---- a/doc/socket.html
-+++ b/doc/socket.html
-@@ -51,6 +51,30 @@ To obtain the <tt>socket</tt> namespace, run:
- local socket = require("socket")
- </pre>
- 
-+<!-- headers.canonic ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+
-+<p class=name id="headers.canonic">
-+socket.headers.<b>canonic</b></p>
-+
-+<p> The <tt>socket.headers.canonic</tt> table 
-+is used by the HTTP and SMTP modules to translate from 
-+lowercase field names back into their canonic 
-+capitalization. When a lowercase field name exists as a key
-+in this table, the associated value is substituted in
-+whenever the field name is sent out.
-+</p>
-+
-+<p> 
-+You can obtain the <tt>headers</tt> namespace if case run-time
-+modifications are required by running:
-+</p>
-+
-+<pre class=example>
-+-- loads the headers module 
-+local headers = require("headers")
-+</pre>
-+
-+
- <!-- bind ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
- <p class=name id=bind> 
-@@ -90,7 +114,7 @@ of connect are defined as simple helper functions that restrict the
- 
- <!-- debug ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
--<p class=name id=debug> 
-+<p class=name id=debug>
- socket.<b>_DEBUG</b>
- </p>
- 
-@@ -99,6 +123,19 @@ This constant is set to <tt><b>true</b></tt> if the library was compiled
- with debug support.
- </p>
- 
-+<!-- datagramsize +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+
-+<p class=name id=debug>
-+socket.<b>_DATAGRAMSIZE</b>
-+</p>
-+
-+<p class=description>
-+Default datagram size used by calls to
-+<a href="udp.html#receive"<tt>receive</tt></a> and
-+<a href="udp.html#receivefrom"><tt>receivefrom</tt></a>.
-+(Unless changed in compile time, the value is 8192.)
-+</p>
-+
- <!-- get time +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
- <p class=name id=gettime> 
-@@ -106,8 +143,7 @@ socket.<b>gettime()</b>
- </p>
- 
- <p class=description>
--Returns the time in seconds, relative to the origin of the 
--universe. You should subtract the values returned by this function
-+Returns the UNIX time in seconds. You should subtract the values returned by this function
- to get meaningful values. 
- </p>
- 
-@@ -117,29 +153,6 @@ t = socket.gettime()
- print(socket.gettime() - t .. " seconds elapsed")
- </pre>
- 
--<!-- socket.headers ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
--
--<p class=name id="headers.canonic">
--socket.headers.<b>canonic</b></p>
--
--<p> The <tt>socket.headers.canonic</tt> table 
--is used by the HTTP and SMTP modules to translate from 
--lowercase field names back into their canonic 
--capitalization. When a lowercase field name exists as a key
--in this table, the associated value is substituted in
--whenever the field name is sent out.
--</p>
--
--<p> 
--You can obtain the <tt>headers</tt> namespace if case run-time
--modifications are required by running:
--</p>
--
--<pre class=example>
---- loads the headers module 
--local headers = require("headers")
--</pre>
--
- <!-- newtry +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
- <p class=name id=newtry> 
-@@ -155,8 +168,7 @@ is  raised.
- 
- <p class=parameters> 
- <tt>Finalizer</tt> is a function that will be called before
--<tt>try</tt> throws the exception. It will be called 
--in <em>protected</em> mode.
-+<tt>try</tt> throws the exception.
- </p>
- 
- <p class=return> 
-@@ -204,15 +216,9 @@ to throw exceptions.
- </p>
- 
- <p class=return>
--Returns an equivalent function that instead of throwing exceptions,
--returns <tt><b>nil</b></tt> followed by an error message. 
--</p>
--
--<p class=note>
--Note: Beware that if your function performs some illegal operation that
--raises an error, the protected function will catch the error and return it
--as a string. This is because the <a href=#try><tt>try</tt></a> function
--uses errors as the mechanism to throw exceptions.  
-+Returns an equivalent function that instead of throwing exceptions in case of
-+a failed <a href=#try><tt>try</tt></a> call, returns <tt><b>nil</b></tt>
-+followed by an error message.
- </p>
- 
- <!-- select +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-@@ -238,7 +244,9 @@ non-numeric indices) in the arrays will be silently ignored.
- 
- <p class=return> The function returns a list with the sockets ready for
- reading, a list with the sockets ready for writing and an error message.
--The error message is "<tt>timeout</tt>" if a timeout condition was met and
-+The error message is "<tt>timeout</tt>" if a timeout
-+condition was met, "<tt>select failed</tt>" if the call
-+to <tt>select</tt> failed, and
- <tt><b>nil</b></tt> otherwise. The returned tables are
- doubly keyed both by integers and also by the sockets
- themselves, to simplify the test if a specific socket has
-@@ -246,7 +254,7 @@ changed status.
- </p>
- 
- <p class=note>
--<b>Note: </b>: <tt>select</tt> can monitor a limited number
-+<b>Note:</b> <tt>select</tt> can monitor a limited number
- of sockets, as defined by the constant <tt>socket._SETSIZE</tt>. This
- number may be as high as 1024 or as low as 64 by default,
- depending on the system. It is usually possible to change this
-@@ -276,6 +284,18 @@ it to <tt>select</tt>, it will be ignored.
- <b>Using select with non-socket objects</b>: Any object that implements <tt>getfd</tt> and <tt>dirty</tt> can be used with <tt>select</tt>, allowing objects from other libraries to be used within a <tt>socket.select</tt> driven loop.
- </p>
- 
-+<!-- setsize ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+
-+<p class=name id=setsize> 
-+socket.<b>_SETSIZE</b>
-+</p>
-+
-+<p class=description>
-+The maximum number of sockets that the <a
-+href=#select><tt>select</tt></a> function can handle. 
-+</p>
-+
-+
- <!-- sink ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
- <p class=name id=sink> 
-@@ -383,15 +403,14 @@ side closes the connection.
- The function returns a source with the appropriate behavior. 
- </p>
- 
--<!-- setsize ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+<!-- socketinvalid ++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
--<p class=name id=setsize> 
--socket.<b>_SETSIZE</b>
-+<p class=name id=socketinvalid>
-+socket.<b>_SOCKETINVALID</b>
- </p>
- 
- <p class=description>
--The maximum number of sockets that the <a
--href=#select><tt>select</tt></a> function can handle. 
-+The OS value for an invalid socket.
- </p>
- 
- <!-- try ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-@@ -401,9 +420,9 @@ socket.<b>try(</b>ret<sub>1</sub> [, ret<sub>2</sub> ... ret<sub>N</sub>]<b>)</b
- </p>
- 
- <p class=description>
--Throws an exception in case of error. The exception can only be caught 
--by the <a href=#protect><tt>protect</tt></a> function. It does not explode
--into an error message.
-+Throws an exception in case <tt>ret<sub>1</sub></tt> is falsy, using
-+<tt>ret<sub>2</sub></tt> as the error message. The exception is supposed to be caught 
-+by a <a href=#protect><tt>protect</tt></a>ed function only.
- </p>
- 
- <p class=parameters>
-@@ -414,7 +433,10 @@ nested with <tt>try</tt>.
- 
- <p class=return> 
- The function returns <tt>ret</tt><sub>1</sub> to <tt>ret</tt><sub>N</sub> if
--<tt>ret</tt><sub>1</sub> is not <tt><b>nil</b></tt>. Otherwise, it calls <tt>error</tt> passing <tt>ret</tt><sub>2</sub>.
-+<tt>ret</tt><sub>1</sub> is not <tt><b>nil</b></tt> or <tt><b>false</b></tt>.
-+Otherwise, it calls <tt>error</tt> passing <tt>ret</tt><sub>2</sub> wrapped
-+in a table with metatable used by <a href=#protect><tt>protect</tt></a> to
-+distinguish exceptions from runtime errors.
- </p>
- 
- <pre class=example>
-diff --git a/doc/tcp.html b/doc/tcp.html
-index 4226d78..c6c6eb2 100644
---- a/doc/tcp.html
-+++ b/doc/tcp.html
-@@ -1,10 +1,10 @@
--<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
-+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-     "http://www.w3.org/TR/html4/strict.dtd">
- <html>
- 
- <head>
- <meta name="description" content="LuaSocket: The TCP/IP support">
--<meta name="keywords" content="Lua, LuaSocket, Socket, TCP, Library, Network, Support"> 
-+<meta name="keywords" content="Lua, LuaSocket, Socket, TCP, Library, Network, Support">
- <title>LuaSocket: TCP/IP support</title>
- <link rel="stylesheet" href="reference.css" type="text/css">
- </head>
-@@ -28,7 +28,7 @@
- <a href="index.html#download">download</a> &middot;
- <a href="installation.html">installation</a> &middot;
- <a href="introduction.html">introduction</a> &middot;
--<a href="reference.html">reference</a> 
-+<a href="reference.html">reference</a>
- </p>
- </center>
- <hr>
-@@ -36,56 +36,11 @@
- 
- <!-- tcp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
--<h2 id="tcp">TCP</h2> 
--
--<!-- socket.tcp +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
--
--<p class=name id="socket.tcp"> 
--socket.<b>tcp()</b>
--</p>
--
--<p class=description> 
--Creates and returns an IPv4 TCP master object. A master object can
--be transformed into a server object with the method 
--<a href=#listen><tt>listen</tt></a> (after a call to <a
--href=#bind><tt>bind</tt></a>) or into a client object with 
--the method <a href=#connect><tt>connect</tt></a>. The only other 
--method supported by a master object is the 
--<a href=#close><tt>close</tt></a> method.</p>
--
--<p class=return>
--In case of success, a new master object is returned. In case of error,
--<b><tt>nil</tt></b> is returned, followed by an error message.
--</p>
--
--<!-- socket.tcp6 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
--
--<p class=name id="socket.tcp6"> 
--socket.<b>tcp6()</b>
--</p>
--
--<p class=description> 
--Creates and returns an IPv6 TCP master object. A master object can
--be transformed into a server object with the method 
--<a href=#listen><tt>listen</tt></a> (after a call to <a
--href=#bind><tt>bind</tt></a>) or into a client object with 
--the method <a href=#connect><tt>connect</tt></a>. The only other 
--method supported by a master object is the 
--<a href=#close><tt>close</tt></a> method.</p>
--
--<p class=return>
--In case of success, a new master object is returned. In case of error,
--<b><tt>nil</tt></b> is returned, followed by an error message.
--</p>
--
--<p class=note>
--Note: The TCP object returned will have the option
--"<tt>ipv6-v6only</tt>" set to <tt><b>true</b></tt>.
--</p>
-+<h2 id="tcp">TCP</h2>
- 
- <!-- accept +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
--<p class=name id="accept"> 
-+<p class=name id="accept">
- server:<b>accept()</b>
- </p>
- 
-@@ -95,9 +50,9 @@ object and returns a client object representing that connection.
- </p>
- 
- <p class=return>
--If a connection is successfully initiated, a client object is returned.  
-+If a connection is successfully initiated, a client object is returned.
- If a  timeout condition  is  met,  the method  returns <b><tt>nil</tt></b>
--followed by the error string '<tt>timeout</tt>'. Other errors are 
-+followed by the error string '<tt>timeout</tt>'. Other errors are
- reported by <b><tt>nil</tt></b> followed by a message describing the error.
- </p>
- 
-@@ -107,28 +62,28 @@ with   a  server   object   in
- the <tt>recvt</tt>  parameter  before  a   call  to  <tt>accept</tt> does
- <em>not</em> guarantee  <tt>accept</tt> will  return immediately.  Use the <a
- href=#settimeout><tt>settimeout</tt></a> method or <tt>accept</tt>
--might block until <em>another</em> client shows up. 
-+might block until <em>another</em> client shows up.
- </p>
- 
- <!-- bind +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
--<p class=name id="bind"> 
-+<p class=name id="bind">
- master:<b>bind(</b>address, port<b>)</b>
- </p>
- 
- <p class=description>
- Binds a master object to <tt>address</tt> and <tt>port</tt> on the
--local host. 
-+local host.
- 
- <p class=parameters>
--<tt>Address</tt> can be an IP address or a host name. 
--<tt>Port</tt> must be an integer number in the range [0..64K). 
-+<tt>Address</tt> can be an IP address or a host name.
-+<tt>Port</tt> must be an integer number in the range [0..64K).
- If <tt>address</tt>
- is '<tt>*</tt>', the system binds to all local interfaces
- using the <tt>INADDR_ANY</tt> constant or
--<tt>IN6ADDR_ANY_INIT</tt>, according to the family. 
-+<tt>IN6ADDR_ANY_INIT</tt>, according to the family.
- If <tt>port</tt> is 0, the system automatically
--chooses an ephemeral port.  
-+chooses an ephemeral port.
- </p>
- 
- <p class=return>
-@@ -137,13 +92,13 @@ method returns <b><tt>nil</tt></b> followed by an error message.
- </p>
- 
- <p class=note>
--Note: The function <a href=socket.html#bind><tt>socket.bind</tt></a> 
-+Note: The function <a href=socket.html#bind><tt>socket.bind</tt></a>
- is available and is a shortcut for the creation of server sockets.
- </p>
- 
- <!-- close ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
--<p class=name id="close"> 
-+<p class=name id="close">
- master:<b>close()</b><br>
- client:<b>close()</b><br>
- server:<b>close()</b>
-@@ -154,14 +109,14 @@ Closes  a TCP object. The internal socket used by the object is closed
- and the local  address   to  which the object was
- bound is made  available to other  applications. No further  operations
- (except  for  further calls  to the <tt>close</tt> method)  are allowed on
--a closed socket. 
-+a closed socket.
- </p>
- 
- <p class=note>
- Note:  It is  important to  close all  used  sockets once  they are  not
- needed,  since, in  many systems,  each socket  uses a  file descriptor,
- which are limited system resources. Garbage-collected objects are
--automatically closed before destruction, though. 
-+automatically closed before destruction, though.
- </p>
- 
- <!-- connect ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-@@ -172,19 +127,19 @@ master:<b>connect(</b>address, port<b>)</b>
- 
- <p class=description>
- Attempts to connect a master object to a remote host, transforming it into a
--client object. 
--Client objects support methods 
-+client object.
-+Client objects support methods
- <a href=#send><tt>send</tt></a>,
--<a href=#receive><tt>receive</tt></a>, 
--<a href=#getsockname><tt>getsockname</tt></a>, 
-+<a href=#receive><tt>receive</tt></a>,
-+<a href=#getsockname><tt>getsockname</tt></a>,
- <a href=#getpeername><tt>getpeername</tt></a>,
--<a href=#settimeout><tt>settimeout</tt></a>, 
-+<a href=#settimeout><tt>settimeout</tt></a>,
- and <a href=#close><tt>close</tt></a>.
- </p>
- 
- <p class=parameters>
--<tt>Address</tt> can be an IP address or a host name. 
--<tt>Port</tt> must be an integer number in the range [1..64K). 
-+<tt>Address</tt> can be an IP address or a host name.
-+<tt>Port</tt> must be an integer number in the range [1..64K).
- </p>
- 
- <p class=return>
-@@ -193,14 +148,14 @@ describing the error. In case of success, the method returns 1.
- </p>
- 
- <p class=note>
--Note: The function <a href=socket.html#connect><tt>socket.connect</tt></a> 
-+Note: The function <a href=socket.html#connect><tt>socket.connect</tt></a>
- is available and is a shortcut for the creation of client sockets.
- </p>
- 
- <p class=note>
--Note: Starting with LuaSocket 2.0, 
-+Note: Starting with LuaSocket 2.0,
- the <a href=#settimeout><tt>settimeout</tt></a>
--method affects the behavior of <tt>connect</tt>, causing it to return 
-+method affects the behavior of <tt>connect</tt>, causing it to return
- with an error in case of a timeout. If that happens, you can still call <a
- href=socket.html#select><tt>socket.select</tt></a> with the socket in the
- <tt>sendt</tt> table. The socket will be writable when the connection is
-@@ -209,13 +164,88 @@ established.
- 
- <p class=note>
- Note: Starting with LuaSocket 3.0, the host name resolution
--depends on whether the socket was created by <a
--href=#socket.tcp><tt>socket.tcp</tt></a> or <a
--href=#socket.tcp6><tt>socket.tcp6</tt></a>. Addresses from
--the appropriate family are tried in succession until the
--first success or until the last failure.
-+depends on whether the socket was created by
-+<a href=#socket.tcp><tt>socket.tcp</tt></a>,
-+<a href=#socket.tcp4><tt>socket.tcp4</tt></a> or
-+<a href=#socket.tcp6><tt>socket.tcp6</tt></a>. Addresses from
-+the appropriate family (or both) are tried in the order
-+returned by the resolver until the
-+first success or until the last failure. If the timeout was
-+set to zero, only the first address is tried.
-+</p>
-+
-+<!-- dirty +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+
-+<p class=name id="dirty">
-+master:<b>dirty()</b><br>
-+client:<b>dirty()</b><br>
-+server:<b>dirty()</b>
-+</p>
-+
-+<p class=description>
-+Check the read buffer status.
-+</p>
-+
-+<p class=return>
-+Returns <tt>true</tt> if there is any data in the read buffer, <tt>false</tt> otherwise.
-+</p>
-+
-+<p class=note>
-+Note: <b>This is an internal method, use at your own risk.</b>
-+</p>
-+
-+
-+<!-- getfd +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+
-+<p class=name id="getfd">
-+master:<b>getfd()</b><br>
-+client:<b>getfd()</b><br>
-+server:<b>getfd()</b>
-+</p>
-+
-+<p class=description>
-+Returns the underling socket descriptor or handle associated to the object.
-+</p>
-+
-+<p class=return>
-+The descriptor or handle. In case the object has been closed, the return will be -1.
-+</p>
-+
-+<p class=note>
-+Note: <b>This is an internal method. Unlikely to be
-+portable. Use at your own risk. </b>
-+</p>
-+
-+
-+<!-- getoption ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+
-+<p class=name id="getoption">
-+client:<b>getoption(</b>option)</b><br>
-+server:<b>getoption(</b>option)</b>
-+</p>
-+
-+<p class=description>
-+Gets options for the TCP object.
-+See <a href=#setoption><tt>setoption</tt></a> for description of the
-+option names and values.
-+</p>
-+
-+<p class=parameters>
-+<tt>Option</tt> is a string with the option name.
-+<ul>
-+
-+<li> '<tt>keepalive</tt>'
-+<li> '<tt>linger</tt>'
-+<li> '<tt>reuseaddr</tt>'
-+<li> '<tt>tcp-nodelay</tt>'
-+</ul>
-+
-+<p class=return>
-+The method returns the option <tt>value</tt> in case of success, or
-+<b><tt>nil</tt></b> followed by an error message otherwise.
- </p>
- 
-+
- <!-- getpeername ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
- <p class=name id="getpeername">
-@@ -227,10 +257,10 @@ Returns information about the remote side of a connected client object.
- </p>
- 
- <p class=return>
--Returns a string with the IP address of the peer, the 
--port number that peer is using for the connection, 
--and a string with the family ("<tt>inet</tt>" or "<tt>inet6</tt>"). 
--In case of error, the method returns <b><tt>nil</tt></b>. 
-+Returns a string with the IP address of the peer, the
-+port number that peer is using for the connection,
-+and a string with the family ("<tt>inet</tt>" or "<tt>inet6</tt>").
-+In case of error, the method returns <b><tt>nil</tt></b>.
- </p>
- 
- <p class=note>
-@@ -246,13 +276,13 @@ server:<b>getsockname()</b>
- </p>
- 
- <p class=description>
--Returns the local address information associated to the object. 
-+Returns the local address information associated to the object.
- </p>
- 
- <p class=return>
--The method returns a string with local IP address, a number with 
--the local port, 
--and a string with the family ("<tt>inet</tt>" or "<tt>inet6</tt>"). 
-+The method returns a string with local IP address, a number with
-+the local port,
-+and a string with the family ("<tt>inet</tt>" or "<tt>inet6</tt>").
- In case of error, the method returns <b><tt>nil</tt></b>.
- </p>
- 
-@@ -266,32 +296,46 @@ server:<b>getstats()</b><br>
- 
- <p class=description>
- Returns accounting information on the socket, useful for throttling
--of bandwidth. 
-+of bandwidth.
- </p>
- 
- <p class=return>
- The method returns the number of bytes received, the number of bytes sent,
--and the age of the socket object in seconds. 
-+and the age of the socket object in seconds.
- </p>
- 
-+<!-- gettimeout +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+
-+<p class=name id="gettimeout">
-+master:<b>gettimeout()</b><br>
-+client:<b>gettimeout()</b><br>
-+server:<b>gettimeout()</b>
-+</p>
-+
-+<p class=description>
-+Returns the current block timeout followed by the curent
-+total timeout.
-+</p>
-+
-+
- <!-- listen ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
--<p class=name id="listen"> 
-+<p class=name id="listen">
- master:<b>listen(</b>backlog<b>)</b>
- </p>
- 
- <p class=description>
- Specifies the socket is willing to receive connections, transforming the
--object into a server object.  Server objects support the 
--<a href=#accept><tt>accept</tt></a>,  
--<a href=#getsockname><tt>getsockname</tt></a>, 
--<a href=#setoption><tt>setoption</tt></a>, 
--<a href=#settimeout><tt>settimeout</tt></a>, 
--and <a href=#close><tt>close</tt></a> methods.  
-+object into a server object.  Server objects support the
-+<a href=#accept><tt>accept</tt></a>,
-+<a href=#getsockname><tt>getsockname</tt></a>,
-+<a href=#setoption><tt>setoption</tt></a>,
-+<a href=#settimeout><tt>settimeout</tt></a>,
-+and <a href=#close><tt>close</tt></a> methods.
- </p>
- 
- <p class=parameters>
--The parameter <tt>backlog</tt> specifies the  number  of  client 
-+The parameter <tt>backlog</tt> specifies the  number  of  client
- connections that can
- be queued waiting for service. If the queue is full and another  client
- attempts connection,  the connection is  refused.
-@@ -310,11 +354,11 @@ client:<b>receive(</b>[pattern [, prefix]]<b>)</b>
- 
- <p class=description>
- Reads data from a client object, according to the specified <em>read
--pattern</em>.  Patterns follow the Lua file I/O format, and the difference in performance between all patterns is negligible. 
-+pattern</em>.  Patterns follow the Lua file I/O format, and the difference in performance between all patterns is negligible.
- </p>
- 
- <p class=parameters>
--<tt>Pattern</tt> can be any of the following: 
-+<tt>Pattern</tt> can be any of the following:
- </p>
- 
- <ul>
-@@ -325,7 +369,7 @@ terminated by a  LF character (ASCII&nbsp;10), optionally  preceded by a
- CR character (ASCII&nbsp;13). The CR and LF characters are not included in
- the returned line. In fact, <em>all</em> CR characters are
- ignored by the pattern. This is the default pattern;
--<li> <tt>number</tt>:  causes the  method to read  a specified <tt>number</tt> 
-+<li> <tt>number</tt>:  causes the  method to read  a specified <tt>number</tt>
- of bytes from the socket.
- </ul>
- 
-@@ -347,10 +391,10 @@ closed  before  the transmission  was completed  or  the string
- <p class=note>
- <b>Important note</b>: This function was changed <em>severely</em>. It used
- to support multiple patterns (but I have never seen this feature used) and
--now it doesn't anymore.  Partial results used to be returned in the same 
-+now it doesn't anymore.  Partial results used to be returned in the same
- way as successful results. This last feature violated the idea that all
- functions should return <tt><b>nil</b></tt> on error.  Thus it was changed
--too. 
-+too.
- </p>
- 
- <!-- send +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-@@ -366,7 +410,7 @@ Sends <tt>data</tt> through client object.
- <p class=parameters>
- <tt>Data</tt> is the string to be sent. The optional arguments
- <tt>i</tt> and <tt>j</tt> work exactly like the standard
--<tt>string.sub</tt> Lua function to allow the selection of a 
-+<tt>string.sub</tt> Lua function to allow the selection of a
- substring to be sent.
- </p>
- 
-@@ -385,10 +429,10 @@ there was  a  timeout  during  the operation.
- </p>
- 
- <p class=note>
--Note: Output is <em>not</em> buffered. For small strings, 
--it is always better to concatenate them in Lua 
--(with the '<tt>..</tt>' operator) and send the result in one call 
--instead of calling the method several times. 
-+Note: Output is <em>not</em> buffered. For small strings,
-+it is always better to concatenate them in Lua
-+(with the '<tt>..</tt>' operator) and send the result in one call
-+instead of calling the method several times.
- </p>
- 
- <!-- setoption ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-@@ -400,12 +444,12 @@ server:<b>setoption(</b>option [, value]<b>)</b>
- 
- <p class=description>
- Sets options for the TCP object. Options are only needed by low-level or
--time-critical applications. You should only modify an option if you 
--are sure you need it. 
-+time-critical applications. You should only modify an option if you
-+are sure you need it.
- </p>
- 
- <p class=parameters>
--<tt>Option</tt> is a string with the option name, and <tt>value</tt> 
-+<tt>Option</tt> is a string with the option name, and <tt>value</tt>
- depends on the option being set:
- 
- <ul>
-@@ -413,7 +457,7 @@ depends on the option being set:
- <li> '<tt>keepalive</tt>':  Setting this option to <tt>true</tt> enables
- the periodic transmission of messages on a connected socket. Should the
- connected party fail to respond to these messages, the connection is
--considered broken and processes using the socket are notified; 
-+considered broken and processes using the socket are notified;
- 
- <li> '<tt>linger</tt>': Controls the action taken when unsent data are
- queued on a socket and a close is performed.  The value is a table with a
-@@ -424,13 +468,13 @@ it is able to transmit the data or until '<tt>timeout</tt>' has passed. If
- '<tt>on</tt>' is <tt>false</tt> and a close is issued, the system will
- process the close in a manner that allows the process to continue as
- quickly as possible. I do not advise you to set this to anything other than
--zero; 
-+zero;
- 
- <li> '<tt>reuseaddr</tt>': Setting this option indicates that the rules
--used in validating addresses supplied in a call to 
-+used in validating addresses supplied in a call to
- <a href=#bind><tt>bind</tt></a> should allow reuse of local addresses;
- 
--<li> '<tt>tcp-nodelay</tt>': Setting this option to <tt>true</tt> 
-+<li> '<tt>tcp-nodelay</tt>': Setting this option to <tt>true</tt>
- disables the Nagle's algorithm for the connection;
- 
- <li> '<tt>ipv6-v6only</tt>':
-@@ -447,34 +491,6 @@ followed by an error message otherwise.
- Note: The descriptions above come from the man pages.
- </p>
- 
--<!-- getoption ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
--
--<p class=name id="getoption">
--client:<b>getoption(</b>option)</b><br>
--server:<b>getoption(</b>option)</b>
--</p>
--
--<p class=description>
--Gets options for the TCP object.
--See <a href=#setoption><tt>setoption</tt></a> for description of the
--option names and values.
--</p>
--
--<p class=parameters>
--<tt>Option</tt> is a string with the option name.
--<ul>
--
--<li> '<tt>keepalive</tt>'
--<li> '<tt>linger</tt>'
--<li> '<tt>reuseaddr</tt>'
--<li> '<tt>tcp-nodelay</tt>'
--</ul>
--
--<p class=return>
--The method returns the option <tt>value</tt> in case of success, or
--<b><tt>nil</tt></b> followed by an error message otherwise.
--</p>
--
- <!-- setstats +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
- <p class=name id="setstats">
-@@ -485,7 +501,7 @@ server:<b>setstats(</b>received, sent, age<b>)</b><br>
- 
- <p class=description>
- Resets accounting information on the socket, useful for throttling
--of bandwidth. 
-+of bandwidth.
- </p>
- 
- <p class=parameters>
-@@ -495,7 +511,7 @@ of bandwidth.
- </p>
- 
- <p class=return>
--The method returns 1 in case of success and <tt><b>nil</b></tt> otherwise. 
-+The method returns 1 in case of success and <tt><b>nil</b></tt> otherwise.
- </p>
- 
- <!-- settimeout +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-@@ -509,8 +525,8 @@ server:<b>settimeout(</b>value [, mode]<b>)</b>
- <p class=description>
- Changes the timeout  values for the object. By default,
- all I/O  operations are  blocking. That  is, any  call to  the methods
--<a href=#send><tt>send</tt></a>, 
--<a href=#receive><tt>receive</tt></a>, and 
-+<a href=#send><tt>send</tt></a>,
-+<a href=#receive><tt>receive</tt></a>, and
- <a href=#accept><tt>accept</tt></a>
- will  block indefinitely,  until the operation completes.  The
- <tt>settimeout</tt>  method defines a  limit on the  amount  of   time  the
-@@ -521,7 +537,7 @@ time has elapsed, the affected methods give up and fail with an error code.
- <p class=parameters>
- The amount of time to wait is specified  as  the
- <tt>value</tt> parameter, in seconds. There  are two timeout  modes and
--both can be used together for fine tuning: 
-+both can be used together for fine tuning:
- </p>
- 
- <ul>
-@@ -532,7 +548,7 @@ default mode;</li>
- 
- <li> '<tt>t</tt>':  <em>total</em> timeout. Specifies the  upper limit on
- the amount of  time LuaSocket can block a Lua  script before returning from
--a call.</li> 
-+a call.</li>
- </ul>
- 
- <p class=parameters>
-@@ -562,7 +578,7 @@ client:<b>shutdown(</b>mode<b>)</b><br>
- </p>
- 
- <p class=description>
--Shuts down part of a full-duplex connection. 
-+Shuts down part of a full-duplex connection.
- </p>
- 
- <p class=parameters>
-@@ -579,66 +595,107 @@ This is the default mode;
- This function returns 1.
- </p>
- 
--<!-- dirty +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+<!-- setfd +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
--<p class=name id="dirty">
--master:<b>dirty()</b><br>
--client:<b>dirty()</b><br>
--server:<b>dirty()</b>
-+<p class=name id="setfd">
-+master:<b>setfd(</b>fd<b>)</b><br>
-+client:<b>setfd(</b>fd<b>)</b><br>
-+server:<b>setfd(</b>fd<b>)</b>
- </p>
- 
- <p class=description>
--Check the read buffer status.
-+Sets the underling socket descriptor or handle associated to the object. The current one is simply replaced, not closed, and no other change to the object state is made.
- </p>
- 
- <p class=return>
--Returns <tt>true</tt> if there is any data in the read buffer, <tt>false</tt> otherwise.
-+No return value.
- </p>
- 
- <p class=note>
--Note: <b>This is an internal method, any use is unlikely to be portable.</b>
-+Note: <b>This is an internal method. Unlikely to be
-+portable. Use at your own risk. </b>
- </p>
- 
--<!-- getfd +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+<!-- socket.tcp +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
--<p class=name id="getfd">
--master:<b>getfd()</b><br>
--client:<b>getfd()</b><br>
--server:<b>getfd()</b>
-+<p class=name id="socket.tcp">
-+socket.<b>tcp()</b>
- </p>
- 
- <p class=description>
--Returns the underling socket descriptor or handle associated to the object. 
--</p>
-+Creates and returns an TCP master object. A master object can
-+be transformed into a server object with the method
-+<a href=#listen><tt>listen</tt></a> (after a call to <a
-+href=#bind><tt>bind</tt></a>) or into a client object with
-+the method <a href=#connect><tt>connect</tt></a>. The only other
-+method supported by a master object is the
-+<a href=#close><tt>close</tt></a> method.</p>
- 
- <p class=return>
--The descriptor or handle. In case the object has been closed, the return will be -1.
-+In case of success, a new master object is returned. In case of error,
-+<b><tt>nil</tt></b> is returned, followed by an error message.
- </p>
- 
- <p class=note>
--Note: <b>This is an internal method, any use is unlikely to be portable.</b>
-+Note: The choice between IPv4 and IPv6 happens during a call to
-+<a href=#bind><tt>bind</tt></a> or <a
-+href=#bind><tt>connect</tt></a>, depending on the address
-+family obtained from the resolver.
- </p>
- 
--<!-- setfd +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+<p class=note>
-+Note: Before the choice between IPv4 and IPv6 happens,
-+the internal socket object is invalid and therefore <a
-+href=#setoption><tt>setoption</tt></a> will fail.
-+</p>
- 
--<p class=name id="setfd">
--master:<b>setfd(</b>fd<b>)</b><br>
--client:<b>setfd(</b>fd<b>)</b><br>
--server:<b>setfd(</b>fd<b>)</b>
-+<!-- socket.tcp +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+
-+<p class=name id="socket.tcp4">
-+socket.<b>tcp4()</b>
- </p>
- 
- <p class=description>
--Sets the underling socket descriptor or handle associated to the object. The current one is simply replaced, not closed, and no other change to the object state is made.
-+Creates and returns an IPv4 TCP master object. A master object can
-+be transformed into a server object with the method
-+<a href=#listen><tt>listen</tt></a> (after a call to <a
-+href=#bind><tt>bind</tt></a>) or into a client object with
-+the method <a href=#connect><tt>connect</tt></a>. The only other
-+method supported by a master object is the
-+<a href=#close><tt>close</tt></a> method.</p>
-+
-+<p class=return>
-+In case of success, a new master object is returned. In case of error,
-+<b><tt>nil</tt></b> is returned, followed by an error message.
-+</p>
-+
-+<!-- socket.tcp6 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+
-+<p class=name id="socket.tcp6">
-+socket.<b>tcp6()</b>
- </p>
- 
-+<p class=description>
-+Creates and returns an IPv6 TCP master object. A master object can
-+be transformed into a server object with the method
-+<a href=#listen><tt>listen</tt></a> (after a call to <a
-+href=#bind><tt>bind</tt></a>) or into a client object with
-+the method <a href=#connect><tt>connect</tt></a>. The only other
-+method supported by a master object is the
-+<a href=#close><tt>close</tt></a> method.</p>
-+
- <p class=return>
--No return value.
-+In case of success, a new master object is returned. In case of error,
-+<b><tt>nil</tt></b> is returned, followed by an error message.
- </p>
- 
- <p class=note>
--Note: <b>This is an internal method, any use is unlikely to be portable.</b>
-+Note: The TCP object returned will have the option
-+"<tt>ipv6-v6only</tt>" set to <tt><b>true</b></tt>.
- </p>
- 
-+
-+
- <!-- footer +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
- <div class=footer>
-diff --git a/doc/udp.html b/doc/udp.html
-index e5b0ad0..4618aad 100644
---- a/doc/udp.html
-+++ b/doc/udp.html
-@@ -4,7 +4,7 @@
- 
- <head>
- <meta name="description" content="LuaSocket: The UDP support">
--<meta name="keywords" content="Lua, LuaSocket, Socket, UDP, Library, Network, Support"> 
-+<meta name="keywords" content="Lua, LuaSocket, Socket, UDP, Library, Network, Support">
- <title>LuaSocket: UDP support</title>
- <link rel="stylesheet" href="reference.css" type="text/css">
- </head>
-@@ -28,7 +28,7 @@
- <a href="index.html#download">download</a> &middot;
- <a href="installation.html">installation</a> &middot;
- <a href="introduction.html">introduction</a> &middot;
--<a href="reference.html">reference</a> 
-+<a href="reference.html">reference</a>
- </p>
- </center>
- <hr>
-@@ -37,74 +37,7 @@
- 
- <!-- udp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
--<h2 id="udp">UDP</h2> 
--
--<!-- socket.udp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
--
--<p class="name" id="socket.udp">
--socket.<b>udp()</b>
--</p>
--
--<p class="description">
--Creates and returns an unconnected IPv4 UDP object. 
--Unconnected objects support the 
--<a href="#sendto"><tt>sendto</tt></a>, 
--<a href="#receive"><tt>receive</tt></a>, 
--<a href="#receivefrom"><tt>receivefrom</tt></a>, 
--<a href="#getoption"><tt>getoption</tt></a>, 
--<a href="#getsockname"><tt>getsockname</tt></a>, 
--<a href="#setoption"><tt>setoption</tt></a>, 
--<a href="#settimeout"><tt>settimeout</tt></a>, 
--<a href="#setpeername"><tt>setpeername</tt></a>, 
--<a href="#setsockname"><tt>setsockname</tt></a>, and 
--<a href="#close"><tt>close</tt></a>. 
--The <a href="#setpeername"><tt>setpeername</tt></a> 
--is used to connect the object.
--</p>
--
--<p class="return">
--In case of success, a new unconnected UDP object
--returned. In case of error, <b><tt>nil</tt></b> is returned, followed by
--an error message.
--</p>
--
--<!-- socket.udp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
--
--<p class="name" id="socket.udp6">
--socket.<b>udp6()</b>
--</p>
--
--<p class="description">
--Creates and returns an unconnected IPv6 UDP object. 
--Unconnected objects support the 
--<a href="#sendto"><tt>sendto</tt></a>, 
--<a href="#receive"><tt>receive</tt></a>, 
--<a href="#receivefrom"><tt>receivefrom</tt></a>, 
--<a href="#getoption"><tt>getoption</tt></a>, 
--<a href="#getsockname"><tt>getsockname</tt></a>, 
--<a href="#setoption"><tt>setoption</tt></a>, 
--<a href="#settimeout"><tt>settimeout</tt></a>, 
--<a href="#setpeername"><tt>setpeername</tt></a>, 
--<a href="#setsockname"><tt>setsockname</tt></a>, and 
--<a href="#close"><tt>close</tt></a>. 
--The <a href="#setpeername"><tt>setpeername</tt></a> 
--is used to connect the object.
--</p>
--
--<p class="return">
--In case of success, a new unconnected UDP object
--returned. In case of error, <b><tt>nil</tt></b> is returned, followed by
--an error message.
--</p>
--
--<p class=note>
--Note: The TCP object returned will have the option
--"<tt>ipv6-v6only</tt>" set to <tt><b>true</b></tt>.
--</p>
--
--
--
--<!-- close +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+<h2 id="udp">UDP</h2>
- 
- <!-- close +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
-@@ -129,6 +62,40 @@ Garbage-collected objects are automatically closed before
- destruction, though.
- </p>
- 
-+<!-- getoption +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+
-+<p class="name" id="getoption">
-+connected:<b>getoption()</b><br>
-+unconnected:<b>getoption()</b>
-+</p>
-+
-+<p class="description">
-+Gets an option value from the UDP object.
-+See <a href=#setoption><tt>setoption</tt></a> for
-+description of the option names and values.
-+</p>
-+
-+<p class="parameters"><tt>Option</tt> is a string with the option name.
-+<ul>
-+<li> '<tt>dontroute</tt>'
-+<li> '<tt>broadcast</tt>'
-+<li> '<tt>reuseaddr</tt>'
-+<li> '<tt>reuseport</tt>'
-+<li> '<tt>ip-multicast-loop</tt>'
-+<li> '<tt>ipv6-v6only</tt>'
-+<li> '<tt>ip-multicast-if</tt>'
-+<li> '<tt>ip-multicast-ttl</tt>'
-+<li> '<tt>ip-add-membership</tt>'
-+<li> '<tt>ip-drop-membership</tt>'
-+</ul>
-+</p>
-+
-+<p class=return>
-+The method returns the option <tt>value</tt> in case of
-+success, or
-+<b><tt>nil</tt></b> followed by an error message otherwise.
-+</p>
-+
- <!-- getpeername +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
- <p class="name" id="getpeername">
-@@ -142,10 +109,10 @@ associated with a connected UDP object.
- 
- 
- <p class=return>
--Returns a string with the IP address of the peer, the 
--port number that peer is using for the connection, 
--and a string with the family ("<tt>inet</tt>" or "<tt>inet6</tt>"). 
--In case of error, the method returns <b><tt>nil</tt></b>. 
-+Returns a string with the IP address of the peer, the
-+port number that peer is using for the connection,
-+and a string with the family ("<tt>inet</tt>" or "<tt>inet6</tt>").
-+In case of error, the method returns <b><tt>nil</tt></b>.
- </p>
- 
- <p class="note">
-@@ -165,9 +132,9 @@ Returns the local address information associated to the object.
- 
- 
- <p class=return>
--The method returns a string with local IP address, a number with 
--the local port, 
--and a string with the family ("<tt>inet</tt>" or "<tt>inet6</tt>"). 
-+The method returns a string with local IP address, a number with
-+the local port,
-+and a string with the family ("<tt>inet</tt>" or "<tt>inet6</tt>").
- In case of error, the method returns <b><tt>nil</tt></b>.
- </p>
- 
-@@ -179,6 +146,18 @@ first time (in which case it is bound to an ephemeral port and the
- wild-card address).
- </p>
- 
-+<!-- gettimeout +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+
-+<p class=name id="gettimeout">
-+connected:<b>settimeout(</b>value<b>)</b><br>
-+unconnected:<b>settimeout(</b>value<b>)</b>
-+</p>
-+
-+<p class=description>
-+Returns the current timeout value.
-+</p>
-+
-+
- <!-- receive +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
- <p class="name" id="receive">
-@@ -199,9 +178,12 @@ specifies the maximum size of the datagram to be retrieved. If
- there are more than <tt>size</tt> bytes available in the datagram,
- the excess bytes are discarded. If there are less then
- <tt>size</tt> bytes available in the current datagram, the
--available bytes are returned. If <tt>size</tt> is omitted, the
--maximum datagram size is used (which is currently limited by the
--implementation to 8192 bytes).
-+available bytes are returned.
-+If <tt>size</tt> is omitted, the
-+compile-time constant <a
-+href=socket.html#datagramsize><tt>socket._DATAGRAMSIZE</tt></a> is used
-+(it defaults to 8192 bytes). Larger sizes will cause a
-+temporary buffer to be allocated for the operation.
- </p>
- 
- <p class="return">
-@@ -217,46 +199,12 @@ unconnected:<b>receivefrom(</b>[size]<b>)</b>
- </p>
- 
- <p class="description">
--Works exactly as the <a href="#receive"><tt>receive</tt></a> 
-+Works exactly as the <a href="#receive"><tt>receive</tt></a>
- method, except it returns the IP
- address and port as extra return values (and is therefore slightly less
- efficient).
- </p>
- 
--<!-- getoption +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
--
--<p class="name" id="getoption">
--connected:<b>getoption()</b><br>
--unconnected:<b>getoption()</b>
--</p>
--
--<p class="description">
--Gets an option value from the UDP object.
--See <a href=#setoption><tt>setoption</tt></a> for
--description of the option names and values.
--</p>
--
--<p class="parameters"><tt>Option</tt> is a string with the option name. 
--<ul>
--<li> '<tt>dontroute</tt>'
--<li> '<tt>broadcast</tt>'
--<li> '<tt>reuseaddr</tt>'
--<li> '<tt>reuseport</tt>'
--<li> '<tt>ip-multicast-loop</tt>'
--<li> '<tt>ipv6-v6only</tt>'
--<li> '<tt>ip-multicast-if</tt>'
--<li> '<tt>ip-multicast-ttl</tt>'
--<li> '<tt>ip-add-membership</tt>' 
--<li> '<tt>ip-drop-membership</tt>'
--</ul> 
--</p>
--
--<p class=return>
--The method returns the option <tt>value</tt> in case of
--success, or
--<b><tt>nil</tt></b> followed by an error message otherwise.
--</p>
--
- <!-- send ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
- <p class="name" id="send">
-@@ -268,7 +216,7 @@ Sends a datagram to the UDP peer of a connected object.
- </p>
- 
- <p class="parameters">
--<tt>Datagram</tt> is a string with the datagram contents. 
-+<tt>Datagram</tt> is a string with the datagram contents.
- The maximum datagram size for UDP is 64K minus IP layer overhead.
- However datagrams larger than the link layer packet size will be
- fragmented, which may deteriorate performance and/or reliability.
-@@ -298,11 +246,11 @@ Sends a datagram to the specified IP address and port number.
- 
- <p class="parameters">
- <tt>Datagram</tt> is a string with the
--datagram contents. 
-+datagram contents.
- The maximum datagram size for UDP is 64K minus IP layer overhead.
- However datagrams larger than the link layer packet size will be
- fragmented, which may deteriorate performance and/or reliability.
--<tt>Ip</tt> is the IP address of the recipient. 
-+<tt>Ip</tt> is the IP address of the recipient.
- Host names are <em>not</em> allowed for performance reasons.
- 
- <tt>Port</tt> is the port number at the recipient.
-@@ -320,6 +268,75 @@ refuses to send a message to the specified address (i.e. no
- interface accepts the address).
- </p>
- 
-+<!-- setoption +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+
-+<p class="name" id="setoption">
-+connected:<b>setoption(</b>option [, value]<b>)</b><br>
-+unconnected:<b>setoption(</b>option [, value]<b>)</b>
-+</p>
-+
-+<p class="description">
-+Sets options for the UDP object. Options are
-+only needed by low-level or time-critical applications. You should
-+only modify an option if you are sure you need it.</p>
-+<p class="parameters"><tt>Option</tt> is a string with the option
-+name, and <tt>value</tt> depends on the option being set:
-+</p>
-+
-+<ul>
-+<li> '<tt>dontroute</tt>': Indicates that outgoing
-+messages should bypass the standard routing facilities.
-+Receives a boolean value;
-+<li> '<tt>broadcast</tt>': Requests permission to send
-+broadcast datagrams on the socket.
-+Receives a boolean value;
-+<li> '<tt>reuseaddr</tt>': Indicates that the rules used in
-+validating addresses supplied in a <tt>bind()</tt> call
-+should allow reuse of local addresses.
-+Receives a boolean value;
-+<li> '<tt>reuseport</tt>': Allows completely duplicate
-+bindings by multiple processes if they all set
-+'<tt>reuseport</tt>' before binding the port.
-+Receives a boolean value;
-+<li> '<tt>ip-multicast-loop</tt>':
-+Specifies whether or not a copy of an outgoing multicast
-+datagram is delivered to the sending host as long as it is a
-+member of the multicast group.
-+Receives a boolean value;
-+<li> '<tt>ipv6-v6only</tt>':
-+Specifies whether to restrict <tt>inet6</tt> sockets to
-+sending and receiving only IPv6 packets.
-+Receive a boolean value;
-+<li> '<tt>ip-multicast-if</tt>':
-+Sets the interface over which outgoing multicast datagrams
-+are sent.
-+Receives an IP address;
-+<li> '<tt>ip-multicast-ttl</tt>':
-+Sets the Time To Live in the IP header for outgoing
-+multicast datagrams.
-+Receives a number;
-+<li> '<tt>ip-add-membership</tt>':
-+Joins the multicast group specified.
-+Receives a table with fields
-+<tt>multiaddr</tt> and <tt>interface</tt>, each containing an
-+IP address;
-+<li> '<tt>ip-drop-membership</tt>': Leaves the multicast
-+group specified.
-+Receives a table with fields
-+<tt>multiaddr</tt> and <tt>interface</tt>, each containing an
-+IP address.
-+</ul>
-+
-+<p class="return">
-+The method returns 1 in case of success, or
-+<b><tt>nil</tt></b> followed by an error message otherwise.
-+</p>
-+
-+<p class=note>
-+Note: The descriptions above come from the man pages.
-+</p>
-+
-+
- <!-- setpeername +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
- <p class="name" id="setpeername">
-@@ -337,9 +354,9 @@ object or vice versa.
- For connected objects, outgoing datagrams
- will be sent to the specified peer, and datagrams received from
- other peers will be discarded by the OS. Connected UDP objects must
--use the <a href="#send"><tt>send</tt></a> and 
--<a href="#receive"><tt>receive</tt></a> methods instead of 
--<a href="#sendto"><tt>sendto</tt></a> and 
-+use the <a href="#send"><tt>send</tt></a> and
-+<a href="#receive"><tt>receive</tt></a> methods instead of
-+<a href="#sendto"><tt>sendto</tt></a> and
- <a href="#receivefrom"><tt>receivefrom</tt></a>.
- </p>
- 
-@@ -406,74 +423,6 @@ system or explicitly by <tt>setsockname</tt>, it cannot be
- changed.
- </p>
- 
--<!-- setoption +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
--
--<p class="name" id="setoption">
--connected:<b>setoption(</b>option [, value]<b>)</b><br>
--unconnected:<b>setoption(</b>option [, value]<b>)</b>
--</p>
--
--<p class="description">
--Sets options for the UDP object. Options are
--only needed by low-level or time-critical applications. You should
--only modify an option if you are sure you need it.</p>
--<p class="parameters"><tt>Option</tt> is a string with the option
--name, and <tt>value</tt> depends on the option being set:
--</p>
--
--<ul> 
--<li> '<tt>dontroute</tt>': Indicates that outgoing
--messages should bypass the standard routing facilities.
--Receives a boolean value;
--<li> '<tt>broadcast</tt>': Requests permission to send 
--broadcast datagrams on the socket.
--Receives a boolean value;
--<li> '<tt>reuseaddr</tt>': Indicates that the rules used in
--validating addresses supplied in a <tt>bind()</tt> call 
--should allow reuse of local addresses. 
--Receives a boolean value;
--<li> '<tt>reuseport</tt>': Allows completely duplicate
--bindings by multiple processes if they all set
--'<tt>reuseport</tt>' before binding the port.
--Receives a boolean value;
--<li> '<tt>ip-multicast-loop</tt>':
--Specifies whether or not a copy of an outgoing multicast
--datagram is delivered to the sending host as long as it is a
--member of the multicast group.
--Receives a boolean value;
--<li> '<tt>ipv6-v6only</tt>':
--Specifies whether to restrict <tt>inet6</tt> sockets to 
--sending and receiving only IPv6 packets.
--Receive a boolean value;
--<li> '<tt>ip-multicast-if</tt>':
--Sets the interface over which outgoing multicast datagrams
--are sent.
--Receives an IP address;
--<li> '<tt>ip-multicast-ttl</tt>':
--Sets the Time To Live in the IP header for outgoing
--multicast datagrams. 
--Receives a number;
--<li> '<tt>ip-add-membership</tt>': 
--Joins the multicast group specified.
--Receives a table with fields
--<tt>multiaddr</tt> and <tt>interface</tt>, each containing an
--IP address;
--<li> '<tt>ip-drop-membership</tt>': Leaves the multicast
--group specified.
--Receives a table with fields
--<tt>multiaddr</tt> and <tt>interface</tt>, each containing an
--IP address.
--</ul> 
--
--<p class="return">
--The method returns 1 in case of success, or
--<b><tt>nil</tt></b> followed by an error message otherwise.
--</p>
--
--<p class=note>
--Note: The descriptions above come from the man pages.
--</p>
--
- <!-- settimeout +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
- <p class="name" id="settimeout">
-@@ -482,14 +431,14 @@ unconnected:<b>settimeout(</b>value<b>)</b>
- </p>
- 
- <p class="description">
--Changes the timeout values for the object.  By default, the 
--<a href="#receive"><tt>receive</tt></a> and 
--<a href="#receivefrom"><tt>receivefrom</tt></a> 
-+Changes the timeout values for the object.  By default, the
-+<a href="#receive"><tt>receive</tt></a> and
-+<a href="#receivefrom"><tt>receivefrom</tt></a>
- operations are blocking. That is, any call to the methods will block
- indefinitely, until data arrives.  The <tt>settimeout</tt> function defines
- a limit on the amount of time the functions can block. When a timeout is
- set and the specified amount of time has elapsed, the affected methods
--give up and fail with an error code.  
-+give up and fail with an error code.
- </p>
- 
- <p class="parameters">
-@@ -514,6 +463,114 @@ all other method names already contained verbs making their
- imperative nature obvious.
- </p>
- 
-+<!-- socket.udp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+
-+<p class="name" id="socket.udp">
-+socket.<b>udp()</b>
-+</p>
-+
-+<p class="description">
-+Creates and returns an unconnected UDP object.
-+Unconnected objects support the
-+<a href="#sendto"><tt>sendto</tt></a>,
-+<a href="#receive"><tt>receive</tt></a>,
-+<a href="#receivefrom"><tt>receivefrom</tt></a>,
-+<a href="#getoption"><tt>getoption</tt></a>,
-+<a href="#getsockname"><tt>getsockname</tt></a>,
-+<a href="#setoption"><tt>setoption</tt></a>,
-+<a href="#settimeout"><tt>settimeout</tt></a>,
-+<a href="#setpeername"><tt>setpeername</tt></a>,
-+<a href="#setsockname"><tt>setsockname</tt></a>, and
-+<a href="#close"><tt>close</tt></a>.
-+The <a href="#setpeername"><tt>setpeername</tt></a>
-+is used to connect the object.
-+</p>
-+
-+<p class="return">
-+In case of success, a new unconnected UDP object
-+returned. In case of error, <b><tt>nil</tt></b> is returned, followed by
-+an error message.
-+</p>
-+
-+<p class=note>
-+Note: The choice between IPv4 and IPv6 happens during a call to
-+<a href=#sendto><tt>sendto</tt></a>, <a
-+href=#setpeername><tt>setpeername</tt></a>, or <a
-+href=#setsockname><tt>sockname</tt></a>, depending on the address
-+family obtained from the resolver.
-+</p>
-+
-+<p class=note>
-+Note: Before the choice between IPv4 and IPv6 happens,
-+the internal socket object is invalid and therefore <a
-+href=#setoption><tt>setoption</tt></a> will fail.
-+</p>
-+
-+<!-- socket.udp4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+
-+<p class="name" id="socket.udp">
-+socket.<b>udp4()</b>
-+</p>
-+
-+<p class="description">
-+Creates and returns an unconnected IPv4 UDP object.
-+Unconnected objects support the
-+<a href="#sendto"><tt>sendto</tt></a>,
-+<a href="#receive"><tt>receive</tt></a>,
-+<a href="#receivefrom"><tt>receivefrom</tt></a>,
-+<a href="#getoption"><tt>getoption</tt></a>,
-+<a href="#getsockname"><tt>getsockname</tt></a>,
-+<a href="#setoption"><tt>setoption</tt></a>,
-+<a href="#settimeout"><tt>settimeout</tt></a>,
-+<a href="#setpeername"><tt>setpeername</tt></a>,
-+<a href="#setsockname"><tt>setsockname</tt></a>, and
-+<a href="#close"><tt>close</tt></a>.
-+The <a href="#setpeername"><tt>setpeername</tt></a>
-+is used to connect the object.
-+</p>
-+
-+<p class="return">
-+In case of success, a new unconnected UDP object
-+returned. In case of error, <b><tt>nil</tt></b> is returned, followed by
-+an error message.
-+</p>
-+
-+<!-- socket.udp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-+
-+<p class="name" id="socket.udp6">
-+socket.<b>udp6()</b>
-+</p>
-+
-+<p class="description">
-+Creates and returns an unconnected IPv6 UDP object.
-+Unconnected objects support the
-+<a href="#sendto"><tt>sendto</tt></a>,
-+<a href="#receive"><tt>receive</tt></a>,
-+<a href="#receivefrom"><tt>receivefrom</tt></a>,
-+<a href="#getoption"><tt>getoption</tt></a>,
-+<a href="#getsockname"><tt>getsockname</tt></a>,
-+<a href="#setoption"><tt>setoption</tt></a>,
-+<a href="#settimeout"><tt>settimeout</tt></a>,
-+<a href="#setpeername"><tt>setpeername</tt></a>,
-+<a href="#setsockname"><tt>setsockname</tt></a>, and
-+<a href="#close"><tt>close</tt></a>.
-+The <a href="#setpeername"><tt>setpeername</tt></a>
-+is used to connect the object.
-+</p>
-+
-+<p class="return">
-+In case of success, a new unconnected UDP object
-+returned. In case of error, <b><tt>nil</tt></b> is returned, followed by
-+an error message.
-+</p>
-+
-+<p class=note>
-+Note: The TCP object returned will have the option
-+"<tt>ipv6-v6only</tt>" set to <tt><b>true</b></tt>.
-+</p>
-+
-+
-+
- <!-- footer ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
- <div class=footer>
-@@ -524,7 +581,7 @@ imperative nature obvious.
- <a href="index.html#download">download</a> &middot;
- <a href="installation.html">installation</a> &middot;
- <a href="introduction.html">introduction</a> &middot;
--<a href="reference.html">reference</a> 
-+<a href="reference.html">reference</a>
- </p>
- <p>
- <small>
-diff --git a/etc/dispatch.lua b/etc/dispatch.lua
-index cab7f59..2485415 100644
---- a/etc/dispatch.lua
-+++ b/etc/dispatch.lua
-@@ -5,6 +5,7 @@
- -----------------------------------------------------------------------------
- local base = _G
- local table = require("table")
-+local string = require("string")
- local socket = require("socket")
- local coroutine = require("coroutine")
- module("dispatch")
-@@ -43,26 +44,32 @@ end
- -----------------------------------------------------------------------------
- -- Mega hack. Don't try to do this at home.
- -----------------------------------------------------------------------------
---- we can't yield across calls to protect, so we rewrite it with coxpcall
-+-- we can't yield across calls to protect on Lua 5.1, so we rewrite it with
-+-- coroutines
- -- make sure you don't require any module that uses socket.protect before
- -- loading our hack
--function socket.protect(f)
--  return function(...)
--    local co = coroutine.create(f)
--    while true do
--      local results = {coroutine.resume(co, ...)}
--      local status = table.remove(results, 1)
--      if not status then
--        if base.type(results[1]) == 'table' then
--          return nil, results[1][1]
--        else base.error(results[1]) end
--      end
--      if coroutine.status(co) == "suspended" then
--        arg = {coroutine.yield(base.unpack(results))}
-+if string.sub(base._VERSION, -3) == "5.1" then
-+  local function _protect(co, status, ...)
-+    if not status then
-+      local msg = ...
-+      if base.type(msg) == 'table' then
-+        return nil, msg[1]
-       else
--        return base.unpack(results)
-+        base.error(msg, 0)
-       end
-     end
-+    if coroutine.status(co) == "suspended" then
-+      return _protect(co, coroutine.resume(co, coroutine.yield(...)))
-+    else
-+      return ...
-+    end
-+  end
-+
-+  function socket.protect(f)
-+    return function(...)
-+      local co = coroutine.create(f)
-+      return _protect(co, coroutine.resume(co, ...))
-+    end
-   end
- end
- 
-diff --git a/linux.cmd b/linux.cmd
-index bd59adc..6c6636b 100644
---- a/linux.cmd
-+++ b/linux.cmd
-@@ -1 +1 @@
--make PLAT=linux DEBUG=DEBUG LUAINC_linux_base=/home/diego/build/linux/include LUAPREFIX_linux=/home/diego/build/linux
-+make PLAT=linux DEBUG=DEBUG LUAINC_linux_base=/home/diego/build/ubuntu/include LUAPREFIX_linux=/home/diego/build/ubuntu
-diff --git a/luasocket-scm-0.rockspec b/luasocket-scm-0.rockspec
-index f86567b..352a497 100644
---- a/luasocket-scm-0.rockspec
-+++ b/luasocket-scm-0.rockspec
-@@ -50,13 +50,12 @@ local function make_plat(plat)
- 	}
- 	local modules = {
- 		["socket.core"] = {
--			sources = { "src/luasocket.c", "src/timeout.c", "src/buffer.c", "src/io.c", "src/auxiliar.c",
--						"src/options.c", "src/inet.c", "src/except.c", "src/select.c", "src/tcp.c", "src/udp.c" },
-+			sources = { "src/luasocket.c", "src/timeout.c", "src/buffer.c", "src/io.c", "src/auxiliar.c", "src/options.c", "src/inet.c", "src/except.c", "src/select.c", "src/tcp.c", "src/udp.c", "src/compat.c" },
- 			defines = defines[plat],
- 			incdir = "/src"
- 		},
--		["mime.core"] = { 
--			sources = { "src/mime.c" },
-+		["mime.core"] = {
-+			sources = { "src/mime.c", "src/compat.c" },
- 			defines = defines[plat],
- 			incdir = "/src"
- 		},
-@@ -73,14 +72,12 @@ local function make_plat(plat)
- 	if plat == "unix" or plat == "macosx" then
- 	    modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/usocket.c"
- 		modules["socket.unix"] = {
--		  sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", 
--					  "src/usocket.c", "src/unix.c" },
-+		  sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", "src/usocket.c", "src/unix.c" },
- 		  defines = defines[plat],
- 		  incdir = "/src"
- 		}
- 		modules["socket.serial"] = {
--		  sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c",
--					  "src/io.c", "src/usocket.c", "src/serial.c" },
-+		  sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", "src/usocket.c", "src/serial.c" },
- 		  defines = defines[plat],
- 		  incdir = "/src"
- 		}
-diff --git a/makefile b/makefile
-index 04cd894..cc15b4e 100644
---- a/makefile
-+++ b/makefile
-@@ -5,12 +5,12 @@
- # Targets:
- #   install            install system independent support
- #   install-unix           also install unix-only support
--#   install-both       install for both lua5.1 and lua5.2 
--#   install-both-unix      also install unix-only 
-+#   install-both       install for lua51 lua52 lua53
-+#   install-both-unix      also install unix-only
- #   print	           print the build settings
- 
- PLAT?= linux
--PLATS= macosx linux win32 mingw
-+PLATS= macosx linux win32 mingw freebsd solaris
- 
- all: $(PLAT)
- 
-@@ -24,20 +24,26 @@ test:
- 	lua test/hello.lua
- 
- install-both:
--	$(MAKE) clean 
-+	$(MAKE) clean
- 	@cd src; $(MAKE) $(PLAT) LUAV=5.1
- 	@cd src; $(MAKE) install LUAV=5.1
--	$(MAKE) clean 
-+	$(MAKE) clean
- 	@cd src; $(MAKE) $(PLAT) LUAV=5.2
- 	@cd src; $(MAKE) install LUAV=5.2
-+	$(MAKE) clean
-+	@cd src; $(MAKE) $(PLAT) LUAV=5.3
-+	@cd src; $(MAKE) install LUAV=5.3
- 
- install-both-unix:
--	$(MAKE) clean 
-+	$(MAKE) clean
- 	@cd src; $(MAKE) $(PLAT) LUAV=5.1
- 	@cd src; $(MAKE) install-unix LUAV=5.1
--	$(MAKE) clean 
-+	$(MAKE) clean
- 	@cd src; $(MAKE) $(PLAT) LUAV=5.2
- 	@cd src; $(MAKE) install-unix LUAV=5.2
-+	$(MAKE) clean
-+	@cd src; $(MAKE) $(PLAT) LUAV=5.3
-+	@cd src; $(MAKE) install-unix LUAV=5.3
- 
- .PHONY: test
- 
-diff --git a/src/auxiliar.c b/src/auxiliar.c
-index de625e9..18fa8e4 100644
---- a/src/auxiliar.c
-+++ b/src/auxiliar.c
-@@ -26,7 +26,7 @@ void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func) {
-     luaL_newmetatable(L, classname); /* mt */
-     /* create __index table to place methods */
-     lua_pushstring(L, "__index");    /* mt,"__index" */
--    lua_newtable(L);                 /* mt,"__index",it */ 
-+    lua_newtable(L);                 /* mt,"__index",it */
-     /* put class name into class metatable */
-     lua_pushstring(L, "class");      /* mt,"__index",it,"class" */
-     lua_pushstring(L, classname);    /* mt,"__index",it,"class",classname */
-@@ -84,7 +84,7 @@ int auxiliar_checkboolean(lua_State *L, int objidx) {
- }
- 
- /*-------------------------------------------------------------------------*\
--* Return userdata pointer if object belongs to a given class, abort with 
-+* Return userdata pointer if object belongs to a given class, abort with
- * error otherwise
- \*-------------------------------------------------------------------------*/
- void *auxiliar_checkclass(lua_State *L, const char *classname, int objidx) {
-@@ -98,7 +98,7 @@ void *auxiliar_checkclass(lua_State *L, const char *classname, int objidx) {
- }
- 
- /*-------------------------------------------------------------------------*\
--* Return userdata pointer if object belongs to a given group, abort with 
-+* Return userdata pointer if object belongs to a given group, abort with
- * error otherwise
- \*-------------------------------------------------------------------------*/
- void *auxiliar_checkgroup(lua_State *L, const char *groupname, int objidx) {
-@@ -121,7 +121,7 @@ void auxiliar_setclass(lua_State *L, const char *classname, int objidx) {
- }
- 
- /*-------------------------------------------------------------------------*\
--* Get a userdata pointer if object belongs to a given group. Return NULL 
-+* Get a userdata pointer if object belongs to a given group. Return NULL
- * otherwise
- \*-------------------------------------------------------------------------*/
- void *auxiliar_getgroupudata(lua_State *L, const char *groupname, int objidx) {
-@@ -139,7 +139,7 @@ void *auxiliar_getgroupudata(lua_State *L, const char *groupname, int objidx) {
- }
- 
- /*-------------------------------------------------------------------------*\
--* Get a userdata pointer if object belongs to a given class. Return NULL 
-+* Get a userdata pointer if object belongs to a given class. Return NULL
- * otherwise
- \*-------------------------------------------------------------------------*/
- void *auxiliar_getclassudata(lua_State *L, const char *classname, int objidx) {
-@@ -151,7 +151,7 @@ void *auxiliar_getclassudata(lua_State *L, const char *classname, int objidx) {
- * Used to be part of lauxlib in Lua 5.1, was dropped from 5.2.
- \*-------------------------------------------------------------------------*/
- int auxiliar_typeerror (lua_State *L, int narg, const char *tname) {
--  const char *msg = lua_pushfstring(L, "%s expected, got %s", tname, 
-+  const char *msg = lua_pushfstring(L, "%s expected, got %s", tname,
-       luaL_typename(L, narg));
-   return luaL_argerror(L, narg, msg);
- }
-diff --git a/src/auxiliar.h b/src/auxiliar.h
-index ea99013..65511d4 100644
---- a/src/auxiliar.h
-+++ b/src/auxiliar.h
-@@ -4,12 +4,12 @@
- * Auxiliar routines for class hierarchy manipulation
- * LuaSocket toolkit (but completely independent of other LuaSocket modules)
- *
--* A LuaSocket class is a name associated with Lua metatables. A LuaSocket 
--* group is a name associated with a class. A class can belong to any number 
-+* A LuaSocket class is a name associated with Lua metatables. A LuaSocket
-+* group is a name associated with a class. A class can belong to any number
- * of groups. This module provides the functionality to:
- *
--*   - create new classes 
--*   - add classes to groups 
-+*   - create new classes
-+*   - add classes to groups
- *   - set the class of objects
- *   - check if an object belongs to a given class or group
- *   - get the userdata associated to objects
-@@ -26,11 +26,12 @@
- * "class" with the class name.
- *
- * The mapping from class name to the corresponding metatable and the
--* reverse mapping are done using lauxlib. 
-+* reverse mapping are done using lauxlib.
- \*=========================================================================*/
- 
- #include "lua.h"
- #include "lauxlib.h"
-+#include "compat.h"
- 
- int auxiliar_open(lua_State *L);
- void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func);
-diff --git a/src/buffer.c b/src/buffer.c
-index 4ef4e8e..fff1634 100644
---- a/src/buffer.c
-+++ b/src/buffer.c
-@@ -4,6 +4,7 @@
- \*=========================================================================*/
- #include "lua.h"
- #include "lauxlib.h"
-+#include "compat.h"
- 
- #include "buffer.h"
- 
-@@ -37,7 +38,7 @@ int buffer_open(lua_State *L) {
- }
- 
- /*-------------------------------------------------------------------------*\
--* Initializes C structure 
-+* Initializes C structure
- \*-------------------------------------------------------------------------*/
- void buffer_init(p_buffer buf, p_io io, p_timeout tm) {
-     buf->first = buf->last = 0;
-@@ -61,8 +62,8 @@ int buffer_meth_getstats(lua_State *L, p_buffer buf) {
- * object:setstats() interface
- \*-------------------------------------------------------------------------*/
- int buffer_meth_setstats(lua_State *L, p_buffer buf) {
--    buf->received = (long) luaL_optnumber(L, 2, (lua_Number) buf->received); 
--    buf->sent = (long) luaL_optnumber(L, 3, (lua_Number) buf->sent); 
-+    buf->received = (long) luaL_optnumber(L, 2, (lua_Number) buf->received);
-+    buf->sent = (long) luaL_optnumber(L, 3, (lua_Number) buf->sent);
-     if (lua_isnumber(L, 4)) buf->birthday = timeout_gettime() - lua_tonumber(L, 4);
-     lua_pushnumber(L, 1);
-     return 1;
-@@ -78,9 +79,7 @@ int buffer_meth_send(lua_State *L, p_buffer buf) {
-     const char *data = luaL_checklstring(L, 2, &size);
-     long start = (long) luaL_optnumber(L, 3, 1);
-     long end = (long) luaL_optnumber(L, 4, -1);
--#ifdef LUASOCKET_DEBUG
--    p_timeout tm = timeout_markstart(buf->tm);
--#endif
-+    timeout_markstart(buf->tm);
-     if (start < 0) start = (long) (size+start+1);
-     if (end < 0) end = (long) (size+end+1);
-     if (start < 1) start = (long) 1;
-@@ -89,7 +88,7 @@ int buffer_meth_send(lua_State *L, p_buffer buf) {
-     /* check if there was an error */
-     if (err != IO_DONE) {
-         lua_pushnil(L);
--        lua_pushstring(L, buf->io->error(buf->io->ctx, err)); 
-+        lua_pushstring(L, buf->io->error(buf->io->ctx, err));
-         lua_pushnumber(L, (lua_Number) (sent+start-1));
-     } else {
-         lua_pushnumber(L, (lua_Number) (sent+start-1));
-@@ -98,7 +97,7 @@ int buffer_meth_send(lua_State *L, p_buffer buf) {
-     }
- #ifdef LUASOCKET_DEBUG
-     /* push time elapsed during operation as the last return value */
--    lua_pushnumber(L, timeout_gettime() - timeout_getstart(tm));
-+    lua_pushnumber(L, timeout_gettime() - timeout_getstart(buf->tm));
- #endif
-     return lua_gettop(L) - top;
- }
-@@ -111,10 +110,8 @@ int buffer_meth_receive(lua_State *L, p_buffer buf) {
-     luaL_Buffer b;
-     size_t size;
-     const char *part = luaL_optlstring(L, 3, "", &size);
--#ifdef LUASOCKET_DEBUG
--    p_timeout tm = timeout_markstart(buf->tm);
--#endif
--    /* initialize buffer with optional extra prefix 
-+    timeout_markstart(buf->tm);
-+    /* initialize buffer with optional extra prefix
-      * (useful for concatenating previous partial results) */
-     luaL_buffinit(L, &b);
-     luaL_addlstring(&b, part, size);
-@@ -122,12 +119,12 @@ int buffer_meth_receive(lua_State *L, p_buffer buf) {
-     if (!lua_isnumber(L, 2)) {
-         const char *p= luaL_optstring(L, 2, "*l");
-         if (p[0] == '*' && p[1] == 'l') err = recvline(buf, &b);
--        else if (p[0] == '*' && p[1] == 'a') err = recvall(buf, &b); 
-+        else if (p[0] == '*' && p[1] == 'a') err = recvall(buf, &b);
-         else luaL_argcheck(L, 0, 2, "invalid receive pattern");
--    /* get a fixed number of bytes (minus what was already partially 
-+    /* get a fixed number of bytes (minus what was already partially
-      * received) */
-     } else {
--        double n = lua_tonumber(L, 2); 
-+        double n = lua_tonumber(L, 2);
-         size_t wanted = (size_t) n;
-         luaL_argcheck(L, n >= 0, 2, "invalid receive pattern");
-         if (size == 0 || wanted > size)
-@@ -138,8 +135,8 @@ int buffer_meth_receive(lua_State *L, p_buffer buf) {
-         /* we can't push anyting in the stack before pushing the
-          * contents of the buffer. this is the reason for the complication */
-         luaL_pushresult(&b);
--        lua_pushstring(L, buf->io->error(buf->io->ctx, err)); 
--        lua_pushvalue(L, -2); 
-+        lua_pushstring(L, buf->io->error(buf->io->ctx, err));
-+        lua_pushvalue(L, -2);
-         lua_pushnil(L);
-         lua_replace(L, -4);
-     } else {
-@@ -149,7 +146,7 @@ int buffer_meth_receive(lua_State *L, p_buffer buf) {
-     }
- #ifdef LUASOCKET_DEBUG
-     /* push time elapsed during operation as the last return value */
--    lua_pushnumber(L, timeout_gettime() - timeout_getstart(tm));
-+    lua_pushnumber(L, timeout_gettime() - timeout_getstart(buf->tm));
- #endif
-     return lua_gettop(L) - top;
- }
-@@ -222,7 +219,7 @@ static int recvall(p_buffer buf, luaL_Buffer *b) {
- }
- 
- /*-------------------------------------------------------------------------*\
--* Reads a line terminated by a CR LF pair or just by a LF. The CR and LF 
-+* Reads a line terminated by a CR LF pair or just by a LF. The CR and LF
- * are not returned by the function and are discarded from the buffer
- \*-------------------------------------------------------------------------*/
- static int recvline(p_buffer buf, luaL_Buffer *b) {
-@@ -252,7 +249,7 @@ static int recvline(p_buffer buf, luaL_Buffer *b) {
- static void buffer_skip(p_buffer buf, size_t count) {
-     buf->received += count;
-     buf->first += count;
--    if (buffer_isempty(buf)) 
-+    if (buffer_isempty(buf))
-         buf->first = buf->last = 0;
- }
- 
-diff --git a/src/compat.c b/src/compat.c
-new file mode 100644
-index 0000000..c2d99cb
---- /dev/null
-+++ b/src/compat.c
-@@ -0,0 +1,19 @@
-+#include "compat.h"
-+
-+#if LUA_VERSION_NUM==501
-+/*
-+** Adapted from Lua 5.2
-+*/
-+void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
-+  luaL_checkstack(L, nup+1, "too many upvalues");
-+  for (; l->name != NULL; l++) {  /* fill the table with given functions */
-+    int i;
-+    lua_pushstring(L, l->name);
-+    for (i = 0; i < nup; i++)  /* copy upvalues to the top */
-+      lua_pushvalue(L, -(nup+1));
-+    lua_pushcclosure(L, l->func, nup);  /* closure with those upvalues */
-+    lua_settable(L, -(nup + 3));
-+  }
-+  lua_pop(L, nup);  /* remove upvalues */
-+}
-+#endif
-diff --git a/src/compat.h b/src/compat.h
-new file mode 100644
-index 0000000..7bf8010
---- /dev/null
-+++ b/src/compat.h
-@@ -0,0 +1,11 @@
-+#ifndef COMPAT_H
-+#define COMPAT_H
-+
-+#include "lua.h"
-+#include "lauxlib.h"
-+
-+#if LUA_VERSION_NUM==501
-+void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup);
-+#endif
-+
-+#endif
-diff --git a/src/except.c b/src/except.c
-index 002e701..60b5005 100644
---- a/src/except.c
-+++ b/src/except.c
-@@ -6,9 +6,19 @@
- 
- #include "lua.h"
- #include "lauxlib.h"
-+#include "compat.h"
- 
- #include "except.h"
- 
-+#if LUA_VERSION_NUM < 502
-+#define lua_pcallk(L, na, nr, err, ctx, cont) \
-+    (((void)ctx),((void)cont),lua_pcall(L, na, nr, err))
-+#endif
-+
-+#if LUA_VERSION_NUM < 503
-+typedef int lua_KContext;
-+#endif
-+
- /*=========================================================================*\
- * Internal function prototypes.
- \*=========================================================================*/
-@@ -29,18 +39,17 @@ static luaL_Reg func[] = {
- * Try factory
- \*-------------------------------------------------------------------------*/
- static void wrap(lua_State *L) {
--    lua_newtable(L);
--    lua_pushnumber(L, 1);
--    lua_pushvalue(L, -3);
--    lua_settable(L, -3);
--    lua_insert(L, -2);
--    lua_pop(L, 1);
-+    lua_createtable(L, 1, 0);
-+    lua_pushvalue(L, -2);
-+    lua_rawseti(L, -2, 1);
-+    lua_pushvalue(L, lua_upvalueindex(1));
-+    lua_setmetatable(L, -2);
- }
- 
- static int finalize(lua_State *L) {
-     if (!lua_toboolean(L, 1)) {
--        lua_pushvalue(L, lua_upvalueindex(1));
--        lua_pcall(L, 0, 0, 0);
-+        lua_pushvalue(L, lua_upvalueindex(2));
-+        lua_call(L, 0, 0);
-         lua_settop(L, 2);
-         wrap(L);
-         lua_error(L);
-@@ -48,15 +57,17 @@ static int finalize(lua_State *L) {
-     } else return lua_gettop(L);
- }
- 
--static int do_nothing(lua_State *L) { 
-+static int do_nothing(lua_State *L) {
-     (void) L;
--    return 0; 
-+    return 0;
- }
- 
- static int global_newtry(lua_State *L) {
-     lua_settop(L, 1);
-     if (lua_isnil(L, 1)) lua_pushcfunction(L, do_nothing);
--    lua_pushcclosure(L, finalize, 1);
-+    lua_pushvalue(L, lua_upvalueindex(1));
-+    lua_insert(L, -2);
-+    lua_pushcclosure(L, finalize, 2);
-     return 1;
- }
- 
-@@ -64,27 +75,49 @@ static int global_newtry(lua_State *L) {
- * Protect factory
- \*-------------------------------------------------------------------------*/
- static int unwrap(lua_State *L) {
--    if (lua_istable(L, -1)) {
--        lua_pushnumber(L, 1);
--        lua_gettable(L, -2);
--        lua_pushnil(L);
--        lua_insert(L, -2);
--        return 1;
--    } else return 0;
-+    if (lua_istable(L, -1) && lua_getmetatable(L, -1)) {
-+        int r = lua_rawequal(L, -1, lua_upvalueindex(1));
-+        lua_pop(L, 1);
-+        if (r) {
-+            lua_pushnil(L);
-+            lua_rawgeti(L, -2, 1);
-+            return 1;
-+        }
-+    }
-+    return 0;
- }
- 
--static int protected_(lua_State *L) {
--    lua_pushvalue(L, lua_upvalueindex(1));
--    lua_insert(L, 1);
--    if (lua_pcall(L, lua_gettop(L) - 1, LUA_MULTRET, 0) != 0) {
-+static int protected_finish(lua_State *L, int status, lua_KContext ctx) {
-+    (void)ctx;
-+    if (status != 0 && status != LUA_YIELD) {
-         if (unwrap(L)) return 2;
--        else lua_error(L);
--        return 0;
-+        else return lua_error(L);
-     } else return lua_gettop(L);
- }
- 
-+#if LUA_VERSION_NUM == 502
-+static int protected_cont(lua_State *L) {
-+    int ctx = 0;
-+    int status = lua_getctx(L, &ctx);
-+    return protected_finish(L, status, ctx);
-+}
-+#else
-+#define protected_cont protected_finish
-+#endif
-+
-+static int protected_(lua_State *L) {
-+    int status;
-+    lua_pushvalue(L, lua_upvalueindex(2));
-+    lua_insert(L, 1);
-+    status = lua_pcallk(L, lua_gettop(L) - 1, LUA_MULTRET, 0, 0, protected_cont);
-+    return protected_finish(L, status, 0);
-+}
-+
- static int global_protect(lua_State *L) {
--    lua_pushcclosure(L, protected_, 1);
-+    lua_settop(L, 1);
-+    lua_pushvalue(L, lua_upvalueindex(1));
-+    lua_insert(L, 1);
-+    lua_pushcclosure(L, protected_, 2);
-     return 1;
- }
- 
-@@ -92,10 +125,9 @@ static int global_protect(lua_State *L) {
- * Init module
- \*-------------------------------------------------------------------------*/
- int except_open(lua_State *L) {
--#if LUA_VERSION_NUM > 501 && !defined(LUA_COMPAT_MODULE)
--    luaL_setfuncs(L, func, 0);
--#else
--    luaL_openlib(L, NULL, func, 0);
--#endif
-+    lua_newtable(L); /* metatable for wrapped exceptions */
-+    lua_pushboolean(L, 0);
-+    lua_setfield(L, -2, "__metatable");
-+    luaL_setfuncs(L, func, 1);
-     return 0;
- }
-diff --git a/src/except.h b/src/except.h
-index 1e7a245..2497c05 100644
---- a/src/except.h
-+++ b/src/except.h
-@@ -9,21 +9,26 @@
- * error checking was taking a substantial amount of the coding. These
- * function greatly simplify the task of checking errors.
- *
--* The main idea is that functions should return nil as its first return
--* value when it finds an error, and return an error message (or value)
-+* The main idea is that functions should return nil as their first return
-+* values when they find an error, and return an error message (or value)
- * following nil. In case of success, as long as the first value is not nil,
- * the other values don't matter.
- *
- * The idea is to nest function calls with the "try" function. This function
--* checks the first value, and calls "error" on the second if the first is
--* nil. Otherwise, it returns all values it received. 
-+* checks the first value, and, if it's falsy, wraps the second value in a
-+* table with metatable and calls "error" on it. Otherwise, it returns all
-+* values it received. Basically, it works like the Lua "assert" function,
-+* but it creates errors targeted specifically at "protect".
- *
--* The protect function returns a new function that behaves exactly like the
--* function it receives, but the new function doesn't throw exceptions: it
--* returns nil followed by the error message instead.
-+* The "newtry" function is a factory for "try" functions that call a
-+* finalizer in protected mode before calling "error".
- *
--* With these two function, it's easy to write functions that throw
--* exceptions on error, but that don't interrupt the user script. 
-+* The "protect" function returns a new function that behaves exactly like
-+* the function it receives, but the new function catches exceptions thrown
-+* by "try" functions and returns nil followed by the error message instead.
-+*
-+* With these three functions, it's easy to write functions that throw
-+* exceptions on error, but that don't interrupt the user script.
- \*=========================================================================*/
- 
- #include "lua.h"
-diff --git a/src/ftp.lua b/src/ftp.lua
-index ea1145b..e0c3cae 100644
---- a/src/ftp.lua
-+++ b/src/ftp.lua
-@@ -268,11 +268,20 @@ _M.command = socket.protect(function(cmdt)
-     cmdt = override(cmdt)
-     socket.try(cmdt.host, "missing hostname")
-     socket.try(cmdt.command, "missing command")
--    local f = open(cmdt.host, cmdt.port, cmdt.create)
-+    local f = _M.open(cmdt.host, cmdt.port, cmdt.create)
-     f:greet()
-     f:login(cmdt.user, cmdt.password)
--    f.try(f.tp:command(cmdt.command, cmdt.argument))
--    if cmdt.check then f.try(f.tp:check(cmdt.check)) end
-+    if type(cmdt.command) == "table" then
-+        local argument = cmdt.argument or {}
-+        local check = cmdt.check or {}
-+        for i,cmd in ipairs(cmdt.command) do
-+            f.try(f.tp:command(cmd, argument[i]))
-+            if check[i] then f.try(f.tp:check(check[i])) end
-+        end
-+    else
-+        f.try(f.tp:command(cmdt.command, cmdt.argument))
-+        if cmdt.check then f.try(f.tp:check(cmdt.check)) end
-+    end
-     f:quit()
-     return f:close()
- end)
-@@ -282,4 +291,4 @@ _M.get = socket.protect(function(gett)
-     else return tget(gett) end
- end)
- 
--return _M
-\ No newline at end of file
-+return _M
-diff --git a/src/http.lua b/src/http.lua
-index ac4b2d6..d6bcc91 100644
---- a/src/http.lua
-+++ b/src/http.lua
-@@ -22,12 +22,15 @@ local _M = socket.http
- -- Program constants
- -----------------------------------------------------------------------------
- -- connection timeout in seconds
--TIMEOUT = 60
---- default port for document retrieval
--_M.PORT = 80
-+_M.TIMEOUT = 60
- -- user agent field sent in request
- _M.USERAGENT = socket._VERSION
- 
-+-- supported schemes
-+local SCHEMES = { ["http"] = true }
-+-- default port for document retrieval
-+local PORT = 80
-+
- -----------------------------------------------------------------------------
- -- Reads MIME headers from a connection, unfolding where needed
- -----------------------------------------------------------------------------
-@@ -114,7 +117,7 @@ function _M.open(host, port, create)
-     h.try = socket.newtry(function() h:close() end)
-     -- set timeout before connecting
-     h.try(c:settimeout(_M.TIMEOUT))
--    h.try(c:connect(host, port or _M.PORT))
-+    h.try(c:connect(host, port or PORT))
-     -- here everything worked
-     return h
- end
-@@ -186,7 +189,7 @@ end
- local function adjusturi(reqt)
-     local u = reqt
-     -- if there is a proxy, we need the full url. otherwise, just a part.
--    if not reqt.proxy and not PROXY then
-+    if not reqt.proxy and not _M.PROXY then
-         u = {
-            path = socket.try(reqt.path, "invalid path 'nil'"),
-            params = reqt.params,
-@@ -198,7 +201,7 @@ local function adjusturi(reqt)
- end
- 
- local function adjustproxy(reqt)
--    local proxy = reqt.proxy or PROXY
-+    local proxy = reqt.proxy or _M.PROXY
-     if proxy then
-         proxy = url.parse(proxy)
-         return proxy.host, proxy.port or 3128
-@@ -209,17 +212,27 @@ end
- 
- local function adjustheaders(reqt)
-     -- default headers
-+    local host = string.gsub(reqt.authority, "^.-@", "")
-     local lower = {
-         ["user-agent"] = _M.USERAGENT,
--        ["host"] = reqt.host,
-+        ["host"] = host,
-         ["connection"] = "close, TE",
-         ["te"] = "trailers"
-     }
-     -- if we have authentication information, pass it along
-     if reqt.user and reqt.password then
--        lower["authorization"] = 
-+        lower["authorization"] =
-             "Basic " ..  (mime.b64(reqt.user .. ":" .. reqt.password))
-     end
-+    -- if we have proxy authentication information, pass it along
-+    local proxy = reqt.proxy or _M.PROXY
-+    if proxy then
-+        proxy = url.parse(proxy)
-+        if proxy.user and proxy.password then
-+            lower["proxy-authorization"] =
-+                "Basic " ..  (mime.b64(proxy.user .. ":" .. proxy.password))
-+        end
-+    end
-     -- override with user headers
-     for i,v in base.pairs(reqt.headers or lower) do
-         lower[string.lower(i)] = v
-@@ -230,7 +243,7 @@ end
- -- default url parts
- local default = {
-     host = "",
--    port = _M.PORT,
-+    port = PORT,
-     path ="/",
-     scheme = "http"
- }
-@@ -240,22 +253,27 @@ local function adjustrequest(reqt)
-     local nreqt = reqt.url and url.parse(reqt.url, default) or {}
-     -- explicit components override url
-     for i,v in base.pairs(reqt) do nreqt[i] = v end
--    if nreqt.port == "" then nreqt.port = 80 end
--    socket.try(nreqt.host and nreqt.host ~= "", 
--        "invalid host '" .. base.tostring(nreqt.host) .. "'")
-+    if nreqt.port == "" then nreqt.port = PORT end
-+    if not (nreqt.host and nreqt.host ~= "") then
-+        socket.try(nil, "invalid host '" .. base.tostring(nreqt.host) .. "'")
-+    end
-     -- compute uri if user hasn't overriden
-     nreqt.uri = reqt.uri or adjusturi(nreqt)
--    -- ajust host and port if there is a proxy
--    nreqt.host, nreqt.port = adjustproxy(nreqt)
-     -- adjust headers in request
-     nreqt.headers = adjustheaders(nreqt)
-+    -- ajust host and port if there is a proxy
-+    nreqt.host, nreqt.port = adjustproxy(nreqt)
-     return nreqt
- end
- 
- local function shouldredirect(reqt, code, headers)
--    return headers.location and
--           string.gsub(headers.location, "%s", "") ~= "" and
--           (reqt.redirect ~= false) and
-+    local location = headers.location
-+    if not location then return false end
-+    location = string.gsub(location, "%s", "")
-+    if location == "" then return false end
-+    local scheme = string.match(location, "^([%w][%w%+%-%.]*)%:")
-+    if scheme and not SCHEMES[scheme] then return false end
-+    return (reqt.redirect ~= false) and
-            (code == 301 or code == 302 or code == 303 or code == 307) and
-            (not reqt.method or reqt.method == "GET" or reqt.method == "HEAD")
-            and (not reqt.nredirects or reqt.nredirects < 5)
-@@ -279,10 +297,10 @@ local trequest, tredirect
-         source = reqt.source,
-         sink = reqt.sink,
-         headers = reqt.headers,
--        proxy = reqt.proxy, 
-+        proxy = reqt.proxy,
-         nredirects = (reqt.nredirects or 0) + 1,
-         create = reqt.create
--    }   
-+    }
-     -- pass location header back as a hint we redirected
-     headers = headers or {}
-     headers.location = headers.location or location
-@@ -299,7 +317,7 @@ end
-     h:sendheaders(nreqt.headers)
-     -- if there is a body, send it
-     if nreqt.source then
--        h:sendbody(nreqt.headers, nreqt.source, nreqt.step) 
-+        h:sendbody(nreqt.headers, nreqt.source, nreqt.step)
-     end
-     local code, status = h:receivestatusline()
-     -- if it is an HTTP/0.9 server, simply get the body and we are done
-@@ -309,13 +327,13 @@ end
-     end
-     local headers
-     -- ignore any 100-continue messages
--    while code == 100 do 
-+    while code == 100 do
-         headers = h:receiveheaders()
-         code, status = h:receivestatusline()
-     end
-     headers = h:receiveheaders()
-     -- at this point we should have a honest reply from the server
--    -- we can't redirect if we already used the source, so we report the error 
-+    -- we can't redirect if we already used the source, so we report the error
-     if shouldredirect(nreqt, code, headers) and not nreqt.source then
-         h:close()
-         return tredirect(reqt, headers.location)
-@@ -351,4 +369,4 @@ _M.request = socket.protect(function(reqt, body)
-     else return trequest(reqt) end
- end)
- 
--return _M
-\ No newline at end of file
-+return _M
-diff --git a/src/inet.c b/src/inet.c
-index 1a411f6..f4c8404 100644
---- a/src/inet.c
-+++ b/src/inet.c
-@@ -8,6 +8,7 @@
- 
- #include "lua.h"
- #include "lauxlib.h"
-+#include "compat.h"
- 
- #include "inet.h"
- 
-@@ -41,11 +42,7 @@ int inet_open(lua_State *L)
- {
-     lua_pushstring(L, "dns");
-     lua_newtable(L);
--#if LUA_VERSION_NUM > 501 && !defined(LUA_COMPAT_MODULE)
-     luaL_setfuncs(L, func, 0);
--#else
--    luaL_openlib(L, NULL, func, 0);
--#endif
-     lua_settable(L, -3);
-     return 0;
- }
-@@ -97,7 +94,7 @@ static int inet_global_getnameinfo(lua_State *L) {
- 
-     memset(&hints, 0, sizeof(hints));
-     hints.ai_socktype = SOCK_STREAM;
--    hints.ai_family = PF_UNSPEC;
-+    hints.ai_family = AF_UNSPEC;
- 
-     ret = getaddrinfo(host, serv, &hints, &resolved);
-     if (ret != 0) {
-@@ -108,8 +105,8 @@ static int inet_global_getnameinfo(lua_State *L) {
- 
-     lua_newtable(L);
-     for (i = 1, iter = resolved; iter; i++, iter = iter->ai_next) {
--        getnameinfo(iter->ai_addr, (socklen_t) iter->ai_addrlen, 
--            hbuf, host? (socklen_t) sizeof(hbuf): 0, 
-+        getnameinfo(iter->ai_addr, (socklen_t) iter->ai_addrlen,
-+            hbuf, host? (socklen_t) sizeof(hbuf): 0,
-             sbuf, serv? (socklen_t) sizeof(sbuf): 0, 0);
-         if (host) {
-             lua_pushnumber(L, i);
-@@ -149,7 +146,7 @@ static int inet_global_toip(lua_State *L)
- int inet_optfamily(lua_State* L, int narg, const char* def)
- {
-     static const char* optname[] = { "unspec", "inet", "inet6", NULL };
--    static int optvalue[] = { PF_UNSPEC, PF_INET, PF_INET6, 0 };
-+    static int optvalue[] = { AF_UNSPEC, AF_INET, AF_INET6, 0 };
- 
-     return optvalue[luaL_checkoption(L, narg, def, optname)];
- }
-@@ -170,7 +167,7 @@ static int inet_global_getaddrinfo(lua_State *L)
-     int i = 1, ret = 0;
-     memset(&hints, 0, sizeof(hints));
-     hints.ai_socktype = SOCK_STREAM;
--    hints.ai_family = PF_UNSPEC;
-+    hints.ai_family = AF_UNSPEC;
-     ret = getaddrinfo(hostname, NULL, &hints, &resolved);
-     if (ret != 0) {
-         lua_pushnil(L);
-@@ -180,9 +177,10 @@ static int inet_global_getaddrinfo(lua_State *L)
-     lua_newtable(L);
-     for (iterator = resolved; iterator; iterator = iterator->ai_next) {
-         char hbuf[NI_MAXHOST];
--        ret = getnameinfo(iterator->ai_addr, (socklen_t) iterator->ai_addrlen, 
-+        ret = getnameinfo(iterator->ai_addr, (socklen_t) iterator->ai_addrlen,
-             hbuf, (socklen_t) sizeof(hbuf), NULL, 0, NI_NUMERICHOST);
-         if (ret){
-+          freeaddrinfo(resolved);
-           lua_pushnil(L);
-           lua_pushstring(L, socket_gaistrerror(ret));
-           return 2;
-@@ -200,6 +198,16 @@ static int inet_global_getaddrinfo(lua_State *L)
-                 lua_pushliteral(L, "inet6");
-                 lua_settable(L, -3);
-                 break;
-+            case AF_UNSPEC:
-+                lua_pushliteral(L, "family");
-+                lua_pushliteral(L, "unspec");
-+                lua_settable(L, -3);
-+                break;
-+            default:
-+                lua_pushliteral(L, "family");
-+                lua_pushliteral(L, "unknown");
-+                lua_settable(L, -3);
-+                break;
-         }
-         lua_pushliteral(L, "addr");
-         lua_pushstring(L, hbuf);
-@@ -256,12 +264,11 @@ int inet_meth_getpeername(lua_State *L, p_socket ps, int family)
-     }
-     lua_pushstring(L, name);
-     lua_pushinteger(L, (int) strtol(port, (char **) NULL, 10));
--    if (family == PF_INET) {
--        lua_pushliteral(L, "inet");
--    } else if (family == PF_INET6) {
--        lua_pushliteral(L, "inet6");
--    } else {
--        lua_pushliteral(L, "uknown family");
-+    switch (family) {
-+        case AF_INET: lua_pushliteral(L, "inet"); break;
-+        case AF_INET6: lua_pushliteral(L, "inet6"); break;
-+        case AF_UNSPEC: lua_pushliteral(L, "unspec"); break;
-+        default: lua_pushliteral(L, "unknown"); break;
-     }
-     return 3;
- }
-@@ -281,7 +288,7 @@ int inet_meth_getsockname(lua_State *L, p_socket ps, int family)
-         lua_pushstring(L, socket_strerror(errno));
-         return 2;
-     }
--	err=getnameinfo((struct sockaddr *)&peer, peer_len, 
-+	err=getnameinfo((struct sockaddr *)&peer, peer_len,
- 		name, INET6_ADDRSTRLEN, port, 6, NI_NUMERICHOST | NI_NUMERICSERV);
-     if (err) {
-         lua_pushnil(L);
-@@ -290,12 +297,11 @@ int inet_meth_getsockname(lua_State *L, p_socket ps, int family)
-     }
-     lua_pushstring(L, name);
-     lua_pushstring(L, port);
--    if (family == PF_INET) {
--        lua_pushliteral(L, "inet");
--    } else if (family == PF_INET6) {
--        lua_pushliteral(L, "inet6");
--    } else {
--        lua_pushliteral(L, "uknown family");
-+    switch (family) {
-+        case AF_INET: lua_pushliteral(L, "inet"); break;
-+        case AF_INET6: lua_pushliteral(L, "inet6"); break;
-+        case AF_UNSPEC: lua_pushliteral(L, "unspec"); break;
-+        default: lua_pushliteral(L, "unknown"); break;
-     }
-     return 3;
- }
-@@ -346,8 +352,13 @@ static void inet_pushresolved(lua_State *L, struct hostent *hp)
- /*-------------------------------------------------------------------------*\
- * Tries to create a new inet socket
- \*-------------------------------------------------------------------------*/
--const char *inet_trycreate(p_socket ps, int family, int type) {
--    return socket_strerror(socket_create(ps, family, type, 0));
-+const char *inet_trycreate(p_socket ps, int family, int type, int protocol) {
-+    const char *err = socket_strerror(socket_create(ps, family, type, protocol));
-+    if (err == NULL && family == AF_INET6) {
-+        int yes = 1;
-+        setsockopt(*ps, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&yes, sizeof(yes));
-+    }
-+    return err;
- }
- 
- /*-------------------------------------------------------------------------*\
-@@ -356,21 +367,21 @@ const char *inet_trycreate(p_socket ps, int family, int type) {
- const char *inet_trydisconnect(p_socket ps, int family, p_timeout tm)
- {
-     switch (family) {
--        case PF_INET: {
-+        case AF_INET: {
-             struct sockaddr_in sin;
-             memset((char *) &sin, 0, sizeof(sin));
-             sin.sin_family = AF_UNSPEC;
-             sin.sin_addr.s_addr = INADDR_ANY;
--            return socket_strerror(socket_connect(ps, (SA *) &sin, 
-+            return socket_strerror(socket_connect(ps, (SA *) &sin,
-                 sizeof(sin), tm));
-         }
--        case PF_INET6: {
-+        case AF_INET6: {
-             struct sockaddr_in6 sin6;
--            struct in6_addr addrany = IN6ADDR_ANY_INIT; 
-+            struct in6_addr addrany = IN6ADDR_ANY_INIT;
-             memset((char *) &sin6, 0, sizeof(sin6));
-             sin6.sin6_family = AF_UNSPEC;
-             sin6.sin6_addr = addrany;
--            return socket_strerror(socket_connect(ps, (SA *) &sin6, 
-+            return socket_strerror(socket_connect(ps, (SA *) &sin6,
-                 sizeof(sin6), tm));
-         }
-     }
-@@ -385,6 +396,7 @@ const char *inet_tryconnect(p_socket ps, int *family, const char *address,
- {
-     struct addrinfo *iterator = NULL, *resolved = NULL;
-     const char *err = NULL;
-+    int current_family = *family;
-     /* try resolving */
-     err = socket_gaistrerror(getaddrinfo(address, serv,
-                 connecthints, &resolved));
-@@ -399,23 +411,23 @@ const char *inet_tryconnect(p_socket ps, int *family, const char *address,
-          * that shows up while iterating. if there was a
-          * bind, all families will be the same and we will
-          * not enter this branch. */
--        if (*family != iterator->ai_family) {
-+        if (current_family != iterator->ai_family || *ps == SOCKET_INVALID) {
-             socket_destroy(ps);
--            err = socket_strerror(socket_create(ps, iterator->ai_family, 
--                iterator->ai_socktype, iterator->ai_protocol));
--            if (err != NULL) {
--                freeaddrinfo(resolved);
--                return err;
--            }
--            *family = iterator->ai_family;
--            /* all sockets initially non-blocking */
-+            err = inet_trycreate(ps, iterator->ai_family,
-+                iterator->ai_socktype, iterator->ai_protocol);
-+            if (err) continue;
-+            current_family = iterator->ai_family;
-+            /* set non-blocking before connect */
-             socket_setnonblocking(ps);
-         }
-         /* try connecting to remote address */
--        err = socket_strerror(socket_connect(ps, (SA *) iterator->ai_addr, 
-+        err = socket_strerror(socket_connect(ps, (SA *) iterator->ai_addr,
-             (socklen_t) iterator->ai_addrlen, tm));
--        /* if success, break out of loop */
--        if (err == NULL) break;
-+        /* if success or timeout is zero, break out of loop */
-+        if (err == NULL || timeout_iszero(tm)) {
-+            *family = current_family;
-+            break;
-+        }
-     }
-     freeaddrinfo(resolved);
-     /* here, if err is set, we failed */
-@@ -425,29 +437,27 @@ const char *inet_tryconnect(p_socket ps, int *family, const char *address,
- /*-------------------------------------------------------------------------*\
- * Tries to accept a socket
- \*-------------------------------------------------------------------------*/
--const char *inet_tryaccept(p_socket server, int family, p_socket client, 
--    p_timeout tm)
--{
-+const char *inet_tryaccept(p_socket server, int family, p_socket client,
-+    p_timeout tm) {
- 	socklen_t len;
- 	t_sockaddr_storage addr;
--	if (family == PF_INET6) {
--		len = sizeof(struct sockaddr_in6);
--	} else {
--		len = sizeof(struct sockaddr_in);
--	}
--	return socket_strerror(socket_accept(server, client, (SA *) &addr, 
-+    switch (family) {
-+        case AF_INET6: len = sizeof(struct sockaddr_in6); break;
-+        case AF_INET: len = sizeof(struct sockaddr_in); break;
-+        default: len = sizeof(addr); break;
-+    }
-+	return socket_strerror(socket_accept(server, client, (SA *) &addr,
-         &len, tm));
- }
- 
- /*-------------------------------------------------------------------------*\
- * Tries to bind socket to (address, port)
- \*-------------------------------------------------------------------------*/
--const char *inet_trybind(p_socket ps, const char *address, const char *serv,
--        struct addrinfo *bindhints)
--{
-+const char *inet_trybind(p_socket ps, int *family, const char *address,
-+    const char *serv, struct addrinfo *bindhints) {
-     struct addrinfo *iterator = NULL, *resolved = NULL;
-     const char *err = NULL;
--    t_socket sock = *ps;
-+    int current_family = *family;
-     /* translate luasocket special values to C */
-     if (strcmp(address, "*") == 0) address = NULL;
-     if (!serv) serv = "0";
-@@ -459,35 +469,32 @@ const char *inet_trybind(p_socket ps, const char *address, const char *serv,
-     }
-     /* iterate over resolved addresses until one is good */
-     for (iterator = resolved; iterator; iterator = iterator->ai_next) {
--        if(sock == SOCKET_INVALID) {
--            err = socket_strerror(socket_create(&sock, iterator->ai_family,
--                        iterator->ai_socktype, iterator->ai_protocol));
--            if(err)
--                continue;
-+        if (current_family != iterator->ai_family || *ps == SOCKET_INVALID) {
-+            socket_destroy(ps);
-+            err = inet_trycreate(ps, iterator->ai_family,
-+                        iterator->ai_socktype, iterator->ai_protocol);
-+            if (err) continue;
-+            current_family = iterator->ai_family;
-         }
-         /* try binding to local address */
--        err = socket_strerror(socket_bind(&sock,
--            (SA *) iterator->ai_addr,
-+        err = socket_strerror(socket_bind(ps, (SA *) iterator->ai_addr,
-             (socklen_t) iterator->ai_addrlen));
--
-         /* keep trying unless bind succeeded */
--        if (err) {
--            if(sock != *ps)
--                socket_destroy(&sock);
--        } else {
--            /* remember what we connected to, particularly the family */
--            *bindhints = *iterator;
-+        if (err == NULL) {
-+            *family = current_family;
-+            /* set to non-blocking after bind */
-+            socket_setnonblocking(ps);
-             break;
-         }
-     }
-     /* cleanup and return error */
-     freeaddrinfo(resolved);
--    *ps = sock;
-+    /* here, if err is set, we failed */
-     return err;
- }
- 
- /*-------------------------------------------------------------------------*\
--* Some systems do not provide these so that we provide our own. 
-+* Some systems do not provide these so that we provide our own.
- \*-------------------------------------------------------------------------*/
- #ifdef LUASOCKET_INET_ATON
- int inet_aton(const char *cp, struct in_addr *inp)
-@@ -512,7 +519,7 @@ int inet_aton(const char *cp, struct in_addr *inp)
- #endif
- 
- #ifdef LUASOCKET_INET_PTON
--int inet_pton(int af, const char *src, void *dst) 
-+int inet_pton(int af, const char *src, void *dst)
- {
-     struct addrinfo hints, *res;
-     int ret = 1;
-@@ -529,7 +536,7 @@ int inet_pton(int af, const char *src, void *dst)
-     } else {
-         ret = -1;
-     }
--    freeaddrinfo(res); 
-+    freeaddrinfo(res);
-     return ret;
- }
- 
-diff --git a/src/inet.h b/src/inet.h
-index 1f1a96a..feb3541 100644
---- a/src/inet.h
-+++ b/src/inet.h
-@@ -1,12 +1,12 @@
--#ifndef INET_H 
--#define INET_H 
-+#ifndef INET_H
-+#define INET_H
- /*=========================================================================*\
- * Internet domain functions
- * LuaSocket toolkit
- *
- * This module implements the creation and connection of internet domain
- * sockets, on top of the socket.h interface, and the interface of with the
--* resolver. 
-+* resolver.
- *
- * The function inet_aton is provided for the platforms where it is not
- * available. The module also implements the interface of the internet
-@@ -24,11 +24,11 @@
- 
- int inet_open(lua_State *L);
- 
--const char *inet_trycreate(p_socket ps, int family, int type);
-+const char *inet_trycreate(p_socket ps, int family, int type, int protocol);
- const char *inet_tryconnect(p_socket ps, int *family, const char *address,
-         const char *serv, p_timeout tm, struct addrinfo *connecthints);
--const char *inet_trybind(p_socket ps, const char *address, const char *serv,
--        struct addrinfo *bindhints);
-+const char *inet_trybind(p_socket ps, int *family, const char *address,
-+        const char *serv, struct addrinfo *bindhints);
- const char *inet_trydisconnect(p_socket ps, int family, p_timeout tm);
- const char *inet_tryaccept(p_socket server, int family, p_socket client, p_timeout tm);
- 
-diff --git a/src/io.c b/src/io.c
-index 35f46f7..a4230ce 100644
---- a/src/io.c
-+++ b/src/io.c
-@@ -25,6 +25,6 @@ const char *io_strerror(int err) {
-         case IO_DONE: return NULL;
-         case IO_CLOSED: return "closed";
-         case IO_TIMEOUT: return "timeout";
--        default: return "unknown error"; 
-+        default: return "unknown error";
-     }
- }
-diff --git a/src/io.h b/src/io.h
-index 76a3e58..8cca08a 100644
---- a/src/io.h
-+++ b/src/io.h
-@@ -22,7 +22,7 @@ enum {
-     IO_DONE = 0,        /* operation completed successfully */
-     IO_TIMEOUT = -1,    /* operation timed out */
-     IO_CLOSED = -2,     /* the connection has been closed */
--	IO_UNKNOWN = -3     
-+	IO_UNKNOWN = -3
- };
- 
- /* interface to error message function */
-diff --git a/src/ltn12.lua b/src/ltn12.lua
-index 5b10f56..575c5a7 100644
---- a/src/ltn12.lua
-+++ b/src/ltn12.lua
-@@ -9,6 +9,7 @@
- -----------------------------------------------------------------------------
- local string = require("string")
- local table = require("table")
-+local unpack = unpack or table.unpack
- local base = _G
- local _M = {}
- if module then -- heuristic for exporting a global package table
-@@ -21,6 +22,9 @@ _M.source = source
- _M.sink = sink
- _M.pump = pump
- 
-+local unpack = unpack or table.unpack
-+local select = base.select
-+
- -- 2048 seems to be better in windows...
- _M.BLOCKSIZE = 2048
- _M._VERSION = "LTN12 1.0.3"
-@@ -42,7 +46,7 @@ end
- -- (thanks to Wim Couwenberg)
- function filter.chain(...)
-     local arg = {...}
--    local n = select('#',...)
-+    local n = base.select('#',...)
-     local top, index = 1, 1
-     local retry = ""
-     return function(chunk)
-@@ -139,7 +143,9 @@ function source.rewind(src)
-     end
- end
- 
--function source.chain(src, f)
-+-- chains a source with one or several filter(s)
-+function source.chain(src, f, ...)
-+    if ... then f=filter.chain(f, ...) end
-     base.assert(src and f)
-     local last_in, last_out = "", ""
-     local state = "feeding"
-@@ -254,8 +260,13 @@ function sink.error(err)
-     end
- end
- 
---- chains a sink with a filter
--function sink.chain(f, snk)
-+-- chains a sink with one or several filter(s)
-+function sink.chain(f, snk, ...)
-+    if ... then
-+        local args = { f, snk, ... }
-+        snk = table.remove(args, #args)
-+        f = filter.chain(unpack(args))
-+    end
-     base.assert(f and snk)
-     return function(chunk, err)
-         if chunk ~= "" then
-diff --git a/src/luasocket.c b/src/luasocket.c
-index e6ee747..7d9c802 100644
---- a/src/luasocket.c
-+++ b/src/luasocket.c
-@@ -17,7 +17,7 @@
- \*=========================================================================*/
- #include "lua.h"
- #include "lauxlib.h"
--
-+#include "compat.h"
- 
- /*=========================================================================*\
- * LuaSocket includes
-@@ -64,7 +64,7 @@ static luaL_Reg func[] = {
- * Skip a few arguments
- \*-------------------------------------------------------------------------*/
- static int global_skip(lua_State *L) {
--    int amount = luaL_checkint(L, 1);
-+    int amount = luaL_checkinteger(L, 1);
-     int ret = lua_gettop(L) - amount - 1;
-     return ret >= 0 ? ret : 0;
- }
-@@ -78,26 +78,14 @@ static int global_unload(lua_State *L) {
-     return 0;
- }
- 
--#if LUA_VERSION_NUM > 501
--int luaL_typerror (lua_State *L, int narg, const char *tname) {
--  const char *msg = lua_pushfstring(L, "%s expected, got %s",
--                                    tname, luaL_typename(L, narg));
--  return luaL_argerror(L, narg, msg);
--}
--#endif
--
- /*-------------------------------------------------------------------------*\
- * Setup basic stuff.
- \*-------------------------------------------------------------------------*/
- static int base_open(lua_State *L) {
-     if (socket_open()) {
-         /* export functions (and leave namespace table on top of stack) */
--#if LUA_VERSION_NUM > 501 && !defined(LUA_COMPAT_MODULE)
-         lua_newtable(L);
-         luaL_setfuncs(L, func, 0);
--#else
--        luaL_openlib(L, "socket", func, 0);
--#endif
- #ifdef LUASOCKET_DEBUG
-         lua_pushstring(L, "_DEBUG");
-         lua_pushboolean(L, 1);
-diff --git a/src/makefile b/src/makefile
-index c24e61b..adf687f 100644
---- a/src/makefile
-+++ b/src/makefile
-@@ -20,15 +20,17 @@ PLAT?=linux
- # lua version to build against
- LUAV?=5.1
- 
-+# MYCFLAGS: to be set by user if needed
-+MYCFLAGS=
-+
-+# MYLDFLAGS: to be set by user if needed
-+MYLDFLAGS=
-+
- # DEBUG: NODEBUG DEBUG
- # debug mode causes luasocket to collect and returns timing information useful
- # for testing and debugging luasocket itself
- DEBUG?=NODEBUG
- 
--# COMPAT: COMPAT NOCOMPAT
--# when compiling for 5.2, use LUA_COMPAT_MODULE
--COMPAT?=NOCOMPAT
--
- # where lua headers are found for macosx builds
- # LUAINC_macosx:
- # /opt/local/include
-@@ -40,7 +42,6 @@ LUAPREFIX_macosx?=/opt/local
- CDIR_macosx?=lib/lua/$(LUAV)
- LDIR_macosx?=share/lua/$(LUAV)
- 
--
- # LUAINC_linux:
- # /usr/include/lua$(LUAV)
- # /usr/local/include
-@@ -52,8 +53,17 @@ LUAPREFIX_linux?=/usr/local
- CDIR_linux?=lib/lua/$(LUAV)
- LDIR_linux?=share/lua/$(LUAV)
- 
-+# LUAINC_freebsd:
-+# /usr/local/include/lua$(LUAV)
-+# where lua headers are found for freebsd builds
-+LUAINC_freebsd_base?=/usr/local/include/
-+LUAINC_freebsd?=$(LUAINC_freebsd_base)/lua$(LUAV)
-+LUAPREFIX_freebsd?=/usr/local/
-+CDIR_freebsd?=lib/lua/$(LUAV)
-+LDIR_freebsd?=share/lua/$(LUAV)
-+
- # where lua headers are found for mingw builds
--# LUAINC_mingw: 
-+# LUAINC_mingw:
- # /opt/local/include
- LUAINC_mingw_base?=/usr/include
- LUAINC_mingw?=$(LUAINC_mingw_base)/lua/$(LUAV)
-@@ -67,13 +77,21 @@ LDIR_mingw?=lua/$(LUAV)/lua
- # LUAINC_win32:
- # LUALIB_win32:
- # where lua headers and libraries are found for win32 builds
--LUAINC_win32_base?=
--LUAINC_win32?=$(LUAINC_win32_base)/lua/$(LUAV)
--PLATFORM_win32?=Release
- LUAPREFIX_win32?=
--CDIR_win32?=lua/$(LUAV)/$(PLATFORM_win32)
--LDIR_win32?=lua/$(LUAV)/$(PLATFORM_win32)/lua
--LUALIB_win32?=$(LUAPREFIX_win32)/lua/$(LUAV)/$(PLATFORM_win32)
-+LUAINC_win32?=$(LUAPREFIX_win32)/include/lua/$(LUAV)
-+PLATFORM_win32?=Release
-+CDIR_win32?=bin/lua/$(LUAV)/$(PLATFORM_win32)
-+LDIR_win32?=bin/lua/$(LUAV)/$(PLATFORM_win32)/lua
-+LUALIB_win32?=$(LUAPREFIX_win32)/lib/lua/$(LUAV)/$(PLATFORM_win32)
-+LUALIBNAME_win32?=lua$(subst .,,$(LUAV)).lib 
-+
-+
-+# LUAINC_solaris:
-+LUAINC_solaris_base?=/usr/include
-+LUAINC_solaris?=$(LUAINC_solaris_base)/lua/$(LUAV)
-+LUAPREFIX_solaris?=/usr/local
-+CDIR_solaris?=lib/lua/$(LUAV)
-+LDIR_solaris?=share/lua/$(LUAV)
- 
- # prefix: /usr/local /usr /opt/local /sw
- # the top of the default install tree
-@@ -121,7 +139,7 @@ print:
- #------
- # Supported platforms
- #
--PLATS= macosx linux win32 mingw
-+PLATS= macosx linux win32 mingw solaris
- 
- #------
- # Compiler and linker settings
-@@ -129,11 +147,11 @@ PLATS= macosx linux win32 mingw
- SO_macosx=so
- O_macosx=o
- CC_macosx=gcc
--DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN -DLUA_$(COMPAT)_MODULE \
-+DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN \
- 	-DLUASOCKET_API='__attribute__((visibility("default")))' \
- 	-DUNIX_API='__attribute__((visibility("default")))' \
- 	-DMIME_API='__attribute__((visibility("default")))'
--CFLAGS_macosx= -I$(LUAINC) $(DEF) -pedantic -Wall -O2 -fno-common \
-+CFLAGS_macosx= -I$(LUAINC) $(DEF) -Wall -O2 -fno-common \
- 	-fvisibility=hidden
- LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o 
- LD_macosx= export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc
-@@ -145,11 +163,11 @@ SOCKET_macosx=usocket.o
- SO_linux=so
- O_linux=o
- CC_linux=gcc
--DEF_linux=-DLUASOCKET_$(DEBUG) -DLUA_$(COMPAT)_MODULE \
-+DEF_linux=-DLUASOCKET_$(DEBUG) \
- 	-DLUASOCKET_API='__attribute__((visibility("default")))' \
- 	-DUNIX_API='__attribute__((visibility("default")))' \
- 	-DMIME_API='__attribute__((visibility("default")))'
--CFLAGS_linux= -I$(LUAINC) $(DEF) -pedantic -Wall -Wshadow -Wextra \
-+CFLAGS_linux= -I$(LUAINC) $(DEF) -Wall -Wshadow -Wextra \
- 	-Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden
- LDFLAGS_linux=-O -shared -fpic -o 
- LD_linux=gcc
-@@ -157,14 +175,46 @@ SOCKET_linux=usocket.o
- 
- #------
- # Compiler and linker settings
-+# for FreeBSD
-+SO_freebsd=so
-+O_freebsd=o
-+CC_freebsd=gcc
-+DEF_freebsd=-DLUASOCKET_$(DEBUG) \
-+	-DLUASOCKET_API='__attribute__((visibility("default")))' \
-+	-DUNIX_API='__attribute__((visibility("default")))' \
-+	-DMIME_API='__attribute__((visibility("default")))'
-+CFLAGS_freebsd= -I$(LUAINC) $(DEF) -Wall -Wshadow -Wextra \
-+	-Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden
-+LDFLAGS_freebsd=-O -shared -fpic -o 
-+LD_freebsd=gcc
-+SOCKET_freebsd=usocket.o
-+
-+#------
-+# Compiler and linker settings
-+# for Solaris
-+SO_solaris=so
-+O_solaris=o
-+CC_solaris=gcc
-+DEF_solaris=-DLUASOCKET_$(DEBUG) \
-+	-DLUASOCKET_API='__attribute__((visibility("default")))' \
-+	-DUNIX_API='__attribute__((visibility("default")))' \
-+	-DMIME_API='__attribute__((visibility("default")))'
-+CFLAGS_solaris=-I$(LUAINC) $(DEF) -Wall -Wshadow -Wextra \
-+	-Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden   
-+LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o 
-+LD_solaris=gcc
-+SOCKET_solaris=usocket.o
-+
-+#------
-+# Compiler and linker settings
- # for MingW
- SO_mingw=dll
- O_mingw=o
- CC_mingw=gcc
--DEF_mingw= -DLUASOCKET_INET_PTON -DLUASOCKET_$(DEBUG) -DLUA_$(COMPAT)_MODULE \
-+DEF_mingw= -DLUASOCKET_INET_PTON -DLUASOCKET_$(DEBUG) \
- 	-DWINVER=0x0501 -DLUASOCKET_API='__declspec(dllexport)' \
- 	-DMIME_API='__declspec(dllexport)'
--CFLAGS_mingw= -I$(LUAINC) $(DEF) -pedantic -Wall -O2 -fno-common \
-+CFLAGS_mingw= -I$(LUAINC) $(DEF) -Wall -O2 -fno-common \
- 	-fvisibility=hidden
- LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o 
- LD_mingw=gcc
-@@ -179,8 +229,7 @@ O_win32=obj
- CC_win32=cl
- DEF_win32= //D "WIN32" //D "NDEBUG" //D "_WINDOWS" //D "_USRDLL" \
-      //D "LUASOCKET_API=__declspec(dllexport)" //D "_CRT_SECURE_NO_WARNINGS" \
--     //D "_WINDLL" //D "LUA_$(COMPAT)_MODULE" \
--	 //D "MIME_API=__declspec(dllexport)" \
-+     //D "_WINDLL" //D "MIME_API=__declspec(dllexport)" \
-      //D "LUASOCKET_$(DEBUG)" 
- CFLAGS_win32=//I "$(LUAINC)" $(DEF) //O2 //Ot //MD //W3 //nologo
- LDFLAGS_win32= //nologo //link //NOLOGO //DLL //INCREMENTAL:NO \
-@@ -188,7 +237,7 @@ LDFLAGS_win32= //nologo //link //NOLOGO //DLL //INCREMENTAL:NO \
-     //MANIFESTUAC:"level='asInvoker' uiAccess='false'" \
- 	//SUBSYSTEM:WINDOWS //OPT:REF //OPT:ICF //DYNAMICBASE:NO \
-     //MACHINE:X86 /LIBPATH:"$(shell cmd //c echo $(LUALIB))" \
--	lua$(subst .,,$(LUAV)).lib ws2_32.lib //OUT:
-+	$(LUALIBNAME_win32) ws2_32.lib //OUT:
- LD_win32=cl
- SOCKET_win32=wsocket.obj
- 
-@@ -204,8 +253,8 @@ SO=$(SO_$(PLAT))
- O=$(O_$(PLAT))
- SOCKET_V=3.0-rc1
- MIME_V=1.0.3
--SOCKET_SO=socket.$(SO).$(SOCKET_V)
--MIME_SO=mime.$(SO).$(MIME_V)
-+SOCKET_SO=socket-$(SOCKET_V).$(SO)
-+MIME_SO=mime-$(MIME_V).$(SO)
- UNIX_SO=unix.$(SO)
- SERIAL_SO=serial.$(SO)
- SOCKET=$(SOCKET_$(PLAT))
-@@ -215,8 +264,8 @@ SOCKET=$(SOCKET_$(PLAT))
- #
- CC=$(CC_$(PLAT))
- DEF=$(DEF_$(PLAT))
--CFLAGS=$(CFLAGS_$(PLAT))
--LDFLAGS=$(LDFLAGS_$(PLAT))
-+CFLAGS=$(MYCFLAGS) $(CFLAGS_$(PLAT))
-+LDFLAGS=$(MYLDFLAGS) $(LDFLAGS_$(PLAT))
- LD=$(LD_$(PLAT))
- LUAINC= $(LUAINC_$(PLAT))
- LUALIB= $(LUALIB_$(PLAT))
-@@ -230,6 +279,7 @@ SOCKET_OBJS= \
- 	buffer.$(O) \
- 	io.$(O) \
- 	auxiliar.$(O) \
-+	compat.$(O) \
- 	options.$(O) \
- 	inet.$(O) \
- 	$(SOCKET) \
-@@ -242,7 +292,8 @@ SOCKET_OBJS= \
- # Modules belonging mime-core
- #
- MIME_OBJS= \
--	mime.$(O)
-+	mime.$(O) \
-+	compat.$(O)
- 
- #------
- # Modules belonging unix (local domain sockets)
-@@ -259,7 +310,7 @@ UNIX_OBJS=\
- #------
- # Modules belonging to serial (device streams)
- #
--SERIAL_OBJS:=\
-+SERIAL_OBJS=\
- 	buffer.$(O) \
- 	auxiliar.$(O) \
- 	options.$(O) \
-@@ -289,6 +340,10 @@ TO_TOP_LDIR= \
- #
- default: $(PLAT)
- 
-+
-+freebsd:
-+	$(MAKE) all-unix PLAT=freebsd
-+
- macosx:
- 	$(MAKE) all-unix PLAT=macosx
- 
-@@ -300,6 +355,9 @@ linux:
- 
- mingw:
- 	$(MAKE) all PLAT=mingw
-+	
-+solaris:
-+	$(MAKE) all-unix PLAT=solaris
- 
- none:
- 	@echo "Please run"
-@@ -349,6 +407,7 @@ clean:
- #------
- # List of dependencies
- #
-+compat.$(O): compat.c compat.h
- auxiliar.$(O): auxiliar.c auxiliar.h
- buffer.$(O): buffer.c buffer.h io.h timeout.h
- except.$(O): except.c except.h
-diff --git a/src/mbox.lua b/src/mbox.lua
-index 7724ae2..ed9e781 100644
---- a/src/mbox.lua
-+++ b/src/mbox.lua
-@@ -61,7 +61,7 @@ function _M.parse_from(from)
- end
- 
- function _M.split_mbox(mbox_s)
--    mbox = {}
-+    local mbox = {}
-     mbox_s = string.gsub(mbox_s, "\r\n", "\n") .."\n\nFrom \n"
-     local nj, i, j = 1, 1, 1
-     while 1 do
-diff --git a/src/mime.c b/src/mime.c
-index dd37dcf..ed44104 100644
---- a/src/mime.c
-+++ b/src/mime.c
-@@ -6,10 +6,7 @@
- 
- #include "lua.h"
- #include "lauxlib.h"
--
--#if !defined(LUA_VERSION_NUM) || (LUA_VERSION_NUM < 501)
--#include "compat-5.1.h"
--#endif
-+#include "compat.h"
- 
- #include "mime.h"
- 
-@@ -41,7 +38,7 @@ static size_t b64decode(UC c, UC *input, size_t size, luaL_Buffer *buffer);
- static void qpsetup(UC *class, UC *unbase);
- static void qpquote(UC c, luaL_Buffer *buffer);
- static size_t qpdecode(UC c, UC *input, size_t size, luaL_Buffer *buffer);
--static size_t qpencode(UC c, UC *input, size_t size, 
-+static size_t qpencode(UC c, UC *input, size_t size,
-         const char *marker, luaL_Buffer *buffer);
- static size_t qppad(UC *input, size_t size, luaL_Buffer *buffer);
- 
-@@ -81,12 +78,8 @@ static UC b64unbase[256];
- \*-------------------------------------------------------------------------*/
- MIME_API int luaopen_mime_core(lua_State *L)
- {
--#if LUA_VERSION_NUM > 501 && !defined(LUA_COMPAT_MODULE)
-     lua_newtable(L);
-     luaL_setfuncs(L, func, 0);
--#else
--    luaL_openlib(L, "mime", func, 0);
--#endif
-     /* make version string available to scripts */
-     lua_pushstring(L, "_VERSION");
-     lua_pushstring(L, MIME_VERSION);
-@@ -103,15 +96,15 @@ MIME_API int luaopen_mime_core(lua_State *L)
- /*-------------------------------------------------------------------------*\
- * Incrementaly breaks a string into lines. The string can have CRLF breaks.
- * A, n = wrp(l, B, length)
--* A is a copy of B, broken into lines of at most 'length' bytes. 
--* 'l' is how many bytes are left for the first line of B. 
--* 'n' is the number of bytes left in the last line of A. 
-+* A is a copy of B, broken into lines of at most 'length' bytes.
-+* 'l' is how many bytes are left for the first line of B.
-+* 'n' is the number of bytes left in the last line of A.
- \*-------------------------------------------------------------------------*/
- static int mime_global_wrp(lua_State *L)
- {
-     size_t size = 0;
-     int left = (int) luaL_checknumber(L, 1);
--    const UC *input = (UC *) luaL_optlstring(L, 2, NULL, &size);
-+    const UC *input = (const UC *) luaL_optlstring(L, 2, NULL, &size);
-     const UC *last = input + size;
-     int length = (int) luaL_optnumber(L, 3, 76);
-     luaL_Buffer buffer;
-@@ -123,7 +116,7 @@ static int mime_global_wrp(lua_State *L)
-         else lua_pushnil(L);
-         lua_pushnumber(L, length);
-         return 2;
--    } 
-+    }
-     luaL_buffinit(L, &buffer);
-     while (input < last) {
-         switch (*input) {
-@@ -150,9 +143,9 @@ static int mime_global_wrp(lua_State *L)
- }
- 
- /*-------------------------------------------------------------------------*\
--* Fill base64 decode map. 
-+* Fill base64 decode map.
- \*-------------------------------------------------------------------------*/
--static void b64setup(UC *unbase) 
-+static void b64setup(UC *unbase)
- {
-     int i;
-     for (i = 0; i <= 255; i++) unbase[i] = (UC) 255;
-@@ -161,11 +154,11 @@ static void b64setup(UC *unbase)
- }
- 
- /*-------------------------------------------------------------------------*\
--* Acumulates bytes in input buffer until 3 bytes are available. 
-+* Acumulates bytes in input buffer until 3 bytes are available.
- * Translate the 3 bytes into Base64 form and append to buffer.
- * Returns new number of bytes in buffer.
- \*-------------------------------------------------------------------------*/
--static size_t b64encode(UC c, UC *input, size_t size, 
-+static size_t b64encode(UC c, UC *input, size_t size,
-         luaL_Buffer *buffer)
- {
-     input[size++] = c;
-@@ -174,7 +167,7 @@ static size_t b64encode(UC c, UC *input, size_t size,
-         unsigned long value = 0;
-         value += input[0]; value <<= 8;
-         value += input[1]; value <<= 8;
--        value += input[2]; 
-+        value += input[2];
-         code[3] = b64base[value & 0x3f]; value >>= 6;
-         code[2] = b64base[value & 0x3f]; value >>= 6;
-         code[1] = b64base[value & 0x3f]; value >>= 6;
-@@ -186,11 +179,11 @@ static size_t b64encode(UC c, UC *input, size_t size,
- }
- 
- /*-------------------------------------------------------------------------*\
--* Encodes the Base64 last 1 or 2 bytes and adds padding '=' 
-+* Encodes the Base64 last 1 or 2 bytes and adds padding '='
- * Result, if any, is appended to buffer.
- * Returns 0.
- \*-------------------------------------------------------------------------*/
--static size_t b64pad(const UC *input, size_t size, 
-+static size_t b64pad(const UC *input, size_t size,
-         luaL_Buffer *buffer)
- {
-     unsigned long value = 0;
-@@ -203,7 +196,7 @@ static size_t b64pad(const UC *input, size_t size,
-             luaL_addlstring(buffer, (char *) code, 4);
-             break;
-         case 2:
--            value = input[0]; value <<= 8; 
-+            value = input[0]; value <<= 8;
-             value |= input[1]; value <<= 2;
-             code[2] = b64base[value & 0x3f]; value >>= 6;
-             code[1] = b64base[value & 0x3f]; value >>= 6;
-@@ -217,11 +210,11 @@ static size_t b64pad(const UC *input, size_t size,
- }
- 
- /*-------------------------------------------------------------------------*\
--* Acumulates bytes in input buffer until 4 bytes are available. 
-+* Acumulates bytes in input buffer until 4 bytes are available.
- * Translate the 4 bytes from Base64 form and append to buffer.
- * Returns new number of bytes in buffer.
- \*-------------------------------------------------------------------------*/
--static size_t b64decode(UC c, UC *input, size_t size, 
-+static size_t b64decode(UC c, UC *input, size_t size,
-         luaL_Buffer *buffer)
- {
-     /* ignore invalid characters */
-@@ -239,7 +232,7 @@ static size_t b64decode(UC c, UC *input, size_t size,
-         decoded[1] = (UC) (value & 0xff); value >>= 8;
-         decoded[0] = (UC) value;
-         /* take care of paddding */
--        valid = (input[2] == '=') ? 1 : (input[3] == '=') ? 2 : 3; 
-+        valid = (input[2] == '=') ? 1 : (input[3] == '=') ? 2 : 3;
-         luaL_addlstring(buffer, (char *) decoded, valid);
-         return 0;
-     /* need more data */
-@@ -251,7 +244,7 @@ static size_t b64decode(UC c, UC *input, size_t size,
- * A, B = b64(C, D)
- * A is the encoded version of the largest prefix of C .. D that is
- * divisible by 3. B has the remaining bytes of C .. D, *without* encoding.
--* The easiest thing would be to concatenate the two strings and 
-+* The easiest thing would be to concatenate the two strings and
- * encode the result, but we can't afford that or Lua would dupplicate
- * every chunk we received.
- \*-------------------------------------------------------------------------*/
-@@ -259,7 +252,7 @@ static int mime_global_b64(lua_State *L)
- {
-     UC atom[3];
-     size_t isize = 0, asize = 0;
--    const UC *input = (UC *) luaL_optlstring(L, 1, NULL, &isize);
-+    const UC *input = (const UC *) luaL_optlstring(L, 1, NULL, &isize);
-     const UC *last = input + isize;
-     luaL_Buffer buffer;
-     /* end-of-input blackhole */
-@@ -272,9 +265,9 @@ static int mime_global_b64(lua_State *L)
-     lua_settop(L, 2);
-     /* process first part of the input */
-     luaL_buffinit(L, &buffer);
--    while (input < last) 
-+    while (input < last)
-         asize = b64encode(*input++, atom, asize, &buffer);
--    input = (UC *) luaL_optlstring(L, 2, NULL, &isize);
-+    input = (const UC *) luaL_optlstring(L, 2, NULL, &isize);
-     /* if second part is nil, we are done */
-     if (!input) {
-         size_t osize = 0;
-@@ -288,7 +281,7 @@ static int mime_global_b64(lua_State *L)
-     }
-     /* otherwise process the second part */
-     last = input + isize;
--    while (input < last) 
-+    while (input < last)
-         asize = b64encode(*input++, atom, asize, &buffer);
-     luaL_pushresult(&buffer);
-     lua_pushlstring(L, (char *) atom, asize);
-@@ -305,7 +298,7 @@ static int mime_global_unb64(lua_State *L)
- {
-     UC atom[4];
-     size_t isize = 0, asize = 0;
--    const UC *input = (UC *) luaL_optlstring(L, 1, NULL, &isize);
-+    const UC *input = (const UC *) luaL_optlstring(L, 1, NULL, &isize);
-     const UC *last = input + isize;
-     luaL_Buffer buffer;
-     /* end-of-input blackhole */
-@@ -318,9 +311,9 @@ static int mime_global_unb64(lua_State *L)
-     lua_settop(L, 2);
-     /* process first part of the input */
-     luaL_buffinit(L, &buffer);
--    while (input < last) 
-+    while (input < last)
-         asize = b64decode(*input++, atom, asize, &buffer);
--    input = (UC *) luaL_optlstring(L, 2, NULL, &isize);
-+    input = (const UC *) luaL_optlstring(L, 2, NULL, &isize);
-     /* if second is nil, we are done */
-     if (!input) {
-         size_t osize = 0;
-@@ -333,7 +326,7 @@ static int mime_global_unb64(lua_State *L)
-     }
-     /* otherwise, process the rest of the input */
-     last = input + isize;
--    while (input < last) 
-+    while (input < last)
-         asize = b64decode(*input++, atom, asize, &buffer);
-     luaL_pushresult(&buffer);
-     lua_pushlstring(L, (char *) atom, asize);
-@@ -349,7 +342,7 @@ static int mime_global_unb64(lua_State *L)
- * 9 and 32 can be plain, unless in the end of a line, where must be =XX
- * encoded lines must be no longer than 76 not counting CRLF
- * soft line-break are =CRLF
--* To encode one byte, we need to see the next two. 
-+* To encode one byte, we need to see the next two.
- * Worst case is when we see a space, and wonder if a CRLF is comming
- \*-------------------------------------------------------------------------*/
- /*-------------------------------------------------------------------------*\
-@@ -362,7 +355,7 @@ static void qpsetup(UC *cl, UC *unbase)
-     for (i = 0; i < 256; i++) cl[i] = QP_QUOTED;
-     for (i = 33; i <= 60; i++) cl[i] = QP_PLAIN;
-     for (i = 62; i <= 126; i++) cl[i] = QP_PLAIN;
--    cl['\t'] = QP_IF_LAST; 
-+    cl['\t'] = QP_IF_LAST;
-     cl[' '] = QP_IF_LAST;
-     cl['\r'] = QP_CR;
-     for (i = 0; i < 256; i++) unbase[i] = 255;
-@@ -388,9 +381,9 @@ static void qpquote(UC c, luaL_Buffer *buffer)
- 
- /*-------------------------------------------------------------------------*\
- * Accumulate characters until we are sure about how to deal with them.
--* Once we are sure, output to the buffer, in the correct form. 
-+* Once we are sure, output to the buffer, in the correct form.
- \*-------------------------------------------------------------------------*/
--static size_t qpencode(UC c, UC *input, size_t size, 
-+static size_t qpencode(UC c, UC *input, size_t size,
-         const char *marker, luaL_Buffer *buffer)
- {
-     input[size++] = c;
-@@ -431,7 +424,7 @@ static size_t qpencode(UC c, UC *input, size_t size,
- }
- 
- /*-------------------------------------------------------------------------*\
--* Deal with the final characters 
-+* Deal with the final characters
- \*-------------------------------------------------------------------------*/
- static size_t qppad(UC *input, size_t size, luaL_Buffer *buffer)
- {
-@@ -448,8 +441,8 @@ static size_t qppad(UC *input, size_t size, luaL_Buffer *buffer)
- * Incrementally converts a string to quoted-printable
- * A, B = qp(C, D, marker)
- * Marker is the text to be used to replace CRLF sequences found in A.
--* A is the encoded version of the largest prefix of C .. D that 
--* can be encoded without doubts. 
-+* A is the encoded version of the largest prefix of C .. D that
-+* can be encoded without doubts.
- * B has the remaining bytes of C .. D, *without* encoding.
- \*-------------------------------------------------------------------------*/
- static int mime_global_qp(lua_State *L)
-@@ -457,7 +450,7 @@ static int mime_global_qp(lua_State *L)
- 
-     size_t asize = 0, isize = 0;
-     UC atom[3];
--    const UC *input = (UC *) luaL_optlstring(L, 1, NULL, &isize);
-+    const UC *input = (const UC *) luaL_optlstring(L, 1, NULL, &isize);
-     const UC *last = input + isize;
-     const char *marker = luaL_optstring(L, 3, CRLF);
-     luaL_Buffer buffer;
-@@ -473,7 +466,7 @@ static int mime_global_qp(lua_State *L)
-     luaL_buffinit(L, &buffer);
-     while (input < last)
-         asize = qpencode(*input++, atom, asize, marker, &buffer);
--    input = (UC *) luaL_optlstring(L, 2, NULL, &isize);
-+    input = (const UC *) luaL_optlstring(L, 2, NULL, &isize);
-     /* if second part is nil, we are done */
-     if (!input) {
-         asize = qppad(atom, asize, &buffer);
-@@ -493,7 +486,7 @@ static int mime_global_qp(lua_State *L)
- 
- /*-------------------------------------------------------------------------*\
- * Accumulate characters until we are sure about how to deal with them.
--* Once we are sure, output the to the buffer, in the correct form. 
-+* Once we are sure, output the to the buffer, in the correct form.
- \*-------------------------------------------------------------------------*/
- static size_t qpdecode(UC c, UC *input, size_t size, luaL_Buffer *buffer) {
-     int d;
-@@ -501,8 +494,8 @@ static size_t qpdecode(UC c, UC *input, size_t size, luaL_Buffer *buffer) {
-     /* deal with all characters we can deal */
-     switch (input[0]) {
-         /* if we have an escape character */
--        case '=': 
--            if (size < 3) return size; 
-+        case '=':
-+            if (size < 3) return size;
-             /* eliminate soft line break */
-             if (input[1] == '\r' && input[2] == '\n') return 0;
-             /* decode quoted representation */
-@@ -512,7 +505,7 @@ static size_t qpdecode(UC c, UC *input, size_t size, luaL_Buffer *buffer) {
-             else luaL_addchar(buffer, (char) ((c << 4) + d));
-             return 0;
-         case '\r':
--            if (size < 2) return size; 
-+            if (size < 2) return size;
-             if (input[1] == '\n') luaL_addlstring(buffer, (char *)input, 2);
-             return 0;
-         default:
-@@ -525,15 +518,15 @@ static size_t qpdecode(UC c, UC *input, size_t size, luaL_Buffer *buffer) {
- /*-------------------------------------------------------------------------*\
- * Incrementally decodes a string in quoted-printable
- * A, B = qp(C, D)
--* A is the decoded version of the largest prefix of C .. D that 
--* can be decoded without doubts. 
-+* A is the decoded version of the largest prefix of C .. D that
-+* can be decoded without doubts.
- * B has the remaining bytes of C .. D, *without* decoding.
- \*-------------------------------------------------------------------------*/
- static int mime_global_unqp(lua_State *L)
- {
-     size_t asize = 0, isize = 0;
-     UC atom[3];
--    const UC *input = (UC *) luaL_optlstring(L, 1, NULL, &isize);
-+    const UC *input = (const UC *) luaL_optlstring(L, 1, NULL, &isize);
-     const UC *last = input + isize;
-     luaL_Buffer buffer;
-     /* end-of-input blackhole */
-@@ -548,14 +541,14 @@ static int mime_global_unqp(lua_State *L)
-     luaL_buffinit(L, &buffer);
-     while (input < last)
-         asize = qpdecode(*input++, atom, asize, &buffer);
--    input = (UC *) luaL_optlstring(L, 2, NULL, &isize);
-+    input = (const UC *) luaL_optlstring(L, 2, NULL, &isize);
-     /* if second part is nil, we are done */
-     if (!input) {
-         luaL_pushresult(&buffer);
-         if (!(*lua_tostring(L, -1))) lua_pushnil(L);
-         lua_pushnil(L);
-         return 2;
--    } 
-+    }
-     /* otherwise process rest of input */
-     last = input + isize;
-     while (input < last)
-@@ -568,9 +561,9 @@ static int mime_global_unqp(lua_State *L)
- /*-------------------------------------------------------------------------*\
- * Incrementally breaks a quoted-printed string into lines
- * A, n = qpwrp(l, B, length)
--* A is a copy of B, broken into lines of at most 'length' bytes. 
--* 'l' is how many bytes are left for the first line of B. 
--* 'n' is the number of bytes left in the last line of A. 
-+* A is a copy of B, broken into lines of at most 'length' bytes.
-+* 'l' is how many bytes are left for the first line of B.
-+* 'n' is the number of bytes left in the last line of A.
- * There are two complications: lines can't be broken in the middle
- * of an encoded =XX, and there might be line breaks already
- \*-------------------------------------------------------------------------*/
-@@ -578,7 +571,7 @@ static int mime_global_qpwrp(lua_State *L)
- {
-     size_t size = 0;
-     int left = (int) luaL_checknumber(L, 1);
--    const UC *input = (UC *) luaL_optlstring(L, 2, NULL, &size);
-+    const UC *input = (const UC *) luaL_optlstring(L, 2, NULL, &size);
-     const UC *last = input + size;
-     int length = (int) luaL_optnumber(L, 3, 76);
-     luaL_Buffer buffer;
-@@ -603,11 +596,11 @@ static int mime_global_qpwrp(lua_State *L)
-                 if (left <= 3) {
-                     left = length;
-                     luaL_addstring(&buffer, EQCRLF);
--                } 
-+                }
-                 luaL_addchar(&buffer, *input);
-                 left--;
-                 break;
--            default: 
-+            default:
-                 if (left <= 1) {
-                     left = length;
-                     luaL_addstring(&buffer, EQCRLF);
-@@ -635,7 +628,7 @@ static int mime_global_qpwrp(lua_State *L)
- * last is the previous character
- \*-------------------------------------------------------------------------*/
- #define eolcandidate(c) (c == '\r' || c == '\n')
--static int eolprocess(int c, int last, const char *marker, 
-+static int eolprocess(int c, int last, const char *marker,
-         luaL_Buffer *buffer)
- {
-     if (eolcandidate(c)) {
-@@ -653,15 +646,15 @@ static int eolprocess(int c, int last, const char *marker,
- }
- 
- /*-------------------------------------------------------------------------*\
--* Converts a string to uniform EOL convention. 
-+* Converts a string to uniform EOL convention.
- * A, n = eol(o, B, marker)
- * A is the converted version of the largest prefix of B that can be
--* converted unambiguously. 'o' is the context returned by the previous 
-+* converted unambiguously. 'o' is the context returned by the previous
- * call. 'n' is the new context.
- \*-------------------------------------------------------------------------*/
- static int mime_global_eol(lua_State *L)
- {
--    int ctx = luaL_checkint(L, 1);
-+    int ctx = luaL_checkinteger(L, 1);
-     size_t isize = 0;
-     const char *input = luaL_optlstring(L, 2, NULL, &isize);
-     const char *last = input + isize;
-@@ -683,18 +676,18 @@ static int mime_global_eol(lua_State *L)
- }
- 
- /*-------------------------------------------------------------------------*\
--* Takes one byte and stuff it if needed. 
-+* Takes one byte and stuff it if needed.
- \*-------------------------------------------------------------------------*/
- static size_t dot(int c, size_t state, luaL_Buffer *buffer)
- {
-     luaL_addchar(buffer, (char) c);
-     switch (c) {
--        case '\r': 
-+        case '\r':
-             return 1;
--        case '\n': 
--            return (state == 1)? 2: 0; 
--        case '.':  
--            if (state == 2) 
-+        case '\n':
-+            return (state == 1)? 2: 0;
-+        case '.':
-+            if (state == 2)
-                 luaL_addchar(buffer, '.');
-         default:
-             return 0;
-@@ -719,7 +712,7 @@ static int mime_global_dot(lua_State *L)
-     }
-     /* process all input */
-     luaL_buffinit(L, &buffer);
--    while (input < last) 
-+    while (input < last)
-         state = dot(*input++, state, &buffer);
-     luaL_pushresult(&buffer);
-     lua_pushnumber(L, (lua_Number) state);
-diff --git a/src/options.c b/src/options.c
-index 8ac2a14..20f4c28 100644
---- a/src/options.c
-+++ b/src/options.c
-@@ -1,8 +1,8 @@
- /*=========================================================================*\
--* Common option interface 
-+* Common option interface
- * LuaSocket toolkit
- \*=========================================================================*/
--#include <string.h> 
-+#include <string.h>
- 
- #include "lauxlib.h"
- 
-@@ -20,9 +20,9 @@ static int opt_setboolean(lua_State *L, p_socket ps, int level, int name);
- static int opt_getboolean(lua_State *L, p_socket ps, int level, int name);
- static int opt_setint(lua_State *L, p_socket ps, int level, int name);
- static int opt_getint(lua_State *L, p_socket ps, int level, int name);
--static int opt_set(lua_State *L, p_socket ps, int level, int name, 
-+static int opt_set(lua_State *L, p_socket ps, int level, int name,
-         void *val, int len);
--static int opt_get(lua_State *L, p_socket ps, int level, int name, 
-+static int opt_get(lua_State *L, p_socket ps, int level, int name,
-         void *val, int* len);
- 
- /*=========================================================================*\
-@@ -60,29 +60,29 @@ int opt_meth_getoption(lua_State *L, p_opt opt, p_socket ps)
- /* enables reuse of local address */
- int opt_set_reuseaddr(lua_State *L, p_socket ps)
- {
--    return opt_setboolean(L, ps, SOL_SOCKET, SO_REUSEADDR); 
-+    return opt_setboolean(L, ps, SOL_SOCKET, SO_REUSEADDR);
- }
- 
- int opt_get_reuseaddr(lua_State *L, p_socket ps)
- {
--    return opt_getboolean(L, ps, SOL_SOCKET, SO_REUSEADDR); 
-+    return opt_getboolean(L, ps, SOL_SOCKET, SO_REUSEADDR);
- }
- 
- /* enables reuse of local port */
- int opt_set_reuseport(lua_State *L, p_socket ps)
- {
--    return opt_setboolean(L, ps, SOL_SOCKET, SO_REUSEPORT); 
-+    return opt_setboolean(L, ps, SOL_SOCKET, SO_REUSEPORT);
- }
- 
- int opt_get_reuseport(lua_State *L, p_socket ps)
- {
--    return opt_getboolean(L, ps, SOL_SOCKET, SO_REUSEPORT); 
-+    return opt_getboolean(L, ps, SOL_SOCKET, SO_REUSEPORT);
- }
- 
- /* disables the Naggle algorithm */
- int opt_set_tcp_nodelay(lua_State *L, p_socket ps)
- {
--    return opt_setboolean(L, ps, IPPROTO_TCP, TCP_NODELAY); 
-+    return opt_setboolean(L, ps, IPPROTO_TCP, TCP_NODELAY);
- }
- 
- int opt_get_tcp_nodelay(lua_State *L, p_socket ps)
-@@ -92,12 +92,12 @@ int opt_get_tcp_nodelay(lua_State *L, p_socket ps)
- 
- int opt_set_keepalive(lua_State *L, p_socket ps)
- {
--    return opt_setboolean(L, ps, SOL_SOCKET, SO_KEEPALIVE); 
-+    return opt_setboolean(L, ps, SOL_SOCKET, SO_KEEPALIVE);
- }
- 
- int opt_get_keepalive(lua_State *L, p_socket ps)
- {
--    return opt_getboolean(L, ps, SOL_SOCKET, SO_KEEPALIVE); 
-+    return opt_getboolean(L, ps, SOL_SOCKET, SO_KEEPALIVE);
- }
- 
- int opt_set_dontroute(lua_State *L, p_socket ps)
-@@ -105,11 +105,21 @@ int opt_set_dontroute(lua_State *L, p_socket ps)
-     return opt_setboolean(L, ps, SOL_SOCKET, SO_DONTROUTE);
- }
- 
-+int opt_get_dontroute(lua_State *L, p_socket ps)
-+{
-+    return opt_getboolean(L, ps, SOL_SOCKET, SO_DONTROUTE);
-+}
-+
- int opt_set_broadcast(lua_State *L, p_socket ps)
- {
-     return opt_setboolean(L, ps, SOL_SOCKET, SO_BROADCAST);
- }
- 
-+int opt_get_broadcast(lua_State *L, p_socket ps)
-+{
-+    return opt_getboolean(L, ps, SOL_SOCKET, SO_BROADCAST);
-+}
-+
- int opt_set_ip6_unicast_hops(lua_State *L, p_socket ps)
- {
-   return opt_setint(L, ps, IPPROTO_IPV6, IPV6_UNICAST_HOPS);
-@@ -156,12 +166,12 @@ int opt_set_linger(lua_State *L, p_socket ps)
-     if (!lua_istable(L, 3)) auxiliar_typeerror(L,3,lua_typename(L, LUA_TTABLE));
-     lua_pushstring(L, "on");
-     lua_gettable(L, 3);
--    if (!lua_isboolean(L, -1)) 
-+    if (!lua_isboolean(L, -1))
-         luaL_argerror(L, 3, "boolean 'on' field expected");
-     li.l_onoff = (u_short) lua_toboolean(L, -1);
-     lua_pushstring(L, "timeout");
-     lua_gettable(L, 3);
--    if (!lua_isnumber(L, -1)) 
-+    if (!lua_isnumber(L, -1))
-         luaL_argerror(L, 3, "number 'timeout' field expected");
-     li.l_linger = (u_short) lua_tonumber(L, -1);
-     return opt_set(L, ps, SOL_SOCKET, SO_LINGER, (char *) &li, sizeof(li));
-@@ -194,7 +204,7 @@ int opt_set_ip_multicast_if(lua_State *L, p_socket ps)
-     val.s_addr = htonl(INADDR_ANY);
-     if (strcmp(address, "*") && !inet_aton(address, &val))
-         luaL_argerror(L, 3, "ip expected");
--    return opt_set(L, ps, IPPROTO_IP, IP_MULTICAST_IF, 
-+    return opt_set(L, ps, IPPROTO_IP, IP_MULTICAST_IF,
-         (char *) &val, sizeof(val));
- }
- 
-@@ -250,17 +260,17 @@ static int opt_setmembership(lua_State *L, p_socket ps, int level, int name)
-     if (!lua_istable(L, 3)) auxiliar_typeerror(L,3,lua_typename(L, LUA_TTABLE));
-     lua_pushstring(L, "multiaddr");
-     lua_gettable(L, 3);
--    if (!lua_isstring(L, -1)) 
-+    if (!lua_isstring(L, -1))
-         luaL_argerror(L, 3, "string 'multiaddr' field expected");
--    if (!inet_aton(lua_tostring(L, -1), &val.imr_multiaddr)) 
-+    if (!inet_aton(lua_tostring(L, -1), &val.imr_multiaddr))
-         luaL_argerror(L, 3, "invalid 'multiaddr' ip address");
-     lua_pushstring(L, "interface");
-     lua_gettable(L, 3);
--    if (!lua_isstring(L, -1)) 
-+    if (!lua_isstring(L, -1))
-         luaL_argerror(L, 3, "string 'interface' field expected");
-     val.imr_interface.s_addr = htonl(INADDR_ANY);
-     if (strcmp(lua_tostring(L, -1), "*") &&
--            !inet_aton(lua_tostring(L, -1), &val.imr_interface)) 
-+            !inet_aton(lua_tostring(L, -1), &val.imr_interface))
-         luaL_argerror(L, 3, "invalid 'interface' ip address");
-     return opt_set(L, ps, level, name, (char *) &val, sizeof(val));
- }
-@@ -272,14 +282,14 @@ static int opt_ip6_setmembership(lua_State *L, p_socket ps, int level, int name)
-     if (!lua_istable(L, 3)) auxiliar_typeerror(L,3,lua_typename(L, LUA_TTABLE));
-     lua_pushstring(L, "multiaddr");
-     lua_gettable(L, 3);
--    if (!lua_isstring(L, -1)) 
-+    if (!lua_isstring(L, -1))
-         luaL_argerror(L, 3, "string 'multiaddr' field expected");
--    if (!inet_pton(AF_INET6, lua_tostring(L, -1), &val.ipv6mr_multiaddr)) 
-+    if (!inet_pton(AF_INET6, lua_tostring(L, -1), &val.ipv6mr_multiaddr))
-         luaL_argerror(L, 3, "invalid 'multiaddr' ip address");
-     lua_pushstring(L, "interface");
-     lua_gettable(L, 3);
-     /* By default we listen to interface on default route
--     * (sigh). However, interface= can override it. We should 
-+     * (sigh). However, interface= can override it. We should
-      * support either number, or name for it. Waiting for
-      * windows port of if_nametoindex */
-     if (!lua_isnil(L, -1)) {
-@@ -291,7 +301,7 @@ static int opt_ip6_setmembership(lua_State *L, p_socket ps, int level, int name)
-     return opt_set(L, ps, level, name, (char *) &val, sizeof(val));
- }
- 
--static 
-+static
- int opt_get(lua_State *L, p_socket ps, int level, int name, void *val, int* len)
- {
-     socklen_t socklen = *len;
-@@ -304,7 +314,7 @@ int opt_get(lua_State *L, p_socket ps, int level, int name, void *val, int* len)
-     return 0;
- }
- 
--static 
-+static
- int opt_set(lua_State *L, p_socket ps, int level, int name, void *val, int len)
- {
-     if (setsockopt(*ps, level, name, (char *) val, len) < 0) {
-diff --git a/src/options.h b/src/options.h
-index 5657a06..19ba0df 100644
---- a/src/options.h
-+++ b/src/options.h
-@@ -21,7 +21,6 @@ typedef t_opt *p_opt;
- /* supported options for setoption */
- int opt_set_dontroute(lua_State *L, p_socket ps);
- int opt_set_broadcast(lua_State *L, p_socket ps);
--int opt_set_reuseaddr(lua_State *L, p_socket ps);
- int opt_set_tcp_nodelay(lua_State *L, p_socket ps);
- int opt_set_keepalive(lua_State *L, p_socket ps);
- int opt_set_linger(lua_State *L, p_socket ps);
-@@ -40,18 +39,21 @@ int opt_set_ip6_drop_membersip(lua_State *L, p_socket ps);
- int opt_set_ip6_v6only(lua_State *L, p_socket ps);
- 
- /* supported options for getoption */
-+int opt_get_dontroute(lua_State *L, p_socket ps);
-+int opt_get_broadcast(lua_State *L, p_socket ps);
- int opt_get_reuseaddr(lua_State *L, p_socket ps);
-+int opt_get_reuseport(lua_State *L, p_socket ps);
- int opt_get_tcp_nodelay(lua_State *L, p_socket ps);
- int opt_get_keepalive(lua_State *L, p_socket ps);
- int opt_get_linger(lua_State *L, p_socket ps);
--int opt_get_reuseaddr(lua_State *L, p_socket ps);
- int opt_get_ip_multicast_loop(lua_State *L, p_socket ps);
- int opt_get_ip_multicast_if(lua_State *L, p_socket ps);
- int opt_get_error(lua_State *L, p_socket ps);
- int opt_get_ip6_multicast_loop(lua_State *L, p_socket ps);
- int opt_get_ip6_multicast_hops(lua_State *L, p_socket ps);
- int opt_get_ip6_unicast_hops(lua_State *L, p_socket ps);
--int opt_get_ip6_v6only(lua_State *L, p_socket ps); 
-+int opt_get_ip6_v6only(lua_State *L, p_socket ps);
-+int opt_get_reuseport(lua_State *L, p_socket ps);
- 
- /* invokes the appropriate option handler */
- int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps);
-diff --git a/src/pierror.h b/src/pierror.h
-new file mode 100644
-index 0000000..cb773ab
---- /dev/null
-+++ b/src/pierror.h
-@@ -0,0 +1,28 @@
-+#ifndef PIERROR_H
-+#define PIERROR_H
-+/*=========================================================================*\
-+* Error messages
-+* Defines platform independent error messages
-+\*=========================================================================*/
-+
-+#define PIE_HOST_NOT_FOUND "host not found"
-+#define PIE_ADDRINUSE      "address already in use"
-+#define PIE_ISCONN         "already connected"
-+#define PIE_ACCESS         "permission denied"
-+#define PIE_CONNREFUSED    "connection refused"
-+#define PIE_CONNABORTED    "closed"
-+#define PIE_CONNRESET      "closed"
-+#define PIE_TIMEDOUT       "timeout"
-+#define PIE_AGAIN          "temporary failure in name resolution"
-+#define PIE_BADFLAGS       "invalid value for ai_flags"
-+#define PIE_BADHINTS       "invalid value for hints"
-+#define PIE_FAIL           "non-recoverable failure in name resolution"
-+#define PIE_FAMILY         "ai_family not supported"
-+#define PIE_MEMORY         "memory allocation failure"
-+#define PIE_NONAME         "host or service not provided, or not known"
-+#define PIE_OVERFLOW       "argument buffer overflow"
-+#define PIE_PROTOCOL       "resolved protocol is unknown"
-+#define PIE_SERVICE        "service not supported for socket type"
-+#define PIE_SOCKTYPE       "ai_socktype not supported"
-+
-+#endif
-diff --git a/src/select.c b/src/select.c
-index fafaa62..9d133b7 100644
---- a/src/select.c
-+++ b/src/select.c
-@@ -6,6 +6,7 @@
- 
- #include "lua.h"
- #include "lauxlib.h"
-+#include "compat.h"
- 
- #include "socket.h"
- #include "timeout.h"
-@@ -16,10 +17,10 @@
- \*=========================================================================*/
- static t_socket getfd(lua_State *L);
- static int dirty(lua_State *L);
--static void collect_fd(lua_State *L, int tab, int itab, 
-+static void collect_fd(lua_State *L, int tab, int itab,
-         fd_set *set, t_socket *max_fd);
- static int check_dirty(lua_State *L, int tab, int dtab, fd_set *set);
--static void return_fd(lua_State *L, fd_set *set, t_socket max_fd, 
-+static void return_fd(lua_State *L, fd_set *set, t_socket max_fd,
-         int itab, int tab, int start);
- static void make_assoc(lua_State *L, int tab);
- static int global_select(lua_State *L);
-@@ -38,13 +39,12 @@ static luaL_Reg func[] = {
- \*-------------------------------------------------------------------------*/
- int select_open(lua_State *L) {
-     lua_pushstring(L, "_SETSIZE");
--    lua_pushnumber(L, FD_SETSIZE);
-+    lua_pushinteger(L, FD_SETSIZE);
-+    lua_rawset(L, -3);
-+    lua_pushstring(L, "_SOCKETINVALID");
-+    lua_pushinteger(L, SOCKET_INVALID);
-     lua_rawset(L, -3);
--#if LUA_VERSION_NUM > 501 && !defined(LUA_COMPAT_MODULE)
-     luaL_setfuncs(L, func, 0);
--#else
--    luaL_openlib(L, NULL, func, 0);
--#endif
-     return 0;
- }
- 
-@@ -98,10 +98,10 @@ static t_socket getfd(lua_State *L) {
-         lua_pushvalue(L, -2);
-         lua_call(L, 1, 1);
-         if (lua_isnumber(L, -1)) {
--            double numfd = lua_tonumber(L, -1); 
-+            double numfd = lua_tonumber(L, -1);
-             fd = (numfd >= 0.0)? (t_socket) numfd: SOCKET_INVALID;
-         }
--    } 
-+    }
-     lua_pop(L, 1);
-     return fd;
- }
-@@ -114,12 +114,12 @@ static int dirty(lua_State *L) {
-         lua_pushvalue(L, -2);
-         lua_call(L, 1, 1);
-         is = lua_toboolean(L, -1);
--    } 
-+    }
-     lua_pop(L, 1);
-     return is;
- }
- 
--static void collect_fd(lua_State *L, int tab, int itab, 
-+static void collect_fd(lua_State *L, int tab, int itab,
-         fd_set *set, t_socket *max_fd) {
-     int i = 1, n = 0;
-     /* nil is the same as an empty table */
-@@ -139,16 +139,16 @@ static void collect_fd(lua_State *L, int tab, int itab,
-         if (fd != SOCKET_INVALID) {
-             /* make sure we don't overflow the fd_set */
- #ifdef _WIN32
--            if (n >= FD_SETSIZE) 
-+            if (n >= FD_SETSIZE)
-                 luaL_argerror(L, tab, "too many sockets");
- #else
--            if (fd >= FD_SETSIZE) 
-+            if (fd >= FD_SETSIZE)
-                 luaL_argerror(L, tab, "descriptor too large for set size");
- #endif
-             FD_SET(fd, set);
-             n++;
-             /* keep track of the largest descriptor so far */
--            if (*max_fd == SOCKET_INVALID || *max_fd < fd) 
-+            if (*max_fd == SOCKET_INVALID || *max_fd < fd)
-                 *max_fd = fd;
-             /* make sure we can map back from descriptor to the object */
-             lua_pushnumber(L, (lua_Number) fd);
-@@ -162,9 +162,9 @@ static void collect_fd(lua_State *L, int tab, int itab,
- 
- static int check_dirty(lua_State *L, int tab, int dtab, fd_set *set) {
-     int ndirty = 0, i = 1;
--    if (lua_isnil(L, tab)) 
-+    if (lua_isnil(L, tab))
-         return 0;
--    for ( ;; ) { 
-+    for ( ;; ) {
-         t_socket fd;
-         lua_pushnumber(L, i);
-         lua_gettable(L, tab);
-@@ -185,7 +185,7 @@ static int check_dirty(lua_State *L, int tab, int dtab, fd_set *set) {
-     return ndirty;
- }
- 
--static void return_fd(lua_State *L, fd_set *set, t_socket max_fd, 
-+static void return_fd(lua_State *L, fd_set *set, t_socket max_fd,
-         int itab, int tab, int start) {
-     t_socket fd;
-     for (fd = 0; fd < max_fd; fd++) {
-diff --git a/src/serial.c b/src/serial.c
-index 583d4e5..7bdb21c 100644
---- a/src/serial.c
-+++ b/src/serial.c
-@@ -2,7 +2,7 @@
- * Serial stream
- * LuaSocket toolkit
- \*=========================================================================*/
--#include <string.h> 
-+#include <string.h>
- 
- #include "lua.h"
- #include "lauxlib.h"
-@@ -11,7 +11,7 @@
- #include "socket.h"
- #include "options.h"
- #include "unix.h"
--#include <sys/un.h> 
-+#include <sys/un.h>
- 
- /*
- Reuses userdata definition from unix.h, since it is useful for all
-@@ -54,15 +54,6 @@ static luaL_Reg serial_methods[] = {
-     {NULL,          NULL}
- };
- 
--/* our socket creation function */
--/* this is an ad-hoc module that returns a single function 
-- * as such, do not include other functions in this array. */
--static luaL_Reg func[] = {
--    {"serial", global_create},
--    {NULL,          NULL}
--};
--
--
- /*-------------------------------------------------------------------------*\
- * Initializes module
- \*-------------------------------------------------------------------------*/
-@@ -71,14 +62,7 @@ LUASOCKET_API int luaopen_socket_serial(lua_State *L) {
-     auxiliar_newclass(L, "serial{client}", serial_methods);
-     /* create class groups */
-     auxiliar_add2group(L, "serial{client}", "serial{any}");
--#if LUA_VERSION_NUM > 501 && !defined(LUA_COMPAT_MODULE)
--    lua_pushcfunction(L, global_create);
--    (void) func;
--#else
--    /* set function into socket namespace */
--    luaL_openlib(L, "socket", func, 0);
-     lua_pushcfunction(L, global_create);
--#endif
-     return 1;
- }
- 
-@@ -120,7 +104,7 @@ static int meth_getfd(lua_State *L) {
- /* this is very dangerous, but can be handy for those that are brave enough */
- static int meth_setfd(lua_State *L) {
-     p_unix un = (p_unix) auxiliar_checkgroup(L, "serial{any}", 1);
--    un->sock = (t_socket) luaL_checknumber(L, 2); 
-+    un->sock = (t_socket) luaL_checknumber(L, 2);
-     return 0;
- }
- 
-@@ -131,7 +115,7 @@ static int meth_dirty(lua_State *L) {
- }
- 
- /*-------------------------------------------------------------------------*\
--* Closes socket used by object 
-+* Closes socket used by object
- \*-------------------------------------------------------------------------*/
- static int meth_close(lua_State *L)
- {
-@@ -156,7 +140,7 @@ static int meth_settimeout(lua_State *L) {
- 
- 
- /*-------------------------------------------------------------------------*\
--* Creates a serial object 
-+* Creates a serial object
- \*-------------------------------------------------------------------------*/
- static int global_create(lua_State *L) {
-     const char* path = luaL_checkstring(L, 1);
-@@ -180,7 +164,7 @@ static int global_create(lua_State *L) {
-     /* initialize remaining structure fields */
-     socket_setnonblocking(&sock);
-     un->sock = sock;
--    io_init(&un->io, (p_send) socket_write, (p_recv) socket_read, 
-+    io_init(&un->io, (p_send) socket_write, (p_recv) socket_read,
-             (p_error) socket_ioerror, &un->sock);
-     timeout_init(&un->tm, -1, -1);
-     buffer_init(&un->buf, &un->io, &un->tm);
-diff --git a/src/socket.lua b/src/socket.lua
-index 3913e6f..d1c0b16 100644
---- a/src/socket.lua
-+++ b/src/socket.lua
-@@ -32,23 +32,23 @@ function _M.bind(host, port, backlog)
-     err = "no info on address"
-     for i, alt in base.ipairs(addrinfo) do
-         if alt.family == "inet" then
--            sock, err = socket.tcp()
-+            sock, err = socket.tcp4()
-         else
-             sock, err = socket.tcp6()
-         end
-         if not sock then return nil, err end
-         sock:setoption("reuseaddr", true)
-         res, err = sock:bind(alt.addr, port)
--        if not res then 
-+        if not res then
-             sock:close()
--        else 
-+        else
-             res, err = sock:listen(backlog)
--            if not res then 
-+            if not res then
-                 sock:close()
-             else
-                 return sock
-             end
--        end 
-+        end
-     end
-     return nil, err
- end
-diff --git a/src/tcp.c b/src/tcp.c
-index 6594bda..ef9ee6f 100644
---- a/src/tcp.c
-+++ b/src/tcp.c
-@@ -6,6 +6,7 @@
- 
- #include "lua.h"
- #include "lauxlib.h"
-+#include "compat.h"
- 
- #include "auxiliar.h"
- #include "socket.h"
-@@ -17,6 +18,7 @@
- * Internal function prototypes
- \*=========================================================================*/
- static int global_create(lua_State *L);
-+static int global_create4(lua_State *L);
- static int global_create6(lua_State *L);
- static int global_connect(lua_State *L);
- static int meth_connect(lua_State *L);
-@@ -34,6 +36,7 @@ static int meth_accept(lua_State *L);
- static int meth_close(lua_State *L);
- static int meth_getoption(lua_State *L);
- static int meth_setoption(lua_State *L);
-+static int meth_gettimeout(lua_State *L);
- static int meth_settimeout(lua_State *L);
- static int meth_getfd(lua_State *L);
- static int meth_setfd(lua_State *L);
-@@ -63,6 +66,7 @@ static luaL_Reg tcp_methods[] = {
-     {"setpeername", meth_connect},
-     {"setsockname", meth_bind},
-     {"settimeout",  meth_settimeout},
-+    {"gettimeout",  meth_gettimeout},
-     {"shutdown",    meth_shutdown},
-     {NULL,          NULL}
- };
-@@ -71,6 +75,7 @@ static luaL_Reg tcp_methods[] = {
- static t_opt optget[] = {
-     {"keepalive",   opt_get_keepalive},
-     {"reuseaddr",   opt_get_reuseaddr},
-+    {"reuseport",   opt_get_reuseport},
-     {"tcp-nodelay", opt_get_tcp_nodelay},
-     {"linger",      opt_get_linger},
-     {"error",       opt_get_error},
-@@ -80,6 +85,7 @@ static t_opt optget[] = {
- static t_opt optset[] = {
-     {"keepalive",   opt_set_keepalive},
-     {"reuseaddr",   opt_set_reuseaddr},
-+    {"reuseport",   opt_set_reuseport},
-     {"tcp-nodelay", opt_set_tcp_nodelay},
-     {"ipv6-v6only", opt_set_ip6_v6only},
-     {"linger",      opt_set_linger},
-@@ -89,6 +95,7 @@ static t_opt optset[] = {
- /* functions in library namespace */
- static luaL_Reg func[] = {
-     {"tcp", global_create},
-+    {"tcp4", global_create4},
-     {"tcp6", global_create6},
-     {"connect", global_connect},
-     {NULL, NULL}
-@@ -108,11 +115,7 @@ int tcp_open(lua_State *L)
-     auxiliar_add2group(L, "tcp{client}", "tcp{any}");
-     auxiliar_add2group(L, "tcp{server}", "tcp{any}");
-     /* define library functions */
--#if LUA_VERSION_NUM > 501 && !defined(LUA_COMPAT_MODULE)
-     luaL_setfuncs(L, func, 0);
--#else
--    luaL_openlib(L, NULL, func, 0);
--#endif
-     return 0;
- }
- 
-@@ -216,8 +219,7 @@ static int meth_accept(lua_State *L)
- /*-------------------------------------------------------------------------*\
- * Binds an object to an address
- \*-------------------------------------------------------------------------*/
--static int meth_bind(lua_State *L)
--{
-+static int meth_bind(lua_State *L) {
-     p_tcp tcp = (p_tcp) auxiliar_checkclass(L, "tcp{master}", 1);
-     const char *address =  luaL_checkstring(L, 2);
-     const char *port = luaL_checkstring(L, 3);
-@@ -227,7 +229,7 @@ static int meth_bind(lua_State *L)
-     bindhints.ai_socktype = SOCK_STREAM;
-     bindhints.ai_family = tcp->family;
-     bindhints.ai_flags = AI_PASSIVE;
--    err = inet_trybind(&tcp->sock, address, port, &bindhints);
-+    err = inet_trybind(&tcp->sock, &tcp->family, address, port, &bindhints);
-     if (err) {
-         lua_pushnil(L);
-         lua_pushstring(L, err);
-@@ -240,8 +242,7 @@ static int meth_bind(lua_State *L)
- /*-------------------------------------------------------------------------*\
- * Turns a master tcp object into a client object.
- \*-------------------------------------------------------------------------*/
--static int meth_connect(lua_State *L)
--{
-+static int meth_connect(lua_State *L) {
-     p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
-     const char *address =  luaL_checkstring(L, 2);
-     const char *port = luaL_checkstring(L, 3);
-@@ -252,7 +253,7 @@ static int meth_connect(lua_State *L)
-     /* make sure we try to connect only to the same family */
-     connecthints.ai_family = tcp->family;
-     timeout_markstart(&tcp->tm);
--    err = inet_tryconnect(&tcp->sock, &tcp->family, address, port, 
-+    err = inet_tryconnect(&tcp->sock, &tcp->family, address, port,
-         &tcp->tm, &connecthints);
-     /* have to set the class even if it failed due to non-blocking connects */
-     auxiliar_setclass(L, "tcp{client}", 1);
-@@ -282,9 +283,12 @@ static int meth_close(lua_State *L)
- static int meth_getfamily(lua_State *L)
- {
-     p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
--    if (tcp->family == PF_INET6) {
-+    if (tcp->family == AF_INET6) {
-         lua_pushliteral(L, "inet6");
-         return 1;
-+    } else if (tcp->family == AF_INET) {
-+        lua_pushliteral(L, "inet4");
-+        return 1;
-     } else {
-         lua_pushliteral(L, "inet4");
-         return 1;
-@@ -348,6 +352,12 @@ static int meth_settimeout(lua_State *L)
-     return timeout_meth_settimeout(L, &tcp->tm);
- }
- 
-+static int meth_gettimeout(lua_State *L)
-+{
-+    p_tcp tcp = (p_tcp) auxiliar_checkgroup(L, "tcp{any}", 1);
-+    return timeout_meth_gettimeout(L, &tcp->tm);
-+}
-+
- /*=========================================================================*\
- * Library functions
- \*=========================================================================*/
-@@ -355,37 +365,36 @@ static int meth_settimeout(lua_State *L)
- * Creates a master tcp object
- \*-------------------------------------------------------------------------*/
- static int tcp_create(lua_State *L, int family) {
--    t_socket sock;
--    const char *err = inet_trycreate(&sock, family, SOCK_STREAM);
--    /* try to allocate a system socket */
--    if (!err) {
--        /* allocate tcp object */
--        p_tcp tcp = (p_tcp) lua_newuserdata(L, sizeof(t_tcp));
--        memset(tcp, 0, sizeof(t_tcp));
--        /* set its type as master object */
--        auxiliar_setclass(L, "tcp{master}", -1);
--        /* initialize remaining structure fields */
--        socket_setnonblocking(&sock);
--        if (family == PF_INET6) {
--            int yes = 1;
--            setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
--                (void *)&yes, sizeof(yes));
-+    p_tcp tcp = (p_tcp) lua_newuserdata(L, sizeof(t_tcp));
-+    memset(tcp, 0, sizeof(t_tcp));
-+    /* set its type as master object */
-+    auxiliar_setclass(L, "tcp{master}", -1);
-+    /* if family is AF_UNSPEC, we leave the socket invalid and
-+     * store AF_UNSPEC into family. This will allow it to later be
-+     * replaced with an AF_INET6 or AF_INET socket upon first use. */
-+    tcp->sock = SOCKET_INVALID;
-+    tcp->family = family;
-+    io_init(&tcp->io, (p_send) socket_send, (p_recv) socket_recv,
-+            (p_error) socket_ioerror, &tcp->sock);
-+    timeout_init(&tcp->tm, -1, -1);
-+    buffer_init(&tcp->buf, &tcp->io, &tcp->tm);
-+    if (family != AF_UNSPEC) {
-+        const char *err = inet_trycreate(&tcp->sock, family, SOCK_STREAM, 0);
-+        if (err != NULL) {
-+            lua_pushnil(L);
-+            lua_pushstring(L, err);
-+            return 2;
-         }
--        tcp->sock = sock;
--        io_init(&tcp->io, (p_send) socket_send, (p_recv) socket_recv,
--                (p_error) socket_ioerror, &tcp->sock);
--        timeout_init(&tcp->tm, -1, -1);
--        buffer_init(&tcp->buf, &tcp->io, &tcp->tm);
--        tcp->family = family;
--        return 1;
--    } else {
--        lua_pushnil(L);
--        lua_pushstring(L, err);
--        return 2;
-+        socket_setnonblocking(&tcp->sock);
-     }
-+    return 1;
- }
- 
- static int global_create(lua_State *L) {
-+    return tcp_create(L, AF_UNSPEC);
-+}
-+
-+static int global_create4(lua_State *L) {
-     return tcp_create(L, AF_INET);
- }
- 
-@@ -393,53 +402,6 @@ static int global_create6(lua_State *L) {
-     return tcp_create(L, AF_INET6);
- }
- 
--#if 0
--static const char *tryconnect6(const char *remoteaddr, const char *remoteserv,
--    struct addrinfo *connecthints, p_tcp tcp) {
--    struct addrinfo *iterator = NULL, *resolved = NULL;
--    const char *err = NULL;
--    /* try resolving */
--    err = socket_gaistrerror(getaddrinfo(remoteaddr, remoteserv,
--                connecthints, &resolved));
--    if (err != NULL) {
--        if (resolved) freeaddrinfo(resolved);
--        return err;
--    }
--    /* iterate over all returned addresses trying to connect */
--    for (iterator = resolved; iterator; iterator = iterator->ai_next) {
--        p_timeout tm = timeout_markstart(&tcp->tm);
--        /* create new socket if necessary. if there was no
--         * bind, we need to create one for every new family
--         * that shows up while iterating. if there was a
--         * bind, all families will be the same and we will
--         * not enter this branch. */
--        if (tcp->family != iterator->ai_family) {
--            socket_destroy(&tcp->sock);
--            err = socket_strerror(socket_create(&tcp->sock,
--                iterator->ai_family, iterator->ai_socktype,
--                iterator->ai_protocol));
--            if (err != NULL) {
--                freeaddrinfo(resolved);
--                return err;
--            }
--            tcp->family = iterator->ai_family;
--            /* all sockets initially non-blocking */
--            socket_setnonblocking(&tcp->sock);
--        }
--        /* finally try connecting to remote address */
--        err = socket_strerror(socket_connect(&tcp->sock,
--            (SA *) iterator->ai_addr,
--            (socklen_t) iterator->ai_addrlen, tm));
--        /* if success, break out of loop */
--        if (err == NULL) break;
--    }
--
--    freeaddrinfo(resolved);
--    /* here, if err is set, we failed */
--    return err;
--}
--#endif
--
- static int global_connect(lua_State *L) {
-     const char *remoteaddr = luaL_checkstring(L, 1);
-     const char *remoteserv = luaL_checkstring(L, 2);
-@@ -456,26 +418,26 @@ static int global_connect(lua_State *L) {
-     timeout_init(&tcp->tm, -1, -1);
-     buffer_init(&tcp->buf, &tcp->io, &tcp->tm);
-     tcp->sock = SOCKET_INVALID;
--    tcp->family = PF_UNSPEC;
-+    tcp->family = AF_UNSPEC;
-     /* allow user to pick local address and port */
-     memset(&bindhints, 0, sizeof(bindhints));
-     bindhints.ai_socktype = SOCK_STREAM;
-     bindhints.ai_family = family;
-     bindhints.ai_flags = AI_PASSIVE;
-     if (localaddr) {
--        err = inet_trybind(&tcp->sock, localaddr, localserv, &bindhints);
-+        err = inet_trybind(&tcp->sock, &tcp->family, localaddr,
-+            localserv, &bindhints);
-         if (err) {
-             lua_pushnil(L);
-             lua_pushstring(L, err);
-             return 2;
-         }
--        tcp->family = bindhints.ai_family;
-     }
-     /* try to connect to remote address and port */
-     memset(&connecthints, 0, sizeof(connecthints));
-     connecthints.ai_socktype = SOCK_STREAM;
-     /* make sure we try to connect only to the same family */
--    connecthints.ai_family = bindhints.ai_family;
-+    connecthints.ai_family = tcp->family;
-     err = inet_tryconnect(&tcp->sock, &tcp->family, remoteaddr, remoteserv,
-          &tcp->tm, &connecthints);
-     if (err) {
-diff --git a/src/timeout.c b/src/timeout.c
-index bdd5e1c..5a601d5 100644
---- a/src/timeout.c
-+++ b/src/timeout.c
-@@ -8,6 +8,7 @@
- 
- #include "lua.h"
- #include "lauxlib.h"
-+#include "compat.h"
- 
- #include "auxiliar.h"
- #include "timeout.h"
-@@ -52,7 +53,7 @@ void timeout_init(p_timeout tm, double block, double total) {
- 
- /*-------------------------------------------------------------------------*\
- * Determines how much time we have left for the next system call,
--* if the previous call was successful 
-+* if the previous call was successful
- * Input
- *   tm: timeout control structure
- * Returns
-@@ -107,7 +108,7 @@ double timeout_getretry(p_timeout tm) {
- }
- 
- /*-------------------------------------------------------------------------*\
--* Marks the operation start time in structure 
-+* Marks the operation start time in structure
- * Input
- *   tm: timeout control structure
- \*-------------------------------------------------------------------------*/
-@@ -117,7 +118,7 @@ p_timeout timeout_markstart(p_timeout tm) {
- }
- 
- /*-------------------------------------------------------------------------*\
--* Gets time in s, relative to January 1, 1970 (UTC) 
-+* Gets time in s, relative to January 1, 1970 (UTC)
- * Returns
- *   time in s.
- \*-------------------------------------------------------------------------*/
-@@ -144,11 +145,7 @@ double timeout_gettime(void) {
- * Initializes module
- \*-------------------------------------------------------------------------*/
- int timeout_open(lua_State *L) {
--#if LUA_VERSION_NUM > 501 && !defined(LUA_COMPAT_MODULE)
-     luaL_setfuncs(L, func, 0);
--#else
--    luaL_openlib(L, NULL, func, 0);
--#endif
-     return 0;
- }
- 
-@@ -163,7 +160,7 @@ int timeout_meth_settimeout(lua_State *L, p_timeout tm) {
-     const char *mode = luaL_optstring(L, 3, "b");
-     switch (*mode) {
-         case 'b':
--            tm->block = t; 
-+            tm->block = t;
-             break;
-         case 'r': case 't':
-             tm->total = t;
-@@ -176,6 +173,16 @@ int timeout_meth_settimeout(lua_State *L, p_timeout tm) {
-     return 1;
- }
- 
-+/*-------------------------------------------------------------------------*\
-+* Gets timeout values for IO operations
-+* Lua Output: block, total
-+\*-------------------------------------------------------------------------*/
-+int timeout_meth_gettimeout(lua_State *L, p_timeout tm) {
-+    lua_pushnumber(L, tm->block);
-+    lua_pushnumber(L, tm->total);
-+    return 2;
-+}
-+
- /*=========================================================================*\
- * Test support functions
- \*=========================================================================*/
-diff --git a/src/timeout.h b/src/timeout.h
-index 6715ca7..af90231 100644
---- a/src/timeout.h
-+++ b/src/timeout.h
-@@ -22,6 +22,7 @@ p_timeout timeout_markstart(p_timeout tm);
- double timeout_getstart(p_timeout tm);
- double timeout_gettime(void);
- int timeout_meth_settimeout(lua_State *L, p_timeout tm);
-+int timeout_meth_gettimeout(lua_State *L, p_timeout tm);
- 
- #define timeout_iszero(tm)   ((tm)->block == 0.0)
- 
-diff --git a/src/tp.lua b/src/tp.lua
-index cbeff56..328cbab 100644
---- a/src/tp.lua
-+++ b/src/tp.lua
-@@ -74,7 +74,7 @@ function metat.__index:command(cmd, arg)
- end
- 
- function metat.__index:sink(snk, pat)
--    local chunk, err = c:receive(pat)
-+    local chunk, err = self.c:receive(pat)
-     return snk(chunk, err)
- end
- 
-diff --git a/src/udp.c b/src/udp.c
-index a9f2393..ec97252 100644
---- a/src/udp.c
-+++ b/src/udp.c
-@@ -7,6 +7,7 @@
- 
- #include "lua.h"
- #include "lauxlib.h"
-+#include "compat.h"
- 
- #include "auxiliar.h"
- #include "socket.h"
-@@ -26,6 +27,7 @@
- * Internal function prototypes
- \*=========================================================================*/
- static int global_create(lua_State *L);
-+static int global_create4(lua_State *L);
- static int global_create6(lua_State *L);
- static int meth_send(lua_State *L);
- static int meth_sendto(lua_State *L);
-@@ -34,6 +36,7 @@ static int meth_receivefrom(lua_State *L);
- static int meth_getfamily(lua_State *L);
- static int meth_getsockname(lua_State *L);
- static int meth_getpeername(lua_State *L);
-+static int meth_gettimeout(lua_State *L);
- static int meth_setsockname(lua_State *L);
- static int meth_setpeername(lua_State *L);
- static int meth_close(lua_State *L);
-@@ -64,6 +67,7 @@ static luaL_Reg udp_methods[] = {
-     {"setpeername", meth_setpeername},
-     {"setsockname", meth_setsockname},
-     {"settimeout",  meth_settimeout},
-+    {"gettimeout",  meth_gettimeout},
-     {NULL,          NULL}
- };
- 
-@@ -89,6 +93,10 @@ static t_opt optset[] = {
- 
- /* socket options for getoption */
- static t_opt optget[] = {
-+    {"dontroute",            opt_get_dontroute},
-+    {"broadcast",            opt_get_broadcast},
-+    {"reuseaddr",            opt_get_reuseaddr},
-+    {"reuseport",            opt_get_reuseport},
-     {"ip-multicast-if",      opt_get_ip_multicast_if},
-     {"ip-multicast-loop",    opt_get_ip_multicast_loop},
-     {"error",                opt_get_error},
-@@ -102,6 +110,7 @@ static t_opt optget[] = {
- /* functions in library namespace */
- static luaL_Reg func[] = {
-     {"udp", global_create},
-+    {"udp4", global_create4},
-     {"udp6", global_create6},
-     {NULL, NULL}
- };
-@@ -109,8 +118,7 @@ static luaL_Reg func[] = {
- /*-------------------------------------------------------------------------*\
- * Initializes module
- \*-------------------------------------------------------------------------*/
--int udp_open(lua_State *L)
--{
-+int udp_open(lua_State *L) {
-     /* create classes */
-     auxiliar_newclass(L, "udp{connected}", udp_methods);
-     auxiliar_newclass(L, "udp{unconnected}", udp_methods);
-@@ -120,18 +128,18 @@ int udp_open(lua_State *L)
-     auxiliar_add2group(L, "udp{connected}",   "select{able}");
-     auxiliar_add2group(L, "udp{unconnected}", "select{able}");
-     /* define library functions */
--#if LUA_VERSION_NUM > 501 && !defined(LUA_COMPAT_MODULE)
-     luaL_setfuncs(L, func, 0);
--#else
--    luaL_openlib(L, NULL, func, 0);
--#endif
-+    /* export default UDP size */
-+    lua_pushliteral(L, "_DATAGRAMSIZE");
-+    lua_pushinteger(L, UDP_DATAGRAMSIZE);
-+    lua_rawset(L, -3);
-     return 0;
- }
- 
- /*=========================================================================*\
- * Lua methods
- \*=========================================================================*/
--const char *udp_strerror(int err) {
-+static const char *udp_strerror(int err) {
-     /* a 'closed' error on an unconnected means the target address was not
-      * accepted by the transport layer */
-     if (err == IO_CLOSED) return "refused";
-@@ -182,7 +190,7 @@ static int meth_sendto(lua_State *L) {
-         return 2;
-     }
-     timeout_markstart(tm);
--    err = socket_sendto(&udp->sock, data, count, &sent, ai->ai_addr, 
-+    err = socket_sendto(&udp->sock, data, count, &sent, ai->ai_addr,
-         (socklen_t) ai->ai_addrlen, tm);
-     freeaddrinfo(ai);
-     if (err != IO_DONE) {
-@@ -199,71 +207,80 @@ static int meth_sendto(lua_State *L) {
- \*-------------------------------------------------------------------------*/
- static int meth_receive(lua_State *L) {
-     p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
--    char buffer[UDP_DATAGRAMSIZE];
--    size_t got, count = (size_t) luaL_optnumber(L, 2, sizeof(buffer));
-+    char buf[UDP_DATAGRAMSIZE];
-+    size_t got, wanted = (size_t) luaL_optnumber(L, 2, sizeof(buf));
-+    char *dgram = wanted > sizeof(buf)? (char *) malloc(wanted): buf;
-     int err;
-     p_timeout tm = &udp->tm;
--    count = MIN(count, sizeof(buffer));
-     timeout_markstart(tm);
--    err = socket_recv(&udp->sock, buffer, count, &got, tm);
-+    if (!dgram) {
-+        lua_pushnil(L);
-+        lua_pushliteral(L, "out of memory");
-+        return 2;
-+    }
-+    err = socket_recv(&udp->sock, dgram, wanted, &got, tm);
-     /* Unlike TCP, recv() of zero is not closed, but a zero-length packet. */
--    if (err == IO_CLOSED)
--        err = IO_DONE;
--    if (err != IO_DONE) {
-+    if (err != IO_DONE && err != IO_CLOSED) {
-         lua_pushnil(L);
-         lua_pushstring(L, udp_strerror(err));
-+        if (wanted > sizeof(buf)) free(dgram);
-         return 2;
-     }
--    lua_pushlstring(L, buffer, got);
-+    lua_pushlstring(L, dgram, got);
-+    if (wanted > sizeof(buf)) free(dgram);
-     return 1;
- }
- 
- /*-------------------------------------------------------------------------*\
- * Receives data and sender from a UDP socket
- \*-------------------------------------------------------------------------*/
--static int meth_receivefrom(lua_State *L)
--{
-+static int meth_receivefrom(lua_State *L) {
-     p_udp udp = (p_udp) auxiliar_checkclass(L, "udp{unconnected}", 1);
--    char buffer[UDP_DATAGRAMSIZE];
--    size_t got, count = (size_t) luaL_optnumber(L, 2, sizeof(buffer));
--    int err;
--    p_timeout tm = &udp->tm;
-+    char buf[UDP_DATAGRAMSIZE];
-+    size_t got, wanted = (size_t) luaL_optnumber(L, 2, sizeof(buf));
-+    char *dgram = wanted > sizeof(buf)? (char *) malloc(wanted): buf;
-     struct sockaddr_storage addr;
-     socklen_t addr_len = sizeof(addr);
-     char addrstr[INET6_ADDRSTRLEN];
-     char portstr[6];
-+    int err;
-+    p_timeout tm = &udp->tm;
-     timeout_markstart(tm);
--    count = MIN(count, sizeof(buffer));
--    err = socket_recvfrom(&udp->sock, buffer, count, &got, (SA *) &addr, 
-+    if (!dgram) {
-+        lua_pushnil(L);
-+        lua_pushliteral(L, "out of memory");
-+        return 2;
-+    }
-+    err = socket_recvfrom(&udp->sock, dgram, wanted, &got, (SA *) &addr,
-             &addr_len, tm);
-     /* Unlike TCP, recv() of zero is not closed, but a zero-length packet. */
--    if (err == IO_CLOSED)
--        err = IO_DONE;
--    if (err != IO_DONE) {
-+    if (err != IO_DONE && err != IO_CLOSED) {
-         lua_pushnil(L);
-         lua_pushstring(L, udp_strerror(err));
-+        if (wanted > sizeof(buf)) free(dgram);
-         return 2;
-     }
--    err = getnameinfo((struct sockaddr *)&addr, addr_len, addrstr, 
-+    err = getnameinfo((struct sockaddr *)&addr, addr_len, addrstr,
-         INET6_ADDRSTRLEN, portstr, 6, NI_NUMERICHOST | NI_NUMERICSERV);
- 	if (err) {
-         lua_pushnil(L);
-         lua_pushstring(L, gai_strerror(err));
-+        if (wanted > sizeof(buf)) free(dgram);
-         return 2;
-     }
--    lua_pushlstring(L, buffer, got);
-+    lua_pushlstring(L, dgram, got);
-     lua_pushstring(L, addrstr);
-     lua_pushinteger(L, (int) strtol(portstr, (char **) NULL, 10));
-+    if (wanted > sizeof(buf)) free(dgram);
-     return 3;
- }
- 
- /*-------------------------------------------------------------------------*\
- * Returns family as string
- \*-------------------------------------------------------------------------*/
--static int meth_getfamily(lua_State *L)
--{
-+static int meth_getfamily(lua_State *L) {
-     p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
--    if (udp->family == PF_INET6) {
-+    if (udp->family == AF_INET6) {
-         lua_pushliteral(L, "inet6");
-         return 1;
-     } else {
-@@ -332,6 +349,11 @@ static int meth_settimeout(lua_State *L) {
-     return timeout_meth_settimeout(L, &udp->tm);
- }
- 
-+static int meth_gettimeout(lua_State *L) {
-+    p_udp udp = (p_udp) auxiliar_checkgroup(L, "udp{any}", 1);
-+    return timeout_meth_gettimeout(L, &udp->tm);
-+}
-+
- /*-------------------------------------------------------------------------*\
- * Turns a master udp object into a client object.
- \*-------------------------------------------------------------------------*/
-@@ -348,7 +370,7 @@ static int meth_setpeername(lua_State *L) {
-     /* make sure we try to connect only to the same family */
-     connecthints.ai_family = udp->family;
-     if (connecting) {
--        err = inet_tryconnect(&udp->sock, &udp->family, address, 
-+        err = inet_tryconnect(&udp->sock, &udp->family, address,
-             port, tm, &connecthints);
-         if (err) {
-             lua_pushnil(L);
-@@ -362,7 +384,6 @@ static int meth_setpeername(lua_State *L) {
-         inet_trydisconnect(&udp->sock, udp->family, tm);
-         auxiliar_setclass(L, "udp{unconnected}", 1);
-     }
--    /* change class to connected or unconnected depending on address */
-     lua_pushnumber(L, 1);
-     return 1;
- }
-@@ -390,7 +411,7 @@ static int meth_setsockname(lua_State *L) {
-     bindhints.ai_socktype = SOCK_DGRAM;
-     bindhints.ai_family = udp->family;
-     bindhints.ai_flags = AI_PASSIVE;
--    err = inet_trybind(&udp->sock, address, port, &bindhints);
-+    err = inet_trybind(&udp->sock, &udp->family, address, port, &bindhints);
-     if (err) {
-         lua_pushnil(L);
-         lua_pushstring(L, err);
-@@ -407,32 +428,32 @@ static int meth_setsockname(lua_State *L) {
- * Creates a master udp object
- \*-------------------------------------------------------------------------*/
- static int udp_create(lua_State *L, int family) {
--    t_socket sock;
--    const char *err = inet_trycreate(&sock, family, SOCK_DGRAM);
--    /* try to allocate a system socket */
--    if (!err) {
--        /* allocate udp object */
--        p_udp udp = (p_udp) lua_newuserdata(L, sizeof(t_udp));
--        auxiliar_setclass(L, "udp{unconnected}", -1);
--        /* initialize remaining structure fields */
--        socket_setnonblocking(&sock);
--        if (family == PF_INET6) {
--            int yes = 1;
--            setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
--                (void *)&yes, sizeof(yes));
-+    /* allocate udp object */
-+    p_udp udp = (p_udp) lua_newuserdata(L, sizeof(t_udp));
-+    auxiliar_setclass(L, "udp{unconnected}", -1);
-+    /* if family is AF_UNSPEC, we leave the socket invalid and
-+     * store AF_UNSPEC into family. This will allow it to later be
-+     * replaced with an AF_INET6 or AF_INET socket upon first use. */
-+    udp->sock = SOCKET_INVALID;
-+    timeout_init(&udp->tm, -1, -1);
-+    udp->family = family;
-+    if (family != AF_UNSPEC) {
-+        const char *err = inet_trycreate(&udp->sock, family, SOCK_DGRAM, 0);
-+        if (err != NULL) {
-+            lua_pushnil(L);
-+            lua_pushstring(L, err);
-+            return 2;
-         }
--        udp->sock = sock;
--        timeout_init(&udp->tm, -1, -1);
--        udp->family = family;
--        return 1;
--    } else {
--        lua_pushnil(L);
--        lua_pushstring(L, err);
--        return 2;
-+        socket_setnonblocking(&udp->sock);
-     }
-+    return 1;
- }
- 
- static int global_create(lua_State *L) {
-+    return udp_create(L, AF_UNSPEC);
-+}
-+
-+static int global_create4(lua_State *L) {
-     return udp_create(L, AF_INET);
- }
- 
-diff --git a/src/udp.h b/src/udp.h
-index 2b831a5..be9b6a5 100644
---- a/src/udp.h
-+++ b/src/udp.h
-@@ -8,7 +8,7 @@
- * (AF_INET, SOCK_DGRAM).
- *
- * Two classes are defined: connected and unconnected. UDP objects are
--* originally unconnected. They can be "connected" to a given address 
-+* originally unconnected. They can be "connected" to a given address
- * with a call to the setpeername function. The same function can be used to
- * break the connection.
- \*=========================================================================*/
-@@ -17,7 +17,6 @@
- #include "timeout.h"
- #include "socket.h"
- 
--/* can't be larger than wsocket.c MAXCHUNK!!! */
- #define UDP_DATAGRAMSIZE 8192
- 
- typedef struct t_udp_ {
-diff --git a/src/unix.c b/src/unix.c
-index 91aaaf8..5bc3148 100644
---- a/src/unix.c
-+++ b/src/unix.c
-@@ -1,8 +1,8 @@
- /*=========================================================================*\
--* Unix domain socket 
-+* Unix domain socket
- * LuaSocket toolkit
- \*=========================================================================*/
--#include <string.h> 
-+#include <string.h>
- 
- #include "lua.h"
- #include "lauxlib.h"
-@@ -11,7 +11,7 @@
- #include "socket.h"
- #include "options.h"
- #include "unix.h"
--#include <sys/un.h> 
-+#include <sys/un.h>
- 
- /*=========================================================================*\
- * Internal function prototypes
-@@ -68,15 +68,6 @@ static t_opt optset[] = {
-     {NULL,          NULL}
- };
- 
--/* our socket creation function */
--/* this is an ad-hoc module that returns a single function 
-- * as such, do not include other functions in this array. */
--static luaL_Reg func[] = {
--    {"unix", global_create},
--    {NULL,          NULL}
--};
--
--
- /*-------------------------------------------------------------------------*\
- * Initializes module
- \*-------------------------------------------------------------------------*/
-@@ -89,15 +80,8 @@ int luaopen_socket_unix(lua_State *L) {
-     auxiliar_add2group(L, "unix{master}", "unix{any}");
-     auxiliar_add2group(L, "unix{client}", "unix{any}");
-     auxiliar_add2group(L, "unix{server}", "unix{any}");
--#if LUA_VERSION_NUM > 501 && !defined(LUA_COMPAT_MODULE)
--    lua_pushcfunction(L, global_create);
--    (void) func;
--#else
--    /* set function into socket namespace */
--    luaL_openlib(L, "socket", func, 0);
--    lua_pushcfunction(L, global_create);
--#endif
-     /* return the function instead of the 'socket' table */
-+    lua_pushcfunction(L, global_create);
-     return 1;
- }
- 
-@@ -147,7 +131,7 @@ static int meth_getfd(lua_State *L) {
- /* this is very dangerous, but can be handy for those that are brave enough */
- static int meth_setfd(lua_State *L) {
-     p_unix un = (p_unix) auxiliar_checkgroup(L, "unix{any}", 1);
--    un->sock = (t_socket) luaL_checknumber(L, 2); 
-+    un->sock = (t_socket) luaL_checknumber(L, 2);
-     return 0;
- }
- 
-@@ -158,8 +142,8 @@ static int meth_dirty(lua_State *L) {
- }
- 
- /*-------------------------------------------------------------------------*\
--* Waits for and returns a client object attempting connection to the 
--* server object 
-+* Waits for and returns a client object attempting connection to the
-+* server object
- \*-------------------------------------------------------------------------*/
- static int meth_accept(lua_State *L) {
-     p_unix server = (p_unix) auxiliar_checkclass(L, "unix{server}", 1);
-@@ -173,20 +157,20 @@ static int meth_accept(lua_State *L) {
-         /* initialize structure fields */
-         socket_setnonblocking(&sock);
-         clnt->sock = sock;
--        io_init(&clnt->io, (p_send)socket_send, (p_recv)socket_recv, 
-+        io_init(&clnt->io, (p_send)socket_send, (p_recv)socket_recv,
-                 (p_error) socket_ioerror, &clnt->sock);
-         timeout_init(&clnt->tm, -1, -1);
-         buffer_init(&clnt->buf, &clnt->io, &clnt->tm);
-         return 1;
-     } else {
--        lua_pushnil(L); 
-+        lua_pushnil(L);
-         lua_pushstring(L, socket_strerror(err));
-         return 2;
-     }
- }
- 
- /*-------------------------------------------------------------------------*\
--* Binds an object to an address 
-+* Binds an object to an address
- \*-------------------------------------------------------------------------*/
- static const char *unix_trybind(p_unix un, const char *path) {
-     struct sockaddr_un local;
-@@ -197,16 +181,16 @@ static const char *unix_trybind(p_unix un, const char *path) {
-     strcpy(local.sun_path, path);
-     local.sun_family = AF_UNIX;
- #ifdef UNIX_HAS_SUN_LEN
--    local.sun_len = sizeof(local.sun_family) + sizeof(local.sun_len) 
-+    local.sun_len = sizeof(local.sun_family) + sizeof(local.sun_len)
-         + len + 1;
-     err = socket_bind(&un->sock, (SA *) &local, local.sun_len);
- 
--#else 
--    err = socket_bind(&un->sock, (SA *) &local, 
-+#else
-+    err = socket_bind(&un->sock, (SA *) &local,
-             sizeof(local.sun_family) + len);
- #endif
-     if (err != IO_DONE) socket_destroy(&un->sock);
--    return socket_strerror(err); 
-+    return socket_strerror(err);
- }
- 
- static int meth_bind(lua_State *L) {
-@@ -236,11 +220,11 @@ static const char *unix_tryconnect(p_unix un, const char *path)
-     remote.sun_family = AF_UNIX;
-     timeout_markstart(&un->tm);
- #ifdef UNIX_HAS_SUN_LEN
--    remote.sun_len = sizeof(remote.sun_family) + sizeof(remote.sun_len) 
-+    remote.sun_len = sizeof(remote.sun_family) + sizeof(remote.sun_len)
-         + len + 1;
-     err = socket_connect(&un->sock, (SA *) &remote, remote.sun_len, &un->tm);
- #else
--    err = socket_connect(&un->sock, (SA *) &remote, 
-+    err = socket_connect(&un->sock, (SA *) &remote,
-             sizeof(remote.sun_family) + len, &un->tm);
- #endif
-     if (err != IO_DONE) socket_destroy(&un->sock);
-@@ -264,7 +248,7 @@ static int meth_connect(lua_State *L)
- }
- 
- /*-------------------------------------------------------------------------*\
--* Closes socket used by object 
-+* Closes socket used by object
- \*-------------------------------------------------------------------------*/
- static int meth_close(lua_State *L)
- {
-@@ -319,13 +303,13 @@ static int meth_settimeout(lua_State *L) {
- * Library functions
- \*=========================================================================*/
- /*-------------------------------------------------------------------------*\
--* Creates a master unix object 
-+* Creates a master unix object
- \*-------------------------------------------------------------------------*/
- static int global_create(lua_State *L) {
-     t_socket sock;
-     int err = socket_create(&sock, AF_UNIX, SOCK_STREAM, 0);
-     /* try to allocate a system socket */
--    if (err == IO_DONE) { 
-+    if (err == IO_DONE) {
-         /* allocate unix object */
-         p_unix un = (p_unix) lua_newuserdata(L, sizeof(t_unix));
-         /* set its type as master object */
-@@ -333,7 +317,7 @@ static int global_create(lua_State *L) {
-         /* initialize remaining structure fields */
-         socket_setnonblocking(&sock);
-         un->sock = sock;
--        io_init(&un->io, (p_send) socket_send, (p_recv) socket_recv, 
-+        io_init(&un->io, (p_send) socket_send, (p_recv) socket_recv,
-                 (p_error) socket_ioerror, &un->sock);
-         timeout_init(&un->tm, -1, -1);
-         buffer_init(&un->buf, &un->io, &un->tm);
-diff --git a/src/url.lua b/src/url.lua
-index 7809535..fbd93d1 100644
---- a/src/url.lua
-+++ b/src/url.lua
-@@ -219,6 +219,7 @@ end
- --   corresponding absolute url
- -----------------------------------------------------------------------------
- function _M.absolute(base_url, relative_url)
-+    local base_parsed
-     if base.type(base_url) == "table" then
-         base_parsed = base_url
-         base_url = _M.build(base_parsed)
-diff --git a/src/usocket.c b/src/usocket.c
-index 096ecd0..8adc573 100644
---- a/src/usocket.c
-+++ b/src/usocket.c
-@@ -4,12 +4,13 @@
- *
- * The code is now interrupt-safe.
- * The penalty of calling select to avoid busy-wait is only paid when
--* the I/O call fail in the first place. 
-+* the I/O call fail in the first place.
- \*=========================================================================*/
--#include <string.h> 
-+#include <string.h>
- #include <signal.h>
- 
- #include "socket.h"
-+#include "pierror.h"
- 
- /*-------------------------------------------------------------------------*\
- * Wait for readable/writable/connected socket with timeout
-@@ -72,7 +73,7 @@ int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
- 
- 
- /*-------------------------------------------------------------------------*\
--* Initializes module 
-+* Initializes module
- \*-------------------------------------------------------------------------*/
- int socket_open(void) {
-     /* instals a handler to ignore sigpipe or it will crash us */
-@@ -81,7 +82,7 @@ int socket_open(void) {
- }
- 
- /*-------------------------------------------------------------------------*\
--* Close module 
-+* Close module
- \*-------------------------------------------------------------------------*/
- int socket_close(void) {
-     return 1;
-@@ -92,7 +93,6 @@ int socket_close(void) {
- \*-------------------------------------------------------------------------*/
- void socket_destroy(p_socket ps) {
-     if (*ps != SOCKET_INVALID) {
--        socket_setblocking(ps);
-         close(*ps);
-         *ps = SOCKET_INVALID;
-     }
-@@ -101,7 +101,7 @@ void socket_destroy(p_socket ps) {
- /*-------------------------------------------------------------------------*\
- * Select with timeout control
- \*-------------------------------------------------------------------------*/
--int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, 
-+int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds,
-         p_timeout tm) {
-     int ret;
-     do {
-@@ -120,8 +120,8 @@ int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds,
- \*-------------------------------------------------------------------------*/
- int socket_create(p_socket ps, int domain, int type, int protocol) {
-     *ps = socket(domain, type, protocol);
--    if (*ps != SOCKET_INVALID) return IO_DONE; 
--    else return errno; 
-+    if (*ps != SOCKET_INVALID) return IO_DONE;
-+    else return errno;
- }
- 
- /*-------------------------------------------------------------------------*\
-@@ -130,29 +130,25 @@ int socket_create(p_socket ps, int domain, int type, int protocol) {
- int socket_bind(p_socket ps, SA *addr, socklen_t len) {
-     int err = IO_DONE;
-     socket_setblocking(ps);
--    if (bind(*ps, addr, len) < 0) err = errno; 
-+    if (bind(*ps, addr, len) < 0) err = errno;
-     socket_setnonblocking(ps);
-     return err;
- }
- 
- /*-------------------------------------------------------------------------*\
--* 
-+*
- \*-------------------------------------------------------------------------*/
- int socket_listen(p_socket ps, int backlog) {
--    int err = IO_DONE; 
--    socket_setblocking(ps);
--    if (listen(*ps, backlog)) err = errno; 
--    socket_setnonblocking(ps);
-+    int err = IO_DONE;
-+    if (listen(*ps, backlog)) err = errno;
-     return err;
- }
- 
- /*-------------------------------------------------------------------------*\
--* 
-+*
- \*-------------------------------------------------------------------------*/
- void socket_shutdown(p_socket ps, int how) {
--    socket_setblocking(ps);
-     shutdown(*ps, how);
--    socket_setnonblocking(ps);
- }
- 
- /*-------------------------------------------------------------------------*\
-@@ -166,7 +162,7 @@ int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) {
-     do if (connect(*ps, addr, len) == 0) return IO_DONE;
-     while ((err = errno) == EINTR);
-     /* if connection failed immediately, return error code */
--    if (err != EINPROGRESS && err != EAGAIN) return err; 
-+    if (err != EINPROGRESS && err != EAGAIN) return err;
-     /* zero timeout case optimization */
-     if (timeout_iszero(tm)) return IO_TIMEOUT;
-     /* wait until we have the result of the connection attempt or timeout */
-@@ -181,7 +177,7 @@ int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) {
- * Accept with timeout
- \*-------------------------------------------------------------------------*/
- int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len, p_timeout tm) {
--    if (*ps == SOCKET_INVALID) return IO_CLOSED; 
-+    if (*ps == SOCKET_INVALID) return IO_CLOSED;
-     for ( ;; ) {
-         int err;
-         if ((*pa = accept(*ps, addr, len)) != SOCKET_INVALID) return IO_DONE;
-@@ -197,7 +193,7 @@ int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len, p_timeout
- /*-------------------------------------------------------------------------*\
- * Send with timeout
- \*-------------------------------------------------------------------------*/
--int socket_send(p_socket ps, const char *data, size_t count, 
-+int socket_send(p_socket ps, const char *data, size_t count,
-         size_t *sent, p_timeout tm)
- {
-     int err;
-@@ -215,6 +211,8 @@ int socket_send(p_socket ps, const char *data, size_t count,
-         err = errno;
-         /* EPIPE means the connection was closed */
-         if (err == EPIPE) return IO_CLOSED;
-+        /* EPROTOTYPE means the connection is being closed (on Yosemite!)*/
-+        if (err == EPROTOTYPE) continue;
-         /* we call was interrupted, just try again */
-         if (err == EINTR) continue;
-         /* if failed fatal reason, report error */
-@@ -229,20 +227,21 @@ int socket_send(p_socket ps, const char *data, size_t count,
- /*-------------------------------------------------------------------------*\
- * Sendto with timeout
- \*-------------------------------------------------------------------------*/
--int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, 
-+int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent,
-         SA *addr, socklen_t len, p_timeout tm)
- {
-     int err;
-     *sent = 0;
-     if (*ps == SOCKET_INVALID) return IO_CLOSED;
-     for ( ;; ) {
--        long put = (long) sendto(*ps, data, count, 0, addr, len);  
-+        long put = (long) sendto(*ps, data, count, 0, addr, len); 
-         if (put >= 0) {
-             *sent = put;
-             return IO_DONE;
-         }
-         err = errno;
-         if (err == EPIPE) return IO_CLOSED;
-+        if (err == EPROTOTYPE) continue;
-         if (err == EINTR) continue;
-         if (err != EAGAIN) return err;
-         if ((err = socket_waitfd(ps, WAITFD_W, tm)) != IO_DONE) return err;
-@@ -266,8 +265,8 @@ int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm
-         err = errno;
-         if (taken == 0) return IO_CLOSED;
-         if (err == EINTR) continue;
--        if (err != EAGAIN) return err; 
--        if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err; 
-+        if (err != EAGAIN) return err;
-+        if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err;
-     }
-     return IO_UNKNOWN;
- }
-@@ -275,7 +274,7 @@ int socket_recv(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm
- /*-------------------------------------------------------------------------*\
- * Recvfrom with timeout
- \*-------------------------------------------------------------------------*/
--int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, 
-+int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got,
-         SA *addr, socklen_t *len, p_timeout tm) {
-     int err;
-     *got = 0;
-@@ -289,8 +288,8 @@ int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got,
-         err = errno;
-         if (taken == 0) return IO_CLOSED;
-         if (err == EINTR) continue;
--        if (err != EAGAIN) return err; 
--        if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err; 
-+        if (err != EAGAIN) return err;
-+        if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err;
-     }
-     return IO_UNKNOWN;
- }
-@@ -303,7 +302,7 @@ int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got,
- * with send/recv replaced with write/read. We can't just use write/read
- * in the socket version, because behaviour when size is zero is different.
- \*-------------------------------------------------------------------------*/
--int socket_write(p_socket ps, const char *data, size_t count, 
-+int socket_write(p_socket ps, const char *data, size_t count,
-         size_t *sent, p_timeout tm)
- {
-     int err;
-@@ -321,6 +320,8 @@ int socket_write(p_socket ps, const char *data, size_t count,
-         err = errno;
-         /* EPIPE means the connection was closed */
-         if (err == EPIPE) return IO_CLOSED;
-+        /* EPROTOTYPE means the connection is being closed (on Yosemite!)*/
-+        if (err == EPROTOTYPE) continue;
-         /* we call was interrupted, just try again */
-         if (err == EINTR) continue;
-         /* if failed fatal reason, report error */
-@@ -349,8 +350,8 @@ int socket_read(p_socket ps, char *data, size_t count, size_t *got, p_timeout tm
-         err = errno;
-         if (taken == 0) return IO_CLOSED;
-         if (err == EINTR) continue;
--        if (err != EAGAIN) return err; 
--        if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err; 
-+        if (err != EAGAIN) return err;
-+        if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err;
-     }
-     return IO_UNKNOWN;
- }
-@@ -374,7 +375,7 @@ void socket_setnonblocking(p_socket ps) {
- }
- 
- /*-------------------------------------------------------------------------*\
--* DNS helpers 
-+* DNS helpers
- \*-------------------------------------------------------------------------*/
- int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp) {
-     *hp = gethostbyaddr(addr, len, AF_INET);
-@@ -399,7 +400,7 @@ int socket_gethostbyname(const char *addr, struct hostent **hp) {
- const char *socket_hoststrerror(int err) {
-     if (err <= 0) return io_strerror(err);
-     switch (err) {
--        case HOST_NOT_FOUND: return "host not found";
-+        case HOST_NOT_FOUND: return PIE_HOST_NOT_FOUND;
-         default: return hstrerror(err);
-     }
- }
-@@ -407,42 +408,43 @@ const char *socket_hoststrerror(int err) {
- const char *socket_strerror(int err) {
-     if (err <= 0) return io_strerror(err);
-     switch (err) {
--        case EADDRINUSE: return "address already in use";
--        case EISCONN: return "already connected";
--        case EACCES: return "permission denied";
--        case ECONNREFUSED: return "connection refused";
--        case ECONNABORTED: return "closed";
--        case ECONNRESET: return "closed";
--        case ETIMEDOUT: return "timeout";
--        default: return strerror(err);
-+        case EADDRINUSE: return PIE_ADDRINUSE;
-+        case EISCONN: return PIE_ISCONN;
-+        case EACCES: return PIE_ACCESS;
-+        case ECONNREFUSED: return PIE_CONNREFUSED;
-+        case ECONNABORTED: return PIE_CONNABORTED;
-+        case ECONNRESET: return PIE_CONNRESET;
-+        case ETIMEDOUT: return PIE_TIMEDOUT;
-+        default: {
-+            return strerror(err);
-+        }
-     }
- }
- 
- const char *socket_ioerror(p_socket ps, int err) {
-     (void) ps;
-     return socket_strerror(err);
--} 
-+}
- 
- const char *socket_gaistrerror(int err) {
--    if (err == 0) return NULL; 
-+    if (err == 0) return NULL;
-     switch (err) {
--        case EAI_AGAIN: return "temporary failure in name resolution";
--        case EAI_BADFLAGS: return "invalid value for ai_flags";
-+        case EAI_AGAIN: return PIE_AGAIN;
-+        case EAI_BADFLAGS: return PIE_BADFLAGS;
- #ifdef EAI_BADHINTS
--        case EAI_BADHINTS: return "invalid value for hints";
-+        case EAI_BADHINTS: return PIE_BADHINTS;
- #endif
--        case EAI_FAIL: return "non-recoverable failure in name resolution";
--        case EAI_FAMILY: return "ai_family not supported";
--        case EAI_MEMORY: return "memory allocation failure";
--        case EAI_NONAME: 
--            return "host or service not provided, or not known";
--        case EAI_OVERFLOW: return "argument buffer overflow";
-+        case EAI_FAIL: return PIE_FAIL;
-+        case EAI_FAMILY: return PIE_FAMILY;
-+        case EAI_MEMORY: return PIE_MEMORY;
-+        case EAI_NONAME: return PIE_NONAME;
-+        case EAI_OVERFLOW: return PIE_OVERFLOW;
- #ifdef EAI_PROTOCOL
--        case EAI_PROTOCOL: return "resolved protocol is unknown";
-+        case EAI_PROTOCOL: return PIE_PROTOCOL;
- #endif
--        case EAI_SERVICE: return "service not supported for socket type";
--        case EAI_SOCKTYPE: return "ai_socktype not supported";
--        case EAI_SYSTEM: return strerror(errno); 
-+        case EAI_SERVICE: return PIE_SERVICE;
-+        case EAI_SOCKTYPE: return PIE_SOCKTYPE;
-+        case EAI_SYSTEM: return strerror(errno);
-         default: return gai_strerror(err);
-     }
- }
-diff --git a/src/wsocket.c b/src/wsocket.c
-index b4a4384..8ecb0fc 100644
---- a/src/wsocket.c
-+++ b/src/wsocket.c
-@@ -3,33 +3,34 @@
- * LuaSocket toolkit
- *
- * The penalty of calling select to avoid busy-wait is only paid when
--* the I/O call fail in the first place. 
-+* the I/O call fail in the first place.
- \*=========================================================================*/
- #include <string.h>
- 
- #include "socket.h"
-+#include "pierror.h"
- 
- /* WinSock doesn't have a strerror... */
- static const char *wstrerror(int err);
- 
- /*-------------------------------------------------------------------------*\
--* Initializes module 
-+* Initializes module
- \*-------------------------------------------------------------------------*/
- int socket_open(void) {
-     WSADATA wsaData;
--    WORD wVersionRequested = MAKEWORD(2, 0); 
-+    WORD wVersionRequested = MAKEWORD(2, 0);
-     int err = WSAStartup(wVersionRequested, &wsaData );
-     if (err != 0) return 0;
-     if ((LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 0) &&
-         (LOBYTE(wsaData.wVersion) != 1 || HIBYTE(wsaData.wVersion) != 1)) {
-         WSACleanup();
--        return 0; 
-+        return 0;
-     }
-     return 1;
- }
- 
- /*-------------------------------------------------------------------------*\
--* Close module 
-+* Close module
- \*-------------------------------------------------------------------------*/
- int socket_close(void) {
-     WSACleanup();
-@@ -50,10 +51,10 @@ int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
-     struct timeval tv, *tp = NULL;
-     double t;
-     if (timeout_iszero(tm)) return IO_TIMEOUT;  /* optimize timeout == 0 case */
--    if (sw & WAITFD_R) { 
--        FD_ZERO(&rfds); 
-+    if (sw & WAITFD_R) {
-+        FD_ZERO(&rfds);
-         FD_SET(*ps, &rfds);
--        rp = &rfds; 
-+        rp = &rfds;
-     }
-     if (sw & WAITFD_W) { FD_ZERO(&wfds); FD_SET(*ps, &wfds); wp = &wfds; }
-     if (sw & WAITFD_C) { FD_ZERO(&efds); FD_SET(*ps, &efds); ep = &efds; }
-@@ -72,9 +73,9 @@ int socket_waitfd(p_socket ps, int sw, p_timeout tm) {
- /*-------------------------------------------------------------------------*\
- * Select with int timeout in ms
- \*-------------------------------------------------------------------------*/
--int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds, 
-+int socket_select(t_socket n, fd_set *rfds, fd_set *wfds, fd_set *efds,
-         p_timeout tm) {
--    struct timeval tv; 
-+    struct timeval tv;
-     double t = timeout_get(tm);
-     tv.tv_sec = (int) t;
-     tv.tv_usec = (int) ((t - tv.tv_sec) * 1.0e6);
-@@ -96,7 +97,7 @@ void socket_destroy(p_socket ps) {
- }
- 
- /*-------------------------------------------------------------------------*\
--* 
-+*
- \*-------------------------------------------------------------------------*/
- void socket_shutdown(p_socket ps, int how) {
-     socket_setblocking(ps);
-@@ -134,10 +135,10 @@ int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) {
-         /* give windows time to set the error (yes, disgusting) */
-         Sleep(10);
-         /* find out why we failed */
--        getsockopt(*ps, SOL_SOCKET, SO_ERROR, (char *)&err, &len); 
-+        getsockopt(*ps, SOL_SOCKET, SO_ERROR, (char *)&err, &len);
-         /* we KNOW there was an error. if 'why' is 0, we will return
-         * "unknown error", but it's not really our fault */
--        return err > 0? err: IO_UNKNOWN; 
-+        return err > 0? err: IO_UNKNOWN;
-     } else return err;
- 
- }
-@@ -154,7 +155,7 @@ int socket_bind(p_socket ps, SA *addr, socklen_t len) {
- }
- 
- /*-------------------------------------------------------------------------*\
--* 
-+*
- \*-------------------------------------------------------------------------*/
- int socket_listen(p_socket ps, int backlog) {
-     int err = IO_DONE;
-@@ -167,7 +168,7 @@ int socket_listen(p_socket ps, int backlog) {
- /*-------------------------------------------------------------------------*\
- * Accept with timeout
- \*-------------------------------------------------------------------------*/
--int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len, 
-+int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len,
-         p_timeout tm) {
-     if (*ps == SOCKET_INVALID) return IO_CLOSED;
-     for ( ;; ) {
-@@ -175,21 +176,21 @@ int socket_accept(p_socket ps, p_socket pa, SA *addr, socklen_t *len,
-         /* try to get client socket */
-         if ((*pa = accept(*ps, addr, len)) != SOCKET_INVALID) return IO_DONE;
-         /* find out why we failed */
--        err = WSAGetLastError(); 
-+        err = WSAGetLastError();
-         /* if we failed because there was no connectoin, keep trying */
-         if (err != WSAEWOULDBLOCK && err != WSAECONNABORTED) return err;
-         /* call select to avoid busy wait */
-         if ((err = socket_waitfd(ps, WAITFD_R, tm)) != IO_DONE) return err;
--    } 
-+    }
- }
- 
- /*-------------------------------------------------------------------------*\
- * Send with timeout
--* On windows, if you try to send 10MB, the OS will buffer EVERYTHING 
--* this can take an awful lot of time and we will end up blocked. 
-+* On windows, if you try to send 10MB, the OS will buffer EVERYTHING
-+* this can take an awful lot of time and we will end up blocked.
- * Therefore, whoever calls this function should not pass a huge buffer.
- \*-------------------------------------------------------------------------*/
--int socket_send(p_socket ps, const char *data, size_t count, 
-+int socket_send(p_socket ps, const char *data, size_t count,
-         size_t *sent, p_timeout tm)
- {
-     int err;
-@@ -206,18 +207,18 @@ int socket_send(p_socket ps, const char *data, size_t count,
-             return IO_DONE;
-         }
-         /* deal with failure */
--        err = WSAGetLastError(); 
-+        err = WSAGetLastError();
-         /* we can only proceed if there was no serious error */
-         if (err != WSAEWOULDBLOCK) return err;
-         /* avoid busy wait */
-         if ((err = socket_waitfd(ps, WAITFD_W, tm)) != IO_DONE) return err;
--    } 
-+    }
- }
- 
- /*-------------------------------------------------------------------------*\
- * Sendto with timeout
- \*-------------------------------------------------------------------------*/
--int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent, 
-+int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent,
-         SA *addr, socklen_t len, p_timeout tm)
- {
-     int err;
-@@ -229,17 +230,17 @@ int socket_sendto(p_socket ps, const char *data, size_t count, size_t *sent,
-             *sent = put;
-             return IO_DONE;
-         }
--        err = WSAGetLastError(); 
-+        err = WSAGetLastError();
-         if (err != WSAEWOULDBLOCK) return err;
-         if ((err = socket_waitfd(ps, WAITFD_W, tm)) != IO_DONE) return err;
--    } 
-+    }
- }
- 
- /*-------------------------------------------------------------------------*\
- * Receive with timeout
- \*-------------------------------------------------------------------------*/
--int socket_recv(p_socket ps, char *data, size_t count, size_t *got, 
--        p_timeout tm) 
-+int socket_recv(p_socket ps, char *data, size_t count, size_t *got,
-+        p_timeout tm)
- {
-     int err, prev = IO_DONE;
-     *got = 0;
-@@ -252,9 +253,9 @@ int socket_recv(p_socket ps, char *data, size_t count, size_t *got,
-         }
-         if (taken == 0) return IO_CLOSED;
-         err = WSAGetLastError();
--        /* On UDP, a connreset simply means the previous send failed. 
--         * So we try again. 
--         * On TCP, it means our socket is now useless, so the error passes. 
-+        /* On UDP, a connreset simply means the previous send failed.
-+         * So we try again.
-+         * On TCP, it means our socket is now useless, so the error passes.
-          * (We will loop again, exiting because the same error will happen) */
-         if (err != WSAEWOULDBLOCK) {
-             if (err != WSAECONNRESET || prev == WSAECONNRESET) return err;
-@@ -267,8 +268,8 @@ int socket_recv(p_socket ps, char *data, size_t count, size_t *got,
- /*-------------------------------------------------------------------------*\
- * Recvfrom with timeout
- \*-------------------------------------------------------------------------*/
--int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got, 
--        SA *addr, socklen_t *len, p_timeout tm) 
-+int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got,
-+        SA *addr, socklen_t *len, p_timeout tm)
- {
-     int err, prev = IO_DONE;
-     *got = 0;
-@@ -281,8 +282,8 @@ int socket_recvfrom(p_socket ps, char *data, size_t count, size_t *got,
-         }
-         if (taken == 0) return IO_CLOSED;
-         err = WSAGetLastError();
--        /* On UDP, a connreset simply means the previous send failed. 
--         * So we try again. 
-+        /* On UDP, a connreset simply means the previous send failed.
-+         * So we try again.
-          * On TCP, it means our socket is now useless, so the error passes.
-          * (We will loop again, exiting because the same error will happen) */
-         if (err != WSAEWOULDBLOCK) {
-@@ -310,7 +311,7 @@ void socket_setnonblocking(p_socket ps) {
- }
- 
- /*-------------------------------------------------------------------------*\
--* DNS helpers 
-+* DNS helpers
- \*-------------------------------------------------------------------------*/
- int socket_gethostbyaddr(const char *addr, socklen_t len, struct hostent **hp) {
-     *hp = gethostbyaddr(addr, len, AF_INET);
-@@ -330,21 +331,21 @@ int socket_gethostbyname(const char *addr, struct hostent **hp) {
- const char *socket_hoststrerror(int err) {
-     if (err <= 0) return io_strerror(err);
-     switch (err) {
--        case WSAHOST_NOT_FOUND: return "host not found";
--        default: return wstrerror(err); 
-+        case WSAHOST_NOT_FOUND: return PIE_HOST_NOT_FOUND;
-+        default: return wstrerror(err);
-     }
- }
- 
- const char *socket_strerror(int err) {
-     if (err <= 0) return io_strerror(err);
-     switch (err) {
--        case WSAEADDRINUSE: return "address already in use";
--        case WSAECONNREFUSED: return "connection refused";
--        case WSAEISCONN: return "already connected";
--        case WSAEACCES: return "permission denied";
--        case WSAECONNABORTED: return "closed";
--        case WSAECONNRESET: return "closed";
--        case WSAETIMEDOUT: return "timeout";
-+        case WSAEADDRINUSE: return PIE_ADDRINUSE;
-+        case WSAECONNREFUSED : return PIE_CONNREFUSED;
-+        case WSAEISCONN: return PIE_ISCONN;
-+        case WSAEACCES: return PIE_ACCESS;
-+        case WSAECONNABORTED: return PIE_CONNABORTED;
-+        case WSAECONNRESET: return PIE_CONNRESET;
-+        case WSAETIMEDOUT: return PIE_TIMEDOUT;
-         default: return wstrerror(err);
-     }
- }
-@@ -357,7 +358,7 @@ const char *socket_ioerror(p_socket ps, int err) {
- static const char *wstrerror(int err) {
-     switch (err) {
-         case WSAEINTR: return "Interrupted function call";
--        case WSAEACCES: return "Permission denied";
-+        case WSAEACCES: return PIE_ACCESS; // "Permission denied";
-         case WSAEFAULT: return "Bad address";
-         case WSAEINVAL: return "Invalid argument";
-         case WSAEMFILE: return "Too many open files";
-@@ -370,63 +371,61 @@ static const char *wstrerror(int err) {
-         case WSAEPROTOTYPE: return "Protocol wrong type for socket";
-         case WSAENOPROTOOPT: return "Bad protocol option";
-         case WSAEPROTONOSUPPORT: return "Protocol not supported";
--        case WSAESOCKTNOSUPPORT: return "Socket type not supported";
-+        case WSAESOCKTNOSUPPORT: return PIE_SOCKTYPE; // "Socket type not supported";
-         case WSAEOPNOTSUPP: return "Operation not supported";
-         case WSAEPFNOSUPPORT: return "Protocol family not supported";
--        case WSAEAFNOSUPPORT: 
--            return "Address family not supported by protocol family"; 
--        case WSAEADDRINUSE: return "Address already in use";
-+        case WSAEAFNOSUPPORT: return PIE_FAMILY; // "Address family not supported by protocol family";
-+        case WSAEADDRINUSE: return PIE_ADDRINUSE; // "Address already in use";
-         case WSAEADDRNOTAVAIL: return "Cannot assign requested address";
-         case WSAENETDOWN: return "Network is down";
-         case WSAENETUNREACH: return "Network is unreachable";
-         case WSAENETRESET: return "Network dropped connection on reset";
-         case WSAECONNABORTED: return "Software caused connection abort";
--        case WSAECONNRESET: return "Connection reset by peer";
-+        case WSAECONNRESET: return PIE_CONNRESET; // "Connection reset by peer";
-         case WSAENOBUFS: return "No buffer space available";
--        case WSAEISCONN: return "Socket is already connected";
-+        case WSAEISCONN: return PIE_ISCONN; // "Socket is already connected";
-         case WSAENOTCONN: return "Socket is not connected";
-         case WSAESHUTDOWN: return "Cannot send after socket shutdown";
--        case WSAETIMEDOUT: return "Connection timed out";
--        case WSAECONNREFUSED: return "Connection refused";
-+        case WSAETIMEDOUT: return PIE_TIMEDOUT; // "Connection timed out";
-+        case WSAECONNREFUSED: return PIE_CONNREFUSED; // "Connection refused";
-         case WSAEHOSTDOWN: return "Host is down";
-         case WSAEHOSTUNREACH: return "No route to host";
-         case WSAEPROCLIM: return "Too many processes";
-         case WSASYSNOTREADY: return "Network subsystem is unavailable";
-         case WSAVERNOTSUPPORTED: return "Winsock.dll version out of range";
--        case WSANOTINITIALISED: 
-+        case WSANOTINITIALISED:
-             return "Successful WSAStartup not yet performed";
-         case WSAEDISCON: return "Graceful shutdown in progress";
--        case WSAHOST_NOT_FOUND: return "Host not found";
-+        case WSAHOST_NOT_FOUND: return PIE_HOST_NOT_FOUND; // "Host not found";
-         case WSATRY_AGAIN: return "Nonauthoritative host not found";
--        case WSANO_RECOVERY: return "Nonrecoverable name lookup error"; 
-+        case WSANO_RECOVERY: return PIE_FAIL; // "Nonrecoverable name lookup error";
-         case WSANO_DATA: return "Valid name, no data record of requested type";
-         default: return "Unknown error";
-     }
- }
- 
- const char *socket_gaistrerror(int err) {
--    if (err == 0) return NULL; 
-+    if (err == 0) return NULL;
-     switch (err) {
--        case EAI_AGAIN: return "temporary failure in name resolution";
--        case EAI_BADFLAGS: return "invalid value for ai_flags";
-+        case EAI_AGAIN: return PIE_AGAIN;
-+        case EAI_BADFLAGS: return PIE_BADFLAGS;
- #ifdef EAI_BADHINTS
--        case EAI_BADHINTS: return "invalid value for hints";
-+        case EAI_BADHINTS: return PIE_BADHINTS;
- #endif
--        case EAI_FAIL: return "non-recoverable failure in name resolution";
--        case EAI_FAMILY: return "ai_family not supported";
--        case EAI_MEMORY: return "memory allocation failure";
--        case EAI_NONAME: 
--            return "host or service not provided, or not known";
-+        case EAI_FAIL: return PIE_FAIL;
-+        case EAI_FAMILY: return PIE_FAMILY;
-+        case EAI_MEMORY: return PIE_MEMORY;
-+        case EAI_NONAME: return PIE_NONAME;
- #ifdef EAI_OVERFLOW
--        case EAI_OVERFLOW: return "argument buffer overflow";
-+        case EAI_OVERFLOW: return PIE_OVERFLOW;
- #endif
- #ifdef EAI_PROTOCOL
--        case EAI_PROTOCOL: return "resolved protocol is unknown";
-+        case EAI_PROTOCOL: return PIE_PROTOCOL;
- #endif
--        case EAI_SERVICE: return "service not supported for socket type";
--        case EAI_SOCKTYPE: return "ai_socktype not supported";
-+        case EAI_SERVICE: return PIE_SERVICE;
-+        case EAI_SOCKTYPE: return PIE_SOCKTYPE;
- #ifdef EAI_SYSTEM
--        case EAI_SYSTEM: return strerror(errno); 
-+        case EAI_SYSTEM: return strerror(errno);
- #endif
-         default: return gai_strerror(err);
-     }
-diff --git a/test/auth/.htaccess b/test/auth/.htaccess
-new file mode 100644
-index 0000000..bb2794a
---- /dev/null
-+++ b/test/auth/.htaccess
-@@ -0,0 +1,4 @@
-+AuthName "test-auth"
-+    AuthType Basic
-+    AuthUserFile /Users/diego/impa/luasocket/test/auth/.htpasswd
-+    Require valid-user
-diff --git a/test/auth/.htpasswd b/test/auth/.htpasswd
-index fd9002b..cfb2603 100644
---- a/test/auth/.htpasswd
-+++ b/test/auth/.htpasswd
-@@ -1 +1 @@
--luasocket:l8n2npozPB.sQ
-+luasocket:$apr1$47u2O.Me$.m/5BWAtt7GVoxsouIPBR1
-diff --git a/test/excepttest.lua b/test/excepttest.lua
-index ce9f197..80c9cb8 100644
---- a/test/excepttest.lua
-+++ b/test/excepttest.lua
-@@ -1,6 +1,30 @@
- local socket = require("socket")
--try = socket.newtry(function()
--    print("finalized!!!")
-+
-+local finalizer_called
-+
-+local func = socket.protect(function(err, ...)
-+    local try = socket.newtry(function()
-+        finalizer_called = true
-+    end)
-+
-+    if err then
-+        return error(err, 0)
-+    else
-+        return try(...)
-+    end
- end)
--try = socket.protect(try)
--print(try(nil, "it works"))
-+
-+local ret1, ret2, ret3 = func(false, 1, 2, 3)
-+assert(not finalizer_called, "unexpected finalizer call")
-+assert(ret1 == 1 and ret2 == 2 and ret3 == 3, "incorrect return values")
-+
-+ret1, ret2, ret3 = func(false, false, "error message")
-+assert(finalizer_called, "finalizer not called")
-+assert(ret1 == nil and ret2 == "error message" and ret3 == nil, "incorrect return values")
-+
-+local err = {key = "value"}
-+ret1, ret2 = pcall(func, err)
-+assert(not ret1, "error not rethrown")
-+assert(ret2 == err, "incorrect error rethrown")
-+
-+print("OK")
-diff --git a/test/httptest.lua b/test/httptest.lua
-index d5fbb37..63ff921 100644
---- a/test/httptest.lua
-+++ b/test/httptest.lua
-@@ -1,4 +1,4 @@
---- needs Alias from /home/c/diego/tec/luasocket/test to 
-+-- needs Alias from /home/c/diego/tec/luasocket/test to
- -- "/luasocket-test" and "/luasocket-test/"
- -- needs ScriptAlias from /home/c/diego/tec/luasocket/test/cgi
- -- to "/luasocket-test-cgi" and "/luasocket-test-cgi/"
-@@ -36,22 +36,22 @@ index = readfile(index_file)
- local check_result = function(response, expect, ignore)
-     for i,v in pairs(response) do
-         if not ignore[i] then
--            if v ~= expect[i] then 
-+            if v ~= expect[i] then
-                 local f = io.open("err", "w")
-                 f:write(tostring(v), "\n\n versus\n\n", tostring(expect[i]))
-                 f:close()
--                fail(i .. " differs!") 
-+                fail(i .. " differs!")
-             end
-         end
-     end
-     for i,v in pairs(expect) do
-         if not ignore[i] then
--            if v ~= response[i] then 
-+            if v ~= response[i] then
-                 local f = io.open("err", "w")
-                 f:write(tostring(response[i]), "\n\n versus\n\n", tostring(v))
-                 v = string.sub(type(v) == "string" and v or "", 1, 70)
-                 f:close()
--                fail(i .. " differs!") 
-+                fail(i .. " differs!")
-             end
-         end
-     end
-@@ -61,10 +61,10 @@ end
- local check_request = function(request, expect, ignore)
-     local t
-     if not request.sink then request.sink, t = ltn12.sink.table() end
--    request.source = request.source or 
-+    request.source = request.source or
-         (request.body and ltn12.source.string(request.body))
-     local response = {}
--    response.code, response.headers, response.status = 
-+    response.code, response.headers, response.status =
-         socket.skip(1, http.request(request))
-     if t and #t > 0 then response.body = table.concat(t) end
-     check_result(response, expect, ignore)
-@@ -82,7 +82,7 @@ else fail(back.query) end
- ------------------------------------------------------------------------
- io.write("testing query string correctness: ")
- forth = "this+is+the+query+string"
--back = http.request("http://" .. host .. cgiprefix .. 
-+back = http.request("http://" .. host .. cgiprefix ..
-     "/query-string?" .. forth)
- if similar(back, forth) then print("ok")
- else fail("failed!") end
-@@ -120,10 +120,10 @@ check_request(request, expect, ignore)
- ------------------------------------------------------------------------
- io.write("testing invalid url: ")
- local r, e = http.request{url = host .. prefix}
--assert(r == nil and e == "invalid host ''") 
-+assert(r == nil and e == "invalid host ''")
- r, re = http.request(host .. prefix)
--assert(r == nil and e == re, tostring(r) ..", " .. tostring(re) .. 
--    " vs " .. tostring(e)) 
-+assert(r == nil and e == re, tostring(r) ..", " .. tostring(re) ..
-+    " vs " .. tostring(e))
- print("ok")
- 
- io.write("testing invalid empty port: ")
-@@ -212,7 +212,7 @@ os.remove(index_file .. "-back")
- io.write("testing ltn12.(sink|source).chain and mime.(encode|decode): ")
- 
- local function b64length(len)
--    local a = math.ceil(len/3)*4 
-+    local a = math.ceil(len/3)*4
-     local l = math.ceil(a/76)
-     return a + l*2
- end
-@@ -313,7 +313,7 @@ ignore = {
-     headers = 1
- }
- check_request(request, expect, ignore)
--    
-+
- ------------------------------------------------------------------------
- io.write("testing document not found: ")
- request = {
-@@ -429,9 +429,9 @@ print("ok")
- io.write("testing host not found: ")
- local c, e = socket.connect("example.invalid", 80)
- local r, re = http.request{url = "http://example.invalid/does/not/exist"}
--assert(r == nil and e == re, tostring(r) .. " " .. tostring(re)) 
-+assert(r == nil and e == re, tostring(r) .. " " .. tostring(re))
- r, re = http.request("http://example.invalid/does/not/exist")
--assert(r == nil and e == re) 
-+assert(r == nil and e == re)
- print("ok")
- 
- ------------------------------------------------------------------------
-diff --git a/test/ltn12test.lua b/test/ltn12test.lua
-index 74a45e8..e3f85fb 100644
---- a/test/ltn12test.lua
-+++ b/test/ltn12test.lua
-@@ -192,6 +192,21 @@ assert(filter(nil, 1), "filter not empty")
- print("ok")
- 
- --------------------------------
-+io.write("testing source.chain (with several filters): ")
-+local function double(x) -- filter turning "ABC" into "AABBCC"
-+    if not x then return end
-+    local b={}
-+    for k in x:gmatch'.' do table.insert(b, k..k) end
-+    return table.concat(b)
-+end
-+source = ltn12.source.string(s)
-+source = ltn12.source.chain(source, double, double, double)
-+sink, t = ltn12.sink.table()
-+assert(ltn12.pump.all(source, sink), "returned error")
-+assert(table.concat(t) == double(double(double(s))), "mismatch")
-+print("ok")
-+
-+--------------------------------
- io.write("testing source.chain (with split) and sink.chain (with merge): ")
- source = ltn12.source.string(s)
- filter = split(5)
-@@ -206,6 +221,15 @@ assert(filter2(nil, 1), "filter2 not empty")
- print("ok")
- 
- --------------------------------
-+io.write("testing sink.chain (with several filters): ")
-+source = ltn12.source.string(s)
-+sink, t = ltn12.sink.table()
-+sink = ltn12.sink.chain(double, double, double, sink)
-+assert(ltn12.pump.all(source, sink), "returned error")
-+assert(table.concat(t) == double(double(double(s))), "mismatch")
-+print("ok")
-+
-+--------------------------------
- io.write("testing filter.chain (and sink.chain, with split, merge): ")
- source = ltn12.source.string(s)
- filter = split(5)
-@@ -272,3 +296,4 @@ assert(filter3(nil, 1), "filter3 not empty")
- assert(filter4(nil, 1), "filter4 not empty")
- assert(filter5(nil, 1), "filter5 not empty")
- print("ok")
-+
-diff --git a/test/testclnt.lua b/test/testclnt.lua
-index 315783b..170e187 100644
---- a/test/testclnt.lua
-+++ b/test/testclnt.lua
-@@ -8,7 +8,7 @@ function printf(...)
- end
- 
- function pass(...)
--    printf(...) 
-+    printf(...)
-     io.stderr:write("\n")
- end
- 
-@@ -45,30 +45,30 @@ function check_timeout(tm, sl, elapsed, err, opp, mode, alldone)
-             if not err then warn("must be buffered")
-             elseif err == "timeout" then pass("proper timeout")
-             else fail("unexpected error '%s'", err) end
--        else 
--            if err ~= "timeout" then fail("should have timed out") 
-+        else
-+            if err ~= "timeout" then fail("should have timed out")
-             else pass("proper timeout") end
-         end
-     else
-         if mode == "total" then
--            if elapsed > tm then 
-+            if elapsed > tm then
-                 if err ~= "timeout" then fail("should have timed out")
-                 else pass("proper timeout") end
-             elseif elapsed < tm then
--                if err then fail(err) 
-+                if err then fail(err)
-                 else pass("ok") end
--            else 
--                if alldone then 
--                    if err then fail("unexpected error '%s'", err) 
-+            else
-+                if alldone then
-+                    if err then fail("unexpected error '%s'", err)
-                     else pass("ok") end
-                 else
--                    if err ~= "timeout" then fail(err) 
-+                    if err ~= "timeout" then fail(err)
-                     else pass("proper timeoutk") end
-                 end
-             end
--        else 
--            if err then fail(err) 
--            else pass("ok") end 
-+        else
-+            if err then fail(err)
-+            else pass("ok") end
-         end
-     end
- end
-@@ -104,8 +104,8 @@ control:setoption("tcp-nodelay", true)
- ------------------------------------------------------------------------
- function test_methods(sock, methods)
-     for _, v in pairs(methods) do
--        if type(sock[v]) ~= "function" then 
--            fail(sock.class .. " method '" .. v .. "' not registered") 
-+        if type(sock[v]) ~= "function" then
-+            fail(sock.class .. " method '" .. v .. "' not registered")
-         end
-     end
-     pass(sock.class .. " methods are ok")
-@@ -121,7 +121,7 @@ function test_mixed(len)
-     local p3 = "raw " .. string.rep("z", inter) .. "bytes"
-     local p4 = "end" .. string.rep("w", inter) .. "bytes"
-     local bp1, bp2, bp3, bp4
--remote (string.format("str = data:receive(%d)", 
-+remote (string.format("str = data:receive(%d)",
-             string.len(p1)+string.len(p2)+string.len(p3)+string.len(p4)))
-     sent, err = data:send(p1..p2..p3..p4)
-     if err then fail(err) end
-@@ -166,7 +166,7 @@ function test_rawline(len)
-     io.stderr:write("length " .. len .. ": ")
-     local str, str10, back, err
-     str = string.rep(string.char(47), math.mod(len, 10))
--    str10 = string.rep(string.char(120,21,77,4,5,0,7,36,44,100), 
-+    str10 = string.rep(string.char(120,21,77,4,5,0,7,36,44,100),
-             math.floor(len/10))
-     str = str .. str10
- remote "str = data:receive()"
-@@ -216,7 +216,7 @@ function test_totaltimeoutreceive(len, tm, sl)
-     data:settimeout(tm, "total")
- local t = socket.gettime()
-     str, err, partial, elapsed = data:receive(2*len)
--    check_timeout(tm, sl, elapsed, err, "receive", "total", 
-+    check_timeout(tm, sl, elapsed, err, "receive", "total",
-         string.len(str or partial) == 2*len)
- end
- 
-@@ -236,7 +236,7 @@ function test_totaltimeoutsend(len, tm, sl)
-     data:settimeout(tm, "total")
-     str = string.rep("a", 2*len)
-     total, err, partial, elapsed = data:send(str)
--    check_timeout(tm, sl, elapsed, err, "send", "total", 
-+    check_timeout(tm, sl, elapsed, err, "send", "total",
-         total == 2*len)
- end
- 
-@@ -256,7 +256,7 @@ function test_blockingtimeoutreceive(len, tm, sl)
-     ]], 2*tm, len, sl, sl))
-     data:settimeout(tm)
-     str, err, partial, elapsed = data:receive(2*len)
--    check_timeout(tm, sl, elapsed, err, "receive", "blocking", 
-+    check_timeout(tm, sl, elapsed, err, "receive", "blocking",
-         string.len(str or partial) == 2*len)
- end
- 
-@@ -290,10 +290,10 @@ function empty_connect()
-         data = server:accept()
-     ]]
-     data, err = socket.connect("", port)
--    if not data then 
-+    if not data then
-         pass("ok")
-         data = socket.connect(host, port)
--    else 
-+    else
-         pass("gethostbyname returns localhost on empty string...")
-     end
- end
-@@ -304,15 +304,20 @@ function isclosed(c)
- end
- 
- function active_close()
--    reconnect()
--    if isclosed(data) then fail("should not be closed") end
--    data:close()
--    if not isclosed(data) then fail("should be closed") end
--    data = nil
--    local udp = socket.udp()
-+    local tcp = socket.tcp4()
-+    if isclosed(tcp) then fail("should not be closed") end
-+    tcp:close()
-+    if not isclosed(tcp) then fail("should be closed") end
-+    tcp = socket.tcp()
-+    if not isclosed(tcp) then fail("should be closed") end
-+    tcp = nil
-+    local udp = socket.udp4()
-     if isclosed(udp) then fail("should not be closed") end
-     udp:close()
-     if not isclosed(udp) then fail("should be closed") end
-+    udp = socket.udp()
-+    if not isclosed(udp) then fail("should be closed") end
-+    udp = nil
-     pass("ok")
- end
- 
-@@ -327,7 +332,7 @@ function test_closed()
-         data:close()
-         data = nil
-     ]], str))
--    -- try to get a line 
-+    -- try to get a line
-     back, err, partial = data:receive()
-     if not err then fail("should have gotten 'closed'.")
-     elseif err ~= "closed" then fail("got '"..err.."' instead of 'closed'.")
-@@ -340,25 +345,25 @@ function test_closed()
-         data = nil
-     ]]
-     total, err, partial = data:send(string.rep("ugauga", 100000))
--    if not err then 
-+    if not err then
-         pass("failed: output buffer is at least %d bytes long!", total)
--    elseif err ~= "closed" then 
-+    elseif err ~= "closed" then
-         fail("got '"..err.."' instead of 'closed'.")
--    else 
--        pass("graceful 'closed' received after %d bytes were sent", partial) 
-+    else
-+        pass("graceful 'closed' received after %d bytes were sent", partial)
-     end
- end
- 
- ------------------------------------------------------------------------
- function test_selectbugs()
-     local r, s, e = socket.select(nil, nil, 0.1)
--    assert(type(r) == "table" and type(s) == "table" and 
-+    assert(type(r) == "table" and type(s) == "table" and
-         (e == "timeout" or e == "error"))
-     pass("both nil: ok")
-     local udp = socket.udp()
-     udp:close()
-     r, s, e = socket.select({ udp }, { udp }, 0.1)
--    assert(type(r) == "table" and type(s) == "table" and 
-+    assert(type(r) == "table" and type(s) == "table" and
-         (e == "timeout" or e == "error"))
-     pass("closed sockets: ok")
-     e = pcall(socket.select, "wrong", 1, 0.1)
-@@ -368,7 +373,7 @@ function test_selectbugs()
-     pass("invalid input: ok")
-     local toomany = {}
-     for i = 1, socket._SETSIZE+1 do
--        toomany[#toomany+1] = socket.udp()
-+        toomany[#toomany+1] = socket.udp4()
-     end
-     if #toomany > socket._SETSIZE then
-         local e = pcall(socket.select, toomany, nil, 0.1)
-@@ -389,7 +394,7 @@ function accept_timeout()
-     local t = socket.gettime()
-     s:settimeout(1)
-     local c, e = s:accept()
--    assert(not c, "should not accept") 
-+    assert(not c, "should not accept")
-     assert(e == "timeout", string.format("wrong error message (%s)", e))
-     t = socket.gettime() - t
-     assert(t < 2, string.format("took to long to give up (%gs)", t))
-@@ -407,9 +412,9 @@ function connect_timeout()
-     local t = socket.gettime()
-     local r, e = c:connect("10.0.0.1", 81)
-     assert(not r, "should not connect")
--    assert(socket.gettime() - t < 2, "took too long to give up.") 
-+    assert(socket.gettime() - t < 2, "took too long to give up.")
-     c:close()
--    pass("ok") 
-+    pass("ok")
- end
- 
- ------------------------------------------------------------------------
-@@ -447,16 +452,14 @@ end
- 
- ------------------------------------------------------------------------
- function rebind_test()
--    --local c ,c1 = socket.bind("localhost", 0)
-    local c ,c1 = socket.bind("127.0.0.1", 0)
-     if not c then pass ("failed to bind! " .. tostring(c) .. ' ' .. tostring(c1))  return end
- 	assert(c,c1)
-- 
-     local i, p = c:getsockname()
-     local s, e = socket.tcp()
-     assert(s, e)
-     s:setoption("reuseaddr", false)
--    r, e = s:bind("localhost", p)
-+    r, e = s:bind(i, p)
-     assert(not r, "managed to rebind!")
-     assert(e)
-     pass("ok")
-@@ -476,9 +479,9 @@ function getstats_test()
-         data:receive(c)
-         t = t + c
-         local r, s, a = data:getstats()
--        assert(r == t, "received count failed" .. tostring(r) 
-+        assert(r == t, "received count failed" .. tostring(r)
-             .. "/" .. tostring(t))
--        assert(s == t, "sent count failed" .. tostring(s) 
-+        assert(s == t, "sent count failed" .. tostring(s)
-             .. "/" .. tostring(t))
-     end
-     pass("ok")
-@@ -486,7 +489,7 @@ end
- 
- 
- ------------------------------------------------------------------------
--function test_nonblocking(size) 
-+function test_nonblocking(size)
-     reconnect()
-     printf("testing "  .. 2*size .. " bytes: ")
- remote(string.format([[
-@@ -545,7 +548,7 @@ function test_readafterclose()
-         data:close()
-         data = nil
-     ]]))
--    data:close() 
-+    data:close()
-     back, err, partial = data:receive("*a")
-     assert(back == nil and err == "closed", "should have returned 'closed'")
-     pass("ok")
-@@ -555,7 +558,7 @@ function test_readafterclose()
-         data:close()
-         data = nil
-     ]]))
--    data:close() 
-+    data:close()
-     back, err, partial = data:receive()
-     assert(back == nil and err == "closed", "should have returned 'closed'")
-     pass("ok")
-@@ -565,7 +568,7 @@ function test_readafterclose()
-         data:close()
-         data = nil
-     ]]))
--    data:close() 
-+    data:close()
-     back, err, partial = data:receive(1)
-     assert(back == nil and err == "closed", "should have returned 'closed'")
-     pass("ok")
-@@ -575,7 +578,7 @@ function test_readafterclose()
-         data:close()
-         data = nil
-     ]]))
--    data:close() 
-+    data:close()
-     back, err, partial = data:receive(0)
-     assert(back == nil and err == "closed", "should have returned 'closed'")
-     pass("ok")
-@@ -590,10 +593,10 @@ function test_writeafterclose()
-         data = nil
-     ]]))
-     local sent, err, errsent
--    while not err do 
-+    while not err do
-         sent, err, errsent, time = data:send(str)
-     end
--    assert(err == "closed", "should have returned 'closed'")
-+    assert(err == "closed", "got " .. err .. " instead of 'closed'")
-     pass("ok")
- end
- 
-@@ -648,25 +651,24 @@ else io.stderr:write("Warning! IPv6 does not support!\n") end
- end
- 
- local udp_methods = {
--    "close", 
-+    "close",
-     "dirty",
-     "getfamily",
-     "getfd",
-     "getoption",
-     "getpeername",
-     "getsockname",
--    "receive", 
--    "receivefrom", 
--    "send", 
--    "sendto", 
--    "setfd", 
-+    "receive",
-+    "receivefrom",
-+    "send",
-+    "sendto",
-+    "setfd",
-     "setoption",
-     "setpeername",
-     "setsockname",
-     "settimeout"
- }
- 
--
- ------------------------------------------------------------------------
- test_methods(socket.udp(), udp_methods)
- do local sock = socket.tcp6()
-@@ -674,6 +676,9 @@ if sock then test_methods(socket.udp6(), udp_methods)
- else io.stderr:write("Warning! IPv6 does not support!\n") end
- end
- 
-+test("closed connection detection: ")
-+test_closed()
-+
- test("partial receive")
- test_partialrecv()
- 
-@@ -697,9 +702,6 @@ rebind_test()
- test("active close: ")
- active_close()
- 
--test("closed connection detection: ")
--test_closed()
--
- test("accept function: ")
- accept_timeout()
- accept_errors()
-diff --git a/test/testsrvr.lua b/test/testsrvr.lua
-index 72b93ab..1eb2d5b 100644
---- a/test/testsrvr.lua
-+++ b/test/testsrvr.lua
-@@ -6,7 +6,7 @@ ack = "\n";
- while 1 do
-     print("server: waiting for client connection...");
-     control = assert(server:accept());
--    while 1 do 
-+    while 1 do
-         command, emsg = control:receive();
-         if emsg == "closed" then
-             control:close()
-diff --git a/test/udpconnectclnt.lua b/test/udpconnectclnt.lua
-index effe13a..ad6ab6a 100644
---- a/test/udpconnectclnt.lua
-+++ b/test/udpconnectclnt.lua
-@@ -1,7 +1,7 @@
- local socket = require"socket"
- local udp = socket.udp
- local localhost = "127.0.0.1"
--local port = arg[1]
-+local port = assert(arg[1], "missing port argument")
- 
- se = udp(); se:setoption("reuseaddr", true)
- se:setsockname(localhost, 5062)
-diff --git a/win32.cmd b/win32.cmd
-index 48522f0..3045721 100644
---- a/win32.cmd
-+++ b/win32.cmd
-@@ -1,12 +1 @@
--make PLAT=win32 LUAV=5.2 LUAINC_win32='c:\cygwin\home\diego\build\include' LUALIB_win32='c:\cygwin\home\diego\build\bin\release'
--
--#!/bin/sh
--for p in Release Debug x64/Release x64/Debug; do
--    for el in mime socket; do
--        for e in dll lib; do
--            cp $p/$el/core.$e ../bin/$p/$el/
--        done;
--    done;
--    cp src/ltn12.lua src/socket.lua src/mime.lua ../bin/$p/
--    cp src/http.lua src/url.lua src/tp.lua src/ftp.lua src/headers.lua src/smtp.lua ../bin/$p/socket/
--done;
-+make LUAPREFIX_win32='c:\cygwin\home\diego\vc12' LUAV=5.1 PLAT=win32 LUALIBNAME_win32=lualib.lib PLATFORM_win32=Debug install-both
diff --git a/main/lua-socket/lua-cflags.patch b/main/lua-socket/lua-cflags.patch
index 57122ec0bcd..78314504c33 100644
--- a/main/lua-socket/lua-cflags.patch
+++ b/main/lua-socket/lua-cflags.patch
@@ -1,8 +1,7 @@
-diff --git a/src/makefile b/src/makefile
-index adf687f..c2abddc 100644
+Use pkg-config to detect cflags
 --- a/src/makefile
 +++ b/src/makefile
-@@ -160,6 +160,8 @@ SOCKET_macosx=usocket.o
+@@ -170,11 +170,13 @@ SOCKET_macosx=usocket.o
  #------
  # Compiler and linker settings
  # for Linux
@@ -11,12 +10,9 @@ index adf687f..c2abddc 100644
  SO_linux=so
  O_linux=o
  CC_linux=gcc
-@@ -167,7 +169,7 @@ DEF_linux=-DLUASOCKET_$(DEBUG) \
- 	-DLUASOCKET_API='__attribute__((visibility("default")))' \
- 	-DUNIX_API='__attribute__((visibility("default")))' \
- 	-DMIME_API='__attribute__((visibility("default")))'
--CFLAGS_linux= -I$(LUAINC) $(DEF) -Wall -Wshadow -Wextra \
-+CFLAGS_linux= $(LUA_CFLAGS) -I$(LUAINC) $(DEF) -Wall -Wshadow -Wextra \
- 	-Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden
- LDFLAGS_linux=-O -shared -fpic -o 
+ DEF_linux=-DLUASOCKET_$(DEBUG)
+-CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
++CFLAGS_linux=$(LUA_CFLAGS) $(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
+ 	-Wimplicit -O2 -ggdb3 -fpic
+ LDFLAGS_linux=-O -shared -fpic -o
  LD_linux=gcc
diff --git a/main/lua-sql/APKBUILD b/main/lua-sql/APKBUILD
index 1db3ca41b79..9822cae001f 100644
--- a/main/lua-sql/APKBUILD
+++ b/main/lua-sql/APKBUILD
@@ -1,17 +1,17 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 _drivers="mysql postgres sqlite3 odbc"
 
 pkgname=lua-sql
 _pkgname=luasql
-pkgver=2.5.0
-pkgrel=0
+pkgver=2.6.0
+pkgrel=4
 pkgdesc="Lua SQL drivers"
-url="https://keplerproject.github.io/luasql/"
+url="http://lunarmodules.github.io/luasql/"
 arch="all"
 license="MIT"
-makedepends="mariadb-connector-c-dev postgresql-dev sqlite-dev unixodbc-dev"
+makedepends="mariadb-connector-c-dev libpq-dev sqlite-dev unixodbc-dev"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	for _d in $_drivers; do
@@ -22,8 +22,9 @@ for _d in $_drivers; do
 	subpackages="$subpackages lua-sql-$_d:_meta_subpackage"
 done
 
-source="$_pkgname-$pkgver.tar.gz::https://github.com/keplerproject/$_pkgname/archive/$pkgver.tar.gz"
+source="$_pkgname-$pkgver.tar.gz::https://github.com/lunarmodules/$_pkgname/archive/$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
+options="!check"
 
 prepare() {
 	default_prepare
@@ -84,4 +85,6 @@ _subpackage() {
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="474363c9feb6bc095d0d067d220a3a2faf0524172e082f217407bbe632d24575083ad8838725e4fb6cd369276ea6cb6f8547b84d9d9f77b9d87076404e2bce9e  luasql-2.5.0.tar.gz"
+sha512sums="
+051438d4f5a9059c2ecf52143a06279469c220117b8b99363ea4fda434f08780794f0c4d54185ea891845238b3f5a307ba06ee7a1e7f4583a3b393c63eed66e9  luasql-2.6.0.tar.gz
+"
diff --git a/main/lua-sqlite/APKBUILD b/main/lua-sqlite/APKBUILD
index 7d41e4db789..5ef67cc42d4 100644
--- a/main/lua-sqlite/APKBUILD
+++ b/main/lua-sqlite/APKBUILD
@@ -1,24 +1,20 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=lua-sqlite
 _rockname=lsqlite3
 pkgver=0.9.5
 _uuid="fsl_9y"
 [ "$pkgver" != "0.9.5" ] && die "Please update uuid!"
-_luaversions="5.1 5.2 5.3"
-pkgrel=2
+_luaversions="5.1 5.2 5.3 5.4"
+pkgrel=6
 pkgdesc="Sqlite3 Binding for Lua"
 url="http://lua.sqlite.org/index.cgi/home"
 arch="all"
 license="MIT"
-depends=""
 makedepends="sqlite-dev"
-install=""
-subpackages=""
 # the uuid determines the archive version and the filename the target directory
 source="$pkgname-$pkgver.zip::http://lua.sqlite.org/index.cgi/zip/$pkgname-$pkgver.zip?uuid=$_uuid"
-
-builddir="$srcdir"/$pkgname-$pkgver
+options="!check"
 
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
@@ -26,11 +22,11 @@ for _v in $_luaversions; do
 done
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	local lver
 	for lver in $_luaversions; do
-		cp -r "$builddir" "$builddir-$lver" || return 1
+		cp -r "$builddir" "$builddir-$lver"
 	done
 }
 
@@ -39,10 +35,10 @@ build() {
 	for lver in $_luaversions; do
 		cd "$builddir-$lver"
 		msg "Building for Lua $lver..."
-		${CC:-gcc} ${CFLAGS} $(pkg-config --cflags sqlite3) \
+		${CC:-gcc} $CFLAGS $(pkg-config --cflags sqlite3) \
 			$(pkg-config --cflags lua$lver) -shared -fPIC \
 			-DLSQLITE_VERSION=\"$pkgver\" -o lsqlite3.so lsqlite3.c \
-			$(pkg-config --libs sqlite3) || return 1
+			$(pkg-config --libs sqlite3)
 	done
 }
 
@@ -55,11 +51,11 @@ _package() {
 	pkgdesc="$pkgdesc (for Lua $lver)"
 	depends="lua$lver"
 	install_if="$pkgname=$pkgver-r$pkgrel lua$lver"
-	local rockdir="$subpkgdir/usr/lib/luarocks/rocks-$lver/$_pkgname/$pkgver-1"
+	local rockdir="$subpkgdir/usr/lib/luarocks/rocks-$lver/$_rockname/$pkgver-1"
 
 	cd "$builddir-$lver"
 	install -Dm755 lsqlite3.so \
-		"$subpkgdir"/usr/lib/lua/$lver/lsqlite3.so || return 1
+		"$subpkgdir"/usr/lib/lua/$lver/lsqlite3.so
 
 	mkdir -p "$rockdir"
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
diff --git a/main/lua-stdlib-debug/APKBUILD b/main/lua-stdlib-debug/APKBUILD
index f0c823f0823..ac9ca2ed412 100644
--- a/main/lua-stdlib-debug/APKBUILD
+++ b/main/lua-stdlib-debug/APKBUILD
@@ -3,18 +3,17 @@
 pkgname=lua-stdlib-debug
 _rockname=std._debug
 pkgver=1.0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Manage an overall debug state, and associated hint substates"
 url="https://lua-stdlib.github.io/_debug/"
 arch="noarch"
 license="MIT"
 depends="lua"
-provides=""
 options="!check"  # FIXME: requires lua-specl that we don't have yet
 source="$pkgname-$pkgver.tar.gz::https://github.com/lua-stdlib/_debug/archive/v$pkgver.tar.gz"
 builddir="$srcdir/_debug-$pkgver"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	provides="$provides lua$_v-${pkgname#lua-}=$pkgver-r$pkgrel"  # for backward compatibility
 done
diff --git a/main/lua-stdlib-normalize/APKBUILD b/main/lua-stdlib-normalize/APKBUILD
index e4e647e5e4d..1ac0f992fcf 100644
--- a/main/lua-stdlib-normalize/APKBUILD
+++ b/main/lua-stdlib-normalize/APKBUILD
@@ -2,19 +2,18 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=lua-stdlib-normalize
 _rockname=std.normalize
-pkgver=2.0.2
-pkgrel=0
+pkgver=2.0.3
+pkgrel=1
 pkgdesc="Normalized Lua functions"
 url="https://lua-stdlib.github.io/normalize/"
 arch="noarch"
 license="MIT"
 depends="lua lua-stdlib-debug"
-provides=""
 options="!check"  # FIXME: requires lua-specl that we don't have yet
 source="$pkgname-$pkgver.tar.gz::https://github.com/lua-stdlib/normalize/archive/v$pkgver.tar.gz"
 builddir="$srcdir/normalize-$pkgver"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	provides="$provides lua$_v-${pkgname#lua-}=$pkgver-r$pkgrel"  # for backward compatibility
 done
@@ -30,4 +29,4 @@ package() {
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="bde7d834ce5324ee6af7e3f76d138f75bb6c55612e6e524a06d7886b92b346043a2ad4befec5f68342d369e7ed610f00388243b18886a53de6cce123b6a7637f  lua-stdlib-normalize-2.0.2.tar.gz"
+sha512sums="eaae2f4962b060d33f7c8487b95f5bc53fbcc0719bedb8dbf0adfaa5678f9161949534dc22904d2e004f9b55018956b6ca6d25ee478085fe803c7e53d3450e63  lua-stdlib-normalize-2.0.3.tar.gz"
diff --git a/main/lua-stdlib/APKBUILD b/main/lua-stdlib/APKBUILD
index 63b5a85aa1e..c357e85f9a2 100644
--- a/main/lua-stdlib/APKBUILD
+++ b/main/lua-stdlib/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=lua-stdlib
 pkgver=41.2.2
-pkgrel=0
+pkgrel=2
 pkgdesc="Lua library of modules for common programming tasks"
 url="https://github.com/lua-stdlib/lua-stdlib"
 arch="noarch"
-license="MIT/X"
+license="MIT"
 makedepends="autoconf automake"
 subpackages="$pkgname-doc"
 for _v in $_luaversions; do
@@ -15,11 +15,10 @@ for _v in $_luaversions; do
 done
 source="$pkgname-$pkgver.tar.gz::https://github.com/lua-stdlib/lua-stdlib/archive/release-v$pkgver.tar.gz"
 builddir="$srcdir"/lua-stdlib-release-v$pkgver
+options="!check"
 
 prepare() {
 	default_prepare
-	cd "$builddir"
-
 	aclocal && autoconf && automake --add-missing
 	for _i in $_luaversions; do
 		cp -r "$builddir" "$srcdir"/build-$_i
@@ -39,7 +38,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	for _i in $_luaversions; do
 		cd "$srcdir"/build-$_i
 		make DESTDIR="$pkgdir" luadir="/usr/share/lua/$_i" install
@@ -59,10 +57,8 @@ _split() {
 	done
 }
 
-
 for _v in $_luaversions; do
 	eval "split_${_v/./_}() { _split $_v; }"
 done
 
-
 sha512sums="b477ff90f2c3e49ad83194b1a67592d786c91dbc9dfe199a701fa68bc84b6ba8c820d37ac2fc74c2ebc3fb7a83aac8bcf0af58041ce14fc1dc6b297f3ae054aa  lua-stdlib-41.2.2.tar.gz"
diff --git a/main/lua-stringy/APKBUILD b/main/lua-stringy/APKBUILD
index 40467f9e958..746bea91c14 100644
--- a/main/lua-stringy/APKBUILD
+++ b/main/lua-stringy/APKBUILD
@@ -3,17 +3,16 @@
 pkgname=lua-stringy
 pkgver=0.5.1
 _pkgver=${pkgver%.*}-${pkgver##*.}
-pkgrel=0
+pkgrel=3
 pkgdesc="Lua string utility library"
 url="https://github.com/brentp/lua-stringy/"
 arch="all"
 license="MIT"
-checkdepends="luajit"
 source="$pkgname-$pkgver.tar.gz::https://github.com/brentp/lua-stringy/archive/v$_pkgver.tar.gz
 	makefile.patch"
 builddir="$srcdir/$pkgname-$_pkgver/stringy"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	checkdepends="$checkdepends lua$_v"
 	makedepends="$makedepends lua$_v-dev"
@@ -40,7 +39,7 @@ build() {
 }
 
 check() {
-	local lver; for lver in $_luaversions jit; do
+	local lver; for lver in $_luaversions; do
 		msg "Testing on lua$lver..."
 		cd "$builddir-${lver/jit/5.1}"
 		lua$lver stringy_test.lua
diff --git a/main/lua-struct/APKBUILD b/main/lua-struct/APKBUILD
index bb2599236aa..309e55b21b0 100644
--- a/main/lua-struct/APKBUILD
+++ b/main/lua-struct/APKBUILD
@@ -1,13 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=lua-struct
 pkgver=0.2
-pkgrel=2
+pkgrel=4
 pkgdesc="Library for Converting Data to and from C Structs for Lua"
 url="http://www.inf.puc-rio.br/~roberto/struct/"
 arch="all"
 license="MIT"
-depends_dev=""
 makedepends="$depends_dev"
 source="http://www.inf.puc-rio.br/~roberto/struct/struct-$pkgver.tar.gz
 	makefile.patch
@@ -19,6 +18,8 @@ for _i in $_luaversions; do
 done
 
 builddir="$srcdir"
+options="!check"
+
 prepare() {
 	default_prepare
 	for i in $_luaversions; do
@@ -35,7 +36,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	mkdir -p "$pkgdir"
 }
 
diff --git a/main/lua-subprocess/APKBUILD b/main/lua-subprocess/APKBUILD
index 1f62593d00a..6ed36d9afca 100644
--- a/main/lua-subprocess/APKBUILD
+++ b/main/lua-subprocess/APKBUILD
@@ -1,75 +1,44 @@
 # Contributor: Ted Trask <ttrask01@yahoo.com>
 # Maintainer: Ted Trask <ttrask01@yahoo.com>
-
-_luaversions="5.1 5.2"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=lua-subprocess
-pkgver=0.0.20141229
-pkgrel=2
+pkgver=0_git20230625
+pkgrel=0
+_gitrev=ccd71c90653b39c6745c771af4393c9e76e4105f
 pkgdesc="A Lua module written in C that allows you to create child processes and communicate with them"
 url="https://github.com/tdtrask/lua-subprocess"
 arch="all"
-license="AS-IS"
-depends=""
-install=""
-depends_dev=""
-makedepends="$depends_dev asciidoc"
-subpackages=""
+license="MIT"
+makedepends="asciidoc"
 for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev"
 	subpackages="$subpackages lua$_i-subprocess:split_${_i/./_}"
 done
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.gz
-	makefile.patch"
-
-_giturl="git://github.com/tdtrask/lua-subprocess.git"
-_upload="dev.alpinelinux.org:/archive/$pkgname/"
-
-snapshot() {
-        local _date=$(date +%Y%m%d)
-        local _ver=0.0.$_date
-        local _pkg=$pkgname-$_ver.tar.gz
-        mkdir -p "$srcdir"
-        cd "$srcdir"
-	msg "Creating snapshot: $_pkg"
-	rm -rf ${_giturl##*/}
-	git clone --depth=1 --bare $_giturl || return 1
-        git --git-dir ${_giturl##*/} archive -o $_pkg \
-                --prefix=$pkgname-$_ver/ HEAD \
-                || return 1
-        msg "Uploading to $_upload"
-        rsync -Lave ssh $_pkg $_upload || return 1
-        cd "$startdir"
-        sed -i -e "s/^pkgver=.*/pkgver=$_ver/" \
-		APKBUILD || return 1
-	abuild checksum
-}
-
-_sdir="$srcdir"/$pkgname-$pkgver
+source="$pkgname-$_gitrev.tar.gz::https://github.com/tdtrask/lua-subprocess/archive/$_gitrev.tar.gz
+	makefile.patch
+	"
+builddir="$srcdir/lua-subprocess-$_gitrev"
+options="!check"
 
 prepare() {
-	local i
-	cd "$_sdir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
 	for _i in $_luaversions; do
-		cp -r "$_sdir" "$srcdir"/build-$_i
+		cp -r "$builddir" "$srcdir"/build-$_i
 	done
 }
 
 build() {
+	export CFLAGS="$CFLAGS -DSHARE_LIOLIB"
 	for _i in $_luaversions; do
 		cd "$srcdir"/build-$_i
-		make lua_package="lua$_i" || return 1
+		make lua_package="lua$_i"
 	done
 }
 
 package() {
 	for _i in $_luaversions; do
 		cd "$srcdir"/build-$_i
-		make lua_package="lua$_i" DESTDIR="$pkgdir" install || return 1
+		make lua_package="lua$_i" DESTDIR="$pkgdir" install
 	done
 }
 
@@ -77,12 +46,10 @@ _split() {
 	local d= _ver=$1
 	pkgdesc="A Lua $_ver module written in C that allows you to create child processes and communicate with them"
 	install_if="lua$_ver $pkgname=$pkgver-r$pkgrel"
-	replaces="$pkgname"
-	depends=
 	for d in usr/lib/lua usr/share/lua; do
 		if [ -d "$pkgdir"/$d/$_ver ]; then
 			mkdir -p "$subpkgdir"/$d
-			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/ || return 1
+			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/
 		fi
 	done
 }
@@ -91,5 +58,7 @@ for _i in $_luaversions; do
 	eval "split_${_i/./_}() { _split $_i; }"
 done
 
-sha512sums="5d0648a883102172bc086a0054f76832d25ce760149f0e0ddac927a325815b1937e780efc5d553bb6b751ed7642d728ff37745be134dfdb42753bde3b338a1b9  lua-subprocess-0.0.20141229.tar.gz
-af4e25d8d503e9cb8296a2b8d8b19577e64b412f56607bf38bc828a7c214904ecdf9619fc2541461bc4dda6c6fcd47cbb1051499bd2f132dad76092cf3ae5e9d  makefile.patch"
+sha512sums="
+d6c2cb45225f518748405ae6039ecad5475eac029f1a1f7250a73dcfcc429420298884d00f8d11677b3fffab833232d3b9436a067cfcce8f70585b2a2b31c46e  lua-subprocess-ccd71c90653b39c6745c771af4393c9e76e4105f.tar.gz
+af4e25d8d503e9cb8296a2b8d8b19577e64b412f56607bf38bc828a7c214904ecdf9619fc2541461bc4dda6c6fcd47cbb1051499bd2f132dad76092cf3ae5e9d  makefile.patch
+"
diff --git a/main/lua-system/APKBUILD b/main/lua-system/APKBUILD
new file mode 100644
index 00000000000..97c1dbc7482
--- /dev/null
+++ b/main/lua-system/APKBUILD
@@ -0,0 +1,62 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=lua-system
+_pkgname=luasystem
+pkgver=0.2.1
+pkgrel=2
+pkgdesc="Platform independent system calls for Lua"
+url="https://github.com/o-lim/luasystem/"
+arch="all"
+license="MIT"
+source="$pkgname-$pkgver.tar.gz::https://github.com/o-lim/$_pkgname/archive/v$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$pkgver"
+# This module needs lua-busted to run tests, but lua-busted depends on
+# lua-system and we wanna avoid circular dependencies.
+options="!check"
+
+_luaversions="5.1 5.2 5.3 5.4"
+for _v in $_luaversions; do
+	makedepends="$makedepends lua$_v-dev"
+	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
+done
+
+prepare() {
+	default_prepare
+
+	local lver; for lver in $_luaversions; do
+		cp -r "$builddir" "$builddir-$lver"
+	done
+}
+
+build() {
+	local lver; for lver in $_luaversions; do
+		msg "Building against Lua $lver..."
+		make -C "$builddir-$lver"/src \
+			LUA_VERSION=$lver \
+			MYCFLAGS="$CFLAGS"
+	done
+}
+
+package() {
+	mkdir -p "$pkgdir"
+}
+
+_subpackage() {
+	local lver="${subpkgname:3:3}"
+	pkgdesc="$pkgdesc $lver"
+	depends="lua$lver"
+	install_if="$pkgname=$pkgver-r$pkgrel lua$lver"
+	local lmod_dir=$(pkg-config --variable=INSTALL_LMOD lua$lver)
+	local rockdir="$subpkgdir/usr/lib/luarocks/rocks-$lver/$_pkgname/$pkgver-0"
+
+	cd "$builddir-$lver"
+
+	make -C src LUA_VERSION=$lver DESTDIR="$subpkgdir" prefix=/usr \
+		install
+	install -m 644 -D system/init.lua "$subpkgdir"/$lmod_dir/system.lua
+
+	mkdir -p "$rockdir"
+	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
+}
+
+sha512sums="b8a04a83e8e39c98da23484c9eba9ff60da2fb4db3deca0d52784a6c13c7e0faf7a8b326999d88703847107e4fce739062fc04a00266140969c9f57b70064f46  lua-system-0.2.1.tar.gz"
diff --git a/main/lua-term/APKBUILD b/main/lua-term/APKBUILD
new file mode 100644
index 00000000000..808797616a1
--- /dev/null
+++ b/main/lua-term/APKBUILD
@@ -0,0 +1,53 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=lua-term
+pkgver=0.07
+_rockver=0.7-1
+pkgrel=2
+pkgdesc="Terminal operations for Lua"
+url="https://github.com/hoelzro/lua-term"
+arch="all"
+license="MIT"
+source="$pkgname-$pkgver.tar.gz::https://github.com/hoelzro/lua-term/archive/$pkgver.tar.gz"
+options="!check"  # upstream does not provide tests
+
+_luaversions="5.1 5.2 5.3 5.4"
+for _v in $_luaversions; do
+	makedepends="$makedepends lua$_v-dev"
+	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
+done
+
+prepare() {
+	default_prepare
+
+	local lver; for lver in $_luaversions; do
+		cp -r "$builddir" "$builddir-$lver"
+	done
+}
+
+build() {
+	local lver; for lver in $_luaversions; do
+		msg "Building for Lua $lver..."
+		make -C "$builddir-$lver" LUA_VER=$lver CFLAGS="$CFLAGS"
+	done
+}
+
+package() {
+	mkdir -p "$pkgdir"
+}
+
+_subpackage() {
+	local lver="${subpkgname:3:3}"
+	pkgdesc="$pkgdesc $lver"
+	depends="lua$lver"
+	install_if="$pkgname=$pkgver-r$pkgrel lua$lver"
+	local rockdir="$subpkgdir/usr/lib/luarocks/rocks-$lver/$pkgname/$_rockver"
+
+	cd "$builddir-$lver"
+	make LUA_VER=$lver LUA_DIR="$subpkgdir/usr" install
+
+	mkdir -p "$rockdir"
+	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
+}
+
+sha512sums="2046ba1861ff590c191bb651941c45eb8b6e9a1252b05e78daaeb31837ce1fc7da9ba124aec34dc7842fd304e945754c463ffd75941125ff952e911ba66efa31  lua-term-0.07.tar.gz"
diff --git a/main/lua-unit/APKBUILD b/main/lua-unit/APKBUILD
index 16b968369b3..422ae4bc9d6 100644
--- a/main/lua-unit/APKBUILD
+++ b/main/lua-unit/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=lua-unit
-_pkgname=$(echo ${pkgname/-/} | tr '[:lower:]' '[:upper:]')
-pkgver=3.3
+_pkgname=LUAUNIT
+pkgver=3.4
 _pkgver=${pkgver/./_}
 pkgrel=0
 pkgdesc="Unit-testing framework for Lua"
@@ -11,10 +11,10 @@ license="BSD-2-Clause"
 depends="lua5.2"
 makedepends="python3"
 options="!check" # test suite suitable for Windows only
-source="https://github.com/bluebird75/luaunit/archive/${_pkgname}_V${_pkgver}.tar.gz"
-builddir="$srcdir"/${pkgname/-/}-${_pkgname}_V${_pkgver}
+source="https://github.com/bluebird75/luaunit/archive/${_pkgname}_V$_pkgver.tar.gz"
+builddir="$srcdir"/${pkgname/-/}-${_pkgname}_V$_pkgver
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
@@ -37,4 +37,6 @@ _subpackage() {
 		"$subpkgdir"/usr/share/lua/$lver/luaunit.lua
 }
 
-sha512sums="bf0ea8f714fe93123ca019e7c9a61fb81592f1300a7943ca2f1d0717c1882d673316f4c800e6204c38cdc4e90467f35475df9a6420e4d675d753db46d2ca57ac  LUAUNIT_V3_3.tar.gz"
+sha512sums="
+a7440b730d60438d5de6887bee116b4661ce5667c911a1acb3600ccad75db90a4a164e87b9253d9ebfa836738ed3c83bcf122161c4ef4fe982671ce993e2a83d  LUAUNIT_V3_4.tar.gz
+"
diff --git a/main/lua-uuid/APKBUILD b/main/lua-uuid/APKBUILD
index 2c133244229..1cb506305d0 100644
--- a/main/lua-uuid/APKBUILD
+++ b/main/lua-uuid/APKBUILD
@@ -1,18 +1,18 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-uuid
 _realname=uuid
-pkgver=0.2.0
-pkgrel=1
+pkgver=0.3
+pkgrel=0
 pkgdesc="A pure Lua uuid generator (modified from a Rackspace module)"
 url="https://tieske.github.io/uuid/"
 arch="noarch"
 license="Apache-2.0"
 options="!check"
-source="$pkgname-$pkgver.tar.gz::https://github.com/Tieske/uuid/archive/version_$pkgver.tar.gz"
-builddir="$srcdir/uuid-version_$pkgver"
+source="$pkgname-$pkgver.tar.gz::https://github.com/Tieske/uuid/archive/$pkgver.tar.gz"
+builddir="$srcdir/uuid-$pkgver"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
@@ -32,4 +32,6 @@ _subpackage() {
 		"$subpkgdir"/usr/share/lua/$lver/uuid.lua
 }
 
-sha512sums="1117c76dbbabee6de01d1657339236810822040e20afd974dec302b9d2035ca087d33ef47029c6184203c3e694cc9282a303ce19eadffc71b0f48c6a4a5ef5b0  lua-uuid-0.2.0.tar.gz"
+sha512sums="
+b003fa36d47e5e325abb261ccfdfa3457455da4ddafa551f316cf8c7269db97f9f9ec7a056533defece316fb149911c0f00013a89293ee0b898e3fd5cd79541f  lua-uuid-0.3.tar.gz
+"
diff --git a/main/lua-xctrl/APKBUILD b/main/lua-xctrl/APKBUILD
index 734b8ea6254..4414b9de3c0 100644
--- a/main/lua-xctrl/APKBUILD
+++ b/main/lua-xctrl/APKBUILD
@@ -1,63 +1,69 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-xctrl
 pkgver=2015.04.10
-_x=${pkgver%%.*}
-_y=${pkgver%.*}
-_y=${_y#*.}
-_z=${pkgver##*.}
-_ver=${_x}-${_y}-${_z}
-pkgrel=2
-_luaversions="5.1 5.2 5.3"
+pkgrel=4
 pkgdesc="Lua module that allows you to query and manipulate various aspects of an X11 window manager"
 url="https://github.com/yetanothergeek/xctrl"
 arch="all"
-license="GPL-2.0"
-depends=
+license="GPL-2.0-or-later"
 makedepends="lua-dev libx11-dev libxmu-dev"
-for _i in $_luaversions; do
-        makedepends="$makedepends lua$_i-dev"
-        subpackages="$subpackages lua$_i-xctrl:split_${_i/./_}"
-done
-install=
 subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/yetanothergeek/xctrl/archive/$pkgver.tar.gz"
-
+source="$pkgname-$pkgver.tar.gz::https://github.com/yetanothergeek/xctrl/archive/$pkgver.tar.gz
+	fix-linking.patch
+	"
 builddir="$srcdir"/xctrl-$pkgver
-_lua_libdir=/usr/lib/lua/5.1
+
+# higher versions fail to import (lua_pcall not found)
+_luaversions="5.1"
+for _i in $_luaversions; do
+	makedepends="$makedepends lua$_i-dev"
+	subpackages="$subpackages lua$_i-xctrl:_subpackage"
+done
 
 prepare() {
-	cd "$builddir"
+	default_prepare
+	local lver; for lver in $_luaversions; do
+		cp -r "$builddir" "$builddir-$lver"
+	done
 }
 
 build() {
-        for _i in $_luaversions; do
-                msg "Build for Lua $_i"
-		cd "$builddir"
-		export EXTRA_CFLAGS="-fPIC"
-		make LUAPKG="lua$_i" || return 1
+	local lver; for lver in $_luaversions; do
+		msg "building for Lua $lver..."
+		cd "$builddir-$lver"
+		make EXTRA_CFLAGS="$CFLAGS -fPIC" LUA="lua$lver"
 	done
 }
 
-package() {
-        cd "$builddir"
-        for _i in $_luaversions; do
-		install -d "$pkgdir"/usr/lib/lua/$_i "$pkgdir"/usr/share/doc/$pkgname
-		install src/xctrl.so "$pkgdir"/usr/lib/lua/$_i/xctrl.so
-		install doc/lxctrl.html "$pkgdir"/usr/share/doc/$pkgname/lxctrl.html
-        done
+check() {
+	local lver; for lver in $_luaversions; do
+		msg "Checking lua $lver build"
+		(
+		cd "$builddir-$lver"/src
+		# check if importable
+		lua$lver -e 'require("xctrl")'
+		)
+	done
 }
 
-_split() {
-        local d=usr/lib/lua _ver=$1
-        pkgdesc="$pkgdesc for Lua $_ver"
-        install_if="lua$_ver $pkgname=$pkgver-r$pkgrel"
-        depends=
-        mkdir -p "$subpkgdir/$d" || return 1
-        mv "$pkgdir/$d/$1" "$subpkgdir/$d"
+package() {
+	local lver; for lver in $_luaversions; do
+		install -Dm644 "$builddir-$lver"/src/xctrl.so \
+			-t "$pkgdir"/usr/lib/lua/$lver
+		install -Dm644 doc/lxctrl.html \
+			-t "$pkgdir"/usr/share/doc/$pkgname
+	done
 }
 
-for _v in $_luaversions; do
-        eval "split_${_v/./_}() { _split $_v; }"
-done
+_subpackage() {
+	local lver="${subpkgname:3:3}"
+	pkgdesc="$pkgdesc $lver"
+	depends="lua$lver"
+
+	amove usr/lib/lua/$lver
+}
 
-sha512sums="11a48641ebc71ab56201a707b844ee0d0475167fe4f4bd96f4d8296db00dc806c6d3889a5447bb41cec787b0de6d0351f77b45a8505fac5a5e184e3b80482acb  lua-xctrl-2015.04.10.tar.gz"
+sha512sums="
+11a48641ebc71ab56201a707b844ee0d0475167fe4f4bd96f4d8296db00dc806c6d3889a5447bb41cec787b0de6d0351f77b45a8505fac5a5e184e3b80482acb  lua-xctrl-2015.04.10.tar.gz
+37707f5a5a697eed1f3776fd33dc5140d0b0480ec39503d79f2793cb338fa28f68740b3f80443d957cfeeaca2593036e8b22a47b89bd445826b7515463489320  fix-linking.patch
+"
diff --git a/main/lua-xctrl/fix-linking.patch b/main/lua-xctrl/fix-linking.patch
new file mode 100644
index 00000000000..682b85f1e11
--- /dev/null
+++ b/main/lua-xctrl/fix-linking.patch
@@ -0,0 +1,16 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -33,11 +33,11 @@
+ lib: $(LIBNAME)_clean $(LIBNAME)
+ 
+ $(LIBNAME): xctrl.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -shared $^ -o $@
++	$(CC) $(CFLAGS) -shared $^ -o $@ $(LDFLAGS)
+ 
+ 
+ $(MODNAME): lxctrl.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -shared $^ -o $@
++	$(CC) $(CFLAGS) -shared $^ -o $@ $(LDFLAGS)
+ 
+ 
+ %.o: %.c
diff --git a/main/lua-yaml/APKBUILD b/main/lua-yaml/APKBUILD
index 928835427c8..fb992668a1c 100644
--- a/main/lua-yaml/APKBUILD
+++ b/main/lua-yaml/APKBUILD
@@ -4,17 +4,18 @@
 pkgname=lua-yaml
 _pkgname=yaml
 pkgver=1.1.2
-pkgrel=2
+pkgrel=7
 pkgdesc="LibYaml binding for Lua"
-url="http://yaml.luaforge.net"
+url="https://lubyk.github.io/lubyk/yaml.html"
 arch="all"
 license="MIT"
-makedepends="cmake yaml-dev"
+makedepends="cmake samurai yaml-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/lubyk/$_pkgname/archive/REL-$pkgver.tar.gz
 	cmake.patch"
 builddir="$srcdir/$_pkgname-REL-$pkgver"
+options="!check"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-$_pkgname:_subpackage"
@@ -24,19 +25,14 @@ build() {
 	local lver; for lver in $_luaversions; do
 		msg "Building for Lua $lver..."
 
-		mkdir -p "$builddir"/build/$lver
-		cd "$builddir"/build/$lver
-
-		cmake \
+		cmake -B build/$lver -G Ninja \
 			-DCMAKE_C_FLAGS="$CFLAGS -Wall -DNDEBUG $(pkg-config --cflags lua$lver)" \
-			-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 			-DCMAKE_SKIP_RPATH=TRUE \
 			-DCMAKE_VERBOSE_MAKEFILE=TRUE \
-			-DCMAKE_BUILD_TYPE=None \
+			-DCMAKE_BUILD_TYPE=MinSizeRel \
 			-DLUA_INSTALL_DIR=/usr/share/lua/$lver \
-			-DLUA_INSTALL_BINDIR=/usr/lib/lua/$lver \
-			"$builddir"
-		make
+			-DLUA_INSTALL_BINDIR=/usr/lib/lua/$lver
+		cmake --build build/$lver
 	done
 }
 
@@ -52,12 +48,13 @@ _subpackage() {
 	install_if="$pkgname=$pkgver-r$pkgrel lua$lver"
 	[ "$lver" = 5.1 ] && replaces="$pkgname"
 
-	cd "$builddir"/build/$lver
-	make DESTDIR="$subpkgdir" install
+	DESTDIR="$subpkgdir" cmake --install "$builddir"/build/$lver
 
 	mkdir -p "$rockdir"
 	echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
 }
 
-sha512sums="9d2ff4ddc243922f11c2ebea1d45bb3fa02e96a30752c04e65aec236e76780780511fe605a7a0bdbe9764189764a3951aadff8bb028c402571fd052cd70e35ac  lua-yaml-1.1.2.tar.gz
-db024b2acfa88441a4a72ec9c2a42d0980465cd759815474f02e3912ca458d913317aacdecf911e4048d43bab7878f472ce044f57dac3df66d20752e1255a8a8  cmake.patch"
+sha512sums="
+9d2ff4ddc243922f11c2ebea1d45bb3fa02e96a30752c04e65aec236e76780780511fe605a7a0bdbe9764189764a3951aadff8bb028c402571fd052cd70e35ac  lua-yaml-1.1.2.tar.gz
+db024b2acfa88441a4a72ec9c2a42d0980465cd759815474f02e3912ca458d913317aacdecf911e4048d43bab7878f472ce044f57dac3df66d20752e1255a8a8  cmake.patch
+"
diff --git a/main/lua5.1/APKBUILD b/main/lua5.1/APKBUILD
index cfb5f83cfb3..eb9b28cd7f9 100644
--- a/main/lua5.1/APKBUILD
+++ b/main/lua5.1/APKBUILD
@@ -3,7 +3,7 @@ pkgname=lua5.1
 _pkgname=lua
 pkgver=5.1.5
 _luaver=${pkgname#lua}
-pkgrel=7
+pkgrel=13
 pkgdesc="A powerful light-weight programming language designed for extending applications."
 url="https://www.lua.org/"
 arch="all"
@@ -13,7 +13,7 @@ makedepends="libtool autoconf automake"
 provides="lua"
 provider_priority=100
 replaces="lua"  # for backward compatibility
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-libs"
 source="https://www.lua.org/ftp/lua-$pkgver.tar.gz
 	lua-5.1-make.patch
 	lua-5.1-module_paths.patch
@@ -24,13 +24,11 @@ builddir="$srcdir/lua-$pkgver"
 prepare() {
 	default_prepare
 
-	cd "$builddir"
-
 	# we want packages to find our things
 	sed -i 's:/usr/local:/usr:' etc/lua.pc
 
 	# correct lua versioning
-	sed -i 's/\(LIB_VERSION = \).*/\16:4:1/' src/Makefile
+	sed -i 's/\(LIB_VERSION = \).*/\16:5:1/' src/Makefile
 
 	# we use libtool
 	cat > configure.ac <<-EOF
@@ -45,8 +43,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -61,13 +57,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
-
 	make V=$pkgver \
 		INSTALL_TOP="$pkgdir/usr" \
 		INSTALL_INC="$pkgdir/usr/include" \
@@ -82,12 +75,20 @@ package() {
 	install -D -m 644 doc/lua.1 "$pkgdir"/usr/share/man/man1/lua$_luaver.1
 	install -D -m 644 doc/luac.1 "$pkgdir"/usr/share/man/man1/luac$_luaver.1
 
+	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
+	install -m644 doc/*.html doc/*.css doc/logo.gif doc/cover.png \
+		"$pkgdir"/usr/share/doc/$pkgname/
+
 	# Create symlinks without version suffix.
 	ln -s lua$_luaver "$pkgdir"/usr/bin/lua
 	ln -s luac$_luaver "$pkgdir"/usr/bin/luac
 	ln -s lua$_luaver.pc "$pkgdir"/usr/lib/pkgconfig/lua.pc
 	ln -s lua$_luaver.1 "$pkgdir"/usr/share/man/man1/lua.1
 	ln -s luac$_luaver.1 "$pkgdir"/usr/share/man/man1/luac.1
+
+	# compat names since we are unique
+	# other distros name it lua-5.1 or lua51. pick the former as a compat name..
+	ln -sv lua5.1.pc "$pkgdir"/usr/lib/pkgconfig/lua-5.1.pc
 }
 
 dev() {
@@ -111,7 +112,9 @@ libs() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
 }
 
-sha512sums="0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9  lua-5.1.5.tar.gz
+sha512sums="
+0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9  lua-5.1.5.tar.gz
 ec5945f9f73d87fceaaa2418f1dc5c0f1e2ab1392e3a110e9ca737bfd122a951543899cd9b6170771374c35de8dd106f7b51ba9885eae281241c79b47ee58370  lua-5.1-make.patch
 6f9ad12b48ce250d23ed5d91b2feb2db43c405efc30df8ea1c818a83d0a4b36d934e8629224a9a3ca575f9bad1337ed4a97624884e4e2bab9b73e3aed5c20c64  lua-5.1-module_paths.patch
-a99154258419dc2e582804eae97517687e5b8b5f731dc91722193d1ff470b8522af6ff4e7142c9258afe4734cd52e6987d3c2108ac52b1487a262f1e89f2f332  lua-5.1-readline.patch"
+a99154258419dc2e582804eae97517687e5b8b5f731dc91722193d1ff470b8522af6ff4e7142c9258afe4734cd52e6987d3c2108ac52b1487a262f1e89f2f332  lua-5.1-readline.patch
+"
diff --git a/main/lua5.2/APKBUILD b/main/lua5.2/APKBUILD
index e5df9172765..14502c6fba9 100644
--- a/main/lua5.2/APKBUILD
+++ b/main/lua5.2/APKBUILD
@@ -2,32 +2,24 @@
 pkgname=lua5.2
 pkgver=5.2.4
 _luaver=${pkgname#lua}
-pkgrel=7
+pkgrel=13
 pkgdesc="Powerful light-weight programming language"
 url="https://www.lua.org/"
 arch="all"
 license="MIT"
-depends=
 ldpath="/usr/lib/$pkgname"
 makedepends="libtool autoconf automake"
 provides="lua"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
+provider_priority=200
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-libs"
 source="https://www.lua.org/ftp/lua-$pkgver.tar.gz
 	lua-5.2-make.patch
 	lua-5.2-module_paths.patch
 	"
+builddir="$srcdir"/lua-$pkgver
 
-_builddir="$srcdir"/lua-$pkgver
 prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		patch*|*.patch)
-			msg "Applying $i"
-			patch -p1 -i "$srcdir"/$i || return 1
-			;;
-		esac
-	done
+	default_prepare
 
 	# disable readline
 	sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h
@@ -44,46 +36,45 @@ EOF
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
+		--prefix=/usr
 	cd src
 	make V=$pkgver \
-		CFLAGS=" -DLUA_USE_LINUX -DLUA_COMPAT_ALL" \
+		CFLAGS="$CFLAGS -DLUA_USE_LINUX -DLUA_COMPAT_ALL" \
 		SYSLDFLAGS="$LDFLAGS" \
 		RPATH="/usr/lib" \
 		LIB_LIBS="-lpthread -lm -ldl" \
-		alpine_all || return 1
+		alpine_all
 }
 
 check() {
-	cd "$_builddir"
 	make test
 }
 
 package() {
-	cd "$_builddir"
 	make V=$pkgver \
 		INSTALL_TOP="$pkgdir"/usr \
 		INSTALL_INC="$pkgdir"/usr/include/$pkgname \
 		INSTALL_LIB="$pkgdir"/usr/lib/$pkgname \
-		alpine_install || return 1
+		alpine_install
 
 	for i in "$pkgdir"/usr/bin/* ; do
-		mv $i ${i}${_luaver} || return 1
+		mv $i ${i}${_luaver}
 	done
 
 	for i in "$pkgdir"/usr/lib/$pkgname/*.so.*; do
-		ln -s $pkgname/${i##*/} "$pkgdir"/usr/lib/${i##*/} || return 1
+		ln -s $pkgname/${i##*/} "$pkgdir"/usr/lib/${i##*/}
 	done
 
 	install -D -m 644 doc/lua.1 "$pkgdir"/usr/share/man/man1/lua$_luaver.1 \
 		&& install -D -m 644 doc/luac.1 \
-			"$pkgdir"/usr/share/man/man1/luac$_luaver.1 \
-		|| return 1
+			"$pkgdir"/usr/share/man/man1/luac$_luaver.1
+
+	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
+	install -m644 doc/*.html doc/*.css doc/logo.gif doc/osi-certified-72x60.png \
+		"$pkgdir"/usr/share/doc/$pkgname/
 
 	install -d "$pkgdir"/usr/lib/pkgconfig
 	cat > "$pkgdir"/usr/lib/pkgconfig/lua$_luaver.pc <<EOF
@@ -120,16 +111,18 @@ Cflags: -I\${includedir}
 # (end of lua$_luaver.pc)
 EOF
 
+	# compat names since we are unique
+	# other distros name it lua-5.2 or lua52. pick the former as a compat name..
+	ln -sv lua5.2.pc "$pkgdir"/usr/lib/pkgconfig/lua-5.2.pc
 }
 
 dev() {
 	depends_dev=$pkgname
 	default_dev
 	mkdir -p "$subpkgdir"/usr/$pkgname "$subpkgdir"/usr/lib/$pkgname
-	ln -s ../include/$pkgname "$subpkgdir"/usr/$pkgname/include || return 1
-	ln -s ../lib/$pkgname "$subpkgdir"/usr/$pkgname/lib || return 1
-	mv "$pkgdir"/usr/lib/$pkgname/liblua.so "$subpkgdir"/usr/lib/$pkgname/ \
-		|| return 1
+	ln -s ../include/$pkgname "$subpkgdir"/usr/$pkgname/include
+	ln -s ../lib/$pkgname "$subpkgdir"/usr/$pkgname/lib
+	mv "$pkgdir"/usr/lib/$pkgname/liblua.so "$subpkgdir"/usr/lib/$pkgname/
 }
 
 libs() {
@@ -139,6 +132,8 @@ libs() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
 }
 
-sha512sums="cd77148aba4b707b6c159758b5e8444e04f968092eb98f6b4c405b2fb647e709370d5a8dcf604176101d3407e196a7433b5dcdce4fe9605c76191d3649d61a8c  lua-5.2.4.tar.gz
+sha512sums="
+cd77148aba4b707b6c159758b5e8444e04f968092eb98f6b4c405b2fb647e709370d5a8dcf604176101d3407e196a7433b5dcdce4fe9605c76191d3649d61a8c  lua-5.2.4.tar.gz
 f1d5e0a1db0790fae82dd6de5742631c6c4ca009752630a612d864746990a00c8f2eacc7dbf07be2bce94d04da4ad185ed10dc317d7bf093df698bf84fea682e  lua-5.2-make.patch
-ca11e6b92acbdb3430faeeaa45fe1326043c3fff19da22a5d22ca38bff98635df3e33266046b1bf02302090f222dd5ab28759b4ed587da26ceb6e1dae6859829  lua-5.2-module_paths.patch"
+ca11e6b92acbdb3430faeeaa45fe1326043c3fff19da22a5d22ca38bff98635df3e33266046b1bf02302090f222dd5ab28759b4ed587da26ceb6e1dae6859829  lua-5.2-module_paths.patch
+"
diff --git a/main/lua5.3/APKBUILD b/main/lua5.3/APKBUILD
index b1baf7b75af..395af53283b 100644
--- a/main/lua5.3/APKBUILD
+++ b/main/lua5.3/APKBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua5.3
 _pkgname=lua
-pkgver=5.3.5
+pkgver=5.3.6
 _luaver=${pkgname#lua}
-pkgrel=2
+pkgrel=6
 pkgdesc="Powerful light-weight programming language"
 url="https://www.lua.org/"
 arch="all"
@@ -12,23 +12,21 @@ ldpath="/usr/lib/$pkgname"
 depends_dev="$pkgname"
 makedepends="libtool autoconf automake linenoise-dev"
 provides="lua"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
+provider_priority=300
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-libs"
 source="https://www.lua.org/ftp/$_pkgname-$pkgver.tar.gz
 	lua-5.3-make.patch
 	lua-5.3-module_paths.patch
 	linenoise.patch
-	CVE-2019-6706-use-after-free-lua_upvaluejoin.patch
 	"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 # secfixes:
 #   5.3.5-r2:
-#   - CVE-2019-6706
+#     - CVE-2019-6706
 
 prepare() {
 	default_prepare
-	cd "$builddir"
-
 	# disable readline
 	sed -i '/#define LUA_USE_READLINE/d' src/luaconf.h
 
@@ -44,8 +42,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -53,7 +49,7 @@ build() {
 
 	cd src
 	make V=${pkgver%.*} \
-		CFLAGS="-DLUA_USE_LINUX -DLUA_COMPAT_5_2 -DLUA_USE_LINENOISE" \
+		CFLAGS="$CFLAGS -DLUA_USE_LINUX -DLUA_COMPAT_5_2 -DLUA_USE_LINENOISE" \
 		SYSLDFLAGS="$LDFLAGS" \
 		RPATH="/usr/lib" \
 		LIB_LIBS="-lpthread -lm -ldl -llinenoise" \
@@ -61,14 +57,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
 	local i
-	cd "$builddir"
-
 	make V=${pkgver%.*} \
 		INSTALL_TOP="$pkgdir"/usr \
 		INSTALL_INC="$pkgdir"/usr/include/$pkgname \
@@ -86,6 +79,10 @@ package() {
 	install -D -m 644 doc/lua.1 "$pkgdir"/usr/share/man/man1/lua$_luaver.1
 	install -D -m 644 doc/luac.1 "$pkgdir"/usr/share/man/man1/luac$_luaver.1
 
+	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
+	install -m644 doc/*.html doc/*.css doc/logo.gif doc/osi-certified-72x60.png \
+		"$pkgdir"/usr/share/doc/$pkgname/
+
 	install -d "$pkgdir"/usr/lib/pkgconfig
 	cat > "$pkgdir"/usr/lib/pkgconfig/lua$_luaver.pc <<-EOF
 		# lua.pc -- pkg-config data for Lua
@@ -93,18 +90,18 @@ package() {
 		# vars from install Makefile
 
 		# grep '^V=' ../Makefile
-		V= ${_luaver}
+		V=$_luaver
 		# grep '^R=' ../Makefile
-		R= ${pkgver}
+		R=$pkgver
 
 		# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
-		prefix= /usr
-		INSTALL_BIN= \${prefix}/bin
-		INSTALL_INC= \${prefix}/include
-		INSTALL_LIB= \${prefix}/lib
-		INSTALL_MAN= \${prefix}/man/man1
-		INSTALL_LMOD= \${prefix}/share/lua/\${V}
-		INSTALL_CMOD= \${prefix}/lib/lua/\${V}
+		prefix=/usr
+		INSTALL_BIN=\${prefix}/bin
+		INSTALL_INC=\${prefix}/include
+		INSTALL_LIB=\${prefix}/lib
+		INSTALL_MAN=\${prefix}/man/man1
+		INSTALL_LMOD=\${prefix}/share/lua/\${V}
+		INSTALL_CMOD=\${prefix}/lib/lua/\${V}
 
 		# canonical vars
 		exec_prefix=\${prefix}
@@ -113,7 +110,7 @@ package() {
 
 		Name: Lua
 		Description: An Extensible Extension Language
-		Version: \${R}
+		Version: ${pkgver}
 		Requires:
 		Libs: -L\${libdir} -llua -lm
 		Cflags: -I\${includedir}
@@ -121,6 +118,9 @@ package() {
 		# (end of lua$_luaver.pc)
 	EOF
 
+	# compat names since we are unique
+	# other distros name it lua-5.3 or lua53. pick the former as a compat name..
+	ln -sv lua5.3.pc "$pkgdir"/usr/lib/pkgconfig/lua-5.3.pc
 }
 
 dev() {
@@ -140,8 +140,9 @@ libs() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
 }
 
-sha512sums="4f9516acc4659dfd0a9e911bfa00c0788f0ad9348e5724fe8fb17aac59e9c0060a64378f82be86f8534e49c6c013e7488ad17321bafcc787831d3d67406bd0f4  lua-5.3.5.tar.gz
+sha512sums="
+ccc380d5e114d54504de0bfb0321ca25ec325d6ff1bfee44b11870b660762d1a9bf120490c027a0088128b58bb6b5271bbc648400cab84d2dc22b512c4841681  lua-5.3.6.tar.gz
 1bc6c623024c1738155b30ff9c0edcce0f336edc25aa20c3a1400c859421ea2015d75175cce8d515e055ac3e96028426b74812e04022af18a0ed4c4601556027  lua-5.3-make.patch
 bc68772390dc8d8940176af0b9fbacc0af61891b5d27de5f1466a4e7f9b3291a1c08ba5add829bc96b789a53fa5ec2dadaa096ca6eabe54ec27724fa2810940f  lua-5.3-module_paths.patch
 a2edcf5a41513492edff5fa6e97652e676ceb6c66bb2c6a7e6f345570248d7646167f0172ceb07a74fd9d4a43051ed8244fbd94706dd9f5593f174075592a527  linenoise.patch
-fde7f5f5a184cd393665c7c8c7ba3c728e1413df5f63dbe60855af13ddd313d9300720298534f4312638ddf59fa678a38f708bce622dd7a2298b4ed87c068ae7  CVE-2019-6706-use-after-free-lua_upvaluejoin.patch"
+"
diff --git a/main/lua5.3/CVE-2019-6706-use-after-free-lua_upvaluejoin.patch b/main/lua5.3/CVE-2019-6706-use-after-free-lua_upvaluejoin.patch
deleted file mode 100644
index ea26696fda3..00000000000
--- a/main/lua5.3/CVE-2019-6706-use-after-free-lua_upvaluejoin.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://lua.2524044.n2.nabble.com/CVE-2019-6706-use-after-free-in-lua-upvaluejoin-function-tc7685575.html
-
---- a/src/lapi.c
-+++ b/src/lapi.c
-@@ -1285,14 +1285,14 @@ LUA_API void *lua_upvalueid (lua_State *
- 
- LUA_API void lua_upvaluejoin (lua_State *L, int fidx1, int n1,
-                                             int fidx2, int n2) {
--  LClosure *f1;
--  UpVal **up1 = getupvalref(L, fidx1, n1, &f1);
-+  UpVal **up1 = getupvalref(L, fidx1, n1, NULL); /* the last parameter not needed */
-   UpVal **up2 = getupvalref(L, fidx2, n2, NULL);
-+  if (*up1 == *up2) return; /* Already joined */
-+  (*up2)->refcount++;
-+  if (upisopen(*up2)) (*up2)->u.open.touched = 1;
-+  luaC_upvalbarrier(L, *up2);
-   luaC_upvdeccount(L, *up1);
-   *up1 = *up2;
--  (*up1)->refcount++;
--  if (upisopen(*up1)) (*up1)->u.open.touched = 1;
--  luaC_upvalbarrier(L, *up1);
- }
- 
- 
diff --git a/main/lua5.4/APKBUILD b/main/lua5.4/APKBUILD
new file mode 100644
index 00000000000..42223029c67
--- /dev/null
+++ b/main/lua5.4/APKBUILD
@@ -0,0 +1,124 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=lua5.4
+_pkgname=lua
+pkgver=5.4.6
+_luaver=${pkgname#lua}
+pkgrel=1
+pkgdesc="Powerful light-weight programming language"
+url="https://www.lua.org/"
+arch="all"
+license="MIT"
+ldpath="/usr/lib/$pkgname"
+depends_dev="$pkgname"
+makedepends="libtool autoconf automake readline-dev"
+provides="lua"
+provider_priority=400
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-libs"
+source="https://www.lua.org/ftp/$_pkgname-$pkgver.tar.gz
+	lua-5.4-make.patch
+	lua-5.4-module_paths.patch
+	lua5.4.pc
+	extern-c-for-cpp.patch
+	"
+builddir="$srcdir/$_pkgname-$pkgver"
+
+# secfixes:
+#   5.4.4-r4:
+#     - CVE-2022-28805
+#   5.3.5-r2:
+#     - CVE-2019-6706
+
+prepare() {
+	default_prepare
+
+	# Fill in data from pkgconfig file
+	sed -e "s|@MAJOR_VER@|$_luaver|g" \
+		-e "s|@MINOR_VER@|$pkgver|g" \
+		-i "$srcdir"/lua5.4.pc
+
+	# we use libtool
+	cat > configure.ac <<-EOF
+		top_buildir=.
+
+		AC_INIT(src/luaconf.h)
+		AC_PROG_LIBTOOL
+		AC_OUTPUT()
+	EOF
+	libtoolize --force --install && aclocal && autoconf
+}
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr
+
+	cd src
+	make V=${pkgver%.*} \
+		CFLAGS="$CFLAGS -DLUA_USE_LINUX -DLUA_COMPAT_5_3 -DLUA_USE_READLINE" \
+		SYSLDFLAGS="$LDFLAGS" \
+		RPATH="/usr/lib" \
+		LIB_LIBS="-lpthread -lm -ldl -lreadline" \
+		alpine_all
+}
+
+check() {
+	make test
+}
+
+package() {
+	local i
+	make V=${pkgver%.*} \
+		INSTALL_TOP="$pkgdir"/usr \
+		INSTALL_INC="$pkgdir"/usr/include/$pkgname \
+		INSTALL_LIB="$pkgdir"/usr/lib/$pkgname \
+		alpine_install
+
+	for i in "$pkgdir"/usr/bin/* ; do
+		mv "$i" "$i"$_luaver
+	done
+
+	for i in "$pkgdir/usr/lib/$pkgname"/*.so.*; do
+		ln -s $pkgname/${i##*/} "$pkgdir"/usr/lib/${i##*/}
+	done
+
+	install -D -m 644 doc/lua.1 "$pkgdir"/usr/share/man/man1/lua$_luaver.1
+	install -D -m 644 doc/luac.1 "$pkgdir"/usr/share/man/man1/luac$_luaver.1
+
+	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
+	install -m644 doc/*.html doc/*.css doc/logo.gif doc/osi-certified-72x60.png \
+		"$pkgdir"/usr/share/doc/$pkgname/
+
+	install -Dm644 "$srcdir"/lua5.4.pc -t "$pkgdir"/usr/lib/pkgconfig
+	# compat name for "c++" lua (same thing with extern C
+	ln -sv lua5.4.pc "$pkgdir"/usr/lib/pkgconfig/lua5.4-c++.pc
+	# compat names since we are unique
+	# other distros name it lua-5.4 or lua54. pick the former as a compat name..
+	ln -sv lua5.4.pc "$pkgdir"/usr/lib/pkgconfig/lua-5.4-c++.pc
+	ln -sv lua5.4.pc "$pkgdir"/usr/lib/pkgconfig/lua-5.4.pc
+}
+
+dev() {
+	default_dev
+
+	mkdir -p "$subpkgdir"/usr/$pkgname "$subpkgdir"/usr/lib/$pkgname
+	ln -s ../include/$pkgname "$subpkgdir"/usr/$pkgname/include
+	ln -s ../lib/$pkgname "$subpkgdir"/usr/$pkgname/lib
+	mv "$pkgdir"/usr/lib/$pkgname/liblua.so "$subpkgdir"/usr/lib/$pkgname/
+}
+
+libs() {
+	pkgdesc="Lua dynamic library runtime"
+	replaces="lua"
+
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
+}
+
+sha512sums="
+d90c6903355ee1309cb0d92a8a024522ff049091a117ea21efb585b5de35776191cd67d17a65b18c2f9d374795b7c944f047576f0e3fe818d094b26f0e4845c5  lua-5.4.6.tar.gz
+1bc6c623024c1738155b30ff9c0edcce0f336edc25aa20c3a1400c859421ea2015d75175cce8d515e055ac3e96028426b74812e04022af18a0ed4c4601556027  lua-5.4-make.patch
+904a9b296d0bdb68630f8865fce86fc8f092120ee6ebfeb97f069b5aa49f203ddc63aeceee276ae8e006bbb73bf2811e7eceb6aae82817170d3acef3ad057c93  lua-5.4-module_paths.patch
+34466bc244737a557ff2c87efbc62ab5c5424523f574d17b2f34aea40f534f2c45cdfa242097aadecd38f00d732b0c8e9daef1cd461728a084c72946edb9a48a  lua5.4.pc
+e0932fedde440e76738725a6eca91bfdc94236fc1ead12731d303282c3cf721f09c601bae88dd9e6d7e77d89e5877ab18d720f146685a273318d33d48dedeba8  extern-c-for-cpp.patch
+"
diff --git a/main/lua5.4/extern-c-for-cpp.patch b/main/lua5.4/extern-c-for-cpp.patch
new file mode 100644
index 00000000000..c2268c76db8
--- /dev/null
+++ b/main/lua5.4/extern-c-for-cpp.patch
@@ -0,0 +1,23 @@
+Patch-Source: https://salsa.debian.org/lua-team/lua5.4/-/blob/bc284bb404e51d27feb5ffc705de8e32959c2048/debian/patches/0003-extern_C.patch
+From: Enrico Tassi <gareuselesinge@debian.org>
+Date: Fri, 14 Aug 2015 09:36:52 +0200
+Subject: extern_C
+
+---
+ src/luaconf.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -287,7 +287,11 @@
+ 
+ #else				/* }{ */
+ 
++#ifdef __cplusplus
++#define LUA_API                extern "C"
++#else
+ #define LUA_API		extern
++#endif
+ 
+ #endif				/* } */
+ 
diff --git a/main/lua5.4/lua-5.4-make.patch b/main/lua5.4/lua-5.4-make.patch
new file mode 100644
index 00000000000..3492186072b
--- /dev/null
+++ b/main/lua5.4/lua-5.4-make.patch
@@ -0,0 +1,74 @@
+diff --git a/Makefile b/Makefile
+index 7fa91c8..c85ede2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -112,3 +112,18 @@ pc:
+ .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho
+ 
+ # (end of Makefile)
++
++# Use libtool for binary installs, etc.
++
++export V
++export LIBTOOL = ../libtool --quiet --tag=CC
++# See libtool manual about how to set this
++
++alpine_clean:
++	cd src; $(MAKE) $@
++
++alpine_install:
++	mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
++	cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua luac $(INSTALL_BIN)
++	cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
++	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la $(INSTALL_LIB)
+diff --git a/src/Makefile b/src/Makefile
+index 2e7a412..a72f342 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -59,10 +59,10 @@ $(LUA_A): $(BASE_O)
+ 	$(AR) $@ $(BASE_O)
+ 	$(RANLIB) $@
+ 
+-$(LUA_T): $(LUA_O) $(LUA_A)
++origin$(LUA_T): $(LUA_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ 
+-$(LUAC_T): $(LUAC_O) $(LUA_A)
++origin$(LUAC_T): $(LUAC_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+ 
+ clean:
+@@ -194,4 +194,33 @@ lvm.o: lvm.c lprefix.h lua.h luaconf.h ldebug.h lstate.h lobject.h \
+ lzio.o: lzio.c lprefix.h lua.h luaconf.h llimits.h lmem.h lstate.h \
+   lobject.h ltm.h lzio.h
+ 
++
++export LIBTOOL = ../libtool --quiet --tag=CC
++export LIB_VERSION = 0:0:0
++
++# The following rules use libtool for compiling and linking in order to
++# provide shared library support.
++
++LIB_NAME = liblua.la
++LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
++
++%.lo %.o: %.c
++	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
++
++$(LIB_NAME): $(LIB_OBJS)
++	$(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) -release $(V) \
++            -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
++
++$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
++	$(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ \
++		$(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
++
++$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
++	$(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) \
++		$(LIB_NAME)
++
++alpine_clean:
++	$(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac
++
++alpine_all: $(LIB_NAME) $(LUA_T) $(LUAC_T)
+ # (end of Makefile)
diff --git a/main/lua5.4/lua-5.4-module_paths.patch b/main/lua5.4/lua-5.4-module_paths.patch
new file mode 100644
index 00000000000..9c806a9f8bd
--- /dev/null
+++ b/main/lua5.4/lua-5.4-module_paths.patch
@@ -0,0 +1,35 @@
+diff --git a/src/luaconf.h b/src/luaconf.h
+index d9cf18c..222eaf8 100644
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -216,16 +216,28 @@
+ #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"
+ #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"
+ 
++#define LUA_VENDOR_ROOT	"/usr/"
++/* Path for version-specific Lua modules. */
++#define LUA_VENDOR_LDIR	LUA_VENDOR_ROOT "share/lua/" LUA_VDIR "/"
++/* Path for Lua modules that are compatible with Lua 5.1 and newer. */
++#define LUA_VENDOR_COMMON_LDIR LUA_VENDOR_ROOT "share/lua/common/"
++#define LUA_VENDOR_CDIR	LUA_VENDOR_ROOT "lib/lua/" LUA_VDIR "/"
++
+ #if !defined(LUA_PATH_DEFAULT)
+ #define LUA_PATH_DEFAULT  \
+ 		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+ 		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
+-		"./?.lua;" "./?/init.lua"
++		LUA_VENDOR_LDIR"?.lua;"  LUA_VENDOR_LDIR"?/init.lua;" \
++		LUA_VENDOR_CDIR"?.lua;"  LUA_VENDOR_CDIR"?/init.lua;" \
++		LUA_VENDOR_COMMON_LDIR"?.lua;"  LUA_VENDOR_COMMON_LDIR"?/init.lua;" \
++		"./?.lua;" "./?/init.lua" 
+ #endif
+ 
+ #if !defined(LUA_CPATH_DEFAULT)
+ #define LUA_CPATH_DEFAULT \
+-		LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
++		LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" \
++		LUA_VENDOR_CDIR"?.so;" LUA_VENDOR_CDIR"loadall.so;" \
++		"./?.so"
+ #endif
+ 
+ #endif			/* } */
diff --git a/main/lua5.4/lua5.4.pc b/main/lua5.4/lua5.4.pc
new file mode 100644
index 00000000000..06c8abc2b65
--- /dev/null
+++ b/main/lua5.4/lua5.4.pc
@@ -0,0 +1,24 @@
+# lua.pc -- pkg-config data for Lua
+
+# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
+prefix=/usr
+INSTALL_BIN=${prefix}/bin
+INSTALL_INC=${prefix}/include
+INSTALL_LIB=${prefix}/lib
+INSTALL_MAN=${prefix}/man/man1
+INSTALL_LMOD=${prefix}/share/lua/@MAJOR_VER@
+INSTALL_CMOD=${prefix}/lib/lua/@MAJOR_VER@
+
+# canonical vars
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib/lua@MAJOR_VER@
+includedir=${prefix}/include/lua@MAJOR_VER@
+
+Name: Lua
+Description: An Extensible Extension Language
+Version: @MINOR_VER@
+Requires:
+Libs: -L${libdir} -llua -lm
+Cflags: -I${includedir}
+
+# (end of lua@MAJOR_VER@.pc)
diff --git a/main/luajit/APKBUILD b/main/luajit/APKBUILD
index ed8afe715c9..5a7f42231de 100644
--- a/main/luajit/APKBUILD
+++ b/main/luajit/APKBUILD
@@ -1,36 +1,66 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 pkgname=luajit
-_pkgname=moonjit
-pkgver=5.1.20190925
-_pkgver=fedora-${pkgver##*.}
-_compatver=2.1.0-beta3
-pkgrel=0
-pkgdesc="Integration fork of the original LuaJIT"
-url="https://github.com/siddhesh/LuaJIT"
-arch="all"
+_pkgname=luajit2
+pkgver=2.1_p20230410
+_pkgver=${pkgver/_p/-}
+pkgrel=3
+_gitrev_tests=1fa1f103f9235e22aac5331fe04b267ee7be6206
+pkgdesc="OpenResty's branch of LuaJIT"
+url="https://github.com/openresty/luajit2"
+# ppc64le: fails tests/not really supported
+# riscv64 loongarch64: does not build/not supported
+arch="all !ppc64le !riscv64 !loongarch64"
 license="MIT"
+checkdepends="
+	perl
+	perl-parallel-forkmanager
+	sqlite-dev
+	zlib-dev
+	"
 provides="lua"
+# lower than 5.1
+provider_priority=90
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://github.com/siddhesh/luajit/archive/luajit-$_pkgver.tar.gz
-	module-paths.patch"
-builddir="$srcdir/$_pkgname-$pkgname-$_pkgver"
+source="https://github.com/openresty/luajit2/archive/v$_pkgver/$_pkgname-$_pkgver.tar.gz
+	https://github.com/openresty/luajit2-test-suite/archive/$_gitrev_tests/luajit2-test-suite-$_gitrev_tests.tar.gz
+	fix-tests-alpine.patch
+	module-paths.patch
+	"
+builddir="$srcdir/$_pkgname-$_pkgver"
+
+prepare() {
+	cp -Rl ../luajit2-test-suite-$_gitrev_tests test-suite
+
+	default_prepare
+
+	case "$CARCH" in
+		# bit.tobit test failed (got 280328, expected 277312)
+		arm*) rm test-suite/test/misc/bit_op.lua;;
+		# 35: declaration specifier expected near '_Alignas' at line 882
+		x86) rm test-suite/test/sysdep/ffi_include_std.lua;;
+	esac
+}
 
 build() {
-	make amalg PREFIX=/usr
+	# It's a language runtime, performance does matter. Users for whom disk
+	# size is more important can use lua5.1 instead.
+	export CFLAGS="${CFLAGS/-Os/-O2}"
+
+	# These flags are recommended by OpenResty.
+	local xcflags="-DLUAJIT_ENABLE_LUA52COMPAT -DLUAJIT_NUMMODE=2"
+
+	make amalg PREFIX=/usr XCFLAGS="$xcflags"
 }
 
 check() {
-	# tests fail
-	sed -i -e '/redir.lua/d' test/lib/ffi/index
-	case $CARCH in
-		ppc64le|s390x) sed -i -e '/math_special.lua/d' test/unportable/index;;
-		armv7|armhf)
-			sed -i -e '/math_special.lua/d' test/unportable/index
-			sed -i -e '/bit.lua/d' test/lib/index
-			;;
-	esac
-	make check
+	local prefix="$builddir/test-suite/target"
+	mkdir -p "$prefix"
+
+	make install PREFIX="$prefix"
+
+	cd test-suite
+	LUA52=1 ./run-tests "$prefix"
 }
 
 package() {
@@ -40,5 +70,9 @@ package() {
 		"$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
 }
 
-sha512sums="d7c256a0865c266e99c8899f10bdb9d8f205dd37a36dcf4bf2cfcd917f2df8fa0e77f8f8dbda06ff371fd1ec834a74128b97ce09de05fe10c88ace8cd9cef515  luajit-fedora-20190925.tar.gz
-9c6c410e142838c5128c70570e66beb53cc5422df5ecfb8ab0b5f362637b21ab5978c00f19bc1759165df162fd6438a2ed43e25020400011b7bb14014d87c62e  module-paths.patch"
+sha512sums="
+b861b4182f4e6814878a9de84ed5a864429a8b9a29f8d1b20b2ec5f42e8883214f3d04ee0e8d7f80e3e58debfedff7a8b6363310b74d926f5cfe7be13ce0892c  luajit2-2.1-20230410.tar.gz
+9931f56998f89638e97ce60d9dab8e8e091d5001a576f7bb4125a8bf7c55cee391421fdf8c60c4454f2518c2865c9374e727ec24a09594b3edb08f2c100950d7  luajit2-test-suite-1fa1f103f9235e22aac5331fe04b267ee7be6206.tar.gz
+684be4199634ac6e52183e98b65c9bcdc99217865c47b83a1f579a9f0e1ec55fb1a5fe8ae2f1293ac561c8c806aef269e451e3d73bf168ec20a4fd343c7a89d4  fix-tests-alpine.patch
+9c6c410e142838c5128c70570e66beb53cc5422df5ecfb8ab0b5f362637b21ab5978c00f19bc1759165df162fd6438a2ed43e25020400011b7bb14014d87c62e  module-paths.patch
+"
diff --git a/main/luajit/fix-tests-alpine.patch b/main/luajit/fix-tests-alpine.patch
new file mode 100644
index 00000000000..83e3108a282
--- /dev/null
+++ b/main/luajit/fix-tests-alpine.patch
@@ -0,0 +1,89 @@
+Fix tests to pass on musl and also avoid extra dependencies (e.g. ncurses, mpc, ...).
+
+--- a/test-suite/run-tests
++++ b/test-suite/run-tests
+@@ -73,15 +73,6 @@
+ 
+ $ENV{LUA_CPATH} = "$cwd/test/clib/?;;";
+ 
+-my $cmd = "pkg-config --cflags --libs gtk+-2.0";
+-my $cdefs = `$cmd`;
+-if ($? != 0) {
+-    die "failed to run command $cmd: $?";
+-}
+-chomp $cdefs;
+-$ENV{CDEFS} = $cdefs;
+-#warn "CDEFS=$cdefs";
+-
+ if (@ARGV) {
+     for my $test_file (@ARGV) {
+         my ($dir, $fname);
+--- a/test-suite/test/ffi/ffi_redir.lua
++++ b/test-suite/test/ffi/ffi_redir.lua
+@@ -12,7 +12,7 @@
+   ]]
+ else
+   ffi.cdef[[
+-  int bar asm("errno");
++  int bar asm("opterr");
+   ]]
+ end
+ 
+--- a/test-suite/test/sysdep/ffi_include_gtk.lua
++++ b/test-suite/test/sysdep/ffi_include_gtk.lua
+@@ -1,9 +0,0 @@
+-local ffi = require("ffi")
+-
+-dofile("../common/ffi_util.inc")
+-
+-if cdefs == "" then
+-  cdefs = "-pthread -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/gdk-pixbuf-2.0"
+-end
+-
+-include"/usr/include/gtk-2.0/gtk/gtk.h"
+--- a/test-suite/test/sysdep/ffi_include_std.lua
++++ b/test-suite/test/sysdep/ffi_include_std.lua
+@@ -14,15 +14,8 @@
+ #define _Float128 long double
+ 
+ #include <sqlite3.h>
+-#include <thread_db.h>
+ #include <resolv.h>
+-#include <mpfr.h>
+-#include <mpc.h>
+-#include <curses.h>
+-#include <form.h>
+ #include <aio.h>
+-#include <unistd.h>
+-#include <zlib.h>
+ #include <netdb.h>
+ #include <math.h>
+ #include <tgmath.h>
+--- a/test-suite/test/sysdep/ffi_lib_c.lua
++++ b/test-suite/test/sysdep/ffi_lib_c.lua
+@@ -7,6 +7,9 @@
+ int rmdir(const char *name);
+ int errno;
+ 
++// musl libc
++int *__errno_location(void);
++
+ // Windows
+ unsigned int GetSystemDirectoryA(char *buf, unsigned int sz);
+ char *CharUpperA(char *str);
+@@ -62,11 +65,11 @@
+   ffi.C._fmode = ffi.C._O_TEXT
+ else
+   assert(ffi.C.rmdir("/tmp/does_not_exist") == -1)
+-  assert(ffi.C.errno == 2)
++  assert(ffi.C.__errno_location()[0] == 2)
+ 
+-  ffi.C.errno = 17
+-  assert(ffi.C.errno == 17)
+-  ffi.C.errno = 0
++  ffi.C.__errno_location()[0] = 17
++  assert(ffi.C.__errno_location()[0] == 17)
++  ffi.C.__errno_location()[0] = 0
+ end
+ 
+ do
diff --git a/main/lucene++/APKBUILD b/main/lucene++/APKBUILD
deleted file mode 100644
index c28540f4ff2..00000000000
--- a/main/lucene++/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=lucene++
-pkgver=3.0.7
-pkgrel=12
-pkgdesc="C++ port of the popular Java Lucene library"
-url="https://github.com/luceneplusplus/LucenePlusPlus"
-arch="all"
-license="LGPL-3.0-or-later OR Apache-2.0"
-depends_dev="boost-dev"
-makedepends="$depends_dev cmake linux-headers"
-subpackages="$pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_3.0.7.tar.gz"
-
-builddir="$srcdir/LucenePlusPlus-rel_$pkgver"
-
-build() {
-	cmake -B build . \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DLIB_DESTINATION=/usr/lib \
-		-DBoost_LIBRARY_DIR=/usr/lib \
-		-DENABLE_CUSTOM_ALLOCATOR='FALSE' \
-		-DCMAKE_CXX_FLAGS='-DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT' \
-		-DCOTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_PATH=/usr/include/fortify
-	make -C build
-}
-
-package() {
-	make -C build DESTDIR="$pkgdir" install
-}
-
-sha512sums="92f3bba320980673cc64c983616aa38d25b44ea811237ed226741b892757fb8151e4f833aa58a18dbe7a0c9a899d94e828aa15e6d7b48a69ab730d1d772db220  lucene++-3.0.7.tar.gz"
diff --git a/main/lutok/APKBUILD b/main/lutok/APKBUILD
index 3f827fa91b8..fdd7ac3f6d8 100644
--- a/main/lutok/APKBUILD
+++ b/main/lutok/APKBUILD
@@ -1,28 +1,25 @@
-# Maintainer: 
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lutok
 pkgver=0.4
-pkgrel=2
+pkgrel=6
 pkgdesc="lightweight C++ API for Lua"
-url="https://github.com/jmmv/lutok"
+url="https://github.com/freebsd/lutok"
 arch="all"
-license="BSD"
-depends_dev="lua5.3-dev"
+license="BSD-3-Clause"
+_luaver=5.4
+depends_dev="lua$_luaver-dev"
 makedepends="$depends_dev"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://github.com/jmmv/lutok/releases/download/lutok-$pkgver/lutok-$pkgver.tar.gz"
-builddir="$srcdir/lutok-$pkgver"
+source="https://github.com/freebsd/lutok/releases/download/lutok-$pkgver/lutok-$pkgver.tar.gz"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
-
-	LUA_CFLAGS=$(pkg-config --cflags lua5.3) \
-		LUA_LIBS=$(pkg-config --libs lua5.3) \
+	LUA_CFLAGS=$(pkg-config --cflags lua$_luaver) \
+		LUA_LIBS=$(pkg-config --libs lua$_luaver) \
 		./configure \
 			--build=$CBUILD \
 			--host=$CHOST \
@@ -34,12 +31,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
diff --git a/main/lvm2/0001-lvresize-use-POSIX-shell.patch b/main/lvm2/0001-lvresize-use-POSIX-shell.patch
new file mode 100644
index 00000000000..cf9609bac8b
--- /dev/null
+++ b/main/lvm2/0001-lvresize-use-POSIX-shell.patch
@@ -0,0 +1,124 @@
+From 50fe324ff953eedd210054ffc21715d22134b3c1 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 16 Nov 2022 11:55:34 +0100
+Subject: [PATCH] lvresize: use POSIX shell
+
+---
+ scripts/lvresize_fs_helper.sh | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/scripts/lvresize_fs_helper.sh b/scripts/lvresize_fs_helper.sh
+index 90b1a97..1c48a71 100755
+--- a/scripts/lvresize_fs_helper.sh
++++ b/scripts/lvresize_fs_helper.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Copyright (C) 2022 Red Hat, Inc. All rights reserved.
+ #
+@@ -69,7 +69,7 @@ fsextend() {
+ 		fi
+ 	fi
+ 
+-	if [[ "$FSTYPE" == "ext"* ]]; then
++	if [ "${FSTYPE#ext}" != "$FSTYPE" ]; then
+ 		logmsg "resize2fs ${DEVPATH}"
+ 		if resize2fs "$DEVPATH"; then
+ 			logmsg "resize2fs done"
+@@ -77,7 +77,7 @@ fsextend() {
+ 			logmsg "resize2fs failed"
+ 			RESIZEFS_FAILED=1
+ 		fi
+-	elif [[ "$FSTYPE" == "xfs" ]]; then
++	elif [ "$FSTYPE" = "xfs" ]; then
+ 		logmsg "xfs_growfs ${DEVPATH}"
+ 		if xfs_growfs "$DEVPATH"; then
+ 			logmsg "xfs_growfs done"
+@@ -102,7 +102,7 @@ fsextend() {
+ 
+ 	# If the fs was temporarily unmounted, now remount it.
+ 	# Not considered a command failure if this fails.
+-	if [[ $DO_UNMOUNT -eq 1 && $REMOUNT -eq 1 ]]; then
++	if [ "$DO_UNMOUNT" -eq 1 ] && [ "$REMOUNT" -eq 1 ]; then
+ 		logmsg "remount ${DEVPATH} ${MOUNTDIR}"
+ 		if mount -t "$FSTYPE" "$DEVPATH" "$MOUNTDIR"; then
+ 			logmsg "remount done"
+@@ -151,7 +151,7 @@ fsreduce() {
+ 		fi
+ 	fi
+ 
+-	if [[ "$FSTYPE" == "ext"* ]]; then
++	if [ "${FSTYPE#ext}" != "$FSTYPE" ]; then
+ 		NEWSIZEKB=$(( NEWSIZEBYTES / 1024 ))
+ 		logmsg "resize2fs ${DEVPATH} ${NEWSIZEKB}k"
+ 		if resize2fs "$DEVPATH" "$NEWSIZEKB"k; then
+@@ -194,7 +194,7 @@ fsreduce() {
+ 
+ 	# If the fs was temporarily unmounted, now remount it.
+ 	# Not considered a command failure if this fails.
+-	if [[ $DO_UNMOUNT -eq 1 && $REMOUNT -eq 1 ]]; then
++	if [ "$DO_UNMOUNT" -eq 1 ] && [ "$REMOUNT" -eq 1 ]; then
+ 		logmsg "remount ${DEVPATH} ${MOUNTDIR}"
+ 		if mount -t "$FSTYPE" "$DEVPATH" "$MOUNTDIR"; then
+ 			logmsg "remount done"
+@@ -291,7 +291,7 @@ DO_FSCK=0
+ # mounted and the script unmounted it.
+ REMOUNT=0
+ 
+-if [ "$UID" != 0 ] && [ "$EUID" != 0 ]; then
++if [ "$(id -u)" != 0 ]; then
+ 	errorexit "${SCRIPTNAME} must be run as root."
+ fi
+ 
+@@ -372,11 +372,11 @@ done
+ #
+ 
+ # There are three top level commands: --fsextend, --fsreduce, --cryptresize.
+-if [[ "$DO_FSEXTEND" -eq 0 && "$DO_FSREDUCE" -eq 0 && "$DO_CRYPTRESIZE" -eq 0 ]]; then
++if [ "$DO_FSEXTEND" -eq 0 ] && [ "$DO_FSREDUCE" -eq 0 ]  && [ "$DO_CRYPTRESIZE" -eq 0 ]; then
+ 	errorexit "Missing --fsextend|--fsreduce|--cryptresize."
+ fi
+ 
+-if [[ "$DO_FSEXTEND" -eq 1 || "$DO_FSREDUCE" -eq 1 ]]; then
++if [ "$DO_FSEXTEND" -eq 1 ] || [ "$DO_FSREDUCE" -eq 1 ]; then
+ 	case "$FSTYPE" in
+ 	  ext[234]) ;;
+ 	  "xfs")    ;;
+@@ -388,7 +388,7 @@ if [[ "$DO_FSEXTEND" -eq 1 || "$DO_FSREDUCE" -eq 1 ]]; then
+ 	fi
+ fi
+ 
+-if [[ "$DO_CRYPTRESIZE" -eq 1 && -z "$CRYPTPATH" ]]; then
++if [ "$DO_CRYPTRESIZE" -eq 1 ] && [ -z "$CRYPTPATH" ]; then
+ 	errorexit "Missing required --cryptpath for --cryptresize."
+ fi
+ 
+@@ -406,15 +406,15 @@ if [ ! -e "$DEVPATH" ]; then
+ 	errorexit "Device does not exist \"$DEVPATH\"."
+ fi
+ 
+-if [[ "$DO_UNMOUNT" -eq 1 && -z "$MOUNTDIR" ]]; then
++if [ "$DO_UNMOUNT" -eq 1 ] && [ -z "$MOUNTDIR" ]; then
+ 	errorexit "Missing required --mountdir for --unmount."
+ fi
+ 
+-if [[ "$DO_FSREDUCE" -eq 1 && "$FSTYPE" == "xfs" ]]; then
++if [ "$DO_FSREDUCE" -eq 1 ] && [ "$FSTYPE" = "xfs" ]; then
+ 	errorexit "Cannot reduce xfs."
+ fi
+ 
+-if [[ "$DO_FSCK" -eq 1 && "$FSTYPE" == "xfs" ]]; then
++if [ "$DO_FSCK" -eq 1 ] && [ "$FSTYPE" = "xfs" ]; then
+ 	errorexit "Cannot use --fsck with xfs."
+ fi
+ 
+@@ -424,7 +424,7 @@ if [ "$DO_MOUNT" -eq 1 ]; then
+ 		errorexit "Failed to create temp dir."
+ 	fi
+ 	# In case the script terminates without doing cleanup
+-	function finish {
++	finish() {
+ 		if [ "$TMP_MOUNT_DONE" -eq 1 ]; then
+ 			logmsg "exit unmount ${TMPDIR}"
+ 			umount "$TMPDIR"
diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD
index 0ed8e4f2d20..04a4ee62844 100644
--- a/main/lvm2/APKBUILD
+++ b/main/lvm2/APKBUILD
@@ -1,45 +1,59 @@
+# Contributor: Jacek Migacz <jacekmigacz@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lvm2
-pkgver=2.02.186
-pkgrel=1
+pkgver=2.03.23
+pkgrel=2
 pkgdesc="Logical Volume Manager 2 utilities"
 url="https://sourceware.org/lvm2/"
 arch="all"
 options="!check"  # Test tries to use real /dev/mapper/control.
-license="GPL-2.0-only LGPL-2.1-only"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause"
 # lvm2 will dlopen libs so we need to add explicit depend
 depends="lvm2-libs=$pkgver-r$pkgrel"
 depends_dev="linux-headers"
-makedepends_build="coreutils"
-makedepends_host="$depends_dev libaio-dev util-linux-dev"
-makedepends="$makedepends_build $makedepends_host"
+makedepends_host="$depends_dev libaio-dev util-linux-static util-linux-dev"
 source="https://mirrors.kernel.org/sourceware/lvm2/LVM2.$pkgver.tgz
+	default-udev-sync.patch
 	fix-stdio-usage.patch
-	mallinfo.patch
 	library_dir-default-config.patch
 	mlockall-default-config.patch
+	no-systemd.patch
+	0001-lvresize-use-POSIX-shell.patch
 	lvm.initd
 	lvm.confd
+	lvmlockd.initd
 	dmeventd.initd
 	"
 subpackages="
+	$pkgname-static:lvm2_static
+	device-mapper-static:dm_static
+	device-mapper-libs:dm_libs
+	device-mapper-event-libs:dm_event_libs
 	$pkgname-dev
 	$pkgname-doc
-	$pkgname-dmeventd
 	$pkgname-openrc
+	$pkgname-dmeventd
+	$pkgname-dmeventd-openrc:dmeventd_openrc
 	device-mapper:dm
-	device-mapper-libs:dm_libs
-	device-mapper-event-libs:dm_event_libs
 	device-mapper-udev:udev:noarch
 	$pkgname-libs
 	$pkgname-extra::noarch
 	"
-
 builddir="$srcdir/LVM2.$pkgver"
 
-build () {
-	cd "$builddir"
+if [ -z "$BOOTSTRAP" ]; then
+	# XXX: enable-udev_sync needs a bit more polish to not fail with mdev-only
+	_no_bootstrap="--enable-lvmlockd-sanlock --disable-udev_sync"
+	makedepends_host="$makedepends_host eudev-dev sanlock-dev"
+	subpackages="$subpackages $pkgname-lockd $pkgname-lockd-openrc:lockd_openrc"
+fi
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
 
+build() {
 	# during cross-compilation malloc test goes wrong
 	export ac_cv_func_malloc_0_nonnull=yes
 	export ac_cv_func_realloc_0_nonnull=yes
@@ -52,92 +66,124 @@ build () {
 		--libdir=/lib \
 		--sbindir=/sbin \
 		--localstatedir=/var \
+		--enable-static_link \
+		--disable-dependency-tracking \
 		--disable-nls \
 		--disable-readline \
 		--enable-pkgconfig \
-		--enable-applib \
 		--with-thin=internal \
 		--enable-dmeventd \
 		--enable-cmdlib \
-		--with-thin-check=/sbin/thin_check \
-		--with-thin-dump=/sbin/thin_dump \
-		--with-thin-repair=/sbin/thin_repair \
+		--with-thin-check=/usr/sbin/thin_check \
+		--disable-thin_check_needs_check \
+		--with-thin-dump=/usr/sbin/thin_dump \
+		--with-thin-repair=/usr/sbin/thin_repair \
+		--with-thin-restore=/usr/sbin/thin_restore \
+		--with-cache-check=/usr/sbin/cache_check \
+		--disable-cache_check_needs_check \
+		--with-cache-dump=/usr/sbin/cache_dump \
+		--with-cache-repair=/usr/sbin/cache_repair \
+		--with-cache-restore=/usr/sbin/cache_restore \
 		--with-dmeventd-path=/sbin/dmeventd \
+		--without-systemd-run \
 		--enable-udev_rules \
-		CLDFLAGS="$LDFLAGS" \
-		|| return 1
-
-	make || return 1
+		$_no_bootstrap \
+		CLDFLAGS="$LDFLAGS"
+	make
 }
 
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -d "$pkgdir"/etc/lvm/archive "$pkgdir"/etc/lvm/backup
 	install -Dm755 "$srcdir"/lvm.initd "$pkgdir"/etc/init.d/lvm
 	install -Dm644 "$srcdir"/lvm.confd "$pkgdir"/etc/conf.d/lvm
-	ln -s libdevmapper.so.1.02 "$pkgdir"/lib/libdevmapper.so || return 1
 }
 
 dmeventd() {
 	pkgdesc="Device-mapper event daemon"
-	mkdir -p "$subpkgdir"/sbin
-	mv "$pkgdir"/sbin/dmeventd "$subpkgdir"/sbin/
+	amove sbin/dmeventd
+}
+
+dmeventd_openrc() {
+	pkgdesc="Device-mapper event daemon (OpenRC init scripts)"
+	install_if="$pkgname-dmeventd=$pkgver-r$pkgrel openrc"
 	install -Dm755 "$srcdir"/dmeventd.initd "$subpkgdir"/etc/init.d/dmeventd
 }
 
+
+dm_static() {
+	pkgdesc="Device-mapper static libraries and binaries"
+	provides="device-mapper-event-static=$pkgver-r$pkgrel"
+	amove usr/lib/libdevmapper*.a usr/sbin/dm*.static
+}
+
 dm() {
 	pkgdesc="Device mapper userspace library and tools from LVM2"
-	mkdir -p "$subpkgdir"/sbin "$subpkgdir"/lib
-	mv "$pkgdir"/sbin/dm* "$subpkgdir"/sbin/
+	amove sbin/dm*
 }
 
 udev() {
 	pkgdesc="Device mapper udev rules"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	install_if="device-mapper eudev"
-	mkdir -p "$subpkgdir"/usr/lib/udev
-	mv "$pkgdir"/usr/lib/udev/rules.d "$subpkgdir"/usr/lib/udev/
+	install_if="device-mapper=$pkgver-r$pkgrel eudev"
+	amove usr/lib/udev/rules.d
 }
 
 libs() {
 	pkgdesc="LVM2 shared libraries"
 	depends=
-	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/liblvm2*.so.* "$subpkgdir"/lib/ || return 1
-	mv "$pkgdir"/lib/libdevmapper-event-lvm2*.so.* "$subpkgdir"/lib/ || return 1
-	mv "$pkgdir"/lib/device-mapper "$subpkgdir"/lib/ || return 1
+	amove lib/liblvm2*.so.* \
+		lib/libdevmapper-event-lvm2*.so.* \
+		lib/device-mapper
 }
 
 dm_libs() {
 	pkgdesc="Device-mapper shared library"
 	depends=
-	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/libdevmapper.so.* "$subpkgdir"/lib/
+	amove lib/libdevmapper.so.*
 }
 
 dm_event_libs() {
 	pkgdesc="Device-mapper event daemon shared library"
 	depends=
-	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/libdevmapper-event.so.* "$subpkgdir"/lib/
+	amove lib/libdevmapper-event.so.*
+}
+
+lvm2_static() {
+	pkgdesc="$pkgdesc static library"
+	amove usr/lib/liblvm2*.a usr/sbin/lvm.static
 }
 
 extra() {
 	pkgdesc="LVM2 extra utilities"
 	depends="bash coreutils"
-	local util
-	for util in sbin/lvmdump sbin/lvmconf sbin/fsadm sbin/blkdeactivate; do
-		mkdir -p "$subpkgdir/${util%/*}"
-		mv $pkgdir/$util $subpkgdir/$util
-	done
+	amove sbin/lvmdump sbin/fsadm sbin/blkdeactivate sbin/lvm_import_vdo
+}
+
+lockd() {
+	pkgdesc="LVM2 locking daemon"
+	depends="sanlock"
+	# lvmpolld isn't strictly part of this, but is enabled by enabling this, so put it here too
+	amove sbin/lvmlockctl sbin/lvmlockd sbin/lvmpolld
+}
+
+lockd_openrc() {
+	pkgdesc="LVM2 locking daemon (OpenRC init scripts)"
+	install_if="$pkgname-lockd=$pkgver-r$pkgrel openrc"
+
+	install -Dm755 "$srcdir"/lvmlockd.initd "$subpkgdir"/etc/init.d/lvmlockd
 }
 
-sha512sums="06a1c00142ee41d8a576a5e06a5beae70baced3020e753ce3b612355cc4d9e33be4acf58569d49436c4ee1118d288d884c7301b7d886074eaf9f2fa6b0248c03  LVM2.2.02.186.tgz
-9ad38a68620986db826ccbc4972c44b3ef12e5b37f1f573db20748e7b2327726c7c51b04aaad2a2e9bb76101ec352b7e7a102fdc4a75e79e9587cfc3b87da0e5  fix-stdio-usage.patch
-9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408  mallinfo.patch
-33004594a5cce7af1e493a2a66ce8ad2f864dde3b2ec0960d0fda9df9b7bcf65d9455f9eccf7860f48726c48f14111b843b0a0c9bd395ef2952b41aaab8092b2  library_dir-default-config.patch
-e113c518bb7f03feea892252518f1df3733fad32f04ed0701a8313cf35ba932c3e2d29ecd97d739f8908b481ed1f6a2eb0129cb307214d0a084d9a8d0b4bc290  mlockall-default-config.patch
-a853078660fd2fd943538924f56e81dc5793294e26b8f61d93e6188893f15f4a438d33792b341c1865d61e03f4a371b7c7ee0db5f4130ef7cb7aeaeb9290086a  lvm.initd
+sha512sums="
+293430a80c7f599d14e77610456d0f44cac8164e6159cd0e2e287462278a89787e289fdb4d481eb8fd6b5eea07a6535c41cb7fdc3deee83df7fea9bf77dcbdaa  LVM2.2.03.23.tgz
+ce526e0b58236d26fcb21c81090f8a5baecc0909e645696dccf4c9c7b7adc31fb6f2ababb158217a81324aca14a55631d2fac3176177d81f0bbd35032c0b9979  default-udev-sync.patch
+c65ef16840321d8a58373e872713eeccbc315a84bb35beebccb6bc6063295b0f54b7c0726c799efd8cafedd011c21f51ec8e85f8a50d0d5df80b7428aedf29c3  fix-stdio-usage.patch
+b790cfcb55aa0362c7046c26a8e050708edecaf0233946adbb34d9c1d967d3614bc19e0c91695da4fd12d7b18adb74041ae11239cd635310cc44b8a7079ccbec  library_dir-default-config.patch
+07f77491cffa0d9dcda86004e2df428d5d52652a3bda8037a4b09c9c786146253314a11bae42512231c664a8fae110fec815bd12135fc3c6152b94e2101f8213  mlockall-default-config.patch
+dfcda00e5607606ae8f10e5765de048af933afd05e0719b14036ba84ebc3b4eb07b138e5ce9af9f653416b4a6cc42161591e6f93ee3a36721a2b7396d70d5d91  no-systemd.patch
+3cec0a44e44b15dcfc0bb22f8a4318e76bf719fe9a550b6cf99160ea4181707f81ba6a50c8dafedc942638b1ae8bfde901eeff83ba0d6cb8383a178274ba54a5  0001-lvresize-use-POSIX-shell.patch
+714e6aaba3437b43af38b0b559d0f983b2cea023e2bc64e0c3763e9c78ae4ca125fb75839fda52128e7044a4add81940fd69e92439d30d232cf20a4204f0e321  lvm.initd
 07caf8fa942290f3c953cc2463aaf55bac01d0bcb9351daf3880fa4d0eefb67fe00761c46a7a4da91cd2f8e492a12fed35853a15dc939cd80d19d3303bc3951d  lvm.confd
-ca06220065525e93347efb7a5746a367cf55cb03574e50eed29bd7c4eae036bdd199b52c42d81811b6e742649e73ab8e66525f663bed66f9d1d82d0efde50332  dmeventd.initd"
+7215daf0872063672d5ad13f65ccd90833c6ebea7347149789b97a232d92af28ddc21c2893cb9ee2cb004f857700822917152c2005300a5060b3095f0582bfdd  lvmlockd.initd
+ca06220065525e93347efb7a5746a367cf55cb03574e50eed29bd7c4eae036bdd199b52c42d81811b6e742649e73ab8e66525f663bed66f9d1d82d0efde50332  dmeventd.initd
+"
diff --git a/main/lvm2/default-udev-sync.patch b/main/lvm2/default-udev-sync.patch
new file mode 100644
index 00000000000..b1dc1906e5e
--- /dev/null
+++ b/main/lvm2/default-udev-sync.patch
@@ -0,0 +1,15 @@
+make this opt-in
+--
+diff --git a/lib/config/defaults.h b/lib/config/defaults.h
+index 1ff3637..9c2711b 100644
+--- a/lib/config/defaults.h
++++ b/lib/config/defaults.h
+@@ -199,7 +199,7 @@
+ #define DEFAULT_LABELSECTOR UINT64_C(1)
+ #define DEFAULT_READ_AHEAD "auto"
+ #define DEFAULT_UDEV_RULES 1
+-#define DEFAULT_UDEV_SYNC 1
++#define DEFAULT_UDEV_SYNC 0
+ #define DEFAULT_NOTIFY_DBUS 1
+ #define DEFAULT_VERIFY_UDEV_OPERATIONS 0
+ #define DEFAULT_RETRY_DEACTIVATION 1
diff --git a/main/lvm2/fix-stdio-usage.patch b/main/lvm2/fix-stdio-usage.patch
index 5ac99fd26e3..98cdc6eb3ec 100644
--- a/main/lvm2/fix-stdio-usage.patch
+++ b/main/lvm2/fix-stdio-usage.patch
@@ -1,6 +1,40 @@
---- ./tools/lvmcmdline.c
-+++ ./tools/lvmcmdline.c
-@@ -1252,7 +1252,7 @@
+From 63b1c7332bee6080bffecf9ce9d75ff15d799166 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 16 Nov 2022 10:42:39 +0100
+Subject: [PATCH] fix stdio usage
+
+---
+ lib/commands/toolcontext.c | 4 ++--
+ tools/lvmcmdline.c         | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
+index b630554a9..f20080d18 100644
+--- a/lib/commands/toolcontext.c
++++ b/lib/commands/toolcontext.c
+@@ -1667,7 +1667,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd,
+ 	/* FIXME Make this configurable? */
+ 	reset_lvm_errno(1);
+ 
+-#ifndef VALGRIND_POOL
++#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
+ 	/* Set in/out stream buffering before glibc */
+ 	if (set_buffering
+ #ifdef SYS_gettid
+@@ -2045,7 +2045,7 @@ void destroy_toolcontext(struct cmd_context *cmd)
+ 		dm_hash_destroy(cmd->cft_def_hash);
+ 
+ 	dm_device_list_destroy(&cmd->cache_dm_devs);
+-#ifndef VALGRIND_POOL
++#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
+ 	if (cmd->linebuffer) {
+ 		/* Reset stream buffering to defaults */
+ 		if (is_valid_fd(STDIN_FILENO) &&
+diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
+index a5bb6a5c5..0ebfa375c 100644
+--- a/tools/lvmcmdline.c
++++ b/tools/lvmcmdline.c
+@@ -3422,7 +3422,7 @@ static int _check_standard_fds(void)
  	int err = is_valid_fd(STDERR_FILENO);
  
  	if (!is_valid_fd(STDIN_FILENO) &&
@@ -9,7 +43,7 @@
  		if (err)
  			perror("stdin stream open");
  		else
-@@ -1262,7 +1262,7 @@
+@@ -3432,7 +3432,7 @@ static int _check_standard_fds(void)
  	}
  
  	if (!is_valid_fd(STDOUT_FILENO) &&
@@ -18,7 +52,7 @@
  		if (err)
  			perror("stdout stream open");
  		/* else no stdout */
-@@ -1270,7 +1270,7 @@
+@@ -3440,7 +3440,7 @@ static int _check_standard_fds(void)
  	}
  
  	if (!is_valid_fd(STDERR_FILENO) &&
@@ -27,23 +61,6 @@
  		printf("stderr stream open: %s\n",
  		       strerror(errno));
  		return 0;
---- ./lib/commands/toolcontext.c
-+++ ./lib/commands/toolcontext.c
-@@ -1869,7 +1869,7 @@
- 	/* FIXME Make this configurable? */
- 	reset_lvm_errno(1);
- 
--#ifndef VALGRIND_POOL
-+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
- 	/* Set in/out stream buffering before glibc */
- 	if (set_buffering
- #ifdef SYS_gettid
-@@ -2274,7 +2274,7 @@
- 
- 	if (cmd->pending_delete_mem)
- 		dm_pool_destroy(cmd->pending_delete_mem);
--#ifndef VALGRIND_POOL
-+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
- 	if (cmd->linebuffer) {
- 		/* Reset stream buffering to defaults */
- 		if (is_valid_fd(STDIN_FILENO) &&
+-- 
+2.38.1
+
diff --git a/main/lvm2/library_dir-default-config.patch b/main/lvm2/library_dir-default-config.patch
index 6e3b95832d9..600fdcbd353 100644
--- a/main/lvm2/library_dir-default-config.patch
+++ b/main/lvm2/library_dir-default-config.patch
@@ -1,6 +1,6 @@
 --- ./conf/example.conf.in.orig
 +++ ./conf/example.conf.in
-@@ -694,6 +694,7 @@
+@@ -982,6 +982,7 @@
  	# Configuration option global/library_dir.
  	# Search this directory first for shared libraries.
  	# This configuration option does not have a default value defined.
diff --git a/main/lvm2/lvm.initd b/main/lvm2/lvm.initd
index db6adbeed76..c5b4163de1a 100644
--- a/main/lvm2/lvm.initd
+++ b/main/lvm2/lvm.initd
@@ -17,12 +17,12 @@ dm_in_proc() {
 start() {
 	local rc=0 msg=
 	ebegin "Setting up the Logical Volume Manager"
-	if [ -e  /proc/modules ] && ! dm_in_proc; then
+	if [ -e /proc/modules ] && ! dm_in_proc; then
 		modprobe dm-mod 2>/dev/null
 	fi
 	if [ -d /proc/lvm ] || dm_in_proc; then
-		vgscan --mknodes --ignorelockingfailure >/dev/null 2>&1
-		vgchange --sysinit --activate y >/dev/null 2>&1
+		vgscan --mknodes --ignorelockingfailure
+		vgchange --sysinit --activate y
 		rc=$?
 	else
 		rc=1
@@ -33,6 +33,10 @@ start() {
 stop() {
 	ebegin "Shutting down the Logical Volume Manager"
 	vgchange --ignorelockingfailure -a n >/dev/null 2>&1
-	eend $?
+	# At this stage all filesystems except rootfs have been
+	# unmounted. A "standard" error here is failure to deactivate
+	# the VG containing the rootfs (as it is still obviously in use)
+	# so why bother giving a non-zero error code?
+	eend 0
 }
 
diff --git a/main/lvm2/lvmlockd.initd b/main/lvm2/lvmlockd.initd
new file mode 100644
index 00000000000..44d7e61f969
--- /dev/null
+++ b/main/lvm2/lvmlockd.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+
+name=lvmlockd
+command="/sbin/$name"
+command_args_foreground="--foreground"
+command_background=true
+pidfile="/run/$name.pid"
+
+start_pre() {
+    checkpath --directory /run/lvm
+}
diff --git a/main/lvm2/mallinfo.patch b/main/lvm2/mallinfo.patch
deleted file mode 100644
index 471a6b25515..00000000000
--- a/main/lvm2/mallinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/mm/memlock.c.orig	2015-03-09 11:18:41.560028850 -0100
-+++ ./lib/mm/memlock.c	2015-03-09 11:19:54.504373309 -0100
-@@ -137,7 +137,7 @@
- 
- static void _allocate_memory(void)
- {
--#ifndef VALGRIND_POOL
-+#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
- 	void *stack_mem;
- 	struct rlimit limit;
- 	int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks;
diff --git a/main/lvm2/mlockall-default-config.patch b/main/lvm2/mlockall-default-config.patch
index 305ddeedb74..5e25893715e 100644
--- a/main/lvm2/mlockall-default-config.patch
+++ b/main/lvm2/mlockall-default-config.patch
@@ -1,17 +1,21 @@
---- ./conf/example.conf.in.orig
-+++ ./conf/example.conf.in
-@@ -1352,7 +1352,7 @@
- 	# Use the old behavior of mlockall to pin all memory.
+diff --git a/conf/example.conf.in b/conf/example.conf.in
+index 923d238..a069dac 100644
+--- a/conf/example.conf.in
++++ b/conf/example.conf.in
+@@ -1778,7 +1778,7 @@ activation {
  	# Prior to version 2.02.62, LVM used mlockall() to pin the whole
  	# process's memory while activating devices.
--	use_mlockall = 0
-+	use_mlockall = 1
+ 	# This configuration option has an automatic default value.
+-	# use_mlockall = 0
++	# use_mlockall = 1
  
  	# Configuration option activation/monitoring.
  	# Monitor LVs that are activated.
---- ./lib/config/defaults.h.orig
-+++ ./lib/config/defaults.h
-@@ -55,7 +55,7 @@
+diff --git a/lib/config/defaults.h b/lib/config/defaults.h
+index 571054d..1ff3637 100644
+--- a/lib/config/defaults.h
++++ b/lib/config/defaults.h
+@@ -66,7 +66,7 @@
  #define DEFAULT_LVMLOCKD_LOCK_RETRIES 3
  #define DEFAULT_LVMETAD_UPDATE_WAIT_TIME 10
  #define DEFAULT_PRIORITISE_WRITE_LOCKS 1
diff --git a/main/lvm2/no-systemd.patch b/main/lvm2/no-systemd.patch
new file mode 100644
index 00000000000..1159b13f021
--- /dev/null
+++ b/main/lvm2/no-systemd.patch
@@ -0,0 +1,13 @@
+diff --git a/udev/69-dm-lvm.rules.in b/udev/69-dm-lvm.rules.in
+index ff15681..9f83bfa 100644
+--- a/udev/69-dm-lvm.rules.in
++++ b/udev/69-dm-lvm.rules.in
+@@ -76,7 +76,7 @@ LABEL="lvm_scan"
+ # it's better suited to appearing in the journal.
+ 
+ IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg --checkcomplete --vgonline --autoactivation event --udevoutput --journal=output $env{DEVNAME}"
+-ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(SYSTEMDRUN) --no-block --property DefaultDependencies=no --unit lvm-activate-$env{LVM_VG_NAME_COMPLETE} (LVM_EXEC)/lvm vgchange -aay --autoactivation event $env{LVM_VG_NAME_COMPLETE}"
++ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(LVM_EXEC)/lvm vgchange -aay --autoactivation event $env{LVM_VG_NAME_COMPLETE}"
+ GOTO="lvm_end"
+ 
+ LABEL="lvm_end"
diff --git a/main/lxc-templates-legacy/0001-Update-alpine-keys-URI-fix-package-verification.patch b/main/lxc-templates-legacy/0001-Update-alpine-keys-URI-fix-package-verification.patch
new file mode 100644
index 00000000000..1733e91b9c2
--- /dev/null
+++ b/main/lxc-templates-legacy/0001-Update-alpine-keys-URI-fix-package-verification.patch
@@ -0,0 +1,66 @@
+From 2163a7e4e04383696bb88a9da2f7fa61ab4781b7 Mon Sep 17 00:00:00 2001
+From: 4oo4 <4oo4@users.noreply.github.com>
+Date: Wed, 8 Jun 2022 00:58:04 +0000
+Subject: [PATCH] Update alpine keys URI - fix package verification
+
+Alpine started using https://git.alpinelinux.org/aports/plain/main/alpine-keys/ to publish their apk keys as of 3.15, so using the old URI will give errors about signature verification since a required key is missing
+
+Remove old key
+
+Fix #43 - let lxc config create character devices
+
+Creating lxc containers will error out when trying to create character devices with "file exists". This does not appear to be necessary for most of them since they get created when you actually start the container.
+
+Signed-off-by: 4oo4 <4oo4@users.noreply.github.com>
+---
+ templates/lxc-alpine.in | 22 +++++++++++++---------
+ 1 file changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in
+index 543961c..18f163c 100644
+--- a/templates/lxc-alpine.in
++++ b/templates/lxc-alpine.in
+@@ -40,15 +40,24 @@ readonly LXC_CACHE_DIR="${LXC_CACHE_PATH:-"$LOCAL_STATE_DIR/cache/lxc"}/alpine"
+ # SHA256 checksums of GPG keys for APK.
+ readonly APK_KEYS_SHA256="\
+ 9c102bcc376af1498d549b77bdbfa815ae86faa1d2d82f040e616b18ef2df2d4  alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
+-2adcf7ce224f476330b5360ca5edb92fd0bf91c92d83292ed028d7c4e26333ab  alpine-devel@lists.alpinelinux.org-4d07755e.rsa.pub
+ ebf31683b56410ecc4c00acd9f6e2839e237a3b62b5ae7ef686705c7ba0396a9  alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
+ 1bb2a846c0ea4ca9d0e7862f970863857fc33c32f5506098c636a62a726a847b  alpine-devel@lists.alpinelinux.org-524d27bb.rsa.pub
+ 12f899e55a7691225603d6fb3324940fc51cd7f133e7ead788663c2b7eecb00c  alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
+ 73867d92083f2f8ab899a26ccda7ef63dfaa0032a938620eda605558958a8041  alpine-devel@lists.alpinelinux.org-58199dcc.rsa.pub
+ 9a4cd858d9710963848e6d5f555325dc199d1c952b01cf6e64da2c15deedbd97  alpine-devel@lists.alpinelinux.org-58cbb476.rsa.pub
+-780b3ed41786772cbc7b68136546fa3f897f28a23b30c72dde6225319c44cfff  alpine-devel@lists.alpinelinux.org-58e4f17d.rsa.pub"
+-
+-readonly APK_KEYS_URI='http://alpinelinux.org/keys'
++780b3ed41786772cbc7b68136546fa3f897f28a23b30c72dde6225319c44cfff  alpine-devel@lists.alpinelinux.org-58e4f17d.rsa.pub
++59c01c57b446633249f67c04b115dd6787f4378f183dff2bbf65406df93f176d  alpine-devel@lists.alpinelinux.org-5e69ca50.rsa.pub
++db0b49163f07ffba64a5ca198bcf1688610b0bd1f0d8d5afeaf78559d73f2278  alpine-devel@lists.alpinelinux.org-60ac2099.rsa.pub
++207e4696d3c05f7cb05966aee557307151f1f00217af4143c1bcaf33b8df733f  alpine-devel@lists.alpinelinux.org-6165ee59.rsa.pub
++128d34d4aec39b0daedea8163cd8dc24dff36fd3d848630ab97eeb1d3084bbb3  alpine-devel@lists.alpinelinux.org-61666e3f.rsa.pub
++10877cce0a935e46ad88cb79e174a2491680508eccda08e92bf04fb9bf37fbc1  alpine-devel@lists.alpinelinux.org-616a9724.rsa.pub
++4a095a9daca86da496a3cd9adcd95ee2197fdbeb84638656d469f05a4d740751  alpine-devel@lists.alpinelinux.org-616abc23.rsa.pub
++0caf5662fde45616d88cfd7021b7bda269a2fcaf311e51c48945a967a609ec0b  alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub
++ebe717d228555aa58133c202314a451f81e71f174781fd7ff8d8970d6cfa60da  alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
++d11f6b21c61b4274e182eb888883a8ba8acdbf820dcc7a6d82a7d9fc2fd2836d  alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
++40a216cbd163f22e5f16a9e0929de7cde221b9cbae8e36aa368b1e128afe0a31  alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub"
++
++readonly APK_KEYS_URI='https://git.alpinelinux.org/aports/plain/main/alpine-keys/'
+ readonly DEFAULT_MIRROR_URL='http://dl-cdn.alpinelinux.org/alpine'
+ 
+ : ${APK_KEYS_DIR:=/etc/apk/keys}
+@@ -278,11 +287,6 @@ make_dev_nodes() {
+ 	mkdir -p -m 755 dev/pts
+ 	mkdir -p -m 1777 dev/shm
+ 
+-	mknod -m 666 dev/zero c 1 5
+-	mknod -m 666 dev/full c 1 7
+-	mknod -m 666 dev/random c 1 8
+-	mknod -m 666 dev/urandom c 1 9
+-
+ 	local i; for i in $(seq 0 4); do
+ 		mknod -m 620 dev/tty$i c 4 $i
+ 		chown 0:5 dev/tty$i  # root:tty
+-- 
+2.40.1
+
diff --git a/main/lxc-templates-legacy/0001-alpine-fix-arch-and-enable-mips64-and-s390x.patch b/main/lxc-templates-legacy/0001-alpine-fix-arch-and-enable-mips64-and-s390x.patch
new file mode 100644
index 00000000000..1d0b9e09eec
--- /dev/null
+++ b/main/lxc-templates-legacy/0001-alpine-fix-arch-and-enable-mips64-and-s390x.patch
@@ -0,0 +1,85 @@
+From 4f22286657af9dffae66ea12e6ca91cc603a7766 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 11 May 2023 16:17:33 +0200
+Subject: [PATCH 1/4] alpine: fix arch and enable mips64 and s390x
+
+Fix detecion of the alpine architecture name.
+
+This allows us to create both armv7 and armhf (armv6) containers on an
+aarch64 host. eg.
+
+  lxc-create -t alpine a1 -- -a armv7
+
+It also allows us to create mips64 and s390x containers, and potentially
+new architectures in the future.
+---
+ templates/lxc-alpine.in | 29 +++++++++++++++++------------
+ 1 file changed, 17 insertions(+), 12 deletions(-)
+
+diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in
+index 18f163c..e3bbab1 100644
+--- a/templates/lxc-alpine.in
++++ b/templates/lxc-alpine.in
+@@ -133,13 +133,18 @@ latest_release_branch() {
+ 
+ parse_arch() {
+ 	case "$1" in
+-		x86 | i[3-6]86) echo 'x86';;
+-		x86_64 | amd64) echo 'x86_64';;
+-		aarch64 | arm64) echo 'aarch64';;
+-		armv7) echo 'armv7';;
+-		arm*) echo 'armhf';;
+-		ppc64le) echo 'ppc64le';;
+-		*) return 1;;
++		i[3-6]86) echo 'x86';;
++		amd64) echo 'x86_64';;
++		arm64) echo 'aarch64';;
++		armv6) echo 'armhf';;
++		*) echo "$1";;
++	esac
++}
++
++lxc_arch() {
++	case "$1" in
++		armv[67]) echo "armhf";;
++		*) echo "$1";;
+ 	esac
+ }
+ 
+@@ -261,7 +266,8 @@ install() {
+ 		echo "$MIRROR_URL/$branch/$repo" >> etc/apk/repositories
+ 	done
+ 
+-	install_packages "$arch" "alpine-base $extra_packages"
++	install_packages "$arch" "alpine-base $extra_packages" \
++		|| die 1 "Failed to install $arch packages"
+ 	make_dev_nodes
+ 	setup_inittab
+ 	setup_hosts
+@@ -384,7 +390,7 @@ setup_services() {
+ configure_container() {
+ 	local config="$1"
+ 	local hostname="$2"
+-	local arch="$3"
++	local arch="$(lxc_arch "$3")"
+ 
+ 	cat <<-EOF >> "$config"
+ 
+@@ -499,12 +505,11 @@ if [ -z "$rootfs" ]; then
+ 	rootfs="$path/rootfs"
+ fi
+ 
+-arch=$(parse_arch "$arch") \
+-	|| die 1 "Unsupported architecture: $arch"
++arch=$(parse_arch "$arch")
+ 
+ if [ -z "$release" ]; then
+ 	release=$(latest_release_branch "$arch") \
+-		|| die 2 'Failed to resolve Alpine last release branch'
++		|| die 2 "Failed to resolve Alpine $arch last release branch"
+ fi
+ 
+ # Here we go!
+-- 
+2.40.1
+
diff --git a/main/lxc-templates-legacy/0002-alpine-use-https-repository-by-default.patch b/main/lxc-templates-legacy/0002-alpine-use-https-repository-by-default.patch
new file mode 100644
index 00000000000..90323beff73
--- /dev/null
+++ b/main/lxc-templates-legacy/0002-alpine-use-https-repository-by-default.patch
@@ -0,0 +1,25 @@
+From 28a3791e0e48d9a393a2fe30918b4c1a73ae85ef Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 11 May 2023 16:42:27 +0200
+Subject: [PATCH 2/4] alpine: use https repository by default
+
+---
+ templates/lxc-alpine.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in
+index e3bbab1..9dc71b2 100644
+--- a/templates/lxc-alpine.in
++++ b/templates/lxc-alpine.in
+@@ -58,7 +58,7 @@ d11f6b21c61b4274e182eb888883a8ba8acdbf820dcc7a6d82a7d9fc2fd2836d  alpine-devel@l
+ 40a216cbd163f22e5f16a9e0929de7cde221b9cbae8e36aa368b1e128afe0a31  alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub"
+ 
+ readonly APK_KEYS_URI='https://git.alpinelinux.org/aports/plain/main/alpine-keys/'
+-readonly DEFAULT_MIRROR_URL='http://dl-cdn.alpinelinux.org/alpine'
++readonly DEFAULT_MIRROR_URL='https://dl-cdn.alpinelinux.org/alpine'
+ 
+ : ${APK_KEYS_DIR:=/etc/apk/keys}
+ if ! ls "$APK_KEYS_DIR"/alpine* >/dev/null 2>&1; then
+-- 
+2.40.1
+
diff --git a/main/lxc-templates-legacy/0003-alpine-add-riscv64-key.patch b/main/lxc-templates-legacy/0003-alpine-add-riscv64-key.patch
new file mode 100644
index 00000000000..0cdaf12bb4d
--- /dev/null
+++ b/main/lxc-templates-legacy/0003-alpine-add-riscv64-key.patch
@@ -0,0 +1,26 @@
+From 6c19d91e22d9ab33f61f4be37d942023f24bbc3e Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 11 May 2023 16:48:55 +0200
+Subject: [PATCH 3/4] alpine: add riscv64 key
+
+---
+ templates/lxc-alpine.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in
+index 9dc71b2..8e71cc0 100644
+--- a/templates/lxc-alpine.in
++++ b/templates/lxc-alpine.in
+@@ -55,7 +55,8 @@ db0b49163f07ffba64a5ca198bcf1688610b0bd1f0d8d5afeaf78559d73f2278  alpine-devel@l
+ 0caf5662fde45616d88cfd7021b7bda269a2fcaf311e51c48945a967a609ec0b  alpine-devel@lists.alpinelinux.org-616ac3bc.rsa.pub
+ ebe717d228555aa58133c202314a451f81e71f174781fd7ff8d8970d6cfa60da  alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
+ d11f6b21c61b4274e182eb888883a8ba8acdbf820dcc7a6d82a7d9fc2fd2836d  alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
+-40a216cbd163f22e5f16a9e0929de7cde221b9cbae8e36aa368b1e128afe0a31  alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub"
++40a216cbd163f22e5f16a9e0929de7cde221b9cbae8e36aa368b1e128afe0a31  alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub
++db0b49163f07ffba64a5ca198bcf1688610b0bd1f0d8d5afeaf78559d73f2278  alpine-devel@lists.alpinelinux.org-60ac2099.rsa.pub"
+ 
+ readonly APK_KEYS_URI='https://git.alpinelinux.org/aports/plain/main/alpine-keys/'
+ readonly DEFAULT_MIRROR_URL='https://dl-cdn.alpinelinux.org/alpine'
+-- 
+2.40.1
+
diff --git a/main/lxc-templates-legacy/0004-alpine-only-create-missing-device-node.patch b/main/lxc-templates-legacy/0004-alpine-only-create-missing-device-node.patch
new file mode 100644
index 00000000000..641dd0705be
--- /dev/null
+++ b/main/lxc-templates-legacy/0004-alpine-only-create-missing-device-node.patch
@@ -0,0 +1,55 @@
+From a927ebd931418af32b37f71d8b9037ae30a3d658 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 11 May 2023 16:58:28 +0200
+Subject: [PATCH 4/4] alpine: only create missing device node
+
+Avoid error out if some of the device nodes exists
+---
+ templates/lxc-alpine.in | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/templates/lxc-alpine.in b/templates/lxc-alpine.in
+index 8e71cc0..45ffc6f 100644
+--- a/templates/lxc-alpine.in
++++ b/templates/lxc-alpine.in
+@@ -290,19 +290,33 @@ install_packages() {
+ 		--update-cache --initdb add $packages
+ }
+ 
++_mknod() {
++	while getopts "m:" opt; do
++		case $opt in
++			m) MODE="-m $OPTARG";;
++			\?) return 1;;
++		esac
++	done
++	shift $((OPTIND - 1))
++
++	test -c "$1" && return 0   # device exists
++	test -f "$1" && rm -f "$1" # device is a regular file
++	mknod $MODE $@
++}
++
+ make_dev_nodes() {
+ 	mkdir -p -m 755 dev/pts
+ 	mkdir -p -m 1777 dev/shm
+ 
+ 	local i; for i in $(seq 0 4); do
+-		mknod -m 620 dev/tty$i c 4 $i
++		_mknod -m 620 dev/tty$i c 4 $i
+ 		chown 0:5 dev/tty$i  # root:tty
+ 	done
+ 
+-	mknod -m 666 dev/tty c 5 0
++	_mknod -m 666 dev/tty c 5 0
+ 	chown 0:5 dev/tty  # root:tty
+-	mknod -m 620 dev/console c 5 1
+-	mknod -m 666 dev/ptmx c 5 2
++	_mknod -m 620 dev/console c 5 1
++	_mknod -m 666 dev/ptmx c 5 2
+ 	chown 0:5 dev/ptmx  # root:tty
+ }
+ 
+-- 
+2.40.1
+
diff --git a/main/lxc-templates-legacy/APKBUILD b/main/lxc-templates-legacy/APKBUILD
index d7752f099fc..1ccf55256e1 100644
--- a/main/lxc-templates-legacy/APKBUILD
+++ b/main/lxc-templates-legacy/APKBUILD
@@ -2,18 +2,23 @@
 # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=lxc-templates-legacy
 pkgver=3.0.3
-pkgrel=0
+pkgrel=5
 pkgdesc="Legacy LXC container templates"
 url="https://linuxcontainers.org"
 arch="noarch"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 depends="bash tar"
 subpackages="$pkgname-alpine"
-source="https://linuxcontainers.org/downloads/lxc/lxc-templates-$pkgver.tar.gz"
+source="https://linuxcontainers.org/downloads/lxc/lxc-templates-$pkgver.tar.gz
+	0001-Update-alpine-keys-URI-fix-package-verification.patch
+	0001-alpine-fix-arch-and-enable-mips64-and-s390x.patch
+	0002-alpine-use-https-repository-by-default.patch
+	0003-alpine-add-riscv64-key.patch
+	0004-alpine-only-create-missing-device-node.patch
+	"
 builddir="$srcdir/lxc-templates-$pkgver"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +30,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
@@ -45,4 +48,11 @@ alpine() {
 	done
 }
 
-sha512sums="3e9d5304f5e06580eeb766570ddfebb0c80061c2d7e47c9ea37d834fe0cf4fabe7eedd667e4937df3f2451bc3e7aa1e98a1b386f3b19964dc218ff0e21011632  lxc-templates-3.0.3.tar.gz"
+sha512sums="
+3e9d5304f5e06580eeb766570ddfebb0c80061c2d7e47c9ea37d834fe0cf4fabe7eedd667e4937df3f2451bc3e7aa1e98a1b386f3b19964dc218ff0e21011632  lxc-templates-3.0.3.tar.gz
+70e3a7b0acd38b71b28c8a92896a7ef04a26cd9cef3f617056197edf2742344b1ec44e3d8d5ed6767a9a7c9c7af986300172f2cc15b9cc69ffbaf741a471f531  0001-Update-alpine-keys-URI-fix-package-verification.patch
+0a34b0346fa5749e2d0e52cd68cede939c371668db07d0622275e3ec58b072059833236241d0c05a1df17997c2e6a021d48dabddb65b2d1e844bbcb45ca5c7a8  0001-alpine-fix-arch-and-enable-mips64-and-s390x.patch
+7f90102df12aff63c0b8e38106ec30d309d6c0a2733b66d47b67f74b0bc8846b3d8eebb7b7cbd2f95ac724633357c06a36d8c69161db863f68dc4c023ad96137  0002-alpine-use-https-repository-by-default.patch
+5036df735f6fa35593516d63a46a1cc398651ee1a6426d2f12397d211deac16e8c587b701df13d46e7d3251b3d0a48d63b8422af92a8e4874ebda045b328d20b  0003-alpine-add-riscv64-key.patch
+20106603e9d3f73759469ebba5c44196a4f6091f414139e30dc4a5f12a3dc9220aa4301dd274a4ca50edef3cec3545f1406b2505be70d5a3496c233a9f9438fb  0004-alpine-only-create-missing-device-node.patch
+"
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD
index b80212ceb12..378798961aa 100644
--- a/main/lxc/APKBUILD
+++ b/main/lxc/APKBUILD
@@ -2,79 +2,78 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lxc
-pkgver=3.2.1
+pkgver=6.0.0
 _pkgver=${pkgver/_rc/.rc}
-pkgrel=2
+pkgrel=1
 pkgdesc="Userspace interface for the Linux kernel containment features"
 url="https://linuxcontainers.org/lxc/"
 arch="all"
-license="GPL-2.0-only"
+license="LGPL-2.1-or-later"
 makedepends="
+	dbus-dev
+	docbook2x
+	libapparmor-dev
 	libcap-dev
 	libcap-static
 	libseccomp-dev
-	linux-pam-dev
 	linux-headers
-	bsd-compat-headers
-	docbook2x
-
-	automake
-	autoconf
-	libtool
+	linux-pam-dev
+	meson
 	"
-
-options="suid"
 subpackages="
+	$pkgname-dbg
 	$pkgname-dev
 	$pkgname-doc
 	$pkgname-openrc
 	$pkgname-lvm::noarch
+	$pkgname-test-utils:_test_utils
 	$pkgname-libs
 	$pkgname-bridge::noarch
-	$pkgname-bash-completion:bashcomp:noarch
+	$pkgname-bash-completion
 	$pkgname-pam
 	$pkgname-download:_download:noarch
 	$pkgname-templates-oci:templates_oci:noarch
 	$pkgname-templates::noarch
 	"
-
 source="https://linuxcontainers.org/downloads/lxc/lxc-$_pkgver.tar.gz
-	cgroups-initialize-cpuset-properly.patch
-	network-restore-ability-to-move-nl80211-devices.patch
 	lxc.initd
 	lxc.confd
 	"
+# no buildtime tests
+options="!check suid"
 
 # secfixes:
+#   5.0.1-r2:
+#     - CVE-2022-47952
 #   3.1.0-r1:
-#   - CVE-2019-5736
+#     - CVE-2019-5736
 #   2.1.1-r9:
-#   - CVE-2018-6556
-#
+#     - CVE-2018-6556
 
 _tmpldir="usr/share/lxc/templates"
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-apparmor \
-		--enable-pam \
-		--with-distro=alpine \
-		--disable-werror \
-		--enable-doc
-	make
-}
-
-check() {
-	make check
+	case "$CARCH" in
+	riscv64)
+		local lto=false
+		;;
+	*)
+		local lto=true
+		;;
+	esac
+	abuild-meson \
+		-Db_lto=$lto \
+		-Ddistrosysconfdir=/etc/default \
+		-Dpam-cgroup=true \
+		-Dtests=true \
+		-Dinit-script="[]" \
+		. output
+
+	meson compile -C output
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 
 	install -Dm755 "$srcdir"/lxc.initd "$pkgdir"/etc/init.d/lxc
 	install -Dm644 "$srcdir"/lxc.confd "$pkgdir"/etc/conf.d/lxc
@@ -82,6 +81,11 @@ package() {
 
 	# Remove useless config for SysVinit.
 	rm -r "$pkgdir"/etc/default
+
+	# they install this to libdir, but the other things are in /usr/lib
+	# so we can't change it
+	mkdir -p "$pkgdir"/lib
+	mv "$pkgdir"/usr/lib/security "$pkgdir"/lib
 }
 
 lvm() {
@@ -91,40 +95,44 @@ lvm() {
 	mkdir "$subpkgdir"
 }
 
+_test_utils() {
+	pkgdesc="Runtime testing utilities for LXC"
+
+	amove usr/bin/lxc-test-*
+}
+
 _py3() {
 	pkgdesc="Python3 module for LXC"
 	depends="python3"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/python3.* "$subpkgdir"/usr/lib
+
+	amove usr/lib/python3*
 }
 
 _download() {
 	pkgdesc="LXC container image downloader template"
-	depends="$pkgname gnupg1 tar wget"
+	depends="$pkgname gpg gnupg-dirmngr tar wget"
 
-	mkdir -p "$subpkgdir"/$_tmpldir
-	mv "$pkgdir"/$_tmpldir/lxc-download "$subpkgdir"/$_tmpldir/
+	amove $_tmpldir/lxc-download
 }
 
 templates() {
 	pkgdesc="Templates for LXC (except alpine and download)"
 	depends="tar"
-	mkdir -p "$subpkgdir"/$_tmpldir
-	mv "$pkgdir"/$_tmpldir/* "$subpkgdir"/$_tmpldir/
+
+	amove $_tmpldir/*
 }
 
 templates_oci() {
 	pkgdesc="OCI Template for LXC"
 	depends="bash jq"
-	mkdir -p "$subpkgdir"/usr/share/lxc/templates
-	mv "$pkgdir"/usr/share/lxc/templates/lxc-oci \
-		"$subpkgdir"/usr/share/lxc/templates/
+
+	amove $_tmpldir/lxc-oci
 }
 
 pam() {
 	pkgdesc="PAM module for LXC"
-	mkdir -p "$subpkgdir"/lib/security
-	mv "$pkgdir"/lib/security/pam_cgfs.so "$subpkgdir"/lib/security/
+
+	amove lib/security
 }
 
 dev() {
@@ -158,17 +166,8 @@ bridge() {
 	EOF
 }
 
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-	mkdir -p "$subpkgdir"/usr/share/bash-completion/completions
-	mv "$pkgdir"/etc/bash_completion.d/$pkgname "$subpkgdir"/usr/share/bash-completion/completions
-	rmdir "$pkgdir"/etc/bash_completion.d
-}
-
-sha512sums="4b3046fc6c4aa497fb26bd45839e60de503184af86d3966e796d14e619203536b9a9ed67bdcd8a108cf1a548f8d095fb46dff53094a08abd8d268c866db685c0  lxc-3.2.1.tar.gz
-2bebe6cc24987354b6e7dc9003c3a4df450ca10263e6dc0e9313977fdfc2eb57c0d68560da4d1071c8de2f8e3e394ed3ca17af445bea524daa5f8ae8955b3ba6  cgroups-initialize-cpuset-properly.patch
-d302b7296918680901d034dc12ae0687dbbc65766800a9f7256e661f638d3dcad66bcc737aec2c6de8c27d3b9c08833e00420c2064f356d6d73efda9ae9bd707  network-restore-ability-to-move-nl80211-devices.patch
-b74ffe7c3e8f193265a90ffeb6e5743b1212bc1416b898e5a7e59ddd7f06fc77dc34e2dcbb3614038ac6222a95e2b9beb9f03ab734c991837203ab626b1b091f  lxc.initd
-91de43db5369a9e10102933514d674e9c875218a1ff2910dd882e5b9c308f9e430deacb13d1d7e0b2ed1ef682d0bb035aa6f8a6738f54fa2ca3a05acce04e467  lxc.confd"
+sha512sums="
+acff2fc70cf2c65af37b70a21239482c3d845c408f7132558b54980e4400c23670c63178a3a3dfb239f047f529004df93cd829d728852a8c8647ce6babf7857f  lxc-6.0.0.tar.gz
+db71783366277a68a5c8116604cf845da4780fe4aebdb5820ae2c4fe028cfe52a9c94246db362476f2f195be6a9c2b835edbe521423f116fc66eb50023d6daab  lxc.initd
+91de43db5369a9e10102933514d674e9c875218a1ff2910dd882e5b9c308f9e430deacb13d1d7e0b2ed1ef682d0bb035aa6f8a6738f54fa2ca3a05acce04e467  lxc.confd
+"
diff --git a/main/lxc/cgroups-initialize-cpuset-properly.patch b/main/lxc/cgroups-initialize-cpuset-properly.patch
deleted file mode 100644
index 4096ba4a561..00000000000
--- a/main/lxc/cgroups-initialize-cpuset-properly.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b31d62b847a3ee013613795094cce4acc12345ef Mon Sep 17 00:00:00 2001
-From: Christian Brauner <christian.brauner@ubuntu.com>
-Date: Sun, 28 Jul 2019 23:13:26 +0200
-Subject: [PATCH] cgroups: initialize cpuset properly
-
-Closes #3108.
-Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
----
- src/lxc/cgroups/cgfsng.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
-index 7b8fe6736f..c29c0958e9 100644
---- a/src/lxc/cgroups/cgfsng.c
-+++ b/src/lxc/cgroups/cgfsng.c
-@@ -496,12 +496,12 @@ static bool cg_legacy_filter_and_set_cpus(char *path, bool am_initialized)
- 	}
- 
- 	if (!flipped_bit) {
--		DEBUG("No isolated or offline cpus present in cpuset");
--		return true;
-+		cpulist = lxc_cpumask_to_cpulist(possmask, maxposs);
-+		TRACE("No isolated or offline cpus present in cpuset");
-+	} else {
-+		cpulist = move_ptr(posscpus);
-+		TRACE("Removed isolated or offline cpus from cpuset");
- 	}
--	DEBUG("Removed isolated or offline cpus from cpuset");
--
--	cpulist = lxc_cpumask_to_cpulist(possmask, maxposs);
- 	if (!cpulist) {
- 		ERROR("Failed to create cpu list");
- 		return false;
diff --git a/main/lxc/lxc.initd b/main/lxc/lxc.initd
index aab7147f74c..210a1269fa9 100644
--- a/main/lxc/lxc.initd
+++ b/main/lxc/lxc.initd
@@ -134,6 +134,9 @@ stop() {
 		_autostart "Stopping" --shutdown --timeout ${LXC_TIMEOUT:-30}
 		return
 	fi
+	if yesno "$systemd_container"; then
+		: ${POWEROFF_SIGNAL=-38}
+	fi
 
 	ebegin "Stopping container ${CONTAINER}"
 	start-stop-daemon --stop --pidfile ${pidfile} \
@@ -148,6 +151,9 @@ reboot() {
 		_autostart "Rebooting" --reboot
 		return
 	fi
+	if yesno "$systemd_container"; then
+		: ${RESTART_SIG=39}
+	fi
 
 	ebegin "Sending reboot signal to container $CONTAINER"
 	start-stop-daemon --signal ${RESTART_SIG:-SIGTERM} \
diff --git a/main/lxc/network-restore-ability-to-move-nl80211-devices.patch b/main/lxc/network-restore-ability-to-move-nl80211-devices.patch
deleted file mode 100644
index 965ef894984..00000000000
--- a/main/lxc/network-restore-ability-to-move-nl80211-devices.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 3dd7829433f63b2ec1323a1f237efa7d67ea6e2b Mon Sep 17 00:00:00 2001
-From: Christian Brauner <christian.brauner@ubuntu.com>
-Date: Fri, 26 Jul 2019 08:20:02 +0200
-Subject: [PATCH] network: restore ability to move nl80211 devices
-
-Closes #3105.
-Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
----
- src/lxc/network.c | 31 +++++++++++++++++--------------
- 1 file changed, 17 insertions(+), 14 deletions(-)
-
-diff --git a/src/lxc/network.c b/src/lxc/network.c
-index 9755116ba1..7684f95918 100644
---- a/src/lxc/network.c
-+++ b/src/lxc/network.c
-@@ -1248,22 +1248,21 @@ static int lxc_netdev_rename_by_name_in_netns(pid_t pid, const char *old,
- static int lxc_netdev_move_wlan(char *physname, const char *ifname, pid_t pid,
- 				const char *newname)
- {
--	char *cmd;
-+	__do_free char *cmd = NULL;
- 	pid_t fpid;
--	int err = -1;
- 
- 	/* Move phyN into the container.  TODO - do this using netlink.
- 	 * However, IIUC this involves a bit more complicated work to talk to
- 	 * the 80211 module, so for now just call out to iw.
- 	 */
- 	cmd = on_path("iw", NULL);
--	if (!cmd)
--		goto out1;
--	free(cmd);
-+	if (!cmd) {
-+		return -1;
-+	}
- 
- 	fpid = fork();
- 	if (fpid < 0)
--		goto out1;
-+		return -1;
- 
- 	if (fpid == 0) {
- 		char pidstr[30];
-@@ -1274,21 +1273,18 @@ static int lxc_netdev_move_wlan(char *physname, const char *ifname, pid_t pid,
- 	}
- 
- 	if (wait_for_pid(fpid))
--		goto out1;
-+		return -1;
- 
--	err = 0;
- 	if (newname)
--		err = lxc_netdev_rename_by_name_in_netns(pid, ifname, newname);
-+		return lxc_netdev_rename_by_name_in_netns(pid, ifname, newname);
- 
--out1:
--	free(physname);
--	return err;
-+	return 0;
- }
- 
- int lxc_netdev_move_by_name(const char *ifname, pid_t pid, const char* newname)
- {
-+	__do_free char *physname = NULL;
- 	int index;
--	char *physname;
- 
- 	if (!ifname)
- 		return -EINVAL;
-@@ -3279,13 +3275,20 @@ int lxc_network_move_created_netdev_priv(struct lxc_handler *handler)
- 		return 0;
- 
- 	lxc_list_for_each(iterator, network) {
-+		__do_free char *physname = NULL;
- 		int ret;
- 		struct lxc_netdev *netdev = iterator->elem;
- 
- 		if (!netdev->ifindex)
- 			continue;
- 
--		ret = lxc_netdev_move_by_index(netdev->ifindex, pid, NULL);
-+		if (netdev->type == LXC_NET_PHYS)
-+			physname = is_wlan(netdev->link);
-+
-+		if (physname)
-+			ret = lxc_netdev_move_wlan(physname, netdev->link, pid, NULL);
-+		else
-+			ret = lxc_netdev_move_by_index(netdev->ifindex, pid, NULL);
- 		if (ret) {
- 			errno = -ret;
- 			SYSERROR("Failed to move network device \"%s\" with ifindex %d to network namespace %d",
diff --git a/main/lynx/APKBUILD b/main/lynx/APKBUILD
index 5f5a2c0b168..167b4283459 100644
--- a/main/lynx/APKBUILD
+++ b/main/lynx/APKBUILD
@@ -1,23 +1,25 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=lynx
-pkgver=2.8.9_p1
+pkgver=2.9.1
 _relver=${pkgver/_p/rel.}
-_v=${_relver%rel.*}
-pkgrel=1
+pkgrel=0
 pkgdesc="Cross-platform text-based browser"
 url="https://lynx.invisible-island.net/"
 arch="all"
 license="GPL-2.0-only"
 depends="gzip"
-makedepends="openssl-dev gettext zlib-dev glib-dev perl ncurses-dev"
-subpackages="$pkgname-doc"
-source="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_relver}.tar.bz2"
+makedepends="openssl-dev>3 gettext zlib-dev glib-dev perl ncurses-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://invisible-mirror.net/archives/lynx/tarballs/lynx$_relver.tar.bz2"
+builddir="$srcdir"/$pkgname$_relver
+
+# secfixes:
+#   2.8.9_p1-r3:
+#     - CVE-2021-38165
 
-builddir="$srcdir"/${pkgname}${_relver}
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,21 +29,27 @@ build() {
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
 		--enable-ipv6 \
-		--with-ssl
+		--with-ssl \
+		--enable-default-colors \
+		--with-screen=ncursesw \
+		--with-zlib \
+		--disable-full-paths \
+		--enable-externs \
+		--enable-nls
 	make helpdir=/usr/share/doc/lynx/help \
 		docdir=/usr/share/doc/lynx
 }
 
 check() {
-	cd "$builddir"
 	./lynx -version
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install install-help install-doc \
 		helpdir=/usr/share/doc/lynx/help \
 		docdir=/usr/share/doc/lynx
 }
 
-sha512sums="61edbe082684fcbd91bdbf4f4d27c3baf92358811aaffc2f8af46adf23ca7b48aede1520fc5f2a8fc974a2f4bbf4e57e7e6027a187bfc6101e56878c98178e6d  lynx2.8.9rel.1.tar.bz2"
+sha512sums="
+d1891b48fa226dbbd3a59717e4b927802f97423c10db220e4d482b63fdced366d80417825d712ab9ae788da5595c9e39e71d630838e9443d0b340a5fe11bec40  lynx2.9.1.tar.bz2
+"
diff --git a/main/lz4/APKBUILD b/main/lz4/APKBUILD
index b3b89891c04..69e849355ad 100644
--- a/main/lz4/APKBUILD
+++ b/main/lz4/APKBUILD
@@ -1,21 +1,25 @@
 # Contributor: Stuart Cardall <developer@it-offshore.co.uk>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=lz4
-pkgver=1.9.2
-pkgrel=0
+pkgver=1.9.4
+pkgrel=5
 pkgdesc="LZ4 is lossless compression algorithm with fast decoder @ multiple GB/s per core."
 url="https://github.com/lz4/lz4"
 arch="all"
-license="BSD-2-Clause GPL-2.0-only"
+license="BSD-2-Clause AND GPL-2.0-only"
 checkdepends="diffutils"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-tests:tests"
 source="$pkgname-$pkgver.tar.gz::https://github.com/lz4/lz4/archive/v$pkgver.tar.gz"
 
 # secfixes:
+#   1.9.3-r1:
+#     - CVE-2021-3520
 #   1.9.2-r0:
 #     - CVE-2019-17543
 
 build() {
+	export CFLAGS="$CFLAGS -O2 -flto=auto"
+	export CPPFLAGS="$CPPFLAGS -O2 -flto=auto"
 	make PREFIX="/usr"
 }
 
@@ -23,15 +27,22 @@ check() {
 	make check
 }
 
-tests() {
-	cd "$builddir"/tests
-	mkdir -p "$subpkgdir"/usr/share/$pkgname
-	rm -f *.c COPYING Makefile .gitignore
-	cp -rf "$builddir"/tests "$subpkgdir"/usr/share/$pkgname
-}
-
 package() {
 	make PREFIX="/usr" DESTDIR="$pkgdir" install
+
+	(
+		cd tests/
+		rm -f ./*.c COPYING Makefile .gitignore
+	)
+	mkdir -p "$pkgdir"/usr/share/$pkgname
+	cp -rf tests "$pkgdir"/usr/share/$pkgname/
+}
+
+tests() {
+	pkgdesc="$pkgdesc (tests)"
+	amove usr/share/$pkgname
 }
 
-sha512sums="ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1  lz4-1.9.2.tar.gz"
+sha512sums="
+043a9acb2417624019d73db140d83b80f1d7c43a6fd5be839193d68df8fd0b3f610d7ed4d628c2a9184f7cde9a0fd1ba9d075d8251298e3eb4b3a77f52736684  lz4-1.9.4.tar.gz
+"
diff --git a/main/lzip/APKBUILD b/main/lzip/APKBUILD
index 257fa7d632b..da09a0b37eb 100644
--- a/main/lzip/APKBUILD
+++ b/main/lzip/APKBUILD
@@ -1,35 +1,33 @@
 # Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
 # Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
 pkgname=lzip
-pkgver=1.21
+pkgver=1.24.1
 pkgrel=0
 pkgdesc="Lzip is a lossless data compressor"
-url="http://www.nongnu.org/lzip/lzip.html"
+url="https://nongnu.org/lzip/"
 arch="all"
 license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
-source="https://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://download.savannah.gnu.org/releases/lzip/lzip-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--prefix=/usr \
-		CXX="${CXX-g++}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-        make
+		CXX="$CXX" \
+		CPPFLAGS="$CPPFLAGS" \
+		CXXFLAGS="$CXXFLAGS" \
+		LDFLAGS="$LDFLAGS"
+	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR=$pkgdir install
 }
 
-sha512sums="02e31a8fc9431e88edbb0fd467e9dd0947203e693e6581be1a8d25d96c74d9c3794f1fef9e4c993553ba74330c8f5851cad6315b49f263fe9cf2444225af4362  lzip-1.21.tar.gz"
+sha512sums="
+b67b3b8ab594306dd863b6f51525ab80e90cbff3af1faf190fd7a35eac895ef869e6a1f8f503d623c16ad5c1496816c8f851abf0be5983d53052bea80afc34bd  lzip-1.24.1.tar.gz
+"
diff --git a/main/lzo/APKBUILD b/main/lzo/APKBUILD
index 78d195da8fc..63ca3457efa 100644
--- a/main/lzo/APKBUILD
+++ b/main/lzo/APKBUILD
@@ -3,40 +3,34 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=lzo
 pkgver=2.10
-pkgrel=2
+pkgrel=5
 pkgdesc="LZO -- a real-time data compression library"
-url="http://www.oberhumer.com/opensource/lzo"
+url="https://www.oberhumer.com/opensource/lzo"
 arch="all"
-license="GPL"
-depends=""
-makedepends=""
-install=
+license="GPL-2.0-or-later"
+makedepends="cmake samurai"
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://www.oberhumer.com/opensource/lzo/download/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$pkgname-$pkgver
+source="https://www.oberhumer.com/opensource/lzo/download/lzo-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
-	CFLAGS="$CFLAGS -DLZO_CFG_NO_SYSCALL=1" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--enable-shared
-	make
+	cmake -B build -G Ninja \
+		-DBUILD_TESTING=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DENABLE_SHARED=ON
+	cmake --build build
 }
 
 check() {
-	cd "$builddir"
-	make check
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
+	rm -r "$pkgdir"/usr/libexec/
 }
 
-sha512sums="a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4  lzo-2.10.tar.gz"
+sha512sums="
+a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4  lzo-2.10.tar.gz
+"
diff --git a/main/m4/0001-test-execute-main.c-set-default-handler-for-SIGPIPE-.patch b/main/m4/0001-test-execute-main.c-set-default-handler-for-SIGPIPE-.patch
new file mode 100644
index 00000000000..769b0b0f7dd
--- /dev/null
+++ b/main/m4/0001-test-execute-main.c-set-default-handler-for-SIGPIPE-.patch
@@ -0,0 +1,37 @@
+Patch-Source: https://lists.gnu.org/archive/html/bug-m4/2022-11/msg00003.html
+From ed64def45d68b2af53f1d3d783cc98e9dbe2ff74 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Sat, 12 Nov 2022 15:18:41 +0100
+Subject: [PATCH] test-execute-main.c: set default handler for SIGPIPE in tests
+ 3 and 4
+
+make 4.4 sets this to SIG_IGN and the tests fail
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ tests/test-execute-main.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/test-execute-main.c b/tests/test-execute-main.c
+index 372ff1d..b4c1ddf 100644
+--- a/tests/test-execute-main.c
++++ b/tests/test-execute-main.c
+@@ -132,6 +132,7 @@ main (int argc, char *argv[])
+       #if !(defined _WIN32 && !defined __CYGWIN__)
+       {
+         /* Check SIGPIPE handling with ignore_sigpipe = false.  */
++        signal(SIGPIPE, SIG_DFL);
+         const char *prog_argv[3] = { prog_path, "3", NULL };
+         int termsig = 0x7DEADBEE;
+         int ret = execute (progname, prog_argv[0], prog_argv, NULL,
+@@ -145,6 +146,7 @@ main (int argc, char *argv[])
+       #if !(defined _WIN32 && !defined __CYGWIN__)
+       {
+         /* Check SIGPIPE handling with ignore_sigpipe = true.  */
++        signal(SIGPIPE, SIG_DFL);
+         const char *prog_argv[3] = { prog_path, "4", NULL };
+         int termsig = 0x7DEADBEE;
+         int ret = execute (progname, prog_argv[0], prog_argv, NULL,
+-- 
+2.30.2
+
diff --git a/main/m4/APKBUILD b/main/m4/APKBUILD
index 4b9fdf04727..f372aef7a7e 100644
--- a/main/m4/APKBUILD
+++ b/main/m4/APKBUILD
@@ -1,22 +1,22 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=m4
-pkgver=1.4.18
-pkgrel=1
+pkgver=1.4.19
+pkgrel=3
 pkgdesc="GNU macro processor"
 url="https://www.gnu.org/software/m4"
-depends=
 makedepends=texinfo
 checkdepends=diffutils
 arch="all"
-license="GPL-3.0+"
+license="GPL-3.0-or-later"
 subpackages="m4-doc"
-source="https://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.gz
-	disable-mbrtowc-test.patch
-	localename-test-fix.patch
+source="https://ftp.gnu.org/gnu/m4/m4-$pkgver.tar.gz
+	musl-realpath.patch
+	fix-sysval-test.patch
+	test-posix_spawn_file_actions_addclose.patch
+	0001-test-execute-main.c-set-default-handler-for-SIGPIPE-.patch
 	"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,17 +25,19 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make install DESTDIR="$pkgdir"
 	rm -rf "$pkgdir"/usr/lib/charset.alias
 	rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
 }
 
-sha512sums="29254dd4267a093e8d9da3a26df8b02564044cdb4506be539ec1aff4e5d406477bcf32f5e813c840f3aec77293bfe2cdde18f6a21724a7e0bfff646ec88b74ae  m4-1.4.18.tar.gz
-78bf099c96fcec8c9cebd4e34f0d7c942e99da2ec238baa9464f8443580edb0565e9026c433ee54fb564304ec8e7e90766e19474472e57b48e567fd7b356777e  disable-mbrtowc-test.patch
-fac0cb58e698996284a222c4da340f92689d6db98f1fbab6e61e1c5f2d90122660296f8e5c60c94169413e3e2ee632c6264f12b98e5d3a1e1aae145a2d4aac45  localename-test-fix.patch"
+sha512sums="
+f5dd0f02fcae65a176a16af9a8e1747c26e9440c6c224003ba458d3298b777a75ffb189aee9051fb0c4840b2a48278be4a51d959381af0b1d627570f478c58f2  m4-1.4.19.tar.gz
+cc86f883eac255301615278af9ee172e13bbe48ce0ac318ab6c325ab2406000ceb10c5360868111210eb784ea028ef93cdfe12b77e17fa0066786957c347fd71  musl-realpath.patch
+d251842f8a6d71b4dc6912961bd873383b1b102a14ae3c1d06f44444b3db69d599fd8afec436734c4dad1c08de06c2ef2a48582a1528cc67b20f8db5afe287d9  fix-sysval-test.patch
+78f78f3f3145515da0a4b6f5fc891b0289b20d25f548d403f7de38f27a4b0f4bf06bf987d994ec85b61f4b28de1494a93c3347ff35b695becf8a5e9f2f3f7d49  test-posix_spawn_file_actions_addclose.patch
+23b1638712dcf648a1333c0ffa626666f60248fe8a9c09bfb7dc62680453a29a08007c3f44f9a93b5f5e53106f8e5269c08cc551e3ba4f6719f13edc469870bc  0001-test-execute-main.c-set-default-handler-for-SIGPIPE-.patch
+"
diff --git a/main/m4/disable-mbrtowc-test.patch b/main/m4/disable-mbrtowc-test.patch
deleted file mode 100644
index cc2be247865..00000000000
--- a/main/m4/disable-mbrtowc-test.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- m4-1.4.18/tests/test-mbrtowc5.sh.old	2016-12-31 13:54:43.000000000 +0000
-+++ m4-1.4.18/tests/test-mbrtowc5.sh	2017-07-30 17:29:50.879924130 +0000
-@@ -1,6 +1,2 @@
- #!/bin/sh
--# Test whether the POSIX locale has encoding errors.
--LC_ALL=C \
--./test-mbrtowc${EXEEXT} 5 || exit
--LC_ALL=POSIX \
--./test-mbrtowc${EXEEXT} 5
-+exit 77
diff --git a/main/m4/fix-sysval-test.patch b/main/m4/fix-sysval-test.patch
new file mode 100644
index 00000000000..3ced3d1cd89
--- /dev/null
+++ b/main/m4/fix-sysval-test.patch
@@ -0,0 +1,25 @@
+commit cd7f4d153ccccf601751e9fa82424412f6ecfc96 (HEAD)
+Author: Eric Blake <eblake@redhat.com>
+Date:   Tue Jun 1 08:10:51 2021 -0500
+
+    tests: Fix 198.sysval
+
+    In my attempt to avoid test failures on Haiku, I caused test failures
+    on platforms where sh is noisy when reporting a killed sub-process.
+
+    * doc/m4.texi (Sysval): Avoid stderr noise during test.
+    Fixes: 17011ea76a (tests: Skip signal detection on Haiku)
+    Fixes: https://lists.gnu.org/archive/html/bug-m4/2021-05/msg00029.html
+
+diff -upr m4-1.4.19.orig/checks/198.sysval m4-1.4.19/checks/198.sysval
+--- m4-1.4.19.orig/checks/198.sysval	2022-01-30 12:07:12.283721677 +0100
++++ m4-1.4.19/checks/198.sysval	2022-01-30 12:08:03.733939699 +0100
+@@ -14,7 +14,7 @@ ifdef(`__unix__', ,
+ ')m4exit(`77')')dnl
+ changequote(`[', `]')
+ dnl @result{}
+-syscmd([/bin/sh -c 'kill -9 $$'; st=$?; test $st = 137 || test $st = 265])
++syscmd([@{ /bin/sh -c 'kill -9 $$'; @} 2>/dev/null; st=$?; test $st = 137 || test $st = 265])
+ dnl @result{}
+ ifelse(sysval, [0], , [errprint([ skipping: shell does not send signal 9
+ ])m4exit([77])])dnl
diff --git a/main/m4/localename-test-fix.patch b/main/m4/localename-test-fix.patch
deleted file mode 100644
index 04584aba661..00000000000
--- a/main/m4/localename-test-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- m4-1.4.18/tests/localename.c.old	2016-12-31 13:54:43.000000000 +0000
-+++ m4-1.4.18/tests/localename.c	2017-07-30 16:40:47.098541270 +0000
-@@ -40,7 +40,7 @@
- # if defined __APPLE__ && defined __MACH__
- #  include <xlocale.h>
- # endif
--# if __GLIBC__ >= 2 && !defined __UCLIBC__
-+# if defined __linux__
- #  include <langinfo.h>
- # endif
- # if !defined IN_LIBINTL
-@@ -2692,16 +2692,19 @@
-     locale_t thread_locale = uselocale (NULL);
-     if (thread_locale != LC_GLOBAL_LOCALE)
-       {
--#  if __GLIBC__ >= 2 && !defined __UCLIBC__
-+#  if defined(_NL_LOCALE_NAME)
-+        const char *name = nl_langinfo(_NL_LOCALE_NAME(category));
-+#   if __GLIBC__ >= 2 && !defined __UCLIBC__
-         /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
-            glibc < 2.12.
-            See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */
--        const char *name =
--          nl_langinfo (_NL_ITEM ((category), _NL_ITEM_INDEX (-1)));
-+	if (name[0] == '\0')
-+          name = nl_langinfo (_NL_ITEM ((category), _NL_ITEM_INDEX (-1)));
-         if (name[0] == '\0')
-           /* Fallback code for glibc < 2.4, which did not implement
-              nl_langinfo (_NL_LOCALE_NAME (category)).  */
-           name = thread_locale->__names[category];
-+#   endif
-         return name;
- #  elif defined __FreeBSD__ || (defined __APPLE__ && defined __MACH__)
-         /* FreeBSD, Mac OS X */
diff --git a/main/m4/musl-realpath.patch b/main/m4/musl-realpath.patch
new file mode 100644
index 00000000000..22f15ff8444
--- /dev/null
+++ b/main/m4/musl-realpath.patch
@@ -0,0 +1,23 @@
+https://gitlab.alpinelinux.org/alpine/aports/-/issues/12295
+
+----
+test-canonicalize.c:339: assertion 'strcmp (result1, "/") == 0' failed
+Aborted (core dumped)
+FAIL test-canonicalize (exit status: 134)
+----
+
+diff --git a/tests/test-canonicalize-lgpl.c b/tests/test-canonicalize-lgpl.c
+index ff82981..17842e8 100644
+--- a/tests/test-canonicalize-lgpl.c
++++ b/tests/test-canonicalize-lgpl.c
+@@ -196,8 +196,8 @@ main (void)
+ #ifndef __MVS__
+     if (SAME_INODE (st1, st2))
+       {
+-        ASSERT (strcmp (result1, "/") == 0);
+-        ASSERT (strcmp (result2, "/") == 0);
++        ASSERT (strcmp (result1, "/") == 0 || strcmp (result1, "//") == 0);
++        ASSERT (strcmp (result2, "/") == 0 || strcmp (result2, "//") == 0);
+       }
+     else
+ #endif
diff --git a/main/m4/test-posix_spawn_file_actions_addclose.patch b/main/m4/test-posix_spawn_file_actions_addclose.patch
new file mode 100644
index 00000000000..079424a2436
--- /dev/null
+++ b/main/m4/test-posix_spawn_file_actions_addclose.patch
@@ -0,0 +1,18 @@
+diff --git a/tests/test-posix_spawn_file_actions_addclose.c b/tests/test-posix_spawn_file_actions_addclose.c
+index 2c910ea..b228a7d 100644
+--- a/tests/test-posix_spawn_file_actions_addclose.c
++++ b/tests/test-posix_spawn_file_actions_addclose.c
+@@ -54,13 +54,6 @@ main (void)
+     errno = 0;
+     ASSERT (posix_spawn_file_actions_addclose (&actions, -1) == EBADF);
+   }
+-  /* This behaviour is not mandated by POSIX, but happens to pass on all
+-     platforms.  */
+-  {
+-    int bad_fd = big_fd ();
+-    errno = 0;
+-    ASSERT (posix_spawn_file_actions_addclose (&actions, bad_fd) == EBADF);
+-  }
+ 
+   posix_spawn_file_actions_destroy (&actions);
+ 
diff --git a/main/macifrename/APKBUILD b/main/macifrename/APKBUILD
index 83d383b5450..d83db7ddd04 100644
--- a/main/macifrename/APKBUILD
+++ b/main/macifrename/APKBUILD
@@ -1,35 +1,32 @@
 # Contributor: Ariadne Conill <ariadne@dereferenced.org>
 # Maintainer: Ariadne Conill <ariadne@dereferenced.org>
-pkgname="macifrename"
-pkgver="0.1"
-pkgrel=0
+pkgname=macifrename
+pkgver=0.1.2
+pkgrel=1
 pkgdesc="stably rename NICs based on MAC addresses"
 url="https://git.sr.ht/~kaniini/macifrename"
 arch="all"
 license="ISC"
-depends=""
 makedepends="linux-headers"
-install=""
 subpackages="$pkgname-openrc"
-source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~kaniini/$pkgname/archive/$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~kaniini/macifrename/archive/$pkgver.tar.gz
 	macifrename.initd
 	macifrename.confd"
-builddir="$srcdir/$pkgname-$pkgver"
 options="!check"
 
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
 	make install DESTDIR="$pkgdir"
 
 	install -D -m755 "$srcdir"/macifrename.initd "$pkgdir"/etc/init.d/macifrename
 	install -D -m644 "$srcdir"/macifrename.confd "$pkgdir"/etc/conf.d/macifrename
 }
 
-sha512sums="4048cf443a6726ece8337ace57f8ce323053a19ef342722d8bd4af9d7f6cc71cff9ab0d485c82f3c8e02203375af90fbf7c5b39baeef2435c7f32c7fca3d6c9d  macifrename-0.1.tar.gz
-2d7351c7cedebe9d323dc991890f598c9947cd21a3e5fd438f6a7161a36853865c6954150d1d77f5269f457241ed9e0b7ceb370ec0938c9fe344d996c25426d9  macifrename.initd
-d6c28da2cd5205f4ffdf353ec88acfbb00ffbff5e984fc949b7c7e8de46ddfeba6af2c41675460599bf7fba36b661fe7b83a6e1c4bb84c0ee513410b7661c6d1  macifrename.confd"
+sha512sums="
+661449b2018fc558e69d1ebfaf0c829e1ba21173fb0b596bc34967c8652926238258e7acba0326d374b21e7637735a381e79d2ba9a2ab67c594c077dda5a2464  macifrename-0.1.2.tar.gz
+77a728bb67c8965d74aa1959628c5ed63739b3df01118a692ee9ee47256b1b9437e9f912652327fc53cf1e87f114ebb56bbcfca5eff6326608b8c14b344c7ba6  macifrename.initd
+d6c28da2cd5205f4ffdf353ec88acfbb00ffbff5e984fc949b7c7e8de46ddfeba6af2c41675460599bf7fba36b661fe7b83a6e1c4bb84c0ee513410b7661c6d1  macifrename.confd
+"
diff --git a/main/macifrename/macifrename.initd b/main/macifrename/macifrename.initd
index 3020900049d..bd069b1bae9 100644
--- a/main/macifrename/macifrename.initd
+++ b/main/macifrename/macifrename.initd
@@ -2,6 +2,7 @@
 
 depend() {
         before net
+        want dev-settle
         keyword -vserver -lxc
 }
 
diff --git a/main/mailcap/APKBUILD b/main/mailcap/APKBUILD
index 83088eb6d08..9c2160a2cb7 100644
--- a/main/mailcap/APKBUILD
+++ b/main/mailcap/APKBUILD
@@ -1,20 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mailcap
-pkgver=2.1.48
+pkgver=2.1.54
 pkgrel=0
 pkgdesc="Helper application and MIME type associations for file types"
-url="http://git.fedorahosted.org/git/mailcap.git"
+url="https://pagure.io/mailcap"
 arch="noarch"
-license="Public-Domain and MIT"
+license="Public Domain"
+options="!check" # no testsuite
 subpackages="$pkgname-doc"
-source="https://releases.pagure.org/$pkgname/$pkgname-$pkgver.tar.xz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://releases.pagure.org/mailcap/mailcap-$pkgver.tar.xz"
 
 package() {
-	cd "$builddir"
-
-	make install DESTDIR="$pkgdir" || return 1
+	make install DESTDIR="$pkgdir"
 	rm -Rf "$pkgdir"/etc/nginx
 }
 
-sha512sums="a79604b732ebb415673d0e04cfc2a1a98f129cb63e14fa615299bdc367ce106bafef52e9f98167f07acfe7883de76fdab657460b84aafc583b67b538c4671c64  mailcap-2.1.48.tar.xz"
+sha512sums="
+a80caba013b644111f163d8ef74fe801d7266cf4edd38ca723f98fb12a103a24e84a8fca0c569beb05ca0f407437ed1282306b30303c38327b744194c6fe80b2  mailcap-2.1.54.tar.xz
+"
diff --git a/main/mailx/00-Makefiles.patch b/main/mailx/00-Makefiles.patch
new file mode 100644
index 00000000000..ca40b9250f3
--- /dev/null
+++ b/main/mailx/00-Makefiles.patch
@@ -0,0 +1,88 @@
+From: Loic Prylli <Loic.Prylli@graville.fdn.fr>
+Date: Mon, 29 Jun 1998 20:15:00 -0400
+Subject: 00 Makefiles
+
+Fix makefiles to make it possible to compile mailx on non-BSD systems.
+---
+ Makefile         | 32 +++++++++++++++++++++++++++++++-
+ USD.doc/Makefile | 14 +++++++++-----
+ 2 files changed, 40 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e2313ca..e693279 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,12 +1,24 @@
+ #	$OpenBSD: Makefile,v 1.13 2020/12/15 00:50:01 daniel Exp $
+ 
+ PROG=	mail
++CC ?=	gcc
++
++CFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -DDEBIAN -g -Wall
++
+ SRCS=	version.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c \
+ 	edit.c fio.c head.c v7.local.c lex.c list.c main.c names.c \
+ 	popen.c quit.c send.c strings.c temp.c tty.c util.c vars.c
++
++
++OBJS=$(SRCS:%.c=%.o)
++LIBS=-llockfile -lbsd
++
+ SFILES=	mail.help mail.tildehelp
+ EFILES=	mail.rc
+ LINKS=	${BINDIR}/mail ${BINDIR}/Mail ${BINDIR}/mail ${BINDIR}/mailx
++MFILES=	mail.1
++
++all: $(PROG)
+ 
+ distribution:
+ 	cd ${.CURDIR}/misc; ${INSTALL} ${INSTALL_COPY} -o root -g wheel \
+@@ -14,4 +26,22 @@ distribution:
+ 	cd ${.CURDIR}/misc; ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
+ 	    -m 444 ${SFILES} ${DESTDIR}/usr/share/misc
+ 
+-.include <bsd.prog.mk>
++
++$(PROG): $(OBJS)
++	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
++
++.c.o:
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
++
++.y.c:
++	bison $<
++	mv -f $*.tab.c $@
++
++clean:
++	rm -f $(PROG) $(OBJS) *~ core
++
++install:
++	install -p -c -m 755 $(PROG) $(DESTDIR)/usr/bin/mail
++	install -p -c -m 644 $(MFILES) $(DESTDIR)/usr/share/man/man1/mail.1
++	cd misc && install -p -c -m 644 $(EFILES) $(DESTDIR)/etc/
++	cd misc && install -p -c -m 644 $(SFILES) $(DESTDIR)/usr/share/misc/
+diff --git a/USD.doc/Makefile b/USD.doc/Makefile
+index fc82a17..a59ecb0 100644
+--- a/USD.doc/Makefile
++++ b/USD.doc/Makefile
+@@ -5,11 +5,15 @@ DIR=	usd/07.mail
+ SRCS=	mail0.nr mail1.nr mail2.nr mail3.nr mail4.nr mail5.nr mail6.nr \
+ 	mail7.nr mail8.nr mail9.nr maila.nr
+ MACROS=	-me
++TBL=tbl
+ 
+-paper.ps: ${SRCS}
+-	${TBL} ${SRCS} | ${ROFF} > ${.TARGET}
++all: manual.ps manual.txt
+ 
+-paper.txt: ${SRCS}
+-	${TBL} ${SRCS} | ${ROFF} -Tascii > ${.TARGET}
++manual.ps: ${SRCS}
++	${TBL} ${SRCS} | groff ${MACROS} -Tps > $@
+ 
+-.include <bsd.doc.mk>
++manual.txt: ${SRCS}
++	${TBL} ${SRCS} | groff ${MACROS} -Tascii  > $@
++
++clean :
++	-rm -f manual.ps manual.txt
diff --git a/main/mailx/02-Base-fixes-1.patch b/main/mailx/02-Base-fixes-1.patch
new file mode 100644
index 00000000000..58d849f9064
--- /dev/null
+++ b/main/mailx/02-Base-fixes-1.patch
@@ -0,0 +1,178 @@
+From: Loic Prylli <Loic.Prylli@graville.fdn.fr>
+Date: Mon, 29 Jun 1998 20:15:00 -0400
+Subject: 02 Base fixes 1
+
+Fixes from  Debian patch 1:8.1.1-10
+---
+ USD.doc/mail1.nr |  2 +-
+ USD.doc/mail5.nr |  2 +-
+ collect.c        |  2 ++
+ head.c           |  3 +++
+ mail.1           |  6 +++---
+ main.c           |  2 +-
+ misc/mail.rc     |  4 ++--
+ names.c          |  3 ++-
+ pathnames.h      | 39 +++++++++++++++++++++++++++++++++++----
+ 9 files changed, 50 insertions(+), 13 deletions(-)
+
+diff --git a/USD.doc/mail1.nr b/USD.doc/mail1.nr
+index 1d21d52..414fc2b 100644
+--- a/USD.doc/mail1.nr
++++ b/USD.doc/mail1.nr
+@@ -90,7 +90,7 @@ When you log in, the system notifies you if there are any messages
+ waiting in your system mailbox.  If you are a
+ .i csh
+ user, you will be notified when new mail arrives if you inform
+-the shell of the location of your mailbox.  On OpenBSD,
++the shell of the location of your mailbox.  On Debian,
+ your system mailbox is located in the directory /var/mail
+ in a file with your login name.  If your login name is
+ .q sam,
+diff --git a/USD.doc/mail5.nr b/USD.doc/mail5.nr
+index aecaf61..3e352af 100644
+--- a/USD.doc/mail5.nr
++++ b/USD.doc/mail5.nr
+@@ -489,7 +489,7 @@ commands.
+ .. The
+ .. .b local
+ .. command is usually not used be general users since it is designed for
+-.. local configuration; it is usually found in the file /usr/lib/Mail.rc.
++.. local configuration; it is usually found in the file /etc/mail.rc.
+ .ip "\fBmail\fP\ \ "
+ Send mail to one or more people.  If you have the
+ .i ask
+diff --git a/collect.c b/collect.c
+index 930d9a1..a63693f 100644
+--- a/collect.c
++++ b/collect.c
+@@ -402,6 +402,8 @@ exwrite(char *name, FILE *fp, int f)
+ 		fputs("File exists\n", stderr);
+ 		return(-1);
+ 	}
++        /* FIXME: Fopen with "w" will currently prevent writing to an existig file
++           (/dev/null), for now I am not sure this would even marginally useful to allow */
+ 	if ((of = Fopen(name, "w")) == NULL) {
+ 		warn(NULL);
+ 		return(-1);
+diff --git a/head.c b/head.c
+index 3043e5c..e89e92f 100644
+--- a/head.c
++++ b/head.c
+@@ -60,10 +60,13 @@ ishead(char *linebuf)
+ 		fail(linebuf, "No from or date field");
+ 		return(0);
+ 	}
++        /* be very tolerant about the date */
++#ifndef DEBIAN
+ 	if (!isdate(hl.l_date)) {
+ 		fail(linebuf, "Date field not legal date");
+ 		return(0);
+ 	}
++#endif
+ 	/*
+ 	 * I guess we got it!
+ 	 */
+diff --git a/mail.1 b/mail.1
+index d712811..aece9c1 100644
+--- a/mail.1
++++ b/mail.1
+@@ -298,7 +298,7 @@ The current list of such aliases can be displayed with the
+ command in
+ .Nm mail .
+ System wide distribution lists can be created by editing
+-.Pa /etc/mail/aliases
++.Pa /etc/aliases ,
+ (see
+ .Xr aliases 5 ) ;
+ these are kept in a different syntax.
+diff --git a/main.c b/main.c
+index f802c07..b8c80fd 100644
+--- a/main.c
++++ b/main.c
+@@ -316,7 +316,7 @@ setscreensize(void)
+ 	if (ioctl(1, TIOCGWINSZ, (char *) &ws) == -1)
+ 		ws.ws_col = ws.ws_row = 0;
+ 	if (tcgetattr(1, &tbuf) == -1)
+-		ospeed = 9600;
++		ospeed = B9600;
+ 	else
+ 		ospeed = cfgetospeed(&tbuf);
+ 	if (ospeed < B1200)
+diff --git a/misc/mail.rc b/misc/mail.rc
+index 95717f3..3fcc98d 100644
+--- a/misc/mail.rc
++++ b/misc/mail.rc
+@@ -1,2 +1,2 @@
+-set append dot save asksub
+-ignore Received Message-Id Resent-Message-Id Status Mail-From Return-Path Via
++set ask askcc append dot save crt
++ignore Received Message-Id Resent-Message-Id Status Mail-From Return-Path Via Delivered-To
+diff --git a/names.c b/names.c
+index d08cbde..8f35e6d 100644
+--- a/names.c
++++ b/names.c
+@@ -238,8 +238,9 @@ outof(struct name *names, FILE *fo, struct header *hp)
+ 
+ 			(void)snprintf(tempname, sizeof(tempname),
+ 			    "%s/mail.ReXXXXXXXXXX", tmpdir);
++                  /* hopefully we always create the file, so I change the "a" to "w"  the line below */
+ 			if ((fd = mkstemp(tempname)) == -1 ||
+-			    (fout = Fdopen(fd, "a")) == NULL) {
++			    (fout = Fdopen(fd, "w")) == NULL) {
+ 				warn("%s", tempname);
+ 				senderr++;
+ 				goto cant;
+diff --git a/pathnames.h b/pathnames.h
+index f1f5100..aa639d2 100644
+--- a/pathnames.h
++++ b/pathnames.h
+@@ -36,14 +36,45 @@
+ #include <paths.h>
+ 
+ /* executables */
++#ifndef _PATH_SHELL
++#define _PATH_SHELL	"/bin/sh"
++#endif
++#ifndef _PATH_PAGER
++#define _PATH_PAGER	"/usr/bin/pager"
++#endif
++#ifndef _PATH_EX
++#define _PATH_EX	"/usr/bin/editor"
++#endif
++#ifndef _PATH_VI
++#define _PATH_VI	"/usr/bin/vi"
++#endif
++#ifndef _PATH_SENDMAIL
++#define _PATH_SENDMAIL	"/usr/sbin/sendmail"
++#endif
++
++/* directories */
++#ifndef _PATH_TMP
++#define _PATH_TMP	"/tmp/"
++#endif
++
++/* executables */
++#ifndef _PATH_LS
++#define _PATH_LS	"/bin/ls"
++#endif
++
++#ifndef DEBIAN
+ #define _PATH_EX	"/usr/bin/ex"
+ #define _PATH_MORE	"/usr/bin/more"
+-#define _PATH_LS	"/bin/ls"
+ #define _PATH_LOCKSPOOL	"/usr/libexec/lockspool"
++#endif
+ 
+-/* directories & files */
++/* mail runtime files */
++#ifndef _PATH_MAILDIR
+ #define _PATH_MAILDIR	"/var/mail"
+-#define _PATH_HELP	"/usr/share/misc/mail.help"
+-#define _PATH_TILDE	"/usr/share/misc/mail.tildehelp"
++#endif
++
++/* directories & files */
++#define _PATH_HELP	"/usr/share/misc/mail.help"
++#define _PATH_TILDE	"/usr/share/misc/mail.tildehelp"
+ #define _PATH_MASTER_RC	"/etc/mail.rc"
+ #define _PATH_LOCTMP	"/tmp/local.XXXXXXXXXX"
diff --git a/main/mailx/APKBUILD b/main/mailx/APKBUILD
index b2f92f64985..6ad328a8e1b 100644
--- a/main/mailx/APKBUILD
+++ b/main/mailx/APKBUILD
@@ -1,47 +1,54 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=mailx
-pkgver=8.1.1
+# tracks debians cvs checkouts
+_date=20220412
+_version=8.1.2
+pkgver=${_version}_git$_date
 pkgrel=1
-pkgdesc="A commandline utility for sending email"
+pkgdesc="commandline utility for sending email"
 url="http://www.opengroup.org/onlinepubs/007908799/xcu/mailx.html"
 arch="all"
-license="BSD"
-depends=
-depends_dev=
-makedepends="$depends_dev bsd-compat-headers"
-install=""
-options="suid"
+license="BSD-4-Clause-UC"
+makedepends="libbsd-dev liblockfile-dev"
 subpackages="$pkgname-doc"
-source="https://sources.archlinux.org/other/mailx/$pkgname-$pkgver-fixed.tar.gz
-	mailx-8.1.1.patch
-	musl-fix.patch
-	mailx-gcc4.patch"
-
-_builddir="$srcdir/$pkgname-$pkgver-fixed"
+source="http://deb.debian.org/debian/pool/main/b/bsd-mailx/bsd-mailx_$_version-0.${_date}cvs.orig.tar.xz
+	http://deb.debian.org/debian/pool/main/b/bsd-mailx/bsd-mailx_$_version-0.${_date}cvs-1.debian.tar.xz
+	00-Makefiles.patch
+	02-Base-fixes-1.patch
+	CCEQ.patch
+	"
+builddir="$srcdir/bsd-mailx-$_version-0.${_date}cvs.orig"
+options="suid !check" # No testsuite
 
 prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	sed -i 's#/man/#/share/man/#' Makefile
+	default_prepare
+	# debian keeps their patchset in their own folder
+	while read -r patch; do
+		# put these top level to modify them
+		echo "$patch" | grep -q 00-Makefiles && continue
+		echo "$patch" | grep -q 02-Base-fixes-1 && continue
+
+		patch -Np1 < "$srcdir"/debian/patches/"$patch"
+	done < "$srcdir"/debian/patches/series
 }
 
 build() {
-	cd "$_builddir"
-	make || return 1
+	make PROG=mail
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	mkdir -p "$pkgdir"/usr/bin
+	mkdir -p "$pkgdir"/usr/share/man/man1
+	mkdir -p "$pkgdir"/usr/share/misc
+	mkdir -p "$pkgdir"/etc
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="adfb1ae796505f2706d03e34ae9b89f45dd878d55014ae8fab91fbf4b53f1bd97e0ac78ce1af5999adf62e99230f91d9539605ae388cf6c16e8334c14c0cce10  mailx-8.1.1-fixed.tar.gz
-05c4185ef54601c9bae6b6505201a9b357f69d9d22c4b992a9ba52f4022b8dec2d0e5b97654fff7c9f303bdcc87ab8bb279a7293fdd538d4291dcd99f6eae1d4  mailx-8.1.1.patch
-de633d557552c38e221cd48c0cf6cefe108f22332eab5e155183463b0209a08b1ae6754508a12bf9f261a345b2feb1a4e607167d51b7a16e60d47c3c02d0218f  musl-fix.patch
-e3fa1016da2cd1583e1ba2f6cd05566385607e144da2766101e4bf8c8dc089c4b956d1d90ccc040e5faf31c98d0855a0bc909bf0d6538df34925e798bba1a074  mailx-gcc4.patch"
+sha512sums="
+acee80e49fbac85dfaa48d885dd310a056a1418c6e3b02ee9f30441a34c104b134fb7c47cac91a1b2359d3d3cba0cf026d9cdf51f659b8c172100d7f98156203  bsd-mailx_8.1.2-0.20220412cvs.orig.tar.xz
+8794d8a41ec86012f4e74509f489afa8dcb624a17a6bc779024b2bb6eed8a7a86826785601bd295147641cd26f4288ec73aa8c3a2451b35b41fbc682f91c157f  bsd-mailx_8.1.2-0.20220412cvs-1.debian.tar.xz
+030ba8fe900d42c0a780109a0b21d2eb040d182dd1febed0e079e1291f0cb3d65472e00ef557f5ea8a96122eef68b17ec00645aaf9b07355bbd44e5ee1139b81  00-Makefiles.patch
+a8c975196468015e2e57b2848c17c0a827c18db9d04b019d3912d3f0a40d379f7f115d6b1db32f129f4faf171e99eb746dcfbbc157329ad11fde1a1b8415175e  02-Base-fixes-1.patch
+c285c25620bfe5ca07fc1d068c40dea1f1a980cce1c4dcd7dd4f6de0d492e9fe8f968ef818c630aa1d95beed269e9b9464a53a5ff1af54cdaf3e0bab92a76d3f  CCEQ.patch
+"
diff --git a/main/mailx/CCEQ.patch b/main/mailx/CCEQ.patch
new file mode 100644
index 00000000000..d04ddd789e3
--- /dev/null
+++ b/main/mailx/CCEQ.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/719512
+
+Tiny definition copied from /usr/include/termios.h.
+--- a/tty.c
++++ b/tty.c
+@@ -57,6 +57,10 @@
+ 	size_t	 cursor;
+ };
+ 
++#ifndef CCEQ
++#define CCEQ(val, c) ((c) == (val) && (val) != _POSIX_VDISABLE)
++#endif
++
+ static void	tty_flush(struct tty *);
+ static int	tty_getc(struct tty *);
+ static int	tty_insert(struct tty *, int, int);
+
diff --git a/main/mailx/mailx-8.1.1.patch b/main/mailx/mailx-8.1.1.patch
deleted file mode 100644
index f1c9519c0c3..00000000000
--- a/main/mailx/mailx-8.1.1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- ./Makefile	Thu Mar 16 09:30:36 2000
-+++ ./Makefile	Wed Feb 27 12:50:09 2002
-@@ -7,18 +7,20 @@
- BINOWN = root
- BINGRP = mail
- 
-+DESTDIR = 
-+
- all:
- 	gcc $(SRCS) -o $(PROG)
- 
- install:
--	mkdir -p /usr/share/misc
--	mkdir -p /usr/share/man/man1
--	mkdir -p /etc
--	mkdir -p /usr/bin
--	install -o $(BINOWN) -g $(BINGRP) -m 2755 $(PROG) /usr/bin
--	install -o root -g root -m 644 mail.1 /usr/share/man/man1
-+	mkdir -p $(DESTDIR)/usr/share/misc
-+	mkdir -p $(DESTDIR)/usr/man/man1
-+	mkdir -p $(DESTDIR)/etc
-+	mkdir -p $(DESTDIR)/usr/bin
-+	install -o $(BINOWN) -g $(BINGRP) -m 2755 $(PROG) $(DESTDIR)/usr/bin
-+	install -o root -g root -m 644 mail.1 $(DESTDIR)/usr/man/man1
- 	cd misc; install -c -o ${BINOWN} -g ${BINGRP} \
--	    -m 444 ${SFILES} /usr/share/misc
-+	    -m 444 ${SFILES} $(DESTDIR)/usr/share/misc
- 	cd misc; install -c -o root -g root \
--	    -m 644 ${EFILES} /etc
-+	    -m 644 ${EFILES} $(DESTDIR)/etc
- 
diff --git a/main/mailx/mailx-gcc4.patch b/main/mailx/mailx-gcc4.patch
deleted file mode 100644
index 18452759c39..00000000000
--- a/main/mailx/mailx-gcc4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-K. Piche:  Unofficial patch for mailx.
-
---- ./dotlock.c.orig      2005-09-18 20:28:20.000000000 -0400
-+++ ./dotlock.c   2005-09-18 20:26:59.000000000 -0400
-@@ -47,6 +47,7 @@
- #include <errno.h>
- #include <signal.h>
-
-+#include "def.h"
- #include "extern.h"
-
- #ifndef O_SYNC
diff --git a/main/mailx/musl-fix.patch b/main/mailx/musl-fix.patch
deleted file mode 100644
index 8b409b286d5..00000000000
--- a/main/mailx/musl-fix.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- mailx-8.1.1-fixed.orig/cmd2.c
-+++ mailx-8.1.1-fixed/cmd2.c
-@@ -383,7 +383,7 @@
- 	void *v;
- {
- 	int pid;
--	extern union wait wait_status;
-+	extern int wait_status;
- 
- 	switch (pid = vfork()) {
- 	case -1:
-@@ -396,7 +396,7 @@
- 	printf("Okie dokie");
- 	fflush(stdout);
- 	wait_child(pid);
--	if (wait_status.w_coredump)
-+	if (WCOREDUMP(wait_status))
- 		printf(" -- Core dumped.\n");
- 	else
- 		printf(" -- Can't dump core.\n");
---- mailx-8.1.1-fixed.orig/def.h
-+++ mailx-8.1.1-fixed/def.h
-@@ -43,6 +43,7 @@
-  */
- 
- #include <sys/param.h>
-+#include <sys/cdefs.h>
- #include <sys/stat.h>
- #include <sys/time.h>
- 
---- mailx-8.1.1-fixed.orig/extern.h
-+++ mailx-8.1.1-fixed/extern.h
-@@ -37,6 +37,8 @@
-  *	$NetBSD: extern.h,v 1.4 1996/06/08 19:48:21 christos Exp $
-  */
- 
-+#include <sys/cdefs.h>
-+
- struct name;
- struct name *cat __P((struct name *, struct name *));
- struct name *delname __P((struct name *, char []));
---- mailx-8.1.1-fixed.orig/fio.c
-+++ mailx-8.1.1-fixed/fio.c
-@@ -47,7 +47,6 @@
- #include <sys/wait.h>
- 
- #include <unistd.h>
--#include <paths.h>
- #include <errno.h>
- #include "extern.h"
- 
-@@ -326,7 +325,7 @@
- 	register char *cp, *shell;
- 	int pivec[2];
- 	struct stat sbuf;
--	extern union wait wait_status;
-+	extern int wait_status;
- 
- 	/*
- 	 * The order of evaluation is "%" and "#" expand into constants.
-@@ -378,7 +377,7 @@
- 	close(pivec[1]);
- 	l = read(pivec[0], xname, BUFSIZ);
- 	close(pivec[0]);
--	if (wait_child(pid) < 0 && wait_status.w_termsig != SIGPIPE) {
-+	if (wait_child(pid) < 0 && WIFSIGNALED(wait_status) && WTERMSIG(wait_status) != SIGPIPE) {
- 		fprintf(stderr, "\"%s\": Expansion failed.\n", name);
- 		return NOSTR;
- 	}
---- mailx-8.1.1-fixed.orig/pathnames.h
-+++ mailx-8.1.1-fixed/pathnames.h
-@@ -44,3 +44,4 @@
- #define	_PATH_TILDE	"/usr/share/misc/mail.tildehelp"
- #define	_PATH_MASTER_RC	"/etc/mail.rc"
- #define	_PATH_MORE	"/usr/bin/more"
-+#define	_PATH_CSHELL	"/bin/csh"
---- mailx-8.1.1-fixed.orig/popen.c
-+++ mailx-8.1.1-fixed/popen.c
-@@ -62,7 +62,7 @@
- 	int pid;
- 	char done;
- 	char free;
--	union wait status;
-+	int status;
- 	struct child *link;
- };
- static struct child *child;
-@@ -341,7 +341,7 @@
- 	int signo;
- {
- 	int pid;
--	union wait status;
-+	int status;
- 	register struct child *cp;
- 
- 	while ((pid =
-@@ -356,7 +356,7 @@
- 	}
- }
- 
--union wait wait_status;
-+int wait_status;
- 
- /*
-  * Wait for a specific child to die.
-@@ -376,7 +376,9 @@
- 	wait_status = cp->status;
- 	delchild(cp);
- 	sigprocmask(SIG_SETMASK, &oset, NULL);
--	return wait_status.w_status ? -1 : 0;
-+	if (WIFEXITED(wait_status) && WEXITSTATUS(wait_status) == 0)
-+		return 0;
-+	return -1;
- }
- 
- /*
---- mailx-8.1.1-fixed.orig/quit.c
-+++ mailx-8.1.1-fixed/quit.c
-@@ -43,6 +43,7 @@
- #endif /* not lint */
- 
- #include "rcv.h"
-+#include <sys/file.h>
- #include <fcntl.h>
- #include "extern.h"
- 
diff --git a/main/make/APKBUILD b/main/make/APKBUILD
index 8fba088dde2..d4518194ec8 100644
--- a/main/make/APKBUILD
+++ b/main/make/APKBUILD
@@ -1,16 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=make
-pkgver=4.3
-pkgrel=0
+pkgver=4.4.1
+pkgrel=2
 pkgdesc="GNU make utility to maintain groups of programs"
 url="https://www.gnu.org/software/make"
 arch="all"
 license="GPL-3.0-or-later"
 subpackages="$pkgname-doc"
-source="https://ftp.gnu.org/gnu/make/make-$pkgver.tar.gz
-	"
+source="https://ftp.gnu.org/gnu/make/make-$pkgver.tar.gz"
 
 build() {
+	if [ -z "$BOOTSTRAP" ]; then
+		export CFLAGS="$CFLAGS -flto=auto"
+	fi
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,6 +29,9 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
+	ln -sfv make "$pkgdir"/usr/bin/gmake
 }
 
-sha512sums="9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b  make-4.3.tar.gz"
+sha512sums="
+145260cbd6a8226cef3dfef0c8baba31847beaebc7e6b65d39d02715fd4f4cab9b139b6c3772e550088d4f9ae80c6d3ed20b9a7664c693644dfb96b4cb60e67c  make-4.4.1.tar.gz
+"
diff --git a/main/makedepend/APKBUILD b/main/makedepend/APKBUILD
index d3427dea9e2..5481241aabd 100644
--- a/main/makedepend/APKBUILD
+++ b/main/makedepend/APKBUILD
@@ -1,18 +1,17 @@
 # Contributor:
-# Maintainer:
+# Maintainer: Steven Guikal <void@fluix.one>
 pkgname=makedepend
-pkgver=1.0.6
+pkgver=1.0.9
 pkgrel=0
 pkgdesc="utility for making makefile dependencies"
-url="http://www.freedesktop.org/"
+url="https://www.freedesktop.org/"
 arch="all"
-license="MIT"
-makedepends="xorgproto util-macros"
+license="MIT-open-group"
+makedepends="util-macros"
 subpackages="$pkgname-doc"
-source="https://www.x.org/releases/individual/util/makedepend-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/util/makedepend-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,13 +21,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42  makedepend-1.0.6.tar.bz2"
+sha512sums="
+68d289656314dc9f12c792d0e394cfbc95404a0d01155dbcb38313d451b506da48a3d44183f568a2cbb2b1d1da9e26703a0d92f2bb658f72fc968eeb03bf2fe8  makedepend-1.0.9.tar.xz
+"
diff --git a/main/man-pages-posix/APKBUILD b/main/man-pages-posix/APKBUILD
new file mode 100644
index 00000000000..42fd5b57dc3
--- /dev/null
+++ b/main/man-pages-posix/APKBUILD
@@ -0,0 +1,32 @@
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
+pkgname=man-pages-posix
+pkgver=2017a
+_majorver=${pkgver%*[a-z]}
+_minorver=${pkgver##${_majorver}}
+pkgrel=0
+pkgdesc="POSIX.1-$_majorver manual pages"
+url="https://mirrors.edge.kernel.org/pub/linux/docs/man-pages/man-pages-posix/"
+arch="noarch"
+license="custom"
+source="https://cdn.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-$_majorver-$_minorver.tar.xz"
+builddir="$srcdir/$pkgname-$_majorver"
+# just manpages
+options="!check"
+
+package() {
+	for sect in 0 1 3; do
+		sed -i "/^\.so /s/man${sect}p/man$sect/" man${sect}p/*
+		mkdir -p "$pkgdir"/usr/share/man/man${sect}
+		mv man${sect}p/* "$pkgdir"/usr/share/man/man$sect/
+	done
+	find "$pkgdir"/usr/share/man -name "*.[0-9]" -o -name "*.[0-9]p" \
+		| xargs gzip -9
+
+	install -Dm644 POSIX-COPYRIGHT \
+		"$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+
+sha512sums="
+dac6bd5bb3e1d5f8918bad3eb15e08eeb3e06ae160c04ccd5619bfb0c536139ac06faa62b6856656a1bb9a7496f3148e52a5227b83e4099be6e6b93230de211d  man-pages-posix-2017-a.tar.xz
+"
diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD
index 98addbc196b..190e84787a9 100644
--- a/main/man-pages/APKBUILD
+++ b/main/man-pages/APKBUILD
@@ -1,37 +1,42 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=man-pages
-pkgver=5.05
-_posixver=2013-a
+pkgver=6.06
 pkgrel=0
 pkgdesc="Linux man pages"
 url="https://www.kernel.org/doc/man-pages/"
 arch="noarch"
 license="GPL-2.0-or-later"
-options="!strip !check"
 source="https://cdn.kernel.org/pub/linux/docs/man-pages/man-pages-$pkgver.tar.xz
-	https://cdn.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-$_posixver.tar.xz
+	gnumakefile-shell.patch
+	no-install-T.patch
 	"
-
-build() {
-	mkdir man0
-	for sect in 0 1 3; do
-		sed -i "/^\.so /s/man${sect}p/man$sect/" \
-			"$srcdir"/$pkgname-posix-$_posixver/man${sect}p/*
-		mv "$srcdir"/$pkgname-posix-$_posixver/man${sect}p/* \
-			"$srcdir"/$pkgname-$pkgver/man$sect/
-	done
-}
+# just manpages
+options="!check"
 
 package() {
-	make prefix="$pkgdir"/usr install
-	find "$pkgdir"/usr/share/man -name "*.[0-9]" -o -name "*.[0-9]p" \
-		| xargs gzip -9
+	make LINK_PAGES=symlink SHELL=/bin/sh prefix="$pkgdir"/usr install
+	# skip things already zipped- find can iterate over new files made by -exec
+	find "$pkgdir"/usr/share/man -type f \
+		! -name "*.gz" \
+		-exec gzip -9 {} \+
+
+	# the symlink install links to non-gzipped
+	# installing with pre-gzipped form requires 'sponge'
+	# shellcheck disable=SC3045  # we aren't using dash
+	find "$pkgdir"/usr/share/man \( -type l -a ! -name "*.gz" \) -print0 | while IFS= read -r -d '' link; do
+		# append gz since gzipped
+		local target="$(readlink "$link")".gz
 
-	# provided by libiconv-doc
+		rm "$link"
+		ln -sfv "$target" "$link".gz
+	done
+
+	# provided by gnu-libiconv-doc
+	rm -f "$pkgdir"/usr/share/man/man1/iconv*
 	rm -f "$pkgdir"/usr/share/man/man3/iconv*
 
-	# provided by mdocml
+	# provided by mandoc
 	rm -f "$pkgdir"/usr/share/man/man7/man* \
 		"$pkgdir"/usr/share/man/man7/mdoc*
 
@@ -40,10 +45,10 @@ package() {
 		"$pkgdir"/usr/share/man/man8/tzselect* \
 		"$pkgdir"/usr/share/man/man8/zic* \
 		"$pkgdir"/usr/share/man/man8/zdump*
-
-	# provided by libbsd
-	rm -f "$pkgdir"/usr/share/man/man3/explicit_bzero*
 }
 
-sha512sums="4f1b9f69c44fb054de9834ad4356fc633416ce98285d137fc616967129f326c8dd28eba05d4fe12a385aced9ff478ed42dde777631be124b2ddc7569ee27a395  man-pages-5.05.tar.xz
-e6ec8eb57269fadf368aeaac31b5a98b9c71723d4d5cc189f9c4642d6e865c88e44f77481dccbdb72e31526488eb531f624d455016361687a834ccfcac19fa14  man-pages-posix-2013-a.tar.xz"
+sha512sums="
+c50b5a47cff5172e46752b61af4dd9f54ee0be88ab69bcc5914bd8ce5ddfaf7358143bea9f69bd6a45f0420eb5eb4596c2200109b23fe98a5221dd01e4a8ea15  man-pages-6.06.tar.xz
+1a11f3c6d15198e1eae7cc81c62fcecffce7a0a3690c1d00c312b749f4556b824dd8b87a96910da2936ecb94cefb52be8e957edaa38a201823629d66113c4b7d  gnumakefile-shell.patch
+ee68e51fc13f058410b95236ae7cc7217531af39e15f6ca6ff5595efa1a7d10e1ef17da1499114e5e03e77268bb9ba0fb6732bf53958c4de744c43baed435005  no-install-T.patch
+"
diff --git a/main/man-pages/gnumakefile-shell.patch b/main/man-pages/gnumakefile-shell.patch
new file mode 100644
index 00000000000..7825028e47a
--- /dev/null
+++ b/main/man-pages/gnumakefile-shell.patch
@@ -0,0 +1,13 @@
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -21,8 +21,8 @@
+ ########################################################################
+ 
+ 
+-SHELL := /usr/bin/env
+-.SHELLFLAGS := -S bash -Eeuo pipefail -c
++SHELL := /bin/sh
++.SHELLFLAGS := -Eeuo pipefail -c
+ 
+ 
+ MAKEFLAGS += --no-builtin-rules
diff --git a/main/man-pages/no-install-T.patch b/main/man-pages/no-install-T.patch
new file mode 100644
index 00000000000..4f41192eeed
--- /dev/null
+++ b/main/man-pages/no-install-T.patch
@@ -0,0 +1,33 @@
+--- a/share/mk/dist.mk
++++ b/share/mk/dist.mk
+@@ -49,7 +49,7 @@
+ 	<$< \
+ 	$(SED) "/^.TH/s/(date)/$$(git log --format=%cs -1 -- $< $(HIDE_ERR))/" \
+ 	| $(SED) '/^.TH/s/(unreleased)/$(DISTVERSION)/' \
+-	| $(INSTALL_DATA) -T /dev/stdin $@
++	| $(INSTALL_DATA) /dev/stdin $@
+ 
+ $(_DISTOTHERS): $(_DISTDIR)/%: $(srcdir)/% $(MK) | $$(@D)/
+ 	$(info CP	$@)
+--- a/share/mk/install/html.mk
++++ b/share/mk/install/html.mk
+@@ -23,7 +23,7 @@
+ 
+ $(_htmlpages): $(_htmldir)/%: $(_HTMLDIR)/% $(MK) | $$(@D)/
+ 	$(info INSTALL	$@)
+-	$(INSTALL_DATA) -T $< $@
++	$(INSTALL_DATA) $< $@
+ 
+ 
+ .PHONY: install-html
+--- a/share/mk/install/man.mk
++++ b/share/mk/install/man.mk
+@@ -63,7 +63,7 @@
+ 	<$< \
+ 	$(SED) $(foreach s, $(MANSECTIONS), \
+ 		-e '/^\.so /s, man$(s)/\(.*\)\.$(s)$$, $(notdir $(man$(s)dir))/\1$(man$(s)ext)$(Z),') \
+-	| $(INSTALL_DATA) -T /dev/stdin $@
++	| $(INSTALL_DATA) /dev/stdin $@
+ ifeq ($(LINK_PAGES),symlink)
+ 	if $(GREP) '^\.so ' <$@ >/dev/null; then \
+ 		$(GREP) '^\.so ' <$@ \
diff --git a/main/mandoc/APKBUILD b/main/mandoc/APKBUILD
new file mode 100644
index 00000000000..5f88c7658e8
--- /dev/null
+++ b/main/mandoc/APKBUILD
@@ -0,0 +1,71 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=mandoc
+pkgver=1.14.6
+pkgrel=13
+pkgdesc="mandoc (formerly mdocml) UNIX manpage compiler toolset"
+url="https://mandoc.bsd.lv/"
+arch="all"
+license="ISC"
+makedepends="zlib-dev"
+checkdepends="perl"
+install="$pkgname-apropos.post-deinstall"
+triggers="$pkgname-apropos.trigger=/usr/share/man/*"
+replaces="mdocml"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-apropos $pkgname-soelim"
+source="https://mandoc.bsd.lv/snapshots/mandoc-$pkgver.tar.gz
+	dynamic-tagfile-support.patch
+	shared-libmandoc.patch
+	outdated-warn-disable.patch
+	"
+
+# higher than community/man-db for this
+provides="doc-provider mdocml=$pkgver-r$pkgrel"
+provider_priority=100
+
+prepare() {
+	default_prepare
+
+	cat >configure.local<<-__EOF__
+	PREFIX=/usr
+	MANDIR=/usr/share/man
+	LIBDIR=/usr/lib
+	CFLAGS="$CFLAGS"
+	UTF8_LOCALE="en_US.UTF-8"
+	MANPATH_DEFAULT="/usr/share/man:/usr/local/man:/usr/local/share/man"
+	MANPATH_BASE="/usr/share/man"
+	LN="ln -sf"
+__EOF__
+}
+
+build() {
+	./configure
+	make
+}
+
+check() {
+	LD_LIBRARY_PATH="$builddir" make regress
+}
+
+package() {
+	make -j1 DESTDIR="$pkgdir" base-install lib-install
+}
+
+apropos() {
+	pkgdesc="makewhatis/whatis and apropos tools and index"
+	amove usr/bin/apropos usr/bin/whatis usr/sbin/makewhatis
+}
+
+soelim() {
+	pkgdesc="so elimination tool"
+	depends=""
+	amove usr/bin/soelim
+}
+
+sha512sums="
+54286070812a47b629f68757046d3c9a1bdd2b5d1c3b84a5c8e4cb92f1331afa745443f7238175835d8cfbe5b8dd442e00c75c3a5b5b8f8efd8d2ec8f636dad4  mandoc-1.14.6.tar.gz
+d84afd0f462dc3c00753f3db5b2690d8f0954b51f5b679667a75f8ea34cb3d2e961d732218b8c1c3a39c209df70ab273b583c4899c56482e7f8761c4b9fea02c  dynamic-tagfile-support.patch
+b512bcb8bae11853a3006e2122d7e652806d4bf2234638d8809fd823375b5b0bd590f7d6a90412baffcc3b7b6a0f197a10986728a70f24fe628f91bfb651d266  shared-libmandoc.patch
+6eda39920cccb1238b104bb90ac4be2c32883897c72363560d8d39345819cdeff535680e78396052b2b8f981e169ad9b3c30da724def80a1501785d82ce7fa25  outdated-warn-disable.patch
+"
diff --git a/main/mandoc/dynamic-tagfile-support.patch b/main/mandoc/dynamic-tagfile-support.patch
new file mode 100644
index 00000000000..7294d5582ae
--- /dev/null
+++ b/main/mandoc/dynamic-tagfile-support.patch
@@ -0,0 +1,131 @@
+BusyBox less doesn't support tag files (-T option), hence we previously
+disabled tag file support in mandoc at compile-time (HAVE_LESS_T).
+However, on Alpine it is entirely possible to replace BusyBox less with
+an implementation that supports tag files (e.g. main/less). In order to
+support tag files when such an implementation is installed, we need to
+detect at runtime whether -T is supported.
+
+This patch achieves this by invoking the pager once with -T beforehand
+and checking if it terminates with a non-zero exit status.
+
+diff -upr mandoc-1.14.6.orig/configure mandoc-1.14.6/configure
+--- mandoc-1.14.6.orig/configure	2023-07-02 19:38:31.011639507 +0200
++++ mandoc-1.14.6/configure	2023-07-02 19:38:41.794998501 +0200
+@@ -67,7 +67,6 @@ HAVE_FTS_COMPARE_CONST=
+ HAVE_GETLINE=
+ HAVE_GETSUBOPT=
+ HAVE_ISBLANK=
+-HAVE_LESS_T=
+ HAVE_MKDTEMP=
+ HAVE_MKSTEMPS=
+ HAVE_NANOSLEEP=
+@@ -363,21 +362,6 @@ fi
+ echo "selected BINM_PAGER=${BINM_PAGER}${manual}" 1>&2
+ echo "selected BINM_PAGER=${BINM_PAGER}${manual}" 1>&3
+ 
+-# --- tagging support in the pager ---
+-if ismanual "${BINM_PAGER} -T" LESS_T ${HAVE_LESS_T}; then
+-	:
+-elif ${BINM_PAGER} -T /dev/null test-noop.c 1>/dev/null 2>&3; then
+-	HAVE_LESS_T=1
+-	echo "tested ${BINM_PAGER} -T: yes" 1>&2
+-	echo "tested ${BINM_PAGER} -T: yes" 1>&3
+-	echo 1>&3
+-else
+-	HAVE_LESS_T=0
+-	echo "tested ${BINM_PAGER} -T: no" 1>&2
+-	echo "tested ${BINM_PAGER} -T: no" 1>&3
+-	echo 1>&3
+-fi
+-
+ # --- wide character and locale support ---
+ if get_locale; then
+ 	runtest wchar WCHAR "-DUTF8_LOCALE=\"${UTF8_LOCALE}\"" \
+@@ -484,7 +468,6 @@ cat << __HEREDOC__
+ #define HAVE_GETLINE ${HAVE_GETLINE}
+ #define HAVE_GETSUBOPT ${HAVE_GETSUBOPT}
+ #define HAVE_ISBLANK ${HAVE_ISBLANK}
+-#define HAVE_LESS_T ${HAVE_LESS_T}
+ #define HAVE_MKDTEMP ${HAVE_MKDTEMP}
+ #define HAVE_MKSTEMPS ${HAVE_MKSTEMPS}
+ #define HAVE_NTOHL ${HAVE_NTOHL}
+diff -upr mandoc-1.14.6.orig/main.c mandoc-1.14.6/main.c
+--- mandoc-1.14.6.orig/main.c	2023-07-02 19:38:31.011639507 +0200
++++ mandoc-1.14.6/main.c	2023-07-02 19:38:50.635019538 +0200
+@@ -1271,6 +1271,44 @@ run_pager(struct outstate *outst, char *
+ 	}
+ }
+ 
++static int
++supports_tags(const char *pager, char *tagfile)
++{
++	int	fd;
++	pid_t	pid;
++	int	wstatus;
++
++	if (strcmp(pager, "less") != 0)
++		return 0;
++
++	pid = fork();
++	switch (pid) {
++	case -1:
++		err(1, "fork");
++	case 0:
++		close(STDIN_FILENO);
++		fd = open("/dev/null", O_RDWR);
++		if (fd == -1)
++			err(1, "open");
++		assert(fd == STDIN_FILENO);
++
++		close(STDOUT_FILENO);
++		dup2(fd, STDOUT_FILENO);
++		close(STDERR_FILENO);
++		dup2(fd, STDERR_FILENO);
++
++		/* If the pager doesn't support -T we expect a non-zero exit code */
++		execlp(pager, pager, "-T", tagfile, "-", (char *)NULL);
++		exit(EXIT_FAILURE);
++	default:
++		if (waitpid(pid, &wstatus, 0) == -1)
++			err(1, "waitpid");
++		break;
++	}
++
++	return wstatus == EXIT_SUCCESS;
++}
++
+ static pid_t
+ spawn_pager(struct outstate *outst, char *tag_target)
+ {
+@@ -1279,9 +1317,7 @@ spawn_pager(struct outstate *outst, char
+ 	char		*argv[MAX_PAGER_ARGS];
+ 	const char	*pager;
+ 	char		*cp;
+-#if HAVE_LESS_T
+ 	size_t		 cmdlen;
+-#endif
+ 	int		 argc, use_ofn;
+ 	pid_t		 pager_pid;
+ 
+@@ -1316,11 +1352,10 @@ spawn_pager(struct outstate *outst, char
+ 	/* For less(1), use the tag file. */
+ 
+ 	use_ofn = 1;
+-#if HAVE_LESS_T
+ 	if (*outst->tag_files->tfn != '\0' &&
+ 	    (cmdlen = strlen(argv[0])) >= 4) {
+ 		cp = argv[0] + cmdlen - 4;
+-		if (strcmp(cp, "less") == 0) {
++		if (supports_tags(pager, outst->tag_files->tfn)) {
+ 			argv[argc++] = mandoc_strdup("-T");
+ 			argv[argc++] = outst->tag_files->tfn;
+ 			if (tag_target != NULL) {
+@@ -1330,7 +1365,7 @@ spawn_pager(struct outstate *outst, char
+ 			}
+ 		}
+ 	}
+-#endif
++
+ 	if (use_ofn) {
+ 		if (outst->outtype == OUTT_HTML && tag_target != NULL)
+ 			mandoc_asprintf(&argv[argc], "file://%s#%s",
diff --git a/main/mdocml/mdocml.post-deinstall b/main/mandoc/mandoc-apropos.post-deinstall
index 77b2574d861..77b2574d861 100644
--- a/main/mdocml/mdocml.post-deinstall
+++ b/main/mandoc/mandoc-apropos.post-deinstall
diff --git a/main/mandoc/mandoc-apropos.trigger b/main/mandoc/mandoc-apropos.trigger
new file mode 100644
index 00000000000..ce19526f750
--- /dev/null
+++ b/main/mandoc/mandoc-apropos.trigger
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+nohup nice sh -c "( flock 9 && /usr/sbin/makewhatis -T utf8 ) 9>/tmp/makewhatis.lock" \
+	>/dev/null 2>&1 &
diff --git a/main/mandoc/outdated-warn-disable.patch b/main/mandoc/outdated-warn-disable.patch
new file mode 100644
index 00000000000..6c58d841467
--- /dev/null
+++ b/main/mandoc/outdated-warn-disable.patch
@@ -0,0 +1,17 @@
+On Alpine, apropos(1) is available in a separate subpackages and not
+installed by default. For this reason, having this warning enabled by
+default does not make much sense since we don't use mandoc.db by
+default.
+
+diff -upr a/main.c b/main.c
+--- a/main.c	2021-09-19 18:21:40.000000000 +0200
++++ b/main.c	2021-09-19 19:40:28.711594083 +0200
+@@ -822,8 +822,6 @@ fs_lookup(const struct manpaths *paths,
+ 	return globres;
+ 
+ found:
+-	warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s",
+-	    name, sec, BINM_MAKEWHATIS, paths->paths[ipath]);
+ 	if (res == NULL)
+ 		free(file);
+ 	else if (file == NULL)
diff --git a/main/mandoc/shared-libmandoc.patch b/main/mandoc/shared-libmandoc.patch
new file mode 100644
index 00000000000..607934c9525
--- /dev/null
+++ b/main/mandoc/shared-libmandoc.patch
@@ -0,0 +1,92 @@
+This patch links libmandoc dynamically instead of statically, this
+causes the package size to be reduced by roughly 50%.
+
+See also: https://inbox.vuxu.org/mandoc-tech/2L1YC2WD8JUE5.3QGU3CQ10EGCD@8pit.net/T/#u
+
+diff --git a/Makefile b/Makefile
+index 48c4741..252e11e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -367,9 +367,13 @@ WWW_INCS	 = eqn.h.html \
+ 		   tbl_int.h.html \
+ 		   tbl_parse.h.html
+ 
++LIBMANDOC	= libmandoc.so
++MANDOCLIB	= -L. -lmandoc
++
+ # === USER CONFIGURATION ===============================================
+ 
+ include Makefile.local
++CFLAGS		+= -fPIC
+ 
+ # === DEPENDENCY HANDLING ==============================================
+ 
+@@ -392,7 +396,7 @@ distclean: clean
+ 	rm -f Makefile.local config.h config.h.old config.log config.log.old
+ 
+ clean:
+-	rm -f libmandoc.a $(LIBMANDOC_OBJS) $(ALL_COBJS)
++	rm -f $(LIBMANDOC) $(LIBMANDOC_OBJS) $(ALL_COBJS)
+ 	rm -f mandoc man $(MAIN_OBJS)
+ 	rm -f man.cgi $(CGI_OBJS)
+ 	rm -f mandocd catman catman.o $(MANDOCD_OBJS)
+@@ -432,11 +436,11 @@ base-install: mandoc demandoc soelim
+ 	$(INSTALL_MAN) makewhatis.8 \
+ 		$(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8
+ 
+-lib-install: libmandoc.a
++lib-install: $(LIBMANDOC)
+ 	mkdir -p $(DESTDIR)$(LIBDIR)
+ 	mkdir -p $(DESTDIR)$(INCLUDEDIR)
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man3
+-	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
++	$(INSTALL_LIB) $(LIBMANDOC) $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_LIB) eqn.h man.h mandoc.h mandoc_aux.h mandoc_parse.h \
+ 		mdoc.h roff.h tbl.h $(DESTDIR)$(INCLUDEDIR)
+ 	$(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
+@@ -485,7 +489,7 @@ uninstall:
+ 	rm -f $(DESTDIR)$(SBINDIR)/$(BINM_CATMAN)
+ 	rm -f $(DESTDIR)$(MANDIR)/man8/mandocd.8
+ 	rm -f $(DESTDIR)$(MANDIR)/man8/$(BINM_CATMAN).8
+-	rm -f $(DESTDIR)$(LIBDIR)/libmandoc.a
++	rm -f $(DESTDIR)$(LIBDIR)/$(LIBMANDOC)
+ 	rm -f $(DESTDIR)$(MANDIR)/man3/mandoc.3
+ 	rm -f $(DESTDIR)$(MANDIR)/man3/mandoc_escape.3
+ 	rm -f $(DESTDIR)$(MANDIR)/man3/mandoc_malloc.3
+@@ -515,23 +519,26 @@ Makefile.local config.h: configure $(TESTSRCS)
+ libmandoc.a: $(MANDOC_COBJS) $(LIBMANDOC_OBJS)
+ 	$(AR) rs $@ $(MANDOC_COBJS) $(LIBMANDOC_OBJS)
+ 
+-mandoc: $(MAIN_OBJS) libmandoc.a
+-	$(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) libmandoc.a $(LDADD)
++libmandoc.so: $(MANDOC_COBJS) $(LIBMANDOC_OBJS)
++	$(CC) $(LDFLAGS) -shared -o $@ $(MANDOC_COBJS) $(LIBMANDOC_OBJS) $(LDADD)
++
++mandoc: $(MAIN_OBJS) $(LIBMANDOC)
++	$(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) $(MANDOCLIB) $(LDADD)
+ 
+ man: mandoc
+ 	$(LN) mandoc man
+ 
+-man.cgi: $(CGI_OBJS) libmandoc.a
+-	$(CC) $(STATIC) -o $@ $(LDFLAGS) $(CGI_OBJS) libmandoc.a $(LDADD)
++man.cgi: $(CGI_OBJS) $(LIBMANDOC)
++	$(CC) $(STATIC) -o $@ $(LDFLAGS) $(CGI_OBJS) $(MANDOCLIB) $(LDADD)
+ 
+-mandocd: $(MANDOCD_OBJS) libmandoc.a
+-	$(CC) -o $@ $(LDFLAGS) $(MANDOCD_OBJS) libmandoc.a $(LDADD)
++mandocd: $(MANDOCD_OBJS) $(LIBMANDOC)
++	$(CC) -o $@ $(LDFLAGS) $(MANDOCD_OBJS) $(MANDOCLIB) $(LDADD)
+ 
+-catman: catman.o libmandoc.a
+-	$(CC) -o $@ $(LDFLAGS) catman.o libmandoc.a $(LDADD)
++catman: catman.o $(LIBMANDOC)
++	$(CC) -o $@ $(LDFLAGS) catman.o $(MANDOCLIB) $(LDADD)
+ 
+-demandoc: $(DEMANDOC_OBJS) libmandoc.a
+-	$(CC) -o $@ $(LDFLAGS) $(DEMANDOC_OBJS) libmandoc.a $(LDADD)
++demandoc: $(DEMANDOC_OBJS) $(LIBMANDOC)
++	$(CC) -o $@ $(LDFLAGS) $(DEMANDOC_OBJS) $(MANDOCLIB) $(LDADD)
+ 
+ soelim: $(SOELIM_COBJS) soelim.o
+ 	$(CC) -o $@ $(LDFLAGS) $(SOELIM_COBJS) soelim.o
diff --git a/main/mariadb-connector-c/APKBUILD b/main/mariadb-connector-c/APKBUILD
index 7abe735e3cd..29348ae750a 100644
--- a/main/mariadb-connector-c/APKBUILD
+++ b/main/mariadb-connector-c/APKBUILD
@@ -1,33 +1,33 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mariadb-connector-c
-pkgver=3.1.7
-pkgrel=1
+pkgver=3.3.9
+pkgrel=0
 pkgdesc="The MariaDB Native Client library (C driver)"
 url="https://mariadb.org/"
 arch="all"
 license="LGPL-2.1-or-later"
-depends_dev="openssl-dev zlib-dev"
-makedepends="$depends_dev cmake"
+depends_dev="openssl-dev>3 zlib-dev"
+makedepends="$depends_dev cmake samurai"
+options="!check" # no testsuite
 replaces="mariadb-client-libs"
 subpackages="$pkgname-dev"
-source="https://downloads.mariadb.org/interstitial/connector-c-$pkgver/mariadb-connector-c-$pkgver-src.tar.gz
-	cmake.patch
-	fix-ucontext-header.patch
+source="$pkgname-$pkgver.tar.gz::https://github.com/mariadb-corporation/mariadb-connector-c/archive/refs/tags/v$pkgver.tar.gz
+	incorrect-sys-poll.patch
+	unused-parameter.patch
 	"
-builddir="$srcdir/mariadb-connector-c-$pkgver-src"
 
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
-	cmake \
-		-DCMAKE_BUILD_TYPE=None \
+
+	# INSTALL_LIBDIR and INSTALL_INCLUDEDIR are relative to CMAKE_INSTALL_PREFIX.
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DBUILD_SHARED_LIBS=True \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DINSTALL_LIBDIR=/usr/lib \
-		-DINSTALL_INCLUDEDIR=/usr/include/mysql \
+		-DINSTALL_LIBDIR=lib \
+		-DINSTALL_INCLUDEDIR=include/mysql \
 		\
 		-DMARIADB_PORT=3306 \
 		-DMARIADB_UNIX_ADDR=/run/mysqld/mysqld.sock \
@@ -35,15 +35,18 @@ build() {
 		-DWITH_MYSQLCOMPAT=ON \
 		-DWITH_SSL=OPENSSL \
 		$CMAKE_CROSSOPTS
-	make
+	cmake --build build
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 
 	# purge static libs
 	rm "$pkgdir"/usr/lib/*.a
 
+	# Docs conflict with mariadb-doc
+	rm -r "$pkgdir"/usr/man
+
 	# compat symlinks
 	ln -s mariadb_config "$pkgdir"/usr/bin/mysql_config
 	ln -s mariadb_version.h "$pkgdir"/usr/include/mysql/mysql_version.h
@@ -55,6 +58,8 @@ dev() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-sha512sums="0b7f6497b6b88b2bbcb870b7c3a8f3fe0bf547c6b5d9b95cc99423aa8ea02ac510c5fb71079e7cd79a49741c7f26f3e68c39e245b18fab46754e8640f79ff670  mariadb-connector-c-3.1.7-src.tar.gz
-a3a1ec5fa984cd4a3545436c8a6f3cd5495bc2c0644ed11dd8957df399f72c9b4545f65b255909d31732b73513fe40bac98f2bffd3180ecfff22efd5ce1d38f0  cmake.patch
-757a2d3531ee271cf5473671bf4d0ac07dc8eb94ab4b6ede848ba7a55415a77f90e7275103be91c73e343e94cdbf2cd652eb6cef6ed48917991733d60d3b8777  fix-ucontext-header.patch"
+sha512sums="
+2365628248d83fdb31ad8aedc2209aaa855262d799183dbc6445d3419f3b769d782232d590add33e7aa2b9d226417a9cdf65707bb95768a60b5215d839d6c55b  mariadb-connector-c-3.3.9.tar.gz
+ca55213d91a1495cc85a972528820af058ea194073f050389fbac829e077fc179fa7c0422b18953ebe7751379af7e670a5fffef9bd642cd2051d35e0410ab4f3  incorrect-sys-poll.patch
+1e71e01ffb2a95833ae08fe6bb72c75f762b57ea5919d27be518e40c4cb1dee16ac2609fe4a663a1ca7781523046285ab1c757b5c82bce42ef4b5ecd75d5ed90  unused-parameter.patch
+"
diff --git a/main/mariadb-connector-c/cmake.patch b/main/mariadb-connector-c/cmake.patch
deleted file mode 100644
index 8e47ac31026..00000000000
--- a/main/mariadb-connector-c/cmake.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Summary: Fix include and libs path in mariadb_config
-----
-
---- a/mariadb_config/mariadb_config.c.in
-+++ b/mariadb_config/mariadb_config.c.in
-@@ -5,8 +5,8 @@
-
- static char *mariadb_progname;
-
--#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
--#define LIBS    "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb"
-+#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mysql"
-+#define LIBS    "-L@INSTALL_LIBDIR@/ -lmariadb"
- #define LIBS_SYS "@extra_dynamic_LDFLAGS@"
- #define CFLAGS  INCLUDE
- #define VERSION "@MARIADB_CLIENT_VERSION@"
diff --git a/main/mariadb-connector-c/fix-ucontext-header.patch b/main/mariadb-connector-c/fix-ucontext-header.patch
deleted file mode 100644
index 8e409729b52..00000000000
--- a/main/mariadb-connector-c/fix-ucontext-header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/CheckIncludeFiles.cmake
-+++ b/cmake/CheckIncludeFiles.cmake
-@@ -46,4 +46,7 @@
- CHECK_INCLUDE_FILES (sys/un.h HAVE_SYS_UN_H)
- CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H)
- CHECK_INCLUDE_FILES (utime.h HAVE_UTIME_H)
--CHECK_INCLUDE_FILES (ucontext.h HAVE_UCONTEXT_H)
-+CHECK_INCLUDE_FILES (ucontext.h HAVE_UCONTEXT_HEADER)
-+IF(HAVE_UCONTEXT_HEADER)
-+  CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H)
-+ENDIF(HAVE_UCONTEXT_HEADER)
diff --git a/main/mariadb-connector-c/incorrect-sys-poll.patch b/main/mariadb-connector-c/incorrect-sys-poll.patch
new file mode 100644
index 00000000000..8a1a53acee5
--- /dev/null
+++ b/main/mariadb-connector-c/incorrect-sys-poll.patch
@@ -0,0 +1,11 @@
+--- a/plugins/pvio/pvio_socket.c
++++ b/plugins/pvio/pvio_socket.c
+@@ -39,7 +39,7 @@
+ #include <sys/un.h>
+ #endif
+ #ifdef HAVE_POLL
+-#include <sys/poll.h>
++#include <poll.h>
+ #endif
+ #ifdef HAVE_SYS_IOCTL_H
+ #include <sys/ioctl.h>
diff --git a/main/mariadb-connector-c/unused-parameter.patch b/main/mariadb-connector-c/unused-parameter.patch
new file mode 100644
index 00000000000..6200bf53aa7
--- /dev/null
+++ b/main/mariadb-connector-c/unused-parameter.patch
@@ -0,0 +1,25 @@
+These functions are implemented in assembly for x86 and x86_64.
+On other architectures, they are no-ops, and so parameters are unused.
+
+Starting from version 3.3.7, mariadb-connector-c is compiled with "-Werror"
+turned on, so allow unused parameters here with GCC's Diagnostic Pragma:
+https://gcc.gnu.org/onlinedocs/gcc/Diagnostic-Pragmas.html
+
+--- a/libmariadb/ma_context.c
++++ b/libmariadb/ma_context.c
+@@ -692,6 +692,9 @@
+ #endif  /* MY_CONTEXT_USE_WIN32_FIBERS */
+ 
+ #ifdef MY_CONTEXT_DISABLE
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wunused-parameter"
++
+ int
+ my_context_continue(struct my_context *c)
+ {
+@@ -723,4 +726,5 @@
+ {
+ }
+ 
++#pragma GCC diagnostic pop
+ #endif
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD
index 96e9f82559b..8380a6c1065 100644
--- a/main/mariadb/APKBUILD
+++ b/main/mariadb/APKBUILD
@@ -1,13 +1,13 @@
 # Contributor: Sergei Lukin <sergej.lukin@gmail.com>
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Contributor: TBK <alpine@jjtc.eu>
 # Contributor: Marcel Haazen <marcel@haazen.xyz>
 # Contributor: Jake Buchholz <tomalok@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mariadb
-pkgver=10.4.12
+pkgver=10.11.7
 pkgrel=0
 pkgdesc="A fast SQL database server"
 url="https://www.mariadb.org/"
@@ -16,17 +16,58 @@ pkggroups="mysql"
 arch="all"
 license="GPL-2.0-or-later"
 depends="$pkgname-common"
-_mytopdeps="perl perl-dbi perl-dbd-mysql perl-getopt-long perl-socket perl-term-readkey"
-depends_dev="openssl-dev zlib-dev mariadb-connector-c-dev"
-makedepends="$depends_dev bison cmake curl-dev libaio-dev libarchive-dev libevent-dev
-	libxml2-dev ncurses-dev pcre-dev readline-dev xz-dev linux-headers linux-pam-dev
-	$_mytopdeps"
+_mytopdeps="
+	perl
+	perl-dbd-mysql
+	perl-dbi
+	perl-getopt-long
+	perl-socket
+	perl-term-readkey
+	"
+depends_dev="
+	fmt-dev
+	mariadb-connector-c-dev
+	openssl-dev
+	zlib-dev
+	"
+makedepends="
+	$_mytopdeps
+	$depends_dev
+	bison
+	cmake
+	curl-dev
+	libaio-dev
+	libarchive-dev
+	libevent-dev
+	libxml2-dev
+	linux-headers
+	linux-pam-dev
+	ncurses-dev
+	pcre2-dev
+	readline-dev
+	samurai
+	xz-dev
+	zstd-dev
+	"
 install="$pkgname.pre-install $pkgname-common.post-upgrade"
-subpackages="$pkgname-static $pkgname-test:mytest $pkgname-embedded-dev:_embedded_dev
-	$pkgname-doc $pkgname-dev $pkgname-common $pkgname-openrc
-	$pkgname-client $pkgname-bench $pkgname-backup $pkgname-embedded $pkgname-mytop
+subpackages="
+	$pkgname-static
+	$pkgname-test:mytest
+	$pkgname-embedded-dev:_embedded_dev
+	$pkgname-doc
+	$pkgname-dev
+	$pkgname-common
+	$pkgname-openrc
+	$pkgname-client
+	$pkgname-bench
+	$pkgname-backup
+	$pkgname-embedded
+	$pkgname-mytop
 	$pkgname-server-utils:_server_utils
-	mysql mysql-client:_compat_client mysql-bench:_compat_bench"
+	mysql
+	mysql-client:_compat_client
+	mysql-bench:_compat_bench
+	"
 options="suid"
 
 case "$CARCH" in
@@ -37,16 +78,96 @@ case "$CARCH" in
 		;;
 esac
 
-source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
+case "$CARCH" in
+	armv7|s390x)
+		# FIXME: sigbus armv7, sigsegv s390x
+		# test-aes
+		options="$options !check"
+		;;
+esac
+
+source="https://rsync.osuosl.org/pub/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
 	$pkgname.initd
-	pcre.cmake.patch
+	gcc13.patch
+	lfs64.patch
 	ppc-remove-glibc-dep.patch
 	disable-failing-test.patch
+	have_stacktrace.patch
+	revert-c432c9ef.patch
 	"
-# dbug test fails under rootbld
-#options="!check"
 
 # secfixes:
+#   10.11.6-r0:
+#     - CVE-2023-22084
+#   10.6.9-r0:
+#     - CVE-2018-25032
+#     - CVE-2022-32081
+#     - CVE-2022-32082
+#     - CVE-2022-32084
+#     - CVE-2022-32089
+#     - CVE-2022-32091
+#   10.6.8-r0:
+#     - CVE-2022-27376
+#     - CVE-2022-27377
+#     - CVE-2022-27378
+#     - CVE-2022-27379
+#     - CVE-2022-27380
+#     - CVE-2022-27381
+#     - CVE-2022-27382
+#     - CVE-2022-27383
+#     - CVE-2022-27384
+#     - CVE-2022-27386
+#     - CVE-2022-27387
+#     - CVE-2022-27444
+#     - CVE-2022-27445
+#     - CVE-2022-27446
+#     - CVE-2022-27447
+#     - CVE-2022-27448
+#     - CVE-2022-27449
+#     - CVE-2022-27451
+#     - CVE-2022-27452
+#     - CVE-2022-27455
+#     - CVE-2022-27456
+#     - CVE-2022-27457
+#     - CVE-2022-27458
+#   10.6.7-r0:
+#     - CVE-2021-46659
+#     - CVE-2021-46661
+#     - CVE-2021-46662
+#     - CVE-2021-46663
+#     - CVE-2021-46664
+#     - CVE-2021-46665
+#     - CVE-2021-46667
+#     - CVE-2021-46668
+#     - CVE-2022-24048
+#     - CVE-2022-24050
+#     - CVE-2022-24051
+#     - CVE-2022-24052
+#     - CVE-2022-27385
+#     - CVE-2022-31621
+#     - CVE-2022-31622
+#     - CVE-2022-31623
+#     - CVE-2022-31624
+#   10.6.4-r0:
+#     - CVE-2021-2372
+#     - CVE-2021-2389
+#   10.5.11-r0:
+#     - CVE-2021-2154
+#     - CVE-2021-2166
+#   10.5.9-r0:
+#     - CVE-2021-27928
+#   10.5.8-r0:
+#     - CVE-2020-14765
+#     - CVE-2020-14776
+#     - CVE-2020-14789
+#     - CVE-2020-14812
+#   10.5.6-r0:
+#     - CVE-2020-15180
+#   10.4.13-r0:
+#     - CVE-2020-2752
+#     - CVE-2020-2760
+#     - CVE-2020-2812
+#     - CVE-2020-2814
 #   10.4.12-r0:
 #     - CVE-2020-2574
 #   10.4.10-r0:
@@ -114,17 +235,21 @@ source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariad
 # Available plugins https://mariadb.com/kb/en/library/list-of-plugins/
 # All cmake configuration options can be displayed with: cmake ../server -LH
 build() {
-	cmake . -DBUILD_CONFIG=mysql_release \
+	# set MinSizeRel as otherwise project enables debugging for some parts
+	cmake -B build -G Ninja -Wno-dev \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCOMPILATION_COMMENT="Alpine Linux" \
 		-DSYSCONFDIR=/etc \
 		-DSYSCONF2DIR=/etc/my.cnf.d \
 		-DMYSQL_DATADIR=/var/lib/mysql \
-		-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
+		-DINSTALL_UNIX_ADDRDIR=/run/mysqld/mysqld.sock \
 		-DDEFAULT_CHARSET=utf8mb4 \
 		-DDEFAULT_COLLATION=utf8mb4_general_ci \
 		-DENABLED_LOCAL_INFILE=ON \
 		-DINSTALL_INFODIR=share/info \
 		-DINSTALL_MANDIR=share/man \
+		-DINSTALL_PAMDIR=/lib/security \
 		-DINSTALL_PLUGINDIR=lib/$pkgname/plugin \
 		-DINSTALL_SCRIPTDIR=bin \
 		-DINSTALL_INCLUDEDIR=include/mysql \
@@ -145,7 +270,7 @@ build() {
 		-DPLUGIN_MYISAM=YES \
 		-DPLUGIN_MROONGA=NO \
 		-DPLUGIN_OQGRAPH=NO \
-		-DPLUGIN_PARTITION=YES \
+		-DPLUGIN_PARTITION=STATIC \
 		-DPLUGIN_ROCKSDB=$_enable_rocksdb \
 		-DPLUGIN_SPHINX=NO \
 		-DPLUGIN_TOKUDB=NO \
@@ -163,10 +288,11 @@ build() {
 		-DWITH_ROCKSDB_BZIP2=OFF \
 		-DWITH_ROCKSDB_JEMALLOC=OFF \
 		-DWITH_ROCKSDB_LZ4=OFF \
-		-DWITH_ROCKSDB_ZSTD=OFF \
+		-DWITH_ROCKSDB_ZSTD=ON \
 		-DWITH_ROCKSDB_SNAPPY=OFF \
 		-DWITH_JEMALLOC=NO \
 		-DWITH_LIBARCHIVE=system \
+		-DWITH_LIBFMT=system \
 		-DWITH_LIBNUMA=NO \
 		-DWITH_LIBWRAP=OFF \
 		-DWITH_LIBWSEP=OFF \
@@ -179,21 +305,18 @@ build() {
 		-DWITH_ZLIB=system \
 		-DSKIP_TESTS=ON # Disables the client lib tests since a running server is needed
 
-	# print config options to log
-	cmake -L
-
-	make
+	cmake --build build
 }
 
 check() {
 	# exclude test-connect which seems to be buggy. testsuite does not set port env var
-	ctest -E '(test-connect)'
+	ctest --test-dir build --output-on-failure -E '(test-connect|mf_iocache)' -j${JOBS:-2}
 }
 
 package() {
-	make DESTDIR="$pkgdir/" install
+	DESTDIR="$pkgdir/" cmake --install build
 
-	install -Dm 755 "$startdir"/$pkgname.initd \
+	install -Dm 755 "$srcdir"/$pkgname.initd \
 		"$pkgdir"/etc/init.d/$pkgname
 	mkdir -p "$pkgdir"/etc/my.cnf.d
 
@@ -204,7 +327,6 @@ package() {
 	ln -s ../../../../bin/my_safe_process \
 		"$pkgdir"/usr/mysql-test/lib/My/SafeProcess/my_safe_process
 
-
 	# remove files provided by mariadb-connector-c
 	rm \
 		"$pkgdir"/usr/bin/mariadb_config \
@@ -235,6 +357,8 @@ package() {
 		"$pkgdir"/usr/lib/libmariadb.so* \
 		"$pkgdir"/usr/lib/pkgconfig/libmariadb.pc
 
+	install -d -m750 -o mysql -g mysql "$pkgdir"/usr/lib/mysql
+
 	cat >"$pkgdir"/etc/my.cnf<<-EOF
 	# This group is read both both by the client and the server
 	# use it for options that affect everything
@@ -288,10 +412,10 @@ package() {
 	# you can put MariaDB-only options here
 	[mariadb]
 
-	# This group is only read by MariaDB-10.3 servers.
+	# This group is only read by MariaDB-10.5 servers.
 	# If you use the same .cnf file for MariaDB of different versions,
 	# use this group for options that older servers don't understand
-	[mariadb-10.3]
+	[mariadb-10.5]
 
 	EOF
 }
@@ -307,50 +431,49 @@ common() {
 	pkgdesc="MariaDB common files for both server and client"
 	replaces="mysql-common"
 	depends=
-	mkdir -p "$subpkgdir"/usr/share/$pkgname \
-		"$subpkgdir"/etc/mysql \
-		"$subpkgdir"/usr/lib/$pkgname/plugin
-	mv "$pkgdir"/etc/my.* "$subpkgdir"/etc/
+	mkdir -p "$subpkgdir"/usr/lib/$pkgname/plugin
+
+	amove etc/my.*
+
 	local lang="charsets danish english french greek italian korean norwegian-ny
 		portuguese russian slovak swedish czech dutch estonian german
 		hungarian japanese norwegian polish romanian serbian spanish
 		ukrainian"
 	for l in $lang; do
-		mv "$pkgdir"/usr/share/$pkgname/$l \
-			"$subpkgdir"/usr/share/$pkgname/
+		amove usr/share/$pkgname/$l
 	done
 }
 
 mytest() {
 	pkgdesc="The test suite distributed with MariaDB"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/mysql_client_test \
-		"$pkgdir"/usr/bin/mysql_client_test_embedded \
-		"$pkgdir"/usr/bin/my_safe_process \
-		"$pkgdir"/usr/bin/mariadb-client-test \
-		"$pkgdir"/usr/bin/mariadb-client-test-embedded \
-		"$pkgdir"/usr/bin/mariadb-test \
-		"$pkgdir"/usr/bin/mariadb-test-embedded \
-		"$pkgdir"/usr/bin/mysqltest \
-		"$pkgdir"/usr/bin/mysqltest_embedded \
-		"$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/mysql-test \
-		"$subpkgdir"/usr/
+
+	amove usr/bin/mysql_client_test \
+		usr/bin/mysql_client_test_embedded \
+		usr/bin/my_safe_process \
+		usr/bin/mariadb-client-test \
+		usr/bin/mariadb-client-test-embedded \
+		usr/bin/mariadb-test \
+		usr/bin/mariadb-test-embedded \
+		usr/bin/mysqltest \
+		usr/bin/mysqltest_embedded \
+		usr/mysql-test
 }
 
 client() {
 	pkgdesc="Client for the MariaDB database"
-	depends="mariadb-common=$pkgver-r$pkgrel"
+	# perl needed for mariadb-access
+	depends="mariadb-common=$pkgver-r$pkgrel perl"
 	install=""
 	local bins="myisam_ftdump mysql mysqlaccess mysqladmin
 		mysqlcheck mysqldump mysqldumpslow mysql_find_rows
-		mysql_fix_extensions mysqlimport mysqlshow mysql_waitpid"
+		mysql_fix_extensions mysqlimport mysqlshow mysql_waitpid
+		mariadb-secure-installation"
 	local symlinks="mariadb mariadb-access mariadb-admin mariadb-check
 		mariadb-dump mariadb-dumpslow mariadb-find-rows mariadb-fix-extensions
-		mariadb-import mariadb-show mariadb-waitpid"
-	mkdir -p "$subpkgdir"/usr/bin/
+		mariadb-import mariadb-show mariadb-waitpid mysql_secure_installation"
+
 	for i in $bins $symlinks; do
-		mv "$pkgdir"/usr/bin/$i "$subpkgdir"/usr/bin/
+		amove usr/bin/$i
 	done
 }
 
@@ -371,80 +494,71 @@ mysql() { _compat mysql mariadb; }
 _compat_client() { _compat mysql-client mariadb-client; }
 _compat_bench() { _compat mysql-bench mariadb-client; }
 
-static() {
-	pkgdesc="Static libraries for MariaDB"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
-}
-
 backup() {
 	pkgdesc="The mariabackup tool for physical online backups"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/mariabackup \
-		"$pkgdir"/usr/bin/mariadb-backup \
-		"$pkgdir"/usr/bin/mbstream \
-		"$subpkgdir"/usr/bin/
+
+	amove usr/bin/mariabackup \
+		usr/bin/mariadb-backup \
+		usr/bin/mbstream
 }
 
 embedded() {
 	pkgdesc="MariaDB as an embeddable library"
 	depends="$pkgname-common=$pkgver-r$pkgrel"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libmariadbd.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libmariadbd.so.*
 }
 
-
 _embedded_dev() {
 	pkgdesc="MariaDB as an embeddable library - development files"
 	# this package only contains a symlink, but we want avoid pull in
 	# libmysqld (embedded) unless needed
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libmysqld.so "$subpkgdir"/usr/lib/
+	amove usr/lib/libmysqld.so
 }
 
 mytop() {
 	pkgdesc="Command line tool used for monitoring MariaDB performance"
 	depends="$_mytopdeps"
-	mkdir -p "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/bin/mytop "$subpkgdir"/usr/bin/
+	amove usr/bin/mytop
 }
 
 _server_utils() {
 	pkgdesc="Non-essential server utilities for MariaDB/MySQL applications"
 	depends="perl $pkgname-common=$pkgver-r$pkgrel"
-	mkdir -p "$subpkgdir"/usr/bin
+
 	# perl utils
-	mv \
-		"$pkgdir"/usr/bin/mysql_convert_table_format \
-		"$pkgdir"/usr/bin/mariadb-convert-table-format \
-		"$pkgdir"/usr/bin/mysql_setpermission \
-		"$pkgdir"/usr/bin/mariadb-setpermission \
-		"$pkgdir"/usr/bin/mysqld_multi \
-		"$pkgdir"/usr/bin/mariadbd-multi \
-		"$pkgdir"/usr/bin/mysqlhotcopy \
-		"$pkgdir"/usr/bin/mariadb-hotcopy \
-		"$subpkgdir"/usr/bin/
+	amove \
+		usr/bin/mysql_convert_table_format \
+		usr/bin/mariadb-convert-table-format \
+		usr/bin/mysql_setpermission \
+		usr/bin/mariadb-setpermission \
+		usr/bin/mysqld_multi \
+		usr/bin/mariadbd-multi \
+		usr/bin/mysqlhotcopy \
+		usr/bin/mariadb-hotcopy
 	# tools that can be used remotely and other tools
-	mv \
-		"$pkgdir"/usr/bin/mysql_upgrade \
-		"$pkgdir"/usr/bin/mariadb-upgrade \
-		"$pkgdir"/usr/bin/perror \
-		"$pkgdir"/usr/bin/mysqld_safe_helper \
-		"$pkgdir"/usr/bin/mariadbd-safe-helper \
-		"$subpkgdir"/usr/bin/
+	amove \
+		usr/bin/mysql_upgrade \
+		usr/bin/mariadb-upgrade \
+		usr/bin/perror \
+		usr/bin/mysqld_safe_helper \
+		usr/bin/mariadbd-safe-helper
 }
 
 _plugin_rocksdb() {
 	pkgdesc="MariaDB plugin for RocksDB (MyRocks)"
 	url="https://mariadb.com/kb/en/library/myrocks/"
 	depends="$pkgname=$pkgver-r$pkgrel"
-	mkdir -p "$subpkgdir"/usr/lib/mariadb/plugin
-	mv "$pkgdir"/usr/lib/mariadb/plugin/ha_rocksdb.so \
-		"$subpkgdir"/usr/lib/mariadb/plugin/ha_rocksdb.so
+
+	amove usr/lib/mariadb/plugin/ha_rocksdb.so
 }
 
-sha512sums="518dae18c04a1f7fcc6fd4d2dfbfbfbdf5e83e72ca41e66e1074328df8d92ab41b458e6a9973771419ac09a7348f264f158916cd198c335085d6e823e707bbc6  mariadb-10.4.12.tar.gz
+sha512sums="
+a6ebc9ba88b52e5d339b176b6fa48c03fcbe5bb590740a02c1bbd083a3d62e619937e645de2504a9f9adeed2f67127fab0307dece524b7c5217ad5df0f3ccc71  mariadb-10.11.7.tar.gz
 c352969f6665b0ffa387f7b185a5dea7751f4b16c12c809627857b27321efa09159369d7dd5c852d6159a9f173cb895fb601f0c52a1fa6e3527899520030964c  mariadb.initd
-70da971aa78815495098205bcbd28428430aa83c3f1050fec0231ca86af9d9def2d2108a48ee08d86812c8dc5ad8ab1ef4e17a49b4936ed5187ae0f6a7ef8f63  pcre.cmake.patch
-e9ae4613f1d8c5f0a59b39a3548c46e50674ae78e7457d0e64c49f7e1573125c13634bbce7e29179bb8865a423171f852f43b96f7ef95619a95f02edcfc71efd  ppc-remove-glibc-dep.patch
-0f5f2147e80b21abe65ccdee72b7d820ea1459112802e44f63d00d9247704d6a5562fce146a255e02f7367bc5d81cffe4e7c39758d533bf5ec9a6544a2a25738  disable-failing-test.patch"
+ec9068ee1da8276f04ac3654640cb6149e0f0a21ee77b133d7e5b82fa2ab2fd7971bce6ea3c5a5e094d8c6e2571f4ce43d7014b2767bb27e0a335005ced81968  gcc13.patch
+466d21376f6abae024aee26af701aa93275734c47a9c93084cec17e2e089667d059fbf76ea9c748c97de4a4b37c6663370f1d1f2183e17e69bd98213a57667ce  lfs64.patch
+20331e52e3dc419b4833e3c16bbb9828b9591f8aa3b6fce93c592161f3cae403c4a5d073369b2383d7d2325a2c9394d178866ac3e069fd8b6c50be00155ba942  ppc-remove-glibc-dep.patch
+598490b4bb45c9f7be46086d25c2b6c601d417c45f11aa519c2290065e7d6e98a7519f9860b823e67a8fd3e6ce3b4728af73ec3a2c66eec32b42fd4ad7cc07f7  disable-failing-test.patch
+4965275371e6d5e08e32a16fcfff2e68dfdcf6f4c30e5beffe18dcf56b503cbf373feeda814694e048964b16165ad65156c32fe27e974bed47201e8cf60736c6  have_stacktrace.patch
+3757166dae8cd2c517d7e09d286f0012c12815e58edbf615d3fb935d52ec4ab56fa4bd62fcb126a434a229a6757a34ec17900dd469d629ea22ed680733a2686d  revert-c432c9ef.patch
+"
diff --git a/main/mariadb/disable-failing-test.patch b/main/mariadb/disable-failing-test.patch
index 4eeac251074..6c546decbc3 100644
--- a/main/mariadb/disable-failing-test.patch
+++ b/main/mariadb/disable-failing-test.patch
@@ -17,3 +17,14 @@ index a2da150..fd04ef4 100644
  
  SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
  SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- a/unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ b/unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+ 
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/main/mariadb/gcc13.patch b/main/mariadb/gcc13.patch
new file mode 100644
index 00000000000..e174d40912b
--- /dev/null
+++ b/main/mariadb/gcc13.patch
@@ -0,0 +1,40 @@
+--- a/storage/rocksdb/rocksdb/util/string_util.h
++++ b/storage/rocksdb/rocksdb/util/string_util.h
+@@ -6,6 +6,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <sstream>
+ #include <string>
+ #include <unordered_map>
+--- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
++++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
+@@ -8,6 +8,7 @@
+ #pragma once
+ #ifndef ROCKSDB_LITE
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ #include "rocksdb/status.h"
+--- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
++++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
+@@ -5,6 +5,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
++++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
+@@ -6,6 +6,7 @@
+ #pragma once
+ 
+ #include "rocksdb/rocksdb_namespace.h"
++#include <cstdint>
+ 
+ struct CompactionIterationStats {
+   // Compaction statistics
diff --git a/main/mariadb/have_stacktrace.patch b/main/mariadb/have_stacktrace.patch
new file mode 100644
index 00000000000..e53734f0700
--- /dev/null
+++ b/main/mariadb/have_stacktrace.patch
@@ -0,0 +1,21 @@
+https://jira.mariadb.org/browse/MDEV-24131
+
+diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
+index 8fa0db15b36..67eb099028e 100644
+--- a/unittest/mysys/stacktrace-t.c
++++ b/unittest/mysys/stacktrace-t.c
+@@ -22,6 +22,14 @@
+ 
+ char b_bss[10];
+ 
++#ifndef HAVE_STACKTRACE
++int  my_safe_print_str(const char* val, size_t max_len)
++{
++  printf("%*s\n", (int) max_len, val);
++  return 0;
++}
++#endif
++
+ void test_my_safe_print_str()
+ {
+   char b_stack[10];
diff --git a/main/mariadb/lfs64.patch b/main/mariadb/lfs64.patch
new file mode 100644
index 00000000000..38cf1fc1b9e
--- /dev/null
+++ b/main/mariadb/lfs64.patch
@@ -0,0 +1,936 @@
+needed since https://github.com/bminor/musl/commit/25e6fee27f4a293728dd15b659170e7b9c7db9bc
+--
+diff --git a/storage/columnstore/columnstore/dbcon/execplan/objectidmanager.h b/storage/columnstore/columnstore/dbcon/execplan/objectidmanager.h
+index 0a389db6..6e3c900f 100644
+--- a/storage/columnstore/columnstore/dbcon/execplan/objectidmanager.h
++++ b/storage/columnstore/columnstore/dbcon/execplan/objectidmanager.h
+@@ -129,7 +129,7 @@ class ObjectIDManager
+      * @param offset the offset to start reading at
+      * @param size the number of bytes to read into buf
+      */
+-    void readData(uint8_t* buf, off64_t offset, int size) const;
++    void readData(uint8_t* buf, off_t offset, int size) const;
+ 
+     /** @brief Reliably writes data to the bitmap file
+      *
+@@ -140,7 +140,7 @@ class ObjectIDManager
+      * @param offset the offset to start writing at
+      * @param size the number of bytes to write
+      */
+-    void writeData(uint8_t* buf, off64_t offset, int size) const;
++    void writeData(uint8_t* buf, off_t offset, int size) const;
+ 
+     /** @brief If there is no bitmap file yet, this is used to make one
+      *
+diff --git a/storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp.single-read b/storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp.single-read
+index d5368cfa..18754df4 100644
+--- a/storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp.single-read
++++ b/storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp.single-read
+@@ -115,7 +115,7 @@ void* thr_popper(void* arg) {
+ #endif
+ 
+ 		longSeekOffset=(uint64_t)offset * (uint64_t)fileBlockSize;
+-		lseek64(fd, longSeekOffset, SEEK_SET);
++		lseek(fd, longSeekOffset, SEEK_SET);
+ 		totalRqst++;
+ 		dlen = (fr->BlocksRequested() > extentSize ? extentSize : fr->BlocksRequested());
+ 		sz=0;
+diff --git a/storage/columnstore/columnstore/utils/cloudio/SMComm.cpp b/storage/columnstore/columnstore/utils/cloudio/SMComm.cpp
+index e2e9b3a9..3bb30fd1 100644
+--- a/storage/columnstore/columnstore/utils/cloudio/SMComm.cpp
++++ b/storage/columnstore/columnstore/utils/cloudio/SMComm.cpp
+@@ -192,7 +192,7 @@ int SMComm::stat(const string& filename, struct stat* statbuf)
+   common_exit(command, response, err);
+ }
+ 
+-int SMComm::truncate(const string& filename, const off64_t length)
++int SMComm::truncate(const string& filename, const off_t length)
+ {
+   ByteStream* command = buffers.getByteStream();
+   ByteStream* response = buffers.getByteStream();
+diff --git a/storage/columnstore/columnstore/utils/cloudio/SMComm.h b/storage/columnstore/columnstore/utils/cloudio/SMComm.h
+index bb46304b..51edc0be 100644
+--- a/storage/columnstore/columnstore/utils/cloudio/SMComm.h
++++ b/storage/columnstore/columnstore/utils/cloudio/SMComm.h
+@@ -50,7 +50,7 @@ class SMComm : public boost::noncopyable
+ 
+   // added this one because it should be trivial to implement in SM, and prevents a large
+   // operation in SMDataFile.
+-  int truncate(const std::string& filename, const off64_t length);
++  int truncate(const std::string& filename, const off_t length);
+ 
+   int listDirectory(const std::string& path, std::list<std::string>* entries);
+ 
+diff --git a/storage/columnstore/columnstore/utils/cloudio/SMDataFile.cpp b/storage/columnstore/columnstore/utils/cloudio/SMDataFile.cpp
+index 84eab1ac..0d827c16 100644
+--- a/storage/columnstore/columnstore/utils/cloudio/SMDataFile.cpp
++++ b/storage/columnstore/columnstore/utils/cloudio/SMDataFile.cpp
+@@ -38,7 +38,7 @@ SMDataFile::SMDataFile(const char* name, int _openmode, const struct stat& _stat
+   comm = SMComm::get();
+ }
+ 
+-ssize_t SMDataFile::pread(void* buf, off64_t offset, size_t count)
++ssize_t SMDataFile::pread(void* buf, off_t offset, size_t count)
+ {
+   return comm->pread(name(), buf, count, offset);
+ }
+@@ -63,7 +63,7 @@ ssize_t SMDataFile::write(const void* buf, size_t count)
+   return ret;
+ }
+ 
+-int SMDataFile::seek(off64_t offset, int whence)
++int SMDataFile::seek(off_t offset, int whence)
+ {
+   switch (whence)
+   {
+@@ -83,18 +83,18 @@ int SMDataFile::seek(off64_t offset, int whence)
+   return 0;
+ }
+ 
+-int SMDataFile::truncate(off64_t length)
++int SMDataFile::truncate(off_t length)
+ {
+   return comm->truncate(name(), length);
+ }
+ 
+-int SMDataFile::fallocate(int mode, off64_t offset, off64_t length)
++int SMDataFile::fallocate(int mode, off_t offset, off_t length)
+ {
+   idbassert_s(mode == 0, "SMDataFile::fallocate() does not support mode != 0 right now.");
+   return comm->truncate(name(), offset + length);
+ }
+ 
+-off64_t SMDataFile::size()
++off_t SMDataFile::size()
+ {
+   struct stat _stat;
+   int err = comm->stat(name(), &_stat);
+@@ -104,7 +104,7 @@ off64_t SMDataFile::size()
+   return _stat.st_size;
+ }
+ 
+-off64_t SMDataFile::tell()
++off_t SMDataFile::tell()
+ {
+   return position;
+ }
+diff --git a/storage/columnstore/columnstore/utils/cloudio/SMDataFile.h b/storage/columnstore/columnstore/utils/cloudio/SMDataFile.h
+index 1d77edd6..6bd9b20f 100644
+--- a/storage/columnstore/columnstore/utils/cloudio/SMDataFile.h
++++ b/storage/columnstore/columnstore/utils/cloudio/SMDataFile.h
+@@ -30,14 +30,14 @@ class SMDataFile : public IDBDataFile
+  public:
+   virtual ~SMDataFile();
+ 
+-  ssize_t pread(void* ptr, off64_t offset, size_t count);
++  ssize_t pread(void* ptr, off_t offset, size_t count);
+   ssize_t read(void* ptr, size_t count);
+   ssize_t write(const void* ptr, size_t count);
+-  int seek(off64_t offset, int whence);
+-  int truncate(off64_t length);
+-  int fallocate(int mode, off64_t offset, off64_t length);
+-  off64_t size();
+-  off64_t tell();
++  int seek(off_t offset, int whence);
++  int truncate(off_t length);
++  int fallocate(int mode, off_t offset, off_t length);
++  off_t size();
++  off_t tell();
+   int flush();
+   time_t mtime();
+   int close();
+@@ -48,7 +48,7 @@ class SMDataFile : public IDBDataFile
+  private:
+   SMDataFile();
+   SMDataFile(const char* fname, int openmode, const struct stat&);
+-  off64_t position;
++  off_t position;
+   int openmode;
+   SMComm* comm;
+ 
+diff --git a/storage/columnstore/columnstore/utils/cloudio/SMFileSystem.cpp b/storage/columnstore/columnstore/utils/cloudio/SMFileSystem.cpp
+index 96fe25d3..c15653ad 100644
+--- a/storage/columnstore/columnstore/utils/cloudio/SMFileSystem.cpp
++++ b/storage/columnstore/columnstore/utils/cloudio/SMFileSystem.cpp
+@@ -38,7 +38,7 @@ int SMFileSystem::mkdir(const char* path)
+   return 0;
+ }
+ 
+-off64_t SMFileSystem::size(const char* filename) const
++off_t SMFileSystem::size(const char* filename) const
+ {
+   struct stat _stat;
+ 
+@@ -50,7 +50,7 @@ off64_t SMFileSystem::size(const char* filename) const
+   return _stat.st_size;
+ }
+ 
+-off64_t SMFileSystem::compressedSize(const char* filename) const
++off_t SMFileSystem::compressedSize(const char* filename) const
+ {
+   // Yikes, punting on this one.
+   throw NotImplementedYet(__func__);
+diff --git a/storage/columnstore/columnstore/utils/cloudio/SMFileSystem.h b/storage/columnstore/columnstore/utils/cloudio/SMFileSystem.h
+index 0e60f533..bace23fb 100644
+--- a/storage/columnstore/columnstore/utils/cloudio/SMFileSystem.h
++++ b/storage/columnstore/columnstore/utils/cloudio/SMFileSystem.h
+@@ -33,8 +33,8 @@ class SMFileSystem : public IDBFileSystem, boost::noncopyable
+ 
+   // why are some of these const and some not const in IDBFileSystem?
+   int mkdir(const char* pathname);
+-  off64_t size(const char* path) const;
+-  off64_t compressedSize(const char* path) const;
++  off_t size(const char* path) const;
++  off_t compressedSize(const char* path) const;
+   int remove(const char* pathname);
+   int rename(const char* oldpath, const char* newpath);
+   bool exists(const char* pathname) const;
+diff --git a/storage/columnstore/columnstore/utils/idbdatafile/BufferedFile.cpp b/storage/columnstore/columnstore/utils/idbdatafile/BufferedFile.cpp
+index 6d7c5834..cb3f2510 100644
+--- a/storage/columnstore/columnstore/utils/idbdatafile/BufferedFile.cpp
++++ b/storage/columnstore/columnstore/utils/idbdatafile/BufferedFile.cpp
+@@ -67,7 +67,7 @@ BufferedFile::~BufferedFile()
+   delete[] m_buffer;
+ }
+ 
+-ssize_t BufferedFile::pread(void* ptr, off64_t offset, size_t count)
++ssize_t BufferedFile::pread(void* ptr, off_t offset, size_t count)
+ {
+   ssize_t ret = 0;
+   int savedErrno;
+@@ -122,7 +122,7 @@ ssize_t BufferedFile::read(void* ptr, size_t count)
+ ssize_t BufferedFile::write(const void* ptr, size_t count)
+ {
+   ssize_t ret = 0;
+-  off64_t offset = tell();
++  off_t offset = tell();
+   int savedErrno = 0;
+   size_t progress = 0;
+   uint8_t* ptr8 = (uint8_t*)ptr;
+@@ -150,7 +150,7 @@ ssize_t BufferedFile::write(const void* ptr, size_t count)
+   return progress;
+ }
+ 
+-int BufferedFile::seek(off64_t offset, int whence)
++int BufferedFile::seek(off_t offset, int whence)
+ {
+   int ret = 0;
+   int savedErrno;
+@@ -168,7 +168,7 @@ int BufferedFile::seek(off64_t offset, int whence)
+   return ret;
+ }
+ 
+-int BufferedFile::truncate(off64_t length)
++int BufferedFile::truncate(off_t length)
+ {
+   int ret = 0;
+   int savedErrno;
+@@ -187,14 +187,14 @@ int BufferedFile::truncate(off64_t length)
+   return ret;
+ }
+ 
+-off64_t BufferedFile::size()
++off_t BufferedFile::size()
+ {
+ #ifdef _MSC_VER
+   return _filelengthi64(fileno(m_fp));  // Interestingly, implemented as fseek/ftell in the windows crt
+ #else
+   // going to calculate size 2 ways - first, via seek
+-  off64_t length = -1;
+-  off64_t here;
++  off_t length = -1;
++  off_t here;
+ 
+   flockfile(m_fp);
+ 
+@@ -220,7 +220,7 @@ off64_t BufferedFile::size()
+ #endif
+ }
+ 
+-off64_t BufferedFile::tell()
++off_t BufferedFile::tell()
+ {
+ #ifdef _MSC_VER
+   return _ftelli64(m_fp);
+@@ -282,7 +282,7 @@ int BufferedFile::close()
+      @see
+     This one is used in shared/we_fileop.cpp to skip expensive file preallocation.
+ */
+-int BufferedFile::fallocate(int mode, off64_t offset, off64_t length)
++int BufferedFile::fallocate(int mode, off_t offset, off_t length)
+ {
+   int ret = 0;
+   int savedErrno = 0;
+diff --git a/storage/columnstore/columnstore/utils/idbdatafile/BufferedFile.h b/storage/columnstore/columnstore/utils/idbdatafile/BufferedFile.h
+index 09646b44..ba688a10 100644
+--- a/storage/columnstore/columnstore/utils/idbdatafile/BufferedFile.h
++++ b/storage/columnstore/columnstore/utils/idbdatafile/BufferedFile.h
+@@ -40,16 +40,16 @@ class BufferedFile : public IDBDataFile, boost::noncopyable
+   BufferedFile(const char* fname, const char* mode, unsigned opts);
+   /* virtual */ ~BufferedFile();
+ 
+-  /* virtual */ ssize_t pread(void* ptr, off64_t offset, size_t count);
++  /* virtual */ ssize_t pread(void* ptr, off_t offset, size_t count);
+   /* virtual */ ssize_t read(void* ptr, size_t count);
+   /* virtual */ ssize_t write(const void* ptr, size_t count);
+-  /* virtual */ int seek(off64_t offset, int whence);
+-  /* virtual */ int truncate(off64_t length);
+-  /* virtual */ off64_t size();
+-  /* virtual */ off64_t tell();
++  /* virtual */ int seek(off_t offset, int whence);
++  /* virtual */ int truncate(off_t length);
++  /* virtual */ off_t size();
++  /* virtual */ off_t tell();
+   /* virtual */ int flush();
+   /* virtual */ time_t mtime();
+-  /* virtual */ int fallocate(int mode, off64_t offset, off64_t length);
++  /* virtual */ int fallocate(int mode, off_t offset, off_t length);
+ 
+  protected:
+   /* virtual */
+diff --git a/storage/columnstore/columnstore/utils/idbdatafile/IDBDataFile.h b/storage/columnstore/columnstore/utils/idbdatafile/IDBDataFile.h
+index 1747189e..739e7717 100644
+--- a/storage/columnstore/columnstore/utils/idbdatafile/IDBDataFile.h
++++ b/storage/columnstore/columnstore/utils/idbdatafile/IDBDataFile.h
+@@ -124,7 +124,7 @@ class IDBDataFile
+    * or fseek followed by read for C-library FILE*.  Return value
+    * is the number of bytes read.
+    */
+-  virtual ssize_t pread(void* ptr, off64_t offset, size_t count) = 0;
++  virtual ssize_t pread(void* ptr, off_t offset, size_t count) = 0;
+ 
+   /**
+    * This is a read method similar to kernel style read or C library
+@@ -148,7 +148,7 @@ class IDBDataFile
+    * operation - ex. HDFS will not support it for files opened for writing
+    * Returns 0 on success, -1 on error
+    */
+-  virtual int seek(off64_t offset, int whence) = 0;
++  virtual int seek(off_t offset, int whence) = 0;
+ 
+   /**
+    * The truncate() method is equivalent to the ftruncate method.  Note
+@@ -156,7 +156,7 @@ class IDBDataFile
+    * or write or append do not, but HDFS files opened for modification do.
+    * Returns 0 on success, -1 on error.
+    */
+-  virtual int truncate(off64_t length) = 0;
++  virtual int truncate(off_t length) = 0;
+ 
+   /**
+    * The size() method returns the size of the file in a manner consistent
+@@ -166,14 +166,14 @@ class IDBDataFile
+    * external view of size may differ (ex. if writing buffered i/o before
+    * a flush/sync or if writing an open HDFS file).  Returns -1 on error.
+    */
+-  virtual off64_t size() = 0;
++  virtual off_t size() = 0;
+ 
+   /**
+    * The tell() call returns the current offset in the file.  This is
+    * similar to lseek with 0 offset in the standard library and ftell
+    * for buffered FILE *s.
+    */
+-  virtual off64_t tell() = 0;
++  virtual off_t tell() = 0;
+ 
+   /**
+    * The flush() method instructs the file to write any buffered contents
+@@ -194,7 +194,7 @@ class IDBDataFile
+    * only.
+    * Returns -1 on error.
+    */
+-  virtual int fallocate(int mode, off64_t offset, off64_t length) = 0;
++  virtual int fallocate(int mode, off_t offset, off_t length) = 0;
+ 
+   int colWidth()
+   {
+diff --git a/storage/columnstore/columnstore/utils/idbdatafile/IDBFileSystem.h b/storage/columnstore/columnstore/utils/idbdatafile/IDBFileSystem.h
+index 4ca4a285..54e58540 100644
+--- a/storage/columnstore/columnstore/utils/idbdatafile/IDBFileSystem.h
++++ b/storage/columnstore/columnstore/utils/idbdatafile/IDBFileSystem.h
+@@ -82,14 +82,14 @@ class IDBFileSystem
+    * size() returns the size of the file specified by path.
+    * Returns the size on success, -1 on error
+    */
+-  virtual off64_t size(const char* path) const = 0;
++  virtual off_t size(const char* path) const = 0;
+ 
+   /**
+    * compressedSize() returns the decompressed size of the file
+    * speicified by path.
+    * Returns the size on success, -1 on error
+    */
+-  virtual off64_t compressedSize(const char* path) const = 0;
++  virtual off_t compressedSize(const char* path) const = 0;
+ 
+   /**
+    * exists() checks for the existence of a particular path.
+diff --git a/storage/columnstore/columnstore/utils/idbdatafile/IDBLogger.cpp b/storage/columnstore/columnstore/utils/idbdatafile/IDBLogger.cpp
+index 37d4cb3c..8111d00c 100644
+--- a/storage/columnstore/columnstore/utils/idbdatafile/IDBLogger.cpp
++++ b/storage/columnstore/columnstore/utils/idbdatafile/IDBLogger.cpp
+@@ -117,14 +117,14 @@ void IDBLogger::logRW(const char* op, const std::string& fname, const IDBDataFil
+   writeLog(logmsg.str());
+ }
+ 
+-void IDBLogger::logSeek(const std::string& fname, const IDBDataFile* ptr, off64_t offset, int whence, int ret)
++void IDBLogger::logSeek(const std::string& fname, const IDBDataFile* ptr, off_t offset, int whence, int ret)
+ {
+   ostringstream logmsg;
+   logmsg << fname << "," << ptr << ",seek," << offset << "," << whence << "," << ret;
+   writeLog(logmsg.str());
+ }
+ 
+-void IDBLogger::logTruncate(const std::string& fname, const IDBDataFile* ptr, off64_t length, int ret)
++void IDBLogger::logTruncate(const std::string& fname, const IDBDataFile* ptr, off_t length, int ret)
+ {
+   ostringstream logmsg;
+   logmsg << fname << "," << ptr << ",truncate," << length << ",," << ret;
+diff --git a/storage/columnstore/columnstore/utils/idbdatafile/IDBLogger.h b/storage/columnstore/columnstore/utils/idbdatafile/IDBLogger.h
+index b200c914..c4d6d0a5 100644
+--- a/storage/columnstore/columnstore/utils/idbdatafile/IDBLogger.h
++++ b/storage/columnstore/columnstore/utils/idbdatafile/IDBLogger.h
+@@ -36,8 +36,8 @@ class IDBLogger
+   static void logNoArg(const std::string& fname, const IDBDataFile* ptr, const char* op, int ret);
+   static void logRW(const char* op, const std::string& fname, const IDBDataFile* ptr, size_t offset,
+                     size_t count, size_t bytesRead);
+-  static void logSeek(const std::string& fname, const IDBDataFile* ptr, off64_t offset, int whence, int ret);
+-  static void logTruncate(const std::string& fname, const IDBDataFile* ptr, off64_t length, int ret);
++  static void logSeek(const std::string& fname, const IDBDataFile* ptr, off_t offset, int whence, int ret);
++  static void logTruncate(const std::string& fname, const IDBDataFile* ptr, off_t length, int ret);
+   static void logSize(const std::string& fname, const IDBDataFile* ptr, long long ret);
+ 
+   static void logFSop(IDBFileSystem::Types type, const char* op, const char* pathname,
+diff --git a/storage/columnstore/columnstore/utils/idbdatafile/IDBPolicy.h b/storage/columnstore/columnstore/utils/idbdatafile/IDBPolicy.h
+index 117f1e8d..d53fbfa0 100644
+--- a/storage/columnstore/columnstore/utils/idbdatafile/IDBPolicy.h
++++ b/storage/columnstore/columnstore/utils/idbdatafile/IDBPolicy.h
+@@ -125,8 +125,8 @@ class IDBPolicy
+    * please see IDBFileSystem.h.
+    */
+   static int mkdir(const char* pathname);
+-  static off64_t size(const char* path);
+-  static off64_t compressedSize(const char* path);
++  static off_t size(const char* path);
++  static off_t compressedSize(const char* path);
+   static int remove(const char* pathname);
+   static int rename(const char* oldpath, const char* newpath);
+   static bool exists(const char* pathname);
+@@ -194,12 +194,12 @@ inline int IDBPolicy::mkdir(const char* pathname)
+   return IDBPolicy::getFs(pathname).mkdir(pathname);
+ }
+ 
+-inline off64_t IDBPolicy::size(const char* path)
++inline off_t IDBPolicy::size(const char* path)
+ {
+   return IDBPolicy::getFs(path).size(path);
+ }
+ 
+-inline off64_t IDBPolicy::compressedSize(const char* path)
++inline off_t IDBPolicy::compressedSize(const char* path)
+ {
+   return IDBPolicy::getFs(path).compressedSize(path);
+ }
+diff --git a/storage/columnstore/columnstore/utils/idbdatafile/PosixFileSystem.cpp b/storage/columnstore/columnstore/utils/idbdatafile/PosixFileSystem.cpp
+index bd3e1c4b..6c9d04a5 100644
+--- a/storage/columnstore/columnstore/utils/idbdatafile/PosixFileSystem.cpp
++++ b/storage/columnstore/columnstore/utils/idbdatafile/PosixFileSystem.cpp
+@@ -115,13 +115,13 @@ int PosixFileSystem::rename(const char* oldpath, const char* newpath)
+   return ret;
+ }
+ 
+-off64_t PosixFileSystem::size(const char* path) const
++off_t PosixFileSystem::size(const char* path) const
+ {
+   // should this use Boost??
+   struct stat statBuf;
+   int rc = ::stat(path, &statBuf);
+   int savedErrno = errno;
+-  off64_t ret = ((rc == 0) ? statBuf.st_size : -1);
++  off_t ret = ((rc == 0) ? statBuf.st_size : -1);
+ 
+   if (IDBLogger::isEnabled())
+     IDBLogger::logFSop(POSIX, "fs:size", path, this, ret);
+@@ -156,11 +156,11 @@ size_t readFillBuffer(idbdatafile::IDBDataFile* pFile, char* buffer, size_t byte
+   return totalBytesRead;
+ }
+ 
+-off64_t PosixFileSystem::compressedSize(const char* path) const
++off_t PosixFileSystem::compressedSize(const char* path) const
+ {
+   IDBDataFile* pFile = NULL;
+   size_t nBytes;
+-  off64_t dataSize = 0;
++  off_t dataSize = 0;
+ 
+   try
+   {
+diff --git a/storage/columnstore/columnstore/utils/idbdatafile/PosixFileSystem.h b/storage/columnstore/columnstore/utils/idbdatafile/PosixFileSystem.h
+index c1f4e5ff..6e18ca45 100644
+--- a/storage/columnstore/columnstore/utils/idbdatafile/PosixFileSystem.h
++++ b/storage/columnstore/columnstore/utils/idbdatafile/PosixFileSystem.h
+@@ -29,8 +29,8 @@ class PosixFileSystem : public IDBFileSystem
+   ~PosixFileSystem();
+ 
+   int mkdir(const char* pathname) override;
+-  off64_t size(const char* path) const override;
+-  off64_t compressedSize(const char* path) const override;
++  off_t size(const char* path) const override;
++  off_t compressedSize(const char* path) const override;
+   int remove(const char* pathname) override;
+   int rename(const char* oldpath, const char* newpath) override;
+   bool exists(const char* pathname) const override;
+diff --git a/storage/columnstore/columnstore/utils/idbdatafile/UnbufferedFile.cpp b/storage/columnstore/columnstore/utils/idbdatafile/UnbufferedFile.cpp
+index 07a7630b..97dcb97c 100644
+--- a/storage/columnstore/columnstore/utils/idbdatafile/UnbufferedFile.cpp
++++ b/storage/columnstore/columnstore/utils/idbdatafile/UnbufferedFile.cpp
+@@ -75,7 +75,7 @@ UnbufferedFile::~UnbufferedFile()
+   close();
+ }
+ 
+-ssize_t UnbufferedFile::pread(void* ptr, off64_t offset, size_t count)
++ssize_t UnbufferedFile::pread(void* ptr, off_t offset, size_t count)
+ {
+   ssize_t ret;
+   int savedErrno;
+@@ -161,7 +161,7 @@ ssize_t UnbufferedFile::write(const void* ptr, size_t count)
+   return ret;
+ }
+ 
+-int UnbufferedFile::seek(off64_t offset, int whence)
++int UnbufferedFile::seek(off_t offset, int whence)
+ {
+   int ret;
+   int savedErrno;
+@@ -182,7 +182,7 @@ int UnbufferedFile::seek(off64_t offset, int whence)
+   return ret;
+ }
+ 
+-int UnbufferedFile::truncate(off64_t length)
++int UnbufferedFile::truncate(off_t length)
+ {
+   int ret;
+   int savedErrno;
+@@ -207,15 +207,15 @@ int UnbufferedFile::truncate(off64_t length)
+   return ret;
+ }
+ 
+-off64_t UnbufferedFile::size()
++off_t UnbufferedFile::size()
+ {
+-  off64_t ret = 0;
++  off_t ret = 0;
+   int savedErrno;
+ 
+ #ifdef _MSC_VER
+   DWORD hi = 0;
+   DWORD lo = GetFileSize(m_fd, &hi);
+-  ret = off64_t(((uint64_t)hi) << 32) | lo;
++  ret = off_t(((uint64_t)hi) << 32) | lo;
+ #else
+   struct stat statBuf;
+   int rc = ::fstat(m_fd, &statBuf);
+@@ -230,9 +230,9 @@ off64_t UnbufferedFile::size()
+   return ret;
+ }
+ 
+-off64_t UnbufferedFile::tell()
++off_t UnbufferedFile::tell()
+ {
+-  off64_t ret;
++  off_t ret;
+ #ifdef _MSC_VER
+   LARGE_INTEGER wRet;
+   LARGE_INTEGER dist;
+@@ -333,7 +333,7 @@ int UnbufferedFile::close()
+      @see
+     This one is used in shared/we_fileop.cpp to skip expensive file preallocation.
+ */
+-int UnbufferedFile::fallocate(int mode, off64_t offset, off64_t length)
++int UnbufferedFile::fallocate(int mode, off_t offset, off_t length)
+ {
+   int ret = 0;
+   int savedErrno = 0;
+diff --git a/storage/columnstore/columnstore/utils/idbdatafile/tdriver.cpp b/storage/columnstore/columnstore/utils/idbdatafile/tdriver.cpp
+index 42b46873..0cef9ebb 100644
+--- a/storage/columnstore/columnstore/utils/idbdatafile/tdriver.cpp
++++ b/storage/columnstore/columnstore/utils/idbdatafile/tdriver.cpp
+@@ -623,9 +623,9 @@ bool TestRunner::truncateTest(IDBDataFile::Types filetype)
+     blk_num = m_opts.numblocks;
+   }
+ 
+-  off64_t fsize = m_file->size();
++  off_t fsize = m_file->size();
+ 
+-  if (fsize != (off64_t)(blk_num * BLK_SIZE))
++  if (fsize != (off_t)(blk_num * BLK_SIZE))
+   {
+     ostringstream errstr;
+     errstr << "wrong file size after truncate, " << fsize << " != " << blk_num * BLK_SIZE;
+@@ -645,7 +645,7 @@ bool TestRunner::renameTest(IDBDataFile::Types type)
+   IDBFileSystem& fs = IDBFileSystem::getFs(type);
+ 
+   // get the size before we move for compare purposes.
+-  off64_t fsize_orig = fs.size(m_fname.c_str());
++  off_t fsize_orig = fs.size(m_fname.c_str());
+ 
+   // choose a path in a different directory that we know already exists
+   // and make it specific to our thread...
+@@ -666,7 +666,7 @@ bool TestRunner::renameTest(IDBDataFile::Types type)
+   }
+ 
+   // now check if oldpath exists using size method
+-  off64_t fsize = fs.size(m_fname.c_str());
++  off_t fsize = fs.size(m_fname.c_str());
+ 
+   if (fsize != -1)
+   {
+@@ -712,7 +712,7 @@ bool TestRunner::copyTest(IDBDataFile::Types type)
+   IDBFileSystem& fs = IDBFileSystem::getFs(type);
+ 
+   // get the size before we copy for compare purposes.
+-  off64_t fsize_orig = fs.size(m_fname.c_str());
++  off_t fsize_orig = fs.size(m_fname.c_str());
+ 
+   // choose a path in a different directory that we know already exists
+   // and make it specific to our thread...
+@@ -733,7 +733,7 @@ bool TestRunner::copyTest(IDBDataFile::Types type)
+   }
+ 
+   // now check if newpath exists using size method
+-  off64_t fsize = fs.size(newpath.c_str());
++  off_t fsize = fs.size(newpath.c_str());
+ 
+   if (fsize != fsize_orig)
+   {
+@@ -1023,9 +1023,9 @@ bool TestRunner::tellTest(IDBDataFile::Types filetype)
+     return false;
+   }
+ 
+-  off64_t filepos = m_file->tell();
++  off_t filepos = m_file->tell();
+ 
+-  if (filepos != off64_t(BLK_SIZE))
++  if (filepos != off_t(BLK_SIZE))
+   {
+     ostringstream errstr;
+     errstr << "tellTest: File position not at correct block, " << filepos << " != " << BLK_SIZE;
+diff --git a/storage/columnstore/columnstore/writeengine/bulk/we_colbufcompressed.cpp b/storage/columnstore/columnstore/writeengine/bulk/we_colbufcompressed.cpp
+index 9678501c..4bb33049 100644
+--- a/storage/columnstore/columnstore/writeengine/bulk/we_colbufcompressed.cpp
++++ b/storage/columnstore/columnstore/writeengine/bulk/we_colbufcompressed.cpp
+@@ -393,7 +393,7 @@ int ColumnBufferCompressed::compressAndFlush(bool bFinishingFile)
+   Stats::startParseEvent(WE_STATS_WRITE_COL);
+ #endif
+ 
+-  off64_t fileOffset = fFile->tell();
++  off_t fileOffset = fFile->tell();
+   size_t nitems = fFile->write(compressedOutBuf, outputLen) / outputLen;
+ 
+   if (nitems != 1)
+diff --git a/storage/columnstore/columnstore/writeengine/bulk/we_columninfo.cpp b/storage/columnstore/columnstore/writeengine/bulk/we_columninfo.cpp
+index 3f89c28a..57f74352 100644
+--- a/storage/columnstore/columnstore/writeengine/bulk/we_columninfo.cpp
++++ b/storage/columnstore/columnstore/writeengine/bulk/we_columninfo.cpp
+@@ -955,7 +955,7 @@ int ColumnInfo::expandAbbrevExtent(bool bRetainFilePos)
+ {
+   if (fLoadingAbbreviatedExtent)
+   {
+-    off64_t oldOffset = 0;
++    off_t oldOffset = 0;
+ 
+     if (bRetainFilePos)
+     {
+diff --git a/storage/columnstore/columnstore/writeengine/dictionary/we_dctnry.cpp b/storage/columnstore/columnstore/writeengine/dictionary/we_dctnry.cpp
+index 0a4f5e90..c7eb5fe6 100644
+--- a/storage/columnstore/columnstore/writeengine/dictionary/we_dctnry.cpp
++++ b/storage/columnstore/columnstore/writeengine/dictionary/we_dctnry.cpp
+@@ -318,7 +318,7 @@ int Dctnry::expandDctnryExtent()
+ {
+   RETURN_ON_NULL(m_dFile, ERR_FILE_SEEK);
+ 
+-  off64_t oldOffset = m_dFile->tell();
++  off_t oldOffset = m_dFile->tell();
+ 
+   RETURN_ON_ERROR(setFileOffset(m_dFile, 0, SEEK_END));
+ 
+diff --git a/storage/columnstore/columnstore/writeengine/server/we_getfilesizes.cpp b/storage/columnstore/columnstore/writeengine/server/we_getfilesizes.cpp
+index 194b260e..4f9ce81b 100644
+--- a/storage/columnstore/columnstore/writeengine/server/we_getfilesizes.cpp
++++ b/storage/columnstore/columnstore/writeengine/server/we_getfilesizes.cpp
+@@ -93,9 +93,9 @@ size_t readFillBuffer(idbdatafile::IDBDataFile* pFile, char* buffer, size_t byte
+   return totalBytesRead;
+ }
+ 
+-static off64_t getCompressedDataSize(string& fileName)
++static off_t getCompressedDataSize(string& fileName)
+ {
+-  off64_t dataSize = 0;
++  off_t dataSize = 0;
+   IDBDataFile* pFile = 0;
+   size_t nBytes;
+   // Some IDBPolicy functions can throw exceptions, caller will catch it
+@@ -198,7 +198,7 @@ struct ColumnThread
+         char fileName[200];
+         (void)fileOp.getFileName(fOid, fileName, rootList[i], entries[0].partitionNum, entries[0].segmentNum);
+         string aFile(fileName);  // convert between char* and string
+-        off64_t fileSize = 0;
++        off_t fileSize = 0;
+ 
+         if (fReportRealUse && (fCompressionType > 0))
+         {
+diff --git a/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.cpp b/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.cpp
+index b34535c7..474a44a8 100644
+--- a/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.cpp
++++ b/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.cpp
+@@ -1183,7 +1183,7 @@ int ChunkManager::openFile(CompFileData* fileData, const char* mode, int colWidt
+ // (ex __LINE__); this is used for logging error messages.  Likewise, filename
+ // is used for logging any error message.
+ //------------------------------------------------------------------------------
+-int ChunkManager::setFileOffset(IDBDataFile* pFile, const string& fileName, off64_t offset, int ln) const
++int ChunkManager::setFileOffset(IDBDataFile* pFile, const string& fileName, off_t offset, int ln) const
+ {
+   int rc = NO_ERROR;
+ 
+diff --git a/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.h b/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.h
+index 30a9862f..bc22a451 100644
+--- a/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.h
++++ b/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.h
+@@ -309,7 +309,7 @@ class ChunkManager
+   int openFile(CompFileData* fileData, const char* mode, int colWidth, bool useTmpSuffix, int ln) const;
+ 
+   // @brief set offset in a compressed DB file from beginning.
+-  int setFileOffset(IDBDataFile* pFile, const std::string& fileName, off64_t offset, int ln) const;
++  int setFileOffset(IDBDataFile* pFile, const std::string& fileName, off_t offset, int ln) const;
+ 
+   // @brief read from a compressed DB file.
+   int readFile(IDBDataFile* pFile, const std::string& fileName, void* buf, size_t size, int ln) const;
+diff --git a/storage/columnstore/columnstore/writeengine/shared/we_fileop.cpp b/storage/columnstore/columnstore/writeengine/shared/we_fileop.cpp
+index 1db08a92..2c783325 100644
+--- a/storage/columnstore/columnstore/writeengine/shared/we_fileop.cpp
++++ b/storage/columnstore/columnstore/writeengine/shared/we_fileop.cpp
+@@ -1310,7 +1310,7 @@ int FileOp::fillCompColumnExtentEmptyChunks(OID oid, int colWidth, const uint8_t
+       getLogger()->logMsg(oss.str(), MSGLVL_INFO2);
+     }
+ 
+-    off64_t endHdrsOffset = pFile->tell();
++    off_t endHdrsOffset = pFile->tell();
+     rc = expandAbbrevColumnExtent(pFile, dbRoot, emptyVal, colWidth, colDataType);
+ 
+     if (rc != NO_ERROR)
+@@ -1374,7 +1374,7 @@ int FileOp::fillCompColumnExtentEmptyChunks(OID oid, int colWidth, const uint8_t
+               std::endl << std::endl;
+ #endif
+ 
+-  off64_t endOffset = 0;
++  off_t endOffset = 0;
+ 
+   // Fill in or add necessary remaining empty chunks
+   if (numChunksToFill > 0)
+@@ -1416,7 +1416,7 @@ int FileOp::fillCompColumnExtentEmptyChunks(OID oid, int colWidth, const uint8_t
+ 
+       // Position file to write empty chunks; default to end of headers
+       // in case there are no chunks listed in the header
+-      off64_t startOffset = pFile->tell();
++      off_t startOffset = pFile->tell();
+ 
+       if (chunkPtrs.size() > 0)
+       {
+diff --git a/storage/connect/filamfix.cpp b/storage/connect/filamfix.cpp
+index 3298a833..ec256a2a 100644
+--- a/storage/connect/filamfix.cpp
++++ b/storage/connect/filamfix.cpp
+@@ -695,7 +695,7 @@ bool BGXFAM::BigSeek(PGLOBAL g, HANDLE h, BIGINT pos, int org)
+     return true;
+     } // endif
+ #else   // !_WIN32
+-  if (lseek64(h, pos, org) < 0) {
++  if (lseek(h, pos, org) < 0) {
+     snprintf(g->Message, sizeof(g->Message), "lseek64: %s", strerror(errno));
+     printf("%s\n", g->Message);
+     return true;
+@@ -1022,7 +1022,7 @@ int BGXFAM::Cardinality(PGLOBAL g)
+ 
+ #else    // UNIX
+     if (Hfile == INVALID_HANDLE_VALUE) {
+-      int h = open64(filename, O_RDONLY, 0);
++      int h = open(filename, O_RDONLY, 0);
+ 
+       if (trace(1))
+         htrc(" h=%d\n", h);
+@@ -1041,13 +1041,13 @@ int BGXFAM::Cardinality(PGLOBAL g)
+         } // endif h
+ 
+       // Get the size of the file (can be greater than 4 GB)
+-      fsize = lseek64(h, 0, SEEK_END);
++      fsize = lseek(h, 0, SEEK_END);
+       close(h);
+     } else {
+-      BIGINT curpos = lseek64(Hfile, 0, SEEK_CUR);
++      BIGINT curpos = lseek(Hfile, 0, SEEK_CUR);
+ 
+-      fsize = lseek64(Hfile, 0, SEEK_END);
+-      lseek64(Hfile, curpos, SEEK_SET);
++      fsize = lseek(Hfile, 0, SEEK_END);
++      lseek(Hfile, curpos, SEEK_SET);
+     } // endif Hfile
+ 
+     if (fsize < 0) {
+@@ -1357,7 +1357,7 @@ int BGXFAM::DeleteRecords(PGLOBAL g, int irc)
+         return RC_FX;
+         } // endif error
+ #else   // !_WIN32
+-      if (ftruncate64(Hfile, (BIGINT)(Tpos * Lrecl))) {
++      if (ftruncate(Hfile, (BIGINT)(Tpos * Lrecl))) {
+         snprintf(g->Message, sizeof(g->Message), MSG(TRUNCATE_ERROR), strerror(errno));
+         return RC_FX;
+         } // endif
+@@ -1402,7 +1402,7 @@ bool BGXFAM::OpenTempFile(PGLOBAL g)
+     return true;
+     } // endif Tfile
+ #else    // UNIX
+-  Tfile = open64(tempname, O_WRONLY | O_TRUNC, S_IWRITE);
++  Tfile = open(tempname, O_WRONLY | O_TRUNC, S_IWRITE);
+ 
+   if (Tfile == INVALID_HANDLE_VALUE) {
+     int rc = errno;
+@@ -1531,7 +1531,7 @@ void BGXFAM::Rewind(void)
+ #if defined(_WIN32)  //OB
+   SetFilePointer(Hfile, 0, NULL, FILE_BEGIN);
+ #else    // UNIX
+-  lseek64(Hfile, 0, SEEK_SET);
++  lseek(Hfile, 0, SEEK_SET);
+ #endif   // UNIX
+ #endif // 0
+   CurBlk = -1;
+diff --git a/storage/connect/filamvct.cpp b/storage/connect/filamvct.cpp
+index 184df646..f462060a 100644
+--- a/storage/connect/filamvct.cpp
++++ b/storage/connect/filamvct.cpp
+@@ -3084,7 +3084,7 @@ bool BGVFAM::BigSeek(PGLOBAL g, HANDLE h, BIGINT pos, bool b)
+     return true;
+     } // endif
+ #else   // !_WIN32
+-  if (lseek64(h, pos, (b) ? SEEK_END : SEEK_SET) < 0) {
++  if (lseek(h, pos, (b) ? SEEK_END : SEEK_SET) < 0) {
+     snprintf(g->Message, sizeof(g->Message), MSG(ERROR_IN_LSK), errno);
+     return true;
+     } // endif
+@@ -3238,7 +3238,7 @@ int BGVFAM::GetBlockInfo(PGLOBAL g)
+ 
+   if (h == INVALID_HANDLE_VALUE || !len.QuadPart) {
+ #else   // !_WIN32
+-  h = open64(filename, O_RDONLY, 0);
++  h = open(filename, O_RDONLY, 0);
+ 
+   if (h == INVALID_HANDLE_VALUE || !_filelength(h)) {
+ #endif  // !_WIN32
+@@ -3314,7 +3314,7 @@ bool BGVFAM::SetBlockInfo(PGLOBAL g)
+ #else   // !_WIN32
+     int oflag = (b) ?  O_RDWR : O_RDWR | O_TRUNC;
+ 
+-    h = open64(filename, oflag, 0);
++    h = open(filename, oflag, 0);
+ #endif  // !_WIN32
+ 
+     if (h == INVALID_HANDLE_VALUE) {
+@@ -3409,7 +3409,7 @@ bool BGVFAM::MakeEmptyFile(PGLOBAL g, PCSZ fn)
+   int    h;
+   BIGINT pos;
+ 
+-  h= open64(filename, O_CREAT | O_WRONLY, S_IREAD | S_IWRITE);
++  h= open(filename, O_CREAT | O_WRONLY, S_IREAD | S_IWRITE);
+ 
+   if (h == -1)
+     return true;
+@@ -3420,7 +3420,7 @@ bool BGVFAM::MakeEmptyFile(PGLOBAL g, PCSZ fn)
+     htrc("MEF: pos=%lld n=%d maxblk=%d blksize=%d\n",
+                pos, n, MaxBlk, Blksize);
+ 
+-  if (lseek64(h, pos, SEEK_SET) < 0)
++  if (lseek(h, pos, SEEK_SET) < 0)
+     goto err;
+ 
+   // This actually fills the empty file
+@@ -3619,7 +3619,7 @@ bool BGVFAM::OpenTableFile(PGLOBAL g)
+       return true;
+     } // endswitch
+ 
+-  Hfile = open64(filename, oflag, pmd); // Enable file size > 2G
++  Hfile = open(filename, oflag, pmd); // Enable file size > 2G
+ 
+   if (Hfile == INVALID_HANDLE_VALUE) {
+     rc = errno;
+@@ -3933,7 +3933,7 @@ int BGVFAM::DeleteRecords(PGLOBAL g, int irc)
+           return RC_FX;
+           } // endif error
+ #else   // !_WIN32
+-        if (ftruncate64(Hfile, (BIGINT)(Tpos * Lrecl))) {
++        if (ftruncate(Hfile, (BIGINT)(Tpos * Lrecl))) {
+           snprintf(g->Message, sizeof(g->Message), MSG(TRUNCATE_ERROR), strerror(errno));
+           return RC_FX;
+           } // endif
+@@ -3993,7 +3993,7 @@ bool BGVFAM::OpenTempFile(PGLOBAL g)
+ #else    // UNIX
+   int oflag = (MaxBlk) ? O_WRONLY : O_WRONLY | O_TRUNC;
+ 
+-  Tfile = open64(tempname, oflag, S_IWRITE);
++  Tfile = open(tempname, oflag, S_IWRITE);
+ 
+   if (Tfile == INVALID_HANDLE_VALUE) {
+     int rc = errno;
+@@ -4250,7 +4250,7 @@ void BGVFAM::Rewind(void)
+ #if defined(_WIN32)  //OB
+   SetFilePointer(Hfile, 0, NULL, FILE_BEGIN);
+ #else    // UNIX
+-  lseek64(Hfile, 0, SEEK_SET);
++  lseek(Hfile, 0, SEEK_SET);
+ #endif   // UNIX
+ #endif // 0
+   } // end of Rewind
+diff --git a/storage/connect/xindex.cpp b/storage/connect/xindex.cpp
+index 4bcbbfd4..1144f89a 100644
+--- a/storage/connect/xindex.cpp
++++ b/storage/connect/xindex.cpp
+@@ -2652,7 +2652,7 @@ bool XHUGE::Open(PGLOBAL g, char *filename, int id, MODE mode)
+     /*******************************************************************/
+     /* Position the cursor at end of file so ftell returns file size.  */
+     /*******************************************************************/
+-    if (!(NewOff.Val = (longlong)lseek64(Hfile, 0LL, SEEK_END))) {
++    if (!(NewOff.Val = (longlong)lseek(Hfile, 0LL, SEEK_END))) {
+       snprintf(g->Message, sizeof(g->Message), MSG(FUNC_ERRNO), errno, "Seek");
+       return true;
+       } // endif
+@@ -2681,7 +2681,7 @@ bool XHUGE::Open(PGLOBAL g, char *filename, int id, MODE mode)
+       htrc("noff[%d]=%lld\n", id, noff[id].Val);
+ 
+     // Position the cursor at the offset of this index
+-    if (lseek64(Hfile, noff[id].Val, SEEK_SET) < 0) {
++    if (lseek(Hfile, noff[id].Val, SEEK_SET) < 0) {
+       snprintf(g->Message, sizeof(g->Message), "(XHUGE)lseek64: %s (%lld)", strerror(errno), noff[id].Val);
+       printf("%s\n", g->Message);
+ //    snprintf(g->Message, sizeof(g->Message), MSG(FUNC_ERRNO), errno, "Hseek");
+@@ -2709,10 +2709,10 @@ bool XHUGE::Seek(PGLOBAL g, int low, int high, int origin)
+     } // endif
+ 
+ #else // UNIX
+-  off64_t pos = (off64_t)low
+-              + (off64_t)high * ((off64_t)0x100 * (off64_t)0x1000000);
++  off_t pos = (off_t)low
++              + (off_t)high * ((off_t)0x100 * (off_t)0x1000000);
+ 
+-  if (lseek64(Hfile, pos, origin) < 0) {
++  if (lseek(Hfile, pos, origin) < 0) {
+     snprintf(g->Message, sizeof(g->Message), MSG(ERROR_IN_LSK), errno);
+ 
+     if (trace(1))
+@@ -2841,7 +2841,7 @@ void XHUGE::Close(char *fn, int id)
+ #else   // !_WIN32
+   if (id >= 0 && fn) {
+     if (Hfile != INVALID_HANDLE_VALUE) {
+-      if (lseek64(Hfile, id * sizeof(IOFF), SEEK_SET) >= 0) {
++      if (lseek(Hfile, id * sizeof(IOFF), SEEK_SET) >= 0) {
+         ssize_t nbw = write(Hfile, &NewOff, sizeof(IOFF));
+ 			  
+         if (nbw != (signed)sizeof(IOFF))
diff --git a/main/mariadb/mariadb.initd b/main/mariadb/mariadb.initd
index 0d914bde581..0d914bde581 100644..100755
--- a/main/mariadb/mariadb.initd
+++ b/main/mariadb/mariadb.initd
diff --git a/main/mariadb/mariadb.pre-install b/main/mariadb/mariadb.pre-install
index 2ab1374c764..5b2695f8078 100644
--- a/main/mariadb/mariadb.pre-install
+++ b/main/mariadb/mariadb.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S mysql 2>/dev/null
-adduser -S -D -h /var/lib/mysql -s /sbin/nologin -G mysql -g mysql mysql 2>/dev/null
+adduser -S -D -H -h /var/lib/mysql -s /sbin/nologin -G mysql -g mysql mysql 2>/dev/null
 
 exit 0
diff --git a/main/mariadb/pcre.cmake.patch b/main/mariadb/pcre.cmake.patch
deleted file mode 100644
index cf0c352b833..00000000000
--- a/main/mariadb/pcre.cmake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/pcre.cmake
-+++ b/cmake/pcre.cmake
-@@ -8,11 +8,7 @@
-     CHECK_LIBRARY_EXISTS(pcre pcre_stack_guard "" HAVE_PCRE_STACK_GUARD)
-     IF(NOT CMAKE_CROSSCOMPILING)
-       SET(CMAKE_REQUIRED_LIBRARIES "pcre")
--      CHECK_C_SOURCE_RUNS("
--        #include <pcre.h>
--        int main() {
--        return -pcre_exec(NULL, NULL, NULL, -999, -999, 0, NULL, 0) < 256;
--        }"  PCRE_STACK_SIZE_OK)
-+      SET(PCRE_STACK_SIZE_OK TRUE)
-       SET(CMAKE_REQUIRED_LIBRARIES)
-     ENDIF()
-   ENDIF()
diff --git a/main/mariadb/ppc-remove-glibc-dep.patch b/main/mariadb/ppc-remove-glibc-dep.patch
index 57f5008b860..8d5123498c0 100644
--- a/main/mariadb/ppc-remove-glibc-dep.patch
+++ b/main/mariadb/ppc-remove-glibc-dep.patch
@@ -26,24 +26,11 @@ index f2e26fca..94599b74 100644
  #define HMT_high() asm volatile("or 3,3,3")
  #else
 @@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
-   */
-   YieldProcessor();
+   __asm__ __volatile__ ("pause");
+ #endif
  #elif defined(_ARCH_PWR8)
 -  __ppc_get_timebase();
 +  __builtin_ppc_get_timebase();
- #else
-   int32 var, oldval = 0;
-   my_atomic_cas32_strong_explicit(&var, &oldval, 1, MY_MEMORY_ORDER_RELAXED,
-diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
-index c4c45b8e..2f7a07f5 100644
---- a/storage/tokudb/PerconaFT/portability/toku_time.h
-+++ b/storage/tokudb/PerconaFT/portability/toku_time.h
-@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
-     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
-     return result;
- #elif defined(__powerpc__)
--    return __ppc_get_timebase();
-+    return __builtin_ppc_get_timebase();
- #else
- #error No timer implementation for this platform
- #endif
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
diff --git a/main/mariadb/revert-c432c9ef.patch b/main/mariadb/revert-c432c9ef.patch
new file mode 100644
index 00000000000..d13fa9dbbc4
--- /dev/null
+++ b/main/mariadb/revert-c432c9ef.patch
@@ -0,0 +1,23 @@
+Date: Wed, 21 Feb 2024 20:34:12 -0800
+Subject: [PATCH] Revert compile_time_assert() changes from "MDEV-32862 MYSQL struct in C/C and server differs"
+
+This partially reverts commit c432c9ef19bf6ff40ab9551bcae202d7e1319878 which
+most likely caused the regression that broke builds on many 32-bit platforms.
+
+--- a/tests/mysql_client_fw.c
++++ b/tests/mysql_client_fw.c
+@@ -1430,14 +1430,6 @@ int main(int argc, char **argv)
+     tests_to_run[i]= NULL;
+   }
+ 
+-#ifdef _WIN32
+-  /* must be the same in C/C and embedded, 1208 on 64bit, 968 on 32bit */
+-  compile_time_assert(sizeof(MYSQL) == 60*sizeof(void*)+728);
+-#else
+-  /* must be the same in C/C and embedded, 1272 on 64bit, 964 on 32bit */
+-  compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656);
+-#endif
+-
+   if (mysql_server_init(embedded_server_arg_count,
+                         embedded_server_args,
+                         (char**) embedded_server_groups))
diff --git a/main/mawk/APKBUILD b/main/mawk/APKBUILD
new file mode 100644
index 00000000000..b992ca7e453
--- /dev/null
+++ b/main/mawk/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Miguel Terron <miguel.a.terron@gmail.com>
+# Maintainer: Miguel Terron <miguel.a.terron@gmail.com>
+pkgname=mawk
+pkgver=1.3.4
+_pkgdate=20240123
+pkgrel=9
+pkgdesc="mawk is an interpreter for the AWK Programming Language"
+url="https://invisible-island.net/mawk/"
+arch="all"
+license="GPL-2.0-only"
+subpackages="$pkgname-doc"
+source="https://invisible-island.net/archives/mawk/mawk-$pkgver-$_pkgdate.tgz"
+builddir="$srcdir"/$pkgname-$pkgver-$_pkgdate
+
+build() {
+	# implicit decls for srandom/environ
+	CFLAGS="$CFLAGS -D_GNU_SOURCE" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+f6d5da44280afeac4a9bb6d3788ed71ee816daaa5816f49b9d40add5292f3ae06e5af007a6c993d14405238cbb70ba4997fdd2fcd5901c9a1a4b61357045c4a6  mawk-1.3.4-20240123.tgz
+"
diff --git a/main/mbedtls/APKBUILD b/main/mbedtls/APKBUILD
index 3d1b000c4bf..eb993bf3b11 100644
--- a/main/mbedtls/APKBUILD
+++ b/main/mbedtls/APKBUILD
@@ -1,17 +1,43 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mbedtls
-pkgver=2.16.3
+pkgver=3.6.0 # long-time support branch
 pkgrel=0
+_framework_commit=f1aa3f5c96da714f06dd4e23d84ba18e4f3cf359
 pkgdesc="Light-weight cryptographic and SSL/TLS library"
-url="https://tls.mbed.org"
+url="https://www.trustedfirmware.org/projects/mbed-tls/"
 arch="all"
-license="Apache-2.0"
-makedepends="cmake perl python3"
+license="Apache-2.0 OR GPL-2.0-or-later"
+makedepends="cmake perl python3 samurai"
 subpackages="$pkgname-static $pkgname-dev $pkgname-utils"
-source="https://tls.mbed.org/download/mbedtls-$pkgver-apache.tgz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/ARMmbed/mbedtls/archive/v$pkgver.tar.gz
+	$pkgname-framework-$_framework_commit.tar.gz::https://github.com/Mbed-TLS/mbedtls-framework/archive/$_framework_commit.tar.gz
+	"
+
+# Track security issues
+# https://tls.mbed.org/security
 
 # secfixes:
+#   2.28.8-r0:
+#     - CVE-2024-28960
+#   2.28.7-r0:
+#     - CVE-2024-23170
+#     - CVE-2024-23775
+#   2.28.5-r0:
+#     - CVE-2023-43615
+#   2.28.1-r0:
+#     - CVE-2022-35409
+#   2.16.12-r0:
+#     - CVE-2021-44732
+#   2.16.8-r0:
+#     - CVE-2020-16150
+#   2.16.6-r0:
+#     - CVE-2020-10932
+#   2.16.4-r0:
+#     - CVE-2019-18222
+#   2.16.3-r0:
+#     - CVE-2019-16910
 #   2.14.1-r0:
 #     - CVE-2018-19608
 #   2.12.0-r0:
@@ -29,32 +55,33 @@ source="https://tls.mbed.org/download/mbedtls-$pkgver-apache.tgz"
 prepare() {
 	default_prepare
 
+	# TF-PSA-Crypto and Mbed TLS version-independent build and test framework
+	rmdir "$builddir"/framework
+	mv "$srcdir/$pkgname-framework-$_framework_commit" "$builddir"/framework
+
 	# Enable flags for non-embedded systems.
-	sed -i \
-		-e 's|//\(#define MBEDTLS_THREADING_C\)|\1|' \
-		-e 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' \
-		"$builddir"/include/mbedtls/config.h
+	python3 scripts/config.py set MBEDTLS_THREADING_C
+	python3 scripts/config.py set MBEDTLS_THREADING_PTHREAD
 }
 
 build() {
-	cd "$builddir"
-
-	cmake . \
-		-DCMAKE_BUILD_TYPE="MinSizeRel" \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_VERBOSE_MAKEFILE=ON \
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-	make
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON \
+		-DENABLE_TESTING="$(want_check && echo ON || echo OFF)"
+	cmake --build build
 }
 
 check() {
-	cd "$builddir"
-	make test
+	cd build
+	# tests break in parallel
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest -j1
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
 utils() {
@@ -72,4 +99,7 @@ static() {
 	chmod -x "$subpkgdir"/usr/lib/*.a
 }
 
-sha512sums="62b984d04570334e740ff8b857b4dad73804a4d0aec22b224cb813eb8a6a4b2ec9bff3126c198552e030da94201fd98ed764e8b9f53056e2f94a51dfdbb47cdd  mbedtls-2.16.3-apache.tgz"
+sha512sums="
+7e50cf2bb2c9abeb56f18a25bc126b96ac5e3329702cf5b2e266df6b649b9544ab5f2ac00bd57e06091e10cdcf907e600c14eb415942d028000d7b6f1c0cfa42  mbedtls-3.6.0.tar.gz
+9f415f96d6b6c6750dad900e6bc8d5f641e6c322d0cb19143218a4b4e7aee5fa6a7a15fe388b883f5d08b49f2e508c6c4838706133768aa668b972343e547c07  mbedtls-framework-f1aa3f5c96da714f06dd4e23d84ba18e4f3cf359.tar.gz
+"
diff --git a/main/mc/APKBUILD b/main/mc/APKBUILD
index 1ec8e344705..d95c29d62cf 100644
--- a/main/mc/APKBUILD
+++ b/main/mc/APKBUILD
@@ -1,18 +1,18 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mc
-pkgver=4.8.24
+pkgver=4.8.31
 pkgrel=0
 pkgdesc="Filemanager/shell that emulates Norton Commander"
+options="!check" # https://midnight-commander.org/ticket/3972#comment:2
 url="https://www.midnight-commander.org"
 arch="all"
 license="GPL-3.0-or-later"
 subpackages="$pkgname-doc $pkgname-lang"
-makedepends="e2fsprogs-dev glib-dev libssh2-dev ncurses-dev pcre-dev perl"
+makedepends="e2fsprogs-dev glib-dev libssh2-dev slang-dev perl gpm-dev"
 source="https://www.midnight-commander.org/downloads/mc-$pkgver.tar.xz
 	alpine_syntax.patch"
 
-
 build() {
 	./configure \
 		--build=$CBUILD \
@@ -27,10 +27,9 @@ build() {
 		--enable-vfs-sftp \
 		--with-internal-edit \
 		--with-mmap \
-		--with-screen=ncurses \
+		--with-screen=slang \
 		--with-subshell \
-		--without-gpm-mouse \
-		--without-included-gettext \
+		--with-gpm-mouse \
 		--without-x
 	make
 }
@@ -49,7 +48,7 @@ doc() {
 	mkdir -p "$subpkgdir"/usr/share/doc
 	mv "$pkgdir"/usr/share/mc/examples \
 		"$subpkgdir"/usr/share/doc/mc
-	find "$pkgdir"/usr/lib/mc -name README* \
+	find "$pkgdir"/usr/lib/mc -name "README*" \
 		-exec mv {} "$subpkgdir"/usr/share/doc/mc/ \;
 }
 
@@ -63,5 +62,7 @@ lang() {
 		"$subpkgdir"/usr/share/mc/hints/
 }
 
-sha512sums="ec9e40198455e7001bb1d06ea060b9b4c32ad3a3750d0cc9bac334b53eb666df1746335bfcd411213fa4386b23e516f6026fe3d74ad9119b2340b26c63ccd4fc  mc-4.8.24.tar.xz
-47aa001e8c20a24631617d665fd0d81b269ebad96696c4bd70c7040bbca713868e02fe53dfaee9a775a57f35a0e7c9e44ce299037379e249ad27354a78d905c3  alpine_syntax.patch"
+sha512sums="
+dc2272a0016ed782eafc78efda575b04d064ffa7984a146f3389dea81f4c7886647e7d1f097b547f7ae00190c10e35979a24400a6bb936c023f190a82934c12d  mc-4.8.31.tar.xz
+47aa001e8c20a24631617d665fd0d81b269ebad96696c4bd70c7040bbca713868e02fe53dfaee9a775a57f35a0e7c9e44ce299037379e249ad27354a78d905c3  alpine_syntax.patch
+"
diff --git a/main/mcpp/01-zeroc-fixes.patch b/main/mcpp/01-zeroc-fixes.patch
deleted file mode 100644
index fff5d321fe9..00000000000
--- a/main/mcpp/01-zeroc-fixes.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Description: Fixes by ZeroC, Inc.
-Author: ZeroC, Inc.
-Bug-Debian: http://bugs.debian.org/611749
-
---- mcpp-2.7.2.orig/src/main.c
-+++ mcpp-2.7.2/src/main.c
-@@ -326,6 +326,8 @@ static void     init_main( void)
-             = FALSE;
-     option_flags.trig = TRIGRAPHS_INIT;
-     option_flags.dig = DIGRAPHS_INIT;
-+    sh_file = NULL;
-+    sh_line = 0;
- }
- 
- int     mcpp_lib_main
---- mcpp-2.7.2.orig/src/support.c
-+++ mcpp-2.7.2/src/support.c
-@@ -188,7 +188,7 @@ static char *   append_to_buffer(
-     size_t      length
- )
- {
--    if (mem_buf_p->bytes_avail < length) {  /* Need to allocate more memory */
-+    if (mem_buf_p->bytes_avail < length + 1) {  /* Need to allocate more memory */
-         size_t size = MAX( BUF_INCR_SIZE, length);
- 
-         if (mem_buf_p->buffer == NULL) {            /* 1st append   */
-@@ -1722,6 +1722,8 @@ com_start:
-                     sp -= 2;
-                     while (*sp != '\n')     /* Until end of line    */
-                         mcpp_fputc( *sp++, OUT);
-+                    mcpp_fputc( '\n', OUT);
-+                    wrong_line = TRUE;
-                 }
-                 goto  end_line;
-             default:                        /* Not a comment        */
---- mcpp-2.7.2.orig/src/internal.H
-+++ mcpp-2.7.2/src/internal.H
-@@ -390,6 +390,8 @@ extern char * const     work_end;   /* E
- extern char     identifier[];       /* Lastly scanned name          */
- extern IFINFO   ifstack[];          /* Information of #if nesting   */
- extern char     work_buf[];
-+extern FILEINFO * sh_file;
-+extern int      sh_line;
-         /* Temporary buffer for directive line and macro expansion  */
- 
- /* main.c   */
-@@ -557,6 +559,6 @@ extern void     init_system( void);
- #endif
- #endif
- 
--#if HOST_HAVE_STPCPY
-+#if HOST_HAVE_STPCPY && !defined(stpcpy)
- extern char *   stpcpy( char * dest, const char * src);
- #endif
---- mcpp-2.7.2.orig/src/system.c
-+++ mcpp-2.7.2/src/system.c
-@@ -3858,6 +3858,9 @@ static int  chk_dirp(
- }
- #endif
- 
-+FILEINFO*       sh_file;
-+int             sh_line;
-+
- void    sharp(
-     FILEINFO *  sharp_file,
-     int         flag        /* Flag to append to the line for GCC   */
-@@ -3868,8 +3871,6 @@ void    sharp(
-  * else (i.e. 'sharp_file' is NULL) 'infile'.
-  */
- {
--    static FILEINFO *   sh_file;
--    static int  sh_line;
-     FILEINFO *  file;
-     int         line;
- 
diff --git a/main/mcpp/02-gniibe-fixes.patch b/main/mcpp/02-gniibe-fixes.patch
deleted file mode 100644
index cb5aa6c345c..00000000000
--- a/main/mcpp/02-gniibe-fixes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Simple fixes
- * Fix freeing unmalloced memory
-   The memory of 'in_file' is not malloced, but points to argv[].
-   It is wrong to free it.
- * When there is no input file specified by argv, it causes error
-   and fp_in == NULL.  Check is needed to call fclose for fp_in.
-Author: NIIBE Yutaka
-
-## Fixes the issue reported at:
-## http://www.forallsecure.com/bug-reports/6b11b6fccda17cc467e055ccf7fec3fa2d89ec00/
-
-Index: mcpp-2.7.2/src/main.c
-===================================================================
---- mcpp-2.7.2.orig/src/main.c	2013-07-09 03:03:05.610947658 +0000
-+++ mcpp-2.7.2/src/main.c	2013-07-09 03:03:05.534947624 +0000
-@@ -428,16 +428,11 @@
- 
- fatal_error_exit:
- #if MCPP_LIB
--    /* Free malloced memory */
--    if (mcpp_debug & MACRO_CALL) {
--        if (in_file != stdin_name)
--            free( in_file);
--    }
-     clear_filelist();
-     clear_symtable();
- #endif
- 
--    if (fp_in != stdin)
-+    if (fp_in && fp_in != stdin)
-         fclose( fp_in);
-     if (fp_out != stdout)
-         fclose( fp_out);
diff --git a/main/mcpp/APKBUILD b/main/mcpp/APKBUILD
deleted file mode 100644
index 2126f45d012..00000000000
--- a/main/mcpp/APKBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
-pkgname=mcpp
-pkgver=2.7.2
-pkgrel=1
-pkgdesc="A portable C preprocessor"
-url="http://mcpp.sourceforge.net"
-arch="all"
-license="custom"
-options="!check"  # No test suite.
-depends=""
-makedepends=""
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-source="https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	01-zeroc-fixes.patch
-	02-gniibe-fixes.patch"
-
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--enable-mcpplib \
-		--disable-static
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-
-	mkdir -p "$pkgdir"/usr/share/licenses/$pkgname
-	mv "$pkgdir"/usr/share/doc/$pkgname/LICENSE \
-		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE || return 1
-}
-
-sha512sums="1ca885cb13fdb684de9d0595a9215b52f48a93a69077d82cdcacafe40d9a61fb77b00a3ff2b8890e7bc0a0fcc0c8d70d4093c00c280351cd4459aba67c573235  mcpp-2.7.2.tar.gz
-86b2e851490e180dfe3028a5a37019ea423924c921ab053a642fb78d4533a87f913ede2928daf9da4daf60e67795a24521186b40c76961ae99ebeb75f8aa95ad  01-zeroc-fixes.patch
-a31a0f2e7430381e5e62ea4257a35891ce9d2f3beed60c6caad3b6d298a58557e9c850223840ef8c6f6c2e8139cf4a4edf29ac93b2532680feafba503fcfaf6d  02-gniibe-fixes.patch"
diff --git a/main/mdadm/APKBUILD b/main/mdadm/APKBUILD
index 054d9a93e7b..78f24686e3d 100644
--- a/main/mdadm/APKBUILD
+++ b/main/mdadm/APKBUILD
@@ -1,33 +1,46 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Contributor: Carlo Landmeter <clandmeter at gmail>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mdadm
-pkgver=4.1
-pkgrel=1
+pkgver=4.2
+pkgrel=4
 pkgdesc="a tool for managing Linux Software RAID arrays"
-url="http://neil.brown.name/blog/mdadm"
+url="https://raid.wiki.kernel.org/index.php/A_guide_to_mdadm"
 arch="all"
 license="GPL-2.0-only"
-depends=
+depends="lsblk"
 makedepends="groff linux-headers"
-subpackages="$pkgname-doc $pkgname-udev::noarch $pkgname-misc::noarch"
-source="https://www.kernel.org/pub/linux/utils/raid/$pkgname/$pkgname-$pkgver.tar.gz
+checkdepends="bash eudev e2fsprogs"
+subpackages="$pkgname-doc $pkgname-udev::noarch $pkgname-misc::noarch $pkgname-openrc"
+source="https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.gz
 	$pkgname.initd
 	$pkgname.confd
 	$pkgname-raid.initd
+	lfs64.patch
 	no-werror.patch
 	mdadm-include-sysmacros.patch
+	fix-monitor-tv_sec.patch
 	"
-builddir="$srcdir/$pkgname-$pkgver"
+options="!check"
 
 build() {
-	cd "$builddir"
-	make
+	make CXFLAGS="$CFLAGS -DNO_LIBUDEV"
+	make raid6check
+}
+
+# This doesn't build in Alpine CI. But it should work on bare-metal as root.
+check() {
+	export PATH="$PWD:$PATH" # Test needs built binaries
+	make test
+	./test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+
+	install -Dm755 raid6check "$pkgdir"/sbin/raid6check
+	install -Dm644 raid6check.8 "$pkgdir"/usr/share/man/man8/raid6check.8
+
 	install -Dm644 $pkgname.conf-example "$pkgdir"/etc/$pkgname.conf
 	install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
@@ -47,13 +60,18 @@ misc() {
 	depends="$pkgname bash"
 
 	cd "$builddir"
+
 	install -Dm755 misc/mdcheck "$subpkgdir"/usr/sbin/mdcheck
 	install -Dm755 misc/syslog-events "$subpkgdir"/usr/sbin/handle-mdadm-events
 }
 
-sha512sums="f9bff760795ba7361f19fd1cbc02efedcdaa4b0125b99cf1369e78f30e5c128126751915fde41407d46c544514d864bf82b508419bc08f1db7aa447557e2ca9e  mdadm-4.1.tar.gz
+sha512sums="
+112a897c6943d7343f44ffe32a8d7ef11e1f1624f51385c0f1d27458d661202bb378678a3ddc78ed2e24533be234441ea15cf33769345d5709b72b72ad9ec540  mdadm-4.2.tar.gz
 ca5f4e3ff5b284102b44e818d11622e1889066e3d18edce2d62c1a44ee8f4cfdc0979121c0462a916c638423c5ebc706c46aa996a7c4f68e030589adc62803f4  mdadm.initd
 7d45bf489ef93a4f217ffcf72311eb661b8de7fbf63a5344697252c0d3a684b0123ff60efa5f218da4eb4cda7c88d91c2ef3625d5e44a588e3e1210cb60b0ab9  mdadm.confd
-37022593ba090eb0690669b99d6386152242c017c1e608cea7b5420b7a6f754b377e916e4f81e2abf9941e791db78b5820e63db0e706d5de8b35e796678e921c  mdadm-raid.initd
-794d6c31fbc0a9ef2f56d7b0afdb94490f0b677414d4f2b1b5104a51c4f39948491fc21aaa30ca75c90c9f056369317f48ea2f78e04ee740327114bee5d959b4  no-werror.patch
-e711c15fada5fc98984f43f90a8ab3b6a2a20e9b91c56b5672fdb0ea127b61934b2f0c6ca986bd91c96c56b66f46326cb616101a62e4bfebe3a2b0d33ed2465c  mdadm-include-sysmacros.patch"
+10d2456ca82c353c9b8540ca996de48575a60b83ede5b0bb7e960b4dd28aac2aa73eaeff4bdb99d03ce9630f986c2023b38fe332c5be74e0234985af6273a934  mdadm-raid.initd
+df8b5d78000c416652da07e46d94c5c3b8afa48619a360b0a33290420f718bf88069ff4cf62537cc510208fae95b5632a9f340fe97d1aa31661b031bd4dc5d71  lfs64.patch
+d3e67b8d4f41996007a4b6dd28666e844925e071cd59530b9611590d536dd206375e372f56bca25cbdf45def41ffe199bd4bf64688436cdd5ac71a6ff699d95d  no-werror.patch
+e711c15fada5fc98984f43f90a8ab3b6a2a20e9b91c56b5672fdb0ea127b61934b2f0c6ca986bd91c96c56b66f46326cb616101a62e4bfebe3a2b0d33ed2465c  mdadm-include-sysmacros.patch
+d7aeac1ce8e1b17bfdc6178551aaee364b731003e03b1d0c713ee879ac3f82164dff70999ad56c0e91c4bf90c5bca7708bdbb5d2a57e032fd0291828a917b054  fix-monitor-tv_sec.patch
+"
diff --git a/main/mdadm/fix-monitor-tv_sec.patch b/main/mdadm/fix-monitor-tv_sec.patch
new file mode 100644
index 00000000000..f40d940026a
--- /dev/null
+++ b/main/mdadm/fix-monitor-tv_sec.patch
@@ -0,0 +1,16 @@
+diff --git monitor.c monitor.c
+index 81537ed..08027ac 100644
+--- a/monitor.c
++++ b/monitor.c
+@@ -447,9 +447,9 @@ static int read_and_act(struct active_array *a, fd_set *fds)
+ 	}
+ 
+ 	gettimeofday(&tv, NULL);
+-	dprintf("(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n",
++	dprintf("(%d): %lld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n",
+ 		a->info.container_member,
+-		tv.tv_sec, tv.tv_usec,
++		(long long)tv.tv_sec, (long)tv.tv_usec,
+ 		array_states[a->curr_state],
+ 		array_states[a->prev_state],
+ 		sync_actions[a->curr_action],
diff --git a/main/mdadm/lfs64.patch b/main/mdadm/lfs64.patch
new file mode 100644
index 00000000000..414f76d3e68
--- /dev/null
+++ b/main/mdadm/lfs64.patch
@@ -0,0 +1,641 @@
+needed since https://github.com/bminor/musl/commit/25e6fee27f4a293728dd15b659170e7b9c7db9bc
+--
+diff --git a/Grow.c b/Grow.c
+index 9c6fc95..bb21333 100644
+--- a/Grow.c
++++ b/Grow.c
+@@ -4260,10 +4260,10 @@ static int grow_backup(struct mdinfo *sra,
+ 		bsb.magic[15] = '2';
+ 	for (i = 0; i < dests; i++)
+ 		if (part)
+-			lseek64(destfd[i], destoffsets[i] +
++			lseek(destfd[i], destoffsets[i] +
+ 				__le64_to_cpu(bsb.devstart2)*512, 0);
+ 		else
+-			lseek64(destfd[i], destoffsets[i], 0);
++			lseek(destfd[i], destoffsets[i], 0);
+ 
+ 	rv = save_stripes(sources, offsets, disks, chunk, level, layout,
+ 			  dests, destfd, offset * 512 * odata,
+@@ -4282,14 +4282,14 @@ static int grow_backup(struct mdinfo *sra,
+ 						((char*)&bsb.sb_csum2)-((char*)&bsb));
+ 
+ 		rv = -1;
+-		if ((unsigned long long)lseek64(destfd[i],
++		if ((unsigned long long)lseek(destfd[i],
+ 						destoffsets[i] - 4096, 0) !=
+ 		    destoffsets[i] - 4096)
+ 			break;
+ 		if (write(destfd[i], &bsb, 512) != 512)
+ 			break;
+ 		if (destoffsets[i] > 4096) {
+-			if ((unsigned long long)lseek64(destfd[i], destoffsets[i]+stripes*chunk*odata, 0) !=
++			if ((unsigned long long)lseek(destfd[i], destoffsets[i]+stripes*chunk*odata, 0) !=
+ 			    destoffsets[i]+stripes*chunk*odata)
+ 				break;
+ 			if (write(destfd[i], &bsb, 512) != 512)
+@@ -4339,7 +4339,7 @@ static int forget_backup(int dests, int *destfd,
+ 		if (memcmp(bsb.magic, "md_backup_data-2", 16) == 0)
+ 			bsb.sb_csum2 = bsb_csum((char*)&bsb,
+ 						((char*)&bsb.sb_csum2)-((char*)&bsb));
+-		if ((unsigned long long)lseek64(destfd[i], destoffsets[i]-4096, 0) !=
++		if ((unsigned long long)lseek(destfd[i], destoffsets[i]-4096, 0) !=
+ 		    destoffsets[i]-4096)
+ 			rv = -1;
+ 		if (rv == 0 && write(destfd[i], &bsb, 512) != 512)
+@@ -4367,7 +4367,7 @@ static void validate(int afd, int bfd, unsigned long long offset)
+ 	 */
+ 	if (afd < 0)
+ 		return;
+-	lseek64(bfd, offset - 4096, 0);
++	lseek(bfd, offset - 4096, 0);
+ 	if (read(bfd, &bsb2, 512) != 512)
+ 		fail("cannot read bsb");
+ 	if (bsb2.sb_csum != bsb_csum((char*)&bsb2,
+@@ -4398,12 +4398,12 @@ static void validate(int afd, int bfd, unsigned long long offset)
+ 			}
+ 		}
+ 
+-		lseek64(bfd, offset, 0);
++		lseek(bfd, offset, 0);
+ 		if ((unsigned long long)read(bfd, bbuf, len) != len) {
+ 			//printf("len %llu\n", len);
+ 			fail("read first backup failed");
+ 		}
+-		lseek64(afd, __le64_to_cpu(bsb2.arraystart)*512, 0);
++		lseek(afd, __le64_to_cpu(bsb2.arraystart)*512, 0);
+ 		if ((unsigned long long)read(afd, abuf, len) != len)
+ 			fail("read first from array failed");
+ 		if (memcmp(bbuf, abuf, len) != 0) {
+@@ -4431,10 +4431,10 @@ static void validate(int afd, int bfd, unsigned long long offset)
+ 			bbuf = xmalloc(abuflen);
+ 		}
+ 
+-		lseek64(bfd, offset+__le64_to_cpu(bsb2.devstart2)*512, 0);
++		lseek(bfd, offset+__le64_to_cpu(bsb2.devstart2)*512, 0);
+ 		if ((unsigned long long)read(bfd, bbuf, len) != len)
+ 			fail("read second backup failed");
+-		lseek64(afd, __le64_to_cpu(bsb2.arraystart2)*512, 0);
++		lseek(afd, __le64_to_cpu(bsb2.arraystart2)*512, 0);
+ 		if ((unsigned long long)read(afd, abuf, len) != len)
+ 			fail("read second from array failed");
+ 		if (memcmp(bbuf, abuf, len) != 0)
+@@ -4711,7 +4711,7 @@ int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist,
+ 			st->ss->getinfo_super(st, &dinfo, NULL);
+ 			st->ss->free_super(st);
+ 
+-			if (lseek64(fd,
++			if (lseek(fd,
+ 				    (dinfo.data_offset + dinfo.component_size - 8) <<9,
+ 				    0) < 0) {
+ 				pr_err("Cannot seek on device %d\n", i);
+@@ -4811,7 +4811,7 @@ int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist,
+ 					goto nonew; /* No new data here */
+ 			}
+ 		}
+-		if (lseek64(fd, __le64_to_cpu(bsb.devstart)*512, 0)< 0) {
++		if (lseek(fd, __le64_to_cpu(bsb.devstart)*512, 0)< 0) {
+ 		second_fail:
+ 			if (verbose)
+ 				pr_err("Failed to verify secondary backup-metadata block on %s\n",
+@@ -4819,7 +4819,7 @@ int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist,
+ 			continue; /* Cannot seek */
+ 		}
+ 		/* There should be a duplicate backup superblock 4k before here */
+-		if (lseek64(fd, -4096, 1) < 0 ||
++		if (lseek(fd, -4096, 1) < 0 ||
+ 		    read(fd, &bsb2, sizeof(bsb2)) != sizeof(bsb2))
+ 			goto second_fail; /* Cannot find leading superblock */
+ 		if (bsb.magic[15] == '1')
+diff --git a/raid6check.c b/raid6check.c
+index a8e6005..392cf29 100644
+--- a/raid6check.c
++++ b/raid6check.c
+@@ -206,7 +206,7 @@ int autorepair(int *disk, unsigned long long start, int chunk_size,
+ 		for(j = 0; j < (chunk_size >> CHECK_PAGE_BITS); j++) {
+ 			if(page_to_write[j] == 1) {
+ 				int slot = block_index_for_slot[disk[j]];
+-				lseek64(source[slot], offsets[slot] + start * chunk_size + j * CHECK_PAGE_SIZE, SEEK_SET);
++				lseek(source[slot], offsets[slot] + start * chunk_size + j * CHECK_PAGE_SIZE, SEEK_SET);
+ 				write_res += write(source[slot],
+ 						   blocks[disk[j]] + j * CHECK_PAGE_SIZE,
+ 						   CHECK_PAGE_SIZE);
+@@ -279,9 +279,9 @@ int manual_repair(int chunk_size, int syndrome_disks,
+ 	}
+ 
+ 	int write_res1, write_res2;
+-	off64_t seek_res;
++	off_t seek_res;
+ 
+-	seek_res = lseek64(source[fd1],
++	seek_res = lseek(source[fd1],
+ 			   offsets[fd1] + start * chunk_size, SEEK_SET);
+ 	if (seek_res < 0) {
+ 		fprintf(stderr, "lseek failed for failed_disk1\n");
+@@ -289,7 +289,7 @@ int manual_repair(int chunk_size, int syndrome_disks,
+ 	}
+ 	write_res1 = write(source[fd1], blocks[failed_slot1], chunk_size);
+ 
+-	seek_res = lseek64(source[fd2],
++	seek_res = lseek(source[fd2],
+ 			   offsets[fd2] + start * chunk_size, SEEK_SET);
+ 	if (seek_res < 0) {
+ 		fprintf(stderr, "lseek failed for failed_disk2\n");
+@@ -374,7 +374,7 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets,
+ 			goto exitCheck;
+ 		}
+ 		for (i = 0 ; i < raid_disks ; i++) {
+-			off64_t seek_res = lseek64(source[i], offsets[i] + start * chunk_size,
++			off_t seek_res = lseek(source[i], offsets[i] + start * chunk_size,
+ 						   SEEK_SET);
+ 			if (seek_res < 0) {
+ 				fprintf(stderr, "lseek to source %d failed\n", i);
+diff --git a/restripe.c b/restripe.c
+index a7a7229..eec3619 100644
+--- a/restripe.c
++++ b/restripe.c
+@@ -581,7 +581,7 @@ int save_stripes(int *source, unsigned long long *offsets,
+ 				       raid_disks, level, layout);
+ 			if (dnum < 0) abort();
+ 			if (source[dnum] < 0 ||
+-			    lseek64(source[dnum],
++			    lseek(source[dnum],
+ 				    offsets[dnum] + offset, 0) < 0 ||
+ 			    read(source[dnum], buf+disk * chunk_size,
+ 				 chunk_size) != chunk_size) {
+@@ -754,8 +754,8 @@ int restore_stripes(int *dest, unsigned long long *offsets,
+ 					   raid_disks, level, layout);
+ 			if (src_buf == NULL) {
+ 				/* read from file */
+-				if (lseek64(source, read_offset, 0) !=
+-					 (off64_t)read_offset) {
++				if (lseek(source, read_offset, 0) !=
++					 (off_t)read_offset) {
+ 					rv = -1;
+ 					goto abort;
+ 				}
+@@ -816,7 +816,7 @@ int restore_stripes(int *dest, unsigned long long *offsets,
+ 		}
+ 		for (i=0; i < raid_disks ; i++)
+ 			if (dest[i] >= 0) {
+-				if (lseek64(dest[i],
++				if (lseek(dest[i],
+ 					 offsets[i]+offset, 0) < 0) {
+ 					rv = -1;
+ 					goto abort;
+@@ -866,7 +866,7 @@ int test_stripes(int *source, unsigned long long *offsets,
+ 		int disk;
+ 
+ 		for (i = 0 ; i < raid_disks ; i++) {
+-			if ((lseek64(source[i], offsets[i]+start, 0) < 0) ||
++			if ((lseek(source[i], offsets[i]+start, 0) < 0) ||
+ 			    (read(source[i], stripes[i], chunk_size) !=
+ 			     chunk_size)) {
+ 				free(q);
+diff --git a/super-ddf.c b/super-ddf.c
+index 3f304cd..7b10568 100644
+--- a/super-ddf.c
++++ b/super-ddf.c
+@@ -816,7 +816,7 @@ static int load_ddf_header(int fd, unsigned long long lba,
+ 	if (lba >= size-1)
+ 		return 0;
+ 
+-	if (lseek64(fd, lba<<9, 0) < 0)
++	if (lseek(fd, lba<<9, 0) < 0)
+ 		return 0;
+ 
+ 	if (read(fd, hdr, 512) != 512)
+@@ -870,7 +870,7 @@ static void *load_section(int fd, struct ddf_super *super, void *buf,
+ 	else
+ 		offset += be64_to_cpu(super->active->secondary_lba);
+ 
+-	if ((unsigned long long)lseek64(fd, offset<<9, 0) != (offset<<9)) {
++	if ((unsigned long long)lseek(fd, offset<<9, 0) != (offset<<9)) {
+ 		if (dofree)
+ 			free(buf);
+ 		return NULL;
+@@ -889,7 +889,7 @@ static int load_ddf_headers(int fd, struct ddf_super *super, char *devname)
+ 
+ 	get_dev_size(fd, NULL, &dsize);
+ 
+-	if (lseek64(fd, dsize-512, 0) < 0) {
++	if (lseek(fd, dsize-512, 0) < 0) {
+ 		if (devname)
+ 			pr_err("Cannot seek to anchor block on %s: %s\n",
+ 			       devname, strerror(errno));
+@@ -1691,7 +1691,7 @@ static int copy_metadata_ddf(struct supertype *st, int from, int to)
+ 	if (!get_dev_size(from, NULL, &dsize))
+ 		goto err;
+ 
+-	if (lseek64(from, dsize-512, 0) < 0)
++	if (lseek(from, dsize-512, 0) < 0)
+ 		goto err;
+ 	if (read(from, buf, 512) != 512)
+ 		goto err;
+@@ -1710,8 +1710,8 @@ static int copy_metadata_ddf(struct supertype *st, int from, int to)
+ 
+ 	bytes = dsize - offset;
+ 
+-	if (lseek64(from, offset, 0) < 0 ||
+-	    lseek64(to, offset, 0) < 0)
++	if (lseek(from, offset, 0) < 0 ||
++	    lseek(to, offset, 0) < 0)
+ 		goto err;
+ 	while (written < bytes) {
+ 		int n = bytes - written;
+@@ -3037,7 +3037,7 @@ static int __write_ddf_structure(struct dl *d, struct ddf_super *ddf, __u8 type)
+ 	header->openflag = 1;
+ 	header->crc = calc_crc(header, 512);
+ 
+-	lseek64(fd, sector<<9, 0);
++	lseek(fd, sector<<9, 0);
+ 	if (write(fd, header, 512) < 0)
+ 		goto out;
+ 
+@@ -3101,7 +3101,7 @@ out:
+ 	header->openflag = 0;
+ 	header->crc = calc_crc(header, 512);
+ 
+-	lseek64(fd, sector<<9, 0);
++	lseek(fd, sector<<9, 0);
+ 	if (write(fd, header, 512) < 0)
+ 		ret = 0;
+ 
+@@ -3154,7 +3154,7 @@ static int _write_super_to_disk(struct ddf_super *ddf, struct dl *d)
+ 	if (!__write_ddf_structure(d, ddf, DDF_HEADER_SECONDARY))
+ 		return 0;
+ 
+-	lseek64(fd, (size-1)*512, SEEK_SET);
++	lseek(fd, (size-1)*512, SEEK_SET);
+ 	if (write(fd, &ddf->anchor, 512) < 0)
+ 		return 0;
+ 
+@@ -3909,7 +3909,7 @@ static int store_super_ddf(struct supertype *st, int fd)
+ 		return 1;
+ 	memset(buf, 0, 512);
+ 
+-	lseek64(fd, dsize-512, 0);
++	lseek(fd, dsize-512, 0);
+ 	rc = write(fd, buf, 512);
+ 	free(buf);
+ 	if (rc < 0)
+diff --git a/super-intel.c b/super-intel.c
+index d5fad10..236e2ee 100644
+--- a/super-intel.c
++++ b/super-intel.c
+@@ -3092,7 +3092,7 @@ static int read_imsm_migr_rec(int fd, struct intel_super *super)
+ 	unsigned long long dsize;
+ 
+ 	get_dev_size(fd, NULL, &dsize);
+-	if (lseek64(fd, dsize - (sector_size*MIGR_REC_SECTOR_POSITION),
++	if (lseek(fd, dsize - (sector_size*MIGR_REC_SECTOR_POSITION),
+ 		   SEEK_SET) < 0) {
+ 		pr_err("Cannot seek to anchor block: %s\n",
+ 		       strerror(errno));
+@@ -3283,7 +3283,7 @@ static int write_imsm_migr_rec(struct supertype *st)
+ 			continue;
+ 
+ 		get_dev_size(sd->fd, NULL, &dsize);
+-		if (lseek64(sd->fd, dsize - (MIGR_REC_SECTOR_POSITION *
++		if (lseek(sd->fd, dsize - (MIGR_REC_SECTOR_POSITION *
+ 		    sector_size),
+ 		    SEEK_SET) < 0) {
+ 			pr_err("Cannot seek to anchor block: %s\n",
+@@ -4404,7 +4404,7 @@ static int load_imsm_mpb(int fd, struct intel_super *super, char *devname)
+ 		return 1;
+ 	}
+ 
+-	if (lseek64(fd, dsize - (sector_size * 2), SEEK_SET) < 0) {
++	if (lseek(fd, dsize - (sector_size * 2), SEEK_SET) < 0) {
+ 		if (devname)
+ 			pr_err("Cannot seek to anchor block on %s: %s\n",
+ 			       devname, strerror(errno));
+@@ -4472,7 +4472,7 @@ static int load_imsm_mpb(int fd, struct intel_super *super, char *devname)
+ 	}
+ 
+ 	/* read the extended mpb */
+-	if (lseek64(fd, dsize - (sector_size * (2 + sectors)), SEEK_SET) < 0) {
++	if (lseek(fd, dsize - (sector_size * (2 + sectors)), SEEK_SET) < 0) {
+ 		if (devname)
+ 			pr_err("Cannot seek to extended mpb on %s: %s\n",
+ 			       devname, strerror(errno));
+@@ -5994,7 +5994,7 @@ static int add_to_super_imsm(struct supertype *st, mdu_disk_info_t *dk,
+ 
+ 	/* clear migr_rec when adding disk to container */
+ 	memset(super->migr_rec_buf, 0, MIGR_REC_BUF_SECTORS*MAX_SECTOR_SIZE);
+-	if (lseek64(fd, size - MIGR_REC_SECTOR_POSITION*member_sector_size,
++	if (lseek(fd, size - MIGR_REC_SECTOR_POSITION*member_sector_size,
+ 	    SEEK_SET) >= 0) {
+ 		if ((unsigned int)write(fd, super->migr_rec_buf,
+ 		    MIGR_REC_BUF_SECTORS*member_sector_size) !=
+@@ -6219,7 +6219,7 @@ static int write_super_imsm(struct supertype *st, int doclose)
+ 			unsigned long long dsize;
+ 
+ 			get_dev_size(d->fd, NULL, &dsize);
+-			if (lseek64(d->fd, dsize - sector_size,
++			if (lseek(d->fd, dsize - sector_size,
+ 			    SEEK_SET) >= 0) {
+ 				if ((unsigned int)write(d->fd,
+ 				    super->migr_rec_buf,
+@@ -6302,7 +6302,7 @@ static int write_ppl_header(unsigned long long ppl_sector, int fd, void *buf)
+ 
+ 	ppl_hdr->checksum = __cpu_to_le32(~crc32c_le(~0, buf, PPL_HEADER_SIZE));
+ 
+-	if (lseek64(fd, ppl_sector * 512, SEEK_SET) < 0) {
++	if (lseek(fd, ppl_sector * 512, SEEK_SET) < 0) {
+ 		ret = -errno;
+ 		perror("Failed to seek to PPL header location");
+ 		return ret;
+@@ -6396,7 +6396,7 @@ static int validate_ppl_imsm(struct supertype *st, struct mdinfo *info,
+ 
+ 		dprintf("Checking potential PPL at offset: %llu\n", ppl_offset);
+ 
+-		if (lseek64(d->fd, info->ppl_sector * 512 + ppl_offset,
++		if (lseek(d->fd, info->ppl_sector * 512 + ppl_offset,
+ 			    SEEK_SET) < 0) {
+ 			perror("Failed to seek to PPL header location");
+ 			ret = -1;
+@@ -8858,7 +8858,7 @@ static int store_imsm_mpb(int fd, struct imsm_super *mpb)
+ 		sectors = mpb_sectors(mpb, sector_size) - 1;
+ 
+ 		/* write the extended mpb to the sectors preceeding the anchor */
+-		if (lseek64(fd, dsize - (sector_size * (2 + sectors)),
++		if (lseek(fd, dsize - (sector_size * (2 + sectors)),
+ 		   SEEK_SET) < 0)
+ 			return 1;
+ 
+@@ -8868,7 +8868,7 @@ static int store_imsm_mpb(int fd, struct imsm_super *mpb)
+ 	}
+ 
+ 	/* first block is stored on second to last sector of the disk */
+-	if (lseek64(fd, dsize - (sector_size * 2), SEEK_SET) < 0)
++	if (lseek(fd, dsize - (sector_size * 2), SEEK_SET) < 0)
+ 		return 1;
+ 
+ 	if ((unsigned int)write(fd, buf, sector_size) != sector_size)
+@@ -11058,7 +11058,7 @@ int recover_backup_imsm(struct supertype *st, struct mdinfo *info)
+ 			skipped_disks++;
+ 			continue;
+ 		}
+-		if (lseek64(dl_disk->fd, read_offset, SEEK_SET) < 0) {
++		if (lseek(dl_disk->fd, read_offset, SEEK_SET) < 0) {
+ 			pr_err("Cannot seek to block: %s\n",
+ 			       strerror(errno));
+ 			skipped_disks++;
+@@ -11070,7 +11070,7 @@ int recover_backup_imsm(struct supertype *st, struct mdinfo *info)
+ 			skipped_disks++;
+ 			continue;
+ 		}
+-		if (lseek64(dl_disk->fd, write_offset, SEEK_SET) < 0) {
++		if (lseek(dl_disk->fd, write_offset, SEEK_SET) < 0) {
+ 			pr_err("Cannot seek to block: %s\n",
+ 			       strerror(errno));
+ 			skipped_disks++;
+@@ -12320,7 +12320,7 @@ static int imsm_manage_reshape(
+ 		unsigned long long dsize;
+ 
+ 		get_dev_size(d->fd, NULL, &dsize);
+-		if (lseek64(d->fd, dsize - MIGR_REC_SECTOR_POSITION*sector_size,
++		if (lseek(d->fd, dsize - MIGR_REC_SECTOR_POSITION*sector_size,
+ 			    SEEK_SET) >= 0) {
+ 			if ((unsigned int)write(d->fd, super->migr_rec_buf,
+ 			    MIGR_REC_BUF_SECTORS*sector_size) !=
+@@ -12476,7 +12476,7 @@ static int validate_internal_bitmap_for_drive(struct supertype *st,
+ 		}
+ 	}
+ 
+-	if (lseek64(fd, offset * super->sector_size, SEEK_SET) < 0)
++	if (lseek(fd, offset * super->sector_size, SEEK_SET) < 0)
+ 		goto abort;
+ 	if (read(fd, read_buf, IMSM_BITMAP_HEADER_SIZE) !=
+ 	    IMSM_BITMAP_HEADER_SIZE)
+@@ -12605,7 +12605,7 @@ static int locate_bitmap_imsm(struct supertype *st, int fd, int node_num)
+ 	offset = get_bitmap_header_sector(super, super->current_vol);
+ 	dprintf("bitmap header offset is %llu\n", offset);
+ 
+-	lseek64(fd, offset << 9, 0);
++	lseek(fd, offset << 9, 0);
+ 
+ 	return 0;
+ }
+@@ -12659,7 +12659,7 @@ static int write_init_bitmap_imsm(struct supertype *st, int fd,
+ 		return -1;
+ 	memset(buf, 0xFF, MAX_SECTOR_SIZE);
+ 	offset = get_bitmap_sector(super, vol_idx);
+-	lseek64(fd, offset << 9, 0);
++	lseek(fd, offset << 9, 0);
+ 	while (written < IMSM_BITMAP_AREA_SIZE) {
+ 		to_write = IMSM_BITMAP_AREA_SIZE - written;
+ 		if (to_write > MAX_SECTOR_SIZE)
+diff --git a/super0.c b/super0.c
+index b79b97a..74bb418 100644
+--- a/super0.c
++++ b/super0.c
+@@ -327,12 +327,12 @@ static int copy_metadata0(struct supertype *st, int from, int to)
+ 
+ 	offset *= 512;
+ 
+-	if (lseek64(from, offset, 0) < 0LL)
++	if (lseek(from, offset, 0) < 0LL)
+ 		goto err;
+ 	if (read(from, buf, bufsize) != bufsize)
+ 		goto err;
+ 
+-	if (lseek64(to, offset, 0) < 0LL)
++	if (lseek(to, offset, 0) < 0LL)
+ 		goto err;
+ 	super = buf;
+ 	if (super->md_magic != MD_SB_MAGIC ||
+@@ -862,7 +862,7 @@ static int store_super0(struct supertype *st, int fd)
+ 		offset = dsize/512 - 8*2;
+ 		offset &= ~(4*2-1);
+ 		offset *= 512;
+-		if (lseek64(fd, offset, 0)< 0LL)
++		if (lseek(fd, offset, 0)< 0LL)
+ 			ret = 3;
+ 		else if (write(fd, st->other, 1024) != 1024)
+ 			ret = 4;
+@@ -877,7 +877,7 @@ static int store_super0(struct supertype *st, int fd)
+ 
+ 	offset *= 512;
+ 
+-	if (lseek64(fd, offset, 0)< 0LL)
++	if (lseek(fd, offset, 0)< 0LL)
+ 		return 3;
+ 
+ 	if (write(fd, super, sizeof(*super)) != sizeof(*super))
+@@ -1004,7 +1004,7 @@ static int load_super0(struct supertype *st, int fd, char *devname)
+ 
+ 	offset *= 512;
+ 
+-	if (lseek64(fd, offset, 0)< 0LL) {
++	if (lseek(fd, offset, 0)< 0LL) {
+ 		if (devname)
+ 			pr_err("Cannot seek to superblock on %s: %s\n",
+ 				devname, strerror(errno));
+@@ -1189,7 +1189,7 @@ static int locate_bitmap0(struct supertype *st, int fd, int node_num)
+ 
+ 	offset += MD_SB_BYTES;
+ 
+-	lseek64(fd, offset, 0);
++	lseek(fd, offset, 0);
+ 	return 0;
+ }
+ 
+@@ -1214,7 +1214,7 @@ static int write_bitmap0(struct supertype *st, int fd, enum bitmap_update update
+ 
+ 	offset *= 512;
+ 
+-	if (lseek64(fd, offset + 4096, 0)< 0LL)
++	if (lseek(fd, offset + 4096, 0)< 0LL)
+ 		return 3;
+ 
+ 	if (posix_memalign(&buf, 4096, 4096))
+diff --git a/super1.c b/super1.c
+index a12a5bc..4e098b0 100644
+--- a/super1.c
++++ b/super1.c
+@@ -761,7 +761,7 @@ static int copy_metadata1(struct supertype *st, int from, int to)
+ 		goto err;
+ 	}
+ 
+-	if (lseek64(from, sb_offset << 9, 0) < 0LL)
++	if (lseek(from, sb_offset << 9, 0) < 0LL)
+ 		goto err;
+ 	if (read(from, buf, bufsize) != bufsize)
+ 		goto err;
+@@ -775,7 +775,7 @@ static int copy_metadata1(struct supertype *st, int from, int to)
+ 	    calc_sb_1_csum(sb) != super.sb_csum)
+ 		goto err;
+ 
+-	if (lseek64(to, sb_offset << 9, 0) < 0LL)
++	if (lseek(to, sb_offset << 9, 0) < 0LL)
+ 		goto err;
+ 	if (write(to, buf, bufsize) != bufsize)
+ 		goto err;
+@@ -791,9 +791,9 @@ static int copy_metadata1(struct supertype *st, int from, int to)
+ 
+ 		bitmap_offset += (int32_t)__le32_to_cpu(super.bitmap_offset);
+ 
+-		if (lseek64(from, bitmap_offset<<9, 0) < 0)
++		if (lseek(from, bitmap_offset<<9, 0) < 0)
+ 			goto err;
+-		if (lseek64(to, bitmap_offset<<9, 0) < 0)
++		if (lseek(to, bitmap_offset<<9, 0) < 0)
+ 			goto err;
+ 
+ 		for (written = 0; written < bytes ; ) {
+@@ -832,9 +832,9 @@ static int copy_metadata1(struct supertype *st, int from, int to)
+ 
+ 		bb_offset += (int32_t)__le32_to_cpu(super.bblog_offset);
+ 
+-		if (lseek64(from, bb_offset<<9, 0) < 0)
++		if (lseek(from, bb_offset<<9, 0) < 0)
+ 			goto err;
+-		if (lseek64(to, bb_offset<<9, 0) < 0)
++		if (lseek(to, bb_offset<<9, 0) < 0)
+ 			goto err;
+ 
+ 		for (written = 0; written < bytes ; ) {
+@@ -940,7 +940,7 @@ static int examine_badblocks_super1(struct supertype *st, int fd, char *devname)
+ 	offset = __le64_to_cpu(sb->super_offset) +
+ 		(int)__le32_to_cpu(sb->bblog_offset);
+ 	offset <<= 9;
+-	if (lseek64(fd, offset, 0) < 0) {
++	if (lseek(fd, offset, 0) < 0) {
+ 		pr_err("Cannot seek to bad-blocks list\n");
+ 		return 1;
+ 	}
+@@ -1797,7 +1797,7 @@ static int store_super1(struct supertype *st, int fd)
+ 		abort();
+ 	}
+ 
+-	if (lseek64(fd, sb_offset << 9, 0)< 0LL)
++	if (lseek(fd, sb_offset << 9, 0)< 0LL)
+ 		return 3;
+ 
+ 	sbsize = ROUND_UP(sizeof(*sb) + 2 * __le32_to_cpu(sb->max_dev), 512);
+@@ -1866,7 +1866,7 @@ static int write_init_ppl1(struct supertype *st, struct mdinfo *info, int fd)
+ 						      sizeof(sb->set_uuid)));
+ 	ppl_hdr->checksum = __cpu_to_le32(~crc32c_le(~0, buf, PPL_HEADER_SIZE));
+ 
+-	if (lseek64(fd, info->ppl_sector * 512, SEEK_SET) < 0) {
++	if (lseek(fd, info->ppl_sector * 512, SEEK_SET) < 0) {
+ 		ret = errno;
+ 		perror("Failed to seek to PPL header location");
+ 	}
+@@ -1911,7 +1911,7 @@ static int write_empty_r5l_meta_block(struct supertype *st, int fd)
+ 	crc = crc32c_le(crc, (void *)mb, META_BLOCK_SIZE);
+ 	mb->checksum = crc;
+ 
+-	if (lseek64(fd, __le64_to_cpu(sb->data_offset) * 512, 0) < 0LL) {
++	if (lseek(fd, __le64_to_cpu(sb->data_offset) * 512, 0) < 0LL) {
+ 		pr_err("cannot seek to offset of the meta block\n");
+ 		goto fail_to_write;
+ 	}
+@@ -2268,7 +2268,7 @@ static int load_super1(struct supertype *st, int fd, char *devname)
+ 		return -EINVAL;
+ 	}
+ 
+-	if (lseek64(fd, sb_offset << 9, 0)< 0LL) {
++	if (lseek(fd, sb_offset << 9, 0)< 0LL) {
+ 		if (devname)
+ 			pr_err("Cannot seek to superblock on %s: %s\n",
+ 				devname, strerror(errno));
+@@ -2639,7 +2639,7 @@ static int locate_bitmap1(struct supertype *st, int fd, int node_num)
+ 	}
+ 	if (mustfree)
+ 		free(sb);
+-	lseek64(fd, offset<<9, 0);
++	lseek(fd, offset<<9, 0);
+ 	return ret;
+ }
+ 
+diff --git a/swap_super.c b/swap_super.c
+index b6db574..9c39aff 100644
+--- a/swap_super.c
++++ b/swap_super.c
+@@ -16,7 +16,7 @@
+ 
+ #define MD_NEW_SIZE_SECTORS(x)		((x & ~(MD_RESERVED_SECTORS - 1)) - MD_RESERVED_SECTORS)
+ 
+-extern long long lseek64(int, long long, int);
++extern long long lseek(int, long long, int);
+ 
+ int main(int argc, char *argv[])
+ {
+@@ -38,8 +38,8 @@ int main(int argc, char *argv[])
+ 		exit(1);
+ 	}
+ 	offset = MD_NEW_SIZE_SECTORS(size) * 512LL;
+-	if (lseek64(fd, offset, 0) < 0LL) {
+-		perror("lseek64");
++	if (lseek(fd, offset, 0) < 0LL) {
++		perror("lseek");
+ 		exit(1);
+ 	}
+ 	if (read(fd, super, 4096) != 4096) {
+@@ -68,8 +68,8 @@ int main(int argc, char *argv[])
+ 		super[32*4+10*4 +i] = t;
+ 	}
+ 
+-	if (lseek64(fd, offset, 0) < 0LL) {
+-		perror("lseek64");
++	if (lseek(fd, offset, 0) < 0LL) {
++		perror("lseek");
+ 		exit(1);
+ 	}
+ 	if (write(fd, super, 4096) != 4096) {
+diff --git a/util.c b/util.c
+index 3d05d07..6109fd4 100644
+--- a/util.c
++++ b/util.c
+@@ -2344,7 +2344,7 @@ int zero_disk_range(int fd, unsigned long long sector, size_t count)
+ 		return -1;
+ 	}
+ 
+-	if (lseek64(fd, sector * 512, SEEK_SET) < 0) {
++	if (lseek(fd, sector * 512, SEEK_SET) < 0) {
+ 		ret = -errno;
+ 		pr_err("Failed to seek offset for zeroing\n");
+ 		goto out;
diff --git a/main/mdadm/mdadm-raid.initd b/main/mdadm/mdadm-raid.initd
index 368860ae014..77f879514d2 100644
--- a/main/mdadm/mdadm-raid.initd
+++ b/main/mdadm/mdadm-raid.initd
@@ -28,7 +28,7 @@ start() {
 
 is_mounted_as() {
 	local mnt
-	for mnt in $(awk "\$1 == \"$1\" {print \$2}" /proc/mounts); do
+	for mnt in $(lsblk -o MOUNTPOINT $1); do
 		[ "$mnt" = "$2" ] && return 0
 	done
 	return 1
diff --git a/main/mdadm/no-werror.patch b/main/mdadm/no-werror.patch
index f4164c5950b..f1a6b10a4ca 100644
--- a/main/mdadm/no-werror.patch
+++ b/main/mdadm/no-werror.patch
@@ -2,9 +2,9 @@ diff --git a/Makefile b/Makefile
 index 5fd7f16..5095a42 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -43,7 +43,7 @@ KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIB
- 
- CC ?= $(CROSS_COMPILE)gcc
+@@ -50,7 +50,7 @@ ifeq ($(origin CC),default)
+ CC := $(CROSS_COMPILE)gcc
+ endif
  CXFLAGS ?= -ggdb
 -CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
 +CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
diff --git a/main/mdev-conf/APKBUILD b/main/mdev-conf/APKBUILD
new file mode 100644
index 00000000000..ef45021a0ee
--- /dev/null
+++ b/main/mdev-conf/APKBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=mdev-conf
+pkgver=4.6
+pkgrel=0
+pkgdesc="Configuration files for mdev and mdevd"
+url="https://gitlab.alpinelinux.org/alpine/mdev-conf"
+arch="noarch"
+license="MIT"
+checkdepends="kyua"
+replaces="busybox-initscripts"
+source="https://gitlab.alpinelinux.org/alpine/mdev-conf/-/archive/$pkgver/mdev-conf-$pkgver.tar.gz
+	"
+
+build() {
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+51334962944701e95d3e6da10aa9f9806c89fd10caaed906336f54e8dfa75275c86ed27c6dacac082978a43b3251cfca28e2fd6ec417e628f58c02d84c977d0e  mdev-conf-4.6.tar.gz
+"
diff --git a/main/mdevd/APKBUILD b/main/mdevd/APKBUILD
new file mode 100644
index 00000000000..6509c6e0992
--- /dev/null
+++ b/main/mdevd/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: Laurent Bercot <ska-devel@skarnet.org>
+# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
+pkgname=mdevd
+pkgver=0.1.6.3
+pkgrel=0
+pkgdesc="A netlink-listening device manager using mdev's configuration files"
+url=https://skarnet.org/software/mdevd/
+arch="all"
+license="ISC"
+options="!check"  # no tests provided
+depends_openrc="mdevd mdev-conf"
+makedepends="linux-headers skalibs-dev>=2.14"
+subpackages="$pkgname-doc $pkgname-openrc"
+source="https://skarnet.org/software/mdevd/mdevd-$pkgver.tar.gz
+	$pkgname.initd
+	mdevd-init.initd"
+
+build() {
+	./configure \
+		--enable-shared \
+		--enable-static \
+		--disable-allstatic
+	make
+}
+
+package() {
+	make install DESTDIR="$pkgdir"
+	mkdir -p "$pkgdir/usr/share/doc" "$pkgdir/etc/init.d"
+	cp -a doc "$pkgdir/usr/share/doc/$pkgname"
+	install -m 755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	install -m 755 "$srcdir"/mdevd-init.initd "$pkgdir"/etc/init.d/mdevd-init
+}
+
+openrc() {
+	provides="dev-openrc"
+	provider_priority=20
+	default_openrc
+}
+
+sha512sums="
+2962be689858117960aa5b332bbc7ca31c2d6592bae1c10acb35a7d66e4bf093cc70d2966649b742ce10ab3ac252b49a4b86b2c548355544aae65ca6214cdaf1  mdevd-0.1.6.3.tar.gz
+3d826495788b1530548e090675f91fe4828f78a95b3b24cb4c73b92f5d5c16b103e6c25a2591d2d0bd17da2d16fa59d1214e70d936930f25cd9872dfd202585b  mdevd.initd
+a1e4734b1ad1a508da6c035aa9523a465cfd44489cceb7552f3b6e94ca8b8fb39e6baa3b230388ff9e89c1edbdcac5682f4c636b9fe52d94a92ac98f55bdd972  mdevd-init.initd
+"
diff --git a/main/mdevd/mdevd-init.initd b/main/mdevd/mdevd-init.initd
new file mode 100644
index 00000000000..daaf82321de
--- /dev/null
+++ b/main/mdevd/mdevd-init.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 2022 Laurent Bercot for Alpine Linux
+# Distributed under the terms of the ISC License.
+
+description="coldplug trigger for mdevd"
+
+depend() {
+	need mdevd
+	before checkfs fsck
+	keyword -containers -vserver -lxc
+}
+
+start() {
+	ebegin "Scanning hardware for mdevd"
+	mdevd-coldplug -O4
+	eend $?
+}
diff --git a/main/mdevd/mdevd.initd b/main/mdevd/mdevd.initd
new file mode 100644
index 00000000000..1034ac558ae
--- /dev/null
+++ b/main/mdevd/mdevd.initd
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 2022 Laurent Bercot for Alpine Linux
+# Distributed under the terms of the ISC License.
+
+description="a netlink-listening device manager similar to mdev"
+extra_started_commands="reload"
+description_reload="Reload mdevd's configuration file"
+command="/bin/mdevd"
+command_args="-O4"  # send handled events to nlgrp 4 for libudev-zero
+command_background="yes"
+pidfile="/run/mdevd.pid"
+
+depend() {
+	provide dev
+	need sysfs dev-mount
+	before checkfs fsck
+	keyword -containers -lxc -vserver
+}
+
+reload() {
+	kill -1 `cat "$pidfile"`
+}
diff --git a/main/mdocml/APKBUILD b/main/mdocml/APKBUILD
deleted file mode 100644
index f5ae0f2583e..00000000000
--- a/main/mdocml/APKBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=mdocml
-_pkgname=mandoc
-pkgver=1.14.5
-pkgrel=3
-pkgdesc="mdoc/man compiler"
-url="http://mdocml.bsd.lv/"
-arch="all"
-license="ISC and BSD-2-Clause and BSD-3-Clause"
-makedepends="zlib-dev"
-checkdepends="perl"
-install="$pkgname.post-deinstall"
-triggers="$pkgname-apropos.trigger=/usr/share/man/*"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-apropos $pkgname-soelim"
-source="http://mdocml.bsd.lv/snapshots/$_pkgname-$pkgver.tar.gz
-	shared-libmandoc.patch
-	outdated-warn-disable.patch
-	fix-tbl-null-pointer.patch
-	mandoc_configure.patch
-	"
-
-builddir="$srcdir/$_pkgname-$pkgver"
-prepare() {
-	default_prepare
-
-	cat >configure.local<<-__EOF__
-	PREFIX=/usr
-	MANDIR=/usr/share/man
-	LIBDIR=/usr/lib
-	CFLAGS="$CFLAGS"
-	UTF8_LOCALE="en_US.UTF-8"
-	MANPATH_DEFAULT="/usr/share/man:/usr/local/man"
-	LN="ln -sf"
-__EOF__
-}
-
-build() {
-	HAVE_LESS_T=0 MANPATH_BASE="/usr/share/man" ./configure
-	make
-}
-
-check() {
-	LD_LIBRARY_PATH="$builddir" make regress
-}
-
-package() {
-	make -j1 DESTDIR="$pkgdir" base-install lib-install
-}
-
-apropos() {
-	pkgdesc="makewhatis/whatis and apropos tools and index"
-	mkdir -p "$subpkgdir"/usr/sbin "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/apropos \
-		"$pkgdir"/usr/bin/whatis \
-		"$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/sbin/makewhatis \
-		"$subpkgdir"/usr/sbin/
-}
-
-soelim() {
-	pkgdesc="so elimination tool"
-	depends=""
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/soelim \
-		"$subpkgdir"/usr/bin/
-}
-
-sha512sums="848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52  mandoc-1.14.5.tar.gz
-b1bd2c197584948cc8bab2310e759b8942b9f9479254ffb5a8223cfa6ba03c9e1a4d402c5440b8d9f962be9a020287d3dd8556592c17f2b46f15f405d9d373cb  shared-libmandoc.patch
-ced05e8b57fb9705c6d8d8570cd6b06ad187511a4c243ac2dbc34064aa164ca49e0c877160134161dcb98ebd5e61a5c23d5741f03ef95903ff56193dd07f36a1  outdated-warn-disable.patch
-bb46bc3a0f07881e5362b32d478632fb209f9740017c467f2258e9b7ddbece6175bba598287d8c24626c9ee7217eb92ae60e0a30aeafdfc4b0154f4d312cbcca  fix-tbl-null-pointer.patch
-a44d86fb012acbc05eb233122e7ca3170e5e01c7c49115c2fe83f49891d442ba94601a039018cfa01cc1ef3cd02d5aff4d1e01abd4230b8bc2091e649ad991db  mandoc_configure.patch"
diff --git a/main/mdocml/fix-tbl-null-pointer.patch b/main/mdocml/fix-tbl-null-pointer.patch
deleted file mode 100644
index ab68f9a1a69..00000000000
--- a/main/mdocml/fix-tbl-null-pointer.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-===================================================================
-RCS file: /cvs/mandoc/tbl_term.c,v
-retrieving revision 1.69
-retrieving revision 1.70
-diff -u -p -r1.69 -r1.70
---- a/tbl_term.c	2019/03/16 21:35:48	1.69
-+++ b/tbl_term.c	2019/03/18 08:00:34	1.70
-@@ -629,7 +629,8 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp
- 
- 		lw = cpp == NULL || cpn == NULL ||
- 		    (cpn->pos != TBL_CELL_DOWN &&
--		     (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
-+		     (dpn == NULL || dpn->string == NULL ||
-+		      strcmp(dpn->string, "\\^") != 0))
- 		    ? hw : 0;
- 		tbl_direct_border(tp, BHORIZ * lw,
- 		    col->width + col->spacing / 2);
-@@ -675,7 +676,8 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp
- 
- 		rw = cpp == NULL || cpn == NULL ||
- 		    (cpn->pos != TBL_CELL_DOWN &&
--		     (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
-+		     (dpn == NULL || dpn->string == NULL ||
-+		      strcmp(dpn->string, "\\^") != 0))
- 		    ? hw : 0;
- 
- 		/* The line crossing at the end of this column. */
diff --git a/main/mdocml/mandoc_configure.patch b/main/mdocml/mandoc_configure.patch
deleted file mode 100644
index e059f6c1c27..00000000000
--- a/main/mdocml/mandoc_configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/configure b/configure
---- a/configure
-+++ b/configure
-@@ -41,7 +41,7 @@
- OSNAME=
- UTF8_LOCALE=
- 
--CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -`
-+CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i PATH="${PATH}" make -sf -`
- CFLAGS=
- LDADD=
- LDFLAGS=
diff --git a/main/mdocml/mdocml-apropos.trigger b/main/mdocml/mdocml-apropos.trigger
deleted file mode 100644
index 517480493fb..00000000000
--- a/main/mdocml/mdocml-apropos.trigger
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/sbin/makewhatis -a -T utf8 /usr/share/man
diff --git a/main/mdocml/outdated-warn-disable.patch b/main/mdocml/outdated-warn-disable.patch
deleted file mode 100644
index f960de7d1d0..00000000000
--- a/main/mdocml/outdated-warn-disable.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/main.c b/main.c
---- a/main.c	2019-03-03 15:24:23.600767518 +0000
-+++ b/main.c	2019-03-03 15:27:37.609820365 +0000
-@@ -676,8 +676,6 @@
- 	return globres != -1;
- 
- found:
--	warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s",
--	    name, sec, BINM_MAKEWHATIS, paths->paths[ipath]);
- 	if (res == NULL) {
- 		free(file);
- 		return 1;
diff --git a/main/mdocml/shared-libmandoc.patch b/main/mdocml/shared-libmandoc.patch
deleted file mode 100644
index 0327138382a..00000000000
--- a/main/mdocml/shared-libmandoc.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/Makefile b/Makefile
-index f4e2954..d153224 100644
---- a/Makefile
-+++ b/Makefile
-@@ -367,9 +367,13 @@ WWW_INCS	 = eqn.h.html \
- 		   tbl_int.h.html \
- 		   tbl_parse.h.html
- 
-+LIBMANDOC        = libmandoc.so
-+MANDOCLIB        = -L. -lmandoc
-+
- # === USER CONFIGURATION ===============================================
- 
- include Makefile.local
-+CFLAGS           += -fPIC
- 
- # === DEPENDENCY HANDLING ==============================================
- 
-@@ -392,7 +396,7 @@ distclean: clean
- 	rm -f Makefile.local config.h config.h.old config.log config.log.old
- 
- clean:
--	rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS)
-+	rm -f $(LIBMANDOC) $(LIBMANDOC_OBJS) $(COMPAT_OBJS)
- 	rm -f mandoc $(MAIN_OBJS)
- 	rm -f man.cgi $(CGI_OBJS)
- 	rm -f mandocd catman catman.o $(MANDOCD_OBJS)
-@@ -431,11 +435,11 @@ base-install: mandoc demandoc soelim
- 	$(INSTALL_MAN) makewhatis.8 \
- 		$(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8
- 
--lib-install: libmandoc.a
-+lib-install: $(LIBMANDOC)
- 	mkdir -p $(DESTDIR)$(LIBDIR)
- 	mkdir -p $(DESTDIR)$(INCLUDEDIR)
- 	mkdir -p $(DESTDIR)$(MANDIR)/man3
--	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
-+	$(INSTALL_LIB) $(LIBMANDOC) $(DESTDIR)$(LIBDIR)
- 	$(INSTALL_LIB) eqn.h man.h mandoc.h mandoc_aux.h mandoc_parse.h \
- 		mdoc.h roff.h tbl.h $(DESTDIR)$(INCLUDEDIR)
- 	$(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
-@@ -511,23 +515,23 @@ Makefile.local config.h: configure $(TESTSRCS)
- 	@echo "$@ is out of date; please run ./configure"
- 	@exit 1
- 
--libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
--	ar rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
-+libmandoc.so: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
-+	$(CC) $(LDFLAGS) -shared -o $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) $(LDADD)
- 
--mandoc: $(MAIN_OBJS) libmandoc.a
--	$(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) libmandoc.a $(LDADD)
-+mandoc: $(MAIN_OBJS) $(LIBMANDOC)
-+	$(CC) -o $@ $(LDFLAGS) $(MAIN_OBJS) $(MANDOCLIB) $(LDADD)
- 
- man.cgi: $(CGI_OBJS) libmandoc.a
- 	$(CC) $(STATIC) -o $@ $(LDFLAGS) $(CGI_OBJS) libmandoc.a $(LDADD)
- 
--mandocd: $(MANDOCD_OBJS) libmandoc.a
--	$(CC) -o $@ $(LDFLAGS) $(MANDOCD_OBJS) libmandoc.a $(LDADD)
-+mandocd: $(MANDOCD_OBJS) $(LIBMANDOC)
-+	$(CC) -o $@ $(LDFLAGS) $(MANDOCD_OBJS) $(LIBMANDOC) $(LDADD)
- 
--catman: catman.o libmandoc.a
--	$(CC) -o $@ $(LDFLAGS) catman.o libmandoc.a $(LDADD)
-+catman: catman.o $(LIBMANDOC)
-+	$(CC) -o $@ $(LDFLAGS) catman.o $(LIBMANDOC) $(LDADD)
- 
--demandoc: $(DEMANDOC_OBJS) libmandoc.a
--	$(CC) -o $@ $(LDFLAGS) $(DEMANDOC_OBJS) libmandoc.a $(LDADD)
-+demandoc: $(DEMANDOC_OBJS) $(LIBMANDOC)
-+	$(CC) -o $@ $(LDFLAGS) $(DEMANDOC_OBJS) $(LIBMANDOC) $(LDADD)
- 
- soelim: $(SOELIM_OBJS)
- 	$(CC) -o $@ $(LDFLAGS) $(SOELIM_OBJS)
-
diff --git a/main/memcached/APKBUILD b/main/memcached/APKBUILD
index e9ff6530a82..0cad10ec0ce 100644
--- a/main/memcached/APKBUILD
+++ b/main/memcached/APKBUILD
@@ -1,21 +1,28 @@
 # Contributor: Jeff Bilyk <jbilyk@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=memcached
-pkgver=1.6.3
+pkgver=1.6.26
 pkgrel=0
 pkgdesc="Distributed memory object caching system"
 url="https://memcached.org/"
 arch="all"
 license="BSD-3-Clause"
 depends_dev="$pkgname=$pkgver-r$pkgrel"
-makedepends="$depends_dev cyrus-sasl-dev libevent-dev libseccomp-dev linux-headers"
+makedepends="$depends_dev cyrus-sasl-dev libevent-dev libseccomp-dev linux-headers bsd-compat-headers"
 install="$pkgname.pre-install"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
 source="https://www.memcached.org/files/memcached-$pkgver.tar.gz
 	$pkgname.confd
-	$pkgname.initd"
+	$pkgname.initd
+	fix-bsd-headers.patch
+	"
+
+# secfixes:
+#   0:
+#     - CVE-2022-26635
 
 build() {
+	CFLAGS="$CFLAGS -flto=auto -O2" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -38,6 +45,9 @@ package() {
 		"$pkgdir/etc/conf.d/$pkgname"
 }
 
-sha512sums="f51248906f59eca3025dd8b56adcd49dcacbf706f66b0fbdafeb054a213d5595a8e13dc38a365cf852d3b1058f90a981f464e24025a4f33dccd09aa579f7cbbd  memcached-1.6.3.tar.gz
+sha512sums="
+7bd0d0dc0d228cde2fc3841c8973a2dde86bd50a4819f9737a22e12435f61d7459655029da390b63b8e6c3ca555b92a9c4c125a7c0bef5e6b051216414f1d49e  memcached-1.6.26.tar.gz
 31bd788433b8021ed332f86d291e7f03222ae234520e52ba673b581d5da2adf5656e8f73e8b985df73258dea9b2a1b8ef36195163fe47a92fda59825deedfed4  memcached.confd
-11566ce544c3feedbbcca7f87cf21c9d7f7e47c8a0ebdbc0e833ac18a858211c5b00d4128457f957401f6f20453f0cbe902570488133a503c79ee01c102a7c18  memcached.initd"
+11566ce544c3feedbbcca7f87cf21c9d7f7e47c8a0ebdbc0e833ac18a858211c5b00d4128457f957401f6f20453f0cbe902570488133a503c79ee01c102a7c18  memcached.initd
+5b1ea6b0be30ca82b914532f698eea9c05eded06b45385b0fc565ee1c241836df36d421e0b86f8fe15876519d5d2e9661e30f8af0d1485b71be3f0896aedf9dd  fix-bsd-headers.patch
+"
diff --git a/main/memcached/fix-bsd-headers.patch b/main/memcached/fix-bsd-headers.patch
new file mode 100644
index 00000000000..03d00e3a68d
--- /dev/null
+++ b/main/memcached/fix-bsd-headers.patch
@@ -0,0 +1,22 @@
+--- a/thread.c
++++ b/thread.c
+@@ -16,7 +16,7 @@
+ #include <string.h>
+ #include <pthread.h>
+ 
+-#include "queue.h"
++#include <sys/queue.h>
+ 
+ #ifdef __sun
+ #include <atomic.h>
+--- a/cache.h
++++ b/cache.h
+@@ -2,7 +2,7 @@
+ #ifndef CACHE_H
+ #define CACHE_H
+ #include <pthread.h>
+-#include "queue.h"
++#include <sys/queue.h>
+ 
+ #ifndef NDEBUG
+ /* may be used for debug purposes */
diff --git a/main/menu-cache/APKBUILD b/main/menu-cache/APKBUILD
deleted file mode 100644
index 98e3c432302..00000000000
--- a/main/menu-cache/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
-# Maintainer:
-
-pkgname=menu-cache
-pkgver=0.5.1
-pkgrel=2
-pkgdesc="Caching mechanism for freedesktop.org compliant menus"
-arch="all"
-license="GPL-2.0+"
-url="https://lxde.org/"
-makedepends="glib-dev"
-options="!check libtool"  # No test suite.
-source="https://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz"
-subpackages="$pkgname-dev"
-
-prepare() {
-	cd "$builddir"
-	update_config_guess
-	default_prepare
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib/menu-cache \
-		--disable-static
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="44d55a01f5452804e77518c4a2ba400a5b65edbf4061e346a6c02356195867eaa0bb9eaa057fbf603ddf79759acb16632bf3b7ae543eebc1544e28517cd23066  menu-cache-0.5.1.tar.gz"
diff --git a/main/mercurial/APKBUILD b/main/mercurial/APKBUILD
deleted file mode 100644
index 2da0d1c4be3..00000000000
--- a/main/mercurial/APKBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=mercurial
-pkgver=5.3.1
-pkgrel=1
-pkgdesc="Scalable distributed SCM tool"
-url="https://www.mercurial-scm.org"
-arch="all"
-license="GPL-2.0-or-later"
-depends="python3"
-makedepends="python3-dev"
-subpackages="
-	$pkgname-doc
-	$pkgname-vim:vim:noarch
-	$pkgname-zsh-completion:zshcomp:noarch
-	$pkgname-bash-completion:bashcomp:noarch
-	"
-source="https://www.mercurial-scm.org/release/mercurial-$pkgver.tar.gz archive_gzip.patch"
-
-# secfixes:
-#   4.9-r0:
-#     - CVE-2019-3902
-
-build() {
-	HGPYTHON3=1 python3 setup.py build
-}
-
-package() {
-	HGPYTHON3=1 python3 setup.py install --root="$pkgdir"
-	install -m755 contrib/hgk contrib/hg-ssh hgeditor "$pkgdir"/usr/bin
-
-	local man
-	for man in doc/*.?; do
-		install -Dm644 "$man" \
-			"$pkgdir"/usr/share/man/man${man##*.}/${man##*/}
-	done
-}
-
-vim() {
-	depends=""
-	pkgdesc="Vim syntax for $pkgname"
-	install_if="vim $pkgname=$pkgver-r$pkgrel"
-
-	cd "$builddir"/contrib/vim/
-	mkdir -p "$subpkgdir"/usr/share/vim/vimfiles/syntax/
-	install -Dm644 HGAnnotate.vim hgtest.vim \
-		"$subpkgdir"/usr/share/vim/vimfiles/syntax/
-}
-
-zshcomp() {
-	depends=""
-	pkgdesc="Zsh completion for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel zsh"
-
-	install -Dm644 "$builddir"/contrib/zsh_completion \
-		"$subpkgdir"/usr/share/zsh/site-functions/_$pkgname
-}
-
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completion for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
-	install -Dm644 "$builddir"/contrib/bash_completion \
-		"$subpkgdir"/usr/share/bash-completion/completions/$pkgname
-}
-
-sha512sums="3bc49ea96cb4ac0e777f667a3243917af495a001534b6b91141fc93b5c47a8eddc84331e1cb0b981fac1bf451dcfc91b8c538134983733466248fdc20afd39c6  mercurial-5.3.1.tar.gz
-42974b580e5dafc562fdce9728b90f882a2cfb10c3c0adbd50d41382bd6bcf3a430be6fc81c52a3baa3955677999bf4662c5e5b5bc90891ba9c862ec27c448a2  archive_gzip.patch"
diff --git a/main/mercurial/archive_gzip.patch b/main/mercurial/archive_gzip.patch
deleted file mode 100644
index 5f4f81ecff8..00000000000
--- a/main/mercurial/archive_gzip.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User Ludovic Chabant <ludovic@chabant.com>
-# Date 1583871438 0
-#      Tue Mar 10 20:17:18 2020 +0000
-# Node ID 70878db5d0ede9c39128328cfa8cb6ee758d5374
-# Parent  a08bbdf839ae08ff69c6f99a289ee85b3a012f03
-archive: fix crash when archiving to gzip file with Python 3.8.2+
-
-Differential Revision: https://phab.mercurial-scm.org/D8272
-
-diff --git a/mercurial/archival.py b/mercurial/archival.py
---- a/mercurial/archival.py
-+++ b/mercurial/archival.py
-@@ -146,7 +146,7 @@
-                 self.timestamp = timestamp
-             gzip.GzipFile.__init__(self, *args, **kw)
- 
--        def _write_gzip_header(self):
-+        def _write_gzip_header(self, *args, **kwargs):
-             self.fileobj.write(b'\037\213')  # magic header
-             self.fileobj.write(b'\010')  # compression method
-             fname = self.name
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index 7decf3d88c9..e50ba0de6a0 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,25 +1,30 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa
-pkgver=20.0.2
-pkgrel=3
+pkgver=24.0.4
+pkgrel=1
 pkgdesc="Mesa DRI OpenGL library"
 url="https://www.mesa3d.org"
 arch="all"
-license="MIT SGI-B-2.0 BSL-1.0"
+license="MIT AND SGI-B-2.0 AND BSL-1.0"
 subpackages="
 	$pkgname-dbg
 	$pkgname-dev
-	$pkgname-dri-classic:_dri
-	$pkgname-dri-gallium:_dri
+	$pkgname-dri-gallium:_gallium
 	$pkgname-va-gallium:_va
 	$pkgname-vdpau-gallium:_vdpau
-	$pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles
-	$pkgname-xatracker $pkgname-osmesa $pkgname-gbm
+	$pkgname-glapi
+	$pkgname-egl
+	$pkgname-gl
+	$pkgname-gles
+	$pkgname-xatracker
+	$pkgname-osmesa
+	$pkgname-gbm
 	$pkgname-vulkan-ati:_vulkan
-	$pkgname-dri-ati:_dri_deprecated
-	$pkgname-dri-nouveau:_dri_deprecated
+	$pkgname-vulkan-swrast:_vulkan
+	$pkgname-vulkan-layers:_vulkan_layers
+	$pkgname-libd3dadapter9
 	"
-_llvmver=10
+_llvmver=17
 depends_dev="
 	libdrm-dev
 	libxext-dev
@@ -36,22 +41,21 @@ makedepends="
 	flex
 	gettext
 	elfutils-dev
+	glslang-dev
 	libtool
 	libxfixes-dev
 	libva-dev
 	libvdpau-dev
 	libx11-dev
+	libxml2-dev
 	libxrandr-dev
-	libxt-dev
-	libxvmc-dev
 	libxxf86vm-dev
 	llvm$_llvmver-dev
-	makedepend
 	meson
 	py3-mako
-	py3-libxml2
+	py3-packaging
 	python3
-	talloc-dev
+	vulkan-loader-dev
 	wayland-dev
 	wayland-protocols
 	xorgproto
@@ -59,165 +63,212 @@ makedepends="
 	zstd-dev
 	"
 source="
-	https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz
-	adjust-cache-deflate-buffer.patch
-	musl-fix-includes.patch
-	add-use-elf-tls.patch
-	missing-dep-on-sha1_h.patch
-	time_h.patch
+	https://mesa.freedesktop.org/archive/mesa-${pkgver/_/-}.tar.xz
+	enable-mali-t600.patch
+	no-unlink-megadrivers.patch
 	"
 replaces="mesa-dricore"
-
-if [ "$CARCH" = x86 ]; then
-	# Bug upstream that needs to be fixed
-	options="$options textrels"
-fi
+options="!check" # we skip tests intentionally
+builddir="$srcdir/mesa-${pkgver/_/-}"
 
 _dri_driverdir=/usr/lib/xorg/modules/dri
-_dri_drivers="r100,r200,nouveau"
-_gallium_drivers="r300,r600,radeonsi,nouveau,swrast,virgl"
-_gallium_provides="
-	$pkgname-dri-swrast=$pkgver-r$pkgrel
-	$pkgname-dri-virtio=$pkgver-r$pkgrel
-	"
-_vulkan_drivers="amd"
-_arch_opts=""
-_vulkan_overlay_layer=false
+_gallium_drivers="r300,r600,radeonsi,nouveau,swrast,virgl,zink"
+_vulkan_drivers="amd,swrast"
+_vulkan_layers="device-select,overlay"
+
+# extra gallium per arch
 case "$CARCH" in
 x86*)
-	_dri_drivers="${_dri_drivers},i915,i965"
-	_gallium_drivers="${_gallium_drivers},svga,iris"
-	_vulkan_drivers="${_vulkan_drivers},intel"
-	_vulkan_overlay_layer=true
-	makedepends="$makedepends glslang"
-	subpackages="$subpackages \
-			$pkgname-dri-intel:_dri_deprecated \
-			$pkgname-vulkan-intel:_vulkan
-			$pkgname-vulkan-layer:_vulkan_layer"
-	_gallium_provides="$_gallium_provides $pkgname-dri-vmwgfx=$pkgver-r$pkgrel"
-	_arch_opts="-Ddri3=true"
-	case "$CARCH" in
-	x86)
-		_arch_opts="$_arch_opts -Dglx-read-only-text=true -Dasm=false";;
-	esac
+	_gallium_drivers="$_gallium_drivers,svga,i915,iris,crocus"
 	;;
 armhf|armv7|aarch64)
-	_gallium_drivers="${_gallium_drivers},vc4,v3d,freedreno,kmsro,lima,panfrost,etnaviv,tegra"
-	_gallium_provides="$_gallium_provides
-		$pkgname-dri-vc4=$pkgver-r$pkgrel
-		$pkgname-dri-v3d=$pkgver-r$pkgrel
-		$pkgname-dri-freedreno=$pkgver-r$pkgrel
-		$pkgname-dri-kmsro=$pkgver-r$pkgrel
-		$pkgname-dri-lima=$pkgver-r$pkgrel
-		$pkgname-dri-panfrost=$pkgver-r$pkgrel
-		$pkgname-dri-etnaviv=$pkgver-r$pkgrel
-		$pkgname-dri-tegra=$pkgver-r$pkgrel
+	_gallium_drivers="$_gallium_drivers,vc4,v3d,freedreno,kmsro,lima,panfrost,etnaviv,tegra"
+	;;
+esac
+
+# extra vulkan per arch
+case "$CARCH" in
+x86*)
+	_vulkan_drivers="$_vulkan_drivers,intel,intel_hasvk"
+	_vulkan_layers="$_vulkan_layers,intel-nullhw"
+	subpackages="
+		$subpackages
+		$pkgname-vulkan-intel:_vulkan
+		"
+	;;
+aarch64)
+	_vulkan_drivers="$_vulkan_drivers,broadcom,freedreno,panfrost"
+	subpackages="
+		$subpackages
+		$pkgname-vulkan-broadcom:_vulkan
+		$pkgname-vulkan-freedreno:_vulkan
+		$pkgname-vulkan-panfrost:_vulkan
+		"
+	;;
+esac
+
+case "$CARCH" in
+x86)
+	# lto fails on x86 only
+	# mostly:
+	# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21371
+	# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21180
+	_lto=false
+	;;
+*)
+	# ~5% smaller
+	_lto=true
+	;;
+esac
+
+case "$CARCH" in
+aarch64|x86_64)
+	_rusticl=true
+	makedepends="
+		$makedepends
+		clang$_llvmver-dev
+		libclc-dev~$_llvmver
+		rust
+		rust-bindgen
+		spirv-llvm-translator-dev
+		"
+	subpackages="
+		$subpackages
+		$pkgname-rusticl
 		"
 	;;
+*)
+	_rusticl=false
+	;;
 esac
 
 build() {
-	export CFLAGS="$CFLAGS -D_XOPEN_SOURCE=700"
-	export MESA_GIT_SHA1_OVERRIDE=53b2b224dc2de982c37915a0ad218e33365ff75e
-
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--buildtype=plain \
+	# use -g1 to generate less debug info:
+	# 485 MiB -> ~80 MiB
+	export CFLAGS="$CFLAGS -O2 -g1"
+	export CXXFLAGS="$CXXFLAGS -O2 -g1"
+	export CPPFLAGS="$CPPFLAGS -O2 -g1"
+
+	case "$CARCH" in
+	armhf|armv7)
+		# gnu2 tlsdesc is broken in binutils
+		export CFLAGS="$CFLAGS -mtls-dialect=gnu"
+		export CXXFLAGS="$CXXFLAGS -mtls-dialect=gnu"
+		;;
+	esac
+
+	PATH="$PATH:/usr/lib/llvm$_llvmver/bin" \
+	abuild-meson \
+		-Db_ndebug=true \
+		-Db_lto=$_lto \
+		-Dbackend_max_links=2 \
 		-Ddri-drivers-path=$_dri_driverdir \
 		-Dgallium-drivers=$_gallium_drivers \
-		-Ddri-drivers=$_dri_drivers \
 		-Dvulkan-drivers=$_vulkan_drivers \
-		-Dvulkan-overlay-layer=$_vulkan_overlay_layer \
-		-Dplatforms=x11,drm,wayland,surfaceless \
-		-Dllvm=true \
-		-Dshared-llvm=true \
-		-Dshared-glapi=true \
-		-Dgbm=true \
+		-Dvulkan-layers=$_vulkan_layers \
+		-Dplatforms=x11,wayland \
+		-Dllvm=enabled \
+		-Dshared-llvm=enabled \
+		-Dshared-glapi=enabled \
+		-Dgbm=enabled \
 		-Dglx=dri \
 		-Dopengl=true \
-		-Dosmesa=gallium \
-		-Dgles1=false \
-		-Dgles2=true \
-		-Degl=true \
-		-Dgallium-xa=true \
-		-Dgallium-vdpau=true \
-		-Dgallium-va=true \
-		-Dgallium-xvmc=false \
-		-Dgallium-nine=false \
-		-Db_ndebug=true \
-		$_arch_opts \
+		-Dosmesa=true \
+		-Dgles1=enabled \
+		-Dgles2=enabled \
+		-Degl=enabled \
+		-Dgallium-extra-hud=true \
+		-Dgallium-nine=true \
+		-Dgallium-rusticl=$_rusticl \
+		-Dgallium-va=enabled \
+		-Dgallium-vdpau=enabled \
+		-Dgallium-xa=enabled \
+		-Drust_std=2021 \
+		-Dvideo-codecs=all \
 		. output
 
 	# Print config
-	meson configure output
-
-	# parallel build workaround
-	ninja -C output src/compiler/nir/nir_intrinsics.h
+	meson configure --no-pager output
 
-	ninja -C output
+	meson compile -C output
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C output install
+	provider_priority=100
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
 egl() {
 	pkgdesc="Mesa libEGL runtime libraries"
 	depends="mesa=$pkgver-r$pkgrel"
+	provider_priority=100
 
-	install -d "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libEGL.so* "$subpkgdir"/usr/lib/
+	amove usr/lib/libEGL.so*
 }
 
 gl() {
 	pkgdesc="Mesa libGL runtime libraries"
 	depends="mesa=$pkgver-r$pkgrel"
+	provider_priority=100
 
-	install -d "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libGL.so* "$subpkgdir"/usr/lib/
+	amove usr/lib/libGL.so*
 }
 
 glapi() {
 	pkgdesc="Mesa shared glapi"
 	replaces="$pkgname-gles=$pkgver-r$pkgrel"
+	provider_priority=100
 
-	install -d "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libglapi.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libglapi.so.*
 }
 
 gles() {
 	pkgdesc="Mesa libGLESv2 runtime libraries"
 	depends="mesa=$pkgver-r$pkgrel"
+	provider_priority=100
 
-	install -d "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libGLES*.so* "$subpkgdir"/usr/lib/
+	amove usr/lib/libGLES*.so*
 }
 
 xatracker() {
 	pkgdesc="Mesa XA state tracker for vmware"
 	depends="mesa=$pkgver-r$pkgrel"
+	provider_priority=100
 
-	install -d "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libxatracker*.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libxatracker*.so.*
 }
 
 osmesa() {
 	pkgdesc="Mesa offscreen rendering libraries"
 	depends="mesa=$pkgver-r$pkgrel"
+	provider_priority=100
 
-	install -d "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libOSMesa.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libOSMesa.so.*
 }
 
 gbm() {
 	pkgdesc="Mesa gbm library"
 	depends="mesa=$pkgver-r$pkgrel"
+	provider_priority=100
+
+	amove usr/lib/libgbm.so.*
+}
+
+libd3dadapter9() {
+	pkgdesc="Mesa directx9 adapter"
+	depends="mesa=$pkgver-r$pkgrel"
+	provider_priority=100
+
+	amove usr/lib/d3d/d3dadapter9.so*
+}
+
+rusticl() {
+	pkgdesc="Mesa OpenCL driver"
+	depends="mesa=$pkgver-r$pkgrel clang$_llvmver-headers libclc~$_llvmver"
+	provider_priority=100
 
-	install -d "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgbm.so.* "$subpkgdir"/usr/lib/
+	amove usr/lib/libRusticlOpenCL.so.*
+	amove etc/OpenCL/vendors/
 }
 
 # Move links referencing the same file to the subpackage.
@@ -232,11 +283,9 @@ _mv_links() {
 
 _mv_vulkan() {
 	local i
-	install -d "$subpkgdir"/usr/lib
-	install -d "$subpkgdir"/usr/share/vulkan/icd.d
 	for i in "$@"; do
-		mv "$pkgdir"/usr/lib/libvulkan_$i.so "$subpkgdir"/usr/lib/
-		mv "$pkgdir"/usr/share/vulkan/icd.d/${i}* "$subpkgdir"/usr/share/vulkan/icd.d/
+		amove usr/lib/libvulkan_$i*.so
+		amove usr/share/vulkan/icd.d/${i}_*.*
 	done
 }
 
@@ -244,44 +293,20 @@ _mv_vulkan() {
 # library. This library is then hard-linked to separate files (one for each driver).
 # Each subpackage contains one megadriver so that all the hard-links are preserved.
 
-_dri() {
-	local n=${subpkgname##*-dri-}
-	pkgdesc="Mesa $n DRI drivers"
+_gallium() {
+	pkgdesc="Mesa gallium DRI drivers"
 	depends="mesa=$pkgver-r$pkgrel"
+	provider_priority=100
 
-	case $n in
-	classic)
-		# libmesa_dri_drivers.so
-		_mv_links $_dri_driverdir radeon_dri.so ;;
-	gallium)
-		# libgallium_dri.so
-		_mv_links $_dri_driverdir swrast_dri.so
-		provides="$_gallium_provides"
-		;;
-	esac
-}
-
-# Compatibility packages for upgrading from the old (driver-specific) subpackages
-_dri_deprecated() {
-	local n=${subpkgname##*-dri-}
-	pkgdesc="Mesa DRI drivers for $n (DEPRECATED)"
-	depends="
-		mesa-dri-classic=$pkgver-r$pkgrel
-		mesa-dri-gallium=$pkgver-r$pkgrel
-		"
-
-	case $n in
-	ati|nouveau)
-		depends="$depends mesa-va-gallium mesa-vdpau-gallium" ;;
-	esac
-
-	mkdir "$subpkgdir"
+	# libgallium_dri.so
+	_mv_links $_dri_driverdir swrast_dri.so
 }
 
 _va() {
 	local n=${subpkgname##*-va-}
 	pkgdesc="Mesa $n VAAPI drivers"
 	depends="mesa=$pkgver-r$pkgrel libva"
+	provider_priority=100
 
 	case $n in
 	gallium)
@@ -294,6 +319,7 @@ _vdpau() {
 	local n=${subpkgname##*-vdpau-}
 	pkgdesc="Mesa $n VDPAU drivers"
 	depends="mesa=$pkgver-r$pkgrel libvdpau"
+	provider_priority=100
 
 	case $n in
 	gallium)
@@ -306,29 +332,45 @@ _vulkan() {
 	local n=${subpkgname##*-vulkan-}
 	pkgdesc="Mesa Vulkan API driver for $n"
 	depends="mesa=$pkgver-r$pkgrel"
+	provider_priority=100
 
 	case $n in
 	ati)
 		_mv_vulkan radeon ;;
 	intel)
 		_mv_vulkan intel ;;
+	broadcom)
+		_mv_vulkan broadcom ;;
+	freedreno)
+		_mv_vulkan freedreno ;;
+	panfrost)
+		_mv_vulkan panfrost ;;
+	swrast)
+		_mv_vulkan lvp ;;
 	esac
 }
 
-_vulkan_layer() {
-	pkgdesc="Vulkan overlay layer to display information about the application"
-	depends=""
-
-	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/share/vulkan "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/share/vulkan/explicit_layer.d "$subpkgdir"/usr/share/vulkan
-	mv "$pkgdir"/usr/lib/libVkLayer_MESA_overlay.so "$subpkgdir"/usr/lib
-
-	mv "$pkgdir"/usr/bin/mesa-overlay-control.py "$subpkgdir"/usr/bin
+_vulkan_layers() {
+	pkgdesc="collection of vulkan layers from mesa"
+	depends="python3"
+	provider_priority=100
+
+	# Remove this after the release of the next stable (3.14)
+	# it originally was claed layer as it only packaged the
+	# overlay one but now it also packages device-select and
+	# intel-nullhw (on x86*)
+	provides="$pkgname-vulkan-layer=$pkgver-r$pkgrel"
+	provider_priority=100
+	replaces="$pkgname-vulkan-layer=$pkgver-r$pkgrel"
+
+	amove usr/share/vulkan/explicit_layer.d
+	amove usr/share/vulkan/implicit_layer.d
+	amove usr/lib/libVkLayer_*.so
+	amove usr/bin/mesa-overlay-control.py
 }
 
-sha512sums="d6ffc29bbc5b908cb0f08fa1b5a83e029b76c7b697c488a73e6bb60990a55beeb3ecdba1745868f6885ee2f660975f5debf7d2c9418e0a96e2f7049e83fd89ab  mesa-20.0.2.tar.xz
-cdf22d2da3328e116c379264886bd01fd3ad5cc45fe03dc6fd97bdc4794502598ee195c0b9d975fa264d6ac31c6fa108c0535c91800ecf4fcabfd308e53074cc  adjust-cache-deflate-buffer.patch
-cf849044d6cc7d2af4ff015208fb09d70bf9660538699797da21bda2ecb7c1892d312af83d05116afd826708d9caafb1d05a13f09139c558aea6fee931e3eee7  musl-fix-includes.patch
-9aa207a38d538abbd8e7a7210e3081508563e85e8c27b2269b8f40fd62d9fc6fee0cb2f573a0e62c42f8ba0fb85740459b761f009d5991cfd9813d7614541908  add-use-elf-tls.patch
-250a048193d1e2f4044c6850e707e1b0f67812f03357cb53bc4c3c501ade14dc9b0f40bf6a7d87903a65d5d87af58d210fd2729fa658f10b63d4d2d60b6bcc11  missing-dep-on-sha1_h.patch
-0e704e0082697170ff33a600988b59b4690f1560af4193c86920ca31128409c64f89f302707cb1ac58f8bc47653b5a8a5d38f36f634e7b7def7659894d4c6c5a  time_h.patch"
+sha512sums="
+1d05b07026417fbe9cf18f7b18f2db9fe5fe327555c590283d87f69bbdd51f64135928a1dbe155d750187fc268bbdbb070bc1ae9ffc3e013b8707b391969d515  mesa-24.0.4.tar.xz
+450e9c61a62487e2cc83e03a05521d40a48294118b1af9d56220fb546c50fedd61f1f005b85c5e956e23eb2397f696fe1bbf9626253c99233278ca406b75543b  enable-mali-t600.patch
+e3d39d61b14188cd5a22e19e8c065650995f85943e6c42ec5775db5b76a9ebe8913253a8b9ac32056ac13a2c357cd951f867ecb39976c52f7d014dcc1a2d87dc  no-unlink-megadrivers.patch
+"
diff --git a/main/mesa/add-use-elf-tls.patch b/main/mesa/add-use-elf-tls.patch
deleted file mode 100644
index 470c2172605..00000000000
--- a/main/mesa/add-use-elf-tls.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 898d025..0da4fc5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -387,7 +387,8 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
- endif
- 
- # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
--if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29)
-+with_use_elf_tls = get_option('use-elf-tls')
-+if with_use_elf_tls and host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29)
-   pre_args += '-DUSE_ELF_TLS'
- endif
- 
-diff --git a/meson_options.txt b/meson_options.txt
-index 626baf3..6e4637c 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -366,3 +366,9 @@ option(
-   value : 25,
-   description : 'Android Platform SDK version. Default: Nougat version.'
- )
-+option(
-+  'use-elf-tls',
-+  type : 'boolean',
-+  value : false,
-+  description : 'Build support for initial-exec TLS model'
-+)
diff --git a/main/mesa/adjust-cache-deflate-buffer.patch b/main/mesa/adjust-cache-deflate-buffer.patch
deleted file mode 100644
index 3c116cb69e1..00000000000
--- a/main/mesa/adjust-cache-deflate-buffer.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru mesa-18.1.7.orig/src/util/disk_cache.c mesa-18.1.7/src/util/disk_cache.c
---- mesa-18.1.7.orig/src/util/disk_cache.c	2018-08-24 19:25:19.000000000 +0300
-+++ mesa-18.1.7/src/util/disk_cache.c	2018-12-14 13:59:15.433631846 +0200
-@@ -721,8 +721,11 @@
- /* From the zlib docs:
-  *    "If the memory is available, buffers sizes on the order of 128K or 256K
-  *    bytes should be used."
-+ *
-+ * But that is performance optimization for large files. To keep stack usage
-+ * in sensible amount (wrt. musl default stack) we use smaller stack on Alpine.
-  */
--#define BUFSIZE 256 * 1024
-+#define BUFSIZE 4 * 1024
- 
- /**
-  * Compresses cache entry in memory and writes it to disk. Returns the size
diff --git a/main/mesa/enable-mali-t600.patch b/main/mesa/enable-mali-t600.patch
new file mode 100644
index 00000000000..4cbbf87476d
--- /dev/null
+++ b/main/mesa/enable-mali-t600.patch
@@ -0,0 +1,27 @@
+From e3111262ee009bfa2a0aad202aaf535715e38ec7 Mon Sep 17 00:00:00 2001
+From: Anton Bambura <jenneron@postmarketos.org>
+Date: Thu, 8 Feb 2024 10:01:58 +0000
+Subject: [PATCH] panfrost: Enable Mali-T600
+
+Upstream MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27519
+
+Signed-off-by: Anton Bambura <jenneron@postmarketos.org>
+---
+ src/panfrost/lib/pan_props.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/panfrost/lib/pan_props.c b/src/panfrost/lib/pan_props.c
+index 55871169638fd..f2da5f6e82a78 100644
+--- a/src/panfrost/lib/pan_props.c
++++ b/src/panfrost/lib/pan_props.c
+@@ -46,6 +46,7 @@
+ /* Table of supported Mali GPUs */
+ /* clang-format off */
+ const struct panfrost_model panfrost_model_list[] = {
++        MODEL(0x600, "T600",    "T60x", NO_ANISO,          8192, {}),
+         MODEL(0x620, "T620",    "T62x", NO_ANISO,          8192, {}),
+         MODEL(0x720, "T720",    "T72x", NO_ANISO,          8192, { .no_hierarchical_tiling = true }),
+         MODEL(0x750, "T760",    "T76x", NO_ANISO,          8192, {}),
+-- 
+GitLab
+
diff --git a/main/mesa/missing-dep-on-sha1_h.patch b/main/mesa/missing-dep-on-sha1_h.patch
deleted file mode 100644
index 20b35afdf64..00000000000
--- a/main/mesa/missing-dep-on-sha1_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/vulkan/overlay-layer/meson.build b/src/vulkan/overlay-layer/meson.build
-index 5b553d0..51e053e 100644
---- a/src/vulkan/overlay-layer/meson.build
-+++ b/src/vulkan/overlay-layer/meson.build
-@@ -38,7 +38,7 @@ vklayer_files = files(
- 
- vklayer_mesa_overlay = shared_library(
-   'VkLayer_MESA_overlay',
--  vklayer_files, overlay_spv,
-+  [vklayer_files, sha1_h], overlay_spv,
-   c_args : [c_vis_args, no_override_init_args, vulkan_wsi_args],
-   cpp_args : [cpp_vis_args, vulkan_wsi_args],
-   dependencies : [idep_vulkan_util, idep_mesautil, vulkan_wsi_deps, libimgui_core_dep, dep_dl],
diff --git a/main/mesa/musl-fix-includes.patch b/main/mesa/musl-fix-includes.patch
deleted file mode 100644
index 9ce9df4e4e9..00000000000
--- a/main/mesa/musl-fix-includes.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/util/rand_xor.c
-+++ b/src/util/rand_xor.c
-@@ -24,6 +24,8 @@
- 
- #if defined(__linux__)
- #include <sys/file.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
- #else
---- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig
-+++ ./src/gallium/winsys/svga/drm/vmw_screen.h
-@@ -34,7 +34,7 @@
- #ifndef VMW_SCREEN_H_
- #define VMW_SCREEN_H_
- 
--
-+#include <sys/stat.h>
- #include "pipe/p_compiler.h"
- #include "pipe/p_state.h"
diff --git a/main/mesa/no-unlink-megadrivers.patch b/main/mesa/no-unlink-megadrivers.patch
new file mode 100644
index 00000000000..3bac68f19d6
--- /dev/null
+++ b/main/mesa/no-unlink-megadrivers.patch
@@ -0,0 +1,24 @@
+this converts megadriver installation to use symlinks instead of hardlinks,
+so checkapk diff does not differ by what got made first, and simplifies disk
+representation (hardlinks are less easy to see)
+--- a/bin/install_megadrivers.py
++++ b/bin/install_megadrivers.py
+@@ -56,7 +56,7 @@ def main():
+         if os.path.lexists(abs_driver):
+             os.unlink(abs_driver)
+         print('installing {} to {}'.format(args.megadriver, abs_driver))
+-        os.link(master, abs_driver)
++        os.symlink(os.path.basename(master), abs_driver)
+ 
+         try:
+             ret = os.getcwd()
+@@ -71,8 +71,7 @@ def main():
+         finally:
+             os.chdir(ret)
+ 
+-    # Remove meson-created master .so and symlinks
+-    os.unlink(master)
++    # Remove meson-created symlinks
+     name, ext = os.path.splitext(master)
+     while ext != '.so':
+         if os.path.lexists(name):
diff --git a/main/mesa/time_h.patch b/main/mesa/time_h.patch
deleted file mode 100644
index 3f64c83a5bc..00000000000
--- a/main/mesa/time_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/gallium/drivers/panfrost/pan_bo.h b/src/gallium/drivers/panfrost/pan_bo.h
-index 414c356..128f733 100644
---- a/src/gallium/drivers/panfrost/pan_bo.h
-+++ b/src/gallium/drivers/panfrost/pan_bo.h
-@@ -26,6 +26,7 @@
- #ifndef __PAN_BO_H__
- #define __PAN_BO_H__
- 
-+#include <time.h>
- #include <panfrost-misc.h>
- #include "pipe/p_state.h"
- #include "util/list.h"
diff --git a/main/meson/APKBUILD b/main/meson/APKBUILD
index a5939d4e001..edf26203867 100644
--- a/main/meson/APKBUILD
+++ b/main/meson/APKBUILD
@@ -1,39 +1,89 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=meson
-pkgver=0.54.0
-pkgrel=0
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="Fast and user friendly build system"
 url="https://mesonbuild.com"
 arch="noarch"
 license="Apache-2.0"
-depends="samurai py3-setuptools python3"
+depends="samurai"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+# glib-dev, gobject-introspection-dev, gtk+3.0-dev is a circular dep,
+# but only during bootstrap-
+# not installing checkdepends with !check should be fine
+options="$options !check" # circular deps above with check on bootstrap
+checkdepends="
+	boost-dev
+	boost-static
+	cmake
+	cups-dev
+	doxygen
+	gettext-static
+	gfortran
+	glib-dev
+	gobject-introspection-dev
+	gtest-dev
+	gtk+3.0-dev
+	libpcap-dev
+	libxml2-dev
+	linux-headers
+	llvm-dev
+	nasm
+	ncurses-dev
+	py3-pytest
+	python3-dev
+	vala
+	zlib-dev
+	zlib-static
+	"
 subpackages="
 	$pkgname-doc
+	$pkgname-pyc
 	$pkgname-vim::noarch
-	$pkgname-bash-completion:bashcomp:noarch
-	$pkgname-zsh-completion:zshcomp:noarch
+	$pkgname-bash-completion
+	$pkgname-zsh-completion
+	$pkgname-polkit::noarch
 	"
 source="https://github.com/mesonbuild/meson/releases/download/$pkgver/meson-$pkgver.tar.gz
+	fix-ninja-output-test.patch
+	skip-broken-tests.patch
+	abuild-meson
 	"
 
+prepare() {
+	default_prepare
+
+	# https://github.com/mesonbuild/meson/issues/10104
+	rm -r "$builddir/test cases/linuxlike/13 cmake dependency"
+}
+
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 setup.py check
+	MESON_CI_JOBNAME=thirdparty \
+		NINJA=samu \
+		NINJA_1_9_OR_NEWER=1 \
+		python3 run_tests.py
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 
 	install -Dm644 data/shell-completions/zsh/* -t "$pkgdir"/usr/share/zsh/site-functions
 	install -Dm644 data/shell-completions/bash/* -t "$pkgdir"/usr/share/bash-completion/completions
+
+	install -Dm0755 "$srcdir"/abuild-meson -t "$pkgdir"/usr/bin
 }
 
 vim() {
 	pkgdesc="$pkgdesc (vim support)"
+	depends=
 	install_if="vim $pkgname=$pkgver-r$pkgrel"
 	cd "$builddir"
 	for kind in ftdetect ftplugin indent syntax
@@ -45,20 +95,17 @@ vim() {
 	done
 }
 
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
-	amove usr/share/bash-completion/completions
-}
-
-zshcomp() {
+polkit() {
+	pkgdesc="$pkgdesc (polkit config)"
 	depends=""
-	pkgdesc="Zsh completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel zsh"
+	install_if="$pkgname=$pkgver-r$pkgrel polkit"
 
-	amove usr/share/zsh/site-functions
+	amove usr/share/polkit-*
 }
 
-sha512sums="e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7  meson-0.54.0.tar.gz"
+sha512sums="
+2787941fbc77d5ad95011753df52fe39812929a06d84dbce8bdc965c9c1e62fd6bfa819712eb1f5934c2ebe6919a65f7874ecac2caf40d111ea024343108cfbd  meson-1.4.0.tar.gz
+a60dd85ecc1004523c213f4d06bfe10ba906a5115e93cfa4f1b70733e0c16f39c2c22b38ff71bb07c67166f3121c263a56842e8f8e2022f0a44094f956e28f02  fix-ninja-output-test.patch
+0bbbf65f56f4feab43b4ec3fbe7d4c64ef9abb563ea114d0b960048319b936dd577e538a762991661a1cb256f32c0da0fef2d3add07730e37a8bbd4ec27dc611  skip-broken-tests.patch
+3e609e58ec6a68633023a3fb3a8fa857f18925c7f0988bcb4171ef89583244aa3631d1ee4292671369a1e4e6c185d841ad3c1aafc577d0f190e3f0ddd37319e6  abuild-meson
+"
diff --git a/main/meson/abuild-meson b/main/meson/abuild-meson
new file mode 100755
index 00000000000..2e56c411496
--- /dev/null
+++ b/main/meson/abuild-meson
@@ -0,0 +1,75 @@
+#!/bin/sh -e
+# Highly opinionated wrapper for Alpine Linux packaging
+
+. /usr/share/abuild/functions.sh
+
+# mostly taken from https://github.com/void-linux/void-packages/blob/22bf95cf356bf1a09212733d775d447d011f70b0/common/build-style/meson.sh
+if [ "$CHOST" != "$CBUILD" ]; then
+	_meson_crossfile="abuild-meson.cross"
+	_meson_target_endian=little
+	# just the first part of the hostspec
+	_meson_target_cpu="$CARCH"
+	case "$CARCH" in
+	arm*)
+		_meson_cpu_family=arm
+		;;
+	x86)
+		_meson_cpu_family=x86
+		;;
+	ppc64le)
+		_meson_cpu_family=ppc64
+		;;
+	s390x)
+		_meson_cpu_family=s390x
+		_meson_target_endian=big
+		;;
+	riscv64)
+		_meson_cpu_family=riscv64
+		;;
+	x86_64)
+		_meson_cpu_family=x86_64
+		;;
+	aarch64)
+		_meson_cpu_family=aarch64
+		;;
+	esac
+	cat > $_meson_crossfile <<-EOF
+	[binaries]
+	strip = '${CROSS_COMPILE}strip'
+	readelf = '${CROSS_COMPILE}readelf'
+	objcopy = '${CROSS_COMPILE}objcopy'
+	[properties]
+	needs_exe_wrapper = true
+	[host_machine]
+	system = 'linux'
+	cpu_family = '$_meson_cpu_family'
+	cpu = '$_meson_target_cpu'
+	endian = '$_meson_target_endian'
+	EOF
+	unset _meson_target_cpu _meson_target_endian _meson_cpu_family
+fi
+
+exec meson setup \
+		--prefix=/usr \
+		--libdir=/usr/lib \
+		--libexecdir=/usr/libexec \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--includedir=/usr/include \
+		--datadir=/usr/share \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localedir=/usr/share/locale \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--sharedstatedir=/var/lib \
+		--buildtype=plain \
+		--auto-features=auto \
+		--wrap-mode=nodownload \
+		-Db_lto=false \
+		-Db_staticpic=true \
+		-Db_pie=true \
+		-Dpython.bytecompile=0 \
+		-Dwerror=false \
+		${_meson_crossfile:+--cross-file=$_meson_crossfile} \
+		"$@"
diff --git a/main/meson/fix-ninja-output-test.patch b/main/meson/fix-ninja-output-test.patch
new file mode 100644
index 00000000000..5706d84859e
--- /dev/null
+++ b/main/meson/fix-ninja-output-test.patch
@@ -0,0 +1,12 @@
+the tests parse the tool output and expect one of the strings to match-
+samurai outputs slightly different strings, and hence breaks the tests
+--- a/unittests/baseplatformtests.py
++++ b/unittests/baseplatformtests.py
+@@ -82,5 +82,5 @@
+         self.orig_env = os.environ.copy()
+         if self.backend is Backend.ninja:
+-            self.no_rebuild_stdout = ['ninja: no work to do.', 'samu: nothing to do']
++            self.no_rebuild_stdout = ['ninja: no work to do.', 'samu: nothing to do', 'samu: explain all: phony and no inputs']
+         else:
+             # VS doesn't have a stable output when no changes are done
+
diff --git a/main/meson/skip-broken-tests.patch b/main/meson/skip-broken-tests.patch
new file mode 100644
index 00000000000..09ea99280c6
--- /dev/null
+++ b/main/meson/skip-broken-tests.patch
@@ -0,0 +1,36 @@
+--- a/unittests/linuxliketests.py
++++ b/unittests/linuxliketests.py
+@@ -993,6 +993,8 @@
+             self.assertEqual(got_rpath, yonder_libdir, rpath_format)
+ 
+     @skip_if_not_base_option('b_sanitize')
++    # https://github.com/mesonbuild/meson/issues/8283
++    @unittest.skip('broken with improperly detected sanitizers')
+     def test_pch_with_address_sanitizer(self):
+         if is_cygwin():
+             raise SkipTest('asan not available on Cygwin')
+@@ -1192,6 +1192,7 @@
+             self.build()
+ 
+     @skipIfNoPkgconfig
++    @unittest.skip('fails because of GNU libintl mess on alpine :)')
+     def test_pkgconfig_formatting(self):
+         testdir = os.path.join(self.unit_test_dir, '38 pkgconfig format')
+         self.init(testdir)
+--- a/unittests/allplatformstests.py
++++ b/unittests/allplatformstests.py
+@@ -377,5 +377,6 @@
+         self.assertNotEqual(before, after)
+
++    @unittest.skip('samurai has a reverse order')
+     def test_static_compile_order(self):
+         '''
+         Test that the order of files in a compiler command-line while compiling
+@@ -3198,6 +3198,7 @@
+             else:
+                 self.assertEqual(o, e)
+ 
++    @unittest.skip('broken with current version of samurai')
+     def test_meson_compile(self):
+         """Test the meson compile command."""
+ 
diff --git a/main/mg/APKBUILD b/main/mg/APKBUILD
index 2fc6c30d3fd..01e1b6c7d5c 100644
--- a/main/mg/APKBUILD
+++ b/main/mg/APKBUILD
@@ -1,15 +1,16 @@
 # Contributor: Lee Hinman <hinman@gmail.com>
 # Maintainer: Will Sinatra <wpsinatra@gmail.com>
 pkgname=mg
-pkgver=20200215
-pkgrel=0
+pkgver=20230501
+pkgrel=2
 pkgdesc="microscopic EMACS style editor"
 url="https://github.com/hboetes/mg"
 arch="all"
-license="Public-Domain"
+license="Public Domain"
 makedepends="ncurses-dev libbsd-dev bsd-compat-headers"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/hboetes/mg/archive/$pkgver.tar.gz"
+options="!check"
 
 build() {
 	make prefix=/usr mandir=/usr/share/man
@@ -24,4 +25,6 @@ package() {
 		"$pkgdir"/usr/share/doc/$pkgname
 }
 
-sha512sums="c6cda5544210bc3d3fa3cbb8494e60949e10ed3716d96b76d0c9e7f5671c7a85f6e7e7a860cfd05466f1bf52112053c722441ff338210c0ada89f10515ac170a  mg-20200215.tar.gz"
+sha512sums="
+db7b9815a01dc9fb1ff92741748d24d558c329135e591c24450d0a3bc10e38a992ef346dd744854864538f330a018415df539d06543570a3566dbabc6c88a8fd  mg-20230501.tar.gz
+"
diff --git a/main/mini_httpd/APKBUILD b/main/mini_httpd/APKBUILD
index b416d44900c..33679d51864 100644
--- a/main/mini_httpd/APKBUILD
+++ b/main/mini_httpd/APKBUILD
@@ -1,26 +1,24 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mini_httpd
 pkgver=1.30
-pkgrel=0
+pkgrel=5
 pkgdesc="Small forking webserver with ssl and ipv6 support"
 url="http://www.acme.com/software/mini_httpd/"
 arch="all"
-license="BSD"
+license="BSD-2-Clause"
 pkgusers="minihttpd"
 pkggroups="www-data"
 # no tests/check provided by upstream
 options="!check"
-makedepends="openssl-dev"
+makedepends="openssl-dev>3"
 subpackages="$pkgname-doc $pkgname-openrc"
 install="$pkgname.pre-install"
-source="http://www.acme.com/software/$pkgname/$pkgname-$pkgver.tar.gz
+source="http://www.acme.com/software/mini_httpd/mini_httpd-$pkgver.tar.gz
 	$pkgname.conf
 	$pkgname.initd
 	$pkgname.logrotate
 	cgi.patch
 	"
-builddir="$srcdir/$pkgname-$pkgver"
-
 # secfixes:
 #   1.30-r0:
 #     - CVE-2018-18778
@@ -28,14 +26,12 @@ builddir="$srcdir/$pkgname-$pkgver"
 #     - CVE-2017-17663
 
 build() {
-	cd "$builddir"
-	make CFLAGS="${CFLAGS} -DUSE_SSL" \
-		LDFLAGS="${LDFLAGS}" \
+	make CFLAGS="$CFLAGS -DUSE_SSL" \
+		LDFLAGS="$LDFLAGS" \
 		SSL_LIBS="-lssl -lcrypto"
 }
 
 package() {
-	cd "$builddir"
 	# does not respect DESTDIR
 	make install \
 		BINDIR="$pkgdir"/usr/sbin \
diff --git a/main/minicom/APKBUILD b/main/minicom/APKBUILD
index 7b4ddc063ec..ef8420cd23c 100644
--- a/main/minicom/APKBUILD
+++ b/main/minicom/APKBUILD
@@ -1,20 +1,17 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=minicom
-pkgver=2.7.1
-pkgrel=1
+pkgver=2.9
+pkgrel=0
 pkgdesc="menu driven communications program for terminals"
 url="https://tracker.debian.org/pkg/minicom"
 arch="all"
 license="GPL-2.0-or-later"
 makedepends="ncurses-dev gettext-dev linux-headers"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://alioth-archive.debian.org/releases/minicom/Source/$pkgver/minicom-$pkgver.tar.gz
-	fix-includes.patch
-	"
+source="https://salsa.debian.org/minicom-team/minicom/-/archive/$pkgver/minicom-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,10 +22,14 @@ build() {
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b429b32d187c3ee915c5074a0d0f08b7e3951cb8528ecbdd889837ff301662c16740ad77bd2bf3baf759c0a84e779a8dc8fd888a4260a0ace15ebc4c2f697c82  minicom-2.7.1.tar.gz
-5acff3efb0b8b02333291722044d7c473bf19eec8a26e66c0e0f41895f3e3f071dff13515ec20f7ce17368732e3674f0a42b38602e61b04e9cd70e61012641ff  fix-includes.patch"
+sha512sums="
+3bd41fa3b93b086c7b0fc851e9f46f241b13a037a4a325fc5e0ca6a4db7e9389443e8965891aa938a9c31ff848d50fd0cb88b98690a06737b5f3aca2520a60e2  minicom-2.9.tar.gz
+"
diff --git a/main/minicom/fix-includes.patch b/main/minicom/fix-includes.patch
deleted file mode 100644
index 19a18dcdb89..00000000000
--- a/main/minicom/fix-includes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- minicom-2.6.2.orig/src/dial.c
-+++ minicom-2.6.2/src/dial.c
-@@ -39,11 +39,9 @@
- #include "intl.h"
- 
- #ifdef VC_MUSIC
--#  if defined(__GLIBC__)
- #    include <sys/ioctl.h>
- #    include <sys/kd.h>
- #    include <sys/time.h>
--#  endif
- #endif
- 
- enum { CURRENT_VERSION = 6 };
---- minicom-2.6.2.orig/src/getsdir.h
-+++ minicom-2.6.2/src/getsdir.h
-@@ -22,6 +22,7 @@
-  *	and licensing conditions.  See the source, Luke.
-  */
- 
-+#include <sys/param.h>
- #include <dirent.h>
- 
- typedef struct dirEntry {		/* structure of data item */
diff --git a/main/minizip/APKBUILD b/main/minizip/APKBUILD
deleted file mode 100644
index f4b9c25da44..00000000000
--- a/main/minizip/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=minizip
-pkgver=1.2.11
-pkgrel=1
-pkgdesc="a library for manipulation with files from .zip archives"
-arch="all"
-license="Zlib"
-url="https://zlib.net"
-makedepends="automake autoconf libtool zlib-dev"
-subpackages="$pkgname-dev"
-options="!check" # No testsuite
-source="https://zlib.net/zlib-$pkgver.tar.gz
-	zlib-1.2.8-minizip-include.patch"
-
-builddir="$srcdir/zlib-$pkgver"/contrib/minizip
-
-prepare() {
-	default_prepare
-	autoreconf -fi
-}
-
-build() {
-	cd "$builddir"
-	./configure --prefix=/usr \
-		--enable-static=no
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae  zlib-1.2.11.tar.gz
-d325818f4674c7aff9e97a6446b01197d89149803b1994441fdcdbdd216206184085cb841bac73dd87472c386335b07283a28cbf852766acd99d55c63f32112d  zlib-1.2.8-minizip-include.patch"
diff --git a/main/minizip/zlib-1.2.8-minizip-include.patch b/main/minizip/zlib-1.2.8-minizip-include.patch
deleted file mode 100644
index c56e7999573..00000000000
--- a/main/minizip/zlib-1.2.8-minizip-include.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 790c73ad93732d31ec6ae5ba4d7116d7f8fb46a2 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember@gmail.com>
-Date: Sat, 10 Aug 2013 14:54:04 +0200
-Subject: [PATCH] minizip: Add missing include
-
-Include zconf.h for z_crc_t, fixes a regression from commit
-63ba7582b80eb81b126c2931e485481c35596aab.
----
- contrib/minizip/crypt.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/contrib/minizip/crypt.h b/contrib/minizip/crypt.h
-index 1e9e820..835a2ba 100644
---- a/crypt.h
-+++ b/crypt.h
-@@ -27,6 +27,8 @@
-    Encryption is not supported.
- */
- 
-+#include "zconf.h"
-+
- #define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
- 
- /***********************************************************************
--- 
-1.8.3.1
-
diff --git a/main/mkfontscale/APKBUILD b/main/mkfontscale/APKBUILD
index e1af73b06f5..a75e66de24c 100644
--- a/main/mkfontscale/APKBUILD
+++ b/main/mkfontscale/APKBUILD
@@ -1,23 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkfontscale
-pkgver=1.2.1
-pkgrel=1
+pkgver=1.2.2
+pkgrel=6
 pkgdesc="Scalable font index generator for X"
-url="http://xorg.freedesktop.org"
+url="https://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 options="!check"  # No test suite.
 subpackages="$pkgname-doc"
 makedepends="freetype-dev libfontenc-dev util-macros xorgproto zlib-dev"
 triggers="$pkgname.trigger=/usr/share/fonts/*"
-source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/app/mkfontscale-$pkgver.tar.xz"
 replaces="mkfontdir"
-provides="mkfontdir"
-
-builddir="$srcdir/$pkgname-$pkgver"
+provides="mkfontdir=$pkgver-r$pkgrel"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,8 +23,9 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4d243160e1f7f8dfa6a8f53349c1a42a55fc99426455ebdef58352c5e951fce8b4f1fbd1061a76c9a148095b002eac372db1ae5e2647d2ccb4886635b317b18c  mkfontscale-1.2.1.tar.bz2"
+sha512sums="
+4c846816325347c91008d76b3a5610c1e58a8414fd55117e7ccf51310db4b20b8397ecf6c9177ff77322e27ee088bf034fd175c9210465c50b094bab8dada4b3  mkfontscale-1.2.2.tar.xz
+"
diff --git a/main/mkfontscale/mkfontscale.trigger b/main/mkfontscale/mkfontscale.trigger
index 244f88425b5..1bd9d93ff69 100644
--- a/main/mkfontscale/mkfontscale.trigger
+++ b/main/mkfontscale/mkfontscale.trigger
@@ -1,6 +1,10 @@
 #!/bin/sh
 
 for i in "$@"; do
+	case "$i" in
+	 # encodings dir doesn't include fonts
+		*/encodings) continue;
+	esac
 	mkfontdir "$i"
 	mkfontscale "$i"
 done
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 10195000ec1..94031574b57 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,28 +1,45 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkinitfs
-pkgver=3.4.5
+pkgver=3.9.1
+# shellcheck disable=SC2034 # used for git versions, keep around for next time
 _ver=${pkgver%_git*}
-pkgrel=1
+pkgrel=0
 pkgdesc="Tool to generate initramfs images for Alpine"
-url="https://git.alpinelinux.org/cgit/mkinitfs"
+url="https://gitlab.alpinelinux.org/alpine/mkinitfs"
 arch="all"
 license="GPL-2.0-only"
-# currently we do not ship any testsuite
-options="!check"
 makedepends_host="busybox kmod-dev util-linux-dev cryptsetup-dev linux-headers"
 makedepends="$makedepends_host"
-depends="busybox>=1.28.2-r1 apk-tools>=2.9.1 lddtree>=1.25 kmod"
+checkdepends="kyua"
+depends="
+	apk-tools>=2.9.1
+	busybox-binsh
+	busybox>=1.28.2-r1
+	kmod
+	lddtree>=1.25
+	mdev-conf
+	"
 subpackages="$pkgname-doc"
 install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade"
-triggers="$pkgname.trigger=/usr/share/kernel/*"
-source="https://dev.alpinelinux.org/archive/mkinitfs/mkinitfs-$_ver.tar.xz"
+triggers="$pkgname.trigger=/lib/modules/*"
+source="https://gitlab.alpinelinux.org/alpine/mkinitfs/-/archive/$pkgver/mkinitfs-$pkgver.tar.gz
+	"
+
+provides="initramfs-generator"
+provider_priority=900 # highest
 
 build() {
 	make VERSION=$pkgver-r$pkgrel
 }
 
+check() {
+	make check
+}
+
 package() {
 	make install DESTDIR="$pkgdir"
 }
 
-sha512sums="e12f603dd9a51c0afbafeca7b4a061733514c4cf509b1dd61cc37c94e6102e5b3439d7a0379e1e4179aeaff13a382dab985c9737812e52803f038c1b2bb97cf8  mkinitfs-3.4.5.tar.xz"
+sha512sums="
+217ae1353dad9bf5e5c7ebb25f281c80493c2bad16fe99aa079a30a9196918ac39fd02c54d59de19f338e07f93f9297945d621d32a6d802f0f01d93df89398d1  mkinitfs-3.9.1.tar.gz
+"
diff --git a/main/mkinitfs/mkinitfs.trigger b/main/mkinitfs/mkinitfs.trigger
index e8acc978544..8ec777c4a79 100644
--- a/main/mkinitfs/mkinitfs.trigger
+++ b/main/mkinitfs/mkinitfs.trigger
@@ -1,33 +1,56 @@
 #!/bin/sh
 
+CONFIG='/etc/mkinitfs/mkinitfs.conf'
+if [ -f "$CONFIG" ]; then
+	case "$(. "$CONFIG" >/dev/null; printf %s "$disable_trigger")" in
+		yes | YES | true | TRUE | 1) exit 0;;
+	esac
+fi
+
 for i in "$@"; do
 	# get last element in path
-	flavor=${i##*/}
-	if ! [ -f "$i"/kernel.release ]; then
-		# kernel was uninstalled
-		rm -f $( readlink -f /boot/initramfs-$flavor ) \
-			/boot/initramfs-$flavor /boot/vmlinuz-$flavor \
-			/boot/$flavor /boot/$flavor.gz /$flavor /$flavor.gz
-		continue
-	fi
-	abi_release=$(cat "$i"/kernel.release)
-	initfs=initramfs-$flavor
-	mkinitfs -o /boot/$initfs $abi_release
+	abi_release=${i##*/}
+
+	suffix="$(cat "$i"/kernel-suffix 2>/dev/null)" || {
+		# clean up on uninstall
+		suffix="$(cat "$i/initramfs-suffix" 2>/dev/null)" || {
+			# fallback suffix
+			flavor="${abi_release##*[0-9]-}"
+			if [ "$flavor" != "$abi_release" ]; then
+				suffix="-$flavor"
+			fi
+		}
+
+		rm -f "$i"/initramfs-suffix
+		rmdir "$i" 2>/dev/null
+		if ! [ -e "/boot/vmlinuz$suffix" ]; then
+			# kernel was removed
+			rm -v "/boot/initramfs$suffix"
+			continue
+		fi
+
+		# upgrading
+		if ! [ -e "$i"/modules.order ]; then
+			continue
+		fi
+	}
+
+	# store the initramfs suffix for removal
+	echo "$suffix" > "$i"/initramfs-suffix
+	initramfs="/boot/initramfs$suffix"
+	mkinitfs -o "$initramfs" "$abi_release" || {
+		echo "  mkinitfs failed!" >&2
+		echo "  your system may not be bootable" >&2
+		exit 1
+	}
 done
 
 # extlinux will use path relative partition, so if /boot is on a
 # separate partition we want /boot/<kernel> resolve to /<kernel>
 if ! [ -e /boot/boot ]; then
-	ln -sf . /boot/boot
+	ln -sf . /boot/boot 2>/dev/null # silence error in case of FAT
 fi
 
-# cleanup unused initramfs
-for i in /boot/initramfs-[0-9]*; do
-	[ -f $i ] || continue
-	if ! [ -f /boot/vmlinuz-${i#/boot/initramfs-} ]; then
-		rm "$i"
-	fi
-done
-
-sync
+# sync only the filesystem on /boot as that is where we are writing the initfs.
+sync -f /boot
 exit 0
diff --git a/main/mksh/APKBUILD b/main/mksh/APKBUILD
index d18349fe4ae..d217f89b750 100644
--- a/main/mksh/APKBUILD
+++ b/main/mksh/APKBUILD
@@ -1,27 +1,24 @@
 # Contributor: Eivind Uggedal <eu@eju.no>
 # Maintainer: Sören Tempel <soeren+alpinelinux@soeren-tempel.net>
 pkgname=mksh
-pkgver=58
+pkgver=59c
 _pkgver=R$pkgver
-pkgrel=0
-pkgdesc="MirBSD KSH Shell"
+pkgrel=4
+pkgdesc="MirBSD Korn Shell"
 url="https://www.mirbsd.org/mksh"
 arch="all"
-license="BSD"
-depends=""
-depends_dev=""
-makedepends=""
+license="MirOS AND Unicode-DFS-2016"
 checkdepends="perl"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
 subpackages="$pkgname-doc"
-source="https://www.mirbsd.org/MirOS/dist/mir/$pkgname/$pkgname-$_pkgver.tgz"
+source="http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-$_pkgver.tgz"
 builddir="$srcdir/$pkgname"
 
 prepare() {
 	default_prepare
 
 	# This test case checks if a controlling tty is not present when
-	# `-C regress:no-ctty` has been passed. However, a controlling
+	# '-C regress:no-ctty' has been passed. However, a controlling
 	# tty might be present when building this APKBUILD locally but
 	# isn't present on the builder. To make sure the tests pass both
 	# locally and on the builders we remove this test case.
@@ -29,20 +26,19 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	sh Build.sh -r
 }
 
 check() {
-	cd "$builddir"
 	./test.sh -v -f -C regress:no-ctty
 }
 
 package() {
-	cd "$builddir"
 	install -Dm755 mksh "$pkgdir"/bin/mksh
+	install -Dm644 dot.mkshrc "$pkgdir"/etc/skel/.mkshrc
 	install -Dm644 mksh.1 "$pkgdir"/usr/share/man/man1/mksh.1
-	install -Dm644 dot.mkshrc "$pkgdir"/usr/share/doc/mksh/dot.mkshrc
 }
 
-sha512sums="711351f8bbe8e44fcf9e7963f8e749938ec3ccb362fafd5350d44593841c2acb6d54ffa115dbb6b83c30865728a4c5274c05feedb063e293361e2830d263d80f  mksh-R58.tgz"
+sha512sums="
+f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340  mksh-R59c.tgz
+"
diff --git a/main/mlmmj/APKBUILD b/main/mlmmj/APKBUILD
index adaa8ad9c85..2c794cf2456 100644
--- a/main/mlmmj/APKBUILD
+++ b/main/mlmmj/APKBUILD
@@ -1,35 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mlmmj
-pkgver=1.3.0
+pkgver=1.4.5
 pkgrel=0
 pkgdesc="Mailing list managing made joyful"
 url="http://mlmmj.org/"
 arch="all"
 license="MIT"
 subpackages="$pkgname-doc"
-depends=
-makedepends=
 install="$pkgname.pre-install"
 pkgusers="mlmmj"
 pkggroups="mlmmj"
-source="http://mlmmj.org/releases/mlmmj-$pkgver.tar.gz"
+source="https://codeberg.org/mlmmj/mlmmj/releases/download/RELEASE_${pkgver//./_}/mlmmj-$pkgver.tar.gz"
+options="!check"
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		|| return 1
-	make || return 1
+		"$(want_check || echo --disable-tests)"
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" install || return 1
+	make -j1 DESTDIR="$pkgdir" install
 	install -d "$pkgdir"/usr/share/mlmmj/texts
 	cp -r listtexts/* "$pkgdir"/usr/share/mlmmj/texts/
 	install -o mlmmj -g mlmmj -d "$pkgdir"/var/spool/mlmmj
 }
-sha512sums="ea40cae02a7ca5949af6ae01adcdc97536f63f9336f1e4081cf875312bb121a285405353a5863aa6d5f09834b2b6dd328650ed212a30f4940b5fbf82d20184cf  mlmmj-1.3.0.tar.gz"
+
+sha512sums="
+b555328bb34e642598965ce086dfaf20ea2a5157976fa6263b7b4274fdc81eb1e8691f31808a7f978ca5a4486c7baee7bf20bf732097f46f19d71cca31d9c94b  mlmmj-1.4.5.tar.gz
+"
diff --git a/main/monit/APKBUILD b/main/monit/APKBUILD
index 6d903e48a10..71c1df5fed6 100644
--- a/main/monit/APKBUILD
+++ b/main/monit/APKBUILD
@@ -1,22 +1,22 @@
 # Contributor: Łukasz Jendrysik
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=monit
-pkgver=5.26.0
-pkgrel=2
+pkgver=5.33.0
+pkgrel=3
 pkgdesc="Managing and monitoring on a UNIX system"
 url="https://mmonit.com/monit/"
 arch="all"
-license="AGPL-3.0-or-later"
-makedepends="openssl-dev zlib-dev"
+license="AGPL-3.0-or-later WITH OpenSSL-Exception"
+makedepends="openssl-dev>3 zlib-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
 source="https://mmonit.com/monit/dist/monit-$pkgver.tar.gz
 	fix-invalid-use-of-vfork.patch
 	$pkgname.initd
+	$pkgname.confd
 	"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,15 +29,15 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-			install -Dm 755 "$srcdir"/$pkgname.initd \
-		"$pkgdir"/etc/init.d/$pkgname
+
+	install -Dm 755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	install -Dm 644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+
 	install -Dm 644 "$builddir"/monitrc \
 		"$pkgdir"/etc/monitrc
 	sed -i '/allow @monit/s/^/#/' \
@@ -49,6 +49,9 @@ package() {
 	chmod 600 "$pkgdir"/etc/monitrc
 }
 
-sha512sums="ae5bfc9f2e8cf2d2efa7a121f3bb865dc5b66b647e23e005349799f3f4384dfa1534ed88d0767ca41dac4cea2674fb82cfb51098129d350b470143df548c6900  monit-5.26.0.tar.gz
+sha512sums="
+f84edfc03a7386bb712c3d1e1e74801c5deea596f533bd898f342c8435e4b9f4225ec24a4daee11c4d23a5742e9f8a9c666ebaa1ba56f13842ac7214d1d70d4f  monit-5.33.0.tar.gz
 549fda6dc92c2630152a29f5bb94d29a59abb06300e55eb93ed729758d73ed7dceaa2e9f491c9d33419920aef24c0360f865753be28af13a11216129529611ae  fix-invalid-use-of-vfork.patch
-cf2b417a73766ff568f1df904f1ccdee1289037994c8ba1743cf1d04cb1ea8945f66d6cb2c9bab868f600a7c7ae57436d1f49cccbe22745b41282034e169ef25  monit.initd"
+05475c60ddfbf8690a83b83c4ec238d6c8e2f1b38ee076f323937d48bd447bb3d415302c23223f7fc0783476cedda81200ac6e08aa60512838f91ce359f3aaae  monit.initd
+0385a06684bae5f66585b7e1de732d9efcb3d13535e5410da85d0a04151ef0c9d8c28f862176a91e5ba769fca5ebab76e5423a8807709859a87314a513acee2d  monit.confd
+"
diff --git a/main/monit/monit.confd b/main/monit/monit.confd
new file mode 100644
index 00000000000..76c17a023be
--- /dev/null
+++ b/main/monit/monit.confd
@@ -0,0 +1,8 @@
+# Configuration for /etc/init.d/monit
+
+# Additional arguments for the monit command.
+#command_args=""
+
+# Run with the process supervisor. If you want to run the daemon with
+# start-stop-daemon instead, comment it out.
+supervisor="supervise-daemon"
diff --git a/main/monit/monit.initd b/main/monit/monit.initd
index 56323bbf984..f8317b25794 100644
--- a/main/monit/monit.initd
+++ b/main/monit/monit.initd
@@ -1,39 +1,46 @@
 #!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/files/monit.initd-5.0-r1,v 1.2 2011/12/31 16:28:50 idl0r Exp $
-
-supervisor=supervise-daemon
 
 name="monit"
 description="Monit service supervisor"
 
-: ${monit_config:=${CONF:-/etc/monitrc}}
+extra_commands="checkconfig configtest"
+extra_started_commands="reload"
+
+# $monit_config is for backward compatibility (Alpine <3.19)
+: ${cfgfile:="${monit_config:-/etc/monitrc}"}
 
-command=/usr/bin/monit
-command_args="-c ${monit_config}"
+command="/usr/bin/monit"
+command_args="-c $cfgfile"
 command_args_foreground="-I"
 
-extra_commands="configtest"
-extra_started_commands="reload"
+required_files="$cfgfile"
 
 depend() {
 	use net
 }
 
+start_pre() {
+	checkconfig
+}
+
+checkconfig() {
+	ebegin "Checking $name configuration"
+
+	if ! /usr/bin/monit -t -c "$cfgfile" >/dev/null 2>&1; then
+		eerror "$RC_SVCNAME has detected an error in your setup:"
+		/usr/bin/monit -t "$cfgfile"
+		return 1
+	fi
+	eend 0
+}
+
+# Deprecated, only for backward compatibility (Alpine <3.19)
 configtest() {
-        /usr/bin/monit -t -c "${monit_config}" 1>/dev/null 2>&1
-        ret=$?
-        if [ $ret -ne 0 ]; then
-                eerror "${RC_SVCNAME} has detected an error in your setup:"
-                /usr/bin/monit -t "${monit_config}"
-        fi
-        return $ret
+	checkconfig "$@"
 }
 
 reload() {
-	ebegin "Reloading monit"
-	$command -c "${monit_config}" reload >/dev/null 2>&1
+	ebegin "Reloading $name"
+	$command -c "$cfgfile" reload >/dev/null 2>&1
 	eend $?
 }
-
diff --git a/main/mosh/APKBUILD b/main/mosh/APKBUILD
index 43160db982b..eb1a869a01e 100644
--- a/main/mosh/APKBUILD
+++ b/main/mosh/APKBUILD
@@ -1,34 +1,51 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=mosh
-pkgver=1.3.2
-pkgrel=13
+pkgver=1.4.0
+pkgrel=8
 pkgdesc="Mobile shell surviving disconnects with local echo and line editing"
-options="!check" # emulation-cursor-motion.test fails
 url="https://mosh.org"
-arch="all !mips64"
+arch="all"
 license="GPL-3.0-or-later"
 depends="$pkgname-client $pkgname-server"
 checkdepends="tmux perl"
-makedepends="ncurses-dev zlib-dev openssl-dev perl-dev perl-io-tty
-	protobuf-dev automake autoconf libtool gzip"
-subpackages="$pkgname-doc $pkgname-client $pkgname-server
-	$pkgname-bash-completion:bashcomp:noarch"
-source="https://mosh.org/$pkgname-$pkgver.tar.gz
-	fix-ppc64le-build-with-musl.patch"
-
-builddir="$srcdir"/$pkgname-$pkgver
+makedepends="
+	abseil-cpp-dev
+	autoconf
+	automake
+	gzip
+	libtool
+	ncurses-dev
+	openssl-dev>3
+	perl-dev
+	perl-io-tty
+	protobuf-dev
+	zlib-dev
+	"
+subpackages="
+	$pkgname-client
+	$pkgname-client-doc:clientdoc:noarch
+	$pkgname-server
+	$pkgname-server-doc:serverdoc:noarch
+	$pkgname-doc
+	$pkgname-bash-completion"
+source="https://github.com/mobile-shell/mosh/archive/refs/tags/mosh-$pkgver.tar.gz
+	fix-ppc64le-build-with-musl.patch
+	fix-makefile.am.patch
+	"
+builddir="$srcdir"/$pkgname-$pkgname-$pkgver
+options="!check" # emulation-cursor-motion.test fails
 
 prepare() {
 	default_prepare
 	# Test unicode-later-combining is failing. Ideally we want to fix it.
 	sed -i '/unicode-later-combining.test/d' "$builddir"/src/tests/Makefile.am
-	cd "$builddir"
 	./autogen.sh
 }
 
+
 build() {
-	cd "$builddir"
+	CXXFLAGS="$CXXFLAGS -std=c++17 -Wno-deprecated-declarations" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -42,22 +59,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make distcheck VERBOSE=1 V=1
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-}
-
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
 	install -Dm644 "$builddir"/conf/bash-completion/completions/mosh \
-		"$subpkgdir"/usr/share/bash-completion/completions/$pkgname
+		"$pkgdir"/usr/share/bash-completion/completions/$pkgname
 }
 
 server() {
@@ -78,5 +86,26 @@ client() {
 		"$subpkgdir"/usr/bin/
 }
 
-sha512sums="f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769  mosh-1.3.2.tar.gz
-a276dde98a2dab63ad9c9c05468c55983a95f482878c5694713810b561eae1ea5618efc72431a17ee5b5014b12ee9709c6a8cbf582620294e7888cc837cd073c  fix-ppc64le-build-with-musl.patch"
+serverdoc() {
+	pkgdesc="Mosh server (documentation)"
+	install_if="mosh-server docs"
+	depends=""
+
+	gzip -n -9 "$pkgdir/usr/share/man/man1/mosh-server.1"
+	amove usr/share/man/man1/mosh-server.1.gz
+}
+
+clientdoc() {
+	pkgdesc="Mosh client (documentation)"
+	install_if="mosh-client docs"
+	depends=""
+
+	gzip -n -9 "$pkgdir/usr/share/man/man1/mosh-client.1"
+	amove usr/share/man/man1/mosh-client.1.gz
+}
+
+sha512sums="
+b91b0e719774f87a565c0f5870a6105edae1763fb7bed0697db152fa38dd748c6e413201887ad3c6c7c2fc75ccc003c2afbb60e754c6f6a977103f90a7caee4a  mosh-1.4.0.tar.gz
+360bdd9e353eec982c98d68ec1a6806c9ccb6dac57bb58ddc98b2fb03dc14346a8bb613c50cada4efbfa4fee0efc5e69b3dcd1e5b164f6ec85f179a18b262d16  fix-ppc64le-build-with-musl.patch
+52a7c167f4150b03a787d124e3aed40f97215ef4171576f4ef75c504b93d28e5240e9fe0a71769b2ef32756565a46926d711f32ab6e07dca17dd53f774f82c5c  fix-makefile.am.patch
+"
diff --git a/main/mosh/fix-makefile.am.patch b/main/mosh/fix-makefile.am.patch
new file mode 100644
index 00000000000..beb3bf1bce2
--- /dev/null
+++ b/main/mosh/fix-makefile.am.patch
@@ -0,0 +1,10 @@
+--- a/scripts/Makefile.am	2022-10-27 01:18:11.000000000 +0000
++++ b/scripts/Makefile.am	2022-10-28 20:22:44.569619128 +0000
+@@ -5,6 +5,6 @@
+ CLEANFILES = $(bin_SCRIPTS)
+ 
+ mosh:	mosh.pl ../VERSION Makefile
+-	perl -Mdiagnostics -c $(srcdir)/mosh.pl
++	perl -c $(srcdir)/mosh.pl
+ 	@sed -e "s/\@VERSION\@/`cat ../VERSION`/" -e "s/\@PACKAGE_STRING\@/@PACKAGE_STRING@/" $(srcdir)/mosh.pl > mosh
+ 	@chmod a+x mosh
diff --git a/main/mosh/fix-ppc64le-build-with-musl.patch b/main/mosh/fix-ppc64le-build-with-musl.patch
index 8d918a963a7..c921a46b5fa 100644
--- a/main/mosh/fix-ppc64le-build-with-musl.patch
+++ b/main/mosh/fix-ppc64le-build-with-musl.patch
@@ -13,8 +13,8 @@ lost.
 +++ b/src/frontend/mosh-server.cc
 @@ -714,7 +714,12 @@
  	      }
- 	      window_size.ws_col = res->width;
- 	      window_size.ws_row = res->height;
+ 	      window_size.ws_col = res.width;
+ 	      window_size.ws_row = res.height;
 -	      if ( ioctl( host_fd, TIOCSWINSZ, &window_size ) < 0 ) {
 +
 +	      #if defined(__powerpc64__) && (!defined(__GLIBC__) && !defined(__UCLIBC__))
diff --git a/main/mosquitto/APKBUILD b/main/mosquitto/APKBUILD
index 6c25d423d6f..19db78a36db 100644
--- a/main/mosquitto/APKBUILD
+++ b/main/mosquitto/APKBUILD
@@ -1,25 +1,42 @@
 # Contributor: Pedro Filipe <xpecex@outlook.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mosquitto
-pkgver=1.6.9
+pkgver=2.0.18
 pkgrel=0
-pkgdesc="An Open Source MQTT v3.1 Message Broker"
+pkgdesc="open source MQTT broker"
 url="https://mosquitto.org/"
 arch="all"
-license="EPL-1.0"
+license="EPL-1.0 OR EPL-2.0"
 replaces="mosquitto-utils"
 install="$pkgname.pre-install"
 options="!check" # FIXME: some of the tests are flaky
-makedepends="openssl-dev c-ares-dev util-linux-dev libwebsockets-dev libxslt"
+makedepends="openssl-dev>3 c-ares-dev util-linux-dev libxslt"
 checkdepends="python3 cunit-dev"
 subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-libs++:_pp $pkgname-openrc
 	$pkgname-libs $pkgname-clients"
-source="http://mosquitto.org/files/source/mosquitto-$pkgver.tar.gz
-	config.patch
-	disable-ci-tests.patch
-	mosquitto.initd"
+source="https://mosquitto.org/files/source/mosquitto-$pkgver.tar.gz
+	mosquitto.initd
+	mosquitto.confd
+	"
+
+if [ -z "$BOOTSTRAP" ]; then
+	makedepends="$makedepends libwebsockets-dev cjson-dev"
+	_websockets=yes
+	_cjson=yes
+else
+	_websockets=no
+	_cjson=no
+fi
 
 # secfixes:
+#   2.0.16-r0:
+#     - CVE-2023-28366
+#     - CVE-2023-0809
+#     - CVE-2023-3592
+#   2.0.10-r0:
+#     - CVE-2021-28166
+#   2.0.8-r0:
+#     - CVE-2021-34432
 #   1.6.7-r0:
 #     - CVE-2019-11779
 #   1.5.6-r0:
@@ -39,19 +56,19 @@ source="http://mosquitto.org/files/source/mosquitto-$pkgver.tar.gz
 prepare() {
 	default_prepare
 
-	# dont strip
+	# don't strip
 	sed -i -e "s|(INSTALL) -s|(INSTALL)|g" \
 		-e 's|--strip-program=${CROSS_COMPILE}${STRIP}||' \
-		*/Makefile */*/Makefile
+		./*/Makefile ./*/*/Makefile
 }
 
 build() {
 	# PSK not supported by libressl
 	make \
 		WITH_MEMORY_TRACKING=no \
-		WITH_WEBSOCKETS=yes \
+		WITH_WEBSOCKETS=$_websockets \
+		WITH_CJSON=$_cjson \
 		WITH_SRV=yes \
-		WITH_TLS_PSK=no \
 		WITH_ADNS=no \
 		prefix=/usr
 }
@@ -61,7 +78,10 @@ check() {
 }
 
 package() {
-	make prefix=/usr DESTDIR="$pkgdir" install
+	make prefix=/usr \
+		DESTDIR="$pkgdir" \
+		WITH_CJSON=$_cjson \
+		install
 
 	mv "$pkgdir"/etc/mosquitto/mosquitto.conf.example \
 		"$pkgdir"/etc/mosquitto/mosquitto.conf
@@ -69,6 +89,7 @@ package() {
 		"$pkgdir"/etc/mosquitto/mosquitto.conf
 
 	install -Dm755 "$srcdir"/mosquitto.initd "$pkgdir"/etc/init.d/mosquitto
+	install -Dm644 "$srcdir"/mosquitto.confd "$pkgdir"/etc/conf.d/mosquitto
 }
 
 _pp() {
@@ -87,7 +108,8 @@ clients() {
 	mv "$pkgdir"/usr/bin/mosquitto_[ps]ub "$subpkgdir"/usr/bin/
 }
 
-sha512sums="f78228a1e8305e4d89b34250981ed2c5fe5317636003636dc90f6fa2b1e3ca3c8fadb705ee7301f5252456cb093a6547bd46a255ca3d9fb5cdced697738d6eb7  mosquitto-1.6.9.tar.gz
-fb000f9fa1ef94cbf3811a23b5692c0c8f9e2df945959cef6005462715e99d6f75cf6b31bd496271ffc17634024aed986771a73962fef865c0d386f6c194fb33  config.patch
-21df2006a5eb9e1248cf261e555ded8e80e79f2a2d2a55b1f8a153af7c0feb867f3b3bd71efbe4d8569e3031c65f3e144794724f012e7539244a9bd97b6b6bb3  disable-ci-tests.patch
-d5406c258351133d85fc90056d78286a0ed1defde90e68d84fa9a1d65244d2baef76fd30fd04855e4bf6fc87532ef8ff274a6b70564f09f69fc6d14b5106fef0  mosquitto.initd"
+sha512sums="
+63f7e2811964bab5856848e6918627c47afc6534ff60aad5ece3d2fa330b407c9df14027610826e343ee68ff7d8d5d93f2459713061251ded478c42766946767  mosquitto-2.0.18.tar.gz
+a527813957b6f2d7afdb7269bade61d99b3023a147861b38902971929ff342a7c8c276bdb808fcfe7e48fa3e5c7521a16d777e5a3313256b8bf1e759cec5b7b0  mosquitto.initd
+678a8aaefb9181f5f4998304046e5a8737049f90cf6bbbfd5fd4549592728afe77cb536547b39ad1598d53fe0b7c03e1506b2683e7b936712b9fad4a317f4b43  mosquitto.confd
+"
diff --git a/main/mosquitto/config.patch b/main/mosquitto/config.patch
deleted file mode 100644
index a070427ddb0..00000000000
--- a/main/mosquitto/config.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/config.mk b/config.mk
-index 46ffb6d..4e7b31d 100644
---- a/config.mk
-+++ b/config.mk
-@@ -26,7 +26,7 @@ WITH_TLS:=yes
- # Comment out to disable TLS/PSK support in the broker and client. Requires
- # WITH_TLS=yes.
- # This must be disabled if using openssl < 1.0.
--WITH_TLS_PSK:=yes
-+WITH_TLS_PSK:=no
- 
- # Comment out to disable client threading support.
- WITH_THREADING:=yes
-@@ -46,7 +46,7 @@ WITH_PERSISTENCE:=yes
- # Comment out to remove memory tracking support from the broker. If disabled,
- # mosquitto won't track heap memory usage nor export '$SYS/broker/heap/current
- # size', but will use slightly less memory and CPU time.
--WITH_MEMORY_TRACKING:=yes
-+WITH_MEMORY_TRACKING:=no
- 
- # Compile with database upgrading support? If disabled, mosquitto won't
- # automatically upgrade old database versions.
-@@ -69,7 +69,7 @@ WITH_SRV:=no
- WITH_UUID:=yes
- 
- # Build with websockets support on the broker.
--WITH_WEBSOCKETS:=no
-+WITH_WEBSOCKETS:=yes
- 
- # Use elliptic keys in broker
- WITH_EC:=yes
-@@ -88,6 +88,7 @@ WITH_STATIC_LIBRARIES:=no
- 
- # Build with async dns lookup support for bridges (temporary). Requires glibc.
- #WITH_ADNS:=yes
-+WITH_ADNS=no
- 
- # Build with epoll support.
- WITH_EPOLL:=yes
diff --git a/main/mosquitto/disable-ci-tests.patch b/main/mosquitto/disable-ci-tests.patch
deleted file mode 100644
index 593b9388572..00000000000
--- a/main/mosquitto/disable-ci-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test/unit/Makefile b/test/unit/Makefile
-index 9d42242..3ffba7d 100644
---- a/test/unit/Makefile
-+++ b/test/unit/Makefile
-@@ -113,7 +113,6 @@ test-lib : mosq_test
- 	./mosq_test
- 
- test-broker : persist_read_test persist_write_test
--	./persist_read_test
- 	./persist_write_test
- 
- test : test-broker test-lib
-
diff --git a/main/mosquitto/mosquitto.confd b/main/mosquitto/mosquitto.confd
new file mode 100644
index 00000000000..d4ee25e710c
--- /dev/null
+++ b/main/mosquitto/mosquitto.confd
@@ -0,0 +1,10 @@
+# Configuration file for /etc/init.d/mosquitto
+
+# Path to the mosquitto configuration file.
+#cfgfile="/etc/mosquitto/${RC_SVCNAME#mosquitto.}.conf"
+
+# Additional arguments to pass to the mosquitto program.
+#command_args=
+
+# Uncomment to use process supervisor.
+#supervisor="supervise-daemon"
diff --git a/main/mosquitto/mosquitto.initd b/main/mosquitto/mosquitto.initd
index 2e7830030d8..7299ab2cd34 100644
--- a/main/mosquitto/mosquitto.initd
+++ b/main/mosquitto/mosquitto.initd
@@ -1,17 +1,14 @@
 #!/sbin/openrc-run
 
-supervisor=supervise-daemon
-
 name="Mosquitto message broker"
 description="MQTT v3.1.1 Message Broker"
 
-command="/usr/sbin/mosquitto"
-command_args="$mosquitto_args"
+: ${cfgfile:="/etc/mosquitto/${RC_SVCNAME#mosquitto.}.conf"}
 
-config=/etc/mosquitto/${RC_SVCNAME#mosquitto.}.conf
+command="/usr/sbin/mosquitto"
+# mosquitto_args is here for backward compatibility only
+command_args="-c $cfgfile ${command_args:-$mosquitto_args}"
+command_background="yes"
+pidfile="/run/$RC_SVCNAME.pid"
 
-start_pre() {
-	if [ -f $config ]; then
-		command_args="-c $config $command_args"
-	fi
-}
+required_files="$cfgfile"
diff --git a/main/mozjs60/0001-silence-sandbox-violations.patch b/main/mozjs60/0001-silence-sandbox-violations.patch
deleted file mode 100644
index 91820267182..00000000000
--- a/main/mozjs60/0001-silence-sandbox-violations.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream: no
-From 9ad10569e11a2fb96377188f895bc66abcc9511d Mon Sep 17 00:00:00 2001
-From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Date: Wed, 5 Sep 2018 15:05:24 +0200
-Subject: [PATCH] silence sandbox violations
-
-Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
----
- python/mozbuild/mozbuild/frontend/emitter.py | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
-index 642b381c0..c37fbf5d0 100644
---- a/python/mozbuild/mozbuild/frontend/emitter.py
-+++ b/python/mozbuild/mozbuild/frontend/emitter.py
-@@ -1127,11 +1127,6 @@ class TreeMetadataEmitter(LoggingMixin):
-                 raise SandboxValidationError('Path specified in LOCAL_INCLUDES '
-                     'does not exist: %s (resolved to %s)' % (local_include,
-                     full_path), context)
--            if (full_path == context.config.topsrcdir or
--                    full_path == context.config.topobjdir):
--                raise SandboxValidationError('Path specified in LOCAL_INCLUDES '
--                    'is not allowed: %s (resolved to %s)' % (local_include,
--                    full_path), context)
-             include_obj = LocalInclude(context, local_include)
-             local_includes.append(include_obj.path.full_path)
-             yield include_obj
--- 
-2.18.0
-
diff --git a/main/mozjs60/APKBUILD b/main/mozjs60/APKBUILD
deleted file mode 100644
index 7b4a2375344..00000000000
--- a/main/mozjs60/APKBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# Contributor: Rasmus Thomsen <oss@cogitri.dev>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
-pkgname=mozjs60
-pkgver=60.9.0
-_majver=${pkgver%%.*}
-pkgrel=3
-pkgdesc="standalone mozilla javascript engine"
-url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/60"
-arch="all"
-license="MPL-2.0"
-depends_dev="icu-dev nspr-dev libffi-dev readline-dev"
-makedepends="$depends_dev zlib-dev python2 python2-dev perl sed autoconf2.13 linux-headers"
-subpackages="$pkgname-dev $pkgname-dbg"
-source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-${pkgver}esr.source.tar.xz
-	0001-silence-sandbox-violations.patch
-	fix-musl-build.patch
-	fix-soname-lib.patch
-	big-endian.patch
-	"
-builddir="$srcdir"/firefox-$pkgver
-_builddir="$builddir/js/src"
-
-# secfixes:
-#   60.7.2-r0:
-#     - CVE-2019-11708
-#     - CVE-2019-11707
-
-build() {
-	cd "$_builddir"
-
-	export LDFLAGS="$LDFLAGS -Wl,-z,stack-size=1048576"
-
-	# avoid complains about autoconf
-	touch configure
-
-	# Fix broken ARM_ARCH check which doesn't work with newer GCCs it seems.
-	# Disable JIT on MIPS, doesn't compile.
-	extra_args=""
-	case "$CTARGET" in
-		armv*)
-			ARM_ARCH=$(echo ${CTARGET#*armv} | sed "s|-.*||")
-			sed -i "s|ARM_ARCH=.*|ARM_ARCH=$ARM_ARCH|" "$builddir"/build/autoconf/arch.m4
-			;;
-		mips*)
-			extra_args="--disable-ion"
-			;;
-	esac
-
-	export SHELL=/bin/ash
-	PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-		--with-system-icu \
-		--with-system-nspr \
-		--with-system-zlib \
-		--with-intl-api \
-		--enable-ctypes \
-		--enable-shared-js \
-		--enable-readline \
-		--enable-system-ffi \
-		--disable-optimize \
-		--disable-jemalloc \
-		--enable-pie $extra_args
-	make
-}
-
-check() {
-	cd "$_builddir"
-	dist/bin/jsapi-tests
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
-	rm -f "$pkgdir"/usr/lib/*.ajs
-}
-
-sha512sums="4baea5c9c4eff257834bbaee6d7786f69f7e6bacd24ca13c2705226f4a0d88315ab38c650b2c5e9c76b698f2debc7cea1e5a99cb4dc24e03c48a24df5143a3cf  firefox-60.9.0esr.source.tar.xz
-adaacd6e087a07bd4ded598f6a66ee00c67c9092bb93d88729668516f6f00f497ad8ece1866680e6c371e4705e0f9194ade41ea3a986f793bd972c92029cf03a  0001-silence-sandbox-violations.patch
-bc91c2fb15eb22acb8acc36d086fb18fbf6f202b4511d138769b5ecaaed4a673349c55f808270c762616fafa42e3b01e74dc0af1dcbeea1289e043926e2750c8  fix-musl-build.patch
-4782794a0f409f767293fb5f61a9ad58985e05197538975ed8f7372bfae6921a3b9bcbbbfcf8ce2843cdfe8ee799d08cee71a6391ed5ae939f051d13038b0960  fix-soname-lib.patch
-d9d587b614e2a08131688cac9bc3c78ffea96a79c7bcf8ae51ce208de5001250e0cd6f03269e1e09a387afcbc003c6f4446eb25411f65ad3073ed06539d7f74b  big-endian.patch"
diff --git a/main/mozjs60/big-endian.patch b/main/mozjs60/big-endian.patch
deleted file mode 100644
index 88c3aafde2f..00000000000
--- a/main/mozjs60/big-endian.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-Related
-https://bugzilla.mozilla.org/show_bug.cgi?id=1543659
-https://bugzilla.mozilla.org/show_bug.cgi?id=1543843
-https://hg.mozilla.org/mozilla-central/rev/bc11fcee5741
-https://bugzilla.mozilla.org/show_bug.cgi?id=1488552
-https://salsa.debian.org/gnome-team/mozjs60/blob/debian/master/debian/patches/jsproperty-endian.patch
-
-diff --git a/js/src/jsapi.h b/js/src/jsapi.h
-index 0f11787..5042af2 100644
---- a/js/src/jsapi.h
-+++ b/js/src/jsapi.h
-@@ -1581,7 +1581,12 @@ struct JSPropertySpec {
-     uintptr_t type;
-     union {
-       const char* string;
--      int32_t int32;
-+      struct {
-+#if MOZ_BIG_ENDIAN && JS_BITS_PER_WORD == 64
-+        uint32_t    padding;
-+#endif
-+        int32_t     int32;
-+      };
-     };
-   };
- 
-Bug 1488552 - Ensure proper running on 64-bit and 32-bit BE platforms.
-
-diff --git a/js/src/gc/RelocationOverlay.h b/js/src/gc/RelocationOverlay.h
---- a/js/src/gc/RelocationOverlay.h
-+++ b/js/src/gc/RelocationOverlay.h
-@@ -29,23 +29,34 @@ struct Cell;
-  * This structure overlays a Cell that has been moved and provides a way to find
-  * its new location. It's used during generational and compacting GC.
-  */
- class RelocationOverlay {
-   /* See comment in js/public/HeapAPI.h. */
-   static const uint32_t Relocated = js::gc::Relocated;
- 
-+#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32
-   /*
--   * Keep the low 32 bits untouched. Use them to distinguish strings from
-+   * Keep the first 32 bits untouched. Use them to distinguish strings from
-    * objects in the nursery.
-    */
-   uint32_t preserve_;
- 
-   /* Set to Relocated when moved. */
-   uint32_t magic_;
-+#elif JS_BITS_PER_WORD == 64
-+  /*
-+   * On big-endian, we need to reorder to keep preserve_ lined up with the
-+   * low 32 bits of the aligned group_ pointer in JSObject.
-+   */
-+  uint32_t magic_;
-+  uint32_t preserve_;
-+#else
-+#  error "Unknown endianness or word size"
-+#endif
- 
-   /* The location |this| was moved to. */
-   Cell* newLocation_;
- 
-   /* A list entry to track all relocated things. */
-   RelocationOverlay* next_;
- 
-  public:
-diff --git a/js/src/vm/StringType.h b/js/src/vm/StringType.h
---- a/js/src/vm/StringType.h
-+++ b/js/src/vm/StringType.h
-@@ -2,16 +2,17 @@
-  * vim: set ts=8 sts=4 et sw=4 tw=99:
-  * This Source Code Form is subject to the terms of the Mozilla Public
-  * License, v. 2.0. If a copy of the MPL was not distributed with this
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
- #ifndef vm_StringType_h
- #define vm_StringType_h
- 
-+#include "mozilla/EndianUtils.h"
- #include "mozilla/MemoryReporting.h"
- #include "mozilla/PodOperations.h"
- #include "mozilla/Range.h"
- 
- #include "jsapi.h"
- #include "jsfriendapi.h"
- 
- #include "builtin/String.h"
-@@ -168,8 +168,20 @@ class JSString : public js::gc::Cell
-   struct Data {
-     union {
-       struct {
-+#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32
-         uint32_t flags;  /* JSString */
-         uint32_t length; /* JSString */
-+#elif JS_BITS_PER_WORD == 64
-+        /*
-+         * On big-endian, we need to reorder to keep flags lined up
-+         * with the low 32 bits of the aligned group_ pointer in
-+         * JSObject.
-+         */
-+        uint32_t length; /* JSString */
-+        uint32_t flags;  /* JSString */
-+#else
-+#  error "Unknown endianness or word size"
-+#endif
-       };
-       uintptr_t flattenData; /* JSRope (temporary while flattening) */
-     } u1;
---- thunderbird-60.2.1/js/src/gc/Marking-inl.h.old	2018-10-01 14:51:12.000000000 +0000
-+++ thunderbird-60.2.1/js/src/gc/Marking-inl.h	2018-10-12 19:08:28.260000000 +0000
-@@ -92,13 +92,29 @@
-   MOZ_ASSERT(!isForwarded());
-   // The location of magic_ is important because it must never be valid to see
-   // the value Relocated there in a GC thing that has not been moved.
-+#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32
-+  // On 32-bit, the magic_ aliases with whatever comes after the first
-+  // pointer; on little-endian 64-bit, the magic_ aliases with the
-+  // 32 most significant bits of the pointer, which are the second half.
-   static_assert(offsetof(RelocationOverlay, magic_) ==
-                     offsetof(JSObject, group_) + sizeof(uint32_t),
-                 "RelocationOverlay::magic_ is in the wrong location");
-   static_assert(offsetof(RelocationOverlay, magic_) ==
-                     offsetof(js::Shape, base_) + sizeof(uint32_t),
-                 "RelocationOverlay::magic_ is in the wrong location");
-+#elif JS_BITS_PER_WORD == 64
-+  // On big-endian 64-bit, the magic_ aliases with the 32 most
-+  // significant bits of the pointer, but now that's the first half.
-+  static_assert(offsetof(RelocationOverlay, magic_) ==
-+                    offsetof(JSObject, group_),
-+                "RelocationOverlay::magic_ is in the wrong location");
-+  static_assert(offsetof(RelocationOverlay, magic_) ==
-+                    offsetof(js::Shape, base_),
-+                "RelocationOverlay::magic_ is in the wrong location");
-+#else
-+#  error "Unknown endianness or word size"
-+#endif
-   static_assert(
-       offsetof(RelocationOverlay, magic_) == offsetof(JSString, d.u1.length),
-       "RelocationOverlay::magic_ is in the wrong location");
-   magic_ = Relocated;
---- thunderbird-60.2.1/js/src/jsfriendapi.h.old	2018-10-01 14:51:13.000000000 +0000
-+++ thunderbird-60.2.1/js/src/jsfriendapi.h	2018-10-12 19:12:06.190000000 +0000
-@@ -9,6 +9,7 @@
- 
- #include "mozilla/Atomics.h"
- #include "mozilla/Casting.h"
-+#include "mozilla/EndianUtils.h"
- #include "mozilla/Maybe.h"
- #include "mozilla/MemoryReporting.h"
- #include "mozilla/UniquePtr.h"
-@@ -640,8 +641,15 @@
-   static const uint32_t LATIN1_CHARS_BIT = JS_BIT(6);
-   static const uint32_t EXTERNAL_FLAGS = LINEAR_BIT | NON_ATOM_BIT | JS_BIT(5);
-   static const uint32_t TYPE_FLAGS_MASK = JS_BIT(6) - 1;
-+#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32
-   uint32_t flags;
-   uint32_t length;
-+#elif JS_BITS_PER_WORD == 64
-+  uint32_t length;
-+  uint32_t flags;
-+#else
-+#  error "Unknown endianness or word size"
-+#endif
-   union {
-     const JS::Latin1Char* nonInlineCharsLatin1;
-     const char16_t* nonInlineCharsTwoByte;
diff --git a/main/mozjs60/fix-musl-build.patch b/main/mozjs60/fix-musl-build.patch
deleted file mode 100644
index af394673990..00000000000
--- a/main/mozjs60/fix-musl-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream: No
-Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD:
-https://github.com/void-linux/void-packages/issues/2598
-diff --git a/js/src/old-configure.in b/js/src/old-configure.in
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -1272,6 +1272,9 @@
-     *-android*|*-linuxandroid*)
-       :
-       ;;
-+    *-musl*)
-+      :
-+      ;;
-     *)
-       AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
-       ;;
diff --git a/main/mozjs60/fix-soname-lib.patch b/main/mozjs60/fix-soname-lib.patch
deleted file mode 100644
index b9147fa20c9..00000000000
--- a/main/mozjs60/fix-soname-lib.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Source: Arch Linux
-Upstream: Unknown
-Reason: fixes linking against libmozjs-60
-
-diff --git i/js/src/build/Makefile.in w/js/src/build/Makefile.in
-index ee19104e0ef5..a0f06fd35a18 100644
---- i/js/src/build/Makefile.in
-+++ w/js/src/build/Makefile.in
-@@ -89,6 +89,8 @@ ifneq (,$(REAL_LIBRARY))
- endif
- ifneq (,$(SHARED_LIBRARY))
- 	$(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir)
-+	mv -f $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).0
-+	ln -s $(SHARED_LIBRARY).0 $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
- ifeq ($(OS_ARCH),Darwin)
- 	install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
- endif
-diff --git i/js/src/build/moz.build w/js/src/build/moz.build
-index a7f5fa4ce8eb..726687c13fb0 100644
---- i/js/src/build/moz.build
-+++ w/js/src/build/moz.build
-@@ -23,6 +23,7 @@ if not CONFIG['JS_STANDALONE']:
- if CONFIG['JS_SHARED_LIBRARY']:
-     GeckoSharedLibrary('js', linkage=None)
-     SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']
-+    LDFLAGS += ['-Wl,-soname,lib{}.so.0'.format(SHARED_LIBRARY_NAME)]
- else:
-     Library('js')
- 
-
diff --git a/main/mpc1/APKBUILD b/main/mpc1/APKBUILD
index 85a48b7b71b..9bba4cd751a 100644
--- a/main/mpc1/APKBUILD
+++ b/main/mpc1/APKBUILD
@@ -1,28 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mpc1
-pkgver=1.1.0
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="Multiprecision C library"
 url="http://www.multiprecision.org/"
 arch="all"
 license="LGPL-3.0-or-later"
-depends=
-makedepends_host="gmp-dev mpfr-dev"
+makedepends_host="gmp-dev mpfr-dev>=4.1.0-r0"
 makedepends="$makedepends_host"
-install=
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://ftp.gnu.org/gnu/mpc/mpc-$pkgver.tar.gz"
 
 builddir="$srcdir"/mpc-$pkgver
 
 build() {
-	cd "$builddir"
-	# workaround for a bug in configure script
-	EGREP=egrep \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--with-sysroot="${CBUILDROOT}" \
+		--with-sysroot="$CBUILDROOT" \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
@@ -32,13 +27,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628  mpc-1.1.0.tar.gz"
+sha512sums="
+4bab4ef6076f8c5dfdc99d810b51108ced61ea2942ba0c1c932d624360a5473df20d32b300fc76f2ba4aa2a97e1f275c9fd494a1ba9f07c4cb2ad7ceaeb1ae97  mpc-1.3.1.tar.gz
+"
diff --git a/main/mpdecimal/APKBUILD b/main/mpdecimal/APKBUILD
new file mode 100644
index 00000000000..78463dd6f5d
--- /dev/null
+++ b/main/mpdecimal/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: Stefan Stutz <stutz@pm.me>
+# Maintainer: Stefan Stutz <stutz@pm.me>
+pkgname=mpdecimal
+pkgver=4.0.0
+pkgrel=0
+pkgdesc="complete implementation of the General Decimal Arithmetic Specification"
+url="https://www.bytereef.org/mpdecimal/index.html"
+arch="all"
+license="BSD-2-Clause"
+subpackages="$pkgname-doc $pkgname-dev"
+source="https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-$pkgver.tar.gz"
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--target=$CTARGET \
+		--prefix=/usr
+	make
+}
+
+check() {
+	# The new test target *make check_local* does not attempt to download
+	# dectest.zip.  This is useful for packagers whose infrastructure does
+	# not allow downloading during the testing phase.
+	make check_local
+}
+
+package() {
+	make install DESTDIR="$pkgdir"
+}
+sha512sums="
+7610ac53ac79f7a8a33fa7a3e61515810444ec73ebca859df7a9ddc18e96b990c99323172810c9cc7f6d6e1502c0be308cd443d6c2d5d0c871648e4842e05d59  mpdecimal-4.0.0.tar.gz
+"
diff --git a/main/mpfr4/APKBUILD b/main/mpfr4/APKBUILD
index f81d040ed1d..41a3d76a0bc 100644
--- a/main/mpfr4/APKBUILD
+++ b/main/mpfr4/APKBUILD
@@ -1,17 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mpfr4
-pkgver=4.0.2
-pkgrel=1
+pkgver=4.2.1
+pkgrel=0
+# strip p value, the patches are separate and are on https://www.mpfr.org/mpfr-current/
+_pkgver="${pkgver%_*}"
 pkgdesc="multiple-precision floating-point library"
-url="http://www.mpfr.org/"
+url="https://www.mpfr.org/"
 arch="all"
-license="GPL LGPL"
+license="LGPL-3.0-or-later"
 makedepends_build="texinfo"
 makedepends_host="gmp-dev"
 makedepends="$makedepends_build $makedepends_host"
-source="http://www.mpfr.org/mpfr-$pkgver/mpfr-$pkgver.tar.xz"
+
+# mpfr is special because we cannot break ABI without first rebuild gcc.
+# so we need be able to have multiple version of mpfr installed in parallel
+# we also need be able to calculate bulid order from global scope, otherwise
+# it is not possible to calculate build order til after package is built.
+# Therfore we call -dev package mpfr-dev instead of mpfr4-dev with a
+# provides=mpfr-dev
 subpackages="$pkgname-doc mpfr-dev"
-builddir="$srcdir/mpfr-$pkgver"
+
+source="https://www.mpfr.org/mpfr-$_pkgver/mpfr-$_pkgver.tar.xz"
+builddir="$srcdir/mpfr-$_pkgver"
+
+provides="mpfr=$pkgver-r$pkgrel"
+replaces="mpfr"
+
+# secfixes:
+#   4.2.1-r0:
+#     - CVE-2023-25139
 
 build() {
 	./configure \
@@ -31,9 +48,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-dev() {
-	replaces=mpfr
-	default_dev
-}
-
-sha512sums="d583555d08863bf36c89b289ae26bae353d9a31f08ee3894520992d2c26e5683c4c9c193d7ad139632f71c0a476d85ea76182702a98bf08dde7b6f65a54f8b88  mpfr-4.0.2.tar.xz"
+sha512sums="
+bc68c0d755d5446403644833ecbb07e37360beca45f474297b5d5c40926df1efc3e2067eecffdf253f946288bcca39ca89b0613f545d46a9e767d1d4cf358475  mpfr-4.2.1.tar.xz
+"
diff --git a/main/mpg123/APKBUILD b/main/mpg123/APKBUILD
index 732af086af0..90e1d25fbb1 100644
--- a/main/mpg123/APKBUILD
+++ b/main/mpg123/APKBUILD
@@ -1,18 +1,19 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mpg123
-pkgver=1.25.13
+pkgver=1.32.6
 pkgrel=0
 pkgdesc="Console-based MPEG Audio Player for Layers 1, 2 and 3"
-url="http://www.mpg123.org"
+options="libtool"
+url="https://www.mpg123.org"
 arch="all"
 license="LGPL-2.1-only"
 subpackages="$pkgname-libs $pkgname-dev $pkgname-doc"
 makedepends="libtool alsa-lib-dev linux-headers"
-source="http://www.mpg123.org/download/mpg123-$pkgver.tar.bz2"
-options="libtool"
+source="https://www.mpg123.org/download/mpg123-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,13 +27,15 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	# Installation is not parallel friendly and will fail
+	# sometimes
+	make -j1 DESTDIR="$pkgdir" install
 }
 
-sha512sums="2308a899f47eb0d17a603cb8a19ea07b1f338d85d9c2f798fb55732d77c603802e18b6ca0215cc59ccdd70fe89816c09fd16a6a91b1d1cd3834bd7877239cb39  mpg123-1.25.13.tar.bz2"
+sha512sums="
+a8f2833cd5b7568b96467917146d16dec7dbde527ba51b5f97b9f8093bbccab232803263f13a790b60ef36c9630d4277adaea41dac7dfd14052bf0be6620736b  mpg123-1.32.6.tar.bz2
+"
diff --git a/main/mqtt-exec/0001-Let-library-generate-client-id-when-unset.patch b/main/mqtt-exec/0001-Let-library-generate-client-id-when-unset.patch
deleted file mode 100644
index bd6411e5e31..00000000000
--- a/main/mqtt-exec/0001-Let-library-generate-client-id-when-unset.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 5ba6139990373e77d638f4dd903281673e145e7e Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 9 Oct 2019 15:00:51 +0200
-Subject: [PATCH] Let library generate client id when unset
-
----
- mqtt-exec.c | 17 ++++-------------
- 1 file changed, 4 insertions(+), 13 deletions(-)
-
-diff --git a/mqtt-exec.c b/mqtt-exec.c
-index 5c69325..ca585f9 100644
---- a/mqtt-exec.c
-+++ b/mqtt-exec.c
-@@ -151,8 +151,7 @@ int main(int argc, char *argv[])
- 	int keepalive = 60;
- 	int i, c, rc = 1;
- 	struct userdata ud;
--	char hostname[256];
--	static char id[MOSQ_MQTT_ID_MAX_LENGTH+1];
-+	char *id = NULL;
- 	struct mosquitto *mosq = NULL;
- 	char *username = NULL;
- 	char *password = NULL;
-@@ -174,9 +173,6 @@ int main(int argc, char *argv[])
- 
- 	memset(&ud, 0, sizeof(ud));
- 
--	memset(hostname, 0, sizeof(hostname));
--	memset(id, 0, sizeof(id));
--
- 	while ((c = getopt_long(argc, argv, "cdh:i:k:p:P:q:t:u:v", opts, &i)) != -1) {
- 		switch(c) {
- 		case 'c':
-@@ -194,7 +190,7 @@ int main(int argc, char *argv[])
- 					MOSQ_MQTT_ID_MAX_LENGTH);
- 				return 1;
- 			}
--			strncpy(id, optarg, sizeof(id)-1);
-+			id = optarg;
- 			break;
- 		case 'k':
- 			keepalive = atoi(optarg);
-@@ -276,12 +272,6 @@ int main(int argc, char *argv[])
- 	for (i=0; i <= ud.command_argc; i++)
- 		ud.command_argv[i] = optind+i < argc ? argv[optind+i] : NULL;
- 
--	if (id[0] == '\0') {
--		/* generate an id */
--		gethostname(hostname, sizeof(hostname)-1);
--		snprintf(id, sizeof(id), "mqttexe/%x-%s", getpid(), hostname);
--	}
--
- 	mosquitto_lib_init();
- 	mosq = mosquitto_new(id, clean_session, &ud);
- 	if (mosq == NULL)
-@@ -289,7 +279,8 @@ int main(int argc, char *argv[])
- 
- 	if (debug) {
- 		printf("host=%s:%d\nid=%s\ntopic_count=%zu\ncommand=%s\n",
--			host, port, id, ud.topic_count, ud.command_argv[0]);
-+			host, port, id ? id : "(null)", ud.topic_count,
-+			ud.command_argv[0]);
- 		mosquitto_log_callback_set(mosq, log_cb);
- 	}
- 
--- 
-2.23.0
-
diff --git a/main/mqtt-exec/0001-authentication-expose-authentication-with-credential.patch b/main/mqtt-exec/0001-authentication-expose-authentication-with-credential.patch
deleted file mode 100644
index aba1cee9fa5..00000000000
--- a/main/mqtt-exec/0001-authentication-expose-authentication-with-credential.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 5ee7377172dc0f30a64d009210db7efbf5d2219f Mon Sep 17 00:00:00 2001
-From: Kevin Daudt <me@ikke.info>
-Date: Wed, 14 Mar 2018 22:50:28 +0100
-Subject: [PATCH] authentication: expose authentication with credentials
-
-libmosquitto supports authentication with credentials, so allow settings
-credentials through parameters.
----
- mqtt-exec.c | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/mqtt-exec.c b/mqtt-exec.c
-index fc5ab03..28251fb 100644
---- a/mqtt-exec.c
-+++ b/mqtt-exec.c
-@@ -71,8 +71,10 @@ int usage(int retcode)
- " -i,--id ID                  The id to use for this client\n"
- " -k,--keepalive SEC          Set keepalive to SEC. Default is 60\n"
- " -p,--port PORT              Set TCP port to PORT. Default is 1883\n"
-+" -P,--password PASSWORD      Set password for authentication\n"
- " -q,--qos QOS                Set Quality of Serive to level. Default is 0\n"
- " -t,--topic TOPIC            Set MQTT topic to TOPIC. May be repeated\n"
-+" -u,--username USERNAME      Set username for authentication\n"
- " -v,--verbose                Pass over the topic to application as firs arg\n"
- " --will-topic TOPIC          Set the client Will topic to TOPIC\n"
- " --will-payload MSG          Set the client Will message to MSG\n"
-@@ -119,6 +121,8 @@ int main(int argc, char *argv[])
- 		{"qos",		required_argument,	0, 'q' },
- 		{"topic",	required_argument,	0, 't' },
- 		{"verbose",	no_argument,		0, 'v' },
-+		{"username",	required_argument,	0, 'u' },
-+		{"password",	required_argument,	0, 'P' },
- 		{"will-topic",	required_argument,	0, 0x1001 },
- 		{"will-payload", required_argument,	0, 0x1002 },
- 		{"will-qos",	required_argument,	0, 0x1003 },
-@@ -145,6 +149,8 @@ int main(int argc, char *argv[])
- 	char hostname[256];
- 	static char id[MOSQ_MQTT_ID_MAX_LENGTH+1];
- 	struct mosquitto *mosq = NULL;
-+	char *username = NULL;
-+	char *password = NULL;
- 
- 	char *will_payload = NULL;
- 	int will_qos = 0;
-@@ -166,7 +172,7 @@ int main(int argc, char *argv[])
- 	memset(hostname, 0, sizeof(hostname));
- 	memset(id, 0, sizeof(id));
- 
--	while ((c = getopt_long(argc, argv, "cdh:i:k:p:q:t:v", opts, &i)) != -1) {
-+	while ((c = getopt_long(argc, argv, "cdh:i:k:p:P:q:t:u:v", opts, &i)) != -1) {
- 		switch(c) {
- 		case 'c':
- 			clean_session = false;
-@@ -191,6 +197,8 @@ int main(int argc, char *argv[])
- 		case 'p':
- 			port = atoi(optarg);
- 			break;
-+		case 'P':
-+			password = optarg;
- 		case 'q':
- 			ud.qos = atoi(optarg);
- 			if (!valid_qos_range(ud.qos, "QoS"))
-@@ -202,6 +210,8 @@ int main(int argc, char *argv[])
- 					    sizeof(char *) * ud.topic_count);
- 			ud.topics[ud.topic_count-1] = optarg;
- 			break;
-+		case 'u':
-+			username = optarg;
- 		case 'v':
- 			ud.verbose = 1;
- 			break;
-@@ -286,6 +296,14 @@ int main(int argc, char *argv[])
- 		goto cleanup;
- 	}
- 
-+	if (!username != !password) {
-+		fprintf(stderr, "Need to set both username and password\n");
-+		goto cleanup;
-+	}
-+
-+	if (username && password)
-+		mosquitto_username_pw_set(mosq, username, password);
-+
- #ifdef WITH_TLS
- 	if ((cafile || capath) && mosquitto_tls_set(mosq, cafile, capath, certfile,
- 						    keyfile, NULL)) {
--- 
-2.18.0
-
diff --git a/main/mqtt-exec/APKBUILD b/main/mqtt-exec/APKBUILD
index 98f35288f43..5e9d76b1b0e 100644
--- a/main/mqtt-exec/APKBUILD
+++ b/main/mqtt-exec/APKBUILD
@@ -1,37 +1,32 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mqtt-exec
-pkgver=0.4
-pkgrel=5
+pkgver=0.5
+pkgrel=3
 pkgdesc="simple MQTT client that executes a command on messages"
 url="https://github.com/ncopa/mqtt-exec"
 arch="all"
 license="MIT"
-depends=""
-depends_dev=""
 makedepends="$depends_dev mosquitto-dev"
 options="!check" # no checks available.
 subpackages="$pkgname-dbg $pkgname-openrc"
 source="mqtt-exec-$pkgver.tar.gz::https://github.com/ncopa/mqtt-exec/archive/v$pkgver.tar.gz
-	0001-authentication-expose-authentication-with-credential.patch
-	0001-Let-library-generate-client-id-when-unset.patch
 	mqtt-exec.initd
+	mqtt-exec.confd
 	"
 
-builddir="$srcdir"/mqtt-exec-$pkgver
-
 build() {
-	cd "$builddir"
-	make || return 1
+	make
 }
 
 package() {
-	cd "$builddir"
-	install -D mqtt-exec "$pkgdir"/usr/bin/mqtt-exec || return 1
-	install -Dm755 "$srcdir"/mqtt-exec.initd \
-		"$pkgdir"/etc/init.d/mqtt-exec || return 1
+	install -D mqtt-exec "$pkgdir"/usr/bin/mqtt-exec
+
+	install -Dm755 "$srcdir"/mqtt-exec.initd "$pkgdir"/etc/init.d/mqtt-exec
+	install -Dm644 "$srcdir"/mqtt-exec.confd "$pkgdir"/etc/conf.d/mqtt-exec
 }
 
-sha512sums="1448b2dda0f27a5275c113331ea2bc073ec1740797c1bb5b472ee3e0fd4d3ef4bcdfa6dc42e7540ee154b291c3d70df89f0646899ebb1bfe585d1384797de5e7  mqtt-exec-0.4.tar.gz
-418058ecc05922df186d0dcbfeab7656977256a143f0346406598d1cf7331d3ba95a9b004bf3b6581be2e3cb2fbf5e69d7954b4c7ac488863f0318506c7f1c7c  0001-authentication-expose-authentication-with-credential.patch
-7007ad1afcba6b5c0e6224a30e3a6c1b9ce178603b27f575bb76d7b979b8e7f4c4c1226afa3ff8cf1f217fff832d0a69cff1cfbc205203dcb8a98afbf6f345ed  0001-Let-library-generate-client-id-when-unset.patch
-7e0c461d5ed73fb8bac1da5f78bb7d8204f692fc3980ee916057c19c3673591d4143a71cc846f863566abfcc9ada22281bb690bc146e9ae37f43896248e5ed4a  mqtt-exec.initd"
+sha512sums="
+55746aabe17d47153c01549a65f0db9278a39dc642e355b8416e905934a3abe233eb0ad763ae8add08bf6c3ad8ccaa97e9bac4372c8af6fea522f6670378acd7  mqtt-exec-0.5.tar.gz
+a5f918d9d874052211b8610c9686fde0b2641402c9be3aebd347083109d7457946d47dd99ebb4b765fddc264651a3182ed816a082add262d11c1a0157089ab60  mqtt-exec.initd
+f402e7a44d69a8fc09aa46a9922a68b21264281d69deeb61bdb8ec842b3f9c1ef8b7d83826997f9722c84f8ab15631dfdc55d9cfc416b3db1613c3ddcd53330e  mqtt-exec.confd
+"
diff --git a/main/mqtt-exec/mqtt-exec.confd b/main/mqtt-exec/mqtt-exec.confd
new file mode 100644
index 00000000000..0ba931e23bb
--- /dev/null
+++ b/main/mqtt-exec/mqtt-exec.confd
@@ -0,0 +1,28 @@
+# Configuration for /etc/init.d/mqtt-exec
+
+# The MQTT broker to connect to
+#mqtt_broker=msg.alpinelinux.org
+
+# The topics to subscribe to. Separate topics by whitespace.
+#mqtt_topics=
+
+# Set the topic for the Will
+#will_topic=
+
+# Whether the Will should be retained or not
+#will_retain=yes
+
+# The message in the Will
+#will_payload=
+
+# QOS level for the Will
+#will_qos=
+
+# Optional username to authenticate as
+#mqtt_user=
+
+# Password for the user
+#export MQTT_EXEC_PASSWORD=
+
+# Run with process supervisor. If you want to disable it, comment it out.
+supervisor=supervise-daemon
diff --git a/main/mqtt-exec/mqtt-exec.initd b/main/mqtt-exec/mqtt-exec.initd
index ff94d01d449..f69781d8b8c 100644
--- a/main/mqtt-exec/mqtt-exec.initd
+++ b/main/mqtt-exec/mqtt-exec.initd
@@ -1,12 +1,12 @@
 #!/sbin/openrc-run
 
+: ${command_user:="${exec_user:-nobody}"}
 : ${mqtt_broker:="msg.alpinelinux.org"}
 : ${mqtt_topics:="git/aports/$git_branch"}
 
-command=/usr/bin/mqtt-exec
-command_user="${exec_user:-nobody}"
-pidfile=/run/$SVCNAME/mqtt-exec.pid
-supervisor=supervise-daemon
+command="/usr/bin/mqtt-exec"
+command_background="yes"
+pidfile="/run/$RC_SVCNAME/mqtt-exec.pid"
 supervise_daemon_args="--stdout /dev/null --stderr /dev/null"
 
 depend() {
@@ -15,7 +15,7 @@ depend() {
 }
 
 start_pre() {
-	checkpath --directory --owner ${exec_user:-nobody} ${pidfile%/*}
+	checkpath --directory --owner "${command_user:-nobody}" "${pidfile%/*}"
 
 	set -- $command_args -h ${mqtt_broker} -v
 	local topic; for topic in $mqtt_topics; do
@@ -34,9 +34,11 @@ start_pre() {
 	if [ -n "$will_qos" ]; then
 		set -- "$@" --will-qos "$will_qos"
 	fi
+	if [ -n "$mqtt_user" ]; then
+		set -- "$@" --username "$mqtt_user"
+	fi
 
 	set -- "$@" -- ${exec_command}
 
 	command_args="$@"
 }
-
diff --git a/main/mrtg/APKBUILD b/main/mrtg/APKBUILD
index a439cd6590b..55eb4dcd1e1 100644
--- a/main/mrtg/APKBUILD
+++ b/main/mrtg/APKBUILD
@@ -1,38 +1,36 @@
 # Contributor: Jeff Bilyk<jbilyk at gmail>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mrtg
-pkgver=2.17.7
-pkgrel=0
+pkgver=2.17.10
+pkgrel=1
 pkgdesc="MRTG Network Latency Monitoring"
 url="https://oss.oetiker.ch/mrtg/"
-source="https://oss.oetiker.ch/mrtg/pub/$pkgname-$pkgver.tar.gz
-	mrtg.initd mrtg.confd"
-subpackages="$pkgname-doc"
+arch="all"
+license="GPL-2.0-or-later"
+options="!check" # no testsuite
 depends="perl"
 makedepends="gd-dev libpng-dev zlib-dev"
-arch="all"
-license="GPL"
-
-_builddir="$srcdir"/$pkgname-$pkgver
+subpackages="$pkgname-doc"
+source="https://oss.oetiker.ch/mrtg/pub/mrtg-$pkgver.tar.gz
+	mrtg.initd mrtg.confd"
 
 build() {
-       cd "$_builddir"
-       ./configure \
+	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--bindir=/usr/bin \
 		--libdir=/usr/lib \
 		--datadir=/usr/share/doc \
-		--mandir=/usr/share/doc/man \
-		|| return 1
-       make
+		--mandir=/usr/share/doc/man
+	make
 }
 
 package() {
-       cd "$_builddir"
-       make install DESTDIR="$pkgdir"
+	make install DESTDIR="$pkgdir"
 }
 
-sha512sums="b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768  mrtg-2.17.7.tar.gz
+sha512sums="
+b1c5232f1b3dcec39adc4fb5a423738f9470ad470e91c6a918cf3f875e71af263d8e03694c3d66129b2653fa498d8d9d9b95349fe90e9d2e0b3ed6c09d06e080  mrtg-2.17.10.tar.gz
 bafdee6845f9f38ca4e3a547ac74e4fdbe444f351f7548b894f2cd3ff39a8eb7d19558459d1c54f5d547e730b8d011e128331c4ec84a192f8ec1c7faa0b577a2  mrtg.initd
-ee42805b0d3abb802e7e69d1544f2821223183aadf3a6009c9434e56054d9b0df579e83a9f6ab22afa65590f6d331daf49fb512ac2578e9f473b6d40382dd2b5  mrtg.confd"
+ee42805b0d3abb802e7e69d1544f2821223183aadf3a6009c9434e56054d9b0df579e83a9f6ab22afa65590f6d331daf49fb512ac2578e9f473b6d40382dd2b5  mrtg.confd
+"
diff --git a/main/msmtp/APKBUILD b/main/msmtp/APKBUILD
deleted file mode 100644
index 16e2536e584..00000000000
--- a/main/msmtp/APKBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=msmtp
-pkgver=1.8.7
-pkgrel=1
-pkgdesc="SMTP client with a sendmail compatible interface"
-url="https://marlam.de/msmtp/"
-arch="all"
-license="GPL-3.0-or-later"
-options="!check" # no test suite
-makedepends="gettext-dev gnutls-dev"
-subpackages="$pkgname-doc $pkgname-lang $pkgname-openrc $pkgname-vim:vim:noarch"
-source="https://marlam.de/msmtp/releases/msmtp-$pkgver.tar.xz
-	msmtp.confd
-	msmtp.initd"
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-
-	install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
-	install -Dm644 "$srcdir/$pkgname.confd" "$pkgdir/etc/conf.d/$pkgname"
-}
-
-vim() {
-	depends=""
-	pkgdesc="Vim syntax for $pkgname"
-
-	install -Dm644 "$builddir"/scripts/vim/$pkgname.vim \
-		"$subpkgdir"/usr/share/vim/vimfiles/syntax/$pkgname.vim
-}
-
-sha512sums="5a079cb90b48853ad812125e8b341f5bcd5f5ba4725d62c37210050896527b63f993aa6393f1d4107636153bf0ed84b0288e88a7e78a119c66b2d58f1e69a67d  msmtp-1.8.7.tar.xz
-3839d7e8400cf897830c674f59563e225096d9755121d1ac14f3b493ab4cc0672228a9b14b9d9620d566593e2ae27d322a78c46791c6b5166ab82275d25dc0d3  msmtp.confd
-0e1b32b07ccac6f5a174a1e317390815b459a4a7ca4f15672456ac0a30c89edb93001a8047c38d1f8da65b9f07a7b17b3270a0a07248a6be248500cd42773cef  msmtp.initd"
diff --git a/main/msmtp/msmtp.confd b/main/msmtp/msmtp.confd
deleted file mode 100644
index cace916f08e..00000000000
--- a/main/msmtp/msmtp.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# defaut config
-
-#MSMTP_INTERFACE="127.0.0.1"
-#MSMTP_PORT="25"
-#MSMTP_COMMAND="/usr/bin/msmtp -f %F"
diff --git a/main/msmtp/msmtp.initd b/main/msmtp/msmtp.initd
deleted file mode 100755
index 70b9940c400..00000000000
--- a/main/msmtp/msmtp.initd
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/sbin/openrc-run
-
-: ${MSMTP_INTERFACE:="127.0.0.1"}
-: ${MSMTP_PORT:="25"}
-: ${MSMTP_COMMAND:="/usr/bin/msmtp -f %F"}
-
-pidfile="/var/run/${SVCNAME}"
-command="/usr/bin/msmtpd"
-command_args="--interface=$MSMTP_INTERFACE --port=$MSMTP_PORT --command='$MSMTP_COMMAND' "
-command_background="yes"
diff --git a/main/mt-st/APKBUILD b/main/mt-st/APKBUILD
index 175b1e956b0..8b9e944dc6c 100644
--- a/main/mt-st/APKBUILD
+++ b/main/mt-st/APKBUILD
@@ -1,32 +1,28 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=mt-st
-pkgver=1.3
+pkgver=1.7
 pkgrel=0
 pkgdesc="Linux SCSI tape driver aware magnetic tape control"
-url="http://www.ibiblio.org/pub/linux/system/backup/"
+url="https://github.com/iustin/mt-st"
 arch="all"
-license="GPL-2.0-or-later"
+license="GPL-2.0-only"
 makedepends="linux-headers"
-subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/iustin/mt-st/archive/mt-st-$pkgver.tar.gz
-	mt-st-include-sysmacros.patch
-	"
-
-builddir="$srcdir"/$pkgname-$pkgname-$pkgver
+subpackages="$pkgname-doc $pkgname-bash-completion"
+source="$pkgname-$pkgver.tar.gz::https://github.com/iustin/mt-st/archive/v$pkgver.tar.gz"
+options="!check"
 
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
-	for dir in sbin bin usr/share/man/man1 usr/share/man/man8
-	do
-		mkdir -p $pkgdir/$dir
-	done
-	make SBINDIR=$pkgdir/sbin BINDIR=$pkgdir/bin MANDIR=$pkgdir/usr/share/man install
+	make \
+		SBINDIR=$pkgdir/sbin \
+		BINDIR=$pkgdir/bin \
+		MANDIR=$pkgdir/usr/share/man \
+		COMPLETIONINSTALLDIR=$pkgdir/usr/share/bash-completion/completions install
 }
 
-sha512sums="d2eab36778b4c56c2bc12fc92dd9aae6a4488934b34f0244e7c461a1f0c5c14663f338bc1337502d3b5feac113b2dbc1f969cd4c1acf6df0bbc6b9a3409882de  mt-st-1.3.tar.gz
-621711dc38436285f98f587a43393c505a101c1a99d3c2b652660cef98c6532813620d6f34fa7ca55fe2e13383e6b5c4930dad5996b4007262a6fdea449c18a7  mt-st-include-sysmacros.patch"
+sha512sums="
+90d98a144b389c7d693fc9360aca5a84d37d60a38fe190c1b23d1c70542fae99b48f328671c72f95a3c357cfaf3ee3bbade5866f00bef319792212044ed23d14  mt-st-1.7.tar.gz
+"
diff --git a/main/mt-st/mt-st-include-sysmacros.patch b/main/mt-st/mt-st-include-sysmacros.patch
deleted file mode 100644
index 4edd0ca8dea..00000000000
--- a/main/mt-st/mt-st-include-sysmacros.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/mt.c
-+++ b/mt.c
-@@ -19,6 +19,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/utsname.h>
diff --git a/main/mtd-utils/APKBUILD b/main/mtd-utils/APKBUILD
index 9842c3912b5..85da4c6ee80 100644
--- a/main/mtd-utils/APKBUILD
+++ b/main/mtd-utils/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Olliver Schinagl <oliver@schinagl.nl>
-pkgname="mtd-utils"
-pkgver="2.1.1"
-pkgrel="0"
+pkgname=mtd-utils
+pkgver=2.2.0
+pkgrel=0
 pkgdesc="Utilities for handling MTD devices, and for dealing with FTL, NFTL JFFS2, etc."
 options="!check" # Tests fail on builder
 url="http://www.linux-mtd.infradead.org/"
@@ -16,7 +16,7 @@ makedepends="
 	libtool
 	linux-headers
 	lzo-dev
-	openssl-dev
+	openssl-dev>3
 	util-linux-dev
 	zlib-dev
 	zstd-dev
@@ -29,16 +29,12 @@ _subpackages="
 	$pkgname-nand
 	$pkgname-nor
 	$pkgname-ubi
+	$pkgname-dev
 	"
 subpackages="$pkgname-doc $_subpackages"
-_githash="beb39b15e926747fe404376ceb148c1b56c998f6"
-source="
-	$pkgname-$pkgver.tar.gz::http://git.infradead.org/mtd-utils.git/snapshot/$_githash.tar.gz
-	"
-builddir="$srcdir/$pkgname-$(echo "$_githash" | cut -c1-7)"
+source="https://infraroot.at/pub/mtd/mtd-utils-$pkgver.tar.bz2"
 
 build() {
-	./autogen.sh
 	./configure \
 	            --build="$CBUILD" \
 	            --enable-tests \
@@ -60,6 +56,14 @@ check() {
 	make check || _cat_found_file 'test-suite.log'
 }
 
+dev() {
+	mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib"
+	cd "$builddir/include"
+	mv libmtd.h libscan.h libubi.h libubigen.h "$subpkgdir/usr/include/"
+	cd $builddir
+	mv libmtd.a libscan.a libubi.a libubigen.a "$subpkgdir/usr/lib/"
+}
+
 flash() {
 	pkgdesc="MTD utils (flash commands)"
 
@@ -124,4 +128,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ec5b0bb00ec97ca759fc1cca83af716fb24f9465d70d61c38cf5ab02e7e30b456d2c884ade6dc594dc37412bbb6100cb954bcb4f5a0caf35e6581a0652f6496d  mtd-utils-2.1.1.tar.gz"
+sha512sums="
+985d1a600cc6d5c69dd4bd47c67612fcd35c009d772051c5e05b132a13c8a62534e0808930a398f78b3ef83e6f14a198169df71ac4c61c6415d879ddf64202de  mtd-utils-2.2.0.tar.bz2
+"
diff --git a/main/mtdev/APKBUILD b/main/mtdev/APKBUILD
deleted file mode 100644
index 23419e0100e..00000000000
--- a/main/mtdev/APKBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=mtdev
-pkgver=1.1.6
-pkgrel=0
-pkgdesc="Multitouch Protocol Translation Library Development Package"
-url="http://bitmath.org/code/mtdev/"
-arch="all"
-license="MIT"
-depends_dev="linux-headers"
-makedepends="$depends_dev"
-subpackages="$pkgname-dev"
-source="http://bitmath.org/code/mtdev/mtdev-$pkgver.tar.gz"
-
-prepare() {
-	update_config_sub
-	default_prepare
-}
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--disable-static
-	make
-}
-
-check() {
-	make check
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-}
-
-dev() {
-	default_dev
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
-}
-
-sha512sums="e643264baa880abfc31b53f8e8ed54fe1adea4bc110fab57d36be16caba84f970c09fc864244c64b0a76e85f5f021fd086c12f96badbd886da6ccf254ab678e9  mtdev-1.1.6.tar.gz"
diff --git a/main/mtools/APKBUILD b/main/mtools/APKBUILD
index 6636b5b7094..95e31462fab 100644
--- a/main/mtools/APKBUILD
+++ b/main/mtools/APKBUILD
@@ -1,16 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mtools
-pkgver=4.0.24
-pkgrel=0
-pkgdesc="A collection of utilities to access MS-DOS disks from Unix without mounting them"
+pkgver=4.0.43
+pkgrel=1
+pkgdesc="collection of utilities to access MS-DOS disks from Unix without mounting them"
 url="https://www.gnu.org/software/mtools/"
 arch="all"
 license="GPL-3.0-or-later"
-makedepends="texinfo"
-source="https://ftp.gnu.org/gnu/mtools/mtools-$pkgver.tar.bz2"
-subpackages="$pkgname-doc"
+makedepends="texinfo linux-headers"
+source="https://ftp.gnu.org/gnu/mtools/mtools-$pkgver.tar.bz2
+	fix-uninitialized.patch"
+subpackages="$pkgname-dbg $pkgname-doc"
 
 build() {
+	# todo: configure scripts are broken
+	export CFLAGS="$CFLAGS -DOS_linux"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,4 +33,7 @@ package() {
 	make -j1 install DESTDIR="$pkgdir"
 }
 
-sha512sums="b74becc4f696315cfabc016d1746e744b43e366de73bf1bffeec4fbab1e4815967594de8acb4af01f89d36a925f93672efbac205b89540161bd53ab7edebcf04  mtools-4.0.24.tar.bz2"
+sha512sums="
+b70e483688124a653dd333ab127494dab12d413809680a4846dc4ae5c166a0b9938a2ab290e518c1f1a5b18ed96d2c2a29d92d61b16b772a4ab5e495379fe410  mtools-4.0.43.tar.bz2
+3c41e2f84d7c2b15b119708453b30b6a056a443dbbf24198f2bdc82c99e6463974f7bb0bb13569fd1f929212506d43deed1ed77502c434a89b2da885baeab597  fix-uninitialized.patch
+"
diff --git a/main/mtools/fix-uninitialized.patch b/main/mtools/fix-uninitialized.patch
new file mode 100644
index 00000000000..5984d5da3ac
--- /dev/null
+++ b/main/mtools/fix-uninitialized.patch
@@ -0,0 +1,13 @@
+diff --git a/init.c b/init.c
+index af154b7..4040018 100644
+--- a/init.c
++++ b/init.c
+@@ -156,7 +156,7 @@ static Stream_t *try_device(struct device *dev,
+ #endif
+ 	
+ 	for(retry_write=0; retry_write<2; retry_write++) {
+-		Stream_t *Stream;
++		Stream_t *Stream = NULL;
+ 		int r;
+ 		int geomFailure=0;
+ 		if(retry_write)
diff --git a/main/mtx/APKBUILD b/main/mtx/APKBUILD
index 93eae0f869f..01d646c5873 100644
--- a/main/mtx/APKBUILD
+++ b/main/mtx/APKBUILD
@@ -1,39 +1,34 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
-pkgname="mtx"
+pkgname=mtx
 pkgver=1.3.12
-pkgrel=2
+pkgrel=4
 pkgdesc="SCSI Media Changer and Backup Device Control"
-url="http://mtx.opensource-sw.net/"
+url="https://sourceforge.net/projects/mtx/"
 arch="all"
-license="GPL-2.0"
-depends=""
-makedepends=""
-install=""
-subpackages=""
-source="https://downloads.sourceforge.net/mtx/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir/$pkgname-$pkgver"
+license="GPL-2.0-only"
+subpackages="$pkgname-doc"
+source="https://downloads.sourceforge.net/mtx/mtx-$pkgver.tar.gz"
+options="!check" # no tests
 
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
+	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--datadir=/usr/share \
-		|| return 1
-	make || return 1
+		--datadir=/usr/share
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make prefix="$pkgdir" install
+	make prefix="$pkgdir" mandir="$pkgdir/usr/share/man" install
 }
 
-sha512sums="d54c360608a2c25bd4d31af3e659de0557ed355fbe45d2dbf1341cfc7e468515eb07eb89200b77ee1fe2618139295ba3c3f4340cc43a7c506ced26aab2652028  mtx-1.3.12.tar.gz"
+sha512sums="
+d54c360608a2c25bd4d31af3e659de0557ed355fbe45d2dbf1341cfc7e468515eb07eb89200b77ee1fe2618139295ba3c3f4340cc43a7c506ced26aab2652028  mtx-1.3.12.tar.gz
+"
diff --git a/main/multipath-tools/0001-Disable-Werror-and-O2.patch b/main/multipath-tools/0001-Disable-Werror-and-O2.patch
new file mode 100644
index 00000000000..56401b78d7a
--- /dev/null
+++ b/main/multipath-tools/0001-Disable-Werror-and-O2.patch
@@ -0,0 +1,27 @@
+From 1494b5a3d96d8e8273c8c4e12cb08b2a86162842 Mon Sep 17 00:00:00 2001
+From: Leonardo Arena <rnalrd@alpinelinux.org>
+Date: Mon, 13 Sep 2021 07:18:04 +0000
+Subject: [PATCH] Disable 'O2' and 'Werror' CFLAGS
+
+---
+ Makefile.inc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.inc b/Makefile.inc
+index d0ec9b4..2f5da9e 100644
+--- a/Makefile.inc
++++ b/Makefile.inc
+@@ -97,8 +97,8 @@ ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers
+ WNOCLOBBERED := $(call TEST_CC_OPTION,-Wno-clobbered -Wno-error=clobbered,)
+ WFORMATOVERFLOW := $(call TEST_CC_OPTION,-Wformat-overflow=2,)
+ 
+-OPTFLAGS	:= -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
+-WARNFLAGS	:= -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
++OPTFLAGS	:= -Os -g $(STACKPROT) --param=ssp-buffer-size=4
++WARNFLAGS	:= -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
+ 		  -Werror=implicit-function-declaration -Werror=format-security \
+ 		  $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS)
+ CPPFLAGS	:= -Wp,-D_FORTIFY_SOURCE=2
+-- 
+2.32.0
+
diff --git a/main/multipath-tools/APKBUILD b/main/multipath-tools/APKBUILD
index 21020923ef6..6a0ed845a06 100644
--- a/main/multipath-tools/APKBUILD
+++ b/main/multipath-tools/APKBUILD
@@ -1,53 +1,63 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=multipath-tools
-pkgver=0.8.3
-pkgrel=4
+pkgver=0.9.8
+pkgrel=0
 pkgdesc="Device Mapper Multipathing Driver"
-url="http://christophe.varoqui.free.fr"
+url="http://christophe.varoqui.free.fr/"
 arch="all"
-license="GPL-2.0-only"
+license="LGPL-2.0-only"
 depends="eudev device-mapper"
-makedepends="lvm2-dev libaio-dev readline-dev ncurses-dev eudev-dev
-	userspace-rcu-dev json-c-dev perl"
+makedepends="
+	eudev-dev
+	json-c-dev
+	libaio-dev
+	lvm2-dev
+	ncurses-dev
+	perl
+	readline-dev
+	userspace-rcu-dev
+	util-linux-dev
+	"
 subpackages="$pkgname-doc $pkgname-openrc"
-source="$pkgname-$pkgver.tar.gz::https://git.opensvc.com/gitweb.cgi?p=$pkgname/.git;a=snapshot;h=$pkgver;sf=tgz
+source="$pkgname-$pkgver.tar.gz::https://github.com/opensvc/multipath-tools/archive/refs/tags/$pkgver.tar.gz
 	multipath-tools.conf
 	multipath.initd
 	multipathd.initd
+	multipathd.confd
+	0001-Disable-Werror-and-O2.patch
+	fix-basename.patch
 	"
 options="!check"
-builddir="$srcdir/multipath-tools"
-
-prepare() {
-	# Rename unpacked directory with hash in the name to something sane...
-	mv "$srcdir"/multipath-tools-$pkgver-* "$builddir"
-
-	default_prepare
-}
 
 build() {
-	cd $builddir
-
 	make prefix="/usr" \
 		sysconfdir="/etc" \
+		configdir="/etc/multipath/conf.d" \
 		mandir="/usr/share/man" \
 		infodir="/usr/share/info"
 }
 
 package() {
-	cd $builddir
-
-	make DESTDIR="$pkgdir" install
+	make prefix="/usr" SYSTEMDPATH="/lib" LIB=lib DESTDIR="$pkgdir" install
 
 	install -D -m644 "$srcdir"/$pkgname.conf \
 		"$pkgdir"/etc/multipath.conf
 	install -D -m755 "$srcdir"/multipathd.initd \
 		"$pkgdir"/etc/init.d/multipathd
+	install -D -m644 "$srcdir"/multipathd.confd \
+		"$pkgdir"/etc/conf.d/multipathd
 	install -D -m755 "$srcdir"/multipath.initd \
 		"$pkgdir"/etc/init.d/multipath
+	install -D -m644 README.md \
+		"$pkgdir"/usr/share/doc/$pkgname/README.md
 }
 
-sha512sums="d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae  multipath-tools-0.8.3.tar.gz
+sha512sums="
+4d73bcf6bce769a829c306c609b206ddba65a708620f458106e406dd18d12f9a9d97f400662daa8e6a75c9fdf7decb6dcbda92cb807b6c53522c7b4b2795b627  multipath-tools-0.9.8.tar.gz
 e81462b22c0cbc92ea935d7544b9f9a0c4ccbcf13f3bc03dadf6de96407c9cf49964c9bbf02f12a134e1255c66421c6fde39d54b15eef975e8df81bdc88b2213  multipath-tools.conf
-97deeee57daee787d807da0a4dbf50baae047ddcda30925f7000ec822b5a17a3dc55196c3e032c8ffbc2caeac690ce5ca485b0a7c99f15e66bddaa000439112a  multipath.initd
-2f913fed199f12f048eb042b5bb1a326f6f09cfe63d572ac269461d96ebf25b251576de22be7ba9ab631ded7af6fd47dac38fda3b29d00640c806181eb37447c  multipathd.initd"
+6176a4ed32711ff8e417a58ca0cad8279d46ba98ec40095dbdb1035c49c0f82b06b5affbe2b79c5f2020b215ebe31ebeb408509dc810f5d21eb757e88be8c99f  multipath.initd
+17853ca127259e129bbd61f24a830777d5b6d69f6500313fa62a0e0773de73387ce2c3a58a93a6182ee3d4891d1ec5fc2322cb674e787b326ef9cd8dcff5cbab  multipathd.initd
+2adc2b8322645fec8763a662614b5682294f81dc0f1b9cacace5e5ea62125aa80f4874c1b10f11619e79871087846a946f7a383c22953ca1fbaeb9ea021c5114  multipathd.confd
+f5699633be498cc78ed27c222334b9e5c7271b852f9e687991e425a27db74cd9c01198792fe5fc7f5dedf47fee9b577e8c4803f5b0323b10544f3678d5c6c714  0001-Disable-Werror-and-O2.patch
+3f65a2006c03ba168eb3fcec537042ae9e0ddbcab48a051970fcc477bd88b2eeb16db79c9f06d4fc7b7e06411d46e159b7d13d2fe9613ba5be1ed68d9e66e54c  fix-basename.patch
+"
diff --git a/main/multipath-tools/fix-basename.patch b/main/multipath-tools/fix-basename.patch
new file mode 100644
index 00000000000..9feff3a06a0
--- /dev/null
+++ b/main/multipath-tools/fix-basename.patch
@@ -0,0 +1,14 @@
+diff --git a/libmultipath/configure.c b/libmultipath/configure.c
+index d809490..62154fd 100644
+--- a/libmultipath/configure.c
++++ b/libmultipath/configure.c
+@@ -43,6 +43,9 @@
+ #include "sysfs.h"
+ #include "io_err_stat.h"
+ 
++#define basename(dev) \
++	(strrchr((dev),'/') ? strrchr((dev),'/')+1 : (dev))
++
+ /* group paths in pg by host adapter
+  */
+ int group_by_host_adapter(struct pathgroup *pgp, vector adapters)
diff --git a/main/multipath-tools/multipath.initd b/main/multipath-tools/multipath.initd
index fd2bd1d0e4f..4b0a1d498bc 100644
--- a/main/multipath-tools/multipath.initd
+++ b/main/multipath-tools/multipath.initd
@@ -1,5 +1,7 @@
 #!/sbin/openrc-run
 
+description="Initialize multipath"
+
 depend() {
 	before checkfs fsck multipathd iscsid lvm
 	after modules device-mapper
diff --git a/main/multipath-tools/multipathd.confd b/main/multipath-tools/multipathd.confd
new file mode 100644
index 00000000000..c77d68669fb
--- /dev/null
+++ b/main/multipath-tools/multipathd.confd
@@ -0,0 +1,4 @@
+# Configuration for /etc/init.d/multipathd
+
+# Comment out to run without process supervisor.
+supervisor="supervise-daemon"
diff --git a/main/multipath-tools/multipathd.initd b/main/multipath-tools/multipathd.initd
index 931ef46e8a6..92e982422b8 100644
--- a/main/multipath-tools/multipathd.initd
+++ b/main/multipath-tools/multipathd.initd
@@ -1,7 +1,10 @@
 #!/sbin/openrc-run
 
-supervisor=supervise-daemon
-command=/sbin/multipathd
-command_args_foreground="-d"
-output_log=/var/log/${RC_SVCNAME}.log
-error_log=/var/log/${RC_SVCNAME}.log
+description="Multipath monitoring daemon"
+
+command="/usr/sbin/multipathd"
+command_args="-d $command_args"
+command_background="yes"
+pidfile="/run/$RC_SVCNAME.pid"
+output_log="/var/log/$RC_SVCNAME.log"
+error_log="/var/log/$RC_SVCNAME.log"
diff --git a/main/musl-fts/APKBUILD b/main/musl-fts/APKBUILD
new file mode 100644
index 00000000000..4561f3dd6ee
--- /dev/null
+++ b/main/musl-fts/APKBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=musl-fts
+pkgver=1.2.7
+pkgrel=6
+pkgdesc="Provides the fts(3) functions, which are missing in musl libc"
+url="https://github.com/void-linux/musl-fts/"
+arch="all"
+license="BSD-3-Clause"
+makedepends="automake autoconf libtool"
+subpackages="$pkgname-dev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/void-linux/musl-fts/archive/refs/tags/v$pkgver.tar.gz"
+provides="fts=$pkgver-r$pkgrel"
+
+prepare() {
+	default_prepare
+	./bootstrap.sh
+}
+
+build() {
+	CFLAGS=-fPIC ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+
+	install -Dm644 musl-fts.pc -t "$pkgdir"/usr/lib/pkgconfig/
+}
+
+dev() {
+	default_dev
+	provides="fts-dev=$pkgver-r$pkgrel"
+}
+
+sha512sums="
+949f73b9406b06bd8712c721b4ec89afcb37d4eaef5666cccf3712242d3a57fc0acf3ca994934e0f57c1e92f40521a9370132a21eb6d1957415a83c76bf20feb  musl-fts-1.2.7.tar.gz
+"
diff --git a/main/musl-legacy-error/APKBUILD b/main/musl-legacy-error/APKBUILD
new file mode 100644
index 00000000000..dad76e64c04
--- /dev/null
+++ b/main/musl-legacy-error/APKBUILD
@@ -0,0 +1,21 @@
+# Maintainer:
+pkgname=musl-legacy-error
+pkgver=0.5
+pkgrel=1
+pkgdesc="Legacy compatibility error.h header for musl libc"
+url="https://voidlinux.org"
+arch="noarch"
+# license of the void-packages repository ?
+license="BSD-2-Clause"
+source="error.h"
+builddir="$srcdir"
+options="!check" # no code
+
+package() {
+	install -Dm644 error.h \
+		-t "$pkgdir"/usr/include
+}
+
+sha512sums="
+f71a0e26315c71988573523dcec12e666d10578b59096f52dfea3613cb0eb694bd53df5f7d6764e73157612eafe1e6ef9c37a8357f300105e4c4e6dd28d49761  error.h
+"
diff --git a/main/musl-legacy-error/error.h b/main/musl-legacy-error/error.h
new file mode 100644
index 00000000000..9a4e1f8d006
--- /dev/null
+++ b/main/musl-legacy-error/error.h
@@ -0,0 +1,60 @@
+#ifndef _ERROR_H_
+#define _ERROR_H_
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#warning usage of non-standard #include <error.h> is deprecated
+
+static unsigned int error_message_count = 0;
+
+static inline void error(int status, int errnum, const char* format, ...)
+{
+	/* should be fflush(stdout), but that's unspecified if stdout has been closed;
+	 * stick with fflush(NULL) for simplicity (glibc checks if the fd is still valid) */
+	fflush(NULL);
+
+	va_list ap;
+	fprintf(stderr, "%s: ", program_invocation_name);
+	va_start(ap, format);
+	vfprintf(stderr, format, ap);
+	va_end(ap);
+	if (errnum)
+		fprintf(stderr, ": %s", strerror(errnum));
+	fprintf(stderr, "\n");
+	error_message_count++;
+	if (status)
+		exit(status);
+}
+
+static int error_one_per_line = 0;
+
+static inline void error_at_line(int status, int errnum, const char *filename,
+		unsigned int linenum, const char *format, ...)
+{
+	va_list ap;
+	if (error_one_per_line) {
+		static const char *old_filename;
+		static int old_linenum;
+		if (linenum == old_linenum && filename == old_filename)
+			return;
+		old_filename = filename;
+		old_linenum = linenum;
+	}
+	fprintf(stderr, "%s: %s:%u: ", program_invocation_name, filename, linenum);
+	va_start(ap, format);
+	vfprintf(stderr, format, ap);
+	va_end(ap);
+	if (errnum)
+		fprintf(stderr, ": %s", strerror(errnum));
+	fprintf(stderr, "\n");
+	error_message_count++;
+	if (status)
+		exit(status);
+}
+
+
+#endif	/* _ERROR_H_ */
diff --git a/main/musl-locales/APKBUILD b/main/musl-locales/APKBUILD
new file mode 100644
index 00000000000..3a8b71e9787
--- /dev/null
+++ b/main/musl-locales/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: TBK <alpine@jjtc.eu>
+# Maintainer: TBK <alpine@jjtc.eu>
+pkgname=musl-locales
+pkgver=0.1.0
+pkgrel=1
+arch="all"
+url="https://git.adelielinux.org/adelie/musl-locales/-/wikis/home"
+pkgdesc="Locales support for musl"
+license="LGPL-3.0-only"
+options="!check" # No test suite
+makedepends="cmake gettext-dev samurai"
+subpackages="$pkgname-lang"
+source="https://git.adelielinux.org/adelie/musl-locales/-/archive/$pkgver/musl-locales-$pkgver.tar.bz2
+	add-all-available-locales.patch
+	"
+
+build() {
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		"$CMAKE_CROSSOPTS"
+	cmake --build build
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+lang() {
+	default_lang
+	license="MIT"
+}
+
+sha512sums="
+4c7ae748f70d02195d221ea9b37e0f033e15c9364b797313727303830fb1d848693facb5267a1d7f354508383d72817e3322f001d86842fa716cecf6ef95c7ff  musl-locales-0.1.0.tar.bz2
+dac294f9e6207686b8dcbedfc71db4e7e8c648ca6e11992dd6b606e0fcefc44d15db192753f8a6c902941a5aa9540e54fac2747bfa59058b087c46c49ac314de  add-all-available-locales.patch
+"
diff --git a/main/musl-locales/add-all-available-locales.patch b/main/musl-locales/add-all-available-locales.patch
new file mode 100644
index 00000000000..fff08c92350
--- /dev/null
+++ b/main/musl-locales/add-all-available-locales.patch
@@ -0,0 +1,24 @@
+Right now we patch e.g. gnome-desktop to list all languages. Musl itself doesn't support
+this localization (so strings from the c lib will always be in English), but at least
+this way users can get translated UIs
+diff --git a/locale.c b/locale.c
+index ede426d..7ae9e67 100644
+--- a/locale.c
++++ b/locale.c
+@@ -107,15 +107,7 @@ static void list_locale()
+     const char *locpath = getenv("MUSL_LOCPATH");
+     printf("C\n");
+     printf("C.UTF-8\n");
+-    if(locpath != NULL)
+-    {
+-        DIR *dir = opendir(locpath);
+-        struct dirent *pDir;
+-        while ((pDir = readdir(dir)) != NULL){
+-            if (strcmp(pDir->d_name,".") && strcmp(pDir->d_name,".."))
+-                printf("%s\n",pDir->d_name);
+-        }
+-    }
++    printf("a_DJ\naa_ER\naa_ET\naf_ZA\nagr_PE\nak_GH\nam_ET\nan_ES\nanp_IN\nar_AE\nar_BH\nar_DZ\nar_EG\nar_IN\nar_IQ\nar_JO\nar_KW\nar_LB\nar_LY\nar_MA\nar_OM\nar_QA\nar_SA\nar_SD\nar_SS\nar_SY\nar_TN\nar_YE\nas_IN\nast_ES\nayc_PE\naz_AZ\naz_IR\nbe_BY\nbem_ZM\nber_DZ\nber_MA\nbg_BG\nbhb_IN\nbho_IN\nbho_NP\nbi_VU\nbn_BD\nbn_IN\nbo_CN\nbo_IN\nbr_FR\nbrx_IN\nbs_BA\nbyn_ER\nca_AD\nca_ES\nca_FR\nca_IT\nce_RU\nch_DE\nchr_US\ncmn_TW\ncrh_UA\ncs_CZ\ncsb_PL\ncv_RU\ncy_GB\nda_DK\nde_AT\nde_BE\nde_CH\nde_DE\nde_IT\nde_LI\nde_LU\ndoi_IN\ndsb_DE\ndv_MV\ndz_BT\nel_CY\nel_GR\nen_AG\nen_AU\nen_BW\nen_CA\nen_DK\nen_GB\nen_HK\nen_IE\nen_IL\nen_IN\nen_NG\nen_NZ\nen_PH\nen_SC\nen_SG\nen_US\nen_ZA\nen_ZM\nen_ZW\neo\nes_AR\nes_BO\nes_CL\nes_CO\nes_CR\nes_CU\nes_DO\nes_EC\nes_ES\nes_GT\nes_HN\nes_MX\nes_NI\nes_PA\nes_PE\nes_PR\nes_PY\nes_SV\nes_US\nes_UY\nes_VE\net_EE\neu_ES\nfa_IR\nff_SN\nfi_FI\nfil_PH\nfo_FO\nfr_BE\nfr_CA\nfr_CH\nfr_FR\nfr_LU\nfur_IT\nfy_DE\nfy_NL\nga_IE\ngd_GB\ngez_ER\ngez_ET\ngl_ES\ngu_IN\ngv_GB\nha_NG\nhak_TW\nhe_IL\nhi_IN\nhif_FJ\nhne_IN\nhr_HR\nhsb_DE\nht_HT\nhu_HU\nhy_AM\nia_FR\nid_ID\nig_NG\nik_CA\nis_IS\nit_CH\nit_IT\niu_CA\nja_JP\nka_GE\nkab_DZ\nkk_KZ\nkl_GL\nkm_KH\nkn_IN\nko_KR\nkok_IN\nks_IN\nku_TR\nkw_GB\nky_KG\nlb_LU\nlg_UG\nli_BE\nli_NL\nlij_IT\nln_CD\nlo_LA\nlt_LT\nlv_LV\nlzh_TW\nmag_IN\nmai_IN\nmai_NP\nmfe_MU\nmg_MG\nmhr_RU\nmi_NZ\nmiq_NI\nmjw_IN\nmk_MK\nml_IN\nmn_MN\nmni_IN\nmnw_MM\nmr_IN\nms_MY\nmt_MT\nmy_MM\nnan_TW\nnb_NO\nnds_DE\nnds_NL\nne_NP\nnhn_MX\nniu_NU\nniu_NZ\nnl_AW\nnl_BE\nnl_NL\nnn_NO\nnr_ZA\nnso_ZA\noc_FR\nom_ET\nom_KE\nor_IN\nos_RU\npa_IN\npa_PK\npap_AW\npap_CW\npl_PL\nps_AF\npt_BR\npt_PT\nquz_PE\nraj_IN\nro_RO\nru_RU\nru_UA\nrw_RW\nsa_IN\nsah_RU\nsat_IN\nsc_IT\nsd_IN\nse_NO\nsgs_LT\nshn_MM\nshs_CA\nsi_LK\nsid_ET\nsk_SK\nsl_SI\nsm_WS\nso_DJ\nso_ET\nso_KE\nso_SO\nsq_AL\nsq_MK\nsr_ME\nsr_RS\nss_ZA\nst_ZA\nsv_FI\nsv_SE\nsw_KE\nsw_TZ\nszl_PL\nta_IN\nta_LK\ntcy_IN\nte_IN\ntg_TJ\nth_TH\nthe_NP\nti_ER\nti_ET\ntig_ER\ntk_TM\ntl_PH\ntn_ZA\nto_TO\ntpi_PG\ntr_CY\ntr_TR\nts_ZA\ntt_RU\nug_CN\nuk_UA\nunm_US\nur_IN\nur_PK\nuz_UZ\nve_ZA\nvi_VN\nwa_BE\nwae_CH\nwal_ET\nwo_SN\nxh_ZA\nyi_US\nyo_NG\nyue_HK\nyuw_PG\nzh_CN\nzh_HK\nzh_SG\nzh_TW\nzu_ZA\n");
+ }
+ 
+ static void list_charmaps()
diff --git a/main/musl-nscd/APKBUILD b/main/musl-nscd/APKBUILD
index 9f2bc470b9d..baab60de3c0 100644
--- a/main/musl-nscd/APKBUILD
+++ b/main/musl-nscd/APKBUILD
@@ -1,15 +1,16 @@
 # Maintainer: Michael Aldridge <maldridge@voidlinux.org>
 pkgname=musl-nscd
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.1.1
+pkgrel=4
 pkgdesc="Implementation of nscd for nsswitch modules for musl"
 url="https://github.com/pikhq/musl-nscd"
 arch="all"
+options="!check" # no test suite
 license="MIT"
 depends_dev="bison flex"
 makedepends="$depends_dev"
-install="$pkgname.pre-install $pkgname.post-deinstall"
-subpackages="$pkgname-dev $pkgname-doc"
+install="$pkgname.pre-install"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
 source="
 	$pkgname-$pkgver.tar.gz::https://github.com/pikhq/musl-nscd/archive/v$pkgver.tar.gz
 	musl-nscd.initd
@@ -29,9 +30,6 @@ build() {
 package() {
 	make DESTDIR="$pkgdir" install
 
-	install -m644 -D include/nss.h \
-		"$pkgdir"/usr/include
-
 	install -m644 -D COPYRIGHT \
 		"$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
 
@@ -39,5 +37,7 @@ package() {
 		"$pkgdir"/etc/init.d/nscd
 }
 
-sha512sums="b931a28d70bbcc19a5b592449e7400ee61d5af93511d44e2e63416010b3938f1d350a965b0ad876699bed406926d3180a0380868279e13d3456e2264c80a4b7d  musl-nscd-1.0.3.tar.gz
-d66265b6e4f15d330282eb57a0e58860d49e24656a90bb7fe0360fdeecb0a0f0d411e9c21da16f0ceadace0523d994398d64e9dc60aaf3734c4d0aab3b8ae73f  musl-nscd.initd"
+sha512sums="
+f067b1491c6c46c3070aa2f61328b874eb6ad390c2efc928e2fee591ef5997b40400e29495546a861e803460efa46024c7a01c53ddae5b763ef63c2f274fceea  musl-nscd-1.1.1.tar.gz
+6cf6c030545156de9137520de0c5b80802e5b478cf334aa33d20d00735f897af6ae1c9fca2cc2bd84b1f0bc25d05e6e8b520637f4e25dc12ba355ae0b180ab73  musl-nscd.initd
+"
diff --git a/main/musl-nscd/musl-nscd.initd b/main/musl-nscd/musl-nscd.initd
index d917cbc062d..215ee06ac23 100644
--- a/main/musl-nscd/musl-nscd.initd
+++ b/main/musl-nscd/musl-nscd.initd
@@ -2,8 +2,9 @@
 
 name="$SVCNAME"
 command="/usr/sbin/nscd"
-command_args="${NSCD_OPTS:--d -p /var/run/$SVCNAME.pid}"
-pidfile="/var/run/$SVCNAME.pid"
+command_args="$NSCD_OPTS"
+pidfile="/run/$SVCNAME.pid"
+command_background=true
 
 start_pre() {
         mkdir -p /var/run/nscd
diff --git a/main/musl-nscd/musl-nscd.post-deinstall b/main/musl-nscd/musl-nscd.post-deinstall
deleted file mode 100644
index d8c88a7d549..00000000000
--- a/main/musl-nscd/musl-nscd.post-deinstall
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# This user is only present on the system to run nscd and does not
-# itself own any files.  Great care must be taken to never delete a
-# user or group that actively controls system resources.
-deluser nscd 2>/dev/null
-delgroup nscd 2>/dev/null
-
-exit 0
diff --git a/main/musl-nscd/musl-nscd.pre-install b/main/musl-nscd/musl-nscd.pre-install
index 45e214e5ad6..351c086c8a4 100644
--- a/main/musl-nscd/musl-nscd.pre-install
+++ b/main/musl-nscd/musl-nscd.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S nscd 2>/dev/null
-adduser -S -D -H -s /bin/false -G nscd -g nscd nscd 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G nscd -g nscd nscd 2>/dev/null
 
 exit 0
diff --git a/main/musl-obstack/APKBUILD b/main/musl-obstack/APKBUILD
index 3773e6ff85e..ecd4b767b5f 100644
--- a/main/musl-obstack/APKBUILD
+++ b/main/musl-obstack/APKBUILD
@@ -1,14 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=musl-obstack
-pkgver=1.1
-pkgrel=1
-pkgdesc="A standalone library to implement GNU libc's obstack"
-url="https://github.com/pullmoll/musl-obstack"
+pkgver=1.2.3
+pkgrel=2
+pkgdesc="Standalone library to implement GNU libc's obstack"
+url="https://github.com/void-linux/musl-obstack"
 arch="all"
 license="GPL-2.0-or-later"
+options="!check" # no test suite
 makedepends="automake autoconf libtool"
 subpackages="$pkgname-dev"
-source="musl-obstack-$pkgver.tar.gz::https://github.com/pullmoll/musl-obstack/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/void-linux/musl-obstack/archive/v$pkgver.tar.gz"
 
 prepare() {
 	default_prepare
@@ -24,4 +25,6 @@ package() {
 	make install DESTDIR="$pkgdir"
 }
 
-sha512sums="e3a9956133d72a00663cf8d9720e62002142e113e7d67e2338a2bce1bdfac9eefd4290db8add15eabafdf01065f7fe9bb6754faa36b88df819c53d44fa140757  musl-obstack-1.1.tar.gz"
+sha512sums="
+b2bbed19c4ab2714ca794bdcb1a84fad1af964e884d4f3bbe91c9937ca089d92b8472cb05ebe998a9f5c85cb922b9b458db91eff29077bd099942e1ce18e16cc  musl-obstack-1.2.3.tar.gz
+"
diff --git a/main/musl/0001-add-thumb2-support-to-arm-assembler-memcpy.patch b/main/musl/0001-add-thumb2-support-to-arm-assembler-memcpy.patch
deleted file mode 100644
index 08f73d937ed..00000000000
--- a/main/musl/0001-add-thumb2-support-to-arm-assembler-memcpy.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 91e662d1d941215eb024787db5e910dbfb5b169f Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <armccurdy@gmail.com>
-Date: Fri, 13 Sep 2019 11:44:31 -0700
-Subject: [PATCH] add thumb2 support to arm assembler memcpy
-
-For Thumb2 compatibility, replace two instances of a single
-instruction "orr with a variable shift" with the two instruction
-equivalent. Neither of the replacements are in a performance critical
-loop.
----
- src/string/arm/memcpy.c    |  2 +-
- src/string/arm/memcpy_le.S | 13 ++++++++-----
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/src/string/arm/memcpy.c b/src/string/arm/memcpy.c
-index f703c9bd..041614f4 100644
---- a/src/string/arm/memcpy.c
-+++ b/src/string/arm/memcpy.c
-@@ -1,3 +1,3 @@
--#if __ARMEB__ || __thumb__
-+#if __ARMEB__
- #include "../memcpy.c"
- #endif
-diff --git a/src/string/arm/memcpy_le.S b/src/string/arm/memcpy_le.S
-index 9cfbcb2a..7b35d305 100644
---- a/src/string/arm/memcpy_le.S
-+++ b/src/string/arm/memcpy_le.S
-@@ -1,4 +1,4 @@
--#if !__ARMEB__ && !__thumb__
-+#if !__ARMEB__
- 
- /*
-  * Copyright (C) 2008 The Android Open Source Project
-@@ -40,8 +40,9 @@
-  * This file has been modified from the original for use in musl libc.
-  * The main changes are: addition of .type memcpy,%function to make the
-  * code safely callable from thumb mode, adjusting the return
-- * instructions to be compatible with pre-thumb ARM cpus, and removal
-- * of prefetch code that is not compatible with older cpus.
-+ * instructions to be compatible with pre-thumb ARM cpus, removal of
-+ * prefetch code that is not compatible with older cpus and support for
-+ * building as thumb 2.
-  */
- 
- .syntax unified
-@@ -241,7 +242,8 @@ non_congruent:
- 	beq     2f
- 	ldr     r5, [r1], #4
- 	sub     r2, r2, #4
--	orr     r4, r3, r5,             lsl lr
-+	mov     r4, r5,                 lsl lr
-+	orr     r4, r4, r3
- 	mov     r3, r5,                 lsr r12
- 	str     r4, [r0], #4
- 	cmp     r2, #4
-@@ -348,7 +350,8 @@ less_than_thirtytwo:
- 
- 1:      ldr     r5, [r1], #4
- 	sub     r2, r2, #4
--	orr     r4, r3, r5,             lsl lr
-+	mov     r4, r5,                 lsl lr
-+	orr     r4, r4, r3
- 	mov     r3,     r5,                     lsr r12
- 	str     r4, [r0], #4
- 	cmp     r2, #4
--- 
-2.24.1
-
diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD
index 1f8b4555c3b..5f40cc7da30 100644
--- a/main/musl/APKBUILD
+++ b/main/musl/APKBUILD
@@ -1,16 +1,18 @@
-# Contributor:
-# Maintainer: Timo Teräs <timo.teras@iki.fi>
+# Contributor: Ariadne Conill <ariadne@dereferenced.org>
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=musl
-pkgver=1.1.24
-pkgrel=5
+pkgver=1.2.5
+pkgrel=0
 pkgdesc="the musl c library (libc) implementation"
 url="https://musl.libc.org/"
 arch="all"
 license="MIT"
-subpackages="$pkgname-libintl:libintl:noarch
-	$pkgname-dev
+options="lib64 !check"
+subpackages="
 	$pkgname-dbg
-	libc6-compat:compat:noarch
+	$pkgname-libintl:libintl:noarch
+	$pkgname-dev
 	"
 case "$BOOTSTRAP" in
 nocc)	pkgname="musl-dev"; subpackages="";;
@@ -19,17 +21,6 @@ nolibc) ;;
 esac
 source="https://musl.libc.org/releases/musl-$pkgver.tar.gz
 	handle-aux-at_base.patch
-	0001-add-thumb2-support-to-arm-assembler-memcpy.patch
-	fix-wcwidth-wrongly-returning-0-for-most-of-planes-4.patch
-	add-missing-case-mapping-between-U-03F3-and-U-037F.patch
-	fix-cacosh-results-for-arguments-with-negative-imagi.patch
-	fix-incorrect-results-for-catanf-and-catanl-with-som.patch
-	fix-return-value-of-ungetc-when-argument-is-outside-.patch
-	fix-errno-for-posix_openpt-with-no-free-ptys-availab.patch
-	improve-strerror-speed.patch
-	ppc-pt_regs.patch
-	ppc64-fpregset_t.patch
-	fix-remaining-direct-use-of-stat-syscalls-outside.patch
 
 	ldconfig
 	__stack_chk_fail_local.c
@@ -37,34 +28,48 @@ source="https://musl.libc.org/releases/musl-$pkgver.tar.gz
 	getent.c
 	iconv.c
 	"
+# this is needed for BOOTSTRAP=nocc (see above)
+builddir="$srcdir/musl-$pkgver"
 
 # secfixes:
+#   1.2.2_pre2-r0:
+#     - CVE-2020-28928
 #   1.1.23-r2:
 #     - CVE-2019-14697
 #   1.1.15-r4:
 #     - CVE-2016-8859
 
-builddir="$srcdir"/musl-$pkgver
+prepare() {
+	default_prepare
 
-build() {
-	cd "$builddir"
+	echo "$pkgver" > VERSION
+}
 
+build() {
 	[ "$BOOTSTRAP" = "nocc" ] && return 0
 
 	# provide minimal libssp_nonshared.a so we don't need libssp from gcc
-	${CROSS_COMPILE}gcc $CPPFLAGS $CFLAGS -c "$srcdir"/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+	${CROSS_COMPILE}cc $CFLAGS -c "$srcdir"/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
 	${CROSS_COMPILE}ar r libssp_nonshared.a __stack_chk_fail_local.o
 
 	if [ "$BOOTSTRAP" != "nolibc" ]; then
 		# getconf/getent/iconv
 		local i
 		for i in getconf getent iconv ; do
-			${CROSS_COMPILE}gcc $CPPFLAGS $CFLAGS "$srcdir"/$i.c -o $i
+			${CROSS_COMPILE}cc $CPPFLAGS $CFLAGS "$srcdir"/$i.c -o $i
 		done
 	fi
 
+	# musl sets a sane default for flags that they tune based on -O2 with alignment things turned off.
+	# see https://git.musl-libc.org/cgit/musl/commit/?id=b90841e2583237a4132bbbd74752e0e9563660cd ,
+	# and the discussion in https://www.openwall.com/lists/musl/2023/05/22/2
+	# this makes libc.so about 5% bigger in itself, but should yield an overall improved libc.so for general use.
+	# NB: if musl detects an -O it skips its own, so remove just the O value
+	export CFLAGS="${CFLAGS/-O* /}"
+
 	# note: not autotools
-	LDFLAGS="$LDFLAGS -Wl,-soname,libc.musl-${CARCH}.so.1" \
+	# shellcheck disable=2153
+	LDFLAGS="$LDFLAGS -Wl,-soname,libc.musl-$CARCH.so.1" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -72,13 +77,12 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--localstatedir=/var
+		--localstatedir=/var \
+		--enable-debug
 	make
 }
 
 package() {
-	cd "$builddir"
-
 	case "$CARCH" in
 	aarch64*)	ARCH="aarch64" ;;
 	arm*)		ARCH="arm" ;;
@@ -89,6 +93,8 @@ package() {
 	s390*)		ARCH="s390x" ;;
 	mips64*)	ARCH="mips64" ;;
 	mips*)		ARCH="mips" ;;
+	riscv64)	ARCH="riscv64" ;;
+	loongarch64)	ARCH="loongarch64" ;;
 	esac
 
 	if [ "$BOOTSTRAP" = "nocc" ]; then
@@ -99,9 +105,10 @@ package() {
 		cp libssp_nonshared.a "$pkgdir"/usr/lib
 
 		# make LDSO the be the real file, and libc the symlink
-		local LDSO=$(make -f Makefile --eval "$(echo -e 'print-ldso:\n\t@echo $$(basename $(LDSO_PATHNAME))')" print-ldso)
+		local rule="$(printf "%s\n\t%s\n" 'print-ldso:' '@echo $$(basename $(LDSO_PATHNAME))')"
+		local LDSO=$(make -f Makefile --eval "$rule" print-ldso)
 		mv -f "$pkgdir"/usr/lib/libc.so "$pkgdir"/lib/"$LDSO"
-		ln -sf "$LDSO" "$pkgdir"/lib/libc.musl-${CARCH}.so.1
+		ln -sf "$LDSO" "$pkgdir"/lib/libc.musl-$CARCH.so.1
 		ln -sf ../../lib/"$LDSO" "$pkgdir"/usr/lib/libc.so
 		mkdir -p "$pkgdir"/usr/bin
 
@@ -117,7 +124,10 @@ package() {
 utils() {
 	depends="scanelf"
 	replaces="libiconv"
-	license="MIT BSD GPL2+"
+	license="MIT AND BSD-2-Clause AND GPL-2.0-or-later"
+
+	# for backwards compatibility
+	provides="libc-utils=$pkgver-r$pkgrel"
 
 	mkdir -p "$subpkgdir"/usr "$subpkgdir"/sbin
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
@@ -141,50 +151,19 @@ libintl() {
 		"$subpkgdir"/usr/include/
 }
 
-compat() {
-	pkgdesc="compatibility libraries for glibc"
-
-	mkdir -p "$subpkgdir"/lib
-	# definitive source is https://sourceware.org/glibc/wiki/ABIList
-	case "$CARCH" in
-	aarch64)	_ld="lib/ld-linux-aarch64.so.1" ;;
-	armel)		_ld="lib/ld-linux.so.3" ;;
-	armhf)		_ld="lib/ld-linux-armhf.so.3" ;;
-	armv7)		_ld="lib/ld-linux-armhf.so.3" ;;
-	mips)		_ld="lib/ld.so.1" ;;
-	mips64)		_ld="lib64/ld.so.1" ;;
-	mipsel)		_ld="lib/ld.so.1" ;;
-	mips64el)	_ld="lib64/ld.so.1" ;;
-	ppc)		_ld="lib/ld.so.1" ;;
-	ppc64)		_ld="lib64/ld64.so.1" ;;
-	ppc64le)	_ld="lib64/ld64.so.2" ;;
-	s390x)		_ld="lib/ld64.so.1" ;;
-	x86)		_ld="lib/ld-linux.so.2" ;;
-	x86_64)		_ld="lib64/ld-linux-x86-64.so.2";;
-	esac
-	mkdir -p "$subpkgdir/${_ld%/*}"
-	ln -sf "/lib/libc.musl-${CARCH}.so.1" "$subpkgdir/$_ld"
+dev() {
+	default_dev
 
-	for i in libc.so.6 libcrypt.so.1 libm.so.6 libpthread.so.0 librt.so.1 libutil.so.1; do
-		ln -sf "/lib/libc.musl-${CARCH}.so.1" "$subpkgdir/lib/$i"
-	done
+	# for backwards compatibility
+	provides="libc-dev=$pkgver-r$pkgrel"
 }
 
-sha512sums="8987f1e194ea616f34f4f21fe9def28fb7f81d7060e38619206c6349f79db3bbb76bae8b711f5f9b8ed038799c9aea1a4cbec69e0bc4131e246203e133149e77  musl-1.1.24.tar.gz
-6a7ff16d95b5d1be77e0a0fbb245491817db192176496a57b22ab037637d97a185ea0b0d19da687da66c2a2f5578e4343d230f399d49fe377d8f008410974238  handle-aux-at_base.patch
-2b26c20112e3984a2501bc6c2f5162c6e60d4a521d9367dc7721ec66c974986e9f98a67e9f4f4c1510e82a0ac47de783317ab254786837c2e86a54122efcc1dd  0001-add-thumb2-support-to-arm-assembler-memcpy.patch
-7a9d7f16461d1e7906764cc5366af057d9402556d7bb1d022016faa8a250947c0d901f84cf02200ebc2e153d572104529097fb6f3a65f67695912d0ea40eb2d4  fix-wcwidth-wrongly-returning-0-for-most-of-planes-4.patch
-402b663b5ff77bdde6f5ea9ccec60a16971e5e7881c29259273a167b5b4d9f81734751b7375e5cb856c1e3db86fc46ee2084a244a74ed3bd47a8f97b37e40fd9  add-missing-case-mapping-between-U-03F3-and-U-037F.patch
-40c369ca393970461f19371542fa5881d0745abaaf99d1f71a3093605a306ccbc1dc120c41a8cea1542be79a82918807749ede786f836406f6c1b3dc4ec2de32  fix-cacosh-results-for-arguments-with-negative-imagi.patch
-41934951bbc16f155d40824abf30d818b4c124f668f74f5a13674b5251650bb9d9bf9fde0b75462bb2a4b80dc00871ba122960fa027998e71970d533df1cb987  fix-incorrect-results-for-catanf-and-catanl-with-som.patch
-81bddb171fc2171a7aa86e74bf674e3a99508d27416dfc1cfcf2824f17b33ee7dda7c5968a8a69a542fdd6eecded5b8e3973e81079d9a061aa80142d08fc1a90  fix-return-value-of-ungetc-when-argument-is-outside-.patch
-144b4525483cbc97f0414955b7e5ce42c9ff69580e5be714b56330da30b0687911bd6019aef3c8611bd0a5bd7671d690b66b4920ae47cf3442a1c982ed000e22  fix-errno-for-posix_openpt-with-no-free-ptys-availab.patch
-4875efd7249613f696b4c470fb0aedf9968f1260cf35ef640666897d9ef2f3032588ac4c37659928ed45c1c010848ec2b19414ba5406f3bd7d745288b8b105d4  improve-strerror-speed.patch
-e7133ce2f0b172e2da03567e41f03bef58b6ff8eaac614494751228bcc102c39cbe312f0beb567c5f1c47c76feeff1e8d3b16284842c599029add4ad6d1d70ec  ppc-pt_regs.patch
-3de8e50519e33a55d2cc737b56011a7178d1c83230477d46e11e67195e08e74bff735c6013de6ff170bb2390e89bfca9919cc8728c064b3eeaab2035dd7e5c08  ppc64-fpregset_t.patch
-d277e45af78ed2bd9f556ae30636783fc401b4d0a339d6e37b77f18ed1486f48fc631e3455f8764ddbc7d9aba41a270ab345ec3495955dfd22b27a306441ba2a  fix-remaining-direct-use-of-stat-syscalls-outside.patch
+sha512sums="
+7bb7f7833923cd69c7a1a9b8a5f1784bfd5289663eb6061dcd43d583e45987df8a68a1be05d75cc1c88a3f5b610653d1a70f4a9cff4d8f7fd41ae73ee058c17c  musl-1.2.5.tar.gz
+a76f79b801497ad994746cf82bb6eaf86f9e1ae646e6819fbae8532a7f4eee53a96ac1d4e789ec8f66aea2a68027b0597f7a579b3369e01258da8accfce41370  handle-aux-at_base.patch
 8d3a2d5315fc56fee7da9abb8b89bb38c6046c33d154c10d168fb35bfde6b0cf9f13042a3bceee34daf091bc409d699223735dcf19f382eeee1f6be34154f26f  ldconfig
 062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b  __stack_chk_fail_local.c
 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d  getconf.c
-378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413  getent.c
-9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf  iconv.c"
+7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee  getent.c
+9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf  iconv.c
+"
diff --git a/main/musl/add-missing-case-mapping-between-U-03F3-and-U-037F.patch b/main/musl/add-missing-case-mapping-between-U-03F3-and-U-037F.patch
deleted file mode 100644
index 6b06c15b2fb..00000000000
--- a/main/musl/add-missing-case-mapping-between-U-03F3-and-U-037F.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e8aba58ab19a18f83d7f78e80d5e4f51e7e4e8a9 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 25 Oct 2019 12:20:22 -0400
-Subject: [PATCH] add missing case mapping between U+03F3 and U+037F
-
-somehow this seems to have been overlooked. add it now so that
-subsequent overhaul of case mapping implementation will not introduce
-a functional change at the same time.
----
- src/ctype/towctrans.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ctype/towctrans.c b/src/ctype/towctrans.c
-index 8f681018..9b91b2de 100644
---- a/src/ctype/towctrans.c
-+++ b/src/ctype/towctrans.c
-@@ -176,6 +176,7 @@ static const unsigned short pairs[][2] = {
- 	{ 0x243, 0x180 },
- 	{ 0x244, 0x289 },
- 	{ 0x245, 0x28c },
-+	{ 0x37f, 0x3f3 },
- 	{ 0x3f4, 0x3b8 },
- 	{ 0x3f9, 0x3f2 },
- 	{ 0x3fd, 0x37b },
--- 
-2.24.1
-
diff --git a/main/musl/fix-cacosh-results-for-arguments-with-negative-imagi.patch b/main/musl/fix-cacosh-results-for-arguments-with-negative-imagi.patch
deleted file mode 100644
index b9f812d0ccd..00000000000
--- a/main/musl/fix-cacosh-results-for-arguments-with-negative-imagi.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From aa2d23e57c9c95f0ffeb80cb035e5a5be52d8ef0 Mon Sep 17 00:00:00 2001
-From: Michael Morrell <mmorrell@tachyum.com>
-Date: Mon, 14 Oct 2019 09:07:31 -0400
-Subject: [PATCH] fix cacosh results for arguments with negative imaginary part
-
----
- src/complex/cacosh.c  | 5 ++++-
- src/complex/cacoshf.c | 5 ++++-
- src/complex/cacoshl.c | 5 ++++-
- 3 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/complex/cacosh.c b/src/complex/cacosh.c
-index 8e42f1ae..76127f75 100644
---- a/src/complex/cacosh.c
-+++ b/src/complex/cacosh.c
-@@ -4,6 +4,9 @@
- 
- double complex cacosh(double complex z)
- {
-+	int zineg = signbit(cimag(z));
-+
- 	z = cacos(z);
--	return CMPLX(-cimag(z), creal(z));
-+	if (zineg) return CMPLX(cimag(z), -creal(z));
-+	else       return CMPLX(-cimag(z), creal(z));
- }
-diff --git a/src/complex/cacoshf.c b/src/complex/cacoshf.c
-index d7e6b545..8bd80581 100644
---- a/src/complex/cacoshf.c
-+++ b/src/complex/cacoshf.c
-@@ -2,6 +2,9 @@
- 
- float complex cacoshf(float complex z)
- {
-+	int zineg = signbit(cimagf(z));
-+
- 	z = cacosf(z);
--	return CMPLXF(-cimagf(z), crealf(z));
-+	if (zineg) return CMPLXF(cimagf(z), -crealf(z));
-+	else       return CMPLXF(-cimagf(z), crealf(z));
- }
-diff --git a/src/complex/cacoshl.c b/src/complex/cacoshl.c
-index d3eaee20..3a284be9 100644
---- a/src/complex/cacoshl.c
-+++ b/src/complex/cacoshl.c
-@@ -8,7 +8,10 @@ long double complex cacoshl(long double complex z)
- #else
- long double complex cacoshl(long double complex z)
- {
-+	int zineg = signbit(cimagl(z));
-+
- 	z = cacosl(z);
--	return CMPLXL(-cimagl(z), creall(z));
-+	if (zineg) return CMPLXL(cimagl(z), -creall(z));
-+	else       return CMPLXL(-cimagl(z), creall(z));
- }
- #endif
--- 
-2.24.1
-
diff --git a/main/musl/fix-errno-for-posix_openpt-with-no-free-ptys-availab.patch b/main/musl/fix-errno-for-posix_openpt-with-no-free-ptys-availab.patch
deleted file mode 100644
index a7afdd3dbd3..00000000000
--- a/main/musl/fix-errno-for-posix_openpt-with-no-free-ptys-availab.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4fd0f2056082441a4503f6bfcb787a7c15754518 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Tue, 22 Oct 2019 10:22:22 -0400
-Subject: [PATCH] fix errno for posix_openpt with no free ptys available
-
-linux fails the open with ENOSPC, but POSIX mandates EAGAIN.
----
- src/misc/pty.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/misc/pty.c b/src/misc/pty.c
-index b9cb5eaa..a0577147 100644
---- a/src/misc/pty.c
-+++ b/src/misc/pty.c
-@@ -7,7 +7,9 @@
- 
- int posix_openpt(int flags)
- {
--	return open("/dev/ptmx", flags);
-+	int r = open("/dev/ptmx", flags);
-+	if (r < 0 && errno == ENOSPC) errno = EAGAIN;
-+	return r;
- }
- 
- int grantpt(int fd)
--- 
-2.24.1
-
diff --git a/main/musl/fix-incorrect-results-for-catanf-and-catanl-with-som.patch b/main/musl/fix-incorrect-results-for-catanf-and-catanl-with-som.patch
deleted file mode 100644
index 4aa3487bb2b..00000000000
--- a/main/musl/fix-incorrect-results-for-catanf-and-catanl-with-som.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 11020620813b828917bc31b4636d8a142f7a564a Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Wed, 5 Feb 2020 09:40:11 -0500
-Subject: [PATCH] fix incorrect results for catanf and catanl with some inputs
-
-catan was fixed in 10e4bd3780050e75b72aac5d85c31816419bb17d but the
-same bug in catanf and catanl was overlooked. the patch is completely
-analogous.
----
- src/complex/catanf.c | 14 +-------------
- src/complex/catanl.c | 14 +-------------
- 2 files changed, 2 insertions(+), 26 deletions(-)
-
-diff --git a/src/complex/catanf.c b/src/complex/catanf.c
-index e10d9c09..ef3907a5 100644
---- a/src/complex/catanf.c
-+++ b/src/complex/catanf.c
-@@ -87,29 +87,17 @@ float complex catanf(float complex z)
- 	x = crealf(z);
- 	y = cimagf(z);
- 
--	if ((x == 0.0f) && (y > 1.0f))
--		goto ovrf;
--
- 	x2 = x * x;
- 	a = 1.0f - x2 - (y * y);
--	if (a == 0.0f)
--		goto ovrf;
- 
- 	t = 0.5f * atan2f(2.0f * x, a);
- 	w = _redupif(t);
- 
- 	t = y - 1.0f;
- 	a = x2 + (t * t);
--	if (a == 0.0f)
--		goto ovrf;
- 
- 	t = y + 1.0f;
- 	a = (x2 + (t * t))/a;
--	w = w + (0.25f * logf (a)) * I;
--	return w;
--
--ovrf:
--	// FIXME
--	w = MAXNUMF + MAXNUMF * I;
-+	w = CMPLXF(w, 0.25f * logf(a));
- 	return w;
- }
-diff --git a/src/complex/catanl.c b/src/complex/catanl.c
-index a9fc02db..e62526c0 100644
---- a/src/complex/catanl.c
-+++ b/src/complex/catanl.c
-@@ -97,30 +97,18 @@ long double complex catanl(long double complex z)
- 	x = creall(z);
- 	y = cimagl(z);
- 
--	if ((x == 0.0L) && (y > 1.0L))
--		goto ovrf;
--
- 	x2 = x * x;
- 	a = 1.0L - x2 - (y * y);
--	if (a == 0.0L)
--		goto ovrf;
- 
- 	t = atan2l(2.0L * x, a) * 0.5L;
- 	w = redupil(t);
- 
- 	t = y - 1.0L;
- 	a = x2 + (t * t);
--	if (a == 0.0L)
--		goto ovrf;
- 
- 	t = y + 1.0L;
- 	a = (x2 + (t * t)) / a;
--	w = w + (0.25L * logl(a)) * I;
--	return w;
--
--ovrf:
--	// FIXME
--	w = LDBL_MAX + LDBL_MAX * I;
-+	w = CMPLXF(w, 0.25L * logl(a));
- 	return w;
- }
- #endif
--- 
-2.24.1
-
diff --git a/main/musl/fix-remaining-direct-use-of-stat-syscalls-outside.patch b/main/musl/fix-remaining-direct-use-of-stat-syscalls-outside.patch
deleted file mode 100644
index 12c68fd015b..00000000000
--- a/main/musl/fix-remaining-direct-use-of-stat-syscalls-outside.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From c9ebff4736128186121424364c1c62224b02aee3 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Wed, 12 Feb 2020 17:23:29 -0500
-Subject: fix remaining direct use of stat syscalls outside fstatat.c
-
-because struct stat is no longer assumed to correspond to the
-structure used by the stat-family syscalls, it's not valid to make any
-of these syscalls directly using a buffer of type struct stat.
-
-commit 9493892021eac4edf1776d945bcdd3f7a96f6978 moved all logic around
-this change for stat-family functions into fstatat.c, making the
-others wrappers for it. but a few other direct uses of the syscall
-were overlooked. the ones in tmpnam/tempnam are harmless since the
-syscalls are just used to test for file existence. however, the uses
-in fchmodat and __map_file depend on getting accurate file properties,
-and these functions may actually have been broken one or more mips
-variants due to removal of conversion hacks from syscall_arch.h.
-
-as a low-risk fix, simply use struct kstat in place of struct stat in
-the affected places.
----
- src/stat/fchmodat.c   | 3 ++-
- src/stdio/tempnam.c   | 5 +++--
- src/stdio/tmpnam.c    | 5 +++--
- src/time/__map_file.c | 3 ++-
- 4 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/src/stat/fchmodat.c b/src/stat/fchmodat.c
-index be61bdf3..4ee00b0a 100644
---- a/src/stat/fchmodat.c
-+++ b/src/stat/fchmodat.c
-@@ -2,6 +2,7 @@
- #include <fcntl.h>
- #include <errno.h>
- #include "syscall.h"
-+#include "kstat.h"
- 
- int fchmodat(int fd, const char *path, mode_t mode, int flag)
- {
-@@ -10,7 +11,7 @@ int fchmodat(int fd, const char *path, mode_t mode, int flag)
- 	if (flag != AT_SYMLINK_NOFOLLOW)
- 		return __syscall_ret(-EINVAL);
- 
--	struct stat st;
-+	struct kstat st;
- 	int ret, fd2;
- 	char proc[15+3*sizeof(int)];
- 
-diff --git a/src/stdio/tempnam.c b/src/stdio/tempnam.c
-index 84f91978..565df6b6 100644
---- a/src/stdio/tempnam.c
-+++ b/src/stdio/tempnam.c
-@@ -6,6 +6,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include "syscall.h"
-+#include "kstat.h"
- 
- #define MAXTRIES 100
- 
-@@ -37,10 +38,10 @@ char *tempnam(const char *dir, const char *pfx)
- 	for (try=0; try<MAXTRIES; try++) {
- 		__randname(s+l-6);
- #ifdef SYS_lstat
--		r = __syscall(SYS_lstat, s, &(struct stat){0});
-+		r = __syscall(SYS_lstat, s, &(struct kstat){0});
- #else
- 		r = __syscall(SYS_fstatat, AT_FDCWD, s,
--			&(struct stat){0}, AT_SYMLINK_NOFOLLOW);
-+			&(struct kstat){0}, AT_SYMLINK_NOFOLLOW);
- #endif
- 		if (r == -ENOENT) return strdup(s);
- 	}
-diff --git a/src/stdio/tmpnam.c b/src/stdio/tmpnam.c
-index 6c7c253a..d667a836 100644
---- a/src/stdio/tmpnam.c
-+++ b/src/stdio/tmpnam.c
-@@ -5,6 +5,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include "syscall.h"
-+#include "kstat.h"
- 
- #define MAXTRIES 100
- 
-@@ -17,10 +18,10 @@ char *tmpnam(char *buf)
- 	for (try=0; try<MAXTRIES; try++) {
- 		__randname(s+12);
- #ifdef SYS_lstat
--		r = __syscall(SYS_lstat, s, &(struct stat){0});
-+		r = __syscall(SYS_lstat, s, &(struct kstat){0});
- #else
- 		r = __syscall(SYS_fstatat, AT_FDCWD, s,
--			&(struct stat){0}, AT_SYMLINK_NOFOLLOW);
-+			&(struct kstat){0}, AT_SYMLINK_NOFOLLOW);
- #endif
- 		if (r == -ENOENT) return strcpy(buf ? buf : internal, s);
- 	}
-diff --git a/src/time/__map_file.c b/src/time/__map_file.c
-index 9d376222..d3cefa82 100644
---- a/src/time/__map_file.c
-+++ b/src/time/__map_file.c
-@@ -2,10 +2,11 @@
- #include <fcntl.h>
- #include <sys/stat.h>
- #include "syscall.h"
-+#include "kstat.h"
- 
- const char unsigned *__map_file(const char *pathname, size_t *size)
- {
--	struct stat st;
-+	struct kstat st;
- 	const unsigned char *map = MAP_FAILED;
- 	int fd = sys_open(pathname, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
- 	if (fd < 0) return 0;
--- 
-cgit v1.2.1
-
diff --git a/main/musl/fix-return-value-of-ungetc-when-argument-is-outside-.patch b/main/musl/fix-return-value-of-ungetc-when-argument-is-outside-.patch
deleted file mode 100644
index b03b1861dee..00000000000
--- a/main/musl/fix-return-value-of-ungetc-when-argument-is-outside-.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f6ecd0c296181bf6a2a7f54e3406c846500e8e63 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Fri, 18 Oct 2019 21:11:44 -0400
-Subject: [PATCH] fix return value of ungetc when argument is outside unsigned
- char range
-
-aside from the special value EOF, ungetc is specified to accept and
-convert values outside the range of unsigned char. conversion takes
-place automatically as part of assignment when storing into the
-buffer, but the return value is also required to be the resulting
-converted value, and this requirement was not satisfied.
-
-simplified from patch by Wang Jianjian.
----
- src/stdio/ungetc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/stdio/ungetc.c b/src/stdio/ungetc.c
-index 180673a4..bc629d4c 100644
---- a/src/stdio/ungetc.c
-+++ b/src/stdio/ungetc.c
-@@ -16,5 +16,5 @@ int ungetc(int c, FILE *f)
- 	f->flags &= ~F_EOF;
- 
- 	FUNLOCK(f);
--	return c;
-+	return (unsigned char)c;
- }
--- 
-2.24.1
-
diff --git a/main/musl/fix-wcwidth-wrongly-returning-0-for-most-of-planes-4.patch b/main/musl/fix-wcwidth-wrongly-returning-0-for-most-of-planes-4.patch
deleted file mode 100644
index 1290aca5db3..00000000000
--- a/main/musl/fix-wcwidth-wrongly-returning-0-for-most-of-planes-4.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 70d80609558153a996833392999c69cdb74e1119 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Wed, 1 Jan 2020 20:02:51 -0500
-Subject: [PATCH] fix wcwidth wrongly returning 0 for most of planes 4 and up
-
-commit 1b0ce9af6d2aa7b92edaf3e9c631cb635bae22bd introduced this bug
-back in 2012 and it was never noticed, presumably since the affected
-planes are essentially unused in Unicode.
----
- src/ctype/wcwidth.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ctype/wcwidth.c b/src/ctype/wcwidth.c
-index 49c40eea..36256a53 100644
---- a/src/ctype/wcwidth.c
-+++ b/src/ctype/wcwidth.c
-@@ -23,7 +23,7 @@ int wcwidth(wchar_t wc)
- 		return -1;
- 	if (wc-0x20000U < 0x20000)
- 		return 2;
--	if (wc == 0xe0001 || wc-0xe0020U < 0x5f || wc-0xe0100 < 0xef)
-+	if (wc == 0xe0001 || wc-0xe0020U < 0x5f || wc-0xe0100U < 0xef)
- 		return 0;
- 	return 1;
- }
--- 
-2.24.1
-
diff --git a/main/musl/getent.c b/main/musl/getent.c
index b10d75acc40..4a6aa6f3236 100644
--- a/main/musl/getent.c
+++ b/main/musl/getent.c
@@ -36,6 +36,7 @@
 #include <netdb.h>
 #include <pwd.h>
 #include <grp.h>
+#include <shadow.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdbool.h>
@@ -428,6 +429,29 @@ static int services(int argc, char *argv[])
 	return rv;
 }
 
+static int shadow(int argc, char *argv[])
+{
+	struct spwd	*sp;
+	int		i, rv;
+
+	rv = RV_OK;
+	if (argc == 2) {
+		while ((sp = getspent()) != NULL)
+			putspent(sp, stdout);
+	} else {
+		for (i = 2; i < argc; i++) {
+			sp = getspnam(argv[i]);
+			if (sp == NULL) {
+				rv = RV_NOTFOUND;
+				break;
+			}
+			putspent(sp, stdout);
+		}
+	}
+	endspent();
+	return rv;
+}
+
 static int shells(int argc, char *argv[])
 {
 	const char	*sh;
@@ -471,6 +495,7 @@ static struct getentdb {
 	{	"passwd",	passwd,		},
 	{	"protocols",	protocols,	},
 	{	"services",	services,	},
+	{	"shadow",	shadow,		},
 	{	"shells",	shells,		},
 
 	{	NULL,		NULL,		},
diff --git a/main/musl/handle-aux-at_base.patch b/main/musl/handle-aux-at_base.patch
index c16463824ac..7c9f2dc5fc0 100644
--- a/main/musl/handle-aux-at_base.patch
+++ b/main/musl/handle-aux-at_base.patch
@@ -1,3 +1,6 @@
+This is required to make the gcompat ELF interpreter stub work with some
+packed binaries.
+
 diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c
 index b125eb1..616c6a6 100644
 --- a/src/env/__init_tls.c
diff --git a/main/musl/improve-strerror-speed.patch b/main/musl/improve-strerror-speed.patch
deleted file mode 100644
index 013b6b80e05..00000000000
--- a/main/musl/improve-strerror-speed.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 8343334d7b9cd4338bdac80e17be079cbc675ec3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Wed, 4 Mar 2020 11:27:01 +0200
-Subject: [PATCH] improve strerror speed
-
-change the current O(n) lookup to O(1) based on the machinery
-described in "How To Write Shared Libraries" (Appendix B).
----
- src/errno/__strerror.h | 13 ++++++-------
- src/errno/strerror.c   | 41 ++++++++++++++++++++++++++---------------
- 2 files changed, 32 insertions(+), 22 deletions(-)
-
-diff --git a/src/errno/__strerror.h b/src/errno/__strerror.h
-index 2f04d400..2d992da5 100644
---- a/src/errno/__strerror.h
-+++ b/src/errno/__strerror.h
-@@ -1,8 +1,9 @@
--/* This file is sorted such that 'errors' which represent exceptional
-- * conditions under which a correct program may fail come first, followed
-- * by messages that indicate an incorrect program or system failure. The
-- * macro E() along with double-inclusion is used to ensure that ordering
-- * of the strings remains synchronized. */
-+/* The first entry is a catch-all for codes not enumerated here.
-+ * This file is included multiple times to declare and define a structure
-+ * with these messages, and then to define a lookup table translating
-+ * error codes to offsets of corresponding fields in the structure. */
-+
-+E(0,            "No error information")
- 
- E(EILSEQ,       "Illegal byte sequence")
- E(EDOM,         "Domain error")
-@@ -101,5 +102,3 @@ E(EDQUOT,       "Quota exceeded")
- E(ENOMEDIUM,    "No medium found")
- E(EMEDIUMTYPE,  "Wrong medium type")
- E(EMULTIHOP,    "Multihop attempted")
--
--E(0,            "No error information")
-diff --git a/src/errno/strerror.c b/src/errno/strerror.c
-index e3ed771a..7f926432 100644
---- a/src/errno/strerror.c
-+++ b/src/errno/strerror.c
-@@ -1,30 +1,41 @@
- #include <errno.h>
-+#include <stddef.h>
- #include <string.h>
- #include "locale_impl.h"
- 
--#define E(a,b) ((unsigned char)a),
--static const unsigned char errid[] = {
-+/* mips has one error code outside of the 8-bit range due to a
-+ * historical typo, so we just remap it. */
-+#if EDQUOT==1133
-+#define EDQUOT_ORIG 1133
-+#undef  EDQUOT
-+#define EDQUOT 109
-+#endif
-+
-+static const struct errmsgstr_t {
-+#define E(n, s) char str##n[sizeof(s)];
-+#include "__strerror.h"
-+#undef E
-+} errmsgstr = {
-+#define E(n, s) s,
- #include "__strerror.h"
-+#undef E
- };
- 
--#undef E
--#define E(a,b) b "\0"
--static const char errmsg[] =
-+static const unsigned short errmsgidx[] = {
-+#define E(n, s) [n] = offsetof(struct errmsgstr_t, str##n),
- #include "__strerror.h"
--;
-+#undef E
-+};
- 
- char *__strerror_l(int e, locale_t loc)
- {
- 	const char *s;
--	int i;
--	/* mips has one error code outside of the 8-bit range due to a
--	 * historical typo, so we just remap it. */
--	if (EDQUOT==1133) {
--		if (e==109) e=-1;
--		else if (e==EDQUOT) e=109;
--	}
--	for (i=0; errid[i] && errid[i] != e; i++);
--	for (s=errmsg; i; s++, i--) for (; *s; s++);
-+#ifdef EDQUOT_ORIG
-+	if (e==EDQUOT) e=0;
-+	else if (e==EDQUOT_ORIG) e=EDQUOT;
-+#endif
-+	if (e >= sizeof errmsgidx / sizeof *errmsgidx) e = 0;
-+	s = (char *)&errmsgstr + errmsgidx[e];
- 	return (char *)LCTRANS(s, LC_MESSAGES, loc);
- }
- 
--- 
-2.25.1
-
diff --git a/main/musl/ppc-pt_regs.patch b/main/musl/ppc-pt_regs.patch
deleted file mode 100644
index 45815321bf0..00000000000
--- a/main/musl/ppc-pt_regs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit c2518a8efb6507f1b41c3b12e03b06f8f2317a1f
-Author: Rich Felker <dalias@aerifal.cx>
-Date:   Sat Oct 19 15:53:43 2019 -0400
-
-    use struct pt_regs * rather than void * for powerpc[64] sigcontext regs
-    
-    this is to match the kernel and glibc interfaces. here, struct pt_regs
-    is an incomplete type, but that's harmless, and if it's completed by
-    inclusion of another header then members of the struct pointed to by
-    the regs member can be accessed directly without going through a cast
-    or intermediate pointer object.
-
-diff --git a/arch/powerpc/bits/signal.h b/arch/powerpc/bits/signal.h
-index 06efb11c..c1bf3caf 100644
---- a/arch/powerpc/bits/signal.h
-+++ b/arch/powerpc/bits/signal.h
-@@ -28,7 +28,7 @@ struct sigcontext {
- 	int signal;
- 	unsigned long handler;
- 	unsigned long oldmask;
--	void *regs;
-+	struct pt_regs *regs;
- };
- 
- typedef struct {
-diff --git a/arch/powerpc64/bits/signal.h b/arch/powerpc64/bits/signal.h
-index 4dec22a5..d5493b18 100644
---- a/arch/powerpc64/bits/signal.h
-+++ b/arch/powerpc64/bits/signal.h
-@@ -32,7 +32,7 @@ typedef struct sigcontext {
- 	int _pad0;
- 	unsigned long handler;
- 	unsigned long oldmask;
--	void *regs;
-+	struct pt_regs *regs;
- 	gregset_t gp_regs;
- 	fpregset_t fp_regs;
- 	vrregset_t *v_regs;
diff --git a/main/musl/ppc64-fpregset_t.patch b/main/musl/ppc64-fpregset_t.patch
deleted file mode 100644
index 12617ba0ef7..00000000000
--- a/main/musl/ppc64-fpregset_t.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit c9f48cde0a22641ce3daf54596a9ecebdab91435
-Author: Rich Felker <dalias@aerifal.cx>
-Date:   Sat Oct 19 15:39:45 2019 -0400
-
-    fix fpregset_t type on powerpc64
-    
-    the userspace ucontext API has this as an array rather than a
-    structure.
-    
-    commit 3c59a868956636bc8adafb1b168d090897692532 fixed the
-    corresponding mistake for vrregset_t, namely that the original
-    powerpc64 port used a mix of types from 32-bit powerpc and powerpc64
-    rather than matching the 64-bit types.
-
-diff --git a/arch/powerpc64/bits/signal.h b/arch/powerpc64/bits/signal.h
-index 2cc0604c..4dec22a5 100644
---- a/arch/powerpc64/bits/signal.h
-+++ b/arch/powerpc64/bits/signal.h
-@@ -9,11 +9,7 @@
- #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
- 
- typedef unsigned long greg_t, gregset_t[48];
--
--typedef struct {
--	double fpregs[32];
--	double fpscr;
--} fpregset_t;
-+typedef double fpregset_t[33];
- 
- typedef struct {
- #ifdef __GNUC__
diff --git a/main/nagios-plugins/APKBUILD b/main/nagios-plugins/APKBUILD
index aad46478413..fc01ab15284 100644
--- a/main/nagios-plugins/APKBUILD
+++ b/main/nagios-plugins/APKBUILD
@@ -3,10 +3,10 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jeff Bilyk <jbilyk@gmail.com>
 pkgname=nagios-plugins
-pkgver=2.3.2
-pkgrel=0
+pkgver=2.4.5
+pkgrel=1
 pkgdesc="Plugins for Nagios to check services on hosts"
-url="https://nagios-plugins.org"
+url="https://nagios-plugins.org/"
 arch="all"
 license="GPL-3.0-only"
 _depends_by_ssh="openssh-client"
@@ -20,17 +20,18 @@ _depends_sensors="grep lm-sensors"
 _depends_snmp="net-snmp-tools"
 makedepends="openssh-client bind-tools samba-client fping grep rpcbind
 	lm-sensors net-snmp-tools
-	file freeradius-client-dev libdbi-dev libpq linux-headers mariadb-dev
+	file freeradius-client-dev<1.1.8 libdbi-dev libpq linux-headers mariadb-dev
 	mariadb-connector-c-dev perl
-	net-snmp-dev openldap-dev opensmtpd openssl-dev postgresql-dev"
+	net-snmp-dev openldap-dev openssl-dev>3 libpq-dev"
 install="$pkgname.post-upgrade"
 pkgusers="nagios"
 pkggroups="nagios"
-options="suid"
-source="https://www.nagios-plugins.org/download/nagios-plugins-$pkgver.tar.gz
-	fix-mysql-headers.patch
+options="suid !check"
+source="https://github.com/nagios-plugins/nagios-plugins/releases/download/release-$pkgver/nagios-plugins-$pkgver.tar.gz
+	fix-compilation-warnings-about-sys-poll.patch
 	check_openrc
-	nagios-openrc.sudoers"
+	nagios-openrc.doasd
+	"
 
 _plugins_dir="/usr/lib/nagios/plugins"
 
@@ -49,14 +50,12 @@ subpackages="$subpackages
 	$pkgname-all:_all"  # all must be the last
 _plugins="$_plugins openrc tcp"
 
-
 prepare() {
-	default_prepare
+ 	default_prepare
 	update_config_sub
 }
 
 build() {
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -67,8 +66,10 @@ build() {
 		--libexecdir="/$_plugins_dir" \
 		--localstatedir=/var/nagios \
 		--with-ipv6 \
-		--with-ps-command="/bin/ps -o stat,pid,ppid,vsz,rss,comm,args" \
-		--with-ps-format="%s %d %d %d %d %s %n" \
+		--with-mailq-command=/usr/bin/mailq \
+		--with-sudo-command=/usr/bin/sudo \
+		--with-ps-command="/bin/busybox ps -o stat,pid,ppid,vsz,rss,comm,args" \
+		--with-ps-format="%s %d %d %s %s %s %n" \
 		--with-ps-varlist="procstat,&procpid,&procppid,&procvsz,&procrss,procprog,&pos" \
 		--with-ps-cols=7 \
 		--with-ping-command="/bin/ping -c %d %s" \
@@ -103,12 +104,13 @@ tcp() {
 
 _openrc() {
 	pkgdesc="Nagios plugin check_openrc"
-	depends="$pkgname openrc sudo"
+	depends="$pkgname openrc doas"
 
 	install -m 755 -D "$srcdir"/check_openrc \
 		"$subpkgdir"/$_plugins_dir/check_openrc
-	install -m 600 -D "$srcdir"/nagios-openrc.sudoers \
-		"$subpkgdir"/etc/sudoers.d/nagios-openrc
+
+	install -m 600 -D "$srcdir"/nagios-openrc.doasd \
+		"$subpkgdir"/etc/doas.d/nagios-openrc.conf
 }
 
 _plugin() {
@@ -149,7 +151,9 @@ _all() {
 	return $retval
 }
 
-sha512sums="c73e13800ad408f9b345fbfc2142ae2275b77e4865ecdb9be33a86024c10be1e54e401450c3f7c848e96bd1152c723426477a1f2874e3bf5dd149f07391b1dd9  nagios-plugins-2.3.2.tar.gz
-5db87cf63fb6d1f72122bd7c72f012aab2724328d3d71da546970792a6cdeedbe008f3feef03f7432f100836ace3701c1902b820c93a79e5fa13abe8b337da0d  fix-mysql-headers.patch
-12d87542631494df1c961e547c19107a025829509e174e8208111736141c12e20dbf490c55d487af39d47cefca5507cd98c973b7b20ae3f961dcbfd167195d8e  check_openrc
-171c9ad14d1027541b78df76063e6d34483dd536219fb83e0346e191739529d59c8d6be468af7f1c4c93b20baf9a32879510f15ec3d06aa1eefaf5d785ea8546  nagios-openrc.sudoers"
+sha512sums="
+f2575d547ddebff54ac664d2aaa287b29610c76ef6e482b3d55d5856ddbe2f2bd2d8eab3c993ecd1f1ad9bb62cf090f8e0cca3c258cb7c44055fd5e1e4288c65  nagios-plugins-2.4.5.tar.gz
+7a62e4808eb8b07ca43bc17a625f4199708da6c52b79eca7a756817cb734648fc3054cd89862638ae925022017db32479d2cfcfddeba79ab4557d7b9ec97c323  fix-compilation-warnings-about-sys-poll.patch
+27050160a71e897343da6d6fd25c322a227702caec98065f82e06cba8929c2f6c538a4563a420fb0a07419622107caba1ad44c2cad195a0c0c76a6a925ec1c4b  check_openrc
+4a4c267c8403d3a1c8630adda9ddbdf7ce421b65e6dbfc0eb3f2bf03f94df563371e78193e8b3127ba9f3edcf8f1a7f96d9312167e6f924028d16d144e8af5d2  nagios-openrc.doasd
+"
diff --git a/main/nagios-plugins/check_openrc b/main/nagios-plugins/check_openrc
index b21d6baebf7..8391b774895 100644
--- a/main/nagios-plugins/check_openrc
+++ b/main/nagios-plugins/check_openrc
@@ -1,7 +1,7 @@
 #!/bin/sh
 # vim: set ts=4:
 
-crashed=$(sudo rc-status --crashed)
+crashed=$(doas -n rc-status --crashed)
 
 if [ -n "$crashed" ]; then
 	echo "CRITICAL - crashed services: ${crashed//$'\n'/, }"
diff --git a/main/nagios-plugins/fix-compilation-warnings-about-sys-poll.patch b/main/nagios-plugins/fix-compilation-warnings-about-sys-poll.patch
new file mode 100644
index 00000000000..70b4d4680c1
--- /dev/null
+++ b/main/nagios-plugins/fix-compilation-warnings-about-sys-poll.patch
@@ -0,0 +1,16 @@
+Subject: Use correct poll.h import
+Author: Simon Frankenberger <simon-alpine@fraho.eu>
+
+This silences some compiler warnings
+
+--- old/plugins/common.h
++++ new/plugins/common.h
+@@ -120,7 +120,7 @@
+ #include <locale.h>
+ 
+ #ifdef HAVE_SYS_POLL_H
+-# include "sys/poll.h"
++# include <poll.h>
+ #endif
+ 
+ /*
diff --git a/main/nagios-plugins/fix-mysql-headers.patch b/main/nagios-plugins/fix-mysql-headers.patch
deleted file mode 100644
index 34926a73feb..00000000000
--- a/main/nagios-plugins/fix-mysql-headers.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up ./plugins/check_mysql.c.fix_mysql_f27 ./plugins/check_mysql.c
---- ./plugins/check_mysql.c.fix_mysql_f27	2017-11-20 21:19:47.597527944 -0500
-+++ ./plugins/check_mysql.c	2017-11-20 21:17:15.715921194 -0500
-@@ -41,7 +41,7 @@ const char *email = "devel@nagios-plugin
- #include "utils_base.h"
- #include "netutils.h"
- 
--#include <mysql.h>
-+#include <server/mysql.h>
- #include <mysqld_error.h>
- #include <errmsg.h>
- 
-diff -up ./plugins/check_mysql_query.c.fix_mysql_f27 ./plugins/check_mysql_query.c
---- ./plugins/check_mysql_query.c.fix_mysql_f27	2017-11-20 21:20:01.369764323 -0500
-+++ ./plugins/check_mysql_query.c	2017-11-20 21:17:20.378001200 -0500
-@@ -38,7 +38,7 @@ const char *email = "devel@nagios-plugin
- #include "utils_base.h"
- #include "netutils.h"
- 
--#include <mysql.h>
-+#include <server/mysql.h>
- #include <errmsg.h>
- 
- char *db_user = NULL;
diff --git a/main/nagios-plugins/nagios-openrc.doasd b/main/nagios-plugins/nagios-openrc.doasd
new file mode 100644
index 00000000000..1aa040e4a9a
--- /dev/null
+++ b/main/nagios-plugins/nagios-openrc.doasd
@@ -0,0 +1,4 @@
+# Rule for /usr/lib/nagios/plugins/check_openrc.
+# Installed by package nagios-plugins-openrc.
+
+permit nopass nolog nagios as root cmd /bin/rc-status
diff --git a/main/nagios-plugins/nagios-openrc.sudoers b/main/nagios-plugins/nagios-openrc.sudoers
deleted file mode 100644
index e739580cb21..00000000000
--- a/main/nagios-plugins/nagios-openrc.sudoers
+++ /dev/null
@@ -1,3 +0,0 @@
-# Rule for /usr/lib/nagios/plugins/check_openrc.
-# Installed by package nagios-plugins-openrc.
-nagios ALL=(root) NOPASSWD: /bin/rc-status
diff --git a/main/nagios/APKBUILD b/main/nagios/APKBUILD
index e31168dad9a..ef4b14d2640 100644
--- a/main/nagios/APKBUILD
+++ b/main/nagios/APKBUILD
@@ -1,32 +1,35 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Will Sinatra <wpsinatra@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=nagios
-pkgver=3.5.1
-pkgrel=6
+pkgver=4.4.13
+pkgrel=1
 pkgdesc="Popular monitoring tool"
 url="https://www.nagios.org/"
 arch="all"
-license="GPL-2.0"
+license="GPL-2.0-only"
 depends="perl"
 install="$pkgname.pre-install"
-makedepends="gd-dev perl-dev libpng-dev libjpeg perl-net-snmp"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+makedepends="gd-dev perl-dev libpng-dev libjpeg perl-net-snmp unzip openssl-dev>3"
+source="https://downloads.sourceforge.net/nagios/nagios-$pkgver.tar.gz
 	nagios.confd
 	nagios.initd
-	lighttpd-nagios.conf"
-subpackages="${pkgname}-web::noarch"
+	lighttpd-nagios.conf
+	"
+subpackages="
+	$pkgname-web::noarch
+	$pkgname-openrc
+	$pkgname-apache::noarch"
 pkgusers="nagios"
 pkggroups="nagios"
-
-_builddir="$srcdir/$pkgname"
+options="!check" #no checks
 
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
+	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -37,20 +40,18 @@ build() {
 		--datadir=/usr/share/nagios \
 		--localstatedir=/var \
 		--bindir=/usr/sbin \
-		--sbindir=/usr/lib/nagios/cgi-bin \
+		--with-cgibindir=/usr/lib/nagios/cgi-bin \
 		--datadir=/usr/share/nagios/htdocs \
 		--libexecdir=/usr/lib/nagios/plugins \
 		--localstatedir=/var/nagios \
 		--with-nagios-user=nagios \
 		--with-nagios-group=nagios \
 		--enable-embedded-perl \
-		--with-perlcache \
-		|| return 1
-	make all || return 1
+		--with-perlcache
+	make all
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	make DESTDIR="$pkgdir" install-config
 	make DESTDIR="$pkgdir" install-commandmode
@@ -59,7 +60,6 @@ package() {
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
-
 web() {
 	#depends="php lighttpd"
 	mkdir -p "$subpkgdir"/usr
@@ -67,7 +67,14 @@ web() {
 	install -m644 -D "$srcdir"/lighttpd-nagios.conf "$subpkgdir"/etc/lighttpd/nagios.conf
 }
 
-sha512sums="48e2ecb91002b08203937b12a438c87c62cd3c5c401a0ed9e861cd6d79074c7017ed373e9379f013d87dea1fd7cb8e3d85112d55c87ac91aed96b256868c112d  nagios-3.5.1.tar.gz
+apache() {
+	depends="apache2 apache2-utils"
+	install -m644 -D "$srcdir"/nagios-$pkgver/sample-config/httpd.conf "$subpkgdir"/etc/apache2/sites-available/nagios.conf
+}
+
+sha512sums="
+43808bf2f9460d2d0fcac6aea8492cf7abc18a527c671e3a8e776ee3563bb91be1f5f384cfc3943157a355596ce4e1516e3ebc54d51c30479054180b01dfe3e8  nagios-4.4.13.tar.gz
 8575902dcb7252f195847f9997b424c1ef9bee7dfacdd124c922fc119f583923c34847ce77c505783662d91f7290b1a85dc5e382ac50d177406bfb3876d4e40a  nagios.confd
 a004ed1cf8e7d9faeb849cd714095dbe5157c707618d2cce92c98c78604b896bb806b55aa69b2db8ca3e954bd629f9e3db5d2676015f87d6be5da32fa9ec5664  nagios.initd
-6f1448db1964e378dbc7460a6d321638f4d0f7a08bc078824edca12fb6653fb0200b3be365fa519e7b2ff566802701878975bb97e65d65dc54d3da34dae21588  lighttpd-nagios.conf"
+6f1448db1964e378dbc7460a6d321638f4d0f7a08bc078824edca12fb6653fb0200b3be365fa519e7b2ff566802701878975bb97e65d65dc54d3da34dae21588  lighttpd-nagios.conf
+"
diff --git a/main/nano/APKBUILD b/main/nano/APKBUILD
index bebb502422f..a1f03b6425f 100644
--- a/main/nano/APKBUILD
+++ b/main/nano/APKBUILD
@@ -1,15 +1,20 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nano
-pkgver=4.9.1
-pkgrel=0
+pkgver=7.2
+pkgrel=1
 pkgdesc="Enhanced clone of the Pico text editor"
 url="https://www.nano-editor.org"
 arch="all"
 license="GPL-3.0-or-later"
-makedepends="file-dev linux-headers ncurses-dev"
+makedepends="linux-headers ncurses-dev"
 subpackages="$pkgname-doc $pkgname-syntax::noarch"
-source="https://www.nano-editor.org/dist/v${pkgver%.*.*}/nano-$pkgver.tar.xz"
+source="https://www.nano-editor.org/dist/v${pkgver%%.*}/nano-$pkgver.tar.xz"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
 	./configure \
@@ -19,6 +24,7 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
+		--disable-libmagic \
 		--disable-nls
 	make
 }
@@ -41,10 +47,11 @@ package() {
 
 syntax() {
 	pkgdesc="Syntax highlighting definitions for $pkgname"
+	depends="$pkgname=$pkgver-r$pkgrel"
 
-	mkdir -p "$subpkgdir"/usr/share/$pkgname/
-	mv "$pkgdir"/usr/share/$pkgname/*.nanorc \
-		"$subpkgdir"/usr/share/$pkgname/
+	amove usr/share/nano/*
 }
 
-sha512sums="9e4265424f08afc614f4c6c5f994173ed9639f065b7e81808872c53264cbab582cd6071704e17c3d706d9048df07f3b0733fd688879576cffb8f9897ff4b8505  nano-4.9.1.tar.xz"
+sha512sums="
+a6dfa70edab62e439a9a998ca214f2415d57dbdc01766ad2e4b14048836557a32755f8b09de13c6a89023f215b61d2854017b389eae8d097ca6f3ba73ce2f583  nano-7.2.tar.xz
+"
diff --git a/main/nasm/APKBUILD b/main/nasm/APKBUILD
index 068ce3af809..ae308df17b4 100644
--- a/main/nasm/APKBUILD
+++ b/main/nasm/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nasm
-pkgver=2.14.02
+pkgver=2.16.02
 pkgrel=0
 pkgdesc="80x86 assembler designed for portability and modularity"
 url="https://www.nasm.us"
@@ -8,12 +8,10 @@ arch="all"
 license="BSD-2-Clause"
 checkdepends="perl"
 subpackages="$pkgname-doc"
-source="https://www.nasm.us/pub/nasm/releasebuilds/$pkgver/$pkgname-$pkgver.tar.xz"
+source="https://www.nasm.us/pub/nasm/releasebuilds/$pkgver/nasm-$pkgver.tar.xz"
 
-build () {
-	cd "$builddir"
-	export CFLAGS=
-	export CXXFLAGS=
+build() {
+	CFLAGS="$CFLAGS -O2 -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,13 +20,13 @@ build () {
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c7a228095f37321d57f2813d04f58ee66949e8f81fc49ef6c4ecd391301e308217583ce1a265d4fe8c13d54b5b9c72aeb132caa3caee36e31b6555fbfff34c81  nasm-2.14.02.tar.xz"
+sha512sums="
+9ccafb4cd9064fb21f6551309d35ba7461de8da138b1239d76c2ea0c070a1a767f1019d5d705088375d625cfb73eebbfd9dfa3588107793b95354d89dcfd22c3  nasm-2.16.02.tar.xz
+"
diff --git a/main/ncdu/APKBUILD b/main/ncdu/APKBUILD
index f51258e6ec7..92b05072723 100644
--- a/main/ncdu/APKBUILD
+++ b/main/ncdu/APKBUILD
@@ -1,15 +1,16 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=ncdu
-pkgver=1.14.2
-pkgrel=0
+pkgver=1.19
+pkgrel=1
 pkgdesc="Text-based disk usage viewer"
 url="https://dev.yorhel.nl/ncdu"
+options="!check" # no test suite
 arch="all"
 license="MIT"
-makedepends="ncurses-dev"
+makedepends="ncurses-dev linux-headers"
 subpackages="$pkgname-doc"
-source="http://dev.yorhel.nl/download/ncdu-$pkgver.tar.gz"
+source="https://dev.yorhel.nl/download/ncdu-$pkgver.tar.gz"
 
 build() {
 	./configure \
@@ -25,4 +26,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d7398448e0e13354a0be1606c3e3f6f29e2dbb742fd56f7cd9c598e974c359429966527ef8fce6a0e3afb0ea3cad9a95169b880600e44d62273b937309fa0e59  ncdu-1.14.2.tar.gz"
+sha512sums="
+2bbfe2bab101f92674e13bef5260a39b32c127a310ae59c045f3684aaa8dab6f767c0162dc8f868d8adfaa17d597d0b3d2c134fe97bbaf205da0f8272e96c5d6  ncdu-1.19.tar.gz
+"
diff --git a/main/ncftp/APKBUILD b/main/ncftp/APKBUILD
index ac5d1684f6f..85d0afa48bf 100644
--- a/main/ncftp/APKBUILD
+++ b/main/ncftp/APKBUILD
@@ -1,21 +1,19 @@
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=ncftp
 pkgver=3.2.6
-pkgrel=1
+pkgrel=6
 pkgdesc="A set of free application programs implementing FTP"
-url="http://www.ncftp.com/"
+url="https://www.ncftp.com/"
 arch="all"
 options="!check"  # No test suite.
 license="ClArtistic"
 makedepends="ncurses-dev"
-source="https://dev.alpinelinux.org/archive/ncftp/ncftp-$pkgver-src.tar.xz"
-subpackages="$pkgname-doc $pkgname-bookmarks"
-
-builddir="$srcdir/$pkgname-$pkgver"
-
-build () {
-	cd "$builddir"
+subpackages="$pkgname-doc $pkgname-bookmarks $pkgname-dev"
+source="https://dev.alpinelinux.org/archive/ncftp/ncftp-$pkgver-src.tar.xz
+	gcc-10.patch
+	"
 
+build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -31,17 +29,18 @@ build () {
 
 package() {
 	cd "$builddir"/libncftp
-	make PREFIX="${pkgdir}"/usr soinstall
+	make PREFIX="$pkgdir"/usr soinstall
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -D doc/LICENSE.txt \
 		"$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
 }
 
-bookmarks () {
+bookmarks() {
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/ncftpbookmarks \
 		"$subpkgdir"/usr/bin/
 }
 
-sha512sums="8e6091ce2ea1eb463edea322d1b5dde813475fd22096d67f0bfd2f5101ae09747ff25d38816d0b9b1077e6a5a256078361691f816aa2eefa38638aa523b4b382  ncftp-3.2.6-src.tar.xz"
+sha512sums="8e6091ce2ea1eb463edea322d1b5dde813475fd22096d67f0bfd2f5101ae09747ff25d38816d0b9b1077e6a5a256078361691f816aa2eefa38638aa523b4b382  ncftp-3.2.6-src.tar.xz
+b0225946f66d21e870216ce19ee229eaceb0b44179af9a16237e41de48bb9344f807829ab3229e96e8a4e39e914d4ac581da377d0239af96775e618372c61084  gcc-10.patch"
diff --git a/main/ncftp/gcc-10.patch b/main/ncftp/gcc-10.patch
new file mode 100644
index 00000000000..622ce6e117e
--- /dev/null
+++ b/main/ncftp/gcc-10.patch
@@ -0,0 +1,71 @@
+Upstream: Should be, taken from Gentoo
+Reason: Fixes compilation with -fno-common
+
+--- a/ncftp/bookmark.h
++++ b/ncftp/bookmark.h
+@@ -59,3 +59,5 @@
+ void DefaultBookmarkName(char *, size_t, char *);
+ void DisposeBookmarkTable(void);
+ int AddNewItemToBookmarkTable(void);
++
++extern Bookmark gBm;
+--- a/ncftp/cmds.c
++++ b/ncftp/cmds.c
+@@ -91,7 +91,6 @@
+ extern char gOS[];
+ extern int gAutoResume;
+ extern int gAutoSaveChangesToExistingBookmarks;
+-extern Bookmark gBm;
+ extern int gLoadedBm, gConfirmClose, gSavePasswords, gScreenColumns;
+ extern char gLocalCWD[512], gPrevLocalCWD[512];
+ extern int gMayCancelJmp;
+--- a/ncftp/main.c
++++ b/ncftp/main.c
+@@ -38,7 +38,6 @@
+ char gLocalCWD[512], gPrevLocalCWD[512];
+ 
+ extern char gRemoteCWD[512], gPrevRemoteCWD[512];
+-extern Bookmark gBm;
+ extern int gLoadedBm;
+ extern int gFirewallType;
+ extern char gAutoAscii[];
+--- a/sh_util/gpshare.c
++++ b/sh_util/gpshare.c
+@@ -28,7 +28,6 @@
+ 
+ static int gIsAtty1 = 1, gIsAtty2 = 1;
+ extern int gLoadedBm, gBookmarkMatchMode;
+-Bookmark gBm;
+ 
+ double
+ FileSize(double size, const char **uStr0, double *uMult0)
+--- a/sh_util/ncftpget.c
++++ b/sh_util/ncftpget.c
+@@ -40,7 +40,6 @@
+ extern char gFirewallExceptionList[256];
+ extern int gFwDataPortMode;
+ extern const char gOS[], gVersion[];
+-extern Bookmark gBm;
+ 
+ static void
+ Usage(void)
+--- a/sh_util/ncftpls.c
++++ b/sh_util/ncftpls.c
+@@ -39,7 +39,6 @@
+ extern char gFirewallExceptionList[256];
+ extern int gFwDataPortMode;
+ extern const char gOS[], gVersion[];
+-extern Bookmark gBm;
+ 
+ static int FTPRemoteRecursiveMList(FTPCIPtr cip, const char *const rdir, /* FTPFileInfoListPtr files, */ FTPLineListPtr lines);
+ 
+--- a/sh_util/ncftpput.c
++++ b/sh_util/ncftpput.c
+@@ -41,7 +41,6 @@
+ extern char gFirewallExceptionList[256];
+ extern int gFwDataPortMode;
+ extern const char gOS[], gVersion[];
+-extern Bookmark gBm;
+ extern int gSendfileInProgress;
+ 
+ static void
diff --git a/main/ncurses/APKBUILD b/main/ncurses/APKBUILD
index 88c8f0f6463..9b7f82a85ba 100644
--- a/main/ncurses/APKBUILD
+++ b/main/ncurses/APKBUILD
@@ -1,20 +1,39 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ncurses
-pkgver=6.2_p20200328
-_ver=${pkgver/_p/-}
+pkgver=6.4_p20240330
+_pkgver=${pkgver/_p/-}
 pkgrel=0
 pkgdesc="Console display library"
 url="https://invisible-island.net/ncurses/"
 arch="all"
 options="!check" # "tests" are actual demo programs, not a test suite.
-license="MIT"
+license="X11"
 makedepends_build="ncurses"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs
-	$pkgname-terminfo-base:base:noarch $pkgname-terminfo:terminfo:noarch"
-source="https://invisible-mirror.net/archives/ncurses/current/ncurses-$_ver.tgz"
-builddir="$srcdir"/ncurses-$_ver
+subpackages="
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-terminfo-base:base:noarch
+	$pkgname-terminfo:terminfo:noarch
+	$pkgname-libs:compat:noarch
+	libformw
+	libmenuw
+	libncurses++:pp
+	libncursesw
+	libpanelw
+	"
+source="https://invisible-mirror.net/archives/ncurses/current/ncurses-$_pkgver.tgz
+	cleanup-pkgconfig-ldflags.patch
+	"
+builddir="$srcdir/$pkgname-$_pkgver"
 
 # secfixes:
+#   6.4_p20230424-r0:
+#     - CVE-2023-29491
+#   6.3_p20220416-r0:
+#     - CVE-2022-29458
+#   6.2_p20200530-r0:
+#     - CVE-2021-39537
 #   6.1_p20180414-r0:
 #     - CVE-2018-10754
 #   6.0_p20171125-r0:
@@ -22,7 +41,45 @@ builddir="$srcdir"/ncurses-$_ver
 #   6.0_p20170701-r0:
 #     - CVE-2017-10684
 
+# Terminfo definitions to be included in ncurses-terminfo-base.
+_basic_terms="
+	alacritty
+	ansi
+	console
+	dumb
+	gnome
+	gnome-256color
+	konsole
+	konsole-256color
+	konsole-linux
+	linux
+	putty
+	putty-256color
+	rxvt
+	rxvt-256color
+	screen
+	screen-256color
+	st-*
+	sun
+	terminator
+	terminology*
+	tmux
+	tmux-256color
+	vt100
+	vt102
+	vt200
+	vt220
+	vt52
+	vte
+	vte-256color
+	xterm
+	xterm-256color
+	xterm-color
+	xterm-xfree86
+	"
+
 build() {
+	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,10 +87,13 @@ build() {
 		--without-ada \
 		--without-tests \
 		--disable-termcap \
+		--disable-root-access \
 		--disable-rpath-hack \
+		--disable-setuid-environ \
 		--disable-stripping \
 		--with-pkg-config-libdir=/usr/lib/pkgconfig \
-		--without-cxx-binding \
+		--with-cxx-binding \
+		--with-cxx-shared \
 		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo:/lib/terminfo:/usr/lib/terminfo" \
 		--enable-pc-files \
 		--with-shared \
@@ -44,67 +104,109 @@ build() {
 package() {
 	make -j1 DESTDIR="$pkgdir" install
 
+	cd "$pkgdir"
+
+	# force link against *w.so
+	local lib; for lib in ncurses ncurses++ form panel menu; do
+		ln -s ${lib}w.pc usr/lib/pkgconfig/$lib.pc
+		ln -s lib${lib}w.a usr/lib/lib$lib.a
+		echo "INPUT(-l${lib}w)" > usr/lib/lib$lib.so
+	done
+
+	# link curses -> ncurses
+	ln -s libncurses.a usr/lib/libcurses.a
+	ln -s libncurses.so usr/lib/libcurses.so
+	echo 'INPUT(-lncursesw)' > usr/lib/libcursesw.so
+
 	# Install basic terms in /etc/terminfo
-	for i in ansi console dumb linux rxvt screen sun vt52 vt100 vt102 \
-			vt200 vt220 xterm xterm-color xterm-xfree86 xterm-256color \
-			alacritty tmux tmux-256color terminator terminology* \
-			vte vte-256color gnome gnome-256color kitty konsole konsole-256color \
-			konsole-linux putty putty-256color rxvt-256color st-* \
-			screen-256color; do
-		local termfile=$(find "$pkgdir"/usr/share/terminfo/ -name "$i" 2>/dev/null) || true
-		local basedir=$(basename "$(dirname "$termfile")")
-
-		[ -z "$termfile" ] && continue
-
-		install -d "$pkgdir"/etc/terminfo/$basedir
-		mv $termfile "$pkgdir"/etc/terminfo/$basedir/
-		ln -s ../../../../etc/terminfo/$basedir/$i \
-			"$pkgdir"/usr/share/terminfo/$basedir/$i
+	local i; for i in $_basic_terms; do
+		local termfiles=$(find usr/share/terminfo/ -name "$i" 2>/dev/null) || true
+
+		[ -z "$termfiles" ] && continue
+
+		for termfile in $termfiles; do
+			local basedir=$(basename "$(dirname "$termfile")")
+			install -d etc/terminfo/$basedir
+			mv "$termfile" etc/terminfo/$basedir/
+			ln -s "../../../../etc/terminfo/$basedir/${termfile##*/}" \
+				"usr/share/terminfo/$basedir/${termfile##*/}"
+		done
 	done
 }
 
 dev() {
 	default_dev
-	# force link against *w.so
-	for lib in ncurses ncurses++ form panel menu; do
-		echo "INPUT(-l${lib}w)" > "$subpkgdir"/usr/lib/lib$lib.so
-		ln -s ${lib}w.pc "$subpkgdir"/usr/lib/pkgconfig/$lib.pc
-	done
-	# link curses -> ncurses
-	echo "INPUT(-lncursesw)" > "$subpkgdir"/usr/lib/libcursesw.so
-	ln -s libncurses.so "$subpkgdir"/usr/lib/libcurses.so
+
+	# also move symlinks
+	amove usr/lib/*.so
 }
 
 terminfo() {
-	depends=""
 	pkgdesc="$pkgdesc (other terminfo files)"
 	depends="$pkgname-terminfo-base=$pkgver-r$pkgrel"
+	replaces="kitty<0.25.2-r1"  # /usr/share/terminfo/x/xterm-kitty (Alpine <3.17)
 
-	mkdir -p $subpkgdir/usr/share $subpkgdir/usr/lib
-	mv $pkgdir/usr/lib/terminfo $subpkgdir/usr/lib
+	amove usr/share/terminfo
+	# also move symlink
+	amove usr/lib/terminfo
 }
 
-libs() {
-	pkgdesc="Ncurses libraries"
-	depends="$pkgname-terminfo-base=$pkgver-r$pkgrel"
+compat() {
+	pkgdesc="Ncurses libraries (old compat to pull sublibs)"
 	provides="ncurses-widec-libs=$pkgver-r$pkgrel"
+	depends="
+		libformw=$pkgver-r$pkgrel
+		libmenuw=$pkgver-r$pkgrel
+		libncursesw=$pkgver-r$pkgrel
+		libpanelw=$pkgver-r$pkgrel
+		"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir"/usr/lib
+	mkdir -p "$subpkgdir"
 }
 
-base() {
-	depends=""
-	pkgdesc="Descriptions of common terminals"
+libmenuw() {
+	pkgdesc="$pkgdesc ($subpkgname)"
+	depends="$pkgname-terminfo-base=$pkgver-r$pkgrel"
 
-	mkdir -p "$subpkgdir"/etc/terminfo
-	mv "$pkgdir"/etc/terminfo/ "$subpkgdir"/etc/
+	amove usr/lib/libmenuw.so.*
 }
 
-static() {
-	pkgdesc="Static libraries for the ncurses library"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
+libformw() {
+	pkgdesc="$pkgdesc ($subpkgname)"
+	depends="$pkgname-terminfo-base=$pkgver-r$pkgrel"
+
+	amove usr/lib/libformw.so.*
+}
+
+pp() {
+	pkgdesc="$pkgdesc ($subpkgname)"
+	depends="$pkgname-terminfo-base=$pkgver-r$pkgrel"
+
+	amove usr/lib/libncurses++w.so.*
+}
+
+libncursesw() {
+	pkgdesc="$pkgdesc ($subpkgname)"
+	depends="$pkgname-terminfo-base=$pkgver-r$pkgrel"
+
+	amove usr/lib/libncursesw.so.*
+}
+
+libpanelw() {
+	pkgdesc="$pkgdesc ($subpkgname)"
+	depends="$pkgname-terminfo-base=$pkgver-r$pkgrel"
+
+	amove usr/lib/libpanelw.so.*
+}
+
+base() {
+	pkgdesc="Descriptions of common terminals"
+	depends=""
+
+	amove etc/terminfo
 }
 
-sha512sums="5cfb2255bd0ff0ec0e357b1934f082b96b0174163516c0c26fca777b101fe2b386f6e0203b22cfa6ea8f56d91978d590b2cedff7d0f8c9486580dc7731a91185  ncurses-6.2-20200328.tgz"
+sha512sums="
+d2f293d8a65a9b21db8d5b3a68eb5acbedf485239f02bdd29d20aa3fd2bee0f1e2c1181168a7e79425a007816b7ebac78ad6a62f5bef278a30aacca8f59e4cca  ncurses-6.4-20240330.tgz
+201ef1876655101cedabc83a0ce46f75079b08f565ca8de4cf96fd69e41332a2d0597b77fe360dc58b10772586fa39bd52ac9ee670a912fef84840278356065a  cleanup-pkgconfig-ldflags.patch
+"
diff --git a/main/ncurses/cleanup-pkgconfig-ldflags.patch b/main/ncurses/cleanup-pkgconfig-ldflags.patch
new file mode 100644
index 00000000000..64f4ccfaa75
--- /dev/null
+++ b/main/ncurses/cleanup-pkgconfig-ldflags.patch
@@ -0,0 +1,26 @@
+Patch-Source: https://github.com/archlinux/svntogit-packages/blob/e458113bf9b1fce36b099cc49bc080d0ba6fc024/trunk/ncurses-6.3-pkgconfig.patch
+--
+diff -ruN a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
+--- a/misc/gen-pkgconfig.in	2021-08-07 23:36:33.000000000 +0200
++++ b/misc/gen-pkgconfig.in	2021-11-03 11:12:51.127160950 +0100
+@@ -83,7 +83,7 @@
+ fi
+ 
+ lib_flags=
+-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@
++for opt in -L$libdir @LIBS@
+ do
+ 	case $opt in
+ 	-l*) # LIBS is handled specially below
+diff -ruN a/misc/ncurses-config.in b/misc/ncurses-config.in
+--- a/misc/ncurses-config.in	2021-08-07 23:36:14.000000000 +0200
++++ b/misc/ncurses-config.in	2021-11-03 11:26:12.393533954 +0100
+@@ -101,7 +101,7 @@
+ # There is no portable way to find the list of standard library directories.
+ # Require a POSIX shell anyway, to keep this simple.
+ lib_flags=
+-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ $LIBS
++for opt in -L$libdir $LIBS
+ do
+ 	case $opt in
+ 	-specs*) # ignore linker specs-files which were used to build library
diff --git a/main/ncurses5/APKBUILD b/main/ncurses5/APKBUILD
deleted file mode 100644
index a4fe1548306..00000000000
--- a/main/ncurses5/APKBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=ncurses5
-pkgver=5.9
-pkgrel=1
-pkgdesc="Console display library - ncurses5 compat"
-url="https://www.gnu.org/software/ncurses/"
-arch="all"
-license=MIT
-depends=
-source="https://ftp.gnu.org/pub/gnu/ncurses/ncurses-${pkgver}.tar.gz
-	ncurses-5.9-gcc-5.patch
-	"
-subpackages="$pkgname-widec-libs:widec $pkgname-libs"
-
-replaces="ncurses"
-_builddir="$srcdir"/ncurses-$pkgver
-prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	local _confopts="
-		--build=$CBUILD
-		--host=$CHOST
-		--mandir=/usr/share/man
-		--without-ada
-		--disable-termcap
-		--disable-rpath-hack
-		--without-cxx-binding
-		--with-terminfo-dirs=/etc/terminfo:/usr/share/terminfo
-		--disable-pc-files
-		--with-shared
-		--without-static
-		--without-progs"
-	cd "$_builddir"
-
-	mkdir ncurses-build ncursesw-build
-	cd ncurses-build
-	../configure $_confopts \
-		|| return 1
-	make libs || return 1
-
-	cd ../ncursesw-build
-	../configure $_confopts \
-		--enable-widec \
-		|| return 1
-	make libs || return 1
-	cd ..
-}
-
-package() {
-	cd "$_builddir"
-	make -j1 -C ncurses-build DESTDIR="$pkgdir" install.libs || return 1
-	make -j1 -C ncursesw-build DESTDIR="$pkgdir" install.libs || return 1
-	rm -r "$pkgdir"/usr/lib/*.a "$pkgdir"/usr/lib/*.so \
-		"$pkgdir"/usr/include "$pkgdir"/usr/bin || return 1
-}
-
-widec() {
-	pkgdesc="Ncurses wide character libraries - ncurses 5 compat"
-	replaces="ncurses-widec-libs"
-	depends="ncurses-terminfo-base"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*w.so.* "$subpkgdir"/usr/lib/
-}
-
-libs() {
-	pkgdesc="Ncurses5 libraries - ncurses 5 compat"
-	depends="ncurses-terminfo-base"
-	replaces="ncurses-libs"
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
-}
-
-sha512sums="d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1  ncurses-5.9.tar.gz
-200388ee1e8d8f656620d067e8993f79a50ed1a6ebee41ce8bd32b2a61cbe10c93347e2604229b58299c457640b247261a4d05afe60802dd4cce80d17bc2f10c  ncurses-5.9-gcc-5.patch"
diff --git a/main/ncurses5/ncurses-5.9-gcc-5.patch b/main/ncurses5/ncurses-5.9-gcc-5.patch
deleted file mode 100644
index 2448229b88e..00000000000
--- a/main/ncurses5/ncurses-5.9-gcc-5.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://bugs.gentoo.org/545114
-
-extracted from the upstream change (which had many unrelated commits in one)
-
-From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001
-From: "Thomas E. Dickey" <dickey@invisible-island.net>
-Date: Sun, 7 Dec 2014 03:10:09 +0000
-Subject: [PATCH] ncurses 5.9 - patch 20141206
-
-+ modify MKlib_gen.sh to work around change in development version of
-  gcc introduced here:
-	  https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
-	  https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
-  (reports by Marcus Shawcroft, Maohui Lei).
-
-diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
-index d8cc3c9..b91398c 100755
---- a/ncurses/base/MKlib_gen.sh
-+++ b/ncurses/base/MKlib_gen.sh
-@@ -474,11 +474,22 @@ sed -n -f $ED1 \
- 	-e 's/gen_$//' \
- 	-e 's/  / /g' >>$TMP
- 
-+cat >$ED1 <<EOF
-+s/  / /g
-+s/^ //
-+s/ $//
-+s/P_NCURSES_BOOL/NCURSES_BOOL/g
-+EOF
-+
-+# A patch discussed here:
-+#	https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
-+# introduces spurious #line markers.  Work around that by ignoring the system's
-+# attempt to define "bool" and using our own symbol here.
-+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
-+cat $ED2 >$TMP
-+
- $preprocessor $TMP 2>/dev/null \
--| sed \
--	-e 's/  / /g' \
--	-e 's/^ //' \
--	-e 's/_Bool/NCURSES_BOOL/g' \
-+| sed -f $ED1 \
- | $AWK -f $AW2 \
- | sed -f $ED3 \
- | sed \
diff --git a/main/ndisc6/APKBUILD b/main/ndisc6/APKBUILD
new file mode 100644
index 00000000000..fc73005ab10
--- /dev/null
+++ b/main/ndisc6/APKBUILD
@@ -0,0 +1,61 @@
+# Contributor: Tyler A <tylera@privatedemail.net>
+# Contributor: ungleich <foss@ungleich.ch>
+# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
+pkgname=ndisc6
+pkgver=1.0.8
+pkgrel=1
+pkgdesc="a small collection of useful tools for IPv6 networking"
+url="https://www.remlab.net/ndisc6"
+arch="all"
+license="GPL-2.0-or-later"
+makedepends="linux-headers perl"
+subpackages="$pkgname-doc rdnssd rdnssd-openrc:openrc:noarch $pkgname-dnssort::noarch"
+source="https://www.remlab.net/files/ndisc6/ndisc6-$pkgver.tar.bz2
+	rdnssd.initd
+	rdnssd.resolvconf
+	"
+
+build() {
+	./configure \
+		--build=$BUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--localstatedir=/var \
+		--sysconfdir=/etc \
+		--disable-nls \
+		--disable-suid-install
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	install -D -m755 "$srcdir"/rdnssd.initd "$pkgdir"/etc/init.d/rdnssd
+}
+
+dnssort() {
+	pkgdesc="ndisc6 dnssort (perl)"
+	install_if="$pkgname=$pkgver-r$pkgrel perl"
+	depends=perl
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/dnssort "$subpkgdir"/usr/bin/
+}
+
+rdnssd() {
+	pkgdesc="autoconfigures the list of DNS servers through slateless IPv6 autoconfiguration"
+	amove usr/sbin/rdnssd
+	amove etc/rdnssd
+	amove var/run/rdnssd
+
+	install -D -m755 "$srcdir"/rdnssd.resolvconf \
+		"$subpkgdir"/etc/rdnssd/resolvconf
+}
+
+sha512sums="
+74a8b0058f9171f1098513891fc1ed890ec43f89195eb501af0e38a67f6e849e44ff7158acf8a6d2eb87c49a00daabf0c3a550e724c1c1afecc2437a35621cc0  ndisc6-1.0.8.tar.bz2
+7225d35c258bc59c23850811583811e3f62936cc395a010e5e0d32734916dec5f7c434b0915075a26c4670bd218b2e47269b7a685a71eab185766ba614f6f3cf  rdnssd.initd
+7b23eafa78bd88d43d0910dbb6cb8d248c00425edb0826571c4d4f9129de33f07093dba4a42f05a549ef1bb9a0fd301716a30bf95ceea18d445e291f0169a444  rdnssd.resolvconf
+"
diff --git a/main/ndisc6/rdnssd.initd b/main/ndisc6/rdnssd.initd
new file mode 100644
index 00000000000..5368f12533b
--- /dev/null
+++ b/main/ndisc6/rdnssd.initd
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+
+supervisor=supervise-daemon
+command=/usr/sbin/rdnssd
+command_args="-H /etc/rdnssd/resolvconf"
+command_args_foreground="-f"
+
+start_pre() {
+        checkpath -d -m 0755 -o nobody:nobody -q /run/rdnssd
+}
diff --git a/main/ndisc6/rdnssd.resolvconf b/main/ndisc6/rdnssd.resolvconf
new file mode 100644
index 00000000000..1553f8545ea
--- /dev/null
+++ b/main/ndisc6/rdnssd.resolvconf
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if command -v resolvconf > /dev/null; then
+	exec resolvconf -a rdnssd < /var/run/rdnssd/resolv.conf
+else
+	exec /etc/rdnssd/merge-hook
+fi
diff --git a/main/neon/APKBUILD b/main/neon/APKBUILD
index 534c75f0b9b..ed8d2c29212 100644
--- a/main/neon/APKBUILD
+++ b/main/neon/APKBUILD
@@ -1,17 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=neon
-pkgver=0.30.2
-pkgrel=7
+pkgver=0.33.0
+pkgrel=0
 pkgdesc="HTTP and WebDAV client library with a C interface"
-url="http://www.webdav.org/neon/"
+url="https://notroj.github.io/neon/"
 arch="all"
 license="LGPL-2.0-or-later"
-makedepends="expat-dev openssl-dev zlib-dev"
-checkdepends="openssl"
+makedepends="
+	expat-dev
+	gzip
+	openssl-dev>3
+	xmlto
+	zlib-dev
+	"
+checkdepends="openssl>3"
 depends="ca-certificates"
 depends_dev="$makedepends"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://fossies.org/linux/www/neon-0.30.2.tar.gz"
+source="https://notroj.github.io/neon/neon-$pkgver.tar.gz"
 # /usr/bin/openssl invocation fails in testsuite, not sure why
 options="!check"
 
@@ -29,6 +35,7 @@ build() {
 		--enable-threadsafe-ssl=posix \
 		--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
 	make
+	make docs
 }
 
 check() {
@@ -36,6 +43,9 @@ check() {
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	make -j1 DESTDIR="$pkgdir" install
 }
-sha512sums="634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631  neon-0.30.2.tar.gz"
+
+sha512sums="
+b214ed34cd832dfaf3af08d4bdbe459c3e791f691548a6d44ee0cdc9811856185522bcbd6c2aca9a536fc021a2ed6329bd093cb3435cc40e3cfd9f5af8b92644  neon-0.33.0.tar.gz
+"
diff --git a/main/net-snmp/APKBUILD b/main/net-snmp/APKBUILD
index d2151d98206..db1aa8b15ad 100644
--- a/main/net-snmp/APKBUILD
+++ b/main/net-snmp/APKBUILD
@@ -1,33 +1,44 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=net-snmp
-pkgver=5.8
-pkgrel=3
+pkgver=5.9.4
+pkgrel=0
 pkgdesc="Simple Network Management Protocol"
 url="http://www.net-snmp.org/"
 arch="all"
-license="GPL"
-depends=
-depends_dev="openssl-dev"
-# we need perl-net-snmp in make depends for bootstrapping issues
-# net-snmp-gui subpackage has perl-net-snmp as depends
-makedepends="file perl-dev openssl-dev perl-net-snmp linux-headers"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-agent-libs:alibs
-	$pkgname-perl:pl $pkgname-gui $pkgname-tools $pkgname-openrc"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+license="Net-SNMP"
+depends_dev="openssl-dev>3"
+# we need perl-net-snmp and perl-tk in make depends for bootstrapping issues
+# net-snmp-gui subpackage has perl-net-snmp and perl-tk as depends
+makedepends="file perl-dev openssl-dev>3 perl-net-snmp perl-tk linux-headers"
+subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-libs $pkgname-agent-libs:alibs
+	$pkgname-perl:pl $pkgname-gui::noarch $pkgname-tools $pkgname-openrc"
+source="https://downloads.sourceforge.net/net-snmp/net-snmp-$pkgver.tar.gz
 	netsnmp-swinst-crash.patch
 	fix-includes.patch
-	report-empty-strings-correctly.patch
+	fix-fd_mask.patch
+	fix-pkgconf-version.patch
 
 	snmpd.initd
 	snmpd.confd
 	snmptrapd.confd
 	"
-
-builddir="$srcdir/$pkgname-$pkgver"
+options="!check"
+
+# secfixes:
+#   5.9.3-r2:
+#     - CVE-2015-8100
+#     - CVE-2022-44792
+#     - CVE-2022-44793
+#   5.9.3-r0:
+#     - CVE-2022-24805
+#     - CVE-2022-24806
+#     - CVE-2022-24807
+#     - CVE-2022-24808
+#     - CVE-2022-24809
+#     - CVE-2022-24810
 
 prepare() {
-	update_config_sub
 	default_prepare
 	# Allow tmpfs volume size monitoring
 	# Ref #932
@@ -35,13 +46,8 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
-
 	export lt_cv_sys_max_cmd_len=8192
 
-	#build fails on: libnetsnmpmibs.so: undefined reference to `pthread_create'
-	LDFLAGS="$LDFLAGS -lpthread"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -60,16 +66,16 @@ build() {
 		--enable-ipv6 \
 		--enable-shared \
 		--enable-as-needed \
+		--enable-blumenthal-aes \
 		--with-perl-modules="INSTALLDIRS=vendor" \
 		--disable-embedded-perl
 	# embedded-perl seems to create TEXTREL's
 
-	make -j1
+	make
 }
 
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install || return 1
+	make -j1 DESTDIR="$pkgdir" install
 	# remove things we dont want distribute
 	rm "$pkgdir"/usr/lib/libsnmp* \
 		"$pkgdir"/usr/bin/snmpcheck \
@@ -84,7 +90,7 @@ package() {
 	install -m644 -D "$srcdir"/snmpd.confd "$pkgdir"/etc/conf.d/snmpd
 	install -m644 -D "$srcdir"/snmptrapd.confd \
 		"$pkgdir"/etc/conf.d/snmptrapd
-	install -m644 -D EXAMPLE.conf "$pkgdir"/etc/snmp/snmpd.conf
+	install -m640 -D EXAMPLE.conf "$pkgdir"/etc/snmp/snmpd.conf
 	echo "authCommunity log,execute,net public" > "$pkgdir"/etc/snmp/snmptrapd.conf
 	mkdir -p "$pkgdir"/var/lib/net-snmp
 	find "$pkgdir" -name perllocal.pod -delete
@@ -130,7 +136,7 @@ pl() {
 
 gui() {
 	pkgdesc="An interactive graphical MIB browser for SNMP"
-	depends="perl-net-snmp" # needs perl-tk too...
+	depends="net-snmp-perl perl-tk"
 	replaces="net-snmp-tools"
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/tkmib "$subpkgdir"/usr/bin/
@@ -142,10 +148,13 @@ tools() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
 }
 
-sha512sums="27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7  net-snmp-5.8.tar.gz
+sha512sums="
+a510fa91a21e9ddc86a12fd1d0bc6b356e63f3ea53f184d2e31439004d41d902390664134dc40b3b828eabb4282eaf3da628a07c4d480fa00eff7e700950c423  net-snmp-5.9.4.tar.gz
 4ad92f50b14d5e27ba86256cc532a2dd055502f4d5fbb1700434f9f01f881fd09bb1eadb94e727554e1470f036707558314c64a66d0376b54e71ab31d5e4baa3  netsnmp-swinst-crash.patch
 87a552bd2e41684bba6e87fbcf6454a85ee912d7a339411fda24cebddf7661f0856729e076a917920a542cf84b687ffd90a091daa15f2c48f0ff64f3a53c0ddb  fix-includes.patch
-633fbf574a76f63b0ae5340cd86439ca89ef2621b890917c35a884fe2d41052d4ec65c88f0d3f94f2bb3481b2bc1989647d3e697f7995b72abee47799300c26b  report-empty-strings-correctly.patch
-896ef65a6f420073746470cdbd0de8f356c5b936d35e131754905b3d4323c24dcd3a09e0cc8bd90b12e3402f01e478f927f0e4163cb85cb0cc03db3c2e0491f4  snmpd.initd
-fb101aa758d741ed3ea88b11f1cd49cfd04bd03ce62435f3acb17724748131c57f00b71fd45cb7e7871d65a1aab576652cd6e158b6406aa6d0998582b8235ef5  snmpd.confd
-073fd2b83eedd6eda1f7345350268ce7946ef6d67a8f26f7c232e46feb75babf68272ae12071a2f9ea76ede71393b3ae4672d3cd47cfd14ab77e3a6482f2e124  snmptrapd.confd"
+6b70e65c16c8b5dea81b7aa12155a7d99e647e35b9e3c20c546850fe5a745061bf6ea2985e5405aa0a657fb0931e62264f68be2f55def4ecff1ecb83f26731c8  fix-fd_mask.patch
+e05c82c9d7a2fe1616996f3641d0ea7907ce17133623e771ec5742a161fd94b43b2e4475ae2d9372c4ec93467b3398865c9b0d0aaa501ff7aa4eebf4c9ef3299  fix-pkgconf-version.patch
+1616d471105fc004bd7472d244d4ff9eae936875853bc51381ce2ddbb4bc29825beab6ed01299c76e3230b5725083ae169381f4572d12f015f6c682926b708bc  snmpd.initd
+ca4921190e8b81e3244465fa66bf6f0a075add159c8ec13a1198ded155df89eb984a48e34972b20f549fbfa9bbff4a24d66bf7cd0b51f5f86a26ad4c2f5cf5cc  snmpd.confd
+073fd2b83eedd6eda1f7345350268ce7946ef6d67a8f26f7c232e46feb75babf68272ae12071a2f9ea76ede71393b3ae4672d3cd47cfd14ab77e3a6482f2e124  snmptrapd.confd
+"
diff --git a/main/net-snmp/fix-fd_mask.patch b/main/net-snmp/fix-fd_mask.patch
new file mode 100644
index 00000000000..a85fe936601
--- /dev/null
+++ b/main/net-snmp/fix-fd_mask.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -31638,7 +31638,7 @@
+ 
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the type of fd_set::fds_bits" >&5
+ printf %s "checking for the type of fd_set::fds_bits... " >&6; }
+-for type in __fd_mask __int32_t unknown; do
++for type in __fd_mask fd_mask __int32_t unknown; do
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
diff --git a/main/net-snmp/fix-pkgconf-version.patch b/main/net-snmp/fix-pkgconf-version.patch
new file mode 100644
index 00000000000..f0dbf567307
--- /dev/null
+++ b/main/net-snmp/fix-pkgconf-version.patch
@@ -0,0 +1,13 @@
+--- a/configure
++++ b/configure
+@@ -622,8 +622,8 @@
+ # Identity of this package.
+ PACKAGE_NAME='Net-SNMP'
+ PACKAGE_TARNAME='net-snmp'
+-PACKAGE_VERSION='5.9.4.pre2'
+-PACKAGE_STRING='Net-SNMP 5.9.4.pre2'
++PACKAGE_VERSION='5.9.4'
++PACKAGE_STRING='Net-SNMP 5.9.4'
+ PACKAGE_BUGREPORT='net-snmp-coders@lists.sourceforge.net'
+ PACKAGE_URL=''
+ 
diff --git a/main/net-snmp/report-empty-strings-correctly.patch b/main/net-snmp/report-empty-strings-correctly.patch
deleted file mode 100644
index b1520d9b645..00000000000
--- a/main/net-snmp/report-empty-strings-correctly.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From d0787a2c86a80e31756965c436fac67b7d1c0f9b Mon Sep 17 00:00:00 2001
-From: Bart Van Assche <bvanassche@acm.org>
-Date: Fri, 11 Oct 2019 20:09:08 -0700
-Subject: [PATCH] HOST-RESOURCES-MIB, UCD-SNMP-MIB: Report empty strings
- correctly
-
-See also https://github.com/net-snmp/net-snmp/issues/26.
-
-Fixes: 9b9c0e287b4d ("MIBs: Use asprintf() instead of snprintf() to prevent truncation")
----
- agent/mibgroup/host/hrh_filesys.c | 5 +++--
- agent/mibgroup/ucd-snmp/disk.c    | 3 ++-
- agent/mibgroup/ucd-snmp/disk_hw.c | 3 ++-
- agent/mibgroup/ucd-snmp/proc.c    | 4 ++--
- 4 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/agent/mibgroup/host/hrh_filesys.c b/agent/mibgroup/host/hrh_filesys.c
-index 354416157..073a37e98 100644
---- a/agent/mibgroup/host/hrh_filesys.c
-+++ b/agent/mibgroup/host/hrh_filesys.c
-@@ -219,6 +219,7 @@ var_hrhfilesys(struct variable *vp,
- {
-     int             fsys_idx;
-     static char    *string;
-+    static char     empty_str[1];
- 
-     fsys_idx =
-         header_hrhfilesys(vp, name, length, exact, var_len, write_method);
-@@ -235,7 +236,7 @@ var_hrhfilesys(struct variable *vp,
-         *var_len = 0;
-         if (asprintf(&string, "%s", HRFS_entry->path) >= 0)
-             *var_len = strlen(string);
--        return (u_char *) string;
-+        return (u_char *)(string ? string : empty_str);
-     case HRFSYS_RMOUNT:
-         free(string);
-         if (HRFS_entry->flags & NETSNMP_FS_FLAG_REMOTE) {
-@@ -245,7 +246,7 @@ var_hrhfilesys(struct variable *vp,
-             string = strdup("");
-         }
-         *var_len = string ? strlen(string) : 0;
--        return (u_char *) string;
-+        return (u_char *)(string ? string : empty_str);
- 
-     case HRFSYS_TYPE:
-         fsys_type_id[fsys_type_len - 1] = 
-diff --git a/agent/mibgroup/ucd-snmp/disk.c b/agent/mibgroup/ucd-snmp/disk.c
-index d827dcc18..52062352e 100644
---- a/agent/mibgroup/ucd-snmp/disk.c
-+++ b/agent/mibgroup/ucd-snmp/disk.c
-@@ -825,6 +825,7 @@ var_extensible_disk(struct variable *vp,
-     struct dsk_entry entry;
-     static long     long_ret;
-     static char    *errmsg;
-+    static char     empty_str[1];
- 
- tryAgain:
-     if (header_simple_table
-@@ -926,7 +927,7 @@ var_extensible_disk(struct variable *vp,
-                 *var_len = strlen(errmsg);
-             }
-         }
--        return (u_char *) (errmsg);
-+        return (u_char *)(errmsg ? errmsg : empty_str);
-     }
-     return NULL;
- }
-diff --git a/agent/mibgroup/ucd-snmp/disk_hw.c b/agent/mibgroup/ucd-snmp/disk_hw.c
-index cc5da14de..e8b09a238 100644
---- a/agent/mibgroup/ucd-snmp/disk_hw.c
-+++ b/agent/mibgroup/ucd-snmp/disk_hw.c
-@@ -314,6 +314,7 @@ var_extensible_disk(struct variable *vp,
-     unsigned long long val;
-     static long     long_ret;
-     static char    *errmsg;
-+    static char     empty_str[1];
-     netsnmp_cache  *cache;
- 
-     /* Update the fsys H/W module */
-@@ -432,7 +433,7 @@ var_extensible_disk(struct variable *vp,
-              >= 0)) {
-             *var_len = strlen(errmsg);
-         }
--        return (u_char *) errmsg;
-+        return (u_char *)(errmsg ? errmsg : empty_str);
-     }
-     return NULL;
- }
-diff --git a/agent/mibgroup/ucd-snmp/proc.c b/agent/mibgroup/ucd-snmp/proc.c
-index 57aa2d58a..8eb5fa7ac 100644
---- a/agent/mibgroup/ucd-snmp/proc.c
-+++ b/agent/mibgroup/ucd-snmp/proc.c
-@@ -265,7 +265,7 @@ var_extensible_proc(struct variable *vp,
-     struct myproc  *proc;
-     static long     long_ret;
-     static char    *errmsg;
--
-+    static char     empty_str[1];
- 
-     if (header_simple_table
-         (vp, name, length, exact, var_len, write_method, numprocs))
-@@ -328,7 +328,7 @@ var_extensible_proc(struct variable *vp,
-                 }
-             }
-             *var_len = errmsg ? strlen(errmsg) : 0;
--            return ((u_char *) errmsg);
-+            return (u_char *)(errmsg ? errmsg : empty_str);
-         case ERRORFIX:
-             *write_method = fixProcError;
-             long_return = fixproc.result;
diff --git a/main/net-snmp/snmpd.confd b/main/net-snmp/snmpd.confd
index 849517574e6..9431214f905 100644
--- a/main/net-snmp/snmpd.confd
+++ b/main/net-snmp/snmpd.confd
@@ -1,14 +1,2 @@
-# Initial (empty) options.
-OPTS=""
-
-# Enable connection logging.
-#OPTS="${OPTS} -a"
-
-# Enable syslog and disable file log.
-OPTS="${OPTS} -LSwd -Lf /dev/null"
-
-# Enable agentx socket as /var/agentx/master
-# *NOTE* Before uncommenting this, make sure
-#        the /var/agentx directory exists.
-#OPTS="${OPTS} -x /var/agentx/master"
-
+# Default options
+# OPTS="-LSwd -Lf /dev/null"
diff --git a/main/net-snmp/snmpd.initd b/main/net-snmp/snmpd.initd
index 5d509cc3d98..a15c41b6cbc 100644
--- a/main/net-snmp/snmpd.initd
+++ b/main/net-snmp/snmpd.initd
@@ -1,13 +1,11 @@
 #!/sbin/openrc-run
 
-# for backward compat
-case "$SVCNAME" in
-snmpd) : ${OPTS:=$SNMPD_FLAGS} ;;
-esac
+: ${OPTS:="-LSwd -Lf /dev/null"}
 
-pidfile="/var/run/${SVCNAME}.pid"
+pidfile="/run/${SVCNAME}.pid"
 command="/usr/sbin/${SVCNAME}"
-command_args="-p ${pidfile} ${OPTS}"
+command_args="-f -p ${pidfile} ${OPTS}"
+command_background="yes"
 required_files="/etc/snmp/${SVCNAME}.conf"
 extra_started_commands="reload"
 
diff --git a/main/net-tools/0001-Revert-sscanf-pattern-is-Lu-not-llu-for-long-long-un.patch b/main/net-tools/0001-Revert-sscanf-pattern-is-Lu-not-llu-for-long-long-un.patch
new file mode 100644
index 00000000000..c746eee8628
--- /dev/null
+++ b/main/net-tools/0001-Revert-sscanf-pattern-is-Lu-not-llu-for-long-long-un.patch
@@ -0,0 +1,45 @@
+Patch-Source: https://sourceforge.net/p/net-tools/mailman/message/37860727/
+https://git.adelielinux.org/adelie/packages/-/issues/600
+--
+From d7d325d5fddb0be4601a910fe23066be6c8bd603 Mon Sep 17 00:00:00 2001
+From: Zach van Rijn <me@zv.io>
+Date: Wed, 21 Jun 2023 16:50:30 +0000
+Subject: [PATCH] Revert "sscanf pattern is %Lu not %llu for long long unsigned
+ byte counters."
+
+This reverts commit 811cf0aaf40a0e7f426f8ffaea7c3ca4b8bebdfc.
+
+diff --git a/lib/interface.c b/lib/interface.c
+index ef28dec..71d4163 100644
+--- a/lib/interface.c
++++ b/lib/interface.c
+@@ -254,7 +254,7 @@ static int get_dev_fields(const char *bp, struct interface *ife)
+     switch (procnetdev_vsn) {
+     case 3:
+ 	sscanf(bp,
+-	"%Lu %Lu %lu %lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu %lu",
++	"%llu %llu %lu %lu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu %lu",
+ 	       &ife->stats.rx_bytes,
+ 	       &ife->stats.rx_packets,
+ 	       &ife->stats.rx_errors,
+@@ -274,7 +274,7 @@ static int get_dev_fields(const char *bp, struct interface *ife)
+ 	       &ife->stats.tx_compressed);
+ 	break;
+     case 2:
+-	sscanf(bp, "%Lu %Lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu",
++	sscanf(bp, "%llu %llu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu",
+ 	       &ife->stats.rx_bytes,
+ 	       &ife->stats.rx_packets,
+ 	       &ife->stats.rx_errors,
+@@ -292,7 +292,7 @@ static int get_dev_fields(const char *bp, struct interface *ife)
+ 	ife->stats.rx_multicast = 0;
+ 	break;
+     case 1:
+-	sscanf(bp, "%Lu %lu %lu %lu %lu %Lu %lu %lu %lu %lu %lu",
++	sscanf(bp, "%llu %lu %lu %lu %lu %llu %lu %lu %lu %lu %lu",
+ 	       &ife->stats.rx_packets,
+ 	       &ife->stats.rx_errors,
+ 	       &ife->stats.rx_dropped,
+-- 
+2.40.0
+
diff --git a/main/net-tools/APKBUILD b/main/net-tools/APKBUILD
index 59b605c7772..d4de84609b0 100644
--- a/main/net-tools/APKBUILD
+++ b/main/net-tools/APKBUILD
@@ -1,32 +1,21 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=net-tools
-pkgver=1.60_git20140218
-_ver=${pkgver%_git*}
-pkgrel=2
+pkgver=2.10
+pkgrel=3
 pkgdesc="Linux networking base tools"
 url="https://sourceforge.net/projects/net-tools/"
 arch="all"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
 depends="mii-tool"
-depends_dev=""
 makedepends="$depends_dev bash linux-headers"
 options="!check"
-install=""
 subpackages="$pkgname-doc $pkgname-dbg mii-tool:mii_tool"
-source="https://downloads.sourceforge.net/project/net-tools/net-tools-$_ver.tar.bz2
-	git.patch
-	musl-fixes.patch
+source="https://downloads.sourceforge.net/project/net-tools/net-tools-$pkgver.tar.xz
+	0001-Revert-sscanf-pattern-is-Lu-not-llu-for-long-long-un.patch
 	"
 
-builddir="$srcdir"/net-tools-$_ver
 prepare() {
-	local i
-	cd "$builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
 	cat > config.make <<EOF
 # I18N=0
 HAVE_AFUNIX=1
@@ -64,29 +53,35 @@ HAVE_HWNETROM=1
 # HAVE_HWEUI64=0
 # HAVE_HWIB=0
 HAVE_FW_MASQUERADE=1
+HAVE_ARP_TOOLS=1
+HAVE_HOSTNAME_TOOLS=1
+HAVE_HOSTNAME_SYMLINKS=1
 HAVE_IP_TOOLS=1
 HAVE_MII=1
+HAVE_PLIP_TOOLS=1
+HAVE_SERIAL_TOOLS=1
 EOF
 	sed -n -e 's/^\(HAVE.*\)=\(.*\)/#define \1 \2/p' config.make > config.h
 }
 
 build() {
-	cd "$builddir"
-	make || return 1
+	make
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
+
+	# move ifconfig to usr/sbin to override busybox in usr/sbin
+	mv "$pkgdir"/bin/ifconfig "$pkgdir"/sbin/
 }
 
 mii_tool() {
 	pkgdesc="media-independent interface (MII) tool"
 	depends=
-	mkdir -p "$subpkgdir"/sbin
-	mv "$pkgdir"/sbin/mii-tool "$subpkgdir"/sbin/
+	amove sbin/mii-tool
 }
 
-sha512sums="8e1ae9bca726ad7d795a06c58388f9e11c1d617d94eebb9ed18bd11e5f34c6541e1ffe631706c407996db86e78df6e5cf1968a2d90b242b473596fda3b6d1eae  net-tools-1.60.tar.bz2
-5edc92e8cf46da11898ac1999cfccb5b7ae3407f649c75c2da43c4264e1271b010eafbc84283e4c41219870bf89722e09666b25d28c84cb4ac60ceebee9adb2d  git.patch
-08c9e7681e069a42f4da714faf0b93ad1c569cf942a94a1b41103e86850235b507c0291e2f3839c84dd02aba0b1a16d79580fbfc55dd2af8d09b0ff71d714e9f  musl-fixes.patch"
+sha512sums="
+aa8f631772da6c16b165065fc5929a206504f2dce19e74a4ffc680f09b40f3a9180bd4bbeaac67e0b32693358b01383bae4fbfcb6061180c130e9e0801d536bf  net-tools-2.10.tar.xz
+c0f5906fe17dc926ecc8767bfbfbfd491cae77680732d02b1c96ca2805cb7ce35ab4edd5485b95b1f691a110d77e028b67c35e201e477981da1eb8bb1e26bad6  0001-Revert-sscanf-pattern-is-Lu-not-llu-for-long-long-un.patch
+"
diff --git a/main/net-tools/git.patch b/main/net-tools/git.patch
deleted file mode 100644
index eb35885e81c..00000000000
--- a/main/net-tools/git.patch
+++ /dev/null
@@ -1,26170 +0,0 @@
-diff --git a/.cvsignore b/.cvsignore
-index 1d4a063..ff65062 100644
---- a/.cvsignore
-+++ b/.cvsignore
-@@ -1,2 +1,3 @@
- arp hostname ifconfig ipmaddr iptunnel netstat plipconfig rarp route slattach
- version.h config.make config.status config.h nameif mii-tool
-+.git
-diff --git a/.gitignore b/.gitignore
-new file mode 100644
-index 0000000..9184162
---- /dev/null
-+++ b/.gitignore
-@@ -0,0 +1,36 @@
-+*.o
-+
-+*.diff
-+*.patch
-+*.rej
-+*.orig
-+
-+.gdb_history
-+.gdbinit
-+core
-+*.gdb
-+
-+/config.h
-+/config.make
-+/config.status
-+
-+/net-tools-*.tar*
-+
-+/lib/libnet-tools.a
-+
-+/po/*.mo
-+
-+/version.h
-+
-+/arp
-+/hostname
-+/ifconfig
-+/ipmaddr
-+/iptunnel
-+/mii-tool
-+/nameif
-+/netstat
-+/plipconfig
-+/rarp
-+/route
-+/slattach
-diff --git a/COPYING b/COPYING
-index a43ea21..d159169 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,12 @@
--		    GNU GENERAL PUBLIC LICENSE
--		       Version 2, June 1991
-+                    GNU GENERAL PUBLIC LICENSE
-+                       Version 2, June 1991
- 
-- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
--                          675 Mass Ave, Cambridge, MA 02139, USA
-+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-  Everyone is permitted to copy and distribute verbatim copies
-  of this license document, but changing it is not allowed.
- 
--			    Preamble
-+                            Preamble
- 
-   The licenses for most software are designed to take away your
- freedom to share and change it.  By contrast, the GNU General Public
-@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
- General Public License applies to most of the Free Software
- Foundation's software and to any other program whose authors commit to
- using it.  (Some other Free Software Foundation software is covered by
--the GNU Library General Public License instead.)  You can apply it to
-+the GNU Lesser General Public License instead.)  You can apply it to
- your programs, too.
- 
-   When we speak of free software, we are referring to freedom, not
-@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
- 
-   The precise terms and conditions for copying, distribution and
- modification follow.
--
--		    GNU GENERAL PUBLIC LICENSE
-+
-+                    GNU GENERAL PUBLIC LICENSE
-    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- 
-   0. This License applies to any program or other work which contains
-@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
-     License.  (Exception: if the Program itself is interactive but
-     does not normally print such an announcement, your work based on
-     the Program is not required to print an announcement.)
--
-+
- These requirements apply to the modified work as a whole.  If
- identifiable sections of that work are not derived from the Program,
- and can be reasonably considered independent and separate works in
-@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
- access to copy the source code from the same place counts as
- distribution of the source code, even though third parties are not
- compelled to copy the source along with the object code.
--
-+
-   4. You may not copy, modify, sublicense, or distribute the Program
- except as expressly provided under this License.  Any attempt
- otherwise to copy, modify, sublicense or distribute the Program is
-@@ -225,7 +225,7 @@ impose that choice.
- 
- This section is intended to make thoroughly clear what is believed to
- be a consequence of the rest of this License.
--
-+
-   8. If the distribution and/or use of the Program is restricted in
- certain countries either by patents or by copyrighted interfaces, the
- original copyright holder who places the Program under this License
-@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
- of preserving the free status of all derivatives of our free software and
- of promoting the sharing and reuse of software generally.
- 
--			    NO WARRANTY
-+                            NO WARRANTY
- 
-   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
- FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
- PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGES.
- 
--		     END OF TERMS AND CONDITIONS
--
--	Appendix: How to Apply These Terms to Your New Programs
-+                     END OF TERMS AND CONDITIONS
-+
-+            How to Apply These Terms to Your New Programs
- 
-   If you develop a new program, and you want it to be of the greatest
- possible use to the public, the best way to achieve this is to make it
-@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
- the "copyright" line and a pointer to where the full notice is found.
- 
-     <one line to give the program's name and a brief idea of what it does.>
--    Copyright (C) 19yy  <name of author>
-+    Copyright (C) <year>  <name of author>
- 
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-@@ -303,16 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
-     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.
-+    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.,
-+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
- Also add information on how to contact you by electronic and paper mail.
- 
- If the program is interactive, make it output a short notice like this
- when it starts in an interactive mode:
- 
--    Gnomovision version 69, Copyright (C) 19yy name of author
-+    Gnomovision version 69, Copyright (C) year name of author
-     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-     This is free software, and you are welcome to redistribute it
-     under certain conditions; type `show c' for details.
-@@ -335,5 +335,5 @@ necessary.  Here is a sample; alter the names:
- This General Public License does not permit incorporating your program into
- proprietary programs.  If your program is a subroutine library, you may
- consider it more useful to permit linking proprietary applications with the
--library.  If this is what you want to do, use the GNU Library General
-+library.  If this is what you want to do, use the GNU Lesser General
- Public License instead of this License.
-diff --git a/INSTALLING b/INSTALLING
-index c49f21f..f6180c8 100644
---- a/INSTALLING
-+++ b/INSTALLING
-@@ -27,7 +27,7 @@ of the other options should work as well.
- 
- 
- COMPILE
---------  
-+-------
- To compile simply use "make".
- 
- There should be no warnings or errors.
-diff --git a/Makefile b/Makefile
-index 8fcc55c..edf80ec 100644
---- a/Makefile
-+++ b/Makefile
-@@ -5,14 +5,10 @@
- #		NET-3 Networking Distribution for the LINUX operating
- #		system.
- #
--# Version:	2001-02-13
--#
- # Author:	Bernd Eckenfels <net-tools@lina.inka.de>
- #		Copyright 1995-1996 Bernd Eckenfels, Germany
- #
--# URLs:		ftp://ftp.inka.de/pub/comp/Linux/networking/NetTools/ 
--#		ftp://ftp.linux.org.uk/pub/linux/Networking/PROGRAMS/NetTools/
--#		http://www.inka.de/sites/lina/linux/NetTools/index_en.html
-+# URLs:		http://net-tools.sourceforge.net/
- #
- # Based on:	Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
- #		Copyright 1988-1993 MicroWalt Corporation
-@@ -22,55 +18,16 @@
- #		Alan Cox <A.Cox@swansea.ac.uk>
- #		Copyright 1993-1994 Swansea University Computer Society
- #
--# Be careful! 
-+# Be careful!
- # This Makefile doesn't describe complete dependencies for all include files.
--# If you change include files you might need to do make clean. 
--#
--#	{1.20}	Bernd Eckenfels:	Even more modifications for the new 
--#					package layout
--#	{1.21}	Bernd Eckenfels:	Check if config.in is newer than 
--#					config.status
--#	{1.22}  Bernd Eckenfels:	Include ypdomainname and nisdomainame
--#
--#	1.3.50-BETA6 private Release
--#				
--#960125	{1.23}	Bernd Eckenfels:	Peter Tobias' rewrite for 
--#					makefile-based installation
--#	1.3.50-BETA6a private Release
--#
--#960201 {1.24}	Bernd Eckenfels:	net-features.h added
--#
--#960201 1.3.50-BETA6b private Release
--#
--#960203 1.3.50-BETA6c private Release
--#
--#960204 1.3.50-BETA6d private Release
--#
--#960204 {1.25}	Bernd Eckenfels:	DISTRIBUTION added
--#
--#960205 1.3.50-BETA6e private Release
--#
--#960206	{1.26}	Bernd Eckenfels:	afrt.o removed (cleaner solution)
--#
--#960215 1.3.50-BETA6f Release
--#
--#960216 {1.30}	Bernd Eckenfels:	net-lib support
--#960322 {1.31}	Bernd Eckenfels:	moveable netlib, TOPDIR
--#960424 {1.32}	Bernd Eckenfels:	included the URLs in the Comment
--#
--#960514 1.31-alpha release
--#
--#960518 {1.33}	Bernd Eckenfels:	-I/usr/src/linux/include comment added
--#
--#	This program 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 of the License, or  (at
--#	your option) any later version.
-+# If you change include files you might need to do make clean.
- #
- 
--# set the base of the Installation 
-+# set the base of the Installation
- # BASEDIR = /mnt
-+BASEDIR ?= $(DESTDIR)
-+BINDIR ?= /bin
-+SBINDIR ?= /sbin
- 
- # path to the net-lib support library. Default: lib
- NET_LIB_PATH = lib
-@@ -88,20 +45,26 @@ endif
- 
- # Compiler and Linker Options
- # You may need to uncomment and edit these if you are using libc5 and IPv6.
--COPTS = -D_GNU_SOURCE -O2 -Wall -g # -I/usr/inet6/include
--ifeq ($(origin LOPTS), undefined)
--LOPTS = 
--endif
-+CFLAGS ?= -O2 -g
-+CFLAGS += -Wall
-+CFLAGS += -fno-strict-aliasing # code needs a lot of work before strict aliasing is safe
-+CPPFLAGS += -D_GNU_SOURCE
- RESLIB = # -L/usr/inet6/lib -linet6
- 
- ifeq ($(HAVE_AFDECnet),1)
- DNLIB = -ldnet
- endif
- 
-+ifeq ($(origin CC), undefined)
-+CC	= gcc
-+endif
-+LD	= $(CC)
-+PKG_CONFIG ?= pkg-config
-+
- # -------- end of user definitions --------
- 
--MAINTAINER = Philip.Blundell@pobox.com
--RELEASE	   = 1.60
-+MAINTAINER = net-tools-devel@lists.sourceforge.net
-+RELEASE	   = 2.10-alpha
- 
- .EXPORT_ALL_VARIABLES:
- 
-@@ -113,22 +76,22 @@ endif
- 
- NET_LIB = $(NET_LIB_PATH)/lib$(NET_LIB_NAME).a
- 
--CFLAGS	= $(COPTS) -I. -idirafter ./include/ -I$(NET_LIB_PATH)
--LDFLAGS	= $(LOPTS) -L$(NET_LIB_PATH)
-+ifeq ($(HAVE_SELINUX),1)
-+SE_PC_CFLAGS := $(shell $(PKG_CONFIG) --cflags libselinux)
-+SE_PC_LIBS := $(shell $(PKG_CONFIG) --libs libselinux || echo -lselinux)
-+SELIB = $(SE_PC_LIBS)
-+CPPFLAGS += $(SE_PC_CFLAGS)
-+endif
- 
--SUBDIRS	= man/ $(NET_LIB_PATH)/
-+CPPFLAGS += -I. -I$(TOPDIR)/include -I$(NET_LIB_PATH)
-+LDFLAGS  += -L$(NET_LIB_PATH)
- 
--ifeq ($(origin CC), undefined)
--CC	= gcc
--endif
--LD	= $(CC)
-+SUBDIRS	= man/ $(NET_LIB_PATH)/
- 
- NLIB	= -l$(NET_LIB_NAME)
- 
--MDEFINES = COPTS='$(COPTS)' LOPTS='$(LOPTS)' TOPDIR='$(TOPDIR)'
--
--%.o:		%.c config.h version.h intl.h net-features.h $<
--		$(CC) $(CFLAGS) -c $<
-+%.o:		%.c config.h version.h intl.h lib/net-features.h $<
-+		$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
- 
- all:		config.h version.h subdirs $(PROGS)
- 
-@@ -154,12 +117,21 @@ clobber: 	clean
- 		@for i in $(SUBDIRS); do (cd $$i && $(MAKE) clobber) ; done
- 
- 
--dist: 		clobber
--		@echo Creating net-tools-$(RELEASE) in ..
--		@tar -cvz -f ../net-tools-$(RELEASE).tar.gz -C .. net-tools
-+dist:
-+		rm -rf net-tools-$(RELEASE)
-+		git archive --prefix=net-tools-$(RELEASE)/ HEAD | tar xf -
-+		$(MAKE) -C net-tools-$(RELEASE)/po $@
-+		tar cf - net-tools-$(RELEASE)/ | xz > net-tools-$(RELEASE).tar.xz
-+		rm -rf net-tools-$(RELEASE)
- 
-+distcheck:	dist
-+		tar xf net-tools-$(RELEASE).tar.xz
-+		yes "" | $(MAKE) -C net-tools-$(RELEASE) config
-+		$(MAKE) -C net-tools-$(RELEASE)
-+		rm -rf net-tools-$(RELEASE)
-+		@printf "\nThe tarball is ready to go:\n%s\n" "`du -b net-tools-$(RELEASE).tar.xz`"
- 
--config.h: 	config.in Makefile 
-+config.h: 	config.in Makefile
- 		@echo "Configuring the Linux net-tools (NET-3 Base Utilities)..." ; echo
- 		@if [ config.status -nt config.in ]; \
- 			then ./configure.sh config.status; \
-@@ -175,85 +147,91 @@ $(NET_LIB):	config.h version.h intl.h libdir
- 
- i18n.h:		i18ndir
- 
--libdir:
--		@$(MAKE) -C $(NET_LIB_PATH) $(MDEFINES)
-+libdir:		version.h
-+		@$(MAKE) -C $(NET_LIB_PATH)
- 
- i18ndir:
- 		@$(MAKE) -C po
- 
--subdirs:
--		@for i in $(SUBDIRS); do $(MAKE) -C $$i $(MDEFINES) ; done
-+# use libdir target for lib/ to avoid parallel build issues
-+subdirs:	libdir
-+		@for i in $(SUBDIRS:$(NET_LIB_PATH)/=); do $(MAKE) -C $$i || exit $$? ; done
- 
- ifconfig:	$(NET_LIB) ifconfig.o
--		$(CC) $(LDFLAGS) -o ifconfig ifconfig.o $(NLIB) $(RESLIB)
--		
--nameif:	nameif.o
--		$(CC) $(LDFLAGS) -o nameif nameif.o 
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ifconfig.o $(NLIB) $(RESLIB)
-+
-+nameif:		$(NET_LIB) nameif.o
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ nameif.o $(NLIB) $(RESLIB)
- 
- hostname:	hostname.o
--		$(CC) $(LDFLAGS) -o hostname hostname.o $(DNLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ hostname.o $(DNLIB)
- 
- route:		$(NET_LIB) route.o
--		$(CC) $(LDFLAGS) -o route route.o $(NLIB) $(RESLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ route.o $(NLIB) $(RESLIB)
- 
- arp:		$(NET_LIB) arp.o
--		$(CC) $(LDFLAGS) -o arp arp.o $(NLIB) $(RESLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ arp.o $(NLIB) $(RESLIB)
- 
- rarp:		$(NET_LIB) rarp.o
--		$(CC) $(LDFLAGS) -o rarp rarp.o $(NLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ rarp.o $(NLIB)
- 
- slattach:	$(NET_LIB) slattach.o
--		$(CC) $(LDFLAGS) -o slattach slattach.o $(NLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ slattach.o $(NLIB)
- 
- plipconfig:	$(NET_LIB) plipconfig.o
--		$(CC) $(LDFLAGS) -o plipconfig plipconfig.o $(NLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ plipconfig.o $(NLIB)
- 
- netstat:	$(NET_LIB) netstat.o statistics.o
--		$(CC) $(LDFLAGS) -o netstat netstat.o statistics.o $(NLIB) $(RESLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ netstat.o statistics.o $(NLIB) $(RESLIB) $(SELIB)
- 
- iptunnel:	$(NET_LIB) iptunnel.o
--		$(CC) $(LDFLAGS) -o iptunnel iptunnel.o $(NLIB) $(RESLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ iptunnel.o $(NLIB) $(RESLIB)
- 
- ipmaddr:	$(NET_LIB) ipmaddr.o
--		$(CC) $(LDFLAGS) -o ipmaddr ipmaddr.o $(NLIB) $(RESLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ipmaddr.o $(NLIB) $(RESLIB)
- 
--mii-tool:	mii-tool.o
--		$(CC) $(LDFLAGS) -o mii-tool mii-tool.o
-+mii-tool:	$(NET_LIB) mii-tool.o
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mii-tool.o $(NLIB) $(RESLIB)
- 
- installbin:
--	install -m 0755 -d ${BASEDIR}/sbin
--	install -m 0755 -d ${BASEDIR}/bin
--	install -m 0755 arp        ${BASEDIR}/sbin
--	install -m 0755 hostname   ${BASEDIR}/bin
--	install -m 0755 ifconfig   ${BASEDIR}/sbin
--	install -m 0755 nameif     ${BASEDIR}/sbin
--	install -m 0755 netstat    ${BASEDIR}/bin
--	install -m 0755 plipconfig $(BASEDIR)/sbin
--	install -m 0755 rarp       ${BASEDIR}/sbin
--	install -m 0755 route      ${BASEDIR}/sbin
--	install -m 0755 slattach   $(BASEDIR)/sbin
-+	@echo
-+	@echo "######################################################"
-+	@echo "Notice: ifconfig and route are now installed into /bin"
-+	@echo "######################################################"
-+	@echo
-+	install -m 0755 -d ${BASEDIR}${SBINDIR}
-+	install -m 0755 -d ${BASEDIR}${BINDIR}
-+	install -m 0755 arp        ${BASEDIR}${SBINDIR}
-+	install -m 0755 hostname   ${BASEDIR}${BINDIR}
-+	install -m 0755 ifconfig   ${BASEDIR}${BINDIR}
-+	install -m 0755 nameif     ${BASEDIR}${SBINDIR}
-+	install -m 0755 netstat    ${BASEDIR}${BINDIR}
-+	install -m 0755 plipconfig $(BASEDIR)${SBINDIR}
-+	install -m 0755 rarp       ${BASEDIR}${SBINDIR}
-+	install -m 0755 route      ${BASEDIR}${BINDIR}
-+	install -m 0755 slattach   $(BASEDIR)${SBINDIR}
- ifeq ($(HAVE_IP_TOOLS),1)
--	install -m 0755 ipmaddr    $(BASEDIR)/sbin
--	install -m 0755 iptunnel   $(BASEDIR)/sbin
-+	install -m 0755 ipmaddr    $(BASEDIR)${SBINDIR}
-+	install -m 0755 iptunnel   $(BASEDIR)${SBINDIR}
- endif
- ifeq ($(HAVE_MII),1)
--	install -m 0755 mii-tool   $(BASEDIR)/sbin
-+	install -m 0755 mii-tool   $(BASEDIR)${SBINDIR}
- endif
--	ln -fs hostname $(BASEDIR)/bin/dnsdomainname
--	ln -fs hostname $(BASEDIR)/bin/ypdomainname
--	ln -fs hostname $(BASEDIR)/bin/nisdomainname
--	ln -fs hostname $(BASEDIR)/bin/domainname
-+	ln -fs hostname $(BASEDIR)${BINDIR}/dnsdomainname
-+	ln -fs hostname $(BASEDIR)${BINDIR}/ypdomainname
-+	ln -fs hostname $(BASEDIR)${BINDIR}/nisdomainname
-+	ln -fs hostname $(BASEDIR)${BINDIR}/domainname
- ifeq ($(HAVE_AFDECnet),1)
--	ln -fs hostname $(BASEDIR)/bin/nodename
-+	ln -fs hostname $(BASEDIR)${BINDIR}/nodename
- endif
- 
- savebin:
--	@for i in ${BASEDIR}/sbin/arp ${BASEDIR}/sbin/ifconfig \
--                 ${BASEDIR}/bin/netstat \
--		 ${BASEDIR}/sbin/rarp ${BASEDIR}/sbin/route \
--		 ${BASEDIR}/bin/hostname ${BASEDIR}/bin/ypdomainname \
--                 ${BASEDIR}/bin/dnsdomainname ${BASEDIR}/bin/nisdomainname \
--		 ${BASEDIR}/bin/domainname ; do \
-+	@for i in ${BASEDIR}${SBINDIR}/arp ${BASEDIR}${SBINDIR}/ifconfig \
-+                 ${BASEDIR}${BINDIR}/netstat \
-+		 ${BASEDIR}${SBINDIR}/rarp ${BASEDIR}${SBINDIR}/route \
-+		 ${BASEDIR}${BINDIR}/hostname ${BASEDIR}${BINDIR}/ypdomainname \
-+                 ${BASEDIR}${BINDIR}/dnsdomainname ${BASEDIR}${BINDIR}/nisdomainname \
-+		 ${BASEDIR}${BINDIR}/domainname ; do \
- 		 [ -f $$i ] && cp -f $$i $$i.old ; done ; echo Saved.
- 
- installdata:
-diff --git a/README b/README
-index 4e35868..aa6cc9a 100644
---- a/README
-+++ b/README
-@@ -10,29 +10,35 @@ This package includes the important tools for controlling the network
- subsystem of the Linux kernel.  This includes arp, hostname, ifconfig,
- netstat, rarp and route.  Additionally, this package contains
- utilities relating to particular network hardware types (plipconfig,
--slattach) and advanced aspects of IP configuration (iptunnel,
-+slattach, mii-tool) and advanced aspects of IP configuration (iptunnel,
- ipmaddr).
- 
- Please include the output of "program --version" when reporting bugs.
- 
- 
- Contents:
--  
-+
-    README		This file.
- 
-    README.ipv6		Notes for people hacking IPv6.
- 
-    INSTALLING		Installation instructions.
- 
--   COPYING		Your free copy of the GNU Public License.
-+   COPYING		Your free copy of the GNU General Public License.
- 
-    TODO			Some things that need to be done.
- 
-+The  Homepage (including Git repository, release downloads, bug tracker and
-+mailing list) is hosted by SourceForge.net. Please consider to
-+join the project if you want to contribute:
-+
-+           https://sourceforge.net/projects/net-tools/
-+
- 
-                           Notes
-                           -----
- 
--This is net-tools 1.60.
-+This is net-tools 1.6x.
- 
- You need kernel 2.0 or later to use these programs.  These programs
- should compile cleanly with both glibc (version 2.0 or 2.1) and libc5,
-@@ -59,6 +65,8 @@ all common environments but some of the more esoteric hardware and
- protocol families may be more touchy.  Feel free to send patches if
- you have problems.
- 
-+For this release, the localized man pages are installed with UTF-8 encoding.
-+
- Phil Blundell
- philb@gnu.org
- 
-diff --git a/RPM/net-tools.spec b/RPM/net-tools.spec
-index 86b45db..b12f785 100644
---- a/RPM/net-tools.spec
-+++ b/RPM/net-tools.spec
-@@ -34,7 +34,7 @@ make BASEDIR=$RPM_BUILD_ROOT install
-   strip arp ifconfig rarp route slattach plipconfig ipmaddr iptunnel
-   cd ../bin
-   strip hostname netstat
--) 
-+)
- 
- %clean
- rm -rf $RPM_BUILD_ROOT
-@@ -92,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
- * Fri Feb 27 1998 Jason Spangler <jasons@usemail.com>
- - changed to net-tools 1.432
- - removed old glibc 2.1 patch
-- 
-+
- * Wed Oct 22 1997 Erik Troan <ewt@redhat.com>
- - added extra patches for glibc 2.1
- 
-diff --git a/TODO b/TODO
-index ec6aae8..c8a10dc 100644
---- a/TODO
-+++ b/TODO
-@@ -23,7 +23,7 @@ TODO for net-tools
- [ ] supply some informations about new features to HOWTOs
- [ ] Config file only works with bash not ash.
- [ ] Token ring is almost totally untested.
--[ ] additional tools for IPX, AX.25 etc be bundled [ipxripd004, ipx_* tools 
-+[ ] additional tools for IPX, AX.25 etc be bundled [ipxripd004, ipx_* tools
- 	from caldera, axattach] into existing bins
- [ ] "SIOCAX25OPTRT" [Joerg (DL1BKE)]. 1.3.75
- [ ] dummy NOARP?! (2. default route for preveting hostunreachables on linedrop)
-diff --git a/arp.c b/arp.c
-index 509a804..5db71a7 100644
---- a/arp.c
-+++ b/arp.c
-@@ -8,7 +8,7 @@
-  *              NET-3 Networking Distribution for the LINUX operating
-  *              system.
-  *
-- * Version:     $Id: arp.c,v 1.20 2001/04/08 17:05:05 pb Exp $
-+ * Version:     $Id: arp.c,v 1.27 2009/09/06 22:50:11 vapier Exp $
-  *
-  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
-  *
-@@ -20,14 +20,14 @@
-  *              Andrew Tridgell :       proxy arp netmasks
-  *              Bernd Eckenfels :       -n option
-  *              Bernd Eckenfels :       Use only /proc for display
-- *       {1.60} Bernd Eckenfels :       new arpcode (-i) for 1.3.42 but works 
-+ *       {1.60} Bernd Eckenfels :       new arpcode (-i) for 1.3.42 but works
-  *                                      with 1.2.x, too
-  *       {1.61} Bernd Eckenfels :       more verbose messages
-  *       {1.62} Bernd Eckenfels :       check -t for hw adresses and try to
-  *                                      explain EINVAL (jeff)
-  *970125 {1.63} Bernd Eckenfels :       -a print hardwarename instead of tiltle
-  *970201 {1.64} Bernd Eckenfels :       net-features.h support
-- *970203 {1.65} Bernd Eckenfels :       "#define" in "#if", 
-+ *970203 {1.65} Bernd Eckenfels :       "#define" in "#if",
-  *                                      -H|-A additional to -t|-p
-  *970214 {1.66} Bernd Eckenfels :       Fix optarg required for -H and -A
-  *970412 {1.67} Bernd Eckenfels :       device=""; is default
-@@ -35,7 +35,7 @@
-  *970517 {1.69} Bernd Eckenfels :       usage() fixed
-  *970622 {1.70} Bernd Eckenfels :       arp -d priv
-  *970106 {1.80} Bernd Eckenfels :       new syntax without -D and with "dev <If>",
-- *                                      ATF_MAGIC, ATF_DONTPUB support. 
-+ *                                      ATF_MAGIC, ATF_DONTPUB support.
-  *                                      Typo fix (Debian Bug#5728 Giuliano Procida)
-  *970803 {1.81} Bernd Eckenfels :       removed junk comment line 1
-  *970925 {1.82} Bernd Eckenfels :       include fix for libc6
-@@ -80,7 +80,7 @@
- #define FEATURE_ARP
- #include "lib/net-features.h"
- 
--char *Release = RELEASE, *Version = "arp 1.88 (2001-04-04)";
-+static char *Release = RELEASE;
- 
- int opt_n = 0;			/* do not resolve addresses     */
- int opt_N = 0;			/* use symbolic names           */
-@@ -100,9 +100,10 @@ static int arp_del(char **args)
- {
-     char host[128];
-     struct arpreq req;
--    struct sockaddr sa;
-+    struct sockaddr_storage ss;
-+    struct sockaddr *sa;
-     int flags = 0;
--    int err;
-+    int deleted = 0;
- 
-     memset((char *) &req, 0, sizeof(req));
- 
-@@ -112,12 +113,13 @@ static int arp_del(char **args)
- 	return (-1);
-     }
-     safe_strncpy(host, *args, (sizeof host));
--    if (ap->input(0, host, &sa) < 0) {
-+    sa = (struct sockaddr *)&ss;
-+    if (ap->input(0, host, sa) < 0) {
- 	ap->herror(host);
- 	return (-1);
-     }
-     /* If a host has more than one address, use the correct one! */
--    memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr));
-+    memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr));
- 
-     if (hw_set)
- 	req.arp_ha.sa_family = hw->type;
-@@ -148,7 +150,7 @@ static int arp_del(char **args)
- 	    continue;
- 	}
- 	if (!strcmp(*args, "dontpub")) {
--#ifdef HAVE_ATF_DONTPUB
-+#ifdef ATF_DONTPUB
- 	    req.arp_flags |= ATF_DONTPUB;
- #else
- 	    ENOSUPP("arp", "ATF_DONTPUB");
-@@ -157,7 +159,7 @@ static int arp_del(char **args)
- 	    continue;
- 	}
- 	if (!strcmp(*args, "auto")) {
--#ifdef HAVE_ATF_MAGIC
-+#ifdef ATF_MAGIC
- 	    req.arp_flags |= ATF_MAGIC;
- #else
- 	    ENOSUPP("arp", "ATF_MAGIC");
-@@ -176,12 +178,12 @@ static int arp_del(char **args)
- 	    if (*++args == NULL)
- 		usage();
- 	    if (strcmp(*args, "255.255.255.255") != 0) {
--		strcpy(host, *args);
--		if (ap->input(0, host, &sa) < 0) {
-+		safe_strncpy(host, *args, (sizeof host));
-+		if (ap->input(0, host, sa) < 0) {
- 		    ap->herror(host);
- 		    return (-1);
- 		}
--		memcpy((char *) &req.arp_netmask, (char *) &sa,
-+		memcpy((char *) &req.arp_netmask, (char *) sa,
- 		       sizeof(struct sockaddr));
- 		req.arp_flags |= ATF_NETMASK;
- 	    }
-@@ -190,35 +192,41 @@ static int arp_del(char **args)
- 	}
- 	usage();
-     }
-+
-+    // if neighter priv nor pub is given, work on both
-     if (flags == 0)
- 	flags = 3;
- 
--    strcpy(req.arp_dev, device);
-+    safe_strncpy(req.arp_dev, device, sizeof(req.arp_dev));
- 
--    err = -1;
-+    /* unfortuatelly the kernel interface does not allow us to
-+       delete private entries anlone, so we need this hack
-+       to avoid "not found" errors if we try both. */
-+    deleted = 0;
- 
-     /* Call the kernel. */
-     if (flags & 2) {
- 	if (opt_v)
--	    fprintf(stderr, "arp: SIOCDARP(nopub)\n");
--	if ((err = ioctl(sockfd, SIOCDARP, &req) < 0)) {
--	    if (errno == ENXIO) {
-+	    fprintf(stderr, "arp: SIOCDARP(dontpub)\n");
-+	if (ioctl(sockfd, SIOCDARP, &req) < 0) {
-+	    if ((errno == ENXIO) || (errno == ENOENT)) {
- 		if (flags & 1)
--		    goto nopub;
-+		    goto dontpub;
- 		printf(_("No ARP entry for %s\n"), host);
- 		return (-1);
- 	    }
--	    perror("SIOCDARP(priv)");
-+	    perror("SIOCDARP(dontpub)");
- 	    return (-1);
--	}
-+	} else
-+	  deleted = 1;
-     }
--    if ((flags & 1) && (err)) {
--      nopub:
-+    if (!deleted && (flags & 1)) {
-+      dontpub:
- 	req.arp_flags |= ATF_PUBL;
- 	if (opt_v)
- 	    fprintf(stderr, "arp: SIOCDARP(pub)\n");
- 	if (ioctl(sockfd, SIOCDARP, &req) < 0) {
--	    if (errno == ENXIO) {
-+	    if ((errno == ENXIO) || (errno == ENOENT)) {
- 		printf(_("No ARP entry for %s\n"), host);
- 		return (-1);
- 	    }
-@@ -235,7 +243,7 @@ static int arp_getdevhw(char *ifname, struct sockaddr *sa, struct hwtype *hw)
-     struct ifreq ifr;
-     struct hwtype *xhw;
- 
--    strcpy(ifr.ifr_name, ifname);
-+    safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-     if (ioctl(sockfd, SIOCGIFHWADDR, &ifr) < 0) {
- 	fprintf(stderr, _("arp: cant get HW-Address for `%s': %s.\n"), ifname, strerror(errno));
- 	return (-1);
-@@ -260,7 +268,8 @@ static int arp_set(char **args)
- {
-     char host[128];
-     struct arpreq req;
--    struct sockaddr sa;
-+    struct sockaddr_storage ss;
-+    struct sockaddr *sa;
-     int flags;
- 
-     memset((char *) &req, 0, sizeof(req));
-@@ -271,12 +280,13 @@ static int arp_set(char **args)
- 	return (-1);
-     }
-     safe_strncpy(host, *args++, (sizeof host));
--    if (ap->input(0, host, &sa) < 0) {
-+    sa = (struct sockaddr *)&ss;
-+    if (ap->input(0, host, sa) < 0) {
- 	ap->herror(host);
- 	return (-1);
-     }
-     /* If a host has more than one address, use the correct one! */
--    memcpy((char *) &req.arp_pa, (char *) &sa, sizeof(struct sockaddr));
-+    memcpy((char *) &req.arp_pa, (char *) sa, sizeof(struct sockaddr));
- 
-     /* Fetch the hardware address. */
-     if (*args == NULL) {
-@@ -317,7 +327,7 @@ static int arp_set(char **args)
- 	    continue;
- 	}
- 	if (!strcmp(*args, "dontpub")) {
--#ifdef HAVE_ATF_DONTPUB
-+#ifdef ATF_DONTPUB
- 	    flags |= ATF_DONTPUB;
- #else
- 	    ENOSUPP("arp", "ATF_DONTPUB");
-@@ -326,7 +336,7 @@ static int arp_set(char **args)
- 	    continue;
- 	}
- 	if (!strcmp(*args, "auto")) {
--#ifdef HAVE_ATF_MAGIC
-+#ifdef ATF_MAGIC
- 	    flags |= ATF_MAGIC;
- #else
- 	    ENOSUPP("arp", "ATF_MAGIC");
-@@ -345,12 +355,12 @@ static int arp_set(char **args)
- 	    if (*++args == NULL)
- 		usage();
- 	    if (strcmp(*args, "255.255.255.255") != 0) {
--		strcpy(host, *args);
--		if (ap->input(0, host, &sa) < 0) {
-+		safe_strncpy(host, *args, (sizeof host));
-+		if (ap->input(0, host, sa) < 0) {
- 		    ap->herror(host);
- 		    return (-1);
- 		}
--		memcpy((char *) &req.arp_netmask, (char *) &sa,
-+		memcpy((char *) &req.arp_netmask, (char *) sa,
- 		       sizeof(struct sockaddr));
- 		flags |= ATF_NETMASK;
- 	    }
-@@ -363,7 +373,7 @@ static int arp_set(char **args)
-     /* Fill in the remainder of the request. */
-     req.arp_flags = flags;
- 
--    strcpy(req.arp_dev, device);
-+    safe_strncpy(req.arp_dev, device, sizeof(req.arp_dev));
- 
-     /* Call the kernel. */
-     if (opt_v)
-@@ -424,7 +434,7 @@ static int arp_file(char *name)
- 
- 
- /* Print the contents of an ARP request block. */
--static void arp_disp_2(char *name, int type, int arp_flags, char *hwa, char *mask, char *dev)
-+static void arp_disp_2(const char *name, int type, int arp_flags, const char *hwa, const char *mask, const char *dev)
- {
-     static int title = 0;
-     struct hwtype *xhw;
-@@ -445,11 +455,11 @@ static void arp_disp_2(char *name, int type, int arp_flags, char *hwa, char *mas
- 	strcat(flags, "M");
-     if (arp_flags & ATF_PUBL)
- 	strcat(flags, "P");
--#ifdef HAVE_ATF_MAGIC
-+#ifdef ATF_MAGIC
-     if (arp_flags & ATF_MAGIC)
- 	strcat(flags, "A");
- #endif
--#ifdef HAVE_ATF_DONTPUB
-+#ifdef ATF_DONTPUB
-     if (arp_flags & ATF_DONTPUB)
- 	strcat(flags, "!");
- #endif
-@@ -463,7 +473,7 @@ static void arp_disp_2(char *name, int type, int arp_flags, char *hwa, char *mas
- 
-     if (!(arp_flags & ATF_COM)) {
- 	if (arp_flags & ATF_PUBL)
--	    printf("%-8.8s%-20.20s", "*", "*");
-+	    printf("%-8.8s%-20.20s", "*", _("<from_interface>"));
- 	else
- 	    printf("%-8.8s%-20.20s", "", _("(incomplete)"));
-     } else {
-@@ -474,7 +484,7 @@ static void arp_disp_2(char *name, int type, int arp_flags, char *hwa, char *mas
- }
- 
- /* Print the contents of an ARP request block. */
--static void arp_disp(char *name, char *ip, int type, int arp_flags, char *hwa, char *mask, char *dev)
-+static void arp_disp(const char *name, const char *ip, int type, int arp_flags, const char *hwa, const char *mask, const char *dev)
- {
-     struct hwtype *xhw;
- 
-@@ -486,7 +496,7 @@ static void arp_disp(char *name, char *ip, int type, int arp_flags, char *hwa, c
- 
-     if (!(arp_flags & ATF_COM)) {
- 	if (arp_flags & ATF_PUBL)
--	    printf("* ");
-+	    printf("<from_interface> ");
- 	else
- 	    printf(_("<incomplete> "));
-     } else {
-@@ -499,12 +509,12 @@ static void arp_disp(char *name, char *ip, int type, int arp_flags, char *hwa, c
-     if (arp_flags & ATF_PERM)
- 	printf("PERM ");
-     if (arp_flags & ATF_PUBL)
--	printf("PUP ");
--#ifdef HAVE_ATF_MAGIC
-+	printf("PUB ");
-+#ifdef ATF_MAGIC
-     if (arp_flags & ATF_MAGIC)
- 	printf("AUTO ");
- #endif
--#ifdef HAVE_ATF_DONTPUB
-+#ifdef ATF_DONTPUB
-     if (arp_flags & ATF_DONTPUB)
- 	printf("DONTPUB ");
- #endif
-@@ -519,7 +529,8 @@ static void arp_disp(char *name, char *ip, int type, int arp_flags, char *hwa, c
- static int arp_show(char *name)
- {
-     char host[100];
--    struct sockaddr sa;
-+    struct sockaddr_storage ss;
-+    struct sockaddr *sa;
-     char ip[100];
-     char hwa[100];
-     char mask[100];
-@@ -527,19 +538,20 @@ static int arp_show(char *name)
-     char dev[100];
-     int type, flags;
-     FILE *fp;
--    char *hostname;
-+    const char *hostname;
-     int num, entries = 0, showed = 0;
- 
-     host[0] = '\0';
- 
-+    sa = (struct sockaddr *)&ss;
-     if (name != NULL) {
- 	/* Resolve the host name. */
- 	safe_strncpy(host, name, (sizeof host));
--	if (ap->input(0, host, &sa) < 0) {
-+	if (ap->input(0, host, sa) < 0) {
- 	    ap->herror(host);
- 	    return (-1);
- 	}
--	safe_strncpy(host, ap->sprint(&sa, 1), sizeof(host));
-+	safe_strncpy(host, ap->sprint(sa, 1), sizeof(host));
-     }
-     /* Open the PROCps kernel table. */
-     if ((fp = fopen(_PATH_PROCNET_ARP, "r")) == NULL) {
-@@ -548,11 +560,11 @@ static int arp_show(char *name)
-     }
-     /* Bypass header -- read until newline */
-     if (fgets(line, sizeof(line), fp) != (char *) NULL) {
--	strcpy(mask, "-");
--	strcpy(dev, "-");
-+	safe_strncpy(mask, "-", sizeof(mask));
-+	safe_strncpy(dev, "-", sizeof(dev));
- 	/* Read the ARP cache entries. */
- 	for (; fgets(line, sizeof(line), fp);) {
--	    num = sscanf(line, "%s 0x%x 0x%x %100s %100s %100s\n",
-+	    num = sscanf(line, "%s 0x%x 0x%x %99s %99s %99s\n",
- 			 ip, &type, &flags, hwa, mask, dev);
- 	    if (num < 4)
- 		break;
-@@ -575,10 +587,10 @@ static int arp_show(char *name)
- 	    if (opt_n)
- 		hostname = "?";
- 	    else {
--		if (ap->input(0, ip, &sa) < 0)
-+		if (ap->input(0, ip, sa) < 0)
- 		    hostname = ip;
- 		else
--		    hostname = ap->sprint(&sa, opt_n | 0x8000);
-+		    hostname = ap->sprint(sa, opt_n | 0x8000);
- 		if (strcmp(hostname, ip) == 0)
- 		    hostname = "?";
- 	    }
-@@ -605,20 +617,20 @@ static int arp_show(char *name)
- 
- static void version(void)
- {
--    fprintf(stderr, "%s\n%s\n%s\n", Release, Version, Features);
-+    fprintf(stderr, "%s\n%s\n", Release, Features);
-     exit(E_VERSION);
- }
- 
- static void usage(void)
- {
-     fprintf(stderr, _("Usage:\n  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP cache\n"));
--    fprintf(stderr, _("  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP entry\n"));
--    fprintf(stderr, _("  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from file\n"));
--    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add entry\n"));
--    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  <-''-\n"));
--    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      <-''-\n\n"));
--    
-+    fprintf(stderr, _("  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP entry\n"));
-+    fprintf(stderr, _("  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from file\n"));
-+    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add entry\n"));
-+    fprintf(stderr, _("  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          <-''-\n\n"));
-+
-     fprintf(stderr, _("        -a                       display (all) hosts in alternative (BSD) style\n"));
-+    fprintf(stderr, _("        -e                       display (all) hosts in default (Linux) style\n"));
-     fprintf(stderr, _("        -s, --set                set a new ARP entry\n"));
-     fprintf(stderr, _("        -d, --delete             delete a specified entry\n"));
-     fprintf(stderr, _("        -v, --verbose            be verbose\n"));
-diff --git a/config.in b/config.in
-index f3310d6..e080937 100644
---- a/config.in
-+++ b/config.in
-@@ -1,5 +1,5 @@
- #
--# config.in	Configure.sh source for the net-tools.
-+# config.in	configure.sh source for the net-tools.
- #		This file contains the definition of what the support
- #		library contains.  Most of all, it defines which types
- #		of address families and hardware we know of.
-@@ -46,19 +46,20 @@ bool 'Does your system support GNU gettext?' I18N n
- *
- *
- *             Protocol Families.
--* 
-+*
- bool 'UNIX protocol family' HAVE_AFUNIX y
- bool 'INET (TCP/IP) protocol family' HAVE_AFINET y
--bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 n
-+bool 'INET6 (IPv6) protocol family' HAVE_AFINET6 y
- bool 'Novell IPX/SPX protocol family' HAVE_AFIPX y
- bool 'Appletalk DDP protocol family' HAVE_AFATALK y
- bool 'AX25 (packet radio) protocol family' HAVE_AFAX25 y
- bool 'NET/ROM (packet radio) protocol family' HAVE_AFNETROM y
--bool 'Rose (packet radio) protocol family' HAVE_AFROSE n
-+bool 'Rose (packet radio) protocol family' HAVE_AFROSE y
- bool 'X.25 (CCITT) protocol family' HAVE_AFX25 y
--bool 'Econet protocol family' HAVE_AFECONET n
-+bool 'Econet protocol family' HAVE_AFECONET y
- bool 'DECnet protocol family' HAVE_AFDECnet n
--bool 'Ash protocol family' HAVE_AFASH n
-+bool 'Ash protocol family' HAVE_AFASH y
-+bool 'Bluetooth protocol family' HAVE_AFBLUETOOTH n
- *
- *
- *            Device Hardware types.
-@@ -68,24 +69,27 @@ bool 'ARCnet support' HAVE_HWARC y
- bool 'SLIP (serial line) support' HAVE_HWSLIP y
- bool 'PPP (serial line) support' HAVE_HWPPP y
- bool 'IPIP Tunnel support' HAVE_HWTUNNEL y
--bool 'STRIP (Metricom radio) support' HAVE_HWSTRIP y
--bool 'Token ring (generic) support' HAVE_HWTR y
-+bool 'STRIP (Metricom radio) support' HAVE_HWSTRIP n
-+bool 'Token ring (generic) support' HAVE_HWTR n
- bool 'AX25 (packet radio) support' HAVE_HWAX25 y
--bool 'Rose (packet radio) support' HAVE_HWROSE n
-+bool 'Rose (packet radio) support' HAVE_HWROSE y
- bool 'NET/ROM (packet radio) support' HAVE_HWNETROM y
- bool 'X.25 (generic) support' HAVE_HWX25 y
- bool 'DLCI/FRAD (frame relay) support' HAVE_HWFR y
--bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT n
--bool 'FDDI (generic) support' HAVE_HWFDDI n
--bool 'HIPPI (generic) support' HAVE_HWHIPPI n
--bool 'Ash hardware support' HAVE_HWASH n
--bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB n
-+bool 'SIT (IPv6-in-IPv4) support' HAVE_HWSIT y
-+bool 'FDDI (generic) support' HAVE_HWFDDI y
-+bool 'HIPPI (generic) support' HAVE_HWHIPPI y
-+bool 'Ash hardware support' HAVE_HWASH y
-+bool '(Cisco)-HDLC/LAPB support' HAVE_HWHDLCLAPB y
- bool 'IrDA support' HAVE_HWIRDA y
--bool 'Econet hardware support' HAVE_HWEC n
-+bool 'Econet hardware support' HAVE_HWEC y
-+bool 'Generic EUI-64 hardware support' HAVE_HWEUI64 y
-+bool 'InfiniBand hardware support' HAVE_HWIB y
- *
- *
- *           Other Features.
- *
--bool 'IP Masquerading support' HAVE_FW_MASQUERADE n
--bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS n
--bool 'Build mii-tool' HAVE_MII n
-+bool 'IP Masquerading support' HAVE_FW_MASQUERADE y
-+bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y
-+bool 'Build mii-tool' HAVE_MII y
-+bool 'SELinux support' HAVE_SELINUX n
-diff --git a/configure.sh b/configure.sh
-index 9859b59..64b594f 100755
---- a/configure.sh
-+++ b/configure.sh
-@@ -1,6 +1,6 @@
- #!/usr/bin/env bash
- #
--# Configure.sh	Generates interactively a config.h from config.in
-+# configure.sh	Generates interactively a config.h from config.in
- #
- # net-tools	A collection of programs that form the base set of the
- #		NET-3 Networking Distribution for the LINUX operating
-@@ -37,7 +37,15 @@ CONFIG=config.h
- MAKECONFIG=config.make
- 
- 
--[ -z "$BASH" ] && { echo "Configure requires bash" 1>&2; exit 1; }
-+[ -z "$BASH" ] && { echo "configure.sh requires bash" 1>&2; exit 1; }
-+
-+cat <<EOF
-+
-+######################################################
-+Notice: ifconfig and route are now installed into /bin
-+######################################################
-+
-+EOF
- 
- # Disable filename globbing once and for all.
- # Enable function cacheing.
-@@ -106,7 +114,7 @@ function int()
- }
- 
-   #
--  # Make sure we start out with a clean slate.
-+  # Make sure we start out with a clean state.
-   #
-   > config.new
-   > ${CONFIG}
-diff --git a/hostname.c b/hostname.c
-index 8793fb9..ae98ca6 100644
---- a/hostname.c
-+++ b/hostname.c
-@@ -6,23 +6,22 @@
-  * Usage:       hostname [-d|-f|-s|-a|-i|-y|-n]
-  *              hostname [-h|-V]
-  *              hostname {name|-F file}
-- *              dnsdmoainname   
-+ *              dnsdmoainname
-  *              nisdomainname {name|-F file}
-  *
-- * Version:     hostname 1.96 (1996-02-18)
-+ * Version:     hostname 1.101 (2003-10-11)
-  *
-  * Author:      Peter Tobias <tobias@et-inf.fho-emden.de>
-  *
-  * Changes:
-- *      {1.90}  Peter Tobias :          Added -a and -i options.
-- *      {1.91}  Bernd Eckenfels :       -v,-V rewritten, long_opts 
-- *                                      (major rewrite), usage.
-- *960120 {1.95} Bernd Eckenfels :       -y/nisdomainname - support for get/
-- *                                      setdomainname added 
-- *960218 {1.96} Bernd Eckenfels :       netinet/in.h added
-- *980629 {1.97} Arnaldo Carvalho de Melo : gettext instead of catgets for i18n
-- *20000213 {1.99} Arnaldo Carvalho de Melo : fixed some i18n strings
-+ *         {1.90}  Peter Tobias : Added -a and -i options.
-+ *         {1.91}  Bernd Eckenfels : -v,-V rewritten, long_opts (major rewrite), usage.
-+ *19960120 {1.95}  Bernd Eckenfels : -y/nisdomainname - support for get/setdomainname added
-+ *19960218 {1.96}  Bernd Eckenfels : netinet/in.h added
-+ *19980629 {1.97}  Arnaldo Carvalho de Melo : gettext instead of catgets for i18n
-+ *20000213 {1.99}  Arnaldo Carvalho de Melo : fixed some i18n strings
-  *20010404 {1.100} Arnaldo Carvalho de Melo: use setlocale
-+ *20031011 {1.101} Maik Broemme: gcc 3.x fixes (default: break)
-  *
-  *              This program is free software; you can redistribute it
-  *              and/or  modify it under  the terms of  the GNU General
-@@ -31,7 +30,9 @@
-  *              your option) any later version.
-  */
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
-+#include <stdlib.h>
- #include <getopt.h>
- #include <string.h>
- #include <netdb.h>
-@@ -41,13 +42,19 @@
- #include <arpa/inet.h>
- #include "config.h"
- #include "version.h"
-+#include "net-support.h"
- #include "../intl.h"
- 
-+#if HAVE_AFINET6
-+#include <sys/socket.h> /* for PF_INET6 */
-+#include <sys/types.h>  /* for inet_ntop */
-+#endif
-+
- #if HAVE_AFDECnet
- #include <netdnet/dn.h>
- #endif
- 
--char *Release = RELEASE, *Version = "hostname 1.100 (2001-04-14)";
-+static char *Release = RELEASE;
- 
- static char *program_name;
- static int opt_v;
-@@ -72,12 +79,13 @@ static void setnname(char *nname)
-     if (setnodename(nname, strlen(nname))) {
-         switch(errno) {
-         case EPERM:
--            fprintf(stderr, _("%s: you must be root to change the node name\n"), program_name);
-+            fprintf(stderr, _("%s: you don't have permission to set the node name\n"), program_name);
-             break;
-         case EINVAL:
-             fprintf(stderr, _("%s: name too long\n"), program_name);
-             break;
-         default:
-+	    break;
-         }
- 	exit(1);
-     }
-@@ -92,12 +100,11 @@ static void sethname(char *hname)
-     if (sethostname(hname, strlen(hname))) {
- 	switch (errno) {
- 	case EPERM:
--	    fprintf(stderr, _("%s: you must be root to change the host name\n"), program_name);
-+	    fprintf(stderr, _("%s: you don't have permission to set the host name\n"), program_name);
- 	    break;
- 	case EINVAL:
- 	    fprintf(stderr, _("%s: name too long\n"), program_name);
- 	    break;
--	default:
- 	}
- 	exit(1);
-     };
-@@ -111,12 +118,11 @@ static void setdname(char *dname)
-     if (setdomainname(dname, strlen(dname))) {
- 	switch (errno) {
- 	case EPERM:
--	    fprintf(stderr, _("%s: you must be root to change the domain name\n"), program_name);
-+	    fprintf(stderr, _("%s: you don't have permission to set the domain name\n"), program_name);
- 	    break;
- 	case EINVAL:
- 	    fprintf(stderr, _("%s: name too long\n"), program_name);
- 	    break;
--	default:
- 	}
- 	exit(1);
-     };
-@@ -125,15 +131,23 @@ static void setdname(char *dname)
- static void showhname(char *hname, int c)
- {
-     struct hostent *hp;
-+#if HAVE_AFINET6
-+    struct in6_addr **ip6;
-+#endif
-     register char *p, **alias;
-     struct in_addr **ip;
- 
-     if (opt_v)
- 	fprintf(stderr, _("Resolving `%s' ...\n"), hname);
--    if (!(hp = gethostbyname(hname))) {
-+    if (
-+#if HAVE_AFINET6
-+        !(hp = gethostbyname2(hname, PF_INET6)) &&
-+#endif
-+        !(hp = gethostbyname(hname))) {
- 	herror(program_name);
- 	exit(1);
-     }
-+
-     if (opt_v) {
- 	fprintf(stderr, _("Result: h_name=`%s'\n"),
- 		hp->h_name);
-@@ -142,11 +156,28 @@ static void showhname(char *hname, int c)
- 	while (alias[0])
- 	    fprintf(stderr, _("Result: h_aliases=`%s'\n"),
- 		    *alias++);
--
--	ip = (struct in_addr **) hp->h_addr_list;
--	while (ip[0])
--	    fprintf(stderr, _("Result: h_addr_list=`%s'\n"),
--		    inet_ntoa(**ip++));
-+#if HAVE_AFINET6
-+	    if (hp->h_addrtype == PF_INET6) {
-+		char addr[INET6_ADDRSTRLEN + 1];
-+		addr[INET6_ADDRSTRLEN] = '\0';
-+		ip6 = (struct in6_addr **) hp->h_addr_list;
-+		while (ip6[0]) {
-+		    if (inet_ntop(PF_INET6, *ip6++, addr, INET6_ADDRSTRLEN))
-+			fprintf(stderr, _("Result: h_addr_list=`%s'\n"), addr);
-+		    else if (errno == EAFNOSUPPORT)
-+			fprintf(stderr, _("%s: protocol family not supported\n"),
-+				program_name);
-+		    else if (errno == ENOSPC)
-+			fprintf(stderr, _("%s: name too long\n"), program_name);
-+	    }
-+	} else
-+#endif
-+	{
-+	    ip = (struct in_addr **) hp->h_addr_list;
-+	    while (ip[0])
-+		fprintf(stderr, _("Result: h_addr_list=`%s'\n"),
-+			inet_ntoa(**ip++));
-+	}
-     }
-     if (!(p = strchr(hp->h_name, '.')) && (c == 'd'))
- 	return;
-@@ -158,8 +189,29 @@ static void showhname(char *hname, int c)
- 	printf("\n");
- 	break;
-     case 'i':
--	while (hp->h_addr_list[0])
--	    printf("%s ", inet_ntoa(*(struct in_addr *) *hp->h_addr_list++));
-+#if HAVE_AFINET6
-+	if (hp->h_addrtype == PF_INET6) {
-+	    char addr[INET6_ADDRSTRLEN + 1];
-+	    addr[INET6_ADDRSTRLEN] = '\0';
-+	    while (hp->h_addr_list[0]) {
-+		if (inet_ntop(PF_INET6, (struct in6_addr *)*hp->h_addr_list++,
-+			      addr, INET6_ADDRSTRLEN)) {
-+		    printf("%s ", addr);
-+		} else if (errno == EAFNOSUPPORT) {
-+		    fprintf(stderr, _("\n%s: protocol family not supported\n"),
-+			    program_name);
-+		    exit(1);
-+		} else if (errno == ENOSPC) {
-+		    fprintf(stderr, _("\n%s: name too long\n"), program_name);
-+		    exit(1);
-+		}
-+	    }
-+	} else
-+#endif
-+	{
-+	    while (hp->h_addr_list[0])
-+		printf("%s ", inet_ntoa(*(struct in_addr *)*hp->h_addr_list++));
-+	}
- 	printf("\n");
- 	break;
-     case 'd':
-@@ -173,7 +225,6 @@ static void showhname(char *hname, int c)
- 	    *p = '\0';
- 	printf("%s\n", hp->h_name);
- 	break;
--    default:
-     }
- }
- 
-@@ -215,8 +266,8 @@ static void setfilename(char *name, int what)
- 
- static void version(void)
- {
--    fprintf(stderr, "%s\n%s\n", Release, Version);
--    exit(5); /* E_VERSION */
-+    fprintf(stderr, "%s\n", Release);
-+    exit(E_VERSION);
- }
- 
- static void usage(void)
-@@ -247,7 +298,7 @@ static void usage(void)
- "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
- "   part of the FQDN) in the /etc/hosts file.\n"));
- 
--    exit(4); /* E_USAGE */
-+    exit(E_USAGE);
- }
- 
- 
-@@ -326,11 +377,12 @@ int main(int argc, char **argv)
- 	    break;
- 	case 'V':
- 	    version();
-+	    break; // not reached
- 	case '?':
- 	case 'h':
- 	default:
- 	    usage();
--
-+	    break; // not reached
- 	};
- 
- 
-@@ -371,7 +423,10 @@ int main(int argc, char **argv)
- 	    setdname(argv[optind]);
- 	    break;
- 	}
--	getdomainname(myname, sizeof(myname));
-+	if (getdomainname(myname, sizeof(myname)) < 0) {
-+	    perror("getdomainname()");
-+	    exit(1);
-+	}
- 	if (opt_v)
- 	    fprintf(stderr, _("getdomainname()=`%s'\n"), myname);
- 	printf("%s\n", myname);
-diff --git a/ifconfig.c b/ifconfig.c
-index 73a4e9b..df9793a 100644
---- a/ifconfig.c
-+++ b/ifconfig.c
-@@ -3,7 +3,7 @@
-  *              that either displays or sets the characteristics of
-  *              one or more of the system's networking interfaces.
-  *
-- * Version:     $Id: ifconfig.c,v 1.50 2001/04/13 18:25:18 pb Exp $
-+ * Version:     $Id: ifconfig.c,v 1.59 2011-01-01 03:22:31 ecki Exp $
-  *
-  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              and others.  Copyright 1993 MicroWalt Corporation
-@@ -19,8 +19,8 @@
-  *
-  * {1.34} - 19980630 - Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-  *                     - gettext instead of catgets for i18n
-- *          10/1998  - Andi Kleen. Use interface list primitives.       
-- *	    20001008 - Bernd Eckenfels, Patch from RH for setting mtu 
-+ *          10/1998  - Andi Kleen. Use interface list primitives.
-+ *	    20001008 - Bernd Eckenfels, Patch from RH for setting mtu
-  *			(default AF was wrong)
-  *          20010404 - Arnaldo Carvalho de Melo, use setlocale
-  */
-@@ -49,7 +49,7 @@
- #include <asm/types.h>
- 
- 
--#ifdef HAVE_HWSLIP
-+#if HAVE_HWSLIP
- #include <linux/if_slip.h>
- #endif
- 
-@@ -85,19 +85,16 @@ struct in6_ifreq {
- #include "sockets.h"
- #include "util.h"
- 
--char *Release = RELEASE, *Version = "ifconfig 1.42 (2001-04-13)";
-+static char *Release = RELEASE;
- 
- int opt_a = 0;			/* show all interfaces          */
--int opt_i = 0;			/* show the statistics          */
- int opt_v = 0;			/* debugging output flag        */
- 
- int addr_family = 0;		/* currently selected AF        */
- 
- /* for ipv4 add/del modes */
--static int get_nmbc_parent(char *parent, unsigned long *nm, 
--			   unsigned long *bc);
--static int set_ifstate(char *parent, unsigned long ip,
--		       unsigned long nm, unsigned long bc,
-+static int get_nmbc_parent(char *parent, in_addr_t *nm, in_addr_t *bc);
-+static int set_ifstate(char *parent, in_addr_t ip, in_addr_t nm, in_addr_t bc,
- 		       int flag);
- 
- static int if_print(char *ifname)
-@@ -105,7 +102,7 @@ static int if_print(char *ifname)
-     int res;
- 
-     if (ife_short)
--	printf(_("Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
-+	printf(_("Iface      MTU    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
- 
-     if (!ifname) {
- 	res = for_all_interfaces(do_if_print, &opt_a);
-@@ -113,11 +110,14 @@ static int if_print(char *ifname)
- 	struct interface *ife;
- 
- 	ife = lookup_interface(ifname);
--	res = do_if_fetch(ife); 
--	if (res >= 0) 
-+	if (!ife) {
-+		return -1;
-+	}
-+	res = do_if_fetch(ife);
-+	if (res >= 0)
- 	    ife_print(ife);
-     }
--    return res; 
-+    return res;
- }
- 
- /* Set a certain interface flag. */
-@@ -127,7 +127,7 @@ static int set_flag(char *ifname, short flag)
- 
-     safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-     if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) {
--	fprintf(stderr, _("%s: unknown interface: %s\n"), 
-+	fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"),
- 		ifname,	strerror(errno));
- 	return (-1);
-     }
-@@ -159,7 +159,7 @@ static int clr_flag(char *ifname, short flag)
- 
-     safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-     if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) {
--	fprintf(stderr, _("%s: unknown interface: %s\n"), 
-+	fprintf(stderr, _("%s: ERROR while getting interface flags: %s\n"),
- 		ifname, strerror(errno));
- 	return -1;
-     }
-@@ -172,9 +172,35 @@ static int clr_flag(char *ifname, short flag)
-     return (0);
- }
- 
-+/** test is a specified flag is set */
-+static int test_flag(char *ifname, short flags)
-+{
-+    struct ifreq ifr;
-+    int fd;
-+
-+    if (strchr(ifname, ':')) {
-+        /* This is a v4 alias interface.  Downing it via a socket for
-+	   another AF may have bad consequences. */
-+        fd = get_socket_for_af(AF_INET);
-+	if (fd < 0) {
-+	    fprintf(stderr, _("No support for INET on this system.\n"));
-+	    return -1;
-+	}
-+    } else
-+        fd = skfd;
-+
-+    safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-+    if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) {
-+	fprintf(stderr, _("%s: ERROR while testing interface flags: %s\n"),
-+		ifname, strerror(errno));
-+	return -1;
-+    }
-+    return (ifr.ifr_flags & flags);
-+}
-+
- static void usage(void)
- {
--    fprintf(stderr, _("Usage:\n  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"));
-+    fprintf(stderr, _("Usage:\n  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"));
- #if HAVE_AFINET
-     fprintf(stderr, _("  [add <address>[/<prefixlen>]]\n"));
-     fprintf(stderr, _("  [del <address>[/<prefixlen>]]\n"));
-@@ -184,7 +210,7 @@ static void usage(void)
- #ifdef SIOCSKEEPALIVE
-     fprintf(stderr, _("  [outfill <NN>] [keepalive <NN>]\n"));
- #endif
--    fprintf(stderr, _("  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"));
-+    fprintf(stderr, _("  [hw <HW> <address>]  [mtu <NN>]\n"));
-     fprintf(stderr, _("  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"));
-     fprintf(stderr, _("  [multicast]  [[-]promisc]\n"));
-     fprintf(stderr, _("  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"));
-@@ -207,38 +233,39 @@ static void usage(void)
- 
- static void version(void)
- {
--    fprintf(stderr, "%s\n%s\n", Release, Version);
--    exit(0);
-+    fprintf(stderr, "%s\n", Release);
-+    exit(E_VERSION);
- }
- 
- static int set_netmask(int skfd, struct ifreq *ifr, struct sockaddr *sa)
- {
-     int err = 0;
- 
--    memcpy((char *) &ifr->ifr_netmask, (char *) sa,
--	   sizeof(struct sockaddr));
-+    memcpy(&ifr->ifr_netmask, sa, sizeof(struct sockaddr));
-     if (ioctl(skfd, SIOCSIFNETMASK, ifr) < 0) {
- 	fprintf(stderr, "SIOCSIFNETMASK: %s\n",
- 		strerror(errno));
- 	err = 1;
-     }
--    return 0;
-+    return err;
- }
- 
- int main(int argc, char **argv)
- {
--    struct sockaddr sa;
--    struct sockaddr_in sin;
-+    struct sockaddr_storage _sa, _samask;
-+    struct sockaddr *sa = (struct sockaddr *)&_sa;
-+    struct sockaddr *samask = (struct sockaddr *)&_samask;
-+    struct sockaddr_in *sin = (struct sockaddr_in *)sa;
-     char host[128];
-     struct aftype *ap;
-     struct hwtype *hw;
-     struct ifreq ifr;
--    int goterr = 0, didnetmask = 0;
-+    int goterr = 0, didnetmask = 0, neednetmask=0;
-     char **spp;
-     int fd;
- #if HAVE_AFINET6
-     extern struct aftype inet6_aftype;
--    struct sockaddr_in6 sa6;
-+    struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa;
-     struct in6_ifreq ifr6;
-     unsigned long prefix_len;
-     char *cp;
-@@ -248,7 +275,7 @@ int main(int argc, char **argv)
- #endif
- 
- #if I18N
--    setlocale (LC_ALL, "");
-+    setlocale(LC_ALL, "");
-     bindtextdomain("net-tools", "/usr/share/locale");
-     textdomain("net-tools");
- #endif
-@@ -265,7 +292,7 @@ int main(int argc, char **argv)
- 
- 	else if (!strcmp(*argv, "-v"))
- 	    opt_v = 1;
--	
-+
- 	else if (!strcmp(*argv, "-V") || !strcmp(*argv, "-version") ||
- 	    !strcmp(*argv, "--version"))
- 	    version();
-@@ -275,7 +302,7 @@ int main(int argc, char **argv)
- 	    usage();
- 
- 	else {
--	    fprintf(stderr, _("ifconfig: option `%s' not recognised.\n"), 
-+	    fprintf(stderr, _("ifconfig: option `%s' not recognised.\n"),
- 		    argv[0]);
- 	    fprintf(stderr, _("ifconfig: `--help' gives usage information.\n"));
- 	    exit(1);
-@@ -309,9 +336,9 @@ int main(int argc, char **argv)
-     /* The next argument is either an address family name, or an option. */
-     if ((ap = get_aftype(*spp)) != NULL)
- 	spp++; /* it was a AF name */
--    else 
-+    else
- 	ap = get_aftype(DFLT_AF);
--	
-+
-     if (ap) {
- 	addr_family = ap->af;
- 	skfd = ap->fd;
-@@ -356,7 +383,7 @@ int main(int argc, char **argv)
- 		    goterr = 1;
- 		} else {
- 		    if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0) {
--			perror("port: SIOCGIFMAP"); 
-+			perror("port: SIOCGIFMAP");
- 			goterr = 1;
- 			continue;
- 		    }
-@@ -388,6 +415,8 @@ int main(int argc, char **argv)
- 	}
- 	if (!strcmp(*spp, "-promisc")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_PROMISC);
-+	    if (test_flag(ifr.ifr_name, IFF_PROMISC) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in promisc mode... maybe other application is running?\n"), ifr.ifr_name);
- 	    spp++;
- 	    continue;
- 	}
-@@ -398,6 +427,8 @@ int main(int argc, char **argv)
- 	}
- 	if (!strcmp(*spp, "-multicast")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_MULTICAST);
-+	    if (test_flag(ifr.ifr_name, IFF_MULTICAST) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in MULTICAST mode.\n"), ifr.ifr_name);
- 	    spp++;
- 	    continue;
- 	}
-@@ -408,6 +439,8 @@ int main(int argc, char **argv)
- 	}
- 	if (!strcmp(*spp, "-allmulti")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_ALLMULTI);
-+	    if (test_flag(ifr.ifr_name, IFF_ALLMULTI) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in ALLMULTI mode.\n"), ifr.ifr_name);
- 	    spp++;
- 	    continue;
- 	}
-@@ -430,21 +463,12 @@ int main(int argc, char **argv)
- 	if (!strcmp(*spp, "-dynamic")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_DYNAMIC);
- 	    spp++;
-+	    if (test_flag(ifr.ifr_name, IFF_DYNAMIC) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in DYNAMIC mode.\n"), ifr.ifr_name);
- 	    continue;
- 	}
- #endif
- 
--	if (!strcmp(*spp, "metric")) {
--	    if (*++spp == NULL)
--		usage();
--	    ifr.ifr_metric = atoi(*spp);
--	    if (ioctl(skfd, SIOCSIFMETRIC, &ifr) < 0) {
--		fprintf(stderr, "SIOCSIFMETRIC: %s\n", strerror(errno));
--		goterr = 1;
--	    }
--	    spp++;
--	    continue;
--	}
- 	if (!strcmp(*spp, "mtu")) {
- 	    if (*++spp == NULL)
- 		usage();
-@@ -460,7 +484,7 @@ int main(int argc, char **argv)
- 	if (!strcmp(*spp, "keepalive")) {
- 	    if (*++spp == NULL)
- 		usage();
--	    ifr.ifr_data = (caddr_t) atoi(*spp);
-+	    ifr.ifr_data = (caddr_t) (uintptr_t) atoi(*spp);
- 	    if (ioctl(skfd, SIOCSKEEPALIVE, &ifr) < 0) {
- 		fprintf(stderr, "SIOCSKEEPALIVE: %s\n", strerror(errno));
- 		goterr = 1;
-@@ -474,7 +498,7 @@ int main(int argc, char **argv)
- 	if (!strcmp(*spp, "outfill")) {
- 	    if (*++spp == NULL)
- 		usage();
--	    ifr.ifr_data = (caddr_t) atoi(*spp);
-+	    ifr.ifr_data = (caddr_t) (uintptr_t) atoi(*spp);
- 	    if (ioctl(skfd, SIOCSOUTFILL, &ifr) < 0) {
- 		fprintf(stderr, "SIOCSOUTFILL: %s\n", strerror(errno));
- 		goterr = 1;
-@@ -486,20 +510,24 @@ int main(int argc, char **argv)
- 
- 	if (!strcmp(*spp, "-broadcast")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_BROADCAST);
-+	    if (test_flag(ifr.ifr_name, IFF_BROADCAST) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in BROADCAST mode.\n"), ifr.ifr_name);
- 	    spp++;
- 	    continue;
- 	}
- 	if (!strcmp(*spp, "broadcast")) {
- 	    if (*++spp != NULL) {
- 		safe_strncpy(host, *spp, (sizeof host));
--		if (ap->input(0, host, &sa) < 0) {
--		    ap->herror(host);
-+		if (ap->input(0, host, sa) < 0) {
-+		    if (ap->herror)
-+		    	ap->herror(host);
-+		    else
-+		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for broadcast\n"), host);
- 		    goterr = 1;
- 		    spp++;
- 		    continue;
- 		}
--		memcpy((char *) &ifr.ifr_broadaddr, (char *) &sa,
--		       sizeof(struct sockaddr));
-+		memcpy(&ifr.ifr_broadaddr, sa, sizeof(struct sockaddr));
- 		if (ioctl(ap->fd, SIOCSIFBRDADDR, &ifr) < 0) {
- 		    fprintf(stderr, "SIOCSIFBRDADDR: %s\n",
- 			    strerror(errno));
-@@ -514,14 +542,16 @@ int main(int argc, char **argv)
- 	    if (*++spp == NULL)
- 		usage();
- 	    safe_strncpy(host, *spp, (sizeof host));
--	    if (ap->input(0, host, &sa) < 0) {
--		ap->herror(host);
-+	    if (ap->input(0, host, sa) < 0) {
-+		    if (ap->herror)
-+		    	ap->herror(host);
-+		    else
-+		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for dstaddr\n"), host);
- 		goterr = 1;
- 		spp++;
- 		continue;
- 	    }
--	    memcpy((char *) &ifr.ifr_dstaddr, (char *) &sa,
--		   sizeof(struct sockaddr));
-+	    memcpy(&ifr.ifr_dstaddr, sa, sizeof(struct sockaddr));
- 	    if (ioctl(ap->fd, SIOCSIFDSTADDR, &ifr) < 0) {
- 		fprintf(stderr, "SIOCSIFDSTADDR: %s\n",
- 			strerror(errno));
-@@ -534,14 +564,17 @@ int main(int argc, char **argv)
- 	    if (*++spp == NULL || didnetmask)
- 		usage();
- 	    safe_strncpy(host, *spp, (sizeof host));
--	    if (ap->input(0, host, &sa) < 0) {
--		ap->herror(host);
-+	    if (ap->input(0, host, sa) < 0) {
-+		    if (ap->herror)
-+		    	ap->herror(host);
-+		    else
-+		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for netmask\n"), host);
- 		goterr = 1;
- 		spp++;
- 		continue;
- 	    }
- 	    didnetmask++;
--	    goterr = set_netmask(ap->fd, &ifr, &sa);
-+	    goterr |= set_netmask(ap->fd, &ifr, sa);
- 	    spp++;
- 	    continue;
- 	}
-@@ -563,8 +596,8 @@ int main(int argc, char **argv)
- 	    if (*++spp == NULL)
- 		usage();
- 	    if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0) {
--		fprintf(stderr, "mem_start: SIOCGIFMAP: %s\n", strerror(errno)); 
--		spp++; 
-+		fprintf(stderr, "mem_start: SIOCGIFMAP: %s\n", strerror(errno));
-+		spp++;
- 		goterr = 1;
- 		continue;
- 	    }
-@@ -580,8 +613,8 @@ int main(int argc, char **argv)
- 	    if (*++spp == NULL)
- 		usage();
- 	    if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0) {
--		fprintf(stderr, "io_addr: SIOCGIFMAP: %s\n", strerror(errno)); 
--		spp++; 
-+		fprintf(stderr, "io_addr: SIOCGIFMAP: %s\n", strerror(errno));
-+		spp++;
- 		goterr = 1;
- 		continue;
- 	    }
-@@ -597,9 +630,9 @@ int main(int argc, char **argv)
- 	    if (*++spp == NULL)
- 		usage();
- 	    if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0) {
--		fprintf(stderr, "irq: SIOCGIFMAP: %s\n", strerror(errno)); 
-+		fprintf(stderr, "irq: SIOCGIFMAP: %s\n", strerror(errno));
- 		goterr = 1;
--		spp++; 
-+		spp++;
- 		continue;
- 	    }
- 	    ifr.ifr_map.irq = atoi(*spp);
-@@ -613,20 +646,24 @@ int main(int argc, char **argv)
- 	if (!strcmp(*spp, "-pointopoint")) {
- 	    goterr |= clr_flag(ifr.ifr_name, IFF_POINTOPOINT);
- 	    spp++;
-+	    if (test_flag(ifr.ifr_name, IFF_POINTOPOINT) > 0)
-+	    	fprintf(stderr, _("Warning: Interface %s still in POINTOPOINT mode.\n"), ifr.ifr_name);
- 	    continue;
- 	}
- 	if (!strcmp(*spp, "pointopoint")) {
- 	    if (*(spp + 1) != NULL) {
- 		spp++;
- 		safe_strncpy(host, *spp, (sizeof host));
--		if (ap->input(0, host, &sa)) {
--		    ap->herror(host);
-+		if (ap->input(0, host, sa)) {
-+		    if (ap->herror)
-+		    	ap->herror(host);
-+		    else
-+		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for pointopoint\n"), host);
- 		    goterr = 1;
- 		    spp++;
- 		    continue;
- 		}
--		memcpy((char *) &ifr.ifr_dstaddr, (char *) &sa,
--		       sizeof(struct sockaddr));
-+		memcpy(&ifr.ifr_dstaddr, sa, sizeof(struct sockaddr));
- 		if (ioctl(ap->fd, SIOCSIFDSTADDR, &ifr) < 0) {
- 		    fprintf(stderr, "SIOCSIFDSTADDR: %s\n",
- 			    strerror(errno));
-@@ -652,17 +689,20 @@ int main(int argc, char **argv)
- 	    if (*++spp == NULL)
- 		usage();
- 	    safe_strncpy(host, *spp, (sizeof host));
--	    if (hw->input(host, &sa) < 0) {
-+	    if (hw->input(host, sa) < 0) {
- 		fprintf(stderr, _("%s: invalid %s address.\n"), host, hw->name);
- 		goterr = 1;
- 		spp++;
- 		continue;
- 	    }
--	    memcpy((char *) &ifr.ifr_hwaddr, (char *) &sa,
--		   sizeof(struct sockaddr));
-+	    memcpy(&ifr.ifr_hwaddr, sa, sizeof(struct sockaddr));
- 	    if (ioctl(skfd, SIOCSIFHWADDR, &ifr) < 0) {
--		fprintf(stderr, "SIOCSIFHWADDR: %s\n",
--			strerror(errno));
-+		if (errno == EBUSY)
-+			fprintf(stderr, "SIOCSIFHWADDR: %s - you may need to down the interface\n",
-+				strerror(errno));
-+		else
-+			fprintf(stderr, "SIOCSIFHWADDR: %s\n",
-+				strerror(errno));
- 		goterr = 1;
- 	    }
- 	    spp++;
-@@ -681,22 +721,23 @@ int main(int argc, char **argv)
- 			usage();
- 		    *cp = 0;
- 		} else {
--		    prefix_len = 0;
-+		    prefix_len = 128;
- 		}
- 		safe_strncpy(host, *spp, (sizeof host));
--		if (inet6_aftype.input(1, host, 
--				       (struct sockaddr *) &sa6) < 0) {
--		    inet6_aftype.herror(host);
-+		if (inet6_aftype.input(1, host, sa) < 0) {
-+		    if (inet6_aftype.herror)
-+		    	inet6_aftype.herror(host);
-+		    else
-+		    	fprintf(stderr, _("ifconfig: Error resolving '%s' for add\n"), host);
- 		    goterr = 1;
- 		    spp++;
- 		    continue;
- 		}
--		memcpy((char *) &ifr6.ifr6_addr, (char *) &sa6.sin6_addr,
--		       sizeof(struct in6_addr));
-+		memcpy(&ifr6.ifr6_addr, &sin6->sin6_addr, sizeof(struct in6_addr));
- 
- 		fd = get_socket_for_af(AF_INET6);
- 		if (fd < 0) {
--		    fprintf(stderr, 
-+		    fprintf(stderr,
- 			    _("No support for INET6 on this system.\n"));
- 		    goterr = 1;
- 		    spp++;
-@@ -718,11 +759,11 @@ int main(int argc, char **argv)
- 		continue;
- 	    }
- #endif
--#ifdef HAVE_AFINET
-+#if HAVE_AFINET
- 	    { /* ipv4 address a.b.c.d */
--		unsigned long ip, nm, bc;
-+		in_addr_t ip, nm, bc;
- 		safe_strncpy(host, *spp, (sizeof host));
--		if (inet_aftype.input(0, host, (struct sockaddr *)&sin) < 0) {
-+		if (inet_aftype.input(0, host, sa) < 0) {
- 		    ap->herror(host);
- 		    goterr = 1;
- 		    spp++;
-@@ -730,15 +771,15 @@ int main(int argc, char **argv)
- 		}
- 		fd = get_socket_for_af(AF_INET);
- 		if (fd < 0) {
--		    fprintf(stderr, 
-+		    fprintf(stderr,
- 			    _("No support for INET on this system.\n"));
- 		    goterr = 1;
- 		    spp++;
- 		    continue;
- 		}
- 
--		memcpy(&ip, &sin.sin_addr.s_addr, sizeof(unsigned long));
--		
-+		memcpy(&ip, &sin->sin_addr.s_addr, sizeof(ip));
-+
- 		if (get_nmbc_parent(ifr.ifr_name, &nm, &bc) < 0) {
- 			fprintf(stderr, _("Interface %s not initialized\n"),
- 				ifr.ifr_name);
-@@ -747,7 +788,7 @@ int main(int argc, char **argv)
- 			continue;
- 		}
- 		set_ifstate(ifr.ifr_name, ip, nm, bc, 1);
--		
-+
- 	    }
- 	    spp++;
- 	    continue;
-@@ -771,22 +812,21 @@ int main(int argc, char **argv)
- 			usage();
- 		    *cp = 0;
- 		} else {
--		    prefix_len = 0;
-+		    prefix_len = 128;
- 		}
- 		safe_strncpy(host, *spp, (sizeof host));
--		if (inet6_aftype.input(1, host, 
--				       (struct sockaddr *) &sa6) < 0) {
-+		if (inet6_aftype.input(1, host, sa) < 0) {
- 		    inet6_aftype.herror(host);
- 		    goterr = 1;
- 		    spp++;
- 		    continue;
- 		}
--		memcpy((char *) &ifr6.ifr6_addr, (char *) &sa6.sin6_addr,
-+		memcpy(&ifr6.ifr6_addr, &sin6->sin6_addr,
- 		       sizeof(struct in6_addr));
--		
-+
- 		fd = get_socket_for_af(AF_INET6);
- 		if (fd < 0) {
--		    fprintf(stderr, 
-+		    fprintf(stderr,
- 			    _("No support for INET6 on this system.\n"));
- 		    goterr = 1;
- 		    spp++;
-@@ -800,6 +840,8 @@ int main(int argc, char **argv)
- 		}
- 		ifr6.ifr6_ifindex = ifr.ifr_ifindex;
- 		ifr6.ifr6_prefixlen = prefix_len;
-+		if (opt_v)
-+			fprintf(stderr, "now deleting: ioctl(SIOCDIFADDR,{ifindex=%d,prefixlen=%ld})\n",ifr.ifr_ifindex,prefix_len);
- 		if (ioctl(fd, SIOCDIFADDR, &ifr6) < 0) {
- 		    fprintf(stderr, "SIOCDIFADDR: %s\n",
- 			    strerror(errno));
-@@ -809,12 +851,12 @@ int main(int argc, char **argv)
- 		continue;
- 	    }
- #endif
--#ifdef HAVE_AFINET
-+#if HAVE_AFINET
- 	    {
- 		/* ipv4 address a.b.c.d */
--		unsigned long ip, nm, bc;
-+		in_addr_t ip, nm, bc;
- 		safe_strncpy(host, *spp, (sizeof host));
--		if (inet_aftype.input(0, host, (struct sockaddr *)&sin) < 0) {
-+		if (inet_aftype.input(0, host, sa) < 0) {
- 		    ap->herror(host);
- 		    goterr = 1;
- 		    spp++;
-@@ -827,9 +869,11 @@ int main(int argc, char **argv)
- 		    spp++;
- 		    continue;
- 		}
--		
--		memcpy(&ip, &sin.sin_addr.s_addr, sizeof(unsigned long));
--		
-+
-+		/* Clear "ip" in case sizeof(unsigned long) > sizeof(sin.sin_addr.s_addr) */
-+		ip = 0;
-+		memcpy(&ip, &sin->sin_addr.s_addr, sizeof(ip));
-+
- 		if (get_nmbc_parent(ifr.ifr_name, &nm, &bc) < 0) {
- 		    fprintf(stderr, _("Interface %s not initialized\n"),
- 			    ifr.ifr_name);
-@@ -859,17 +903,16 @@ int main(int argc, char **argv)
- 		    usage();
- 		*cp = 0;
- 	    } else {
--		prefix_len = 0;
-+		prefix_len = 128;
- 	    }
- 	    safe_strncpy(host, *spp, (sizeof host));
--	    if (inet6_aftype.input(1, host, (struct sockaddr *) &sa6) < 0) {
-+	    if (inet6_aftype.input(1, host, sa) < 0) {
- 		inet6_aftype.herror(host);
- 		goterr = 1;
- 		spp++;
- 		continue;
- 	    }
--	    memcpy((char *) &ifr6.ifr6_addr, (char *) &sa6.sin6_addr,
--		   sizeof(struct in6_addr));
-+	    memcpy(&ifr6.ifr6_addr, &sin6->sin6_addr, sizeof(struct in6_addr));
- 
- 	    fd = get_socket_for_af(AF_INET6);
- 	    if (fd < 0) {
-@@ -900,10 +943,10 @@ int main(int argc, char **argv)
- 	/* If the next argument is a valid hostname, assume OK. */
- 	safe_strncpy(host, *spp, (sizeof host));
- 
--	/* FIXME: sa is too small for INET6 addresses, inet6 should use that too, 
-+	/* FIXME: sa is too small for INET6 addresses, inet6 should use that too,
- 	   broadcast is unexpected */
- 	if (ap->getmask) {
--	    switch (ap->getmask(host, &sa, NULL)) {
-+	    switch (ap->getmask(host, samask, NULL)) {
- 	    case -1:
- 		usage();
- 		break;
-@@ -911,8 +954,8 @@ int main(int argc, char **argv)
- 		if (didnetmask)
- 		    usage();
- 
--		goterr = set_netmask(skfd, &ifr, &sa);
--		didnetmask++;
-+		// remeber to set the netmask from samask later
-+		neednetmask = 1;
- 		break;
- 	    }
- 	}
-@@ -920,12 +963,14 @@ int main(int argc, char **argv)
- 	   fprintf(stderr, _("ifconfig: Cannot set address for this protocol family.\n"));
- 	   exit(1);
- 	}
--	if (ap->input(0, host, &sa) < 0) {
--	    ap->herror(host);
--	    fprintf(stderr, _("ifconfig: `--help' gives usage information.\n"));
--	    exit(1);
-+	if (ap->input(0, host, sa) < 0) {
-+	    if (ap->herror)
-+	    	ap->herror(host);
-+	    else
-+	    	fprintf(stderr,_("ifconfig: error resolving '%s' to set address for af=%s\n"), host, ap->name); fprintf(stderr,
-+	    _("ifconfig: `--help' gives usage information.\n")); exit(1);
- 	}
--	memcpy((char *) &ifr.ifr_addr, (char *) &sa, sizeof(struct sockaddr));
-+	memcpy(&ifr.ifr_addr, sa, sizeof(struct sockaddr));
- 	{
- 	    int r = 0;		/* to shut gcc up */
- 	    switch (ap->af) {
-@@ -965,14 +1010,14 @@ int main(int argc, char **argv)
-         * end, since it's deleted already! - Roman
-         *
-         * Should really use regex.h here, not sure though how well it'll go
--        * with the cross-platform support etc. 
-+        * with the cross-platform support etc.
-         */
-         {
-             char *ptr;
-             short int found_colon = 0;
-             for (ptr = ifr.ifr_name; *ptr; ptr++ )
-                 if (*ptr == ':') found_colon++;
--                
-+
-             if (!(found_colon && *(ptr - 1) == '-'))
-                 goterr |= set_flag(ifr.ifr_name, (IFF_UP | IFF_RUNNING));
-         }
-@@ -980,6 +1025,14 @@ int main(int argc, char **argv)
- 	spp++;
-     }
- 
-+    if (neednetmask) {
-+	goterr |= set_netmask(skfd, &ifr, samask);
-+	didnetmask++;
-+    }
-+
-+    if (opt_v && goterr)
-+    	fprintf(stderr, _("WARNING: at least one error occured. (%d)\n"), goterr);
-+
-     return (goterr);
- }
- 
-@@ -1012,7 +1065,7 @@ static int do_ifcmd(struct interface *x, struct ifcmd *ptr)
-     char *z, *e;
-     struct sockaddr_in *sin;
-     int i;
--    
-+
-     if (do_if_fetch(x) < 0)
- 	return 0;
-     if (strncmp(x->name, ptr->base, ptr->baselen) != 0)
-@@ -1028,13 +1081,13 @@ static int do_ifcmd(struct interface *x, struct ifcmd *ptr)
-     if (i < 0 || i > 255)
- 	abort();
-     searcher[i] = 1;
--    
-+
-     /* copy */
-     sin = (struct sockaddr_in *)&x->dstaddr;
-     if (sin->sin_addr.s_addr != ptr->addr) {
- 	return 0;
-     }
--    
-+
-     if (ptr->flag) {
- 	/* turn UP */
- 	if (set_flag(x->name, IFF_UP | IFF_RUNNING) == -1)
-@@ -1044,49 +1097,48 @@ static int do_ifcmd(struct interface *x, struct ifcmd *ptr)
- 	if (clr_flag(x->name, IFF_UP) == -1)
- 	    return -1;
-     }
--    
-+
-     return 1; /* all done! */
- }
- 
- 
- static int get_nmbc_parent(char *parent,
--			   unsigned long *nm, unsigned long *bc)
-+			   in_addr_t *nm, in_addr_t *bc)
- {
-     struct interface *i;
-     struct sockaddr_in *sin;
--    
-+
-     i = lookup_interface(parent);
-     if (!i)
- 	return -1;
-     if (do_if_fetch(i) < 0)
- 	return 0;
-     sin = (struct sockaddr_in *)&i->netmask;
--    memcpy(nm, &sin->sin_addr.s_addr, sizeof(unsigned long));
-+    memcpy(nm, &sin->sin_addr.s_addr, sizeof(*nm));
-     sin = (struct sockaddr_in *)&i->broadaddr;
--    memcpy(bc, &sin->sin_addr.s_addr, sizeof(unsigned long));
-+    memcpy(bc, &sin->sin_addr.s_addr, sizeof(*bc));
-     return 0;
- }
- 
--static int set_ifstate(char *parent, unsigned long ip,
--		       unsigned long nm, unsigned long bc,
-+static int set_ifstate(char *parent, in_addr_t ip, in_addr_t nm, in_addr_t bc,
- 		       int flag)
- {
-     char buf[IFNAMSIZ];
-     struct ifcmd pt;
-     int i;
--    
-+
-     pt.base = parent;
-     pt.baselen = strlen(parent);
-     pt.addr = ip;
-     pt.flag = flag;
-     memset(searcher, 0, sizeof(searcher));
--    i = for_all_interfaces((int (*)(struct interface *,void *))do_ifcmd, 
-+    i = for_all_interfaces((int (*)(struct interface *,void *))do_ifcmd,
- 			   &pt);
-     if (i == -1)
- 	return -1;
-     if (i == 1)
- 	return 0;
--    
-+
-     /* add a new interface */
-     for (i = 0; i < 256; i++)
- 	if (searcher[i] == 0)
-@@ -1094,7 +1146,7 @@ static int set_ifstate(char *parent, unsigned long ip,
- 
-     if (i == 256)
- 	return -1; /* FAILURE!!! out of ip addresses */
--    
-+
-     if (snprintf(buf, IFNAMSIZ, "%s:%d", parent, i) > IFNAMSIZ)
- 	return -1;
-     if (set_ip_using(buf, SIOCSIFADDR, ip) == -1)
-diff --git a/include/interface.h b/include/interface.h
-index f95555c..1b58599 100644
---- a/include/interface.h
-+++ b/include/interface.h
-@@ -28,11 +28,10 @@ struct user_net_device_stats {
- };
- 
- struct interface {
--    struct interface *next, *prev; 
-+    struct interface *next, *prev;
-     char name[IFNAMSIZ];	/* interface name        */
-     short type;			/* if type               */
-     short flags;		/* various flags         */
--    int metric;			/* routing metric        */
-     int mtu;			/* MTU value             */
-     int tx_queue_len;		/* transmit queue length */
-     struct ifmap map;		/* hardware setup        */
-@@ -64,13 +63,17 @@ struct interface {
- extern int if_fetch(struct interface *ife);
- 
- extern int for_all_interfaces(int (*)(struct interface *, void *), void *);
--extern int free_interface_list(void);
-+extern int if_cache_free(void);
- extern struct interface *lookup_interface(char *name);
- extern int if_readlist(void);
- 
- extern int do_if_fetch(struct interface *ife);
- extern int do_if_print(struct interface *ife, void *cookie);
- 
-+extern int    procnetdev_version(char *buf);
-+extern int    get_dev_fields(char *bp, struct interface *ife);
-+extern char * get_name(char *name, char *p);
-+
- extern void ife_print(struct interface *ptr);
- 
- extern int ife_short;
-@@ -84,7 +87,7 @@ extern const char *if_port_text[][4];
- #endif
- 
- #if !defined(ifr_qlen)
--/* Actually it is ifru_ivalue, but that is not present in 2.0 kernel headers */   
-+/* Actually it is ifru_ivalue, but that is not present in 2.0 kernel headers */
- #define ifr_qlen        ifr_ifru.ifru_mtu
- #endif
- 
-diff --git a/include/mii.h b/include/mii.h
-deleted file mode 100644
-index 1ef7ccc..0000000
---- a/include/mii.h
-+++ /dev/null
-@@ -1,86 +0,0 @@
--/*
-- * mii.h 1.4 2000/04/25 22:06:15
-- *
-- * Media Independent Interface support: register layout and ioctl's
-- *
-- * Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org
-- */
--
--#ifndef _LINUX_MII_H
--#define _LINUX_MII_H
--
--/* network interface ioctl's for MII commands */
--#ifndef SIOCGMIIPHY
--#define SIOCGMIIPHY (SIOCDEVPRIVATE)	/* Read from current PHY */
--#define SIOCGMIIREG (SIOCDEVPRIVATE+1) 	/* Read any PHY register */
--#define SIOCSMIIREG (SIOCDEVPRIVATE+2) 	/* Write any PHY register */
--#define SIOCGPARAMS (SIOCDEVPRIVATE+3) 	/* Read operational parameters */
--#define SIOCSPARAMS (SIOCDEVPRIVATE+4) 	/* Set operational parameters */
--#endif
--
--#include <linux/types.h>
--
--/* This data structure is used for all the MII ioctl's */
--struct mii_data {
--    __u16	phy_id;
--    __u16	reg_num;
--    __u16	val_in;
--    __u16	val_out;
--};
--
--/* Basic Mode Control Register */
--#define MII_BMCR		0x00
--#define  MII_BMCR_RESET		0x8000
--#define  MII_BMCR_LOOPBACK	0x4000
--#define  MII_BMCR_100MBIT	0x2000
--#define  MII_BMCR_AN_ENA	0x1000
--#define  MII_BMCR_ISOLATE	0x0400
--#define  MII_BMCR_RESTART	0x0200
--#define  MII_BMCR_DUPLEX	0x0100
--#define  MII_BMCR_COLTEST	0x0080
--
--/* Basic Mode Status Register */
--#define MII_BMSR		0x01
--#define  MII_BMSR_CAP_MASK	0xf800
--#define  MII_BMSR_100BASET4	0x8000
--#define  MII_BMSR_100BASETX_FD	0x4000
--#define  MII_BMSR_100BASETX_HD	0x2000
--#define  MII_BMSR_10BASET_FD	0x1000
--#define  MII_BMSR_10BASET_HD	0x0800
--#define  MII_BMSR_NO_PREAMBLE	0x0040
--#define  MII_BMSR_AN_COMPLETE	0x0020
--#define  MII_BMSR_REMOTE_FAULT	0x0010
--#define  MII_BMSR_AN_ABLE	0x0008
--#define  MII_BMSR_LINK_VALID	0x0004
--#define  MII_BMSR_JABBER	0x0002
--#define  MII_BMSR_EXT_CAP	0x0001
--
--#define MII_PHY_ID1		0x02
--#define MII_PHY_ID2		0x03
--
--/* Auto-Negotiation Advertisement Register */
--#define MII_ANAR		0x04
--/* Auto-Negotiation Link Partner Ability Register */
--#define MII_ANLPAR		0x05
--#define  MII_AN_NEXT_PAGE	0x8000
--#define  MII_AN_ACK		0x4000
--#define  MII_AN_REMOTE_FAULT	0x2000
--#define  MII_AN_ABILITY_MASK	0x07e0
--#define  MII_AN_FLOW_CONTROL	0x0400
--#define  MII_AN_100BASET4	0x0200
--#define  MII_AN_100BASETX_FD	0x0100
--#define  MII_AN_100BASETX_HD	0x0080
--#define  MII_AN_10BASET_FD	0x0040
--#define  MII_AN_10BASET_HD	0x0020
--#define  MII_AN_PROT_MASK	0x001f
--#define  MII_AN_PROT_802_3	0x0001
--
--/* Auto-Negotiation Expansion Register */
--#define MII_ANER		0x06
--#define  MII_ANER_MULT_FAULT	0x0010
--#define  MII_ANER_LP_NP_ABLE	0x0008
--#define  MII_ANER_NP_ABLE	0x0004
--#define  MII_ANER_PAGE_RX	0x0002
--#define  MII_ANER_LP_AN_ABLE	0x0001
--
--#endif /* _LINUX_MII_H */
-diff --git a/include/util-ank.h b/include/util-ank.h
-index 04ab16c..c8fcd08 100644
---- a/include/util-ank.h
-+++ b/include/util-ank.h
-@@ -75,6 +75,6 @@ extern int do_qdisc(int argc, char **argv);
- extern int do_class(int argc, char **argv);
- extern int do_filter(int argc, char **argv);
- 
--extern const char *format_host(int af, void *addr, __u8 *abuf, int alen);
-+extern const char *format_host(int af, void *addr, char *abuf, int alen);
- 
- #endif /* __UTILS_H__ */
-diff --git a/ipmaddr.c b/ipmaddr.c
-index 2134e81..e4ed41d 100644
---- a/ipmaddr.c
-+++ b/ipmaddr.c
-@@ -32,6 +32,7 @@
- 
- #include "config.h"
- #include "intl.h"
-+#include "util.h"
- #include "util-ank.h"
- #include "net-support.h"
- #include "version.h"
-@@ -44,13 +45,11 @@ int  filter_family;
- #define NEWADDR		1
- #define DELADDR		2
- 
--char *Release = RELEASE,
--     *Version = "ipmaddr 1.1",
--     *Signature = "Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>";
-+static char *Release = RELEASE, *Signature = "Alexey Kuznetsov";
- 
- static void version(void)
- {
--	printf("%s\n%s\n%s\n", Release, Version, Signature);
-+	printf("%s\n%s\n", Release, Signature);
- 	exit(E_VERSION);
- }
- 
-@@ -61,7 +60,7 @@ static void usage(void)
- 	fprintf(stderr, _("Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"));
- 	fprintf(stderr, _("       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"));
- 	fprintf(stderr, _("       ipmaddr -V | -version\n"));
--	exit(-1);
-+	exit(E_USAGE);
- }
- 
- static void print_lla(FILE *fp, int len, unsigned char *addr)
-@@ -75,7 +74,7 @@ static void print_lla(FILE *fp, int len, unsigned char *addr)
- 	}
- }
- 
--static int parse_lla(char *str, unsigned char *addr)
-+static int parse_lla(char *str, char *addr)
- {
- 	int len=0;
- 
-@@ -159,8 +158,7 @@ void read_dev_mcast(struct ma_info **result_p)
- 
- 		len = parse_hex(hexa, (unsigned char*)&m.addr.data);
- 		if (len >= 0) {
--			struct ma_info *ma = malloc(sizeof(m));
--
-+			struct ma_info *ma = xmalloc(sizeof(m));
- 			memcpy(ma, &m, sizeof(m));
- 			ma->addr.bytelen = len;
- 			ma->addr.bitlen = len<<3;
-@@ -174,22 +172,21 @@ void read_dev_mcast(struct ma_info **result_p)
- 
- void read_igmp(struct ma_info **result_p)
- {
--	struct ma_info m;
-+	struct ma_info m, *ma = NULL;
- 	char buf[256];
- 	FILE *fp = fopen(_PATH_PROCNET_IGMP, "r");
- 
- 	if (!fp)
- 		return;
- 	memset(&m, 0, sizeof(m));
--	fgets(buf, sizeof(buf), fp);
-+	if (fgets(buf, sizeof(buf), fp))
-+		/* eat line */;
- 
- 	m.addr.family = AF_INET;
- 	m.addr.bitlen = 32;
- 	m.addr.bytelen = 4;
- 
- 	while (fgets(buf, sizeof(buf), fp)) {
--		struct ma_info *ma = malloc(sizeof(m));
--
- 		if (buf[0] != '\t') {
- 			sscanf(buf, "%d%s", &m.index, m.name);
- 			continue;
-@@ -200,7 +197,7 @@ void read_igmp(struct ma_info **result_p)
- 
- 		sscanf(buf, "%08x%d", (__u32*)&m.addr.data, &m.users);
- 
--		ma = malloc(sizeof(m));
-+		ma = xmalloc(sizeof(m));
- 		memcpy(ma, &m, sizeof(m));
- 		maddr_ins(result_p, ma);
- 	}
-@@ -231,8 +228,7 @@ void read_igmp6(struct ma_info **result_p)
- 
- 		len = parse_hex(hexa, (unsigned char*)&m.addr.data);
- 		if (len >= 0) {
--			struct ma_info *ma = malloc(sizeof(m));
--
-+			struct ma_info *ma = xmalloc(sizeof(m));
- 			memcpy(ma, &m, sizeof(m));
- 
- 			ma->addr.bytelen = len;
-@@ -291,13 +287,15 @@ static void print_mlist(FILE *fp, struct ma_info *list)
- static int multiaddr_list(int argc, char **argv)
- {
- 	struct ma_info *list = NULL;
-+	size_t l;
- 
- 	while (argc > 0) {
- 		if (strcmp(*argv, "dev") == 0) {
- 			NEXT_ARG();
--			if (filter_dev[0])
-+			l = strlen(*argv);
-+			if (l <= 0 || l >= sizeof(filter_dev))
- 				usage();
--			strcpy(filter_dev, *argv);
-+			strncpy(filter_dev, *argv, sizeof (filter_dev));
- 		} else if (strcmp(*argv, "all") == 0) {
- 			filter_family = AF_UNSPEC;
- 		} else if (strcmp(*argv, "ipv4") == 0) {
-@@ -307,9 +305,10 @@ static int multiaddr_list(int argc, char **argv)
- 		} else if (strcmp(*argv, "link") == 0) {
- 			filter_family = AF_PACKET;
- 		} else {
--			if (filter_dev[0])
-+			l = strlen(*argv);
-+			if (l <= 0 || l >= sizeof(filter_dev))
- 				usage();
--			strcpy(filter_dev, *argv);
-+			strncpy(filter_dev, *argv, sizeof (filter_dev));
- 		}
- 		argv++; argc--;
- 	}
-@@ -401,7 +400,7 @@ int main(int argc, char **argv)
- 		basename = argv[0];
- 	else
- 		basename++;
--	
-+
- 	while (argc > 1) {
- 		if (argv[1][0] != '-')
- 			break;
-diff --git a/iptunnel.c b/iptunnel.c
-index 4943d83..ddf43b2 100644
---- a/iptunnel.c
-+++ b/iptunnel.c
-@@ -68,13 +68,11 @@
- 
- #include "util-ank.h"
- 
--char *Release = RELEASE,
--     *Version = "iptunnel 1.01",
--     *Signature = "Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>";
-+static char *Release = RELEASE, *Signature = "Alexey Kuznetsov";
- 
- static void version(void)
- {
--	printf("%s\n%s\n%s\n", Release, Version, Signature);
-+	printf("%s\n%s\n", Release, Signature);
- 	exit(E_VERSION);
- }
- 
-@@ -92,7 +90,7 @@ static void usage(void)
- 	fprintf(stderr, _("       TOS  := { NUMBER | inherit }\n"));
- 	fprintf(stderr, _("       TTL  := { 1..255 | inherit }\n"));
- 	fprintf(stderr, _("       KEY  := { DOTTED_QUAD | NUMBER }\n"));
--	exit(-1);
-+	exit(E_USAGE);
- }
- 
- static int do_ioctl_get_ifindex(char *dev)
-@@ -101,11 +99,12 @@ static int do_ioctl_get_ifindex(char *dev)
- 	int fd;
- 	int err;
- 
--	strcpy(ifr.ifr_name, dev);
-+	safe_strncpy(ifr.ifr_name, dev, IFNAMSIZ);
- 	fd = socket(AF_INET, SOCK_DGRAM, 0);
- 	err = ioctl(fd, SIOCGIFINDEX, &ifr);
- 	if (err) {
- 		perror("ioctl");
-+		close(fd);
- 		return 0;
- 	}
- 	close(fd);
-@@ -118,11 +117,12 @@ static int do_ioctl_get_iftype(char *dev)
- 	int fd;
- 	int err;
- 
--	strcpy(ifr.ifr_name, dev);
-+	safe_strncpy(ifr.ifr_name, dev, IFNAMSIZ);
- 	fd = socket(AF_INET, SOCK_DGRAM, 0);
- 	err = ioctl(fd, SIOCGIFHWADDR, &ifr);
- 	if (err) {
- 		perror("ioctl");
-+		close(fd);
- 		return -1;
- 	}
- 	close(fd);
-@@ -141,6 +141,7 @@ static char * do_ioctl_get_ifname(int idx)
- 	err = ioctl(fd, SIOCGIFNAME, &ifr);
- 	if (err) {
- 		perror("ioctl");
-+		close(fd);
- 		return NULL;
- 	}
- 	close(fd);
-@@ -155,7 +156,7 @@ static int do_get_ioctl(char *basedev, struct ip_tunnel_parm *p)
- 	int fd;
- 	int err;
- 
--	strcpy(ifr.ifr_name, basedev);
-+	safe_strncpy(ifr.ifr_name, basedev, IFNAMSIZ);
- 	ifr.ifr_ifru.ifru_data = (void*)p;
- 	fd = socket(AF_INET, SOCK_DGRAM, 0);
- 	err = ioctl(fd, SIOCGETTUNNEL, &ifr);
-@@ -171,7 +172,7 @@ static int do_add_ioctl(int cmd, char *basedev, struct ip_tunnel_parm *p)
- 	int fd;
- 	int err;
- 
--	strcpy(ifr.ifr_name, basedev);
-+	safe_strncpy(ifr.ifr_name, basedev, IFNAMSIZ);
- 	ifr.ifr_ifru.ifru_data = (void*)p;
- 	fd = socket(AF_INET, SOCK_DGRAM, 0);
- 	err = ioctl(fd, cmd, &ifr);
-@@ -187,7 +188,7 @@ static int do_del_ioctl(char *basedev, struct ip_tunnel_parm *p)
- 	int fd;
- 	int err;
- 
--	strcpy(ifr.ifr_name, basedev);
-+	safe_strncpy(ifr.ifr_name, basedev, IFNAMSIZ);
- 	ifr.ifr_ifru.ifru_data = (void*)p;
- 	fd = socket(AF_INET, SOCK_DGRAM, 0);
- 	err = ioctl(fd, SIOCDELTUNNEL, &ifr);
-@@ -375,7 +376,7 @@ static int do_add(int cmd, int argc, char **argv)
- 		return do_add_ioctl(cmd, "gre0", &p);
- 	case IPPROTO_IPV6:
- 		return do_add_ioctl(cmd, "sit0", &p);
--	default:	
-+	default:
- 		fprintf(stderr, _("cannot determine tunnel mode (ipip, gre or sit)\n"));
- 		return -1;
- 	}
-@@ -390,13 +391,13 @@ int do_del(int argc, char **argv)
- 		return -1;
- 
- 	switch (p.iph.protocol) {
--	case IPPROTO_IPIP:	
-+	case IPPROTO_IPIP:
- 		return do_del_ioctl(p.name[0] ? p.name : "tunl0", &p);
--	case IPPROTO_GRE:	
-+	case IPPROTO_GRE:
- 		return do_del_ioctl(p.name[0] ? p.name : "gre0", &p);
--	case IPPROTO_IPV6:	
-+	case IPPROTO_IPV6:
- 		return do_del_ioctl(p.name[0] ? p.name : "sit0", &p);
--	default:	
-+	default:
- 		return do_del_ioctl(p.name, &p);
- 	}
- 	return -1;
-@@ -476,8 +477,10 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
- 		return -1;
- 	}
- 
--	fgets(buf, sizeof(buf), fp);
--	fgets(buf, sizeof(buf), fp);
-+	if (fgets(buf, sizeof(buf), fp))
-+		/* eat line */;
-+	if (fgets(buf, sizeof(buf), fp))
-+		/* eat line */;
- 
- 	while (fgets(buf, sizeof(buf), fp) != NULL) {
- 		char *ptr;
-@@ -485,9 +488,10 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
- 		if ((ptr = strchr(buf, ':')) == NULL ||
- 		    (*ptr++ = 0, sscanf(buf, "%s", name) != 1)) {
- 			fprintf(stderr, _("Wrong format of /proc/net/dev. Sorry.\n"));
-+			fclose(fp);
- 			return -1;
- 		}
--		if (sscanf(ptr, "%ld%ld%ld%ld%ld%ld%ld%*d%ld%ld%ld%ld%ld%ld%ld",
-+		if (sscanf(ptr, "%lu%lu%lu%lu%lu%lu%lu%*u%lu%lu%lu%lu%lu%lu%lu",
- 			   &rx_bytes, &rx_packets, &rx_errs, &rx_drops,
- 			   &rx_fifo, &rx_frame, &rx_multi,
- 			   &tx_bytes, &tx_packets, &tx_errs, &tx_drops,
-@@ -521,6 +525,7 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
- 			       tx_packets, tx_bytes, tx_errs, tx_colls, tx_carrier, tx_drops);
- 		}
- 	}
-+	fclose(fp);
- 	return 0;
- }
- 
-@@ -533,7 +538,7 @@ static int do_show(int argc, char **argv)
- 		return -1;
- 
- 	switch (p.iph.protocol) {
--	case IPPROTO_IPIP:	
-+	case IPPROTO_IPIP:
- 		err = do_get_ioctl(p.name[0] ? p.name : "tunl0", &p);
- 		break;
- 	case IPPROTO_GRE:
-@@ -592,7 +597,7 @@ int main(int argc, char **argv)
- 		basename = argv[0];
- 	else
- 		basename++;
--	
-+
- 	while (argc > 1) {
- 		if (argv[1][0] != '-')
- 			break;
-diff --git a/lib/Makefile b/lib/Makefile
-index d714b2e..431f258 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -16,7 +16,7 @@
- #
- 
- 
--HWOBJS	 = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o
-+HWOBJS	 = hw.o loopback.o slip.o ether.o ax25.o ppp.o arcnet.o tr.o tunnel.o frame.o sit.o rose.o ash.o fddi.o hippi.o hdlclapb.o strip.o irda.o ec_hw.o x25.o eui64.o ib.o
- AFOBJS	 = unix.o inet.o inet6.o ax25.o ipx.o ddp.o ipx.o netrom.o af.o rose.o econet.o x25.o
- AFGROBJS = inet_gr.o inet6_gr.o ipx_gr.o ddp_gr.o netrom_gr.o ax25_gr.o rose_gr.o getroute.o x25_gr.o
- AFSROBJS = inet_sr.o inet6_sr.o netrom_sr.o ipx_sr.o setroute.o x25_sr.o
-@@ -36,7 +36,7 @@ OBJS	= $(sort $(VARIA) $(AFOBJS) $(HWOBJS) \
- 
- # This can be overwritten by the TOPLEVEL Makefile
- TOPDIR=..
--CFLAGS += -I$(TOPDIR) -idirafter $(TOPDIR)/include # -fPIC
-+CFLAGS += -I$(TOPDIR) -I$(TOPDIR)/include # -fPIC
- SONAME=libnet-tools.so.0
- 
- .SUFFIXES: .a .so
-diff --git a/lib/af.c b/lib/af.c
-index 4f002c4..0500a0a 100644
---- a/lib/af.c
-+++ b/lib/af.c
-@@ -2,7 +2,7 @@
-  * lib/af.c   This file contains the top-level part of the protocol
-  *              support functions module for the NET-2 base distribution.
-  *
-- * Version:     $Id: af.c,v 1.13 2000/05/20 13:38:10 pb Exp $
-+ * Version:     $Id: af.c,v 1.14 2007/12/01 17:49:35 ecki Exp $
-  *
-  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              Copyright 1993 MicroWalt Corporation
-@@ -35,8 +35,10 @@ int flag_netrom;
- int flag_inet;
- int flag_inet6;
- int flag_econet;
-+int flag_rose;
- int flag_x25 = 0;
- int flag_ash;
-+int flag_bluetooth;
- 
- 
- struct aftrans_t {
-@@ -58,6 +60,9 @@ struct aftrans_t {
- 	"ipx", "ipx", &flag_ipx
-     },
-     {
-+	"rose", "rose", &flag_rose
-+    },
-+    {
- 	"appletalk", "ddp", &flag_ddp
-     },
-     {
-@@ -88,6 +93,9 @@ struct aftrans_t {
-         "ash", "ash", &flag_ash
-     },
-     {
-+        "bluetooth", "bluetooth", &flag_bluetooth
-+    },
-+    {
- 	0, 0, 0
-     }
- };
-@@ -193,15 +201,14 @@ void aftrans_def(char *tool, char *argv0, char *dflt)
-     char *tmp;
-     char *buf;
- 
--    strcpy(afname, dflt);
-+    safe_strncpy(afname, dflt, sizeof(afname));
- 
-     if (!(tmp = strrchr(argv0, '/')))
- 	tmp = argv0;		/* no slash?! */
-     else
- 	tmp++;
- 
--    if (!(buf = strdup(tmp)))
--	return;
-+    buf = xstrdup(tmp);
- 
-     if (strlen(tool) >= strlen(tmp)) {
- 	free(buf);
-@@ -219,7 +226,7 @@ void aftrans_def(char *tool, char *argv0, char *dflt)
- 
-     afname[0] = '\0';
-     if (aftrans_opt(buf))
--	strcpy(afname, buf);
-+	safe_strncpy(afname, buf, sizeof(afname));
- 
-     free(buf);
- }
-@@ -296,7 +303,6 @@ int aftrans_opt(const char *arg)
- 	if (tmp2)
- 	    *(tmp2++) = '\0';
- 
--	paft = aftrans;
- 	for (paft = aftrans; paft->alias; paft++) {
- 	    if (strcmp(tmp1, paft->alias))
- 		continue;
-@@ -335,7 +341,7 @@ void print_aflist(int type) {
- 	if ((type == 1 && ((*afp)->rprint == NULL)) || ((*afp)->af == 0)) {
- 		afp++; continue;
- 	}
--	if ((count % 3) == 0) fprintf(stderr,count?"\n    ":"    "); 
-+	if ((count % 3) == 0) fprintf(stderr,count?"\n    ":"    ");
-         txt = (*afp)->name; if (!txt) txt = "..";
- 	fprintf(stderr,"%s (%s) ",txt,(*afp)->title);
- 	count++;
-diff --git a/lib/arcnet.c b/lib/arcnet.c
-index eb0f46e..9bc3267 100644
---- a/lib/arcnet.c
-+++ b/lib/arcnet.c
-@@ -35,7 +35,7 @@ extern struct hwtype arcnet_hwtype;
- 
- 
- /* Display an ARCnet address in readable format. */
--static char *pr_arcnet(unsigned char *ptr)
-+static const char *pr_arcnet(const char *ptr)
- {
-     static char buff[64];
- 
-@@ -43,11 +43,16 @@ static char *pr_arcnet(unsigned char *ptr)
-     return (buff);
- }
- 
-+#ifdef DEBUG
-+#define _DEBUG 1
-+#else
-+#define _DEBUG 0
-+#endif
- 
- /* Input an ARCnet address and convert to binary. */
- static int in_arcnet(char *bufp, struct sockaddr *sap)
- {
--    unsigned char *ptr;
-+    char *ptr;
-     char c, *orig;
-     int i, val;
- 
-@@ -66,9 +71,8 @@ static int in_arcnet(char *bufp, struct sockaddr *sap)
- 	else if (c >= 'A' && c <= 'F')
- 	    val = c - 'A' + 10;
- 	else {
--#ifdef DEBUG
--	    fprintf(stderr, _("in_arcnet(%s): invalid arcnet address!\n"), orig);
--#endif
-+	    if (_DEBUG)
-+		fprintf(stderr, _("in_arcnet(%s): invalid arcnet address!\n"), orig);
- 	    errno = EINVAL;
- 	    return (-1);
- 	}
-@@ -81,9 +85,8 @@ static int in_arcnet(char *bufp, struct sockaddr *sap)
- 	else if (c >= 'A' && c <= 'F')
- 	    val |= c - 'A' + 10;
- 	else {
--#ifdef DEBUG
--	    fprintf(stderr, _("in_arcnet(%s): invalid arcnet address!\n"), orig);
--#endif
-+	    if (_DEBUG)
-+		fprintf(stderr, _("in_arcnet(%s): invalid arcnet address!\n"), orig);
- 	    errno = EINVAL;
- 	    return (-1);
- 	}
-@@ -92,28 +95,21 @@ static int in_arcnet(char *bufp, struct sockaddr *sap)
- 
- 	/* We might get a semicolon here - not required. */
- 	if (*bufp == ':') {
--	    if (i == ETH_ALEN) {
--#ifdef DEBUG
-+	    if (_DEBUG && i == ETH_ALEN)
- 		fprintf(stderr, _("in_arcnet(%s): trailing : ignored!\n"),
--			orig)
--#endif
--		    ;		/* nothing */
--	    }
-+			orig);
- 	    bufp++;
- 	}
-     }
- 
-     /* That's it.  Any trailing junk? */
--    if ((i == ETH_ALEN) && (*bufp != '\0')) {
--#ifdef DEBUG
-+    if (_DEBUG && (i == ETH_ALEN) && (*bufp != '\0')) {
- 	fprintf(stderr, _("in_arcnet(%s): trailing junk!\n"), orig);
- 	errno = EINVAL;
- 	return (-1);
--#endif
-     }
--#ifdef DEBUG
--    fprintf(stderr, "in_arcnet(%s): %s\n", orig, pr_arcnet(sap->sa_data));
--#endif
-+    if (_DEBUG)
-+	fprintf(stderr, "in_arcnet(%s): %s\n", orig, pr_arcnet(sap->sa_data));
- 
-     return (0);
- }
-diff --git a/lib/ash.c b/lib/ash.c
-index c64667c..6cfc154 100644
---- a/lib/ash.c
-+++ b/lib/ash.c
-@@ -31,8 +31,8 @@ static unsigned char hamming[16] =
- };
- 
- /* Display an Ash address in readable format. */
--static char *
--pr_ash(unsigned char *ptr)
-+static const char *
-+pr_ash(const char *ptr)
- {
-     static char buff[128];
-     char *p = buff;
-@@ -57,10 +57,10 @@ pr_ash(unsigned char *ptr)
- 
- struct hwtype ash_hwtype;
- 
--static int 
-+static int
- in_ash(char *bufp, struct sockaddr *sap)
- {
--    unsigned char *ptr;
-+    char *ptr;
-     unsigned int i = 0;
- 
-     sap->sa_family = ash_hwtype.type;
-@@ -102,7 +102,7 @@ struct hwtype ash_hwtype =
- #if HAVE_AFASH
- 
- /* Display an Ash socket address. */
--static char *
-+static const char *
- pr_sash(struct sockaddr *sap, int numeric)
- {
-     static char buf[64];
-diff --git a/lib/ax25.c b/lib/ax25.c
-index 11521d2..d57abe7 100644
---- a/lib/ax25.c
-+++ b/lib/ax25.c
-@@ -47,7 +47,7 @@ static char AX25_errmsg[128];
- 
- extern struct aftype ax25_aftype;
- 
--static char *AX25_print(unsigned char *ptr)
-+static const char *AX25_print(const char *ptr)
- {
-     static char buff[8];
-     int i;
-@@ -66,7 +66,7 @@ static char *AX25_print(unsigned char *ptr)
- 
- 
- /* Display an AX.25 socket address. */
--static char *
-+static const char *
-  AX25_sprint(struct sockaddr *sap, int numeric)
- {
-     static char buf[64];
-@@ -76,10 +76,15 @@ static char *
-     return (AX25_print(((struct sockaddr_ax25 *) sap)->sax25_call.ax25_call));
- }
- 
-+#ifdef DEBUG
-+#define _DEBUG 1
-+#else
-+#define _DEBUG 0
-+#endif
- 
- static int AX25_input(int type, char *bufp, struct sockaddr *sap)
- {
--    unsigned char *ptr;
-+    char *ptr;
-     char *orig, c;
-     int i;
- 
-@@ -95,9 +100,8 @@ static int AX25_input(int type, char *bufp, struct sockaddr *sap)
- 	    c = toupper(c);
- 	if (!(isupper(c) || isdigit(c))) {
- 	    safe_strncpy(AX25_errmsg, _("Invalid callsign"), sizeof(AX25_errmsg));
--#ifdef DEBUG
--	    fprintf(stderr, "ax25_input(%s): %s !\n", AX25_errmsg, orig);
--#endif
-+	    if (_DEBUG)
-+		fprintf(stderr, "ax25_input(%s): %s !\n", AX25_errmsg, orig);
- 	    errno = EINVAL;
- 	    return (-1);
- 	}
-@@ -107,10 +111,9 @@ static int AX25_input(int type, char *bufp, struct sockaddr *sap)
- 
-     /* Callsign too long? */
-     if ((i == 6) && (*bufp != '-') && (*bufp != '\0')) {
--	strcpy(AX25_errmsg, _("Callsign too long"));
--#ifdef DEBUG
--	fprintf(stderr, "ax25_input(%s): %s !\n", AX25_errmsg, orig);
--#endif
-+	safe_strncpy(AX25_errmsg, _("Callsign too long"), sizeof(AX25_errmsg));
-+	if (_DEBUG)
-+	    fprintf(stderr, "ax25_input(%s): %s !\n", AX25_errmsg, orig);
- 	errno = E2BIG;
- 	return (-1);
-     }
-@@ -128,12 +131,12 @@ static int AX25_input(int type, char *bufp, struct sockaddr *sap)
-     }
- 
-     /* All done. */
--#ifdef DEBUG
--    fprintf(stderr, "ax25_input(%s): ", orig);
--    for (i = 0; i < sizeof(ax25_address); i++)
--	fprintf(stderr, "%02X ", sap->sa_data[i] & 0377);
--    fprintf(stderr, "\n");
--#endif
-+    if (_DEBUG) {
-+	fprintf(stderr, "ax25_input(%s): ", orig);
-+	for (i = 0; i < sizeof(ax25_address); i++)
-+	    fprintf(stderr, "%02X ", sap->sa_data[i] & 0377);
-+	fprintf(stderr, "\n");
-+    }
- 
-     return (0);
- }
-diff --git a/lib/ax25_gr.c b/lib/ax25_gr.c
-index 4dce92d..46a67ee 100644
---- a/lib/ax25_gr.c
-+++ b/lib/ax25_gr.c
-@@ -49,7 +49,8 @@ int AX25_rprint(int options)
-     }
-     printf(_("Kernel AX.25 routing table\n"));	/* xxx */
-     printf(_("Destination  Iface    Use\n"));	/* xxx */
--    fgets(buffer, 256, f);
-+    if (fgets(buffer, 256, f))
-+	/* eat line */;
-     while (fgets(buffer, 256, f)) {
- 	buffer[9] = 0;
- 	buffer[14] = 0;
-diff --git a/lib/ddp.c b/lib/ddp.c
-index 9b5e829..0a08fd2 100644
---- a/lib/ddp.c
-+++ b/lib/ddp.c
-@@ -32,7 +32,7 @@
- #include "util.h"
- 
- /* Display a ddp domain address. */
--static char *ddp_print(unsigned char *ptr)
-+static const char *ddp_print(const char *ptr)
- {
-     static char buff[64];
-     struct sockaddr_at *sat = (struct sockaddr_at *) (ptr - 2);
-@@ -42,7 +42,7 @@ static char *ddp_print(unsigned char *ptr)
- 
- 
- /* Display a ddp domain address. */
--static char *ddp_sprint(struct sockaddr *sap, int numeric)
-+static const char *ddp_sprint(struct sockaddr *sap, int numeric)
- {
-     static char buf[64];
- 
-diff --git a/lib/ddp_gr.c b/lib/ddp_gr.c
-index 94169f0..d05c431 100644
---- a/lib/ddp_gr.c
-+++ b/lib/ddp_gr.c
-@@ -1,3 +1,20 @@
-+/*
-+ * lib/ddp_gr.c         Prinbting of DDP (AppleTalk) routing table
-+ *                      used by the NET-LIB.
-+ *
-+ * NET-LIB
-+ *
-+ * Version:     $Id: ddp_gr.c,v 1.4 2002/06/02 05:25:15 ecki Exp $
-+ *
-+ * Author:      Ajax <ajax@firest0rm.org>
-+ *
-+ * Modification:
-+ *  2002-06-02 integrated into main source by Bernd Eckenfels
-+ *
-+ */
-+
-+/* TODO: name lookups (/etc/atalk.names?  NBP?) */
-+
- #include "config.h"
- 
- #if HAVE_AFATALK
-@@ -16,9 +33,62 @@
- #include "pathnames.h"
- #include "intl.h"
- 
-+/* stolen from inet_gr.c */
-+#define flags_decode(i,o) do {                  \
-+        o[0] = '\0';                            \
-+        if (i & RTF_UP) strcat(o, "U");         \
-+        if (i & RTF_GATEWAY) strcat(o, "G");    \
-+        if (i & RTF_REJECT) strcat(o, "!");     \
-+        if (i & RTF_HOST) strcat(o, "H");       \
-+        if (i & RTF_REINSTATE) strcat(o, "R");  \
-+        if (i & RTF_DYNAMIC) strcat(o, "D");    \
-+        if (i & RTF_MODIFIED) strcat(o, "M");   \
-+        if (i & RTF_DEFAULT) strcat(o, "d");    \
-+        if (i & RTF_ALLONLINK) strcat(o, "a");  \
-+        if (i & RTF_ADDRCONF) strcat(o, "c");   \
-+        if (i & RTF_NONEXTHOP) strcat(o, "o");  \
-+        if (i & RTF_EXPIRES) strcat(o, "e");    \
-+        if (i & RTF_CACHE) strcat(o, "c");      \
-+        if (i & RTF_FLOW) strcat(o, "f");       \
-+        if (i & RTF_POLICY) strcat(o, "p");     \
-+        if (i & RTF_LOCAL) strcat(o, "l");      \
-+        if (i & RTF_MTU) strcat(o, "u");        \
-+        if (i & RTF_WINDOW) strcat(o, "w");     \
-+        if (i & RTF_IRTT) strcat(o, "i");       \
-+        if (i & RTF_NOTCACHED) strcat(o, "n");  \
-+    } while (0)
-+
- int DDP_rprint(int options)
- {
--    fprintf(stderr, _("Routing table for `ddp' not yet supported.\n"));
--    return (1);
-+    FILE *fp;
-+    char *dest, *gw, *dev, *flags;
-+    char oflags[32];
-+    char *hdr = "Destination     Gateway         Device          Flags";
-+
-+    fp = fopen(_PATH_PROCNET_ATALK_ROUTE, "r");
-+
-+    if (!fp) {
-+        perror("Error opening " _PATH_PROCNET_ATALK_ROUTE);
-+        fprintf(stderr, "DDP (AppleTalk) not configured on this system.\n");
-+        return 1;
-+    }
-+
-+    if (fscanf(fp, "%ms %ms %ms %ms\n", &dest, &gw, &flags, &dev))
-+		/* eat line */;
-+    free(dest); free(gw); free(flags); free(dev);
-+
-+    printf("%s\n", hdr);
-+
-+    while (fscanf(fp, "%ms %ms %ms %ms\n", &dest, &gw, &flags, &dev) == 4) {
-+        int iflags = atoi(flags);
-+        flags_decode(iflags, oflags);
-+        printf("%-16s%-16s%-16s%-s\n", dest, gw, dev, oflags);
-+        free(dest); free(gw); free(flags); free(dev);
-+    }
-+
-+    fclose(fp);
-+
-+    return 0;
-+
- }
- #endif
-diff --git a/lib/ec_hw.c b/lib/ec_hw.c
-index 825e501..088d125 100644
---- a/lib/ec_hw.c
-+++ b/lib/ec_hw.c
-@@ -2,7 +2,7 @@
-  * lib/ec_hw.c  This file contains an implementation of the Econet
-  *              hardware support functions.
-  *
-- * Version:     $Id: ec_hw.c,v 1.2 1999/09/27 11:00:46 philip Exp $
-+ * Version:     $Id: ec_hw.c,v 1.3 2009/09/06 22:39:20 ecki Exp $
-  *
-  * Author:      Philip Blundell <philb@gnu.org>
-  *
-@@ -16,6 +16,7 @@
- 
- #if HAVE_HWEC
- 
-+#include <stdlib.h>
- #include <net/if_arp.h>
- #include "net-support.h"
- 
-diff --git a/lib/econet.c b/lib/econet.c
-index 1229a28..6cf8a9a 100644
---- a/lib/econet.c
-+++ b/lib/econet.c
-@@ -32,8 +32,8 @@
- 
- 
- /* Display an Econet address */
--static char *
--ec_print(unsigned char *ptr)
-+static const char *
-+ec_print(const char *ptr)
- {
-     static char buff[64];
-     struct ec_addr *ec = (struct ec_addr *) ptr;
-@@ -43,7 +43,7 @@ ec_print(unsigned char *ptr)
- 
- 
- /* Display an Econet socket address */
--static char *
-+static const char *
- ec_sprint(struct sockaddr *sap, int numeric)
- {
-     struct sockaddr_ec *sec = (struct sockaddr_ec *) sap;
-@@ -51,10 +51,10 @@ ec_sprint(struct sockaddr *sap, int numeric)
-     if (sap->sa_family != AF_ECONET)
- 	return _("[NONE SET]");
- 
--    return ec_print((unsigned char *) &sec->addr);
-+    return ec_print((const char *) &sec->addr);
- }
- 
--static int 
-+static int
- ec_input(int type, char *bufp, struct sockaddr *sap)
- {
-     struct sockaddr_ec *sec = (struct sockaddr_ec *) sap;
-diff --git a/lib/ether.c b/lib/ether.c
-index a71aed7..dee9c73 100644
---- a/lib/ether.c
-+++ b/lib/ether.c
-@@ -2,7 +2,7 @@
-  * lib/ether.c        This file contains an implementation of the "Ethernet"
-  *              support functions.
-  *
-- * Version:     $Id: ether.c,v 1.7 1999/09/27 11:00:47 philip Exp $
-+ * Version:     $Id: ether.c,v 1.8 2002/07/30 05:17:29 ecki Exp $
-  *
-  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              Copyright 1993 MicroWalt Corporation
-@@ -35,22 +35,27 @@ extern struct hwtype ether_hwtype;
- 
- 
- /* Display an Ethernet address in readable format. */
--static char *pr_ether(unsigned char *ptr)
-+static const char *pr_ether(const char *ptr)
- {
-     static char buff[64];
- 
--    snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X",
-+    snprintf(buff, sizeof(buff), "%02x:%02x:%02x:%02x:%02x:%02x",
- 	     (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377),
- 	     (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
- 	);
-     return (buff);
- }
- 
-+#ifdef DEBUG
-+#define _DEBUG 1
-+#else
-+#define _DEBUG 0
-+#endif
- 
- /* Input an Ethernet address and convert to binary. */
- static int in_ether(char *bufp, struct sockaddr *sap)
- {
--    unsigned char *ptr;
-+    char *ptr;
-     char c, *orig;
-     int i;
-     unsigned val;
-@@ -70,9 +75,8 @@ static int in_ether(char *bufp, struct sockaddr *sap)
- 	else if (c >= 'A' && c <= 'F')
- 	    val = c - 'A' + 10;
- 	else {
--#ifdef DEBUG
--	    fprintf(stderr, _("in_ether(%s): invalid ether address!\n"), orig);
--#endif
-+	    if (_DEBUG)
-+		fprintf(stderr, _("in_ether(%s): invalid ether address!\n"), orig);
- 	    errno = EINVAL;
- 	    return (-1);
- 	}
-@@ -87,9 +91,8 @@ static int in_ether(char *bufp, struct sockaddr *sap)
- 	else if (c == ':' || c == 0)
- 	    val >>= 4;
- 	else {
--#ifdef DEBUG
--	    fprintf(stderr, _("in_ether(%s): invalid ether address!\n"), orig);
--#endif
-+	    if (_DEBUG)
-+		fprintf(stderr, _("in_ether(%s): invalid ether address!\n"), orig);
- 	    errno = EINVAL;
- 	    return (-1);
- 	}
-@@ -100,28 +103,21 @@ static int in_ether(char *bufp, struct sockaddr *sap)
- 
- 	/* We might get a semicolon here - not required. */
- 	if (*bufp == ':') {
--	    if (i == ETH_ALEN) {
--#ifdef DEBUG
-+	    if (_DEBUG && i == ETH_ALEN)
- 		fprintf(stderr, _("in_ether(%s): trailing : ignored!\n"),
--			orig)
--#endif
--		    ;		/* nothing */
--	    }
-+			orig);
- 	    bufp++;
- 	}
-     }
- 
-     /* That's it.  Any trailing junk? */
--    if ((i == ETH_ALEN) && (*bufp != '\0')) {
--#ifdef DEBUG
-+    if (_DEBUG && (i == ETH_ALEN) && (*bufp != '\0')) {
- 	fprintf(stderr, _("in_ether(%s): trailing junk!\n"), orig);
- 	errno = EINVAL;
- 	return (-1);
--#endif
-     }
--#ifdef DEBUG
--    fprintf(stderr, "in_ether(%s): %s\n", orig, pr_ether(sap->sa_data));
--#endif
-+    if (_DEBUG)
-+	fprintf(stderr, "in_ether(%s): %s\n", orig, pr_ether(sap->sa_data));
- 
-     return (0);
- }
-diff --git a/lib/eui64.c b/lib/eui64.c
-new file mode 100644
-index 0000000..94831c0
---- /dev/null
-+++ b/lib/eui64.c
-@@ -0,0 +1,152 @@
-+/*
-+ * lib/eui64.c  This file contains support for generic EUI-64 hw addressing
-+ *
-+ * Version:     $Id: eui64.c,v 1.1 2001/11/12 02:12:05 ecki Exp $
-+ *
-+ * Author:      Daniel Stodden <stodden@in.tum.de>
-+ *              Copyright 2001 Daniel Stodden
-+ *
-+ *              blueprinted from ether.c
-+ *              Copyright 1993 MicroWalt Corporation
-+ *
-+ *              This program 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 of the License, or  (at
-+ *              your option) any later version.
-+ */
-+#include "config.h"
-+
-+#if HAVE_HWEUI64
-+
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <sys/socket.h>
-+#include <net/if_arp.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <ctype.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <string.h>
-+#include <termios.h>
-+#include <unistd.h>
-+#include "net-support.h"
-+#include "pathnames.h"
-+#include "intl.h"
-+
-+/*
-+ * EUI-64 constants
-+ */
-+
-+#define EUI64_ALEN	8
-+
-+#ifndef ARPHRD_EUI64
-+#define ARPHRD_EUI64	27
-+#warning "ARPHRD_EUI64 not defined in <net/if_arp.h>. Using private value 27"
-+#endif
-+
-+struct hwtype eui64_hwtype;
-+
-+/* Display an EUI-64 address in readable format. */
-+static const char *pr_eui64(const char *ptr)
-+{
-+	static char buff[64];
-+
-+	snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X",
-+		 (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377), (ptr[3] & 0377),
-+		 (ptr[4] & 0377), (ptr[5] & 0377), (ptr[6] & 0377), (ptr[7] & 0377)
-+		);
-+	return (buff);
-+}
-+
-+#ifdef DEBUG
-+#define _DEBUG 1
-+#else
-+#define _DEBUG 0
-+#endif
-+
-+/* Start the PPP encapsulation on the file descriptor. */
-+static int in_eui64( char *bufp, struct sockaddr *sap )
-+{
-+	char *ptr;
-+	char c, *orig;
-+	int i;
-+	unsigned val;
-+
-+	sap->sa_family = eui64_hwtype.type;
-+	ptr = sap->sa_data;
-+
-+	i = 0;
-+	orig = bufp;
-+
-+	while ((*bufp != '\0') && (i < EUI64_ALEN)) {
-+		val = 0;
-+		c = *bufp++;
-+		if (isdigit(c))
-+			val = c - '0';
-+		else if (c >= 'a' && c <= 'f')
-+			val = c - 'a' + 10;
-+		else if (c >= 'A' && c <= 'F')
-+			val = c - 'A' + 10;
-+		else {
-+			if (_DEBUG)
-+				fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"),
-+					 orig );
-+			errno = EINVAL;
-+			return (-1);
-+		}
-+
-+		val <<= 4;
-+		c = *bufp;
-+		if (isdigit(c))
-+			val |= c - '0';
-+		else if (c >= 'a' && c <= 'f')
-+			val |= c - 'a' + 10;
-+		else if (c >= 'A' && c <= 'F')
-+			val |= c - 'A' + 10;
-+		else if (c == ':' || c == 0)
-+			val >>= 4;
-+		else {
-+			if (_DEBUG)
-+				fprintf( stderr, _("in_eui64(%s): invalid eui64 address!\n"),
-+					 orig );
-+			errno = EINVAL;
-+			return (-1);
-+		}
-+
-+		if (c != 0)
-+			bufp++;
-+
-+		*ptr++ = (unsigned char) (val & 0377);
-+		i++;
-+
-+		/* We might get a semicolon here - not required. */
-+		if (*bufp == ':') {
-+			if (_DEBUG && i == EUI64_ALEN)
-+				fprintf(stderr, _("in_eui64(%s): trailing : ignored!\n"),
-+					orig);
-+			bufp++;
-+		}
-+	}
-+
-+	/* That's it.  Any trailing junk? */
-+	if (_DEBUG && (i == EUI64_ALEN) && (*bufp != '\0')) {
-+		fprintf(stderr, _("in_eui64(%s): trailing junk!\n"), orig);
-+		errno = EINVAL;
-+		return (-1);
-+	}
-+	if (_DEBUG)
-+		fprintf(stderr, "in_eui64(%s): %s\n", orig, pr_eui64(sap->sa_data));
-+
-+    return (0);
-+}
-+
-+struct hwtype eui64_hwtype =
-+{
-+	"eui64", NULL, /*"EUI-64 addressing", */ ARPHRD_EUI64, EUI64_ALEN,
-+	pr_eui64, in_eui64, NULL, 0
-+};
-+
-+
-+#endif				/* HAVE_EUI64 */
-diff --git a/lib/fddi.c b/lib/fddi.c
-index f6bf5ca..c18696e 100644
---- a/lib/fddi.c
-+++ b/lib/fddi.c
-@@ -46,7 +46,7 @@ extern struct hwtype fddi_hwtype;
- 
- 
- /* Display an FDDI address in readable format. */
--static char *pr_fddi(unsigned char *ptr)
-+static const char *pr_fddi(const char *ptr)
- {
-     static char buff[64];
- 
-@@ -57,11 +57,16 @@ static char *pr_fddi(unsigned char *ptr)
-     return (buff);
- }
- 
-+#ifdef DEBUG
-+#define _DEBUG 1
-+#else
-+#define _DEBUG 0
-+#endif
- 
- /* Input an FDDI address and convert to binary. */
- static int in_fddi(char *bufp, struct sockaddr *sap)
- {
--    unsigned char *ptr;
-+    char *ptr;
-     char c, *orig;
-     int i, val;
- 
-@@ -80,9 +85,8 @@ static int in_fddi(char *bufp, struct sockaddr *sap)
- 	else if (c >= 'A' && c <= 'F')
- 	    val = c - 'A' + 10;
- 	else {
--#ifdef DEBUG
--	    fprintf(stderr, _("in_fddi(%s): invalid fddi address!\n"), orig);
--#endif
-+	    if (_DEBUG)
-+		fprintf(stderr, _("in_fddi(%s): invalid fddi address!\n"), orig);
- 	    errno = EINVAL;
- 	    return (-1);
- 	}
-@@ -95,9 +99,8 @@ static int in_fddi(char *bufp, struct sockaddr *sap)
- 	else if (c >= 'A' && c <= 'F')
- 	    val |= c - 'A' + 10;
- 	else {
--#ifdef DEBUG
--	    fprintf(stderr, _("in_fddi(%s): invalid fddi address!\n"), orig);
--#endif
-+	    if (_DEBUG)
-+		fprintf(stderr, _("in_fddi(%s): invalid fddi address!\n"), orig);
- 	    errno = EINVAL;
- 	    return (-1);
- 	}
-@@ -106,28 +109,21 @@ static int in_fddi(char *bufp, struct sockaddr *sap)
- 
- 	/* We might get a semicolon here - not required. */
- 	if (*bufp == ':') {
--	    if (i == FDDI_K_ALEN) {
--#ifdef DEBUG
-+	    if (_DEBUG && i == FDDI_K_ALEN)
- 		fprintf(stderr, _("in_fddi(%s): trailing : ignored!\n"),
--			orig)
--#endif
--		    ;		/* nothing */
--	    }
-+			orig);
- 	    bufp++;
- 	}
-     }
- 
-     /* That's it.  Any trailing junk? */
--    if ((i == FDDI_K_ALEN) && (*bufp != '\0')) {
--#ifdef DEBUG
-+    if (_DEBUG && (i == FDDI_K_ALEN) && (*bufp != '\0')) {
- 	fprintf(stderr, _("in_fddi(%s): trailing junk!\n"), orig);
- 	errno = EINVAL;
- 	return (-1);
--#endif
-     }
--#ifdef DEBUG
--    fprintf(stderr, "in_fddi(%s): %s\n", orig, pr_fddi(sap->sa_data));
--#endif
-+    if (_DEBUG)
-+	fprintf(stderr, "in_fddi(%s): %s\n", orig, pr_fddi(sap->sa_data));
- 
-     return (0);
- }
-diff --git a/lib/frame.c b/lib/frame.c
-index 58d1ad4..ad265d6 100644
---- a/lib/frame.c
-+++ b/lib/frame.c
-@@ -37,7 +37,7 @@
- #include "net-support.h"
- #include "pathnames.h"
- 
--char *pr_dlci(unsigned char *ptr)
-+static const char *pr_dlci(const char *ptr)
- {
-     static char buf[12];
- 
-diff --git a/lib/getargs.c b/lib/getargs.c
-index 4170097..6952777 100644
---- a/lib/getargs.c
-+++ b/lib/getargs.c
-@@ -24,12 +24,13 @@
- #include <unistd.h>
- #include "net-support.h"
- #include "pathnames.h"
-+#include "util.h"
- 
- 
- /* Split the input string into multiple fields. */
- int getargs(char *string, char *arguments[])
- {
--    int len = strlen(string); 
-+    int len = strlen(string);
-     char temp[len+1];
-     char *sp, *ptr;
-     int i, argc;
-@@ -41,7 +42,7 @@ int getargs(char *string, char *arguments[])
-      */
-     sp = string;
-     i = 0;
--    strcpy(temp, string);
-+    safe_strncpy(temp, string, sizeof(temp));
-     ptr = temp;
- 
-     /*
-diff --git a/lib/hdlclapb.c b/lib/hdlclapb.c
-index c4ed074..b7d563e 100644
---- a/lib/hdlclapb.c
-+++ b/lib/hdlclapb.c
-@@ -1,11 +1,11 @@
- /*
-- * lib/hdlclapb.c 
-+ * lib/hdlclapb.c
-  *              This file contains the HDLC/LAPB support for the NET-2 base
-  *              distribution.
-  *
-  * Version:    $Id: hdlclapb.c,v 1.5 2000/03/05 11:26:02 philip Exp $
-  *
-- * Original Author:     
-+ * Original Author:
-  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              Copyright 1993 MicroWalt Corporation
-  *
-diff --git a/lib/hippi.c b/lib/hippi.c
-index 308db00..43e7a79 100644
---- a/lib/hippi.c
-+++ b/lib/hippi.c
-@@ -46,7 +46,7 @@ extern struct hwtype hippi_hwtype;
- 
- 
- /* Display an HIPPI address in readable format. */
--static char *pr_hippi(unsigned char *ptr)
-+static const char *pr_hippi(const char *ptr)
- {
-     static char buff[64];
- 
-@@ -57,11 +57,16 @@ static char *pr_hippi(unsigned char *ptr)
-     return (buff);
- }
- 
-+#ifdef DEBUG
-+#define _DEBUG 1
-+#else
-+#define _DEBUG 0
-+#endif
- 
- /* Input an HIPPI address and convert to binary. */
- static int in_hippi(char *bufp, struct sockaddr *sap)
- {
--    unsigned char *ptr;
-+    char *ptr;
-     char c, *orig;
-     int i, val;
- 
-@@ -80,9 +85,8 @@ static int in_hippi(char *bufp, struct sockaddr *sap)
- 	else if (c >= 'A' && c <= 'F')
- 	    val = c - 'A' + 10;
- 	else {
--#ifdef DEBUG
--	    fprintf(stderr, _("in_hippi(%s): invalid hippi address!\n"), orig);
--#endif
-+	    if (_DEBUG)
-+		fprintf(stderr, _("in_hippi(%s): invalid hippi address!\n"), orig);
- 	    errno = EINVAL;
- 	    return (-1);
- 	}
-@@ -95,9 +99,8 @@ static int in_hippi(char *bufp, struct sockaddr *sap)
- 	else if (c >= 'A' && c <= 'F')
- 	    val |= c - 'A' + 10;
- 	else {
--#ifdef DEBUG
--	    fprintf(stderr, _("in_hippi(%s): invalid hippi address!\n"), orig);
--#endif
-+	    if (_DEBUG)
-+		fprintf(stderr, _("in_hippi(%s): invalid hippi address!\n"), orig);
- 	    errno = EINVAL;
- 	    return (-1);
- 	}
-@@ -106,27 +109,20 @@ static int in_hippi(char *bufp, struct sockaddr *sap)
- 
- 	/* We might get a semicolon here - not required. */
- 	if (*bufp == ':') {
--	    if (i == HIPPI_ALEN) {
--#ifdef DEBUG
--		fprintf(stderr, _("in_hippi(%s): trailing : ignored!\n"), orig)
--#endif
--		    ;		/* nothing */
--	    }
-+	    if (_DEBUG && i == HIPPI_ALEN)
-+		fprintf(stderr, _("in_hippi(%s): trailing : ignored!\n"), orig);
- 	    bufp++;
- 	}
-     }
- 
-     /* That's it.  Any trailing junk? */
--    if ((i == HIPPI_ALEN) && (*bufp != '\0')) {
--#ifdef DEBUG
-+    if (_DEBUG && (i == HIPPI_ALEN) && (*bufp != '\0')) {
- 	fprintf(stderr, _("in_hippi(%s): trailing junk!\n"), orig);
- 	errno = EINVAL;
- 	return (-1);
--#endif
-     }
--#ifdef DEBUG
--    fprintf(stderr, "in_hippi(%s): %s\n", orig, pr_hippi(sap->sa_data));
--#endif
-+    if (_DEBUG)
-+	fprintf(stderr, "in_hippi(%s): %s\n", orig, pr_hippi(sap->sa_data));
- 
-     return (0);
- }
-diff --git a/lib/hw.c b/lib/hw.c
-index 4989748..71dfcf9 100644
---- a/lib/hw.c
-+++ b/lib/hw.c
-@@ -2,7 +2,7 @@
-  * lib/hw.c   This file contains the top-level part of the hardware
-  *              support functions module.
-  *
-- * Version:     $Id: hw.c,v 1.17 2000/05/20 13:38:10 pb Exp $
-+ * Version:     $Id: hw.c,v 1.19 2008/10/03 01:52:04 ecki Exp $
-  *
-  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
-  *
-@@ -73,6 +73,10 @@ extern struct hwtype irda_hwtype;
- 
- extern struct hwtype ec_hwtype;
- 
-+extern struct hwtype ib_hwtype;
-+
-+extern struct hwtype eui64_hwtype;
-+
- static struct hwtype *hwtypes[] =
- {
- 
-@@ -97,7 +101,7 @@ static struct hwtype *hwtypes[] =
- #if HAVE_HWTR
-     &tr_hwtype,
- #ifdef ARPHRD_IEEE802_TR
--    &tr_hwtype1, 
-+    &tr_hwtype1,
- #endif
- #endif
- #if HAVE_HWAX25
-@@ -144,6 +148,12 @@ static struct hwtype *hwtypes[] =
- #if HAVE_HWX25
-     &x25_hwtype,
- #endif
-+#if HAVE_HWIB
-+    &ib_hwtype,
-+#endif
-+#if HAVE_HWEUI64
-+    &eui64_hwtype,
-+#endif
-     &unspec_hwtype,
-     NULL
- };
-@@ -211,12 +221,18 @@ void hwinit()
- #if HAVE_HWTR
-     tr_hwtype.title = _("16/4 Mbps Token Ring");
- #ifdef ARPHRD_IEEE802_TR
--    tr_hwtype1.title = _("16/4 Mbps Token Ring (New)") ; 
-+    tr_hwtype1.title = _("16/4 Mbps Token Ring (New)") ;
- #endif
- #endif
- #if HAVE_HWEC
-     ec_hwtype.title = _("Econet");
- #endif
-+#if HAVE_HWIB
-+    ib_hwtype.title = _("InfiniBand");
-+#endif
-+#if HAVE_HWEUI64
-+    eui64_hwtype.title = _("Generic EUI-64");
-+#endif
-     sVhwinit = 1;
- }
- 
-@@ -269,7 +285,7 @@ void print_hwlist(int type) {
- 	if (((type == 1) && ((*hwp)->alen == 0)) || ((*hwp)->type == -1)) {
- 		hwp++; continue;
- 	}
--	if ((count % 3) == 0) fprintf(stderr,count?"\n    ":"    "); 
-+	if ((count % 3) == 0) fprintf(stderr,count?"\n    ":"    ");
-         txt = (*hwp)->name; if (!txt) txt = "..";
- 	fprintf(stderr,"%s (%s) ",txt,(*hwp)->title);
- 	count++;
-diff --git a/lib/ib.c b/lib/ib.c
-new file mode 100644
-index 0000000..1eeb7f0
---- /dev/null
-+++ b/lib/ib.c
-@@ -0,0 +1,151 @@
-+/*
-+ * lib/ib.c        This file contains an implementation of the "Infiniband"
-+ *              support functions.
-+ *
-+ * Version:     $Id: ib.c,v 1.1 2008/10/03 01:52:03 ecki Exp $
-+ *
-+ * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-+ *              Copyright 1993 MicroWalt Corporation
-+ *		Tom Duffy <tduffy@sun.com>
-+ *
-+ *              This program 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 of the License, or  (at
-+ *              your option) any later version.
-+ */
-+#include "config.h"
-+
-+#if HAVE_HWIB
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <net/if_arp.h>
-+#include <linux/if_infiniband.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <errno.h>
-+#include <ctype.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include "net-support.h"
-+#include "pathnames.h"
-+#include "intl.h"
-+#include "util.h"
-+
-+extern struct hwtype ib_hwtype;
-+
-+
-+/* Display an InfiniBand address in readable format. */
-+static const char *pr_ib(const char *ptr)
-+{
-+    static char buff[128];
-+    char *pos;
-+    unsigned int i;
-+
-+    pos = buff;
-+    for (i = 0; i < INFINIBAND_ALEN; i++) {
-+	pos += sprintf(pos, "%02X:", (*ptr++ & 0377));
-+    }
-+    buff[strlen(buff) - 1] = '\0';
-+    fprintf(stderr, _("Infiniband hardware address can be incorrect! Please read BUGS section in ifconfig(8).\n"));
-+    /* snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X",
-+	     (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377),
-+	     (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
-+	);
-+    */
-+    return (buff);
-+}
-+
-+#ifdef DEBUG
-+#define _DEBUG 1
-+#else
-+#define _DEBUG 0
-+#endif
-+
-+/* Input an Infiniband address and convert to binary. */
-+static int in_ib(char *bufp, struct sockaddr *sap)
-+{
-+    char *ptr;
-+    char c, *orig;
-+    int i;
-+    unsigned val;
-+
-+    sap->sa_family = ib_hwtype.type;
-+    ptr = sap->sa_data;
-+
-+    i = 0;
-+    orig = bufp;
-+    while ((*bufp != '\0') && (i < INFINIBAND_ALEN)) {
-+	val = 0;
-+	c = *bufp++;
-+	if (isdigit(c))
-+	    val = c - '0';
-+	else if (c >= 'a' && c <= 'f')
-+	    val = c - 'a' + 10;
-+	else if (c >= 'A' && c <= 'F')
-+	    val = c - 'A' + 10;
-+	else {
-+	    if (_DEBUG)
-+		fprintf(stderr, _("in_ib(%s): invalid infiniband address!\n"), orig);
-+	    errno = EINVAL;
-+	    return (-1);
-+	}
-+	val <<= 4;
-+	c = *bufp;
-+	if (isdigit(c))
-+	    val |= c - '0';
-+	else if (c >= 'a' && c <= 'f')
-+	    val |= c - 'a' + 10;
-+	else if (c >= 'A' && c <= 'F')
-+	    val |= c - 'A' + 10;
-+	else if (c == ':' || c == 0)
-+	    val >>= 4;
-+	else {
-+#ifdef DEBUG
-+	    fprintf(stderr, _("in_ib(%s): invalid infiniband address!\n"), orig);
-+#endif
-+	    errno = EINVAL;
-+	    return (-1);
-+	}
-+	if (c != 0)
-+	    bufp++;
-+	*ptr++ = (unsigned char) (val & 0377);
-+	i++;
-+
-+	/* We might get a semicolon here - not required. */
-+	if (*bufp == ':') {
-+	    if (i == INFINIBAND_ALEN) {
-+#ifdef DEBUG
-+		fprintf(stderr, _("in_ib(%s): trailing : ignored!\n"),
-+			orig)
-+#endif
-+		    ;		/* nothing */
-+	    }
-+	    bufp++;
-+	}
-+    }
-+
-+    /* That's it.  Any trailing junk? */
-+    if ((i == INFINIBAND_ALEN) && (*bufp != '\0')) {
-+#ifdef DEBUG
-+	fprintf(stderr, _("in_ib(%s): trailing junk!\n"), orig);
-+	errno = EINVAL;
-+	return (-1);
-+#endif
-+    }
-+#ifdef DEBUG
-+    fprintf(stderr, "in_ib(%s): %s\n", orig, pr_ib(sap->sa_data));
-+#endif
-+
-+    return (0);
-+}
-+
-+
-+struct hwtype ib_hwtype =
-+{
-+    "infiniband", NULL, ARPHRD_INFINIBAND, INFINIBAND_ALEN,
-+    pr_ib, in_ib, NULL
-+};
-+
-+
-+#endif				/* HAVE_HWIB */
-diff --git a/lib/inet.c b/lib/inet.c
-index ae90664..fc23b17 100644
---- a/lib/inet.c
-+++ b/lib/inet.c
-@@ -3,7 +3,7 @@
-  *              support functions for the net-tools.
-  *              (NET-3 base distribution).
-  *
-- * Version:    $Id: inet.c,v 1.13 1999/12/11 13:35:56 freitag Exp $
-+ * Version:    $Id: inet.c,v 1.14 2003/10/19 11:57:37 pb Exp $
-  *
-  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              Copyright 1993 MicroWalt Corporation
-@@ -14,11 +14,11 @@
-  *960203 {1.23} Bernd Eckenfels :       net-features support
-  *960217 {1.24} Bernd Eckenfels :       get_sname
-  *960219 {1.25} Bernd Eckenfels :       extern int h_errno
-- *960329 {1.26} Bernd Eckenfels :       resolve 255.255.255.255 
-+ *960329 {1.26} Bernd Eckenfels :       resolve 255.255.255.255
-  *980101 {1.27} Bernd Eckenfels :	resolve raw sockets in /etc/protocols
-  *990302 {1.28} Phil Blundell   :       add netmask to INET_rresolve
-  *991007        Kurt Garloff	:	rresolve, resolve: may be hosts
-- *		<garloff@suse.de>	store type (host?) in cache 
-+ *		<garloff@suse.de>	store type (host?) in cache
-  *
-  *              This program is free software; you can redistribute it
-  *              and/or  modify it under  the terms of  the GNU General
-@@ -96,9 +96,9 @@ static int INET_resolve(char *name, struct sockaddr_in *sin, int hostfirst)
- #ifdef DEBUG
-     if (hostfirst) fprintf (stderr, "gethostbyname (%s)\n", name);
- #endif
--    if (hostfirst && 
-+    if (hostfirst &&
- 	(hp = gethostbyname(name)) != (struct hostent *) NULL) {
--	memcpy((char *) &sin->sin_addr, (char *) hp->h_addr_list[0], 
-+	memcpy((char *) &sin->sin_addr, (char *) hp->h_addr_list[0],
- 		sizeof(struct in_addr));
- 	return 0;
-     }
-@@ -127,24 +127,24 @@ static int INET_resolve(char *name, struct sockaddr_in *sin, int hostfirst)
- 	errno = h_errno;
- 	return -1;
-     }
--    memcpy((char *) &sin->sin_addr, (char *) hp->h_addr_list[0], 
-+    memcpy((char *) &sin->sin_addr, (char *) hp->h_addr_list[0],
- 	   sizeof(struct in_addr));
- 
-     return 0;
- }
- 
- 
--/* numeric: & 0x8000: default instead of *, 
-- *	    & 0x4000: host instead of net, 
-+/* numeric: & 0x8000: default instead of *,
-+ *	    & 0x4000: host instead of net,
-  *	    & 0x0fff: don't resolve
-  */
--static int INET_rresolve(char *name, size_t len, struct sockaddr_in *sin, 
-+static int INET_rresolve(char *name, size_t len, struct sockaddr_in *sin,
- 			 int numeric, unsigned int netmask)
- {
-     struct hostent *ent;
-     struct netent *np;
-     struct addr *pn;
--    unsigned long ad, host_ad;
-+    u_int32_t ad, host_ad;
-     int host = 0;
- 
-     /* Grmpf. -FvK */
-@@ -155,24 +155,34 @@ static int INET_rresolve(char *name, size_t len, struct sockaddr_in *sin,
- 	errno = EAFNOSUPPORT;
- 	return (-1);
-     }
--    ad = (unsigned long) sin->sin_addr.s_addr;
-+    ad = sin->sin_addr.s_addr;
- #ifdef DEBUG
--    fprintf (stderr, "rresolve: %08lx, mask %08x, num %08x \n", ad, netmask, numeric);
-+    fprintf (stderr, "rresolve: %08lx, mask %08x, num %08x, len %d\n", ad, netmask, numeric, len);
- #endif
-+
-+    // if no symbolic names are requested we shortcut with ntoa
-+    if (numeric & 0x0FFF) {
-+        safe_strncpy(name, inet_ntoa(sin->sin_addr), len);
-+	return (0);
-+    }
-+
-+    // we skip getnetbyaddr for 0.0.0.0/0 and 0.0.0.0/~0
-     if (ad == INADDR_ANY) {
--	if ((numeric & 0x0FFF) == 0) {
-+        if (netmask == INADDR_ANY) {
-+            // for 0.0.0.0/0 we hardcode symbolic name
- 	    if (numeric & 0x8000)
- 		safe_strncpy(name, "default", len);
- 	    else
- 	        safe_strncpy(name, "*", len);
- 	    return (0);
-+	} else {
-+	    // for 0.0.0.0/1 we skip getnetbyname()
-+            safe_strncpy(name, "0.0.0.0", len);
-+            return (0);
- 	}
-     }
--    if (numeric & 0x0FFF) {
--        safe_strncpy(name, inet_ntoa(sin->sin_addr), len);
--	return (0);
--    }
- 
-+    // it is a host address if flagged or any host bits set
-     if ((ad & (~netmask)) != 0 || (numeric & 0x4000))
- 	host = 1;
- #if 0
-@@ -183,7 +193,7 @@ static int INET_rresolve(char *name, size_t len, struct sockaddr_in *sin,
- 	if (pn->addr.sin_addr.s_addr == ad && pn->host == host) {
- 	    safe_strncpy(name, pn->name, len);
- #ifdef DEBUG
--	    fprintf (stderr, "rresolve: found %s %08lx in cache\n", (host? "host": "net"), ad);
-+	    fprintf (stderr, "rresolve: found %s %08lx in cache (name=%s, len=%d)\n", (host? "host": "net"), ad, name, len);
- #endif
- 	    return (0);
- 	}
-@@ -210,12 +220,11 @@ static int INET_rresolve(char *name, size_t len, struct sockaddr_in *sin,
-     }
-     if ((ent == NULL) && (np == NULL))
- 	safe_strncpy(name, inet_ntoa(sin->sin_addr), len);
--    pn = (struct addr *) malloc(sizeof(struct addr));
-+    pn = (struct addr *) xmalloc(sizeof(struct addr));
-     pn->addr = *sin;
-     pn->next = INET_nn;
-     pn->host = host;
--    pn->name = (char *) malloc(strlen(name) + 1);
--    strcpy(pn->name, name);
-+    pn->name = xstrdup(name);
-     INET_nn = pn;
- 
-     return (0);
-@@ -229,35 +238,35 @@ static void INET_reserror(char *text)
- 
- 
- /* Display an Internet socket address. */
--static char *INET_print(unsigned char *ptr)
-+static const char *INET_print(const char *ptr)
- {
-     return (inet_ntoa((*(struct in_addr *) ptr)));
- }
- 
- 
- /* Display an Internet socket address. */
--static char *INET_sprint(struct sockaddr *sap, int numeric)
-+static const char *INET_sprint(struct sockaddr *sap, int numeric)
- {
-     static char buff[128];
- 
-     if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
- 	return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff));
- 
--    if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap, 
-+    if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap,
- 		      numeric, 0xffffff00) != 0)
- 	return (NULL);
- 
-     return (buff);
- }
- 
--char *INET_sprintmask(struct sockaddr *sap, int numeric, 
-+char *INET_sprintmask(struct sockaddr *sap, int numeric,
- 		      unsigned int netmask)
- {
-     static char buff[128];
- 
-     if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
- 	return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff));
--    if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap, 
-+    if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap,
- 		      numeric, netmask) != 0)
- 	return (NULL);
-     return (buff);
-@@ -385,10 +394,8 @@ static int read_services(void)
-     setservent(1);
-     while ((se = getservent())) {
- 	/* Allocate a service entry. */
--	item = (struct service *) malloc(sizeof(struct service));
--	if (item == NULL)
--	    perror("netstat");
--	item->name = strdup(se->s_name);
-+	item = (struct service *) xmalloc(sizeof(struct service));
-+	item->name = xstrdup(se->s_name);
- 	item->number = se->s_port;
- 
- 	/* Fill it in. */
-@@ -398,16 +405,17 @@ static int read_services(void)
- 	    add2list(&udp_name, item);
- 	} else if (!strcmp(se->s_proto, "raw")) {
- 	    add2list(&raw_name, item);
-+	} else { /* sctp, ddp, dccp */
-+	    free(item->name);
-+	    free(item);
- 	}
-     }
-     endservent();
-     setprotoent(1);
-     while ((pe = getprotoent())) {
- 	/* Allocate a service entry. */
--	item = (struct service *) malloc(sizeof(struct service));
--	if (item == NULL)
--	    perror("netstat");
--	item->name = strdup(pe->p_name);
-+	item = (struct service *) xmalloc(sizeof(struct service));
-+	item->name = xstrdup(pe->p_name);
- 	item->number = htons(pe->p_proto);
- 	add2list(&raw_name, item);
-     }
-@@ -416,35 +424,38 @@ static int read_services(void)
- }
- 
- 
--char *get_sname(int socknumber, char *proto, int numeric)
-+const char *get_sname(int socknumber, const char *proto, int numeric)
- {
-     static char buffer[64], init = 0;
-     struct service *item;
- 
-     if (socknumber == 0)
- 	return ("*");
--    if (numeric) {
--	sprintf(buffer, "%d", ntohs(socknumber));
--	return (buffer);
--    }
-+    if (numeric)
-+	goto do_ntohs;
-+
-     if (!init) {
- 	(void) read_services();
- 	init = 1;
-     }
-     buffer[0] = '\0';
--    if (!strcmp(proto, "tcp")) {
--	if ((item = searchlist(tcp_name, socknumber)) != NULL)
--	    sprintf(buffer, "%s", item->name);
--    } else if (!strcmp(proto, "udp")) {
--	if ((item = searchlist(udp_name, socknumber)) != NULL)
--	    sprintf(buffer, "%s", item->name);
--    } else if (!strcmp(proto, "raw")) {
--	if ((item = searchlist(raw_name, socknumber)) != NULL)
--	    sprintf(buffer, "%s", item->name);
--
-+    if (!strcmp(proto, "tcp"))
-+	item = searchlist(tcp_name, socknumber);
-+    else if (!strcmp(proto, "udp"))
-+	item = searchlist(udp_name, socknumber);
-+    else if (!strcmp(proto, "raw"))
-+	item = searchlist(raw_name, socknumber);
-+    else
-+	item = NULL;
-+    if (item) {
-+	strncpy(buffer, item->name, sizeof(buffer));
-+	buffer[sizeof(buffer) - 1] = '\0';
-     }
--    if (!buffer[0])
-+
-+    if (!buffer[0]) {
-+ do_ntohs:
- 	sprintf(buffer, "%d", ntohs(socknumber));
-+    }
-     return (buffer);
- }
- 
-diff --git a/lib/inet6.c b/lib/inet6.c
-index 1f936b3..b428d07 100644
---- a/lib/inet6.c
-+++ b/lib/inet6.c
-@@ -3,7 +3,7 @@
-  *              support functions for the net-tools.
-  *              (most of it copied from lib/inet.c 1.26).
-  *
-- * Version:     $Id: inet6.c,v 1.10 2000/10/28 11:04:00 pb Exp $
-+ * Version:     $Id: inet6.c,v 1.13 2010-07-05 22:52:00 ecki Exp $
-  *
-  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              Copyright 1993 MicroWalt Corporation
-@@ -44,6 +44,21 @@
- 
- extern int h_errno;		/* some netdb.h versions don't export this */
- 
-+char * fix_v4_address(char *buf, struct in6_addr *in6)
-+{
-+	if (IN6_IS_ADDR_V4MAPPED(in6->s6_addr)) {
-+			char *s =strchr(buf, '.');
-+			if (s) {
-+				while (s > buf && *s != ':')
-+					--s;
-+				if (*s == ':') ++s;
-+				else s = NULL;
-+			}
-+			if (s) return s;
-+	}
-+	return buf;
-+}
-+
- static int INET6_resolve(char *name, struct sockaddr_in6 *sin6)
- {
-     struct addrinfo req, *ai;
-@@ -69,10 +84,9 @@ static int INET6_resolve(char *name, struct sockaddr_in6 *sin6)
- #endif
- 
- 
--static int INET6_rresolve(char *name, struct sockaddr_in6 *sin6, int numeric)
-+static int INET6_rresolve(char *name, size_t namelen,
-+			  struct sockaddr_in6 *sin6, int numeric)
- {
--    int s;
--
-     /* Grmpf. -FvK */
-     if (sin6->sin6_family != AF_INET6) {
- #ifdef DEBUG
-@@ -83,21 +97,20 @@ static int INET6_rresolve(char *name, struct sockaddr_in6 *sin6, int numeric)
- 	return (-1);
-     }
-     if (numeric & 0x7FFF) {
--	inet_ntop(AF_INET6, &sin6->sin6_addr, name, 80);
-+	inet_ntop( AF_INET6, &sin6->sin6_addr, name, namelen);
- 	return (0);
-     }
-     if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
-         if (numeric & 0x8000)
--	    strcpy(name, "default");
-+	    safe_strncpy(name, "default", namelen);
- 	else
--	    strcpy(name, "*");
-+	    safe_strncpy(name, "[::]", namelen);
- 	return (0);
-     }
- 
--    if ((s = getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6),
--			 name, 255 /* !! */ , NULL, 0, 0))) {
--	fputs("getnameinfo failed\n", stderr);
--	return -1;
-+    if (getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6),
-+		    name, namelen , NULL, 0, 0)) {
-+	inet_ntop( AF_INET6, &sin6->sin6_addr, name, namelen);
-     }
-     return (0);
- }
-@@ -109,41 +122,48 @@ static void INET6_reserror(char *text)
- }
- 
- 
-+
- /* Display an Internet socket address. */
--static char *INET6_print(unsigned char *ptr)
-+static const char *INET6_print(const char *ptr)
- {
-     static char name[80];
- 
-     inet_ntop(AF_INET6, (struct in6_addr *) ptr, name, 80);
--    return name;
-+	return fix_v4_address(name, (struct in6_addr *)ptr);
- }
- 
- 
- /* Display an Internet socket address. */
- /* dirty! struct sockaddr usually doesn't suffer for inet6 addresses, fst. */
--static char *INET6_sprint(struct sockaddr *sap, int numeric)
-+static const char *INET6_sprint(struct sockaddr *sap, int numeric)
- {
-     static char buff[128];
- 
-     if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
- 	return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff));
--    if (INET6_rresolve(buff, (struct sockaddr_in6 *) sap, numeric) != 0)
-+    if (INET6_rresolve(buff, sizeof(buff),
-+		       (struct sockaddr_in6 *) sap, numeric) != 0)
- 	return safe_strncpy(buff, _("[UNKNOWN]"), sizeof(buff));
--    return (buff);
-+    return (fix_v4_address(buff, &((struct sockaddr_in6 *)sap)->sin6_addr));
- }
- 
- 
- static int INET6_getsock(char *bufp, struct sockaddr *sap)
- {
-     struct sockaddr_in6 *sin6;
-+	char *p;
- 
-     sin6 = (struct sockaddr_in6 *) sap;
-     sin6->sin6_family = AF_INET6;
-     sin6->sin6_port = 0;
-+    sin6->sin6_scope_id = 0;
-+    sin6->sin6_flowinfo = 0;
- 
-     if (inet_pton(AF_INET6, bufp, sin6->sin6_addr.s6_addr) <= 0)
- 	return (-1);
--
-+    p = fix_v4_address(bufp, &sin6->sin6_addr);
-+    if (p != bufp)
-+        memcpy(bufp, p, strlen(p)+1);
-     return 16;			/* ?;) */
- }
- 
-diff --git a/lib/inet6_gr.c b/lib/inet6_gr.c
-index 14f32eb..72b4a66 100644
---- a/lib/inet6_gr.c
-+++ b/lib/inet6_gr.c
-@@ -1,4 +1,4 @@
--/*
-+ /*
-    Modifications:
-    1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets,
-    snprintf instead of sprintf
-@@ -31,6 +31,7 @@
- #include "pathnames.h"
- #include "intl.h"
- #include "net-features.h"
-+#include "util.h"
- 
- /* neighbour discovery from linux-2.4.0/include/net/neighbour.h */
- 
-@@ -63,7 +64,7 @@ int rprint_fib6(int ext, int numeric)
-     struct sockaddr_in6 saddr6, snaddr6;
-     int num, iflags, metric, refcnt, use, prefix_len, slen;
-     FILE *fp = fopen(_PATH_PROCNET_ROUTE6, "r");
--    
-+
-     char addr6p[8][5], saddr6p[8][5], naddr6p[8][5];
- 
-     if (!fp) {
-@@ -71,14 +72,18 @@ int rprint_fib6(int ext, int numeric)
-         printf(_("INET6 (IPv6) not configured in this system.\n"));
- 	return 1;
-     }
--    printf(_("Kernel IPv6 routing table\n"));
- 
--    printf(_("Destination                                 "
--	     "Next Hop                                "
--	     "Flags Metric Ref    Use Iface\n"));
-+    if (numeric & RTF_CACHE)
-+    	printf(_("Kernel IPv6 routing cache\n"));
-+    else
-+    	printf(_("Kernel IPv6 routing table\n"));
-+
-+    printf(_("Destination                    "
-+	     "Next Hop                   "
-+	     "Flag Met Ref Use If\n"));
- 
-     while (fgets(buff, 1023, fp)) {
--	num = sscanf(buff, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %08x %08x %08x %08x %s\n",
-+	num = sscanf(buff, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %08x %08x %08x %08x %15s\n",
- 		     addr6p[0], addr6p[1], addr6p[2], addr6p[3],
- 		     addr6p[4], addr6p[5], addr6p[6], addr6p[7],
- 		     &prefix_len,
-@@ -87,20 +92,24 @@ int rprint_fib6(int ext, int numeric)
- 		     &slen,
- 		     naddr6p[0], naddr6p[1], naddr6p[2], naddr6p[3],
- 		     naddr6p[4], naddr6p[5], naddr6p[6], naddr6p[7],
--		     &metric, &use, &refcnt, &iflags, iface);
--#if 0
--	if (num < 23)
--	    continue;
--#endif
--	if (!(iflags & RTF_UP))
-+		     &metric, &refcnt, &use, &iflags, iface);
-+	if (0 && num < 23)
- 	    continue;
-+	if (iflags & RTF_CACHE) {
-+		if (!(numeric & RTF_CACHE))
-+			continue;
-+	} else {
-+		if (numeric & RTF_CACHE)
-+			continue;
-+	}
-+
- 	/* Fetch and resolve the target address. */
- 	snprintf(addr6, sizeof(addr6), "%s:%s:%s:%s:%s:%s:%s:%s",
- 		 addr6p[0], addr6p[1], addr6p[2], addr6p[3],
- 		 addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
- 	inet6_aftype.input(1, addr6, (struct sockaddr *) &saddr6);
- 	snprintf(addr6, sizeof(addr6), "%s/%d",
--		 inet6_aftype.sprint((struct sockaddr *) &saddr6, 1),
-+		 inet6_aftype.sprint((struct sockaddr *) &saddr6, numeric),
- 		 prefix_len);
- 
- 	/* Fetch and resolve the nexthop address. */
-@@ -109,10 +118,15 @@ int rprint_fib6(int ext, int numeric)
- 		 naddr6p[4], naddr6p[5], naddr6p[6], naddr6p[7]);
- 	inet6_aftype.input(1, naddr6, (struct sockaddr *) &snaddr6);
- 	snprintf(naddr6, sizeof(naddr6), "%s",
--		 inet6_aftype.sprint((struct sockaddr *) &snaddr6, 1));
-+		 inet6_aftype.sprint((struct sockaddr *) &snaddr6, numeric));
- 
- 	/* Decode the flags. */
--	strcpy(flags, "U");
-+
-+	flags[0]=0;
-+	if (iflags & RTF_UP)
-+	    strcat(flags, "U");
-+	if (iflags & RTF_REJECT)
-+	    strcat(flags, "!");
- 	if (iflags & RTF_GATEWAY)
- 	    strcat(flags, "G");
- 	if (iflags & RTF_HOST)
-@@ -123,9 +137,19 @@ int rprint_fib6(int ext, int numeric)
- 	    strcat(flags, "A");
- 	if (iflags & RTF_CACHE)
- 	    strcat(flags, "C");
-+	if (iflags & RTF_ALLONLINK)
-+	    strcat(flags, "a");
-+	if (iflags & RTF_EXPIRES)
-+	    strcat(flags, "e");
-+	if (iflags & RTF_MODIFIED)
-+	    strcat(flags, "m");
-+	if (iflags & RTF_NONEXTHOP)
-+	    strcat(flags, "n");
-+	if (iflags & RTF_FLOW)
-+	    strcat(flags, "f");
- 
- 	/* Print the info. */
--	printf("%-43s %-39s %-5s %-6d %-2d %7d %-8s\n",
-+	printf("%-30s %-26s %-4s %-3d %-1d%6d %s\n",
- 	       addr6, naddr6, flags, metric, refcnt, use, iface);
-     }
- 
-@@ -138,14 +162,13 @@ int rprint_cache6(int ext, int numeric)
-     char buff[4096], iface[16], flags[16];
-     char addr6[128], haddr[20], statestr[20];
-     struct sockaddr_in6 saddr6;
--    int type, num, refcnt, prefix_len, location, state, gc;
-+    int type, refcnt, prefix_len, location, state, gc;
-     long tstamp, expire, ndflags, reachable, stale, delete;
-     FILE *fp = fopen(_PATH_PROCNET_NDISC, "r");
-     char addr6p[8][5], haddrp[6][3];
- 
-     if (!fp) {
--	ESYSNOT("nd_print", "ND Table");
--	return 1;
-+	return rprint_fib6(ext, numeric | RTF_CACHE);
-     }
-     printf(_("Kernel IPv6 Neighbour Cache\n"));
- 
-@@ -160,7 +183,7 @@ int rprint_cache6(int ext, int numeric)
- 
- 
-     while (fgets(buff, 1023, fp)) {
--	num = sscanf(buff, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %08lx %08lx %08lx %04x %04x %04lx %8s %2s%2s%2s%2s%2s%2s\n",
-+	sscanf(buff, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %08lx %08lx %08lx %04x %04x %04lx %8s %2s%2s%2s%2s%2s%2s\n",
- 		     addr6p[0], addr6p[1], addr6p[2], addr6p[3],
- 		     addr6p[4], addr6p[5], addr6p[6], addr6p[7],
- 		     &location, &prefix_len, &type, &state, &expire, &tstamp, &reachable, &gc, &refcnt,
-@@ -194,31 +217,31 @@ int rprint_cache6(int ext, int numeric)
- 	/* Decode the state */
- 	switch (state) {
- 	case NUD_NONE:
--	    strcpy(statestr, "NONE");
-+	    safe_strncpy(statestr, "NONE", sizeof(statestr));
- 	    break;
- 	case NUD_INCOMPLETE:
--	    strcpy(statestr, "INCOMPLETE");
-+	    safe_strncpy(statestr, "INCOMPLETE", sizeof(statestr));
- 	    break;
- 	case NUD_REACHABLE:
--	    strcpy(statestr, "REACHABLE");
-+	    safe_strncpy(statestr, "REACHABLE", sizeof(statestr));
- 	    break;
- 	case NUD_STALE:
--	    strcpy(statestr, "STALE");
-+	    safe_strncpy(statestr, "STALE", sizeof(statestr));
- 	    break;
- 	case NUD_DELAY:
--	    strcpy(statestr, "DELAY");
-+	    safe_strncpy(statestr, "DELAY", sizeof(statestr));
- 	    break;
- 	case NUD_PROBE:
--	    strcpy(statestr, "PROBE");
-+	    safe_strncpy(statestr, "PROBE", sizeof(statestr));
- 	    break;
- 	case NUD_FAILED:
--	    strcpy(statestr, "FAILED");
-+	    safe_strncpy(statestr, "FAILED", sizeof(statestr));
- 	    break;
- 	case NUD_NOARP:
--	    strcpy(statestr, "NOARP");
-+	    safe_strncpy(statestr, "NOARP", sizeof(statestr));
- 	    break;
- 	case NUD_PERMANENT:
--	    strcpy(statestr, "PERM");
-+	    safe_strncpy(statestr, "PERM", sizeof(statestr));
- 	    break;
- 	default:
- 	    snprintf(statestr, sizeof(statestr), "UNKNOWN(%02x)", state);
-diff --git a/lib/inet6_sr.c b/lib/inet6_sr.c
-index fbfe033..1ad9510 100644
---- a/lib/inet6_sr.c
-+++ b/lib/inet6_sr.c
-@@ -33,7 +33,7 @@
- #include "pathnames.h"
- #include "intl.h"
- #include "net-features.h"
--
-+#include "util.h"
- 
- 
- extern struct aftype inet6_aftype;
-@@ -63,7 +63,7 @@ static int INET6_setroute(int action, int options, char **args)
-     if (*args == NULL)
- 	return (usage());
- 
--    strcpy(target, *args++);
-+    safe_strncpy(target, *args++, sizeof(target));
-     if (!strcmp(target, "default")) {
-         prefix_len = 0;
- 	memset(&sa6, 0, sizeof(sa6));
-@@ -112,7 +112,7 @@ static int INET6_setroute(int action, int options, char **args)
- 		return (usage());
- 	    if (rt.rtmsg_flags & RTF_GATEWAY)
- 		return (usage());
--	    strcpy(gateway, *args);
-+	    safe_strncpy(gateway, *args, sizeof(gateway));
- 	    if (inet6_aftype.input(1, gateway,
- 				   (struct sockaddr *) &sa6) < 0) {
- 		inet6_aftype.herror(gateway);
-@@ -152,7 +152,7 @@ static int INET6_setroute(int action, int options, char **args)
-     }
-     if (devname) {
- 	memset(&ifr, 0, sizeof(ifr));
--	strcpy(ifr.ifr_name, devname);
-+	safe_strncpy(ifr.ifr_name, devname, sizeof(ifr.ifr_name));
- 
- 	if (ioctl(skfd, SIOGIFINDEX, &ifr) < 0) {
- 	    perror("SIOGIFINDEX");
-diff --git a/lib/inet_gr.c b/lib/inet_gr.c
-index d1e5efc..f67e89d 100644
---- a/lib/inet_gr.c
-+++ b/lib/inet_gr.c
-@@ -1,5 +1,5 @@
- /*
--   $Id: inet_gr.c,v 1.13 2000/10/08 01:00:44 ecki Exp $
-+   $Id: inet_gr.c,v 1.14 2009/07/08 00:24:03 ecki Exp $
- 
-    Modifications:
-    1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets
-@@ -31,14 +31,15 @@
- #include "intl.h"
- #include "net-features.h"
- #include "proc.h"
-+#include "util.h"
- extern struct aftype inet_aftype;
- 
--extern char *INET_sprintmask(struct sockaddr *sap, int numeric, 
-+extern char *INET_sprintmask(struct sockaddr *sap, int numeric,
- 			     unsigned int netmask);
- 
- int rprint_fib(int ext, int numeric)
- {
--    char buff[1024], iface[16], flags[64];
-+    char buff[1024], iface[17], flags[64];
-     char gate_addr[128], net_addr[128];
-     char mask_addr[128];
-     int num, iflags, metric, refcnt, use, mss, window, irtt;
-@@ -68,19 +69,19 @@ int rprint_fib(int ext, int numeric)
-     mss = 0;
- 
-     fmt = proc_gen_fmt(_PATH_PROCNET_ROUTE, 0, fp,
--		       "Iface", "%16s",
--		       "Destination", "%128s",
--		       "Gateway", "%128s",
-+		       "Iface", "%15s",
-+		       "Destination", "%127s",
-+		       "Gateway", "%127s",
- 		       "Flags", "%X",
- 		       "RefCnt", "%d",
- 		       "Use", "%d",
- 		       "Metric", "%d",
--		       "Mask", "%128s",
-+		       "Mask", "%127s",
- 		       "MTU", "%d",
- 		       "Window", "%d",
- 		       "IRTT", "%d",
- 		       NULL);
--    /* "%16s %128s %128s %X %d %d %d %128s %d %d %d\n" */
-+    /* "%15s %127s %127s %X %d %d %d %127s %d %d %d\n" */
- 
-     if (!fmt)
- 	return 1;
-@@ -104,18 +105,19 @@ int rprint_fib(int ext, int numeric)
- 
- 	/* Fetch and resolve the genmask. */
- 	(void) inet_aftype.input(1, mask_addr, &snet_mask);
--	
-+
- 	sin_netmask = (struct sockaddr_in *)&snet_mask;
--	strcpy(net_addr, INET_sprintmask(&snet_target, 
-+	safe_strncpy(net_addr, INET_sprintmask(&snet_target,
- 					 (numeric | 0x8000 | (iflags & RTF_HOST? 0x4000: 0)),
--					 sin_netmask->sin_addr.s_addr));
--	net_addr[15] = '\0';
-+					 sin_netmask->sin_addr.s_addr), sizeof(net_addr));
-+    net_addr[15] = '\0';
- 
--	strcpy(gate_addr, inet_aftype.sprint(&snet_gateway, numeric | 0x4000));
--	gate_addr[15] = '\0';
-+	safe_strncpy(gate_addr, inet_aftype.sprint(&snet_gateway, numeric | 0x4000),
-+                sizeof(gate_addr));
-+    gate_addr[15] = '\0';
- 
--	strcpy(mask_addr, inet_aftype.sprint(&snet_mask, 1));
--	mask_addr[15] = '\0';
-+	safe_strncpy(mask_addr, inet_aftype.sprint(&snet_mask, 1), sizeof(mask_addr));
-+    mask_addr[15] = '\0';
- 
- 	/* Decode the flags. */
- 	flags[0] = '\0';
-@@ -125,7 +127,7 @@ int rprint_fib(int ext, int numeric)
- 	    strcat(flags, "G");
- #if HAVE_RTF_REJECT
- 	if (iflags & RTF_REJECT)
--	    strcpy(flags, "!");
-+	    safe_strncpy(flags, "!", sizeof(flags));
- #endif
- 	if (iflags & RTF_HOST)
- 	    strcat(flags, "H");
-@@ -205,7 +207,7 @@ int rprint_fib(int ext, int numeric)
- 
- int rprint_cache(int ext, int numeric)
- {
--    char buff[1024], iface[16], flags[64];
-+    char buff[1024], iface[17], flags[64];
-     char gate_addr[128], dest_addr[128], specdst[128];
-     char src_addr[128];
-     struct sockaddr snet;
-@@ -221,17 +223,17 @@ int rprint_cache(int ext, int numeric)
- 	return 1;
-     }
- 
--   /* Okay, first thing we need to know is the format of the rt_cache. 
-+   /* Okay, first thing we need to know is the format of the rt_cache.
-     * I am aware of two possible layouts:
-     * 2.2.0
-     * "Iface\tDestination\tGateway \tFlags\t\tRefCnt\tUse\tMetric\tSource\t\tMTU\tWindow\tIRTT\tTOS\tHHRef\tHHUptod\tSpecDst"
--    * "%s\t%08lX\t%08lX\t%8X\t%d\t%u\t%d\t%08lX\t%d\t%u\t%u\t%02X\t%d\t%1d\t%08X" 
-+    * "%s\t%08lX\t%08lX\t%8X\t%d\t%u\t%d\t%08lX\t%d\t%u\t%u\t%02X\t%d\t%1d\t%08X"
-     *
-     * 2.0.36
-     * "Iface\tDestination\tGateway \tFlags\tRefCnt\tUse\tMetric\tSource\t\tMTU\tWindow\tIRTT\tHH\tARP"
-     * "%s\t%08lX\t%08lX\t%02X\t%d\t%u\t%d\t%08lX\t%d\t%lu\t%u\t%d\t%1d"
-     */
--    
-+
-     format = proc_guess_fmt(_PATH_PROCNET_RTCACHE, fp, "IRTT",1,"TOS",2,"HHRef",4,"HHUptod",8,"SpecDst",16,"HH",32,"ARP",64,NULL);
- 
-     printf(_("Kernel IP routing cache\n"));
-@@ -251,7 +253,7 @@ int rprint_cache(int ext, int numeric)
-     	  printf("ERROR: proc_guess_fmt(%s,... returned: %d\n",_PATH_PROCNET_RTCACHE, format);
- 	  break;
-     }
--    
-+
-     rewind(fp);
- 
-     if (ext == 1)
-@@ -268,21 +270,21 @@ int rprint_cache(int ext, int numeric)
- 		 "MSS   Window irtt  HH  Arp\n"));
- 
-       fmt = proc_gen_fmt(_PATH_PROCNET_RTCACHE, 0, fp,
--		       "Iface", "%16s",
--		       "Destination", "%128s",
--		       "Gateway", "%128s",
-+		       "Iface", "%15s",
-+		       "Destination", "%127s",
-+		       "Gateway", "%127s",
- 		       "Flags", "%X",
- 		       "RefCnt", "%d",
- 		       "Use", "%d",
- 		       "Metric", "%d",
--		       "Source", "%128s",
-+		       "Source", "%127s",
- 		       "MTU", "%d",
- 		       "Window", "%d",
- 		       "IRTT", "%d",
- 		       "HH", "%d",
- 		       "ARP", "%d",
- 		       NULL);
--      /* "%16s %128s %128s %X %d %d %d %128s %d %d %d %d %d\n" */
-+      /* "%15s %127s %127s %X %d %d %d %127s %d %d %d %d %d\n" */
-     }
- 
-     if (format == 2) {
-@@ -291,23 +293,23 @@ int rprint_cache(int ext, int numeric)
- 		 "Flags Metric Ref    Use Iface    "
- 		 "MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"));
-         fmt = proc_gen_fmt(_PATH_PROCNET_RTCACHE, 0, fp,
--		       "Iface", "%16s",
--		       "Destination", "%128s",
--		       "Gateway", "%128s",
-+		       "Iface", "%15s",
-+		       "Destination", "%127s",
-+		       "Gateway", "%127s",
- 		       "Flags", "%X",
- 		       "RefCnt", "%d",
- 		       "Use", "%d",
- 		       "Metric", "%d",
--		       "Source", "%128s",
-+		       "Source", "%127s",
- 		       "MTU", "%d",
- 		       "Window", "%d",
- 		       "IRTT", "%d",
- 		       "TOS", "%d",
- 		       "HHRef", "%d",
- 		       "HHUptod", "%d",
--		       "SpecDst", "%128s",
-+		       "SpecDst", "%127s",
- 		       NULL);
--      /* "%16s %128s %128s %X %d %d %d %128s %d %d %d %d %d %128s\n" */
-+      /* "%15s %127s %127s %X %d %d %d %127s %d %d %d %d %d %127s\n" */
-     }
- 
- 
-@@ -333,27 +335,23 @@ int rprint_cache(int ext, int numeric)
- 	  if (num < 12)
- 	    continue;
- 	}
--	
-+
- 
- 	/* Fetch and resolve the target address. */
- 	(void) inet_aftype.input(1, dest_addr, &snet);
--	strcpy(dest_addr, inet_aftype.sprint(&snet, numeric));
--	dest_addr[15] = '\0';
-+	safe_strncpy(dest_addr, inet_aftype.sprint(&snet, numeric), sizeof(dest_addr));
- 
- 	/* Fetch and resolve the gateway address. */
- 	(void) inet_aftype.input(1, gate_addr, &snet);
--	strcpy(gate_addr, inet_aftype.sprint(&snet, numeric));
--	gate_addr[15] = '\0';
-+    safe_strncpy(gate_addr, inet_aftype.sprint(&snet, numeric), sizeof(gate_addr));
- 
- 	/* Fetch and resolve the source. */
- 	(void) inet_aftype.input(1, src_addr, &snet);
--	strcpy(src_addr, inet_aftype.sprint(&snet, numeric));
--	src_addr[15] = '\0';
-+	safe_strncpy(src_addr, inet_aftype.sprint(&snet, numeric), sizeof(src_addr));
- 
- 	/* Fetch and resolve the SpecDst addrerss. */
- 	(void) inet_aftype.input(1, specdst, &snet);
--	strcpy(specdst, inet_aftype.sprint(&snet, numeric));
--	specdst[15] = '\0';
-+	safe_strncpy(specdst, inet_aftype.sprint(&snet, numeric), sizeof(specdst));
- 
- 	/* Decode the flags. */
- 	flags[0] = '\0';
-@@ -367,7 +365,7 @@ if (format == 1) {
- 	    strcat(flags, "G");
- #if HAVE_RTF_REJECT
- 	if (iflags & RTF_REJECT)
--	    strcpy(flags, "!");
-+	    safe_strncpy(flags, "!", sizeof(flags));
- #endif
- 	if (iflags & RTF_REINSTATE)
- 	    strcat(flags, "R");
-diff --git a/lib/inet_sr.c b/lib/inet_sr.c
-index 6d010d5..1a876ae 100644
---- a/lib/inet_sr.c
-+++ b/lib/inet_sr.c
-@@ -3,6 +3,7 @@
-    1998-07-01 - Arnaldo Carvalho de Melo - GNU gettext instead of catgets
-    1999-10-07 - Kurt Garloff		 - for -host and gws: prefer host names
- 						over networks (or even reject)
-+   2003-10-11 - Maik Broemme		 - gcc 3.x warnign fixes (default: break;)
-  */
- 
- #include "config.h"
-@@ -104,7 +105,6 @@ static int INET_setroute(int action, int options, char **args)
-        isnet = 1; break;
-     case 2:
-        isnet = 0; break;
--    default:
-     }
- 
-     /* Fill in the other fields. */
-diff --git a/lib/interface.c b/lib/interface.c
-index f4d2a9a..67f0d8f 100644
---- a/lib/interface.c
-+++ b/lib/interface.c
-@@ -1,13 +1,13 @@
- /* Code to manipulate interface information, shared between ifconfig and
--   netstat. 
-+   netstat.
- 
--   10/1998 partly rewriten by Andi Kleen to support an interface list.   
--   I don't claim that the list operations are efficient @).  
-+   10/1998 partly rewriten by Andi Kleen to support an interface list.
-+   I don't claim that the list operations are efficient @).
- 
-    8/2000  Andi Kleen make the list operations a bit more efficient.
-    People are crazy enough to use thousands of aliases now.
- 
--   $Id: interface.c,v 1.14 2001/02/10 19:31:15 pb Exp $
-+   $Id: interface.c,v 1.35 2011-01-01 03:22:31 ecki Exp $
-  */
- 
- #include "config.h"
-@@ -23,6 +23,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <ctype.h>
-+#include <string.h>
- 
- #if HAVE_AFIPX
- #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
-@@ -36,7 +37,7 @@
- #include <neteconet/ec.h>
- #endif
- 
--#ifdef HAVE_HWSLIP
-+#if HAVE_HWSLIP
- #include <linux/if_slip.h>
- #include <net/if_arp.h>
- #endif
-@@ -87,49 +88,58 @@ int procnetdev_vsn = 1;
- 
- int ife_short;
- 
-+int if_list_all = 0;	/* do we have requested the complete proc list, yet? */
-+
- static struct interface *int_list, *int_last;
- 
- static int if_readlist_proc(char *);
- 
--static struct interface *add_interface(char *name)
-+static struct interface *if_cache_add(char *name)
- {
-     struct interface *ife, **nextp, *new;
- 
-+    if (!int_list)
-+    	int_last = NULL;
-+
-+    /* the cache is sorted, so if we hit a smaller if, exit */
-     for (ife = int_last; ife; ife = ife->prev) {
--	    int n = nstrcmp(ife->name, name); 
--	    if (n == 0) 
--		    return ife; 
--	    if (n < 0) 
--		    break; 
-+	    int n = nstrcmp(ife->name, name);
-+	    if (n == 0)
-+		    return ife;
-+	    if (n < 0)
-+		    break;
-     }
--    new(new); 
--    safe_strncpy(new->name, name, IFNAMSIZ); 
--    nextp = ife ? &ife->next : &int_list;
-+    new(new);
-+    safe_strncpy(new->name, name, IFNAMSIZ);
-+    nextp = ife ? &ife->next : &int_list; // keep sorting
-     new->prev = ife;
--    new->next = *nextp; 
--    if (new->next) 
--	    new->next->prev = new; 
-+    new->next = *nextp;
-+    if (new->next)
-+	    new->next->prev = new;
-     else
--	    int_last = new; 
--    *nextp = new; 
--    return new; 
-+	    int_last = new;
-+    *nextp = new;
-+    return new;
- }
- 
- struct interface *lookup_interface(char *name)
- {
--    struct interface *ife = NULL;
-+   /* if we have read all, use it */
-+   if (if_list_all)
-+   	return if_cache_add(name);
- 
--    if (if_readlist_proc(name) < 0) 
--	    return NULL; 
--    ife = add_interface(name); 
--    return ife;
-+   /* otherwise we read a limited list */
-+   if (if_readlist_proc(name) < 0)
-+   	return NULL;
-+
-+   return if_cache_add(name);
- }
- 
- int for_all_interfaces(int (*doit) (struct interface *, void *), void *cookie)
- {
-     struct interface *ife;
- 
--    if (!int_list && (if_readlist() < 0))
-+    if (!if_list_all && (if_readlist() < 0))
- 	return -1;
-     for (ife = int_list; ife; ife = ife->next) {
- 	int err = doit(ife, cookie);
-@@ -139,13 +149,15 @@ int for_all_interfaces(int (*doit) (struct interface *, void *), void *cookie)
-     return 0;
- }
- 
--int free_interface_list(void)
-+int if_cache_free(void)
- {
-     struct interface *ife;
-     while ((ife = int_list) != NULL) {
- 	int_list = ife->next;
- 	free(ife);
-     }
-+    int_last = NULL;
-+    if_list_all = 0;
-     return 0;
- }
- 
-@@ -158,7 +170,7 @@ static int if_readconf(void)
-     int skfd;
- 
-     /* SIOCGIFCONF currently seems to only work properly on AF_INET sockets
--       (as of 2.1.128) */ 
-+       (as of 2.1.128) */
-     skfd = get_socket_for_af(AF_INET);
-     if (skfd < 0) {
- 	fprintf(stderr, _("warning: no inet socket available: %s\n"),
-@@ -180,7 +192,7 @@ static int if_readconf(void)
- 	}
- 	if (ifc.ifc_len == sizeof(struct ifreq) * numreqs) {
- 	    /* assume it overflowed and try again */
--	    numreqs += 10;
-+	    numreqs *= 2;
- 	    continue;
- 	}
- 	break;
-@@ -188,7 +200,7 @@ static int if_readconf(void)
- 
-     ifr = ifc.ifc_req;
-     for (n = 0; n < ifc.ifc_len; n += sizeof(struct ifreq)) {
--	add_interface(ifr->ifr_name);
-+	if_cache_add(ifr->ifr_name);
- 	ifr++;
-     }
-     err = 0;
-@@ -198,7 +210,7 @@ out:
-     return err;
- }
- 
--static char *get_name(char *name, char *p)
-+char *get_name(char *name, char *p)
- {
-     while (isspace(*p))
- 	p++;
-@@ -206,16 +218,19 @@ static char *get_name(char *name, char *p)
- 	if (isspace(*p))
- 	    break;
- 	if (*p == ':') {	/* could be an alias */
--	    char *dot = p, *dotname = name;
--	    *name++ = *p++;
--	    while (isdigit(*p))
--		*name++ = *p++;
--	    if (*p != ':') {	/* it wasn't, backup */
--		p = dot;
--		name = dotname;
-+		char *dot = p++;
-+ 		while (*p && isdigit(*p)) p++;
-+		if (*p == ':') {
-+			/* Yes it is, backup and copy it. */
-+			p = dot;
-+			*name++ = *p++;
-+			while (*p && isdigit(*p)) {
-+				*name++ = *p++;
-+			}
-+		} else {
-+			/* No, it isn't */
-+			p = dot;
- 	    }
--	    if (*p == '\0')
--		return NULL;
- 	    p++;
- 	    break;
- 	}
-@@ -225,7 +240,7 @@ static char *get_name(char *name, char *p)
-     return p;
- }
- 
--static int procnetdev_version(char *buf)
-+int procnetdev_version(char *buf)
- {
-     if (strstr(buf, "compressed"))
- 	return 3;
-@@ -234,12 +249,12 @@ static int procnetdev_version(char *buf)
-     return 1;
- }
- 
--static int get_dev_fields(char *bp, struct interface *ife)
-+int get_dev_fields(char *bp, struct interface *ife)
- {
-     switch (procnetdev_vsn) {
-     case 3:
- 	sscanf(bp,
--	"%llu %llu %lu %lu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu %lu",
-+	"%Lu %Lu %lu %lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu %lu",
- 	       &ife->stats.rx_bytes,
- 	       &ife->stats.rx_packets,
- 	       &ife->stats.rx_errors,
-@@ -259,7 +274,7 @@ static int get_dev_fields(char *bp, struct interface *ife)
- 	       &ife->stats.tx_compressed);
- 	break;
-     case 2:
--	sscanf(bp, "%llu %llu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu",
-+	sscanf(bp, "%Lu %Lu %lu %lu %lu %lu %Lu %Lu %lu %lu %lu %lu %lu",
- 	       &ife->stats.rx_bytes,
- 	       &ife->stats.rx_packets,
- 	       &ife->stats.rx_errors,
-@@ -277,7 +292,7 @@ static int get_dev_fields(char *bp, struct interface *ife)
- 	ife->stats.rx_multicast = 0;
- 	break;
-     case 1:
--	sscanf(bp, "%llu %lu %lu %lu %lu %llu %lu %lu %lu %lu %lu",
-+	sscanf(bp, "%Lu %lu %lu %lu %lu %Lu %lu %lu %lu %lu %lu",
- 	       &ife->stats.rx_packets,
- 	       &ife->stats.rx_errors,
- 	       &ife->stats.rx_dropped,
-@@ -300,25 +315,21 @@ static int get_dev_fields(char *bp, struct interface *ife)
- 
- static int if_readlist_proc(char *target)
- {
--    static int proc_read; 
-     FILE *fh;
-     char buf[512];
-     struct interface *ife;
-     int err;
- 
--    if (proc_read) 
--	    return 0; 
--    if (!target) 
--	    proc_read = 1;
--
-     fh = fopen(_PATH_PROCNET_DEV, "r");
-     if (!fh) {
- 		fprintf(stderr, _("Warning: cannot open %s (%s). Limited output.\n"),
--			_PATH_PROCNET_DEV, strerror(errno)); 
--		return if_readconf();
--	}	
--    fgets(buf, sizeof buf, fh);	/* eat line */
--    fgets(buf, sizeof buf, fh);
-+			_PATH_PROCNET_DEV, strerror(errno));
-+		return -2;
-+	}
-+    if (fgets(buf, sizeof buf, fh))
-+		/* eat line */;
-+    if (fgets(buf, sizeof buf, fh))
-+		/* eat line */;
- 
- #if 0				/* pretty, but can't cope with missing fields */
-     fmt = proc_gen_fmt(_PATH_PROCNET_DEV, 1, fh,
-@@ -349,8 +360,8 @@ static int if_readlist_proc(char *target)
-     err = 0;
-     while (fgets(buf, sizeof buf, fh)) {
- 	char *s, name[IFNAMSIZ];
--	s = get_name(name, buf);    
--	ife = add_interface(name);
-+	s = get_name(name, buf);
-+	ife = if_cache_add(name);
- 	get_dev_fields(s, ife);
- 	ife->statistics_valid = 1;
- 	if (target && !strcmp(target,name))
-@@ -359,7 +370,6 @@ static int if_readlist_proc(char *target)
-     if (ferror(fh)) {
- 	perror(_PATH_PROCNET_DEV);
- 	err = -1;
--	proc_read = 0; 
-     }
- 
- #if 0
-@@ -369,13 +379,23 @@ static int if_readlist_proc(char *target)
-     return err;
- }
- 
--int if_readlist(void) 
--{ 
--    int err = if_readlist_proc(NULL); 
--    if (!err)
--	    err = if_readconf();
--    return err;
--} 
-+int if_readlist(void)
-+{
-+    /* caller will/should check not to call this too often
-+     *   (i.e. only if if_list_all == 0
-+     */
-+    int proc_err, conf_err;
-+
-+    proc_err = if_readlist_proc(NULL);
-+    conf_err = if_readconf();
-+
-+    if_list_all = 1;
-+
-+    if (proc_err < 0 && conf_err < 0)
-+        return -1;
-+    else
-+        return 0;
-+}
- 
- /* Support for fetching an IPX address */
- 
-@@ -392,14 +412,14 @@ int if_fetch(struct interface *ife)
- {
-     struct ifreq ifr;
-     int fd;
--    char *ifname = ife->name; 
-+    char *ifname = ife->name;
- 
--    strcpy(ifr.ifr_name, ifname);
-+    safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-     if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0)
- 	return (-1);
-     ife->flags = ifr.ifr_flags;
- 
--    strcpy(ifr.ifr_name, ifname);
-+    safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-     if (ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0)
- 	memset(ife->hwaddr, 0, 32);
-     else
-@@ -407,53 +427,47 @@ int if_fetch(struct interface *ife)
- 
-     ife->type = ifr.ifr_hwaddr.sa_family;
- 
--    strcpy(ifr.ifr_name, ifname);
--    if (ioctl(skfd, SIOCGIFMETRIC, &ifr) < 0)
--	ife->metric = 0;
--    else
--	ife->metric = ifr.ifr_metric;
--
--    strcpy(ifr.ifr_name, ifname);
-+    safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-     if (ioctl(skfd, SIOCGIFMTU, &ifr) < 0)
- 	ife->mtu = 0;
-     else
- 	ife->mtu = ifr.ifr_mtu;
- 
--#ifdef HAVE_HWSLIP
-+#if HAVE_HWSLIP
-     if (ife->type == ARPHRD_SLIP || ife->type == ARPHRD_CSLIP ||
- 	ife->type == ARPHRD_SLIP6 || ife->type == ARPHRD_CSLIP6 ||
- 	ife->type == ARPHRD_ADAPT) {
- #ifdef SIOCGOUTFILL
--	strcpy(ifr.ifr_name, ifname);
-+	safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
- 	if (ioctl(skfd, SIOCGOUTFILL, &ifr) < 0)
- 	    ife->outfill = 0;
- 	else
--	    ife->outfill = (unsigned int) ifr.ifr_data;
-+	    ife->outfill = (unsigned long) ifr.ifr_data;
- #endif
- #ifdef SIOCGKEEPALIVE
--	strcpy(ifr.ifr_name, ifname);
-+	safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
- 	if (ioctl(skfd, SIOCGKEEPALIVE, &ifr) < 0)
- 	    ife->keepalive = 0;
- 	else
--	    ife->keepalive = (unsigned int) ifr.ifr_data;
-+	    ife->keepalive = (unsigned long) ifr.ifr_data;
- #endif
-     }
- #endif
- 
--    strcpy(ifr.ifr_name, ifname);
-+    safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-     if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0)
- 	memset(&ife->map, 0, sizeof(struct ifmap));
-     else
- 	memcpy(&ife->map, &ifr.ifr_map, sizeof(struct ifmap));
- 
--    strcpy(ifr.ifr_name, ifname);
-+    safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-     if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0)
- 	memset(&ife->map, 0, sizeof(struct ifmap));
-     else
- 	ife->map = ifr.ifr_map;
- 
- #ifdef HAVE_TXQUEUELEN
--    strcpy(ifr.ifr_name, ifname);
-+    safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-     if (ioctl(skfd, SIOCGIFTXQLEN, &ifr) < 0)
- 	ife->tx_queue_len = -1;	/* unknown value */
-     else
-@@ -466,24 +480,24 @@ int if_fetch(struct interface *ife)
-     /* IPv4 address? */
-     fd = get_socket_for_af(AF_INET);
-     if (fd >= 0) {
--	strcpy(ifr.ifr_name, ifname);
-+	safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
- 	ifr.ifr_addr.sa_family = AF_INET;
- 	if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) {
- 	    ife->has_ip = 1;
- 	    ife->addr = ifr.ifr_addr;
--	    strcpy(ifr.ifr_name, ifname);
-+	    safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
- 	    if (ioctl(fd, SIOCGIFDSTADDR, &ifr) < 0)
- 	        memset(&ife->dstaddr, 0, sizeof(struct sockaddr));
- 	    else
- 	        ife->dstaddr = ifr.ifr_dstaddr;
- 
--	    strcpy(ifr.ifr_name, ifname);
-+	    safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
- 	    if (ioctl(fd, SIOCGIFBRDADDR, &ifr) < 0)
- 	        memset(&ife->broadaddr, 0, sizeof(struct sockaddr));
- 	    else
- 		ife->broadaddr = ifr.ifr_broadaddr;
- 
--	    strcpy(ifr.ifr_name, ifname);
-+	    safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
- 	    if (ioctl(fd, SIOCGIFNETMASK, &ifr) < 0)
- 		memset(&ife->netmask, 0, sizeof(struct sockaddr));
- 	    else
-@@ -497,7 +511,7 @@ int if_fetch(struct interface *ife)
-     /* DDP address maybe ? */
-     fd = get_socket_for_af(AF_APPLETALK);
-     if (fd >= 0) {
--	strcpy(ifr.ifr_name, ifname);
-+	safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
- 	if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) {
- 	    ife->ddpaddr = ifr.ifr_addr;
- 	    ife->has_ddp = 1;
-@@ -509,22 +523,22 @@ int if_fetch(struct interface *ife)
-     /* Look for IPX addresses with all framing types */
-     fd = get_socket_for_af(AF_IPX);
-     if (fd >= 0) {
--	strcpy(ifr.ifr_name, ifname);
-+	safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
- 	if (!ipx_getaddr(fd, IPX_FRAME_ETHERII, &ifr)) {
- 	    ife->has_ipx_bb = 1;
- 	    ife->ipxaddr_bb = ifr.ifr_addr;
- 	}
--	strcpy(ifr.ifr_name, ifname);
-+	safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
- 	if (!ipx_getaddr(fd, IPX_FRAME_SNAP, &ifr)) {
- 	    ife->has_ipx_sn = 1;
- 	    ife->ipxaddr_sn = ifr.ifr_addr;
- 	}
--	strcpy(ifr.ifr_name, ifname);
-+	safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
- 	if (!ipx_getaddr(fd, IPX_FRAME_8023, &ifr)) {
- 	    ife->has_ipx_e3 = 1;
- 	    ife->ipxaddr_e3 = ifr.ifr_addr;
- 	}
--	strcpy(ifr.ifr_name, ifname);
-+	safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
- 	if (!ipx_getaddr(fd, IPX_FRAME_8022, &ifr)) {
- 	    ife->has_ipx_e2 = 1;
- 	    ife->ipxaddr_e2 = ifr.ifr_addr;
-@@ -536,7 +550,7 @@ int if_fetch(struct interface *ife)
-     /* Econet address maybe? */
-     fd = get_socket_for_af(AF_ECONET);
-     if (fd >= 0) {
--	strcpy(ifr.ifr_name, ifname);
-+	safe_strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
- 	if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) {
- 	    ife->ecaddr = ifr.ifr_addr;
- 	    ife->has_econet = 1;
-@@ -548,29 +562,29 @@ int if_fetch(struct interface *ife)
- }
- 
- int do_if_fetch(struct interface *ife)
--{ 
-+{
-     if (if_fetch(ife) < 0) {
--	char *errmsg; 
--	if (errno == ENODEV) { 
--	    /* Give better error message for this case. */ 
--	    errmsg = _("Device not found"); 
--	} else { 
--	    errmsg = strerror(errno); 
-+	char *errmsg;
-+	if (errno == ENODEV) {
-+	    /* Give better error message for this case. */
-+	    errmsg = _("Device not found");
-+	} else {
-+	    errmsg = strerror(errno);
- 	}
-   	fprintf(stderr, _("%s: error fetching interface information: %s\n"),
- 		ife->name, errmsg);
- 	return -1;
-     }
--    return 0; 
-+    return 0;
- }
- 
- int do_if_print(struct interface *ife, void *cookie)
- {
-     int *opt_a = (int *) cookie;
--    int res; 
-+    int res;
- 
--    res = do_if_fetch(ife); 
--    if (res >= 0) {   
-+    res = do_if_fetch(ife);
-+    if (res >= 0) {
- 	if ((ife->flags & IFF_UP) || *opt_a)
- 	    ife_print(ife);
-     }
-@@ -579,11 +593,11 @@ int do_if_print(struct interface *ife, void *cookie)
- 
- void ife_print_short(struct interface *ptr)
- {
--    printf("%-5.5s ", ptr->name);
--    printf("%5d %3d", ptr->mtu, ptr->metric);
-+    printf("%-8.8s ", ptr->name);
-+    printf("%5d ", ptr->mtu);
-     /* If needed, display the interface statistics. */
-     if (ptr->statistics_valid) {
--	printf("%8llu %6lu %6lu %6lu",
-+	printf("%8llu %6lu %6lu %-6lu ",
- 	       ptr->stats.rx_packets, ptr->stats.rx_errors,
- 	       ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors);
- 	printf("%8llu %6lu %6lu %6lu ",
-@@ -636,8 +650,9 @@ void ife_print_long(struct interface *ptr)
-     int hf;
-     int can_compress = 0;
-     unsigned long long rx, tx, short_rx, short_tx;
--    char Rext[5]="b";
--    char Text[5]="b";
-+    const char *Rext = "B";
-+    const char *Text = "B";
-+    static char flags[200];
- 
- #if HAVE_AFIPX
-     static struct aftype *ipxtype = NULL;
-@@ -650,7 +665,7 @@ void ife_print_long(struct interface *ptr)
- #endif
- #if HAVE_AFINET6
-     FILE *f;
--    char addr6[40], devname[20];
-+    char addr6[40], devname[21];
-     struct sockaddr_in6 sap;
-     int plen, scope, dad_status, if_idx;
-     extern struct aftype inet6_aftype;
-@@ -663,39 +678,79 @@ void ife_print_long(struct interface *ptr)
- 
-     hf = ptr->type;
- 
-+#if HAVE_HWSLIP
-     if (hf == ARPHRD_CSLIP || hf == ARPHRD_CSLIP6)
- 	can_compress = 1;
-+#endif
- 
-     hw = get_hwntype(hf);
-     if (hw == NULL)
- 	hw = get_hwntype(-1);
- 
--    printf(_("%-9.9s Link encap:%s  "), ptr->name, hw->title);
--    /* For some hardware types (eg Ash, ATM) we don't print the 
--       hardware address if it's null.  */
--    if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
--				  hw->suppress_null_addr)))
--	printf(_("HWaddr %s  "), hw->print(ptr->hwaddr));
--#ifdef IFF_PORTSEL
--    if (ptr->flags & IFF_PORTSEL) {
--	printf(_("Media:%s"), if_port_text[ptr->map.port][0]);
--	if (ptr->flags & IFF_AUTOMEDIA)
--	    printf(_("(auto)"));
--    }
-+    sprintf(flags, "flags=%d<", ptr->flags);
-+    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
-+    if (ptr->flags == 0)
-+	strcat(flags,">");
-+    if (ptr->flags & IFF_UP)
-+	strcat(flags,_("UP,"));
-+    if (ptr->flags & IFF_BROADCAST)
-+	strcat(flags,_("BROADCAST,"));
-+    if (ptr->flags & IFF_DEBUG)
-+	strcat(flags,_("DEBUG,"));
-+    if (ptr->flags & IFF_LOOPBACK)
-+	strcat(flags,_("LOOPBACK,"));
-+    if (ptr->flags & IFF_POINTOPOINT)
-+	strcat(flags,_("POINTOPOINT,"));
-+    if (ptr->flags & IFF_NOTRAILERS)
-+	strcat(flags,_("NOTRAILERS,"));
-+    if (ptr->flags & IFF_RUNNING)
-+	strcat(flags,_("RUNNING,"));
-+    if (ptr->flags & IFF_NOARP)
-+	strcat(flags,_("NOARP,"));
-+    if (ptr->flags & IFF_PROMISC)
-+	strcat(flags,_("PROMISC,"));
-+    if (ptr->flags & IFF_ALLMULTI)
-+	strcat(flags,_("ALLMULTI,"));
-+    if (ptr->flags & IFF_SLAVE)
-+	strcat(flags,_("SLAVE,"));
-+    if (ptr->flags & IFF_MASTER)
-+	strcat(flags,_("MASTER,"));
-+    if (ptr->flags & IFF_MULTICAST)
-+	strcat(flags,_("MULTICAST,"));
-+#ifdef HAVE_DYNAMIC
-+    if (ptr->flags & IFF_DYNAMIC)
-+	strcat(flags,_("DYNAMIC,"));
-+#endif
-+    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
-+    if (flags[strlen(flags)-1] == ',')
-+      flags[strlen(flags)-1] = '>';
-+    else
-+      flags[strlen(flags)-1] = 0;
-+
-+
-+    printf(_("%s: %s  mtu %d"),
-+	   ptr->name, flags, ptr->mtu);
-+#ifdef SIOCSKEEPALIVE
-+    if (ptr->outfill || ptr->keepalive)
-+	printf(_("  outfill %d  keepalive %d"),
-+	       ptr->outfill, ptr->keepalive);
- #endif
-     printf("\n");
- 
-+
-+
- #if HAVE_AFINET
-     if (ptr->has_ip) {
--	printf(_("          %s addr:%s "), ap->name,
-+	printf(_("        %s %s"), ap->name,
- 	       ap->sprint(&ptr->addr, 1));
--	if (ptr->flags & IFF_POINTOPOINT) {
--	    printf(_(" P-t-P:%s "), ap->sprint(&ptr->dstaddr, 1));
--	}
-+	printf(_("  netmask %s"), ap->sprint(&ptr->netmask, 1));
- 	if (ptr->flags & IFF_BROADCAST) {
--	    printf(_(" Bcast:%s "), ap->sprint(&ptr->broadaddr, 1));
-+	    printf(_("  broadcast %s"), ap->sprint(&ptr->broadaddr, 1));
- 	}
--	printf(_(" Mask:%s\n"), ap->sprint(&ptr->netmask, 1));
-+	if (ptr->flags & IFF_POINTOPOINT) {
-+	    printf(_("  destination %s"), ap->sprint(&ptr->dstaddr, 1));
-+	}
-+	printf("\n");
-     }
- #endif
- 
-@@ -703,7 +758,7 @@ void ife_print_long(struct interface *ptr)
-     /* FIXME: should be integrated into interface.c.   */
- 
-     if ((f = fopen(_PATH_PROCNET_IFINET6, "r")) != NULL) {
--	while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %20s\n",
-+	while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %08x %02x %02x %02x %20s\n",
- 		      addr6p[0], addr6p[1], addr6p[2], addr6p[3],
- 		      addr6p[4], addr6p[5], addr6p[6], addr6p[7],
- 		  &if_idx, &plen, &scope, &dad_status, devname) != EOF) {
-@@ -712,29 +767,30 @@ void ife_print_long(struct interface *ptr)
- 			addr6p[0], addr6p[1], addr6p[2], addr6p[3],
- 			addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
- 		inet6_aftype.input(1, addr6, (struct sockaddr *) &sap);
--		printf(_("          inet6 addr: %s/%d"),
--		 inet6_aftype.sprint((struct sockaddr *) &sap, 1), plen);
--		printf(_(" Scope:"));
--		switch (scope) {
--		case 0:
--		    printf(_("Global"));
--		    break;
--		case IPV6_ADDR_LINKLOCAL:
--		    printf(_("Link"));
--		    break;
--		case IPV6_ADDR_SITELOCAL:
--		    printf(_("Site"));
--		    break;
--		case IPV6_ADDR_COMPATv4:
--		    printf(_("Compat"));
--		    break;
--		case IPV6_ADDR_LOOPBACK:
--		    printf(_("Host"));
--		    break;
--		default:
--		    printf(_("Unknown"));
-+		printf(_("        %s %s  prefixlen %d"),
-+			inet6_aftype.name,
-+			inet6_aftype.sprint((struct sockaddr *) &sap, 1),
-+			plen);
-+		printf(_("  scopeid 0x%x"), scope);
-+
-+		flags[0] = '<'; flags[1] = 0;
-+		if (scope & IPV6_ADDR_COMPATv4) {
-+		    	strcat(flags, _("compat,"));
-+		    	scope -= IPV6_ADDR_COMPATv4;
- 		}
--		printf("\n");
-+		if (scope == 0)
-+			strcat(flags, _("global,"));
-+		if (scope & IPV6_ADDR_LINKLOCAL)
-+			strcat(flags, _("link,"));
-+		if (scope & IPV6_ADDR_SITELOCAL)
-+			strcat(flags, _("site,"));
-+		if (scope & IPV6_ADDR_LOOPBACK)
-+			strcat(flags, _("host,"));
-+		if (flags[strlen(flags)-1] == ',')
-+			flags[strlen(flags)-1] = '>';
-+		else
-+			flags[strlen(flags)-1] = 0;
-+		printf("%s\n", flags);
- 	    }
- 	}
- 	fclose(f);
-@@ -747,17 +803,17 @@ void ife_print_long(struct interface *ptr)
- 
-     if (ipxtype != NULL) {
- 	if (ptr->has_ipx_bb)
--	    printf(_("          IPX/Ethernet II addr:%s\n"),
--		   ipxtype->sprint(&ptr->ipxaddr_bb, 1));
-+	    printf(_("        %s Ethernet-II   %s\n"),
-+		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_bb, 1));
- 	if (ptr->has_ipx_sn)
--	    printf(_("          IPX/Ethernet SNAP addr:%s\n"),
--		   ipxtype->sprint(&ptr->ipxaddr_sn, 1));
-+	    printf(_("        %s Ethernet-SNAP %s\n"),
-+		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_sn, 1));
- 	if (ptr->has_ipx_e2)
--	    printf(_("          IPX/Ethernet 802.2 addr:%s\n"),
--		   ipxtype->sprint(&ptr->ipxaddr_e2, 1));
-+	    printf(_("        %s Ethernet802.2 %s\n"),
-+		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e2, 1));
- 	if (ptr->has_ipx_e3)
--	    printf(_("          IPX/Ethernet 802.3 addr:%s\n"),
--		   ipxtype->sprint(&ptr->ipxaddr_e3, 1));
-+	    printf(_("        %s Ethernet802.3 %s\n"),
-+		   ipxtype->name, ipxtype->sprint(&ptr->ipxaddr_e3, 1));
-     }
- #endif
- 
-@@ -766,7 +822,7 @@ void ife_print_long(struct interface *ptr)
- 	ddptype = get_afntype(AF_APPLETALK);
-     if (ddptype != NULL) {
- 	if (ptr->has_ddp)
--	    printf(_("          EtherTalk Phase 2 addr:%s\n"), ddptype->sprint(&ptr->ddpaddr, 1));
-+	    printf(_("        %s %s\n"), ddptype->name, ddptype->sprint(&ptr->ddpaddr, 1));
-     }
- #endif
- 
-@@ -775,53 +831,30 @@ void ife_print_long(struct interface *ptr)
- 	ectype = get_afntype(AF_ECONET);
-     if (ectype != NULL) {
- 	if (ptr->has_econet)
--	    printf(_("          econet addr:%s\n"), ectype->sprint(&ptr->ecaddr, 1));
-+	    printf(_("        %s %s\n"), ectype->name, ectype->sprint(&ptr->ecaddr, 1));
-     }
- #endif
- 
--    printf("          ");
--    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
--    if (ptr->flags == 0)
--	printf(_("[NO FLAGS] "));
--    if (ptr->flags & IFF_UP)
--	printf(_("UP "));
--    if (ptr->flags & IFF_BROADCAST)
--	printf(_("BROADCAST "));
--    if (ptr->flags & IFF_DEBUG)
--	printf(_("DEBUG "));
--    if (ptr->flags & IFF_LOOPBACK)
--	printf(_("LOOPBACK "));
--    if (ptr->flags & IFF_POINTOPOINT)
--	printf(_("POINTOPOINT "));
--    if (ptr->flags & IFF_NOTRAILERS)
--	printf(_("NOTRAILERS "));
--    if (ptr->flags & IFF_RUNNING)
--	printf(_("RUNNING "));
--    if (ptr->flags & IFF_NOARP)
--	printf(_("NOARP "));
--    if (ptr->flags & IFF_PROMISC)
--	printf(_("PROMISC "));
--    if (ptr->flags & IFF_ALLMULTI)
--	printf(_("ALLMULTI "));
--    if (ptr->flags & IFF_SLAVE)
--	printf(_("SLAVE "));
--    if (ptr->flags & IFF_MASTER)
--	printf(_("MASTER "));
--    if (ptr->flags & IFF_MULTICAST)
--	printf(_("MULTICAST "));
--#ifdef HAVE_DYNAMIC
--    if (ptr->flags & IFF_DYNAMIC)
--	printf(_("DYNAMIC "));
--#endif
--    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
--    printf(_(" MTU:%d  Metric:%d"),
--	   ptr->mtu, ptr->metric ? ptr->metric : 1);
--#ifdef SIOCSKEEPALIVE
--    if (ptr->outfill || ptr->keepalive)
--	printf(_("  Outfill:%d  Keepalive:%d"),
--	       ptr->outfill, ptr->keepalive);
-+    /* For some hardware types (eg Ash, ATM) we don't print the
-+       hardware address if it's null.  */
-+    if (hw->print != NULL && (! (hw_null_address(hw, ptr->hwaddr) &&
-+				  hw->suppress_null_addr)))
-+	printf(_("        %s %s"), hw->name, hw->print(ptr->hwaddr));
-+    else
-+	printf(_("        %s"), hw->name);
-+    if (ptr->tx_queue_len != -1)
-+    	printf(_("  txqueuelen %d"), ptr->tx_queue_len);
-+    printf("  (%s)\n", hw->title);
-+
-+#ifdef IFF_PORTSEL
-+    if (ptr->flags & IFF_PORTSEL) {
-+	printf(_("        media %s"), if_port_text[ptr->map.port][0]);
-+	if (ptr->flags & IFF_AUTOMEDIA)
-+	    printf(_("autoselect"));
-+    	printf("\n");
-+    }
- #endif
--    printf("\n");
-+
- 
-     /* If needed, display the interface statistics. */
- 
-@@ -830,55 +863,87 @@ void ife_print_long(struct interface *ptr)
- 	 *      not for the aliases, although strictly speaking they're shared
- 	 *      by all addresses.
- 	 */
--	printf("          ");
--
--	printf(_("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"),
--	       ptr->stats.rx_packets, ptr->stats.rx_errors,
--	       ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors,
--	       ptr->stats.rx_frame_errors);
--	if (can_compress)
--	    printf(_("             compressed:%lu\n"), ptr->stats.rx_compressed);
--
--	rx = ptr->stats.rx_bytes;  
-+	rx = ptr->stats.rx_bytes;
-+	short_rx = rx * 10;
-+	if (rx > 1125899906842624ull) {
-+	    short_rx /= 1125899906842624ull;
-+	    Rext = "PiB";
-+	} else if (rx > 1099511627776ull) {
-+	    short_rx /= 1099511627776ull;
-+	    Rext = "TiB";
-+	} else if (rx > 1073741824ull) {
-+	    short_rx /= 1073741824ull;
-+	    Rext = "GiB";
-+	} else if (rx > 1048576) {
-+	    short_rx /= 1048576;
-+	    Rext = "MiB";
-+	} else if (rx > 1024) {
-+	    short_rx /= 1024;
-+	    Rext = "KiB";
-+	}
- 	tx = ptr->stats.tx_bytes;
--	short_rx = rx * 10;  
- 	short_tx = tx * 10;
--	if (rx > 1048576) { short_rx /= 1048576;  strcpy(Rext, "Mb"); }
--	else if (rx > 1024) { short_rx /= 1024;  strcpy(Rext, "Kb"); }
--	if (tx > 1048576) { short_tx /= 1048576;  strcpy(Text, "Mb"); }
--	else if (tx > 1024) { short_tx /= 1024;  strcpy(Text, "Kb"); }
-+	if (tx > 1125899906842624ull) {
-+	    short_tx /= 1125899906842624ull;
-+	    Text = "PiB";
-+	} else 	if (tx > 1099511627776ull) {
-+	    short_tx /= 1099511627776ull;
-+	    Text = "TiB";
-+	} else if (tx > 1073741824ull) {
-+	    short_tx /= 1073741824ull;
-+	    Text = "GiB";
-+	} else if (tx > 1048576) {
-+	    short_tx /= 1048576;
-+	    Text = "MiB";
-+	} else if (tx > 1024) {
-+	    short_tx /= 1024;
-+	    Text = "KiB";
-+	}
- 
--	printf("          ");
--	printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"),
--	       ptr->stats.tx_packets, ptr->stats.tx_errors,
-+	printf("        ");
-+	printf(_("RX packets %llu  bytes %llu (%lu.%lu %s)\n"),
-+		ptr->stats.rx_packets,
-+	       rx, (unsigned long)(short_rx / 10),
-+	       (unsigned long)(short_rx % 10), Rext);
-+	if (can_compress) {
-+  	    printf("        ");
-+	    printf(_("RX compressed:%lu\n"), ptr->stats.rx_compressed);
-+	}
-+	printf("        ");
-+	printf(_("RX errors %lu  dropped %lu  overruns %lu  frame %lu\n"),
-+	       ptr->stats.rx_errors, ptr->stats.rx_dropped,
-+	       ptr->stats.rx_fifo_errors, ptr->stats.rx_frame_errors);
-+
-+
-+	printf("        ");
-+	printf(_("TX packets %llu  bytes %llu (%lu.%lu %s)\n"),
-+		ptr->stats.tx_packets,
-+	        tx, (unsigned long)(short_tx / 10),
-+	        (unsigned long)(short_tx % 10), Text);
-+	if (can_compress) {
-+  	    printf("        ");
-+	    printf(_("TX compressed %lu\n"), ptr->stats.tx_compressed);
-+	}
-+	printf("        ");
-+	printf(_("TX errors %lu  dropped %lu overruns %lu  carrier %lu  collisions %lu\n"),
-+	       ptr->stats.tx_errors,
- 	       ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
--	       ptr->stats.tx_carrier_errors);
--	printf(_("          collisions:%lu "), ptr->stats.collisions);
--	if (can_compress)
--	    printf(_("compressed:%lu "), ptr->stats.tx_compressed);
--	if (ptr->tx_queue_len != -1)
--	    printf(_("txqueuelen:%d "), ptr->tx_queue_len);
--	printf("\n          ");
--	printf(_("RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"),
--	       rx, (unsigned long)(short_rx / 10), 
--	       (unsigned long)(short_rx % 10), Rext, 
--	       tx, (unsigned long)(short_tx / 10), 
--	       (unsigned long)(short_tx % 10), Text);
-+	       ptr->stats.tx_carrier_errors, ptr->stats.collisions);
-     }
- 
-     if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma ||
--	 ptr->map.base_addr)) {
--	printf("          ");
-+	 ptr->map.base_addr >= 0x100)) {
-+	printf("        device ");
- 	if (ptr->map.irq)
--	    printf(_("Interrupt:%d "), ptr->map.irq);
--	if (ptr->map.base_addr >= 0x100)	/* Only print devices using it for 
-+	    printf(_("interrupt %d  "), ptr->map.irq);
-+	if (ptr->map.base_addr >= 0x100)	/* Only print devices using it for
- 						   I/O maps */
--	    printf(_("Base address:0x%x "), ptr->map.base_addr);
-+	    printf(_("base 0x%x  "), ptr->map.base_addr);
- 	if (ptr->map.mem_start) {
--	    printf(_("Memory:%lx-%lx "), ptr->map.mem_start, ptr->map.mem_end);
-+	    printf(_("memory 0x%lx-%lx  "), ptr->map.mem_start, ptr->map.mem_end);
- 	}
- 	if (ptr->map.dma)
--	    printf(_("DMA chan:%x "), ptr->map.dma);
-+	    printf(_("  dma 0x%x"), ptr->map.dma);
- 	printf("\n");
-     }
-     printf("\n");
-diff --git a/lib/ipx.c b/lib/ipx.c
-index 0e760a3..837788c 100644
---- a/lib/ipx.c
-+++ b/lib/ipx.c
-@@ -42,7 +42,7 @@
- #endif
- 
- /* Display a ipx domain address. */
--static char *IPX_print(unsigned char *ptr)
-+static const char *IPX_print(const char *ptr)
- {
-     static char buff[64];
-     struct sockaddr_ipx *sipx = (struct sockaddr_ipx *) (ptr - 2);
-@@ -73,7 +73,7 @@ static char *IPX_print(unsigned char *ptr)
- 
- 
- /* Display a ipx domain address. */
--static char *IPX_sprint(struct sockaddr *sap, int numeric)
-+static const char *IPX_sprint(struct sockaddr *sap, int numeric)
- {
-     static char buf[64];
- 
-@@ -87,12 +87,10 @@ static int IPX_getsock(char *bufp, struct sockaddr *sap)
- {
-     char *sp = bufp, *bp;
-     unsigned int i;
--    unsigned char val;
-     struct sockaddr_ipx *sipx = (struct sockaddr_ipx *) sap;
- 
-     sipx->sipx_port = 0;
- 
--    val = 0;
-     bp = (char *) sipx->sipx_node;
-     for (i = 0; i < sizeof(sipx->sipx_node); i++) {
- 	*sp = toupper(*sp);
-@@ -133,6 +131,9 @@ static int IPX_input(int type, char *bufp, struct sockaddr *sap)
-     char *ep;
-     int nbo;
- 
-+    if (!sai)
-+    	return (-1);
-+
-     sai->sipx_family = AF_IPX;
-     sai->sipx_network = htonl(0);
-     sai->sipx_node[0] = sai->sipx_node[1] = sai->sipx_node[2] =
-diff --git a/lib/ipx_gr.c b/lib/ipx_gr.c
-index 3d7ef1d..09c8dcd 100644
---- a/lib/ipx_gr.c
-+++ b/lib/ipx_gr.c
-@@ -27,6 +27,7 @@
- #include "net-support.h"
- #include "pathnames.h"
- #include "intl.h"
-+#include "util.h"
- 
- /* UGLY */
- 
-@@ -38,25 +39,32 @@ int IPX_rprint(int options)
-     char net[128], router_net[128];
-     char router_node[128];
-     int num;
--    FILE *fp = fopen(_PATH_PROCNET_IPX_ROUTE, "r");
-+    FILE *fp;
-     struct aftype *ap;
-     struct sockaddr sa;
- 
--    if ((ap = get_afntype(AF_IPX)) == NULL) {
--	EINTERN("lib/ipx_rt.c", "AF_IPX missing");
--	return (-1);
-+    fp = fopen(_PATH_PROCNET_IPX_ROUTE1, "r");
-+
-+    if (!fp) {
-+        fp = fopen(_PATH_PROCNET_IPX_ROUTE2, "r");
-     }
- 
-     if (!fp) {
--        perror(_PATH_PROCNET_IPX_ROUTE);
--        printf(_("IPX not configured in this system.\n"));
-+        perror(NULL);
-+        printf(_("IPX routing not in file %s or %s found.\n"), _PATH_PROCNET_IPX_ROUTE1, _PATH_PROCNET_IPX_ROUTE2);
- 	return 1;
-     }
- 
-+    if ((ap = get_afntype(AF_IPX)) == NULL) {
-+	EINTERN("lib/ipx_rt.c", "AF_IPX missing");
-+	return (-1);
-+    }
-+
-     printf(_("Kernel IPX routing table\n"));	/* xxx */
-     printf(_("Destination               Router Net                Router Node\n"));
- 
--    fgets(buff, 1023, fp);
-+    if (fgets(buff, 1023, fp))
-+	/* eat line */;
- 
-     while (fgets(buff, 1023, fp)) {
- 	num = sscanf(buff, "%s %s %s", net, router_net, router_node);
-@@ -65,15 +73,15 @@ int IPX_rprint(int options)
- 
- 	/* Fetch and resolve the Destination */
- 	(void) ap->input(5, net, &sa);
--	strcpy(net, ap->sprint(&sa, numeric));
-+	safe_strncpy(net, ap->sprint(&sa, numeric), sizeof(net));
- 
- 	/* Fetch and resolve the Router Net */
- 	(void) ap->input(5, router_net, &sa);
--	strcpy(router_net, ap->sprint(&sa, numeric));
-+	safe_strncpy(router_net, ap->sprint(&sa, numeric), sizeof(router_net));
- 
- 	/* Fetch and resolve the Router Node */
- 	(void) ap->input(2, router_node, &sa);
--	strcpy(router_node, ap->sprint(&sa, numeric));
-+	safe_strncpy(router_node, ap->sprint(&sa, numeric), sizeof(router_node));
- 
- 	printf("%-25s %-25s %-25s\n", net, router_net, router_node);
-     }
-diff --git a/lib/irda.c b/lib/irda.c
-index fa147fe..3658673 100644
---- a/lib/irda.c
-+++ b/lib/irda.c
-@@ -1,29 +1,31 @@
- /*********************************************************************
-- *                
-+ *
-  * Filename:      irda.c
-- * Version:       0.1
-- * Description:   A first attempt to make ifconfig understand IrDA
-+ * Version:       0.2
-+ * Description:   A second attempt to make ifconfig understand IrDA
-  * Status:        Experimental.
-  * Author:        Dag Brattli <dagb@cs.uit.no>
-  * Created at:    Wed Apr 21 09:03:09 1999
-  * Modified at:   Wed Apr 21 09:17:05 1999
-  * Modified by:   Dag Brattli <dagb@cs.uit.no>
-- * 
-- *     This program 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 of 
-+ * Modified at:   Wed May  1 11:51:44 CEST 2002
-+ * Modified by:   Christoph Bartelmus <christoph@bartelmus.de>
-+ *
-+ *     This program 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 of
-  *     the License, or (at your option) any later version.
-- * 
-+ *
-  *     This program 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., 59 Temple Place, Suite 330, Boston, 
-+ *
-+ *     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., 59 Temple Place, Suite 330, Boston,
-  *     MA 02111-1307 USA
-- *     
-+ *
-  ********************************************************************/
- 
- #include "config.h"
-@@ -57,11 +59,11 @@
-  *    Print hardware address of interface
-  *
-  */
--static char *irda_print(unsigned char *ptr)
-+static const char *irda_print(const char *ptr)
- {
--    static char buff[8];
-+    static char buff[12];
- 
--    sprintf(&buff[strlen(buff)], "%02x:%02x:%02x:%02x", ptr[3], ptr[2], 
-+    snprintf(buff, 12, "%02x:%02x:%02x:%02x", ptr[3], ptr[2],
- 	    ptr[1], ptr[0]);
- 
-     return (buff);
-diff --git a/lib/loopback.c b/lib/loopback.c
-index 0f08ac2..1b7e9cc 100644
---- a/lib/loopback.c
-+++ b/lib/loopback.c
-@@ -32,7 +32,7 @@
- #include "util.h"
- 
- /* Display an UNSPEC address. */
--static char *pr_unspec(unsigned char *ptr)
-+static const char *pr_unspec(const char *ptr)
- {
-     static char buff[64];
-     char *pos;
-diff --git a/lib/masq_info.c b/lib/masq_info.c
-index 45ca689..3a97a98 100644
---- a/lib/masq_info.c
-+++ b/lib/masq_info.c
-@@ -6,7 +6,7 @@
-  *              NET-3 Networking Distribution for the LINUX operating
-  *              system. (net-tools, net-drivers)
-  *
-- * Version:     $Id: masq_info.c,v 1.7 2000/10/08 01:00:44 ecki Exp $
-+ * Version:     $Id: masq_info.c,v 1.8 2009/09/06 22:52:01 vapier Exp $
-  *
-  * Author:      Bernd 'eckes' Eckenfels <net-tools@lina.inka.de>
-  *              Copyright 1999 Bernd Eckenfels, Germany
-@@ -119,7 +119,9 @@ static int read_masqinfo(FILE * f, struct masq *mslist, int nmslist)
- 	ms->src.sin_family = AF_INET;
- 	ms->dst.sin_family = AF_INET;
- 
--	if (strcmp("TCP", buf) == 0)
-+	if (strcmp("IP", buf) == 0)
-+	    ms->proto = "ip";
-+	else if (strcmp("TCP", buf) == 0)
- 	    ms->proto = "tcp";
- 	else if (strcmp("UDP", buf) == 0)
- 	    ms->proto = "udp";
-@@ -206,10 +208,9 @@ int ip_masq_info(int numeric_host, int numeric_port, int ext)
- 	}
- 	for (i = 0; i < ntotal; i++)
- 	    print_masq(&(mslist[i]), numeric_host, numeric_port, ext);
--	if (mslist)
--	    free(mslist);
--
-     }
-+
-+    free(mslist);
-     return 0;
- }
- #endif
-diff --git a/lib/net-features.h b/lib/net-features.h
-index 0de2730..569f4a5 100644
---- a/lib/net-features.h
-+++ b/lib/net-features.h
-@@ -20,7 +20,7 @@
-  *              your option) any later version.
-  */
- 
--/* 
-+/*
-  *    This needs to be included AFTER the KErnel Header Files
-  *      one of the FEATURE_ should be defined to get the Feature Variable
-  *      definition included
-@@ -117,6 +117,9 @@ static char *Features =
- "-I18N"
- #endif				/* I18N */
- 
-+#if HAVE_SELINUX
-+" +SELINUX"
-+#endif
- 
- "\nAF: "
- #ifdef DFLT_AF
-@@ -183,6 +186,12 @@ static char *Features =
- "-"
- #endif
- "ROSE "
-+#if HAVE_AFBLUETOOTH
-+"+"
-+#else
-+"-"
-+#endif
-+"BLUETOOTH"
- 
- "\nHW: "
- 
-@@ -295,6 +304,13 @@ static char *Features =
- "-"
- #endif
- "HDLC/LAPB "
-+
-+#if HAVE_HWEUI64
-+"+"
-+#else
-+"-"
-+#endif
-+"EUI64 "
- ;
- 
- 
-diff --git a/lib/net-support.h b/lib/net-support.h
-index 568fe81..0841170 100644
---- a/lib/net-support.h
-+++ b/lib/net-support.h
-@@ -38,15 +38,15 @@ struct aftype {
-     char *title;
-     int af;
-     int alen;
--    char *(*print) (unsigned char *);
--    char *(*sprint) (struct sockaddr *, int numeric);
-+    const char *(*print) (const char *);
-+    const char *(*sprint) (struct sockaddr *, int numeric);
-     int (*input) (int type, char *bufp, struct sockaddr *);
-     void (*herror) (char *text);
-     int (*rprint) (int options);
-     int (*rinput) (int typ, int ext, char **argv);
- 
-     /* may modify src */
--    int (*getmask) (char *src, struct sockaddr * mask, char *name);
-+    int (*getmask) (char *src, struct sockaddr *mask, char *name);
- 
-     int fd;
-     char *flag_file;
-@@ -60,7 +60,7 @@ struct hwtype {
-     char *title;
-     int type;
-     int alen;
--    char *(*print) (unsigned char *);
-+    const char *(*print) (const char *);
-     int (*input) (char *, struct sockaddr *);
-     int (*activate) (int fd);
-     int suppress_null_addr;
-@@ -119,11 +119,12 @@ extern int IPX_rinput(int action, int flags, char **argv);
- extern int NETROM_rinput(int action, int flags, char **argv);
- extern int AX25_rinput(int action, int flags, char **argv);
- extern int X25_rinput(int action, int flags, char **argv);
-+extern int ROSE_rinput(int action, int flags, char **argv);
- 
- extern int aftrans_opt(const char *arg);
- extern void aftrans_def(char *tool, char *argv0, char *dflt);
- 
--extern char *get_sname(int socknumber, char *proto, int numeric);
-+extern const char *get_sname(int socknumber, const char *proto, int numeric);
- 
- extern int flag_unx;
- extern int flag_ipx;
-@@ -131,14 +132,16 @@ extern int flag_ax25;
- extern int flag_ddp;
- extern int flag_netrom;
- extern int flag_x25;
-+extern int flag_rose;
- extern int flag_inet;
- extern int flag_inet6;
-+extern int flag_bluetooth;
- 
--extern char afname[];
-+extern char afname[256];
- 
- #define AFTRANS_OPTS \
- 	{"ax25",	0,	0,	1}, \
--       {"x25",         0,      0,      1}, \
-+	{"x25",         0,      0,      1}, \
- 	{"ip",		0,	0,	1}, \
- 	{"ipx",         0,	0,	1}, \
- 	{"appletalk",	0,	0,	1}, \
-@@ -146,9 +149,11 @@ extern char afname[];
- 	{"inet",	0,	0,	1}, \
- 	{"inet6",	0,	0,	1}, \
- 	{"ddp",		0,	0,	1}, \
-+	{"rose",	0,	0,	1}, \
- 	{"unix",	0,	0,	1}, \
-+	{"bluetooth",	0,	0,	1}, \
- 	{"tcpip",	0,	0,	1}
--#define AFTRANS_CNT 11
-+#define AFTRANS_CNT 12
- 
- #define EINTERN(file, text) fprintf(stderr, \
- 	_("%s: Internal Error `%s'.\n"),file,text);
-@@ -163,8 +168,8 @@ extern char afname[];
- #define E_NOTFOUND	8
- #define E_SOCK		7
- #define E_LOOKUP	6
--#define E_VERSION	5
--#define E_USAGE		4
-+#define E_VERSION	EXIT_SUCCESS
-+#define E_USAGE		EXIT_SUCCESS
- #define E_OPTERR	3
- #define E_INTERN	2
- #define E_NOSUPP	1
-@@ -234,7 +239,7 @@ extern char afname[];
- /* this is a 2.0.36 flag from /usr/src/linux/include/linux/route.h */
- #define RTF_NOTCACHED   0x0400          /* this route isn't cached        */
- 
--#ifdef HAVE_AFECONET
-+#if HAVE_AFECONET
- #ifndef AF_ECONET
- #define AF_ECONET       19      /* Acorn Econet */
- #endif
-diff --git a/lib/netrom.c b/lib/netrom.c
-index 1de9dc3..dfe1ae3 100644
---- a/lib/netrom.c
-+++ b/lib/netrom.c
-@@ -11,7 +11,7 @@
-  *
-  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              Copyright 1993 MicroWalt Corporation
-- * 
-+ *
-  * Changes:
-  * 980701 {1.21} Arnaldo Carvalho de Melo - GNU gettext instead of catgets,
-  *                                          strncpy instead of strcpy for
-@@ -52,7 +52,7 @@ static char netrom_errmsg[128];
- 
- extern struct aftype netrom_aftype;
- 
--static char *NETROM_print(unsigned char *ptr)
-+static const char *NETROM_print(const char *ptr)
- {
-     static char buff[8];
-     int i;
-@@ -71,7 +71,7 @@ static char *NETROM_print(unsigned char *ptr)
- 
- 
- /* Display an AX.25 socket address. */
--static char *NETROM_sprint(struct sockaddr *sap, int numeric)
-+static const char *NETROM_sprint(struct sockaddr *sap, int numeric)
- {
-     char buf[64];
-     if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
-@@ -79,10 +79,15 @@ static char *NETROM_sprint(struct sockaddr *sap, int numeric)
-     return (NETROM_print(((struct sockaddr_ax25 *) sap)->sax25_call.ax25_call));
- }
- 
-+#ifdef DEBUG
-+#define _DEBUG 1
-+#else
-+#define _DEBUG 0
-+#endif
- 
- static int NETROM_input(int type, char *bufp, struct sockaddr *sap)
- {
--    unsigned char *ptr;
-+    char *ptr;
-     char *orig, c;
-     unsigned int i;
- 
-@@ -98,9 +103,8 @@ static int NETROM_input(int type, char *bufp, struct sockaddr *sap)
- 	    c = toupper(c);
- 	if (!(isupper(c) || isdigit(c))) {
- 	    safe_strncpy(netrom_errmsg, _("Invalid callsign"), sizeof(netrom_errmsg));
--#ifdef DEBUG
--	    fprintf(stderr, "netrom_input(%s): %s !\n", netrom_errmsg, orig);
--#endif
-+	    if (_DEBUG)
-+		fprintf(stderr, "netrom_input(%s): %s !\n", netrom_errmsg, orig);
- 	    errno = EINVAL;
- 	    return (-1);
- 	}
-@@ -111,9 +115,8 @@ static int NETROM_input(int type, char *bufp, struct sockaddr *sap)
-     /* Callsign too long? */
-     if ((i == 6) && (*bufp != '-') && (*bufp != '\0')) {
- 	safe_strncpy(netrom_errmsg, _("Callsign too long"), sizeof(netrom_errmsg));
--#ifdef DEBUG
--	fprintf(stderr, "netrom_input(%s): %s !\n", netrom_errmsg, orig);
--#endif
-+	if (_DEBUG)
-+	    fprintf(stderr, "netrom_input(%s): %s !\n", netrom_errmsg, orig);
- 	errno = E2BIG;
- 	return (-1);
-     }
-@@ -131,12 +134,12 @@ static int NETROM_input(int type, char *bufp, struct sockaddr *sap)
-     }
- 
-     /* All done. */
--#ifdef DEBUG
--    fprintf(stderr, "netrom_input(%s): ", orig);
--    for (i = 0; i < sizeof(ax25_address); i++)
--	fprintf(stderr, "%02X ", sap->sa_data[i] & 0377);
--    fprintf(stderr, "\n");
--#endif
-+    if (_DEBUG) {
-+	fprintf(stderr, "netrom_input(%s): ", orig);
-+	for (i = 0; i < sizeof(ax25_address); i++)
-+	    fprintf(stderr, "%02X ", sap->sa_data[i] & 0377);
-+	fprintf(stderr, "\n");
-+    }
- 
-     return (0);
- }
-diff --git a/lib/netrom_gr.c b/lib/netrom_gr.c
-index adf54b2..ec82fe8 100644
---- a/lib/netrom_gr.c
-+++ b/lib/netrom_gr.c
-@@ -10,7 +10,7 @@
-  *
-  * Changes:
-  * 980701 {0.02} Arnaldo Carvalho de Melo   GNU gettext instead of catgets
-- * 
-+ *
-  *
-  *              This program is free software; you can redistribute it
-  *              and/or  modify it under  the terms of  the GNU General
-@@ -39,9 +39,7 @@ int NETROM_rprint(int options)
-     /*int ext = options & FLAG_EXT;
-        int numeric = options & FLAG_NUM_HOST; */
- 
--    f1 = fopen(_PATH_PROCNET_NR_NODES, "r");
-     if (!f1) perror(_PATH_PROCNET_NR_NODES);
--    f2 = fopen(_PATH_PROCNET_NR_NEIGH, "r");
-     if (!f2) perror(_PATH_PROCNET_NR_NEIGH);
- 
-     if (f1 == NULL || f2 == NULL) {
-@@ -50,7 +48,8 @@ int NETROM_rprint(int options)
-     }
-     printf(_("Kernel NET/ROM routing table\n"));
-     printf(_("Destination  Mnemonic  Quality  Neighbour  Iface\n"));
--    fgets(buffer, 256, f1);
-+    if (fgets(buffer, 256, f1))
-+	/* eat line */;
-     while (fgets(buffer, 256, f1)) {
- 	buffer[9] = 0;
- 	buffer[17] = 0;
-@@ -60,7 +59,8 @@ int NETROM_rprint(int options)
- 	qual = atoi(buffer + 24 + 15 * w);
- 	n = atoi(buffer + 32 + 15 * w);
- 	rewind(f2);
--	fgets(buffer, 256, f2);
-+	if (fgets(buffer, 256, f2))
-+	    /* eat line */;
- 	while (fgets(buffer, 256, f2)) {
- 	    if (atoi(buffer) == n) {
- 		buffer[15] = 0;
-diff --git a/lib/nstrcmp.c b/lib/nstrcmp.c
-index 8b1ff30..e05c778 100644
---- a/lib/nstrcmp.c
-+++ b/lib/nstrcmp.c
-@@ -1,34 +1,190 @@
- /* Copyright 1998 by Andi Kleen. Subject to the GPL. */
--/* $Id: nstrcmp.c,v 1.2 1998/11/15 20:11:38 freitag Exp $ */ 
-+/* rewritten by bernd eckenfels because of complicated alias semantic */
-+/* $Id: nstrcmp.c,v 1.4 2004/06/03 22:49:17 ecki Exp $ */
- #include <ctype.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "util.h"
- 
--/* like strcmp(), but knows about numbers */
--int nstrcmp(const char *astr, const char *b)
-+
-+/* return numerical :999 suffix or null. sideeffect: replace ':' with \0 */
-+char* cutalias(char* name)
-+{
-+	int digit = 0;
-+	int pos;
-+
-+	for(pos=strlen(name); pos>0; pos--)
-+	{
-+		if (name[pos-1]==':' && digit)
-+		{
-+			name[pos-1]='\0';
-+			return name+pos;
-+		}
-+		if (!isdigit(name[pos-1]))
-+			break;
-+		digit = 1;
-+	}
-+	return NULL;
-+}
-+
-+
-+/* return index of last non digit or -1 if it does not end with digits */
-+int rindex_nondigit(char *name)
-+{
-+	int pos = strlen(name);
-+
-+	for(pos=strlen(name); pos>0; pos--)
-+	{
-+		if (!isdigit(name[pos-1]))
-+			return pos;
-+	}
-+	return 0;
-+}
-+
-+
-+/* like strcmp(), but knows about numbers and ':' alias suffix */
-+int nstrcmp(const char *ap, const char *bp)
-+{
-+	char *a = xstrdup(ap);
-+	char *b = xstrdup(bp);
-+	char *an, *bn;
-+	int av = 0, bv = 0;
-+	char *aalias=cutalias(a);
-+	char *balias=cutalias(b);
-+	int aindex=rindex_nondigit(a);
-+	int bindex=rindex_nondigit(b);
-+	int complen=(aindex<bindex)?aindex:bindex;
-+	int res = strncmp(a, b, complen);
-+
-+	if (res != 0) {
-+		goto out;
-+	}
-+
-+	if (aindex > bindex) {
-+		res = 1;
-+		goto out;
-+	}
-+
-+	if (aindex < bindex) {
-+		res = -1;
-+		goto out;
-+	}
-+
-+	an = a+aindex;
-+	bn = b+bindex;
-+
-+	av = atoi(an);
-+	bv = atoi(bn);
-+
-+	if (av < bv) {
-+		res = -1;
-+		goto out;
-+	}
-+
-+	if (av > bv) {
-+		res = 1;
-+		goto out;
-+	}
-+
-+	res = strcmp(a, b);
-+	if (res != 0) {
-+		goto out;
-+	}
-+
-+	av = -1;
-+	if (aalias != NULL)
-+		av = atoi(aalias);
-+
-+	bv = -1;
-+	if (balias != NULL)
-+		bv = atoi(balias);
-+
-+	if (av < bv) {
-+		res = -1;
-+		goto out;
-+	}
-+
-+	if (av > bv) {
-+		res = 1;
-+		goto out;
-+	}
-+
-+	if (aalias && balias) {
-+		res = strcmp(aalias, balias);
-+	}
-+
-+out:
-+
-+	free(a); free(b);
-+
-+	return res;
-+}
-+
-+
-+#ifdef NSTRCMP_TEST
-+
-+int cs(int s)
-+{
-+	if (s < 0) return -1;
-+	if (s > 0) return 1;
-+	return 0;
-+}
-+
-+
-+int dotest(char* a, char* b, int exp)
-+{
-+	int res = nstrcmp(a, b);
-+	int err = (cs(res) != cs(exp));
-+	printf("nstrcmp(\"%s\", \"%s\")=%d %d %s\n", a, b, res, exp, err?"WRONG":"OK");
-+	return err;
-+}
-+
-+int main()
- {
--    const char *a = astr;
--
--    while (*a == *b) {
--	if (*a == '\0')
--	    return 0;
--	a++;
--	b++;
--    }
--    if (isdigit(*a)) {
--	if (!isdigit(*b))
--	    return -1;
--	while (a > astr) {
--	    a--;
--	    if (!isdigit(*a)) {
--		a++;
--		break;
--	    }
--	    if (!isdigit(*b))
--		return -1;
--	    b--;
--	}
--	return atoi(a) > atoi(b) ? 1 : -1;
--    }
--    return *a - *b;
-+	int err = 0;
-+
-+	err |= dotest("eth1", "eth1", 0);
-+	err |= dotest("eth0:1", "eth0:1", 0);
-+	err |= dotest("lan", "lan", 0);
-+	err |= dotest("100", "100", 0);
-+	err |= dotest("", "", 0);
-+	err |= dotest(":", ":", 0);
-+	err |= dotest("a:b:c", "a:b:c", 0);
-+	err |= dotest("a:", "a:", 0);
-+	err |= dotest(":a", ":a", 0);
-+
-+	err |= dotest("a", "aa", -1);
-+	err |= dotest("eth0", "eth1", -1);
-+	err |= dotest("eth1", "eth20", -1);
-+	err |= dotest("eth20", "eth100", -1);
-+	err |= dotest("eth1", "eth13", -1);
-+	err |= dotest("eth", "eth2", -1);
-+	err |= dotest("eth0:1", "eth0:2", -1);
-+	err |= dotest("eth1:10", "eth13:10", -1);
-+	err |= dotest("eth1:1", "eth1:13", -1);
-+	err |= dotest("a", "a:", -1);
-+
-+	err |= dotest("aa", "a", 1);
-+	err |= dotest("eth2", "eth1", 1);
-+	err |= dotest("eth13", "eth1", 1);
-+	err |= dotest("eth2", "eth", 1);
-+	err |= dotest("eth2:10", "eth2:1", 1);
-+	err |= dotest("eth2:5", "eth2:4", 1);
-+	err |= dotest("eth3:2", "eth2:3", 1);
-+	err |= dotest("eth13:1", "eth1:0", 1);
-+	err |= dotest("a:", "a", 1);
-+	err |= dotest("a1b12", "a1b2", 1);
-+
-+	err |= dotest("eth1", "eth01", 1);
-+	err |= dotest("eth01", "eth1", -1);
-+	err |= dotest("eth1:1", "eth01:1", 1);
-+	err |= dotest("eth01:1", "eth1:1", -1);
-+	err |= dotest("eth1:1", "eth01:01", 1);
-+	err |= dotest("eth1:01", "eth01:1", 1);
-+	err |= dotest("eth01:1", "eth1:01", -1);
-+	err |= dotest("eth01:01", "eth1:1", -1);
-+
-+	return err;
- }
-+
-+#endif
-diff --git a/lib/pathnames.h b/lib/pathnames.h
-index 1f7fefb..14b051c 100644
---- a/lib/pathnames.h
-+++ b/lib/pathnames.h
-@@ -1,9 +1,8 @@
--
- /*
-- * lib/pathnames.h    This file contains the definitions of the path 
-+ * lib/pathnames.h    This file contains the definitions of the path
-  *                      names used by the NET-LIB.
-  *
-- * NET-LIB      
-+ * NET-LIB
-  *
-  * Version:     lib/pathnames.h 1.37 (1997-08-23)
-  *
-@@ -17,6 +16,12 @@
- #define _PATH_PROCNET_TCP6		"/proc/net/tcp6"
- #define _PATH_PROCNET_UDP		"/proc/net/udp"
- #define _PATH_PROCNET_UDP6		"/proc/net/udp6"
-+#define _PATH_PROCNET_UDPLITE           "/proc/net/udplite"
-+#define _PATH_PROCNET_UDPLITE6          "/proc/net/udplite6"
-+#define _PATH_PROCNET_SCTPEPTS		"/proc/net/sctp/eps"
-+#define _PATH_PROCNET_SCTP6EPTS		"/proc/net/sctp6/eps"
-+#define _PATH_PROCNET_SCTPASSOCS	"/proc/net/sctp/assocs"
-+#define _PATH_PROCNET_SCTP6ASSOCS	"/proc/net/sctp6/assocs"
- #define _PATH_PROCNET_RAW		"/proc/net/raw"
- #define _PATH_PROCNET_RAW6		"/proc/net/raw6"
- #define _PATH_PROCNET_UNIX		"/proc/net/unix"
-@@ -29,8 +34,10 @@
- #define _PATH_PROCNET_NR_NODES		"/proc/net/nr_nodes"
- #define _PATH_PROCNET_ARP		"/proc/net/arp"
- #define _PATH_PROCNET_AX25		"/proc/net/ax25"
--#define _PATH_PROCNET_IPX		"/proc/net/ipx"
--#define _PATH_PROCNET_IPX_ROUTE		"/proc/net/ipx_route"
-+#define _PATH_PROCNET_IPX_SOCKET1	"/proc/net/ipx/socket"
-+#define _PATH_PROCNET_IPX_SOCKET2	"/proc/net/ipx"
-+#define _PATH_PROCNET_IPX_ROUTE1	"/proc/net/ipx/route"
-+#define _PATH_PROCNET_IPX_ROUTE2	"/proc/net/ipx_route"
- #define _PATH_PROCNET_ATALK		"/proc/net/appletalk"
- #define _PATH_PROCNET_IP_BLK		"/proc/net/ip_block"
- #define _PATH_PROCNET_IP_FWD		"/proc/net/ip_forward"
-@@ -42,9 +49,12 @@
- #define _PATH_PROCNET_RARP		"/proc/net/rarp"
- #define _PATH_ETHERS			"/etc/ethers"
- #define _PATH_PROCNET_ROSE_ROUTE	"/proc/net/rose_routes"
--#define _PATH_PROCNET_X25              "/proc/net/x25"
--#define _PATH_PROCNET_X25_ROUTE                "/proc/net/x25_routes"
-+#define _PATH_PROCNET_X25		"/proc/net/x25"
-+#define _PATH_PROCNET_X25_ROUTE		"/proc/net/x25/route"
- #define _PATH_PROCNET_DEV_MCAST		"/proc/net/dev_mcast"
-+#define _PATH_PROCNET_ATALK_ROUTE	"/proc/net/atalk_route"
-+#define _PATH_SYS_BLUETOOTH_L2CAP	"/sys/class/bluetooth/l2cap"
-+#define _PATH_SYS_BLUETOOTH_RFCOMM	"/sys/class/bluetooth/rfcomm"
- 
- /* pathname for the netlink device */
- #define _PATH_DEV_ROUTE	"/dev/route"
-diff --git a/lib/ppp.c b/lib/ppp.c
-index 8bf1499..27d660c 100644
---- a/lib/ppp.c
-+++ b/lib/ppp.c
-@@ -8,7 +8,7 @@
-  *              Copyright 1993 MicroWalt Corporation
-  *
-  *              Modified by Alan Cox, May 94 to cover NET-3
-- *                       
-+ *
-  * Changes:
-  * 980701 {1.12} Arnaldo Carvalho de Melo - GNU gettext instead of catgets
-  *
-diff --git a/lib/proc.c b/lib/proc.c
-index bf34dbe..8e4711d 100644
---- a/lib/proc.c
-+++ b/lib/proc.c
-@@ -1,11 +1,14 @@
- /* Tolerant /proc file parser. Copyright 1998 Andi Kleen */
--/* $Id: proc.c,v 1.4 1999/01/05 20:54:00 philip Exp $ */ 
--/* Fixme: cannot currently cope with removed fields */ 
-+/* $Id: proc.c,v 1.5 2007/12/01 18:44:57 ecki Exp $ */
-+/* Fixme: cannot currently cope with removed fields */
- 
- #include <string.h>
- #include <stdarg.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <ctype.h>
-+#include <unistd.h>
-+#include "util.h"
- 
- /* Caller must free return string. */
- 
-@@ -46,10 +49,10 @@ char *proc_gen_fmt(char *name, int more, FILE * fh,...)
- 		name, title);
- 	return NULL;
-     }
--    return strdup(format);
-+    return xstrdup(format);
- }
- 
--/* 
-+/*
-  * this will generate a bitmask of present/missing fields in the header of
-  * a /proc file.
-  */
-@@ -72,3 +75,22 @@ int proc_guess_fmt(char *name, FILE *fh, ...)
-     va_end(ap);
-     return flag;
- }
-+
-+
-+FILE *proc_fopen(const char *name)
-+{
-+    static char *buffer;
-+    static size_t pagesz;
-+    FILE *fd = fopen(name, "r");
-+
-+    if (fd == NULL)
-+      return NULL;
-+
-+    if (!buffer) {
-+      pagesz = getpagesize();
-+      buffer = malloc(pagesz);
-+    }
-+
-+    setvbuf(fd, buffer, _IOFBF, pagesz);
-+    return fd;
-+}
-diff --git a/lib/proc.h b/lib/proc.h
-index 91f803c..379de23 100644
---- a/lib/proc.h
-+++ b/lib/proc.h
-@@ -1,5 +1,7 @@
--
--
--/* Generate a suitable scanf format for a column title line */
-+/*
-+ * prototypes for proc.c
-+ */
- char *proc_gen_fmt(char *name, int more, FILE * fh,...);
- int   proc_guess_fmt(char *name, FILE* fh,...);
-+FILE *proc_fopen(const char *name);
-+
-diff --git a/lib/rose.c b/lib/rose.c
-index 381226b..6286cb1 100644
---- a/lib/rose.c
-+++ b/lib/rose.c
-@@ -34,6 +34,7 @@
- #include "net-support.h"
- #include "pathnames.h"
- #include "intl.h"
-+#include "util.h"
- 
- #ifndef _NETROSE_ROSE_H
- #include <linux/ax25.h>
-@@ -53,8 +54,8 @@ static char ROSE_errmsg[128];
- 
- extern struct aftype rose_aftype;
- 
--static char *
-- ROSE_print(unsigned char *ptr)
-+static const char *
-+ ROSE_print(const char *ptr)
- {
-     static char buff[12];
- 
-@@ -64,7 +65,7 @@ static char *
- }
- 
- /* Display a ROSE socket address. */
--static char *
-+static const char *
-  ROSE_sprint(struct sockaddr *sap, int numeric)
- {
-     if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
-@@ -73,7 +74,6 @@ static char *
-     return (ROSE_print(((struct sockaddr_rose *) sap)->srose_addr.rose_addr));
- }
- 
--
- static int ROSE_input(int type, char *bufp, struct sockaddr *sap)
- {
-     char *ptr;
-@@ -84,10 +84,7 @@ static int ROSE_input(int type, char *bufp, struct sockaddr *sap)
- 
-     /* Node address the correct length ? */
-     if (strlen(bufp) != 10) {
--	strcpy(ROSE_errmsg, _("Node address must be ten digits"));
--#ifdef DEBUG
--	fprintf(stderr, "rose_input(%s): %s !\n", ROSE_errmsg, orig);
--#endif
-+	safe_strncpy(ROSE_errmsg, _("Node address must be ten digits"), sizeof(ROSE_errmsg));
- 	errno = EINVAL;
- 	return (-1);
-     }
-@@ -98,13 +95,6 @@ static int ROSE_input(int type, char *bufp, struct sockaddr *sap)
-     }
- 
-     /* All done. */
--#ifdef DEBUG
--    fprintf(stderr, "rose_input(%s): ", orig);
--    for (i = 0; i < sizeof(rose_address); i++)
--	fprintf(stderr, "%02X ", sap->sa_data[i] & 0377);
--    fprintf(stderr, "\n");
--#endif
--
-     return (0);
- }
- 
-diff --git a/lib/rose_gr.c b/lib/rose_gr.c
-index cf0a60a..a0858fd 100644
---- a/lib/rose_gr.c
-+++ b/lib/rose_gr.c
-@@ -53,7 +53,8 @@ int ROSE_rprint(int options)
-     }
-     printf(_("Kernel ROSE routing table\n"));
-     printf(_("Destination  Iface    Use\n"));
--    fgets(buffer, 256, f);
-+    if (fgets(buffer, 256, f))
-+	/* eat line */;
-     while (fgets(buffer, 256, f)) {
- 	buffer[9] = 0;
- 	buffer[14] = 0;
-diff --git a/lib/strip.c b/lib/strip.c
-index fd396ba..ced2325 100644
---- a/lib/strip.c
-+++ b/lib/strip.c
-@@ -38,8 +38,8 @@
- 
- extern struct hwtype strip_hwtype;
- 
--static char *
--pr_strip(unsigned char *ptr)
-+static const char *
-+pr_strip(const char *ptr)
- {
-   static char buff[64];
-   if(ptr[1])
-diff --git a/lib/tr.c b/lib/tr.c
-index 8d86aa7..c5314da 100644
---- a/lib/tr.c
-+++ b/lib/tr.c
-@@ -2,7 +2,7 @@
-  * lib/tr.c   This file contains an implementation of the "Tokenring"
-  *              support functions.
-  *
-- * Version:     $Id: tr.c,v 1.8 2000/02/02 08:56:30 freitag Exp $
-+ * Version:     $Id: tr.c,v 1.9 2005/05/16 03:15:12 ecki Exp $
-  *
-  * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-  *              Copyright 1993 MicroWalt Corporation
-@@ -30,10 +30,16 @@
- #include "net-support.h"
- #include "pathnames.h"
- #include "intl.h"
-+#include "util.h"
- 
-+
-+/* actual definition at the end of file */
- extern struct hwtype tr_hwtype;
-+#ifdef ARPHRD_IEEE802_TR
-+extern struct hwtype tr_hwtype1;
-+#endif
- 
--static char *pr_tr(unsigned char *ptr)
-+static const char *pr_tr(const char *ptr)
- {
-     static char buff[64];
- 
-@@ -42,16 +48,31 @@ static char *pr_tr(unsigned char *ptr)
- 	     (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
- 	);
-     return (buff);
--}
-+      }
- 
-+#ifdef DEBUG
-+#define _DEBUG 1
-+#else
-+#define _DEBUG 0
-+#endif
- 
- static int in_tr(char *bufp, struct sockaddr *sap)
- {
--    unsigned char *ptr;
-+    char *ptr;
-     char c, *orig;
-     int i, val;
- 
-+#ifdef ARPHRD_IEEE802_TR
-+    if (kernel_version() < KRELEASE(2,3,30)) {
-+        sap->sa_family = tr_hwtype.type;
-+    } else {
-+        sap->sa_family = tr_hwtype1.type;
-+    }
-+#else
-     sap->sa_family = tr_hwtype.type;
-+    #warning "Limited functionality, no support for ARPHRD_IEEE802_TR (old kernel headers?)"
-+#endif
-+
-     ptr = sap->sa_data;
- 
-     i = 0;
-@@ -66,9 +87,8 @@ static int in_tr(char *bufp, struct sockaddr *sap)
- 	else if (c >= 'A' && c <= 'F')
- 	    val = c - 'A' + 10;
- 	else {
--#ifdef DEBUG
--	    fprintf(stderr, _("in_tr(%s): invalid token ring address!\n"), orig);
--#endif
-+	    if (_DEBUG)
-+		fprintf(stderr, _("in_tr(%s): invalid token ring address!\n"), orig);
- 	    errno = EINVAL;
- 	    return (-1);
- 	}
-@@ -81,9 +101,8 @@ static int in_tr(char *bufp, struct sockaddr *sap)
- 	else if (c >= 'A' && c <= 'F')
- 	    val |= c - 'A' + 10;
- 	else {
--#ifdef DEBUG
--	    fprintf(stderr, _("in_tr(%s): invalid token ring address!\n"), orig);
--#endif
-+	    if (_DEBUG)
-+		fprintf(stderr, _("in_tr(%s): invalid token ring address!\n"), orig);
- 	    errno = EINVAL;
- 	    return (-1);
- 	}
-@@ -92,28 +111,21 @@ static int in_tr(char *bufp, struct sockaddr *sap)
- 
- 	/* We might get a semicolon here - not required. */
- 	if (*bufp == ':') {
--	    if (i == TR_ALEN) {
--#ifdef DEBUG
-+	    if (_DEBUG && i == TR_ALEN)
- 		fprintf(stderr, _("in_tr(%s): trailing : ignored!\n"),
--			orig)
--#endif
--		    ;		/* nothing */
--	    }
-+			orig);
- 	    bufp++;
- 	}
-     }
- 
-     /* That's it.  Any trailing junk? */
--    if ((i == TR_ALEN) && (*bufp != '\0')) {
--#ifdef DEBUG
-+    if (_DEBUG && (i == TR_ALEN) && (*bufp != '\0')) {
- 	fprintf(stderr, _("in_tr(%s): trailing junk!\n"), orig);
- 	errno = EINVAL;
- 	return (-1);
--#endif
-     }
--#ifdef DEBUG
--    fprintf(stderr, "in_tr(%s): %s\n", orig, pr_tr(sap->sa_data));
--#endif
-+    if (_DEBUG)
-+	fprintf(stderr, "in_tr(%s): %s\n", orig, pr_tr(sap->sa_data));
- 
-     return (0);
- }
-diff --git a/lib/tunnel.c b/lib/tunnel.c
-index 19606c1..8a160bf 100644
---- a/lib/tunnel.c
-+++ b/lib/tunnel.c
-@@ -21,7 +21,7 @@
- 
- extern struct hwtype ether_hwtype;
- 
--static char *pr_tunnel(unsigned char *ptr)
-+static const char *pr_tunnel(const char *ptr)
- {
-     return ("");
- }
-diff --git a/lib/unix.c b/lib/unix.c
-index fb4dcce..936cd48 100644
---- a/lib/unix.c
-+++ b/lib/unix.c
-@@ -32,7 +32,7 @@
- 
- 
- /* Display an UNSPEC address. */
--static char *UNSPEC_print(unsigned char *ptr)
-+static const char *UNSPEC_print(const char *ptr)
- {
-     static char buff[64];
-     char *pos;
-@@ -48,7 +48,7 @@ static char *UNSPEC_print(unsigned char *ptr)
- 
- 
- /* Display an UNSPEC socket address. */
--static char *UNSPEC_sprint(struct sockaddr *sap, int numeric)
-+static const char *UNSPEC_sprint(struct sockaddr *sap, int numeric)
- {
-     static char buf[64];
- 
-@@ -61,14 +61,14 @@ static char *UNSPEC_sprint(struct sockaddr *sap, int numeric)
- #if HAVE_AFUNIX
- 
- /* Display a UNIX domain address. */
--static char *UNIX_print(unsigned char *ptr)
-+static const char *UNIX_print(const char *ptr)
- {
-     return (ptr);
- }
- 
- 
- /* Display a UNIX domain address. */
--static char *UNIX_sprint(struct sockaddr *sap, int numeric)
-+static const char *UNIX_sprint(struct sockaddr *sap, int numeric)
- {
-     static char buf[64];
- 
-diff --git a/lib/util-ank.c b/lib/util-ank.c
-index 43a7f1c..b077f35 100644
---- a/lib/util-ank.c
-+++ b/lib/util-ank.c
-@@ -293,7 +293,7 @@ int inet_addr_match(inet_prefix *a, inet_prefix *b, int bits)
- 	return 0;
- }
- 
--const char *format_host(int af, void *addr, __u8 *abuf, int alen)
-+const char *format_host(int af, void *addr, char *abuf, int alen)
- {
- #ifdef RESOLVE_HOSTNAMES
- 	if (resolve_hosts) {
-diff --git a/lib/util.c b/lib/util.c
-index ac932f4..0397f1e 100644
---- a/lib/util.c
-+++ b/lib/util.c
-@@ -1,4 +1,4 @@
--/* Copyright 1998 by Andi Kleen. Subject to the GPL. */ 
-+/* Copyright 1998 by Andi Kleen. Subject to the GPL. */
- /* $Id: util.c,v 1.4 1998/11/17 15:17:02 freitag Exp $ */
- #include <stdio.h>
- #include <stdlib.h>
-@@ -22,6 +22,15 @@ void *xmalloc(size_t sz)
-     return p;
- }
- 
-+/* Like strdup, but oom() instead of NULL */
-+char *xstrdup(const char *s)
-+{
-+    char *d = strdup(s);
-+    if (!d)
-+        oom();
-+    return d;
-+}
-+
- void *xrealloc(void *oldp, size_t sz)
- {
-     void *p = realloc(oldp, sz);
-@@ -33,19 +42,19 @@ void *xrealloc(void *oldp, size_t sz)
- int kernel_version(void)
- {
-     struct utsname uts;
--    int major, minor, patch;
-+    int major, minor, patch=0;
- 
-     if (uname(&uts) < 0)
- 	return -1;
--    if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) != 3)
-+    if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) < 2)
- 	return -1;
-     return KRELEASE(major, minor, patch);
- }
- 
- 
--/* Like strncpy but make sure the resulting string is always 0 terminated. */  
-+/* Like strncpy but make sure the resulting string is always 0 terminated. */
- char *safe_strncpy(char *dst, const char *src, size_t size)
--{   
-+{
-     dst[size-1] = '\0';
--    return strncpy(dst,src,size-1);   
-+    return strncpy(dst,src,size-1);
- }
-diff --git a/lib/util.h b/lib/util.h
-index 6acb158..b7598e8 100644
---- a/lib/util.h
-+++ b/lib/util.h
-@@ -2,6 +2,7 @@
- 
- void *xmalloc(size_t sz);
- void *xrealloc(void *p, size_t sz);
-+char *xstrdup(const char *src);
- 
- #define new(p) ((p) = xmalloc(sizeof(*(p))))
- 
-@@ -12,5 +13,8 @@ int kernel_version(void);
- 
- int nstrcmp(const char *, const char *);
- 
--char *safe_strncpy(char *dst, const char *src, size_t size); 
-+char *safe_strncpy(char *dst, const char *src, size_t size);
- 
-+
-+#define netmin(a,b) ((a)<(b) ? (a) : (b))
-+#define netmax(a,b) ((a)>(b) ? (a) : (b))
-diff --git a/lib/x25.c b/lib/x25.c
-index 1ffb569..45de5af 100644
---- a/lib/x25.c
-+++ b/lib/x25.c
-@@ -38,6 +38,7 @@
- #include "net-locale.h"
- #endif
- #include "intl.h"
-+#include "util.h"
- 
- static char X25_errmsg[128];
- 
-@@ -50,8 +51,8 @@ extern struct aftype x25_aftype;
- #endif
- 
- 
--static char *
--X25_print(unsigned char *ptr)
-+static const char *
-+X25_print(const char *ptr)
- {
-   static char buff[X25_ADDR_LEN+1];
- 
-@@ -63,7 +64,7 @@ X25_print(unsigned char *ptr)
- 
- 
- /* Display an X.25 socket address. */
--static char *
-+static const char *
- X25_sprint(struct sockaddr *sap, int numeric)
- {
-   if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
-@@ -78,7 +79,7 @@ X25_sprint(struct sockaddr *sap, int numeric)
- static int
- X25_input(int type, char *bufp, struct sockaddr *sap)
- {
--  unsigned char *ptr;
-+  char *ptr;
-   char *p;
-   unsigned int sigdigits;
- 
-@@ -88,9 +89,11 @@ X25_input(int type, char *bufp, struct sockaddr *sap)
- 
-   /* Address the correct length ? */
-   if (strlen(bufp)>18) {
--        strcpy(X25_errmsg, _("Address can't exceed eighteen digits with sigdigits"));
-+        safe_strncpy(X25_errmsg,
-+                     _("Address can't exceed eighteen digits with sigdigits"),
-+                     sizeof(X25_errmsg));
- #ifdef DEBUG
--        fprintf(stderr, "x25_input(%s): %s !\n", X25_errmsg, orig);
-+        fprintf(stderr, "x25_input(%s): %s !\n", bufp, X25_errmsg);
- #endif
-         errno = EINVAL;
-         return(-1);
-@@ -105,10 +108,11 @@ X25_input(int type, char *bufp, struct sockaddr *sap)
-   }
- 
-   if (strlen(bufp) < 1 || strlen(bufp) > 15 || sigdigits > strlen(bufp)) {
--	*p = '/';
--        strcpy(X25_errmsg, _("Invalid address"));
-+        if (p != NULL)
-+                *p = '/';
-+        safe_strncpy(X25_errmsg, _("Invalid address"), sizeof(X25_errmsg));
- #ifdef DEBUG
--        fprintf(stderr, "x25_input(%s): %s !\n", X25_errmsg, orig);
-+        fprintf(stderr, "x25_input(%s): %s !\n", bufp, X25_errmsg);
- #endif
-         errno = EINVAL;
-         return(-1);
-@@ -118,10 +122,7 @@ X25_input(int type, char *bufp, struct sockaddr *sap)
- 
-   /* All done. */
- #ifdef DEBUG
--  fprintf(stderr, "x25_input(%s): ", orig);
--  for (i = 0; i < sizeof(x25_address); i++)
--	fprintf(stderr, "%02X ", sap->sa_data[i] & 0377);
--  fprintf(stderr, "\n");
-+  fprintf(stderr, "x25_input(%s)\n", bufp);
- #endif
- 
-   return sigdigits;
-@@ -152,7 +153,7 @@ struct hwtype x25_hwtype = {
- };
- 
- struct aftype x25_aftype =
--{   
-+{
-     "x25", NULL, /*"CCITT X.25", */ AF_X25, X25_ADDR_LEN,
-     X25_print, X25_sprint, X25_input, X25_herror,
-     X25_rprint, X25_rinput, NULL /* getmask */,
-diff --git a/lib/x25_gr.c b/lib/x25_gr.c
-index 187fc05..79682e0 100644
---- a/lib/x25_gr.c
-+++ b/lib/x25_gr.c
-@@ -37,6 +37,7 @@
- #include <string.h>
- #include "net-support.h"
- #include "pathnames.h"
-+#include "proc.h"
- #define  EXTERN
- #if 0
- #include "net-locale.h"
-@@ -48,9 +49,18 @@
- #define X25_ADDR_LEN 16
- #endif
- 
-+static FILE *proc_fopen_x25_route(void)
-+{
-+	FILE *ret = proc_fopen(_PATH_PROCNET_X25_ROUTE);
-+	if (ret)
-+		return ret;
-+	/* try old linux-2.4 name */
-+	return proc_fopen("/proc/net/x25_routes");
-+}
-+
- int X25_rprint(int options)
- {
--	FILE *f=fopen(_PATH_PROCNET_X25_ROUTE, "r");
-+	FILE *f=proc_fopen_x25_route();
- 	char buffer[256];
- 	char *p;
- 	int  digits;
-@@ -62,7 +72,8 @@ int X25_rprint(int options)
- 	}
- 	printf( _("Kernel X.25 routing table\n")); /* xxx */
- 	printf( _("Destination          Iface\n")); /* xxx */
--	fgets(buffer,256,f);
-+	if (fgets(buffer,256,f))
-+		/* eat line */;
- 	while(fgets(buffer,256,f))
- 	{
- 		p = strchr(buffer,'\n');
-diff --git a/lib/x25_sr.c b/lib/x25_sr.c
-index 8637c98..fde79dc 100644
---- a/lib/x25_sr.c
-+++ b/lib/x25_sr.c
-@@ -38,6 +38,7 @@
- #include "net-locale.h"
- #endif
- #include "intl.h"
-+#include "util.h"
- 
- #include "net-features.h"
- 
-@@ -64,10 +65,10 @@ static int X25_setroute(int action, int options, char **args)
-   if (*args == NULL)
- 	return(usage());
- 
--  strcpy(target, *args++);
-+  safe_strncpy(target, *args++, sizeof(target));
- 
-   /* Clean out the x25_route_struct structure. */
--  memset((char *) &rt, 0, sizeof(struct x25_route_struct));
-+  memset((char *) &rt, 0, sizeof(rt));
- 
- 
-   if ((sigdigits = x25_aftype.input(0, target, (struct sockaddr *)&sx25)) < 0) {
-@@ -76,8 +77,8 @@ static int X25_setroute(int action, int options, char **args)
-   }
-   rt.sigdigits=sigdigits;
- 
--  /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
--  memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
-+  /* this works with 2.4 and 2.6 headers struct x25_address vs. typedef */
-+  memcpy(&rt.address, &sx25.sx25_addr, sizeof(sx25.sx25_addr));
- 
-   while (*args) {
- 	if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {
-@@ -89,7 +90,7 @@ static int X25_setroute(int action, int options, char **args)
- 			return(usage());
- 	if (rt.device[0])
- 		return(usage());
--	strcpy(rt.device, *args);
-+	safe_strncpy(rt.device, *args, sizeof(rt.device));
- 	args++;
-   }
-   if (rt.device[0]=='\0')
-@@ -111,7 +112,7 @@ static int X25_setroute(int action, int options, char **args)
- 	perror("socket");
- 	return(E_SOCK);
-   }
--  
-+
-   /* Tell the kernel to accept this route. */
-   if (action==RTACTION_DEL) {
- 	if (ioctl(skfd, SIOCDELRT, &rt) < 0) {
-@@ -137,14 +138,14 @@ int X25_rinput(int action, int options, char **args)
-   if (action == RTACTION_FLUSH) {
-   	fprintf(stderr,"Flushing `x25' routing table not supported\n");
-   	return(usage());
--  }	
-+  }
-   if (options & FLAG_CACHE) {
-   	fprintf(stderr,"Modifying `x25' routing cache not supported\n");
-   	return(usage());
--  }	
-+  }
-   if ((*args == NULL) || (action == RTACTION_HELP))
- 	return(usage());
--  
-+
-   return(X25_setroute(action, options, args));
- }
- #endif	/* HAVE_AFX25 */
-diff --git a/man/Makefile b/man/Makefile
-index 4ef1af8..23f5468 100644
---- a/man/Makefile
-+++ b/man/Makefile
-@@ -29,9 +29,14 @@ mandir=/usr/share/man
- 
- -include ../config.make
- ifeq ($(I18N),1)
--LANGS=`ls -d * | grep -v Makefile`
-+ALL_LANGS = $(filter-out Makefile,$(wildcard *))
-+ifeq ($(LINGUAS),)
-+LANGS = $(ALL_LANGS)
- else
--LANGS=en_US
-+LANGS = $(sort $(filter $(LINGUAS),$(ALL_LANGS)) en_US)
-+endif
-+else
-+LANGS = en_US
- endif
- 
- all:
-@@ -43,7 +48,7 @@ clean:
- clobber:	clean
- 
- install:
--		LANGS=$(LANGS) ; \
-+		LANGS='$(LANGS)' ; \
- 		for LANG in $$LANGS; do \
- 			cd $$LANG; \
- 			for SECTION in 1 5 8; do \
-diff --git a/man/de_DE/arp.8 b/man/de_DE/arp.8
-index debd879..79abfc7 100644
---- a/man/de_DE/arp.8
-+++ b/man/de_DE/arp.8
-@@ -1,149 +1,145 @@
--.TH ARP 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
-+.TH ARP 8 "17. Oktober 2012" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
- .SH NAME
- arp \- Manipulation des ARP-Caches
- .SH SYNOPSIS
--.B arp 
--.RB [ \-vn ] 
--.RB [ "\-H Typ" ] 
--.RB [ "-i Schnittstelle" ] 
--.B -a 
-+.B arp
-+.RB [ \-vn ]
-+.RB [ "\-H Typ" ]
-+.RB [ "-i Schnittstelle" ]
-+.B -a
- .RB [ Rechnername ]
- .PP
--.B arp 
-+.B arp
- .RB [ \-v ]
--.RB [ "\-i if" ] 
-+.RB [ "\-i Schnittstelle" ]
- .B "\-d Rechnername"
- .RB [ pub ]
- .PP
--.B arp 
--.RB [ \-v ] 
--.RB [ "\-H Typ" ] 
--.RB [ "\-i Schnittstelle" ] 
-+.B arp
-+.RB [ \-v ]
-+.RB [ "\-H Typ" ]
-+.RB [ "\-i Schnittstelle" ]
- .B -s Rechnername hw_adr
--.RB [ temp ] 
-+.RB [ temp ]
- .PP
--.B arp 
--.RB [ \-v ] 
--.RB [ "\-H Typ" ] 
--.RB [ "\-i Interface" ] 
-+.B arp
-+.RB [ \-v ]
-+.RB [ "\-H Typ" ]
-+.RB [ "\-i Interface" ]
- .B -s Rechnername hw_adr
--.RB [ "netmask nm" ] 
-+.RB [ "netmask Maske" ]
- .B pub
- .PP
--.B arp 
--.RB [ \-v ] 
--.RB [ "\-H Typ" ] 
--.RB [ "\-i Schnittstelle" ] 
--.B -Ds Rechnername ifa
--.RB [ "netmask nm" ] 
-+.B arp
-+.RB [ \-v ]
-+.RB [ "\-H Typ" ]
-+.RB [ "\-i Schnittstelle" ]
-+.B -Ds Rechnername Schnittstelle2
-+.RB [ "netmask Maske" ]
- .B pub
- .PP
--.B arp 
-+.B arp
- .RB [ \-vnD ]
--.RB [ "\-H Typ" ] 
-+.RB [ "\-H Typ" ]
- .RB [ "-i Schnittstelle" ]
- .B -f [Dateiname]
- 
- .SH BESCHREIBUNG
- .B Arp
- kann den ARP-Cache des Kernels auf verschiedene Arten manipulieren.  Die
--haupts\(:achliche Verwendung ist es Adresszuordnungseintr\(:age zu
-+haupts\(:achliche Verwendung ist es, Adresszuordnungseintr\(:age zu
- l\(:oschen und von Hand neue zu erzeugen.  Zum Zweck der Fehlersuche ist
--moeglich mit dem
--.B arp
--Programm den Inhalt des ARP-Caches vollst\(:andig auszugeben.
-+es m\(:oglich, mit dem
-+.BR arp -Programm
-+den Inhalt des ARP-Caches vollst\(:andig auszugeben.
-+
-+.B ARP
-+steht f\(:ur Address Resolution Protocol, welches dazu verwendet wird, \(:uber
-+die IPv4-Adresse die MAC-Adresse von Nachbarn im Netzwerk zu finden.
- .SH OPTIONEN
- .TP
- .B "\-v, \-\-verbose"
- Ausf\(:uhrlichere Ausgaben.
- .TP
- .B "\-n, \-\-numeric"
--macht numerische Adressausgaben anstatt zu versuche, den symbolischen Rechner-,
-+Numerische Adressausgaben anstatt zu versuchen, den symbolischen Rechner-,
- Port- oder Benutzernamen zu ermitteln.
- .TP
--.B "\-H type, \-\-hw-type type"
-+.B "\-H Typ, \-\-hw-type Typ"
- Beim Setzen oder Auslesen des ARP-Caches schr\(:ankt diese Option
--ein, auf welcher Klasse von Eintr\(:agen 
-+ein, auf welcher Klasse von Eintr\(:agen
- .B arp
- operieren soll.  Der Standardwert dieses Arguments ist
- .B ether
- (d.h. Hardwarecode 0x01 f\(:ur IEEE 802.3 10Mbps Ethernet).
- Andere m\(:ogliche Werte sind Netzwerkstechnologien so wie z.B.
--.RB "ARCnet (" arcnet ")"
--,
--.RB "PROnet (" pronet ")"
--,
--.RB "AX.25 (" ax25 ")"
--and
--.RB "NET/ROM (" netrom ")."
-+.RB "ARCnet (" arcnet "), PROnet (" pronet "), AX.25 (" ax25 ") und NET/ROM (" netrom ")."
- .TP
- .B "\-a [Rechnername], \-\-display [Rechnername]"
- Zeigt die Eintr\(:age der angegebenen Rechner an.  Wird kein
--.B hostname
--Argument verwendet, so werden alle Eintr\(:age aufgelistet.
-+.BR hostname -Argument
-+verwendet, so werden alle Eintr\(:age aufgelistet.
- .TP
- .B "\-d Rechnername, \-\-delete Rechnername"
--Alle Eintr\(:age f\(:ur den angegebenen Host entfernen.  Dies kann z.B.
--benutzt werden, wenn ein System angehalten wird.
-+Alle Eintr\(:age f\(:ur den angegebenen Host entfernen.  Dies kann z.B. benutzt
-+werden, wenn ein System angehalten wird.
- .TP
- .B "\-D, \-\-use-device"
- Die Hardwareadresse der Netzwerksschnittstelle
--.B ifa
-+.B Schnittstelle2
- verwenden.
- .TP
--.B "\-i If, \-\-device Schnittstelle"
-+.B "\-i Schnittstelle, \-\-device Schnittstelle"
- Eine Netzwerksschnittstelle ausw\(:ahlen.  Es werden nur Eintr\(:age
--f\(:ur die angegebene Schnittstelle ausgedruckt.  Beim Setzen von von
-+f\(:ur die angegebene Schnittstelle ausgegeben.  Beim Setzen von
- permanenten oder tempor\(:aren Eintr\(:agen wird diese Schnittstelle mit
- dem Eintrag assoziiert.  Wird diese Option nicht verwendet, so versucht der
--Kernel auf Basis der Routentabelle eine Schnittstelle auszuw\(:ahlen.  F\(:ur
--.B pub
--Eintr\(:age ist die angegebene Schnittstelle diejenige, auf der ARP-Anfragen
-+Kernel, auf Basis der Routentabelle eine Schnittstelle auszuw\(:ahlen.  F\(:ur
-+.BR pub -Eintr\(:age
-+ist die angegebene Schnittstelle diejenige, auf der ARP-Anfragen
- beantwortet werden.
- .br
- .B ANMERKUNG:
--Diese Schnittstelle mu\(ss eine andere sein als die, auf die die IP-Datagramme
-+Diese Schnittstelle mu\(ss eine andere sein als die, auf welche die IP-Datagramme
- weitergeleitet werden.
- .TP
--.B "\-s Rechnername hw_addr, \-\-set Rechnername"
--Erzeugt manuel einen ARP Adresseintrag f\(:ur den Rechner
--.B Rechnername
-+.B "\-s Rechnername hw_addr, \-\-set Rechnername hw_addr"
-+Erzeugt manuell einen ARP-Adresseintrag f\(:ur den Rechner
-+.BR Rechnername ,
- in dem die Hardwareadresse auf
- .B hw_addr
- gesetzt ist.  Das genaue Format der Hardwareadresse ist abh\(:angig von der
--Hardwareklasse aber f\(:ur die meisten Klassen kann man davon ausgehen, da\(ss
-+Hardwareklasse, aber f\(:ur die meisten Klassen kann man davon ausgehen, da\(ss
- die \(:ubliche Darstellung verwendet wird.  F\(:ur die Ethernetklasse sind
--dies sechs hexadezimale, von Doppelpunkten getrennte Bytes.  Beim Zuf\(:ugen
--von Proxy-ARP-Entr\(:agen (das sind die mit der gesetzten
--.BR pub lizieren
--Flagge) kann
--.B Netmaske
-+dies sechs hexadezimale, durch Doppelpunkte getrennte Bytes.  Beim Zuf\(:ugen
-+von Proxy-ARP-Entr\(:agen (das sind die mit dem gesetzten
-+.BR pub lished-Flag)
-+kann die
-+.B Maske
- f\(:ur ARP-Eintr\(:age f\(:ur ganze Subnetze angegeben werde.  Von dieser
- Praxis wird abgeraten.  Sie wird von \(:alteren Kerneln unterst\(:utzt, da
--sie gelegentlich n\(:utzlich ist.  Wird die
--If the
--.B temp
--Flagge nicht angegeben, so werden die erzeugten Eintr\(:age nicht dauerhaft
--in den ARP-Cache eingetragen.
-+sie gelegentlich n\(:utzlich ist.
-+Der Eintrag wird permanent im ARP-Cache gespeichert,
-+wenn das \fBtemp\fR-Flag nicht angegeben wird.
- .br
- .B ANMERKUNG:
--Ab der Kernelversion 2.2.0 ist es nicht mehr m\(:oglich ARP-Eintr\(:age f\(:ur
--ganze Teilnetze zu erzeugen. Statt dessen wird automatisches Proxy ARP
-+Ab der Kernelversion 2.2.0 ist es nicht mehr m\(:oglich, ARP-Eintr\(:age f\(:ur
-+ganze Teilnetze zu erzeugen. Stattdessen wird automatisches Proxy ARP
- durchgef\(:uhrt, d.h. wenn eine Route existiert und Forwarding eingeschaltet
--ist wird automatisch ein tempor\(:arer Proxyarpeintrag erzeugt. 
-+ist, wird automatisch ein tempor\(:arer Proxyarpeintrag erzeugt.
- Siehe auch
- .BR arp (7)
- f\(:ur mehr Details.
- .TP
--.B "\-f Dateiname, \-\-file Dateiname"
-+.B "\-f [Dateiname], \-\-file [Dateiname]"
- \(:Ahnlich der
- .B \-s
- Option, au\(sser, da\(ss diesmal die Adressinformation aus der Datei
- .B Dateiname
- verwendet wird.  Dies kann verwendet werden, wenn ARP-Eintr\(:age f\(:ur
- etliche Rechner erzeugt werden m\(:ussen.  Der Name dieser Datei ist oft
--.IR /etc/ethers , 
--aber dies ist nicht offizieil standardisiert. Wenn kein Dateinamen 
-+.IR /etc/ethers ,
-+aber dies ist nicht offizieil standardisiert. Wenn kein Dateinamen
- angeben ist wird /etc/ethers benutzt.
- .sp 1
- Das Format der Datei ist einfach; es enth\(:alt nur ASCII-Textzeilen, die
-@@ -158,16 +154,28 @@ erwartet wird, kann auch eine
- .B "IP-Adresse"
- in Form eines durch Punkte getrennten Dezimalquadrupels angegeben werden.
- .P
--Aus Kompatiblit\(:atsgr\(:unden k\(:onnen Rechnername und die 
-+Aus Kompatiblit\(:atsgr\(:unden k\(:onnen Rechnername und die
- Hardwareadresse auch vertauscht werden.
--.LP 
--Jeder vollst\(:andige Eintrag wird im ARP-Cache mit der
--.B C
--Flagge markiert. Permanente Eintr\(:age werden mit
-+.LP
-+Jeder vollst\(:andige Eintrag wird im ARP-Cache mit dem
-+.BR C -Flag
-+markiert. Permanente Eintr\(:age werden mit
- .B M
--und zu publizierende Eintr\(:age mit der 
-+und zu publizierende Eintr\(:age mit
- .B P
--Flagge.
-+markiert.
-+.SH BEISPIELE
-+.B /usr/sbin/arp -i eth0 -Ds 10.0.0.2 eth1 pub
-+
-+Beantwortet ARP-Anfragen f\(:ur 10.0.0.2 die auf der Schnittstelle eth0 
-+empfangen werden mit der MAC-Adresse f\(:ur eth1.
-+
-+.B /usr/sbin/arp -i eth1 -d 10.0.0.1
-+
-+Entfernt den ARP-Eintrag f\(:ur 10.0.0.1 auf der Schnittstelle 
-+.BR eth1 . 
-+Dies betrifft sowohl publizierte Proxy-ARP-Einträge als auch auf permanente ARP-Eintr\(:age.
-+
- .SH DATEIEN
- .I /proc/net/arp,
- .br
-@@ -176,10 +184,12 @@ Flagge.
- .I /etc/hosts
- .br
- .I /etc/ethers
-+
- .SH SIEHE AUCH
- ethers(5), rarp(8), route(8), ifconfig(8), netstat(8)
-+
- .SH AUTOREN
--Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> mit vielen Verbesserungen vom
--Verwalter der Net-Tools Bernd Eckenfels <net-tools@lina.inka.de>.
-+Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>, Bernd Eckenfels <net-tools@lina.inka.de>.
-+
- .SH \(:Ubersetzung
--Ralf B\(:achle <ralf@gnu.org>
-+Ralf B\(:achle <ralf@gnu.org>, Simon A. Eugster <simon.eu@gmail.com>
-diff --git a/man/de_DE/ifconfig.8 b/man/de_DE/ifconfig.8
-index aa2a4a0..9713965 100644
---- a/man/de_DE/ifconfig.8
-+++ b/man/de_DE/ifconfig.8
-@@ -73,9 +73,6 @@ Modus.  Ist er eingeschaltet, so werden alle Multicastpakete vom Netzwerk
- empfangen unabh\(:angig davon, ob sie an die Schnittstelle adressiert sind
- oder nicht.
- .TP
--.B "metric N"
--Dieses Argument setzt den Metrik-Wert f\(:ur die Schnittstelle auf N.
--.TP
- .B "mtu N"
- Dieses Argument setzt die Maximum Transfer Unit (MTU) der Schnittstelle,
- das ist das gr\(:o\(sste Paket, dass gesendet werden kann.
-@@ -98,7 +95,7 @@ F\(:ugt der Schnittstelle eine IPv6-Adresse zu.
- .B "del addr/prefixlen"
- Entfernt eine IPv6-Adresse von der Schnittstelle.
- .TP
--.B "tunnel aa.bb.cc.dd"
-+.B "tunnel ::aa.bb.cc.dd"
- Erzeugt ein neues SIT (IPv6-in-IPv4) Ger\(:at, das Pakete zum angegebenen
- Ziel tunnelt.
- .TP
-@@ -180,12 +177,10 @@ Seit Kernel Version 2.2 gibt es keine expliziten Statistiken f\(:ur
- Schnittstellenaliase mehr.  Die Statistiken f\(:ur die Originaladresse werden
- mit allen Aliasen auf das gleiche Ger\(:at geteilt.  Um Statistiken per
- Adresse zu erhalten sollte explizite EIntr\(:age f\(:ur die Adresse mit dem
--.BR ipchains(8)
-+.BR iptables(8)
- Kommando gemacht werden.
- 
- .SH DATEIEN
--.I /proc/net/socket 
--.br
- .I /proc/net/dev
- .br
- .I /proc/net/if_inet6
-@@ -193,7 +188,7 @@ Kommando gemacht werden.
- W\(:ahrend AppleTalk DDP und IPX Adressen angezeigt werden, k\(:onnen sie mit
- diesem Kommando nicht ge\(:andert werden.
- .SH SIEHE AUCH
--route(8), netstat(8), arp(8), rarp(8), ipchains(8)
-+route(8), netstat(8), arp(8), rarp(8), iptables(8)
- .SH AUTOREN
- Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
- .br
-diff --git a/man/de_DE/netstat.8 b/man/de_DE/netstat.8
-index f59aec0..fdb76c9 100644
---- a/man/de_DE/netstat.8
-+++ b/man/de_DE/netstat.8
-@@ -9,7 +9,7 @@
- .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
- .\"
- .\"
--.TH NETSTAT 8 "6. M\(:arz 1999" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
-+.TH NETSTAT 8 "2007-12-02" "net-tools" "Handbuch f\(:ur Linuxprogrammierer"
- 
- .SH NAME
- netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstatistiken, maskierten Verbindungen, Netlink-Nachrichten und Mitgliedschaft in Multicastgruppen
-@@ -20,6 +20,8 @@ netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstat
- .RB [ \-venaoc ]
- .RB [ \-\-tcp | \-t ]
- .RB [ \-\-udp | \-u ]
-+.RB [ \-\-udplite | \-U ]
-+.RB [ \-\-sctp | \-S ]
- .RB [ \-\-raw | \-w ]
- .RB [ \-\-groups | \-g ]
- .RB [ \-\-unix | \-x ] 
-@@ -44,7 +46,6 @@ netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstat
- .B netstat
- .RB [ \-veenpac ]
- .RB { \-\-interfaces | \-i }
--.RI [ Schnittstelle ]
- 
- .PP
- 
-@@ -68,6 +69,8 @@ netstat \- Anzeige von Netzwerksverbindungen, Routentabellen, Schnittstellenstat
- .SH BESCHREIBUNG
- .B Netstat
- zeigt Informationen des Linux Netzwerkssystems an.
-+.PP
-+.B Bitte beachten Sie, dass der Inhalt der deutschen man-page nicht vollst\(:andig ist, im Moment.
- 
- .SS "(no option)"
- Ohne Optionen zeigt
-@@ -103,18 +106,17 @@ benutzt das Ausgabeformat von
- Wegen Details siehe
- .BR route (8).
- 
--.SS "\-i, \-\-interface \fISchnittstelle\fI"
-+.SS "\-i, \-\-interfaces"
- Wird die
- .BR -i ", " --interfaces
--Option verwendet,  so wird eine Tabelle aller (oder der angegebenen
--.IR Schnittstellen ) 
-+Option verwendet,  so wird eine Tabelle aller Schnittstellen
- ausgedruckt.  Die Ausgabe ist im Format von
- .B "ifconfig -e"
- und wird in
- .BR ifconfig (8)
- beschrieben.
- .B "netstat -ei" 
--druckt eine Tabelle oder einen Eintrag f\(:ur einen einzelnes Interface wie
-+druckt eine Tabelle f\(:ur Interfaces wie
- .BR ifconfig .
- Die
- .B -a
-@@ -182,7 +184,7 @@ Dies hat den gleichen Effekt wie die Langoptionen
- und
- .BR \-\-ddp.
- 
--.SS "\-c, \-\-continous"
-+.SS "\-c, \-\-continuous"
- Mit dieser Option wiederholt
- .B netstat
- im Sekundenabstand die Ausgabe, bis es abgebrochen wird.
-@@ -414,7 +416,7 @@ werden.)
- Seit der Kern Version 2.2 zeigt netstat -i keine Schnittstellenstatistiken
- von Schnittstellenaliasen mehr an.  Um Statistiken per Schnittstelle zur
- erhalten, m\(:ussen jetzt mit dem
--.BR ipchains(8) 
-+.BR iptables(8)
- Befehl explizite Regeln zugef\(:ugt werden.
- 
- .SH DATEIEN
-@@ -477,10 +479,7 @@ Befehl explizite Regeln zugef\(:ugt werden.
- .SH SIEHE AUCH
- .BR route (8), 
- .BR ifconfig (8), 
--.BR ipfw (4), 
--.BR ipfw (8), 
--.BR ipfwadm (8)
--.BR ipchains (8)
-+.BR iptables (8)
- 
- .PP
- .SH PROBLEME
-diff --git a/man/de_DE/route.8 b/man/de_DE/route.8
-index a28c9d1..1a32712 100644
---- a/man/de_DE/route.8
-+++ b/man/de_DE/route.8
-@@ -55,7 +55,7 @@ Schnittstelle]
- .SH BESCHREIBUNG
- .B Route
- wird zum \(:Andern der IP-Routing-Tabelle der Kernels verwendet.  Seine
--prim\(:are Verwendung ist statische Routen f\*:ur bestimmte Rechner oder
-+prim\(:are Verwendung ist statische Routen f\(:ur bestimmte Rechner oder
- Netzwerke \(:uber eine Schnittstelle einzutragen, nachdem diese mit dem
- Programm
- .BR ifconfig (8)
-diff --git a/man/en_US/arp.8 b/man/en_US/arp.8
-index d859b46..c065e22 100644
---- a/man/en_US/arp.8
-+++ b/man/en_US/arp.8
-@@ -1,56 +1,111 @@
--.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual"
-+.TH ARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
- .SH NAME
- arp \- manipulate the system ARP cache
- .SH SYNOPSIS
--.B arp 
--.RB [ \-vn ] 
--.RB [ "\-H type" ] 
--.RB [ "-i if" ] 
--.B -a 
--.RB [ hostname ]
-+.B arp
-+.RB [ \-vn ]
-+.RB [ \-H
-+.IR type ]
-+.RB [ \-i
-+.IR if ]
-+.RB [ \-ae ]
-+.RI [ hostname ]
- .PP
--.B arp 
-+.B arp
- .RB [ \-v ]
--.RB [ "\-i if" ] 
--.B "\-d hostname"
-+.RB [ \-i
-+.IR if ]
-+.B \-d
-+.I hostname
- .RB [ pub ]
- .PP
--.B arp 
--.RB [ \-v ] 
--.RB [ "\-H type" ] 
--.RB [ "\-i if" ] 
--.B -s hostname hw_addr
--.RB [ temp ] 
-+.B arp
-+.RB [ \-v ]
-+.RB [ \-H
-+.IR type ]
-+.RB [ \-i
-+.IR if ]
-+.B \-s
-+.I hostname hw_addr
-+.RB [ temp ]
- .PP
--.B arp 
--.RB [ \-v ] 
--.RB [ "\-H type" ] 
--.RB [ "\-i if" ] 
--.B -s hostname hw_addr
--.RB [ "netmask nm" ] 
-+.B arp
-+.RB [ \-v ]
-+.RB [ \-H
-+.IR type ]
-+.RB [ \-i
-+.IR if ]
-+.B \-s
-+.I hostname hw_addr
-+.RB [ netmask
-+.IR nm ]
- .B pub
- .PP
--.B arp 
--.RB [ \-v ] 
--.RB [ "\-H type" ] 
--.RB [ "\-i if" ] 
--.B -Ds hostname ifa
--.RB [ "netmask nm" ] 
-+.B arp
-+.RB [ \-v ]
-+.RB [ \-H
-+.IR type ]
-+.RB [ \-i
-+.IR if ]
-+.B \-Ds
-+.I hostname
-+.I ifname
-+.RB [ netmask
-+.IR nm ]
- .B pub
- .PP
--.B arp 
-+.B arp
- .RB [ \-vnD ]
--.RB [ "\-H type" ] 
--.RB [ "-i if" ]
--.B -f [filename]
-+.RB [ \-H
-+.IR type ]
-+.RB [ \-i
-+.IR if ]
-+.B \-f
-+.RI [ filename ]
- 
- .SH DESCRIPTION
- .B Arp
--manipulates the kernel's ARP cache in various ways.  The primary options
--are clearing an address mapping entry and manually setting up one.  For
--debugging purposes, the
-+manipulates or displays the kernel's IPv4 network neighbour cache. It can add
-+entries to the table, delete one or display the current content.
-+
-+.B ARP
-+stands for Address Resolution Protocol, which is used to find the media
-+access control address of a network neighbour for a given IPv4 Address.
-+.SH MODES
- .B arp
--program also allows a complete dump of the ARP cache.
-+with no mode specifier will print the current content of the table. It is
-+possible to limit the number of entries printed, by specifying an hardware
-+address type, interface name or host address.
-+
-+.B arp -d
-+.I address
-+will delete a ARP table entry. Root or netadmin privilege is required to do
-+this. The entry is found by IP address. If a hostname is given, it will be
-+resolved before looking up the entry in the ARP table.
-+
-+.B arp -s
-+.I address hw_addr
-+is used to set up a new table entry. The format of the
-+.I hw_addr
-+parameter is dependent on the hardware class, but for most classes one can
-+assume that the usual presentation can be used.  For the Ethernet class,
-+this is 6 bytes in hexadecimal, separated by colons. When adding proxy arp
-+entries (that is those with the
-+.BR pub lish
-+flag set) a
-+.B netmask
-+may be specified to proxy arp for entire subnets. This is not good
-+practice, but is supported by older kernels because it can be
-+useful. If the
-+.B temp
-+flag is not supplied entries will be permanent stored into the ARP
-+cache. To simplify setting up entries for one of your own network interfaces, you can use the
-+.B "arp \-Ds"
-+.I address ifname
-+form. In that case the hardware address is taken from the interface with the
-+specified name.
-+
-+.br
- .SH OPTIONS
- .TP
- .B "\-v, \-\-verbose"
-@@ -60,7 +115,7 @@ Tell the user what is going on by being verbose.
- shows numerical addresses instead of trying to determine symbolic host, port
- or user names.
- .TP
--.B "\-H type, \-\-hw-type type"
-+\fB\-H\fI type\fR, \fB\-\-hw\-type\fI type\fR, \fB\-t\fI type\fR
- When setting or reading the ARP cache, this optional parameter tells
- .B arp
- which class of entries it should check for.  The default value of
-@@ -76,23 +131,18 @@ Other values might include network technologies such as
- and
- .RB "NET/ROM (" netrom ")."
- .TP
--.B "\-a [hostname], \-\-display [hostname]"
--Shows the entries of the specified hosts.  If the
--.B hostname
--parameter is not used,
--.B all
--entries will be displayed.
-+.B \-a
-+Use alternate BSD style output format (with no fixed columns).
- .TP
--.B "\-d hostname, \-\-delete hostname"
--Remove any entry for the specified host.  This can be used if the
--indicated host is brought down, for example.
-+.B \-e
-+Use default Linux style output format (with fixed columns).
- .TP
- .B "\-D, \-\-use-device"
--Use the interface
--.BR ifa "'s"
--hardware address.
-+Instead of a hw_addr, the given argument is the name of an interface.
-+.B arp
-+will use the MAC address of that interface for the table entry. This is usually the best option to set up a proxy ARP entry to yourself.
- .TP
--.B "\-i If, \-\-device If"
-+\fB\-i\fI If\fR, \fB\-\-device\fI If\fR
- Select an interface. When dumping the ARP cache only entries matching
- the specified interface will be printed. When setting a permanent or
- .B temp
-@@ -101,53 +151,36 @@ option is not used, the kernel will guess based on the routing
- table. For
- .B pub
- entries the specified interface is the interface on which ARP requests will
--be answered. 
-+be answered.
- .br
- .B NOTE:
- This has to be different from the interface to which the IP
- datagrams will be routed.
--.TP
--.B "\-s hostname hw_addr, \-\-set hostname"
--Manually create an ARP address mapping entry for host
--.B hostname
--with hardware address set to
--.B hw_addr
--.  The format of the hardware address is dependent on the hardware
--class, but for most classes one can assume that the usual presentation
--can be used.  For the Ethernet class, this is 6 bytes in hexadecimal,
--separated by colons. When adding proxy arp entries (that is those with
--the 
--.BR pub lish 
--flag set a 
--.B netmask 
--may be specified to proxy arp for entire subnets. This is not good
--practice, but is supported by older kernels because it can be
--useful. If the
--.B temp
--flag is not supplied entries will be permanent stored into the ARP
--cache.
--.br
- .B NOTE:
--As of kernel 2.2.0 it is no longer possible to set an ARP entry for an 
-+As of kernel 2.2.0 it is no longer possible to set an ARP entry for an
- entire subnet. Linux instead does automagic proxy arp when a route
--exists and it is forwarding. See 
-+exists and it is forwarding. See
- .BR arp (7)
--for details.
-+for details. Also the
-+.B dontpub
-+option which is available for delete and set operations cannot be
-+used with 2.4 and newer kernels.
- .TP
--.B "\-f filename, \-\-file filename"
-+\fB\-f\fI filename\fR, \fB\-\-file\fI filename\fR
- Similar to the
- .B \-s
- option, only this time the address info is taken from file
--.B filename
--.  This can be used if ARP entries for a lot of hosts have to be
-+.IR filename .
-+This can be used if ARP entries for a lot of hosts have to be
- set up.  The name of the data file is very often
--.IR /etc/ethers , 
--but this is not official. If no filename is specified /etc/ethers
-+.IR /etc/ethers ,
-+but this is not official. If no filename is specified
-+.I /etc/ethers
- is used as default.
- .sp 1
- The format of the file is simple; it
- only contains ASCII text lines with a hostname, and a hardware
--address separated by whitespace. Additionally the 
-+address separated by whitespace. Additionally the
- .BR "pub" , " temp" " and" " netmask"
- flags can be used.
- .LP
-@@ -157,9 +190,9 @@ is expected, one can also enter an
- .B "IP address"
- in dotted-decimal notation.
- .P
--As a special case for compatibility the order of the hostname and 
-+As a special case for compatibility the order of the hostname and
- the hardware address can be exchanged.
--.LP 
-+.LP
- Each complete entry in the ARP cache will be marked with the
- .B C
- flag. Permanent entries are marked with
-@@ -167,8 +200,18 @@ flag. Permanent entries are marked with
- and published entries have the
- .B P
- flag.
-+.SH EXAMPLES
-+.B /usr/sbin/arp -i eth0 -Ds 10.0.0.2 eth1 pub
-+
-+This will answer ARP requests for 10.0.0.2 on eth0 with the MAC address for
-+eth1.
-+
-+.B /usr/sbin/arp -i eth1 -d 10.0.0.1
-+
-+Delete the ARP table entry for 10.0.0.1 on interface eth1. This will match
-+published proxy ARP entries and permanent entries.
- .SH FILES
--.I /proc/net/arp,
-+.I /proc/net/arp
- .br
- .I /etc/networks
- .br
-@@ -178,5 +221,4 @@ flag.
- .SH SEE ALSO
- rarp(8), route(8), ifconfig(8), netstat(8)
- .SH AUTHORS
--Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> with a lot of improvements
--from net-tools Maintainer Bernd Eckenfels <net-tools@lina.inka.de>.
-+Fred N. van Kempen <waltje@uwalt.nl.mugnet.org>, Bernd Eckenfels <net\-tools@lina.inka.de>.
-diff --git a/man/en_US/ethers.5 b/man/en_US/ethers.5
-index f3ba116..5a02892 100644
---- a/man/en_US/ethers.5
-+++ b/man/en_US/ethers.5
-@@ -1,4 +1,4 @@
--.TH ETHERS 5 "April 26th, 1996" "" "File formats"
-+.TH ETHERS 5 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
- .SH NAME \"{{{roff}}}\"{{{
- ethers \- Ethernet address to IP number database
- .\"}}}
-@@ -7,17 +7,17 @@ ethers \- Ethernet address to IP number database
- IP numbers, one line for each IP number:
- .sp
- .RS
--\fIEthernet-address\fP  \fIIP-number\fP
-+\fIEthernet\-address\fP  \fIIP\-number\fP
- .RE
- .sp
--The two items are separated by any number of SPACE and/or TAB char
--acters.   A \fB#\fP at the beginning of a line starts a comment
--which extends to the end of the line.  The \fIEthernet-address\fP is
-+The two items are separated by any number of SPACE and/or TAB characters.
-+A \fB#\fP at the beginning of a line starts a comment
-+which extends to the end of the line.  The \fIEthernet\-address\fP is
- written as
- .IR x : x : x : x : x : x ,
- where \fIx\fP is a hexadecimal number between \fB0\fP and \fBff\fP
- which represents one byte of the address, which is in network byte
--order (big-endian).  The \fIIP-number\fP may be a hostname which
-+order (big-endian).  The \fIIP\-number\fP may be a hostname which
- can be resolved by DNS or a dot separated number.
- .\"}}}
- .SH EXAMPLES \"{{{
-diff --git a/man/en_US/hostname.1 b/man/en_US/hostname.1
-index cea3f6e..c45b7b6 100644
---- a/man/en_US/hostname.1
-+++ b/man/en_US/hostname.1
-@@ -1,66 +1,60 @@
--.TH HOSTNAME 1 "28 Jan 1996" "net-tools" "Linux Programmer's Manual"
-+.TH HOSTNAME 1 "2013\-08\-29" "net\-tools" "Linux System Administrator's Manual"
- 
- .SH NAME
- hostname \- show or set the system's host name
- .br
--domainname \- show or set the system's NIS/YP domain name
--.br
- dnsdomainname \- show the system's DNS domain name
- .br
--nisdomainname \- show or set system's NIS/YP domain name
-+domainname \- show or set the system's NIS/YP domain name
- .br
--ypdomainname \- show or set the system's NIS/YP domain name
-+nisdomainname \- show or set system's NIS/YP domain name
- .br
- nodename \- show or set the system's DECnet node name
-+.br
-+ypdomainname \- show or set the system's NIS/YP domain name
- 
- .SH SYNOPSIS
- .B hostname
- .RB [ \-v ]
--.RB [ \-a ]
--.RB [ \-\-alias ]
--.RB [ \-d ]
--.RB [ \-\-domain ]
--.RB [ \-f ]
--.RB [ \-\-fqdn ]
--.RB [ \-i ]
--.RB [ \-\-ip-address ]
--.RB [ \-\-long ]
--.RB [ \-s ]
--.RB [ \-\-short ]
--.RB [ \-y ]
--.RB [ \-\-yp ]
--.RB [ \-\-nis ]
--.RB [ \-n ]
--.RB [ \-\-node ]
-+.RB [ \-s | \-\-short ]
-+
-+.PP
-+.B hostname
-+.RB [ \-v ]
-+.RB [ \-a | \-\-alias ]
-+.RB [ \-d | \-\-domain ]
-+.RB [ \-f | \-\-fqdn | \-\-long ]
-+.RB [ \-i | \-\-ip\-address ]
-+
-+.PP
-+.B hostname
-+.RB [ \-v ]
-+.RB [ \-y | \-\-yp | \-\-nis ]
-+.RB [ \-n | \-\-node ]
- 
- .PP
- .B hostname 
- .RB [ \-v ]
--.RB [ \-F\ filename ]
--.RB [ \-\-file\ filename ]
--.RB [ hostname ]
-+.RB [ \-F\ filename | \-\-file\ filename ]
-+.RI [ newname ]
- 
- .PP
- .B domainname
- .RB [ \-v ]
--.RB [ \-F\ filename ]
--.RB [ \-\-file\ filename ]
--.RB [ name ]
-+.RB [ \-F\ filename | \-\-file\ filename ]
-+.RI [ newname ]
- 
- .PP 
- .B nodename
- .RB [ \-v ]
--.RB [ \-F\ filename ]
--.RB [ \-\-file\ filename ]
--.RB [ name ]
-+.RB [ \-F\ filename | \-\-file\ filename ]
-+.RI [ newname ]
- 
- .PP
- .B hostname
--.RB [ \-v ]
--.RB [ \-h ]
--.RB [ \-\-help ]
--.RB [ \-V ]
--.RB [ \-\-version ]
-+.RB [ \-v | \-\-verbose ]
-+.RB [ \-h | \-\-help ]
-+.RB [ \-V | \-\-version ]
- 
- .PP
- .B dnsdomainname
-@@ -124,12 +118,8 @@ command (see
- below).
- 
- .LP
--The host name is usually set once at system startup in
--.I /etc/rc.d/rc.inet1
--or
--.I /etc/init.d/boot
--(normally by reading the contents of a file which contains
--the host name, e.g. 
-+The host name is usually set once at system startup by reading the 
-+contents of a file which contains the host name, e.g. 
- .IR /etc/hostname ).
- 
- .SS THE FQDN
-@@ -142,16 +132,17 @@ with this command. The FQDN of the system is the name that the
- returns for the host name. 
- 
- .LP
--Technically: The FQDN is the name
--.BR gethostbyname (2)
--returns for the host name returned by
--.BR gethostname (2).
--The DNS domain name is the part after the first dot.
-+Technically: The FQDN is the canonical name returned by
-+.BR gethostbyname2 (2)
-+when resolving the result of the 
-+.BR gethostname (2)
-+name. The DNS domain name is the part after the first dot.
- .LP
- Therefore it depends on the configuration (usually in 
- .IR /etc/host.conf )
--how you can change it. Usually (if the hosts file is parsed before DNS or 
--NIS) you can change it in 
-+how you can change it. If
-+.B hosts 
-+is the first lookup method, you can change the FQDN in 
- .IR /etc/hosts .
- 
- 
-@@ -161,27 +152,23 @@ NIS) you can change it in
- Display the alias name of the host (if used).
- .TP
- .I "\-d, \-\-domain"
--Display the name of the DNS domain. Don't use the command
--.B domainname
--to get the DNS domain name because it will show the NIS domain name and
--not the DNS domain name. Use
-+Display the name of the DNS domain (this is the FQDN without the segment up
-+to the first dot). This is equivalent to using the 
- .B dnsdomainname 
--instead.
-+command.
- .TP
- .I "\-F, \-\-file filename"
--Read the host name from the specified file. Comments (lines starting with
-+Read the new host name from the specified file. Comments (lines starting with
- a `#') are ignored.
- .TP
- .I "\-f, \-\-fqdn, \-\-long"
--Display the FQDN (Fully Qualified Domain Name). A FQDN consists of a
--short host name and the DNS domain name. Unless you are using bind or NIS
--for host lookups you can change the FQDN and the DNS domain name (which is
--part of the FQDN) in the \fI/etc/hosts\fR file.
-+Display the FQDN (Fully Qualified Domain Name). A FQDN consists of name
-+including the DNS domain.
- .TP
- .I "\-h, \-\-help"
- Print a usage message and exit.
- .TP
--.I "\-i, \-\-ip-address"
-+.I "\-i, \-\-ip\-address"
- Display the IP address(es) of the host.
- .TP
- .I "\-n, \-\-node"
-@@ -203,11 +190,13 @@ Display the NIS domain name. If a parameter is given (or
- .B \-\-file name
- ) then root can also set a new NIS domain.
- .SH FILES
-+.B /etc/hostname
- .B /etc/hosts
-+.B /etc/host.conf
-+
- .SH AUTHOR
--Peter Tobias, <tobias@et-inf.fho-emden.de>
-+Peter Tobias, <tobias@et\-inf.fho\-emden.de>
- .br
--Bernd Eckenfels, <net-tools@lina.inka.de> (NIS and manpage).
-+Bernd Eckenfels, <net\-tools@lina.inka.de> (NIS and manpage).
- .br
- Steve Whitehouse, <SteveW@ACM.org> (DECnet support and manpage).
--
-diff --git a/man/en_US/ifconfig.8 b/man/en_US/ifconfig.8
-index e75cf59..0243be3 100644
---- a/man/en_US/ifconfig.8
-+++ b/man/en_US/ifconfig.8
-@@ -1,10 +1,10 @@
--.TH IFCONFIG 8 "14 August 2000" "net-tools" "Linux Programmer's Manual"
-+.TH IFCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
- .SH NAME
- ifconfig \- configure a network interface
- .SH SYNOPSIS
--.B "ifconfig [interface]"
-+.B "ifconfig [-v] [-a] [-s] [interface]"
- .br
--.B "ifconfig interface [aftype] options | address ..."
-+.B "ifconfig [-v] interface [aftype] options | address ..."
- .SH DESCRIPTION
- .B Ifconfig
- is used to configure the kernel-resident network interfaces.  It is
-@@ -18,7 +18,7 @@ a single
- .B interface
- argument is given, it displays the status of the given interface
- only; if a single
--.B -a
-+.B \-a
- argument is given, it displays the status of all interfaces, even
- those that are down.  Otherwise, it configures an interface.
- 
-@@ -39,13 +39,34 @@ supported address families include
- (Novell IPX) and
- .B netrom
- (AMPR Packet radio).
-+All numbers supplied as parts in IPv4 dotted decimal notation may be decimal,
-+octal, or hexadecimal, as specified in the ISO C standard (that is, a leading 0x
-+or 0X implies hexadecimal; otherwise, a leading '0' implies octal; otherwise,
-+the number is interpreted as decimal). Use of hexadecimal and octal numbers
-+is not RFC-compliant and therefore its use is discouraged.
- .SH OPTIONS
- .TP
-+.B -a
-+display all interfaces which are currently available, even if down
-+.TP
-+.B -s
-+display a short list (like netstat -i)
-+.TP
-+.B -v
-+be more verbose for some error conditions
-+.TP
- .B interface
- The name of the interface.  This is usually a driver name followed by
- a unit number, for example
- .B eth0
--for the first Ethernet interface.
-+for the first Ethernet interface. If your kernel supports alias interfaces,
-+you can specify them with 
-+.B eth0:0
-+for the first alias of eth0. You can use them to assign a second address. To
-+delete an alias interface use
-+.BR "ifconfig eth0:0 down" .
-+Note: for every scope (i.e. same net with address/netmask combination) all
-+aliases are deleted, if you delete the first (primary).
- .TP
- .B up
- This flag causes the interface to be activated.  It is implicitly
-@@ -69,9 +90,6 @@ Enable or disable
- mode.  If selected, all multicast packets on the network will be
- received by the interface.
- .TP
--.B "metric N"
--This parameter sets the interface metric.
--.TP
- .B "mtu N"
- This parameter sets the Maximum Transfer Unit (MTU) of an interface.
- .TP
-@@ -92,7 +110,7 @@ Add an IPv6 address to an interface.
- .B "del addr/prefixlen"
- Remove an IPv6 address from an interface.
- .TP
--.B "tunnel aa.bb.cc.dd"
-+.B "tunnel ::aa.bb.cc.dd"
- Create a new SIT (IPv6-in-IPv4) device, tunnelling to the given destination.
- .TP
- .B "irq addr"
-@@ -122,13 +140,13 @@ are
- can be used to tell the driver to auto-sense the media.  Again, not
- all drivers can do this.
- .TP
--.B "[-]broadcast [addr]"
-+.B "[\-]broadcast [addr]"
- If the address argument is given, set the protocol broadcast
- address for this interface.  Otherwise, set (or clear) the
- .B IFF_BROADCAST
- flag for the interface.
- .TP
--.B "[-]pointopoint [addr]"
-+.B "[\-]pointopoint [addr]"
- This keyword enables the
- .B point-to-point
- mode of an interface, meaning that it is a direct link between two
-@@ -173,23 +191,40 @@ alias interfaces anymore. The statistics printed for the original address
- are shared with all alias addresses on the same device. If you want per-address
- statistics you should add explicit accounting
- rules for the address using the 
--.BR ipchains(8)
-+.BR iptables (8)
- command.
- .LP
--Interrupt problems with Ethernet device drivers fail with EAGAIN. See
--.I http://cesdis.gsfc.nasa.gov/linux/misc/irq-conflict.html
-+Since net\-tools 1.60\-4 ifconfig is printing byte counters and human readable
-+counters with IEC 60027-2 units. So 1 KiB are 2^10 byte. Note, the numbers 
-+are truncated to one decimal (which can by quite a large error if you 
-+consider 0.1 PiB is 112.589.990.684.262 bytes :)
-+.LP
-+Interrupt problems with Ethernet device drivers fail with EAGAIN
-+.I (SIOCSIIFLAGS: Resource temporarily unavailable)
-+it is most likely a interrupt conflict. See
-+.I http://www.scyld.com/expert/irq\-conflict.html
- for more information.
- .SH FILES
--.I /proc/net/socket 
--.br
- .I /proc/net/dev
- .br
- .I /proc/net/if_inet6
- .SH BUGS
-+Ifconfig uses the ioctl access method to get the full address information,
-+which limits hardware addresses to 8 bytes.
-+Because Infiniband hardware address has 20 bytes,
-+only the first 8 bytes are displayed correctly.
-+Please use
-+.B ip link
-+command from
-+.B iproute2
-+package to display link layer informations including the hardware address.
-+.LP
- While appletalk DDP and IPX addresses will be displayed they cannot be
- altered by this command.
- .SH SEE ALSO
--route(8), netstat(8), arp(8), rarp(8), ipchains(8)
-+route(8), netstat(8), arp(8), rarp(8), iptables(8), ifup(8), interfaces(5).
-+.br
-+http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples
- .SH AUTHORS
- Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
- .br
-@@ -198,3 +233,5 @@ Alan Cox, <Alan.Cox@linux.org>
- Phil Blundell, <Philip.Blundell@pobox.com>
- .br
- Andi Kleen
-+.br
-+Bernd Eckenfels, <net\-tools@lina.inka.de>
-diff --git a/man/en_US/mii-tool.8 b/man/en_US/mii-tool.8
-index 6b773ec..7decaac 100644
---- a/man/en_US/mii-tool.8
-+++ b/man/en_US/mii-tool.8
-@@ -1,13 +1,12 @@
- .\" Copyright (C) 2000 David A. Hinds -- dhinds@pcmcia.sourceforge.org
--.\" mii-tool.8 1.5 2000/04/25 22:58:19
- .\"
--.TH MII-TOOL 8 "2000/04/25 22:58:19" "net-tools"
-+.TH MII\-TOOL 8 "2013\-02\-15" "net\-tools" "Linux System Administrator's Manual"
- 
- .SH NAME
--mii-tool \- view, manipulate media-independent interface status
-+mii\-tool \- view, manipulate media-independent interface status
- 
- .SH SYNOPSIS
--.B mii-tool
-+.B mii\-tool
- [\fB\-v\fR, \fB\-\-verbose\fR]
- [\fB\-V\fR, \fB\-\-version\fR]
- [\fB\-R\fR, \fB\-\-reset\fR]
-@@ -16,7 +15,8 @@ mii-tool \- view, manipulate media-independent interface status
- [\fB\-l\fR, \fB\-\-log\fR]
- [\fB\-A\fR, \fB\-\-advertise=\fImedia,...\fR]
- [\fB\-F\fR, \fB\-\-force=\fImedia\fR]
--.RI [ "interface\ ..." ]
-+[\fB\-p\fR, \fB\-\-phy=\fIaddr\fR]
-+.RI "interface\ ..."
- 
- .SH DESCRIPTION
- This utility checks or sets the status of a network interface's Media
-@@ -32,18 +32,21 @@ single-speed hubs, are unable to autonegotiate.  To handle such
- devices, the MII protocol also allows for establishing a link by
- simply detecting either a 10baseT or 100baseT link beat.  The \fB\-F\fR
- or \fB\-\-force\fR options can be used to force the MII to operate in
--one mode, instead of autonegotiating.  The \fB\-A\fR and \fB-F\fR
-+one mode, instead of autonegotiating.  The \fB\-A\fR and \fB\-F\fR
- options are mutually exclusive.
- .PP
- The default short output reports the negotiated link speed and link
--status for each interface.  If an interface or interfaces are not
--specified on the command line, then \fBmii-tool\fR will check any
--available interfaces from \fBeth0\fR through \fBeth7\fR.
-+status for each interface.
- .SH OPTIONS
- .TP
- \fB\-v\fR, \fB\-\-verbose\fR
- Display more detailed MII status information.  If used twice, also
- display raw MII register contents.
-+.br
-+\fBAlert:\fR If used three times, will force reading all MII
-+registers, including non standard ones. It's not guaranteed any
-+valid answer from PHY while PHY communication can even hang.
-+With driver e1000e will fail while reading register 0x07.
- .TP
- \fB\-V\fR, \fB\-\-version\fR
- Display program version information.
-@@ -59,7 +62,7 @@ Watch interface(s) and report changes in link status.  The MII
- interfaces are polled at one second intervals.
- .TP
- \fB\-l\fR, \fB\-\-log\fR
--Used with \fB-w\fR, records link status changes in the system log
-+Used with \fB\-w\fR, records link status changes in the system log
- instead of printing on standard output.
- .TP
- \fB\-F\fI media\fR, \fB\-\-force=\fImedia\fR
-@@ -71,8 +74,31 @@ Enable and restart autonegotiation, and advertise only the specified
- media technologies.  Multiple technologies should be separated by
- commas.  Valid media are \fB100baseT4\fR, \fB100baseTx-FD\fR,
- \fB100baseTx-HD\fR, \fB10baseT-FD\fR, and \fB10baseT-HD\fR.
-+.TP
-+\fB\-p\fI addr\fR, \fB\-\-phy=\fIaddr\fR
-+Override the MII address provided by kernel with value \fBaddr\fR.
-+
-+.SH DIAGNOSTICS
-+.TP
-+SIOCGMIIPHY on 'eth?' failed: Invalid argument
-+If the interface is not running (up), kernel will refuse to report its link state.
-+.TP
-+SIOCGMIIPHY on 'eth?' failed: Operation not permitted
-+Most kernels restrict access to root.
-+.TP
-+SIOCGMIIPHY on 'eth?' failed: No such device
-+This error is shown, if the kernel does not know about the named device.
-+.TP
-+SIOCGMIIPHY on 'eth?' failed: Operation not supported 
-+The interface in question does not support MII queries. Most likely, it does not have 
-+MII transceivers, at all.
- 
- .SH AUTHORS
- David Hinds \- dhinds@pcmcia.sourceforge.org
- .br
- Donald Becker \- becker@scyld.com
-+.br
-+Bernd Eckenfels \- net-tools@lina.inka.de
-+
-+.SH SEE ALSO
-+http://net-tools.sourceforge.net \- Homepage of the net-tools project
-diff --git a/man/en_US/nameif.8 b/man/en_US/nameif.8
-index ff2430f..195304d 100644
---- a/man/en_US/nameif.8
-+++ b/man/en_US/nameif.8
-@@ -1,10 +1,10 @@
--.TH NAMEIF 8 "18 Oct 2000" "net-tools" "Linux's Administrator's Manual"
-+.TH NAMEIF 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
- .SH NAME
- nameif \- name network interfaces based on MAC addresses
- .SH SYNOPSIS
--.B "nameif [-c configfile] [-s]"
-+.B "nameif [\-c configfile] [\-s]"
- .br
--.B "nameif [-c configfile] [-s] {interface macaddress}"
-+.B "nameif [\-c configfile] [\-s] {interface macaddress}"
- .SH DESCRIPTION
- .B nameif 
- renames network interfaces based on mac addresses. When no arguments are
-@@ -18,11 +18,11 @@ looks for the interface with the given MAC address and renames it to the
- name given.
- 
- When the 
--.I -s
-+.I \-s
- argument is given all error messages go to the syslog.
- 
- When the 
--.I -c 
-+.I \-c 
- argument is given with a file name that file is read instead of /etc/mactab.
- 
- .SH NOTES
-diff --git a/man/en_US/netstat.8 b/man/en_US/netstat.8
-index b33996a..3157dc4 100644
---- a/man/en_US/netstat.8
-+++ b/man/en_US/netstat.8
-@@ -6,9 +6,10 @@
- .\" Modified: Bernd.Eckenfels@inka.de
- .\" Modified: Andi Kleen ak@muc.de 
- .\" Modified: Tuan Hoang tqhoang@bigfoot.com 
-+.\" Modified: Brian Micek bmicek@gmail.com
- .\"
- .\"
--.TH NETSTAT 8 "19 December 2000" "net-tools" "Linux Programmer's Manual"
-+.TH NETSTAT 8 "2012\-09\-15" "net\-tools" "Linux System Administrator's Manual"
- 
- .SH NAME
- netstat \- Print network connections, routing tables, interface statistics, masquerade connections, and multicast memberships
-@@ -19,17 +20,20 @@ netstat \- Print network connections, routing tables, interface statistics, masq
- .RI [ address_family_options ]
- .RB [ \-\-tcp | \-t ]
- .RB [ \-\-udp | \-u ]
-+.RB [ \-\-udplite | \-U ]
-+.RB [ \-\-sctp | \-S ]
- .RB [ \-\-raw | \-w ]
- .RB [ \-\-listening | \-l ]
- .RB [ \-\-all | \-a ]
- .RB [ \-\-numeric | \-n ]
--.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-+.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
- .RB [ \-\-symbolic | \-N ]
- .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
- .RB [ \-\-timers | \-o ]
- .RB [ \-\-program | \-p ]
- .RB [ \-\-verbose | \-v ]
- .RB [ \-\-continuous | \-c]
-+.RB [ \-\-wide | \-W]
- .P
- .B netstat 
- .RB { \-\-route | \-r }
-@@ -37,37 +41,38 @@ netstat \- Print network connections, routing tables, interface statistics, masq
- .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
- .RB [ \-\-verbose | \-v ]
- .RB [ \-\-numeric | \-n ]
--.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-+.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
- .RB [ \-\-continuous | \-c]
- .P
- .B netstat
- .RB { \-\-interfaces | \-i }
--.RI [ iface ]
- .RB [ \-\-all | \-a ]
- .RB [ \-\-extend | \-e  [ \-\-extend | \-e] ]
- .RB [ \-\-verbose | \-v ]
- .RB [ \-\-program | \-p ]
- .RB [ \-\-numeric | \-n ]
--.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-+.RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ]
- .RB [ \-\-continuous | \-c]
- .P
- .B netstat
- .RB { \-\-groups | \-g }
- .RB [ \-\-numeric | \-n ]
--.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-+.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
- .RB [ \-\-continuous | \-c]
- .P
- .B netstat
- .RB { \-\-masquerade | \-M }
- .RB [ \-\-extend | \-e ]
- .RB [ \-\-numeric | \-n ]
--.RB [ \-\-numeric-hosts ] [ \-\-numeric-ports ] [ \-\-numeric-ports ]
-+.RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
- .RB [ \-\-continuous | \-c]
- .P
- .B netstat
- .RB { \-\-statistics | -s }
- .RB [ \-\-tcp | \-t ]
- .RB [ \-\-udp | \-u ]
-+.RB [ \-\-udplite | \-U ]
-+.RB [ \-\-sctp | \-S ]
- .RB [ \-\-raw | \-w ]
- .P
- .B netstat 
-@@ -78,13 +83,26 @@ netstat \- Print network connections, routing tables, interface statistics, masq
- .P
- .IR address_family_options :
- .PP
--.RB [ \-\-protocol= { inet , unix , ipx , ax25 , netrom , ddp }[, ...] ]
-+.RB [ -4 | \-\-inet ]
-+.RB [ -6 | \-\-inet6 ]
-+.RB [ \-\-protocol= { inet , inet6 , unix , ipx , ax25 , netrom , ddp ", ... } ]"
- .RB [ \-\-unix | \-x ] 
--.RB [ \-\-inet | \-\-ip ]
-+.RB [ \-\-inet | \-\-ip | \-\-tcpip ]
- .RB [ \-\-ax25 ]
-+.RB [ \-\-x25 ]
-+.RB [ \-\-rose ]
-+.RB [ \-\-ash ]
- .RB [ \-\-ipx ] 
- .RB [ \-\-netrom ]
--.RB [ \-\-ddp ]
-+.RB [ \-\-ddp | \-\-appletalk ]
-+.RB [ \-\-econet | \-\-ec ]
-+
-+.SH NOTES
-+This program is obsolete.
-+Replacement for \fBnetstat\fR is \fBss\fR.
-+Replacement for \fBnetstat -r\fR is \fBip route\fR.
-+Replacement for \fBnetstat -i\fR is \fBip -s link\fR.
-+Replacement for \fBnetstat -g\fR is \fBip maddr\fR.
- 
- .SH DESCRIPTION
- .B Netstat
-@@ -98,12 +116,17 @@ displays a list of open sockets.  If you don't specify any
- address families, then the active sockets of all configured address
- families will be printed.
- .SS "\-\-route , \-r"
--Display the kernel routing tables.
-+Display the kernel routing tables. See the description in 
-+.BR route (8) 
-+for details. 
-+.B netstat -r 
-+and 
-+.B route -e 
-+produce the same output.
- .SS "\-\-groups , \-g"
- Display multicast group membership information for IPv4 and IPv6.
--.SS "\-\-interface=\fIiface \fR, \fB\-i"
--Display a table of all network interfaces, or the specified
--.IR iface ) .
-+.SS "\-\-interfaces, \-i"
-+Display a table of all network interfaces.
- .SS "\-\-masquerade , \-M"
- Display a list of masqueraded connections.
- .SS "\-\-statistics , \-s"
-@@ -112,16 +135,19 @@ Display summary statistics for each protocol.
- .SS "\-\-verbose , \-v"
- Tell the user what is going on by being verbose. Especially print some
- useful information about unconfigured address families.
-+.SS "\-\-wide , \-W"
-+Do not truncate IP addresses by using output as wide as needed. This is
-+optional for now to not break existing scripts.
- .SS "\-\-numeric , \-n"
- Show numerical addresses instead of trying to determine symbolic host, port
- or user names.
--.SS "\-\-numeric-hosts"
-+.SS "\-\-numeric\-hosts"
- shows numerical host addresses but does not affect the resolution of
- port or user names.
--.SS "\-\-numeric-ports"
-+.SS "\-\-numeric\-ports"
- shows numerical port numbers but does not affect the resolution of
- host or user names.
--.SS "\-\-numeric-users"
-+.SS "\-\-numeric\-users"
- shows numerical user IDs but does not affect the resolution of host or
- port names.
- 
-@@ -131,15 +157,18 @@ protocols) for which connections are to be shown.
- .I family 
- is a comma (',') separated list of address family keywords like
- .BR inet , 
-+.BR inet6 ,
- .BR unix , 
- .BR ipx , 
- .BR ax25 , 
- .BR netrom ,
-+.BR econet ,
- and
- .BR ddp .
- This has the same effect as using the 
--.BR \-\-inet ,
--.BR \-\-unix " (" \-x ),
-+.BR \-\-inet | -4 ,
-+.BR \-\-inet6 | -6 ,
-+.BR \-\-unix | -x ,
- .BR \-\-ipx ,
- .BR \-\-ax25 ,
- .BR \-\-netrom ,
-@@ -149,7 +178,7 @@ options.
- .P
- The address family
- .B inet
--includes raw, udp and tcp protocol sockets.
-+(Iv4) includes raw, udp, udplite and tcp protocol sockets.
- .SS "\-c, \-\-continuous"
- This will cause
- .B netstat
-@@ -164,23 +193,24 @@ Show the PID and name of the program to which each socket belongs.
- Show only listening sockets.  (These are omitted by default.)
- .SS "\-a, \-\-all"
- Show both listening and non-listening sockets.  With the
--.B --interfaces
--option, show interfaces that are not marked 
-+.B \-\-interfaces
-+option, show interfaces that are not up
- .SS "\-F"
- Print routing information from the FIB.  (This is the default.)
- .SS "\-C"
- Print routing information from the route cache.
--.IR UP .
- .P
- .SH OUTPUT
- .P
--.SS Active Internet connections \fR(TCP, UDP, raw)\fR
-+.SS Active Internet connections \fR(TCP, UDP, UDPLite, raw)\fR
- .SS "Proto" 
--The protocol (tcp, udp, raw) used by the socket. 
--.SS "Recv-Q"
--The count of bytes not copied by the user program connected to this socket.
--.SS "Send-Q"
--The count of bytes not acknowledged by the remote host.
-+The protocol (tcp, udp, udpl, raw) used by the socket. 
-+.SS "Recv\-Q"
-+Established: The count of bytes not copied by the user program connected to this socket.
-+Listening: Since Kernel 2.6.18 this column contains the current syn backlog.
-+.SS "Send\-Q"
-+Established: The count of bytes not acknowledged by the remote host.
-+Listening: Since Kernel 2.6.18 this column contains the maximum size of the syn backlog.
- .SS "Local Address" 
- Address and port number of the local end of the socket.  Unless the
- .BR \-\-numeric " (" \-n )
-@@ -192,7 +222,7 @@ Address and port number of the remote end of the socket.
- Analogous to "Local Address."
- .SS "State"
- The state of the socket. Since there are no states in raw mode and usually no
--states used in UDP, this column may be left blank. Normally this can be one
-+states used in UDP and UDPLite, this column may be left blank. Normally this can be one
- of several values:
- .TP
- .I
-@@ -221,7 +251,7 @@ TIME_WAIT
- The socket is waiting after close to handle packets still in the network.
- .TP
- .I
--CLOSED
-+CLOSE
- The socket is not being used.
- .TP
- .I
-@@ -255,7 +285,7 @@ The username or the user id (UID) of the owner of the socket.
- .SS "PID/Program name"
- Slash-separated pair of the process id (PID) and process name of the 
- process that owns the socket.
--.B --program
-+.B \-\-program
- causes this column to be included.  You will also need
- .I superuser
- privileges to see this information on sockets you don't own.  This
-@@ -356,13 +386,6 @@ to the socket.
- .SS Active AX.25 sockets
- (this needs to be done by somebody who knows it)
- .PP
--.SH NOTES
--Starting with Linux release 2.2 
--.B netstat -i 
--does not show interface statistics for alias interfaces. To get per
--alias interface counters you need to setup explicit rules using the
--.BR ipchains(8) 
--command.  
- 
- .SH FILES
- .ta
-@@ -385,6 +408,9 @@ status information via the following files.
- .I /proc/net/udp
- -- UDP socket information
- 
-+.I /proc/net/udplite
-+-- UDPLite socket information
-+
- .I /proc/net/igmp
- -- IGMP multicast information
- 
-@@ -428,9 +454,10 @@ status information via the following files.
- .SH SEE ALSO
- .BR route (8), 
- .BR ifconfig (8), 
--.BR ipchains (8),
- .BR iptables (8),
- .BR proc (5)
-+.BR ss (8)
-+.BR ip (8)
- .P
- .SH BUGS
- Occasionally strange information may appear if a socket changes
-@@ -438,12 +465,10 @@ as it is viewed. This is unlikely to occur.
- .P
- .SH AUTHORS
- The netstat user interface was written by Fred Baumgarten
--<dc6iq@insu1.etec.uni-karlsruhe.de> the man page basically
-+<dc6iq@insu1.etec.uni\-karlsruhe.de>, the man page basically
- by Matt Welsh <mdw@tc.cornell.edu>. It was updated by
--Alan Cox <Alan.Cox@linux.org> but could do with a bit more
--work.  It was updated again by Tuan Hoang
--<tqhoang@bigfoot.com>.
--.br
--The man page and the command included in the net-tools
--package is totally rewritten by Bernd Eckenfels 
--<ecki@linux.de>.
-+Alan Cox <Alan.Cox@linux.org>, updated again by Tuan Hoang
-+<tqhoang@bigfoot.com>. The man page and the command included 
-+in the net\-tools package is totally rewritten by Bernd Eckenfels 
-+<ecki@linux.de>.  UDPLite options were added by Brian Micek
-+<bmicek@gmail.com>
-diff --git a/man/en_US/plipconfig.8 b/man/en_US/plipconfig.8
-index c6d2567..d42a0bc 100644
---- a/man/en_US/plipconfig.8
-+++ b/man/en_US/plipconfig.8
-@@ -1,10 +1,18 @@
--.TH PLIPCONFIG 8 "17 February 1995" "" ""
-+.TH PLIPCONFIG 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
- .SH NAME
- plipconfig \- fine tune PLIP device parameters 
- .SH SYNOPSIS
--.B "plipconfig interface"
-+.B plipconfig interface
-+.RB [ nibble
-+.IR NN ]
-+.RB [ trigger
-+.IR NN ]
- .br
--.B "plipconfig interface [nibble NN] [trigger NN] [unit NN]"
-+.B plipconfig
-+.RB [ \-V ]
-+.RB [ \-\-version ]
-+.RB [ \-h ]
-+.RB [ \-\-help ]
- .SH DESCRIPTION
- .B Plipconfig
- is used to (hopefully) improve PLIP performance by changing the default
-diff --git a/man/en_US/rarp.8 b/man/en_US/rarp.8
-index e462799..d9d31f9 100644
---- a/man/en_US/rarp.8
-+++ b/man/en_US/rarp.8
-@@ -1,20 +1,20 @@
--.TH RARP 8 "4 August 1997" "net-tools" "Linux Programmer's Manual"
-+.TH RARP 8 "2008\-10\-03" "net\-tools" "Linux System Administrator's Manual"
- .SH NAME
- rarp \- manipulate the system RARP table
- .SH SYNOPSIS
--.B "rarp [-V] [--version] [-h] [--help]"
-+.B "rarp [\-V] [\-\-version] [\-h] [\-\-help]"
- .br
--.B "rarp -a"
-+.B "rarp \-a"
- .br
--.B "rarp [-v] -d hostname ..."
-+.B "rarp [\-v] \-d hostname ..."
- .br
--.B "rarp [-v] [-t type] -s hostname hw_addr"
-+.B "rarp [\-v] [\-t type] \-s hostname hw_addr"
- .SH NOTE
- .P
- This program is obsolete.  From version 2.3, the Linux kernel 
- no longer contains RARP support.  For a replacement RARP daemon, see
- .I
--ftp://ftp.dementia.org/pub/net-tools
-+ftp://ftp.dementia.org/pub/net\-tools
- .SH DESCRIPTION
- .B Rarp
- manipulates the kernel's RARP table in various ways.  The primary options
-@@ -61,8 +61,8 @@ Remove all RARP entries for the specified host.
- Create a RARP address mapping entry for host
- .B hostname
- with hardware address set to
--.B hw_addr
--.  The format of the hardware address is dependent on the hardware
-+.BR hw_addr .
-+The format of the hardware address is dependent on the hardware
- class, but for most classes one can assume that the usual presentation
- can be used.  For the Ethernet class, this is 6 bytes in hexadecimal,
- separated by colons.
-diff --git a/man/en_US/route.8 b/man/en_US/route.8
-index f59c074..19895e9 100644
---- a/man/en_US/route.8
-+++ b/man/en_US/route.8
-@@ -1,57 +1,62 @@
--.TH ROUTE 8 "2 January 2000" "net-tools" "Linux Programmer's Manual"
-+.TH ROUTE 8 "2014\-02\-17" "net\-tools" "Linux System Administrator's Manual"
- .SH NAME
- route \- show / manipulate the IP routing table
- .SH SYNOPSIS
- .B route
--.RB [ \-CFvnee ]
-+.RB [ \-CFvnNee ]
-+.RB [ \-A
-+family
-+.RB | \-4 | \-6 ] 
- .TP
- .B route 
- .RB [ \-v ]
- .RB [ \-A
--family] 
-+family 
-+.RB | \-4 | \-6 ] 
- .B add 
- .RB [ \-net | \-host ] 
--target 
-+.I target 
- .RB [ netmask 
--Nm] 
-+.IR Nm ] 
- .RB [ gw 
--Gw] 
-+.IR Gw ] 
- .RB [ metric 
--N] 
-+.IR N ] 
- .RB [ mss 
--M] 
-+.IR M ] 
- .RB [ window 
--W] 
-+.IR W ] 
- .RB [ irtt 
--I]
-+.IR I ]
- .RB [ reject ]
- .RB [ mod ]
- .RB [ dyn ] 
- .RB [ reinstate ] 
- .RB [[ dev ] 
--If]
-+.IR If ]
- .TP
- .B route 
- .RB [ \-v ] 
- .RB [ \-A
--family]
-+.I family
-+.RB | \-4 | \-6 ]
- .B del 
- .RB [ \-net | \-host ] 
--target 
-+.I target 
- .RB [ gw 
--Gw] 
-+.IR Gw ] 
- .RB [ netmask 
--Nm] 
-+.IR Nm ] 
- .RB [ metric 
--N] 
-+.IR M ] 
- .RB [[ dev ]
--If]
-+.IR If ]
- .TP
- .B route 
- .RB [ \-V ] 
- .RB [ \-\-version ]
- .RB [ \-h ]
--.RB [ \--help ]
-+.RB [ \-\-help ]
- .SH DESCRIPTION
- .B Route
- manipulates the kernel's IP routing tables.  Its primary use is to set
-@@ -72,19 +77,27 @@ displays the current contents of the routing tables.
- 
- .SH OPTIONS
- .TP
--.B \-A family
--use the specified address family (eg `inet'; use `route --help' for a full 
--list).
-+\fB\-A \fIfamily\fR
-+use the specified address family (eg `inet'). Use 
-+.B route \-\-help
-+for a full list. You can use 
-+.B \-6 
-+as an alias for 
-+.B \-\-inet6 
-+and 
-+.B \-4 
-+as an alias for 
-+.B \-A inet
-+.
- 
- .TP 
--.B -F
-+.B \-F
- operate on the kernel's FIB (Forwarding Information Base) routing
- table. 
- This is the default.
- .TP 
--.B -C
-+.B \-C
- operate on the kernel's routing cache.
--
- .TP
- .B \-v
- select verbose operation.
-@@ -96,11 +109,10 @@ nameserver has vanished.
- .TP
- .B \-e
- use
--.BR netstat (8)-format
-+.BR netstat (8)\-format
- for displaying the routing table.
- .B \-ee 
- will generate a very long line with all parameters from the routing table.
--
- .TP
- .B del
- delete a route.
-@@ -108,25 +120,27 @@ delete a route.
- .B add 
- add a new route.
- .TP
--.B target
--the destination network or host. You can provide IP addresses in dotted
--decimal or host/network names.
-+.I target
-+the destination network or host. You can provide an addresses or symbolic 
-+network or host name. Optionally you can use \fB/\fIprefixlen\fR notation
-+instead of using the \fBnetmask\fR option.
- .TP
- .B \-net
- the
--.B target
-+.I target
- is a network.
- .TP
--.B -host
-+.B \-host
- the
--.B target 
-+.I target 
- is a host.
- .TP
--.B netmask NM
-+\fBnetmask \fINM\fR
- when adding a network route, the netmask to be used.
- .TP
--.B gw GW
-+\fBgw \fIGW\fR
- route packets via a gateway.
-+.br
- .B NOTE:
- The specified gateway must be reachable first. This usually means that
- you have to set up a static route to the gateway beforehand. If you specify
-@@ -134,91 +148,94 @@ the address of one of your local interfaces, it will be used to decide about
- the interface to which the packets should be routed to. This is a BSDism
- compatibility hack.
- .TP
--.B metric M
--set the metric field in the routing table (used by routing daemons) to M.
-+\fBmetric \fIM\fR
-+set the metric field in the routing table (used by routing daemons) to \fIM\fR. If this option is not specified the metric for inet6 (IPv6) address family defaults to '1', for inet (IPv4) it defaults to '0'. You should always specify an explicit metric value to not rely on those defaults - they also differ from iproute2.
- .TP 
--.B mss M
--set the TCP Maximum Segment Size (MSS) for connections over this route
--to M bytes. 
--The default is the device MTU minus headers, or a lower MTU when path mtu 
--discovery occured. This setting can be used to force smaller TCP packets on the
--other end when path mtu discovery does not work (usually because of
--misconfigured firewalls that block ICMP Fragmentation Needed)
-+\fBmss \fIM\fR
-+sets MTU (Maximum Transmission Unit) of the route to \fIM\fR bytes.
-+Note that the current implementation of the route command does not allow
-+the option to set the Maximum Segment Size (MSS).
- .TP 
--.B window W 
--set the TCP window size for connections over this route to W
-+\fBwindow \fIW\fR
-+set the TCP window size for connections over this route to \fIW\fR
- bytes. This is typically only used on AX.25 networks and with drivers
- unable to handle back to back frames.
- .TP
--.B irtt I
-+\fBirtt \fII\fR
- set the initial round trip time (irtt) for TCP connections over this
--route to I milliseconds (1-12000). This is typically only used on
-+route to \fII\fR milliseconds (1-12000). This is typically only used on
- AX.25 networks. If omitted the RFC 1122 default of 300ms is used.
- .TP
- .B reject
- install a blocking route, which will force a route lookup to fail.
- This is for example used to mask out networks before using the default
--route.  This is NOT for firewalling.
-+route. This is NOT for firewalling.
- .TP
- .B mod, dyn, reinstate
- install a dynamic or modified route. These flags are for diagnostic
- purposes, and are generally only set by routing daemons.
- .TP
--.B dev If
-+\fBdev \fIIf\fR
- force the route to be associated with the specified device, as the
- kernel will otherwise try to determine the device on its own (by
- checking already existing routes and device specifications, and where
- the route is added to). In most normal networks you won't need this.
- 
--If 
--.B dev If
-+If \fBdev \fIIf\fR
- is the last option on the command line, the word 
- .B dev
- may be omitted, as it's the default. Otherwise the order of the route
--modifiers (metric - netmask - gw - dev) doesn't matter.
-+modifiers (\fBmetric netmask gw dev\fR) doesn't matter.
- 
- .SH EXAMPLES
- .TP
--.B route add -net 127.0.0.0
--adds the normal loopback entry, using netmask 255.0.0.0 (class A net,
--determined from the destination address) and associated with the 
--"lo" device (assuming this device was prviously set up correctly with
-+.B route add \-net 127.0.0.0 netmask 255.0.0.0 metric 1024 dev lo
-+adds the normal loopback entry, using netmask 255.0.0.0 and associated with the 
-+"lo" device (assuming this device was previously set up correctly with
- .BR ifconfig (8)). 
- 
- .TP 
--.B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0
--adds a route to the network 192.56.76.x via 
--"eth0". The Class C netmask modifier is not really necessary here because
--192.* is a Class C IP address. The word "dev" can be omitted here. 
-+.B route add \-net 192.56.76.0 netmask 255.255.255.0 metric 1024 dev eth0
-+adds a route to the local network 192.56.76.x via 
-+"eth0".  The word "dev" can be omitted here. 
- 
- .TP
--.B route add default gw mango-gw
-+.B route del default
-+deletes the current default route, which is labeled "default" or 0.0.0.0
-+in the destination field of the current routing table.
-+
-+.TP
-+.B route add default gw mango 
- adds a default route (which will be used if no other route matches).
--All packets using this route will be gatewayed through "mango-gw". The
-+All packets using this route will be gatewayed through the address of a node
-+named "mango". The
- device which will actually be used for that route depends on how we
--can reach "mango-gw" - the static route to "mango-gw" will have to be
--set up before. 
-+can reach "mango" - "mango" must be on directly reachable route.
- 
- .TP
--.B route add ipx4 sl0
--Adds the route to the "ipx4" host via the SLIP interface (assuming that
--"ipx4" is the SLIP host).
-+.B route add mango sl0
-+Adds the route to the host named "mango" via the SLIP interface (assuming that
-+"mango" is the SLIP host).
- 
- .TP
--.B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4
-+.B route add \-net 192.57.66.0 netmask 255.255.255.0 gw mango
- This command adds the net "192.57.66.x" to be gatewayed through the former
- route to the SLIP interface.
- 
- .TP
--.B route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0
-+.B route add \-net 224.0.0.0 netmask 240.0.0.0 dev eth0
- This is an obscure one documented so people know how to do it. This sets
- all of the class D (multicast) IP routes to go via "eth0". This is the
- correct normal configuration line with a multicasting kernel. 
- 
- .TP
--.B route add -net 10.0.0.0 netmask 255.0.0.0 reject
-+.B route add \-net 10.0.0.0 netmask 255.0.0.0 metric 1024 reject
- This installs a rejecting route for the private network "10.x.x.x."
- 
-+.TP
-+.B route -6 add 2001:0002::/48 metric 1 dev eth0  
-+This adds a IPv6 route with the specified metric to be directly reachable via eth0.
-+
- .LP
- .SH OUTPUT
- The output of the kernel routing table is organized in the following columns
-@@ -275,21 +292,20 @@ entry)
- route)
- .TP
- .B Metric 
--The 'distance' to the target (usually counted in hops). It is not used by
--recent kernels, but may be needed by routing daemons.
-+The 'distance' to the target (usually counted in hops).
- .TP
- .B Ref    
- Number of references to this route. (Not used in the Linux kernel.)
- .TP
- .B Use
--Count of lookups for the route.  Depending on the use of -F and -C this will
--be either route cache misses (-F) or hits (-C).
-+Count of lookups for the route.  Depending on the use of \-F and \-C this will
-+be either route cache misses (\-F) or hits (\-C).
- .TP
- .B Iface
- Interface to which packets for this route will be sent.
- .TP
- .B MSS 
--Default maximum segement size for TCP connections over this route.
-+Default maximum segment size for TCP connections over this route.
- .TP
- .B Window  
- Default window size for TCP connections over this route.
-@@ -313,8 +329,12 @@ Whether or not the hardware address for the cached route is up to date.
- .br
- .I /proc/net/rt_cache
- .LP
--.SH SEE ALSO
--.I ifconfig(8), netstat(8), arp(8), rarp(8)
-+.SH "SEE ALSO"
-+.IR ifconfig (8),
-+.IR netstat (8), 
-+.IR arp (8), 
-+.IR rarp (8),
-+.IR ip (8)
- .LP
- .SH HISTORY
- .B Route
-@@ -323,4 +343,4 @@ for Linux was originally written by Fred N.  van Kempen,
- Linus Torvalds for pl15. Alan Cox added the mss and window options for
- Linux 1.1.22. irtt support and merged with netstat from Bernd Eckenfels.
- .SH AUTHOR
--Currently maintained by Phil Blundell <Philip.Blundell@pobox.com>.
-+Currently maintained by Phil Blundell <Philip.Blundell@pobox.com> and Bernd Eckenfels <net-tools@lina.inka.de>.
-diff --git a/man/en_US/slattach.8 b/man/en_US/slattach.8
-index 0c4c863..0e2cfcc 100644
---- a/man/en_US/slattach.8
-+++ b/man/en_US/slattach.8
-@@ -1,8 +1,8 @@
--.TH SLATTACH 8 "12 Feb 1994" "" ""
-+.TH SLATTACH 8 "2011\-12\-31" "net\-tools" "Linux System Administrator's Manual"
- .SH NAME
- slattach \- attach a network interface to a serial line
- .SH SYNOPSIS
--.B "slattach [-dehlLmnqv] [-c command] [-p proto] [-s speed] [tty]"
-+.B "slattach [\-dehlLmnqv] [\-c command] [\-p proto] [\-s speed] [tty]"
- .br
- .SH DESCRIPTION
- .B Slattach
-@@ -11,47 +11,53 @@ is a tiny little program that can be used to put a normal terminal
- you to use it for point-to-point links to other computers.
- .SH OPTIONS
- .TP
--.B "[-c command]"
-+.B tty
-+Path to a serial device like
-+.IR /dev/ttyS* ", " /dev/cua* " or " /dev/ptmx
-+to spawn a new pseudo tty.
-+.TP
-+.B "[\-c command]"
- Execute
- .B command
- when the line is hung up. This can be used to run scripts or re-establish
- connections when a link goes down.
- .TP
--.B "[-d]"
-+.B "[\-d]"
- Enable debugging output.  Useful when determining why a given
- setup doesn't work.
- .TP
--.B "[-h]"
-+.B "[\-h]"
- Exit when the carrier is lost. This works on both /dev/tty and /dev/cua
- devices by directly monitoring the carrier status every 15 seconds.
--.B "[-v]"
-+.TP
-+.B "[\-v]"
- Enable verbose output.  Useful in shell scripts.
- .TP
--.B "[-q]"
-+.B "[\-q]"
- Operate in quiet mode - no messages at all.
- .TP
--.B "[-l]"
-+.B "[\-l]"
- Create an UUCP-style lockfile for the device in /var/lock.
- .TP
--.B "[-n]"
-+.B "[\-n]"
- Equivalent to the "mesg n" command.
- .TP
--.B "[-m]"
-+.B "[\-m]"
- Do \fBnot\fP initialize the line into 8 bits raw mode.
- .TP
--.B "[-e]"
-+.B "[\-e]"
- Exit right after initializing device, instead of waiting for the
--line to hangup.
-+line to hang up.
- .TP
--.B "[-L]"
-+.B "[\-L]"
- Enable 3 wire operation. The terminal is moved into CLOCAL mode, 
- carrier watching is disabled.
- .TP
--.B "[-p proto]"
-+.B "[\-p proto]"
- Set a specific kind of protocol to use on the line.  The default
- is set to
--.B "cslip"
--, i.e. compressed SLIP.  Other possible values are
-+.BR "cslip" ,
-+i.e. compressed SLIP.  Other possible values are
- .B "slip"
- (normal SLIP), 
- .B "adaptive"
-@@ -70,14 +76,14 @@ to be active on the line. For kiss connections the
- .B axattach
- program should be used.
- .TP
--.B "[-s speed]"
-+.B "[\-s speed]"
- Set a specific line speed, other than the default.
- .PP
- If no arguments are given, the current terminal line (usually: the
- login device) is used.  Otherwise, an attempt is made to claim the
- indicated terminal port, lock it, and open it.
- .SH FILES
--.I /dev/cua* /var/lock/LCK.*
-+.I /dev/cua* /var/lock/LCK.* /dev/ttyS* /dev/ptmx
- .SH BUGS
- None known.
- .SH SEE ALSO
-diff --git a/man/fr_FR/arp.8 b/man/fr_FR/arp.8
-index df37e8b..a669469 100644
---- a/man/fr_FR/arp.8
-+++ b/man/fr_FR/arp.8
-@@ -1,32 +1,32 @@
--.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Programmer's Manual"
-+.TH ARP 8 "5 Jan 1999" "net-tools" "Linux Administrator's Manual"
- .SH NOM
--arp \- manipule la table ARP du syst�me
-+arp \- manipule la table ARP du système
- .SH SYNOPSIS
- .B arp 
- .RB [ \-vn ] 
- .RB [ "\-H type" ] 
- .RB [ "-i if" ] 
- .B -a 
--.RB [ nom_h�te ]
-+.RB [ nom_hôte ]
- .PP
- .B arp 
- .RB [ \-v ]
- .RB [ "\-i if" ] 
--.B "\-d nom_h�te"
-+.B "\-d nom_hôte"
- .RB [ pub ]
- .PP
- .B arp 
- .RB [ \-v ] 
- .RB [ "\-H type" ] 
- .RB [ "\-i if" ] 
--.B -s nom_h�te hw_addr
-+.B -s nom_hôte hw_addr
- .RB [ temp ] 
- .PP
- .B arp 
- .RB [ \-v ] 
- .RB [ "\-H type" ] 
- .RB [ "\-i if" ] 
--.B -s nom_h�te hw_addr
-+.B -s nom_hôte hw_addr
- .RB [ "netmask nm" ] 
- .B pub
- .PP
-@@ -34,7 +34,7 @@ arp \- manipule la table ARP du syst
- .RB [ \-v ] 
- .RB [ "\-H type" ] 
- .RB [ "\-i if" ] 
--.B -Ds nom_h�te ifa
-+.B -Ds nom_hôte ifa
- .RB [ "netmask nm" ] 
- .B pub
- .PP
-@@ -46,33 +46,33 @@ arp \- manipule la table ARP du syst
- 
- .SH DESCRIPTION
- .B Arp
--manipule la table ARP du noyau de diff�rentes fa�ons.  Les options principales
--permettent d'effacer une correspondance d'adresses   et d'en d�finir
-+manipule la table ARP du noyau de différentes façons.  Les options principales
-+permettent d'effacer une correspondance d'adresses   et d'en définir
- une manuellement.
--Pour les besoins de d�bogage, le programme
-+Pour les besoins de débogage, le programme
- .B arp
- permet aussi d'effectuer un dump complet de la table ARP.
- .SH OPTIONS
- .TP
- .B "\-v, \-\-verbose"
--Dit � l'utilisateur ce qui se passe en �tant verbeux.
-+Dit à l'utilisateur ce qui se passe en étant verbeux.
- .TP
- .B "\-n, \-\-numeric"
--Affiche les adresses num�riques au lieu d'essayer de d�terminer les nom
--d'h�tes symboliques.
-+Affiche les adresses numériques au lieu d'essayer de déterminer les nom
-+d'hôtes symboliques.
- .TP
- .B "\-H type, \-\-hw-type type"
--En positionnant ou lisant les entr�es ARP, ce param�tre optionnel indique
--� 
-+En positionnant ou lisant les entrées ARP, ce paramètre optionnel indique
-+à 
- .B arp
--les classes d'entr�es qu'il doit contr�ler.  La valeur par d�faut de
--ce param�tre est
-+les classes d'entrées qu'il doit contrôler.  La valeur par défaut de
-+ce paramètre est
- .B ether
--(i.e. code de mat�riel
-+(i.e. code de matériel
- .B 0x01
- pour
- .B "IEEE 802.3 10Mbps Ethernet".
--D'autres valeurs doivent correspondre � des technologies r�seaux telles que
-+D'autres valeurs doivent correspondre à des technologies réseaux telles que
- .RB "ARCnet (" arcnet ")"
- ,
- .RB "PROnet (" pronet ")"
-@@ -81,89 +81,89 @@ D'autres valeurs doivent correspondre 
- and
- .RB "NET/ROM (" netrom ")."
- .TP
--.B "\-a [nom_d_h�te], \-\-display [nom_d_h�te]"
--Affiche les entr�es concernant l'h�te sp�cifi�.  Si le param�tre
--.B nom_d_h�te
--n'est pas utilis�,
-+.B "\-a [nom_d_hôte], \-\-display [nom_d_hôte]"
-+Affiche les entrées concernant l'hôte spécifié.  Si le paramètre
-+.B nom_d_hôte
-+n'est pas utilisé,
- .B toutes
--les entr�es seront affich�es.
-+les entrées seront affichées.
- .TP
--.B "\-d nom_d_h�te, \-\-delete nom_d_h�te"
--Enl�ve une entr�e pour l'h�te sp�cifi�.  Ceci peut �tre
--utilis� si l'h�te concern� ne fonctionne plus, par exemple.
-+.B "\-d nom_d_hôte, \-\-delete nom_d_hôte"
-+Enlève une entrée pour l'hôte spécifié.  Ceci peut être
-+utilisé si l'hôte concerné ne fonctionne plus, par exemple.
- .TP
- .B "\-D, \-\-use-device"
--Utilise l'adresse mat�rielle de l'interface
-+Utilise l'adresse matérielle de l'interface
- .BR ifa
- .
- .TP
- .B "\-i If, \-\-device If"
--S�lectionne une interface. Lors du dump du cache ARP, seules les entr�es
--correspondant � l'interface sp�cifi�e seront affich�es. Lorsque l'on d�finit
--une entr�e permanente ou une entr�e
-+Sélectionne une interface. Lors du dump du cache ARP, seules les entrées
-+correspondant à l'interface spécifiée seront affichées. Lorsque l'on définit
-+une entrée permanente ou une entrée
- .B temp
--, cette interface lui sera associ�e; si cette option n'est pas utilis�e,
--le noyau fera des tentatives de r�solution selon la table de routage. Pour
--les entr�es 
-+, cette interface lui sera associée; si cette option n'est pas utilisée,
-+le noyau fera des tentatives de résolution selon la table de routage. Pour
-+les entrées 
- .B pub
--l'interface sp�cifi�e est celle pour laquelle les requ�tes ARP auront trouv�
--une r�ponse. 
-+l'interface spécifiée est celle pour laquelle les requêtes ARP auront trouvé
-+une réponse. 
- .br
- .B NOTE:
--Ceci est diff�rent de l'interface vers laquelle les datagrammes IP seront rout�s.
-+Ceci est différent de l'interface vers laquelle les datagrammes IP seront routés.
- .TP
--.B "\-s nom_d_h�te hw_addr, \-\-set hostname hw_addr"
--Cr�e manuellement une correspondance d'adresses ARP pour l'h�te
--.B nom_d_h�te
--avec l'adresse mat�rielle positionn�e �
-+.B "\-s nom_d_hôte hw_addr, \-\-set hostname hw_addr"
-+Crée manuellement une correspondance d'adresses ARP pour l'hôte
-+.B nom_d_hôte
-+avec l'adresse matérielle positionnée à
- .B hw_addr.
--Le format de l'adresse mat�rielle est d�pendant de la classe du mat�riel,
--mais pour la plupart on peut consid�rer que la pr�sentation classique
--peut �tre utilis�e.  Pour la classe Ethernet, c'est 6 octets en hexad�cimal,
--s�par�s par des double-points. Pour ajouter des entr�es proxy-arp
-+Le format de l'adresse matérielle est dépendant de la classe du matériel,
-+mais pour la plupart on peut considérer que la présentation classique
-+peut être utilisée.  Pour la classe Ethernet, c'est 6 octets en hexadécimal,
-+séparés par des double-points. Pour ajouter des entrées proxy-arp
- (Ce sont celles avec l'indicateur
- .BR pub lish 
--positionn�)
--un masque r�seau (
-+positionné)
-+un masque réseau (
- .B netmask 
--) peut �tre sp�cifi� au proxy-arp pour le
--sous-r�seau entier. Ceci n'est pas tr�s recommand�, mais est support� par
-+) peut être spécifié au proxy-arp pour le
-+sous-réseau entier. Ceci n'est pas très recommandé, mais est supporté par
- les anciens noyaux, car c'est utile dans certains cas. Si l'indicateur
- .B temp
--n'est pas fourni, les entr�es ARP seront permanentes.
-+n'est pas fourni, les entrées ARP seront permanentes.
- .br
- .B NOTE:
--A partir du noyau 2.2.0 il n'est plus possible de d�finir des entr�es ARP
--pour un sous r�seau entier.
-+A partir du noyau 2.2.0 il n'est plus possible de définir des entrées ARP
-+pour un sous réseau entier.
- .TP
- .B "\-f nom_de_fichier, \-\-file nom_de_fichier"
--Similaire � l'option 
-+Similaire à l'option 
- .B \-s
- , mais cette fois les informations d'adresses sont prises dans le fichier
--.B nom_de_fichier
--. Ceci peut �tre utilis� si les entr�es ARP � configurer sont
--nombreuses.  Le nom du fichier de donn�es est tr�s souvent nomm�
-+.BR nom_de_fichier .
-+Ceci peut être utilisé si les entrées ARP à configurer sont
-+nombreuses.  Le nom du fichier de données est très souvent nommé
- .B /etc/ethers
- , mais ce n'est pas officiel.
- .sp 1
- Le format du fichier est simple; Il contient
--seulement des lignes de texte ASCII avec sur chaque ligne un nom d'h�te et
--une adresse mat�rielle, s�par�s par des espaces. Les indicateurs
-+seulement des lignes de texte ASCII avec sur chaque ligne un nom d'hôte et
-+une adresse matérielle, séparés par des espaces. Les indicateurs
- .BR "pub" , " temp" " et" " netmask"
--peuvent �galement �tre utilis�s.
-+peuvent également être utilisés.
- .LP
--A tous les endroits o� un
--.B nom d'h�te
-+A tous les endroits où un
-+.B nom d'hôte
- est attendu, on peut aussi entrer une
- .B "addresse IP"
--en notation d�cimale point�e.
-+en notation décimale pointée.
- .LP
--Chaque entr�e compl�te se trouvant dans le cache ARP est marqu�e de
-+Chaque entrée complète se trouvant dans le cache ARP est marquée de
- l'indicateur
--.B C
--. Les entr�es permanentes sont marqu�es de l'indicateur
-+.BR C .
-+Les entrées permanentes sont marquées de l'indicateur
- .B M
--et les entr�es 'pub' ont l'indicateur
-+et les entrées 'pub' ont l'indicateur
- .B P
- .
- .SH FICHIERS
-@@ -177,8 +177,8 @@ et les entr
- .SH VOIR AUSSI
- rarp(8), route(8), ifconfig(8), netstat(8)
- .SH AUTEUR
--Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> avec les am�liorations
--apport�es par le mainteneur des net-tools Bernd Eckenfels
-+Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> avec les améliorations
-+apportées par le mainteneur des net-tools Bernd Eckenfels
- <net-tools@lina.inka.de>.
- .SH TRADUCTION
- Jean Michel VANSTEENE (vanstee@worldnet.fr)
-diff --git a/man/fr_FR/ethers.5 b/man/fr_FR/ethers.5
-index 5e70929..030fdf6 100644
---- a/man/fr_FR/ethers.5
-+++ b/man/fr_FR/ethers.5
-@@ -5,7 +5,7 @@
- .\"
- .TH ETHERS 5 "26 Avril 1996" "" "Formats de fichiers"
- .SH NOM \"{{{roff}}}\"{{{
--ethers \- Base de donn�es adresses Ethernet - adresses IP
-+ethers \- Base de données adresses Ethernet - adresses IP
- .\"}}}
- .SH DESCRIPTION \"{{{
- \fB/etc/ethers\fP contient des adresses Ethernet sur 48 bits et leur
-@@ -15,14 +15,14 @@ adresse IP correspondante, une ligne par adresses IP:
- \fIAdresse-Ethernet\fP  \fIAdresse-IP\fP
- .RE
- .sp
--Les deux items sont s�par�s par un ou plusieurs espaces et/ou tabulations.
--Un \fB#\fP en d�but de ligne est un commentaire pour tout le reste de la ligne.
--L'\fIadresse-Ethernet\fP est �crite sous la forme
-+Les deux items sont séparés par un ou plusieurs espaces et/ou tabulations.
-+Un \fB#\fP en début de ligne est un commentaire pour tout le reste de la ligne.
-+L'\fIadresse-Ethernet\fP est écrite sous la forme
- .IR x : x : x : x : x : x ,
--o� \fIx\fP est une valeur h�xadecimale comprise entre \fB0\fP et \fBff\fP
--repr�sentant un octet de l'adresse, dans l'ordre du r�seau (big-endian).
--L'\fIAdresse-IP\fP peut �tre soit un nom d'h�te r�solu par DNS ou une adresse
--en notation d�cimale point�e.
-+où \fIx\fP est une valeur héxadecimale comprise entre \fB0\fP et \fBff\fP
-+représentant un octet de l'adresse, dans l'ordre du réseau (big-endian).
-+L'\fIAdresse-IP\fP peut être soit un nom d'hôte résolu par DNS ou une adresse
-+en notation décimale pointée.
- .\"}}}
- .SH EXEMPLES \"{{{
- 08:00:20:00:61:CA  pal
-diff --git a/man/fr_FR/hostname.1 b/man/fr_FR/hostname.1
-index c4cd412..3adaf4b 100644
---- a/man/fr_FR/hostname.1
-+++ b/man/fr_FR/hostname.1
-@@ -1,16 +1,16 @@
- .TH HOSTNAME 1 "15 Mars 1999" "net-tools" "Linux Programmer's Manual"
- .SH NOM
--hostname \- affiche ou d�finit le nom d'h�te du syst�me
-+hostname \- affiche ou définit le nom d'hôte du système
- .br
--domainname \- affiche le nom de domaine NIS/YP du syst�me
-+domainname \- affiche le nom de domaine NIS/YP du système
- .br
--dnsdomainname \- affiche le nom de domaine du syst�me
-+dnsdomainname \- affiche le nom de domaine du système
- .br
--nisdomainname \- affiche ou d�finit le nom de domaine NIS/YP du syst�me
-+nisdomainname \- affiche ou définit le nom de domaine NIS/YP du système
- .br
--ypdomainname \- affiche ou d�finit le nom de domaine NIS/YP du syst�me
-+ypdomainname \- affiche ou définit le nom de domaine NIS/YP du système
- .br
--nodename \- affiche ou d�finit le nom de domaine DECnet du syst�me
-+nodename \- affiche ou définit le nom de domaine DECnet du système
- 
- .SH SYNOPSIS
- .B hostname
-@@ -73,45 +73,45 @@ nodename \- affiche ou d
- 
- .SH DESCRIPTION
- .B Hostname
--est le programme utilis� soit pour d�finir le nom d'h�te, soit
--pour visualiser le nom d'h�te ou de domaine du syst�me. Ce nom est
--utilis� par diff�rents programmes r�seaux pour identifier la machine. Le
--nom de domaine est �galement utilis� par les NIS/YP.
-+est le programme utilisé soit pour définir le nom d'hôte, soit
-+pour visualiser le nom d'hôte ou de domaine du système. Ce nom est
-+utilisé par différents programmes réseaux pour identifier la machine. Le
-+nom de domaine est également utilisé par les NIS/YP.
- 
- .SS "OBTENTION DU NOM"
--Appel� sans argument, le programme affiche les noms courants:
-+Appelé sans argument, le programme affiche les noms courants:
- 
- .LP
- .B hostname
--fournit le nom du syst�me tel qu'il est retourn� par la fonction
--.BR getdomainname (2)
--. Ceci est connu comme nom de domaine YP/NIS du syst�me.
-+fournit le nom du système tel qu'il est retourné par la fonction
-+.BR getdomainname (2).
-+Ceci est connu comme nom de domaine YP/NIS du système.
- 
- 
- .LP
- .B nodename
--fournit le nom de noeud DECnet du syst�me tel qu'il est retourn� par la
-+fournit le nom de noeud DECnet du système tel qu'il est retourné par la
- fonction
- .BR getnodename (2)
- .
- 
- .LP
- .B dnsdomainname
--fournit la partie domaine du nom compl�tement qualifi� - FQDN (Fully
--Qualified Domain Name). Le nom FQDN du syst�me est retourn� par la commande
-+fournit la partie domaine du nom complètement qualifié - FQDN (Fully
-+Qualified Domain Name). Le nom FQDN du système est retourné par la commande
- .BR "hostname \-\-fqdn" .
- 
- .SS "SET NAME"
--Appel� avec un argument ou avec l'option
-+Appelé avec un argument ou avec l'option
- .B \-\-file
--, la commande d�finit le nom d'h�te, le nom de domaine NIS/YP ou
-+, la commande définit le nom d'hôte, le nom de domaine NIS/YP ou
- le nom de noeud. 
- 
- .LP
- Notez que seul le super-utilisateur peut changer les noms.
- 
- .LP
--Il n'est pas possible de d�finir le nom FQDN ou le nom de domaine DNS avec
-+Il n'est pas possible de définir le nom FQDN ou le nom de domaine DNS avec
- la commande 
- .B dnsdomainname 
-  (voir 
-@@ -119,8 +119,8 @@ la commande
- ci-dessous).
- 
- .LP
--Le nom d'h�te est g�n�rallement d�finit une seule fois, au
--d�marrage du syst�me, par le script de configuration
-+Le nom d'hôte est générallement définit une seule fois, au
-+démarrage du système, par le script de configuration
- .I /etc/rc.d/rc.inet1.
- ou
- .I /etc/init.d/boot
-@@ -132,45 +132,45 @@ Vous pouvez modifier le FQDN (tel que fourni par la commande
- .BR "hostname \-\-fqdn" ) 
- ou le nom de domaine DNS (tel que fourni par la commande
- .BR "dnsdomainname" ) 
--avec cette commande. Le FQDN du syst�me est le nom que le resolveur (
-+avec cette commande. Le FQDN du système est le nom que le resolveur (
- .BR resolver (3)
-- ) retourne comme nom d'h�te. 
-+ ) retourne comme nom d'hôte. 
- 
- .LP
- Techniquement: Le FQDN est le nom fourni par
- .BR gethostbyname (2)
--� partir du nom d'h�te retourn� par
-+à partir du nom d'hôte retourné par
- .BR gethostname (2).
- Le nom de domaine DNS est la partie suivant le premier point.
- .LP
--La fa�on dont vous pouvez le changer d�pend de la configuration
-+La façon dont vous pouvez le changer dépend de la configuration
- (habituellement dans 
--.IR /etc/host.conf )
--. Si le fichier 'hosts' est analys� avant d'interroger le DNS ou 
-+.IR /etc/host.conf ).
-+Si le fichier 'hosts' est analysé avant d'interroger le DNS ou 
- NIS) vous pouvez le changer dans le fichier 
- .IR /etc/hosts .
- 
- .SH OPTIONS
- .TP
- .I "\-a, \-\-alias"
--Affiche l'alias de l'h�te (si utilis�).
-+Affiche l'alias de l'hôte (si utilisé).
- .TP
- .I "\-d, \-\-domain"
- Affiche le nom du domaine DNS. Ne pas utiliser la commande
- .B domainname
--pour obtenir le nom de domaine DNS car vous obtiendrez en r�alit� le
--nom de domaine NIS. Utilisez plut�t la commande
-+pour obtenir le nom de domaine DNS car vous obtiendrez en réalité le
-+nom de domaine NIS. Utilisez plutôt la commande
- .B dnsdomainname 
- .
- .TP
- .I "\-F, \-\-file nom_fichier"
--Lit le nom d'h�te � partir du fichier sp�cifi�. Les commentaires (lignes commen�ant
--par un `#') sont ignor�s.
-+Lit le nom d'hôte à partir du fichier spécifié. Les commentaires (lignes commençant
-+par un `#') sont ignorés.
- .TP
- .I "\-f, \-\-fqdn, \-\-long"
--Affiche le nom pleinement qualifi� - FQDN (Fully Qualified Domain Name). un
--FQDN consiste en un nom d'h�te court et un nom de domaine. A moins que vous
--utilisiez 'bind' ou les NIS pour la recherche d'h�tes, vous pouvez changer
-+Affiche le nom pleinement qualifié - FQDN (Fully Qualified Domain Name). un
-+FQDN consiste en un nom d'hôte court et un nom de domaine. A moins que vous
-+utilisiez 'bind' ou les NIS pour la recherche d'hôtes, vous pouvez changer
- le nom FQDN et le nom de domaine (qui fait partie du FQDN) dans le fichier
- \fI/etc/hosts\fR.
- .TP
-@@ -178,15 +178,15 @@ le nom FQDN et le nom de domaine (qui fait partie du FQDN) dans le fichier
- Affiche un message d'aide et se termine.
- .TP
- .I "\-i, \-\-ip-address"
--Affiche la (les) adresse(s) IP de l'h�te.
-+Affiche la (les) adresse(s) IP de l'hôte.
- .TP
- .I "\-n, \-\-node"
--Affiche le nom de noeud DECnet. Si un param�tre est fourni (ou
-+Affiche le nom de noeud DECnet. Si un paramètre est fourni (ou
- .B \-\-file nom_fichier
--) le super-utilisateur peut �galement d�finir un nouveau nom de neud.
-+) le super-utilisateur peut également définir un nouveau nom de neud.
- .TP
- .I "\-s, \-\-short"
--Affiche le nom d'h�te en format court. Il s'agit du nom d'h�te coup� au
-+Affiche le nom d'hôte en format court. Il s'agit du nom d'hôte coupé au
- premier point.
- .TP
- .I "\-V, \-\-version"
-@@ -197,9 +197,9 @@ termine correctement.
- Mode verbeux.
- .TP
- .I "\-y, \-\-yp, \-\-nis"
--Affiche le nom de domaine NIS. Si un param�tre est fourni (ou
-+Affiche le nom de domaine NIS. Si un paramètre est fourni (ou
- .B \-\-file nom_fichier
--) le super-utilisateur peut �galement d�finir un nouveau nom de domaine NIS.
-+) le super-utilisateur peut également définir un nouveau nom de domaine NIS.
- .SH FICHIERS
- .B /etc/hosts
- .SH AUTEURS
-diff --git a/man/fr_FR/ifconfig.8 b/man/fr_FR/ifconfig.8
-index 0c29eb0..821f164 100644
---- a/man/fr_FR/ifconfig.8
-+++ b/man/fr_FR/ifconfig.8
-@@ -1,160 +1,178 @@
--.TH IFCONFIG 8 "4 August 1997" "net-tools" "Linux Programmer's Manual"
-+.\"
-+.\" Traduction : Jean Michel VANSTEENE <vanstee@worldnet.fr>
-+.\" zz/08/1997
-+.\" Màj zz/08/2004 net-tools-1.60 Guillaume Audirac
-+.\" Màj 17/08/2006 net-tools-1.65 Alain Portal
-+.\"
-+.TH IFCONFIG 8 "30 juin 2005" "net-tools" "Manuel de l'administrateur Linux"
- .SH NOM
--ifconfig \- configure une interface r�seau
-+ifconfig \- Configurer une interface réseau.
- .SH SYNOPSIS
--.B "ifconfig [interface]"
-+.B "ifconfig [\-v] [\-a] [\-s] [interface]"
- .br
--.B "ifconfig interface [aftype] options | adresse ..."
-+.B "ifconfig [\-v] interface [aftype] options | adresse ..."
- .SH DESCRIPTION
--.B Ifconfig
--est utilis� pour configurer (et maintenir ensuite) les interfaces
--r�seau r�sidentes dans le noyau.  Il est utilis� lors du boot pour
--configurer la plupart d'entre-elles et ainsi rendre le syst�me
--op�rationnel.  Apr�s, ce n'est quasiment plus utilis� que pour
--le d�bogage ou pour des r�glages si n�cessaire.
-+.B ifconfig
-+permet de configurer les interfaces réseau présentes dans le noyau.
-+On peut les configurer lors du démarrage quand c'est nécessaire. Ensuite,
-+on l'utilise généralement pour le débogage ou pour d'éventuels réglages.
- .LP
--Si aucun argument n'est donn�,
-+Si aucun argument n'est donné,
- .B ifconfig
--affiche simplement l'�tat des interfaces actuellement d�finies. Si
--seul le param�tre
-+affiche l'état des interfaces actives. Si seul le paramètre
- .B interface
--est donn�, il affiche seulement l'�tat de l'interface correspondante;
--si seul le param�tre
--.B -a
--est fourni, il affiche l'�tat de toutes les interfaces, m�me celles qui
--ne sont pas actives.
--Autrement, il consid�re qu'il faut positionner de nouvelles valeurs.
--
--.SH Familles d'adresses
--Si le premier argument apr�s le nom de l'interface est reconnu comme
--�tant un nom de famille d'adresses support�, cette famille d'adresses
--est utilis�e pour d�coder et afficher toutes les adresses
--protocolaires.  Les familles d'adresses actuellement support�es comprennent
-+est donné, il affiche seulement l'état de l'interface correspondante\ ;
-+si seul le paramètre
-+.B \-a
-+est fourni, il affiche l'état de toutes les interfaces, même celles
-+qui sont inactives. Autrement, il permet de configurer une interface.
-+.SH Familles d'Adresses
-+Si le premier argument après le nom d'interface est reconnu comme
-+le nom d'une famille d'adresses prise en charge, alors cette famille
-+d'adresses est utilisée pour décoder et afficher toutes les adresses
-+du protocole. Les familles d'adresses actuellement prises en charge
-+comprennent
- .B inet
--(TCP/IP, default) 
-+(TCP/IP, par défaut),
-+.B inet6
-+(IPv6),
- .B ax25
--(AMPR Packet Radio.) 
-+(AMPR Packet Radio),
- .B ddp
--(Appletalk Phase 2) and
-+(Appletalk Phase 2),
- .B ipx
--(Novell IPX).
-+(Novell IPX) et
-+.B netrom
-+(AMPR Packet Radio).
- .SH OPTIONS
- .TP
-+.B \-a
-+Afficher toutes les interfaces actuellement disponibles, même celles
-+qui sont inactives.
-+.TP
-+.B \-s
-+Afficher un résumé (comme netstat \-i).
-+.TP
-+.B \-v
-+Mode volubile pour certains types d'erreurs.
-+.TP
- .B interface
--Le nom de l'interface r�seau.  C'est g�n�ralement un nom de pilote suivi
--d'un num�ro d'ordre comme
-+Correspond au nom de l'interface de réseau. C'est généralement un nom de
-+pilote suivi d'un chiffre, comme
- .B eth0
--pour la premi�re interface Ethernet.
-+pour la première interface Ethernet. Si votre noyau accepte les alias
-+d'interfaces, vous pouvez les spécifier avec
-+.B eth0:0
-+pour le premier alias de eth0. On peut les utiliser pour les affecter
-+à une seconde adresse. Pour supprimer un alias d'interface, utilisez
-+.BR "ifconfig eth0:0 down" .
-+Note\ : pour chaque groupe (un même noeud donné par une combinaison
-+adresse/masque de réseau), si vous supprimez le premier alias (le
-+principal), tous les alias sont supprimés.
- .TP
- .B up
--Cette option active l'interface.  Elle est implicitement sp�cifi�e
--si une nouvelle adresse est affect�e � l'interface (voir plus loin).
-+Activer l'interface donnée. Cette option est implicite si une adresse est
-+affectée à l'interface.
- .TP
- .B down
--Cette option arr�te le fonctionnement du pilote pour cette interface, et
--est utilis�e lorsque les choses commencent � aller mal.
-+Désactiver le pilote pour l'interface donnée.
- .TP
- .B "[\-]arp"
--Valide ou invalide l'utilisation du protocole ARP sur cette interface. Si
--le signe moins (\-) est pr�sent, l'option est invalid�e.
-+Activer ou désactiver l'utilisation du protocole ARP sur une interface.
- .TP
- .B "[\-]promisc"
--Valide ou invalide le mode
--.B promiscuous
--.  S'il est valid�, tous les paquets circulant sur le r�seau
--seront re�us sur cette interface.
-+Activer ou désactiver le mode
-+.BR promiscuous .
-+S'il est activé, tous les paquets circulant sur le réseau seront reçus
-+par l'interface.
- .TP
- .B "[\-]allmulti"
--Valide ou invalide le fonctionnement de l'interface en mode
--.B all-multicast
--.  S'il est valid�, tous les paquets multicast circulant sur le r�seau
--seront re�us sur cette interface.
-+Activer ou désactiver le mode
-+.BR all-multicast .
-+S'il est activé, l'interface recevra tous les paquets de multidiffusion
-+circulant sur le réseau.
- .TP
- .B "metric N"
--Ce param�tre d�finit la m�trique de l'interface. Il n'est pour
--l'instant pas impl�ment�, mais le sera prochainement.
-+Définir la métrique de l'interface.
- .TP
- .B "mtu N"
--Ce     param�tre  d�finit le  MTU     (Maximum  Transfer Unit)  d'une
--interface.
-+Définir l'unité de transfert maximum ou MTU («\ Maximum Transfer Unit\ »)
-+d'une interface.
- .TP
--.B "dstaddr adr"
--D�finit l'adresse IP de "l'autre bout" dans le cas d'un lien
--point-�-point, comme PPP. Ce param�tre est obsol�te; utilisez plut�t
--le param�tre 
--.B pointopoint.
-+.B "dstaddr adresse"
-+Définir l'adresse IP distante dans le cas d'un lien point-à-point
-+(comme PPP). Cette option est obsolète\ ; utilisez à la place l'option
-+.BR pointopoint .
- .TP
--.B "netmask adr"
--D�finit le masque de r�seau IP pour cette interface. La valeur par
--d�faut de cette valeur correspond au masque r�seau usuel pour les
--classes A, B ou C (d�duite de l'adresse IP), mais toute autre valeur peut
--�tre d�finie selon les besoins en sous-r�seaux.
-+.B "netmask adresse"
-+Définir le masque de réseau IP pour cette interface. La valeur par
-+défaut correspond au masque de réseau usuel pour les classes A, B ou C
-+(déduite de l'adresse IP), mais une autre valeur peut être définie.
- .TP
--.B "add adr/lg_prefix"
--Ajoute une adresse IPv6 � une interface. 
-+.B "add adresse/long_préfixe"
-+Ajouter une adresse IPv6 à une interface.
- .TP
--.B "del adr/lg_prefix"
--Supprime une adresse IPv6 d'une interface.
-+.B "del adresse/long_préfixe"
-+Supprimer une adresse IPv6 d'une interface.
- .TP
- .B "tunnel aa.bb.cc.dd"
--Cr�e un nouveau p�riph�rique SIT (IPv6-dans-IPv4), en mode
--tunnel jusqu'� la destination.
-+Créer un nouveau périphérique SIT (IPv6-dans-IPv4), fonctionnant en mode
-+tunnel jusqu'à la destination donnée.
- .TP
--.B "irq adr"
--D�finit la ligne d'interruption utilis�e par ce
--p�riph�rique. Certains p�riph�riques ne supportent pas le
--changement dynamique de l'IRQ.
-+.B "irq adresse"
-+Définir la ligne d'interruption utilisée par un périphérique.
-+Certains périphériques ne sont pas capables de changer
-+dynamiquement d'IRQ.
- .TP
--.B "io_addr adr"
--D�finit pour ce p�riph�rique, l'adresse de d�but dans l'espace
--d'entr�e-sortie I/O.
-+.B "io_addr adresse"
-+Définir l'adresse de début dans l'espace d'entrée-sortie pour un
-+périphérique.
- .TP
--.B "mem_start adr"
--D�finit l'adresse de d�but de m�moire partag�e pour ce p�riph�rique. Seuls
--quelques p�riph�riques ont besoin de ce param�tre.
-+.B "mem_start adresse"
-+Définir l'adresse de début de la mémoire partagée utilisée par un
-+périphérique. Peu de périphériques ont besoin de ce paramètre.
- .TP
- .B "media type"
--D�finit le port physique ou le type de medium utilis� par ce p�riph�rique.
--Tous les p�riph�riques ne peuvent pas changer de configuration et les
--valeurs support�es varient de l'un � l'autre. Les valeur typiques sont
-+Définir le port physique ou le type de médium utilisé par le périphérique.
-+Tous les périphériques ne peuvent pas changer cette configuration et les
-+types acceptés varient de l'un à l'autre. Les valeurs habituelles du
-+.B type
-+sont
- .B 10base2
- (Ethernet fin),
- .B 10baseT
--(10Mbps Ethernet paire torsad�e),
--.B AUI 
--(transceiver externe) etc.  Le type
-+(Ethernet 10Mbps en paire torsadée),
-+.B AUI
-+(émetteur-récepteur externe), etc. Le médium spécial de type
- .B auto
--permet d'indiquer au pilote de d�tecter automatiquement le medium
--utilis�. Une fois de plus, tous les p�riph�riques ne supportent pas cette
--option.
--.TP
--.B "[-]broadcast [adr]"
--Si l'adresse est �galement donn�e, d�finit l'adresse broadcast
--protocolaire pour cette interface. Autrement, il permet d'armer (ou d�sarmer)
--l'indicateur
-+permet d'indiquer au pilote de détecter automatiquement le médium utilisé.
-+Une fois de plus, tous les pilotes n'acceptent pas cette option.
-+.TP
-+.B "[\-]broadcast [adresse]"
-+Si l'adresse est donnée, elle définit l'adresse de diffusion du
-+protocole pour cette interface. Autrement, on arme
-+(ou désarme) l'indicateur
- .B IFF_BROADCAST
- de l'interface.
- .TP
--.B "[-]pointopoint [adr]"
--Ce mot cl� valide le mode
--.B point-�-point
--d'une interface, signifiant qu'il existe un lien direct entre 2 machines,
--sans que personne d'autre ne puisse �tre � l'�coute.
-+.B "[\-]pointopoint [adresse]"
-+Valider le mode
-+.B point-à-point
-+d'une interface, signifiant qu'il existe un lien direct entre 2\ machines,
-+sans que personne d'autre ne puisse être à l'écoute.
- .br
--Si l'argument d'adresse est �galement donn�, il d�finit l'adresse
--de l'autre machine, de la m�me mani�re que le param�tre obsol�te
--.B dstaddr
--.
--Autrement il arme (ou d�sarme) l'indicateur 
-+Si l'adresse est également donnée, cela définit l'adresse de
-+protocole de l'autre machine, de la même manière que l'option obsolète
-+.BR dstaddr .
-+Autrement, il arme (ou désarme) l'indicateur 
- .B IFF_POINTOPOINT
- de l'interface.
- .TP
- .B hw classe adresse
--D�finit l'adresse mat�rielle de l'interface, si le pilote du
--p�riph�rique supporte cette op�ration. Le mot cl� doit �tre
--suivi du nom de la classe mat�rielle et de l'adresse mat�rielle en
--caract�res imprimables ASCII. Les classes mat�rielles actuellement
--support�es comprennent 
-+Définir l'adresse matérielle de l'interface, si le pilote du périphérique
-+accepte cette opération. L'option doit être suivie du nom de la classe
-+matérielle et de l'adresse matérielle en caractères ASCII affichables.
-+Les classes matérielles actuellement prises en charge comprennent
- .B ether
- (Ethernet),
- .B ax25
-@@ -165,45 +183,82 @@ et
- (AMPR NET/ROM).
- .TP
- .B multicast
--Positionne l'indicateur multicast sur l'interface. Elle n'est
--g�n�ralement pas n�cessaire puisque les pilotes positionnent
--l'option correcte eux m�me.
-+Positionner l'indicateur de multidiffusion sur l'interface. Ce n'est
-+généralement pas nécessaire puisque les pilotes positionnent correctement
-+l'option eux-mêmes.
- .TP
- .B adresse
--L'adresse IP de cette interface.
-+Correspond à l'adresse IP affectée à cette interface.
- .TP
--.B txqueuelen length
--Set the length of the transmit queue of the device. It is useful to set this
--to small values for slower devices with a high latency (modem links, ISDN)
--to prevent fast bulk transfers from disturbing interactive traffic like
--telnet too much. 
-+.B txqueuelen longueur
-+Définir la longueur de la file d'attente de transmission du périphérique.
-+Il est utile de la fixer à des valeurs faibles pour les périphériques
-+lents avec un temps d'attente important (modems, ISDN), pour empêcher
-+d'être perturbé par de rapides transferts de masse issus des trafics
-+interactifs, comme
-+.BR telnet .
- .SH NOTES
--Depuis le noyau 2.2 il n'y a plus de statistiques d'interface explicite
--pour les interfaces en alias. Les statistiques affich�es pour la v�ritable
--adresse sont partag�es avec toutes les adresses alias du m�me p�riph�rique.
--Si vous voulez des adresses par interface, vous devez ajouter des r�gles de
--comptabilit� particuli�res pour l'adresse en utilisant la commande 
--.BR ipchains(8)
--.
--
-+Depuis la version 2.2 du noyau, il n'y a plus de statistiques d'interface
-+explicites pour les alias d'interfaces. Les statistiques affichées pour la
-+véritable adresse sont partagées avec toutes les adresses d'alias du même
-+périphérique. Pour avoir des statistiques par adresse, il faut ajouter
-+des règles de comptabilité particulières pour l'adresse en utilisant
-+la commande
-+.BR ipchains (8)
-+ou
-+.BR iptables (8).
-+.LP
-+Depuis net-tools 1.61,
-+.B ifconfig
-+affiche les compteurs d'octets et ceux lisibles par un utilisateur en
-+unités IEC\ 60027-2. Ainsi, 1\ KiB vaut 2^10 octets. Notez que les nombres
-+sont tronqués à la première décimale (ce qui peut être une erreur importante
-+si vous considérez que 0,1\ PiB vaut 112.589.990.684.262\ octets\ :)
-+.LP
-+Des problèmes d'interruption avec les pilotes de périphériques Ethernet
-+apparaissent avec EAGAIN
-+(\fISIOCSIIFLAGS\ : Ressource temporairement indisponible\fR)
-+il s'agit sûrement d'un conflit d'interruptions. Voir
-+.I http://www.scyld.com/expert/irq-conflict.html
-+pour plus d'informations.
- .SH FICHIERS
--.I /proc/net/socket 
-+.I /proc/net/socket
- .br
- .I /proc/net/dev
- .br
- .I /proc/net/if_inet6
--.SH BUGS
--M�me si les adresses appletalk DDP et IPX peuvent �tre affich�es,
--elles ne peuvent �tre modifi�es avec cette commande.
-+.SH BOGUES
-+Même si les adresses appletalk DDP et IPX peuvent être affichées,
-+elles ne peuvent être modifiées avec cette commande.
- .SH VOIR AUSSI
--route(8), netstat(8), arp(8), rarp(8), ipchains(8)
--.SH AUTHORS
-+.BR route (8),
-+.BR netstat (8),
-+.BR arp (8),
-+.BR rarp (8),
-+.BR ipchains (8),
-+.BR iptables (8)
-+.br
-+http://physics.nist.gov/cuu/Units/binary.html \- Préfixes
-+pour les multiples binaires.
-+.SH AUTEURS
- Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
- .br
- Alan Cox, <Alan.Cox@linux.org>
- .br
- Phil Blundell, <Philip.Blundell@pobox.com>
- .br
--Andi Kleen, 
-+Andi Kleen,
-+.br
-+Bernd Eckenfels, <net-tools@lina.inka.de>
- .SH TRADUCTION
--Jean-Michel VANSTEENE (vanstee@worldnet.fr)
-+.PP
-+Ce document est une traduction réalisée par Jean Michel Vansteene
-+<vanstee\ AT\ worldnet\ DOT\ fr> en août\ 1997,
-+mise à jour par Guillaume Audirac en août 2004
-+et révisée le 17\ août\ 2006.
-+.PP
-+L'équipe de traduction a fait le maximum pour réaliser une adaptation
-+française de qualité. La version anglaise la plus à jour de ce document est
-+toujours consultable via la commande\ : «\ \fBLANG=C\ man\ 8\ ifconfig\fR\ ».
-+N'hésitez pas à signaler à l'auteur ou au traducteur, selon le cas, toute
-+erreur dans cette page de manuel.
-diff --git a/man/fr_FR/netstat.8 b/man/fr_FR/netstat.8
-index bf16bc6..c65d0be 100644
---- a/man/fr_FR/netstat.8
-+++ b/man/fr_FR/netstat.8
-@@ -8,11 +8,11 @@
- .\" Modified: Tuan Hoang tuan@optimus.mitre.org 
- .\"
- .\"
--.TH NETSTAT 8 "25 F�v 1999" "net-tools" "Linux Programmer's Manual"
-+.TH NETSTAT 8 "2007-12-02" "net-tools" "Linux Administrator's Manual"
- 
- .SH NAME
--netstat \- Affiche les connexions r�seau, les tables de routage, les
--statistiques des interfaces, les connexions masqu�es, les messages netlink,
-+netstat \- Affiche les connexions réseau, les tables de routage, les
-+statistiques des interfaces, les connexions masquées, les messages netlink,
- et les membres multicast.
- 
- .SH SYNOPSIS
-@@ -21,6 +21,8 @@ et les membres multicast.
- .RB [ \-venaoc ]
- .RB [ \-\-tcp | \-t ]
- .RB [ \-\-udp | \-u ]
-+.RB [ \-\-udplite | \-U ]
-+.RB [ \-\-sctp | \-S ]
- .RB [ \-\-raw | \-w ]
- .RB [ \-\-groups | \-g ]
- .RB [ \-\-unix | \-x ] 
-@@ -68,34 +70,34 @@ et les membres multicast.
- .PP
- .SH DESCRIPTION
- .B Netstat
--affiche les informations du sous-syst�me r�seau de Linux
-+affiche les informations du sous-système réseau de Linux
- 
- .SS "(no option)"
--Vous pouvez voir l'�tat des connexions r�seau en listant les sockets
--ouvertes. C'est l'option par d�faut : si vous ne sp�cifiez aucune famille
-+Vous pouvez voir l'état des connexions réseau en listant les sockets
-+ouvertes. C'est l'option par défaut : si vous ne spécifiez aucune famille
- d'adresses, les sockets actives de toutes les familles d'adresses seront
--affich�es.
--Avec le param�tre
-+affichées.
-+Avec le paramètre
- .B -e
--vous obtenez quelques informations suppl�mentaires (userid). Avec le param�tre
-+vous obtenez quelques informations supplémentaires (userid). Avec le paramètre
- .B -v
--vous pouvez demander � netstat de signaler des familles d'adresses connues
--non support�es par le noyau. Le param�tre
-+vous pouvez demander à netstat de signaler des familles d'adresses connues
-+non supportées par le noyau. Le paramètre
- .B -o
--affiche des informations suppl�mentaires sur les timers r�seau. En donnant
--le param�tre
-+affiche des informations supplémentaires sur les timers réseau. En donnant
-+le paramètre
- .B -p
--vous verrez le PID et le nom du processus � qui appartient la socket. Le param�tre
-+vous verrez le PID et le nom du processus à qui appartient la socket. Le paramètre
- .B -a
--affiche toutes les sockets, y compris les sockets d'�coute des serveurs. La famille
-+affiche toutes les sockets, y compris les sockets d'écoute des serveurs. La famille
- d'adresses
- .B inet
- affiche les sockets raw, udp et tcp.
- 
- .SS "\-r, \-\-route"
--Avec le param�tre
-+Avec le paramètre
- .BR \-r ", " \-\-route
--vous pouvez visualiser les tables de routage dans le m�me format qu'avec la
-+vous pouvez visualiser les tables de routage dans le même format qu'avec la
- commande
- .B "route -e" 
- .
-@@ -104,44 +106,44 @@ utilisera le format de la commande
- .BR route .
- Veuillez consulter
- .BR route (8)
--pour plus de d�tails.
-+pour plus de détails.
- 
--.SS "\-i, \-\-interface \fIiface\fI"
-+.SS "\-i, \-\-interfaces \fIiface\fI"
- Si vous utilisez l'option
- .BR -i ", " --interfaces
- , une table de toutes (ou de l'interface
- .IR iface 
--sp�cifi�e) les interfaces r�seau sera affich�e. Le format de sortie est le
--m�me que celui de la commande
-+spécifiée) les interfaces réseau sera affichée. Le format de sortie est le
-+même que celui de la commande
- .B "ifconfig -e"
--, et est d�crit dans
-+, et est décrit dans
- .BR ifconfig (8).
- .B "netstat -ei"
--affiche une table ou une seule entr�e d'interface comme la commande 
--.B ifconfig
--. Avec le param�tre
-+affiche une table ou une seule entrée d'interface comme la commande 
-+.BR ifconfig .
-+Avec le paramètre
- .B -a
--, vous pouvez inclure les interfaces qui ne sont pas configur�es (c.a.d qui
-+, vous pouvez inclure les interfaces qui ne sont pas configurées (c.a.d qui
- n'ont pas l'indicateur
- .BR U = UP
--arm�).
-+armé).
- 
- .SS "\-M, \-\-masquerade"
- 
--Permet de voir les sessions ayant de l'IP-masquerade. Avec le param�tre
-+Permet de voir les sessions ayant de l'IP-masquerade. Avec le paramètre
- .B -e 
--vous pouvez inclure quelques informations concernant les num�ros de
--s�quence et les deltas caus�s par des r��critures de donn�es sur des
--sessions FTP (commande PORT). Le support de l'IP-Masquerade est utilis�
--pour cacher au monde ext�rieur des h�tes appartenant � un r�seau (et ayant
--des adresses) non officiel, tel que d�crit dans
--.BR ipfw (4), ipfwadm "(8) et " ipfw (8).
-+vous pouvez inclure quelques informations concernant les numéros de
-+séquence et les deltas causés par des réécritures de données sur des
-+sessions FTP (commande PORT). Le support de l'IP-Masquerade est utilisé
-+pour cacher au monde extérieur des hôtes appartenant à un réseau (et ayant
-+des adresses) non officiel, tel que décrit dans
-+.BR iptables (8).
- 
- .SS "\-N, \-\-netlink"
- 
--Les noyaux r�cents supportent une communication avec l'utilisateur appel�e
--netlink. Vous pouvez obtenir des messages relatifs � la cr�ation, la
--suppression d'interfaces ou de routes � partir de 
-+Les noyaux récents supportent une communication avec l'utilisateur appelée
-+netlink. Vous pouvez obtenir des messages relatifs à la création, la
-+suppression d'interfaces ou de routes à partir de 
- .I /dev/route
- (36,0).
- 
-@@ -149,23 +151,23 @@ suppression d'interfaces ou de routes 
- .SH OPTIONS
- .SS "\-v, \-\-verbose"
- active le mode verbeux. Affiche quelques informations utiles concernant les
--familles d'adresses non configur�es.
-+familles d'adresses non configurées.
- 
- .SS "\-n, \-\-numeric"
--affiche les adresses en format num�rique au lieu d'essayer de d�terminer le
--nom symbolique d'h�te, de port ou d'utilisateur.
-+affiche les adresses en format numérique au lieu d'essayer de déterminer le
-+nom symbolique d'hôte, de port ou d'utilisateur.
- 
- .SS "\-p, \-\-programs"
--affiche le nom et le PID des processus propri�taires de chaque socket
--d�crite. Vous devez �tre le propri�taire d'un processus pour visualiser les
--sockets qui lui appartiennent ou �tre l'utilisateur
-+affiche le nom et le PID des processus propriétaires de chaque socket
-+décrite. Vous devez être le propriétaire d'un processus pour visualiser les
-+sockets qui lui appartiennent ou être l'utilisateur
- .B root
- pour disposer de toutes les informations.
- 
- .SS "\-A, \-\-af \fIfamille\fI"
--utilise une m�thode diff�rente pour affecter les familles d'adresses.
-+utilise une méthode différente pour affecter les familles d'adresses.
- .I famille 
--est une liste de familles d'adresses s�par�es par des (',') telles que
-+est une liste de familles d'adresses séparées par des (',') telles que
- .BR inet , 
- .BR unix , 
- .BR ipx , 
-@@ -173,7 +175,7 @@ est une liste de familles d'adresses s
- .B netrom 
- et
- .BR ddp .
--L'utilisation des options longues suivantes a le m�me effet
-+L'utilisation des options longues suivantes a le même effet
- .BR \-\-inet ,
- .BR \-\-unix ,
- .BR \-\-ipx ,
-@@ -183,9 +185,9 @@ et
- .BR \-\-ddp.
- 
- .SS "\-c, \-\-continous"
--Demandera � 
-+Demandera à 
- .B netstat
--d'afficher la table s�lectionn�e chaque seconde jusqu'� ce que vous
-+d'afficher la table sélectionnée chaque seconde jusqu'à ce que vous
- l'interrompiez.
- 
- .PP
-@@ -195,102 +197,102 @@ l'interrompiez.
- .SS Connexions Internet actives \fR(TCP, UDP, RAW)\fR
- 
- .SS "Proto" 
--Le protocole (TCP, UDP, RAW) utilis� par la socket. 
-+Le protocole (TCP, UDP, RAW) utilisé par la socket. 
- 
- .SS "Recv-Q"
--Le nombre d'octets non encore lus par le programme utilisateur connect�
--� cette socket.
-+Le nombre d'octets non encore lus par le programme utilisateur connecté
-+à cette socket.
- 
- .SS "Send-Q"
--Le nombre d'octets non encore acquitt�s par l'h�te distant.
-+Le nombre d'octets non encore acquittés par l'hôte distant.
- 
- .SS "Local Address (Adresse locale)" 
--L'adresse locale (nom d'h�te local) et num�ro de port de la
-+L'adresse locale (nom d'hôte local) et numéro de port de la
- socket. Sauf si l'option
- .B -n
--est donn�e, l'adresse de la prise est traduite en nom d'h�te,
--et le num�ro de port est traduit en nom de service correspondant.
-+est donnée, l'adresse de la prise est traduite en nom d'hôte,
-+et le numéro de port est traduit en nom de service correspondant.
- 
- .SS "Foreign Address (Adresse distante)"
--L'adresse distante (nom d'h�te distant) et le num�ro de port de
--la prise. Comme pour l'adresse locale et le num�ro de port, l'option
-+L'adresse distante (nom d'hôte distant) et le numéro de port de
-+la prise. Comme pour l'adresse locale et le numéro de port, l'option
- .B -n
--invalide la traduction du nom d'h�te et de service.
-+invalide la traduction du nom d'hôte et de service.
- 
- .SS "State (Etat)"
--L'�tat de la socket. Puisqu'il n'y a pas d'�tat dans le mode RAW
--et g�n�ralement pas d'�tat utilis� en UDP, cette colonne
-+L'état de la socket. Puisqu'il n'y a pas d'état dans le mode RAW
-+et généralement pas d'état utilisé en UDP, cette colonne
- peut se trouver vierge. Normalement, on trouvera une des valeur suivante:
- 
- .TP
- .I
- ESTABLISHED
--La socket a une connexion �tablie.
-+La socket a une connexion établie.
- .TP
- .I
- SYN_SENT
--La socket attend activement d'�tablir une connexion.
-+La socket attend activement d'établir une connexion.
- .TP
- .I
- SYN_RECV
--Une requ�te de connexion a �t� re�ue du r�seau.
-+Une requête de connexion a été reçue du réseau.
- .TP
- .I
- FIN_WAIT1
--La socket est ferm�e, et la connexion est en cours de terminaison.
-+La socket est fermée, et la connexion est en cours de terminaison.
- .TP
- .I
- FIN_WAIT2
--La connexion est ferm�e, et la socket attend une terminaison du distant.
-+La connexion est fermée, et la socket attend une terminaison du distant.
- .TP
- .I
- TIME_WAIT
--La socket attend le traitement de tous les paquets encore sur le r�seau
-+La socket attend le traitement de tous les paquets encore sur le réseau
- avant d'entreprendre la fermeture.
- .TP
- .I
--CLOSED
--La socket n'est pas utilis�e.
-+CLOSE
-+La socket n'est pas utilisée.
- .TP
- .I
- CLOSE_WAIT
--Le distant a arr�t�, attendant la fermeture de la socket.
-+Le distant a arrêté, attendant la fermeture de la socket.
- .TP
- .I
- LAST_ACK
--Le distant termine, et la socket est ferm�e. Attente d'acquittement.
-+Le distant termine, et la socket est fermée. Attente d'acquittement.
- .TP
- .I
- LISTEN
--La socket est � l'�coute de connexions entrantes. Ces sockets ne sont
--affich�es que si le param�tre
-+La socket est à l'écoute de connexions entrantes. Ces sockets ne sont
-+affichées que si le paramètre
- .BR -a , --listening
- est fourni.
- .TP
- .I
- CLOSING
--Les deux prises sont arr�t�es mais toutes les donn�es locales n'ont
--pas encore �t� envoy�es.
-+Les deux prises sont arrêtées mais toutes les données locales n'ont
-+pas encore été envoyées.
- .TP
- .I
- UNKNOWN
--L'�tat de la prise est inconnu.
-+L'état de la prise est inconnu.
- 
- .SS "User (Utilisateur)"
--Le nom d'utilisateur ou l'UID du propri�taire de la socket.
-+Le nom d'utilisateur ou l'UID du propriétaire de la socket.
- 
- .SS "PID/Program name (PID/Nom de Programme)"
--Le PID et le nom du programme (s�par�s par un slash) propri�taire de la
--socket. Le param�tre
-+Le PID et le nom du programme (séparés par un slash) propriétaire de la
-+socket. Le paramètre
- .B -p
- active l'affichage de cette colonne. Vous devez avoir les droits de
- .B root
--puisque vous devez avoir les droits d'acc�s aux processus pour visualiser
-+puisque vous devez avoir les droits d'accès aux processus pour visualiser
- les sockets qui lui correspondent. Ces informations ne sont pas disponibles
- avec les sockets IPX.
- 
- .SS "Timer"
--(Ceci doit �tre r�dig�)
-+(Ceci doit être rédigé)
- 
- 
- .PP
-@@ -298,28 +300,28 @@ avec les sockets IPX.
- 
- 
- .SS "Proto" 
--Le protocole (habituellement UNIX) utilis� par la socket.
-+Le protocole (habituellement UNIX) utilisé par la socket.
- 
- .SS "RefCnt"
--Le nombre de r�f�rences (i.e. processus attach�s via cette socket).
-+Le nombre de références (i.e. processus attachés via cette socket).
- 
- .SS "Flags (indicateurs)"
--Les indicateurs affich�e sont SO_ACCEPTON (affich�  
-+Les indicateurs affichée sont SO_ACCEPTON (affiché  
- .BR ACC ),
- SO_WAITDATA 
- .RB ( W )
- ou SO_NOSPACE 
- .RB ( N ). 
--SO_ACCECPTON est utilis� pour les sockets
--non-connect�es si les processus correspondant sont en attente de
--demande de connexion. Les autres indicateurs sont d'un int�r�t limit�.
-+SO_ACCECPTON est utilisé pour les sockets
-+non-connectées si les processus correspondant sont en attente de
-+demande de connexion. Les autres indicateurs sont d'un intérêt limité.
- 
- .SS "Type"
--Il y a diff�rents types d'acc�s aux sockets :
-+Il y a différents types d'accès aux sockets :
- .TP
- .I
- SOCK_DGRAM
--La prise est utilis�e en mode Datagram (sans connexion).
-+La prise est utilisée en mode Datagram (sans connexion).
- .TP
- .I
- SOCK_STREAM
-@@ -327,90 +329,89 @@ C'est une socket `stream' (connexion).
- .TP
- .I
- SOCK_RAW
--La prise est utilis�e en mode `raw'.
-+La prise est utilisée en mode `raw'.
- .TP
- .I
- SOCK_RDM
--Celle-ci est utilis�e pour les messages d�livr�e de mani�re fiable.
-+Celle-ci est utilisée pour les messages délivrée de manière fiable.
- .TP
- .I
- SOCK_SEQPACKET
--C'est une socket en mode paquets s�quentiels.
-+C'est une socket en mode paquets séquentiels.
- .TP
- .I
- SOCK_PACKET
--Prise d'acc�s � l'interface RAW.
-+Prise d'accès à l'interface RAW.
- .TP
- .I
- UNKNOWN
--Qui sait ce que l'avenir nous r�serve - Juste � remplir ici :-)
-+Qui sait ce que l'avenir nous réserve - Juste à remplir ici :-)
- 
- .PP
- .SS "State (Etat)"
--Ce champ contient un des mots cl�s suivants :
-+Ce champ contient un des mots clés suivants :
- .TP
- .I
- FREE
--La socket n'est pas allou�e
-+La socket n'est pas allouée
- .TP
- .I
- LISTENING
--La socket est � l'�coute de demandes de connexions. Ces sockets ne sont
--affich�es que si le param�tre
-+La socket est à l'écoute de demandes de connexions. Ces sockets ne sont
-+affichées que si le paramètre
- .BR -a , --listening
- est fourni.
- .TP
- .I
- CONNECTING
--La prise est en cours d'�tablissement de connexion.
-+La prise est en cours d'établissement de connexion.
- .TP
- .I
- CONNECTED
--La socket est connect�e.
-+La socket est connectée.
- .TP
- .I
- DISCONNECTING
--La socket est en cours de d�connexion.
-+La socket est en cours de déconnexion.
- .TP
- .I
- (empty)
--La socket n'est connect�e � aucune autre.
-+La socket n'est connectée à aucune autre.
- .TP
- .I
- UNKNOWN
--Cet �tat ne devrait pas appara�tre.
-+Cet état ne devrait pas apparaître.
- 
- .SS "PID/Program name (PID/Nom de programme"
--Le PID et le nom du programme propri�taire de la socket. Plus
-+Le PID et le nom du programme propriétaire de la socket. Plus
- d'informations sont disponibles dans la section
- .B "Connexions Internet actives"
- ci-dessus.
- 
- .SS "Path (chemin)"
--Affiche le chemin correspondant � l'attachement des processus � la socket.
-+Affiche le chemin correspondant à l'attachement des processus à la socket.
- 
- .PP
- .SS Sockets IPX actives
- 
--(� faire par quelqu'un qui conna�t)
-+(à faire par quelqu'un qui connaît)
- 
- .PP
- .SS Sockets NET/ROM actives
- 
--(� faire par quelqu'un qui conna�t)
-+(à faire par quelqu'un qui connaît)
- 
- .PP
- .SS Sockets AX.25 actives
- 
--(� faire par quelqu'un qui conna�t)
-+(à faire par quelqu'un qui connaît)
- 
- .PP
- .SH NOTES
- Depuis la version 2.2 du noyau, netstat -i n'affiche plus les statistiques
- des interfaces alias. Pour obtenir les compteurs par interface alias, vous
--devez d�finir des r�gles sp�cifiques � l'aide de la commande
--.BR ipchains(8) 
--.  
-+devez définir des règles spécifiques à l'aide de la commande
-+.BR iptables(8).
- 
- .SH FICHIERS
- .ta
-@@ -418,7 +419,7 @@ devez d
- -- Le fichier de correspondance des services
- 
- .I /proc/net/dev
---- informations p�riph�riques
-+-- informations périphériques
- 
- .I /proc/net/raw
- -- informations sockets RAW
-@@ -471,31 +472,28 @@ devez d
- .SH VOIR AUSSI
- .BR route (8), 
- .BR ifconfig (8), 
--.BR ipfw (4), 
--.BR ipfw (8), 
--.BR ipfwadm (8)
--.BR ipchains (8)
-+.BR iptables (8)
- 
- .PP
- .SH BUGS
--Des informations �tranges peuvent apparaitre occasionnellement
--si une socket change d'�tat au moment ou elle est visualis�e.
-+Des informations étranges peuvent apparaitre occasionnellement
-+si une socket change d'état au moment ou elle est visualisée.
- Ceci est peut probable.
- .br
--Le param�tre
-+Le paramètre
- .B netstat -i
--est d�crit tel qu'il fonctionnera lorsque le code de la version BETA du
--paquetage net-tools aura �t� nettoy�.
-+est décrit tel qu'il fonctionnera lorsque le code de la version BETA du
-+paquetage net-tools aura été nettoyé.
- 
- .PP
- .SH AUTEURS
--L'interface utilisateur de netstat a �t� d�velopp�e par
-+L'interface utilisateur de netstat a été développée par
- Fred Baumgarten <dc6iq@insu1.etec.uni-karlsruhe.de>. Les pages du
--manuel essentiellement �crites par Matt Welsh
--<mdw@tc.cornell.edu>. Mis � jour par Alan Cox <Alan.Cox@linux.org>.
-+manuel essentiellement écrites par Matt Welsh
-+<mdw@tc.cornell.edu>. Mis à jour par Alan Cox <Alan.Cox@linux.org>.
- .br
- La page de manuel et la commande incluse dans le paquetage net-tools
--a �t� totallement r��crite par Bernd Eckenfels 
-+a été totallement réécrite par Bernd Eckenfels 
- <ecki@linux.de>.
- .SH TRADUCTION
- Jean Michel VANSTEENE (vanstee@worldnet.fr)
-diff --git a/man/fr_FR/plipconfig.8 b/man/fr_FR/plipconfig.8
-index cd44449..4d17ea2 100644
---- a/man/fr_FR/plipconfig.8
-+++ b/man/fr_FR/plipconfig.8
-@@ -1,44 +1,44 @@
- .TH PLIPCONFIG 8 "17 February 1995" "" ""
- .SH NOM
--plipconfig \- r�glage fin des param�tres du p�riph�rique PLIP
-+plipconfig \- réglage fin des paramètres du périphérique PLIP
- .SH SYNOPSIS
- .B "plipconfig interface"
- .br
- .B "plipconfig interface [nibble NN] [trigger NN] [unit NN]"
- .SH DESCRIPTION
- .B Plipconfig
--est utilis� pour am�liorer (esp�rons-le) les performances PLIP
--en changeant les timings par d�faut utilis�s par le protocole PLIP. Les
--r�sultats d�pendent du port parall�le
--utilis�, du cable, et de la vitesse CPU de chaque machine
--� chaque bout du lien PLIP.
-+est utilisé pour améliorer (espérons-le) les performances PLIP
-+en changeant les timings par défaut utilisés par le protocole PLIP. Les
-+résultats dépendent du port parallèle
-+utilisé, du cable, et de la vitesse CPU de chaque machine
-+à chaque bout du lien PLIP.
- .LP
- Si le seul argument est l'
- .B interface
- ,
- .B plipconfig
--affiche seulement l'�tat de cette interface. Autrement, il essaiera de
--positionner les options donn�es.
-+affiche seulement l'état de cette interface. Autrement, il essaiera de
-+positionner les options données.
- .SH OPTIONS
- .TP
- .B "nibble NN"
--D�finit la valeur d'attente des digits en microsecondes. Par d�fault : 3000.
-+Définit la valeur d'attente des digits en microsecondes. Par défault : 3000.
- .TP
- .B "trigger NN"
--D�finit le d�lai de d�clenchement en microsecondes. Par d�fault : 500.
-+Définit le délai de déclenchement en microsecondes. Par défault : 500.
- .LP
--La vitesse de PLIP peut, dans certains cas, �tre am�lior�e en
--diminuant les valeurs par d�faut.
-+La vitesse de PLIP peut, dans certains cas, être améliorée en
-+diminuant les valeurs par défaut.
- Les valeurs trop petites peuvent engendrer une utilisation excessive de CPU,
--et un temps de r�ponse aux interruptions mauvais, dont le r�sultat est
--la perte de caract�res lus sur le port, ou de paquets PLIP.
-+et un temps de réponse aux interruptions mauvais, dont le résultat est
-+la perte de caractères lus sur le port, ou de paquets PLIP.
- La modification du MTU PLIP peut aussi affecter la vitesse PLIP.
- .SH NOTE
--Si vous n'obtenez aucune r�ponse, il est fort probable que l'IRQ configur�e
--soit mauvaise, et qu'elle n�cessite une configuration avec ifconfig.
--Les quelques cas pour lesquels les timings par d�faut sont trop courts,
--arrivent lorque l'on utilise de longs cables. Quelque chose � ne pas faire,
--puisque le port parall�le n'est pas fait pour fonctionner avec de longs cables.
-+Si vous n'obtenez aucune réponse, il est fort probable que l'IRQ configurée
-+soit mauvaise, et qu'elle nécessite une configuration avec ifconfig.
-+Les quelques cas pour lesquels les timings par défaut sont trop courts,
-+arrivent lorque l'on utilise de longs cables. Quelque chose à ne pas faire,
-+puisque le port parallèle n'est pas fait pour fonctionner avec de longs cables.
- .SH VOIR AUSSI
- .I ifconfig(8)
- .SH BUGS
-diff --git a/man/fr_FR/rarp.8 b/man/fr_FR/rarp.8
-index 73e9328..e68730f 100644
---- a/man/fr_FR/rarp.8
-+++ b/man/fr_FR/rarp.8
-@@ -1,6 +1,6 @@
--.TH RARP 8 "4 Ao�t 1997" "net-tools" "Linux Programmer's Manual"
-+.TH RARP 8 "4 Août 1997" "net-tools" "Linux Administrator's Manual"
- .SH NOM
--rarp \- manipule la table syst�me RARP
-+rarp \- manipule la table système RARP
- .SH SYNOPSIS
- .B "rarp [-V] [--version] [-h] [--help]"
- .br
-@@ -11,30 +11,30 @@ rarp \- manipule la table syst
- .B "rarp [-v] [-t type] -s nom_d_hote adr_materiel"
- .SH DESCRIPTION
- .B Rarp
--manipule la table RARP du noyau de diff�rentes fa�ons.  Les options de base
--permettent d'effacer une entr�e de correspondance d'adresses et d'en
--red�finir une manuellement.  Pour des besoins de d�bogage, le programme
-+manipule la table RARP du noyau de différentes façons.  Les options de base
-+permettent d'effacer une entrée de correspondance d'adresses et d'en
-+redéfinir une manuellement.  Pour des besoins de débogage, le programme
- .B rarp
--permet aussi de vider compl�tement la table RARP.
-+permet aussi de vider complètement la table RARP.
- .SH OPTIONS
- .TP
- .B \-V
--Affiche la version de RARP utilis�.
-+Affiche la version de RARP utilisé.
- .TP
- .B \-v
--Dit � l'utilisateur ce qui se passe, en �tant verbeux.
-+Dit à l'utilisateur ce qui se passe, en étant verbeux.
- .TP
- .B "\-t type"
--En d�finissant ou lisant la table RARP, ce param�tre optionnel dit �
-+En définissant ou lisant la table RARP, ce paramètre optionnel dit à
- .B rarp
--quelles classes d'entr�es il doit contr�ler.  La valeur par d�faut de
--ce param�tre est
-+quelles classes d'entrées il doit contrôler.  La valeur par défaut de
-+ce paramètre est
- .B ether
--(i.e. code mat�riel
-+(i.e. code matériel
- .B 0x01
- pour
- .B "IEEE 802.3 10Mbps Ethernet".
--D'autres valeurs doivent correspondre � des technologies r�seaux telles que
-+D'autres valeurs doivent correspondre à des technologies réseaux telles que
- .B AX.25 (ax25).
- et
- .B NET/ROM (netrom).
-@@ -42,31 +42,31 @@ et
- .B "\-a"
- .TP
- .B "\-\-list"
--Liste les entr�es de la table RARP.
-+Liste les entrées de la table RARP.
- .TP
- .B "\-d nom_d_hote"
- .TP
- .B "\-\-delete nom_d_hote"
--Supprime toutes les entr�es RARP relatives � l'h�te sp�cifi�.
-+Supprime toutes les entrées RARP relatives à l'hôte spécifié.
- .TP
- .B "\-s nom_d_hote adr_materielle"
- .TP
- .B "\-\-set nom_d_hote adr_materielle"
--Cr�e manuellement une correspondance d'adresses RARP pour l'h�te
--.B nom_d_h�te
--avec l'adresse mat�rielle
--.B adr_materielle
--. Le format de l'adresse mat�rielle est d�pendant du mat�riel,
--mais pour la plupart on peut consid�rer que la pr�sentation classique
--peut �tre utilis�e.  Pour la classe Ethernet, c'est 6 octets en hexad�cimal,
--s�par�s par des double-points.
-+Crée manuellement une correspondance d'adresses RARP pour l'hôte
-+.B nom_d_hôte
-+avec l'adresse matérielle
-+.BR adr_materielle .
-+Le format de l'adresse matérielle est dépendant du matériel,
-+mais pour la plupart on peut considérer que la présentation classique
-+peut être utilisée.  Pour la classe Ethernet, c'est 6 octets en hexadécimal,
-+séparés par des double-points.
- 
- .SH ATTENTION
--Certains syst�mes (notamment des vieux Sun's) supposent que l'h�te
--r�pondant � une requ�te RARP peut aussi fournir d'autres services
--de boot � distance. Par cons�quent n'ajoutez jamais
--d'entr�es RARP � la l�g�re � moins que vous souhaitiez affronter la
--col�re de votre administrateur r�seau.
-+Certains systèmes (notamment des vieux Sun's) supposent que l'hôte
-+répondant à une requête RARP peut aussi fournir d'autres services
-+de boot à distance. Par conséquent n'ajoutez jamais
-+d'entrées RARP à la légère à moins que vous souhaitiez affronter la
-+colère de votre administrateur réseau.
- .SH FICHIERS
- .I /proc/net/rarp,
- .SH VOIR AUSSI
-diff --git a/man/fr_FR/route.8 b/man/fr_FR/route.8
-index 9109e8d..986faf9 100644
---- a/man/fr_FR/route.8
-+++ b/man/fr_FR/route.8
-@@ -1,4 +1,4 @@
--.TH ROUTE 8 "8 Ao�t 1997" "net-tools" "Linux Programmer's Manual"
-+.TH ROUTE 8 "8 Août 1997" "net-tools" "Linux Administrator's Manual"
- .SH NAME
- route \- affiche / manipule la table de routage IP
- .SH SYNOPSIS
-@@ -54,9 +54,9 @@ If]
- .RB [ \--help ]
- .SH DESCRIPTION
- .B Route
--manipule la table de routage IP du noyau.  Son utilisation premi�re
--consiste � configurer des routes statiques vers des h�tes ou des r�seaux
--via une interface, apr�s sa configuration par le programme
-+manipule la table de routage IP du noyau.  Son utilisation première
-+consiste à configurer des routes statiques vers des hôtes ou des réseaux
-+via une interface, après sa configuration par le programme
- .B ifconfig(8).
- 
- .SH OPTIONS
-@@ -66,12 +66,12 @@ Active le mode verbeux.
- 
- .TP
- .B \-A famille
--Utilise la famille d'adresses sp�cifi�e (p.ex. `inet', `inet6').
-+Utilise la famille d'adresses spécifiée (p.ex. `inet', `inet6').
- 
- .TP
- .B \-n
--Affiche les adresses num�riques, au lieu
--d'essayer de d�terminer les noms d'h�tes. C'est utile si vous essayer de
-+Affiche les adresses numériques, au lieu
-+d'essayer de déterminer les noms d'hôtes. C'est utile si vous essayer de
- savoir pourquoi la route vers votre serveur de nom a disparu.
- 
- .TP
-@@ -80,24 +80,24 @@ utilise
- .BR netstat (8)-format
- pour l'affichage de la table de routage.
- .B \-ee 
--G�n�re une tr�s longue ligne avec tous les param�tres � partir de la table
-+Génère une très longue ligne avec tous les paramètres à partir de la table
- de routage.
- 
- .TP
- .B \-net
- la
- .B cible
--est un r�seau.
-+est un réseau.
- 
- .TP
- .B -host
- la
- .B cible 
--est un h�te.
-+est un hôte.
- 
- .TP 
- .B -F
--affiche la table de routage FIB du noyau. L'organisation peut �tre chang�e avec
-+affiche la table de routage FIB du noyau. L'organisation peut être changée avec
- .B \-e
- et
- .B \-ee
-@@ -117,131 +117,131 @@ ajoute une route.
- 
- .TP
- .B cible
--L'h�te ou le r�seau destination. Vous pouvez fournir une adresse IP en
--notation d�cimale point�e ou un nom d'h�te ou de r�seau.
-+L'hôte ou le réseau destination. Vous pouvez fournir une adresse IP en
-+notation décimale pointée ou un nom d'hôte ou de réseau.
- 
- .TP
- .B netmask Nm
--sp�cifie le masque r�seau de la route � ajouter.
-+spécifie le masque réseau de la route à ajouter.
- 
- .TP
- .B gw Gw
--signifie que tout paquet IP envoy� � cette adresse  sera rout� par
--la passerelle sp�cifi�e.
-+signifie que tout paquet IP envoyé à cette adresse  sera routé par
-+la passerelle spécifiée.
- .B NOTE:
--La passerelle concern�e doit pouvoir �tre atteinte. Ceci signifie
--qu'une route statique vers cette passerelle doit pr�alablement exister.
--Si vous sp�cifiez l'adresse de l'une de vos interfaces locales, elle sera
--utilis�e pour d�cider de l'interface vers laquelle les paquets seront
--envoy�s. Ceci est une bidouille permettant d'�tre compatible BSD.
-+La passerelle concernée doit pouvoir être atteinte. Ceci signifie
-+qu'une route statique vers cette passerelle doit préalablement exister.
-+Si vous spécifiez l'adresse de l'une de vos interfaces locales, elle sera
-+utilisée pour décider de l'interface vers laquelle les paquets seront
-+envoyés. Ceci est une bidouille permettant d'être compatible BSD.
- 
- .TP
- .B metric M
--Affecte la valeur M au champ m�trique de la table de routage (utilis� par
--les d�mons de routage).
-+Affecte la valeur M au champ métrique de la table de routage (utilisé par
-+les démons de routage).
- 
- .TP 
- .B mss M
--Sp�cifie le MSS (Maximum Segment Size, Taille maximum de segment) de TCP,
--pour les connexions empreintant cette route. Ce n'est normalement utilis�
-+Spécifie le MSS (Maximum Segment Size, Taille maximum de segment) de TCP,
-+pour les connexions empreintant cette route. Ce n'est normalement utilisé
- que pour des optimisations fines des configurations de routage. 
- 
- 
- .TP 
- .B window W 
--D�finit la taille de fen�tre TCP � W octets pour les connexions relatives 
--� cette route. C'est en g�n�ral uniquement utilis� sur les r�seaux AX.25 et
--avec les pilotes incapables de manipuler les trames dos � dos.
-+Définit la taille de fenêtre TCP à W octets pour les connexions relatives 
-+à cette route. C'est en général uniquement utilisé sur les réseaux AX.25 et
-+avec les pilotes incapables de manipuler les trames dos à dos.
- 
- .TP
- .B irtt I
--D�finit le iRTT initial (round trip time) pour les connexions TCP sur cette
--route � I millisecondes (1-12000). C'est en g�n�ral uniquement utilis� sur
--les r�seaux AX.25. Si omis, la valeur par d�faut (300 ms selon le RFC 1122)
--est utilis�e.
-+Définit le iRTT initial (round trip time) pour les connexions TCP sur cette
-+route à I millisecondes (1-12000). C'est en général uniquement utilisé sur
-+les réseaux AX.25. Si omis, la valeur par défaut (300 ms selon le RFC 1122)
-+est utilisée.
- 
- .TP
- .B reject
--Installe une route bloquante, qui forcera l'�chec d'une recherche.
--C'est par exemple utilis� pour masquer les r�seaux avant d'utiliser la
--route par d�faut. Ce n'est pas une fonction de pare-feu.
-+Installe une route bloquante, qui forcera l'échec d'une recherche.
-+C'est par exemple utilisé pour masquer les réseaux avant d'utiliser la
-+route par défaut. Ce n'est pas une fonction de pare-feu.
- 
- .TP
- .B mod, dyn, reinstate
--Installe une route dynamique ou modifi�e. Les deux indicateurs ne sont en
--g�n�ral positionn�s que par le d�mon de routage. Cela ne sert que pour des
-+Installe une route dynamique ou modifiée. Les deux indicateurs ne sont en
-+général positionnés que par le démon de routage. Cela ne sert que pour des
- besoins de diagnostics.
- 
- .TP
- .B dev If
--Force la route � �tre associ�e au p�riph�rique sp�cifi�, sinon le noyau
--tentera de le d�terminer par lui-m�me (en consultant les routes existantes
--et les sp�cifications de p�riph�riques). Dans la plupart des r�seaux
-+Force la route à être associée au périphérique spécifié, sinon le noyau
-+tentera de le déterminer par lui-même (en consultant les routes existantes
-+et les spécifications de périphériques). Dans la plupart des réseaux
- normaux, vous n'aurez pas besoin de ceci.
- 
- If 
- .B dev If
--est la derni�re option de la ligne de commande, le mot
-+est la dernière option de la ligne de commande, le mot
- .B dev
--peut �tre omis, puisque c'est la valeur par d�faut. Autrement l'ordre des
-+peut être omis, puisque c'est la valeur par défaut. Autrement l'ordre des
- modificateurs de route (metric - netmask - gw - dev) n'a pas d'importance.
- 
- .SH EXEMPLES
- .TP
- .B route add -net 127.0.0.0
--ajoute l'entr�e loopback normale, en utilisant le masque 255.0.0.0 (r�seau
--de classe A, selon l'adresse de destination) et associ�e avec l'interface 
--"lo" (en supposant que ce p�riph�rique a �t� correctement configur� avec
-+ajoute l'entrée loopback normale, en utilisant le masque 255.0.0.0 (réseau
-+de classe A, selon l'adresse de destination) et associée avec l'interface 
-+"lo" (en supposant que ce périphérique a été correctement configuré avec
- .BR ifconfig (8)). 
- 
- .TP 
- .B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0
--ajoute une route vers le r�seau 192.56.76.x via 
--"eth0". Le masque de classe C n'est pas vraiment n�cessaire ici car
--192.* est une adresse IP de classe C. Le mot "dev" peut �tre omis. 
-+ajoute une route vers le réseau 192.56.76.x via 
-+"eth0". Le masque de classe C n'est pas vraiment nécessaire ici car
-+192.* est une adresse IP de classe C. Le mot "dev" peut être omis. 
- 
- .TP
- .B route add default gw mango-gw
--ajoute une route par d�faut (qui sera utilis�e si aucune autre route ne
-+ajoute une route par défaut (qui sera utilisée si aucune autre route ne
- convient). Tous les paquets empreintant cette route passeront par
--"mango-gw". Le p�riph�rique qui sera effectivement utilis� pour cette route
--d�pend de la fa�on dont on atteint "mango-gw" - la route statique vers
--"mango-gw" devra �tre pr�alablement configur�e. 
-+"mango-gw". Le périphérique qui sera effectivement utilisé pour cette route
-+dépend de la façon dont on atteint "mango-gw" - la route statique vers
-+"mango-gw" devra être préalablement configurée. 
- 
- .TP
- .B route add ipx4 sl0
--ajoute une route vers l'h�te "ipx4" via l'interface SLIP (en supposant que
--"ipx4" est l'h�te SLIP).
-+ajoute une route vers l'hôte "ipx4" via l'interface SLIP (en supposant que
-+"ipx4" est l'hôte SLIP).
- 
- .TP
- .B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4
--Cette commande route le r�seau "192.57.66.x" par l'ancienne route vers l'interface SLIP.
-+Cette commande route le réseau "192.57.66.x" par l'ancienne route vers l'interface SLIP.
- 
- .TP
- .B route add 224.0.0.0 netmask 240.0.0.0 dev eth0
--Ceci est une commande mal document�e et les gens savent ce qu'il faut
--faire? Ceci force toutes les routes IP des classes D (multicast) �
-+Ceci est une commande mal documentée et les gens savent ce qu'il faut
-+faire? Ceci force toutes les routes IP des classes D (multicast) à
- passer par "eth0". C'est la configuration correcte, normale pour un noyau
- supportant le multicast.
- 
- .TP
- .B route add 10.0.0.0 netmask 255.0.0.0 reject
--Installe une route 'rejet�e' pour le r�seau priv� "10.x.x.x."
-+Installe une route 'rejetée' pour le réseau privé "10.x.x.x."
- 
- .LP
- .SH RESULTATS
--Le contenu des tables de routage du noyaus est affich� en colonnes comme
-+Le contenu des tables de routage du noyaus est affiché en colonnes comme
- suit
- .TP
- .B Destination     
--Le r�seau ou h�te destination.
-+Le réseau ou hôte destination.
- .TP
- .B Gateway
--L'adresse de la passerelle ou '*' si ind�fini.
-+L'adresse de la passerelle ou '*' si indéfini.
- .TP
- .B Genmask         
--Le masque de r�seau pour le r�seau destinataire; '255.255.255.255' pour un h�te
--et '0.0.0.0' pour la route par d�faut (
-+Le masque de réseau pour le réseau destinataire; '255.255.255.255' pour un hôte
-+et '0.0.0.0' pour la route par défaut (
- .B default
- ).
- .TP
-@@ -254,63 +254,63 @@ Les indicateurs possibles sont
- .br
- .B H
- (la cible est un 
--.BR h�te )
-+.BR hôte )
- .br
- .B G
- (utilise comme
- .BR passerelle )
- .br
- .B R
--.RB ( r�tablit 
-+.RB ( rétablit 
- la route pour le routage dynamique)
- .br
- .B D
- .RB ( dynamiquement
--configur�e par le d�mon ou par redirect)
-+configurée par le démon ou par redirect)
- .br
- .B M
--.RB ( modifi�e
--par le d�mon de routage ou par redirect)
-+.RB ( modifiée
-+par le démon de routage ou par redirect)
- .br
- .B !
--.RB ( rej�te
-+.RB ( rejète
- la route)
- .TP
- .B Metric 
--La 'distance' � la cible (habituellement compt�e en hops). Ce n'est pas
--utilis� par les noyaux r�cents, mais peut-�tre requis par certains d�mons
-+La 'distance' à la cible (habituellement comptée en hops). Ce n'est pas
-+utilisé par les noyaux récents, mais peut-être requis par certains démons
- de routage.
- .TP
- .B Ref    
--Nombre de r�f�rences � cette route. (Pas utilis� dans le noyau Linux.)
-+Nombre de références à cette route. (Pas utilisé dans le noyau Linux.)
- .TP
- .B Use
- Count of lookups for the route.  Depending on the use of -F and -C this will
- be either route cache misses (-F) or hits (-C).
- .TP
- .B Iface
--Interface vers laquelle les paquets empruntant cette route seront envoy�s.
-+Interface vers laquelle les paquets empruntant cette route seront envoyés.
- .TP
- .B MSS 
--Taille de segment maximum par d�faut pour les connexions TCP sur cette
-+Taille de segment maximum par défaut pour les connexions TCP sur cette
- route.
- .TP
- .B Window  
--Taille de fen�tre par d�faut pour les connexions TCP sur cette route.
-+Taille de fenêtre par défaut pour les connexions TCP sur cette route.
- .TP
- .B irtt
- RTT Initial (Round Trip Time). Le noyau utilise ceci pour essayer les
--meilleurs param�tres protocolaires TCP sans attendre de r�ponse
--(�ventuellement tardive).
-+meilleurs paramètres protocolaires TCP sans attendre de réponse
-+(éventuellement tardive).
- .TP
--.B HH (seulement cach�)
--Le nombre d'entr�es ARP et de routes cach�es faisant r�f�rence au cache
--d'en-t�te mat�riel pour la route en cache. Ce sera la valeur \-1 si aucune adresse
--mat�rielle n'est n�cessaire pour l'interface de la route cach�e (p.ex. lo).
-+.B HH (seulement caché)
-+Le nombre d'entrées ARP et de routes cachées faisant référence au cache
-+d'en-tête matériel pour la route en cache. Ce sera la valeur \-1 si aucune adresse
-+matérielle n'est nécessaire pour l'interface de la route cachée (p.ex. lo).
- .TP
--.B Arp (seulement cach�)
--Indique si oui ou non l'adresse mat�rielle pour la route en cache est encore
--� jour.
-+.B Arp (seulement caché)
-+Indique si oui ou non l'adresse matérielle pour la route en cache est encore
-+à jour.
- .LP
- .SH FICHIERS
- .I /proc/net/ipv6_route
-@@ -324,11 +324,11 @@ Indique si oui ou non l'adresse mat
- .LP
- .SH HISTORIQUE
- .B Route 
--pour Linux a �t� originellement �crit par Fred N. van Kempen,
--<waltje@uwalt.nl.mugnet.org> puis modifi� par Johannes Stille et
--Linus Torvalds pour pl15. Alan Cox a ajout� les options concernant 
--la gestion des fen�tres et MSS pour Linux 1.1.22. Le support de irtt 
--et la fusion avec netstat ont �t� r�alis�s par Bernd Eckenfels.
-+pour Linux a été originellement écrit par Fred N. van Kempen,
-+<waltje@uwalt.nl.mugnet.org> puis modifié par Johannes Stille et
-+Linus Torvalds pour pl15. Alan Cox a ajouté les options concernant 
-+la gestion des fenêtres et MSS pour Linux 1.1.22. Le support de irtt 
-+et la fusion avec netstat ont été réalisés par Bernd Eckenfels.
- .SH AUTEUR
- Maintenu par Phil Blundell <Philip.Blundell@pobox.com>.
- .SH TRADUCTION
-diff --git a/man/fr_FR/slattach.8 b/man/fr_FR/slattach.8
-index 512d514..d21d0d7 100644
---- a/man/fr_FR/slattach.8
-+++ b/man/fr_FR/slattach.8
-@@ -1,87 +1,87 @@
- .TH SLATTACH 8 "12 Feb 1994" "" ""
- .SH NOM
--slattach \- attache une interface r�seau � une ligne s�rie
-+slattach \- attache une interface réseau à une ligne série
- .SH SYNOPSIS
- .B "slattach [-dehlLmnqv] [-c commande] [-p proto] [-s vitesse] [tty]"
- .br
- .SH DESCRIPTION
- .B Slattach
--est un minuscule programme qui peut �tre utilis� pour attacher
--un terminal normal ("s�rie") dans un des diff�rents modes "r�seau",
--ceci vous permettant de l'utiliser pour des liaisons point-�-point
--vers d'autres syst�mes.
-+est un minuscule programme qui peut être utilisé pour attacher
-+un terminal normal ("série") dans un des différents modes "réseau",
-+ceci vous permettant de l'utiliser pour des liaisons point-à-point
-+vers d'autres systèmes.
- .SH OPTIONS
- .TP
- .B "[-c commande]"
--Ex�cute
-+Exécute
- .B `commande'
--lorsque la ligne est suspendue. Ceci peut �tre utilis� pour lancer
--des scripts ou r��tablir des connexions quand un lien tombe.
-+lorsque la ligne est suspendue. Ceci peut être utilisé pour lancer
-+des scripts ou réétablir des connexions quand un lien tombe.
- .TP
- .B "[-d]"
--Valide le d�bogage.  Utile pour d�terminer pourquoi une configuration
-+Valide le débogage.  Utile pour déterminer pourquoi une configuration
- ne fonctionne pas.
- .TP
- .B "[-h]"
--Termine lorsque la porteuse est perdue. Ceci fonctionne � la fois sur
--les p�riph�riques /dev/tty et /dev/cua en contr�lant directement
--l'�tat de la porteuse toutes les 15 secondes.
-+Termine lorsque la porteuse est perdue. Ceci fonctionne à la fois sur
-+les périphériques /dev/tty et /dev/cua en contrôlant directement
-+l'état de la porteuse toutes les 15 secondes.
- .TP
- .B "[-v]"
- Valide le mode verbeux.  Utile pour les shell scripts.
- .TP
- .B "[-q]"
--Op�re en mode silencieux - pas de messages du tout.
-+Opère en mode silencieux - pas de messages du tout.
- .TP
- .B "[-l]"
--Cr�e un fichier de v�rouillage pour le p�riph�rique comme
-+Crée un fichier de vérouillage pour le périphérique comme
- pour UUCP dans /var/lock.
- .TP
- .B "[-n]"
--Equivalent � la commande "mesg n".
-+Equivalent à la commande "mesg n".
- .TP
- .B "[-m]"
- \fBn'\fPinitialise \fBpas\fP la ligne en mode raw 8 bits.
- .TP
- .B "[-e]"
--Termine correctement apr�s l'initialisation du p�riph�rique,
-+Termine correctement après l'initialisation du périphérique,
- au lieu d'attendre que la ligne soit suspendue.
- .TP
- .B "[-L]"
--Valide les op�rations 3 lignes. Le terminal est mis en mode CLOCAL, 
--la surveillance de porteuse est invalid�e.
-+Valide les opérations 3 lignes. Le terminal est mis en mode CLOCAL, 
-+la surveillance de porteuse est invalidée.
- .TP
- .B "[-p proto]"
--D�finit le protocole sp�cifique � utiliser sur la ligne.
--La valeur par d�faut est 
-+Définit le protocole spécifique à utiliser sur la ligne.
-+La valeur par défaut est 
- .B "cslip"
--, c'est-�-dire SLIP compress�.  Les autres valeurs possibles sont :
-+, c'est-à-dire SLIP compressé.  Les autres valeurs possibles sont :
- .B "slip"
- (SLIP normal), 
- .B "adaptive"
- (CSLIP/SLIP adaptatifs),
- .B "ppp"
--(Protocole Point-�-Point)
-+(Protocole Point-à-Point)
- et
- .B "kiss"
--(un protocole utilis� pour communiquer avec des controleurs AX.25 paquets radios).
--L'argument sp�cifique
-+(un protocole utilisé pour communiquer avec des controleurs AX.25 paquets radios).
-+L'argument spécifique
- .B "tty"
--peut �tre utilis� pour refaire passer le p�riph�rique en
--fonctionnement s�rie normal. L'utilisation du mode 'ppp' n'est en
--principe pas utile puisque ppp n�cessite le d�mon additionnel
-+peut être utilisé pour refaire passer le périphérique en
-+fonctionnement série normal. L'utilisation du mode 'ppp' n'est en
-+principe pas utile puisque ppp nécessite le démon additionnel
- .B pppd
--pour �tre actif sur la ligne. Pour les connexions `kiss', le programme 
-+pour être actif sur la ligne. Pour les connexions `kiss', le programme 
- .B axattach
--doit �tre utilis�.
-+doit être utilisé.
- .TP
- .B "[-s vitesse]"
--D�finit la vitesse de la ligne, diff�rente de la valeur par d�faut.
-+Définit la vitesse de la ligne, différente de la valeur par défaut.
- .PP
--Si aucun argument n'est donn�, la ligne courante du terminal
--(habituellement li�e au login) est utilis�e. Autrement, une tentative
--est effectu�e pour obtenir le port du terminal indiqu�, puis il est
--v�rouill� et ouvert.
-+Si aucun argument n'est donné, la ligne courante du terminal
-+(habituellement liée au login) est utilisée. Autrement, une tentative
-+est effectuée pour obtenir le port du terminal indiqué, puis il est
-+vérouillé et ouvert.
- .SH FICHIERS
- .I /dev/cua* /var/lock/LCK.*
- .SH BUGS
-diff --git a/man/pt_BR/arp.8 b/man/pt_BR/arp.8
-index 41c8fd6..6c1e7f7 100644
---- a/man/pt_BR/arp.8
-+++ b/man/pt_BR/arp.8
-@@ -7,12 +7,12 @@ arp \- manipula o cache ARP do sistema
- .RB [ "\-H tipo" ] 
- .RB [ "-i if" ] 
- .B -a 
--.RB [ m�quina ]
-+.RB [ máquina ]
- .PP
- .B arp 
- .RB [ \-v ]
- .RB [ "\-i if" ] 
--.B "\-d m�quina"
-+.B "\-d máquina"
- .RB [ pub ]
- .RB [ nopub ]
- .PP
-@@ -20,7 +20,7 @@ arp \- manipula o cache ARP do sistema
- .RB [ \-v ] 
- .RB [ "\-H tipo" ] 
- .RB [ "\-i if" ] 
--.B -s m�quina endere�o_hardware
-+.B -s máquina endereço_hardware
- .RB [ temp ] 
- .RB [ nopub ]
- .PP
-@@ -28,7 +28,7 @@ arp \- manipula o cache ARP do sistema
- .RB [ \-v ] 
- .RB [ "\-H tipo" ] 
- .RB [ "\-i if" ] 
--.B -s m�quina endere�o_hardware
-+.B -s máquina endereço_hardware
- .RB [ "netmask nm" ] 
- .B pub
- .PP
-@@ -36,7 +36,7 @@ arp \- manipula o cache ARP do sistema
- .RB [ \-v ] 
- .RB [ "\-H tipo" ] 
- .RB [ "\-i if" ] 
--.B -Ds m�quina ifa
-+.B -Ds máquina ifa
- .RB [ "netmask nm" ] 
- .B pub
- .PP
-@@ -46,28 +46,28 @@ arp \- manipula o cache ARP do sistema
- .RB [ "-i if" ]
- .B -f arquivo
- 
--.SH DESCRI��O
-+.SH DESCRIÇÃO
- .B arp
--manipula o cache ARP do kernel de v�rias maneiras. As principais op��es
--s�o remo��o de uma entrada de mapeamento de endere�o e configura��o manual
--de um endere�o. Para prop�sitos de depura��o, o programa
-+manipula o cache ARP do kernel de várias maneiras. As principais opções
-+são remoção de uma entrada de mapeamento de endereço e configuração manual
-+de um endereço. Para propósitos de depuração, o programa
- .B arp
--tamb�m permite um dump completo do cache ARP.
--.SH OP��ES
-+também permite um dump completo do cache ARP.
-+.SH OPÇÕES
- .TP
- .B "\-v, \-\-verbose"
--Mostra ao usu�rio o que est� acontecendo, de modo detalhado.
-+Mostra ao usuário o que está acontecendo, de modo detalhado.
- .TP
- .B "\-n, \-\-numeric"
--mostra endere�os num�ricos, ao inv�s de tentar determinar os nomes simb�licos da
--m�quina, porta e usu�rio.
-+mostra endereços numéricos, ao invés de tentar determinar os nomes simbólicos da
-+máquina, porta e usuário.
- .TP
- .B "\-H type, \-\-hw-type type"
--Quando configurando ou lendo o cache ARP, este par�metro opcional informa ao
-+Quando configurando ou lendo o cache ARP, este parâmetro opcional informa ao
- .B arp
--que classe de entradas devem ser verificadas. O valor padr�o deste par�metro �
-+que classe de entradas devem ser verificadas. O valor padrão deste parâmetro é
- .B ether
--(i.e. c�digo de hardware 0x01 para Ethernet IEEE 802.3 10Mbps).
-+(i.e. código de hardware 0x01 para Ethernet IEEE 802.3 10Mbps).
- Outros valores podem incluir tecnologias de rede como
- .RB "ARCnet (" arcnet ")"
- ,
-@@ -77,86 +77,86 @@ Outros valores podem incluir tecnologias de rede como
- e
- .RB "NET/ROM (" netrom ")."
- .TP
--.B "\-a [m�quina], \-\-display [m�quina]"
--Mostra as entradas das m�quinas especificadas. Se o par�metro
--.B m�quina
--n�o for usado,
-+.B "\-a [máquina], \-\-display [máquina]"
-+Mostra as entradas das máquinas especificadas. Se o parâmetro
-+.B máquina
-+não for usado,
- .B todas
--as entradas ser�o mostradas.
-+as entradas serão mostradas.
- .TP
--.B "\-d m�quina, \-\-delete m�quina"
--Remove quaisquer entradas para a m�quina especificada. Isto pode ser
--usado se a m�quina indicada for desligada, por exemplo. Nos kernels
-+.B "\-d máquina, \-\-delete máquina"
-+Remove quaisquer entradas para a máquina especificada. Isto pode ser
-+usado se a máquina indicada for desligada, por exemplo. Nos kernels
- mais recentes o
- .BR arp (1)
--suporta a especifica��o de
-+suporta a especificação de
- .B pub 
- ou
- .B nopub 
--para decidir se uma entrada p�blica ou privada deve ser removida. Se voc�
--n�o informar uma destas flags as duas entradas ser�o removidas.
-+para decidir se uma entrada pública ou privada deve ser removida. Se você
-+não informar uma destas flags as duas entradas serão removidas.
- .TP
- .B "\-D, \-\-use-device"
--Usa o endere�o de hardware da interface 
-+Usa o endereço de hardware da interface 
- .BR ifa
- .TP
- .B "\-i If, \-\-device If"
- Seleciona uma interface. Quando mostrando o cache ARP somente entradas iguais
--� interface ser�o mostradas. Configura uma entrada ARP permanente ou
--tempor�ria que ser� usada no dispositivo especificado. Se nenhum dispositivo for 
-+à interface serão mostradas. Configura uma entrada ARP permanente ou
-+temporária que será usada no dispositivo especificado. Se nenhum dispositivo for 
- informado, o kernel descobre o dispositivo a partir da tabela de roteamento. 
- Para entradas
- .B pub
--a interface especificada � a interface na qual as requisi��es ARP ser�o 
-+a interface especificada é a interface na qual as requisições ARP serão 
- respondidas.
- .br
- .B NOTA:
--Deve ser diferente da interface para a qual os pacotes IP ser�o roteados.
-+Deve ser diferente da interface para a qual os pacotes IP serão roteados.
- .TP
--.B "\-s m�quina endere�o_hardware, \-\-set m�quina"
--Cria manualmente uma entrada de mapeamento de endere�o ARP para a m�quina
--.B m�quina
--com endere�o de hardware configurado para 
--.B endere�o_hardware.  
--O formato do endere�o de hardware depende da classe de hardware, mas
--para a maioria das classes pode-se assumir que a apresenta��o usual pode
--ser usada. Para a classe Ethernet, s�o 6 bytes em hexadecimal, separados
--por dois pontos (:). Quando adicionando entradas proxy arp (isto �, aquelas
-+.B "\-s máquina endereço_hardware, \-\-set máquina"
-+Cria manualmente uma entrada de mapeamento de endereço ARP para a máquina
-+.B máquina
-+com endereço de hardware configurado para 
-+.B endereço_hardware.  
-+O formato do endereço de hardware depende da classe de hardware, mas
-+para a maioria das classes pode-se assumir que a apresentação usual pode
-+ser usada. Para a classe Ethernet, são 6 bytes em hexadecimal, separados
-+por dois pontos (:). Quando adicionando entradas proxy arp (isto é, aquelas
- com a flag
--.BR p�b lico
-+.BR púb lico
- setadas) uma
- .B netmask
- pode ser especificada para o proxy arp de uma subrede inteira. 
--Proxy arp para rotear redes inteiras n�o � um bom protocolo, mas algumas
--vezes � �til, ent�o � suportado. Se a flag
-+Proxy arp para rotear redes inteiras não é um bom protocolo, mas algumas
-+vezes é útil, então é suportado. Se a flag
- .B temp
--n�o for fornecida, as entradas ser�o permanentemente armazenadas no cache ARP.
-+não for fornecida, as entradas serão permanentemente armazenadas no cache ARP.
- .TP
- .B "\-f arquivo, \-\-file arquivo"
--Similar � op��o
-+Similar à opção
- .B \-s
--s� que desta vez as informa��es de endere�os s�o obtidas a partir do arquivo
-+só que desta vez as informações de endereços são obtidas a partir do arquivo
- .B arquivo.  
--Isto pode ser usado se entradas ARP para muitas m�quinas tiverem que ser
--configuradas. O nome do arquivo de dados � freq�entemente
-+Isto pode ser usado se entradas ARP para muitas máquinas tiverem que ser
-+configuradas. O nome do arquivo de dados é freqüentemente
- .IR /etc/ethers , 
--mas isto n�o � oficial.
-+mas isto não é oficial.
- .sp 1
--O formato deste arquivo � simples; ele somente cont�m linhas de texto ASCII com
--um nome de m�quina e um endere�o de hardware separados por um espa�o em branco.
-+O formato deste arquivo é simples; ele somente contém linhas de texto ASCII com
-+um nome de máquina e um endereço de hardware separados por um espaço em branco.
- Adicionalmente as flags 
- .BR "pub" , " nopub" , " temp" " and" " netmask"
- podem ser usadas.
- .LP
- Em todos os lugares onde uma
--.B m�quina
--� esperada, voc� tamb�m pode informar um
--.B "endere�o IP"
--em nota��o decimal separada por pontos.
-+.B máquina
-+é esperada, você também pode informar um
-+.B "endereço IP"
-+em notação decimal separada por pontos.
- .LP 
--Cada entrada completa no cache ARP ser� marcada com uma flag
-+Cada entrada completa no cache ARP será marcada com uma flag
- .BR C . 
--Entradas permanentes s�o marcadas com um
-+Entradas permanentes são marcadas com um
- .B M
- e entradas publicadas tem uma flag 
- .BR P .
-@@ -171,7 +171,7 @@ e entradas publicadas tem uma flag
- .SH AUTOR
- Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org> com muitas melhorias
- feitas pelo mantenedor do net-tools, Bernd Eckenfels <net-tools@lina.inka.de>.
--Tradu��o para a l�ngua portuguesa feita por
-+Tradução para a língua portuguesa feita por
- Arnaldo Carvalho de Melo <acme@conectiva.com.br> em 11/abril/1998.
- Revisado por 
- Jorge Luiz Godoy Filho <jorge@bestway.com.br> em 15/abril/1998.
-diff --git a/man/pt_BR/hostname.1 b/man/pt_BR/hostname.1
-index fe00879..5880fc8 100644
---- a/man/pt_BR/hostname.1
-+++ b/man/pt_BR/hostname.1
-@@ -1,15 +1,15 @@
- .TH HOSTNAME 1 "28 de janeiro de 1996" "net-tools" "Manual do Programador Linux"
- 
- .SH NOME
--hostname \- mostra ou configura o nome da m�quina 
-+hostname \- mostra ou configura o nome da máquina 
- .BR
--domainname \- mostra ou configura o nome do dom�nio NIS/YP
-+domainname \- mostra ou configura o nome do domínio NIS/YP
- .BR
--dnsdomainname \- mostra o nome do dom�nio DNS
-+dnsdomainname \- mostra o nome do domínio DNS
- .BR
--nisdomainname \- mostra ou configura o nome do dom�nio NIS/YP
-+nisdomainname \- mostra ou configura o nome do domínio NIS/YP
- .BR
--ypdomainname \- mostra ou configura o nome do dom�nio NIS/YP
-+ypdomainname \- mostra ou configura o nome do domínio NIS/YP
- 
- .SH SINOPSE
- .B hostname
-@@ -34,7 +34,7 @@ ypdomainname \- mostra ou configura o nome do dom
- .RB [ \-v ]
- .RB [ \-F\ arquivo ]
- .RB [ \-\-file\ arquivo ]
--.RB [ m�quina ]
-+.RB [ máquina ]
- 
- .PP
- .B domainname
-@@ -61,11 +61,11 @@ ypdomainname \- mostra ou configura o nome do dom
- .B ypdomainname
- .RB [ \-v ]
- 
--.SH DESCRI��O
-+.SH DESCRIÇÃO
- .B hostname
--� o programa usado para configurar ou mostrar o nome corrente da m�quina
--ou o dom�nio do sistema. Este nome � usado por muitos dos programas de
--rede para identificar a m�quina. O nome do dom�nio tamb�m � usado pelo
-+é o programa usado para configurar ou mostrar o nome corrente da máquina
-+ou o domínio do sistema. Este nome é usado por muitos dos programas de
-+rede para identificar a máquina. O nome do domínio também é usado pelo
- NIS/YP.
- 
- .SS "OBTER NOME"
-@@ -73,119 +73,119 @@ Quando chamado sem argumentos o programa mostra os nomes correntes:
- 
- .LP
- .B hostname
--mostrar� o nome do sistema conforme retornado pela fun��o
-+mostrará o nome do sistema conforme retornado pela função
- .BR gethostname (2).
- 
- 
- .LP
- .B "domainname, nisdomainname, ypdomainname"
--mostrar� o nome do sistema conforme retornado pela fun��o
-+mostrará o nome do sistema conforme retornado pela função
- .BR getdomainname (2).
--Isto tamb�m � conhecido como o nome de dom�nio YP/NIS do sistema.
-+Isto também é conhecido como o nome de domínio YP/NIS do sistema.
- 
- .LP
- .B dnsdomainname
--mostrara a parte do dom�nio do FQDN (Nome de dom�nio completamente qualificado).
--O FQDN do sistema � retornado pelo comando
-+mostrara a parte do domínio do FQDN (Nome de domínio completamente qualificado).
-+O FQDN do sistema é retornado pelo comando
- .BR "hostname \-\-fqdn" .
- 
- .SS "CONFIGURAR NOME"
--Quando chamado com um argumento ou com a op��o
-+Quando chamado com um argumento ou com a opção
- .B \-\-file
--, o comando configura o nome da m�quina ou do dom�nio NIS/YP.
-+, o comando configura o nome da máquina ou do domínio NIS/YP.
- 
- .LP
--Note que somente o super usu�rio pode mudar os nomes.
-+Note que somente o super usuário pode mudar os nomes.
- 
- .LP
--Nao � poss�vel configurar o FQDN ou o nome do dom�nio DNS com o comando
-+Nao é possível configurar o FQDN ou o nome do domínio DNS com o comando
- .B dnsdomainname 
- (veja 
- .B "O FQDN"
- abaixo).
- 
- .LP
--O nome da m�quina � normalmente configurado durante a inicializa��o do sistema,
-+O nome da máquina é normalmente configurado durante a inicialização do sistema,
- em
- .I /etc/rc.d/rc.inet1
- ou
- .I /etc/init.d/boot
--(normalmente lendo o conte�do de um arquivo que cont�m o nome da m�quina, ex.:
-+(normalmente lendo o conteúdo de um arquivo que contém o nome da máquina, ex.:
- .IR /etc/hostname ).
- 
- .SS O FQDN
--Voc� n�o pode mudar o FQDN (conforme retornado por
-+Você não pode mudar o FQDN (conforme retornado por
- .BR "hostname \-\-fqdn" ) 
--ou o nome do dom�nio DNS (conforme retornado por
-+ou o nome do domínio DNS (conforme retornado por
- .BR "dnsdomainname" ) 
--com este comando. O FQDN do sistema � o nome que o
-+com este comando. O FQDN do sistema é o nome que o
- .BR resolver (3)
--retorna para o nome da m�quina.
-+retorna para o nome da máquina.
- 
- .LP
--Tecnicamente: O FQDN � o nome retornado pelo
-+Tecnicamente: O FQDN é o nome retornado pelo
- .BR gethostbyname (2)
- para o nome retornado pelo
- .BR gethostname (2).
--O nome do dom�nio DNS � a parte ap�s o primeiro ponto.
-+O nome do domínio DNS é a parte após o primeiro ponto.
- .LP
--Portanto isto depende da configura��o (normalmente em
-+Portanto isto depende da configuração (normalmente em
- .IR /etc/host.conf )
--para que voc� possa mud�-lo. Normalmente (se o arquivo hosts for lido antes 
--do DNS ou NIS) voc� pode mud�-lo em
-+para que você possa mudá-lo. Normalmente (se o arquivo hosts for lido antes 
-+do DNS ou NIS) você pode mudá-lo em
- .IR /etc/hosts .
- 
- 
--.SH OP��ES
-+.SH OPÇÕES
- .TP
- .I "\-a, \-\-alias"
--Mostra o alias da m�quina (se usado).
-+Mostra o alias da máquina (se usado).
- .TP
- .I "\-d, \-\-domain"
--Mostra o nome do dom�nio DNS. N�o use o comando
-+Mostra o nome do domínio DNS. Não use o comando
- .B domainname
--para obter o nome do dom�nio DNS porque ele mostrar� o nome do dom�nio NIS e
--n�o o nome do dom�nio DNS. Use 
-+para obter o nome do domínio DNS porque ele mostrará o nome do domínio NIS e
-+não o nome do domínio DNS. Use 
- .BR dnsdomainname .
- .TP
- .I "\-F, \-\-file arquivo"
--Leia o nome da m�quina a partir do arquivo especificado. Coment�rios (linhas
--come�ando com um `#') s�o ignorados.
-+Leia o nome da máquina a partir do arquivo especificado. Comentários (linhas
-+começando com um `#') são ignorados.
- .TP
- .I "\-f, \-\-fqdn, \-\-long"
--Mostra o FQDN (Nome de Dom�nio Completamente Qualificado). Um FQDN consiste de
--um nome curto de m�quina e do nome do dom�nio DNS. A menos que voc� esteja
--usando bind ou NIS para resolu��o de nomes voc� pode mudar o FQDN e o nome
--do dom�nio DNS (que � parte do FQDN) no arquivo \fI/etc/hosts\fR.
-+Mostra o FQDN (Nome de Domínio Completamente Qualificado). Um FQDN consiste de
-+um nome curto de máquina e do nome do domínio DNS. A menos que você esteja
-+usando bind ou NIS para resolução de nomes você pode mudar o FQDN e o nome
-+do domínio DNS (que é parte do FQDN) no arquivo \fI/etc/hosts\fR.
- .TP
- .I "\-h, \-\-help"
- Mostra uma mensagem sobre como utilizar o comando e termina.
- .TP
- .I "\-i, \-\-ip-address"
--Mostra o(s) endere�o(s) IP da m�quina.
-+Mostra o(s) endereço(s) IP da máquina.
- .TP
- .I "\-s, \-\-short"
--Mostra o nome curto da m�quina. � o nome da m�quina at� o primeiro ponto.
-+Mostra o nome curto da máquina. É o nome da máquina até o primeiro ponto.
- .TP
- .I "\-V, \-\-version"
--Mostra informa��o de vers�o na sa�da padr�o e termina com sucesso.
-+Mostra informação de versão na saída padrão e termina com sucesso.
- .TP
- .I "\-v, \-\-verbose"
--Mostra uma sa�da detalhada do que est� acontecendo.
-+Mostra uma saída detalhada do que está acontecendo.
- .TP
- .I "\-y, \-\-yp, \-\-nis"
--Mostra o nome do dom�nio NIS. Se um par�metro for especificado (ou
-+Mostra o nome do domínio NIS. Se um parâmetro for especificado (ou
- .B \-\-file arquivo
--) ent�o o root tamb�m pode configurar um novo dom�nio NIS.
-+) então o root também pode configurar um novo domínio NIS.
- .SH ARQUIVOS
- .B /etc/hosts
- .SH AUTOR
- Peter Tobias, <tobias@et-inf.fho-emden.de>
- .BR
--Bernd Eckenfels, <net-tools@lina.inka.de> (NIS e p�gina man).
-+Bernd Eckenfels, <net-tools@lina.inka.de> (NIS e página man).
- .BR
--Arnaldo Carvalho de Melo, <acme@conectiva.com.br> Tradu��o para a l�ngua
-+Arnaldo Carvalho de Melo, <acme@conectiva.com.br> Tradução para a língua
- portuguesa.
- .BR
--Jorge Luiz Godoy Filho, <jorge@bestway.com.br> Revis�o.
-+Jorge Luiz Godoy Filho, <jorge@bestway.com.br> Revisão.
- .BR
-diff --git a/man/pt_BR/ifconfig.8 b/man/pt_BR/ifconfig.8
-index 0a97683..1432dc5 100644
---- a/man/pt_BR/ifconfig.8
-+++ b/man/pt_BR/ifconfig.8
-@@ -4,13 +4,13 @@ ifconfig \- configura uma interface de rede
- .SH SINOPSE
- .B "ifconfig [interface]"
- .br
--.B "ifconfig interface [aftype] op��es | endere�os ..."
--.SH DESCRI��O
-+.B "ifconfig interface [aftype] opções | endereços ..."
-+.SH DESCRIÇÃO
- .B ifconfig
--� usado para configurar (e posteriormente manter) as interfaces de
--rede. � usado durante o boot para configurar a maioria delas para
--um estado us�vel. Depois disto, � normalmente somente necess�rio
--durante depura��es ou quando for necess�ria uma configura��o fina
-+é usado para configurar (e posteriormente manter) as interfaces de
-+rede. É usado durante o boot para configurar a maioria delas para
-+um estado usável. Depois disto, é normalmente somente necessário
-+durante depurações ou quando for necessária uma configuração fina
- do sistema.
- .LP
- Se nenhum argumento for informado,
-@@ -19,12 +19,12 @@ somente mostra o estado das interfaces correntemente definidas. Se
- um argumento
- .B interface
- for informado, ele mostra somente o estado da interface informada. De
--outra forma ele assume que os par�metros devem ser configurados.
--.SH Fam�lias de Endere�amento
--Se o primeiro argumento ap�s o nome da interface for reconhecido
--como um nome de uma fam�lia de endere�amento suportada, esta fam�lia
--de endere�amento � usada na decodifica��o e apresenta��o de todos
--os endere�os de protocolos. Atualmente as fam�lias de endere�amento
-+outra forma ele assume que os parâmetros devem ser configurados.
-+.SH Famílias de Endereçamento
-+Se o primeiro argumento após o nome da interface for reconhecido
-+como um nome de uma família de endereçamento suportada, esta família
-+de endereçamento é usada na decodificação e apresentação de todos
-+os endereços de protocolos. Atualmente as famílias de endereçamento
- suportadas incluem
- .B inet
- (TCP/IP, default) 
-@@ -36,95 +36,91 @@ suportadas incluem
- (Novell IPX) and
- .B netrom
- (AMPR Packet radio).
--.SH OP��ES
-+.SH OPÇÕES
- .TP
- .B interface
--O nome da interface de rede. Usualmente � um nome como
-+O nome da interface de rede. Usualmente é um nome como
- .B eth0
- ,
- .B sl3
- ou algo parecido: um nome de driver de dispositivo seguido por um
--n�mero.
-+número.
- .TP
- .B up 
--Esta flag causa a ativa��o da interface. � especificada
--implicitamente se a interface receber um novo endere�o (veja
-+Esta flag causa a ativação da interface. É especificada
-+implicitamente se a interface receber um novo endereço (veja
- abaixo).
- .TP
- .B down 
--Esta flag desativa o driver desta interface, � �til quando alguma
--coisa come�ar a ter problemas.
-+Esta flag desativa o driver desta interface, é útil quando alguma
-+coisa começar a ter problemas.
- .TP
- .B "[\-]arp" 
- Habilita ou desabilita o uso do protocolo ARP para esta interface. Se
--o sinal de menos (\-) estiver presente a op��o � desligada.
-+o sinal de menos (\-) estiver presente a opção é desligada.
- .TP
- .B "[\-]trailers" 
--Habilita ou desabilita o uso de trailer em frames Ethernet. N�o �
--utilizada na implementa��o atual do pacote net-tools.
-+Habilita ou desabilita o uso de trailer em frames Ethernet. Não é
-+utilizada na implementação atual do pacote net-tools.
- .TP
- .B "[\-]allmulti" 
- Habilita ou desabilita o modo
- .B promiscuous
--da interface. Isto significa que todos os frames passar�o pela camada
--de rede do kernel, permitindo monitora��o da rede.
--.TP
--.B "metric N" 
--Este par�metro configura a m�trica da interface. N�o � usado atualmente,
--mas ser� implementado no futuro.
-+da interface. Isto significa que todos os frames passarão pela camada
-+de rede do kernel, permitindo monitoração da rede.
- .TP
- .B "mtu N" 
--Este par�metro configura a Unidade M�xima de Transfer�ncia (MTU) de uma
--interface. Para Ethernet � um n�mero entre 1000-2000 (o padr�o �
--1500). Para SLIP, use algo entre 200 e 4096. Note que a implementa��o
--atual n�o manipula fragmenta��o IP ainda, ent�o � melhor configurar
-+Este parâmetro configura a Unidade Máxima de Transferência (MTU) de uma
-+interface. Para Ethernet é um número entre 1000-2000 (o padrão é
-+1500). Para SLIP, use algo entre 200 e 4096. Note que a implementação
-+atual não manipula fragmentação IP ainda, então é melhor configurar
- a MTU com um tamanho adequado!
- .TP
- .B "dstaddr addr"
--Configura o endere�o IP do "outro lado" no caso de um link Ponto-A-Ponto,
-+Configura o endereço IP do "outro lado" no caso de um link Ponto-A-Ponto,
- como PPP. Esta palavra-chave tornou-se obsoleta e deve ser usada a nova 
- palavra-chave
- .BR pointopoint .
- .TP
- .B "netmask addr"
--Configura a m�scara de rede IP para esta interface. Este valor assume o
--padr�o usual das classes A, B ou C (deduzindo-o a partir do endere�o
-+Configura a máscara de rede IP para esta interface. Este valor assume o
-+padrão usual das classes A, B ou C (deduzindo-o a partir do endereço
- IP da interface), mas pode ser configurado para qualquer valor para o
- uso de sub-redes.
- 
- .TP
- .B "irq addr"
--Configura a linha de interrup��o (IRQ) usada por este dispositivo. Muitos
--dispositivos n�o suportam configura��o din�mica de IRQ.
-+Configura a linha de interrupção (IRQ) usada por este dispositivo. Muitos
-+dispositivos não suportam configuração dinâmica de IRQ.
- .TP
--.B "[-]broadcast [endere�o]"
--Se o argumento endere�o for informado, configura o endere�o de protocolo
-+.B "[-]broadcast [endereço]"
-+Se o argumento endereço for informado, configura o endereço de protocolo
- broadcast para esta interface. De outra forma ele somente configura a flag
- .B IFF_BROADCAST
- da interface.  Se a palavra-chave for precedida por um sinal de menos
- .B (-)
--, ent�o a flag � removida.
-+, então a flag é removida.
- .TP
--.B "[-]pointopoint [endere�o]"
-+.B "[-]pointopoint [endereço]"
- Esta palavra-chave habilita o modo
- .B ponto-a-ponto
--da interface, significando que ela � um link direto entre duas m�quinas
--sem ningu�m ouvindo (ou, pelo menos n�s esperamos que este seja o caso
-+da interface, significando que ela é um link direto entre duas máquinas
-+sem ninguém ouvindo (ou, pelo menos nós esperamos que este seja o caso
- :-)
- .BR
--Se o argumento endere�o for informado, configura o endere�o de protocolo
-+Se o argumento endereço for informado, configura o endereço de protocolo
- do outro lado do link, exatamente como a palavra-chave obsoleta
- .B dstaddr
- faz. De outra forma, ela somente configura a flag
- .B IFF_POINTOPOINT
- da interface. Se a palavra-chave for precedida por um sinal de menos
- .B (-)
--, ent�o a flag � removida.
-+, então a flag é removida.
- .TP
- .B "hw"
--Configura o endere�o de hardware para esta interface, se o driver do
--dispositivo suportar esta opera��o. A palavra-chave deve ser seguida
--pelo nome da classe do hardware e o equivalente em ASCII do endere�o
-+Configura o endereço de hardware para esta interface, se o driver do
-+dispositivo suportar esta operação. A palavra-chave deve ser seguida
-+pelo nome da classe do hardware e o equivalente em ASCII do endereço
- de hardware. As classes de hardware atualmente suportadas incluem
- .B ether
- (Ethernet),
-@@ -136,45 +132,34 @@ e
- (AMPR NET/ROM).
- .TP
- .B multicast
--Inicializa a flag de multicast para a interface. Normalmente, isto n�o ser�
--necess�rio j� que os drivers ajustam as flags corretas por si s�.
-+Inicializa a flag de multicast para a interface. Normalmente, isto não será
-+necessário já que os drivers ajustam as flags corretas por si só.
- .TP
--.B endere�o
--O nome ou endere�o IP da m�quina (um nome de m�quina ser� traduzido para
--um  endere�o IP) da interface. Este par�metro � necess�rio, apesar
--da sintaxe atualmente n�o requisit�-lo.
-+.B endereço
-+O nome ou endereço IP da máquina (um nome de máquina será traduzido para
-+um  endereço IP) da interface. Este parâmetro é necessário, apesar
-+da sintaxe atualmente não requisitá-lo.
- .SH NOTAS
--
--+Since kernel release 2.2 there are no explicit interface statistics for
--+alias interfaces anymore. The statistics printed for the original address
--+are shared with all alias addresses on the same device. If you want per-address
--+statistics you should add explicit accounting
--+rules for the address using the
--+.BR ipchains(8)
--+command.
--
--Deste o kernel 2.2 n�o existem mais estat�sticas expl�citas para os apelidos (aliases)
--de interfaces. As estat�sticas mostradas para o endere�o original s�o compartilhadas
--como todos os endere�os associados ao mesmo dispositivo. Se desejar estat�sticas
--por endere�o voc� deve explicitamente adicionar regras de contabiliza��o para os
--endere�os usando o comando
--.BR ipchains(8)
-+Deste o kernel 2.2 não existem mais estatísticas explícitas para os apelidos (aliases)
-+de interfaces. As estatísticas mostradas para o endereço original são compartilhadas
-+como todos os endereços associados ao mesmo dispositivo. Se desejar estatísticas
-+por endereço você deve explicitamente adicionar regras de contabilização para os
-+endereços usando o comando
-+.BR iptables(8)
- .
- 
- .SH ARQUIVOS
--.I /proc/net/socket 
--.br
- .I /proc/net/dev
- .SH BUGS
--Os endere�os appletalk DDP e IPX ser�o mostrados, mas n�o podem ser alterados
-+Os endereços appletalk DDP e IPX serão mostrados, mas não podem ser alterados
- com este comando.
--.SH VEJA TAMB�M
--route(8), netstat(8), arp(8), rarp(8), ipchains(8)
-+.SH VEJA TAMBÉM
-+route(8), netstat(8), arp(8), rarp(8), iptables(8)
- .SH AUTORES
- Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
- Alan Cox, <Alan.Cox@linux.org>
--.SH TRADU��O E REVIS�O PARA A L�NGUA PORTUGUESA
--Arnaldo Carvalho de Melo <acme@conectiva.com.br> (tradu��o)
-+.SH TRADUÇÃO E REVISÃO PARA A LÍNGUA PORTUGUESA
-+Arnaldo Carvalho de Melo <acme@conectiva.com.br> (tradução)
- .BR
--Jorge Luiz Godoy Filho <jorge@bestway.com.br> (revis�o)
-+Jorge Luiz Godoy Filho <jorge@bestway.com.br> (revisão)
- 
-diff --git a/man/pt_BR/netstat.8 b/man/pt_BR/netstat.8
-index b9b359a..d2d04ef 100644
---- a/man/pt_BR/netstat.8
-+++ b/man/pt_BR/netstat.8
-@@ -5,13 +5,13 @@
- .\"
- .\" Modificado por: Bernd.Eckenfels@inka.de
- .\" Modificado por: Andi Kleen ak@muc.de
--.\" Traduzido para portugu�s por Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-+.\" Traduzido para português por Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- .\" Revisado por Jorge Luiz Godoy Filho <jorge@bestway.com.br>
- .\"
--.TH NETSTAT 8 "19 de maio de 1997" "net-tools" "Manual do Programador Linux"
-+.TH NETSTAT 8 "2007-12-02" "net-tools" "Manual do Programador Linux"
- 
- .SH NOME
--netstat \- Mostra conex�es de rede, tabelas de roteamento, estat�sticas de interface e conex�es
-+netstat \- Mostra conexões de rede, tabelas de roteamento, estatísticas de interface e conexões
- mascaradas.
- .SH SINOPSE
- 
-@@ -19,6 +19,8 @@ mascaradas.
- .RB [ \-venaoc ]
- .RB [ \-\-tcp | \-t ]
- .RB [ \-\-udp | \-u ]
-+.RB [ \-\-udplite | \-U ]
-+.RB [ \-\-sctp | \-S ]
- .RB [ \-\-raw | \-w ]
- .RB [ \-\-unix | \-x ] 
- .RB [ \-\-inet | \-\-ip ]
-@@ -63,90 +65,90 @@ mascaradas.
- .RB { \-h | \-\-help }
- 
- .PP
--.SH DESCRI��O
-+.SH DESCRIÇÃO
- .B netstat
--mostra informa��es do subsistema de rede do Linux.
-+mostra informações do subsistema de rede do Linux.
- 
--.SS "(sem op��es)"
--Voc� pode ver o estado das conex�es de rede atrav�s da listagem dos sockets
--abertos. Esta � a opera��o padr�o: se voc� n�o especificar nenhuma
--fam�lia de endere�os, os sockets ativos de todas as fam�lias de endere�os
--configuradas ser�o mostrados. Com
-+.SS "(sem opções)"
-+Você pode ver o estado das conexões de rede através da listagem dos sockets
-+abertos. Esta é a operação padrão: se você não especificar nenhuma
-+família de endereços, os sockets ativos de todas as famílias de endereços
-+configuradas serão mostrados. Com
- .B -e
--voc� obter� informa��es adicionais (userid). Com a chave
-+você obterá informações adicionais (userid). Com a chave
- .B -v
--voc� poder� fazer com que o netstat reclame sobre fam�lias de endere�os
--conhecidas que n�o sejam suportadas pelo kernel. A op��o
-+você poderá fazer com que o netstat reclame sobre famílias de endereços
-+conhecidas que não sejam suportadas pelo kernel. A opção
- .B -o
--mostra algumas informa��es adicionais sobre temporizadores de rede.
-+mostra algumas informações adicionais sobre temporizadores de rede.
- .B -a
--mostra todos os sockets, incluindo sockets de servidores. A fam�lia de
--endere�os
-+mostra todos os sockets, incluindo sockets de servidores. A família de
-+endereços
- .B inet
--mostrar� sockets raw, udp e tcp.
-+mostrará sockets raw, udp e tcp.
- 
- .SS "\-r, \-\-route"
--Com a op��o
-+Com a opção
- .BR \-r ", " \-\-route
--voc� obter� as tabelas de roteamento do kernel no mesmo formato usado por
-+você obterá as tabelas de roteamento do kernel no mesmo formato usado por
- .BR "route -e" .
- .B "netstat -er" 
--usar� o formato de apresenta��o do comando
-+usará o formato de apresentação do comando
- .BR route .
- Por favor veja
- .BR route (8)
- para maiores detalhes.
- 
--.SS "\-i, \-\-interface \fIiface\fI"
--Se voc� usar a op��o
-+.SS "\-i, \-\-interfaces \fIiface\fI"
-+Se você usar a opção
- .BR -i ", " --interfaces
- , uma tabela de todas (ou da
- .IR iface
--especificada) as interfaces de rede ser� mostrada. A sa�da usa o formato
-+especificada) as interfaces de rede será mostrada. A saída usa o formato
- .B "ifconfig -e"
--, e � descrita em
-+, e é descrita em
- .BR ifconfig (8).
- .B "netstat -ei" 
--mostrar� uma tabela ou uma entrada de interface como
-+mostrará uma tabela ou uma entrada de interface como
- .B ifconfig
- mostra. Com a chave
- .B -a
--, voc� pode incluir interfaces que n�o estejam configuradas (i.e. n�o tem
-+, você pode incluir interfaces que não estejam configuradas (i.e. não tem
- a flag 
- .BR U = UP
- configurada).
- 
- .SS "\-M, \-\-masquerade"
- 
--Uma lista de todas as sess�es mascaradas tamb�m pode ser vista. Com a chave
-+Uma lista de todas as sessões mascaradas também pode ser vista. Com a chave
- .B -e 
--voc� pode incluir mais algumas informa��es sobre numera��o sequencial e deltas
--, causados por reescritas de dados em sess�es FTP (comando PORT).
--O suporte a mascaramento � usado para esconder m�quinas em endere�os de
--rede n�o oficiais do resto do mundo, como descrito em
--.BR ipfw (4), ipfwadm "(8) e ipfw (8).
-+você pode incluir mais algumas informações sobre numeração sequencial e deltas
-+, causados por reescritas de dados em sessões FTP (comando PORT).
-+O suporte a mascaramento é usado para esconder máquinas em endereços de
-+rede não oficiais do resto do mundo, como descrito em
-+.BR iptables (8).
- 
- .SS "\-s, \-\-statistics"
- 
--Mostra estat�sticas sobre o subsistema de rede do kernel do Linux, que 
--s�o lidas a partir de
-+Mostra estatísticas sobre o subsistema de rede do kernel do Linux, que 
-+são lidas a partir de
- .IR /proc/net/snmp .
- 
- .PP
--.SH OP��ES
-+.SH OPÇÕES
- .SS "\-v, \-\-verbose"
--Informa ao usu�rio o que est� ocorrendo, sendo detalhado. Especialmente 
--mostra algumas informa��es �teis sobre fam�lias de endere�os n�o 
-+Informa ao usuário o que está ocorrendo, sendo detalhado. Especialmente 
-+mostra algumas informações úteis sobre famílias de endereços não 
- configuradas.
- 
- .SS "\-n, \-\-numeric"
--Mostra endere�os num�ricos, sem tentar resolver os nomes da m�quina, porta ou
--usu�rio.
-+Mostra endereços numéricos, sem tentar resolver os nomes da máquina, porta ou
-+usuário.
- 
--.SS "\-A, \-\-af \fIfam�lia\fI"
--Usa um m�todo diferente para configurar as fam�lias de endere�os.
--.I fam�lia 
--� uma lista de palavras-chave de fam�lias de endere�os separadas por v�rgulas
-+.SS "\-A, \-\-af \fIfamília\fI"
-+Usa um método diferente para configurar as famílias de endereços.
-+.I família 
-+é uma lista de palavras-chave de famílias de endereços separadas por vírgulas
- (',') como
- .BR inet , 
- .BR unix , 
-@@ -155,7 +157,7 @@ Usa um m
- .B netrom 
- e
- .BR ddp .
--Tem o mesmo efeito de usar as op��es longas
-+Tem o mesmo efeito de usar as opções longas
- .BR \-\-inet ,
- .BR \-\-unix ,
- .BR \-\-ipx ,
-@@ -165,99 +167,99 @@ e
- .BR \-\-ddp.
- 
- .SS "\-c, \-\-continuous"
--Isto far� com que 
-+Isto fará com que 
- .B netstat
--mostre a tabela selecionada a cada segundo, continuamente na tela at� que
--voc� o interrompa.
-+mostre a tabela selecionada a cada segundo, continuamente na tela até que
-+você o interrompa.
- 
- .PP
--.SH SA�DA
-+.SH SAÍDA
- 
- .PP
--.SS Conex�es Internet Ativas \fR(TCP, UDP, RAW)\fR
-+.SS Conexões Internet Ativas \fR(TCP, UDP, RAW)\fR
- 
- .SS "Proto" 
- O protocolo (tcp, udp, raw) usado pelo socket.
- 
- .SS "Recv-Q"
--O contador de bytes n�o copiados pelo programa conectado a este socket.
-+O contador de bytes não copiados pelo programa conectado a este socket.
- 
- .SS "Send-Q"
--O contador de bytes n�o confirmados pela m�quina remota.
-+O contador de bytes não confirmados pela máquina remota.
- 
--.SS "Endere�o Local" 
--O endere�o local (nome da m�quina local) e o numero da porta do socket. A menos
-+.SS "Endereço Local" 
-+O endereço local (nome da máquina local) e o numero da porta do socket. A menos
- que a chave
- .B -n
--seja especificada o endere�o do socket ser� resolvido para seu nome de m�quina
--can�nico e o n�mero da porta ser� traduzido para o servi�o correspondente.
-+seja especificada o endereço do socket será resolvido para seu nome de máquina
-+canônico e o número da porta será traduzido para o serviço correspondente.
- 
--.SS "Endere�o Remoto"
--O endere�o remoto (nome da m�quina remota) e o n�mero da porta do socket. Como
--com o endere�o local, a chave
-+.SS "Endereço Remoto"
-+O endereço remoto (nome da máquina remota) e o número da porta do socket. Como
-+com o endereço local, a chave
- .B -n
--desliga a resolu��o do nome da m�quina e do servi�o.
-+desliga a resolução do nome da máquina e do serviço.
- 
- .SS "Estado"
--O estado do socket. Uma vez que n�o existem estados no modo RAW e normalmente
--nenhum estado � usado em UDP, esta linha pode ser deixada em branco. Normalmente
--ele pode assumir um de v�rios valores:
-+O estado do socket. Uma vez que não existem estados no modo RAW e normalmente
-+nenhum estado é usado em UDP, esta linha pode ser deixada em branco. Normalmente
-+ele pode assumir um de vários valores:
- .TP
- .I
- ESTABELECIDO
--O socket tem uma conex�o estabelecida.
-+O socket tem uma conexão estabelecida.
- .TP
- .I
- SYN_SENT
--O socket est� ativamente tentando estabelecer uma conex�o.
-+O socket está ativamente tentando estabelecer uma conexão.
- .TP
- .I
- SYN_RECV
--Uma requisi��o de conex�o foi recebida da rede.
-+Uma requisição de conexão foi recebida da rede.
- .TP
- .I
- FIN_WAIT1
--O socket est� fechado e a conex�o est� terminando.
-+O socket está fechado e a conexão está terminando.
- .TP
- .I
- FIN_WAIT2
--A conex�o est� fechada e o socket est� esperando por uma termina��o pela
--m�quina remota.
-+A conexão está fechada e o socket está esperando por uma terminação pela
-+máquina remota.
- .TP
- .I
- TIME_WAIT
--O socket est� esperando ap�s o fechamento para tratar os pacotes ainda na rede.
-+O socket está esperando após o fechamento para tratar os pacotes ainda na rede.
- .TP
- .I
- FECHADO
--O socket n�o est� sendo usado.
-+O socket não está sendo usado.
- .TP
- .I
- CLOSE_WAIT
- O lado remoto terminou, esperando pelo fechamento do socket.
- .TP
- .I
--�LTIMO_ACK
--O lado remoto terminou, e o socket est� fechado. Esperando por uma
--confirma��o.
-+ÚLTIMO_ACK
-+O lado remoto terminou, e o socket está fechado. Esperando por uma
-+confirmação.
- .TP
- .I
- OUVINDO
--O socket est� ouvindo por conex�es. Estes socket s�o somente mostrados se
-+O socket está ouvindo por conexões. Estes socket são somente mostrados se
- a chave
- .BR -a , --listening
- for especificada.
- .TP
- .I
- FECHANDO
--Ambos os sockets est�o terminados mas n�s ainda n�o enviamos todos os nossos
-+Ambos os sockets estão terminados mas nós ainda não enviamos todos os nossos
- dados.
- .TP
- .I
- DESCONHECIDO
--O estado do socket � desconhecido.
-+O estado do socket é desconhecido.
- 
--.SS "Usu�rio"
-+.SS "Usuário"
- O nome ou UID do dono do socket.
- 
- .SS "Temporizador"
-@@ -272,198 +274,195 @@ O nome ou UID do dono do socket.
- O protocolo (normalmente unix) usado pelo socket.
- 
- .SS "CntRef"
--O contador de refer�ncias (i.e. processos conectados via este socket).
-+O contador de referências (i.e. processos conectados via este socket).
- 
- .SS "Flags"
--As flags mostradas s�o SO_ACCEPTON (mostrada como 
-+As flags mostradas são SO_ACCEPTON (mostrada como 
- .BR ACC ),
- SO_WAITDATA 
- .RB ( W )
- ou SO_NOSPACE 
- .RB ( N ). 
- SO_ACCECPTON 
--� usada para sockets n�o-conectados se seus processos correspondentes
--estiverem esperando por uma solicita��o de conex�o. As demais flags n�o
--s�o de interesse comum.
-+é usada para sockets não-conectados se seus processos correspondentes
-+estiverem esperando por uma solicitação de conexão. As demais flags não
-+são de interesse comum.
- 
- .SS "Tipos"
--H� diversos tipos de acesso a sockets:
-+Há diversos tipos de acesso a sockets:
- .TP
- .I
- SOCK_DGRAM
--O socket � usado no modo de Datagramas (sem conex�o).
-+O socket é usado no modo de Datagramas (sem conexão).
- .TP
- .I
- SOCK_STREAM
--� um socket usado quando h� conex�es (stream socket).
-+É um socket usado quando há conexões (stream socket).
- .TP
- .I
- SOCK_RAW
--� usado como o socket b�sico (raw socket).
-+É usado como o socket básico (raw socket).
- .TP
- .I
- SOCK_RDM
--Este � usado para confirma��o de entrega de mensagens.
-+Este é usado para confirmação de entrega de mensagens.
- .TP
- .I
- SOCK_SEQPACKET
--� um socket para um pacote sequencial.
-+É um socket para um pacote sequencial.
- .TP
- .I
- SOCK_PACKET
--Socket para acesso da interface B�SICA.
-+Socket para acesso da interface BÁSICA.
- .TP
- .I
- UNKNOWN
--Quem sabe o que nos trar� o futuro? Preencha aqui :-)
-+Quem sabe o que nos trará o futuro? Preencha aqui :-)
- 
- .PP
- .SS "Estados"
--Este campo conter� uma das seguintes palavras-chave:
-+Este campo conterá uma das seguintes palavras-chave:
- .TP
- .I
- FREE
--Este socket n�o est� alocado.
-+Este socket não está alocado.
- .TP
- .I
- LISTENING
--O socket est� aguardando por uma solicita��o de conex�o. S�o mostrados
--apenas se as op��es
-+O socket está aguardando por uma solicitação de conexão. São mostrados
-+apenas se as opções
- .BR -a , --listening
- forem selecionadas.
- .TP
- .I
- CONNECTING
--O socket est� por estabelecer uma conex�o.
-+O socket está por estabelecer uma conexão.
- .TP
- .I
- CONNECTED
--O socket est� conectado.
-+O socket está conectado.
- .TP
- .I
- DISCONNECTING
--O socket est� desconectado.
-+O socket está desconectado.
- .TP
- .I
- (nada)
--O socket n�o est� conectado a nenhum outro.
-+O socket não está conectado a nenhum outro.
- .TP
- .I
- UNKNOWN
--Isto n�o deve acontecer nunca.
-+Isto não deve acontecer nunca.
- 
- .SS "Path"
--Mostra o caminho (path) do processo do qual est� tratando esse socket.
-+Mostra o caminho (path) do processo do qual está tratando esse socket.
- 
- .PP
- .SS Sockets IPX ativos
- 
--(Isso precisa ser feito por algu�m que saiba faz�-lo.)
-+(Isso precisa ser feito por alguém que saiba fazê-lo.)
- 
- .PP
- .SS Sockets NET/ROM ativos
- 
--(Isso precisa ser feito por algu�m que saiba faz�-lo.)
-+(Isso precisa ser feito por alguém que saiba fazê-lo.)
- 
- .PP
- .SS Sockets AX.25 ativos
- 
--(Isso precisa ser feito por algu�m que saiba faz�-lo.)
-+(Isso precisa ser feito por alguém que saiba fazê-lo.)
- 
- .PP
- .SH NOTAS
--Desde o kernel 2.2 o netstat -i n�o mostra estat�sticas para apelidos (aliases)
--de interfaces. Para obter contadores por apelido de interface voc� precisa
--configurar regras expl�citas usando o comando
--+.BR ipchains(8)
-+Desde o kernel 2.2 o netstat -i não mostra estatísticas para apelidos (aliases)
-+de interfaces. Para obter contadores por apelido de interface você precisa
-+configurar regras explícitas usando o comando
-++.BR iptables(8)
- .
- .SH FILES
- .ta
- .I /etc/services
---- O arquivo de "tradu��o" (correspond�ncia) entre socket e servi�o.
-+-- O arquivo de "tradução" (correspondência) entre socket e serviço.
- 
- .I /proc/net/dev
---- Informa��es de dispositivos.
-+-- Informações de dispositivos.
- 
- .I /proc/net/snmp
---- Estat�sticas da rede.
-+-- Estatísticas da rede.
- 
- .I /proc/net/raw
---- Informa��o sobre o socket B�SICO (RAW).
-+-- Informação sobre o socket BÁSICO (RAW).
- 
- .I /proc/net/tcp
---- Informa��o sobre o socket TCP.
-+-- Informação sobre o socket TCP.
- 
- .I /proc/net/udp
---- Informa��o sobre o socket UDP.
-+-- Informação sobre o socket UDP.
- 
- .I /proc/net/unix
---- Informa��o sobre o socket de dom�nio Unix.
-+-- Informação sobre o socket de domínio Unix.
- 
- .I /proc/net/ipx
---- Informa��o sobre o socket IPX.
-+-- Informação sobre o socket IPX.
- 
- .I /proc/net/ax25
---- Informa��o sobre o socket AX25.
-+-- Informação sobre o socket AX25.
- 
- .I /proc/net/appletalk
---- Informa��o sobre o socket DDP (Appletalk).
-+-- Informação sobre o socket DDP (Appletalk).
- 
- .I /proc/net/nr
---- Informa��o sobre o socket NET/ROM.
-+-- Informação sobre o socket NET/ROM.
- 
- .I /proc/net/route
---- Informa��o sobre os roteamentos IP realizados pelo kernel
-+-- Informação sobre os roteamentos IP realizados pelo kernel
- 
- .I /proc/net/ax25_route
---- Informa��o sobre os roteamentos AX25 realizados pelo kernel
-+-- Informação sobre os roteamentos AX25 realizados pelo kernel
- 
- .I /proc/net/ipx_route
---- Informa��o sobre os roteamentos IPX realizados pelo kernel
-+-- Informação sobre os roteamentos IPX realizados pelo kernel
- 
- .I /proc/net/nr_nodes
---- Lista de n�s NET/ROM do kernel
-+-- Lista de nós NET/ROM do kernel
- 
- .I /proc/net/nr_neigh
- -- "Vizinhos" NET/ROM do kernel
- 
- .I /proc/net/ip_masquerade
---- Conex�es mascaradas do kernel
-+-- Conexões mascaradas do kernel
- 
- .fi
- 
- .PP
--.SH VEJA TAMB�M
-+.SH VEJA TAMBÉM
- .BR route (8), 
- .BR ifconfig (8), 
--.BR ipfw (4), 
--.BR ipfw (8), 
--.BR ipfwadm (8)
--.BR ipchains (8)
-+.BR iptables (8)
- 
- .PP
- .SH BUGS
--Ocasionalmente informa��es estranhas podem surgir se um socket mudar
--enquanto � visualizado. Isso � incomum.
-+Ocasionalmente informações estranhas podem surgir se um socket mudar
-+enquanto é visualizado. Isso é incomum.
- .br
--As op��es descritas para
-+As opções descritas para
- .B netstat -i
--foram descritas como dever�o funcionar ap�s alguma limpeza da libera��o
-+foram descritas como deverão funcionar após alguma limpeza da liberação
- BETA do pacote net-tools.
- 
- .PP
- .SH AUTORES
--A interface com o usu�rio foi escrita por Fred Baumgarten
--<dc6iq@insu1.etec.uni-karlsruhe.de> a p�gina do manual basicamente
-+A interface com o usuário foi escrita por Fred Baumgarten
-+<dc6iq@insu1.etec.uni-karlsruhe.de> a página do manual basicamente
- por Matt Welsh <mdw@tc.cornell.edu>. Foi atualizada por
- Alan Cox <Alan.Cox@linux.org> mas poderia ter sido feita com um pouco
- mais de trabalho.
- .BR
- .LP
--A p�gina do manual e os comandos inclu�dos no pacote net-tools
-+A página do manual e os comandos incluídos no pacote net-tools
- foram totalmente reescritos desde Bernd Eckenfels
- <ecki@linux.de>.
- .BR
--.SH TRADU��O E REVIS�O PARA PORTUGU�S
--Traduzido para o portugu�s por Arnaldo Carvalho de Melo
-+.SH TRADUÇÃO E REVISÃO PARA PORTUGUÊS
-+Traduzido para o português por Arnaldo Carvalho de Melo
- <acme@conectiva.com.br> e Jorge Luiz Godoy Filho <jorge@bestway.com.br>.
-diff --git a/man/pt_BR/rarp.8 b/man/pt_BR/rarp.8
-index de31931..b19f1b7 100644
---- a/man/pt_BR/rarp.8
-+++ b/man/pt_BR/rarp.8
-@@ -2,30 +2,30 @@
- .SH NOME
- rarp \- manipula a tabela RARP do sistema
- .SH SINOPSE
--.B "rarp [-v] [-t tipo] -a [m�quina]"
-+.B "rarp [-v] [-t tipo] -a [máquina]"
- .br
--.B "rarp [-v] -d m�quina ..."
-+.B "rarp [-v] -d máquina ..."
- .br
--.B "rarp [-v] [-t tipo] -s m�quina endere�o_hardware"
--.SH DESCRI��O
-+.B "rarp [-v] [-t tipo] -s máquina endereço_hardware"
-+.SH DESCRIÇÃO
- .B Rarp
--manipula as tabelas RARP do kernel de varias formas. As op��es principais
--s�o limpar uma entrada de mapeamento de endere�os e manualmente configurar uma.
--Para prop�sitos de depura��o, o programa
-+manipula as tabelas RARP do kernel de varias formas. As opções principais
-+são limpar uma entrada de mapeamento de endereços e manualmente configurar uma.
-+Para propósitos de depuração, o programa
- .B rarp
--tamb�m permite um dump completo da tabela RARP.
--.SH OP��ES
-+também permite um dump completo da tabela RARP.
-+.SH OPÇÕES
- .TP
- .B \-v
--Informe o usu�rio o que esta acontecendo, sendo detalhado.
-+Informe o usuário o que esta acontecendo, sendo detalhado.
- .TP
- .B "\-t tipo"
--quando configurando ou lendo a tabela RARP, este par�metro opcional informa ao
-+quando configurando ou lendo a tabela RARP, este parâmetro opcional informa ao
- .B rarp
--que classe de entradas devem ser verificadas. O valor default para este par�metro
--�
-+que classe de entradas devem ser verificadas. O valor default para este parâmetro
-+é
- .B ether
--(i.e. c�digo de hardware
-+(i.e. código de hardware
- .B 0x01
- para
- .B "IEEE 802.3 10Mbps Ethernet".
-@@ -34,31 +34,31 @@ Outros valores podem incluir tecnologias de rede como
- e
- .B NET/ROM (netrom).
- .TP
--.B "\-a [m�quina]"
--Mostra as entradas  dos m�quinas especificadas.  Se o
--Mostra as entradas das m�quinas especificadas. Se o par�metro
--.B m�quina
--n�o for usado 
-+.B "\-a [máquina]"
-+Mostra as entradas  dos máquinas especificadas.  Se o
-+Mostra as entradas das máquinas especificadas. Se o parâmetro
-+.B máquina
-+não for usado 
- .B todas
--as entradas ser�o mostradas.
-+as entradas serão mostradas.
- .TP
--.B "\-d m�quina"
--Remove a(s) entrada(s) para a m�quina especificada. Isto pode ser usado se a
--m�quina indicada for desligada, por exemplo.
-+.B "\-d máquina"
-+Remove a(s) entrada(s) para a máquina especificada. Isto pode ser usado se a
-+máquina indicada for desligada, por exemplo.
- .TP
--.B "\-s m�quina endere�o_hardware"
--Cria um mapeamento de endere�os RARP para a m�quina
--.B m�quina
--com endere�o de hardware configurado para
--.B endere�o_hardware
--.  O formato do endere�o de hardware depende da classe do hardware, mas
--para a maioria das classes voc� pode assumir que a apresenta��o usual pode
--ser usada.  Para a classe Ethernet, s�o 6 bytes em hexadecimal, separados
-+.B "\-s máquina endereço_hardware"
-+Cria um mapeamento de endereços RARP para a máquina
-+.B máquina
-+com endereço de hardware configurado para
-+.B endereço_hardware.
-+O formato do endereço de hardware depende da classe do hardware, mas
-+para a maioria das classes você pode assumir que a apresentação usual pode
-+ser usada.  Para a classe Ethernet, são 6 bytes em hexadecimal, separados
- por dois pontos (:).
--.SH ATEN��O
--Alguns arquivos (principalmente Suns velhas) assumem que a m�quina respondendo
--ao query ARP tamb�m podem oferecer outros servi�os de boot remoto. Portanto
--nunca adiciona gratuitamente entradas rarp a menos que deseje encontrar a f�ria
-+.SH ATENÇÃO
-+Alguns arquivos (principalmente Suns velhas) assumem que a máquina respondendo
-+ao query ARP também podem oferecer outros serviços de boot remoto. Portanto
-+nunca adiciona gratuitamente entradas rarp a menos que deseje encontrar a fúria
- do administrador da rede.
- .SH ARQUIVOS
- .I /proc/net/rarp,
-@@ -66,5 +66,5 @@ do administrador da rede.
- Ross D. Martin, <martin@trcsun3.eas.asu.edu>
- .br
- Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
--.SH TRADU��O
-+.SH TRADUÇÃO
- Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 13/04/1998
-diff --git a/man/pt_BR/route.8 b/man/pt_BR/route.8
-index c440974..eb152e2 100644
---- a/man/pt_BR/route.8
-+++ b/man/pt_BR/route.8
-@@ -50,44 +50,44 @@ If]
- .RB [ \--help ]
- .SH DESCRICAO
- .B Route
--manipula a tabela de roteamento IP do kernel. Seu principal uso �
--configurar rotas est�ticas para hosts ou redes especificadas atrav�s de
--uma interface, ap�s a mesma ter sido configurada com o programa 
-+manipula a tabela de roteamento IP do kernel. Seu principal uso é
-+configurar rotas estáticas para hosts ou redes especificadas através de
-+uma interface, após a mesma ter sido configurada com o programa 
- .BR ifconfig (8)
- .
- 
--.SH OP��ES
-+.SH OPÇÕES
- .TP
- .B \-v
--flag para detalhamento (n�o usada).
-+flag para detalhamento (não usada).
- 
- .TP
- .B \-n
--mostra endere�os num�ricos, sem tentar resolver o nomes simb�licos das
--m�quinas. �til se voc� esta tentando determinar por que a rota para o seu
-+mostra endereços numéricos, sem tentar resolver o nomes simbólicos das
-+máquinas. Útil se você esta tentando determinar por que a rota para o seu
- servidor de nomes sumiu.
- 
- .TP
- .B \-e
- use o formato 
- .BR netstat (8)
--na apresenta��o da tabela de roteamento.
-+na apresentação da tabela de roteamento.
- .B \-ee 
--produzira uma linha bem grande com todos os par�metros da tabela de roteamento.
-+produzira uma linha bem grande com todos os parâmetros da tabela de roteamento.
- 
- .TP
- .B \-net
- o
- .B Alvo
--� o endere�o de uma rede (encontrado no arquivo
-+é o endereço de uma rede (encontrado no arquivo
- .I /etc/networks
--pela fun��o 
-+pela função 
- .BR getnetbyname (2) 
- ).
- 
- .TP
- .B -host
--� o endere�o de uma m�quina (descoberto com a fun��o 
-+é o endereço de uma máquina (descoberto com a função 
- .BR gethostbyname (2)
- ).
- 
-@@ -110,150 +110,150 @@ adiciona uma rota.
- 
- .TP
- .B Alvo
--A m�quina ou rede destino. Voc� pode fornecer endere�os IP em formato
--decimal separado por pontos ou nomes de m�quinas/redes.
-+A máquina ou rede destino. Você pode fornecer endereços IP em formato
-+decimal separado por pontos ou nomes de máquinas/redes.
- 
- .TP
- .B netmask Nm
- modificador para especificar a mascara de rede da rota a ser adicionada.
--Somente faz sentido para uma rota para uma rede e quanto o endere�o
-+Somente faz sentido para uma rota para uma rede e quanto o endereço
- .B Alvo
--� valido com rela��o a mascara especificada. Se nenhuma mascara de rede
-+é valido com relação a mascara especificada. Se nenhuma mascara de rede
- for especificada, o comando
- .B route
--descobre-a, desta forma, para a maioria das configura��es normais voc� n�o
-+descobre-a, desta forma, para a maioria das configurações normais você não
- precisa especificar uma mascara de rede.
- 
- .TP
- .B gw Gw
--Quaisquer pacotes IP para a rede/m�quina destino ser�o roteadas atrav�s
-+Quaisquer pacotes IP para a rede/máquina destino serão roteadas através
- do gateway/roteador especificado.
- .B NOTA:
--O gateway especificado deve ser alcan��vel antes deste comando. Isto
--normalmente significa que voc� ter� que configurar uma rota est�tica para
--o gateway antes de emitir este comando. Se voc� especificar o endere�o
--de uma de suas interfaces locais, isto ser� usado para decidir sobre
--qual interface deve ser usada para rotear os pacotes. Isto esta dispon�vel
-+O gateway especificado deve ser alcançável antes deste comando. Isto
-+normalmente significa que você terá que configurar uma rota estática para
-+o gateway antes de emitir este comando. Se você especificar o endereço
-+de uma de suas interfaces locais, isto será usado para decidir sobre
-+qual interface deve ser usada para rotear os pacotes. Isto esta disponível
- para manter compatibilidade com os sistemas baseados em BSD.
- 
- .TP
- .B metric M
--Configura o campo de m�trica na tabela de roteamento, usado em daemons
--para roteamento din�mico.
-+Configura o campo de métrica na tabela de roteamento, usado em daemons
-+para roteamento dinâmico.
- 
- .TP 
- .B mss M
--Especifica o Tamanho M�ximo do Segmento TCP em Bytes (MSS) para conex�es
--TCP atrav�s desta rota. Isto � normalmente usado somente para otimiza��o
--fina de configura��es de roteamento. 
-+Especifica o Tamanho Máximo do Segmento TCP em Bytes (MSS) para conexões
-+TCP através desta rota. Isto é normalmente usado somente para otimização
-+fina de configurações de roteamento. 
- 
- .TP 
- .B window W 
--Especifica o tamanho da janela TCP para conex�es TCP atrav�s desta rota.
-+Especifica o tamanho da janela TCP para conexões TCP através desta rota.
- Tipicamente somente usado para redes AX.25 e em drivers incapazes de
- de tratar frames back to back.
- 
- .TP
- .B irtt I
--Especifica o tempo de ida e volta inicial (irtt) para conex�es TCP atrav�s
--desta rota. Tipicamente usado somente em redes AX.25. O numero � especificado
--em milisegundos (1-12000). Se omitido o default da RFC 1122 de 300ms � usado.
-+Especifica o tempo de ida e volta inicial (irtt) para conexões TCP através
-+desta rota. Tipicamente usado somente em redes AX.25. O numero é especificado
-+em milisegundos (1-12000). Se omitido o default da RFC 1122 de 300ms é usado.
- 
- .TP
- .B reject
--Instala uma rota de bloqueio, que for�ar� falha na procura por esta rota.
--Exemplo de utiliza��o: bloquear rotas antes do uso da rota default.
--Isto n�o � firewalling.
-+Instala uma rota de bloqueio, que forçará falha na procura por esta rota.
-+Exemplo de utilização: bloquear rotas antes do uso da rota default.
-+Isto não é firewalling.
- 
- .TP
- .B mod, dyn, reinstate
--Instala uma rota modificada ou din�mica. Ambas as flags s�o geralmente somente
--configuradas por um daemon de roteamento. Somente para prop�sitos de diagnostico.
-+Instala uma rota modificada ou dinâmica. Ambas as flags são geralmente somente
-+configuradas por um daemon de roteamento. Somente para propósitos de diagnostico.
- 
- .TP
- .B dev If
--For�a a associa��o da rota com o dispositivo especificado, pois o kernel
--de outra forma tentara determinar o dispositivo por conta pr�pria
--(atrav�s da checagem de rotas e especifica��es de dispositivos j� existentes
-+Força a associação da rota com o dispositivo especificado, pois o kernel
-+de outra forma tentara determinar o dispositivo por conta própria
-+(através da checagem de rotas e especificações de dispositivos já existentes
- e onde a rota esta adicionada).
- 
- If 
- .B dev If
--� a �ltima op��o na linha de comando, a palavra
-+é a última opção na linha de comando, a palavra
- .B dev
--pode ser omitida, pois � o default. De outra forma a ordem dos outros
--modificadores do route (metric - netmask - gw - dev) n�o importa.
-+pode ser omitida, pois é o default. De outra forma a ordem dos outros
-+modificadores do route (metric - netmask - gw - dev) não importa.
- 
- .SH EXEMPLOS
- .TP
- .B route add -net 127.0.0.0
- Adiciona a entrada para a interface loopback normal, usando mascara igual
--a 255.0.0.0 (rede classe A, determinada a partir do endere�o de destino),
-+a 255.0.0.0 (rede classe A, determinada a partir do endereço de destino),
- associada ao dispositivo "lo" (assumindo que este dispositivo tenha sido
- previamente configurado com o
- .BR ifconfig (8)). 
- 
- .TP 
- .B route add -net 192.56.76.0 netmask 255.255.255.0 dev eth0
--Adiciona uma rota para a rede 192.56.76.x atrav�s da interface "eth0". O 
--modificador de mascara classe C n�o � realmente necess�rio aqui por que
--192.* � um endere�o IP de classe C. A palavra "dev" pode ser omitida aqui.
-+Adiciona uma rota para a rede 192.56.76.x através da interface "eth0". O 
-+modificador de mascara classe C não é realmente necessário aqui por que
-+192.* é um endereço IP de classe C. A palavra "dev" pode ser omitida aqui.
- 
- .TP
- .B route add default gw mango-gw
--Adiciona uma rota default (que ser� usada se nenhuma outra rota for encontrada).
--Todos os pacotes que usarem esta rota ser�o passados para a m�quina "mango-gw".
--O dispositivo que ser� utilizado para esta rota depende de como � poss�vel
--alcan�ar "mango-gw" - a rota est�tica para "mango-gw" ter� que ser configurada
-+Adiciona uma rota default (que será usada se nenhuma outra rota for encontrada).
-+Todos os pacotes que usarem esta rota serão passados para a máquina "mango-gw".
-+O dispositivo que será utilizado para esta rota depende de como é possível
-+alcançar "mango-gw" - a rota estática para "mango-gw" terá que ser configurada
- previamente.
- 
- .TP
- .B route add ipx4 sl0
--Adiciona uma rota para a m�quina "ipx4" atrav�s da interface SLIP (assumindo
--que "ipx4" � a m�quina SLIP).
-+Adiciona uma rota para a máquina "ipx4" através da interface SLIP (assumindo
-+que "ipx4" é a máquina SLIP).
- 
- .TP
- .B route add -net 192.57.66.0 netmask 255.255.255.0 gw ipx4
--Este comando adiciona a rede "192.57.66.x" para ser alcan�ada atrav�s da
--rota anterior atrav�s da interface SLIP.
-+Este comando adiciona a rede "192.57.66.x" para ser alcançada através da
-+rota anterior através da interface SLIP.
- 
- .TP
- .B route add -net 224.0.0.0 netmask 240.0.0.0 dev eth0
--Isto � bem obscura, documentada para que as pessoas saibam como us�-la. 
--Configura para que todas as rotas IP classe D (multicast) v�o atrav�s da
--interface "eth0". Esta � a linha de configura��o normal a ser usada com
-+Isto é bem obscura, documentada para que as pessoas saibam como usá-la. 
-+Configura para que todas as rotas IP classe D (multicast) vão através da
-+interface "eth0". Esta é a linha de configuração normal a ser usada com
- um kernel multicast.
- 
- .TP
- .B route add 10.0.0.0 netmask 255.0.0.0 reject
--Esta instala uma rota de rejei��o para a rede privada "10.x.x.x"
-+Esta instala uma rota de rejeição para a rede privada "10.x.x.x"
- 
- .LP
--.SH SA�DA
--A sa�da da tabela de roteamento do kernel � organizada nas seguintes colunas
-+.SH SAÍDA
-+A saída da tabela de roteamento do kernel é organizada nas seguintes colunas
- .TP
- .B Destino     
--A rede ou m�quina de destino.
-+A rede ou máquina de destino.
- .TP
- .B Roteador
--A m�quina roteador ou '*' se nenhuma estiver configurada.
-+A máquina roteador ou '*' se nenhuma estiver configurada.
- .TP
--.B Mascara Gen�rica
--A mascara para a rede destino. '255.255.255.255' para uma m�quina de destino,
--'0.0.0.0' para a rota
-+.B Mascara Genérica
-+A mascara para a rede destino. '255.255.255.255' para uma máquina de
-+destino, '0.0.0.0' para a rota
- .B default
- .
- .TP
- .B Flags 
--Os flags poss�veis s�o
-+Os flags possíveis são
- .br
- .B U
- (rota esta
- .BR Up )
- .br
- .B H
--(alvo � uma
--.BR m�quina )
-+(alvo é uma
-+.BR máquina )
- .br
- .B G
- (use
-@@ -261,7 +261,7 @@ Os flags poss
- .br
- .B R
- .RB ( reinstate
--rota para roteamento din�mico)
-+rota para roteamento dinâmico)
- .br
- .B D
- Instalada
-@@ -278,29 +278,29 @@ Rota
- )
- .TP
- .B Metric 
--A 'dist�ncia' at� o alvo (geralmente contada em hops). N�o � utilizada pelos
-+A 'distância' até o alvo (geralmente contada em hops). Não é utilizada pelos
- kernels recentes, somente daemons de roteamento podem usa-la.
- .TP
- .B Ref    
--Numero de refer�ncias a esta rota. N�o usado no kernel do Linux, sempre 0.
-+Numero de referências a esta rota. Não usado no kernel do Linux, sempre 0.
- .TP
- .B Uso
--Contagem de procuras por esta rota. Nos kernels recentes estes n�meros s�o
--bem baixos, pois os sockets tem seu pr�prio cache e n�o precisam procurar
-+Contagem de procuras por esta rota. Nos kernels recentes estes números são
-+bem baixos, pois os sockets tem seu próprio cache e não precisam procurar
- por rotas.
- .TP
- .B Iface
--Interface atrav�s da qual os pacotes IP ser�o enviados.
-+Interface através da qual os pacotes IP serão enviados.
- .TP
- .B MSS 
--Tamanho m�ximo de segmento default para conex�es TCP atrav�s desta rota.
-+Tamanho máximo de segmento default para conexões TCP através desta rota.
- .TP
- .B Window  
--Tamanho de janela default para conex�es TCP atrav�s desta rota.
-+Tamanho de janela default para conexões TCP através desta rota.
- .TP
- .B irtt
- RTT (Tempo de Ida e Volta) Inicial. O kernel usa isto para inferir os melhores
--par�metros do protocolo TCP sem esperar por respostas (possivelmente lentas).
-+parâmetros do protocolo TCP sem esperar por respostas (possivelmente lentas).
- .LP
- .SH ARQUIVOS
- .I /proc/net/route
-@@ -311,17 +311,17 @@ par
- .br
- .I /etc/init.d/network
- .LP
--.SH VEJA TAMB�M
-+.SH VEJA TAMBÉM
- .I ifconfig(8), netstat(8), arp(8)
- .LP
--.SH HIST�RICO
-+.SH HISTÓRICO
- .B Route
- para o linux foi originalmente escrito por Fred N. van Kempen,
- <waltje@uwalt.nl.mugnet.org> e depois modificado por Johannes Stille e
--Linus Torvalds para a vers�o pl15. Alan Cox adicionou as op��es para
-+Linus Torvalds para a versão pl15. Alan Cox adicionou as opções para
- mss e window no kernel 1.1.22. O suporte a irtt (compartilhado com o
- netstat) foi feito por Bernd Eckenfels.
--.SH TRADU��O
-+.SH TRADUÇÃO
- Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 13/04/1998
- .SH BUGS
- nenhum :)
-diff --git a/mii-tool.c b/mii-tool.c
-index ef2d48a..1cfecc2 100644
---- a/mii-tool.c
-+++ b/mii-tool.c
-@@ -29,8 +29,6 @@
- 	http://www.national.com/pf/DP/DP83840.html
- */
- 
--static char version[] =
--"mii-tool.c 1.9 2000/04/28 00:56:08 (David Hinds)\n";
- 
- #include <unistd.h>
- #include <stdlib.h>
-@@ -46,16 +44,25 @@ static char version[] =
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <net/if.h>
-+#include <linux/sockios.h>
-+
- #ifndef __GLIBC__
- #include <linux/if_arp.h>
- #include <linux/if_ether.h>
- #endif
--#include "mii.h"
-+#include <linux/mii.h>
-+#include <linux/sockios.h>
-+#include "version.h"
-+#include "net-support.h"
-+#include "util.h"
-+
-+static char *Release = RELEASE, *Signature = "David Hinds based on Donald Becker's mii-diag";
- 
- #define MAX_ETH		8		/* Maximum # of interfaces */
-+#define LPA_ABILITY_MASK	0x07e0
- 
- /* Table of known MII's */
--static struct {
-+static const struct {
-     u_short	id1, id2;
-     char	*name;
- } mii_id[] = {
-@@ -64,16 +71,25 @@ static struct {
-     { 0x0000, 0x6b90, "AMD 79C901A HomePNA" },
-     { 0x0000, 0x6b70, "AMD 79C901A 10baseT" },
-     { 0x0181, 0xb800, "Davicom DM9101" },
--    { 0x0043, 0x7411, "Enable EL40-331" },
-+    { 0x0043, 0x7410, "Enable EL40-331" },
-+    { 0x0243, 0x0c50, "ICPlus IP101A" },
-     { 0x0015, 0xf410, "ICS 1889" },
-     { 0x0015, 0xf420, "ICS 1890" },
-     { 0x0015, 0xf430, "ICS 1892" },
-     { 0x02a8, 0x0150, "Intel 82555" },
-     { 0x7810, 0x0000, "Level One LXT970/971" },
-+    { 0x0022, 0x1510, "Micrel KSZ8041" },
-+    { 0x0022, 0x1610, "Micrel KSZ9021" },
-     { 0x2000, 0x5c00, "National DP83840A" },
-+    { 0x2000, 0x5c70, "National DP83865" },
-     { 0x0181, 0x4410, "Quality QS6612" },
-     { 0x0282, 0x1c50, "SMSC 83C180" },
-+    { 0x0203, 0x8460, "STMicroelectronics ST802RT" },
-+    { 0x1c04, 0x0010, "STMicroelectronics STE100P" },
-     { 0x0300, 0xe540, "TDK 78Q2120" },
-+    { 0x0141, 0x0c20, "Yukon 88E1011" },
-+    { 0x0141, 0x0cc0, "Yukon-EC 88E1111" },
-+    { 0x0141, 0x0c90, "Yukon-2 88E1112" },
- };
- #define NMII (sizeof(mii_id)/sizeof(mii_id[0]))
- 
-@@ -81,10 +97,10 @@ static struct {
- 
- struct option longopts[] = {
-  /* { name  has_arg  *flag  val } */
--    {"advertise",	1, 0, 'A'},	/* Change capabilities advertised. */
--    {"force",		1, 0, 'F'},	/* Change capabilities advertised. */
-+    {"advertise",	1, 0, 'A'},	/* Advertise only specified media. */
-+    {"force",		1, 0, 'F'},	/* Force specified media technology. */
-     {"phy",		1, 0, 'p'},	/* Set PHY (MII address) to report. */
--    {"log",		0, 0, 'l'},	/* Set PHY (MII address) to report. */
-+    {"log",		0, 0, 'l'},	/* With --watch, write events to syslog. */
-     {"restart",		0, 0, 'r'},	/* Restart link negotiation */
-     {"reset",		0, 0, 'R'},	/* Reset the transceiver. */
-     {"verbose", 	0, 0, 'v'},	/* Report each action taken.  */
-@@ -112,7 +128,7 @@ static struct ifreq ifr;
- 
- static int mdio_read(int skfd, int location)
- {
--    struct mii_data *mii = (struct mii_data *)&ifr.ifr_data;
-+    struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&ifr.ifr_data;
-     mii->reg_num = location;
-     if (ioctl(skfd, SIOCGMIIREG, &ifr) < 0) {
- 	fprintf(stderr, "SIOCGMIIREG on %s failed: %s\n", ifr.ifr_name,
-@@ -124,7 +140,7 @@ static int mdio_read(int skfd, int location)
- 
- static void mdio_write(int skfd, int location, int value)
- {
--    struct mii_data *mii = (struct mii_data *)&ifr.ifr_data;
-+    struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&ifr.ifr_data;
-     mii->reg_num = location;
-     mii->val_in = value;
-     if (ioctl(skfd, SIOCSMIIREG, &ifr) < 0) {
-@@ -137,40 +153,48 @@ static void mdio_write(int skfd, int location, int value)
- 
- const struct {
-     char	*name;
--    u_short	value;
-+    u_short	value[2];
- } media[] = {
-     /* The order through 100baseT4 matches bits in the BMSR */
--    { "10baseT-HD",	MII_AN_10BASET_HD },
--    { "10baseT-FD",	MII_AN_10BASET_FD },
--    { "100baseTx-HD",	MII_AN_100BASETX_HD },
--    { "100baseTx-FD",	MII_AN_100BASETX_FD },
--    { "100baseT4",	MII_AN_100BASET4 },
--    { "100baseTx",	MII_AN_100BASETX_FD | MII_AN_100BASETX_HD },
--    { "10baseT",	MII_AN_10BASET_FD | MII_AN_10BASET_HD },
-+    { "10baseT-HD",	{LPA_10HALF} },
-+    { "10baseT-FD",	{LPA_10FULL} },
-+    { "100baseTx-HD",	{LPA_100HALF} },
-+    { "100baseTx-FD",	{LPA_100FULL} },
-+    { "100baseT4",	{LPA_100BASE4} },
-+    { "100baseTx",	{LPA_100FULL | LPA_100HALF} },
-+    { "10baseT",	{LPA_10FULL | LPA_10HALF} },
-+
-+    { "1000baseT-HD",	{0, ADVERTISE_1000HALF} },
-+    { "1000baseT-FD",	{0, ADVERTISE_1000FULL} },
-+    { "1000baseT",	{0, ADVERTISE_1000HALF|ADVERTISE_1000FULL} },
- };
- #define NMEDIA (sizeof(media)/sizeof(media[0]))
--	
-+
- /* Parse an argument list of media types */
--static int parse_media(char *arg)
-+static int parse_media(char *arg, unsigned *bmcr2)
- {
-     int mask, i;
-     char *s;
-     mask = strtoul(arg, &s, 16);
-     if ((*arg != '\0') && (*s == '\0')) {
--	if ((mask & MII_AN_ABILITY_MASK) &&
--	    !(mask & ~MII_AN_ABILITY_MASK))
--	    return mask;
-+	if ((mask & LPA_ABILITY_MASK) &&
-+	    !(mask & ~LPA_ABILITY_MASK)) {
-+		*bmcr2 = 0;
-+		return mask;
-+	}
- 	goto failed;
--    } else {
--	mask = 0;
--	s = strtok(arg, ", ");
--	do {
-+    }
-+    mask = 0;
-+    *bmcr2 = 0;
-+    s = strtok(arg, ", ");
-+    do {
- 	    for (i = 0; i < NMEDIA; i++)
--		if (strcasecmp(media[i].name, s) == 0) break;
-+		if (s && strcasecmp(media[i].name, s) == 0) break;
- 	    if (i == NMEDIA) goto failed;
--	    mask |= media[i].value;
--	} while ((s = strtok(NULL, ", ")) != NULL);
--    }
-+	    mask |= media[i].value[0];
-+	    *bmcr2 |= media[i].value[1];
-+    } while ((s = strtok(NULL, ", ")) != NULL);
-+
-     return mask;
- failed:
-     fprintf(stderr, "Invalid media specification '%s'.\n", arg);
-@@ -179,11 +203,25 @@ failed:
- 
- /*--------------------------------------------------------------------*/
- 
--static char *media_list(int mask, int best)
-+static const char *media_list(unsigned mask, unsigned mask2, int best)
- {
-     static char buf[100];
-     int i;
-     *buf = '\0';
-+
-+    if (mask & BMCR_SPEED1000) {
-+	if (mask2 & ADVERTISE_1000HALF) {
-+	    strcat(buf, " ");
-+	    strcat(buf, "1000baseT-HD");
-+	    if (best) goto out;
-+	}
-+	if (mask2 & ADVERTISE_1000FULL) {
-+	    strcat(buf, " ");
-+	    strcat(buf, "1000baseT-FD");
-+	    if (best) goto out;
-+	}
-+    }
-+
-     mask >>= 5;
-     for (i = 4; i >= 0; i--) {
- 	if (mask & (1<<i)) {
-@@ -192,6 +230,7 @@ static char *media_list(int mask, int best)
- 	    if (best) break;
- 	}
-     }
-+ out:
-     if (mask & (1<<5))
- 	strcat(buf, " flow-control");
-     return buf;
-@@ -199,49 +238,82 @@ static char *media_list(int mask, int best)
- 
- int show_basic_mii(int sock, int phy_id)
- {
--    char buf[100];
-+    char buf[200];
-     int i, mii_val[32];
--    int bmcr, bmsr, advert, lkpar;
-+    unsigned bmcr, bmsr, advert, lkpar, bmcr2, lpa2;
- 
-     /* Some bits in the BMSR are latched, but we can't rely on being
-        the only reader, so only the current values are meaningful */
-     mdio_read(sock, MII_BMSR);
--    for (i = 0; i < ((verbose > 1) ? 32 : 8); i++)
--	mii_val[i] = mdio_read(sock, i);
-+    for (i = 0; i < ((verbose > 1) ? 32 : (MII_STAT1000+1)); i++)
-+	switch (i & 0x1F) {
-+	    case MII_BMCR:
-+	    case MII_BMSR:
-+	    case MII_PHYSID1:
-+	    case MII_PHYSID2:
-+	    case MII_ADVERTISE:
-+	    case MII_LPA:
-+	    case MII_EXPANSION:
-+	    case MII_CTRL1000:
-+	    case MII_STAT1000:
-+	    case MII_ESTATUS:
-+	    case MII_DCOUNTER:
-+	    case MII_FCSCOUNTER:
-+	    case MII_NWAYTEST:
-+	    case MII_RERRCOUNTER:
-+	    case MII_SREVISION:
-+	    case MII_RESV1:
-+	    case MII_LBRERROR:
-+	    case MII_PHYADDR:
-+	    case MII_RESV2:
-+	    case MII_TPISTATUS:
-+	    case MII_NCONFIG:
-+		mii_val[i] = mdio_read(sock, i);
-+		break;
-+	    default:
-+		if (verbose > 2)
-+		    mii_val[i] = mdio_read(sock, i);
-+		else
-+		    mii_val[i] = 0;
-+		break;
-+        }
- 
--    if (mii_val[MII_BMCR] == 0xffff) {
-+    if (mii_val[MII_BMCR] == 0xffff  || mii_val[MII_BMSR] == 0x0000) {
- 	fprintf(stderr, "  No MII transceiver present!.\n");
- 	return -1;
-     }
- 
-     /* Descriptive rename. */
-     bmcr = mii_val[MII_BMCR]; bmsr = mii_val[MII_BMSR];
--    advert = mii_val[MII_ANAR]; lkpar = mii_val[MII_ANLPAR];
-+    advert = mii_val[MII_ADVERTISE]; lkpar = mii_val[MII_LPA];
-+    bmcr2 = mii_val[MII_CTRL1000]; lpa2 = mii_val[MII_STAT1000];
- 
-     sprintf(buf, "%s: ", ifr.ifr_name);
--    if (bmcr & MII_BMCR_AN_ENA) {
--	if (bmsr & MII_BMSR_AN_COMPLETE) {
-+    if (bmcr & BMCR_ANENABLE) {
-+	if (bmsr & BMSR_ANEGCOMPLETE) {
- 	    if (advert & lkpar) {
--		strcat(buf, (lkpar & MII_AN_ACK) ?
-+		strcat(buf, (lkpar & LPA_LPACK) ?
- 		       "negotiated" : "no autonegotiation,");
--		strcat(buf, media_list(advert & lkpar, 1));
-+		strcat(buf, media_list(advert & lkpar, bmcr2 & lpa2>>2, 1));
- 		strcat(buf, ", ");
- 	    } else {
- 		strcat(buf, "autonegotiation failed, ");
- 	    }
--	} else if (bmcr & MII_BMCR_RESTART) {
-+	} else if (bmcr & BMCR_ANRESTART) {
- 	    strcat(buf, "autonegotiation restarted, ");
- 	}
-     } else {
- 	sprintf(buf+strlen(buf), "%s Mbit, %s duplex, ",
--	       (bmcr & MII_BMCR_100MBIT) ? "100" : "10",
--	       (bmcr & MII_BMCR_DUPLEX) ? "full" : "half");
-+		((bmcr2 & (ADVERTISE_1000HALF | ADVERTISE_1000FULL)) & lpa2 >> 2)
-+		? "1000"
-+		: (bmcr & BMCR_SPEED100) ? "100" : "10",
-+		(bmcr & BMCR_FULLDPLX) ? "full" : "half");
-     }
--    strcat(buf, (bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link");
-+    strcat(buf, (bmsr & BMSR_LSTATUS) ? "link ok" : "no link");
- 
-     if (opt_watch) {
- 	if (opt_log) {
--	    syslog(LOG_INFO, buf);
-+	    syslog(LOG_INFO, "%s", buf);
- 	} else {
- 	    char s[20];
- 	    time_t t = time(NULL);
-@@ -273,35 +345,36 @@ int show_basic_mii(int sock, int phy_id)
- 		   ((mii_val[2]<<6)|(mii_val[3]>>10))&0xff,
- 		   (mii_val[3]>>4)&0x3f, mii_val[3]&0x0f);
- 	printf("  basic mode:   ");
--	if (bmcr & MII_BMCR_RESET)
-+	if (bmcr & BMCR_RESET)
- 	    printf("software reset, ");
--	if (bmcr & MII_BMCR_LOOPBACK)
-+	if (bmcr & BMCR_LOOPBACK)
- 	    printf("loopback, ");
--	if (bmcr & MII_BMCR_ISOLATE)
-+	if (bmcr & BMCR_ISOLATE)
- 	    printf("isolate, ");
--	if (bmcr & MII_BMCR_COLTEST)
-+	if (bmcr & BMCR_CTST)
- 	    printf("collision test, ");
--	if (bmcr & MII_BMCR_AN_ENA) {
-+	if (bmcr & BMCR_ANENABLE) {
- 	    printf("autonegotiation enabled\n");
- 	} else {
- 	    printf("%s Mbit, %s duplex\n",
--		   (bmcr & MII_BMCR_100MBIT) ? "100" : "10",
--		   (bmcr & MII_BMCR_DUPLEX) ? "full" : "half");
-+		   (bmcr & BMCR_SPEED100) ? "100" : "10",
-+		   (bmcr & BMCR_FULLDPLX) ? "full" : "half");
- 	}
- 	printf("  basic status: ");
--	if (bmsr & MII_BMSR_AN_COMPLETE)
-+	if (bmsr & BMSR_ANEGCOMPLETE)
- 	    printf("autonegotiation complete, ");
--	else if (bmcr & MII_BMCR_RESTART)
-+	else if (bmcr & BMCR_ANRESTART)
- 	    printf("autonegotiation restarted, ");
--	if (bmsr & MII_BMSR_REMOTE_FAULT)
-+	if (bmsr & BMSR_RFAULT)
- 	    printf("remote fault, ");
--	printf((bmsr & MII_BMSR_LINK_VALID) ? "link ok" : "no link");
--	printf("\n  capabilities:%s", media_list(bmsr >> 6, 0));
--	printf("\n  advertising: %s", media_list(advert, 0));
--	if (lkpar & MII_AN_ABILITY_MASK)
--	    printf("\n  link partner:%s", media_list(lkpar, 0));
-+	printf((bmsr & BMSR_LSTATUS) ? "link ok" : "no link");
-+	printf("\n  capabilities:%s", media_list(bmsr >> 6, bmcr2, 0));
-+	printf("\n  advertising: %s", media_list(advert, bmcr2, 0));
-+	if (lkpar & LPA_ABILITY_MASK)
-+	    printf("\n  link partner:%s", media_list(lkpar, lpa2 >> 2, 0));
- 	printf("\n");
-     }
-+    fflush(stdout);
-     return 0;
- }
- 
-@@ -309,10 +382,10 @@ int show_basic_mii(int sock, int phy_id)
- 
- static int do_one_xcvr(int skfd, char *ifname, int maybe)
- {
--    struct mii_data *mii = (struct mii_data *)&ifr.ifr_data;
-+    struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&ifr.ifr_data;
- 
-     /* Get the vitals from the interface. */
--    strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-+    safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-     if (ioctl(skfd, SIOCGMIIPHY, &ifr) < 0) {
- 	if (!maybe || (errno != ENODEV))
- 	    fprintf(stderr, "SIOCGMIIPHY on '%s' failed: %s\n",
-@@ -327,23 +400,23 @@ static int do_one_xcvr(int skfd, char *ifname, int maybe)
- 
-     if (opt_reset) {
- 	printf("resetting the transceiver...\n");
--	mdio_write(skfd, MII_BMCR, MII_BMCR_RESET);
-+	mdio_write(skfd, MII_BMCR, BMCR_RESET);
-     }
--    if (nway_advertise) {
--	mdio_write(skfd, MII_ANAR, nway_advertise | 1);
-+    if (nway_advertise > 0) {
-+	mdio_write(skfd, MII_ADVERTISE, nway_advertise | 1);
- 	opt_restart = 1;
-     }
-     if (opt_restart) {
- 	printf("restarting autonegotiation...\n");
- 	mdio_write(skfd, MII_BMCR, 0x0000);
--	mdio_write(skfd, MII_BMCR, MII_BMCR_AN_ENA|MII_BMCR_RESTART);
-+	mdio_write(skfd, MII_BMCR, BMCR_ANENABLE|BMCR_ANRESTART);
-     }
-     if (fixed_speed) {
- 	int bmcr = 0;
--	if (fixed_speed & (MII_AN_100BASETX_FD|MII_AN_100BASETX_HD))
--	    bmcr |= MII_BMCR_100MBIT;
--	if (fixed_speed & (MII_AN_100BASETX_FD|MII_AN_10BASET_FD))
--	    bmcr |= MII_BMCR_DUPLEX;
-+	if (fixed_speed & (LPA_100FULL|LPA_100HALF))
-+	    bmcr |= BMCR_SPEED100;
-+	if (fixed_speed & (LPA_100FULL|LPA_10FULL))
-+	    bmcr |= BMCR_FULLDPLX;
- 	mdio_write(skfd, MII_BMCR, bmcr);
-     }
- 
-@@ -357,12 +430,12 @@ static int do_one_xcvr(int skfd, char *ifname, int maybe)
- 
- static void watch_one_xcvr(int skfd, char *ifname, int index)
- {
--    struct mii_data *mii = (struct mii_data *)&ifr.ifr_data;
-+    struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&ifr.ifr_data;
-     static int status[MAX_ETH] = { 0, /* ... */ };
-     int now;
- 
-     /* Get the vitals from the interface. */
--    strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-+    safe_strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-     if (ioctl(skfd, SIOCGMIIPHY, &ifr) < 0) {
- 	if (errno != ENODEV)
- 	    fprintf(stderr, "SIOCGMIIPHY on '%s' failed: %s\n",
-@@ -379,27 +452,38 @@ static void watch_one_xcvr(int skfd, char *ifname, int index)
- /*--------------------------------------------------------------------*/
- 
- const char *usage =
--"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
--       -V, --version               display version information
--       -v, --verbose               more verbose output
--       -R, --reset                 reset MII to poweron state
--       -r, --restart               restart autonegotiation
--       -w, --watch                 monitor for link status changes
--       -l, --log                   with -w, write events to syslog
--       -A, --advertise=media,...   advertise only specified media
--       -F, --force=media           force specified media technology
--media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
--       (to advertise both HD and FD) 100baseTx, 10baseT\n";
-+"usage: %s [-VvRrwl] [-A media,... | -F media] [-p addr] <interface ...>\n"
-+"       -V, --version               display version information\n"
-+"       -v, --verbose               more verbose output\n"
-+"       -R, --reset                 reset MII to poweron state\n"
-+"       -r, --restart               restart autonegotiation\n"
-+"       -w, --watch                 monitor for link status changes\n"
-+"       -l, --log                   with -w, write events to syslog\n"
-+"       -A, --advertise=media,...   advertise only specified media\n"
-+"       -F, --force=media           force specified media technology\n"
-+"       -p, --phy=addr              set PHY (MII address) to report\n"
-+"media: 1000baseTx-HD, 1000baseTx-FD,\n"
-+"       100baseT4, 100baseTx-FD, 100baseTx-HD,\n"
-+"       10baseT-FD, 10baseT-HD,\n"
-+"       (to advertise both HD and FD) 1000baseTx, 100baseTx, 10baseT\n";
-+
-+
-+static void version(void)
-+{
-+    fprintf(stderr, "%s\n%s\n", Release, Signature);
-+    exit(E_VERSION);
-+}
-+
- 
- int main(int argc, char **argv)
- {
-     int i, c, ret, errflag = 0;
--    char s[6];
--    
-+    unsigned ctrl1000 = 0;
-+
-     while ((c = getopt_long(argc, argv, "A:F:p:lrRvVw?", longopts, 0)) != EOF)
- 	switch (c) {
--	case 'A': nway_advertise = parse_media(optarg); break;
--	case 'F': fixed_speed = parse_media(optarg); break;
-+	case 'A': nway_advertise = parse_media(optarg, &ctrl1000); break;
-+	case 'F': fixed_speed = parse_media(optarg, &ctrl1000); break;
- 	case 'p': override_phy = atoi(optarg); break;
- 	case 'r': opt_restart++;	break;
- 	case 'R': opt_reset++;		break;
-@@ -411,6 +495,10 @@ int main(int argc, char **argv)
- 	}
-     /* Check for a few inappropriate option combinations */
-     if (opt_watch) verbose = 0;
-+
-+    if ((nway_advertise < 0) || (fixed_speed < 0))
-+    	return 2;
-+
-     if (errflag || (fixed_speed & (fixed_speed-1)) ||
- 	(fixed_speed && (opt_restart || nway_advertise))) {
- 	fprintf(stderr, usage, argv[0]);
-@@ -418,7 +506,7 @@ int main(int argc, char **argv)
-     }
- 
-     if (opt_version)
--	printf(version);
-+	version();
- 
-     /* Open a basic socket. */
-     if ((skfd = socket(AF_INET, SOCK_DGRAM,0)) < 0) {
-@@ -426,15 +514,15 @@ int main(int argc, char **argv)
- 	exit(-1);
-     }
- 
-+    if (verbose > 1)
-+    	printf("Using SIOCGMIIPHY=0x%x\n", SIOCGMIIPHY);
-+
-     /* No remaining args means show all interfaces. */
-     if (optind == argc) {
--	ret = 1;
--	for (i = 0; i < MAX_ETH; i++) {
--	    sprintf(s, "eth%d", i);
--	    ret &= do_one_xcvr(skfd, s, 1);
--	}
--	if (ret)
--	    fprintf(stderr, "no MII interfaces found\n");
-+	fprintf(stderr, "No interface specified\n");
-+	fprintf(stderr, usage, argv[0]);
-+	close(skfd);
-+	return 2;
-     } else {
- 	ret = 0;
- 	for (i = optind; i < argc; i++) {
-@@ -445,15 +533,8 @@ int main(int argc, char **argv)
-     if (opt_watch && (ret == 0)) {
- 	while (1) {
- 	    sleep(1);
--	    if (optind == argc) {
--		for (i = 0; i < MAX_ETH; i++) {
--		    sprintf(s, "eth%d", i);
--		    watch_one_xcvr(skfd, s, i);
--		}
--	    } else {
--		for (i = optind; i < argc; i++)
-+	    for (i = optind; i < argc; i++)
- 		    watch_one_xcvr(skfd, argv[i], i-optind);
--	    }
- 	}
-     }
- 
-diff --git a/nameif.c b/nameif.c
-index 8d79b50..b280e59 100644
---- a/nameif.c
-+++ b/nameif.c
-@@ -1,11 +1,11 @@
--/* 
-+/*
-  * Name Interfaces based on MAC address.
-  * Writen 2000 by Andi Kleen.
-- * Subject to the Gnu Public License, version 2.  
-+ * Subject to the Gnu Public License, version 2.
-  * TODO: make it support token ring etc.
-- * $Id: nameif.c,v 1.1 2000/10/18 17:26:29 ak Exp $
-- */ 
--#ifndef _GNU_SOURCE 
-+ * $Id: nameif.c,v 1.4 2003/09/11 03:46:49 ak Exp $
-+ */
-+#ifndef _GNU_SOURCE
- #define _GNU_SOURCE
- #endif
- #include <stdio.h>
-@@ -21,73 +21,68 @@
- #include <net/if.h>
- #include <linux/sockios.h>
- #include <errno.h>
--#include "intl.h" 
--
--const char default_conf[] = "/etc/mactab"; 
--const char *fname = default_conf; 
--int use_syslog; 
--int ctl_sk = -1; 
--
--void err(char *msg) 
--{ 
--	if (use_syslog) { 
--		syslog(LOG_ERR,"%s: %m", msg); 
--	} else { 
--		perror(msg); 
--	} 
--	exit(1); 
-+#include "intl.h"
-+#include "net-support.h"
-+#include "util.h"
-+
-+const char default_conf[] = "/etc/mactab";
-+const char *fname = default_conf;
-+int use_syslog;
-+int ctl_sk = -1;
-+
-+void err(char *msg)
-+{
-+	if (use_syslog) {
-+		syslog(LOG_ERR,"%s: %m", msg);
-+	} else {
-+		perror(msg);
-+	}
-+	exit(1);
- }
- 
--void complain(char *fmt, ...) 
--{ 
-+void complain(char *fmt, ...)
-+{
- 	va_list ap;
- 	va_start(ap,fmt);
--	if (use_syslog) { 
-+	if (use_syslog) {
- 		vsyslog(LOG_ERR,fmt,ap);
- 	} else {
- 		vfprintf(stderr,fmt,ap);
--		fputc('\n',stderr); 
-+		fputc('\n',stderr);
- 	}
--	va_end(ap); 
-+	va_end(ap);
- 	exit(1);
--} 
-+}
- 
--void warning(char *fmt, ...) 
--{ 
-+void warning(char *fmt, ...)
-+{
- 	va_list ap;
- 	va_start(ap,fmt);
--	if (use_syslog) { 
-+	if (use_syslog) {
- 		vsyslog(LOG_ERR,fmt,ap);
- 	} else {
- 		vfprintf(stderr,fmt,ap);
--		fputc('\n',stderr); 
-+		fputc('\n',stderr);
- 	}
--	va_end(ap); 
--} 
-+	va_end(ap);
-+}
- 
- int parsemac(char *str, unsigned char *mac)
--{ 
--	char *s; 
--	while ((s = strsep(&str, ":")) != NULL) { 
-+{
-+	char *s;
-+	while ((s = strsep(&str, ":")) != NULL) {
- 		unsigned byte;
--		if (sscanf(s,"%x", &byte)!=1 || byte > 0xff) 
-+		if (sscanf(s,"%x", &byte)!=1 || byte > 0xff)
- 			return -1;
--		*mac++ = byte; 
--	}  
-+		*mac++ = byte;
-+	}
- 	return 0;
--} 
--
--void *xmalloc(unsigned sz)
--{ 
--	void *p = calloc(sz,1);
--	if (!p) errno=ENOMEM, err("xmalloc"); 
--	return p; 
--} 
-+}
- 
- void opensock(void)
- {
--	if (ctl_sk < 0) 
--		ctl_sk = socket(PF_INET,SOCK_DGRAM,0); 
-+	if (ctl_sk < 0)
-+		ctl_sk = socket(PF_INET,SOCK_DGRAM,0);
- }
- 
- #ifndef ifr_newname
-@@ -97,10 +92,10 @@ void opensock(void)
- int  setname(char *oldname, char *newname)
- {
- 	struct ifreq ifr;
--	opensock(); 
-+	opensock();
- 	memset(&ifr,0,sizeof(struct ifreq));
--	strcpy(ifr.ifr_name, oldname); 
--	strcpy(ifr.ifr_newname, newname); 
-+	safe_strncpy(ifr.ifr_name, oldname, IFNAMSIZ);
-+	safe_strncpy(ifr.ifr_newname, newname, IFNAMSIZ);
- 	return ioctl(ctl_sk, SIOCSIFNAME, &ifr);
- }
- 
-@@ -108,118 +103,118 @@ int getmac(char *name, unsigned char *mac)
- {
- 	int r;
- 	struct ifreq ifr;
--	opensock(); 
-+	opensock();
- 	memset(&ifr,0,sizeof(struct ifreq));
--	strcpy(ifr.ifr_name, name); 
-+	safe_strncpy(ifr.ifr_name, name, IFNAMSIZ);
- 	r = ioctl(ctl_sk, SIOCGIFHWADDR, &ifr);
--	memcpy(mac, ifr.ifr_hwaddr.sa_data, 6); 
--	return r; 
-+	memcpy(mac, ifr.ifr_hwaddr.sa_data, 6);
-+	return r;
- }
- 
--struct change { 
--	struct change *next,**pprev;
-+struct change {
-+	struct change *next;
-+	int found;
- 	char ifname[IFNAMSIZ+1];
- 	unsigned char mac[6];
--}; 
-+};
- struct change *clist;
- 
--struct change *lookupmac(unsigned char *mac) 
--{ 
-+struct change *lookupmac(unsigned char *mac)
-+{
- 	struct change *ch;
--	for (ch = clist;ch;ch = ch->next) 
-+	for (ch = clist;ch;ch = ch->next)
- 		if (!memcmp(ch->mac, mac, 6))
- 			return ch;
--	return NULL; 
--} 
-+	return NULL;
-+}
- 
- int addchange(char *p, struct change *ch, char *pos)
- {
- 	if (strchr(ch->ifname, ':'))
--		warning(_("alias device %s at %s probably has no mac"), 
--			ch->ifname, pos); 
--	if (parsemac(p,ch->mac) < 0) 
--		complain(_("cannot parse MAC `%s' at %s"), p, pos); 
--	if (clist) 
--		clist->pprev = &ch->next;
-+		warning(_("alias device %s at %s probably has no mac"),
-+			ch->ifname, pos);
-+	if (parsemac(p,ch->mac) < 0)
-+		complain(_("cannot parse MAC `%s' at %s"), p, pos);
- 	ch->next = clist;
--	ch->pprev = &clist;
- 	clist = ch;
--	return 0; 
-+	return 0;
- }
- 
- void readconf(void)
- {
--	char *line; 
--	size_t linel; 
--	int linenum; 
-+	char *line;
-+	size_t linel;
-+	int linenum;
- 	FILE *ifh;
- 	char *p;
- 	int n;
-+	struct change *ch = NULL;
- 
- 	ifh = fopen(fname, "r");
--	if (!ifh) 
--		complain(_("opening configuration file %s: %s"),fname,strerror(errno)); 
-+	if (!ifh)
-+		complain(_("opening configuration file %s: %s"),fname,strerror(errno));
- 
--	line = NULL; 
-+	line = NULL;
- 	linel = 0;
--	linenum = 1; 
-+	linenum = 1;
- 	while (getdelim(&line, &linel, '\n', ifh) > 0) {
--		struct change *ch = xmalloc(sizeof(struct change)); 
--		char pos[20]; 
-+		char pos[20];
- 
--		sprintf(pos, _("line %d"), linenum); 
-+		sprintf(pos, _("line %d"), linenum);
- 
- 		if ((p = strchr(line,'#')) != NULL)
- 			*p = '\0';
--		p = line; 
-+		p = line;
- 		while (isspace(*p))
--			++p; 
-+			++p;
- 		if (*p == '\0')
--			continue; 
--		n = strcspn(p, " \t"); 
--		if (n > IFNAMSIZ) 
--			complain(_("interface name too long at line %d"), line);  
--		memcpy(ch->ifname, p, n); 
--		ch->ifname[n] = 0; 
--		p += n; 
--		p += strspn(p, " \t"); 
--		n = strspn(p, "0123456789ABCDEFabcdef:"); 
--		p[n] = 0; 
-+			continue;
-+		n = strcspn(p, " \t");
-+		if (n > IFNAMSIZ-1)
-+			complain(_("interface name too long at line %d"), line);
-+		ch = xmalloc(sizeof(struct change));
-+		memcpy(ch->ifname, p, n);
-+		ch->ifname[n] = 0;
-+		p += n;
-+		p += strspn(p, " \t");
-+		n = strspn(p, "0123456789ABCDEFabcdef:");
-+		p[n] = 0;
- 		addchange(p, ch, pos);
- 		linenum++;
--	}   
--	fclose(ifh); 
-+	}
-+	fclose(ifh);
- }
- 
--struct option lopt[] = { 
-+struct option lopt[] = {
- 	{"syslog", 0, NULL, 's' },
- 	{"config-file", 1, NULL, 'c' },
--	{"help", 0, NULL, '?' }, 
--	{NULL}, 
--}; 
-+	{"help", 0, NULL, '?' },
-+	{NULL},
-+};
- 
- void usage(void)
- {
--	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}")); 
--	exit(1); 
-+	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n"));
-+	exit(E_USAGE);
- }
- 
--int main(int ac, char **av) 
--{ 
--	FILE *ifh; 
-+int main(int ac, char **av)
-+{
-+	FILE *ifh;
- 	char *p;
- 	int n;
--	int linenum; 
-+	int linenum;
- 	char *line = NULL;
- 	size_t linel = 0;
-+	int ret = 0;
- 
- 	for (;;) {
- 		int c = getopt_long(ac,av,"c:s",lopt,NULL);
- 		if (c == -1) break;
--		switch (c) { 
-+		switch (c) {
- 		default:
- 		case '?':
--			usage(); 
-+			usage();
- 		case 'c':
- 			fname = optarg;
- 			break;
-@@ -229,74 +224,76 @@ int main(int ac, char **av)
- 		}
- 	}
- 
--	if (use_syslog) 
-+	if (use_syslog)
- 		openlog("nameif",0,LOG_LOCAL0);
--		
--	while (optind < ac) { 
--		struct change *ch = xmalloc(sizeof(struct change)); 
-+
-+	while (optind < ac) {
-+		struct change *ch = xmalloc(sizeof(struct change));
- 		char pos[30];
- 
--		if ((ac-optind) & 1) 
-+		if ((ac-optind) & 1)
- 			usage();
--		if (strlen(av[optind])+1>IFNAMSIZ) 
-+		if (strlen(av[optind])+1>IFNAMSIZ)
- 			complain(_("interface name `%s' too long"), av[optind]);
--		strcpy(ch->ifname, av[optind]); 
--		optind++; 
--		sprintf(pos,_("argument %d"),optind); 
--		addchange(av[optind], ch, pos); 
--		optind++; 
--	} 
-+		safe_strncpy(ch->ifname, av[optind], sizeof(ch->ifname));
-+		optind++;
-+		sprintf(pos,_("argument %d"),optind);
-+		addchange(av[optind], ch, pos);
-+		optind++;
-+	}
- 
--	if (!clist || fname != default_conf) 
--		readconf(); 
-+	if (!clist || fname != default_conf)
-+		readconf();
- 
--	ifh = fopen("/proc/net/dev", "r"); 
--	if (!ifh)  complain(_("open of /proc/net/dev: %s"), strerror(errno)); 
-+	ifh = fopen("/proc/net/dev", "r");
-+	if (!ifh)  complain(_("open of /proc/net/dev: %s"), strerror(errno));
- 
- 
- 	linenum = 0;
- 	while (getdelim(&line, &linel, '\n', ifh) > 0) {
--		struct change *ch; 
-+		struct change *ch;
- 		unsigned char mac[6];
- 
--		if (linenum++ < 2) 
-+		if (linenum++ < 2)
- 			continue;
--			
--		p = line; 
--		while (isspace(*p)) 
-+
-+		p = line;
-+		while (isspace(*p))
- 			++p;
--		n = strcspn(p, ": \t");  
--		p[n] = 0; 
--		
--		if (n > IFNAMSIZ-1) 
--			complain(_("interface name `%s' too long"), p); 
--			
--		if (getmac(p, mac) < 0) 
-+		n = strcspn(p, ": \t");
-+		p[n] = 0;
-+
-+		if (n > IFNAMSIZ-1)
-+			complain(_("interface name `%s' too long"), p);
-+
-+		if (getmac(p, mac) < 0)
- 			continue;
--			
--		ch = lookupmac(mac); 
--		if (!ch) 
-+
-+		ch = lookupmac(mac);
-+		if (!ch)
- 			continue;
--			
--		*ch->pprev = ch->next;
--		if (strcmp(p, ch->ifname)) { 
--			if (setname(p, ch->ifname) < 0)  
-+
-+		ch->found = 1;
-+		if (strcmp(p, ch->ifname)) {
-+			if (setname(p, ch->ifname) < 0)
- 				complain(_("cannot change name of %s to %s: %s"),
--						p, ch->ifname, strerror(errno)); 
--		} 
--		free(ch);
--	} 
--	fclose(ifh); 
--	
--	while (clist) { 
-+						p, ch->ifname, strerror(errno));
-+		}
-+	}
-+	fclose(ifh);
-+
-+	while (clist) {
- 		struct change *ch = clist;
- 		clist = clist->next;
--		warning(_("interface '%s' not found"), ch->ifname); 
--		free(ch); 
-+		if (!ch->found){
-+			warning(_("interface '%s' not found"), ch->ifname);
-+			ret = 1;
-+		}
-+		free(ch);
- 	}
- 
- 	if (use_syslog)
- 		closelog();
--	return 0;
--} 
-+	return ret;
-+}
- 
-diff --git a/netstat.c b/netstat.c
-index 1ef790e..d0c364f 100644
---- a/netstat.c
-+++ b/netstat.c
-@@ -6,7 +6,7 @@
-  *              NET-3 Networking Distribution for the LINUX operating
-  *              system.
-  *
-- * Version:     $Id: netstat.c,v 1.43 2001/04/15 14:41:17 pb Exp $
-+ * Version:     $Id: netstat.c,v 1.73 2011-04-20 01:35:22 ecki Exp $
-  *
-  * Authors:     Fred Baumgarten, <dc6iq@insu1.etec.uni-karlsruhe.de>
-  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
-@@ -23,24 +23,24 @@
-  * Modified:
-  *
-  *960116 {1.01} Bernd Eckenfels:        verbose, cleanups
-- *960204 {1.10} Bernd Eckenfels:        aftrans, usage, new route_info, 
-+ *960204 {1.10} Bernd Eckenfels:        aftrans, usage, new route_info,
-  *                                      DLFT_AF
-  *960204 {1.11} Bernd Eckenfels:        netlink support
-  *960204 {1.12} Bernd Eckenfels:        route_init()
-  *960215 {1.13} Bernd Eckenfels:        netlink_print honors HAVE_
-- *960217 {1.14} Bernd Eckenfels:        masq_info from Jos Vos and 
-+ *960217 {1.14} Bernd Eckenfels:        masq_info from Jos Vos and
-  *                                      ax25_info from Jonathan Naylor.
-  *960218 {1.15} Bernd Eckenfels:        ipx_info rewritten, -e for tcp/ipx
-  *960220 {1.16} Bernd Eckenfels:        minor output reformats, -a for -x
-  *960221 {1.17} Bernd Eckenfels:        route_init->getroute_init
-  *960426 {1.18} Bernd Eckenfels:        new RTACTION, SYM/NUM, FIB/CACHE
-- *960517 {1.19} Bernd Eckenfels:        usage() spelling fix and --unix inode, 
-+ *960517 {1.19} Bernd Eckenfels:        usage() spelling fix and --unix inode,
-  *                                      ':' is part of sock_addr for --inet
-  *960822 {x.xx} Frank Strauss:          INET6 support
-  *
-  *970406 {1.33} Philip Copeland         Added snmp reporting support module -s
-  *                                      code provided by Andi Kleen
-- *                                      (relly needs to be kernel hooked but 
-+ *                                      (relly needs to be kernel hooked but
-  *                                      this will do in the meantime)
-  *                                      minor header file misplacement tidy up.
-  *980815 {1.xx} Stephane Fillod:       X.25 support
-@@ -58,6 +58,8 @@
-  *
-  *990420 {1.38} Tuan Hoang              removed a useless assignment from igmp_do_one()
-  *20010404 {1.39} Arnaldo Carvalho de Melo - use setlocale
-+ *20081201 {1.42} Brian Micek           added -L|--udplite options for RFC 3828
-+ *20020722 {1.51} Thomas Preusser       added SCTP over IPv4 support
-  *
-  *              This program is free software; you can redistribute it
-  *              and/or  modify it under  the terms of  the GNU General
-@@ -83,6 +85,7 @@
- #include <arpa/inet.h>
- #include <netinet/in.h>
- #include <sys/ioctl.h>
-+#include <sys/stat.h>
- #include <net/if.h>
- #include <dirent.h>
- 
-@@ -94,8 +97,18 @@
- #include "sockets.h"
- #include "interface.h"
- #include "util.h"
-+#include "proc.h"
-+
-+#if HAVE_SELINUX
-+#include <selinux/selinux.h>
-+#endif
-+
-+#if HAVE_AFBLUETOOTH
-+#include <bluetooth/bluetooth.h>
-+#endif
- 
- #define PROGNAME_WIDTH 20
-+#define SELINUX_WIDTH 50
- 
- #if !defined(s6_addr32) && defined(in6a_words)
- #define s6_addr32 in6a_words	/* libinet6			*/
-@@ -104,6 +117,8 @@
- /* prototypes for statistics.c */
- void parsesnmp(int, int, int);
- void inittab(void);
-+void parsesnmp6(int, int, int);
-+void inittab6(void);
- 
- typedef enum {
-     SS_FREE = 0,		/* not allocated                */
-@@ -122,7 +137,7 @@ typedef enum {
- #define FEATURE_NETSTAT
- #include "lib/net-features.h"
- 
--char *Release = RELEASE, *Version = "netstat 1.42 (2001-04-15)", *Signature = "Fred Baumgarten, Alan Cox, Bernd Eckenfels, Phil Blundell, Tuan Hoang and others";
-+static char *Release = RELEASE, *Signature = "Fred Baumgarten, Alan Cox, Bernd Eckenfels, Phil Blundell, Tuan Hoang, Brian Micek and others";
- 
- 
- #define E_READ  -1
-@@ -142,18 +157,24 @@ int flag_cf  = 0;
- int flag_opt = 0;
- int flag_raw = 0;
- int flag_tcp = 0;
-+int flag_sctp= 0;
- int flag_udp = 0;
-+int flag_udplite = 0;
- int flag_igmp= 0;
- int flag_rom = 0;
- int flag_exp = 1;
-+int flag_wide= 0;
- int flag_prg = 0;
- int flag_arg = 0;
- int flag_ver = 0;
-+int flag_l2cap = 0;
-+int flag_rfcomm = 0;
-+int flag_selinux = 0;
- 
- FILE *procinfo;
- 
--#define INFO_GUTS1(file,name,proc)			\
--  procinfo = fopen((file), "r");			\
-+#define INFO_GUTS1(file,name,proc,prot)			\
-+  procinfo = proc_fopen((file));			\
-   if (procinfo == NULL) {				\
-     if (errno != ENOENT) {				\
-       perror((file));					\
-@@ -166,58 +187,63 @@ FILE *procinfo;
-   } else {						\
-     do {						\
-       if (fgets(buffer, sizeof(buffer), procinfo))	\
--        (proc)(lnr++, buffer);				\
-+        (proc)(lnr++, buffer,prot);			\
-     } while (!feof(procinfo));				\
-     fclose(procinfo);					\
-   }
- 
- #if HAVE_AFINET6
--#define INFO_GUTS2(file,proc)				\
-+#define INFO_GUTS2(file,proc,prot)			\
-   lnr = 0;						\
--  procinfo = fopen((file), "r");		       	\
-+  procinfo = proc_fopen((file));		       	\
-   if (procinfo != NULL) {				\
-     do {						\
-       if (fgets(buffer, sizeof(buffer), procinfo))	\
--	(proc)(lnr++, buffer);				\
-+	(proc)(lnr++, buffer,prot);			\
-     } while (!feof(procinfo));				\
-     fclose(procinfo);					\
-   }
- #else
--#define INFO_GUTS2(file,proc)
-+#define INFO_GUTS2(file,proc,prot)
- #endif
- 
- #define INFO_GUTS3					\
-  return rc;
- 
--#define INFO_GUTS6(file,file6,name,proc)		\
-+#define INFO_GUTS6(file,file6,name,proc,prot4,prot6)	\
-  char buffer[8192];					\
-  int rc = 0;						\
-  int lnr = 0;						\
-  if (!flag_arg || flag_inet) {				\
--    INFO_GUTS1(file,name,proc)				\
-+    INFO_GUTS1(file,name,proc,prot4)			\
-  }							\
-  if (!flag_arg || flag_inet6) {				\
--    INFO_GUTS2(file6,proc)				\
-+    INFO_GUTS2(file6,proc,prot6)			\
-  }							\
-  INFO_GUTS3
- 
--#define INFO_GUTS(file,name,proc)			\
-+#define INFO_GUTS(file,name,proc,prot)			\
-  char buffer[8192];					\
-  int rc = 0;						\
-  int lnr = 0;						\
-- INFO_GUTS1(file,name,proc)				\
-+ INFO_GUTS1(file,name,proc,prot)			\
-  INFO_GUTS3
- 
- #define PROGNAME_WIDTHs PROGNAME_WIDTH1(PROGNAME_WIDTH)
- #define PROGNAME_WIDTH1(s) PROGNAME_WIDTH2(s)
- #define PROGNAME_WIDTH2(s) #s
- 
-+#define SELINUX_WIDTHs SELINUX_WIDTH1(SELINUX_WIDTH)
-+#define SELINUX_WIDTH1(s) SELINUX_WIDTH2(s)
-+#define SELINUX_WIDTH2(s) #s
-+
- #define PRG_HASH_SIZE 211
- 
- static struct prg_node {
-     struct prg_node *next;
--    int inode;
-+    unsigned long inode;
-     char name[PROGNAME_WIDTH];
-+    char scon[SELINUX_WIDTH];
- } *prg_hash[PRG_HASH_SIZE];
- 
- static char prg_cache_loaded = 0;
-@@ -225,8 +251,11 @@ static char prg_cache_loaded = 0;
- #define PRG_HASHIT(x) ((x) % PRG_HASH_SIZE)
- 
- #define PROGNAME_BANNER "PID/Program name"
-+#define SELINUX_BANNER "Security Context"
-+
-+#define print_progname_banner() do { if (flag_prg) printf(" %-" PROGNAME_WIDTHs "s",PROGNAME_BANNER); } while (0)
- 
--#define print_progname_banner() do { if (flag_prg) printf("%-" PROGNAME_WIDTHs "s"," " PROGNAME_BANNER); } while (0)
-+#define print_selinux_banner() do { if (flag_selinux) printf("%-" SELINUX_WIDTHs "s"," " SELINUX_BANNER); } while (0)
- 
- #define PRG_LOCAL_ADDRESS "local_address"
- #define PRG_INODE	 "inode"
-@@ -246,40 +275,57 @@ static char prg_cache_loaded = 0;
- #define PATH_PROC_X_FD      PATH_PROC "/%s/" PATH_FD_SUFF
- #define PATH_CMDLINE	"cmdline"
- #define PATH_CMDLINEl       strlen(PATH_CMDLINE)
--/* NOT working as of glibc-2.0.7: */
--#undef  DIRENT_HAVE_D_TYPE_WORKS
- 
--static void prg_cache_add(int inode, char *name)
-+static void prg_cache_add(unsigned long inode, char *name, const char *scon)
- {
-     unsigned hi = PRG_HASHIT(inode);
-     struct prg_node **pnp,*pn;
- 
--    prg_cache_loaded=2;
--    for (pnp=prg_hash+hi;(pn=*pnp);pnp=&pn->next) {
--	if (pn->inode==inode) {
-+    prg_cache_loaded = 2;
-+    for (pnp = prg_hash + hi; (pn = *pnp); pnp = &pn->next) {
-+	if (pn->inode == inode) {
- 	    /* Some warning should be appropriate here
- 	       as we got multiple processes for one i-node */
- 	    return;
- 	}
-     }
--    if (!(*pnp=malloc(sizeof(**pnp)))) 
-+    if (!(*pnp = malloc(sizeof(**pnp))))
- 	return;
--    pn=*pnp;
--    pn->next=NULL;
--    pn->inode=inode;
--    if (strlen(name)>sizeof(pn->name)-1) 
--	name[sizeof(pn->name)-1]='\0';
--    strcpy(pn->name,name);
-+    pn = *pnp;
-+    pn->next = NULL;
-+    pn->inode = inode;
-+    safe_strncpy(pn->name, name, sizeof(pn->name));
-+
-+    {
-+	int len = (strlen(scon) - sizeof(pn->scon)) + 1;
-+	if (len > 0)
-+            safe_strncpy(pn->scon, &scon[len + 1], sizeof(pn->scon));
-+	else
-+            safe_strncpy(pn->scon, scon, sizeof(pn->scon));
-+    }
-+
-+}
-+
-+static const char *prg_cache_get(unsigned long inode)
-+{
-+    unsigned hi = PRG_HASHIT(inode);
-+    struct prg_node *pn;
-+
-+    for (pn = prg_hash[hi]; pn; pn = pn->next)
-+	if (pn->inode == inode)
-+	    return (pn->name);
-+    return ("-");
- }
- 
--static const char *prg_cache_get(int inode)
-+static const char *prg_cache_get_con(unsigned long inode)
- {
--    unsigned hi=PRG_HASHIT(inode);
-+    unsigned hi = PRG_HASHIT(inode);
-     struct prg_node *pn;
- 
--    for (pn=prg_hash[hi];pn;pn=pn->next)
--	if (pn->inode==inode) return(pn->name);
--    return("-");
-+    for (pn = prg_hash[hi]; pn; pn = pn->next)
-+	if (pn->inode == inode)
-+	    return (pn->scon);
-+    return ("-");
- }
- 
- static void prg_cache_clear(void)
-@@ -287,143 +333,164 @@ static void prg_cache_clear(void)
-     struct prg_node **pnp,*pn;
- 
-     if (prg_cache_loaded == 2)
--	for (pnp=prg_hash;pnp<prg_hash+PRG_HASH_SIZE;pnp++)
--	    while ((pn=*pnp)) {
--		*pnp=pn->next;
-+	for (pnp = prg_hash; pnp < prg_hash + PRG_HASH_SIZE; pnp++)
-+	    while ((pn = *pnp)) {
-+		*pnp = pn->next;
- 		free(pn);
- 	    }
--    prg_cache_loaded=0;
-+    prg_cache_loaded = 0;
-+}
-+
-+static void wait_continous(void)
-+{
-+    fflush(stdout);
-+    sleep(1);
- }
- 
--static void extract_type_1_socket_inode(const char lname[], long * inode_p) {
-+static int extract_type_1_socket_inode(const char lname[], unsigned long * inode_p) {
- 
-     /* If lname is of the form "socket:[12345]", extract the "12345"
-        as *inode_p.  Otherwise, return -1 as *inode_p.
-        */
- 
--    if (strlen(lname) < PRG_SOCKET_PFXl+3) *inode_p = -1;
--    else if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) *inode_p = -1;
--    else if (lname[strlen(lname)-1] != ']') *inode_p = -1;
--    else {
-+    if (strlen(lname) < PRG_SOCKET_PFXl+3) return(-1);
-+
-+    if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) return(-1);
-+    if (lname[strlen(lname)-1] != ']') return(-1);
-+
-+    {
-         char inode_str[strlen(lname + 1)];  /* e.g. "12345" */
-         const int inode_str_len = strlen(lname) - PRG_SOCKET_PFXl - 1;
-         char *serr;
- 
-         strncpy(inode_str, lname+PRG_SOCKET_PFXl, inode_str_len);
-         inode_str[inode_str_len] = '\0';
--        *inode_p = strtol(inode_str,&serr,0);
--        if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
--            *inode_p = -1;
-+        *inode_p = strtoul(inode_str, &serr, 0);
-+        if (!serr || *serr || *inode_p == ~0)
-+            return(-1);
-     }
-+    return(0);
- }
- 
- 
- 
--static void extract_type_2_socket_inode(const char lname[], long * inode_p) {
-+static int extract_type_2_socket_inode(const char lname[], unsigned long * inode_p) {
- 
-     /* If lname is of the form "[0000]:12345", extract the "12345"
-        as *inode_p.  Otherwise, return -1 as *inode_p.
-        */
- 
--    if (strlen(lname) < PRG_SOCKET_PFX2l+1) *inode_p = -1;
--    else if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) *inode_p = -1;
--    else {
-+    if (strlen(lname) < PRG_SOCKET_PFX2l+1) return(-1);
-+    if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) return(-1);
-+
-+    {
-         char *serr;
- 
--        *inode_p=strtol(lname + PRG_SOCKET_PFX2l,&serr,0);
--        if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
--            *inode_p = -1;
-+        *inode_p = strtoul(lname + PRG_SOCKET_PFX2l, &serr, 0);
-+        if (!serr || *serr || *inode_p == ~0)
-+            return(-1);
-     }
-+    return(0);
- }
- 
- 
- 
-+
- static void prg_cache_load(void)
- {
--    char line[LINE_MAX],eacces=0;
--    int procfdlen,fd,cmdllen,lnamelen;
--    char lname[30],cmdlbuf[512],finbuf[PROGNAME_WIDTH];
--    long inode;
--    const char *cs,*cmdlp;
--    DIR *dirproc=NULL,*dirfd=NULL;
--    struct dirent *direproc,*direfd;
-+    char line[LINE_MAX], eacces=0;
-+    int procfdlen, fd, cmdllen, lnamelen;
-+    char lname[30], cmdlbuf[512], finbuf[PROGNAME_WIDTH];
-+    unsigned long inode;
-+    const char *cs, *cmdlp;
-+    DIR *dirproc = NULL, *dirfd = NULL;
-+    struct dirent *direproc, *direfd;
-+#if HAVE_SELINUX
-+    security_context_t scon = NULL;
-+#endif
- 
-     if (prg_cache_loaded || !flag_prg) return;
--    prg_cache_loaded=1;
--    cmdlbuf[sizeof(cmdlbuf)-1]='\0';
-+    prg_cache_loaded = 1;
-+    cmdlbuf[sizeof(cmdlbuf) - 1] = '\0';
-     if (!(dirproc=opendir(PATH_PROC))) goto fail;
--    while (errno=0,direproc=readdir(dirproc)) {
--#ifdef DIRENT_HAVE_D_TYPE_WORKS
--	if (direproc->d_type!=DT_DIR) continue;
--#endif
--	for (cs=direproc->d_name;*cs;cs++)
--	    if (!isdigit(*cs)) 
-+    while (errno = 0, direproc = readdir(dirproc)) {
-+	for (cs = direproc->d_name; *cs; cs++)
-+	    if (!isdigit(*cs))
- 		break;
--	if (*cs) 
-+	if (*cs)
- 	    continue;
--	procfdlen=snprintf(line,sizeof(line),PATH_PROC_X_FD,direproc->d_name);
--	if (procfdlen<=0 || procfdlen>=sizeof(line)-5) 
-+	procfdlen = snprintf(line,sizeof(line),PATH_PROC_X_FD,direproc->d_name);
-+	if (procfdlen <= 0 || procfdlen >= sizeof(line) - 5)
- 	    continue;
--	errno=0;
--	dirfd=opendir(line);
-+	errno = 0;
-+	dirfd = opendir(line);
- 	if (! dirfd) {
--	    if (errno==EACCES) 
--		eacces=1;
-+	    if (errno == EACCES)
-+		eacces = 1;
- 	    continue;
- 	}
- 	line[procfdlen] = '/';
- 	cmdlp = NULL;
- 	while ((direfd = readdir(dirfd))) {
--#ifdef DIRENT_HAVE_D_TYPE_WORKS
--	    if (direfd->d_type!=DT_LNK) 
--		continue;
--#endif
--	    if (procfdlen+1+strlen(direfd->d_name)+1>sizeof(line)) 
-+           /* Skip . and .. */
-+           if (!isdigit(direfd->d_name[0]))
-+               continue;
-+	    if (procfdlen + 1 + strlen(direfd->d_name) + 1 > sizeof(line))
- 		continue;
- 	    memcpy(line + procfdlen - PATH_FD_SUFFl, PATH_FD_SUFF "/",
--		   PATH_FD_SUFFl+1);
--	    strcpy(line + procfdlen + 1, direfd->d_name);
--	    lnamelen=readlink(line,lname,sizeof(lname)-1);
-+		   PATH_FD_SUFFl + 1);
-+        safe_strncpy(line + procfdlen + 1, direfd->d_name,
-+                        sizeof(line) - procfdlen - 1);
-+	    lnamelen = readlink(line, lname, sizeof(lname) - 1);
-+	    if (lnamelen == -1)
-+		    continue;
-             lname[lnamelen] = '\0';  /*make it a null-terminated string*/
- 
--            extract_type_1_socket_inode(lname, &inode);
--
--            if (inode < 0) extract_type_2_socket_inode(lname, &inode);
--
--            if (inode < 0) continue;
-+            if (extract_type_1_socket_inode(lname, &inode) < 0)
-+              if (extract_type_2_socket_inode(lname, &inode) < 0)
-+                continue;
- 
- 	    if (!cmdlp) {
--		if (procfdlen - PATH_FD_SUFFl + PATH_CMDLINEl >= 
--		    sizeof(line) - 5) 
-+		if (procfdlen - PATH_FD_SUFFl + PATH_CMDLINEl >=
-+		    sizeof(line) - 5)
- 		    continue;
--		strcpy(line + procfdlen-PATH_FD_SUFFl, PATH_CMDLINE);
-+        safe_strncpy(line + procfdlen - PATH_FD_SUFFl, PATH_CMDLINE,
-+                        sizeof(line) - procfdlen + PATH_FD_SUFFl);
- 		fd = open(line, O_RDONLY);
--		if (fd < 0) 
-+		if (fd < 0)
- 		    continue;
- 		cmdllen = read(fd, cmdlbuf, sizeof(cmdlbuf) - 1);
--		if (close(fd)) 
-+		if (close(fd))
- 		    continue;
--		if (cmdllen == -1) 
-+		if (cmdllen == -1)
- 		    continue;
--		if (cmdllen < sizeof(cmdlbuf) - 1) 
-+		if (cmdllen < sizeof(cmdlbuf) - 1)
- 		    cmdlbuf[cmdllen]='\0';
--		if ((cmdlp = strrchr(cmdlbuf, '/'))) 
-+		if (cmdlbuf[0] == '/' && (cmdlp = strrchr(cmdlbuf, '/')))
- 		    cmdlp++;
--		else 
-+		else
- 		    cmdlp = cmdlbuf;
- 	    }
- 
- 	    snprintf(finbuf, sizeof(finbuf), "%s/%s", direproc->d_name, cmdlp);
--	    prg_cache_add(inode, finbuf);
-+#if HAVE_SELINUX
-+	    if (getpidcon(atoi(direproc->d_name), &scon) == -1) {
-+		    scon=xstrdup("-");
-+	    }
-+	    prg_cache_add(inode, finbuf, scon);
-+	    freecon(scon);
-+#else
-+	    prg_cache_add(inode, finbuf, "-");
-+#endif
- 	}
--	closedir(dirfd); 
-+	closedir(dirfd);
- 	dirfd = NULL;
-     }
--    if (dirproc) 
-+    if (dirproc)
- 	closedir(dirproc);
--    if (dirfd) 
-+    if (dirfd)
- 	closedir(dirfd);
--    if (!eacces) 
-+    if (!eacces)
- 	return;
-     if (prg_cache_loaded == 1) {
-     fail:
-@@ -450,7 +517,7 @@ static int netrom_info(void)
-     char buffer[256], dev[16];
-     int st, vs, vr, sendq, recvq, ret;
- 
--    f = fopen(_PATH_PROCNET_NR, "r");
-+    f = proc_fopen(_PATH_PROCNET_NR);
-     if (f == NULL) {
- 	if (errno != ENOENT) {
- 	    perror(_PATH_PROCNET_NR);
-@@ -465,7 +532,8 @@ static int netrom_info(void)
-     }
-     printf(_("Active NET/ROM sockets\n"));
-     printf(_("User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"));
--    fgets(buffer, 256, f);
-+    if (fgets(buffer, 256, f))
-+	/* eat line */;
- 
-     while (fgets(buffer, 256, f)) {
- 	buffer[9] = 0;
-@@ -527,19 +595,22 @@ static void finish_this_one(int uid, unsigned long inode, const char *timers)
- 
-     if (flag_exp > 1) {
- 	if (!(flag_not & FLAG_NUM_USER) && ((pw = getpwuid(uid)) != NULL))
--	    printf("%-10s ", pw->pw_name);
-+	    printf(" %-10s ", pw->pw_name);
- 	else
--	    printf("%-10d ", uid);
--	printf("%-10ld ",inode);
-+	    printf(" %-10d ", uid);
-+	printf("%-10lu",inode);
-     }
-     if (flag_prg)
--	printf("%-" PROGNAME_WIDTHs "s",prg_cache_get(inode));
-+	printf(" %-" PROGNAME_WIDTHs "s",prg_cache_get(inode));
-+    if (flag_selinux)
-+	printf(" %-" SELINUX_WIDTHs "s",prg_cache_get_con(inode));
-+
-     if (flag_opt)
--	printf("%s", timers);
-+	printf(" %s", timers);
-     putchar('\n');
- }
- 
--static void igmp_do_one(int lnr, const char *line)
-+static void igmp_do_one(int lnr, const char *line,const char *prot)
- {
-     char mcast_addr[128];
- #if HAVE_AFINET6
-@@ -598,8 +669,8 @@ static void igmp_do_one(int lnr, const char *line)
- 		    ((struct sockaddr *) &mcastaddr)->sa_family);
- 	    return;
- 	}
--	safe_strncpy(mcast_addr, ap->sprint((struct sockaddr *) &mcastaddr, 
--				      flag_not), sizeof(mcast_addr));
-+	safe_strncpy(mcast_addr, ap->sprint((struct sockaddr *) &mcastaddr,
-+				      flag_not & FLAG_NUM_HOST), sizeof(mcast_addr));
- 	printf("%-15s %-6d %s\n", device, refcnt, mcast_addr);
- #endif
-     } else {    /* IPV4 */
-@@ -630,14 +701,14 @@ static void igmp_do_one(int lnr, const char *line)
- 	    fprintf(stderr, _("warning, got bogus igmp line %d.\n"), lnr);
- 	    return;
- 	}
--	
-+
- 	if ((ap = get_afntype(((struct sockaddr *) &mcastaddr)->sa_family)) == NULL) {
- 	    fprintf(stderr, _("netstat: unsupported address family %d !\n"),
- 		    ((struct sockaddr *) &mcastaddr)->sa_family);
- 	    return;
- 	}
--	safe_strncpy(mcast_addr, ap->sprint((struct sockaddr *) &mcastaddr, 
--				      flag_not), sizeof(mcast_addr));
-+	safe_strncpy(mcast_addr, ap->sprint((struct sockaddr *) &mcastaddr,
-+				      flag_not & FLAG_NUM_HOST), sizeof(mcast_addr));
- 	printf("%-15s %-6d %s\n", device, refcnt, mcast_addr );
- #endif
-     }    /* IPV4 */
-@@ -646,7 +717,7 @@ static void igmp_do_one(int lnr, const char *line)
- #if HAVE_AFX25
- static int x25_info(void)
- {
--       FILE *f=fopen(_PATH_PROCNET_X25, "r");
-+       FILE *f=proc_fopen(_PATH_PROCNET_X25);
-        char buffer[256],dev[16];
-        int st,vs,vr,sendq,recvq,lci;
-        static char *x25_state[5]=
-@@ -657,7 +728,7 @@ static int x25_info(void)
-                "ESTABLISHED",
-                "RECOVERY"
-        };
--       if(!(f=fopen(_PATH_PROCNET_X25, "r")))
-+       if(!f)
-        {
-                if (errno != ENOENT) {
-                        perror(_PATH_PROCNET_X25);
-@@ -673,7 +744,8 @@ static int x25_info(void)
-        printf( _("Active X.25 sockets\n"));
-        /* IMHO, Vr/Vs is not very usefull --SF */
-        printf( _("Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-Q\n"));
--       fgets(buffer,256,f);
-+       if (fgets(buffer,256,f))
-+               /* eat line */;
-        while(fgets(buffer,256,f))
-        {
-                buffer[10]=0;
-@@ -690,21 +762,206 @@ static int x25_info(void)
-                        vr,vs,sendq,recvq);
-        }
-        fclose(f);
--       return 0;               
-+       return 0;
- }
- #endif
- 
- static int igmp_info(void)
- {
-     INFO_GUTS6(_PATH_PROCNET_IGMP, _PATH_PROCNET_IGMP6, "AF INET (igmp)",
--	       igmp_do_one);
-+	       igmp_do_one, "igmp", "igmp6");
-+}
-+
-+static int ip_parse_dots(uint32_t *addr, char const *src) {
-+  unsigned  a, b, c, d;
-+  unsigned  ret = 4-sscanf(src, "%u.%u.%u.%u", &a, &b, &c, &d);
-+  *addr = htonl((a << 24)|(b << 16)|(c << 8)|d);
-+  return  ret;
-+}
-+
-+static void print_ip_service(struct sockaddr_in *addr, char const *protname,
-+			     char *buf, unsigned size) {
-+  struct aftype *ap;
-+
-+  if(size == 0)  return;
-+
-+  /* print host */
-+  if((ap = get_afntype(addr->sin_family)) == NULL) {
-+    fprintf(stderr, _("netstat: unsupported address family %d !\n"),
-+	    addr->sin_family);
-+    return;
-+  }
-+  safe_strncpy(buf, ap->sprint((struct sockaddr*)addr, flag_not), size);
-+
-+  /* print service */
-+  if(flag_all || (flag_lst && !addr->sin_port) || (!flag_lst && addr->sin_port)) {
-+    char  bfs[32];
-+
-+    snprintf(bfs, sizeof(bfs), "%s",
-+	     get_sname(addr->sin_port, (char*)protname, flag_not & FLAG_NUM_PORT));
-+
-+    /* check if we must cut on host and/or service name */
-+    {
-+      unsigned const  bufl = strlen(buf);
-+      unsigned const  bfsl = strlen(bfs);
-+
-+      if(bufl+bfsl+2 > size) {
-+	unsigned const  half = (size-2)>>1;
-+	if(bufl > half) {
-+	  if(bfsl > half) {
-+	    buf[size-2-half] = '\0';
-+	    bfs[half+1]      = '\0';
-+	  }
-+	  else  buf[size-2-bfsl] = '\0';
-+	}
-+	else  bfs[size-2-bufl] = '\0';
-+      }
-+    }
-+    strcat(buf, ":");
-+    strcat(buf, bfs);
-+  }
-+}
-+
-+/* process single SCTP endpoint */
-+static void sctp_do_ept(int lnr, char const *line, const char *prot)
-+{
-+  struct sockaddr_in  laddr, raddr;
-+  unsigned            uid, inode;
-+
-+  char        l_addr[23], r_addr[23];
-+
-+  /* fill sockaddr_in structures */
-+  {
-+    unsigned  lport;
-+    unsigned  ate;
-+
-+    if(lnr == 0)  return;
-+    if(sscanf(line, "%*X %*X %*u %*u %*u %u %u %u %n",
-+	      &lport, &uid, &inode, &ate) < 3)  goto err;
-+
-+    /* decode IP address */
-+    if(ip_parse_dots(&laddr.sin_addr.s_addr, line+ate))  goto err;
-+    raddr.sin_addr.s_addr = htonl(0);
-+    laddr.sin_family = raddr.sin_family = AF_INET;
-+    laddr.sin_port = htons(lport);
-+    raddr.sin_port = htons(0);
-+  }
-+
-+  /* print IP:service to l_addr and r_addr */
-+  print_ip_service(&laddr, prot, l_addr, sizeof(l_addr));
-+  print_ip_service(&raddr, prot, r_addr, sizeof(r_addr));
-+
-+  /* Print line */
-+  printf("%-4s  %6d %6d %-*s %-*s %-11s",
-+	 prot, 0, 0,
-+	 (int)netmax(23,strlen(l_addr)), l_addr,
-+	 (int)netmax(23,strlen(r_addr)), r_addr,
-+	 _(tcp_state[TCP_LISTEN]));
-+  finish_this_one(uid, inode, "");
-+  return;
-+ err:
-+  fprintf(stderr, "SCTP error in line: %d\n", lnr);
-+}
-+
-+/* process single SCTP association */
-+static void sctp_do_assoc(int lnr, char const *line, const char *prot)
-+{
-+  struct sockaddr_in  laddr, raddr;
-+  unsigned long       rxq, txq;
-+  unsigned            uid, inode;
-+
-+  char        l_addr[23], r_addr[23];
-+
-+  /* fill sockaddr_in structures */
-+  {
-+    unsigned    lport, rport;
-+    unsigned    ate;
-+    char const *addr;
-+
-+    if(lnr == 0)  return;
-+    if(sscanf(line, "%*X %*X %*u %*u %*u %*u %*u %lu %lu %u %u %u %u %n",
-+	      &txq, &rxq, &uid, &inode, &lport, &rport, &ate) < 6)  goto err;
-+
-+    /* decode IP addresses */
-+    addr = strchr(line+ate, '*');
-+    if(addr == 0)  goto err;
-+    if(ip_parse_dots(&laddr.sin_addr.s_addr, ++addr))  goto err;
-+    addr = strchr(addr, '*');
-+    if(addr == 0)  goto err;
-+    if(ip_parse_dots(&raddr.sin_addr.s_addr, ++addr))  goto err;
-+
-+    /* complete sockaddr_in structures */
-+    laddr.sin_family = raddr.sin_family = AF_INET;
-+    laddr.sin_port = htons(lport);
-+    raddr.sin_port = htons(rport);
-+  }
-+
-+  /* print IP:service to l_addr and r_addr */
-+  print_ip_service(&laddr, prot, l_addr, sizeof(l_addr));
-+  print_ip_service(&raddr, prot, r_addr, sizeof(r_addr));
-+
-+  /* Print line */
-+  printf("%-4s  %6ld %6ld %-*s %-*s %-11s",
-+	 prot, rxq, txq,
-+	 (int)netmax(23,strlen(l_addr)), l_addr,
-+	 (int)netmax(23,strlen(r_addr)), r_addr,
-+	 _(tcp_state[TCP_ESTABLISHED]));
-+  finish_this_one(uid, inode, "");
-+  return;
-+ err:
-+  fprintf(stderr, "SCTP error in line: %d\n", lnr);
-+}
-+
-+static int sctp_info_epts(void) {
-+  INFO_GUTS6(_PATH_PROCNET_SCTPEPTS, _PATH_PROCNET_SCTP6EPTS, "AF INET (sctp)",
-+	     sctp_do_ept, "sctp", "sctp6");
-+}
-+
-+static int sctp_info_assocs(void) {
-+  INFO_GUTS6(_PATH_PROCNET_SCTPASSOCS, _PATH_PROCNET_SCTP6ASSOCS, "AF INET (sctp)",
-+	     sctp_do_assoc, "sctp", "sctp6");
-+}
-+
-+static int sctp_info(void) {
-+  int  res;
-+  res = sctp_info_epts();
-+  if(res)  return  res;
-+  return  sctp_info_assocs();
-+}
-+
-+static void addr_do_one(char *buf, size_t buf_len, size_t short_len, struct aftype *ap,
-+#if HAVE_AFINET6
-+			struct sockaddr_in6 *addr,
-+#else
-+			struct sockaddr_in *addr,
-+#endif
-+			int port, const char *proto
-+)
-+{
-+    const char *sport, *saddr;
-+    size_t port_len, addr_len;
-+
-+    saddr = ap->sprint((struct sockaddr *)addr, flag_not & FLAG_NUM_HOST);
-+    sport = get_sname(htons(port), proto, flag_not & FLAG_NUM_PORT);
-+    addr_len = strlen(saddr);
-+    port_len = strlen(sport);
-+    if (!flag_wide && (addr_len + port_len > short_len)) {
-+	/* Assume port name is short */
-+	port_len = netmin(port_len, short_len - 4);
-+	addr_len = short_len - port_len;
-+	strncpy(buf, saddr, addr_len);
-+	buf[addr_len] = '\0';
-+	strcat(buf, ":");
-+	strncat(buf, sport, port_len);
-+    } else
-+	snprintf(buf, buf_len, "%s:%s", saddr, sport);
- }
- 
--static void tcp_do_one(int lnr, const char *line)
-+static void tcp_do_one(int lnr, const char *line, const char *prot)
- {
-     unsigned long rxq, txq, time_len, retr, inode;
-     int num, local_port, rem_port, d, state, uid, timer_run, timeout;
--    char rem_addr[128], local_addr[128], timers[64], buffer[1024], more[512];
-+    char rem_addr[128], local_addr[128], timers[64];
-     struct aftype *ap;
- #if HAVE_AFINET6
-     struct sockaddr_in6 localaddr, remaddr;
-@@ -719,9 +976,17 @@ static void tcp_do_one(int lnr, const char *line)
- 	return;
- 
-     num = sscanf(line,
--    "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
-+    "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %*s\n",
- 		 &d, local_addr, &local_port, rem_addr, &rem_port, &state,
--		 &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
-+		 &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode);
-+
-+    if (num < 11) {
-+	fprintf(stderr, _("warning, got bogus tcp line.\n"));
-+	return;
-+    }
-+
-+    if (!flag_all && ((flag_lst && rem_port) || (!flag_lst && !rem_port)))
-+      return;
- 
-     if (strlen(local_addr) > 8) {
- #if HAVE_AFINET6
-@@ -748,45 +1013,16 @@ static void tcp_do_one(int lnr, const char *line)
- 	((struct sockaddr *) &remaddr)->sa_family = AF_INET;
-     }
- 
--    if (num < 11) {
--	fprintf(stderr, _("warning, got bogus tcp line.\n"));
--	return;
--    }
-     if ((ap = get_afntype(((struct sockaddr *) &localaddr)->sa_family)) == NULL) {
- 	fprintf(stderr, _("netstat: unsupported address family %d !\n"),
- 		((struct sockaddr *) &localaddr)->sa_family);
- 	return;
-     }
--    if (state == TCP_LISTEN) {
--	time_len = 0;
--	retr = 0L;
--	rxq = 0L;
--	txq = 0L;
--    }
--    safe_strncpy(local_addr, ap->sprint((struct sockaddr *) &localaddr, 
--					flag_not), sizeof(local_addr));
--    safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr, flag_not),
--		 sizeof(rem_addr));
--    if (flag_all || (flag_lst && !rem_port) || (!flag_lst && rem_port)) {
--	snprintf(buffer, sizeof(buffer), "%s",
--		 get_sname(htons(local_port), "tcp",
--			   flag_not & FLAG_NUM_PORT));
--
--	if ((strlen(local_addr) + strlen(buffer)) > 22)
--	    local_addr[22 - strlen(buffer)] = '\0';
--
--	strcat(local_addr, ":");
--	strcat(local_addr, buffer);
--	snprintf(buffer, sizeof(buffer), "%s",
--		 get_sname(htons(rem_port), "tcp", flag_not & FLAG_NUM_PORT));
--
--	if ((strlen(rem_addr) + strlen(buffer)) > 22)
--	    rem_addr[22 - strlen(buffer)] = '\0';
--
--	strcat(rem_addr, ":");
--	strcat(rem_addr, buffer);
--	timers[0] = '\0';
- 
-+	addr_do_one(local_addr, sizeof(local_addr), 22, ap, &localaddr, local_port, "tcp");
-+	addr_do_one(rem_addr, sizeof(rem_addr), 22, ap, &remaddr, rem_port, "tcp");
-+
-+	timers[0] = '\0';
- 	if (flag_opt)
- 	    switch (timer_run) {
- 	    case 0:
-@@ -813,23 +1049,23 @@ static void tcp_do_one(int lnr, const char *line)
- 			 timer_run, (double) time_len / HZ, retr, timeout);
- 		break;
- 	    }
--	printf("tcp   %6ld %6ld %-23s %-23s %-12s",
--	       rxq, txq, local_addr, rem_addr, _(tcp_state[state]));
-+
-+	printf("%-4s  %6ld %6ld %-*s %-*s %-11s",
-+	       prot, rxq, txq, (int)netmax(23,strlen(local_addr)), local_addr, (int)netmax(23,strlen(rem_addr)), rem_addr, _(tcp_state[state]));
- 
- 	finish_this_one(uid,inode,timers);
--    }
- }
- 
- static int tcp_info(void)
- {
-     INFO_GUTS6(_PATH_PROCNET_TCP, _PATH_PROCNET_TCP6, "AF INET (tcp)",
--	       tcp_do_one);
-+	       tcp_do_one, "tcp", "tcp6");
- }
- 
--static void udp_do_one(int lnr, const char *line)
-+static void udp_do_one(int lnr, const char *line,const char *prot)
- {
--    char buffer[8192], local_addr[64], rem_addr[64];
--    char *udp_state, timers[64], more[512];
-+    char local_addr[64], rem_addr[64];
-+    char *udp_state, timers[64];
-     int num, local_port, rem_port, d, state, timer_run, uid, timeout;
- #if HAVE_AFINET6
-     struct sockaddr_in6 localaddr, remaddr;
-@@ -845,12 +1081,16 @@ static void udp_do_one(int lnr, const char *line)
-     if (lnr == 0)
- 	return;
- 
--    more[0] = '\0';
-     num = sscanf(line,
--		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
-+		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %*s\n",
- 		 &d, local_addr, &local_port,
- 		 rem_addr, &rem_port, &state,
--	  &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
-+	  &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode);
-+
-+    if (num < 10) {
-+	fprintf(stderr, _("warning, got bogus udp line.\n"));
-+	return;
-+    }
- 
-     if (strlen(local_addr) > 8) {
- #if HAVE_AFINET6
-@@ -877,13 +1117,7 @@ static void udp_do_one(int lnr, const char *line)
-     }
- 
-     retr = 0L;
--    if (!flag_opt)
--	more[0] = '\0';
- 
--    if (num < 10) {
--	fprintf(stderr, _("warning, got bogus udp line.\n"));
--	return;
--    }
-     if ((ap = get_afntype(((struct sockaddr *) &localaddr)->sa_family)) == NULL) {
- 	fprintf(stderr, _("netstat: unsupported address family %d !\n"),
- 		((struct sockaddr *) &localaddr)->sa_family);
-@@ -917,24 +1151,8 @@ static void udp_do_one(int lnr, const char *line)
- 
-     if (flag_all || (notnull(remaddr) && !flag_lst) || (!notnull(remaddr) && flag_lst))
-     {
--        safe_strncpy(local_addr, ap->sprint((struct sockaddr *) &localaddr, 
--					    flag_not), sizeof(local_addr));
--	snprintf(buffer, sizeof(buffer), "%s",
--		 get_sname(htons(local_port), "udp",
--			   flag_not & FLAG_NUM_PORT));
--	if ((strlen(local_addr) + strlen(buffer)) > 22)
--	    local_addr[22 - strlen(buffer)] = '\0';
--	strcat(local_addr, ":");
--	strcat(local_addr, buffer);
--
--	snprintf(buffer, sizeof(buffer), "%s",
--		 get_sname(htons(rem_port), "udp", flag_not & FLAG_NUM_PORT));
--        safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr, 
--					  flag_not), sizeof(rem_addr));
--	if ((strlen(rem_addr) + strlen(buffer)) > 22)
--	    rem_addr[22 - strlen(buffer)] = '\0';
--	strcat(rem_addr, ":");
--	strcat(rem_addr, buffer);
-+	addr_do_one(local_addr, sizeof(local_addr), 22, ap, &localaddr, local_port, "udp");
-+	addr_do_one(rem_addr, sizeof(rem_addr), 22, ap, &remaddr, rem_port, "udp");
- 
- 	timers[0] = '\0';
- 	if (flag_opt)
-@@ -953,8 +1171,8 @@ static void udp_do_one(int lnr, const char *line)
- 			 retr, timeout);
- 		break;
- 	    }
--	printf("udp   %6ld %6ld %-23s %-23s %-12s",
--	       rxq, txq, local_addr, rem_addr, udp_state);
-+	printf("%-5s %6ld %6ld %-23s %-23s %-11s",
-+	       prot, rxq, txq, local_addr, rem_addr, udp_state);
- 
- 	finish_this_one(uid,inode,timers);
-     }
-@@ -963,13 +1181,19 @@ static void udp_do_one(int lnr, const char *line)
- static int udp_info(void)
- {
-     INFO_GUTS6(_PATH_PROCNET_UDP, _PATH_PROCNET_UDP6, "AF INET (udp)",
--	       udp_do_one);
-+	       udp_do_one, "udp", "udp6");
- }
- 
--static void raw_do_one(int lnr, const char *line)
-+static int udplite_info(void)
- {
--    char buffer[8192], local_addr[64], rem_addr[64];
--    char timers[64], more[512];
-+    INFO_GUTS6(_PATH_PROCNET_UDPLITE, _PATH_PROCNET_UDPLITE6,
-+               "AF INET (udplite)", udp_do_one, "udpl", "udpl6" );
-+}
-+
-+static void raw_do_one(int lnr, const char *line,const char *prot)
-+{
-+    char local_addr[64], rem_addr[64];
-+    char timers[64];
-     int num, local_port, rem_port, d, state, timer_run, uid, timeout;
- #if HAVE_AFINET6
-     struct sockaddr_in6 localaddr, remaddr;
-@@ -985,11 +1209,15 @@ static void raw_do_one(int lnr, const char *line)
-     if (lnr == 0)
- 	return;
- 
--    more[0] = '\0';
-     num = sscanf(line,
--		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
-+		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %*s\n",
- 		 &d, local_addr, &local_port, rem_addr, &rem_port, &state,
--	  &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
-+	  &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode);
-+
-+    if (num < 10) {
-+    	fprintf(stderr, _("warning, got bogus raw line.\n"));
-+	return;
-+    }
- 
-     if (strlen(local_addr) > 8) {
- #if HAVE_AFINET6
-@@ -1026,34 +1254,10 @@ static void raw_do_one(int lnr, const char *line)
-     }
- #endif
- 
--    if (!flag_opt)
--	more[0] = '\0';
--
--    if (num < 10) {
--	fprintf(stderr, _("warning, got bogus raw line.\n"));
--	return;
--    }
--
-     if (flag_all || (notnull(remaddr) && !flag_lst) || (!notnull(remaddr) && flag_lst))
-     {
--	snprintf(buffer, sizeof(buffer), "%s",
--		 get_sname(htons(local_port), "raw",
--			   flag_not & FLAG_NUM_PORT));
--        safe_strncpy(local_addr, ap->sprint((struct sockaddr *) &localaddr, 
--					    flag_not), sizeof(local_addr));
--	if ((strlen(local_addr) + strlen(buffer)) > 22)
--	    local_addr[22 - strlen(buffer)] = '\0';
--	strcat(local_addr, ":");
--	strcat(local_addr, buffer);
--
--	snprintf(buffer, sizeof(buffer), "%s",
--		 get_sname(htons(rem_port), "raw", flag_not & FLAG_NUM_PORT));
--        safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr, 
--					  flag_not), sizeof(rem_addr));
--	if ((strlen(rem_addr) + strlen(buffer)) > 22)
--	    rem_addr[22 - strlen(buffer)] = '\0';
--	strcat(rem_addr, ":");
--	strcat(rem_addr, buffer);
-+	addr_do_one(local_addr, sizeof(local_addr), 22, ap, &localaddr, local_port, "raw");
-+	addr_do_one(rem_addr, sizeof(rem_addr), 22, ap, &remaddr, rem_port, "raw");
- 
- 	timers[0] = '\0';
- 	if (flag_opt)
-@@ -1074,8 +1278,8 @@ static void raw_do_one(int lnr, const char *line)
- 			 retr, timeout);
- 		break;
- 	    }
--	printf("raw   %6ld %6ld %-23s %-23s %-12d",
--	       rxq, txq, local_addr, rem_addr, state);
-+	printf("%-4s  %6ld %6ld %-23s %-23s %-11d",
-+	       prot, rxq, txq, local_addr, rem_addr, state);
- 
- 	finish_this_one(uid,inode,timers);
-     }
-@@ -1084,7 +1288,7 @@ static void raw_do_one(int lnr, const char *line)
- static int raw_info(void)
- {
-     INFO_GUTS6(_PATH_PROCNET_RAW, _PATH_PROCNET_RAW6, "AF INET (raw)",
--	       raw_do_one);
-+	       raw_do_one, "raw", "raw6");
- }
- 
- #endif
-@@ -1094,14 +1298,14 @@ static int raw_info(void)
- 
- #define HAS_INODE 1
- 
--static void unix_do_one(int nr, const char *line)
-+static void unix_do_one(int nr, const char *line, const char *prot)
- {
-     static int has = 0;
-     char path[MAXPATHLEN], ss_flags[32];
-     char *ss_proto, *ss_state, *ss_type;
--    int num, state, type, inode;
-+    int num, state, type;
-     void *d;
--    unsigned long refcnt, proto, flags;
-+    unsigned long refcnt, proto, flags, inode;
- 
-     if (nr == 0) {
- 	if (strstr(line, "Inode"))
-@@ -1109,14 +1313,14 @@ static void unix_do_one(int nr, const char *line)
- 	return;
-     }
-     path[0] = '\0';
--    num = sscanf(line, "%p: %lX %lX %lX %X %X %d %s",
-+    num = sscanf(line, "%p: %lX %lX %lX %X %X %lu %s",
- 		 &d, &refcnt, &proto, &flags, &type, &state, &inode, path);
-     if (num < 6) {
- 	fprintf(stderr, _("warning, got bogus unix line.\n"));
- 	return;
-     }
-     if (!(has & HAS_INODE))
--	snprintf(path,sizeof(path),"%d",inode);
-+	snprintf(path,sizeof(path),"%lu",inode);
- 
-     if (!flag_all) {
-     	if ((state == SS_UNCONNECTED) && (flags & SO_ACCEPTCON)) {
-@@ -1195,7 +1399,7 @@ static void unix_do_one(int nr, const char *line)
- 	ss_state = _("UNKNOWN");
-     }
- 
--    strcpy(ss_flags, "[ ");
-+    safe_strncpy(ss_flags, "[ ", sizeof(ss_flags));
-     if (flags & SO_ACCEPTCON)
- 	strcat(ss_flags, "ACC ");
-     if (flags & SO_WAITDATA)
-@@ -1208,12 +1412,15 @@ static void unix_do_one(int nr, const char *line)
-     printf("%-5s %-6ld %-11s %-10s %-13s ",
- 	   ss_proto, refcnt, ss_flags, ss_type, ss_state);
-     if (has & HAS_INODE)
--	printf("%-6d ",inode);
-+	printf("%-8lu",inode);
-     else
--	printf("-      ");
-+	printf("-       ");
-     if (flag_prg)
--	printf("%-" PROGNAME_WIDTHs "s",(has & HAS_INODE?prg_cache_get(inode):"-"));
--    puts(path);
-+	printf(" %-" PROGNAME_WIDTHs "s",(has & HAS_INODE?prg_cache_get(inode):"-"));
-+    if (flag_selinux)
-+	printf(" %-" SELINUX_WIDTHs "s",(has & HAS_INODE?prg_cache_get_con(inode):"-"));
-+
-+    printf(" %s\n", path);
- }
- 
- static int unix_info(void)
-@@ -1229,12 +1436,13 @@ static int unix_info(void)
- 	printf(_("(w/o servers)"));
-     }
- 
--    printf(_("\nProto RefCnt Flags       Type       State         I-Node"));
-+    printf(_("\nProto RefCnt Flags       Type       State         I-Node  "));
-     print_progname_banner();
-+    print_selinux_banner();
-     printf(_(" Path\n"));	/* xxx */
- 
-     {
--	INFO_GUTS(_PATH_PROCNET_UNIX, "AF UNIX", unix_do_one);
-+	INFO_GUTS(_PATH_PROCNET_UNIX, "AF UNIX", unix_do_one, "unix");
-     }
- }
- #endif
-@@ -1256,7 +1464,7 @@ static int ax25_info(void)
- 	N_("ESTABLISHED"),
- 	N_("RECOVERY")
-     };
--    if (!(f = fopen(_PATH_PROCNET_AX25, "r"))) {
-+    if (!(f = proc_fopen(_PATH_PROCNET_AX25))) {
- 	if (errno != ENOENT) {
- 	    perror(_PATH_PROCNET_AX25);
- 	    return (-1);
-@@ -1350,18 +1558,37 @@ static int ipx_info(void)
-     char sad[50], dad[50];
-     struct sockaddr sa;
-     unsigned sport = 0, dport = 0;
--
--    if (!(f = fopen(_PATH_PROCNET_IPX, "r"))) {
--	if (errno != ENOENT) {
--	    perror(_PATH_PROCNET_IPX);
--	    return (-1);
--	}
--	if (flag_arg || flag_ver)
--	    ESYSNOT("netstat", "AF IPX");
--	if (flag_arg)
--	    return (1);
--	else
--	    return (0);
-+    struct stat s;
-+
-+    f = proc_fopen(_PATH_PROCNET_IPX_SOCKET1);
-+    if (!f) {
-+        if (errno != ENOENT) {
-+            perror(_PATH_PROCNET_IPX_SOCKET1);
-+            return (-1);
-+        }
-+        f = proc_fopen(_PATH_PROCNET_IPX_SOCKET2);
-+
-+        /* We need to check for directory */
-+        if (f) {
-+            if (fstat (fileno(f), &s) == -1 ||
-+                !S_ISREG(s.st_mode)) {
-+                fclose(f);
-+                f=NULL;
-+            }
-+        }
-+
-+        if (!f) {
-+            if (errno != ENOENT) {
-+	        perror(_PATH_PROCNET_IPX_SOCKET2);
-+	        return (-1);
-+	    }
-+	    if (flag_arg || flag_ver)
-+	        ESYSNOT("netstat", "AF IPX");
-+	    if (flag_arg)
-+	        return (1);
-+ 	    else
-+	        return (0);
-+        }
-     }
-     printf(_("Active IPX sockets\nProto Recv-Q Send-Q Local Address              Foreign Address            State"));	/* xxx */
-     if (flag_exp > 1)
-@@ -1369,19 +1596,22 @@ static int ipx_info(void)
-     printf("\n");
-     if ((ap = get_afntype(AF_IPX)) == NULL) {
- 	EINTERN("netstat.c", "AF_IPX missing");
-+	fclose(f);
- 	return (-1);
-     }
--    fgets(buf, 255, f);
-+    if (fgets(buf, 255, f))
-+	/* eat line */;
- 
-     while (fgets(buf, 255, f) != NULL) {
--	sscanf(buf, "%s %s %lX %lX %d %d",
-+	sscanf(buf, "%s %s %lX %lX %u %u",
- 	       sad, dad, &txq, &rxq, &state, &uid);
- 	if ((st = rindex(sad, ':'))) {
- 	    *st++ = '\0';
- 	    sscanf(st, "%X", &sport);	/* net byt order */
- 	    sport = ntohs(sport);
- 	} else {
--	    EINTERN("netstat.c", _PATH_PROCNET_IPX " sport format error");
-+	    EINTERN("netstat.c", "ipx socket format error in source port");
-+	    fclose(f);
- 	    return (-1);
- 	}
- 	nc = 0;
-@@ -1391,7 +1621,8 @@ static int ipx_info(void)
- 		sscanf(st, "%X", &dport);	/* net byt order */
- 		dport = ntohs(dport);
- 	    } else {
--		EINTERN("netstat.c", _PATH_PROCNET_IPX " dport format error");
-+		EINTERN("netstat.c", "ipx socket format error in destination port");
-+		fclose(f);
- 		return (-1);
- 	    }
- 	} else
-@@ -1413,16 +1644,16 @@ static int ipx_info(void)
- 
- 	/* Fetch and resolve the Source */
- 	(void) ap->input(4, sad, &sa);
--	safe_strncpy(buf, ap->sprint(&sa, flag_not), sizeof(buf));
-+	safe_strncpy(buf, ap->sprint(&sa, flag_not & FLAG_NUM_HOST), sizeof(buf));
- 	snprintf(sad, sizeof(sad), "%s:%04X", buf, sport);
- 
- 	if (!nc) {
- 	    /* Fetch and resolve the Destination */
- 	    (void) ap->input(4, dad, &sa);
--	    safe_strncpy(buf, ap->sprint(&sa, flag_not), sizeof(buf));
-+	    safe_strncpy(buf, ap->sprint(&sa, flag_not & FLAG_NUM_HOST), sizeof(buf));
- 	    snprintf(dad, sizeof(dad), "%s:%04X", buf, dport);
- 	} else
--	    strcpy(dad, "-");
-+        safe_strncpy(dad, "-", sizeof(dad));
- 
- 	printf("IPX   %6ld %6ld %-26s %-26s %-5s", txq, rxq, sad, dad, st);
- 	if (flag_exp > 1) {
-@@ -1438,6 +1669,116 @@ static int ipx_info(void)
- }
- #endif
- 
-+#if HAVE_AFBLUETOOTH
-+const char *bluetooth_state(int state)
-+{
-+    switch (state) {
-+	case BT_CONNECTED:
-+	    return _("CONNECTED");
-+	case BT_OPEN:
-+	    return _("OPEN");
-+	case BT_BOUND:
-+	    return _("BOUND");
-+	case BT_LISTEN:
-+	    return _("LISTEN");
-+	case BT_CONNECT:
-+	    return _("CONNECT");
-+	case BT_CONNECT2:
-+	    return _("CONNECT2");
-+	case BT_CONFIG:
-+	    return _("CONFIG");
-+	case BT_DISCONN:
-+	    return _("DISCONN");
-+	case BT_CLOSED:
-+	    return _("CLOSED");
-+	default:
-+	    return _("UNKNOWN");
-+    }
-+}
-+
-+static void l2cap_do_one(int nr, const char *line, const char *prot)
-+{
-+    char daddr[18], saddr[18];
-+    unsigned state, psm, dcid, scid, imtu, omtu, sec_level;
-+    int num;
-+    const char *bt_state, *bt_sec_level;
-+
-+    num = sscanf(line, "%17s %17s %d %d 0x%04x 0x%04x %d %d %d",
-+	daddr, saddr, &state, &psm, &dcid, &scid, &imtu, &omtu, &sec_level);
-+
-+    if (num < 9) {
-+	fprintf(stderr, _("warning, got bogus l2cap line.\n"));
-+	return;
-+    }
-+
-+    if (flag_lst && !(state == BT_LISTEN || state == BT_BOUND))
-+	return;
-+    if (!(flag_all || flag_lst) && (state == BT_LISTEN || state == BT_BOUND))
-+	return;
-+
-+    bt_state = bluetooth_state(state);
-+    switch (sec_level) {
-+	case BT_SECURITY_SDP:
-+	    bt_sec_level = _("SDP");
-+	    break;
-+	case BT_SECURITY_LOW:
-+	    bt_sec_level = _("LOW");
-+	    break;
-+	case BT_SECURITY_MEDIUM:
-+	    bt_sec_level = _("MEDIUM");
-+	    break;
-+	case BT_SECURITY_HIGH:
-+	    bt_sec_level = _("HIGH");
-+	    break;
-+	default:
-+	    bt_sec_level = _("UNKNOWN");
-+    }
-+
-+    printf("l2cap  %-17s %-17s %-9s %7d 0x%04x 0x%04x %7d %7d %-7s\n",
-+	(strcmp (daddr, "00:00:00:00:00:00") == 0 ? "*" : daddr),
-+	(strcmp (saddr, "00:00:00:00:00:00") == 0 ? "*" : saddr),
-+	bt_state, psm, dcid, scid, imtu, omtu, bt_sec_level);
-+}
-+
-+static int l2cap_info(void)
-+{
-+    printf("%-6s %-17s %-17s %-9s %7s %-6s %-6s %7s %7s %-7s\n",
-+	"Proto", "Destination", "Source", "State", "PSM", "DCID", "SCID", "IMTU", "OMTU", "Security");
-+    INFO_GUTS(_PATH_SYS_BLUETOOTH_L2CAP, "AF BLUETOOTH", l2cap_do_one, "l2cap");
-+}
-+
-+static void rfcomm_do_one(int nr, const char *line, const char *prot)
-+{
-+    char daddr[18], saddr[18];
-+    unsigned state, channel;
-+    int num;
-+    const char *bt_state;
-+
-+    num = sscanf(line, "%17s %17s %d %d", daddr, saddr, &state, &channel);
-+    if (num < 4) {
-+	fprintf(stderr, _("warning, got bogus rfcomm line.\n"));
-+	return;
-+    }
-+
-+    if (flag_lst && !(state == BT_LISTEN || state == BT_BOUND))
-+	return;
-+    if (!(flag_all || flag_lst) && (state == BT_LISTEN || state == BT_BOUND))
-+	return;
-+
-+    bt_state = bluetooth_state(state);
-+    printf("rfcomm %-17s %-17s %-9s %7d\n",
-+	(strcmp (daddr, "00:00:00:00:00:00") == 0 ? "*" : daddr),
-+	(strcmp (saddr, "00:00:00:00:00:00") == 0 ? "*" : saddr),
-+	bt_state, channel);
-+}
-+
-+static int rfcomm_info(void)
-+{
-+    printf("%-6s %-17s %-17s %-9s %7s\n", "Proto", "Destination", "Source", "State", "Channel");
-+    INFO_GUTS(_PATH_SYS_BLUETOOTH_RFCOMM, "AF BLUETOOTH", rfcomm_do_one, "rfcomm");
-+}
-+#endif
-+
- static int iface_info(void)
- {
-     if (skfd < 0) {
-@@ -1449,7 +1790,7 @@ static int iface_info(void)
-     }
-     if (flag_exp < 2) {
- 	ife_short = 1;
--	printf(_("Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
-+	printf(_("Iface      MTU    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
-     }
- 
-     if (for_all_interfaces(do_if_print, &flag_all) < 0) {
-@@ -1457,7 +1798,7 @@ static int iface_info(void)
- 	exit(1);
-     }
-     if (flag_cnt)
--	free_interface_list();
-+	if_cache_free();
-     else {
- 	close(skfd);
- 	skfd = -1;
-@@ -1469,16 +1810,16 @@ static int iface_info(void)
- 
- static void version(void)
- {
--    printf("%s\n%s\n%s\n%s\n", Release, Version, Signature, Features);
-+    printf("%s\n%s\n%s\n", Release, Signature, Features);
-     exit(E_VERSION);
- }
- 
- 
- static void usage(void)
- {
--    fprintf(stderr, _("usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--help}\n"));
--    fprintf(stderr, _("       netstat [-vnNcaeol] [<Socket> ...]\n"));
--    fprintf(stderr, _("       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n\n"));
-+    fprintf(stderr, _("usage: netstat [-vWeenNcCF] [<Af>] -r         netstat {-V|--version|-h|--help}\n"));
-+    fprintf(stderr, _("       netstat [-vWnNcaeol] [<Socket> ...]\n"));
-+    fprintf(stderr, _("       netstat { [-vWeenNac] -i | [-cnNe] -M | -s [-6tuw] }\n\n"));
- 
-     fprintf(stderr, _("        -r, --route              display routing table\n"));
-     fprintf(stderr, _("        -i, --interfaces         display interface table\n"));
-@@ -1487,7 +1828,9 @@ static void usage(void)
- #if HAVE_FW_MASQUERADE
-     fprintf(stderr, _("        -M, --masquerade         display masqueraded connections\n\n"));
- #endif
-+
-     fprintf(stderr, _("        -v, --verbose            be verbose\n"));
-+    fprintf(stderr, _("        -W, --wide               don't truncate IP addresses\n"));
-     fprintf(stderr, _("        -n, --numeric            don't resolve names\n"));
-     fprintf(stderr, _("        --numeric-hosts          don't resolve host names\n"));
-     fprintf(stderr, _("        --numeric-ports          don't resolve port names\n"));
-@@ -1495,15 +1838,19 @@ static void usage(void)
-     fprintf(stderr, _("        -N, --symbolic           resolve hardware names\n"));
-     fprintf(stderr, _("        -e, --extend             display other/more information\n"));
-     fprintf(stderr, _("        -p, --programs           display PID/Program name for sockets\n"));
-+    fprintf(stderr, _("        -o, --timers             display timers\n"));
-     fprintf(stderr, _("        -c, --continuous         continuous listing\n\n"));
-     fprintf(stderr, _("        -l, --listening          display listening server sockets\n"));
--    fprintf(stderr, _("        -a, --all, --listening   display all sockets (default: connected)\n"));
--    fprintf(stderr, _("        -o, --timers             display timers\n"));
-+    fprintf(stderr, _("        -a, --all                display all sockets (default: connected)\n"));
-     fprintf(stderr, _("        -F, --fib                display Forwarding Information Base (default)\n"));
--    fprintf(stderr, _("        -C, --cache              display routing cache instead of FIB\n\n"));
-+    fprintf(stderr, _("        -C, --cache              display routing cache instead of FIB\n"));
-+#if HAVE_SELINUX
-+    fprintf(stderr, _("        -Z, --context            display SELinux security context for sockets\n"));
-+#endif
- 
--    fprintf(stderr, _("  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n"));
--    fprintf(stderr, _("  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
-+    fprintf(stderr, _("\n  <Socket>={-t|--tcp} {-u|--udp} {-U|--udplite} {-S|--sctp} {-w|--raw}\n"));
-+    fprintf(stderr, _("           {-x|--unix} --ax25 --ipx --netrom\n"));
-+    fprintf(stderr, _("  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
-     fprintf(stderr, _("  List of possible address families (which support routing):\n"));
-     print_aflist(1); /* 1 = routeable */
-     exit(E_USAGE);
-@@ -1514,7 +1861,7 @@ int main
-  (int argc, char *argv[]) {
-     int i;
-     int lop;
--    struct option longopts[] =
-+    static struct option longopts[] =
-     {
- 	AFTRANS_OPTS,
- 	{"version", 0, 0, 'V'},
-@@ -1526,9 +1873,13 @@ int main
- #endif
- 	{"protocol", 1, 0, 'A'},
- 	{"tcp", 0, 0, 't'},
-+	{"sctp", 0, 0, 'S'},
- 	{"udp", 0, 0, 'u'},
-+        {"udplite", 0, 0, 'U'},
- 	{"raw", 0, 0, 'w'},
- 	{"unix", 0, 0, 'x'},
-+	{"l2cap", 0, 0, '2'},
-+	{"rfcomm", 0, 0, 'f'},
- 	{"listening", 0, 0, 'l'},
- 	{"all", 0, 0, 'a'},
- 	{"timers", 0, 0, 'o'},
-@@ -1537,6 +1888,7 @@ int main
- 	{"programs", 0, 0, 'p'},
- 	{"verbose", 0, 0, 'v'},
- 	{"statistics", 0, 0, 's'},
-+	{"wide", 0, 0, 'W'},
- 	{"numeric", 0, 0, 'n'},
- 	{"numeric-hosts", 0, 0, '!'},
- 	{"numeric-ports", 0, 0, '@'},
-@@ -1545,6 +1897,7 @@ int main
- 	{"cache", 0, 0, 'C'},
- 	{"fib", 0, 0, 'F'},
- 	{"groups", 0, 0, 'g'},
-+	{"context", 0, 0, 'Z'},
- 	{NULL, 0, 0, 0}
-     };
- 
-@@ -1556,7 +1909,7 @@ int main
-     getroute_init();		/* Set up AF routing support */
- 
-     afname[0] = '\0';
--    while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl", longopts, &lop)) != EOF)
-+    while ((i = getopt_long(argc, argv, "A:CFMacdeghilnNoprsStuUvVWwx64?Z", longopts, &lop)) != EOF)
- 	switch (i) {
- 	case -1:
- 	    break;
-@@ -1600,6 +1953,9 @@ int main
- 	case 'i':
- 	    flag_int++;
- 	    break;
-+	case 'W':
-+	    flag_wide++;
-+	    break;
- 	case 'n':
- 	    flag_not |= FLAG_NUM;
- 	    break;
-@@ -1624,6 +1980,14 @@ int main
- 	case 'o':
- 	    flag_opt++;
- 	    break;
-+	case '6':
-+	    if (aftrans_opt("inet6"))
-+		exit(1);
-+	    break;
-+	case '4':
-+	    if (aftrans_opt("inet"))
-+		exit(1);
-+	    break;
- 	case 'V':
- 	    version();
- 	    /*NOTREACHED */
-@@ -1633,21 +1997,45 @@ int main
- 	case 'r':
- 	    flag_rou++;
- 	    break;
--
- 	case 't':
- 	    flag_tcp++;
- 	    break;
--
-+	case 'S':
-+	    flag_sctp++;
-+	    break;
- 	case 'u':
- 	    flag_udp++;
- 	    break;
-+        case 'U':
-+	    flag_udplite++;
-+	    break;
- 	case 'w':
- 	    flag_raw++;
- 	    break;
-+        case '2':
-+	    flag_l2cap++;
-+	    break;
-+        case 'f':
-+	    flag_rfcomm++;
-+	    break;
- 	case 'x':
- 	    if (aftrans_opt("unix"))
- 		exit(1);
- 	    break;
-+	case 'Z':
-+#if HAVE_SELINUX
-+	    if (is_selinux_enabled() <= 0) {
-+		fprintf(stderr, _("SELinux is not enabled on this machine.\n"));
-+		exit(1);
-+	    }
-+	    flag_prg++;
-+	    flag_selinux++;
-+#else
-+            fprintf(stderr, _("SELinux is not enabled for this application.\n"));
-+	    exit(1);
-+#endif
-+
-+	    break;
- 	case '?':
- 	case 'h':
- 	    usage();
-@@ -1658,46 +2046,71 @@ int main
-     if (flag_int + flag_rou + flag_mas + flag_sta > 1)
- 	usage();
- 
--    if ((flag_inet || flag_inet6 || flag_sta) && !(flag_tcp || flag_udp || flag_raw))
--	flag_tcp = flag_udp = flag_raw = 1;
-+    if ((flag_inet || flag_inet6 || flag_sta) &&
-+        !(flag_tcp || flag_sctp || flag_udp || flag_udplite || flag_raw))
-+	   flag_tcp = flag_sctp = flag_udp = flag_udplite = flag_raw = 1;
- 
--    if ((flag_tcp || flag_udp || flag_raw || flag_igmp) && !(flag_inet || flag_inet6))
-+    if ((flag_tcp || flag_sctp || flag_udp || flag_udplite || flag_raw || flag_igmp) &&
-+        !(flag_inet || flag_inet6))
-         flag_inet = flag_inet6 = 1;
- 
--    flag_arg = flag_tcp + flag_udp + flag_raw + flag_unx + flag_ipx
--	+ flag_ax25 + flag_netrom + flag_igmp + flag_x25;
-+    if (flag_bluetooth && !(flag_l2cap || flag_rfcomm))
-+	   flag_l2cap = flag_rfcomm = 1;
-+
-+    flag_arg = flag_tcp + flag_sctp + flag_udplite + flag_udp + flag_raw + flag_unx
-+        + flag_ipx + flag_ax25 + flag_netrom + flag_igmp + flag_x25 + flag_rose
-+	+ flag_l2cap + flag_rfcomm;
- 
-     if (flag_mas) {
- #if HAVE_FW_MASQUERADE && HAVE_AFINET
- #if MORE_THAN_ONE_MASQ_AF
- 	if (!afname[0])
--	    strcpy(afname, DFLT_AF);
-+        safe_strncpy(afname, DFLT_AF, sizeof(afname));
- #endif
- 	for (;;) {
- 	    i = ip_masq_info(flag_not & FLAG_NUM_HOST,
- 			     flag_not & FLAG_NUM_PORT, flag_exp);
- 	    if (i || !flag_cnt)
- 		break;
--	    sleep(1);
-+	    wait_continous();
- 	}
- #else
--	ENOSUPP("netstat.c", "FW_MASQUERADE");
-+	ENOSUPP("netstat", "FW_MASQUERADE");
- 	i = -1;
- #endif
- 	return (i);
-     }
- 
-     if (flag_sta) {
--        inittab();
--	parsesnmp(flag_raw, flag_tcp, flag_udp);
--	exit(0);
-+        if (!afname[0])
-+            safe_strncpy(afname, DFLT_AF, sizeof(afname));
-+
-+        if (!strcmp(afname, "inet")) {
-+#if HAVE_AFINET
-+            inittab();
-+            parsesnmp(flag_raw, flag_tcp, flag_udp);
-+#else
-+            ENOSUPP("netstat", "AF INET");
-+#endif
-+        } else if(!strcmp(afname, "inet6")) {
-+#if HAVE_AFINET6
-+            inittab6();
-+            parsesnmp6(flag_raw, flag_tcp, flag_udp);
-+#else
-+            ENOSUPP("netstat", "AF INET6");
-+#endif
-+        } else {
-+          printf(_("netstat: No statistics support for specified address family: %s\n"), afname);
-+          exit(1);
-+        }
-+        exit(0);
-     }
--    
-+
-     if (flag_rou) {
- 	int options = 0;
- 
- 	if (!afname[0])
--	    strcpy(afname, DFLT_AF);
-+        safe_strncpy(afname, DFLT_AF, sizeof(afname));
- 
- 	if (flag_exp == 2)
- 	    flag_exp = 1;
-@@ -1712,7 +2125,7 @@ int main
- 	    i = route_info(afname, options);
- 	    if (i || !flag_cnt)
- 		break;
--	    sleep(1);
-+            wait_continous();
- 	}
- 	return (i);
-     }
-@@ -1721,12 +2134,12 @@ int main
- 	    i = iface_info();
- 	    if (!flag_cnt || i)
- 		break;
--	    sleep(1);
-+            wait_continous();
- 	}
- 	return (i);
-     }
-     for (;;) {
--	if (!flag_arg || flag_tcp || flag_udp || flag_raw) {
-+	if (!flag_arg || flag_tcp || flag_sctp || flag_udp || flag_udplite || flag_raw) {
- #if HAVE_AFINET
- 	    prg_cache_load();
- 	    printf(_("Active Internet connections "));	/* xxx */
-@@ -1743,6 +2156,7 @@ int main
- 	    if (flag_exp > 1)
- 		printf(_(" User       Inode     "));
- 	    print_progname_banner();
-+	    print_selinux_banner();
- 	    if (flag_opt)
- 		printf(_(" Timer"));	/* xxx */
- 	    printf("\n");
-@@ -1759,11 +2173,25 @@ int main
- 	    if (i)
- 		return (i);
- 	}
-+
-+	if (!flag_arg || flag_sctp) {
-+	    i = sctp_info();
-+	    if (i)
-+		return (i);
-+	}
-+
- 	if (!flag_arg || flag_udp) {
- 	    i = udp_info();
- 	    if (i)
- 		return (i);
- 	}
-+
-+	if (!flag_arg || flag_udplite) {
-+	    i = udplite_info();
-+	    if (i)
-+		return (i);
-+	}
-+
- 	if (!flag_arg || flag_raw) {
- 	    i = raw_info();
- 	    if (i)
-@@ -1845,9 +2273,55 @@ int main
- 	    }
- #endif
- 	}
-+	if (!flag_arg || flag_rose) {
-+#if 0 && HAVE_AFROSE
-+          i = rose_info();
-+          if (i)
-+            return (i);
-+#else
-+          if (flag_arg) {
-+            i = 1;
-+            ENOSUPP("netstat", "AF ROSE");
-+          }
-+#endif
-+        }
-+
-+	if (!flag_arg || flag_l2cap || flag_rfcomm) {
-+#if HAVE_AFBLUETOOTH
-+	    printf(_("Active Bluetooth connections "));	/* xxx */
-+
-+	    if (flag_all)
-+		printf(_("(servers and established)"));
-+	    else {
-+	      if (flag_lst)
-+		printf(_("(only servers)"));
-+	      else
-+		printf(_("(w/o servers)"));
-+	    }
-+	    printf("\n");
-+#else
-+	    if (flag_arg) {
-+		i = 1;
-+		ENOSUPP("netstat", "AF BLUETOOTH");
-+	    }
-+#endif
-+	}
-+#if HAVE_AFBLUETOOTH
-+	if (!flag_arg || flag_l2cap) {
-+	    i = l2cap_info();
-+	    if (i)
-+		return (i);
-+	}
-+	if (!flag_arg || flag_rfcomm) {
-+	    i = rfcomm_info();
-+	    if (i)
-+		return (i);
-+	}
-+#endif
-+
- 	if (!flag_cnt || i)
- 	    break;
--	sleep(1);
-+        wait_continous();
- 	prg_cache_clear();
-     }
-     return (i);
-diff --git a/plipconfig.c b/plipconfig.c
-index 1f972a7..86fa890 100644
---- a/plipconfig.c
-+++ b/plipconfig.c
-@@ -4,7 +4,7 @@
-    Copyright (c) 1994 John Paul Morrison (VE7JPM).
- 
-    version 0.2
--   
-+
-    Changed by Alan Cox, to reflect the way SIOCDEVPRIVATE is meant to work
-    and for the extra parameter added by Niibe.
- 
-@@ -42,31 +42,27 @@
- #include "intl.h"
- #include "net-support.h"
- #include "version.h"
-+#include "util.h"
- 
--int opt_a = 0;
--int opt_i = 0;
--int opt_v = 0;
- int skfd = -1;
- 
- struct ifreq ifr;
- struct plipconf *plip;
- 
--char *Release = RELEASE,
--     *Version = "plipconfig 0.2",
--     *Signature = "John Paul Morrison, Alan Cox et al.";
-+static char *Release = RELEASE, *Signature = "John Paul Morrison, Alan Cox et al.";
- 
- static void version(void)
- {
--    printf("%s\n%s\n%s\n", Release, Version, Signature);
-+    printf("%s\n%s\n", Release, Signature);
-     exit(E_VERSION);
- }
- 
- void usage(void)
- {
--    fprintf(stderr, _("Usage: plipconfig [-a] [-i] [-v] interface\n"));
--    fprintf(stderr, _("                  [nibble NN] [trigger NN]\n"));
-+    fprintf(stderr, _("Usage: plipconfig interface [nibble NN] [trigger NN]\n"));
-     fprintf(stderr, _("       plipconfig -V | --version\n"));
--    exit(-1);
-+    fprintf(stderr, _("       plipconfig -h | --help\n"));
-+    exit(E_USAGE);
- }
- 
- void print_plip(void)
-@@ -93,12 +89,10 @@ int main(int argc, char **argv)
-     argc--;
-     argv++;
-     while (argv[0] && *argv[0] == '-') {
--	if (!strcmp(*argv, "-a"))
--	    opt_a = 1;
--	if (!strcmp(*argv, "-v"))
--	    opt_v = 1;
- 	if (!strcmp(*argv, "-V") || !strcmp(*argv, "--version"))
- 	    version();
-+	else
-+            usage();
- 	argv++;
- 	argc--;
-     }
-@@ -107,7 +101,7 @@ int main(int argc, char **argv)
- 	usage();
- 
-     spp = argv;
--    strncpy(ifr.ifr_name, *spp++, IFNAMSIZ);
-+    safe_strncpy(ifr.ifr_name, *spp++, IFNAMSIZ);
-     plip=(struct plipconf *)&ifr.ifr_data;
- 
-     plip->pcmd = PLIP_GET_TIMEOUT;	/* get current settings for device */
-diff --git a/po/Makefile b/po/Makefile
-index 0fdf82d..c7f27fb 100644
---- a/po/Makefile
-+++ b/po/Makefile
-@@ -3,16 +3,24 @@ INSTALL_PROGRAM= ${INSTALL}
- INSTALL_DATA= ${INSTALL} -m 644
- INSTALLNLSDIR=${BASEDIR}/usr/share/locale
- 
--TUPDATE = tupdate
-+TUPDATE = msgmerge
- 
- NLSPACKAGE = net-tools
- 
- -include ../config.make
-+ALL_POS = $(wildcard *.po)
-+ALL_LANGS = $(ALL_POS:%.po=%)
-+ALL_CATALOGS = $(ALL_LANGS:%=%.mo)
- ifeq ($(I18N),1)
--CATALOGS = de.mo fr.mo pt_BR.mo et_EE.mo cs.mo
-+ifeq ($(LINGUAS),)
-+LANGS = $(ALL_LANGS)
- else
--CATALOGS =
-+LANGS = $(filter $(LINGUAS),$(ALL_LANGS))
- endif
-+else
-+LANGS =
-+endif
-+CATALOGS = $(LANGS:%=%.mo)
- 
- POTFILES=../arp.c ../hostname.c ../ifconfig.c ../netstat.c ../rarp.c \
- 	../route.c ../plipconfig.c ../iptunnel.c ../statistics.c \
-@@ -44,12 +52,12 @@ $(NLSPACKAGE).pot: $(POTFILES)
- 
- update-po: Makefile
- 	$(MAKE) $(NLSPACKAGE).pot
--	catalogs='$(CATALOGS)'; \
--	for cat in $$catalogs; do \
--		lang=`echo $$cat | sed 's/.mo//'`; \
-+	langs='$(ALL_LANGS)'; \
-+	for lang in $$langs; do \
-+		cat=$$lang.mo; \
- 		mv $$lang.po $$lang.old.po; \
- 		echo "$$lang:"; \
--		if $(TUPDATE) $(NLSPACKAGE).pot $$lang.old.po > $$lang.po; then \
-+		if $(TUPDATE) $$lang.old.po $(NLSPACKAGE).pot > $$lang.po; then \
- 		rm -f $$lang.old.po; \
- 	else \
- 	 	echo "tupdate for $$cat failed!"; \
-@@ -61,18 +69,19 @@ update-po: Makefile
- clean:
- 	rm -f *mo
- 
-+dist: $(ALL_CATALOGS)
-+
- distclean: clean
- 	rm -f .depend Makefile
- 
- depend:
- 
- install: $(CATALOGS)
--	catalogs='$(CATALOGS)'; \
--	for n in $$catalogs; do \
--	    l=`basename $$n .mo`; \
-+	langs='$(LANGS)'; \
-+	for l in $$langs; do \
- 	    $(INSTALL) -m 755 -d $(INSTALLNLSDIR)/$$l; \
- 	    $(INSTALL) -m 755 -d $(INSTALLNLSDIR)/$$l/LC_MESSAGES; \
--	    $(INSTALL) -m 644 $$n $(INSTALLNLSDIR)/$$l/LC_MESSAGES/net-tools.mo; \
-+	    $(INSTALL) -m 644 $$l.mo $(INSTALLNLSDIR)/$$l/LC_MESSAGES/net-tools.mo; \
- 	done
- 
- %.mo: %.po
-diff --git a/po/cs.po b/po/cs.po
-index b4b66a1..c1d6a8a 100644
---- a/po/cs.po
-+++ b/po/cs.po
-@@ -1,359 +1,385 @@
- # Czech translation of net-tools
- # Copyright (C) 1999 Free Software Foundation, Inc.
--# Ji�� Pavlovsk� <pavlovsk@ffcuni.cz>, 1999.
-+# Jiří Pavlovský <pavlovsk@ffcuni.cz>, 1999.
-+# Petr Pisar <petr.pisar@atlas.cz>, 2009.
- #
- msgid ""
- msgstr ""
--"Project-Id-Version: net-tools-1.51\n"
--"POT-Creation-Date: 2000-02-14 02:31+0100\n"
--"PO-Revision-Date: 1999-08-29 23:20+0200\n"
--"Last-Translator: Ji�� Pavlovsk� <pavlovsk@ff.cuni.cz>\n"
--"Language-Team: Czech <cs@li.org>\n"
-+"Project-Id-Version: net-tools cvs-20090825\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2009-08-25 18:34+0200\n"
-+"PO-Revision-Date: 2009-08-26 22:18+0200\n"
-+"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
-+"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
- "MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=iso-8859-2\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: ../arp.c:110 ../arp.c:269
-+#: ../arp.c:112 ../arp.c:279
-+#, c-format
- msgid "arp: need host name\n"
--msgstr "arp: je t�eba jm�no po��ta�e\n"
-+msgstr "arp: je třeba jméno počítače\n"
- 
--#: ../arp.c:207 ../arp.c:221
-+#: ../arp.c:215 ../arp.c:230
- #, c-format
- msgid "No ARP entry for %s\n"
--msgstr "Pro %s neexistuje ARP polo�ka\n"
-+msgstr "Pro %s neexistuje ARP položka\n"
- 
--#: ../arp.c:239
-+#: ../arp.c:248
- #, c-format
- msgid "arp: cant get HW-Address for `%s': %s.\n"
- msgstr "arp: HW adresu `%s' nelze zjistit: %s\n"
- 
--#: ../arp.c:243
-+#: ../arp.c:252
-+#, c-format
- msgid "arp: protocol type mismatch.\n"
--msgstr "arp: chybn� zadan� typ protokolu\n"
-+msgstr "arp: chybně zadaný typ protokolu\n"
- 
--#: ../arp.c:252
-+#: ../arp.c:261
- #, c-format
- msgid "arp: device `%s' has HW address %s `%s'.\n"
--msgstr "arp: za��zen� `%s' m� Hw adresu %s `%s'.\n"
-+msgstr "arp: zařízení `%s' má Hw adresu %s `%s'.\n"
- 
--#: ../arp.c:282
-+#: ../arp.c:293
-+#, c-format
- msgid "arp: need hardware address\n"
--msgstr "arp: je t�eba hardwarov� adresa\n"
-+msgstr "arp: je třeba hardwarová adresa\n"
- 
--#: ../arp.c:290
-+#: ../arp.c:301
-+#, c-format
- msgid "arp: invalid hardware address\n"
--msgstr "arp: nespr�vn� hardwarov� adresa\n"
-+msgstr "arp: nesprávná hardwarová adresa\n"
- 
--#: ../arp.c:387
-+#: ../arp.c:398
- #, c-format
- msgid "arp: cannot open etherfile %s !\n"
--msgstr "arp: datab�zi ethernetov�ch adres %s nelze otev��t!\n"
-+msgstr "arp: databázi ethernetových adres %s nelze otevřít!\n"
- 
--#: ../arp.c:403
-+#: ../arp.c:414
- #, c-format
- msgid "arp: format error on line %u of etherfile %s !\n"
--msgstr "arp: syntaktick� chyba na ��dku %u datab�ze ethernetov�ch adres %s!\n"
-+msgstr "arp: syntaktická chyba na řádku %u databáze ethernetových adres %s!\n"
- 
--#: ../arp.c:416
-+#: ../arp.c:427
- #, c-format
- msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr ""
--"arp: polo�ku na ��dku %u datab�ze ethernetov�ch adres %s nelze nastavit!\n"
-+"arp: položku na řádku %u databáze ethernetových adres %s nelze nastavit!\n"
-+
-+#: ../arp.c:448
-+#, c-format
-+msgid ""
-+"Address                  HWtype  HWaddress           Flags Mask            "
-+"Iface\n"
-+msgstr ""
-+"Adresa                   HWtyp   HWadresa            Příz. Maska           "
-+"Rozhr\n"
- 
--#: ../arp.c:437
--msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
--msgstr "Adresa\t\t\t HWtyp\t HWadresa\t     P��z  Maska\t\t   Rozhran�\n"
-+#: ../arp.c:476
-+msgid "<from_interface>"
-+msgstr "<z_rozhraní>"
- 
--#: ../arp.c:467
-+#: ../arp.c:478
- msgid "(incomplete)"
--msgstr "(nekompletn�)"
-+msgstr "(nekompletní)"
- 
--#: ../arp.c:484
-+#: ../arp.c:495
- #, c-format
- msgid "%s (%s) at "
- msgstr "%s (%s) na "
- 
--#: ../arp.c:490
-+#: ../arp.c:501
-+#, c-format
- msgid "<incomplete> "
--msgstr "<nekompletn�>"
-+msgstr "<nekompletní>"
- 
--#: ../arp.c:496
-+#: ../arp.c:507
- #, c-format
- msgid "netmask %s "
--msgstr "s��ov� maska %s "
-+msgstr "síťová maska %s "
- 
--#: ../arp.c:513
-+#: ../arp.c:524
- #, c-format
- msgid "on %s\n"
- msgstr "na %s\n"
- 
--#: ../arp.c:592
-+#: ../arp.c:605
- #, c-format
- msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
--msgstr "Polo�ky: %d\tVynech�no: %d\tNalezeno: %d\n"
-+msgstr "Položky: %d\tVynecháno: %d\tNalezeno: %d\n"
- 
--#: ../arp.c:596
-+#: ../arp.c:609
- #, c-format
- msgid "%s (%s) -- no entry\n"
--msgstr "%s (%s) -- ��dn� polo�ka\n"
-+msgstr "%s (%s) -- žádná položka\n"
- 
--#: ../arp.c:598
-+#: ../arp.c:611
- #, c-format
- msgid "arp: in %d entries no match found.\n"
--msgstr "arp: ��dn� z polo�ek (%d) nevyhovuje.\n"
-+msgstr "arp: žádná z položek (%d) nevyhovuje.\n"
- 
--#: ../arp.c:613
-+#: ../arp.c:626
-+#, c-format
- msgid ""
- "Usage:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
- "cache\n"
- msgstr ""
--"Pou�it�:\n"
--"  arp [-vn]  [<HW>] [-i <if> [-a] [<po��ta�>]             <-Zobraz� ARP "
-+"Použití:\n"
-+"  arp [-vn]  [<HW>] [-i <rozhraní>] [-a] [<počítač>]        <-Zobrazí ARP "
- "cache\n"
- 
--#: ../arp.c:614
-+#: ../arp.c:627
-+#, c-format
- msgid ""
--"  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
-+"  arp [-v]          [-i <if>] -d  <host> [pub]               <-Delete ARP "
- "entry\n"
- msgstr ""
--"  arp [-v]          [-i <if>] -d <po��ta�> [pub][nopub]   <-Sma�e polo�ku "
-+"  arp [-v]          [-i <rozhraní>] -d <počítač> [pub]      <-Smaže položku "
- "ARP\n"
- 
--#: ../arp.c:615
--#, fuzzy
-+#: ../arp.c:628
-+#, c-format
- msgid ""
--"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-+"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
- "file\n"
- msgstr ""
--"  arp [-vnD] [<HW>] [-i <if>] -f <soubor>                 <-P�id� polo�ku "
--"ze\n"
--"                                                          souboru\n"
-+"  arp [-vnD] [<HW>] [-i <rozhraní>] -f [<soubor>]     <-Přidá položku ze "
-+"souboru\n"
- 
--#: ../arp.c:616
-+#: ../arp.c:629
-+#, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
-+"  arp [-v]   [<HW>] [-i <if>] -s  <host> <hwaddr> [temp]            <-Add "
- "entry\n"
- msgstr ""
--"  arp [-v]   [<HW> [-i <if> -s   <po��ta�> <hwadr> [temp][nopub] <-P�id� "
--"polo�ku\n"
--
--#: ../arp.c:617
--msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
--"<-''-\n"
--msgstr ""
--"  arp [-v]   [<HW>] [-i <if>] -s <soubor> <hwadr> [s��mask <��s>]  <-''-\n"
-+"  arp [-v]   [<HW>] [-i <rozhraní>] -s <počítač> <hwadr> [temp]  <-Přidá "
-+"položku\n"
- 
--#: ../arp.c:618
-+#: ../arp.c:630
-+#, c-format
- msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
-+"  arp [-v]   [<HW>] [-i <if>] -Ds <host> <if> [netmask <nm>] pub          "
- "<-''-\n"
- "\n"
- msgstr ""
--"  arp [-v]   [<HW> [-i <if> -Ds  <po��ta�> <if> [s��mask <��s>] pub      "
--"<-''-\n"
-+"  arp [-v]   [<HW>] [-i <rozhraní>] -Ds <počítač> <rozhraní> [síťmask <čís>] "
-+"pub\n"
-+"                                                                 <-Totéž\n"
- 
--#: ../arp.c:620
-+#: ../arp.c:632
-+#, c-format
- msgid ""
- "        -a                       display (all) hosts in alternative (BSD) "
- "style\n"
- msgstr ""
--"        -a                       zobraz� jmna v�ech po��ta�� alternativn�m\n"
--"                                 (BSD) zp�sobem\n"
-+"        -a                       zobrazí jména všech počítačů alternativním\n"
-+"                                 (BSD) způsobem\n"
- 
--#: ../arp.c:621
-+#: ../arp.c:633
-+#, c-format
- msgid "        -s, --set                set a new ARP entry\n"
--msgstr "        -s, --set                nastav� novou ARP polo�ku\n"
-+msgstr "        -s, --set                nastaví novou ARP položku\n"
- 
--#: ../arp.c:622
-+#: ../arp.c:634
-+#, c-format
- msgid "        -d, --delete             delete a specified entry\n"
--msgstr "        -d, --delete             sma�e zadanou ARP polo�ku\n"
-+msgstr "        -d, --delete             smaže zadanou ARP položku\n"
- 
--#: ../arp.c:623 ../netstat.c:1436 ../route.c:85
-+#: ../arp.c:635 ../netstat.c:1520 ../route.c:86
-+#, c-format
- msgid "        -v, --verbose            be verbose\n"
- msgstr ""
--"        -v, --verbose            bude vypisovat podrobn� zpr�vy\n"
--"                                 o �innosti\n"
-+"        -v, --verbose            bude vypisovat podrobné zprávy o činnosti\n"
- 
--#: ../arp.c:624 ../netstat.c:1437 ../route.c:86
--msgid "        -n, --numeric            dont resolve names\n"
--msgstr ""
--"        -n, --numeric            nebude p�ev�d�t ��seln� adresy\n"
--"                                 na kanonick� jm�na\n"
-+#: ../arp.c:636 ../netstat.c:1522 ../route.c:87
-+#, c-format
-+msgid "        -n, --numeric            don't resolve names\n"
-+msgstr "        -n, --numeric            nebude převádět jména\n"
- 
--#: ../arp.c:625
-+#: ../arp.c:637
-+#, c-format
- msgid ""
- "        -i, --device             specify network interface (e.g. eth0)\n"
--msgstr "        -i, --device             zad�v� s��ov� rozhran� (nap�. eth0)\n"
-+msgstr "        -i, --device             zadává síťové rozhraní (např. eth0)\n"
- 
--#: ../arp.c:626
-+#: ../arp.c:638
-+#, c-format
- msgid "        -D, --use-device         read <hwaddr> from given device\n"
--msgstr "        -D, --use-device         �te <hwadr> ze zadan�ho za��zen�\n"
-+msgstr "        -D, --use-device         čte <hwadr> ze zadaného zařízení\n"
- 
--#: ../arp.c:627
--#, fuzzy
-+#: ../arp.c:639
-+#, c-format
- msgid "        -A, -p, --protocol       specify protocol family\n"
--msgstr "         -r, --route              vyp��e sm�rovac� tabulku\n"
-+msgstr "        -A, -p, --protocol       určuje rodinu protokolů\n"
- 
--#: ../arp.c:628
--#, fuzzy
-+#: ../arp.c:640
-+#, c-format
- msgid ""
--"        -f, --file               read new entries from file or from "
--"/etc/ethers\n"
-+"        -f, --file               read new entries from file or from /etc/"
-+"ethers\n"
- "\n"
- msgstr ""
--"        -f, --file               �te nov� polo�ky ze souboru\n"
--"\n"
-+"        -f, --file               čte nové položky ze souboru nebo z /etc/"
-+"ethers\n"
- 
--#: ../arp.c:630 ../rarp.c:181
-+#: ../arp.c:642 ../rarp.c:183
- #, c-format
- msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
- msgstr ""
--"  <HW>=Pou�ijte '-H <hw> pro zad�n� hardwarov�ho typu adresy.\n"
--"  Implicitn�: %s\n"
-+"  <HW>=Použijte '-H <hw> pro zadání hardwarového typu adresy.\n"
-+"  Implicitně: %s\n"
- 
--#: ../arp.c:631 ../rarp.c:182
-+#: ../arp.c:643 ../rarp.c:184
-+#, c-format
- msgid "  List of possible hardware types (which support ARP):\n"
--msgstr "  Seznam mo�n�ch hardwarov�ch typ� (podporuj�c�ch ARP):\n"
-+msgstr "  Seznam možných hardwarových typů (podporujících ARP):\n"
- 
--#: ../arp.c:664
-+#: ../arp.c:677 ../arp.c:762
- #, c-format
- msgid "%s: hardware type not supported!\n"
--msgstr "hardwarov� typ %s nen� podporov�n!\n"
-+msgstr "hardwarový typ %s není podporován!\n"
- 
--#: ../arp.c:668
-+#: ../arp.c:681
- #, c-format
- msgid "%s: address family not supported!\n"
--msgstr "t��da adres %s nen� podporov�na!\n"
-+msgstr "třída adres %s není podporována!\n"
- 
--#: ../arp.c:703
-+#: ../arp.c:716
-+#, c-format
- msgid "arp: -N not yet supported.\n"
--msgstr "arp: p�ep�na� -N nen� zat�m podporov�n\n"
-+msgstr "arp: přepínač -N není zatím podporován\n"
- 
--#: ../arp.c:713
-+#: ../arp.c:726
- #, c-format
- msgid "arp: %s: unknown address family.\n"
--msgstr "arp: nezn�m� t��da adres %s.\n"
-+msgstr "arp: neznámá třída adres %s.\n"
- 
--#: ../arp.c:722
-+#: ../arp.c:735
- #, c-format
- msgid "arp: %s: unknown hardware type.\n"
--msgstr "arp: nezn�m� hardwarov� typ %s.\n"
-+msgstr "arp: neznámý hardwarový typ %s.\n"
- 
--#: ../arp.c:741
-+#: ../arp.c:754
- #, c-format
- msgid "arp: %s: kernel only supports 'inet'.\n"
--msgstr "arp: %s: j�dro podporuje pouze 'inet'.\n"
-+msgstr "arp: %s: jádro podporuje pouze 'inet'.\n"
- 
--#: ../arp.c:746
-+#: ../arp.c:767
- #, c-format
- msgid "arp: %s: hardware type without ARP support.\n"
--msgstr "arp: hardwarov� typ %s nepodporuje ARP.\n"
-+msgstr "arp: hardwarový typ %s nepodporuje ARP.\n"
- 
--#: ../hostname.c:69
-+#: ../hostname.c:71
- #, c-format
- msgid "Setting nodename to `%s'\n"
--msgstr "Nastavuji jm�no uzlu na `%s'\n"
-+msgstr "Nastavuji jméno uzlu na `%s'\n"
- 
--#: ../hostname.c:74
-+#: ../hostname.c:76
- #, c-format
- msgid "%s: you must be root to change the node name\n"
--msgstr "%s: jm�no uzlu m��e zm�nit pouze superu�ivatel\n"
-+msgstr "%s: jméno uzlu může změnit pouze superuživatel\n"
- 
--#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
-+#: ../hostname.c:79 ../hostname.c:100 ../hostname.c:118
- #, c-format
- msgid "%s: name too long\n"
--msgstr "jm�no %s je p��li� dlouh�\n"
-+msgstr "jméno %s je příliš dlouhé\n"
- 
--#: ../hostname.c:89
-+#: ../hostname.c:92
- #, c-format
- msgid "Setting hostname to `%s'\n"
--msgstr "Nastavuji jm�no po��ta�e na `%s'\n"
-+msgstr "Nastavuji jméno počítače na `%s'\n"
- 
--#: ../hostname.c:94
-+#: ../hostname.c:97
- #, c-format
- msgid "%s: you must be root to change the host name\n"
--msgstr "%s: jm�no po��ta�e m��e zm�nit pouze superu�ivatel\n"
-+msgstr "%s: jméno počítače může změnit pouze superuživatel\n"
- 
--#: ../hostname.c:108
-+#: ../hostname.c:110
- #, c-format
- msgid "Setting domainname to `%s'\n"
--msgstr "Nastavuji jm�no dom�ny na `%s'\n"
-+msgstr "Nastavuji jméno domény na `%s'\n"
- 
--#: ../hostname.c:113
-+#: ../hostname.c:115
- #, c-format
- msgid "%s: you must be root to change the domain name\n"
--msgstr "%s: jm�no dom�ny m��e zm�nit pouze superu�ivatel\n"
-+msgstr "%s: jméno domény může změnit pouze superuživatel\n"
- 
--#: ../hostname.c:131
-+#: ../hostname.c:132
- #, c-format
- msgid "Resolving `%s' ...\n"
--msgstr "Vyhled�v�m `%s' ...\n"
-+msgstr "Vyhledávám `%s' ...\n"
- 
--#: ../hostname.c:137
-+#: ../hostname.c:138
- #, c-format
- msgid "Result: h_name=`%s'\n"
--msgstr "V�sledek: h_name=`%s'\n"
-+msgstr "Výsledek: h_name=`%s'\n"
- 
--#: ../hostname.c:142
-+#: ../hostname.c:143
- #, c-format
- msgid "Result: h_aliases=`%s'\n"
--msgstr "V�sledek: h_aliases=`%s'\n"
-+msgstr "Výsledek: h_aliases=`%s'\n"
- 
--#: ../hostname.c:147
-+#: ../hostname.c:148
- #, c-format
- msgid "Result: h_addr_list=`%s'\n"
--msgstr "V�sledek: h_addr_list=`%s'\n"
-+msgstr "Výsledek: h_addr_list=`%s'\n"
- 
- #: ../hostname.c:209
- #, c-format
- msgid "%s: can't open `%s'\n"
--msgstr "%s: `%s' nelze otev��t\n"
-+msgstr "%s: `%s' nelze otevřít\n"
- 
- #: ../hostname.c:223
-+#, c-format
- msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
- msgstr ""
--"Pou�it�:\n"
--"    hostname [-v] {jm�no|-F soubor}       nastav� jm�no po��ta�e (ze "
-+"Použití:\n"
-+"    hostname [-v] {jméno|-F soubor}       nastaví jméno počítače (ze "
- "souboru)\n"
- 
- #: ../hostname.c:224
-+#, c-format
- msgid ""
- "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
- msgstr ""
--"    domainname [-v] {jm�no|-F soubor}     nastav� jm�no NIS dom�ny (ze\n"
-+"    domainname [-v] {jméno|-F soubor}     nastaví jméno NIS domény (ze\n"
- "                                          souboru)\n"
- 
- #: ../hostname.c:226
-+#, c-format
- msgid ""
- "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
- "file)\n"
- msgstr ""
--"    nodename [-v] {jm�no|-F soubor}       nastav� jm�no DECnet uzlu (ze\n"
-+"    nodename [-v] {jméno|-F soubor}       nastaví jméno DECnet uzlu (ze\n"
- "                                          souboru)\n"
- 
- #: ../hostname.c:228
-+#, c-format
- msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
--msgstr "    hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  vyp��e form�tovan� jm�no\n"
-+msgstr "    hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  vypíše formátované jméno\n"
- 
- #: ../hostname.c:229
-+#, c-format
- msgid ""
- "       hostname [-v]                         display hostname\n"
- "\n"
- msgstr ""
--"    hostname [-v]                         vyp��e jm�no po��ta�e\n"
-+"    hostname [-v]                         vypíše jméno počítače\n"
- "\n"
- 
- #: ../hostname.c:230
-+#, c-format
- msgid ""
- "       hostname -V|--version|-h|--help       print info and exit\n"
- "\n"
- msgstr ""
--"    hostname -V|--version|-h|--help       vyp��e informace a skon��\n"
-+"    hostname -V|--version|-h|--help       vypíše informace a skončí\n"
- "\n"
- 
- #: ../hostname.c:231
-+#, c-format
- msgid ""
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
-@@ -362,42 +388,51 @@ msgstr ""
- "\n"
- 
- #: ../hostname.c:232
-+#, c-format
- msgid "    -s, --short           short host name\n"
--msgstr "    -s, --short           kr�tk� jm�no po��ta�e\n"
-+msgstr "    -s, --short           krátké jméno počítače\n"
- 
- #: ../hostname.c:233
-+#, c-format
- msgid "    -a, --alias           alias names\n"
--msgstr "    -a, --alias           p�ezd�vky\n"
-+msgstr "    -a, --alias           přezdívky\n"
- 
- #: ../hostname.c:234
-+#, c-format
- msgid "    -i, --ip-address      addresses for the hostname\n"
--msgstr "    -i, --ip-address      adresy odpov�daj�c� jm�nu po��ta�e\n"
-+msgstr "    -i, --ip-address      adresy odpovídající jménu počítače\n"
- 
- #: ../hostname.c:235
-+#, c-format
- msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
--msgstr "    -f, --fqdn, --long    dlouh� jm�no po��ta�e (kanonick�)\n"
-+msgstr "    -f, --fqdn, --long    dlouhé jméno počítače (kanonické)\n"
- 
- #: ../hostname.c:236
-+#, c-format
- msgid "    -d, --domain          DNS domain name\n"
--msgstr "    -d, --domain          jm�no DNS dom�ny\n"
-+msgstr "    -d, --domain          jméno DNS domény\n"
- 
- #: ../hostname.c:237
-+#, c-format
- msgid "    -y, --yp, --nis       NIS/YP domainname\n"
--msgstr "    -y, --yp, --nis       jm�no NIS/YP dom�ny\n"
-+msgstr "    -y, --yp, --nis       jméno NIS/YP domény\n"
- 
- #: ../hostname.c:239
-+#, c-format
- msgid "    -n, --node            DECnet node name\n"
--msgstr "    -n, --node            jm�no DECnet uzlu\n"
-+msgstr "    -n, --node            jméno DECnet uzlu\n"
- 
- #: ../hostname.c:241
-+#, c-format
- msgid ""
- "    -F, --file            read hostname or NIS domainname from given file\n"
- "\n"
- msgstr ""
--"    -F, --file            �te jm�no po��ta�e �i nis dom�ny ze souboru\n"
-+"    -F, --file            čte jméno počítače či nis domény ze souboru\n"
- "\n"
- 
- #: ../hostname.c:243
-+#, c-format
- msgid ""
- "   This command can read or set the hostname or the NIS domainname. You can\n"
- "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-@@ -405,931 +440,929 @@ msgid ""
- "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
- "   part of the FQDN) in the /etc/hosts file.\n"
- msgstr ""
-+"   Tento příkaz může přečíst nebo nastavit název stroje nebo doménové jméno\n"
-+"   NIS. Načíst lze rovněž DNS doménu nebo FQDN (plně kvalifikované doménové\n"
-+"   jméno). Pokud pro vyhledávání strojů nepoužíváte bind nebo NIS, můžete\n"
-+"   změnit FQDN (Fully Qualified Domain Name) a doménové jméno DNS (což je\n"
-+"   část FQDN) v souboru /etc/hosts.\n"
- 
--#: ../hostname.c:338
-+#: ../hostname.c:340
- #, c-format
- msgid "%s: You can't change the DNS domain name with this command\n"
--msgstr "%s: T�mto p��kazem nelze DNS jm�no dom�ny zm�nit\n"
-+msgstr "%s: Tímto příkazem nelze DNS jméno domény změnit\n"
- 
--#: ../hostname.c:339
-+#: ../hostname.c:341
-+#, c-format
- msgid ""
- "\n"
- "Unless you are using bind or NIS for host lookups you can change the DNS\n"
- msgstr ""
- "\n"
--"Pokud nepou��v�te bind �i NIS pro vyhled�v�n� jmen po��ta��, pak m��ete "
--"zm�nit\n"
-+"Pokud nepoužíváte bind či NIS pro vyhledávání jmen počítačů, pak můžete "
-+"změnit\n"
- 
--#: ../hostname.c:340
-+#: ../hostname.c:342
-+#, c-format
- msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
- msgstr ""
--"DNS jm�no dom�ny (je sou��st� kanonick�ho jm�na po��ta�e) v souboru\n"
-+"DNS jméno domény (je součástí kanonického jména počítače) v souboru\n"
- "/etc/hosts\n"
- 
--#: ../hostname.c:357
-+#: ../hostname.c:359
- #, c-format
- msgid "gethostname()=`%s'\n"
- msgstr "gethostname()=`%s'\n"
- 
--#: ../hostname.c:374
-+#: ../hostname.c:376
- #, c-format
- msgid "getdomainname()=`%s'\n"
- msgstr "getdomainname()=`%s'\n"
- 
--#: ../hostname.c:389
-+#: ../hostname.c:391
- #, c-format
- msgid "getnodename()=`%s'\n"
- msgstr "getnodename()=`%s'\n"
- 
--#: ../ifconfig.c:159
--#, c-format
--msgid "%-9.9s Link encap:%s  "
--msgstr "%-9.9s Zapouzd�en�:%s  "
--
--#: ../ifconfig.c:164
-+#: ../ifconfig.c:107 ../netstat.c:1482
- #, c-format
--msgid "HWaddr %s  "
--msgstr "HWadr %s  "
-+msgid ""
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Flg\n"
-+msgstr ""
-+"Rozhr   MTU Met  PŘ-OK PŘ-CHYB PŘ-ZAH PŘ-PŘT   OD-OK OD-CHYB OD-ZAH OD-PŘT "
-+"Přízn\n"
- 
--#: ../ifconfig.c:167
-+#: ../ifconfig.c:132 ../ifconfig.c:164
- #, c-format
--msgid "Media:%s"
--msgstr "M�dium:%s"
-+msgid "%s: ERROR while getting interface flags: %s\n"
-+msgstr "%s: CHYBA při získávání příznaků rozhraní: %s\n"
- 
--#: ../ifconfig.c:169
--msgid "(auto)"
--msgstr "(auto)"
--
--#: ../ifconfig.c:176
-+#: ../ifconfig.c:156 ../ifconfig.c:188 ../ifconfig.c:794 ../ifconfig.c:887
-+#: ../ifconfig.c:1000
- #, c-format
--msgid "          %s addr:%s "
--msgstr "          %s adr:%s "
-+msgid "No support for INET on this system.\n"
-+msgstr "Tento systém nepodporuje INET.\n"
- 
--#: ../ifconfig.c:179
-+#: ../ifconfig.c:196
- #, c-format
--msgid " P-t-P:%s "
--msgstr " P-t-P:%s "
-+msgid "%s: ERROR while testing interface flags: %s\n"
-+msgstr "%s: CHYBA při zkoušení příznaků rozhraní: %s\n"
- 
--# V ostatn�ch kataloz�ch se p�ekl�d� Broadcast -> v�esm�rov� vys�l�n�.
--# Tudi� bcast -> V�esm�r :)
--#: ../ifconfig.c:182
-+#: ../ifconfig.c:205
- #, c-format
--msgid " Bcast:%s "
--msgstr " V�esm�r:%s "
-+msgid ""
-+"Usage:\n"
-+"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+msgstr ""
-+"Použití:\n"
-+"  ifconfig [-a] [-v] [-s] <rozhraní> [[<AF>] <adresa>]\n"
- 
--#: ../ifconfig.c:184
-+#: ../ifconfig.c:207
- #, c-format
--msgid " Mask:%s\n"
--msgstr "Maska:%s\n"
-+msgid "  [add <address>[/<prefixlen>]]\n"
-+msgstr "  [add <adresa>[/<délka prefixu>]]\n"
- 
--#: ../ifconfig.c:201
-+#: ../ifconfig.c:208
- #, c-format
--msgid "          inet6 addr: %s/%d"
--msgstr "          inet6-adr: %s/%d"
--
--#: ../ifconfig.c:203
--msgid " Scope:"
--msgstr " Rozsah:"
--
--#: ../ifconfig.c:206
--msgid "Global"
--msgstr "Glob�l"
-+msgid "  [del <address>[/<prefixlen>]]\n"
-+msgstr "  [del <adresa>[/<délka prefixu>]]\n"
- 
- #: ../ifconfig.c:209
--msgid "Link"
--msgstr "Linka"
--
--#: ../ifconfig.c:212
--msgid "Site"
--msgstr "Stanovi�t�"
--
--#: ../ifconfig.c:215
--msgid "Compat"
--msgstr "Kompatibilita"
--
--#: ../ifconfig.c:218
--msgid "Host"
--msgstr "Po��ta�"
--
--#: ../ifconfig.c:221
--msgid "Unknown"
--msgstr "Nezn�m."
--
--#: ../ifconfig.c:236
--#, c-format
--msgid "          IPX/Ethernet II addr:%s\n"
--msgstr "          IPX/Ethernet II adr: %s\n"
--
--#: ../ifconfig.c:239
- #, c-format
--msgid "          IPX/Ethernet SNAP addr:%s\n"
--msgstr "          IPX/Ethernet SNAP adr:%s\n"
--
--#: ../ifconfig.c:242
--#, c-format
--msgid "          IPX/Ethernet 802.2 addr:%s\n"
--msgstr "          IPX/Ethernet 802.2 adr:%s\n"
-+msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
-+msgstr "  [[-]broadcast [<adresa>]]  [[-]pointopoint [<adresa>]]\n"
- 
--#: ../ifconfig.c:245
-+#: ../ifconfig.c:210
- #, c-format
--msgid "          IPX/Ethernet 802.3 addr:%s\n"
--msgstr "          IPX/Ethernet 802.3 adr:%s\n"
-+msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
-+msgstr "  [netmask <adresa>]  [dstaddr <adresa>]  [tunnel <adresa>]\n"
- 
--#: ../ifconfig.c:255
-+#: ../ifconfig.c:213
- #, c-format
--msgid "          EtherTalk Phase 2 addr:%s\n"
--msgstr "          EtherTalk Phase 2 adr:%s\n"
-+msgid "  [outfill <NN>] [keepalive <NN>]\n"
-+msgstr "  [outfill <NN>] [keepalive <NN>]\n"
- 
--#: ../ifconfig.c:264
-+#: ../ifconfig.c:215
- #, c-format
--msgid "          econet addr:%s\n"
--msgstr "          econet adr:%s\n"
--
--# Hic sunt leones ...
--#: ../ifconfig.c:270
--msgid "[NO FLAGS] "
--msgstr "[��DN� P��ZNAKY]"
--
--#: ../ifconfig.c:272
--msgid "UP "
--msgstr "AKTIVOV�NO "
--
--#: ../ifconfig.c:274
--msgid "BROADCAST "
--msgstr "V�ESM�ROV�_VYS�L�N� "
--
--#: ../ifconfig.c:276
--msgid "DEBUG "
--msgstr "DEBUG "
--
--#: ../ifconfig.c:278
--msgid "LOOPBACK "
--msgstr "SMY�KA "
--
--#: ../ifconfig.c:280
--msgid "POINTOPOINT "
--msgstr "POINTOPOINT "
--
--# ??
--#: ../ifconfig.c:282
--msgid "NOTRAILERS "
--msgstr "NOTRAILERS "
--
--#: ../ifconfig.c:284
--msgid "RUNNING "
--msgstr "B̮� "
--
--#: ../ifconfig.c:286
--msgid "NOARP "
--msgstr "NEARP "
--
--#: ../ifconfig.c:288
--msgid "PROMISC "
--msgstr "PROMISK "
--
--#: ../ifconfig.c:290
--msgid "ALLMULTI "
--msgstr "ALLMULTI "
--
--#: ../ifconfig.c:292
--msgid "SLAVE "
--msgstr "SLAVE "
--
--#: ../ifconfig.c:294
--msgid "MASTER "
--msgstr "MASTER "
--
--#: ../ifconfig.c:296
--msgid "MULTICAST "
--msgstr "MULTICAST "
--
--#: ../ifconfig.c:299
--msgid "DYNAMIC "
--msgstr "DYNAMIC "
-+msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
-+msgstr "  [hw <HW> <adresa>]  [metric <NN>]  [mtu <NN>]\n"
- 
--#: ../ifconfig.c:302
-+#: ../ifconfig.c:216
- #, c-format
--msgid " MTU:%d  Metric:%d"
--msgstr " MTU:%d  Metrika:%d"
-+msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- 
--#: ../ifconfig.c:306
-+#: ../ifconfig.c:217
- #, c-format
--msgid "  Outfill:%d  Keepalive:%d"
--msgstr "  Outfill:%d  Keepalive:%d"
-+msgid "  [multicast]  [[-]promisc]\n"
-+msgstr "  [multicast]  [[-]promisc]\n"
- 
--#: ../ifconfig.c:320
-+#: ../ifconfig.c:218
- #, c-format
--msgid "RX packets:%lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
--msgstr "p�ijmut�ch paket�:%lu chyb:%lu zahozeno:%lu p�ete�en�:%lu r�mc�:%lu\n"
-+msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
-+msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <typ>]\n"
- 
--#: ../ifconfig.c:325
-+#: ../ifconfig.c:220
- #, c-format
--msgid "             compressed:%lu\n"
--msgstr "             komprimov�no:%lu\n"
-+msgid "  [txqueuelen <NN>]\n"
-+msgstr "  [txqueuelen délka]\n"
- 
--# carrier?
--#: ../ifconfig.c:329
-+#: ../ifconfig.c:223
- #, c-format
--msgid "TX packets:%lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
--msgstr "odeslan�ch paket�:%lu chyb:%lu zahozeno:%lu p�ete�en�:%lu p�enos:%lu\n"
-+msgid "  [[-]dynamic]\n"
-+msgstr "  [[-]dynamic]\n"
- 
--#: ../ifconfig.c:333
-+#: ../ifconfig.c:225
- #, c-format
--msgid "          collisions:%lu "
--msgstr "          koliz�:%lu "
-+msgid ""
-+"  [up|down] ...\n"
-+"\n"
-+msgstr ""
-+"  [up|down] ...\n"
-+"\n"
- 
--#: ../ifconfig.c:335
-+#: ../ifconfig.c:227
- #, c-format
--msgid "compressed:%lu "
--msgstr "komprimov�no:%lu "
-+msgid "  <HW>=Hardware Type.\n"
-+msgstr "   <HW> = Hardwarový Typ.\n"
- 
--#: ../ifconfig.c:337
-+#: ../ifconfig.c:228
- #, c-format
--msgid "txqueuelen:%d "
--msgstr "d�lka odchoz� fronty:%d "
-+msgid "  List of possible hardware types:\n"
-+msgstr "  Seznam možných hardwarových typů:\n"
- 
--#: ../ifconfig.c:345
-+#. 1 = ARPable
-+#: ../ifconfig.c:230
- #, c-format
--msgid "Interrupt:%d "
--msgstr "P�eru�en�:%d "
-+msgid "  <AF>=Address family. Default: %s\n"
-+msgstr "  <AF> = Třída adres. Implicitní: %s\n"
- 
--#. Only print devices using it for
--#. I/O maps
--#: ../ifconfig.c:348
-+#: ../ifconfig.c:231
- #, c-format
--msgid "Base address:0x%x "
--msgstr "Vstupn�/V�stupn� port:0x%x "
-+msgid "  List of possible address families:\n"
-+msgstr "  Seznam možných tříd adres:\n"
- 
--#: ../ifconfig.c:350
-+#: ../ifconfig.c:307
- #, c-format
--msgid "Memory:%lx-%lx "
--msgstr "Pam�:%lx-%lx "
-+msgid "ifconfig: option `%s' not recognised.\n"
-+msgstr "ifconfig: přepínač „%s“ nebyl rozpoznán.\n"
- 
--#: ../ifconfig.c:353
-+#: ../ifconfig.c:309 ../ifconfig.c:990
- #, c-format
--msgid "DMA chan:%x "
--msgstr "Kan�l DMA:%x "
-+msgid "ifconfig: `--help' gives usage information.\n"
-+msgstr "ifconfig: návod na použití lze získat pomocí „--help“\n"
- 
--#: ../ifconfig.c:384 ../ifconfig.c:405
-+#: ../ifconfig.c:384
- #, c-format
--msgid "%s: unknown interface: %s\n"
--msgstr "%s: rozhran� %s nen� zn�mo\n"
-+msgid "Unknown media type.\n"
-+msgstr "Neznámý typ média.\n"
- 
- #: ../ifconfig.c:421
-+#, c-format
- msgid ""
--"Usage:\n"
--"  ifconfig [-a] [-i] [-v] <interface> [[<AF>] <address>]\n"
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
- msgstr ""
--"Pou�it�:\n"
--"  ifconfig [-a] [-i] [-v] <rozhran�> [[<AF>] <adresa>]\n"
--
--#: ../ifconfig.c:425
--msgid "  [add <address>[/<prefixlen>]]\n"
--msgstr "  [add <adresa>[/<d�lka prefixu>]]\n"
--
--#: ../ifconfig.c:427
--msgid "  [del <address>[/<prefixlen>]]\n"
--msgstr "  [del <adresa>[/<d�lka prefixu>]]\n"
--
--#: ../ifconfig.c:432
--msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
--msgstr "  [[-]broadcast [<adresa>]]  [[-]pointopoint [<adresa>]]\n"
-+"Pozor: Rozhraní %s je stále v promiskuitním režimu. Neběží jiná aplikace?\n"
- 
- #: ../ifconfig.c:433
--msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
--msgstr "  [netmask <adresa>]  [dstaddr <adresa>]  [tunnel <adresa>]\n"
--
--#: ../ifconfig.c:436
--msgid "  [outfill <NN>] [keepalive <NN>]\n"
--msgstr "  [outfill <NN>] [keepalive <NN>]\n"
-+#, c-format
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr "Pozor: Rozhraní %s je stále v režimu MULTICAST.\n"
- 
--#: ../ifconfig.c:438
--msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
--msgstr "  [hw <HW> <adresa>]  [metric <NN>]  [mtu <NN>]\n"
-+#: ../ifconfig.c:445
-+#, c-format
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-+msgstr "Pozor: Rozhraní %s je stále v režimu ALLMULTI.\n"
- 
--#: ../ifconfig.c:439
--msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
--msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
-+#: ../ifconfig.c:469
-+#, c-format
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-+msgstr "Pozor: Rozhraní %s je stále v režimu DYNAMIC.\n"
- 
--#: ../ifconfig.c:440
--msgid "  [multicast]  [[-]promisc]\n"
--msgstr "  [multicast]  [[-]promisc]\n"
-+#: ../ifconfig.c:527
-+#, c-format
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
-+msgstr "Pozor: Rozhraní %s je stále v režimu VŠESMĚR.\n"
- 
--#: ../ifconfig.c:441
--msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
--msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <typ>]\n"
-+#: ../ifconfig.c:538
-+#, c-format
-+msgid "ifconfig: Error resolving '%s' for broadcast\n"
-+msgstr "ifconfig: Chyba při překládání „%s“ pro všesměr\n"
- 
--#: ../ifconfig.c:443
--msgid "  [txqueuelen <NN>]\n"
--msgstr "  [txqueuelen d�lka]\n"
-+#: ../ifconfig.c:563
-+#, c-format
-+msgid "ifconfig: Error resolving '%s' for dstaddr\n"
-+msgstr "ifconfig: Chyba při překládání „%s“ pro adresu cíle\n"
- 
--#: ../ifconfig.c:446
--msgid "  [[-]dynamic]\n"
--msgstr "  [[-]dynamic]\n"
-+#: ../ifconfig.c:586
-+#, c-format
-+msgid "ifconfig: Error resolving '%s' for netmask\n"
-+msgstr "ifconfig: Chyba při překládání „%s“ pro masku sítě\n"
- 
--#: ../ifconfig.c:448
--msgid ""
--"  [up|down] ...\n"
--"\n"
--msgstr ""
--"  [up|down] ...\n"
--"\n"
-+#: ../ifconfig.c:665
-+#, c-format
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-+msgstr "Pozor: Rozhraní %s je stále v DVOUBODOVÉM režimu.\n"
- 
--#: ../ifconfig.c:450
--msgid "  <HW>=Hardware Type.\n"
--msgstr "   <HW>=Hardwarov� Typ.\n"
-+#: ../ifconfig.c:676
-+#, c-format
-+msgid "ifconfig: Error resolving '%s' for pointopoint\n"
-+msgstr "ifconfig: Chyba při překládání „%s“ pro dvoubodové nastavení\n"
- 
--#: ../ifconfig.c:451
--msgid "  List of possible hardware types:\n"
--msgstr "  Seznam mo�n�ch hardwarov�ch typ�:\n"
-+#: ../ifconfig.c:700
-+#, c-format
-+msgid "hw address type `%s' has no handler to set address. failed.\n"
-+msgstr ""
-+"Pro typ hardwarové adresy „%s“ neexistuje obsluha na nastavování adresy.\n"
-+"Operace selhala.\n"
- 
--#. 1 = ARPable
--#: ../ifconfig.c:453
-+#: ../ifconfig.c:709
- #, c-format
--msgid "  <AF>=Address family. Default: %s\n"
--msgstr "   <AF>=t��da adres. Implicitn�: %s\n"
-+msgid "%s: invalid %s address.\n"
-+msgstr "%s: adresa %s je nesprávná.\n"
- 
--#: ../ifconfig.c:454
--msgid "  List of possible address families:\n"
--msgstr "  Seznam mo�n�ch t��d adres:\n"
-+#: ../ifconfig.c:749
-+#, c-format
-+msgid "ifconfig: Error resolving '%s' for add\n"
-+msgstr "ifconfig: Chyba při překládání „%s“ pro adresu\n"
- 
--#: ../ifconfig.c:593
--msgid "Unknown media type.\n"
--msgstr "Nezn�m� typ m�dia.\n"
-+#: ../ifconfig.c:760 ../ifconfig.c:850 ../ifconfig.c:938
-+#, c-format
-+msgid "No support for INET6 on this system.\n"
-+msgstr "Tento systém nepodporuje INET6.\n"
- 
--#: ../ifconfig.c:881
-+#: ../ifconfig.c:803 ../ifconfig.c:896
- #, c-format
--msgid "%s: invalid %s address.\n"
--msgstr "%s: adresa %s je nespr�vn�.\n"
-+msgid "Interface %s not initialized\n"
-+msgstr "Rozhraní %s není inicializováno\n"
- 
--#: ../ifconfig.c:920 ../ifconfig.c:963 ../ifconfig.c:1011
--msgid "No support for INET6 on this system.\n"
--msgstr "Tento syst�m nepodporuje INET6.\n"
-+#: ../ifconfig.c:815 ../ifconfig.c:907
-+#, c-format
-+msgid "Bad address.\n"
-+msgstr "Chybná adresa.\n"
- 
--#: ../ifconfig.c:983
-+#: ../ifconfig.c:910
-+#, c-format
- msgid "Address deletion not supported on this system.\n"
--msgstr "Tento syst�m nepodporuje maz�n� adres.\n"
-+msgstr "Tento systém nepodporuje mazání adres.\n"
- 
--#: ../ifconfig.c:1066
--msgid "No support for INET on this system.\n"
--msgstr "Tento syst�m nepodporuje INET.\n"
-+#: ../ifconfig.c:982
-+#, c-format
-+msgid "ifconfig: Cannot set address for this protocol family.\n"
-+msgstr "ifconfig: Pro tuto rodinu protokolů nelze nastavit adresu.\n"
-+
-+#: ../ifconfig.c:989
-+#, c-format
-+msgid "ifconfig: error resolving '%s' to set address for af=%s\n"
-+msgstr "ifconfig: chyba při překládání „%s“ za účelem nastavení adresy AF=%s\n"
- 
--#: ../ifconfig.c:1076
-+#: ../ifconfig.c:1010
-+#, c-format
- msgid "No support for ECONET on this system.\n"
--msgstr "Tento syst�m nepodporuje ECONET.\n"
-+msgstr "Tento systém nepodporuje ECONET.\n"
- 
--#: ../ifconfig.c:1084
-+#: ../ifconfig.c:1018
- #, c-format
- msgid "Don't know how to set addresses for family %d.\n"
--msgstr "Nev�m, jak nastavit adresu t��dy %d.\n"
-+msgstr "Nevím, jak nastavit adresu třídy %d.\n"
-+
-+#: ../ifconfig.c:1053
-+#, c-format
-+msgid "WARNING: at least one error occured. (%d)\n"
-+msgstr "POZOR: Vyskytla se alespoň jedna chyba. (%d)\n"
- 
--#: ../netstat.c:383
-+#: ../netstat.c:434
- #, c-format
- msgid ""
- "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
- msgstr ""
--"(Pro \"-p\" nelze z�skat ��dn� informace: geteuid()=%d, ale je t�eba, aby "
-+"(Pro \"-p\" nelze získat žádné informace: geteuid()=%d, ale je třeba, aby "
- "jste\n"
--"byl superu�ivatelem)\n"
-+"byl superuživatelem)\n"
- 
--#: ../netstat.c:387
-+#: ../netstat.c:438
-+#, c-format
- msgid ""
- "(Not all processes could be identified, non-owned process info\n"
- " will not be shown, you would have to be root to see it all.)\n"
- msgstr ""
--"(V�echny procesy nemohly b�t identifikov�ny. Budou vypsa�ny informace\n"
--"pouze o procesech, jich� jste vlastn�kem. Aby jste mohl vid�t v�e, musel\n"
--"byste b�t superu�ivatelem.)\n"
-+"(Všechny procesy nemohly být identifikovány. Budou vypsány informace\n"
-+"pouze o procesech, jichž jste vlastníkem. Aby jste mohl vidět vše, musel\n"
-+"byste být superuživatelem.)\n"
- 
--#: ../netstat.c:394 ../netstat.c:1089 ../netstat.c:1166
-+#: ../netstat.c:445 ../netstat.c:1186 ../netstat.c:1264
- msgid "LISTENING"
--msgstr "NASLOUCH�"
-+msgstr "NASLOUCHÁ"
- 
--#: ../netstat.c:395
-+#: ../netstat.c:446
- msgid "CONN SENT"
--msgstr "CONN ODESL�N"
-+msgstr "CONN ODESLÁN"
- 
--#: ../netstat.c:396 ../netstat.c:1168
-+#: ../netstat.c:447 ../netstat.c:1266
- msgid "DISC SENT"
--msgstr "DISC ODESL�N"
-+msgstr "DISC ODESLÁN"
- 
--#: ../netstat.c:397 ../netstat.c:464 ../netstat.c:809 ../netstat.c:1169
-+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:898 ../netstat.c:1267
- msgid "ESTABLISHED"
- msgstr "SPOJENO"
- 
--#: ../netstat.c:419
-+#: ../netstat.c:470
-+#, c-format
- msgid "Active NET/ROM sockets\n"
--msgstr "Aktivn� NET/ROM sokety\n"
-+msgstr "Aktivní NET/ROM sokety\n"
- 
--#: ../netstat.c:420
-+#: ../netstat.c:471
-+#, c-format
- msgid ""
--"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
--"Recv-Q\n"
-+"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-+"Q\n"
- msgstr ""
--"U�ivatel   C�l        Zdroj      Za��zen� Stav        Vr/Vs    Odch-F "
--"P��ch-F\n"
-+"Uživatel   Cíl        Zdroj      Zařízení Stav        Vr/Vs    Odch-F Přích-"
-+"F\n"
- 
--#: ../netstat.c:430 ../netstat.c:1208
-+#: ../netstat.c:481 ../netstat.c:1306
- #, c-format
- msgid "Problem reading data from %s\n"
--msgstr "Chyba p�i �ten� dat z %s\n"
-+msgstr "Chyba při čtení dat z %s\n"
- 
--# n�sleduj�c� rad�ji ponechat v origin�le ?!
--#: ../netstat.c:465
-+# následující raději ponechat v originále ?!
-+#: ../netstat.c:516
- msgid "SYN_SENT"
- msgstr "SYN_SENT"
- 
--#: ../netstat.c:466
-+#: ../netstat.c:517
- msgid "SYN_RECV"
- msgstr "SYN_RECV"
- 
--#: ../netstat.c:467
-+#: ../netstat.c:518
- msgid "FIN_WAIT1"
- msgstr "FIN_WAIT1"
- 
--#: ../netstat.c:468
-+#: ../netstat.c:519
- msgid "FIN_WAIT2"
- msgstr "FIN_WAIT2"
- 
--#: ../netstat.c:469
-+#: ../netstat.c:520
- msgid "TIME_WAIT"
- msgstr "TIME_WAIT"
- 
--#: ../netstat.c:470
-+#: ../netstat.c:521
- msgid "CLOSE"
--msgstr "ZAV�EN"
-+msgstr "ZAVŘEN"
- 
--#: ../netstat.c:471
-+#: ../netstat.c:522
- msgid "CLOSE_WAIT"
- msgstr "CLOSE_WAIT"
- 
--#: ../netstat.c:472
-+#: ../netstat.c:523
- msgid "LAST_ACK"
--msgstr "POSLEDN� ACK"
-+msgstr "POSLEDNÍ ACK"
- 
--#: ../netstat.c:473
-+#: ../netstat.c:524
- msgid "LISTEN"
--msgstr "LISTEN"
-+msgstr "NASLOUCHÁ"
- 
--#: ../netstat.c:474
-+#: ../netstat.c:525
- msgid "CLOSING"
--msgstr "ZAV�R�"
-+msgstr "ZAVíRÁ"
- 
--#: ../netstat.c:544
-+#: ../netstat.c:596
- #, c-format
- msgid "warning, got bogus igmp6 line %d.\n"
--msgstr "varov�n�, nesmysln� igmp6 ��dek %d.\n"
-+msgstr "varování, nesmyslný igmp6 řádek %d.\n"
- 
--#: ../netstat.c:549 ../netstat.c:587 ../netstat.c:670 ../netstat.c:803
--#: ../netstat.c:935 ../netstat.c:940
-+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:892
-+#: ../netstat.c:1029 ../netstat.c:1034
- #, c-format
- msgid "netstat: unsupported address family %d !\n"
--msgstr "netstat: t��da adres %d nen� podporov�na !\n"
-+msgstr "netstat: třída adres %d není podporována !\n"
- 
--#: ../netstat.c:562 ../netstat.c:567 ../netstat.c:575 ../netstat.c:582
-+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
- #, c-format
- msgid "warning, got bogus igmp line %d.\n"
--msgstr "varov�n�, nesmysln� igmp ��dek %d.\n"
-+msgstr "varování, nesmyslný igmp řádek %d.\n"
-+
-+#: ../netstat.c:677
-+#, c-format
-+msgid "Active X.25 sockets\n"
-+msgstr "Aktivní X.25 sokety\n"
-+
-+#. IMHO, Vr/Vs is not very usefull --SF
-+#: ../netstat.c:679
-+#, c-format
-+msgid ""
-+"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-+"Q\n"
-+msgstr ""
-+"Cíl          Zdroj           Zaříz   LCI  Stav         Vr/Vs  Odhod-F Přích-"
-+"F\n"
- 
--#: ../netstat.c:666
-+#: ../netstat.c:759
-+#, c-format
- msgid "warning, got bogus tcp line.\n"
--msgstr "varov�n�, nesmysln� tcp ��dek.\n"
-+msgstr "varování, nesmyslný tcp řádek.\n"
- 
--#: ../netstat.c:704 ../netstat.c:855 ../netstat.c:975
-+#: ../netstat.c:798 ../netstat.c:947 ../netstat.c:1072
- #, c-format
- msgid "off (0.00/%ld/%d)"
- msgstr "vyp (0.00/%ld/%d)"
- 
--#: ../netstat.c:708
--#, fuzzy, c-format
-+#: ../netstat.c:802
-+#, c-format
- msgid "on (%2.2f/%ld/%d)"
--msgstr "zap%d (%2.2f/%ld/%d)"
-+msgstr "zapnut (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:713
--#, fuzzy, c-format
-+#: ../netstat.c:807
-+#, c-format
- msgid "keepalive (%2.2f/%ld/%d)"
--msgstr "zap%d (%2.2f/%ld/%d)"
-+msgstr "keepalive (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:718
--#, fuzzy, c-format
-+#: ../netstat.c:812
-+#, c-format
- msgid "timewait (%2.2f/%ld/%d)"
--msgstr "zap%d (%2.2f/%ld/%d)"
-+msgstr "timewait (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:723 ../netstat.c:864 ../netstat.c:985
-+#: ../netstat.c:817 ../netstat.c:956 ../netstat.c:1082
- #, c-format
- msgid "unkn-%d (%2.2f/%ld/%d)"
- msgstr "nezn-%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:799
-+#: ../netstat.c:888
-+#, c-format
- msgid "warning, got bogus udp line.\n"
--msgstr "varov�n�, nesmysln� udp ��dek.\n"
-+msgstr "varování, nesmyslný udp řádek.\n"
- 
--#: ../netstat.c:817 ../netstat.c:1075 ../netstat.c:1108
-+#: ../netstat.c:906 ../netstat.c:1172 ../netstat.c:1205
- msgid "UNKNOWN"
--msgstr "NEZN�M"
-+msgstr "NEZNÁM"
- 
--#: ../netstat.c:860 ../netstat.c:980
-+#: ../netstat.c:952 ../netstat.c:1077
- #, c-format
- msgid "on%d (%2.2f/%ld/%d)"
- msgstr "zap%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:949
-+#: ../netstat.c:1043
-+#, c-format
- msgid "warning, got bogus raw line.\n"
--msgstr "varov�n�, nesmysln� 'raw' ��dek.\n"
-+msgstr "varování, nesmyslný 'raw' řádek.\n"
- 
--#: ../netstat.c:1028
-+#: ../netstat.c:1125
-+#, c-format
- msgid "warning, got bogus unix line.\n"
--msgstr "varov�n�, netstat 'unix' ��dek.\n"
-+msgstr "varování, netstat 'unix' řádek.\n"
- 
--#: ../netstat.c:1055
-+#: ../netstat.c:1152
- msgid "STREAM"
- msgstr "STREAM"
- 
--#: ../netstat.c:1059
-+#: ../netstat.c:1156
- msgid "DGRAM"
- msgstr "DGRAM"
- 
--#: ../netstat.c:1063
-+#: ../netstat.c:1160
- msgid "RAW"
- msgstr "RAW"
- 
--#: ../netstat.c:1067
-+#: ../netstat.c:1164
- msgid "RDM"
- msgstr "RDM"
- 
--#: ../netstat.c:1071
-+#: ../netstat.c:1168
- msgid "SEQPACKET"
- msgstr "SEQPACKET"
- 
--#: ../netstat.c:1080
-+#: ../netstat.c:1177
- msgid "FREE"
--msgstr "NEALOKOV�N"
-+msgstr "NEALOKOVÁN"
- 
--#: ../netstat.c:1096
-+#: ../netstat.c:1193
- msgid "CONNECTING"
- msgstr "SPOJUJE"
- 
--#: ../netstat.c:1100
-+#: ../netstat.c:1197
- msgid "CONNECTED"
- msgstr "SPOJEN"
- 
--#: ../netstat.c:1104
-+#: ../netstat.c:1201
- msgid "DISCONNECTING"
- msgstr "ODPOJUJE"
- 
--#: ../netstat.c:1135
-+#: ../netstat.c:1233
-+#, c-format
- msgid "Active UNIX domain sockets "
--msgstr "Aktivn� sokety dom�ny UNIX "
-+msgstr "Aktivní sokety domény UNIX "
- 
--#: ../netstat.c:1137 ../netstat.c:1666
-+#: ../netstat.c:1235 ../netstat.c:1801
-+#, c-format
- msgid "(servers and established)"
--msgstr "(servery a nav�zan� spojen�)"
-+msgstr "(servery a navázaná spojení)"
- 
--#: ../netstat.c:1140 ../netstat.c:1669
-+#: ../netstat.c:1238 ../netstat.c:1804
-+#, c-format
- msgid "(only servers)"
- msgstr "(pouze servery)"
- 
--#: ../netstat.c:1142 ../netstat.c:1671
-+#: ../netstat.c:1240 ../netstat.c:1806
-+#, c-format
- msgid "(w/o servers)"
- msgstr "(w/o servery)"
- 
--#: ../netstat.c:1145
-+#: ../netstat.c:1243
-+#, c-format
- msgid ""
- "\n"
--"Proto RefCnt Flags       Type       State         I-Node"
-+"Proto RefCnt Flags       Type       State         I-Node  "
- msgstr ""
- "\n"
--"Proto ��ta�  P��znaky    Typ        Stav          I-Uzel"
-+"Proto Čítač  Příznaky    Typ        Stav          I-Uzel  "
- 
--#: ../netstat.c:1147
-+#: ../netstat.c:1245
-+#, c-format
- msgid " Path\n"
- msgstr " Cesta\n"
- 
--#: ../netstat.c:1167
-+#: ../netstat.c:1265
- msgid "SABM SENT"
--msgstr "SABM ODESL�N"
-+msgstr "SABM ODESLÁN"
- 
--#: ../netstat.c:1170
-+#: ../netstat.c:1268
- msgid "RECOVERY"
- msgstr "OBNOVA"
- 
--#: ../netstat.c:1184
-+#: ../netstat.c:1282
-+#, c-format
- msgid "Active AX.25 sockets\n"
--msgstr "Aktivn� AX.25 sokety\n"
-+msgstr "Aktivní AX.25 sokety\n"
- 
--#: ../netstat.c:1185
-+#: ../netstat.c:1283
-+#, c-format
- msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
--msgstr "C�l        Zdroj      Za��z   Stav         Vr/Vs    Odhod-F P��ch-F\n"
-+msgstr "Cíl        Zdroj      Zaříz   Stav         Vr/Vs    Odhod-F Přích-F\n"
- 
--#: ../netstat.c:1228
-+#: ../netstat.c:1326
- #, c-format
- msgid "problem reading data from %s\n"
--msgstr "chyba p�i �ten� dat z %s\n"
-+msgstr "chyba při čtení dat z %s\n"
- 
--#: ../netstat.c:1279
-+#: ../netstat.c:1396
-+#, c-format
- msgid ""
- "Active IPX sockets\n"
- "Proto Recv-Q Send-Q Local Address              Foreign Address            "
- "State"
- msgstr ""
--"Aktivn� IPX sokety\n"
--"Proto P��ch-F Odch-F Lok�l adresa              Vzd�len� adresa               "
--" Stav"
-+"Aktivní IPX sokety\n"
-+"Proto Přích-F Odch-F Lokál adresa              Vzdálená "
-+"adresa                Stav"
- 
--#: ../netstat.c:1281
-+#: ../netstat.c:1398
-+#, c-format
- msgid " User"
--msgstr " U�ivatel"
-+msgstr " Uživatel"
- 
--#: ../netstat.c:1315
-+#: ../netstat.c:1432
- msgid "ESTAB"
- msgstr "SPOJEN"
- 
--#: ../netstat.c:1323
-+#: ../netstat.c:1440
- msgid "UNK."
- msgstr "NEZ."
- 
--#: ../netstat.c:1367
--msgid "     - no statistics available -"
--msgstr "     - statistick� data nejsou dostupn� -"
--
--#: ../netstat.c:1370
--msgid "[NO FLAGS]"
--msgstr "[��DN� P��ZNAKY]"
--
--#: ../netstat.c:1400
-+#: ../netstat.c:1478
-+#, c-format
- msgid "Kernel Interface table\n"
--msgstr "Tabulka rozhran� v j�dru\n"
-+msgstr "Tabulka rozhraní v jádru\n"
- 
--#: ../netstat.c:1401
--msgid ""
--"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
--"Flg\n"
--msgstr ""
--"Rozhr   MTU Met    P�-OK P�-CHYB P�-ZAH P�-P�T   OD-OK OD-CHYB OD-ZAH OD-P�T "
--"P�Z\n"
--
--#: ../netstat.c:1404
-+#: ../netstat.c:1486
- msgid "missing interface information"
--msgstr "chyb� informace o rozhran�"
-+msgstr "chybí informace o rozhraní"
- 
--#: ../netstat.c:1425
-+#: ../netstat.c:1509
-+#, c-format
- msgid ""
--"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
--"{-V|--version|-h|--help}\n"
-+"usage: netstat [-vWeenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
- msgstr ""
--"Pou�it�: netstat [--veenNcCF] [<TA>] -r       netstat "
--"{-V|--version|-h|--help}\n"
-+"Použití: netstat [-vWeenNcCF] [<AF>] -r       netstat {-V|--version|-h|--"
-+"help}\n"
- 
--#: ../netstat.c:1426
--msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
--msgstr "         netstat [-vnNcaeol] [<Soket> ...]\n"
-+#: ../netstat.c:1510
-+#, c-format
-+msgid "       netstat [-vWnNcaeol] [<Socket> ...]\n"
-+msgstr "        netstat [-vWnNcaeol] [<Socket>…]\n"
- 
--#: ../netstat.c:1427
-+#: ../netstat.c:1511
-+#, c-format
- msgid ""
--"       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
-+"       netstat { [-vWeenNac] -i | [-cnNe] -M | -s [-6tuw] }\n"
- "\n"
- msgstr ""
--"         netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
-+"       netstat { [-vWeenNac] -i | [-cnNe] -M | -s [-6tuw] }\n"
- "\n"
- 
--#: ../netstat.c:1429
-+#: ../netstat.c:1513
-+#, c-format
- msgid "        -r, --route              display routing table\n"
--msgstr "         -r, --route              vyp��e sm�rovac� tabulku\n"
-+msgstr "         -r, --route              vypíše směrovací tabulku\n"
- 
--#: ../netstat.c:1430
-+#: ../netstat.c:1514
-+#, c-format
- msgid "        -i, --interfaces         display interface table\n"
--msgstr "         -i, --interfaces         vyp��e tabulku rozhran�\n"
-+msgstr "         -i, --interfaces         vypíše tabulku rozhraní\n"
- 
--#: ../netstat.c:1431
-+#: ../netstat.c:1515
-+#, c-format
- msgid "        -g, --groups             display multicast group memberships\n"
- msgstr ""
--"         -g, --groups             vyp��e �lenstv� v multicast skupin�ch\n"
-+"         -g, --groups             vypíše členství v multicast skupinách\n"
- 
--#: ../netstat.c:1432
-+#: ../netstat.c:1516
-+#, c-format
- msgid ""
- "        -s, --statistics         display networking statistics (like SNMP)\n"
- msgstr ""
--"         -s, --statistics         vyp��e statistiku s��ov� aktivity (jako "
-+"         -s, --statistics         vypíše statistiku síťové aktivity (jako "
- "SNMP)\n"
- 
--#: ../netstat.c:1434
-+#: ../netstat.c:1518
-+#, c-format
- msgid ""
- "        -M, --masquerade         display masqueraded connections\n"
- "\n"
- msgstr ""
--"         -M, --masquerade         vyp��e maskovan� spojen�\n"
-+"         -M, --masquerade         vypíše maskovaná spojení\n"
- "\n"
- 
--#: ../netstat.c:1438 ../route.c:87
-+#: ../netstat.c:1521
-+#, c-format
-+msgid "        -W, --wide               don't truncate IP addresses\n"
-+msgstr "        -W, --wide               nezkracuje IP adresy\n"
-+
-+#: ../netstat.c:1523
-+#, c-format
-+msgid "        --numeric-hosts          don't resolve host names\n"
-+msgstr "        --numeric-hosts          nepřekládá názvy strojů\n"
-+
-+#: ../netstat.c:1524
-+#, c-format
-+msgid "        --numeric-ports          don't resolve port names\n"
-+msgstr "        --numeric-ports          nepřekládá názvy portů\n"
-+
-+#: ../netstat.c:1525
-+#, c-format
-+msgid "        --numeric-users          don't resolve user names\n"
-+msgstr "        --numeric-users          nepřekládá uživatelské jména\n"
-+
-+#: ../netstat.c:1526
-+#, c-format
- msgid "        -N, --symbolic           resolve hardware names\n"
--msgstr "         -N, --symbolic           p�evede hw jm�na\n"
-+msgstr "         -N, --symbolic           převede hw jména\n"
- 
--#: ../netstat.c:1439 ../route.c:88
-+#: ../netstat.c:1527 ../route.c:88
-+#, c-format
- msgid "        -e, --extend             display other/more information\n"
--msgstr "         -e, --extend             vyp��e podrobn�j�� informace\n"
-+msgstr "         -e, --extend             vypíše podrobnější informace\n"
- 
--#: ../netstat.c:1440
-+#: ../netstat.c:1528
-+#, c-format
- msgid "        -p, --programs           display PID/Program name for sockets\n"
- msgstr ""
--"         -p, --programs           vyp��e PID/jm�no programu pro sokety\n"
-+"         -p, --programs           vypíše PID/jméno programu pro sokety\n"
- 
--#: ../netstat.c:1441
-+#: ../netstat.c:1529
-+#, c-format
- msgid ""
- "        -c, --continuous         continuous listing\n"
- "\n"
- msgstr ""
--"         -c, --continuous         nep�eru�ovan� v�pis\n"
-+"         -c, --continuous         nepřerušovaný výpis\n"
- "\n"
- 
--#: ../netstat.c:1442
-+#: ../netstat.c:1530
-+#, c-format
- msgid "        -l, --listening          display listening server sockets\n"
- msgstr ""
--"         -l, --listening          vyp��e sokety, na nich� je naslouch�no\n"
-+"         -l, --listening          vypíše sokety, na nichž je nasloucháno\n"
- 
--#: ../netstat.c:1443
-+#: ../netstat.c:1531
-+#, c-format
- msgid ""
- "        -a, --all, --listening   display all sockets (default: connected)\n"
- msgstr ""
--"         -a, --all, --listening   vyp��e v�echny sokety (implicitn�: "
--"spojen�)\n"
-+"         -a, --all, --listening   vypíše všechny sokety (implicitně: "
-+"spojené)\n"
- 
--#: ../netstat.c:1444
-+#: ../netstat.c:1532
-+#, c-format
- msgid "        -o, --timers             display timers\n"
--msgstr "         -o, --timers             zobraz� �asova�e\n"
-+msgstr "         -o, --timers             zobrazí časovače\n"
- 
--#: ../netstat.c:1445 ../route.c:89
-+#: ../netstat.c:1533 ../route.c:89
-+#, c-format
- msgid ""
- "        -F, --fib                display Forwarding Information Base "
- "(default)\n"
- msgstr ""
--"         -F, --fib                zobraz� Forwarding Infomation Base\n"
--"                                  (implicitn�)\n"
-+"         -F, --fib                zobrazí Forwarding Information Base\n"
-+"                                  (implicitní)\n"
- 
--#: ../netstat.c:1446 ../route.c:90
-+#: ../netstat.c:1534 ../route.c:90
-+#, c-format
- msgid ""
- "        -C, --cache              display routing cache instead of FIB\n"
- "\n"
--msgstr "         -C, --cache              m�sto FIB zobraz� sm�rovac� cache\n"
-+msgstr "         -C, --cache              místo FIB zobrazí směrovací cache\n"
- 
--#: ../netstat.c:1448
-+#: ../netstat.c:1536
-+#, c-format
- msgid ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-U|--udplite} {-w|--raw} {-x|--unix} --"
-+"ax25 --ipx --netrom\n"
- msgstr ""
--"  <Soket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-U|--udplite} {-w|--raw} {-x|--unix} --"
-+"ax25 --ipx --netrom\n"
- 
--#: ../netstat.c:1449 ../route.c:92
-+#: ../netstat.c:1537
- #, c-format
--msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
--msgstr "   <AF>=Pou�ijte '-A <af>' or '--<af>' Implicitn�: %s\n"
-+msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
-+msgstr "  <AF>=Použijte „-6|-4“ nebo „-A <af>“ nebo „--<af>“. Implicitní: %s\n"
- 
--#: ../netstat.c:1450 ../route.c:93
-+#: ../netstat.c:1538 ../route.c:93
-+#, c-format
- msgid "  List of possible address families (which support routing):\n"
--msgstr "  Seznam mo�n�ch t��d adres (podporuj�c�ch sm�rov�n�):\n"
-+msgstr "  Seznam možných tříd adres (podporujících směrování):\n"
-+
-+#: ../netstat.c:1756
-+#, c-format
-+msgid "netstat: No statistics support for specified address family: %s\n"
-+msgstr "netstat: Pro zadanou rodinu adres není podporována statistika: %s\n"
- 
--#: ../netstat.c:1663
-+#: ../netstat.c:1798
-+#, c-format
- msgid "Active Internet connections "
--msgstr "Aktivn� Internetov� spojen� "
-+msgstr "Aktivní Internetová spojení "
- 
--#: ../netstat.c:1673
-+#: ../netstat.c:1808
-+#, c-format
- msgid ""
- "\n"
--"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
--"  "
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
- msgstr ""
- "\n"
--"Proto P��ch-F Odch-F M�stn� Adresa          Vzd�len� Adresa         Stav     "
-+"Proto Přích-F Odch-F Místní Adresa          Vzdálená Adresa         Stav     "
- 
--#: ../netstat.c:1675
-+#: ../netstat.c:1810
-+#, c-format
- msgid " User       Inode     "
--msgstr " U�ivatel   I-uzel    "
-+msgstr " Uživatel   I-uzel    "
- 
--#: ../netstat.c:1678
-+#: ../netstat.c:1813
-+#, c-format
- msgid " Timer"
--msgstr " �asova�"
-+msgstr " Časovač"
- 
--#: ../netstat.c:1708
-+#: ../netstat.c:1851
-+#, c-format
- msgid "IPv4 Group Memberships\n"
--msgstr "�lenstv� v IPv4 skupin�ch\n"
-+msgstr "Členství v IPv4 skupinách\n"
- 
--#: ../netstat.c:1709
-+#: ../netstat.c:1852
-+#, c-format
- msgid "Interface       RefCnt Group\n"
--msgstr "Rozhran�        ��ta�  Skupina\n"
-+msgstr "Rozhraní        Čítač  Skupina\n"
- 
--#: ../rarp.c:43
-+#: ../rarp.c:45
- msgid "This kernel does not support RARP.\n"
--msgstr "Toto j�dro nepodporuje RARP.\n"
-+msgstr "Toto jádro nepodporuje RARP.\n"
- 
--#: ../rarp.c:82
-+#: ../rarp.c:84
- #, c-format
- msgid "no RARP entry for %s.\n"
--msgstr "pro %s neexistuje RARP polo�ka.\n"
-+msgstr "pro %s neexistuje RARP položka.\n"
- 
--#: ../rarp.c:95
-+#: ../rarp.c:97
- #, c-format
- msgid "%s: bad hardware address\n"
--msgstr "hardwarov� adresa %s je nespr�vn�\n"
-+msgstr "hardwarová adresa %s je nesprávná\n"
- 
--#: ../rarp.c:127
-+#: ../rarp.c:129
- #, c-format
- msgid "rarp: cannot open file %s:%s.\n"
--msgstr "rarp: soubor %s:%s nelze otev��t.\n"
-+msgstr "rarp: soubor %s:%s nelze otevřít.\n"
- 
--#: ../rarp.c:139
-+#: ../rarp.c:141
- #, c-format
- msgid "rarp: format error at %s:%u\n"
--msgstr "rarp: syntaktick� chyba na ��dku %2$u souboru %1$s\n"
-+msgstr "rarp: syntaktická chyba na řádku %2$u souboru %1$s\n"
- 
--#: ../rarp.c:143 ../rarp.c:287
-+#: ../rarp.c:145 ../rarp.c:290
- #, c-format
- msgid "rarp: %s: unknown host\n"
--msgstr "rarp: po��ta� %s nen� zn�m\n"
-+msgstr "rarp: počítač %s není znám\n"
- 
--#: ../rarp.c:146
-+#: ../rarp.c:148
- #, c-format
- msgid "rarp: cannot set entry from %s:%u\n"
--msgstr "rarp: nelze nastavit polo�ku z ��dku %2$u souboru %1$s\n"
-+msgstr "rarp: nelze nastavit položku z řádku %2$u souboru %1$s\n"
- 
--#: ../rarp.c:175
-+#: ../rarp.c:177
-+#, c-format
- msgid "Usage: rarp -a                               list entries in cache.\n"
--msgstr "Pou�it�: rarp -a                            vyp��e polo�ky z cache.\n"
-+msgstr "Použití: rarp -a                            vypíše položky z cache.\n"
- 
--#: ../rarp.c:176
-+#: ../rarp.c:178
-+#, c-format
- msgid "       rarp -d <hostname>                    delete entry from cache.\n"
--msgstr "         rarp -d <jm�no>                    sma�e polo�ku z cache.\n"
-+msgstr "         rarp -d <jméno>                    smaže položku z cache.\n"
- 
--#: ../rarp.c:177
-+#: ../rarp.c:179
-+#, c-format
- msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
- msgstr ""
--"         rarp [<HW>] -s <jm�no> <hwadr>       p�id� polo�ku do cache.\n"
-+"         rarp [<HW>] -s <jméno> <hwadr>       přidá položku do cache.\n"
- 
--#: ../rarp.c:178
-+#: ../rarp.c:180
-+#, c-format
- msgid ""
- "       rarp -f                               add entries from /etc/ethers.\n"
- msgstr ""
--"         rarp -f                               p�id� polo�ky z /etc/ethers.\n"
-+"         rarp -f                               přidá položky z /etc/ethers.\n"
- 
--#: ../rarp.c:179
-+#: ../rarp.c:181
-+#, c-format
- msgid ""
- "       rarp -V                               display program version.\n"
- "\n"
- msgstr ""
--"         rarp -V                               vyp��e ozna�en� verze "
-+"         rarp -V                               vypíše označení verze "
- "programu.\n"
- "\n"
- 
--#: ../rarp.c:236
-+#: ../rarp.c:239
- #, c-format
- msgid "%s: illegal option mix.\n"
--msgstr "Kombinace p�ep�na�� %s je nespr�vn�.\n"
-+msgstr "Kombinace přepínačů %s je nesprávná.\n"
- 
--#: ../rarp.c:267
-+#: ../rarp.c:270
- #, c-format
- msgid "rarp: %s: unknown hardware type.\n"
--msgstr "rarp: hardwarov� typ %s nen� zn�m.\n"
-+msgstr "rarp: hardwarový typ %s není znám.\n"
- 
--#: ../route.c:79
-+#: ../route.c:80
-+#, c-format
- msgid ""
- "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
- msgstr ""
--"Pou�it�: route [-nNvee] [-FC] [<AF>]         Zobraz� sm�rovac� tabulky v "
--"j�dru\n"
-+"Použití: route [-nNvee] [-FC] [<AF>]         Zobrazí směrovací tabulky v "
-+"jádru\n"
- 
--#: ../route.c:80
-+#: ../route.c:81
-+#, c-format
- msgid ""
- "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
- "\n"
- msgstr ""
--"       route [-v] [-FC] {add|del|flush} ...  Zm�n� sm�rovac� tabulku pro "
-+"       route [-v] [-FC] {add|del|flush} ...  Změní směrovací tabulku pro "
- "AF.\n"
- "\n"
- 
--#: ../route.c:82
-+#: ../route.c:83
-+#, c-format
- msgid ""
- "       route {-h|--help} [<AF>]              Detailed usage syntax for "
- "specified AF.\n"
- msgstr ""
--"       route {-h|--help [<AF>]               N�pov�da pro pou�it� s AF.\n"
-+"       route {-h|--help [<AF>]               Nápověda pro použití s AF.\n"
- 
--#: ../route.c:83
-+#: ../route.c:84
-+#, c-format
- msgid ""
- "       route {-V|--version}                  Display version/author and "
- "exit.\n"
- "\n"
- msgstr ""
--"       route {-V|--version}                  Vyp��e ozna�en� verze a autora\n"
-+"       route {-V|--version}                  Vypíše označení verze a autora\n"
- "                                             programu.\n"
- 
-+#: ../route.c:92
-+#, c-format
-+msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgstr "   <AF>=Použijte „-A <af>“ nebo „--<af>“. Implicitní: %s\n"
-+
- #: ../plipconfig.c:66
-+#, c-format
- msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
--msgstr "Pou�it�: plipconfig [-a] [-i] [-v] rozhran�\n"
-+msgstr "Použití: plipconfig [-a] [-i] [-v] rozhraní\n"
- 
- #: ../plipconfig.c:67
-+#, c-format
- msgid "                  [nibble NN] [trigger NN]\n"
- msgstr "                  [nibble NN] [trigger NN]\n"
- 
- #: ../plipconfig.c:68
-+#, c-format
- msgid "       plipconfig -V | --version\n"
- msgstr "       plipconfig -V | --version\n"
- 
-@@ -1338,25 +1371,30 @@ msgstr "       plipconfig -V | --version\n"
- msgid "%s\tnibble %lu  trigger %lu\n"
- msgstr "%s\tnibble %lu  trigger %lu\n"
- 
--#: ../iptunnel.c:79
-+#: ../iptunnel.c:85
-+#, c-format
- msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
--msgstr "Pou�it�: iptunnel { add | change | del | show } [ JM�NO ]\n"
-+msgstr "Použití: iptunnel { add | change | del | show } [ JMÉNO ]\n"
- 
--#: ../iptunnel.c:80
-+#: ../iptunnel.c:86
-+#, c-format
- msgid ""
- "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
- msgstr ""
--"          [ mode { ipip | gre | sit } ] [ vzd�len� ADR ] [ m�stn� ADR ]\n"
-+"          [ mode { ipip | gre | sit } ] [ vzdálená ADR ] [ místní ADR ]\n"
- 
--#: ../iptunnel.c:81
-+#: ../iptunnel.c:87
-+#, c-format
- msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
--msgstr "          [ [i|o]seq ] [ [i|o]key KL�� ] [ [i|o]csum ]\n"
-+msgstr "          [ [i|o]seq ] [ [i|o]key KLÍČ ] [ [i|o]csum ]\n"
- 
--#: ../iptunnel.c:82
-+#: ../iptunnel.c:88
-+#, c-format
- msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
--msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev ZA��ZEN� ]\n"
-+msgstr "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev ZAŘÍZENÍ ]\n"
- 
--#: ../iptunnel.c:83
-+#: ../iptunnel.c:89
-+#, c-format
- msgid ""
- "       iptunnel -V | --version\n"
- "\n"
-@@ -1364,1068 +1402,1781 @@ msgstr ""
- "       iptunnel -V | --version\n"
- "\n"
- 
--#: ../iptunnel.c:84
-+#: ../iptunnel.c:90
-+#, c-format
- msgid "Where: NAME := STRING\n"
--msgstr "Kde: JM�NO := �ET�ZEC\n"
-+msgstr "Kde: JMÉNO := ŘETĚZEC\n"
- 
--#: ../iptunnel.c:85
-+#: ../iptunnel.c:91
-+#, c-format
- msgid "       ADDR := { IP_ADDRESS | any }\n"
- msgstr "       ADR := { IP-ADRESA | any }\n"
- 
--#: ../iptunnel.c:86
-+#: ../iptunnel.c:92
-+#, c-format
- msgid "       TOS  := { NUMBER | inherit }\n"
--msgstr "       TOS  := { ��SLO | inherit }\n"
-+msgstr "       TOS  := { ČÍSLO | inherit }\n"
- 
--#: ../iptunnel.c:87
-+#: ../iptunnel.c:93
-+#, c-format
- msgid "       TTL  := { 1..255 | inherit }\n"
- msgstr "       TTL  := { 1..255 | inherit }\n"
- 
--#: ../iptunnel.c:88
-+#: ../iptunnel.c:94
-+#, c-format
- msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
--msgstr "       KL��  := { DOTTED_QUAD | ��SLO }\n"
-+msgstr "       KLÍČ  := { DOTTED_QUAD | ČÍSLO }\n"
- 
--#: ../iptunnel.c:326
-+#: ../iptunnel.c:332
-+#, c-format
- msgid "Keys are not allowed with ipip and sit.\n"
--msgstr "S ipip a sit nejsou kl��e povoleny.\n"
-+msgstr "S ipip a sit nejsou klíče povoleny.\n"
- 
--#: ../iptunnel.c:346
-+#: ../iptunnel.c:352
-+#, c-format
- msgid "Broadcast tunnel requires a source address.\n"
--msgstr "Tunel se v�esm�rov�m vys�l�n�m vy�aduje zdrojovou adresu.\n"
-+msgstr "Tunel se všesměrovým vysíláním vyžaduje zdrojovou adresu.\n"
- 
--#: ../iptunnel.c:361
-+#: ../iptunnel.c:367
-+#, c-format
- msgid "ttl != 0 and noptmudisc are incompatible\n"
--msgstr "ttl != 0 a noptmudisc se navz�jem vylu�uj�\n"
-+msgstr "ttl != 0 a noptmudisc se navzájem vylučují\n"
- 
--#: ../iptunnel.c:373
-+#: ../iptunnel.c:379
-+#, c-format
- msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
--msgstr "re�im tunelu (ipip, gre �i sit) nelze zjistit\n"
-+msgstr "režim tunelu (ipip, gre či sit) nelze zjistit\n"
- 
--#: ../iptunnel.c:411
-+#: ../iptunnel.c:417
- #, c-format
- msgid "%s: %s/ip  remote %s  local %s "
--msgstr "%s: %s/ip  vzd�len� %s  m�stn� %s "
-+msgstr "%s: %s/ip  vzdálený %s  místní %s "
- 
--#: ../iptunnel.c:415
-+#: ../iptunnel.c:421
- msgid "unknown"
--msgstr "Nezn�m."
-+msgstr "Neznám."
- 
--#: ../iptunnel.c:447
-+#: ../iptunnel.c:453
-+#, c-format
- msgid "  Drop packets out of sequence.\n"
--msgstr "  Zahazuje pakety mimo po�ad�.\n"
-+msgstr "  Zahazuje pakety mimo pořadí.\n"
- 
--#: ../iptunnel.c:449
-+#: ../iptunnel.c:455
-+#, c-format
- msgid "  Checksum in received packet is required.\n"
--msgstr "  P�ij�man� pakety mus� m�t kontroln� sou�et.\n"
-+msgstr "  Přijímané pakety musí mít kontrolní součet.\n"
- 
- # ???
--#: ../iptunnel.c:451
-+#: ../iptunnel.c:457
-+#, c-format
- msgid "  Sequence packets on output.\n"
--msgstr "  �ad� odchoz� pakety.\n"
-+msgstr "  Řadí odchozí pakety.\n"
- 
--#: ../iptunnel.c:453
-+#: ../iptunnel.c:459
-+#, c-format
- msgid "  Checksum output packets.\n"
--msgstr "  Odchoz� pakety budou m�t kontroln� sou�et.\n"
-+msgstr "  Odchozí pakety budou mít kontrolní součet.\n"
- 
--#: ../iptunnel.c:481
-+#: ../iptunnel.c:487
-+#, c-format
- msgid "Wrong format of /proc/net/dev. Sorry.\n"
--msgstr "Lituji, form�t /proc/net/dev je chybn�.\n"
-+msgstr "Lituji, formát /proc/net/dev je chybný.\n"
- 
--#: ../iptunnel.c:494
-+#: ../iptunnel.c:500
- #, c-format
- msgid "Failed to get type of [%s]\n"
--msgstr "Typ [%s] se nepoda�ilo zjistit.\n"
-+msgstr "Typ [%s] se nepodařilo zjistit.\n"
- 
--#: ../iptunnel.c:510
-+#: ../iptunnel.c:516
-+#, c-format
- msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
--msgstr "RX: Pakety     Bajty        Chyby  CsumChyb MimoPo�  Mcasts\n"
-+msgstr "RX: Pakety     Bajty        Chyby  CsumChyb MimoPoř  Mcasts\n"
- 
--#: ../iptunnel.c:513
-+#: ../iptunnel.c:519
-+#, c-format
- msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
- msgstr "TX: Pakety     Bajty        Chyby  DeadLoop NoRoute  NoBufs\n"
- 
--#: ../statistics.c:45
-+#: ../statistics.c:48
- msgid "ICMP input histogram:"
--msgstr "histogram ICMP vstupu:"
-+msgstr "Histogram ICMP vstupu:"
- 
--#: ../statistics.c:46
-+#: ../statistics.c:49
- msgid "ICMP output histogram:"
--msgstr "histogram ICMP v�stupu:"
-+msgstr "Histogram ICMP výstupu:"
-+
-+#: ../statistics.c:66
-+#, c-format
-+msgid "Forwarding is %s"
-+msgstr "Předávání je %s"
-+
-+#: ../statistics.c:67
-+#, c-format
-+msgid "Default TTL is %u"
-+msgstr "Implicitní TTL je %u"
-+
-+#: ../statistics.c:68 ../statistics.c:89
-+#, c-format
-+msgid "%u total packets received"
-+msgstr "Celkem přijatých paketů: %u"
-+
-+#: ../statistics.c:69 ../statistics.c:90
-+#, c-format
-+msgid "%u with invalid headers"
-+msgstr "S nesprávnými hlavičkami: %u"
-+
-+#: ../statistics.c:70 ../statistics.c:93
-+#, c-format
-+msgid "%u with invalid addresses"
-+msgstr "S nesprávnými adresami: %u"
-+
-+#: ../statistics.c:71 ../statistics.c:98
-+#, c-format
-+msgid "%u forwarded"
-+msgstr "Přeposláno: %u"
-+
-+#: ../statistics.c:72 ../statistics.c:94
-+#, c-format
-+msgid "%u with unknown protocol"
-+msgstr "S neznámým protokolem: %u"
-+
-+#: ../statistics.c:73 ../statistics.c:96
-+#, c-format
-+msgid "%u incoming packets discarded"
-+msgstr "Počet zahozených příchozích paketů: %u"
-+
-+#: ../statistics.c:74 ../statistics.c:97
-+#, c-format
-+msgid "%u incoming packets delivered"
-+msgstr "Počet doručených příchozích paketů: %u"
-+
-+#: ../statistics.c:75 ../statistics.c:99
-+#, c-format
-+msgid "%u requests sent out"
-+msgstr "Počet požadavků na odeslání: %u"
-+
-+#. ?
-+#: ../statistics.c:76 ../statistics.c:100
-+#, c-format
-+msgid "%u outgoing packets dropped"
-+msgstr "Počet zahozených odchozích paketů: %u"
-+
-+#: ../statistics.c:77 ../statistics.c:101
-+#, c-format
-+msgid "%u dropped because of missing route"
-+msgstr "Zahozeno kvůli chybějící cestě: %u"
-+
-+#: ../statistics.c:78 ../statistics.c:102
-+#, c-format
-+msgid "%u fragments dropped after timeout"
-+msgstr "Počet fragmentů zahozených po vypršení času: %u"
-+
-+#: ../statistics.c:79 ../statistics.c:103
-+#, c-format
-+msgid "%u reassemblies required"
-+msgstr "Počet nutných znovusestavení: %u"
-+
-+#. ?
-+#: ../statistics.c:80 ../statistics.c:104
-+#, c-format
-+msgid "%u packets reassembled ok"
-+msgstr "Počet v pořádku znovu sestavených paketů: %u"
-+
-+#: ../statistics.c:81 ../statistics.c:105
-+#, c-format
-+msgid "%u packet reassembles failed"
-+msgstr "Počet paketů, jež se nepodařilo znovu sestavit: %u"
-+
-+#: ../statistics.c:82 ../statistics.c:106
-+#, c-format
-+msgid "%u fragments received ok"
-+msgstr "Počet v pořádku přijatých fragmentů: %u"
-+
-+#: ../statistics.c:83 ../statistics.c:107
-+#, c-format
-+msgid "%u fragments failed"
-+msgstr "Počet chybných fragmentů: %u"
-+
-+#: ../statistics.c:84 ../statistics.c:108
-+#, c-format
-+msgid "%u fragments created"
-+msgstr "Počet vytvořených fragmentů: %u"
-+
-+#: ../statistics.c:91
-+#, c-format
-+msgid "%u with packets too big"
-+msgstr "Počet příliš velkých packetů: %u"
-+
-+#: ../statistics.c:92
-+#, c-format
-+msgid "%u incoming packets with no route"
-+msgstr "Počet příchozích paketů bez odpovídající cesty: %u"
-+
-+#: ../statistics.c:95
-+#, c-format
-+msgid "%u with truncated packets"
-+msgstr "Počet zkrácených packetů: %u"
-+
-+#: ../statistics.c:109
-+#, c-format
-+msgid "%u incoming multicast packets"
-+msgstr "Počet příchozích multicastových paketů: %u"
-+
-+#: ../statistics.c:110
-+#, c-format
-+msgid "%u outgoing multicast packets"
-+msgstr "Počet odchozích multicastových paketů: %u"
-+
-+#: ../statistics.c:115 ../statistics.c:145
-+#, c-format
-+msgid "%u ICMP messages received"
-+msgstr "Počet přijatých ICMP zpráv: %u"
-+
-+#: ../statistics.c:116 ../statistics.c:146
-+#, c-format
-+msgid "%u input ICMP message failed."
-+msgstr "Počet chybných příchozích ICMP zpráv: %u"
-+
-+#: ../statistics.c:117 ../statistics.c:130 ../statistics.c:147
-+#: ../statistics.c:162
-+#, c-format
-+msgid "destination unreachable: %u"
-+msgstr "Adresát nedostupný: %u"
-+
-+#: ../statistics.c:118
-+#, c-format
-+msgid "timeout in transit: %u"
-+msgstr "Vypršel čas při přenosu: %u"
-+
-+#: ../statistics.c:119 ../statistics.c:132
-+#, c-format
-+msgid "wrong parameters: %u"
-+msgstr "Chybné parametry: %u"
-+
-+#. ?
-+#: ../statistics.c:120
-+#, c-format
-+msgid "source quenches: %u"
-+msgstr "Zahlcení zdroje: %u"
-+
-+#: ../statistics.c:121 ../statistics.c:160 ../statistics.c:175
-+#, c-format
-+msgid "redirects: %u"
-+msgstr "Počet přesměrování: %u"
-+
-+#: ../statistics.c:122 ../statistics.c:151 ../statistics.c:166
-+#, c-format
-+msgid "echo requests: %u"
-+msgstr "Žádost o echo: %u"
-+
-+#: ../statistics.c:123 ../statistics.c:136 ../statistics.c:152
-+#: ../statistics.c:167
-+#, c-format
-+msgid "echo replies: %u"
-+msgstr "Odpověď na žádost o echo: %u"
-+
-+#: ../statistics.c:124
-+#, c-format
-+msgid "timestamp request: %u"
-+msgstr "Žádost o čas: %u"
-+
-+#: ../statistics.c:125
-+#, c-format
-+msgid "timestamp reply: %u"
-+msgstr "Odpověď na žádost o čas: %u"
-+
-+#: ../statistics.c:126
-+#, c-format
-+msgid "address mask request: %u"
-+msgstr "Žádost o masku podsítě: %u"
-+
-+#. ?
-+#: ../statistics.c:127 ../statistics.c:140
-+#, c-format
-+msgid "address mask replies: %u"
-+msgstr "Odpověď na žádost o masku podsítě: %u"
-+
-+#. ?
-+#: ../statistics.c:128 ../statistics.c:161
-+#, c-format
-+msgid "%u ICMP messages sent"
-+msgstr "Počet odeslaných ICMP zpráv: %u"
-+
-+#: ../statistics.c:129
-+#, c-format
-+msgid "%u ICMP messages failed"
-+msgstr "Počet chybných ICMP zpráv: %u"
-+
-+#: ../statistics.c:131
-+#, c-format
-+msgid "time exceeded: %u"
-+msgstr "Vypršení životnosti: %u"
-+
-+#. ?
-+#: ../statistics.c:133
-+#, c-format
-+msgid "source quench: %u"
-+msgstr "Zahlcení zdroje: %u"
-+
-+#: ../statistics.c:134
-+#, c-format
-+msgid "redirect: %u"
-+msgstr "Počet přesměrování: %u"
-+
-+#: ../statistics.c:135
-+#, c-format
-+msgid "echo request: %u"
-+msgstr "Žádost o echo: %u"
-+
-+#: ../statistics.c:137
-+#, c-format
-+msgid "timestamp requests: %u"
-+msgstr "žádost o čas: %u"
-+
-+#: ../statistics.c:138
-+#, c-format
-+msgid "timestamp replies: %u"
-+msgstr "Odpověď na žádost o čas: %u"
-+
-+#: ../statistics.c:139
-+#, c-format
-+msgid "address mask requests: %u"
-+msgstr "Žádost o masku podsítě: %u"
-+
-+#: ../statistics.c:148 ../statistics.c:163
-+#, c-format
-+msgid "packets too big: %u"
-+msgstr "Příliš velkých packetů: %u"
-+
-+#: ../statistics.c:149
-+#, c-format
-+msgid "received ICMPv6 time exceeded: %u"
-+msgstr "Přijato ICMPv6 vypršení životnosti: %u"
-+
-+#: ../statistics.c:150 ../statistics.c:165
-+#, c-format
-+msgid "parameter problem: %u"
-+msgstr "Problém s parametrem: %u"
-+
-+#: ../statistics.c:153 ../statistics.c:168
-+#, c-format
-+msgid "group member queries: %u"
-+msgstr "Dotazů na členství ve skupině: %u"
-+
-+#: ../statistics.c:154 ../statistics.c:169
-+#, c-format
-+msgid "group member responses: %u"
-+msgstr "Odpovědí na členství ve skupině: %u"
-+
-+#: ../statistics.c:155 ../statistics.c:170
-+#, c-format
-+msgid "group member reductions: %u"
-+msgstr "Počet snížení členů skupiny: %u"
-+
-+#: ../statistics.c:156 ../statistics.c:171
-+#, c-format
-+msgid "router solicits: %u"
-+msgstr "Počet výzev směrovači: %u"
-+
-+#: ../statistics.c:157 ../statistics.c:172
-+#, c-format
-+msgid "router advertisement: %u"
-+msgstr "Počet oznámení směrovače: %u"
-+
-+#: ../statistics.c:158
-+#, c-format
-+msgid "neighbour solicits: %u"
-+msgstr "Počet výzev sousedovi: %u"
-+
-+#: ../statistics.c:159
-+#, c-format
-+msgid "neighbour advertisement: %u"
-+msgstr "Počet oznámení souseda: %u"
-+
-+#: ../statistics.c:164
-+#, c-format
-+msgid "sent ICMPv6 time exceeded: %u"
-+msgstr "Počet odeslaných ICMPv6 vypršení životnosti: %u"
-+
-+#: ../statistics.c:173
-+#, c-format
-+msgid "neighbor solicits: %u"
-+msgstr "Počet výzev sousedovi: %u"
-+
-+#: ../statistics.c:174
-+#, c-format
-+msgid "neighbor advertisements: %u"
-+msgstr "Počet oznámení souseda: %u"
-+
-+#: ../statistics.c:180
-+#, c-format
-+msgid "RTO algorithm is %s"
-+msgstr "RTO algoritmus je %s"
-+
-+#: ../statistics.c:184
-+#, c-format
-+msgid "%u active connections openings"
-+msgstr "Počet aktivně navázaných spojení: %u"
-+
-+#: ../statistics.c:185
-+#, c-format
-+msgid "%u passive connection openings"
-+msgstr "Počet pasivně navázaných spojení: %u"
-+
-+#: ../statistics.c:186
-+#, c-format
-+msgid "%u failed connection attempts"
-+msgstr "Počet neúspěšných pokusů o spojení: %u"
-+
-+#: ../statistics.c:187
-+#, c-format
-+msgid "%u connection resets received"
-+msgstr "Počet přijatých resetů spojení: %u"
-+
-+#: ../statistics.c:188
-+#, c-format
-+msgid "%u connections established"
-+msgstr "Počet navázaných spojení: %u"
-+
-+#: ../statistics.c:189
-+#, c-format
-+msgid "%u segments received"
-+msgstr "Počet přijatých segmentů: %u"
-+
-+#: ../statistics.c:190
-+#, c-format
-+msgid "%u segments send out"
-+msgstr "Počet odeslaných segmentů: %u"
-+
-+#: ../statistics.c:191
-+#, c-format
-+msgid "%u segments retransmited"
-+msgstr "Počet přenesených segmentů: %u"
-+
-+#: ../statistics.c:192
-+#, c-format
-+msgid "%u bad segments received."
-+msgstr "Počet chybných příchozích segmentů: %u"
-+
-+#: ../statistics.c:193
-+#, c-format
-+msgid "%u resets sent"
-+msgstr "Počet odeslaných resetů: %u"
-+
-+#: ../statistics.c:198 ../statistics.c:206
-+#, c-format
-+msgid "%u packets received"
-+msgstr "Počet přijatých paketů: %u"
-+
-+#: ../statistics.c:199 ../statistics.c:207
-+#, c-format
-+msgid "%u packets to unknown port received."
-+msgstr "Počet paketů přijatých pro neznámý port: %u"
-+
-+#: ../statistics.c:200 ../statistics.c:208
-+#, c-format
-+msgid "%u packet receive errors"
-+msgstr "Počet chyb při příjmu paketů: %u"
-+
-+#: ../statistics.c:201 ../statistics.c:209
-+#, c-format
-+msgid "%u packets sent"
-+msgstr "Počet odeslaných paketů: %u"
-+
-+#: ../statistics.c:214
-+#, c-format
-+msgid "%u SYN cookies sent"
-+msgstr "Počet odeslaných SYN cookies: %u"
- 
--#: ../statistics.c:63
-+#: ../statistics.c:215
- #, c-format
--msgid "Forwarding is %s"
--msgstr "P�ed�v�n� je %s"
-+msgid "%u SYN cookies received"
-+msgstr "Počet přijatých SYN cookies: %u"
- 
--#: ../statistics.c:64
-+#: ../statistics.c:216
- #, c-format
--msgid "Default TTL is %d"
--msgstr "Implicitn� TTL je %d"
-+msgid "%u invalid SYN cookies received"
-+msgstr "Počet chybných příchozích SYN cookies: %u"
- 
--#: ../statistics.c:65
-+#: ../statistics.c:218
- #, c-format
--msgid "%d total packets received"
--msgstr "celkem p�ijmut�ch paket�: %d"
-+msgid "%u resets received for embryonic SYN_RECV sockets"
-+msgstr "Počet resetů přijatých pro sokety v zárodečném stavu SYN_PŘÍCH: %u"
- 
--#: ../statistics.c:66
-+#: ../statistics.c:220
- #, c-format
--msgid "%d with invalid headers"
--msgstr "s nespr�vn�mi hlavi�kami: %d"
-+msgid "%u packets pruned from receive queue because of socket buffer overrun"
-+msgstr ""
-+"Počet packetů odstraněných z přijímací fronty kvůli přetečení bufferu "
-+"socketu: %u"
- 
--#: ../statistics.c:67
-+#. obsolete: 2.2.0 doesn't do that anymore
-+#: ../statistics.c:223
- #, c-format
--msgid "%d with invalid addresses"
--msgstr "s nespr�vn�mi adresami: %d"
-+msgid "%u packets pruned from receive queue"
-+msgstr "Počet packetů odstraněných z přijímací fronty: %u"
- 
--#: ../statistics.c:68
-+#: ../statistics.c:224
- #, c-format
--msgid "%d forwarded"
--msgstr "p�ed�no: %d"
-+msgid ""
-+"%u packets dropped from out-of-order queue because of socket buffer overrun"
-+msgstr ""
-+"Počet packetů zahozených z fronty mimo-pořadí kvůli přetečení bufferu "
-+"socketu: %u"
- 
--#: ../statistics.c:69
-+#: ../statistics.c:226
- #, c-format
--msgid "%d with unknown protocol"
--msgstr "s nezn�m�m protokolem: %d"
-+msgid "%u ICMP packets dropped because they were out-of-window"
-+msgstr "Počet ICMP packetů zahozených, protože byly mimo okno: %u"
- 
--#: ../statistics.c:70
-+#: ../statistics.c:228
- #, c-format
--msgid "%d incoming packets discarded"
--msgstr "po�et zahozen�ch p��choz�ch paket�: %d"
-+msgid "%u ICMP packets dropped because socket was locked"
-+msgstr "Počet ICMP packetů zahozených kvůli zamčenému socketu: %u"
- 
--#: ../statistics.c:71
-+#: ../statistics.c:230
- #, c-format
--msgid "%d incoming packets delivered"
--msgstr "po�et doru�en�ch p��choz�ch paket�: %d"
-+msgid "%u TCP sockets finished time wait in fast timer"
-+msgstr ""
-+"Počet TCP socketů, které ukončily fázi time-wait uvnitř rychlého časovače: %u"
- 
--#: ../statistics.c:72
-+#: ../statistics.c:231
- #, c-format
--msgid "%d requests sent out"
--msgstr "po�et odeslan�ch po�adavk�: %d"
-+msgid "%u time wait sockets recycled by time stamp"
-+msgstr ""
-+"Počet socketů ve fázi time-wait, které byly znovu použity díky časovému "
-+"razítku: %u"
- 
--#. ?
--#: ../statistics.c:73
-+#: ../statistics.c:232
- #, c-format
--msgid "%d outgoing packets dropped"
--msgstr "po�et zahozen�ch odchoz�ch paket�: %d"
-+msgid "%u TCP sockets finished time wait in slow timer"
-+msgstr ""
-+"Počet TCP socketů, které ukončily fázi time-wait uvnitř pomalého časovače: %u"
- 
--#: ../statistics.c:74
-+#: ../statistics.c:233
- #, c-format
--msgid "%d dropped because of missing route"
--msgstr "zahozeno kv�li chyb�j�c� cest�: %d"
-+msgid "%u passive connections rejected because of time stamp"
-+msgstr "Počet odmítnutých pasivních spojení kvůli časovému razítku: %u"
- 
--#: ../statistics.c:75
-+#: ../statistics.c:235
- #, c-format
--msgid "%d fragments dropped after timeout"
--msgstr "po�et fragment� zahozen�ch po vypr�en� �asu: %d"
-+msgid "%u active connections rejected because of time stamp"
-+msgstr "Počet odmítnutých aktivních spojení kvůli časovému razítku: %u"
- 
--#: ../statistics.c:76
-+#: ../statistics.c:237
- #, c-format
--msgid "%d reassemblies required"
--msgstr "po�et nutn�ch znovusestaven�: %d"
-+msgid "%u packets rejects in established connections because of timestamp"
-+msgstr ""
-+"Počet odmítnutých packetů uvnitř navázaného spojení kvůli časovému razítku: %"
-+"u"
- 
--#. ?
--#: ../statistics.c:77
-+#: ../statistics.c:239
- #, c-format
--msgid "%d packets reassembled ok"
--msgstr "po�et v po��dku znovu sestaven�ch paket�: %d"
-+msgid "%u delayed acks sent"
-+msgstr "Počet odeslaných zpožděných potvrzení: %u"
- 
--#: ../statistics.c:78
-+#: ../statistics.c:240
- #, c-format
--msgid "%d packet reassembles failed"
--msgstr "po�et paket�, je� se nepoda�ilo znovu sestavit: %d"
-+msgid "%u delayed acks further delayed because of locked socket"
-+msgstr ""
-+"Počet zpožděných potvrzení dále pozdržených kvůli zamčenému socketu: %u"
- 
--#: ../statistics.c:79
-+#: ../statistics.c:242
- #, c-format
--msgid "%d fragments received ok"
--msgstr "po�et v po��dku p�ijmut�ch fragment�: %d"
-+msgid "Quick ack mode was activated %u times"
-+msgstr "Počet aktivovaní rychlého potvrzovacího režimu: %u"
- 
--#: ../statistics.c:80
-+#: ../statistics.c:243
- #, c-format
--msgid "%d fragments failed"
--msgstr "po�et chybn�ch fragment�: %d"
-+msgid "%u times the listen queue of a socket overflowed"
-+msgstr "Počet přetečení naslouchací fronty socketu: %u"
- 
--#: ../statistics.c:81
-+#: ../statistics.c:245
- #, c-format
--msgid "%d fragments created"
--msgstr "po�et vytvo�en�ch fragment�: %d"
-+msgid "%u SYNs to LISTEN sockets dropped"
-+msgstr "Počet zahozených SYN packetů určených naslouchajícímu socketu: %u"
- 
--#: ../statistics.c:86
-+#: ../statistics.c:246
- #, c-format
--msgid "%d ICMP messages received"
--msgstr "po�et p�ijmut�ch ICMP zpr�v: %d"
-+msgid "%u packets directly queued to recvmsg prequeue."
-+msgstr "Počet packetů přímo zařazených do předfronty recvmsg: %u"
- 
--#: ../statistics.c:87
-+#: ../statistics.c:248
- #, c-format
--msgid "%d input ICMP message failed."
--msgstr "po�et chybn�ch p��choz�ch ICMP zpr�v: %d"
-+msgid "%u bytes directly in process context from backlog"
-+msgstr "Počet bajtů předaných přímo z backlogu do kontextu procesu: %u"
- 
--#: ../statistics.c:88 ../statistics.c:101
-+#: ../statistics.c:249
- #, c-format
--msgid "destination unreachable: %d"
--msgstr "adres�t nedostupn�: %d"
-+msgid "%u bytes directly received in process context from prequeue"
-+msgstr "Počet bajtů přímo přijatých do kontextu procesu z předfronty: %u"
- 
--#: ../statistics.c:89
-+#: ../statistics.c:251
- #, c-format
--msgid "timeout in transit: %d"
--msgstr "vypr�el �as p�i p�enosu: %d"
-+msgid "%u packets dropped from prequeue"
-+msgstr "Počet paketů odstraněných z předfronty: %u"
- 
--#: ../statistics.c:90 ../statistics.c:103
-+#: ../statistics.c:252
- #, c-format
--msgid "wrong parameters: %d"
--msgstr "chybn� parametry: %d"
-+msgid "%u packet headers predicted"
-+msgstr "Počet předpovězených hlaviček packetů: %u"
- 
--#. ?
--#: ../statistics.c:91
-+#: ../statistics.c:253
- #, c-format
--msgid "source quenchs: %d"
--msgstr "��zen� toku dat: %d"
-+msgid "%u packets header predicted and directly queued to user"
-+msgstr "Počet hlaviček packetů předpovězených a přímo předaných uživateli: %u"
- 
--#: ../statistics.c:92
-+#: ../statistics.c:255
- #, c-format
--msgid "redirects: %d"
--msgstr "zm�na cesty: %d"
-+msgid "Ran %u times out of system memory during packet sending"
-+msgstr "Kolikrát systému došla paměť při odesílání packetu: %u"
- 
--#: ../statistics.c:93
-+#: ../statistics.c:257
- #, c-format
--msgid "echo requests: %d"
--msgstr "��dost o echo: %d"
-+msgid "%u acknowledgments not containing data payload received"
-+msgstr "Počet přijatých potvrzení neobsahující data: %u"
- 
--#: ../statistics.c:94 ../statistics.c:107
-+#: ../statistics.c:258
- #, c-format
--msgid "echo replies: %d"
--msgstr "odpov�� na ��dost o echo: %d"
-+msgid "%u predicted acknowledgments"
-+msgstr "Počet předpovězených potvrzení: %u"
- 
--#: ../statistics.c:95
-+#: ../statistics.c:259
- #, c-format
--msgid "timestamp request: %d"
--msgstr "��dost o �as: %d"
-+msgid "%u times recovered from packet loss due to fast retransmit"
-+msgstr "Počet zotavení ze ztráty packetu kvůli rychle opakovanému odeslání: %u"
- 
--#: ../statistics.c:96
-+#: ../statistics.c:260
- #, c-format
--msgid "timestamp reply: %d"
--msgstr "odpov�� na ��dost o �as: %d"
-+msgid "%u times recovered from packet loss by selective acknowledgements"
-+msgstr "Počet zotavení ze ztráty packetu pomocí vyběrových potvrzení: %u"
- 
--#: ../statistics.c:97
-+#: ../statistics.c:261
- #, c-format
--msgid "address mask request: %d"
--msgstr "��dost o masku pods�t�: %d"
-+msgid "%u bad SACK blocks received"
-+msgstr "Počet přijatých chybných SACK bloků: %u"
- 
--#. ?
--#: ../statistics.c:98
--msgid "address mask replies"
--msgstr "odpov�di na ��dost o masku pods�t�"
-+#: ../statistics.c:262
-+#, c-format
-+msgid "Detected reordering %u times using FACK"
-+msgstr "Kolikrát byla nalezena změna pořadí pomocí FACK: %u"
- 
--#. ?
--#: ../statistics.c:99
-+#: ../statistics.c:263
- #, c-format
--msgid "%d ICMP messages sent"
--msgstr "po�et odeslan�ch ICMP zpr�v: %d"
-+msgid "Detected reordering %u times using SACK"
-+msgstr "Kolikrát byla nalezena změna pořadí pomocí SACK: %u"
- 
--#: ../statistics.c:100
-+#: ../statistics.c:264
- #, c-format
--msgid "%d ICMP messages failed"
--msgstr "po�et chybn�ch ICMP zpr�v: %d"
-+msgid "Detected reordering %u times using time stamp"
-+msgstr "Kolikrát byla nalezena změna pořadí pomocí časového razítka: %u"
- 
--#: ../statistics.c:102
-+#: ../statistics.c:265
- #, c-format
--msgid "time exceeded: %d"
--msgstr "vypr�en� �ivotnosti: %d"
-+msgid "Detected reordering %u times using reno fast retransmit"
-+msgstr ""
-+"Kolikrát byla nalezena změna pořadí kvůli rychlému znovuodeslání Reno: %u"
- 
--#. ?
--#: ../statistics.c:104
-+#: ../statistics.c:266
- #, c-format
--msgid "source quench: %d"
--msgstr "��zen� toku dat: %d"
-+msgid "%u congestion windows fully recovered without slow start"
-+msgstr "Počet plných zotavení ze zahlcení okna bez pomalého startu: %u"
- 
--#: ../statistics.c:105
-+#: ../statistics.c:267
- #, c-format
--msgid "redirect: %d"
--msgstr "zm�na cesty: %d"
-+msgid "%u congestion windows partially recovered using Hoe heuristic"
-+msgstr "Počet částečných zotavení ze zahlcení okna pomocí heuristiky Hoe: %u"
- 
--#: ../statistics.c:106
-+#: ../statistics.c:268
- #, c-format
--msgid "echo request: %d"
--msgstr "��dost o echo: %d"
-+msgid "%u congestion window recovered without slow start using DSACK"
-+msgstr "Počet zotavení ze zahlceného okna bez pomalého startu pomocí DSACK: %u"
- 
--#: ../statistics.c:108
-+#: ../statistics.c:269
- #, c-format
--msgid "timestamp requests: %d"
--msgstr "��dost o �as: %d"
-+msgid "%u congestion windows recovered without slow start after partial ack"
-+msgstr ""
-+"Počet zotavení ze zahlcení okna bez pomalého startu po částečném potvrzení: %"
-+"u"
- 
--#: ../statistics.c:109
-+#: ../statistics.c:270
- #, c-format
--msgid "timestamp replies: %d"
--msgstr "odpov�� na ��dost o �as: %d"
-+msgid "%u retransmits lost"
-+msgstr "Počet ztracených opakovaných odeslání: %u"
- 
--#: ../statistics.c:110
-+#: ../statistics.c:271
- #, c-format
--msgid "address mask requests: %d"
--msgstr "��dost o masku pods�t�: %d"
-+msgid "%u timeouts after reno fast retransmit"
-+msgstr "Počet vypršení času po rychlém opakovaném odeslání Reno: %u"
- 
--#: ../statistics.c:111
-+#: ../statistics.c:272
- #, c-format
--msgid "address mask replies: %d"
--msgstr "odpov�� na ��dost o masku pods�t�: %d"
-+msgid "%u timeouts after SACK recovery"
-+msgstr "Počet vypršení času po zotavení pomocí SACK: %u"
- 
--#: ../statistics.c:116
-+#: ../statistics.c:273
- #, c-format
--msgid "RTO algorithm is %s"
--msgstr "RTO algoritmus je %s"
-+msgid "%u timeouts in loss state"
-+msgstr "Počet vypršení času ve stavu ztráty: %u"
- 
--#: ../statistics.c:120
-+#: ../statistics.c:274
- #, c-format
--msgid "%d active connections openings"
--msgstr "po�et aktivn� nav�zan�ch spojen�: %d"
-+msgid "%u fast retransmits"
-+msgstr "Počet rychlých opakování odeslání: %u"
- 
--#: ../statistics.c:121
-+#: ../statistics.c:275
- #, c-format
--msgid "%d passive connection openings"
--msgstr "po�et pasivn� nav�zan�ch spojen�: %d"
-+msgid "%u forward retransmits"
-+msgstr "Počet dopředných opakovaných odeslání: %u"
- 
--#: ../statistics.c:122
-+#: ../statistics.c:276
- #, c-format
--msgid "%d failed connection attempts"
--msgstr "po�et ne�sp�n�ch pokus� o spojen�: %d"
-+msgid "%u retransmits in slow start"
-+msgstr "Počet opakovaných odeslání v pomalém startu: %u"
- 
--#: ../statistics.c:123
-+#: ../statistics.c:277
- #, c-format
--msgid "%d connection resets received"
--msgstr "po�et p�ijmut�ch reset�: %d"
-+msgid "%u other TCP timeouts"
-+msgstr "Počet jiných vypršení časovače TCP: %u"
- 
--#: ../statistics.c:124
-+#: ../statistics.c:278
- #, c-format
--msgid "%d connections established"
--msgstr "po�et nav�zan�ch spojen�: %d"
-+msgid "%u reno fast retransmits failed"
-+msgstr "Počet selhání rychlých opakovaných odeslání Reno: %u"
- 
--#: ../statistics.c:125
-+#: ../statistics.c:279
- #, c-format
--msgid "%d segments received"
--msgstr "po�et p�ijmut�ch segment�: %d"
-+msgid "%u SACK retransmits failed"
-+msgstr "Počet selhání opakovaných odeslání SACK: %u"
- 
--#: ../statistics.c:126
-+#: ../statistics.c:280
- #, c-format
--msgid "%d segments send out"
--msgstr "po�et odeslan�ch segment�: %d"
-+msgid "%u times receiver scheduled too late for direct processing"
-+msgstr "Kolikrát byl přijímač naplánován příliš pozdě na přímé zpracovaní: %u"
- 
--#: ../statistics.c:127
-+#: ../statistics.c:281
- #, c-format
--msgid "%d segments retransmited"
--msgstr "po�et p�enesen�ch segment�: %d"
-+msgid "%u packets collapsed in receive queue due to low socket buffer"
-+msgstr ""
-+"Počet packetů sloučených v přijímací frontě kvůli malému bufferu socketu: %u"
- 
--#: ../statistics.c:128
-+#: ../statistics.c:282
- #, c-format
--msgid "%d bad segments received."
--msgstr "po�et chybn�ch p��choz�ch segment�: %d."
-+msgid "%u DSACKs sent for old packets"
-+msgstr "Počet packetů DSACK odeslaných kvůli starým packetům: %u"
- 
--#: ../statistics.c:129
-+#: ../statistics.c:283
- #, c-format
--msgid "%d resets sent"
--msgstr "po�et odeslan�ch reset�: %d"
-+msgid "%u DSACKs sent for out of order packets"
-+msgstr "Počet packetů DSCACK odeslaných kvůli packetům mimo pořadí: %u"
- 
--#: ../statistics.c:134
-+#: ../statistics.c:284
- #, c-format
--msgid "%d packets received"
--msgstr "po�et p�ijmut�ch paket�: %d"
-+msgid "%u DSACKs received"
-+msgstr "Počet přijatých paketů DSACK: %u"
- 
--#: ../statistics.c:135
-+#: ../statistics.c:285
- #, c-format
--msgid "%d packets to unknown port received."
--msgstr "po�et paket� p�ijmut�ch pro nezn�m� port: %d."
-+msgid "%u DSACKs for out of order packets received"
-+msgstr "Počet packetů DSACK přijatých kvůli packetům mimo pořadí: %u"
- 
--#: ../statistics.c:136
-+#: ../statistics.c:286
- #, c-format
--msgid "%d packet receive errors"
--msgstr "po�et chyb p�i p��jmu paket�: %d"
-+msgid "%u connections reset due to unexpected SYN"
-+msgstr "Počet resetů spojení kvůli neočekávanému SYN: %u"
- 
--#: ../statistics.c:137
-+#: ../statistics.c:287
- #, c-format
--msgid "%d packets sent"
--msgstr "po�et odeslan�ch paket�: %d"
-+msgid "%u connections reset due to unexpected data"
-+msgstr "Počet resetů spojení kvůli neočekávaným datům: %u"
- 
--#: ../statistics.c:142
-+#: ../statistics.c:288
- #, c-format
--msgid "%d SYN cookies sent"
--msgstr "po�et odeslan�ch SYN cookies: %d"
-+msgid "%u connections reset due to early user close"
-+msgstr "Počet resetů spojení kvůli časnému uzavření uživatelem: %u"
- 
--#: ../statistics.c:143
-+#: ../statistics.c:289
- #, c-format
--msgid "%d SYN cookies received"
--msgstr "po�et p�ijmut�ch SYN cookies: %d"
-+msgid "%u connections aborted due to memory pressure"
-+msgstr "Počet zrušených spojení kvůli paměťové tísni: %u"
- 
--#: ../statistics.c:144
-+#: ../statistics.c:290
- #, c-format
--msgid "%d invalid SYN cookies received"
--msgstr "po�et chybn�ch p��choz�ch SYN cookies: %d"
-+msgid "%u connections aborted due to timeout"
-+msgstr "Počet zrušených spojení kvůli vypršení časovače: %u"
- 
--#: ../statistics.c:146
-+#: ../statistics.c:291
- #, c-format
--msgid "%d resets received for embryonic SYN_RECV sockets"
--msgstr "po�et reset� p�ijmut�ch pro sokety ve stavu SYN_P��CH: %d"
-+msgid "%u connections aborted after user close in linger timeout"
-+msgstr ""
-+"Počet zrušených spojení po té, co je uživatel uzavřel ve fázi dožití: %u"
- 
--#: ../statistics.c:148
-+#: ../statistics.c:292
- #, c-format
--msgid "%d packets pruned from receive queue because of socket buffer overrun"
--msgstr "po�et paket� odstran�n�ch z fronty kv�li p�ete�en� bufferu soketu: %d"
-+msgid "%u times unabled to send RST due to no memory"
-+msgstr "Kolikrát nebylo možné odeslat RST kvůli nedostatku paměti: %u"
- 
--#. obsolete: 2.2.0 doesn't do that anymore
--#: ../statistics.c:151
-+#: ../statistics.c:293
- #, c-format
--msgid "%d packets pruned from out-of-order queue"
--msgstr "po�et paket� odstran�n�ch z fronty mimo-po�ad�: %d"
-+msgid "TCP ran low on memory %u times"
-+msgstr "Kolikrát TCP zpomalilo kvůli paměti: %u"
- 
--#: ../statistics.c:152
-+#: ../statistics.c:294
- #, c-format
--msgid ""
--"%d packets dropped from out-of-order queue because of socket buffer overrun"
--msgstr ""
--"po�et paket� zahozen�ch z fronty mimo-po�ad� kv�li p�ete�en� bufferu soketu: "
--"%d"
-+msgid "%u TCP data loss events"
-+msgstr "Počet ztrát dat TCP: %u"
- 
--#: ../statistics.c:154
-+#: ../statistics.c:295
- #, c-format
--msgid "%d ICMP packets dropped because they were out-of-window"
--msgstr "po�et ICMP paket� zahozen�ch, proto�e byly mimo-okno: %d"
-+msgid "%u congestion windows recovered without slow start by DSACK"
-+msgstr "Počet zotavení ze zahlcení okna bez pomalého startu pomocí DSACK: %u"
- 
--#: ../statistics.c:156
-+#: ../statistics.c:297
- #, c-format
--msgid "%d ICMP packets dropped because socket was locked"
--msgstr "po�et ICMP paket� zahozen�ch kv�li zam�en�mu soketu: %d"
-+msgid "%u classic Reno fast retransmits failed"
-+msgstr "Počet selhání klasického rychlého opakovaného odeslání Reno: %u"
- 
--#: ../statistics.c:222
-+#: ../statistics.c:373
- msgid "enabled"
- msgstr "zapnuto"
- 
--#: ../statistics.c:222
-+#: ../statistics.c:373
- msgid "disabled"
- msgstr "vypnuto"
- 
--#: ../statistics.c:272
-+#: ../statistics.c:511 ../statistics.c:555
-+msgid "cannot open /proc/net/snmp"
-+msgstr "/proc/net/snmp nelze otevřít"
-+
-+#: ../statistics.c:516
- #, c-format
--msgid "unknown title %s\n"
--msgstr "titulek %s je nezn�m�\n"
-+msgid "Problem while parsing /proc/net/snmp\n"
-+msgstr "Potíže při při zpracování /proc/net/snmp\n"
- 
--#: ../statistics.c:298
--msgid "error parsing /proc/net/snmp"
--msgstr "chyba p�i zpracov�n� /proc/net/snmp"
-+#: ../statistics.c:527
-+#, c-format
-+msgid "Problem while parsing /proc/net/netstat\n"
-+msgstr "Potíže při při zpracování /proc/net/netstat\n"
- 
--#: ../statistics.c:311
--msgid "cannot open /proc/net/snmp"
--msgstr "/proc/net/snmp nelze otev��t"
-+#: ../statistics.c:545
-+msgid "cannot open /proc/net/snmp6"
-+msgstr "/proc/net/snmp6 nelze otevřít"
- 
- #: ../lib/activate.c:69
- #, c-format
- msgid "Hardware type `%s' not supported.\n"
--msgstr "Hardwarov� typ `%s' nen� podporov�n.\n"
-+msgstr "Hardwarový typ „%s“ není podporován.\n"
- 
- #: ../lib/activate.c:73
- #, c-format
- msgid "Cannot change line discipline to `%s'.\n"
--msgstr "Linkovou discipl�nu nelze na `%s' zm�nit.\n"
-+msgstr "Linkovou disciplínu nelze na „%s“ změnit.\n"
- 
--#: ../lib/af.c:145 ../lib/hw.c:148
-+#: ../lib/af.c:157 ../lib/hw.c:166
- msgid "UNSPEC"
--msgstr "NEZN�M"
-+msgstr "NEZNÁM"
- 
--#: ../lib/af.c:147
-+#: ../lib/af.c:159
- msgid "UNIX Domain"
--msgstr "Dom�na UNIX"
-+msgstr "Doména UNIX"
- 
--#: ../lib/af.c:150
-+#: ../lib/af.c:162
- msgid "DARPA Internet"
- msgstr "DARPA Internet"
- 
--#: ../lib/af.c:153
-+#: ../lib/af.c:165
- msgid "IPv6"
- msgstr "IPv6"
- 
--#: ../lib/af.c:156 ../lib/hw.c:169
-+#: ../lib/af.c:168 ../lib/hw.c:187
- msgid "AMPR AX.25"
- msgstr "AMPR AX.25"
- 
--#: ../lib/af.c:159 ../lib/hw.c:175
-+#: ../lib/af.c:171 ../lib/hw.c:193
- msgid "AMPR NET/ROM"
- msgstr "AMPR NET/ROM"
- 
--#: ../lib/af.c:162
-+#: ../lib/af.c:174
- msgid "Novell IPX"
- msgstr "Novell IPX"
- 
--#: ../lib/af.c:165
-+#: ../lib/af.c:177
- msgid "Appletalk DDP"
- msgstr "Appletalk DDP"
- 
--#: ../lib/af.c:168 ../lib/hw.c:207
-+#: ../lib/af.c:180 ../lib/hw.c:228
- msgid "Econet"
- msgstr "Econet"
- 
--#: ../lib/af.c:171 ../lib/hw.c:172
-+#: ../lib/af.c:183
-+msgid "CCITT X.25"
-+msgstr "CCITT X.25"
-+
-+#: ../lib/af.c:186 ../lib/hw.c:190
- msgid "AMPR ROSE"
- msgstr "AMPR ROSE"
- 
--#: ../lib/af.c:174 ../lib/hw.c:160
-+#: ../lib/af.c:189 ../lib/hw.c:178
- msgid "Ash"
- msgstr "Ash"
- 
--#: ../lib/af.c:232
-+#: ../lib/af.c:247
-+#, c-format
- msgid "Please don't supply more than one address family.\n"
--msgstr "Nezad�vejte v�ce ne� jednu t��du adres.\n"
-+msgstr "Nezadávejte více než jednu třídu adres.\n"
- 
--#: ../lib/af.c:293
-+#: ../lib/af.c:308
-+#, c-format
- msgid "Too much address family arguments.\n"
--msgstr "Bylo zad�no p��li� mnoho t��d adres.\n"
-+msgstr "Bylo zadáno příliš mnoho tříd adres.\n"
- 
--#: ../lib/af.c:304
-+#: ../lib/af.c:319
- #, c-format
- msgid "Unknown address family `%s'.\n"
--msgstr "T��da adres `%s' nen� zn�ma.\n"
--
--#: ../lib/arcnet.c:53 ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52
--#: ../lib/fddi.c:67 ../lib/hippi.c:68 ../lib/inet.c:244 ../lib/inet.c:259
--#: ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78 ../lib/rose.c:71
--#: ../lib/rose.c:126 ../lib/unix.c:56 ../lib/unix.c:76
--msgid "[NONE SET]"
--msgstr "[NENASTAVENO]"
-+msgstr "Třída adres `%s' není známa.\n"
- 
--#: ../lib/arcnet.c:81 ../lib/arcnet.c:96
-+#: ../lib/arcnet.c:70 ../lib/arcnet.c:85
- #, c-format
- msgid "in_arcnet(%s): invalid arcnet address!\n"
--msgstr "in_arcnet(%s): chybn� arcnet adresa!\n"
-+msgstr "in_arcnet(%s): chybná arcnet adresa!\n"
- 
--#: ../lib/arcnet.c:108
-+#: ../lib/arcnet.c:97
- #, c-format
- msgid "in_arcnet(%s): trailing : ignored!\n"
--msgstr "in_arcnet(%s): nadbyte�n� : ignorov�no!\n"
-+msgstr "in_arcnet(%s): nadbytečné : ignorováno!\n"
- 
--#: ../lib/arcnet.c:120
-+#: ../lib/arcnet.c:109
- #, c-format
- msgid "in_arcnet(%s): trailing junk!\n"
--msgstr "in_arcnet(%s): nadbyte�n� znaky!\n"
-+msgstr "in_arcnet(%s): nadbytečné znaky!\n"
- 
- #: ../lib/ash.c:81
-+#, c-format
- msgid "Malformed Ash address"
--msgstr "Chybn� Ash adresa"
-+msgstr "Chybná Ash adresa"
-+
-+#: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
-+#: ../lib/inet.c:259 ../lib/inet6.c:145 ../lib/ipx.c:81 ../lib/netrom.c:78
-+#: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
-+msgid "[NONE SET]"
-+msgstr "[NENASTAVENO]"
- 
- #: ../lib/ax25.c:97 ../lib/netrom.c:100
- msgid "Invalid callsign"
--msgstr "Nespr�vn� volac� znak"
-+msgstr "Nesprávný volací znak"
- 
- #: ../lib/ax25.c:110 ../lib/netrom.c:113
- msgid "Callsign too long"
--msgstr "Volac� znak je p��li� dlouh�."
-+msgstr "Volací znak je příliš dlouhý."
- 
- #: ../lib/ax25_gr.c:47
-+#, c-format
- msgid "AX.25 not configured in this system.\n"
--msgstr "AX.25 nen� na tomto syst�mu nakonfigurov�no.\n"
-+msgstr "AX.25 není na tomto systému nakonfigurováno.\n"
- 
- #: ../lib/ax25_gr.c:50
-+#, c-format
- msgid "Kernel AX.25 routing table\n"
--msgstr "Sm�rovac� tabulka v j�dru pro AX.25\n"
-+msgstr "Směrovací tabulka v jádru pro AX.25\n"
- 
- #. xxx
- #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-+#, c-format
- msgid "Destination  Iface    Use\n"
--msgstr "Adres�t      Rozhran� U�it�\n"
--
--#: ../lib/ddp_gr.c:21
--msgid "Routing table for `ddp' not yet supported.\n"
--msgstr "Sm�rovac� tabulka pro `ddp' nen� zat�m podporov�na.\n"
-+msgstr "Adresát      Rozhraní Užití\n"
- 
- #: ../lib/ether.c:74 ../lib/ether.c:91
- #, c-format
- msgid "in_ether(%s): invalid ether address!\n"
--msgstr "in_ether(%s): chybn� ethernetov� adresa!\n"
-+msgstr "in_ether(%s): chybná ethernetová adresa!\n"
- 
- #: ../lib/ether.c:105
- #, c-format
- msgid "in_ether(%s): trailing : ignored!\n"
--msgstr "in_ether(%s): nadbyte�n� : ignorov�no!\n"
-+msgstr "in_ether(%s): nadbytečné : ignorováno!\n"
- 
- #: ../lib/ether.c:117
- #, c-format
- msgid "in_ether(%s): trailing junk!\n"
--msgstr "in_ether(%s): nadbyte�n� znaky!\n"
-+msgstr "in_ether(%s): nadbytečné znaky!\n"
- 
--#: ../lib/fddi.c:95 ../lib/fddi.c:110
-+#: ../lib/fddi.c:84 ../lib/fddi.c:99
- #, c-format
- msgid "in_fddi(%s): invalid fddi address!\n"
--msgstr "in_fddi(%s): chybn� fddi adresa!\n"
-+msgstr "in_fddi(%s): chybná fddi adresa!\n"
- 
--#: ../lib/fddi.c:122
-+#: ../lib/fddi.c:111
- #, c-format
- msgid "in_fddi(%s): trailing : ignored!\n"
--msgstr "in_fddi(%s): nadbyte�n� : ignorov�no!\n"
-+msgstr "in_fddi(%s): nadbytečné : ignorováno!\n"
- 
--#: ../lib/fddi.c:134
-+#: ../lib/fddi.c:123
- #, c-format
- msgid "in_fddi(%s): trailing junk!\n"
--msgstr "in_fddi(%s): nadbyte�n� znaky!\n"
-+msgstr "in_fddi(%s): nadbytečné znaky!\n"
- 
--#: ../lib/getroute.c:97 ../lib/setroute.c:76
-+#: ../lib/getroute.c:101 ../lib/setroute.c:80
- #, c-format
- msgid "Address family `%s' not supported.\n"
--msgstr "T��da adres `%s' nen� podporov�na.\n"
-+msgstr "Třída adres `%s' není podporována.\n"
- 
--#: ../lib/getroute.c:103 ../lib/setroute.c:80
-+#: ../lib/getroute.c:107 ../lib/setroute.c:84
- #, c-format
- msgid "No routing for address family `%s'.\n"
--msgstr "Pro t��du adres `%s' nen� ��dn� sm�rov�n�.\n"
-+msgstr "Pro třídu adres `%s' není žádné směrování.\n"
- 
--#: ../lib/hippi.c:96 ../lib/hippi.c:111
-+#: ../lib/hippi.c:84 ../lib/hippi.c:99
- #, c-format
- msgid "in_hippi(%s): invalid hippi address!\n"
--msgstr "in_hippi(%s): chybn� hippi adresa!\n"
-+msgstr "in_hippi(%s): chybná hippi adresa!\n"
- 
--#: ../lib/hippi.c:123
-+#: ../lib/hippi.c:111
- #, c-format
- msgid "in_hippi(%s): trailing : ignored!\n"
--msgstr "in_hippi(%s): nadbyte�n� : ignorov�no!\n"
-+msgstr "in_hippi(%s): nadbytečné : ignorováno!\n"
- 
--#: ../lib/hippi.c:134
-+#: ../lib/hippi.c:122
- #, c-format
- msgid "in_hippi(%s): trailing junk!\n"
--msgstr "in_hippi(%s): nadbyte�n� znaky!\n"
-+msgstr "in_hippi(%s): nadbytečné znaky!\n"
- 
--#: ../lib/hw.c:147
-+#: ../lib/hw.c:165
- msgid "Local Loopback"
--msgstr "M�stn� smy�ka"
-+msgstr "Místní smyčka"
- 
--#: ../lib/hw.c:150
-+#: ../lib/hw.c:168
- msgid "Serial Line IP"
--msgstr "IP po s�riov� lince"
-+msgstr "IP po sériové lince"
- 
--#: ../lib/hw.c:151
-+#: ../lib/hw.c:169
- msgid "VJ Serial Line IP"
--msgstr "Vj IP po s�riov� lince"
-+msgstr "VJ IP po sériové lince"
- 
--#: ../lib/hw.c:152
-+#: ../lib/hw.c:170
- msgid "6-bit Serial Line IP"
--msgstr "6bitov� IP po s�riov� lince"
-+msgstr "6bitový IP po sériové lince"
- 
--#: ../lib/hw.c:153
-+#: ../lib/hw.c:171
- msgid "VJ 6-bit Serial Line IP"
--msgstr "6bitov� VJ IP po s�riov� lince"
-+msgstr "6bitový VJ IP po sériové lince"
- 
--#: ../lib/hw.c:154
-+#: ../lib/hw.c:172
- msgid "Adaptive Serial Line IP"
--msgstr "Adaptivn� IP po s�riov� lince"
-+msgstr "Adaptivní IP po sériové lince"
- 
--#: ../lib/hw.c:157
-+#: ../lib/hw.c:175
- msgid "Ethernet"
- msgstr "Ethernet"
- 
--#: ../lib/hw.c:163
-+#: ../lib/hw.c:181
- msgid "Fiber Distributed Data Interface"
- msgstr "Fiber Distributed Data Interface"
- 
--#: ../lib/hw.c:166
-+#: ../lib/hw.c:184
- msgid "HIPPI"
- msgstr "HIPPI"
- 
--#: ../lib/hw.c:178
-+#: ../lib/hw.c:196
-+msgid "generic X.25"
-+msgstr "obecné X.25"
-+
-+#: ../lib/hw.c:199
- msgid "IPIP Tunnel"
- msgstr "IPIP Tunnel"
- 
--#: ../lib/hw.c:181
-+#: ../lib/hw.c:202
- msgid "Point-to-Point Protocol"
--msgstr "Point-to-Point Protokol"
-+msgstr "Dvoubodový protokol"
- 
--#: ../lib/hw.c:184
-+#: ../lib/hw.c:205
- msgid "(Cisco)-HDLC"
- msgstr "(Cisco)-HDLC"
- 
--#: ../lib/hw.c:185
-+#: ../lib/hw.c:206
- msgid "LAPB"
- msgstr "LAPB"
- 
--#: ../lib/hw.c:188
-+#: ../lib/hw.c:209
- msgid "ARCnet"
- msgstr "ARCnet"
- 
--#: ../lib/hw.c:191
-+#: ../lib/hw.c:212
- msgid "Frame Relay DLCI"
- msgstr "Frame Relay DLCI"
- 
--#: ../lib/hw.c:192
-+#: ../lib/hw.c:213
- msgid "Frame Relay Access Device"
--msgstr "P��stupov� za��zen� Frame Relay"
-+msgstr "Přístupové zařízení Frame Relay"
- 
--#: ../lib/hw.c:195
-+#: ../lib/hw.c:216
- msgid "IPv6-in-IPv4"
- msgstr "IPv6-in-IPv4"
- 
--#: ../lib/hw.c:198
-+#: ../lib/hw.c:219
- msgid "IrLAP"
- msgstr "IrLAP"
- 
--#: ../lib/hw.c:201
-+#: ../lib/hw.c:222
- msgid "16/4 Mbps Token Ring"
- msgstr "Token Ring 16/4 Mb/s"
- 
--#: ../lib/hw.c:203
--#, fuzzy
-+#: ../lib/hw.c:224
- msgid "16/4 Mbps Token Ring (New)"
--msgstr "Token Ring 16/4 Mb/s"
-+msgstr "Token Ring 16/4 Mb/s (Nový)"
- 
--#: ../lib/inet.c:153 ../lib/inet6.c:79
-+#: ../lib/hw.c:231
-+msgid "InfiniBand"
-+msgstr "InfiniBand"
-+
-+#: ../lib/hw.c:234
-+msgid "Generic EUI-64"
-+msgstr "Obecné EUI-64"
-+
-+#: ../lib/inet.c:153 ../lib/inet6.c:94
- #, c-format
- msgid "rresolve: unsupport address family %d !\n"
--msgstr "rresolve: t��da adres %d nen� podporov�na!\n"
-+msgstr "rresolve: třída adres %d není podporována!\n"
- 
--#: ../lib/inet6_gr.c:79
-+#: ../lib/inet6.c:147
-+msgid "[UNKNOWN]"
-+msgstr "[NEZNÁMÝ]"
-+
-+#: ../lib/inet6_gr.c:71
-+#, c-format
- msgid "INET6 (IPv6) not configured in this system.\n"
--msgstr "INET6 (IPv6) nen� na tomto syst�mu nakonfigurov�no.\n"
-+msgstr "INET6 (IPv6) není na tomto systému nakonfigurováno.\n"
- 
--#: ../lib/inet6_gr.c:82
-+#: ../lib/inet6_gr.c:76
-+#, c-format
-+msgid "Kernel IPv6 routing cache\n"
-+msgstr "Směrovací cache v jádru pro IPv6\n"
-+
-+#: ../lib/inet6_gr.c:78
-+#, c-format
- msgid "Kernel IPv6 routing table\n"
--msgstr "Sm�rovac� tabulka v j�dru pro IPv6\n"
-+msgstr "Směrovací tabulka v jádru pro IPv6\n"
- 
--#: ../lib/inet6_gr.c:84
-+#: ../lib/inet6_gr.c:80
-+#, c-format
- msgid ""
--"Destination                                 Next Hop                         "
--"       Flags Metric Ref    Use Iface\n"
-+"Destination                    Next Hop                   Flag Met Ref Use "
-+"If\n"
- msgstr ""
--"Adres�t                                     Dal�� Sm�rova�                   "
--"       P��zn Metrika Odkaz U�it Rozhran�\n"
-+"Adresát                        Další směrovač             Příz Met Odk Užt "
-+"Rozhr\n"
- 
--#: ../lib/inet6_gr.c:158
-+#: ../lib/inet6_gr.c:174
-+#, c-format
- msgid "Kernel IPv6 Neighbour Cache\n"
--msgstr "Cache soused� v j�dru pro IPv6\n"
-+msgstr "Cache sousedů v jádru pro IPv6\n"
- 
--#: ../lib/inet6_gr.c:161
-+#: ../lib/inet6_gr.c:177
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State\n"
- msgstr ""
--"Soused                                      HW Adresa         Rozhran� P��zn "
-+"Soused                                      HW Adresa         Rozhraní Přízn "
- "Odkazy Stav\n"
- 
--#: ../lib/inet6_gr.c:165
-+#: ../lib/inet6_gr.c:181
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State            Stale(sec) Delete(sec)\n"
- msgstr ""
--"Soused                                      HW Adresa         Rozhran� "
--"P��znaky Odkazy Stav          Pro�l�(sec) Smazat(sec)\n"
-+"Soused                                      HW Adresa         Rozhraní "
-+"Příznaky Odkazy Stav          Prošlý(sec) Smazat(sec)\n"
- 
- #: ../lib/inet6_sr.c:46
-+#, c-format
- msgid "Usage: inet6_route [-vF] del Target\n"
--msgstr "Pou�it�: inet6_route [-vF] del C�l\n"
-+msgstr "Použití: inet6_route [-vF] del Cíl\n"
- 
- #: ../lib/inet6_sr.c:47
-+#, c-format
- msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
--msgstr "       inet6_route [-vF] add C�l [gw Gw] [metrika M] [[dev] If]\n"
-+msgstr "       inet6_route [-vF] add Cíl [gw Gw] [metrika M] [[dev] If]\n"
- 
- #: ../lib/inet6_sr.c:48
-+#, c-format
- msgid "       inet6_route [-FC] flush      NOT supported\n"
--msgstr "       inet6_route [-FC] flush      NEN� podporov�no\n"
-+msgstr "       inet6_route [-FC] flush      NENÍ podporováno\n"
- 
--#: ../lib/inet6_sr.c:182
-+#: ../lib/inet6_sr.c:188
-+#, c-format
- msgid "Flushing `inet6' routing table not supported\n"
--msgstr "Sm�rovac� tabulku `inet6' nelze vyprazd�ovat\n"
-+msgstr "Směrovací tabulku `inet6' nelze vyprazdňovat\n"
- 
- #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-+#, c-format
- msgid "INET (IPv4) not configured in this system.\n"
--msgstr "INET (IPv4) nen� na tomto syst�mu nakonfigurov�no.\n"
-+msgstr "INET (IPv4) není na tomto systému nakonfigurováno.\n"
- 
- #: ../lib/inet_gr.c:53
-+#, c-format
- msgid "Kernel IP routing table\n"
--msgstr "Sm�rovac� tabulka v j�dru pro IP\n"
-+msgstr "Směrovací tabulka v jádru pro IP\n"
- 
- #: ../lib/inet_gr.c:56
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface\n"
- msgstr ""
--"Adres�t         Br�na           Maska           P��zn Metrik Odkaz  U�t "
--"Rozhran�\n"
-+"Adresát         Brána           Maska           Přízn Metrik Odkazů Užt "
-+"Rozhraní\n"
- 
- #: ../lib/inet_gr.c:59
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
- "Iface\n"
- msgstr ""
--"Adres�t         Br�na           Maska           P��zn   MSS Okno    irtt "
--"Rozhran�\n"
-+"Adresát         Brána           Maska           Přízn   MSS Okno    irtt "
-+"Rozhraní\n"
- 
- #: ../lib/inet_gr.c:62
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt\n"
- msgstr ""
--"Adres�t         Br�na           Maska           P��zn Metrik Odkazy U�t "
--"Rozhran� MSS   Okno   irtt\n"
-+"Adresát         Brána           Maska           Přízn Metrik Odkazy Užt "
-+"Rozhraní MSS   Okno   irtt\n"
- 
- #: ../lib/inet_gr.c:237
-+#, c-format
- msgid "Kernel IP routing cache\n"
--msgstr "Sm�rovac� cache v j�dru pro IP\n"
-+msgstr "Směrovací cache v jádru pro IP\n"
- 
- #: ../lib/inet_gr.c:258
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface\n"
- msgstr ""
--"Odes�latel      Adres�t         Maska           P��zn Metrik Odkazy U�t "
--"Rozhran�\n"
-+"Odesílatel      Adresát         Maska           Přízn Metrik Odkazy Užt "
-+"Rozhraní\n"
- 
- #: ../lib/inet_gr.c:261
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags   MSS Window  irtt "
- "Iface\n"
- msgstr ""
--"Odes�latel      Adres�t         Maska           P��zn   MSS Okno    irtt "
--"Rozhran�\n"
-+"Odesílatel      Adresát         Maska           Přízn   MSS Okno    irtt "
-+"Rozhraní\n"
- 
- #: ../lib/inet_gr.c:266
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  HH  Arp\n"
- msgstr ""
--"Odes�latel      Adres�t         Maska           P��zn Metrik Odkazy U�t "
--"Rozhran� MSS   Okno   irtt HH   Arp\n"
-+"Odesílatel      Adresát         Maska           Přízn Metrik Odkazy Užt "
-+"Rozhraní MSS   Okno   irtt HH   Arp\n"
- 
- #: ../lib/inet_gr.c:290
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
- msgstr ""
--"Odes�latel      Adres�t         Maska           P��zn Metrik Odkazy U�t "
--"Rozhran� MSS    Okno irtt   TOS HHOdk HHAktu�l    Zvl�tC�l\n"
-+"Odesílatel      Adresát         Maska           Přízn Metrik Odkazy Užt "
-+"Rozhraní MSS    Okno irtt   TOS HHOdk HHAktuál    ZvláštCíl\n"
- 
--#: ../lib/inet_sr.c:50
-+#: ../lib/inet_sr.c:51
-+#, c-format
- msgid ""
- "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
- "[[dev] If]\n"
- msgstr ""
--"Pou�it�: inet_route [-vF] del {-host|-net} C�l[/prefix] [gw Gw] [metrika M] "
-+"Použití: inet_route [-vF] del {-host|-net} Cíl[/prefix] [gw Gw] [metrika M] "
- "[[dev] If]\n"
- 
--#: ../lib/inet_sr.c:51
-+#: ../lib/inet_sr.c:52
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
- msgstr ""
--"       inet_route [-vF] add {-host|-net} C�l[/prefix] [gw Gw] [metrika M]\n"
-+"       inet_route [-vF] add {-host|-net} Cíl[/prefix] [gw Gw] [metrika M]\n"
- 
--#: ../lib/inet_sr.c:52
-+#: ../lib/inet_sr.c:53
-+#, c-format
- msgid ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- msgstr ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- 
--#: ../lib/inet_sr.c:53
-+#: ../lib/inet_sr.c:54
-+#, c-format
- msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- msgstr "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- 
--#: ../lib/inet_sr.c:54
-+#: ../lib/inet_sr.c:55
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
- msgstr ""
--"       inet_route [-vF] add {-host|-net} C�l/[prefix] [metrika M] reject\n"
-+"       inet_route [-vF] add {-host|-net} Cíl/[prefix] [metrika M] reject\n"
- 
--#: ../lib/inet_sr.c:55
-+#: ../lib/inet_sr.c:56
-+#, c-format
- msgid "       inet_route [-FC] flush      NOT supported\n"
--msgstr "       inet_route [-FC] flush      NEN� podporov�no\n"
-+msgstr "       inet_route [-FC] flush      NENÍ podporováno\n"
- 
- #: ../lib/inet_sr.c:158
- #, c-format
- msgid "route: %s: cannot use a NETWORK as gateway!\n"
--msgstr "route: %s: s�� nelze pou��t jako br�nu!\n"
-+msgstr "route: %s: síť nelze použít jako bránu!\n"
- 
- #: ../lib/inet_sr.c:174
--#, fuzzy
-+#, c-format
- msgid "route: Invalid MSS/MTU.\n"
--msgstr "route: Nespr�vn� NSS.\n"
-+msgstr "route: Neplatné MSS/MTU.\n"
- 
- #: ../lib/inet_sr.c:187
-+#, c-format
- msgid "route: Invalid window.\n"
--msgstr "route: Nespr�vn� okno.\n"
-+msgstr "route: Nesprávné okno.\n"
- 
- #: ../lib/inet_sr.c:203
-+#, c-format
- msgid "route: Invalid initial rtt.\n"
--msgstr "route: Nespr�vn� zahajovac� rtt.\n"
-+msgstr "route: Nesprávné zahajovací rtt.\n"
- 
- #: ../lib/inet_sr.c:261
- #, c-format
- msgid "route: netmask %.8x doesn't make sense with host route\n"
--msgstr "route: s��ov� maska %.8x ned�v� smysl, kdy� c�lem je cesty po��ta�\n"
-+msgstr "route: síťová maska %.8x nedává smysl, když cílem je cesty počítač\n"
- 
- #: ../lib/inet_sr.c:265
- #, c-format
- msgid "route: bogus netmask %s\n"
--msgstr "route: s��ov� maska %s je nespr�vn�\n"
-+msgstr "route: síťová maska %s je nesprávná\n"
- 
- #: ../lib/inet_sr.c:270
-+#, c-format
- msgid "route: netmask doesn't match route address\n"
--msgstr "route: s��ov� maska nevyhovuje adrese cesty\n"
-+msgstr "route: síťová maska nevyhovuje adrese cesty\n"
- 
- #: ../lib/inet_sr.c:306
-+#, c-format
- msgid "Flushing `inet' routing table not supported\n"
--msgstr "Sm�rovac� cache `inet' nelze vyprazd�ovat\n"
-+msgstr "Směrovací cache `inet' nelze vyprazdňovat\n"
- 
- #: ../lib/inet_sr.c:310
-+#, c-format
- msgid "Modifying `inet' routing cache not supported\n"
--msgstr "Sm�rovac� cache `inet' nelze m�nit\n"
-+msgstr "Směrovací cache `inet' nelze měnit\n"
- 
--#: ../lib/ipx_gr.c:52
--msgid "IPX not configured in this system.\n"
--msgstr "IPX nen� na tomto syst�mu nakonfigurov�no.\n"
-+#: ../lib/ipx_gr.c:53
-+#, c-format
-+msgid "IPX routing not in file %s or %s found.\n"
-+msgstr "Směrování IPX nenalezeno v souboru %s nebo %s.\n"
- 
--#: ../lib/ipx_gr.c:56
-+#: ../lib/ipx_gr.c:62
-+#, c-format
- msgid "Kernel IPX routing table\n"
--msgstr "Sm�rovac� tabulka v j�dru pro IPX\n"
-+msgstr "Směrovací tabulka v jádru pro IPX\n"
- 
- #. xxx
--#: ../lib/ipx_gr.c:57
-+#: ../lib/ipx_gr.c:63
-+#, c-format
- msgid "Destination               Router Net                Router Node\n"
--msgstr "C�l                       Sm�rova� S��              Sm�rova� Uzel\n"
-+msgstr "Cíl                       Směrovač Síť              Směrovač Uzel\n"
- 
- #: ../lib/ipx_sr.c:33
-+#, c-format
- msgid "IPX: this needs to be written\n"
--msgstr "IPX: toto je t�eba ulo�it\n"
-+msgstr "IPX: toto je třeba uložit\n"
- 
--#: ../lib/masq_info.c:197
-+#: ../lib/masq_info.c:198
-+#, c-format
- msgid "IP masquerading entries\n"
--msgstr "IP maskovac� polo�ky\n"
-+msgstr "IP maskovací položky\n"
- 
--#: ../lib/masq_info.c:200
-+#: ../lib/masq_info.c:201
-+#, c-format
- msgid "prot   expire source               destination          ports\n"
--msgstr "prot   �ivot  zdroj                c�l                  porty\n"
-+msgstr "prot   život  zdroj                cíl                  porty\n"
- 
--#: ../lib/masq_info.c:203
-+#: ../lib/masq_info.c:204
-+#, c-format
- msgid ""
--"prot   expire    initseq delta prevd source               destination        "
--"  ports\n"
-+"prot   expire    initseq delta prevd source               "
-+"destination          ports\n"
- msgstr ""
--"prot   �ivot     zahajsek delta p�edchd zdroj             c�l                "
--"   porty\n"
-+"prot   život     zahajsek delta předchd zdroj             "
-+"cíl                   porty\n"
- 
- #: ../lib/netrom_gr.c:48
-+#, c-format
- msgid "NET/ROM not configured in this system.\n"
--msgstr "NET/ROM nen� na tomto syst�mu nakonfigurov�no.\n"
-+msgstr "NET/ROM není na tomto systému nakonfigurováno.\n"
- 
- #: ../lib/netrom_gr.c:51
-+#, c-format
- msgid "Kernel NET/ROM routing table\n"
--msgstr "Sm�rovac� tabulka v j�dru pro NET/ROM\n"
-+msgstr "Směrovací tabulka v jádru pro NET/ROM\n"
- 
- #: ../lib/netrom_gr.c:52
-+#, c-format
- msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
--msgstr "C�l          Mnemonika Kvalita  Soused     Rozhran�\n"
-+msgstr "Cíl          Mnemonika Kvalita  Soused     Rozhraní\n"
- 
- #: ../lib/netrom_sr.c:34
-+#, c-format
- msgid "netrom usage\n"
--msgstr "pou�it� netrom\n"
-+msgstr "použití netrom\n"
- 
- #: ../lib/netrom_sr.c:44
-+#, c-format
- msgid "NET/ROM: this needs to be written\n"
--msgstr "NET/ROM: toto je pot�eba ulo�it\n"
-+msgstr "NET/ROM: toto je potřeba uložit\n"
- 
- #: ../lib/ppp.c:44
-+#, c-format
- msgid "You cannot start PPP with this program.\n"
--msgstr "T�mto programem nelze PPP spustit.\n"
-+msgstr "Tímto programem nelze PPP spustit.\n"
- 
- #: ../lib/ppp_ac.c:38
-+#, c-format
- msgid "Sorry, use pppd!\n"
--msgstr "Lituji, pou�ijte pppd!\n"
-+msgstr "Lituji, použijte pppd!\n"
- 
- #: ../lib/rose.c:87
- msgid "Node address must be ten digits"
--msgstr "Adresa uzlu mus� m�t 10 ��slic"
-+msgstr "Adresa uzlu musí mít 10 číslic"
- 
- #: ../lib/rose_gr.c:51
-+#, c-format
- msgid "ROSE not configured in this system.\n"
--msgstr "ROSE nen� na tomto syst�mu nakonfigurov�no.\n"
-+msgstr "ROSE není na tomto systému nakonfigurováno.\n"
- 
- #: ../lib/rose_gr.c:54
-+#, c-format
- msgid "Kernel ROSE routing table\n"
--msgstr "Sm�rovac� tabulka v j�dru pro ROSE\n"
-+msgstr "Směrovací tabulka v jádru pro ROSE\n"
- 
--#: ../lib/tr.c:70 ../lib/tr.c:85
-+#: ../lib/tr.c:86 ../lib/tr.c:101
- #, c-format
- msgid "in_tr(%s): invalid token ring address!\n"
--msgstr "in_tr(%s): nespr�vn� token ring adresa!\n"
-+msgstr "in_tr(%s): nesprávná token ring adresa!\n"
- 
--#: ../lib/tr.c:97
-+#: ../lib/tr.c:113
- #, c-format
- msgid "in_tr(%s): trailing : ignored!\n"
--msgstr "in_tr(%s): nadbyte�n�: ignorov�no!\n"
-+msgstr "in_tr(%s): nadbytečné: ignorováno!\n"
- 
--#: ../lib/tr.c:109
-+#: ../lib/tr.c:125
- #, c-format
- msgid "in_tr(%s): trailing junk!\n"
--msgstr "in_tr(%s): nadbyte�n� znaky!\n"
-+msgstr "in_tr(%s): nadbytečné znaky!\n"
- 
--#: ../lib/interface.c:124
-+#: ../lib/interface.c:176
- #, c-format
- msgid "warning: no inet socket available: %s\n"
--msgstr "varov�n�: nen� dostupn� ��dn� inet soket: %s\n"
-+msgstr "varování: není dostupný žádný inet soket: %s\n"
- 
--#: ../lib/interface.c:270
-+#: ../lib/interface.c:325
- #, c-format
- msgid "Warning: cannot open %s (%s). Limited output.\n"
--msgstr ""
-+msgstr "Pozor: %s nelze otevřít (%s). Výstup omezen.\n"
- 
- #. Give better error message for this case.
--#: ../lib/interface.c:504
-+#: ../lib/interface.c:571
- msgid "Device not found"
--msgstr "Za��zen� nebylo nalezeno"
-+msgstr "Zařízení nebylo nalezeno"
- 
--#: ../lib/interface.c:508
-+#: ../lib/interface.c:575
- #, c-format
- msgid "%s: error fetching interface information: %s\n"
--msgstr "%s: chyba p�i z�sk�v�n� informac� o rozhran� %s\n"
-+msgstr "%s: chyba při získávání informací o rozhraní %s\n"
-+
-+#: ../lib/interface.c:608
-+msgid "     - no statistics available -"
-+msgstr "     - statistická data nejsou dostupná -"
-+
-+#: ../lib/interface.c:612
-+#, c-format
-+msgid "[NO FLAGS]"
-+msgstr "[ŽÁDNÉ PŘÍZNAKY]"
-+
-+#: ../lib/interface.c:694
-+msgid "UP,"
-+msgstr "AKTIVOVÁNO,"
-+
-+#: ../lib/interface.c:696
-+msgid "BROADCAST,"
-+msgstr "VŠESMĚR,"
-+
-+#: ../lib/interface.c:698
-+msgid "DEBUG,"
-+msgstr "LADĚNÍ,"
-+
-+#: ../lib/interface.c:700
-+msgid "LOOPBACK,"
-+msgstr "SMYČKA,"
-+
-+#: ../lib/interface.c:702
-+msgid "POINTOPOINT,"
-+msgstr "DVOUBODOVÉ,"
-+
-+# ??
-+#: ../lib/interface.c:704
-+msgid "NOTRAILERS,"
-+msgstr "ŽÁDNÉ_TRAILERS"
-+
-+#: ../lib/interface.c:706
-+msgid "RUNNING,"
-+msgstr "BĚŽÍ,"
-+
-+#: ../lib/interface.c:708
-+msgid "NOARP,"
-+msgstr "NEARP,"
-+
-+#: ../lib/interface.c:710
-+msgid "PROMISC,"
-+msgstr "PROMISK,"
-+
-+#: ../lib/interface.c:712
-+msgid "ALLMULTI,"
-+msgstr "ALLMULTI,"
-+
-+#: ../lib/interface.c:714
-+msgid "SLAVE,"
-+msgstr "PODŘÍZENÝ,"
-+
-+#: ../lib/interface.c:716
-+msgid "MASTER,"
-+msgstr "NADŘÍZENÝ,"
-+
-+#: ../lib/interface.c:718
-+msgid "MULTICAST,"
-+msgstr "MULTICAST,"
-+
-+#: ../lib/interface.c:721
-+msgid "DYNAMIC,"
-+msgstr "DYNAMIC,"
-+
-+#: ../lib/interface.c:730
-+#, c-format
-+msgid "%s: %s  mtu %d  metric %d"
-+msgstr "%s: %s  mtu %d  metrika %d"
-+
-+#: ../lib/interface.c:734
-+#, c-format
-+msgid "  outfill %d  keepalive %d"
-+msgstr "  outfill %d  keepalive %d"
-+
-+#: ../lib/interface.c:743 ../lib/interface.c:841
-+#, c-format
-+msgid "        %s %s"
-+msgstr "        %s %s"
-+
-+#: ../lib/interface.c:745
-+#, c-format
-+msgid "  netmask %s"
-+msgstr " síťová_maska %s"
-+
-+#: ../lib/interface.c:747
-+#, c-format
-+msgid "  broadcast %s"
-+msgstr "  všesměr %s"
-+
-+#: ../lib/interface.c:750
-+#, c-format
-+msgid "  destination %s"
-+msgstr "  cíl %s"
-+
-+#: ../lib/interface.c:769
-+#, c-format
-+msgid "        %s %s  prefixlen %d"
-+msgstr "        %s %s  délka_prefixu %d"
-+
-+#: ../lib/interface.c:773
-+#, c-format
-+msgid "  scopeid 0x%x"
-+msgstr "  scopeid 0x%x"
-+
-+#: ../lib/interface.c:777
-+msgid "compat,"
-+msgstr "kompat,"
-+
-+#: ../lib/interface.c:781
-+msgid "global,"
-+msgstr "globální,"
-+
-+#: ../lib/interface.c:783
-+msgid "link,"
-+msgstr "linka,"
-+
-+#: ../lib/interface.c:785
-+msgid "site,"
-+msgstr "oblast,"
-+
-+#: ../lib/interface.c:787
-+msgid "host,"
-+msgstr "stroj,"
-+
-+#: ../lib/interface.c:805
-+#, c-format
-+msgid "        %s Ethernet-II   %s\n"
-+msgstr "        %s Ethernet-II   %s\n"
-+
-+#: ../lib/interface.c:808
-+#, c-format
-+msgid "        %s Ethernet-SNAP %s\n"
-+msgstr "        %s Ethernet-SNAP %s\n"
-+
-+#: ../lib/interface.c:811
-+#, c-format
-+msgid "        %s Ethernet802.2 %s\n"
-+msgstr "        %s Ethernet802.2 %s\n"
-+
-+#: ../lib/interface.c:814
-+#, c-format
-+msgid "        %s Ethernet802.3 %s\n"
-+msgstr "        %s Ethernet802.3 %s\n"
-+
-+#: ../lib/interface.c:824 ../lib/interface.c:833
-+#, c-format
-+msgid "        %s %s\n"
-+msgstr "        %s %s\n"
-+
-+#: ../lib/interface.c:843
-+#, c-format
-+msgid "        %s"
-+msgstr "        %s"
-+
-+#: ../lib/interface.c:845
-+#, c-format
-+msgid "  txqueuelen %d"
-+msgstr " délka_odchozí_fronty %d"
-+
-+#: ../lib/interface.c:850
-+#, c-format
-+msgid "        media %s"
-+msgstr "        médium %s"
-+
-+#: ../lib/interface.c:852
-+#, c-format
-+msgid "autoselect"
-+msgstr "automatika"
-+
-+#: ../lib/interface.c:903
-+#, c-format
-+msgid "RX packets %llu  bytes %llu (%lu.%lu %s)\n"
-+msgstr "RX packetů %llu  bajtů %llu (%lu,%lu %s)\n"
-+
-+#: ../lib/interface.c:909
-+#, c-format
-+msgid "RX compressed:%lu\n"
-+msgstr "RX komprimováno %lu\n"
-+
-+#: ../lib/interface.c:912
-+#, c-format
-+msgid "RX errors %lu  dropped %lu  overruns %lu  frame %lu\n"
-+msgstr "RX chyb %lu  zahozeno %lu  přetečení %lu  rámců %lu\n"
-+
-+#: ../lib/interface.c:918
-+#, c-format
-+msgid "TX packets %llu  bytes %llu (%lu.%lu %s)\n"
-+msgstr "TX packetů %llu  bajtů %llu (%lu,%lu %s)\n"
-+
-+#: ../lib/interface.c:924
-+#, c-format
-+msgid "TX compressed %lu\n"
-+msgstr "TX komprimováno %lu\n"
-+
-+# carrier?
-+#: ../lib/interface.c:927
-+#, c-format
-+msgid "TX errors %lu  dropped %lu overruns %lu  carrier %lu  collisions %lu\n"
-+msgstr "TX chyb %lu  zahozeno %lu  přetečení %lu  přenos %lu  kolizí %lu\n"
- 
--#: ../lib/sockets.c:59
-+#: ../lib/interface.c:937
-+#, c-format
-+msgid "interrupt %d  "
-+msgstr "přerušení %d  "
-+
-+#. Only print devices using it for
-+#. I/O maps
-+#: ../lib/interface.c:940
-+#, c-format
-+msgid "base 0x%x  "
-+msgstr "základ 0x%x  "
-+
-+#: ../lib/interface.c:942
-+#, c-format
-+msgid "memory 0x%lx-%lx  "
-+msgstr "paměť 0x%lx–%lx  "
-+
-+#: ../lib/interface.c:945
-+#, c-format
-+msgid "  dma 0x%x"
-+msgstr "  DMA 0x%x"
-+
-+#: ../lib/sockets.c:63
-+#, c-format
- msgid "No usable address families found.\n"
--msgstr "Nebyla nalezena ��dn� pou�iteln� t��da adres.\n"
-+msgstr "Nebyla nalezena žádná použitelná třída adres.\n"
- 
- #: ../lib/util-ank.c:229
- #, c-format
- msgid "ip: %s is invalid inet address\n"
--msgstr "ip: %s nen� platnou inet adresou\n"
-+msgstr "ip: %s není platnou inet adresou\n"
- 
- #: ../lib/util-ank.c:238
- #, c-format
- msgid "ip: %s is invalid inet prefix\n"
--msgstr "ip: %s nen� platn�m inet prefixem\n"
-+msgstr "ip: %s není platným inet prefixem\n"
- 
- #: ../lib/util-ank.c:248
- #, c-format
- msgid "ip: %s is invalid IPv4 address\n"
--msgstr "ip: %s nen� platnou IPv4 adresou\n"
-+msgstr "ip: %s není platnou IPv4 adresou\n"
- 
- #: ../lib/util-ank.c:256
- #, c-format
- msgid "ip: argument is wrong: %s\n"
--msgstr "ip: argument %s je nespr�vn�\n"
-+msgstr "ip: argument %s je nesprávný\n"
- 
--#: ../ipmaddr.c:56
-+#: ../ipmaddr.c:61
-+#, c-format
- msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
--msgstr " Usage: ipmaddr [ add | del ] MULTIADR dev �ET�ZEC\n"
-+msgstr " Usage: ipmaddr [ add | del ] MULTIADR dev ŘETĚZEC\n"
- 
--#: ../ipmaddr.c:57
-+#: ../ipmaddr.c:62
-+#, c-format
- msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
--msgstr "       ipmaddr show [ dev �ET�ZEC ] [ ipv4 | ipv6 | link | all ]\n"
-+msgstr "       ipmaddr show [ dev ŘETĚZEC ] [ ipv4 | ipv6 | link | all ]\n"
- 
--#: ../ipmaddr.c:58
-+#: ../ipmaddr.c:63
-+#, c-format
- msgid "       ipmaddr -V | -version\n"
- msgstr "       ipmaddr -V | -version\n"
- 
--#: ../ipmaddr.c:258
-+#: ../ipmaddr.c:263
- #, c-format
- msgid "family %d "
--msgstr "t��da %d "
-+msgstr "třída %d "
- 
--#: ../ipmaddr.c:267
-+#: ../ipmaddr.c:272
- #, c-format
- msgid " users %d"
--msgstr " u�ivatel� %d"
-+msgstr " uživatelé %d"
- 
--#: ../ipmaddr.c:353
-+#: ../ipmaddr.c:361
- msgid "Cannot create socket"
--msgstr "Soket nelze vytvo�it"
-+msgstr "Soket nelze vytvořit"
- 
- #: ../slattach.c:180
- #, c-format
- msgid "slattach: /dev/%s already locked!\n"
--msgstr "slattach: za��zen� /dev/%s je ji� zam�eno!\n"
-+msgstr "slattach: zařízení /dev/%s je již zamčeno!\n"
- 
- #: ../slattach.c:186
- #, c-format
-@@ -2433,80 +3184,169 @@ msgid "slattach: tty_lock: (%s): %s\n"
- msgstr "slattach: tty_lock: (%s): %s\n"
- 
- #: ../slattach.c:192
-+#, c-format
- msgid "slattach: cannot write PID file\n"
- msgstr "slattach: do PID souboru nelze zapisovat\n"
- 
- #: ../slattach.c:202
- #, c-format
- msgid "slattach: tty_lock: UUCP user %s unknown!\n"
--msgstr "slattach: tty_lock: u�ivatel UUCP %s nen� zn�m!\n"
-+msgstr "slattach: tty_lock: uživatel UUCP %s není znám!\n"
- 
--#: ../slattach.c:430
-+#: ../slattach.c:432
- #, c-format
- msgid "slattach: tty_hangup(DROP): %s\n"
- msgstr "slattach: tty_hangup(DROP): %s\n"
- 
--#: ../slattach.c:437
-+#: ../slattach.c:439
- #, c-format
- msgid "slattach: tty_hangup(RAISE): %s\n"
- msgstr "slattach: tty_hangup(RAISE): %s\n"
- 
--#: ../slattach.c:486
-+#: ../slattach.c:470
-+#, c-format
-+msgid "slattach: tty name too long\n"
-+msgstr "slattach: název TTY je příliš dlouhý\n"
-+
-+#: ../slattach.c:500
-+#, c-format
- msgid "slattach: tty_open: cannot get current state!\n"
--msgstr "slattach: tty_open: aktu�ln� stav nelze zjistit!\n"
-+msgstr "slattach: tty_open: aktuální stav nelze zjistit!\n"
- 
--#: ../slattach.c:493
-+#: ../slattach.c:507
-+#, c-format
- msgid "slattach: tty_open: cannot get current line disc!\n"
--msgstr "slattach: tty_open: aktu�ln� linkovou discipl�nu nelze zjistit!\n"
-+msgstr "slattach: tty_open: aktuální linkovou disciplínu nelze zjistit!\n"
- 
--#: ../slattach.c:501
-+#: ../slattach.c:515
-+#, c-format
- msgid "slattach: tty_open: cannot set RAW mode!\n"
--msgstr "slattach: tty_open: re�im RAW nelze nastavit!\n"
-+msgstr "slattach: tty_open: režim RAW nelze nastavit!\n"
- 
--#: ../slattach.c:508
-+#: ../slattach.c:522
- #, c-format
- msgid "slattach: tty_open: cannot set %s bps!\n"
- msgstr "slattach: tty_open: %s bps nelze nastavit!\n"
- 
--#: ../slattach.c:518
-+#: ../slattach.c:532
-+#, c-format
- msgid "slattach: tty_open: cannot set 8N1 mode!\n"
--msgstr "slattach: tty_open: re�im 8N1 nelze nastavit!\n"
-+msgstr "slattach: tty_open: režim 8N1 nelze nastavit!\n"
-+
-+#: ../slattach.c:674
-+#, c-format
-+msgid "slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"
-+msgstr "slattach: setvbuf(stdout, 0, _IOLBF, 0): %s\n"
- 
--#: ../slattach.c:686
-+#: ../slattach.c:706
- #, c-format
- msgid "%s started"
--msgstr "protokol %s spu�t�n"
-+msgstr "protokol %s spuštěn"
- 
--#: ../slattach.c:687
-+#: ../slattach.c:707
- #, c-format
- msgid " on %s"
- msgstr " na %s"
- 
--#: ../slattach.c:688
-+#: ../slattach.c:708
- #, c-format
- msgid " interface %s\n"
--msgstr " rozhran� %s\n"
-+msgstr " rozhraní %s\n"
-+
-+#~ msgid ""
-+#~ "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
-+#~ "<-''-\n"
-+#~ msgstr ""
-+#~ "  arp [-v]   [<HW>] [-i <if>] -s <soubor> <hwadr> [síťmask <čís>]  <-''-\n"
-+
-+#~ msgid "%-9.9s Link encap:%s  "
-+#~ msgstr "%-9.9s Zapouzdření:%s  "
-+
-+#~ msgid "HWaddr %s  "
-+#~ msgstr "HWadr %s  "
-+
-+#~ msgid "Media:%s"
-+#~ msgstr "Médium:%s"
-+
-+#~ msgid "(auto)"
-+#~ msgstr "(auto)"
-+
-+#~ msgid " P-t-P:%s "
-+#~ msgstr " P-t-P:%s "
-+
-+# V ostatních katalozích se překládá Broadcast -> všesměrové vysílání.
-+# Tudiž bcast -> Všesměr :)
-+#~ msgid " Bcast:%s "
-+#~ msgstr " Všesměr:%s "
-+
-+#~ msgid " Mask:%s\n"
-+#~ msgstr "Maska:%s\n"
-+
-+#~ msgid " Scope:"
-+#~ msgstr " Rozsah:"
-+
-+#~ msgid "Unknown"
-+#~ msgstr "Neznám."
-+
-+#~ msgid "          EtherTalk Phase 2 addr:%s\n"
-+#~ msgstr "          EtherTalk Phase 2 adr:%s\n"
-+
-+#~ msgid "          econet addr:%s\n"
-+#~ msgstr "          econet adr:%s\n"
-+
-+# Hic sunt leones ...
-+#~ msgid "[NO FLAGS] "
-+#~ msgstr "[ŽÁDNÉ PŘÍZNAKY]"
-+
-+#~ msgid " MTU:%d  Metric:%d"
-+#~ msgstr " MTU:%d  Metrika:%d"
-+
-+#~ msgid "             compressed:%lu\n"
-+#~ msgstr "             komprimováno:%lu\n"
-+
-+#~ msgid "          collisions:%lu "
-+#~ msgstr "          kolizí:%lu "
-+
-+#~ msgid "DMA chan:%x "
-+#~ msgstr "Kanál DMA:%x "
-+
-+#~ msgid "%s: unknown interface: %s\n"
-+#~ msgstr "%s: rozhraní %s není známo\n"
-+
-+#~ msgid "address mask replies"
-+#~ msgstr "odpovědi na žádost o masku podsítě"
-+
-+#~ msgid "unknown title %s\n"
-+#~ msgstr "titulek %s je neznámý\n"
-+
-+#~ msgid "Routing table for `ddp' not yet supported.\n"
-+#~ msgstr "Směrovací tabulka pro `ddp' není zatím podporována.\n"
-+
-+#~ msgid "IPX not configured in this system.\n"
-+#~ msgstr "IPX není na tomto systému nakonfigurováno.\n"
- 
- #~ msgid ""
--#~ "   This comand can read or set the hostname or the NIS domainname. You can\n"
-+#~ "   This comand can read or set the hostname or the NIS domainname. You "
-+#~ "can\n"
- #~ msgstr ""
--#~ "   Tento program zji��uje a nastavuje jm�no po��ta�e �i NIS dom�ny. M��e "
--#~ "tak�\n"
-+#~ "   Tento program zjišťuje a nastavuje jméno počítače či NIS domény. Může "
-+#~ "také\n"
- 
- #~ msgid ""
- #~ "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
--#~ msgstr "   zjistit DNS dom�nu �i kanonick� jm�no po��ta�e.\n"
-+#~ msgstr "   zjistit DNS doménu či kanonické jméno počítače.\n"
- 
- #~ msgid ""
- #~ "   Unless you are using bind or NIS for host lookups you can change the\n"
- #~ msgstr ""
--#~ "   Pokud nepou��v�te bind �i NIS pro vyhled�v�n� jmen po��ta��, pak m��ete\n"
-+#~ "   Pokud nepoužíváte bind či NIS pro vyhledávání jmen počítačů, pak "
-+#~ "můžete\n"
- 
- #~ msgid ""
- #~ "   FQDN (Fully Qualified Domain Name) and the DNS domain name (which is\n"
- #~ msgstr ""
--#~ "   zm�nit kanonick� jm�no po��ta�e a jm�no DNS dom�ny (je sou��st� "
--#~ "kanonick�ho\n"
-+#~ "   změnit kanonické jméno počítače a jméno DNS domény (je součástí "
-+#~ "kanonického\n"
- 
- #~ msgid "   part of the FQDN) in the /etc/hosts file.\n"
--#~ msgstr "   jm�na po��ta�e) v souboru /etc/hosts.\n"
-+#~ msgstr "   jména počítače) v souboru /etc/hosts.\n"
-diff --git a/po/de.po b/po/de.po
-index f884dd9..9f8f679 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -1,4 +1,4 @@
--# $Id: de.po,v 1.10 2000/08/01 03:19:48 ecki Exp $
-+# $Id: de.po,v 1.11 2003/10/25 21:15:09 ecki Exp $
- # German translation for net-tools 1.51
- # Copyright (C) 1999 Ralf B�chle <ralf@gnu.org>
- msgid ""
-@@ -9,7 +9,7 @@ msgstr ""
- "Last-Translator: Ralf B�chle <ralf@gnu.org>\n"
- "Language-Team:\n"
- "MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=iso8859-1\n"
-+"Content-Type: text/plain; charset=iso-8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
- #: ../arp.c:110 ../arp.c:269
-@@ -59,12 +59,16 @@ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr "arp: Kann Eintrag auf Zeile %u von Etherdatei %s nicht setzen!\n"
- 
- #: ../arp.c:437
--msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
--msgstr "Adresse\t\t\tHWTyp\tHWAdresse\t    Flags   Maske\t\t  Iface\n"
-+msgid ""
-+"Address                  HWtype  HWaddress           Flags Mask            "
-+"Iface\n"
-+msgstr ""
-+"Adresse                  HW-Typ  HW-Adresse          Flags Maske           "
-+"Iface\n"
- 
- #: ../arp.c:467
- msgid "(incomplete)"
--msgstr "(unvolls�ndig)"
-+msgstr "(unvollst�ndig)"
- 
- #: ../arp.c:484
- #, c-format
-diff --git a/po/et_EE.po b/po/et_EE.po
-index d748410..827406d 100644
---- a/po/et_EE.po
-+++ b/po/et_EE.po
-@@ -1,66 +1,65 @@
- # Estonian translations for net-tools
--# Copyright (C) 1999 Free Software Foundation, Inc.
--# Meelis Roos <Meelis.Roos@mail.ee>, 1999.
-+# Copyright (C) 1999-2001 Free Software Foundation, Inc.
-+# Meelis Roos <mroos@linux.ee>, 1999-2001.
- #
--#, fuzzy
- msgid ""
- msgstr ""
--"Project-Id-Version: net-tools 1.58\n"
--"POT-Creation-Date: 2001-02-15 21:28+0200\n"
--"PO-Revision-Date: 2001-02-15 18:00+0300\n"
-+"Project-Id-Version: net-tools 1.60\n"
-+"POT-Creation-Date: 2001-04-16 20:24+0200\n"
-+"PO-Revision-Date: 2001-04-16 20:30+0200\n"
- "Last-Translator: Meelis Roos <mroos@linux.ee>\n"
- "Language-Team: Estonian <linux-ee@eenet.ee>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=iso-8859-15\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: ../arp.c:110 ../arp.c:269
-+#: ../arp.c:111 ../arp.c:270
- msgid "arp: need host name\n"
- msgstr "arp: puudub hosti nimi\n"
- 
--#: ../arp.c:207 ../arp.c:221
-+#: ../arp.c:208 ../arp.c:222
- #, c-format
- msgid "No ARP entry for %s\n"
- msgstr "%s jaoks pole ARP kirjet\n"
- 
--#: ../arp.c:239
-+#: ../arp.c:240
- #, c-format
- msgid "arp: cant get HW-Address for `%s': %s.\n"
- msgstr "arp: ei saa riistvaralist aadressi `%s' jaoks: %s\n"
- 
--#: ../arp.c:243
-+#: ../arp.c:244
- msgid "arp: protocol type mismatch.\n"
- msgstr "arp: vale protokolli t��p\n"
- 
--#: ../arp.c:252
-+#: ../arp.c:253
- #, c-format
- msgid "arp: device `%s' has HW address %s `%s'.\n"
- msgstr "arp: seadmel `%s' on riistvaraline aadress %s `%s'\n"
- 
--#: ../arp.c:282
-+#: ../arp.c:283
- msgid "arp: need hardware address\n"
- msgstr "arp: puudub riistvaraline aadress\n"
- 
--#: ../arp.c:290
-+#: ../arp.c:291
- msgid "arp: invalid hardware address\n"
- msgstr "arp: vigane riistvaraline aadress\n"
- 
--#: ../arp.c:387
-+#: ../arp.c:388
- #, c-format
- msgid "arp: cannot open etherfile %s !\n"
- msgstr "arp: ei saa avada faili %s\n"
- 
--#: ../arp.c:403
-+#: ../arp.c:404
- #, c-format
- msgid "arp: format error on line %u of etherfile %s !\n"
- msgstr "arp: formaadiviga real %u failis %s\n"
- 
--#: ../arp.c:416
-+#: ../arp.c:417
- #, c-format
- msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr "arp: ei saa kehtestada ARP kirjet real %u failis %s\n"
- 
--#: ../arp.c:437
-+#: ../arp.c:438
- msgid ""
- "Address                  HWtype  HWaddress           Flags Mask            "
- "Iface\n"
-@@ -68,45 +67,45 @@ msgstr ""
- "Aadress                  HWt��p  HWaadress           Lipud Mask            "
- "Liides\n"
- 
--#: ../arp.c:467
-+#: ../arp.c:468
- msgid "(incomplete)"
- msgstr "(mittet�ielik)"
- 
--#: ../arp.c:484
-+#: ../arp.c:485
- #, c-format
- msgid "%s (%s) at "
- msgstr "%s (%s) aadressil "
- 
--#: ../arp.c:490
-+#: ../arp.c:491
- msgid "<incomplete> "
- msgstr "<mittet�ielik>"
- 
--#: ../arp.c:496
-+#: ../arp.c:497
- #, c-format
- msgid "netmask %s "
- msgstr "v�rgumask %s "
- 
--#: ../arp.c:513
-+#: ../arp.c:514
- #, c-format
- msgid "on %s\n"
- msgstr "liides %s\n"
- 
--#: ../arp.c:592
-+#: ../arp.c:593
- #, c-format
- msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
- msgstr "ARP kirjeid kokku: %s\tignoreerisin: %d\tleidsin: %d\n"
- 
--#: ../arp.c:596
-+#: ../arp.c:597
- #, c-format
- msgid "%s (%s) -- no entry\n"
- msgstr "%s (%s) -- pole kirjet\n"
- 
--#: ../arp.c:598
-+#: ../arp.c:599
- #, c-format
- msgid "arp: in %d entries no match found.\n"
- msgstr "arp: ei leidnud %d kirje hulgast sobivat\n"
- 
--#: ../arp.c:613
-+#: ../arp.c:614
- msgid ""
- "Usage:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
-@@ -116,7 +115,7 @@ msgstr ""
- "ARP cache vaatamine:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hosti nimi>]\n"
- 
--#: ../arp.c:614
-+#: ../arp.c:615
- msgid ""
- "  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
- "entry\n"
-@@ -124,7 +123,7 @@ msgstr ""
- "ARP kirje kustutamine:\n"
- "  arp [-v]          [-i <if>] -d  <hosti nimi> [pub] [nopub]\n"
- 
--#: ../arp.c:615
-+#: ../arp.c:616
- msgid ""
- "  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
- "file\n"
-@@ -132,7 +131,7 @@ msgstr ""
- "ARP kirjete lisamine failist:\n"
- "  arp [-vnD] [<HW>] [-i <if>] -f  [<failinimi>]\n"
- 
--#: ../arp.c:616
-+#: ../arp.c:617
- msgid ""
- "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
- "entry\n"
-@@ -140,14 +139,14 @@ msgstr ""
- "ARP kirje lisamine:\n"
- "  arp [-v]   [<HW>] [-i <if>] -s  <hosti nimi> <hwaddr> [temp] [nopub]\n"
- 
--#: ../arp.c:617
-+#: ../arp.c:618
- msgid ""
- "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
- "<-''-\n"
- msgstr ""
- "  arp [-v]   [<HW>] [-i <if>] -s  <hosti nimi> <hwaddr> [netmask <nm>] pub\n"
- 
--#: ../arp.c:618
-+#: ../arp.c:619
- msgid ""
- "  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
- "<-''-\n"
-@@ -156,7 +155,7 @@ msgstr ""
- "  arp [-v]   [<HW>] [-i <if>] -Ds <hosti nimi> <if> [netmask <nm>] pub\n"
- "\n"
- 
--#: ../arp.c:620
-+#: ../arp.c:621
- msgid ""
- "        -a                       display (all) hosts in alternative (BSD) "
- "style\n"
-@@ -164,37 +163,37 @@ msgstr ""
- "        -a                       n�ita k�iki hoste alternatiivsel (BSD) "
- "kujul\n"
- 
--#: ../arp.c:621
-+#: ../arp.c:622
- msgid "        -s, --set                set a new ARP entry\n"
- msgstr "        -s, --set                uue ARP kirje seadmine\n"
- 
--#: ../arp.c:622
-+#: ../arp.c:623
- msgid "        -d, --delete             delete a specified entry\n"
- msgstr "        -d, --delete             m��ratud kirje kustutamine\n"
- 
--#: ../arp.c:623 ../netstat.c:1485 ../route.c:85
-+#: ../arp.c:624 ../netstat.c:1490 ../route.c:86
- msgid "        -v, --verbose            be verbose\n"
- msgstr "        -v, --verbose            jutukas v�ljund\n"
- 
--#: ../arp.c:624
-+#: ../arp.c:625 ../netstat.c:1491 ../route.c:87
- msgid "        -n, --numeric            don't resolve names\n"
- msgstr "        -n, --numeric            mitte lahendada nimesid\n"
- 
--#: ../arp.c:625
-+#: ../arp.c:626
- msgid ""
- "        -i, --device             specify network interface (e.g. eth0)\n"
- msgstr ""
- "        -i, --device             v�rguliidese t�psustamine (n�iteks eth0)\n"
- 
--#: ../arp.c:626
-+#: ../arp.c:627
- msgid "        -D, --use-device         read <hwaddr> from given device\n"
- msgstr "        -D, --use-device         lugeda <hwaddr> vastavalt liideselt\n"
- 
--#: ../arp.c:627
-+#: ../arp.c:628
- msgid "        -A, -p, --protocol       specify protocol family\n"
- msgstr "        -A, -p, --protocol       protokollipere m��ramine\n"
- 
--#: ../arp.c:628
-+#: ../arp.c:629
- msgid ""
- "        -f, --file               read new entries from file or from "
- "/etc/ethers\n"
-@@ -204,125 +203,125 @@ msgstr ""
- "/etc/ethers'st\n"
- "\n"
- 
--#: ../arp.c:630 ../rarp.c:181
-+#: ../arp.c:631 ../rarp.c:182
- #, c-format
- msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
- msgstr ""
- "  <HW>=kasutage '-H <hw>' riistvaralise aadressi m��ramiseks.\n"
- "       Vaikimisi: %s\n"
- 
--#: ../arp.c:631 ../rarp.c:182
-+#: ../arp.c:632 ../rarp.c:183
- msgid "  List of possible hardware types (which support ARP):\n"
- msgstr "  V�imalike ARP-i toetavate riistvara t��pide nimekiri:\n"
- 
--#: ../arp.c:664 ../arp.c:749
-+#: ../arp.c:666 ../arp.c:751
- #, c-format
- msgid "%s: hardware type not supported!\n"
- msgstr "arp: riistvara t��pi %s ei toetata\n"
- 
--#: ../arp.c:668
-+#: ../arp.c:670
- #, c-format
- msgid "%s: address family not supported!\n"
- msgstr "arp: aadressiperekonda %s ei toetata\n"
- 
--#: ../arp.c:703
-+#: ../arp.c:705
- msgid "arp: -N not yet supported.\n"
- msgstr "arp: -N toetust pole veel\n"
- 
--#: ../arp.c:713
-+#: ../arp.c:715
- #, c-format
- msgid "arp: %s: unknown address family.\n"
- msgstr "arp: tundmatu aadressiperekond %s\n"
- 
--#: ../arp.c:722
-+#: ../arp.c:724
- #, c-format
- msgid "arp: %s: unknown hardware type.\n"
- msgstr "arp: tundmatu riistvara t��p %s\n"
- 
--#: ../arp.c:741
-+#: ../arp.c:743
- #, c-format
- msgid "arp: %s: kernel only supports 'inet'.\n"
- msgstr "arp: tuumas on ainult 'inet' aadressiperekonna toetus\n"
- 
--#: ../arp.c:754
-+#: ../arp.c:756
- #, c-format
- msgid "arp: %s: hardware type without ARP support.\n"
- msgstr "arp: riistvara t��bil %s pole ARP toetust\n"
- 
--#: ../hostname.c:69
-+#: ../hostname.c:70
- #, c-format
- msgid "Setting nodename to `%s'\n"
- msgstr "Sean s�lme nimeks `%s'\n"
- 
--#: ../hostname.c:74
-+#: ../hostname.c:75
- #, c-format
- msgid "%s: you must be root to change the node name\n"
- msgstr "%s: ainult root saab s�lme nime muuta\n"
- 
--#: ../hostname.c:77 ../hostname.c:97 ../hostname.c:116
-+#: ../hostname.c:78 ../hostname.c:98 ../hostname.c:117
- #, c-format
- msgid "%s: name too long\n"
- msgstr "%s: nimi on liiga pikk\n"
- 
--#: ../hostname.c:89
-+#: ../hostname.c:90
- #, c-format
- msgid "Setting hostname to `%s'\n"
- msgstr "Sean hosti nimeks `%s'\n"
- 
--#: ../hostname.c:94
-+#: ../hostname.c:95
- #, c-format
- msgid "%s: you must be root to change the host name\n"
- msgstr "%s: ainult root saab hosti nime muuta\n"
- 
--#: ../hostname.c:108
-+#: ../hostname.c:109
- #, c-format
- msgid "Setting domainname to `%s'\n"
- msgstr "Sean domeeni nimeks `%s'\n"
- 
--#: ../hostname.c:113
-+#: ../hostname.c:114
- #, c-format
- msgid "%s: you must be root to change the domain name\n"
- msgstr "%s: ainult root saab domeeni nime muuta\n"
- 
--#: ../hostname.c:131
-+#: ../hostname.c:132
- #, c-format
- msgid "Resolving `%s' ...\n"
- msgstr "Lahendan `%s' ...\n"
- 
--#: ../hostname.c:137
-+#: ../hostname.c:138
- #, c-format
- msgid "Result: h_name=`%s'\n"
- msgstr "Tulemus: h_name=`%s'\n"
- 
--#: ../hostname.c:142
-+#: ../hostname.c:143
- #, c-format
- msgid "Result: h_aliases=`%s'\n"
- msgstr "Tulemus: h_aliases=`%s'\n"
- 
--#: ../hostname.c:147
-+#: ../hostname.c:148
- #, c-format
- msgid "Result: h_addr_list=`%s'\n"
- msgstr "Tulemus: h_addr_list=`%s'\n"
- 
--#: ../hostname.c:209
-+#: ../hostname.c:210
- #, c-format
- msgid "%s: can't open `%s'\n"
- msgstr "%s: ei saa avada faili `%s'\n"
- 
--#: ../hostname.c:223
-+#: ../hostname.c:224
- msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
- msgstr ""
- "Kasutamine:\n"
- "  hostname [-v] {hosti nimi|-F fail}         hosti nime seadmine (ka "
- "failist)\n"
- 
--#: ../hostname.c:224
-+#: ../hostname.c:225
- msgid ""
- "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
- msgstr ""
- "  domainname [-v] {nisdomeen|-F fail}        NIS domeeni nime seadmine\n"
- 
--#: ../hostname.c:226
-+#: ../hostname.c:227
- msgid ""
- "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
- "file)\n"
-@@ -330,18 +329,18 @@ msgstr ""
- "  nodename [-v] {nodename|-F fail}           DECneti v�rgus�lme nime "
- "seadmine\n"
- 
--#: ../hostname.c:228
-+#: ../hostname.c:229
- msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
- msgstr ""
- "  hostname [-v] [-d|-f|-s|-a|-i|-y|-n]       nime n�itamine antud formaadis\n"
- 
--#: ../hostname.c:229
-+#: ../hostname.c:230
- msgid ""
- "       hostname [-v]                         display hostname\n"
- "\n"
- msgstr "  hostname [-v]                              hosti nime n�itamine\n"
- 
--#: ../hostname.c:230
-+#: ../hostname.c:231
- msgid ""
- "       hostname -V|--version|-h|--help       print info and exit\n"
- "\n"
-@@ -350,7 +349,7 @@ msgstr ""
- "  hostname -h|--help                         seesama abiinfo\n"
- "\n"
- 
--#: ../hostname.c:231
-+#: ../hostname.c:232
- msgid ""
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
-@@ -358,36 +357,36 @@ msgstr ""
- "  dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
- 
--#: ../hostname.c:232
-+#: ../hostname.c:233
- msgid "    -s, --short           short host name\n"
- msgstr "    -s, --short           l�hike hosti nimi\n"
- 
--#: ../hostname.c:233
-+#: ../hostname.c:234
- msgid "    -a, --alias           alias names\n"
- msgstr "     -a, --alias          alias-nimed\n"
- 
--#: ../hostname.c:234
-+#: ../hostname.c:235
- msgid "    -i, --ip-address      addresses for the hostname\n"
- msgstr "    -i, --ip-address      hosti IP aadressid\n"
- 
--#: ../hostname.c:235
-+#: ../hostname.c:236
- msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
- msgstr ""
- "    -f, --fqdn, --long    pikk hosti nimi (FQDN - t�ielik s�steeminimi)\n"
- 
--#: ../hostname.c:236
-+#: ../hostname.c:237
- msgid "    -d, --domain          DNS domain name\n"
- msgstr "    -d, --domain          DNS domeeni nimi\n"
- 
--#: ../hostname.c:237
-+#: ../hostname.c:238
- msgid "    -y, --yp, --nis       NIS/YP domainname\n"
- msgstr "    -y, --yp, --nis       NIS/YP domeeni nimi\n"
- 
--#: ../hostname.c:239
-+#: ../hostname.c:240
- msgid "    -n, --node            DECnet node name\n"
- msgstr "    -n, --node            DECneti v�rgus�lme nimi\n"
- 
--#: ../hostname.c:241
-+#: ../hostname.c:242
- msgid ""
- "    -F, --file            read hostname or NIS domainname from given file\n"
- "\n"
-@@ -395,7 +394,7 @@ msgstr ""
- "    -F, --file            lugeda hosti v�i NIS domeeni nimi failist\n"
- "\n"
- 
--#: ../hostname.c:243
-+#: ../hostname.c:244
- msgid ""
- "   This command can read or set the hostname or the NIS domainname. You can\n"
- "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-@@ -409,12 +408,12 @@ msgstr ""
- "   t�ielikku s�steeminime (FQDN) ja DNS domeeni nime (mis on t�ieliku nime\n"
- "   osa) muuta failist /etc/hosts.\n"
- 
--#: ../hostname.c:338
-+#: ../hostname.c:340
- #, c-format
- msgid "%s: You can't change the DNS domain name with this command\n"
- msgstr "%s: selle k�suga ei saa muuta DNS domeeni nime\n"
- 
--#: ../hostname.c:339
-+#: ../hostname.c:341
- msgid ""
- "\n"
- "Unless you are using bind or NIS for host lookups you can change the DNS\n"
-@@ -422,26 +421,26 @@ msgstr ""
- "\n"
- "Kui Te EI kasuta bind'i ega NIS'i nimede lahendamiseks, saate DNS domeeni\n"
- 
--#: ../hostname.c:340
-+#: ../hostname.c:342
- msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
- msgstr "(mis on t�ieliku nime osa) nime muuta failist /etc/hosts.\n"
- 
--#: ../hostname.c:357
-+#: ../hostname.c:359
- #, c-format
- msgid "gethostname()=`%s'\n"
- msgstr "gethostname()=`%s'\n"
- 
--#: ../hostname.c:374
-+#: ../hostname.c:376
- #, c-format
- msgid "getdomainname()=`%s'\n"
- msgstr "getdomainname()=`%s'\n"
- 
--#: ../hostname.c:389
-+#: ../hostname.c:391
- #, c-format
- msgid "getnodename()=`%s'\n"
- msgstr "getnodename()=`%s'\n"
- 
--#: ../ifconfig.c:110
-+#: ../ifconfig.c:108
- msgid ""
- "Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
-@@ -449,16 +448,16 @@ msgstr ""
- "Liides  MTU Meetr. RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Lip\n"
- 
--#: ../ifconfig.c:132 ../ifconfig.c:164
-+#: ../ifconfig.c:130 ../ifconfig.c:162
- #, c-format
- msgid "%s: unknown interface: %s\n"
- msgstr "ifconfig: tundmatu liides %s: %s\n"
- 
--#: ../ifconfig.c:156 ../ifconfig.c:740 ../ifconfig.c:831 ../ifconfig.c:937
-+#: ../ifconfig.c:154 ../ifconfig.c:734 ../ifconfig.c:825 ../ifconfig.c:936
- msgid "No support for INET on this system.\n"
- msgstr "Antud s�steem ei toeta INET aadressiperekonda\n"
- 
--#: ../ifconfig.c:179
-+#: ../ifconfig.c:177
- msgid ""
- "Usage:\n"
- "  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"
-@@ -466,51 +465,51 @@ msgstr ""
- "Kasutamine:\n"
- "  ifconfig [-a] [-i] [-v] [-s] <liides> [[<AF>] <aadress>]\n"
- 
--#: ../ifconfig.c:181
-+#: ../ifconfig.c:179
- msgid "  [add <address>[/<prefixlen>]]\n"
- msgstr "  [add <aadress>[/<prefiksi pikkus>]]\n"
- 
--#: ../ifconfig.c:182
-+#: ../ifconfig.c:180
- msgid "  [del <address>[/<prefixlen>]]\n"
- msgstr "  [del <aadress>[/<prefiksi pikkus>]]\n"
- 
--#: ../ifconfig.c:183
-+#: ../ifconfig.c:181
- msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
- msgstr "  [[-]broadcast [<aadress>]]  [[-]pointopoint [<aadress>]]\n"
- 
--#: ../ifconfig.c:184
-+#: ../ifconfig.c:182
- msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
- msgstr "  [netmask <aadress>]  [dstaddr <aadress>]  [tunnel <aadress>]\n"
- 
--#: ../ifconfig.c:187
-+#: ../ifconfig.c:185
- msgid "  [outfill <NN>] [keepalive <NN>]\n"
- msgstr "  [outfill <NN>] [keepalive <NN>]\n"
- 
--#: ../ifconfig.c:189
-+#: ../ifconfig.c:187
- msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
- msgstr "  [hw <HW> <aadress>]  [metric <NN>]  [mtu <NN>]\n"
- 
--#: ../ifconfig.c:190
-+#: ../ifconfig.c:188
- msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- msgstr "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- 
--#: ../ifconfig.c:191
-+#: ../ifconfig.c:189
- msgid "  [multicast]  [[-]promisc]\n"
- msgstr "  [multicast]  [[-]promisc]\n"
- 
--#: ../ifconfig.c:192
-+#: ../ifconfig.c:190
- msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
- msgstr "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <t��p>]\n"
- 
--#: ../ifconfig.c:194
-+#: ../ifconfig.c:192
- msgid "  [txqueuelen <NN>]\n"
- msgstr "  [txqueuelen <NN>]\n"
- 
--#: ../ifconfig.c:197
-+#: ../ifconfig.c:195
- msgid "  [[-]dynamic]\n"
- msgstr "  [[-]dynamic]\n"
- 
--#: ../ifconfig.c:199
-+#: ../ifconfig.c:197
- msgid ""
- "  [up|down] ...\n"
- "\n"
-@@ -518,73 +517,86 @@ msgstr ""
- "  [up|down] ...\n"
- "\n"
- 
--#: ../ifconfig.c:201
-+#: ../ifconfig.c:199
- msgid "  <HW>=Hardware Type.\n"
- msgstr "  <HW>=riistvara t��p\n"
- 
--#: ../ifconfig.c:202
-+#: ../ifconfig.c:200
- msgid "  List of possible hardware types:\n"
- msgstr "  V�imalike riistvara t��pide nimekiri:\n"
- 
- #. 1 = ARPable
--#: ../ifconfig.c:204
-+#: ../ifconfig.c:202
- #, c-format
- msgid "  <AF>=Address family. Default: %s\n"
- msgstr "  <AF>=aadressiperekond, vaikimisi %s\n"
- 
--#: ../ifconfig.c:205
-+#: ../ifconfig.c:203
- msgid "  List of possible address families:\n"
- msgstr "  V�imalike aadressiperekondade nimekiri:\n"
- 
--#: ../ifconfig.c:361
-+#: ../ifconfig.c:278
-+#, c-format
-+msgid "ifconfig: option `%s' not recognised.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:280 ../ifconfig.c:925
-+msgid "ifconfig: `--help' gives usage information.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:355
- msgid "Unknown media type.\n"
- msgstr "Tundmatu meedia t��p\n"
- 
--#: ../ifconfig.c:653
-+#: ../ifconfig.c:647
- #, c-format
- msgid "hw address type `%s' has no handler to set address. failed.\n"
- msgstr ""
- "riistvara aadressi t��bil `%s' pole k�sitlejat aadressi seadmiseks - eba�nn\n"
- 
--#: ../ifconfig.c:662
-+#: ../ifconfig.c:656
- #, c-format
- msgid "%s: invalid %s address.\n"
- msgstr "%s: vigane %s aadress\n"
- 
--#: ../ifconfig.c:706 ../ifconfig.c:796 ../ifconfig.c:882
-+#: ../ifconfig.c:700 ../ifconfig.c:790 ../ifconfig.c:876
- msgid "No support for INET6 on this system.\n"
- msgstr "Antud s�steem ei toeta INET6 aadressiperekonda\n"
- 
--#: ../ifconfig.c:749 ../ifconfig.c:840
-+#: ../ifconfig.c:743 ../ifconfig.c:834
- #, c-format
- msgid "Interface %s not initialized\n"
- msgstr "Liides %s pole initsialiseeritud\n"
- 
--#: ../ifconfig.c:761 ../ifconfig.c:851
-+#: ../ifconfig.c:755 ../ifconfig.c:845
- msgid "Bad address.\n"
- msgstr "Vigane aadress\n"
- 
--#: ../ifconfig.c:854
-+#: ../ifconfig.c:848
- msgid "Address deletion not supported on this system.\n"
- msgstr "Antud s�steem ei toeta aadresside kustutamist\n"
- 
--#: ../ifconfig.c:947
-+#: ../ifconfig.c:920
-+msgid "ifconfig: Cannot set address for this protocol family.\n"
-+msgstr "Ei oska seada aadresse selle aadressiperekonna jaoks\n"
-+
-+#: ../ifconfig.c:946
- msgid "No support for ECONET on this system.\n"
- msgstr "Antud s�steem ei toeta ECONET aadressiperekonda\n"
- 
--#: ../ifconfig.c:955
-+#: ../ifconfig.c:954
- #, c-format
- msgid "Don't know how to set addresses for family %d.\n"
- msgstr "Ei oska seada aadresse aadressiperekonna %d jaoks\n"
- 
--#: ../netstat.c:429
-+#: ../netstat.c:430
- #, c-format
- msgid ""
- "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
- msgstr ""
- "(\"-p\" jaoks ei saanud infot lugeda: geteuid()=%d, aga vaja oleks root'u)\n"
- 
--#: ../netstat.c:433
-+#: ../netstat.c:434
- msgid ""
- "(Not all processes could be identified, non-owned process info\n"
- " will not be shown, you would have to be root to see it all.)\n"
-@@ -592,27 +604,27 @@ msgstr ""
- "(M�nesid protsesse ei saanud identifitseerida, teiste kasutajate\n"
- "info lugemiseks peab olema root)\n"
- 
--#: ../netstat.c:440 ../netstat.c:1171 ../netstat.c:1248
-+#: ../netstat.c:441 ../netstat.c:1176 ../netstat.c:1253
- msgid "LISTENING"
- msgstr "LISTENING"
- 
--#: ../netstat.c:441
-+#: ../netstat.c:442
- msgid "CONN SENT"
- msgstr "CONN SENT"
- 
--#: ../netstat.c:442 ../netstat.c:1250
-+#: ../netstat.c:443 ../netstat.c:1255
- msgid "DISC SENT"
- msgstr "DISC SENT"
- 
--#: ../netstat.c:443 ../netstat.c:510 ../netstat.c:889 ../netstat.c:1251
-+#: ../netstat.c:444 ../netstat.c:511 ../netstat.c:894 ../netstat.c:1256
- msgid "ESTABLISHED"
- msgstr "ESTABLISHED"
- 
--#: ../netstat.c:465
-+#: ../netstat.c:466
- msgid "Active NET/ROM sockets\n"
- msgstr "Aktiivsed NET/ROM soklid\n"
- 
--#: ../netstat.c:466
-+#: ../netstat.c:467
- msgid ""
- "User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
- "Recv-Q\n"
-@@ -620,182 +632,182 @@ msgstr ""
- "Kasutaja   Sihtpunkt  L�htepunkt Liides  Olek         Vr/Vs    SaatJrk "
- "VvJrk\n"
- 
--#: ../netstat.c:476 ../netstat.c:1290
-+#: ../netstat.c:477 ../netstat.c:1295
- #, c-format
- msgid "Problem reading data from %s\n"
- msgstr "Probleem andmete lugemisel failist %s\n"
- 
--#: ../netstat.c:511
-+#: ../netstat.c:512
- msgid "SYN_SENT"
- msgstr "SYN_SENT"
- 
--#: ../netstat.c:512
-+#: ../netstat.c:513
- msgid "SYN_RECV"
- msgstr "SYN_RECV"
- 
--#: ../netstat.c:513
-+#: ../netstat.c:514
- msgid "FIN_WAIT1"
- msgstr "FIN_WAIT1"
- 
--#: ../netstat.c:514
-+#: ../netstat.c:515
- msgid "FIN_WAIT2"
- msgstr "FIN_WAIT2"
- 
--#: ../netstat.c:515
-+#: ../netstat.c:516
- msgid "TIME_WAIT"
- msgstr "TIME_WAIT"
- 
--#: ../netstat.c:516
-+#: ../netstat.c:517
- msgid "CLOSE"
- msgstr "CLOSE"
- 
--#: ../netstat.c:517
-+#: ../netstat.c:518
- msgid "CLOSE_WAIT"
- msgstr "CLOSE_WAIT"
- 
--#: ../netstat.c:518
-+#: ../netstat.c:519
- msgid "LAST_ACK"
- msgstr "LAST_ACK"
- 
--#: ../netstat.c:519
-+#: ../netstat.c:520
- msgid "LISTEN"
- msgstr "LISTEN"
- 
--#: ../netstat.c:520
-+#: ../netstat.c:521
- msgid "CLOSING"
- msgstr "CLOSING"
- 
--#: ../netstat.c:587
-+#: ../netstat.c:592
- #, c-format
- msgid "warning, got bogus igmp6 line %d.\n"
- msgstr "Hoiatus - sain imeliku igmp6 rea (nr. %d)\n"
- 
--#: ../netstat.c:592 ../netstat.c:630 ../netstat.c:751 ../netstat.c:883
--#: ../netstat.c:1014 ../netstat.c:1019
-+#: ../netstat.c:597 ../netstat.c:635 ../netstat.c:756 ../netstat.c:888
-+#: ../netstat.c:1019 ../netstat.c:1024
- #, c-format
- msgid "netstat: unsupported address family %d !\n"
- msgstr "netstat: aadressiperekonda %d ei toetata\n"
- 
--#: ../netstat.c:605 ../netstat.c:610 ../netstat.c:618 ../netstat.c:625
-+#: ../netstat.c:610 ../netstat.c:615 ../netstat.c:623 ../netstat.c:630
- #, c-format
- msgid "warning, got bogus igmp line %d.\n"
- msgstr "Hoiatus - sain imeliku igmp rea (nr. %d)\n"
- 
--#: ../netstat.c:668
-+#: ../netstat.c:673
- msgid "Active X.25 sockets\n"
- msgstr "Aktiivsed X.25 soklid\n"
- 
- #. IMHO, Vr/Vs is not very usefull --SF
--#: ../netstat.c:670
-+#: ../netstat.c:675
- msgid ""
- "Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  "
- "Recv-Q\n"
- msgstr ""
- "Sihtpunkt    L�htepunkt      Liides  LCI  Olek         Vr/Vs  SaatJrk VvJrk\n"
- 
--#: ../netstat.c:747
-+#: ../netstat.c:752
- msgid "warning, got bogus tcp line.\n"
- msgstr "Hoiatus - sain imeliku tcp rea\n"
- 
--#: ../netstat.c:788 ../netstat.c:938 ../netstat.c:1057
-+#: ../netstat.c:793 ../netstat.c:943 ../netstat.c:1062
- #, c-format
- msgid "off (0.00/%ld/%d)"
- msgstr "eik�i ((0.00/%ld/%d)"
- 
--#: ../netstat.c:792
-+#: ../netstat.c:797
- #, c-format
- msgid "on (%2.2f/%ld/%d)"
- msgstr "k�ib (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:797
-+#: ../netstat.c:802
- #, c-format
- msgid "keepalive (%2.2f/%ld/%d)"
- msgstr "keepalive (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:802
-+#: ../netstat.c:807
- #, c-format
- msgid "timewait (%2.2f/%ld/%d)"
- msgstr "timewait (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:807 ../netstat.c:947 ../netstat.c:1067
-+#: ../netstat.c:812 ../netstat.c:952 ../netstat.c:1072
- #, c-format
- msgid "unkn-%d (%2.2f/%ld/%d)"
- msgstr "eitea-%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:879
-+#: ../netstat.c:884
- msgid "warning, got bogus udp line.\n"
- msgstr "Hoiatus - sain imeliku udp rea\n"
- 
--#: ../netstat.c:897 ../netstat.c:1157 ../netstat.c:1190
-+#: ../netstat.c:902 ../netstat.c:1162 ../netstat.c:1195
- msgid "UNKNOWN"
- msgstr "TUNDMATU"
- 
--#: ../netstat.c:943 ../netstat.c:1062
-+#: ../netstat.c:948 ../netstat.c:1067
- #, c-format
- msgid "on%d (%2.2f/%ld/%d)"
- msgstr "k�ib-%d (%2.2f/%ld/%d)"
- 
--#: ../netstat.c:1028
-+#: ../netstat.c:1033
- msgid "warning, got bogus raw line.\n"
- msgstr "Hoiatus - sain imeliku raw rea\n"
- 
--#: ../netstat.c:1110
-+#: ../netstat.c:1115
- msgid "warning, got bogus unix line.\n"
- msgstr "Hoiatus - sain imeliku unix rea\n"
- 
--#: ../netstat.c:1137
-+#: ../netstat.c:1142
- msgid "STREAM"
- msgstr "STREAM"
- 
--#: ../netstat.c:1141
-+#: ../netstat.c:1146
- msgid "DGRAM"
- msgstr "DGRAM"
- 
--#: ../netstat.c:1145
-+#: ../netstat.c:1150
- msgid "RAW"
- msgstr "RAW"
- 
--#: ../netstat.c:1149
-+#: ../netstat.c:1154
- msgid "RDM"
- msgstr "RDM"
- 
--#: ../netstat.c:1153
-+#: ../netstat.c:1158
- msgid "SEQPACKET"
- msgstr "SEQPACKET"
- 
--#: ../netstat.c:1162
-+#: ../netstat.c:1167
- msgid "FREE"
- msgstr "VABA"
- 
--#: ../netstat.c:1178
-+#: ../netstat.c:1183
- msgid "CONNECTING"
- msgstr "�HENDUMAS"
- 
--#: ../netstat.c:1182
-+#: ../netstat.c:1187
- msgid "CONNECTED"
- msgstr "�HENDATUD"
- 
--#: ../netstat.c:1186
-+#: ../netstat.c:1191
- msgid "DISCONNECTING"
- msgstr "LAHTI�HENDUMAS"
- 
--#: ../netstat.c:1217
-+#: ../netstat.c:1222
- msgid "Active UNIX domain sockets "
- msgstr "Aktiivsed UNIX domeeni soklid "
- 
--#: ../netstat.c:1219 ../netstat.c:1729
-+#: ../netstat.c:1224 ../netstat.c:1735
- msgid "(servers and established)"
- msgstr "(serverid ja �hendatud)"
- 
--#: ../netstat.c:1222 ../netstat.c:1732
-+#: ../netstat.c:1227 ../netstat.c:1738
- msgid "(only servers)"
- msgstr "(ainult serverid)"
- 
--#: ../netstat.c:1224 ../netstat.c:1734
-+#: ../netstat.c:1229 ../netstat.c:1740
- msgid "(w/o servers)"
- msgstr "(ilma serveriteta)"
- 
--#: ../netstat.c:1227
-+#: ../netstat.c:1232
- msgid ""
- "\n"
- "Proto RefCnt Flags       Type       State         I-Node"
-@@ -803,32 +815,32 @@ msgstr ""
- "\n"
- "Proto Mitu   Lipud       T��p       Olek         I-kirje "
- 
--#: ../netstat.c:1229
-+#: ../netstat.c:1234
- msgid " Path\n"
- msgstr "Tee\n"
- 
--#: ../netstat.c:1249
-+#: ../netstat.c:1254
- msgid "SABM SENT"
- msgstr "SABM SENT"
- 
--#: ../netstat.c:1252
-+#: ../netstat.c:1257
- msgid "RECOVERY"
- msgstr "RECOVERY"
- 
--#: ../netstat.c:1266
-+#: ../netstat.c:1271
- msgid "Active AX.25 sockets\n"
- msgstr "Aktiivsed AX.25 soklid\n"
- 
--#: ../netstat.c:1267
-+#: ../netstat.c:1272
- msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
- msgstr "Sihtpunkt  L�htepunkt Liides  Olek         Vr/Vs    SaatJrk VvJrk\n"
- 
--#: ../netstat.c:1310
-+#: ../netstat.c:1315
- #, c-format
- msgid "problem reading data from %s\n"
- msgstr "Probleem andmete lugemisel failist %s\n"
- 
--#: ../netstat.c:1361
-+#: ../netstat.c:1366
- msgid ""
- "Active IPX sockets\n"
- "Proto Recv-Q Send-Q Local Address              Foreign Address            "
-@@ -838,23 +850,23 @@ msgstr ""
- "Proto VvJrk  SaatJrk Kohalik aadress           V�line aadress             "
- "Olek "
- 
--#: ../netstat.c:1363
-+#: ../netstat.c:1368
- msgid " User"
- msgstr " Kasutaja"
- 
--#: ../netstat.c:1397
-+#: ../netstat.c:1402
- msgid "ESTAB"
- msgstr "ESTAB"
- 
--#: ../netstat.c:1405
-+#: ../netstat.c:1410
- msgid "UNK."
- msgstr "UNK."
- 
--#: ../netstat.c:1443
-+#: ../netstat.c:1448
- msgid "Kernel Interface table\n"
- msgstr "Tuuma liideste tabel\n"
- 
--#: ../netstat.c:1447
-+#: ../netstat.c:1452
- msgid ""
- "Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
-@@ -862,11 +874,11 @@ msgstr ""
- "Liides  MTU Meetr RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
- "Lip\n"
- 
--#: ../netstat.c:1451
-+#: ../netstat.c:1456
- msgid "missing interface information"
- msgstr "Puudulik informatsioon liideste kohta"
- 
--#: ../netstat.c:1474
-+#: ../netstat.c:1479
- msgid ""
- "usage: netstat [-veenNcCF] [<Af>] -r         netstat "
- "{-V|--version|-h|--help}\n"
-@@ -874,11 +886,11 @@ msgstr ""
- "Kasutamine: netstat [-veenNcCF] [<Af>] -r\n"
- "            netstat {-V|--version|-h|--help}\n"
- 
--#: ../netstat.c:1475
-+#: ../netstat.c:1480
- msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
- msgstr "            netstat [-vnNcaeol] [<Sokkel> ...]\n"
- 
--#: ../netstat.c:1476
-+#: ../netstat.c:1481
- msgid ""
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
-@@ -886,25 +898,25 @@ msgstr ""
- "            netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
- 
--#: ../netstat.c:1478
-+#: ../netstat.c:1483
- msgid "        -r, --route              display routing table\n"
- msgstr "        -r, --route              ruutingutabeli n�itamine\n"
- 
--#: ../netstat.c:1479
-+#: ../netstat.c:1484
- msgid "        -i, --interfaces         display interface table\n"
- msgstr "        -i, --interfaces         liideste tabeli n�itamine\n"
- 
--#: ../netstat.c:1480
-+#: ../netstat.c:1485
- msgid "        -g, --groups             display multicast group memberships\n"
- msgstr "        -g, --groups             multiedastuse gruppide n�itamine\n"
- 
--#: ../netstat.c:1481
-+#: ../netstat.c:1486
- msgid ""
- "        -s, --statistics         display networking statistics (like SNMP)\n"
- msgstr ""
- "        -s, --statistics         v�rgu statistika n�itamine (SNMP stiilis)\n"
- 
--#: ../netstat.c:1483
-+#: ../netstat.c:1488
- msgid ""
- "        -M, --masquerade         display masqueraded connections\n"
- "\n"
-@@ -912,36 +924,32 @@ msgstr ""
- "        -M, --masquerade         maskeeritavate �henduste n�itamine\n"
- "\n"
- 
--#: ../netstat.c:1486 ../route.c:86
--msgid "        -n, --numeric            dont resolve names\n"
--msgstr "        -n, --numeric            mitte lahendada numbreid nimedeks\n"
--
--#: ../netstat.c:1487
--msgid "        --numeric-hosts          dont resolve host names\n"
-+#: ../netstat.c:1492
-+msgid "        --numeric-hosts          don't resolve host names\n"
- msgstr "        --numeric-hosts          mitte lahendada hostinimesid\n"
- 
--#: ../netstat.c:1488
--msgid "        --numeric-ports          dont resolve port names\n"
-+#: ../netstat.c:1493
-+msgid "        --numeric-ports          don't resolve port names\n"
- msgstr "        --numeric-ports          mitte lahendada pordinimesid\n"
- 
--#: ../netstat.c:1489
--msgid "        --numeric-users          dont resolve user names\n"
-+#: ../netstat.c:1494
-+msgid "        --numeric-users          don't resolve user names\n"
- msgstr "        --numeric-users          mitte lahendada kasutajanimesid\n"
- 
--#: ../netstat.c:1490
-+#: ../netstat.c:1495
- msgid "        -N, --symbolic           resolve hardware names\n"
- msgstr "        -N, --symbolic           lahendada riistvara aadressid\n"
- 
--#: ../netstat.c:1491 ../route.c:87
-+#: ../netstat.c:1496 ../route.c:88
- msgid "        -e, --extend             display other/more information\n"
- msgstr "        -e, --extend             muu info/lisainfo n�itamine\n"
- 
--#: ../netstat.c:1492
-+#: ../netstat.c:1497
- msgid "        -p, --programs           display PID/Program name for sockets\n"
- msgstr ""
- "        -p, --programs           soklite kohta PID/protsessi nime n�itamine\n"
- 
--#: ../netstat.c:1493
-+#: ../netstat.c:1498
- msgid ""
- "        -c, --continuous         continuous listing\n"
- "\n"
-@@ -949,22 +957,22 @@ msgstr ""
- "        -c, --continuous         pidevalt uuenev nimekiri\n"
- "\n"
- 
--#: ../netstat.c:1494
-+#: ../netstat.c:1499
- msgid "        -l, --listening          display listening server sockets\n"
- msgstr "        -l, --listening          kuulavate serversoklite n�itamine\n"
- 
--#: ../netstat.c:1495
-+#: ../netstat.c:1500
- msgid ""
- "        -a, --all, --listening   display all sockets (default: connected)\n"
- msgstr ""
- "        -a, --all, --listening   k�igi soklite n�itamine (vaikimisi "
- "�hendatud)\n"
- 
--#: ../netstat.c:1496
-+#: ../netstat.c:1501
- msgid "        -o, --timers             display timers\n"
- msgstr "        -o, --timers             taimerite n�itamine\n"
- 
--#: ../netstat.c:1497 ../route.c:88
-+#: ../netstat.c:1502 ../route.c:89
- msgid ""
- "        -F, --fib                display Forwarding Information Base "
- "(default)\n"
-@@ -972,7 +980,7 @@ msgstr ""
- "        -F, --fib                �ldiste ruutingutabelite n�itamine "
- "(vaikimisi)\n"
- 
--#: ../netstat.c:1498 ../route.c:89
-+#: ../netstat.c:1503 ../route.c:90
- msgid ""
- "        -C, --cache              display routing cache instead of FIB\n"
- "\n"
-@@ -981,7 +989,7 @@ msgstr ""
- "n�itamine\n"
- "\n"
- 
--#: ../netstat.c:1500
-+#: ../netstat.c:1505
- msgid ""
- "  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
- "--netrom\n"
-@@ -989,20 +997,19 @@ msgstr ""
- "  <Sokkel>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
- "--netrom\n"
- 
--#: ../netstat.c:1501 ../route.c:91
--#, c-format
--msgid "  <AF>=Use '-A <af>' or '--<af>' Default: %s\n"
--msgstr "  <AF>=kasutage '-A <af>' v�i '--<af>' vaikimisi: %s\n"
-+#: ../netstat.c:1506 ../route.c:92
-+msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgstr "  <AF>=kasutage '-A <af>' v�i '--<af>'; vaikimisi: %s\n"
- 
--#: ../netstat.c:1502 ../route.c:92
-+#: ../netstat.c:1507 ../route.c:93
- msgid "  List of possible address families (which support routing):\n"
- msgstr "  V�imalike ruutingu toetavate aadressiperekondade nimekiri:\n"
- 
--#: ../netstat.c:1726
-+#: ../netstat.c:1732
- msgid "Active Internet connections "
- msgstr "Aktiivsed interneti�hendused "
- 
--#: ../netstat.c:1736
-+#: ../netstat.c:1742
- msgid ""
- "\n"
- "Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
-@@ -1012,77 +1019,77 @@ msgstr ""
- "Proto  VvJrk SaatJrk Kohalik aadress        V�line aadress          Olek     "
- "  "
- 
--#: ../netstat.c:1738
-+#: ../netstat.c:1744
- msgid " User       Inode     "
- msgstr " Kasutaja   I-kirje   "
- 
--#: ../netstat.c:1741
-+#: ../netstat.c:1747
- msgid " Timer"
- msgstr " Taimer"
- 
--#: ../netstat.c:1771
-+#: ../netstat.c:1777
- msgid "IPv4 Group Memberships\n"
- msgstr "IPv4 grupikuuluvused\n"
- 
--#: ../netstat.c:1772
-+#: ../netstat.c:1778
- msgid "Interface       RefCnt Group\n"
- msgstr "Liides          Mitu   Grupp\n"
- 
--#: ../rarp.c:43
-+#: ../rarp.c:44
- msgid "This kernel does not support RARP.\n"
- msgstr "rarp: tuum ei toeta RARP'i\n"
- 
--#: ../rarp.c:82
-+#: ../rarp.c:83
- #, c-format
- msgid "no RARP entry for %s.\n"
- msgstr "rarp: %s jaoks pole RARP kirjet\n"
- 
--#: ../rarp.c:95
-+#: ../rarp.c:96
- #, c-format
- msgid "%s: bad hardware address\n"
- msgstr "rarp: vigane riistvaraline aadress %s\n"
- 
--#: ../rarp.c:127
-+#: ../rarp.c:128
- #, c-format
- msgid "rarp: cannot open file %s:%s.\n"
- msgstr "rarp: ei saa avada faili %s:%s\n"
- 
--#: ../rarp.c:139
-+#: ../rarp.c:140
- #, c-format
- msgid "rarp: format error at %s:%u\n"
- msgstr "rarp: vorminguviga failis %s real %u\n"
- 
--#: ../rarp.c:143 ../rarp.c:287
-+#: ../rarp.c:144 ../rarp.c:289
- #, c-format
- msgid "rarp: %s: unknown host\n"
- msgstr "rarp: tundmatu host %s\n"
- 
--#: ../rarp.c:146
-+#: ../rarp.c:147
- #, c-format
- msgid "rarp: cannot set entry from %s:%u\n"
- msgstr "rarp: ei saa kehtestada kirjet failist %s realt %u\n"
- 
--#: ../rarp.c:175
-+#: ../rarp.c:176
- msgid "Usage: rarp -a                               list entries in cache.\n"
- msgstr ""
- "Kasutamine:\n"
- "  rarp -a                              puhvris olevate kirjete vaatamine\n"
- 
--#: ../rarp.c:176
-+#: ../rarp.c:177
- msgid "       rarp -d <hostname>                    delete entry from cache.\n"
- msgstr "  rarp -d <hosti nimi>                 kirje kustutamine puhvrist\n"
- 
--#: ../rarp.c:177
-+#: ../rarp.c:178
- msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
- msgstr "  rarp [<HW>] -s <hosti nimi> <hwaddr> kirje lisamine puhvrisse\n"
- 
--#: ../rarp.c:178
-+#: ../rarp.c:179
- msgid ""
- "       rarp -f                               add entries from /etc/ethers.\n"
- msgstr ""
- "  rarp -f                              kirjete lisamine failist /etc/ethers\n"
- 
--#: ../rarp.c:179
-+#: ../rarp.c:180
- msgid ""
- "       rarp -V                               display program version.\n"
- "\n"
-@@ -1090,24 +1097,24 @@ msgstr ""
- "  rarp -V                              programmi versiooni n�itamine\n"
- "\n"
- 
--#: ../rarp.c:236
-+#: ../rarp.c:238
- #, c-format
- msgid "%s: illegal option mix.\n"
- msgstr "%s: lubamatu v�tmete kombinatsioon\n"
- 
--#: ../rarp.c:267
-+#: ../rarp.c:269
- #, c-format
- msgid "rarp: %s: unknown hardware type.\n"
- msgstr "rarp: tundmatu riistvara t��p %s\n"
- 
--#: ../route.c:79
-+#: ../route.c:80
- msgid ""
- "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
- msgstr ""
- "Kasutamine:\n"
- "    route [-nNvee] [-FC] [<AF>]           Tuuma ruutingutabeli n�itamine\n"
- 
--#: ../route.c:80
-+#: ../route.c:81
- msgid ""
- "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
- "\n"
-@@ -1115,7 +1122,7 @@ msgstr ""
- "    route [-v] [-FC] {add|del|flush} ...  Tuuma ruutingutabeli muutmine\n"
- "\n"
- 
--#: ../route.c:82
-+#: ../route.c:83
- msgid ""
- "       route {-h|--help} [<AF>]              Detailed usage syntax for "
- "specified AF.\n"
-@@ -1123,7 +1130,7 @@ msgstr ""
- "    route {-h|--help} [<AF>]              Detailne s�ntaks perekonna AF "
- "jaoks\n"
- 
--#: ../route.c:83
-+#: ../route.c:84
- msgid ""
- "       route {-V|--version}                  Display version/author and "
- "exit.\n"
-@@ -1149,25 +1156,25 @@ msgstr "             plipconfig -V | --version\n"
- msgid "%s\tnibble %lu  trigger %lu\n"
- msgstr "%s\tnibble %lu  trigger %lu\n"
- 
--#: ../iptunnel.c:84
-+#: ../iptunnel.c:85
- msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
- msgstr "Kasutamine: iptunnel { add | change | del | show } [ NIMI ]\n"
- 
--#: ../iptunnel.c:85
-+#: ../iptunnel.c:86
- msgid ""
- "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
- msgstr ""
- "             [ mode { ipip | gre | sit } ] [ remote AADR ] [ local AADR ]\n"
- 
--#: ../iptunnel.c:86
-+#: ../iptunnel.c:87
- msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- msgstr "             [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- 
--#: ../iptunnel.c:87
-+#: ../iptunnel.c:88
- msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
- msgstr "             [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev LIIDES ]\n"
- 
--#: ../iptunnel.c:88
-+#: ../iptunnel.c:89
- msgid ""
- "       iptunnel -V | --version\n"
- "\n"
-@@ -1175,83 +1182,83 @@ msgstr ""
- "             iptunnel -V | --version\n"
- "\n"
- 
--#: ../iptunnel.c:89
-+#: ../iptunnel.c:90
- msgid "Where: NAME := STRING\n"
- msgstr "Kus:   NIMI := STRING\n"
- 
--#: ../iptunnel.c:90
-+#: ../iptunnel.c:91
- msgid "       ADDR := { IP_ADDRESS | any }\n"
- msgstr "       AADR := { IP_AADRESS | any }\n"
- 
--#: ../iptunnel.c:91
-+#: ../iptunnel.c:92
- msgid "       TOS  := { NUMBER | inherit }\n"
- msgstr "       TOS  := { ARV | inherit }\n"
- 
--#: ../iptunnel.c:92
-+#: ../iptunnel.c:93
- msgid "       TTL  := { 1..255 | inherit }\n"
- msgstr "       TTL  := { 1..255 | inherit }\n"
- 
--#: ../iptunnel.c:93
-+#: ../iptunnel.c:94
- msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
- msgstr ""
- "       KEY  := { PUNKTIDEGA_ARVUNELIK | ARV }\n"
- "       LIIDES := F��SILISE_LIIDESE_NIMI\n"
- 
--#: ../iptunnel.c:331
-+#: ../iptunnel.c:332
- msgid "Keys are not allowed with ipip and sit.\n"
- msgstr "ipip ja sit juures ei ole v�tmed lubatud\n"
- 
--#: ../iptunnel.c:351
-+#: ../iptunnel.c:352
- msgid "Broadcast tunnel requires a source address.\n"
- msgstr "Leviedastusega tunnel vajab l�hteaadressi\n"
- 
--#: ../iptunnel.c:366
-+#: ../iptunnel.c:367
- msgid "ttl != 0 and noptmudisc are incompatible\n"
- msgstr "ttl != 0 ning noptmudisc ei sobi kokku\n"
- 
--#: ../iptunnel.c:378
-+#: ../iptunnel.c:379
- msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
- msgstr "Ei suuda m��rata tunneli moodi (ipip, gre v�i sit)\n"
- 
--#: ../iptunnel.c:416
-+#: ../iptunnel.c:417
- #, c-format
- msgid "%s: %s/ip  remote %s  local %s "
- msgstr "%s: %s/ip teises otsas %s  siin %s "
- 
--#: ../iptunnel.c:420
-+#: ../iptunnel.c:421
- msgid "unknown"
- msgstr "tundmatu"
- 
--#: ../iptunnel.c:452
-+#: ../iptunnel.c:453
- msgid "  Drop packets out of sequence.\n"
- msgstr "  J�rjekorrav�lised paketid visatakse minema\n"
- 
--#: ../iptunnel.c:454
-+#: ../iptunnel.c:455
- msgid "  Checksum in received packet is required.\n"
- msgstr "  Vastuv�etavates pakettides on kontrollsumma kohustuslik\n"
- 
--#: ../iptunnel.c:456
-+#: ../iptunnel.c:457
- msgid "  Sequence packets on output.\n"
- msgstr "  V�ljuvad paketid varustatakse j�rjekorranumbritega\n"
- 
--#: ../iptunnel.c:458
-+#: ../iptunnel.c:459
- msgid "  Checksum output packets.\n"
- msgstr "  V�ljuvad paketid varustatakse kontrollsummaga\n"
- 
--#: ../iptunnel.c:486
-+#: ../iptunnel.c:487
- msgid "Wrong format of /proc/net/dev. Sorry.\n"
- msgstr "/proc/net/dev on vales formaadis. Vale tuuma versioon?\n"
- 
--#: ../iptunnel.c:499
-+#: ../iptunnel.c:500
- #, c-format
- msgid "Failed to get type of [%s]\n"
- msgstr "Ei suutnud kindlaks teha liidese %s t��pi\n"
- 
--#: ../iptunnel.c:515
-+#: ../iptunnel.c:516
- msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
- msgstr "RX: Pakette    Baite        Vigu   KSumVigu JrkVigu  Levipakette\n"
- 
--#: ../iptunnel.c:518
-+#: ../iptunnel.c:519
- msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
- msgstr "TX: Pakette    Baite        Vigu   DeadLoop EiRuudi  M�luOtsas\n"
- 
-@@ -1972,15 +1979,15 @@ msgstr "rresolve: toetuseta aadressiperekond %d\n"
- msgid "[UNKNOWN]"
- msgstr "[TUNDMATU]"
- 
--#: ../lib/inet6_gr.c:79
-+#: ../lib/inet6_gr.c:71
- msgid "INET6 (IPv6) not configured in this system.\n"
- msgstr "INET6 (IPv6) pole antud s�steemis konfigureeritud\n"
- 
--#: ../lib/inet6_gr.c:82
-+#: ../lib/inet6_gr.c:74
- msgid "Kernel IPv6 routing table\n"
- msgstr "Tuuma IPv6 ruutingutabel\n"
- 
--#: ../lib/inet6_gr.c:84
-+#: ../lib/inet6_gr.c:76
- msgid ""
- "Destination                                 Next Hop                         "
- "       Flags Metric Ref    Use Iface\n"
-@@ -1988,11 +1995,11 @@ msgstr ""
- "Sihtpunkt                                   J�rgmine samm                    "
- "       Lipud Meetr  Mitu Kasut Liides\n"
- 
--#: ../lib/inet6_gr.c:158
-+#: ../lib/inet6_gr.c:150
- msgid "Kernel IPv6 Neighbour Cache\n"
- msgstr "Tuuma IPv6 naabrite puhver\n"
- 
--#: ../lib/inet6_gr.c:161
-+#: ../lib/inet6_gr.c:153
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State\n"
-@@ -2000,7 +2007,7 @@ msgstr ""
- "Naaber                                      HW Aadress        Liides   Lipud "
- "Mitu Olek\n"
- 
--#: ../lib/inet6_gr.c:165
-+#: ../lib/inet6_gr.c:157
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State            Stale(sec) Delete(sec)\n"
-@@ -2538,29 +2545,29 @@ msgstr "iptunnel: %s on vigane IPv4 aadress\n"
- msgid "ip: argument is wrong: %s\n"
- msgstr "iptunnel: vale argument %s\n"
- 
--#: ../ipmaddr.c:58
-+#: ../ipmaddr.c:61
- msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
- msgstr "Kasutamine: ipmaddr [ add | del ] MULTIAADR dev STRING\n"
- 
--#: ../ipmaddr.c:59
-+#: ../ipmaddr.c:62
- msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- msgstr "            ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- 
--#: ../ipmaddr.c:60
-+#: ../ipmaddr.c:63
- msgid "       ipmaddr -V | -version\n"
- msgstr "            ipmaddr -V | -version\n"
- 
--#: ../ipmaddr.c:260
-+#: ../ipmaddr.c:263
- #, c-format
- msgid "family %d "
- msgstr "perekond %d "
- 
--#: ../ipmaddr.c:269
-+#: ../ipmaddr.c:272
- #, c-format
- msgid " users %d"
- msgstr " kasutajaid %d"
- 
--#: ../ipmaddr.c:355
-+#: ../ipmaddr.c:358
- msgid "Cannot create socket"
- msgstr "Ei saa avada soklit"
- 
-diff --git a/po/fr.po b/po/fr.po
-index e8e7542..e4e8245 100644
---- a/po/fr.po
-+++ b/po/fr.po
-@@ -9,7 +9,7 @@ msgstr ""
- "Last-Translator: J.M.Vansteene <vanstee@worldnet.fr>\n"
- "Language-Team:\n"
- "MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=iso8859-1\n"
-+"Content-Type: text/plain; charset=iso-8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
- #: ../arp.c:110 ../arp.c:269
-@@ -59,8 +59,12 @@ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr "arp: ne peut d�finir l'entr�e en ligne %u du fichier ether %s !\n"
- 
- #: ../arp.c:437
--msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
--msgstr "Adresse\t\t\tTypeMap\tAdresseMat\t   Indicateurs\t\t  Iface\n"
-+msgid ""
-+"Address                  HWtype  HWaddress           Flags Mask            "
-+"Iface\n"
-+msgstr ""
-+"Adresse                  TypeMap AdresseMat          Indicateurs           "
-+"Iface\n"
- 
- #: ../arp.c:467
- msgid "(incomplete)"
-diff --git a/po/net-tools.pot b/po/net-tools.pot
-index 0231aac..cdeccc9 100644
---- a/po/net-tools.pot
-+++ b/po/net-tools.pot
-@@ -1,263 +1,285 @@
- # SOME DESCRIPTIVE TITLE.
--# Copyright (C) YEAR Free Software Foundation, Inc.
-+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-+# This file is distributed under the same license as the PACKAGE package.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
- #, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
--"POT-Creation-Date: 2001-04-15 15:40+0100\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2005-05-16 05:18+0200\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <LL@li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=CHARSET\n"
--"Content-Transfer-Encoding: ENCODING\n"
-+"Content-Transfer-Encoding: 8bit\n"
- 
--#: ../arp.c:111 ../arp.c:270
-+#: ../arp.c:111 ../arp.c:276
-+#, c-format
- msgid "arp: need host name\n"
- msgstr ""
- 
--#: ../arp.c:208 ../arp.c:222
-+#: ../arp.c:213 ../arp.c:228
- #, c-format
- msgid "No ARP entry for %s\n"
- msgstr ""
- 
--#: ../arp.c:240
-+#: ../arp.c:246
- #, c-format
- msgid "arp: cant get HW-Address for `%s': %s.\n"
- msgstr ""
- 
--#: ../arp.c:244
-+#: ../arp.c:250
-+#, c-format
- msgid "arp: protocol type mismatch.\n"
- msgstr ""
- 
--#: ../arp.c:253
-+#: ../arp.c:259
- #, c-format
- msgid "arp: device `%s' has HW address %s `%s'.\n"
- msgstr ""
- 
--#: ../arp.c:283
-+#: ../arp.c:289
-+#, c-format
- msgid "arp: need hardware address\n"
- msgstr ""
- 
--#: ../arp.c:291
-+#: ../arp.c:297
-+#, c-format
- msgid "arp: invalid hardware address\n"
- msgstr ""
- 
--#: ../arp.c:388
-+#: ../arp.c:394
- #, c-format
- msgid "arp: cannot open etherfile %s !\n"
- msgstr ""
- 
--#: ../arp.c:404
-+#: ../arp.c:410
- #, c-format
- msgid "arp: format error on line %u of etherfile %s !\n"
- msgstr ""
- 
--#: ../arp.c:417
-+#: ../arp.c:423
- #, c-format
- msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr ""
- 
--#: ../arp.c:438
-+#: ../arp.c:444
-+#, c-format
- msgid ""
- "Address                  HWtype  HWaddress           Flags Mask            "
- "Iface\n"
- msgstr ""
- 
--#: ../arp.c:468
-+#: ../arp.c:472
-+msgid "<from_interface>"
-+msgstr ""
-+
-+#: ../arp.c:474
- msgid "(incomplete)"
- msgstr ""
- 
--#: ../arp.c:485
-+#: ../arp.c:491
- #, c-format
- msgid "%s (%s) at "
- msgstr ""
- 
--#: ../arp.c:491
-+#: ../arp.c:497
-+#, c-format
- msgid "<incomplete> "
- msgstr ""
- 
--#: ../arp.c:497
-+#: ../arp.c:503
- #, c-format
- msgid "netmask %s "
- msgstr ""
- 
--#: ../arp.c:514
-+#: ../arp.c:520
- #, c-format
- msgid "on %s\n"
- msgstr ""
- 
--#: ../arp.c:593
-+#: ../arp.c:599
- #, c-format
- msgid "Entries: %d\tSkipped: %d\tFound: %d\n"
- msgstr ""
- 
--#: ../arp.c:597
-+#: ../arp.c:603
- #, c-format
- msgid "%s (%s) -- no entry\n"
- msgstr ""
- 
--#: ../arp.c:599
-+#: ../arp.c:605
- #, c-format
- msgid "arp: in %d entries no match found.\n"
- msgstr ""
- 
--#: ../arp.c:614
-+#: ../arp.c:620
-+#, c-format
- msgid ""
- "Usage:\n"
- "  arp [-vn]  [<HW>] [-i <if>] [-a] [<hostname>]             <-Display ARP "
- "cache\n"
- msgstr ""
- 
--#: ../arp.c:615
-+#: ../arp.c:621
-+#, c-format
- msgid ""
- "  arp [-v]          [-i <if>] -d  <hostname> [pub][nopub]    <-Delete ARP "
- "entry\n"
- msgstr ""
- 
--#: ../arp.c:616
-+#: ../arp.c:622
-+#, c-format
- msgid ""
--"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]              <-Add entry from "
-+"  arp [-vnD] [<HW>] [-i <if>] -f  [<filename>]            <-Add entry from "
- "file\n"
- msgstr ""
- 
--#: ../arp.c:617
-+#: ../arp.c:623
-+#, c-format
- msgid ""
- "  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [temp][nopub] <-Add "
- "entry\n"
- msgstr ""
- 
--#: ../arp.c:618
--msgid ""
--"  arp [-v]   [<HW>] [-i <if>] -s  <hostname> <hwaddr> [netmask <nm>] pub  "
--"<-''-\n"
--msgstr ""
--
--#: ../arp.c:619
-+#: ../arp.c:624
-+#, c-format
- msgid ""
- "  arp [-v]   [<HW>] [-i <if>] -Ds <hostname> <if> [netmask <nm>] pub      "
- "<-''-\n"
- "\n"
- msgstr ""
- 
--#: ../arp.c:621
-+#: ../arp.c:626
-+#, c-format
- msgid ""
- "        -a                       display (all) hosts in alternative (BSD) "
- "style\n"
- msgstr ""
- 
--#: ../arp.c:622
-+#: ../arp.c:627
-+#, c-format
- msgid "        -s, --set                set a new ARP entry\n"
- msgstr ""
- 
--#: ../arp.c:623
-+#: ../arp.c:628
-+#, c-format
- msgid "        -d, --delete             delete a specified entry\n"
- msgstr ""
- 
--#: ../arp.c:624 ../netstat.c:1490 ../route.c:86
-+#: ../arp.c:629 ../netstat.c:1503 ../route.c:86
-+#, c-format
- msgid "        -v, --verbose            be verbose\n"
- msgstr ""
- 
--#: ../arp.c:625 ../netstat.c:1491 ../route.c:87
-+#: ../arp.c:630 ../netstat.c:1504 ../route.c:87
-+#, c-format
- msgid "        -n, --numeric            don't resolve names\n"
- msgstr ""
- 
--#: ../arp.c:626
-+#: ../arp.c:631
-+#, c-format
- msgid ""
- "        -i, --device             specify network interface (e.g. eth0)\n"
- msgstr ""
- 
--#: ../arp.c:627
-+#: ../arp.c:632
-+#, c-format
- msgid "        -D, --use-device         read <hwaddr> from given device\n"
- msgstr ""
- 
--#: ../arp.c:628
-+#: ../arp.c:633
-+#, c-format
- msgid "        -A, -p, --protocol       specify protocol family\n"
- msgstr ""
- 
--#: ../arp.c:629
-+#: ../arp.c:634
-+#, c-format
- msgid ""
--"        -f, --file               read new entries from file or from "
--"/etc/ethers\n"
-+"        -f, --file               read new entries from file or from /etc/"
-+"ethers\n"
- "\n"
- msgstr ""
- 
--#: ../arp.c:631 ../rarp.c:182
-+#: ../arp.c:636 ../rarp.c:182
- #, c-format
- msgid "  <HW>=Use '-H <hw>' to specify hardware address type. Default: %s\n"
- msgstr ""
- 
--#: ../arp.c:632 ../rarp.c:183
-+#: ../arp.c:637 ../rarp.c:183
-+#, c-format
- msgid "  List of possible hardware types (which support ARP):\n"
- msgstr ""
- 
--#: ../arp.c:666 ../arp.c:751
-+#: ../arp.c:671 ../arp.c:756
- #, c-format
- msgid "%s: hardware type not supported!\n"
- msgstr ""
- 
--#: ../arp.c:670
-+#: ../arp.c:675
- #, c-format
- msgid "%s: address family not supported!\n"
- msgstr ""
- 
--#: ../arp.c:705
-+#: ../arp.c:710
-+#, c-format
- msgid "arp: -N not yet supported.\n"
- msgstr ""
- 
--#: ../arp.c:715
-+#: ../arp.c:720
- #, c-format
- msgid "arp: %s: unknown address family.\n"
- msgstr ""
- 
--#: ../arp.c:724
-+#: ../arp.c:729
- #, c-format
- msgid "arp: %s: unknown hardware type.\n"
- msgstr ""
- 
--#: ../arp.c:743
-+#: ../arp.c:748
- #, c-format
- msgid "arp: %s: kernel only supports 'inet'.\n"
- msgstr ""
- 
--#: ../arp.c:756
-+#: ../arp.c:761
- #, c-format
- msgid "arp: %s: hardware type without ARP support.\n"
- msgstr ""
- 
--#: ../hostname.c:70
-+#: ../hostname.c:71
- #, c-format
- msgid "Setting nodename to `%s'\n"
- msgstr ""
- 
--#: ../hostname.c:75
-+#: ../hostname.c:76
- #, c-format
- msgid "%s: you must be root to change the node name\n"
- msgstr ""
- 
--#: ../hostname.c:78 ../hostname.c:98 ../hostname.c:117
-+#: ../hostname.c:79 ../hostname.c:100 ../hostname.c:118
- #, c-format
- msgid "%s: name too long\n"
- msgstr ""
- 
--#: ../hostname.c:90
-+#: ../hostname.c:92
- #, c-format
- msgid "Setting hostname to `%s'\n"
- msgstr ""
- 
--#: ../hostname.c:95
-+#: ../hostname.c:97
- #, c-format
- msgid "%s: you must be root to change the host name\n"
- msgstr ""
- 
--#: ../hostname.c:109
-+#: ../hostname.c:110
- #, c-format
- msgid "Setting domainname to `%s'\n"
- msgstr ""
- 
--#: ../hostname.c:114
-+#: ../hostname.c:115
- #, c-format
- msgid "%s: you must be root to change the domain name\n"
- msgstr ""
-@@ -282,83 +304,99 @@ msgstr ""
- msgid "Result: h_addr_list=`%s'\n"
- msgstr ""
- 
--#: ../hostname.c:210
-+#: ../hostname.c:209
- #, c-format
- msgid "%s: can't open `%s'\n"
- msgstr ""
- 
--#: ../hostname.c:224
-+#: ../hostname.c:223
-+#, c-format
- msgid "Usage: hostname [-v] {hostname|-F file}      set hostname (from file)\n"
- msgstr ""
- 
--#: ../hostname.c:225
-+#: ../hostname.c:224
-+#, c-format
- msgid ""
- "       domainname [-v] {nisdomain|-F file}   set NIS domainname (from file)\n"
- msgstr ""
- 
--#: ../hostname.c:227
-+#: ../hostname.c:226
-+#, c-format
- msgid ""
- "       nodename [-v] {nodename|-F file}      set DECnet node name (from "
- "file)\n"
- msgstr ""
- 
--#: ../hostname.c:229
-+#: ../hostname.c:228
-+#, c-format
- msgid "       hostname [-v] [-d|-f|-s|-a|-i|-y|-n]  display formatted name\n"
- msgstr ""
- 
--#: ../hostname.c:230
-+#: ../hostname.c:229
-+#, c-format
- msgid ""
- "       hostname [-v]                         display hostname\n"
- "\n"
- msgstr ""
- 
--#: ../hostname.c:231
-+#: ../hostname.c:230
-+#, c-format
- msgid ""
- "       hostname -V|--version|-h|--help       print info and exit\n"
- "\n"
- msgstr ""
- 
--#: ../hostname.c:232
-+#: ../hostname.c:231
-+#, c-format
- msgid ""
- "    dnsdomainname=hostname -d, {yp,nis,}domainname=hostname -y\n"
- "\n"
- msgstr ""
- 
--#: ../hostname.c:233
-+#: ../hostname.c:232
-+#, c-format
- msgid "    -s, --short           short host name\n"
- msgstr ""
- 
--#: ../hostname.c:234
-+#: ../hostname.c:233
-+#, c-format
- msgid "    -a, --alias           alias names\n"
- msgstr ""
- 
--#: ../hostname.c:235
-+#: ../hostname.c:234
-+#, c-format
- msgid "    -i, --ip-address      addresses for the hostname\n"
- msgstr ""
- 
--#: ../hostname.c:236
-+#: ../hostname.c:235
-+#, c-format
- msgid "    -f, --fqdn, --long    long host name (FQDN)\n"
- msgstr ""
- 
--#: ../hostname.c:237
-+#: ../hostname.c:236
-+#, c-format
- msgid "    -d, --domain          DNS domain name\n"
- msgstr ""
- 
--#: ../hostname.c:238
-+#: ../hostname.c:237
-+#, c-format
- msgid "    -y, --yp, --nis       NIS/YP domainname\n"
- msgstr ""
- 
--#: ../hostname.c:240
-+#: ../hostname.c:239
-+#, c-format
- msgid "    -n, --node            DECnet node name\n"
- msgstr ""
- 
--#: ../hostname.c:242
-+#: ../hostname.c:241
-+#, c-format
- msgid ""
- "    -F, --file            read hostname or NIS domainname from given file\n"
- "\n"
- msgstr ""
- 
--#: ../hostname.c:244
-+#: ../hostname.c:243
-+#, c-format
- msgid ""
- "   This command can read or set the hostname or the NIS domainname. You can\n"
- "   also read the DNS domain or the FQDN (fully qualified domain name).\n"
-@@ -373,12 +411,14 @@ msgid "%s: You can't change the DNS domain name with this command\n"
- msgstr ""
- 
- #: ../hostname.c:341
-+#, c-format
- msgid ""
- "\n"
- "Unless you are using bind or NIS for host lookups you can change the DNS\n"
- msgstr ""
- 
- #: ../hostname.c:342
-+#, c-format
- msgid "domain name (which is part of the FQDN) in the /etc/hosts file.\n"
- msgstr ""
- 
-@@ -397,557 +437,697 @@ msgstr ""
- msgid "getnodename()=`%s'\n"
- msgstr ""
- 
--#: ../ifconfig.c:108
-+#: ../ifconfig.c:107 ../netstat.c:1465
-+#, c-format
- msgid ""
--"Iface   MTU Met    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
-+"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR "
- "Flg\n"
- msgstr ""
- 
--#: ../ifconfig.c:130 ../ifconfig.c:162
-+#: ../ifconfig.c:129 ../ifconfig.c:161
- #, c-format
--msgid "%s: unknown interface: %s\n"
-+msgid "%s: ERROR while getting interface flags: %s\n"
- msgstr ""
- 
--#: ../ifconfig.c:154 ../ifconfig.c:734 ../ifconfig.c:825 ../ifconfig.c:936
-+#: ../ifconfig.c:153 ../ifconfig.c:185 ../ifconfig.c:791 ../ifconfig.c:884
-+#: ../ifconfig.c:997
-+#, c-format
- msgid "No support for INET on this system.\n"
- msgstr ""
- 
--#: ../ifconfig.c:177
-+#: ../ifconfig.c:193
-+#, c-format
-+msgid "%s: ERROR while testing interface flags: %s\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:202
-+#, c-format
- msgid ""
- "Usage:\n"
--"  ifconfig [-a] [-i] [-v] [-s] <interface> [[<AF>] <address>]\n"
-+"  ifconfig [-a] [-v] [-s] <interface> [[<AF>] <address>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:179
-+#: ../ifconfig.c:204
-+#, c-format
- msgid "  [add <address>[/<prefixlen>]]\n"
- msgstr ""
- 
--#: ../ifconfig.c:180
-+#: ../ifconfig.c:205
-+#, c-format
- msgid "  [del <address>[/<prefixlen>]]\n"
- msgstr ""
- 
--#: ../ifconfig.c:181
-+#: ../ifconfig.c:206
-+#, c-format
- msgid "  [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n"
- msgstr ""
- 
--#: ../ifconfig.c:182
-+#: ../ifconfig.c:207
-+#, c-format
- msgid "  [netmask <address>]  [dstaddr <address>]  [tunnel <address>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:185
-+#: ../ifconfig.c:210
-+#, c-format
- msgid "  [outfill <NN>] [keepalive <NN>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:187
-+#: ../ifconfig.c:212
-+#, c-format
- msgid "  [hw <HW> <address>]  [metric <NN>]  [mtu <NN>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:188
-+#: ../ifconfig.c:213
-+#, c-format
- msgid "  [[-]trailers]  [[-]arp]  [[-]allmulti]\n"
- msgstr ""
- 
--#: ../ifconfig.c:189
-+#: ../ifconfig.c:214
-+#, c-format
- msgid "  [multicast]  [[-]promisc]\n"
- msgstr ""
- 
--#: ../ifconfig.c:190
-+#: ../ifconfig.c:215
-+#, c-format
- msgid "  [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]  [media <type>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:192
-+#: ../ifconfig.c:217
-+#, c-format
- msgid "  [txqueuelen <NN>]\n"
- msgstr ""
- 
--#: ../ifconfig.c:195
-+#: ../ifconfig.c:220
-+#, c-format
- msgid "  [[-]dynamic]\n"
- msgstr ""
- 
--#: ../ifconfig.c:197
-+#: ../ifconfig.c:222
-+#, c-format
- msgid ""
- "  [up|down] ...\n"
- "\n"
- msgstr ""
- 
--#: ../ifconfig.c:199
-+#: ../ifconfig.c:224
-+#, c-format
- msgid "  <HW>=Hardware Type.\n"
- msgstr ""
- 
--#: ../ifconfig.c:200
-+#: ../ifconfig.c:225
-+#, c-format
- msgid "  List of possible hardware types:\n"
- msgstr ""
- 
- #. 1 = ARPable
--#: ../ifconfig.c:202
-+#: ../ifconfig.c:227
- #, c-format
- msgid "  <AF>=Address family. Default: %s\n"
- msgstr ""
- 
--#: ../ifconfig.c:203
-+#: ../ifconfig.c:228
-+#, c-format
- msgid "  List of possible address families:\n"
- msgstr ""
- 
--#: ../ifconfig.c:278
-+#: ../ifconfig.c:304
- #, c-format
- msgid "ifconfig: option `%s' not recognised.\n"
- msgstr ""
- 
--#: ../ifconfig.c:280 ../ifconfig.c:925
-+#: ../ifconfig.c:306 ../ifconfig.c:987
-+#, c-format
- msgid "ifconfig: `--help' gives usage information.\n"
- msgstr ""
- 
--#: ../ifconfig.c:355
-+#: ../ifconfig.c:381
-+#, c-format
- msgid "Unknown media type.\n"
- msgstr ""
- 
--#: ../ifconfig.c:647
-+#: ../ifconfig.c:418
-+#, c-format
-+msgid ""
-+"Warning: Interface %s still in promisc mode... maybe other application is "
-+"running?\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:430
-+#, c-format
-+msgid "Warning: Interface %s still in MULTICAST mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:442
-+#, c-format
-+msgid "Warning: Interface %s still in ALLMULTI mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:466
-+#, c-format
-+msgid "Warning: Interface %s still in DYNAMIC mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:524
-+#, c-format
-+msgid "Warning: Interface %s still in BROADCAST mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:535
-+#, c-format
-+msgid "ifconfig: Error resolving '%s' for broadcast\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:560
-+#, c-format
-+msgid "ifconfig: Error resolving '%s' for dstaddr\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:583
-+#, c-format
-+msgid "ifconfig: Error resolving '%s' for netmask\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:662
-+#, c-format
-+msgid "Warning: Interface %s still in POINTOPOINT mode.\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:673
-+#, c-format
-+msgid "ifconfig: Error resolving '%s' for pointopoint\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:697
- #, c-format
- msgid "hw address type `%s' has no handler to set address. failed.\n"
- msgstr ""
- 
--#: ../ifconfig.c:656
-+#: ../ifconfig.c:706
- #, c-format
- msgid "%s: invalid %s address.\n"
- msgstr ""
- 
--#: ../ifconfig.c:700 ../ifconfig.c:790 ../ifconfig.c:876
-+#: ../ifconfig.c:746
-+#, c-format
-+msgid "ifconfig: Error resolving '%s' for add\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:757 ../ifconfig.c:847 ../ifconfig.c:935
-+#, c-format
- msgid "No support for INET6 on this system.\n"
- msgstr ""
- 
--#: ../ifconfig.c:743 ../ifconfig.c:834
-+#: ../ifconfig.c:800 ../ifconfig.c:893
- #, c-format
- msgid "Interface %s not initialized\n"
- msgstr ""
- 
--#: ../ifconfig.c:755 ../ifconfig.c:845
-+#: ../ifconfig.c:812 ../ifconfig.c:904
-+#, c-format
- msgid "Bad address.\n"
- msgstr ""
- 
--#: ../ifconfig.c:848
-+#: ../ifconfig.c:907
-+#, c-format
- msgid "Address deletion not supported on this system.\n"
- msgstr ""
- 
--#: ../ifconfig.c:920
-+#: ../ifconfig.c:979
-+#, c-format
- msgid "ifconfig: Cannot set address for this protocol family.\n"
- msgstr ""
- 
--#: ../ifconfig.c:946
-+#: ../ifconfig.c:986
-+#, c-format
-+msgid "ifconfig: error resolving '%s' to set address for af=%s\n"
-+msgstr ""
-+
-+#: ../ifconfig.c:1007
-+#, c-format
- msgid "No support for ECONET on this system.\n"
- msgstr ""
- 
--#: ../ifconfig.c:954
-+#: ../ifconfig.c:1015
- #, c-format
- msgid "Don't know how to set addresses for family %d.\n"
- msgstr ""
- 
--#: ../netstat.c:430
-+#: ../ifconfig.c:1050
-+#, c-format
-+msgid "WARNING: at least one error occured. (%d)\n"
-+msgstr ""
-+
-+#: ../netstat.c:434
- #, c-format
- msgid ""
- "(No info could be read for \"-p\": geteuid()=%d but you should be root.)\n"
- msgstr ""
- 
--#: ../netstat.c:434
-+#: ../netstat.c:438
-+#, c-format
- msgid ""
- "(Not all processes could be identified, non-owned process info\n"
- " will not be shown, you would have to be root to see it all.)\n"
- msgstr ""
- 
--#: ../netstat.c:441 ../netstat.c:1176 ../netstat.c:1253
-+#: ../netstat.c:445 ../netstat.c:1189 ../netstat.c:1266
- msgid "LISTENING"
- msgstr ""
- 
--#: ../netstat.c:442
-+#: ../netstat.c:446
- msgid "CONN SENT"
- msgstr ""
- 
--#: ../netstat.c:443 ../netstat.c:1255
-+#: ../netstat.c:447 ../netstat.c:1268
- msgid "DISC SENT"
- msgstr ""
- 
--#: ../netstat.c:444 ../netstat.c:511 ../netstat.c:894 ../netstat.c:1256
-+#: ../netstat.c:448 ../netstat.c:515 ../netstat.c:904 ../netstat.c:1269
- msgid "ESTABLISHED"
- msgstr ""
- 
--#: ../netstat.c:466
-+#: ../netstat.c:470
-+#, c-format
- msgid "Active NET/ROM sockets\n"
- msgstr ""
- 
--#: ../netstat.c:467
-+#: ../netstat.c:471
-+#, c-format
- msgid ""
--"User       Dest       Source     Device  State        Vr/Vs    Send-Q  "
--"Recv-Q\n"
-+"User       Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-"
-+"Q\n"
- msgstr ""
- 
--#: ../netstat.c:477 ../netstat.c:1295
-+#: ../netstat.c:481 ../netstat.c:1308
- #, c-format
- msgid "Problem reading data from %s\n"
- msgstr ""
- 
--#: ../netstat.c:512
-+#: ../netstat.c:516
- msgid "SYN_SENT"
- msgstr ""
- 
--#: ../netstat.c:513
-+#: ../netstat.c:517
- msgid "SYN_RECV"
- msgstr ""
- 
--#: ../netstat.c:514
-+#: ../netstat.c:518
- msgid "FIN_WAIT1"
- msgstr ""
- 
--#: ../netstat.c:515
-+#: ../netstat.c:519
- msgid "FIN_WAIT2"
- msgstr ""
- 
--#: ../netstat.c:516
-+#: ../netstat.c:520
- msgid "TIME_WAIT"
- msgstr ""
- 
--#: ../netstat.c:517
-+#: ../netstat.c:521
- msgid "CLOSE"
- msgstr ""
- 
--#: ../netstat.c:518
-+#: ../netstat.c:522
- msgid "CLOSE_WAIT"
- msgstr ""
- 
--#: ../netstat.c:519
-+#: ../netstat.c:523
- msgid "LAST_ACK"
- msgstr ""
- 
--#: ../netstat.c:520
-+#: ../netstat.c:524
- msgid "LISTEN"
- msgstr ""
- 
--#: ../netstat.c:521
-+#: ../netstat.c:525
- msgid "CLOSING"
- msgstr ""
- 
--#: ../netstat.c:592
-+#: ../netstat.c:596
- #, c-format
- msgid "warning, got bogus igmp6 line %d.\n"
- msgstr ""
- 
--#: ../netstat.c:597 ../netstat.c:635 ../netstat.c:756 ../netstat.c:888
--#: ../netstat.c:1019 ../netstat.c:1024
-+#: ../netstat.c:601 ../netstat.c:639 ../netstat.c:763 ../netstat.c:898
-+#: ../netstat.c:1032 ../netstat.c:1037
- #, c-format
- msgid "netstat: unsupported address family %d !\n"
- msgstr ""
- 
--#: ../netstat.c:610 ../netstat.c:615 ../netstat.c:623 ../netstat.c:630
-+#: ../netstat.c:614 ../netstat.c:619 ../netstat.c:627 ../netstat.c:634
- #, c-format
- msgid "warning, got bogus igmp line %d.\n"
- msgstr ""
- 
--#: ../netstat.c:673
-+#: ../netstat.c:677
-+#, c-format
- msgid "Active X.25 sockets\n"
- msgstr ""
- 
- #. IMHO, Vr/Vs is not very usefull --SF
--#: ../netstat.c:675
-+#: ../netstat.c:679
-+#, c-format
- msgid ""
--"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  "
--"Recv-Q\n"
-+"Dest         Source          Device  LCI  State        Vr/Vs  Send-Q  Recv-"
-+"Q\n"
- msgstr ""
- 
--#: ../netstat.c:752
-+#: ../netstat.c:759
-+#, c-format
- msgid "warning, got bogus tcp line.\n"
- msgstr ""
- 
--#: ../netstat.c:793 ../netstat.c:943 ../netstat.c:1062
-+#: ../netstat.c:800 ../netstat.c:953 ../netstat.c:1075
- #, c-format
- msgid "off (0.00/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:797
-+#: ../netstat.c:804
- #, c-format
- msgid "on (%2.2f/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:802
-+#: ../netstat.c:809
- #, c-format
- msgid "keepalive (%2.2f/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:807
-+#: ../netstat.c:814
- #, c-format
- msgid "timewait (%2.2f/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:812 ../netstat.c:952 ../netstat.c:1072
-+#: ../netstat.c:819 ../netstat.c:962 ../netstat.c:1085
- #, c-format
- msgid "unkn-%d (%2.2f/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:884
-+#: ../netstat.c:894
-+#, c-format
- msgid "warning, got bogus udp line.\n"
- msgstr ""
- 
--#: ../netstat.c:902 ../netstat.c:1162 ../netstat.c:1195
-+#: ../netstat.c:912 ../netstat.c:1175 ../netstat.c:1208
- msgid "UNKNOWN"
- msgstr ""
- 
--#: ../netstat.c:948 ../netstat.c:1067
-+#: ../netstat.c:958 ../netstat.c:1080
- #, c-format
- msgid "on%d (%2.2f/%ld/%d)"
- msgstr ""
- 
--#: ../netstat.c:1033
-+#: ../netstat.c:1046
-+#, c-format
- msgid "warning, got bogus raw line.\n"
- msgstr ""
- 
--#: ../netstat.c:1115
-+#: ../netstat.c:1128
-+#, c-format
- msgid "warning, got bogus unix line.\n"
- msgstr ""
- 
--#: ../netstat.c:1142
-+#: ../netstat.c:1155
- msgid "STREAM"
- msgstr ""
- 
--#: ../netstat.c:1146
-+#: ../netstat.c:1159
- msgid "DGRAM"
- msgstr ""
- 
--#: ../netstat.c:1150
-+#: ../netstat.c:1163
- msgid "RAW"
- msgstr ""
- 
--#: ../netstat.c:1154
-+#: ../netstat.c:1167
- msgid "RDM"
- msgstr ""
- 
--#: ../netstat.c:1158
-+#: ../netstat.c:1171
- msgid "SEQPACKET"
- msgstr ""
- 
--#: ../netstat.c:1167
-+#: ../netstat.c:1180
- msgid "FREE"
- msgstr ""
- 
--#: ../netstat.c:1183
-+#: ../netstat.c:1196
- msgid "CONNECTING"
- msgstr ""
- 
--#: ../netstat.c:1187
-+#: ../netstat.c:1200
- msgid "CONNECTED"
- msgstr ""
- 
--#: ../netstat.c:1191
-+#: ../netstat.c:1204
- msgid "DISCONNECTING"
- msgstr ""
- 
--#: ../netstat.c:1222
-+#: ../netstat.c:1235
-+#, c-format
- msgid "Active UNIX domain sockets "
- msgstr ""
- 
--#: ../netstat.c:1224 ../netstat.c:1735
-+#: ../netstat.c:1237 ../netstat.c:1756
-+#, c-format
- msgid "(servers and established)"
- msgstr ""
- 
--#: ../netstat.c:1227 ../netstat.c:1738
-+#: ../netstat.c:1240 ../netstat.c:1759
-+#, c-format
- msgid "(only servers)"
- msgstr ""
- 
--#: ../netstat.c:1229 ../netstat.c:1740
-+#: ../netstat.c:1242 ../netstat.c:1761
-+#, c-format
- msgid "(w/o servers)"
- msgstr ""
- 
--#: ../netstat.c:1232
-+#: ../netstat.c:1245
-+#, c-format
- msgid ""
- "\n"
- "Proto RefCnt Flags       Type       State         I-Node"
- msgstr ""
- 
--#: ../netstat.c:1234
-+#: ../netstat.c:1247
-+#, c-format
- msgid " Path\n"
- msgstr ""
- 
--#: ../netstat.c:1254
-+#: ../netstat.c:1267
- msgid "SABM SENT"
- msgstr ""
- 
--#: ../netstat.c:1257
-+#: ../netstat.c:1270
- msgid "RECOVERY"
- msgstr ""
- 
--#: ../netstat.c:1271
-+#: ../netstat.c:1284
-+#, c-format
- msgid "Active AX.25 sockets\n"
- msgstr ""
- 
--#: ../netstat.c:1272
-+#: ../netstat.c:1285
-+#, c-format
- msgid "Dest       Source     Device  State        Vr/Vs    Send-Q  Recv-Q\n"
- msgstr ""
- 
--#: ../netstat.c:1315
-+#: ../netstat.c:1328
- #, c-format
- msgid "problem reading data from %s\n"
- msgstr ""
- 
--#: ../netstat.c:1366
-+#: ../netstat.c:1379
-+#, c-format
- msgid ""
- "Active IPX sockets\n"
- "Proto Recv-Q Send-Q Local Address              Foreign Address            "
- "State"
- msgstr ""
- 
--#: ../netstat.c:1368
-+#: ../netstat.c:1381
-+#, c-format
- msgid " User"
- msgstr ""
- 
--#: ../netstat.c:1402
-+#: ../netstat.c:1415
- msgid "ESTAB"
- msgstr ""
- 
--#: ../netstat.c:1410
-+#: ../netstat.c:1423
- msgid "UNK."
- msgstr ""
- 
--#: ../netstat.c:1448
-+#: ../netstat.c:1461
-+#, c-format
- msgid "Kernel Interface table\n"
- msgstr ""
- 
--#: ../netstat.c:1452
--msgid ""
--"Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR   TX-OK TX-ERR TX-DRP TX-OVR "
--"Flg\n"
--msgstr ""
--
--#: ../netstat.c:1456
-+#: ../netstat.c:1469
- msgid "missing interface information"
- msgstr ""
- 
--#: ../netstat.c:1479
-+#: ../netstat.c:1492
-+#, c-format
- msgid ""
--"usage: netstat [-veenNcCF] [<Af>] -r         netstat "
--"{-V|--version|-h|--help}\n"
-+"usage: netstat [-veenNcCF] [<Af>] -r         netstat {-V|--version|-h|--"
-+"help}\n"
- msgstr ""
- 
--#: ../netstat.c:1480
-+#: ../netstat.c:1493
-+#, c-format
- msgid "       netstat [-vnNcaeol] [<Socket> ...]\n"
- msgstr ""
- 
--#: ../netstat.c:1481
-+#: ../netstat.c:1494
-+#, c-format
- msgid ""
- "       netstat { [-veenNac] -i | [-cnNe] -M | -s }\n"
- "\n"
- msgstr ""
- 
--#: ../netstat.c:1483
-+#: ../netstat.c:1496
-+#, c-format
- msgid "        -r, --route              display routing table\n"
- msgstr ""
- 
--#: ../netstat.c:1484
-+#: ../netstat.c:1497
-+#, c-format
- msgid "        -i, --interfaces         display interface table\n"
- msgstr ""
- 
--#: ../netstat.c:1485
-+#: ../netstat.c:1498
-+#, c-format
- msgid "        -g, --groups             display multicast group memberships\n"
- msgstr ""
- 
--#: ../netstat.c:1486
-+#: ../netstat.c:1499
-+#, c-format
- msgid ""
- "        -s, --statistics         display networking statistics (like SNMP)\n"
- msgstr ""
- 
--#: ../netstat.c:1488
-+#: ../netstat.c:1501
-+#, c-format
- msgid ""
- "        -M, --masquerade         display masqueraded connections\n"
- "\n"
- msgstr ""
- 
--#: ../netstat.c:1492
-+#: ../netstat.c:1505
-+#, c-format
- msgid "        --numeric-hosts          don't resolve host names\n"
- msgstr ""
- 
--#: ../netstat.c:1493
-+#: ../netstat.c:1506
-+#, c-format
- msgid "        --numeric-ports          don't resolve port names\n"
- msgstr ""
- 
--#: ../netstat.c:1494
-+#: ../netstat.c:1507
-+#, c-format
- msgid "        --numeric-users          don't resolve user names\n"
- msgstr ""
- 
--#: ../netstat.c:1495
-+#: ../netstat.c:1508
-+#, c-format
- msgid "        -N, --symbolic           resolve hardware names\n"
- msgstr ""
- 
--#: ../netstat.c:1496 ../route.c:88
-+#: ../netstat.c:1509 ../route.c:88
-+#, c-format
- msgid "        -e, --extend             display other/more information\n"
- msgstr ""
- 
--#: ../netstat.c:1497
-+#: ../netstat.c:1510
-+#, c-format
- msgid "        -p, --programs           display PID/Program name for sockets\n"
- msgstr ""
- 
--#: ../netstat.c:1498
-+#: ../netstat.c:1511
-+#, c-format
- msgid ""
- "        -c, --continuous         continuous listing\n"
- "\n"
- msgstr ""
- 
--#: ../netstat.c:1499
-+#: ../netstat.c:1512
-+#, c-format
- msgid "        -l, --listening          display listening server sockets\n"
- msgstr ""
- 
--#: ../netstat.c:1500
-+#: ../netstat.c:1513
-+#, c-format
- msgid ""
- "        -a, --all, --listening   display all sockets (default: connected)\n"
- msgstr ""
- 
--#: ../netstat.c:1501
-+#: ../netstat.c:1514
-+#, c-format
- msgid "        -o, --timers             display timers\n"
- msgstr ""
- 
--#: ../netstat.c:1502 ../route.c:89
-+#: ../netstat.c:1515 ../route.c:89
-+#, c-format
- msgid ""
- "        -F, --fib                display Forwarding Information Base "
- "(default)\n"
- msgstr ""
- 
--#: ../netstat.c:1503 ../route.c:90
-+#: ../netstat.c:1516 ../route.c:90
-+#, c-format
- msgid ""
- "        -C, --cache              display routing cache instead of FIB\n"
- "\n"
- msgstr ""
- 
--#: ../netstat.c:1505
-+#: ../netstat.c:1518
-+#, c-format
- msgid ""
--"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx "
--"--netrom\n"
-+"  <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --"
-+"netrom\n"
- msgstr ""
- 
--#: ../netstat.c:1506 ../route.c:92
-+#: ../netstat.c:1519
- #, c-format
--msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgid "  <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"
- msgstr ""
- 
--#: ../netstat.c:1507 ../route.c:93
-+#: ../netstat.c:1520 ../route.c:93
-+#, c-format
- msgid "  List of possible address families (which support routing):\n"
- msgstr ""
- 
--#: ../netstat.c:1732
-+#: ../netstat.c:1753
-+#, c-format
- msgid "Active Internet connections "
- msgstr ""
- 
--#: ../netstat.c:1742
-+#: ../netstat.c:1763
-+#, c-format
- msgid ""
- "\n"
--"Proto Recv-Q Send-Q Local Address           Foreign Address         State    "
--"  "
-+"Proto Recv-Q Send-Q Local Address           Foreign Address         "
-+"State      "
- msgstr ""
- 
--#: ../netstat.c:1744
-+#: ../netstat.c:1765
-+#, c-format
- msgid " User       Inode     "
- msgstr ""
- 
--#: ../netstat.c:1747
-+#: ../netstat.c:1768
-+#, c-format
- msgid " Timer"
- msgstr ""
- 
--#: ../netstat.c:1777
-+#: ../netstat.c:1798
-+#, c-format
- msgid "IPv4 Group Memberships\n"
- msgstr ""
- 
--#: ../netstat.c:1778
-+#: ../netstat.c:1799
-+#, c-format
- msgid "Interface       RefCnt Group\n"
- msgstr ""
- 
-@@ -986,23 +1166,28 @@ msgid "rarp: cannot set entry from %s:%u\n"
- msgstr ""
- 
- #: ../rarp.c:176
-+#, c-format
- msgid "Usage: rarp -a                               list entries in cache.\n"
- msgstr ""
- 
- #: ../rarp.c:177
-+#, c-format
- msgid "       rarp -d <hostname>                    delete entry from cache.\n"
- msgstr ""
- 
- #: ../rarp.c:178
-+#, c-format
- msgid "       rarp [<HW>] -s <hostname> <hwaddr>    add entry to cache.\n"
- msgstr ""
- 
- #: ../rarp.c:179
-+#, c-format
- msgid ""
- "       rarp -f                               add entries from /etc/ethers.\n"
- msgstr ""
- 
- #: ../rarp.c:180
-+#, c-format
- msgid ""
- "       rarp -V                               display program version.\n"
- "\n"
-@@ -1019,38 +1204,50 @@ msgid "rarp: %s: unknown hardware type.\n"
- msgstr ""
- 
- #: ../route.c:80
-+#, c-format
- msgid ""
- "Usage: route [-nNvee] [-FC] [<AF>]           List kernel routing tables\n"
- msgstr ""
- 
- #: ../route.c:81
-+#, c-format
- msgid ""
- "       route [-v] [-FC] {add|del|flush} ...  Modify routing table for AF.\n"
- "\n"
- msgstr ""
- 
- #: ../route.c:83
-+#, c-format
- msgid ""
- "       route {-h|--help} [<AF>]              Detailed usage syntax for "
- "specified AF.\n"
- msgstr ""
- 
- #: ../route.c:84
-+#, c-format
- msgid ""
- "       route {-V|--version}                  Display version/author and "
- "exit.\n"
- "\n"
- msgstr ""
- 
-+#: ../route.c:92
-+#, c-format
-+msgid "  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"
-+msgstr ""
-+
- #: ../plipconfig.c:66
-+#, c-format
- msgid "Usage: plipconfig [-a] [-i] [-v] interface\n"
- msgstr ""
- 
- #: ../plipconfig.c:67
-+#, c-format
- msgid "                  [nibble NN] [trigger NN]\n"
- msgstr ""
- 
- #: ../plipconfig.c:68
-+#, c-format
- msgid "       plipconfig -V | --version\n"
- msgstr ""
- 
-@@ -1060,61 +1257,75 @@ msgid "%s\tnibble %lu  trigger %lu\n"
- msgstr ""
- 
- #: ../iptunnel.c:85
-+#, c-format
- msgid "Usage: iptunnel { add | change | del | show } [ NAME ]\n"
- msgstr ""
- 
- #: ../iptunnel.c:86
-+#, c-format
- msgid ""
- "          [ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n"
- msgstr ""
- 
- #: ../iptunnel.c:87
-+#, c-format
- msgid "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n"
- msgstr ""
- 
- #: ../iptunnel.c:88
-+#, c-format
- msgid "          [ ttl TTL ] [ tos TOS ] [ nopmtudisc ] [ dev PHYS_DEV ]\n"
- msgstr ""
- 
- #: ../iptunnel.c:89
-+#, c-format
- msgid ""
- "       iptunnel -V | --version\n"
- "\n"
- msgstr ""
- 
- #: ../iptunnel.c:90
-+#, c-format
- msgid "Where: NAME := STRING\n"
- msgstr ""
- 
- #: ../iptunnel.c:91
-+#, c-format
- msgid "       ADDR := { IP_ADDRESS | any }\n"
- msgstr ""
- 
- #: ../iptunnel.c:92
-+#, c-format
- msgid "       TOS  := { NUMBER | inherit }\n"
- msgstr ""
- 
- #: ../iptunnel.c:93
-+#, c-format
- msgid "       TTL  := { 1..255 | inherit }\n"
- msgstr ""
- 
- #: ../iptunnel.c:94
-+#, c-format
- msgid "       KEY  := { DOTTED_QUAD | NUMBER }\n"
- msgstr ""
- 
- #: ../iptunnel.c:332
-+#, c-format
- msgid "Keys are not allowed with ipip and sit.\n"
- msgstr ""
- 
- #: ../iptunnel.c:352
-+#, c-format
- msgid "Broadcast tunnel requires a source address.\n"
- msgstr ""
- 
- #: ../iptunnel.c:367
-+#, c-format
- msgid "ttl != 0 and noptmudisc are incompatible\n"
- msgstr ""
- 
- #: ../iptunnel.c:379
-+#, c-format
- msgid "cannot determine tunnel mode (ipip, gre or sit)\n"
- msgstr ""
- 
-@@ -1128,22 +1339,27 @@ msgid "unknown"
- msgstr ""
- 
- #: ../iptunnel.c:453
-+#, c-format
- msgid "  Drop packets out of sequence.\n"
- msgstr ""
- 
- #: ../iptunnel.c:455
-+#, c-format
- msgid "  Checksum in received packet is required.\n"
- msgstr ""
- 
- #: ../iptunnel.c:457
-+#, c-format
- msgid "  Sequence packets on output.\n"
- msgstr ""
- 
- #: ../iptunnel.c:459
-+#, c-format
- msgid "  Checksum output packets.\n"
- msgstr ""
- 
- #: ../iptunnel.c:487
-+#, c-format
- msgid "Wrong format of /proc/net/dev. Sorry.\n"
- msgstr ""
- 
-@@ -1153,10 +1369,12 @@ msgid "Failed to get type of [%s]\n"
- msgstr ""
- 
- #: ../iptunnel.c:516
-+#, c-format
- msgid "RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts\n"
- msgstr ""
- 
- #: ../iptunnel.c:519
-+#, c-format
- msgid "TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs\n"
- msgstr ""
- 
-@@ -1323,287 +1541,487 @@ msgstr ""
- 
- #: ../statistics.c:99
- #, c-format
--msgid "address mask request: %u"
-+msgid "address mask request: %u"
-+msgstr ""
-+
-+#. ?
-+#: ../statistics.c:100 ../statistics.c:113
-+#, c-format
-+msgid "address mask replies: %u"
-+msgstr ""
-+
-+#. ?
-+#: ../statistics.c:101
-+#, c-format
-+msgid "%u ICMP messages sent"
-+msgstr ""
-+
-+#: ../statistics.c:102
-+#, c-format
-+msgid "%u ICMP messages failed"
-+msgstr ""
-+
-+#: ../statistics.c:104
-+#, c-format
-+msgid "time exceeded: %u"
-+msgstr ""
-+
-+#. ?
-+#: ../statistics.c:106
-+#, c-format
-+msgid "source quench: %u"
-+msgstr ""
-+
-+#: ../statistics.c:107
-+#, c-format
-+msgid "redirect: %u"
-+msgstr ""
-+
-+#: ../statistics.c:108
-+#, c-format
-+msgid "echo request: %u"
-+msgstr ""
-+
-+#: ../statistics.c:110
-+#, c-format
-+msgid "timestamp requests: %u"
-+msgstr ""
-+
-+#: ../statistics.c:111
-+#, c-format
-+msgid "timestamp replies: %u"
-+msgstr ""
-+
-+#: ../statistics.c:112
-+#, c-format
-+msgid "address mask requests: %u"
-+msgstr ""
-+
-+#: ../statistics.c:118
-+#, c-format
-+msgid "RTO algorithm is %s"
-+msgstr ""
-+
-+#: ../statistics.c:122
-+#, c-format
-+msgid "%u active connections openings"
-+msgstr ""
-+
-+#: ../statistics.c:123
-+#, c-format
-+msgid "%u passive connection openings"
-+msgstr ""
-+
-+#: ../statistics.c:124
-+#, c-format
-+msgid "%u failed connection attempts"
-+msgstr ""
-+
-+#: ../statistics.c:125
-+#, c-format
-+msgid "%u connection resets received"
-+msgstr ""
-+
-+#: ../statistics.c:126
-+#, c-format
-+msgid "%u connections established"
-+msgstr ""
-+
-+#: ../statistics.c:127
-+#, c-format
-+msgid "%u segments received"
-+msgstr ""
-+
-+#: ../statistics.c:128
-+#, c-format
-+msgid "%u segments send out"
-+msgstr ""
-+
-+#: ../statistics.c:129
-+#, c-format
-+msgid "%u segments retransmited"
-+msgstr ""
-+
-+#: ../statistics.c:130
-+#, c-format
-+msgid "%u bad segments received."
-+msgstr ""
-+
-+#: ../statistics.c:131
-+#, c-format
-+msgid "%u resets sent"
-+msgstr ""
-+
-+#: ../statistics.c:136
-+#, c-format
-+msgid "%u packets received"
-+msgstr ""
-+
-+#: ../statistics.c:137
-+#, c-format
-+msgid "%u packets to unknown port received."
-+msgstr ""
-+
-+#: ../statistics.c:138
-+#, c-format
-+msgid "%u packet receive errors"
-+msgstr ""
-+
-+#: ../statistics.c:139
-+#, c-format
-+msgid "%u packets sent"
-+msgstr ""
-+
-+#: ../statistics.c:144
-+#, c-format
-+msgid "%u SYN cookies sent"
-+msgstr ""
-+
-+#: ../statistics.c:145
-+#, c-format
-+msgid "%u SYN cookies received"
-+msgstr ""
-+
-+#: ../statistics.c:146
-+#, c-format
-+msgid "%u invalid SYN cookies received"
-+msgstr ""
-+
-+#: ../statistics.c:148
-+#, c-format
-+msgid "%u resets received for embryonic SYN_RECV sockets"
-+msgstr ""
-+
-+#: ../statistics.c:150
-+#, c-format
-+msgid "%u packets pruned from receive queue because of socket buffer overrun"
-+msgstr ""
-+
-+#. obsolete: 2.2.0 doesn't do that anymore
-+#: ../statistics.c:153
-+#, c-format
-+msgid "%u packets pruned from receive queue"
-+msgstr ""
-+
-+#: ../statistics.c:154
-+#, c-format
-+msgid ""
-+"%u packets dropped from out-of-order queue because of socket buffer overrun"
-+msgstr ""
-+
-+#: ../statistics.c:156
-+#, c-format
-+msgid "%u ICMP packets dropped because they were out-of-window"
-+msgstr ""
-+
-+#: ../statistics.c:158
-+#, c-format
-+msgid "%u ICMP packets dropped because socket was locked"
-+msgstr ""
-+
-+#: ../statistics.c:160
-+#, c-format
-+msgid "%u TCP sockets finished time wait in fast timer"
-+msgstr ""
-+
-+#: ../statistics.c:161
-+#, c-format
-+msgid "%u time wait sockets recycled by time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:162
-+#, c-format
-+msgid "%u TCP sockets finished time wait in slow timer"
-+msgstr ""
-+
-+#: ../statistics.c:163
-+#, c-format
-+msgid "%u passive connections rejected because of time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:165
-+#, c-format
-+msgid "%u active connections rejected because of time stamp"
-+msgstr ""
-+
-+#: ../statistics.c:167
-+#, c-format
-+msgid "%u packets rejects in established connections because of timestamp"
- msgstr ""
- 
--#. ?
--#: ../statistics.c:100 ../statistics.c:113
-+#: ../statistics.c:169
- #, c-format
--msgid "address mask replies: %u"
-+msgid "%u delayed acks sent"
- msgstr ""
- 
--#. ?
--#: ../statistics.c:101
-+#: ../statistics.c:170
- #, c-format
--msgid "%u ICMP messages sent"
-+msgid "%u delayed acks further delayed because of locked socket"
- msgstr ""
- 
--#: ../statistics.c:102
-+#: ../statistics.c:172
- #, c-format
--msgid "%u ICMP messages failed"
-+msgid "Quick ack mode was activated %u times"
- msgstr ""
- 
--#: ../statistics.c:104
-+#: ../statistics.c:173
- #, c-format
--msgid "time exceeded: %u"
-+msgid "%u times the listen queue of a socket overflowed"
- msgstr ""
- 
--#. ?
--#: ../statistics.c:106
-+#: ../statistics.c:175
- #, c-format
--msgid "source quench: %u"
-+msgid "%u SYNs to LISTEN sockets dropped"
- msgstr ""
- 
--#: ../statistics.c:107
-+#: ../statistics.c:176
- #, c-format
--msgid "redirect: %u"
-+msgid "%u packets directly queued to recvmsg prequeue."
- msgstr ""
- 
--#: ../statistics.c:108
-+#: ../statistics.c:178
- #, c-format
--msgid "echo request: %u"
-+msgid "%u bytes directly in process context from backlog"
- msgstr ""
- 
--#: ../statistics.c:110
-+#: ../statistics.c:179
- #, c-format
--msgid "timestamp requests: %u"
-+msgid "%u bytes directly received in process context from prequeue"
- msgstr ""
- 
--#: ../statistics.c:111
-+#: ../statistics.c:181
- #, c-format
--msgid "timestamp replies: %u"
-+msgid "%u packets dropped from prequeue"
- msgstr ""
- 
--#: ../statistics.c:112
-+#: ../statistics.c:182
- #, c-format
--msgid "address mask requests: %u"
-+msgid "%u packet headers predicted"
- msgstr ""
- 
--#: ../statistics.c:118
-+#: ../statistics.c:183
- #, c-format
--msgid "RTO algorithm is %s"
-+msgid "%u packets header predicted and directly queued to user"
- msgstr ""
- 
--#: ../statistics.c:122
-+#: ../statistics.c:185
- #, c-format
--msgid "%u active connections openings"
-+msgid "Ran %u times out of system memory during packet sending"
- msgstr ""
- 
--#: ../statistics.c:123
-+#: ../statistics.c:187
- #, c-format
--msgid "%u passive connection openings"
-+msgid "%u acknowledgments not containing data payload received"
- msgstr ""
- 
--#: ../statistics.c:124
-+#: ../statistics.c:188
- #, c-format
--msgid "%u failed connection attempts"
-+msgid "%u predicted acknowledgments"
- msgstr ""
- 
--#: ../statistics.c:125
-+#: ../statistics.c:189
- #, c-format
--msgid "%u connection resets received"
-+msgid "%u times recovered from packet loss due to fast retransmit"
- msgstr ""
- 
--#: ../statistics.c:126
-+#: ../statistics.c:190
- #, c-format
--msgid "%u connections established"
-+msgid "%u times recovered from packet loss by selective acknowledgements"
- msgstr ""
- 
--#: ../statistics.c:127
-+#: ../statistics.c:191
- #, c-format
--msgid "%u segments received"
-+msgid "%u bad SACK blocks received"
- msgstr ""
- 
--#: ../statistics.c:128
-+#: ../statistics.c:192
- #, c-format
--msgid "%u segments send out"
-+msgid "Detected reordering %u times using FACK"
- msgstr ""
- 
--#: ../statistics.c:129
-+#: ../statistics.c:193
- #, c-format
--msgid "%u segments retransmited"
-+msgid "Detected reordering %u times using SACK"
- msgstr ""
- 
--#: ../statistics.c:130
-+#: ../statistics.c:194
- #, c-format
--msgid "%u bad segments received."
-+msgid "Detected reordering %u times using time stamp"
- msgstr ""
- 
--#: ../statistics.c:131
-+#: ../statistics.c:195
- #, c-format
--msgid "%u resets sent"
-+msgid "Detected reordering %u times using reno fast retransmit"
- msgstr ""
- 
--#: ../statistics.c:136
-+#: ../statistics.c:196
- #, c-format
--msgid "%u packets received"
-+msgid "%u congestion windows fully recovered without slow start"
- msgstr ""
- 
--#: ../statistics.c:137
-+#: ../statistics.c:197
- #, c-format
--msgid "%u packets to unknown port received."
-+msgid "%u congestion windows partially recovered using Hoe heuristic"
- msgstr ""
- 
--#: ../statistics.c:138
-+#: ../statistics.c:198
- #, c-format
--msgid "%u packet receive errors"
-+msgid "%u congestion window recovered without slow start using DSACK"
- msgstr ""
- 
--#: ../statistics.c:139
-+#: ../statistics.c:199
- #, c-format
--msgid "%u packets sent"
-+msgid "%u congestion windows recovered without slow start after partial ack"
- msgstr ""
- 
--#: ../statistics.c:144
-+#: ../statistics.c:200
- #, c-format
--msgid "%u SYN cookies sent"
-+msgid "%u retransmits lost"
- msgstr ""
- 
--#: ../statistics.c:145
-+#: ../statistics.c:201
- #, c-format
--msgid "%u SYN cookies received"
-+msgid "%u timeouts after reno fast retransmit"
- msgstr ""
- 
--#: ../statistics.c:146
-+#: ../statistics.c:202
- #, c-format
--msgid "%u invalid SYN cookies received"
-+msgid "%u timeouts after SACK recovery"
- msgstr ""
- 
--#: ../statistics.c:148
-+#: ../statistics.c:203
- #, c-format
--msgid "%u resets received for embryonic SYN_RECV sockets"
-+msgid "%u timeouts in loss state"
- msgstr ""
- 
--#: ../statistics.c:150
-+#: ../statistics.c:204
- #, c-format
--msgid "%u packets pruned from receive queue because of socket buffer overrun"
-+msgid "%u fast retransmits"
- msgstr ""
- 
--#. obsolete: 2.2.0 doesn't do that anymore
--#: ../statistics.c:153
-+#: ../statistics.c:205
- #, c-format
--msgid "%u packets pruned from receive queue"
-+msgid "%u forward retransmits"
- msgstr ""
- 
--#: ../statistics.c:154
-+#: ../statistics.c:206
- #, c-format
--msgid ""
--"%u packets dropped from out-of-order queue because of socket buffer overrun"
-+msgid "%u retransmits in slow start"
- msgstr ""
- 
--#: ../statistics.c:156
-+#: ../statistics.c:207
- #, c-format
--msgid "%u ICMP packets dropped because they were out-of-window"
-+msgid "%u other TCP timeouts"
- msgstr ""
- 
--#: ../statistics.c:158
-+#: ../statistics.c:208
- #, c-format
--msgid "%u ICMP packets dropped because socket was locked"
-+msgid "%u reno fast retransmits failed"
- msgstr ""
- 
--#: ../statistics.c:160
-+#: ../statistics.c:209
- #, c-format
--msgid "%u TCP sockets finished time wait in fast timer"
-+msgid "%u SACK retransmits failed"
- msgstr ""
- 
--#: ../statistics.c:161
-+#: ../statistics.c:210
- #, c-format
--msgid "%u time wait sockets recycled by time stamp"
-+msgid "%u times receiver scheduled too late for direct processing"
- msgstr ""
- 
--#: ../statistics.c:162
-+#: ../statistics.c:211
- #, c-format
--msgid "%u TCP sockets finished time wait in slow timer"
-+msgid "%u packets collapsed in receive queue due to low socket buffer"
- msgstr ""
- 
--#: ../statistics.c:163
-+#: ../statistics.c:212
- #, c-format
--msgid "%u passive connections rejected because of time stamp"
-+msgid "%u DSACKs sent for old packets"
- msgstr ""
- 
--#: ../statistics.c:165
-+#: ../statistics.c:213
- #, c-format
--msgid "%u active connections rejected because of time stamp"
-+msgid "%u DSACKs sent for out of order packets"
- msgstr ""
- 
--#: ../statistics.c:167
-+#: ../statistics.c:214
- #, c-format
--msgid "%u packets rejects in established connections because of timestamp"
-+msgid "%u DSACKs received"
- msgstr ""
- 
--#: ../statistics.c:169
-+#: ../statistics.c:215
- #, c-format
--msgid "%u delayed acks sent"
-+msgid "%u DSACKs for out of order packets received"
- msgstr ""
- 
--#: ../statistics.c:170
-+#: ../statistics.c:216
- #, c-format
--msgid "%u delayed acks further delayed because of locked socket"
-+msgid "%u connections reset due to unexpected SYN"
- msgstr ""
- 
--#: ../statistics.c:172
-+#: ../statistics.c:217
- #, c-format
--msgid "Quick ack mode was activated %u times"
-+msgid "%u connections reset due to unexpected data"
- msgstr ""
- 
--#: ../statistics.c:173
-+#: ../statistics.c:218
- #, c-format
--msgid "%u times the listen queue of a socket overflowed"
-+msgid "%u connections reset due to early user close"
- msgstr ""
- 
--#: ../statistics.c:175
-+#: ../statistics.c:219
- #, c-format
--msgid "%u SYNs to LISTEN sockets ignored"
-+msgid "%u connections aborted due to memory pressure"
- msgstr ""
- 
--#: ../statistics.c:176
-+#: ../statistics.c:220
- #, c-format
--msgid "%u packets directly queued to recvmsg prequeue."
-+msgid "%u connections aborted due to timeout"
- msgstr ""
- 
--#: ../statistics.c:178
-+#: ../statistics.c:221
- #, c-format
--msgid "%u packets directly received from backlog"
-+msgid "%u connections aborted after user close in linger timeout"
- msgstr ""
- 
--#: ../statistics.c:180
-+#: ../statistics.c:222
- #, c-format
--msgid "%u packets directly received from prequeue"
-+msgid "%u times unabled to send RST due to no memory"
- msgstr ""
- 
--#: ../statistics.c:182
-+#: ../statistics.c:223
- #, c-format
--msgid "%u packets dropped from prequeue"
-+msgid "TCP ran low on memory %u times"
- msgstr ""
- 
--#: ../statistics.c:183
-+#: ../statistics.c:224
- #, c-format
--msgid "%u packets header predicted"
-+msgid "%u TCP data loss events"
- msgstr ""
- 
--#: ../statistics.c:184
-+#: ../statistics.c:225
- #, c-format
--msgid "%u packets header predicted and directly queued to user"
-+msgid "%u congestion windows recovered without slow start by DSACK"
- msgstr ""
- 
--#: ../statistics.c:186
-+#: ../statistics.c:227
- #, c-format
--msgid "Ran %u times out of system memory during packet sending"
-+msgid "%u classic Reno fast retransmits failed"
- msgstr ""
- 
--#: ../statistics.c:253
-+#: ../statistics.c:294
- msgid "enabled"
- msgstr ""
- 
--#: ../statistics.c:253
-+#: ../statistics.c:294
- msgid "disabled"
- msgstr ""
- 
--#: ../statistics.c:336
-+#: ../statistics.c:377
- msgid "error parsing /proc/net/snmp"
- msgstr ""
- 
--#: ../statistics.c:349
-+#: ../statistics.c:390
- msgid "cannot open /proc/net/snmp"
- msgstr ""
- 
-@@ -1617,7 +2035,7 @@ msgstr ""
- msgid "Cannot change line discipline to `%s'.\n"
- msgstr ""
- 
--#: ../lib/af.c:153 ../lib/hw.c:156
-+#: ../lib/af.c:153 ../lib/hw.c:161
- msgid "UNSPEC"
- msgstr ""
- 
-@@ -1633,11 +2051,11 @@ msgstr ""
- msgid "IPv6"
- msgstr ""
- 
--#: ../lib/af.c:164 ../lib/hw.c:177
-+#: ../lib/af.c:164 ../lib/hw.c:182
- msgid "AMPR AX.25"
- msgstr ""
- 
--#: ../lib/af.c:167 ../lib/hw.c:183
-+#: ../lib/af.c:167 ../lib/hw.c:188
- msgid "AMPR NET/ROM"
- msgstr ""
- 
-@@ -1649,7 +2067,7 @@ msgstr ""
- msgid "Appletalk DDP"
- msgstr ""
- 
--#: ../lib/af.c:176 ../lib/hw.c:218
-+#: ../lib/af.c:176 ../lib/hw.c:223
- msgid "Econet"
- msgstr ""
- 
-@@ -1657,19 +2075,21 @@ msgstr ""
- msgid "CCITT X.25"
- msgstr ""
- 
--#: ../lib/af.c:182 ../lib/hw.c:180
-+#: ../lib/af.c:182 ../lib/hw.c:185
- msgid "AMPR ROSE"
- msgstr ""
- 
--#: ../lib/af.c:185 ../lib/hw.c:168
-+#: ../lib/af.c:185 ../lib/hw.c:173
- msgid "Ash"
- msgstr ""
- 
- #: ../lib/af.c:243
-+#, c-format
- msgid "Please don't supply more than one address family.\n"
- msgstr ""
- 
- #: ../lib/af.c:304
-+#, c-format
- msgid "Too much address family arguments.\n"
- msgstr ""
- 
-@@ -1694,11 +2114,12 @@ msgid "in_arcnet(%s): trailing junk!\n"
- msgstr ""
- 
- #: ../lib/ash.c:81
-+#, c-format
- msgid "Malformed Ash address"
- msgstr ""
- 
- #: ../lib/ax25.c:75 ../lib/ddp.c:50 ../lib/econet.c:52 ../lib/inet.c:244
--#: ../lib/inet.c:259 ../lib/inet6.c:129 ../lib/ipx.c:81 ../lib/netrom.c:78
-+#: ../lib/inet.c:259 ../lib/inet6.c:145 ../lib/ipx.c:81 ../lib/netrom.c:78
- #: ../lib/rose.c:71 ../lib/unix.c:56 ../lib/unix.c:76
- msgid "[NONE SET]"
- msgstr ""
-@@ -1712,22 +2133,21 @@ msgid "Callsign too long"
- msgstr ""
- 
- #: ../lib/ax25_gr.c:47
-+#, c-format
- msgid "AX.25 not configured in this system.\n"
- msgstr ""
- 
- #: ../lib/ax25_gr.c:50
-+#, c-format
- msgid "Kernel AX.25 routing table\n"
- msgstr ""
- 
- #. xxx
- #: ../lib/ax25_gr.c:51 ../lib/rose_gr.c:55
-+#, c-format
- msgid "Destination  Iface    Use\n"
- msgstr ""
- 
--#: ../lib/ddp_gr.c:21
--msgid "Routing table for `ddp' not yet supported.\n"
--msgstr ""
--
- #: ../lib/ether.c:74 ../lib/ether.c:91
- #, c-format
- msgid "in_ether(%s): invalid ether address!\n"
-@@ -1783,225 +2203,260 @@ msgstr ""
- msgid "in_hippi(%s): trailing junk!\n"
- msgstr ""
- 
--#: ../lib/hw.c:155
-+#: ../lib/hw.c:160
- msgid "Local Loopback"
- msgstr ""
- 
--#: ../lib/hw.c:158
-+#: ../lib/hw.c:163
- msgid "Serial Line IP"
- msgstr ""
- 
--#: ../lib/hw.c:159
-+#: ../lib/hw.c:164
- msgid "VJ Serial Line IP"
- msgstr ""
- 
--#: ../lib/hw.c:160
-+#: ../lib/hw.c:165
- msgid "6-bit Serial Line IP"
- msgstr ""
- 
--#: ../lib/hw.c:161
-+#: ../lib/hw.c:166
- msgid "VJ 6-bit Serial Line IP"
- msgstr ""
- 
--#: ../lib/hw.c:162
-+#: ../lib/hw.c:167
- msgid "Adaptive Serial Line IP"
- msgstr ""
- 
--#: ../lib/hw.c:165
-+#: ../lib/hw.c:170
- msgid "Ethernet"
- msgstr ""
- 
--#: ../lib/hw.c:171
-+#: ../lib/hw.c:176
- msgid "Fiber Distributed Data Interface"
- msgstr ""
- 
--#: ../lib/hw.c:174
-+#: ../lib/hw.c:179
- msgid "HIPPI"
- msgstr ""
- 
--#: ../lib/hw.c:186
-+#: ../lib/hw.c:191
- msgid "generic X.25"
- msgstr ""
- 
--#: ../lib/hw.c:189
-+#: ../lib/hw.c:194
- msgid "IPIP Tunnel"
- msgstr ""
- 
--#: ../lib/hw.c:192
-+#: ../lib/hw.c:197
- msgid "Point-to-Point Protocol"
- msgstr ""
- 
--#: ../lib/hw.c:195
-+#: ../lib/hw.c:200
- msgid "(Cisco)-HDLC"
- msgstr ""
- 
--#: ../lib/hw.c:196
-+#: ../lib/hw.c:201
- msgid "LAPB"
- msgstr ""
- 
--#: ../lib/hw.c:199
-+#: ../lib/hw.c:204
- msgid "ARCnet"
- msgstr ""
- 
--#: ../lib/hw.c:202
-+#: ../lib/hw.c:207
- msgid "Frame Relay DLCI"
- msgstr ""
- 
--#: ../lib/hw.c:203
-+#: ../lib/hw.c:208
- msgid "Frame Relay Access Device"
- msgstr ""
- 
--#: ../lib/hw.c:206
-+#: ../lib/hw.c:211
- msgid "IPv6-in-IPv4"
- msgstr ""
- 
--#: ../lib/hw.c:209
-+#: ../lib/hw.c:214
- msgid "IrLAP"
- msgstr ""
- 
--#: ../lib/hw.c:212
-+#: ../lib/hw.c:217
- msgid "16/4 Mbps Token Ring"
- msgstr ""
- 
--#: ../lib/hw.c:214
-+#: ../lib/hw.c:219
- msgid "16/4 Mbps Token Ring (New)"
- msgstr ""
- 
--#: ../lib/inet.c:153 ../lib/inet6.c:79
-+#: ../lib/hw.c:226
-+msgid "Generic EUI-64"
-+msgstr ""
-+
-+#: ../lib/inet.c:153 ../lib/inet6.c:94
- #, c-format
- msgid "rresolve: unsupport address family %d !\n"
- msgstr ""
- 
--#: ../lib/inet6.c:131
-+#: ../lib/inet6.c:147
- msgid "[UNKNOWN]"
- msgstr ""
- 
- #: ../lib/inet6_gr.c:71
-+#, c-format
- msgid "INET6 (IPv6) not configured in this system.\n"
- msgstr ""
- 
--#: ../lib/inet6_gr.c:74
-+#: ../lib/inet6_gr.c:76
-+#, c-format
-+msgid "Kernel IPv6 routing cache\n"
-+msgstr ""
-+
-+#: ../lib/inet6_gr.c:78
-+#, c-format
- msgid "Kernel IPv6 routing table\n"
- msgstr ""
- 
--#: ../lib/inet6_gr.c:76
-+#: ../lib/inet6_gr.c:80
-+#, c-format
- msgid ""
--"Destination                                 Next Hop                         "
--"       Flags Metric Ref    Use Iface\n"
-+"Destination                    Next Hop                   Flag Met Ref Use "
-+"If\n"
- msgstr ""
- 
--#: ../lib/inet6_gr.c:150
-+#: ../lib/inet6_gr.c:174
-+#, c-format
- msgid "Kernel IPv6 Neighbour Cache\n"
- msgstr ""
- 
--#: ../lib/inet6_gr.c:153
-+#: ../lib/inet6_gr.c:177
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State\n"
- msgstr ""
- 
--#: ../lib/inet6_gr.c:157
-+#: ../lib/inet6_gr.c:181
-+#, c-format
- msgid ""
- "Neighbour                                   HW Address        Iface    Flags "
- "Ref State            Stale(sec) Delete(sec)\n"
- msgstr ""
- 
- #: ../lib/inet6_sr.c:46
-+#, c-format
- msgid "Usage: inet6_route [-vF] del Target\n"
- msgstr ""
- 
- #: ../lib/inet6_sr.c:47
-+#, c-format
- msgid "       inet6_route [-vF] add Target [gw Gw] [metric M] [[dev] If]\n"
- msgstr ""
- 
- #: ../lib/inet6_sr.c:48
-+#, c-format
- msgid "       inet6_route [-FC] flush      NOT supported\n"
- msgstr ""
- 
- #: ../lib/inet6_sr.c:188
-+#, c-format
- msgid "Flushing `inet6' routing table not supported\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:50 ../lib/inet_gr.c:220
-+#, c-format
- msgid "INET (IPv4) not configured in this system.\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:53
-+#, c-format
- msgid "Kernel IP routing table\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:56
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:59
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags   MSS Window  irtt "
- "Iface\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:62
-+#, c-format
- msgid ""
- "Destination     Gateway         Genmask         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:237
-+#, c-format
- msgid "Kernel IP routing cache\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:258
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:261
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags   MSS Window  irtt "
- "Iface\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:266
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  HH  Arp\n"
- msgstr ""
- 
- #: ../lib/inet_gr.c:290
-+#, c-format
- msgid ""
- "Source          Destination     Gateway         Flags Metric Ref    Use "
- "Iface    MSS   Window irtt  TOS HHRef HHUptod     SpecDst\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:50
-+#: ../lib/inet_sr.c:51
-+#, c-format
- msgid ""
- "Usage: inet_route [-vF] del {-host|-net} Target[/prefix] [gw Gw] [metric M] "
- "[[dev] If]\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:51
-+#: ../lib/inet_sr.c:52
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [gw Gw] [metric M]\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:52
-+#: ../lib/inet_sr.c:53
-+#, c-format
- msgid ""
- "                              [netmask N] [mss Mss] [window W] [irtt I]\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:53
-+#: ../lib/inet_sr.c:54
-+#, c-format
- msgid "                              [mod] [dyn] [reinstate] [[dev] If]\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:54
-+#: ../lib/inet_sr.c:55
-+#, c-format
- msgid ""
- "       inet_route [-vF] add {-host|-net} Target[/prefix] [metric M] reject\n"
- msgstr ""
- 
--#: ../lib/inet_sr.c:55
-+#: ../lib/inet_sr.c:56
-+#, c-format
- msgid "       inet_route [-FC] flush      NOT supported\n"
- msgstr ""
- 
-@@ -2011,14 +2466,17 @@ msgid "route: %s: cannot use a NETWORK as gateway!\n"
- msgstr ""
- 
- #: ../lib/inet_sr.c:174
-+#, c-format
- msgid "route: Invalid MSS/MTU.\n"
- msgstr ""
- 
- #: ../lib/inet_sr.c:187
-+#, c-format
- msgid "route: Invalid window.\n"
- msgstr ""
- 
- #: ../lib/inet_sr.c:203
-+#, c-format
- msgid "route: Invalid initial rtt.\n"
- msgstr ""
- 
-@@ -2033,73 +2491,90 @@ msgid "route: bogus netmask %s\n"
- msgstr ""
- 
- #: ../lib/inet_sr.c:270
-+#, c-format
- msgid "route: netmask doesn't match route address\n"
- msgstr ""
- 
- #: ../lib/inet_sr.c:306
-+#, c-format
- msgid "Flushing `inet' routing table not supported\n"
- msgstr ""
- 
- #: ../lib/inet_sr.c:310
-+#, c-format
- msgid "Modifying `inet' routing cache not supported\n"
- msgstr ""
- 
- #: ../lib/ipx_gr.c:52
-+#, c-format
- msgid "IPX not configured in this system.\n"
- msgstr ""
- 
- #: ../lib/ipx_gr.c:56
-+#, c-format
- msgid "Kernel IPX routing table\n"
- msgstr ""
- 
- #. xxx
- #: ../lib/ipx_gr.c:57
-+#, c-format
- msgid "Destination               Router Net                Router Node\n"
- msgstr ""
- 
- #: ../lib/ipx_sr.c:33
-+#, c-format
- msgid "IPX: this needs to be written\n"
- msgstr ""
- 
- #: ../lib/masq_info.c:198
-+#, c-format
- msgid "IP masquerading entries\n"
- msgstr ""
- 
- #: ../lib/masq_info.c:201
-+#, c-format
- msgid "prot   expire source               destination          ports\n"
- msgstr ""
- 
- #: ../lib/masq_info.c:204
-+#, c-format
- msgid ""
--"prot   expire    initseq delta prevd source               destination        "
--"  ports\n"
-+"prot   expire    initseq delta prevd source               "
-+"destination          ports\n"
- msgstr ""
- 
- #: ../lib/netrom_gr.c:48
-+#, c-format
- msgid "NET/ROM not configured in this system.\n"
- msgstr ""
- 
- #: ../lib/netrom_gr.c:51
-+#, c-format
- msgid "Kernel NET/ROM routing table\n"
- msgstr ""
- 
- #: ../lib/netrom_gr.c:52
-+#, c-format
- msgid "Destination  Mnemonic  Quality  Neighbour  Iface\n"
- msgstr ""
- 
- #: ../lib/netrom_sr.c:34
-+#, c-format
- msgid "netrom usage\n"
- msgstr ""
- 
- #: ../lib/netrom_sr.c:44
-+#, c-format
- msgid "NET/ROM: this needs to be written\n"
- msgstr ""
- 
- #: ../lib/ppp.c:44
-+#, c-format
- msgid "You cannot start PPP with this program.\n"
- msgstr ""
- 
- #: ../lib/ppp_ac.c:38
-+#, c-format
- msgid "Sorry, use pppd!\n"
- msgstr ""
- 
-@@ -2108,287 +2583,314 @@ msgid "Node address must be ten digits"
- msgstr ""
- 
- #: ../lib/rose_gr.c:51
-+#, c-format
- msgid "ROSE not configured in this system.\n"
- msgstr ""
- 
- #: ../lib/rose_gr.c:54
-+#, c-format
- msgid "Kernel ROSE routing table\n"
- msgstr ""
- 
--#: ../lib/tr.c:70 ../lib/tr.c:85
-+#: ../lib/tr.c:86 ../lib/tr.c:101
- #, c-format
- msgid "in_tr(%s): invalid token ring address!\n"
- msgstr ""
- 
--#: ../lib/tr.c:97
-+#: ../lib/tr.c:113
- #, c-format
- msgid "in_tr(%s): trailing : ignored!\n"
- msgstr ""
- 
--#: ../lib/tr.c:109
-+#: ../lib/tr.c:125
- #, c-format
- msgid "in_tr(%s): trailing junk!\n"
- msgstr ""
- 
--#: ../lib/interface.c:164
-+#: ../lib/interface.c:174
- #, c-format
- msgid "warning: no inet socket available: %s\n"
- msgstr ""
- 
--#: ../lib/interface.c:316
-+#: ../lib/interface.c:323
- #, c-format
- msgid "Warning: cannot open %s (%s). Limited output.\n"
- msgstr ""
- 
- #. Give better error message for this case.
--#: ../lib/interface.c:556
-+#: ../lib/interface.c:570
- msgid "Device not found"
- msgstr ""
- 
--#: ../lib/interface.c:560
-+#: ../lib/interface.c:574
- #, c-format
- msgid "%s: error fetching interface information: %s\n"
- msgstr ""
- 
--#: ../lib/interface.c:593
-+#: ../lib/interface.c:607
- msgid "     - no statistics available -"
- msgstr ""
- 
--#: ../lib/interface.c:597
-+#: ../lib/interface.c:611
-+#, c-format
- msgid "[NO FLAGS]"
- msgstr ""
- 
--#: ../lib/interface.c:673
-+#: ../lib/interface.c:687
- #, c-format
- msgid "%-9.9s Link encap:%s  "
- msgstr ""
- 
--#: ../lib/interface.c:678
-+#: ../lib/interface.c:692
- #, c-format
- msgid "HWaddr %s  "
- msgstr ""
- 
--#: ../lib/interface.c:681
-+#: ../lib/interface.c:695
- #, c-format
- msgid "Media:%s"
- msgstr ""
- 
--#: ../lib/interface.c:683
-+#: ../lib/interface.c:697
-+#, c-format
- msgid "(auto)"
- msgstr ""
- 
--#: ../lib/interface.c:690
-+#: ../lib/interface.c:704
- #, c-format
- msgid "          %s addr:%s "
- msgstr ""
- 
--#: ../lib/interface.c:693
-+#: ../lib/interface.c:707
- #, c-format
- msgid " P-t-P:%s "
- msgstr ""
- 
--#: ../lib/interface.c:696
-+#: ../lib/interface.c:710
- #, c-format
- msgid " Bcast:%s "
- msgstr ""
- 
--#: ../lib/interface.c:698
-+#: ../lib/interface.c:712
- #, c-format
- msgid " Mask:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:715
-+#: ../lib/interface.c:729
- #, c-format
- msgid "          inet6 addr: %s/%d"
- msgstr ""
- 
--#: ../lib/interface.c:717
-+#: ../lib/interface.c:731
-+#, c-format
- msgid " Scope:"
- msgstr ""
- 
--#: ../lib/interface.c:720
-+#: ../lib/interface.c:734
-+#, c-format
- msgid "Global"
- msgstr ""
- 
--#: ../lib/interface.c:723
-+#: ../lib/interface.c:737
-+#, c-format
- msgid "Link"
- msgstr ""
- 
--#: ../lib/interface.c:726
-+#: ../lib/interface.c:740
-+#, c-format
- msgid "Site"
- msgstr ""
- 
--#: ../lib/interface.c:729
-+#: ../lib/interface.c:743
-+#, c-format
- msgid "Compat"
- msgstr ""
- 
--#: ../lib/interface.c:732
-+#: ../lib/interface.c:746
-+#, c-format
- msgid "Host"
- msgstr ""
- 
--#: ../lib/interface.c:735
-+#: ../lib/interface.c:749
-+#, c-format
- msgid "Unknown"
- msgstr ""
- 
--#: ../lib/interface.c:750
-+#: ../lib/interface.c:764
- #, c-format
- msgid "          IPX/Ethernet II addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:753
-+#: ../lib/interface.c:767
- #, c-format
- msgid "          IPX/Ethernet SNAP addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:756
-+#: ../lib/interface.c:770
- #, c-format
- msgid "          IPX/Ethernet 802.2 addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:759
-+#: ../lib/interface.c:773
- #, c-format
- msgid "          IPX/Ethernet 802.3 addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:769
-+#: ../lib/interface.c:783
- #, c-format
- msgid "          EtherTalk Phase 2 addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:778
-+#: ../lib/interface.c:792
- #, c-format
- msgid "          econet addr:%s\n"
- msgstr ""
- 
--#: ../lib/interface.c:785
-+#: ../lib/interface.c:799
-+#, c-format
- msgid "[NO FLAGS] "
- msgstr ""
- 
--#: ../lib/interface.c:787
-+#: ../lib/interface.c:801
-+#, c-format
- msgid "UP "
- msgstr ""
- 
--#: ../lib/interface.c:789
-+#: ../lib/interface.c:803
-+#, c-format
- msgid "BROADCAST "
- msgstr ""
- 
--#: ../lib/interface.c:791
-+#: ../lib/interface.c:805
-+#, c-format
- msgid "DEBUG "
- msgstr ""
- 
--#: ../lib/interface.c:793
-+#: ../lib/interface.c:807
-+#, c-format
- msgid "LOOPBACK "
- msgstr ""
- 
--#: ../lib/interface.c:795
-+#: ../lib/interface.c:809
-+#, c-format
- msgid "POINTOPOINT "
- msgstr ""
- 
--#: ../lib/interface.c:797
-+#: ../lib/interface.c:811
-+#, c-format
- msgid "NOTRAILERS "
- msgstr ""
- 
--#: ../lib/interface.c:799
-+#: ../lib/interface.c:813
-+#, c-format
- msgid "RUNNING "
- msgstr ""
- 
--#: ../lib/interface.c:801
-+#: ../lib/interface.c:815
-+#, c-format
- msgid "NOARP "
- msgstr ""
- 
--#: ../lib/interface.c:803
-+#: ../lib/interface.c:817
-+#, c-format
- msgid "PROMISC "
- msgstr ""
- 
--#: ../lib/interface.c:805
-+#: ../lib/interface.c:819
-+#, c-format
- msgid "ALLMULTI "
- msgstr ""
- 
--#: ../lib/interface.c:807
-+#: ../lib/interface.c:821
-+#, c-format
- msgid "SLAVE "
- msgstr ""
- 
--#: ../lib/interface.c:809
-+#: ../lib/interface.c:823
-+#, c-format
- msgid "MASTER "
- msgstr ""
- 
--#: ../lib/interface.c:811
-+#: ../lib/interface.c:825
-+#, c-format
- msgid "MULTICAST "
- msgstr ""
- 
--#: ../lib/interface.c:814
-+#: ../lib/interface.c:828
-+#, c-format
- msgid "DYNAMIC "
- msgstr ""
- 
- #. DONT FORGET TO ADD THE FLAGS IN ife_print_short
--#: ../lib/interface.c:817
-+#: ../lib/interface.c:831
- #, c-format
- msgid " MTU:%d  Metric:%d"
- msgstr ""
- 
--#: ../lib/interface.c:821
-+#: ../lib/interface.c:835
- #, c-format
- msgid "  Outfill:%d  Keepalive:%d"
- msgstr ""
- 
--#: ../lib/interface.c:835
-+#: ../lib/interface.c:849
- #, c-format
- msgid "RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"
- msgstr ""
- 
--#: ../lib/interface.c:840
-+#: ../lib/interface.c:854
- #, c-format
- msgid "             compressed:%lu\n"
- msgstr ""
- 
--#: ../lib/interface.c:852
-+#: ../lib/interface.c:894
- #, c-format
- msgid "TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"
- msgstr ""
- 
--#: ../lib/interface.c:856
-+#: ../lib/interface.c:898
- #, c-format
- msgid "          collisions:%lu "
- msgstr ""
- 
--#: ../lib/interface.c:858
-+#: ../lib/interface.c:900
- #, c-format
- msgid "compressed:%lu "
- msgstr ""
- 
--#: ../lib/interface.c:860
-+#: ../lib/interface.c:902
- #, c-format
- msgid "txqueuelen:%d "
- msgstr ""
- 
--#: ../lib/interface.c:862
-+#: ../lib/interface.c:904
- #, c-format
- msgid "RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"
- msgstr ""
- 
--#: ../lib/interface.c:873
-+#: ../lib/interface.c:915
- #, c-format
- msgid "Interrupt:%d "
- msgstr ""
- 
- #. Only print devices using it for
- #. I/O maps
--#: ../lib/interface.c:876
-+#: ../lib/interface.c:918
- #, c-format
- msgid "Base address:0x%x "
- msgstr ""
- 
--#: ../lib/interface.c:878
-+#: ../lib/interface.c:920
- #, c-format
- msgid "Memory:%lx-%lx "
- msgstr ""
- 
--#: ../lib/interface.c:881
-+#: ../lib/interface.c:923
- #, c-format
- msgid "DMA chan:%x "
- msgstr ""
- 
- #: ../lib/sockets.c:63
-+#, c-format
- msgid "No usable address families found.\n"
- msgstr ""
- 
-@@ -2413,14 +2915,17 @@ msgid "ip: argument is wrong: %s\n"
- msgstr ""
- 
- #: ../ipmaddr.c:61
-+#, c-format
- msgid "Usage: ipmaddr [ add | del ] MULTIADDR dev STRING\n"
- msgstr ""
- 
- #: ../ipmaddr.c:62
-+#, c-format
- msgid "       ipmaddr show [ dev STRING ] [ ipv4 | ipv6 | link | all ]\n"
- msgstr ""
- 
- #: ../ipmaddr.c:63
-+#, c-format
- msgid "       ipmaddr -V | -version\n"
- msgstr ""
- 
-@@ -2449,6 +2954,7 @@ msgid "slattach: tty_lock: (%s): %s\n"
- msgstr ""
- 
- #: ../slattach.c:192
-+#, c-format
- msgid "slattach: cannot write PID file\n"
- msgstr ""
- 
-@@ -2468,18 +2974,22 @@ msgid "slattach: tty_hangup(RAISE): %s\n"
- msgstr ""
- 
- #: ../slattach.c:468
-+#, c-format
- msgid "slattach: tty name too long\n"
- msgstr ""
- 
- #: ../slattach.c:498
-+#, c-format
- msgid "slattach: tty_open: cannot get current state!\n"
- msgstr ""
- 
- #: ../slattach.c:505
-+#, c-format
- msgid "slattach: tty_open: cannot get current line disc!\n"
- msgstr ""
- 
- #: ../slattach.c:513
-+#, c-format
- msgid "slattach: tty_open: cannot set RAW mode!\n"
- msgstr ""
- 
-@@ -2489,6 +2999,7 @@ msgid "slattach: tty_open: cannot set %s bps!\n"
- msgstr ""
- 
- #: ../slattach.c:530
-+#, c-format
- msgid "slattach: tty_open: cannot set 8N1 mode!\n"
- msgstr ""
- 
-diff --git a/po/pt_BR.po b/po/pt_BR.po
-index 7c5dd37..17f1e5a 100644
---- a/po/pt_BR.po
-+++ b/po/pt_BR.po
-@@ -2,7 +2,7 @@
- # Copyright (C) 2000 Free Software Foundation, Inc.
- # Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 2000.
- #
--# $Id: pt_BR.po,v 1.7 2000/02/13 22:28:11 ralf Exp $
-+# $Id: pt_BR.po,v 1.8 2006/12/14 23:36:24 ecki Exp $
- # Brazilian portuguese translation for net-tools 1.54
- # Copyright (C) 1998, 1999 Free Software Foundation, Inc.
- # Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998-2000
-@@ -14,7 +14,7 @@ msgstr ""
- "PO-Revision-Date: 1999-03-01 02:38+0100\n"
- "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
- "MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=ISO8859-9\n"
-+"Content-Type: text/plain; charset=iso-8859-9\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
- #: ../arp.c:110 ../arp.c:269
-@@ -64,8 +64,12 @@ msgid "arp: cannot set entry on line %u of etherfile %s !\n"
- msgstr "arp: n�o foi poss�vel configurar a linha %u do arquivo etherfile %s!\n"
- 
- #: ../arp.c:437
--msgid "Address\t\t\tHWtype\tHWaddress\t    Flags Mask\t\t  Iface\n"
--msgstr "Endere�o\t\tTipoHW\tEndere�oHW\t Flags Mascara\t\t Iface\n"
-+msgid ""
-+"Address                  HWtype  HWaddress           Flags Mask            "
-+"Iface\n"
-+msgstr ""
-+"Endere�o                 TipoHW  Endere�oHW          Flags Mascara         "
-+"Iface\n"
- 
- #: ../arp.c:467
- msgid "(incomplete)"
-@@ -2361,17 +2365,15 @@ msgstr "aten
- msgid "Warning: cannot open %s (%s). Limited output.\n"
- msgstr "Aten��o: n�o foi poss�vel abrir %s (%s). Sa�da limitada.\n"
- 
--#. Give better error message for this case.
-+#. better translation?
- #: ../lib/interface.c:504
- msgid "Device not found"
--msgstr "%s: dispositivo n�o encontrado"
-+msgstr "dispositivo n�o encontrado"
- 
- #: ../lib/interface.c:508
- #, c-format
- msgid "%s: error fetching interface information: %s\n"
--msgstr ""
--"%s: erro obtendo informa��es da interface: %s\n"
--"\n"
-+msgstr "%s: erro obtendo informa��es da interface: %s\n"
- 
- #: ../lib/sockets.c:59
- msgid "No usable address families found.\n"
-diff --git a/rarp.c b/rarp.c
-index aab05b3..ab8f710 100644
---- a/rarp.c
-+++ b/rarp.c
-@@ -3,7 +3,7 @@
-  *              that maintains the kernel's RARP cache.  It is derived
-  *              from Fred N. van Kempen's arp command.
-  *
-- * Version:	$Id: rarp.c,v 1.6 2001/04/08 17:05:05 pb Exp $
-+ * Version:	$Id: rarp.c,v 1.9 2007/12/02 02:19:52 ecki Exp $
-  *
-  * Usage:       rarp -d hostname                      Delete entry
-  *              rarp -s hostname ethernet_address     Add entry
-@@ -40,10 +40,11 @@
- #include "net-support.h"
- #include "version.h"
- #include "pathnames.h"
-+#include "proc.h"
- 
- static char no_rarp_message[] = N_("This kernel does not support RARP.\n");
- 
--static char version_string[] = RELEASE "\nrarp 1.03 (2001-04-04)\n";
-+static char *Release = RELEASE;
- 
- static struct hwtype *hardware = NULL;
- 
-@@ -154,7 +155,7 @@ static int rarp_file(int fd, const char *name)
- 
- static int display_cache(void)
- {
--    FILE *fd = fopen(_PATH_PROCNET_RARP, "r");
-+    FILE *fd = proc_fopen(_PATH_PROCNET_RARP);
-     char buffer[256];
-     if (fd == NULL) {
- 	if (errno == ENOENT)
-@@ -225,7 +226,7 @@ int main(int argc, char **argv)
- 	case 'h':
- 	    usage();
- 	case 'V':
--	    fprintf(stderr, version_string);
-+	    fprintf(stderr, "%s\n", Release);
- 	    exit(E_VERSION);
- 	    break;
- 	case 'v':
-diff --git a/route.c b/route.c
-index f8c2bc3..4eaed49 100644
---- a/route.c
-+++ b/route.c
-@@ -2,7 +2,7 @@
-  * route        This file contains an implementation of the command
-  *              that manages the IP routing table in the kernel.
-  *
-- * Version:     $Id: route.c,v 1.9 2001/04/15 14:41:17 pb Exp $
-+ * Version:     $Id: route.c,v 1.10 2002/07/30 05:24:20 ecki Exp $
-  *
-  * Maintainer:  Bernd 'eckes' Eckenfels, <net-tools@lina.inka.de>
-  *
-@@ -10,7 +10,7 @@
-  *              (derived from FvK's 'route.c     1.70    01/04/94')
-  *
-  * Modifications:
-- *              Johannes Stille:        for Net-2Debugged by 
-+ *              Johannes Stille:        for Net-2Debugged by
-  *                                      <johannes@titan.os.open.de>
-  *              Linus Torvalds:         Misc Changes
-  *              Alan Cox:               add the new mtu/window stuff
-@@ -19,7 +19,7 @@
-  *       {1.80} Bernd Eckenfels:        reject, metric, irtt, 1.2.x support.
-  *       {1.81} Bernd Eckenfels:        reject routes need a dummy device
-  *960127 {1.82} Bernd Eckenfels:        'mod' and 'dyn' 'reinstate' added
-- *960129 {1.83} Bernd Eckenfels:        resolve and getsock now in lib/, 
-+ *960129 {1.83} Bernd Eckenfels:        resolve and getsock now in lib/,
-  *                                      REJECT displays '-' as gatway.
-  *960202 {1.84} Bernd Eckenfels:        net-features support added
-  *960203 {1.85} Bernd Eckenfels:        "#ifdef' in '#if' for net-features
-@@ -60,20 +60,21 @@
- #include "intl.h"
- #include "pathnames.h"
- #include "version.h"
-+#include "util.h"
- 
- #define DFLT_AF "inet"
- 
- #define FEATURE_ROUTE
- #include "lib/net-features.h"	/* needs some of the system includes above! */
- 
--char *Release = RELEASE, *Version = "route 1.98 (2001-04-15)";
-+static char *Release = RELEASE;
- 
--int opt_n = 0;			/* numerical output flag        */
--int opt_v = 0;			/* debugging output flag        */
--int opt_e = 1;			/* 1,2,3=type of routetable     */
--int opt_fc = 0;			/* routing cache/FIB */
--int opt_h = 0;			/* help selected                */
--struct aftype *ap;		/* current address family       */
-+int opt_n = 0;     // numerical output FLAG_NUM | FLAG_SYM
-+int opt_v = 0;     // debugging output flag
-+int opt_e = 1;     // 1,2,3=type of routetable
-+int opt_fc = 0;    // routing cache/FIB
-+int opt_h = 0;     // help selected
-+struct aftype *ap; // selected address family
- 
- static void usage(void)
- {
-@@ -89,7 +90,7 @@ static void usage(void)
-     fprintf(stderr, _("        -F, --fib                display Forwarding Information Base (default)\n"));
-     fprintf(stderr, _("        -C, --cache              display routing cache instead of FIB\n\n"));
- 
--    fprintf(stderr, _("  <AF>=Use '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
-+    fprintf(stderr, _("  <AF>=Use -4, -6, '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
-     fprintf(stderr, _("  List of possible address families (which support routing):\n"));
-     print_aflist(1); /* 1 = routeable */
-     exit(E_USAGE);
-@@ -98,7 +99,7 @@ static void usage(void)
- 
- static void version(void)
- {
--    fprintf(stderr, "%s\n%s\n%s\n", Release, Version, Features);
-+    fprintf(stderr, "%s\n%s\n", Release, Features);
-     exit(E_VERSION);
- }
- 
-@@ -135,14 +136,12 @@ int main(int argc, char **argv)
- 
-     /* getopts and -net wont work :-/ */
-     for (tmp = argv; *tmp; tmp++) {
--	if (!strcmp(*tmp, "-net"))
--	    strcpy(*tmp, "#net");
--	else if (!strcmp(*tmp, "-host"))
--	    strcpy(*tmp, "#host");
-+        if (!strcmp(*tmp, "-net") || !strcmp(*tmp, "-host"))
-+            (*tmp)[0]='#';
-     }
- 
-     /* Fetch the command-line arguments. */
--    while ((i = getopt_long(argc, argv, "A:eCFhnNVv?", longopts, &lop)) != EOF)
-+    while ((i = getopt_long(argc, argv, "A:eCFhnN64Vv?", longopts, &lop)) != EOF)
- 	switch (i) {
- 	case -1:
- 	    break;
-@@ -176,6 +175,14 @@ int main(int argc, char **argv)
- 	    if ((i = aftrans_opt(optarg)))
- 		exit(i);
- 	    break;
-+	case '6':
-+	    if ((i = aftrans_opt("inet6")))
-+		exit(i);
-+	    break;
-+	case '4':
-+	    if ((i = aftrans_opt("inet")))
-+		exit(i);
-+	    break;
- 	case 'V':
- 	    version();
- 	case 'h':
-diff --git a/slattach.c b/slattach.c
-index cedae1b..5c81584 100644
---- a/slattach.c
-+++ b/slattach.c
-@@ -40,7 +40,7 @@
- #include <limits.h>
- #include <pwd.h>
- #include <signal.h>
--#include <stdlib.h>          
-+#include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
- #include <getopt.h>
-@@ -62,26 +62,27 @@
- #include "util.h"
- 
- #ifndef _PATH_LOCKD
--#define _PATH_LOCKD		"/var/lock"		/* lock files   */
-+#define _PATH_LOCKD	"/var/lock"		/* lock files   */
- #endif
- #ifndef _UID_UUCP
--#define _UID_UUCP		"uucp"			/* owns locks   */
-+#define _UID_UUCP	"uucp"			/* owns locks   */
-+#endif
-+#ifndef _PATH_DEVPTMX
-+#define _PATH_DEVPTMX	"/dev/ptmx"		/* pseudo-terminal master */
- #endif
- 
- 
- #define DEF_PROTO	"cslip"
- 
- 
--const char *Release = RELEASE,
--	   *Version = "@(#) slattach 1.21 (1999-11-21)",
--	   *Signature = "net-tools, Fred N. van Kempen et al.";
-+static char *Release = RELEASE, *Signature = "Fred N. van Kempen et al.";
- 
- 
- struct {
-   const char	*speed;
-   int	code;
- } tty_speeds[] = {			/* table of usable baud rates	*/
--  { "50",	B50	}, { "75",	B75  	},	
-+  { "50",	B50	}, { "75",	B75  	},
-   { "110",	B110	}, { "300",	B300	},
-   { "600",	B600	}, { "1200",	B1200	},
-   { "2400",	B2400	}, { "4800",	B4800	},
-@@ -108,6 +109,7 @@ struct termios	tty_saved,		/* saved TTY device state	*/
- int		tty_sdisc,		/* saved TTY line discipline	*/
- 		tty_ldisc,		/* current TTY line discipline	*/
- 		tty_fd = -1;		/* TTY file descriptor		*/
-+char *		path_pts = NULL;	/* slave pseudo-terminal device */
- int		opt_c = 0;		/* "command" to run at exit	*/
- int		opt_e = 0;		/* "activate only" flag		*/
- int		opt_h = 0;		/* "hangup" on carrier loss	*/
-@@ -115,7 +117,7 @@ int		opt_h = 0;		/* "hangup" on carrier loss	*/
- int		opt_k = 0;		/* "keepalive" value		*/
- #endif
- int		opt_l = 0;		/* "lock it" flag		*/
--int		opt_L = 0;		/* clocal flag			*/
-+int		opt_L = 0;		/* 3-wire mode flag		*/
- int		opt_m = 0;		/* "set RAW mode" flag		*/
- int		opt_n = 0;		/* "set No Mesg" flag		*/
- #ifdef SIOCSOUTFILL
-@@ -149,7 +151,7 @@ tty_already_locked(char *nam)
-   /* that lock.                                   */
-   i = fscanf(fd, "%d", &pid);
-   (void) fclose(fd);
-- 
-+
-   if (i != 1) /* Lock file format's wrong! Kill't */
-     return(0);
- 
-@@ -195,15 +197,18 @@ tty_lock(char *path, int mode)
- 		return(-1);
- 	}
- 
--	(void) close(fd);
--
- 	/* Make sure UUCP owns the lockfile.  Required by some packages. */
- 	if ((pw = getpwnam(_UID_UUCP)) == NULL) {
- 		if (opt_q == 0) fprintf(stderr, _("slattach: tty_lock: UUCP user %s unknown!\n"),
- 					_UID_UUCP);
-+		(void) close(fd);
- 		return(0);	/* keep the lock anyway */
- 	}
--	(void) chown(saved_path, pw->pw_uid, pw->pw_gid);
-+	if (fchown(fd, pw->pw_uid, pw->pw_gid))
-+		/* keep the lock anyway */;
-+
-+	(void) close(fd);
-+
- 	saved_lock = 1;
-   } else {	/* unlock */
- 	if (saved_lock != 1) return(0);
-@@ -294,7 +299,7 @@ tty_set_parity(struct termios *tty, char *parity)
-   switch(toupper(*parity)) {
- 	case 'N':
- 		tty->c_cflag &= ~(PARENB | PARODD);
--		break;  
-+		break;
- 
- 	case 'O':
- 		tty->c_cflag &= ~(PARENB | PARODD);
-@@ -342,9 +347,11 @@ tty_set_raw(struct termios *tty)
-   tty->c_oflag = (0);				/* output flags		*/
-   tty->c_lflag = (0);				/* local flags		*/
-   speed = (tty->c_cflag & CBAUD);		/* save current speed	*/
--  tty->c_cflag = (CRTSCTS | HUPCL | CREAD);	/* UART flags		*/
--  if (opt_L) 
-+  tty->c_cflag = (HUPCL | CREAD);		/* UART flags		*/
-+  if (opt_L)
- 	tty->c_cflag |= CLOCAL;
-+  else
-+	tty->c_cflag |= CRTSCTS;
-   tty->c_cflag |= speed;			/* restore speed	*/
-   return(0);
- }
-@@ -410,7 +417,7 @@ static int
- tty_get_name(char *name)
- {
-   if (ioctl(tty_fd, SIOCGIFNAME, name) < 0) {
--	if (opt_q == 0) 
-+	if (opt_q == 0)
- 	    perror("tty_get_name");
- 	return(-errno);
-   }
-@@ -464,7 +471,7 @@ tty_open(char *name, const char *speed)
-   if (name != NULL) {
- 	if (name[0] != '/') {
- 		if (strlen(name + 6) > sizeof(pathbuf)) {
--			if (opt_q == 0) fprintf(stderr, 
-+			if (opt_q == 0) fprintf(stderr,
- 				_("slattach: tty name too long\n"));
- 			return (-1);
- 		}
-@@ -488,7 +495,28 @@ tty_open(char *name, const char *speed)
- 		return(-errno);
- 	}
- 	tty_fd = fd;
--	if (opt_d) printf("slattach: tty_open: %s (fd=%d) ", path_open, fd);
-+	if (opt_d) printf("slattach: tty_open: %s (fd=%d)\n", path_open, fd);
-+	if (!strcmp(path_open, _PATH_DEVPTMX)) {
-+		if (opt_d) printf("slattach: tty_open: trying to grantpt and unlockpt\n");
-+		if (grantpt(fd) < 0) {
-+		    if (opt_q == 0) fprintf(stderr,
-+			    "slattach: tty_open: grantpt: %s\n", strerror(errno));
-+		    return(-errno);
-+		}
-+		if (unlockpt(fd) < 0) {
-+		    if (opt_q == 0) fprintf(stderr,
-+			    "slattach: tty_open: unlockpt: %s\n", strerror(errno));
-+		    return(-errno);
-+		}
-+		path_pts = ptsname(fd);
-+		if (path_pts == NULL) {
-+		    if (opt_q == 0) fprintf(stderr,
-+			    "slattach: tty_open: ptsname: %s\n", strerror(errno));
-+		    return(-errno);
-+		}
-+		if (opt_d) printf("slattach: tty_open: %s: slave pseudo-terminal is %s\n",
-+				  path_open, path_pts);
-+	}
-   } else {
- 	tty_fd = 0;
-   }
-@@ -504,7 +532,7 @@ tty_open(char *name, const char *speed)
-   if (tty_get_disc(&tty_sdisc) < 0) {
- 	if (opt_q == 0) fprintf(stderr, _("slattach: tty_open: cannot get current line disc!\n"));
- 	return(-errno);
--  } 
-+  }
-   tty_ldisc = tty_sdisc;
- 
-   /* Put this terminal line in a 8-bit transparent mode. */
-@@ -565,15 +593,15 @@ usage(void)
- 	  "[-c cmd] [-s speed] [-p protocol] tty | -\n"
- 	  "       slattach -V | --version\n";
- 
--  fprintf(stderr, usage_msg);
--  exit(1);
-+  fputs(usage_msg, stderr);
-+  exit(E_USAGE);
- }
- 
- 
--static void 
-+static void
- version(void)
- {
--    printf("%s\n%s\n%s\n", Release, Version, Signature);
-+    printf("%s\n%s\n", Release, Signature);
-     exit(E_VERSION);
- }
- 
-@@ -581,7 +609,7 @@ version(void)
- int
- main(int argc, char *argv[])
- {
--  char path_buf[128];
-+  char path_buf[128] = "";
-   char *path_dev;
-   char buff[128];
-   const char *speed = NULL;
-@@ -593,7 +621,6 @@ main(int argc, char *argv[])
-     { NULL, 0, NULL, 0 }
-   };
- 
--  strcpy(path_buf, "");
-   path_dev = path_buf;
- 
-   /* Scan command line for any arguments. */
-@@ -667,7 +694,7 @@ main(int argc, char *argv[])
- 		usage();
- 		/*NOTREACHED*/
-   }
--  
-+
-   if (setvbuf(stdout,0,_IOLBF,0)) {
- 	if (opt_q == 0) fprintf(stderr, _("slattach: setvbuf(stdout,0,_IOLBF,0) : %s\n"),
- 				strerror(errno));
-@@ -703,6 +730,7 @@ main(int argc, char *argv[])
-         if (tty_get_name(buff)) { return(3); }
- 	printf(_("%s started"), proto);
- 	if (path_dev != NULL) printf(_(" on %s"), path_dev);
-+	if (path_pts != NULL) printf(_(" ptsname %s"), path_pts);
- 	printf(_(" interface %s\n"), buff);
-   }
- 
-@@ -738,7 +766,7 @@ main(int argc, char *argv[])
- 
- 	tty_close();
- 	if(extcmd)	/* external command on exit */
--		system(extcmd);
-+		exit(system(extcmd));
-   }
-   exit(0);
- }
-diff --git a/statistics.c b/statistics.c
-index a878df8..fe8ee4e 100644
---- a/statistics.c
-+++ b/statistics.c
-@@ -1,9 +1,9 @@
- /*
-- * Copyright 1997,1999,2000 Andi Kleen. Subject to the GPL. 
-- * $Id: statistics.c,v 1.14 2001/02/02 18:01:23 pb Exp $
-- * 19980630 - i18n - Arnaldo Carvalho de Melo <acme@conectiva.com.br> 
-- * 19981113 - i18n fixes - Arnaldo Carvalho de Melo <acme@conectiva.com.br> 
-- * 19990101 - added net/netstat, -t, -u, -w supprt - Bernd Eckenfels 
-+ * Copyright 1997,1999,2000 Andi Kleen. Subject to the GPL.
-+ * $Id: statistics.c,v 1.23 2010-10-29 19:24:36 ecki Exp $
-+ * 19980630 - i18n - Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-+ * 19981113 - i18n fixes - Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-+ * 19990101 - added net/netstat, -t, -u, -w supprt - Bernd Eckenfels
-  */
- #include <ctype.h>
- #include <stdio.h>
-@@ -11,6 +11,7 @@
- #include <string.h>
- #include "config.h"
- #include "intl.h"
-+#include "proc.h"
- 
- /* #define WARN 1 */
- 
-@@ -35,26 +36,26 @@ struct entry {
-     enum State type;
- };
- 
--struct statedesc { 
-+struct statedesc {
-     int indent;
--    char *title; 
--}; 
-+    char *title;
-+};
- 
--struct statedesc states[] = { 
-+struct statedesc states[] = {
-     [number] = { 4, NULL },
--    [opt_number] = { 4, NULL }, 
-+    [opt_number] = { 4, NULL },
-     [i_forward] = { 4, NULL },
-     [i_inp_icmp] = { 8, N_("ICMP input histogram:") },
-     [i_outp_icmp] = { 8, N_("ICMP output histogram:") },
-     [MaxState] = {0},
--}; 
-+};
- 
- static enum State state;
- 
- #define I_STATIC (1<<16)	/* static configuration option. */
- #define I_TITLE  (1<<17)
- 
--/* 
-+/*
-  * XXX check against the snmp mib rfc.
-  *
-  * Don't mark the first field as translatable! It's a snmp MIB standard.
-@@ -63,54 +64,115 @@ static enum State state;
- struct entry Iptab[] =
- {
-     {"Forwarding", N_("Forwarding is %s"), i_forward | I_STATIC},
--    {"DefaultTTL", N_("Default TTL is %u"), number | I_STATIC},
--    {"InReceives", N_("%u total packets received"), number},
--    {"InHdrErrors", N_("%u with invalid headers"), opt_number},
--    {"InAddrErrors", N_("%u with invalid addresses"), opt_number},
--    {"ForwDatagrams", N_("%u forwarded"), number},
--    {"InUnknownProtos", N_("%u with unknown protocol"), opt_number},
--    {"InDiscards", N_("%u incoming packets discarded"), number},
--    {"InDelivers", N_("%u incoming packets delivered"), number},
--    {"OutRequests", N_("%u requests sent out"), number},	/*? */
--    {"OutDiscards", N_("%u outgoing packets dropped"), opt_number},
--    {"OutNoRoutes", N_("%u dropped because of missing route"), opt_number},
--    {"ReasmTimeout", N_("%u fragments dropped after timeout"), opt_number},
--    {"ReasmReqds", N_("%u reassemblies required"), opt_number},	/* ? */
--    {"ReasmOKs", N_("%u packets reassembled ok"), opt_number},
--    {"ReasmFails", N_("%u packet reassembles failed"), opt_number},
--    {"FragOKs", N_("%u fragments received ok"), opt_number},
--    {"FragFails", N_("%u fragments failed"), opt_number},
--    {"FragCreates", N_("%u fragments created"), opt_number}
-+    {"DefaultTTL", N_("Default TTL is %llu"), number | I_STATIC},
-+    {"InReceives", N_("%llu total packets received"), number},
-+    {"InHdrErrors", N_("%llu with invalid headers"), opt_number},
-+    {"InAddrErrors", N_("%llu with invalid addresses"), opt_number},
-+    {"ForwDatagrams", N_("%llu forwarded"), number},
-+    {"InUnknownProtos", N_("%llu with unknown protocol"), opt_number},
-+    {"InDiscards", N_("%llu incoming packets discarded"), number},
-+    {"InDelivers", N_("%llu incoming packets delivered"), number},
-+    {"OutRequests", N_("%llu requests sent out"), number},	/*? */
-+    {"OutDiscards", N_("%llu outgoing packets dropped"), opt_number},
-+    {"OutNoRoutes", N_("%llu dropped because of missing route"), opt_number},
-+    {"ReasmTimeout", N_("%llu fragments dropped after timeout"), opt_number},
-+    {"ReasmReqds", N_("%llu reassemblies required"), opt_number},	/* ? */
-+    {"ReasmOKs", N_("%llu packets reassembled ok"), opt_number},
-+    {"ReasmFails", N_("%llu packet reassembles failed"), opt_number},
-+    {"FragOKs", N_("%llu fragments received ok"), opt_number},
-+    {"FragFails", N_("%llu fragments failed"), opt_number},
-+    {"FragCreates", N_("%llu fragments created"), opt_number}
-+};
-+
-+struct entry Ip6tab[] =
-+{
-+    {"Ip6InReceives", N_("%llu total packets received"), number},
-+    {"Ip6InHdrErrors", N_("%llu with invalid headers"), opt_number},
-+    {"Ip6InTooBigErrors", N_("%llu with packets too big"), opt_number},
-+    {"Ip6InNoRoutes", N_("%llu incoming packets with no route"), opt_number},
-+    {"Ip6InAddrErrors", N_("%llu with invalid addresses"), opt_number},
-+    {"Ip6InUnknownProtos", N_("%llu with unknown protocol"), opt_number},
-+    {"Ip6InTruncatedPkts", N_("%llu with truncated packets"), opt_number},
-+    {"Ip6InDiscards", N_("%llu incoming packets discarded"), number},
-+    {"Ip6InDelivers", N_("%llu incoming packets delivered"), number},
-+    {"Ip6OutForwDatagrams", N_("%llu forwarded"), number},
-+    {"Ip6OutRequests", N_("%llu requests sent out"), number},     /*? */
-+    {"Ip6OutDiscards", N_("%llu outgoing packets dropped"), opt_number},
-+    {"Ip6OutNoRoutes", N_("%llu dropped because of missing route"), opt_number},
-+    {"Ip6ReasmTimeout", N_("%llu fragments dropped after timeout"), opt_number},
-+    {"Ip6ReasmReqds", N_("%llu reassemblies required"), opt_number}, /* ? */
-+    {"Ip6ReasmOKs", N_("%llu packets reassembled ok"), opt_number},
-+    {"Ip6ReasmFails", N_("%llu packet reassembles failed"), opt_number},
-+    {"Ip6FragOKs", N_("%llu fragments received ok"), opt_number},
-+    {"Ip6FragFails", N_("%llu fragments failed"), opt_number},
-+    {"Ip6FragCreates", N_("%llu fragments created"), opt_number},
-+    {"Ip6InMcastPkts", N_("%llu incoming multicast packets"), opt_number},
-+    {"Ip6OutMcastPkts", N_("%llu outgoing multicast packets"), opt_number}
- };
- 
- struct entry Icmptab[] =
- {
--    {"InMsgs", N_("%u ICMP messages received"), number},
--    {"InErrors", N_("%u input ICMP message failed."), number},
--    {"InDestUnreachs", N_("destination unreachable: %u"), i_inp_icmp | I_TITLE},
--    {"InTimeExcds", N_("timeout in transit: %u"), i_inp_icmp | I_TITLE},
--    {"InParmProbs", N_("wrong parameters: %u"), i_inp_icmp | I_TITLE},	/*? */
--    {"InSrcQuenchs", N_("source quenches: %u"), i_inp_icmp | I_TITLE},
--    {"InRedirects", N_("redirects: %u"), i_inp_icmp | I_TITLE},
--    {"InEchos", N_("echo requests: %u"), i_inp_icmp | I_TITLE},
--    {"InEchoReps", N_("echo replies: %u"), i_inp_icmp | I_TITLE},
--    {"InTimestamps", N_("timestamp request: %u"), i_inp_icmp | I_TITLE},
--    {"InTimestampReps", N_("timestamp reply: %u"), i_inp_icmp | I_TITLE},
--    {"InAddrMasks", N_("address mask request: %u"), i_inp_icmp | I_TITLE},	/*? */
--    {"InAddrMaskReps", N_("address mask replies: %u"), i_inp_icmp | I_TITLE},	/*? */
--    {"OutMsgs", N_("%u ICMP messages sent"), number},
--    {"OutErrors", N_("%u ICMP messages failed"), number},
--    {"OutDestUnreachs", N_("destination unreachable: %u"), i_outp_icmp | I_TITLE},
--    {"OutTimeExcds", N_("time exceeded: %u"), i_outp_icmp | I_TITLE},
--    {"OutParmProbs", N_("wrong parameters: %u"), i_outp_icmp | I_TITLE},	/*? */
--    {"OutSrcQuenchs", N_("source quench: %u"), i_outp_icmp | I_TITLE},
--    {"OutRedirects", N_("redirect: %u"), i_outp_icmp | I_TITLE},
--    {"OutEchos", N_("echo request: %u"), i_outp_icmp | I_TITLE},
--    {"OutEchoReps", N_("echo replies: %u"), i_outp_icmp | I_TITLE},
--    {"OutTimestamps", N_("timestamp requests: %u"), i_outp_icmp | I_TITLE},
--    {"OutTimestampReps", N_("timestamp replies: %u"), i_outp_icmp | I_TITLE},
--    {"OutAddrMasks", N_("address mask requests: %u"), i_outp_icmp | I_TITLE},
--    {"OutAddrMaskReps", N_("address mask replies: %u"), i_outp_icmp | I_TITLE},
-+    {"InMsgs", N_("%llu ICMP messages received"), number},
-+    {"InErrors", N_("%llu input ICMP message failed."), number},
-+    {"InDestUnreachs", N_("destination unreachable: %llu"), i_inp_icmp | I_TITLE},
-+    {"InTimeExcds", N_("timeout in transit: %llu"), i_inp_icmp | I_TITLE},
-+    {"InParmProbs", N_("wrong parameters: %llu"), i_inp_icmp | I_TITLE},	/*? */
-+    {"InSrcQuenchs", N_("source quenches: %llu"), i_inp_icmp | I_TITLE},
-+    {"InRedirects", N_("redirects: %llu"), i_inp_icmp | I_TITLE},
-+    {"InEchos", N_("echo requests: %llu"), i_inp_icmp | I_TITLE},
-+    {"InEchoReps", N_("echo replies: %llu"), i_inp_icmp | I_TITLE},
-+    {"InTimestamps", N_("timestamp request: %llu"), i_inp_icmp | I_TITLE},
-+    {"InTimestampReps", N_("timestamp reply: %llu"), i_inp_icmp | I_TITLE},
-+    {"InAddrMasks", N_("address mask request: %llu"), i_inp_icmp | I_TITLE},	/*? */
-+    {"InAddrMaskReps", N_("address mask replies: %llu"), i_inp_icmp | I_TITLE},	/*? */
-+    {"OutMsgs", N_("%llu ICMP messages sent"), number},
-+    {"OutErrors", N_("%llu ICMP messages failed"), number},
-+    {"OutDestUnreachs", N_("destination unreachable: %llu"), i_outp_icmp | I_TITLE},
-+    {"OutTimeExcds", N_("time exceeded: %llu"), i_outp_icmp | I_TITLE},
-+    {"OutParmProbs", N_("wrong parameters: %llu"), i_outp_icmp | I_TITLE},	/*? */
-+    {"OutSrcQuenchs", N_("source quench: %llu"), i_outp_icmp | I_TITLE},
-+    {"OutRedirects", N_("redirect: %llu"), i_outp_icmp | I_TITLE},
-+    {"OutEchos", N_("echo request: %llu"), i_outp_icmp | I_TITLE},
-+    {"OutEchoReps", N_("echo replies: %llu"), i_outp_icmp | I_TITLE},
-+    {"OutTimestamps", N_("timestamp requests: %llu"), i_outp_icmp | I_TITLE},
-+    {"OutTimestampReps", N_("timestamp replies: %llu"), i_outp_icmp | I_TITLE},
-+    {"OutAddrMasks", N_("address mask requests: %llu"), i_outp_icmp | I_TITLE},
-+    {"OutAddrMaskReps", N_("address mask replies: %llu"), i_outp_icmp | I_TITLE},
-+};
-+
-+struct entry Icmp6tab[] =
-+{
-+    {"Icmp6InMsgs", N_("%llu ICMP messages received"), number},
-+    {"Icmp6InErrors", N_("%llu input ICMP message failed."), number},
-+    {"Icmp6InDestUnreachs", N_("destination unreachable: %llu"), i_inp_icmp | I_TITLE},
-+    {"Icmp6InPktTooBigs", N_("packets too big: %llu"), i_inp_icmp | I_TITLE},
-+    {"Icmp6InTimeExcds", N_("received ICMPv6 time exceeded: %llu"), i_inp_icmp | I_TITLE},
-+    {"Icmp6InParmProblems", N_("parameter problem: %llu"), i_inp_icmp | I_TITLE},
-+    {"Icmp6InEchos", N_("echo requests: %llu"), i_inp_icmp | I_TITLE},
-+    {"Icmp6InEchoReplies", N_("echo replies: %llu"), i_inp_icmp | I_TITLE},
-+    {"Icmp6InGroupMembQueries", N_("group member queries: %llu"), i_inp_icmp | I_TITLE},
-+    {"Icmp6InGroupMembResponses", N_("group member responses: %llu"), i_inp_icmp | I_TITLE},
-+    {"Icmp6InGroupMembReductions", N_("group member reductions: %llu"), i_inp_icmp | I_TITLE},
-+    {"Icmp6InRouterSolicits", N_("router solicits: %llu"), i_inp_icmp | I_TITLE},
-+    {"Icmp6InRouterAdvertisements", N_("router advertisement: %llu"), i_inp_icmp | I_TITLE},
-+    {"Icmp6InNeighborSolicits", N_("neighbour solicits: %llu"), i_inp_icmp | I_TITLE},
-+    {"Icmp6InNeighborAdvertisements", N_("neighbour advertisement: %llu"), i_inp_icmp | I_TITLE},
-+    {"Icmp6InRedirects", N_("redirects: %llu"), i_inp_icmp | I_TITLE},
-+    {"Icmp6OutMsgs", N_("%llu ICMP messages sent"), number},
-+    {"Icmp6OutDestUnreachs", N_("destination unreachable: %llu"), i_outp_icmp | I_TITLE},
-+    {"Icmp6OutPktTooBigs", N_("packets too big: %llu"), i_outp_icmp | I_TITLE},
-+    {"Icmp6OutTimeExcds", N_("sent ICMPv6 time exceeded: %llu"), i_outp_icmp | I_TITLE},
-+    {"Icmp6OutParmProblems", N_("parameter problem: %llu"), i_outp_icmp | I_TITLE},
-+    {"Icmp6OutEchos", N_("echo requests: %llu"), i_outp_icmp | I_TITLE},
-+    {"Icmp6OutEchoReplies", N_("echo replies: %llu"), i_outp_icmp | I_TITLE},
-+    {"Icmp6OutGroupMembQueries", N_("group member queries: %llu"), i_outp_icmp | I_TITLE},
-+    {"Icmp6OutGroupMembResponses", N_("group member responses: %llu"), i_outp_icmp | I_TITLE},
-+    {"Icmp6OutGroupMembReductions", N_("group member reductions: %llu"), i_outp_icmp | I_TITLE},
-+    {"Icmp6OutRouterSolicits", N_("router solicits: %llu"), i_outp_icmp | I_TITLE},
-+    {"Icmp6OutRouterAdvertisements ", N_("router advertisement: %llu"), i_outp_icmp | I_TITLE},
-+    {"Icmp6OutNeighborSolicits", N_("neighbor solicits: %llu"), i_outp_icmp | I_TITLE},
-+    {"Icmp6OutNeighborAdvertisements", N_("neighbor advertisements: %llu"), i_outp_icmp | I_TITLE},
-+    {"Icmp6OutRedirects", N_("redirects: %llu"), i_outp_icmp | I_TITLE},
- };
- 
- struct entry Tcptab[] =
-@@ -119,79 +181,129 @@ struct entry Tcptab[] =
-     {"RtoMin", "", number},
-     {"RtoMax", "", number},
-     {"MaxConn", "", number},
--    {"ActiveOpens", N_("%u active connections openings"), number},
--    {"PassiveOpens", N_("%u passive connection openings"), number},
--    {"AttemptFails", N_("%u failed connection attempts"), number},
--    {"EstabResets", N_("%u connection resets received"), number},
--    {"CurrEstab", N_("%u connections established"), number},
--    {"InSegs", N_("%u segments received"), number},
--    {"OutSegs", N_("%u segments send out"), number},
--    {"RetransSegs", N_("%u segments retransmited"), number},
--    {"InErrs", N_("%u bad segments received."), number},
--    {"OutRsts", N_("%u resets sent"), number},
-+    {"ActiveOpens", N_("%llu active connections openings"), number},
-+    {"PassiveOpens", N_("%llu passive connection openings"), number},
-+    {"AttemptFails", N_("%llu failed connection attempts"), number},
-+    {"EstabResets", N_("%llu connection resets received"), number},
-+    {"CurrEstab", N_("%llu connections established"), number},
-+    {"InSegs", N_("%llu segments received"), number},
-+    {"OutSegs", N_("%llu segments send out"), number},
-+    {"RetransSegs", N_("%llu segments retransmited"), number},
-+    {"InErrs", N_("%llu bad segments received."), number},
-+    {"OutRsts", N_("%llu resets sent"), number},
- };
- 
- struct entry Udptab[] =
- {
--    {"InDatagrams", N_("%u packets received"), number},
--    {"NoPorts", N_("%u packets to unknown port received."), number},
--    {"InErrors", N_("%u packet receive errors"), number},
--    {"OutDatagrams", N_("%u packets sent"), number},
-+    {"InDatagrams", N_("%llu packets received"), number},
-+    {"NoPorts", N_("%llu packets to unknown port received."), number},
-+    {"InErrors", N_("%llu packet receive errors"), number},
-+    {"OutDatagrams", N_("%llu packets sent"), number},
-+    {"RcvbufErrors", N_("%llu receive buffer errors"), number},
-+    {"SndbufErrors", N_("%llu send buffer errors"), number},
-+ };
-+
-+struct entry Udp6tab[] =
-+{
-+    {"Udp6InDatagrams", N_("%llu packets received"), number},
-+    {"Udp6NoPorts", N_("%llu packets to unknown port received."), number},
-+    {"Udp6InErrors", N_("%llu packet receive errors"), number},
-+    {"Udp6OutDatagrams", N_("%llu packets sent"), number},
- };
- 
- struct entry Tcpexttab[] =
- {
--    {"SyncookiesSent", N_("%u SYN cookies sent"), opt_number},
--    {"SyncookiesRecv", N_("%u SYN cookies received"), opt_number},
--    {"SyncookiesFailed", N_("%u invalid SYN cookies received"), opt_number},
--
--    { "EmbryonicRsts", N_("%u resets received for embryonic SYN_RECV sockets"),
--      opt_number },  
--    { "PruneCalled", N_("%u packets pruned from receive queue because of socket"
--			" buffer overrun"), opt_number },  
-+    {"SyncookiesSent", N_("%llu SYN cookies sent"), opt_number},
-+    {"SyncookiesRecv", N_("%llu SYN cookies received"), opt_number},
-+    {"SyncookiesFailed", N_("%llu invalid SYN cookies received"), opt_number},
-+
-+    { "EmbryonicRsts", N_("%llu resets received for embryonic SYN_RECV sockets"),
-+      opt_number },
-+    { "PruneCalled", N_("%llu packets pruned from receive queue because of socket"
-+			" buffer overrun"), opt_number },
-     /* obsolete: 2.2.0 doesn't do that anymore */
--    { "RcvPruned", N_("%u packets pruned from receive queue"), opt_number },
--    { "OfoPruned", N_("%u packets dropped from out-of-order queue because of"
--		      " socket buffer overrun"), opt_number }, 
--    { "OutOfWindowIcmps", N_("%u ICMP packets dropped because they were "
--			     "out-of-window"), opt_number }, 
--    { "LockDroppedIcmps", N_("%u ICMP packets dropped because"
-+    { "RcvPruned", N_("%llu packets pruned from receive queue"), opt_number },
-+    { "OfoPruned", N_("%llu packets dropped from out-of-order queue because of"
-+		      " socket buffer overrun"), opt_number },
-+    { "OutOfWindowIcmps", N_("%llu ICMP packets dropped because they were "
-+			     "out-of-window"), opt_number },
-+    { "LockDroppedIcmps", N_("%llu ICMP packets dropped because"
- 			     " socket was locked"), opt_number },
--    { "TW", N_("%u TCP sockets finished time wait in fast timer"), opt_number },
--    { "TWRecycled", N_("%u time wait sockets recycled by time stamp"), opt_number }, 
--    { "TWKilled", N_("%u TCP sockets finished time wait in slow timer"), opt_number },
--    { "PAWSPassive", N_("%u passive connections rejected because of"
-+    { "TW", N_("%llu TCP sockets finished time wait in fast timer"), opt_number },
-+    { "TWRecycled", N_("%llu time wait sockets recycled by time stamp"), opt_number },
-+    { "TWKilled", N_("%llu TCP sockets finished time wait in slow timer"), opt_number },
-+    { "PAWSPassive", N_("%llu passive connections rejected because of"
- 			" time stamp"), opt_number },
--    { "PAWSActive", N_("%u active connections rejected because of "
-+    { "PAWSActive", N_("%llu active connections rejected because of "
- 		       "time stamp"), opt_number },
--    { "PAWSEstab", N_("%u packets rejects in established connections because of"
-+    { "PAWSEstab", N_("%llu packets rejects in established connections because of"
- 		      " timestamp"), opt_number },
--    { "DelayedACKs", N_("%u delayed acks sent"), opt_number },
--    { "DelayedACKLocked", N_("%u delayed acks further delayed because of"
-+    { "DelayedACKs", N_("%llu delayed acks sent"), opt_number },
-+    { "DelayedACKLocked", N_("%llu delayed acks further delayed because of"
- 			     " locked socket"), opt_number },
--    { "DelayedACKLost", N_("Quick ack mode was activated %u times"), opt_number },
--    { "ListenOverflows", N_("%u times the listen queue of a socket overflowed"),
-+    { "DelayedACKLost", N_("Quick ack mode was activated %llu times"), opt_number },
-+    { "ListenOverflows", N_("%llu times the listen queue of a socket overflowed"),
-       opt_number },
--    { "ListenDrops", N_("%u SYNs to LISTEN sockets ignored"), opt_number },
--    { "TCPPrequeued", N_("%u packets directly queued to recvmsg prequeue."), 
-+    { "ListenDrops", N_("%llu SYNs to LISTEN sockets dropped"), opt_number },
-+    { "TCPPrequeued", N_("%llu packets directly queued to recvmsg prequeue."),
-       opt_number },
--    { "TCPDirectCopyFromBacklog", N_("%u packets directly received"
--				     " from backlog"), opt_number },
--    { "TCPDirectCopyFromPrequeue", N_("%u packets directly received"
--				      " from prequeue"), opt_number },
--    { "TCPPrequeueDropped", N_("%u packets dropped from prequeue"), opt_number },
--    { "TCPHPHits", N_("%u packets header predicted"), number },
--    { "TCPHPHitsToUser", N_("%u packets header predicted and "
-+    { "TCPDirectCopyFromBacklog", N_("%llu bytes directly in process context from backlog"), opt_number },
-+    { "TCPDirectCopyFromPrequeue", N_("%llu bytes directly received in process context from prequeue"),
-+				      opt_number },
-+    { "TCPPrequeueDropped", N_("%llu packets dropped from prequeue"), opt_number },
-+    { "TCPHPHits", N_("%llu packet headers predicted"), number },
-+    { "TCPHPHitsToUser", N_("%llu packets header predicted and "
- 			    "directly queued to user"), opt_number },
--    { "SockMallocOOM", N_("Ran %u times out of system memory during " 
--			  "packet sending"), opt_number }, 
-+    { "SockMallocOOM", N_("Ran %llu times out of system memory during "
-+			  "packet sending"), opt_number },
-+    { "TCPPureAcks", N_("%llu acknowledgments not containing data payload received"), opt_number },
-+    { "TCPHPAcks", N_("%llu predicted acknowledgments"), opt_number },
-+    { "TCPRenoRecovery", N_("%llu times recovered from packet loss due to fast retransmit"), opt_number },
-+    { "TCPSackRecovery", N_("%llu times recovered from packet loss by selective acknowledgements"), opt_number },
-+    { "TCPSACKReneging", N_("%llu bad SACK blocks received"), opt_number },
-+    { "TCPFACKReorder", N_("Detected reordering %llu times using FACK"), opt_number },
-+    { "TCPSACKReorder", N_("Detected reordering %llu times using SACK"), opt_number },
-+    { "TCPTSReorder", N_("Detected reordering %llu times using time stamp"), opt_number },
-+    { "TCPRenoReorder", N_("Detected reordering %llu times using reno fast retransmit"), opt_number },
-+    { "TCPFullUndo", N_("%llu congestion windows fully recovered without slow start"), opt_number },
-+    { "TCPPartialUndo", N_("%llu congestion windows partially recovered using Hoe heuristic"), opt_number },
-+    { "TCPDSackUndo", N_("%llu congestion window recovered without slow start using DSACK"), opt_number },
-+    { "TCPLossUndo", N_("%llu congestion windows recovered without slow start after partial ack"), opt_number },
-+    { "TCPLostRetransmits", N_("%llu retransmits lost"), opt_number },
-+    { "TCPRenoFailures",  N_("%llu timeouts after reno fast retransmit"), opt_number },
-+    { "TCPSackFailures",  N_("%llu timeouts after SACK recovery"), opt_number },
-+    { "TCPLossFailures",  N_("%llu timeouts in loss state"), opt_number },
-+    { "TCPFastRetrans", N_("%llu fast retransmits"), opt_number },
-+    { "TCPForwardRetrans", N_("%llu forward retransmits"), opt_number },
-+    { "TCPSlowStartRetrans", N_("%llu retransmits in slow start"), opt_number },
-+    { "TCPTimeouts", N_("%llu other TCP timeouts"), opt_number },
-+    { "TCPRenoRecoveryFailed", N_("%llu reno fast retransmits failed"), opt_number },
-+    { "TCPSackRecoveryFail", N_("%llu SACK retransmits failed"), opt_number },
-+    { "TCPSchedulerFailed", N_("%llu times receiver scheduled too late for direct processing"), opt_number },
-+    { "TCPRcvCollapsed", N_("%llu packets collapsed in receive queue due to low socket buffer"), opt_number },
-+    { "TCPDSACKOldSent", N_("%llu DSACKs sent for old packets"), opt_number },
-+    { "TCPDSACKOfoSent", N_("%llu DSACKs sent for out of order packets"), opt_number },
-+    { "TCPDSACKRecv", N_("%llu DSACKs received"), opt_number },
-+    { "TCPDSACKOfoRecv", N_("%llu DSACKs for out of order packets received"), opt_number },
-+    { "TCPAbortOnSyn", N_("%llu connections reset due to unexpected SYN"), opt_number },
-+    { "TCPAbortOnData", N_("%llu connections reset due to unexpected data"), opt_number },
-+    { "TCPAbortOnClose", N_("%llu connections reset due to early user close"), opt_number },
-+    { "TCPAbortOnMemory", N_("%llu connections aborted due to memory pressure"), opt_number },
-+    { "TCPAbortOnTimeout", N_("%llu connections aborted due to timeout"), opt_number },
-+    { "TCPAbortOnLinger", N_("%llu connections aborted after user close in linger timeout"), opt_number },
-+    { "TCPAbortFailed", N_("%llu times unable to send RST due to no memory"), opt_number },
-+    { "TCPMemoryPressures", N_("TCP ran low on memory %llu times"), opt_number },
-+    { "TCPLoss", N_("%llu TCP data loss events"), opt_number },
-+    { "TCPDSACKUndo", N_("%llu congestion windows recovered without slow start by DSACK"),
-+	opt_number },
-+    { "TCPRenoRecoveryFail", N_("%llu classic Reno fast retransmits failed"), opt_number },
- };
- 
- struct tabtab {
-     char *title;
-     struct entry *tab;
-     size_t size;
--    int *flag; 
-+    int *flag;
- };
- 
- struct tabtab snmptabs[] =
-@@ -204,6 +316,15 @@ struct tabtab snmptabs[] =
-     {NULL}
- };
- 
-+struct tabtab snmp6tabs[] =
-+{
-+    {"Ip6", Ip6tab, sizeof(Ip6tab), &f_raw},
-+    {"Icmp6", Icmp6tab, sizeof(Icmp6tab), &f_raw},
-+    {"Udp6", Udp6tab, sizeof(Udp6tab), &f_udp},
-+    {"Tcp6", Tcptab, sizeof(Tcptab), &f_tcp},
-+    {NULL}
-+};
-+
- /* XXX IGMP */
- 
- int cmpentries(const void *a, const void *b)
-@@ -211,18 +332,19 @@ int cmpentries(const void *a, const void *b)
-     return strcmp(((struct entry *) a)->title, ((struct entry *) b)->title);
- }
- 
--void printval(struct tabtab *tab, char *title, int val)
-+void printval(struct tabtab *tab, char *title, unsigned long long val)
- {
-     struct entry *ent = NULL, key;
-     int type;
-     char buf[512];
- 
-     key.title = title;
--	if (tab->tab) 
-+	if (tab->tab)
- 	    ent = bsearch(&key, tab->tab, tab->size / sizeof(struct entry),
- 			  sizeof(struct entry), cmpentries);
-     if (!ent) {			/* try our best */
--	printf("%*s%s: %d\n", states[state].indent, "", title, val);
-+	if (val)
-+		printf("%*s%s: %llu\n", states[state].indent, "", title, val);
- 	return;
-     }
-     type = ent->type;
-@@ -242,7 +364,7 @@ void printval(struct tabtab *tab, char *title, int val)
-     buf[0] = '\0';
-     switch (type) {
-     case opt_number:
--	if (val == 0) 
-+	if (val == 0)
- 	    break;
- 	/*FALL THOUGH*/
-     case number:
-@@ -272,7 +394,7 @@ struct tabtab *newtable(struct tabtab *tabs, char *title)
- {
-     struct tabtab *t;
- 	static struct tabtab dummytab;
--	
-+
-     for (t = tabs; t->title; t++) {
- 		if (!strcmp(title, t->title)) {
- 	    	if (*(t->flag))
-@@ -281,22 +403,25 @@ struct tabtab *newtable(struct tabtab *tabs, char *title)
- 	   		return t;
- 		}
- 	}
--	if (!f_unknown) 
--		return NULL; 
-+	if (!f_unknown)
-+		return NULL;
- 	printf("%s:\n", _(title));
- 	dummytab.title = title;
--	dummytab.flag = &f_unknown; 
-+	dummytab.flag = &f_unknown;
- 	return &dummytab;
- }
- 
--void process_fd(FILE *f)
-+int process_fd(FILE *f, int all, char *filter)
- {
--    char buf1[1024], buf2[1024];
-+    char buf1[2048], buf2[2048];
-     char *sp, *np, *p;
-     while (fgets(buf1, sizeof buf1, f)) {
- 	int endflag;
- 	struct tabtab *tab;
- 
-+        if (buf1[0] == '\n') // skip empty first line in 2.6 kernels
-+            continue;
-+
- 	if (!fgets(buf2, sizeof buf2, f))
- 	    break;
- 	sp = strchr(buf1, ':');
-@@ -305,6 +430,10 @@ void process_fd(FILE *f)
- 	    goto formaterr;
- 	*sp = '\0';
- 
-+        if (!all)
-+           if (strncmp(buf1, filter, strlen(filter)))
-+               continue;
-+
- 	tab = newtable(snmptabs, buf1);
- 	if (tab == NULL) {
- 		printf("unknown %s\n", buf1);
-@@ -315,8 +444,8 @@ void process_fd(FILE *f)
- 
- 	endflag = 0;
- 	while (!endflag) {
--	    sp += strspn(sp, " \t\n"); 
--	    np += strspn(np, " \t\n"); 
-+	    sp += strspn(sp, " \t\n");
-+	    np += strspn(np, " \t\n");
- 	    /*if (*np == '\0') goto formaterr; */
- 
- 	    p = sp+strcspn(sp, " \t\n");
-@@ -324,51 +453,116 @@ void process_fd(FILE *f)
- 		endflag = 1;
- 	    *p = '\0';
- 
--	    if (*sp != '\0' && *(tab->flag)) 	
--		printval(tab, sp, strtoul(np, &np, 10));
-+	    if (*sp != '\0' && *(tab->flag))
-+		printval(tab, sp, strtoull(np, &np, 10));
- 
- 	    sp = p + 1;
- 	}
-     }
--  return;
--  
-+  return 0;
-+
- formaterr:
--  perror(_("error parsing /proc/net/snmp"));
--  return;
-+  return -1;
- }
- 
-+void cpytitle(char *original, char *new)
-+{
-+     char *ptr = original;
-+     while(*ptr != '6' && *ptr != '\0') {
-+           *new = *ptr;
-+            new++;
-+            ptr++;
-+     }
-+    *new = *ptr;
-+    new++;
-+    *new = '\0';
-+}
-+
-+void process6_fd(FILE *f)
-+{
-+   char buf1[1024],buf2[50],buf3[1024];
-+   unsigned long long val;
-+   struct tabtab *tab = NULL;
-+   int cpflg = 0;
-+
-+   while (fgets(buf1, sizeof buf1, f)) {
-+          sscanf(buf1, "%s %llu", buf2, &val);
-+          if(!cpflg) {
-+             cpytitle(buf2, buf3);
-+             tab = newtable(snmp6tabs, buf3);
-+             cpflg = 1;
-+          }
-+          if(!strstr(buf2, buf3)) {
-+             cpytitle(buf2, buf3);
-+             tab = newtable(snmp6tabs, buf3);
-+          }
-+          if (*(tab->flag))
-+             printval(tab, buf2, val);
-+   }
-+
-+}
- 
- void parsesnmp(int flag_raw, int flag_tcp, int flag_udp)
- {
-     FILE *f;
- 
-     f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp;
--    
--    f = fopen("/proc/net/snmp", "r");
-+
-+    f = proc_fopen("/proc/net/snmp");
-     if (!f) {
- 	perror(_("cannot open /proc/net/snmp"));
- 	return;
-     }
--    process_fd(f);
-+
-+    if (process_fd(f, 1, NULL) < 0)
-+      fprintf(stderr, _("Problem while parsing /proc/net/snmp\n"));
- 
-     if (ferror(f))
- 	perror("/proc/net/snmp");
- 
-     fclose(f);
- 
--    f = fopen("/proc/net/netstat", "r");
-+    f = proc_fopen("/proc/net/netstat");
- 
-     if (f) {
--    	process_fd(f);
-+    	if (process_fd(f, 1, NULL) <0)
-+          fprintf(stderr, _("Problem while parsing /proc/net/netstat\n"));
- 
-         if (ferror(f))
- 	    perror("/proc/net/netstat");
--    
-+
-         fclose(f);
-     }
-     return;
- }
--    
-+
-+void parsesnmp6(int flag_raw, int flag_tcp, int flag_udp)
-+{
-+    FILE *f;
-+
-+    f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp;
-+
-+    f = fopen("/proc/net/snmp6", "r");
-+    if (!f) {
-+        perror(_("cannot open /proc/net/snmp6"));
-+        return;
-+    }
-+    process6_fd(f);
-+    if (ferror(f))
-+        perror("/proc/net/snmp6");
-+
-+    fclose(f);
-+    f = fopen("/proc/net/snmp", "r");
-+    if (!f) {
-+        perror(_("cannot open /proc/net/snmp"));
-+        return;
-+    }
-+    process_fd(f, 0, "Tcp");
-+    if (ferror(f))
-+        perror("/proc/net/snmp");
-+
-+    fclose(f);
-+}
- 
- void inittab(void)
- {
-@@ -379,3 +573,13 @@ void inittab(void)
- 	qsort(t->tab, t->size / sizeof(struct entry),
- 	      sizeof(struct entry), cmpentries);
- }
-+
-+void inittab6(void)
-+{
-+    struct tabtab *t;
-+
-+    for (t = snmp6tabs; t->title; t++)
-+        qsort(t->tab, t->size / sizeof(struct entry),
-+              sizeof(struct entry), cmpentries);
-+}
-+
diff --git a/main/net-tools/musl-fixes.patch b/main/net-tools/musl-fixes.patch
deleted file mode 100644
index 4d6170ca962..00000000000
--- a/main/net-tools/musl-fixes.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/lib/inet6_gr.c b/lib/inet6_gr.c
-index 72b4a66..2361809 100644
---- a/lib/inet6_gr.c
-+++ b/lib/inet6_gr.c
-@@ -23,7 +23,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <unistd.h>
--#ifndef __GLIBC__
-+#ifdef HAVE_IPV6_ROUTE_H
- #include <netinet6/ipv6_route.h>	/* glibc doesn't have this */
- #endif
- #include "version.h"
-diff --git a/lib/inet6_sr.c b/lib/inet6_sr.c
-index 1ad9510..96dbd5f 100644
---- a/lib/inet6_sr.c
-+++ b/lib/inet6_sr.c
-@@ -23,10 +23,10 @@
- #include <string.h>
- #include <stdio.h>
- #include <unistd.h>
--#ifdef __GLIBC__
--#include <net/route.h>
--#else
-+#ifdef HAVE_IPV6_ROUTE_H
- #include <netinet6/ipv6_route.h>	/* glibc does not have this */
-+#else
-+#include <net/route.h>
- #endif
- #include "version.h"
- #include "net-support.h"
-diff --git a/lib/inet_sr.c b/lib/inet_sr.c
-index 1a876ae..6a26a76 100644
---- a/lib/inet_sr.c
-+++ b/lib/inet_sr.c
-@@ -26,6 +26,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <unistd.h>
-+#include <asm-generic/param.h>
- #include "version.h"
- #include "net-support.h"
- #include "pathnames.h"
-diff --git a/lib/util-ank.c b/lib/util-ank.c
-index b077f35..4ee59f6 100644
---- a/lib/util-ank.c
-+++ b/lib/util-ank.c
-@@ -14,6 +14,7 @@
-  * Rani Assaf <rani@magic.metawire.com> 980929:	resolve addresses
-  */
- 
-+#include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-diff --git a/mii-tool.c b/mii-tool.c
-index 1cfecc2..fbc3b34 100644
---- a/mii-tool.c
-+++ b/mii-tool.c
-@@ -46,10 +46,6 @@
- #include <net/if.h>
- #include <linux/sockios.h>
- 
--#ifndef __GLIBC__
--#include <linux/if_arp.h>
--#include <linux/if_ether.h>
--#endif
- #include <linux/mii.h>
- #include <linux/sockios.h>
- #include "version.h"
-diff --git a/netstat.c b/netstat.c
-index d0c364f..8453f18 100644
---- a/netstat.c
-+++ b/netstat.c
-@@ -88,6 +88,7 @@
- #include <sys/stat.h>
- #include <net/if.h>
- #include <dirent.h>
-+#include <asm-generic/param.h>
- 
- #include "net-support.h"
- #include "pathnames.h"
-diff --git a/slattach.c b/slattach.c
-index 5c81584..3ccde28 100644
---- a/slattach.c
-+++ b/slattach.c
-@@ -44,6 +44,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <getopt.h>
-+#include <termios.h>
- #include <linux/if_slip.h>
- 
- #if defined(__GLIBC__)
diff --git a/main/netcat-openbsd/0001-port-to-linux-with-libsd.patch b/main/netcat-openbsd/0001-port-to-linux-with-libsd.patch
deleted file mode 100644
index 4e15a74dc35..00000000000
--- a/main/netcat-openbsd/0001-port-to-linux-with-libsd.patch
+++ /dev/null
@@ -1,438 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 15:59:31 +0800
-Subject: port to linux with libsd
-
----
- Makefile | 17 ++++++++++--
- nc.1     |  4 +--
- netcat.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
- socks.c  | 46 +++++++++++++++----------------
- 4 files changed, 122 insertions(+), 41 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 150f829..96a6587 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,19 @@
--#	$OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $
-+#       $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $
- 
- PROG=	nc
- SRCS=	netcat.c atomicio.c socks.c
- 
--.include <bsd.prog.mk>
-+LIBS=  `pkg-config --libs libbsd` -lresolv
-+OBJS=  $(SRCS:.c=.o)
-+CFLAGS=  -g -O2
-+LDFLAGS=  -Wl,--no-add-needed
-+
-+all: nc
-+nc: $(OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o nc
-+
-+$(OBJS): %.o: %.c
-+	$(CC) $(CFLAGS) -c $< -o $@
-+
-+clean:
-+	rm -f $(OBJS) nc
-diff --git a/nc.1 b/nc.1
-index d83cb5c..67cc19f 100644
---- a/nc.1
-+++ b/nc.1
-@@ -169,9 +169,6 @@ Proxy authentication is only supported for HTTP CONNECT proxies at present.
- Specifies the source port
- .Nm
- should use, subject to privilege restrictions and availability.
--It is an error to use this option in conjunction with the
--.Fl l
--option.
- .It Fl r
- Specifies that source and/or destination ports should be chosen randomly
- instead of sequentially within a range or in the order that the system
-@@ -193,6 +190,7 @@ Change IPv4 TOS value.
- may be one of
- .Ar critical ,
- .Ar inetcontrol ,
-+.Ar lowcost ,
- .Ar lowdelay ,
- .Ar netcontrol ,
- .Ar throughput ,
-diff --git a/netcat.c b/netcat.c
-index 6358539..30591de 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -42,6 +42,46 @@
- #include <netinet/ip.h>
- #include <arpa/telnet.h>
- 
-+#ifndef IPTOS_LOWDELAY
-+# define IPTOS_LOWDELAY 0x10
-+# define IPTOS_THROUGHPUT 0x08
-+# define IPTOS_RELIABILITY 0x04
-+# define IPTOS_LOWCOST 0x02
-+# define IPTOS_MINCOST IPTOS_LOWCOST
-+#endif /* IPTOS_LOWDELAY */
-+
-+# ifndef IPTOS_DSCP_AF11
-+# define	IPTOS_DSCP_AF11		0x28
-+# define	IPTOS_DSCP_AF12		0x30
-+# define	IPTOS_DSCP_AF13		0x38
-+# define	IPTOS_DSCP_AF21		0x48
-+# define	IPTOS_DSCP_AF22		0x50
-+# define	IPTOS_DSCP_AF23		0x58
-+# define	IPTOS_DSCP_AF31		0x68
-+# define	IPTOS_DSCP_AF32		0x70
-+# define	IPTOS_DSCP_AF33		0x78
-+# define	IPTOS_DSCP_AF41		0x88
-+# define	IPTOS_DSCP_AF42		0x90
-+# define	IPTOS_DSCP_AF43		0x98
-+# define	IPTOS_DSCP_EF		0xb8
-+#endif /* IPTOS_DSCP_AF11 */
-+
-+#ifndef IPTOS_DSCP_CS0
-+# define	IPTOS_DSCP_CS0		0x00
-+# define	IPTOS_DSCP_CS1		0x20
-+# define	IPTOS_DSCP_CS2		0x40
-+# define	IPTOS_DSCP_CS3		0x60
-+# define	IPTOS_DSCP_CS4		0x80
-+# define	IPTOS_DSCP_CS5		0xa0
-+# define	IPTOS_DSCP_CS6		0xc0
-+# define	IPTOS_DSCP_CS7		0xe0
-+#endif /* IPTOS_DSCP_CS0 */
-+
-+#ifndef IPTOS_DSCP_EF
-+# define	IPTOS_DSCP_EF		0xb8
-+#endif /* IPTOS_DSCP_EF */
-+
-+
- #include <err.h>
- #include <errno.h>
- #include <fcntl.h>
-@@ -54,6 +94,8 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <bsd/stdlib.h>
-+#include <bsd/string.h>
- #include "atomicio.h"
- 
- #ifndef SUN_LEN
-@@ -130,7 +172,7 @@ main(int argc, char *argv[])
- 	struct servent *sv;
- 	socklen_t len;
- 	struct sockaddr_storage cliaddr;
--	char *proxy;
-+	char *proxy = NULL;
- 	const char *errstr, *proxyhost = "", *proxyport = NULL;
- 	struct addrinfo proxyhints;
- 	char unix_dg_tmp_socket_buf[UNIX_DG_TMP_SOCKET_SIZE];
-@@ -211,10 +253,14 @@ main(int argc, char *argv[])
- 			uflag = 1;
- 			break;
- 		case 'V':
-+# if defined(RT_TABLEID_MAX)
- 			rtableid = (int)strtonum(optarg, 0,
- 			    RT_TABLEID_MAX, &errstr);
- 			if (errstr)
- 				errx(1, "rtable %s: %s", errstr, optarg);
-+# else
-+			errx(1, "no alternate routing table support available");
-+# endif
- 			break;
- 		case 'v':
- 			vflag = 1;
-@@ -249,7 +295,11 @@ main(int argc, char *argv[])
- 				    errstr, optarg);
- 			break;
- 		case 'S':
-+# if defined(TCP_MD5SIG)
- 			Sflag = 1;
-+# else
-+			errx(1, "no TCP MD5 signature support available");
-+# endif
- 			break;
- 		case 'T':
- 			errstr = NULL;
-@@ -276,6 +326,15 @@ main(int argc, char *argv[])
- 	if (argv[0] && !argv[1] && family == AF_UNIX) {
- 		host = argv[0];
- 		uport = NULL;
-+	} else if (!argv[0] && lflag) {
-+		if (sflag)
-+			errx(1, "cannot use -s and -l");
-+		if (zflag)
-+			errx(1, "cannot use -z and -l");
-+		if (pflag)
-+			uport=pflag;
-+	} else if (!lflag && kflag) {
-+		errx(1, "cannot use -k without -l");
- 	} else if (argv[0] && !argv[1]) {
- 		if  (!lflag)
- 			usage(1);
-@@ -287,14 +346,7 @@ main(int argc, char *argv[])
- 	} else
- 		usage(1);
- 
--	if (lflag && sflag)
--		errx(1, "cannot use -s and -l");
--	if (lflag && pflag)
--		errx(1, "cannot use -p and -l");
--	if (lflag && zflag)
--		errx(1, "cannot use -z and -l");
--	if (!lflag && kflag)
--		errx(1, "must use -l with -k");
-+
- 
- 	/* Get name of temporary socket for unix datagram client */
- 	if ((family == AF_UNIX) && uflag && !lflag) {
-@@ -303,8 +355,8 @@ main(int argc, char *argv[])
- 		} else {
- 			strlcpy(unix_dg_tmp_socket_buf, "/tmp/nc.XXXXXXXXXX",
- 				UNIX_DG_TMP_SOCKET_SIZE);
--			if (mktemp(unix_dg_tmp_socket_buf) == NULL)
--				err(1, "mktemp");
-+			if (mkstemp(unix_dg_tmp_socket_buf) == -1)
-+				err(1, "mkstemp");
- 			unix_dg_tmp_socket = unix_dg_tmp_socket_buf;
- 		}
- 	}
-@@ -598,16 +650,20 @@ remote_connect(const char *host, const char *port, struct addrinfo hints)
- 		    res0->ai_protocol)) < 0)
- 			continue;
- 
-+# if defined(RT_TABLEID_MAX)
- 		if (rtableid >= 0 && (setsockopt(s, SOL_SOCKET, SO_RTABLE,
- 		    &rtableid, sizeof(rtableid)) == -1))
- 			err(1, "setsockopt SO_RTABLE");
-+# endif
- 
- 		/* Bind to a local port or source address if specified. */
- 		if (sflag || pflag) {
- 			struct addrinfo ahints, *ares;
- 
-+# if defined (SO_BINDANY)
- 			/* try SO_BINDANY, but don't insist */
- 			setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on));
-+# endif
- 			memset(&ahints, 0, sizeof(struct addrinfo));
- 			ahints.ai_family = res0->ai_family;
- 			ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
-@@ -707,13 +763,21 @@ local_listen(char *host, char *port, struct addrinfo hints)
- 		    res0->ai_protocol)) < 0)
- 			continue;
- 
-+# if defined(RT_TABLEID_MAX)
- 		if (rtableid >= 0 && (setsockopt(s, SOL_SOCKET, SO_RTABLE,
- 		    &rtableid, sizeof(rtableid)) == -1))
- 			err(1, "setsockopt SO_RTABLE");
-+# endif
- 
-+		ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &x, sizeof(x));
-+		if (ret == -1)
-+			err(1, NULL);
-+
-+# if defined(SO_REUSEPORT)
- 		ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x));
- 		if (ret == -1)
- 			err(1, NULL);
-+# endif
- 
- 		set_common_sockopts(s, res0->ai_family);
- 
-@@ -1134,11 +1198,13 @@ set_common_sockopts(int s, int af)
- {
- 	int x = 1;
- 
-+# if defined(TCP_MD5SIG)
- 	if (Sflag) {
- 		if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
- 			&x, sizeof(x)) == -1)
- 			err(1, NULL);
- 	}
-+# endif
- 	if (Dflag) {
- 		if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
- 			&x, sizeof(x)) == -1)
-@@ -1201,6 +1267,7 @@ map_tos(char *s, int *val)
- 		{ "cs7",		IPTOS_DSCP_CS7 },
- 		{ "ef",			IPTOS_DSCP_EF },
- 		{ "inetcontrol",	IPTOS_PREC_INTERNETCONTROL },
-+		{ "lowcost",		IPTOS_LOWCOST },
- 		{ "lowdelay",		IPTOS_LOWDELAY },
- 		{ "netcontrol",		IPTOS_PREC_NETCONTROL },
- 		{ "reliability",	IPTOS_RELIABILITY },
-@@ -1247,6 +1314,9 @@ report_connect(const struct sockaddr *sa, socklen_t salen)
- void
- help(void)
- {
-+# if defined(DEBIAN_VERSION)
-+        fprintf(stderr, "OpenBSD netcat (Debian patchlevel " DEBIAN_VERSION ")\n");
-+# endif
- 	usage(0);
- 	fprintf(stderr, "\tCommand Summary:\n\
- 	\t-4		Use IPv4\n\
-@@ -1278,7 +1348,7 @@ help(void)
- 	\t-x addr[:port]\tSpecify proxy address and port\n\
- 	\t-z		Zero-I/O mode [used for scanning]\n\
- 	Port numbers can be individual or ranges: lo-hi [inclusive]\n");
--	exit(1);
-+	exit(0);
- }
- 
- void
-@@ -1286,7 +1356,7 @@ usage(int ret)
- {
- 	fprintf(stderr,
- 	    "usage: nc [-46DdFhklNnrStUuvz] [-I length] [-i interval] [-O length]\n"
--	    "\t  [-P proxy_username] [-p source_port] [-s source] [-T ToS]\n"
-+	    "\t  [-P proxy_username] [-p source_port] [-s source] [-T toskeyword]\n"
- 	    "\t  [-V rtable] [-w timeout] [-X proxy_protocol]\n"
- 	    "\t  [-x proxy_address[:port]] [destination] [port]\n");
- 	if (ret)
-diff --git a/socks.c b/socks.c
-index 1b06e0e..57e4316 100644
---- a/socks.c
-+++ b/socks.c
-@@ -38,7 +38,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <resolv.h>
--#include <readpassphrase.h>
-+#include <bsd/readpassphrase.h>
- #include "atomicio.h"
- 
- #define SOCKS_PORT	"1080"
-@@ -167,11 +167,11 @@ socks_connect(const char *host, const char *port,
- 		buf[2] = SOCKS_NOAUTH;
- 		cnt = atomicio(vwrite, proxyfd, buf, 3);
- 		if (cnt != 3)
--			err(1, "write failed (%zu/3)", cnt);
-+			err(1, "write failed (%zu/3)", (size_t)cnt);
- 
- 		cnt = atomicio(read, proxyfd, buf, 2);
- 		if (cnt != 2)
--			err(1, "read failed (%zu/3)", cnt);
-+			err(1, "read failed (%zu/3)", (size_t)cnt);
- 
- 		if (buf[1] == SOCKS_NOMETHOD)
- 			errx(1, "authentication method negotiation failed");
-@@ -220,23 +220,23 @@ socks_connect(const char *host, const char *port,
- 
- 		cnt = atomicio(vwrite, proxyfd, buf, wlen);
- 		if (cnt != wlen)
--			err(1, "write failed (%zu/%zu)", cnt, wlen);
-+			err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen);
- 
- 		cnt = atomicio(read, proxyfd, buf, 4);
- 		if (cnt != 4)
--			err(1, "read failed (%zu/4)", cnt);
-+			err(1, "read failed (%zu/4)", (size_t)cnt);
- 		if (buf[1] != 0)
- 			errx(1, "connection failed, SOCKS error %d", buf[1]);
- 		switch (buf[3]) {
- 		case SOCKS_IPV4:
- 			cnt = atomicio(read, proxyfd, buf + 4, 6);
- 			if (cnt != 6)
--				err(1, "read failed (%zu/6)", cnt);
-+				err(1, "read failed (%zu/6)", (size_t)cnt);
- 			break;
- 		case SOCKS_IPV6:
- 			cnt = atomicio(read, proxyfd, buf + 4, 18);
- 			if (cnt != 18)
--				err(1, "read failed (%zu/18)", cnt);
-+				err(1, "read failed (%zu/18)", (size_t)cnt);
- 			break;
- 		default:
- 			errx(1, "connection failed, unsupported address type");
-@@ -256,11 +256,11 @@ socks_connect(const char *host, const char *port,
- 
- 		cnt = atomicio(vwrite, proxyfd, buf, wlen);
- 		if (cnt != wlen)
--			err(1, "write failed (%zu/%zu)", cnt, wlen);
-+			err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen);
- 
- 		cnt = atomicio(read, proxyfd, buf, 8);
- 		if (cnt != 8)
--			err(1, "read failed (%zu/8)", cnt);
-+			err(1, "read failed (%zu/8)", (size_t)cnt);
- 		if (buf[1] != 90)
- 			errx(1, "connection failed, SOCKS error %d", buf[1]);
- 	} else if (socksv == -1) {
-@@ -272,39 +272,39 @@ socks_connect(const char *host, const char *port,
- 
- 		/* Try to be sane about numeric IPv6 addresses */
- 		if (strchr(host, ':') != NULL) {
--			r = snprintf(buf, sizeof(buf),
-+			r = snprintf((char*)buf, sizeof(buf),
- 			    "CONNECT [%s]:%d HTTP/1.0\r\n",
- 			    host, ntohs(serverport));
- 		} else {
--			r = snprintf(buf, sizeof(buf),
-+			r = snprintf((char*)buf, sizeof(buf),
- 			    "CONNECT %s:%d HTTP/1.0\r\n",
- 			    host, ntohs(serverport));
- 		}
- 		if (r == -1 || (size_t)r >= sizeof(buf))
- 			errx(1, "hostname too long");
--		r = strlen(buf);
-+		r = strlen((char*)buf);
- 
- 		cnt = atomicio(vwrite, proxyfd, buf, r);
- 		if (cnt != r)
--			err(1, "write failed (%zu/%d)", cnt, r);
-+			err(1, "write failed (%zu/%d)", (size_t)cnt, (int)r);
- 
- 		if (authretry > 1) {
- 			char resp[1024];
- 
- 			proxypass = getproxypass(proxyuser, proxyhost);
--			r = snprintf(buf, sizeof(buf), "%s:%s",
-+			r = snprintf((char*)buf, sizeof(buf), "%s:%s",
- 			    proxyuser, proxypass);
- 			if (r == -1 || (size_t)r >= sizeof(buf) ||
--			    b64_ntop(buf, strlen(buf), resp,
-+			    b64_ntop(buf, strlen((char*)buf), resp,
- 			    sizeof(resp)) == -1)
- 				errx(1, "Proxy username/password too long");
--			r = snprintf(buf, sizeof(buf), "Proxy-Authorization: "
-+			r = snprintf((char*)buf, sizeof(buf), "Proxy-Authorization: "
- 			    "Basic %s\r\n", resp);
- 			if (r == -1 || (size_t)r >= sizeof(buf))
- 				errx(1, "Proxy auth response too long");
--			r = strlen(buf);
-+			r = strlen((char*)buf);
- 			if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r)
--				err(1, "write failed (%zu/%d)", cnt, r);
-+				err(1, "write failed (%zu/%d)", (size_t)cnt, r);
- 		}
- 
- 		/* Terminate headers */
-@@ -312,22 +312,22 @@ socks_connect(const char *host, const char *port,
- 			err(1, "write failed (%zu/2)", cnt);
- 
- 		/* Read status reply */
--		proxy_read_line(proxyfd, buf, sizeof(buf));
-+		proxy_read_line(proxyfd, (char*)buf, sizeof(buf));
- 		if (proxyuser != NULL &&
--		    strncmp(buf, "HTTP/1.0 407 ", 12) == 0) {
-+		    strncmp((char*)buf, "HTTP/1.0 407 ", 12) == 0) {
- 			if (authretry > 1) {
- 				fprintf(stderr, "Proxy authentication "
- 				    "failed\n");
- 			}
- 			close(proxyfd);
- 			goto again;
--		} else if (strncmp(buf, "HTTP/1.0 200 ", 12) != 0 &&
--		    strncmp(buf, "HTTP/1.1 200 ", 12) != 0)
-+		} else if (strncmp((char*)buf, "HTTP/1.0 200 ", 12) != 0 &&
-+		    strncmp((char*)buf, "HTTP/1.1 200 ", 12) != 0)
- 			errx(1, "Proxy error: \"%s\"", buf);
- 
- 		/* Headers continue until we hit an empty line */
- 		for (r = 0; r < HTTP_MAXHDRS; r++) {
--			proxy_read_line(proxyfd, buf, sizeof(buf));
-+			proxy_read_line(proxyfd, (char*)buf, sizeof(buf));
- 			if (*buf == '\0')
- 				break;
- 		}
--- 
diff --git a/main/netcat-openbsd/0002-connect-timeout.patch b/main/netcat-openbsd/0002-connect-timeout.patch
deleted file mode 100644
index 0ea679cc77f..00000000000
--- a/main/netcat-openbsd/0002-connect-timeout.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 14:43:56 +0800
-Subject: connect timeout
-
----
- netcat.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 75 insertions(+), 2 deletions(-)
-
-diff --git a/netcat.c b/netcat.c
-index 30591de..d40e3a5 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -113,6 +113,10 @@
- #define POLL_STDOUT 3
- #define BUFSIZE 16384
- 
-+#define CONNECTION_SUCCESS 0
-+#define CONNECTION_FAILED 1
-+#define CONNECTION_TIMEOUT 2
-+
- /* Command Line Options */
- int	dflag;					/* detached, no stdin */
- int	Fflag;					/* fdpass sock to stdout */
-@@ -163,6 +167,9 @@ void	usage(int);
- ssize_t drainbuf(int, unsigned char *, size_t *);
- ssize_t fillbuf(int, unsigned char *, size_t *);
- 
-+static int connect_with_timeout(int fd, const struct sockaddr *sa,
-+        socklen_t salen, int ctimeout);
-+
- int
- main(int argc, char *argv[])
- {
-@@ -680,11 +687,14 @@ remote_connect(const char *host, const char *port, struct addrinfo hints)
- 
- 		set_common_sockopts(s, res0->ai_family);
- 
--		if (timeout_connect(s, res0->ai_addr, res0->ai_addrlen) == 0)
-+                if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout))== CONNECTION_SUCCESS)
- 			break;
--		else if (vflag)
-+		else if (vflag && error == CONNECTION_FAILED)
- 			warn("connect to %s port %s (%s) failed", host, port,
- 			    uflag ? "udp" : "tcp");
-+                else if (vflag && error == CONNECTION_TIMEOUT)
-+                    warn("connect to %s port %s (%s) timed out", host, port,
-+                            uflag ? "udp" : "tcp");
- 
- 		close(s);
- 		s = -1;
-@@ -732,6 +742,69 @@ timeout_connect(int s, const struct sockaddr *name, socklen_t namelen)
- 	return (ret);
- }
- 
-+static int connect_with_timeout(int fd, const struct sockaddr *sa,
-+		                socklen_t salen, int ctimeout)
-+{
-+	int err;
-+	struct timeval tv, *tvp = NULL;
-+	fd_set connect_fdset;
-+	socklen_t len;
-+	int orig_flags;
-+
-+	orig_flags = fcntl(fd, F_GETFL, 0);
-+	if (fcntl(fd, F_SETFL, orig_flags | O_NONBLOCK) < 0 ) {
-+		warn("can't set O_NONBLOCK - timeout not available");
-+		if (connect(fd, sa, salen) == 0)
-+			return CONNECTION_SUCCESS;
-+		else
-+			return CONNECTION_FAILED;
-+	}
-+
-+	/* set connect timeout */
-+	if (ctimeout > 0) {
-+		tv.tv_sec = (time_t)ctimeout/1000;
-+		tv.tv_usec = 0;
-+		tvp = &tv;
-+	}
-+
-+	/* attempt the connection */
-+	err = connect(fd, sa, salen);
-+	if (err != 0 && errno == EINPROGRESS) {
-+		/* connection is proceeding
-+		 * it is complete (or failed) when select returns */
-+
-+		/* initialize connect_fdset */
-+		FD_ZERO(&connect_fdset);
-+		FD_SET(fd, &connect_fdset);
-+
-+		/* call select */
-+		do {
-+			err = select(fd + 1, NULL, &connect_fdset,
-+				     NULL, tvp);
-+		} while (err < 0 && errno == EINTR);
-+
-+		/* select error */
-+		if (err < 0)
-+			errx(1,"select error: %s", strerror(errno));
-+		/* we have reached a timeout */
-+		if (err == 0)
-+			return CONNECTION_TIMEOUT;
-+		/* select returned successfully, but we must test socket
-+		 * error for result */
-+		len = sizeof(err);
-+		if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &len) < 0)
-+			errx(1, "getsockopt error: %s", strerror(errno));
-+		/* setup errno according to the result returned by
-+		 * getsockopt */
-+		if (err != 0)
-+			errno = err;
-+	}
-+
-+	/* return aborted if an error occured, and valid otherwise */
-+	fcntl(fd, F_SETFL, orig_flags);
-+	return (err != 0)? CONNECTION_FAILED : CONNECTION_SUCCESS;
-+}
-+
- /*
-  * local_listen()
-  * Returns a socket listening on a local port, binds to specified source
--- 
diff --git a/main/netcat-openbsd/0003-get-sev-by-name.patch b/main/netcat-openbsd/0003-get-sev-by-name.patch
deleted file mode 100644
index c5ba82ee699..00000000000
--- a/main/netcat-openbsd/0003-get-sev-by-name.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 14:45:08 +0800
-Subject: get sev by name
-
----
- netcat.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/netcat.c b/netcat.c
-index d40e3a5..e0ad5c7 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -1193,12 +1193,19 @@ atelnet(int nfd, unsigned char *buf, unsigned int size)
- void
- build_ports(char *p)
- {
-+        struct servent *sv;
- 	const char *errstr;
- 	char *n;
- 	int hi, lo, cp;
- 	int x = 0;
- 
--	if ((n = strchr(p, '-')) != NULL) {
-+        sv = getservbyname(p, uflag ? "udp" : "tcp");
-+        if (sv) {
-+                portlist[0] = calloc(1, PORT_MAX_LEN);
-+                if (portlist[0] == NULL)
-+                        err(1, NULL);
-+                snprintf(portlist[0], PORT_MAX_LEN, "%d", ntohs(sv->s_port));
-+        } else if ((n = strchr(p, '-')) != NULL) {
- 		*n = '\0';
- 		n++;
- 
--- 
diff --git a/main/netcat-openbsd/0004-send-crlf.patch b/main/netcat-openbsd/0004-send-crlf.patch
deleted file mode 100644
index 8c787c0f23e..00000000000
--- a/main/netcat-openbsd/0004-send-crlf.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 14:57:45 +0800
-Subject: send crlf
-
----
- nc.1     |  6 ++++--
- netcat.c | 50 ++++++++++++++++++++++++++++++++++++--------------
- 2 files changed, 40 insertions(+), 16 deletions(-)
-
-diff --git a/nc.1 b/nc.1
-index 67cc19f..746d3b6 100644
---- a/nc.1
-+++ b/nc.1
-@@ -34,7 +34,7 @@
- .Sh SYNOPSIS
- .Nm nc
- .Bk -words
--.Op Fl 46DdFhklNnrStUuvz
-+.Op Fl 46CDdFhklNnrStUuvz
- .Op Fl I Ar length
- .Op Fl i Ar interval
- .Op Fl O Ar length
-@@ -98,6 +98,8 @@ to use IPv4 addresses only.
- Forces
- .Nm
- to use IPv6 addresses only.
-+.It Fl C
-+Send CRLF as line-ending.
- .It Fl D
- Enable debugging on the socket.
- .It Fl d
-@@ -377,7 +379,7 @@ More complicated examples can be built up when the user knows the format
- of requests required by the server.
- As another example, an email may be submitted to an SMTP server using:
- .Bd -literal -offset indent
--$ nc localhost 25 \*(Lt\*(Lt EOF
-+$ nc [\-C] localhost 25 \*(Lt\*(Lt EOF
- HELO host.example.com
- MAIL FROM:\*(Ltuser@host.example.com\*(Gt
- RCPT TO:\*(Ltuser2@host.example.com\*(Gt
-diff --git a/netcat.c b/netcat.c
-index e0ad5c7..1c90145 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -118,6 +118,7 @@
- #define CONNECTION_TIMEOUT 2
- 
- /* Command Line Options */
-+int     Cflag = 0;                              /* CRLF line-ending */
- int	dflag;					/* detached, no stdin */
- int	Fflag;					/* fdpass sock to stdout */
- unsigned int iflag;				/* Interval Flag */
-@@ -164,7 +165,7 @@ void	set_common_sockopts(int, int);
- int	map_tos(char *, int *);
- void	report_connect(const struct sockaddr *, socklen_t);
- void	usage(int);
--ssize_t drainbuf(int, unsigned char *, size_t *);
-+ssize_t drainbuf(int, unsigned char *, size_t *, int);
- ssize_t fillbuf(int, unsigned char *, size_t *);
- 
- static int connect_with_timeout(int fd, const struct sockaddr *sa,
-@@ -194,7 +195,7 @@ main(int argc, char *argv[])
- 	signal(SIGPIPE, SIG_IGN);
- 
- 	while ((ch = getopt(argc, argv,
--	    "46DdFhI:i:klNnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
-+	    "46CDdFhI:i:klNnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
- 		switch (ch) {
- 		case '4':
- 			family = AF_INET;
-@@ -322,6 +323,9 @@ main(int argc, char *argv[])
- 			if (Tflag < 0 || Tflag > 255 || errstr || errno)
- 				errx(1, "illegal tos value %s", optarg);
- 			break;
-+                case 'C':
-+                        Cflag = 1;
-+                        break;
- 		default:
- 			usage(1);
- 		}
-@@ -928,12 +932,6 @@ readwrite(int net_fd)
- 			return;
- 		}
- 
--		/* help says -i is for "wait between lines sent". We read and
--		 * write arbitrary amounts of data, and we don't want to start
--		 * scanning for newlines, so this is as good as it gets */
--		if (iflag)
--			sleep(iflag);
--
- 		/* poll */
- 		num_fds = poll(pfd, 4, timeout);
- 
-@@ -999,7 +997,7 @@ readwrite(int net_fd)
- 		/* try to write to network */
- 		if (pfd[POLL_NETOUT].revents & POLLOUT && stdinbufpos > 0) {
- 			ret = drainbuf(pfd[POLL_NETOUT].fd, stdinbuf,
--			    &stdinbufpos);
-+			    &stdinbufpos, (iflag || Cflag) ? 1 : 0);
- 			if (ret == -1)
- 				pfd[POLL_NETOUT].fd = -1;
- 			/* buffer empty - remove self from polling */
-@@ -1034,7 +1032,7 @@ readwrite(int net_fd)
- 		/* try to write to stdout */
- 		if (pfd[POLL_STDOUT].revents & POLLOUT && netinbufpos > 0) {
- 			ret = drainbuf(pfd[POLL_STDOUT].fd, netinbuf,
--			    &netinbufpos);
-+			    &netinbufpos, 0);
- 			if (ret == -1)
- 				pfd[POLL_STDOUT].fd = -1;
- 			/* buffer empty - remove self from polling */
-@@ -1059,17 +1057,40 @@ readwrite(int net_fd)
- }
- 
- ssize_t
--drainbuf(int fd, unsigned char *buf, size_t *bufpos)
-+drainbuf(int fd, unsigned char *buf, size_t *bufpos, int oneline)
- {
--	ssize_t n;
-+	ssize_t n, r;
- 	ssize_t adjust;
-+	unsigned char *lf = NULL;
-+
-+	if (oneline)
-+		lf = memchr(buf, '\n', *bufpos);
-+	if (lf == NULL) {
-+		n = *bufpos;
-+		oneline = 0;
-+	}
-+	else if (Cflag && (lf == buf || buf[lf - buf - 1] != '\r')) {
-+		n = lf - buf;
-+		oneline = 2;
-+	}
-+	else
-+		n = lf - buf + 1;
-+	if (n > 0)
-+		n = write(fd, buf, n);
- 
--	n = write(fd, buf, *bufpos);
- 	/* don't treat EAGAIN, EINTR as error */
- 	if (n == -1 && (errno == EAGAIN || errno == EINTR))
- 		n = -2;
-+	if (oneline == 2 && n >= 0)
-+		n++;
- 	if (n <= 0)
- 		return n;
-+
-+	if (oneline == 2 && (r = atomicio(vwrite, fd, "\r\n", 2)) != 2)
-+		err(1, "write failed (%zu/2)", r);
-+	if (oneline > 0 && iflag)
-+		sleep(iflag);
-+
- 	/* adjust buffer */
- 	adjust = *bufpos - n;
- 	if (adjust > 0)
-@@ -1401,6 +1422,7 @@ help(void)
- 	fprintf(stderr, "\tCommand Summary:\n\
- 	\t-4		Use IPv4\n\
- 	\t-6		Use IPv6\n\
-+	\t-C		Send CRLF as line-ending\n\
- 	\t-D		Enable the debug socket option\n\
- 	\t-d		Detach from stdin\n\
- 	\t-F		Pass socket fd\n\
-@@ -1435,7 +1457,7 @@ void
- usage(int ret)
- {
- 	fprintf(stderr,
--	    "usage: nc [-46DdFhklNnrStUuvz] [-I length] [-i interval] [-O length]\n"
-+	    "usage: nc [-46CDdFhklNnrStUuvz] [-I length] [-i interval] [-O length]\n"
- 	    "\t  [-P proxy_username] [-p source_port] [-s source] [-T toskeyword]\n"
- 	    "\t  [-V rtable] [-w timeout] [-X proxy_protocol]\n"
- 	    "\t  [-x proxy_address[:port]] [destination] [port]\n");
--- 
diff --git a/main/netcat-openbsd/0005-quit-timer.patch b/main/netcat-openbsd/0005-quit-timer.patch
deleted file mode 100644
index a4b3fa6bd82..00000000000
--- a/main/netcat-openbsd/0005-quit-timer.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 15:16:04 +0800
-Subject: quit timer
-
----
- nc.1     |  5 +++++
- netcat.c | 52 +++++++++++++++++++++++++++++++++++++++++++---------
- 2 files changed, 48 insertions(+), 9 deletions(-)
-
-diff --git a/nc.1 b/nc.1
-index 746d3b6..1ee6887 100644
---- a/nc.1
-+++ b/nc.1
-@@ -40,6 +40,7 @@
- .Op Fl O Ar length
- .Op Fl P Ar proxy_username
- .Op Fl p Ar source_port
-+.Op Fl q Ar seconds
- .Op Fl s Ar source
- .Op Fl T Ar toskeyword
- .Op Fl V Ar rtable
-@@ -171,6 +172,15 @@ Proxy authentication is only supported for HTTP CONNECT proxies at present.
- Specifies the source port
- .Nm
- should use, subject to privilege restrictions and availability.
-+.It Fl q Ar seconds
-+after EOF on stdin, wait the specified number of
-+.Ar seconds
-+and then quit. If
-+.Ar seconds
-+is negative, wait forever (default).  Specifying a non-negative
-+.Ar seconds
-+implies
-+.Fl N .
- .It Fl r
- Specifies that source and/or destination ports should be chosen randomly
- instead of sequentially within a range or in the order that the system
-diff --git a/netcat.c b/netcat.c
-index 1c90145..7572bb2 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -128,6 +128,7 @@ int	Nflag;					/* shutdown() network socket */
- int	nflag;					/* Don't do name look up */
- char   *Pflag;					/* Proxy username */
- char   *pflag;					/* Localport flag */
-+int    qflag = -1;				/* Quit after some secs */
- int	rflag;					/* Random ports flag */
- char   *sflag;					/* Source Address */
- int	tflag;					/* Telnet Emulation */
-@@ -171,6 +172,8 @@ ssize_t fillbuf(int, unsigned char *, size_t *);
- static int connect_with_timeout(int fd, const struct sockaddr *sa,
-         socklen_t salen, int ctimeout);
- 
-+static void quit();
-+
- int
- main(int argc, char *argv[])
- {
-@@ -195,7 +198,7 @@ main(int argc, char *argv[])
- 	signal(SIGPIPE, SIG_IGN);
- 
- 	while ((ch = getopt(argc, argv,
--	    "46CDdFhI:i:klNnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) {
-+	    "46CDdFhI:i:klNnO:P:p:q:rSs:tT:UuV:vw:X:x:z")) != -1) {
- 		switch (ch) {
- 		case '4':
- 			family = AF_INET;
-@@ -248,6 +251,13 @@ main(int argc, char *argv[])
- 		case 'p':
- 			pflag = optarg;
- 			break;
-+                case 'q':
-+			qflag = strtonum(optarg, INT_MIN, INT_MAX, &errstr);
-+			if (errstr)
-+				errx(1, "quit timer %s: %s", errstr, optarg);
-+			if (qflag >= 0)
-+				Nflag = 1;
-+			break;
- 		case 'r':
- 			rflag = 1;
- 			break;
-@@ -918,18 +928,26 @@ readwrite(int net_fd)
- 		if (pfd[POLL_STDIN].fd == -1 && pfd[POLL_NETIN].fd == -1
- 		    && stdinbufpos == 0 && netinbufpos == 0) {
- 			close(net_fd);
--			return;
-+			if (qflag <= 0)
-+				return;
-+			goto delay_exit;
- 		}
- 		/* both outputs are gone, we can't continue */
- 		if (pfd[POLL_NETOUT].fd == -1 && pfd[POLL_STDOUT].fd == -1) {
- 			close(net_fd);
--			return;
-+			if (qflag <= 0)
-+				return;
-+			goto delay_exit;
- 		}
- 		/* listen and net in gone, queues empty, done */
- 		if (lflag && pfd[POLL_NETIN].fd == -1
- 		    && stdinbufpos == 0 && netinbufpos == 0) {
- 			close(net_fd);
--			return;
-+			if (qflag <= 0)
-+				return;
-+delay_exit:
-+			signal(SIGALRM, quit);
-+			alarm(qflag);
- 		}
- 
- 		/* poll */
-@@ -1436,6 +1454,7 @@ help(void)
- 	\t-O length	TCP send buffer length\n\
- 	\t-P proxyuser\tUsername for proxy authentication\n\
- 	\t-p port\t	Specify local port for remote connects\n\
-+        \t-q secs\t	quit after EOF on stdin and delay of secs\n\
- 	\t-r		Randomize remote ports\n\
- 	\t-S		Enable the TCP MD5 signature option\n\
- 	\t-s addr\t	Local source address\n\
-@@ -1458,9 +1477,18 @@ usage(int ret)
- {
- 	fprintf(stderr,
- 	    "usage: nc [-46CDdFhklNnrStUuvz] [-I length] [-i interval] [-O length]\n"
--	    "\t  [-P proxy_username] [-p source_port] [-s source] [-T toskeyword]\n"
--	    "\t  [-V rtable] [-w timeout] [-X proxy_protocol]\n"
-+	    "\t  [-P proxy_username] [-p source_port] [-q seconds] [-s source]\n"
-+	    "\t  [-T toskeyword] [-V rtable] [-w timeout] [-X proxy_protocol]\n"
- 	    "\t  [-x proxy_address[:port]] [destination] [port]\n");
- 	if (ret)
- 		exit(1);
- }
-+
-+/*
-+ * quit()
-+ * handler for a "-q" timeout (exit 0 instead of 1)
-+ */
-+static void quit()
-+{
-+	exit(0);
-+}
diff --git a/main/netcat-openbsd/0006-udp-scan-timeout.patch b/main/netcat-openbsd/0006-udp-scan-timeout.patch
deleted file mode 100644
index 799acc6ac5a..00000000000
--- a/main/netcat-openbsd/0006-udp-scan-timeout.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 15:29:37 +0800
-Subject: udp scan timeout
-
----
- netcat.c | 25 ++++++++++++++++---------
- 1 file changed, 16 insertions(+), 9 deletions(-)
-
-diff --git a/netcat.c b/netcat.c
-index f971893..9ab507a 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -117,6 +117,8 @@
- #define CONNECTION_FAILED 1
- #define CONNECTION_TIMEOUT 2
- 
-+#define UDP_SCAN_TIMEOUT 3			/* Seconds */
-+
- /* Command Line Options */
- int     Cflag = 0;                              /* CRLF line-ending */
- int	dflag;					/* detached, no stdin */
-@@ -525,7 +527,7 @@ main(int argc, char *argv[])
- 				continue;
- 
- 			ret = 0;
--			if (vflag || zflag) {
-+			if (vflag) {
- 				/* For UDP, make sure we are connected. */
- 				if (uflag) {
- 					if (udptest(s) == -1) {
-@@ -1298,15 +1300,20 @@ build_ports(char *p)
- int
- udptest(int s)
- {
--	int i, ret;
--
--	for (i = 0; i <= 3; i++) {
--		if (write(s, "X", 1) == 1)
--			ret = 1;
--		else
--			ret = -1;
-+	int i, t;
-+
-+	if ((write(s, "X", 1) != 1) ||
-+	    ((write(s, "X", 1) != 1) && (errno == ECONNREFUSED)))
-+		return -1;
-+
-+	/* Give the remote host some time to reply. */
-+	for (i = 0, t = (timeout == -1) ? UDP_SCAN_TIMEOUT : (timeout / 1000);
-+	     i < t; i++) {
-+		sleep(1);
-+		if ((write(s, "X", 1) != 1) && (errno == ECONNREFUSED))
-+			return -1;
- 	}
--	return (ret);
-+	return 1;
- }
- 
- void
--- 
diff --git a/main/netcat-openbsd/0007-verbose-numeric-port.patch b/main/netcat-openbsd/0007-verbose-numeric-port.patch
deleted file mode 100644
index dd6ed009440..00000000000
--- a/main/netcat-openbsd/0007-verbose-numeric-port.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 15:38:15 +0800
-Subject: verbose numeric port
-
----
- netcat.c | 19 ++++++++++++++++---
- 1 file changed, 16 insertions(+), 3 deletions(-)
-
-diff --git a/netcat.c b/netcat.c
-index 9ab507a..3240a08 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -41,6 +41,7 @@
- #include <netinet/tcp.h>
- #include <netinet/ip.h>
- #include <arpa/telnet.h>
-+#include <arpa/inet.h>
- 
- #ifndef IPTOS_LOWDELAY
- # define IPTOS_LOWDELAY 0x10
-@@ -436,6 +437,18 @@ main(int argc, char *argv[])
- 				s = local_listen(host, uport, hints);
- 			if (s < 0)
- 				err(1, NULL);
-+
-+			char* local;
-+			if (family == AF_INET6
-+				local = "0.0.0.0";
-+			else if (family == AF_INET)
-+				local = ":::";
-+			else
-+				local = "unknown"
-+			fprintf(stderr, "Listening on [%s] (family %d, port %d)\n",
-+				host ?: local,
-+				family,
-+				*uport);
- 			/*
- 			 * For UDP and -k, don't connect the socket, let it
- 			 * receive datagrams from multiple socket pairs.
-@@ -452,14 +465,14 @@ main(int argc, char *argv[])
- 				char buf[16384];
- 				struct sockaddr_storage z;
- 
--				len = sizeof(z);
-+				len = sizeof(cliaddr);
- 				plen = 2048;
- 				rv = recvfrom(s, buf, plen, MSG_PEEK,
--				    (struct sockaddr *)&z, &len);
-+				    (struct sockaddr *)&cliaddr, &len);
- 				if (rv < 0)
- 					err(1, "recvfrom");
- 
--				rv = connect(s, (struct sockaddr *)&z, len);
-+				rv = connect(s, (struct sockaddr *)&cliaddr, len);
- 				if (rv < 0)
- 					err(1, "connect");
- 
--- 
diff --git a/main/netcat-openbsd/0008-dccp-support.patch b/main/netcat-openbsd/0008-dccp-support.patch
deleted file mode 100644
index 26ed8a32c19..00000000000
--- a/main/netcat-openbsd/0008-dccp-support.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 15:56:51 +0800
-Subject: dccp support
-
----
- nc.1     |   4 ++-
- netcat.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
- 2 files changed, 88 insertions(+), 18 deletions(-)
-
-diff --git a/nc.1 b/nc.1
-index 1ee6887..fe42909 100644
---- a/nc.1
-+++ b/nc.1
-@@ -34,7 +34,7 @@
- .Sh SYNOPSIS
- .Nm nc
- .Bk -words
--.Op Fl 46CDdFhklNnrStUuvz
-+.Op Fl 46CDdFhklNnrStUuvZz
- .Op Fl I Ar length
- .Op Fl i Ar interval
- .Op Fl O Ar length
-@@ -279,6 +279,8 @@ If
- .Ar port
- is not specified, the well-known port for the proxy protocol is used (1080
- for SOCKS, 3128 for HTTPS).
-+.It Fl Z
-+DCCP mode.
- .It Fl z
- Specifies that
- .Nm
-diff --git a/netcat.c b/netcat.c
-index 3240a08..f4d85af 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -136,6 +136,7 @@ int	rflag;					/* Random ports flag */
- char   *sflag;					/* Source Address */
- int	tflag;					/* Telnet Emulation */
- int	uflag;					/* UDP - Default to TCP */
-+int	dccpflag;				/* DCCP - Default to TCP */
- int	vflag;					/* Verbosity */
- int	xflag;					/* Socks proxy */
- int	zflag;					/* Port Scan Flag */
-@@ -171,6 +172,7 @@ void	report_connect(const struct sockaddr *, socklen_t);
- void	usage(int);
- ssize_t drainbuf(int, unsigned char *, size_t *, int);
- ssize_t fillbuf(int, unsigned char *, size_t *);
-+char    *proto_name(int uflag, int dccpflag);
- 
- static int connect_with_timeout(int fd, const struct sockaddr *sa,
-         socklen_t salen, int ctimeout);
-@@ -200,7 +202,7 @@ main(int argc, char *argv[])
- 	signal(SIGPIPE, SIG_IGN);
- 
- 	while ((ch = getopt(argc, argv,
--	    "46CDdFhI:i:klNnO:P:p:q:rSs:tT:UuV:vw:X:x:z")) != -1) {
-+	    "46CDdFhI:i:klNnO:P:p:q:rSs:tT:UuV:vw:X:x:Zz")) != -1) {
- 		switch (ch) {
- 		case '4':
- 			family = AF_INET;
-@@ -270,6 +272,13 @@ main(int argc, char *argv[])
- 		case 'u':
- 			uflag = 1;
- 			break;
-+		case 'Z':
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+			dccpflag = 1;
-+# else
-+			errx(1, "no DCCP support available");
-+# endif
-+			break;
- 		case 'V':
- # if defined(RT_TABLEID_MAX)
- 			rtableid = (int)strtonum(optarg, 0,
-@@ -345,6 +354,12 @@ main(int argc, char *argv[])
- 
- 	/* Cruft to make sure options are clean, and used properly. */
- 	if (argv[0] && !argv[1] && family == AF_UNIX) {
-+ 		if (uflag)
-+ 			errx(1, "cannot use -u and -U");
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+		if (dccpflag)
-+			errx(1, "cannot use -Z and -U");
-+# endif
- 		host = argv[0];
- 		uport = NULL;
- 	} else if (!argv[0] && lflag) {
-@@ -386,8 +401,20 @@ main(int argc, char *argv[])
- 	if (family != AF_UNIX) {
- 		memset(&hints, 0, sizeof(struct addrinfo));
- 		hints.ai_family = family;
--		hints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
--		hints.ai_protocol = uflag ? IPPROTO_UDP : IPPROTO_TCP;
-+		if (uflag) {
-+		    hints.ai_socktype = SOCK_DGRAM;
-+		    hints.ai_protocol = IPPROTO_UDP;
-+		}
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+		else if (dccpflag) {
-+		    hints.ai_socktype = SOCK_DCCP;
-+		    hints.ai_protocol = IPPROTO_DCCP;
-+		}
-+# endif
-+		else {
-+		    hints.ai_socktype = SOCK_STREAM;
-+		    hints.ai_protocol = IPPROTO_TCP;
-+		}
- 		if (nflag)
- 			hints.ai_flags |= AI_NUMERICHOST;
- 	}
-@@ -395,7 +422,10 @@ main(int argc, char *argv[])
- 	if (xflag) {
- 		if (uflag)
- 			errx(1, "no proxy support for UDP mode");
--
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+		if (dccpflag)
-+			errx(1, "no proxy support for DCCP mode");
-+# endif
- 		if (lflag)
- 			errx(1, "no proxy support for listen");
- 
-@@ -439,12 +469,12 @@ main(int argc, char *argv[])
- 				err(1, NULL);
- 
- 			char* local;
--			if (family == AF_INET6
-+			if (family == AF_INET6 )
- 				local = "0.0.0.0";
- 			else if (family == AF_INET)
- 				local = ":::";
- 			else
--				local = "unknown"
-+				local = "unknown";
- 			fprintf(stderr, "Listening on [%s] (family %d, port %d)\n",
- 				host ?: local,
- 				family,
-@@ -549,19 +579,20 @@ main(int argc, char *argv[])
- 					}
- 				}
- 
-+				char *proto = proto_name(uflag, dccpflag);
- 				/* Don't look up port if -n. */
- 				if (nflag)
- 					sv = NULL;
- 				else {
- 					sv = getservbyport(
- 					    ntohs(atoi(portlist[i])),
--					    uflag ? "udp" : "tcp");
-+					    proto);
- 				}
- 
- 				fprintf(stderr,
- 				    "Connection to %s %s port [%s/%s] "
- 				    "succeeded!\n", host, portlist[i],
--				    uflag ? "udp" : "tcp",
-+				    proto,
- 				    sv ? sv->s_name : "*");
- 			}
- 			if (Fflag)
-@@ -663,6 +694,24 @@ unix_listen(char *path)
- 	return (s);
- }
- 
-+char *proto_name(int uflag, int dccpflag) {
-+
-+    char *proto = NULL;
-+    if (uflag) {
-+	proto = "udp";
-+    }
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+    else if (dccpflag) {
-+	proto = "dccp";
-+    }
-+# endif
-+    else {
-+	proto = "tcp";
-+    }
-+
-+    return proto;
-+}
-+
- /*
-  * remote_connect()
-  * Returns a socket connected to a remote host. Properly binds to a local
-@@ -699,8 +748,21 @@ remote_connect(const char *host, const char *port, struct addrinfo hints)
- # endif
- 			memset(&ahints, 0, sizeof(struct addrinfo));
- 			ahints.ai_family = res0->ai_family;
--			ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
--			ahints.ai_protocol = uflag ? IPPROTO_UDP : IPPROTO_TCP;
-+			if (uflag) {
-+			    ahints.ai_socktype = SOCK_DGRAM;
-+			    ahints.ai_protocol = IPPROTO_UDP;
-+
-+			}
-+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
-+			else if (dccpflag) {
-+			    hints.ai_socktype = SOCK_DCCP;
-+			    hints.ai_protocol = IPPROTO_DCCP;
-+			}
-+# endif
-+			else {
-+		    	    ahints.ai_socktype = SOCK_STREAM;
-+			    ahints.ai_protocol = IPPROTO_TCP;
-+			}
- 			ahints.ai_flags = AI_PASSIVE;
- 			if ((error = getaddrinfo(sflag, pflag, &ahints, &ares)))
- 				errx(1, "getaddrinfo: %s", gai_strerror(error));
-@@ -712,15 +774,19 @@ remote_connect(const char *host, const char *port, struct addrinfo hints)
- 		}
- 
- 		set_common_sockopts(s, res0->ai_family);
-+		char *proto = proto_name(uflag, dccpflag);
- 
--                if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout))== CONNECTION_SUCCESS)
-+                if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout))== CONNECTION_SUCCESS) {
- 			break;
--		else if (vflag && error == CONNECTION_FAILED)
-+		}
-+		else if (vflag && error == CONNECTION_FAILED) {
- 			warn("connect to %s port %s (%s) failed", host, port,
--			    uflag ? "udp" : "tcp");
--                else if (vflag && error == CONNECTION_TIMEOUT)
-+			     proto);
-+		}
-+                else if (vflag && error == CONNECTION_TIMEOUT) {
-                     warn("connect to %s port %s (%s) timed out", host, port,
--                            uflag ? "udp" : "tcp");
-+                             proto);
-+		}
- 
- 		close(s);
- 		s = -1;
-@@ -1250,7 +1316,8 @@ build_ports(char *p)
- 	int hi, lo, cp;
- 	int x = 0;
- 
--        sv = getservbyname(p, uflag ? "udp" : "tcp");
-+	char *proto = proto_name(uflag, dccpflag);
-+	sv = getservbyname(p, proto);
-         if (sv) {
-                 portlist[0] = calloc(1, PORT_MAX_LEN);
-                 if (portlist[0] == NULL)
-@@ -1484,6 +1551,7 @@ help(void)
- 	\t-w secs\t	Timeout for connects and final net reads\n\
- 	\t-X proto	Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\
- 	\t-x addr[:port]\tSpecify proxy address and port\n\
-+	\t-Z		DCCP mode\n\
- 	\t-z		Zero-I/O mode [used for scanning]\n\
- 	Port numbers can be individual or ranges: lo-hi [inclusive]\n");
- 	exit(0);
-@@ -1493,7 +1561,7 @@ void
- usage(int ret)
- {
- 	fprintf(stderr,
--	    "usage: nc [-46CDdFhklNnrStUuvz] [-I length] [-i interval] [-O length]\n"
-+	    "usage: nc [-46CDdFhklNnrStUuvZz] [-I length] [-i interval] [-O length]\n"
- 	    "\t  [-P proxy_username] [-p source_port] [-q seconds] [-s source]\n"
- 	    "\t  [-T toskeyword] [-V rtable] [-w timeout] [-X proxy_protocol]\n"
- 	    "\t  [-x proxy_address[:port]] [destination] [port]\n");
--- 
diff --git a/main/netcat-openbsd/0009-serialized-handling-multiple-clients.patch b/main/netcat-openbsd/0009-serialized-handling-multiple-clients.patch
deleted file mode 100644
index 0b32737961d..00000000000
--- a/main/netcat-openbsd/0009-serialized-handling-multiple-clients.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Tue, 14 Feb 2012 23:02:00 +0800
-Subject: serialized handling multiple clients
-
----
- netcat.c | 39 +++++++++++++++++++--------------------
- 1 file changed, 19 insertions(+), 20 deletions(-)
-
-diff --git a/netcat.c b/netcat.c
-index f4d85af..5d3a2d3 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -459,26 +459,24 @@ main(int argc, char *argv[])
- 				s = unix_bind(host);
- 			else
- 				s = unix_listen(host);
--		}
-+		} else
-+			s = local_listen(host, uport, hints);
-+		if (s < 0)
-+			err(1, NULL);
-+
-+		char* local;
-+		if (family == AF_INET6)
-+			local = ":::";
-+		else
-+			local = "0.0.0.0";
-+		fprintf(stderr, "Listening on [%s] (family %d, port %d)\n",
-+			host ?: local,
-+			family,
-+			*uport);
- 
- 		/* Allow only one connection at a time, but stay alive. */
- 		for (;;) {
--			if (family != AF_UNIX)
--				s = local_listen(host, uport, hints);
--			if (s < 0)
--				err(1, NULL);
- 
--			char* local;
--			if (family == AF_INET6 )
--				local = "0.0.0.0";
--			else if (family == AF_INET)
--				local = ":::";
--			else
--				local = "unknown";
--			fprintf(stderr, "Listening on [%s] (family %d, port %d)\n",
--				host ?: local,
--				family,
--				*uport);
- 			/*
- 			 * For UDP and -k, don't connect the socket, let it
- 			 * receive datagrams from multiple socket pairs.
-@@ -525,15 +523,16 @@ main(int argc, char *argv[])
- 				close(connfd);
- 			}
- 
--			if (family != AF_UNIX)
-+			if (kflag)
-+				continue;
-+			if (family != AF_UNIX) {
- 				close(s);
-+			}
- 			else if (uflag) {
- 				if (connect(s, NULL, 0) < 0)
- 					err(1, "connect");
- 			}
--
--			if (!kflag)
--				break;
-+			break;
- 		}
- 	} else if (family == AF_UNIX) {
- 		ret = 0;
--- 
diff --git a/main/netcat-openbsd/0010-misc-failures-and-features.patch b/main/netcat-openbsd/0010-misc-failures-and-features.patch
deleted file mode 100644
index 507f67d8d3a..00000000000
--- a/main/netcat-openbsd/0010-misc-failures-and-features.patch
+++ /dev/null
@@ -1,404 +0,0 @@
-From: Aron Xu <aron@debian.org>
-Date: Mon, 13 Feb 2012 19:06:52 +0800
-Subject: misc failures and features
-
----
- Makefile |   3 +-
- nc.1     |  76 ++++++++++++++++++++++++++++++++++++++++++++---
- netcat.c | 101 +++++++++++++++++++++++++++++++++++++++++++--------------------
- 3 files changed, 143 insertions(+), 37 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 96a6587..becd854 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,8 @@
- PROG=	nc
- SRCS=	netcat.c atomicio.c socks.c
- 
--LIBS=  `pkg-config --libs libbsd` -lresolv
-+PKG_CONFIG ?= pkg-config
-+LIBS=  `$(PKG_CONFIG) --libs libbsd` -lresolv
- OBJS=  $(SRCS:.c=.o)
- CFLAGS=  -g -O2
- LDFLAGS=  -Wl,--no-add-needed
-diff --git a/nc.1 b/nc.1
-index fe42909..e95918a 100644
---- a/nc.1
-+++ b/nc.1
-@@ -34,7 +34,7 @@
- .Sh SYNOPSIS
- .Nm nc
- .Bk -words
--.Op Fl 46CDdFhklNnrStUuvZz
-+.Op Fl 46bCDdFhklNnrStUuvZz
- .Op Fl I Ar length
- .Op Fl i Ar interval
- .Op Fl O Ar length
-@@ -99,6 +99,8 @@ to use IPv4 addresses only.
- Forces
- .Nm
- to use IPv6 addresses only.
-+.It Fl b
-+Allow broadcast.
- .It Fl C
- Send CRLF as line-ending.
- .It Fl D
-@@ -345,6 +347,54 @@ and which side is being used as a
- The connection may be terminated using an
- .Dv EOF
- .Pq Sq ^D .
-+.Pp
-+There is no
-+.Fl c
-+or
-+.Fl e
-+option in this netcat, but you still can execute a command after connection
-+being established by redirecting file descriptors. Be cautious here because
-+opening a port and let anyone connected execute arbitrary command on your
-+site is DANGEROUS. If you really need to do this, here is an example:
-+.Pp
-+On
-+.Sq server
-+side:
-+.Pp
-+.Dl $ rm -f /tmp/f; mkfifo /tmp/f
-+.Dl $ cat /tmp/f | /bin/sh -i 2>&1 | nc -l 127.0.0.1 1234 > /tmp/f
-+.Pp
-+On
-+.Sq client
-+side:
-+.Pp
-+.Dl $ nc host.example.com 1234
-+.Dl $ (shell prompt from host.example.com)
-+.Pp
-+By doing this, you create a fifo at /tmp/f and make nc listen at port 1234
-+of address 127.0.0.1 on
-+.Sq server
-+side, when a
-+.Sq client
-+establishes a connection successfully to that port, /bin/sh gets executed
-+on
-+.Sq server
-+side and the shell prompt is given to
-+.Sq client
-+side.
-+.Pp
-+When connection is terminated,
-+.Nm
-+quits as well. Use
-+.Fl k
-+if you want it keep listening, but if the command quits this option won't
-+restart it or keep
-+.Nm
-+running. Also don't forget to remove the file descriptor once you don't need
-+it anymore:
-+.Pp
-+.Dl $ rm -f /tmp/f
-+.Pp
- .Sh DATA TRANSFER
- The example in the previous section can be expanded to build a
- basic data transfer model.
-@@ -404,15 +454,30 @@ The
- flag can be used to tell
- .Nm
- to report open ports,
--rather than initiate a connection.
-+rather than initiate a connection. Usually it's useful to turn on verbose
-+output to stderr by use this option in conjunction with
-+.Fl v
-+option.
-+.Pp
- For example:
- .Bd -literal -offset indent
--$ nc -z host.example.com 20-30
-+$ nc \-zv host.example.com 20-30
- Connection to host.example.com 22 port [tcp/ssh] succeeded!
- Connection to host.example.com 25 port [tcp/smtp] succeeded!
- .Ed
- .Pp
--The port range was specified to limit the search to ports 20 \- 30.
-+The port range was specified to limit the search to ports 20 \- 30, and is
-+scanned by increasing order.
-+.Pp
-+You can also specify a list of ports to scan, for example:
-+.Bd -literal -offset indent
-+$ nc \-zv host.example.com 80 20 22
-+nc: connect to host.example.com 80 (tcp) failed: Connection refused
-+nc: connect to host.example.com 20 (tcp) failed: Connection refused
-+Connection to host.example.com port [tcp/ssh] succeeded!
-+.Ed
-+.Pp
-+The ports are scanned by the order you given.
- .Pp
- Alternatively, it might be useful to know which server software
- is running, and which versions.
-@@ -477,6 +542,9 @@ Original implementation by *Hobbit*
- .br
- Rewritten with IPv6 support by
- .An Eric Jackson Aq Mt ericj@monkey.org .
-+.br
-+Modified for Debian port by Aron Xu
-+.Aq aron@debian.org .
- .Sh CAVEATS
- UDP port scans using the
- .Fl uz
-diff --git a/netcat.c b/netcat.c
-index 258a29a..c47fc0f 100644
---- a/netcat.c
-+++ b/netcat.c
-@@ -90,6 +90,7 @@
- #include <netdb.h>
- #include <poll.h>
- #include <signal.h>
-+#include <stddef.h>
- #include <stdarg.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -121,6 +122,7 @@
- #define UDP_SCAN_TIMEOUT 3			/* Seconds */
- 
- /* Command Line Options */
-+int	bflag;					/* Allow Broadcast */
- int     Cflag = 0;                              /* CRLF line-ending */
- int	dflag;					/* detached, no stdin */
- int	Fflag;					/* fdpass sock to stdout */
-@@ -153,7 +155,7 @@ char *portlist[PORT_MAX+1];
- char *unix_dg_tmp_socket;
- 
- void	atelnet(int, unsigned char *, unsigned int);
--void	build_ports(char *);
-+void	build_ports(char **);
- void	help(void);
- int	local_listen(char *, char *, struct addrinfo);
- void	readwrite(int);
-@@ -182,11 +184,14 @@ int
- main(int argc, char *argv[])
- {
- 	int ch, s, ret, socksv;
--	char *host, *uport;
-+	char *host, **uport;
- 	struct addrinfo hints;
- 	struct servent *sv;
- 	socklen_t len;
--	struct sockaddr_storage cliaddr;
-+	union {
-+        	struct sockaddr_storage storage;
-+		struct sockaddr_un forunix;
-+	} cliaddr;
- 	char *proxy = NULL;
- 	const char *errstr, *proxyhost = "", *proxyport = NULL;
- 	struct addrinfo proxyhints;
-@@ -202,7 +207,7 @@ main(int argc, char *argv[])
- 	signal(SIGPIPE, SIG_IGN);
- 
- 	while ((ch = getopt(argc, argv,
--	    "46CDdFhI:i:klNnO:P:p:q:rSs:tT:UuV:vw:X:x:Zz")) != -1) {
-+	    "46bCDdFhI:i:klNnO:P:p:q:rSs:tT:UuV:vw:X:x:Zz")) != -1) {
- 		switch (ch) {
- 		case '4':
- 			family = AF_INET;
-@@ -210,6 +215,13 @@ main(int argc, char *argv[])
- 		case '6':
- 			family = AF_INET6;
- 			break;
-+		case 'b':
-+# if defined(SO_BROADCAST)
-+			bflag = 1;
-+# else
-+			errx(1, "no broadcast frame support available");
-+# endif
-+			break;
- 		case 'U':
- 			family = AF_UNIX;
- 			break;
-@@ -354,35 +366,40 @@ main(int argc, char *argv[])
- 
- 	/* Cruft to make sure options are clean, and used properly. */
- 	if (argv[0] && !argv[1] && family == AF_UNIX) {
-- 		if (uflag)
-- 			errx(1, "cannot use -u and -U");
- # if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
- 		if (dccpflag)
- 			errx(1, "cannot use -Z and -U");
- # endif
- 		host = argv[0];
- 		uport = NULL;
--	} else if (!argv[0] && lflag) {
--		if (sflag)
--			errx(1, "cannot use -s and -l");
--		if (zflag)
--			errx(1, "cannot use -z and -l");
--		if (pflag)
--			uport=pflag;
--	} else if (!lflag && kflag) {
--		errx(1, "cannot use -k without -l");
--	} else if (argv[0] && !argv[1]) {
--		if  (!lflag)
--			usage(1);
--		uport = argv[0];
-+	} else if (argv[0] && !argv[1] && lflag) {
-+		if (pflag) {
-+			uport = &pflag;
-+			host = argv[0];
-+		} else {
-+			uport = argv;
-+			host = NULL;
-+		}
-+	} else if (!argv[0] && lflag && pflag) {
-+		uport = &pflag;
- 		host = NULL;
- 	} else if (argv[0] && argv[1]) {
- 		host = argv[0];
--		uport = argv[1];
-+		uport = &argv[1];
- 	} else
- 		usage(1);
- 
--
-+	if (lflag) {
-+		if (sflag)
-+			errx(1, "cannot use -s and -l");
-+		if (zflag)
-+			errx(1, "cannot use -z and -l");
-+		if (pflag)
-+			/* This still does not work well because of getopt mess
-+			errx(1, "cannot use -p and -l"); */
-+			uport = &pflag;
-+	} else if (!lflag && kflag)
-+		errx(1, "cannot use -k without -l");
- 
- 	/* Get name of temporary socket for unix datagram client */
- 	if ((family == AF_UNIX) && uflag && !lflag) {
-@@ -460,7 +477,7 @@ main(int argc, char *argv[])
- 			else
- 				s = unix_listen(host);
- 		} else
--			s = local_listen(host, uport, hints);
-+			s = local_listen(host, *uport, hints);
- 		if (s < 0)
- 			err(1, NULL);
- 
-@@ -469,7 +486,8 @@ main(int argc, char *argv[])
- 			local = ":::";
- 		else
- 			local = "0.0.0.0";
--		fprintf(stderr, "Listening on [%s] (family %d, port %d)\n",
-+		if (vflag && (family != AF_UNIX))
-+		fprintf(stderr, "Listening on [%s] (family %d, port %s)\n",
- 			host ?: local,
- 			family,
- 			*uport);
-@@ -632,6 +650,8 @@ unix_bind(char *path)
- 		return (-1);
- 	}
- 
-+        unlink(path);
-+
- 	if (bind(s, (struct sockaddr *)&sun, SUN_LEN(&sun)) < 0) {
- 		close(s);
- 		return (-1);
-@@ -653,8 +673,10 @@ unix_connect(char *path)
- 		if ((s = unix_bind(unix_dg_tmp_socket)) < 0)
- 			return (-1);
- 	} else {
--		if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
-+		if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
-+                        errx(1,"create unix socket failed");
- 			return (-1);
-+                }
- 	}
- 	(void)fcntl(s, F_SETFD, FD_CLOEXEC);
- 
-@@ -665,9 +687,11 @@ unix_connect(char *path)
- 	    sizeof(sun.sun_path)) {
- 		close(s);
- 		errno = ENAMETOOLONG;
-+                warn("unix connect abandoned");
- 		return (-1);
- 	}
- 	if (connect(s, (struct sockaddr *)&sun, SUN_LEN(&sun)) < 0) {
-+                warn("unix connect failed");
- 		close(s);
- 		return (-1);
- 	}
-@@ -1307,22 +1331,23 @@ atelnet(int nfd, unsigned char *buf, unsigned int size)
-  * that we should try to connect to.
-  */
- void
--build_ports(char *p)
-+build_ports(char **p)
- {
-         struct servent *sv;
- 	const char *errstr;
- 	char *n;
- 	int hi, lo, cp;
- 	int x = 0;
-+	int i;
- 
- 	char *proto = proto_name(uflag, dccpflag);
--	sv = getservbyname(p, proto);
-+	sv = getservbyname(*p, proto);
-         if (sv) {
-                 portlist[0] = calloc(1, PORT_MAX_LEN);
-                 if (portlist[0] == NULL)
-                         err(1, NULL);
-                 snprintf(portlist[0], PORT_MAX_LEN, "%d", ntohs(sv->s_port));
--        } else if ((n = strchr(p, '-')) != NULL) {
-+        } else if ((n = strchr(*p, '-')) != NULL) {
- 		*n = '\0';
- 		n++;
- 
-@@ -1330,9 +1355,9 @@ build_ports(char *p)
- 		hi = strtonum(n, 1, PORT_MAX, &errstr);
- 		if (errstr)
- 			errx(1, "port number %s: %s", errstr, n);
--		lo = strtonum(p, 1, PORT_MAX, &errstr);
-+		lo = strtonum(*p, 1, PORT_MAX, &errstr);
- 		if (errstr)
--			errx(1, "port number %s: %s", errstr, p);
-+			errx(1, "port number %s: %s", errstr, *p);
- 
- 		if (lo > hi) {
- 			cp = hi;
-@@ -1362,10 +1387,12 @@ build_ports(char *p)
- 			}
- 		}
- 	} else {
--		hi = strtonum(p, 1, PORT_MAX, &errstr);
-+		hi = strtonum(*p, 1, PORT_MAX, &errstr);
- 		if (errstr)
--			errx(1, "port number %s: %s", errstr, p);
--		portlist[0] = strdup(p);
-+			errx(1, "port number %s: %s", errstr, *p);
-+		for (i=0;p[i];i++) {
-+			portlist[i] = strdup(p[i]);
-+		}
- 		if (portlist[0] == NULL)
- 			err(1, NULL);
- 	}
-@@ -1400,6 +1427,15 @@ set_common_sockopts(int s, int af)
- {
- 	int x = 1;
- 
-+# if defined(SO_BROADCAST)
-+	if (bflag) {
-+		/* allow datagram sockets to send packets to a broadcast address
-+		 * (this option has no effect on stream-oriented sockets) */
-+		if (setsockopt(s, SOL_SOCKET, SO_BROADCAST,
-+			&x, sizeof(x)) == -1)
-+			err(1, NULL);
-+	}
-+# endif
- # if defined(TCP_MD5SIG)
- 	if (Sflag) {
- 		if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
-@@ -1523,6 +1559,7 @@ help(void)
- 	fprintf(stderr, "\tCommand Summary:\n\
- 	\t-4		Use IPv4\n\
- 	\t-6		Use IPv6\n\
-+	\t-b		Allow broadcast\n\
- 	\t-C		Send CRLF as line-ending\n\
- 	\t-D		Enable the debug socket option\n\
- 	\t-d		Detach from stdin\n\
--- 
diff --git a/main/netcat-openbsd/APKBUILD b/main/netcat-openbsd/APKBUILD
index 1e85d0db286..fd98ed8610b 100644
--- a/main/netcat-openbsd/APKBUILD
+++ b/main/netcat-openbsd/APKBUILD
@@ -1,59 +1,45 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=netcat-openbsd
-pkgver=1.130
-pkgrel=1
-pkgdesc="The TCP/IP swiss army knife. OpenBSD variant."
-url="http://packages.debian.org/sid/netcat-openbsd"
+pkgver=1.226
+pkgrel=0
+pkgdesc="The TCP/IP swiss army knife. OpenBSD variant from debian."
+url="https://packages.debian.org/sid/netcat-openbsd"
 arch="all"
-license="GPL"
-makedepends="glib-dev libbsd-dev"
+license="BSD-3-Clause"
+makedepends="libbsd-dev"
 subpackages="$pkgname-doc"
 options="!check"
-source="$pkgname-$pkgver.tar.gz::http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}.orig.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://deb.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_$pkgver.orig.tar.gz
+	$pkgname-$pkgver-debian.tar.xz::https://deb.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_$pkgver-1.debian.tar.xz
+	b64.patch
 	base64.c
-
-	0001-port-to-linux-with-libsd.patch
-	0002-connect-timeout.patch
-	0003-get-sev-by-name.patch
-	0004-send-crlf.patch
-	0005-quit-timer.patch
-	0006-udp-scan-timeout.patch
-	0007-verbose-numeric-port.patch
-	0008-dccp-support.patch
-	0009-serialized-handling-multiple-clients.patch
-	0010-misc-failures-and-features.patch
 	"
-builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
-	cd "$builddir"
-	cp "$srcdir"/base64.c .
 	default_prepare
+
+	# debian keeps their patchset in their own folder
+	while read -r patch; do
+		patch -Np1 < "$srcdir"/debian/patches/"$patch"
+	done < "$srcdir"/debian/patches/series
+
+	# linux port requires b64_ntop
+	cp "$srcdir"/base64.c .
 	sed -i Makefile -e "/SRCS=/s;\(.*\);& base64.c;"
 }
 
 build() {
-	cd "$builddir"
-	make CFLAGS="$CFLAGS -DDEBIAN_VERSION=\"\\\"${pkgver}\\\"\"" || return 1
+	make CFLAGS="$CFLAGS -DDEBIAN_VERSION=\"\\\"$pkgver\\\"\""
 }
 
 package() {
-	cd "$builddir"
-	install -d $pkgdir/usr/bin/
-	install -d $pkgdir/usr/share/man/man1/
-	install nc $pkgdir/usr/bin/nc
-	install nc.1 $pkgdir/usr/share/man/man1/nc.openbsd.1
+	install -Dm755 nc "$pkgdir"/usr/bin/nc
+	install -Dm644 nc.1 "$pkgdir"/usr/share/man/man1/nc.openbsd.1
 }
 
-sha512sums="fb2b80ccbfce364f3d376bd396f38a218127627721052694f1da24751e45a239a72c839b07b54bfc6846be6efa0c557a9cdab349711631ecff7055b763fd98e4  netcat-openbsd-1.130.tar.gz
+sha512sums="
+1826086282236233757983619d423a538c253474e82050a55963bbc14f8d343432704e9748259873dcab75af03a708d2e2c05b3752e44bd2d198662f8dd5cd3a  netcat-openbsd-1.226.tar.gz
+b7ab1a133cbfcca37864df4b2cc5b8d5fab25104670fb03a6ead538c6433064c736ec7c25b930a2c3ea28e19dc8279130f4465607174f1a4806b8d2f94596e74  netcat-openbsd-1.226-debian.tar.xz
+c35ed4e10d0a8d312d8e730cafb8c69538183ce4af5a3cd2a1ceabfc58e009a23bf487507ef4aab5ad0617abf1dde6ac4be4dff6aac4bbb8091f2089cb6a8fe3  b64.patch
 2d4b117397e6882b0f4357bb11ca1f520746c59e0305a58f8651582a9cff17f4c59cacb14ce93de1d0fe78db5ba7fd9096c0176afc61b2c715b0b9a0444c2b4f  base64.c
-06ebc872c7bedd1961b615625e3690909cdfe5c7635c5bb14826aa5a12ab333fa6cedfd38e1b1dddc00cc6b6527927dee730377c194617f7dc889edec7de410e  0001-port-to-linux-with-libsd.patch
-70dca0943a8045951a50aa3897b0066b3838bec6ea58a6325b888ffe0cbace30afdce52741257ef080e36d2c1d4db2d51287d08d1a5942c0f98327343c036f27  0002-connect-timeout.patch
-e4fca460b25aaa2f6ae360137bfa46b12e1329bacc59f249b46fd55246fbdc4ad8ae0eb6c3ecc4989ab92e385da7b0b9353bc3d72ca230b149b5cd93263ff893  0003-get-sev-by-name.patch
-46c8a5774792590487732e4a5bcca7d5e5be1b4587cccf5c757f7198900d6e4154ef01425a846bbdd3ec52ea476db5d79e80c94620a21e29f277aadecbd1210d  0004-send-crlf.patch
-21bb871a2f55d7cb5759734b16c5b64be937cf7d1a50be7995fdc8885fbcd55ef70a6173c5b266918c5aedf2dc36cf031aa2a3db9c5fcf89d834cd834ac948b4  0005-quit-timer.patch
-f927d547a837314b0418f119ff0d0d83a662a90470fe1739e808c854a7fbe536326a445a2bf83a43af473a159a76d2262f68b5851b86a7a88b72ea0e69995a68  0006-udp-scan-timeout.patch
-4c5ea10262098d411ea428ef1eac59d2cffa85b2d485b4af62ea71a9fd9ee2bc90644b8ba0259f5b182b371bad6a3cdbddca7818f0dd312421768ea4170bf9d6  0007-verbose-numeric-port.patch
-cf3f37272e06908f7fb5ea6d1ab0217cfbc69b19dd5cfd805749498c46177efd208c62c24864ffddaeb7aa4302424d0b964909d1195d72056a000cf204b2a1cc  0008-dccp-support.patch
-fff37c6854403586f1b2e838ad9ee19c511277ada17063847ecaec7066ee052980a646db76c3ffc53bf917e661bbbdc74e944e1bffeba9dc100d9521c15c3b23  0009-serialized-handling-multiple-clients.patch
-ed618931b28e21b52eb8844758edaa434293217ab7f7bd064b56029bb4eef35a45d87800171c14dbef31674490ff9aa9539753ced80fa07f13b567b7e75df3b6  0010-misc-failures-and-features.patch"
+"
diff --git a/main/netcat-openbsd/b64.patch b/main/netcat-openbsd/b64.patch
new file mode 100644
index 00000000000..5c11d71d8a8
--- /dev/null
+++ b/main/netcat-openbsd/b64.patch
@@ -0,0 +1,14 @@
+declare ahead of time so it's not implicit which is invalid in c23
+diff --git a/socks.c b/socks.c
+index 7c7448c..ce2533d 100644
+--- a/socks.c
++++ b/socks.c
+@@ -53,6 +54,8 @@
+ #define SOCKS_DOMAIN	3
+ #define SOCKS_IPV6	4
+ 
++int b64_ntop(const uint8_t *, size_t, char *, size_t);
++
+ int	remote_connect(const char *, const char *, struct addrinfo, char *);
+ int	socks_connect(const char *, const char *, struct addrinfo,
+ 	    const char *, const char *, struct addrinfo, int,
diff --git a/main/netcf/APKBUILD b/main/netcf/APKBUILD
index b14bec2e30a..5c16336a6ce 100644
--- a/main/netcf/APKBUILD
+++ b/main/netcf/APKBUILD
@@ -1,23 +1,25 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=netcf
 pkgver=0.2.8
-pkgrel=6
+pkgrel=10
 pkgdesc="Cross-platform network configuration library"
 arch="all"
 url="https://fedorahosted.org/released/netcf"
-license="LGPL-2.0"
-depends=
+license="LGPL-2.1-or-later"
 makedepends="augeas-dev libgcrypt-dev libnl3-dev libxml2-dev libxslt-dev
 	linux-headers pkgconfig readline-dev"
-install=
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-source="https://releases.pagure.org/$pkgname/$pkgname-$pkgver.tar.gz"
+source="https://releases.pagure.org/netcf/netcf-$pkgver.tar.gz"
 replaces="libnetcf"
+options="!check"
 
-builddir="$srcdir/netcf-$pkgver"
+prepare() {
+	update_config_sub
+	update_config_guess
+	default_prepare
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,20 +27,18 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--with-driver=debian \
-		|| return 1
-	make || return 1
+		--with-driver=debian
+	make
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 libs() {
 	pkgdesc="Libraries for $pkgname"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr/
+
+	amove usr/lib usr/share
 }
 
 sha512sums="d9a667a06469b60e8967423d6a738abc65512bf0ad0975164738c6cd5a168bf0300153067a772a61c4088ea969a88de234be0486c354edf73a7b984ddb003328  netcf-0.2.8.tar.gz"
diff --git a/main/nettle/APKBUILD b/main/nettle/APKBUILD
index 9ccb67c4976..5df66daa21c 100644
--- a/main/nettle/APKBUILD
+++ b/main/nettle/APKBUILD
@@ -2,17 +2,22 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=nettle
-pkgver=3.5.1
+pkgver=3.9.1
 pkgrel=0
-pkgdesc="A low-level cryptographic library"
+pkgdesc="Low-level cryptographic library"
 url="https://www.lysator.liu.se/~nisse/nettle/"
 arch="all"
-license="LGPL-2.0-or-later"
+license="GPL-2.0-or-later OR LGPL-3.0-or-later"
 depends_dev="gmp-dev"
 makedepends="$depends_dev m4"
-subpackages="$pkgname-dev $pkgname-utils"
-source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+subpackages="$pkgname-static $pkgname-dev $pkgname-utils"
+source="https://ftp.gnu.org/gnu/nettle/nettle-$pkgver.tar.gz"
+
+# secfixes:
+#   3.7.3-r0:
+#     - CVE-2021-3580
+#   3.7.2-r0:
+#     - CVE-2021-20305
 
 build() {
 	./configure \
@@ -27,10 +32,10 @@ build() {
 		--enable-fat \
 		--enable-shared \
 		--disable-openssl \
-		--disable-static
+		--enable-static
 	make
 	# strip comments in fields from .pc as it confuses pkgconf
-	sed -i -e 's/ \#.*//' *.pc
+	sed -i -e 's/ \#.*//' ./*.pc
 }
 
 check() {
@@ -44,8 +49,9 @@ package() {
 
 utils() {
 	pkgdesc="Utils for nettle"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+	amove usr/bin
 }
 
-sha512sums="f738121b9091cbe79435fb5d46b45cf6f10912320c233829356908127bab1cac6946ca56e022a832380c44f2c10f21d2feef64cb0f4f41e3da4a681dc0131784  nettle-3.5.1.tar.gz"
+sha512sums="
+5939c4b43cf9ff6c6272245b85f123c81f8f4e37089fa4f39a00a570016d837f6e706a33226e4bbfc531b02a55b2756ff312461225ed88de338a73069e031ced  nettle-3.9.1.tar.gz
+"
diff --git a/main/network-extras/APKBUILD b/main/network-extras/APKBUILD
index 1863264dfa0..2098c26f0d4 100644
--- a/main/network-extras/APKBUILD
+++ b/main/network-extras/APKBUILD
@@ -1,28 +1,16 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=network-extras
-pkgver=1.2
+pkgver=2.0
 pkgrel=0
 pkgdesc="Meta package to pull in ppp, vlan, bonding, bridge and wifi support"
-url="http://alpinelinux.org"
+url="https://alpinelinux.org/"
 arch="noarch"
-license="GPL"
-depends="bridge bonding vlan wpa_supplicant wireless-tools ppp-atm ppp-chat
+license="GPL-2.0-only"
+depends="bridge bonding vlan wpa_supplicant iw ppp-atm ppp-chat
 	ppp-daemon ppp-l2tp ppp-minconn ppp-passprompt ppp-passwordfd ppp-pppoe
 	ppp-radius ppp-winbind usb-modeswitch"
-
-makedepends=""
-install=""
-subpackages=""
-source=""
-
-prepare() {
-	return 0
-}
-
-build() {
-	return 0
-}
+options="!check"
 
 package() {
 	mkdir -p "$pkgdir"
diff --git a/main/newt/APKBUILD b/main/newt/APKBUILD
index 07e2f67e9ec..fbd5b982cac 100644
--- a/main/newt/APKBUILD
+++ b/main/newt/APKBUILD
@@ -1,43 +1,44 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=newt
-pkgver=0.52.21
-pkgrel=0
+pkgver=0.52.24
+pkgrel=1
 pkgdesc="Redhat's Newt windowing toolkit development files"
 options="!check" # No testsuite
 url="https://pagure.io/newt/"
 arch="all"
-license="LGPL-2.0"
-makedepends="slang-dev popt-dev ncurses-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://releases.pagure.org/newt/newt-$pkgver.tar.gz
-	fix-includes.patch
-	"
-
-builddir="$srcdir/$pkgname-$pkgver"
+license="LGPL-2.0-only"
+makedepends="slang-dev popt-dev python3-dev ncurses-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py3-$pkgname:py3"
+source="https://releases.pagure.org/newt/newt-$pkgver.tar.gz"
 
 prepare() {
-	cd "$builddir"
+	default_prepare
+
 	sed -i -e 's:-lslang:-lslang -lncurses:g' \
 		-e 's:instroot:DESTDIR:g' Makefile.in
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--without-tcl \
-		--disable-nls \
-		--without-python
+		--disable-nls
 	make RPM_OPT_FLAGS="$CFLAGS"
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" prefix="/usr" RPM_OPT_FLAGS="ERROR" install
 	rm -f "$pkgdir"/usr/lib/*.a
 }
 
-sha512sums="d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c  newt-0.52.21.tar.gz
-ce53446eb587b79790f12f806f02999568cb49067520813ab146d1f16c71f009e86ab72d08666e483b550fdae3332b673935b8aa1a14b02f5273217fb5404611  fix-includes.patch"
+py3() {
+	pkgdesc="Python3 bindings for Newt windowing toolkit"
+	depends="$pkgname=$pkgver-r$pkgrel python3"
+	amove '/usr/lib/python*'
+}
+
+sha512sums="
+2001f45fb1cdb48cbc51feb8b6e555a2e50b65d897db2dbc1b1711c04efb51834801bef921c89879ddb43de221a243ed240c4a3355eebafa78f50f24432acdcd  newt-0.52.24.tar.gz
+"
diff --git a/main/newt/fix-includes.patch b/main/newt/fix-includes.patch
deleted file mode 100644
index 0995b6d8e8f..00000000000
--- a/main/newt/fix-includes.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- newt-0.52.11.orig/whiptail.c
-+++ newt-0.52.11/whiptail.c
-@@ -1,4 +1,5 @@
- #include "config.h"
-+#include <sys/stat.h>
- #include <fcntl.h>
- #include <popt.h>
- #include <stdio.h>
diff --git a/main/nfdump/APKBUILD b/main/nfdump/APKBUILD
index 87b4be9f17c..f31d9afba44 100644
--- a/main/nfdump/APKBUILD
+++ b/main/nfdump/APKBUILD
@@ -1,13 +1,15 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nfdump
-pkgver=1.6.20
+pkgver=1.7.3
 pkgrel=0
 pkgdesc="Tools to collect and process netflow data"
 url="https://github.com/phaag/nfdump"
-arch="all"
+# fails diff tests, probably broken on big endian
+arch="all !s390x"
 license="BSD-3-Clause"
 makedepends="autoconf automake bison bzip2-dev flex libtool rrdtool-dev"
+checkdepends="tzdata"
 subpackages="
 	$pkgname-doc
 	$pkgname-dbg
@@ -35,6 +37,8 @@ prepare() {
 }
 
 build() {
+	# setresgid
+	CFLAGS="$CFLAGS -D_GNU_SOURCE" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -42,9 +46,20 @@ build() {
 		--enable-nfprofile \
 		--enable-sflow \
 		--enable-shared
+
+	# musl has a fpurge weak alias but only __fpurge in header,
+	# so this gets misdetected
+	sed -i '/HAVE_FPURGE/d' config.h
 	make
 }
 
+check() {
+	make check || {
+		cat src/test/test-suite.log
+		return 1
+	}
+}
+
 package() {
 	make DESTDIR="$pkgdir" install
 	install -D -m755 "$srcdir"/nfcapd.initd \
@@ -56,17 +71,15 @@ package() {
 
 nfprofile() {
 	pkgdesc="Create views of the data with NFdump filters"
-	depends="nfdump"
-	cd "$builddir"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/nfprofile "$subpkgdir"/usr/bin
+	depends="nfdump=$pkgver-r$pkgrel"
+
+	amove usr/bin/nfprofile
 }
 
 sfcapd() {
 	pkgdesc="sFlow collector"
-	cd "$builddir"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/sfcapd "$subpkgdir"/usr/bin
+
+	amove usr/bin/sfcapd
 
 	# Install to pkgdir so it is later caught by sfcapd-openrc
 	install -D -m644 "$srcdir"/sfcapd.confd \
@@ -75,8 +88,10 @@ sfcapd() {
 		"$pkgdir"/etc/init.d/sfcapd
 }
 
-sha512sums="8396241fa24d532540135762a81ce035586c405d4ab1e01d6e2b8226b7cc9b6784170ca1fa4c1581fb60f324473cca5ce2d3de82282313d3877f9584e449d137  nfdump-1.6.20.tar.gz
+sha512sums="
+588459558a2831db679d32b0f3da5321bae04b9519b5f4f493ca32521afd87b1eb075faabd97a9d26b095e14e89685c589b2a563280a70e2202bda8b5cb88884  nfdump-1.7.3.tar.gz
 fcb467f819f2b73ac0e13de6de4d6c94cafd3866a7a56685d5d4a048fa975135299655e896ff8370c8c5061d03ab38644623f8be455c08dfe5f630f152820148  nfcapd.confd
 97e432e884dd1cc8f27c2d7398bb0320164d46dea06c64ad72fa385d190998b3d62356634962f42652daf6e31f237baa2f3f3efad47c3fc38cc6bea799db61cc  nfcapd.initd
 abe594a95a9320bec1d6ee6af6b75cd4d176526d4b10d07aa7ed79fc292b51c341339ba8e1e468df9ec2aae138b1dd66e3a291921938217835ac33819da9d153  sfcapd.confd
-7a65c80186a8708a27e90a7239d1b44ee919c3bbf8cd1ca07ef5d35a623d0dce5eac516b65ba7a98c5fcfab5bad6c15e1f03af38a06eb6280afd1c1f0f52cee4  sfcapd.initd"
+7a65c80186a8708a27e90a7239d1b44ee919c3bbf8cd1ca07ef5d35a623d0dce5eac516b65ba7a98c5fcfab5bad6c15e1f03af38a06eb6280afd1c1f0f52cee4  sfcapd.initd
+"
diff --git a/main/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD
index d3bbb1f324c..cc50b15d10a 100644
--- a/main/nfs-utils/APKBUILD
+++ b/main/nfs-utils/APKBUILD
@@ -1,23 +1,42 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nfs-utils
-pkgver=2.4.3
+pkgver=2.6.4
 pkgrel=1
 pkgdesc="kernel-mode NFS"
 url="https://linux-nfs.org/"
 arch="all"
-license="GPL-2.0-or-later BSD-3-Clause"
-depends="rpcbind"
+license="GPL-2.0-only"
+depends="rpcbind python3"
 options="suid"
-makedepends="autoconf automake bsd-compat-headers keyutils-dev krb5-dev
-	libcap-dev libevent-dev libtirpc-dev libtool lvm2-dev musl-libintl
-	openldap-dev sqlite-dev util-linux-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg $pkgname-openrc rpcgen
-	libnfsidmap libnfsidmap-ldap"
+makedepends="
+	bsd-compat-headers
+	keyutils-dev
+	krb5-dev
+	libcap-dev
+	libevent-dev
+	libtirpc-dev
+	libtool
+	lvm2-dev
+	musl-libintl
+	openldap-dev
+	sqlite-dev
+	util-linux-dev
+	"
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-dbg
+	$pkgname-openrc
+	rpcgen
+	libnfsidmap
+	libnfsidmap-ldap
+	"
 source="https://www.kernel.org/pub/linux/utils/nfs-utils/$pkgver/nfs-utils-$pkgver.tar.xz
-	musl-configure_ac.patch
 	musl-getservbyport.patch
 	musl-svcgssd-sysconf.patch
+	musl-stat64.patch
+	include-unistd.patch
 
 	nfs.initd
 	nfsmount.initd
@@ -31,13 +50,9 @@ source="https://www.kernel.org/pub/linux/utils/nfs-utils/$pkgver/nfs-utils-$pkgv
 	nfs.exports
 	nfsclient.initd
 	nfsclient.confd
+	nfsidmap.request-key.conf
 	"
 
-prepare() {
-	default_prepare
-	./autogen.sh
-}
-
 build() {
 	./configure \
 		--build=$CBUILD \
@@ -64,10 +79,12 @@ check() {
 }
 
 package() {
-	make -j1 DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
 	install -Dm644 "$srcdir"/nfs.exports "$pkgdir"/etc/exports
 	mv "$pkgdir"/usr/sbin/rpc.statd "$pkgdir"/sbin/
 
+	install -Dm644 support/nfsidmap/idmapd.conf "$pkgdir"/etc/idmapd.conf
+
 	local file
 	for file in $source; do
 		case "$file" in
@@ -77,6 +94,9 @@ package() {
 			"$pkgdir"/etc/init.d/${file%.*} ;;
 		esac
 	done
+
+	mkdir -p "$pkgdir"/etc/request-key.d
+	install -Dm644 "$srcdir"/nfsidmap.request-key.conf "$pkgdir"/etc/request-key.d/
 }
 
 dev() {
@@ -91,13 +111,13 @@ doc() {
 
 rpcgen() {
 	pkgdesc="Remote Procedure Call (RPC) protocol compiler"
-	install -Dm755 "$builddir"/tools/rpcgen/rpcgen \
-		"$subpkgdir"/usr/bin/rpcgen
+	amove usr/bin/rpcgen
 }
 
 libnfsidmap() {
 	pkgdesc="NFSv4 User and Group ID Mapping Library"
-	install -Dm644 "$builddir"/support/nfsidmap/idmapd.conf "$subpkgdir"/etc/idmapd.conf
+
+	amove etc/idmapd.conf
 	mkdir -p "$subpkgdir"/usr/lib/libnfsidmap
 	mv "$pkgdir"/usr/lib/libnfsidmap.so* "$subpkgdir"/usr/lib/
 	mv "$pkgdir"/usr/lib/libnfsidmap/static* "$subpkgdir"/usr/lib/libnfsidmap/
@@ -107,15 +127,17 @@ libnfsidmap() {
 
 ldap() {
 	pkgdesc="LDAP plugin for libnfsidmap"
-	mkdir -p "$subpkgdir"/usr/lib/libnfsidmap
-	mv "$pkgdir"/usr/lib/libnfsidmap/*ldap* "$subpkgdir"/usr/lib/libnfsidmap/
+
+	amove usr/lib/libnfsidmap/*ldap*
 }
 
-sha512sums="260359f06c1114915a96ee2a593137b02e24db03a414d8d52dadbccb272f7272cb2907e3877c824c80a5c9efeba09f5493c2c9144ef17e43e24c22b9e97cd605  nfs-utils-2.4.3.tar.xz
-3f245b1870a47998d90cee191dba528dede7d2e18abad3f045864f95039057cda5a22708d89fcc086eeed452729c397a0284c73c1c7037277943a9890504e250  musl-configure_ac.patch
+sha512sums="
+3aa4c28780c2dd46aa2d57dffdb79a6146478359d449f636cef3c789e9b1f111cd7492b7b817b9600c9805f45ae0afdc1319c7746fac95963383b92f7bddc114  nfs-utils-2.6.4.tar.xz
 94d7ba23164660f1da9298494dff75c57f5a300cb32b2922bc2226fcdaded7eaaa0c50a59a145ac7c75639d177558b5f5594fb1f03a50f60f4c577c93b135748  musl-getservbyport.patch
 52eeade44753f2002bf99d58ad4982086aab74ef8b14de46be547f23508197f58a6ff529145f96de7f031ac0bb7779b648d05fd981cdd91556dd13d068dfe57b  musl-svcgssd-sysconf.patch
-f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018  nfs.initd
+f186a758a7e1e489920be8f7d3b957f358cbcfc158b0ebfe25d8558f54491a4732bfb3b7a3778bc70da5c186d6e6c0901c6c94b7c0475a659420429ee948025f  musl-stat64.patch
+c4fd642960fab82956dc1386a0209c7f66f7bc52dc855ad7004ba31c999933f1d0c66ac37f97b6db9548c0b6c799bd3918373789238338f9942ffafe42d0f186  include-unistd.patch
+b7c2f8d0f8f7ff5fa59ef326432b3e063f52ccdf664fd2b4908adb8cac63bbfe12a60d3a75c4c3e893a0ff0fb6e8c726899d7b7245f1acd39efd5c2c29398e2d  nfs.initd
 89259b9f0878658d48792b5b2f42b43c966ed098dba1fecf9e07fb0de4aab37ad67655ea8dbcc2361ddab2b5013b2de35a03048a513aaeedf790e4b416a35a54  nfsmount.initd
 6e23897885cc33c49d9c7353b456585a1e0c7300822edba81bc48ba4ccc18297adce137260cc0aa9487aa5ef0aab3eecf931532cfa5bd40fd03bc9e0ddacfb28  nfsmount.confd
 414f2de0b64897b2350666760337683aa4bab612be3e5a3cdd3ac5afa55e498c5cb053430e35b7eb7ed66b93fd66d416d557c2bd8299e3b8b633c7935db6d422  rpc.gssd.initd
@@ -126,4 +148,6 @@ d5d654927cf867fc3562edfc471b2e9df6b737a080f2f726c9c4f58815c092c3403fbbd1f8779d4f
 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535  nfs.confd
 70f96bb3a465ee0fa857a6e511051ca3ced9f5a5d1e6b8b32eec843a2067f2475d8979c724a3661de0a2b078eef143f55d75ed184d823841d9de5038da91fb91  nfs.exports
 85078e2cd38b37a1e6fbaf0e40cf7690f403e71d9c8188d542d12fe56bfc02a49763c7bcc7742691754acc37928468c215db2795bebc29a5dfb052ba08f407bb  nfsclient.initd
-f12e67728ac4e76357685e2fe38bd7f6fcd90064165758ffeca145e6962ac44d4ff9d8d57e18cc6925a6ada8e95ad8321e9fc355931a804dd455aae1e4850e92  nfsclient.confd"
+f12e67728ac4e76357685e2fe38bd7f6fcd90064165758ffeca145e6962ac44d4ff9d8d57e18cc6925a6ada8e95ad8321e9fc355931a804dd455aae1e4850e92  nfsclient.confd
+204e2219b0e74fe6e16673d117018fedfdf4760602fb659e5d3dbd31101313333003ed0b89f47b1ffd7e4847f5111cc5ca85f6a0b6c8bf8ab0f1f2240ba32900  nfsidmap.request-key.conf
+"
diff --git a/main/nfs-utils/include-unistd.patch b/main/nfs-utils/include-unistd.patch
new file mode 100644
index 00000000000..ae67e892991
--- /dev/null
+++ b/main/nfs-utils/include-unistd.patch
@@ -0,0 +1,20 @@
+--- a/support/reexport/fsidd.c
++++ b/support/reexport/fsidd.c
+@@ -7,6 +7,7 @@
+ #include <dlfcn.h>
+ #endif
+ #include <event2/event.h>
++#include <unistd.h>
+ 
+ #include "conffile.h"
+ #include "reexport_backend.h"
+--- a/support/reexport/reexport.c
++++ b/support/reexport/reexport.c
+@@ -7,6 +7,7 @@
+ #endif
+ #include <sys/types.h>
+ #include <sys/vfs.h>
++#include <unistd.h>
+ #include <errno.h>
+ 
+ #include "nfsd_path.h"
diff --git a/main/nfs-utils/musl-configure_ac.patch b/main/nfs-utils/musl-configure_ac.patch
deleted file mode 100644
index a96c7bd73a5..00000000000
--- a/main/nfs-utils/musl-configure_ac.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -578,10 +578,10 @@
-  -Wall \
-  -Wextra \
-  $rpcgen_cflags \
-- -Werror=missing-prototypes \
-- -Werror=missing-declarations \
-+ -Wmissing-prototypes \
-+ -Wmissing-declarations \
-  -Werror=format=2 \
-- -Werror=undef \
-+ -Wundef \
-  -Werror=missing-include-dirs \
-  -Werror=strict-aliasing=2 \
-  -Werror=init-self \
-@@ -617,11 +617,11 @@
- 
- CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1])
- CHECK_CCSUPPORT([-Werror=int-conversion], [flg2])
--CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3])
-+#CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3])
- CHECK_CCSUPPORT([-Werror=misleading-indentation], [flg4])
- AX_GCC_FUNC_ATTRIBUTE([format])
- 
--AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4"])
-+AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg4"])
- 
- # Make sure that $ACLOCAL_FLAGS are used during a rebuild
- AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"])
diff --git a/main/nfs-utils/musl-stat64.patch b/main/nfs-utils/musl-stat64.patch
new file mode 100644
index 00000000000..74c2df260b3
--- /dev/null
+++ b/main/nfs-utils/musl-stat64.patch
@@ -0,0 +1,50 @@
+diff --git a/tools/rpcgen/rpc_main.c b/tools/rpcgen/rpc_main.c
+index 277adc6..fd7dea9 100644
+--- a/tools/rpcgen/rpc_main.c
++++ b/tools/rpcgen/rpc_main.c
+@@ -62,12 +62,6 @@
+ #define EXTEND	1		/* alias for TRUE */
+ #define DONT_EXTEND	0	/* alias for FALSE */
+ 
+-#ifdef __APPLE__
+-# if __DARWIN_ONLY_64_BIT_INO_T
+-#  define stat64 stat
+-# endif
+-#endif
+-
+ struct commandline
+   {
+     int cflag;			/* xdr C routines */
+@@ -337,9 +331,9 @@ clear_args (void)
+ static void
+ find_cpp (void)
+ {
+-  struct stat64 buf;
++  struct stat buf;
+ 
+-  if (stat64 (CPP, &buf) == 0)
++  if (stat (CPP, &buf) == 0)
+     return;
+ 
+   if (cppDefined) /* user specified cpp but it does not exist */
+@@ -1125,17 +1119,17 @@ putarg (int whereto, const char *cp)
+ static void
+ checkfiles (const char *infile, const char *outfile)
+ {
+-  struct stat64 buf;
++  struct stat buf;
+ 
+   if (infile)			/* infile ! = NULL */
+-    if (stat64 (infile, &buf) < 0)
++    if (stat (infile, &buf) < 0)
+       {
+ 	perror (infile);
+ 	crash ();
+       }
+   if (outfile)
+     {
+-      if (stat64 (outfile, &buf) < 0)
++      if (stat (outfile, &buf) < 0)
+ 	return;			/* file does not exist */
+       else
+ 	{
diff --git a/main/nfs-utils/nfs.initd b/main/nfs-utils/nfs.initd
index 4b572fc2e5e..c88605bd1c4 100644
--- a/main/nfs-utils/nfs.initd
+++ b/main/nfs-utils/nfs.initd
@@ -55,7 +55,7 @@ mount_nfsd() {
 		fi
 		# Restart idmapd if needed #220747
 		if grep -qs nfsd /proc/modules ; then
-			killall -q -HUP rpc.idmapd
+			busybox killall -q -HUP rpc.idmapd
 		fi
 	fi
 
diff --git a/main/nfs-utils/nfsidmap.request-key.conf b/main/nfs-utils/nfsidmap.request-key.conf
new file mode 100644
index 00000000000..d5808bb3da5
--- /dev/null
+++ b/main/nfs-utils/nfsidmap.request-key.conf
@@ -0,0 +1,2 @@
+#OP	TYPE		DESCRIPTION	CALLOUT INFO	PROGRAM ARG1 ARG2 ARG3 ...
+create	id_resolver	*		*		/usr/sbin/nfsidmap %k %d
diff --git a/main/nftables/APKBUILD b/main/nftables/APKBUILD
index 24379543bc0..440fe7f0dd1 100644
--- a/main/nftables/APKBUILD
+++ b/main/nftables/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=nftables
-pkgver=0.9.3
-pkgrel=5
+pkgver=1.0.9
+pkgrel=2
 pkgdesc="Netfilter tables userspace tools"
 url="https://netfilter.org/projects/nftables"
 arch="all"
@@ -18,19 +18,31 @@ makedepends="
 	libmnl-dev
 	libnftnl-dev
 	ncurses-dev
+	py3-gpep517
+	py3-setuptools
+	py3-wheel
 	readline-dev
 	"
 install="$pkgname.post-upgrade"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="https://netfilter.org/projects/nftables/files/$pkgname-$pkgver.tar.bz2
+subpackages="
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-openrc
+	py3-$pkgname-pyc
+	py3-$pkgname:_py3:noarch
+	"
+source="https://netfilter.org/projects/nftables/files/nftables-$pkgver.tar.xz
 	nftables.confd
 	nftables.initd
 	nftables.nft
 	"
-builddir="$srcdir/$pkgname-$pkgver"
+options="!check"
 
 prepare() {
 	default_prepare
+	update_config_sub
+
 	sed -i '1i#include "config.h"' "$builddir"/src/proto.c
 }
 
@@ -43,20 +55,40 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--with-json
+		--disable-python \
+		--enable-static=yes \
+		--with-json \
+		--with-cli=readline
 	make
+
+	cd py
+	gpep517 build-wheel \
+		--wheel-dir "$builddir"/.dist \
+		--output-fd 3 3>&1 >&2
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 	install -Dm644 "$srcdir"/nftables.nft "$pkgdir"/etc/nftables.nft
 	install -dm755 "$pkgdir"/etc/nftables.d
+	install -dm750 "$pkgdir"/var/lib/nftables
+}
+
+_py3() {
+	pkgdesc="$pkgdesc (Python interface)"
+	depends="$pkgname=$pkgver-r$pkgrel"
+
+	amove usr/lib/python3*
 }
 
-sha512sums="d264f6fc75c95510e29fe7d5b82ae418d502f40437b098ba6117ffb1374d9989d70a7296e2e58c5fb25142145a987bb9c160902637899f892589809f9541db43  nftables-0.9.3.tar.bz2
-cca875473bbd7b2326afcaeec84b1f9826afb70fc67381a64f3ad104a13a314bd2c352e0fac1f602b9980edb2818bf6242373aa1634ce17bcc1d82eeb8b05b39  nftables.confd
-739e704b263b7afd124c5f497fef43c6f5de69f0a75e0a370c2b84f84619ca6a8a64fe704413c2d1cc1e4a0db062cce2c7fb807c202f9a1a1f60152bd45ad914  nftables.initd
-059e0920517ff9f9c564bdfda6a06e8392a2755c01f8d0331a8577fd027713948d3f1e2cbe9da5077870181dc9e425d8c69e4c82ea6ee261fced4ab61aff3ad4  nftables.nft"
+sha512sums="
+dc34099658e283d9fd4d06264b593710121074558305ea23ab298c5f6a6b564a826f186241b6e106fbaa4e11160cf77e68bb52b4ce401b28d8d2e403cd4b88e8  nftables-1.0.9.tar.xz
+5a298ea01df60b434791fea94306d5b14f7ce684329e4122cc78bb52d1c272fcc48b06eaae154fd082c05f7030792fe42e73814caf3c7be3c446bb265fe25642  nftables.confd
+93a4d3109e3b7d36bcd0901755e1ee4dba3b5555deddc5eecdee2ccbcce15c08f122bf8f1c879c3f696f6a5a13d283536a0ff5e1af82289c3263b6aeb9d116d0  nftables.initd
+b524c124a11f870ae789d5ad05de8a49d365d6c2cb3cd94c21669c5ae0e453481c671a1700ee6518372b10c491b50c5d81ea59fa941092a9161d1b13be7a13b6  nftables.nft
+"
diff --git a/main/nftables/nftables.confd b/main/nftables/nftables.confd
index f01275947fc..767ea8b3d69 100644
--- a/main/nftables/nftables.confd
+++ b/main/nftables/nftables.confd
@@ -1,15 +1,27 @@
 # Configuration for /etc/init.d/nftables
 
-# Location of file with nftables rules to restore on service start,
-# and save rules to on service stop when $save_on_stop is enabled.
+# Location of the nftables rules file to load on the service start.
 #rules_file="/etc/nftables.nft"
 
-# Options to pass to nft on save.
-#save_options="-n"
-
-# Save state on stopping nftables (this will overwrite $rules_file).
+# Whether to save the state of stateful objects (or full ruleset, see
+# $save_objects) on the service stopping.
 #save_on_stop="no"
 
+# File path where to save the nftables state on the service stopping.
+# Defaults to $rules_file if $save_objects is "ruleset".
+#save_file="/var/lib/nftables/state.nft"
+
+# A space-separated list of stateful objects to save on the service stop.
+#
+# If you want to save the full ruleset, set it to "ruleset" (that's the default
+# value, for backward compatibility). Please note that this is discouraged;
+# it's highly recommended to write nftable rules by hand and organize them in
+# files /etc/nftables.d/<name>.nft (included by /etc/nftables.nft).
+save_objects="counters limits quotas"
+
+# Options to pass to nft on save.
+#save_options=""
+
 # Enable IPv4/IPv6 forwarding with the rules?
 # Note: If you want to enable forwarding only on selected interfaces,
 # keep this disabled and enable forwarding using /etc/sysctl.conf.
diff --git a/main/nftables/nftables.initd b/main/nftables/nftables.initd
index 3224ea1d017..5d639d56014 100644
--- a/main/nftables/nftables.initd
+++ b/main/nftables/nftables.initd
@@ -1,24 +1,36 @@
 #!/sbin/openrc-run
-# Copyright 2014 Nicholas Vinson
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
 
-extra_commands="checkconfig list panic save"
-extra_started_commands="reload"
+extra_commands="checkconfig panic save"
+extra_started_commands="reload reset"
 
 description="Manage nftable based firewall."
 description_checkconfig="Check validity of rulesets on disk without applying changes."
-description_save="Save current nftables rulesets to disk."
-description_list="Displays the current nftables ruleset."
 description_panic="Immediately drop all packets on all interfaces."
-description_reload="Clear current rulesets and load rulesets from the saved ruleset files."
-
-# Uppercase variables are there for backward compatibility.
-: ${rules_file:=${NFTABLES_SAVE:="/etc/nftables.nft"}}
-: ${save_options:=${SAVE_OPTIONS:="-n"}}
-: ${save_on_stop:=${SAVE_ON_STOP:="no"}}
+description_reload="Clear current rulesets and load rulesets from the ruleset files."
+description_save="Save nftables state or ruleset to disk."
+description_reset="Reset stateful objects (counters and quotas)."
+
+# Uppercase variables are there for backward compatibility (Alpine <3.8).
+: ${rules_file:=${NFTABLES_SAVE:-"/etc/nftables.nft"}}
+: ${save_objects:="ruleset"}  # "ruleset" is for backward compatibility (Alpine <3.17)
+: ${save_options:=${SAVE_OPTIONS:-}}
+: ${save_on_stop:=${SAVE_ON_STOP:-"no"}}
 : ${enable_forwarding:="no"}
 
+if [ "$save_objects" = 'ruleset' ]; then
+	: ${save_file:="$rules_file"}
+else
+	: ${save_file:="/var/lib/nftables/state.nft"}
+fi
+
+nft=nft
+
+# Add ip netns if configured to run in a netns namespace
+if [ -n "$netns" ]; then
+	test -e /run/netns/$netns || ip netns add $netns
+	nft="ip netns exec $netns $nft"
+fi
+
 depend() {
 	need localmount
 	after sysctl
@@ -30,8 +42,41 @@ start_pre() {
 	checkkernel && checkconfig
 }
 
-list() {
-	nft list ruleset
+start() {
+	ebegin "Loading nftables rules and starting firewall"
+
+	$nft -f "$rules_file"
+	eend $? || return 1
+
+	if yesno "$enable_forwarding"; then
+		ebegin "Enabling forwarding"
+		forwarding 1
+		eend $? || return 1
+	fi
+}
+
+stop() {
+	if yesno "$save_on_stop"; then
+		save || return 1
+	fi
+
+	if yesno "$enable_forwarding"; then
+		ebegin "Disabling forwarding"
+		forwarding 0
+		eend $?
+	fi
+
+	ebegin "Stopping firewall"
+	$nft flush ruleset
+	eend $?
+}
+
+reload() {
+	# This condition is mainly for backward compatibility (Alpine <3.17).
+	if yesno "$save_on_stop" && [ "$save_objects" != 'ruleset' ]; then
+		save || return 1
+	fi
+	start
 }
 
 panic() {
@@ -42,7 +87,7 @@ panic() {
 	fi
 
 	ebegin "Dropping all packets"
-	nft -f /dev/stdin <<-EOF
+	$nft -f /dev/stdin <<-EOF
 		flush ruleset
 		table inet filter {
 		    chain input { type filter hook input priority 0; policy drop; }
@@ -53,53 +98,34 @@ panic() {
 	eend $?
 }
 
-reload() {
-	start
-}
-
 save() {
-	ebegin "Saving nftables state"
+	[ "$RC_CMD" = 'save' ] && ebegin "Saving nftables state"
 
-	checkpath -q -d "${rules_file%/*}"
-	checkpath -q -m 0600 -f "$rules_file"
+	checkpath -q -d "${save_file%/*}"
+	checkpath -q -m 0600 -F -f "$save_file.tmp"
 
-	local tmp_save="$rules_file.tmp"
+	local rc=0
+	local type; for type in $save_objects; do
+		[ "$type" = 'ruleset' ] && echo 'flush ruleset' >> "$save_file.tmp"
+		$nft $save_options list $type >> "$save_file.tmp" || rc=$?
+	done
 
-	echo 'flush ruleset' > "$tmp_save"
-	nft list ruleset >> "$tmp_save"; local retval=$?
+	[ $rc -eq 0 ] && mv "$save_file.tmp" "$save_file"
 
-	[ $retval -eq 0 ] && mv "$tmp_save" "$rules_file"
+	[ "$RC_CMD" = 'save' ] && eend $rc
 
-	return $retval
+	return $rc
 }
 
-start() {
-	ebegin "Loading nftables state and starting firewall"
+reset() {
+	ebegin "Resetting stateful objects"
 
-	nft -f "$rules_file"
-	eend $? || return 1
+	local rc=0 type
+	for type in counters quotas; do
+		$nft reset $type >/dev/null || rc=$?
+	done
 
-	if yesno "$enable_forwarding"; then
-		ebegin "Enabling forwarding"
-		forwarding 1
-		eend $? || return 1
-	fi
-}
-
-stop() {
-	if yesno "$save_on_stop"; then
-		save || return 1
-	fi
-
-	if yesno "$enable_forwarding"; then
-		ebegin "Disabling forwarding"
-		forwarding 0
-		eend $?
-	fi
-
-	ebegin "Stopping firewall"
-	nft flush ruleset
-	eend $?
+	eend $rc
 }
 
 checkconfig() {
@@ -107,11 +133,11 @@ checkconfig() {
 		eerror "Rules files $rules_file does not exist!"
 		return 1
 	fi
-	nft -c -f "$rules_file"
+	$nft -c -f "$rules_file"
 }
 
 checkkernel() {
-	if ! nft list tables >/dev/null 2>&1; then
+	if ! $nft list tables >/dev/null 2>&1; then
 		eerror "Your kernel lacks nftables support, please load"
 		eerror "appropriate modules and try again."
 		return 1
@@ -120,8 +146,12 @@ checkkernel() {
 }
 
 forwarding() {
-	/sbin/sysctl -qw \
-		net.ipv4.ip_forward=$1 \
-		net.ipv6.conf.default.forwarding=$1 \
-		net.ipv6.conf.all.forwarding=$1
+	/sbin/sysctl -qw net.ipv4.ip_forward=$1 || return 1
+
+	if /sbin/sysctl -eq net.ipv6.conf.all.forwarding >/dev/null; then
+		/sbin/sysctl -qw \
+			net.ipv6.conf.default.forwarding=$1 \
+			net.ipv6.conf.all.forwarding=$1 || return 1
+	fi
+	return 0
 }
diff --git a/main/nftables/nftables.nft b/main/nftables/nftables.nft
index a251450358d..391e800eae9 100644
--- a/main/nftables/nftables.nft
+++ b/main/nftables/nftables.nft
@@ -1,5 +1,5 @@
 #!/usr/sbin/nft -f
-# vim:set ts=4:
+# vim: set ts=4 sw=4:
 # You can find examples in /usr/share/nftables/.
 
 # Clear all prior state
@@ -27,29 +27,25 @@ table inet filter {
 		ip protocol icmp icmp type {
 			echo-reply,  # type 0
 			destination-unreachable,  # type 3
+			echo-request,  # type 8
 			time-exceeded,  # type 11
 			parameter-problem,  # type 12
 		} accept \
 		comment "Accept ICMP"
 
-		ip protocol icmp icmp type echo-request limit rate 1/second accept \
-		comment "Accept max 1 ping per second"
-
 		# ICMPv6
 
-		ip6 nexthdr icmpv6 icmpv6 type {
+		icmpv6 type {
 			destination-unreachable,  # type 1
 			packet-too-big,  # type 2
 			time-exceeded,  # type 3
 			parameter-problem,  # type 4
+			echo-request,  # type 128
 			echo-reply,  # type 129
 		} accept \
 		comment "Accept basic IPv6 functionality"
 
-		ip6 nexthdr icmpv6 icmpv6 type echo-request limit rate 1/second accept \
-		comment "Accept max 1 ping per second"
-
-		ip6 nexthdr icmpv6 icmpv6 type {
+		icmpv6 type {
 			nd-router-solicit,  # type 133
 			nd-router-advert,  # type 134
 			nd-neighbor-solicit,  # type 135
@@ -57,13 +53,16 @@ table inet filter {
 		} ip6 hoplimit 255 accept \
 		comment "Allow IPv6 SLAAC"
 
-		ip6 nexthdr icmpv6 icmpv6 type {
+		icmpv6 type {
 			mld-listener-query,  # type 130
 			mld-listener-report,  # type 131
 			mld-listener-reduction,  # type 132
 			mld2-listener-report,  # type 143
 		} ip6 saddr fe80::/10 accept \
 		comment "Allow IPv6 multicast listener discovery on link-local"
+
+		ip6 saddr fe80::/10 udp sport 547 udp dport 546 accept \
+		comment "Accept DHCPv6 replies from IPv6 link-local addresses"
 	}
 
 	chain forward {
@@ -75,4 +74,8 @@ table inet filter {
 	}
 }
 
+# The state of stateful objects saved on the nftables service stop.
+include "/var/lib/nftables/*.nft"
+
+# Rules
 include "/etc/nftables.d/*.nft"
diff --git a/main/nghttp2/APKBUILD b/main/nghttp2/APKBUILD
index 98f9de3920d..59cc0f01147 100644
--- a/main/nghttp2/APKBUILD
+++ b/main/nghttp2/APKBUILD
@@ -1,27 +1,27 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=nghttp2
-pkgver=1.40.0
+pkgver=1.61.0
 pkgrel=0
-pkgdesc="Experimental HTTP/2 client, server and proxy"
+pkgdesc="HTTP/2 C client, server and proxy"
 url="https://nghttp2.org"
 arch="all"
 license="MIT"
-makedepends_build="autoconf automake libtool"
-makedepends_host="libev-dev openssl-dev zlib-dev c-ares-dev cunit-dev"
+makedepends_host="libev-dev openssl-dev>3 zlib-dev c-ares-dev"
+checkdepends="cunit-dev"
 subpackages="$pkgname-static $pkgname-doc $pkgname-dev $pkgname-libs"
-source="https://github.com/tatsuhiro-t/$pkgname/releases/download/v$pkgver/nghttp2-$pkgver.tar.xz
-remove-mruby-tests.patch
-disable-failing-musl-unittest.patch"
-builddir="$srcdir"/$pkgname-$pkgver
+source="https://github.com/nghttp2/nghttp2/releases/download/v$pkgver/nghttp2-$pkgver.tar.xz"
 
 # secfixes:
+#   1.57.0-r0:
+#     - CVE-2023-44487
+#   1.41.0-r0:
+#     - CVE-2020-11080
 #   1.39.2-r0:
 #     - CVE-2019-9511
 #     - CVE-2019-9513
 
 check() {
-	cd "$builddir"
 	make check
 	# integration tests require go, which is only available
 	# in community at the moment of writing. Disabling until
@@ -32,8 +32,12 @@ check() {
 }
 
 build() {
-	cd "$builddir"
-	autoreconf -vif
+	if [ -z "$BOOTSTRAP" ]; then
+		# fat to keep static non-lto too for non-gcc
+		# -20% size
+		export CFLAGS="$CFLAGS -ffat-lto-objects -flto=auto"
+		export CXXFLAGS="$CXXFLAGS -ffat-lto-objects -flto=auto"
+	fi
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -42,30 +46,32 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
+		--disable-examples \
+		--disable-http3 \
+		--disable-werror \
+		--enable-app \
+		--enable-static \
+		--enable-threads \
+		--with-libcares \
+		--with-libev \
+		--with-openssl \
+		--without-jansson \
+		--without-jemalloc \
+		--without-libbpf \
+		--without-libnghttp3 \
+		--without-libngtcp2 \
 		--without-libxml2 \
+		--without-mruby \
 		--without-neverbleed \
-		--without-jemalloc \
-		--disable-python-bindings \
-		--enable-static \
-		--enable-app
+		--without-systemd \
+		"$(want_check && echo --with-cunit || echo --without-cunit)"
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-static() {
-	pkgdesc="$pkgname static libraries"
-	mkdir -p "$subpkgdir"/usr/lib
-	cd "$pkgdir"
-	for _lib in  $(find . -name '*.a'); do
-		mkdir -p "$subpkgdir"/${_lib%/*}
-		mv "$_lib" "$subpkgdir"/${_lib%/*}/
-	done
-}
-
-sha512sums="3f9b989c4bd9571b11bb9d59fe2dfd5596ba3962babfc836587d5047e780400a6cf46e43c602caa25ca83c03b84a1629953140d45223099b193df54a719745ce  nghttp2-1.40.0.tar.xz
-d3f6a66ad6522babb5ad2b3721d52c1c2af88e57ed2895cf87037da1032ca42dcb95dacc23ea277b9507b4116cec117b5c9a3313759dc56b48199b687b74dd9a  remove-mruby-tests.patch
-ad9a645e00d33747338cd23d1d0ff7c744ea6abd504b9175e086574d23881b188fd014464b660923ff37a64c0c46c4379c96374ac8997b03eb2350f9ec817740  disable-failing-musl-unittest.patch"
+sha512sums="
+01e930d7caf464699505f92b76e2bc8192d168612dc564d2546812c42afea2fb81d552d70e8a5fed35e2bf5deadbec8eda095af94a2484bca41542988afce52a  nghttp2-1.61.0.tar.xz
+"
diff --git a/main/nghttp2/disable-failing-musl-unittest.patch b/main/nghttp2/disable-failing-musl-unittest.patch
deleted file mode 100644
index 3d20eefca20..00000000000
--- a/main/nghttp2/disable-failing-musl-unittest.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This testcase fails due to musl libc.
-
---- a/src/shrpx-unittest.cc
-+++ b/src/shrpx-unittest.cc
-@@ -177,8 +177,6 @@
-       !CU_add_test(pSuite, "util_ends_with", shrpx::test_util_ends_with) ||
-       !CU_add_test(pSuite, "util_parse_http_date",
-                    shrpx::test_util_parse_http_date) ||
--      !CU_add_test(pSuite, "util_localtime_date",
--                   shrpx::test_util_localtime_date) ||
-       !CU_add_test(pSuite, "util_get_uint64", shrpx::test_util_get_uint64) ||
-       !CU_add_test(pSuite, "util_parse_config_str_list",
-                    shrpx::test_util_parse_config_str_list) ||
diff --git a/main/nghttp2/remove-mruby-tests.patch b/main/nghttp2/remove-mruby-tests.patch
deleted file mode 100644
index 7154f858456..00000000000
--- a/main/nghttp2/remove-mruby-tests.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-Disables mruby tests when running the integration tests.
-This is only required after go is moved from community to main.
-
---- a/integration-tests/nghttpx_http1_test.go
-+++ b/integration-tests/nghttpx_http1_test.go
-@@ -471,6 +471,7 @@
- // TestH1H1ReqPhaseSetHeader tests mruby request phase hook
- // modifies request header fields.
- func TestH1H1ReqPhaseSetHeader(t *testing.T) {
-+	t.Skip("No mruby support")
- 	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-set-header.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
- 		if got, want := r.Header.Get("User-Agent"), "mruby"; got != want {
- 			t.Errorf("User-Agent = %v; want %v", got, want)
-@@ -493,6 +494,7 @@
- // TestH1H1ReqPhaseReturn tests mruby request phase hook returns
- // custom response.
- func TestH1H1ReqPhaseReturn(t *testing.T) {
-+	t.Skip("No mruby support")
- 	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
- 		t.Fatalf("request should not be forwarded")
- 	})
-@@ -529,6 +531,7 @@
- // TestH1H1RespPhaseSetHeader tests mruby response phase hook modifies
- // response header fields.
- func TestH1H1RespPhaseSetHeader(t *testing.T) {
-+	t.Skip("No mruby support")
- 	st := newServerTester([]string{"--mruby-file=" + testDir + "/resp-set-header.rb"}, t, noopHandler)
- 	defer st.Close()
- 
-@@ -551,6 +554,7 @@
- // TestH1H1RespPhaseReturn tests mruby response phase hook returns
- // custom response.
- func TestH1H1RespPhaseReturn(t *testing.T) {
-+	t.Skip("No mruby support")
- 	st := newServerTester([]string{"--mruby-file=" + testDir + "/resp-return.rb"}, t, noopHandler)
- 	defer st.Close()
- 
-@@ -821,6 +825,7 @@
- // TestH1H2ReqPhaseReturn tests mruby request phase hook returns
- // custom response.
- func TestH1H2ReqPhaseReturn(t *testing.T) {
-+	t.Skip("No mruby support")
- 	st := newServerTester([]string{"--http2-bridge", "--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
- 		t.Fatalf("request should not be forwarded")
- 	})
-@@ -857,6 +862,7 @@
- // TestH1H2RespPhaseReturn tests mruby response phase hook returns
- // custom response.
- func TestH1H2RespPhaseReturn(t *testing.T) {
-+	t.Skip("No mruby support")
- 	st := newServerTester([]string{"--http2-bridge", "--mruby-file=" + testDir + "/resp-return.rb"}, t, noopHandler)
- 	defer st.Close()
- 
-@@ -1119,6 +1125,7 @@
- // TestH1ResponseBeforeRequestEnd tests the situation where response
- // ends before request body finishes.
- func TestH1ResponseBeforeRequestEnd(t *testing.T) {
-+	t.Skip("No mruby support")
- 	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
- 		t.Fatal("request should not be forwarded")
- 	})
---- a/integration-tests/nghttpx_http2_test.go
-+++ b/integration-tests/nghttpx_http2_test.go
-@@ -969,6 +969,7 @@
- // TestH2H1ReqPhaseSetHeader tests mruby request phase hook
- // modifies request header fields.
- func TestH2H1ReqPhaseSetHeader(t *testing.T) {
-+	t.Skip("No mruby support")
- 	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-set-header.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
- 		if got, want := r.Header.Get("User-Agent"), "mruby"; got != want {
- 			t.Errorf("User-Agent = %v; want %v", got, want)
-@@ -991,6 +992,7 @@
- // TestH2H1ReqPhaseReturn tests mruby request phase hook returns
- // custom response.
- func TestH2H1ReqPhaseReturn(t *testing.T) {
-+	t.Skip("No mruby support")
- 	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
- 		t.Fatalf("request should not be forwarded")
- 	})
-@@ -1027,6 +1029,7 @@
- // TestH2H1RespPhaseSetHeader tests mruby response phase hook modifies
- // response header fields.
- func TestH2H1RespPhaseSetHeader(t *testing.T) {
-+	t.Skip("No mruby support")
- 	st := newServerTester([]string{"--mruby-file=" + testDir + "/resp-set-header.rb"}, t, noopHandler)
- 	defer st.Close()
- 
-@@ -1049,6 +1052,7 @@
- // TestH2H1RespPhaseReturn tests mruby response phase hook returns
- // custom response.
- func TestH2H1RespPhaseReturn(t *testing.T) {
-+	t.Skip("No mruby support")
- 	st := newServerTester([]string{"--mruby-file=" + testDir + "/resp-return.rb"}, t, noopHandler)
- 	defer st.Close()
- 
-@@ -2262,6 +2266,7 @@
- // TestH2H2ReqPhaseReturn tests mruby request phase hook returns
- // custom response.
- func TestH2H2ReqPhaseReturn(t *testing.T) {
-+	t.Skip("No mruby support")
- 	st := newServerTester([]string{"--http2-bridge", "--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
- 		t.Fatalf("request should not be forwarded")
- 	})
-@@ -2298,6 +2303,7 @@
- // TestH2H2RespPhaseReturn tests mruby response phase hook returns
- // custom response.
- func TestH2H2RespPhaseReturn(t *testing.T) {
-+	t.Skip("No mruby support")
- 	st := newServerTester([]string{"--http2-bridge", "--mruby-file=" + testDir + "/resp-return.rb"}, t, noopHandler)
- 	defer st.Close()
- 
-@@ -2592,6 +2598,7 @@
- // TestH2ResponseBeforeRequestEnd tests the situation where response
- // ends before request body finishes.
- func TestH2ResponseBeforeRequestEnd(t *testing.T) {
-+	t.Skip("No mruby support")
- 	st := newServerTester([]string{"--mruby-file=" + testDir + "/req-return.rb"}, t, func(w http.ResponseWriter, r *http.Request) {
- 		t.Fatal("request should not be forwarded")
- 	})
diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD
index 8d224f6b4bb..d6240bc1499 100644
--- a/main/nginx/APKBUILD
+++ b/main/nginx/APKBUILD
@@ -4,6 +4,20 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 #
 # secfixes:
+#   1.24.0-r12:
+#     - CVE-2023-44487
+#   1.22.1-r0:
+#     - CVE-2022-41741
+#     - CVE-2022-41742
+#   1.20.2-r2:
+#     - CVE-2021-46461
+#     - CVE-2021-46462
+#     - CVE-2021-46463
+#     - CVE-2022-25139
+#   1.20.1-r1:
+#     - CVE-2021-3618
+#   1.20.1-r0:
+#     - CVE-2021-23017
 #   1.16.1-r6:
 #     - CVE-2019-20372
 #   1.16.1-r0:
@@ -16,34 +30,42 @@
 #     - CVE-2018-16845
 #   1.12.1-r0:
 #     - CVE-2017-7529
+#   0:
+#     - CVE-2022-3638
 #
 pkgname=nginx
 # NOTE: Upgrade only to even-numbered versions (e.g. 1.14.z, 1.16.z)!
 # Odd-numbered versions are mainline (development) versions.
-pkgver=1.16.1
-pkgrel=8
+pkgver=1.24.0
+pkgrel=18
 # Revision of nginx-tests to use for check().
-_tests_hgrev=40e5f2a0a238
-_njs_ver=0.3.5
+_tests_hgrev=22f45bf99a9e
+_njs_ver=0.8.3
+# if this isn't set higher than testing/openresty that comes first for some reason
+# even though this has a higher version..
+provider_priority=100
 pkgdesc="HTTP and reverse proxy server (stable version)"
 url="https://www.nginx.org/"
 arch="all"
 license="BSD-2-Clause"
-depends=""
 makedepends="
+	brotli-dev
 	gd-dev
 	geoip-dev
+	hiredis-dev
+	jansson-dev
 	libmaxminddb-dev
 	libxml2-dev
 	libxslt-dev
 	linux-headers
-	luajit-dev
-	openssl-dev
-	paxmark
+	openssl-dev>3
 	pcre-dev
 	perl-dev
 	pkgconf
+	zeromq-dev
 	zlib-dev
+	zstd-dev
+	!zstd-static
 	"
 checkdepends="
 	gd
@@ -53,41 +75,68 @@ checkdepends="
 	perl-net-ssleay
 	perl-protocol-websocket
 	tzdata
-	uwsgi-python
+	uwsgi-python3
 	"
 pkgusers="nginx"
 _grp_ngx="nginx"
 _grp_www="www-data"
 pkggroups="$_grp_ngx $_grp_www"
-install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade"
-subpackages="$pkgname-debug $pkgname-doc $pkgname-vim::noarch"
-replaces="$pkgname-common $pkgname-initscripts $pkgname-lua $pkgname-rtmp"
-source="https://nginx.org/download/$pkgname-$pkgver.tar.gz
+install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-upgrade $pkgname.post-upgrade"
+subpackages="$pkgname-debug $pkgname-doc $pkgname-openrc $pkgname-vim::noarch"
+source="https://nginx.org/download/nginx-$pkgver.tar.gz
+	CVE-2023-44487.patch
 	$pkgname-tests-$_tests_hgrev.tar.gz::https://hg.nginx.org/nginx-tests/archive/$_tests_hgrev.tar.gz
 	$pkgname-njs-$_njs_ver.tar.gz::https://hg.nginx.org/njs/archive/$_njs_ver.tar.gz
-	CVE-2019-20372.patch
+	nginx-dav-ext-module~pr-56.patch::https://github.com/arut/nginx-dav-ext-module/pull/56.patch
+	nginx-dav-ext-module~pr-62.patch::https://github.com/arut/nginx-dav-ext-module/commit/bbf93f75ca58657fb0f8376b0898f854f13cef91.patch
+	no-werror.patch
+	traffic-accounting-nginx-module~disable-stream-module.patch
+	traffic-accounting-nginx-module~fix-memory-leak.patch
+	nginx_cookie_flag_module~fix-mem-allocations.patch
+	njs~mktemp-busybox-compat.patch
+	naxsi~assert.patch
+	naxsi~ff-header.patch
+	naxsi~compat.patch
+	nginx-upload-progress-module~fix.patch
+	nginx-upload-progress-module~fix-http2.patch
+	ngx-fancyindex~fix-404-on-fs-root.patch
+	ngx-fancyindex~fix-missing-saturday.patch
+	nchan~dont-fail-redis-cluster-before-consensus.patch
+	nchan~fix-redis-race-condition.patch
+	nginx-upload-module~fixes.patch
+	nginx-upload-module~fix-nginx-compat.patch
+	zstd-nginx-module~fix-infinite-loop.patch
 	nginx.conf
 	default.conf
+	stream.conf
 	$pkgname.logrotate
 	$pkgname.initd
 	$pkgname.confd
 	"
-builddir="$srcdir/$pkgname-$pkgver"
 
 _modules_dir="usr/lib/$pkgname/modules"
 _stream_js_depends="$pkgname-mod-stream"
 
+case "$CARCH" in
+	ppc64le|riscv64) _has_luajit=false;;
+	*) _has_luajit=true; makedepends="$makedepends luajit-dev";;
+esac
+
+case "$CARCH" in
+	x86) _njs_mods= ;; # has failing tests
+	*) _njs_mods="http-js stream-js";;
+esac
+
 # Built-in dynamic modules
 for _mod in \
 	http-geoip \
 	http-image-filter \
-	http-js \
 	http-perl \
 	http-xslt-filter \
 	mail \
 	stream \
 	stream-geoip \
-	stream-js
+	$_njs_mods
 do
 	subpackages="$subpackages $pkgname-mod-$_mod:_module"
 done
@@ -96,67 +145,119 @@ done
 
 # For simplicity we assume that module is hosted on GitHub.
 _add_module() {
-	local name="$1" ver="$2" url="$3"
-	local dirname="${url##*/}-${ver#v}"
+	local name="$1" ver="$2" url="$3" subdir="$4" enabled="${5:-true}"
+	local dirname=${url##*/}-${ver#v}
+	local varprefix="_${name//-/_}"
+
+	eval "${varprefix}_ver='$ver'; ${varprefix}_url='$url'"
 
 	# Don't add new flag and source if it's already there, i.e. two or more
 	# modules share the same source (e.g. geoip2 that provides http-geoip2
 	# and stream-geoip2).
-	if ! printf '%s\n' $_extra_flags | grep -qFw "$srcdir/$dirname"; then
-		_extra_flags="$_extra_flags --add-dynamic-module=$srcdir/$dirname"
+	local present=false
+	case "$_extra_flags" in
+		*="$srcdir/$dirname"*) present=true;;
+	esac
+
+	if ! $present; then
 		source="$source $dirname.tar.gz::$url/archive/$ver.tar.gz"
+		# $source must be always in-sync with $sha512sums, so we have to
+		# add there source of a module that is disabled on the current arch.
+		[ "$enabled" = false ] && return
+
+		_extra_flags="$_extra_flags --add-dynamic-module=$srcdir/$dirname/$subdir"
 	fi
 	subpackages="$subpackages $pkgname-mod-$name:_module"
 }
 
-_add_module "devel-kit" "v0.3.0" "https://github.com/simpl/ngx_devel_kit"
+_add_module "devel-kit" "v0.3.3" "https://github.com/vision5/ngx_devel_kit"
 _devel_kit_so="ndk_http_module.so"
 
-_add_module "http-cache-purge" "2.5" "https://github.com/nginx-modules/ngx_cache_purge"
+_add_module "http-accounting" "v2.0" "https://github.com/Lax/traffic-accounting-nginx-module"
+
+_add_module "http-array-var" "v0.06" "https://github.com/openresty/array-var-nginx-module"
+_http_array_var_depends="$pkgname-mod-devel-kit"
+
+_add_module "http-auth-jwt" "0.6.0" "https://github.com/kjdev/nginx-auth-jwt"
+_http_auth_jwt_desc="Nginx third-party module kjdev/nginx-auth-jwt (version $_http_auth_jwt_ver)"
+
+_add_module "http-brotli" "v1.0.0rc" "https://github.com/google/ngx_brotli"
+_http_brotli_so="ngx_http_brotli_filter_module.so ngx_http_brotli_static_module.so"
+
+_add_module "http-cache-purge" "2.5.3" "https://github.com/nginx-modules/ngx_cache_purge"
+
+_add_module "http-cookie-flag" "v1.1.0" "https://github.com/AirisX/nginx_cookie_flag_module"
+_http_cookie_flag_so="ngx_http_cookie_flag_filter_module.so"
 
 _add_module "http-dav-ext" "v3.0.0" "https://github.com/arut/nginx-dav-ext-module"
 
-_add_module "http-echo" "v0.61" "https://github.com/openresty/echo-nginx-module"
+_add_module "http-echo" "v0.63" "https://github.com/openresty/echo-nginx-module"
+
+_add_module "http-encrypted-session" "v0.09" "https://github.com/openresty/encrypted-session-nginx-module"
+_http_encrypted_session_depends="$pkgname-mod-devel-kit"
 
-_add_module "http-fancyindex" "v0.4.3" "https://github.com/aperezdc/ngx-fancyindex"
+_add_module "http-fancyindex" "v0.5.2" "https://github.com/aperezdc/ngx-fancyindex"
 
-_add_module "http-headers-more" "v0.33" "https://github.com/openresty/headers-more-nginx-module"
+_add_module "http-geoip2" "3.4" "https://github.com/leev/ngx_http_geoip2_module"
+_add_module "stream-geoip2" "3.4" "https://github.com/leev/ngx_http_geoip2_module"
+_stream_geoip2_depends="$pkgname-mod-stream"
+
+_add_module "http-headers-more" "v0.37" "https://github.com/openresty/headers-more-nginx-module"
 _http_headers_more_so="ngx_http_headers_more_filter_module.so"
 
+_add_module "http-keyval" "0.2.0" "https://github.com/kjdev/nginx-keyval"
+
+_add_module "http-log-zmq" "v1.0.0" "https://github.com/danifbento/nginx-log-zmq"
+
 # luajit is required for lua-nginx-module since v0.10.14
-_add_module "http-lua" "v0.10.15" "https://github.com/openresty/lua-nginx-module"
-_http_lua_depends="$pkgname-mod-devel-kit"
+_add_module "http-lua" "v0.10.26" "https://github.com/openresty/lua-nginx-module" "" "$_has_luajit"
+_http_lua_depends="$pkgname-mod-devel-kit lua-resty-core"
 _http_lua_provides="$pkgname-lua"  # for backward compatibility
 
-_add_module "http-lua-upstream" "v0.07" "https://github.com/openresty/lua-upstream-nginx-module"
+_add_module "http-lua-upstream" "v0.07" "https://github.com/openresty/lua-upstream-nginx-module" "" "$_has_luajit"
 _http_lua_upstream_depends="$pkgname-mod-http-lua"
 
-_add_module "http-nchan" "v1.2.5" "https://github.com/slact/nchan"
-_http_nchan_so="ngx_nchan_module.so"
+_add_module "http-naxsi" "1.3" "https://github.com/nbs-system/naxsi" "naxsi_src"
+_naxsi_provides="$pkgname-naxsi"  # for backward compatibility
 
-_add_module "http-shibboleth" "v2.0.1" "https://github.com/nginx-shib/nginx-http-shibboleth"
+_add_module "http-nchan" "v1.3.6" "https://github.com/slact/nchan"
+_http_nchan_so="ngx_nchan_module.so"
 
 _add_module "http-redis2" "v0.15" "https://github.com/openresty/redis2-nginx-module"
 
-_add_module "http-set-misc" "v0.32" "https://github.com/openresty/set-misc-nginx-module"
+_add_module "http-set-misc" "v0.33" "https://github.com/openresty/set-misc-nginx-module"
 _http_set_misc_depends="$pkgname-mod-devel-kit"
 
+_add_module "http-shibboleth" "v2.0.2" "https://github.com/nginx-shib/nginx-http-shibboleth"
+
+_add_module "http-untar" "v1.1" "https://github.com/ajax16384/ngx_http_untar_module"
+
+_add_module "http-upload" "2.3.0" "https://github.com/fdintino/nginx-upload-module"
+
 _add_module "http-upload-progress" "v0.9.2" "https://github.com/masterzen/nginx-upload-progress-module"
 _http_upload_progress_so="ngx_http_uploadprogress_module.so"
 
 _add_module "http-upstream-fair" "0.1.3" "https://github.com/itoffshore/nginx-upstream-fair"
 
-_add_module "rtmp" "v1.2.1" "https://github.com/arut/nginx-rtmp-module"
-_rtmp_provides="$pkgname-rtmp"  # for backward compatibility
+_add_module "http-upstream-jdomain" "1.5.0" "https://github.com/nicholaschiasson/ngx_upstream_jdomain"
 
-_add_module "http-vod" "1.24" "https://github.com/kaltura/nginx-vod-module"
+_add_module "http-vod" "1.33" "https://github.com/kaltura/nginx-vod-module"
 
-_add_module "http-geoip2" "3.2" "https://github.com/leev/ngx_http_geoip2_module"
-_add_module "stream-geoip2" "3.2" "https://github.com/leev/ngx_http_geoip2_module"
-_stream_geoip2_depends="$pkgname-mod-stream"
+_add_module "http-vts" "v0.2.2" "https://github.com/vozlt/nginx-module-vts"
+_http_vts_so="ngx_http_vhost_traffic_status_module.so"
+
+_add_module "http-zip" "1.3.0" "https://github.com/evanmiller/mod_zip"
+
+_add_module "http-zstd" "0.1.1" "https://github.com/tokers/zstd-nginx-module"
+_http_zstd_so="ngx_http_zstd_filter_module.so ngx_http_zstd_static_module.so"
+
+_add_module "rtmp" "v1.2.2" "https://github.com/arut/nginx-rtmp-module"
+_rtmp_provides="$pkgname-rtmp"  # for backward compatibility
 
 prepare() {
 	local file; for file in $source; do
+		file=${file%%::*}
+
 		case $file in
 		*~*.patch)
 			msg $file
@@ -179,8 +280,21 @@ prepare() {
 }
 
 _build() {
-	export LUAJIT_LIB="$(pkgconf --variable=libdir luajit)"
-	export LUAJIT_INC="$(pkgconf --variable=includedir luajit)"
+	if $_has_luajit; then
+		export LUAJIT_LIB="$(pkgconf --variable=libdir luajit)"
+		export LUAJIT_INC="$(pkgconf --variable=includedir luajit)"
+	fi
+
+	# Fix compilation with gcc 13.1.
+	# TODO: Remove after upgrade to njs 0.7.13.
+	#   https://github.com/nginx/njs/commit/e60d10f2007c332391d7a104453e13567ebbe52d
+	export NJS_CFLAGS="-Wno-error=dangling-pointer"
+
+	# Enable support for Redis store in the http-keyval module.
+	export NGX_HTTP_KEYVAL_ZONE_REDIS=1
+
+	# --without-pcre2 - Lua module is not compatible with PCRE2 yet
+	#   https://github.com/openresty/lua-nginx-module/issues/1984
 	./configure \
 		--prefix=/var/lib/$pkgname \
 		--sbin-path=/usr/sbin/$pkgname \
@@ -200,6 +314,8 @@ _build() {
 		--with-threads \
 		--with-file-aio \
 		\
+		--without-pcre2 \
+		\
 		--with-http_ssl_module \
 		--with-http_v2_module \
 		--with-http_realip_module \
@@ -228,7 +344,7 @@ _build() {
 		--with-stream_geoip_module=dynamic \
 		--with-stream_ssl_preread_module \
 		\
-		--add-dynamic-module="$srcdir/njs-$_njs_ver/nginx" \
+		${_njs_mods:+"--add-dynamic-module=$srcdir/njs-$_njs_ver/nginx"} \
 		$_extra_flags \
 		"$@"
 
@@ -236,8 +352,6 @@ _build() {
 }
 
 build() {
-	cd "$builddir"
-
 	_build --with-debug
 	mv objs objs-debug
 
@@ -256,44 +370,51 @@ check() {
 		;;
 	esac
 
-	TEST_NGINX_BINARY="$builddir/objs/nginx" prove .
+	: ${JOBS:-1}
+	TEST_NGINX_BINARY="$builddir/objs/nginx" prove -j $((JOBS > 20 ? 20 : JOBS)) .
+
+	# FIXME: see !46437
+	#if [ -n "$_njs_mods" ]; then
+	#	msg "Running njs tests..."
+	#	cd "$srcdir"/njs-*
+	#	make test
+	#fi
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
-
-	# Disable some PaX protections; this is needed for Lua module.
-	local paxflags="-m"
-	[ "$CARCH" = "x86" ] && paxflags="-msp"
-	paxmark $paxflags "$pkgdir"/usr/sbin/nginx
-	paxmark $paxflags objs-debug/nginx
+	chown root:root "$pkgdir"/usr/sbin/nginx
 
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 	install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README
 
 	install -Dm644 objs/$pkgname.8 "$pkgdir"/usr/share/man/man8/$pkgname.8
 
-	local name; for name in ngx_devel_kit lua-nginx-module nginx-rtmp-module; do
+	local name; for name in ngx_devel_kit nginx-rtmp-module; do
 		cp -r "$srcdir"/$name-*/doc* "$pkgdir"/usr/share/doc/$pkgname/$name
 	done
+	if $_has_luajit; then
+		cp -r "$srcdir"/lua-nginx-module-*/doc* "$pkgdir"/usr/share/doc/$pkgname/lua-nginx-module
+	fi
 
 	cd "$pkgdir"
 
 	install -Dm644 "$srcdir"/nginx.conf ./etc/$pkgname/nginx.conf
-	install -Dm644 "$srcdir"/default.conf ./etc/$pkgname/conf.d/default.conf
+	install -dm755 ./etc/$pkgname/http.d ./etc/$pkgname/modules
+
 	install -Dm755 "$srcdir"/$pkgname.initd ./etc/init.d/$pkgname
 	install -Dm644 "$srcdir"/$pkgname.confd ./etc/conf.d/$pkgname
 	install -Dm644 "$srcdir"/$pkgname.logrotate ./etc/logrotate.d/$pkgname
 
-	install -dm755 ./etc/$pkgname/modules
 	install -dm750 -o $pkgusers -g $_grp_ngx ./var/lib/$pkgname
 	install -dm700 -o $pkgusers -g $_grp_ngx ./var/lib/$pkgname/tmp
 	install -dm755 -g $_grp_www ./var/www/localhost/htdocs
 
+	install -Dm644 "$srcdir"/default.conf ./usr/share/$pkgname/http-default_server.conf
+
 	install -dm755 ./var/log
 	mv ./var/lib/$pkgname/logs ./var/log/$pkgname
+	chown $pkgusers:$_grp_ngx var/log/$pkgname
 
 	ln -sf /$_modules_dir ./var/lib/$pkgname/modules
 	ln -sf /var/log/$pkgname ./var/lib/$pkgname/logs
@@ -324,14 +445,24 @@ vim() {
 }
 
 _module() {
-	local name="${subpkgname#$pkgname-mod-}"
-	name="${name//-/_}"
-	local sonames="$(eval "echo \$_${name}_so")";
-	sonames="${sonames:-"ngx_${name}_module.so"}"
+	local name="${subpkgname#$pkgname-mod-}"; name="${name//-/_}"
+	local ver=$(getvar _${name}_ver)
+
+	pkgdesc="Nginx module ${name//_/-}"
+	[ "$ver" ] && pkgdesc="Nginx third-party module ${name//_/-} (version $ver)"
+
+	pkgdesc="$(getvar "_${name}_desc" "$pkgdesc")"
+	url=$(getvar "_${name}_url" "$url")
+	sonames=$(getvar "_${name}_so" "ngx_${name}_module.so")
+	depends="$pkgname $(getvar "_${name}_depends")"
+	provides=$(getvar "_${name}_provides")
 
-	pkgdesc="$pkgdesc (module $name)"
-	depends="$pkgname $(eval "echo \$_${name}_depends")"
-	provides="$(eval "echo \$_${name}_provides")"
+	# Numeric prefix for the module config to ensure that modules with
+	# dependencies on other modules will be loaded after their dependencies.
+	# For simplicity, we don't actually resolve dependency tree. Instead,
+	# we just prefix the module name with a number that reflects number of
+	# the module's dependencies times ten (e.g. 10, 20, 30, ...).
+	local conf_prefix="$(echo "$depends" | wc -w)0_"
 
 	mkdir -p "$subpkgdir"/$_modules_dir
 	mkdir -p "$subpkgdir"/etc/nginx/modules
@@ -340,37 +471,89 @@ _module() {
 
 	local soname; for soname in $sonames; do
 		mv "$pkgdir"/$_modules_dir/$soname ./$_modules_dir/$soname
-		echo "load_module \"modules/$soname\";" >> ./etc/nginx/modules/$name.conf
+		echo "load_module \"modules/$soname\";" >> ./etc/nginx/modules/${conf_prefix}$name.conf
 	done
 
 	case "$name" in
-		http_perl) mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib/;;
+		http_perl)
+			mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib/
+		;;
+		http_naxsi)
+			install -m644 -D "$srcdir"/naxsi-*/naxsi_config/naxsi_core.rules \
+				./etc/nginx/naxsi_core.rules
+		;;
+		stream)
+			mkdir -p ./etc/nginx/stream.d
+			install -m644 -D "$srcdir"/stream.conf ./etc/nginx/conf.d/stream.conf
+		;;
 	esac
 }
 
-sha512sums="17e95b43fa47d4fef5e652dea587518e16ab5ec562c9c94355c356440166d4b6a6a41ee520d406e5a34791a327d2e3c46b3f9b105ac9ce07afdd495c49eca437  nginx-1.16.1.tar.gz
-69ebc81dba60c062e3a0e1ba0a7e1f2c2bf74f38f2bbd4dd0c5608e6c6965b819dc3c57fe21b596c1faceef61bc4a1c804eb9634f8824d62bc9293d17cd2bab2  nginx-tests-40e5f2a0a238.tar.gz
-e7e11b5ed8703adac1d4fb3b8e82731f868eb6c1cad405e9664f3761733ebfaa9a122517ac78cf4ef93d8d78cdb58d36bdbd96dff164079a3a18e9eba60f4aae  nginx-njs-0.3.5.tar.gz
-3d70fecd28a3c7b126aa06404ebb3a0fa71659abb710ecf441208b6735bda80493265410bebb4cecbb2fffa589fede75897b7f7d2da9def2482c75ac85b02b30  CVE-2019-20372.patch
-ac7e3153ab698b4cde077f0d5d7ac0a58897927eb36cf3b58cb01268ca0296f1d589c0a5b4f889b96b5b4a57bef05b17c59be59a9d7c4d7a3d3be58f101f7f41  nginx.conf
+# Print value of the specified variable, or the default if empty or not defined.
+getvar() {
+	eval "printf '%s\n' \"\${$1:-$2}\""
+}
+
+sha512sums="
+1114e37de5664a8109c99cfb2faa1f42ff8ac63c932bcf3780d645e5ed32c0b2ac446f80305b4465994c8f9430604968e176ae464fd80f632d1cb2c8f6007ff3  nginx-1.24.0.tar.gz
+18b69643648119dfab45101bb9404be667aeb9d550aa3bc9706e63e7da1c2806106e9a6bbfb2d10bd57ef56b9b5b0b524059353ec30a51469b44641cb7dbd8a6  CVE-2023-44487.patch
+d882d7f79814bd5caf323099aef318a5f4c75c2eb81f13bbd9688fd5404f5a2e4dc653dbc23121f77cc5ccf59742f80fb34db38b8788030c54b376eb9a2065ff  nginx-tests-22f45bf99a9e.tar.gz
+1cec9a322c40aa2b4ec6eb5bea78d7442880b0cff3a41ad171a3dc3157a6990baec6c8b9eda99ee02a9e51c0b933f13ef17431079a5ff409aaf84b912c7f4df7  nginx-njs-0.8.3.tar.gz
+4c7a94aaebbb69599b0067e74f9f3db54ec383ca9499292fec5b875bb0b5859aa11dc14cef5664c94dd54aba231f31e85feacddc49f7622aa4d0fdb38709b6e1  nginx-dav-ext-module~pr-56.patch
+fdd66e433126e194a3ef22737993191a04fcc4c8caa044b27cb22bea0e7f16c8fdbc900553507d2bb541cdb82b542845a297db2a48c2460a38dd772d0ebfca9d  nginx-dav-ext-module~pr-62.patch
+c89fab6d3d4226e37f2a8d2122d825046fc9a787e464fc75351a19fbda5b47016ddb907e0a61241a007304af921e11a0715895ba7b6d4c1112afe816177ed02a  no-werror.patch
+09ec9f18323197eafa55ff68e8c836ad3dd830e6cd3bd4aeaf34e179ef3f72f734a0117288c1c58813aff59f3f1f0f29ccd772a672e17551e7a4fd0693a89c92  traffic-accounting-nginx-module~disable-stream-module.patch
+5a7e72fc6ade460b725e6b91d5eafeb2792ad9832fbdb84ed868bd9a25d43116e42877df587b5f3885a1e38769f072ed4e8605393aca672d61bc71dd106d392b  traffic-accounting-nginx-module~fix-memory-leak.patch
+ac0f912ae90e0083cc761a622290223edeed0bd32213bbe766d637ac2dfd9835d163e5d16ef28740cbad05d6d92cc418d62df3413c70b4f2c63db02f8ca1c7cc  nginx_cookie_flag_module~fix-mem-allocations.patch
+4db527d663dbe9e8b503c3cbaa4eae34b45990a5359b3bb98ce970c705faefcac98de49439f2557756a2be8e2e06acc67f98942de01674c498832d80c3cb90c3  njs~mktemp-busybox-compat.patch
+eee45b82a594c4dfa5eecf94cf14cd247bd1dd7d627aa0a26666828b3e2da1a358da251a23f0b5feeb5f95f6ba205af6ead54c1e6bcb67f6d11149c0580de3af  naxsi~assert.patch
+7c35f51d73b6c20b6b9b030e76a4898752eae38e0f8e4001286a93633f0b1b11c39fd883116d86a323338027766d15d99c824a9cd9ffe934bea80b7af2a3070c  naxsi~ff-header.patch
+3e000d58e1259a656bb49af23623e6542ec994e3fe699e0005afde9ded5d505e7a174b206390b55ef639e53fd47516a86d88de675df86d550808da1d2732e683  naxsi~compat.patch
+745e900573bc4d1ca6dd40da4743387f9ffaa764cca59591fcbfb1afe67980e529184f81a7cf8f047ddd1962a6a26ed65f1589d69a4f63f6f5701549f38a0652  nginx-upload-progress-module~fix.patch
+24bcde151301ed41eaea65c3792219b25dbb76e3eddd74064937038326698b83d6620d2515a954984502ad2a1c6c53843680952c2ce813f2da34652047675ddf  nginx-upload-progress-module~fix-http2.patch
+37ad4288684d8918045d406f9f46510211413ab343e47aa149e52fd773ad95e6ff10a1b4e7cdd60acaf9231a0c6a935ab489c25880444f1a79e8624693fa166e  ngx-fancyindex~fix-404-on-fs-root.patch
+d54eb2152b2ddbf3e8956cb7b4634b1657635b21b9b4f91309d45a43553c9506ad70161d265e0840c1e84c9e04c0e89061600176ad2ec39311b5c0ce75e42f1e  ngx-fancyindex~fix-missing-saturday.patch
+abda15727e34178db2f8013a1c47e480ba323a3b3b88a44bbada0169b8ce66743911ec7b551272fc8540199070b62eadc78a19989f770794b43877c6743f573d  nchan~dont-fail-redis-cluster-before-consensus.patch
+2a87aee322a146a55e58d48636cdb6a3a182c308a6fe5327c9c2ece0487f669fe6b3f231f56e395e12b7c2ae2dd929a72a03dc18b1032ccc733184aac50d2381  nchan~fix-redis-race-condition.patch
+ef57603bd65ffbbb216fd748dab0126d3df7aafdfa70dce0ea9ef91373df95269546ec2fcaa03f842a8db3a16879274184a23b18db17b4f9be3916aedacb7765  nginx-upload-module~fixes.patch
+bae6c3153810bf6f460248668f2c48e332aba37081e25e45a1691344508530ef1be9acee4d52f506cb09510c4fce8d93ca3178ba45af771c54e37126f4f11b1b  nginx-upload-module~fix-nginx-compat.patch
+97ed3a3ad636a8853a993db3a33c67da303063e7ac43c20eeac6afb9f71adafa5dedf5f5f8c6705a256294c0566e3ac9f5fa41930048ad80b10a7d2a7d3c9b53  zstd-nginx-module~fix-infinite-loop.patch
+c209a220b6afc9354a1c4c39817199327425485b3da44778d632cdfd1d95b8412c58ba9b27a5c96599e7a34cc039f5b7d914ad82153c610b27dfbe21fdcdca77  nginx.conf
 0907f69dc2d3dc1bad3a04fb6673f741f1a8be964e22b306ef9ae2f8e736e1f5733a8884bfe54f3553fff5132a0e5336716250f54272c3fec2177d6ba16986f3  default.conf
+426f0c317322af7cab152f2070398c7aa5c059276ba504617a212f1e060bbb1dd9edc54e62d4cf5f14e3678235351c808ebeabe8b122757c74b3f505e8427106  stream.conf
 09b110693e3f4377349ccea3c43cb8199c8579ee351eae34283299be99fdf764b0c1bddd552e13e4d671b194501618b29c822e1ad53b34101a73a63954363dbb  nginx.logrotate
 ee10a5687740dde0c3d18d8b3555f49fcdc6abfc0a3bc2de1de3be0e99951a346fe8027d916aab73071ecd4e2c50871e7c867aca3a7a0fd16e3374c5caed1c57  nginx.initd
 0b9b9ed01ac077e334c034faa2679f6e26740fb3362eebf8cef82d22b2af2a3faaa53bae3c9e14af51cbf64720a7c66431905ca5cc43f978366456cc4e3b7f4a  nginx.confd
-558764c9be913a4f61d0e277d07bf3c272e1ce086b3fadb85b693a7e92805cd9fca4da7a8d29c96e53fc0d23b331327d3b2561ff61f19d2330e7d5d35ac7d614  ngx_devel_kit-0.3.0.tar.gz
-1f6c15b148856e5d258ed804b8340ae286e8ef925128ba230c59c24c3412c60e58952be4511e8360695cb5301268a9a3407760b0887323e6f46ccc9e81a73642  ngx_cache_purge-2.5.tar.gz
+a255e3a4a9b902b3e15140dc88bbbb152b0a9cdc64604152de41e1b254e81aa2a1e2c95c06cb4905c1520886acf9070031d63913b53fe98b034f8adad2bccf61  ngx_devel_kit-0.3.3.tar.gz
+0df34c3765e18dc5cc5a053d3a17dbee17a686a1f6e76ad057c262741c4e4465c66bcef86e627a19258f836cad5f14745bf046fd396b00960ad79ed20c2a07bb  traffic-accounting-nginx-module-2.0.tar.gz
+bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26  array-var-nginx-module-0.06.tar.gz
+56fe87b7b456856c167b47e5dfc579ac77f15487785dd8411397f6041561b991218518218b4adf3054392fdf1569469a4eff288706f320cf8d2c45b066ef780b  nginx-auth-jwt-0.6.0.tar.gz
+05a880d5e48ac83be84498ed41fb4750211b827a9d7541acfd6ef494e5205a6e853d5594bfec3ab4ae668ea3f803e4f4b0ba550c76811971c8e266e42663c56d  ngx_brotli-1.0.0rc.tar.gz
+aebc9b19a3e7dda3b57e6bd6d86a5ab66d25e05cf5c6c99c71234c789700eb9da8e29529b8b2abf3d775ff3c2610e695fc88e647738769f0d3730bcafc3be38b  ngx_cache_purge-2.5.3.tar.gz
+352cc3d033cc67ee34209f958dac13ada2147de429f4dd3da301c865d52970d80c8aa3c193f7fb28cf4854b88baff07b6efc3bae1fb813fe53d5956a87dfc81a  nginx_cookie_flag_module-1.1.0.tar.gz
 d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde  nginx-dav-ext-module-3.0.0.tar.gz
-c90b81a4e85a8e9beeb5ff591dc91adb25fa4e0b6cb47086b577e5fa36db2368442dd011187675e358781956c364b949bc4d920ca2b534481b21c9987d2a9a3b  echo-nginx-module-0.61.tar.gz
-fe5f6afc29c99f66151c1a06e27b5749b0a16227638583d9c961adc94b2942b981184382f95e70d927f00b09b43f597b963a85a41bde5903b10e42f86bc321f1  ngx-fancyindex-0.4.3.tar.gz
-13165b1b8d4be281b8bd2404fa48d456013d560bace094c81da08a35dc6a4f025a809a3ae3a42be6bbf67abbcbe41e0730aba06f905220f3baeb01e1192a7d37  headers-more-nginx-module-0.33.tar.gz
-1feea538464275e6e571860592628ad639b2259c8aab7f38575b81c0b355f1ade32a91643267bc9ec16519e3bcf3d132511513dc8c949f74a3bff975c85d8ff7  lua-nginx-module-0.10.15.tar.gz
+c325ac4e3f3f735739e156d8c7ada503b34475c62533b4830231ff1b42c25cb0c841aae06b3448b589c2ab35da8d211436ed194d6fd062cad925af8152c5e789  echo-nginx-module-0.63.tar.gz
+399ce2690e85ee27802e8031954a1a3aa3fdc9246e17323a72a298d235931a8dbebdcb121ac8788e074872df0ef5b5a8a3d512b17fbe860b38f696ce42de3655  encrypted-session-nginx-module-0.09.tar.gz
+c208cdf3e245527d7b313f9ef1f5d36ca26e3bdafe67df56492a13b7726587538665e5d9fd50f295fc933f218dc33394f2fe442713d15631701dbfc4a156799b  ngx-fancyindex-0.5.2.tar.gz
+18dea21e5ae2647bea1fc448058a1b773c936917245edef8d861d5e23ed92e9a3b1ec4ef43ffb2ece7b5899d787910adcf4fbd39f84d7e8d7c54759e2fee5b72  ngx_http_geoip2_module-3.4.tar.gz
+0cc2fffe506194d439e3669644d41b7943e2c3cffa3483eb70b92067930b358d506a14646eff8362b191a11c624db29f6b53d830876929dcb4ce1c9d7b2bc40d  headers-more-nginx-module-0.37.tar.gz
+45b8f107a492f415f5053b9b95d3dad481d5736c603b87c1342541214e89b9acbe37925f93acc396782406232e607879b52f9bb480f9021c10d405b832298022  nginx-keyval-0.2.0.tar.gz
+015a358d987476bb61302fbbe1cb105f5314edc1a8b7ee6310aae697f755c79fcb1834ff561fced054c8cd5624f5387fcc1de729731ccd70662f2eb72bcdc174  nginx-log-zmq-1.0.0.tar.gz
+9abf00844ef00ce1dc5ff08d6fe4ddccf843f2ad2de6fd450854b38a66b45add71e814205dba9b19225b9165e67eb93578e83e5fe37af4e0c891e61e6a6bfb3d  lua-nginx-module-0.10.26.tar.gz
 72887c4490854b099cb26bb3f840073a36b0d812bde4486f04dc1be182ca74f0d1e3fd709e77c240c2dcf37665f74cf04e188ea9efe8e127c6789b27b487d0cd  lua-upstream-nginx-module-0.07.tar.gz
-016bbc4a33dccb4f06d43d32b132159473f26b96df2366f6eea246c695073842bcd6252a71873f42032fa47404cbbf9e34ac80f2ea819a9196491ef6c58713f7  nchan-1.2.5.tar.gz
-1730845ea2e52be8c2f6cfceb2894304c5a07959a96940bb1617ee0e7cf81d22283304f411d9a219ddb71e4d9a66012bba0f6f5574d101aeb3c406f26c5d6a4e  nginx-http-shibboleth-2.0.1.tar.gz
+d7aac69b5eceeb1b0db4741201159ade1e0e7f6f7c3e8c4afa2f8959c6c00c3b5285d5185747c2fb0b1400efda02e96799836315e7e492bb4a059b14acb2142d  naxsi-1.3.tar.gz
+0f1c25d460dcf4e3407a1ef4bfcefe17eba7b0ff250f267e5bde0eb4298e9596c1e6992fc58fe35d8420888065353bf3883a1f1bbc5e607a00128992eb1ee6d2  nchan-1.3.6.tar.gz
 d6ca250db8de93edbd7875afca35e73cecdaf82132d1a7ee933cf94c6b8afa8e629e9e647a9321f2bc1fbb92137ec0d32dcd89b82ac5fae31e342537fb7e0431  redis2-nginx-module-0.15.tar.gz
-5590526f60c99630f99a49bfa9e3455baee6d58cd2a1419eab1367a838dafb87a50f5e2607aa8ac557b90dbf633dcf61069c997b3526cddc8f2fc45820a7bc3b  set-misc-nginx-module-0.32.tar.gz
+1ff4c947538a5bd5f9d6adcd87b37f2702f5cc90e3342bc08359cbe8f290b705a3a2daa3dedfb1df3ce4bc19478c8fcac07081c4a53a804fc2862d50078278dc  set-misc-nginx-module-0.33.tar.gz
+0f0c5167e999ffad0caa816d4b7d0a121f0598d578391834fe3293a3e023453d91b36ffc32a431ff3af3f9f376d2d78703998560094d20643b4049c2fec84bda  nginx-http-shibboleth-2.0.2.tar.gz
+c3a7dd29c4a4e47d396b19622a290a04d4cceb97c1b8a508bc984eb8c81d17da4bf5789514bb996987f8343bc801ee4457a86a274bde98b49a809afdfc04cbde  ngx_http_untar_module-1.1.tar.gz
+a0da355888398f86a6b5d065e58c05f9e057589ee785be9f515d77d7a020ae5a7b0656f5af30fb3b026f457326db2e26f4fed29026221ec5fc8156ef8586da25  nginx-upload-module-2.3.0.tar.gz
 c31c46344d49704389722325a041b9cd170fa290acefe92cfc572c07f711cd3039de78f28df48ca7dcb79b2e4bbe442580aaaf4d92883fd3a14bf41d66dd9d8c  nginx-upload-progress-module-0.9.2.tar.gz
 8adb7453c27748f4e685e3352e9b318b408da818754dc5b6244e908423941a8ba337561104f6e481f2553cbc0e334dcea73b57f8e810a9d6e974bb69ff8859e5  nginx-upstream-fair-0.1.3.tar.gz
-4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922  nginx-rtmp-module-1.2.1.tar.gz
-daa9b23858937e57f1bcd5f4400b33155ab4e0e455eea01d80eec5285fc85bd10db63d80a1560f1fea51914a4eb4c59cc54110b7e4de208adbf52ea691cfd6d9  nginx-vod-module-1.24.tar.gz
-84b26955234e29dbfbf2431b652fcc453c5e86b95f837296df4f3d6c730e3e0773223dae890eebfc9b5763f46082bde6f38d6505b8bf78133b89e7297016cc5d  ngx_http_geoip2_module-3.2.tar.gz"
+2ac8351d8d325353534c87e0ef6034a5d3897411895b4e03f22fa06343337d86897331797541ab9201cd7dc8b0376d6d76eb4458849900348f5e199e0b0bd357  ngx_upstream_jdomain-1.5.0.tar.gz
+29ef77f1bbdb2410ff317ebdd7434f31b8ec370ae6b617b92e745e87c11bc820b451181d1d2b57156b414348da14ac448b689b32b17ab418144292eda094512d  nginx-vod-module-1.33.tar.gz
+7295c1af3267b067793fb88e3d3a74fdba5187742141d447f597b8d726c455bfb163209eca5d00b00a57adc3f627078b404a43f5318f910a68c6aeaffb189b1c  nginx-module-vts-0.2.2.tar.gz
+8c5dda14da06ef776fe2b496c2f1b80d2c25c9269309aa560a006c369044c52917024a90f897b7212b2409a874bf2e0a3ab2dbc1e10ad84fa64f54f1f4df3d0d  mod_zip-1.3.0.tar.gz
+6feb544face95121ea076db5df8ca34854085b57602e732c7ba427be5e3f2bf668729d45497a2c91212f98ed8a2c347aa8778a54594f5d241e39e094a2556e4c  zstd-nginx-module-0.1.1.tar.gz
+3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81  nginx-rtmp-module-1.2.2.tar.gz
+"
diff --git a/main/nginx/CVE-2019-20372.patch b/main/nginx/CVE-2019-20372.patch
deleted file mode 100644
index 7329261e556..00000000000
--- a/main/nginx/CVE-2019-20372.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c1be55f97211d38b69ac0c2027e6812ab8b1b94e Mon Sep 17 00:00:00 2001
-From: Ruslan Ermilov <ru@nginx.com>
-Date: Mon, 23 Dec 2019 15:45:46 +0300
-Subject: [PATCH] Discard request body when redirecting to a URL via
- error_page.
-
-Reported by Bert JW Regeer and Francisco Oca Gonzalez.
----
- src/http/ngx_http_special_response.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
-index 4ffb2cc8ad..76e6705889 100644
---- a/src/http/ngx_http_special_response.c
-+++ b/src/http/ngx_http_special_response.c
-@@ -623,6 +623,12 @@ ngx_http_send_error_page(ngx_http_request_t *r, ngx_http_err_page_t *err_page)
-         return ngx_http_named_location(r, &uri);
-     }
- 
-+    r->expect_tested = 1;
-+
-+    if (ngx_http_discard_request_body(r) != NGX_OK) {
-+        r->keepalive = 0;
-+    }
-+
-     location = ngx_list_push(&r->headers_out.headers);
- 
-     if (location == NULL) {
diff --git a/main/nginx/CVE-2023-44487.patch b/main/nginx/CVE-2023-44487.patch
new file mode 100644
index 00000000000..b9fcfbf7d6c
--- /dev/null
+++ b/main/nginx/CVE-2023-44487.patch
@@ -0,0 +1,71 @@
+
+# HG changeset patch
+# User Maxim Dounin <mdounin@mdounin.ru>
+# Date 1696940019 -10800
+# Node ID cdda286c0f1b4b10f30d4eb6a63fefb9b8708ecc
+# Parent  3db945fda515014d220151046d02f3960bcfca0a
+HTTP/2: per-iteration stream handling limit.
+
+To ensure that attempts to flood servers with many streams are detected
+early, a limit of no more than 2 * max_concurrent_streams new streams per one
+event loop iteration was introduced.  This limit is applied even if
+max_concurrent_streams is not yet reached - for example, if corresponding
+streams are handled synchronously or reset.
+
+Further, refused streams are now limited to maximum of max_concurrent_streams
+and 100, similarly to priority_limit initial value, providing some tolerance
+to clients trying to open several streams at the connection start, yet
+low tolerance to flooding attempts.
+
+diff -r 3db945fda515 -r cdda286c0f1b src/http/v2/ngx_http_v2.c
+--- a/src/http/v2/ngx_http_v2.c	Fri Sep 22 19:23:57 2023 +0400
++++ b/src/http/v2/ngx_http_v2.c	Tue Oct 10 15:13:39 2023 +0300
+@@ -347,6 +347,7 @@
+     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http2 read handler");
+ 
+     h2c->blocked = 1;
++    h2c->new_streams = 0;
+ 
+     if (c->close) {
+         c->close = 0;
+@@ -1284,6 +1285,14 @@
+         goto rst_stream;
+     }
+ 
++    if (h2c->new_streams++ >= 2 * h2scf->concurrent_streams) {
++        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
++                      "client sent too many streams at once");
++
++        status = NGX_HTTP_V2_REFUSED_STREAM;
++        goto rst_stream;
++    }
++
+     if (!h2c->settings_ack
+         && !(h2c->state.flags & NGX_HTTP_V2_END_STREAM_FLAG)
+         && h2scf->preread_size < NGX_HTTP_V2_DEFAULT_WINDOW)
+@@ -1349,6 +1358,12 @@
+ 
+ rst_stream:
+ 
++    if (h2c->refused_streams++ > ngx_max(h2scf->concurrent_streams, 100)) {
++        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
++                      "client sent too many refused streams");
++        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_NO_ERROR);
++    }
++
+     if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid, status) != NGX_OK) {
+         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
+     }
+diff -r 3db945fda515 -r cdda286c0f1b src/http/v2/ngx_http_v2.h
+--- a/src/http/v2/ngx_http_v2.h	Fri Sep 22 19:23:57 2023 +0400
++++ b/src/http/v2/ngx_http_v2.h	Tue Oct 10 15:13:39 2023 +0300
+@@ -131,6 +131,8 @@
+     ngx_uint_t                       processing;
+     ngx_uint_t                       frames;
+     ngx_uint_t                       idle;
++    ngx_uint_t                       new_streams;
++    ngx_uint_t                       refused_streams;
+     ngx_uint_t                       priority_limit;
+ 
+     size_t                           send_window;
+
diff --git a/main/nginx/naxsi~assert.patch b/main/nginx/naxsi~assert.patch
new file mode 100644
index 00000000000..35ae171d48a
--- /dev/null
+++ b/main/nginx/naxsi~assert.patch
@@ -0,0 +1,23 @@
+Patch-Source: https://github.com/nbs-system/naxsi/commit/aa9da98b1b9b52e5d95bbc28dc8126c0920cb4cb
+
+From aa9da98b1b9b52e5d95bbc28dc8126c0920cb4cb Mon Sep 17 00:00:00 2001
+From: Giovanni <561184+wargio@users.noreply.github.com>
+Date: Fri, 18 Dec 2020 11:31:42 +0100
+Subject: [PATCH] Fix #541 - Removing useless assert.
+
+---
+ naxsi_src/naxsi_runtime.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/naxsi_src/naxsi_runtime.c b/naxsi_src/naxsi_runtime.c
+index eccdce3e..28e0b29d 100644
+--- a/naxsi_src/naxsi_runtime.c
++++ b/naxsi_src/naxsi_runtime.c
+@@ -1073,7 +1073,6 @@ ngx_http_nx_log(ngx_http_request_ctx_t* ctx,
+   ** don't handle uri > 4k, string will be split
+   */
+ 
+-  assert(strlen(fmt_config) != 0);
+   sub = snprintf((char*)fragment->data,
+                  sz_left,
+                  fmt_base,
diff --git a/main/nginx/naxsi~compat.patch b/main/nginx/naxsi~compat.patch
new file mode 100644
index 00000000000..ac9a2d64064
--- /dev/null
+++ b/main/nginx/naxsi~compat.patch
@@ -0,0 +1,133 @@
+Patch-Source: https://github.com/nbs-system/naxsi/commit/d714f1636ea49a9a9f4f06dba14aee003e970834
+
+From d714f1636ea49a9a9f4f06dba14aee003e970834 Mon Sep 17 00:00:00 2001
+From: Danila Vershinin <ciapnz@gmail.com>
+Date: Mon, 27 Jun 2022 19:45:00 +0300
+Subject: [PATCH] Fixes NGINX >= v.1.23.0 (all credits @lubomudr) (#598)
+
+---
+ naxsi_src/naxsi.h         |  4 ++--
+ naxsi_src/naxsi_runtime.c | 42 ++++++++++++++++++++++++++++++++-------
+ 2 files changed, 37 insertions(+), 9 deletions(-)
+
+diff --git a/naxsi_src/naxsi.h b/naxsi_src/naxsi.h
+index b2f5c1a5..8c1939e1 100644
+--- a/naxsi_src/naxsi.h
++++ b/naxsi_src/naxsi.h
+@@ -9,12 +9,12 @@
+ 
+ #define NAXSI_VERSION "1.3"
+ 
++#include <ngx_config.h>
++#include <ngx_core.h>
+ #include "ext/libinjection/libinjection_sqli.h"
+ #include "ext/libinjection/libinjection_xss.h"
+ #include <ctype.h>
+ #include <nginx.h>
+-#include <ngx_config.h>
+-#include <ngx_core.h>
+ #include <ngx_event.h>
+ #include <ngx_http.h>
+ #include <ngx_http_core_module.h>
+diff --git a/naxsi_src/naxsi_runtime.c b/naxsi_src/naxsi_runtime.c
+index 784852b0..6b55d2b3 100644
+--- a/naxsi_src/naxsi_runtime.c
++++ b/naxsi_src/naxsi_runtime.c
+@@ -4,8 +4,8 @@
+  * Licensed under GNU GPL v3.0 – See the LICENSE notice for details
+  */
+ 
+-#include "assert.h"
+ #include "naxsi.h"
++#include "assert.h"
+ #include "naxsi_macros.h"
+ #include "naxsi_net.h"
+ 
+@@ -2912,20 +2912,20 @@ ngx_http_naxsi_data_parse(ngx_http_request_ctx_t* ctx, ngx_http_request_t* r)
+       /* and the presence of data to parse */
+       r->request_body && ((!ctx->block || ctx->learning) && !ctx->drop))
+     ngx_http_naxsi_body_parse(ctx, r, cf, main_cf);
++#if (NGX_HTTP_X_FORWARDED_FOR)
+   ngx_str_t tag;
+   tag.len  = 15;
+   tag.data = ngx_pcalloc(r->pool, tag.len + 1);
+   if (tag.data)
+     memcpy(tag.data, "x-forwarded-for", 15);
++#if (nginx_version < 1023000)
+   unsigned int      n = 0;
+   ngx_table_elt_t** h = NULL;
+   ngx_array_t       a;
+-#if (NGX_HTTP_X_FORWARDED_FOR)
+   if (r->headers_in.x_forwarded_for.nelts >= 1) {
+     a = r->headers_in.x_forwarded_for;
+     n = a.nelts;
+   }
+-#endif
+   if (n >= 1)
+     h = a.elts;
+   if (n >= 1) {
+@@ -2933,6 +2933,16 @@ ngx_http_naxsi_data_parse(ngx_http_request_ctx_t* ctx, ngx_http_request_t* r)
+ 
+     ngx_http_naxsi_update_current_ctx_status(ctx, cf, r, &tag, (ngx_str_t*)h[0]->value.data);
+   }
++#else
++  ngx_table_elt_t* xff = NULL;
++  if (r->headers_in.x_forwarded_for != NULL) {
++    xff = r->headers_in.x_forwarded_for;
++    ngx_log_debug(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "xfor %s", xff->value.data);
++
++    ngx_http_naxsi_update_current_ctx_status(ctx, cf, r, &tag, (ngx_str_t*)xff->value.data);
++  }
++#endif
++#endif
+ }
+ 
+ void
+@@ -2947,19 +2957,20 @@ ngx_http_naxsi_update_current_ctx_status(ngx_http_request_ctx_t*    ctx,
+   ngx_http_check_rule_t* cr;
+ 
+   ngx_http_special_score_t* sc;
+-  unsigned int              n = 0;
+ 
+   NX_DEBUG(_debug_custom_score, NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "XX-custom check rules");
+ 
+   int               ignore = 0;
+-  ngx_table_elt_t** h;
+-  ngx_array_t       a;
+ 
+   ctx->ignore = 0;
+ 
+   /*cr, sc, cf, ctx*/
+   if (cf->check_rules && ctx->special_scores) {
+ #if (NGX_HTTP_X_FORWARDED_FOR)
++#if (nginx_version < 1023000)
++      unsigned int              n = 0;
++      ngx_table_elt_t** h;
++      ngx_array_t       a;
+     if (r->headers_in.x_forwarded_for.nelts >= 1) {
+       a = r->headers_in.x_forwarded_for;
+       n = a.nelts;
+@@ -2978,6 +2989,23 @@ ngx_http_naxsi_update_current_ctx_status(ngx_http_request_ctx_t*    ctx,
+         ignore = nx_can_ignore_ip(&ip, cf) || nx_can_ignore_cidr(&ip, cf);
+       }
+     } else
++#else
++    ngx_table_elt_t* xff;
++    if (r->headers_in.x_forwarded_for != NULL) {
++      xff = r->headers_in.x_forwarded_for;
++      NX_DEBUG(_debug_whitelist_ignore,
++                 NGX_LOG_DEBUG_HTTP,
++                 r->connection->log,
++                 0,
++                 "XX- lookup ignore X-Forwarded-For: %s",
++                 xff->value.data);
++      ngx_str_t ip;
++      ip.len  = strlen((char*)xff->value.data);
++      ip.data = ngx_pcalloc(r->pool, ip.len + 1);
++      memcpy(ip.data, xff->value.data, ip.len);
++      ignore = nx_can_ignore_ip(&ip, cf) || nx_can_ignore_cidr(&ip, cf);
++    } else
++#endif
+ #endif
+     {
+       ngx_str_t* ip = &r->connection->addr_text;
diff --git a/main/nginx/naxsi~ff-header.patch b/main/nginx/naxsi~ff-header.patch
new file mode 100644
index 00000000000..b6ed47760d8
--- /dev/null
+++ b/main/nginx/naxsi~ff-header.patch
@@ -0,0 +1,62 @@
+Patch-Source: https://github.com/nbs-system/naxsi/commit/296583f06ba5c43cc859e01fd3c0ae1271eef0ce
+
+From 296583f06ba5c43cc859e01fd3c0ae1271eef0ce Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sat, 14 Aug 2021 12:57:28 +0200
+Subject: [PATCH] naxsi_src/naxsi_runtime.c: fix build without x_forwarded_for
+ (#568)
+
+x_forwarded_for is not available if realip, geo, geoip or proxy modules
+aren't enabled resulting in the following build failure since version
+1.1a and
+https://github.com/nbs-system/naxsi/commit/07a056ccd36bc3c5c40dc17991db226cb8cf6241:
+
+/home/buildroot/autobuild/instance-3/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c: In function 'ngx_http_naxsi_data_parse':
+/home/buildroot/autobuild/instance-3/output-1/build/nginx-naxsi-1.3/naxsi_src/naxsi_runtime.c:2846:20: error: 'ngx_http_headers_in_t' has no member named 'x_forwarded_for'
+   if (r->headers_in.x_forwarded_for.nelts >= 1) {
+                    ^
+
+Fixes:
+ - http://autobuild.buildroot.org/results/cdbc1536f6b5de3d4c836efa2f0dcaf0cdbb1462
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ naxsi_src/naxsi_runtime.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/naxsi_src/naxsi_runtime.c b/naxsi_src/naxsi_runtime.c
+index 28e0b29d..6a723d24 100644
+--- a/naxsi_src/naxsi_runtime.c
++++ b/naxsi_src/naxsi_runtime.c
+@@ -2842,10 +2842,12 @@ ngx_http_naxsi_data_parse(ngx_http_request_ctx_t* ctx, ngx_http_request_t* r)
+   unsigned int      n = 0;
+   ngx_table_elt_t** h = NULL;
+   ngx_array_t       a;
++#if (NGX_HTTP_X_FORWARDED_FOR)
+   if (r->headers_in.x_forwarded_for.nelts >= 1) {
+     a = r->headers_in.x_forwarded_for;
+     n = a.nelts;
+   }
++#endif
+   if (n >= 1)
+     h = a.elts;
+   if (n >= 1) {
+@@ -2879,6 +2881,7 @@ ngx_http_naxsi_update_current_ctx_status(ngx_http_request_ctx_t*    ctx,
+ 
+   /*cr, sc, cf, ctx*/
+   if (cf->check_rules && ctx->special_scores) {
++#if (NGX_HTTP_X_FORWARDED_FOR)
+     if (r->headers_in.x_forwarded_for.nelts >= 1) {
+       a = r->headers_in.x_forwarded_for;
+       n = a.nelts;
+@@ -2896,7 +2899,9 @@ ngx_http_naxsi_update_current_ctx_status(ngx_http_request_ctx_t*    ctx,
+         memcpy(ip.data, h[0]->value.data, ip.len);
+         ignore = nx_can_ignore_ip(&ip, cf) || nx_can_ignore_cidr(&ip, cf);
+       }
+-    } else {
++    } else
++#endif
++    {
+       ngx_str_t* ip = &r->connection->addr_text;
+       NX_DEBUG(_debug_whitelist_ignore,
+                NGX_LOG_DEBUG_HTTP,
diff --git a/main/nginx/nchan~dont-fail-redis-cluster-before-consensus.patch b/main/nginx/nchan~dont-fail-redis-cluster-before-consensus.patch
new file mode 100644
index 00000000000..114ff925b97
--- /dev/null
+++ b/main/nginx/nchan~dont-fail-redis-cluster-before-consensus.patch
@@ -0,0 +1,49 @@
+Patch-Source: https://github.com/slact/nchan/commit/ed27e02adcac66ce73f5db387596fa063362ac6e
+--
+From ed27e02adcac66ce73f5db387596fa063362ac6e Mon Sep 17 00:00:00 2001
+From: Fabio Urquiza <fabiorush@gmail.com>
+Date: Wed, 1 Feb 2023 14:48:47 +0000
+Subject: [PATCH] Don't fail redis cluster nodes before consensus is reached
+
+diff --git a/src/store/redis/redis_nodeset.c b/src/store/redis/redis_nodeset.c
+index 39fdd396..2c4646c4 100644
+--- a/src/store/redis/redis_nodeset.c
++++ b/src/store/redis/redis_nodeset.c
+@@ -1052,6 +1052,9 @@ static void nodeset_cluster_check_event_callback(redisAsyncContext *ac, void *re
+   
+   for(i=0; i<n; i++) {
+     l = &lines[i];
++    if(l->maybe_failed) {
++      nodeset_log_warning(ns, "Ignoring 'fail?' state reported by %V:%d for node %V", &node->connect_params.hostname, node->connect_params.port, &l->address);
++    }
+     if(l->failed && nodeset_node_remove_failed(ns, &l->id)) {
+       failed_nodes++;
+       continue;
+diff --git a/src/store/redis/redis_nodeset_parser.c b/src/store/redis/redis_nodeset_parser.c
+index 7ce0037b..e3052dc2 100644
+--- a/src/store/redis/redis_nodeset_parser.c
++++ b/src/store/redis/redis_nodeset_parser.c
+@@ -132,7 +132,10 @@ static char *nodeset_parser_scan_cluster_nodes_line(const char *line, cluster_no
+     l->slot_ranges_count = 0;
+     l->master = 0;
+   }
+-  l->failed = nchan_ngx_str_substr((&l->flags), "fail");
++  l->maybe_failed = nchan_ngx_str_substr((&l->flags), "fail?");
++  if(!l->maybe_failed)
++    l->failed = nchan_ngx_str_substr((&l->flags), "fail");
++
+   l->self = nchan_ngx_str_substr((&l->flags), "myself");
+   l->noaddr = nchan_ngx_str_substr((&l->flags), "noaddr");
+   l->handshake = nchan_ngx_str_substr((&l->flags), "handshake");
+diff --git a/src/store/redis/redis_nodeset_parser.h b/src/store/redis/redis_nodeset_parser.h
+index 5d564b62..a14ae146 100644
+--- a/src/store/redis/redis_nodeset_parser.h
++++ b/src/store/redis/redis_nodeset_parser.h
+@@ -28,6 +28,7 @@ typedef struct {
+   unsigned       master:1;
+   unsigned       noaddr:1;
+   unsigned       failed:1;
++  unsigned       maybe_failed:1;
+   unsigned       handshake:1;
+   unsigned       self:1;
+ } cluster_nodes_line_t;
diff --git a/main/nginx/nchan~fix-redis-race-condition.patch b/main/nginx/nchan~fix-redis-race-condition.patch
new file mode 100644
index 00000000000..75d5b83a050
--- /dev/null
+++ b/main/nginx/nchan~fix-redis-race-condition.patch
@@ -0,0 +1,270 @@
+Patch-Source: https://github.com/slact/nchan/commit/cc705a948cf6797f669b64649605f007f6f26a42
+--
+From cc705a948cf6797f669b64649605f007f6f26a42 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?F=C3=A1bio=20Urquiza?= <fabiorush@gmail.com>
+Date: Mon, 20 Mar 2023 10:31:33 -0300
+Subject: [PATCH] Fix redis connection race condition on many workers (#666)
+
+diff --git a/src/nchan_module.c b/src/nchan_module.c
+index ad6f3534..95b51521 100644
+--- a/src/nchan_module.c
++++ b/src/nchan_module.c
+@@ -39,7 +39,6 @@ int                 nchan_redis_stats_enabled = 0;
+ 
+ 
+ static void nchan_publisher_body_handler(ngx_http_request_t *r);
+-static void nchan_publisher_unavailable_body_handler(ngx_http_request_t *r);
+ 
+ //#define DEBUG_LEVEL NGX_LOG_WARN
+ //#define DEBUG_LEVEL NGX_LOG_DEBUG
+@@ -746,18 +745,6 @@ ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
+     return NGX_OK;
+   }
+   
+-  if(cf->redis.enabled && !nchan_store_redis_ready(cf)) {
+-    //using redis, and it's not ready yet
+-    if(r->method == NGX_HTTP_POST || r->method == NGX_HTTP_PUT) {
+-      //discard request body before responding
+-      nchan_http_publisher_handler(r, nchan_publisher_unavailable_body_handler);
+-    }
+-    else {
+-      nchan_respond_status(r, NGX_HTTP_SERVICE_UNAVAILABLE, NULL, NULL, 0);
+-    }
+-    return NGX_OK;
+-  }
+-  
+   if(cf->pub.websocket || cf->pub.http) {
+     char *err;
+     if(!nchan_parse_message_buffer_config(r, cf, &err)) {
+@@ -841,6 +828,13 @@ ngx_int_t nchan_pubsub_handler(ngx_http_request_t *r) {
+ #if FAKESHARD
+           memstore_sub_debug_start();
+ #endif
++
++          if(cf->redis.enabled && ngx_process_slot == memstore_channel_owner(channel_id) && !nchan_store_redis_ready(cf)) {
++            //using redis, and it's not ready yet
++            nchan_respond_status(r, NGX_HTTP_SERVICE_UNAVAILABLE, NULL, NULL, 0);
++            return NGX_OK;
++          }
++
+           if((msg_id = nchan_subscriber_get_msg_id(r)) == NULL) {
+             goto bad_msgid;
+           }
+@@ -1249,11 +1243,6 @@ static ngx_int_t nchan_publisher_body_authorize_handler(ngx_http_request_t *r, v
+   return NGX_OK;
+ }
+ 
+-static void nchan_publisher_unavailable_body_handler(ngx_http_request_t *r) {
+-  nchan_http_finalize_request(r, NGX_HTTP_SERVICE_UNAVAILABLE);
+-  return;
+-}
+-
+ static void nchan_publisher_body_handler(ngx_http_request_t *r) {
+   ngx_str_t                      *channel_id;
+   nchan_loc_conf_t               *cf = ngx_http_get_module_loc_conf(r, ngx_nchan_module);
+diff --git a/src/store/memory/ipc-handlers.c b/src/store/memory/ipc-handlers.c
+index 55df2fd3..bee7c1d9 100644
+--- a/src/store/memory/ipc-handlers.c
++++ b/src/store/memory/ipc-handlers.c
+@@ -47,6 +47,8 @@
+   L(benchmark_finish_reply) \
+   L(redis_stats_request) \
+   L(redis_stats_reply) \
++  L(redis_conn_ready) \
++  L(redis_conn_ready_reply) \
+ 
+ 
+ 
+@@ -1205,6 +1207,35 @@ static void receive_redis_stats_reply(ngx_int_t sender, redis_stats_request_data
+   shm_free(nchan_store_memory_shmem, data->stats);
+ }
+ 
++////////// REDIS CONN READY DATA ////////////////
++typedef struct {
++  ngx_int_t                ready;
++  nchan_loc_conf_t        *cf;
++  callback_pt              callback;
++  void                    *privdata;
++} redis_conn_ready_data_t;
++
++ngx_int_t memstore_ipc_send_redis_conn_ready(ngx_int_t dst, nchan_loc_conf_t *cf, callback_pt callback, void* privdata) {
++  DBG("send redis_conn_ready to %i", dst);
++  redis_conn_ready_data_t        data;
++  DEBUG_MEMZERO(&data);
++  data.ready = 0;
++  data.cf = cf;
++  data.callback = callback;
++  data.privdata = privdata;
++
++  return ipc_cmd(redis_conn_ready, dst, &data);
++}
++
++static void receive_redis_conn_ready(ngx_int_t sender, redis_conn_ready_data_t *d) {
++  DBG("received redis_conn_ready request for privdata %p", d->privdata);
++  d->ready = nchan_store_redis_ready(d->cf);
++  ipc_cmd(redis_conn_ready_reply, sender, d);
++}
++
++static void receive_redis_conn_ready_reply(ngx_int_t sender, redis_conn_ready_data_t *d) {
++  d->callback(d->ready, NULL, d->privdata);
++}
+ 
+ #define MAKE_ipc_cmd_handler(val) [offsetof(ipc_handlers_t, val)/sizeof(ipc_handler_pt)] = (ipc_handler_pt )receive_ ## val,
+ static ipc_handler_pt ipc_cmd_handler[] = {
+diff --git a/src/store/memory/ipc-handlers.h b/src/store/memory/ipc-handlers.h
+index e22c4a0d..7fd9c19c 100644
+--- a/src/store/memory/ipc-handlers.h
++++ b/src/store/memory/ipc-handlers.h
+@@ -26,3 +26,5 @@ ngx_int_t memstore_ipc_broadcast_benchmark_finish(void);
+ ngx_int_t memstore_ipc_broadcast_benchmark_abort(void);
+ 
+ ngx_int_t memstore_ipc_broadcast_redis_stats_request(void *nodeset, callback_pt cb, void *pd);
++
++ngx_int_t memstore_ipc_send_redis_conn_ready(ngx_int_t dst, nchan_loc_conf_t *cf, callback_pt callback, void* privdata);
+\ No newline at end of file
+diff --git a/src/store/memory/memstore.c b/src/store/memory/memstore.c
+index f8b4ee8b..e1e1c7a8 100755
+--- a/src/store/memory/memstore.c
++++ b/src/store/memory/memstore.c
+@@ -2079,12 +2079,13 @@ static void subscribe_data_free(subscribe_data_t *d) {
+ #define SUB_CHANNEL_NOTSURE 2
+ 
+ static ngx_int_t nchan_store_subscribe_channel_existence_check_callback(ngx_int_t channel_status, void* _, subscribe_data_t *d);
+-static ngx_int_t nchan_store_subscribe_continued(ngx_int_t channel_status, void* _, subscribe_data_t *d);
++static ngx_int_t nchan_store_subscribe_stage2(ngx_int_t continue_subscription, void* _, subscribe_data_t *d);
++static ngx_int_t nchan_store_subscribe_stage3(ngx_int_t channel_status, void* _, subscribe_data_t *d);
+ 
+ static ngx_int_t nchan_store_subscribe(ngx_str_t *channel_id, subscriber_t *sub) {
+   ngx_int_t                    owner = memstore_channel_owner(channel_id);
+   subscribe_data_t            *d = subscribe_data_alloc(sub->cf->redis.enabled ? -1 : owner);
+-  
++
+   assert(d != NULL);
+   
+   d->channel_owner = owner;
+@@ -2095,24 +2096,51 @@ static ngx_int_t nchan_store_subscribe(ngx_str_t *channel_id, subscriber_t *sub)
+   d->channel_exists = 0;
+   d->group_channel_limit_pass = 0;
+   d->msg_id = sub->last_msgid;
+-  
+-  if(sub->cf->subscribe_only_existing_channel || sub->cf->max_channel_subscribers > 0) {
++
++  if(sub->cf->redis.enabled && memstore_slot() != owner) {
++    ngx_int_t rc;
+     sub->fn->reserve(sub);
+     d->reserved = 1;
+-    if(memstore_slot() != owner) {
+-      ngx_int_t rc;
+-      rc = memstore_ipc_send_channel_existence_check(owner, channel_id, sub->cf, (callback_pt )nchan_store_subscribe_channel_existence_check_callback, d);
+-      if(rc == NGX_DECLINED) { // out of memory
+-        nchan_store_subscribe_channel_existence_check_callback(SUB_CHANNEL_UNAUTHORIZED, NULL, d);
+-        return NGX_ERROR;
++    rc = memstore_ipc_send_redis_conn_ready(d->channel_owner, sub->cf, (callback_pt)nchan_store_subscribe_stage2, d);
++    if(rc == NGX_DECLINED) { // out of memory
++      nchan_store_subscribe_stage2(0, NULL, d);
++      return NGX_ERROR;
++    }
++  } else {
++    return nchan_store_subscribe_stage2(1, NULL, d);
++  }
++  return NGX_OK;
++}
++
++static ngx_int_t nchan_store_subscribe_stage2(ngx_int_t continue_subscription, void* _, subscribe_data_t *d) {
++  if(continue_subscription) {
++    if(d->sub->cf->subscribe_only_existing_channel || d->sub->cf->max_channel_subscribers > 0) {
++      if(!d->reserved) {
++        d->sub->fn->reserve(d->sub);
++        d->reserved = 1;
++      }
++      if(memstore_slot() != d->channel_owner) {
++        ngx_int_t rc;
++        rc = memstore_ipc_send_channel_existence_check(d->channel_owner, d->channel_id, d->sub->cf, (callback_pt )nchan_store_subscribe_channel_existence_check_callback, d);
++        if(rc == NGX_DECLINED) { // out of memory
++          nchan_store_subscribe_channel_existence_check_callback(SUB_CHANNEL_UNAUTHORIZED, NULL, d);
++          return NGX_ERROR;
++        }
++      }
++      else {
++        return nchan_store_subscribe_stage3(SUB_CHANNEL_NOTSURE, NULL, d);
+       }
+     }
+     else {
+-      return nchan_store_subscribe_continued(SUB_CHANNEL_NOTSURE, NULL, d);
++      return nchan_store_subscribe_stage3(SUB_CHANNEL_AUTHORIZED, NULL, d);
+     }
+-  }
+-  else {
+-    return nchan_store_subscribe_continued(SUB_CHANNEL_AUTHORIZED, NULL, d);
++  } else {
++    //using redis, and it's not ready yet
++    if(d->sub->fn->release(d->sub, 0) == NGX_OK) {
++      d->reserved = 0;
++      nchan_respond_status(d->sub->request, NGX_HTTP_SERVICE_UNAVAILABLE, NULL, NULL, 0);
++    }
++    subscribe_data_free(d);
+   }
+   return NGX_OK;
+ }
+@@ -2120,7 +2148,7 @@ static ngx_int_t nchan_store_subscribe(ngx_str_t *channel_id, subscriber_t *sub)
+ static ngx_int_t nchan_store_subscribe_channel_existence_check_callback(ngx_int_t channel_status, void* _, subscribe_data_t *d) {
+   if(d->sub->fn->release(d->sub, 0) == NGX_OK) {
+     d->reserved = 0;
+-    return nchan_store_subscribe_continued(channel_status, _, d);
++    return nchan_store_subscribe_stage3(channel_status, _, d);
+   }
+   else {//don't go any further, the sub has been deleted
+     subscribe_data_free(d);
+@@ -2143,7 +2171,7 @@ static ngx_int_t redis_subscribe_channel_existence_callback(ngx_int_t status, vo
+     /*
+     else if (cf->max_channel_subscribers > 0) {
+       // don't check this anymore -- a total subscribers count check is less
+-      // useful as a per-instance check, which is handled in nchan_store_subscribe_continued
++      // useful as a per-instance check, which is handled in nchan_store_subscribe_stage3
+       // shared total subscriber count check can be re-enabled with another config setting
+       channel_status = channel->subscribers >= cf->max_channel_subscribers ? SUB_CHANNEL_UNAUTHORIZED : SUB_CHANNEL_AUTHORIZED;
+     }
+@@ -2152,7 +2180,7 @@ static ngx_int_t redis_subscribe_channel_existence_callback(ngx_int_t status, vo
+       channel_status = SUB_CHANNEL_AUTHORIZED;
+ 
+     }
+-    nchan_store_subscribe_continued(channel_status, NULL, data);
++    nchan_store_subscribe_stage3(channel_status, NULL, data);
+   }
+   else {
+     //error!!
+@@ -2196,7 +2224,7 @@ static ngx_int_t group_subscribe_channel_limit_reached(ngx_int_t rc, nchan_chann
+   if(d->sub->status != DEAD) {
+     if(chaninfo) {
+       //ok, channel already exists.
+-      nchan_store_subscribe_continued(SUB_CHANNEL_AUTHORIZED, NULL, d);
++      nchan_store_subscribe_stage3(SUB_CHANNEL_AUTHORIZED, NULL, d);
+     }
+     else {
+       //nope. no channel, no subscribing.
+@@ -2219,14 +2247,14 @@ static ngx_int_t group_subscribe_channel_limit_check(ngx_int_t _, nchan_group_t
+     if(shm_group) {
+       if(!shm_group->limit.channels || (shm_group->channels < shm_group->limit.channels)) {
+         d->group_channel_limit_pass = 1;
+-        rc = nchan_store_subscribe_continued(SUB_CHANNEL_AUTHORIZED, NULL, d);
++        rc = nchan_store_subscribe_stage3(SUB_CHANNEL_AUTHORIZED, NULL, d);
+       }
+       else if (shm_group->limit.channels && shm_group->channels == shm_group->limit.channels){
+         //no new channels!
+         rc = nchan_store_find_channel(d->channel_id, d->sub->cf, (callback_pt )group_subscribe_channel_limit_reached, d);
+       }
+       else {
+-        rc = nchan_store_subscribe_continued(SUB_CHANNEL_UNAUTHORIZED, NULL, d);
++        rc = nchan_store_subscribe_stage3(SUB_CHANNEL_UNAUTHORIZED, NULL, d);
+       }
+       
+     }
+@@ -2246,7 +2274,7 @@ static ngx_int_t group_subscribe_channel_limit_check(ngx_int_t _, nchan_group_t
+   return rc;
+ }
+ 
+-static ngx_int_t nchan_store_subscribe_continued(ngx_int_t channel_status, void* _, subscribe_data_t *d) {
++static ngx_int_t nchan_store_subscribe_stage3(ngx_int_t channel_status, void* _, subscribe_data_t *d) {
+   memstore_channel_head_t       *chanhead = NULL;
+   int                            retry_null_chanhead = 1;
+   //store_message_t             *chmsg;
diff --git a/main/nginx/nginx-upload-module~fix-nginx-compat.patch b/main/nginx/nginx-upload-module~fix-nginx-compat.patch
new file mode 100644
index 00000000000..474a84fec4b
--- /dev/null
+++ b/main/nginx/nginx-upload-module~fix-nginx-compat.patch
@@ -0,0 +1,40 @@
+Patch-Source: https://github.com/fdintino/nginx-upload-module/commit/96e64603dc5a588a2d1ae59a62b0019d6b41070c
+--
+From 96e64603dc5a588a2d1ae59a62b0019d6b41070c Mon Sep 17 00:00:00 2001
+From: Karthikdasari0423 <92445174+Karthikdasari0423@users.noreply.github.com>
+Date: Thu, 22 Jun 2023 01:40:07 +0530
+Subject: [PATCH] Update ngx_http_upload_module.c (#147)
+
+* Update ngx_http_upload_module.c
+
+* Fix whitespace
+
+---------
+
+Co-authored-by: Frankie Dintino <fdintino@gmail.com>
+---
+ ngx_http_upload_module.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ngx_http_upload_module.c b/ngx_http_upload_module.c
+index c51429f..66150f0 100644
+--- a/ngx_http_upload_module.c
++++ b/ngx_http_upload_module.c
+@@ -12,7 +12,7 @@
+ 
+ #include <ngx_md5.h>
+ 
+-typedef ngx_md5_t MD5_CTX;
++typedef ngx_md5_t MD5_CTX1;
+ 
+ #define MD5Init ngx_md5_init
+ #define MD5Update ngx_md5_update
+@@ -189,7 +189,7 @@ typedef struct {
+ } ngx_http_upload_loc_conf_t;
+ 
+ typedef struct ngx_http_upload_md5_ctx_s {
+-    MD5_CTX     md5;
++    MD5_CTX1    md5;
+     u_char      md5_digest[MD5_DIGEST_LENGTH * 2];
+ } ngx_http_upload_md5_ctx_t;
+ 
diff --git a/main/nginx/nginx-upload-module~fixes.patch b/main/nginx/nginx-upload-module~fixes.patch
new file mode 100644
index 00000000000..423647d8089
--- /dev/null
+++ b/main/nginx/nginx-upload-module~fixes.patch
@@ -0,0 +1,620 @@
+git diff 2.3.0..643b4c1fa6993da6bc1f82e7121ca62a7696ee6b ngx_http_upload_module.c
+--
+commit 643b4c1fa6993da6bc1f82e7121ca62a7696ee6b
+Author: Frankie Dintino <fdintino@gmail.com>
+Date:   Sun Jun 21 17:09:17 2020 -0400
+
+    Fix bug caused by uploading a single byte range
+
+    fixes #115
+
+commit 1ac57ac4d37bfb0c09337f2eef3fab5a1c1e9a38
+Author: Romain Pomier <romain@cardiologs.com>
+Date:   Wed Apr 8 18:42:38 2020 +0200
+
+    Handle quotes problems in Content-Type and Content-Disposition
+
+commit 1b0c530a3abf5c8782feabcfa2e89a312687f968
+Author: Frankie Dintino <fdintino@gmail.com>
+Date:   Mon Feb 10 12:48:52 2020 -0500
+
+    Fix issue where upload headers were only added to final request
+
+    fixes #124
+
+commit a350ce9d6814438db56428ad6365db994dbd27f6
+Author: Valery Kholodkov <valery@coldrift.com>
+Date:   Mon Nov 18 18:04:55 2019 +0100
+
+    Update read handler
+
+commit 8d50edd32ae788c3e0c12fe1940007e9faa3f15d
+Author: Demid Rudak <demid.r@didww.com>
+Date:   Mon Apr 1 15:37:52 2019 +0300
+
+    Fixed upload_aggregate_form_field 'upload_file_md5' calculation
+
+commit 666428bf8ea3ee3e5bd40aaa693624234feb6da3
+Author: Frankie Dintino <fdintino@gmail.com>
+Date:   Fri Aug 10 11:39:01 2018 -0400
+
+    Fix and add tests for upload_add_header
+
+commit e8d93f8f37db62f2588c7b3a20c873514fce4f5d
+Author: Frankie Dintino <fdintino@gmail.com>
+Date:   Fri Aug 10 11:35:16 2018 -0400
+
+    Remove unnecessary ngx_http_upload_variable_set function
+
+commit 9c58c8ae9b3f4d44a28eebdffbdc1ab4224e3f90
+Author: Frankie Dintino <fdintino@gmail.com>
+Date:   Mon Aug 6 09:38:52 2018 -0400
+
+    Fix bug when uc and lc hash aggregate fields present in the same request
+--
+diff --git a/ngx_http_upload_module.c b/ngx_http_upload_module.c
+index 3ac3279..c51429f 100644
+--- a/ngx_http_upload_module.c
++++ b/ngx_http_upload_module.c
+@@ -55,8 +55,8 @@ typedef ngx_md5_t MD5_CTX;
+ #define X_SESSION_ID_STRING                     "X-Session-ID:"
+ #define FORM_DATA_STRING                        "form-data"
+ #define ATTACHMENT_STRING                       "attachment"
+-#define FILENAME_STRING                         "filename=\""
+-#define FIELDNAME_STRING                        "name=\""
++#define FILENAME_STRING                         "filename="
++#define FIELDNAME_STRING                        "name="
+ #define BYTES_UNIT_STRING                       "bytes "
+ 
+ #define NGX_UPLOAD_MALFORMED    -11
+@@ -302,8 +302,6 @@ static void *ngx_http_upload_create_loc_conf(ngx_conf_t *cf);
+ static char *ngx_http_upload_merge_loc_conf(ngx_conf_t *cf,
+     void *parent, void *child);
+ static ngx_int_t ngx_http_upload_add_variables(ngx_conf_t *cf);
+-static void ngx_http_upload_variable_set(ngx_http_request_t *r,
+-    ngx_http_variable_value_t *v, uintptr_t data);
+ static ngx_int_t ngx_http_upload_variable(ngx_http_request_t *r,
+     ngx_http_variable_value_t *v, uintptr_t data);
+ static ngx_int_t ngx_http_upload_md5_variable(ngx_http_request_t *r,
+@@ -326,6 +324,10 @@ static ngx_int_t ngx_http_upload_uint_variable(ngx_http_request_t *r,
+     ngx_http_variable_value_t *v, uintptr_t data);
+ static char *ngx_http_upload_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+ 
++static ngx_int_t
++ngx_http_upload_process_field_templates(ngx_http_request_t *r,
++    ngx_http_upload_field_template_t *t, ngx_str_t *field_name, ngx_str_t *field_value);
++
+ static ngx_int_t ngx_http_upload_start_handler(ngx_http_upload_ctx_t *u);
+ static void ngx_http_upload_finish_handler(ngx_http_upload_ctx_t *u);
+ static void ngx_http_upload_abort_handler(ngx_http_upload_ctx_t *u);
+@@ -345,9 +347,7 @@ static ngx_int_t ngx_http_read_upload_client_request_body(ngx_http_request_t *r)
+ 
+ static char *ngx_http_upload_set_form_field(ngx_conf_t *cf, ngx_command_t *cmd,
+     void *conf);
+-static char *ngx_http_upload_add_header(ngx_conf_t *cf, ngx_command_t *cmd,
+-    void *conf);
+-static ngx_int_t ngx_http_upload_eval_path(ngx_http_request_t *r);
++    static ngx_int_t ngx_http_upload_eval_path(ngx_http_request_t *r);
+ static ngx_int_t ngx_http_upload_eval_state_path(ngx_http_request_t *r);
+ static char *ngx_http_upload_pass_form_field(ngx_conf_t *cf, ngx_command_t *cmd,
+     void *conf);
+@@ -666,7 +666,7 @@ static ngx_command_t  ngx_http_upload_commands[] = { /* {{{ */
+     { ngx_string("upload_add_header"),
+       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LMT_CONF|NGX_HTTP_LIF_CONF
+                         |NGX_CONF_TAKE2,
+-      ngx_http_upload_add_header,
++      ngx_http_upload_set_form_field,
+       NGX_HTTP_LOC_CONF_OFFSET,
+       offsetof(ngx_http_upload_loc_conf_t, header_templates),
+       NULL},
+@@ -710,7 +710,7 @@ static ngx_http_variable_t  ngx_http_upload_variables[] = { /* {{{ */
+       NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
+ 
+     { ngx_string("upload_content_type"),
+-      ngx_http_upload_variable_set,
++      NULL,
+       ngx_http_upload_variable,
+       (uintptr_t) offsetof(ngx_http_upload_ctx_t, content_type),
+       NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
+@@ -1052,18 +1052,14 @@ err:
+ static ngx_int_t ngx_http_upload_add_headers(ngx_http_request_t *r, ngx_http_upload_loc_conf_t *ulcf) { /* {{{ */
+     ngx_str_t                            name;
+     ngx_str_t                            value;
+-    ngx_http_upload_header_template_t    *t;
++    ngx_http_upload_field_template_t     *t;
+     ngx_table_elt_t                      *h;
+     ngx_uint_t                           i;
+ 
+-    if(ulcf->header_templates != NULL) {
++    if (ulcf->header_templates != NULL) {
+         t = ulcf->header_templates->elts;
+-        for(i = 0; i < ulcf->header_templates->nelts; i++) {
+-            if(ngx_http_complex_value(r, t->name, &name) != NGX_OK) {
+-                return NGX_ERROR;
+-            }
+-
+-            if(ngx_http_complex_value(r, t->value, &value) != NGX_OK) {
++        for (i = 0; i < ulcf->header_templates->nelts; i++) {
++            if (ngx_http_upload_process_field_templates(r, &t[i], &name, &value) != NGX_OK) {
+                 return NGX_ERROR;
+             }
+ 
+@@ -1079,8 +1075,6 @@ static ngx_int_t ngx_http_upload_add_headers(ngx_http_request_t *r, ngx_http_upl
+                 h->value.len = value.len;
+                 h->value.data = value.data;
+             }
+-
+-            t++;
+         }
+     }
+ 
+@@ -1180,10 +1174,6 @@ static ngx_int_t ngx_http_upload_body_handler(ngx_http_request_t *r) { /* {{{ */
+     ngx_str_t                   dummy = ngx_string("<ngx_upload_module_dummy>");
+     ngx_table_elt_t             *h;
+ 
+-    if(ngx_http_upload_add_headers(r, ulcf) != NGX_OK) {
+-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+-    }
+-
+     if(ctx->prevent_output) {
+         r->headers_out.status = NGX_HTTP_CREATED;
+ 
+@@ -1360,6 +1350,27 @@ static ngx_int_t ngx_http_upload_body_handler(ngx_http_request_t *r) { /* {{{ */
+     return rc;
+ } /* }}} */
+ 
++static ngx_int_t
++ngx_http_upload_process_field_templates(
++    ngx_http_request_t *r, ngx_http_upload_field_template_t *t,
++    ngx_str_t *name, ngx_str_t *value)
++{
++    if (t->field_lengths == NULL) {
++        *name = t->value.key;
++    } else if (ngx_http_script_run(r, name, t->field_lengths->elts, 0,
++                                   t->field_values->elts) == NULL) {
++        return NGX_UPLOAD_SCRIPTERROR;
++    }
++
++    if (t->value_lengths == NULL) {
++        *value = t->value.value;
++    } else if (ngx_http_script_run(r, value, t->value_lengths->elts, 0,
++                                   t->value_values->elts) == NULL) {
++            return NGX_UPLOAD_SCRIPTERROR;
++    }
++    return NGX_OK;
++}
++
+ static ngx_int_t ngx_http_upload_start_handler(ngx_http_upload_ctx_t *u) { /* {{{ */
+     ngx_http_request_t        *r = u->request;
+     ngx_http_upload_loc_conf_t  *ulcf = ngx_http_get_module_loc_conf(r, ngx_http_upload_module);
+@@ -1495,28 +1506,10 @@ static ngx_int_t ngx_http_upload_start_handler(ngx_http_upload_ctx_t *u) { /* {{
+ 
+             t = ulcf->field_templates->elts;
+             for (i = 0; i < ulcf->field_templates->nelts; i++) {
++                rc = ngx_http_upload_process_field_templates(r, &t[i], &field_name, &field_value);
+ 
+-                if (t[i].field_lengths == NULL) {
+-                    field_name = t[i].value.key;
+-                }else{
+-                    if (ngx_http_script_run(r, &field_name, t[i].field_lengths->elts, 0,
+-                        t[i].field_values->elts) == NULL)
+-                    {
+-                        rc = NGX_UPLOAD_SCRIPTERROR;
+-                        goto cleanup_file;
+-                    }
+-                }
+-
+-                if (t[i].value_lengths == NULL) {
+-                    field_value = t[i].value.value;
+-                }else{
+-                    if (ngx_http_script_run(r, &field_value, t[i].value_lengths->elts, 0,
+-                        t[i].value_values->elts) == NULL)
+-                    {
+-                        rc = NGX_UPLOAD_SCRIPTERROR;
+-                        goto cleanup_file;
+-                    }
+-                }
++                if(rc != NGX_OK)
++                    goto cleanup_file;
+ 
+                 rc = ngx_http_upload_append_field(u, &field_name, &field_value);
+ 
+@@ -1603,6 +1596,11 @@ static ngx_int_t ngx_http_upload_start_handler(ngx_http_upload_ctx_t *u) { /* {{
+             u->discard_data = 1;
+     }
+ 
++
++    if(ngx_http_upload_add_headers(r, ulcf) != NGX_OK) {
++        return NGX_HTTP_INTERNAL_SERVER_ERROR;
++    }
++
+     return NGX_OK;
+ 
+ cleanup_file:
+@@ -1697,25 +1695,10 @@ static void ngx_http_upload_finish_handler(ngx_http_upload_ctx_t *u) { /* {{{ */
+         if(ulcf->aggregate_field_templates) {
+             af = ulcf->aggregate_field_templates->elts;
+             for (i = 0; i < ulcf->aggregate_field_templates->nelts; i++) {
+-
+-                if (af[i].field_lengths == NULL) {
+-                    aggregate_field_name = af[i].value.key;
+-                }else{
+-                    if (ngx_http_script_run(r, &aggregate_field_name, af[i].field_lengths->elts, 0,
+-                        af[i].field_values->elts) == NULL)
+-                    {
+-                        goto rollback;
+-                    }
+-                }
+-
+-                if (af[i].value_lengths == NULL) {
+-                    aggregate_field_value = af[i].value.value;
+-                }else{
+-                    if (ngx_http_script_run(r, &aggregate_field_value, af[i].value_lengths->elts, 0,
+-                        af[i].value_values->elts) == NULL)
+-                    {
+-                        goto rollback;
+-                    }
++                rc = ngx_http_upload_process_field_templates(r, &af[i], &aggregate_field_name,
++                                                             &aggregate_field_value);
++                if (rc != NGX_OK) {
++                    goto rollback;
+                 }
+ 
+                 rc = ngx_http_upload_append_field(u, &aggregate_field_name, &aggregate_field_value);
+@@ -2001,7 +1984,7 @@ ngx_http_upload_buf_merge_range(ngx_http_upload_merger_state_t *ms, ngx_http_upl
+                     return NGX_ERROR;
+                 }
+ 
+-                if(ms->current_range_n.start >= ms->current_range_n.end || ms->current_range_n.start >= ms->current_range_n.total
++                if(ms->current_range_n.start > ms->current_range_n.end || ms->current_range_n.start > ms->current_range_n.total
+                     || ms->current_range_n.end > ms->current_range_n.total)
+                 {
+                     ngx_log_debug3(NGX_LOG_DEBUG_CORE, ms->log, 0,
+@@ -2398,21 +2381,6 @@ ngx_http_upload_add_variables(ngx_conf_t *cf)
+     return NGX_OK;
+ } /* }}} */
+ 
+-static void /* {{{ ngx_http_upload_variable_set */
+-ngx_http_upload_variable_set(ngx_http_request_t *r,
+-    ngx_http_variable_value_t *v, uintptr_t data)
+-{
+-    ngx_str_t  *s;
+-    ngx_http_upload_ctx_t  *u;
+-
+-    u = ngx_http_get_module_ctx(r, ngx_http_upload_module);
+-
+-    s = (ngx_str_t *) ((char *) u + data);
+-
+-    s->len = v->len;
+-    s->data = v->data;
+-} /* }}} */
+-
+ static ngx_int_t /* {{{ ngx_http_upload_variable */
+ ngx_http_upload_variable(ngx_http_request_t *r,
+     ngx_http_variable_value_t *v, uintptr_t data)
+@@ -2434,88 +2402,78 @@ ngx_http_upload_variable(ngx_http_request_t *r,
+     return NGX_OK;
+ } /* }}} */
+ 
+-static ngx_int_t /* {{{ ngx_http_upload_md5_variable */
+-ngx_http_upload_md5_variable(ngx_http_request_t *r,
+-    ngx_http_variable_value_t *v,  uintptr_t data)
++static ngx_int_t
++ngx_http_upload_hash_variable(ngx_http_request_t *r,
++    ngx_http_variable_value_t *v, uintptr_t data, u_char *digest,
++    ngx_uint_t digest_len)
+ {
+     ngx_uint_t             i;
+-    ngx_http_upload_ctx_t  *u;
+     u_char                 *c;
++    u_char                 *p;
+     u_char                 *hex_table;
+ 
+-    u = ngx_http_get_module_ctx(r, ngx_http_upload_module);
+-
+-    if(u->md5_ctx == NULL || u->partial_content) {
+-        v->not_found = 1;
+-        return NGX_OK;
+-    }
+-
+     v->valid = 1;
+     v->no_cacheable = 0;
+     v->not_found = 0;
+ 
+     hex_table = (u_char*)data;
+-    c = u->md5_ctx->md5_digest + MD5_DIGEST_LENGTH * 2;
+ 
+-    i = MD5_DIGEST_LENGTH;
++    p = ngx_palloc(r->pool, digest_len * 2);
++    if (p == NULL) {
++        return NGX_ERROR;
++    }
++
++    c = p + digest_len * 2;
++    i = digest_len;
+ 
+     do{
+         i--;
+-        *--c = hex_table[u->md5_ctx->md5_digest[i] & 0xf];
+-        *--c = hex_table[u->md5_ctx->md5_digest[i] >> 4];
++        *--c = hex_table[digest[i] & 0xf];
++        *--c = hex_table[digest[i] >> 4];
+     }while(i != 0);
+ 
+-    v->data = u->md5_ctx->md5_digest;
+-    v->len = MD5_DIGEST_LENGTH * 2;
++    v->data = c;
++    v->len = digest_len * 2;
+ 
+     return NGX_OK;
+ } /* }}} */
+ 
+-static ngx_int_t /* {{{ ngx_http_upload_sha1_variable */
+-ngx_http_upload_sha1_variable(ngx_http_request_t *r,
++static ngx_int_t /* {{{ ngx_http_upload_md5_variable */
++ngx_http_upload_md5_variable(ngx_http_request_t *r,
+     ngx_http_variable_value_t *v,  uintptr_t data)
+ {
+-    ngx_uint_t             i;
+     ngx_http_upload_ctx_t  *u;
+-    u_char                 *c;
+-    u_char                 *hex_table;
+ 
+     u = ngx_http_get_module_ctx(r, ngx_http_upload_module);
+ 
+-    if(u->sha1_ctx == NULL || u->partial_content) {
++    if(u->md5_ctx == NULL || u->partial_content) {
+         v->not_found = 1;
+         return NGX_OK;
+     }
++    return ngx_http_upload_hash_variable(r, v, data, u->md5_ctx->md5_digest, MD5_DIGEST_LENGTH);
++} /* }}} */
+ 
+-    v->valid = 1;
+-    v->no_cacheable = 0;
+-    v->not_found = 0;
+-
+-    hex_table = (u_char*)data;
+-    c = u->sha1_ctx->sha1_digest + SHA_DIGEST_LENGTH * 2;
+-
+-    i = SHA_DIGEST_LENGTH;
++static ngx_int_t /* {{{ ngx_http_upload_sha1_variable */
++ngx_http_upload_sha1_variable(ngx_http_request_t *r,
++    ngx_http_variable_value_t *v,  uintptr_t data)
++{
++    ngx_http_upload_ctx_t  *u;
+ 
+-    do{
+-        i--;
+-        *--c = hex_table[u->sha1_ctx->sha1_digest[i] & 0xf];
+-        *--c = hex_table[u->sha1_ctx->sha1_digest[i] >> 4];
+-    }while(i != 0);
++    u = ngx_http_get_module_ctx(r, ngx_http_upload_module);
+ 
+-    v->data = u->sha1_ctx->sha1_digest;
+-    v->len = SHA_DIGEST_LENGTH * 2;
++    if(u->sha1_ctx == NULL || u->partial_content) {
++        v->not_found = 1;
++        return NGX_OK;
++    }
+ 
+-    return NGX_OK;
++    return ngx_http_upload_hash_variable(r, v, data, u->sha1_ctx->sha1_digest, SHA_DIGEST_LENGTH);
+ } /* }}} */
+ 
+ static ngx_int_t /* {{{ ngx_http_upload_sha256_variable */
+ ngx_http_upload_sha256_variable(ngx_http_request_t *r,
+     ngx_http_variable_value_t *v,  uintptr_t data)
+ {
+-    ngx_uint_t             i;
+     ngx_http_upload_ctx_t  *u;
+-    u_char                 *c;
+-    u_char                 *hex_table;
+ 
+     u = ngx_http_get_module_ctx(r, ngx_http_upload_module);
+ 
+@@ -2524,35 +2482,14 @@ ngx_http_upload_sha256_variable(ngx_http_request_t *r,
+         return NGX_OK;
+     }
+ 
+-    v->valid = 1;
+-    v->no_cacheable = 0;
+-    v->not_found = 0;
+-
+-    hex_table = (u_char*)data;
+-    c = u->sha256_ctx->sha256_digest + SHA256_DIGEST_LENGTH * 2;
+-
+-    i = SHA256_DIGEST_LENGTH;
+-
+-    do{
+-        i--;
+-        *--c = hex_table[u->sha256_ctx->sha256_digest[i] & 0xf];
+-        *--c = hex_table[u->sha256_ctx->sha256_digest[i] >> 4];
+-    }while(i != 0);
+-
+-    v->data = u->sha256_ctx->sha256_digest;
+-    v->len = SHA256_DIGEST_LENGTH * 2;
+-
+-    return NGX_OK;
++    return ngx_http_upload_hash_variable(r, v, data, u->sha256_ctx->sha256_digest, SHA256_DIGEST_LENGTH);
+ } /* }}} */
+ 
+ static ngx_int_t /* {{{ ngx_http_upload_sha512_variable */
+ ngx_http_upload_sha512_variable(ngx_http_request_t *r,
+     ngx_http_variable_value_t *v,  uintptr_t data)
+ {
+-    ngx_uint_t             i;
+     ngx_http_upload_ctx_t  *u;
+-    u_char                 *c;
+-    u_char                 *hex_table;
+ 
+     u = ngx_http_get_module_ctx(r, ngx_http_upload_module);
+ 
+@@ -2561,25 +2498,7 @@ ngx_http_upload_sha512_variable(ngx_http_request_t *r,
+         return NGX_OK;
+     }
+ 
+-    v->valid = 1;
+-    v->no_cacheable = 0;
+-    v->not_found = 0;
+-
+-    hex_table = (u_char*)data;
+-    c = u->sha512_ctx->sha512_digest + SHA512_DIGEST_LENGTH * 2;
+-
+-    i = SHA512_DIGEST_LENGTH;
+-
+-    do{
+-        i--;
+-        *--c = hex_table[u->sha512_ctx->sha512_digest[i] & 0xf];
+-        *--c = hex_table[u->sha512_ctx->sha512_digest[i] >> 4];
+-    }while(i != 0);
+-
+-    v->data = u->sha512_ctx->sha512_digest;
+-    v->len = SHA512_DIGEST_LENGTH * 2;
+-
+-    return NGX_OK;
++    return ngx_http_upload_hash_variable(r, v, data, u->sha512_ctx->sha512_digest, SHA512_DIGEST_LENGTH);
+ } /* }}} */
+ 
+ static ngx_int_t /* {{{ ngx_http_upload_crc32_variable */
+@@ -2922,73 +2841,6 @@ ngx_http_upload_pass_form_field(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+     return NGX_CONF_OK;
+ } /* }}} */
+ 
+-static char * /* {{{ ngx_http_upload_add_header */
+-ngx_http_upload_add_header(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+-{
+-    ngx_str_t                  *value;
+-    ngx_http_upload_header_template_t *h;
+-    ngx_array_t                 **field;
+-    ngx_http_compile_complex_value_t   ccv;
+-
+-    field = (ngx_array_t**) (((u_char*)conf) + cmd->offset);
+-
+-    value = cf->args->elts;
+-
+-    /*
+-     * Add new entry to header template list
+-     */
+-    if (*field == NULL) {
+-        *field = ngx_array_create(cf->pool, 1,
+-                                  sizeof(ngx_http_upload_header_template_t));
+-        if (*field == NULL) {
+-            return NGX_CONF_ERROR;
+-        }
+-    }
+-
+-    h = ngx_array_push(*field);
+-    if (h == NULL) {
+-        return NGX_CONF_ERROR;
+-    }
+-
+-    /*
+-     * Compile header name
+-     */
+-    h->name = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
+-    if(h->name == NULL) {
+-        return NGX_CONF_ERROR;
+-    }
+-
+-    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+-
+-    ccv.cf = cf;
+-    ccv.value = &value[1];
+-    ccv.complex_value = h->name;
+-
+-    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+-        return NGX_CONF_ERROR;
+-    }
+-
+-    /*
+-     * Compile header value
+-     */
+-    h->value = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
+-    if(h->value == NULL) {
+-        return NGX_CONF_ERROR;
+-    }
+-
+-    ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+-
+-    ccv.cf = cf;
+-    ccv.value = &value[2];
+-    ccv.complex_value = h->value;
+-
+-    if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+-        return NGX_CONF_ERROR;
+-    }
+-
+-    return NGX_CONF_OK;
+-} /* }}} */
+-
+ static char * /* {{{ ngx_http_upload_cleanup */
+ ngx_http_upload_cleanup(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+ {
+@@ -3599,6 +3451,8 @@ ngx_http_do_read_upload_client_request_body(ngx_http_request_t *r)
+         ngx_del_timer(c->read);
+     }
+ 
++    r->read_event_handler = ngx_http_block_reading;
++
+     rc = ngx_http_process_request_body(r, u->to_write);
+ 
+     switch(rc) {
+@@ -3667,16 +3521,14 @@ static ngx_int_t upload_parse_content_disposition(ngx_http_upload_ctx_t *upload_
+ 
+     if(filename_start != 0) {
+         
+-        filename_start += sizeof(FILENAME_STRING)-1;
+-
+-        filename_end = filename_start + strcspn(filename_start, "\"");
++        filename_start += sizeof(FILENAME_STRING) - 1;
+ 
+-        if(*filename_end != '\"') {
+-            ngx_log_debug0(NGX_LOG_DEBUG_CORE, upload_ctx->log, 0,
+-                           "malformed filename in part header");
+-            return NGX_UPLOAD_MALFORMED;
++        if (*filename_start == '\"') {
++            filename_start++;
+         }
+ 
++        filename_end = filename_start + strcspn(filename_start, "\";");
++
+         /*
+          * IE sends full path, strip path from filename 
+          * Also strip all UNIX path references
+@@ -3703,16 +3555,14 @@ static ngx_int_t upload_parse_content_disposition(ngx_http_upload_ctx_t *upload_
+ //    }while((fieldname_start != 0) && (fieldname_start + sizeof(FIELDNAME_STRING) - 1 == filename_start));
+ 
+     if(fieldname_start != 0) {
+-        fieldname_start += sizeof(FIELDNAME_STRING)-1;
++        fieldname_start += sizeof(FIELDNAME_STRING) - 1;
+ 
+-        if(fieldname_start != filename_start) {
+-            fieldname_end = fieldname_start + strcspn(fieldname_start, "\"");
++        if (*fieldname_start == '\"') {
++            fieldname_start++;
++        }
+ 
+-            if(*fieldname_end != '\"') {
+-                ngx_log_error(NGX_LOG_ERR, upload_ctx->log, 0,
+-                               "malformed fieldname in part header");
+-                return NGX_UPLOAD_MALFORMED;
+-            }
++        if(fieldname_start != filename_start) {
++            fieldname_end = fieldname_start + strcspn(fieldname_start, "\";");
+ 
+             upload_ctx->field_name.len = fieldname_end - fieldname_start;
+             upload_ctx->field_name.data = ngx_pcalloc(upload_ctx->request->pool, upload_ctx->field_name.len + 1);
+@@ -4087,6 +3937,12 @@ static ngx_int_t upload_parse_request_headers(ngx_http_upload_ctx_t *upload_ctx,
+         boundary_start_ptr += sizeof(BOUNDARY_STRING) - 1;
+         boundary_end_ptr = boundary_start_ptr + strcspn((char*)boundary_start_ptr, " ;\n\r");
+ 
++        // Handle quoted boundaries
++        if ((boundary_end_ptr - boundary_start_ptr) >= 2 && boundary_start_ptr[0] == '"' && *(boundary_end_ptr - 1) == '"') {
++          boundary_start_ptr++;
++          boundary_end_ptr--;
++        }
++
+         if(boundary_end_ptr == boundary_start_ptr) {
+             ngx_log_debug0(NGX_LOG_DEBUG_CORE, upload_ctx->log, 0,
+                            "boundary is empty");
diff --git a/main/nginx/nginx-upload-progress-module~fix-http2.patch b/main/nginx/nginx-upload-progress-module~fix-http2.patch
new file mode 100644
index 00000000000..9886e1d7f09
--- /dev/null
+++ b/main/nginx/nginx-upload-progress-module~fix-http2.patch
@@ -0,0 +1,44 @@
+Patch-Source: https://github.com/masterzen/nginx-upload-progress-module/pull/57
+--
+From 594f1233c3c622ad51a2bde0c3289747af20e245 Mon Sep 17 00:00:00 2001
+From: Allan Jude <allanjude@freebsd.org>
+Date: Sat, 26 Nov 2022 20:28:10 +0000
+Subject: [PATCH] Restore functionality of upload-progress for HTTP2
+
+The upload-progress module was only getting notified of the first
+block of uploaded data, because r->read_event_handler was being
+reset by ngx_http_v2_read_request_body() and
+ngx_http_v2_process_request_body()
+
+The patch detects that situation, updates module_ctx to call the
+new function, then reinserts itself as the read_event_handler so
+we continue to be notified about uploaded data.
+
+Introduced in nginx/nginx@67d160bf25e02ba6679bb6c3b9cbdfeb29b759de
+
+Sponsored-by:	ScaleEngine Inc.
+---
+ ngx_http_uploadprogress_module.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/ngx_http_uploadprogress_module.c b/ngx_http_uploadprogress_module.c
+index 33bdaf7..f17ad92 100644
+--- a/ngx_http_uploadprogress_module.c
++++ b/ngx_http_uploadprogress_module.c
+@@ -489,6 +489,16 @@ static void ngx_http_uploadprogress_event_handler(ngx_http_request_t *r)
+     module_ctx = ngx_http_get_module_ctx(r, ngx_http_uploadprogress_module);
+     if (module_ctx != NULL ) {
+         module_ctx->read_event_handler(r);
++        /*
++         * Both ngx_http_v2_read_request_body() and
++         * ngx_http_v2_process_request_body() modify read_event_handler,
++         * we respect the change, but re-interpose our function so we still get
++         * future events, otherwise we miss all upload progress.
++         */
++        if (r->read_event_handler != ngx_http_uploadprogress_event_handler) {
++            module_ctx->read_event_handler = r->read_event_handler;
++            r->read_event_handler = ngx_http_uploadprogress_event_handler;
++        }
+     }
+ 
+     /* at this stage, r is not anymore safe to use */
diff --git a/main/nginx/nginx-upload-progress-module~fix.patch b/main/nginx/nginx-upload-progress-module~fix.patch
new file mode 100644
index 00000000000..7d5fd1bde6d
--- /dev/null
+++ b/main/nginx/nginx-upload-progress-module~fix.patch
@@ -0,0 +1,937 @@
+Patch-Source: https://github.com/masterzen/nginx-upload-progress-module/compare/master...msva:nginx-upload-progress-module:master
+
+Ref https://github.com/masterzen/nginx-upload-progress-module/issues/56
+
+diff --git a/ngx_http_uploadprogress_module.c b/ngx_http_uploadprogress_module.c
+index 33bdaf7..577c146 100644
+--- a/ngx_http_uploadprogress_module.c
++++ b/ngx_http_uploadprogress_module.c
+@@ -8,6 +8,7 @@
+ #include <ngx_core.h>
+ #include <ngx_http.h>
+ 
++
+ #define TIMER_FREQUENCY 15 * 1000
+ 
+ typedef enum {
+@@ -31,6 +32,8 @@ struct ngx_http_uploadprogress_node_s {
+     off_t                            rest;
+     off_t                            length;
+     ngx_uint_t                       done;
++    ngx_uint_t                       sequence;
++    ngx_uint_t                       sent_portion;
+     time_t                           timeout;
+     struct ngx_http_uploadprogress_node_s *prev;
+     struct ngx_http_uploadprogress_node_s *next;
+@@ -65,7 +68,13 @@ typedef struct {
+     ngx_str_t                        content_type;
+     ngx_array_t                      templates;
+     ngx_str_t                        header;
++    ngx_str_t                        header_mul;
++
++    ngx_addr_t                       progress_server;
++    int                              udp_socket;
++
+     ngx_str_t                        jsonp_parameter;
++    ngx_int_t                        json_multiple:1;
+ } ngx_http_uploadprogress_conf_t;
+ 
+ typedef struct {
+@@ -87,6 +96,8 @@ static ngx_int_t ngx_http_uploadprogress_offset_variable(ngx_http_request_t *r,
+     ngx_http_variable_value_t *v, uintptr_t data);
+ static ngx_int_t ngx_http_uploadprogress_status_variable(ngx_http_request_t *r,
+     ngx_http_variable_value_t *v, uintptr_t data);
++static ngx_int_t ngx_http_uploadprogress_id_variable(ngx_http_request_t *r,
++    ngx_http_variable_value_t *v, uintptr_t data);
+ static ngx_int_t ngx_http_uploadprogress_callback_variable(ngx_http_request_t *r,
+     ngx_http_variable_value_t *v, uintptr_t data);
+ static char* ngx_http_upload_progress_set_template(ngx_conf_t * cf, ngx_http_uploadprogress_template_t *t, ngx_str_t *source);
+@@ -97,6 +108,8 @@ static char* ngx_http_upload_progress_template(ngx_conf_t * cf, ngx_command_t *
+ static char* ngx_http_upload_progress_java_output(ngx_conf_t * cf, ngx_command_t * cmd, void *conf);
+ static char* ngx_http_upload_progress_json_output(ngx_conf_t * cf, ngx_command_t * cmd, void *conf);
+ static char* ngx_http_upload_progress_jsonp_output(ngx_conf_t * cf, ngx_command_t * cmd, void *conf);
++static char* ngx_http_upload_progress_json_multiple_output(ngx_conf_t * cf, ngx_command_t * cmd, void *conf);
++static char* ngx_http_upload_progress_jsonp_multiple_output(ngx_conf_t * cf, ngx_command_t * cmd, void *conf);
+ static void ngx_clean_old_connections(ngx_event_t * ev);
+ static ngx_int_t ngx_http_uploadprogress_content_handler(ngx_http_request_t *r);
+ 
+@@ -112,7 +125,7 @@ static ngx_command_t ngx_http_uploadprogress_commands[] = {
+      NULL},
+ 
+     {ngx_string("track_uploads"),
+-     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_TAKE2,
++     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_TAKE2 | NGX_CONF_TAKE3,
+      ngx_http_track_uploads,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+@@ -160,6 +173,20 @@ static ngx_command_t ngx_http_uploadprogress_commands[] = {
+      0,
+      NULL},
+ 
++    {ngx_string("upload_progress_json_multiple_output"),
++     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_NOARGS,
++     ngx_http_upload_progress_json_multiple_output,
++     NGX_HTTP_LOC_CONF_OFFSET,
++     0,
++     NULL},
++
++    {ngx_string("upload_progress_jsonp_multiple_output"),
++     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_NOARGS,
++     ngx_http_upload_progress_jsonp_multiple_output,
++     NGX_HTTP_LOC_CONF_OFFSET,
++     0,
++     NULL},
++
+     {ngx_string("upload_progress_header"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+@@ -167,6 +194,13 @@ static ngx_command_t ngx_http_uploadprogress_commands[] = {
+      offsetof(ngx_http_uploadprogress_conf_t, header),
+      NULL},
+ 
++    {ngx_string("upload_progress_header_mul"),
++     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_TAKE1,
++     ngx_conf_set_str_slot,
++     NGX_HTTP_LOC_CONF_OFFSET,
++     offsetof(ngx_http_uploadprogress_conf_t, header_mul),
++     NULL},
++
+     {ngx_string("upload_progress_jsonp_parameter"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+@@ -195,6 +229,10 @@ static ngx_http_variable_t  ngx_http_uploadprogress_variables[] = {
+       (uintptr_t) offsetof(ngx_http_uploadprogress_node_t, err_status),
+       NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
+ 
++    { ngx_string("uploadprogress_id"), NULL, ngx_http_uploadprogress_id_variable,
++      (uintptr_t) offsetof(ngx_http_uploadprogress_node_t, err_status),
++      NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
++
+     { ngx_string("uploadprogress_callback"), NULL, ngx_http_uploadprogress_callback_variable,
+       (uintptr_t) NULL,
+       NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
+@@ -261,9 +299,24 @@ static ngx_str_t ngx_http_uploadprogress_jsonp_defaults[] = {
+     ngx_string("$uploadprogress_callback({ \"state\" : \"uploading\", \"received\" : $uploadprogress_received, \"size\" : $uploadprogress_length });\r\n")
+ };
+ 
++static ngx_str_t ngx_http_uploadprogress_json_multiple_defaults[] = {
++    ngx_string("{ \"id\" : $uploadprogress_id, \"state\" : \"starting\" }"),
++    ngx_string("{ \"id\" : $uploadprogress_id, \"state\" : \"error\", \"status\" : $uploadprogress_status }"),
++    ngx_string("{ \"id\" : $uploadprogress_id, \"state\" : \"done\" }"),
++    ngx_string("{ \"id\" : $uploadprogress_id, \"state\" : \"uploading\", \"received\" : $uploadprogress_received, \"size\" : $uploadprogress_length }")
++};
++
++static ngx_str_t ngx_http_uploadprogress_jsonp_multiple_defaults[] = {
++    ngx_string("$uploadprogress_callback({ \"id\" : $uploadprogress_id, \"state\" : \"starting\" });\r\n"),
++    ngx_string("$uploadprogress_callback({ \"id\" : $uploadprogress_id, \"state\" : \"error\", \"status\" : $uploadprogress_status });\r\n"),
++    ngx_string("$uploadprogress_callback({ \"id\" : $uploadprogress_id, \"state\" : \"done\" });\r\n"),
++    ngx_string("$uploadprogress_callback({ \"id\" : $uploadprogress_id, \"state\" : \"uploading\", \"received\" : $uploadprogress_received, \"size\" : $uploadprogress_length });\r\n")
++};
++
+ 
+ static ngx_array_t ngx_http_uploadprogress_global_templates;
+ 
++
+ static ngx_str_t*
+ get_tracking_id(ngx_http_request_t * r)
+ {
+@@ -328,7 +381,7 @@ get_tracking_id(ngx_http_request_t * r)
+                 i = 1;
+                 break;
+             }
+-            if (len<=0)
++            else if (!len)
+                 break;
+         } 
+         while(p++);
+@@ -355,6 +408,97 @@ get_tracking_id(ngx_http_request_t * r)
+     return NULL;
+ }
+ 
++static ngx_str_t*
++get_tracking_ids_mul(ngx_http_request_t * r)
++{
++    u_char                          *p, *start_p;
++    ngx_uint_t                       i;
++    ngx_list_part_t                 *part;
++    ngx_table_elt_t                 *header;
++    ngx_str_t                       *ret, args;
++    ngx_http_uploadprogress_conf_t  *upcf;
++
++    upcf = ngx_http_get_module_loc_conf(r, ngx_http_uploadprogress_module);
++
++    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "upload-progress: get_tracking_ids");
++
++    part = &r->headers_in.headers.part;
++    header = part->elts;
++
++    for (i = 0; /* void */ ; i++) {
++
++        if (i >= part->nelts) {
++            if (part->next == NULL) {
++                break;
++            }
++
++            part = part->next;
++            header = part->elts;
++            i = 0;
++        }
++
++        if (header[i].key.len == upcf->header_mul.len
++            && ngx_strncasecmp(header[i].key.data, upcf->header_mul.data,
++                           header[i].key.len) == 0) {
++            ret = ngx_calloc(sizeof(ngx_str_t), r->connection->log );
++            ret->data = header[i].value.data;
++            ret->len = header[i].value.len;
++            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++                            "upload-progress: get_tracking_ids found header: %V", ret);
++            return ret;
++        }
++    }
++
++    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++                    "upload-progress: get_tracking_ids no header found");
++
++    /* not found, check as a request arg */
++    /* it is possible the request args have not been yet created (or already released) */
++    /* so let's try harder first from the request line */
++    args.len =  r->args.len;
++    args.data = r->args.data;
++
++    if (args.len && args.data) {
++        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++                       "upload-progress: get_tracking_id no header found, args found");
++        i = 0;
++        p = args.data;
++        do {
++            ngx_uint_t len = args.len - (p - args.data);
++            if (len >= (upcf->header_mul.len + 1) && ngx_strncasecmp(p, upcf->header_mul.data, upcf->header_mul.len) == 0
++                && p[upcf->header_mul.len] == '=') {
++              ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++                             "upload-progress: get_tracking_id found args: %s",p);
++                i = 1;
++                break;
++            }
++            else if (!len)
++                break;
++        }
++        while(p++);
++
++        if (i) {
++            start_p = p += upcf->header_mul.len + 1;
++            while (p < args.data + args.len) {
++                if (*((p++) + 1) == '&') {
++                    break;
++                }
++            }
++
++            ret = ngx_calloc(sizeof(ngx_str_t), r->connection->log);
++            ret->data = start_p;
++            ret->len = p - start_p;
++            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++                           "upload-progress: get_tracking_id found args: %V",ret);
++            return ret;
++        }
++    }
++
++    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++                   "upload-progress: get_tracking_id no id found");
++    return NULL;
++}
++
+ static ngx_http_uploadprogress_node_t *
+ find_node(ngx_str_t * id, ngx_http_uploadprogress_ctx_t * ctx, ngx_log_t * log)
+ {
+@@ -540,6 +684,27 @@ static void ngx_http_uploadprogress_event_handler(ngx_http_request_t *r)
+         
+         if(up->length == 0)
+             up->length = r->headers_in.content_length_n;
++        if(upcf->udp_socket != -1 && upcf->progress_server.socklen != 0)
++        {
++            u_char      datagram_buf[1024];
++            u_char *    end;
++            off_t       uploaded;
++            ngx_uint_t  portion;
++
++            uploaded = up->length - up->rest;
++            if(up->length)
++                portion = 100 * uploaded / up->length;
++            else
++                portion = 100;
++            if(portion > up->sent_portion)
++            {
++                end = ngx_snprintf(datagram_buf, sizeof(datagram_buf), "{\"id\" : \"%V\", \"sequence\" : %d, \"size\" : %uO, \"uploaded\" : %uO }",
++                                   id, up->sequence, up->length, uploaded);
++                sendto(upcf->udp_socket, datagram_buf, end - datagram_buf, 0, (struct sockaddr*)upcf->progress_server.sockaddr, upcf->progress_server.socklen);
++                up->sent_portion = portion;
++                ++up->sequence;
++            }
++        }
+         ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                        "upload-progress: read_event_handler storing rest %uO/%uO for %V", up->rest, up->length, id);
+     } else {
+@@ -559,12 +724,12 @@ ngx_http_reportuploads_handler(ngx_http_request_t * r)
+     ngx_chain_t                      out;
+     ngx_int_t                        rc, found=0, done=0, err_status=0;
+     off_t                            rest=0, length=0;
+-    ngx_uint_t                       len, i;
++    ngx_uint_t                       len;
+     ngx_slab_pool_t                 *shpool;
+     ngx_http_uploadprogress_conf_t  *upcf;
+     ngx_http_uploadprogress_ctx_t   *ctx;
+     ngx_http_uploadprogress_node_t  *up;
+-    ngx_table_elt_t                 *expires, *cc, **ccp;
++    ngx_table_elt_t                 *expires, *cc;
+     ngx_http_uploadprogress_state_t  state;
+     ngx_http_uploadprogress_template_t  *t;
+ 
+@@ -578,9 +743,13 @@ ngx_http_reportuploads_handler(ngx_http_request_t * r)
+         return rc;
+     }
+ 
+-    /* get the tracking id if any */
+-    id = get_tracking_id(r);
++    upcf = ngx_http_get_module_loc_conf(r, ngx_http_uploadprogress_module);
+ 
++    /* get the tracking id if any */
++    if(upcf->json_multiple)
++        id = get_tracking_ids_mul(r);
++    else
++        id = get_tracking_id(r);
+ 
+     if (id == NULL) {
+         ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+@@ -591,8 +760,6 @@ ngx_http_reportuploads_handler(ngx_http_request_t * r)
+     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                    "reportuploads handler found id: %V", id);
+ 
+-    upcf = ngx_http_get_module_loc_conf(r, ngx_http_uploadprogress_module);
+-
+     if (upcf->shm_zone == NULL) {
+         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                        "reportuploads no shm_zone for id: %V", id);
+@@ -600,32 +767,6 @@ ngx_http_reportuploads_handler(ngx_http_request_t * r)
+         return NGX_DECLINED;
+     }
+ 
+-    ctx = upcf->shm_zone->data;
+-
+-    /* get the original connection of the upload */
+-    shpool = (ngx_slab_pool_t *) upcf->shm_zone->shm.addr;
+-
+-    ngx_shmtx_lock(&shpool->mutex);
+-
+-    up = find_node(id, ctx, r->connection->log);
+-    if (up != NULL) {
+-        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+-                       "reportuploads found node: %V (rest: %uO, length: %uO, done: %ui, err_status: %ui)", id, up->rest, up->length, up->done, up->err_status);
+-        rest = up->rest;
+-        length = up->length;
+-        done = up->done;
+-        err_status = up->err_status;
+-        found = 1;
+-    } else {
+-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+-                       "reportuploads not found: %V", id);
+-    }
+-    ngx_shmtx_unlock(&shpool->mutex);
+-	ngx_free(id);
+-
+-    /* send the output */
+-    r->headers_out.content_type = upcf->content_type;
+-
+     /* force no-cache */
+     expires = r->headers_out.expires;
+ 
+@@ -637,6 +778,7 @@ ngx_http_reportuploads_handler(ngx_http_request_t * r)
+         }
+ 
+         r->headers_out.expires = expires;
++        expires->next = NULL;
+ 
+         expires->hash = 1;
+         expires->key.len = sizeof("Expires") - 1;
+@@ -646,37 +788,28 @@ ngx_http_reportuploads_handler(ngx_http_request_t * r)
+     len = sizeof("Mon, 28 Sep 1970 06:00:00 GMT");
+     expires->value.len = len - 1;
+ 
+-    ccp = r->headers_out.cache_control.elts;
+-    if (ccp == NULL) {
+-
+-        if (ngx_array_init(&r->headers_out.cache_control, r->pool,
+-                           1, sizeof(ngx_table_elt_t *))
+-            != NGX_OK) {
+-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+-        }
+-
+-        ccp = ngx_array_push(&r->headers_out.cache_control);
+-        if (ccp == NULL) {
+-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+-        }
+-
++    cc = r->headers_out.cache_control;
++    if (cc == NULL) {
+         cc = ngx_list_push(&r->headers_out.headers);
+         if (cc == NULL) {
++            expires->hash = 0;
+             return NGX_HTTP_INTERNAL_SERVER_ERROR;
+         }
+ 
++        r->headers_out.cache_control = cc;
++        cc->next = NULL;
++
+         cc->hash = 1;
+         cc->key.len = sizeof("Cache-Control") - 1;
+         cc->key.data = (u_char *) "Cache-Control";
+ 
+-        *ccp = cc;
+-
+     } else {
+-        for (i = 1; i < r->headers_out.cache_control.nelts; i++) {
+-            ccp[i]->hash = 0;
++        for (cc = cc->next; cc; cc = cc->next) {
++            cc->hash = 0;
+         }
+ 
+-        cc = ccp[0];
++        cc = r->headers_out.cache_control;
++        cc->next = NULL;
+     }
+ 
+     expires->value.data = (u_char *) "Thu, 01 Jan 1970 00:00:01 GMT";
+@@ -695,59 +828,282 @@ ngx_http_reportuploads_handler(ngx_http_request_t * r)
+         }
+     }
+ 
+-    ngx_http_set_ctx(r, up, ngx_http_uploadprogress_module);
++    ctx = upcf->shm_zone->data;
+ 
+-/*
++    /* get the original connection of the upload */
++    shpool = (ngx_slab_pool_t *) upcf->shm_zone->shm.addr;
++
++    if(upcf->json_multiple)
++    {
++        ngx_chain_t * p_chain_end = 0;
++        ngx_chain_t * p_chain_start = 0;
++        size_t offs = 0;
++        u_char * p1 = id->data, * p2;
++        r->headers_out.content_length_n = 0;
++        while(offs < id->len)
++        {
++            p2 = memchr((char *)id->data + offs, ';', id->len - offs);
++            if(!p2) p2 = id->data + id->len;
++            size_t len = p2 - p1;
++            if(len)
++            {
++                ngx_str_t sub_id;
++                sub_id.data = p1;
++                sub_id.len = len;
++
++                // ---->
++
++                ngx_shmtx_lock(&shpool->mutex);
++
++                up = find_node(&sub_id, ctx, r->connection->log);
++                if (up != NULL) {
++                    ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++                                   "reportuploads found node: %V (rest: %uO, length: %uO, done: %ui, err_status: %ui)", &sub_id, up->rest, up->length, up->done, up->err_status);
++                    rest = up->rest;
++                    length = up->length;
++                    done = up->done;
++                    err_status = up->err_status;
++                    found = 1;
++                } else {
++                    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++                                   "reportuploads not found: %V", &sub_id);
++                }
++                ngx_shmtx_unlock(&shpool->mutex);
++
++                /* send the output */
++                r->headers_out.content_type = upcf->content_type;
++
++                if(up == NULL)
++                {
++                    // For current id
++                    ngx_http_uploadprogress_node_t * tmp_node = ngx_pcalloc(r->pool, sizeof(ngx_http_uploadprogress_node_t) + sub_id.len);
++                    tmp_node->len = sub_id.len;
++                    ngx_memcpy(tmp_node->data, sub_id.data, sub_id.len);
++                    ngx_http_set_ctx(r, tmp_node, ngx_http_uploadprogress_module);
++                }
++                else
++                    ngx_http_set_ctx(r, up, ngx_http_uploadprogress_module);
++
++
++                if (!found) {
++                    state = uploadprogress_state_starting;
++                } else if (err_status >= NGX_HTTP_BAD_REQUEST) {
++                    state = uploadprogress_state_error;
++                } else if (done) {
++                    state = uploadprogress_state_done;
++                } else if ( length == 0 && rest == 0 ) {
++                    state = uploadprogress_state_starting;
++                } else {
++                    state = uploadprogress_state_uploading;
++                }
++
++                t = upcf->templates.elts;
++
++                if (ngx_http_script_run(r, &response, t[(ngx_uint_t)state].lengths->elts, 0,
++                                        t[(ngx_uint_t)state].values->elts) == NULL)
++                {
++                    ngx_free(id);
++                    return NGX_HTTP_INTERNAL_SERVER_ERROR;
++                }
++
++                ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++                               "upload progress: state=%d, err_status=%ui, remaining=%uO, length=%uO",
++                               state, err_status, (length - rest), length);
++
++                if(p_chain_end)
++                {
++                    p_chain_end->next = ngx_palloc(r->pool, sizeof(ngx_chain_t));
++                    if (p_chain_end->next == NULL) {
++                        ngx_free(id);
++                        return NGX_HTTP_INTERNAL_SERVER_ERROR;
++                    }
++                    p_chain_end = p_chain_end->next;
++
++                    // Insert comma
++                    b = ngx_calloc_buf(r->pool);
++                    if (b == NULL) {
++                        ngx_free(id);
++                        return NGX_HTTP_INTERNAL_SERVER_ERROR;
++                    }
++
++                    b->pos = b->start = ngx_palloc(r->pool, 2);
++                    if (b->pos == NULL) {
++                        ngx_free(id);
++                        return NGX_HTTP_INTERNAL_SERVER_ERROR;
++                    }
++                    b->last = b->end = b->pos + 2;
++                    ngx_memcpy(b->pos, ", ", 2);
++                    b->temporary = 1;
++                    b->memory = 1;
++
++                    p_chain_end->buf = b;
++                    p_chain_end->next = ngx_palloc(r->pool, sizeof(ngx_chain_t));
++                    if (p_chain_end->next == NULL) {
++                        ngx_free(id);
++                        return NGX_HTTP_INTERNAL_SERVER_ERROR;
++                    }
++                    p_chain_end = p_chain_end->next;
++                }
++                else
++                {
++                    p_chain_start = p_chain_end = ngx_palloc(r->pool, sizeof(ngx_chain_t));
++                }
++
++                b = ngx_calloc_buf(r->pool);
++                if (b == NULL) {
++                    ngx_free(id);
++                    return NGX_HTTP_INTERNAL_SERVER_ERROR;
++                }
++
++                b->pos = b->start = response.data;
++                b->last = b->end = response.data + response.len;
++
++                b->temporary = 1;
++                b->memory = 1;
++
++                p_chain_end->buf = b;
++                p_chain_end->next = NULL;
++
++                // ---->
++
++                r->headers_out.content_length_n += b->last - b->pos;
++
++                p1 = p2 + 1;
++            }
++            offs += len + 1;
++        }
++        ngx_free(id);
++        if(!p_chain_end) // Malformed id
++        {
++            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++                           "reportuploads malformed multiple id");
++            return NGX_DECLINED;
++        }
++        // Prepend brace
++        b = ngx_calloc_buf(r->pool);
++        if (b == NULL) {
++            ngx_free(id);
++            return NGX_HTTP_INTERNAL_SERVER_ERROR;
++        }
++        b->pos = b->start = ngx_palloc(r->pool, 2);
++        if (b->pos == NULL) {
++            return NGX_HTTP_INTERNAL_SERVER_ERROR;
++        }
++        b->last = b->end = b->pos + 2;
++        ngx_memcpy(b->pos, "[ ", 2);
++        b->temporary = 1;
++        b->memory = 1;
++        r->headers_out.content_length_n += 2;
++
++        out.buf = b;
++        out.next = p_chain_start;
++
++        // Append brace
++        p_chain_end->next = ngx_palloc(r->pool, sizeof(ngx_chain_t));
++        if (p_chain_end->next == NULL) {
++            return NGX_HTTP_INTERNAL_SERVER_ERROR;
++        }
++        p_chain_end = p_chain_end->next;
++
++        b = ngx_calloc_buf(r->pool);
++        if (b == NULL) {
++            return NGX_HTTP_INTERNAL_SERVER_ERROR;
++        }
++
++        b->pos = b->start = ngx_palloc(r->pool, 2);
++        if (b->pos == NULL) {
++            return NGX_HTTP_INTERNAL_SERVER_ERROR;
++        }
++        b->last = b->end = b->pos + 4;
++        ngx_memcpy(b->pos, " ]\r\n", 4);
++        b->temporary = 1;
++        b->memory = 1;
++        r->headers_out.content_length_n += 4;
++
++        p_chain_end->buf = b;
++        p_chain_end->next = NULL;
++
++        r->headers_out.status = NGX_HTTP_OK;
++        p_chain_end->buf->last_buf = 1;
++    }
++    else
++    {
++        ngx_shmtx_lock(&shpool->mutex);
++
++        up = find_node(id, ctx, r->connection->log);
++        if (up != NULL) {
++            ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++                           "reportuploads found node: %V (rest: %uO, length: %uO, done: %ui, err_status: %ui)", id, up->rest, up->length, up->done, up->err_status);
++            rest = up->rest;
++            length = up->length;
++            done = up->done;
++            err_status = up->err_status;
++            found = 1;
++        } else {
++            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++                           "reportuploads not found: %V", id);
++        }
++        ngx_shmtx_unlock(&shpool->mutex);
++        ngx_free(id);
++
++        /* send the output */
++        r->headers_out.content_type = upcf->content_type;
++
++        ngx_http_set_ctx(r, up, ngx_http_uploadprogress_module);
++
++        /*
+  There are 4 possibilities
+    * request not yet started: found = false
+    * request in error:        err_status >= NGX_HTTP_BAD_REQUEST
+    * request finished:        done = true
+    * request not yet started but registered:        length==0 && rest ==0
+-   * reauest in progress:     rest > 0 
++   * reauest in progress:     rest > 0
+  */
+ 
+-    if (!found) {
+-        state = uploadprogress_state_starting;
+-    } else if (err_status >= NGX_HTTP_BAD_REQUEST) {
+-        state = uploadprogress_state_error;
+-    } else if (done) {
+-        state = uploadprogress_state_done;
+-    } else if ( length == 0 && rest == 0 ) {
+-        state = uploadprogress_state_starting;
+-    } else {
+-        state = uploadprogress_state_uploading;
+-    }
++        if (!found) {
++            state = uploadprogress_state_starting;
++        } else if (err_status >= NGX_HTTP_BAD_REQUEST) {
++            state = uploadprogress_state_error;
++        } else if (done) {
++            state = uploadprogress_state_done;
++        } else if ( length == 0 && rest == 0 ) {
++            state = uploadprogress_state_starting;
++        } else {
++            state = uploadprogress_state_uploading;
++        }
+ 
+-    t = upcf->templates.elts;
++        t = upcf->templates.elts;
+ 
+-    if (ngx_http_script_run(r, &response, t[(ngx_uint_t)state].lengths->elts, 0,
+-        t[(ngx_uint_t)state].values->elts) == NULL)
+-    {
+-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+-    }
++        if (ngx_http_script_run(r, &response, t[(ngx_uint_t)state].lengths->elts, 0,
++                                t[(ngx_uint_t)state].values->elts) == NULL)
++        {
++            return NGX_HTTP_INTERNAL_SERVER_ERROR;
++        }
+ 
+-    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+-        "upload progress: state=%d, err_status=%ui, remaining=%uO, length=%uO",
+-        state, err_status, (length - rest), length);
++        ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++                       "upload progress: state=%d, err_status=%ui, remaining=%uO, length=%uO",
++                       state, err_status, (length - rest), length);
+ 
+-    b = ngx_calloc_buf(r->pool);
+-    if (b == NULL) {
+-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
+-    }
++        b = ngx_calloc_buf(r->pool);
++        if (b == NULL) {
++            return NGX_HTTP_INTERNAL_SERVER_ERROR;
++        }
+ 
+-    b->pos = b->start = response.data;
+-    b->last = b->end = response.data + response.len;
++        b->pos = b->start = response.data;
++        b->last = b->end = response.data + response.len;
+ 
+-    b->temporary = 1;
+-    b->memory = 1;
++        b->temporary = 1;
++        b->memory = 1;
+ 
+-    out.buf = b;
+-    out.next = NULL;
++        out.buf = b;
++        out.next = NULL;
+ 
+-    r->headers_out.status = NGX_HTTP_OK;
+-    r->headers_out.content_length_n = b->last - b->pos;
++        r->headers_out.status = NGX_HTTP_OK;
++        r->headers_out.content_length_n = b->last - b->pos;
++
++        b->last_buf = 1;
++    }
+ 
+-    b->last_buf = 1;
+     rc = ngx_http_send_header(r);
+ 
+     if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
+@@ -774,8 +1130,8 @@ ngx_http_uploadprogress_handler(ngx_http_request_t * r)
+     ngx_http_uploadprogress_cleanup_t *upcln;
+     ngx_pool_cleanup_t              *cln;
+ 
+-    /* Is it a POST connection */
+-    if (r->method != NGX_HTTP_POST) {
++    /* Only look for progress IDs on POST, PUT and PATCH */
++    if (!(r->method & (NGX_HTTP_POST | NGX_HTTP_PUT | NGX_HTTP_PATCH))) {
+         return NGX_DECLINED;
+     }
+ 
+@@ -852,6 +1208,8 @@ ngx_http_uploadprogress_handler(ngx_http_request_t * r)
+     up->rest = 0;
+     up->length = 0;
+     up->timeout = 0;
++    up->sequence = 0;
++    up->sent_portion = 0;
+ 
+     /* Properly handles small files where no read events happen after the */
+     /* request is first handled (apparently this can happen on linux with epoll) */
+@@ -859,6 +1217,8 @@ ngx_http_uploadprogress_handler(ngx_http_request_t * r)
+         up->length = r->headers_in.content_length_n;
+         if (r->request_body) {
+             up->rest = r->request_body->rest;
++        } else {
++         up->rest = up->length;
+         }
+     }
+ 
+@@ -1197,6 +1557,8 @@ ngx_http_uploadprogress_errortracker(ngx_http_request_t * r)
+         up->rest = 0;
+         up->length = 0;
+         up->timeout = 0;
++        up->sequence = 0;
++        up->sent_portion = 0;
+ 
+         ngx_memcpy(up->data, id->data, id->len);
+ 
+@@ -1288,6 +1650,7 @@ ngx_http_uploadprogress_create_loc_conf(ngx_conf_t * cf)
+         elt->values = NULL;
+         elt->lengths = NULL;
+     } 
++    conf->udp_socket = -1;
+ 
+     return conf;
+ }
+@@ -1329,6 +1692,7 @@ ngx_http_uploadprogress_merge_loc_conf(ngx_conf_t * cf, void *parent, void *chil
+     } 
+ 
+     ngx_conf_merge_str_value(conf->header, prev->header, "X-Progress-ID");
++    ngx_conf_merge_str_value(conf->header_mul, prev->header_mul, "X-ProgressMultiple-ID");
+     ngx_conf_merge_str_value(conf->jsonp_parameter, prev->jsonp_parameter, "callback");
+ 
+     return NGX_CONF_OK;
+@@ -1447,6 +1811,7 @@ ngx_http_track_uploads(ngx_conf_t * cf, ngx_command_t * cmd, void *conf)
+     ngx_http_core_loc_conf_t        *clcf;
+     ngx_http_uploadprogress_conf_t  *lzcf = conf;
+     ngx_str_t                       *value;
++    ngx_url_t                       url;
+ 
+     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cf->log, 0, "ngx_track_uploads in");
+ 
+@@ -1471,10 +1836,27 @@ ngx_http_track_uploads(ngx_conf_t * cf, ngx_command_t * cmd, void *conf)
+     lzcf->timeout = ngx_parse_time(&value[2], 1);
+     if (lzcf->timeout == NGX_ERROR) {
+         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+-                           "track_uploads \"%V\" timeout value invalid", &value[1]);
++                           "track_uploads \"%V\" timeout value invalid", &value[2]);
+         return NGX_CONF_ERROR;
+     }
+ 
++    if(cf->args->nelts > 3)
++    {
++        ngx_memzero(&url, sizeof(ngx_url_t));
++        url.url = value[3];
++        url.default_port = 80;
++        url.no_resolve = 0;
++
++        if(ngx_parse_url(cf->pool, &url) != NGX_OK)
++        {
++            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "Invalid graphite server %V: %s", &url.host, url.err);
++            return NGX_CONF_ERROR;
++        }
++        lzcf->progress_server = url.addrs[0];
++        if(lzcf->udp_socket == -1)
++            lzcf->udp_socket = ngx_socket(PF_INET, SOCK_DGRAM, 0);
++    }
++
+     clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+     lzcf->handler = clcf->handler;
+     if ( lzcf->handler == NULL )
+@@ -1555,6 +1937,8 @@ ngx_http_upload_progress_template(ngx_conf_t * cf, ngx_command_t * cmd, void *co
+     ngx_http_uploadprogress_state_map_t  *m = ngx_http_uploadprogress_state_map;
+     ngx_http_uploadprogress_template_t   *t;
+ 
++    upcf->json_multiple = 0;
++
+     value = cf->args->elts;
+ 
+     while(m->name.data != NULL) {
+@@ -1584,6 +1968,8 @@ ngx_http_upload_progress_java_output(ngx_conf_t * cf, ngx_command_t * cmd, void
+     ngx_uint_t                            i;
+     char*                                 rc;
+ 
++    upcf->json_multiple = 0;
++
+     t = (ngx_http_uploadprogress_template_t*)upcf->templates.elts;
+ 
+     for(i = 0;i < upcf->templates.nelts;i++) {
+@@ -1608,6 +1994,8 @@ ngx_http_upload_progress_json_output(ngx_conf_t * cf, ngx_command_t * cmd, void
+     ngx_uint_t                            i;
+     char*                                 rc;
+ 
++    upcf->json_multiple = 0;
++
+     t = (ngx_http_uploadprogress_template_t*)upcf->templates.elts;
+ 
+     for(i = 0;i < upcf->templates.nelts;i++) {
+@@ -1632,6 +2020,8 @@ ngx_http_upload_progress_jsonp_output(ngx_conf_t * cf, ngx_command_t * cmd, void
+     ngx_uint_t                            i;
+     char*                                 rc;
+ 
++    upcf->json_multiple = 0;
++
+     t = (ngx_http_uploadprogress_template_t*)upcf->templates.elts;
+ 
+     for(i = 0;i < upcf->templates.nelts;i++) {
+@@ -1648,6 +2038,58 @@ ngx_http_upload_progress_jsonp_output(ngx_conf_t * cf, ngx_command_t * cmd, void
+     return NGX_CONF_OK;
+ }
+ 
++static char*
++ngx_http_upload_progress_json_multiple_output(ngx_conf_t * cf, ngx_command_t * cmd, void *conf)
++{
++    ngx_http_uploadprogress_conf_t       *upcf = conf;
++    ngx_http_uploadprogress_template_t   *t;
++    ngx_uint_t                            i;
++    char*                                 rc;
++
++    upcf->json_multiple = 1;
++
++    t = (ngx_http_uploadprogress_template_t*)upcf->templates.elts;
++
++    for(i = 0;i < upcf->templates.nelts;i++) {
++        rc = ngx_http_upload_progress_set_template(cf, t + i, ngx_http_uploadprogress_json_multiple_defaults + i);
++
++        if(rc != NGX_CONF_OK) {
++            return rc;
++        }
++    }
++
++    upcf->content_type.data = (u_char*)"application/json";
++    upcf->content_type.len = sizeof("application/json") - 1;
++
++    return NGX_CONF_OK;
++}
++
++static char*
++ngx_http_upload_progress_jsonp_multiple_output(ngx_conf_t * cf, ngx_command_t * cmd, void *conf)
++{
++    ngx_http_uploadprogress_conf_t       *upcf = conf;
++    ngx_http_uploadprogress_template_t   *t;
++    ngx_uint_t                            i;
++    char*                                 rc;
++
++    upcf->json_multiple = 1;
++
++    t = (ngx_http_uploadprogress_template_t*)upcf->templates.elts;
++
++    for(i = 0;i < upcf->templates.nelts;i++) {
++        rc = ngx_http_upload_progress_set_template(cf, t + i, ngx_http_uploadprogress_jsonp_multiple_defaults + i);
++
++        if(rc != NGX_CONF_OK) {
++            return rc;
++        }
++    }
++
++    upcf->content_type.data = (u_char*)"application/json";
++    upcf->content_type.len = sizeof("application/json") - 1;
++
++    return NGX_CONF_OK;
++}
++
+ static ngx_int_t ngx_http_uploadprogress_received_variable(ngx_http_request_t *r,
+     ngx_http_variable_value_t *v, uintptr_t data)
+ {
+@@ -1724,6 +2166,30 @@ ngx_http_uploadprogress_status_variable(ngx_http_request_t *r,
+     return NGX_OK;
+ }
+ 
++static ngx_int_t
++ngx_http_uploadprogress_id_variable(ngx_http_request_t *r,
++    ngx_http_variable_value_t *v,  uintptr_t data)
++{
++    ngx_http_uploadprogress_node_t  *up;
++    u_char                          *p;
++
++    up = ngx_http_get_module_ctx(r, ngx_http_uploadprogress_module);
++
++    p = ngx_palloc(r->pool, up->len);
++    if (p == NULL) {
++        return NGX_ERROR;
++    }
++
++    v->len = up->len;
++    v->data = p;
++    ngx_memcpy(v->data, up->data, up->len);
++    v->valid = 1;
++    v->no_cacheable = 0;
++    v->not_found = 0;
++
++    return NGX_OK;
++}
++
+ static ngx_int_t
+ ngx_http_uploadprogress_callback_variable(ngx_http_request_t *r,
+     ngx_http_variable_value_t *v,  uintptr_t data)
diff --git a/main/nginx/nginx.conf b/main/nginx/nginx.conf
index 87b1a16019a..89fa9854bf6 100644
--- a/main/nginx/nginx.conf
+++ b/main/nginx/nginx.conf
@@ -14,6 +14,8 @@ error_log /var/log/nginx/error.log warn;
 # Includes files with directives to load dynamic modules.
 include /etc/nginx/modules/*.conf;
 
+# Include files with config snippets into the root context.
+include /etc/nginx/conf.d/*.conf;
 
 events {
 	# The maximum number of simultaneous connections that can be opened by
@@ -29,52 +31,62 @@ http {
 
 	# Name servers used to resolve names of upstream servers into addresses.
 	# It's also needed when using tcpsocket and udpsocket in Lua modules.
-	#resolver 208.67.222.222 208.67.220.220;
+	#resolver 1.1.1.1 1.0.0.1 [2606:4700:4700::1111] [2606:4700:4700::1001];
 
-	# Don't tell nginx version to clients.
+	# Don't tell nginx version to the clients. Default is 'on'.
 	server_tokens off;
 
 	# Specifies the maximum accepted body size of a client request, as
 	# indicated by the request header Content-Length. If the stated content
 	# length is greater than this size, then the client receives the HTTP
-	# error code 413. Set to 0 to disable.
+	# error code 413. Set to 0 to disable. Default is '1m'.
 	client_max_body_size 1m;
 
-	# Timeout for keep-alive connections. Server will close connections after
-	# this time.
-	keepalive_timeout 65;
-
 	# Sendfile copies data between one FD and other from within the kernel,
-	# which is more efficient than read() + write().
+	# which is more efficient than read() + write(). Default is off.
 	sendfile on;
 
-	# Don't buffer data-sends (disable Nagle algorithm).
-	# Good for sending frequent small bursts of data in real time.
-	tcp_nodelay on;
-
 	# Causes nginx to attempt to send its HTTP response head in one packet,
-	# instead of using partial frames.
-	#tcp_nopush on;
+	# instead of using partial frames. Default is 'off'.
+	tcp_nopush on;
+
 
+	# Enables the specified protocols. Default is TLSv1 TLSv1.1 TLSv1.2.
+	# TIP: If you're not obligated to support ancient clients, remove TLSv1.1.
+	ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
 
 	# Path of the file with Diffie-Hellman parameters for EDH ciphers.
+	# TIP: Generate with: `openssl dhparam -out /etc/ssl/nginx/dh2048.pem 2048`
 	#ssl_dhparam /etc/ssl/nginx/dh2048.pem;
 
 	# Specifies that our cipher suits should be preferred over client ciphers.
+	# Default is 'off'.
 	ssl_prefer_server_ciphers on;
 
 	# Enables a shared SSL cache with size that can hold around 8000 sessions.
+	# Default is 'none'.
 	ssl_session_cache shared:SSL:2m;
 
+	# Specifies a time during which a client may reuse the session parameters.
+	# Default is '5m'.
+	ssl_session_timeout 1h;
+
+	# Disable TLS session tickets (they are insecure). Default is 'on'.
+	ssl_session_tickets off;
+
 
 	# Enable gzipping of responses.
 	#gzip on;
 
-	# Set the Vary HTTP header as defined in the RFC 2616.
+	# Set the Vary HTTP header as defined in the RFC 2616. Default is 'off'.
 	gzip_vary on;
 
-	# Enable checking the existence of precompressed files.
-	#gzip_static on;
+
+	# Helper variable for proxying websockets.
+	map $http_upgrade $connection_upgrade {
+		default upgrade;
+		'' close;
+	}
 
 
 	# Specifies the main log format.
@@ -87,5 +99,5 @@ http {
 
 
 	# Includes virtual hosts configs.
-	include /etc/nginx/conf.d/*.conf;
+	include /etc/nginx/http.d/*.conf;
 }
diff --git a/main/nginx/nginx.post-install b/main/nginx/nginx.post-install
new file mode 100644
index 00000000000..cf4ddbcfe3c
--- /dev/null
+++ b/main/nginx/nginx.post-install
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# This is needed for containers that don't start nginx using init script.
+install -d -m 755 -o nginx -g nginx /run/nginx || true
+
+# Install config with the default http server to the new location (since 1.18.0-r13).
+if ! [ -e /etc/nginx/http.d/default.conf ]; then
+	install -m644 /usr/share/nginx/http-default_server.conf /etc/nginx/http.d/default.conf
+fi
+
+exit 0
diff --git a/main/nginx/nginx.post-upgrade b/main/nginx/nginx.post-upgrade
index 6d9e698dc7d..3062f98223f 100644
--- a/main/nginx/nginx.post-upgrade
+++ b/main/nginx/nginx.post-upgrade
@@ -20,4 +20,38 @@ if [ "$(apk version -t "$ver_old" "1.10.1-r3")" = "<" ]; then
 	EOF
 fi
 
+# Handle transition from /etc/nginx/conf.d to /etc/nginx/http.d.
+if [ "$(apk version -t "$ver_old" '1.18.0-r13')" = '<' ]; then
+	if ! [ -e /etc/nginx/http.d/default.conf ]; then
+		install -D -m644 /usr/share/nginx/http-default_server.conf \
+			/etc/nginx/http.d/default.conf
+	fi
+fi
+
+# Handle transition from /etc/nginx/conf.d to /etc/nginx/http.d.
+if [ "$(apk version -t "$ver_old" '1.22.0-r7')" = '<' ]; then
+	if sed -En '/^http\s*\{/,/^\}/{ /^\s*include\s+\/etc\/nginx\/conf.d\/.*;/p }' /etc/nginx/nginx.conf | grep -q .; then
+		cat >&2 <<-EOF
+		!!
+		!! Found 'include /etc/nginx/conf.d/*.conf' in the 'http' section!
+		!! The default and preferred location for nginx http configs has been changed
+		!! from /etc/nginx/conf.d to /etc/nginx/http.d. The former is now used for
+		!! configs to be included in the root context. Move your vhost configs from
+		!! /etc/nginx/conf.d/ to /etc/nginx/http.d/ and update /etc/nginx/nginx.conf.
+		!!
+		EOF
+	fi
+fi
+
+# Handle trasition from /var/tmp/nginx to /var/lib/nginx/tmp
+# https://gitlab.alpinelinux.org/alpine/aports/-/issues/11204
+if [ -d /var/lib/nginx/tmp ]; then
+	for i in /var/tmp/nginx/*; do
+		if [ -e "$i" ]; then
+			mv $i /var/lib/nginx/tmp/
+		fi
+	done
+	rmdir /var/tmp/nginx 2>/dev/null
+fi
+
 exit 0
diff --git a/main/nginx/nginx.pre-upgrade b/main/nginx/nginx.pre-upgrade
index 67f05dda1c0..67d540f1854 100644
--- a/main/nginx/nginx.pre-upgrade
+++ b/main/nginx/nginx.pre-upgrade
@@ -1,27 +1,9 @@
-#!/bin/ash
+#!/bin/sh
 
-ver_new="$1"
-ver_old="$2"
+# symlink to directory confuses apk. remove it before the upgrade
+# https://gitlab.alpinelinux.org/alpine/aports/-/issues/11204
 
-if [ "$(apk version -t "$ver_old" '1.12.0-r1')" = '<' ]; then
-	tmp_new=/var/tmp/nginx
-	tmp_old=/var/lib/nginx/tmp
-
-	# Create a new temp directory, move data from the old one to the new
-	# one and delete the old one.
-	if [ -d "$tmp_old" ]; then
-		echo "* Moving data from $tmp_old to $tmp_new..." >&2
-
-		[ -d "$tmp_new" ] \
-			|| install -d -m 700 -o nginx -g nginx "$tmp_new"
-		rmdir "$tmp_old" 2>/dev/null \
-			&& exit 0 \
-			|| mv "$tmp_old"/* "$tmp_new"/
-		rmdir "$tmp_old" 2>/dev/null \
-			&& exit 0 \
-			|| mv "$tmp_old"/.[!.]* "$tmp_new"/  # move dot files
-		rmdir "$tmp_old"
-	fi
+if [ "$(readlink /var/lib/nginx/tmp)" = "/var/tmp/nginx" ]; then
+	rm /var/lib/nginx/tmp
 fi
 
-exit 0
diff --git a/main/nginx/nginx_cookie_flag_module~fix-mem-allocations.patch b/main/nginx/nginx_cookie_flag_module~fix-mem-allocations.patch
new file mode 100644
index 00000000000..ef8f0360334
--- /dev/null
+++ b/main/nginx/nginx_cookie_flag_module~fix-mem-allocations.patch
@@ -0,0 +1,182 @@
+From fc68e3670624660b7fdf89bc1b7316f5a267d7e0 Mon Sep 17 00:00:00 2001
+From: "Oleg A. Mamontov" <oleg@mamontov.net>
+Date: Wed, 8 Jul 2020 19:44:02 +0300
+Subject: [PATCH] ngx_http_cookie_flag_filter_handler() allocated not enough
+ memory for "cookie_name".  The strcat() call would write '\0' outside the
+ allocated buffer.  The current code also incorrectly matches any cookie whose
+ name ends in "foo" if "set_cookie_flag foo ..." is specified.  Both bugs
+ fixed by rewriting the code that matches cookies by name.
+
+ngx_http_cookie_flag_filter_append() allocated not enough memory
+when editing cookie values.  Generally, strings in nginx are not
+NUL-terminated, but there are some exceptions, including the
+values of request/response headers.  While that assumption allows
+searching for substrings with ngx_strcasestrn(), the edited values
+were not NUL-terminated.  This is fixed by allocating enough memory
+to have NUL-terminated strings.
+---
+ ngx_http_cookie_flag_filter_module.c | 117 ++++++++++++++++-----------
+ 1 file changed, 71 insertions(+), 46 deletions(-)
+
+Patch-Source: https://github.com/AirisX/nginx_cookie_flag_module/pull/17
+
+diff --git a/ngx_http_cookie_flag_filter_module.c b/ngx_http_cookie_flag_filter_module.c
+index b0316aa..63b8269 100644
+--- a/ngx_http_cookie_flag_filter_module.c
++++ b/ngx_http_cookie_flag_filter_module.c
+@@ -235,58 +235,89 @@ ngx_http_cookie_flag_filter_init(ngx_conf_t *cf)
+ static ngx_int_t
+ ngx_http_cookie_flag_filter_append(ngx_http_request_t *r, ngx_http_cookie_t *cookie, ngx_table_elt_t *header)
+ {
+-    ngx_str_t tmp;
++    u_char *data, *p;
++    size_t len;
++    ngx_http_cookie_t c;
+ 
+-    if (cookie->httponly == 1 && ngx_strcasestrn(header->value.data, "; HttpOnly", 10 - 1) == NULL) {
+-        tmp.data = ngx_pnalloc(r->pool, header->value.len + sizeof("; HttpOnly") - 1);
+-        if (tmp.data == NULL) {
+-            return NGX_ERROR;
++    c = *cookie;
++    len = 0;
++
++    if (c.httponly) {
++        if (ngx_strcasestrn(header->value.data, "; HttpOnly", 10 - 1) == NULL) {
++            len += sizeof("; HttpOnly") - 1;
++        } else {
++            c.httponly = 0;
+         }
+-        tmp.len = ngx_sprintf(tmp.data, "%V; HttpOnly", &header->value) - tmp.data;
+-        header->value.data = tmp.data;
+-        header->value.len = tmp.len;
+     }
+ 
+-    if (cookie->secure == 1 && ngx_strcasestrn(header->value.data, "; secure", 8 - 1) == NULL) {
+-        tmp.data = ngx_pnalloc(r->pool, header->value.len + sizeof("; secure") - 1);
+-        if (tmp.data == NULL) {
+-            return NGX_ERROR;
++    if (c.secure) {
++        if (ngx_strcasestrn(header->value.data, "; secure", 8 - 1) == NULL) {
++            len += sizeof("; secure") - 1;
++        } else {
++            c.secure = 0;
+         }
+-        tmp.len = ngx_sprintf(tmp.data, "%V; secure", &header->value) - tmp.data;
+-        header->value.data = tmp.data;
+-        header->value.len = tmp.len;
+     }
+ 
+-    if (cookie->samesite == 1 && ngx_strcasestrn(header->value.data, "; SameSite", 10 - 1) == NULL) {
+-        tmp.data = ngx_pnalloc(r->pool, header->value.len + sizeof("; SameSite") - 1);
+-        if (tmp.data == NULL) {
+-            return NGX_ERROR;
++    if (c.samesite) {
++        if (ngx_strcasestrn(header->value.data, "; SameSite", 10 - 1) == NULL) {
++            len += sizeof("; SameSite") - 1;
++        } else {
++            c.samesite = 0;
+         }
+-        tmp.len = ngx_sprintf(tmp.data, "%V; SameSite", &header->value) - tmp.data;
+-        header->value.data = tmp.data;
+-        header->value.len = tmp.len;
+     }
+ 
+-    if (cookie->samesite_lax == 1 && ngx_strcasestrn(header->value.data, "; SameSite=Lax", 14 - 1) == NULL) {
+-        tmp.data = ngx_pnalloc(r->pool, header->value.len + sizeof("; SameSite=Lax") - 1);
+-        if (tmp.data == NULL) {
+-            return NGX_ERROR;
++    if (c.samesite_lax) {
++        if (ngx_strcasestrn(header->value.data, "; SameSite=Lax", 14 - 1) == NULL) {
++            len += sizeof("; SameSite=Lax") - 1;
++        } else {
++            c.samesite_lax = 0;
+         }
+-        tmp.len = ngx_sprintf(tmp.data, "%V; SameSite=Lax", &header->value) - tmp.data;
+-        header->value.data = tmp.data;
+-        header->value.len = tmp.len;
+     }
+ 
+-    if (cookie->samesite_strict == 1 && ngx_strcasestrn(header->value.data, "; SameSite=Strict", 17 - 1) == NULL) {
+-        tmp.data = ngx_pnalloc(r->pool, header->value.len + sizeof("; SameSite=Strict") - 1);
+-        if (tmp.data == NULL) {
+-            return NGX_ERROR;
++    if (c.samesite_strict) {
++        if (ngx_strcasestrn(header->value.data, "; SameSite=Strict", 17 - 1) == NULL) {
++            len += sizeof("; SameSite=Strict") - 1;
++        } else {
++            c.samesite_strict = 0;
+         }
+-        tmp.len = ngx_sprintf(tmp.data, "%V; SameSite=Strict", &header->value) - tmp.data;
+-        header->value.data = tmp.data;
+-        header->value.len = tmp.len;
+     }
+ 
++    if (len == 0) {
++        return NGX_OK;
++    }
++
++    data = ngx_pnalloc(r->pool, header->value.len + len + 1);
++    if (data == NULL) {
++        return NGX_ERROR;
++    }
++
++    p = ngx_sprintf(data, "%V", &header->value);
++
++    if (c.httponly) {
++        p = ngx_sprintf(p, "; HttpOnly");
++    }
++
++    if (c.secure) {
++        p = ngx_sprintf(p, "; secure");
++    }
++
++    if (c.samesite) {
++        p = ngx_sprintf(p, "; SameSite");
++    }
++
++    if (c.samesite_lax) {
++        p = ngx_sprintf(p, "; SameSite=Lax");
++    }
++
++    if (c.samesite_strict) {
++        p = ngx_sprintf(p, "; SameSite=Strict");
++    }
++
++    *p = '\0';
++
++    header->value.data = data;
++    header->value.len = p - data;
++
+     return NGX_OK;
+ }
+ 
+@@ -332,17 +363,11 @@ ngx_http_cookie_flag_filter_handler(ngx_http_request_t *r)
+             // for each security cookie we check whether preset it within Set-Cookie value. If not then we append.
+             for (j = 0; j < flcf->cookies->nelts; j++) {
+ 
+-                if (ngx_strncasecmp(cookie[j].cookie_name.data, (u_char *) "*", 1) != 0) {
+-                    // append "=" to the security cookie name. The result will be something like "cookie_name="
+-                    char *cookie_name = ngx_pnalloc(r->pool,  sizeof("=") - 1 + cookie[j].cookie_name.len);
+-                    if (cookie_name == NULL) {
+-                        return NGX_ERROR;
+-                    }
+-                    strcpy(cookie_name, (char *) cookie[j].cookie_name.data);
+-                    strcat(cookie_name, "=");
++                if (cookie[j].cookie_name.len != 1 || cookie[j].cookie_name.data[0] != '*') {
++                    ngx_str_t *cookie_name = &cookie[j].cookie_name;
+ 
+                     // if Set-Cookie contains a cookie from settings
+-                    if (ngx_strcasestrn(header[i].value.data, cookie_name, strlen(cookie_name) - 1) != NULL) {
++                    if (header[i].value.len > cookie_name->len && header[i].value.data[cookie_name->len] == '=' && ngx_strncasecmp(header[i].value.data, cookie_name->data, cookie_name->len) == 0) {
+                         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "filter http_cookie_flag - add flags for cookie \"%V\"", &cookie[j].cookie_name);
+                         ngx_int_t res = ngx_http_cookie_flag_filter_append(r, &cookie[j], &header[i]);
+                         if (res != NGX_OK) {
+@@ -350,7 +375,7 @@ ngx_http_cookie_flag_filter_handler(ngx_http_request_t *r)
+                         }
+                         break; // otherwise default value will be added
+                     }
+-                } else if (ngx_strncasecmp(cookie[j].cookie_name.data, (u_char *) "*", 1) == 0) {
++                } else {
+                     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "filter http_cookie_flag - add default cookie flags");
+                     ngx_int_t res = ngx_http_cookie_flag_filter_append(r, &cookie[j], &header[i]);
+                     if (res != NGX_OK) {
diff --git a/main/nginx/ngx-fancyindex~fix-404-on-fs-root.patch b/main/nginx/ngx-fancyindex~fix-404-on-fs-root.patch
new file mode 100644
index 00000000000..1c0df2bf257
--- /dev/null
+++ b/main/nginx/ngx-fancyindex~fix-404-on-fs-root.patch
@@ -0,0 +1,27 @@
+Patch-Source: https://github.com/aperezdc/ngx-fancyindex/commit/83bef5c8a633ebbf96576eeb596a972a5816e057
+--
+From 83bef5c8a633ebbf96576eeb596a972a5816e057 Mon Sep 17 00:00:00 2001
+From: Ryan Schmidt <git@ryandesign.com>
+Date: Fri, 13 May 2022 00:16:09 -0500
+Subject: [PATCH] Fix 404 not found when indexing filesystem root
+
+Backport of https://github.com/nginx/nginx/commit/4c89c09ad8e574509446efab0347b124372bc53a
+
+Fixes #107
+
+diff --git a/ngx_http_fancyindex_module.c b/ngx_http_fancyindex_module.c
+index e6928dd..dd721d0 100644
+--- a/ngx_http_fancyindex_module.c
++++ b/ngx_http_fancyindex_module.c
+@@ -684,7 +684,10 @@ make_content_buf(
+         return NGX_HTTP_INTERNAL_SERVER_ERROR;
+ 
+     allocated = path.len;
+-    path.len  = last - path.data - 1;
++    path.len = last - path.data;
++    if (path.len > 1) {
++        path.len--;
++    }
+     path.data[path.len] = '\0';
+ 
+     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
diff --git a/main/nginx/ngx-fancyindex~fix-missing-saturday.patch b/main/nginx/ngx-fancyindex~fix-missing-saturday.patch
new file mode 100644
index 00000000000..b34f3e5d361
--- /dev/null
+++ b/main/nginx/ngx-fancyindex~fix-missing-saturday.patch
@@ -0,0 +1,25 @@
+Patch-Source: https://github.com/aperezdc/ngx-fancyindex/commit/674e99547d21b8bd9a36dc5d8689d08632d3a34d
+--
+From 674e99547d21b8bd9a36dc5d8689d08632d3a34d Mon Sep 17 00:00:00 2001
+From: Adrian Perez de Castro <aperez@igalia.com>
+Date: Thu, 19 Jan 2023 20:51:08 +0200
+Subject: [PATCH] Add missing entry in long weekday names array
+
+The entry for Saturday was missing, as pointed out in the bug report.
+While at it, add a test case.
+
+Fixes #157
+
+diff --git a/ngx_http_fancyindex_module.c b/ngx_http_fancyindex_module.c
+index bfccdc8..ed349d5 100644
+--- a/ngx_http_fancyindex_module.c
++++ b/ngx_http_fancyindex_module.c
+@@ -37,7 +37,7 @@ static const char *short_weekday[] = {
+     "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun",
+ };
+ static const char *long_weekday[] = {
+-    "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Sunday",
++    "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday",
+ };
+ static const char *short_month[] = {
+     "Jan", "Feb", "Mar", "Apr", "May", "Jun",
diff --git a/main/nginx/njs~mktemp-busybox-compat.patch b/main/nginx/njs~mktemp-busybox-compat.patch
new file mode 100644
index 00000000000..d6299972aed
--- /dev/null
+++ b/main/nginx/njs~mktemp-busybox-compat.patch
@@ -0,0 +1,13 @@
+Fix error: mktemp: (null): Invalid argument
+
+--- a/test/options
++++ b/test/options
+@@ -3,7 +3,7 @@
+ # Copyright (C) Dmitry Volyntsev
+ # Copyright (C) NGINX, Inc.
+ 
+-NJS_TEST_DIR=`mktemp -d /tmp/njs_test.XXX`
++NJS_TEST_DIR=`mktemp -d /tmp/njs_test.XXXXXX`
+ NJS_TEST_LOG_DEFAULT="$NJS_TEST_DIR/log.log"
+ 
+ NJS_TEST_VERBOSE=${NJS_TEST_VERBOSE:-}
diff --git a/main/nginx/no-werror.patch b/main/nginx/no-werror.patch
new file mode 100644
index 00000000000..58ab7f48537
--- /dev/null
+++ b/main/nginx/no-werror.patch
@@ -0,0 +1,11 @@
+--- a/auto/cc/gcc
++++ b/auto/cc/gcc
+@@ -166,7 +166,7 @@
+ 
+ 
+ # stop on warning
+-CFLAGS="$CFLAGS -Werror"
++CFLAGS="$CFLAGS"
+ 
+ # debug
+ CFLAGS="$CFLAGS -g"
diff --git a/main/nginx/stream.conf b/main/nginx/stream.conf
new file mode 100644
index 00000000000..4b7177de0c3
--- /dev/null
+++ b/main/nginx/stream.conf
@@ -0,0 +1,14 @@
+# /etc/nginx/conf.d/stream.conf
+
+stream {
+	# Specifies the main log format.
+	log_format main '$remote_addr [$time_local] '
+			'$protocol $status $bytes_sent $bytes_received '
+			'$session_time "$upstream_addr" '
+			'"$upstream_bytes_sent" "$upstream_bytes_received" "$upstream_connect_time"';
+
+	access_log /var/log/nginx/stream.log main;
+
+	# Includes servers configs.
+	include stream.d/*.conf;
+}
diff --git a/main/nginx/traffic-accounting-nginx-module~disable-stream-module.patch b/main/nginx/traffic-accounting-nginx-module~disable-stream-module.patch
new file mode 100644
index 00000000000..ae2090a4730
--- /dev/null
+++ b/main/nginx/traffic-accounting-nginx-module~disable-stream-module.patch
@@ -0,0 +1,14 @@
+Stream module is broken, nginx doesn't start worker processes when
+the module is loaded.
+
+--- a/config
++++ b/config
+@@ -43,7 +43,7 @@
+     ngx_module_srcs="$ngx_module_srcs $HTTP_ACCOUNTING_SRCS"
+ fi
+ 
+-if [ $STREAM != NO ]
++if false # [ $STREAM != NO ]
+ then
+     ngx_module_type=STREAM
+     if test -n "$ngx_module_name"; then
diff --git a/main/nginx/traffic-accounting-nginx-module~fix-memory-leak.patch b/main/nginx/traffic-accounting-nginx-module~fix-memory-leak.patch
new file mode 100644
index 00000000000..4822d25b656
--- /dev/null
+++ b/main/nginx/traffic-accounting-nginx-module~fix-memory-leak.patch
@@ -0,0 +1,253 @@
+Patch-Source: https://github.com/Lax/traffic-accounting-nginx-module/commit/900fceedcb00a840510d547a5b1e135b4f340745
+Patch-Source: https://github.com/Lax/traffic-accounting-nginx-module/commit/c0667a81a3ab3f62f30e9051179dc705261ec556
+--
+From 900fceedcb00a840510d547a5b1e135b4f340745 Mon Sep 17 00:00:00 2001
+From: Tony Liu <Tony.Liu@harmonicinc.com>
+Date: Thu, 19 Aug 2021 08:03:47 +0000
+Subject: [PATCH] use ngx_calloc to replace ngx_pcalloc to avoid memory leak
+ https://github.com/Lax/traffic-accounting-nginx-module/issues/53
+
+---
+ src/http/ngx_http_accounting_module.c       |  8 +++----
+ src/ngx_traffic_accounting.h                |  8 +++----
+ src/ngx_traffic_accounting_module.c         | 11 +++++-----
+ src/ngx_traffic_accounting_module.h         |  4 ++--
+ src/ngx_traffic_accounting_period_metrics.c | 24 ++++++++++-----------
+ src/stream/ngx_stream_accounting_module.c   |  8 +++----
+ 6 files changed, 30 insertions(+), 33 deletions(-)
+
+diff --git a/src/http/ngx_http_accounting_module.c b/src/http/ngx_http_accounting_module.c
+index 63eccf0..23a5fc3 100644
+--- a/src/http/ngx_http_accounting_module.c
++++ b/src/http/ngx_http_accounting_module.c
+@@ -139,7 +139,7 @@ ngx_http_accounting_process_init(ngx_cycle_t *cycle)
+     }
+ 
+     if (amcf->current == NULL) {
+-        if (ngx_traffic_accounting_period_create(cycle->pool, amcf) != NGX_OK)
++        if (ngx_traffic_accounting_period_create(amcf) != NGX_OK)
+             return NGX_ERROR;
+     }
+ 
+@@ -206,7 +206,7 @@ worker_process_alarm_handler(ngx_event_t *ev)
+ 
+     amcf = ngx_http_cycle_get_module_main_conf(ngx_cycle, ngx_http_accounting_module);
+ 
+-    ngx_traffic_accounting_period_rotate(amcf->current->pool, amcf);
++    ngx_traffic_accounting_period_rotate(amcf);
+     ngx_traffic_accounting_period_rbtree_iterate(amcf->previous,
+                               worker_process_export_metrics,
+                               amcf->previous->created_at,
+@@ -243,10 +243,10 @@ ngx_http_accounting_request_handler(ngx_http_request_t *r)
+ 
+     amcf = ngx_http_get_module_main_conf(r, ngx_http_accounting_module);
+ 
+-    metrics = ngx_traffic_accounting_period_fetch_metrics(amcf->current, accounting_id);
++    metrics = ngx_traffic_accounting_period_fetch_metrics(amcf->current, accounting_id, amcf->log);
+     if (metrics == NULL) { return NGX_ERROR; }
+ 
+-    if (ngx_traffic_accounting_metrics_init(metrics, amcf->current->pool, ngx_http_statuses_len) == NGX_ERROR)
++    if (ngx_traffic_accounting_metrics_init(metrics, ngx_http_statuses_len, amcf->log) == NGX_ERROR)
+         return NGX_ERROR;
+ 
+     amcf->current->updated_at = ngx_timeofday();
+diff --git a/src/ngx_traffic_accounting.h b/src/ngx_traffic_accounting.h
+index 1812927..462becf 100644
+--- a/src/ngx_traffic_accounting.h
++++ b/src/ngx_traffic_accounting.h
+@@ -38,21 +38,19 @@ typedef struct {
+     ngx_rbtree_t       rbtree;
+     ngx_rbtree_node_t  sentinel;
+ 
+-    ngx_pool_t        *pool;
+-
+     ngx_time_t        *created_at;
+     ngx_time_t        *updated_at;
+ } ngx_traffic_accounting_period_t;
+ 
+-ngx_int_t ngx_traffic_accounting_metrics_init(ngx_traffic_accounting_metrics_t *metrics, ngx_pool_t *pool, size_t len);
++ngx_int_t ngx_traffic_accounting_metrics_init(ngx_traffic_accounting_metrics_t *metrics, size_t len, ngx_log_t *log);
+ 
+ ngx_int_t ngx_traffic_accounting_period_init(ngx_traffic_accounting_period_t *period);
+-void ngx_traffic_accounting_period_insert(ngx_traffic_accounting_period_t *period, ngx_str_t *name);
++void ngx_traffic_accounting_period_insert(ngx_traffic_accounting_period_t *period, ngx_str_t *name, ngx_log_t *log);
+ void ngx_traffic_accounting_period_insert_metrics(ngx_traffic_accounting_period_t *period, ngx_traffic_accounting_metrics_t *metrics);
+ void ngx_traffic_accounting_period_delete(ngx_traffic_accounting_period_t *period, ngx_str_t *name);
+ void ngx_traffic_accounting_period_delete_metrics(ngx_traffic_accounting_period_t *period, ngx_traffic_accounting_metrics_t *metrics);
+ ngx_traffic_accounting_metrics_t * ngx_traffic_accounting_period_lookup_metrics(ngx_traffic_accounting_period_t *period, ngx_str_t *name);
+-ngx_traffic_accounting_metrics_t * ngx_traffic_accounting_period_fetch_metrics(ngx_traffic_accounting_period_t *period, ngx_str_t *name);
++ngx_traffic_accounting_metrics_t * ngx_traffic_accounting_period_fetch_metrics(ngx_traffic_accounting_period_t *period, ngx_str_t *name, ngx_log_t *log);
+ 
+ typedef ngx_int_t (*ngx_traffic_accounting_period_iterate_func)(void *val, void *para1, void *para2);
+ 
+diff --git a/src/ngx_traffic_accounting_module.c b/src/ngx_traffic_accounting_module.c
+index ebc877a..2291db7 100644
+--- a/src/ngx_traffic_accounting_module.c
++++ b/src/ngx_traffic_accounting_module.c
+@@ -9,15 +9,14 @@
+ 
+ 
+ ngx_int_t
+-ngx_traffic_accounting_period_create(ngx_pool_t *pool, ngx_traffic_accounting_main_conf_t *amcf)
++ngx_traffic_accounting_period_create(ngx_traffic_accounting_main_conf_t *amcf)
+ {
+     ngx_traffic_accounting_period_t   *period;
+ 
+-    period = ngx_pcalloc(pool, sizeof(ngx_traffic_accounting_period_t));
++    period = ngx_calloc(sizeof(ngx_traffic_accounting_period_t), amcf->log);
+     if (period == NULL)
+         return NGX_ERROR;
+ 
+-    period->pool = pool;
+     ngx_traffic_accounting_period_init(period);
+ 
+     period->created_at = ngx_timeofday();
+@@ -28,11 +27,11 @@ ngx_traffic_accounting_period_create(ngx_pool_t *pool, ngx_traffic_accounting_ma
+ }
+ 
+ ngx_int_t
+-ngx_traffic_accounting_period_rotate(ngx_pool_t *pool, ngx_traffic_accounting_main_conf_t *amcf)
++ngx_traffic_accounting_period_rotate(ngx_traffic_accounting_main_conf_t *amcf)
+ {
+-    ngx_pfree(pool, amcf->previous);
++    ngx_free(amcf->previous);
+ 
+     amcf->previous = amcf->current;
+ 
+-    return ngx_traffic_accounting_period_create(pool, amcf);
++    return ngx_traffic_accounting_period_create(amcf);
+ }
+diff --git a/src/ngx_traffic_accounting_module.h b/src/ngx_traffic_accounting_module.h
+index 08881f1..adfccec 100644
+--- a/src/ngx_traffic_accounting_module.h
++++ b/src/ngx_traffic_accounting_module.h
+@@ -46,8 +46,8 @@ ngx_str_t * ngx_traffic_accounting_get_accounting_id(void *entry, ngx_get_loc_co
+     ngx_get_indexed_variable_pt get_indexed_variable);
+ 
+ 
+-ngx_int_t ngx_traffic_accounting_period_create(ngx_pool_t *pool, ngx_traffic_accounting_main_conf_t *amcf);
+-ngx_int_t ngx_traffic_accounting_period_rotate(ngx_pool_t *pool, ngx_traffic_accounting_main_conf_t *amcf);
++ngx_int_t ngx_traffic_accounting_period_create(ngx_traffic_accounting_main_conf_t *amcf);
++ngx_int_t ngx_traffic_accounting_period_rotate(ngx_traffic_accounting_main_conf_t *amcf);
+ 
+ 
+ #endif /* _NGX_TRAFFIC_ACCOUNTING_MODULE_H_INCLUDED_ */
+diff --git a/src/ngx_traffic_accounting_period_metrics.c b/src/ngx_traffic_accounting_period_metrics.c
+index b6b7055..302bd84 100644
+--- a/src/ngx_traffic_accounting_period_metrics.c
++++ b/src/ngx_traffic_accounting_period_metrics.c
+@@ -10,17 +10,17 @@
+ static void ngx_traffic_accounting_period_insert_value(ngx_rbtree_node_t *temp, ngx_rbtree_node_t *node, ngx_rbtree_node_t *sentinel);
+ 
+ ngx_int_t
+-ngx_traffic_accounting_metrics_init(ngx_traffic_accounting_metrics_t *metrics, ngx_pool_t *pool, size_t len)
++ngx_traffic_accounting_metrics_init(ngx_traffic_accounting_metrics_t *metrics, size_t len, ngx_log_t *log)
+ {
+     if (metrics->nr_status == NULL) {
+-        metrics->nr_status = ngx_pcalloc(pool, sizeof(ngx_uint_t) * len);
++        metrics->nr_status = ngx_calloc(sizeof(ngx_uint_t) * len, log);
+ 
+         if (metrics->nr_status == NULL)
+             return NGX_ERROR;
+     }
+ 
+     if (metrics->nr_upstream_status == NULL) {
+-        metrics->nr_upstream_status = ngx_pcalloc(pool, sizeof(ngx_uint_t) * len);
++        metrics->nr_upstream_status = ngx_calloc(sizeof(ngx_uint_t) * len, log);
+ 
+         if (metrics->nr_upstream_status == NULL)
+             return NGX_ERROR;
+@@ -39,14 +39,14 @@ ngx_traffic_accounting_period_init(ngx_traffic_accounting_period_t *period)
+ }
+ 
+ void
+-ngx_traffic_accounting_period_insert(ngx_traffic_accounting_period_t *period, ngx_str_t *name)
++ngx_traffic_accounting_period_insert(ngx_traffic_accounting_period_t *period, ngx_str_t *name, ngx_log_t *log)
+ {
+     ngx_traffic_accounting_metrics_t   *metrics;
+ 
+-    metrics = ngx_pcalloc(period->pool, sizeof(ngx_traffic_accounting_metrics_t));
++    metrics = ngx_calloc(sizeof(ngx_traffic_accounting_metrics_t), log);
+ 
+     void *data;
+-    data = ngx_pcalloc(period->pool, name->len+1);
++    data = ngx_calloc(name->len+1, log);
+     ngx_memcpy(data, name->data, name->len);
+ 
+     metrics->name.data = data;
+@@ -82,7 +82,7 @@ void
+ ngx_traffic_accounting_period_delete_metrics(ngx_traffic_accounting_period_t *period, ngx_traffic_accounting_metrics_t *metrics)
+ {
+     ngx_rbtree_delete(&period->rbtree, &metrics->rbnode);
+-    ngx_pfree(period->pool, metrics);
++    ngx_free(metrics);
+ }
+ 
+ ngx_traffic_accounting_metrics_t *
+@@ -124,7 +124,7 @@ ngx_traffic_accounting_period_lookup_metrics(ngx_traffic_accounting_period_t *pe
+ }
+ 
+ ngx_traffic_accounting_metrics_t *
+-ngx_traffic_accounting_period_fetch_metrics(ngx_traffic_accounting_period_t *period, ngx_str_t *name)
++ngx_traffic_accounting_period_fetch_metrics(ngx_traffic_accounting_period_t *period, ngx_str_t *name, ngx_log_t *log)
+ {
+     ngx_traffic_accounting_metrics_t   *n;
+ 
+@@ -132,7 +132,7 @@ ngx_traffic_accounting_period_fetch_metrics(ngx_traffic_accounting_period_t *per
+     if (n != NULL)
+         return n;
+ 
+-    ngx_traffic_accounting_period_insert(period, name);
++    ngx_traffic_accounting_period_insert(period, name, log);
+ 
+     return ngx_traffic_accounting_period_lookup_metrics(period, name);
+ }
+@@ -158,9 +158,10 @@ ngx_traffic_accounting_period_rbtree_iterate(ngx_traffic_accounting_period_t *pe
+         if (rc == NGX_DONE) {
+             /* NGX_DONE -> destroy node */
+             ngx_rbtree_delete(rbtree, node);
+-            ngx_pfree(period->pool, n->nr_status);
+-            ngx_pfree(period->pool, n->nr_upstream_status);
+-            ngx_pfree(period->pool, n);
++            ngx_free(n->nr_status);
++            ngx_free(n->nr_upstream_status);
++            ngx_free(n->name.data);
++            ngx_free(n);
+ 
+             goto done;
+         }
+diff --git a/src/stream/ngx_stream_accounting_module.c b/src/stream/ngx_stream_accounting_module.c
+index b1839d1..3db787d 100644
+--- a/src/stream/ngx_stream_accounting_module.c
++++ b/src/stream/ngx_stream_accounting_module.c
+@@ -136,7 +136,7 @@ ngx_stream_accounting_process_init(ngx_cycle_t *cycle)
+     }
+ 
+     if (amcf->current == NULL) {
+-        if (ngx_traffic_accounting_period_create(cycle->pool, amcf) != NGX_OK)
++        if (ngx_traffic_accounting_period_create(amcf) != NGX_OK)
+             return NGX_ERROR;
+     }
+ 
+@@ -203,7 +203,7 @@ worker_process_alarm_handler(ngx_event_t *ev)
+ 
+     amcf = ngx_stream_cycle_get_module_main_conf(ngx_cycle, ngx_stream_accounting_module);
+ 
+-    ngx_traffic_accounting_period_rotate(amcf->current->pool, amcf);
++    ngx_traffic_accounting_period_rotate(amcf);
+     ngx_traffic_accounting_period_rbtree_iterate(amcf->previous,
+                               worker_process_export_metrics,
+                               amcf->previous->created_at,
+@@ -240,10 +240,10 @@ ngx_stream_accounting_session_handler(ngx_stream_session_t *s)
+ 
+     amcf = ngx_stream_get_module_main_conf(s, ngx_stream_accounting_module);
+ 
+-    metrics = ngx_traffic_accounting_period_fetch_metrics(amcf->current, accounting_id);
++    metrics = ngx_traffic_accounting_period_fetch_metrics(amcf->current, accounting_id, amcf->log);
+     if (metrics == NULL) { return NGX_ERROR; }
+ 
+-    if (ngx_traffic_accounting_metrics_init(metrics, amcf->current->pool, ngx_stream_statuses_len) == NGX_ERROR)
++    if (ngx_traffic_accounting_metrics_init(metrics, ngx_stream_statuses_len, amcf->log) == NGX_ERROR)
+         return NGX_ERROR;
+ 
+     amcf->current->updated_at = ngx_timeofday();
diff --git a/main/nginx/zstd-nginx-module~fix-infinite-loop.patch b/main/nginx/zstd-nginx-module~fix-infinite-loop.patch
new file mode 100644
index 00000000000..7f71271681a
--- /dev/null
+++ b/main/nginx/zstd-nginx-module~fix-infinite-loop.patch
@@ -0,0 +1,47 @@
+patch-source: https://github.com/tokers/zstd-nginx-module/pull/23
+
+From 7f86e5bbd7711b216688c418ffe2a64c9b25f319 Mon Sep 17 00:00:00 2001
+From: drawing <cppbreak@qq.com>
+Date: Mon, 12 Jun 2023 14:37:00 +0800
+Subject: [PATCH] bugfix: fix zstd module infinite loop when upstream return
+ content-length abnormal
+
+---
+ filter/ngx_http_zstd_filter_module.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/filter/ngx_http_zstd_filter_module.c b/filter/ngx_http_zstd_filter_module.c
+index d5784ba..cea386f 100644
+--- a/filter/ngx_http_zstd_filter_module.c
++++ b/filter/ngx_http_zstd_filter_module.c
+@@ -440,6 +440,8 @@ ngx_http_zstd_filter_compress(ngx_http_request_t *r, ngx_http_zstd_ctx_t *ctx)
+     ctx->out_buf->last += ctx->buffer_out.pos - pos_out;
+     ctx->redo = 0;
+ 
++    unsigned last_action = ctx->action;
++
+     if (rc > 0) {
+         if (ctx->action == NGX_HTTP_ZSTD_FILTER_COMPRESS) {
+             ctx->action = NGX_HTTP_ZSTD_FILTER_FLUSH;
+@@ -459,7 +461,7 @@ ngx_http_zstd_filter_compress(ngx_http_request_t *r, ngx_http_zstd_ctx_t *ctx)
+         ctx->action = NGX_HTTP_ZSTD_FILTER_COMPRESS; /* restore */
+     }
+ 
+-    if (ngx_buf_size(ctx->out_buf) == 0) {
++    if (ngx_buf_size(ctx->out_buf) == 0 && last_action != NGX_HTTP_ZSTD_FILTER_FLUSH) {
+         return NGX_AGAIN;
+     }
+ 
+@@ -469,6 +471,12 @@ ngx_http_zstd_filter_compress(ngx_http_request_t *r, ngx_http_zstd_ctx_t *ctx)
+     }
+ 
+     b = ctx->out_buf;
++    if (ngx_buf_size(b) == 0) {
++        b = ngx_calloc_buf(ctx->request->pool);
++        if (b == NULL) {
++            return NGX_ERROR;
++        }
++    }
+ 
+     if (rc == 0 && (ctx->flush || ctx->last)) {
+         r->connection->buffered &= ~NGX_HTTP_GZIP_BUFFERED;
diff --git a/main/ngircd/APKBUILD b/main/ngircd/APKBUILD
index 0d90d1dd826..6f08fbdcd05 100644
--- a/main/ngircd/APKBUILD
+++ b/main/ngircd/APKBUILD
@@ -1,21 +1,25 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ngircd
-pkgver=25
-pkgrel=0
+pkgver=26.1
+pkgrel=4
 pkgdesc="Next Generation IRC Daemon"
 url="https://ngircd.barton.de/"
 arch="all"
 license="GPL-2.0-or-later"
-makedepends="openssl-dev zlib-dev linux-pam-dev"
+makedepends="openssl-dev>3 zlib-dev linux-pam-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
 install="$pkgname.pre-install"
 source="https://ngircd.barton.de/pub/ngircd/ngircd-$pkgver.tar.xz
 	$pkgname.initd
 	"
+options="!check"
+
+# secfixes:
+#   25-r1:
+#     - CVE-2020-14148
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,10 +34,9 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
-sha512sums="61f7606a13daeac3ff69c689ad53c7e8ff70fe4dff6acbfde6a5fd3b2d4e3c9a182d9fc1a93c9e470633ab7cd201c5469b9d39599c56d7c66271d0e295dfb1f4  ngircd-25.tar.xz
+sha512sums="6333244e3fb2dc00ee9812c8c45990baa95ff473a7037a0a11ca495bed86fa438110ad5151d86b9274b6187d86b7b5712fdca2b74b8cb92f7f66fa10cf1961ee  ngircd-26.1.tar.xz
 50339507917c956a38451394a8a5996337ff29948944ff6aa40ed39f6dd3d6bfdfb864d60a24199c0a86a01e18a71f213efa6cfb2857a320f31b9fcfb92c6ac1  ngircd.initd"
diff --git a/main/ngrep/APKBUILD b/main/ngrep/APKBUILD
index c3e8caefd7c..c256a49c3b1 100644
--- a/main/ngrep/APKBUILD
+++ b/main/ngrep/APKBUILD
@@ -3,26 +3,24 @@
 pkgname=ngrep
 pkgver=1.47
 _pkgver="${pkgver/./_}"
-pkgrel=0
+pkgrel=3
 pkgdesc="A grep-like utility that allows you to search for network packets on an interface"
-url="http://ngrep.sourceforge.net/"
+url="https://ngrep.sourceforge.net/"
 arch="all"
-license="BSD"
+license="custom"
 makedepends="autoconf automake libpcap-dev pcre-dev"
 options="!check"
 subpackages="$pkgname-dbg $pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/jpr5/$pkgname/archive/V${_pkgver}.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/jpr5/ngrep/archive/V$_pkgver.tar.gz"
 builddir="$srcdir"/$pkgname-$_pkgver
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 	autoreconf -vif
 }
 
 build() {
-	cd "$builddir"
 	export EXTRA_INCLUDES=$(pcre-config --cflags)
 	export EXTRA_LIBS=$(pcre-config --libs)
 	./configure \
@@ -38,10 +36,8 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	install -Dm644 LICENSE \
-		"$pkgdir"/usr/share/licenses/custom/$pkgname/LICENSE
+	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 sha512sums="47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657  ngrep-1.47.tar.gz"
diff --git a/main/ngtcp2/APKBUILD b/main/ngtcp2/APKBUILD
new file mode 100644
index 00000000000..dfc48725110
--- /dev/null
+++ b/main/ngtcp2/APKBUILD
@@ -0,0 +1,69 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ngtcp2
+pkgver=1.4.0
+pkgrel=0
+pkgdesc="Implementation of IETF QUIC protocol"
+url="https://nghttp2.org/ngtcp2/"
+arch="all"
+license="MIT"
+makedepends="
+	cmake
+	gnutls-dev
+	samurai
+	"
+checkdepends="cunit-dev"
+subpackages="
+	$pkgname-dev
+	$pkgname-gnutls
+	"
+source="https://github.com/ngtcp2/ngtcp2/releases/download/v$pkgver/ngtcp2-$pkgver.tar.xz"
+
+build() {
+	# Build static library separately w/o LTO for compatibility with non-gcc
+	# and minimal size.
+	_build build-static -DENABLE_SHARED_LIB=OFF
+
+	# NOTE: -DINTERPROCEDURAL_OPTIMIZATION=ON doesn't work here.
+	export CFLAGS="$CFLAGS -flto=auto"
+	_build build-shared -DENABLE_STATIC_LIB=OFF
+}
+
+_build() {
+	local outdir="$1"; shift
+
+	local crossopts=
+	[ "$CBUILD" != "$CHOST" ] \
+		&& crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+
+	cmake -B "$outdir" -G Ninja \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_VERBOSE_MAKEFILE=ON \
+		-DENABLE_GNUTLS=ON \
+		$crossopts \
+		"$@"
+	cmake --build "$outdir"
+}
+
+check() {
+	cmake --build build-shared -t check
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build-static
+	DESTDIR="$pkgdir" cmake --install build-shared
+
+	rm -rf "$pkgdir"/usr/share/doc
+}
+
+gnutls() {
+	pkgdesc="$pkgdesc - GnuTLS backend"
+	depends="$pkgname=$pkgver-r$pkgrel"
+
+	amove usr/lib/libngtcp2_crypto_gnutls.so*
+}
+
+sha512sums="
+6491f158cd3bd659d593810935ceedefea8ee4a77e0a1952c0300f83188d0af1ef8313b24f9dbd3e7a795b6ad9099d2681b70ff1bafd92eed429ee028b2f2dea  ngtcp2-1.4.0.tar.xz
+"
diff --git a/main/nikto/APKBUILD b/main/nikto/APKBUILD
deleted file mode 100644
index 432fd2c4738..00000000000
--- a/main/nikto/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Fabio Aires <fabioaires.web@gmail.com>
-# Maintainer: Fabio Aires <fabioaires.web@gmail.com>
-pkgname=nikto
-pkgver=2.1.6
-pkgrel=1
-pkgdesc="A web application security scanner"
-url="https://www.cirt.net/Nikto2"
-arch="noarch"
-license="GPL-2.0"
-options="!check" # No test suite
-depends="perl nmap openssl"
-source="$pkgname-$pkgver.tar.gz::https://github.com/sullo/nikto/archive/$pkgver.tar.gz
-	nikto.conf.base"
-builddir="$srcdir/$pkgname-$pkgver/program"
-
-build() {
-	cd "$builddir"
-	return 0
-}
-
-package() {
-	cd "$builddir"
-	mkdir -p "$pkgdir"/etc/nikto "$pkgdir"/usr/bin
-	cp "$srcdir"/nikto.conf.base "$pkgdir"/etc/nikto.conf
-	cp -r databases "$pkgdir"/etc/nikto
-	cp -r templates "$pkgdir"/etc/nikto
-	cp -r plugins "$pkgdir"/etc/nikto
-	cp -r docs "$pkgdir"/etc/nikto
-	install -m 755 nikto.pl  "$pkgdir"/usr/bin
-}
-
-sha512sums="13632018ef6862de7dc53c674d7266fcfb7e164bcf3070327c103cbf8737720ffb710ccc8949acc920a6e0a85da1bb7575d073ee245bc2ba3a8a292ad1695e69  nikto-2.1.6.tar.gz
-d6e349bd20428e45d6ef49db91630e1c6d65d4cf2107a1f4c58e697d8fceeb428fb90c247fbbf8a8ad6f9d27672790d07040079b94c2480dd77dc445fccd6f69  nikto.conf.base"
diff --git a/main/nikto/nikto.conf.base b/main/nikto/nikto.conf.base
deleted file mode 100644
index 3f17dfef2a1..00000000000
--- a/main/nikto/nikto.conf.base
+++ /dev/null
@@ -1,82 +0,0 @@
-#########################################################################################################
-# CONFIG STUFF
-# $Id: config.txt 94 2009-01-21 22:47:25Z deity $
-#########################################################################################################
-
-# default command line options, can't be an option that requires a value.  used for ALL runs.
-# CLIOPTS=-g -a
-
-# ports never to scan
-SKIPPORTS=21 111
-
-# User-Agent variables:
- # @VERSION 	- Nikto version
- # @TESTID 	- Test identifier
- # @EVASIONS 	- List of active evasions
-USERAGENT=Mozilla/5.00 (Nikto/@VERSION) (Evasions:@EVASIONS) (Test:@TESTID)
-
-# RFI URL. This remote file should return a phpinfo call, for example: <?php phpinfo(); ?>
-# You may use the one below, if you like.
-RFIURL=http://cirt.net/rfiinc.txt?
-
-# IDs never to alert on (Note: this only works for IDs loaded from db_tests)
-#SKIPIDS=
-
-# The DTD
-NIKTODTD=docs/nikto.dtd
-
-# the default HTTP version to try... can/will be changed as necessary
-DEFAULTHTTPVER=1.0
-
-# Nikto can submit updated version strings to CIRT.net. It won't do this w/o permission. You should
-# send updates because it makes the data better for everyone ;)  *NO* server specific information
-# such as IP or name is sent, just the relevant version information.
-# UPDATES=yes  	- ask before each submission if it should send
-# UPDATES=no   	- don't ask, don't send
-# UPDATES=auto 	- automatically attempt submission *without prompting*
-UPDATES=yes
-
-# Warning if MAX_WARN OK or MOVED responses are retrieved
-MAX_WARN=20
-
-# Prompt... if set to 'no' you'll never be asked for anything. Good for automation.
-#PROMPTS=no
-
-# cirt.net : set the IP so that updates can work without name resolution -- just in case
-CIRT=174.142.17.165
-
-# Proxy settings -- still must be enabled by -useproxy
-#PROXYHOST=127.0.0.1
-#PROXYPORT=8080
-#PROXYUSER=proxyuserid
-#PROXYPASS=proxypassword
-
-# Cookies: send cookies with all requests
-# Multiple can be set by separating with a semi-colon, e.g.:
-# "cookie1"="cookie value";"cookie2"="cookie val" 
-#STATIC-COOKIE=
-
-# The below allows you to vary which HTTP methods are used to check whether an HTTP(s) server 
-# is running. Some web servers, such as the autopsy web server do not implement the HEAD method
-CHECKMETHODS=HEAD GET
-
-# If you want to specify the location of any of the files, specify them here
-EXECDIR=/etc/nikto				# Location of Nikto
-PLUGINDIR=/etc/nikto/plugins			# Location of plugin dir
-DBDIR=/etc/nikto/databases			# Location of plugin dir
-TEMPLATEDIR=/etc/nikto/templates		# Location of tempmlate dir
-DOCDIR=/etc/nikto/docs			# Location of docs dir
-
-# Default plugin macros
-@@MUTATE=dictionary;subdomain
-@@DEFAULT=@@ALL;-@@MUTATE;tests(report:500)
-
-#Choose SSL libs 
-# Options: 
-# SSLeay        - use Net::SSLeay 
-# SSL           - use Net::SSL 
-# auto          - automatically choose whats available 
-#                 (SSLeay wins if both are available) 
-LW_SSL_ENGINE=auto
-
-
diff --git a/main/nload/APKBUILD b/main/nload/APKBUILD
index abc947c6fa3..806c085eecc 100644
--- a/main/nload/APKBUILD
+++ b/main/nload/APKBUILD
@@ -2,39 +2,32 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nload
 pkgver=0.7.4
-pkgrel=3
+pkgrel=6
 pkgdesc="Console network traffic and bandwidth monitor"
 url="http://www.roland-riegel.de/nload"
 arch="all"
-license="GPL"
-depends=
+license="GPL-2.0-only"
 makedepends="ncurses-dev"
-install=
 subpackages="$pkgname-doc"
 source="http://www.roland-riegel.de/nload/nload-$pkgver.tar.gz"
-
-_builddir="$srcdir"/$pkgname-$pkgver
+options="!check"
 
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
-	make || return 1
+		--infodir=/usr/share/info
+	make
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD
index c9a28a7281f..fc8934710ea 100644
--- a/main/nmap/APKBUILD
+++ b/main/nmap/APKBUILD
@@ -1,19 +1,28 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=nmap
-pkgver=7.80
-pkgrel=2
-pkgdesc="A network exploration tool and security/port scanner"
+pkgver=7.94
+pkgrel=0
+pkgdesc="network exploration tool and security/port scanner"
 url="https://nmap.org"
 arch="all"
 license="custom"
-makedepends="linux-headers openssl-dev libpcap-dev pcre-dev zlib-dev libssh2-dev lua5.3-dev"
-options="!check" #FIXME: fails on armhf and aarch64
+makedepends="
+	libpcap-dev
+	libssh2-dev
+	linux-headers
+	lua5.3-dev
+	openssl-dev
+	pcre-dev
+	zlib-dev
+	"
 subpackages="
 	$pkgname-doc
 	$pkgname-scripts::noarch
 	$pkgname-nselibs::noarch
 	$pkgname-nping
-	$pkgname-ncat"
+	$pkgname-ncat
+	"
+options="net" # needed for test suite
 source="https://nmap.org/dist/nmap-$pkgver.tar.bz2
 	fortify-source.patch"
 
@@ -51,43 +60,31 @@ check() {
 
 package() {
 	make -j1 DESTDIR="$pkgdir" install
-	install -Dm644 COPYING \
-		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-
-	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
-	install -m644 CHANGELOG CONTRIBUTING.md HACKING README.md \
-		"$pkgdir"/usr/share/doc/$pkgname/
 }
 
 scripts() {
 	depends="$pkgname-nselibs"
 	pkgdesc="$pkgdesc (scripts)"
-
-	mkdir -p "$subpkgdir"/usr/share/nmap/
-	mv "$pkgdir"/usr/share/nmap/scripts \
-		"$subpkgdir"/usr/share/nmap/
+	amove usr/share/nmap/scripts
 }
 
 nselibs() {
 	pkgdesc="$pkgdesc (nselibs)"
-
-	mkdir -p "$subpkgdir"/usr/share/nmap/
-	mv "$pkgdir"/usr/share/nmap/nse_main.lua \
-		"$pkgdir"/usr/share/nmap/nselib \
-		"$subpkgdir"/usr/share/nmap/
+	amove usr/share/nmap/nse_main.lua
+	amove usr/share/nmap/nselib
 }
 
 ncat() {
 	pkgdesc="$pkgdesc (ncat tool)"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/ncat "$subpkgdir"/usr/bin
+	amove usr/bin/ncat
 }
 
 nping() {
 	pkgdesc="$pkgdesc (nping tool)"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/nping "$subpkgdir"/usr/bin
+	amove usr/bin/nping
 }
 
-sha512sums="d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b  nmap-7.80.tar.bz2
-2d1f6e290723ac643f456a0e1ac95c4c966106cf2ab743839d25c835bf0141dc2d6bfee19285c3518d4c5f553b0505dabe5a496b769ba47b7adb03e791f05b8d  fortify-source.patch"
+sha512sums="
+a55cddf9c1d9272243d01251eb3315b26f232d0596818857083222a385398618b428dc2bd8282c3e832527e135a74aeb020ca8609d83d8337342f5d8a04d7f2c  nmap-7.94.tar.bz2
+2d1f6e290723ac643f456a0e1ac95c4c966106cf2ab743839d25c835bf0141dc2d6bfee19285c3518d4c5f553b0505dabe5a496b769ba47b7adb03e791f05b8d  fortify-source.patch
+"
diff --git a/main/nodejs/APKBUILD b/main/nodejs/APKBUILD
index cd9c9509cd6..a03f4bc7567 100644
--- a/main/nodejs/APKBUILD
+++ b/main/nodejs/APKBUILD
@@ -6,6 +6,72 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 #
 # secfixes:
+#   20.12.1-r0:
+#     - CVE-2024-27982
+#     - CVE-2024-27983
+#   18.18.2-r0:
+#     - CVE-2023-45143
+#     - CVE-2023-38552
+#     - CVE-2023-39333
+#   18.17.1-r0:
+#     - CVE-2023-32002
+#     - CVE-2023-32006
+#     - CVE-2023-32559
+#   18.14.1-r0:
+#     - CVE-2023-23918
+#     - CVE-2023-23919
+#     - CVE-2023-23920
+#     - CVE-2023-23936
+#     - CVE-2023-24807
+#   18.12.1-r0:
+#     - CVE-2022-3602
+#     - CVE-2022-3786
+#     - CVE-2022-43548
+#   16.17.1-r0:
+#     - CVE-2022-32213
+#     - CVE-2022-32214
+#     - CVE-2022-32215
+#     - CVE-2022-35255
+#     - CVE-2022-35256
+#   16.13.2-r0:
+#     - CVE-2021-44531
+#     - CVE-2021-44532
+#     - CVE-2021-44533
+#     - CVE-2022-21824
+#   14.18.1-r0:
+#     - CVE-2021-22959
+#     - CVE-2021-22960
+#   14.17.6-r0:
+#     - CVE-2021-37701
+#     - CVE-2021-37712
+#     - CVE-2021-37713
+#     - CVE-2021-39134
+#     - CVE-2021-39135
+#   14.17.5-r0:
+#     - CVE-2021-3672
+#     - CVE-2021-22931
+#     - CVE-2021-22939
+#   14.17.4-r0:
+#     - CVE-2021-22930
+#   14.16.1-r0:
+#     - CVE-2020-7774
+#   14.16.0-r0:
+#     - CVE-2021-22883
+#     - CVE-2021-22884
+#   14.15.5-r0:
+#     - CVE-2021-21148
+#   14.15.4-r0:
+#     - CVE-2020-8265
+#     - CVE-2020-8287
+#   14.15.1-r0:
+#     - CVE-2020-8277
+#   12.18.4-r0:
+#     - CVE-2020-8201
+#     - CVE-2020-8252
+#   12.18.0-r0:
+#     - CVE-2020-8172
+#     - CVE-2020-11080
+#     - CVE-2020-8174
 #   12.15.0-r0:
 #     - CVE-2019-15606
 #     - CVE-2019-15605
@@ -44,59 +110,136 @@
 #     - CVE-2017-14919
 #   6.11.1-r0:
 #     - CVE-2017-1000381
-#
+#   0:
+#     - CVE-2021-43803
+#     - CVE-2022-32212
+#     - CVE-2023-44487
 pkgname=nodejs
 # Note: Update only to even-numbered versions (e.g. 6.y.z, 8.y.z)!
 # Odd-numbered versions are supported only for 9 months by upstream.
-pkgver=12.15.0
-pkgrel=1
+pkgver=20.12.1
+pkgrel=0
 pkgdesc="JavaScript runtime built on V8 engine - LTS version"
 url="https://nodejs.org/"
-arch="all !mips64 !mips64el"
+arch="all"
 license="MIT"
 depends="ca-certificates"
-depends_dev="libuv"
-makedepends="linux-headers python2 paxmark
-	zlib-dev libuv-dev openssl-dev c-ares-dev nghttp2-dev"
-subpackages="$pkgname-dev $pkgname-doc npm::noarch"
-provides="nodejs-lts=$pkgver"  # for backward compatibility
+makedepends="
+	ada-dev
+	base64-dev
+	brotli-dev
+	c-ares-dev
+	icu-dev
+	linux-headers
+	nghttp2-dev
+	openssl-dev
+	py3-jinja2
+	python3
+	samurai
+	zlib-dev
+	"
+install="$pkgname.post-upgrade"
+subpackages="
+	$pkgname-dev
+	$pkgname-libs
+	$pkgname-doc
+	"
+provider_priority=100  # highest priority (other provider is nodejs-current)
+provides="nodejs-lts=$pkgver-r$pkgrel"  # for backward compatibility
 replaces="nodejs-current nodejs-lts"  # nodejs-lts for backward compatibility
 source="https://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz
-	dont-run-gyp-files-for-bundled-deps.patch
-	link-with-libatomic-on-mips32.patch
+	disable-running-gyp-on-shared-deps.patch
+	system-ada.patch
+	system-base64.patch
+	base64.gyp
+	$pkgname.pc.in
 	"
 builddir="$srcdir/node-v$pkgver"
 
 prepare() {
 	default_prepare
 
+	# openssl.cnf is required for build.
+	mv deps/openssl/nodejs-openssl.cnf .
+
 	# Remove bundled dependencies that we're not using.
-	rm -rf deps/cares deps/openssl deps/uv deps/zlib
+	#
+	# NOTE: nghttp3 and ngtcp2 are only used when building with OpenSSL
+	#  that supports QUIC. After the QUIC support is added to openssl, add
+	#  options --shared-nghttp3 and --shared-ngtcp2.
+	rm -rf deps/ada/*.cpp \
+		deps/base64/* \
+		deps/brotli \
+		deps/cares \
+		deps/corepack \
+		deps/nghttp2 \
+		deps/nghttp3 \
+		deps/ngtcp2 \
+		deps/openssl/* \
+		deps/v8/third_party/jinja2 \
+		deps/zlib \
+		tools/inspector_protocol/jinja2
+
+	mv nodejs-openssl.cnf deps/openssl/
+
+	cp "$srcdir"/base64.gyp deps/base64/
 }
 
 build() {
-	cd "$builddir"
+	# Add defines recommended in libuv readme.
+	local common_flags="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+
+	# -Os overwrites the optimizations enabled by BUILDTYPE=Release.
+	# Compiling with O2 instead of Os increases binary size by ~10%
+	# (53.1 MiB -> 58.6 MiB), but also increases performance by ~20%
+	# according to v8/web-tooling-benchmark. Node.js is quite huge anyway;
+	# there are better options for size constrained environments.
+	export CFLAGS="${CFLAGS/-Os} $common_flags"
+	export CXXFLAGS="${CXXFLAGS/-Os} $common_flags"
+	export CPPFLAGS="${CPPFLAGS/-Os} $common_flags"
+
+	# When building shared libnode.so, the resulting package size is +15 %
+	# (~8 MiB), so we rather build it twice to keep the node binary smaller
+	# (there are currently no packages using libnode.so).
+	msg 'Building node binary'
+	_build
+	cp out/Release/node out/
+
+	msg 'Building libnode.so'
+	_build --shared
+	cp out/Release/lib/libnode.so* out/Release/
 
-	case "$CARCH" in
-	mips*) _carchflags="--with-mips-arch-variant=r1 --with-mips-float-abi=soft";;
-	esac
+	sed "s/@VERSION@/$pkgver/" "$srcdir"/$pkgname.pc.in > out/Release/$pkgname.pc
+}
 
-	./configure --prefix=/usr \
-		$_carchflags \
+_build() {
+	# NOTE: We use bundled libuv because they don't care much about backward
+	# compatibility and it has happened several times in past that we
+	# couldn't upgrade nodejs package in stable branches to fix CVEs due to
+	# libuv incompatibility.
+	#
+	# NOTE: We don't package the bundled npm - it's a separate project with
+	# its own release cycle and version numbering, so it's better to keep
+	# it in a standalone aport.
+	#
+	# TODO: Fix and enable corepack.
+	python3 configure.py \
+		--prefix=/usr \
+		--ninja \
+		--enable-lto \
+		--shared-brotli \
 		--shared-zlib \
-		--shared-libuv \
 		--shared-openssl \
 		--shared-cares \
 		--shared-nghttp2 \
-		--openssl-use-def-ca-store
-
-	# we need run mksnapshot at build time so paxmark it early.
-	make -C out mksnapshot BUILDTYPE=Release
-	paxmark -m out/Release/mksnapshot
-	make
+		--openssl-use-def-ca-store \
+		--with-icu-default-data-dir=$(icu-config --icudatadir) \
+		--with-intl=system-icu \
+		--without-corepack \
+		--without-npm \
+		"$@"
 
-	# paxmark so JIT works
-	paxmark -m out/Release/node
+	make BUILDTYPE=Release
 }
 
 # TODO Run provided test suite.
@@ -105,28 +248,20 @@ check() {
 
 	./node -e 'console.log("Hello, world!")'
 	./node -e "require('assert').equal(process.versions.node, '$pkgver')"
+	./node -e 'require("assert").equal(
+		Buffer.from(Buffer.from("foo").toString("base64"), "base64").toString("ascii"),
+		"foo")'
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 
-	# It's strange, but it really needs to be paxmarked again...
-	paxmark -m "$pkgdir"/usr/bin/node
-
-	cp -pr "$pkgdir"/usr/lib/node_modules/npm/man "$pkgdir"/usr/share
-	local d; for d in docs man; do
-		rm -r "$pkgdir"/usr/lib/node_modules/npm/$d
-	done
-
-	# XXX: Workaround for https://github.com/npm/cli/issues/780.
-	(cd "$pkgdir"/usr/share/man/man5 && find * \
-		-type f ! \( -name 'package-json.*' -or -name 'npmrc.*' -or -name 'npm-*' \) \
-		-exec mv {} npm-{} \;)
-	(cd "$pkgdir"/usr/share/man/man7 && find * \
-		-type f ! \( -name 'semver.*' -or -name 'npm-*' \) \
-		-exec mv {} npm-{} \;)
+	# node binary built without libnode.so.
+	install -D -m755 out/node -t "$pkgdir"/usr/bin/
+
+	install -D -m644 out/Release/$pkgname.pc -t "$pkgdir"/usr/lib/pkgconfig/
+
+	(cd "$pkgdir"/usr/lib; ln -sf libnode.so.* libnode.so)
 }
 
 dev() {
@@ -134,20 +269,11 @@ dev() {
 	default_dev
 }
 
-npm() {
-	pkgdesc="A package manager for JavaScript"
-	depends="$pkgname"
-	# for backward compatibility
-	provides="nodejs-npm=$pkgver-r$pkgrel nodejs-current-npm=$pkgver-r$pkgrel"
-	replaces="nodejs-npm nodejs-current-npm $pkgname"
-
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/np[mx] "$subpkgdir"/usr/bin/
-
-	mkdir -p "$subpkgdir"/usr/lib/node_modules
-	mv "$pkgdir"/usr/lib/node_modules/npm "$subpkgdir"/usr/lib/node_modules/
-}
-
-sha512sums="b1c5412b27b85e286f7f5e6758f30659655f18570e9b114d6743cea98e902297f0bd591ffe36e2a4483a3b9e5138f5f82f5975131eaab72495a477f960b938e0  node-v12.15.0.tar.gz
-3c536776e2ecb5dc677bf711a09418085b3c5e931a6eaf647f47c28e194d5c6dec354d4e7a039a5805b30fc7e83140594851e18d9120f523eec2f93539eac4db  dont-run-gyp-files-for-bundled-deps.patch
-9f60928b53447f9590c7065bcdbdd4065d10a06e8451531615791a3bd7d14f9114807e5446e0ec00e2cb7a11a277050345e34636b199db2979d7f022b31ffde4  link-with-libatomic-on-mips32.patch"
+sha512sums="
+24a858477f087383b9a531247ecd5622810b8a1af3a3baf3c4f3e608cceacb90642230ddb0f2d9043c19e87459da45ea5d6f3ffe0874948b2be90be53f39cc8c  node-v20.12.1.tar.gz
+8c264eefc0bfa9dd57656f9f515e940d5c21b8d836dc549031ee559ba909643f4f2495b8b392ee9976c5eed7c3b4a09db876bbe0f7fcd5b2bf63fafca37bffc2  disable-running-gyp-on-shared-deps.patch
+4fc09500212ebc178801e7419c840ccebc239ff06edcb28910315e39bfc772a3967f5ff2abff03845269e730643be161134ac95bab899069fa57dd64be98defa  system-ada.patch
+94db1f150cb962bf19f42e0ef7cec2c0e007d1909611d03a393095720cc8db58322e638ea3c3280b4412f47615963c88e69c71b4c5adf84292b9fc7f3be3b110  system-base64.patch
+bb0f74d8fb1ef07fd457670b9073a3cecadb3ac7d4fea008e8f17c091a62d15ef50646be457a50ac24c4129085d4da21beedd03af0739dded5d636916482f082  base64.gyp
+f908fa93f6194ec4f6c5e9d76ed7c918721c7f5d46afcc12de1f84683c185401a27a174b7a7c6a76085a4d0826f964e7088bf5596d4e6901a15bf751846299a6  nodejs.pc.in
+"
diff --git a/main/nodejs/base64.gyp b/main/nodejs/base64.gyp
new file mode 100644
index 00000000000..17023dcefcc
--- /dev/null
+++ b/main/nodejs/base64.gyp
@@ -0,0 +1,15 @@
+{
+  'targets': [
+    {
+      'target_name': 'base64',
+      'type': 'shared_library',
+      'include_dirs': ['/usr/include'],
+      'direct_dependent_settings': {
+        'include_dirs': ['/usr/include'],
+        'linkflags': ['-lbase64'],
+        'ldflags': ['-lbase64'],
+        'libraries': ['-lbase64']
+      }
+    },
+  ]
+}
diff --git a/main/nodejs/disable-running-gyp-on-shared-deps.patch b/main/nodejs/disable-running-gyp-on-shared-deps.patch
new file mode 100644
index 00000000000..ce3cbe224c1
--- /dev/null
+++ b/main/nodejs/disable-running-gyp-on-shared-deps.patch
@@ -0,0 +1,22 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sat, 26 Nov 2016 01:32:00 +0200
+Subject: Disable running gyp on shared deps
+
+Author: Stephen Gallagher <sgallagh@redhat.com>
+
+Modified 2016-11-26 by Jakub Jirutka <jakub@jirutka.cz> to update for
+Node.js 7.2.0
+
+diff --git a/Makefile b/Makefile
+index 94013466..de3f5e9a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -169,7 +169,7 @@ with-code-cache test-code-cache:
+ 	$(warning '$@' target is a noop)
+ 
+ out/Makefile: config.gypi common.gypi node.gyp \
+-	deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \
++	deps/uv/uv.gyp deps/llhttp/llhttp.gyp \
+ 	deps/simdutf/simdutf.gyp deps/ada/ada.gyp \
+ 	tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
+ 	tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
diff --git a/main/nodejs/dont-run-gyp-files-for-bundled-deps.patch b/main/nodejs/dont-run-gyp-files-for-bundled-deps.patch
deleted file mode 100644
index db2ab01c66e..00000000000
--- a/main/nodejs/dont-run-gyp-files-for-bundled-deps.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Sat, 26 Nov 2016 01:32:00 +0200
-Subject: Disable running gyp files for bundled deps
-
-Author: Stephen Gallagher <sgallagh@redhat.com>
-
-Modified 2016-11-26 by Jakub Jirutka <jakub@jirutka.cz> to update for
-Node.js 7.2.0
-
---- a/Makefile
-+++ b/Makefile
-@@ -141,7 +141,7 @@
- 	echo "'test-code-cache' target is a noop"
- 
- out/Makefile: config.gypi common.gypi node.gyp \
--	deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \
-+	deps/http_parser/http_parser.gyp \
- 	tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
- 	tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
- 	$(PYTHON) tools/gyp_node.py -f make
diff --git a/main/nodejs/link-with-libatomic-on-mips32.patch b/main/nodejs/link-with-libatomic-on-mips32.patch
deleted file mode 100644
index 21f9960d7bd..00000000000
--- a/main/nodejs/link-with-libatomic-on-mips32.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/tools/v8_gypfiles/v8.gyp
-+++ b/tools/v8_gypfiles/v8.gyp
-@@ -2460,6 +2460,11 @@
-         }, {
-           'toolsets': ['target'],
-         }],
-+        [ 'host_arch=="mips" or host_arch=="mipsel"', {
-+          'link_settings': {
-+            'libraries': [ '-latomic' ],
-+          },
-+        }],
-         ['component=="shared_library"', {
-           'direct_dependent_settings': {
-             'defines': [ 'USING_V8_PLATFORM_SHARED' ],
---- a/node.gyp
-+++ b/node.gyp
-@@ -315,6 +315,11 @@
-       'msvs_disabled_warnings!': [4244],
- 
-       'conditions': [
-+        [ 'host_arch=="mips" or host_arch=="mipsel"', {
-+          'link_settings': {
-+            'libraries': [ '-latomic' ],
-+          },
-+        }],
-         [ 'node_intermediate_lib_type=="static_library" and '
-             'node_shared=="true" and OS=="aix"', {
-           # For AIX, shared lib is linked by static lib and .exp. In the
diff --git a/main/nodejs/nodejs.pc.in b/main/nodejs/nodejs.pc.in
new file mode 100644
index 00000000000..12577552501
--- /dev/null
+++ b/main/nodejs/nodejs.pc.in
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: nodejs
+Description: JavaScript Runtime
+Version: @VERSION@
+Libs: -L${libdir} -lnode
+Cflags: -I${includedir}/node
diff --git a/main/nodejs/nodejs.post-upgrade b/main/nodejs/nodejs.post-upgrade
new file mode 100644
index 00000000000..764aa17ff34
--- /dev/null
+++ b/main/nodejs/nodejs.post-upgrade
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# This file is not provided since splitting npm into a separate aport,
+# so we use it to quickly detect presence of the old npm package.
+if [ -f /usr/lib/node_modules/npm/configure ]; then
+	pkg_ver=$(apk info -W /usr/bin/npm 2>/dev/null \
+	        | sed -En 's/.*owned by npm-([^-]+).*/\1/p' \
+		| grep .) || exit 0
+
+	npm_ver=$(/usr/bin/npm --version 2>/dev/null) || exit 0
+
+	[ "$pkg_ver" = "$npm_ver" ] && exit 0
+
+	cat >&2 <<-EOF
+	*
+	* You have an old version of the 'npm' package installed
+	* (pkg version: $pkg_ver, real version: $npm_ver). The newer package
+	* has a *lower* version number that now corresponds to the actual
+	* version of the 'npm' program. You have to reinstall the npm package
+	* (apk del npm; apk add npm) or upgrade all packages to the available
+	* versions (apk upgrade -a).
+	*
+	EOF
+fi
+
+exit 0
diff --git a/main/nodejs/system-ada.patch b/main/nodejs/system-ada.patch
new file mode 100644
index 00000000000..b956177cc33
--- /dev/null
+++ b/main/nodejs/system-ada.patch
@@ -0,0 +1,36 @@
+diff --git a/deps/ada/ada.gyp b/deps/ada/ada.gyp
+index 55cea003..b5a08656 100644
+--- a/deps/ada/ada.gyp
++++ b/deps/ada/ada.gyp
+@@ -6,12 +6,14 @@
+   'targets': [
+     {
+       'target_name': 'ada',
+-      'type': 'static_library',
+-      'include_dirs': ['.'],
++      'type': 'shared_library',
++      'include_dirs': ['/usr/include/ada'],
+       'direct_dependent_settings': {
+-        'include_dirs': ['.'],
+-      },
+-      'sources': [ '<@(ada_sources)' ]
++        'include_dirs': ['/usr/include/ada'],
++        'linkflags': ['-lada'],
++        'ldflags': ['-lada'],
++        'libraries': ['-lada']
++      }
+     },
+   ]
+ }
+diff --git a/node.gyp b/node.gyp
+index f092c332..06fcd510 100644
+--- a/node.gyp
++++ b/node.gyp
+@@ -465,6 +465,7 @@
+       'dependencies': [
+         'deps/histogram/histogram.gyp:histogram',
+         'deps/uvwasi/uvwasi.gyp:uvwasi',
++        'deps/ada/ada.gyp:ada',
+       ],
+ 
+       'msvs_settings': {
diff --git a/main/nodejs/system-base64.patch b/main/nodejs/system-base64.patch
new file mode 100644
index 00000000000..39902781d33
--- /dev/null
+++ b/main/nodejs/system-base64.patch
@@ -0,0 +1,33 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sun, 19 Nov 2023 22:45:01 +0100
+Subject: [PATCH] Link with shared libbase64
+
+The second part is our modified base64.gyp.
+
+--- a/node.gyp
++++ b/node.gyp
+@@ -512,7 +512,8 @@
+       'dependencies': [
+         'deps/histogram/histogram.gyp:histogram',
+         'deps/uvwasi/uvwasi.gyp:uvwasi',
+         'deps/ada/ada.gyp:ada',
++        'deps/base64/base64.gyp:base64'
+       ],
+ 
+       'msvs_settings': {
+@@ -1117,6 +1119,7 @@
+         'deps/histogram/histogram.gyp:histogram',
+         'deps/uvwasi/uvwasi.gyp:uvwasi',
+         'deps/ada/ada.gyp:ada',
++        'deps/base64/base64.gyp:base64',
+       ],
+ 
+       'includes': [
+@@ -1228,6 +1231,7 @@
+         'deps/histogram/histogram.gyp:histogram',
+         'deps/uvwasi/uvwasi.gyp:uvwasi',
+         'deps/ada/ada.gyp:ada',
++        'deps/base64/base64.gyp:base64',
+       ],
+ 
+       'includes': [
diff --git a/main/npth/APKBUILD b/main/npth/APKBUILD
index f01b9d7e304..967b45a68f0 100644
--- a/main/npth/APKBUILD
+++ b/main/npth/APKBUILD
@@ -1,18 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=npth
 pkgver=1.6
-pkgrel=0
+pkgrel=4
 pkgdesc="The New GNU Portable Threads library"
-url="ftp://ftp.gnupg.org/gcrypt/npth/"
+url="https://gnupg.org/related_software/npth/"
 arch="all"
-license="LGPL-3.0-or-later or GPL-2.0-or-later or (LGPL-3.0-or-later and GPL-2.0-or-later)"
+license="LGPL-2.0-or-later"
 subpackages="$pkgname-dev"
-source="ftp://ftp.gnupg.org/gcrypt/npth/npth-$pkgver.tar.bz2"
+source="https://gnupg.org/ftp/gcrypt/npth/npth-$pkgver.tar.bz2"
 
-builddir="$srcdir/$pkgname-$pkgver"
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +27,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/nrpe/APKBUILD b/main/nrpe/APKBUILD
index da004c910de..aee979c21e4 100644
--- a/main/nrpe/APKBUILD
+++ b/main/nrpe/APKBUILD
@@ -1,26 +1,28 @@
 # Maintainer: Jeff Bilyk <jbilyk@gmail.com>
 pkgname=nrpe
-pkgver=3.2.1
-pkgrel=1
+pkgver=4.1.0
+pkgrel=2
 pkgusers="nagios"
 pkggroups="nagios"
 pkgdesc="NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines."
-url="http://www.nagios.org/download/addons"
+url="https://www.nagios.org/downloads/nagios-core-addons/"
 arch="all"
-license="GPL"
-makedepends="openssl-dev autoconf"
+license="GPL-2.0-or-later"
+makedepends="openssl-dev>3"
 install="nrpe.pre-install"
-subpackages="$pkgname-plugin"
-source="https://downloads.sourceforge.net/nagios/$pkgname-$pkgver.tar.gz
+subpackages="$pkgname-plugin $pkgname-openrc"
+source="https://github.com/NagiosEnterprises/nrpe/releases/download/nrpe-$pkgver/nrpe-$pkgver.tar.gz
 	sample-config.patch
 	nrpe.initd
 	nrpe.confd"
-builddir="$srcdir/$pkgname-$pkgver"
 options="!check" # needs services to run
 
-build() {
-	cd "$builddir"
+# secfixes:
+#   4.0.0-r0:
+#     - CVE-2020-6581
+#     - CVE-2020-6582
 
+build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,6 +32,7 @@ build() {
 		--infodir=/usr/share/info \
 		--libexecdir=/usr/lib/nagios/plugins \
 		--localstatedir=/var \
+		--with-logdir=/var/log \
 		--with-need-dh=no \
 		--with-init-type=openrc \
 		--enable-command-args
@@ -37,8 +40,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install install-daemon install-config
 
 	rm "$pkgdir"/usr/bin/nrpe-uninstall
@@ -56,7 +57,9 @@ plugin() {
 	make DESTDIR="$subpkgdir" install-plugin
 }
 
-sha512sums="ec6ff42a00bd97ed80010a82e26dc35fd419f2feda65820cda0108068173c1ae44eee698833a50fd2079429a6f5eb1321c4f06b09c6708bc5fbe48f176389856  nrpe-3.2.1.tar.gz
+sha512sums="
+a47935eecc65d646737166f98f5f160e3d1d5bbd245e006e8cd0758af75db083f870db6c02c1edd0d44cf9a91909ba26df8eee1620a7ac4d9f98032f2cce8981  nrpe-4.1.0.tar.gz
 5949a019a9e699559c66d506029e8c7a2daa298dfd254cab3d8049eec59ccec03efe5a5f32190fbc1f3fdc884cd204636f0eb445793758886d199efae46ef1ce  sample-config.patch
 b2f23bab97384ef8f1760c79d0cbadb4e81d4bb8134887a38662033a7f0c30480222b9ecb78c3ae276bd8b35470b3db316143f591baa2c535f5fb26c34ad2824  nrpe.initd
-05a0f1f5f75345370cae3262f9988d537e24dfcbb6c14a1ff3486193625481045d0844c035f7be491e74ca9ad45ed0fae7b7005616936cc274cd7e8a851c8628  nrpe.confd"
+05a0f1f5f75345370cae3262f9988d537e24dfcbb6c14a1ff3486193625481045d0844c035f7be491e74ca9ad45ed0fae7b7005616936cc274cd7e8a851c8628  nrpe.confd
+"
diff --git a/main/nsd/APKBUILD b/main/nsd/APKBUILD
index ffb58dadf5b..267e20d0379 100644
--- a/main/nsd/APKBUILD
+++ b/main/nsd/APKBUILD
@@ -4,21 +4,27 @@
 # Contributor: Iggy Jackson <iggy@theiggy.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nsd
-pkgver=4.3.0
+pkgver=4.9.1
 pkgrel=0
 pkgdesc="Authoritative only, high performance and simple DNS server"
 url="https://www.nlnetlabs.nl/projects/nsd"
 arch="all"
 license="BSD-3-Clause"
-makedepends="openssl-dev libevent-dev"
+makedepends="openssl-dev>3 libevent-dev"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
-subpackages="$pkgname-doc $pkgname-dbg $pkgname-openrc"
+subpackages="$pkgname-doc $pkgname-dbg $pkgname-openrc $pkgname-bash-completion"
 pkgusers="nsd"
 pkggroups="nsd"
 source="https://www.nlnetlabs.nl/downloads/nsd/nsd-$pkgver.tar.gz
 	nsd.initd
 	config.patch
+	tsig-openssl.patch
 	"
+options="!check"
+
+# secfixes:
+#   4.3.4-r0:
+#     - CVE-2020-28935
 
 build() {
 	./configure \
@@ -30,7 +36,7 @@ build() {
 		--with-pidfile=/run/nsd/nsd.pid \
 		--with-xfrdir=/var/db/nsd \
 		--enable-ratelimit \
-		--enable-ratelimit-default-is-off
+		--enable-ratelimit-default-is-off \
 	make
 }
 
@@ -43,11 +49,19 @@ package() {
 	install -d "$pkgdir"/usr/share/doc/$pkgname
 	cp -a "$builddir"/doc/* "$builddir"/contrib \
 		"$pkgdir"/usr/share/doc/$pkgname/
+	rm "$pkgdir"/usr/share/doc/nsd/contrib/nsd.service
+
+	mkdir -p "$pkgdir"/usr/share/bash-completion/completions
+	mv "$pkgdir"/usr/share/doc/nsd/contrib/autocomplete_nsd-control.bash \
+		"$pkgdir"/usr/share/bash-completion/completions/nsd-control
 
 	install -d -m 755 -o nsd -g nsd "$pkgdir"/var/db/nsd
 	rm -fr "$pkgdir"/run
 }
 
-sha512sums="8724fdfe9ca07dce6cf73bd0441a5d6b6e8a37f31744aca185e8cff2bde66ba677c189bb0b5bd8c8ec5682cd623bf24c0087ae47630615292b96d89f1d4134c5  nsd-4.3.0.tar.gz
+sha512sums="
+65cd38aa8a41aee57a6950747de448bc4007a2d2c095152f1d22006f85faa7f0732ec4aa0aeae9f46bc69bff17164d8fe384bbc3441d0484364c4af938b511c1  nsd-4.9.1.tar.gz
 bc2b27d98b99db067c7c4b152ee40ae81b8ee66989f873ca0c21f57333c3734bb342866f68d5837f10bb56cb598fafc794095c02b8bc97ef6dace450cae526a6  nsd.initd
-4c107bba33785a031f29c2d078419c8f0858c94a2488e192a6e76085e7135755352446d350ad4561b02beb767fecd488ac710fc1d2ba9e19a9c42f484331bd3c  config.patch"
+5b192f2151114d1853fb17f89324d9cc7ec16aa4d057c4f86b81ce8385b69eeb128df737e12597705c2acd33cdfd5857ed3234e4be153a36ba1dcf4175232701  config.patch
+3a9085320ceb4b63d2cada23f730f515b306d641c782a0b1b0b9c4cef0e473f5e6accbce8bbbfdb2ce0275adb947f5705aa3e0f1e4809775e2910173456b7e5b  tsig-openssl.patch
+"
diff --git a/main/nsd/config.patch b/main/nsd/config.patch
index 244f95b755a..7620f490fed 100644
--- a/main/nsd/config.patch
+++ b/main/nsd/config.patch
@@ -1,16 +1,6 @@
 --- a/nsd.conf.sample.in
 +++ b/nsd.conf.sample.in
-@@ -79,9 +79,6 @@
- 	# facility LOG_DAEMON).  stderr disappears when daemon goes to bg.
- 	# logfile: "@logfile@"
- 
--	# File to store pid for nsd in.
--	# pidfile: "@pidfile@"
--
- 	# The file where secondary zone refresh and expire timeouts are kept.
- 	# If you delete this file, all secondary zones are forced to be 
- 	# 'refreshing' (as if nsd got a notify).  Set to "" to disable.
-@@ -222,11 +219,14 @@
+@@ -264,7 +264,9 @@
  remote-control:
  	# Enable remote control with nsd-control(8) here.
  	# set up the keys and certificates with nsd-control-setup.
@@ -20,9 +10,12 @@
 +	control-enable: yes
  
  	# what interfaces are listened to for control, default is on localhost.
- 	# with an absolute path, a unix local named pipe is used for control
- 	# (and key and cert files are not needed, use directory permissions).
-+	control-interface: /run/nsd.control.sock
+ 	# interfaces can be specified by IP address or interface name.
+@@ -275,6 +277,7 @@
  	# control-interface: 127.0.0.1
  	# control-interface: ::1
+ 	# control-interface: lo
++	control-interface: /run/nsd.control.sock
  
+ 	# port number for remote control operations (uses TLS over TCP).
+ 	# control-port: 8952
diff --git a/main/nsd/tsig-openssl.patch b/main/nsd/tsig-openssl.patch
new file mode 100644
index 00000000000..77b54d1f2d8
--- /dev/null
+++ b/main/nsd/tsig-openssl.patch
@@ -0,0 +1,11 @@
+--- a/tsig-openssl.c
++++ b/tsig-openssl.c
+@@ -117,7 +117,7 @@
+ #ifndef HAVE_EVP_MAC_CTX_NEW
+ 	algorithm->maximum_digest_size = EVP_MD_size(hmac_algorithm);
+ #else
+-	algorithm->maximum_digest_size = EVP_MAC_size(hmac_ctx);
++	algorithm->maximum_digest_size = EVP_MAC_CTX_get_mac_size(hmac_ctx);
+ #endif
+ 	if(algorithm->maximum_digest_size < 20)
+ 		algorithm->maximum_digest_size = EVP_MAX_MD_SIZE;
diff --git a/main/nspr/APKBUILD b/main/nspr/APKBUILD
index 0035b742021..df5b3f11d6e 100644
--- a/main/nspr/APKBUILD
+++ b/main/nspr/APKBUILD
@@ -1,31 +1,32 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nspr
-pkgver=4.25
-pkgrel=0
+pkgver=4.35
+pkgrel=4
 pkgdesc="Netscape Portable Runtime"
 url="https://www.mozilla.org/projects/nspr/"
 arch="all"
-license="GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only AND MPL-2.0"
+license="MPL-2.0"
 options="!check"  # No test suite.
 # -dev package does not ship any symlinks so dependency cannot be autodetected
-depends_dev="nspr linux-headers"
+depends_dev="$pkgname=$pkgver-r$pkgrel linux-headers"
 makedepends="autoconf automake linux-headers"
 subpackages="$pkgname-dev"
 source="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$pkgver/src/nspr-$pkgver.tar.gz
-	fix-getproto.patch
-	fix-sgidefs-usage.patch
+	lfs64.patch
 	"
 
 prepare() {
 	mkdir build inst
 	default_prepare
+	update_config_sub
 }
 
 build() {
 	local conf=
-	if [ "$CARCH" = "x86_64" ];then
-		conf="--enable-64bit"
-	fi
+	case "$CARCH" in
+		arm*|x86) conf="";;
+		*) conf="--enable-64bit";;
+	esac
 	cd "$builddir"/build
 	# ./nspr/pr/include/md/_linux.h tests only __GLIBC__ version
 	# to detect c-library features, list musl features here for now.
@@ -42,13 +43,11 @@ build() {
 }
 
 package() {
-	local file=
-
 	cd "$builddir"/build
 	make DESTDIR="$pkgdir" install
 
 	cd "$pkgdir"/usr/lib
-	rm -f *.a
+	rm -f -- *.a
 
 	cd "$builddir"/build/config
 	install -Dm755 nspr-config "$pkgdir"/usr/bin/nspr-config
@@ -59,6 +58,7 @@ package() {
 		"$pkgdir"/usr/include/nspr/md
 }
 
-sha512sums="b9aa576e0da37e8729088fe559d94030cf18f277c1f7a30104d3088a804913343ed884645c0adb62144da475e20934b359f897bf3ae9a6ebb5f9daf283d5a562  nspr-4.25.tar.gz
-7062cc03e38541282226781e67c886c78ca693f7ee96df96509c9429470d294ca6b87ebe05ea809920b9ef78eaa0a0d21ae575a1ac438f148d0c1dc915424613  fix-getproto.patch
-69e804907d1a8867912511818d9827e4d7fd36ff44253cb21f4a5527610076874ddf5aada87717ef6454162c21248c9f7c3395376c585129134950c12f90ac0f  fix-sgidefs-usage.patch"
+sha512sums="
+502815833116e25f79ddf71d1526484908aa92fbc55f8a892729cb404a4daafcc0470a89854cd080d2d20299fdb7d9662507c5362c7ae661cbacf308ac56ef7f  nspr-4.35.tar.gz
+626208e91c296bb26cee84e2b5dcc2ff2d576e06dacf7008655590c0b76ea21cb33cd96994fad3b0e771e8d7d60a3d90f71f81f33a8e9c1b7ce8536f5c6cab8a  lfs64.patch
+"
diff --git a/main/nspr/fix-getproto.patch b/main/nspr/fix-getproto.patch
deleted file mode 100644
index cb1a9b2977a..00000000000
--- a/main/nspr/fix-getproto.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/nspr/pr/src/misc/prnetdb.c
-+++ b/nspr/pr/src/misc/prnetdb.c
-@@ -58,9 +58,7 @@
-  * an int, and glibc's flavor takes five arguments.
-  */
- 
--#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \
--    || (defined(LINUX) && defined(_REENTRANT) \
--        && defined(__GLIBC__) && __GLIBC__ < 2)
-+#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT))
- #define _PR_HAVE_GETPROTO_R
- #define _PR_HAVE_GETPROTO_R_POINTER
- #endif
diff --git a/main/nspr/fix-sgidefs-usage.patch b/main/nspr/fix-sgidefs-usage.patch
deleted file mode 100644
index 3719d6452a2..00000000000
--- a/main/nspr/fix-sgidefs-usage.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/nspr/pr/include/md/_linux.cfg
-+++ b/nspr/pr/include/md/_linux.cfg
-@@ -498,8 +498,8 @@
- 
- #elif defined(__mips__)
- 
--/* For _ABI64 */
--#include <sgidefs.h>
-+/* For _MIPS_SIM_ABI64 */
-+#include <asm/sgidefs.h>
- 
- #ifdef __MIPSEB__
- #define IS_BIG_ENDIAN 1
-@@ -511,7 +511,7 @@
- #error "Unknown MIPS endianness."
- #endif
- 
--#if _MIPS_SIM == _ABI64
-+#if _MIPS_SIM == _MIPS_SIM_ABI64
- 
- #define IS_64
- 
-@@ -555,7 +555,7 @@
- #define PR_BYTES_PER_WORD_LOG2   3
- #define PR_BYTES_PER_DWORD_LOG2  3
- 
--#else /* _ABI64 */
-+#else /* _MIPS_SIM_ABI64 */
- 
- #define PR_BYTES_PER_BYTE   1
- #define PR_BYTES_PER_SHORT  2
-@@ -597,7 +597,7 @@
- #define PR_BYTES_PER_WORD_LOG2   2
- #define PR_BYTES_PER_DWORD_LOG2  3
- 
--#endif /* _ABI64 */
-+#endif /* _MIPS_SIM_ABI64 */
- 
- #elif defined(__arm__)
- 
diff --git a/main/nspr/lfs64.patch b/main/nspr/lfs64.patch
new file mode 100644
index 00000000000..2201d49c8ba
--- /dev/null
+++ b/main/nspr/lfs64.patch
@@ -0,0 +1,15 @@
+diff --git a/nspr/pr/include/md/_unixos.h b/nspr/pr/include/md/_unixos.h
+index 7d444cd..40ec47e 100644
+--- a/nspr/pr/include/md/_unixos.h
++++ b/nspr/pr/include/md/_unixos.h
+@@ -588,8 +588,8 @@ typedef struct stat64 _MDStat64;
+ typedef off64_t _MDOff64_t;
+ 
+ #elif defined(_PR_HAVE_OFF64_T)
+-typedef struct stat64 _MDStat64;
+-typedef off64_t _MDOff64_t;
++typedef struct stat _MDStat64;
++typedef off_t _MDOff64_t;
+ #elif defined(_PR_HAVE_LARGE_OFF_T)
+ typedef struct stat _MDStat64;
+ typedef off_t _MDOff64_t;
diff --git a/main/nss-pam-ldapd/10-define-netdb-internal.patch b/main/nss-pam-ldapd/10-define-netdb-internal.patch
new file mode 100644
index 00000000000..039753c7c81
--- /dev/null
+++ b/main/nss-pam-ldapd/10-define-netdb-internal.patch
@@ -0,0 +1,15 @@
+Author: Nick O'Connor <nick@o-connor.io>
+Summary: Fixes musl compatibility
+----
+--- a/configure.ac.orig
++++ b/configure.ac
+@@ -499,6 +499,9 @@
+       #include <nsswitch.h>
+       #endif])
+
++  # if not defined, define NETDB_INTERNAL
++  AC_CHECK_DECL([NETDB_INTERNAL],,[AC_DEFINE([NETDB_INTERNAL], [-1], "define NETDB_INTERNAL")])
++
+   # check if struct nss_XbyY_args has a returnlen attribute
+   AC_CHECK_MEMBERS([struct nss_XbyY_args.returnlen],,, [[
+       #ifdef HAVE_NSS_H
\ No newline at end of file
diff --git a/main/nss-pam-ldapd/APKBUILD b/main/nss-pam-ldapd/APKBUILD
index 8d29f1a2a20..316f8e0b596 100644
--- a/main/nss-pam-ldapd/APKBUILD
+++ b/main/nss-pam-ldapd/APKBUILD
@@ -1,20 +1,25 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nss-pam-ldapd
 pkgver=0.9.11
-pkgrel=0
+pkgrel=4
 pkgdesc="An nsswitch module which uses directory servers"
 url="https://arthurdejong.org/nss-pam-ldapd/"
 arch="all"
-license="LGPL-2.0-or-later"
-depends_dev="linux-pam-dev openldap-dev"
-makedepends="$depends_dev"
+license="LGPL-2.1-or-later"
+makedepends="autoconf automake linux-pam-dev openldap-dev musl-nscd-dev"
 install="nss-pam-ldapd.pre-install"
 subpackages="$pkgname-doc $pkgname-openrc"
 source="https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-$pkgver.tar.gz
+	10-define-netdb-internal.patch
 	nslcd.initd"
+options="!check"
+
+prepare() {
+	default_prepare
+	autoreconf -fiv
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,15 +28,15 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--disable-nss
+		--libdir=/lib
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm755 "$srcdir"/nslcd.initd "$pkgdir"/etc/init.d/nslcd
 }
 
 sha512sums="2b307805667526b85c724e113fe38899eee397e5c8673e89090d4836ce6d0ffcf18dd022d6c20a5e11d4138e736451b841a0f16ba379d524de4faaaf02906645  nss-pam-ldapd-0.9.11.tar.gz
+8916713358d8e8b42877701aaec241a8052c5dd95047355daee4bfbfcf26e138063797a2fa06db0298f7406b58c1ee6da1483d37000d2fcf47c88da9008a7443  10-define-netdb-internal.patch
 26db842fd517ccc0b242677d6e92c2fe66028e441681c8e6129150e81c93a282ae0c3142230f61b579f40596c2843ca1f2217d46f9d8fb3ba4b117896912355b  nslcd.initd"
diff --git a/main/nss/APKBUILD b/main/nss/APKBUILD
index 6eb2772cc24..d26d36a891a 100644
--- a/main/nss/APKBUILD
+++ b/main/nss/APKBUILD
@@ -1,25 +1,50 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nss
-pkgver=3.51
+pkgver=3.99
 pkgrel=0
 pkgdesc="Mozilla Network Security Services"
 url="https://developer.mozilla.org/docs/Mozilla/Projects/NSS"
 arch="all"
 license="MPL-2.0"
-options="!check" # failing tests
 depends_dev="nspr-dev"
-makedepends="nspr-dev sqlite-dev zlib-dev perl bsd-compat-headers linux-headers"
-subpackages="$pkgname-static $pkgname-dev $pkgname-tools"
+makedepends="
+	$depends_dev
+	bash
+	bsd-compat-headers
+	linux-headers
+	gyp
+	perl
+	sqlite-dev
+	zlib-dev
+	"
+subpackages="$pkgname-dev $pkgname-tools"
 source="https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-$pkgver.tar.gz
+	gyp-config.patch
+	no-werror.patch
 	nss.pc.in
 	nss-util.pc.in
 	nss-softokn.pc.in
 	nss-config.in
-	add_spi+cacert_ca_certs.patch
 	"
 
 # secfixes:
+#   3.98-r0:
+#     - CVE-2023-5388
+#   3.76.1-r0:
+#     - CVE-2022-1097
+#   3.73-r0:
+#     - CVE-2021-43527
+#   3.58-r0:
+#     - CVE-2020-25648
+#   3.55-r0:
+#     - CVE-2020-12400
+#     - CVE-2020-12401
+#     - CVE-2020-12403
+#     - CVE-2020-6829
+#   3.53.1-r0:
+#     - CVE-2020-12402
 #   3.49-r0:
 #     - CVE-2019-17023
 #   3.47.1-r0:
@@ -29,49 +54,35 @@ source="https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM
 #   3.39-r0:
 #     - CVE-2018-12384
 
-prepare() {
-	default_prepare
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
-		"$builddir"/nss/coreconf/rules.mk
-}
-
 build() {
-	unset CFLAGS
-	unset CXXFLAGS
-	export BUILD_OPT=1
-	export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-	export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-	export FREEBL_NO_DEPEND=0
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSS_ENABLE_WERROR=0
-	export NSPR_INCLUDE_DIR=$(pkg-config --cflags-only-I nspr | sed 's/-I//')
-	export NSPR_LIB_DIR=$(pkg-config --libs-only-L nspr | sed 's/-L//')
-	case "$CARCH" in
-		*64* | s390x) export USE_64=1;;
-	esac
-	make -j 1 -C nss/coreconf
-	make -j 1 -C nss/lib/dbm
-	make -j 1 -C nss
+	cd nss
+	CFLAGS="$CFLAGS -O2 -flto=auto" \
+	CXXFLAGS="$CXXFLAGS -O2 -flto=auto" \
+	./build.sh \
+		--opt \
+		--system-nspr \
+		--system-sqlite \
+		--enable-libpkix
 }
 
 check() {
-	HOST=localhost DOMSUF=localdomain sh "$builddir/nss/tests/all.sh"
+	cd nss/tests
+	# other tests are failing for some reason and prompt an interactive password
+	export NSS_TESTS="cipher lowhash libpkix"
+	export NSS_CYCLES=standard
+	HOST=localhost DOMSUF=localdomain bash ./all.sh
 }
 
 package() {
 	replaces="nss-dev libnss"
 
-	install -m755 -d "$pkgdir"/usr/lib/pkgconfig
-	install -m755 -d "$pkgdir"/usr/bin
-	install -m755 -d "$pkgdir"/usr/include/nss/private
-
-	NSS_VMAJOR=$(awk '/#define.*NSS_VMAJOR/ {print $3}' nss/lib/nss/nss.h)
-	NSS_VMINOR=$(awk '/#define.*NSS_VMINOR/ {print $3}' nss/lib/nss/nss.h)
-	NSS_VPATCH=$(awk '/#define.*NSS_VPATCH/ {print $3}' nss/lib/nss/nss.h)
+	local nss_vmajor=$(awk '/#define.*NSS_VMAJOR/ {print $3}' nss/lib/nss/nss.h)
+	local nss_vminor=$(awk '/#define.*NSS_VMINOR/ {print $3}' nss/lib/nss/nss.h)
+	local nss_vpatch=$(awk '/#define.*NSS_VPATCH/ {print $3}' nss/lib/nss/nss.h)
+	local nspr_version="$(pkg-config --modversion nspr)"
 
 	# pkgconfig files
+	mkdir -p "$pkgdir"/usr/lib/pkgconfig
 	local _pc; for _pc in nss.pc nss-util.pc nss-softokn.pc; do
 		sed "$srcdir"/$_pc.in \
 			-e "s,%libdir%,/usr/lib,g" \
@@ -79,7 +90,7 @@ package() {
 			-e "s,%exec_prefix%,/usr/bin,g" \
 			-e "s,%includedir%,/usr/include/nss,g" \
 			-e "s,%SOFTOKEN_VERSION%,$pkgver,g" \
-			-e "s,%NSPR_VERSION%,$pkgver,g" \
+			-e "s,%NSPR_VERSION%,$nspr_version,g" \
 			-e "s,%NSS_VERSION%,$pkgver,g" \
 			-e "s,%NSSUTIL_VERSION%,$pkgver,g" \
 			> "$pkgdir"/usr/lib/pkgconfig/$_pc
@@ -88,52 +99,45 @@ package() {
 	chmod 644 "$pkgdir"/usr/lib/pkgconfig/*.pc
 
 	# nss-config
+	mkdir -p "$pkgdir"/usr/bin
 	sed "$srcdir"/nss-config.in \
 		-e "s,@libdir@,/usr/lib,g" \
 		-e "s,@prefix@,/usr/bin,g" \
 		-e "s,@exec_prefix@,/usr/bin,g" \
 		-e "s,@includedir@,/usr/include/nss,g" \
-		-e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
-		-e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
-		-e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
+		-e "s,@MOD_MAJOR_VERSION@,${nss_vmajor},g" \
+		-e "s,@MOD_MINOR_VERSION@,${nss_vminor},g" \
+		-e "s,@MOD_PATCH_VERSION@,${nss_vpatch},g" \
 		> "$pkgdir"/usr/bin/nss-config
 	chmod 755 "$pkgdir"/usr/bin/nss-config
+
 	local minor=${pkgver#*.}
 	minor=${minor%.*}
-	for file in $(find dist/*.OBJ/lib -name "*.so"); do
-		install -m755 $file \
+	find dist/Release/lib -name "*.so" | while IFS= read -r file; do
+		install -Dm755 $file \
 			"$pkgdir"/usr/lib/${file##*/}.$minor
 		ln -s ${file##*/}.$minor "$pkgdir"/usr/lib/${file##*/}
 	done
-	install -m644 dist/*.OBJ/lib/*.a "$pkgdir"/usr/lib/
-	install -m644 dist/*.OBJ/lib/*.chk "$pkgdir"/usr/lib/
 
 	for file in certutil cmsutil crlutil modutil pk12util shlibsign \
 			signtool signver ssltap; do
-		install -m755 dist/*.OBJ/bin/$file "$pkgdir"/usr/bin/
+		install -Dm755 dist/Release/bin/$file -t "$pkgdir"/usr/bin/
 	done
-	install -m644 dist/public/nss/*.h "$pkgdir"/usr/include/nss/
-	install -m644 dist/private/nss/blapi.h dist/private/nss/alghmac.h "$pkgdir"/usr/include/nss/private/
-}
 
-static() {
-	default_static
-
-	# remove libssl.a which conflicts with openssl
-	rm "$subpkgdir"/usr/lib/libssl.a
+	install -Dm644 dist/public/nss/*.h -t "$pkgdir"/usr/include/nss/
+	install -Dm644 dist/private/nss/blapi.h dist/private/nss/alghmac.h -t "$pkgdir"/usr/include/nss/private/
 }
 
 dev() {
 	# we cannot use default_dev because we need the .so symlinks in main package
 	local i
 	pkgdesc="Development files for nss"
-	depends="$pkgname $depends_dev"
+	depends="$pkgname=$pkgver-r$pkgrel $depends_dev"
 
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/nss-config "$subpkgdir"/usr/bin
+	amove usr/bin/nss-config
 
 	cd "$pkgdir"
-	for i in usr/include usr/lib/pkgconfig usr/lib/*.a; do
+	for i in usr/include usr/lib/pkgconfig; do
 		if [ -e "$pkgdir/$i" ] || [ -L "$pkgdir/$i" ]; then
 			d="$subpkgdir/${i%/*}"  # dirname $i
 			mkdir -p "$d"
@@ -141,20 +145,21 @@ dev() {
 			rmdir "$pkgdir/${i%/*}" 2>/dev/null || true
 		fi
 	done
-	mv "$pkgdir"/usr/lib/libgtest1.* "$pkgdir"/usr/lib/libnsssysinit.* \
-		"$subpkgdir"/usr/lib
 }
 
 tools() {
 	pkgdesc="Tools for the Network Security Services"
 	replaces="nss"
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+
+	amove usr/bin
 }
 
-sha512sums="9c894b1ea41449b000750a7b3a89fcb43dfc3d0d4d6dcc0dc288bc73996f76f1ee1ede927a8aecae6d4a07f9f3d3e3a042c6a60cf06e27e0cdc004fce2e510fd  nss-3.51.tar.gz
+sha512sums="
+8ae032f3cb8eadfe524505d20e430b90ed25af2b4732b2cf286c435b0fcd5701d2f5c48bd2cfb3f9aa0bfdf503c1f3d5394cf34f860f51a1141cc4a7586bba32  nss-3.99.tar.gz
+fba19cc35986dde6e5994ce67ab29fb4417814e12d6ae82c406600832eb8db79a0fdea4fd5eb6c5e77d565bfebb9e154e190796f67c06097ddae1539084243bb  gyp-config.patch
+20046e6adf3d1cfcd8ddf2b92fe3f79678d569c653d26126dde6a967ab6c90a798b9a6bb6351f82d49dbd751d0637c5e46aa98dbe7342c8cd604c7e3dc8ce48a  no-werror.patch
 75dbd648a461940647ff373389cc73bc8ec609139cd46c91bcce866af02be6bcbb0524eb3dfb721fbd5b0bc68c20081ed6f7debf6b24317f2a7ba823e8d3c531  nss.pc.in
 0f2efa8563b11da68669d281b4459289a56f5a3a906eb60382126f3adcfe47420cdcedc6ab57727a3afeeffa2bbb4c750b43bef8b5f343a75c968411dfa30e09  nss-util.pc.in
 09c69d4cc39ec9deebc88696a80d0f15eb2d8c94d9daa234a2adfec941b63805eb4ce7f2e1943857b938bddcaee1beac246a0ec627b71563d9f846e6119a4a15  nss-softokn.pc.in
 2971669e128f06a9af40a5ba88218fa7c9eecfeeae8b0cf42e14f31ed12bf6fa4c5ce60289e078f50e2669a9376b56b45d7c29d726a7eac69ebe1d1e22dc710b  nss-config.in
-6e04556858499aec465d6670818465327ba2cb099061c2afee4b5cac8aa61938e0095906acfb38df6a1b70a6bde6dd69f08bb4c00a9d188e4cb3131b26c1bc16  add_spi+cacert_ca_certs.patch"
+"
diff --git a/main/nss/add_spi+cacert_ca_certs.patch b/main/nss/add_spi+cacert_ca_certs.patch
deleted file mode 100644
index ccf97310385..00000000000
--- a/main/nss/add_spi+cacert_ca_certs.patch
+++ /dev/null
@@ -1,561 +0,0 @@
---- a/nss/lib/ckfw/builtins/certdata.txt
-+++ b/nss/lib/ckfw/builtins/certdata.txt
-@@ -20926,3 +20926,558 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
- CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
- CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "CAcert.org Class 1 Root CA"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\000
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000
-+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
-+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
-+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
-+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
-+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
-+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
-+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
-+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063
-+\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060
-+\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016
-+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
-+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
-+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
-+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
-+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
-+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
-+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
-+\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
-+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
-+\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007
-+\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002
-+\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011
-+\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315
-+\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230
-+\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272
-+\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016
-+\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052
-+\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262
-+\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140
-+\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150
-+\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273
-+\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022
-+\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234
-+\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334
-+\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070
-+\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232
-+\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044
-+\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355
-+\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252
-+\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352
-+\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276
-+\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306
-+\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320
-+\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167
-+\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335
-+\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324
-+\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246
-+\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106
-+\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272
-+\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334
-+\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304
-+\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060
-+\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265
-+\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071
-+\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230
-+\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260
-+\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016
-+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
-+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
-+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
-+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
-+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
-+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
-+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
-+\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001
-+\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037
-+\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160
-+\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157
-+\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006
-+\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164
-+\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060
-+\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045
-+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162
-+\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077
-+\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102
-+\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165
-+\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164
-+\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040
-+\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167
-+\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006
-+\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001
-+\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201
-+\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275
-+\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234
-+\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323
-+\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073
-+\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140
-+\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353
-+\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160
-+\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334
-+\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231
-+\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116
-+\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145
-+\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031
-+\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363
-+\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330
-+\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367
-+\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260
-+\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223
-+\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335
-+\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026
-+\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005
-+\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361
-+\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371
-+\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246
-+\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206
-+\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153
-+\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344
-+\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143
-+\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362
-+\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226
-+\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175
-+\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305
-+\103
-+END
-+
-+# Trust for Certificate "CAcert.org Class 1 Root CA"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106
-+\166\316\217\063
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\000
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "CAcert.org Class 3 Root CA"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143
-+\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004
-+\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101
-+\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004
-+\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040
-+\063\040\122\157\157\164
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001
-+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
-+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
-+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
-+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
-+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
-+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
-+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
-+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065
-+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060
-+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022
-+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156
-+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164
-+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157
-+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143
-+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164
-+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001
-+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001
-+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335
-+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175
-+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163
-+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144
-+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001
-+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171
-+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313
-+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011
-+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353
-+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277
-+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331
-+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205
-+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073
-+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161
-+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371
-+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047
-+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252
-+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102
-+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064
-+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133
-+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242
-+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137
-+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325
-+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150
-+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230
-+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140
-+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347
-+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321
-+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206
-+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257
-+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164
-+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373
-+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003
-+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006
-+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006
-+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072
-+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162
-+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034
-+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162
-+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003
-+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001
-+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002
-+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101
-+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160
-+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206
-+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241
-+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072
-+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135
-+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253
-+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364
-+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172
-+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302
-+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214
-+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074
-+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154
-+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025
-+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352
-+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231
-+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213
-+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325
-+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242
-+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214
-+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027
-+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057
-+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224
-+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134
-+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356
-+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005
-+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355
-+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143
-+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123
-+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243
-+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005
-+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156
-+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317
-+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360
-+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101
-+\322\156\245\033\231\047\200\347\013\251\250\000
-+END
-+
-+# Trust for Certificate "CAcert.org Class 3 Root CA"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304
-+\030\116\052\055
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "Software in the Public Interest, Inc. Root CA (2008)"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\011\000\350\216\266\311\370\052\024\050
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000
-+\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206
-+\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003
-+\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010
-+\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125
-+\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163
-+\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167
-+\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151
-+\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003
-+\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061
-+\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146
-+\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061
-+\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026
-+\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151
-+\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063
-+\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060
-+\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125
-+\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023
-+\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004
-+\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061
-+\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141
-+\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143
-+\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125
-+\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036
-+\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151
-+\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045
-+\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150
-+\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156
-+\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
-+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
-+\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051
-+\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074
-+\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271
-+\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240
-+\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321
-+\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265
-+\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175
-+\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375
-+\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161
-+\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342
-+\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172
-+\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056
-+\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247
-+\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310
-+\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361
-+\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356
-+\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110
-+\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151
-+\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316
-+\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307
-+\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320
-+\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205
-+\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123
-+\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154
-+\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275
-+\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356
-+\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250
-+\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204
-+\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147
-+\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305
-+\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057
-+\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124
-+\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060
-+\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161
-+\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122
-+\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346
-+\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102
-+\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061
-+\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016
-+\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025
-+\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141
-+\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037
-+\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040
-+\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061
-+\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141
-+\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103
-+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157
-+\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015
-+\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100
-+\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216
-+\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377
-+\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206
-+\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035
-+\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102
-+\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151
-+\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164
-+\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102
-+\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141
-+\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055
-+\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206
-+\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057
-+\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143
-+\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125
-+\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164
-+\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016
-+\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015
-+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002
-+\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162
-+\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030
-+\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255
-+\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065
-+\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014
-+\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306
-+\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051
-+\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017
-+\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302
-+\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213
-+\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017
-+\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162
-+\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152
-+\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357
-+\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266
-+\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104
-+\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177
-+\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253
-+\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206
-+\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217
-+\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265
-+\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225
-+\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140
-+\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207
-+\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252
-+\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340
-+\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254
-+\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275
-+\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132
-+\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151
-+\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005
-+\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004
-+\243\140
-+END
-+
-+# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044
-+\251\220\103\034
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\011\000\350\216\266\311\370\052\024\050
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff --git a/main/nss/gyp-config.patch b/main/nss/gyp-config.patch
new file mode 100644
index 00000000000..426426966d3
--- /dev/null
+++ b/main/nss/gyp-config.patch
@@ -0,0 +1,49 @@
+diff --git a/nss/coreconf/config.gypi b/nss/coreconf/config.gypi
+index 6900f79..9188d53 100644
+--- a/nss/coreconf/config.gypi
++++ b/nss/coreconf/config.gypi
+@@ -35,7 +35,7 @@
+         ['OS=="mac"', {
+           'use_system_sqlite%': 1,
+         },{
+-          'use_system_sqlite%': 0,
++          'use_system_sqlite%': 1,
+         }],
+         ['OS=="mac" or OS=="ios" or OS=="solaris" or OS=="win"', {
+           'cc_use_gnu_ld%': 0,
+@@ -102,8 +102,8 @@
+     'disable_intel_hw_sha%': 0,
+     'disable_tests%': 0,
+     'disable_chachapoly%': 0,
+-    'disable_deprecated_seed%': 0,
+-    'disable_deprecated_rc2%': 0,
++    'disable_deprecated_seed%': 1,
++    'disable_deprecated_rc2%': 1,
+     'disable_dbm%': 1,
+     'disable_libpkix%': 1,
+     'disable_werror%': 0,
+diff --git a/nss/nss.gyp b/nss/nss.gyp
+index 2cf713a..10c9b63 100644
+--- a/nss/nss.gyp
++++ b/nss/nss.gyp
+@@ -210,20 +210,6 @@
+             'cmd/vfychain/vfychain.gyp:vfychain',
+             'cmd/vfyserv/vfyserv.gyp:vfyserv',
+             'cmd/mpitests/mpitests.gyp:mpi_tests',
+-            'gtests/base_gtest/base_gtest.gyp:base_gtest',
+-            'gtests/certhigh_gtest/certhigh_gtest.gyp:certhigh_gtest',
+-            'gtests/cryptohi_gtest/cryptohi_gtest.gyp:cryptohi_gtest',
+-            'gtests/der_gtest/der_gtest.gyp:der_gtest',
+-            'gtests/certdb_gtest/certdb_gtest.gyp:certdb_gtest',
+-            'gtests/freebl_gtest/freebl_gtest.gyp:freebl_gtest',
+-            'gtests/mozpkix_gtest/mozpkix_gtest.gyp:mozpkix_gtest',
+-            'gtests/nss_bogo_shim/nss_bogo_shim.gyp:nss_bogo_shim',
+-            'gtests/pkcs11testmodule/pkcs11testmodule.gyp:pkcs11testmodule',
+-            'gtests/pk11_gtest/pk11_gtest.gyp:pk11_gtest',
+-            'gtests/smime_gtest/smime_gtest.gyp:smime_gtest',
+-            'gtests/softoken_gtest/softoken_gtest.gyp:softoken_gtest',
+-            'gtests/ssl_gtest/ssl_gtest.gyp:ssl_gtest',
+-            'gtests/util_gtest/util_gtest.gyp:util_gtest',
+             'lib/ckfw/builtins/testlib/builtins-testlib.gyp:nssckbi-testlib',
+           ],
+           'conditions': [
diff --git a/main/nss/no-werror.patch b/main/nss/no-werror.patch
new file mode 100644
index 00000000000..9055ae39755
--- /dev/null
+++ b/main/nss/no-werror.patch
@@ -0,0 +1,12 @@
+diff --git a/nss/coreconf/werror.py b/nss/coreconf/werror.py
+index 2f622c5..286cd46 100644
+--- a/nss/coreconf/werror.py
++++ b/nss/coreconf/werror.py
+@@ -38,7 +38,6 @@ def main():
+         print('-DNSS_NO_GCC48')
+         return
+ 
+-    print('-Werror')
+     print('-Wall')
+ 
+     def set_warning(warning, contra=''):
diff --git a/main/ntfs-3g/APKBUILD b/main/ntfs-3g/APKBUILD
index 9f63527fe11..1be9d17c3db 100644
--- a/main/ntfs-3g/APKBUILD
+++ b/main/ntfs-3g/APKBUILD
@@ -1,21 +1,43 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ntfs-3g
 _pkgreal=ntfs-3g_ntfsprogs
-pkgver=2017.3.23
-pkgrel=1
+pkgver=2022.10.3
+pkgrel=3
 pkgdesc="Stable, full-featured, read-write NTFS"
-url="http://www.tuxera.com/community/ntfs-3g-download/"
+url="https://www.tuxera.com/company/open-source/"
 arch="all"
-license="GPL"
+license="GPL-2.0-only"
+options="!check" # No test suite
 makedepends="attr-dev util-linux-dev linux-headers"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-progs"
-source="http://tuxera.com/opensource/$_pkgreal-$pkgver.tgz"
+subpackages="
+	$pkgname-static
+	$pkgname-doc
+	$pkgname-dev
+	$pkgname-libs
+	$pkgname-progs
+	"
+source="https://tuxera.com/opensource/ntfs-3g_ntfsprogs-$pkgver.tgz
+	"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
+# secfixes:
+#   2022.10.3-r0:
+#     - CVE-2022-40284
+#   2022.5.17-r0:
+#     - CVE-2021-46790
+#     - CVE-2022-30783
+#     - CVE-2022-30784
+#     - CVE-2022-30785
+#     - CVE-2022-30786
+#     - CVE-2022-30787
+#     - CVE-2022-30788
+#     - CVE-2022-30789
+#   2017.3.23-r2:
+#     - CVE-2019-9755
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,7 +51,6 @@ build() {
 package() {
 	pkgdesc="$pkgdesc (driver)"
 
-	cd "$builddir"
 	mkdir -p "$pkgdir"/lib
 	make -j1 DESTDIR="$pkgdir" LDCONFIG=: install
 	ln -s /bin/ntfs-3g "$pkgdir"/sbin/mount.ntfs
@@ -40,8 +61,9 @@ progs() {
 
 	mkdir -p "$subpkgdir"/sbin
 	mv "$pkgdir"/usr "$pkgdir"/lib "$subpkgdir"/
-	mv "$pkgdir"/sbin/mkfs.ntfs "$subpkgdir"/sbin
 	rm -fr "$subpkgdir"/lib "$subpkgdir"/usr/lib
 }
 
-sha512sums="3a607f0d7be35204c992d8931de0404fbc52032c13b4240d2c5e6f285c318a28eb2a385d7cf5ac4cd445876aee5baa5753bb636ada0d870d84a9d3fdbce794ef  ntfs-3g_ntfsprogs-2017.3.23.tgz"
+sha512sums="
+891589483954423b19bef6e8a174fb4311ad92b6397a0db80f77c72b746bf18c2fa12457a571947f92755637a6bc784188920d4f017ae12a420819ab0d74af59  ntfs-3g_ntfsprogs-2022.10.3.tgz
+"
diff --git a/main/ntop/APKBUILD b/main/ntop/APKBUILD
deleted file mode 100644
index 083ad8b730a..00000000000
--- a/main/ntop/APKBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
-pkgname=ntop
-pkgver=5.0.1
-pkgrel=15
-pkgdesc="Network traffic probe"
-url="https://www.ntop.org/"
-arch="all"
-license="GPL-3.0-only"
-pkgusers="ntop"
-pkggroups="ntop"
-makedepends="autoconf automake freetype-dev gdbm-dev geoip-dev
-	libart-lgpl-dev libevent-dev libpcap-dev libpng-dev libtool libxml2-dev
-	lua-dev openssl-dev python2-dev rrdtool-dev subversion wget zlib-dev
-	linux-headers"
-install="$pkgname.pre-install"
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://sourceforge.net/projects/ntop/files/ntop/Stable/ntop-$pkgver.tar.gz
-	include-sys-types.h.patch
-	automake.patch
-	reorder_make_deps
-	ntop-rrdtool-1.6.0.patch
-	ntop.initd
-	ntop.confd
-	ntop-update-geoip-db"
-
-build() {
-	update_config_guess
-	update_config_sub
-	./autogen.sh --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--disable-snmp
-	patch -p1 < "$srcdir"/reorder_make_deps
-	make
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-	install -m755 -D "$srcdir"/ntop-update-geoip-db \
-		"$pkgdir"/usr/bin/ntop-update-geoip-db
-	# ntop internal db dir
-	install -d -o ntop -g ntop -m755 "$pkgdir"/var/lib/ntop
-	chown -R ntop.ntop "$pkgdir"/usr/share/ntop
-}
-
-sha512sums="f52c40e6c00c8d2f46b68078c5f9aef8ed78670f92a0a81f66f2f44c71d41bc4c001b4550f19b71c546f7c07cbbed15e0aa1ee13873ac63a11678bf2b8483f2a  ntop-5.0.1.tar.gz
-b67705152cd8723ba3e1c340ca55267134dddae04dd281fae262d07ce273a78d24bf40c297fe61ea7f70deb9cb7d59445e8a3ce360ed7810497e63052e1a9214  include-sys-types.h.patch
-ce284679f9ecf589139b6cfdba95a76df5205f5292a5ff88b7cdeb39fe01b4fef27fb097a6a594017aa015a2474fea6c5729917423398a911e1732329ec1504a  automake.patch
-ab1fb14317721a18d044145ddb552f827ec02c042ae591af6e7a738c28defcce53767493f01dcc31a6f4bfeb0d8032ceeca330a425a6c6e4efde0b22f8e1be9e  reorder_make_deps
-3532acc6e54a1abdefeba42b3adb68cba1a0d1d2d6422e5b33fb9823b48481bb83696f097e65288c5811a6dd65ce20bff6d285d152776156b0690610d4026245  ntop-rrdtool-1.6.0.patch
-22b61d88e1fc30106d07ee87701ff46b7f63f1ee2aa7bb5666d9cb5cb6251c583f793c80a5d799ac27fcb63650e7ecacb37e7992feb8aa8cbc2d326b36b05a8f  ntop.initd
-8693050cab03eeb29b59e0a7b173c7791625e8cd6bc33eaa5d74a50ab3ecf435577d7918626cfe3963a0d23d4522a737737b2b9fd8335df29784858a6191813d  ntop.confd
-7b5ae8dbd7d5d084c7278af1deb64a903b106663c3195df70acead3e8d7e14fbd996e69d5132c0ddac9147b3e70892c91695d834ab7b22fec2569efcd52df5f6  ntop-update-geoip-db"
diff --git a/main/ntop/automake.patch b/main/ntop/automake.patch
deleted file mode 100644
index db68ccee2b7..00000000000
--- a/main/ntop/automake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./configure.in.orig	2012-12-31 21:13:54.969154614 +0000
-+++ ./configure.in	2012-12-31 21:14:11.542636354 +0000
-@@ -56,7 +56,7 @@
- dnl> generate the config header
- dnl>
- umask 002
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
- 
- HAS_ERROR=
- HAS_WARNING=
-@@ -324,7 +324,6 @@
- echo
- echo "Checking C compiler program and features..."
- echo
--AM_PROG_CC_STDC
- if test ".${ac_cv_prog_cc_stdc}" = ".no"; then
-     echo
-     echo "*******************************************************************"
diff --git a/main/ntop/include-sys-types.h.patch b/main/ntop/include-sys-types.h.patch
deleted file mode 100644
index dfb0e7378c6..00000000000
--- a/main/ntop/include-sys-types.h.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/nDPI/src/include/ipq_api.h.orig
-+++ b/nDPI/src/include/ipq_api.h
-@@ -24,6 +24,7 @@
- #ifndef __IPOQUE_API_INCLUDE_FILE__

- #define __IPOQUE_API_INCLUDE_FILE__

- 

-+#include <sys/types.h>

- 

- #if defined(HAVE_NTOP) && defined(WIN32)

- #include <winsock2.h>

---- a/nDPI/src/lib/ipq_main.c.orig
-+++ b/nDPI/src/lib/ipq_main.c
-@@ -21,6 +21,7 @@
-  */
- 
- 
-+#include <sys/types.h>
- #include "ipq_main.h"
- #include "ipq_protocols.h"
- #include "ipq_utils.h"
diff --git a/main/ntop/ntop-rrdtool-1.6.0.patch b/main/ntop/ntop-rrdtool-1.6.0.patch
deleted file mode 100644
index 51439390f17..00000000000
--- a/main/ntop/ntop-rrdtool-1.6.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up ntop-5.0.1/configure.in.rrdtool ntop-5.0.1/configure.in
---- ntop-5.0.1/configure.in.rrdtool	2016-10-16 20:32:46.194496951 +0200
-+++ ntop-5.0.1/configure.in	2016-10-16 20:32:57.392486940 +0200
-@@ -893,19 +893,19 @@ else
-    fi
- fi
- 
--RRD_LIB="-L${RRD_HOME}/lib -lrrd_th"
-+RRD_LIB="-L${RRD_HOME}/lib -lrrd"
- 
--if test -f "$RRD_HOME/lib/librrd_th.so"; then
-+if test -f "$RRD_HOME/lib/librrd.so"; then
-    AC_MSG_RESULT(checking for rrdtool... yes)
- else
--  if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX
-+  if test -f "$RRD_HOME/lib/librrd.dylib"; then # OSX
-      AC_MSG_RESULT(checking for rrdtool... yes)
-   else
--     if test -f "$RRD_HOME/lib/librrd_th.a"; then
-+     if test -f "$RRD_HOME/lib/librrd.a"; then
-        AC_MSG_RESULT(checking for rrdtool... yes)
-      else
--       AC_CHECK_LIB([rrd_th], [main])
--       if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then
-+       AC_CHECK_LIB([rrd], [main])
-+       if test ".${ac_cv_lib_rrd_main}" != ".yes"; then
-          AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR);
- 	 AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/);
-        else
diff --git a/main/ntop/ntop-update-geoip-db b/main/ntop/ntop-update-geoip-db
deleted file mode 100644
index 2bf3faaf68c..00000000000
--- a/main/ntop/ntop-update-geoip-db
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-BASE_URL=http://geolite.maxmind.com/download/geoip/database
-
-echo "Updating NTOP GeoIP databases..."
-
-cd /var/lib/ntop || exit
-
-for u in asnum/GeoIPASNum.dat.gz GeoLiteCity.dat.gz ; do
-	FILE_GZ=${u#*/}
-	FILE=${FILE_GZ%.gz}
-	wget -nv -O ${FILE_GZ} ${BASE_URL}/${u} &&
-		gunzip < ${FILE_GZ} > .${FILE} &&
-		mv -f .${FILE} ${FILE} &&
-		rm -f ${FILE_GZ} ||
-		exit
-done
-
-/etc/init.d/ntop --quiet status && /etc/init.d/ntop restart
-
-echo "NTOP GeoIP databases were successfully updated"
diff --git a/main/ntop/ntop.confd b/main/ntop/ntop.confd
deleted file mode 100644
index 352a26fa9b1..00000000000
--- a/main/ntop/ntop.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Config file for /etc/init.d/ntop
-
-# Set preferred options here
-#NTOP_OPTS="--http-server 3000 --https-server 0 --interface eth0"
-
-# suggestions from bug #136983 (use it in case you experience ntop hangs)
-#NTOP_OPTS="u ntop -P /var/lib/ntop --disable-schedyield --http-server 3000 --https-server 3001"
-
-NTOP_OPTS="-u ntop -P /var/lib/ntop"
diff --git a/main/ntop/ntop.initd b/main/ntop/ntop.initd
deleted file mode 100644
index ec9afd576f3..00000000000
--- a/main/ntop/ntop.initd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ ! -e /var/lib/ntop/ntop_pw.db ]; then
-		eerror "You need to set a password first by running"
-		eerror "ntop --set-admin-password"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ntop"
-	export LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
-	export GDFONTPATH=/usr/share/fonts/corefonts # apparently the only font that works (#231705)
-	start-stop-daemon --start --exec /usr/bin/ntop -- -d -L ${NTOP_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ntop"
-	start-stop-daemon --stop --retry 30 --pidfile /var/run/ntop.pid
-	eend $?
-}
diff --git a/main/ntop/ntop.pre-install b/main/ntop/ntop.pre-install
deleted file mode 100755
index 0fea81baa7b..00000000000
--- a/main/ntop/ntop.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S ntop 2>/dev/null
-adduser -S -D -H -h /var/lib/ntop -s /sbin/nologin -G ntop -g ntop ntop 2>/dev/null
-
-exit 0
diff --git a/main/ntop/reorder_make_deps b/main/ntop/reorder_make_deps
deleted file mode 100644
index 3a104272eef..00000000000
--- a/main/ntop/reorder_make_deps
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugins/Makefile
-+++ b/plugins/Makefile
-@@ -793,7 +793,7 @@
- 	done
- check-am: all-am
- check: check-recursive
--all-am: Makefile $(PROGRAMS) $(LTLIBRARIES)
-+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
- installdirs: installdirs-recursive
- installdirs-am:
- 	for dir in "$(DESTDIR)$(libdir)"; do \
diff --git a/main/numactl/APKBUILD b/main/numactl/APKBUILD
index 2e4db3ce51d..519dff89e2b 100644
--- a/main/numactl/APKBUILD
+++ b/main/numactl/APKBUILD
@@ -1,44 +1,36 @@
 # Maintainer: Daniel Sabogal <dsabogalcc@gmail.com>
 pkgname=numactl
-pkgver=2.0.13
+pkgver=2.0.18
 pkgrel=0
 pkgdesc="Simple NUMA policy support"
 url="https://github.com/numactl/numactl"
-# ARM lacks the __NR_migrate_pages syscall
-arch="all !armhf !armv7"
+arch="all"
 license="LGPL-2.1-only"
-makedepends="autoconf automake libtool linux-headers"
+makedepends="linux-headers"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
-source="numactl-$pkgver.tar.gz::https://github.com/numactl/numactl/archive/v$pkgver.tar.gz
-	musl.patch"
+source="https://github.com/numactl/numactl/releases/download/v$pkgver/numactl-$pkgver.tar.gz"
 
 case "$CARCH" in
-	s390x)  options="!check";; # FAIL: distance test
-	mips*)  options="!check";; # XXX: numa support not enabled on builder
+ppc64le)
+	# no numa support in builder's kernel
+	options="$options !check"
+	;;
 esac
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	./autogen.sh
-}
-
-check() {
-	cd "$builddir"
-	make check VERBOSE=1 TESTS='test/distance test/nodemap test/tbitmap'
-}
-
 build() {
-	cd "$builddir"
 	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
 		--mandir=/usr/share/man
 	make
 }
 
+check() {
+	make check VERBOSE=1 TESTS='test/distance test/nodemap test/tbitmap'
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	# provided by linux man-pages
@@ -49,9 +41,9 @@ tools() {
 	pkgdesc="NUMA policy control tools"
 	license="GPL-2.0-only"
 
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+	amove usr/bin
 }
 
-sha512sums="328e2c9ff102f3402f02aac0c94a06c3d352a026ffb6dc31edb4dca029a530719f6dd9903163f6c2eef1a24f6aac10c2a6a52cefcdf7cf0bd9e3844ac85096d8  numactl-2.0.13.tar.gz
-c24affa5a8a8ea83d7f0ee384dc0629e17a5c4201357132f770f894ad4236772116d96d8389d54fb99095af40d1ccbffc3170b5fb9cc88cfca39179f50bee9c9  musl.patch"
+sha512sums="
+17abe7a3744065edb5ec1e27135873629031c509313809ca99e0d9254f7a5cb00cce5b32173e811e9b9d7cb407aabdcbe3c6be6e3b094ad3e7d696a154b7f1ec  numactl-2.0.18.tar.gz
+"
diff --git a/main/numactl/musl.patch b/main/numactl/musl.patch
deleted file mode 100644
index 009233f6308..00000000000
--- a/main/numactl/musl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- numactl-2.0.11/syscall.c.orig
-+++ numactl-2.0.11/syscall.c
-@@ -115,14 +115,16 @@
- 
- #endif
- 
--#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 11)
-+#if defined(__GLIBC__)
-+# if __GLIBC_PREREQ(2,11)
- 
- /* glibc 2.11 seems to have working 6 argument sycall. Use the
-    glibc supplied syscall in this case.
-    The version cut-off is rather arbitary and could be probably
-    earlier. */
- 
--#define syscall6 syscall
-+#  define syscall6 syscall
-+#endif
- #elif defined(__x86_64__)
- /* 6 argument calls on x86-64 are often buggy in both glibc and
-    asm/unistd.h. Add a working version here. */
diff --git a/main/nvme-cli/APKBUILD b/main/nvme-cli/APKBUILD
new file mode 100644
index 00000000000..82201da4077
--- /dev/null
+++ b/main/nvme-cli/APKBUILD
@@ -0,0 +1,50 @@
+# Contributor: Florian Heigl <florian.heigl@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=nvme-cli
+pkgver=2.8
+pkgrel=0
+pkgdesc="NVM-Express user space tooling for Linux"
+arch="all"
+url="https://github.com/linux-nvme/nvme-cli"
+license="GPL-2.0-or-later"
+makedepends="
+	bash
+	libnvme-dev
+	linux-headers
+	meson
+	util-linux-dev
+	uuidgen
+	zlib-dev
+	"
+checkdepends="
+	py3-nose2
+	"
+subpackages="
+	$pkgname-doc
+	$pkgname-bash-completion
+	$pkgname-zsh-completion
+	"
+source="$pkgname-$pkgver.tar.gz::https://github.com/linux-nvme/nvme-cli/archive/v$pkgver.tar.gz"
+options="!check" # needs pci nvme stuff
+
+build() {
+	abuild-meson \
+		-Db_lto=true \
+		-Ddocs=man \
+		-Dudevrulesdir=/usr/lib/udev/rules.d/ \
+		. output
+	meson compile -C output
+}
+
+check() {
+	meson test --print-errorlogs --no-rebuild -C output
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+	rm -rf "$pkgdir"/usr/lib/systemd
+}
+
+sha512sums="
+1be0bed4e1bf8a25229f301c2b00b78d2de4eaf8ff2b815fa75e44dd35ddd7787604152bdf00696130df3281206a734c5f408c3f2127440e05c2e4b1cdbb79d4  nvme-cli-2.8.tar.gz
+"
diff --git a/main/oath-toolkit/APKBUILD b/main/oath-toolkit/APKBUILD
deleted file mode 100644
index e14d1a402e6..00000000000
--- a/main/oath-toolkit/APKBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# Contributor: Jann - Ove Risvik <jann.ove@dev.usaklig.com>
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname=oath-toolkit
-pkgver=2.6.2
-pkgrel=1
-pkgdesc="OATH Toolkit One-time password components"
-url="http://www.nongnu.org/oath-toolkit/index.html"
-arch="all"
-license="various"
-depends="perl cvs diffutils"
-makedepends="linux-pam-dev libxml2-dev xmlsec-dev autoconf automake libtool gtk-doc"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-liboath $pkgname-libpskc $pkgname-oathtool $pkgname-pam_oath"
-source="https://download.savannah.gnu.org/releases/oath-toolkit/oath-toolkit-${pkgver}.tar.gz
-  oath-toolkit-2.6.2-gcc7.patch"
-
-build() {
-	cd "$builddir"
-	autoreconf --force --install
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-liboath() {
-	depends=""
-	pkgdesc="A shared and static C library for OATH handling."
-	license="LGPL-2.1-or-later"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/liboath.so* "$subpkgdir"/usr/lib
-}
-
-libpskc() {
-	depends=""
-	pkgdesc="Library for Portable Symmetric Key Container"
-	license="LGPL-2.1-or-later"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libpskc.so* "$subpkgdir"/usr/lib
-}
-
-oathtool() {
-	depends="oath-toolkit-liboath"
-	pkgdesc="A command line tool for generating and validating OTPs."
-	license="GPL-3.0-or-later"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/oathtool "$subpkgdir"/usr/bin
-}
-
-pam_oath() {
-	depends="oath-toolkit-liboath"
-	license="GPL-3.0-or-later"
-	pkgdesc="A PAM module for pluggable login authentication for OATH."
-	mkdir -p "$subpkgdir"/lib/security
-	mv "$pkgdir"/usr/lib/security/pam_oath.so "$subpkgdir"/lib/security
-}
-
-sha512sums="201a702a05a2e9fb3a66d04750e1a34e293342126caf02c344954a0d9fd0daafe73ca7f1fe273be129ae555a29b82b72fa2b4770ea2ad10711924e1926ec2cfb  oath-toolkit-2.6.2.tar.gz
-dda606ee9c32075f2268af76394ac886da419ed42e34a45bb528ff26e39faede420ec7201dc32308d9cbfbc253d27a5d603e7bb6eaffc96a88a6bd9b2b3c54d9  oath-toolkit-2.6.2-gcc7.patch"
diff --git a/main/oath-toolkit/oath-toolkit-2.6.2-gcc7.patch b/main/oath-toolkit/oath-toolkit-2.6.2-gcc7.patch
deleted file mode 100644
index 68cc017b433..00000000000
--- a/main/oath-toolkit/oath-toolkit-2.6.2-gcc7.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-Bug: https://bugs.gentoo.org/618100
-Cherry-picked from upstream commits: https://github.com/coreutils/gnulib/commit/175b4e22f99e00996b72f822f5ae54dca8243d19
-                                     https://github.com/coreutils/gnulib/commit/abae112b34572cd3869ce4fc81dddb5c2a7394c4
-
---- a/oathtool/gl/intprops.h
-+++ b/oathtool/gl/intprops.h
-@@ -23,6 +23,10 @@
- #include <limits.h>
- #include <verify.h>
- 
-+#ifndef __has_builtin
-+# define __has_builtin(x) 0
-+#endif
-+
- /* Return a value with the common real type of E and V and the value of V.  */
- #define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
- 
-@@ -222,20 +226,24 @@
-    ? (a) < (min) >> (b)                                 \
-    : (max) >> (b) < (a))
- 
--/* True if __builtin_add_overflow (A, B, P) works when P is null.  */
--#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__)
-+/* True if __builtin_add_overflow (A, B, P) works when P is non-null.  */
-+#define _GL_HAS_BUILTIN_OVERFLOW \
-+  (5 <= __GNUC__ || __has_builtin (__builtin_add_overflow))
-+
-+#define _GL_HAS_BUILTIN_OVERFLOW_P \
-+  (7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p))
- 
- /* The _GL*_OVERFLOW macros have the same restrictions as the
-    *_RANGE_OVERFLOW macros, except that they do not assume that operands
-    (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
-    that the result (e.g., A + B) has that type.  */
--#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
--# define _GL_ADD_OVERFLOW(a, b, min, max)
--   __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
--# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
--   __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
--# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
--   __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
-+#if _GL_HAS_BUILTIN_OVERFLOW_P
-+# define _GL_ADD_OVERFLOW(a, b, min, max)                               \
-+   __builtin_add_overflow_p (a, b, (a) + (b))
-+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                          \
-+   __builtin_sub_overflow_p (a, b, (a) - (b))
-+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                          \
-+   __builtin_mul_overflow_p (a, b, (a) * (b))
- #else
- # define _GL_ADD_OVERFLOW(a, b, min, max)                                \
-    ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
-@@ -315,7 +323,7 @@
-   _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
- #define INT_SUBTRACT_OVERFLOW(a, b) \
-   _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
--#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
-+#if _GL_HAS_BUILTIN_OVERFLOW || _GL_HAS_BUILTIN_OVERFLOW_P
- # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
- #else
- # define INT_NEGATE_OVERFLOW(a) \
-@@ -349,10 +357,6 @@
- #define INT_MULTIPLY_WRAPV(a, b, r) \
-   _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW)
- 
--#ifndef __has_builtin
--# define __has_builtin(x) 0
--#endif
--
- /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390.  See:
-    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
-    https://llvm.org/bugs/show_bug.cgi?id=25390
-@@ -369,7 +373,7 @@
-    the operation.  BUILTIN is the builtin operation, and OVERFLOW the
-    overflow predicate.  Return 1 if the result overflows.  See above
-    for restrictions.  */
--#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)
-+#if _GL_HAS_BUILTIN_OVERFLOW
- # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r)
- #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
- # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
-Bug: https://bugs.gentoo.org/618100
-Cherry-picked from upstream commits: https://github.com/coreutils/gnulib/commit/175b4e22f99e00996b72f822f5ae54dca8243d19
-                                     https://github.com/coreutils/gnulib/commit/abae112b34572cd3869ce4fc81dddb5c2a7394c4
-
---- a/libpskc/gl/intprops.h
-+++ b/libpskc/gl/intprops.h
-@@ -23,6 +23,10 @@
- #include <limits.h>
- #include <verify.h>
- 
-+#ifndef __has_builtin
-+# define __has_builtin(x) 0
-+#endif
-+
- /* Return a value with the common real type of E and V and the value of V.  */
- #define _GL_INT_CONVERT(e, v) (0 * (e) + (v))
- 
-@@ -222,20 +226,24 @@
-    ? (a) < (min) >> (b)                                 \
-    : (max) >> (b) < (a))
- 
--/* True if __builtin_add_overflow (A, B, P) works when P is null.  */
--#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__)
-+/* True if __builtin_add_overflow (A, B, P) works when P is non-null.  */
-+#define _GL_HAS_BUILTIN_OVERFLOW \
-+  (5 <= __GNUC__ || __has_builtin (__builtin_add_overflow))
-+
-+#define _GL_HAS_BUILTIN_OVERFLOW_P \
-+  (7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p))
- 
- /* The _GL*_OVERFLOW macros have the same restrictions as the
-    *_RANGE_OVERFLOW macros, except that they do not assume that operands
-    (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
-    that the result (e.g., A + B) has that type.  */
--#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
--# define _GL_ADD_OVERFLOW(a, b, min, max)
--   __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
--# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
--   __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
--# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
--   __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
-+#if _GL_HAS_BUILTIN_OVERFLOW_P
-+# define _GL_ADD_OVERFLOW(a, b, min, max)                               \
-+   __builtin_add_overflow_p (a, b, (a) + (b))
-+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                          \
-+   __builtin_sub_overflow_p (a, b, (a) - (b))
-+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                          \
-+   __builtin_mul_overflow_p (a, b, (a) * (b))
- #else
- # define _GL_ADD_OVERFLOW(a, b, min, max)                                \
-    ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
-@@ -315,7 +323,7 @@
-   _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
- #define INT_SUBTRACT_OVERFLOW(a, b) \
-   _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
--#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
-+#if _GL_HAS_BUILTIN_OVERFLOW || _GL_HAS_BUILTIN_OVERFLOW_P
- # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
- #else
- # define INT_NEGATE_OVERFLOW(a) \
-@@ -349,10 +357,6 @@
- #define INT_MULTIPLY_WRAPV(a, b, r) \
-   _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW)
- 
--#ifndef __has_builtin
--# define __has_builtin(x) 0
--#endif
--
- /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390.  See:
-    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
-    https://llvm.org/bugs/show_bug.cgi?id=25390
-@@ -369,7 +373,7 @@
-    the operation.  BUILTIN is the builtin operation, and OVERFLOW the
-    overflow predicate.  Return 1 if the result overflows.  See above
-    for restrictions.  */
--#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)
-+#if _GL_HAS_BUILTIN_OVERFLOW
- # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r)
- #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
- # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
diff --git a/main/obex-data-server/APKBUILD b/main/obex-data-server/APKBUILD
index 5dd1ec5cba2..46edd8eb874 100644
--- a/main/obex-data-server/APKBUILD
+++ b/main/obex-data-server/APKBUILD
@@ -1,43 +1,33 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=obex-data-server
 pkgver=0.4.6
-pkgrel=4
+pkgrel=6
 pkgdesc="D-Bus service for Obex access"
 url="http://wiki.muiline.com/obex-data-server"
 license="GPL-2.0-or-later"
 arch="all"
-depends=""
+makedepends="dbus-glib-dev openobex-dev libusb-compat-dev bluez-dev
+	gdk-pixbuf-dev"
 subpackages="$pkgname-doc"
-makedepends="dbus-glib-dev openobex-dev gtk+-dev libusb-compat-dev bluez-dev"
-source="http://tadas.dailyda.com/software/obex-data-server-$pkgver.tar.gz
+source="https://dev.alpinelinux.org/archive/obex-data-server/obex-data-server-$pkgver.tar.gz
 	obex-data-server-0.4.6-build-fixes-1.patch"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+options="!check"
 
 build() {
-	cd $srcdir/$pkgname-$pkgver
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		--enable-bip=gdk-pixbuf \
-		|| return 1
+		--enable-bip=gdk-pixbuf
 	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="5f924377fa45fec22a15d74fa45bf6ae98f56a9f8c98142cce6123e4ca6dcca042a636469b491f4103e230e270ad1af18dc38274b661795cac4beb4f7b798d5b  obex-data-server-0.4.6.tar.gz
-a35f8b20aedbda2465cce20673be41f3e34ff6c306407f283f9156c70d9ecec38fdd9f9575f2bf201cb83ff0d464bca24c3b64d32ffd4ceba30a53d2f8e9ef49  obex-data-server-0.4.6-build-fixes-1.patch"
+sha512sums="
+5f924377fa45fec22a15d74fa45bf6ae98f56a9f8c98142cce6123e4ca6dcca042a636469b491f4103e230e270ad1af18dc38274b661795cac4beb4f7b798d5b  obex-data-server-0.4.6.tar.gz
+a35f8b20aedbda2465cce20673be41f3e34ff6c306407f283f9156c70d9ecec38fdd9f9575f2bf201cb83ff0d464bca24c3b64d32ffd4ceba30a53d2f8e9ef49  obex-data-server-0.4.6-build-fixes-1.patch
+"
diff --git a/main/oidentd/APKBUILD b/main/oidentd/APKBUILD
index 5f8b8e3291d..7ebe0eccee9 100644
--- a/main/oidentd/APKBUILD
+++ b/main/oidentd/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=oidentd
-pkgver=2.4.0
-pkgrel=1
+pkgver=2.5.0
+pkgrel=2
 pkgdesc="Configurable IDENT server that supports NAT/IP masq"
 url="https://oidentd.janikrabe.com"
 arch="all"
@@ -14,6 +14,12 @@ source="https://files.janikrabe.com/pub/oidentd/releases/$pkgver/oidentd-$pkgver
 	$pkgname.initd
 	$pkgname.confd
 	"
+options="!check"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
 	./configure \
@@ -22,7 +28,8 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		have_sockaddr_storage=1
 	make
 }
 
@@ -33,6 +40,8 @@ package() {
 	install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
-sha512sums="3dc6f8ba1c374c21bbc721516f83c5b825d5bc75dbda390d5e5e0e72ceac31495380a6025c626edcec4f8685a009f5be9571606c50e28fc28dc9f73a20f1b2d0  oidentd-2.4.0.tar.xz
+sha512sums="
+31ff2cad2afaa9f07a0aa35ad904047de78f168f9e6d6a3fcf7397eb89e6b930c30741eb1de44e3c2c24f48ca7d860cafd2771f464b336d400ab6d98384e9320  oidentd-2.5.0.tar.xz
 8f4efbd888ab729be6e04197a6f05080a2c5cc3d0c2b6944529f087a9be3a5e4946138aed9c8d74bdce64664e9ba5f2533859e950c6083ce778dac5147cb6a60  oidentd.initd
-387acc88fb9331ea57614785abc679dea69401c2d6d266c1481da208d8f9c9d5fb15619aab3871fff51aa5871bd1bd5f55baa7ba9748e8ced97d7d1fbabb1b40  oidentd.confd"
+387acc88fb9331ea57614785abc679dea69401c2d6d266c1481da208d8f9c9d5fb15619aab3871fff51aa5871bd1bd5f55baa7ba9748e8ced97d7d1fbabb1b40  oidentd.confd
+"
diff --git a/main/one-context/APKBUILD b/main/one-context/APKBUILD
index 44a2e1ac8e8..61247ddef21 100644
--- a/main/one-context/APKBUILD
+++ b/main/one-context/APKBUILD
@@ -1,20 +1,23 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=one-context
-pkgver=0.5.5
+pkgver=0.9.0
 pkgrel=0
 pkgdesc="Contextualization scripts for OpenNebula guests"
 url="https://github.com/jirutka/one-context/"
 arch="noarch"
 license="MIT"
-depends="blkid"
-source="https://github.com/jirutka/$pkgname/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+depends="blkid partx sfdisk"
+source="https://github.com/jirutka/one-context/archive/v$pkgver/one-context-$pkgver.tar.gz"
 
-package() {
-	cd "$builddir"
+check() {
+	make check
+}
 
-	PREFIX=/usr DESTDIR="$pkgdir" DISTRO=alpine ./install
+package() {
+	make install PREFIX=/usr DESTDIR="$pkgdir"
 }
 
-sha512sums="7d82a77a766ccf050b1f46aaa5ef43b0cdeb4413ef65d9304c965eacfe1ba293b693963513e5f3e98e104c93353b5a0429894f28a8f9a9cdd6c64d6579a2a548  one-context-0.5.5.tar.gz"
+sha512sums="
+21d4464ef7f56880634b97fdfca6766423a758c7726e9f9c7980f0eee4a1ee368a3c0fa4c0f94df7a2377e2b1ae2642adc3970e2d045e0d8ee8bcd70689acd21  one-context-0.9.0.tar.gz
+"
diff --git a/main/oniguruma/APKBUILD b/main/oniguruma/APKBUILD
index a26ceeb7c65..4cf7915ddd1 100644
--- a/main/oniguruma/APKBUILD
+++ b/main/oniguruma/APKBUILD
@@ -1,7 +1,7 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=oniguruma
-pkgver=6.9.4
+pkgver=6.9.9
 pkgrel=0
 pkgdesc="a regular expressions library"
 url="https://github.com/kkos/oniguruma"
@@ -9,7 +9,11 @@ arch="all"
 license="BSD-2-Clause"
 makedepends="automake autoconf libtool"
 subpackages="$pkgname-dev"
-source="$pkgver-$pkgver.tar.gz::https://github.com/kkos/oniguruma/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/kkos/oniguruma/archive/v$pkgver.tar.gz"
+
+# secfixes:
+#   6.9.5-r2:
+#     - CVE-2020-26159
 
 prepare() {
 	default_prepare
@@ -24,7 +28,8 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--localstatedir=/var
+		--localstatedir=/var \
+		--enable-posix-api
 	make
 }
 
@@ -36,4 +41,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="28a618c31db047c19dfb0e519d849ff33dd9d027abb154df341bc9c4a3ee738144007cfa95066e8714b0e1a0133ccfb6e629e9b7483cb3f9fb3a890156d769cb  6.9.4-6.9.4.tar.gz"
+sha512sums="
+7c89247d8504c635687dc61b39b39b5afefa4851b24409a8eab31273f1cbc88f3db89095ae4b135bd034147d2616c2e18fc74887300b89532eedeab75677f437  oniguruma-6.9.9.tar.gz
+"
diff --git a/main/open-iscsi/APKBUILD b/main/open-iscsi/APKBUILD
index 2b693985292..4e3f9ad1990 100644
--- a/main/open-iscsi/APKBUILD
+++ b/main/open-iscsi/APKBUILD
@@ -1,47 +1,56 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=open-iscsi
-pkgver=2.1.0
-pkgrel=2
+pkgver=2.1.9
+pkgrel=1
 pkgdesc="High performance, transport independent, multi-platform iSCSI initiator"
 url="https://www.open-iscsi.com"
 arch="all"
 license="GPL-2.0-only"
-makedepends="autoconf automake kmod-dev libmount libtool linux-headers openssl-dev
-	open-isns-dev util-linux-dev"
+makedepends="kmod-dev libmount linux-headers openssl-dev>3
+	open-isns-dev util-linux-dev meson bash perl"
 options="!check"
 subpackages="$pkgname-dev $pkgname-libs $pkgname-doc $pkgname-openrc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/open-iscsi/open-iscsi/archive/$pkgver.tar.gz
 	iscsid.initd
 	iscsid.confd
 	iscsid.conf
+	bash.patch
 	musl-fixes.patch
 	add-missing-headers.patch
 	dont-use-lib64.patch
 	remove-werror.patch
 	"
 
-
 build() {
-	make prefix=/usr \
-		exec_prefix=/usr \
-		localstatedir=/var \
-		sysconfdir=/etc \
-		mandir=/usr/share/man \
-		OPTFLAGS="$CFLAGS -DNO_SYSTEMD"
+	# musl doesn't have glob_onlydir but by spec it's also not guaranteed to return only dirs anyway
+	CFLAGS="$CFLAGS -DGLOB_ONLYDIR=0" \
+	abuild-meson \
+		-Db_lto=true \
+		-Dno_systemd=true \
+		-Drulesdir="/usr/lib/udev/rules.d" \
+		. output
+	meson compile -C output
+}
+
+check() {
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	make prefix=/usr DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 	install -Dm755 "$srcdir"/iscsid.initd "$pkgdir"/etc/init.d/iscsid
 	install -Dm644 "$srcdir"/iscsid.confd "$pkgdir"/etc/conf.d/iscsid
 	install -Dm644 "$srcdir"/iscsid.conf "$pkgdir"/etc/iscsi/iscsid.conf
 }
 
-sha512sums="bb1a4ff2bab0562bfd4281d757dd888e8f5d2d1ae16561cabf5598073c343e8c2dc9b35992c2bc51398faffceb9b70ea2eae214ab205a586bcb971d741d5f59d  open-iscsi-2.1.0.tar.gz
-febf67065c133fd2f79d5aff509891d557af25739b700e961d2289a941b447099021b01fa29817bcd057147adad3a3f8948049d4f8ff3590cb7255a0fa0d715c  iscsid.initd
-075bb9cb783be7ccbc799947e0e042b85310d40b3045141dc1be40ca84ed1cc0e1e54559df501c512c179e28375314b27a03c15d9a6d4b1cabd428b2279985d3  iscsid.confd
-3686d31c5642e611c0c0c61f0f42a33030a74b518a2a108f004b9bd34b2b98d8e29ee2416a5b9cc447ab0449bdc94158b2323d977e7b7d2930dd4dcf0866da68  iscsid.conf
+sha512sums="
+25c28da5918b775ca54d3e55591eca0b4f7b5be33d803cad28fce1e9b2334b43cee1423a4e1819497b322e0f420dcd8d74226f442ca432233d1753565b11a5bb  open-iscsi-2.1.9.tar.gz
+52e273d20d3c95c943409d3b6251f0447e19a822d32ff33d3c8dc1e9b8c6065ab72b823fe9cb72f5d92256d3a219417a3847dc59815d29f727fc59c4e49716a8  iscsid.initd
+3ba1825ee8b39ce2c58d70b59d6c2d6a954a8c65ce9adf920fb44d046cfe0f7f54bcc70f3f3c24754f0e866abdc92b4a1716fb516c45278b217532b97a6d948a  iscsid.confd
+4cc7c1923047616d908806aab96d468cb7b99ff9f8a9e02a039866b66db4ae856bd9f414854712d8a57c21614674f4468736bce26a4199c2ff054a165bca26e0  iscsid.conf
+89e44837a1d7fcd3b7de88ae7f25a3c2d3ff24cf01bbe752882e56d25e9ee41ef57dac9d21257057b9a4fcd6fe18650b7f4926f934d348fdb6080e6b42e43ac1  bash.patch
 1b89ffd6de0dc7bb63fc2702a97e49df4369158c66ee609acfc041b1677c07fbd964b7a709f1f324fa51a9842d4d3e11611d9783e18d526372d468163c0ac8db  musl-fixes.patch
 104b559eb368459a7151657fbca63927b6b1032bda272e903a1633c8b9d3ed199f2c5cca0e6741bcd5fa6e860d1ff2d111caf58d60d9f0a736ad767e8ae0427b  add-missing-headers.patch
 86a9c4be4abd34821f156f9df586c530dc2b0efc96e961cb15fd22846856cc1e76aae85806e8d0eb9f3d3e3acd7f73fe8d2a1de8944903b503e256e6a99bb2dd  dont-use-lib64.patch
-d99ef789d1aab1e7ba81e3f2b334a9518f1174cd53b4600bfd7e866973cdfa87664b2161c994ae7c35526a7d9165e0e2b3036f7dacc139b90fa3d0a90b6f6599  remove-werror.patch"
+d99ef789d1aab1e7ba81e3f2b334a9518f1174cd53b4600bfd7e866973cdfa87664b2161c994ae7c35526a7d9165e0e2b3036f7dacc139b90fa3d0a90b6f6599  remove-werror.patch
+"
diff --git a/main/open-iscsi/bash.patch b/main/open-iscsi/bash.patch
new file mode 100644
index 00000000000..d4fd7d52072
--- /dev/null
+++ b/main/open-iscsi/bash.patch
@@ -0,0 +1,79 @@
+diff --git a/etc/systemd/ibft-rule-generator b/etc/systemd/ibft-rule-generator
+index a464fd6..f0fcd32 100644
+--- a/etc/systemd/ibft-rule-generator
++++ b/etc/systemd/ibft-rule-generator
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Systemd rule generator for ibft interfaces
+ #
+diff --git a/iscsiuio/src/unix/build_date.sh b/iscsiuio/src/unix/build_date.sh
+index 65888fe..be999c8 100755
+--- a/iscsiuio/src/unix/build_date.sh
++++ b/iscsiuio/src/unix/build_date.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # build the build_date.c and build_date.h files
+ #
+diff --git a/libopeniscsiusr/docs/list-man-pages.sh b/libopeniscsiusr/docs/list-man-pages.sh
+index dda8277..044eb71 100755
+--- a/libopeniscsiusr/docs/list-man-pages.sh
++++ b/libopeniscsiusr/docs/list-man-pages.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # list man pages found given one or more ??? passed in
+ #
+diff --git a/utils/iscsi-gen-initiatorname.sh.template b/utils/iscsi-gen-initiatorname.sh.template
+index 5c2bfdf..86148f0 100644
+--- a/utils/iscsi-gen-initiatorname.sh.template
++++ b/utils/iscsi-gen-initiatorname.sh.template
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # iscsi-gen-initiatorname
+ #
+diff --git a/utils/iscsi_discovery.sh b/utils/iscsi_discovery.sh
+index be2f390..fbe066b 100755
+--- a/utils/iscsi_discovery.sh
++++ b/utils/iscsi_discovery.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Copyright (C) Voltaire Ltd. 2006.  ALL RIGHTS RESERVED.
+ #
+diff --git a/utils/iscsi_fw_login.sh.template b/utils/iscsi_fw_login.sh.template
+index aae9e4c..6758da2 100644
+--- a/utils/iscsi_fw_login.sh.template
++++ b/utils/iscsi_fw_login.sh.template
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # iscsi_fw_login -- login to iscsi firmware targets, if any
+ #
+diff --git a/utils/iscsi_offload.sh b/utils/iscsi_offload.sh
+index 1869fe1..5de465a 100755
+--- a/utils/iscsi_offload.sh
++++ b/utils/iscsi_offload.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # iscsi_offload
+ #
+@@ -239,7 +239,7 @@ if iscsiadm -m iface -I $ioe_iface > /dev/null 2>&1 ; then
+     ioe_mac=$(iscsiadm -m iface -I $ioe_iface 2> /dev/null| sed -n "s/iface\.hwaddress = \(.*\)/\1/p")
+     ioe_mod=$(iscsiadm -m iface -I $ioe_iface 2> /dev/null| sed -n "s/iface\.transport_name = \(.*\)/\1/p")
+     ipaddr=$(iscsiadm -m iface -I $ioe_iface 2> /dev/null| sed -n "s/iface\.ipaddress = \(.*\)/\1/p")
+-    if [ "$ipaddr" == "<empty>" ] ; then
++    if [ "$ipaddr" = "<empty>" ] ; then
+ 	ipaddr=
+     fi
+ elif [ "$mod" = "be2iscsi" ] ; then
diff --git a/main/open-iscsi/iscsid.conf b/main/open-iscsi/iscsid.conf
index ab4df53b68d..78e1b9425cd 100644
--- a/main/open-iscsi/iscsid.conf
+++ b/main/open-iscsi/iscsid.conf
@@ -10,18 +10,27 @@
 ######################
 # iscsid daemon config
 ######################
-# If you want iscsid to start the first time a iscsi tool
+#
+# If you want iscsid to start the first time an iscsi tool
 # needs to access it, instead of starting it when the init
 # scripts run, set the iscsid startup command here. This
 # should normally only need to be done by distro package
-# maintainers.
+# maintainers. If you leave the iscsid daemon running all
+# the time then leave this attribute commented out.
 #
-# Default for Fedora and RHEL. (uncomment to activate).
+
+# Alpine startup
  iscsid.startup = /etc/init.d/iscsid start
-# 
-# Default for upstream open-iscsi scripts (uncomment to activate).
-#iscsid.startup = /sbin/iscsid
+#
+# Default for Fedora and RHEL. (uncomment to activate).
+# iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket
+#
+# Default if you are not using systemd (uncomment to activate)
+# iscsid.startup = /usr/bin/service start iscsid
 
+# Check for active mounts on devices reachable through a session
+# and refuse to logout if there are any.  Defaults to "No".
+# iscsid.safe_logout = Yes
 
 #############################
 # NIC/HBA and driver settings
@@ -41,7 +50,7 @@ node.startup = manual
 
 # For "automatic" startup nodes, setting this to "Yes" will try logins on each
 # available iface until one succeeds, and then stop.  The default "No" will try
-# logins on all availble ifaces simultaneously.
+# logins on all available ifaces simultaneously.
 node.leading_login = No
 
 # *************
@@ -52,6 +61,13 @@ node.leading_login = No
 # to CHAP. The default is None.
 #node.session.auth.authmethod = CHAP
 
+# To configure which CHAP algorithms to enable set
+# node.session.auth.chap_algs to a comma seperated list.
+# The algorithms should be listen with most prefered first.
+# Valid values are MD5, SHA1, SHA256, and SHA3-256.
+# The default is MD5.
+#node.session.auth.chap_algs = SHA3-256,SHA256,SHA1,MD5
+
 # To set a CHAP username and password for initiator
 # authentication by the target(s), uncomment the following lines:
 #node.session.auth.username = username
@@ -80,7 +96,7 @@ node.leading_login = No
 # Timeouts
 # ********
 #
-# See the iSCSI REAME's Advanced Configuration section for tips
+# See the iSCSI README's Advanced Configuration section for tips
 # on setting timeouts when using multipath or doing root over iSCSI.
 #
 # To specify the length of time to wait for session re-establishment
@@ -288,6 +304,17 @@ discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768
 # appropriate number of sessions is created.
 node.session.nr_sessions = 1
 
+# When iscsid starts up it recovers existing sessions, if possible.
+# If the target for a session has gone away when this occurs, the
+# iscsid daemon normally tries to reestablish each session,
+# in succession, in the background, by trying again every two
+# seconds, until all sessions are restored. This configuration
+# variable can limits the number of retries for each session.
+# For example, setting reopen_max=150 would mean that each session
+# recovery was limited to about five minutes.
+# 
+node.session.reopen_max = 0
+
 #************
 # Workarounds
 #************
@@ -302,3 +329,11 @@ node.session.iscsi.FastAbort = Yes
 # a task management function like an ABORT TASK or LOGICAL UNIT RESET, that
 # it continue to respond to R2Ts. To enable this uncomment this line
 # node.session.iscsi.FastAbort = No
+
+# To prevent doing automatic scans that would add unwanted luns to the system
+# we can disable them and have sessions only do manually requested scans.
+# Automatic scans are performed on startup, on login, and on AEN/AER reception
+# on devices supporting it.  For HW drivers all sessions will use the value
+# defined in the configuration file.  This configuration option is independent
+# of scsi_mod scan parameter. (The default behavior is auto):
+node.session.scan = auto
diff --git a/main/open-iscsi/iscsid.confd b/main/open-iscsi/iscsid.confd
index 1c4cc405426..bae6e210ed7 100644
--- a/main/open-iscsi/iscsid.confd
+++ b/main/open-iscsi/iscsid.confd
@@ -1,13 +1,3 @@
 # /etc/conf.d/iscsid
-
-# config file to use
-CONFIG_FILE=/etc/iscsi/iscsid.conf
-
-# you need to specify an initiatorname in the file
-INITIATORNAME_FILE=/etc/iscsi/initiatorname.iscsi
-
 # options to pass to iscsid
-OPTS="-i ${INITIATORNAME_FILE}"
-
-# Start automatic targets when iscsid is started
-AUTOSTARTTARGETS="yes"
+# OPTS=""
diff --git a/main/open-iscsi/iscsid.initd b/main/open-iscsi/iscsid.initd
index c0bea59b7f6..a1c55963190 100644
--- a/main/open-iscsi/iscsid.initd
+++ b/main/open-iscsi/iscsid.initd
@@ -2,16 +2,18 @@
 # Copyright 1999-2015 Gentoo Foundation, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 
-command=/sbin/iscsid
-command_args="${OPTS}"
-start_stop_daemon_args="-w 100" # iscsid might fail e.g. when the iSCSI kernel modules aren't available
-pidfile=${PIDFILE:-/var/run/${SVCNAME}.pid}
+: ${CONFIG_FILE:="/etc/iscsi/iscsid.conf"}
+: ${INITIATORNAME_FILE:="/etc/iscsi/initiatorname.iscsi"}
+: ${AUTOSTARTTARGETS:="yes"}
+ISCSIADM=/usr/sbin/iscsiadm
 
+command=/usr/sbin/iscsid
+command_args="-i ${INITIATORNAME_FILE} ${OPTS}"
+start_stop_daemon_args="-w 100" # iscsid might fail e.g. when the iSCSI kernel modules aren't available
+pidfile=${PIDFILE:-/run/${SVCNAME}.pid}
 extra_started_commands="starttargets stoptargets"
 extra_commands="restarttargets"
 
-ISCSIADM=/sbin/iscsiadm
-
 depend() {
 	after modules multipath
 	use net
diff --git a/main/open-isns/APKBUILD b/main/open-isns/APKBUILD
index e883ca35463..ac2f27fcd89 100644
--- a/main/open-isns/APKBUILD
+++ b/main/open-isns/APKBUILD
@@ -1,48 +1,31 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=open-isns
-pkgver=0.100
-pkgrel=0
+pkgver=0.102
+pkgrel=1
 pkgdesc="iSNS server and client for Linux"
 url="https://github.com/open-iscsi/open-isns"
 arch="all"
 license="LGPL-2.1-or-later"
-makedepends="autoconf automake openssl-dev musl-dev"
+makedepends="meson openssl-dev>3 musl-dev"
 options="!check"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lib"
 source="$pkgname-$pkgver.tar.gz::https://github.com/open-iscsi/open-isns/archive/v$pkgver.tar.gz
 	"
 
-prepare() {
-	default_prepare
-	update_config_sub
-	autoreconf -fi
-}
-
 build() {
-	CFLAGS="$CFLAGS -Wno-error" \
-	./configure \
-		--host=$CHOST \
-		--build=$CBUILD \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--enable-shared
-	make all
+	abuild-meson . output
+	meson compile -C output
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
-	make DESTDIR="$pkgdir" install_hdrs
-	make DESTDIR="$pkgdir" install_lib
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 	rm -rf "$pkgdir"/usr/lib/systemd
-	rm -rf "$pkgdir"/usr/lib/*.a
 }
 
 lib() {
-	cd "$builddir"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr
+	amove usr/lib
 }
 
-sha512sums="ccf49ba1c60d46ae49b75424a966abc1f7e104c8ffa13013951a58a8f0ccaa1cf550f24fd2743fcaba1211a0ec8033c5df5249b7a108ae5974d4f1144dd3b169  open-isns-0.100.tar.gz"
+sha512sums="
+f5ae8af89b85565181c2f6def9834d9dab0a15d5d9b28721cce116c5580173ed9adba219e1ede48988cb57f047578db4ece458c4a7db598412c7583e56393d2b  open-isns-0.102.tar.gz
+"
diff --git a/main/open-lldp/APKBUILD b/main/open-lldp/APKBUILD
index 55b5df7d098..7c050233acb 100644
--- a/main/open-lldp/APKBUILD
+++ b/main/open-lldp/APKBUILD
@@ -1,64 +1,73 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=open-lldp
-_realname=lldpad
-pkgver=0.9.46
-pkgrel=4
+pkgver=1.1
+pkgrel=1
 pkgdesc="Open Source implementation of the IEEE standard 802.1AB Link Layer Discovery Protocol (LLDP)"
 url="http://www.open-lldp.org"
 arch="all"
-license="GPL"
-depends=
-makedepends="autoconf automake bash flex libtool libconfig-dev libnl-dev
-	readline-dev linux-headers bsd-compat-headers"
-install=
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://ftp-osl.osuosl.org/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        clif.h.patch
-	$pkgname.initd
-	$pkgname.confd"
-
-_builddir="$srcdir/${pkgname}-${pkgver}"
+license="GPL-2.0-only"
+makedepends="
+	autoconf
+	automake
+	bsd-compat-headers
+	flex
+	libconfig-dev
+	libnl3-dev
+	libtool
+	linux-headers
+	readline-dev
+	"
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-openrc
+	$pkgname-bash-completion
+	"
+source="$pkgname-$pkgver.tar.gz::https://github.com/intel/openlldp/archive/refs/tags/v$pkgver.tar.gz
+	reopenstdout.patch
+	lldpad.initd
+	lldpad.confd
+	"
+	# clif.h.patch
+builddir="$srcdir/openlldp-$pkgver"
 
 prepare() {
-        local i
-        cd "$_builddir"
-        for i in $source; do
-                case $i in
-                *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-                esac
-        done
-	sed -i 's/ln -T -s/ln -s/' Makefile.am || return 1
-	sed -i -e 's/-Werror//' Makefile.am configure.ac || return 1
-	libtoolize --force && aclocal && autoconf --force && automake --add-missing
+	default_prepare
+	# sed -i 's/ln -T -s/ln -s/' Makefile.am
+	# sed -i -e 's/-Werror//' Makefile.am configure.ac
+	./bootstrap.sh
 }
 
 build() {
-	cd "$_builddir"
-	./bootstrap.sh || return 1
-        export CFLAGS="${CFLAGS} -fgnu89-inline"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
-	make || return 1
+		--infodir=/usr/share/info
+	make
+}
+
+check() {
+	make check
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
-	mkdir -p "$pkgdir"/usr/include/dcbd
-	# ln -s /usr/include/lldpad "$pkgdir"/usr/include/dcbd
-	ln -s /usr/include/lldpad/lldp_dcbx_cmds.h "$pkgdir"/usr/include/dcbd/clif_cmds.h
-	install -m755 -D ../../$pkgname.initd "$pkgdir"/etc/init.d/$_realname
-	install -m644 -D ../../$pkgname.confd "$pkgdir"/etc/conf.d/$_realname
+	rm -r "$pkgdir"/usr/lib/systemd
+
+	install -Dm755 "$srcdir"/lldpad.initd "$pkgdir"/etc/init.d/lldpad
+	install -Dm644 "$srcdir"/lldpad.confd "$pkgdir"/etc/conf.d/lldpad
+
+	mkdir -p "$pkgdir"/usr/share/bash-completion
+	mv "$pkgdir"/etc/bash_completion.d "$pkgdir"/usr/share/bash-completion/completions
 }
 
-sha512sums="45982ba69c159ca386970d49de8cee70b654e762b60d95c96a4794ee696e6c889694bb12eb1454e6c176152c949e67af38974a431838c3788d9bc42751c60878  open-lldp-0.9.46.tar.gz
-fd9eca241564e76df2b97d8048b788fc35c3d791a1784386e68bf92dfd39076b356546adee42028007483f0cdb579b0da519d0376791d0f902f7e83df60d9306  clif.h.patch
-cfd618d2414ec1624e66105b5357de93414b0320badf63b78cbab9b5bb493bd8ef7cac9a22ba4d60418037d2d6636469a20dc288906348c2332beb786f67f808  open-lldp.initd
-8f8a68b9764e3b2be0cc01a37debb099e3d9021c354eb8d584a5123c470002f1f61ecc5688e5d958c8c576fd36df7a65233192221849a8fc51e999a7c5ea5678  open-lldp.confd"
+sha512sums="
+794bd2d43e7b6e76a1aa9d1e650f24a52b4cb66166058ce4ec3f0c6567bcdff149ca86ab9108e82be14f7e7bf43c7486479edc23d851e739a2a22de7038ecb35  open-lldp-1.1.tar.gz
+74cf3d7ef3c6d00cf05713bf5ef505292b6cfd7d6e080993947e88a44d725906d7243d59ee12bb468c093dc26937a5efe8fb644eca1d4c5b545825ce78253362  reopenstdout.patch
+d8c7d3c449a9c557814f70a5af15b1b8e34f4c465293aa962bc3a8310e24f8363cf15e75d3cbdc8894ca7a0b1e1962daaaba75ecb0caf770471ae0988e85be7b  lldpad.initd
+5dc09090913e55bde9aab3ad33eb7889942bb7a0583ae1a94cc31f6c8e34ccae18c02f2c191e157f81f2949cc91998d673b37d60522dc9c476d63136512f2b58  lldpad.confd
+"
diff --git a/main/open-lldp/lldpad.confd b/main/open-lldp/lldpad.confd
new file mode 100644
index 00000000000..be4069e1649
--- /dev/null
+++ b/main/open-lldp/lldpad.confd
@@ -0,0 +1 @@
+#command_args="-f /etc/lldpad.conf"
diff --git a/main/open-lldp/lldpad.initd b/main/open-lldp/lldpad.initd
new file mode 100755
index 00000000000..f5807a45a08
--- /dev/null
+++ b/main/open-lldp/lldpad.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+
+name="lldpad"
+command="/usr/sbin/lldpad"
+command_args="$command_args -p"
+command_background=true
+pidfile=/run/$RC_SVCNAME.pid
+
+depend() {
+	need net
+	after firewall
+}
diff --git a/main/open-lldp/open-lldp.confd b/main/open-lldp/open-lldp.confd
deleted file mode 100644
index a4d4b1de802..00000000000
--- a/main/open-lldp/open-lldp.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# Remove existing pid file at startup
-OPTS="-d -f /etc/lldpad.conf"
diff --git a/main/open-lldp/open-lldp.initd b/main/open-lldp/open-lldp.initd
deleted file mode 100755
index 468473a6407..00000000000
--- a/main/open-lldp/open-lldp.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-
-NAME="lldpad"
-DAEMON="/usr/sbin/$NAME"
-pidfile=/var/run/$NAME.pid
-
-depend() {
-	need net
-	after firewall
-}
-
-start() {
-	ebegin "Starting ${NAME}"
-	start-stop-daemon --start --quiet --pidfile ${pidfile} \
-		--exec ${DAEMON} -- ${OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${NAME}"
-	start-stop-daemon --stop --exec ${DAEMON}
-	eend $?
-}
-
diff --git a/main/open-lldp/reopenstdout.patch b/main/open-lldp/reopenstdout.patch
new file mode 100644
index 00000000000..bf098e1616f
--- /dev/null
+++ b/main/open-lldp/reopenstdout.patch
@@ -0,0 +1,13 @@
+diff --git a/test/lldp_clif_test.c b/test/lldp_clif_test.c
+index 11a3e9c..3154c98 100644
+--- a/test/lldp_clif_test.c
++++ b/test/lldp_clif_test.c
+@@ -64,7 +64,7 @@ static void unhook_stdout()
+ {
+ 	if (hook_fd != -1) {
+ 		dup2(hook_fd, STDOUT_FILENO);
+-		stdout = fdopen(STDOUT_FILENO, "w");
++		//stdout = fdopen(STDOUT_FILENO, "w");
+ 		close(hook_fd);
+ 		hook_fd = -1;
+ 
diff --git a/main/openjade/APKBUILD b/main/openjade/APKBUILD
index 31d3b351fce..c3df238c024 100644
--- a/main/openjade/APKBUILD
+++ b/main/openjade/APKBUILD
@@ -1,19 +1,17 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Maintainer:
 pkgname=openjade
 pkgver=1.3.2
-pkgrel=5
+pkgrel=9
 pkgdesc="Implementation of the DSSSL style language"
-url="http://openjade.sourceforge.net"
+url="https://openjade.sourceforge.net/"
 arch="all"
 license="custom"
-depends=""
-depends_dev=""
-makedepends="$depends_dev opensp-dev perl"
-install=""
+options="!check" # no testsuite
+makedepends="$depends_dev opensp-dev perl libtool autoconf"
 subpackages="$pkgname-dev $pkgname-libs $pkgname-doc"
-source="https://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+source="https://prdownloads.sourceforge.net/openjade/openjade-$pkgver.tar.gz
 	openjade-1.3.2-msggen.pl.patch
 	openjade-1.3.2-ldflags.patch
 	openjade-1.3.2-deplibs.patch
@@ -22,28 +20,31 @@ source="https://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	openjade-1.3.2-respect-ldflags.patch
 	"
 
-builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	default_prepare
+	update_config_guess
+	update_config_sub
+	libtoolize --force
+	sed -i configure -e 's:^LIBTOOL=.*:LIBTOOL=/usr/bin/libtool:g'
+}
 
 build() {
-	cd "$builddir"
-	update_config_guess || return 1
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
-	make || return 1
+	make
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 
 	install -Dm644 COPYING \
-		"$pkgdir"/usr/share/licenses/$pkgname/COPYING || return 1
+		"$pkgdir"/usr/share/licenses/$pkgname/COPYING
 
 	mkdir -p "$pkgdir"/usr/share/doc/$pkgname
 	install -m644 README ChangeLog NEWS \
-		"$pkgdir"/usr/share/doc/$pkgname || return 1
+		"$pkgdir"/usr/share/doc/$pkgname
 }
 
 sha512sums="c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1  openjade-1.3.2.tar.gz
diff --git a/main/openjpeg/APKBUILD b/main/openjpeg/APKBUILD
index 16fbadd0690..5969956ab0b 100644
--- a/main/openjpeg/APKBUILD
+++ b/main/openjpeg/APKBUILD
@@ -1,31 +1,34 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=openjpeg
-pkgver=2.3.1
-pkgrel=4
+pkgver=2.5.2
+pkgrel=0
 pkgdesc="Open-source implementation of JPEG2000 image codec"
 url="https://www.openjpeg.org/"
 arch="all"
 options="!check"  # No test suite.
-license="BSD-2-Clause-NetBSD"
-makedepends="libpng-dev tiff-dev lcms2-dev doxygen cmake"
+license="BSD-2-Clause"
+# Some of the development CMake files installed by -dev depend on tools provided by the -tools subpackage
+depends_dev="$pkgname-tools"
+makedepends="libpng-dev tiff-dev lcms2-dev doxygen cmake samurai"
 subpackages="$pkgname-dev $pkgname-tools"
-source="$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz
-	fix-cmakelists.patch
-	CVE-2020-6851.patch
-	CVE-2020-8112.patch
+source="https://github.com/uclouvain/openjpeg/archive/v$pkgver/openjpeg-v$pkgver.tar.gz
 	"
-builddir="${srcdir}/$pkgname-$pkgver"
-
-build() {
-	cd "$builddir"
-	cmake . \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_BUILD_TYPE=None \
-		-DOPENJPEG_INSTALL_LIB_DIR=lib
-	make
-}
 
 # secfixes:
+#   2.5.0-r0:
+#     - CVE-2021-3575
+#     - CVE-2022-1122
+#   2.4.0-r1:
+#     - CVE-2021-29338
+#   2.4.0-r0:
+#     - CVE-2020-27844
+#   2.3.1-r6:
+#     - CVE-2020-27814
+#     - CVE-2020-27823
+#     - CVE-2020-27824
+#   2.3.1-r5:
+#     - CVE-2019-12973
+#     - CVE-2020-15389
 #   2.3.1-r3:
 #     - CVE-2020-6851
 #     - CVE-2020-8112
@@ -51,18 +54,23 @@ build() {
 #     - CVE-2016-9580
 #     - CVE-2016-9581
 
+build() {
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DOPENJPEG_INSTALL_LIB_DIR=lib
+	cmake --build build
+}
+
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
 tools() {
 	pkgdesc="$pkgdesc - tools"
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+	amove usr/bin
 }
 
-sha512sums="339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03  openjpeg-2.3.1.tar.gz
-b50cd382d08647db18f202769aae7df87613a18143a30e360e8f00aba1ec1b7fd0a153685dbea3950bc5623b06c314326777c4fb7aff56adfc6b17bc74c933e5  fix-cmakelists.patch
-c8ffc926d91392b38250fd4e00fff5f93fbf5e17487d0e4a0184c9bd191aa2233c5c5dcf097dd62824714097bba2d8cc865bed31193d1a072aa954f216011297  CVE-2020-6851.patch
-9659e04087e0d80bf53555e9807aae59205adef2d49d7a49e05bf250c484a2e92132d471ec6076e57ca69b5ce98fd81462a6a8c01205ca7096781eec06e401cc  CVE-2020-8112.patch"
+sha512sums="
+24c058b3e0710e689ba7fd6bce8a88353ce64e825b2e5bbf6b00ca3f2a2ec1e9c70a72e0252a5c89d10c537cf84d55af54bf2f16c58ca01db98c2018cf132e1a  openjpeg-v2.5.2.tar.gz
+"
diff --git a/main/openjpeg/CVE-2020-6851.patch b/main/openjpeg/CVE-2020-6851.patch
deleted file mode 100644
index 9a70291f50e..00000000000
--- a/main/openjpeg/CVE-2020-6851.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 11 Jan 2020 01:51:19 +0100
-Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose
- coordinates are beyond INT_MAX (fixes #1228)
-
----
- src/lib/openjp2/j2k.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
-index 14f6ff41a..922550eb1 100644
---- a/src/lib/openjp2/j2k.c
-+++ b/src/lib/openjp2/j2k.c
-@@ -9221,6 +9221,14 @@ static OPJ_BOOL opj_j2k_update_image_dimensions(opj_image_t* p_image,
-     l_img_comp = p_image->comps;
-     for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) {
-         OPJ_INT32 l_h, l_w;
-+        if (p_image->x0 > (OPJ_UINT32)INT_MAX ||
-+                p_image->y0 > (OPJ_UINT32)INT_MAX ||
-+                p_image->x1 > (OPJ_UINT32)INT_MAX ||
-+                p_image->y1 > (OPJ_UINT32)INT_MAX) {
-+            opj_event_msg(p_manager, EVT_ERROR,
-+                          "Image coordinates above INT_MAX are not supported\n");
-+            return OPJ_FALSE;
-+        }
- 
-         l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0,
-                          (OPJ_INT32)l_img_comp->dx);
diff --git a/main/openjpeg/CVE-2020-8112.patch b/main/openjpeg/CVE-2020-8112.patch
deleted file mode 100644
index 95cb8095f56..00000000000
--- a/main/openjpeg/CVE-2020-8112.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 05f9b91e60debda0e83977e5e63b2e66486f7074 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Thu, 30 Jan 2020 00:59:57 +0100
-Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow
-
-That could lead to later assertion failures.
-
-Fixes #1231 / CVE-2020-8112
----
- src/lib/openjp2/tcd.c | 20 ++++++++++++++++++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
-index deecc4dff..aa419030a 100644
---- a/src/lib/openjp2/tcd.c
-+++ b/src/lib/openjp2/tcd.c
-@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no,
-             /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
-             l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx;
-             l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy;
--            l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx;
--            l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy;
-+            {
-+                OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1,
-+                                  (OPJ_INT32)l_pdx)) << l_pdx;
-+                if (tmp > (OPJ_UINT32)INT_MAX) {
-+                    opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
-+                    return OPJ_FALSE;
-+                }
-+                l_br_prc_x_end = (OPJ_INT32)tmp;
-+            }
-+            {
-+                OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1,
-+                                  (OPJ_INT32)l_pdy)) << l_pdy;
-+                if (tmp > (OPJ_UINT32)INT_MAX) {
-+                    opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
-+                    return OPJ_FALSE;
-+                }
-+                l_br_prc_y_end = (OPJ_INT32)tmp;
-+            }
-             /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/
- 
-             l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)((
diff --git a/main/openjpeg/fix-cmakelists.patch b/main/openjpeg/fix-cmakelists.patch
deleted file mode 100644
index ee5fb013b17..00000000000
--- a/main/openjpeg/fix-cmakelists.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -148,7 +148,7 @@
-   # We could install *.cmake files in share/ however those files contains
-   # hardcoded path to libraries on a multi-arch system (fedora/debian) those
-   # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
--  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
-+  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}")
- endif()
- 
- if (APPLE)
diff --git a/main/openldap/0001-Fix-build-issue-in-clients-tools-common.c.patch b/main/openldap/0001-Fix-build-issue-in-clients-tools-common.c.patch
new file mode 100644
index 00000000000..6790d460786
--- /dev/null
+++ b/main/openldap/0001-Fix-build-issue-in-clients-tools-common.c.patch
@@ -0,0 +1,26 @@
+From 1dcef12a5d3ffd679b2ea5b6ecb30a5dee6dd68e Mon Sep 17 00:00:00 2001
+From: Lars Kellogg-Stedman <lars@oddbit.com>
+Date: Fri, 19 Aug 2022 22:49:57 -0400
+Subject: [PATCH 1/8] Fix build issue in clients/tools/common.c
+
+---
+ clients/tools/common.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clients/tools/common.c b/clients/tools/common.c
+index b88f219..681249a 100644
+--- a/clients/tools/common.c
++++ b/clients/tools/common.c
+@@ -1414,8 +1414,8 @@ tool_bind( LDAP *ld )
+ 	msgbuf[0] = 0;
+ 
+ #ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
++	LDAPControl c;
+ 	if ( ppolicy ) {
+-		LDAPControl c;
+ 		c.ldctl_oid = LDAP_CONTROL_PASSWORDPOLICYREQUEST;
+ 		c.ldctl_value.bv_val = NULL;
+ 		c.ldctl_value.bv_len = 0;
+-- 
+2.37.1
+
diff --git a/main/openldap/0002-Add-UNIX_LINK_LIBS-to-slapi-Makefile.patch b/main/openldap/0002-Add-UNIX_LINK_LIBS-to-slapi-Makefile.patch
new file mode 100644
index 00000000000..953139bbddd
--- /dev/null
+++ b/main/openldap/0002-Add-UNIX_LINK_LIBS-to-slapi-Makefile.patch
@@ -0,0 +1,23 @@
+From 5837703b7d7ead28ac155c4fc89c2af3adf51a56 Mon Sep 17 00:00:00 2001
+From: Lars Kellogg-Stedman <lars@oddbit.com>
+Date: Fri, 19 Aug 2022 22:51:03 -0400
+Subject: [PATCH 2/8] Add UNIX_LINK_LIBS to slapi Makefile
+
+---
+ servers/slapd/slapi/Makefile.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/servers/slapd/slapi/Makefile.in b/servers/slapd/slapi/Makefile.in
+index 0e46f78..dd29cca 100644
+--- a/servers/slapd/slapi/Makefile.in
++++ b/servers/slapd/slapi/Makefile.in
+@@ -37,6 +37,7 @@
+ XXLIBS = 
+ MOD_LIBS = $(MODULES_LIBS)
+ NT_LINK_LIBS = $(AC_LIBS) -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
++UNIX_LINK_LIBS = ../../../libraries/libldap/libldap.la $(LTHREAD_LIBS)
+ 
+ XINCPATH = -I$(srcdir)/.. -I$(srcdir)
+ XDEFS = $(MODULES_CPPFLAGS)
+-- 
+2.37.1
diff --git a/main/openldap/0003-Add-mqtt-overlay.patch b/main/openldap/0003-Add-mqtt-overlay.patch
new file mode 100644
index 00000000000..c7ea47c158f
--- /dev/null
+++ b/main/openldap/0003-Add-mqtt-overlay.patch
@@ -0,0 +1,461 @@
+From b2251604bdf2ed66471c9be546a8aab9f973ede2 Mon Sep 17 00:00:00 2001
+From: Lars Kellogg-Stedman <lars@oddbit.com>
+Date: Fri, 19 Aug 2022 22:53:36 -0400
+Subject: [PATCH 3/8] Add mqtt overlay
+
+---
+ contrib/slapd-modules/mqtt/Makefile |  45 ++++
+ contrib/slapd-modules/mqtt/mqtt.c   | 389 ++++++++++++++++++++++++++++
+ 2 files changed, 434 insertions(+)
+ create mode 100644 contrib/slapd-modules/mqtt/Makefile
+ create mode 100644 contrib/slapd-modules/mqtt/mqtt.c
+
+diff --git a/contrib/slapd-modules/mqtt/Makefile b/contrib/slapd-modules/mqtt/Makefile
+new file mode 100644
+index 0000000..5f62aab
+--- /dev/null
++++ b/contrib/slapd-modules/mqtt/Makefile
+@@ -0,0 +1,45 @@
++# $OpenLDAP$
++
++LDAP_SRC = ../../..
++LDAP_BUILD = ../../..
++LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
++LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
++	$(LDAP_BUILD)/libraries/liblber/liblber.la
++
++LIBTOOL = $(LDAP_BUILD)/libtool
++CC = gcc
++OPT = -g -O2 -Wall
++DEFS = 
++INCS = $(LDAP_INC)
++LIBS = $(LDAP_LIB) -lmosquitto
++
++PROGRAMS = mqtt.la
++LTVER = 0:0:0
++
++prefix=/usr/local
++exec_prefix=$(prefix)
++ldap_subdir=/openldap
++
++libdir=$(exec_prefix)/lib
++libexecdir=$(exec_prefix)/libexec
++moduledir = $(libdir)$(ldap_subdir)
++
++.SUFFIXES: .c .o .lo
++
++.c.lo:
++	$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
++
++all: $(PROGRAMS)
++
++mqtt.la: mqtt.lo
++	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
++	-rpath $(moduledir) -module -o $@ $? $(LIBS)
++
++clean:
++	rm -rf *.o *.lo *.la .libs
++
++install: $(PROGRAMS)
++	mkdir -p $(DESTDIR)$(moduledir)
++	for p in $(PROGRAMS) ; do \
++		$(LIBTOOL) --mode=install cp $$p $(DESTDIR)$(moduledir) ; \
++	done
+diff --git a/contrib/slapd-modules/mqtt/mqtt.c b/contrib/slapd-modules/mqtt/mqtt.c
+new file mode 100644
+index 0000000..143d776
+--- /dev/null
++++ b/contrib/slapd-modules/mqtt/mqtt.c
+@@ -0,0 +1,389 @@
++/* $OpenLDAP$ */
++/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
++ *
++ * Copyright 2014 Timo Teräs <timo.teras@iki.fi>.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted only as authorized by the OpenLDAP
++ * Public License.
++ *
++ * A copy of this license is available in file LICENSE in the
++ * top-level directory of the distribution or, alternatively, at
++ * http://www.OpenLDAP.org/license.html.
++ */
++/* mqtt-overlay
++ *
++ * This is an OpenLDAP overlay that... */
++
++#include <mosquitto.h>
++#include <unistd.h>
++
++#include "portable.h" 
++#include "slap.h"
++#include "slap-config.h"
++
++typedef struct mqtt_notify_t {
++	struct mqtt_notify_t	*next;
++	char			*topic;
++	char			*dn_group_str;
++	char			*oc_group_str;
++	char			*str_member;
++
++	struct berval		ndn_group;
++	ObjectClass		*oc_group;
++	AttributeDescription	*ad_member;
++	int			notify_pending;
++} mqtt_notify_t;
++
++typedef struct mqtt_t {
++	struct mosquitto *mq;
++	int port;
++	char *hostname, *username, *password;
++	mqtt_notify_t *notify_map;
++} mqtt_t;
++
++static ConfigDriver mqtt_config_notify;
++
++static ConfigTable mqttcfg[] = {
++	{ "mqtt-hostname", "hostname", 2, 2, 0,
++		ARG_STRING|ARG_OFFSET, (void *)offsetof(mqtt_t, hostname),
++		"( OLcfgCtAt:5.1 NAME 'olcMqttHostname' "
++		"DESC 'Hostname of MQTT broker' "
++		"SYNTAX OMsDirectoryString SINGLE-VALUE )",
++		NULL, NULL },
++	{ "mqtt-port", "port", 2, 2, 0,
++		ARG_INT|ARG_OFFSET, (void *)offsetof(mqtt_t, port),
++		"( OLcfgCtAt:5.2 NAME 'olcMqttPort' "
++		"DESC 'Port of MQTT broker' "
++		"SYNTAX OMsInteger SINGLE-VALUE )",
++		NULL, NULL },
++	{ "mqtt-username", "username", 2, 2, 0,
++		ARG_STRING|ARG_OFFSET, (void *)offsetof(mqtt_t, username),
++		"( OLcfgCtAt:5.3 NAME 'olcMqttUsername' "
++		"DESC 'Username for MQTT broker' "
++		"SYNTAX OMsDirectoryString SINGLE-VALUE )",
++		NULL, NULL },
++	{ "mqtt-password", "password", 2, 2, 0,
++		ARG_STRING|ARG_OFFSET, (void *)offsetof(mqtt_t, password),
++		"( OLcfgCtAt:5.4 NAME 'olcMqttPassword' "
++		"DESC 'Password for MQTT broker' "
++		"SYNTAX OMsDirectoryString SINGLE-VALUE )",
++		NULL, NULL },
++	{ "mqtt-notify-password", "topic> <group-dn> <group-oc> <member-ad", 2, 5, 0,
++		ARG_MAGIC, mqtt_config_notify,
++		"( OLcfgCtAt:5.5 NAME 'olcMqttNotifyPassword' "
++		"DESC 'Notify password change on <topic>, optionally checking that the object is in the specified group.'"
++		"SYNTAX OMsDirectoryString X-ORDERED 'VALUES' )",
++		NULL, NULL },
++	{ NULL, NULL, 0, 0, 0, ARG_IGNORED }
++};
++
++static ConfigOCs mqttocs[] = {
++	{ "( OLcfgCtOc:5.1 "
++	  "NAME 'olcMqttConfig' "
++	  "DESC 'MQTT configuration' "
++	  "SUP olcOverlayConfig "
++	  "MAY ( "
++		"olcMqttHostname "
++		"$ olcMqttPort"
++		"$ olcMqttUsername"
++		"$ olcMqttPassword"
++		"$ olcMqttNotifyPassword"
++	  " ) )",
++	  Cft_Overlay, mqttcfg },
++
++	{ NULL, 0, NULL }
++};
++
++static int mqtt_init(BackendInfo *bi)
++{
++	return mosquitto_lib_init();
++}
++
++static int mqtt_destroy(BackendInfo *bi)
++{
++	return mosquitto_lib_cleanup();
++}
++
++static const char *ca_arg(ConfigArgs *c, int n)
++{
++	return (c->argc <= n) ? NULL : c->argv[n];
++}
++
++static void free_notify(mqtt_notify_t *n)
++{
++	ch_free(n->topic);
++	ch_free(n->oc_group_str);
++	ch_free(n->str_member);
++	ch_free(n->dn_group_str);
++	if (!BER_BVISNULL(&n->ndn_group))
++		ber_memfree(n->ndn_group.bv_val);
++	ch_free(n);
++}
++
++static void free_all_notifies(mqtt_t *mqtt)
++{
++	mqtt_notify_t *n, *next;
++
++	for (n = mqtt->notify_map; n; n = next) {
++		next = n->next;
++		free_notify(n);
++	}
++	mqtt->notify_map = NULL;
++}
++
++static int mqtt_config_notify(ConfigArgs *c)
++{
++	slap_overinst *on = (slap_overinst *)c->bi;
++	mqtt_t *mqtt = (mqtt_t *) on->on_bi.bi_private;
++	mqtt_notify_t *n, **pprev;
++	const char *text = NULL;
++	struct berval bv = BER_BVNULL, ndn = BER_BVNULL;
++	int rc, i;
++
++	switch (c->op) {
++	case SLAP_CONFIG_EMIT:
++		for (i = 0, n = mqtt->notify_map; n; n = n->next, i++) {
++			char *ptr = c->cr_msg, *end = &c->cr_msg[sizeof(c->cr_msg)-1];
++
++			ptr += snprintf(ptr, end-ptr, SLAP_X_ORDERED_FMT "%s", i, n->topic);
++			if (n->dn_group_str)
++				ptr += snprintf(ptr, end-ptr, " \"%s\"", n->dn_group_str);
++			if (n->oc_group_str)
++				ptr += snprintf(ptr, end-ptr, " \"%s\"", n->oc_group_str);
++			if (n->str_member)
++				ptr += snprintf(ptr, end-ptr, " \"%s\"", n->str_member);
++
++			bv.bv_val = c->cr_msg;
++			bv.bv_len = ptr - bv.bv_val;
++			value_add_one(&c->rvalue_vals, &bv);
++		}
++		return 0;
++	case LDAP_MOD_DELETE:
++		if (c->valx < 0) {
++			free_all_notifies(mqtt);
++		} else {
++			pprev = &mqtt->notify_map;
++			n = mqtt->notify_map;
++			for (i = 0; i < c->valx; i++) {
++				pprev = &n->next;
++				n = n->next;
++			}
++			*pprev = n->next;
++			free_notify(n);
++		}
++		return 0;
++	}
++
++	const char *groupdn = ca_arg(c, 2);
++	const char *oc_name = ca_arg(c, 3);
++	const char *ad_name = ca_arg(c, 4);
++	ObjectClass *oc = NULL;
++	AttributeDescription *ad = NULL;
++
++	if (groupdn) {
++		oc = oc_find(oc_name ?: SLAPD_GROUP_CLASS);
++		if (oc == NULL) {
++			Debug(LDAP_DEBUG_ANY, "mqtt_db_open: unable to find objectClass=\"%s\"\n",
++				oc_name, 0, 0);
++			return 1;
++		}
++
++		rc = slap_str2ad(ad_name ?: SLAPD_GROUP_ATTR, &ad, &text);
++		if (rc != LDAP_SUCCESS) {
++			Debug(LDAP_DEBUG_ANY, "mqtt_db_config_notify: unable to find attribute=\"%s\": %s (%d)\n",
++				ad_name, text, rc);
++			return rc;
++		}
++
++		ber_str2bv(groupdn, 0, 0, &bv);
++		rc = dnNormalize(0, NULL, NULL, &bv, &ndn, NULL);
++		if (rc != LDAP_SUCCESS) {
++			Debug(LDAP_DEBUG_ANY, "mqtt_db_config_notify: DN normalization failed for \"%s\": %d\n",
++				groupdn, rc, 0);
++			return rc;
++		}
++	}
++
++	n = ch_calloc(1, sizeof(*n));
++	n->topic = ch_strdup(c->argv[1]);
++	n->dn_group_str = groupdn ? ch_strdup(groupdn) : NULL;
++	n->oc_group_str = oc_name ? ch_strdup(oc_name) : NULL;
++	n->str_member   = ad_name ? ch_strdup(ad_name) : NULL;
++	n->ndn_group = ndn;
++	n->oc_group = oc;
++	n->ad_member = ad;
++
++	for (pprev = &mqtt->notify_map; *pprev; pprev = &(*pprev)->next);
++	*pprev = n;
++
++	return 0;
++}
++
++static void mqtt_send_notify(mqtt_t *mqtt, mqtt_notify_t *n)
++{
++	Debug(LDAP_DEBUG_TRACE, "mqtt_send_notify: pub on topic '%s'\n", n->topic, 0, 0);
++	n->notify_pending = mosquitto_publish(mqtt->mq, NULL, n->topic, 0, NULL, 1, true) == MOSQ_ERR_NO_CONN;
++}
++
++static void mqtt_on_connect(struct mosquitto *mq, void *obj, int rc)
++{
++	slap_overinst *on = (slap_overinst *) obj;
++	mqtt_t *mqtt = (mqtt_t *) on->on_bi.bi_private;
++	mqtt_notify_t *n;
++
++	Debug(LDAP_DEBUG_TRACE, "mqtt_on_connect: connected with status %d\n", rc, 0, 0);
++	if (rc != 0)
++		return;
++	
++	for (n = mqtt->notify_map; n; n = n->next)
++		if (n->notify_pending)
++			mqtt_send_notify(mqtt, n);
++}
++
++static int mqtt_db_init(BackendDB *be, ConfigReply *cr)
++{
++	slap_overinst *on = (slap_overinst *) be->bd_info;
++
++	Debug(LDAP_DEBUG_TRACE, "mqtt_db_init: initialize overlay\n", 0, 0, 0);
++	on->on_bi.bi_private = ch_calloc(1, sizeof(mqtt_t));
++
++	return 0;
++}
++
++static int mqtt_db_destroy(BackendDB *be, ConfigReply *cr)
++{
++	slap_overinst *on = (slap_overinst *) be->bd_info;
++	mqtt_t *mqtt = on->on_bi.bi_private;
++
++	Debug(LDAP_DEBUG_TRACE, "mqtt_db_destroy: destroy overlay\n", 0, 0, 0);
++	free_all_notifies(mqtt);
++	ch_free(mqtt);
++
++	return 0;
++}
++
++static int mqtt_db_open(BackendDB *be, ConfigReply *cr)
++{
++	slap_overinst *on = (slap_overinst *) be->bd_info;
++	mqtt_t *mqtt = (mqtt_t *) on->on_bi.bi_private;
++	struct mosquitto *mq;
++	char id[256];
++	int n;
++
++	n = snprintf(id, sizeof(id), "openldap-mqtt/%d/", getpid());
++	gethostname(&id[n], sizeof(id) - n);
++
++	Debug(LDAP_DEBUG_TRACE, "mqtt_db_open, id='%s'\n", id, 0, 0);
++	mqtt->mq = mq = mosquitto_new(id, true, on);
++	if (!mq) return 1;
++
++	if (mqtt->username && mqtt->password)
++		mosquitto_username_pw_set(mq, mqtt->username, mqtt->password);
++
++	mosquitto_connect_callback_set(mq, mqtt_on_connect);
++	mosquitto_connect_async(mq, mqtt->hostname ?: "127.0.0.1", mqtt->port ?: 1883, 60);
++	mosquitto_loop_start(mq);
++
++	return 0;
++}
++
++static int mqtt_db_close(BackendDB *be, ConfigReply *cr)
++{
++	slap_overinst *on = (slap_overinst *) be->bd_info;
++	mqtt_t *mqtt = (mqtt_t *) on->on_bi.bi_private;
++
++	Debug(LDAP_DEBUG_TRACE, "mqtt_db_close\n", 0, 0, 0);
++	mosquitto_disconnect(mqtt->mq);
++	mosquitto_loop_stop(mqtt->mq, false);
++	mosquitto_destroy(mqtt->mq);
++
++	free(mqtt->hostname); mqtt->hostname = NULL;
++	free(mqtt->username); mqtt->username = NULL;
++	free(mqtt->password); mqtt->password = NULL;
++
++	return 0;
++}
++
++static int mqtt_response(Operation *op, SlapReply *rs)
++{
++	slap_overinst *on = (slap_overinst *) op->o_bd->bd_info;
++	mqtt_t *mqtt = (mqtt_t *) on->on_bi.bi_private;
++	Attribute *a;
++	Modifications *m;
++	bool change = false;
++
++	switch (op->o_tag) {
++	case LDAP_REQ_ADD:
++		for (a = op->ora_e->e_attrs; a; a = a->a_next) {
++			if (a->a_desc == slap_schema.si_ad_userPassword) {
++				change = true;
++				break;
++			}
++		}
++		break;
++	case LDAP_REQ_MODIFY:
++		for (m = op->orm_modlist; m; m = m->sml_next) {
++			if (m->sml_desc == slap_schema.si_ad_userPassword) {
++				change = true;
++				break;
++			}
++		}
++		break;
++	case LDAP_REQ_EXTENDED:
++		if (ber_bvcmp(&slap_EXOP_MODIFY_PASSWD, &op->ore_reqoid) == 0)
++			change = true;
++		break;
++	}
++
++	if (change) {
++		mqtt_notify_t *n;
++		int r, cache;
++
++		for (n = mqtt->notify_map; n; n = n->next) {
++			if (n->oc_group) {
++				cache = op->o_do_not_cache;
++				op->o_do_not_cache = 1;
++				r = backend_group(op, NULL, &n->ndn_group, &op->o_req_ndn, n->oc_group, n->ad_member);
++				op->o_do_not_cache = cache;
++			} else {
++				r = 0;
++			}
++
++			Debug(LDAP_DEBUG_TRACE, "tested o_req_ndn='%s' in ndn_group='%s' r=%d\n",
++				op->o_req_ndn.bv_val, n->ndn_group.bv_val, r);
++
++			if (r == 0)
++				mqtt_send_notify(mqtt, n);
++		}
++	}
++
++	return SLAP_CB_CONTINUE;
++}
++
++static int mqtt_init_overlay() 
++{
++	static slap_overinst ov;
++	int rc;
++
++	ov.on_bi.bi_type = "mqtt";
++	ov.on_bi.bi_init = mqtt_init;
++	ov.on_bi.bi_destroy = mqtt_destroy;
++	ov.on_bi.bi_db_init = mqtt_db_init;
++	ov.on_bi.bi_db_destroy = mqtt_db_destroy;
++	ov.on_bi.bi_db_open = mqtt_db_open;
++	ov.on_bi.bi_db_close = mqtt_db_close;
++	ov.on_bi.bi_cf_ocs = mqttocs;
++	ov.on_response = mqtt_response;
++
++	rc = config_register_schema(mqttcfg, mqttocs);
++	if (rc) return rc;
++
++	return overlay_register(&ov);
++}
++
++int init_module(int argc, char *argv[]) 
++{
++	return mqtt_init_overlay();
++}
+-- 
+2.37.1
+
diff --git a/main/openldap/0004-Fix-manpages.patch b/main/openldap/0004-Fix-manpages.patch
new file mode 100644
index 00000000000..3ec08bcc02e
--- /dev/null
+++ b/main/openldap/0004-Fix-manpages.patch
@@ -0,0 +1,72 @@
+From 08334cb28550230ab73aa1bc60ad4f62d6f85486 Mon Sep 17 00:00:00 2001
+From: Lars Kellogg-Stedman <lars@oddbit.com>
+Date: Fri, 19 Aug 2022 22:54:43 -0400
+Subject: [PATCH 4/8] Fix manpages
+
+Various manual pages changes:
+* removes LIBEXECDIR from slapd.8
+* removes references to non-existing manpages (bz 624616)
+
+Patch-Source: https://src.fedoraproject.org/rpms/openldap/blob/f27/f/openldap-manpages.patch
+---
+ doc/man/man1/ldapmodify.1 | 3 +--
+ doc/man/man8/slapd.8      | 8 ++++----
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1
+index 1104e9f..161f2ff 100644
+--- a/doc/man/man1/ldapmodify.1
++++ b/doc/man/man1/ldapmodify.1
+@@ -382,8 +382,7 @@ exit status and a diagnostic message being written to standard error.
+ .BR ldap_add_ext (3),
+ .BR ldap_delete_ext (3),
+ .BR ldap_modify_ext (3),
+-.BR ldap_modrdn_ext (3),
+-.BR ldif (5).
++.BR ldif (5)
+ .SH AUTHOR
+ The OpenLDAP Project <http://www.openldap.org/>
+ .SH ACKNOWLEDGEMENTS
+diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8
+index a93fcbc..1e64855 100644
+--- a/doc/man/man8/slapd.8
++++ b/doc/man/man8/slapd.8
+@@ -5,7 +5,7 @@
+ .SH NAME
+ slapd \- Stand-alone LDAP Daemon
+ .SH SYNOPSIS
+-.B LIBEXECDIR/slapd 
++.B slapd
+ [\c
+ .BR \-V [ V [ V ]]
+ [\c
+@@ -332,7 +332,7 @@ the LDAP databases defined in the default config file, just type:
+ .LP
+ .nf
+ .ft tt
+-	LIBEXECDIR/slapd
++	slapd
+ .ft
+ .fi
+ .LP
+@@ -343,7 +343,7 @@ on voluminous debugging which will be printed on standard error, type:
+ .LP
+ .nf
+ .ft tt
+-	LIBEXECDIR/slapd \-f /var/tmp/slapd.conf \-d 255
++	slapd -f /var/tmp/slapd.conf -d 255
+ .ft
+ .fi
+ .LP
+@@ -351,7 +351,7 @@ To test whether the configuration file is correct or not, type:
+ .LP
+ .nf
+ .ft tt
+-	LIBEXECDIR/slapd \-Tt
++	slapd -Tt
+ .ft
+ .fi
+ .LP
+-- 
+2.37.1
+
diff --git a/main/openldap/0005-Correct-command-line-syntax-in-lloadd-tests.patch b/main/openldap/0005-Correct-command-line-syntax-in-lloadd-tests.patch
new file mode 100644
index 00000000000..563704ed528
--- /dev/null
+++ b/main/openldap/0005-Correct-command-line-syntax-in-lloadd-tests.patch
@@ -0,0 +1,84 @@
+From aef7e9c3c6678016c103243eb6476bc8b5e0e721 Mon Sep 17 00:00:00 2001
+From: Lars Kellogg-Stedman <lars@oddbit.com>
+Date: Fri, 19 Aug 2022 22:44:04 -0400
+Subject: [PATCH 5/8] Correct command line syntax in lloadd tests
+
+---
+ tests/scripts/lloadd/test004-monitor   | 6 +++---
+ tests/scripts/lloadd/test007-coherence | 8 ++++----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/scripts/lloadd/test004-monitor b/tests/scripts/lloadd/test004-monitor
+index 9ab4045..677e3e7 100755
+--- a/tests/scripts/lloadd/test004-monitor
++++ b/tests/scripts/lloadd/test004-monitor
+@@ -218,7 +218,7 @@ fi
+ # wait for it to settle
+ echo "Waiting until connections are established..."
+ for i in 0 1 2 3 4 5; do
+-    $LDAPCOMPARE "cn=Load Balancer,cn=Backends,cn=monitor" -H $URI6 \
++    $LDAPCOMPARE -H $URI6 "cn=Load Balancer,cn=Backends,cn=monitor" \
+         'olmOutgoingConnections:4' > /dev/null 2>&1
+     RC=$?
+     if test $RC = 6 ; then
+@@ -269,7 +269,7 @@ fi
+ # wait for it to settle
+ echo "Waiting until connections are established..."
+ for i in 0 1 2 3 4 5; do
+-    $LDAPCOMPARE "cn=Load Balancer,cn=Backends,cn=monitor" -H $URI6 \
++    $LDAPCOMPARE -H $URI6 "cn=Load Balancer,cn=Backends,cn=monitor" \
+         'olmOutgoingConnections:13' > /dev/null 2>&1
+     RC=$?
+     if test $RC = 6 ; then
+@@ -306,7 +306,7 @@ fi
+ # wait for it to settle
+ echo "Waiting until global counters are updated..."
+ for i in 0 1 2 3 4 5; do
+-    $LDAPCOMPARE "cn=Other,cn=Operations,cn=Load Balancer,cn=Backends,cn=monitor" -H $URI6 \
++    $LDAPCOMPARE -H $URI6 "cn=Other,cn=Operations,cn=Load Balancer,cn=Backends,cn=monitor" \
+         'olmCompletedOps:2' > /dev/null 2>&1
+     RC=$?
+     if test $RC = 6 ; then
+diff --git a/tests/scripts/lloadd/test007-coherence b/tests/scripts/lloadd/test007-coherence
+index a78d8e7..7b91c28 100755
+--- a/tests/scripts/lloadd/test007-coherence
++++ b/tests/scripts/lloadd/test007-coherence
+@@ -239,7 +239,7 @@ fi
+ # wait for it to settle
+ echo "Waiting until connections are established..."
+ for i in 0 1 2 3 4 5; do
+-	$LDAPCOMPARE "cn=Load Balancer,cn=Backends,cn=monitor" -H $URI6 \
++	$LDAPCOMPARE -H $URI6 "cn=Load Balancer,cn=Backends,cn=monitor" \
+ 		'olmOutgoingConnections:4' > /dev/null 2>&1
+ 	RC=$?
+ 	if test $RC = 6 ; then
+@@ -291,7 +291,7 @@ fi
+ # wait for it to settle
+ echo "Waiting until connections are established..."
+ for i in 0 1 2 3 4 5; do
+-	$LDAPCOMPARE "cn=Load Balancer,cn=Backends,cn=monitor" -H $URI6 \
++	$LDAPCOMPARE -H $URI6 "cn=Load Balancer,cn=Backends,cn=monitor" \
+ 		'olmOutgoingConnections:13' > /dev/null 2>&1
+ 	RC=$?
+ 	if test $RC = 6 ; then
+@@ -338,7 +338,7 @@ fi
+ # wait for it to settle
+ echo "Waiting until global counters are updated..."
+ for i in 0 1 2 3 4 5; do
+-	$LDAPCOMPARE "cn=Other,cn=Operations,cn=Load Balancer,cn=Backends,cn=monitor" -H $URI6 \
++	$LDAPCOMPARE -H $URI6 "cn=Other,cn=Operations,cn=Load Balancer,cn=Backends,cn=monitor" \
+ 		'olmCompletedOps:20' > /dev/null 2>&1
+ 	RC=$?
+ 	if test $RC = 6 ; then
+@@ -443,7 +443,7 @@ fi
+ # wait for it to settle
+ echo "Waiting until global counters are updated..."
+ for i in 0 1 2 3 4 5; do
+-	$LDAPCOMPARE "cn=Other,cn=Operations,cn=Load Balancer,cn=Backends,cn=monitor" -H $URI6 \
++	$LDAPCOMPARE -H $URI6 "cn=Other,cn=Operations,cn=Load Balancer,cn=Backends,cn=monitor" \
+ 		'olmCompletedOps:28' > /dev/null 2>&1
+ 	RC=$?
+ 	if test $RC = 6 ; then
+-- 
+2.37.1
+
diff --git a/main/openldap/0007-Use-correct-extension-for-slapd-modules.patch b/main/openldap/0007-Use-correct-extension-for-slapd-modules.patch
new file mode 100644
index 00000000000..cf2e4e7c595
--- /dev/null
+++ b/main/openldap/0007-Use-correct-extension-for-slapd-modules.patch
@@ -0,0 +1,44 @@
+From: Lars Kellogg-Stedman <lars@oddbit.com>
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Fri, 19 Aug 2022 22:32:10 -0400
+Subject: [PATCH 7/8] Use correct extension for slapd modules
+
+The example slapd.conf and slapd.ldif provided by this package attempts
+to load modules with a .la suffix, but the package only provides .so
+modules.
+
+Update the example slapd.conf to use the correct extension.
+
+See https://gitlab.alpinelinux.org/alpine/aports/-/issues/13866
+
+diff --git a/servers/slapd/slapd.conf b/servers/slapd/slapd.conf
+--- a/servers/slapd/slapd.conf
++++ b/servers/slapd/slapd.conf
+@@ -15,8 +15,8 @@ argsfile	%LOCALSTATEDIR%/run/slapd.args
+ 
+ # Load dynamic backend modules:
+ modulepath	%MODULEDIR%
+-moduleload	back_mdb.la
+-# moduleload	back_ldap.la
++moduleload	back_mdb.so
++# moduleload	back_ldap.so
+ 
+ # Sample security restrictions
+ #	Require integrity protection (prevent hijacking)
+
+diff --git a/servers/slapd/slapd.ldif b/servers/slapd/slapd.ldif
+--- a/servers/slapd/slapd.ldif
++++ b/servers/slapd/slapd.ldif
+@@ -30,9 +30,9 @@
+ objectClass: olcModuleList
+ cn: module
+ olcModulepath:	%MODULEDIR%
+-olcModuleload:	back_mdb.la
+-#olcModuleload:	back_ldap.la
+-#olcModuleload:	back_passwd.la
++olcModuleload:	back_mdb.so
++#olcModuleload:	back_ldap.so
++#olcModuleload:	back_passwd.so
+ 
+ dn: cn=schema,cn=config
+ objectClass: olcSchemaConfig
diff --git a/main/openldap/0008-Remove-pidfile-and-argsfile.patch b/main/openldap/0008-Remove-pidfile-and-argsfile.patch
new file mode 100644
index 00000000000..4c91d724439
--- /dev/null
+++ b/main/openldap/0008-Remove-pidfile-and-argsfile.patch
@@ -0,0 +1,35 @@
+From: Lars Kellogg-Stedman <lars@oddbit.com>
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sat, 20 Aug 2022 08:37:28 -0400
+Subject: [PATCH 8/8] Remove pidfile and argsfile
+
+Under Alpine Linux, OpenRC manages a pid file on its own; it's not
+necessary for slapd to manage one separately. This commit removes the
+pidfile and argsfile directives from the example configuration.
+
+diff --git a/servers/slapd/slapd.conf b/servers/slapd/slapd.conf
+--- a/servers/slapd/slapd.conf
++++ b/servers/slapd/slapd.conf
+@@ -10,9 +10,6 @@
+ # service AND an understanding of referrals.
+ #referral	ldap://root.openldap.org
+ 
+-pidfile		%LOCALSTATEDIR%/run/slapd.pid
+-argsfile	%LOCALSTATEDIR%/run/slapd.args
+-
+ # Load dynamic backend modules:
+ modulepath	%MODULEDIR%
+ moduleload	back_mdb.so
+diff --git a/servers/slapd/slapd.ldif b/servers/slapd/slapd.ldif
+--- a/servers/slapd/slapd.ldif
++++ b/servers/slapd/slapd.ldif
+@@ -9,9 +9,6 @@
+ #
+ # Define global ACLs to disable default read access.
+ #
+-olcArgsFile: %LOCALSTATEDIR%/run/slapd.args
+-olcPidFile: %LOCALSTATEDIR%/run/slapd.pid
+-#
+ # Do not enable referrals until AFTER you have a working directory
+ # service AND an understanding of referrals.
+ #olcReferral:	ldap://root.openldap.org
diff --git a/main/openldap/0009-Include-more-schemas-in-default-config.patch b/main/openldap/0009-Include-more-schemas-in-default-config.patch
new file mode 100644
index 00000000000..dedd099eb34
--- /dev/null
+++ b/main/openldap/0009-Include-more-schemas-in-default-config.patch
@@ -0,0 +1,44 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sun, 6 Nov 2022 00:57:00 +0100
+Subject: [PATCH] Include more schemas in default config
+
+The default configuration of the openldap apk has only one schema
+configured: core.ldif. This is very limiting and most admins will want
+to add nis.ldif, inetorgperson.ldif, and the dependency cosine.ldif to
+manage user accounts on a Linux-based system.
+
+This is easily done with include: lines in slapd.ldif. The trick is,
+you need to add these lines before you import slapd.ldif during initial
+configuration. Otherwise, it's kind of painful to add after the fact.
+
+Other distributions (Debian and derivatives) include these schema as
+part of their OpenLDAP package, so it's not out of the ordinary.
+
+See https://gitlab.alpinelinux.org/alpine/aports/-/issues/13867
+
+diff --git a/servers/slapd/slapd.ldif b/servers/slapd/slapd.ldif
+--- a/servers/slapd/slapd.ldif
++++ b/servers/slapd/slapd.ldif
+@@ -39,6 +39,9 @@
+ cn: schema
+ 
+ include: file://%SYSCONFDIR%/schema/core.ldif
++include: file://%SYSCONFDIR%/schema/cosine.ldif
++include: file://%SYSCONFDIR%/schema/inetorgperson.ldif
++include: file://%SYSCONFDIR%/schema/nis.ldif
+ 
+ # Frontend settings
+ #
+diff --git a/servers/slapd/slapd.conf b/servers/slapd/slapd.conf
+--- a/servers/slapd/slapd.conf
++++ b/servers/slapd/slapd.conf
+@@ -3,6 +3,9 @@
+ # This file should NOT be world readable.
+ #
+ include		%SYSCONFDIR%/schema/core.schema
++include		%SYSCONFDIR%/schema/cosine.schema
++include		%SYSCONFDIR%/schema/inetorgperson.schema
++include	 	%SYSCONFDIR%/schema/nis.schema
+ 
+ # Define global ACLs to disable default read access.
+ 
diff --git a/main/openldap/APKBUILD b/main/openldap/APKBUILD
index 70b90971d24..5bc697095b8 100644
--- a/main/openldap/APKBUILD
+++ b/main/openldap/APKBUILD
@@ -2,6 +2,26 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 #
 # secfixes:
+#   2.6.2-r0:
+#     - CVE-2022-29155
+#   2.4.57-r1:
+#     - CVE-2021-27212
+#   2.4.57-r0:
+#     - CVE-2020-36221
+#     - CVE-2020-36222
+#     - CVE-2020-36223
+#     - CVE-2020-36224
+#     - CVE-2020-36225
+#     - CVE-2020-36226
+#     - CVE-2020-36227
+#     - CVE-2020-36228
+#     - CVE-2020-36229
+#     - CVE-2020-36230
+#   2.4.56-r0:
+#     - CVE-2020-25709
+#     - CVE-2020-25710
+#   2.4.50-r0:
+#     - CVE-2020-12243
 #   2.4.48-r0:
 #     - CVE-2019-13565
 #     - CVE-2019-13057
@@ -12,163 +32,226 @@
 #     - CVE-2017-9287
 #
 pkgname=openldap
-pkgver=2.4.49
-pkgrel=3
+pkgver=2.6.7
+pkgrel=0
 pkgdesc="LDAP Server"
-url="https://www.openldap.org"
-arch="all !mips64"
-license="custom"
+url="https://www.openldap.org/"
+arch="all"
+license="OLDAP-2.8"
 pkgusers="ldap"
 pkggroups="ldap"
-depends_dev="cyrus-sasl-dev openssl-dev util-linux-dev"
+depends_dev="
+	cyrus-sasl-dev
+	libevent-dev
+	libsodium-dev
+	util-linux-dev
+	"
 makedepends="
 	$depends_dev
+	argon2-dev
 	autoconf
 	automake
 	db-dev
 	groff
 	libtool
 	mosquitto-dev
+	openssl-dev
 	unixodbc-dev
 	"
+provides="$pkgname-back-monitor=$pkgver-r$pkgrel"  # for backward compatibility (Alpine <3.15)
 subpackages="
 	$pkgname-dev
 	$pkgname-doc
-	libldapcpp
 	libldap
+	$pkgname-lloadd
+	$pkgname-lloadd-openrc:lloadd_openrc
 	$pkgname-clients
-	$pkgname-mqtt
+	$pkgname-passwd-argon2:passwd_argon2
 	$pkgname-passwd-pbkdf2:passwd_pbkdf2
 	$pkgname-passwd-sha2:passwd_sha2
 	$pkgname-backend-all:_backend_all:noarch
 	$pkgname-overlay-all:_overlay_all:noarch
 	$pkgname-openrc
 	"
-install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade"
+install="
+	$pkgname.pre-install
+	$pkgname.post-install
+	$pkgname.pre-upgrade
+	$pkgname.post-upgrade
+	$pkgname-lloadd.pre-install
+	"
 source="https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-$pkgver.tgz
-	openldap-2.4-ppolicy.patch
-	openldap-2.4.11-libldap_r.patch
-	openldap-mqtt-overlay.patch
-	fix-manpages.patch
-	configs.patch
-	cacheflush.patch
-
+	0001-Fix-build-issue-in-clients-tools-common.c.patch
+	0002-Add-UNIX_LINK_LIBS-to-slapi-Makefile.patch
+	0003-Add-mqtt-overlay.patch
+	0004-Fix-manpages.patch
+	0005-Correct-command-line-syntax-in-lloadd-tests.patch
+	0007-Use-correct-extension-for-slapd-modules.patch
+	0008-Remove-pidfile-and-argsfile.patch
+	0009-Include-more-schemas-in-default-config.patch
+
+	lloadd.conf
 	slapd.initd
 	slapd.confd
+	lloadd.initd
+	lloadd.confd
 	"
 
 # SLAPD backends
-_backends=""
-for _name in bdb dnssrv hdb ldap mdb meta monitor null passwd \
-	relay shell sql sock
-do
+_backends="
+	asyncmeta
+	dnssrv
+	ldap
+	lload
+	mdb
+	meta
+	null
+	passwd
+	relay
+	sock
+	sql
+	"
+for _name in $_backends; do
 	subpackages="$subpackages $pkgname-back-$_name:_backend"
-	_backends="$_backends $pkgname-back-$_name"
+	_backend_pkgs="$_backend_pkgs $pkgname-back-$_name"
 done
 
 # SLAPD overlays
-_overlays=""
-for _name in accesslog auditlog collect constraint dds deref dyngroup \
-	dynlist memberof ppolicy proxycache refint retcode rwm seqmod \
-	sssvlv syncprov translucent unique valsort
-do
+_overlays="
+	accesslog
+	auditlog
+	autoca
+	collect
+	constraint
+	dds
+	deref
+	dyngroup
+	dynlist
+	homedir
+	lastbind
+	memberof
+	mqtt
+	otp
+	ppolicy
+	proxycache
+	refint
+	remoteauth
+	retcode
+	rwm
+	seqmod
+	sssvlv
+	syncprov
+	translucent
+	unique
+	valsort
+	"
+for _name in $_overlays; do
 	subpackages="$subpackages $pkgname-overlay-$_name:_overlay"
-	_overlays="$_overlays $pkgname-overlay-$_name"
+	_overlay_pkgs="$_overlay_pkgs $pkgname-overlay-$_name"
 done
 
+# Extra modules from contrib/slapd-modules to build and install.
+_extra_modules="
+	mqtt
+	passwd/pbkdf2
+	passwd/sha2
+	lastbind
+	"
+
+# Some tests hang on aarch64
+case "$CARCH" in
+s390x|aarch64|arm*|x86)
+	options="!check"
+	;;
+esac
+
 prepare() {
-	update_config_sub
 	default_prepare
 
 	sed -i '/^STRIP/s,-s,,g' build/top.mk
-	libtoolize --force && aclocal && autoconf
+	AUTOMAKE=/bin/true autoreconf -fi
 }
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var/lib/openldap \
+	_configure \
 		--enable-slapd \
-		--enable-crypt \
-		--enable-spasswd \
 		--enable-modules \
-		--enable-dynamic \
-		--enable-bdb=mod \
 		--enable-dnssrv=mod \
-		--enable-hdb=mod \
 		--enable-ldap=mod \
 		--enable-mdb=mod \
 		--enable-meta=mod \
-		--enable-monitor=mod \
+		--enable-asyncmeta=mod \
 		--enable-null=mod \
 		--enable-passwd=mod \
 		--enable-relay=mod \
-		--enable-shell=mod \
 		--enable-sock=mod \
 		--enable-sql=mod \
 		--enable-overlays=mod \
-		--with-tls=openssl \
-		--with-cyrus-sasl
+		--enable-balancer=mod \
+		--enable-argon2
 	make
 
-	# Build MQTT overlay.
-	make prefix=/usr libexec=/usr/lib \
-		-C contrib/slapd-modules/mqtt
+	local dir; for dir in $_extra_modules; do
+		msg "Building module $dir"
+		make -C contrib/slapd-modules/$dir prefix=/usr libexecdir=/usr/lib
+	done
 
-	# Build passwd pbkdf2.
-	make prefix=/usr libexecdir=/usr/lib \
-		-C contrib/slapd-modules/passwd/pbkdf2
+	cp -ar "$builddir" "$builddir-lloadd"
+	cd "$builddir-lloadd"
 
-	# Build passwd sha2.
-	make prefix=/usr libexecdir=/usr/lib \
-		-C contrib/slapd-modules/passwd/sha2
+	msg "Building standalone lloadd"
+	make -C servers clean
+	_configure \
+		--enable-balancer=yes
+	make
+}
 
-	# Build C++ library.
-	cd contrib/ldapc++
-	autoreconf -fi
+_configure() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--with-libldap="$builddir/libraries/libldap/.libs -L$builddir/libraries/liblber/.libs" \
-		--with-ldap-includes="$builddir/include"
-	make
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var/lib/openldap \
+		--enable-dynamic \
+		--enable-crypt \
+		--enable-spasswd \
+		--with-tls=openssl \
+		--with-systemd=no \
+		--with-cyrus-sasl \
+		"$@"
 }
 
-package() {
-	make DESTDIR="$pkgdir" install
+check() {
+	# FIXME: Failing network tests on some platforms.
+	rm -f tests/scripts/test018-syncreplication-persist
+	rm -f tests/scripts/test063-delta-multiprovider
+	rm -f tests/scripts/test079-proxy-timeout
 
-	# Install MQTT overlay.
-	make DESTDIR="$pkgdir" prefix=/usr libexec=/usr/lib \
-		-C contrib/slapd-modules/mqtt install
+	make test
+}
 
-	# Install passwd pbkdf2.
-	make DESTDIR="$pkgdir" prefix=/usr libexecdir=/usr/lib \
-		-C contrib/slapd-modules/passwd/pbkdf2 install
+package() {
+	make DESTDIR="$pkgdir" install
 
-	# Install passwd sha2.
-	make DESTDIR="$pkgdir" prefix=/usr libexecdir=/usr/lib \
-		-C contrib/slapd-modules/passwd/sha2 install
+	local dir; for dir in $_extra_modules; do
+		make -C contrib/slapd-modules/$dir \
+			DESTDIR="$pkgdir" prefix=/usr libexecdir=/usr/lib install
+	done
 
-	make DESTDIR="$pkgdir" \
-		-C contrib/ldapc++ install
+	make -C "$builddir-lloadd"/servers/lloadd DESTDIR="$pkgdir" install
 
 	cd "$pkgdir"
 
 	rmdir var/lib/openldap/run
 
 	# Fix tools symlinks to slapd.
-	local path; for path in $(find usr/sbin/ -type l); do
-		ln -sf slapd $path
-	done
+	find usr/sbin/ -type l -exec ln -sf slapd {} \;
 
-	# Move executable from lib to sbin.
-	mv usr/lib/slapd usr/sbin/
+	# Move executables from lib to sbin.
+	mv usr/lib/slapd usr/lib/lloadd usr/sbin/
 
 	# Move *.default configs to docs.
 	mkdir -p usr/share/doc/$pkgname
@@ -177,67 +260,92 @@ package() {
 	chgrp ldap etc/openldap/slapd.*
 	chmod g+r etc/openldap/slapd.*
 
+	install -D -m 640 -g ldap "$srcdir"/lloadd.conf -t etc/openldap/
+
 	install -d -m 700 -o ldap -g ldap \
+		run/openldap \
 		var/lib/openldap \
-		var/lib/openldap/openldap-data
+		var/lib/openldap/openldap-data \
+		var/lib/openldap/openldap-lloadd
 
 	install -D -m 755 "$srcdir"/slapd.initd etc/init.d/slapd
 	install -D -m 644 "$srcdir"/slapd.confd etc/conf.d/slapd
-}
 
-libldapcpp() {
-	pkgdesc="LDAPv3 C++ Class Library"
-	depends=""
-	install=""
-
-	_submv "usr/lib/libldapcpp.so*"
+	install -D -m 755 "$srcdir"/lloadd.initd etc/init.d/lloadd
+	install -D -m 644 "$srcdir"/lloadd.confd etc/conf.d/lloadd
 }
 
 libldap() {
 	pkgdesc="OpenLDAP libraries"
 	depends=""
-	install=""
+	provides=""
 
-	_submv "usr/lib/*.so*" etc/openldap/ldap.conf
+	amove usr/lib/*.so*
+	amove etc/openldap/ldap.conf
+}
+
+lloadd() {
+	pkgdesc="Standalone LDAP Load Balancer Daemon"
+	provides=""
+
+	amove etc/openldap/lloadd.conf
+	amove usr/sbin/lloadd
+	amove var/lib/openldap/openldap-lloadd
+}
+
+lloadd_openrc() {
+	pkgdesc="Standalone LDAP Load Balancer Daemon (OpenRC init scripts)"
+	depends="$depends_openrc"
+	provides=""
+	install_if="openrc $pkgname-lloadd=$pkgver-r$pkgrel"
+
+	amove etc/init.d/lloadd
+	amove etc/conf.d/lloadd
 }
 
 clients() {
 	pkgdesc="LDAP client utilities"
+	provides=""
 
-	_submv usr/bin
+	amove usr/bin
 }
 
-mqtt() {
-	pkgdesc="OpenLDAP MQTT overlay"
+passwd_argon2() {
+	pkgdesc="Argon2 OpenLDAP support"
 	depends="$pkgname"
+	provides=""
 
-	_submv "usr/lib/openldap/mqtt.*"
+	amove usr/lib/openldap/argon2.*
 }
 
 passwd_pbkdf2() {
 	pkgdesc="PBKDF2 OpenLDAP support"
 	depends="$pkgname"
+	provides=""
 
-	_submv "usr/lib/openldap/pw-pbkdf2.*"
+	amove usr/lib/openldap/pw-pbkdf2.*
 }
 
 passwd_sha2() {
 	pkgdesc="SHA2 OpenLDAP support"
 	depends="$pkgname"
+	provides=""
 
-	_submv "usr/lib/openldap/pw-sha2.*"
+	amove usr/lib/openldap/pw-sha2.*
 }
 
 _backend_all() {
 	pkgdesc="Virtual package that installs all OpenLDAP backends"
-	depends="$_backends"
+	depends="$_backend_pkgs"
+	provides=""
 
 	mkdir -p "$subpkgdir"
 }
 
 _overlay_all() {
 	pkgdesc="Virtual package that installs all OpenLDAP overlays"
-	depends="$_overlays"
+	depends="$_overlay_pkgs"
+	provides=""
 
 	mkdir -p "$subpkgdir"
 }
@@ -245,33 +353,47 @@ _overlay_all() {
 _backend() {
 	backend_name="${subpkgname#openldap-back-}"
 	pkgdesc="OpenLDAP $backend_name backend"
+	provides=""
+
+	case "$backend_name" in
+		lload) pkgdesc="OpenLDAP load balancer backend (module)";;
+		*) backend_name="back_$backend_name";;
+	esac
 
-	_submv "usr/lib/openldap/back_$backend_name*"
+	amove usr/lib/openldap/$backend_name*
 }
 
 _overlay() {
 	overlay_name="${subpkgname#openldap-overlay-}"
-	pkgdesc="OpenLDAP $backend_name overlay"
+	pkgdesc="OpenLDAP $overlay_name overlay"
+	provides=""
 
 	case "$overlay_name" in
-		proxycache) overlay_name=pcache;;
+		proxycache)
+			overlay_name=pcache
+		;;
+		mqtt)
+			# For backward compatibility (Alpine <3.15).
+			provides="$pkgname-mqtt=$pkgver-r$pkgrel"
+			replaces="$pkgname-mqtt"
+		;;
 	esac
-	_submv "usr/lib/openldap/$overlay_name*"
-}
-
-_submv() {
-	local path; for path in "$@"; do
-		mkdir -p "$subpkgdir"/${path%/*}
-		mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/
-	done
+	amove usr/lib/openldap/$overlay_name*
 }
 
-sha512sums="99d1943d126b06e62865e31e5825fcff2cb15415f7f85ae4962fa0e7425bc3b58db5b9639150d7b09e3642c80257724c745e47c25ab4fcb1bba0ba771011dd49  openldap-2.4.49.tgz
-5d34d49eabe7cb66cf8284cc3bd9730fa23df4932df68549e242d250ee50d40c434ae074ebc720d5fbcd9d16587c9333c5598d30a5f1177caa61461ab7771f38  openldap-2.4-ppolicy.patch
-44d97efb25d4f39ab10cd5571db43f3bfa7c617a5bb087085ae16c0298aca899b55c8742a502121ba743a73e6d77cd2056bc96cee63d6d0862dabc8fb5574357  openldap-2.4.11-libldap_r.patch
-9c7f41279e91ed995c91e9a8c543c797d9294a93cf260afdc03ab5777e45ed045a4d6a4d4d0180b5dc387dc04babca01d818fbfa8168309df44f4500d2a430a4  openldap-mqtt-overlay.patch
-8c4244d316a05870dd1147b2ab7ddbcfd7626b5dce2f5a0e72f066dc635c2edb4f1ea3be88c6fec2d5ab016001be16bedef70f2ce0695c3cd96f69e1614ff177  fix-manpages.patch
-fd1c1ba368148d42c24071a8a8f668232347f4c48268cd189b6be4a48bb51fc11e8c29074e70db69e1a2c249210bc7d4b4d55a0712e5e97a9df04cc8f743fa70  configs.patch
-60c1ec62003a33036de68402544e25a71715ed124a3139056a94ed1ba02fb8148ee510ab8f182a308105a2f744b9787e67112bcd8cd0d800cdb6f5409c4f63ff  cacheflush.patch
-2d286ff7cc56153204f3ab79c464d083801a40cc9bbb0b5cc1fb19de63d6e81c953b1ab0edd256d9ba48144bbda9a0c0d628bfec1342129aa2727344dea5fa9e  slapd.initd
-64dc4c0aa0abe3d9f7d2aef25fe4c8e23c53df2421067947ac4d096c9e942b26356cb8577ebc41b52d88d0b0a03b2a3e435fe86242671f9b36555a5f82ee0e3a  slapd.confd"
+sha512sums="
+ea207b84fdb7bc6cdff2bc1201fcdde6a907f5766f9637589d956ca86ecf61d4e732ab7d80f33b18b691644e1f5fa39b00ff2c7f4084c9b85760ee693a7c451e  openldap-2.6.7.tgz
+8fa57c43c2d51cd2d1d297b4dd4edd9a15b549b6d5beb8038f66f65cb1d7c93b8fda326c33b4f9356ea99e63703c553662deefc87222f23a1e5517fbf2fabdeb  0001-Fix-build-issue-in-clients-tools-common.c.patch
+a47f909a2ddc1efa12c369243ba59c5b312bebf67f5106d92b575ce9cb694540a9053a1cf6e9811c1ba1da8a9ea36062c357ff7e94d4bf8b4c2457fc4fdaaaec  0002-Add-UNIX_LINK_LIBS-to-slapi-Makefile.patch
+81a9b769bc5b6b599c17381a9f6515f2c479d82f4d728627c83a746403fc3401529dc47146390a4b66a3a4e074cd09c850d3fabe1a097d92066ce16c4443a0fb  0003-Add-mqtt-overlay.patch
+0552438d010a3cf225aa90b8c7744a8dbf853885f34a42f6dfc92e08a8b5b86c0082b1548498c6bc55522ca4ac8e3699cfba63be2279d9dcbbffa2690901f632  0004-Fix-manpages.patch
+f88de2f92a31f1b906e850daa1b518fc90822e668c9ca99c33934304d260237a1406cb845c2f4985bcc1c1c49355784287cb8e27f724ab6833a8e90912decf73  0005-Correct-command-line-syntax-in-lloadd-tests.patch
+30af37e70a53a55c56bb0e74eee770a00abe83d4b0a787845363ccff564b49b8ba20c907bb976442b4dc2278db7b0a039a11c85dd40a547af6de9a7f1591328f  0007-Use-correct-extension-for-slapd-modules.patch
+eaadec2a58a7f117c67b10673e26fe8c38e40ae4c1ae5fda9004c9bbebca81b6cd51cc482f28d94dacd8154ed800fd1e90f48807970f54652bfc021f8039806e  0008-Remove-pidfile-and-argsfile.patch
+1c2a18280ea06f8095f013c110f8b1b0779c3dc89aa19158cdedbe3a7e1019e7ea5a503cba4d3e3ae824423ded22b2ef334665d2281969ac3b0efb96de34e37e  0009-Include-more-schemas-in-default-config.patch
+c47a415a2a9cd98bb448820b981f40df82b4825e0ebcc8a5fb3c604d15e8f57ea1578afca6b3aa90351fd13e7ddba7dc7452bdb669df4a402f02990ca154e34e  lloadd.conf
+d8bd06f56a816851015488cccb352657df09f1aed9990fc2870208ffb1c5c499ac1d7592c42e8fa6e4a26a6bb2535f57e91d3a2aecfb38cf15d86de20e0e69a7  slapd.initd
+5898139481b3317b257ce1bfab401dd4e111a8f7ebb02262a8dcb165c6416fba1e5bb070cdf618918f018d2ad942d9514ce6a9b2ab1c57ac30ec75fb53b04af1  slapd.confd
+60667ed6fe2a4fa590f3b3ab6b33e338d6f78334ed234941a8912cf6fe646d1a70b2480586faa18c33c9e130cb53347c9681900ebaa66c900ed76d93a7876d40  lloadd.initd
+de18b02336ebfff79b681ae4781ed0fa29903162ab9fb64328750f0ae8f6c2533dac69d5430efb56f10734642a3f4cd81c50bdb2920b6f70ad89c87acabecbe2  lloadd.confd
+"
diff --git a/main/openldap/cacheflush.patch b/main/openldap/cacheflush.patch
deleted file mode 100644
index 330e4c67aa7..00000000000
--- a/main/openldap/cacheflush.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/libraries/liblmdb/mdb.c
-+++ b/libraries/liblmdb/mdb.c
-@@ -77,8 +77,7 @@
- 
- #if defined(__mips) && defined(__linux)
- /* MIPS has cache coherency issues, requires explicit cache control */
--#include <asm/cachectl.h>
--extern int cacheflush(char *addr, int nbytes, int cache);
-+#include <sys/cachectl.h>
- #define CACHEFLUSH(addr, bytes, cache)	cacheflush(addr, bytes, cache)
- #else
- #define CACHEFLUSH(addr, bytes, cache)
diff --git a/main/openldap/configs.patch b/main/openldap/configs.patch
deleted file mode 100644
index 8f0c2bfdbbd..00000000000
--- a/main/openldap/configs.patch
+++ /dev/null
@@ -1,117 +0,0 @@
---- a/servers/slapd/slapd.conf
-+++ b/servers/slapd/slapd.conf
-@@ -2,7 +2,7 @@
- # See slapd.conf(5) for details on configuration options.
- # This file should NOT be world readable.
- #
--include		%SYSCONFDIR%/schema/core.schema
-+include		/etc/openldap/schema/core.schema
- 
- # Define global ACLs to disable default read access.
- 
-@@ -10,13 +10,16 @@
- # service AND an understanding of referrals.
- #referral	ldap://root.openldap.org
- 
--pidfile		%LOCALSTATEDIR%/run/slapd.pid
--argsfile	%LOCALSTATEDIR%/run/slapd.args
-+# If you change this, adjust pidfile path also in runscript!
-+pidfile		/run/openldap/slapd.pid
-+argsfile	/run/openldap/slapd.args
- 
- # Load dynamic backend modules:
--# modulepath	%MODULEDIR%
--# moduleload	back_mdb.la
--# moduleload	back_ldap.la
-+modulepath	/usr/lib/openldap
-+moduleload	back_mdb.so
-+# moduleload	back_hdb.so
-+# moduleload	back_bbd.so
-+# moduleload	back_ldap.so
- 
- # Sample security restrictions
- #	Require integrity protection (prevent hijacking)
-@@ -53,13 +56,16 @@
- maxsize		1073741824
- suffix		"dc=my-domain,dc=com"
- rootdn		"cn=Manager,dc=my-domain,dc=com"
-+
- # Cleartext passwords, especially for the rootdn, should
- # be avoid.  See slappasswd(8) and slapd.conf(5) for details.
- # Use of strong authentication encouraged.
- rootpw		secret
-+
- # The database directory MUST exist prior to running slapd AND 
- # should only be accessible by the slapd and slap tools.
- # Mode 700 recommended.
--directory	%LOCALSTATEDIR%/openldap-data
-+directory	/var/lib/openldap/openldap-data
-+
- # Indices to maintain
- index	objectClass	eq
---- a/servers/slapd/slapd.ldif
-+++ b/servers/slapd/slapd.ldif
-@@ -9,8 +9,9 @@
- #
- # Define global ACLs to disable default read access.
- #
--olcArgsFile: %LOCALSTATEDIR%/run/slapd.args
--olcPidFile: %LOCALSTATEDIR%/run/slapd.pid
-+# If you change this, set pidfile variable in /etc/conf.d/slapd!
-+olcPidFile: /run/openldap/slapd.pid
-+olcArgsFile: /run/openldap/slapd.args
- #
- # Do not enable referrals until AFTER you have a working directory
- # service AND an understanding of referrals.
-@@ -26,22 +27,23 @@
- #
- # Load dynamic backend modules:
- #
--#dn: cn=module,cn=config
--#objectClass: olcModuleList
--#cn: module
--#olcModulepath:	%MODULEDIR%
--#olcModuleload:	back_bdb.la
--#olcModuleload:	back_hdb.la
--#olcModuleload:	back_ldap.la
--#olcModuleload:	back_passwd.la
--#olcModuleload:	back_shell.la
-+dn: cn=module,cn=config
-+objectClass: olcModuleList
-+cn: module
-+olcModulepath:	/usr/lib/openldap
-+#olcModuleload:	back_bdb.so
-+#olcModuleload:	back_hdb.so
-+#olcModuleload:	back_ldap.so
-+olcModuleload:	back_mdb.so
-+#olcModuleload:	back_passwd.so
-+#olcModuleload:	back_shell.so
- 
- 
- dn: cn=schema,cn=config
- objectClass: olcSchemaConfig
- cn: schema
- 
--include: file://%SYSCONFDIR%/schema/core.ldif
-+include: file:///etc/openldap/schema/core.ldif
- 
- # Frontend settings
- #
-@@ -83,13 +85,16 @@
- olcDatabase: mdb
- olcSuffix: dc=my-domain,dc=com
- olcRootDN: cn=Manager,dc=my-domain,dc=com
-+#
- # Cleartext passwords, especially for the rootdn, should
- # be avoided.  See slappasswd(8) and slapd-config(5) for details.
- # Use of strong authentication encouraged.
- olcRootPW: secret
-+#
- # The database directory MUST exist prior to running slapd AND 
- # should only be accessible by the slapd and slap tools.
- # Mode 700 recommended.
--olcDbDirectory:	%LOCALSTATEDIR%/openldap-data
-+olcDbDirectory:	/var/lib/openldap/openldap-data
-+#
- # Indices to maintain
- olcDbIndex: objectClass eq
diff --git a/main/openldap/fix-manpages.patch b/main/openldap/fix-manpages.patch
deleted file mode 100644
index 17956949493..00000000000
--- a/main/openldap/fix-manpages.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Various manual pages changes:
-* removes LIBEXECDIR from slapd.8
-* removes references to non-existing manpages (bz 624616)
-
-Patch-Source: https://src.fedoraproject.org/rpms/openldap/blob/f27/f/openldap-manpages.patch
-
-diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1
-index 3def6da..466c772 100644
---- a/doc/man/man1/ldapmodify.1
-+++ b/doc/man/man1/ldapmodify.1
-@@ -397,8 +397,7 @@ exit status and a diagnostic message being written to standard error.
- .BR ldap_add_ext (3),
- .BR ldap_delete_ext (3),
- .BR ldap_modify_ext (3),
--.BR ldap_modrdn_ext (3),
--.BR ldif (5).
-+.BR ldif (5)
- .SH AUTHOR
- The OpenLDAP Project <http://www.openldap.org/>
- .SH ACKNOWLEDGEMENTS
-diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
-index cfde143..63592cb 100644
---- a/doc/man/man5/ldap.conf.5
-+++ b/doc/man/man5/ldap.conf.5
-@@ -317,6 +317,7 @@ certificates in separate individual files. The
- .B TLS_CACERT
- is always used before
- .B TLS_CACERTDIR.
-+The specified directory must be managed with the LibreSSL c_rehash utility.
- This parameter is ignored with GnuTLS.
- 
- When using Mozilla NSS, <path> may contain a Mozilla NSS cert/key
-diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8
-index b739f4d..e2a1a00 100644
---- a/doc/man/man8/slapd.8
-+++ b/doc/man/man8/slapd.8
-@@ -5,7 +5,7 @@
- .SH NAME
- slapd \- Stand-alone LDAP Daemon
- .SH SYNOPSIS
--.B LIBEXECDIR/slapd 
-+.B slapd
- [\c
- .BR \-4 | \-6 ]
- [\c
-@@ -317,7 +317,7 @@ the LDAP databases defined in the default config file, just type:
- .LP
- .nf
- .ft tt
--	LIBEXECDIR/slapd
-+	slapd
- .ft
- .fi
- .LP
-@@ -328,7 +328,7 @@ on voluminous debugging which will be printed on standard error, type:
- .LP
- .nf
- .ft tt
--	LIBEXECDIR/slapd \-f /var/tmp/slapd.conf \-d 255
-+	slapd -f /var/tmp/slapd.conf -d 255
- .ft
- .fi
- .LP
-@@ -336,7 +336,7 @@ To test whether the configuration file is correct or not, type:
- .LP
- .nf
- .ft tt
--	LIBEXECDIR/slapd \-Tt
-+	slapd -Tt
- .ft
- .fi
- .LP
--- 
-1.8.1.4
-
diff --git a/main/openldap/lloadd.conf b/main/openldap/lloadd.conf
new file mode 100644
index 00000000000..39d1bba541d
--- /dev/null
+++ b/main/openldap/lloadd.conf
@@ -0,0 +1,49 @@
+# Configuration file for stand alone LDAP Load Balancer Daemon (Lloadd)
+# Refer to lloadd.conf(5) for more information.
+
+## Global configuration
+
+# Specify the level at which debugging statements and operation statistics
+# should be syslogged. Log levels are additive, and available levels are:
+# trace, packets, args, conns, BER, config, stats, stats2, none.
+# "none" means only messages that get logged whatever log level is set.
+loglevel none
+
+# Cancel is not supported yet.
+restrict_exop 1.3.6.1.1.8 reject
+
+# Turn is not supported.
+restrict_exop 1.3.6.1.1.19 reject
+
+# TXN Exop if desired, otherwise reject.
+restrict_exop 1.3.6.1.1.21.1 connection
+
+# Paged results control.
+restrict_control 1.2.840.113556.1.4.319 connection
+
+# VLV control.
+restrict_control 2.16.840.1.113730.3.4.9 connection
+
+
+## Backend configuration
+
+# bindconf
+# 	bindmethod=simple
+# 	binddn=cn=test
+# 	credentials=change-me
+#
+# tier roundrobin
+#
+# backend-server
+# 	uri=ldap://ldap1.example.org
+# 	numconns=3
+# 	bindconns=2
+# 	max-pending-ops=5
+# 	conn-max-pending=3
+#
+# backend-server
+# 	uri=ldap://ldap2.example.org
+# 	numconns=3
+# 	bindconns=2
+# 	max-pending-ops=5
+# 	conn-max-pending=3
diff --git a/main/openldap/lloadd.confd b/main/openldap/lloadd.confd
new file mode 100644
index 00000000000..62d23fb1ed7
--- /dev/null
+++ b/main/openldap/lloadd.confd
@@ -0,0 +1,19 @@
+# Configuration for /etc/init.d/lloadd
+
+# Location of the configuration file.
+#cfgfile="/etc/openldap/lloadd.conf"
+
+# lloadd will by default serve ldap:/// (LDAP over TCP on all interfaces on
+# port LDAP port 389). This option may be used to specify LDAP (and other
+# scheme) URLs to serve. Refer to lloadd(8) for more information.
+#listen_uris=
+
+# Additional arguments to pass to lloadd.
+#command_args=
+
+# Number of milliseconds to wait after starting to check if the daemon is still
+# running (used only with start-stop-daemon). Set to empty string to disable.
+#start_wait=50
+
+# Uncomment to run with process supervisor.
+# supervisor="supervise-daemon"
diff --git a/main/openldap/lloadd.initd b/main/openldap/lloadd.initd
new file mode 100644
index 00000000000..2eb7121b034
--- /dev/null
+++ b/main/openldap/lloadd.initd
@@ -0,0 +1,48 @@
+#!/sbin/openrc-run
+
+name="LDAP load-balancer"
+description="Stand-alone LDAP load balancer daemon"
+description_checkconfig="Check configuration file (errors are logged to syslog)"
+
+extra_commands="checkconfig"
+
+: ${cfgfile:="/etc/openldap/lloadd.conf"}
+: ${start_wait=50}  # milliseconds
+
+command=/usr/sbin/lloadd
+command_args="
+	-u ldap -g ldap
+	-l DAEMON
+	${listen_uris:+-h \"$listen_uris\"}
+	-d 0
+	-f $cfgfile
+	${command_args:-}
+	"
+command_background=yes
+
+pidfile="/run/$RC_SVCNAME.pid"
+start_stop_daemon_args="
+	${start_wait:+--wait $start_wait}
+	${start_stop_daemon_args:-}
+	"
+# See https://github.com/OpenRC/openrc/pull/558
+supervise_daemon_args=" $supervise_daemon_args"
+
+required_files="$cfgfile"
+
+depend() {
+	need net
+	after firewall
+	before dbus hald avahi-daemon
+	provide ldap
+}
+
+start_pre() {
+	$command $command_args -t >/dev/null 2>&1 || $command $command_args -t
+}
+
+checkconfig() {
+	ebegin "Checking $name configuration"
+	$command $command_args -t
+	eend $?
+}
diff --git a/main/openldap/openldap-2.4-ppolicy.patch b/main/openldap/openldap-2.4-ppolicy.patch
deleted file mode 100644
index c05790e3e29..00000000000
--- a/main/openldap/openldap-2.4-ppolicy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN ./clients.orig/tools/common.c ./clients/tools/common.c
---- ./clients.orig/tools/common.c	2007-09-01 01:13:50.000000000 +0200
-+++ ./clients/tools/common.c	2008-01-13 21:50:06.000000000 +0100
-@@ -1262,8 +1262,8 @@
- 	int		nsctrls = 0;
- 
- #ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
-+	LDAPControl c;
- 	if ( ppolicy ) {
--		LDAPControl c;
- 		c.ldctl_oid = LDAP_CONTROL_PASSWORDPOLICYREQUEST;
- 		c.ldctl_value.bv_val = NULL;
- 		c.ldctl_value.bv_len = 0;
diff --git a/main/openldap/openldap-2.4.11-libldap_r.patch b/main/openldap/openldap-2.4.11-libldap_r.patch
deleted file mode 100644
index 448249a3b58..00000000000
--- a/main/openldap/openldap-2.4.11-libldap_r.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nuar openldap-2.4.11.orig/servers/slapd/slapi/Makefile.in openldap-2.4.11/servers/slapd/slapi/Makefile.in
---- openldap-2.4.11.orig/servers/slapd/slapi/Makefile.in	2008-02-11 15:26:49.000000000 -0800
-+++ openldap-2.4.11/servers/slapd/slapi/Makefile.in	2008-10-14 02:10:18.402799262 -0700
-@@ -37,6 +37,7 @@
- XLIBS = $(LIBRARY)
- XXLIBS = 
- NT_LINK_LIBS = $(AC_LIBS)
-+UNIX_LINK_LIBS = ../../../libraries/libldap_r/libldap_r.la $(LTHREAD_LIBS)
- 
- XINCPATH = -I$(srcdir)/.. -I$(srcdir)
- XDEFS = $(MODULES_CPPFLAGS)
diff --git a/main/openldap/openldap-lloadd.pre-install b/main/openldap/openldap-lloadd.pre-install
new file mode 120000
index 00000000000..d4fb5656dd9
--- /dev/null
+++ b/main/openldap/openldap-lloadd.pre-install
@@ -0,0 +1 @@
+openldap.pre-install
\ No newline at end of file
diff --git a/main/openldap/openldap-mqtt-overlay.patch b/main/openldap/openldap-mqtt-overlay.patch
deleted file mode 100644
index 795480f1e45..00000000000
--- a/main/openldap/openldap-mqtt-overlay.patch
+++ /dev/null
@@ -1,447 +0,0 @@
-diff --git a/contrib/slapd-modules/mqtt/Makefile b/contrib/slapd-modules/mqtt/Makefile
-new file mode 100644
-index 0000000..2cb4db7
---- /dev/null
-+++ b/contrib/slapd-modules/mqtt/Makefile
-@@ -0,0 +1,45 @@
-+# $OpenLDAP$
-+
-+LDAP_SRC = ../../..
-+LDAP_BUILD = ../../..
-+LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
-+LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
-+	$(LDAP_BUILD)/libraries/liblber/liblber.la
-+
-+LIBTOOL = $(LDAP_BUILD)/libtool
-+CC = gcc
-+OPT = -g -O2 -Wall
-+DEFS = 
-+INCS = $(LDAP_INC)
-+LIBS = $(LDAP_LIB) -lmosquitto
-+
-+PROGRAMS = mqtt.la
-+LTVER = 0:0:0
-+
-+prefix=/usr/local
-+exec_prefix=$(prefix)
-+ldap_subdir=/openldap
-+
-+libdir=$(exec_prefix)/lib
-+libexecdir=$(exec_prefix)/libexec
-+moduledir = $(libdir)$(ldap_subdir)
-+
-+.SUFFIXES: .c .o .lo
-+
-+.c.lo:
-+	$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
-+
-+all: $(PROGRAMS)
-+
-+mqtt.la: mqtt.lo
-+	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-+	-rpath $(moduledir) -module -o $@ $? $(LIBS)
-+
-+clean:
-+	rm -rf *.o *.lo *.la .libs
-+
-+install: $(PROGRAMS)
-+	mkdir -p $(DESTDIR)$(moduledir)
-+	for p in $(PROGRAMS) ; do \
-+		$(LIBTOOL) --mode=install cp $$p $(DESTDIR)$(moduledir) ; \
-+	done
-diff --git a/contrib/slapd-modules/mqtt/mqtt.c b/contrib/slapd-modules/mqtt/mqtt.c
-new file mode 100644
-index 0000000..b3a0a31
---- /dev/null
-+++ b/contrib/slapd-modules/mqtt/mqtt.c
-@@ -0,0 +1,389 @@
-+/* $OpenLDAP$ */
-+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
-+ *
-+ * Copyright 2014 Timo Teräs <timo.teras@iki.fi>.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted only as authorized by the OpenLDAP
-+ * Public License.
-+ *
-+ * A copy of this license is available in file LICENSE in the
-+ * top-level directory of the distribution or, alternatively, at
-+ * http://www.OpenLDAP.org/license.html.
-+ */
-+/* mqtt-overlay
-+ *
-+ * This is an OpenLDAP overlay that... */
-+
-+#include <mosquitto.h>
-+#include <unistd.h>
-+
-+#include "portable.h" 
-+#include "slap.h"
-+#include "config.h"
-+
-+typedef struct mqtt_notify_t {
-+	struct mqtt_notify_t	*next;
-+	char			*topic;
-+	char			*dn_group_str;
-+	char			*oc_group_str;
-+	char			*str_member;
-+
-+	struct berval		ndn_group;
-+	ObjectClass		*oc_group;
-+	AttributeDescription	*ad_member;
-+	int			notify_pending;
-+} mqtt_notify_t;
-+
-+typedef struct mqtt_t {
-+	struct mosquitto *mq;
-+	int port;
-+	char *hostname, *username, *password;
-+	mqtt_notify_t *notify_map;
-+} mqtt_t;
-+
-+static ConfigDriver mqtt_config_notify;
-+
-+static ConfigTable mqttcfg[] = {
-+	{ "mqtt-hostname", "hostname", 2, 2, 0,
-+		ARG_STRING|ARG_OFFSET, (void *)offsetof(mqtt_t, hostname),
-+		"( OLcfgCtAt:5.1 NAME 'olcMqttHostname' "
-+		"DESC 'Hostname of MQTT broker' "
-+		"SYNTAX OMsDirectoryString SINGLE-VALUE )",
-+		NULL, NULL },
-+	{ "mqtt-port", "port", 2, 2, 0,
-+		ARG_INT|ARG_OFFSET, (void *)offsetof(mqtt_t, port),
-+		"( OLcfgCtAt:5.2 NAME 'olcMqttPort' "
-+		"DESC 'Port of MQTT broker' "
-+		"SYNTAX OMsInteger SINGLE-VALUE )",
-+		NULL, NULL },
-+	{ "mqtt-username", "username", 2, 2, 0,
-+		ARG_STRING|ARG_OFFSET, (void *)offsetof(mqtt_t, username),
-+		"( OLcfgCtAt:5.3 NAME 'olcMqttUsername' "
-+		"DESC 'Username for MQTT broker' "
-+		"SYNTAX OMsDirectoryString SINGLE-VALUE )",
-+		NULL, NULL },
-+	{ "mqtt-password", "password", 2, 2, 0,
-+		ARG_STRING|ARG_OFFSET, (void *)offsetof(mqtt_t, password),
-+		"( OLcfgCtAt:5.4 NAME 'olcMqttPassword' "
-+		"DESC 'Password for MQTT broker' "
-+		"SYNTAX OMsDirectoryString SINGLE-VALUE )",
-+		NULL, NULL },
-+	{ "mqtt-notify-password", "topic> <group-dn> <group-oc> <member-ad", 2, 5, 0,
-+		ARG_MAGIC, mqtt_config_notify,
-+		"( OLcfgCtAt:5.5 NAME 'olcMqttNotifyPassword' "
-+		"DESC 'Notify password change on <topic>, optionally checking that the object is in the specified group.'"
-+		"SYNTAX OMsDirectoryString X-ORDERED 'VALUES' )",
-+		NULL, NULL },
-+	{ NULL, NULL, 0, 0, 0, ARG_IGNORED }
-+};
-+
-+static ConfigOCs mqttocs[] = {
-+	{ "( OLcfgCtOc:5.1 "
-+	  "NAME 'olcMqttConfig' "
-+	  "DESC 'MQTT configuration' "
-+	  "SUP olcOverlayConfig "
-+	  "MAY ( "
-+		"olcMqttHostname "
-+		"$ olcMqttPort"
-+		"$ olcMqttUsername"
-+		"$ olcMqttPassword"
-+		"$ olcMqttNotifyPassword"
-+	  " ) )",
-+	  Cft_Overlay, mqttcfg },
-+
-+	{ NULL, 0, NULL }
-+};
-+
-+static int mqtt_init(BackendInfo *bi)
-+{
-+	return mosquitto_lib_init();
-+}
-+
-+static int mqtt_destroy(BackendInfo *bi)
-+{
-+	return mosquitto_lib_cleanup();
-+}
-+
-+static const char *ca_arg(ConfigArgs *c, int n)
-+{
-+	return (c->argc <= n) ? NULL : c->argv[n];
-+}
-+
-+static void free_notify(mqtt_notify_t *n)
-+{
-+	ch_free(n->topic);
-+	ch_free(n->oc_group_str);
-+	ch_free(n->str_member);
-+	ch_free(n->dn_group_str);
-+	if (!BER_BVISNULL(&n->ndn_group))
-+		ber_memfree(n->ndn_group.bv_val);
-+	ch_free(n);
-+}
-+
-+static void free_all_notifies(mqtt_t *mqtt)
-+{
-+	mqtt_notify_t *n, *next;
-+
-+	for (n = mqtt->notify_map; n; n = next) {
-+		next = n->next;
-+		free_notify(n);
-+	}
-+	mqtt->notify_map = NULL;
-+}
-+
-+static int mqtt_config_notify(ConfigArgs *c)
-+{
-+	slap_overinst *on = (slap_overinst *)c->bi;
-+	mqtt_t *mqtt = (mqtt_t *) on->on_bi.bi_private;
-+	mqtt_notify_t *n, **pprev;
-+	const char *text = NULL;
-+	struct berval bv = BER_BVNULL, ndn = BER_BVNULL;
-+	int rc, i;
-+
-+	switch (c->op) {
-+	case SLAP_CONFIG_EMIT:
-+		for (i = 0, n = mqtt->notify_map; n; n = n->next, i++) {
-+			char *ptr = c->cr_msg, *end = &c->cr_msg[sizeof(c->cr_msg)-1];
-+
-+			ptr += snprintf(ptr, end-ptr, SLAP_X_ORDERED_FMT "%s", i, n->topic);
-+			if (n->dn_group_str)
-+				ptr += snprintf(ptr, end-ptr, " \"%s\"", n->dn_group_str);
-+			if (n->oc_group_str)
-+				ptr += snprintf(ptr, end-ptr, " \"%s\"", n->oc_group_str);
-+			if (n->str_member)
-+				ptr += snprintf(ptr, end-ptr, " \"%s\"", n->str_member);
-+
-+			bv.bv_val = c->cr_msg;
-+			bv.bv_len = ptr - bv.bv_val;
-+			value_add_one(&c->rvalue_vals, &bv);
-+		}
-+		return 0;
-+	case LDAP_MOD_DELETE:
-+		if (c->valx < 0) {
-+			free_all_notifies(mqtt);
-+		} else {
-+			pprev = &mqtt->notify_map;
-+			n = mqtt->notify_map;
-+			for (i = 0; i < c->valx; i++) {
-+				pprev = &n->next;
-+				n = n->next;
-+			}
-+			*pprev = n->next;
-+			free_notify(n);
-+		}
-+		return 0;
-+	}
-+
-+	const char *groupdn = ca_arg(c, 2);
-+	const char *oc_name = ca_arg(c, 3);
-+	const char *ad_name = ca_arg(c, 4);
-+	ObjectClass *oc = NULL;
-+	AttributeDescription *ad = NULL;
-+
-+	if (groupdn) {
-+		oc = oc_find(oc_name ?: SLAPD_GROUP_CLASS);
-+		if (oc == NULL) {
-+			Debug(LDAP_DEBUG_ANY, "mqtt_db_open: unable to find objectClass=\"%s\"\n",
-+				oc_name, 0, 0);
-+			return 1;
-+		}
-+
-+		rc = slap_str2ad(ad_name ?: SLAPD_GROUP_ATTR, &ad, &text);
-+		if (rc != LDAP_SUCCESS) {
-+			Debug(LDAP_DEBUG_ANY, "mqtt_db_config_notify: unable to find attribute=\"%s\": %s (%d)\n",
-+				ad_name, text, rc);
-+			return rc;
-+		}
-+
-+		ber_str2bv(groupdn, 0, 0, &bv);
-+		rc = dnNormalize(0, NULL, NULL, &bv, &ndn, NULL);
-+		if (rc != LDAP_SUCCESS) {
-+			Debug(LDAP_DEBUG_ANY, "mqtt_db_config_notify: DN normalization failed for \"%s\": %d\n",
-+				groupdn, rc, 0);
-+			return rc;
-+		}
-+	}
-+
-+	n = ch_calloc(1, sizeof(*n));
-+	n->topic = ch_strdup(c->argv[1]);
-+	n->dn_group_str = groupdn ? ch_strdup(groupdn) : NULL;
-+	n->oc_group_str = oc_name ? ch_strdup(oc_name) : NULL;
-+	n->str_member   = ad_name ? ch_strdup(ad_name) : NULL;
-+	n->ndn_group = ndn;
-+	n->oc_group = oc;
-+	n->ad_member = ad;
-+
-+	for (pprev = &mqtt->notify_map; *pprev; pprev = &(*pprev)->next);
-+	*pprev = n;
-+
-+	return 0;
-+}
-+
-+static void mqtt_send_notify(mqtt_t *mqtt, mqtt_notify_t *n)
-+{
-+	Debug(LDAP_DEBUG_TRACE, "mqtt_send_notify: pub on topic '%s'\n", n->topic, 0, 0);
-+	n->notify_pending = mosquitto_publish(mqtt->mq, NULL, n->topic, 0, NULL, 1, true) == MOSQ_ERR_NO_CONN;
-+}
-+
-+static void mqtt_on_connect(struct mosquitto *mq, void *obj, int rc)
-+{
-+	slap_overinst *on = (slap_overinst *) obj;
-+	mqtt_t *mqtt = (mqtt_t *) on->on_bi.bi_private;
-+	mqtt_notify_t *n;
-+
-+	Debug(LDAP_DEBUG_TRACE, "mqtt_on_connect: connected with status %d\n", rc, 0, 0);
-+	if (rc != 0)
-+		return;
-+	
-+	for (n = mqtt->notify_map; n; n = n->next)
-+		if (n->notify_pending)
-+			mqtt_send_notify(mqtt, n);
-+}
-+
-+static int mqtt_db_init(BackendDB *be, ConfigReply *cr)
-+{
-+	slap_overinst *on = (slap_overinst *) be->bd_info;
-+
-+	Debug(LDAP_DEBUG_TRACE, "mqtt_db_init: initialize overlay\n", 0, 0, 0);
-+	on->on_bi.bi_private = ch_calloc(1, sizeof(mqtt_t));
-+
-+	return 0;
-+}
-+
-+static int mqtt_db_destroy(BackendDB *be, ConfigReply *cr)
-+{
-+	slap_overinst *on = (slap_overinst *) be->bd_info;
-+	mqtt_t *mqtt = on->on_bi.bi_private;
-+
-+	Debug(LDAP_DEBUG_TRACE, "mqtt_db_destroy: destroy overlay\n", 0, 0, 0);
-+	free_all_notifies(mqtt);
-+	ch_free(mqtt);
-+
-+	return 0;
-+}
-+
-+static int mqtt_db_open(BackendDB *be, ConfigReply *cr)
-+{
-+	slap_overinst *on = (slap_overinst *) be->bd_info;
-+	mqtt_t *mqtt = (mqtt_t *) on->on_bi.bi_private;
-+	struct mosquitto *mq;
-+	char id[256];
-+	int n;
-+
-+	n = snprintf(id, sizeof(id), "openldap-mqtt/%d/", getpid());
-+	gethostname(&id[n], sizeof(id) - n);
-+
-+	Debug(LDAP_DEBUG_TRACE, "mqtt_db_open, id='%s'\n", id, 0, 0);
-+	mqtt->mq = mq = mosquitto_new(id, true, on);
-+	if (!mq) return 1;
-+
-+	if (mqtt->username && mqtt->password)
-+		mosquitto_username_pw_set(mq, mqtt->username, mqtt->password);
-+
-+	mosquitto_connect_callback_set(mq, mqtt_on_connect);
-+	mosquitto_connect_async(mq, mqtt->hostname ?: "127.0.0.1", mqtt->port ?: 1883, 60);
-+	mosquitto_loop_start(mq);
-+
-+	return 0;
-+}
-+
-+static int mqtt_db_close(BackendDB *be, ConfigReply *cr)
-+{
-+	slap_overinst *on = (slap_overinst *) be->bd_info;
-+	mqtt_t *mqtt = (mqtt_t *) on->on_bi.bi_private;
-+
-+	Debug(LDAP_DEBUG_TRACE, "mqtt_db_close\n", 0, 0, 0);
-+	mosquitto_disconnect(mqtt->mq);
-+	mosquitto_loop_stop(mqtt->mq, false);
-+	mosquitto_destroy(mqtt->mq);
-+
-+	free(mqtt->hostname); mqtt->hostname = NULL;
-+	free(mqtt->username); mqtt->username = NULL;
-+	free(mqtt->password); mqtt->password = NULL;
-+
-+	return 0;
-+}
-+
-+static int mqtt_response(Operation *op, SlapReply *rs)
-+{
-+	slap_overinst *on = (slap_overinst *) op->o_bd->bd_info;
-+	mqtt_t *mqtt = (mqtt_t *) on->on_bi.bi_private;
-+	Attribute *a;
-+	Modifications *m;
-+	bool change = false;
-+
-+	switch (op->o_tag) {
-+	case LDAP_REQ_ADD:
-+		for (a = op->ora_e->e_attrs; a; a = a->a_next) {
-+			if (a->a_desc == slap_schema.si_ad_userPassword) {
-+				change = true;
-+				break;
-+			}
-+		}
-+		break;
-+	case LDAP_REQ_MODIFY:
-+		for (m = op->orm_modlist; m; m = m->sml_next) {
-+			if (m->sml_desc == slap_schema.si_ad_userPassword) {
-+				change = true;
-+				break;
-+			}
-+		}
-+		break;
-+	case LDAP_REQ_EXTENDED:
-+		if (ber_bvcmp(&slap_EXOP_MODIFY_PASSWD, &op->ore_reqoid) == 0)
-+			change = true;
-+		break;
-+	}
-+
-+	if (change) {
-+		mqtt_notify_t *n;
-+		int r, cache;
-+
-+		for (n = mqtt->notify_map; n; n = n->next) {
-+			if (n->oc_group) {
-+				cache = op->o_do_not_cache;
-+				op->o_do_not_cache = 1;
-+				r = backend_group(op, NULL, &n->ndn_group, &op->o_req_ndn, n->oc_group, n->ad_member);
-+				op->o_do_not_cache = cache;
-+			} else {
-+				r = 0;
-+			}
-+
-+			Debug(LDAP_DEBUG_TRACE, "tested o_req_ndn='%s' in ndn_group='%s' r=%d\n",
-+				op->o_req_ndn.bv_val, n->ndn_group.bv_val, r);
-+
-+			if (r == 0)
-+				mqtt_send_notify(mqtt, n);
-+		}
-+	}
-+
-+	return SLAP_CB_CONTINUE;
-+}
-+
-+static int mqtt_init_overlay() 
-+{
-+	static slap_overinst ov;
-+	int rc;
-+
-+	ov.on_bi.bi_type = "mqtt";
-+	ov.on_bi.bi_init = mqtt_init;
-+	ov.on_bi.bi_destroy = mqtt_destroy;
-+	ov.on_bi.bi_db_init = mqtt_db_init;
-+	ov.on_bi.bi_db_destroy = mqtt_db_destroy;
-+	ov.on_bi.bi_db_open = mqtt_db_open;
-+	ov.on_bi.bi_db_close = mqtt_db_close;
-+	ov.on_bi.bi_cf_ocs = mqttocs;
-+	ov.on_response = mqtt_response;
-+
-+	rc = config_register_schema(mqttcfg, mqttocs);
-+	if (rc) return rc;
-+
-+	return overlay_register(&ov);
-+}
-+
-+int init_module(int argc, char *argv[]) 
-+{
-+	return mqtt_init_overlay();
-+}
-
diff --git a/main/openldap/openldap.pre-upgrade b/main/openldap/openldap.pre-upgrade
new file mode 100644
index 00000000000..6ff21696c7b
--- /dev/null
+++ b/main/openldap/openldap.pre-upgrade
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+old_ver="$2"
+datadir='/var/lib/openldap/openldap-data'
+
+if [ "$(apk version -t "$old_ver" '2.6.0-r0')" = '<' ]; then
+	for back in bdb hdb; do
+		if apk info -eq openldap-back-$back; then
+			if find "$datadir" -iname "*.$back" 2>/dev/null | grep -q .; then
+				cat >&2 <<-EOF
+				*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*
+				*! Found *.$back files in $datadir!
+				*! OpenLDAP 2.6+ doesn't provide deprecated BDB and HDB backends anymore.
+				*! You have to migrate your database to MDB backend before upgrading
+				*! openldap!
+				*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*!*
+				EOF
+				exit 1
+			fi
+		fi
+	done
+fi
+
+exit 0
diff --git a/main/openldap/slapd.confd b/main/openldap/slapd.confd
index f69f92b4ab0..ff8613d8cb5 100644
--- a/main/openldap/slapd.confd
+++ b/main/openldap/slapd.confd
@@ -4,9 +4,20 @@
 cfgfile="/etc/openldap/slapd.conf"
 
 # Location of the configuration directory (OpenLDAP 2.3+).
-#cfgdir=""
+#cfgdir=
 
-# To enable both the standard unciphered server and the ssl encrypted
-# one uncomment this line or set any other server starting options
-# you may desire.
-#command_args="-h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'"
+# A space-separated list of LDAP URIs to serve.
+# slapd will by default serve ldap:/// (LDAP over TCP on all interfaces on port
+# 389). For example, to listen both on LDAP port 389 and LDAP over TLS port
+# 636, set to "ldap:// ldaps://". Refer to slapd(8) for more information.
+#listen_uris=
+
+# Additional arguments to pass to slapd.
+#command_args=
+
+# Number of milliseconds to wait after starting to check if the daemon is still
+# running (used only with start-stop-daemon). Set to empty string to disable.
+#start_wait=50
+
+# Uncomment to run with process supervisor.
+# supervisor="supervise-daemon"
diff --git a/main/openldap/slapd.initd b/main/openldap/slapd.initd
index 367b16b97a4..49b7776d97b 100644
--- a/main/openldap/slapd.initd
+++ b/main/openldap/slapd.initd
@@ -1,19 +1,33 @@
 #!/sbin/openrc-run
 
-: ${pidfile:="/run/openldap/slapd.pid"}
-
 name="LDAP server"
+description_checkconfig="Check configuration files for errors"
+
 extra_commands="checkconfig"
-description_checkconfig="Check slapd.conf for errors"
+
+: ${start_wait=50}  # milliseconds
 
 command="/usr/sbin/slapd"
-# OPTS is for backward compatibility
 cfg_opt="${cfgdir:+"-F $cfgdir"} ${cfgfile:+"-f $cfgfile"}"
-command_args="-u ldap -g ldap $cfg_opt ${command_args:-${OPTS:-}}"
+command_args="
+	-u ldap -g ldap
+	-l DAEMON
+	${listen_uris:+-h \"$listen_uris\"}
+	-d0
+	$cfg_opt
+	${command_args-}
+	"
+command_background=yes
 
+pidfile="/run/$RC_SVCNAME.pid"
 stopsig=2
+
 start_stop_daemon_args="
-	${KRB5_KTNAME:+"--env KRB5_KTNAME=$KRB5_KTNAME"}"
+	${start_wait:+--wait $start_wait}
+	${start_stop_daemon_args-}
+	"
+# See https://github.com/OpenRC/openrc/pull/558
+supervise_daemon_args=" $supervise_daemon_args"
 
 depend() {
 	need net
@@ -23,7 +37,12 @@ depend() {
 }
 
 start_pre() {
-	checkpath --directory --owner ldap:ldap "${pidfile%/*}"
+	export KRB5_KTNAME
+
+	# NOTE: This directory is not used by default, it's created mainly for
+	# backward compatibility.
+	checkpath -d -o ldap:ldap /run/openldap || return 1
+
 	/usr/sbin/slaptest -u -Q $cfg_opt || /usr/sbin/slaptest -u $cfg_opt
 }
 
diff --git a/main/opennhrp/0008-fix-builds-with-gcc10.patch b/main/opennhrp/0008-fix-builds-with-gcc10.patch
new file mode 100644
index 00000000000..7d717fd3650
--- /dev/null
+++ b/main/opennhrp/0008-fix-builds-with-gcc10.patch
@@ -0,0 +1,25 @@
+From 2e0ae487a84864263509284715222ff79c3e79f4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Tue, 17 Nov 2020 16:23:45 +0200
+Subject: [PATCH] fix builds with gcc10
+
+---
+ nhrp/nhrp_peer.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nhrp/nhrp_peer.h b/nhrp/nhrp_peer.h
+index e0e77f6..1fef210 100644
+--- a/nhrp/nhrp_peer.h
++++ b/nhrp/nhrp_peer.h
+@@ -138,7 +138,7 @@ struct nhrp_peer_selector {
+ 	struct nhrp_address local_nbma_address;
+ };
+ 
+-const char * const nhrp_peer_type[NHRP_PEER_TYPE_MAX];
++extern const char * const nhrp_peer_type[NHRP_PEER_TYPE_MAX];
+ typedef int (*nhrp_peer_enumerator)(void *ctx, struct nhrp_peer *peer);
+ 
+ void nhrp_peer_cleanup(void);
+-- 
+2.29.2
+
diff --git a/main/opennhrp/APKBUILD b/main/opennhrp/APKBUILD
index 75613f9a450..9efd33be303 100644
--- a/main/opennhrp/APKBUILD
+++ b/main/opennhrp/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=opennhrp
 pkgver=0.14.1
-pkgrel=6
+pkgrel=12
 pkgdesc="NBMA Next Hop Resolution Protocol daemon"
-url="https://sourceforge.net/projects/opennhrp"
+url="https://sourceforge.net/projects/opennhrp/"
 arch="all"
-license="GPL-2.0"
-depends=
+license="MIT AND (BSD-2-Clause OR GPL-2.0-or-later)"
 makedepends="c-ares-dev linux-headers"
-subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+subpackages="$pkgname-doc $pkgname-openrc"
+source="https://downloads.sourceforge.net/opennhrp/opennhrp-$pkgver.tar.bz2
 	0001-peer-reset-interface-nat-cie-when-server-does-not-de.patch
 	0002-all-fix-includes-and-types-to-honor-standards.patch
 	0003-netlink-honor-configured-route-table-for-shortcut-de.patch
@@ -17,39 +16,29 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
 	0005-do-not-establish-shortcut-entry-if-cie-code-indicate.patch
 	0006-modify-packet-destination-only-for-registration-requ.patch
 	0007-fix-race-condition-to-stop-processing-dns-requests.patch
+	0008-fix-builds-with-gcc10.patch
 
 	opennhrp-0.9.3-peer-up-bgp.patch
 	$pkgname.initd
 	$pkgname.confd
 	"
-
-_builddir="$srcdir"/$pkgname-$pkgver
+options="!check"
 
 prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch)
-			msg "Applying $i"
-			patch -p1 < "$srcdir"/$i || return 1
-			;;
-		esac
-	done
+	default_prepare
 	sed -i -e 's/-Werror//' Make.rules
 }
 
 build() {
-	cd "$_builddir"
-	make || return 1
+	make
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm755 "$srcdir"/opennhrp.initd "$pkgdir"/etc/init.d/opennhrp
 	install -Dm644 "$srcdir"/opennhrp.confd "$pkgdir"/etc/conf.d/opennhrp
 }
+
 sha512sums="dd0d5debf86d195256995406909c7406d4b60dcdd3a47fca95fd7053b1691e1863b430ff9d65e8633c2d49c747abb4fdc10b45bdef0d0bfa733e94e33c476785  opennhrp-0.14.1.tar.bz2
 7d6d73dfc7c078d6af6f5df7b4e06703f40675a9746c9191c227b85cc857537502ab501c7e01085e36eafe39dc1a2468ebf139a92ac67522606968abe53e74cd  0001-peer-reset-interface-nat-cie-when-server-does-not-de.patch
 19a5822e9d6f5be06084213c11e2bb09a4283d2fe6a010cd04b9a3724208581b624c9edb323b6f84e06b1a9d67c2129341c171eeb9eedacc37ff43099c94ac30  0002-all-fix-includes-and-types-to-honor-standards.patch
@@ -58,6 +47,7 @@ sha512sums="dd0d5debf86d195256995406909c7406d4b60dcdd3a47fca95fd7053b1691e1863b4
 46dc3a8bb2e919092388b20691adcf59f32f5d49b0b952c5187ada40f0ce9fa552e0f4334645a73002ef1970c18e1131c881af231a5956a5875cdc1111bdb259  0005-do-not-establish-shortcut-entry-if-cie-code-indicate.patch
 a9c523c6c73c3376c3939bf04b873f1eba0d1f5855e2a979c6788a8ddabd2c9712539f8c8509174dc76b861036873384aef387fe08cfd22dcecece7098acc49d  0006-modify-packet-destination-only-for-registration-requ.patch
 4c2e103bdf8c97fdfdbcea5b796dd72b2db3522b0e9eb3543a00fcb6a8b7dc38c8e0cd59baa9a0a474b1d5827c321e2733e5b5b6bd34e03903cfbdcd0ad76963  0007-fix-race-condition-to-stop-processing-dns-requests.patch
+14d5cd94ec597f583a2c00b6b08c9c750d703b10846fdf02e50fb7091e47da45ff021361bf00183d04a6da637c1178a1133b69b3368676ed91de2cf8b15935b7  0008-fix-builds-with-gcc10.patch
 6ce107a2ad59331ab130108b49e80de5902d96002480f0465f7ad15b5146637a67982d2edaa392117a3f1820381b6b4a8985bef2a49364ce269c0bbc632d1739  opennhrp-0.9.3-peer-up-bgp.patch
 97046d2ee2d9b5c2e91e6358807f797454d6daa129244d81a2e1e4afac739567d09425751e7d4a83922ce509a56d5d2f059117c408111fe8d7a2ef2543cba3f8  opennhrp.initd
 c998a0ba198e187c72d09ed3ba2e12fbd30c5d998ed06da01394058741c28a534f1c7e9d692f931ff00dac76c7d4e19e911f7d2ad48deb94f0cef8bd706c4315  opennhrp.confd"
diff --git a/main/openntpd/APKBUILD b/main/openntpd/APKBUILD
index 92fa7cfb179..3bf3a5432c0 100644
--- a/main/openntpd/APKBUILD
+++ b/main/openntpd/APKBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openntpd
-pkgver=6.2_p3
+pkgver=6.8_p1
 _pkgver=${pkgver/_/}
-pkgrel=3
+pkgrel=9
 pkgdesc="Lightweight NTP server ported from OpenBSD"
 url="http://www.openntpd.org/"
-subpackages="openntpd-doc"
-makedepends="libtls-standalone-dev linux-headers bsd-compat-headers
-	autoconf automake libtool"
+subpackages="openntpd-doc openntpd-openrc"
+makedepends="libretls-dev linux-headers bsd-compat-headers
+	autoconf automake libtool byacc"
 arch="all"
-license="BSD"
+license="ISC"
 options="!check"
-source="https://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$pkgname-$_pkgver.tar.gz
+source="https://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/openntpd-$_pkgver.tar.gz
 	ntp-user.patch
 	libtls-standalone.patch
 	$pkgname.confd
@@ -25,8 +25,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -40,8 +38,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
-
 	make install DESTDIR="$pkgdir"
 
 	mkdir -p "$pkgdir"/var/empty
@@ -52,8 +48,10 @@ package() {
 	rmdir "$pkgdir"/var/run
 }
 
-sha512sums="56a04bfd8b161b365607673ac80086ff53ae943938fa49bf52edbc541432eca30730a46a4af581fe26ce3bbceb144cb25982a38959b7a3f9304c727fe60f9f50  openntpd-6.2p3.tar.gz
+sha512sums="
+200056bedb9c757aae1ce5d3f6655175ec058cb479429fe4704955f3a3fa15e8a9cb578ae4898ddb4cfc08c9742bbab6a7c92b5e569f06a148e40c448360b58f  openntpd-6.8p1.tar.gz
 290311e5cd074d5bd1e6374ba9b4776e4acf792d47011c43412e236766b73be2b0e5f0091bd3ad79d0b637754531889b199e66c64952765bbcd1bade0d2ebe94  ntp-user.patch
 4b27edb9b778a8a0437735e010f0606cd03a46d10bb054a6527929d46de44ba470bc81017cb2a61956fc8049879e498aadf545a89a35be1237e26eeac98ef3e3  libtls-standalone.patch
-01c3d9ed18741981fb2d8ebb509cd71801b57f57fcac48ed727687a6402dbad8a791ace1e63c0069a07b0dbcbc98c917885c942dab9616d25dde429f1fb9c348  openntpd.confd
-009eb7c7cf290c9302d9585ce7dffb2195e7e73c8bd3274b158efde10b537919c5dc4a47038f2fca6d650bcd79e8333395faa06d98f28327a328368fd59a1618  openntpd.initd"
+a893f0a46509ef7a868cb153e90701cd67e5e08df0cd1cf50f3a2b8da027cbd3b3fcde77d3dd4c3e8c8135c54f4aab61d5f85c02bb0199bc26a4631ffc431f64  openntpd.confd
+009eb7c7cf290c9302d9585ce7dffb2195e7e73c8bd3274b158efde10b537919c5dc4a47038f2fca6d650bcd79e8333395faa06d98f28327a328368fd59a1618  openntpd.initd
+"
diff --git a/main/openntpd/openntpd.confd b/main/openntpd/openntpd.confd
index ec002b74f55..c8d4adec5e2 100644
--- a/main/openntpd/openntpd.confd
+++ b/main/openntpd/openntpd.confd
@@ -1,3 +1,2 @@
-# See ntpd(8) man page ... some popular options:
-#  -s   Set the time immediately at startup
+# See ntpd(8) man page for available options.
 #NTPD_OPTS=
diff --git a/main/openobex/APKBUILD b/main/openobex/APKBUILD
index d2c21c0e417..754e2ed0c35 100644
--- a/main/openobex/APKBUILD
+++ b/main/openobex/APKBUILD
@@ -1,39 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openobex
 pkgver=1.7.2
-pkgrel=2
+pkgrel=5
 pkgdesc="Implementation of the OBject EXchange (OBEX) protocol"
 url="http://dev.zuckschwerdt.org/openobex/"
 arch="all"
-license="GPL LGPL"
-depends=
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 depends_dev="libusb-dev"
-makedepends="$depends_dev bluez-dev cmake eudev-dev libxml2-utils docbook-xsl"
+makedepends="$depends_dev bluez-dev cmake eudev-dev libxml2-utils docbook-xsl samurai"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-apps"
 source="https://downloads.sourceforge.net/project/openobex/openobex/$pkgver/openobex-$pkgver-Source.tar.gz"
-
-_builddir="$srcdir"/openobex-$pkgver-Source
+builddir="$srcdir"/openobex-$pkgver-Source
+options="!check"
 
 build() {
-	cd "$_builddir"
-	cmake \
+	cmake -B build -G Ninja \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_SKIP_RPATH=ON \
-		|| return 1
-	make && make openobex-apps || return 1
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_SKIP_RPATH=ON
+	cmake --build build --target all openobex-apps
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	DESTDIR="$pkgdir" cmake --install build
 }
 
 apps() {
 	pkgdesc="Applications for using OBEX"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+
+	amove usr/bin
 }
 
-sha512sums="22f1b0d99e7186da9fa12b510ef9dbb6f7d76777d58b235ab2f627703d07b6f6b0488cdc9c6d8c0ab7bc86d6d19117c55fff9273fed02736c0210f9b1788bf4d  openobex-1.7.2-Source.tar.gz"
+sha512sums="
+22f1b0d99e7186da9fa12b510ef9dbb6f7d76777d58b235ab2f627703d07b6f6b0488cdc9c6d8c0ab7bc86d6d19117c55fff9273fed02736c0210f9b1788bf4d  openobex-1.7.2-Source.tar.gz
+"
diff --git a/main/openrc/0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch b/main/openrc/0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
index f6996b3fc7f..c2b4f024eb2 100644
--- a/main/openrc/0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
+++ b/main/openrc/0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
@@ -1,14 +1,19 @@
-From 94742e085ac96d366401df883df96d35d0eafd5a Mon Sep 17 00:00:00 2001
+From 908f77d4f1930c1ac0be036d3d2e10ff15f84fbf Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
 Date: Wed, 1 Feb 2017 04:04:52 +0000
-Subject: [PATCH 1/7] call /sbin/mkmntdirs in localmount OpenRC service
+Subject: [PATCH] call /sbin/mkmntdirs in localmount OpenRC service
 
 ---
- init.d/localmount.in | 2 ++
- 1 file changed, 2 insertions(+)
+ init.d/localmount.in      |  2 ++
+ src/meson.build           |  1 +
+ src/mkmntdirs/meson.build |  5 +++
+ src/mkmntdirs/mkmntdirs.c | 67 +++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 75 insertions(+)
+ create mode 100644 src/mkmntdirs/meson.build
+ create mode 100644 src/mkmntdirs/mkmntdirs.c
 
 diff --git a/init.d/localmount.in b/init.d/localmount.in
-index cae80c34..3dbb375b 100644
+index 8a66eb8d..19693b6b 100644
 --- a/init.d/localmount.in
 +++ b/init.d/localmount.in
 @@ -21,6 +21,8 @@ depend()
@@ -20,6 +25,102 @@ index cae80c34..3dbb375b 100644
  	# Mount local filesystems in /etc/fstab.
  	# The types variable must start with no, and must be a type
  	local critical= types="noproc" x= no_netdev= rc=
+diff --git a/src/meson.build b/src/meson.build
+index 76f6d8a1..0f640eec 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -12,6 +12,7 @@ subdir('is_newer_than')
+ subdir('is_older_than')
+ subdir('kill_all')
+ subdir('mark_service')
++subdir('mkmntdirs')
+ subdir('mountinfo')
+ subdir('on_ac_power')
+ subdir('openrc')
+diff --git a/src/mkmntdirs/meson.build b/src/mkmntdirs/meson.build
+new file mode 100644
+index 00000000..20f9762d
+--- /dev/null
++++ b/src/mkmntdirs/meson.build
+@@ -0,0 +1,5 @@
++executable('mkmntdirs',
++  ['mkmntdirs.c'],
++  c_args : cc_branding_flags,
++  install: true,
++  install_dir: sbindir)
+diff --git a/src/mkmntdirs/mkmntdirs.c b/src/mkmntdirs/mkmntdirs.c
+new file mode 100644
+index 00000000..eaeae732
+--- /dev/null
++++ b/src/mkmntdirs/mkmntdirs.c
+@@ -0,0 +1,67 @@
++/*
++ * Create mount directories in fstab
++ *
++ * Copyright(c) 2008 Natanael Copa <natanael.copa@gmail.com>
++ * May be distributed under the terms of GPL-2
++ *
++ * usage: mkmntdirs [fstab]
++ *
++ */
++
++#include <sys/stat.h>
++#include <sys/types.h>
++
++#include <err.h>
++#include <mntent.h>
++#include <stdio.h>
++#include <string.h>
++
++
++#ifdef DEBUG
++#define mkdir_recursive(p)	puts((p))
++#else
++static void mkdir_recursive(char *path)
++{
++	char *s = path;
++	while (1) {
++		int c = '\0';
++		while (*s) {
++			if (*s == '/') {
++				do {
++					++s;
++				} while (*s == '/');
++				c = *s; /* Save the current char */
++				*s = '\0'; /* and replace it with nul. */
++				break;
++			}
++			++s;
++		}
++		mkdir(path, 0755);
++		if (c == '\0')
++			return;
++		*s = c;
++	}
++}
++#endif
++
++int main(int argc, const char *argv[])
++{
++	const char *filename = "/etc/fstab";
++	FILE *f;
++	struct mntent *ent;
++	if (argc == 2)
++		filename = argv[1];
++
++	f = setmntent(filename, "r");
++	if (f == NULL)
++		err(1, "%s", filename);
++
++	while ((ent = getmntent(f)) != NULL) {
++		if (strcmp(ent->mnt_dir, "none") != 0)
++			mkdir_recursive(ent->mnt_dir);
++	}
++
++	endmntent(f);
++	return 0;
++}
++
 -- 
-2.11.0
+2.37.1
 
diff --git a/main/openrc/0001-fsck-don-t-add-C0-to-busybox-fsck.patch b/main/openrc/0001-fsck-don-t-add-C0-to-busybox-fsck.patch
deleted file mode 100644
index 46c2c7bbe6e..00000000000
--- a/main/openrc/0001-fsck-don-t-add-C0-to-busybox-fsck.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From eb1d69ae84f6d2cb7f081dfca3251b2446a039f0 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 28 Nov 2017 13:35:10 +0100
-Subject: [PATCH] fsck: don't add -C0 to busybox fsck
-
----
- init.d/fsck.in | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/init.d/fsck.in b/init.d/fsck.in
-index 7052d808..99a9ae4f 100644
---- a/init.d/fsck.in
-+++ b/init.d/fsck.in
-@@ -82,7 +82,7 @@ start()
- 		local skiptypes
- 		skiptypes=$(printf 'no%s,' ${net_fs_list} ${extra_net_fs_list})
- 		[ "${skiptypes}" = "no," ] && skiptypes=""
--		fsck_opts="$fsck_opts -C0 -T -t ${skiptypes}noopts=_netdev"
-+		fsck_opts="$fsck_opts -T -t ${skiptypes}noopts=_netdev"
- 		if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then
- 			fsck_args=${fsck_args:--A -p}
- 			if echo 2>/dev/null >/.test.$$; then
-@@ -90,6 +90,9 @@ start()
- 				fsck_opts="$fsck_opts -R"
- 			fi
- 		fi
-+		if [ "$(readlink -f $(which fsck))" != "/bin/busybox" ]; then
-+			fsck_opts="$fsck_opts -C0"
-+		fi
- 	fi
- 
- 	trap : INT QUIT
--- 
-2.15.0
-
diff --git a/main/openrc/0002-force-root-be-rw-before-localmount.patch b/main/openrc/0002-force-root-be-rw-before-localmount.patch
deleted file mode 100644
index 7ea880829dd..00000000000
--- a/main/openrc/0002-force-root-be-rw-before-localmount.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 1 Feb 2017 04:05:44 +0000
-Date: Tue, 3 Apr 2018 17:11:15 +0200
-Subject: [PATCH] force root be rw before localmount
-
-The service that pulls in root remount is mtab which we dont need/use.
-
---- a/init.d/localmount.in
-+++ b/init.d/localmount.in
-@@ -13,9 +13,9 @@
- 
- depend()
- {
--	need fsck
--	use lvm modules root
--	after clock lvm modules root
-+	need fsck root
-+	use lvm modules
-+	after clock lvm modules
- 	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
- }
- 
diff --git a/main/openrc/0002-fsck-don-t-add-C0-to-busybox-fsck.patch b/main/openrc/0002-fsck-don-t-add-C0-to-busybox-fsck.patch
new file mode 100644
index 00000000000..1d798185ced
--- /dev/null
+++ b/main/openrc/0002-fsck-don-t-add-C0-to-busybox-fsck.patch
@@ -0,0 +1,35 @@
+From b143f35a45d59708365a52e329fd8caa6475a9bb Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 28 Nov 2017 13:35:10 +0100
+Subject: [PATCH] fsck: don't add -C0 to busybox fsck
+
+---
+ init.d/fsck.in | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/init.d/fsck.in b/init.d/fsck.in
+index 7052d808..99a9ae4f 100644
+--- a/init.d/fsck.in
++++ b/init.d/fsck.in
+@@ -82,7 +82,7 @@ start()
+ 		local skiptypes
+ 		skiptypes=$(printf 'no%s,' ${net_fs_list} ${extra_net_fs_list})
+ 		[ "${skiptypes}" = "no," ] && skiptypes=""
+-		fsck_opts="$fsck_opts -C0 -T -t ${skiptypes}noopts=_netdev"
++		fsck_opts="$fsck_opts -T -t ${skiptypes}noopts=_netdev"
+ 		if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then
+ 			fsck_args=${fsck_args:--A -p}
+ 			if echo 2>/dev/null >/.test.$$; then
+@@ -90,6 +90,9 @@ start()
+ 				fsck_opts="$fsck_opts -R"
+ 			fi
+ 		fi
++		if [ "$(readlink -f $(which fsck))" != "/bin/busybox" ]; then
++			fsck_opts="$fsck_opts -C0"
++		fi
+ 	fi
+ 
+ 	trap : INT QUIT
+-- 
+2.33.1
+
diff --git a/main/openrc/0003-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch b/main/openrc/0003-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
new file mode 100644
index 00000000000..265a51e3716
--- /dev/null
+++ b/main/openrc/0003-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
@@ -0,0 +1,70 @@
+From 17f33c1968a51484eefdafbfb5b8fef5ac13d215 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 1 Feb 2017 04:17:14 +0000
+Subject: [PATCH] rc: pull in sysinit and boot as stacked levels when needed
+
+We need start services from sysinit and boot runlevel, even if the new
+runlevel is empty.
+
+This fixes problem introduced with commit 7716bf31 (Fix stacked runlevel
+support), at which the start_services list are no longer used to start
+the services.
+
+This also make sure that all services in sysinit and boot runlevels are
+started before switching to next. This was not guaranteed when switching
+to a non-empty runlevel.
+
+Fixes issue #54.
+---
+ src/rc/rc.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/rc/rc.c b/src/rc/rc.c
+index ef46925d..82786074 100644
+--- a/src/openrc/rc.c
++++ b/src/openrc/rc.c
+@@ -729,6 +729,7 @@ int main(int argc, char **argv)
+ 	const char *bootlevel = NULL;
+ 	char *newlevel = NULL;
+ 	const char *systype = NULL;
++	RC_STRINGLIST *runlevel_chain;
+ 	RC_STRINGLIST *deporder = NULL;
+ 	RC_STRINGLIST *tmplist;
+ 	RC_STRING *service;
+@@ -986,6 +987,7 @@ int main(int argc, char **argv)
+ 	main_hotplugged_services = rc_services_in_state(RC_SERVICE_HOTPLUGGED);
+ 	main_start_services = rc_services_in_runlevel_stacked(newlevel ?
+ 	    newlevel : runlevel);
++	runlevel_chain = rc_runlevel_stacks(newlevel ? newlevel : runlevel);
+ 	if (strcmp(newlevel ? newlevel : runlevel, RC_LEVEL_SHUTDOWN) != 0 &&
+ 	    strcmp(newlevel ? newlevel : runlevel, RC_LEVEL_SYSINIT) != 0)
+ 	{
+@@ -1003,6 +1005,7 @@ int main(int argc, char **argv)
+ 				tmplist = rc_services_in_runlevel(bootlevel);
+ 				TAILQ_CONCAT(main_start_services, tmplist, entries);
+ 				free(tmplist);
++				rc_stringlist_add(runlevel_chain, bootlevel);
+ 			}
+ 			if (main_hotplugged_services) {
+ 				TAILQ_FOREACH(service, main_hotplugged_services,
+@@ -1011,6 +1014,7 @@ int main(int argc, char **argv)
+ 					service->value);
+ 			}
+ 		}
++		rc_stringlist_add(runlevel_chain, RC_LEVEL_SYSINIT);
+ 	}
+ 
+ 	parallel = rc_conf_yesno("rc_parallel");
+@@ -1067,9 +1071,6 @@ int main(int argc, char **argv)
+ 
+ 	/* If we have a list of services to start then... */
+ 	if (main_start_services) {
+-		/* Get a list of the chained runlevels which compose the target runlevel */
+-		RC_STRINGLIST *runlevel_chain = rc_runlevel_stacks(runlevel);
+-
+ 		/* Loop through them in reverse order. */
+ 		RC_STRING *rlevel;
+ 		TAILQ_FOREACH_REVERSE(rlevel, runlevel_chain, rc_stringlist, entries)
+-- 
+2.33.1
+
diff --git a/main/openrc/0004-hide-error-when-migrating-var-run-to-run.patch b/main/openrc/0004-hide-error-when-migrating-var-run-to-run.patch
deleted file mode 100644
index 801d3b23639..00000000000
--- a/main/openrc/0004-hide-error-when-migrating-var-run-to-run.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 496b984f889531bf629d77a5fa2211f8cb0a1183 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 17 Aug 2016 17:18:21 +0200
-Subject: [PATCH 4/7] hide error when migrating /var/run to /run
-
-The script tries to copy non-existing files. We simply hide the error
-
-http://bugs.alpinelinux.org/issues/3160
----
- init.d/bootmisc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
-index efc1c572..6e473ade 100644
---- a/init.d/bootmisc.in
-+++ b/init.d/bootmisc.in
-@@ -112,7 +112,7 @@ migrate_to_run()
-  		rm $src
-  	elif [ ! -L $src -a -d $src ]; then
-  		ebegin "Migrating $src to $dst"
-- 		cp -a $src/* $dst/
-+ 		cp -a $src/* $dst/ 2>/dev/null
-  		rm -rf $src
-  		eend $?
-  	fi
--- 
-2.11.0
-
diff --git a/main/openrc/0004-make-consolefont-service-compatible-with-busyboxs-se.patch b/main/openrc/0004-make-consolefont-service-compatible-with-busyboxs-se.patch
new file mode 100644
index 00000000000..b92b5ac961a
--- /dev/null
+++ b/main/openrc/0004-make-consolefont-service-compatible-with-busyboxs-se.patch
@@ -0,0 +1,70 @@
+From 613fb7f437c42e0ed01b2366b597598235e64a2d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Wed, 17 Aug 2016 17:52:58 +0200
+Subject: [PATCH] make consolefont service compatible with busyboxs setfont
+ applet
+
+Compared to kdbs setfont program it doesn't support -O and -m.
+---
+ conf.d/consolefont    | 11 ++---------
+ init.d/consolefont.in |  7 ++-----
+ 2 files changed, 4 insertions(+), 14 deletions(-)
+
+diff --git a/conf.d/consolefont b/conf.d/consolefont
+index e01ae842..75544b2f 100644
+--- a/conf.d/consolefont
++++ b/conf.d/consolefont
+@@ -3,16 +3,9 @@
+ #
+ # consolefont specifies the default font that you'd like Linux to use on the
+ # console.  You can find a good selection of fonts in /usr/share/consolefonts;
+-# you shouldn't specify the trailing ".psf.gz", just the font name below.
+-# To use the default console font, comment out the CONSOLEFONT setting below.
+-consolefont="default8x16"
++consolefont="default8x16.psf.gz"
+ 
+ # consoletranslation is the charset map file to use.  Leave commented to use
+ # the default one.  Have a look in /usr/share/consoletrans for a selection of
+ # map files you can use.
+-#consoletranslation="8859-1_to_uni"
+-
+-# unicodemap is the unicode map file to use. Leave commented to use the
+-# default one. Have a look in /usr/share/unimaps for a selection of map files
+-# you can use.
+-#unicodemap="iso01"
++#consoletranslation="8859-1_to_uni.trans"
+diff --git a/init.d/consolefont.in b/init.d/consolefont.in
+index d65dd14c..ccb6ee87 100644
+--- a/init.d/consolefont.in
++++ b/init.d/consolefont.in
+@@ -22,7 +22,6 @@ start()
+ {
+ 	ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
+ 	consolefont=${consolefont:-${CONSOLEFONT}}
+-	unicodemap=${unicodemap:-${UNICODEMAP}}
+ 	consoletranslation=${consoletranslation:-${CONSOLETRANSLATION}}
+ 
+ 	if [ -z "$consolefont" ]; then
+@@ -43,9 +42,6 @@ start()
+ 	if [ -n "$consoletranslation" ]; then
+ 		param="$param -m $consoletranslation"
+ 	fi
+-	if [ -n "${unicodemap}" ]; then
+-		param="$param -u $unicodemap"
+-	fi
+ 
+ 	# Set the console font
+ 	ebegin "Setting console font [$consolefont]"
+@@ -63,7 +59,8 @@ start()
+ 	# Store the font so we can use it ASAP on boot
+ 	if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then
+ 		mkdir -p "$RC_LIBEXECDIR"/console
+-		setfont -O "$RC_LIBEXECDIR"/console/font
++		zcat "/usr/share/consolefonts/$consolefont" \
++			> "$RC_LIBEXECDIR"/console/font
+ 	fi
+ 
+ 	return $retval
+-- 
+2.33.1
+
diff --git a/main/openrc/0005-Support-early-loading-of-keymap-if-kbd-is-installed.patch b/main/openrc/0005-Support-early-loading-of-keymap-if-kbd-is-installed.patch
new file mode 100644
index 00000000000..f25d984809f
--- /dev/null
+++ b/main/openrc/0005-Support-early-loading-of-keymap-if-kbd-is-installed.patch
@@ -0,0 +1,31 @@
+From a07970bf087c089f467eefa30c2476f17f6e9536 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Thu, 7 Mar 2019 16:55:53 +0100
+Subject: [PATCH] Support early loading of keymap if kbd is installed
+
+Early loading of the keymap with busybox was never supported and would
+require modifying the save-keymaps services as well. Since no one
+complained that it doesn't work with busybox so far just make it work
+with kbd for now.
+---
+ sh/init-early.sh.Linux.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sh/init-early.sh.Linux.in b/sh/init-early.sh.Linux.in
+index f304e924..7571ff3d 100644
+--- a/sh/init-early.sh.Linux.in
++++ b/sh/init-early.sh.Linux.in
+@@ -48,8 +48,8 @@ if service_present "$RC_DEFAULTLEVEL" consolefont ||
+ fi
+ 
+ # Try and set a keyboard map as early as possible
+-if service_present "$RC_DEFAULTLEVEL" keymaps ||
+-   service_present "$RC_BOOTLEVEL" keymaps; then
++if service_present "$RC_DEFAULTLEVEL" loadkeys ||
++   service_present "$RC_BOOTLEVEL" loadkeys; then
+ 	kbd_mode $kmode -C "$CONSOLE" 2>/dev/null
+ 	if [ -r "$RC_LIBEXECDIR"/console/keymap ]; then
+ 		loadkeys -q "$RC_LIBEXECDIR"/console/keymap 2>/dev/null
+-- 
+2.33.1
+
diff --git a/main/openrc/0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch b/main/openrc/0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
deleted file mode 100644
index eb1ad140858..00000000000
--- a/main/openrc/0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From b62d7b9438af6dac50d52708777070f312e6650c Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 1 Feb 2017 04:17:14 +0000
-Subject: [PATCH 5/7] rc: pull in sysinit and boot as stacked levels when
- needed
-
-We need start services from sysinit and boot runlevel, even if the new
-runlevel is empty.
-
-This fixes problem introduced with commit 7716bf31 (Fix stacked runlevel
-support), at which the start_services list are no longer used to start
-the services.
-
-This also make sure that all services in sysinit and boot runlevels are
-started before switching to next. This was not guaranteed when switching
-to a non-empty runlevel.
-
-Fixes issue #54.
----
- src/rc/rc.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/rc/rc.c b/src/rc/rc.c
-index 110591e4..13a7e0d4 100644
---- a/src/rc/rc.c
-+++ b/src/rc/rc.c
-@@ -738,6 +738,7 @@ int main(int argc, char **argv)
- 	const char *bootlevel = NULL;
- 	char *newlevel = NULL;
- 	const char *systype = NULL;
-+	RC_STRINGLIST *runlevel_chain;
- 	RC_STRINGLIST *deporder = NULL;
- 	RC_STRINGLIST *tmplist;
- 	RC_STRING *service;
-@@ -993,6 +994,7 @@ int main(int argc, char **argv)
- 	main_hotplugged_services = rc_services_in_state(RC_SERVICE_HOTPLUGGED);
- 	main_start_services = rc_services_in_runlevel_stacked(newlevel ?
- 	    newlevel : runlevel);
-+	runlevel_chain = rc_runlevel_stacks(newlevel ? newlevel : runlevel);
- 	if (strcmp(newlevel ? newlevel : runlevel, RC_LEVEL_SHUTDOWN) != 0 &&
- 	    strcmp(newlevel ? newlevel : runlevel, RC_LEVEL_SYSINIT) != 0)
- 	{
-@@ -1010,6 +1012,7 @@ int main(int argc, char **argv)
- 				tmplist = rc_services_in_runlevel(bootlevel);
- 				TAILQ_CONCAT(main_start_services, tmplist, entries);
- 				free(tmplist);
-+				rc_stringlist_add(runlevel_chain, bootlevel);
- 			}
- 			if (main_hotplugged_services) {
- 				TAILQ_FOREACH(service, main_hotplugged_services,
-@@ -1018,6 +1021,7 @@ int main(int argc, char **argv)
- 					service->value);
- 			}
- 		}
-+		rc_stringlist_add(runlevel_chain, RC_LEVEL_SYSINIT);
- 	}
- 
- 	parallel = rc_conf_yesno("rc_parallel");
-@@ -1074,9 +1078,6 @@ int main(int argc, char **argv)
- 
- 	/* If we have a list of services to start then... */
- 	if (main_start_services) {
--		/* Get a list of the chained runlevels which compose the target runlevel */
--		RC_STRINGLIST *runlevel_chain = rc_runlevel_stacks(runlevel);
--
- 		/* Loop through them in reverse order. */
- 		RC_STRING *rlevel;
- 		TAILQ_FOREACH_REVERSE(rlevel, runlevel_chain, rc_stringlist, entries)
--- 
-2.11.0
-
diff --git a/main/openrc/0006-Add-support-for-starting-services-in-a-specified-VRF.patch b/main/openrc/0006-Add-support-for-starting-services-in-a-specified-VRF.patch
new file mode 100644
index 00000000000..6f7ed69f037
--- /dev/null
+++ b/main/openrc/0006-Add-support-for-starting-services-in-a-specified-VRF.patch
@@ -0,0 +1,101 @@
+From c250503412b061e69a99cfe12514e47fc06b5885 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 14 Feb 2020 16:02:43 +0000
+Subject: [PATCH] Add support for starting services in a specified VRF.
+
+The venerable iproute2 utility has recently introduced support
+for executing programs in specific VRFs which are virtualized
+routing tables.  These are typically used to isolate different
+networking planes from each other, for security or flexibility
+reasons.
+
+Services which use the normal supervisor/start-stop-daemon
+pattern can be configured by setting the vrf variable in the
+/etc/conf.d tree for the service.
+
+This allows for things like configuring the sshd service to
+run in a management VRF, which is useful for high assurance
+environments where the management plane is intended to be
+isolated.
+
+Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
+---
+ sh/openrc-run.sh.in     | 6 ++++++
+ sh/runit.sh             | 2 +-
+ sh/s6.sh                | 2 +-
+ sh/start-stop-daemon.sh | 2 +-
+ sh/supervise-daemon.sh  | 2 +-
+ 5 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/sh/openrc-run.sh.in b/sh/openrc-run.sh.in
+index 5c84af45..a1f374b0 100644
+--- a/sh/openrc-run.sh.in
++++ b/sh/openrc-run.sh.in
+@@ -236,6 +236,12 @@ if ! sourcex -e "$_conf_d/$RC_SVCNAME.$RC_RUNLEVEL"; then
+ fi
+ unset _conf_d
+ 
++# If we are configured to run in a VRF, provide a hint for that
++RC_VRF_EXEC=""
++if [ -n "$vrf" ]; then
++	RC_VRF_EXEC="/sbin/ip vrf exec $vrf"
++fi
++
+ # load service supervisor functions
+ sourcex "@LIBEXECDIR@/sh/runit.sh"
+ sourcex "@LIBEXECDIR@/sh/s6.sh"
+diff --git a/sh/runit.sh b/sh/runit.sh
+index 5d82c9f6..c0186a43 100644
+--- a/sh/runit.sh
++++ b/sh/runit.sh
+@@ -23,7 +23,7 @@ runit_start()
+ 	local i=0 retval=1
+ 	# it can take upto 5 seconds for runsv to start
+ 	while [ $i -lt 6 ] ; do
+-		if sv start "${service_link}" > /dev/null 2>&1; then
++		if ${RC_VRF_EXEC} sv start "${service_link}" > /dev/null 2>&1; then
+ 			retval=0
+ 			break
+ 		fi
+diff --git a/sh/s6.sh b/sh/s6.sh
+index acbe965b..1f339703 100644
+--- a/sh/s6.sh
++++ b/sh/s6.sh
+@@ -37,7 +37,7 @@ s6_start()
+ 	ln -sf "${s6_service_path}" "${s6_service_link}"
+ 	s6-svscanctl -na "${RC_SVCDIR}"/s6-scan
+ 	sleep 1.5
+-	s6-svc -u "${s6_service_link}"
++	${RC_VRF_EXEC} s6-svc -u "${s6_service_link}"
+ 	if [ -n "$s6_svwait_options_start" ]; then
+ 		s6-svwait ${s6_svwait_options_start} "${s6_service_link}"
+ 	fi
+diff --git a/sh/start-stop-daemon.sh b/sh/start-stop-daemon.sh
+index 2e549ae1..5e7a1b88 100644
+--- a/sh/start-stop-daemon.sh
++++ b/sh/start-stop-daemon.sh
+@@ -45,7 +45,7 @@ ssd_start()
+ 	#the eval call is necessary for cases like:
+ 	# command_args="this \"is a\" test"
+ 	# to work properly.
+-	eval start-stop-daemon --start \
++	eval ${RC_VRF_EXEC} start-stop-daemon --start \
+ 		--exec $command \
+ 		${chroot:+--chroot} $chroot \
+ 		${directory:+--chdir} $directory \
+diff --git a/sh/supervise-daemon.sh b/sh/supervise-daemon.sh
+index e403a789..259b8166 100644
+--- a/sh/supervise-daemon.sh
++++ b/sh/supervise-daemon.sh
+@@ -24,7 +24,7 @@ supervise_start()
+ 	# The eval call is necessary for cases like:
+ 	# command_args="this \"is a\" test"
+ 	# to work properly.
+-	eval supervise-daemon "${RC_SVCNAME}" --start \
++	eval ${RC_VRF_EXEC} supervise-daemon "${RC_SVCNAME}" --start \
+ 		${retry:+--retry} $retry \
+ 		${directory:+--chdir} $directory  \
+ 		${chroot:+--chroot} $chroot \
+-- 
+2.33.1
+
diff --git a/main/openrc/0007-Clean-up-staticroute-config-remove-irrelevant-parts-.patch b/main/openrc/0007-Clean-up-staticroute-config-remove-irrelevant-parts-.patch
new file mode 100644
index 00000000000..34100ef6a36
--- /dev/null
+++ b/main/openrc/0007-Clean-up-staticroute-config-remove-irrelevant-parts-.patch
@@ -0,0 +1,47 @@
+From f406231dc9a49b67ca558983de80513f95078309 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 8 Sep 2021 23:51:11 -0600
+Subject: [PATCH] Clean up staticroute config - remove irrelevant parts (for
+ BSD, Hurd) and suggest that route(8) is legacy.
+
+---
+ conf.d/staticroute | 23 +++--------------------
+ 1 file changed, 3 insertions(+), 20 deletions(-)
+
+diff --git a/conf.d/staticroute b/conf.d/staticroute
+index 19d0961f..49d0e0bb 100644
+--- a/conf.d/staticroute
++++ b/conf.d/staticroute
+@@ -1,26 +1,9 @@
+-# Static routes are defined differently depending on your operating
+-# system, so please be sure to use the correct syntax.
+ # Do not use this file to define the default route.
+ # In all settings, multiple routes should be separated using ; or new lines.
+ 
+-# Define static routes on Linux using route. See route(8) for syntax.
+-#staticroute="net 192.168.0.0 netmask 255.255.255.0 gw 10.73.1.1
+-#net 192.168.1.0 netmask 255.255.255.0 gw 10.73.1.1"
+-
+ # Define static routes on Linux using iproute2. See ip(8) for syntax.
+ #staticiproute="192.168.0.0/24 via 10.73.1.1; 192.168.1.0/24 via 10.73.1.1"
+ 
+-# Define static routes on GNU/Hurd. See route(8) for syntax.
+-# /etc/route.conf(5) takes precedence over this configuration.
+-# FIXME: "net ..." not supported
+-#staticroute="net 192.168.0.0 -netmask 255.255.255.0 --address 10.73.1.1
+-#net 192.168.1.0 -netmask 255.255.255.0 --address 10.73.1.1"
+-
+-# Define static routes on GNU/KFreeBSD. See route(8) for syntax.
+-#staticroute="net 192.168.0.0 10.73.1.1 netmask 255.255.255.0
+-#net 192.168.1.0 10.73.1.1 netmask 255.255.255.0"
+-
+-# Define static routes on other BSD systems. See route(8) for syntax.
+-# /etc/route.conf(5) takes precedence over this configuration.
+-#staticroute="net 192.168.0.0 -netmask 255.255.255.0 10.73.1.1
+-#net 192.168.1.0 -netmask 255.255.255.0 10.73.1.1"
++# Or define static routes on Linux using route (legacy). See route(8) for syntax.
++#staticroute="net 192.168.0.0 netmask 255.255.255.0 gw 10.73.1.1
++#net 192.168.1.0 netmask 255.255.255.0 gw 10.73.1.1"
+-- 
+2.33.1
+
diff --git a/main/openrc/0007-make-consolefont-service-compatible-with-busyboxs-se.patch b/main/openrc/0007-make-consolefont-service-compatible-with-busyboxs-se.patch
deleted file mode 100644
index 6c23e2ab06c..00000000000
--- a/main/openrc/0007-make-consolefont-service-compatible-with-busyboxs-se.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 3d0d2b89745597ea973129eafa3f999cf19d761f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Wed, 17 Aug 2016 17:52:58 +0200
-Subject: [PATCH 7/7] make consolefont service compatible with busyboxs setfont
- applet
-
-Compared to kdbs setfont program it doesn't support -O and -m.
----
- conf.d/consolefont    | 11 ++---------
- init.d/consolefont.in |  7 ++-----
- 2 files changed, 4 insertions(+), 14 deletions(-)
-
-diff --git a/conf.d/consolefont b/conf.d/consolefont
-index e01ae842..75544b2f 100644
---- a/conf.d/consolefont
-+++ b/conf.d/consolefont
-@@ -3,16 +3,9 @@
- #
- # consolefont specifies the default font that you'd like Linux to use on the
- # console.  You can find a good selection of fonts in /usr/share/consolefonts;
--# you shouldn't specify the trailing ".psf.gz", just the font name below.
--# To use the default console font, comment out the CONSOLEFONT setting below.
--consolefont="default8x16"
-+consolefont="default8x16.psf.gz"
- 
- # consoletranslation is the charset map file to use.  Leave commented to use
- # the default one.  Have a look in /usr/share/consoletrans for a selection of
- # map files you can use.
--#consoletranslation="8859-1_to_uni"
--
--# unicodemap is the unicode map file to use. Leave commented to use the
--# default one. Have a look in /usr/share/unimaps for a selection of map files
--# you can use.
--#unicodemap="iso01"
-+#consoletranslation="8859-1_to_uni.trans"
-diff --git a/init.d/consolefont.in b/init.d/consolefont.in
-index 9fe95afa..173ed426 100644
---- a/init.d/consolefont.in
-+++ b/init.d/consolefont.in
-@@ -22,7 +22,6 @@ start()
- {
- 	ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
- 	consolefont=${consolefont:-${CONSOLEFONT}}
--	unicodemap=${unicodemap:-${UNICODEMAP}}
- 	consoletranslation=${consoletranslation:-${CONSOLETRANSLATION}}
- 
- 	if [ -z "$consolefont" ]; then
-@@ -43,9 +42,6 @@ start()
- 	if [ -n "$consoletranslation" ]; then
- 		param="$param -m $consoletranslation"
- 	fi
--	if [ -n "${unicodemap}" ]; then
--		param="$param -u $unicodemap"
--	fi
- 
- 	# Set the console font
- 	ebegin "Setting console font [$consolefont]"
-@@ -63,7 +59,8 @@ start()
- 	# Store the font so we can use it ASAP on boot
- 	if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then
- 		mkdir -p "$RC_LIBEXECDIR"/console
--		setfont -O "$RC_LIBEXECDIR"/console/font
-+		zcat "/usr/share/consolefonts/$consolefont" \
-+			> "$RC_LIBEXECDIR"/console/font
- 	fi
- 
- 	return $retval
--- 
-2.11.0
-
diff --git a/main/openrc/0008-bootmisc-switch-wipe_tmp-setting-to-no-by-default.patch b/main/openrc/0008-bootmisc-switch-wipe_tmp-setting-to-no-by-default.patch
new file mode 100644
index 00000000000..f498d05f17f
--- /dev/null
+++ b/main/openrc/0008-bootmisc-switch-wipe_tmp-setting-to-no-by-default.patch
@@ -0,0 +1,44 @@
+From a756576ae62e4f24a2ea36e87053187cdfc1be63 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Wed, 13 Oct 2021 21:12:10 -0600
+Subject: [PATCH] bootmisc: switch wipe_tmp setting to no by default
+
+When wipe_tmp=yes, an insufficiently bounded rm -rf occurs that,
+under specific unknown circumstances, can escape into other filesystems
+resulting in data loss.
+
+See alpine/aports#13070.
+---
+ conf.d/bootmisc    | 2 +-
+ init.d/bootmisc.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/conf.d/bootmisc b/conf.d/bootmisc
+index dd5b08e0..5cf18d33 100644
+--- a/conf.d/bootmisc
++++ b/conf.d/bootmisc
+@@ -3,7 +3,7 @@ clean_tmp_dirs="/tmp"
+ 
+ # Should we wipe the tmp paths completely or just selectively remove known
+ # locks / files / etc... ?
+-wipe_tmp="YES"
++wipe_tmp="NO"
+ 
+ # Write the initial dmesg log into /var/log/dmesg after boot
+ # This may be useful if you need the kernel boot log afterwards
+diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
+index b1a849a3..8485110a 100644
+--- a/init.d/bootmisc.in
++++ b/init.d/bootmisc.in
+@@ -17,7 +17,7 @@ depend()
+ 	keyword -prefix -timeout
+ }
+ 
+-: ${wipe_tmp:=${WIPE_TMP:-yes}}
++: ${wipe_tmp:=${WIPE_TMP:-no}}
+ : ${log_dmesg:=${LOG_DMESG:-yes}}
+ 
+ cleanup_tmp_dir()
+-- 
+2.33.1
+
diff --git a/main/openrc/0008-fix-undeclared-UT_LINESIZE.patch b/main/openrc/0008-fix-undeclared-UT_LINESIZE.patch
deleted file mode 100644
index a61f0c6c7fe..00000000000
--- a/main/openrc/0008-fix-undeclared-UT_LINESIZE.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e7a8d2d5f988d6a9688b7359f62209b6ed296c64 Mon Sep 17 00:00:00 2001
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Mon, 12 Nov 2018 18:41:32 +0100
-Subject: [PATCH] Fix undeclared UT_LINESIZE
-
-Fix the following error:
-
-	broadcast.c:41:21: error: '__UT_LINESIZE' undeclared (first use in this function); did you mean 'UT_LINESIZE'?
-	 #define UT_LINESIZE __UT_LINESIZE
-                          ^~~~~~~~~~
-
-Constant UT_LINESIZE is defined in <utmp.h> provided by musl.
----
- src/rc/broadcast.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/rc/broadcast.c b/src/rc/broadcast.c
-index 47c093ce..4877fb74 100644
---- a/src/rc/broadcast.c
-+++ b/src/rc/broadcast.c
-@@ -22,6 +22,7 @@
- #include <time.h>
- #include <unistd.h>
- #include <stdio.h>
-+#include <utmp.h>
- #include <utmpx.h>
- #include <pwd.h>
- #include <fcntl.h>
diff --git a/main/openrc/0009-Based-on-the-vrf-patch-it-adds-support-to-run-servic.patch b/main/openrc/0009-Based-on-the-vrf-patch-it-adds-support-to-run-servic.patch
new file mode 100644
index 00000000000..bd149d98d3c
--- /dev/null
+++ b/main/openrc/0009-Based-on-the-vrf-patch-it-adds-support-to-run-servic.patch
@@ -0,0 +1,30 @@
+From 2f7405254f16cbb33ddb7c57eb20606a92b6c84a Mon Sep 17 00:00:00 2001
+From: Thomas Liske <thomas@fiasko-nw.net>
+Date: Sat, 16 Sep 2023 18:25:42 +0200
+Subject: [PATCH] Based on the vrf patch it adds support to run services in
+ netns namespaces. It is even possible to stack both options and run services
+ in a VRF inside a netns namespace.
+
+---
+ sh/openrc-run.sh.in | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/sh/openrc-run.sh.in b/sh/openrc-run.sh.in
+index 5eb4224c..2a6605db 100644
+--- a/sh/openrc-run.sh.in
++++ b/sh/openrc-run.sh.in
+@@ -242,6 +242,11 @@ if [ -n "$vrf" ]; then
+ 	RC_VRF_EXEC="/sbin/ip vrf exec $vrf"
+ fi
+ 
++# Add ip netns if configured to run in a netns (netns+vrf may stack)
++if [ -n "$netns" ]; then
++	RC_VRF_EXEC="/sbin/ip netns exec $netns $RC_VRF_EXEC"
++fi
++
+ # load service supervisor functions
+ sourcex "@LIBEXECDIR@/sh/runit.sh"
+ sourcex "@LIBEXECDIR@/sh/s6.sh"
+-- 
+2.39.2
+
diff --git a/main/openrc/0009-Support-early-loading-of-keymap-if-kdb-is-installed.patch b/main/openrc/0009-Support-early-loading-of-keymap-if-kdb-is-installed.patch
deleted file mode 100644
index cabfad83e6e..00000000000
--- a/main/openrc/0009-Support-early-loading-of-keymap-if-kdb-is-installed.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c991820ef19cc57b7c83dfa86f195d9ed12ec501 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Thu, 7 Mar 2019 16:55:53 +0100
-Subject: [PATCH] Support early loading of keymap if kbd is installed
-
-Early loading of the keymap with busybox was never supported and would
-require modifying the save-keymaps services as well. Since no one
-complained that it doesn't work with busybox so far just make it work
-with kbd for now.
----
- sh/init-early.sh.Linux.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sh/init-early.sh.Linux.in b/sh/init-early.sh.Linux.in
-index b7082a02..777cbda9 100644
---- a/sh/init-early.sh.Linux.in
-+++ b/sh/init-early.sh.Linux.in
-@@ -48,8 +48,8 @@ if service_present "$RC_DEFAULTLEVEL" consolefont ||
- fi
- 
- # Try and set a keyboard map as early as possible
--if service_present "$RC_DEFAULTLEVEL" keymaps ||
--   service_present "$RC_BOOTLEVEL" keymaps; then
-+if service_present "$RC_DEFAULTLEVEL" loadkeys ||
-+   service_present "$RC_BOOTLEVEL" loadkeys; then
- 	kbd_mode $kmode -C "$CONSOLE" 2>/dev/null
- 	if [ -r "$RC_LIBEXECDIR"/console/keymap ]; then
- 		loadkeys -q "$RC_LIBEXECDIR"/console/keymap 2>/dev/null
diff --git a/main/openrc/0010-rc-mount-make-timeout-invocation-compatible-with-bus.patch b/main/openrc/0010-rc-mount-make-timeout-invocation-compatible-with-bus.patch
deleted file mode 100644
index 02e00318304..00000000000
--- a/main/openrc/0010-rc-mount-make-timeout-invocation-compatible-with-bus.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3825e467b30b04cdfd25e24de9425df051d47a97 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Wed, 15 Jan 2020 21:41:32 +0100
-Subject: [PATCH] rc-mount: make timeout invocation compatible with busybox
- timeout
-
-Busybox timeout does not support the `-k` flag. As such, invoking fuser
-from do_unmount never worked without this patch. This went unnoticed as
-standard error is redirected to /dev/null. This patch fixes this by
-simply removing the incompatible `-k` flag.
----
- sh/rc-mount.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sh/rc-mount.sh b/sh/rc-mount.sh
-index f443d4c5..b640541f 100644
---- a/sh/rc-mount.sh
-+++ b/sh/rc-mount.sh
-@@ -48,7 +48,7 @@ do_unmount()
- 		retry=4 # Effectively TERM, sleep 1, TERM, sleep 1, KILL, sleep 1
- 		while ! LC_ALL=C $cmd "$mnt" 2>/dev/null; do
- 			if command -v fuser >/dev/null 2>&1; then
--				pids="$(timeout -k 10 -s KILL "${rc_fuser_timeout:-60}" \
-+				pids="$(timeout -s KILL "${rc_fuser_timeout:-60}" \
- 					fuser $f_opts "$mnt" 2>/dev/null)"
- 			fi
- 			case " $pids " in
diff --git a/main/openrc/0011-vrf.patch b/main/openrc/0011-vrf.patch
deleted file mode 100644
index 822b53191e0..00000000000
--- a/main/openrc/0011-vrf.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From e9fa602a76693ff508dd498bcae8b27ce73e8294 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Fri, 14 Feb 2020 16:02:43 +0000
-Subject: [PATCH] Add support for starting services in a specified VRF.
-
-The venerable iproute2 utility has recently introduced support
-for executing programs in specific VRFs which are virtualized
-routing tables.  These are typically used to isolate different
-networking planes from each other, for security or flexibility
-reasons.
-
-Services which use the normal supervisor/start-stop-daemon
-pattern can be configured by setting the vrf variable in the
-/etc/conf.d tree for the service.
-
-This allows for things like configuring the sshd service to
-run in a management VRF, which is useful for high assurance
-environments where the management plane is intended to be
-isolated.
-
-Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
----
- sh/openrc-run.sh.in     | 6 ++++++
- sh/runit.sh             | 2 +-
- sh/s6.sh                | 2 +-
- sh/start-stop-daemon.sh | 2 +-
- sh/supervise-daemon.sh  | 2 +-
- 5 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/sh/openrc-run.sh.in b/sh/openrc-run.sh.in
-index 7e9064c2..0401423e 100644
---- a/sh/openrc-run.sh.in
-+++ b/sh/openrc-run.sh.in
-@@ -236,6 +236,12 @@ if ! sourcex -e "$_conf_d/$RC_SVCNAME.$RC_RUNLEVEL"; then
- fi
- unset _conf_d
- 
-+# If we are configured to run in a VRF, provide a hint for that
-+RC_VRF_EXEC=""
-+if [ -n "$vrf" ]; then
-+	RC_VRF_EXEC="/sbin/ip vrf exec $vrf"
-+fi
-+
- # load service supervisor functions
- sourcex "@LIBEXECDIR@/sh/runit.sh"
- sourcex "@LIBEXECDIR@/sh/s6.sh"
-diff --git a/sh/runit.sh b/sh/runit.sh
-index 3cef0f3a..ab729292 100644
---- a/sh/runit.sh
-+++ b/sh/runit.sh
-@@ -20,7 +20,7 @@ runit_start()
- 	service_link="${RC_SVCDIR}/sv/${service_path##*/}"
- 	ebegin "Starting ${name:-$RC_SVCNAME}"
- 	ln -snf "${service_path}" "${service_link}"
--	sv start "${service_link}" > /dev/null 2>&1
-+	${RC_VRF_EXEC} sv start "${service_link}" > /dev/null 2>&1
- 	eend $? "Failed to start ${name:-$RC_SVCNAME}"
- }
- 
-diff --git a/sh/s6.sh b/sh/s6.sh
-index acbe965b..1f339703 100644
---- a/sh/s6.sh
-+++ b/sh/s6.sh
-@@ -37,7 +37,7 @@ s6_start()
- 	ln -sf "${s6_service_path}" "${s6_service_link}"
- 	s6-svscanctl -na "${RC_SVCDIR}"/s6-scan
- 	sleep 1.5
--	s6-svc -u "${s6_service_link}"
-+	${RC_VRF_EXEC} s6-svc -u "${s6_service_link}"
- 	if [ -n "$s6_svwait_options_start" ]; then
- 		s6-svwait ${s6_svwait_options_start} "${s6_service_link}"
- 	fi
-diff --git a/sh/start-stop-daemon.sh b/sh/start-stop-daemon.sh
-index 2e549ae1..5e7a1b88 100644
---- a/sh/start-stop-daemon.sh
-+++ b/sh/start-stop-daemon.sh
-@@ -45,7 +45,7 @@ ssd_start()
- 	#the eval call is necessary for cases like:
- 	# command_args="this \"is a\" test"
- 	# to work properly.
--	eval start-stop-daemon --start \
-+	eval ${RC_VRF_EXEC} start-stop-daemon --start \
- 		--exec $command \
- 		${chroot:+--chroot} $chroot \
- 		${directory:+--chdir} $directory \
-diff --git a/sh/supervise-daemon.sh b/sh/supervise-daemon.sh
-index e403a789..259b8166 100644
---- a/sh/supervise-daemon.sh
-+++ b/sh/supervise-daemon.sh
-@@ -24,7 +24,7 @@ supervise_start()
- 	# The eval call is necessary for cases like:
- 	# command_args="this \"is a\" test"
- 	# to work properly.
--	eval supervise-daemon "${RC_SVCNAME}" --start \
-+	eval ${RC_VRF_EXEC} supervise-daemon "${RC_SVCNAME}" --start \
- 		${retry:+--retry} $retry \
- 		${directory:+--chdir} $directory  \
- 		${chroot:+--chroot} $chroot \
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index 9ab644162ff..af29e66468a 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -1,29 +1,40 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openrc
-pkgver=0.42.1
+pkgver=0.54
 _ver=${pkgver/_git*/}
-pkgrel=7
+pkgrel=1
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
 url="https://github.com/OpenRC/openrc"
 arch="all"
 license="BSD-2-Clause"
-makedepends="bsd-compat-headers"
-subpackages="$pkgname-doc $pkgname-dev
-	$pkgname-zsh-completion:zshcomp:noarch
-	$pkgname-bash-completion:bashcomp:noarch"
+depends="ifupdown-any"
+makedepends_host="bsd-compat-headers libcap-dev linux-headers"
+makedepends_build="meson"
+checkdepends="sed"
+subpackages="
+	$pkgname-dbg
+	$pkgname-doc
+	$pkgname-tools::noarch
+	$pkgname-static
+	$pkgname-dev
+	agetty-openrc:_agetty_openrc:noarch
+	$pkgname-bash-completion
+	$pkgname-zsh-completion
+	"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgver.tar.gz
-
 	0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
-	0002-force-root-be-rw-before-localmount.patch
-	0004-hide-error-when-migrating-var-run-to-run.patch
-	0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
-	0007-make-consolefont-service-compatible-with-busyboxs-se.patch
-	0001-fsck-don-t-add-C0-to-busybox-fsck.patch
-	0008-fix-undeclared-UT_LINESIZE.patch
-	0009-Support-early-loading-of-keymap-if-kdb-is-installed.patch
-	0010-rc-mount-make-timeout-invocation-compatible-with-bus.patch
-	0011-vrf.patch
+	0002-fsck-don-t-add-C0-to-busybox-fsck.patch
+	0003-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
+	0004-make-consolefont-service-compatible-with-busyboxs-se.patch
+	0005-Support-early-loading-of-keymap-if-kbd-is-installed.patch
+	0006-Add-support-for-starting-services-in-a-specified-VRF.patch
+	0007-Clean-up-staticroute-config-remove-irrelevant-parts-.patch
+	0008-bootmisc-switch-wipe_tmp-setting-to-no-by-default.patch
+	0009-Based-on-the-vrf-patch-it-adds-support-to-run-servic.patch
+
+	supervise-daemon-defaults.patch
+	sysctl-readme.patch
 
 	openrc.logrotate
 	hostname.initd
@@ -35,23 +46,67 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgve
 	sysfsconf.initd
 	firstboot.initd
 	sysctl.initd
+	machine-id.initd
+	test-networking.sh
 	"
+options="!check" # not updated to meson build system, require makefile build
+provides="ifupdown-ng-openrc=0.12.1-r4"
+replaces="alpine-baselayout" # due to move of mkmntdirs
+
+# secfixes:
+#   0.44.6-r1:
+#     - CVE-2021-42341
 
 prepare() {
 	default_prepare
-	sed -i -e '/^sed/d' "$builddir"/pkgconfig/Makefile
+	# meson overrides this with the aports tag,
+	# we get there first :)
+	sed -i -e "s|@VCS_TAG@|$pkgver|" \
+		src/shared/version.h.in \
+		src/shared/version.in
 }
 
 build() {
-	export MKZSHCOMP=yes
-	export MKBASHCOMP=yes
-	make LIBEXECDIR=/lib/rc
+	if [ -z "$BOOTSTRAP" ]; then
+		local lto="-Db_lto=true"
+	fi
+	abuild-meson \
+		$lto \
+		-Dzsh-completions=true \
+		-Dbash-completions=true \
+		-Dpam=false \
+		-Dpkgconfig=true \
+		--default-library=both \
+		--prefix=/ \
+		--libdir=/usr/lib \
+		--libexecdir=/lib \
+		--bindir=/bin \
+		--sbindir=/sbin \
+		. output
+	meson compile -C output
+}
+
+check() {
+	make check
+
+	# run unit tests for networking.initd
+	#cd "$srcdir"
+	#( set -e; sh test-networking.sh )
 }
 
 package() {
 	local i j
 
-	make LIBEXECDIR=/lib/rc DESTDIR="$pkgdir/" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+
+	# place .so's in /lib so fancy ancient separate partition /usr configs can
+	# load them
+	mv "$pkgdir"/usr/lib/*.so* "$pkgdir"/usr/lib/*.a \
+		"$pkgdir"/lib/
+
+	# Alpine does not use openrc as its init so delete
+	# openrc-init & openrc-shutdown to avoid confusion.
+	rm -f "$pkgdir"/sbin/openrc-init "$pkgdir"/sbin/openrc-shutdown
 
 	# we cannot have anything turned on by default
 	rm -f "$pkgdir"/etc/runlevels/*/*
@@ -59,6 +114,9 @@ package() {
 	# we still use our ifup/ifdown based net config
 	rm -f "$pkgdir"/etc/conf.d/network "$pkgdir"/etc/init.d/network
 
+	# our hostname init script reads hostname from /etc/hostname
+	rm -f "$pkgdir"/etc/conf.d/hostname
+
 	# we override some of the scripts
 	for i in "$srcdir"/*.initd; do
 		j=${i##*/}
@@ -73,12 +131,12 @@ package() {
 
 	# additional documentation considered useful
 	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
-	install -m644 ChangeLog *.md "$pkgdir"/usr/share/doc/$pkgname/
+	install -m644 ./*.md "$pkgdir"/usr/share/doc/$pkgname/
 
 	# we use a virtual keymaps services to allow users to set their
 	# keymaps either with the OpenRC loadkeys service provided by
 	# the kbd aport or with the loadkmap service provided by the
-	# busybox-initscripts aport.
+	# busybox-openrc aport.
 	rm -f "$pkgdir/etc/init.d/keymaps" \
 		"$pkgdir/etc/conf.d/keymaps"
 
@@ -87,48 +145,53 @@ package() {
 
 	# openrc upstream removed service(8) for whatever reason, put it back
 	ln -s /sbin/rc-service "$pkgdir"/sbin/service
+
+	install -Dm755 "$pkgdir"/usr/share/openrc/support/deptree2dot/deptree2dot \
+		-t "$pkgdir"/usr/bin/
+	rm -r "$pkgdir"/usr/share/openrc/support/deptree2dot/deptree2dot
 }
 
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
+doc() {
+	default_doc
+	amove usr/share/openrc/support
+}
 
-	mkdir -p "$subpkgdir"/usr/share/bash-completion
-	mv "$pkgdir"/usr/share/bash-completion/completions \
-		"$subpkgdir"/usr/share/bash-completion
-	rm -rf "$pkgdir"/usr/share/bash-completion
+tools() {
+	depends="perl"
+	amove usr/bin/deptree2dot
 }
 
-zshcomp() {
-	depends=""
-	pkgdesc="Zsh completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel zsh"
+_agetty_openrc() {
+	pkgdesc="agetty program from util-linux (OpenRC init scripts)"
+	install_if="agetty openrc=$pkgver-r$pkgrel"
 
-	mkdir -p "$subpkgdir"/usr/share/zsh
-	mv "$pkgdir"/usr/share/zsh/site-functions \
-		"$subpkgdir"/usr/share/zsh
-	rm -rf "$pkgdir"/usr/share/zsh
+	amove etc/init.d/agetty
+	amove etc/conf.d/agetty
 }
 
-sha512sums="579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646  openrc-0.42.1.tar.gz
-71fce711adbcb411189a089f1d49567c50348e12c42b7a9c9b582dae5d18051f88ccf81c768337e87d6792d953e84d1e8b93d7978a1947d7d20ef3b1cd330875  0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
-b1cedd38badda4fc308decdff06f9644b96fe35617792da8d6d62407409841705fd71b5b57d1804a6395095604a70898f80830c76395ec99f715038a0809d815  0002-force-root-be-rw-before-localmount.patch
-d54630d40a2d6b10a325cb012d4efcda997a60c008ca953ce5d60059d3f267308a59dabddf93a5fc0d301aa91967137d144effbe5f574394af768ce4ebc48738  0004-hide-error-when-migrating-var-run-to-run.patch
-39a35c54ec9112fe84c901ed155a711cec8e194af02d5483ee60b80743dab12391e6fdc7b3da2f86844dd4edcf53e681ff95bd4d6fa1101a89ce54dce2ddbb7c  0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
-234c4f3cf39df3350dbea25c00b8d584794b28194f44c726767a6a16d91a26fee1b5d2dd16635f19803fc015b4e9d99c52b23128e6b815938b88365feba8cf59  0007-make-consolefont-service-compatible-with-busyboxs-se.patch
-dbe3f170440f0f357f31ac4d49c56a9a7ec22172df2701bf4a0afdee22aedda1f88b9fa5ffdbe19a5eea3c764ad0e4c802e19b95b7082a72d423d46d30c18edd  0001-fsck-don-t-add-C0-to-busybox-fsck.patch
-d2b8700f56b05579926352855de8fcee5cf78f0c13200643a5195f8c60e2b5082d476b42cc77b13246b9fb883aa002d723237b0fc7ae84ccd7ebe3b25690cf50  0008-fix-undeclared-UT_LINESIZE.patch
-667085d89e194f7e2255d5c098c3d8de272f54cb925710cb98d5e7a6b58982d0acfe15f97b574cfc646b139cd7aa5b527ba700ef9b8048a6d6d9dee8cc74913c  0009-Support-early-loading-of-keymap-if-kdb-is-installed.patch
-ff9bf2f6e4f55633a9641385398f70a2e591e2b3b56b1903f168a97b07bd56dc5a65d151deeab94229452b2e892b597c16dc3d57d5d47ec35a48cf5343190c36  0010-rc-mount-make-timeout-invocation-compatible-with-bus.patch
-34c5b1157d9f1e26f9c9121b649f7a31c32f3bdd62a17f451d3391f276ec8ca82623c1b917506867647523d18a1ee665a17d261ac12ff1732ab5c19cfaf91aac  0011-vrf.patch
+sha512sums="
+25a7c6b042608627b4cabb98208205c0cffafefcfa62ab4c7a6747a134583c3c6d54adcbb0d837cae6fbae5b082b964b60ebd1762e90efeae23a14bc5f1e348e  openrc-0.54.tar.gz
+257861f5f0562e9b9a9fccebae474bd75c4bb51f005a2b8132fd551f061f65863de46c5bc4437f137b4a9d3ca741f9de9274bfa7b418eda70497ed4b5fd3056d  0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
+3f47b4f7e6c5b7fb53ff8a13470fbada67f7470e5eba71a683e6c022162c3905f560d561c3d61698e3fde367d6ae715edf76e99949f52a22a3bbf79debc33f64  0002-fsck-don-t-add-C0-to-busybox-fsck.patch
+0bd69d9e8e9c321a5e67cf924be07b9dd0b58801143c18f74bebf442958fc878e46a65f07cc2842566a8c3434e788ef3ca0c90c607de6b10931f01324bfc1b11  0003-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
+71a743bf969110a27259405ef4b4dc4fad608b8e49039fd6afb1b1486d0f1dfccc3ef5275410fa3d6d1554ccee59c5a3424be4f2919e14453ebb709282c588a7  0004-make-consolefont-service-compatible-with-busyboxs-se.patch
+9e2ae6c8e189ceae0f3f2662d9504f796e9a6a987a26ee2e10add85746b6596eb04cc256dc532a39f711b4e1aa07f1d12a384ef45d23cab49878b887bf0a878c  0005-Support-early-loading-of-keymap-if-kbd-is-installed.patch
+8bf00b82d7fc0eb1b529ec735009f91d277141ba7e5c04e23d10bbcf36eb453f0b31d48aec45e50b5be4c14f611acc4454933f3cefdf8beab07d851328223464  0006-Add-support-for-starting-services-in-a-specified-VRF.patch
+431ac28808e684bea5511386bf5f06efe7f509f1dbe7e15ae6309563d813deae8f3edd872a0943ef8088e3cf778d7bc5ebd15a893dc4a08f4022b7a56bbafc63  0007-Clean-up-staticroute-config-remove-irrelevant-parts-.patch
+475f4ea63b9b5d7eb9c623e96b6cc3d3072abcb7194d0045b84e0688836c8514fccfc68b0eae0b4bee60878cdea8042c3ce7e48406ee7a2f0e4a3e128a153468  0008-bootmisc-switch-wipe_tmp-setting-to-no-by-default.patch
+d7b8b1facd7fb9a6a8350912644cce3956947bcaa8bcb645f9c26a2bb0d062970efaa14bd66a7987f0748daff7b5a8e701b45b3fcca7c7c7e393ac262728f1a6  0009-Based-on-the-vrf-patch-it-adds-support-to-run-servic.patch
+1323a8476580f7b56a9cf1b24b26b10da76c5916cf23d7dab01f08a3261751341dfe01d1ed884df8e6ea17ff6a52021cc40fb3101e99b77d4ae7f3f61ee330e8  supervise-daemon-defaults.patch
+903ff555275a67ff08da91badb55d9fa6c6a2901e8ef09ca8366bd74d69757491c8336347f04551268ecf053c8ae974f50decd869926894dd94e382008e3e925  sysctl-readme.patch
 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec  openrc.logrotate
-493f27d588e64bb2bb542b32493ed05873f4724e8ad1751002982d7b4e07963cfb72f93603b2d678f305177cf9556d408a87b793744c6b7cd46cf9be4b744c02  hostname.initd
-c06eac7264f6cc6888563feeae5ca745aae538323077903de1b19102e4f16baa34c18b8c27af5dd5423e7670834e2261e9aa55f2b1ec8d8fdc2be105fe894d55  hwdrivers.initd
-7113c930f7f5fb5b345b115db175f8e5837e3541b3e022d5cecf1b59067ed4b40b2adea2324a008035b97d653311217ac5cf961b4d0fc8b714a8b2505883cdc6  modules.initd
-c1615dbeb18e2f988237ecbef830a01fd79970365a799e8704abefab9c716ab45553b3c15f1e3d24320d422fd25d21ab38f519f0edd4ca25cf19846713195ae1  modloop.initd
-d21164f4d265456c7633c1f63a296170fcd0d95ca509bbf57c16ac33e4f2e55b840d9e5811f863732040f443ef43d4b9f248d939e273997000556014f114e82e  networking.initd
+afbb4cb4f2d6c2a5cf81ee2b5da8dfcd1f573e8168f1f3586681222ccfc59d6dda65eca3f2cb97c94ce7af4da60db0c4c6c643c014358dcecf94a6152466c89c  hostname.initd
+594d0b8c8a8eafdcbf6f566ec43797cbe98debfa5d9ee8b2e78344d8031184c23cf1a22588fbb4b0aaf2769458bef233332b4f8da71337db4df6a431c4bafa8f  hwdrivers.initd
+bc152c2b5eb37a08035f289b21e85d41461914e8b1f3c6a6a87ba0dd0cfeb20c9a5e6d7dab132e345339245a7ae1ffcb741f5bfde76fb8e0c87e4de5e0b1faf0  modules.initd
+47bea7e48444fc15f30b1da168e3d33b124c7f3480e08adcf93c5d301504cc6e73d96b254833fe20e906e353053eba8e8f410f238a3d4cd65743718a800939e5  modloop.initd
+aa1dd3d31872d7ec308b534044e490136de47a3e72575a96522f60c5740ee3b953a17e05013359d27985ac16b048ff8fff76e8ac1103802a4fb75a31d2185d45  networking.initd
 80e43ded522e2d48b876131c7c9997debd43f3790e0985801a8c1dd60bc6e09f625b35a127bf225eb45a65eec7808a50d1c08a5e8abceafc61726211e061e0a2  modloop.confd
 d76c75c58e6f4b0801edac4e081b725ef3d50a9a8c9bbb5692bf4d0f804af7d383bf71a73d5d03ed348a89741ef0b2427eb6a7cbf5a9b9ff60a240639fa6ec88  sysfsconf.initd
-f65b061b4272463071022e88a7392d5573f2d95f91e42c8b4f3ef69171604460ddd3d426dfbab382f73a3fac68d4b4ff3a923fdc49fb6fd9f27ebd3ab24e0d0e  firstboot.initd
-2d5f9f6d41b7c0a8643cfdee1ce3c399bfe4ebff54421f33ab1e74c1c4c1b96a49e54b5cd69f0339a060342e4e5a11067bbff68c39fa487919259d73e8e46ed1  sysctl.initd"
+990855f875513a85c2b737685ac5bfdfa86f8dadacf00c1826a456547f99b69d4ecf1b9a09c0ce002f1df618b44b1febabe53f95a2c0cd02b504d565bccb50c8  firstboot.initd
+2d5f9f6d41b7c0a8643cfdee1ce3c399bfe4ebff54421f33ab1e74c1c4c1b96a49e54b5cd69f0339a060342e4e5a11067bbff68c39fa487919259d73e8e46ed1  sysctl.initd
+a60129f4bed134a27773c61994d114b3a5d1ab9f20097b096956f5bb696c056f4a608577cabb34c32b51899c69dce3bd0d8ffa61f5b66fd00fc5085d1ebba54f  machine-id.initd
+af17947aa3954e317dc06580da829200e0b0f2ddc37ce842c3fc7fc0d8ca2f40220e4f4665f61b4b5ec47c96416db0127e2ed979b9421bf21df89d4c4f998b7f  test-networking.sh
+"
diff --git a/main/openrc/firstboot.initd b/main/openrc/firstboot.initd
index 27f2c1f3743..eac4ef86c66 100644
--- a/main/openrc/firstboot.initd
+++ b/main/openrc/firstboot.initd
@@ -4,7 +4,8 @@
 
 # read kernel options
 init_KOPT() {
-	for opt in $(cat /proc/cmdline 2>/dev/null); do
+	eval "set -- $(cat /proc/cmdline 2>/dev/null)"
+	for opt; do
 		case "$opt" in
 			ssh_*=*)
 				eval "KOPT_${opt%%=*}='${opt#*=}'" ;;
@@ -20,13 +21,13 @@ start() {
 	if [ -n "$KOPT_ssh_key" ] && [ ! -f "/root/.ssh/authorized_keys" ]; then
 		einfo "Fetching ssh keys"
 		mkdir -pm 700 /root/.ssh
+		checkpath -fm 0600 /root/.ssh/authorized_keys
 		case "$KOPT_ssh_key" in
 			https://*|ftps://*|http://*)
 				wget -q "$KOPT_ssh_key" -O /root/.ssh/authorized_keys
 				rc=$?;;
 			*) echo "$KOPT_ssh_key" > /root/.ssh/authorized_keys;;
 		esac
-		chmod 600 /root/.ssh/authorized_keys
 	fi
 	eend $rc
 }
diff --git a/main/openrc/hostname.initd b/main/openrc/hostname.initd
index bd208749fac..cf4c5ce34c3 100644
--- a/main/openrc/hostname.initd
+++ b/main/openrc/hostname.initd
@@ -1,5 +1,8 @@
 #!/sbin/openrc-run
 
+# Copyright (c) Natanael Copa
+# This code is licensed under BSD-2-Clause
+
 description="Sets the hostname of the machine."
 
 depend() {
diff --git a/main/openrc/hwdrivers.initd b/main/openrc/hwdrivers.initd
index 80184c9710b..9bc5278ffa2 100644
--- a/main/openrc/hwdrivers.initd
+++ b/main/openrc/hwdrivers.initd
@@ -1,5 +1,8 @@
 #!/sbin/openrc-run
 
+# Copyright (c) Natanael Copa
+# This code is licensed under BSD-2-Clause
+
 depend() {
 	need sysfs dev
 	before checkfs fsck
@@ -16,10 +19,10 @@ start() {
 	fi
 
 	ebegin "Loading hardware drivers"
-	find /sys -name modalias -type f -print0 | xargs -0 sort -u \
+	find /sys -name modalias -type f -print0 2> /dev/null | xargs -0 sort -u \
 		| xargs modprobe -b -a 2> /dev/null
 	# we run it twice so we detect all devices
-	find /sys -name modalias -type f -print0 | xargs -0 sort -u \
+	find /sys -name modalias -type f -print0 2> /dev/null | xargs -0 sort -u \
 		| xargs modprobe -b -a 2> /dev/null
 
 	# check if framebuffer drivers got pulled in
diff --git a/main/openrc/machine-id.initd b/main/openrc/machine-id.initd
new file mode 100644
index 00000000000..60e1821244b
--- /dev/null
+++ b/main/openrc/machine-id.initd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+
+# Copyright (c) Natanael Copa
+# This code is licensed under BSD-2-Clause
+
+description="Generate machine-id if needed"
+
+depend() {
+	need root dev
+}
+
+start() {
+	if [ -s /etc/machine-id ] ; then
+		return 0
+	fi
+	ebegin "Generating machine-id"
+	dd if=/dev/urandom status=none bs=16 count=1 \
+		| md5sum | cut -d' ' -f1 > /etc/machine-id
+	eend $?
+}
diff --git a/main/openrc/modloop.initd b/main/openrc/modloop.initd
index 87069b487ac..41f8462bb72 100755
--- a/main/openrc/modloop.initd
+++ b/main/openrc/modloop.initd
@@ -1,5 +1,8 @@
 #!/sbin/openrc-run
 
+# Copyright (c) Natanael Copa
+# This code is licensed under BSD-2-Clause
+
 # script that will mount image with modules
 
 depend() {
@@ -12,7 +15,7 @@ depend() {
 init_KOPT() {
 	for opt in $(cat /proc/cmdline 2>/dev/null); do
 	        case "$opt" in
-			modloop=*)
+			modloop=*|modloop_verify=*)
 				eval "KOPT_${opt%%=*}='${opt#*=}'" ;;
 		esac
 	done
@@ -43,6 +46,9 @@ find_modloop() {
 
 verify_modloop() {
 	local modloop=$1 key=
+	if ! yesno "${KOPT_modloop_verify:=yes}"; then
+		return 0
+	fi
 	for key in /etc/apk/keys/*.pub; do
 		local sig=/var/cache/misc/${modloop##*/}.SIGN.RSA.${key##*/}
 		if [ -f "$sig" ]; then
@@ -67,11 +73,12 @@ start() {
 	local modloop= mount_opts= modloop_dldir="/lib"
 	init_KOPT
 
-	mkdir -p /.modloop /lib
 	case "$KOPT_modloop" in
+		none) return 0;;
 		http://*|https://*|ftp://*)
 			modloop=$modloop_dldir/${KOPT_modloop##*/}
 			if [ ! -f "$modloop" ]; then
+				mkdir -p "$modloop_dldir"
 				wget -P "$modloop_dldir" "$KOPT_modloop" || eend 1
 			fi
 			;;
@@ -87,6 +94,7 @@ start() {
 	esac
 
 	ebegin "Mounting modloop $modloop"
+	mkdir -p /.modloop
 	if [ -n "$modloop" ]; then
 		verify_modloop "$modloop" || eerror "Failed to verify signature of $img!"
 		mount -o loop,ro $modloop /.modloop
diff --git a/main/openrc/modules.initd b/main/openrc/modules.initd
index 3cd141ec29e..d702d5856c7 100644
--- a/main/openrc/modules.initd
+++ b/main/openrc/modules.initd
@@ -1,5 +1,8 @@
 #!/sbin/openrc-run
 
+# Copyright (c) Natanael Copa
+# This code is licensed under BSD-2-Clause
+
 description="Loads a user defined list of kernel modules."
 
 depend()
diff --git a/main/openrc/networking.initd b/main/openrc/networking.initd
index 1de19be1f5f..adae1b66cb0 100644
--- a/main/openrc/networking.initd
+++ b/main/openrc/networking.initd
@@ -1,10 +1,14 @@
 #!/sbin/openrc-run
 
+# Copyright (c) Natanael Copa
+# This code is licensed under BSD-2-Clause
+#
 # note that the spoofprotect, syncoockies and ip_forward options are set in 
 # /etc/sysctl.conf
 
 : ${cfgfile:="/etc/network/interfaces"}
-ifstate=/run/ifstate
+: ${ifquery:="ifquery"}
+: ${ifstate:="/run/ifstate"}
 
 single_iface="${RC_SVCNAME#*.}"
 if [ "$single_iface" = "$RC_SVCNAME" ]; then
@@ -12,7 +16,8 @@ if [ "$single_iface" = "$RC_SVCNAME" ]; then
 fi
 
 depend() {
-	need localmount
+	need localmount hostname
+	want dev-settle
 	after bootmisc hwdrivers modules
 	provide net
 	keyword -jail -prefix -vserver -docker
@@ -22,18 +27,32 @@ depend() {
 find_ifaces() {
 	if [ -n "$single_iface" ]; then
 		echo $single_iface
-	else
-		awk '$1 == "auto" {for (i = 2; i <= NF; i = i + 1) printf("%s ", $i)}' "$cfgfile"
+		return 0
 	fi
+
+	if command -v "$ifquery" >/dev/null; then
+		$ifquery -i "$cfgfile" --list -a
+		return
+	fi
+
+	# fallback in case ifquery does not exist
+	awk '$1 == "auto" {for (i = 2; i <= NF; i = i + 1) printf("%s ", $i)}' "$cfgfile"
 }
 
 # return the list of interfaces we should try stop
 find_running_ifaces() {
 	if [ -n "$single_iface" ]; then
 		echo $single_iface
-	else
-		awk -F= '{print $2}' $ifstate
+		return 0
 	fi
+
+	if command -v "$ifquery" >/dev/null; then
+		$ifquery --state-file $ifstate -i "$cfgfile" --running
+		return
+	fi
+
+	# fallback
+	awk -F= '{print $2}' $ifstate
 }
 
 start() {
diff --git a/main/openrc/openrc.post-install b/main/openrc/openrc.post-install
index 1c273502c1d..6bcdbbfbd46 100644
--- a/main/openrc/openrc.post-install
+++ b/main/openrc/openrc.post-install
@@ -3,8 +3,8 @@
 rc_update() {
 	local svc="$1"
 	local level="$2"
-	mkdir -p /etc/runlevels/$level
-	ln -sf /etc/init.d/$svc /etc/runlevels/$level
+	mkdir -p etc/runlevels/$level
+	ln -sf /etc/init.d/$svc etc/runlevels/$level
 }
 
 if [ ! -d etc/rcS.d ] && [ ! -d etc/rcL.d ]; then
@@ -23,7 +23,7 @@ for i in etc/rc[SL].d/*; do
 		rc.local)	svc=local;;
 		*)		svc=$oldsvc;;
 	esac
-	
+
 	# add the service to correct "runlevel"
 	case "$svc" in
 		syslog|klogd)
@@ -35,4 +35,3 @@ for i in etc/rc[SL].d/*; do
 
 	rm $i
 done
-
diff --git a/main/openrc/openrc.post-upgrade b/main/openrc/openrc.post-upgrade
index 8884202be10..9b487c88530 100644
--- a/main/openrc/openrc.post-upgrade
+++ b/main/openrc/openrc.post-upgrade
@@ -1,18 +1,20 @@
 #!/bin/sh
 
+ver_old=$2
+
 # in 0.8.0-r1 the state dir moved from /libexec/rc/init.d to /lib/rc/init.d
 # and with 0.10 it moved to /run/openrc
 
-mkdir -p /run/openrc
-for dir in /libexec /lib; do
+mkdir -p run/openrc
+for dir in libexec lib; do
 	[ -d $dir/rc/init.d ] || continue
 
 	for i in $dir/rc/init.d/* ; do
 		[ -e "$i" ] || continue
-		if [ -e /run/openrc/${i##*/} ]; then
+		if [ -e run/openrc/${i##*/} ]; then
 			rm -r $i
 		else
-			mv $i /run/openrc/
+			mv $i run/openrc/
 		fi
 	done
 
@@ -20,8 +22,8 @@ for dir in /libexec /lib; do
 done
 
 # create rc.local compat
-if [ -f /etc/rc.local ]; then
-	cat >/etc/local.d/rc.local-compat.start<<__EOF__
+if [ -f etc/rc.local ]; then
+	cat >etc/local.d/rc.local-compat.start<<__EOF__
 #!/bin/sh
 
 # this is only here for compatibility reasons
@@ -29,7 +31,35 @@ if [ -f /etc/rc.local ]; then
 	. /etc/rc.local
 fi
 __EOF__
-	chmod +x /etc/local.d/rc.local-compat.start
+	chmod +x etc/local.d/rc.local-compat.start
+fi
+
+rename_service() {
+	oldname="$1"
+	newname="$2"
+
+	ret=1
+	for link in run/openrc/*/${oldname} etc/runlevels/*/${oldname}; do
+		newlink="${link%/*}/${newname}"
+		if [ -L "$link" ] && ! [ -L "$newlink" ]; then
+			target="$(readlink $link)"
+			ln -s "${target%/*}/$newname" "$newlink"
+			rm "$link"
+			ret=0
+			continue
+		fi
+		if [ -d "$link" ] && ! [ -d "$newlink" ]; then
+			mv "$link" "$newlink"
+			ret=0
+		fi
+	done
+
+	return $ret
+}
+
+if [ "$(apk version -t "$ver_old" '0.45-r0')" = '<' ]; then
+	# in 0.45 urandom was renamed to seedrng
+	rename_service urandom seedrng
 fi
 
 exit 0
diff --git a/main/openrc/supervise-daemon-defaults.patch b/main/openrc/supervise-daemon-defaults.patch
new file mode 100644
index 00000000000..53a70bb9c12
--- /dev/null
+++ b/main/openrc/supervise-daemon-defaults.patch
@@ -0,0 +1,31 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Wed, 16 Nov 2022 01:47:34 +0100
+Subject: [PATCH] Provide more reasonable defaults for supervise-daemon
+
+The vendor's default parameters for the supervise-daemon are unreasonable
+or even unusable for most of the services (empirically found), especially
+respawn_delay=0 (i.e. respawn crashed service immediately).
+
+--- a/etc/rc.conf
++++ b/etc/rc.conf
+@@ -315,3 +315,20 @@
+ # If this is set to no, we do not send sigkill to all processes in the
+ # cgroup.
+ #rc_send_sigkill="YES"
++
++##############################################################################
++# SUPERVISE DAEMON CONFIGURATION VARIABLES
++# These variables sets more reasonable defaults for supervise-daemon(8).
++# They may be overriden on a per service basis.
++
++# Wait this number of seconds before restarting a daemon after it crashes.
++respawn_delay=2
++
++# Sets the maximum number of times a daemon will be respawned during a respawn
++# period. If a daemon dies more than this number of times during a respawn
++# period, supervise-daemon(8) will give up trying to respawn it and exit.
++# 0 means unlimited.
++respawn_max=5
++
++# Sets the length in seconds of a respawn period.
++respawn_period=1800
diff --git a/main/openrc/sysctl-readme.patch b/main/openrc/sysctl-readme.patch
new file mode 100644
index 00000000000..df61aa10790
--- /dev/null
+++ b/main/openrc/sysctl-readme.patch
@@ -0,0 +1,11 @@
+diff --git a/sysctl.d/README b/sysctl.d/README
+index ca3e030..1b056a7 100644
+--- a/sysctl.d/README
++++ b/sysctl.d/README
+@@ -10,4 +10,5 @@ with .conf, or it will not be read.
+ 
+ The recommended location for local system settings is /etc/sysctl.d/local.conf
+ but as long as you follow the rules for the name of the file, anything will
+-work. see the sysctl.conf(5) man page for details of the format.
++work. see the sysctl.conf(5) man page for details of the format. This manpage
++can be found in the `procps-doc` package.
diff --git a/main/openrc/test-networking.sh b/main/openrc/test-networking.sh
new file mode 100644
index 00000000000..5e5f70b025d
--- /dev/null
+++ b/main/openrc/test-networking.sh
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# unit tests for find_ifaces and find_running_ifaces in networking.initd
+
+cfgfile=/tmp/openrc-test-network.$$
+sourcefile=$cfgfile.source
+sourcedir=$cfgfile.d
+ifstate=$cfgfile.state
+
+cat >$cfgfile<<EOF
+auto eth0
+iface eth0 inet dhcp
+
+source $sourcefile
+
+source-directory $sourcedir
+EOF
+
+cat >$sourcefile<<EOF
+auto eth1
+iface eth1 inet dhcp
+EOF
+
+mkdir -p $sourcedir
+cat >$sourcedir/a<<EOF
+auto eth2
+iface eth2 inet dhcp
+EOF
+
+cat >$ifstate<<EOF
+eth4=eth4 1
+EOF
+
+errors=0
+fail() {
+	echo "$@"
+	errors=$(( $errors + 1))
+}
+
+# test fallback, when ifquery does not exist
+ifquery=does-not-exist
+. ./networking.initd
+
+find_ifaces | grep -q -w eth0 || fail "Did not find eth0"
+find_ifaces | grep -q -E '(eth1|eth2)' && fail "Unexpectedly found eth1 or eth2"
+
+# test that ifquery finds source and source-directory
+unset ifquery
+. ./networking.initd
+for i in eth0 eth1 eth2; do
+	find_ifaces | grep -q -w "$i" || fail "Did not find $i"
+done
+
+# test that ifquery picks up the running state file
+find_running_ifaces | grep -q -w "eth4" || fail "Did not detect eth4 running"
+
+
+# test /etc/init.d/net.eth5
+RC_SVCNAME=net.eth5
+. ./networking.initd
+find_ifaces | grep -q -w "eth5" || fail "Did not detect eth5"
+find_running_ifaces | grep -q -w "eth5" || fail "Did not detect eth5 running"
+
+rm -rf $cfgfile $sourcefile $sourcedir $ifstate
+exit $errors
diff --git a/main/openresolv/APKBUILD b/main/openresolv/APKBUILD
index a652ea46528..aeb3915189a 100644
--- a/main/openresolv/APKBUILD
+++ b/main/openresolv/APKBUILD
@@ -1,20 +1,25 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openresolv
-pkgver=3.10.0
+pkgver=3.13.2
 pkgrel=0
 pkgdesc="A framework for managing DNS information"
 url="https://roy.marples.name/projects/openresolv"
 arch="noarch"
-license="BSD"
+license="BSD-2-Clause"
 subpackages="$pkgname-doc"
-source="http://roy.marples.name/downloads/openresolv/openresolv-$pkgver.tar.xz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/NetworkConfiguration/openresolv/archive/refs/tags/v$pkgver.tar.gz
+	detect_init-remove-irrelevant.patch
+	"
+options="!check"
 
 build() {
+	# NOTE: Don't set --prefix, it should be /.
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		--libexecdir=/usr/libexec/openresolv \
+		--libexecdir=/lib/resolvconf \
+		--mandir=/usr/share/man \
+		--rundir=/run \
 		--sysconfdir=/etc
 	make
 }
@@ -23,4 +28,7 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f28fc43887f18f6cbdcdabbb48777fc704ed653e77f34caf349b5c4e5f5f6e7686242ea9f2617f2f65d40d14c794ce28cffee0ec5e5c7b8a19566f3bd72e9ec5  openresolv-3.10.0.tar.xz"
+sha512sums="
+5471178db5336f2d6ae08b1baf0fb45b76f0eb8fa313f25f3beb360749c87897b69d835c64733ee4ec18f72150259e4ba79cfe13dd69e5ff65a7e5b50f543136  openresolv-3.13.2.tar.gz
+4532f62530c8922f91ca9bb78b1fdb8f68801b0a4643af5e1a57faa7b1640e0b453c8603040c2a3315bbf1ee0c4f39c6fe696fde3ec9569d61a0ed086b3afaaa  detect_init-remove-irrelevant.patch
+"
diff --git a/main/openresolv/detect_init-remove-irrelevant.patch b/main/openresolv/detect_init-remove-irrelevant.patch
new file mode 100644
index 00000000000..f4e91149379
--- /dev/null
+++ b/main/openresolv/detect_init-remove-irrelevant.patch
@@ -0,0 +1,95 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sat, 25 Jun 2022 19:51:00 +0200
+Subject: Remove support for init systems we don't have, add support for s6
+
+Don't waste resources looking for init systems we don't have in Alpine.
+
+diff --git a/resolvconf.in b/resolvconf.in
+index d1cdc71..42023ff 100644
+--- a/resolvconf.in
++++ b/resolvconf.in
+@@ -299,80 +299,25 @@ detect_init()
+ 	[ -n "$RESTARTCMD" ] && return 0
+ 
+ 	# Detect the running init system.
+-	# As systemd and OpenRC can be installed on top of legacy init
+-	# systems we try to detect them first.
+ 	status="@STATUSARG@"
+ 	: ${status:=status}
+-	if [ -x /bin/systemctl ] && [ -S /run/systemd/private ]; then
+-		RESTARTCMD='
+-			if /bin/systemctl --quiet is-active $1.service
+-			then
+-				/bin/systemctl restart $1.service
+-			fi'
+-	elif [ -x /usr/bin/systemctl ] && [ -S /run/systemd/private ]; then
+-		RESTARTCMD='
+-			if /usr/bin/systemctl --quiet is-active $1.service
+-			then
+-				/usr/bin/systemctl restart $1.service
+-			fi'
+-	elif [ -x /sbin/rc-service ] &&
++	if [ -x /sbin/rc-service ] &&
+ 	     { [ -s /libexec/rc/init.d/softlevel ] ||
+ 	     [ -s /run/openrc/softlevel ]; }
+ 	then
+ 		RESTARTCMD='/sbin/rc-service -i $1 -- -Ds restart'
+-	elif [ -x /usr/sbin/invoke-rc.d ]; then
+-		RCDIR=/etc/init.d
+-		RESTARTCMD='
+-		   if /usr/sbin/invoke-rc.d --quiet $1 status >/dev/null 2>&1
+-		   then
+-			/usr/sbin/invoke-rc.d $1 restart
+-		   fi'
+ 	elif [ -x /usr/bin/s6-rc ] && [ -x /usr/bin/s6-svc ]; then
+ 		RESTARTCMD='
+ 		   if s6-rc -a list | grep -qFx $1-srv
+ 		   then
+ 			s6-svc -r /run/service/$1-srv
+ 		   fi'
+-	elif [ -x /sbin/service ]; then
+-		# Old RedHat
+-		RCDIR=/etc/init.d
+-		RESTARTCMD='
+-			if /sbin/service $1; then
+-				/sbin/service $1 restart
+-			fi'
+-	elif [ -x /usr/sbin/service ]; then
+-		# Could be FreeBSD
+-		RESTARTCMD="
+-			if /usr/sbin/service \$1 $status >/dev/null 2>&1
+-			then
+-				/usr/sbin/service \$1 restart
+-			fi"
+ 	elif [ -x /bin/sv ]; then
+ 		RESTARTCMD='/bin/sv status $1 >/dev/null 2>&1 &&
+ 			    /bin/sv try-restart $1'
+-	elif [ -x /usr/bin/sv ]; then
+-		RESTARTCMD='/usr/bin/sv status $1 >/dev/null 2>&1 &&
+-			    /usr/bin/sv try-restart $1'
+-	elif [ -e /etc/arch-release ] && [ -d /etc/rc.d ]; then
+-		RCDIR=/etc/rc.d
+-		RESTARTCMD='
+-			if [ -e /var/run/daemons/$1 ]
+-			then
+-				/etc/rc.d/$1 restart
+-			fi'
+-	elif [ -e /etc/slackware-version ] && [ -d /etc/rc.d ]; then
+-		RESTARTCMD='
+-			if /etc/rc.d/rc.$1 status >/dev/null 2>&1
+-			then
+-				/etc/rc.d/rc.$1 restart
+-			fi'
+-	elif [ -e /etc/rc.d/rc.subr ] && [ -d /etc/rc.d ]; then
+-		# OpenBSD
+-		RESTARTCMD='
+-			if /etc/rc.d/$1 check >/dev/null 2>&1
+-			then
+-				/etc/rc.d/$1 restart
+-			fi'
++	# TODO: Test if this works correctly.
++	elif [ -x /bin/s6-svc ] && [ -e /run/s6-rc ]; then
++		RESTARTCMD='/bin/s6-svc -r /run/service/$1'
+ 	elif [ -d /etc/dinit.d ] && command -v dinitctl >/dev/null 2>&1; then
+ 		RESTARTCMD='dinitctl --quiet restart --ignore-unstarted $1'
+ 	else
diff --git a/main/opensbi/APKBUILD b/main/opensbi/APKBUILD
new file mode 100644
index 00000000000..f030e23381c
--- /dev/null
+++ b/main/opensbi/APKBUILD
@@ -0,0 +1,27 @@
+# Contributor: Milan P. Stanić <mps@arvanta.net>
+# Maintainer: Milan P. Stanić <mps@arvanta.net>
+pkgname=opensbi
+# XXX: Updates require rebuilds of main/u-boot.
+pkgver=1.4
+pkgrel=0
+pkgdesc="risc-v open source supervisor binary interface"
+url="https://github.com/riscv/opensbi"
+arch="riscv64"
+license="BSD-2-Clause"
+options="!check" # no tests
+makedepends="bash python3"
+source="$pkgname-$pkgver.tar.gz::https://github.com/riscv/opensbi/archive/refs/tags/v$pkgver.tar.gz"
+
+build() {
+	make PLATFORM=generic
+}
+
+package() {
+	mkdir -p "$pkgdir"/usr/share/opensbi/generic/firmware
+	cp $builddir/build/platform/generic/firmware/*elf "$pkgdir"/usr/share/opensbi/generic/firmware
+	cp $builddir/build/platform/generic/firmware/*bin "$pkgdir"/usr/share/opensbi/generic/firmware
+}
+
+sha512sums="
+11833ccca1f16ca5d19580862a0f25d303f7696214c47c30f78f221e16fc35f385f4388d96370c4aa8d43f7f7d5a804c8b55dc845bd316421d9d8ad9509b7ba4  opensbi-1.4.tar.gz
+"
diff --git a/main/opensmtpd/APKBUILD b/main/opensmtpd/APKBUILD
deleted file mode 100644
index f1752e4084e..00000000000
--- a/main/opensmtpd/APKBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Jonathan Curran <jonathan@curran.in>
-# Contributor: Shiz <hi@shiz.me>
-# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
-#
-# secfixes:
-#   6.6.2p1-r0:
-#     - CVE-2020-7247
-pkgname=opensmtpd
-pkgver=6.6.4p1
-pkgrel=0
-pkgdesc="Secure, reliable, lean, and easy-to configure SMTP server"
-url="https://www.opensmtpd.org/"
-arch="all"
-license="ISC"
-depends="!postfix ca-certificates"
-makedepends="automake autoconf libtool mdocml db-dev libasr-dev libevent-dev
-	fts-dev zlib-dev openssl-dev bison flex-dev"
-install="$pkgname.pre-install"
-subpackages="$pkgname-dbg $pkgname-doc"
-source="https://www.opensmtpd.org/archives/opensmtpd-$pkgver.tar.gz
-	smtpd.initd
-	aliases
-	autoconf-decl-checks.patch
-	smtpd.conf.patch
-	"
-options="suid !check"
-
-build() {
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/smtpd \
-		--with-libssl=/usr/include/openssl \
-		--mandir=/usr/share/man \
-		--libexecdir=/usr/lib \
-		--with-path-mbox=/var/mail \
-		--with-table-db \
-		--with-user-queue=smtpq \
-		--with-group-queue=smtpq \
-		--with-user-smtpd=smtpd \
-		--with-path-socket=/run \
-		--with-libs="-lfts" \
-		--with-pie \
-		--with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \
-		--with-mantype=doc
-	make
-}
-
-package() {
-	make DESTDIR="$pkgdir" -C "$builddir" install
-
-	install -Dm755 "$srcdir"/smtpd.initd "$pkgdir"/etc/init.d/smtpd
-	install -Dm644 "$srcdir"/aliases "$pkgdir"/etc/smtpd/aliases
-
-	# Create compatibility symlinks for mailq, newaliases, makemap and sendmail.
-	local binary; for binary in mailq newaliases makemap sendmail; do
-		ln -s /usr/sbin/smtpctl "$pkgdir"/usr/sbin/$binary
-	done
-}
-
-sha512sums="267307c91f4fcf21624b0897dfb1f5638b77da7b8d9a02211d734ed2cc5bd39ea7542ae7f200255e2945518fbe7609a0e5aa4e5c6dcb8146014f08b3845c108b  opensmtpd-6.6.4p1.tar.gz
-d544d873e37a503f07808cf2fe0e14736b88401c1dfa08631c1ea49b7237733e2d0cbb3685e695854ae66227f129bb18e9d7e57cd617164017144d7ba00954eb  smtpd.initd
-51d47b34eb3d728daa45f29d6434cc75db28dfa69b6fb3ecd873121df85b296a2d2c81016d765a07778aa26a496e4b29c09a30b82678cf42596a536734b5deca  aliases
-37104cc605569f142ceffa902f200e8a7e9e1114ebe5394ed1eac0ed6ce25454e1610270921c45246de8396eee04b7c8ab5a112a231036a6ef14e7e229b264e3  autoconf-decl-checks.patch
-14ff3d4f56aee3a31551ea535c4a5bf9b760f0f11bc269225d7b176d5031294716133cbf4555a92e76cc6e33de89454435562672ddaf1ab365e61085eb1e4d53  smtpd.conf.patch"
diff --git a/main/opensmtpd/aliases b/main/opensmtpd/aliases
deleted file mode 100644
index 02c802dd4a5..00000000000
--- a/main/opensmtpd/aliases
+++ /dev/null
@@ -1,63 +0,0 @@
-#  Aliases in this file will NOT be expanded in the header from
-#  Mail, but WILL be visible over networks or from /usr/lib/opensmtpd/mail.local.
-#
-#	>>>>>>>>>>	The program "newaliases" must be run after
-#	>> NOTE >>	this file is updated for any changes to
-#	>>>>>>>>>>	show through to smtpd.
-#
-
-# Well-known aliases -- this should be filled in!
-# root: your-every-day-user
-
-# Basic system aliases -- these MUST be present
-MAILER-DAEMON: postmaster
-postmaster: root
-operator: root
-
-# General redirections for important pseudo accounts
-daemon:	root
-uucp: root
-
-# Redirections for pseudo accounts that should not receive mail
-bin: /dev/null
-adm: /dev/null
-lp: /dev/null
-sync: /dev/null
-shutdown: /dev/null
-halt: /dev/null
-mail: /dev/null
-news: /dev/null
-man: /dev/null
-cron: /dev/null
-ftp: /dev/null
-sshd: /dev/null
-at: /dev/null
-squid: /dev/null
-gdm: /dev/null
-xfs: /dev/null
-games: /dev/null
-named: /dev/null
-mysql: /dev/null
-postgres: /dev/null
-apache: /dev/null
-nut: /dev/null
-cyrus: /dev/null
-vpopmail: /dev/null
-ntp: /dev/null
-postfix: /dev/null
-smmsp: /dev/null
-distcc: /dev/null
-guest: /dev/null
-nobody: /dev/null
-
-# RFC 2142: NETWORK OPERATIONS MAILBOX NAMES
-abuse:		root
-# noc:		root
-security:	root
-
-# RFC 2142: SUPPORT MAILBOX NAMES FOR SPECIFIC INTERNET SERVICES
-# hostmaster:	root
-# usenet:	root
-# news:		usenet
-# webmaster:	root
-# ftp:		root
\ No newline at end of file
diff --git a/main/opensmtpd/autoconf-decl-checks.patch b/main/opensmtpd/autoconf-decl-checks.patch
deleted file mode 100644
index c7823879e18..00000000000
--- a/main/opensmtpd/autoconf-decl-checks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/smtpd/to.c
-+++ b/smtpd/to.c
-@@ -210,7 +210,7 @@
- #if HAVE_STRUCT_TM_TM_GMTOFF
- 	offset = lt->tm_gmtoff;
- 	tz = lt->tm_zone;
--#elif defined HAVE_DECL_ALTZONE && defined HAVE_DECL_TIMEZONE
-+#elif HAVE_DECL_ALTZONE && HAVE_DECL_TIMEZONE
- 	offset = lt->tm_isdst > 0 ? altzone : timezone;
- 	tz = lt->tm_isdst > 0 ? tzname[1] : tzname[0];
- #endif
diff --git a/main/opensmtpd/opensmtpd.pre-install b/main/opensmtpd/opensmtpd.pre-install
deleted file mode 100644
index 2c3f80dcf40..00000000000
--- a/main/opensmtpd/opensmtpd.pre-install
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-addgroup -S smtpd 2>/dev/null
-addgroup -S smtpq 2>/dev/null
-adduser -S -D -H -h /dev/null -s /sbin/nologin -G smtpd -g 'SMTP Daemon' smtpd 2>/dev/null
-adduser -S -D -H -h /dev/null -s /sbin/nologin -G smtpq -g 'SMTPD Queue' smtpq 2>/dev/null
-mkdir -p /var/mail
-
-exit 0
diff --git a/main/opensmtpd/smtpd.conf.patch b/main/opensmtpd/smtpd.conf.patch
deleted file mode 100644
index aa5e4b86358..00000000000
--- a/main/opensmtpd/smtpd.conf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-"listen on localhost" and "listen on all" doesn't work on Linux
-
---- a/smtpd/smtpd.conf
-+++ b/smtpd/smtpd.conf
-@@ -3,11 +3,11 @@
- # This is the smtpd server system-wide configuration file.
- # See smtpd.conf(5) for more information.
- 
--table aliases file:/etc/mail/aliases
-+table aliases file:/etc/smtpd/aliases
- 
--# To accept external mail, replace with: listen on all
-+# To accept external mail, add something like: listen on eth0
- #
--listen on localhost
-+listen on lo
- 
- action "local" mbox alias <aliases>
- action "relay" relay
diff --git a/main/opensmtpd/smtpd.initd b/main/opensmtpd/smtpd.initd
deleted file mode 100644
index 9117fe3f826..00000000000
--- a/main/opensmtpd/smtpd.initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-extra_commands="checkconfig"
-description_checkconfig="Check the configuration file for validity"
-
-name="OpenSMTPD"
-
-command=/usr/sbin/smtpd
-command_args="-F ${command_args:-$SMTPD_OPTS}"  # SMTPD_OPTS is deprecated
-command_background=yes
-
-pidfile=/run/$RC_SVCNAME.pid
-required_files=/etc/smtpd/smtpd.conf
-
-depend() {
-	need net localmount
-	after bootmisc firewall
-	use logger dns
-	provide mta
-}
-
-start_pre() {
-	checkconfig
-}
-
-checkconfig() {
-	# Don't output anything unless something is *not* ok.
-	output=$($command -n 2>&1)
-	ret=$?
-
-	[ $ret -ne 0 ] && echo $output 1>&2
-	return $ret
-}
diff --git a/main/opensp/APKBUILD b/main/opensp/APKBUILD
index aaddb74dbc2..b0a408498a1 100644
--- a/main/opensp/APKBUILD
+++ b/main/opensp/APKBUILD
@@ -4,32 +4,24 @@
 pkgname=opensp
 _realname=OpenSP
 pkgver=1.5.2
-pkgrel=0
+pkgrel=5
 pkgdesc="Implementation of the DSSSL style language"
-url="http://openjade.sourceforge.net"
+url="https://openjade.sourceforge.net/"
 arch="all"
-license="custom"
-depends=""
-depends_dev=""
+license="ICU"
 makedepends="$depends_dev xmlto"
-install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://prdownloads.sourceforge.net/openjade/$_realname-$pkgver.tar.gz
-	opensp-1.5-install.patch"
+	opensp-1.5-install.patch
+	removed-failing-tests.patch"
+builddir="$srcdir"/$_realname-$pkgver
 
-_builddir="$srcdir"/$_realname-$pkgver
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -39,17 +31,28 @@ build() {
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
 		--disable-static \
-		--enable-shared \
-		|| return 1
-	make || return 1
+		--enable-shared
+	make
+}
+
+check() {
+	make check
+}
+
+lang() {
+	default_lang
+	mkdir -p "$subpkgdir"/usr/share/$pkgname
+	mv "$subpkgdir"/usr/share/locale "$subpkgdir"/usr/share/$pkgname
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 "$_builddir"/COPYING \
-		"$pkgdir"/usr/share/licenses/$pkgname/COPYING || return 1
+	make DESTDIR="$pkgdir" install
+	install -Dm644 "$builddir"/COPYING \
+		"$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e  OpenSP-1.5.2.tar.gz
-6d4cddb3c98313643ef7ab57ce154dd8a188b7ea8edc608a62ff25e4f995ab4167be94e40c2a62ae568e22e1ada4bd9bf0c9687e4dfa43dafde4d87e8b73fdf8  opensp-1.5-install.patch"
+sha512sums="
+a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e  OpenSP-1.5.2.tar.gz
+6d4cddb3c98313643ef7ab57ce154dd8a188b7ea8edc608a62ff25e4f995ab4167be94e40c2a62ae568e22e1ada4bd9bf0c9687e4dfa43dafde4d87e8b73fdf8  opensp-1.5-install.patch
+4d32af7936193281b621b40a7d8248e61ffb100960a4d07a03b52f47102e8fa47f823d01b059860408cce469404a0cd6f63d4201b976730565a8196872b8d4d3  removed-failing-tests.patch
+"
diff --git a/main/opensp/removed-failing-tests.patch b/main/opensp/removed-failing-tests.patch
new file mode 100644
index 00000000000..28f99773314
--- /dev/null
+++ b/main/opensp/removed-failing-tests.patch
@@ -0,0 +1,52 @@
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 2ea8cb1..fa491ec 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -16,20 +16,20 @@ af-18 af-19
+
+ # These tests currently fail, but should not.  The problems need to be tracked
+ # down and fixed, then the tests moved to TESTS_THAT_PASS.
+-TESTS_THAT_FAIL = catalog-2 \
+-af-7 af-8 af-9 af-10 af-11
++#TESTS_THAT_FAIL = catalog-2 \
++#af-7 af-8 af-9 af-10 af-11
+
+-SHOWSTOPPERS = $(TESTS_THAT_FAIL)
++#SHOWSTOPPERS = $(TESTS_THAT_FAIL)
+
+ DTDDECL_TEST = catalog-1
+
+-TESTS = $(TESTS_THAT_PASS) $(SHOWSTOPPERS)
++TESTS = $(TESTS_THAT_PASS)
+
+ if DTDDECL
+ TESTS += $(DTDDECL_TEST)
+ endif
+
+-EXTRA_DIST = $(TESTS_THAT_PASS) $(TESTS_THAT_FAIL) $(DTDDECL_TEST)
++EXTRA_DIST = $(TESTS_THAT_PASS) $(DTDDECL_TEST)
+
+
+ TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index 19b6648..500caec 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -220,13 +220,12 @@ af-18 af-19
+
+ # These tests currently fail, but should not.  The problems need to be tracked
+ # down and fixed, then the tests moved to TESTS_THAT_PASS.
+-TESTS_THAT_FAIL = catalog-2 \
+-af-7 af-8 af-9 af-10 af-11
++# TESTS_THAT_FAIL = catalog-2 \
++# af-7 af-8 af-9 af-10 af-11
+
+-SHOWSTOPPERS = $(TESTS_THAT_FAIL)
+ DTDDECL_TEST = catalog-1
+-TESTS = $(TESTS_THAT_PASS) $(SHOWSTOPPERS) $(am__append_1)
+-EXTRA_DIST = $(TESTS_THAT_PASS) $(TESTS_THAT_FAIL) $(DTDDECL_TEST)
++TESTS = $(TESTS_THAT_PASS) $(am__append_1)
++EXTRA_DIST = $(TESTS_THAT_PASS) $(DTDDECL_TEST)
+ TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
+	PATH=.:../nsgmls:../sgmlnorm:../sx:../spent:../spcat:../spam:$$PATH \
+	ONSGMLS=`echo onsgmls|sed '$(transform)'`\
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD
index bcbd4eed026..0b8feae7602 100644
--- a/main/openssh/APKBUILD
+++ b/main/openssh/APKBUILD
@@ -1,45 +1,72 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
+# Contributor: Will Sinatra <wpsinatra@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openssh
-pkgver=8.2_p1
+pkgver=9.7_p1
 _myver=${pkgver%_*}${pkgver#*_}
-pkgrel=0
+pkgrel=3
 pkgdesc="Port of OpenBSD's free SSH release"
 url="https://www.openssh.com/portable.html"
 arch="all"
-license="BSD"
-options="!check suid" # FIXME: tests fails. disable for now
+license="SSH-OpenSSH"
+options="suid"
 depends="openssh-client openssh-sftp-server openssh-server"
-makedepends_build="linux-pam-dev"
-makedepends_host="openssl-dev zlib-dev libedit-dev linux-headers"
+makedepends_build="autoconf automake"
+makedepends_host="
+	linux-headers
+	openssl-dev>3
+	zlib-dev
+	"
+#
+# NOTE: if you edit this file, please make sure that it builds with `BOOTSTRAP=1 abuild -r`
+#
+# build bootstrap sshd without libedit, linux-pam and krb5
+if [ -z "$BOOTSTRAP" ]; then
+	makedepends_host="$makedepends_host libedit-dev linux-pam-dev krb5-dev libfido2-dev
+		utmps-dev utmps-static"
+	subpackages="$pkgname-client-krb5:_client_krb5
+		$pkgname-server-pam:_server_with_flavor
+		$pkgname-server-krb5:_server_with_flavor
+		$pkgname-sk-helper:_ssh_sk_helper"
+fi
+
 makedepends="$makedepends_build $makedepends_host"
-# Add more packages support here e.g. kerberos
-_pkgsupport=""
-[ -z "$BOOTSTRAP" ] && _pkgsupport="pam"
+
 subpackages="$pkgname-dbg
+	$subpackages
 	$pkgname-doc
 	$pkgname-keygen
-	$pkgname-client
+	$pkgname-client-default:_client_default
+	$pkgname-client-common:_client_common
 	$pkgname-keysign
-	$pkgname-sftp-server:sftp
-	$pkgname-server-common:server_common:noarch
+	$pkgname-sftp-server:_sftp_server
+	$pkgname-server-common:_server_common:noarch
 	$pkgname-server
+	$pkgname-server-common-openrc
 	"
-for _flavour in $_pkgsupport; do
-	subpackages="$subpackages $pkgname-server-$_flavour:_pkg_flavour"
-done
 
 source="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$_myver.tar.gz
 	fix-utmp.patch
-	sftp-interactive.patch
 	disable-forwarding-by-default.patch
-	fix-verify-dns-segfault.patch
+	avoid-redefined-warnings-when-building-with-utmps.patch
+	default-internal-sftp.patch
+	include-config-dir.patch
 
 	sshd.initd
 	sshd.confd
+	sshd.pam
 	"
+
 # secfixes:
+#   9.6_p1-r0:
+#     - CVE-2023-48795
+#   8.8_p1-r0:
+#     - CVE-2021-41617
+#   8.5_p1-r0:
+#     - CVE-2021-28041
+#   8.4_p1-r0:
+#     - CVE-2020-14145
 #   7.9_p1-r3:
 #     - CVE-2018-20685
 #     - CVE-2019-6109
@@ -53,20 +80,25 @@ source="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$_myver.tar
 #     - CVE-2016-10010
 #     - CVE-2016-10011
 #     - CVE-2016-10012
+#   0:
+#     - CVE-2023-38408
 
 builddir="$srcdir"/$pkgname-$_myver
 
-prepare() {
-	default_prepare
-	for _flavour in $_pkgsupport; do
-		cp -a "$srcdir"/$pkgname-$_myver "$srcdir"/$pkgname-$_myver-$_flavour
-	done
-}
+_do_configure() {
+	autoreconf
+	local _with_libedit="--with-libedit"
+	if [ -n "$BOOTSTRAP" ]; then
+		_with_libedit="--without-libedit"
+	fi
 
-build() {
-	export LD="$CC"
-	export TEST_SSH_UTF8=no # utf8 test fails
-	_configure_vanilla="./configure \
+	local _extra_cflags="" _extra_libs=""
+	if [ -z "$BOOTSTRAP" ]; then
+		_extra_cflags="$(pkg-config --cflags --static utmps)"
+		_extra_libs="$(pkg-config --libs --static utmps)"
+	fi
+
+	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -75,138 +107,192 @@ build() {
 		--mandir=/usr/share/man \
 		--with-pid-dir=/run \
 		--with-mantype=doc \
-		--with-ldflags='${LDFLAGS}' \
+		--with-cflags="$CFLAGS $_extra_cflags" \
+		--with-libs="$_extra_libs" \
+		--with-ldflags="$LDFLAGS" \
+		--disable-utmp \
+		--disable-wtmp \
 		--disable-lastlog \
 		--disable-strip \
-		--disable-wtmp \
 		--with-privsep-path=/var/empty \
 		--with-xauth=/usr/bin/xauth \
+		--with-default-path='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' \
 		--with-privsep-user=sshd \
-		--with-md5-passwords \
 		--with-ssl-engine \
-		--with-libedit \
-		"
-	# now we build "vanilla" openssh
-	_configure="$_configure_vanilla"
-	for _flavour in $_pkgsupport; do
-		_configure="$_configure --without-$_flavour"
-	done
-	msg "Building openssh..."
-	eval "$_configure"
-	make
+		$_with_libedit \
+		"$@"
+}
 
-	# now we build other openssh-$_flavour
-	_configure="$_configure_vanilla"
-	for _flavour in $_pkgsupport; do
-		cd "$builddir-$_flavour"
-		msg "Building openssh with $_flavour support..."
-		eval "$_configure --with-$_flavour"
+build() {
+	export LD="$CC"
+	export TEST_SSH_UTF8=no # utf8 test fails
+	local _with_security_key_builtin=
+
+	if [ -z "$BOOTSTRAP" ]; then
+		msg "Building openssh with pam support..."
+		_do_configure --without-kerberos5 --with-pam --with-pam-service=sshd
 		make
-	done
+		mv sshd sshd.pam
+
+		msg "Building openssh with kerberos5"
+		_do_configure --with-kerberos5 --with-pam
+		make
+		mv sshd sshd.krb5
+		mv ssh ssh.krb5
+
+		_with_security_key_builtin="--with-security-key-builtin"
+	fi
+
+	msg "Building openssh without pam and kerberos5"
+	_do_configure --without-kerberos5 --without-pam $_with_security_key_builtin
+	make
 }
 
 check() {
-	make tests
+	# Run all tests except the t-exec tests which fail on the
+	# builders for some reason but pass locally (needs further
+	# investigation).
+	TEST_SSH_UNSAFE_PERMISSIONS=1 make -j1 file-tests interop-tests unit
+
+	if [ -z "$BOOTSTRAP" ]; then
+		msg "verify pam build"
+		scanelf -n sshd.pam | grep libpam
+
+		msg "verify krb5 build"
+		scanelf -n sshd.krb5 | grep krb5
+		scanelf -n ssh.krb5 | grep krb5
+	fi
+
+	msg "verify minimal build"
+	for i in sshd ssh; do
+		if scanelf -n $i | grep -E '(libpam|krb5)'; then
+			error "$i should not be linked to libpam or libkrb5"
+			return 1
+		fi
+	done
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
+	if [ -z "$BOOTSTRAP" ]; then
+		install -m755 -t "$pkgdir"/usr/sbin/ sshd.pam sshd.krb5
+		install -m755 -t "$pkgdir"/usr/bin/ ssh.krb5
+		install -Dm644 "$srcdir"/sshd.pam "$pkgdir"/etc/pam.d/sshd
+	fi
+
 	mkdir -p "$pkgdir"/var/empty
+	mkdir -p "$pkgdir"/etc/ssh/ssh_config.d
+	mkdir -p "$pkgdir"/etc/ssh/sshd_config.d
+
 	install -D -m755 "$srcdir"/sshd.initd \
 		"$pkgdir"/etc/init.d/sshd
 	install -D -m644 "$srcdir"/sshd.confd \
 		"$pkgdir"/etc/conf.d/sshd
 	install -Dm644 "$builddir"/contrib/ssh-copy-id.1 \
 		"$pkgdir"/usr/share/man/man1/ssh-copy-id.1
-	sed -i 's/#UseDNS yes/UseDNS no/' "$pkgdir"/etc/ssh/sshd_config
+	install -Dm755 "$builddir"/contrib/findssl.sh \
+		"$pkgdir"/usr/bin/findssl.sh
+	install -Dm755 "$builddir"/contrib/ssh-copy-id \
+		"$pkgdir"/usr/bin/ssh-copy-id
+	install -Dm755	"$builddir"/ssh-pkcs11-helper \
+		"$pkgdir"/usr/bin/ssh-pkcs11-helper
 }
 
 keygen() {
 	pkgdesc="ssh helper program for generating keys"
-	depends=
-	install -d "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/ssh-keygen \
-		"$subpkgdir"/usr/bin/
+	depends="libcrypto3>=3.1.0"
+
+	amove usr/bin/ssh-keygen
 }
 
-client() {
+_client_krb5() {
+	pkgdesc="OpenBSD's SSH client with kerberos support"
+	depends="openssh-keygen=$pkgver-r$pkgrel openssh-client-common=$pkgver-r$pkgrel !openssh-client-default"
+	provides="openssh-client=$pkgver-r$pkgrel"
+	provider_priority=1
+
+	amove usr/bin/ssh.krb5
+	mv "$subpkgdir"/usr/bin/ssh.krb5 "$subpkgdir"/usr/bin/ssh
+}
+
+_ssh_sk_helper() {
+	pkgdesc="OpenSSH libfido2 security key helper"
+	depends="openssh-keygen=$pkgver-r$pkgrel openssh-server-common=$pkgver-r$pkgrel"
+	amove usr/lib/ssh/ssh-sk-helper
+}
+
+_client_default() {
 	pkgdesc="OpenBSD's SSH client"
-	depends="openssh-keygen"
-	install -d "$subpkgdir"/usr/bin \
-		"$subpkgdir"/usr/lib/ssh \
-		"$subpkgdir"/etc/ssh \
+	depends="openssh-keygen=$pkgver-r$pkgrel openssh-client-common=$pkgver-r$pkgrel !openssh-client-krb5"
+	provides="openssh-client=$pkgver-r$pkgrel"
+	provider_priority=2
+
+	amove usr/bin/ssh
+}
+
+_client_common() {
+	pkgdesc="OpenBSD's SSH client common files"
+	depends="libcrypto3>=3.1.0"
+
+	install -d "$subpkgdir"/usr/lib/ssh \
 		"$subpkgdir"/var/empty
 
-	mv "$pkgdir"/usr/bin/* \
-		"$subpkgdir"/usr/bin/
-	mv "$pkgdir"/etc/ssh/ssh_config \
-		"$pkgdir"/etc/ssh/moduli \
-		"$subpkgdir"/etc/ssh/
-	install -Dm755 "$builddir"/contrib/findssl.sh \
-		"$subpkgdir"/usr/bin/findssl.sh
-	install -Dm755 "$builddir"/contrib/ssh-copy-id \
-		"$subpkgdir"/usr/bin/ssh-copy-id
-	install -Dm755	"$builddir"/ssh-pkcs11-helper \
-		"$subpkgdir"/usr/bin/ssh-pkcs11-helper
+	amove usr/bin
+	amove etc/ssh/ssh_config
+	amove etc/ssh/ssh_config.d
+	amove etc/ssh/moduli
 }
 
 keysign() {
 	pkgdesc="ssh helper program for host-based authentication"
-	depends="openssh-client"
-	install -d "$subpkgdir"/usr/lib/ssh
-	mv "$pkgdir"/usr/lib/ssh/ssh-keysign \
-		"$subpkgdir"/usr/lib/ssh/
+	depends="openssh-client=$pkgver-r$pkgrel libcrypto3>=3.1.0"
+
+	amove usr/lib/ssh/ssh-keysign
 }
 
-sftp() {
+_sftp_server() {
 	pkgdesc="ssh sftp server module"
 	depends=""
-	install -d "$subpkgdir"/usr/lib/ssh
-	mv "$pkgdir"/usr/lib/ssh/sftp-server \
-		"$subpkgdir"/usr/lib/ssh/
+
+	amove usr/lib/ssh/sftp-server
 }
 
-server_common() {
+_server_common() {
 	pkgdesc="OpenSSH server configuration files"
 	depends=""
-	for i in etc/ssh/sshd_config \
-		etc/init.d/sshd \
-		etc/conf.d/sshd; do
 
-		install -d "$subpkgdir"/${i%/*}
-		mv "$pkgdir"/$i \
-			"$subpkgdir"/${i%/*}/
-
-	done
+	amove etc/ssh/sshd_config
+	amove etc/ssh/sshd_config.d
 }
 
 server() {
 	pkgdesc="OpenSSH server"
-	depends="openssh-keygen openssh-server-common"
-	cd "$builddir"
-	install -d "$subpkgdir"/usr/sbin
-	mv "$pkgdir"/usr/sbin/sshd "$subpkgdir"/usr/sbin/
-}
+	depends="openssh-keygen=$pkgver-r$pkgrel openssh-server-common=$pkgver-r$pkgrel"
 
-_server() {
-	cd "$builddir"
-	install -d "$subpkgdir"/usr/sbin
-	mv "$1"/sshd "$subpkgdir"/usr/sbin/
+	amove usr/sbin/sshd
 }
 
-_pkg_flavour() {
-	pkgdesc="OpenSSH server with $_flavour support"
-	depends="openssh-keygen openssh-server-common"
-	for _flavour in $_pkgsupport; do
-		cd "$builddir"-$_flavour
-		_server "$builddir"-$_flavour
-	done
+_server_with_flavor() {
+	local _flavor="${subpkgname#openssh-server-}"
+	pkgdesc="OpenSSH server with $_flavor support"
+	depends="openssh-keygen=$pkgver-r$pkgrel openssh-server-common=$pkgver-r$pkgrel"
+
+	# pam flavor also ships a pam entry
+	if [ "$_flavor" = "pam" ]; then
+		amove etc/pam.d/sshd
+	fi
+
+	amove usr/sbin/sshd.$_flavor
 }
 
-sha512sums="c4db64e52a3a4c410de9de49f9cb104dd493b10250af3599b92457dd986277b3fd99a6f51cec94892fd1be5bd0369c5757262ea7805f0de464b245c3d34c120a  openssh-8.2p1.tar.gz
-f35fffcd26635249ce5d820e7b3e406e586f2d2d7f6a045f221e2f9fb53aebc1ab1dd1e603b3389462296ed77921a1d08456e7aaa3825cbed08f405b381a58e1  fix-utmp.patch
-c1d09c65dbc347f0904edc30f91aa9a24b0baee50309536182455b544f1e3f85a8cecfa959e32be8b101d8282ef06dde3febbbc3f315489339dcf04155c859a9  sftp-interactive.patch
+sha512sums="
+0cafc17d22851605a4a5495a1d82c2b3fbbe6643760aad226dbf2a25b5f49d4375c3172833706ea3cb6c05d5d02a40feb9a7e790eae5c4570dd344a43e94ca55  openssh-9.7p1.tar.gz
+b10a9eb167cfbb23b144fdb03f30a0363be9a715ceb3c202c971ec4f36160e434cc6bbad91d0e49106189e07152067f7e227df28b5a1b82f3901cb36cba321b5  fix-utmp.patch
 8df35d72224cd255eb0685d2c707b24e5eb24f0fdd67ca6cc0f615bdbd3eeeea2d18674a6af0c6dab74c2d8247e2370d0b755a84c99f766a431bc50c40b557de  disable-forwarding-by-default.patch
-b0d1fc89bd46ebfc8c7c00fd897732e67a6cda996811c14d99392685bb0b508b52c9dc3188b1a84c0ffa3f72f57189cc615a76b81796dd1b5f552542bd53f84d  fix-verify-dns-segfault.patch
-8122ac1838586a1487dad1f70ed2ec8161ae57b4a7ee8bfef9757b590aa76a887a6c5e5f2575728da4c6c2f00d2a924360e23d84a4df204d7021b44b690cb2f8  sshd.initd
-ec506156c286e5b28a530e9964dd68b7f6c9e881fbc47247a988e52a1f9cd50cbfaf4955c96774f9e2508d8b734c4abf98785fbaa75ae6249e3464b5495f1afc  sshd.confd"
+e85754b2b6c4c37b432d166e63d6293e58c9c8bb6ebd8d3527c83afa2337f14c06d6a4e008ffcc0afd7dc3409e960b89c1dde41d2543c4be7d4813d477ff3a5e  avoid-redefined-warnings-when-building-with-utmps.patch
+1fb55aae445dfd9ededeba1f204a0c3e4a752128ad0a388f473ace074e68b040112f309192243621fd4f16b0d1cce4f083612b1639c3e18166abf92babe52c93  default-internal-sftp.patch
+ff73563e6018e94a1b2dd320cf32426f3945c0f4aa509eeb95783c34dd5c5c8dec91f6d71e4d538c4735539a4d8c724cf61d71513887d8a96b84109ae3a5562e  include-config-dir.patch
+2cab1b844d4efb53f848308b4aaedbe74888d2e85bcb2e4dfdae7c18ac3ecea707829072a4276fbe90dfe2f537bbf48127d96f29ec5154e96c0bfb7437910d53  sshd.initd
+be7dd5f6d319b2e03528525a66a58310d43444606713786b913a17a0fd9311869181d0fb7927a185d71d392674857dea3c97b6b8284886227d47b36193471a09  sshd.confd
+5d3b62d724d930bafb6263d0600828771e667751cb5ba5070414dce7c3d0559bebdfb05960b721cfd20c81d3ad824291ffb10498798171c8bbbcbf389b706265  sshd.pam
+"
diff --git a/main/openssh/avoid-redefined-warnings-when-building-with-utmps.patch b/main/openssh/avoid-redefined-warnings-when-building-with-utmps.patch
new file mode 100644
index 00000000000..54ae55dd28a
--- /dev/null
+++ b/main/openssh/avoid-redefined-warnings-when-building-with-utmps.patch
@@ -0,0 +1,16 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Wed, 15 Dec 2021 22:37:42 +0100
+Subject: [PATCH] Avoid redefined warnings when building with utmps
+
+--- a/includes.h
++++ b/includes.h
+@@ -62,6 +62,9 @@
+ #endif
+ 
+ #ifdef HAVE_UTMP_H
++/* _PATH_UTMP and _PATH_WTMP are defined both in paths.h and utmps/utmp.h. */
++#  undef _PATH_UTMP
++#  undef _PATH_WTMP
+ #  include <utmp.h>
+ #endif
+ #ifdef HAVE_UTMPX_H
diff --git a/main/openssh/default-internal-sftp.patch b/main/openssh/default-internal-sftp.patch
new file mode 100644
index 00000000000..5128410a8d9
--- /dev/null
+++ b/main/openssh/default-internal-sftp.patch
@@ -0,0 +1,14 @@
+set the default sftp to internal.
+this is better than the extra one, because it requires no extra support files
+with ChrootDirectory, and it does not fork so it is faster.
+--- a/sshd_config
++++ b/sshd_config
+@@ -107,7 +107,7 @@
+ #Banner none
+ 
+ # override default of no subsystems
+-Subsystem	sftp	/usr/libexec/sftp-server
++Subsystem	sftp	internal-sftp
+ 
+ # Example of overriding settings on a per-user basis
+ #Match User anoncvs
diff --git a/main/openssh/fix-utmp.patch b/main/openssh/fix-utmp.patch
index 275e80590dd..8add964c236 100644
--- a/main/openssh/fix-utmp.patch
+++ b/main/openssh/fix-utmp.patch
@@ -1,6 +1,29 @@
---- openssh-6.8p1.orig/loginrec.c	2015-03-17 07:49:20.000000000 -0200
-+++ openssh-6.8p1/loginrec.c	2015-03-19 10:45:45.780276841 -0200
-@@ -783,7 +783,7 @@
+diff -rNU3 openssh-9.0p1.old/loginrec.c openssh-9.0p1/loginrec.c
+--- openssh-9.0p1.old/loginrec.c	2022-04-06 02:47:48.000000000 +0200
++++ openssh-9.0p1/loginrec.c	2022-07-11 14:59:44.848827188 +0200
+@@ -763,10 +763,6 @@
+ 	set_utmpx_time(li, utx);
+ 	utx->ut_pid = li->pid;
+ 
+-	/* strncpy(): Don't necessarily want null termination */
+-	strncpy(utx->ut_user, li->username,
+-	    MIN_SIZEOF(utx->ut_user, li->username));
+-
+ 	if (li->type == LTYPE_LOGOUT)
+ 		return;
+ 
+@@ -775,6 +771,10 @@
+ 	 * for logouts.
+ 	 */
+ 
++	/* strncpy(): Don't necessarily want null termination */
++	strncpy(utx->ut_user, li->username,
++	    MIN_SIZEOF(utx->ut_user, li->username));
++
+ # ifdef HAVE_HOST_IN_UTMPX
+ 	strncpy(utx->ut_host, li->hostname,
+ 	    MIN_SIZEOF(utx->ut_host, li->hostname));
+@@ -787,7 +787,7 @@
  	if (li->hostaddr.sa.sa_family == AF_INET)
  		utx->ut_addr = li->hostaddr.sa_in.sin_addr.s_addr;
  # endif
diff --git a/main/openssh/fix-verify-dns-segfault.patch b/main/openssh/fix-verify-dns-segfault.patch
deleted file mode 100644
index 11b65c28971..00000000000
--- a/main/openssh/fix-verify-dns-segfault.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Handle case when answer=NULL due to zero answers
-
-diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
-index dc6fe05..28622b5 100644
---- a/openbsd-compat/getrrsetbyname.c
-+++ b/openbsd-compat/getrrsetbyname.c
-@@ -268,7 +268,7 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
- 	}
- 	rrset->rri_rdclass = response->query->class;
- 	rrset->rri_rdtype = response->query->type;
--	rrset->rri_ttl = response->answer->ttl;
-+	rrset->rri_ttl = response->answer ? response->answer->ttl : 0;
- 	rrset->rri_nrdatas = response->header.ancount;
- 
- #ifdef HAVE_HEADER_AD
-@@ -276,6 +276,17 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
- 	if (response->header.ad == 1)
- 		rrset->rri_flags |= RRSET_VALIDATED;
- #endif
-+	/* allocate memory for signatures */
-+	if (rrset->rri_nsigs > 0) {
-+		rrset->rri_sigs = calloc(rrset->rri_nsigs, sizeof(struct rdatainfo));
-+		if (rrset->rri_sigs == NULL) {
-+			result = ERRSET_NOMEMORY;
-+			goto fail;
-+		}
-+	}
-+
-+	if (response->answer == NULL || response->header.ancount == 0)
-+		goto done;
- 
- 	/* copy name from answer section */
- 	rrset->rri_name = strdup(response->answer->name);
-@@ -298,15 +309,6 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
- 		goto fail;
- 	}
- 
--	/* allocate memory for signatures */
--	if (rrset->rri_nsigs > 0) {
--		rrset->rri_sigs = calloc(rrset->rri_nsigs, sizeof(struct rdatainfo));
--		if (rrset->rri_sigs == NULL) {
--			result = ERRSET_NOMEMORY;
--			goto fail;
--		}
--	}
--
- 	/* copy answers & signatures */
- 	for (rr = response->answer, index_ans = 0, index_sig = 0;
- 	    rr; rr = rr->next) {
-@@ -334,6 +336,7 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
- 	}
- 	free_dns_response(response);
- 
-+done:
- 	*res = rrset;
- 	return (ERRSET_SUCCESS);
- 
diff --git a/main/openssh/include-config-dir.patch b/main/openssh/include-config-dir.patch
new file mode 100644
index 00000000000..c4ad935b657
--- /dev/null
+++ b/main/openssh/include-config-dir.patch
@@ -0,0 +1,26 @@
+--- a/ssh_config
++++ b/ssh_config
+@@ -17,6 +17,10 @@
+ # list of available options, their meanings and defaults, please see the
+ # ssh_config(5) man page.
+ 
++# Include configuration snippets before processing this file to allow the
++# snippets to override directives set in this file.
++Include /etc/ssh/ssh_config.d/*.conf
++
+ # Host *
+ #   ForwardAgent no
+ #   ForwardX11 no
+--- a/sshd_config
++++ b/sshd_config
+@@ -10,6 +10,10 @@
+ # possible, but leave them commented.  Uncommented options override the
+ # default value.
+ 
++# Include configuration snippets before processing this file to allow the
++# snippets to override directives set in this file.
++Include /etc/ssh/sshd_config.d/*.conf
++
+ #Port 22
+ #AddressFamily any
+ #ListenAddress 0.0.0.0
diff --git a/main/openssh/sftp-interactive.patch b/main/openssh/sftp-interactive.patch
deleted file mode 100644
index ab14f3a6ba2..00000000000
--- a/main/openssh/sftp-interactive.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/sftp.c	2014-10-24 10:32:15.793544472 +0500
-+++ b/sftp.c	2014-10-24 10:35:22.329199875 +0500
-@@ -2076,8 +2076,10 @@
- 		signal(SIGINT, SIG_IGN);
- 
- 		if (el == NULL) {
--			if (interactive)
-+			if (interactive) {
- 				printf("sftp> ");
-+				fflush(stdout);
-+			}
- 			if (fgets(cmd, sizeof(cmd), infile) == NULL) {
- 				if (interactive)
- 					printf("\n");
diff --git a/main/openssh/sshd.confd b/main/openssh/sshd.confd
index 0eac79dc63d..8c4444444e8 100644
--- a/main/openssh/sshd.confd
+++ b/main/openssh/sshd.confd
@@ -6,3 +6,21 @@
 # Any random options you want to pass to sshd.
 # See the sshd(8) manpage for more info.
 #command_args=""
+
+# Space-separated list of SSH host key types to generate if they do
+# not already exist. An empty value means generate all of the default
+# set of dsa, ecdsa, ed25519, and rsa types.
+#
+# Example: "ed25519 rsa".
+#
+#key_types_to_generate=""
+
+# The number of bits to use for a generated ECDSA SSH host key.
+# Defaults to 256 bits if not set.
+#
+#ecdsa_bit_size="256"
+
+# Number of bits for use for a generated RSA SSH host key.
+# Defaults to 3072 bits if not set.
+#
+#rsa_bit_size="3072"
diff --git a/main/openssh/sshd.initd b/main/openssh/sshd.initd
index 529be7474a3..2221d0f7c44 100644
--- a/main/openssh/sshd.initd
+++ b/main/openssh/sshd.initd
@@ -8,8 +8,8 @@ extra_commands="checkconfig"
 extra_started_commands="reload"
 
 # NOTE: SSHD_* variables are deprecated and will be removed in future!
-: ${sshd_disable_keygen:="${SSHD_DISABLE_KEYGEN:-"no"}"}
-: ${cfgfile:=${SSHD_CONFIG:-"${SSHD_CONFDIR:-"/etc/ssh"}/sshd_config"}}
+: "${sshd_disable_keygen:="${SSHD_DISABLE_KEYGEN:-"no"}"}"
+: "${cfgfile:=${SSHD_CONFIG:-"${SSHD_CONFDIR:-"/etc/ssh"}/sshd_config"}}"
 
 pidfile="${SSHD_PIDFILE:-"/run/$RC_SVCNAME.pid"}"
 command="${SSHD_BINARY:-"/usr/sbin/sshd"}"
@@ -17,6 +17,46 @@ command_args="${command_args:-${SSHD_OPTS:-}}"
 
 required_files="$cfgfile"
 
+generate_host_key_type() {
+	local bit_size key_type
+
+	key_type=$1
+	if [ ! -f /etc/ssh/ssh_host_"${key_type}"_key ]; then
+		case $key_type in
+			ecdsa)	bit_size="$ecdsa_bit_size";;
+			rsa)	bit_size="$rsa_bit_size";;
+		esac
+		einfo "Generating $key_type SSH host key..."
+		ssh-keygen \
+			-q \
+			-f /etc/ssh/ssh_host_"$key_type"_key \
+			-N '' \
+			-t "$key_type" \
+			${bit_size:+ -b ${bit_size}} || return 1
+	fi
+}
+
+generate_host_keys() {
+	local type
+
+	if [ -z "$key_types_to_generate" ] &&
+	   [ -z "$ecdsa_bit_size" ] && [ -z "$rsa_bit_size" ]; then
+		ssh-keygen -A
+		return
+	fi
+	for type in ${key_types_to_generate:-dsa ecdsa ed25519 rsa}; do
+		generate_host_key_type "$type" || return 1
+	done
+}
+
+get_conf() {
+	awk "/^$1\s/{ print \$2; exit }" "$cfgfile" /etc/ssh/sshd_config.d/*.conf 2>/dev/null
+}
+
+conf_enabled() {
+	[ "$(get_conf "$1")" = "yes" ]
+}
+
 depend() {
 	use logger dns
 	after entropy
@@ -25,7 +65,8 @@ depend() {
 		: # Do nothing, the user has explicitly set rc_need
 	else
 		local x warn_addr
-		for x in $(awk '/^ListenAddress/{ print $2 }' "$cfgfile" 2>/dev/null) ; do
+		# shellcheck disable=SC2013
+		for x in $(get_conf ListenAddress) ; do
 			case "$x" in
 				0.0.0.0|0.0.0.0:*) ;;
 				::|\[::\]*) ;;
@@ -42,7 +83,16 @@ depend() {
 	fi
 }
 
+update_command() {
+	if conf_enabled KerberosAuthentication || conf_enabled GSSAPIAuthentication && [ -r /usr/sbin/sshd.krb5 ]; then
+		command="${SSHD_BINARY:-"/usr/sbin/sshd.krb5"}"
+	elif conf_enabled UsePAM && [ -r /usr/sbin/sshd.pam ]; then
+		command="${SSHD_BINARY:-"/usr/sbin/sshd.pam"}"
+	fi
+}
+
 checkconfig() {
+	update_command
 	warn_deprecated_var SSHD_BINARY
 	warn_deprecated_var SSHD_CONFDIR
 	warn_deprecated_var SSHD_CONFIG cfgfile
@@ -55,7 +105,7 @@ checkconfig() {
 	fi
 
 	if ! yesno "$sshd_disable_keygen"; then
-		ssh-keygen -A || return 1
+		generate_host_keys || return 1
 	fi
 
 	[ "$pidfile" != "/run/sshd.pid" ] \
@@ -64,6 +114,7 @@ checkconfig() {
 	[ "$cfgfile" != "/etc/ssh/sshd_config" ] \
 		&& command_args="$command_args -f $cfgfile"
 
+	# shellcheck disable=SC2086
 	"$command" -t $command_args || return 1
 }
 
@@ -71,20 +122,19 @@ start_pre() {
 	checkconfig
 }
 
-stop() {
+stop_pre() {
+	update_command
 	if [ "${RC_CMD}" = "restart" ] ; then
 		checkconfig || return 1
 	fi
+}
 
-	ebegin "Stopping $RC_SVCNAME"
-	start-stop-daemon --stop --exec "$command" \
-		--pidfile "$pidfile" --quiet
-	eend $?
-
+stop_post() {
 	if [ "$RC_RUNLEVEL" = "shutdown" ]; then
-		_sshd_pids=$(pgrep "${command##*/}")
+		_sshd_pids=$(pgrep "${command##*/}:")
 		if [ -n "$_sshd_pids" ]; then
 			ebegin "Shutting down ssh connections"
+			# shellcheck disable=SC2086
 			kill -TERM $_sshd_pids >/dev/null 2>&1
 			eend 0
 		fi
@@ -107,5 +157,6 @@ warn_deprecated_var() {
 	eval "test -n \"\$$varname\"" || return 0
 
 	ewarn "Variable \$$varname is deprecated and will be removed in the future!"
+	# shellcheck disable=SC2015
 	[ "$replacement" ] && ewarn "Use \$$replacement instead of \$$varname." ||:
 }
diff --git a/main/openssh/sshd.pam b/main/openssh/sshd.pam
new file mode 100644
index 00000000000..fab227a8982
--- /dev/null
+++ b/main/openssh/sshd.pam
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth      include   base-auth
+account   include   base-account
+password  include   base-password
+session   include   base-session
diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD
index 0eccb6cda16..ce0902cd985 100644
--- a/main/openssl/APKBUILD
+++ b/main/openssl/APKBUILD
@@ -1,24 +1,92 @@
-# Maintainer: Timo Teras <timo.teras@iki.fi>
+# Contributor: Ariadne Conill <ariadne@dereferenced.org>
+# Contributor: Timo Teras <timo.teras@iki.fi>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openssl
-pkgver=1.1.1f
-_abiver=${pkgver%.*}
-pkgrel=0
+pkgver=3.3.0
+_abiver=${pkgver%.*.*}
+pkgrel=1
 pkgdesc="Toolkit for Transport Layer Security (TLS)"
 url="https://www.openssl.org/"
 arch="all"
-license="OpenSSL"
-replaces="libressl"
+license="Apache-2.0"
+replaces="openssl"
 makedepends_build="perl"
 makedepends_host="linux-headers"
 makedepends="$makedepends_host $makedepends_build"
 subpackages="$pkgname-dbg $pkgname-libs-static $pkgname-dev $pkgname-doc
-	libcrypto$_abiver:_libcrypto libssl$_abiver:_libssl"
+	$pkgname-misc::noarch libcrypto$_abiver:_libcrypto libssl$_abiver:_libssl"
 source="https://www.openssl.org/source/openssl-$pkgver.tar.gz
 	man-section.patch
 	"
-
+builddir="$srcdir/openssl-$pkgver"
 
 # secfixes:
+#   3.2.1-r2:
+#     - CVE-2024-2511
+#   3.1.4-r5:
+#     - CVE-2024-0727
+#   3.1.4-r4:
+#     - CVE-2023-6237
+#   3.1.4-r3:
+#     - CVE-2023-6129
+#   3.1.4-r1:
+#     - CVE-2023-5678
+#   3.1.4-r0:
+#     - CVE-2023-5363
+#   3.1.2-r0:
+#     - CVE-2023-3817
+#   3.1.1-r3:
+#     - CVE-2023-3446
+#   3.1.1-r2:
+#     - CVE-2023-2975
+#   3.1.1-r0:
+#     - CVE-2023-2650
+#   3.1.0-r4:
+#     - CVE-2023-1255
+#   3.1.0-r2:
+#     - CVE-2023-0465
+#   3.1.0-r1:
+#     - CVE-2023-0464
+#   3.0.8-r0:
+#     - CVE-2022-4203
+#     - CVE-2022-4304
+#     - CVE-2022-4450
+#     - CVE-2023-0215
+#     - CVE-2023-0216
+#     - CVE-2023-0217
+#     - CVE-2023-0286
+#     - CVE-2023-0401
+#   3.0.7-r2:
+#     - CVE-2022-3996
+#   3.0.7-r0:
+#     - CVE-2022-3786
+#     - CVE-2022-3602
+#   3.0.6-r0:
+#     - CVE-2022-3358
+#   3.0.5-r0:
+#     - CVE-2022-2097
+#   3.0.3-r0:
+#     - CVE-2022-1343
+#     - CVE-2022-1434
+#     - CVE-2022-1473
+#   3.0.2-r0:
+#     - CVE-2022-0778
+#   3.0.1-r0:
+#     - CVE-2021-4044
+#   1.1.1l-r0:
+#     - CVE-2021-3711
+#     - CVE-2021-3712
+#   1.1.1k-r0:
+#     - CVE-2021-3449
+#     - CVE-2021-3450
+#   1.1.1j-r0:
+#     - CVE-2021-23841
+#     - CVE-2021-23840
+#     - CVE-2021-23839
+#   1.1.1i-r0:
+#     - CVE-2020-1971
+#   1.1.1g-r0:
+#     - CVE-2020-1967
 #   1.1.1d-r3:
 #     - CVE-2019-1551
 #   1.1.1d-r1:
@@ -30,14 +98,20 @@ source="https://www.openssl.org/source/openssl-$pkgver.tar.gz
 #   1.1.1a-r0:
 #     - CVE-2018-0734
 #     - CVE-2018-0735
+#   0:
+#     - CVE-2022-1292
+#     - CVE-2022-2068
+#     - CVE-2022-2274
+#     - CVE-2023-0466
+#     - CVE-2023-4807
 
 build() {
 	local _target _optflags
 
 	# openssl will prepend crosscompile always core CC et al
-	CC=${CC#${CROSS_COMPILE}}
-	CXX=${CXX#${CROSS_COMPILE}}
-	CPP=${CPP#${CROSS_COMPILE}}
+	CC=${CC#"$CROSS_COMPILE"}
+	CXX=${CXX#"$CROSS_COMPILE"}
+	CPP=${CPP#"$CROSS_COMPILE"}
 
 	# determine target OS for openssl
 	case "$CARCH" in
@@ -46,10 +120,14 @@ build() {
 		mips64*)	_target="linux64-mips64" ;;
 		# explicit _optflags is needed to prevent automatic -mips3 addition
 		mips*)		_target="linux-mips32"; _optflags="-mips32" ;;
+		ppc)		_target="linux-ppc" ;;
+		ppc64)		_target="linux-ppc64" ;;
 		ppc64le)	_target="linux-ppc64le" ;;
 		x86)		_target="linux-elf" ;;
 		x86_64)		_target="linux-x86_64"; _optflags="enable-ec_nistp_64_gcc_128" ;;
-		s390x) 		_target="linux64-s390x";;
+		s390x)		_target="linux64-s390x";;
+		riscv64)	_target="linux64-riscv64";;
+		loongarch64)	_target="linux64-loongarch64";;
 		*)		msg "Unable to determine architecture from (CARCH=$CARCH)" ; return 1 ;;
 	esac
 
@@ -57,14 +135,38 @@ build() {
 	# gcc's --sysroot fake this by overriding CC
 	[ -n "$CBUILDROOT" ] && CC="$CC --sysroot=$CBUILDROOT"
 
-	perl ./Configure $_target --prefix=/usr \
+	# when cross building do not enable threads as libatomic is not avaiable
+	if [ "$CBUILD" != "$CHOST" ]; then
+		case $CARCH in
+			riscv64) _optflags="$_optflags no-threads";;
+		esac
+	fi
+
+	perl ./Configure \
+		$_target \
+		--prefix=/usr \
 		--libdir=lib \
 		--openssldir=/etc/ssl \
-		shared no-zlib $_optflags \
-		no-async no-comp no-idea no-mdc2 no-rc5 no-ec2m \
-		no-sm2 no-sm4 no-ssl2 no-ssl3 no-seed \
+		enable-ktls \
+		shared \
+		no-zlib \
+		no-async \
+		no-comp \
+		no-idea \
+		no-mdc2 \
+		no-rc5 \
+		no-ec2m \
+		no-ssl3 \
+		no-seed \
 		no-weak-ssl-ciphers \
-		$CPPFLAGS $CFLAGS $LDFLAGS -Wa,--noexecstack
+		$_optflags \
+		$CPPFLAGS \
+		$CFLAGS \
+		$LDFLAGS -Wa,--noexecstack
+
+	# dump configuration into logs
+	perl configdata.pm --dump
+
 	make
 }
 
@@ -77,19 +179,32 @@ check() {
 }
 
 package() {
+	depends="libssl$_abiver=$pkgver-r$pkgrel libcrypto$_abiver=$pkgver-r$pkgrel"
+	provides="openssl3=$pkgver-r$pkgrel"
+	replaces="openssl3"
+
 	make DESTDIR="$pkgdir" install
 	# remove the script c_rehash
 	rm "$pkgdir"/usr/bin/c_rehash
 }
 
 dev() {
+	provides="openssl3-dev=$pkgver-r$pkgrel"
+	replaces="openssl3-dev"
+
 	default_dev
-	replaces="libressl-dev"
+}
+
+misc() {
+	depends="$pkgname=$pkgver-r$pkgrel perl"
+	pkgdesc="Various perl scripts from $pkgname"
+
+	amove etc/ssl/misc
 }
 
 _libcrypto() {
 	pkgdesc="Crypto library from openssl"
-	replaces="libressl2.7-libcrypto"
+	replaces="libcrypto1.1"
 	mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib
 	mv "$pkgdir"/etc "$subpkgdir"/
 	for i in "$pkgdir"/usr/lib/libcrypto*; do
@@ -97,10 +212,12 @@ _libcrypto() {
 		ln -s ../../lib/${i##*/} "$subpkgdir"/usr/lib/${i##*/}
 	done
 	mv "$pkgdir"/usr/lib/engines-$_abiver "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/ossl-modules "$subpkgdir"/usr/lib/
 }
 
 _libssl() {
 	pkgdesc="SSL shared libraries"
+	depends="libcrypto$_abiver=$pkgver-r$pkgrel"
 
 	mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib
 	for i in "$pkgdir"/usr/lib/libssl*; do
@@ -109,5 +226,7 @@ _libssl() {
 	done
 }
 
-sha512sums="b00bd9b5ad5298fbceeec6bb19c1ab0c106ca5cfb31178497c58bf7e0e0cf30fcc19c20f84e23af31cc126bf2447d3e4f8461db97bafa7bd78f69561932f000c  openssl-1.1.1f.tar.gz
-43c3255118db6f5f340dc865c0f25ccbcafe5bf7507585244ca59b4d27daf533d6c3171aa32a8685cbb6200104bec535894b633de13feaadff87ab86739a445a  man-section.patch"
+sha512sums="
+1f9daeee6542e1b831c65f1f87befaef98ccedc3abc958c9d17f064ef771924c30849e3ff880f94eed4aaa9d81ea105e3bc8815e6d2e4d6b60b5e890f14fc5da  openssl-3.3.0.tar.gz
+8c44e990fe8a820f649631b9f81cf28225b7516065169a7f68e2dd7c067b30df9b2c6cb88fa826afbc9fcdaf156360aabf7c498d2d9ed452968815b12b004809  man-section.patch
+"
diff --git a/main/openssl/man-section.patch b/main/openssl/man-section.patch
index 0606897f45e..c1f96cede25 100644
--- a/main/openssl/man-section.patch
+++ b/main/openssl/man-section.patch
@@ -3,52 +3,29 @@ Date: Sun, 5 Nov 2017 15:09:09 +0100
 Subject: man-section
 
 ---
- Configurations/unix-Makefile.tmpl | 6 ++++--
- util/process_docs.pl              | 3 ++-
- 2 files changed, 6 insertions(+), 3 deletions(-)
+ Configurations/unix-Makefile.tmpl | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
-index 1292053546f5..c034d21884d8 100644
+index f88a70f4828e..fceda4a1161c 100644
 --- a/Configurations/unix-Makefile.tmpl
 +++ b/Configurations/unix-Makefile.tmpl
-@@ -183,7 +183,8 @@ HTMLDIR=$(DOCDIR)/html
+@@ -317,7 +317,8 @@ HTMLDIR=$(DOCDIR)/html
  # MANSUFFIX is for the benefit of anyone who may want to have a suffix
  # appended after the manpage file section number.  "ssl" is popular,
  # resulting in files such as config.5ssl rather than config.5.
--MANSUFFIX=
+-MANSUFFIX=ossl
 +MANSUFFIX=ssl
 +MANSECTION=SSL
  HTMLSUFFIX=html
  
  # For "optional" echo messages, to get "real" silence
-@@ -726,7 +727,8 @@ uninstall_runtime: uninstall_programs uninstall_runtime_libs
- 	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
- 	@$(ECHO) "*** Installing manpages"
- 	$(PERL) $(SRCDIR)/util/process_docs.pl \
--		"--destdir=$(DESTDIR)$(MANDIR)" --type=man --suffix=$(MANSUFFIX)
-+		"--destdir=$(DESTDIR)$(MANDIR)" --type=man --suffix=$(MANSUFFIX) \
-+		--mansection=$(MANSECTION)
- 
- uninstall_man_docs:
- 	@$(ECHO) "*** Uninstalling manpages"
-diff --git a/util/process_docs.pl b/util/process_docs.pl
-index 30b149eb8fcc..424155ea808e 100755
---- a/util/process_docs.pl
-+++ b/util/process_docs.pl
-@@ -37,6 +37,7 @@ GetOptions(\%options,
-            'type=s',            # The result type, 'man' or 'html'
-            'suffix:s',          # Suffix to add to the extension.
-                                 # Only used with type=man
-+           'mansection:s',      # Section to put to manpage in
-            'remove',            # To remove files rather than writing them
-            'dry-run|n',         # Only output file names on STDOUT
-            'debug|D+',
-@@ -97,7 +98,7 @@ foreach my $section (sort @{$options{section}}) {
-         my $name = uc $podname;
-         my $suffix = { man  => ".$podinfo{section}".($options{suffix} // ""),
-                        html => ".html" } -> {$options{type}};
--        my $generate = { man  => "pod2man --name=$name --section=$podinfo{section} --center=OpenSSL --release=$config{version} \"$podpath\"",
-+        my $generate = { man  => "pod2man --name=$name --section=$podinfo{section}$options{mansection} --center=OpenSSL --release=$config{version} \"$podpath\"",
-                          html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=man1:man3:man5:man7 \"--infile=$podpath\" \"--title=$podname\" --quiet"
-                          } -> {$options{type}};
-         my $output_dir = catdir($options{destdir}, "man$podinfo{section}");
+@@ -1520,7 +1521,7 @@ EOF
+           my $pod = $gen0;
+           return <<"EOF";
+ $args{src}: $pod
+-	pod2man --name=$name --section=$section\$(MANSUFFIX) --center=OpenSSL \\
++	pod2man --name=$name --section=$section\$(MANSECTION) --center=OpenSSL \\
+ 		--release=\$(VERSION) $pod >\$\@
+ EOF
+       } elsif (platform->isdef($args{src})) {
diff --git a/main/openvpn-ad-check/APKBUILD b/main/openvpn-ad-check/APKBUILD
index 4f67033cbe5..7b69602e44b 100644
--- a/main/openvpn-ad-check/APKBUILD
+++ b/main/openvpn-ad-check/APKBUILD
@@ -2,38 +2,21 @@
 # Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
 pkgname=openvpn-ad-check
 pkgver=1.1
-pkgrel=2
+pkgrel=4
 pkgdesc="Authenticate OpenVPN users against AD server and verify if they are member of a specific group."
 url="https://sourceforge.net/p/openvpnadcheck"
 arch="noarch"
-license="GPL"
+license="GPL-3.0-only"
 depends="openvpn lua-ldap"
-depends_dev=""
-makedepends="$depends_dev"
-install=""
-subpackages=""
-source="https://sourceforge.net/projects/openvpnadcheck/files/$pkgname-$pkgver.tgz"
-
-_builddir="$srcdir/$pkgname"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-}
+source="https://sourceforge.net/projects/openvpnadcheck/files/openvpn-ad-check-$pkgver.tgz"
+builddir="$srcdir/openvpn-ad-check"
+options="!check" # no tests
 
 package() {
-        mkdir -p "$pkgdir"/etc/openvpn
-	cd "$_builddir"
-	install -c * "$pkgdir"/etc/openvpn
-	chmod 644 "$pkgdir"/etc/openvpn/openvpnadcheck.conf
+	install -Dm755 openvpnadcheck.lua -t "$pkgdir"/etc/openvpn
+	install -Dm644 openvpnadcheck.conf -t "$pkgdir"/etc/openvpn
 }
 
-sha512sums="0d2237acb3b227184b4f7c1ff34516d1dc0a04b09faba940afa9c8bb179cd608f43939f851109662dd0956ba9b8e24e2aad416e140554cc5b4006202fad2feab  openvpn-ad-check-1.1.tgz"
+sha512sums="
+0d2237acb3b227184b4f7c1ff34516d1dc0a04b09faba940afa9c8bb179cd608f43939f851109662dd0956ba9b8e24e2aad416e140554cc5b4006202fad2feab  openvpn-ad-check-1.1.tgz
+"
diff --git a/main/openvpn-auth-ldap/APKBUILD b/main/openvpn-auth-ldap/APKBUILD
index d59e77aa1e5..719512d9ab5 100644
--- a/main/openvpn-auth-ldap/APKBUILD
+++ b/main/openvpn-auth-ldap/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openvpn-auth-ldap
 pkgver=2.0.4
-pkgrel=3
+pkgrel=6
 pkgdesc="LDAP authentication and authorization plugin for OpenVPN 2.x"
 url="https://github.com/threerings/openvpn-auth-ldap/"
 arch="all"
@@ -34,7 +34,7 @@ build() {
 		--infodir=/usr/share/info \
 		--with-openvpn=/usr \
 		--with-objc-runtime=GNU \
-		CFLAGS="-fPIC" \
+		CFLAGS="$CFLAGS -fPIC" \
 		OBJCFLAGS="-std=gnu11"
 	make
 }
@@ -49,6 +49,8 @@ package() {
 	install -D -m 640 -g openvpn auth-ldap.conf "$pkgdir"/etc/openvpn/auth-ldap.conf
 }
 
-sha512sums="ffa1f1617acd3f4e96d3abea7e5611d8b8406c92ff1298ac0520f2d42f188116904187d3ca8c0ae88e0bcc6449ec4c8494a18770a4635c1ee7301baaaddfa12e  auth-ldap-2.0.4.tar.gz
+sha512sums="
+ffa1f1617acd3f4e96d3abea7e5611d8b8406c92ff1298ac0520f2d42f188116904187d3ca8c0ae88e0bcc6449ec4c8494a18770a4635c1ee7301baaaddfa12e  auth-ldap-2.0.4.tar.gz
 7d33287dde5ef338797d395f6e254d6e3116cbc274f89fc44b0de7f624d51c23c5734229279023c5b818d1ce7313f761770ee2f60c1975713feefdf03f040374  default-config.patch
-e6f826558a8542e3372c23692b9006ae5978110cd599ccde4756ace6bedd0c6a249738b00ba29e7121727246e001154f7aeb3804864fbc935e0acbb17b7d2a27  fix-make-install.patch"
+e6f826558a8542e3372c23692b9006ae5978110cd599ccde4756ace6bedd0c6a249738b00ba29e7121727246e001154f7aeb3804864fbc935e0acbb17b7d2a27  fix-make-install.patch
+"
diff --git a/main/openvpn/APKBUILD b/main/openvpn/APKBUILD
index aacedeecb69..81a490b2d7c 100644
--- a/main/openvpn/APKBUILD
+++ b/main/openvpn/APKBUILD
@@ -1,23 +1,48 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openvpn
-pkgver=2.4.8
-pkgrel=4
-pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)"
+pkgver=2.6.10
+pkgrel=0
+pkgdesc="Robust, and highly configurable VPN (Virtual Private Network)"
 url="https://openvpn.net/"
 arch="all"
-license="custom"
+license="GPL-2.0-only WITH openvpn-openssl-exception"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-openrc $pkgname-auth-pam:pam"
-depends="iproute2"
-makedepends="openssl-dev lzo-dev linux-pam-dev linux-headers"
+depends="iproute2-minimal"  # needs just /sbin/ip
+depends_dev="openssl-dev" # openvpn-plugin.h includes openssl/x509.h
+makedepends="
+	$depends_dev
+	libcap-ng-dev
+	linux-headers
+	linux-pam-dev
+	lz4-dev
+	lzo-dev
+	"
+checkdepends="cmocka-dev"
 install="$pkgname.pre-install"
-source="https://swupdate.openvpn.net/community/releases/openvpn-$pkgver.tar.xz
+source="https://build.openvpn.net/downloads/releases/openvpn-$pkgver.tar.gz
 	openvpn.initd
 	openvpn.confd
 	openvpn.up
 	openvpn.down
 	"
 
+# secfixes:
+#   2.6.7-r0:
+#     - CVE-2023-46849
+#     - CVE-2023-46850
+#   2.5.6-r0:
+#     - CVE-2022-0547
+#   2.5.2-r0:
+#     - CVE-2020-15078
+#   2.4.9-r0:
+#     - CVE-2020-11810
+#   2.4.6-r0:
+#     - CVE-2018-9336
+#   0:
+#     - CVE-2020-7224
+#     - CVE-2020-27569
+
 build() {
 	./configure \
 		--build=$CBUILD \
@@ -25,8 +50,8 @@ build() {
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc/openvpn \
-		--enable-crypto \
-		--enable-iproute2
+		--enable-iproute2 \
+		--enable-x509-alt-username
 	make
 }
 
@@ -37,6 +62,8 @@ check() {
 package() {
 	make DESTDIR="$pkgdir" install
 
+	install -D -m644 doc/openvpn.8 "$pkgdir"/usr/share/man/man8/openvpn.8
+
 	# install samples
 	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/samples
 	cp -a sample/sample-* "$pkgdir"/usr/share/doc/$pkgname/samples
@@ -58,8 +85,10 @@ pam() {
 		"$subpkgdir"/usr/lib/openvpn/plugins/
 }
 
-sha512sums="d37a768c7f8683c23ae0d73d7e9947b5a1dac26580b0d7fe72454319acfe40375fbe150e68daee865a78e0269740e4ac5c96cdb8a7f02a1287ea93752ee0be06  openvpn-2.4.8.tar.xz
-111a1ce79bdb41b8a03c0d43f1fd87de8a0d5592a8b1bd878113af79adce3d0a3109badd92b5af9a0f80b6585473a1e01638f7e78e6baa8aac439f0708bc2a72  openvpn.initd
+sha512sums="
+2220d453db5b1e00cdddc4f7417eeb39ac7089e951c0cfb39da461f525517dbe94802ae1fb4625997fc8dec22c8359427da05618db4fb64d3e9fdcf0cb2ee861  openvpn-2.6.10.tar.gz
+42eda00f64727e6a1c3c74a02a5e99f34bd1361935fef8f807f16515e553ae644d3b054f40e8a352138db646aa3553e3f4ce6f5c10354191bef745ff99245f46  openvpn.initd
 1f14d4bd7a4a026c276af048ce647501c15358c6b0d184e95c49be5b8184188c8edafb76ed94835cdbb314187ee3b5b3ccd852e3a47add0599814c402309bece  openvpn.confd
 cdb73c9a5b1eb56e9cbd29955d94297ce5a87079419cd626d6a0b6680d88cbf310735a53f794886df02030b687eaea553c7c569a8ea1282a149441add1c65760  openvpn.up
-4456880d5c2db061219ba94e4052786700efa5e685f03b0d12d75a6023e3c0fc7b5242cc3d2bd3988e42fcd99701ab13a6257b1a0943b812318d30c64843ad27  openvpn.down"
+4456880d5c2db061219ba94e4052786700efa5e685f03b0d12d75a6023e3c0fc7b5242cc3d2bd3988e42fcd99701ab13a6257b1a0943b812318d30c64843ad27  openvpn.down
+"
diff --git a/main/openvpn/openvpn.initd b/main/openvpn/openvpn.initd
index 085ee5ea83f..b6a60e53da5 100644
--- a/main/openvpn/openvpn.initd
+++ b/main/openvpn/openvpn.initd
@@ -23,6 +23,7 @@ pidfile="/run/$RC_SVCNAME.pid"
 command="/usr/sbin/openvpn"
 command_args="
 	--daemon $instance_name
+	--cd $cfgdir
 	--config $cfgfile
 	--writepid $pidfile
 	--setenv RC_SVCNAME $RC_SVCNAME
diff --git a/main/opus/APKBUILD b/main/opus/APKBUILD
index f772c6d6307..185a5fa0f42 100644
--- a/main/opus/APKBUILD
+++ b/main/opus/APKBUILD
@@ -1,42 +1,51 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=opus
-pkgver=1.3.1
+pkgver=1.4
 pkgrel=0
 pkgdesc="Codec designed for interactive speech and audio transmission over the Internet"
-url="http://www.opus-codec.org/"
+url="https://www.opus-codec.org/"
 arch="all"
-license="BSD"
+license="BSD-3-Clause"
+makedepends="meson"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://archive.mozilla.org/pub/$pkgname/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://github.com/xiph/opus/releases/download/v$pkgver/opus-$pkgver.tar.gz
+	arm32.patch
+	"
 
-build() {
-	cd "$builddir"
+case "$CARCH" in
+arm*)
+	# the tests pass, but with contention armhf is really slow, and they can take
+	# over 20 minutes on one test
+	options="$options !check"
+	;;
+esac
+
+# secfixes:
+#   0:
+#     - CVE-2022-25345
 
-	CFLAGS="${CFLAGS/-Os/-O2}" ./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--enable-custom-modes
-	make
+build() {
+	CFLAGS="${CFLAGS/-Os/-O2}" \
+	CPPFLAGS="${CPPFLAGS/-Os/-O2}" \
+	abuild-meson \
+		-Db_lto=true \
+		-Dcustom-modes=true \
+		-Dtests="$(want_check && echo enabled || echo disabled)" \
+		. output
+	meson compile -C output
 }
 
 check() {
-	cd "$builddir"
-	make check
+	meson test -t10 --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	cd "$builddir"
-
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING \
-		"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd  opus-1.3.1.tar.gz"
+sha512sums="
+1ecd39e0add24de12823bf7c936bb67441228721e2cdae0edbfcf3cee0894bcc6edf2a1d0ca5cdfdad1565803bf39cc4c985ad32710c2a9582f850adeb5ca631  opus-1.4.tar.gz
+4218a3bc31efb91aa6b9cb2ac5928e63c34fd3b5aac61c68fa13b5a5fee00f902a1a03c61735d0610b0ded8f5b5e789494ea24165383bd4501d6a16e422e8eb6  arm32.patch
+"
diff --git a/main/opus/arm32.patch b/main/opus/arm32.patch
new file mode 100644
index 00000000000..364d7f5d5a7
--- /dev/null
+++ b/main/opus/arm32.patch
@@ -0,0 +1,27 @@
+Patch-Source: https://github.com/xiph/opus/pull/267
+--
+From d94583359bcf8f1b52cc93b7ca6ced9664fb2a7e Mon Sep 17 00:00:00 2001
+From: Vilius <orion1vi@protonmail.com>
+Date: Sun, 27 Nov 2022 03:13:09 +0200
+Subject: [PATCH] Meson: Fix unknown variable have_arm_intrinsics_or_asm
+
+---
+ silk/meson.build | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/silk/meson.build b/silk/meson.build
+index 917048b2d..a3e3f9eb3 100644
+--- a/silk/meson.build
++++ b/silk/meson.build
+@@ -25,6 +25,11 @@ if host_cpu_family in ['x86', 'x86_64'] and opus_conf.has('OPUS_HAVE_RTCD')
+   silk_sources +=  sources['SILK_SOURCES_X86_RTCD']
+ endif
+ 
++have_arm_intrinsics_or_asm = have_arm_ne10
++if (intrinsics_support.length() + asm_optimization.length() + inline_optimization.length()) > 0
++  have_arm_intrinsics_or_asm = true
++endif
++
+ if host_cpu_family in ['arm', 'aarch64'] and have_arm_intrinsics_or_asm
+   if opus_conf.has('OPUS_HAVE_RTCD')
+     silk_sources +=  sources['SILK_SOURCES_ARM_RTCD']
diff --git a/main/opusfile/APKBUILD b/main/opusfile/APKBUILD
new file mode 100644
index 00000000000..cb2ecb21bfc
--- /dev/null
+++ b/main/opusfile/APKBUILD
@@ -0,0 +1,51 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=opusfile
+pkgver=0.12
+pkgrel=6
+pkgdesc="High-level API for decoding and seeking within .opus files"
+url="https://www.opus-codec.org/"
+arch="all"
+license="BSD-3-Clause"
+depends_dev="openssl-dev>3"
+makedepends="$depends_dev libogg-dev opus-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://downloads.xiph.org/releases/opus/opusfile-$pkgver.tar.gz
+	$pkgname-CVE-2022-47021.patch::https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5.patch
+	fix-conflict.patch
+	"
+
+# secfixes:
+#   0.12-r4:
+#     - CVE-2022-47021
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--disable-static
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+e25e6968a3183ac0628ce1000840fd6f9f636e92ba984d6a72b76fb2a98ec632d2de4c66a8e4c05ef30655c2a4a13ab35f89606fa7d79a54cfa8506543ca57af  opusfile-0.12.tar.gz
+d5b9f45a26b2721d0e929932bebcb5382daad394f54c694daca2119dfb01217afb4d68606c45353542888ba589d66f27bacad3644be34b4c119d51fba64662c8  opusfile-CVE-2022-47021.patch
+b902b8c25506d3730a2a3bafcc5542671df8f35c588d05e54e883071c853c2e6e572dde80a8f7f39a58780a509c2d14b963040a3cab633edfc400cfca08060de  fix-conflict.patch
+"
diff --git a/main/opusfile/fix-conflict.patch b/main/opusfile/fix-conflict.patch
new file mode 100644
index 00000000000..05a2b72ff08
--- /dev/null
+++ b/main/opusfile/fix-conflict.patch
@@ -0,0 +1,9 @@
+--- a/opusurl.pc.in
++++ b/opusurl.pc.in
+@@ -9,6 +9,5 @@
+ Description: High-level Opus decoding library, URL support
+ Version: @PACKAGE_VERSION@
+ Requires: opusfile
+-Requires.private: @openssl@
+ Conflicts:
+ Libs: -L${libdir} -lopusurl
diff --git a/main/orc/APKBUILD b/main/orc/APKBUILD
index 3513797d8a6..5edb6a414a5 100644
--- a/main/orc/APKBUILD
+++ b/main/orc/APKBUILD
@@ -2,50 +2,39 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=orc
-pkgver=0.4.31
-pkgrel=2
-pkgdesc="The Oil Run-time Compiler"
+pkgver=0.4.37
+pkgrel=0
+pkgdesc="Oil Run-time Compiler"
 url="https://gstreamer.freedesktop.org/modules/orc.html"
 arch="all"
 license="BSD-2-Clause"
+depends_dev="$pkgname-compiler=$pkgver-r$pkgrel"
 makedepends="linux-headers meson"
 subpackages="$pkgname-dev $pkgname-compiler"
-source="https://gstreamer.freedesktop.org/src/orc/orc-$pkgver.tar.xz
-	"
-
-case "$CARCH" in
-	# FIXME: Test exec_opcodes_sys fails on armhf.
-	# FIXME: MIPS DSP Module Rev2 is required for tests on mips*.
-	arm*|mips*) options="!check";;
-esac
+source="https://gstreamer.freedesktop.org/src/orc/orc-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--buildtype=plain \
+	abuild-meson \
+		-Db_lto=true \
 		-Dorc-test=disabled \
 		. output
-	ninja -C output
+	meson compile -C output
 }
 
 check() {
-	cd "$builddir"
-	ninja -C output test
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	cd "$builddir"
-	DESTDIR="$pkgdir" ninja -C output install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
 compiler() {
 	pkgdesc="Orc compiler"
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+
+	amove usr/bin
 }
 
-sha512sums="4e97597e70982dbfc239d1ef9a8913b0155e5aaac15d91162d7f73a1095bd944e27fbe6d6194b9f74af07b985a44b1d9dddbe917425e1ad9e8da17ce86495696  orc-0.4.31.tar.xz"
+sha512sums="
+73c1e6e3bf66ceda94eb009675b0728ec844acc238959a4e741cbd6b69b7231b544fb85bb093641319d761bcfc0a9f84da864ab7bcf5dd1c263aa75f7b9d2310  orc-0.4.37.tar.xz
+"
diff --git a/main/ortp/APKBUILD b/main/ortp/APKBUILD
index a91916c61da..91cebdde00e 100644
--- a/main/ortp/APKBUILD
+++ b/main/ortp/APKBUILD
@@ -1,44 +1,39 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=ortp
-pkgver=1.0.2
-_pkgver=${pkgver}-0
-pkgrel=1
+pkgver=5.3.38
+pkgrel=0
 pkgdesc="oRTP is a library implemeting Real-time Transport Protocol (RFC3550), licensed under LGPL"
-url="http://www.linphone.org/technical-corner/ortp"
+url="https://www.linphone.org/technical-corner/ortp"
 arch="all"
 options="!check" #no test avail
-license="LGPL-2.0-or-later VSL"
-makedepends="cmake bctoolbox-dev"
+license="LGPL-2.0-or-later"
+makedepends="cmake bctoolbox-dev samurai"
 subpackages="$pkgname-doc $pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::https://www.linphone.org/releases/sources/ortp/$pkgname-$pkgver.tar.gz
-	fix-cmake.patch"
-builddir="$srcdir/$pkgname-$_pkgver"
+source="https://gitlab.linphone.org/BC/public/ortp/-/archive/$pkgver/ortp-$pkgver.tar.gz
+	fix-pkgconfig-pc-file.patch
+	fix-cmake-path.patch
+	"
 
 build() {
-	cmake \
+	cmake -B build -G Ninja \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DCMAKE_MODULE_PATH=/usr/lib/cmake \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_SKIP_INSTALL_RPATH=ON \
 		-DENABLE_STATIC=NO \
-		-DENABLE_SHARED=YES .
-	make
+		-DENABLE_UNIT_TESTS=OFF \
+		-DBUILD_SHARED_LIBS=YES .
+	cmake --build build
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
-dev()  {
-	default_dev
-	mkdir -p "$subpkgdir"/usr/lib/cmake/oRTP
-	mv "$pkgdir"/usr/share/oRTP/cmake/* "$subpkgdir"/usr/lib/cmake/oRTP
-	# Remove empty dirs
-	rmdir "$pkgdir"/usr/share/oRTP/cmake
-	rmdir "$pkgdir"/usr/share/oRTP
-	rmdir "$pkgdir"/usr/share
-}
-
-sha512sums="653f0a607ff8a3d44a81ff73840ffe121140d04288965f18e8e9dc1d09c28eb86cf8efef3b2bbbdff0e76299a2cf87a28d8028a70bf1918616fb10c61d77f95e  ortp-1.0.2.tar.gz
-edfe84d0b5ab2c6bce0bd40f764049b4bd35d478bba7aba6a53c911d1ec9f55a546c7450327c7885a27117352b029e11f0caba2f021d72555629643b8df9a6de  fix-cmake.patch"
+sha512sums="
+83a5d549767f92352235a1ae146c9c98f0fb83fc52101fd7f955ae978231b978d376742689d951f045eee1f639ed973169775068b546089049cc34573da7f251  ortp-5.3.38.tar.gz
+f889b47bf3d6a47d05b56c14a601328d636ea858a5abef0873b3bef329822a7271ada2ed2d8c4b09edddb59882f54752a8fcc3d8d067ee832631af7161505222  fix-pkgconfig-pc-file.patch
+19613325809a3086403ef87d67a12707d85e56d455b7fd57dae5e09635743d2d04c41f85b3b60441ee60ef93f4143c531dc7cbdc4818e64d8611c70bf5b38c15  fix-cmake-path.patch
+"
diff --git a/main/ortp/fix-cmake-path.patch b/main/ortp/fix-cmake-path.patch
new file mode 100644
index 00000000000..6b06448445b
--- /dev/null
+++ b/main/ortp/fix-cmake-path.patch
@@ -0,0 +1,13 @@
+Adapted from https://github.com/OpenMandrivaAssociation/ortp/blob/master/ortp-5.3.6-cmake-fix_cmake_path.patch
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -212,7 +212,7 @@ if (ENABLE_PACKAGE_SOURCE)
+ endif()
+ 
+ include(CMakePackageConfigHelpers)
+-set(CMAKE_MODULES_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake")
++set(CMAKE_MODULES_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/")
+ configure_package_config_file("cmake/${PROJECT_NAME}Config.cmake.in" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+ 	INSTALL_DESTINATION "${CMAKE_MODULES_INSTALL_DIR}"
+ 	NO_SET_AND_CHECK_MACRO
diff --git a/main/ortp/fix-cmake.patch b/main/ortp/fix-cmake.patch
deleted file mode 100644
index 4556d47312b..00000000000
--- a/main/ortp/fix-cmake.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix build with newer CMake.
-
-Upstream-Status: Derived from upstream patch
---- ortp-1.0.2-0.orig/CMakeLists.txt
-+++ ortp-1.0.2-0/CMakeLists.txt
-@@ -60,11 +60,7 @@
- find_package(Threads)
- find_library(LIBM NAMES m)
- 
--if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
--	include("${EP_bctoolbox_CONFIG_DIR}/BcToolboxConfig.cmake")
--else()
--	find_package(BcToolbox 0.2.0 REQUIRED)
--endif()
-+find_package(bctoolbox 0.2.0 REQUIRED)
- 
- add_subdirectory(build)
- 
diff --git a/main/ortp/fix-pkgconfig-pc-file.patch b/main/ortp/fix-pkgconfig-pc-file.patch
new file mode 100644
index 00000000000..cc3c2e7442b
--- /dev/null
+++ b/main/ortp/fix-pkgconfig-pc-file.patch
@@ -0,0 +1,18 @@
+Patch-Source: https://github.com/OpenMandrivaAssociation/ortp/blob/master/ortp-4.4.6-cmake-fix-pkgconfig-pc-file.patch
+
+--- a/ortp.pc.in
++++ b/ortp.pc.in
+@@ -1,4 +1,3 @@
+-# This is a comment
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-includedir=@includedir@
++includedir=@includedir@/ortp
+@@ -6,5 +5,5 @@ includedir=@includedir@
+ Name: oRTP 
+ Description: Implement the RFC3550 (RTP) with a easy to use API with high and low level access.
+ Version: @ORTP_PKGCONFIG_VERSION@
+-Libs: -L@libdir@ -lortp @ORTPDEPS_LIBS@
+-Cflags: -I@includedir@ @ORTPDEPS_CFLAGS@
++Libs: -lortp @ORTPDEPS_LIBS@
++Cflags: -I@includedir@/ortp @ORTPDEPS_CFLAGS@
diff --git a/main/p11-kit/APKBUILD b/main/p11-kit/APKBUILD
index 56b018fe27e..172c2108fab 100644
--- a/main/p11-kit/APKBUILD
+++ b/main/p11-kit/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=p11-kit
-pkgver=0.23.20
-pkgrel=2
+pkgver=0.25.3
+pkgrel=0
 pkgdesc="Library for loading and sharing PKCS#11 modules"
 url="https://p11-glue.freedesktop.org/"
 arch="all"
@@ -11,46 +11,48 @@ makedepends="meson libtasn1-dev libffi-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-trust $pkgname-server"
 source="https://github.com/p11-glue/p11-kit/releases/download/$pkgver/p11-kit-$pkgver.tar.xz"
 
+# secfixes:
+#   0.23.22-r0:
+#     - CVE-2020-29361
+#     - CVE-2020-29362
+#     - CVE-2020-29363
+
 build() {
-	meson \
-		--prefix=/usr \
-		--buildtype=plain \
+	abuild-meson \
+		-Db_lto=true \
+		-Dbackend_max_links=4 \
+		-Dtest="$(want_check && echo true || echo false)" \
 		-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt \
 		. output
-	ninja -C output
+	meson compile -C output
 }
 
 check() {
-	ninja -C output test
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C output install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 	install -Dm644 "$pkgdir"/etc/pkcs11/pkcs11.conf.example -t "$pkgdir"/usr/share/doc/$pkgname
 }
 
 trust() {
 	pkgdesc="System trust module from $pkgname"
-	mkdir -p "$subpkgdir"/usr/share/p11-kit/modules \
-		"$subpkgdir"/usr/lib/pkcs11 \
-		"$subpkgdir"/usr/bin
-
-	mv "$pkgdir"/usr/share/p11-kit/modules/p11-kit-trust.module \
-		"$subpkgdir"/usr/share/p11-kit/modules/
-	mv "$pkgdir"/usr/lib/pkcs11/p11-kit-trust.so \
-		"$subpkgdir"/usr/lib/pkcs11/
-	mv "$pkgdir"/usr/bin/trust "$subpkgdir"/usr/bin/
+
+	amove \
+		usr/share/p11-kit/modules/p11-kit-trust.module \
+		usr/lib/pkcs11/p11-kit-trust.so \
+		usr/bin/trust
 }
 
 server() {
 	pkgdesc="Server and client commands for $pkgname"
-	mkdir -p "$subpkgdir"/usr/lib/pkcs11 \
-		"$subpkgdir"/usr/libexec/p11-kit \
-		"$subpkgdir"/etc/init.d
-	mv "$pkgdir"/usr/lib/pkcs11/p11-kit-client.so \
-		"$subpkgdir"/usr/lib/pkcs11
-	mv "$pkgdir"/usr/libexec/p11-kit/p11-kit-server \
-		"$subpkgdir"/usr/libexec/p11-kit
+
+	amove \
+		usr/lib/pkcs11/p11-kit-client.so \
+		usr/libexec/p11-kit/p11-kit-server
 }
 
-sha512sums="1eb88773fdd49dd48c7e089744e9dbbf6c1033a4863f3bfe75a68d842804baa3c373cb1b28ee625dd69a6e16c89df4ac755e0928495dccf38c007c530f6cfa57  p11-kit-0.23.20.tar.xz"
+sha512sums="
+ad2d393bf122526cbba18dc9d5a13f2c1cad7d70125ec90ffd02059dfa5ef30ac59dfc0bb9bc6380c8f317e207c9e87e895f1945634f56ddf910c2958868fb4c  p11-kit-0.25.3.tar.xz
+"
diff --git a/main/p7zip/APKBUILD b/main/p7zip/APKBUILD
deleted file mode 100644
index 2e3921134c3..00000000000
--- a/main/p7zip/APKBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=p7zip
-pkgver=16.02
-pkgrel=3
-pkgdesc="A command-line port of the 7zip compression utility"
-url="http://p7zip.sourceforge.net"
-arch="all"
-license="LGPL-2.0-or-later"
-subpackages="$pkgname-doc"
-depends=""
-makedepends="bash yasm nasm"
-source="https://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}_${pkgver}_src_all.tar.bz2
-	CVE-2016-9296.patch
-	CVE-2017-17969.patch
-	CVE-2018-5996.patch
-	CVE-2018-10115.patch
-	"
-builddir="$srcdir/${pkgname}_$pkgver"
-
-# secfixes:
-#   16.02-r3:
-#   - CVE-2018-5996
-#   - CVE-2018-10115
-#   16.02-r2:
-#   - CVE-2017-17969
-#   16.02-r1:
-#   - CVE-2016-9296
-
-prepare() {
-	default_prepare
-
-	local makefile="makefile.linux_any_cpu_gcc_4.X"
-	case "$CARCH" in
-		x86)    makefile="makefile.linux_x86_asm_gcc_4.X" ;;
-		x86_64) makefile="makefile.linux_amd64_asm" ;;
-	esac
-
-	cd "$builddir"
-	ln -sf $makefile makefile.machine
-
-	sed -e "s,g++,${CXX:-g++}," -i makefile.machine
-	sed -e "s,gcc,${CC:-gcc}," -i makefile.machine
-}
-
-check() {
-	cd "$builddir"
-	make test
-}
-
-build() {
-	cd "$builddir"
-	make all3 OPTFLAGS="${CXXFLAGS}"
-}
-
-package() {
-	cd "$builddir"
-	make install DEST_DIR="$pkgdir" DEST_HOME="/usr" \
-		DEST_MAN="/usr/share/man" \
-		DEST_SHARE_DOC="/usr/share/doc/$pkgname"
-
-	install -Dm755 contrib/gzip-like_CLI_wrapper_for_7z/$pkgname \
-		"$pkgdir"/usr/bin/$pkgname
-	install -Dm644 contrib/gzip-like_CLI_wrapper_for_7z/man1/$pkgname.1 \
-		"$pkgdir"/usr/share/man/man1/$pkgname.1
-}
-
-sha512sums="d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f  p7zip_16.02_src_all.tar.bz2
-7a7fddf4122c3f5d4632640149a94c285a18515f38510388709c2fb9ecd450f9f34ae2e5fe4926c1c68507567b0affa2c8e9194c732673171dd5ee625192b194  CVE-2016-9296.patch
-22b6437770f2fb70675ed6971239ec3d40d5b9c7e1c5aa28c670d082bd2e7d861863f2f00feacec759eab216081dc49544b980b2ebe9fe40c7d0d1ca1dfc3069  CVE-2017-17969.patch
-7962a03430b94aec7c93d6dabee340f4f5915d728ba4df0dcaae483ab9c29115818e5e944572a3fd910addad8799c6a1e3911f6a0a02b661f804eea11c3a0f40  CVE-2018-5996.patch
-757d0f50ccce2a21dce81f165a9f408a71ea53c226ef29b4d3843f30b2fc518d06cd784e2de644904813cd16a87f24387c5cc35c2499b1df9d86377057be032a  CVE-2018-10115.patch"
diff --git a/main/p7zip/CVE-2016-9296.patch b/main/p7zip/CVE-2016-9296.patch
deleted file mode 100644
index 773f92a46e0..00000000000
--- a/main/p7zip/CVE-2016-9296.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./CPP/7zip/Archive/7z/7zIn.cpp.orig	2016-11-21 01:42:29.460901230 +0000
-+++ ./CPP/7zip/Archive/7z/7zIn.cpp	2016-11-21 01:42:57.481197725 +0000
-@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedS
-       if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i])
-         ThrowIncorrect();
-   }
--  HeadersSize += folders.PackPositions[folders.NumPackStreams];
-+  if (folders.PackPositions)
-+      HeadersSize += folders.PackPositions[folders.NumPackStreams];
-   return S_OK;
- }
- 
diff --git a/main/p7zip/CVE-2017-17969.patch b/main/p7zip/CVE-2017-17969.patch
deleted file mode 100644
index af9e03931f1..00000000000
--- a/main/p7zip/CVE-2017-17969.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- p7zip_16.02/CPP/7zip/Compress/ShrinkDecoder.cpp.orig
-+++ p7zip_16.02/CPP/7zip/Compress/ShrinkDecoder.cpp
-@@ -121,7 +121,12 @@
-     {
-       _stack[i++] = _suffixes[cur];
-       cur = _parents[cur];
--    }
-+      if (i >= kNumItems)
-+        break;
-+     }
-+
-+    if (i >= kNumItems)
-+      break;
-     
-     _stack[i++] = (Byte)cur;
-     lastChar2 = (Byte)cur;
diff --git a/main/p7zip/CVE-2018-10115.patch b/main/p7zip/CVE-2018-10115.patch
deleted file mode 100644
index 7d9c4bf81f0..00000000000
--- a/main/p7zip/CVE-2018-10115.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-From: Robert Luberda <robert@debian.org>
-Date: Tue, 29 May 2018 23:59:09 +0200
-Subject: Fix CVE-2018-10115
-
-Apply "patch" taken from https://landave.io/files/patch_7zip_CVE-2018-10115.txt
-
-
-Bugs-Debian: https://bugs.debian.org/897674
----
- CPP/7zip/Compress/Rar1Decoder.cpp | 16 +++++++++++-----
- CPP/7zip/Compress/Rar1Decoder.h   |  3 ++-
- CPP/7zip/Compress/Rar2Decoder.cpp | 17 +++++++++++++----
- CPP/7zip/Compress/Rar2Decoder.h   |  3 ++-
- CPP/7zip/Compress/Rar3Decoder.cpp | 19 +++++++++++++++----
- CPP/7zip/Compress/Rar3Decoder.h   |  3 ++-
- CPP/7zip/Compress/Rar5Decoder.cpp |  8 ++++++++
- CPP/7zip/Compress/Rar5Decoder.h   |  1 +
- 8 files changed, 54 insertions(+), 16 deletions(-)
-
-diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp
-index 68030c7..8c890c8 100644
---- a/CPP/7zip/Compress/Rar1Decoder.cpp
-+++ b/CPP/7zip/Compress/Rar1Decoder.cpp
-@@ -29,7 +29,7 @@ public:
- };
- */
- 
--CDecoder::CDecoder(): m_IsSolid(false), _errorMode(false) { }
-+CDecoder::CDecoder(): _isSolid(false), _solidAllowed(false), _errorMode(false) { }
- 
- void CDecoder::InitStructures()
- {
-@@ -345,7 +345,7 @@ void CDecoder::GetFlagsBuf()
- 
- void CDecoder::InitData()
- {
--  if (!m_IsSolid)
-+  if (!_isSolid)
-   {
-     AvrPlcB = AvrLn1 = AvrLn2 = AvrLn3 = NumHuf = Buf60 = 0;
-     AvrPlc = 0x3500;
-@@ -391,6 +391,11 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
-   if (inSize == NULL || outSize == NULL)
-     return E_INVALIDARG;
- 
-+  if (_isSolid && !_solidAllowed)
-+    return S_FALSE;
-+
-+  _solidAllowed = false;
-+
-   if (!m_OutWindowStream.Create(kHistorySize))
-     return E_OUTOFMEMORY;
-   if (!m_InBitStream.Create(1 << 20))
-@@ -398,13 +403,13 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
- 
-   m_UnpackSize = (Int64)*outSize;
-   m_OutWindowStream.SetStream(outStream);
--  m_OutWindowStream.Init(m_IsSolid);
-+  m_OutWindowStream.Init(_isSolid);
-   m_InBitStream.SetStream(inStream);
-   m_InBitStream.Init();
- 
-   // CCoderReleaser coderReleaser(this);
-   InitData();
--  if (!m_IsSolid)
-+  if (!_isSolid)
-   {
-     _errorMode = false;
-     InitStructures();
-@@ -475,6 +480,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
-   }
-   if (m_UnpackSize < 0)
-     return S_FALSE;
-+  _solidAllowed = true;
-   return m_OutWindowStream.Flush();
- }
- 
-@@ -491,7 +497,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
- {
-   if (size < 1)
-     return E_INVALIDARG;
--  m_IsSolid = ((data[0] & 1) != 0);
-+  _isSolid = ((data[0] & 1) != 0);
-   return S_OK;
- }
- 
-diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h
-index 01b606b..8abb3a3 100644
---- a/CPP/7zip/Compress/Rar1Decoder.h
-+++ b/CPP/7zip/Compress/Rar1Decoder.h
-@@ -38,7 +38,8 @@ public:
-   UInt32 LastLength;
- 
-   Int64 m_UnpackSize;
--  bool m_IsSolid;
-+  bool _isSolid;
-+  bool _solidAllowed;
-   bool _errorMode;
- 
-   UInt32 ReadBits(int numBits);
-diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp
-index 0580c8d..be8d842 100644
---- a/CPP/7zip/Compress/Rar2Decoder.cpp
-+++ b/CPP/7zip/Compress/Rar2Decoder.cpp
-@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20;
- static const UInt32 kWindowReservSize = (1 << 22) + 256;
- 
- CDecoder::CDecoder():
--  m_IsSolid(false),
-+  _isSolid(false),
-+  _solidAllowed(false),
-   m_TablesOK(false)
- {
- }
-@@ -320,6 +321,10 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
-   if (inSize == NULL || outSize == NULL)
-     return E_INVALIDARG;
- 
-+  if (_isSolid && !_solidAllowed)
-+    return S_FALSE;
-+  _solidAllowed = false;
-+
-   if (!m_OutWindowStream.Create(kHistorySize))
-     return E_OUTOFMEMORY;
-   if (!m_InBitStream.Create(1 << 20))
-@@ -330,12 +335,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
-   UInt64 pos = 0, unPackSize = *outSize;
-   
-   m_OutWindowStream.SetStream(outStream);
--  m_OutWindowStream.Init(m_IsSolid);
-+  m_OutWindowStream.Init(_isSolid);
-   m_InBitStream.SetStream(inStream);
-   m_InBitStream.Init();
- 
-   // CCoderReleaser coderReleaser(this);
--  if (!m_IsSolid)
-+  if (!_isSolid)
-   {
-     InitStructures();
-     if (unPackSize == 0)
-@@ -343,6 +348,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
-       if (m_InBitStream.GetProcessedSize() + 2 <= m_PackSize) // test it: probably incorrect;
-         if (!ReadTables())
-           return S_FALSE;
-+      _solidAllowed = true;
-       return S_OK;
-     }
-     if (!ReadTables())
-@@ -386,6 +392,9 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
- 
-   if (!ReadLastTables())
-     return S_FALSE;
-+
-+  _solidAllowed = true;
-+
-   return m_OutWindowStream.Flush();
- }
- 
-@@ -402,7 +411,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
- {
-   if (size < 1)
-     return E_INVALIDARG;
--  m_IsSolid = ((data[0] & 1) != 0);
-+  _isSolid = ((data[0] & 1) != 0);
-   return S_OK;
- }
- 
-diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h
-index 0e9005f..370bce2 100644
---- a/CPP/7zip/Compress/Rar2Decoder.h
-+++ b/CPP/7zip/Compress/Rar2Decoder.h
-@@ -138,7 +138,8 @@ class CDecoder :
-   Byte m_LastLevels[kMaxTableSize];
- 
-   UInt64 m_PackSize;
--  bool m_IsSolid;
-+  bool _isSolid;
-+  bool _solidAllowed;
-   bool m_TablesOK;
- 
-   void InitStructures();
-diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp
-index 6cb8a6a..7b85833 100644
---- a/CPP/7zip/Compress/Rar3Decoder.cpp
-+++ b/CPP/7zip/Compress/Rar3Decoder.cpp
-@@ -92,7 +92,8 @@ CDecoder::CDecoder():
-   _writtenFileSize(0),
-   _vmData(0),
-   _vmCode(0),
--  m_IsSolid(false),
-+  _isSolid(false),
-+  _solidAllowed(false),
-   _errorMode(false)
- {
-   Ppmd7_Construct(&_ppmd);
-@@ -821,7 +822,7 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
- {
-   _writtenFileSize = 0;
-   _unsupportedFilter = false;
--  if (!m_IsSolid)
-+  if (!_isSolid)
-   {
-     _lzSize = 0;
-     _winPos = 0;
-@@ -840,12 +841,15 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
-   if (_errorMode)
-     return S_FALSE;
- 
--  if (!m_IsSolid || !TablesRead)
-+  if (!_isSolid || !TablesRead)
-   {
-     bool keepDecompressing;
-     RINOK(ReadTables(keepDecompressing));
-     if (!keepDecompressing)
-+    {
-+      _solidAllowed = true;
-       return S_OK;
-+    }
-   }
- 
-   for (;;)
-@@ -870,6 +874,9 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
-     if (!keepDecompressing)
-       break;
-   }
-+
-+  _solidAllowed = true;
-+
-   RINOK(WriteBuf());
-   UInt64 packSize = m_InBitStream.BitDecoder.GetProcessedSize();
-   RINOK(progress->SetRatioInfo(&packSize, &_writtenFileSize));
-@@ -890,6 +897,10 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
-     if (!inSize)
-       return E_INVALIDARG;
- 
-+    if (_isSolid && !_solidAllowed)
-+      return S_FALSE;
-+    _solidAllowed = false;
-+
-     if (!_vmData)
-     {
-       _vmData = (Byte *)::MidAlloc(kVmDataSizeMax + kVmCodeSizeMax);
-@@ -928,7 +939,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
- {
-   if (size < 1)
-     return E_INVALIDARG;
--  m_IsSolid = ((data[0] & 1) != 0);
-+  _isSolid = ((data[0] & 1) != 0);
-   return S_OK;
- }
- 
-diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h
-index 2f72d7d..32c8943 100644
---- a/CPP/7zip/Compress/Rar3Decoder.h
-+++ b/CPP/7zip/Compress/Rar3Decoder.h
-@@ -191,7 +191,8 @@ class CDecoder:
-   CRecordVector<CTempFilter *>  _tempFilters;
-   UInt32 _lastFilter;
- 
--  bool m_IsSolid;
-+  bool _isSolid;
-+  bool _solidAllowed;
-   bool _errorMode;
- 
-   bool _lzMode;
-diff --git a/CPP/7zip/Compress/Rar5Decoder.cpp b/CPP/7zip/Compress/Rar5Decoder.cpp
-index dc8830f..a826d5a 100644
---- a/CPP/7zip/Compress/Rar5Decoder.cpp
-+++ b/CPP/7zip/Compress/Rar5Decoder.cpp
-@@ -72,6 +72,7 @@ CDecoder::CDecoder():
-     _writtenFileSize(0),
-     _dictSizeLog(0),
-     _isSolid(false),
-+    _solidAllowed(false),
-     _wasInit(false),
-     _inputBuf(NULL)
- {
-@@ -801,7 +802,10 @@ HRESULT CDecoder::CodeReal()
-   */
- 
-   if (res == S_OK)
-+  {
-+    _solidAllowed = true;
-     res = res2;
-+  }
-      
-   if (res == S_OK && _unpackSize_Defined && _writtenFileSize != _unpackSize)
-     return S_FALSE;
-@@ -821,6 +825,10 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
- {
-   try
-   {
-+    if (_isSolid && !_solidAllowed)
-+      return S_FALSE;
-+    _solidAllowed = false;
-+
-     if (_dictSizeLog >= sizeof(size_t) * 8)
-       return E_NOTIMPL;
- 
-diff --git a/CPP/7zip/Compress/Rar5Decoder.h b/CPP/7zip/Compress/Rar5Decoder.h
-index b0a4dd1..3db5018 100644
---- a/CPP/7zip/Compress/Rar5Decoder.h
-+++ b/CPP/7zip/Compress/Rar5Decoder.h
-@@ -271,6 +271,7 @@ class CDecoder:
-   Byte _dictSizeLog;
-   bool _tableWasFilled;
-   bool _isSolid;
-+  bool _solidAllowed;
-   bool _wasInit;
- 
-   UInt32 _reps[kNumReps];
diff --git a/main/p7zip/CVE-2018-5996.patch b/main/p7zip/CVE-2018-5996.patch
deleted file mode 100644
index 6733bff9189..00000000000
--- a/main/p7zip/CVE-2018-5996.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From: Robert Luberda <robert@debian.org>
-Date: Sun, 28 Jan 2018 23:47:40 +0100
-Subject: CVE-2018-5996
-
-Hopefully fix Memory Corruptions via RAR PPMd (CVE-2018-5996) by
-applying a few changes from 7Zip 18.00-beta.
-
-Bug-Debian: https://bugs.debian.org/#888314
----
- CPP/7zip/Compress/Rar1Decoder.cpp | 13 +++++++++----
- CPP/7zip/Compress/Rar1Decoder.h   |  1 +
- CPP/7zip/Compress/Rar2Decoder.cpp | 10 +++++++++-
- CPP/7zip/Compress/Rar2Decoder.h   |  1 +
- CPP/7zip/Compress/Rar3Decoder.cpp | 23 ++++++++++++++++++++---
- CPP/7zip/Compress/Rar3Decoder.h   |  2 ++
- 6 files changed, 42 insertions(+), 8 deletions(-)
-
-diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp
-index 1aaedcc..68030c7 100644
---- a/CPP/7zip/Compress/Rar1Decoder.cpp
-+++ b/CPP/7zip/Compress/Rar1Decoder.cpp
-@@ -29,7 +29,7 @@ public:
- };
- */
- 
--CDecoder::CDecoder(): m_IsSolid(false) { }
-+CDecoder::CDecoder(): m_IsSolid(false), _errorMode(false) { }
- 
- void CDecoder::InitStructures()
- {
-@@ -406,9 +406,14 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
-   InitData();
-   if (!m_IsSolid)
-   {
-+    _errorMode = false;
-     InitStructures();
-     InitHuff();
-   }
-+
-+  if (_errorMode)
-+    return S_FALSE;
-+
-   if (m_UnpackSize > 0)
-   {
-     GetFlagsBuf();
-@@ -477,9 +482,9 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
-     const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress)
- {
-   try { return CodeReal(inStream, outStream, inSize, outSize, progress); }
--  catch(const CInBufferException &e) { return e.ErrorCode; }
--  catch(const CLzOutWindowException &e) { return e.ErrorCode; }
--  catch(...) { return S_FALSE; }
-+  catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; }
-+  catch(const CLzOutWindowException &e) { _errorMode = true; return e.ErrorCode; }
-+  catch(...) { _errorMode = true; return S_FALSE; }
- }
- 
- STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
-diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h
-index 630f089..01b606b 100644
---- a/CPP/7zip/Compress/Rar1Decoder.h
-+++ b/CPP/7zip/Compress/Rar1Decoder.h
-@@ -39,6 +39,7 @@ public:
- 
-   Int64 m_UnpackSize;
-   bool m_IsSolid;
-+  bool _errorMode;
- 
-   UInt32 ReadBits(int numBits);
-   HRESULT CopyBlock(UInt32 distance, UInt32 len);
-diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp
-index b3f2b4b..0580c8d 100644
---- a/CPP/7zip/Compress/Rar2Decoder.cpp
-+++ b/CPP/7zip/Compress/Rar2Decoder.cpp
-@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20;
- static const UInt32 kWindowReservSize = (1 << 22) + 256;
- 
- CDecoder::CDecoder():
--  m_IsSolid(false)
-+  m_IsSolid(false),
-+  m_TablesOK(false)
- {
- }
- 
-@@ -100,6 +101,8 @@ UInt32 CDecoder::ReadBits(unsigned numBits) { return m_InBitStream.ReadBits(numB
- 
- bool CDecoder::ReadTables(void)
- {
-+  m_TablesOK = false;
-+
-   Byte levelLevels[kLevelTableSize];
-   Byte newLevels[kMaxTableSize];
-   m_AudioMode = (ReadBits(1) == 1);
-@@ -170,6 +173,8 @@ bool CDecoder::ReadTables(void)
-   }
-   
-   memcpy(m_LastLevels, newLevels, kMaxTableSize);
-+  m_TablesOK = true;
-+
-   return true;
- }
- 
-@@ -344,6 +349,9 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
-       return S_FALSE;
-   }
- 
-+  if (!m_TablesOK)
-+    return S_FALSE;
-+
-   UInt64 startPos = m_OutWindowStream.GetProcessedSize();
-   while (pos < unPackSize)
-   {
-diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h
-index 3a0535c..0e9005f 100644
---- a/CPP/7zip/Compress/Rar2Decoder.h
-+++ b/CPP/7zip/Compress/Rar2Decoder.h
-@@ -139,6 +139,7 @@ class CDecoder :
- 
-   UInt64 m_PackSize;
-   bool m_IsSolid;
-+  bool m_TablesOK;
- 
-   void InitStructures();
-   UInt32 ReadBits(unsigned numBits);
-diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp
-index 3bf2513..6cb8a6a 100644
---- a/CPP/7zip/Compress/Rar3Decoder.cpp
-+++ b/CPP/7zip/Compress/Rar3Decoder.cpp
-@@ -92,7 +92,8 @@ CDecoder::CDecoder():
-   _writtenFileSize(0),
-   _vmData(0),
-   _vmCode(0),
--  m_IsSolid(false)
-+  m_IsSolid(false),
-+  _errorMode(false)
- {
-   Ppmd7_Construct(&_ppmd);
- }
-@@ -545,6 +546,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing)
-     return InitPPM();
-   }
- 
-+  TablesRead = false;
-+  TablesOK = false;
-+
-   _lzMode = true;
-   PrevAlignBits = 0;
-   PrevAlignCount = 0;
-@@ -606,6 +610,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing)
-       }
-     }
-   }
-+  if (InputEofError())
-+    return S_FALSE;
-+
-   TablesRead = true;
- 
-   // original code has check here:
-@@ -623,6 +630,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing)
-   RIF(m_LenDecoder.Build(&newLevels[kMainTableSize + kDistTableSize + kAlignTableSize]));
- 
-   memcpy(m_LastLevels, newLevels, kTablesSizesSum);
-+
-+  TablesOK = true;
-+
-   return S_OK;
- }
- 
-@@ -824,7 +834,12 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
-     PpmEscChar = 2;
-     PpmError = true;
-     InitFilters();
-+    _errorMode = false;
-   }
-+
-+  if (_errorMode)
-+    return S_FALSE;
-+
-   if (!m_IsSolid || !TablesRead)
-   {
-     bool keepDecompressing;
-@@ -838,6 +853,8 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
-     bool keepDecompressing;
-     if (_lzMode)
-     {
-+      if (!TablesOK)
-+        return S_FALSE;
-       RINOK(DecodeLZ(keepDecompressing))
-     }
-     else
-@@ -901,8 +918,8 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
-     _unpackSize = outSize ? *outSize : (UInt64)(Int64)-1;
-     return CodeReal(progress);
-   }
--  catch(const CInBufferException &e)  { return e.ErrorCode; }
--  catch(...) { return S_FALSE; }
-+  catch(const CInBufferException &e)  { _errorMode = true; return e.ErrorCode; }
-+  catch(...) { _errorMode = true; return S_FALSE; }
-   // CNewException is possible here. But probably CNewException is caused
-   // by error in data stream.
- }
-diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h
-index c130cec..2f72d7d 100644
---- a/CPP/7zip/Compress/Rar3Decoder.h
-+++ b/CPP/7zip/Compress/Rar3Decoder.h
-@@ -192,6 +192,7 @@ class CDecoder:
-   UInt32 _lastFilter;
- 
-   bool m_IsSolid;
-+  bool _errorMode;
- 
-   bool _lzMode;
-   bool _unsupportedFilter;
-@@ -200,6 +201,7 @@ class CDecoder:
-   UInt32 PrevAlignCount;
- 
-   bool TablesRead;
-+  bool TablesOK;
- 
-   CPpmd7 _ppmd;
-   int PpmEscChar;
diff --git a/main/pahole/APKBUILD b/main/pahole/APKBUILD
new file mode 100644
index 00000000000..3e1fb196212
--- /dev/null
+++ b/main/pahole/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Dominique Martinet <dominique.martinet@atmark-techno.com>
+# Maintainer: Dominique Martinet <dominique.martinet@atmark-techno.com>
+pkgname=pahole
+pkgver=1.25
+pkgrel=0
+pkgdesc="dwarf manipulation utilities"
+url="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
+arch="all"
+license="GPL-2.0-only"
+options="!check" # no test
+makedepends="cmake elfutils-dev libdwarf-dev zlib-dev libbpf-dev
+	linux-headers musl-obstack-dev argp-standalone samurai"
+subpackages="$pkgname-doc"
+source="https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
+
+build() {
+	# use libbpf installed uapi headers as we need something
+	# newer than linux-headers provides
+	export CFLAGS="$CFLAGS -I/usr/include/bpf/uapi"
+
+	cmake -B build -G Ninja . \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=None \
+		-D__LIB=lib \
+		-DCMAKE_MODULE_PATH=/usr/lib/cmake \
+		-DLIBBPF_EMBEDDED=OFF
+	cmake --build build
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --build build --target install
+}
+
+sha512sums="
+79070ed90edae752588fa4213bd180c770cae7870b2c016fba8e265f34d9f3e0ca82fb8cdf39275b5c3f53119d9fb225b1ee5c87a5f95df5beef37d32b4fde15  pahole-v1.25.tar.gz
+"
diff --git a/main/pam-pgsql/APKBUILD b/main/pam-pgsql/APKBUILD
index bb42cb45cbf..0e6aa81aaf8 100644
--- a/main/pam-pgsql/APKBUILD
+++ b/main/pam-pgsql/APKBUILD
@@ -2,34 +2,38 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pam-pgsql
 pkgver=0.7.3.2
-pkgrel=0
+pkgrel=3
 pkgdesc="PAM module to authenticate using a PostgreSQL database"
 url="https://sourceforge.net/projects/pam-pgsql/"
 arch="all"
-license="GPL"
-depends=""
-depends_dev=""
-makedepends="$depends_dev linux-pam-dev postgresql-dev libgcrypt-dev
+license="GPL-2.0-or-later"
+makedepends="$depends_dev linux-pam-dev libpq-dev libgcrypt-dev
 	bsd-compat-headers"
-install=""
 subpackages="$pkgname-doc"
 source="https://downloads.sourceforge.net/project/pam-pgsql/pam-pgsql/0.7/pam-pgsql-$pkgver.tar.gz"
 
-builddir="$srcdir"/pam-pgsql-$pkgver
+prepare() {
+	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		|| return 1
-	make || return 1
+		--libdir=/lib # for pam module
+	make
+}
+
+check() {
+	make check
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d5766e56a13b0b4762fba10d624d12f130f2675f1f1772eaaf275b599f44adcf98287c2636462ba3faf46af139eb1bd157918c0c783040796562f37dec17a6d9  pam-pgsql-0.7.3.2.tar.gz"
+sha512sums="
+d5766e56a13b0b4762fba10d624d12f130f2675f1f1772eaaf275b599f44adcf98287c2636462ba3faf46af139eb1bd157918c0c783040796562f37dec17a6d9  pam-pgsql-0.7.3.2.tar.gz
+"
diff --git a/main/pango/APKBUILD b/main/pango/APKBUILD
index 24db6b7bab2..f63742873b3 100644
--- a/main/pango/APKBUILD
+++ b/main/pango/APKBUILD
@@ -1,21 +1,34 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Simon Zeni <simon@bl4ckb0ne.ca>
 pkgname=pango
-pkgver=1.44.7
-pkgrel=2
-pkgdesc="A library for layout and rendering of text"
-options="!check" # Some tests fail
+pkgver=1.52.2
+pkgrel=0
+pkgdesc="library for layout and rendering of text"
 url="https://www.pango.org/"
 arch="all"
 license="LGPL-2.1-or-later"
 depends_dev="pango-tools=$pkgver-r$pkgrel"
-makedepends="meson cairo-dev expat-dev gobject-introspection-dev help2man
-	fontconfig-dev glib-dev harfbuzz-dev libxft-dev fribidi-dev"
+makedepends="
+	cairo-dev
+	expat-dev
+	fontconfig-dev
+	fribidi-dev
+	glib-dev
+	gobject-introspection-dev
+	gtk-doc
+	harfbuzz-dev
+	help2man
+	libxft-dev
+	meson
+	"
+checkdepends="font-dejavu font-cantarell font-droid font-tlwg"
 install="$pkgname.pre-deinstall"
 triggers="$pkgname.trigger=/usr/lib/pango/*/modules"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-tools"
 source="https://download.gnome.org/sources/pango/${pkgver%.*}/pango-$pkgver.tar.xz
-	fix-include-hb.patch
+	disable-broken-test.patch
 	"
 
 # secfixes:
@@ -23,35 +36,29 @@ source="https://download.gnome.org/sources/pango/${pkgver%.*}/pango-$pkgver.tar.
 #     - CVE-2019-1010238
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	meson  \
-		--prefix=/usr \
-		--buildtype=plain \
-		-Dintrospection=true \
+	abuild-meson \
+		-Db_lto=true \
+		-Dintrospection=enabled \
 		-Dgtk_doc=false \
 		build
-	ninja -C build
+	meson compile -C build
 }
 
 check() {
-	cd "$builddir"
-	ninja -C build test
+	meson test --no-rebuild --print-errorlogs -C build
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	mkdir -p "$pkgdir"/etc/pango
-	DESTDIR="$pkgdir" ninja -C build install
-
-	rm -rf "$pkgdir"/usr/share/installed-tests
-	rm -rf "$pkgdir"/usr/libexec/installed-tests
+	DESTDIR="$pkgdir" meson install --no-rebuild -C build
 }
 
 tools() {
 	pkgdesc="$pkgdesc (tools)"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin
+
+	amove usr/bin
 }
 
-sha512sums="6e0a3d5cd32c209fd71a2ce5f705a60db318c2133bcca07360a047a73892f642a1661c1f0fb90353fc43e75336dfc22909bf4969f1bd03324c9689344af08350  pango-1.44.7.tar.xz
-0db43f91c7da15cb90d6e5bea18a4cf3f2afe7c11979eff60ce61e84a287f404114d4250cb03bdc48323af84ec2c578f3a7ee830d1d965f203d5e1979f6360fa  fix-include-hb.patch"
+sha512sums="
+6b3d762d133e7c900c6dfa85f43c950699930f6149cb3c90bf0e787f1b5a126a0b90220b90e649f84e4c244e44c46d4b575d5d7afeb305232c333712effc0981  pango-1.52.2.tar.xz
+b347c5dcdbe2a19f1d801193a3d309d3c14ff8474759b3ec74cc7d4714a3ac6aacce8b4ae770ba5172524a7be5654820839c5edd689d3957a2b55fedc875a5fb  disable-broken-test.patch
+"
diff --git a/main/pango/disable-broken-test.patch b/main/pango/disable-broken-test.patch
new file mode 100644
index 00000000000..66b2d7b3ed9
--- /dev/null
+++ b/main/pango/disable-broken-test.patch
@@ -0,0 +1,13 @@
+diff -U3 -r a/tests/meson.build b/tests/meson.build
+diff --git a/tests/meson.build b/tests/meson.build
+index 8b4bfa3..287a001 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -62,7 +62,6 @@
+     if host_system != 'darwin'
+       tests += [
+         [ 'test-layout', [ 'test-layout.c', 'test-common.c' ], [ libpangocairo_dep, libpangoft2_dep ] ],
+-        [ 'test-fonts', [ 'test-fonts.c', 'test-common.c' ], [ libpangocairo_dep, libpangoft2_dep ] ],
+         [ 'test-no-fonts', [ 'test-no-fonts.c' ], [ libpangocairo_dep, libpangoft2_dep ] ],
+       ]
+     endif
diff --git a/main/pango/fix-include-hb.patch b/main/pango/fix-include-hb.patch
deleted file mode 100644
index 350df11d152..00000000000
--- a/main/pango/fix-include-hb.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/pango/pango-coverage.h b/pango/pango-coverage.h
-index 9189af2..e46f34d 100644
---- a/pango/pango-coverage.h
-+++ b/pango/pango-coverage.h
-@@ -25,7 +25,7 @@
- #include <glib.h>
- 
- #include <pango/pango-version-macros.h>
--#include <hb.h>
-+#include <harfbuzz/hb.h>
- 
- G_BEGIN_DECLS
- 
-diff --git a/pango/pango-font.h b/pango/pango-font.h
-index 13730fa..41d9dff 100644
---- a/pango/pango-font.h
-+++ b/pango/pango-font.h
-@@ -26,7 +26,7 @@
- #include <pango/pango-types.h>
- 
- #include <glib-object.h>
--#include <hb.h>
-+#include <harfbuzz/hb.h>
- 
- G_BEGIN_DECLS
- 
-diff --git a/pango/pangofc-fontmap.h b/pango/pangofc-fontmap.h
-index 495adc5..7835146 100644
---- a/pango/pangofc-fontmap.h
-+++ b/pango/pangofc-fontmap.h
-@@ -26,7 +26,7 @@
- #include <fontconfig/fontconfig.h>
- #include <pango/pangofc-decoder.h>
- #include <pango/pangofc-font.h>
--#include <hb.h>
-+#include <harfbuzz/hb.h>
- 
- G_BEGIN_DECLS
- 
diff --git a/main/parallel/APKBUILD b/main/parallel/APKBUILD
index 3231ac5dc32..8c980f0cd4a 100644
--- a/main/parallel/APKBUILD
+++ b/main/parallel/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
 pkgname=parallel
-pkgver=20200222
+pkgver=20240322
 pkgrel=0
 pkgdesc="Shell tool for executing jobs in parallel"
 arch="noarch"
@@ -9,7 +9,7 @@ url="https://www.gnu.org/software/parallel"
 license="GPL-3.0-or-later"
 options="!check" # Test suite not part of src pkg
 depends="perl"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-bash-completion $pkgname-zsh-completion"
 source="https://ftp.gnu.org/gnu/parallel/parallel-$pkgver.tar.bz2"
 
 build() {
@@ -27,4 +27,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a9b5ed83f338c47612451d4c2eb064540c49ea3e30ef9ee8d33acc2fc87712f6bc876c3aeb3b727000579025acf93cfb96699709bd05521e581492d2587d498c  parallel-20200222.tar.bz2"
+sha512sums="
+5eefc4dd8c320b3607eabc14924317340d74bbc56e4b0ede8cf7091380b433e6c8b2dac61711921516591396997b3e18a7737e0a06724ed7190cf3a8b37258af  parallel-20240322.tar.bz2
+"
diff --git a/main/parted/APKBUILD b/main/parted/APKBUILD
index cb34522b1b8..627b4735ca7 100644
--- a/main/parted/APKBUILD
+++ b/main/parted/APKBUILD
@@ -1,18 +1,30 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=parted
-pkgver=3.3
-pkgrel=0
+pkgver=3.6
+pkgrel=2
 pkgdesc="Utility to create, destroy, resize, check and copy partitions"
 url="https://www.gnu.org/software/parted/parted.html"
 arch="all"
 license="GPL-3.0-or-later"
+makedepends="
+	bash
+	lvm2-dev
+	ncurses-dev
+	readline-dev
+	util-linux-dev
+	"
+checkdepends="
+	coreutils
+	eudev
+	perl
+	util-linux
+	"
 subpackages="$pkgname-dev $pkgname-doc"
-checkdepends="perl eudev util-linux"
-makedepends="readline-dev ncurses-dev lvm2-dev bash util-linux-dev"
 source="https://ftp.gnu.org/gnu/parted/parted-$pkgver.tar.xz
 	fix-includes.patch
 	fix-libintl-header-s390x.patch
 	parted-include-sysmacros.patch
+	fix-truncate-tests.patch
 	make-tests.patch
 	skip-duplicate-bsd-test-on-s390x.patch
 	"
@@ -30,17 +42,22 @@ build() {
 }
 
 check() {
-	make check
+	make check || {
+		cat tests/test-suite.log
+		return 1
+	}
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
-	rm -rf "$pkgdir"/usr/lib/charset.alias
-	rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
 }
-sha512sums="d1384694a491aa53bab6206fdeccd1d192de2ed379fe25aa865dd6aa06ed945a728e85b2ccc2fb23f5aa9dfee4a8bd8f0f2be1dd386cb8e8861b73382c6a07e4  parted-3.3.tar.xz
+
+sha512sums="
+034a44b25718acba175212019d24f092972a791c5bd1d921ae91e17478657a77c5c5dd0c832bed7968c3a07ec6c65c0785acfac2f90c1ca5e1692f3c141693ef  parted-3.6.tar.xz
 55ee63c218d1867c0f2c596e7c3eec5c42af160181456cc551fe3d432eabed0ac2dd3a3955ff0c375f76aeec8071e7f55a32834b87a0d39b8ef30361f671bfdd  fix-includes.patch
 444a7e2fb3235dfd218f6b71fb25adde107d001f638d988ee1fa79686d8efee94a9499e27bdfdd75f9718760b448938b70a90a74285b93a39338d21f4ab4c9dc  fix-libintl-header-s390x.patch
 ba86cd2591d8e920e474faf28a32f9eaca9482e168c53eae5d392276aefaf6c46b66a0d5fc4a18b7186bf38f7288bd79de8ba8019c1cd38a5e2102904ce75723  parted-include-sysmacros.patch
-a8995b87f1bb1c9c357fc4729a17b629291f918df2b65548789d41537af5c3972238b2ad65d845738bd76f8b63673d075227c0de0bbf7f7f061cc36adec0c19d  make-tests.patch
-d19ad61cffb6434f1433c2da29dc6c137076125ddd23936ca26298db5d120dc8ec64788556599a1a8522d10630bca48258d7dfa9fd633551b791275bdc2c68d0  skip-duplicate-bsd-test-on-s390x.patch"
+cca125b891739fd65c38a05638105ea15f77a71b9780af891bb56523b67e9ec3188be18109c3166be445bc03409de85d09e994d7dbbe13d663312df7dda2a2fa  fix-truncate-tests.patch
+8bf7fce435092baba6855cefca75b701124941741417e2f7f5b78f68da5c0f33013232b411fa04b3532c37c347d75bbfa9279221985d0f0080d1b2a48863e6c1  make-tests.patch
+42120158f44705b416162edd5e2d61635d34ff88878d84fc8110a169fd927ec3d714376a52e60e55d041e80afd8edad6429b1b5897e0738d23c6583a7bfc09bc  skip-duplicate-bsd-test-on-s390x.patch
+"
diff --git a/main/parted/fix-truncate-tests.patch b/main/parted/fix-truncate-tests.patch
new file mode 100644
index 00000000000..c7c6667f969
--- /dev/null
+++ b/main/parted/fix-truncate-tests.patch
@@ -0,0 +1,48 @@
+Fixes for BusyBox's truncate
+--- a/tests/t0290-gpt-name.sh
++++ b/tests/t0290-gpt-name_.sh
+@@ -21,7 +21,7 @@
+ 
+ dev=loop-file
+ 
+-truncate --size 50MiB "$dev" || fail=1
++truncate -s 50M "$dev" || fail=1
+ 
+ # create partition with empty name
+ parted --script "$dev" mklabel gpt mkpart '""' ext4 1MiB 49MiB > out 2>&1 || fail=1
+
+--- a/tests/t0215-gpt-attrs.sh
++++ b/tests/t0215-gpt-attrs.sh
+@@ -23,7 +23,7 @@
+ dev=loop-file
+ 
+ # create device
+-truncate --size 50MiB "$dev" || fail=1
++truncate -s 50M "$dev" || fail=1
+ 
+ # create gpt label and one partitions
+ parted --script "$dev" mklabel gpt > out 2>&1 || fail=1
+
+--- a/tests/t0801-json-msdos.sh
++++ b/tests/t0801-json-msdos.sh
+@@ -23,7 +23,7 @@
+ dev=loop-file
+ 
+ # create device
+-truncate --size 50MiB "$dev" || fail=1
++truncate -s 50M "$dev" || fail=1
+ 
+ # create msdos label and some partitions
+ parted --script "$dev" mklabel msdos > out 2>&1 || fail=1
+
+--- a/tests/t0800-json-gpt.sh
++++ b/tests/t0800-json-gpt.sh
+@@ -23,7 +23,7 @@
+ dev=loop-file
+ 
+ # create device
+-truncate --size 50MiB "$dev" || fail=1
++truncate -s 50M "$dev" || fail=1
+ 
+ # create gpt label and some partitions
+ parted --script "$dev" mklabel gpt > out 2>&1 || fail=1
diff --git a/main/parted/make-tests.patch b/main/parted/make-tests.patch
index edadee9fee3..8b36a5a940a 100644
--- a/main/parted/make-tests.patch
+++ b/main/parted/make-tests.patch
@@ -1,8 +1,6 @@
-diff --git a/tests/Makefile.in b/tests/Makefile.in
-index 11baba0..2288cc7 100644
 --- a/tests/Makefile.in
 +++ b/tests/Makefile.in
-@@ -1622,16 +1622,12 @@ TEST_EXTENSIONS = .sh
+@@ -1771,16 +1771,12 @@
  SH_LOG_COMPILER = $(SHELL)
  TESTS = \
    help-version.sh \
@@ -19,8 +17,10 @@ index 11baba0..2288cc7 100644
    t0203-gpt-create-on-min-sized-device.sh \
    t0205-gpt-list-clobbers-pmbr.sh \
    t0206-gpt-print-with-corrupt-primary-clobbers-pmbr.sh \
-@@ -1644,14 +1640,9 @@ TESTS = \
+@@ -1792,17 +1788,11 @@
+   t0212-gpt-many-partitions.sh \
    t0213-mkpart-start-negative.sh \
+-  t0215-gpt-attrs.sh \
    t0220-gpt-msftres.sh \
    t0250-gpt.sh \
 -  t0251-gpt-unicode.sh \
@@ -28,15 +28,16 @@ index 11baba0..2288cc7 100644
 -  t0281-gpt-grow.sh \
 -  t0282-gpt-move-backup.sh \
 -  t0283-overlap-partitions.sh \
+   t0290-gpt-name.sh \
    t0300-dos-on-gpt.sh \
    t0301-overwrite-gpt-pmbr.sh \
 -  t0350-mac-PT-increases-sector-size.sh \
    t0400-loop-clobber-infloop.sh \
    t0500-dup-clobber.sh \
    t0501-duplicate.sh \
-@@ -1673,8 +1664,6 @@ TESTS = \
-   t3200-resize-partition.sh \
+@@ -1827,8 +1818,6 @@
    t3200-type-change.sh \
+   t3210-gpt-type-change.sh \
    t3300-palo-prep.sh \
 -  t3310-flags.sh \
 -  t3400-whole-disk-FAT-partition.sh \
diff --git a/main/parted/skip-duplicate-bsd-test-on-s390x.patch b/main/parted/skip-duplicate-bsd-test-on-s390x.patch
index 6920ee2c9a2..f938e5b874b 100644
--- a/main/parted/skip-duplicate-bsd-test-on-s390x.patch
+++ b/main/parted/skip-duplicate-bsd-test-on-s390x.patch
@@ -1,16 +1,16 @@
-diff --git a/tests/t0501-duplicate.sh b/tests/t0501-duplicate.sh
-index 66d321a..0520131 100644
 --- a/tests/t0501-duplicate.sh
 +++ b/tests/t0501-duplicate.sh
-@@ -18,7 +18,11 @@
+@@ -18,9 +18,13 @@
  
  . "${srcdir=.}/init.sh"; path_prepend_ ../parted .
  
 +arch=$(uname -m)
- for t in msdos gpt bsd; do
-+    if [ "$t" = bsd ] && [ "$arch" = "s390x" ]; then
-+        continue
-+    fi
-     duplicate $t || fail=1
- done
- 
+ for t in msdos gpt bsd sun atari mac pc98; do
+     case $t in
+       atari) [ $ss -ne 512 ] && continue
++          ;;
++      bsd) [ "$arch" = "s390x" ] && continue
++      	  duplicate $t || fail=1
+           ;;
+       *) duplicate $t || fail=1
+           ;;
diff --git a/main/partimage/APKBUILD b/main/partimage/APKBUILD
deleted file mode 100644
index 662cf137594..00000000000
--- a/main/partimage/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
-pkgname=partimage
-pkgver=0.6.9
-pkgrel=8
-pkgdesc="Saves partitions having a supported filesystem to an image file"
-options="!check" # No testsuite
-url="http://www.partimage.org"
-arch="all"
-license="GPL-2.0-or-later"
-makedepends="linux-headers bzip2-dev newt-dev zlib-dev gettext-dev slang-dev
-	openssl-dev autoconf automake libtool"
-subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/project/$pkgname/stable/$pkgver/$pkgname-$pkgver.tar.bz2
-	partimage-0.6.9-zlib-1.2.6.patch
-	partimage-0.6.9-common.patch
-	partimage-include-sysmacros.patch
-	Use-SSLv3-by-default.patch
-	openssl-1.1.patch
-	"
-
-prepare() {
-	default_prepare
-	autoreconf -vif
-}
-
-build() {
-	cd "$builddir"
-	export LIBS="$LIBS -lintl"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--disable-nls
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="252885921b23933fdcdf0bb6efa4b82066b08ca95cc653296912d384ae875b421c1d39f347a90115315139176d4eab4a930c24919c2d38cf00ed29c764cd14d9  partimage-0.6.9.tar.bz2
-f6feaf6967620ca5512aec50ada13e1b3676976ee2e04cebb3cd64c991ec8be47b337cd99c2656b3a1c77ce4ea25661784a8217f6d8325fd346f1d15463392ce  partimage-0.6.9-zlib-1.2.6.patch
-39faba3b75302c0fb04e343b3854549c06447e28040f9c49a83d595533901e3c6af252a18d8db0394cbaabc7c9c1bde014f2d423cab80dadb6ea5322dc19a381  partimage-0.6.9-common.patch
-bffd175117aa18f558521b0b33eeeb287b88e0c64e69209802e49f9284da72a7443eeb47b62de928f198e20ff0c06d86ffe3bb29fdb5119adf7bc9aa39b608f3  partimage-include-sysmacros.patch
-580d9ef868b423fd77282839f619239f92789e202fc25cb2ee409ecc43424f89bd5d31314a6aba183ef36a61b427cb24a0ca1f62f53235b5bc60f574c5469a1b  Use-SSLv3-by-default.patch
-bd1bc43bed6d6829ea8d15ff8b278807815de776c8f4fe1a86a1c3695dd3c8cadc155e5bcaf7f030ca8d0fac10ad3ad48a52a29cde15832511ae52fcc307edb6  openssl-1.1.patch"
diff --git a/main/partimage/Use-SSLv3-by-default.patch b/main/partimage/Use-SSLv3-by-default.patch
deleted file mode 100644
index cf219957e66..00000000000
--- a/main/partimage/Use-SSLv3-by-default.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 8b05af027723ff3a64040275d4050ff0e992d629 Mon Sep 17 00:00:00 2001
-From: Marko Kohtala <marko.kohtala@gmail.com>
-Date: Sun, 9 Feb 2014 22:54:11 +0200
-Subject: [PATCH] Use SSLv3 by default
-
-SSLv2_client_method may be hidden. Use the SSLv23_client_method instead.
-
-This is a fix from Debian package partimage-0.6.8-2.2.
-
-Signed-off-by: Marko Kohtala <marko.kohtala@gmail.com>
----
- src/client/netclient.cpp | 3 +--
- src/client/netclient.h   | 6 ------
- src/server/netserver.cpp | 3 +--
- src/server/netserver.h   | 6 ------
- 4 files changed, 2 insertions(+), 16 deletions(-)
-
-diff --git a/src/client/netclient.cpp b/src/client/netclient.cpp
-index 30b8d5c..43b2672 100644
---- a/src/client/netclient.cpp
-+++ b/src/client/netclient.cpp
-@@ -43,9 +43,8 @@ CNetClient::CNetClient(bool bMustLogin, bool bUseSSL):CNet()
-     {
-       showDebug(3, "initializing client ssl\n");
-       SSLeay_add_ssl_algorithms();
--      meth = SSLv2_client_method();
-       SSL_load_error_strings();
--      ctx = SSL_CTX_new(meth);
-+      ctx = SSL_CTX_new(SSLv23_client_method());
-       if (!ctx)
-         THROW(ERR_SSL_CTX);
-       m_bUseSSL = (ctx != NULL);
-diff --git a/src/client/netclient.h b/src/client/netclient.h
-index 8423798..9d98b39 100644
---- a/src/client/netclient.h
-+++ b/src/client/netclient.h
-@@ -35,12 +35,6 @@ class CNetClient : public CNet
- #ifdef HAVE_SSL
-   SSL_CTX * ctx;
-   X509 * server_cert;
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
--  SSL_METHOD const * meth;
--#else
--  SSL_METHOD * meth;
--#endif // OPENSSL_VERSION_NUMBER
--
- #endif
-   bool m_bUseSSL;
-   bool m_bMustLogin;
-diff --git a/src/server/netserver.cpp b/src/server/netserver.cpp
-index a542760..28c43cc 100644
---- a/src/server/netserver.cpp
-+++ b/src/server/netserver.cpp
-@@ -39,8 +39,7 @@ CNetServer::CNetServer( uint32_t ip4_addr, unsigned short int port):CNet()
-     {
-       SSL_load_error_strings();
-       SSLeay_add_ssl_algorithms();
--      meth = SSLv23_server_method();
--      ctx = SSL_CTX_new(meth);
-+      ctx = SSL_CTX_new(SSLv23_server_method());
-       if (!ctx)
-         {
-           ERR_print_errors_fp(stderr);
-diff --git a/src/server/netserver.h b/src/server/netserver.h
-index 01f6b6c..29d2a32 100644
---- a/src/server/netserver.h
-+++ b/src/server/netserver.h
-@@ -41,12 +41,6 @@ class CNetServer : public CNet
- #ifdef HAVE_SSL
-   SSL_CTX * ctx;
-   X509 * client_cert;
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
--  SSL_METHOD const * meth; 
--#else
--  SSL_METHOD * meth;
--#endif // OPENSSL_VERSION_NUMBER
-- 
-   int err;
- #endif
- 
diff --git a/main/partimage/openssl-1.1.patch b/main/partimage/openssl-1.1.patch
deleted file mode 100644
index 49c8b2182d7..00000000000
--- a/main/partimage/openssl-1.1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index bb2ff61..cd3cc9a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -240,7 +240,7 @@ if test "$SSL" = "yes"; then
-   AC_CHECKING([ for SSL Library and Header files ... ])
-   AC_SEARCH_HEADERS(rsa.h crypto.h x509.h pem.h ssl.h err.h,
-     $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include,
--    [  AC_CHECK_LIB(crypto, CRYPTO_lock, [LIBS="$LIBS -lcrypto"],
-+    [  AC_CHECK_LIB(crypto, X509_new, [LIBS="$LIBS -lcrypto"],
-         AC_MSG_ERROR([ Required for SSL Crypto Library not found. ])
-       )
-        AC_CHECK_LIB(ssl, SSL_CTX_new,
diff --git a/main/partimage/partimage-0.6.9-common.patch b/main/partimage/partimage-0.6.9-common.patch
deleted file mode 100644
index 98d3df89322..00000000000
--- a/main/partimage/partimage-0.6.9-common.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/shared/common.h
-+++ b/src/shared/common.h
-@@ -21,6 +21,7 @@
- 
- #include <stdarg.h>
- #include <pthread.h>
-+#include <sys/types.h>
- 
- #include <sys/param.h>
- 
diff --git a/main/partimage/partimage-0.6.9-zlib-1.2.6.patch b/main/partimage/partimage-0.6.9-zlib-1.2.6.patch
deleted file mode 100644
index 9922daa811b..00000000000
--- a/main/partimage/partimage-0.6.9-zlib-1.2.6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/src/client/imagefile.cpp b/src/client/imagefile.cpp
-index dd83411..62d0f72 100644
---- a/src/client/imagefile.cpp
-+++ b/src/client/imagefile.cpp
-@@ -783,7 +783,7 @@ void CImage::openWriting()
-   else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
-     {
-       showDebug(1, "open gzip\n");
--      m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "wb"); //"wb1h");
-+      m_gzImageFile = gzdopen(m_nFdImage, "wb"); //"wb1h");
-       if (m_gzImageFile == NULL)
-    {
-      showDebug(1, "error:%d %s\n", errno, strerror(errno));
-@@ -1098,7 +1098,7 @@ void CImage::openReading(CVolumeHeader *vh /* = NULL */)
-     }
-   else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
-     {
--      m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "rb");
-+      m_gzImageFile = gzdopen(m_nFdImage, "rb");
-       if (m_gzImageFile == NULL)
-         THROW(ERR_ERRNO, errno);
-       else
-diff --git a/src/client/imagefile.h b/src/client/imagefile.h
-index 4ba8910..6adb098 100644
---- a/src/client/imagefile.h
-+++ b/src/client/imagefile.h
-@@ -41,7 +41,7 @@ class CImage
-   COptions m_options;
-
-   FILE *m_fImageFile;
--  gzFile *m_gzImageFile;
-+  gzFile m_gzImageFile;
-   BZFILE *m_bzImageFile;
-
-   int m_nFdImage;
diff --git a/main/partimage/partimage-include-sysmacros.patch b/main/partimage/partimage-include-sysmacros.patch
deleted file mode 100644
index cd84e2a3b80..00000000000
--- a/main/partimage/partimage-include-sysmacros.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/client/misc.cpp
-+++ b/src/client/misc.cpp
-@@ -40,6 +40,7 @@
- 
- #include <ctype.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/ioctl.h>
- #include <sys/mount.h>
- #include <sys/time.h>
diff --git a/main/patch/0003-memory-allocation.patch b/main/patch/0003-memory-allocation.patch
new file mode 100644
index 00000000000..c816b48de06
--- /dev/null
+++ b/main/patch/0003-memory-allocation.patch
@@ -0,0 +1,88 @@
+Patch-Source: https://github.com/mirror/patch/commit/61d7788b83b302207a67b82786f4fd79e3538f30
+--
+From 61d7788b83b302207a67b82786f4fd79e3538f30 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruen@gnu.org>
+Date: Thu, 27 Jun 2019 11:10:43 +0200
+Subject: [PATCH] Don't crash when RLIMIT_NOFILE is set to RLIM_INFINITY
+
+* src/safe.c (min_cached_fds): Define minimum number of cached dir file
+descriptors.
+(max_cached_fds): Change type to rlim_t to allow storing RLIM_INFINITY.
+(init_dirfd_cache): Set max_cached_fds to RLIM_INFINITY when RLIMIT_NOFILE is
+RLIM_INFINITY.  Set the initial hash table size to min_cached_fds, independent
+of RLIMIT_NOFILE: patches commonly only affect one or a few files, so a small
+hash table will usually suffice; if needed, the hash table will grow.
+(insert_cached_dirfd): Don't shrink the cache when max_cached_fds is
+RLIM_INFINITY.
+---
+ src/safe.c | 36 +++++++++++++++++++++++-------------
+ 1 file changed, 23 insertions(+), 13 deletions(-)
+
+diff --git a/src/safe.c b/src/safe.c
+index 5a7202f..f147b0e 100644
+--- a/src/safe.c
++++ b/src/safe.c
+@@ -67,7 +67,8 @@ struct cached_dirfd {
+ };
+ 
+ static Hash_table *cached_dirfds = NULL;
+-static size_t max_cached_fds;
++static rlim_t min_cached_fds = 8;
++static rlim_t max_cached_fds;
+ LIST_HEAD (lru_list);
+ 
+ static size_t hash_cached_dirfd (const void *entry, size_t table_size)
+@@ -98,11 +99,17 @@ static void init_dirfd_cache (void)
+ {
+   struct rlimit nofile;
+ 
+-  max_cached_fds = 8;
+   if (getrlimit (RLIMIT_NOFILE, &nofile) == 0)
+-    max_cached_fds = MAX (nofile.rlim_cur / 4, max_cached_fds);
++    {
++      if (nofile.rlim_cur == RLIM_INFINITY)
++        max_cached_fds = RLIM_INFINITY;
++      else
++	max_cached_fds = MAX (nofile.rlim_cur / 4, min_cached_fds);
++    }
++  else
++    max_cached_fds = min_cached_fds;
+ 
+-  cached_dirfds = hash_initialize (max_cached_fds,
++  cached_dirfds = hash_initialize (min_cached_fds,
+ 				   NULL,
+ 				   hash_cached_dirfd,
+ 				   compare_cached_dirfds,
+@@ -148,20 +155,23 @@ static void insert_cached_dirfd (struct cached_dirfd *entry, int keepfd)
+   if (cached_dirfds == NULL)
+     init_dirfd_cache ();
+ 
+-  /* Trim off the least recently used entries */
+-  while (hash_get_n_entries (cached_dirfds) >= max_cached_fds)
++  if (max_cached_fds != RLIM_INFINITY)
+     {
+-      struct cached_dirfd *last =
+-	list_entry (lru_list.prev, struct cached_dirfd, lru_link);
+-      if (&last->lru_link == &lru_list)
+-	break;
+-      if (last->fd == keepfd)
++      /* Trim off the least recently used entries */
++      while (hash_get_n_entries (cached_dirfds) >= max_cached_fds)
+ 	{
+-	  last = list_entry (last->lru_link.prev, struct cached_dirfd, lru_link);
++	  struct cached_dirfd *last =
++	    list_entry (lru_list.prev, struct cached_dirfd, lru_link);
+ 	  if (&last->lru_link == &lru_list)
+ 	    break;
++	  if (last->fd == keepfd)
++	    {
++	      last = list_entry (last->lru_link.prev, struct cached_dirfd, lru_link);
++	      if (&last->lru_link == &lru_list)
++		break;
++	    }
++	  remove_cached_dirfd (last);
+ 	}
+-      remove_cached_dirfd (last);
+     }
+ 
+   /* Only insert if the parent still exists. */
diff --git a/main/patch/0004-fix-memleak.patch b/main/patch/0004-fix-memleak.patch
new file mode 100644
index 00000000000..0209e99acce
--- /dev/null
+++ b/main/patch/0004-fix-memleak.patch
@@ -0,0 +1,100 @@
+Patch-Source: https://github.com/archlinux/svntogit-packages/blob/c08d2ec698bc46d4134fc2028d5ac9df1db6e89d/trunk/19599883ffb6a450d2884f081f8ecf68edbed7ee.patch
+From 19599883ffb6a450d2884f081f8ecf68edbed7ee Mon Sep 17 00:00:00 2001
+From: Jean Delvare <jdelvare@suse.de>
+Date: Thu, 3 May 2018 14:31:55 +0200
+Subject: [PATCH] Don't leak temporary file on failed ed-style patch
+
+Now that we write ed-style patches to a temporary file before we
+apply them, we need to ensure that the temporary file is removed
+before we leave, even on fatal error.
+
+* src/pch.c (do_ed_script): Use global TMPEDNAME instead of local
+  tmpname. Don't unlink the file directly, instead tag it for removal
+  at exit time.
+* src/patch.c (cleanup): Unlink TMPEDNAME at exit.
+
+This closes bug #53820:
+https://savannah.gnu.org/bugs/index.php?53820
+
+Fixes: 123eaff0d5d1 ("Fix arbitrary command execution in ed-style patches (CVE-2018-1000156)")
+---
+ src/common.h |  2 ++
+ src/patch.c  |  1 +
+ src/pch.c    | 11 +++++------
+ 3 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/src/common.h b/src/common.h
+index 904a3f8..53c5e32 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -94,10 +94,12 @@ XTERN char const *origsuff;
+ XTERN char const * TMPINNAME;
+ XTERN char const * TMPOUTNAME;
+ XTERN char const * TMPPATNAME;
++XTERN char const * TMPEDNAME;
+ 
+ XTERN bool TMPINNAME_needs_removal;
+ XTERN bool TMPOUTNAME_needs_removal;
+ XTERN bool TMPPATNAME_needs_removal;
++XTERN bool TMPEDNAME_needs_removal;
+ 
+ #ifdef DEBUGGING
+ XTERN int debug;
+diff --git a/src/patch.c b/src/patch.c
+index 3fcaec5..9146597 100644
+--- a/src/patch.c
++++ b/src/patch.c
+@@ -1999,6 +1999,7 @@ cleanup (void)
+   remove_if_needed (TMPINNAME, &TMPINNAME_needs_removal);
+   remove_if_needed (TMPOUTNAME, &TMPOUTNAME_needs_removal);
+   remove_if_needed (TMPPATNAME, &TMPPATNAME_needs_removal);
++  remove_if_needed (TMPEDNAME, &TMPEDNAME_needs_removal);
+   remove_if_needed (TMPREJNAME, &TMPREJNAME_needs_removal);
+   output_files (NULL);
+ }
+diff --git a/src/pch.c b/src/pch.c
+index 79a3c99..1bb3153 100644
+--- a/src/pch.c
++++ b/src/pch.c
+@@ -2396,7 +2396,6 @@ do_ed_script (char const *inname, char const *outname,
+     file_offset beginning_of_this_line;
+     size_t chars_read;
+     FILE *tmpfp = 0;
+-    char const *tmpname;
+     int tmpfd;
+     pid_t pid;
+
+@@ -2411,12 +2410,13 @@ do_ed_script (char const *inname, char const *outname,
+ 	   invalid commands and treats the next line as a new command, which
+ 	   can lead to arbitrary command execution.  */
+ 
+-	tmpfd = make_tempfile (&tmpname, 'e', NULL, O_RDWR | O_BINARY, 0);
++	tmpfd = make_tempfile (&TMPEDNAME, 'e', NULL, O_RDWR | O_BINARY, 0);
+ 	if (tmpfd == -1)
+-	  pfatal ("Can't create temporary file %s", quotearg (tmpname));
++	  pfatal ("Can't create temporary file %s", quotearg (TMPEDNAME));
++	TMPEDNAME_needs_removal = true;
+ 	tmpfp = fdopen (tmpfd, "w+b");
+ 	if (! tmpfp)
+-	  pfatal ("Can't open stream for file %s", quotearg (tmpname));
++	  pfatal ("Can't open stream for file %s", quotearg (TMPEDNAME));
+       }
+ 
+     for (;;) {
+@@ -2457,7 +2457,7 @@ do_ed_script (char const *inname, char const *outname,
+       write_fatal ();
+ 
+     if (lseek (tmpfd, 0, SEEK_SET) == -1)
+-      pfatal ("Can't rewind to the beginning of file %s", quotearg (tmpname));
++      pfatal ("Can't rewind to the beginning of file %s", quotearg (TMPEDNAME));
+ 
+     if (inerrno != ENOENT)
+       {
+@@ -2484,7 +2484,6 @@ do_ed_script (char const *inname, char const *outname,
+       pfatal ("Failed to duplicate standard input");
+ 
+     fclose (tmpfp);
+-    safe_unlink (tmpname);
+ 
+     if (ofp)
+       {
diff --git a/main/patch/APKBUILD b/main/patch/APKBUILD
index ac8c05c93be..b7ed0f10ffd 100644
--- a/main/patch/APKBUILD
+++ b/main/patch/APKBUILD
@@ -2,31 +2,36 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=patch
 pkgver=2.7.6
-pkgrel=6
+pkgrel=10
 pkgdesc="Utility to apply diffs to files"
 url="https://www.gnu.org/software/patch/patch.html"
 arch="all"
 license="GPL-3.0-or-later"
-depends=""
 makedepends="autoconf automake"
 # testsuite needs coreutils due to bug in busybox `cat -ve`
 # http://lists.busybox.net/pipermail/busybox/2018-April/086401.html
 checkdepends="coreutils bash ed"
 subpackages="$pkgname-doc"
-source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
-	CVE-2018-6951.patch
-	CVE-2018-6952.patch
+source="https://ftp.gnu.org/gnu/patch/patch-$pkgver.tar.xz
 	0001-Allow-input-files-to-be-missing-for-ed-style-patches.patch
 	0002-Fix-arbitrary-command-execution-in-ed-style-patches-.patch
+	0003-memory-allocation.patch
+	0004-fix-memleak.patch
+	CVE-2018-6951.patch
+	CVE-2018-6952.patch
 	CVE-2019-13636.patch
 	CVE-2019-13638.patch
+	CVE-2019-20633.patch
 	"
 builddir="$srcdir"/$pkgname-$pkgver
 
 # secfixes:
+#   2.7.6-r7:
+#     - CVE-2019-20633
 #   2.7.6-r6:
 #     - CVE-2018-1000156
 #     - CVE-2019-13638
+#     - CVE-2018-20969
 #   2.7.6-r5:
 #     - CVE-2019-13636
 #   2.7.6-r2:
@@ -36,6 +41,8 @@ builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	default_prepare
+	update_config_sub
+
 	aclocal && autoheader && autoconf && automake --add-missing
 }
 
@@ -65,10 +72,15 @@ package() {
 	rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
 }
 
-sha512sums="fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd  patch-2.7.6.tar.xz
-db51d0b791d38dd4f1b373621ee18620ae339b172f58a79420fdaa4a4b1b1d9df239cf61bbddc4e6a4896b28b8cffc7c99161eb5e2facaec8df86a1bf7755bc0  CVE-2018-6951.patch
-5d2eaef629bae92e5b4e5e57d140c24a73e2811306d5f2854858f846646b034d2da315071f478bcf6f8d856a065b9bb073f76322e8e3a42616bc212281ce6945  CVE-2018-6952.patch
+sha512sums="
+fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd  patch-2.7.6.tar.xz
 33e8a82f5ee6b896fd434e7de1ca9e16e8d317941a021bea8c53afd5bf210774e8727df22f8d8f63f255de10de5a26428047bc710b033423d1e7a459cbbaf83a  0001-Allow-input-files-to-be-missing-for-ed-style-patches.patch
 d0d46e28c5fdcd5fe16826cbcf39d5a74fdf2593375d5206aa7bad759f16dbebeca3bf259239f99c13344579044a3de1000d705065cc19e917266bca6e5c0630  0002-Fix-arbitrary-command-execution-in-ed-style-patches-.patch
+3dd30ef35da27f83678fe61ae132de0e9f7c3262831ada5decbe8ac970bf928d7fad9c99f58484f90898b15ce11f297cd078588c29f8528e582842a9bd66d74f  0003-memory-allocation.patch
+94a8dc8eddd814f0837a8cb673f09d8a6cd12072b46466d94e01d8273ef7499a9d0568f5cae53ef80983b36cb00de272ae8054a7a5755c043bc01c1bafdc96a2  0004-fix-memleak.patch
+db51d0b791d38dd4f1b373621ee18620ae339b172f58a79420fdaa4a4b1b1d9df239cf61bbddc4e6a4896b28b8cffc7c99161eb5e2facaec8df86a1bf7755bc0  CVE-2018-6951.patch
+5d2eaef629bae92e5b4e5e57d140c24a73e2811306d5f2854858f846646b034d2da315071f478bcf6f8d856a065b9bb073f76322e8e3a42616bc212281ce6945  CVE-2018-6952.patch
 029b92bb899d0b1165cfe7f55b5a4c2d7090852f52e5c85a6bb1cf5913c914a5c68c6c34517e84f0a020a56d21814f8c18b934c8ebe059ba4eddece78a3a258c  CVE-2019-13636.patch
-d60f8c2364fca9b73aa73b5914cfd6571d11528d13fa7703ccfa93730cbdf8a6e4c9ca04cb7d02a40d33c38075890790b490052d5217e728b0948991da937980  CVE-2019-13638.patch"
+d60f8c2364fca9b73aa73b5914cfd6571d11528d13fa7703ccfa93730cbdf8a6e4c9ca04cb7d02a40d33c38075890790b490052d5217e728b0948991da937980  CVE-2019-13638.patch
+e988836c90946282e70fca0fe29a52405a357b14bfdc8fce3afb680d7d1b25c4bf9d9cbc5612e3bb2d9379192635d7f1bf1b7b16c23b13d77450ec87dc5e3fe4  CVE-2019-20633.patch
+"
diff --git a/main/patch/CVE-2019-20633.patch b/main/patch/CVE-2019-20633.patch
new file mode 100644
index 00000000000..a528e1ad0d4
--- /dev/null
+++ b/main/patch/CVE-2019-20633.patch
@@ -0,0 +1,26 @@
+From 15b158db3ae11cb835f2eb8d2eb48e09d1a4af48 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruen@gnu.org>
+Date: Mon, 15 Jul 2019 19:10:02 +0200
+Subject: Avoid invalid memory access in context format diffs
+
+* src/pch.c (another_hunk): Avoid invalid memory access in context format
+diffs.
+---
+ src/pch.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/pch.c b/src/pch.c
+index a500ad9..cb54e03 100644
+--- a/src/pch.c
++++ b/src/pch.c
+@@ -1328,6 +1328,7 @@ another_hunk (enum diff difftype, bool rev)
+ 		  ptrn_prefix_context = context;
+ 		ptrn_suffix_context = context;
+ 		if (repl_beginning
++		    || p_end <= 0
+ 		    || (p_end
+ 			!= p_ptrn_lines + 1 + (p_Char[p_end - 1] == '\n')))
+ 		  {
+-- 
+cgit v1.2.1
+
diff --git a/main/patchelf/APKBUILD b/main/patchelf/APKBUILD
new file mode 100644
index 00000000000..cab0ad89375
--- /dev/null
+++ b/main/patchelf/APKBUILD
@@ -0,0 +1,39 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Contributor: Michael Koloberdin <koloberdin@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=patchelf
+pkgver=0.18.0
+pkgrel=3
+pkgdesc="Small utility to modify the dynamic linker and RPATH of ELF executables"
+url="https://nixos.org/patchelf.html"
+arch="all"
+license="GPL-3.0-or-later"
+subpackages="$pkgname-doc $pkgname-zsh-completion"
+source="$pkgname-$pkgver-2.tar.gz::https://github.com/NixOS/patchelf/releases/download/$pkgver/patchelf-$pkgver.tar.gz
+	fix-completion.patch
+	"
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr
+	make
+}
+
+check() {
+	case "$CARCH" in
+		ppc64le) ;;
+		x86) ;;
+		*) make -C tests -j1 check ;;
+	esac
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+ff08b24212d90a2d6e5987b181fffaa365efbfe2d4191462dd9d0f6655d78a719df1db0add192764677712e5a37a0efeaafdbaa904021c0d63cf5abfa37ab685  patchelf-0.18.0-2.tar.gz
+5c28fe4a918f951c89663aba95b5e10c9290d0cd27edb91fe807b763b4f61b6c2331a9475260eb9a6c9b58640ef2141c533632a116770809d10bb414cc1b2542  fix-completion.patch
+"
diff --git a/main/patchelf/fix-completion.patch b/main/patchelf/fix-completion.patch
new file mode 100644
index 00000000000..49fb5b00f3e
--- /dev/null
+++ b/main/patchelf/fix-completion.patch
@@ -0,0 +1,57 @@
+Patch-Source: https://github.com/NixOS/patchelf/pull/495
+--
+From 72a19b93228aa7867345c58aace000a28032c8a8 Mon Sep 17 00:00:00 2001
+From: wzy <32936898+Freed-Wu@users.noreply.github.com>
+Date: Thu, 4 May 2023 23:33:27 +0800
+Subject: [PATCH] Fix wrong completion
+
+---
+ completions/zsh/_patchelf | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/completions/zsh/_patchelf b/completions/zsh/_patchelf
+index c674549a..080fa268 100644
+--- a/completions/zsh/_patchelf
++++ b/completions/zsh/_patchelf
+@@ -2,32 +2,32 @@
+ 
+ local options=(
+   '--page-size[Uses the given page size]:SIZE'
+-  '--set-interpreter[Change the dynamic loader of executable]:INTERPRETER:dynamic loader:_files'
+-  '(- : *)--print-interpreter[Prints the ELF interpreter of the executable]'
+-  '(- : *)--print-os-abi[Prints the OS ABI of the executable]'
++  '--set-interpreter[Change the dynamic loader of executable]:INTERPRETER:_files'
++  '(-)--print-interpreter[Prints the ELF interpreter of the executable]'
++  '(-)--print-os-abi[Prints the OS ABI of the executable]'
+   '--set-os-abi[Changes the OS ABI of the executable]:ABI:(none sysv hpux netbsd gnu linux solaris aix irix freebsd tru64 modesto openbsd arm_aeabi arm standalone)'
+-  '(- : *)--print-soname[Prints DT_SONAME entry of .dynamic section]'
++  '(-)--print-soname[Prints DT_SONAME entry of .dynamic section]'
+   '--set-soname[Sets DT_SONAME entry of a library to SONAME]:SONAME'
+   '--set-rpath[Change the DT_RUNPATH of the executable or library to RUNPATH]:RUNPATH:_dirs'
+   '--remove-rpath[Removes the DT_RPATH or DT_RUNPATH entry of the executable or library]'
+   '--shrink-rpath[Remove from the DT_RUNPATH or DT_RPATH all directories that do not contain a library referenced by DT_NEEDED fields of the executable or library]'
+   '--allowed-rpath-prefixes[Combined with the "--shrink-rpath" option, this can be used for further rpath tuning]:PREFIXES'
+-  '(- : *)--print-rpath[Prints the DT_RUNPATH or DT_RPATH for an executable or library]'
++  '(-)--print-rpath[Prints the DT_RUNPATH or DT_RPATH for an executable or library]'
+   '--force-rpath[Forces the use of the obsolete DT_RPATH in the file instead of DT_RUNPATH]'
+   '--add-needed[Adds a declared dependency on a dynamic library]:LIBRARY'
+-  '*--replace-needed[Replaces a declared dependency on a dynamic library with another one]:a declared dependency:LIB_ORIG:another declared dependency:LIB_NEW'
++  '*--replace-needed[Replaces a declared dependency on a dynamic library with another one]:a declared dependency::another declared dependency'
+   '--remove-needed[Removes a declared dependency on LIBRARY]:LIBRARY'
+-  '(- : *)--print-needed[Prints all DT_NEEDED entries of the executable]'
++  '(-)--print-needed[Prints all DT_NEEDED entries of the executable]'
+   '--no-default-lib[Marks the object so that the search for dependencies of this object will ignore any default library search paths]'
+   '--no-sort[Do not sort program headers or section headers]'
+   '--add-debug-tag[Adds DT_DEBUG tag to the .dynamic section if not yet present in an ELF object]'
+-  '(- : *)--print-execstack[Prints the state of the executable flag of the GNU_STACK program header, if present]'
++  '(-)--print-execstack[Prints the state of the executable flag of the GNU_STACK program header, if present]'
+   '--clear-execstack[Clears the executable flag of the GNU_STACK program header, or adds a new header]'
+   '--set-execstack[Sets the executable flag of the GNU_STACK program header, or adds a new header]'
+   '--rename-dynamic-symbols[Renames dynamic symbols]:NAME_MAP_FILE'
+   '--output[Set the output file name]:FILE:_files'
+   '--debug[Prints details of the changes made to the input file]'
+-  '--version[Shows the version of patchelf]'
++  "(- : *)"'--version[Shows the version of patchelf]'
+   "(- : *)"{-h,--help}'[Show list of command-line options]'
+ )
+ 
diff --git a/main/patchutils/APKBUILD b/main/patchutils/APKBUILD
index 5f6c7cbfab6..eb5dfe78640 100644
--- a/main/patchutils/APKBUILD
+++ b/main/patchutils/APKBUILD
@@ -1,31 +1,20 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=patchutils
-pkgver=0.3.4
-pkgrel=1
+pkgver=0.4.2
+pkgrel=2
 pkgdesc="A collection of programs for manipulating patch files"
+options="!check" # 6 tests fail
 url="http://cyberelk.net/tim/patchutils/"
 arch="all"
 license="GPL-2.0-or-later"
 depends="perl"
 makedepends="xmlto"
-options="!check"  # No test suite.
 subpackages="$pkgname-doc"
 source="http://cyberelk.net/tim/data/patchutils/stable/patchutils-$pkgver.tar.xz"
 
-_builddir="$srcdir"/patchutils-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,14 +22,16 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
+		--localstatedir=/var
+	make
+}
+
+check() {
+	make check
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ede006122fad180b78feaf69294f1c40c0a764981fa581f1893abeeb0421f9d586fc33f79d065690a6bc6187a31f11311b086669879dde12c6e49c7c8a2aa440  patchutils-0.3.4.tar.xz"
+sha512sums="20970d52fd43c09dc7799297b9a9eb6f60ba29ecc750d49381a2dc52273dfe484a47696cddd541f623394fa3486734cf337297cbeab6b1b244511c7740f46897  patchutils-0.4.2.tar.xz"
diff --git a/main/pax-utils/APKBUILD b/main/pax-utils/APKBUILD
index b7514458553..ada6ab2a0c5 100644
--- a/main/pax-utils/APKBUILD
+++ b/main/pax-utils/APKBUILD
@@ -2,42 +2,58 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pax-utils
-pkgver=1.2.5
-pkgrel=0
+pkgver=1.3.7
+pkgrel=2
 pkgdesc="ELF related utils for ELF 32/64 binaries"
 url="https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities"
 arch="all"
 license="GPL-2.0-only"
 depends="scanelf"
+makedepends_build="meson"
 makedepends_host="linux-headers libcap-dev"
-makedepends="$makedepends_host"
 checkdepends="bash python3 py3-elftools"
-source="https://dev.gentoo.org/~slyfox/distfiles/pax-utils-$pkgver.tar.xz"
-subpackages="$pkgname-doc scanelf:_scanelf"
+subpackages="$pkgname-doc scanelf:_scanelf lddtreepax:_lddtreepax:noarch"
+[ -n "$BOOTSTRAP" ] && options="$options !check" # prevent python dependency
+source="https://dev.gentoo.org/~sam/distfiles/app-misc/pax-utils/pax-utils-$pkgver.tar.xz"
 
 build() {
-	make USE_CAP=yes
+	if [ -z "$BOOTSTRAP" ]; then
+		local lto="-Db_lto=true"
+	fi
+	abuild-meson \
+		$lto \
+		-Dlddtree_implementation=sh \
+		-Duse_seccomp=false \
+		. output
+	meson compile -C output
 }
 
 check() {
-	# Use py3
-	sed -i '1 s:^.*$:#!/usr/bin/python3:' lddtree.py
-	make check
+	meson test --print-errorlogs --no-rebuild -C output
 }
 
 package() {
-	make DESTDIR="$pkgdir/" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 
 	# Don't conflict with main/lddtree
-	rm -f "$pkgdir"/usr/bin/lddtree
+	mv "$pkgdir"/usr/bin/lddtree "$pkgdir"/usr/bin/lddtreepax
 }
 
 _scanelf() {
-	pkgdesc="Scan ELF binaries for stuff"
 	depends=""
+	pkgdesc="Scan ELF binaries for stuff"
 	replaces="pax-utils"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/scanelf "$subpkgdir"/usr/bin/
+
+	amove usr/bin/scanelf
+}
+
+_lddtreepax() {
+	depends="python3 py3-elftools"
+	pkgdesc="Read and package ELF dependency trees"
+
+	amove usr/bin/lddtreepax
 }
 
-sha512sums="bf2f47393a66b4218eba7981100fc6936c7c9d6d98970f5337e7b3097ce6f7b2ca13de486ff7450e4395b74ba2308d37105508234f323230376ec5814cfe54f9  pax-utils-1.2.5.tar.xz"
+sha512sums="
+f1b87a564573da838a02c4cc10e0d5f9754c3b004ecb172a6290b48a8179b30695ae556942457dfac3caf07b91dd56eb1d801475c35e9708e4d671aa507f9576  pax-utils-1.3.7.tar.xz
+"
diff --git a/main/paxctl/APKBUILD b/main/paxctl/APKBUILD
deleted file mode 100644
index caa0eac4b35..00000000000
--- a/main/paxctl/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=paxctl
-pkgver=0.9
-pkgrel=1
-pkgdesc="Manage PaX related program header flags"
-url="http://pax.grsecurity.net"
-arch="all"
-license="GPL-2.0"
-depends=""
-makedepends=""
-install=
-subpackages="$pkgname-doc"
-source="https://pax.grsecurity.net/$pkgname-$pkgver.tar.gz"
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	sed -i -e 's:--owner:-o:g; s:--group:-g:g; s:--mode:-m:g' Makefile
-
-	make CFLAGS="$CFLAGS" LDFLASG="$LDFLAGS" || return 1
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="4048544bd05ed6eb37866034ade8482b8d017110ed9a639f220e8d2e32bb3dfb6c913a986c8fd41829e88efa793f7552eaa2a6d6b2af533c44a5754a5ab8650f  paxctl-0.9.tar.gz"
diff --git a/main/paxmark/APKBUILD b/main/paxmark/APKBUILD
deleted file mode 100644
index 0192ef91403..00000000000
--- a/main/paxmark/APKBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maintainer: Timo Teräs <timo.teras@iki.fi>
-pkgname=paxmark
-pkgver=0.12
-pkgrel=0
-pkgdesc="Manage PaX marking of executables"
-url="https://alpinelinux.org"
-arch="noarch"
-options="!check"
-license="GPL-2.0-or-later"
-depends="attr"
-source="paxmark"
-
-package() {
-	mkdir -p "$pkgdir"/usr/sbin
-	install -m755 "$srcdir"/paxmark "$pkgdir"/usr/sbin
-	ln -s paxmark "$pkgdir"/usr/sbin/paxmark.sh
-}
-
-sha512sums="8bbae69e8159a75abd24b461994ad2c1995529fac1457c48845eec43b7f03b4fe50f49992810978ae15b1854bdf97ed86948f1b48209fd26baabb39384384d52  paxmark"
diff --git a/main/paxmark/paxmark b/main/paxmark/paxmark
deleted file mode 100644
index 03e244bc09d..00000000000
--- a/main/paxmark/paxmark
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-ret=0
-flags="${1//[!zPpEeMmRrSs]}"
-[ -n "${flags}" ] || exit 0
-shift
-
-# Create XATTR_PAX marking using attr
-xval=""
-[ "${flags//[!P]}" ] && xval="${xval}P"
-[ "${flags//[!p]}" -a -z "${flags//[!P]}" ] && xval="${xval}p"
-[ "${flags//[!E]}" ] && xval="${xval}E"
-[ "${flags//[!e]}" -a -z "${flags//[!E]}" ] && xval="${xval}e"
-[ -z "${flags//[!zEe]}" ] && xval="${xval}e"
-[ "${flags//[!M]}" ] && xval="${xval}M"
-[ "${flags//[!m]}" -a -z "${flags//[!M]}" ] && xval="${xval}m"
-[ "${flags//[!R]}" ] && xval="${xval}R"
-[ "${flags//[!r]}" -a -z "${flags//[!R]}" ] && xval="${xval}r"
-[ "${flags//[!S]}" ] && xval="${xval}S"
-[ "${flags//[!s]}" -a -z "${flags//[!S]}" ] && xval="${xval}s"
-
-for f in "$@"; do
-	if [ -n "FAKEROOTKEY" ]; then
-		# fakeroot does not set xattr's on disk.
-		# explicitly do that, because the marked binary might
-		# be executed next during install. But don't fail on it
-		# because if xattr is not supported it's not hardened kernel.
-		LD_PRELOAD="" FAKEROOTKEY="" attr -q -s pax.flags -V "${xval}" "${f}" &>/dev/null
-	fi
-	attr -q -s pax.flags -V "${xval}" "${f}" >/dev/null || ret=1
-done
-
-exit $ret
-
diff --git a/main/pciutils/APKBUILD b/main/pciutils/APKBUILD
index 919d48bec0c..b8724ec1e89 100644
--- a/main/pciutils/APKBUILD
+++ b/main/pciutils/APKBUILD
@@ -1,24 +1,21 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=pciutils
-pkgver=3.6.4
+pkgver=3.12.0
 pkgrel=0
 pkgdesc="PCI bus configuration space access library and tools"
 url="http://mj.ucw.cz/pciutils.html"
 arch="all"
 license="GPL-2.0-only"
-depends="hwids-pci"
+depends="hwdata-pci"
 makedepends="linux-headers"
 options="!check"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-libs"
-source="https://www.kernel.org/pub/software/utils/pciutils/pciutils-$pkgver.tar.gz
-	fix-linking-pci-malloc-Makefile.patch
-	pread.patch
+source="$pkgname-$pkgver.tar.gz::https://github.com/pciutils/pciutils/archive/refs/tags/v$pkgver.tar.gz
 	"
 
 build() {
-	sed -i -e "106s/^/\#/" Makefile
-	make OPT="$CFLAGS" ZLIB=no \
+	make OPT="$CFLAGS -fPIC -flto=auto" ZLIB=no \
 		SHARED=yes \
 		PREFIX=/usr \
 		SHAREDIR=/usr/share/hwdata \
@@ -31,14 +28,7 @@ package() {
 		SHARED=yes \
 		SHAREDIR="$pkgdir"/usr/share/hwdata \
 		MANDIR="$pkgdir"/usr/share/man \
-		install
-
-	install -d "$pkgdir"/usr/lib
-	ln -s libpci.so.${pkgver%%.*} "$pkgdir"/usr/lib/libpci.so
-	install -D -m 644 lib/libpci.pc "$pkgdir"/usr/lib/pkgconfig/libpci.pc
-	for i in config.h header.h pci.h types.h; do
-		install -D -m 644 lib/$i "$pkgdir"/usr/include/pci/$i
-	done
+		install install-lib
 
 	# this is now supplied by the hwids package
 	rm -rf "$pkgdir"/usr/sbin/update-pciids
@@ -46,6 +36,6 @@ package() {
 	rm -rf "$pkgdir"/usr/share/hwdata
 }
 
-sha512sums="ace51681d8803a06fdfa7153a56f586616044823cb10b0e701a7fb57af0e38884537afc27be0885cf244c0a8dec7c6295baf226f1ef2868ed1eedff10565945f  pciutils-3.6.4.tar.gz
-520b39602078e4325d7dac2d460547b360f7b52c668d88cf3d776c59246c8cfcb537b7b4f50575da9d2fcea1e207b3e99626ce4f23df890d2565b7dac1db2d94  fix-linking-pci-malloc-Makefile.patch
-aa1d3272500180256929b39a5fc4ea38ddb6a9fad090d732832ded9cc396303cf56efc91cfdeb76edbcfefc9a7c8eb058562c3c2b09a9090a59d3e68c27cec62  pread.patch"
+sha512sums="
+2157cda808acd685b985bd8b8e63bd868a042c6316859bb5bfd08f6de52172570dd6780fb3390a5abbf3b4c16d7e4bec05b4034caeee28b5a11cb3a8efc299ce  pciutils-3.12.0.tar.gz
+"
diff --git a/main/pciutils/fix-linking-pci-malloc-Makefile.patch b/main/pciutils/fix-linking-pci-malloc-Makefile.patch
deleted file mode 100644
index a2b5f01f11c..00000000000
--- a/main/pciutils/fix-linking-pci-malloc-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pciutils-3.2.1/Makefile.orig
-+++ pciutils-3.2.1/Makefile
-@@ -2,7 +2,7 @@
- # (c) 1998--2013 Martin Mares <mj@ucw.cz>
- 
- OPT=-O2
--CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
-+CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -fPIC
- 
- VERSION=3.2.1
- DATE=2013-11-10
diff --git a/main/pciutils/pread.patch b/main/pciutils/pread.patch
deleted file mode 100644
index 6e0843a6cca..00000000000
--- a/main/pciutils/pread.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./lib/pread.h.orig
-+++ ./lib/pread.h
-@@ -12,8 +12,8 @@
-  *  don't define it.
-  */
- 
--#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ > 0
--/* glibc 2.1 or newer -> pread/pwrite supported automatically */
-+#if (defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ > 0) || (_POSIX_VERSION >= 200809L)
-+ /* glibc 2.1 or newer or posix 2008 -> pread/pwrite supported automatically */
- 
- #elif defined(i386) && defined(__GLIBC__)
- /* glibc 2.0 on i386 -> call syscalls directly */
diff --git a/main/pcmciautils/APKBUILD b/main/pcmciautils/APKBUILD
index b4b0c8d07ba..cd2979ed083 100644
--- a/main/pcmciautils/APKBUILD
+++ b/main/pcmciautils/APKBUILD
@@ -1,33 +1,24 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pcmciautils
 pkgver=018
-pkgrel=1
+pkgrel=4
 pkgdesc="Utilities for inserting and removing PCMCIA cards"
 url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
 arch="all"
-license="GPL"
+license="GPL-2.0-only"
 subpackages="$pkgname-doc"
-depends=
 makedepends="sysfsutils-dev bison flex"
 options="!check"
-source="https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
+source="https://sources.archlinux.org/other/pcmciautils/pcmciautils-$pkgver.tar.xz
 	unsigned.patch
 	disable_yywrap.patch
 	"
-builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	cd "$builddir"
-	default_prepare || return 1
-}
 
 build() {
-	cd "$builddir"
-	make -j1 LEX=flex || return 1
+	make -j1 LEX=flex
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir"/ install
 	ln -sf pccardctl "$pkgdir"/sbin/lspcmcia
 }
diff --git a/main/pcre/APKBUILD b/main/pcre/APKBUILD
index d642aa8b13e..eb90e3abcf0 100644
--- a/main/pcre/APKBUILD
+++ b/main/pcre/APKBUILD
@@ -1,23 +1,39 @@
 # Contributor: Sergei Lukin <sergej.lukin@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pcre
-pkgver=8.44
-pkgrel=0
+pkgver=8.45
+pkgrel=3
 pkgdesc="Perl-compatible regular expression library"
-url="http://pcre.sourceforge.net"
+url="https://www.pcre.org/"
 arch="all"
+makedepends="m4 libtool autoconf automake"
 license="BSD-3-Clause"
-checkdepends="paxmark"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools
 	libpcrecpp libpcre16 libpcre32"
-source="https://ftp.pcre.org/pub/pcre/pcre-$pkgver.tar.bz2"
+source="https://downloads.sourceforge.net/project/pcre/pcre/$pkgver/pcre-$pkgver.tar.bz2"
+
 # secfixes:
+#   8.44-r0:
+#     - CVE-2020-14155
 #   8.40-r2:
-#   - CVE-2017-7186
+#     - CVE-2017-7186
 #   7.8-r0:
-#   - CVE-2017-11164
-#   - CVE-2017-16231
+#     - CVE-2017-11164
+#     - CVE-2017-16231
+
+# use sysroot if cross compiling to avoid pulling in system libs
+[ "$CBUILD"  != "$CHOST" ] && _cross_configure="--with-sysroot=$CBUILDROOT"
 
+prepare() {
+	default_prepare
+	update_config_sub
+
+	# update libtool so it won't use system libs when a sysroot is provided
+	libtoolize -f &&
+		aclocal &&
+		autoconf &&
+		automake --add-missing
+}
 
 build() {
 	local _enable_jit="--enable-jit"
@@ -25,6 +41,8 @@ build() {
 	mips64*) export CPPFLAGS="$CPPFLAGS -DSLJIT_IS_FPU_AVAILABLE=0";;
 	mips*) export CPPFLAGS="$CPPFLAGS -DSLJIT_IS_FPU_AVAILABLE=0 -DSLJIT_MIPS_R1=1";;
 	s390x) _enable_jit="";;
+	riscv*) _enable_jit="";;
+	loongarch64) _enable_jit="";;
 	esac
 
 	./configure \
@@ -39,8 +57,8 @@ build() {
 		--enable-pcre32 \
 		--with-match-limit-recursion=8192 \
 		--htmldir=/usr/share/doc/$pkgname-$pkgver/html \
-		--docdir=/usr/share/doc/$pkgname-$pkgver
-
+		--docdir=/usr/share/doc/$pkgname-$pkgver \
+		$_cross_configure
 	make
 }
 
@@ -79,4 +97,6 @@ tools() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-sha512sums="f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac  pcre-8.44.tar.bz2"
+sha512sums="
+91bff52eed4a2dfc3f3bfdc9c672b88e7e2ffcf3c4b121540af8a4ae8c1ce05178430aa6b8000658b9bb7b4252239357250890e20ceb84b79cdfcde05154061a  pcre-8.45.tar.bz2
+"
diff --git a/main/pcre2/APKBUILD b/main/pcre2/APKBUILD
index e317d3702f5..bb65c1d6801 100644
--- a/main/pcre2/APKBUILD
+++ b/main/pcre2/APKBUILD
@@ -1,31 +1,34 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=pcre2
-pkgver=10.34
-pkgrel=1
+pkgver=10.43
+pkgrel=0
 pkgdesc="Perl-compatible regular expression library"
 url="https://pcre.org/"
 arch="all"
 license="BSD-3-Clause"
-depends_dev="libedit-dev zlib-dev"
-makedepends="$depends_dev paxmark"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-tools
-	libpcre2-16:_libpcre libpcre2-32:_libpcre"
-source="https://ftp.pcre.org/pub/pcre/pcre2-$pkgver.tar.gz
-	fix-rspamd-segfault.patch
+depends_dev="
+	libedit-dev
+	zlib-dev
 	"
+makedepends="$depends_dev"
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-tools
+	libpcre2-16:_libpcre
+	libpcre2-32:_libpcre
+	"
+source="https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$pkgver/pcre2-$pkgver.tar.bz2"
 
-case "$CARCH" in
-	s390x|armhf) _enable_jit="";; # https://bugs.exim.org/show_bug.cgi?id=2468
-	*) _enable_jit="--enable-jit";;
-esac
+# secfixes:
+#   10.41-r0:
+#     - CVE-2022-41409
+#   10.40-r0:
+#     - CVE-2022-1586
+#     - CVE-2022-1587
 
 build() {
-	case "$CARCH" in
-	mips64*) export CPPFLAGS="$CPPFLAGS -DSLJIT_IS_FPU_AVAILABLE=0";;
-	mips*) export CPPFLAGS="$CPPFLAGS -DSLJIT_IS_FPU_AVAILABLE=0 -DSLJIT_MIPS_R1=1";;
-	esac
-
 	# Note: Forced -O3 is recommended (needed?) for Julia.
 	./configure \
 		CFLAGS="$CFLAGS -O3" \
@@ -38,29 +41,13 @@ build() {
 		--enable-pcre2-32 \
 		--enable-pcre2grep-libz \
 		--enable-pcre2test-libedit \
-		--with-match-limit-depth=8192 \
-		$_enable_jit
+		--enable-jit
 	make
 }
 
-# Note: RunTest and pcre2_jit_test generates some binaries in .libs that needs
-# to disable MPROTECT on grsecurity kernel. That's why it's so complicated...
 check() {
-	local is_pax=$(grep -q PaX /proc/$$/status && echo 'yes' || echo 'no')
-
-	if [ "$is_pax" = yes ]; then
-		timeout -t 1 -s KILL ./RunTest 2>/dev/null || true
-		find .libs -type f ! -name 'lib*' | xargs paxmark m
-	fi
 	./RunTest
-
-	if [ -n "$_enable_jit" ]; then
-		if [ "$is_pax" = yes ]; then
-			timeout -t 1 -s KILL ./pcre2_jit_test >/dev/null || true
-			find .libs -type f ! -name 'lib*' | xargs paxmark m
-		fi
-		./pcre2_jit_test
-	fi
+	./pcre2_jit_test
 }
 
 package() {
@@ -71,16 +58,15 @@ _libpcre() {
 	local bits="${subpkgname##*-}"
 	pkgdesc="PCRE2 with $bits bit character support"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libpcre2-$bits.so* "$subpkgdir"/usr/lib/
+	amove usr/lib/libpcre2-$bits.so*
 }
 
 tools() {
 	pkgdesc="Auxiliary utilities for PCRE2"
 
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+	amove usr/bin
 }
 
-sha512sums="820b3805fc7fcf3a80dfd42ff570efc8518fe3c50f3feb720319b95316619e5b8f6601b3c9522606315aecd5558ccfc8a04a89fab9921fdfc3400dc2caf17c22  pcre2-10.34.tar.gz
-571e89a3dc74a3e6b52fe9c8083df79a72a6430849a7ffe887fed832c8d40537554ac8ee29c42b3c1f212ad13f0326b9c5d9305d0dd889be10ed25b1cc6992b6  fix-rspamd-segfault.patch"
+sha512sums="
+8ac1520c32e9e5672404aaf6104e23c9ee5c3c28ad28ff101435599d813cbb20e0491a3fd34e012b4411b3e0366a4c6dfa3f02d093acaa6ff0ab25478bb7ade9  pcre2-10.43.tar.bz2
+"
diff --git a/main/pcre2/fix-rspamd-segfault.patch b/main/pcre2/fix-rspamd-segfault.patch
deleted file mode 100644
index e4bd828fab9..00000000000
--- a/main/pcre2/fix-rspamd-segfault.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: zherczeg
-Date: Sat, 7 Dec 2019 16:00:53 +0000
-Subject: [PATCH] Fix the too early access of the fields of a compiled pattern in JIT
-
-Patch-Source: https://lists.exim.org/lurker/message/20191207.160053.4a30f0bc.hu.html
-
-diff --git a/src/pcre2_jit_compile.c b/src/pcre2_jit_compile.c
-index f564127..304c47a 100644
---- a/src/pcre2_jit_compile.c
-+++ b/src/pcre2_jit_compile.c
-@@ -13742,11 +13742,6 @@ pcre2_jit_compile(pcre2_code *code, uint32_t options)
- {
- pcre2_real_code *re = (pcre2_real_code *)code;
- 
--#ifdef SUPPORT_JIT
--executable_functions *functions = (executable_functions *)re->executable_jit;
--static int executable_allocator_is_working = 0;
--#endif
--
- if (code == NULL)
-   return PCRE2_ERROR_NULL;
- 
-@@ -13779,6 +13774,11 @@ actions are needed:
-      avoid compiler warnings.
- */
- 
-+#ifdef SUPPORT_JIT
-+executable_functions *functions = (executable_functions *)re->executable_jit;
-+static int executable_allocator_is_working = 0;
-+#endif
-+
- if ((options & PCRE2_JIT_INVALID_UTF) != 0)
-   {
-   if ((re->overall_options & PCRE2_MATCH_INVALID_UTF) == 0)
diff --git a/main/pcsc-lite/APKBUILD b/main/pcsc-lite/APKBUILD
index 34cc46e1cec..726a5a8b25b 100644
--- a/main/pcsc-lite/APKBUILD
+++ b/main/pcsc-lite/APKBUILD
@@ -1,23 +1,39 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=pcsc-lite
-pkgver=1.8.26
+pkgver=2.0.1
 pkgrel=0
 pkgdesc="Middleware to access a smart card using SCard API (PC/SC)"
 url="https://pcsclite.apdu.fr/"
 arch="all"
-license="Custom"
-depends_dev="eudev-dev"
-makedepends="$depends_dev perl perl-dev libcap-ng-utils"
-install="pcsc-lite.pre-install pcsc-lite.pre-upgrade"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
+license="BSD-3-Clause AND BSD-2-Clause AND ISC"
+depends_dev="
+	$pkgname-libs=$pkgver-r$pkgrel
+	eudev-dev
+	"
+makedepends="
+	$depends_dev
+	flex
+	libcap-ng-utils
+	perl-dev
+	"
+install="$pkgname.pre-install $pkgname.pre-upgrade"
+subpackages="
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-spy-libs:spylibs
+	$pkgname-libs
+	$pkgname-openrc
+	"
 source="https://pcsclite.apdu.fr/files/pcsc-lite-$pkgver.tar.bz2
-	pcscd.initd"
-
+	pcscd.initd
+	"
 
 build() {
-	./configure --prefix=/usr \
+	./configure \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
@@ -30,7 +46,9 @@ build() {
 		--enable-ipcdir=/run/pcscd \
 		--enable-usbdropdir=/usr/lib/pcsc/drivers \
 		--disable-libsystemd \
-		--disable-polkit
+		--disable-polkit \
+		--disable-strict \
+		--enable-static
 	make
 }
 
@@ -39,27 +57,37 @@ check() {
 }
 
 package() {
+	license="$license AND GPL-3.0-or-later"
+
 	make DESTDIR="$pkgdir" install
-	install -D -m755 "$srcdir"/pcscd.initd \
-		"$pkgdir"/etc/init.d/pcscd
+
+	install -D -m755 "$srcdir"/pcscd.initd "$pkgdir"/etc/init.d/pcscd
+
 	mkdir -p "$pkgdir"/usr/lib/pcsc/drivers
+}
+
+spylibs() {
+	pkgdesc="$pkgdesc (log/debug/spy libraries)"
+	license="GPL-3.0-or-later"
 
-	# grant sysfs access
-	filecap "$pkgdir"/usr/sbin/pcscd dac_override
+	amove usr/lib/libpcscspy.so.*
 }
 
 libs() {
-	pkgdesc="Middleware to access a smart card using SCard API (PC/SC) (libraries)"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr
+	pkgdesc="$pkgdesc (libraries)"
+
+	amove usr/lib
 }
 
 dev() {
 	default_dev
+
 	# move back the /usr/lib/libpcsclite.so
 	# see http://bugs.alpinelinux.org/issues/3236 (and 6392)
 	mv "$subpkgdir"/usr/lib/libpcsclite.so "$pkgdir"/usr/lib/libpcsclite.so
 }
 
-sha512sums="23f9f41e08f6a5ff1840bec621ee37d6eb268e4ced58df516eb7e32cb6a84998a1d04bafcec36e6524926963e6730a25301301d364b6bd4dda8da1caaa76f037  pcsc-lite-1.8.26.tar.bz2
-6810ab357b5bcf07bf1ad76ed17ebb8e92be4599303a4e697b87a05d43b8d2bec5d3c29d44d8ddb5d031910ea62ca52a9868e6de9a255227eaeb29d1a7ee0041  pcscd.initd"
+sha512sums="
+af007f00f43e8d897710580f6f27814c9e7d3ca489ff01edf2e3b979e46267915aa04d9c15f225a420fa681de936e42a1d4779d962717cf9a9f4a3d1ca31502b  pcsc-lite-2.0.1.tar.bz2
+5a8b3cb5b4ed9884c1032ec3c4c51167b8771185e8ea4122e40de4a92135cc3687a1df43bc877cf5ebcfe9392a17035873d8c052d58243eb681a3e93a44c5773  pcscd.initd
+"
diff --git a/main/pcsc-lite/pcscd.initd b/main/pcsc-lite/pcscd.initd
index 7c580253a14..f75f97d2adb 100644
--- a/main/pcsc-lite/pcscd.initd
+++ b/main/pcsc-lite/pcscd.initd
@@ -1,16 +1,13 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/files/pcscd-init.7,v 1.1 2014/02/14 23:11:54 flameeyes Exp $
-
-name="PC/SC Daemon"
-
-pidfile=/run/pcscd/pcscd.pid
+description="PC/SC Smart Card Daemon"
 
 command=/usr/sbin/pcscd
-command_args="${EXTRA_OPTS}"
-
-start_stop_daemon_args="--user pcscd:pcscd"
+# EXTRA_OPTS is for backward compatibility only (Alpine <3.16)
+command_args="${cfgfile:+--config $cfgfile} --foreground ${command_args:-$EXTRA_OPTS}"
+command_background=true
+command_user="pcscd:pcscd"
+pidfile=/run/pcscd.pid
+capabilities="^cap_dac_override"
 
 depend() {
 	need localmount
@@ -19,5 +16,5 @@ depend() {
 }
 
 start_pre() {
-	checkpath -d -m 0755 -o pcscd:pcscd /run/pcscd
+	checkpath -d -m 0755 -o "$command_user" /run/pcscd
 }
diff --git a/main/pdnsd/APKBUILD b/main/pdnsd/APKBUILD
deleted file mode 100644
index eb9ea754d34..00000000000
--- a/main/pdnsd/APKBUILD
+++ /dev/null
@@ -1,103 +0,0 @@
-# Contributor: Matt Smith <mcs@darkregion.net>
-# Maintainer:  Matt Smith <mcs@darkregion.net>
-pkgname=pdnsd
-pkgver=1.2.9a
-_realver=$pkgver-par
-pkgrel=5
-pkgdesc="A proxy DNS server with permanent caching"
-url="http://members.home.nl/p.a.rombouts/pdnsd/"
-arch="all"
-license="GPL"
-depends=
-depends_dev=
-makedepends="$depends_dev linux-headers"
-install="$pkgname.pre-install"
-subpackages="$pkgname-doc"
-pkgusers="pdnsd"
-pkggroups="pdnsd"
-source="http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$pkgver-par.tar.gz
-	pdnsd.initd
-	pdnsd.confd
-	pdnsd.conf
-	"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--enable-ipv6 \
-		--with-random-device=/dev/urandom \
-		--enable-tcp-subseq \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-
-	install -m755 -D "$srcdir"/$pkgname.initd \
-		"$pkgdir"/etc/init.d/$pkgname || return 1
-	install -m644 -D "$srcdir"/$pkgname.confd \
-		"$pkgdir"/etc/conf.d/$pkgname || return 1
-	install -m644 -D "$srcdir"/$pkgname.conf \
-		"$pkgdir"/etc/$pkgname.conf || return 1
-
-	chown -R pdnsd "$pkgdir"/var/cache/pdnsd || return 1
-	sed -ri 's/([    ]*run_as=)"nobody";/\1"pdnsd";/' \
-		"$pkgdir"/etc/pdnsd.conf.sample || return 1
-	sed -ri '/pid_file/d' "$pkgdir"/etc/pdnsd.conf.sample || return 1
-	sed -ri '/query_method/d' "$pkgdir"/etc/pdnsd.conf.sample || return 1
-}
-
-doc() {
-	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/html || return 1
-	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/txt || return 1
-	mkdir -p "$subpkgdir"/usr/share/$pkgname/contrib || return 1
-
-	# /usr/share/{man,doc/$pkgname}
-	cp -a "$pkgdir"/usr/share/ "$subpkgdir"/usr/ || return 1
-	rm -rf "$pkgdir"/usr/share/ || return 1
-	_docs="AUTHORS COPYING COPYING.BSD ChangeLog ChangeLog.old \
-		NEWS README README.par README.par.old THANKS TODO"
-	for _doc in $_docs; do
-		cp "$_builddir"/$_doc "$subpkgdir"/usr/share/doc/$pkgname/ \
-			|| return 1
-	done
-	cp -R "$_builddir"/doc/html/* \
-		"$subpkgdir"/usr/share/doc/$pkgname/html/ || return 1
-	cp -R "$_builddir"/doc/txt/* \
-		"$subpkgdir"/usr/share/doc/$pkgname/txt/ || return 1
-
-	# /usr/share/$pkgname
-	mv "$pkgdir"/etc/pdnsd.conf.sample \
-		"$subpkgdir"/usr/share/$pkgname/ || return 1
-	_contribs="README change_pdnsd_server_ip.pl dhcp2pdnsd pdnsd_dhcp.pl"
-	for _contrib in $_contribs; do
-		cp -a "$_builddir"/contrib/$_contrib \
-			"$subpkgdir"/usr/share/$pkgname/contrib/ || return 1
-	done
-        default_doc
-}
-
-sha512sums="4fde296642306aa986ddb7cad0b5991bcd397656d93ef4962706276848c7fa62c664a40198e807d029637f116e8000c237d98b91cbbfec5c08b134d8bb3adf81  pdnsd-1.2.9a-par.tar.gz
-41062d23e4586a3db38609c808584e55d913786627a83cd7d4bf61ac963b4ad8ba4ea4316dc1839e5082cfe6e7c84cf4d0323da9380d3b6d29b7c870c1a7a156  pdnsd.initd
-e8fc0667dd58a4bf6a685b9a6590fd5141e116ca7e769aa14180c642908fc214f3c3a6c45c7a3bb17f241bcb06ff6972ca46d1ab58e139ac9b68049fc137eadc  pdnsd.confd
-ad023777f3d1f8eb5b9e296f42511c56aae4b5785b42a256c6f61d0b619657929622aced7034feabf321833e739a70c109610df0fc08e133557a7cf51c2fafd4  pdnsd.conf"
diff --git a/main/pdnsd/pdnsd.conf b/main/pdnsd/pdnsd.conf
deleted file mode 100644
index f3e6ae4b750..00000000000
--- a/main/pdnsd/pdnsd.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Default Alpine Linux pdnsd config
-# 
-# See /usr/share/pdnsd/pdnsd.conf.sample and the pdnsd.conf(5) manpage,
-# both available in the pdnsd-doc package.
-#
-# Comments can begin with either '#' or '//', and entire blocks may be
-# commented out with '/*' and '*/'.
-#
-global {
-	perm_cache=2048;
-	cache_dir="/var/cache/pdnsd";
-	run_as="pdnsd";
-	server_ip = any;
-	status_ctl = on;
-#	paranoid=on;       # This option reduces the chance of cache poisoning
-	                   # but may make pdnsd less efficient, unfortunately.
-	min_ttl=15m;       # Retain cached entries at least 15 minutes.
-	max_ttl=1w;        # One week.
-	timeout=10;        # Global timeout option (10 seconds).
-	neg_domain_pol=on;
-}
-
-server {
-	label= "googledns";
-	ip = 8.8.8.8, 8.8.4.4;
-	proxy_only=on;
-	lean_query=on;
-	timeout=4;         # Server timeout; this may be much shorter
-			   # that the global timeout option.
-	uptest=none;
-	interval=10m;      # Check every 10 minutes.
-	purge_cache=off;
-}
-
-/*
-source {
-	owner=localhost;
-#	serve_aliases=on;
-	file="/etc/hosts";
-}
-*/
-
-rr {
-	name=localhost;
-	reverse=on;
-	a=127.0.0.1;
-#	a=::1;
-	owner=localhost;
-	soa=localhost,root.localhost,42,86400,900,86400,86400;
-}
diff --git a/main/pdnsd/pdnsd.confd b/main/pdnsd/pdnsd.confd
deleted file mode 100644
index 8f8820c8da2..00000000000
--- a/main/pdnsd/pdnsd.confd
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Specify pdnsd options here.
-#
-# -4 run in IPv4 mode
-# -6 run in IPv6 mode
-# -a autodetects IPv6 supports, falls back to IPv4
-#    NOTE: IPv6 mode seems to have issues.
-# -d run in daemon mode
-# -s enables the status control socket so pdnsd-ctl can be used at run-time
-#    (same as setting  status_ctl=on;  in the config file)
-# -t enables the TCP server thread alongside the UDP server thread
-# -mut sets the query method to 'ut': udp first, fallback to tcp
-# -c specifies the config file
-# -p specifies the pid file
-# -g enables debugging/logging output at /var/cache/pdnsd/pdnsd.debug
-# -vn where n specifies the debugging verbosity level (0-3)
-
-pdnsd_opts="-4 -d -s -t -mut -c /etc/pdnsd.conf -p /var/run/pdnsd.pid"
diff --git a/main/pdnsd/pdnsd.initd b/main/pdnsd/pdnsd.initd
deleted file mode 100644
index 12baa03cdb0..00000000000
--- a/main/pdnsd/pdnsd.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-
-name=pdnsd
-daemon=/usr/sbin/$name
-
-depend() {
-	need net
-	after firewall
-}
-
-start() {
-	ebegin "Starting ${name}"
-		start-stop-daemon --start --quiet \
-			--pidfile /var/run/${name}.pid \
-			--exec ${daemon} -- ${pdnsd_opts}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${name}"
-		start-stop-daemon --stop --quiet \
-			--pidfile /var/run/$name.pid \
-			--exec ${daemon}
-	eend $?
-}
diff --git a/main/pdnsd/pdnsd.pre-install b/main/pdnsd/pdnsd.pre-install
deleted file mode 100644
index 164ef02a444..00000000000
--- a/main/pdnsd/pdnsd.pre-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-adduser -S -H -h /var/cache/pdnsd -s /sbin/nologin -g pdnsd pdnsd 2>/dev/null
-
-exit 0
diff --git a/main/perdition/APKBUILD b/main/perdition/APKBUILD
index e28cfacbc56..a33ae62b5a4 100644
--- a/main/perdition/APKBUILD
+++ b/main/perdition/APKBUILD
@@ -1,26 +1,26 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perdition
 pkgver=2.2
-pkgrel=0
+pkgrel=6
 pkgdesc="A Mail retrieval proxy"
 url="http://horms.net/projects/perdition/"
 arch="all"
-license="LGPL"
-depends=
-depends_dev="gdbm-dev openssl-dev popt-dev vanessa_adt-dev vanessa_logger-dev
+license="GPL-2.0-or-later"
+makedepends="gdbm-dev openssl-dev>3 popt-dev vanessa_adt-dev vanessa_logger-dev
 	vanessa_socket-dev"
-makedepends="$depends_dev"
 install=$pkgname.pre-install
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
 source="http://horms.net/projects/perdition/download/$pkgver/perdition-$pkgver.tar.xz
 	perdition.initd
 	perdition.confd
 	"
 
-builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,6 +29,7 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--enable-gdbm \
+		--disable-static \
 		--disable-libtool-lock \
 		--disable-mysql \
 		--disable-odbc \
@@ -41,8 +42,11 @@ build() {
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
diff --git a/main/perl-apache-logformat-compiler/APKBUILD b/main/perl-apache-logformat-compiler/APKBUILD
index 07c090b5af8..37dce766cbb 100644
--- a/main/perl-apache-logformat-compiler/APKBUILD
+++ b/main/perl-apache-logformat-compiler/APKBUILD
@@ -1,30 +1,25 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-apache-logformat-compiler
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Apache-LogFormat-Compiler
 pkgver=0.36
-pkgrel=0
-pkgdesc="Compile a log format string to perl-code"
-url="https://metacpan.org/release/Apache-LogFormat-Compiler"
+pkgrel=3
+pkgdesc="Compile a log format string to perl-code "
+url="https://metacpan.org/release/Apache-LogFormat-Compiler/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends="perl-posix-strftime-compiler"
-cpanmakedepends="perl-test-requires perl-http-message perl-try-tiny perl-uri perl-test-mocktime"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build-tiny"
+depends="perl perl-posix-strftime-compiler"
+makedepends="perl-dev perl-module-build-tiny perl-module-build"
+checkdepends="perl-uri perl-http-message perl-test-mocktime perl-test-requires perl-try-tiny"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/K/KA/KAZEBURO/Apache-LogFormat-Compiler-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	perl Build.PL --installdirs vendor --destdir "$pkgdir"
-}
-
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
 	./Build
 }
 
@@ -33,8 +28,10 @@ check() {
 }
 
 package() {
-	./Build install
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="a6f7f0f9f98401a70e4bb6bd4862e9e520e8b968c5e0f25853da57b12bf6d67357ddc8d2fe985668520758e5745b5d7783f6c656c35efd823f4325f267fdbfee  Apache-LogFormat-Compiler-0.36.tar.gz"
+sha512sums="
+a6f7f0f9f98401a70e4bb6bd4862e9e520e8b968c5e0f25853da57b12bf6d67357ddc8d2fe985668520758e5745b5d7783f6c656c35efd823f4325f267fdbfee  Apache-LogFormat-Compiler-0.36.tar.gz
+"
diff --git a/main/perl-apache-session/APKBUILD b/main/perl-apache-session/APKBUILD
index efd4dfcee9a..589373a816a 100644
--- a/main/perl-apache-session/APKBUILD
+++ b/main/perl-apache-session/APKBUILD
@@ -1,27 +1,24 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-apache-session
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Apache-Session
-pkgver=1.93
+pkgver=1.94
 pkgrel=1
 pkgdesc="A persistence framework for session data"
-url="https://metacpan.org/release/Apache-Session"
+url="https://metacpan.org/release/Apache-Session/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpanmakedepends="perl-test-exception perl-test-deep"
-depends="$cpandepends"
-makedepends="perl-dev perl-sub-uplevel $cpanmakedepends perl-module-build"
+depends="perl"
+makedepends="perl-test-deep perl-test-exception perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/C/CH/CHORNY/Apache-Session-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	perl Build.PL installdirs=vendor
-}
-
 build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
 	./Build
 }
 
@@ -30,8 +27,8 @@ check() {
 }
 
 package() {
-	./Build install destdir="$pkgdir"
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="568653b5151df61dbbc4b034043e1d4be75642122ab920a13155c4abbe052e4d96915b1453eb9f2f06bd1159d95efef7ed5905b4d2f2b8c6fdd3711d0cf5dbe4  Apache-Session-1.93.tar.gz"
+sha512sums="796874e25dfc38a45998f8e13c3dabda779c9590c768ddc706a7bdae4b9e4b74ea457617c0079dd6d8168d97c19428d7609af00d5db218ad545f3c7dd0c0b825  Apache-Session-1.94.tar.gz"
diff --git a/main/perl-archive-zip/APKBUILD b/main/perl-archive-zip/APKBUILD
index f422c9407ae..b3126cb4703 100644
--- a/main/perl-archive-zip/APKBUILD
+++ b/main/perl-archive-zip/APKBUILD
@@ -1,21 +1,19 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-archive-zip
-_pkgname=Archive-Zip
+_pkgreal=Archive-Zip
 pkgver=1.68
-pkgrel=0
+pkgrel=3
 pkgdesc="Provide a perl interface to ZIP archive files."
 url="https://metacpan.org/release/Archive-Zip"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
-checkdepends="perl-test-mockmodule perl-super perl-sub-identify perl-test-simple
-	zip"
+checkdepends="perl-test-mockmodule perl-super perl-sub-identify perl-test-simple zip"
 subpackages="$pkgname-doc"
 options="!check"
 source="https://cpan.metacpan.org/authors/id/P/PH/PHRED/Archive-Zip-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
 	default_prepare
diff --git a/main/perl-astro-suntime/APKBUILD b/main/perl-astro-suntime/APKBUILD
index a7c37121e38..4d6645280c2 100644
--- a/main/perl-astro-suntime/APKBUILD
+++ b/main/perl-astro-suntime/APKBUILD
@@ -1,16 +1,16 @@
 # Automatically generated by apkbuild-cpan, template 3
-# Contributor:  Francesco Colista <francesco.colista@gmail.com>
-# Maintainer:  Francesco Colista <francesco.colista@gmail.com>
+# Contributor:  Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-astro-suntime
 _pkgreal=Astro-SunTime
 pkgver=0.06
-pkgrel=2
+pkgrel=4
 pkgdesc="A functional module for calculating sunrise/sunset times"
 url="https://metacpan.org/release/Astro-SunTime/"
 arch="noarch"
 license="GPL-3.0-only"
 depends="perl perl-time-parsedate"
-makedepends="perl-dev perl-module-build"
+makedepends="perl-module-build"
 checkdepends="perl-time-parsedate"
 source="https://cpan.metacpan.org/authors/id/R/RO/ROBF/Astro-SunTime-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/main/perl-async-mergepoint/APKBUILD b/main/perl-async-mergepoint/APKBUILD
index 736760b48d3..17a21e3cc20 100644
--- a/main/perl-async-mergepoint/APKBUILD
+++ b/main/perl-async-mergepoint/APKBUILD
@@ -1,28 +1,24 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-async-mergepoint
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Async-MergePoint
 pkgver=0.04
-pkgrel=1
+pkgrel=5
 pkgdesc="resynchronise diverged control flow"
-url="https://metacpan.org/release/Async-MergePoint"
+url="https://metacpan.org/release/Async-MergePoint/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpanmakedepends="perl-test-fatal"
 depends="perl"
-makedepends="perl-dev perl-module-build $cpanmakedepends"
+makedepends="perl-dev perl-module-build perl-test-fatal"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Async-MergePoint-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	perl Build.PL installdirs=vendor
-}
-
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
 	./Build
 }
 
@@ -31,8 +27,10 @@ check() {
 }
 
 package() {
-	./Build install destdir="$pkgdir"
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="23ea745523795facfe32943c355693c4ee8a28946a94af5b207751cf07fc286e051ac8c7c2e2e33b90a922d3e233decff4da8a68b2b1f84099440d719e10dc8b  Async-MergePoint-0.04.tar.gz"
+sha512sums="
+23ea745523795facfe32943c355693c4ee8a28946a94af5b207751cf07fc286e051ac8c7c2e2e33b90a922d3e233decff4da8a68b2b1f84099440d719e10dc8b  Async-MergePoint-0.04.tar.gz
+"
diff --git a/main/perl-authen-sasl/APKBUILD b/main/perl-authen-sasl/APKBUILD
index 85e99815451..b732c186b5e 100644
--- a/main/perl-authen-sasl/APKBUILD
+++ b/main/perl-authen-sasl/APKBUILD
@@ -1,18 +1,18 @@
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-authen-sasl
-_realname=Authen-SASL
-pkgver=2.16
-pkgrel=2
+_pkgreal=Authen-SASL
+pkgver=2.1700
+pkgrel=0
 pkgdesc="SASL Authentication framework for perl"
 url="https://metacpan.org/release/Authen-SASL"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-digest-hmac"
-makedepends="perl-dev perl-module-install"
+makedepends="perl-module-install"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/G/GB/GBARR/Authen-SASL-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/E/EH/EHUELS/Authen-SASL-$pkgver.tar.gz"
 
-builddir="$srcdir/$_realname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
@@ -30,4 +30,6 @@ package() {
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="d472b8b07b8915e65a219c0a40a7b6f25ca4fb767df301f426224b8f6ebf24d66fcb4422a1f421c39631e84585af06f6c64e41abe11e1e505d03e43a9f86bd6f  Authen-SASL-2.16.tar.gz"
+sha512sums="
+f2b7bef711535b2f11f2c75948c83df0d73cb830ecf101ecd36bc7435bf27677a526b5530e314798805d8a6c5be922909436ba2c9b84abedf7f36d2aa3e0727a  Authen-SASL-2.1700.tar.gz
+"
diff --git a/main/perl-b-cow/APKBUILD b/main/perl-b-cow/APKBUILD
new file mode 100644
index 00000000000..df63407ab36
--- /dev/null
+++ b/main/perl-b-cow/APKBUILD
@@ -0,0 +1,37 @@
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Timothy Legge <timlegge@gmail.com>
+# Maintainer: Timothy Legge <timlegge@gmail.com>
+pkgname=perl-b-cow
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=B-COW
+pkgver=0.007
+pkgrel=2
+pkgdesc="B::COW additional B helpers to check COW status"
+url="https://metacpan.org/release/B-COW/"
+arch="all"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/B-COW-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="
+889e5a57f679735f4f064bc59a7e4c1bec994cb123c83742a165e2ba62a17619e36659b3f0125b6dd6a15616da7100a9d04b66de293a8bf700847d294fe0a2c2  B-COW-0.007.tar.gz
+"
diff --git a/main/perl-b-hooks-endofscope/APKBUILD b/main/perl-b-hooks-endofscope/APKBUILD
index 398e4c53481..94519ef1dc0 100644
--- a/main/perl-b-hooks-endofscope/APKBUILD
+++ b/main/perl-b-hooks-endofscope/APKBUILD
@@ -1,39 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Automatically generated by apkbuild-cpan, template 4
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-b-hooks-endofscope
+pkgver=0.28
+pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=B-Hooks-EndOfScope
-pkgver=0.24
-pkgrel=1
 pkgdesc="Execute code after a scope finished compilation"
 url="https://metacpan.org/release/B-Hooks-EndOfScope/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-sub-exporter-progressive perl-module-runtime perl-module-implementation perl-variable-magic"
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-sub-exporter-progressive perl-module-implementation"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="5c061a81a3fed88ad868a14a1f817f7952b2f0c9512408174354e0ecf7e3caa5d646054cf75efa8b8c558e6241a8dfebf9400e8826021bdb5cbdf3a00065b147  B-Hooks-EndOfScope-0.24.tar.gz"
+sha512sums="
+692d6ccc5d86f4fdd23491983ec4358a0be61d9ed23ab2e9a0b767395482447c44ff1a78e10ce72f393f542db3879712bc3077e74dbab13d902c302cae3750fe  B-Hooks-EndOfScope-0.28.tar.gz
+"
diff --git a/main/perl-boolean/APKBUILD b/main/perl-boolean/APKBUILD
index a99b65d831e..d9e9e25a577 100644
--- a/main/perl-boolean/APKBUILD
+++ b/main/perl-boolean/APKBUILD
@@ -1,32 +1,29 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-boolean
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=boolean
 pkgver=0.46
-pkgrel=1
+pkgrel=4
 pkgdesc="Boolean support for Perl"
-url="https://metacpan.org/release/boolean"
+url="https://metacpan.org/release/boolean/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/I/IN/INGY/boolean-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -35,4 +32,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="910653882f501cbf9420d775a79a000c62632a98643ac5e9f3d99765652e7c8c073f251bc36f0b69c9b259762bebeaeac18376e78494977d912da538939bb296  boolean-0.46.tar.gz"
+sha512sums="
+910653882f501cbf9420d775a79a000c62632a98643ac5e9f3d99765652e7c8c073f251bc36f0b69c9b259762bebeaeac18376e78494977d912da538939bb296  boolean-0.46.tar.gz
+"
diff --git a/main/perl-business-hours/APKBUILD b/main/perl-business-hours/APKBUILD
index f22e2aa5578..2c2a79251d6 100644
--- a/main/perl-business-hours/APKBUILD
+++ b/main/perl-business-hours/APKBUILD
@@ -1,44 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-business-hours
-_pkgname=Business-Hours
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Business-Hours
 pkgver=0.13
-pkgrel=1
-pkgdesc="Calculate business hours in a time period"
+pkgrel=4
+pkgdesc="Perl module for Business-Hours"
 url="https://metacpan.org/release/Business-Hours/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-set-intspan"
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-set-intspan"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/B/BP/BPS/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+source="https://cpan.metacpan.org/authors/id/B/BP/BPS/Business-Hours-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-        cd "$builddir"
-        make test
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="2fb0c5c017f4dd5eaeaf394b7534348473bf47009020d23d5fb642ae67a06d8041f6dae4d554e8e36412cecf447a300f30bcacf4f8aab3c357ea81b6a5c55d7c  Business-Hours-0.13.tar.gz"
+sha512sums="
+2fb0c5c017f4dd5eaeaf394b7534348473bf47009020d23d5fb642ae67a06d8041f6dae4d554e8e36412cecf447a300f30bcacf4f8aab3c357ea81b6a5c55d7c  Business-Hours-0.13.tar.gz
+"
diff --git a/main/perl-cache-cache/APKBUILD b/main/perl-cache-cache/APKBUILD
index 12533d21544..4b934388933 100644
--- a/main/perl-cache-cache/APKBUILD
+++ b/main/perl-cache-cache/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-cache-cache
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Cache-Cache
 pkgver=1.08
-pkgrel=1
-pkgdesc="Perl modules for cache-handling for applications"
+pkgrel=5
+pkgdesc="Perl module for Cache-Cache"
 url="https://metacpan.org/release/Cache-Cache/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-error perl-digest-sha1"
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev perl-ipc-sharelite $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-error perl-digest-sha1 perl-ipc-sharelite"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Cache-Cache-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="7b0f215b9c765840a1ca1e831735aeff610288048c352889408d514d41820b9315d2de03712b4ad6637d9f0db59467240a0918c22c1257a3f87bc62add4f0e06  Cache-Cache-1.08.tar.gz"
+sha512sums="
+7b0f215b9c765840a1ca1e831735aeff610288048c352889408d514d41820b9315d2de03712b4ad6637d9f0db59467240a0918c22c1257a3f87bc62add4f0e06  Cache-Cache-1.08.tar.gz
+"
diff --git a/main/perl-cache-simple-timedexpiry/APKBUILD b/main/perl-cache-simple-timedexpiry/APKBUILD
index 3a7d05fba5e..5552afffd53 100644
--- a/main/perl-cache-simple-timedexpiry/APKBUILD
+++ b/main/perl-cache-simple-timedexpiry/APKBUILD
@@ -1,33 +1,30 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-cache-simple-timedexpiry
-_pkgname="Cache-Simple-TimedExpiry"
+_pkgreal=Cache-Simple-TimedExpiry
 pkgver=0.27
-pkgrel=2
+pkgrel=5
 pkgdesc="Cache::Simple::TimedExpiry perl module"
 url="https://metacpan.org/release/Cache-Simple-TimedExpiry/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev perl-module-install"
+makedepends="perl-module-install"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/J/JE/JESSE/Cache-Simple-TimedExpiry-$pkgver.tar.gz"
 
-builddir="$srcdir/$_pkgname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-canary-stability/APKBUILD b/main/perl-canary-stability/APKBUILD
index e5e8a40ffbe..9be3268efcc 100644
--- a/main/perl-canary-stability/APKBUILD
+++ b/main/perl-canary-stability/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=perl-canary-stability
 pkgver=2013
-pkgrel=0
+pkgrel=3
 pkgdesc="CPAN/Canary-Stability - canary to check perl compatability for schmorp's modules"
 url="https://metacpan.org/release/Canary-Stability"
 arch="noarch"
@@ -14,20 +14,19 @@ source="https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/Canary-Stability-$pkg
 builddir="$srcdir"/Canary-Stability-$pkgver
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="9dfb0e6d136048050aac7c29e1fc79dc2a7703c8800582aa837c5d9b9934c48bfcb0a9ef1c6b5bb7e71a10a709e7f7431b3c79ea12b8d9f374b33bfd4a3e468d  Canary-Stability-2013.tar.gz"
+sha512sums="
+9dfb0e6d136048050aac7c29e1fc79dc2a7703c8800582aa837c5d9b9934c48bfcb0a9ef1c6b5bb7e71a10a709e7f7431b3c79ea12b8d9f374b33bfd4a3e468d  Canary-Stability-2013.tar.gz
+"
diff --git a/main/perl-capture-tiny/APKBUILD b/main/perl-capture-tiny/APKBUILD
index 0ea73b26357..15dabf48fed 100644
--- a/main/perl-capture-tiny/APKBUILD
+++ b/main/perl-capture-tiny/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-capture-tiny
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Capture-Tiny
 pkgver=0.48
-pkgrel=1
+pkgrel=4
 pkgdesc="Capture STDOUT and STDERR from Perl, XS or external programs"
 url="https://metacpan.org/release/Capture-Tiny/"
 arch="noarch"
 license="Apache-2.0"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Capture-Tiny-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="96d140b33a5ee147804925353ec5b49b806fa9c98b4ac23ec9c9494828f52ac72fd6f69c08e14ada18e5187dc4cece3d72901ce07b12eef20595322161a98437  Capture-Tiny-0.48.tar.gz"
+sha512sums="
+96d140b33a5ee147804925353ec5b49b806fa9c98b4ac23ec9c9494828f52ac72fd6f69c08e14ada18e5187dc4cece3d72901ce07b12eef20595322161a98437  Capture-Tiny-0.48.tar.gz
+"
diff --git a/main/perl-carp-clan/APKBUILD b/main/perl-carp-clan/APKBUILD
index 2d1aa2b40c6..d02131be56f 100644
--- a/main/perl-carp-clan/APKBUILD
+++ b/main/perl-carp-clan/APKBUILD
@@ -1,37 +1,34 @@
 # Contributor: Mika Havela <mika.havela@gmail.com>
 # Maintainer: Mika Havela <mika.havela@gmail.com>
 pkgname=perl-carp-clan
-_realname=Carp-Clan
+_pkgreal=Carp-Clan
 pkgver=6.08
-pkgrel=0
+pkgrel=2
 pkgdesc="Perl - Report errors from perspective of caller of a 'clan' of modules"
 url="https://metacpan.org/pod/Carp::Clan"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-test-exception"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Carp-Clan-$pkgver.tar.gz"
 
-builddir="$srcdir/$_realname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$builddir"
+	default_prepare
+
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$builddir"
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-carp/APKBUILD b/main/perl-carp/APKBUILD
index 20a04b2c68f..5daae60440a 100644
--- a/main/perl-carp/APKBUILD
+++ b/main/perl-carp/APKBUILD
@@ -3,38 +3,32 @@
 pkgname=perl-carp
 _pkgreal=Carp
 pkgver=1.50
-pkgrel=0
+pkgrel=3
 pkgdesc="alternative warn and die for modules"
-url="https://search.cpan.org/dist/Carp/"
+url="https://metacpan.org/release/Carp"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 subpackages="$pkgname-doc"
-source="https://search.cpan.org/CPAN/authors/id/X/XS/XSAWYERX/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX/Carp-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$builddir"
+	default_prepare
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-cgi-emulate-psgi/APKBUILD b/main/perl-cgi-emulate-psgi/APKBUILD
index 3eb9d24f910..2f2b8bc9703 100644
--- a/main/perl-cgi-emulate-psgi/APKBUILD
+++ b/main/perl-cgi-emulate-psgi/APKBUILD
@@ -1,48 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-cgi-emulate-psgi
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=CGI-Emulate-PSGI
 pkgver=0.23
-pkgrel=1
+pkgrel=4
 pkgdesc="PSGI adapter for CGI"
 url="https://metacpan.org/release/CGI-Emulate-PSGI/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-http-message"
-cpanmakedepends=""
-cpancheckdepends="perl-test-requires"
-depends="$cpandepends perl-cgi"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-http-message perl-cgi"
+makedepends="perl-dev"
+checkdepends="perl-test-requires"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/T/TO/TOKUHIROM/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/T/TO/TOKUHIROM/CGI-Emulate-PSGI-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$builddir"
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-sha512sums="0e1017175ccab53ef50993c9884990dc85c7cdb30744f4bac2df4486a63fd5fd24e7f4b0e473d39b1f2b4dfdcf12756016edbc39e0fb725c6c610c21e6a7f96a  CGI-Emulate-PSGI-0.23.tar.gz"
+sha512sums="
+0e1017175ccab53ef50993c9884990dc85c7cdb30744f4bac2df4486a63fd5fd24e7f4b0e473d39b1f2b4dfdcf12756016edbc39e0fb725c6c610c21e6a7f96a  CGI-Emulate-PSGI-0.23.tar.gz
+"
diff --git a/main/perl-cgi-fast/APKBUILD b/main/perl-cgi-fast/APKBUILD
index 37d0c4af156..7dc476e500c 100644
--- a/main/perl-cgi-fast/APKBUILD
+++ b/main/perl-cgi-fast/APKBUILD
@@ -1,32 +1,36 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=perl-cgi-fast
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=CGI-Fast
-pkgver=2.15
+pkgver=2.17
 pkgrel=0
 pkgdesc="CGI Interface for Fast CGI"
-url="https://metacpan.org/release/CGI-Fast"
+url="https://metacpan.org/release/CGI-Fast/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl-cgi perl-fcgi"
-makedepends="perl-dev"
+depends="perl perl-cgi perl-fcgi"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/L/LE/LEEJO/CGI-Fast-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	make -C "$builddir" test
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	make -C "$builddir" DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="b984cbcf5d1d96dd9fcb58b704ae643e127fcdbe37b4d7e7560e5e1219abb849d72c4ff5a2eb45d7f076a126543b06fda282aabf2c3788b8a87f075c081d30c1  CGI-Fast-2.15.tar.gz"
+sha512sums="
+4e64442b4c5dab9ab25799e9c34020d4750047f387c0f4a392bdcc3f22d417ab9d60215c4e21d7b2824da026433e547d9e760bf6ab5e260cbcde85265031ceac  CGI-Fast-2.17.tar.gz
+"
diff --git a/main/perl-cgi-psgi/APKBUILD b/main/perl-cgi-psgi/APKBUILD
index faeadc8b226..2919b64dd2b 100644
--- a/main/perl-cgi-psgi/APKBUILD
+++ b/main/perl-cgi-psgi/APKBUILD
@@ -1,40 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-cgi-psgi
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=CGI-PSGI
 pkgver=0.15
-pkgrel=2
+pkgrel=5
 pkgdesc="Adapt CGI.pm to the PSGI protocol"
 url="https://metacpan.org/release/CGI-PSGI/"
 arch="noarch"
-license="GPL PerlArtistic"
-depends="$cpandepends perl-cgi"
-makedepends="perl-dev $cpanmakedepends perl-module-install"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-cgi"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA/CGI-PSGI-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="5cdb32846dab5e35a81b52611bb109c66c72db98ddc6fe93a5b91335a1f03cc6ed396c415fb5ee311ce78d72e45e4986b5809569b6394d601af24d4d117fe96f  CGI-PSGI-0.15.tar.gz"
+sha512sums="
+5cdb32846dab5e35a81b52611bb109c66c72db98ddc6fe93a5b91335a1f03cc6ed396c415fb5ee311ce78d72e45e4986b5809569b6394d601af24d4d117fe96f  CGI-PSGI-0.15.tar.gz
+"
diff --git a/main/perl-cgi-session/APKBUILD b/main/perl-cgi-session/APKBUILD
index 2898d596ebe..5cee68102c8 100644
--- a/main/perl-cgi-session/APKBUILD
+++ b/main/perl-cgi-session/APKBUILD
@@ -1,27 +1,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-cgi-session
-_name=CGI-Session
+_pkgreal=CGI-Session
 pkgver=4.48
-pkgrel=1
+pkgrel=5
 pkgdesc="perl module for persistent session data in CGI applications"
-url="http://search.cpan.org/~markstos/CGI-Session-$pkgver/"
+url="https://metacpan.org/pod/CGI::Session"
 arch="noarch"
-license="PerlArtistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
+options="!check" # failing test
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/M/MA/MARKSTOS/CGI-Session-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-build () {
-	cd "$srcdir"/$_name-$pkgver
-	perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make MAN1EXT=1p MAN3EXT=3pm || return 1
+build() {
+	perl Makefile.PL INSTALLDIRS=vendor
+	make MAN1EXT=1p MAN3EXT=3pm
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd "$srcdir"/$_name-$pkgver
-	make install MAN1EXT=1p MAN3EXT=3pm DESTDIR="$pkgdir" || return 1
+	make install MAN1EXT=1p MAN3EXT=3pm DESTDIR="$pkgdir"
 	find "$pkgdir" -name perllocal.pod -delete
 	find "$pkgdir" -name .packlist -delete
 }
+
 sha512sums="82d6a498035b91474df712fdae2c9ce7290157ddec36095757f16b5cbce593d3b5115077c722350d1c890c299230f7489a41328ed64b85a0f4c3cfff8aceef54  CGI-Session-4.48.tar.gz"
diff --git a/main/perl-cgi/APKBUILD b/main/perl-cgi/APKBUILD
index b7052727399..daceb8895d2 100644
--- a/main/perl-cgi/APKBUILD
+++ b/main/perl-cgi/APKBUILD
@@ -1,40 +1,46 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 4
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-cgi
-_pkgreal=CGI
-pkgver=4.46
+pkgver=4.64
 pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=CGI
 pkgdesc="Handle Common Gateway Interface requests and responses"
-url="https://metacpan.org/release/CGI"
+url="https://metacpan.org/release/CGI/"
 arch="noarch"
-license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl perl-html-parser"
-makedepends="perl-dev"
-checkdepends="perl-test-nowarnings perl-test-deep perl-test-warn"
+license="Artistic-2.0"
+depends="perl perl-html-parser perl-uri"
+checkdepends="perl-test-nowarnings perl-test-warn"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/L/LE/LEEJO/CGI-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
+	make
 }
 
-build() {
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
+doc() {
+	local file; find "$pkgdir" -name "*.pod" | while read -r file; do
+		amove "${file#"$pkgdir"}"
+	done
+	default_doc
 }
 
-sha512sums="11280537b828fc595ad8c3d18a8a0b148cfcaccf1c4d4e58288e581254781182f1f3c4b119880c4e793af3bb051973b52c08142e9f0179178e927c4bfe33a292  CGI-4.46.tar.gz"
+sha512sums="
+1c94b0f1f952165381ec16a4f206edc6c4f7eec06d18004a87230cad4484ce86c631d18eddc0b86cadfc02ac182a9c143c07acea9e79913759e47f117ba87a4d  CGI-4.64.tar.gz
+"
diff --git a/main/perl-class-accessor-chained/APKBUILD b/main/perl-class-accessor-chained/APKBUILD
index 38c4bc4eeb5..d554728f03b 100644
--- a/main/perl-class-accessor-chained/APKBUILD
+++ b/main/perl-class-accessor-chained/APKBUILD
@@ -1,37 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-class-accessor-chained
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Class-Accessor-Chained
 pkgver=0.01
-pkgrel=1
-pkgdesc="make chained accessors"
+pkgrel=4
+pkgdesc="Perl module for Class-Accessor-Chained"
 url="https://metacpan.org/release/Class-Accessor-Chained/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-class-accessor"
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-class-accessor"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/Class-Accessor-Chained-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	perl Build.PL installdirs=vendor || return 1
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
 }
 
-build() {
-	cd "$_builddir"
-	./Build && ./Build test
+check() {
+	./Build test
 }
 
 package() {
-	cd "$_builddir"
-	./Build install destdir="$pkgdir" || return 1
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="b2728d12dd3bd01169b43ef6cc5d0e8f82660ed80f5473415025ce3d5e93c059cd9ef4fbad2b0481e0efc7478cbdff7bec0042ea3bd6bddac51d78ee5bf25a04  Class-Accessor-Chained-0.01.tar.gz"
+sha512sums="
+b2728d12dd3bd01169b43ef6cc5d0e8f82660ed80f5473415025ce3d5e93c059cd9ef4fbad2b0481e0efc7478cbdff7bec0042ea3bd6bddac51d78ee5bf25a04  Class-Accessor-Chained-0.01.tar.gz
+"
diff --git a/main/perl-class-accessor/APKBUILD b/main/perl-class-accessor/APKBUILD
index a4114f62f90..a9d458c96da 100644
--- a/main/perl-class-accessor/APKBUILD
+++ b/main/perl-class-accessor/APKBUILD
@@ -2,43 +2,30 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-class-accessor
 pkgver=0.51
-pkgrel=0
+pkgrel=4
 pkgdesc="Class::Accessor perl module"
-url="https://search.cpan.org/dist/Class-Accessor/"
+url="https://metacpan.org/pod/Class::Accessor"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
-source="https://search.cpan.org/CPAN/authors/id/K/KA/KASEI/Class-Accessor-$pkgver.tar.gz"
-
-_builddir="$srcdir"/Class-Accessor-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i;;
-		esac
-	done
-}
+source="https://cpan.metacpan.org/authors/id/K/KA/KASEI/Class-Accessor-$pkgver.tar.gz"
+builddir="$srcdir"/Class-Accessor-$pkgver
 
 build() {
-	cd "$_builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$_builddir"
 	make test
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="be11acea4747c59e3e524c75d818e0391756cbc08eebff71dca280e737ce228209e76310649298e536e07db1c856d5a71dd64aefc55b49e33cfcb2b3439eab0b  Class-Accessor-0.51.tar.gz"
+sha512sums="
+be11acea4747c59e3e524c75d818e0391756cbc08eebff71dca280e737ce228209e76310649298e536e07db1c856d5a71dd64aefc55b49e33cfcb2b3439eab0b  Class-Accessor-0.51.tar.gz
+"
diff --git a/main/perl-class-container/APKBUILD b/main/perl-class-container/APKBUILD
index 0d83895adeb..17c25935e04 100644
--- a/main/perl-class-container/APKBUILD
+++ b/main/perl-class-container/APKBUILD
@@ -1,47 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-class-container
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Class-Container
 pkgver=0.13
-pkgrel=1
+pkgrel=4
 pkgdesc="Glues object frameworks together transparently"
 url="https://metacpan.org/release/Class-Container/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-params-validate"
-cpanmakedepends=""
-cpancheckdepends=""
-depends="$cpandepends"
-makedepends="perl-dev perl-module-build $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-params-validate"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/K/KW/KWILLIAMS/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/K/KW/KWILLIAMS/Class-Container-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	perl Build.PL installdirs=vendor
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
 	./Build
 }
 
-package() {
-	cd "$builddir"
-	./Build install destdir="$pkgdir"
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
 check() {
-	cd "$builddir"
 	./Build test
 }
 
-sha512sums="c51284e377942930384e22ff8d17489fa279eecc87a68acd88bffd8a134d2f2930b40008df98d12bddc46845175d2ce9f630522379692c2f630f2618928c6acd  Class-Container-0.13.tar.gz"
+package() {
+	./Build install --destdir="$pkgdir"
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="
+c51284e377942930384e22ff8d17489fa279eecc87a68acd88bffd8a134d2f2930b40008df98d12bddc46845175d2ce9f630522379692c2f630f2618928c6acd  Class-Container-0.13.tar.gz
+"
diff --git a/main/perl-class-data-inheritable/APKBUILD b/main/perl-class-data-inheritable/APKBUILD
index 7c6819e187e..281f80e7559 100644
--- a/main/perl-class-data-inheritable/APKBUILD
+++ b/main/perl-class-data-inheritable/APKBUILD
@@ -1,37 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-class-data-inheritable
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Class-Data-Inheritable
-pkgver=0.08
+pkgver=0.09
 pkgrel=1
 pkgdesc="Inheritable, overridable class data"
 url="https://metacpan.org/release/Class-Data-Inheritable/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/T/TM/TMTM/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/R/RS/RSHERER/Class-Data-Inheritable-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="bddc61096158b21d4cfa69538d5db0f53617a66c71447ee193141064f4f58194462b21e0a849510e24e4c263b13be3ee1bc6bb8504320e0a86c02b67ad1652c8  Class-Data-Inheritable-0.08.tar.gz"
+sha512sums="
+2e76aaf12c8d26442d53746e5d74636bb35c55461efb6d9b5ea50a635e3f781707b2d7f9cb3da9113ed31de464d3931f9734c29ace2a7ee5c6e111392b6a97cf  Class-Data-Inheritable-0.09.tar.gz
+"
diff --git a/main/perl-class-inspector/APKBUILD b/main/perl-class-inspector/APKBUILD
index 9ede6e76311..0583b2aaeb2 100644
--- a/main/perl-class-inspector/APKBUILD
+++ b/main/perl-class-inspector/APKBUILD
@@ -2,31 +2,28 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-class-inspector
 pkgver=1.36
-pkgrel=1
+pkgrel=3
 pkgdesc="Class::Inspector perl module"
 url="https://metacpan.org/release/Class-Inspector/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev perl-module-install"
+makedepends="perl-module-install"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Class-Inspector-$pkgver.tar.gz"
 
 builddir="$srcdir/Class-Inspector-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-class-load/APKBUILD b/main/perl-class-load/APKBUILD
index 68c4fe59103..2979a708c25 100644
--- a/main/perl-class-load/APKBUILD
+++ b/main/perl-class-load/APKBUILD
@@ -1,46 +1,40 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-class-load
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Class-Load
 pkgver=0.25
-pkgrel=1
+pkgrel=4
 pkgdesc="A working (require Class::Name) and more"
 url="https://metacpan.org/release/Class-Load/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-data-optlist perl-module-runtime perl-module-implementation perl-try-tiny perl-namespace-clean perl-package-stash"
-cpanmakedepends="perl-test-fatal perl-test-requires "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="perl-test-needs"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="
+	perl perl-data-optlist perl-module-runtime perl-module-implementation perl-try-tiny
+	perl-package-stash
+	"
+makedepends="perl-dev"
+checkdepends="perl-test-needs perl-test-fatal"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Class-Load-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="feacb4ae99358d3dc45b23b2d7cc814603e59a72424e7e0620d4939fa6d6206a1bb123c010b49013ce4764df11dc7c04fc1d7bd5783c61a391310bcb653e7ca4  Class-Load-0.25.tar.gz"
+sha512sums="
+feacb4ae99358d3dc45b23b2d7cc814603e59a72424e7e0620d4939fa6d6206a1bb123c010b49013ce4764df11dc7c04fc1d7bd5783c61a391310bcb653e7ca4  Class-Load-0.25.tar.gz
+"
diff --git a/main/perl-class-method-modifiers/APKBUILD b/main/perl-class-method-modifiers/APKBUILD
index 54bc09efda4..b7bb86ffd84 100644
--- a/main/perl-class-method-modifiers/APKBUILD
+++ b/main/perl-class-method-modifiers/APKBUILD
@@ -1,33 +1,30 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-class-method-modifiers
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Class-Method-Modifiers
-pkgver=2.13
+pkgver=2.15
 pkgrel=1
 pkgdesc="Provides Moose-like method modifiers"
 url="https://metacpan.org/release/Class-Method-Modifiers/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpanmakedepends="perl-test-fatal perl-test-requires"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="perl-test-needs"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
+checkdepends="perl-test-needs perl-test-fatal"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Class-Method-Modifiers-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -36,5 +33,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-
-sha512sums="379afff763b647b787dd2049d9a8b928ca88be34e50c91c0848c5652efb1e4b40d8cacd2a1d5f6ce7bb254b9e65801b7c1a710f9807458a129af0af470f5ebbe  Class-Method-Modifiers-2.13.tar.gz"
+sha512sums="
+427d21418516ff296b5a536a2d1f13b81b92d36f1c17c2366bc65fd2f05bf6afc7d02a4257033f53ee14d806b43e8d4322c6eac256d1c0e892926c4e7f878995  Class-Method-Modifiers-2.15.tar.gz
+"
diff --git a/main/perl-class-mix/APKBUILD b/main/perl-class-mix/APKBUILD
index d1ed804b0fa..c457b7e7774 100644
--- a/main/perl-class-mix/APKBUILD
+++ b/main/perl-class-mix/APKBUILD
@@ -1,44 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-class-mix
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Class-Mix
 pkgver=0.006
-pkgrel=1
-pkgdesc="Dynamic class mixing"
+pkgrel=4
+pkgdesc="dynamic class mixing"
 url="https://metacpan.org/release/Class-Mix/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-params-classify"
-depends="$cpandepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-params-classify"
 makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/Class-Mix-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	perl Build.PL installdirs=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
 	./Build
 }
 
 check() {
-	cd "$builddir"
 	./Build test
 }
 
 package() {
-	cd "$builddir"
-	./Build install destdir="$pkgdir"
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="f1e52d189a57b4a6e4b7b093cd561881bcccec03dcf7286d69b592865343ab413ab35e42c14dd92ceb0089df1df33df4ff2a502026fde060ef246e77c8d21af1  Class-Mix-0.006.tar.gz"
+sha512sums="
+f1e52d189a57b4a6e4b7b093cd561881bcccec03dcf7286d69b592865343ab413ab35e42c14dd92ceb0089df1df33df4ff2a502026fde060ef246e77c8d21af1  Class-Mix-0.006.tar.gz
+"
diff --git a/main/perl-class-returnvalue/APKBUILD b/main/perl-class-returnvalue/APKBUILD
index 19adaf6aa15..e9229f3bfe9 100644
--- a/main/perl-class-returnvalue/APKBUILD
+++ b/main/perl-class-returnvalue/APKBUILD
@@ -2,31 +2,28 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-class-returnvalue
 pkgver=0.55
-pkgrel=2
+pkgrel=5
 pkgdesc="Class::ReturnValue perl module"
 url="https://metacpan.org/release/Class-ReturnValue/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl"
 depends="perl perl-devel-stacktrace"
-makedepends="perl-dev perl-module-install"
+makedepends="perl-module-install"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/J/JE/JESSE/Class-ReturnValue-$pkgver.tar.gz"
 
 builddir="$srcdir/Class-ReturnValue-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-class-singleton/APKBUILD b/main/perl-class-singleton/APKBUILD
index 79bcd93d617..5795d6dbdd8 100644
--- a/main/perl-class-singleton/APKBUILD
+++ b/main/perl-class-singleton/APKBUILD
@@ -1,38 +1,33 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-class-singleton
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Class-Singleton
-pkgver=1.5
-pkgrel=1
-pkgdesc="Base class for creating singleton objects"
+pkgver=1.6
+pkgrel=2
+pkgdesc="Implementation of a \"Singleton\" class"
 url="https://metacpan.org/release/Class-Singleton/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/S/SH/SHAY/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/S/SH/SHAY/Class-Singleton-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="f061a8b92d5f65e4fbcd14ef36ff1216f84443f487de34c98f7d08d6d18148f156c0cbd6249e75ac448c17547d1172dbda8b670a8e7573d3581c9c1196eb4804  Class-Singleton-1.5.tar.gz"
+sha512sums="68b637ba57d5da70ac8e7a8a5e1874481681d6a217bb0c58a232d4329c582f32d29b5ac4c60a131bc863c8faf2852c5249bced9d286e87fefe4960e95f35b1ec  Class-Singleton-1.6.tar.gz"
diff --git a/main/perl-class-tiny/APKBUILD b/main/perl-class-tiny/APKBUILD
index aa524b50076..7ee25d01155 100644
--- a/main/perl-class-tiny/APKBUILD
+++ b/main/perl-class-tiny/APKBUILD
@@ -1,47 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-class-tiny
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Class-Tiny
-pkgver=1.006
-pkgrel=1
+pkgver=1.008
+pkgrel=3
 pkgdesc="Minimalist class construction"
 url="https://metacpan.org/release/Class-Tiny/"
 arch="noarch"
 license="Apache-2.0"
-cpandepends=""
-cpanmakedepends=""
-cpancheckdepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+depends="perl"
+makedepends="perl-dev"
+checkdepends="perl-test-failwarnings"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Class-Tiny-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$builddir"
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-sha512sums="0a6ca0b99bd10a39445bb582bcf89f3668747f05b13b1f7271e934a73781c855a0418ae19a41593c64288b74710f49c1dcda0005be4edf9965e8020139ca0c7e  Class-Tiny-1.006.tar.gz"
+sha512sums="
+908eb8547e01036ef361f0a8623d028b1e733ea003fc227788b9c18d0db544a70dbe47de18822f9699a19156f36eac73caeb4849d44eea14ada1128afdb7efbd  Class-Tiny-1.008.tar.gz
+"
diff --git a/main/perl-clone/APKBUILD b/main/perl-clone/APKBUILD
index bc6f1e35dc7..d7be3d8354a 100644
--- a/main/perl-clone/APKBUILD
+++ b/main/perl-clone/APKBUILD
@@ -1,19 +1,20 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-clone
-_pkgname=Clone
-pkgver=0.43
-pkgrel=0
+_pkgreal=Clone
+pkgver=0.46
+pkgrel=2
 pkgdesc="Clone perl module"
 url="https://metacpan.org/release/Clone"
 arch="all"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
 makedepends="perl-dev"
+checkdepends="perl-b-cow"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/Clone-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/G/GA/GARU/Clone-$pkgver.tar.gz"
 
-builddir="$srcdir/$_pkgname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
@@ -29,4 +30,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="1a973fb5bde9e722e8d5bd11cf70005454f8e797687a145e5eb563629200cb6535168e458d312d57741ec4caf9c333dab588223e2368402aafd712b375846cd5  Clone-0.43.tar.gz"
+sha512sums="
+f8bb1010364e94c7cc8bba25681cd9fd737ec2935a8be960ac53099359729fc679190a115dd082fccd239b35762dee2b3be3adbddce37e4ceae6fe934fbad545  Clone-0.46.tar.gz
+"
diff --git a/main/perl-common-sense/APKBUILD b/main/perl-common-sense/APKBUILD
index fcf4414a06c..dda6a3d85dc 100644
--- a/main/perl-common-sense/APKBUILD
+++ b/main/perl-common-sense/APKBUILD
@@ -1,25 +1,28 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor:
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
 pkgname=perl-common-sense
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=common-sense
-pkgver=3.74
-pkgrel=2
-pkgdesc="Implementation of sane defaults for Perl programs"
-url="https://metacpan.org/release/common-sense"
+pkgver=3.75
+pkgrel=4
+pkgdesc="Perl module for common-sense"
+url="https://metacpan.org/release/common-sense/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/common-sense-$pkgver.tar.gz"
-
-builddir="$srcdir"/$_pkgreal-$pkgver
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	perl Makefile.PL INSTALLDIRS=vendor
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -28,4 +31,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="658ad70a2d1bbd0b26f91c4ea5d69b4cc0b632ede9532b88282987002a5e280f0475d63ee846b7bd2d38ef82f2680e20c2093803e4b62a984750ed447f318d60  common-sense-3.74.tar.gz"
+sha512sums="
+cb6034d9ff721a4122e0215db8ad5279ec4b189c3364593d427d70a1e84a1583a0e1447e276aa9a4fcaeb2f9d47a465a5bc4c0f842c803d3ddf91755311f4af4  common-sense-3.75.tar.gz
+"
diff --git a/main/perl-compress-raw-bzip2/APKBUILD b/main/perl-compress-raw-bzip2/APKBUILD
index f97ffc3caab..699ea8511d9 100644
--- a/main/perl-compress-raw-bzip2/APKBUILD
+++ b/main/perl-compress-raw-bzip2/APKBUILD
@@ -1,25 +1,26 @@
+# Automatically generated by apkbuild-cpan, template 4
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-compress-raw-bzip2
-_pkgname=Compress-Raw-Bzip2
-pkgver=2.093
-pkgrel=1
+pkgver=2.211
+pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Compress-Raw-Bzip2
 pkgdesc="Perl low-level interface to bzip2 compression library"
-url="https://metacpan.org/release/PMQS/Compress-Raw-Bzip2-$pkgver"
+url="https://metacpan.org/release/Compress-Raw-Bzip2/"
 arch="all"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
-source="https://cpan.metacpan.org/authors/id/P/PM/PMQS/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-prepare() {
-	default_prepare
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+makedepends="bzip2-dev perl-dev"
+source="https://cpan.metacpan.org/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 BUILD_BZIP2=0 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
 	make
 }
 
@@ -30,10 +31,11 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 
 	# remove man pages already provided by perl-doc
 	rm -rf "$pkgdir"/usr/share/man
 }
 
-sha512sums="03299251b84e457a82749411f237d92a6d77438ccbda6f8ba30a95c70ab40decf85e86d6b60cbefdda9602afd7cb74819a53d5bbe22ecca347f01e4c1a97229e  Compress-Raw-Bzip2-2.093.tar.gz"
+sha512sums="
+d3eb1245c07b0c7834a76229fa0b46a6b444bb3bd46a901184a2105f234b5d080f64fe79dfe3fc97dedb2e60235db794cefef0f81adb248c03f9cf11a7c596d1  Compress-Raw-Bzip2-2.211.tar.gz
+"
diff --git a/main/perl-compress-raw-zlib/APKBUILD b/main/perl-compress-raw-zlib/APKBUILD
index 216904a960f..48895f8a021 100644
--- a/main/perl-compress-raw-zlib/APKBUILD
+++ b/main/perl-compress-raw-zlib/APKBUILD
@@ -1,21 +1,26 @@
+# Automatically generated by apkbuild-cpan, template 4
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-compress-raw-zlib
-_realname=Compress-Raw-Zlib
-pkgver=2.093
-pkgrel=1
+pkgver=2.211
+pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Compress-Raw-Zlib
 pkgdesc="Perl low-level interface to zlib compression library"
-url="https://metacpan.org/release/Compress-Raw-Zlib"
+url="https://metacpan.org/release/Compress-Raw-Zlib/"
 arch="all"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
-source="https://cpan.metacpan.org/authors/id/P/PM/PMQS/$_realname-$pkgver.tar.gz"
-builddir="$srcdir/$_realname-$pkgver"
+makedepends="perl-dev zlib-dev"
+source="https://cpan.metacpan.org/authors/id/P/PM/PMQS/Compress-Raw-Zlib-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 BUILD_ZLIB=0 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
 	make
 }
 
@@ -26,10 +31,11 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 
 	# man pages are already provided by perl-doc
 	rm -rf "$pkgdir"/usr/share/man
 }
 
-sha512sums="451f844da7758390c030739c2869609d58398a799c27fc0ae1164de60a487c53d53513bfa7db25736dc13f48546131eed7bbf1f09d3414c212f5f33b46c7a9b2  Compress-Raw-Zlib-2.093.tar.gz"
+sha512sums="
+463ddfec976dd20fa66172f39818521565736c65ef7abfabf3d53475e7baf87452644a06dd1051437a36820a00f874fc710d5ff7f8cea139cf06d324c34bb6da  Compress-Raw-Zlib-2.211.tar.gz
+"
diff --git a/main/perl-config-autoconf/APKBUILD b/main/perl-config-autoconf/APKBUILD
new file mode 100644
index 00000000000..83ebaa9581b
--- /dev/null
+++ b/main/perl-config-autoconf/APKBUILD
@@ -0,0 +1,37 @@
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
+pkgname=perl-config-autoconf
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Config-AutoConf
+pkgver=0.320
+pkgrel=2
+pkgdesc="A module to implement some of AutoConf macros in pure perl."
+url="https://metacpan.org/release/Config-AutoConf/"
+arch="noarch"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-capture-tiny"
+makedepends="perl-dev"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/A/AM/AMBS/Config-AutoConf-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="
+ea07e3d08af4c2b3e983f108bd7a0830731dc485f8af4b48f7064057097bfdad8e7c51640bdd634a276042f101c5fbd55e9c074fa5ed29aa4615786bbd3c3a99  Config-AutoConf-0.320.tar.gz
+"
diff --git a/main/perl-config-grammar/APKBUILD b/main/perl-config-grammar/APKBUILD
index c7a202d58ee..1e1159f0689 100644
--- a/main/perl-config-grammar/APKBUILD
+++ b/main/perl-config-grammar/APKBUILD
@@ -2,34 +2,36 @@
 pkgname=perl-config-grammar
 _pkgreal=Config-Grammar
 pkgver=1.13
-pkgrel=1
+pkgrel=4
 pkgdesc="A grammar-based, user-friendly config parser"
 url="https://metacpan.org/release/Config-Grammar/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/D/DS/DSCHWEI/$_pkgreal-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$_builddir"
+	default_prepare
+
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$_builddir"
-	make && make test
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="51b165ccec452e48906d3c8972bb68841de93f0ece11104fea837eebefa1569e921a7532f7e4a3d204e73cf4c9b592f8707fc4741481c99b67d1b7a3eb5644d9  Config-Grammar-1.13.tar.gz"
+sha512sums="
+51b165ccec452e48906d3c8972bb68841de93f0ece11104fea837eebefa1569e921a7532f7e4a3d204e73cf4c9b592f8707fc4741481c99b67d1b7a3eb5644d9  Config-Grammar-1.13.tar.gz
+"
diff --git a/main/perl-config-inifiles/APKBUILD b/main/perl-config-inifiles/APKBUILD
index 36d833b127f..350d219f253 100644
--- a/main/perl-config-inifiles/APKBUILD
+++ b/main/perl-config-inifiles/APKBUILD
@@ -1,39 +1,35 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-config-inifiles
-_pkgname=Config-IniFiles
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Config-IniFiles
 pkgver=3.000003
-pkgrel=0
+pkgrel=3
 pkgdesc="A module for reading .ini-style configuration files."
-url="https://metacpan.org/release/Config-IniFiles"
+url="https://metacpan.org/release/Config-IniFiles/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl perl-list-moreutils perl-io-stringy"
+depends="perl perl-io-stringy"
 makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-prepare() {
-	default_prepare
-
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Config-IniFiles-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	perl Build.PL --installdirs=vendor
+	./Build
 }
 
 check() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
+	./Build test
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="29278b7f6aaf9ffcc0cd8b48ca0e1f1084b10278e50764b2b93e3e9b156ef13d6e54f779f41d0a6cbf6e0b23da1b73a3bb83fbf873add0a604693a41312b91f5  Config-IniFiles-3.000003.tar.gz"
+sha512sums="
+29278b7f6aaf9ffcc0cd8b48ca0e1f1084b10278e50764b2b93e3e9b156ef13d6e54f779f41d0a6cbf6e0b23da1b73a3bb83fbf873add0a604693a41312b91f5  Config-IniFiles-3.000003.tar.gz
+"
diff --git a/main/perl-control-x10/APKBUILD b/main/perl-control-x10/APKBUILD
index 19196499f20..fc7cdcba837 100644
--- a/main/perl-control-x10/APKBUILD
+++ b/main/perl-control-x10/APKBUILD
@@ -1,28 +1,31 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-control-x10
-_realname=ControlX10-CM11
+_pkgreal=ControlX10-CM11
 pkgver=2.09
-pkgrel=2
+pkgrel=5
 pkgdesc="Perl extension for X10 'ActiveHome' Controller"
-url="http://search.cpan.org/~bbirth/ControlX10-CM11-2.09/"
+url="https://metacpan.org/release/ControlX10-CM11"
 arch="noarch"
-license="GPL PerlArtistic"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
-install=
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/B/BB/BBIRTH/$_realname-$pkgver.tar.gz"
-_builddir="$srcdir/$_realname-$pkgver"
+source="https://cpan.metacpan.org/authors/id/B/BB/BBIRTH/ControlX10-CM11-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
 build() {
-	cd $_builddir
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
 }
+
+check() {
+	make test
+}
+
 package() {
-	cd $_builddir
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
+
 sha512sums="c13f275c6673a0a6b6b3eafa353e7d9c36a651359247abdf5308870ccbf5528b7d57fed57ce8dea2f9801ce1725835f16f1091705a3c4bd9c571e4690de5e450  ControlX10-CM11-2.09.tar.gz"
diff --git a/main/perl-convert-asn1/APKBUILD b/main/perl-convert-asn1/APKBUILD
index 019e6872847..f5b0de12547 100644
--- a/main/perl-convert-asn1/APKBUILD
+++ b/main/perl-convert-asn1/APKBUILD
@@ -1,39 +1,40 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-convert-asn1
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Convert-ASN1
-pkgver=0.27
-pkgrel=1
+pkgver=0.34
+pkgrel=0
 pkgdesc="Convert between perl data structures and ASN.1 encoded packets"
 url="https://metacpan.org/release/Convert-ASN1/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/G/GB/GBARR/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/T/TI/TIMLEGGE/Convert-ASN1-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
+# secfixes:
+#   0.29-r0:
+#     - CVE-2013-7488
 
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="253bc0c1b2919841497a95bcbd05825217a3013c7f789fd9f3d389808fb015daca91f5c149797574bf32d38e94efb7f1d8df62e9e4c13928ec3b978cc9fd6fe8  Convert-ASN1-0.27.tar.gz"
+sha512sums="
+f19734b5c267705467b59ddb4c4c7e0e23916da2aac2ac59629fef1c06e033d032fd27c68533beb3f928c02d8780e52ada2092630c72ef3da4561eadafd7936a  Convert-ASN1-0.34.tar.gz
+"
diff --git a/main/perl-convert-binhex/APKBUILD b/main/perl-convert-binhex/APKBUILD
index df9c8de247b..a9dae023d4b 100644
--- a/main/perl-convert-binhex/APKBUILD
+++ b/main/perl-convert-binhex/APKBUILD
@@ -1,31 +1,35 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-convert-binhex
-_realname=Convert-BinHex
+_pkgreal=Convert-BinHex
 pkgver=1.125
-pkgrel=2
+pkgrel=7
 pkgdesc="Extract data from Macintosh BinHex files"
 url="https://metacpan.org/release/Convert-BinHex/"
 arch="noarch"
-license="Artistic-1.0 GPL+"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
-install=
+checkdepends="perl-file-slurp perl-test-most"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/S/ST/STEPHEN/Convert-BinHex-$pkgver.tar.gz"
+options="!check" # checkdepends in community/
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$srcdir/$_realname-$pkgver"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
 
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+check() {
+	make test
 }
 
 package() {
-	cd "$srcdir/$_realname-$pkgver"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="c088feb0d9dd2c56d79e4fe21494e5957f763bfb4afbd0335ba099f4babbc7790951897730faf097d61ebca4a262f6676a9532d8861c2deca5a6d61ffdd6f115  Convert-BinHex-1.125.tar.gz"
+sha512sums="
+c088feb0d9dd2c56d79e4fe21494e5957f763bfb4afbd0335ba099f4babbc7790951897730faf097d61ebca4a262f6676a9532d8861c2deca5a6d61ffdd6f115  Convert-BinHex-1.125.tar.gz
+"
diff --git a/main/perl-convert-color/APKBUILD b/main/perl-convert-color/APKBUILD
index 50006dc5db3..ff27f0e011d 100644
--- a/main/perl-convert-color/APKBUILD
+++ b/main/perl-convert-color/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-convert-color
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Convert-Color
-pkgver=0.11
+pkgver=0.17
 pkgrel=1
 pkgdesc="color space conversions and named lookups"
 url="https://metacpan.org/release/Convert-Color/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-list-utilsby"
-cpanmakedepends="perl-test-number-delta"
-depends="$cpandepends perl-module-pluggable"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-list-utilsby perl-module-pluggable"
+makedepends="perl-dev perl-module-build"
+checkdepends="perl-test2-suite rgb"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Convert-Color-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	perl Build.PL installdirs=vendor || return 1
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	./Build && ./Build test
+check() {
+	./Build test
 }
 
 package() {
-	cd "$_builddir"
-	./Build install destdir="$pkgdir" || return 1
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="add90dff917a8fbc553fbd67826bb66b59319f7331dc7e13c79c525b1cbc6ab2f01161a20caacf2de90b28794451b34e3f60b5f21a413177ba7e92a349fffaf6  Convert-Color-0.11.tar.gz"
+sha512sums="
+edcbdc0d2775b7e5f814fc3fd16d4e089f89a3141a0e8776bf783aade5a7f20fa05cb4a46bd01bf16d2d9f41af46bca72de087c56c02fd088fe8b619bc26cb27  Convert-Color-0.17.tar.gz
+"
diff --git a/main/perl-convert-tnef/APKBUILD b/main/perl-convert-tnef/APKBUILD
index 6e70c6f732d..f3ebb5b9327 100644
--- a/main/perl-convert-tnef/APKBUILD
+++ b/main/perl-convert-tnef/APKBUILD
@@ -1,31 +1,34 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-convert-tnef
-_realname=Convert-TNEF
+_pkgreal=Convert-TNEF
 pkgver=0.18
-pkgrel=2
+pkgrel=7
 pkgdesc="Perl module to read TNEF files"
-url="http://search.cpan.org/~dougw/Convert-TNEF-0.17/"
+url="https://metacpan.org/release/Convert-TNEF"
 arch="noarch"
-license="Artistic-Perl-1.0 GPL+"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
-install=
+checkdepends="perl-io-stringy perl-mime-tools"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DO/DOUGW/$_realname-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/D/DO/DOUGW/Convert-TNEF-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$srcdir/$_realname-$pkgver"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
 
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+check() {
+	make test
 }
 
 package() {
-	cd "$srcdir/$_realname-$pkgver"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="00cbe54169c535e6d6d3b53a06eb47808a129d6397c73b5f2b53b93efba20f81d078c16edb7b0108bc037e2cb7f1c92719633519ea17088442ea8f63864eaf07  Convert-TNEF-0.18.tar.gz"
+sha512sums="
+00cbe54169c535e6d6d3b53a06eb47808a129d6397c73b5f2b53b93efba20f81d078c16edb7b0108bc037e2cb7f1c92719633519ea17088442ea8f63864eaf07  Convert-TNEF-0.18.tar.gz
+"
diff --git a/main/perl-convert-uulib/APKBUILD b/main/perl-convert-uulib/APKBUILD
index 526ea37024b..47e18407bcb 100644
--- a/main/perl-convert-uulib/APKBUILD
+++ b/main/perl-convert-uulib/APKBUILD
@@ -1,15 +1,15 @@
 # Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-convert-uulib
 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Convert-UUlib
-pkgver=1.71
-pkgrel=0
+pkgver=1.8
+pkgrel=3
 pkgdesc="Perl module for Convert-UUlib"
 url="https://metacpan.org/release/Convert-UUlib/"
 arch="all"
-license="(GPL-2.0-or-later OR Artistic-1.0-Perl) AND GPL-2.0-or-later AND ZLib"
+license="(GPL-1.0-or-later OR Artistic-1.0-Perl) AND GPL-2.0-or-later AND Zlib"
 depends="perl perl-common-sense"
 makedepends="perl-dev perl-canary-stability"
 subpackages="$pkgname-doc"
@@ -18,7 +18,7 @@ builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
@@ -32,4 +32,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="6ca67737a29709903322f506063c4c65e17a15a2cef40959cbf1309ba608867516f554bdec426e217ec610f84e76197d41cb8a2ac7d57fb640728b0e2ae5ef31  Convert-UUlib-1.71.tar.gz"
+sha512sums="
+4ea39cf36e7406c9e8a8e0c50778594f004b91a53f7aa0f90d8e127791d85bad00d8d5586bb35180b2605c5552567d0ae62f048de92fb85b9d99a8f14d9a0a40  Convert-UUlib-1.8.tar.gz
+"
diff --git a/main/perl-cpan-meta-check/APKBUILD b/main/perl-cpan-meta-check/APKBUILD
index 9810975aa42..3f76e0cd24f 100644
--- a/main/perl-cpan-meta-check/APKBUILD
+++ b/main/perl-cpan-meta-check/APKBUILD
@@ -1,46 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-cpan-meta-check
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=CPAN-Meta-Check
-pkgver=0.014
-pkgrel=1
+pkgver=0.018
+pkgrel=0
 pkgdesc="Verify requirements in a CPAN::Meta object"
 url="https://metacpan.org/release/CPAN-Meta-Check/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-module-metadata>=1.000023"
-cpanmakedepends="perl-test-deep"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/CPAN-Meta-Check-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="a10af09a7ce771ca3983adea8053d141750fd09849609a28e7f973831fd3a3ece55281841aec93c099154bb59135986da4983bf612ae4e956c45dbb3f2770f5e  CPAN-Meta-Check-0.014.tar.gz"
+sha512sums="
+ea340287e4f14a5ea00f7fe0decc424ff3ac1af9615cf41905e36be37b1b5f3401d3d44d4aef1d0f4a253f46f0170e1a1607b669ab975ba78d7c1497f0583169  CPAN-Meta-Check-0.018.tar.gz
+"
diff --git a/main/perl-cpanel-json-xs/APKBUILD b/main/perl-cpanel-json-xs/APKBUILD
index 44d9e5ea3b3..135ae991e56 100644
--- a/main/perl-cpanel-json-xs/APKBUILD
+++ b/main/perl-cpanel-json-xs/APKBUILD
@@ -1,31 +1,29 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-cpanel-json-xs
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Cpanel-JSON-XS
-pkgver=4.19
+pkgver=4.37
 pkgrel=0
-pkgdesc="JSON::XS for Cpanel, fast and correct serialising, also for 5.6.2"
-url="https://metacpan.org/release/Cpanel-JSON-XS"
+pkgdesc="cPanel fork of JSON::XS, fast and correct serializing"
+url="https://metacpan.org/release/Cpanel-JSON-XS/"
 arch="all"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev perl-json perl-test-leaktrace"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-check() {
-	make test
-}
-
-prepare() {
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
@@ -33,4 +31,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="c67b62e8f95900cb3626357cfa9976f1553f84ffd10a977d47839ca3b317014473c3a6e48f6680478b89bbdc2ac177b22441ad5e49e7e8eb0344ef14a3c52b10  Cpanel-JSON-XS-4.19.tar.gz"
+sha512sums="
+f1b5fc161711815f33b3e05a19111d9c94ef817c952eb3d317cb8bc3fd973acdb645a6b129cb21345dccf4a161de069f0ab2d3cb807e7f6b20ebe2527ef48978  Cpanel-JSON-XS-4.37.tar.gz
+"
diff --git a/main/perl-cps/APKBUILD b/main/perl-cps/APKBUILD
index 1fa82abf78d..af201321d72 100644
--- a/main/perl-cps/APKBUILD
+++ b/main/perl-cps/APKBUILD
@@ -1,46 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-cps
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=CPS
 pkgver=0.19
-pkgrel=1
+pkgrel=5
 pkgdesc="manage flow of control in Continuation-Passing Style"
 url="https://metacpan.org/release/CPS/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends="perl-future perl-sub-name"
-cpanmakedepends="perl-test-identity perl-test-refcount perl-test-fatal"
-depends="$cpandepends"
-makedepends="$cpanmakedepends perl-dev perl-module-build"
+depends="perl perl-future"
+makedepends="perl-dev perl-module-build"
+checkdepends="perl-test-identity perl-test-refcount perl-test-fatal"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/CPS-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	perl Build.PL installdirs=vendor
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
 	./Build
 }
 
 check() {
-	cd "$builddir"
 	./Build test
 }
 
 package() {
-	cd "$_builddir"
-	./Build install destdir="$pkgdir"
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="58479ba56554c6028db34fccc3942eba9e6cd7bfd5a1ee90b540db6d3ed3ef3b61aee354829cde386bc2beef134ee057dd96a5fd1e074d1389f46c8c54a312b0  CPS-0.19.tar.gz"
+sha512sums="
+58479ba56554c6028db34fccc3942eba9e6cd7bfd5a1ee90b540db6d3ed3ef3b61aee354829cde386bc2beef134ee057dd96a5fd1e074d1389f46c8c54a312b0  CPS-0.19.tar.gz
+"
diff --git a/main/perl-crypt-des/APKBUILD b/main/perl-crypt-des/APKBUILD
index 291e81aca43..2d937c3fbb5 100644
--- a/main/perl-crypt-des/APKBUILD
+++ b/main/perl-crypt-des/APKBUILD
@@ -2,40 +2,32 @@
 pkgname=perl-crypt-des
 _pkgreal=Crypt-DES
 pkgver=2.07
-pkgrel=7
-pkgdesc="unknown"
+pkgrel=14
+pkgdesc="Perl DES encryption module"
 url="https://metacpan.org/release/Crypt-DES/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/D/DP/DPARIS/$_pkgreal-$pkgver.tar.gz
 	"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+build() {
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test
+check() {
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="95d40280850290fb2f9b2f26be2f47f2241e0aeeb842bd02c56d667062d65b3b65b9a87c045cbee50604f95f8a0d0b033c92334520de19022decaf77f77c7678  Crypt-DES-2.07.tar.gz"
+sha512sums="
+95d40280850290fb2f9b2f26be2f47f2241e0aeeb842bd02c56d667062d65b3b65b9a87c045cbee50604f95f8a0d0b033c92334520de19022decaf77f77c7678  Crypt-DES-2.07.tar.gz
+"
diff --git a/main/perl-crypt-eksblowfish/APKBUILD b/main/perl-crypt-eksblowfish/APKBUILD
index 11ea4c39104..108e4b5732c 100644
--- a/main/perl-crypt-eksblowfish/APKBUILD
+++ b/main/perl-crypt-eksblowfish/APKBUILD
@@ -1,39 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-crypt-eksblowfish
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Crypt-Eksblowfish
 pkgver=0.009
-pkgrel=7
+pkgrel=13
 pkgdesc="the Eksblowfish block cipher"
 url="https://metacpan.org/release/Crypt-Eksblowfish/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends="perl-class-mix"
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-class-mix"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/Crypt-Eksblowfish-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	perl Build.PL installdirs=vendor || return 1
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	./Build && ./Build test
+check() {
+	./Build test
 }
 
 package() {
-	cd "$_builddir"
-	./Build install destdir="$pkgdir" || return 1
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="ca66a1ca4fd71388f25dc77c943e2416ed8534576309dd75f19a7219457418140c1bd21887d61918c34d3d6f9e11ea822b4661d30c6edf7f3673bbcd9a00a51b  Crypt-Eksblowfish-0.009.tar.gz"
+sha512sums="
+ca66a1ca4fd71388f25dc77c943e2416ed8534576309dd75f19a7219457418140c1bd21887d61918c34d3d6f9e11ea822b4661d30c6edf7f3673bbcd9a00a51b  Crypt-Eksblowfish-0.009.tar.gz
+"
diff --git a/main/perl-crypt-openssl-guess/APKBUILD b/main/perl-crypt-openssl-guess/APKBUILD
index 1db697ae4ba..008083e4545 100644
--- a/main/perl-crypt-openssl-guess/APKBUILD
+++ b/main/perl-crypt-openssl-guess/APKBUILD
@@ -1,48 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 2
-# Contributor: 
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor:
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-crypt-openssl-guess
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Crypt-OpenSSL-Guess
-pkgver=0.11
+pkgver=0.15
 pkgrel=1
 pkgdesc="Guess OpenSSL include path"
 url="https://metacpan.org/release/Crypt-OpenSSL-Guess/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-cpancheckdepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/A/AK/AKIYM/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$builddir"
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-sha512sums="cdae7f20a15d24842cf117bfba4f3bc0ec7d1066251e0480cbadd8f0aa28c9c9573905726fc1333ea9fbbb3769a67dbf28043de8487dcce27dab5d14a0848b09  Crypt-OpenSSL-Guess-0.11.tar.gz"
+sha512sums="
+d7527be1f07847fbafc10b30c00c43e7fdcd4db27535b16cac98c5b6507d138c14cebcdb3c4ef07dc3016a93fea95155548cc7d83a0309fbc13b7d3b9607bf5d  Crypt-OpenSSL-Guess-0.15.tar.gz
+"
diff --git a/main/perl-crypt-openssl-random/APKBUILD b/main/perl-crypt-openssl-random/APKBUILD
index 95688f99d62..ea6e28b1682 100644
--- a/main/perl-crypt-openssl-random/APKBUILD
+++ b/main/perl-crypt-openssl-random/APKBUILD
@@ -1,42 +1,38 @@
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Automatically generated by apkbuild-cpan, template 4
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-crypt-openssl-random
-_pkgname=Crypt-OpenSSL-Random
-pkgver=0.15
-pkgrel=4
-pkgdesc="RSA encoding and decoding, using the openSSL libraries"
-url="http://search.cpan.org/~iroberts/Crypt-OpenSSL-Random-0.04/"
+pkgver=0.16
+pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Crypt-OpenSSL-Random
+pkgdesc="OpenSSL/LibreSSL pseudo-random number generator access"
+url="https://metacpan.org/release/Crypt-OpenSSL-Random/"
 arch="all"
-license="Artistic-1.0 GPL+"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev openssl-dev perl-crypt-openssl-guess"
-install=
+makedepends="perl-dev openssl-dev>3 perl-crypt-openssl-guess"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RU/RURBAN/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
-}
+source="https://cpan.metacpan.org/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
 	make
 }
 
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
 check() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
-sha512sums="bba8ce86b97ce2d6271be503efff6e6e0ff60a797282a2b7cb9c6c0592b69cc43344f9738b4790e5fc165a7273ff01e35ada481cf8c4dfde38cb7ad741d97530  Crypt-OpenSSL-Random-0.15.tar.gz"
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+832033ca87f36b34c9d4774cb01b6f96ef3b1dfd9441c504e534e12a25d1f95b6d3d59add2bbdf84680f2df41aebe87f01fa5b94b4d08e11ce91329b64edb29d  Crypt-OpenSSL-Random-0.16.tar.gz
+"
diff --git a/main/perl-crypt-openssl-rsa/APKBUILD b/main/perl-crypt-openssl-rsa/APKBUILD
index 22879de83d4..a1419a23402 100644
--- a/main/perl-crypt-openssl-rsa/APKBUILD
+++ b/main/perl-crypt-openssl-rsa/APKBUILD
@@ -1,42 +1,37 @@
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-crypt-openssl-rsa
-_pkgname=Crypt-OpenSSL-RSA
-pkgver=0.31
-pkgrel=4
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Crypt-OpenSSL-RSA
+pkgver=0.33
+pkgrel=3
 pkgdesc="RSA encoding and decoding, using the openSSL libraries"
-url="http://search.cpan.org/~perler/"
+url="https://metacpan.org/release/Crypt-OpenSSL-RSA/"
 arch="all"
-license="Perl Artistic GPL"
-depends="perl perl-crypt-openssl-random perl-crypt-openssl-guess"
-makedepends="perl-dev openssl-dev"
-install=
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-crypt-openssl-random"
+makedepends="perl-dev openssl-dev>3 perl-crypt-openssl-guess"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/T/TO/TODDR/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-prepare() {
-	default_prepare
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+source="https://cpan.metacpan.org/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd $builddir
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd $builddir
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="e00d25fc1d39253ea2d7d6ee478403d2b38bd9125602baf5815672fb9e81674ff58bbb47539e425526db1988ebc1a40837372cf42ffd466cb532efa2e450ccab  Crypt-OpenSSL-RSA-0.31.tar.gz"
+sha512sums="
+7bfa802ec41925ec9fa6937c5eea0d21f6f554a1d1d57ed679ed03b260cf08c0a397df11880de6d67abacfd843ad2c4f28b20ac58d80e183c2a83c91deb926bf  Crypt-OpenSSL-RSA-0.33.tar.gz
+"
diff --git a/main/perl-crypt-rijndael/APKBUILD b/main/perl-crypt-rijndael/APKBUILD
index 6a6be2c915d..4b75bb57e12 100644
--- a/main/perl-crypt-rijndael/APKBUILD
+++ b/main/perl-crypt-rijndael/APKBUILD
@@ -1,39 +1,34 @@
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Jeff Bilyk <jbilyk@gmail.com>
 pkgname=perl-crypt-rijndael
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Crypt-Rijndael
-pkgver=1.14
-pkgrel=1
+pkgver=1.16
+pkgrel=4
 pkgdesc="Crypt::CBC compliant Rijndael encryption module"
-url="https://search.cpan.org/dist/Crypt-Rijndael/"
+url="https://metacpan.org/release/Crypt-Rijndael/"
 arch="all"
-license="LGPL-2.1"
-cpandepends="perl-test-manifest"
+license="LGPL-2.0-or-later"
+depends="perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/Crypt-Rijndael-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="a3c419142954dc2b430422f532b5349d0fb902a704335ba0708504a6a4a5d617835409916b76bc1b8dc8669c0f03356dab3ef90e5f7ea530b5fcc70bd1bf4eff  Crypt-Rijndael-1.14.tar.gz"
+sha512sums="e33cb691cd62d9b98f26c8f0d1365437f8a77154a4100be4969a88ad094074fb2f855fcb11541dc63743f861ef0c45944831b7f887df9bbb0b4ec36d6e0fd66d  Crypt-Rijndael-1.16.tar.gz"
diff --git a/main/perl-crypt-ssleay/APKBUILD b/main/perl-crypt-ssleay/APKBUILD
index fbdbc773821..4c5bf8bb5f1 100644
--- a/main/perl-crypt-ssleay/APKBUILD
+++ b/main/perl-crypt-ssleay/APKBUILD
@@ -1,48 +1,42 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@gmail.com>
 # Maintainer:
 pkgname=perl-crypt-ssleay
-_realname=Crypt-SSLeay
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Crypt-SSLeay
 pkgver=0.72
-pkgrel=12
-pkgdesc="OpenSSL Support for LWP"
+pkgrel=21
+pkgdesc="OpenSSL support for LWP"
 url="https://metacpan.org/release/Crypt-SSLeay/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends perl-path-class perl-try-tiny"
-makedepends="zlib-dev openssl-dev perl-dev $cpanmakedepends"
+license="Artistic-2.0"
+depends="perl perl-lwp-protocol-https"
+makedepends="perl-dev zlib-dev openssl-dev>3 perl-path-class perl-try-tiny"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/N/NA/NANIS/$_realname-$pkgver.tar.gz
-	libressl.patch
+source="https://cpan.metacpan.org/authors/id/N/NA/NANIS/Crypt-SSLeay-$pkgver.tar.gz
 	Crypt-SSLeay-0.72-Fix-building-on-Perl-without-dot-in-INC.patch
+	libressl.patch
 	"
-
-builddir="$srcdir/$_realname-$pkgver"
-
-prepare() {
-	cd "$builddir"
-	default_prepare
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="af7a2878df94e116e9aad9a0f028f2e4f89074aaf31672915162f86e55211632d65c1cb00f3ebd25644d77adf8eecdd244dba6a004d93ab90289ab34fe4caaf4  Crypt-SSLeay-0.72.tar.gz
+sha512sums="
+af7a2878df94e116e9aad9a0f028f2e4f89074aaf31672915162f86e55211632d65c1cb00f3ebd25644d77adf8eecdd244dba6a004d93ab90289ab34fe4caaf4  Crypt-SSLeay-0.72.tar.gz
+c8362c5d6afcdf08f70e7aefde8c1b0bcb798093dad66d3c54324b8ce1e758be021cbc36c2fe5d91782dc8cd2d75ac65ac12271280da4743638e4d1df88be3f8  Crypt-SSLeay-0.72-Fix-building-on-Perl-without-dot-in-INC.patch
 2e64924c2213368c1043afa01b622c8040d59cdf469be444885fb8e1f5c61c6755b427290cf7bba6e33f30f378a1910c56a3ae4306e4bd0f32f3e16335ada453  libressl.patch
-c8362c5d6afcdf08f70e7aefde8c1b0bcb798093dad66d3c54324b8ce1e758be021cbc36c2fe5d91782dc8cd2d75ac65ac12271280da4743638e4d1df88be3f8  Crypt-SSLeay-0.72-Fix-building-on-Perl-without-dot-in-INC.patch"
+"
diff --git a/main/perl-crypt-x509/APKBUILD b/main/perl-crypt-x509/APKBUILD
index 562948d7991..1c87dd6aef8 100644
--- a/main/perl-crypt-x509/APKBUILD
+++ b/main/perl-crypt-x509/APKBUILD
@@ -1,34 +1,29 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-crypt-x509
-_pkgname=Crypt-X509
-pkgver=0.52
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Crypt-X509
+pkgver=0.55
 pkgrel=1
 pkgdesc="Parse a X.509 certificate"
 url="https://metacpan.org/release/Crypt-X509/"
 arch="noarch"
-license="Artistic-1.0-Perl"
-cpandepends="perl-convert-asn1"
-cpanmakedepends=
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-convert-asn1"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/M/MR/MRSCOTTY/Crypt-X509-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-prepare() {
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -37,4 +32,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="fc02335f8d3696db709867afc31b1c93b3598c54c0575e4dd2fb50e4ce626d82ac9c09d6ca9b79b42828d252a1a687ee54be203db45d957fec58fb76d239a2d5  Crypt-X509-0.52.tar.gz"
+sha512sums="
+b7c72ccc57f132fa754e4372846b148914c2b4b94957716e3db55f2d7459f0d77fddb0aae9750191b887b9a5cea0dfc6704fb32a5bfbdebdb4f33a2ccfa3fb00  Crypt-X509-0.55.tar.gz
+"
diff --git a/main/perl-cryptx/APKBUILD b/main/perl-cryptx/APKBUILD
new file mode 100644
index 00000000000..160d41c9700
--- /dev/null
+++ b/main/perl-cryptx/APKBUILD
@@ -0,0 +1,41 @@
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Timothy Legge <timlegge@gmail.com>
+# Maintainer: Timothy Legge <timlegge@gmail.com>
+pkgname=perl-cryptx
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=CryptX
+pkgver=0.080
+pkgrel=0
+pkgdesc="Cryptographic toolkit"
+url="https://metacpan.org/release/CryptX/"
+arch="all"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/M/MI/MIK/CryptX-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+# secfixes:
+#   0.079-r0:
+#     - CVE-2019-17362
+
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="
+5702f59f28c70858eb2e78046c6415a816d94f45214092d4e2e938c0655a37e58e5295b2a7f753ee42e0fe4c2ce5632c068d80c7b3055cce1ecb0e5784fca475  CryptX-0.080.tar.gz
+"
diff --git a/main/perl-css-minifier-xs/APKBUILD b/main/perl-css-minifier-xs/APKBUILD
index f9a11467157..b020e361d55 100644
--- a/main/perl-css-minifier-xs/APKBUILD
+++ b/main/perl-css-minifier-xs/APKBUILD
@@ -1,39 +1,34 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor:
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-css-minifier-xs
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=CSS-Minifier-XS
-pkgver=0.09
-pkgrel=6
+pkgver=0.13
+pkgrel=4
 pkgdesc="XS based CSS minifier"
 url="https://metacpan.org/release/CSS-Minifier-XS/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/G/GT/GTERMARS/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	perl Build.PL installdirs=vendor || return 1
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	./Build && ./Build test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	./Build install destdir="$pkgdir" || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="520e40fa4a6d70bd7692880f3bc5c813a8648dfe12946426dedf0874e180ccd98e703d67ed8b502a7b00489aa2404edce844d80b1eccc48f94156a0d5c36ad51  CSS-Minifier-XS-0.09.tar.gz"
+sha512sums="cd924e9d47e52fc96ed41ce4a8e4bbb3f9eea594b47cc6bb388050f1a2c3154d9dc359bc6c7f6c5f2811489eaba21416b9703d152fa403842aee08f44e148ae6  CSS-Minifier-XS-0.13.tar.gz"
diff --git a/main/perl-css-squish/APKBUILD b/main/perl-css-squish/APKBUILD
index a3627d79330..6c11bd55488 100644
--- a/main/perl-css-squish/APKBUILD
+++ b/main/perl-css-squish/APKBUILD
@@ -2,38 +2,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-css-squish
 pkgver=0.10
-pkgrel=1
+pkgrel=5
 pkgdesc="CSS::Squish perl module"
 url="https://metacpan.org/release/CSS-Squish/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl perl-uri perl-test-longstring"
-makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/T/TS/TSIBLEY/CSS-Squish-$pkgver.tar.gz"
 
-_builddir="$srcdir"/CSS-Squish-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/CSS-Squish-$pkgver
 
 build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="82140c51a1e0cbed5e63a04134f56f8dcc0b383aa6b7b40574cf6636d3f92373cdd0eb474045daa8c5769cea7cd2b60bc7b36804ebea090541174d9a9e0ba6ac  CSS-Squish-0.10.tar.gz"
+sha512sums="
+82140c51a1e0cbed5e63a04134f56f8dcc0b383aa6b7b40574cf6636d3f92373cdd0eb474045daa8c5769cea7cd2b60bc7b36804ebea090541174d9a9e0ba6ac  CSS-Squish-0.10.tar.gz
+"
diff --git a/main/perl-data-guid/APKBUILD b/main/perl-data-guid/APKBUILD
index f498ac6485c..052f62239eb 100644
--- a/main/perl-data-guid/APKBUILD
+++ b/main/perl-data-guid/APKBUILD
@@ -1,39 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-data-guid
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Data-GUID
-pkgver=0.049
+pkgver=0.051
 pkgrel=1
 pkgdesc="globally unique identifiers"
 url="https://metacpan.org/release/Data-GUID/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-sub-install perl-sub-exporter perl-data-uuid"
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-sub-install perl-sub-exporter perl-data-uuid"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Data-GUID-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="1404322971af93067e121052a47f796ac77d19dbeb328dc5db0e60df1c4ce24f614679198afb442cc3ff4326e76df84ff762f85b4e129f44e1441c5beb40801e  Data-GUID-0.049.tar.gz"
+sha512sums="
+75b22311e8ac3b84a82187e4b6d9877de0282c09f723899a6ac423643ab6bf2e49ee20ddd210ed809e0698950d75885bb8a6986c6b2dc8cfbf5e68032f6a3530  Data-GUID-0.051.tar.gz
+"
diff --git a/main/perl-data-hexdump/APKBUILD b/main/perl-data-hexdump/APKBUILD
index 1240cf88821..1ce19cce5cf 100644
--- a/main/perl-data-hexdump/APKBUILD
+++ b/main/perl-data-hexdump/APKBUILD
@@ -1,44 +1,34 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-data-hexdump
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Data-HexDump
-pkgver=0.02
-pkgrel=2
-pkgdesc="Hexadecial Dumper"
+pkgver=0.04
+pkgrel=1
+pkgdesc="Perl module for Data-HexDump"
 url="https://metacpan.org/release/Data-HexDump/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/F/FT/FTASSIN/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/N/NE/NEILB/Data-HexDump-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-        cd "$builddir"
-        make test
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="71e787cf679237cbddffd3eca2576812dca38216a8caf9282f7d56af4e268810f36ebd57e3e5c369ec393e7f0e9ae2edbcbe7fd5ffbe49ef4d7e8ba302a28e47  Data-HexDump-0.02.tar.gz"
+sha512sums="41f95f0a8ebf23372acd1af737785950663c597d9c76aa2342896967c9b5361a9c29e514c1ef9018461c276978b258649c516c33d3037083a2af0add37589b1f  Data-HexDump-0.04.tar.gz"
diff --git a/main/perl-data-optlist/APKBUILD b/main/perl-data-optlist/APKBUILD
index 5a12787dd1b..5e76d5480cf 100644
--- a/main/perl-data-optlist/APKBUILD
+++ b/main/perl-data-optlist/APKBUILD
@@ -1,39 +1,36 @@
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-data-optlist
-pkgver=0.110
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Data-OptList
+pkgver=0.114
 pkgrel=1
-pkgdesc="Data::OptList perl module"
+pkgdesc="parse and validate simple name/value option pairs"
 url="https://metacpan.org/release/Data-OptList/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-params-util perl-sub-install"
-makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Data-OptList-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir"/Data-OptList-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="68393958a38f509a71cfba61f6dff8303821918ba29ad8492af0c23cfd4f741c6ce98c4f68ad295f27e166287fc546229c430816f0bdd6009d4f60860c967b76  Data-OptList-0.110.tar.gz"
+sha512sums="
+72f60ad7d9a6d87ffecfbc0f6f6d48dad2816dd4431d7e82e8ab834e0852da27420fd52fb2a1138254d80bf8b98b94b9fa25b878e1bb155221543a78219ee16a  Data-OptList-0.114.tar.gz
+"
diff --git a/main/perl-data-page-pageset/APKBUILD b/main/perl-data-page-pageset/APKBUILD
index 4bd74c1afc4..d68b410ad43 100644
--- a/main/perl-data-page-pageset/APKBUILD
+++ b/main/perl-data-page-pageset/APKBUILD
@@ -1,39 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor:
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-data-page-pageset
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Data-Page-Pageset
 pkgver=1.02
-pkgrel=2
+pkgrel=5
 pkgdesc="change long page list to be shorter and well navigate"
 url="https://metacpan.org/release/Data-Page-Pageset/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-data-page perl-test-exception perl-class-accessor"
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-data-page perl-class-accessor"
+makedepends="perl-dev perl-module-build"
+checkdepends="perl-test-exception"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/C/CH/CHUNZI/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/C/CH/CHUNZI/Data-Page-Pageset-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	perl Build.PL installdirs=vendor || return 1
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	./Build && ./Build test
+check() {
+	./Build test
 }
 
 package() {
-	cd "$_builddir"
-	./Build install destdir="$pkgdir" || return 1
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="d6676511e6b9cb0c110d6f535120e04f110e53a18bf9ce65e6f346d616d9020cea6f7d9514e264fee0220ef100a1bce2e863d276fbaaa113ba8f920cf5bd2610  Data-Page-Pageset-1.02.tar.gz"
+sha512sums="
+d6676511e6b9cb0c110d6f535120e04f110e53a18bf9ce65e6f346d616d9020cea6f7d9514e264fee0220ef100a1bce2e863d276fbaaa113ba8f920cf5bd2610  Data-Page-Pageset-1.02.tar.gz
+"
diff --git a/main/perl-data-page/APKBUILD b/main/perl-data-page/APKBUILD
index 7e4fbbac259..68ebf78cb89 100644
--- a/main/perl-data-page/APKBUILD
+++ b/main/perl-data-page/APKBUILD
@@ -1,43 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor:
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-data-page
-_pkgname=Data-Page
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Data-Page
 pkgver=2.03
-pkgrel=1
+pkgrel=4
 pkgdesc="help when paging through sets of results"
 url="https://metacpan.org/release/Data-Page/"
 arch="noarch"
-license="Artistic-1.0-Perl GPL-1.0-or-later"
-cpandepends="perl-class-accessor-chained perl-test-exception"
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-class-accessor-chained"
+makedepends="perl-dev"
+checkdepends="perl-test-exception"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Data-Page-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	perl Makefile.PL installdirs=vendor
-}
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="5c0c411e8b03163b2b88b7ab6432def0ddcce48987e98868897e89d0220665537f23d9a56b6d544a5c6fb67f615a2db582764ebcaa612cb2a8906ba660fc3c59  Data-Page-2.03.tar.gz"
+sha512sums="
+5c0c411e8b03163b2b88b7ab6432def0ddcce48987e98868897e89d0220665537f23d9a56b6d544a5c6fb67f615a2db582764ebcaa612cb2a8906ba660fc3c59  Data-Page-2.03.tar.gz
+"
diff --git a/main/perl-data-uuid/APKBUILD b/main/perl-data-uuid/APKBUILD
index 535b2ee4e67..c45d32182f3 100644
--- a/main/perl-data-uuid/APKBUILD
+++ b/main/perl-data-uuid/APKBUILD
@@ -1,11 +1,11 @@
-# Automatically generated by apkbuild-cpan, template 3
+# Automatically generated by apkbuild-cpan, template 4
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-data-uuid
+pkgver=1.227
+pkgrel=0
 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Data-UUID
-pkgver=1.224
-pkgrel=4
 pkgdesc="Globally/Universally Unique Identifiers (GUIDs/UUIDs)"
 url="https://metacpan.org/release/Data-UUID/"
 arch="all"
@@ -14,12 +14,15 @@ license="osf-1990(variant)"
 depends="perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Data-UUID-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/G/GT/GTERMARS/Data-UUID-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
 	make
 }
 
@@ -30,7 +33,8 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="897ab26e83600214110167b86fc63848281b7bdf3818dcfedb713bf2eb64a06c48cc7cee43bfa4130c6fdb912fb77863bd31ffe08c95ec85e6660a9b369b7970  Data-UUID-1.224.tar.gz"
+sha512sums="
+4b9ae792fba12232b49e799064c774b5a9b55b3019041e4ed0da6d7478b68815676295f888aa957dc4f0b8fca1fa88b3394992d2ea9ed79763769f262ad0835f  Data-UUID-1.227.tar.gz
+"
diff --git a/main/perl-date-format/APKBUILD b/main/perl-date-format/APKBUILD
deleted file mode 100644
index 745f65227d3..00000000000
--- a/main/perl-date-format/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Mika Havela <mika.havela@gmail.com>
-# Maintainer: Mika Havela <mika.havela@gmail.com>
-pkgname=perl-date-format
-_realname=TimeDate
-pkgver=2.32
-pkgrel=0
-pkgdesc="Perl - Date formating subroutines"
-url="https://metacpan.org/release/TimeDate"
-arch="noarch"
-license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl"
-makedepends="perl-dev"
-subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/$_realname-$pkgver.tar.gz"
-
-builddir="$srcdir/$_realname-$pkgver"
-
-build() {
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-	make
-}
-
-check() {
-	make test
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-	# creates file collision among perl modules
-	find "$pkgdir" -name perllocal.pod -delete
-}
-
-sha512sums="7c451c3a69b32db1ec8ec21462eef2ac5e3a63f8eb6521260362a396f39c0c0f93efaf6f2903ade82175b391f09b7d6f6121b68fbf9f5dde421a8b5dd65476bf  TimeDate-2.32.tar.gz"
diff --git a/main/perl-datetime-format-mail/APKBUILD b/main/perl-datetime-format-mail/APKBUILD
index aa622735a2f..37862306528 100644
--- a/main/perl-datetime-format-mail/APKBUILD
+++ b/main/perl-datetime-format-mail/APKBUILD
@@ -2,32 +2,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-datetime-format-mail
 pkgver=0.403
-pkgrel=1
+pkgrel=4
 pkgdesc="DateTime::Format::Mail perl module"
 url="https://metacpan.org/release/DateTime-Format-Mail/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl perl-datetime perl-params-validate"
-makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/B/BO/BOOK/DateTime-Format-Mail-$pkgver.tar.gz"
 
 builddir="$srcdir"/DateTime-Format-Mail-$pkgver
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-datetime-format-w3cdtf/APKBUILD b/main/perl-datetime-format-w3cdtf/APKBUILD
index cfe26f86617..90a4ca3b563 100644
--- a/main/perl-datetime-format-w3cdtf/APKBUILD
+++ b/main/perl-datetime-format-w3cdtf/APKBUILD
@@ -1,39 +1,31 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-datetime-format-w3cdtf
-pkgver=0.07
-pkgrel=1
+pkgver=0.08
+pkgrel=4
 pkgdesc="DateTime::Format::W3CDTF perl module"
 url="https://metacpan.org/release/DateTime-Format-W3CDTF/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl perl-datetime"
-makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-$pkgver.tar.gz"
+builddir="$srcdir"/DateTime-Format-W3CDTF-$pkgver
 
-_builddir="$srcdir"/DateTime-Format-W3CDTF-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+build() {
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+check() {
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="f5b8f3437c4e9a7e192900af16e83a567889dbdf1a934d604461c5096c271b497cda9bd4f9359658f536d262232e4521519f92c06bf07712922403baf6429c64  DateTime-Format-W3CDTF-0.07.tar.gz"
+sha512sums="
+d7b04870909432a7a98189dc2239ec201f9132e5a5b6db5d3284351a7db31324c1451538880d215073f8fa1e0f909b99a51354e8e87d6c4cf11d90ea184c9b4e  DateTime-Format-W3CDTF-0.08.tar.gz
+"
diff --git a/main/perl-datetime-locale/APKBUILD b/main/perl-datetime-locale/APKBUILD
index 804ed9acbda..f41eea101de 100644
--- a/main/perl-datetime-locale/APKBUILD
+++ b/main/perl-datetime-locale/APKBUILD
@@ -1,36 +1,49 @@
+# Automatically generated by apkbuild-cpan, template 4
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-datetime-locale
-pkgver=1.25
+pkgver=1.41
 pkgrel=0
-pkgdesc="DateTime::Locale perl module"
-url="https://search.cpan.org/dist/DateTime-Locale"
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=DateTime-Locale
+pkgdesc="Localization support for DateTime.pm"
+url="https://metacpan.org/release/DateTime-Locale/"
 arch="noarch"
-license="Artistic-1.0-Perl GPL-1.0-or-later"
-depends="perl perl-cpan-meta-check perl-dist-checkconflicts perl-file-sharedir perl-file-sharedir-install
-	perl-list-moreutils perl-namespace-autoclean perl-params-validate perl-params-validationcompiler
-	perl-scalar-list-utils perl-test-fatal perl-test-requires perl-test-warnings"
-checkdepends="perl-test-file-sharedir perl-ipc-system-simple"
-makedepends="perl-dev"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="
+	perl perl-dist-checkconflicts perl-file-sharedir perl-namespace-autoclean
+	perl-params-validationcompiler perl-specio
+	"
+makedepends="perl-dist-checkconflicts perl-file-sharedir-install"
+checkdepends="
+	perl-test-file-sharedir perl-ipc-system-simple perl-path-tiny perl-test2-plugin-nowarnings
+	perl-test2-suite perl-cpan-meta-check
+	"
 subpackages="$pkgname-doc"
-source="https://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/DateTime-Locale-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-Locale-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-builddir="$srcdir"/DateTime-Locale-$pkgver
 build() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+
+	# These just seem to be examples, and are available as man pages
+	rm -v "$pkgdir"/usr/share/perl5/vendor_perl/DateTime/Locale/*.pod
 }
 
-sha512sums="31fb6c2a4d38350dea0160dc816c21ed2b97f11510fe9f545fe52530d00260b7bb64b1cab3a7e30531a1337aac2dd2983d0b3af09d24da0c4451498729d8777a  DateTime-Locale-1.25.tar.gz"
+sha512sums="
+a5dae9887485cf778c7e5e9a3f14dd46e04d7d8cee27127870225ec4a3743f3b08f5116a62cd2426a18b63a6f48439557267c27a4370c447f54fecb83e4cbb3d  DateTime-Locale-1.41.tar.gz
+"
diff --git a/main/perl-datetime-timezone/APKBUILD b/main/perl-datetime-timezone/APKBUILD
index 01025589d10..598a5f0a5cb 100644
--- a/main/perl-datetime-timezone/APKBUILD
+++ b/main/perl-datetime-timezone/APKBUILD
@@ -1,46 +1,42 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 4
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-datetime-timezone
-_pkgreal=DateTime-TimeZone
-pkgver=2.38
+pkgver=2.62
 pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=DateTime-TimeZone
 pkgdesc="Time zone object base class and factory"
-url="https://metacpan.org/release/DateTime-TimeZone"
+url="https://metacpan.org/release/DateTime-TimeZone/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends="perl-class-singleton perl-params-validationcompiler
-	perl-namespace-autoclean perl-try-tiny perl-module-runtime
-	perl-specio"
-cpancheckdepends="perl-test-requires perl-test-fatal"
-depends="$cpandepends"
-makedepends="perl-dev"
-options="!check" # disable due to circular dependency with perl-datetime
-# checkdepends="perl-datetime $cpancheckdepends"
+depends="
+	perl perl-specio perl-class-singleton perl-module-runtime perl-params-validationcompiler
+	perl-try-tiny perl-namespace-autoclean
+	"
+checkdepends="perl-test-requires perl-test-fatal"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-TimeZone-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
 	make
 }
 
-package() {
-	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
 check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
-sha512sums="984a3bf8e30bae0085be51d67288230ffd8d2834b066b275720ab3658df6cc0607316cb22b2ca28ec8c9c1be7f6cbb8509eee52d4906aedf6175bf36a413b643  DateTime-TimeZone-2.38.tar.gz"
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+7608a47b5acbf61904f66cc945bd96ff1042af6a6d3077905d238239dfdb8cd4a4dc3c75d21c37308d2ed716c64557c7a0fae41e47403a6771cf2f53cbb22afb  DateTime-TimeZone-2.62.tar.gz
+"
diff --git a/main/perl-datetime/APKBUILD b/main/perl-datetime/APKBUILD
index 10b9fd89922..70818138f5b 100644
--- a/main/perl-datetime/APKBUILD
+++ b/main/perl-datetime/APKBUILD
@@ -1,36 +1,32 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-datetime
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=DateTime
-pkgver=1.52
+pkgver=1.65
 pkgrel=0
 pkgdesc="A date and time object for Perl"
-url="https://metacpan.org/release/DateTime"
+url="https://metacpan.org/release/DateTime/"
 arch="all"
 license="Artistic-2.0"
-depends="perl perl-datetime-locale perl-try-tiny perl-dist-checkconflicts
-	perl-params-validationcompiler perl-datetime-timezone perl-namespace-autoclean
-	perl-specio"
-makedepends="perl-test-warnings perl-cpan-meta-check perl-test-fatal
-	perl-dev perl-file-sharedir"
+depends="perl perl-specio perl-dist-checkconflicts perl-datetime-locale
+	perl-namespace-autoclean perl-try-tiny perl-datetime-timezone
+	perl-params-validationcompiler"
+makedepends="perl-dev"
+checkdepends="perl-cpan-meta-check perl-test-warnings perl-test-fatal"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -39,4 +35,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="c2e359f480396e0da16afbec362cb744f201f6c777fa916228f0adfd26a848b9451535feeda4e1531e5afb40a286e3b11a44e95dc0947dc4e2ba714973bb5ac4  DateTime-1.52.tar.gz"
+sha512sums="
+53b8bb5085420104d9cd2b6df076d353684ec6f347caf17f858c9c09e052aa19421bf980d130dbbe0094b791ff071ee99d8222509717008e5a3cd354639f7720  DateTime-1.65.tar.gz
+"
diff --git a/main/perl-db/APKBUILD b/main/perl-db/APKBUILD
deleted file mode 100644
index a8c54d1464a..00000000000
--- a/main/perl-db/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
-pkgname=perl-db
-_pkgname=BerkeleyDB
-pkgver=0.63
-pkgrel=2
-pkgdesc="Perl extension for Berkeley DB version 2, 3 or 4"
-url="https://metacpan.org/release/BerkeleyDB/"
-arch="all"
-license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl"
-makedepends="perl-dev db-dev"
-subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/P/PM/PMQS/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-prepare() {
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
-check() {
-	make test
-}
-
-build() {
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-sha512sums="43edf4eb3650e7b03dfc45ead834ea766d458cf3bc9b6405646142ad0ab223bdb3267815be5a92ddbf3958e5507d39f193d749d9ff6fe83a3beb9e02e8f6c66b  BerkeleyDB-0.63.tar.gz"
diff --git a/main/perl-db_file/APKBUILD b/main/perl-db_file/APKBUILD
deleted file mode 100644
index 32b11717603..00000000000
--- a/main/perl-db_file/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
-pkgname=perl-db_file
-_pkgname=DB_File
-pkgver=1.853
-pkgrel=0
-pkgdesc="Perl5 access to Berkeley DB"
-url="https://metacpan.org/pod/DB_File"
-arch="all"
-license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl"
-makedepends="perl-dev db-dev"
-subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/P/PM/PMQS/DB_File-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-prepare() {
-	default_prepare
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-
-}
-
-build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
-}
-
-check() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-sha512sums="484186dcad8b6310e60782c01f531b11f1088db2218e1aba3c303db458c220671d7cf6ba2d4ba88572ecc4abb8cfee32865aea1c78ba7e594ddaf132780130e4  DB_File-1.853.tar.gz"
diff --git a/main/perl-dbd-mysql/APKBUILD b/main/perl-dbd-mysql/APKBUILD
index e26782175cc..cb47869c398 100644
--- a/main/perl-dbd-mysql/APKBUILD
+++ b/main/perl-dbd-mysql/APKBUILD
@@ -2,19 +2,19 @@
 # Contributor: Jeff Bilyk <jbilyk at gmail>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-dbd-mysql
-_pkgname=DBD-mysql
-pkgver=4.050
-pkgrel=2
+_pkgreal=DBD-mysql
+pkgver=4.052
+pkgrel=0
 pkgdesc="Perl CPAN DBD::Mysql module"
-url="http://search.cpan.org/~capttofu/DBD-mysql/"
+url="https://metacpan.org/dist/DBD-mysql"
 arch="all"
-license="GPL PerlArtistic"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-dbi"
-makedepends="perl perl-dev mariadb-connector-c-dev zlib-dev perl-devel-checklib"
+makedepends="perl-dev mariadb-connector-c-dev zlib-dev perl-devel-checklib"
 source="https://cpan.metacpan.org/authors/id/D/DV/DVEEDEN/DBD-mysql-$pkgver.tar.gz"
 subpackages="$pkgname-doc"
 options="!check" # requires a running dbms
-builddir="$srcdir"/${_pkgname}-$pkgver
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
 	default_prepare
@@ -23,20 +23,19 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	make
 }
 
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	find "$pkgdir" -name perllocal.pod -delete
-}
-
 check() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
-sha512sums="910f5b4ba7a7890d50a79f37d04ec8971a4f62acd0fe30bf3ab634f66e3128f0cd6513e5c9da8c807a0f4477d0cc766682ea8dd0d8072d02821b78df51f37879  DBD-mysql-4.050.tar.gz"
+package() {
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" -name perllocal.pod -delete
+}
+
+sha512sums="
+7dd04209e656cc0221a757fa79bb979f4baf7834c2235b43754346792b416db7886df2907376b0c40f2def567d7c3ec153266ab5d57beb01f4eb2613a7467619  DBD-mysql-4.052.tar.gz
+"
diff --git a/main/perl-dbd-odbc/APKBUILD b/main/perl-dbd-odbc/APKBUILD
index fe8dd049808..8fd9fda8655 100644
--- a/main/perl-dbd-odbc/APKBUILD
+++ b/main/perl-dbd-odbc/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Jeff Bilyk <jbilyk at gmail>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-dbd-odbc
-_pkgname=DBD-ODBC
+_pkgreal=DBD-ODBC
 pkgver=1.61
-pkgrel=0
+pkgrel=5
 pkgdesc="Perl CPAN DBD::ODBC module"
 url="https://metacpan.org/release/DBD-ODBC/"
 arch="all"
@@ -12,9 +12,11 @@ depends="perl perl-dbi"
 makedepends="perl-dev unixodbc-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/M/MJ/MJEVANS/DBD-ODBC-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
+	default_prepare
+
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
diff --git a/main/perl-dbd-pg/APKBUILD b/main/perl-dbd-pg/APKBUILD
index 29b93e45a7a..685a5b1ad4a 100644
--- a/main/perl-dbd-pg/APKBUILD
+++ b/main/perl-dbd-pg/APKBUILD
@@ -1,30 +1,30 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-dbd-pg
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=DBD-Pg
-pkgver=3.10.5
+pkgver=3.18.0
 pkgrel=0
-pkgdesc="DBI PostgreSQL interface"
-url="https://metacpan.org/release/DBD-Pg"
+pkgdesc="Perl module for DBD-Pg"
+url="https://metacpan.org/release/DBD-Pg/"
 arch="all"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-dbi"
-makedepends="perl-dev postgresql-dev"
+makedepends="perl-dev libpq-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
@@ -32,9 +32,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-sha512sums="655f4869731db6c3ac892032000c099770b2769a3f100c15b4ccd89d8d9ea43d827b1fe86cabbf6d297f45a700f0422c4f6ee068f5a78d606e12f008474cff9f  DBD-Pg-3.10.5.tar.gz"
+sha512sums="
+0a81d1993f22a923776ab57f1437dbee2b5c42de091e274355dbcc9bb07e3db0c22126d0037de8de43fafeab9c947db1e3692087127027a0b13eed538fc2e1ee  DBD-Pg-3.18.0.tar.gz
+"
diff --git a/main/perl-dbd-sqlite/APKBUILD b/main/perl-dbd-sqlite/APKBUILD
index 744c27f867e..f3aca6f5704 100644
--- a/main/perl-dbd-sqlite/APKBUILD
+++ b/main/perl-dbd-sqlite/APKBUILD
@@ -1,44 +1,40 @@
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Jeff Bilyk <jbilyk at gmail>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-dbd-sqlite
-_pkgname=DBD-SQLite
-pkgver=1.64
-pkgrel=2
-pkgdesc="Perl CPAN DBD::SQLite module"
-url="https://metacpan.org/release/$_pkgname"
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=DBD-SQLite
+pkgver=1.74
+pkgrel=0
+pkgdesc="Self Contained SQLite RDBMS in a DBI Driver"
+url="https://metacpan.org/release/DBD-SQLite/"
 arch="all"
-license="GPL PerlArtistic"
-depends="perl-dbi"
-makedepends="perl perl-dev sqlite-dev"
-source="https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/${_pkgname}-$pkgver.tar.gz
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-dbi"
+makedepends="perl-dev sqlite-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/DBD-SQLite-$pkgver.tar.gz
 	perl-DBD-SQLite-bz543982.patch
 	"
-subpackages="$pkgname-dev $pkgname-doc"
-builddir="$srcdir"/${_pkgname}-$pkgver
-
-prepare() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="36a227193b4544c7cec24eec50ee51f46c00a2dad99ab7b8899b0417ea928a1e223f4052fb75f2d641cbfa4408192492ba8943fdb92520dc9888014467f503a4  DBD-SQLite-1.64.tar.gz
-00961932f9f89d9b46e6134150c2628aadd4cfa7159cb1604de023fedc919087fbf982b72fd51610e1ca390234cd939e74430b270131d0b30cedb97ba6203b49  perl-DBD-SQLite-bz543982.patch"
+sha512sums="
+46bb26ffac07ca6d25d44101bd59fe7ebb397d159154fe10528e4ca4ee270e62159a40be0325099237ce28fb6ce11b5dc1da5396c3e9a3e0e03062a65c16cbab  DBD-SQLite-1.74.tar.gz
+00961932f9f89d9b46e6134150c2628aadd4cfa7159cb1604de023fedc919087fbf982b72fd51610e1ca390234cd939e74430b270131d0b30cedb97ba6203b49  perl-DBD-SQLite-bz543982.patch
+"
diff --git a/main/perl-dbi/APKBUILD b/main/perl-dbi/APKBUILD
index 86af78a167f..93e01766e6b 100644
--- a/main/perl-dbi/APKBUILD
+++ b/main/perl-dbi/APKBUILD
@@ -1,32 +1,43 @@
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Jeff Bilyk <jbilyk at gmail>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-dbi
-_realpkgname=DBI
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=DBI
 pkgver=1.643
-pkgrel=0
+pkgrel=6
 pkgdesc="Database independent interface for Perl"
-url="https://metacpan.org/release/DBI"
+url="https://metacpan.org/release/DBI/"
 arch="all"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/T/TI/TIMB/DBI-$pkgver.tar.gz"
-builddir="$srcdir"/$_realpkgname-$pkgver
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+# secfixes:
+#   1.643-r0:
+#     - CVE-2020-14392
+#     - CVE-2020-14393
+#     - CVE-2014-10402
 
 build() {
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
-	# creates file collision among perl modules
-	find "$pkgdir" -name perllocal.pod -delete
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="03812f3eb1e43c8290dadb8cb14bbced9ec6e237228ea2a2ba91f22e52143906a91a7e82945dab30b1d1b9fc925073721111adafd9a09fac070808ab88f908b8  DBI-1.643.tar.gz"
+sha512sums="
+03812f3eb1e43c8290dadb8cb14bbced9ec6e237228ea2a2ba91f22e52143906a91a7e82945dab30b1d1b9fc925073721111adafd9a09fac070808ab88f908b8  DBI-1.643.tar.gz
+"
diff --git a/main/perl-dbix-dbschema/APKBUILD b/main/perl-dbix-dbschema/APKBUILD
index 60a3b389a17..3c040594180 100644
--- a/main/perl-dbix-dbschema/APKBUILD
+++ b/main/perl-dbix-dbschema/APKBUILD
@@ -1,34 +1,31 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-dbix-dbschema
-pkgver=0.45
-pkgrel=1
+pkgver=0.47
+pkgrel=2
 pkgdesc="DBIx::DBSchema perl module"
 url="https://metacpan.org/release/DBIx-DBSchema/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl perl-dbi"
-makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/I/IV/IVAN/DBIx-DBSchema-$pkgver.tar.gz"
 builddir="$srcdir"/DBIx-DBSchema-$pkgver
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="808d83898b1265b6dcdd5e9727fb0fed50935dba893cae40ead5d0d344edcf6f342a3ed2e7ad63efbb94e0cc07c0615153c29d14132c13ac9b071d77a9069770  DBIx-DBSchema-0.45.tar.gz"
+sha512sums="
+f40342d586f3c2665c3eb38cd52bb47ed33fde18363d3377e47b63be5262e542e140ac45b5ed059b9b8d41d50bb04d2de6c51ef1cb8c8a35a55ec969dca8673f  DBIx-DBSchema-0.47.tar.gz
+"
diff --git a/main/perl-dbix-searchbuilder/APKBUILD b/main/perl-dbix-searchbuilder/APKBUILD
index 969a9ecef18..045db2ec22c 100644
--- a/main/perl-dbix-searchbuilder/APKBUILD
+++ b/main/perl-dbix-searchbuilder/APKBUILD
@@ -1,44 +1,46 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-dbix-searchbuilder
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=DBIx-SearchBuilder
-pkgver=1.67
-pkgrel=2
+pkgver=1.81
+pkgrel=0
 pkgdesc="Encapsulate SQL queries and rows in simple perl objects"
 url="https://metacpan.org/release/DBIx-SearchBuilder/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-class-returnvalue perl-dbi perl-cache-simple-timedexpiry perl-class-accessor perl-clone perl-want perl-dbix-dbschema"
-cpanmakedepends="perl-dbd-sqlite"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-install"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="
+	perl
+	perl-cache-simple-timedexpiry
+	perl-class-accessor
+	perl-class-returnvalue
+	perl-clone
+	perl-dbi
+	perl-dbix-dbschema
+	perl-want
+	"
+makedepends="perl-dbd-sqlite"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/B/BP/BPS/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/B/BP/BPS/DBIx-SearchBuilder-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="8cade12f01da749356a3c1b167f46e0377934e01832548baebfa629e71c3199ce473a63077ee5ac5ed58f805f7cb883bd8d0886d2ecf27f4740eafbb30f91bae  DBIx-SearchBuilder-1.67.tar.gz"
+sha512sums="
+611dc2868255ff84ff94eff3083886c76d4aee00e3d4b92cd4cb1f0db35e3ef7b5c5a2be8a86aa28c5d7b9f6cc4af86496c8d44e074fb6092aaa1f69464a342a  DBIx-SearchBuilder-1.81.tar.gz
+"
diff --git a/main/perl-devel-checkbin/APKBUILD b/main/perl-devel-checkbin/APKBUILD
index 6412a1c2691..b6b7fd93170 100644
--- a/main/perl-devel-checkbin/APKBUILD
+++ b/main/perl-devel-checkbin/APKBUILD
@@ -1,43 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-devel-checkbin
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Devel-CheckBin
 pkgver=0.04
-pkgrel=0
+pkgrel=3
 pkgdesc="check that a command is available"
-url="https://search.cpan.org/dist/Devel-CheckBin/"
+url="https://metacpan.org/release/Devel-CheckBin/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://search.cpan.org/CPAN/authors/id/T/TO/TOKUHIROM/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	perl Makefile.PL installdirs=vendor
-}
+source="https://cpan.metacpan.org/authors/id/T/TO/TOKUHIROM/Devel-CheckBin-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$_builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="7b28092fa2e6309ddc09976dcfadabbad9be678352c5b97a7938bf7e73944454e5c3c198aaf1a39939f24544e436ec4323925e77fa91e8d92e3986702c840f44  Devel-CheckBin-0.04.tar.gz"
+sha512sums="
+7b28092fa2e6309ddc09976dcfadabbad9be678352c5b97a7938bf7e73944454e5c3c198aaf1a39939f24544e436ec4323925e77fa91e8d92e3986702c840f44  Devel-CheckBin-0.04.tar.gz
+"
diff --git a/main/perl-devel-checklib/APKBUILD b/main/perl-devel-checklib/APKBUILD
index 28a58301f8c..6f8f39a2c3e 100644
--- a/main/perl-devel-checklib/APKBUILD
+++ b/main/perl-devel-checklib/APKBUILD
@@ -1,31 +1,30 @@
-# Automatically generated by apkbuild-cpan, template 2
-# Contributor:
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-devel-checklib
-_pkgname=Devel-CheckLib
-pkgver=1.14
-pkgrel=0
-pkgdesc="Check if a library is installed"
-url="https://metacpan.org/release/MATTN/Devel-CheckLib-$pkgver"
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Devel-CheckLib
+pkgver=1.16
+pkgrel=2
+pkgdesc="check that a library is available"
+url="https://metacpan.org/release/Devel-CheckLib/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="$cpandepends"
-makedepends="perl-dev perl-io-captureoutput"
-checkdepends="$cpancheckdepends perl-capture-tiny"
+depends="perl"
+makedepends="perl-dev"
+checkdepends="perl-capture-tiny"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/M/MA/MATTN/Devel-CheckLib-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-prepare() {
-	default_prepare
+builddir="$srcdir/$_pkgreal-$pkgver"
 
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
@@ -33,9 +32,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-sha512sums="a5a310cd20e7bfa3c28718b0cba997e029ae0a422ed355d70774691521a3f5c2942eb39269dec1b09e706c1d124559313ab79e787430e0bb3ad43d8aa937539c  Devel-CheckLib-1.14.tar.gz"
+sha512sums="
+919da046cdd1f48e0ccd8a7734a98f3144c0005c8303b02b43aeedcd2cfc148c78f502f26a80ea2612279e2becf4948b408d8cbd4b7cc514519c5954ae4139cb  Devel-CheckLib-1.16.tar.gz
+"
diff --git a/main/perl-devel-globaldestruction/APKBUILD b/main/perl-devel-globaldestruction/APKBUILD
index 558c9a23975..9a29f08d17f 100644
--- a/main/perl-devel-globaldestruction/APKBUILD
+++ b/main/perl-devel-globaldestruction/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-devel-globaldestruction
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Devel-GlobalDestruction
 pkgver=0.14
-pkgrel=1
-pkgdesc="unknown"
+pkgrel=4
+pkgdesc="Provides function returning the equivalent of C<\${^GLOBAL_PHASE} eq 'DESTRUCT'> for older perls."
 url="https://metacpan.org/release/Devel-GlobalDestruction/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-sub-exporter-progressive"
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-sub-exporter-progressive"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Devel-GlobalDestruction-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="75c346feae98897fb202dea0295f0225bf3cac59f21915da5dd1cdcf845052f4f8bcd0362d357020fb0facb6358175112b3685860ca1c1f173421c7c6a54f45d  Devel-GlobalDestruction-0.14.tar.gz"
+sha512sums="
+75c346feae98897fb202dea0295f0225bf3cac59f21915da5dd1cdcf845052f4f8bcd0362d357020fb0facb6358175112b3685860ca1c1f173421c7c6a54f45d  Devel-GlobalDestruction-0.14.tar.gz
+"
diff --git a/main/perl-devel-overloadinfo/APKBUILD b/main/perl-devel-overloadinfo/APKBUILD
index e21000e1d89..04fa3cc194f 100644
--- a/main/perl-devel-overloadinfo/APKBUILD
+++ b/main/perl-devel-overloadinfo/APKBUILD
@@ -1,17 +1,17 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timothy Legge <timlegge@gmail.com>
 # Maintainer: Timothy Legge <timlegge@gmail.com>
 pkgname=perl-devel-overloadinfo
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Devel-OverloadInfo
-pkgver=0.005
+pkgver=0.007
 pkgrel=1
 pkgdesc="introspect overloaded operators"
 url="https://metacpan.org/release/Devel-OverloadInfo/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl-mro-compat perl-sub-identify perl-package-stash"
+depends="perl perl-mro-compat perl-package-stash"
 checkdepends="perl-test-fatal"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/I/IL/ILMARI/Devel-OverloadInfo-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
@@ -32,4 +32,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="66ff0869ecd34b2a80e6c8052e9ba7cf396b85e25f2efa92e42447ae3164ac50f703ca4dbee38ac676b70caf19ce189a6d2a1d6322cf3af342d4edd5c0b336e7  Devel-OverloadInfo-0.005.tar.gz"
+sha512sums="4db830d6f9edb467626213ab4d45b3e4b8fa9b3c38fad1349233f7b420d08be42833e57daa9a8076f4127cafba92f4cfc177ca33bd19cf2a582b644ac1ae7d72  Devel-OverloadInfo-0.007.tar.gz"
diff --git a/main/perl-devel-stacktrace-ashtml/APKBUILD b/main/perl-devel-stacktrace-ashtml/APKBUILD
index 028b3b8e17a..b9da6801d30 100644
--- a/main/perl-devel-stacktrace-ashtml/APKBUILD
+++ b/main/perl-devel-stacktrace-ashtml/APKBUILD
@@ -2,31 +2,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-devel-stacktrace-ashtml
 pkgver=0.15
-pkgrel=1
+pkgrel=4
 pkgdesc="Devel::StackTrace::AsHTML perl module"
 url="https://metacpan.org/release/Devel-StackTrace-AsHTML/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl perl-devel-stacktrace"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA/Devel-StackTrace-AsHTML-$pkgver.tar.gz"
 
 builddir="$srcdir/Devel-StackTrace-AsHTML-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-devel-stacktrace/APKBUILD b/main/perl-devel-stacktrace/APKBUILD
index b3f2b0ceda4..8706e4d1291 100644
--- a/main/perl-devel-stacktrace/APKBUILD
+++ b/main/perl-devel-stacktrace/APKBUILD
@@ -1,43 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-devel-stacktrace
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Devel-StackTrace
-pkgver=2.04
-pkgrel=1
+pkgver=2.05
+pkgrel=0
 pkgdesc="An object representing a stack trace"
 url="https://metacpan.org/release/Devel-StackTrace/"
 arch="noarch"
 license="Artistic-2.0"
-makedepends="perl-dev"
+depends="perl"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Devel-StackTrace-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="2330c1d8619cdcb42b5919090e6eaabbe34ab26b50d5c09c4cfd7ed099829817a50ffe582bd1f2a19a7d5be050819796f22dee32b10e175259e6df177ce6d0a9  Devel-StackTrace-2.04.tar.gz"
+sha512sums="
+070f95e731a7ac07a19f0ae0a4dbe04ae2ee72e43c34363e57c2336c856ec2f7fc055ae9fec6b8ee85ca06d6b5558a891a1a6df62c7d1b60493b22be38a020b8  Devel-StackTrace-2.05.tar.gz
+"
diff --git a/main/perl-devel-symdump/APKBUILD b/main/perl-devel-symdump/APKBUILD
index f370a79f99a..8ff2260c39a 100644
--- a/main/perl-devel-symdump/APKBUILD
+++ b/main/perl-devel-symdump/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-devel-symdump
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Devel-Symdump
 pkgver=2.18
-pkgrel=1
+pkgrel=4
 pkgdesc="dump symbol names or the symbol table"
 url="https://metacpan.org/release/Devel-Symdump/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/A/AN/ANDK/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/A/AN/ANDK/Devel-Symdump-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="4e8e1ee723e3e02d2f0c100dace40d7722f6366402cff24fb50c8616a863628bc2faa02210754132afa7cbebbd90c75ea6f173e15bbcfaa5158dfcfdfd03da73  Devel-Symdump-2.18.tar.gz"
+sha512sums="
+4e8e1ee723e3e02d2f0c100dace40d7722f6366402cff24fb50c8616a863628bc2faa02210754132afa7cbebbd90c75ea6f173e15bbcfaa5158dfcfdfd03da73  Devel-Symdump-2.18.tar.gz
+"
diff --git a/main/perl-device-serialport/APKBUILD b/main/perl-device-serialport/APKBUILD
index 3bd77ac927d..d75652bbff9 100644
--- a/main/perl-device-serialport/APKBUILD
+++ b/main/perl-device-serialport/APKBUILD
@@ -1,33 +1,35 @@
-# Contributor:  Francesco Colista <francesco.colista@gmail.com>
-# Maintainer:  Francesco Colista <francesco.colista@gmail.com>
+# Contributor:  Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-device-serialport
-_realname=Device-SerialPort
+_pkgreal=Device-SerialPort
 pkgver=1.04
-pkgrel=13
+pkgrel=21
 pkgdesc="Linux/POSIX emulation of Win32::SerialPort functions."
-url="http://search.cpan.org/~cook/"
+url="https://metacpan.org/dist/Device-SerialPort"
 arch="all"
-license="GPL PerlArtistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
 makedepends="perl-dev"
-install=
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/C/CO/COOK/$_realname-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_realname-$pkgver"
+source="https://cpan.metacpan.org/authors/id/C/CO/COOK/Device-SerialPort-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd $_builddir
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd $_builddir
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 
 }
 
-sha512sums="4b25a7d29091322d516e0aa20693caabe95a8521b3fdc425d1c03e3312fb59a6883268db7eaf79b32586569502fb656c875dd2b6b1d7a4341d9bd6916e04ee44  Device-SerialPort-1.04.tar.gz"
+sha512sums="
+4b25a7d29091322d516e0aa20693caabe95a8521b3fdc425d1c03e3312fb59a6883268db7eaf79b32586569502fb656c875dd2b6b1d7a4341d9bd6916e04ee44  Device-SerialPort-1.04.tar.gz
+"
diff --git a/main/perl-digest-hmac/APKBUILD b/main/perl-digest-hmac/APKBUILD
index 6233a0a2680..1e4bc219472 100644
--- a/main/perl-digest-hmac/APKBUILD
+++ b/main/perl-digest-hmac/APKBUILD
@@ -1,30 +1,33 @@
-# Maintainer:  Natanael Copa <ncopa@alpinelinux.org>
+# Automatically generated by apkbuild-cpan, template 3
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-digest-hmac
-_realname=Digest-HMAC
-pkgver=1.03
-pkgrel=1
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Digest-HMAC
+pkgver=1.04
+pkgrel=2
 pkgdesc="Keyed-Hashing for Message Authentication Perl module"
-url="http://search.cpan.org/~gaas/Digest-HMAC-1.01/"
+url="https://metacpan.org/release/Digest-HMAC/"
 arch="noarch"
-license="GPL PerlArtistic"
-depends="perl perl-digest-sha1"
-makedepends="perl-dev"
-install=
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-digest-sha1 perl-digest-md5"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/A/AR/ARODLAND/Digest-HMAC-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir"/$_realname-$pkgver
 build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
-	# creates file collision among perl modules
-	find "$pkgdir" -name perllocal.pod -delete
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="9863547f8bccdc08e0e3d565b9f0fc3c64cbcc366d92692715a9594e3c02474f7927cb833b5aa0183e7bb757b0ad4d74ea52e481480527a5b1dbcf560b4e4b5b  Digest-HMAC-1.03.tar.gz"
+sha512sums="d30b62e60bfa9f6c0f0c058e190938f13a08a70a816771a0641226c24045cb6dbd622756f1f88593fd3690442a45636bdcaf35457e9dfea6de5f8a342a538a6d  Digest-HMAC-1.04.tar.gz"
diff --git a/main/perl-digest-md5/APKBUILD b/main/perl-digest-md5/APKBUILD
index 4e77e0b4b72..eda6736c75d 100644
--- a/main/perl-digest-md5/APKBUILD
+++ b/main/perl-digest-md5/APKBUILD
@@ -1,43 +1,39 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-digest-md5
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Digest-MD5
-pkgver=2.55
-pkgrel=5
+pkgver=2.59
+pkgrel=1
 pkgdesc="Perl interface to the MD-5 algorithm"
 url="https://metacpan.org/release/Digest-MD5/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$_pkgreal-$pkgver.tar.gz"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
+source="https://cpan.metacpan.org/authors/id/T/TO/TODDR/Digest-MD5-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
 
-doc() {
-	default_doc
-	replaces="perl-doc"
+	# man pages are already provided by perl-doc
+	rm -rf "$pkgdir"/usr/share/man
 }
 
-sha512sums="e921fe802566047479d4f33e65cdda0c316e0de06b316845bb48feaefdf5d0c602e330d42335f2cbe34d5b076aa0da2ed6daa7f998e9fda09cf9d66fb3c66811  Digest-MD5-2.55.tar.gz"
+sha512sums="
+478fb39b47bd31d032a0c801ddb26b7c08059e5b8a5d0253dacf26f656733ca0042a3347c08799221f521c7571dbc214fbf1883748795e0cc3617a8a531af748  Digest-MD5-2.59.tar.gz
+"
diff --git a/main/perl-digest-sha1/APKBUILD b/main/perl-digest-sha1/APKBUILD
index 2ef6a838b59..090239ae6b2 100644
--- a/main/perl-digest-sha1/APKBUILD
+++ b/main/perl-digest-sha1/APKBUILD
@@ -1,40 +1,34 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-digest-sha1
-_realname=Digest-SHA1
+_pkgreal=Digest-SHA1
 pkgver=2.13
-pkgrel=12
+pkgrel=18
 pkgdesc="Perl interface to the SHA-1 algorithm"
 url="https://metacpan.org/release/Digest-SHA1/"
 arch="all"
-license="GPL PerlArtistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
 makedepends="perl-dev"
-install=
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz
+source="https://cpan.metacpan.org/authors/id/G/GA/GAAS/Digest-SHA1-$pkgver.tar.gz
 	perl-digest-sha1-check-object.patch
 	"
+builddir="$srcdir/$_pkgreal-$pkgver"
+options="!check"
 
 prepare() {
-	cd "$srcdir/$_realname-$pkgver"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
 
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \
-		OPTIMIZE="$CFLAGS" || return 1
+		OPTIMIZE="$CFLAGS"
 }
 
 build() {
-	cd "$srcdir/$_realname-$pkgver"
-	make || return 1
+	make
 }
 
 package() {
-	cd "$srcdir/$_realname-$pkgver"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
diff --git a/main/perl-dist-checkconflicts/APKBUILD b/main/perl-dist-checkconflicts/APKBUILD
index 206904b813f..231206cf6f1 100644
--- a/main/perl-dist-checkconflicts/APKBUILD
+++ b/main/perl-dist-checkconflicts/APKBUILD
@@ -1,37 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-dist-checkconflicts
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Dist-CheckConflicts
 pkgver=0.11
-pkgrel=1
+pkgrel=4
 pkgdesc="declare version conflicts for your dist"
 url="https://metacpan.org/release/Dist-CheckConflicts/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-list-moreutils perl-module-runtime"
-cpanmakedepends="  perl-test-fatal "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-module-runtime"
+makedepends="perl-dev"
+checkdepends="perl-test-fatal"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DO/DOY/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/D/DO/DOY/Dist-CheckConflicts-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="6c3f8546c1c7904bbc2a3c1135d145cbff95997c3032e9129afc98bdd98578dd9219af444f357dd8e9b1f08442a2fdd9d6f7fe8768f8ef165e71570f5ae246ad  Dist-CheckConflicts-0.11.tar.gz"
+sha512sums="
+6c3f8546c1c7904bbc2a3c1135d145cbff95997c3032e9129afc98bdd98578dd9219af444f357dd8e9b1f08442a2fdd9d6f7fe8768f8ef165e71570f5ae246ad  Dist-CheckConflicts-0.11.tar.gz
+"
diff --git a/main/perl-email-address-list/APKBUILD b/main/perl-email-address-list/APKBUILD
index aa11fb128ae..b2af7054341 100644
--- a/main/perl-email-address-list/APKBUILD
+++ b/main/perl-email-address-list/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-email-address-list
 pkgver=0.06
-pkgrel=1
+pkgrel=4
 pkgdesc="RFC close address list parsing"
 url="https://metacpan.org/release/Email-Address-List/"
 arch="noarch"
-license="GPL+ or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl perl-email-address"
-makedepends="perl-dev perl-json perl-module-install"
+makedepends="perl-json perl-module-install"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/B/BP/BPS/Email-Address-List-$pkgver.tar.gz"
 builddir="$srcdir/Email-Address-List-$pkgver"
@@ -17,18 +17,15 @@ builddir="$srcdir/Email-Address-List-$pkgver"
 #     - CVE-2018-18898
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-email-address/APKBUILD b/main/perl-email-address/APKBUILD
index 64b1dffae2f..696084d11e3 100644
--- a/main/perl-email-address/APKBUILD
+++ b/main/perl-email-address/APKBUILD
@@ -1,14 +1,13 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-email-address
-pkgver=1.912
+pkgver=1.913
 pkgrel=1
 pkgdesc="RFC 2822 Address Parsing and Creation"
 url="https://metacpan.org/release/Email-Address"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-capture-tiny"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Email-Address-$pkgver.tar.gz"
 builddir="$srcdir/Email-Address-$pkgver"
@@ -18,20 +17,19 @@ builddir="$srcdir/Email-Address-$pkgver"
 #     - CVE-2018-12558
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make -C "$builddir" test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="fd8a8c09829f725609aa84c79ad89d1e44cbfb70cc44cae6a9f31174589404f56cf60ab3a4186137f7ff9838a3fe34a95a7c584e0eec2e5d1d79c919610f6e1a  Email-Address-1.912.tar.gz"
+sha512sums="
+3c12c052cf7bc5738763f35e81eb328f990494774703ac204b516cec7faa985d262af79126e4068cb084ee4f3b56b1704bbe219288ff8efe5e61b6a62fcea901  Email-Address-1.913.tar.gz
+"
diff --git a/main/perl-email-date-format/APKBUILD b/main/perl-email-date-format/APKBUILD
index 9630ce8ccec..f8f1dd0a278 100644
--- a/main/perl-email-date-format/APKBUILD
+++ b/main/perl-email-date-format/APKBUILD
@@ -1,37 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor:
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-email-date-format
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Email-Date-Format
-pkgver=1.005
+pkgver=1.008
 pkgrel=1
 pkgdesc="produce RFC 2822 date strings"
 url="https://metacpan.org/release/Email-Date-Format/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="  perl-capture-tiny "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Email-Date-Format-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="23daefa45874211f053d05ac3c3f3c7c3a86d9b623fdcec3bd9f6f7b4c8e5ad1ac8038146bdc85cc950b21b43b0ad843f8a52ad2183d868d3a62ea96292e34ca  Email-Date-Format-1.005.tar.gz"
+sha512sums="
+24c97cd3b739c2f3c298b9ec168c4614bb71b13a0106f351990443cc86506e4e121f9c647bde6f08080a876f36adeb3fcef566d87ded9bddcbec6f3191f508be  Email-Date-Format-1.008.tar.gz
+"
diff --git a/main/perl-encode-hanextra/APKBUILD b/main/perl-encode-hanextra/APKBUILD
index 4d0aa20d416..b0abf7199c9 100644
--- a/main/perl-encode-hanextra/APKBUILD
+++ b/main/perl-encode-hanextra/APKBUILD
@@ -1,40 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=perl-encode-hanextra
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Encode-HanExtra
 pkgver=0.23
-pkgrel=5
-pkgdesc="Perl module for Encode-HanExtra"
+pkgrel=11
+pkgdesc="Extra sets of Chinese encodings"
 url="https://metacpan.org/release/Encode-HanExtra/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="MIT"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/A/AU/AUDREYT/$_pkgreal-$pkgver.tar.gz
-	perl-5.26.patch"
-
+source="https://cpan.metacpan.org/authors/id/A/AU/AUDREYT/Encode-HanExtra-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
+
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="218083b9b3b4517cfc714169479cba0689a3586d9abb24bcc79d3401d37dd9412cb4e878b6aad06676d5c4f0e03cc69dcaf2e5f48036e2da6f336508c381e462  Encode-HanExtra-0.23.tar.gz
-91044f483f87951094ebbbb326165f31fe8e616b7189f45a97d4d65e60ad751d956bbf5425c3fe213e15e0c027209edb348a398755ef8fb23499493161fae955  perl-5.26.patch"
+sha512sums="
+218083b9b3b4517cfc714169479cba0689a3586d9abb24bcc79d3401d37dd9412cb4e878b6aad06676d5c4f0e03cc69dcaf2e5f48036e2da6f336508c381e462  Encode-HanExtra-0.23.tar.gz
+"
diff --git a/main/perl-encode-hanextra/perl-5.26.patch b/main/perl-encode-hanextra/perl-5.26.patch
deleted file mode 100644
index 7848467b1e3..00000000000
--- a/main/perl-encode-hanextra/perl-5.26.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile.PL b/Makefile.PL
-index 9e6cf51..333c7cd 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -5,6 +5,7 @@
- #
- use 5.007002;
- use strict;
-+BEGIN { push @INC, '.'; }
- use inc::Module::Install;
- use Config;
- 
diff --git a/main/perl-encode-locale/APKBUILD b/main/perl-encode-locale/APKBUILD
index 8a417a7bf53..c5e56edbf59 100644
--- a/main/perl-encode-locale/APKBUILD
+++ b/main/perl-encode-locale/APKBUILD
@@ -1,37 +1,34 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-encode-locale
-_realname=Encode-Locale
+_pkgreal=Encode-Locale
 pkgver=1.05
-pkgrel=2
+pkgrel=5
 pkgdesc="Perl module - Determine the locale encoding"
-url="http://search.cpan.org/~gaas"
+url="https://metacpan.org/dist/Encode-Locale"
 arch="noarch"
-license="GPL PerlArtistic"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
-install=
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$_realname-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/G/GA/GAAS/Encode-Locale-$pkgver.tar.gz"
 
-builddir="$srcdir/$_realname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="68ed5732fd3645eca2ea54080067677a48f90fc5a594a1b453a322f3127e67a984d539cb5fd41ac63a03b9dab693c070b65e3c70a2a677dc61b4634f3e212d06  Encode-Locale-1.05.tar.gz"
+sha512sums="
+68ed5732fd3645eca2ea54080067677a48f90fc5a594a1b453a322f3127e67a984d539cb5fd41ac63a03b9dab693c070b65e3c70a2a677dc61b4634f3e212d06  Encode-Locale-1.05.tar.gz
+"
diff --git a/main/perl-encode/APKBUILD b/main/perl-encode/APKBUILD
index 197ff7c0921..53eacfdd33a 100644
--- a/main/perl-encode/APKBUILD
+++ b/main/perl-encode/APKBUILD
@@ -1,31 +1,33 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-encode
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Encode
-pkgver=3.05
+pkgver=3.21
 pkgrel=0
 pkgdesc="character encodings in Perl"
 url="https://metacpan.org/release/Encode/"
 arch="all"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends_dev="$pkgname-utils"
+depends="perl"
 makedepends="perl-dev"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-utils::noarch"
-source="https://cpan.metacpan.org/authors/id/D/DA/DANKOGAI/$_pkgreal-$pkgver.tar.gz"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/D/DA/DANKOGAI/Encode-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+# secfixes:
+#   3.12-r0:
+#     - CVE-2021-36770
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -39,30 +41,30 @@ utils() {
 	pkgdesc="$pkgdesc (utilities)"
 	depends="$pkgname perl"
 	provides="$pkgname-piconv"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+
+	amove usr/bin
 }
 
 dev() {
 	default_dev
 	replaces="perl-dev"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/enc2xs "$subpkgdir"/usr/bin
-	local file; for file in $(find "$pkgdir" -name "*.e2x"); do
-		file=${file#$pkgdir/}
-		mkdir -p "$subpkgdir"/${file%/*}
-		mv "$pkgdir"/$file "$subpkgdir"/$file
+
+	amove usr/bin/enc2xs
+
+	local file; find "$pkgdir" -name "*.e2x" | while read -r file; do
+		amove "${file#"$pkgdir"}"
 	done
 }
 
 doc() {
 	default_doc
 	replaces="perl-doc"
-	local file; for file in $(find "$pkgdir" -name "*.pod"); do
-		file=${file#$pkgdir/}
-		mkdir -p "$subpkgdir"/${file%/*}
-		mv "$pkgdir"/$file "$subpkgdir"/$file
+
+	local file; find "$pkgdir" -name "*.pod" | while read -r file; do
+		amove "${file#"$pkgdir"}"
 	done
 }
 
-sha512sums="463a3356358b95ab13be456cdb69994b7e38aecba2417933f67ea5d36d55252bf673c0499ceb3440ada2053b63f878a7840037bbe00b0140a2d98eb101ac9ad4  Encode-3.05.tar.gz"
+sha512sums="
+413b22ff4175bc32b1081c9bb2db0b290379bf318de5ef94e86165fa68a197a68c64da538915e50a1d0c5f7db0de058e9c7248a024bca1301bc7b1d5b41f2467  Encode-3.21.tar.gz
+"
diff --git a/main/perl-error/APKBUILD b/main/perl-error/APKBUILD
index c8466fde66b..21f8b9049a1 100644
--- a/main/perl-error/APKBUILD
+++ b/main/perl-error/APKBUILD
@@ -1,19 +1,20 @@
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-error
-_realname=Error
+_pkgreal=Error
 pkgver=0.17029
-pkgrel=0
+pkgrel=2
 pkgdesc="Perl module error/exception handling in an OO-ish way"
 url="https://metacpan.org/release/Error"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Error-$pkgver.tar.gz"
-builddir="$srcdir"/$_realname-$pkgver
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
+	default_prepare
+
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
diff --git a/main/perl-eval-closure/APKBUILD b/main/perl-eval-closure/APKBUILD
index cc5f3e9bca0..23c07b0af24 100644
--- a/main/perl-eval-closure/APKBUILD
+++ b/main/perl-eval-closure/APKBUILD
@@ -1,37 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-eval-closure
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Eval-Closure
 pkgver=0.14
-pkgrel=1
+pkgrel=4
 pkgdesc="safely and cleanly create closures via string eval"
 url="https://metacpan.org/release/Eval-Closure/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-try-tiny"
-cpanmakedepends="  perl-test-fatal perl-test-requires "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
+checkdepends="perl-test-fatal perl-test-requires"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DO/DOY/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/D/DO/DOY/Eval-Closure-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="fc55206bd39c4cb39360d06b6f39a65743f34b5e59d1a1ce99bf5831b9d88a03fb6dadf32fa9f0868e140fce719d53a7b13027f397cdd7f6ca05cc81277bdc08  Eval-Closure-0.14.tar.gz"
+sha512sums="
+fc55206bd39c4cb39360d06b6f39a65743f34b5e59d1a1ce99bf5831b9d88a03fb6dadf32fa9f0868e140fce719d53a7b13027f397cdd7f6ca05cc81277bdc08  Eval-Closure-0.14.tar.gz
+"
diff --git a/main/perl-exception-class/APKBUILD b/main/perl-exception-class/APKBUILD
index 6f0ec08b4cf..2ad0a5153df 100644
--- a/main/perl-exception-class/APKBUILD
+++ b/main/perl-exception-class/APKBUILD
@@ -1,48 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-exception-class
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Exception-Class
-pkgver=1.44
+pkgver=1.45
 pkgrel=1
 pkgdesc="A module that allows you to declare real exception classes in Perl"
 url="https://metacpan.org/release/Exception-Class/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-devel-stacktrace perl-class-data-inheritable"
-cpanmakedepends=""
-cpancheckdepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-devel-stacktrace perl-class-data-inheritable"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Exception-Class-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$builddir"
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-sha512sums="7ce1e488505dc3d1c6d6365b5ed523b204b93d89d205ad4cdf6c9ee9dbad1a6edc257251a365275f067479e734def56b3b21d588e978822e7714bd8a49ba6bb2  Exception-Class-1.44.tar.gz"
+sha512sums="
+8eff70c85c8f1cc9e1db2c47b5a815ef902fddd4989783b9fb7e84e3ce75776564cafddd3aedd2c86a5a8b9627021c9cfd094b95ec4956a60dd6703bba3eaf4d  Exception-Class-1.45.tar.gz
+"
diff --git a/main/perl-exporter-tiny/APKBUILD b/main/perl-exporter-tiny/APKBUILD
index d1b6ec746ca..aeba872b6c6 100644
--- a/main/perl-exporter-tiny/APKBUILD
+++ b/main/perl-exporter-tiny/APKBUILD
@@ -1,44 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-exporter-tiny
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Exporter-Tiny
-pkgver=1.002001
+pkgver=1.006002
 pkgrel=1
-pkgdesc="An exporter with the features of Sub::Exporter but only core dependencies"
+pkgdesc="an exporter with the features of Sub::Exporter but only core dependencies"
 url="https://metacpan.org/release/Exporter-Tiny/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpanmakedepends="perl-test-warnings perl-test-fatal"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
+checkdepends="perl-test-fatal perl-test-warnings"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/T/TO/TOBYINK/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/T/TO/TOBYINK/Exporter-Tiny-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="b247e7785e02c3346f231736a430c2d54e5ac93c175892090c40121c86eb255ce4d138c65e31836fd2970b45fb71dc7e68ea3c45a06a9e9c4135b45df48621d8  Exporter-Tiny-1.002001.tar.gz"
+sha512sums="
+684dc97d854686910928f413bd84df3e2d2b351c2304116d5c567ec74eb7384f4085881f2bdeaf96dcf9ade2a959076ebd2bde3977dd5b876f75daaf6ca9d763  Exporter-Tiny-1.006002.tar.gz
+"
diff --git a/main/perl-exporter/APKBUILD b/main/perl-exporter/APKBUILD
index b523e669c0a..0f315cebc4d 100644
--- a/main/perl-exporter/APKBUILD
+++ b/main/perl-exporter/APKBUILD
@@ -1,41 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-exporter
-_pkgname=Exporter
-pkgver=5.74
-pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Exporter
+pkgver=5.78
+pkgrel=1
 pkgdesc="Implements default import method for modules"
-url="https://metacpan.org/release/Exporter"
+url="https://metacpan.org/release/Exporter/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
-subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/T/TO/TODDR/Exporter-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-prepare() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
 
-doc() {
-	default_doc
-	replaces="perl-doc"
+	# man pages are already provided by perl-doc
+	rm -rf "$pkgdir"/usr/share/man
 }
 
-sha512sums="e5233d2851f456a15b3e79069e45edac657898d4ce423ae9942767ce02d873ce1be10f995f0a3b10b66095ac5fe742c21585928d00f63eddb528a6c4a994e6fc  Exporter-5.74.tar.gz"
+sha512sums="
+e3fb5b64902dd5ca4f0222a7204d76c87da3657cf2f3c1833e5ff8c5dfd47669d47be5ea5d1a87ef6c4aa747bbfe4375ec23ee0ccb8fa2420093f677e3917fef  Exporter-5.78.tar.gz
+"
diff --git a/main/perl-extutils-cchecker/APKBUILD b/main/perl-extutils-cchecker/APKBUILD
index 522203f7e66..c52578ff780 100644
--- a/main/perl-extutils-cchecker/APKBUILD
+++ b/main/perl-extutils-cchecker/APKBUILD
@@ -1,36 +1,38 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer:
+# Automatically generated by apkbuild-cpan, template 4
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-extutils-cchecker
+pkgver=0.12
+pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=ExtUtils-CChecker
-pkgver=0.10
-pkgrel=2
 pkgdesc="Perl module configuration-time utilities for using C headers, libraries, or OS features"
 url="https://metacpan.org/release/ExtUtils-CChecker/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl-test-exception"
-makedepends="perl-dev"
-checkdepends="perl-test-fatal perl-module-build"
+depends="perl"
+makedepends="perl-module-build"
+checkdepends="perl-test2-suite"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/ExtUtils-CChecker-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-	make
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL \
+		--installdirs=vendor \
+		--create_packlist=0
+	./Build
 }
 
 check() {
-	cd "$builddir"
-	make test
+	./Build test
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+	./Build install --destdir="$pkgdir"
 }
 
-sha512sums="8b43c559333d14d682a00a0fa956aff8b6b4209b7b442f330f9e8573b438dcd5a2d3b86582e2aad2f974c342acee3e79785b9816cb585807dba9b448a1626d4c  ExtUtils-CChecker-0.10.tar.gz"
+sha512sums="
+d0408d88d6c33de799959f42f296d1d05187a12b943a4aee93a79d608a56d972d0f90e6d64712b2722563ba36fc59092cbfb6608d9a39a97b7c1efebefeab979  ExtUtils-CChecker-0.12.tar.gz
+"
diff --git a/main/perl-extutils-config/APKBUILD b/main/perl-extutils-config/APKBUILD
index 7326b6a842f..29a0aa11867 100644
--- a/main/perl-extutils-config/APKBUILD
+++ b/main/perl-extutils-config/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-extutils-config
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=ExtUtils-Config
 pkgver=0.008
-pkgrel=1
+pkgrel=4
 pkgdesc="A wrapper for perl's configuration"
 url="https://metacpan.org/release/ExtUtils-Config/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/ExtUtils-Config-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="7775e2212b4605e60559c7e63604b8f2b4c56f4846e64f9f4454f3f5d0a7a21f618143e6c61eafabf5d9ee9bca8f722c04aedeaf9c51f59924de68c272b86db2  ExtUtils-Config-0.008.tar.gz"
+sha512sums="
+7775e2212b4605e60559c7e63604b8f2b4c56f4846e64f9f4454f3f5d0a7a21f618143e6c61eafabf5d9ee9bca8f722c04aedeaf9c51f59924de68c272b86db2  ExtUtils-Config-0.008.tar.gz
+"
diff --git a/main/perl-extutils-helpers/APKBUILD b/main/perl-extutils-helpers/APKBUILD
index 70e2d8c8926..0a48a4c156e 100644
--- a/main/perl-extutils-helpers/APKBUILD
+++ b/main/perl-extutils-helpers/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-extutils-helpers
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=ExtUtils-Helpers
 pkgver=0.026
-pkgrel=1
+pkgrel=4
 pkgdesc="Various portability utilities for module builders"
 url="https://metacpan.org/release/ExtUtils-Helpers/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/ExtUtils-Helpers-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="372d801f43003c571758823a84bfe418876f1b48e3d8c35f888ca41469f6771a33aa30cf893a4c4a68ea62c6e8c8c6ab2ef44ee783dbf9f25e18bc0389359399  ExtUtils-Helpers-0.026.tar.gz"
+sha512sums="
+372d801f43003c571758823a84bfe418876f1b48e3d8c35f888ca41469f6771a33aa30cf893a4c4a68ea62c6e8c8c6ab2ef44ee783dbf9f25e18bc0389359399  ExtUtils-Helpers-0.026.tar.gz
+"
diff --git a/main/perl-extutils-installpaths/APKBUILD b/main/perl-extutils-installpaths/APKBUILD
index 69cea1df096..5670321c478 100644
--- a/main/perl-extutils-installpaths/APKBUILD
+++ b/main/perl-extutils-installpaths/APKBUILD
@@ -1,45 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-extutils-installpaths
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=ExtUtils-InstallPaths
 pkgver=0.012
-pkgrel=1
+pkgrel=4
 pkgdesc="Build.PL install path logic made easy"
 url="https://metacpan.org/release/ExtUtils-InstallPaths/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-extutils-config"
-depends="$cpandepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-extutils-config"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="92a4e9ebb387d330ae67b0716b96b27165d08503d2915d8301b3a6aa185f962940e761d21fd400033e6a814e276918e0662da3740ca2852a53cf0fe54f3d7660  ExtUtils-InstallPaths-0.012.tar.gz"
+sha512sums="
+92a4e9ebb387d330ae67b0716b96b27165d08503d2915d8301b3a6aa185f962940e761d21fd400033e6a814e276918e0662da3740ca2852a53cf0fe54f3d7660  ExtUtils-InstallPaths-0.012.tar.gz
+"
diff --git a/main/perl-extutils-pkgconfig/APKBUILD b/main/perl-extutils-pkgconfig/APKBUILD
index 96b3871d6b2..b9bedb619a0 100644
--- a/main/perl-extutils-pkgconfig/APKBUILD
+++ b/main/perl-extutils-pkgconfig/APKBUILD
@@ -1,44 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-extutils-pkgconfig
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=ExtUtils-PkgConfig
 pkgver=1.16
-pkgrel=2
-pkgdesc="simplistic interface to pkg-config"
+pkgrel=5
+pkgdesc="Perl module for ExtUtils-PkgConfig"
 url="https://metacpan.org/release/ExtUtils-PkgConfig/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/X/XA/XAOC/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-check() {
-	cd "$builddir"
-	make test
-}
-
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="a872fd54aa5bf3137ace9c44457dfc047ea6d283accc453e824b609b6996a8e2fab685459f38a8236419155df01a18421671426a7237639a47ab32e18c9b4191  ExtUtils-PkgConfig-1.16.tar.gz"
+sha512sums="
+a872fd54aa5bf3137ace9c44457dfc047ea6d283accc453e824b609b6996a8e2fab685459f38a8236419155df01a18421671426a7237639a47ab32e18c9b4191  ExtUtils-PkgConfig-1.16.tar.gz
+"
diff --git a/main/perl-fcgi-procmanager/APKBUILD b/main/perl-fcgi-procmanager/APKBUILD
index bdd3b78de9b..6284ed6e1a0 100644
--- a/main/perl-fcgi-procmanager/APKBUILD
+++ b/main/perl-fcgi-procmanager/APKBUILD
@@ -3,32 +3,27 @@
 pkgname=perl-fcgi-procmanager
 _pkgreal=FCGI-ProcManager
 pkgver=0.28
-pkgrel=1
+pkgrel=4
 pkgdesc="Functions for managing FastCGI applications"
 url="https://metacpan.org/release/FCGI-ProcManager/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/A/AR/ARODLAND/FCGI-ProcManager-$pkgver.tar.gz"
 
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-        cd "$builddir"
-        make test
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-fcgi/APKBUILD b/main/perl-fcgi/APKBUILD
index b1d9af23d73..3abf84c76ea 100644
--- a/main/perl-fcgi/APKBUILD
+++ b/main/perl-fcgi/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-fcgi
-_realname=FCGI
-pkgver=0.79
-pkgrel=0
+_pkgreal=FCGI
+pkgver=0.82
+pkgrel=3
 pkgdesc="Perl Fast CGI module"
 url="https://metacpan.org/pod/FCGI"
 arch="all"
@@ -10,9 +10,10 @@ license="OML"
 depends="perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
+options="!check" # makedepends missing
 source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/FCGI-$pkgver.tar.gz"
 
-builddir="$srcdir/$_realname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
@@ -29,4 +30,6 @@ package() {
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="18bb654b1d779881211e90c37144479fc2767dac71cdeb45099c67e1f2650f1aeae90d8646415b62a9b1dcc7595653b14c9f89b711416ebc6a31342bacd72c90  FCGI-0.79.tar.gz"
+sha512sums="
+dd962678b4c2012298c9b34cd85ffbacbdfc269b3a25cad7a77aadf1545c2ccab63ea14b44ffff727d51520f62a9ddd943deaff80a442888efd1a2caadb53334  FCGI-0.82.tar.gz
+"
diff --git a/main/perl-file-copy-recursive/APKBUILD b/main/perl-file-copy-recursive/APKBUILD
index f36edc9669d..252cd8e44bc 100644
--- a/main/perl-file-copy-recursive/APKBUILD
+++ b/main/perl-file-copy-recursive/APKBUILD
@@ -2,33 +2,30 @@
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=perl-file-copy-recursive
 pkgver=0.45
-_realname=File-Copy-Recursive-$pkgver
-pkgrel=1
+_pkgreal=File-Copy-Recursive
+pkgrel=3
 pkgdesc="Perl extension for recursively copying files and directories"
 url="https://metacpan.org/release/File-Copy-Recursive"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-makedepends="perl-dev"
+depends="perl"
 checkdepends="perl-test-deep perl-test-exception"
 options="!check" # requires several new pkgs which will ! begin in main
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DM/DMUEY/$_realname.tar.gz"
+source="https://cpan.metacpan.org/authors/id/D/DM/DMUEY/File-Copy-Recursive-$pkgver.tar.gz"
 
-builddir="$srcdir/$_realname"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-file-listing/APKBUILD b/main/perl-file-listing/APKBUILD
index 88c765a7985..c0081b97787 100644
--- a/main/perl-file-listing/APKBUILD
+++ b/main/perl-file-listing/APKBUILD
@@ -1,36 +1,37 @@
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-file-listing
-pkgver=6.04
-pkgrel=2
-pkgdesc="File::Listing perl module"
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=File-Listing
+pkgver=6.16
+pkgrel=0
+pkgdesc="Parse directory listing"
+replaces="perl-libwww"
 url="https://metacpan.org/release/File-Listing/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-http-date"
-makedepends="perl-dev"
-install=""
-replaces="perl-libwww"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/G/GA/GAAS/File-Listing-$pkgver.tar.gz"
-
-builddir="$srcdir"/File-Listing-$pkgver
+source="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/File-Listing-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="a84198bc82003daaf88ed23218e34a7a1552dcd2855a9563e9609ce5df167a8295043501534c31614854fc8dd9c04b4af27b4d7320112c613914f94c86c2eeb2  File-Listing-6.04.tar.gz"
+sha512sums="
+2d18f0cf7dbf30bb752c5d70132e90dd346e6fb795cb61664b8f11bfba67ec357235f5cb5a87752cf65ba9d000a6c7976548f0aed0f833048ca1b06aed991eca  File-Listing-6.16.tar.gz
+"
diff --git a/main/perl-file-next/APKBUILD b/main/perl-file-next/APKBUILD
index 587227c2e4a..883154d8965 100644
--- a/main/perl-file-next/APKBUILD
+++ b/main/perl-file-next/APKBUILD
@@ -1,33 +1,28 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-file-next
 _pkgreal=File-Next
 pkgver=1.18
-pkgrel=0
+pkgrel=3
 pkgdesc="Perl module for taint-safe file-finding"
 url="https://metacpan.org/release/File-Next"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/File-Next-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" -name perllocal.pod -delete
 }
diff --git a/main/perl-file-remove/APKBUILD b/main/perl-file-remove/APKBUILD
index 5e29adbdb43..433b4e034db 100644
--- a/main/perl-file-remove/APKBUILD
+++ b/main/perl-file-remove/APKBUILD
@@ -1,43 +1,35 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-file-remove
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=File-Remove
-pkgver=1.58
+pkgver=1.61
 pkgrel=1
 pkgdesc="Remove files and directories"
 url="https://metacpan.org/release/File-Remove/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/File-Remove-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
 }
 
 check() {
-	cd "$builddir"
-	make test
+	./Build test
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="2d616751328d57ff6975775189f92745fb3cb1d69675049ebddd96a2612c11c62c1995a70720efe4e73a9c10b9a2ec5528b90d468815e7c2ee395145241608e2  File-Remove-1.58.tar.gz"
+sha512sums="
+2ff999f7d71349b7e4a7db8728cfe2b5669c76fb27ca42fe006b0e0061bb73a29d556f3e3da88c004a4dd23bf2d9e12a1e1054b85237e8c14fb2b58c1086971f  File-Remove-1.61.tar.gz
+"
diff --git a/main/perl-file-rsync/APKBUILD b/main/perl-file-rsync/APKBUILD
index 8fc6392b211..1832508bfea 100644
--- a/main/perl-file-rsync/APKBUILD
+++ b/main/perl-file-rsync/APKBUILD
@@ -1,36 +1,41 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-file-rsync
-_realname=File-RsyncP
-pkgver=0.74
-pkgrel=4
+_pkgreal=File-RsyncP
+pkgver=0.76
+pkgrel=5
 pkgdesc="Perl rsync client"
-url="http://search.cpan.org/~cbarratt/File-RsyncP-0.68/"
+url="https://metacpan.org/pod/File::RsyncP"
 arch="all"
-license="GPL PerlArtistic"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
 makedepends="perl-dev"
-install=
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/C/CB/CBARRATT/$_realname-$pkgver.tar.gz
+source="https://cpan.metacpan.org/authors/id/C/CB/CBARRATT/File-RsyncP-$pkgver.tar.gz
 	perl-file-rsync-parallell-build-fix.patch
 	"
 
-builddir="$srcdir/$_realname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd $builddir
-	update_config_guess || return 1
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make config && make || return 1
+	chmod +w ./*/config.guess
+	update_config_guess
+	update_config_sub
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make config && make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd $builddir
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="0585c2f0b145875e9a13523d829b2ed9907e1e38c526f630a79a5b5dab36b6a9012375620ae92292e5977735c106bfab905bb121f56df5ca4494e1efcbd02cb6  File-RsyncP-0.74.tar.gz
-1b7ddad9d13bcad01760048670545d893c6eb9c0ed3bbb33b80f9c1520aea682c98233efeafa2f6de12e4b86de5895c648a67dfb2402d9877b428df3b06da972  perl-file-rsync-parallell-build-fix.patch"
+sha512sums="
+b81d9ce63181605939e8aff87c9e56ab276899f019f44eb3f149e7ee0d44a94fcbee771381ebe6ca8281c2de0d57d9cbdbcb972ccb7406a0aefd920040603bb3  File-RsyncP-0.76.tar.gz
+1b7ddad9d13bcad01760048670545d893c6eb9c0ed3bbb33b80f9c1520aea682c98233efeafa2f6de12e4b86de5895c648a67dfb2402d9877b428df3b06da972  perl-file-rsync-parallell-build-fix.patch
+"
diff --git a/main/perl-file-sharedir-install/APKBUILD b/main/perl-file-sharedir-install/APKBUILD
index 7a27bac274b..75e0f0b7fc1 100644
--- a/main/perl-file-sharedir-install/APKBUILD
+++ b/main/perl-file-sharedir-install/APKBUILD
@@ -1,46 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-file-sharedir-install
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=File-ShareDir-Install
-pkgver=0.13
-pkgrel=1
+pkgver=0.14
+pkgrel=2
 pkgdesc="Install shared files"
 url="https://metacpan.org/release/File-ShareDir-Install/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build-tiny"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/File-ShareDir-Install-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-        cd "$builddir"
-        make test
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="a119e38491fad8ae0ebd95913e3b608e09a2b99376a5160e75083a28abe4f83c4f6a36df216365527ff87bf8ec095254b16a2f6d2515c69f34609df8672605ca  File-ShareDir-Install-0.13.tar.gz"
+sha512sums="
+92c1c3899bc58d3e1686fef775ac09e9aab7e3ce6b61d1a8e754127dc1f84627cf1e23e78a5d0042934e011685c0676c706ef7964778c06e073e8725155af34d  File-ShareDir-Install-0.14.tar.gz
+"
diff --git a/main/perl-file-sharedir/APKBUILD b/main/perl-file-sharedir/APKBUILD
index 4f5b2873f44..033aec86226 100644
--- a/main/perl-file-sharedir/APKBUILD
+++ b/main/perl-file-sharedir/APKBUILD
@@ -1,36 +1,32 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-file-sharedir
-_pkgname=File-ShareDir
-pkgver=1.116
+_pkgreal=File-ShareDir
+pkgver=1.118
 pkgrel=1
-pkgdesc="File::ShareDir perl module"
+pkgdesc="Locate per-dist and per-module shared files"
 url="https://metacpan.org/release/File-ShareDir/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-class-inspector"
-makedepends="perl-dev"
-checkdepends="perl-file-sharedir-install"
+makedepends="perl-file-sharedir-install perl-inc-latest"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RE/REHSACK/$_pkgname-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/R/RE/REHSACK/File-ShareDir-$pkgver.tar.gz"
 
-builddir="$srcdir/$_pkgname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="5fcd75254c446f02ee377e6b5848baad95c73779b8525b0ee1699fe675ddd2bd67d0dc057f47b0991ec136de16e06a4891a4b14a78bd96c3e2468640053bbe0e  File-ShareDir-1.116.tar.gz"
+sha512sums="890f33e96333f7b07707d722e59e7da9a287112062814ef294594ac67f2f7349f905c009e6cd70d3af3a4de85335b074ec5a61194f9b0495f3e793d6ca635853  File-ShareDir-1.118.tar.gz"
diff --git a/main/perl-file-slurp-tiny/APKBUILD b/main/perl-file-slurp-tiny/APKBUILD
index ae619cc9956..7819f360948 100644
--- a/main/perl-file-slurp-tiny/APKBUILD
+++ b/main/perl-file-slurp-tiny/APKBUILD
@@ -1,38 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-file-slurp-tiny
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=File-Slurp-Tiny
 pkgver=0.004
-pkgrel=1
-pkgdesc="A simple, sane and efficient file slurper"
+pkgrel=4
+pkgdesc="A simple, sane and efficient file slurper [DISCOURAGED]"
 url="https://metacpan.org/release/File-Slurp-Tiny/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/File-Slurp-Tiny-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="916af1da5375ced4ebc00cb2b908e53b027e7b4fcad9069d5109eb2c0623faaa1d2d4fc8aeefb22861c7304ec913696cec85c280a82fd9aa7236c902427bc5cf  File-Slurp-Tiny-0.004.tar.gz"
+sha512sums="
+916af1da5375ced4ebc00cb2b908e53b027e7b4fcad9069d5109eb2c0623faaa1d2d4fc8aeefb22861c7304ec913696cec85c280a82fd9aa7236c902427bc5cf  File-Slurp-Tiny-0.004.tar.gz
+"
diff --git a/main/perl-file-slurp/APKBUILD b/main/perl-file-slurp/APKBUILD
index 8815281522b..f5d34760b59 100644
--- a/main/perl-file-slurp/APKBUILD
+++ b/main/perl-file-slurp/APKBUILD
@@ -1,30 +1,29 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-file-slurp
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=File-Slurp
-pkgver=9999.30
-pkgrel=0
+pkgver=9999.32
+pkgrel=3
 pkgdesc="Simple and Efficient Reading/Writing/Modifying of Complete Files"
-url="https://metacpan.org/release/File-Slurp"
+url="https://metacpan.org/release/File-Slurp/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/C/CA/CAPOEIRAB/File-Slurp-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -33,4 +32,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="ea512f0e6683be0a48dc8a58200ed032492234dc6c9c8ee1051a476915467c8c1aece7817a3c12cb6833b9f153530e2e8bb1dfe43e9b6aa8883dcb2de1486702  File-Slurp-9999.30.tar.gz"
+sha512sums="
+413337e0257e95e8e8d2aabf684bec81e746000a741809935b058490b8c42b494064f724e618b250330d8bb67a0a7a2a5adad17e3e6c96d4b193531a192a4d56  File-Slurp-9999.32.tar.gz
+"
diff --git a/main/perl-file-slurper/APKBUILD b/main/perl-file-slurper/APKBUILD
index 447e3cb42fe..45e2f33bbdf 100644
--- a/main/perl-file-slurper/APKBUILD
+++ b/main/perl-file-slurper/APKBUILD
@@ -1,46 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-file-slurper
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=File-Slurper
-pkgver=0.012
-pkgrel=0
+pkgver=0.014
+pkgrel=1
 pkgdesc="A simple, sane and efficient module to slurp a file"
-url="https://metacpan.org/release/File-Slurper"
+url="https://metacpan.org/release/File-Slurper/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpancheckdepends="perl-test-warnings"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+depends="perl"
+makedepends="perl-dev"
+checkdepends="perl-test-warnings"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/File-Slurper-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$builddir"
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-sha512sums="276b510c85b4e28fff4b8bd77c81031367b073426138743efb5d54fe01fa9825409f86090788779e96625b43207d1f864f348cc11554c51d36868dfed568f2bb  File-Slurper-0.012.tar.gz"
+sha512sums="
+45474865b8c4a360ad04423c510c62f2a796081544499cf9ed335ffefe9d4087a844a1f988dfbd21b38237942eeead045923121e9786607c5270520b2b0af577  File-Slurper-0.014.tar.gz
+"
diff --git a/main/perl-file-tail/APKBUILD b/main/perl-file-tail/APKBUILD
index 7bb2178282f..935a9a71859 100644
--- a/main/perl-file-tail/APKBUILD
+++ b/main/perl-file-tail/APKBUILD
@@ -1,43 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-file-tail
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=File-Tail
 pkgver=1.3
-pkgrel=2
-pkgdesc="Perl extension for reading from continously updated files"
+pkgrel=5
+pkgdesc="Perl module for File-Tail"
 url="https://metacpan.org/release/File-Tail/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/M/MG/MGRABNAR/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/M/MG/MGRABNAR/File-Tail-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-        cd "$builddir"
-        make test
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="942f87880d0d8b79c521248cdbc449daafbd117a2a3700e2dbcc7fe7a6046e5783e8616b6c32de513f85a56663b63c4dde217e9e124216ba6a605c645db2bde9  File-Tail-1.3.tar.gz"
+sha512sums="
+942f87880d0d8b79c521248cdbc449daafbd117a2a3700e2dbcc7fe7a6046e5783e8616b6c32de513f85a56663b63c4dde217e9e124216ba6a605c645db2bde9  File-Tail-1.3.tar.gz
+"
diff --git a/main/perl-file-temp/APKBUILD b/main/perl-file-temp/APKBUILD
index f4b063c4dc4..b6cbe4ed767 100644
--- a/main/perl-file-temp/APKBUILD
+++ b/main/perl-file-temp/APKBUILD
@@ -1,46 +1,35 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-file-temp
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=File-Temp
-pkgver=0.2309
-pkgrel=1
-pkgdesc="Return name and handle of a temporary file safely"
+pkgver=0.2311
+pkgrel=2
+pkgdesc="return name and handle of a temporary file safely"
 url="https://metacpan.org/release/File-Temp/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-makedepends="perl-dev"
-subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
+depends="perl"
+source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/File-Temp-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
 
-doc() {
-	default_doc
-	replaces="perl-doc"
+	# man pages are already provided by perl-doc
+	rm -rf "$pkgdir"/usr/share/man
 }
 
-sha512sums="9812e35d561ccff310262dc5bc50a9612fb3bbf7765a715c8fcad7653de977d08382733e38978586d47f943152b4a9619b76357c2f823c13f78dbf9b4eb4cd65  File-Temp-0.2309.tar.gz"
+sha512sums="2db3f03f4d25013c60585cd3e6aa7e68fe9bb26f1957adf6674e9cae9e963a41c559d36862943703f567d116c82747b4fae0612253a784addeb53d7867a232d1  File-Temp-0.2311.tar.gz"
diff --git a/main/perl-file-which/APKBUILD b/main/perl-file-which/APKBUILD
index 885628a049a..d648dfe609c 100644
--- a/main/perl-file-which/APKBUILD
+++ b/main/perl-file-which/APKBUILD
@@ -1,39 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-file-which
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=File-Which
-pkgver=1.23
+pkgver=1.27
 pkgrel=1
 pkgdesc="Perl implementation of the which utility as an API"
 url="https://metacpan.org/release/File-Which/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/File-Which-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="73c48642f448abdab2a3cf39409db50bb311cbd7ea352f5dc70f6e97296d9b09ab7e1738482864aa7f7e300a8f74b19b7ca9949fe3102f61e08fe08c9be2a4ac  File-Which-1.23.tar.gz"
+sha512sums="
+8a6164c4af915e93924b1d62864e492b1c5067856e505c50b9a5cce0600d73bdcda5f7e35a9f37134d9e89949b45bbd0a5426cb56121604aea1a3cfe48d55e5c  File-Which-1.27.tar.gz
+"
diff --git a/main/perl-filesys-notify-simple/APKBUILD b/main/perl-filesys-notify-simple/APKBUILD
index 2639b03b435..d3f2c40f165 100644
--- a/main/perl-filesys-notify-simple/APKBUILD
+++ b/main/perl-filesys-notify-simple/APKBUILD
@@ -2,13 +2,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-filesys-notify-simple
 pkgver=0.14
-pkgrel=0
+pkgrel=2
 pkgdesc="Filesys::Notify::Simple perl module"
 url="https://metacpan.org/release/Filesys-Notify-Simple"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 checkdepends="perl-test-sharedfork"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA/Filesys-Notify-Simple-$pkgver.tar.gz"
diff --git a/main/perl-font-afm/APKBUILD b/main/perl-font-afm/APKBUILD
index 292a67be892..270a9b1a03b 100644
--- a/main/perl-font-afm/APKBUILD
+++ b/main/perl-font-afm/APKBUILD
@@ -1,37 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-font-afm
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Font-AFM
 pkgver=1.20
-pkgrel=1
-pkgdesc="Interface to Adobe Font Metrics files"
+pkgrel=4
+pkgdesc="Perl module for Font-AFM"
 url="https://metacpan.org/release/Font-AFM/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/G/GA/GAAS/Font-AFM-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="1fc74f0dbbed52937d512465a021148e93b2e0698189a6fc17eb1aa8951c934b0060a0256883118dc2a3a9086025468e0a851706306876568466bf4638fdb618  Font-AFM-1.20.tar.gz"
+sha512sums="
+1fc74f0dbbed52937d512465a021148e93b2e0698189a6fc17eb1aa8951c934b0060a0256883118dc2a3a9086025468e0a851706306876568466bf4638fdb618  Font-AFM-1.20.tar.gz
+"
diff --git a/main/perl-future/APKBUILD b/main/perl-future/APKBUILD
index d3aa3fa2520..e547accbe81 100644
--- a/main/perl-future/APKBUILD
+++ b/main/perl-future/APKBUILD
@@ -1,29 +1,24 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-future
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Future
-pkgver=0.44
-pkgrel=0
-pkgdesc="Represent an operation awaiting completion"
-url="https://metacpan.org/release/Future"
+pkgver=0.50
+pkgrel=1
+pkgdesc="represent an operation awaiting completion"
+url="https://metacpan.org/release/Future/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev perl-test-fatal perl-test-refcount perl-test-identity
-	perl-module-build"
+makedepends="perl-dev perl-module-build"
+checkdepends="perl-test2-suite"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Future-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	perl Build.PL installdirs=vendor
-}
-
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
 	./Build
 }
 
@@ -32,8 +27,10 @@ check() {
 }
 
 package() {
-	./Build install destdir="$pkgdir"
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="770040cfff6049acea64e49c76b7e4788a3a9d957f6a54066ffc91eafea9ff5c5cfd7f6377d0f59b126ef313f72769ab7b2c7051988baf9683d393fa4c293bb5  Future-0.44.tar.gz"
+sha512sums="
+d8c0011d0dcee9bb0317a394da34925d6a5e214ff8706158268d546f5b0e6d8fad7a8edafda2eada15bcca20d2da9ae722018c6dd0ff9a69bae1c0759776f616  Future-0.50.tar.gz
+"
diff --git a/main/perl-gd/APKBUILD b/main/perl-gd/APKBUILD
index d2aa11a5666..246e383e6ee 100644
--- a/main/perl-gd/APKBUILD
+++ b/main/perl-gd/APKBUILD
@@ -1,47 +1,39 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=perl-gd
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=GD
-pkgver=2.71
-pkgrel=1
-pkgdesc="Perl module for GD"
-url="https://metacpan.org/release/GD"
+pkgver=2.78
+pkgrel=0
+pkgdesc="Perl interface to the gd2 graphics library"
+url="https://metacpan.org/release/GD/"
 arch="all"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpanmakedepends="perl-extutils-pkgconfig"
 depends="perl"
-makedepends="perl-dev $cpanmakedepends gd-dev libjpeg-turbo-dev zlib-dev
+makedepends="perl-dev perl-extutils-pkgconfig gd-dev libjpeg-turbo-dev zlib-dev
 	libpng-dev freetype-dev libwebp-dev"
+checkdepends="perl-test-fork perl-test-nowarnings"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/R/RU/RURBAN/GD-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	if [ -e Build.PL ]; then
-		perl Build.PL installdirs=vendor
-	else
-		PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-	fi
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="3a1555f07e6ab36a7218f24853f4168914be45e8c19ab0fe971ab044725dc0d7efeca75be2e4408406e69601f07e047fd3ea157acc9b9d339c9917a1c3e1f74d  GD-2.71.tar.gz"
+sha512sums="
+ef3df42c003f105fd1c313ea9e8b8b1e75912b4fdb274e73f2e4f5664a0adb8479a2e62fae5a493e37c36865f9dc37207d2d31e96316eb18a3c5384e07858591  GD-2.78.tar.gz
+"
diff --git a/main/perl-gdgraph/APKBUILD b/main/perl-gdgraph/APKBUILD
index 5b677bb3e02..24c91442131 100644
--- a/main/perl-gdgraph/APKBUILD
+++ b/main/perl-gdgraph/APKBUILD
@@ -1,39 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=perl-gdgraph
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=GDGraph
-pkgver=1.54
+pkgver=1.56
 pkgrel=1
 pkgdesc="Produces charts with GD"
 url="https://metacpan.org/release/GDGraph/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-gdtextutil perl-gd"
-cpanmakedepends="perl-test-exception perl-capture-tiny"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-gdtextutil perl-gd"
+makedepends="perl-dev"
+checkdepends="perl-capture-tiny perl-test-exception"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RU/RUZ/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/B/BP/BPS/GDGraph-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="0dd0da5fa0e879cf2addcbfdd02ee8e9e6af715b88b451dc29fe5028f30d7ba7fa0e126d07e7bb4f9a63e40b3be95a9cc0f6c061ea8644ba0ee7fdd2a7964fce  GDGraph-1.54.tar.gz"
+sha512sums="
+4a336e02cf3ca75b41ccef42d8790b00d7ff60c63686f49c3b0d1fe8ff29ce76c52d4603f74c9b2704e1f1d2ca71f2313dcb692ae10261dbf8e0e05a7172dc71  GDGraph-1.56.tar.gz
+"
diff --git a/main/perl-gdtextutil/APKBUILD b/main/perl-gdtextutil/APKBUILD
index 466effa8ab9..ae3d89d9f60 100644
--- a/main/perl-gdtextutil/APKBUILD
+++ b/main/perl-gdtextutil/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=perl-gdtextutil
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=GDTextUtil
 pkgver=0.86
-pkgrel=1
-pkgdesc="text utilities for GD"
+pkgrel=4
+pkgdesc="Perl module for GDTextUtil"
 url="https://metacpan.org/release/GDTextUtil/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-gd"
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-gd"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/M/MV/MVERB/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/M/MV/MVERB/GDTextUtil-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="0c503df81249b0b53a8e87d65f684cf7ff01184ef1fc0166d2f295332d4cb553b6b714f42d6915cd0798f899213cd9cffef12bd30f5fcab0abfa4d0be97c8b18  GDTextUtil-0.86.tar.gz"
+sha512sums="
+0c503df81249b0b53a8e87d65f684cf7ff01184ef1fc0166d2f295332d4cb553b6b714f42d6915cd0798f899213cd9cffef12bd30f5fcab0abfa4d0be97c8b18  GDTextUtil-0.86.tar.gz
+"
diff --git a/main/perl-getopt-long/APKBUILD b/main/perl-getopt-long/APKBUILD
index d3c1daa4d77..af48c0c6f62 100644
--- a/main/perl-getopt-long/APKBUILD
+++ b/main/perl-getopt-long/APKBUILD
@@ -1,48 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-getopt-long
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Getopt-Long
-pkgver=2.51
+pkgver=2.57
 pkgrel=1
 pkgdesc="Module to handle parsing command line options"
 url="https://metacpan.org/release/Getopt-Long/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/J/JV/JV/$_pkgreal-$pkgver.tar.gz"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+source="https://cpan.metacpan.org/authors/id/J/JV/JV/Getopt-Long-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
 
-doc() {
-	default_doc
-	replaces="perl-doc"
+	# man pages are already provided by perl-doc
+	rm -rf "$pkgdir"/usr/share/man
 }
 
-sha512sums="e70b2c30f5f85d7bf387381782a22b55f76598e1b4e19102fbf463c4333e91090ad2da49965be6211821d4f7f109aa7e4153348a9142f38fdb1a39299c997c02  Getopt-Long-2.51.tar.gz"
+sha512sums="
+6b07f683b6f1371bc7f9b018ec659c049d58de25194965c6e2ba3a288e6802ba07257aa5d447bc082f0481d0956798d9f17521faf6a31d896bb3be0d17953b49  Getopt-Long-2.57.tar.gz
+"
diff --git a/main/perl-hash-multivalue/APKBUILD b/main/perl-hash-multivalue/APKBUILD
index 7152cb95fab..3887772783c 100644
--- a/main/perl-hash-multivalue/APKBUILD
+++ b/main/perl-hash-multivalue/APKBUILD
@@ -2,31 +2,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-hash-multivalue
 pkgver=0.16
-pkgrel=1
+pkgrel=4
 pkgdesc="Hash::MultiValue perl module"
 url="https://metacpan.org/release/Hash-MultiValue/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/A/AR/ARISTOTLE/Hash-MultiValue-$pkgver.tar.gz"
 
 builddir="$srcdir/Hash-MultiValue-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-heap/APKBUILD b/main/perl-heap/APKBUILD
index 8f97cce4572..ac3fe8f3011 100644
--- a/main/perl-heap/APKBUILD
+++ b/main/perl-heap/APKBUILD
@@ -1,43 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-heap
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Heap
 pkgver=0.80
-pkgrel=2
-pkgdesc="Perl extensions for keeping data partially sorted"
+pkgrel=6
+pkgdesc="Perl module for Heap"
 url="https://metacpan.org/release/Heap/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/J/JM/JMM/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/J/JM/JMM/Heap-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="133e2668a90de8cea13302464188415fa30e4a0a85fb51af7409ff2e3466e33a6daf172b2466f046c5275db6ab19bb573e8b2d14acf616b110bdd60869865690  Heap-0.80.tar.gz"
+sha512sums="
+133e2668a90de8cea13302464188415fa30e4a0a85fb51af7409ff2e3466e33a6daf172b2466f046c5275db6ab19bb573e8b2d14acf616b110bdd60869865690  Heap-0.80.tar.gz
+"
diff --git a/main/perl-html-formatter/APKBUILD b/main/perl-html-formatter/APKBUILD
index 7c53f184181..fe8655ad2b9 100644
--- a/main/perl-html-formatter/APKBUILD
+++ b/main/perl-html-formatter/APKBUILD
@@ -4,13 +4,12 @@
 pkgname=perl-html-formatter
 _pkgreal=HTML-Formatter
 pkgver=2.16
-pkgrel=1
+pkgrel=3
 pkgdesc="Base class for HTML formatters"
 url="https://metacpan.org/release/HTML-Formatter/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-font-afm perl-html-tree"
-makedepends="perl-dev"
 checkdepends="perl-file-slurper perl-test-warnings"
 replaces=perl-html-format
 subpackages="$pkgname-doc"
diff --git a/main/perl-html-formattext-withlinks-andtables/APKBUILD b/main/perl-html-formattext-withlinks-andtables/APKBUILD
index 03b02f153f1..ff3df705e04 100644
--- a/main/perl-html-formattext-withlinks-andtables/APKBUILD
+++ b/main/perl-html-formattext-withlinks-andtables/APKBUILD
@@ -1,41 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-html-formattext-withlinks-andtables
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=HTML-FormatText-WithLinks-AndTables
 pkgver=0.07
-pkgrel=1
-pkgdesc="Perl module for HTML-FormatText-WithLinks-AndTables"
+pkgrel=4
+pkgdesc="Converts HTML to Text with tables intact"
 url="https://metacpan.org/release/HTML-FormatText-WithLinks-AndTables/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-html-formattext-withlinks"
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="perl-test-pod"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-html-formattext-withlinks perl-html-tree perl-html-formatter"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DA/DALEEVANS/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-        cd "$builddir"
-	if [ -e Build.PL ]; then
-		perl Build.PL installdirs=vendor
-	else
-		PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-	fi
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-        cd "$builddir"
 	make DESTDIR="$pkgdir" install
-        find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="3deea4406f7f9dd55d22d60c169d3889be7ef802a43507fb8b608c45ecdff52f743c9cb3a4703f1e44cdcf033c4c64b4c993192fe1a39efc9eae78c6fb66ff3e  HTML-FormatText-WithLinks-AndTables-0.07.tar.gz"
+sha512sums="
+3deea4406f7f9dd55d22d60c169d3889be7ef802a43507fb8b608c45ecdff52f743c9cb3a4703f1e44cdcf033c4c64b4c993192fe1a39efc9eae78c6fb66ff3e  HTML-FormatText-WithLinks-AndTables-0.07.tar.gz
+"
diff --git a/main/perl-html-formattext-withlinks/APKBUILD b/main/perl-html-formattext-withlinks/APKBUILD
index 379cb7c911e..21b5f3df278 100644
--- a/main/perl-html-formattext-withlinks/APKBUILD
+++ b/main/perl-html-formattext-withlinks/APKBUILD
@@ -4,13 +4,13 @@
 pkgname=perl-html-formattext-withlinks
 _pkgreal=HTML-FormatText-WithLinks
 pkgver=0.15
-pkgrel=3
+pkgrel=5
 pkgdesc="HTML to text conversion with links as footnotes"
 url="https://metacpan.org/release/HTML-FormatText-WithLinks/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-html-tree perl-uri perl-html-formatter"
-makedepends="perl-dev perl-module-build"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/main/perl-html-mason-psgihandler/APKBUILD b/main/perl-html-mason-psgihandler/APKBUILD
deleted file mode 100644
index 9515ca90dda..00000000000
--- a/main/perl-html-mason-psgihandler/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Timo Teräs <timo.teras@iki.fi>
-# Maintainer: Timo Teräs <timo.teras@iki.fi>
-pkgname=perl-html-mason-psgihandler
-_pkgreal=HTML-Mason-PSGIHandler
-pkgver=0.53
-pkgrel=1
-pkgdesc="PSGI handler for HTML::Mason"
-url="https://metacpan.org/release/HTML-Mason-PSGIHandler/"
-arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-cgi-psgi perl-html-mason"
-cpanmakedepends="  perl-plack "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RU/RUZ/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-sha512sums="d8fe27ff0b25e41b7e64e83c277d323f5207b66e7630e3f688d586c375c63b1837935934a67e630c54fe8219e7b44fe084875e1530d36044fac85884ea62da40  HTML-Mason-PSGIHandler-0.53.tar.gz"
diff --git a/main/perl-html-mason/APKBUILD b/main/perl-html-mason/APKBUILD
index 72c96035107..1f96f4fb615 100644
--- a/main/perl-html-mason/APKBUILD
+++ b/main/perl-html-mason/APKBUILD
@@ -1,48 +1,41 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-html-mason
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=HTML-Mason
-pkgver=1.58
+pkgver=1.60
 pkgrel=1
 pkgdesc="High-performance, dynamic web site authoring system"
 url="https://metacpan.org/release/HTML-Mason/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-cache-cache perl-log-any perl-html-parser perl-class-container perl-params-validate perl-exception-class"
-cpanmakedepends=""
-cpancheckdepends="perl-test-deep"
-depends="perl-cgi $cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="
+	perl perl-cache-cache perl-log-any perl-html-parser perl-class-container perl-params-validate
+	perl-exception-class perl-cgi
+	"
+makedepends="perl-dev"
+checkdepends="perl-test-deep"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/HTML-Mason-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$builddir"
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-sha512sums="e66a40a1ed7d2f36bd3ab2457d45f60a66181fd568495d5c081d3acdd1fb425c5c0050d7aeabbcaf7192206362356a0b2033cc0f023c869d1be282e36e2d065f  HTML-Mason-1.58.tar.gz"
+sha512sums="
+16f3acbe312020012b073aaa1b140978f97d77be64f85289089a5eeb25bdc97733ce51d68e871f640c54a8e5cd91127e81bb69076b522f2d8dc27e393d88c022  HTML-Mason-1.60.tar.gz
+"
diff --git a/main/perl-html-parser/APKBUILD b/main/perl-html-parser/APKBUILD
index ee8221ce01a..36661c0a4a3 100644
--- a/main/perl-html-parser/APKBUILD
+++ b/main/perl-html-parser/APKBUILD
@@ -1,44 +1,39 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 4
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-html-parser
+pkgver=3.82
+pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=HTML-Parser
-pkgver=3.72
-pkgrel=5
 pkgdesc="HTML parser class"
 url="https://metacpan.org/release/HTML-Parser/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends="perl-html-tagset"
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-html-tagset perl-http-message perl-uri"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTML-Parser-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="9fded69219791af085018ffbe6737e74e370c543af52aa221aec174daf52d1b8d3cdd07f025176c0212ae572a924555262f2eefc73781f82cdb7d9cff58ae716  HTML-Parser-3.72.tar.gz"
+sha512sums="
+c3c173097eabe46dc95cf408915f1f33cdac2dab2430ea144258741cdcd4c8b90c5b11f4e1114da2703a4412aecfea778e003a3d8eb4c61ee433f64b07489d18  HTML-Parser-3.82.tar.gz
+"
diff --git a/main/perl-html-quoted/APKBUILD b/main/perl-html-quoted/APKBUILD
index ea950f3e56f..2b335088305 100644
--- a/main/perl-html-quoted/APKBUILD
+++ b/main/perl-html-quoted/APKBUILD
@@ -1,34 +1,33 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-html-quoted
-pkgver=0.04
+pkgver=0.05
 pkgrel=1
 pkgdesc="HTML::Quoted perl module"
 url="https://metacpan.org/release/HTML-Quoted/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl perl-html-parser"
-makedepends="perl-dev perl-module-install"
+makedepends="perl-module-install"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/T/TS/TSIBLEY/HTML-Quoted-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/B/BP/BPS/HTML-Quoted-$pkgver.tar.gz"
 
 builddir="$srcdir/HTML-Quoted-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="a13fb07d683741ec32679780d7183c849c534fb79e2b5f5613f9142e2b877938712d8bf20bb1e540ad5f4532cd7f2fcbf42bc3be5e931d7a4a2ae12bd0af0cc0  HTML-Quoted-0.04.tar.gz"
+sha512sums="
+5a9d9b2c9a5d7730ea304e3088ddbf51a9e2367b975e51831a8ed6468e39383575b0d1fa86269f762361cfc7dd9b9caa784d59989260bbb8b610917b5237af25  HTML-Quoted-0.05.tar.gz
+"
diff --git a/main/perl-html-rewriteattributes/APKBUILD b/main/perl-html-rewriteattributes/APKBUILD
index fd5b02be8fb..01c644cbdcf 100644
--- a/main/perl-html-rewriteattributes/APKBUILD
+++ b/main/perl-html-rewriteattributes/APKBUILD
@@ -1,46 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-html-rewriteattributes
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=HTML-RewriteAttributes
 pkgver=0.05
-pkgrel=2
-pkgdesc="Concise attribute rewriting"
+pkgrel=5
+pkgdesc="concise attribute rewriting"
 url="https://metacpan.org/release/HTML-RewriteAttributes/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-html-tagset perl-uri perl-html-parser"
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-install"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-html-tagset perl-uri perl-html-parser"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/T/TS/TSIBLEY/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/T/TS/TSIBLEY/HTML-RewriteAttributes-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="6a654dd2767010781f7fd145110dda4ebe71ed82aa6fea5932fa301b23f885d928c7dc0cea562ab5c5cd4f0881dadd590c4a4ae052285fcd261ac4ee9d25eb70  HTML-RewriteAttributes-0.05.tar.gz"
+sha512sums="
+6a654dd2767010781f7fd145110dda4ebe71ed82aa6fea5932fa301b23f885d928c7dc0cea562ab5c5cd4f0881dadd590c4a4ae052285fcd261ac4ee9d25eb70  HTML-RewriteAttributes-0.05.tar.gz
+"
diff --git a/main/perl-html-scrubber/APKBUILD b/main/perl-html-scrubber/APKBUILD
index 2bf34df8628..abcdd91913f 100644
--- a/main/perl-html-scrubber/APKBUILD
+++ b/main/perl-html-scrubber/APKBUILD
@@ -1,32 +1,39 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-html-scrubber
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=HTML-Scrubber
 pkgver=0.19
-pkgrel=0
-pkgdesc="Perl extension for scrubbing/sanitizing html"
-url="https://metacpan.org/release/HTML-Scrubber"
+pkgrel=3
+pkgdesc="Perl extension for scrubbing/sanitizing HTML"
+url="https://metacpan.org/release/HTML-Scrubber/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends="perl-html-parser"
-depends="$cpandepends"
-makedepends="perl-dev perl-module-build"
+depends="perl perl-html-parser"
+makedepends="perl-dev"
+checkdepends="perl-test-memory-cycle perl-test-differences"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/N/NI/NIGELM/HTML-Scrubber-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
+options="!check" # missing checkdepends
 
 build() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="6894c58315f38e81d645b999cca180b1e86a64e8ae913df5891a6293c9c4950d99f1d1c5a03b7d584aff381afc49c16fe2e06541203c8dea881479cc981ee262  HTML-Scrubber-0.19.tar.gz"
+sha512sums="
+6894c58315f38e81d645b999cca180b1e86a64e8ae913df5891a6293c9c4950d99f1d1c5a03b7d584aff381afc49c16fe2e06541203c8dea881479cc981ee262  HTML-Scrubber-0.19.tar.gz
+"
diff --git a/main/perl-html-tagset/APKBUILD b/main/perl-html-tagset/APKBUILD
index 51229ae2841..ffc74ac4981 100644
--- a/main/perl-html-tagset/APKBUILD
+++ b/main/perl-html-tagset/APKBUILD
@@ -1,42 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 4
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-html-tagset
+pkgver=3.24
+pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=HTML-Tagset
-pkgver=3.20
-pkgrel=2
-pkgdesc="data tables useful in parsing HTML"
+pkgdesc="Data tables useful in parsing HTML"
 url="https://metacpan.org/release/HTML-Tagset/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="Artistic-2.0"
+depends="perl"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/HTML-Tagset-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="b53c099a96b493c3d03c51fcf3d58dd3b830069583f2d07477175ea234c43e91a0b380c82a71126f971faf2768e832af34967d08d899db7653d65613d6530072  HTML-Tagset-3.20.tar.gz"
+sha512sums="
+e13e4f0dcc49cf8c4ab7cacfa82fb0c8be3a24f7013ab55003b1c0079cbd5b8bb6912ce1b8af794f89791a097c31558b113c9845807e428ccf5d97c3c38b9e24  HTML-Tagset-3.24.tar.gz
+"
diff --git a/main/perl-html-tree/APKBUILD b/main/perl-html-tree/APKBUILD
index fd97e9aa943..d962ae14eeb 100644
--- a/main/perl-html-tree/APKBUILD
+++ b/main/perl-html-tree/APKBUILD
@@ -1,43 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-html-tree
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=HTML-Tree
 pkgver=5.07
-pkgrel=1
+pkgrel=5
 pkgdesc="Work with HTML in a DOM-like tree structure"
 url="https://metacpan.org/release/HTML-Tree/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-html-tagset perl-html-parser"
-cpanmakedepends="perl-test-fatal"
-cpancheckdepends=""
-depends="$cpandepends"
-makedepends="perl-dev perl-module-build $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-html-tagset perl-html-parser"
+makedepends="perl-dev perl-module-build"
+checkdepends="perl-uri perl-test-fatal perl-test-leaktrace"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/K/KE/KENTNL/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/K/KE/KENTNL/HTML-Tree-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare || return 1
-
-	cd "$builddir"
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	perl Build.PL installdirs=vendor || return 1
+	perl Build.PL --installdirs=vendor
+	./Build
 }
 
-build() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	./Build && ./Build test
+check() {
+	./Build test
 }
 
 package() {
-	cd "$builddir"
-	./Build install destdir="$pkgdir" || return 1
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-
-sha512sums="a1faaf547d7db323388d5f6b289ab96887de5a80add55aefd380e4b540948514550a86785bdccf0776dfff38085b6bd3e98228f96231264217adcfc2f132c5de  HTML-Tree-5.07.tar.gz"
+sha512sums="
+a1faaf547d7db323388d5f6b289ab96887de5a80add55aefd380e4b540948514550a86785bdccf0776dfff38085b6bd3e98228f96231264217adcfc2f132c5de  HTML-Tree-5.07.tar.gz
+"
diff --git a/main/perl-http-body/APKBUILD b/main/perl-http-body/APKBUILD
index 84a275e6f54..d958eb0b663 100644
--- a/main/perl-http-body/APKBUILD
+++ b/main/perl-http-body/APKBUILD
@@ -1,31 +1,39 @@
+# Automatically generated by apkbuild-cpan, template 4
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-http-body
-pkgver=1.22
+pkgver=1.23
 pkgrel=0
-pkgdesc="HTTP::Body perl module"
-url="https://search.cpan.org/dist/HTTP-Body/"
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=HTTP-Body
+pkgdesc="HTTP Body Parser"
+url="https://metacpan.org/release/HTTP-Body/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
-depends="perl perl-http-message perl-uri"
-makedepends="perl-dev perl-test-deep"
-install=""
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-http-message"
+checkdepends="perl-test-deep"
 subpackages="$pkgname-doc"
-source="https://search.cpan.org/CPAN/authors/id/G/GE/GETTY/HTTP-Body-$pkgver.tar.gz"
-builddir="$srcdir"/HTTP-Body-$pkgver
+source="https://cpan.metacpan.org/authors/id/G/GE/GETTY/HTTP-Body-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="62665989d76699a3c3747d8f4e23d2009488bc229220bcf6fc07fc425e6ac5118f6ea48c75af681c2f29e9ed644d7a7979368cc36df77aca0544786b523c9cfe  HTTP-Body-1.22.tar.gz"
+sha512sums="
+b02fb8652ceebdaa858ff12fe759ded62eefa7f23e5bf8b90e31a52d4433f13d29986f9646141b92a6a4ea58e1be007c6f675c3e2b26559fa0ff9333e69f3ebb  HTTP-Body-1.23.tar.gz
+"
diff --git a/main/perl-http-cookiejar/APKBUILD b/main/perl-http-cookiejar/APKBUILD
new file mode 100644
index 00000000000..1d2df34ba83
--- /dev/null
+++ b/main/perl-http-cookiejar/APKBUILD
@@ -0,0 +1,37 @@
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
+pkgname=perl-http-cookiejar
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=HTTP-CookieJar
+pkgver=0.014
+pkgrel=1
+pkgdesc="minimalist HTTP user agent cookie jar"
+url="https://metacpan.org/release/HTTP-CookieJar/"
+arch="noarch"
+license="Apache-2.0"
+depends="perl perl-http-date"
+checkdepends="perl-uri perl-test-deep perl-test-requires"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/HTTP-CookieJar-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="
+98e6834574e28d8e278ba6f23817d7a4b0a072fea144f97db78e20881f622c01ddf4edff1dc5563c0fc46b22ba94fd9acfd18c9c81118c8c18c7d810f7534467  HTTP-CookieJar-0.014.tar.gz
+"
diff --git a/main/perl-http-cookies/APKBUILD b/main/perl-http-cookies/APKBUILD
index b1ef09a6490..b7702f7f4c2 100644
--- a/main/perl-http-cookies/APKBUILD
+++ b/main/perl-http-cookies/APKBUILD
@@ -2,14 +2,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-http-cookies
 _pkgreal=HTTP-Cookies
-pkgver=6.08
+pkgver=6.11
 pkgrel=0
-pkgdesc="HTTP::Cookies perl module"
+pkgdesc="HTTP cookie jars"
 url="https://metacpan.org/release/HTTP-Cookies"
 arch="noarch"
-license="GPL-1.0-or-later or Artistic-1.0-Perl"
-depends="perl perl-http-date perl-http-message"
-makedepends="perl-dev"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-http-message perl-http-date"
+checkdepends="perl-uri"
 replaces="perl-libwww"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTTP-Cookies-$pkgver.tar.gz"
@@ -30,4 +30,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="ddcbe61df3e419c3e29ee60a360d5d622f49281db612cfdb586508f50351cdfa3042c5b56e29648a776cd636919b5a4e26d5f9176a2d09a76c23b5acdef5bba9  HTTP-Cookies-6.08.tar.gz"
+sha512sums="
+3ebfa742407a623fdcb23fe7fc559a1667b9510c4c152f98c6d98bcea3df6f336183920636244cd5175b9e9ada4a599bae87433c1ea518739b4eac90a4ca5342  HTTP-Cookies-6.11.tar.gz
+"
diff --git a/main/perl-http-daemon/APKBUILD b/main/perl-http-daemon/APKBUILD
index 3ef1cf9f061..888144968dc 100644
--- a/main/perl-http-daemon/APKBUILD
+++ b/main/perl-http-daemon/APKBUILD
@@ -1,35 +1,37 @@
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-http-daemon
-pkgver=6.06
-pkgrel=0
-pkgdesc="HTTP::Daemon perl module"
-url="https://metacpan.org/release/HTTP-Daemon"
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=HTTP-Daemon
+pkgver=6.16
+pkgrel=2
+pkgdesc="A simple http server class"
+replaces="perl-libwww"
+url="https://metacpan.org/release/HTTP-Daemon/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl perl-http-date perl-http-message"
-makedepends="perl-dev perl-module-build-tiny"
+depends="perl perl-http-date perl-http-message perl-lwp-mediatypes"
+makedepends="perl-dev perl-module-build-tiny perl-module-build"
 checkdepends="perl-test-needs"
-replaces="perl-libwww"
-subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTTP-Daemon-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-builddir="$srcdir"/HTTP-Daemon-$pkgver
 build() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-	make
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
 }
 
 check() {
-	cd "$builddir"
-	make test
+	./Build test
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="8e6dcf4451aaa6bd5f38508a087e5bb9b7f5105e8e243d09bdd3f4be3d7009222b3d9f8e494f049b48f0caebf36f239b8bbc7b8edc805f7d32b1bbeb38431732  HTTP-Daemon-6.06.tar.gz"
+sha512sums="
+09e3c5c98c6f22bcb494eae9a28990d52a98c3b1be1b0ca001fc364b3891f7f43f0468aa7274070c64ca11c6b6313591e064084c0b2f5bc6b8bd71708f390d64  HTTP-Daemon-6.16.tar.gz
+"
diff --git a/main/perl-http-date/APKBUILD b/main/perl-http-date/APKBUILD
index 827d26d1b31..37d3679c537 100644
--- a/main/perl-http-date/APKBUILD
+++ b/main/perl-http-date/APKBUILD
@@ -1,19 +1,18 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-http-date
-_pkgname=HTTP-Date
-pkgver=6.05
+_pkgreal=HTTP-Date
+pkgver=6.06
 pkgrel=0
 pkgdesc="Perl module date conversion routines"
 url="https://metacpan.org/pod/HTTP::Date"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 replaces="perl-libwww"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTTP-Date-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
@@ -31,4 +30,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="08a427a860161cd0d7a34a4fa3eb6bf6439c2504478a308ff560de0e6620c20df46f004cfcb719e3d19e35fdb650728d6983ffce1423f4d9da06f91d85c7b927  HTTP-Date-6.05.tar.gz"
+sha512sums="
+e1555a9b5dff3b2041594f9b480f12a022eb03b0f1628f884fc88a3aed687ba7a6c7d743198c4ca7ba32df22a98fd070bd4a2bc2494703ec72e16303c9cfb3e6  HTTP-Date-6.06.tar.gz
+"
diff --git a/main/perl-http-message/APKBUILD b/main/perl-http-message/APKBUILD
index 09e4a54c205..030c08b126f 100644
--- a/main/perl-http-message/APKBUILD
+++ b/main/perl-http-message/APKBUILD
@@ -1,29 +1,28 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house>
+# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
 pkgname=perl-http-message
 _pkgreal=HTTP-Message
-pkgver=6.22
+_author=OALDERS
+_au=${_author%%"${_author#??}"}
+_a=${_author%%"${_author#?}"}
+pkgver=6.45
 pkgrel=0
-pkgdesc="HTTP style messages"
+pkgdesc="HTTP style message"
 url="https://metacpan.org/release/HTTP-Message"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl perl-lwp-mediatypes perl-encode-locale perl-http-date perl-uri
-	perl-io-html"
-makedepends="perl-dev"
-checkdepends="perl-try-tiny"
+depends="perl perl-clone>=0.46 perl-http-date perl-uri perl-io-html perl-encode-locale perl-lwp-mediatypes"
+checkdepends="perl-try-tiny perl-test-needs"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/HTTP-Message-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	default_prepare
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make
 }
 
@@ -36,4 +35,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="285d197f1ee28db3ebb00711264990a5527130961daecefb5bdb37feb67d13461b57d6570960025064a22099bf4f9037e146b8272be1832c433371cc0e2a712a  HTTP-Message-6.22.tar.gz"
+sha512sums="
+b72ab9068c5f9ddb41f89b2a84887393f2c1bd14b462a1a60c03b4560800cfbf37c76f4bdd7c08f1ce9bf616242c2e39e0ff93859ed61268c48c978322a6d03d  HTTP-Message-6.45.tar.gz
+"
diff --git a/main/perl-http-negotiate/APKBUILD b/main/perl-http-negotiate/APKBUILD
index d479e99558f..2e3d17b56ba 100644
--- a/main/perl-http-negotiate/APKBUILD
+++ b/main/perl-http-negotiate/APKBUILD
@@ -2,32 +2,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-http-negotiate
 pkgver=6.01
-pkgrel=2
+pkgrel=5
 pkgdesc="HTTP::Negotiate perl module"
 url="https://metacpan.org/release/HTTP-Negotiate/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl perl-http-message"
-makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/G/GA/GAAS/HTTP-Negotiate-$pkgver.tar.gz"
 
 builddir="$srcdir"/HTTP-Negotiate-$pkgver
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-importer/APKBUILD b/main/perl-importer/APKBUILD
index 5168ddcc054..8fa49d9a540 100644
--- a/main/perl-importer/APKBUILD
+++ b/main/perl-importer/APKBUILD
@@ -1,29 +1,29 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-importer
-pkgver=0.025
-pkgrel=0
+pkgver=0.026
+pkgrel=3
 pkgdesc="Alternative but compatible interface to modules that export symbols."
 url="https://metacpan.org/release/Importer"
 arch="noarch"
-license="PerlArtistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends=""
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Importer-$pkgver.tar.gz"
 builddir="$srcdir/Importer-$pkgver"
 
 build() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="99632c7a425fe7d965e052b2fc1fa8c34c4fe44c39899d280adaed8490b980f1fd7cc70dc974b45f97ce67c88163177bc2a11be44f04324241cc8d097e0afed8  Importer-0.025.tar.gz"
+sha512sums="f6726b204ee358af00b5c72120bd2131ed575c100a9946b1772552e42b98f78dd38ffcc0119e2cdf721c39e2d83547bc5778adb61c5f84089caf11949c7ef045  Importer-0.026.tar.gz"
diff --git a/main/perl-inc-latest/APKBUILD b/main/perl-inc-latest/APKBUILD
new file mode 100644
index 00000000000..ccf1659ba51
--- /dev/null
+++ b/main/perl-inc-latest/APKBUILD
@@ -0,0 +1,36 @@
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Celeste <cielesti@protonmail.com>
+pkgname=perl-inc-latest
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=inc-latest
+pkgver=0.500
+pkgrel=3
+pkgdesc="use modules bundled in inc/ if they are newer than installed ones"
+url="https://metacpan.org/release/inc-latest/"
+arch="noarch"
+license="Apache-2.0"
+depends="perl"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/inc-latest-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="
+b312d1dfce963322796bc0127f0ecd82c12baacf9e5df40d9acc093221edd80f3696ce6d9f185ed24b21983147363d1d0ff3e273b8b5ce7559a6f16983a1385c  inc-latest-0.500.tar.gz
+"
diff --git a/main/perl-inline-c/APKBUILD b/main/perl-inline-c/APKBUILD
index 7fbf3245396..997d4ccf833 100644
--- a/main/perl-inline-c/APKBUILD
+++ b/main/perl-inline-c/APKBUILD
@@ -1,36 +1,39 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-inline-c
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Inline-C
-pkgver=0.81
-pkgrel=1
-pkgdesc="Perl module for Inline-C"
-url="https://metacpan.org/pod/distribution/Inline-C/lib/Inline/C.pod"
+pkgver=0.82
+pkgrel=3
+pkgdesc="C Language Support for Inline"
+url="https://metacpan.org/release/Inline-C/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-parse-recdescent perl-inline"
 makedepends="perl-dev perl-file-sharedir-install"
+checkdepends="perl-yaml-libyaml perl-test-warn perl-file-copy-recursive"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/T/TI/TINITA/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/E/ET/ETJ/Inline-C-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+options="!check" # no perl-pegex
 
 build() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
 package() {
-	cd "$builddir"
-	make install DESTDIR="$pkgdir"
-	find "$pkgdir" -name perllocal.pod -delete
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="c3d0d669c26017b4b63cc101377d067438c31fc5d1e6187d01194f70158049e386683b792716aad58772eae839512ecaefd4b3ac7a2377dd1404a651c24b2277  Inline-C-0.81.tar.gz"
+sha512sums="
+1d1e91a63df12b4f3dc631fd1b66f9bd2e006b300002d9aa184ab571a128953722127400a39055d07ee630709f2a7c96dd35ad6e0860959cbb5a6fce3134b357  Inline-C-0.82.tar.gz
+"
diff --git a/main/perl-inline/APKBUILD b/main/perl-inline/APKBUILD
index f6c5442dc14..59ff520daa1 100644
--- a/main/perl-inline/APKBUILD
+++ b/main/perl-inline/APKBUILD
@@ -1,19 +1,18 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-inline
-_pkgname=Inline
+_pkgreal=Inline
 pkgver=0.86
-pkgrel=0
+pkgrel=2
 pkgdesc="Write Perl subroutines in other programming languages"
 url="https://metacpan.org/pod/distribution/Inline/lib/Inline.pod"
 arch="noarch"
 license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
 checkdepends="perl-test-warn"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/I/IN/INGY/Inline-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
 	default_prepare
diff --git a/main/perl-io-async/APKBUILD b/main/perl-io-async/APKBUILD
deleted file mode 100644
index c1b427f646b..00000000000
--- a/main/perl-io-async/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-pkgname=perl-io-async
-_pkgreal=IO-Async
-pkgver=0.75
-pkgrel=0
-pkgdesc="Asynchronous event-driven programming"
-url="https://metacpan.org/release/IO-Async"
-arch="noarch"
-license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl-struct-dumb perl-future"
-makedepends="perl-dev perl-test-refcount perl-test-fatal perl-test-identity perl-module-build"
-subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
-
-builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	perl Build.PL installdirs=vendor
-}
-
-build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	./Build
-}
-
-check() {
-	./Build test
-}
-
-package() {
-	./Build install destdir="$pkgdir"
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-sha512sums="a8ae2d38ee4f7847ae80aeccb3553b978ff274d8a53dc1c9a17e21c7af43695293a98b2ef04190d51abb8e9cce15fbc6e175823c91ac48ab837ac0e71bed3bdc  IO-Async-0.75.tar.gz"
diff --git a/main/perl-io-captureoutput/APKBUILD b/main/perl-io-captureoutput/APKBUILD
deleted file mode 100644
index 2180bfcdd72..00000000000
--- a/main/perl-io-captureoutput/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 2
-# Contributor:
-# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
-pkgname=perl-io-captureoutput
-_pkgreal=IO-CaptureOutput
-pkgver=1.1105
-pkgrel=0
-pkgdesc="capture STDOUT and STDERR from Perl code, subprocesses or XS"
-url="https://metacpan.org/pod/IO::CaptureOutput"
-arch="noarch"
-license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl"
-makedepends="perl-dev"
-subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/$_pkgreal-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
-build() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-check() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-sha512sums="8ca9485982d6bfae08ec322c28efd8f673f2a6705421ac5d680c228c436e7a5c8e18a16ff9712062631c35a91e6d19d9518263135db469c47083ce30814cf064  IO-CaptureOutput-1.1105.tar.gz"
diff --git a/main/perl-io-compress/APKBUILD b/main/perl-io-compress/APKBUILD
deleted file mode 100644
index 7c30ea57f2d..00000000000
--- a/main/perl-io-compress/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
-pkgname=perl-io-compress
-_pkgname=IO-Compress
-pkgver=2.093
-pkgrel=0
-pkgdesc="Perl compression library"
-url="https://metacpan.org/release/IO-Compress"
-arch="noarch"
-license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl perl-compress-raw-bzip2 perl-compress-raw-zlib"
-makedepends="perl-dev"
-source="https://cpan.metacpan.org/authors/id/P/PM/PMQS/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-prepare() {
-	default_prepare
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
-build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
-}
-
-check() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-package() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make DESTDIR="$pkgdir" install
-
-	# conflicts with core perl
-	rm "$pkgdir"/usr/bin/zipdetails
-	rmdir "$pkgdir"/usr/bin 2>/dev/null || true
-
-	# creates file collision among perl modules
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-
-	# man pages are already provided by perl-doc
-	rm -rf "$pkgdir"/usr/share/man
-}
-
-sha512sums="5921d6c32b48bd78acec8b2083ebefea85de7931c6091982eb80ffef877504dc709ad3435aade04f53981d47f98123f5225d7dd427c172dd6a1bb1b21cf4ae8c  IO-Compress-2.093.tar.gz"
diff --git a/main/perl-io-html/APKBUILD b/main/perl-io-html/APKBUILD
index cc63a298f84..eb6ab409214 100644
--- a/main/perl-io-html/APKBUILD
+++ b/main/perl-io-html/APKBUILD
@@ -1,41 +1,33 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-io-html
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=IO-HTML
-pkgver=1.001
-pkgrel=2
+pkgver=1.004
+pkgrel=1
 pkgdesc="Open an HTML file with automatic charset detection"
-url="https://metacpan.org/pod/IO::HTML"
+url="https://metacpan.org/release/IO-HTML/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/C/CJ/CJM/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/C/CJ/CJM/IO-HTML-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="fd3780c854e2e4003c80d2399987bbde2ebcc8f110915a74326660036d0860f79123f924c3200bcfa163363d74f53ca742bde973549e5a554e63648ed55dac52  IO-HTML-1.001.tar.gz"
+sha512sums="564fba7cfb50ef1cc78fa9e2b2200a20e305d098b8ceeb6f8478f0275cc48e4fb069386f5c318bc9deb43a5d590a78a995c04100bd440340f5c990eadc76a70f  IO-HTML-1.004.tar.gz"
diff --git a/main/perl-io-multiplex/APKBUILD b/main/perl-io-multiplex/APKBUILD
index c422bafc139..a72795d889f 100644
--- a/main/perl-io-multiplex/APKBUILD
+++ b/main/perl-io-multiplex/APKBUILD
@@ -1,32 +1,28 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-io-multiplex
-_realname=IO-Multiplex
+_pkgreal=IO-Multiplex
 pkgver=1.16
-pkgrel=2
+pkgrel=5
 pkgdesc="Perl module to manage IO on many file handles"
 url="https://metacpan.org/pod/IO::Multiplex"
 arch="noarch"
-license="Artistic-Perl-1.0 OR GPL-1.0-or-later"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/B/BB/BBB/$_realname-$pkgver.tar.gz"
-builddir="$srcdir"/$_realname-$pkgver
+source="https://cpan.metacpan.org/authors/id/B/BB/BBB/IO-Multiplex-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
diff --git a/main/perl-io-socket-inet6/APKBUILD b/main/perl-io-socket-inet6/APKBUILD
index f5a78665e90..43b4a77bc6d 100644
--- a/main/perl-io-socket-inet6/APKBUILD
+++ b/main/perl-io-socket-inet6/APKBUILD
@@ -1,43 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-io-socket-inet6
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=IO-Socket-INET6
-pkgver=2.72
-pkgrel=1
-pkgdesc="Object interface for AF_INET|AF_INET6 domain sockets"
-url="https://metacpan.org/pod/IO::Socket::INET6"
+pkgver=2.73
+pkgrel=2
+pkgdesc="[ DEPRECATED!! ] Object interface for AF_INET/AF_INET6 domain sockets"
+url="https://metacpan.org/release/IO-Socket-INET6/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl-socket6"
+depends="perl perl-socket6"
 makedepends="perl-dev perl-module-build"
-options="!check" # No ipv6 in buildozer
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	perl Build.PL installdirs=vendor
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
 	./Build
 }
 
 check() {
-	cd "$builddir"
 	./Build test
 }
 
 package() {
-	cd "$builddir"
-	./Build install destdir="$pkgdir"
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="c6dc0bbcc81682d317597de26d5023de84781e4bd2af224145cc4980db7fcbc93295a7d0a80c1eaa649c6aebf4057d0b0159f47e6a6379d4b545b49305f28a37  IO-Socket-INET6-2.72.tar.gz"
+sha512sums="
+8d71b1fcb78b4338eb1973a2f9d1ccc539d6a6d83190b818df8ebcc43e978d7404eefedb51a7d6e0a64aa02375503325e8cd8723c7fec6dfdb277519b5a16b4b  IO-Socket-INET6-2.73.tar.gz
+"
diff --git a/main/perl-io-socket-ssl/APKBUILD b/main/perl-io-socket-ssl/APKBUILD
index 9453969242e..e1bbde43ff6 100644
--- a/main/perl-io-socket-ssl/APKBUILD
+++ b/main/perl-io-socket-ssl/APKBUILD
@@ -1,30 +1,27 @@
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-io-socket-ssl
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=IO-Socket-SSL
-pkgver=2.068
+pkgver=2.085
 pkgrel=0
-pkgdesc="Nearly transparent SSL encapsulation for IO::Socket::INET"
-url="https://metacpan.org/release/IO-Socket-SSL"
+pkgdesc="Nearly transparent SSL encapsulation for IO::Socket::INET."
+url="https://metacpan.org/release/IO-Socket-SSL/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="ca-certificates perl-net-libidn perl-net-ssleay"
-makedepends="perl-dev"
+depends="perl ca-certificates perl-net-ssleay perl-mozilla-ca"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/S/SU/SULLR/IO-Socket-SSL-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
-options="!check" # FIXME: check hangs occationally
-
-prepare() {
-	default_prepare
-
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
 
 build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -33,4 +30,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="9bccce1a85d24a4e06394a7a0eb8c1c834a71d1fecf99e3a7c0fea1828dcad0da24768bfe0db996d70f3e153135fc958d85ae65fab300ebfd8b520441aa27cfa  IO-Socket-SSL-2.068.tar.gz"
+sha512sums="
+c4e045e88f69579d53a3663ed8f74d342fe3529e24e06d9e7d299debafdb840839c6f5bccb579b4d03f7501615439dba4661ac006312f379a2598a3030634cfd  IO-Socket-SSL-2.085.tar.gz
+"
diff --git a/main/perl-io-stringy/APKBUILD b/main/perl-io-stringy/APKBUILD
index d5893a2a4ac..c202e5d06df 100644
--- a/main/perl-io-stringy/APKBUILD
+++ b/main/perl-io-stringy/APKBUILD
@@ -1,19 +1,18 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-io-stringy
-_realname=IO-Stringy
+_pkgreal=IO-Stringy
 pkgver=2.113
-pkgrel=0
+pkgrel=3
 pkgdesc="A Perl module for I/O on in-core objects like strings and arrays"
 url="https://metacpan.org/pod/IO::Stringy"
 arch="noarch"
-license="Artistic-Perl-1.0 OR GPL-1.0-or-later"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/C/CA/CAPOEIRAB/IO-Stringy-$pkgver.tar.gz"
 
-builddir="$srcdir/$_realname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
@@ -30,6 +29,4 @@ package() {
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-
-
 sha512sums="5af104766c20b4336649dc4a19554ad204506c2476b4bf7d8ad7c2cfab15f0296efadb9019cd57e770a2a3c5f5686f7f010bddbd6efd51d300c54ca36286f094  IO-Stringy-2.113.tar.gz"
diff --git a/main/perl-io-tty/APKBUILD b/main/perl-io-tty/APKBUILD
index 470164ba113..932ac1287e4 100644
--- a/main/perl-io-tty/APKBUILD
+++ b/main/perl-io-tty/APKBUILD
@@ -1,30 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-io-tty
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=IO-Tty
-pkgver=1.14
+pkgver=1.20
 pkgrel=0
 pkgdesc="Pseudo ttys and constants"
-url="https://metacpan.org/pod/IO::Tty"
+url="https://metacpan.org/release/IO-Tty/"
 arch="all"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/T/TO/TODDR/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/T/TO/TODDR/IO-Tty-$pkgver.tar.gz
+	disable-failing-test.patch
+	"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+# On the builders, tests fail randomly on ARM when using Perl 5.36.0
+# Error: "Failed test '$maxlen >= 200 (41)' at t/test.t line 235."
+case "$CARCH" in
+	arm*|aarch64) options="$options !check" ;;
+esac
 
 build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -33,4 +40,7 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="4d6a5299f87eab0281f5e26953bc1537d760d88c486de9c8512750af733d5e466e059400a310746eb8fe432b8c8dcb82055c4cfbb1d31e25c9ce874557618305  IO-Tty-1.14.tar.gz"
+sha512sums="
+a411dcc3da4adf4913ceaca7d97198041c6870ac8b579a1d5c2517d984fab4cc8108962b23ee694da9e0c952f35d695e636ff35589873b95a86c2bf8c1838ee4  IO-Tty-1.20.tar.gz
+37c8aae630d4ee80b20b3540ed7fb5840b9a995e2ee489cbad8ace503ac9f596b38d01cb46e55d339898cc60d23581b451b71b27a6b871bc8ef84d1be2600427  disable-failing-test.patch
+"
diff --git a/main/perl-io-tty/disable-failing-test.patch b/main/perl-io-tty/disable-failing-test.patch
new file mode 100644
index 00000000000..0d873daa066
--- /dev/null
+++ b/main/perl-io-tty/disable-failing-test.patch
@@ -0,0 +1,13 @@
+diff --git a/t/test.t b/t/test.t
+index f61a978..382a35e 100644
+--- a/t/test.t
++++ b/t/test.t
+@@ -183,7 +183,7 @@ diag(
+         my $inv = ~$s . "\n";
+         $s .= "\n";
+         my $sendbuf = $s;
+-        $SIG{ALRM} = $SIG{TERM} = $SIG{INT} = sub { die "TIMEOUT(SIG" . shift() . ")"; };
++        #$SIG{ALRM} = $SIG{TERM} = $SIG{INT} = sub { die "TIMEOUT(SIG" . shift() . ")"; };
+         eval {
+             alarm(15);
+ 
diff --git a/main/perl-io/APKBUILD b/main/perl-io/APKBUILD
index 822c6ccb208..350e26a0769 100644
--- a/main/perl-io/APKBUILD
+++ b/main/perl-io/APKBUILD
@@ -1,42 +1,39 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-io
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=IO
-pkgver=1.42
-pkgrel=0
+pkgver=1.55
+pkgrel=1
 pkgdesc="Perl core IO modules"
-url="https://metacpan.org/pod/IO"
+url="https://metacpan.org/release/IO/"
 arch="all"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
 makedepends="perl-dev"
-subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/T/TO/TODDR/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/T/TO/TODDR/IO-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
 
-doc() {
-	default_doc
-	replaces="perl-doc"
+	# man pages are already provided by perl-doc
+	rm -rf "$pkgdir"/usr/share/man
 }
 
-sha512sums="d17b7ece8b7986355ee6053a763973568b18551e200021d5b436504d2498bda5c41333bbbb2b2d0fb7f950251a394683ea6da5f9be947bda214954efbec12113  IO-1.42.tar.gz"
+sha512sums="
+e52fc6e06400e3fb54e0017d25bdbd6a67b8a39a1f326af86af914623901f3e3629f9b51bf3e8a3619cf087cdecbf9cf4bf72b1f790b4f8df78ed86eadacd6a2  IO-1.55.tar.gz
+"
diff --git a/main/perl-ipc-run/APKBUILD b/main/perl-ipc-run/APKBUILD
new file mode 100644
index 00000000000..ce7226864e6
--- /dev/null
+++ b/main/perl-ipc-run/APKBUILD
@@ -0,0 +1,36 @@
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
+pkgname=perl-ipc-run
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=IPC-Run
+pkgver=20231003.0
+pkgrel=0
+pkgdesc="system() and background procs w/ piping, redirs, ptys (Unix, Win32)"
+url="https://metacpan.org/release/IPC-Run/"
+arch="noarch"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-io-tty"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/T/TO/TODDR/IPC-Run-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="
+81b94715e61f2a302ba4cfbd03f6af14ab66d438dfdf58187ccf8b0f7ff562fd343ef560ad48dad8118342dd493530560ac89beca6de2818663d556d18feff90  IPC-Run-20231003.0.tar.gz
+"
diff --git a/main/perl-ipc-run3/APKBUILD b/main/perl-ipc-run3/APKBUILD
index bcdafe4be87..ef9fb9a8e0f 100644
--- a/main/perl-ipc-run3/APKBUILD
+++ b/main/perl-ipc-run3/APKBUILD
@@ -1,28 +1,33 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-ipc-run3
-pkgver=0.048
+pkgver=0.049
 pkgrel=1
 pkgdesc="IPC::Run3 perl module"
 url="https://metacpan.org/pod/IPC::Run3"
 arch="noarch"
-license="GPL-2.0 or Artistic-1.0-Perl"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/IPC-Run3-$pkgver.tar.gz"
 builddir="$srcdir"/IPC-Run3-$pkgver
 
 build() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-	make && make test
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="50432850d8dccd2e59aa6684d34f3e3242fd7df3eb4d9a5eb02dae389aa46b5fd68cc54114a157c3fe99956e68e74d575ab3db5009b7bf7d5c325f1f109b1262  IPC-Run3-0.048.tar.gz"
+sha512sums="
+19dbf902666ccb56bfdb02c0c4e9ef585d773e1b8b53d4627367a3c0344d08a6358a733786b8de97e615b6916b716c4e66e73ae263986a2cacf50ab155539c55  IPC-Run3-0.049.tar.gz
+"
diff --git a/main/perl-ipc-sharelite/APKBUILD b/main/perl-ipc-sharelite/APKBUILD
index 8da4dd6f3f5..9ae0544d222 100644
--- a/main/perl-ipc-sharelite/APKBUILD
+++ b/main/perl-ipc-sharelite/APKBUILD
@@ -1,40 +1,32 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=perl-ipc-sharelite
 pkgver=0.17
-pkgrel=5
+pkgrel=12
 pkgdesc="Lightweight interface to shared memory"
 url="https://metacpan.org/pod/IPC::ShareLite"
 arch="all"
-license="PerlArtistic GPL"
-depends=""
-depends_dev=""
-makedepends="$depends_dev perl-dev"
-install=""
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/A/AN/ANDYA/IPC-ShareLite-$pkgver.tar.gz"
 
-_builddir="$srcdir"/IPC-ShareLite-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/IPC-ShareLite-$pkgver
 
 build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="f796f6766df11205755de4672ff8a586690545ccaa2f91c3fc65f106f3b61e1cbd86ee3e97dadf787809e3be32f503670cb67dafc9b18eee30d59d8be03b5ee9  IPC-ShareLite-0.17.tar.gz"
+sha512sums="
+f796f6766df11205755de4672ff8a586690545ccaa2f91c3fc65f106f3b61e1cbd86ee3e97dadf787809e3be32f503670cb67dafc9b18eee30d59d8be03b5ee9  IPC-ShareLite-0.17.tar.gz
+"
diff --git a/main/perl-ipc-system-simple/APKBUILD b/main/perl-ipc-system-simple/APKBUILD
index 2157a0118c3..7c30726b3f1 100644
--- a/main/perl-ipc-system-simple/APKBUILD
+++ b/main/perl-ipc-system-simple/APKBUILD
@@ -1,29 +1,26 @@
 # Automatically generated by apkbuild-cpan, template 3
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-ipc-system-simple
 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=IPC-System-Simple
 pkgver=1.30
-pkgrel=0
+pkgrel=3
 pkgdesc="Run commands simply, with detailed diagnostics"
 url="https://metacpan.org/release/IPC-System-Simple/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/J/JK/JKEENAN/IPC-System-Simple-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
diff --git a/main/perl-javascript-minifier-xs/APKBUILD b/main/perl-javascript-minifier-xs/APKBUILD
index 6a9f856ce4e..59aa9a90d03 100644
--- a/main/perl-javascript-minifier-xs/APKBUILD
+++ b/main/perl-javascript-minifier-xs/APKBUILD
@@ -1,39 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor:
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-javascript-minifier-xs
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=JavaScript-Minifier-XS
-pkgver=0.11
-pkgrel=6
+pkgver=0.15
+pkgrel=3
 pkgdesc="XS based JavaScript minifier"
 url="https://metacpan.org/release/JavaScript-Minifier-XS/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/G/GT/GTERMARS/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	perl Build.PL installdirs=vendor || return 1
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	./Build && ./Build test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	./Build install destdir="$pkgdir" || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="736294c898d7806eae509b0d0c14cfcbb783ac335fe6c08bed9c00a52643b3e6d0ade124735d7de8d2203bf404448889e0e84b3097e316d0ef444f1603cbbdef  JavaScript-Minifier-XS-0.11.tar.gz"
+sha512sums="
+334a205c849ab2f70eb0712e28567a9edbc1f1360538204009c0ac89047cf271be93d792d3158a4b61a20091c6cea46326fdb5d1fd820765ddcba9259a89b91a  JavaScript-Minifier-XS-0.15.tar.gz
+"
diff --git a/main/perl-javascript-minifier/APKBUILD b/main/perl-javascript-minifier/APKBUILD
index 25c1bead619..d6ac8b9da00 100644
--- a/main/perl-javascript-minifier/APKBUILD
+++ b/main/perl-javascript-minifier/APKBUILD
@@ -1,39 +1,34 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-javascript-minifier
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=JavaScript-Minifier
-pkgver=1.14
+pkgver=1.16
 pkgrel=1
 pkgdesc="Perl extension for minifying JavaScript code"
 url="https://metacpan.org/release/JavaScript-Minifier/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/Z/ZO/ZOFFIX/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/Z/ZO/ZOFFIX/JavaScript-Minifier-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="191dbf81672ea438c8c045c2fb0ebaeecee088630f77d91cb0518d800d815768d4695e8c32c5001492af1ab6b31f0bf69052701bf15e2b9a4981c4694620e251  JavaScript-Minifier-1.14.tar.gz"
+sha512sums="08341a6d329dd4f2bb8529c66135d9f25aff06c5f36f605d80a540aee21a6624aeb43ca45cd33378b88285af8d1771f894ab6083c7ba323cfdfe4fbbd10fe729  JavaScript-Minifier-1.16.tar.gz"
diff --git a/main/perl-json-maybexs/APKBUILD b/main/perl-json-maybexs/APKBUILD
index a5d4490f0e1..c661a7a2e8c 100644
--- a/main/perl-json-maybexs/APKBUILD
+++ b/main/perl-json-maybexs/APKBUILD
@@ -1,43 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-json-maybexs
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=JSON-MaybeXS
-pkgver=1.004000
+pkgver=1.004005
 pkgrel=1
 pkgdesc="Use L<Cpanel::JSON::XS> with a fallback to L<JSON::XS> and L<JSON::PP>"
 url="https://metacpan.org/release/JSON-MaybeXS/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-cpanel-json-xs"
-cpanmakedepends="  perl-test-without-module "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
+checkdepends="perl-test-needs"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/H/HA/HAARG/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/JSON-MaybeXS-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="caebd00e49f4bd79f9a9a748077d58d963f53b656e4f48f9577a14fb36a80e956ff393f0ccdf7066129bcd7ebcec73a201c1c6fc778ce2488522b4e3886d2bbb  JSON-MaybeXS-1.004000.tar.gz"
+sha512sums="
+f483549f08bb829c7958fd36d33ece8550ed13d53f559d3a8a0915045a11443a01fcbd3ad767f09759d24ec98c2eeced4e550a1fb333a1fc929b7086e1506edf  JSON-MaybeXS-1.004005.tar.gz
+"
diff --git a/main/perl-json/APKBUILD b/main/perl-json/APKBUILD
index 709bf3891fc..e3caa236ae3 100644
--- a/main/perl-json/APKBUILD
+++ b/main/perl-json/APKBUILD
@@ -1,34 +1,32 @@
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
 pkgname=perl-json
 _pkgreal=JSON
-pkgver=4.02
-pkgrel=0
+pkgver=4.10
+pkgrel=1
 pkgdesc="Perl module implementing a JSON encoder/decoder"
 url="https://metacpan.org/release/JSON"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-makedepends="perl-dev"
+depends="perl"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/JSON-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" -name perllocal.pod -delete
 	find "$pkgdir" -name .packlist -delete
 }
 
-sha512sums="4af44478cd1dac1755768e5211fe86f0086150157393ff2075def7cf6a394fe11e8e35f369f2abc0470373efc8021e941c59ace9a92dfcd50740f924c747d95a  JSON-4.02.tar.gz"
+sha512sums="
+2aa0c40fbff23d3df84cfa729d00a32a69e06ea83d082b25b7223f90cb157fa3c2e72342fadcd2ebe09b5848a0e3a7d2caec6d1753e95952a56e3e9367f343e3  JSON-4.10.tar.gz
+"
diff --git a/main/perl-ldap/APKBUILD b/main/perl-ldap/APKBUILD
index ca6adf6a944..f7552d72540 100644
--- a/main/perl-ldap/APKBUILD
+++ b/main/perl-ldap/APKBUILD
@@ -4,20 +4,21 @@
 pkgname=perl-ldap
 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=perl-ldap
-pkgver=0.66
+pkgver=0.68
 pkgrel=2
 pkgdesc="LDAP client library"
-provides="perl-net-ldap"
+provides="perl-net-ldap=$pkgver-r$pkgrel"
 replaces="perl-net-ldap"
 url="https://metacpan.org/release/perl-ldap/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl perl-libwww perl-lwp-mediatypes perl-json perl-convert-asn1 perl-http-message perl-uri perl-http-negotiate perl-io-socket-ssl"
-makedepends="perl-dev"
+depends="
+	perl perl-libwww perl-lwp-mediatypes perl-json perl-convert-asn1 perl-http-message perl-uri
+	perl-http-negotiate perl-io-socket-ssl
+	"
 checkdepends="perl-text-soundex"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/M/MA/MARSCHAP/perl-ldap-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
@@ -33,6 +34,12 @@ check() {
 package() {
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+	# make seems to install soundex in usr/local
+	# make check seems to remove it again
+	# add this hack to allow running without checks
+	rm -rf "$pkgdir"/usr/local
 }
 
-sha512sums="58b066a73cbab6f9c709105a01d8bc04128dc52e3b10f6c99b4d4bb8fdb574a6471211a21416dbd06760b7c585e0a340920467b6805a3cc475f00ef27d084b2a  perl-ldap-0.66.tar.gz"
+sha512sums="
+9b6260ac997c3279585745571f7d825aac956f157aef5715f13efb118723379aa9c838fdc123e2932047b28b38ebc2261ebe82ae1ef6a1f383b775d748ff18c6  perl-ldap-0.68.tar.gz
+"
diff --git a/main/perl-libwww/APKBUILD b/main/perl-libwww/APKBUILD
index b739ae9b889..c6e7e672efc 100644
--- a/main/perl-libwww/APKBUILD
+++ b/main/perl-libwww/APKBUILD
@@ -1,34 +1,34 @@
+# Automatically generated by apkbuild-cpan, template 4
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-libwww
-_realname=libwww-perl
-pkgver=6.43
+pkgver=6.77
 pkgrel=0
-pkgdesc="Perl module - World Wide Web library"
-url="https://metacpan.org/author/MSCHILLI"
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=libwww-perl
+pkgdesc="The World-Wide Web library for Perl"
+url="https://metacpan.org/release/libwww-perl/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl-http-date perl-http-cookies perl-net-http perl-http-daemon
-	perl-html-parser perl-file-listing perl-www-robotrules
-	perl-http-negotiate perl-uri perl-http-message
-	perl-lwp-mediatypes perl-encode-locale perl-try-tiny"
-makedepends="perl-dev perl-test-fatal perl-test-requiresinternet"
-checkdepends="perl-test-needs perl-test-leaktrace"
+depends="
+	perl perl-http-date perl-http-cookies perl-net-http perl-html-parser perl-file-listing
+	perl-www-robotrules perl-http-negotiate perl-uri perl-http-message perl-lwp-mediatypes
+	perl-encode-locale perl-try-tiny
+	"
+checkdepends="
+	perl-test-needs perl-test-leaktrace perl-http-daemon perl-test-fatal
+	perl-test-requiresinternet perl-http-cookiejar
+	"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/libwww-perl-$pkgver.tar.gz"
-builddir="$srcdir/$_realname-$pkgver"
-
-prepare() {
-	default_prepare
-
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-	rm -v t/base/protocols/nntp.t
-}
-
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
 	make
 }
 
@@ -39,7 +39,8 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="789d43f4f3481fa4aca5bf6468318989074e3301053ac66482a40f4fa2730f280b2c71518ebacc652243b35e86ab00e6313613033d35f5ef0e223ebee977c11e  libwww-perl-6.43.tar.gz"
+sha512sums="
+66aa1928da3362a496da543473a0ce1a7cc3885ebb5bf449ab0cdd18ce7836835b80ec8919cf6d0e63107eda03e1fe9d05ba39422a32e144034ef02632d43659  libwww-perl-6.77.tar.gz
+"
diff --git a/main/perl-list-allutils/APKBUILD b/main/perl-list-allutils/APKBUILD
index 0f93044a537..715eb6c9b07 100644
--- a/main/perl-list-allutils/APKBUILD
+++ b/main/perl-list-allutils/APKBUILD
@@ -1,32 +1,28 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-list-allutils
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=List-AllUtils
-pkgver=0.16
-pkgrel=0
+pkgver=0.19
+pkgrel=2
 pkgdesc="Combines List::Util, List::SomeUtils and List::UtilsBy in one bite-sized package"
-url="https://metacpan.org/release/List-AllUtils"
+url="https://metacpan.org/release/List-AllUtils/"
 arch="noarch"
 license="Artistic-2.0"
-depends="perl perl-scalar-list-utils perl-list-utilsby perl-list-someutils"
+depends="perl perl-list-utilsby perl-list-someutils"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/List-AllUtils-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -35,4 +31,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="e4644aebf8b152888f41082dca7380146a3a784af2c7a3705d8332b5effd35684702e85085a1865281be03c9f4d7e230141459d8680365c3437e928f7f948417  List-AllUtils-0.16.tar.gz"
+sha512sums="
+3f06165a3f416c75f1dd2364cb111479b053eb0a32e3c6a5823e5e8206f79fd3039599e9521526c0080a009541a86f344d921f6679ba4d7eb930d0c1ca2e25f0  List-AllUtils-0.19.tar.gz
+"
diff --git a/main/perl-list-moreutils-xs/APKBUILD b/main/perl-list-moreutils-xs/APKBUILD
index 69ef85be6cb..ddc61e3dd9f 100644
--- a/main/perl-list-moreutils-xs/APKBUILD
+++ b/main/perl-list-moreutils-xs/APKBUILD
@@ -1,48 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-list-moreutils-xs
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=List-MoreUtils-XS
-pkgver=0.428
-pkgrel=3
+pkgver=0.430
+pkgrel=4
 pkgdesc="Provide the stuff missing in List::Util in XS"
 url="https://metacpan.org/release/List-MoreUtils-XS/"
 arch="all"
 license="Apache-2.0"
-cpandepends=""
-cpanmakedepends=""
-cpancheckdepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+depends="perl"
+makedepends="perl-dev perl-config-autoconf perl-inc-latest"
+checkdepends="perl-test-leaktrace"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RE/REHSACK/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/R/RE/REHSACK/List-MoreUtils-XS-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$builddir"
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-sha512sums="a608568e3c4a2e160e4f9afa26640be5b97ec83e301a6b81849e37951698b9423c0a969d7e8797a49b4fb6c5123780630a3726c64713922b90b21b947682c3dd  List-MoreUtils-XS-0.428.tar.gz"
+sha512sums="98260b81f03a425bf8c2e0b63bc3a8d360a0aa2e198b2b7faaeaa48684936183018afdd1e6a04bd7e99a7e728d809709c6206ea578dfe7d8d40c5a4e3e4bb405  List-MoreUtils-XS-0.430.tar.gz"
diff --git a/main/perl-list-moreutils/APKBUILD b/main/perl-list-moreutils/APKBUILD
index db497370f50..b7f687bee64 100644
--- a/main/perl-list-moreutils/APKBUILD
+++ b/main/perl-list-moreutils/APKBUILD
@@ -1,43 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-list-moreutils
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=List-MoreUtils
-pkgver=0.428
-pkgrel=0
+pkgver=0.430
+pkgrel=1
 pkgdesc="Provide the stuff missing in List::Util"
-url="https://search.cpan.org/dist/List-MoreUtils/"
+url="https://metacpan.org/release/List-MoreUtils/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-exporter-tiny perl-list-moreutils-xs"
-cpanmakedepends="perl-test-leaktrace"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="Apache-2.0"
+depends="perl perl-exporter-tiny perl-list-moreutils-xs"
+makedepends="perl-dev perl-config-autoconf"
+checkdepends="perl-test-leaktrace"
 subpackages="$pkgname-doc"
-source="https://search.cpan.org/CPAN/authors/id/R/RE/REHSACK/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/R/RE/REHSACK/List-MoreUtils-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-check() {
-	cd "$builddir"
-	make test
-}
-
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="f7e11f10f1d7bd3b8f9f8bc2fc325e1a9230056f68591da624aed01fb4e4cbac20caeae0c3e2aa3acc8b71febd6d4149284367f051d3c1e608e3a4ca8b62dbd8  List-MoreUtils-0.428.tar.gz"
+sha512sums="bc9ff033c12251a6f0899a96da0ec8fc314ddb8d6cdf18c37fe1fdcfc38a4c95ed6f8e006bb124e77d07241ae6754f429bc2041f7772b4acfce9378a21283469  List-MoreUtils-0.430.tar.gz"
diff --git a/main/perl-list-someutils-xs/APKBUILD b/main/perl-list-someutils-xs/APKBUILD
index 7e388ecf9d8..9aeaede5795 100644
--- a/main/perl-list-someutils-xs/APKBUILD
+++ b/main/perl-list-someutils-xs/APKBUILD
@@ -1,44 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-list-someutils-xs
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=List-SomeUtils-XS
 pkgver=0.58
-pkgrel=1
+pkgrel=7
 pkgdesc="XS implementation for List::SomeUtils"
-url="https://metacpan.org/release/List-SomeUtils-XS"
+url="https://metacpan.org/release/List-SomeUtils-XS/"
 arch="all"
 license="Artistic-2.0"
-cpanmakedepends="perl-test-leaktrace perl-test-warnings"
 depends="perl"
-makedepends="perl-dev $cpanmakedepends"
+makedepends="perl-dev"
+checkdepends="perl-test-leaktrace perl-test-warnings"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/List-SomeUtils-XS-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="f89f5a35224a69a59c1d512a819bd725b324f0968ea447824a42c741c4ba66ee9522db939bd3e75d190e0f2f75d54100912b83a86d5e7dd1079025a57a245c38  List-SomeUtils-XS-0.58.tar.gz"
+sha512sums="
+f89f5a35224a69a59c1d512a819bd725b324f0968ea447824a42c741c4ba66ee9522db939bd3e75d190e0f2f75d54100912b83a86d5e7dd1079025a57a245c38  List-SomeUtils-XS-0.58.tar.gz
+"
diff --git a/main/perl-list-someutils/APKBUILD b/main/perl-list-someutils/APKBUILD
index 8264f62af18..0ce7bb1053c 100644
--- a/main/perl-list-someutils/APKBUILD
+++ b/main/perl-list-someutils/APKBUILD
@@ -1,40 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-list-someutils
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=List-SomeUtils
-pkgver=0.58
-pkgrel=0
+pkgver=0.59
+pkgrel=1
 pkgdesc="Provide the stuff missing in List::Util"
-url="https://metacpan.org/release/List-SomeUtils"
+url="https://metacpan.org/release/List-SomeUtils/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends="perl-module-implementation perl-list-someutils-xs"
-cpanmakedepends="perl-test-leaktrace"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+depends="perl perl-module-implementation"
+makedepends="perl-dev"
+checkdepends="perl-test-leaktrace"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/List-SomeUtils-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$builddir"
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make && make test
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="e45f05dbd82914bf804cc1ee00c808b6f8b4f2c80f852db55b3efb13cfe1601c34926e4c7966887a75ef49fd0fb2bd43adf48d12c72687464ece4e2b5a697ff4  List-SomeUtils-0.58.tar.gz"
+sha512sums="
+e8120f3231ae91ec1d60a90281bca6d109fc0df0d98ddb45528fcac186854acb7e5805f77c0cbca589ff0e0f2ecb5eac1a86d10be52e9a4902f59f84fd0a3d79  List-SomeUtils-0.59.tar.gz
+"
diff --git a/main/perl-list-utilsby/APKBUILD b/main/perl-list-utilsby/APKBUILD
index 7edf4edde6c..a15427e1717 100644
--- a/main/perl-list-utilsby/APKBUILD
+++ b/main/perl-list-utilsby/APKBUILD
@@ -1,40 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-list-utilsby
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=List-UtilsBy
-pkgver=0.11
-pkgrel=1
+pkgver=0.12
+pkgrel=2
 pkgdesc="higher-order list utility functions"
 url="https://metacpan.org/release/List-UtilsBy/"
 arch="noarch"
-license="GPL PerlArtistic"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/List-UtilsBy-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-	cd "$builddir"
-	perl Build.PL installdirs=vendor
-}
-
 build() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
 	./Build
 }
 
 check() {
-	cd "$builddir"
-        ./Build test
+	./Build test
 }
 
 package() {
-	cd "$builddir"
-	./Build install destdir="$pkgdir"
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="7c912b805e1e21d5d683224b63125bc8385d79c7115d88c08ca28fc1778ec8d22ad4aaf366731df438365a5233108926cbffee284c2e2d37346b47984dbbd4c9  List-UtilsBy-0.11.tar.gz"
+sha512sums="
+8be14ef99a49f3e6ff524d08244522a8724857f7aa7af70db4475befcfc7ab34c75041942ef7c737565567c7f578a0d8ecdde1a61d193572e0010838fb1db0de  List-UtilsBy-0.12.tar.gz
+"
diff --git a/main/perl-locale-maketext-fuzzy/APKBUILD b/main/perl-locale-maketext-fuzzy/APKBUILD
index 2f0221df41e..16c7da875e2 100644
--- a/main/perl-locale-maketext-fuzzy/APKBUILD
+++ b/main/perl-locale-maketext-fuzzy/APKBUILD
@@ -2,14 +2,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-locale-maketext-fuzzy
 pkgver=0.11
-pkgrel=2
+pkgrel=5
 pkgdesc="Locale::Maketext::Fuzzy perl module"
 url="https://metacpan.org/release/Locale-Maketext-Fuzzy/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/A/AU/AUDREYT/Locale-Maketext-Fuzzy-$pkgver.tar.gz
 	Locale-Maketext-Fuzzy-0.11-Fix-building-on-Perl-without-dot-in-INC.patch
@@ -18,18 +16,15 @@ source="https://cpan.metacpan.org/authors/id/A/AU/AUDREYT/Locale-Maketext-Fuzzy-
 builddir="$srcdir"/Locale-Maketext-Fuzzy-$pkgver
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-locale-maketext-lexicon/APKBUILD b/main/perl-locale-maketext-lexicon/APKBUILD
index 5ec4ffb8f6b..e01e924a6a5 100644
--- a/main/perl-locale-maketext-lexicon/APKBUILD
+++ b/main/perl-locale-maketext-lexicon/APKBUILD
@@ -2,38 +2,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-locale-maketext-lexicon
 pkgver=1.00
-pkgrel=1
+pkgrel=6
 pkgdesc="Locale::Maketext::Lexicon perl module"
 url="https://metacpan.org/release/Locale-Maketext-Lexicon/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/D/DR/DRTECH/Locale-Maketext-Lexicon-$pkgver.tar.gz"
 
-_builddir="$srcdir"/Locale-Maketext-Lexicon-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/Locale-Maketext-Lexicon-$pkgver
 
 build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="b16a4296048aa77809780f6f55e944a67ce3287708bff4fc88d8ee487a6493580a7129a740ee65c6c74fa27e4343964fa8a5269f66fffc308354e723ed4afa60  Locale-Maketext-Lexicon-1.00.tar.gz"
+sha512sums="
+b16a4296048aa77809780f6f55e944a67ce3287708bff4fc88d8ee487a6493580a7129a740ee65c6c74fa27e4343964fa8a5269f66fffc308354e723ed4afa60  Locale-Maketext-Lexicon-1.00.tar.gz
+"
diff --git a/main/perl-log-any/APKBUILD b/main/perl-log-any/APKBUILD
index 77b6e4adad5..bbd24ed140a 100644
--- a/main/perl-log-any/APKBUILD
+++ b/main/perl-log-any/APKBUILD
@@ -1,12 +1,13 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-log-any
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Log-Any
-pkgver=1.708
+pkgver=1.717
 pkgrel=0
 pkgdesc="Bringing loggers and listeners together"
-url="https://metacpan.org/release/Log-Any"
+url="https://metacpan.org/release/Log-Any/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
@@ -15,16 +16,15 @@ subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PR/PREACTION/Log-Any-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
@@ -32,9 +32,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-sha512sums="7cb86cb376140cd99a1f5aca97e5991ae958dbea39c64db3f095663341160cda055572694679f281581e0ba5c2a74d92c27a13aaed6b40f33c6f95d0c3ac7523  Log-Any-1.708.tar.gz"
+sha512sums="
+feabda26eefebd7fe63ba63750b11e00f217778f0fa801adf3b52342400155230b620b3f2b08630e4b472a328a6c13a84294d35c52968f2fc1206b61fee0d20e  Log-Any-1.717.tar.gz
+"
diff --git a/main/perl-log-dispatch/APKBUILD b/main/perl-log-dispatch/APKBUILD
index 38602ccc436..1c103b190ec 100644
--- a/main/perl-log-dispatch/APKBUILD
+++ b/main/perl-log-dispatch/APKBUILD
@@ -1,46 +1,40 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-log-dispatch
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Log-Dispatch
-pkgver=2.69
-pkgrel=0
+pkgver=2.71
+pkgrel=1
 pkgdesc="Dispatches messages to one or more outputs"
-url="https://metacpan.org/release/Log-Dispatch"
+url="https://metacpan.org/release/Log-Dispatch/"
 arch="noarch"
 license="Artistic-2.0"
-cpandepends="perl-module-runtime perl-params-validate perl-dist-checkconflicts
-	perl-devel-globaldestruction"
-cpanmakedepends="perl-ipc-run3 perl-test-fatal perl-test-requires perl-test-needs
-	perl-namespace-autoclean perl-specio perl-params-validationcompiler"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+depends="
+	perl perl-module-runtime perl-dist-checkconflicts perl-devel-globaldestruction
+	perl-namespace-autoclean perl-params-validationcompiler perl-try-tiny perl-specio
+	"
+checkdepends="perl-test-needs perl-test-fatal perl-ipc-run3"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Log-Dispatch-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="641d050c054843739fd43f97e88e17303d2e3e87ead0a756c88a8bd28fc27a56dd4cf4b228a5c23f240fca94f1a7894eb892070120b1a10ed293504826e6ace8  Log-Dispatch-2.69.tar.gz"
+sha512sums="
+b3aac1e0dab7b4c02fe98ac3c82854d9413c97510e390ace26fa5630cdaece628f9ea4e4c925ec10d1e6e386cc24617b348f5df837e6465cc9f49d465eb0e386  Log-Dispatch-2.71.tar.gz
+"
diff --git a/main/perl-lwp-mediatypes/APKBUILD b/main/perl-lwp-mediatypes/APKBUILD
index 6d5eb4ee0ba..b2f35207cba 100644
--- a/main/perl-lwp-mediatypes/APKBUILD
+++ b/main/perl-lwp-mediatypes/APKBUILD
@@ -1,47 +1,41 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-lwp-mediatypes
-_pkgname=LWP-MediaTypes
+_pkgreal=LWP-MediaTypes
 pkgver=6.04
-pkgrel=0
+pkgrel=3
 pkgdesc="Perl module - guess media type for a file or a URL"
-url="http://search.cpan.org/~gaas"
+url="https://metacpan.org/dist/LWP-MediaTypes"
 arch="noarch"
-license="GPL PerlArtistic"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 checkdepends="perl-test-fatal"
-install=
 replaces="perl-libwww"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/LWP-MediaTypes-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
 	default_prepare
-
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make
 }
 
 check() {
-	cd $builddir
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd $builddir
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="0610627ef3efdfde3c89bad273931c9cbde5c6da0bd782d59ce26dc4445cd538be9041d722f08206d96d69d5e3643b15150ef29b9e92e3968833f2ae1b6dc53f  LWP-MediaTypes-6.04.tar.gz"
+sha512sums="
+0610627ef3efdfde3c89bad273931c9cbde5c6da0bd782d59ce26dc4445cd538be9041d722f08206d96d69d5e3643b15150ef29b9e92e3968833f2ae1b6dc53f  LWP-MediaTypes-6.04.tar.gz
+"
diff --git a/main/perl-lwp-protocol-https/APKBUILD b/main/perl-lwp-protocol-https/APKBUILD
new file mode 100644
index 00000000000..5649e23440d
--- /dev/null
+++ b/main/perl-lwp-protocol-https/APKBUILD
@@ -0,0 +1,51 @@
+# Automatically generated by apkbuild-cpan, template 4
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
+pkgname=perl-lwp-protocol-https
+pkgver=6.14
+pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=LWP-Protocol-https
+pkgdesc="Provide https support for LWP::UserAgent"
+url="https://metacpan.org/release/LWP-Protocol-https/"
+arch="noarch"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="
+	perl
+	perl-io-socket-ssl
+	perl-libwww
+	perl-net-http
+	"
+checkdepends="
+	perl-test-needs
+	perl-test-requiresinternet
+	"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/LWP-Protocol-https-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+# secfixes:
+#   6.11-r0:
+#     - CVE-2014-3230
+
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
+	make
+}
+
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+8f220c307833a803a8539a1c794598097133f24017edda9030eba2ff558d54104040fbae64d7068e99b9e03142e6e96a8b11c478e2a5571e908754a385b59fab  LWP-Protocol-https-6.14.tar.gz
+"
diff --git a/main/perl-lwp-useragent-determined/APKBUILD b/main/perl-lwp-useragent-determined/APKBUILD
index f6f8b240ecd..e2c4b56f1d3 100644
--- a/main/perl-lwp-useragent-determined/APKBUILD
+++ b/main/perl-lwp-useragent-determined/APKBUILD
@@ -1,34 +1,34 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-lwp-useragent-determined
 _pkgreal=LWP-UserAgent-Determined
 pkgver=1.07
-pkgrel=1
+pkgrel=4
 pkgdesc="a virtual browser that retries errors"
 url="https://metacpan.org/release/LWP-UserAgent-Determined/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-libwww"
-cpanmakedepends=""
-depends="perl $cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-install=
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-libwww"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/A/AL/ALEXMV/$_pkgreal-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd $_builddir
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd $_builddir
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="bed056468366bf86f0711a23c5bdb502a614efa2fd80d632f8d43d33295309d0ee88e439933cb3eda99192ad7d7025d0a7f6f0a53a45e79e70512771bb58ae7d  LWP-UserAgent-Determined-1.07.tar.gz"
+sha512sums="
+bed056468366bf86f0711a23c5bdb502a614efa2fd80d632f8d43d33295309d0ee88e439933cb3eda99192ad7d7025d0a7f6f0a53a45e79e70512771bb58ae7d  LWP-UserAgent-Determined-1.07.tar.gz
+"
diff --git a/main/perl-mail-authenticationresults/APKBUILD b/main/perl-mail-authenticationresults/APKBUILD
index 9a2960d196e..105cbcb80c2 100644
--- a/main/perl-mail-authenticationresults/APKBUILD
+++ b/main/perl-mail-authenticationresults/APKBUILD
@@ -3,15 +3,14 @@
 pkgname=perl-mail-authenticationresults
 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Mail-AuthenticationResults
-pkgver=1.20200331.1
+pkgver=2.20231031
 pkgrel=0
 pkgdesc="Object Oriented Authentication-Results Headers"
 url="https://metacpan.org/release/Mail-AuthenticationResults/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl perl-json"
-makedepends="perl-dev"
-checkdepends="perl-test-exception"
+depends="perl perl-json perl-clone"
+makedepends="perl-test-exception"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
@@ -32,4 +31,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="d492adf166894e4615903681905683585fd3268cd47fe1a305a80cf3cf0d574e39b35f7fef01fc76584912e4c8972c4aeedb3cadc7ecf5662a05667cbf599c97  Mail-AuthenticationResults-1.20200331.1.tar.gz"
+sha512sums="
+fc1a1f9099e1d3c3a2185bb2ba9f53be6799779b71dc1e7524e117b78e3868e9d264668bde188e787868a303d62262e9ded2fa9e1657d1987e9cbe488d06ed8e  Mail-AuthenticationResults-2.20231031.tar.gz
+"
diff --git a/main/perl-mail-dkim/APKBUILD b/main/perl-mail-dkim/APKBUILD
index c55da1910a2..6596a0def50 100644
--- a/main/perl-mail-dkim/APKBUILD
+++ b/main/perl-mail-dkim/APKBUILD
@@ -1,43 +1,36 @@
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Automatically generated by apkbuild-cpan, template 3
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-mail-dkim
-_realname=Mail-DKIM
-pkgver=0.58
-pkgrel=1
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Mail-DKIM
+pkgver=1.20240124
+pkgrel=0
 pkgdesc="Signs/verifies Internet mail with DKIM/DomainKey signatures"
-url="http://search.cpan.org/~jaslong/Mail-DKIM/"
+url="https://metacpan.org/release/Mail-DKIM/"
 arch="noarch"
-license="Artistic-Perl-1.0 GPL+"
-depends="perl perl-net-dns perl-net-ip perl-mailtools perl-crypt-openssl-rsa
-	perl-yaml-libyaml perl-net-dns-resolver-mock
-	perl-mail-authenticationresults
-	"
-makedepends="perl-dev"
-checkdepends="perl-test-requiresinternet"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-net-dns perl-mailtools perl-crypt-openssl-rsa perl-mail-authenticationresults perl-cryptx"
+checkdepends="perl-test-requiresinternet perl-yaml-libyaml perl-net-dns perl-net-dns-resolver-mock"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/M/MB/MBRADSHAW/$_realname-$pkgver.tar.gz"
-builddir="$srcdir/$_realname-$pkgver"
-
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+source="https://cpan.metacpan.org/authors/id/M/MB/MBRADSHAW/Mail-DKIM-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	cd "$builddir"
-	make test
-}
-
-sha512sums="b06e834286a1ae6c5e2049c26ab1df2f4e784f44cd2ac5ad370be76746da7a32b41733e4b756aded422017cf646d2d0d93dee51cff8320604074cb3375df743d  Mail-DKIM-0.58.tar.gz"
+sha512sums="
+5453bca0e27906193084f0faf94b06c3a01cc835d4d226a0281793ea5e7105b4907090f25769dc5f51b6b816eacb5abceb56a046716a80a0288f3332c655c1c8  Mail-DKIM-1.20240124.tar.gz
+"
diff --git a/main/perl-mail-domainkeys/APKBUILD b/main/perl-mail-domainkeys/APKBUILD
index 99fd0be1a7a..c2b9c49e2d6 100644
--- a/main/perl-mail-domainkeys/APKBUILD
+++ b/main/perl-mail-domainkeys/APKBUILD
@@ -1,31 +1,34 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-mail-domainkeys
-_realname=Mail-DomainKeys
+_pkgreal=Mail-DomainKeys
 pkgver=1.0
-pkgrel=3
+pkgrel=5
 pkgdesc="A perl implementation of DomainKeys"
-url="http://search.cpan.org/~anthonyu/Mail-DomainKeys-1.0/"
+url="https://metacpan.org/dist/Mail-DomainKeys"
 arch="noarch"
-license="Artistic-Perl-1.0 GPL+"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
-install=
+checkdepends="perl-crypt-openssl-rsa perl-mailtools perl-net-dns"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/A/AN/ANTHONYU/$_realname-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/A/AN/ANTHONYU/Mail-DomainKeys-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$srcdir/$_realname-$pkgver"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
 
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+check() {
+	make test
 }
 
 package() {
-	cd "$srcdir/$_realname-$pkgver"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="359f77c6c0eaa1bd1267dbda08371c4b7826ea6e3ad79f677f40653d0aa47822e01db033802fd4a1532a8ed46f05bb90f339171040be693670e26f8bb62b600f  Mail-DomainKeys-1.0.tar.gz"
+sha512sums="
+359f77c6c0eaa1bd1267dbda08371c4b7826ea6e3ad79f677f40653d0aa47822e01db033802fd4a1532a8ed46f05bb90f339171040be693670e26f8bb62b600f  Mail-DomainKeys-1.0.tar.gz
+"
diff --git a/main/perl-mail-imapclient/APKBUILD b/main/perl-mail-imapclient/APKBUILD
index ca8c268698a..e02676a81f5 100644
--- a/main/perl-mail-imapclient/APKBUILD
+++ b/main/perl-mail-imapclient/APKBUILD
@@ -1,49 +1,34 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=perl-mail-imapclient
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Mail-IMAPClient
-pkgver=3.42
-pkgrel=0
+pkgver=3.43
+pkgrel=1
 pkgdesc="IMAP4 client library"
-url="https://metacpan.org/release/Mail-IMAPClient"
+url="https://metacpan.org/release/Mail-IMAPClient/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends="perl-parse-recdescent"
-depends="$cpandepends"
-makedepends="perl-dev"
+depends="perl perl-parse-recdescent"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PL/PLOBBES/Mail-IMAPClient-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$builddir"
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make && make test
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-doc() {
-	default_doc
-
-	cd "$pkgdir"
-	local file; for file in $(find ./ -name "*.pod"); do
-		mkdir -p "$subpkgdir"/${file%/*}
-		mv $file "$subpkgdir"/$file
-	done
-}
-
-sha512sums="1aa289efb6af5fe58734b26f40e98511f5e0f1ec5b74ffba09921e504bd87734d2f98c009e55815209c45a2d0ab9f74a2c164d2c4a3c490d58c8fb820173fa26  Mail-IMAPClient-3.42.tar.gz"
+sha512sums="9e2346238d68ea62c0ad2e5c03ae9a36face8238dbccbbc083bcefd41d82a7f75887e3245c792e4bd2a5999ce66fabdc4e861118904e96cf2781e1ca549a1b09  Mail-IMAPClient-3.43.tar.gz"
diff --git a/main/perl-mail-spf/APKBUILD b/main/perl-mail-spf/APKBUILD
index dafd18cc76f..ed087c16dbf 100644
--- a/main/perl-mail-spf/APKBUILD
+++ b/main/perl-mail-spf/APKBUILD
@@ -1,43 +1,46 @@
+# Automatically generated by apkbuild-cpan, template 4
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-mail-spf
-_realname=Mail-SPF
-pkgver=2.9.0
-pkgrel=3
+pkgver=3.20240206
+pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Mail-SPF
 pkgdesc="An object-oriented implementation of Sender Policy Framework"
-url="http://search.cpan.org/~jmehnle/Mail-SPF-v2.006/"
+url="https://metacpan.org/release/Mail-SPF/"
 arch="noarch"
-license="GPL PerlArtistic"
-depends="perl perl-error perl-net-dns perl-uri perl-netaddr-ip
-	perl-net-dns-resolver-programmable"
-makedepends="perl-dev perl-module-build"
-install=
+license="BSD-3-Clause"
+depends="perl perl-error perl-net-dns perl-uri perl-netaddr-ip"
+checkdepends="perl-net-dns-resolver-programmable"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/J/JM/JMEHNLE/mail-spf/$_realname-v$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/M/MB/MBRADSHAW/Mail-SPF-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_realname-v$pkgver"
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
+	make
 }
 
-build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
-	mv "$pkgdir"/usr/share/perl5/vendor_perl/* "$pkgdir"/usr/lib/perl5/vendor_perl
-	rm -fr "$pkgdir"/usr/share/perl5
-	rm -fr "$pkgdir"/usr/bin "$pkgdir"/usr/sbin
+
+	cd "$pkgdir"
+	# conflicts with libspf2-tools
+	rm -vrf usr/bin
+	# delete their man pages as well
+	rm -vrf usr/share/man/man1
 }
 
-sha512sums="22bf98c4981f121ed85bb5cbc1ebcb2607ada5052bcea0dd8de692e3473a2ebdd3066acd944bb12f0efe64605e4bf7dc695a1549b7608239d0efc059339df60b  Mail-SPF-v2.9.0.tar.gz"
+sha512sums="
+eb2a4f496e828e6da30f967a1d4f91daab096f0cc2b37544a96e075fa5b5a251f0581a82e7323fb34b9808372b2a6b43dd979f79725b744a3172160a75be5ff5  Mail-SPF-3.20240206.tar.gz
+"
diff --git a/main/perl-mailtools/APKBUILD b/main/perl-mailtools/APKBUILD
index 280c2c864df..83ab72dae63 100644
--- a/main/perl-mailtools/APKBUILD
+++ b/main/perl-mailtools/APKBUILD
@@ -1,45 +1,39 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-mailtools
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=MailTools
 pkgver=2.21
-pkgrel=1
-pkgdesc="Various e-mail related modules"
+pkgrel=4
+pkgdesc="Various ancient e-mail related modules"
+provides="perl-mail-tools=$pkgver"
+replaces="perl-mail-tools"
 url="https://metacpan.org/release/MailTools/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-timedate"
-cpanmakedepends=""
-replaces=perl-mail-tools
-provides="perl-mail-tools=$pkgver"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-timedate"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/M/MA/MARKOV/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/M/MA/MARKOV/MailTools-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
 
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="70c7e5760691a1fc0a2812c48a632896db9bf719d3cb07a63c3a4456c5a365855c7f71c7436c84e5085374628f26ad31fcf13e74b3b7242911da59b7916065a0  MailTools-2.21.tar.gz"
+sha512sums="
+70c7e5760691a1fc0a2812c48a632896db9bf719d3cb07a63c3a4456c5a365855c7f71c7436c84e5085374628f26ad31fcf13e74b3b7242911da59b7916065a0  MailTools-2.21.tar.gz
+"
diff --git a/main/perl-math-round/APKBUILD b/main/perl-math-round/APKBUILD
index d9c91df2ab9..c81c2c43423 100644
--- a/main/perl-math-round/APKBUILD
+++ b/main/perl-math-round/APKBUILD
@@ -1,39 +1,32 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-math-round
-pkgver=0.07
+pkgver=0.08
 pkgrel=1
 pkgdesc="Math::Round perl module"
 url="https://metacpan.org/release/Math-Round/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/G/GR/GROMMEL/Math-Round-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/N/NE/NEILB/Math-Round-$pkgver.tar.gz"
 
-_builddir="$srcdir"/Math-Round-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/Math-Round-$pkgver
 
 build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="7b25c907b4d2c7d8f9d9318991739ea6dfd104d75f9d7f88057739a21072a003306669a9affafed752a20ec97d6341560216492a80ac49f7b456ea54121211b7  Math-Round-0.07.tar.gz"
+sha512sums="
+00ef34f541acef09b80588492a3502ac13d1c6c806709b5403a59dc757540b8a9094f2b304f4242a2a8f67d90c06ed7c52626b56e9309fd01b07229ff538f15a  Math-Round-0.08.tar.gz
+"
diff --git a/main/perl-metrics-any/APKBUILD b/main/perl-metrics-any/APKBUILD
new file mode 100644
index 00000000000..5062894de33
--- /dev/null
+++ b/main/perl-metrics-any/APKBUILD
@@ -0,0 +1,37 @@
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Timothy Legge <timlegge@gmail.com>
+# Maintainer: Timothy Legge <timlegge@gmail.com>
+pkgname=perl-metrics-any
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Metrics-Any
+pkgver=0.10
+pkgrel=0
+pkgdesc="abstract collection of monitoring metrics"
+url="https://metacpan.org/release/Metrics-Any/"
+arch="noarch"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-module-build"
+checkdepends="perl-test2-suite"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Metrics-Any-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
+}
+
+check() {
+	./Build test
+}
+
+package() {
+	./Build install --destdir="$pkgdir"
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="
+5d0261459fa0f315470b48297e726c4a9e91a8318b30321147d4d9cc2f37a4fb0f8225fc0c2dc01c03f6c96e7316eb2b08905d244be94efc254920c8d681ee52  Metrics-Any-0.10.tar.gz
+"
diff --git a/main/perl-mime-base64/APKBUILD b/main/perl-mime-base64/APKBUILD
index d328987a561..a0852ac97a5 100644
--- a/main/perl-mime-base64/APKBUILD
+++ b/main/perl-mime-base64/APKBUILD
@@ -1,43 +1,35 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor:
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-mime-base64
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=MIME-Base64
-pkgver=3.15
-pkgrel=7
-pkgdesc="The RFC 2045 encodings; base64 and quoted-printable"
+pkgver=3.16
+pkgrel=5
+pkgdesc="Encoding and decoding of base64 strings"
 url="https://metacpan.org/release/MIME-Base64/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$_pkgreal-$pkgver.tar.gz"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
+source="https://cpan.metacpan.org/authors/id/C/CA/CAPOEIRAB/MIME-Base64-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$builddir"
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make && make test
+	make test
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+	# conflicts with perl apk
+	rm -rf "$pkgdir"/usr/share/man
 }
 
-doc() {
-	default_doc
-	replaces="perl-doc"
-}
-
-sha512sums="2f1ce99f755d7ae25f6b1907e043c16f72799e0cc9aa8b5efe8bb1f0542fc6f39bff691b2477e18136d06dfb38f6a844c76018a7fa4e60591ebf0e60cfea55d4  MIME-Base64-3.15.tar.gz"
+sha512sums="717aab853377019c8811656e37e3754b6bfeb81f976eb159b04ad41c7beff67fe8dbbbfe827aefd28090c248d237dd1040789e7701649ffad90b64cafd202cf3  MIME-Base64-3.16.tar.gz"
diff --git a/main/perl-mime-lite/APKBUILD b/main/perl-mime-lite/APKBUILD
index e507529f65c..8ab4ac33243 100644
--- a/main/perl-mime-lite/APKBUILD
+++ b/main/perl-mime-lite/APKBUILD
@@ -1,38 +1,34 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-mime-lite
 _pkgreal=MIME-Lite
-pkgver=3.031
+pkgver=3.033
 pkgrel=1
 pkgdesc="low-calorie MIME generator"
 url="https://metacpan.org/release/MIME-Lite"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends="perl-mime-types perl-email-date-format
-	perl-mailtools perl-test-pod-coverage"
-depends="perl $cpandepends"
-makedepends="perl-dev"
+depends="perl perl-mime-types perl-email-date-format perl-mailtools perl-test-pod-coverage"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/MIME-Lite-$pkgver.tar.gz"
 
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="0fd57414a685f33d6fcc6d3c0dc2ae8556c7a7b2f5e05021af072bea48561b5bf89de49cbcc90328087e0cb46382e7cbccd60f8d5a9328f1e484afca502ca420  MIME-Lite-3.031.tar.gz"
+sha512sums="
+315fbe01a432e67953305fb1db70aa337d3c7e1710087196535e108fbb516cf868a277acc693afbbc34ffa135386c6a784ddf4c1de0359fbe6c6339b26aac878  MIME-Lite-3.033.tar.gz
+"
diff --git a/main/perl-mime-tools/APKBUILD b/main/perl-mime-tools/APKBUILD
index 7c956b66b49..3b14de02f45 100644
--- a/main/perl-mime-tools/APKBUILD
+++ b/main/perl-mime-tools/APKBUILD
@@ -1,41 +1,39 @@
+# Automatically generated by apkbuild-cpan, template 4
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-mime-tools
-_realname=MIME-tools
-pkgver=5.509
-pkgrel=2
+pkgver=5.514
+pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=MIME-tools
 pkgdesc="Perl modules for parsing (and creating!) MIME entities"
-url="http://search.cpan.org/~doneill/MIME-tools-$pkgver/"
+url="https://metacpan.org/release/MIME-tools/"
 arch="noarch"
-license="PerlArtistic GPL"
-depends="perl perl-io-stringy perl-mailtools perl-convert-binhex"
-makedepends="perl-dev"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-mailtools perl-convert-binhex"
 checkdepends="perl-test-deep perl-test-pod"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DS/DSKOLL/$_realname-$pkgver.tar.gz"
-builddir="$srcdir/$_realname-$pkgver"
+source="https://cpan.metacpan.org/authors/id/D/DS/DSKOLL/MIME-tools-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
+	make
 }
 
-build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make || return 1
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-check() {
-	cd "$builddir"
-	make test
 }
 
-sha512sums="0407b09916144eafbee0c75758306e0f44c27db0e8aabf033267f9903f676f0415de99927dcfdb69f9e9d4123d63c280f526dff92e0d97744761c888df90667a  MIME-tools-5.509.tar.gz"
+sha512sums="
+1f80d436305bada1ed46104ba25a1bbd877cf358294c0e4101d7018ba5eb7f208debf62125b66378a0b8b9103a4e488165881c1b2bc6fa2964b6986a66c36b27  MIME-tools-5.514.tar.gz
+"
diff --git a/main/perl-mime-types/APKBUILD b/main/perl-mime-types/APKBUILD
index df536954a25..71d80c81685 100644
--- a/main/perl-mime-types/APKBUILD
+++ b/main/perl-mime-types/APKBUILD
@@ -1,48 +1,45 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 4
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-mime-types
+pkgver=2.26
+pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=MIME-Types
-pkgver=2.17
-pkgrel=1
 pkgdesc="Definition of MIME types"
 url="https://metacpan.org/release/MIME-Types/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-cpancheckdepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/M/MA/MARKOV/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/M/MA/MARKOV/MIME-Types-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
+	make
 }
 
-build() {
-	cd "$builddir"
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
+doc() {
+	local file; find "$pkgdir" -name "*.pod" | while read -r file; do
+		amove "${file#"$pkgdir"}"
+	done
+	default_doc
 }
 
-sha512sums="a834ddfa70fbaa5688a2a35626c489a48448e273638312609faaa8fbf07ba656254d1f907ba5f25518e93fd62b7b9265eec700c38c8446876dca24e07d8b15c4  MIME-Types-2.17.tar.gz"
+sha512sums="
+cde3a8c6cbde16143732cf2ac4d648eff167917970357daf0162370cbba375b2aa546af472a73b2a4b26086919ddcc49bd9da999251946a40aee8abb60af2d75  MIME-Types-2.26.tar.gz
+"
diff --git a/main/perl-module-build-tiny/APKBUILD b/main/perl-module-build-tiny/APKBUILD
index 54922884fbf..9d852762a2a 100644
--- a/main/perl-module-build-tiny/APKBUILD
+++ b/main/perl-module-build-tiny/APKBUILD
@@ -1,42 +1,42 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-module-build-tiny
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Module-Build-Tiny
-pkgver=0.039
-pkgrel=1
+pkgver=0.047
+pkgrel=0
 pkgdesc="A tiny replacement for Module::Build"
 url="https://metacpan.org/release/Module-Build-Tiny/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-extutils-installpaths perl-extutils-config perl-extutils-helpers perl-test-harness"
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="
+	perl
+	perl-extutils-config
+	perl-extutils-helpers
+	perl-extutils-installpaths
+	"
+makedepends="perl-module-build"
+checkdepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/Module-Build-Tiny-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	if [ -e Build.PL ]; then
-		perl Build.PL --installdirs=vendor || return 1
-	else
-		PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	fi
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	./Build && ./Build test
+check() {
+	./Build test
 }
 
 package() {
-	cd "$_builddir"
-	./Build install --destdir="$pkgdir" --create_packlist=0 || return 1
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="26ca6fe4c1792b26bb2b4711035847f4215ea7c37234fbe24fc07432682fd9d3b6016dbdb2ecb455a7b13f6bea13994826c7f84f21075f0a6e575fa74672903a  Module-Build-Tiny-0.039.tar.gz"
+sha512sums="
+505e8a1a1d7e4f73a820352b476c938769bee1b069eaee0df7a95ea5651f109dfb106faf82bf423ca96b15d0148fd890342ad214b4fa6481d15b8f494fe48a30  Module-Build-Tiny-0.047.tar.gz
+"
diff --git a/main/perl-module-build/APKBUILD b/main/perl-module-build/APKBUILD
index cc18e3eb887..5e75be70289 100644
--- a/main/perl-module-build/APKBUILD
+++ b/main/perl-module-build/APKBUILD
@@ -1,38 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-module-build
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Module-Build
-pkgver=0.4231
-pkgrel=0
+pkgver=0.4234
+pkgrel=1
 pkgdesc="Build and install Perl modules"
-url="https://metacpan.org/release/Module-Build"
+url="https://metacpan.org/release/Module-Build/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/Module-Build-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-check() {
-	./Build test
-}
-
-prepare() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	perl Build.PL installdirs=vendor
-}
-
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
 	./Build
 }
 
+check() {
+	./Build test
+}
+
 package() {
-	./Build install destdir="$pkgdir"
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="ee1dc18a7df3fe67e7f954d5e1e071aa0a6f5bce6783b768bceb01f071e64ac8be63f410c932c7c16764e5d4f52fc664ce11a12f26f6afc75a26f79883efad70  Module-Build-0.4231.tar.gz"
+sha512sums="
+e2bbdd64f98b424ea7fd20e2ba301d34b77c9f2ecec28e3191fda63a056a12c0fb1cab1496419e9e9b8054db1a8d3fe92e1f033cdcdf021e1a086c8859905eca  Module-Build-0.4234.tar.gz
+"
diff --git a/main/perl-module-implementation/APKBUILD b/main/perl-module-implementation/APKBUILD
index 12f05c608ad..8d78f5b0ae2 100644
--- a/main/perl-module-implementation/APKBUILD
+++ b/main/perl-module-implementation/APKBUILD
@@ -1,46 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-module-implementation
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Module-Implementation
 pkgver=0.09
-pkgrel=2
+pkgrel=5
 pkgdesc="Loads one of several alternate underlying implementations for a module"
 url="https://metacpan.org/release/Module-Implementation/"
 arch="noarch"
 license="Artistic-2.0"
-cpandepends="perl-module-runtime perl-try-tiny perl-test-taint"
-cpanmakedepends="perl-test-fatal perl-test-requires "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+depends="perl perl-module-runtime perl-try-tiny"
+makedepends="perl-dev"
+checkdepends="perl-test-requires perl-test-fatal"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Module-Implementation-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-        cd "$builddir"
-        make test
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="049f967ba1bd8a3914968b34006030ae318d99ac629a0f34736f1c2b5392490c30aa0914e777eaefda7f0f58755d2d3363a266b90db59b53fe145ef68e1d953c  Module-Implementation-0.09.tar.gz"
+sha512sums="
+049f967ba1bd8a3914968b34006030ae318d99ac629a0f34736f1c2b5392490c30aa0914e777eaefda7f0f58755d2d3363a266b90db59b53fe145ef68e1d953c  Module-Implementation-0.09.tar.gz
+"
diff --git a/main/perl-module-install/APKBUILD b/main/perl-module-install/APKBUILD
index d32e779c700..9ec1f95a02e 100644
--- a/main/perl-module-install/APKBUILD
+++ b/main/perl-module-install/APKBUILD
@@ -1,40 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-module-install
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Module-Install
-pkgver=1.19
+pkgver=1.21
 pkgrel=1
-pkgdesc="Perl module for Module-Install"
+pkgdesc="Standalone, extensible Perl module installer"
 url="https://metacpan.org/release/Module-Install/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpanmakedepends="perl-file-remove perl-module-build perl-module-scandeps perl-yaml-tiny"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-yaml-tiny perl-module-build perl-module-scandeps perl-file-remove"
+makedepends="perl-dev perl-yaml-tiny"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Module-Install-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-check() {
-	cd "$builddir"
-	make test
-}
-
-prepare() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="68a255402c98955cfcb5a8a99555fe511b89d5fccf96ee1c498cab347c8945f3abe53485ea936f7419420d9c7beb52c861516f4cfd299812cebf80eab50fa5ba  Module-Install-1.19.tar.gz"
+sha512sums="
+f3dd1dfcae81704f1aa9ac409abd22c9e0d5d66c048adac13da19ab88559d717427b5471b7a065db8312d4d44e829afea52567cd0993e4016df0e10c760ada85  Module-Install-1.21.tar.gz
+"
diff --git a/main/perl-module-metadata/APKBUILD b/main/perl-module-metadata/APKBUILD
index f2add07226a..a90871fa180 100644
--- a/main/perl-module-metadata/APKBUILD
+++ b/main/perl-module-metadata/APKBUILD
@@ -1,45 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-module-metadata
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Module-Metadata
-pkgver=1.000037
-pkgrel=0
+pkgver=1.000038
+pkgrel=2
 pkgdesc="Gather package and POD information from perl module files"
-url="https://metacpan.org/release/Module-Metadata"
+url="https://metacpan.org/release/Module-Metadata/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-makedepends="perl-dev"
-subpackages="$pkgname-doc"
+depends="perl"
 source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Module-Metadata-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
 
-doc() {
-	default_doc
-	replaces="perl-doc"
+	# man pages are already provided by perl-doc
+	rm -rf "$pkgdir"/usr/share/man
 }
 
-sha512sums="b11084c9e3ba9a49350e069fb7743d1bb989e0b3891a822f351915c78579d75a76853c05e546e3ae8e3a0378fbc98fdb1edebc416e2e7462d69346d964f6057b  Module-Metadata-1.000037.tar.gz"
+sha512sums="
+49a37dd054b739bc8b23b633d2ac7ce4b288b6acaeb147e5eb159557ec85b5f6b61687a857d39174f086a5b4ac73108b14e715e879c3559db2a13bd38457c985  Module-Metadata-1.000038.tar.gz
+"
diff --git a/main/perl-module-pluggable/APKBUILD b/main/perl-module-pluggable/APKBUILD
index 0a9f148fd9c..654a373645b 100644
--- a/main/perl-module-pluggable/APKBUILD
+++ b/main/perl-module-pluggable/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-module-pluggable
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Module-Pluggable
 pkgver=5.2
-pkgrel=1
+pkgrel=4
 pkgdesc="automatically give your module the ability to have plugins"
 url="https://metacpan.org/release/Module-Pluggable/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/S/SI/SIMONW/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/S/SI/SIMONW/Module-Pluggable-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="7df8ee6713c8e0d4df756736c43c2033632cb8887c82ed5b9f38476dbf402b5daa3af83d3b2bd1228afb020ce5855831812f86299b63518e04e0929390b0c5f5  Module-Pluggable-5.2.tar.gz"
+sha512sums="
+7df8ee6713c8e0d4df756736c43c2033632cb8887c82ed5b9f38476dbf402b5daa3af83d3b2bd1228afb020ce5855831812f86299b63518e04e0929390b0c5f5  Module-Pluggable-5.2.tar.gz
+"
diff --git a/main/perl-module-refresh/APKBUILD b/main/perl-module-refresh/APKBUILD
index 4010e9f2d04..294052dc593 100644
--- a/main/perl-module-refresh/APKBUILD
+++ b/main/perl-module-refresh/APKBUILD
@@ -1,46 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-module-refresh
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Module-Refresh
-pkgver=0.17
+pkgver=0.18
 pkgrel=2
 pkgdesc="Refresh %INC files when updated on disk"
 url="https://metacpan.org/release/Module-Refresh/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="perl-path-class"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-install"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev perl-path-class"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/A/AL/ALEXMV/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/B/BP/BPS/Module-Refresh-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="48bbcf14d5c6f13217b41c9a4683fd5ff492d3d33f8d6d50e89eae8a6336f306358e0070ecf1617d68c6eb9f91caaec6e1048e09b741d3fa0a19f6d38a75f17f  Module-Refresh-0.17.tar.gz"
+sha512sums="
+9e950cab0119253123af1f1fe06a8f833a3019fab5e87b2d4602dcda8a1a9b94862158c3c64ceb070239d95b158c0809557049908f68f3f51c55b242d0804b2b  Module-Refresh-0.18.tar.gz
+"
diff --git a/main/perl-module-runtime/APKBUILD b/main/perl-module-runtime/APKBUILD
index 840171ec4a0..e453b5f2e2b 100644
--- a/main/perl-module-runtime/APKBUILD
+++ b/main/perl-module-runtime/APKBUILD
@@ -1,44 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-module-runtime
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Module-Runtime
 pkgver=0.016
-pkgrel=3
+pkgrel=6
 pkgdesc="runtime module handling"
 url="https://metacpan.org/release/Module-Runtime/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="perl-test-pod perl-test-pod-coverage perl-module-build"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/Module-Runtime-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-check() {
-	cd "$builddir"
-	./Build test
-}
-
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	perl Build.PL installdirs=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
 	./Build
 }
 
+check() {
+	./Build test
+}
+
 package() {
-	cd "$builddir"
-	./Build install destdir="$pkgdir" || return 1
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="64a362ee897646173dbbdd8794f863d93379d45d7ac20d3ae890d77b4ec3f5e36aaff66c41b4a6a33b28bf492216283528755550ab09e466ceafb4f0cfbaeb9e  Module-Runtime-0.016.tar.gz"
+sha512sums="
+64a362ee897646173dbbdd8794f863d93379d45d7ac20d3ae890d77b4ec3f5e36aaff66c41b4a6a33b28bf492216283528755550ab09e466ceafb4f0cfbaeb9e  Module-Runtime-0.016.tar.gz
+"
diff --git a/main/perl-module-scandeps/APKBUILD b/main/perl-module-scandeps/APKBUILD
index eb0fb36aaad..0f319e0e54c 100644
--- a/main/perl-module-scandeps/APKBUILD
+++ b/main/perl-module-scandeps/APKBUILD
@@ -1,44 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=perl-module-scandeps
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Module-ScanDeps
-pkgver=1.27
+pkgver=1.35
 pkgrel=0
 pkgdesc="Recursively scan Perl code for dependencies"
-url="https://metacpan.org/release/Module-ScanDeps"
+url="https://metacpan.org/release/Module-ScanDeps/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpanmakedepends="perl-test-requires"
-makedepends="perl-dev $cpanmakedepends perl-test-pod"
+depends="perl"
+checkdepends="perl-ipc-run3 perl-test-requires"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/R/RS/RSCHUPP/Module-ScanDeps-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-	cd "$builddir"
-
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$builddir"
-
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	cd "$builddir"
-	make test
-}
-
-sha512sums="ab5625f497a9dc9133960c7c9a5867f27f6f0061fa954225cfc53fda39d9b657743ee66a7a96cc1485bba57532fc0447c3b245dd81cf6e6c39522fdd2e308411  Module-ScanDeps-1.27.tar.gz"
+sha512sums="
+314a8098883995d876bfae7760b569ade56eed1940e50f92a509fd0f2c0020d57da859bb8848c56a9e1dcb4acd62cd246c39424bc1c30d71c6defc9f491518b9  Module-ScanDeps-1.35.tar.gz
+"
diff --git a/main/perl-module-util/APKBUILD b/main/perl-module-util/APKBUILD
index b8ff9eff370..4229aaec36a 100644
--- a/main/perl-module-util/APKBUILD
+++ b/main/perl-module-util/APKBUILD
@@ -1,39 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-module-util
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Module-Util
 pkgver=1.09
-pkgrel=1
+pkgrel=5
 pkgdesc="Module name tools and transformations"
 url="https://metacpan.org/release/Module-Util/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/M/MA/MATTLAW/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/M/MA/MATTLAW/Module-Util-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	perl Build.PL installdirs=vendor || return 1
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	./Build && ./Build test
+check() {
+	./Build test
 }
 
 package() {
-	cd "$_builddir"
-	./Build install destdir="$pkgdir" || return 1
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="6669216598c5a3b41964e65792fa5bdea9675150bf2ef908ed3e154b9fbc207de0b766feaebc2656a5379393cf8acafa5e27aeb694b9a56d8ff3b5f9c35837ad  Module-Util-1.09.tar.gz"
+sha512sums="
+6669216598c5a3b41964e65792fa5bdea9675150bf2ef908ed3e154b9fbc207de0b766feaebc2656a5379393cf8acafa5e27aeb694b9a56d8ff3b5f9c35837ad  Module-Util-1.09.tar.gz
+"
diff --git a/main/perl-module-versions-report/APKBUILD b/main/perl-module-versions-report/APKBUILD
index 90c27a1f8f6..2ebf669438a 100644
--- a/main/perl-module-versions-report/APKBUILD
+++ b/main/perl-module-versions-report/APKBUILD
@@ -2,38 +2,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-module-versions-report
 pkgver=1.06
-pkgrel=1
+pkgrel=5
 pkgdesc="Module::Versions::Report perl module"
 url="https://metacpan.org/release/Module-Versions-Report/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/J/JE/JESSE/Module-Versions-Report-$pkgver.tar.gz"
 
-_builddir="$srcdir"/Module-Versions-Report-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/Module-Versions-Report-$pkgver
 
 build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="e9cd5025f5ab586a41d6ecb9f1a1aaa9dcfd902899709ac62817168dc690bfbfe195ef8fd1246d4cc55157bf90f048719891fbeaec4ed1aa885c3ba3e3db08f1  Module-Versions-Report-1.06.tar.gz"
+sha512sums="
+e9cd5025f5ab586a41d6ecb9f1a1aaa9dcfd902899709ac62817168dc690bfbfe195ef8fd1246d4cc55157bf90f048719891fbeaec4ed1aa885c3ba3e3db08f1  Module-Versions-Report-1.06.tar.gz
+"
diff --git a/main/perl-moo/APKBUILD b/main/perl-moo/APKBUILD
new file mode 100644
index 00000000000..5c99aedfd7a
--- /dev/null
+++ b/main/perl-moo/APKBUILD
@@ -0,0 +1,34 @@
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
+pkgname=perl-moo
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Moo
+pkgver=2.005005
+pkgrel=1
+pkgdesc="Minimalist Object Orientation (with Moose compatibility)"
+url="https://metacpan.org/release/Moo/"
+arch="noarch"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-class-method-modifiers perl-sub-quote perl-role-tiny"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Moo-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+build() {
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	make test
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="
+e6b6cc491bb55ab0a7a57418d210da52990e8aa559fcf83c25838624caa0de1c919a229bab2b9c7e7c99cc9904706b64db169860d2c404449731e400ea1c5f79  Moo-2.005005.tar.gz
+"
diff --git a/main/perl-mozilla-ca/APKBUILD b/main/perl-mozilla-ca/APKBUILD
index 82f1e25efef..96ef1743a32 100644
--- a/main/perl-mozilla-ca/APKBUILD
+++ b/main/perl-mozilla-ca/APKBUILD
@@ -1,37 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Automatically generated by apkbuild-cpan, template 4
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-mozilla-ca
-_pkgreal=Mozilla-CA
-pkgver=20180117
+pkgver=20240313
 pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Mozilla-CA
 pkgdesc="Mozilla's CA cert bundle in PEM format"
-url="https://search.cpan.org/dist/Mozilla-CA/"
+url="https://metacpan.org/release/Mozilla-CA/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="MPL-2.0"
+depends="perl"
 subpackages="$pkgname-doc"
-source="https://search.cpan.org/CPAN/authors/id/A/AB/ABH/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/L/LW/LWP/Mozilla-CA-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="8b4187f47638ba8d670b3f5cafc1de4040dfec1dde6a932411c79b41a8a454bcd3b66f9818c6d28135e29551ce93bc3ddb61e648c7810b30cb147ea0beaaedba  Mozilla-CA-20180117.tar.gz"
+sha512sums="
+b5666f30a483e0abeb04182d8c02e8d3c3457672debf628152f3566ed7f5fc4942d7ac186b14802cd549d35abe2fc93cd505373d8a9af77fee57a2948d9a4984  Mozilla-CA-20240313.tar.gz
+"
diff --git a/main/perl-mro-compat/APKBUILD b/main/perl-mro-compat/APKBUILD
index 16c8634a41d..0004e1de167 100644
--- a/main/perl-mro-compat/APKBUILD
+++ b/main/perl-mro-compat/APKBUILD
@@ -1,42 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-mro-compat
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=MRO-Compat
-pkgver=0.13
-pkgrel=1
+pkgver=0.15
+pkgrel=2
 pkgdesc="mro::* interface compatibility for Perls < 5.9.5"
 url="https://metacpan.org/release/MRO-Compat/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/H/HA/HAARG/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/H/HA/HAARG/MRO-Compat-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-check() {
-	cd "$builddir"
-	make test
-}
-
-prepare() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="3311c37c8fc73acaf68bae2b12315a448a87de8f756e817c967cf49b753cf218e8c762ecc44890297afd82193d71b2407060db0bc70720d228b31c0a30de10c1  MRO-Compat-0.13.tar.gz"
+sha512sums="
+0767ea5e98414ce55607c599eecde686fe2defed99ade156ce8db63e508bfcd150aea48952eed7624f969c0ca185652a85eedb8dbcae82b826152d18d4152545  MRO-Compat-0.15.tar.gz
+"
diff --git a/main/perl-namespace-autoclean/APKBUILD b/main/perl-namespace-autoclean/APKBUILD
index 3fd73555612..9c615d43019 100644
--- a/main/perl-namespace-autoclean/APKBUILD
+++ b/main/perl-namespace-autoclean/APKBUILD
@@ -5,13 +5,12 @@
 pkgname=perl-namespace-autoclean
 _pkgreal=namespace-autoclean
 pkgver=0.29
-pkgrel=1
+pkgrel=3
 pkgdesc="Keep imports out of your namespace"
 url="https://metacpan.org/release/namespace-autoclean/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-sub-identify perl-b-hooks-endofscope perl-namespace-clean"
-makedepends="perl-dev"
 checkdepends="perl-test-needs perl-devel-overloadinfo"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/namespace-autoclean-$pkgver.tar.gz"
diff --git a/main/perl-namespace-clean/APKBUILD b/main/perl-namespace-clean/APKBUILD
index db3421bff99..00a47b2cb59 100644
--- a/main/perl-namespace-clean/APKBUILD
+++ b/main/perl-namespace-clean/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-namespace-clean
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=namespace-clean
 pkgver=0.27
-pkgrel=1
+pkgrel=4
 pkgdesc="Keep imports and functions out of your namespace"
 url="https://metacpan.org/release/namespace-clean/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-package-stash perl-sub-name perl-sub-identify perl-b-hooks-endofscope"
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-package-stash perl-b-hooks-endofscope"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RI/RIBASUSHI/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/R/RI/RIBASUSHI/namespace-clean-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="4422640656602e44c6d3675e55a0e699f8c0e07abbaf11f0b0905043f90e13bb95ee0eaa4c4a08c853296825dd8ef33c806e0a7c284a70448e35ac3354545744  namespace-clean-0.27.tar.gz"
+sha512sums="
+4422640656602e44c6d3675e55a0e699f8c0e07abbaf11f0b0905043f90e13bb95ee0eaa4c4a08c853296825dd8ef33c806e0a7c284a70448e35ac3354545744  namespace-clean-0.27.tar.gz
+"
diff --git a/main/perl-net-async-http/APKBUILD b/main/perl-net-async-http/APKBUILD
deleted file mode 100644
index c28ca711fa3..00000000000
--- a/main/perl-net-async-http/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-pkgname=perl-net-async-http
-_pkgreal=Net-Async-HTTP
-pkgver=0.45
-pkgrel=0
-pkgdesc="Use HTTP with C<IO::Async>"
-url="https://metacpan.org/release/Net-Async-HTTP"
-arch="noarch"
-license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends="perl-io-async perl-future perl-uri perl-http-message perl-struct-dumb"
-cpanmakedepends="perl-test-identity perl-http-cookies"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-test-refcount perl-module-build"
-subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Net-Async-HTTP-$pkgver.tar.gz"
-
-builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	perl Build.PL installdirs=vendor
-}
-
-build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	./Build
-}
-
-check() {
-	./Build test
-}
-
-package() {
-	./Build install destdir="$pkgdir"
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-sha512sums="0d50716cf73b05a55c177eb7858acb002993bace6b1aafc02b18067e9fb5583c7ed5ff49bd611b10b5186e98b2de50016720f827cf7cff82918259fca57e6f9f  Net-Async-HTTP-0.45.tar.gz"
diff --git a/main/perl-net-cidr-lite/APKBUILD b/main/perl-net-cidr-lite/APKBUILD
index f8a0f9f6fca..7df980cae36 100644
--- a/main/perl-net-cidr-lite/APKBUILD
+++ b/main/perl-net-cidr-lite/APKBUILD
@@ -1,36 +1,35 @@
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Matt Smith <mcs@darkregion.net>
-# Maintainer:  Matt Smith <mcs@darkregion.net>
+# Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=perl-net-cidr-lite
-_realname=Net-CIDR-Lite
-pkgver=0.21
-pkgrel=5
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Net-CIDR-Lite
+pkgver=0.22
+pkgrel=1
 pkgdesc="Perl extension for merging IPv4 or IPv6 CIDR addresses"
-url="http://search.cpan.org/~dougw/Net-CIDR-Lite-0.21/"
+url="https://metacpan.org/release/Net-CIDR-Lite/"
 arch="noarch"
-license="Artistic-Perl-1.0 GPL+"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
-install=
+
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DO/DOUGW/$_realname-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/S/ST/STIGTSP/Net-CIDR-Lite-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-builddir="$srcdir/$_realname-$pkgver"
 build() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	# creates file collision among perl modules
-	find "$pkgdir" -name perllocal.pod -delete
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="c8a5b00a26fb823e637825eac72ca7002f401a1a623d8b77b694848975124f24fba86830df8d41f6bdba4d2e2f0f93b2b155ac1511b607efa67942189614dc7c  Net-CIDR-Lite-0.21.tar.gz"
+sha512sums="5d89c0b6d950e5cb4c7eb9639829d76a67373865f5582f61d3e384636b176ac08335a9210d05a53c54105fecfb8ec98ae115cba3d181aed3032370d50f3aec9f  Net-CIDR-Lite-0.22.tar.gz"
diff --git a/main/perl-net-cidr/APKBUILD b/main/perl-net-cidr/APKBUILD
index f14d0183f1a..271d42a7a86 100644
--- a/main/perl-net-cidr/APKBUILD
+++ b/main/perl-net-cidr/APKBUILD
@@ -1,35 +1,35 @@
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-net-cidr
-_pkgname=Net-CIDR
-pkgver=0.20
-pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Net-CIDR
+pkgver=0.21
+pkgrel=2
 pkgdesc="Manipulate IPv4/IPv6 netblocks in CIDR notation"
-url="https://metacpan.org/release/Net-CIDR"
+url="https://metacpan.org/release/Net-CIDR/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
+
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/M/MR/MRSAM/Net-CIDR-$pkgver.tar.gz"
-
-builddir="$srcdir/$_pkgname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="e00fd79bc21e9e56e74cb8de90372daf12e23a2be9a3cbfe328c2d72b7a280faba8368d89f8df11c79e2be47874b24f225504747c468498950ff33c9996cc314  Net-CIDR-0.20.tar.gz"
+sha512sums="28e7c808173d87a403ab6d924763bdeeef61801775167a11b02bf352d70808821f896f7e3dbb1fd3cd2b42c937f9c6175d1522daddf38c53ee9d242d1a3b5fd1  Net-CIDR-0.21.tar.gz"
diff --git a/main/perl-net-dns-resolver-mock/APKBUILD b/main/perl-net-dns-resolver-mock/APKBUILD
index a1ad8648835..1522a331c41 100644
--- a/main/perl-net-dns-resolver-mock/APKBUILD
+++ b/main/perl-net-dns-resolver-mock/APKBUILD
@@ -3,8 +3,8 @@
 pkgname=perl-net-dns-resolver-mock
 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Net-DNS-Resolver-Mock
-pkgver=1.20200215
-pkgrel=0
+pkgver=1.20230216
+pkgrel=1
 pkgdesc="Mock a DNS Resolver object for testing"
 url="https://metacpan.org/release/Net-DNS-Resolver-Mock/"
 arch="noarch"
@@ -32,4 +32,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="92ac244dc2a7b939b1e8e8c71eb9ce65fdf1494dd08c62e6fc3720ffa82acc7c354bd7dcb8c77d9e52ee132773864b4b3ba869303af7363001ff5e9125c06802  Net-DNS-Resolver-Mock-1.20200215.tar.gz"
+sha512sums="
+832fdae88ef915251bd71ebacd3223cd8adb269cbb2e9724c617b31cfa65c92471ce93273070143c629e0a3f3bda54bcd5d55ae78fd60eae6c929bb7da7e1290  Net-DNS-Resolver-Mock-1.20230216.tar.gz
+"
diff --git a/main/perl-net-dns-resolver-programmable/APKBUILD b/main/perl-net-dns-resolver-programmable/APKBUILD
index f3592ba809e..de92fc2b991 100644
--- a/main/perl-net-dns-resolver-programmable/APKBUILD
+++ b/main/perl-net-dns-resolver-programmable/APKBUILD
@@ -1,33 +1,30 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-net-dns-resolver-programmable
-_pkgname=Net-DNS-Resolver-Programmable
+_pkgreal=Net-DNS-Resolver-Programmable
 pkgver=0.009
-pkgrel=1
+pkgrel=4
 pkgdesc="Programmable DNS resolver perl class for offline emulation of DNS"
 url="https://metacpan.org/pod/Net::DNS::Resolver::Programmable"
 arch="noarch"
-license="Perl Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl perl-net-dns"
-makedepends="perl-dev perl-module-build"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/B/BI/BIGPRESH/$_pkgname-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/B/BI/BIGPRESH/Net-DNS-Resolver-Programmable-$pkgver.tar.gz"
 
-builddir="$srcdir/$_pkgname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name '.packlist' -o -name 'perllocal.pod' \) -delete
 }
diff --git a/main/perl-net-dns/APKBUILD b/main/perl-net-dns/APKBUILD
index debe5348668..b009bc524d9 100644
--- a/main/perl-net-dns/APKBUILD
+++ b/main/perl-net-dns/APKBUILD
@@ -1,38 +1,45 @@
+# Automatically generated by apkbuild-cpan, template 4
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-net-dns
-_pkgname=Net-DNS
-pkgver=1.23
+pkgver=1.44
 pkgrel=0
-pkgdesc="Perl interface to the DNS resolver"
-url="https://www.net-dns.org/"
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Net-DNS
+pkgdesc="Perl Interface to the Domain Name System"
+url="https://metacpan.org/release/Net-DNS/"
 arch="noarch"
-license="GPL-1.0-or-later or Artistic-1.0-Perl"
-depends="perl"
-makedepends="perl-dev"
+license="MIT"
+depends="perl perl-digest-hmac"
 subpackages="$pkgname-doc"
-checkdepends="perl-digest-hmac perl-net-libidn perl-test-pod"
-source="https://www.net-dns.org/download/Net-DNS-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+source="https://cpan.metacpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
+	make
 }
 
-build() {
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
-	# creates file collision among perl modules
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	make test
+doc() {
+	local file; find "$pkgdir" -name "*.pod" | while read -r file; do
+		amove "${file#"$pkgdir"}"
+	done
+	default_doc
 }
 
-sha512sums="23c9df9e12340687d3399cbe7fb5f94dfa4ceae94be77227c42f0f707470ef90194ef64aa953ee36da5c2ba6a28d2bb4b59de04a9722ae3b0db6162916bde2b1  Net-DNS-1.23.tar.gz"
+sha512sums="
+9de622a58d658799f8b3b636408d4e64ce8e4db7623f6e28809e12fb86802c8995e39ee3e0753e13ce8fdc8119fc6a449abc8fd768e72adca205d51fdb774bbe  Net-DNS-1.44.tar.gz
+"
diff --git a/main/perl-net-http/APKBUILD b/main/perl-net-http/APKBUILD
index 03767efe739..d84c2a4be9d 100644
--- a/main/perl-net-http/APKBUILD
+++ b/main/perl-net-http/APKBUILD
@@ -1,35 +1,37 @@
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-net-http
-pkgver=6.19
-pkgrel=0
-pkgdesc="Net::HTTP perl module"
-url="https://search.cpan.org/dist/Net-HTTP/"
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Net-HTTP
+pkgver=6.23
+pkgrel=1
+pkgdesc="Low-level HTTP connection (client)"
+replaces="perl-libwww"
+url="https://metacpan.org/release/Net-HTTP/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-uri"
-makedepends="perl-dev"
-replaces="perl-libwww"
 subpackages="$pkgname-doc"
-source="https://search.cpan.org/CPAN/authors/id/O/OA/OALDERS/Net-HTTP-$pkgver.tar.gz"
-
-builddir="$srcdir"/Net-HTTP-$pkgver
+source="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/Net-HTTP-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="85b139150d8608f7439ef2f975afe884c1f5220726d45603427510e39ad2003e20ea30ed1326b4ff20527c4e625262769a5abaa5ef320f1c26bf3f8eafc9cd1b  Net-HTTP-6.19.tar.gz"
+sha512sums="
+be926d12f6a8be504f221b54dbe9b1cbe1ff18b7dc8075ce308cc8c436ed9e4fe959516ce81c858a70de80df13cedd8cd78fd153cc5eb763f1bc3c9893ceaa05  Net-HTTP-6.23.tar.gz
+"
diff --git a/main/perl-net-ip/APKBUILD b/main/perl-net-ip/APKBUILD
index 29a5ee08537..a4b9255ac85 100644
--- a/main/perl-net-ip/APKBUILD
+++ b/main/perl-net-ip/APKBUILD
@@ -1,31 +1,33 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-net-ip
-_realname=Net-IP
+_pkgreal=Net-IP
 pkgver=1.26
-pkgrel=2
+pkgrel=7
 pkgdesc="Perl extension for manipulating IPv4/IPv6 addresses"
-url="http://search.cpan.org/~manu/Net-IP-1.25/"
+url="https://metacpan.org/dist/Net-IP"
 arch="noarch"
-license="Artistic-Perl-1.0 GPL+"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
-install=
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/M/MA/MANU/$_realname-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/M/MA/MANU/Net-IP-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$srcdir/$_realname-$pkgver"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
 
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+check() {
+	make test
 }
 
 package() {
-	cd "$srcdir/$_realname-$pkgver"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="c561f32b6ca5dc082e2bc6c47000a2ca0f5ee7abb47105f5b1bf98cb76723287416de0a767ea63c18f87964df7f3982c7258fe1208afa22cff0378ae3509d9eb  Net-IP-1.26.tar.gz"
+sha512sums="
+c561f32b6ca5dc082e2bc6c47000a2ca0f5ee7abb47105f5b1bf98cb76723287416de0a767ea63c18f87964df7f3982c7258fe1208afa22cff0378ae3509d9eb  Net-IP-1.26.tar.gz
+"
diff --git a/main/perl-net-libidn/APKBUILD b/main/perl-net-libidn/APKBUILD
index a18ce06361c..fd9f9f56198 100644
--- a/main/perl-net-libidn/APKBUILD
+++ b/main/perl-net-libidn/APKBUILD
@@ -1,31 +1,35 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-net-libidn
-_realname=Net-LibIDN
+_pkgreal=Net-LibIDN
 pkgver=0.12
-pkgrel=8
+pkgrel=15
 pkgdesc="Perl bindings for GNU Libidn"
 url="http://www.net-dns.org/"
 arch="all"
-license="Artistic-Perl-1.0 GPL+"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
 makedepends="libidn-dev perl-dev"
-install=""
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/T/TH/THOR/$_realname-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/T/TH/THOR/Net-LibIDN-$pkgver.tar.gz"
+
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_realname-$pkgver"
 build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
-        # creates file collision among perl modules
+	# creates file collision among perl modules
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="2c80d0e3d4635e225e8866a1ef6335e3b8642662101e89fde6529aa07acc1eaf8adbe20fadd1d44898651f9d67a3d00c11ff71a22a2aa3027e81643e700d79ee  Net-LibIDN-0.12.tar.gz"
+sha512sums="
+2c80d0e3d4635e225e8866a1ef6335e3b8642662101e89fde6529aa07acc1eaf8adbe20fadd1d44898651f9d67a3d00c11ff71a22a2aa3027e81643e700d79ee  Net-LibIDN-0.12.tar.gz
+"
diff --git a/main/perl-net-openssh/APKBUILD b/main/perl-net-openssh/APKBUILD
index 284e671f934..4030dce4774 100644
--- a/main/perl-net-openssh/APKBUILD
+++ b/main/perl-net-openssh/APKBUILD
@@ -1,40 +1,32 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-net-openssh
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Net-OpenSSH
-pkgver=0.78
-pkgrel=0
+pkgver=0.84
+pkgrel=1
 pkgdesc="Perl SSH client package implemented on top of OpenSSH"
-url="https://search.cpan.org/dist/Net-OpenSSH/"
+options="!check" # make test is interactive
+url="https://metacpan.org/release/Net-OpenSSH/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 subpackages="$pkgname-doc"
-source="https://search.cpan.org/CPAN/authors/id/S/SA/SALVA/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+source="https://cpan.metacpan.org/authors/id/S/SA/SALVA/Net-OpenSSH-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
-	# make test is interactive
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="5130b9fa0963955397c2fcbf2c317f42bb3a8c181e2d2a73d58b901ff9a9bfb477322fd6b80134f1e67c4c6f661978ffb214317686ab6d8e38a13558d9156307  Net-OpenSSH-0.78.tar.gz"
+sha512sums="
+eae50ddc609654432c77080dbfd1dbfd76a7651a1a4e85c0a0f01547b329761a6676faabec931a3b4ff5c74bfa4f529cf649249ad57e73305e67b33da891a555  Net-OpenSSH-0.84.tar.gz
+"
diff --git a/main/perl-net-rblclient/APKBUILD b/main/perl-net-rblclient/APKBUILD
index 875da831148..32a67da9bfe 100644
--- a/main/perl-net-rblclient/APKBUILD
+++ b/main/perl-net-rblclient/APKBUILD
@@ -1,33 +1,28 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer:  Michael Mason <ms13sp@gmail.com>
+# Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=perl-net-rblclient
-_realname=Net-RBLClient
+_pkgreal=Net-RBLClient
 pkgver=0.5
-pkgrel=4
+pkgrel=8
 pkgdesc="Queries multiple Realtime Blackhole Lists in parallel"
 url="https://metacpan.org/release/Net-RBLClient/"
 arch="noarch"
-license="Artistic GPL-2.0"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
-install=
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/A/AB/ABLUM/$_realname-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/A/AB/ABLUM/Net-RBLClient-$pkgver.tar.gz"
 builddir="$srcdir/RBLCLient-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$srcdir/RBLCLient-$pkgver"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
diff --git a/main/perl-net-server/APKBUILD b/main/perl-net-server/APKBUILD
index 00d63f8dca6..d3bfabd7c9d 100644
--- a/main/perl-net-server/APKBUILD
+++ b/main/perl-net-server/APKBUILD
@@ -1,41 +1,37 @@
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-net-server
-_realname=Net-Server
-pkgver=2.009
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Net-Server
+pkgver=2.014
 pkgrel=2
-pkgdesc="Extensible, general Perl server engine"
+pkgdesc="Extensible Perl internet server"
 url="https://metacpan.org/release/Net-Server/"
 arch="noarch"
-license="Artistic-1.0 GPL+"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
 makedepends="perl-dev"
-install=
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RH/RHANDOM/$_realname-$pkgver.tar.gz"
-builddir="$srcdir/$_realname-$pkgver"
-
-prepare() {
-	cd "$builddir"
-        export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+source="https://cpan.metacpan.org/authors/id/R/RH/RHANDOM/Net-Server-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
-        export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-        find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="36409f8d2478877c68cbfcbe9c08045b0c24a926b64f022faf3de8f4b4369ff417d5c41ff1e9800553c38da29c6d72ef301119c956cb26439f6b6366ff4b459c  Net-Server-2.009.tar.gz"
+sha512sums="
+6b1bbfeed13af5f9dba76873899e162497234b5cc8fc08bf749fd86e0377bd9184a9807df61f27645634d0ff8d8e6c8c14b700b3d283fbbb7d1d844e6608c9c2  Net-Server-2.014.tar.gz
+"
diff --git a/main/perl-net-smtp-ssl/APKBUILD b/main/perl-net-smtp-ssl/APKBUILD
index b62d7ebd6ad..f48cd6f4465 100644
--- a/main/perl-net-smtp-ssl/APKBUILD
+++ b/main/perl-net-smtp-ssl/APKBUILD
@@ -1,44 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-net-smtp-ssl
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Net-SMTP-SSL
 pkgver=1.04
-pkgrel=1
+pkgrel=4
 pkgdesc="SSL support for Net::SMTP"
 url="https://metacpan.org/release/Net-SMTP-SSL/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-io-socket-ssl perl-net-ssleay"
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-io-socket-ssl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Net-SMTP-SSL-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="dfbf59e5d895add19f5684c999c941ab56a58be39492a02e5a9bdac47039bf388279eda734c6b0422d228ac14efed899b3572561e6a34cfd9582423252efb509  Net-SMTP-SSL-1.04.tar.gz"
+sha512sums="
+dfbf59e5d895add19f5684c999c941ab56a58be39492a02e5a9bdac47039bf388279eda734c6b0422d228ac14efed899b3572561e6a34cfd9582423252efb509  Net-SMTP-SSL-1.04.tar.gz
+"
diff --git a/main/perl-net-smtp-tls-butmaintained/APKBUILD b/main/perl-net-smtp-tls-butmaintained/APKBUILD
index 42d6e38f5e8..fb72ba91a2f 100644
--- a/main/perl-net-smtp-tls-butmaintained/APKBUILD
+++ b/main/perl-net-smtp-tls-butmaintained/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=perl-net-smtp-tls-butmaintained
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Net-SMTP-TLS-ButMaintained
 pkgver=0.24
-pkgrel=1
+pkgrel=4
 pkgdesc="An SMTP client supporting TLS and AUTH (DEPRECATED, use Net::SMTPS instead)"
 url="https://metacpan.org/release/Net-SMTP-TLS-ButMaintained/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-net-ssleay perl-io-socket-ssl perl-digest-hmac"
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-net-ssleay perl-io-socket-ssl perl-digest-hmac"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/F/FA/FAYLAND/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="28c5145ed5a3ce2beecbe95dde33c6892a4384102f0fe7c795bc92206e34257cae5c993e8c748b462c87a494eab399e45e56737bc3c424aa155613bbee2e4588  Net-SMTP-TLS-ButMaintained-0.24.tar.gz"
+sha512sums="
+28c5145ed5a3ce2beecbe95dde33c6892a4384102f0fe7c795bc92206e34257cae5c993e8c748b462c87a494eab399e45e56737bc3c424aa155613bbee2e4588  Net-SMTP-TLS-ButMaintained-0.24.tar.gz
+"
diff --git a/main/perl-net-snmp/APKBUILD b/main/perl-net-snmp/APKBUILD
index dc30405b7cb..576e021d333 100644
--- a/main/perl-net-snmp/APKBUILD
+++ b/main/perl-net-snmp/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-net-snmp
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Net-SNMP
 pkgver=6.0.1
-pkgrel=3
+pkgrel=8
 pkgdesc="Object oriented interface to SNMP"
 url="https://metacpan.org/release/Net-SNMP/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends perl-crypt-des perl-crypt-rijndael perl-digest-sha1"
-makedepends="perl-dev perl-module-build $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DT/DTOWN/$_pkgreal-v$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/D/DT/DTOWN/Net-SNMP-v$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-v$pkgver"
 
-_builddir="$srcdir/$_pkgreal-v$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	perl Build.PL installdirs=vendor || return 1
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-		export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	# test fails for some reason
-	./Build #&& ./Build test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	./Build install destdir="$pkgdir" || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="5e38d4a934661201d42fd4a2d08aeca8c4522e0e430303eec7af38d16ea0aee131a4ec563bf87874376fe4995a674a24451f2a12b71a9c51ed3632e6f65314df  Net-SNMP-v6.0.1.tar.gz"
+sha512sums="
+5e38d4a934661201d42fd4a2d08aeca8c4522e0e430303eec7af38d16ea0aee131a4ec563bf87874376fe4995a674a24451f2a12b71a9c51ed3632e6f65314df  Net-SNMP-v6.0.1.tar.gz
+"
diff --git a/main/perl-net-snpp/APKBUILD b/main/perl-net-snpp/APKBUILD
index c3e57ad58db..cd79cbb0c20 100644
--- a/main/perl-net-snpp/APKBUILD
+++ b/main/perl-net-snpp/APKBUILD
@@ -1,33 +1,35 @@
 # Contributor:  Jeff Bilyk <jbilyk@gmail.com>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-net-snpp
-_realname=Net-SNPP
+_pkgreal=Net-SNPP
 pkgver=1.17
-pkgrel=3
+pkgrel=7
 pkgdesc="Perl Simple Network Pager Protocol Client"
-url="http://search.cpan.org/~tobeya/"
+url="https://metacpan.org/dist/Net-SNPP"
 arch="noarch"
-license="GPL PerlArtistic"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+options="!check" # fixme: failing tests
 depends="perl"
-makedepends="perl-dev"
-install=
-subpackages=""
-source="https://cpan.metacpan.org/authors/id/T/TO/TOBEYA/$_realname-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/T/TO/TOBEYA/Net-SNPP-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_realname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd $_builddir
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd $_builddir
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 
 }
 
-sha512sums="aa1e47736226cc528513f5339579aa20f1aabbc5c0ddee2e4ca24beb0f797f50805fcf547fc6b8d0564be9331256706894d2619ee5a32c574a21d3738d86dcda  Net-SNPP-1.17.tar.gz"
+sha512sums="
+aa1e47736226cc528513f5339579aa20f1aabbc5c0ddee2e4ca24beb0f797f50805fcf547fc6b8d0564be9331256706894d2619ee5a32c574a21d3738d86dcda  Net-SNPP-1.17.tar.gz
+"
diff --git a/main/perl-net-ssleay/APKBUILD b/main/perl-net-ssleay/APKBUILD
index e60e7fcb79b..973a91f1dde 100644
--- a/main/perl-net-ssleay/APKBUILD
+++ b/main/perl-net-ssleay/APKBUILD
@@ -1,37 +1,36 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-net-ssleay
-_realname=Net-SSLeay
-pkgver=1.88
+_pkgreal=Net-SSLeay
+pkgver=1.94
 pkgrel=0
 pkgdesc="Perl extension for using OpenSSL"
 url="https://metacpan.org/release/Net-SSLeay"
 arch="all"
 license="Artistic-2.0"
 depends="perl"
-makedepends="perl-dev openssl-dev zlib-dev"
+makedepends="perl-dev openssl-dev>3 zlib-dev"
 checkdepends="perl-test-exception perl-test-warn perl-test-nowarnings"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-$pkgver.tar.gz"
-builddir="$srcdir/$_realname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	# creates file collision among perl modules
-	find "$pkgdir" -name perllocal.pod -delete
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="37fc32ec003337f3dc18bf928139079a3127628c6fa0fccaed0c27b6bf3b216c2c5338ed1aaf9408b0add3be549df3218d3c5a6d6299793c1329d8a0813a1682  Net-SSLeay-1.88.tar.gz"
+sha512sums="
+f1461667269f3da56ff7e1724b5511b95c34582250f8336e9f93d30f3b30d4a5360eb27622b9730bba11df75e00d717c7f0cea2120d20206723db136a8509375  Net-SSLeay-1.94.tar.gz
+"
diff --git a/main/perl-net-telnet/APKBUILD b/main/perl-net-telnet/APKBUILD
index dcbda39f93b..ca4f4b8e0ed 100644
--- a/main/perl-net-telnet/APKBUILD
+++ b/main/perl-net-telnet/APKBUILD
@@ -1,37 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-net-telnet
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Net-Telnet
-pkgver=3.04
+pkgver=3.05
 pkgrel=1
 pkgdesc="Interact with TELNET port or other TCP ports"
 url="https://metacpan.org/release/Net-Telnet/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/J/JR/JROGERS/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/J/JR/JROGERS/Net-Telnet-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="1df68f55ad94d42e5e2be5e0669c2ecd0bc916f4ed929453ee2d136141ce413ff84b883d488c2f815c2c43132f7c3b36178177072fc5172c292e7bc39351dbdc  Net-Telnet-3.04.tar.gz"
+sha512sums="
+3864e2e6f2fb314d2d80c37597dddc0f4fe6b50c3ec96be3d823667929852fadefd0572945b3b442afe8da451fb279ad335762eeb7d328ad7f8777d3bd8e5a74  Net-Telnet-3.05.tar.gz
+"
diff --git a/main/perl-netaddr-ip/APKBUILD b/main/perl-netaddr-ip/APKBUILD
index 78ca2c4195a..8ce665d209b 100644
--- a/main/perl-netaddr-ip/APKBUILD
+++ b/main/perl-netaddr-ip/APKBUILD
@@ -1,34 +1,34 @@
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-netaddr-ip
-_realname=NetAddr-IP
+_pkgreal=NetAddr-IP
 pkgver=4.079
-pkgrel=4
+pkgrel=12
 pkgdesc="Perl extension for managing IPv4 and IPv6 addresses and subnets"
-url="http://search.cpan.org/~miker/NetAddr-IP-$pkgver/"
+url="https://metacpan.org/dist/NetAddr-IP"
 arch="all"
-license="GPL-2.0 and Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
 makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/M/MI/MIKER/$_realname-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/M/MI/MIKER/NetAddr-IP-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_realname-$pkgver"
-prepare() {
-	return 0
-}
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd $_builddir
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd $_builddir
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="8ebc8ffb914cf72c041441f96de0e9c982eebdb8c26dbf15f885d0113b3634e4851d81f13f555c14d1fdf0ab95ae2ce880ed124e6c200e391adae3b1d6d3eb65  NetAddr-IP-4.079.tar.gz"
+sha512sums="
+8ebc8ffb914cf72c041441f96de0e9c982eebdb8c26dbf15f885d0113b3634e4851d81f13f555c14d1fdf0ab95ae2ce880ed124e6c200e391adae3b1d6d3eb65  NetAddr-IP-4.079.tar.gz
+"
diff --git a/main/perl-package-anon/APKBUILD b/main/perl-package-anon/APKBUILD
index e4ea699e1a5..75cef37e1dd 100644
--- a/main/perl-package-anon/APKBUILD
+++ b/main/perl-package-anon/APKBUILD
@@ -1,38 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-package-anon
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Package-Anon
 pkgver=0.05
-pkgrel=8
+pkgrel=14
 pkgdesc="Anonymous packages"
 url="https://metacpan.org/release/Package-Anon/"
 arch="all"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpanmakedepends="perl-sub-exporter"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+depends="perl"
+makedepends="perl-dev"
+checkdepends="perl-sub-exporter"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/A/AU/AUGGY/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/A/AU/AUGGY/Package-Anon-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$builddir"
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make && make test
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="73adf4eb8348ad51e678d7d777f7c13599eaaa53e776a35df768ee1afcf781801c980c786c658addad80ae5fe852fefb3600722ea7b02d928653543aa28d9d51  Package-Anon-0.05.tar.gz"
+sha512sums="
+73adf4eb8348ad51e678d7d777f7c13599eaaa53e776a35df768ee1afcf781801c980c786c658addad80ae5fe852fefb3600722ea7b02d928653543aa28d9d51  Package-Anon-0.05.tar.gz
+"
diff --git a/main/perl-package-deprecationmanager/APKBUILD b/main/perl-package-deprecationmanager/APKBUILD
index add4b212aa3..f64d11e998d 100644
--- a/main/perl-package-deprecationmanager/APKBUILD
+++ b/main/perl-package-deprecationmanager/APKBUILD
@@ -1,38 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-package-deprecationmanager
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Package-DeprecationManager
-pkgver=0.17
+pkgver=0.18
 pkgrel=1
 pkgdesc="Manage deprecation warnings for your distribution"
 url="https://metacpan.org/release/Package-DeprecationManager/"
 arch="noarch"
 license="Artistic-2.0"
-cpandepends="perl-list-moreutils perl-sub-install perl-params-util perl-test-fatal
-	perl-test-requires perl-package-stash perl-test-warnings perl-sub-name"
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+depends="perl perl-sub-install perl-params-util perl-package-stash"
+makedepends="perl-dev"
+checkdepends="perl-test-fatal perl-test-warnings"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Package-DeprecationManager-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="57bf79df657895342ca5b8d13f155d85f34d1a85415570b112138b6c50c5d08b421a1707671fbf807918cc334006e4558a626a7201c60096924fc2200c751cde  Package-DeprecationManager-0.17.tar.gz"
+sha512sums="
+e0e34fd9b90d0266d782b85fe9a74c4bde217009488c75143c0ef2114d8c53f58a01c34214909705628c3816267b288b1b05d341fa8fae7a3fcc6bbdbf2f6031  Package-DeprecationManager-0.18.tar.gz
+"
diff --git a/main/perl-package-stash-xs/APKBUILD b/main/perl-package-stash-xs/APKBUILD
index eae10ec9032..ec2d34c029a 100644
--- a/main/perl-package-stash-xs/APKBUILD
+++ b/main/perl-package-stash-xs/APKBUILD
@@ -1,39 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-package-stash-xs
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Package-Stash-XS
-pkgver=0.29
+pkgver=0.30
 pkgrel=3
-pkgdesc="faster and more correct implementation of the Package::Stash API"
+pkgdesc="Faster and more correct implementation of the Package::Stash API"
 url="https://metacpan.org/release/Package-Stash-XS/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="perl-test-requires perl-test-fatal perl-yaml
-	perl-module-runtime perl-sub-name perl-pod-coverage"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="perl-package-anon"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
+checkdepends="perl-test-needs perl-test-fatal"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Package-Stash-XS-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="f7afcf1a67915d9990a8d63e418ebc6b6b48947b90a72a454b8197656233d8cc976f72d44e4179621628e52fa7ab9a9a74f18f95ad1999d3f45181531ed44849  Package-Stash-XS-0.29.tar.gz"
+sha512sums="
+528faaefa71c5c37d378a9bedf325babf3b2717024995d166fc77bb1fb1ce1aed11da775608029a1c215c903dcd7ac9f68569cd8fd3690681ccd72b47c51b0a3  Package-Stash-XS-0.30.tar.gz
+"
diff --git a/main/perl-package-stash/APKBUILD b/main/perl-package-stash/APKBUILD
index 51eaafa8d8e..b8d9bc4bc2d 100644
--- a/main/perl-package-stash/APKBUILD
+++ b/main/perl-package-stash/APKBUILD
@@ -1,37 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-package-stash
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Package-Stash
-pkgver=0.38
-pkgrel=2
-pkgdesc="routines for manipulating stashes"
+pkgver=0.40
+pkgrel=1
+pkgdesc="Routines for manipulating stashes"
 url="https://metacpan.org/release/Package-Stash/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends="perl-dist-checkconflicts perl-package-stash-xs perl-module-implementation"
-cpanmakedepends="perl-test-fatal perl-test-requires perl-yaml perl-sub-name"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="perl-package-anon"
+depends="perl perl-dist-checkconflicts perl-module-implementation"
+checkdepends="perl-test-fatal perl-test-needs perl-cpan-meta-check"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Package-Stash-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="4846953a845727d2b987a4625fc96e18c7d68a365ac8dbacfa21388b0a063ebac9c91e43190dc4f91af4b3adca508b32a6c7ec18213096622162c06c11cbb611  Package-Stash-0.38.tar.gz"
+sha512sums="
+1a1e358c8409ba0bcc2fee9b3cc86b6cd42297c9bd0641a57872bec498567ee18075ad71f7e79bb9b3a789cb47ebbf852163886f8babaf3aa23e7ff9eb2e7080  Package-Stash-0.40.tar.gz
+"
diff --git a/main/perl-parallel-forkmanager/APKBUILD b/main/perl-parallel-forkmanager/APKBUILD
new file mode 100644
index 00000000000..c20a076e38b
--- /dev/null
+++ b/main/perl-parallel-forkmanager/APKBUILD
@@ -0,0 +1,38 @@
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
+pkgname=perl-parallel-forkmanager
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Parallel-ForkManager
+pkgver=2.02
+pkgrel=5
+pkgdesc="A simple parallel processing fork manager"
+url="https://metacpan.org/release/Parallel-ForkManager/"
+arch="noarch"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-moo"
+makedepends="perl-dev"
+checkdepends="perl-test-warn"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/Y/YA/YANICK/Parallel-ForkManager-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="
+2b390ec8f252e7bf2b6be8d602b231b1fd347bc5256bf7f16a6d56f67256938f3d96b7a28c92c662d8b91441b7fa4cb5922c655e64a7a4a9332eb58f19b6bcfb  Parallel-ForkManager-2.02.tar.gz
+"
diff --git a/main/perl-params-classify/APKBUILD b/main/perl-params-classify/APKBUILD
index d98735c2883..7fe431dd9cb 100644
--- a/main/perl-params-classify/APKBUILD
+++ b/main/perl-params-classify/APKBUILD
@@ -1,38 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-params-classify
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Params-Classify
 pkgver=0.015
-pkgrel=3
+pkgrel=9
 pkgdesc="argument type classification"
 url="https://metacpan.org/release/Params-Classify/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build
-perl-test-pod-coverage perl-test-pod"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/Params-Classify-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	perl Build.PL installdirs=vendor || return 1
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
 }
 
 check() {
-	cd "$builddir"
-	./Build && ./Build test
+	./Build test
 }
 
 package() {
-	cd "$builddir"
-	./Build install destdir="$pkgdir" || return 1
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="1c41590a3f06d21d5f23e12371b0aee5d4249f773bfb0738e955fbdccdccc6e495744c50d3b91305a6b470e022475446705c8eb8e8d05ca1ed037d369a67617c  Params-Classify-0.015.tar.gz"
+sha512sums="
+1c41590a3f06d21d5f23e12371b0aee5d4249f773bfb0738e955fbdccdccc6e495744c50d3b91305a6b470e022475446705c8eb8e8d05ca1ed037d369a67617c  Params-Classify-0.015.tar.gz
+"
diff --git a/main/perl-params-util/APKBUILD b/main/perl-params-util/APKBUILD
index 9b8b6b27615..3af26c588a2 100644
--- a/main/perl-params-util/APKBUILD
+++ b/main/perl-params-util/APKBUILD
@@ -1,41 +1,36 @@
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-params-util
-pkgver=1.07
-pkgrel=8
-pkgdesc="Params::Util perl module"
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Params-Util
+pkgver=1.102
+pkgrel=4
+pkgdesc="Simple, compact and correct param-checking functions"
 url="https://metacpan.org/release/Params-Util/"
 arch="all"
-license="GPL-2.0 or Artistic"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
-install=""
+makedepends="perl-dev perl-config-autoconf"
+checkdepends="perl-test-leaktrace"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/A/AD/ADAMK/Params-Util-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/R/RE/REHSACK/Params-Util-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir"/Params-Util-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	unset CFLAGS
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
-	make test || return 1
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="ff471b01b33414fc5e1c68d97c21171a95d3418c33e3c45f9910cc768898690e35051506a83ad9403a200336654c14b8efc9d471c4b3fe3321047a7603d6fd56  Params-Util-1.07.tar.gz"
+sha512sums="e2587b62545cf0572cc8f719ea8e5411d710789c3cbcab4038c5b01f86073a010d32191551f6aeea1bdae22d49e7d34358250b4e7ece9f261a598854af187194  Params-Util-1.102.tar.gz"
diff --git a/main/perl-params-validate/APKBUILD b/main/perl-params-validate/APKBUILD
index 196d8018aa8..02538320a5b 100644
--- a/main/perl-params-validate/APKBUILD
+++ b/main/perl-params-validate/APKBUILD
@@ -1,43 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-params-validate
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Params-Validate
-pkgver=1.29
-pkgrel=3
+pkgver=1.31
+pkgrel=2
 pkgdesc="Validate method/function parameters"
 url="https://metacpan.org/release/Params-Validate/"
 arch="all"
 license="Artistic-2.0"
-cpandepends="perl-module-implementation"
-cpanmakedepends="perl-test-fatal perl-module-implementation perl-test-requires"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+depends="perl perl-module-implementation"
+makedepends="perl-dev perl-module-build"
+checkdepends="perl-test-requires perl-test-fatal"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Params-Validate-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	perl Build.PL installdirs=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
 	./Build
 }
 
 check() {
-	cd "$builddir"
 	./Build test
 }
 
 package() {
-	cd "$builddir"
-	./Build install destdir="$pkgdir"
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="afa887d1ce60d38b82cbf3ad88fb892f473e0fa45db528b68e66bbb800058af453180cc96afddae56a2cdad8ec531a587e7aac36b6869c489caa6dd36a57a385  Params-Validate-1.29.tar.gz"
+sha512sums="
+8b20db8725df35b4dd9201dea764254d993cfa8a73b2ccebd7a9ba492cde36b589f66c26b287fe2f0ec1ebfafd53872cd164bee1727d1453265e030a927556d9  Params-Validate-1.31.tar.gz
+"
diff --git a/main/perl-params-validationcompiler/APKBUILD b/main/perl-params-validationcompiler/APKBUILD
index 17b96642ab2..99c85c1450a 100644
--- a/main/perl-params-validationcompiler/APKBUILD
+++ b/main/perl-params-validationcompiler/APKBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-params-validationcompiler
 _pkgreal=Params-ValidationCompiler
-pkgver=0.30
-pkgrel=0
+pkgver=0.31
+pkgrel=1
 pkgdesc="Params::ValidationCompiler perl module"
 url="https://metacpan.org/release/Params-ValidationCompiler"
 arch="noarch"
 license="Artistic-2.0"
-depends="perl-specio perl-test2-suite perl-test-simple perl-test-without-module
-	perl-eval-closure perl-exception-class perl-test2-plugin-nowarnings
-	perl-role-tiny perl-mro-compat"
-makedepends="perl-dev"
+depends="
+	perl perl-specio perl-test2-suite perl-test-simple perl-test-without-module perl-eval-closure
+	perl-exception-class perl-test2-plugin-nowarnings perl-role-tiny perl-mro-compat
+	"
 checkdepends="perl-type-tiny"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-$pkgver.tar.gz"
@@ -18,20 +18,19 @@ source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Params-ValidationCompi
 builddir="$srcdir"/$_pkgreal-$pkgver
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="5911f9317f0b72e17c72435420a3b6b9f36780ab70715510c46e847970094e730169b9b3085f29cb23ee0aca2e78f7f9edd0d093859a1062869f35c90172bf05  Params-ValidationCompiler-0.30.tar.gz"
+sha512sums="
+e3265cc6a5fc9761dd6ae82c3875711c5766242ab0f1edd74cc74296fdac22b6c23e48ba4768e895701ca8a00bd81677056713124b8edaa0b340eae1b33cf9c4  Params-ValidationCompiler-0.31.tar.gz
+"
diff --git a/main/perl-parse-recdescent/APKBUILD b/main/perl-parse-recdescent/APKBUILD
index 9e54789ed85..cecf19f18a9 100644
--- a/main/perl-parse-recdescent/APKBUILD
+++ b/main/perl-parse-recdescent/APKBUILD
@@ -1,42 +1,40 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-parse-recdescent
-_realname=Parse-RecDescent
+_pkgreal=Parse-RecDescent
 pkgver=1.967015
-pkgrel=2
+pkgrel=6
 pkgdesc="Generate Recursive-Descent Parsers"
-url="http://search.cpan.org/~dconway/Parse-RecDescent-1.96.0/"
+url="https://metacpan.org/dist/Parse-RecDescent"
 arch="noarch"
-license="Artistic-Perl-1.0 GPL+"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
 checkdepends="perl-test-pod perl-test-warn"
-install=
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/J/JT/JTBRAUN/$_realname-$pkgver.tar.gz"
-builddir="$srcdir/$_realname-$pkgver"
+source="https://cpan.metacpan.org/authors/id/J/JT/JTBRAUN/Parse-RecDescent-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+	default_prepare
+
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make || return 1
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	cd "$builddir"
-	make test
-}
-
-sha512sums="38adbfc9a88f09d0465d862b845f48c0921ce462ffccaa7ce8b5f1b7090f33f70e7f00f9ee787fd698b5539804412c44f03e7942cf675d53a17a84c3510e5aa4  Parse-RecDescent-1.967015.tar.gz"
+sha512sums="
+38adbfc9a88f09d0465d862b845f48c0921ce462ffccaa7ce8b5f1b7090f33f70e7f00f9ee787fd698b5539804412c44f03e7942cf675d53a17a84c3510e5aa4  Parse-RecDescent-1.967015.tar.gz
+"
diff --git a/main/perl-parse-syslog/APKBUILD b/main/perl-parse-syslog/APKBUILD
index 8ffe0415744..53f77bf89d9 100644
--- a/main/perl-parse-syslog/APKBUILD
+++ b/main/perl-parse-syslog/APKBUILD
@@ -1,17 +1,16 @@
 # Automatically generated by apkbuild-cpan, template 3
 # Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer:  Michael Mason <ms13sp@gmail.com>
+# Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=perl-parse-syslog
 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Parse-Syslog
 pkgver=1.10
-pkgrel=5
+pkgrel=7
 pkgdesc="Perl module for Parse-Syslog"
 url="https://metacpan.org/release/Parse-Syslog/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/D/DS/DSCHWEI/Parse-Syslog-$pkgver.tar.gz
 	remove-locale-tests.patch"
diff --git a/main/perl-parse-yapp/APKBUILD b/main/perl-parse-yapp/APKBUILD
index e52ce749826..d32138445eb 100644
--- a/main/perl-parse-yapp/APKBUILD
+++ b/main/perl-parse-yapp/APKBUILD
@@ -3,12 +3,12 @@
 pkgname=perl-parse-yapp
 _pkgreal=Parse-Yapp
 pkgver=1.21
-pkgrel=0
+pkgrel=3
 pkgdesc="Perl module for Parse-Yapp"
 url="https://metacpan.org/release/Parse-Yapp/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-makedepends="perl-dev"
+depends="perl"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/W/WB/WBRASWELL/Parse-Yapp-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/main/perl-path-class/APKBUILD b/main/perl-path-class/APKBUILD
index 3989f14bc32..587ff78c140 100644
--- a/main/perl-path-class/APKBUILD
+++ b/main/perl-path-class/APKBUILD
@@ -1,38 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-path-class
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Path-Class
 pkgver=0.37
-pkgrel=1
+pkgrel=4
 pkgdesc="Cross-platform path specification manipulation"
 url="https://metacpan.org/release/Path-Class/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/K/KW/KWILLIAMS/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/K/KW/KWILLIAMS/Path-Class-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	perl Build.PL installdirs=vendor || return 1
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
 }
 
-build() {
-	cd "$_builddir"
-		export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	./Build && ./Build test
+check() {
+	./Build test
 }
 
 package() {
-	cd "$_builddir"
-	./Build install destdir="$pkgdir" || return 1
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="044d86f85eebff96bdff8fc11e97884eb4e06d56ecd2d3bfdc045135da6f08c40e644e0e5c1a779a8ef5d6c7c04e159e47721b4e637a92fed7d298b5f798ef83  Path-Class-0.37.tar.gz"
+sha512sums="
+044d86f85eebff96bdff8fc11e97884eb4e06d56ecd2d3bfdc045135da6f08c40e644e0e5c1a779a8ef5d6c7c04e159e47721b4e637a92fed7d298b5f798ef83  Path-Class-0.37.tar.gz
+"
diff --git a/main/perl-path-tiny/APKBUILD b/main/perl-path-tiny/APKBUILD
index 1f631fbd000..b24a68a3a41 100644
--- a/main/perl-path-tiny/APKBUILD
+++ b/main/perl-path-tiny/APKBUILD
@@ -1,33 +1,29 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-path-tiny
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Path-Tiny
-pkgver=0.112
-pkgrel=0
+pkgver=0.144
+pkgrel=1
 pkgdesc="File path utility"
-url="https://metacpan.org/release/Path-Tiny"
+url="https://metacpan.org/release/Path-Tiny/"
 arch="noarch"
 license="Apache-2.0"
 depends="perl"
-makedepends="perl-dev perl-test-mockrandom perl-test-failwarnings"
+checkdepends="perl-test-failwarnings perl-test-mockrandom"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Path-Tiny-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -36,4 +32,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="c387192fc42a78aee506fa332fd9fcd385fbc28fed02bc41b9c50e4cff6c65700ad3fd9d840871ef3bf7a8029719d8fd8b84f993ac816ff65c8d4e2203ad3b3f  Path-Tiny-0.112.tar.gz"
+sha512sums="
+a6360ff3c81dac6026a7610b4934a415db04060a7792e37d38eec6f7b46970eeb42840da25fc0b4eab21eaa7b5f011c6d92ba5382dcea49e57e4fc693c4620d5  Path-Tiny-0.144.tar.gz
+"
diff --git a/main/perl-pathtools/APKBUILD b/main/perl-pathtools/APKBUILD
index 40501d48838..d08032c2b5f 100644
--- a/main/perl-pathtools/APKBUILD
+++ b/main/perl-pathtools/APKBUILD
@@ -1,44 +1,40 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-pathtools
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=PathTools
 pkgver=3.75
-pkgrel=3
-pkgdesc="The combined distribution for the File::Spec and Cwd modules"
+pkgrel=10
+pkgdesc="Tools for working with directory and file names"
 url="https://metacpan.org/release/PathTools/"
 arch="all"
-license="GPL PerlArtistic"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX/$_pkgreal-$pkgver.tar.gz"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
+source="https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX/PathTools-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+options="!check" # need updating for perl 5.38
 
 build() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
-	 make test
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
 
-doc() {
-	default_doc
-	replaces="perl-doc"
+	# man pages are already provided by perl-doc
+	rm -rf "$pkgdir"/usr/share/man
 }
 
-sha512sums="bab592a64df391a50b70717cd5fa042ca395e83790dbc447abd72ef81f0e7caf7b8ce1158102d77d470765c572e6773cd907e4884532350bd2f15da667b9a993  PathTools-3.75.tar.gz"
+sha512sums="
+bab592a64df391a50b70717cd5fa042ca395e83790dbc447abd72ef81f0e7caf7b8ce1158102d77d470765c572e6773cd907e4884532350bd2f15da667b9a993  PathTools-3.75.tar.gz
+"
diff --git a/main/perl-php-serialization/APKBUILD b/main/perl-php-serialization/APKBUILD
index c27e987d3d2..b08723aaf60 100644
--- a/main/perl-php-serialization/APKBUILD
+++ b/main/perl-php-serialization/APKBUILD
@@ -1,32 +1,34 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-php-serialization
-_realname=PHP-Serialization
+_pkgreal=PHP-Serialization
 pkgver=0.34
-pkgrel=2
+pkgrel=6
 pkgdesc="Simple flexible means of converting the output of PHP's serialize() into the equivalent Perl memory structure, and vice versa."
-url="http://search.cpan.org/~bobtfish/PHP-Serialization-$pkgver"
+url="https://metacpan.org/dist/PHP-Serialization"
 arch="noarch"
-license="GPL PerlArtistic"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
-install=
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/B/BO/BOBTFISH/$_realname-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/B/BO/BOBTFISH/PHP-Serialization-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_realname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd $_builddir
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd $_builddir
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="72218973f21ab71419751cf818e6bd998235aa74bf8ae60ec4a6080ba169d0d7fcefde4f433ce3f6f30ed3084a651deb8aa3a5dd818fc6ebf3fb6188def4efe7  PHP-Serialization-0.34.tar.gz"
+sha512sums="
+72218973f21ab71419751cf818e6bd998235aa74bf8ae60ec4a6080ba169d0d7fcefde4f433ce3f6f30ed3084a651deb8aa3a5dd818fc6ebf3fb6188def4efe7  PHP-Serialization-0.34.tar.gz
+"
diff --git a/main/perl-plack/APKBUILD b/main/perl-plack/APKBUILD
deleted file mode 100644
index f77f4968ea2..00000000000
--- a/main/perl-plack/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=perl-plack
-_pkgreal=Plack
-pkgver=1.0047
-pkgrel=0
-pkgdesc="Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"
-url="https://plackperl.org/"
-arch="noarch"
-license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl perl-file-sharedir perl-filesys-notify-simple perl-devel-stacktrace
-	perl-stream-buffered perl-uri perl-devel-stacktrace-ashtml perl-http-body
-	perl-test-tcp perl-try-tiny perl-apache-logformat-compiler
-	perl-hash-multivalue perl-http-message"
-makedepends="perl-dev perl-test-requires perl-file-sharedir-install"
-subpackages="$pkgname-doc"
-options="!check" # missing dependencies
-source="https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA/Plack-$pkgver.tar.gz"
-
-builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
-build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
-}
-
-check() {
-	make test
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-sha512sums="95fa7b7c1cc4d94bc077e69b52a6555e6f62e0119a29cb932f554e70a3466e8bb416b5a8e02c2a11c45f60e87fd01ed469c80a1c19c1a2eba7ba5ad2263e994c  Plack-1.0047.tar.gz"
diff --git a/main/perl-pod-coverage/APKBUILD b/main/perl-pod-coverage/APKBUILD
index ec9f2d025cb..1cce09d8c9b 100644
--- a/main/perl-pod-coverage/APKBUILD
+++ b/main/perl-pod-coverage/APKBUILD
@@ -1,37 +1,32 @@
 # Contributor: Mika Havela <mika.havela@gmail.com>
 # Maintainer: Mika Havela <mika.havela@gmail.com>
 pkgname=perl-pod-coverage
-_realname=Pod-Coverage
+_pkgreal=Pod-Coverage
 pkgver=0.23
-pkgrel=1
+pkgrel=6
 pkgdesc="Perl - Checks if the documentation of a module is comprehensive"
-url="http://search.cpan.org/~rclamp/$_realname-$pkgver/"
+url="https://metacpan.org/dist/Pod-Coverage"
 arch="noarch"
-license="Artistic GPL"
-depends="perl perl-devel-symdump perl-test-pod"
-makedepends="perl-dev"
-install=
-#subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/$_realname-$pkgver.tar.gz"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
+depends="perl perl-devel-symdump perl-test-pod perl-pod-parser"
+source="https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/Pod-Coverage-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_realname-$pkgver"
-
-prepare() {
-	cd "$_builddir"
+build() {
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
-	make test || return 1
+check() {
+	make test
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="64760bcaf37b22a1308b665bcccb9273e3f7d12c9a96e4a2c4a0fddd4b528e2b476dcfeb654dc52ef3f40f64f2e7a1e860647f139dc53909c7696f406b7a312e  Pod-Coverage-0.23.tar.gz"
+sha512sums="
+64760bcaf37b22a1308b665bcccb9273e3f7d12c9a96e4a2c4a0fddd4b528e2b476dcfeb654dc52ef3f40f64f2e7a1e860647f139dc53909c7696f406b7a312e  Pod-Coverage-0.23.tar.gz
+"
diff --git a/main/perl-pod-parser/APKBUILD b/main/perl-pod-parser/APKBUILD
new file mode 100644
index 00000000000..a1306349549
--- /dev/null
+++ b/main/perl-pod-parser/APKBUILD
@@ -0,0 +1,36 @@
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Celeste <cielesti@protonmail.com>
+pkgname=perl-pod-parser
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Pod-Parser
+pkgver=1.67
+pkgrel=0
+pkgdesc="Modules for parsing/translating POD format documents"
+url="https://metacpan.org/release/Pod-Parser/"
+arch="noarch"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/M/MA/MAREKR/Pod-Parser-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="
+62cfbb9da1f4ccb224fb3e3d3f952f6c1579728ad7dcd7f2ef0b0393dabe8caa06cd5e259a875b58066fe0a519b3db1d26a40ae5aa23d1eff06e20547cac1e33  Pod-Parser-1.67.tar.gz
+"
diff --git a/main/perl-posix-strftime-compiler/APKBUILD b/main/perl-posix-strftime-compiler/APKBUILD
index d452c928426..456155b5c16 100644
--- a/main/perl-posix-strftime-compiler/APKBUILD
+++ b/main/perl-posix-strftime-compiler/APKBUILD
@@ -1,46 +1,39 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-posix-strftime-compiler
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=POSIX-strftime-Compiler
-pkgver=0.42
-pkgrel=1
+pkgver=0.46
+pkgrel=0
 pkgdesc="GNU C library compatible strftime for loggers and servers"
 url="https://metacpan.org/release/POSIX-strftime-Compiler/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends tzdata"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl tzdata"
+makedepends="perl-module-build-tiny"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/K/KA/KAZEBURO/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/K/KA/KAZEBURO/POSIX-strftime-Compiler-$pkgver.tar.gz
+	change-timezone-name.patch
+	"
 builddir="$srcdir/$_pkgreal-$pkgver"
-[ $CARCH = "mips64" ] && options="!check"
-
-prepare() {
-	default_prepare
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	perl Build.PL installdirs=vendor
-}
 
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
 	./Build
 }
 
 check() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
 	./Build test
 }
 
 package() {
-	cd "$builddir"
-	./Build install destdir="$pkgdir"
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="0c07f1b8589b067533c65a023dd634a29640cb8992aae8047aa1063affe6b30b95930479829982a30a13b87bc7c9ebf82ca4837726bd29658d85d718164e3c76  POSIX-strftime-Compiler-0.42.tar.gz"
+sha512sums="
+cee80a7b2f6b79dbb706898b713a4bb05bc57ecb3ef6c1644bce3682cc35d584c528aced6cd71b926e2fe549c95644ad59ecf780ba064adbb3bc9c54c8d4c459  POSIX-strftime-Compiler-0.46.tar.gz
+372ca8d3b8dfe35cbb6f67023341e59d6bca558d6a8bf8f02e79fb1f44c8d42a7c798b82e3e8732ebe7a46588912f6a533018bd4256419cd32a1257f11f5b467  change-timezone-name.patch
+"
diff --git a/main/perl-posix-strftime-compiler/change-timezone-name.patch b/main/perl-posix-strftime-compiler/change-timezone-name.patch
new file mode 100644
index 00000000000..5ef5598b3c9
--- /dev/null
+++ b/main/perl-posix-strftime-compiler/change-timezone-name.patch
@@ -0,0 +1,12 @@
+diff -ru a/t/02_timezone.t b/t/02_timezone.t
+--- a/t/02_timezone.t	2021-04-03 11:56:22.696118176 -0300
++++ b/t/02_timezone.t	2021-04-03 11:57:25.279713829 -0300
+@@ -8,7 +8,7 @@
+ my $inc = join ' ', map { "-I\"$_\"" } @INC;
+ my $dir = dirname(__FILE__);
+ 
+-$ENV{TEST_TZ} = 'CET-1CEST';
++$ENV{TEST_TZ} = 'Europe/Brussels';
+ 
+ eval {
+     my $d = `"$^X" $inc $dir/02_timezone.pl %z 0 0 0 1 7 112`;
diff --git a/main/perl-probe-perl/APKBUILD b/main/perl-probe-perl/APKBUILD
index 901372576ea..725cbd3179a 100644
--- a/main/perl-probe-perl/APKBUILD
+++ b/main/perl-probe-perl/APKBUILD
@@ -1,38 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-probe-perl
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Probe-Perl
 pkgver=0.03
-pkgrel=1
+pkgrel=4
 pkgdesc="Information about the currently running perl"
 url="https://metacpan.org/release/Probe-Perl/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/K/KW/KWILLIAMS/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/K/KW/KWILLIAMS/Probe-Perl-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	perl Makefile.PL INSTALLDIRS=vendor || return 1
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-		export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make install DESTDIR="$pkgdir" || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="739bdb9d1a74eb77ab885a5aca861a1915cadbb1002bb4cb0d21fc6940ae6b3aa64ee52951ac8b2dca41c9e8fe188e17ae5f3c848c4a1caaf66fec5d25bef49c  Probe-Perl-0.03.tar.gz"
+sha512sums="
+739bdb9d1a74eb77ab885a5aca861a1915cadbb1002bb4cb0d21fc6940ae6b3aa64ee52951ac8b2dca41c9e8fe188e17ae5f3c848c4a1caaf66fec5d25bef49c  Probe-Perl-0.03.tar.gz
+"
diff --git a/main/perl-proc-wait3/APKBUILD b/main/perl-proc-wait3/APKBUILD
index 02b57578923..d28c7edd90c 100644
--- a/main/perl-proc-wait3/APKBUILD
+++ b/main/perl-proc-wait3/APKBUILD
@@ -1,37 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-proc-wait3
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Proc-Wait3
 pkgver=0.05
-pkgrel=4
+pkgrel=10
 pkgdesc="Perl extension for wait3 system call"
 url="https://metacpan.org/release/Proc-Wait3/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/C/CT/CTILMES/$_pkgreal-$pkgver.tar.gz"
-
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+source="https://cpan.metacpan.org/authors/id/C/CT/CTILMES/Proc-Wait3-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$_builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="6af398422cc79fb02f544226b22dcbd3b3b25ae186da4e5e2d9f3d172fa0c59c7813d404397a8f47f426bde04d7936d939241d197085277b5e57981ac7be274d  Proc-Wait3-0.05.tar.gz"
+sha512sums="
+6af398422cc79fb02f544226b22dcbd3b3b25ae186da4e5e2d9f3d172fa0c59c7813d404397a8f47f426bde04d7936d939241d197085277b5e57981ac7be274d  Proc-Wait3-0.05.tar.gz
+"
diff --git a/main/perl-protocol-websocket/APKBUILD b/main/perl-protocol-websocket/APKBUILD
index 19ecebfdbdd..9d7d6db7cfe 100644
--- a/main/perl-protocol-websocket/APKBUILD
+++ b/main/perl-protocol-websocket/APKBUILD
@@ -3,37 +3,34 @@
 pkgname=perl-protocol-websocket
 _pkgreal=Protocol-WebSocket
 pkgver=0.26
-pkgrel=0
+pkgrel=2
 pkgdesc="WebSocket protocol"
 url="https://metacpan.org/release/Protocol-WebSocket"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev perl-module-build-tiny"
+makedepends="perl-module-build-tiny"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/V/VT/VTI/Protocol-WebSocket-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
 	default_prepare
-
-	cd "$builddir"
 	perl Build.PL --installdirs=vendor
 }
 
 build() {
-	cd "$builddir"
 	./Build
 }
 
 check() {
-	cd "$builddir"
 	./Build test
 }
 
 package() {
-	cd "$builddir"
 	./Build install --destdir="$pkgdir"
 }
 
-sha512sums="82384cdbeafc7b37fd4a97471c414e6653d311d1f4cc21de5ea4bbc3e06589df8e0a909e781470e8a84d3d74f6907a851f222338cea3f1f1aa6eb4a276149357  Protocol-WebSocket-0.26.tar.gz"
+sha512sums="
+82384cdbeafc7b37fd4a97471c414e6653d311d1f4cc21de5ea4bbc3e06589df8e0a909e781470e8a84d3d74f6907a851f222338cea3f1f1aa6eb4a276149357  Protocol-WebSocket-0.26.tar.gz
+"
diff --git a/main/perl-regexp-common/APKBUILD b/main/perl-regexp-common/APKBUILD
index 01dc45023a2..8cfa1b76ec3 100644
--- a/main/perl-regexp-common/APKBUILD
+++ b/main/perl-regexp-common/APKBUILD
@@ -1,43 +1,39 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-regexp-common
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Regexp-Common
 pkgver=2017060201
-pkgrel=1
+pkgrel=4
 pkgdesc="Provide commonly requested regular expressions"
 url="https://metacpan.org/release/Regexp-Common/"
 arch="noarch"
-license="MIT"
+license="MIT OR Artistic-2.0"
+depends="perl"
 makedepends="perl-dev"
+checkdepends="perl-test-regexp"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/A/AB/ABIGAIL/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/A/AB/ABIGAIL/Regexp-Common-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+options="!check" # take forever
 
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="fd046d775214bdca42f868557559595360b069121a75fc119f45e064091000968d9d84154f8a0f06072ecff169dccecf68be58f99a7196932fcb4ffcbd678608  Regexp-Common-2017060201.tar.gz"
+sha512sums="
+fd046d775214bdca42f868557559595360b069121a75fc119f45e064091000968d9d84154f8a0f06072ecff169dccecf68be58f99a7196932fcb4ffcbd678608  Regexp-Common-2017060201.tar.gz
+"
diff --git a/main/perl-regexp-ipv6/APKBUILD b/main/perl-regexp-ipv6/APKBUILD
index 21bb3e66abc..0c1124c3fac 100644
--- a/main/perl-regexp-ipv6/APKBUILD
+++ b/main/perl-regexp-ipv6/APKBUILD
@@ -2,38 +2,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-regexp-ipv6
 pkgver=0.03
-pkgrel=1
+pkgrel=5
 pkgdesc="Regexp::IPv6 perl module"
 url="https://metacpan.org/release/Regexp-IPv6/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/S/SA/SALVA/Regexp-IPv6-$pkgver.tar.gz"
 
-_builddir="$srcdir"/Regexp-IPv6-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/Regexp-IPv6-$pkgver
 
 build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="e4d226d3f925f01e03bf610dfd397babdb7ef823b4df6189aaf87a84e75c242e32073dd90a96719f8ce8969af42806c59b24e600534c330a983e1e301574d29f  Regexp-IPv6-0.03.tar.gz"
+sha512sums="
+e4d226d3f925f01e03bf610dfd397babdb7ef823b4df6189aaf87a84e75c242e32073dd90a96719f8ce8969af42806c59b24e600534c330a983e1e301574d29f  Regexp-IPv6-0.03.tar.gz
+"
diff --git a/main/perl-role-basic/APKBUILD b/main/perl-role-basic/APKBUILD
index c46f75976f3..d49a5941373 100644
--- a/main/perl-role-basic/APKBUILD
+++ b/main/perl-role-basic/APKBUILD
@@ -1,39 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-role-basic
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Role-Basic
 pkgver=0.13
-pkgrel=1
+pkgrel=4
 pkgdesc="Just roles. Nothing else."
 url="https://metacpan.org/release/Role-Basic/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/O/OV/OVID/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/O/OV/OVID/Role-Basic-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	perl Build.PL installdirs=vendor || return 1
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	./Build && ./Build test
+check() {
+	./Build test
 }
 
 package() {
-	cd "$_builddir"
-	./Build install destdir="$pkgdir" || return 1
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="685f758e1afc4441b3ac507d52e0d18b6f64081f74fa0a768c81c7c9fad7b7ec30497002cff22449a65ab78c27671a4fe7a7213c45d28cc4077bb855fcce1438  Role-Basic-0.13.tar.gz"
+sha512sums="
+685f758e1afc4441b3ac507d52e0d18b6f64081f74fa0a768c81c7c9fad7b7ec30497002cff22449a65ab78c27671a4fe7a7213c45d28cc4077bb855fcce1438  Role-Basic-0.13.tar.gz
+"
diff --git a/main/perl-role-tiny/APKBUILD b/main/perl-role-tiny/APKBUILD
index d5e5a6dae4c..b891b7faaf1 100644
--- a/main/perl-role-tiny/APKBUILD
+++ b/main/perl-role-tiny/APKBUILD
@@ -1,44 +1,32 @@
-# Automatically generated by apkbuild-cpan, template 2
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-role-tiny
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Role-Tiny
-pkgver=2.001004
-pkgrel=0
-pkgdesc="Roles. Like a nouvelle cuisine portion size slice of Moose."
-url="https://metacpan.org/release/Role-Tiny"
+pkgver=2.002004
+pkgrel=2
+pkgdesc="Roles: a nouvelle cuisine portion size slice of Moose"
+url="https://metacpan.org/release/Role-Tiny/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Role-Tiny-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
+check() {
+	make test
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-sha512sums="818373746cc4d86f87f9f88adf7f108de396f135e5dd1e380bf7722503675cacd9ee1d0d1f1eb2cd7851e50121504f94db02b3b67512d4069d7fdec94e441130  Role-Tiny-2.001004.tar.gz"
+sha512sums="f66a799a0cd4e989adc173f6d913967df7aa6b9ffda934c2a80c0a91dcfe4edce606bd27cf1b4d857d52d0aa770224315ae4e915e4e735c6a9483a6cf5ce02f1  Role-Tiny-2.002004.tar.gz"
diff --git a/main/perl-scalar-list-utils/APKBUILD b/main/perl-scalar-list-utils/APKBUILD
deleted file mode 100644
index 2beac222d46..00000000000
--- a/main/perl-scalar-list-utils/APKBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <fcolista@alpinelinux.org>
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname=perl-scalar-list-utils
-_pkgreal=Scalar-List-Utils
-pkgver=1.54
-pkgrel=0
-pkgdesc="Common Scalar and List utility subroutines"
-url="https://metacpan.org/release/Scalar-List-Utils"
-arch="all"
-license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-makedepends="perl-dev"
-subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Scalar-List-Utils-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	default_prepare
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
-build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
-}
-
-check() {
-	make test
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-doc() {
-	default_doc
-	replaces="perl-doc"
-}
-
-sha512sums="da85b7532e6f54433c328e82411715e0f90281779fc2bfd921c3ed49f853667650c029d2be6cf3a41e2ac9060c0a444245d579030a8054a1f1003d45a9c6eb0e  Scalar-List-Utils-1.54.tar.gz"
diff --git a/main/perl-scope-guard/APKBUILD b/main/perl-scope-guard/APKBUILD
index d6580bbe308..1422dac3013 100644
--- a/main/perl-scope-guard/APKBUILD
+++ b/main/perl-scope-guard/APKBUILD
@@ -2,38 +2,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-scope-guard
 pkgver=0.21
-pkgrel=1
+pkgrel=5
 pkgdesc="Scope::Guard perl module"
 url="https://metacpan.org/release/Scope-Guard/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/C/CH/CHOCOLATE/Scope-Guard-$pkgver.tar.gz"
 
-_builddir="$srcdir"/Scope-Guard-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/Scope-Guard-$pkgver
 
 build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="65492e08ab79dc323649166e83ffc13c6f1fffaa9c60d581d8854dfe427a54a3c3c5e4d8b90308d4b1a31a1a54c7977b4e1d36fc9005c6e716c2361ce187fc9f  Scope-Guard-0.21.tar.gz"
+sha512sums="
+65492e08ab79dc323649166e83ffc13c6f1fffaa9c60d581d8854dfe427a54a3c3c5e4d8b90308d4b1a31a1a54c7977b4e1d36fc9005c6e716c2361ce187fc9f  Scope-Guard-0.21.tar.gz
+"
diff --git a/main/perl-scope-upper/APKBUILD b/main/perl-scope-upper/APKBUILD
index e4b0da30492..b5e9309cfcd 100644
--- a/main/perl-scope-upper/APKBUILD
+++ b/main/perl-scope-upper/APKBUILD
@@ -1,39 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor:
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-scope-upper
-_pkgname=Scope-Upper
-pkgver=0.32
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Scope-Upper
+pkgver=0.34
 pkgrel=2
 pkgdesc="Act on upper scopes."
 url="https://metacpan.org/release/Scope-Upper/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/V/VP/VPIT/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+source="https://cpan.metacpan.org/authors/id/V/VP/VPIT/Scope-Upper-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
-build() {
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make
-}
-
 package() {
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="92fbc9b2e49bc1f6c66a4f10519c508ede36ba6266781397f93bd48310ae36b454112c59794f0346b8c915cfe106d2a4f673ecf20e7a2b8f11e504539691bda4  Scope-Upper-0.32.tar.gz"
+sha512sums="
+f24e169c8c03e146af1a05aa967aeb8d7ffc8aa8401ea72dd89d6e16f5f49f73e62f316a9bfbbf18f40be059ecd087fd23d82606c4e9d64fa001118f2f61d31f  Scope-Upper-0.34.tar.gz
+"
diff --git a/main/perl-server-starter/APKBUILD b/main/perl-server-starter/APKBUILD
index caab132d6f4..934245a7278 100644
--- a/main/perl-server-starter/APKBUILD
+++ b/main/perl-server-starter/APKBUILD
@@ -1,27 +1,25 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-server-starter
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Server-Starter
 pkgver=0.35
-pkgrel=0
+pkgrel=4
 pkgdesc="a superdaemon for hot-deploying server programs"
 url="https://metacpan.org/release/Server-Starter/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends=""
-cpanmakedepends="perl-module-build>=0.4229"
-cpancheckdepends="perl-test-tcp>=2.22 perl-test-sharedfork>=0.35 perl-test-requires>=0.10"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+depends="perl"
+makedepends="perl-dev perl-module-build"
+checkdepends="perl-test-tcp perl-test-requires perl-test-sharedfork"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/K/KA/KAZUHO/Server-Starter-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	perl Build.PL installdirs=vendor
+	perl Build.PL --installdirs=vendor
 	./Build
 }
 
@@ -30,8 +28,10 @@ check() {
 }
 
 package() {
-	./Build install destdir="$pkgdir"
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="d9ba5be08424b1b37ebaa765fbb6318353214cb8d8381227eae2b6445bbd21d853888a72fbcef2ba99dd6ba97bed6217af9e8f44b371bc15ec5d9c97b00c17d2  Server-Starter-0.35.tar.gz"
+sha512sums="
+d9ba5be08424b1b37ebaa765fbb6318353214cb8d8381227eae2b6445bbd21d853888a72fbcef2ba99dd6ba97bed6217af9e8f44b371bc15ec5d9c97b00c17d2  Server-Starter-0.35.tar.gz
+"
diff --git a/main/perl-set-intspan/APKBUILD b/main/perl-set-intspan/APKBUILD
index 6a61ce6a6aa..c0f88abd7e4 100644
--- a/main/perl-set-intspan/APKBUILD
+++ b/main/perl-set-intspan/APKBUILD
@@ -1,42 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor:
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-set-intspan
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Set-IntSpan
 pkgver=1.19
-pkgrel=2
+pkgrel=5
 pkgdesc="Manages sets of integers, newsrc style"
-url="https://metacpan.org/release/Set-IntSpan"
+url="https://metacpan.org/release/Set-IntSpan/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/S/SW/SWMCD/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/S/SW/SWMCD/Set-IntSpan-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="de743bc26e4e9daf0bff636279219776421a31d1b3fa5d8e9232e051f2396cbfdd339dacd4aadc006cf31527935550c8659d8c80cbaed5942895239ab36c9cd9  Set-IntSpan-1.19.tar.gz"
+sha512sums="
+de743bc26e4e9daf0bff636279219776421a31d1b3fa5d8e9232e051f2396cbfdd339dacd4aadc006cf31527935550c8659d8c80cbaed5942895239ab36c9cd9  Set-IntSpan-1.19.tar.gz
+"
diff --git a/main/perl-snmp-session/APKBUILD b/main/perl-snmp-session/APKBUILD
index c40340389c0..5379bdc8bd2 100644
--- a/main/perl-snmp-session/APKBUILD
+++ b/main/perl-snmp-session/APKBUILD
@@ -1,28 +1,28 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-snmp-session
-_name=SNMP_Session
-pkgver=1.13
+pkgver=1.16
 pkgrel=2
 pkgdesc="A SNMP Perl Module"
-url="http://code.google.com/p/snmp-session/"
+url="https://github.com/sleinen/snmp-session"
 arch="noarch"
-license="PerlArtistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
+options="!check" # no testsuite
 depends="perl"
-makedepends="perl-dev"
-# note this project has moved to: https://github.com/sleinen/snmp-session/
-# but the new location has no release tags, so fall back to archives for now
-source="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/snmp-session/$_name-$pkgver.tar.gz"
+subpackages="$pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/sleinen/snmp-session/archive/refs/tags/v$pkgver.tar.gz"
+builddir="$srcdir/snmp-session-$pkgver"
 
-build () {
-	cd "$srcdir"/$_name-$pkgver
-	perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make MAN1EXT=1p MAN3EXT=3pm || return 1
+build() {
+	perl Makefile.PL INSTALLDIRS=vendor
+	make MAN1EXT=1p MAN3EXT=3pm
 }
 
 package() {
-	cd "$srcdir"/$_name-$pkgver
-	make install MAN1EXT=1p MAN3EXT=3pm DESTDIR="$pkgdir" || return 1
+	make install MAN1EXT=1p MAN3EXT=3pm DESTDIR="$pkgdir"
 	find "$pkgdir" -name perllocal.pod -delete
 	find "$pkgdir" -name .packlist -delete
 }
-sha512sums="5185739cfe1c37f7087136b23f3fb1eb5daa9d1ab2036d8bbf36438b0a9ede354daca73567529c96297f2621842dfb4c7832101306cee1540ee950b4d0bfe6a8  SNMP_Session-1.13.tar.gz"
+
+sha512sums="
+fa0baa4423088198ea533d432118ab4760540416673ef72ae13ad9544f76ebccb42ae274337a392be33c74ed682e623d9f77ce43cadb9d2c9bf401b404583e4e  perl-snmp-session-1.16.tar.gz
+"
diff --git a/main/perl-socket-getaddrinfo/APKBUILD b/main/perl-socket-getaddrinfo/APKBUILD
index b109f331674..27fee342e6a 100644
--- a/main/perl-socket-getaddrinfo/APKBUILD
+++ b/main/perl-socket-getaddrinfo/APKBUILD
@@ -1,33 +1,29 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-socket-getaddrinfo
 _pkgreal=Socket-GetAddrInfo
 pkgver=0.22
-pkgrel=1
+pkgrel=5
 pkgdesc="Perl interface for get{addr,name}info(3)"
 url="https://metacpan.org/release/Socket-GetAddrInfo/"
 arch="noarch"
-license="GPL PerlArtistic"
-depends="perl-extutils-cchecker"
-makedepends="perl-dev perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-extutils-cchecker"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" -name .packlist -name perllocal.pod -delete
 }
diff --git a/main/perl-socket/APKBUILD b/main/perl-socket/APKBUILD
index 5b47bb17419..82d77da94c9 100644
--- a/main/perl-socket/APKBUILD
+++ b/main/perl-socket/APKBUILD
@@ -1,44 +1,40 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 4
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-socket
+pkgver=2.038
+pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Socket
-pkgver=2.029
-pkgrel=2
 pkgdesc="networking constants and support functions"
 url="https://metacpan.org/release/Socket/"
 arch="all"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 makedepends="perl-dev"
-subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Socket-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
 
-doc() {
-	default_doc
-	replaces="perl-doc"
+	# man pages are already provided by perl-doc
+	rm -rf "$pkgdir"/usr/share/man
 }
 
-sha512sums="7a59c66962638695a8e4dfab170266cdcfebce7e5143449ae3a37a2dc24910cda8cd89f45b09951f98182179c9419021c95308b0bde4dbb177dda0c677329cce  Socket-2.029.tar.gz"
+sha512sums="
+68e2ed41e7c30cb3bc90c3fb3d2c4894fa6517f5828dec8f3700dd382b5539f581408324ed957b3708e1cec48c54d48f5b69b5089e04bb329699461859106cd5  Socket-2.038.tar.gz
+"
diff --git a/main/perl-socket6/APKBUILD b/main/perl-socket6/APKBUILD
index 1a15f1f8a4d..cae491f41c2 100644
--- a/main/perl-socket6/APKBUILD
+++ b/main/perl-socket6/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-socket6
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Socket6
 pkgver=0.29
-pkgrel=2
-pkgdesc="perl module for IPV6 operations"
+pkgrel=9
+pkgdesc="Perl module for Socket6"
 url="https://metacpan.org/release/Socket6/"
 arch="all"
-license="BSD-3-Clause"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/U/UM/UMEMOTO/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/U/UM/UMEMOTO/Socket6-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="51d05a04563519010f515a50fb1082c4e72eb4537137ad55f117458c71ec8429a5674083bd68adcbbf2e57632a1cb1bf60693ea98364e7f96c826ff8c9655b33  Socket6-0.29.tar.gz"
+sha512sums="
+51d05a04563519010f515a50fb1082c4e72eb4537137ad55f117458c71ec8429a5674083bd68adcbbf2e57632a1cb1bf60693ea98364e7f96c826ff8c9655b33  Socket6-0.29.tar.gz
+"
diff --git a/main/perl-specio/APKBUILD b/main/perl-specio/APKBUILD
index 00ba99aa6ad..1450df57905 100644
--- a/main/perl-specio/APKBUILD
+++ b/main/perl-specio/APKBUILD
@@ -1,15 +1,17 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-specio
 _pkgreal=Specio
-pkgver=0.46
-pkgrel=0
-pkgdesc="Specio perl module"
+pkgver=0.48
+pkgrel=1
+pkgdesc="Type constraints and coercions for Perl"
 url="https://metacpan.org/release/Specio"
 arch="noarch"
 license="Artistic-2.0"
-depends="perl-test-needs perl-devel-stacktrace perl-eval-closure perl-mro-compat
-	perl-role-tiny perl-test-fatal perl-module-runtime perl-sub-quote"
-makedepends="perl-dev"
+depends="
+	perl perl-sub-quote perl-devel-stacktrace perl-role-tiny perl-mro-compat perl-try-tiny
+	perl-test-fatal perl-eval-closure perl-module-runtime
+	"
+checkdepends="perl-test-needs"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Specio-$pkgver.tar.gz"
 builddir="$srcdir"/$_pkgreal-$pkgver
@@ -28,4 +30,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="8dfc0e87bd640bd30aa9a92118f77305565dee2441f95c7e9f311b517c07573e3a0e977ea348eaf879dfafe6edc3c0d89625f28b5f3f0f2bff789178cd513802  Specio-0.46.tar.gz"
+sha512sums="
+76fd2aa398008238d55714700581782c95b635a4d4198b1c51daecfec770b61b9898351cbc2bf999f4d837691de657c51a94581c0f0b21b67b605770d507729a  Specio-0.48.tar.gz
+"
diff --git a/main/perl-stream-buffered/APKBUILD b/main/perl-stream-buffered/APKBUILD
index e427b9f88d9..b0aa9354844 100644
--- a/main/perl-stream-buffered/APKBUILD
+++ b/main/perl-stream-buffered/APKBUILD
@@ -1,45 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor:
-# Maintainer:
+# Automatically generated by apkbuild-cpan, template 3
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=perl-stream-buffered
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Stream-Buffered
-pkgdesc="Temporary buffer to save bytes"
 pkgver=0.03
-pkgrel=1
+pkgrel=5
+pkgdesc="temporary buffer to save bytes"
 url="https://metacpan.org/release/Stream-Buffered/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-install"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DO/DOY/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/D/DO/DOY/Stream-Buffered-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="cbc418846f61fd46163f85d2ce53c3d08ebc164a4e775b7e9fee4dc143daa3655983723099d1ded53f0054506c550038680d1f95e11d1399fef6ff6b38f9712e  Stream-Buffered-0.03.tar.gz"
+sha512sums="
+cbc418846f61fd46163f85d2ce53c3d08ebc164a4e775b7e9fee4dc143daa3655983723099d1ded53f0054506c550038680d1f95e11d1399fef6ff6b38f9712e  Stream-Buffered-0.03.tar.gz
+"
diff --git a/main/perl-string-shellquote/APKBUILD b/main/perl-string-shellquote/APKBUILD
index 7c4639b49d1..3d9e08d8e4c 100644
--- a/main/perl-string-shellquote/APKBUILD
+++ b/main/perl-string-shellquote/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-string-shellquote
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=String-ShellQuote
 pkgver=1.04
-pkgrel=1
-pkgdesc="unknown"
+pkgrel=5
+pkgdesc="Perl module for String-ShellQuote"
 url="https://metacpan.org/release/String-ShellQuote/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RO/ROSCH/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/R/RO/ROSCH/String-ShellQuote-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="f5b472985fb9c15d5c82c03b5c6c90a3a545ada854b90a96cfb7b0f57b8a817707ed91ca0f20344a2b8d200fe365ea737a9b39b64d526310d41ac2466552236d  String-ShellQuote-1.04.tar.gz"
+sha512sums="
+f5b472985fb9c15d5c82c03b5c6c90a3a545ada854b90a96cfb7b0f57b8a817707ed91ca0f20344a2b8d200fe365ea737a9b39b64d526310d41ac2466552236d  String-ShellQuote-1.04.tar.gz
+"
diff --git a/main/perl-struct-dumb/APKBUILD b/main/perl-struct-dumb/APKBUILD
index 2b4ba956ff4..4095270390b 100644
--- a/main/perl-struct-dumb/APKBUILD
+++ b/main/perl-struct-dumb/APKBUILD
@@ -1,44 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-struct-dumb
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Struct-Dumb
-pkgver=0.09
+pkgver=0.14
 pkgrel=1
-pkgdesc="Make simple lightweight record-like structures"
+pkgdesc="make simple lightweight record-like structures"
 url="https://metacpan.org/release/Struct-Dumb/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpanmakedepends="perl-test-fatal"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev perl-module-build"
+checkdepends="perl-test2-suite"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Struct-Dumb-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	perl Build.PL installdirs=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
 	./Build
 }
 
 check() {
-	cd "$builddir"
 	./Build test
 }
 
 package() {
-	cd "$builddir"
-	./Build install destdir="$pkgdir"
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="6dc1e6ce02386906f5e440d989a5cd1810201327567684d26d877a212e0b97d64b2cfdb0432ac5d8ab94bcecfb61c4b59fd8aa3ae22adc06de3c8083f667c134  Struct-Dumb-0.09.tar.gz"
+sha512sums="
+d59e9e63b21ef0afbfc36398a8eeabc3d2bfd7fb94da2d39dd0af8251cca88bc5c1cf476329a35a23012afdfbba3ee40ffa1a6ee53d435405bd81af5e3bfd90d  Struct-Dumb-0.14.tar.gz
+"
diff --git a/main/perl-sub-exporter-progressive/APKBUILD b/main/perl-sub-exporter-progressive/APKBUILD
index 258a1631ff6..82a184ea6fb 100644
--- a/main/perl-sub-exporter-progressive/APKBUILD
+++ b/main/perl-sub-exporter-progressive/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-sub-exporter-progressive
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Sub-Exporter-Progressive
 pkgver=0.001013
-pkgrel=1
+pkgrel=4
 pkgdesc="Only use Sub::Exporter if you need it"
 url="https://metacpan.org/release/Sub-Exporter-Progressive/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="perl-sub-exporter"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/F/FR/FREW/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/F/FR/FREW/Sub-Exporter-Progressive-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="28d0ac6a380a4fc1515bd69320bcfd073c0c0e92ea34bb924972aa46fb2f6912485d686f0eca5d5b885d8b06927250dfaacd1a7ff86ba029f879a183cba546c4  Sub-Exporter-Progressive-0.001013.tar.gz"
+sha512sums="
+28d0ac6a380a4fc1515bd69320bcfd073c0c0e92ea34bb924972aa46fb2f6912485d686f0eca5d5b885d8b06927250dfaacd1a7ff86ba029f879a183cba546c4  Sub-Exporter-Progressive-0.001013.tar.gz
+"
diff --git a/main/perl-sub-exporter/APKBUILD b/main/perl-sub-exporter/APKBUILD
index 29f66ba3273..8d3b0aa10a5 100644
--- a/main/perl-sub-exporter/APKBUILD
+++ b/main/perl-sub-exporter/APKBUILD
@@ -1,38 +1,35 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-sub-exporter
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Sub-Exporter
-pkgver=0.987
-pkgrel=1
+pkgver=0.991
+pkgrel=0
 pkgdesc="a sophisticated exporter for custom-built routines"
 url="https://metacpan.org/release/Sub-Exporter/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-data-optlist perl-sub-install perl-params-util"
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-data-optlist perl-sub-install perl-params-util"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Sub-Exporter-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="6b682d27a0df8ce971ea48aeca5162e1c70929c51cf27119b30361477876b0b86ecb15ab13a6c3cbe5bb85be9e600589fb9e3c9c4e94bad3fc05b675d293adad  Sub-Exporter-0.987.tar.gz"
+sha512sums="
+7829bbca1eb332156ba33dd0cbde7f57c178ad56cc03e76c1b7d5327c94ce15bb5172894eeef011e12e472071a7d7a07f514a1121535d96ae05ed0ef6734b329  Sub-Exporter-0.991.tar.gz
+"
diff --git a/main/perl-sub-identify/APKBUILD b/main/perl-sub-identify/APKBUILD
index 4aa80ac565e..f44e702ac9a 100644
--- a/main/perl-sub-identify/APKBUILD
+++ b/main/perl-sub-identify/APKBUILD
@@ -1,43 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-sub-identify
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Sub-Identify
 pkgver=0.14
-pkgrel=4
+pkgrel=10
 pkgdesc="Retrieve names of code references"
 url="https://metacpan.org/release/Sub-Identify/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RG/RGARCIA/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/R/RG/RGARCIA/Sub-Identify-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-check() {
-	cd "$builddir"
-	make test
-}
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="f69f542c84c5c3ca1f1c7f5f58fd2cf19279a65229f43117c31f24ab0e49d5f329bef2bc00f22252fd2e52b4e17f16b279dac438920668e046e59f2e22e52c14  Sub-Identify-0.14.tar.gz"
+sha512sums="
+f69f542c84c5c3ca1f1c7f5f58fd2cf19279a65229f43117c31f24ab0e49d5f329bef2bc00f22252fd2e52b4e17f16b279dac438920668e046e59f2e22e52c14  Sub-Identify-0.14.tar.gz
+"
diff --git a/main/perl-sub-info/APKBUILD b/main/perl-sub-info/APKBUILD
index 09df326833a..a964725f0d7 100644
--- a/main/perl-sub-info/APKBUILD
+++ b/main/perl-sub-info/APKBUILD
@@ -1,48 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 2
-# Contributor: 
-# Maintainer: 
+# Automatically generated by apkbuild-cpan, template 3
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=perl-sub-info
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Sub-Info
 pkgver=0.002
-pkgrel=1
+pkgrel=5
 pkgdesc="Tool for inspecting subroutines."
 url="https://metacpan.org/release/Sub-Info/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-importer perl-test-simple"
-cpanmakedepends=""
-cpancheckdepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-importer"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Sub-Info-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare || return 1
-
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
 check() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
-sha512sums="e3ad2c8b270a44f9de2d5b71845a4a21f363a234edf2ddb9942c2fb2e4d765eedff3653a047f025b9d1dfaeff32ddd58aeff7f81fa42e6f4b57f5ca6311519b3  Sub-Info-0.002.tar.gz"
+package() {
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="
+e3ad2c8b270a44f9de2d5b71845a4a21f363a234edf2ddb9942c2fb2e4d765eedff3653a047f025b9d1dfaeff32ddd58aeff7f81fa42e6f4b57f5ca6311519b3  Sub-Info-0.002.tar.gz
+"
diff --git a/main/perl-sub-install/APKBUILD b/main/perl-sub-install/APKBUILD
index 9c24acad15c..be5f8d08412 100644
--- a/main/perl-sub-install/APKBUILD
+++ b/main/perl-sub-install/APKBUILD
@@ -1,39 +1,37 @@
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-sub-install
-pkgver=0.928
-pkgrel=1
-pkgdesc="Sub::Install perl module"
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Sub-Install
+pkgver=0.929
+pkgrel=2
+pkgdesc="install subroutines into packages easily"
 url="https://metacpan.org/release/Sub-Install/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
 makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Sub-Install-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir"/Sub-Install-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="3f25df9f5992075968830d4235e9f6520c526331b9180391e41483241d43253a61ad8dc381d77aaeb6c6fb841cfc5c097598e62abb46208894275c393a133ade  Sub-Install-0.928.tar.gz"
+sha512sums="
+f51992531607af97ff6b8700bf23a2918261d05f24886781f36e2676c130df5d109a42ad3d6f8d089a6ee2c050af27ec5fc2ef9610ee993eca6549866a4fe8d7  Sub-Install-0.929.tar.gz
+"
diff --git a/main/perl-sub-name/APKBUILD b/main/perl-sub-name/APKBUILD
index 1507fbd6f54..b10f22e6778 100644
--- a/main/perl-sub-name/APKBUILD
+++ b/main/perl-sub-name/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-sub-name
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Sub-Name
-pkgver=0.26
+pkgver=0.27
 pkgrel=1
-pkgdesc="(re)name a sub"
+pkgdesc="(Re)name a sub"
 url="https://metacpan.org/release/Sub-Name/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="  perl-devel-checkbin "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Sub-Name-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="df032823c340500a0cc5e5f4d88688bbed14344a67a1ded462572aebeb39827563c5f69afbc0af1c5aac483013e7083a8aba2e3e47b805007d006818dadd9b5a  Sub-Name-0.26.tar.gz"
+sha512sums="
+766c2b229a222e84c40069f2aba0611f7936a9018c375c66b9ed58c4b3ad074cf102906e23aaf514e6897a8aaeaee1658bc2887d73052b8f67ccdf3cab52f71f  Sub-Name-0.27.tar.gz
+"
diff --git a/main/perl-sub-quote/APKBUILD b/main/perl-sub-quote/APKBUILD
index 0f8f9b6a3c9..3282990f717 100644
--- a/main/perl-sub-quote/APKBUILD
+++ b/main/perl-sub-quote/APKBUILD
@@ -1,46 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-sub-quote
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Sub-Quote
-pkgver=2.006006
-pkgrel=0
+pkgver=2.006008
+pkgrel=1
 pkgdesc="Efficient generation of subroutines via string eval"
-url="https://metacpan.org/release/Sub-Quote"
+url="https://metacpan.org/release/Sub-Quote/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpancheckdepends="perl-test-fatal"
 depends="perl"
 makedepends="perl-dev"
-checkdepends="$cpancheckdepends"
+checkdepends="perl-test-fatal"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Sub-Quote-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$builddir"
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-sha512sums="19cd0504f039f3218d3f47b3b44714f0baed73a13f97c4552eb1816b7b03186b1bbdf48cc70c2cae616eb9ec81721b30217c7f788176d389df694c9b355ead64  Sub-Quote-2.006006.tar.gz"
+sha512sums="
+474c02953555e815c64270299a2ea36a172c11ff739d77a3f5133f4c40d5ec48ad60c09465bd93864c254f180ba73d8381752ac649f8d4f729199f3088e71e26  Sub-Quote-2.006008.tar.gz
+"
diff --git a/main/perl-sub-uplevel/APKBUILD b/main/perl-sub-uplevel/APKBUILD
index 3729d1c55e4..a73a7e10af7 100644
--- a/main/perl-sub-uplevel/APKBUILD
+++ b/main/perl-sub-uplevel/APKBUILD
@@ -1,36 +1,34 @@
 # Contributor: Mika Havela <mika.havela@gmail.com>
 # Maintainer: Mika Havela <mika.havela@gmail.com>
 pkgname=perl-sub-uplevel
-_realname=Sub-Uplevel
+_pkgreal=Sub-Uplevel
 pkgver=0.2800
-pkgrel=1
+pkgrel=5
 pkgdesc="Perl - Apparently run a function in a higher stack frame"
-url="http://search.cpan.org/~dagolden/$_realname-$pkgver/"
+url="https://metacpan.org/dist/Sub-Uplevel"
 arch="noarch"
-license="Artistic GPL"
-depends="perl "
-makedepends="perl-dev"
-#subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/$_realname-$pkgver.tar.gz"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
+depends="perl"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_realname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$_builddir"
+build() {
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
-	make test || return 1
+check() {
+	make test
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="655bab9441bc81e4002db2e715b5c1f771ee35a03bc643a44d4a279aca55431fe17e64332919311a51db2dc02c16b5f97c5751595e61ad0ab96cd0a10ac2d230  Sub-Uplevel-0.2800.tar.gz"
+sha512sums="
+655bab9441bc81e4002db2e715b5c1f771ee35a03bc643a44d4a279aca55431fe17e64332919311a51db2dc02c16b5f97c5751595e61ad0ab96cd0a10ac2d230  Sub-Uplevel-0.2800.tar.gz
+"
diff --git a/main/perl-super/APKBUILD b/main/perl-super/APKBUILD
index fab13675f39..21b30732d59 100644
--- a/main/perl-super/APKBUILD
+++ b/main/perl-super/APKBUILD
@@ -1,8 +1,8 @@
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-super
-_pkgname=SUPER
+_pkgreal=SUPER
 pkgver=1.20190531
-pkgrel=0
+pkgrel=2
 pkgdesc="Control superclass method dispatch"
 url="https://metacpan.org/pod/SUPER"
 arch="noarch"
@@ -11,29 +11,25 @@ depends="perl"
 makedepends="perl-dev perl-module-build perl-sub-identify"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/C/CH/CHROMATIC/SUPER-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl Build.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-switch/APKBUILD b/main/perl-switch/APKBUILD
index 4a9cb8ba47a..872ecfc65e0 100644
--- a/main/perl-switch/APKBUILD
+++ b/main/perl-switch/APKBUILD
@@ -2,38 +2,31 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-switch
 pkgver=2.17
-pkgrel=1
+pkgrel=5
 pkgdesc="A switch statement for Perl"
 url="https://metacpan.org/release/Switch/"
 arch="noarch"
-license="Perl"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/C/CH/CHORNY/Switch-$pkgver.tar.gz"
 
-_builddir="$srcdir"/Switch-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/Switch-$pkgver
 
 build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="8faf3585c7b8a0552c7de7fad7b0ab89a8c3f3d55cb090d5656ae0925f8d328d9b466bd5bcbca76eaeaf56eceab11654137ba8a9bb03f79b91f00338ab2483ab  Switch-2.17.tar.gz"
+sha512sums="
+8faf3585c7b8a0552c7de7fad7b0ab89a8c3f3d55cb090d5656ae0925f8d328d9b466bd5bcbca76eaeaf56eceab11654137ba8a9bb03f79b91f00338ab2483ab  Switch-2.17.tar.gz
+"
diff --git a/main/perl-symbol-global-name/APKBUILD b/main/perl-symbol-global-name/APKBUILD
index 0cd099480f0..576bebd1e3b 100644
--- a/main/perl-symbol-global-name/APKBUILD
+++ b/main/perl-symbol-global-name/APKBUILD
@@ -1,46 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-symbol-global-name
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Symbol-Global-Name
 pkgver=0.05
-pkgrel=2
-pkgdesc="Finds name and type of a global variable"
+pkgrel=5
+pkgdesc="finds name and type of a global variable"
 url="https://metacpan.org/release/Symbol-Global-Name/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-install"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/A/AL/ALEXMV/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/A/AL/ALEXMV/Symbol-Global-Name-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="23c14ac5d022f3d61af63d26bf3740eca4080a0bd72719e998b991dc93cf53b668615ef1718ac5e43e8bb227b050a381e75af4c83ddbe90840c7ab2255052c0b  Symbol-Global-Name-0.05.tar.gz"
+sha512sums="
+23c14ac5d022f3d61af63d26bf3740eca4080a0bd72719e998b991dc93cf53b668615ef1718ac5e43e8bb227b050a381e75af4c83ddbe90840c7ab2255052c0b  Symbol-Global-Name-0.05.tar.gz
+"
diff --git a/main/perl-syntax-keyword-try/APKBUILD b/main/perl-syntax-keyword-try/APKBUILD
new file mode 100644
index 00000000000..151b9148c01
--- /dev/null
+++ b/main/perl-syntax-keyword-try/APKBUILD
@@ -0,0 +1,37 @@
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: rubicon <rubicon@mailo.com>
+# Maintainer: Celeste <cielesti@protonmail.com>
+pkgname=perl-syntax-keyword-try
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Syntax-Keyword-Try
+pkgver=0.29
+pkgrel=2
+pkgdesc="C<try/catch/finally> syntax for perl"
+url="https://metacpan.org/release/Syntax-Keyword-Try/"
+arch="all"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-xs-parse-keyword"
+makedepends="perl-dev perl-module-build"
+checkdepends="perl-test2-suite"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Syntax-Keyword-Try-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
+}
+
+check() {
+	./Build test
+}
+
+package() {
+	./Build install --destdir="$pkgdir"
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="
+269ea66916c39852262bc60b1661e90adf55489f1369a745a3c3ba24dd4335203a46d8bf8ddd39dcdefc4ae3314ce06b1fa7956d0a4bd23bba6fb809adaa1814  Syntax-Keyword-Try-0.29.tar.gz
+"
diff --git a/main/perl-sys-hostname-long/APKBUILD b/main/perl-sys-hostname-long/APKBUILD
index 989e83fe9d0..f04e31c05c6 100644
--- a/main/perl-sys-hostname-long/APKBUILD
+++ b/main/perl-sys-hostname-long/APKBUILD
@@ -1,43 +1,43 @@
 # Contributor:  Jeff Bilyk <jbilyk@gmail.com>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-sys-hostname-long
-_pkgname=Sys-Hostname-Long
+_pkgreal=Sys-Hostname-Long
 pkgver=1.5
-pkgrel=3
+pkgrel=6
 pkgdesc="Perl Module to get full hostname"
-url="http://search.cpan.org/~scott/"
+url="https://metacpan.org/dist/Sys-Hostname-Long"
 arch="noarch"
 license="Artistic-1.0-Perl GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/S/SC/SCOTT/$_pkgname-$pkgver.tar.gz
-	hostname-f.patch"
-builddir="$srcdir/$_pkgname-$pkgver"
+source="https://cpan.metacpan.org/authors/id/S/SC/SCOTT/Sys-Hostname-Long-$pkgver.tar.gz
+	hostname-f.patch
+	"
+options="net"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
 	default_prepare
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd $builddir
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make
 }
 
 check() {
-	cd $builddir
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd $builddir
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="e34a5f17e65eb9c8d3aa213a6d930be4d0b6981dae3bf600e782b0e9863e6584061285a894f9f54daff7520bcadbb3e8cd6b1f9f973ad1c1b72c79e9f588133b  Sys-Hostname-Long-1.5.tar.gz
-47ea5f1a35ac286f9f858fb42e8f4b59801cf99d8c61238238095abb8aee6ff706a8763e5d564dd4582bd7d80c3b966632833958cee1b007b71b5ca10b2f0c90  hostname-f.patch"
+sha512sums="
+e34a5f17e65eb9c8d3aa213a6d930be4d0b6981dae3bf600e782b0e9863e6584061285a894f9f54daff7520bcadbb3e8cd6b1f9f973ad1c1b72c79e9f588133b  Sys-Hostname-Long-1.5.tar.gz
+47ea5f1a35ac286f9f858fb42e8f4b59801cf99d8c61238238095abb8aee6ff706a8763e5d564dd4582bd7d80c3b966632833958cee1b007b71b5ca10b2f0c90  hostname-f.patch
+"
diff --git a/main/perl-sys-mmap/APKBUILD b/main/perl-sys-mmap/APKBUILD
index ec10270c367..29ef7c82439 100644
--- a/main/perl-sys-mmap/APKBUILD
+++ b/main/perl-sys-mmap/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-sys-mmap
-_realname=Sys-Mmap
+_pkgreal=Sys-Mmap
 pkgver=0.20
-pkgrel=0
+pkgrel=5
 pkgdesc="Uses mmap to map in a file as a Perl variable"
 url="https://metacpan.org/pod/Sys::Mmap"
 arch="all"
@@ -12,7 +12,7 @@ depends="perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/T/TO/TODDR/Sys-Mmap-$pkgver.tar.gz"
-builddir="$srcdir/Sys-Mmap-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
diff --git a/main/perl-term-readkey/APKBUILD b/main/perl-term-readkey/APKBUILD
index 4e5e080dd13..11e60a5257b 100644
--- a/main/perl-term-readkey/APKBUILD
+++ b/main/perl-term-readkey/APKBUILD
@@ -1,38 +1,34 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-term-readkey
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=TermReadKey
 pkgver=2.38
-pkgrel=3
+pkgrel=9
 pkgdesc="Change terminal modes, and perform non-blocking reads"
 url="https://metacpan.org/release/TermReadKey/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/J/JS/JSTOWE/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/J/JS/JSTOWE/TermReadKey-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make -j1 && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/main/perl-term-table/APKBUILD b/main/perl-term-table/APKBUILD
index d9909b1daa0..bce89e94b2d 100644
--- a/main/perl-term-table/APKBUILD
+++ b/main/perl-term-table/APKBUILD
@@ -1,32 +1,28 @@
-# Automatically generated by apkbuild-cpan, template 2
-# Contributor:
-# Maintainer:
+# Automatically generated by apkbuild-cpan, template 3
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=perl-term-table
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Term-Table
-pkgver=0.015
+pkgver=0.018
 pkgrel=0
 pkgdesc="Format a header and rows into a table"
-url="https://metacpan.org/release/Term-Table"
+url="https://metacpan.org/release/Term-Table/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends="perl-importer"
-cpanmakedepends="perl-test-simple"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+depends="perl"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Term-Table-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
@@ -34,9 +30,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-sha512sums="2f5cbc28d0d0f76a6269892055871c103a65d9fd9836d3a0b7c7320cf1439d27cba596453f1d94bd324bd4d4dffdd0eb672801aa23f9a8609310a28eca15dd87  Term-Table-0.015.tar.gz"
+sha512sums="
+99670976b884482697d667cf5db3cc3ff60e511270eab7e0df0cd922cfcc38297d143f03579df153a62db201db8d9e81e5f8bdaa94015d0b9ee9a5c033470621  Term-Table-0.018.tar.gz
+"
diff --git a/main/perl-test-cpan-meta/APKBUILD b/main/perl-test-cpan-meta/APKBUILD
index 6addf14d88c..fb8ec21dc98 100644
--- a/main/perl-test-cpan-meta/APKBUILD
+++ b/main/perl-test-cpan-meta/APKBUILD
@@ -3,43 +3,33 @@
 pkgname=perl-test-cpan-meta
 _pkgreal=Test-CPAN-Meta
 pkgver=0.25
-pkgrel=1
+pkgrel=4
 pkgdesc="Validate your CPAN META.json files"
 url="https://metacpan.org/release/Test-CPAN-Meta/"
 arch="noarch"
-license="Artistic-2"
-cpandepends=""
-cpanmakedepends=""
-cpancheckdepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
+depends="perl"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/B/BA/BARBIE/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
 	default_prepare
-
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
 check() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
diff --git a/main/perl-test-deep/APKBUILD b/main/perl-test-deep/APKBUILD
index 5c8459a3f74..4d3b86a4100 100644
--- a/main/perl-test-deep/APKBUILD
+++ b/main/perl-test-deep/APKBUILD
@@ -1,14 +1,13 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-test-deep
-pkgver=1.130
-pkgrel=0
+pkgver=1.204
+pkgrel=2
 pkgdesc="Test::Deep perl module"
 url="https://metacpan.org/release/Test-Deep/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
-depends="perl perl-test-tester perl-test-nowarnings"
-makedepends="perl-dev"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
+depends="perl perl-test-simple perl-test-nowarnings"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Test-Deep-$pkgver.tar.gz"
 
@@ -28,4 +27,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="de34197c97d44c68dd43372fa5a4d905a2ad636b5503c5f1443476a85b921f42cd07d475af8901dfee9deff1f29deef440c1783cdcc7f93c5f5030c4548ff9cf  Test-Deep-1.130.tar.gz"
+sha512sums="
+1a11b221810b7b23a6d3f71546e264ea3636fa36c73def760f756da69e6937ca3e1c1123505b80241360459d09fc4b9ab614d1c6826593695f6577f60595a8ae  Test-Deep-1.204.tar.gz
+"
diff --git a/main/perl-test-eol/APKBUILD b/main/perl-test-eol/APKBUILD
index 8ba71d77891..8110dc7e913 100644
--- a/main/perl-test-eol/APKBUILD
+++ b/main/perl-test-eol/APKBUILD
@@ -2,18 +2,13 @@
 # Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com>
 pkgname=perl-test-eol
 _pkgreal=Test-EOL
-pkgver=2.00
+pkgver=2.02
 pkgrel=1
 pkgdesc="Check the correct line endings in your project"
 url="https://metacpan.org/release/Test-EOL/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-cpancheckdepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
@@ -21,27 +16,23 @@ builddir="$srcdir/$_pkgreal-$pkgver"
 prepare() {
 	default_prepare
 
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
 check() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
-sha512sums="9f43b88c05915fe722307a313f9149837058e34c8310393e97418f1393f828c2d2f7c6a7537d9ca8caff1b07a19cb2600904319f753b1a76bca09e654637ede2  Test-EOL-2.00.tar.gz"
+sha512sums="03f3a60973fde1c0fb9532be957d981bad657fec4db1b77dca865011e1bf39dcbb91a8ee09cc692ab9b372a139371ba66b69c60ae582b687a6ec230fb58a9654  Test-EOL-2.02.tar.gz"
diff --git a/main/perl-test-exception/APKBUILD b/main/perl-test-exception/APKBUILD
index 848d6e3e785..61714bdcc63 100644
--- a/main/perl-test-exception/APKBUILD
+++ b/main/perl-test-exception/APKBUILD
@@ -1,38 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-test-exception
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-Exception
 pkgver=0.43
-pkgrel=1
-pkgdesc="Perl - Test exception based code"
+pkgrel=4
+pkgdesc="Test exception-based code"
 url="https://metacpan.org/release/Test-Exception/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-sub-uplevel"
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-sub-uplevel"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test-Exception-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-	make || return 1
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make install DESTDIR=$pkgdir
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="f5ab65ce7b142ab7a96b0075838826a7f6b975a151a285e00d99db307bea07b359d5ca44eb678ba93d97b2ae37a112f0002ae1c06bb6e5654b80ce8c5473aa20  Test-Exception-0.43.tar.gz"
+sha512sums="
+f5ab65ce7b142ab7a96b0075838826a7f6b975a151a285e00d99db307bea07b359d5ca44eb678ba93d97b2ae37a112f0002ae1c06bb6e5654b80ce8c5473aa20  Test-Exception-0.43.tar.gz
+"
diff --git a/main/perl-test-failwarnings/APKBUILD b/main/perl-test-failwarnings/APKBUILD
index 280764765e4..53c73e32abe 100644
--- a/main/perl-test-failwarnings/APKBUILD
+++ b/main/perl-test-failwarnings/APKBUILD
@@ -1,45 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-test-failwarnings
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-FailWarnings
 pkgver=0.008
-pkgrel=2
+pkgrel=5
 pkgdesc="Add test failures if warnings are caught"
 url="https://metacpan.org/release/Test-FailWarnings/"
 arch="noarch"
 license="Apache-2.0"
-cpandepends=""
-cpanmakedepends="perl-capture-tiny"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+depends="perl"
+makedepends="perl-dev"
+checkdepends="perl-capture-tiny"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-        cd "$builddir"
-        make test
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="7bffcc18191326095d99ad01be6426f4d9d927f769a156318f9abfea67da6adfecb657bad89390740c9f531fe69c717afa1d250258eed63d127bf10cbbf2bd51  Test-FailWarnings-0.008.tar.gz"
+sha512sums="
+7bffcc18191326095d99ad01be6426f4d9d927f769a156318f9abfea67da6adfecb657bad89390740c9f531fe69c717afa1d250258eed63d127bf10cbbf2bd51  Test-FailWarnings-0.008.tar.gz
+"
diff --git a/main/perl-test-fatal/APKBUILD b/main/perl-test-fatal/APKBUILD
index 87f4f8a9cc6..9af494bf50a 100644
--- a/main/perl-test-fatal/APKBUILD
+++ b/main/perl-test-fatal/APKBUILD
@@ -1,42 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-test-fatal
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-Fatal
-pkgver=0.014
-pkgrel=2
+pkgver=0.017
+pkgrel=1
 pkgdesc="incredibly simple helpers for testing code with exceptions"
 url="https://metacpan.org/release/Test-Fatal/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-try-tiny"
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-try-tiny"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Test-Fatal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="339d9b33231f8c8d93c0f9374a51458d004568a2f3e28471976e954c35d27efd348f68fb56e3cabd11dc47d37e7ce46282eba967c156ba5081811d221c6a7523  Test-Fatal-0.014.tar.gz"
+sha512sums="
+e88bb9749bd1cbc4ed169e13bcd5a1ac7411873d8ae00d8b7ecf1dfc39ed9a02f0286d885876913c69b5c90033144d5fda6a5517ef64175d13e284d3c971a6e7  Test-Fatal-0.017.tar.gz
+"
diff --git a/main/perl-test-file-sharedir/APKBUILD b/main/perl-test-file-sharedir/APKBUILD
index e137d1ba1c7..113981087b6 100644
--- a/main/perl-test-file-sharedir/APKBUILD
+++ b/main/perl-test-file-sharedir/APKBUILD
@@ -1,48 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 2
-# Contributor: 
-# Maintainer: 
+# Automatically generated by apkbuild-cpan, template 3
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=perl-test-file-sharedir
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-File-ShareDir
 pkgver=1.001002
-pkgrel=1
+pkgrel=5
 pkgdesc="Create a Fake ShareDir for your modules for testing."
 url="https://metacpan.org/release/Test-File-ShareDir/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-class-tiny perl-file-sharedir perl-file-copy-recursive perl-path-tiny perl-scope-guard"
-cpanmakedepends=""
-cpancheckdepends="perl-test-fatal"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-class-tiny perl-file-sharedir perl-file-copy-recursive perl-path-tiny perl-scope-guard"
+makedepends="perl-dev"
+checkdepends="perl-test-fatal"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/K/KE/KENTNL/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/K/KE/KENTNL/Test-File-ShareDir-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$builddir"
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-sha512sums="858fd7483a63fe4742e48663d64088b811658c9d24dfc730ae1fb5786818949133de98f1cc3a705f67ad97fed1144420a96c22e2cfa663c79953c33f1633f00e  Test-File-ShareDir-1.001002.tar.gz"
+sha512sums="
+858fd7483a63fe4742e48663d64088b811658c9d24dfc730ae1fb5786818949133de98f1cc3a705f67ad97fed1144420a96c22e2cfa663c79953c33f1633f00e  Test-File-ShareDir-1.001002.tar.gz
+"
diff --git a/main/perl-test-fork/APKBUILD b/main/perl-test-fork/APKBUILD
new file mode 100644
index 00000000000..530cda7426a
--- /dev/null
+++ b/main/perl-test-fork/APKBUILD
@@ -0,0 +1,36 @@
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Celeste <cielesti@protonmail.com>
+pkgname=perl-test-fork
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Test-Fork
+pkgver=0.02
+pkgrel=3
+pkgdesc="test code which forks"
+url="https://metacpan.org/release/Test-Fork/"
+arch="noarch"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-module-build"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/M/MS/MSCHWERN/Test-Fork-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
+}
+
+check() {
+	./Build test
+}
+
+package() {
+	./Build install --destdir="$pkgdir"
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="
+854f92eabc786735dfbc3c7d0ad29e4e65ee8c99bac1bebab79876c064dec60cbdfd7ef1f5a04d7a5f5dc73b633e903d4d68c4caedd5890914707b829bca46fa  Test-Fork-0.02.tar.gz
+"
diff --git a/main/perl-test-harness/APKBUILD b/main/perl-test-harness/APKBUILD
index 12eef0e00cb..4c768dfde3a 100644
--- a/main/perl-test-harness/APKBUILD
+++ b/main/perl-test-harness/APKBUILD
@@ -1,37 +1,33 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-test-harness
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-Harness
-pkgver=3.42
-pkgrel=1
-pkgdesc="Run Perl standard test scripts with statistics"
+pkgver=3.48
+pkgrel=0
+pkgdesc="Perl module for Test-Harness"
 url="https://metacpan.org/release/Test-Harness/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 subpackages="$pkgname-doc $pkgname-utils"
-source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/L/LE/LEONT/Test-Harness-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$builddir"
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make && make test
+	make test
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
@@ -39,18 +35,19 @@ utils() {
 	pkgdesc="$pkgdesc (utilities)"
 	depends="$pkgname perl"
 	replaces="perl-utils"
-	mkdir -p "$subpkgdir"/usr || return 1
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+
+	amove usr/bin
 }
 
 doc() {
 	default_doc
 	replaces="perl-doc"
-	local file; for file in $(find "$pkgdir" -name "*.pod"); do
-	file=${file#$pkgdir/}
-		mkdir -p "$subpkgdir"/${file%/*} || return 1
-		mv "$pkgdir"/$file "$subpkgdir"/$file || return 1
+
+	local file; find "$pkgdir" -name "*.pod" | while read -r file; do
+		amove "${file#"$pkgdir"}"
 	done
 }
 
-sha512sums="c9a3feec242772dd597be5e304dcf536c117dcad01cc2e22b8881e2bf24e5e3b1a119f3a29152a1602b6a2072b555f38c0fed8211198c2b2f6ee612df3d09b00  Test-Harness-3.42.tar.gz"
+sha512sums="
+7d65b48157ec7bc63553144f68e6233c07d21a4d127cefd5f77b2193c47f4d96325b15a9eb029ed62a19340f65659fcef0796ff7c6b07e5b5b8d539ddeee485c  Test-Harness-3.48.tar.gz
+"
diff --git a/main/perl-test-identity/APKBUILD b/main/perl-test-identity/APKBUILD
index dcd91a17ee3..81747037f0f 100644
--- a/main/perl-test-identity/APKBUILD
+++ b/main/perl-test-identity/APKBUILD
@@ -1,38 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-test-identity
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-Identity
 pkgver=0.01
-pkgrel=1
+pkgrel=5
 pkgdesc="assert the referential identity of a reference"
 url="https://metacpan.org/release/Test-Identity/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Test-Identity-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	perl Build.PL installdirs=vendor || return 1
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
 }
 
-build() {
-	cd "$_builddir"
-		export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	./Build && ./Build test
+check() {
+	./Build test
 }
 
 package() {
-	cd "$_builddir"
-	./Build install destdir="$pkgdir" || return 1
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="eee20978e2e39a11c5649b4609840f02686482f8fe4c0c2de639bfd9749ba9a08202f70b660432f1142ff800824ee2a6e9e43873f3f089041cd3e864ff502c32  Test-Identity-0.01.tar.gz"
+sha512sums="
+eee20978e2e39a11c5649b4609840f02686482f8fe4c0c2de639bfd9749ba9a08202f70b660432f1142ff800824ee2a6e9e43873f3f089041cd3e864ff502c32  Test-Identity-0.01.tar.gz
+"
diff --git a/main/perl-test-leaktrace/APKBUILD b/main/perl-test-leaktrace/APKBUILD
index 60fdc4daf16..52b042857d2 100644
--- a/main/perl-test-leaktrace/APKBUILD
+++ b/main/perl-test-leaktrace/APKBUILD
@@ -1,39 +1,35 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-test-leaktrace
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-LeakTrace
-pkgver=0.16
-pkgrel=3
-pkgdesc="Traces memory leaks"
+pkgver=0.17
+pkgrel=4
+pkgdesc="Perl module for Test-LeakTrace"
 url="https://metacpan.org/release/Test-LeakTrace/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/L/LE/LEEJO/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/L/LE/LEEJO/Test-LeakTrace-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="6fa7a5eaae01ca5232f3f297a104553dac5f57e4c6721d7084e5d44b0133206100878c7067b228b1e01b21f7639a97a0ec48ef77198deb0598d94d8861bab049  Test-LeakTrace-0.16.tar.gz"
+sha512sums="57ffd8c64ef871427c04419bda239d73e169f3b6ee268e0d4d7a27942c277d4b1f502e82e2e0df415b1050c0aa11944c2c3acb2e9b353855f77c91d1dfcaf00d  Test-LeakTrace-0.17.tar.gz"
diff --git a/main/perl-test-longstring/APKBUILD b/main/perl-test-longstring/APKBUILD
index 4fbe39a8694..ddf8c9d34e4 100644
--- a/main/perl-test-longstring/APKBUILD
+++ b/main/perl-test-longstring/APKBUILD
@@ -1,33 +1,29 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-test-longstring
-_pkgname=Test-LongString
+_pkgreal=Test-LongString
 pkgver=0.17
-pkgrel=1
+pkgrel=4
 pkgdesc="Tests strings for equality"
 url="https://metacpan.org/release/Test-LongString/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RG/RGARCIA/$_pkgname-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/R/RG/RGARCIA/Test-LongString-$pkgver.tar.gz"
 
-builddir="$srcdir/$_pkgname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-test-manifest/APKBUILD b/main/perl-test-manifest/APKBUILD
index 2c0d8e573f3..0edfb81f718 100644
--- a/main/perl-test-manifest/APKBUILD
+++ b/main/perl-test-manifest/APKBUILD
@@ -1,39 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-test-manifest
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-Manifest
-pkgver=2.021
-pkgrel=1
-pkgdesc="Interact with a t/test_manifest file"
+pkgver=2.024
+pkgrel=0
+pkgdesc="interact with a t/test_manifest file"
 url="https://metacpan.org/release/Test-Manifest/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="Artistic-2.0"
+depends="perl"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/B/BD/BDFOY/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/B/BD/BDFOY/Test-Manifest-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="dca3bef8373b9de119f5d2fa58c8a5fc4d8c1a914ca982300767f84087f8bdeb49a8a33e41f675c347fccbbab6a81f7eae8bc704e3d24e3088776cd0ea9f932c  Test-Manifest-2.021.tar.gz"
+sha512sums="
+e68b6e262296689b882e1c920b9592cd83f285bba11bbae93c5519c2f19504ecd58de8d6593c39a0b99f4c93fbde3a3236735bb6fa526918ffcf49cc8ccfad5e  Test-Manifest-2.024.tar.gz
+"
diff --git a/main/perl-test-metrics-any/APKBUILD b/main/perl-test-metrics-any/APKBUILD
new file mode 100644
index 00000000000..c69b1d2a366
--- /dev/null
+++ b/main/perl-test-metrics-any/APKBUILD
@@ -0,0 +1,34 @@
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Timothy Legge <timlegge@gmail.com>
+# Maintainer: Timothy Legge <timlegge@gmail.com>
+pkgname=perl-test-metrics-any
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Test-Metrics-Any
+pkgver=0.01
+pkgrel=2
+pkgdesc="assert that code produces metrics via L<Metrics::Any>"
+url="https://metacpan.org/release/Test-Metrics-Any/"
+arch="noarch"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-metrics-any"
+makedepends="perl-module-build"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Test-Metrics-Any-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
+}
+
+check() {
+	./Build test
+}
+
+package() {
+	./Build install --destdir="$pkgdir"
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="7102a8bf5c38bb186c648e2544a01914605e7d5e88ef8a848c301f39eca94af1823b2b40889bc9aabb4fd94573191896e2726f495a7ff03b9ab241d81cd4f304  Test-Metrics-Any-0.01.tar.gz"
diff --git a/main/perl-test-mockmodule/APKBUILD b/main/perl-test-mockmodule/APKBUILD
index c49c50ba93a..be6dc3f49d6 100644
--- a/main/perl-test-mockmodule/APKBUILD
+++ b/main/perl-test-mockmodule/APKBUILD
@@ -1,37 +1,36 @@
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Automatically generated by apkbuild-cpan, template 3
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-test-mockmodule
-_pkgname=Test-MockModule
-pkgver=0.172.0
-pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Test-MockModule
+pkgver=0.177.0
+pkgrel=1
 pkgdesc="Override subroutines in a module for unit testing"
-url="https://metacpan.org/release/Test-MockModule"
+url="https://metacpan.org/release/Test-MockModule/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl"
-makedepends="perl-dev perl-module-build perl-test-warnings perl-super
-	perl-sub-identify"
+depends="perl perl-super"
+makedepends="perl-module-build"
+checkdepends="perl-test-warnings perl-sub-identify"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/G/GF/GFRANKS/Test-MockModule-v$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-v$pkgver"
-
-prepare() {
-	default_prepare
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Build.PL installdirs=vendor prefix=/usr
-}
+source="https://cpan.metacpan.org/authors/id/G/GF/GFRANKS/Test-MockModule-v0.177.0.tar.gz"
+builddir="$srcdir/$_pkgreal-v0.177.0"
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Build
+	perl Build.PL --installdirs=vendor
+	./Build
 }
 
 check() {
-	PERL_MM_USE_DEFAULT=1 perl Build test
+	./Build test
 }
 
 package() {
-	PERL_MM_USE_DEFAULT=1 perl Build install destdir="$pkgdir"
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="056c53bc36d2b63f5eb5572c40721f252e33bc008547e46f4af2ecece868b8e9bbf91daca0484cb9d01ae489fa81cb18fdcd3325208d1f409e5e52d6f09ee323  Test-MockModule-v0.172.0.tar.gz"
+sha512sums="
+d28523202ba4dbf040e26a3cb0795297c2c4fc65598e7717a51ed8678bce308eec7eb3b5d5d35d71418b21c2c81833679cf1624e0e07c6b1e26e8f7605eb98b3  Test-MockModule-v0.177.0.tar.gz
+"
diff --git a/main/perl-test-mockobject/APKBUILD b/main/perl-test-mockobject/APKBUILD
index a500d9ca88c..56b44104498 100644
--- a/main/perl-test-mockobject/APKBUILD
+++ b/main/perl-test-mockobject/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor:  Jeff Bilyk <jbilyk@gmail.com>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-test-mockobject
-_pkgname=Test-MockObject
+_pkgreal=Test-MockObject
 pkgver=1.20200122
-pkgrel=0
+pkgrel=2
 pkgdesc="Perl Mock part of an object or class"
 url="https://metacpan.org/release/Test-MockObject/"
 arch="noarch"
@@ -12,8 +12,8 @@ depends="perl"
 makedepends="perl-dev"
 checkdepends="perl-test-warn perl-test-exception perl-universal-isa perl-universal-can"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/C/CH/CHROMATIC/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+source="https://cpan.metacpan.org/authors/id/C/CH/CHROMATIC/Test-MockObject-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
diff --git a/main/perl-test-mockrandom/APKBUILD b/main/perl-test-mockrandom/APKBUILD
index 56a01c08580..03c59d4a003 100644
--- a/main/perl-test-mockrandom/APKBUILD
+++ b/main/perl-test-mockrandom/APKBUILD
@@ -1,45 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-test-mockrandom
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-MockRandom
 pkgver=1.01
-pkgrel=2
+pkgrel=5
 pkgdesc="Replaces random number generation with non-random number generation"
 url="https://metacpan.org/release/Test-MockRandom/"
 arch="noarch"
 license="Apache-2.0"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Test-MockRandom-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="e222bd0d3d7673b403e80d1633ddaca0ee35f96f2245e8df859d661edc7efc09b9a96d3718f25b6614395d1f24d66c9498e842cec476cf8c5b12464d585f85e7  Test-MockRandom-1.01.tar.gz"
+sha512sums="
+e222bd0d3d7673b403e80d1633ddaca0ee35f96f2245e8df859d661edc7efc09b9a96d3718f25b6614395d1f24d66c9498e842cec476cf8c5b12464d585f85e7  Test-MockRandom-1.01.tar.gz
+"
diff --git a/main/perl-test-mocktime/APKBUILD b/main/perl-test-mocktime/APKBUILD
index 12c3288b376..1563022a33d 100644
--- a/main/perl-test-mocktime/APKBUILD
+++ b/main/perl-test-mocktime/APKBUILD
@@ -1,43 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-test-mocktime
-_pkgname=Test-MockTime
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Test-MockTime
 pkgver=0.17
-pkgrel=1
+pkgrel=4
 pkgdesc="Replaces actual time with simulated time"
 url="https://metacpan.org/release/Test-MockTime/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DD/DDICK/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+source="https://cpan.metacpan.org/authors/id/D/DD/DDICK/Test-MockTime-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="ad73be430e3a483a61209bacf4bfa170d6eec6597d3c0efcf5de167f9c129fbf656581dcdceeba88bd98e530371db2542894ded793f9d46e4155c612e2b7cac5  Test-MockTime-0.17.tar.gz"
+sha512sums="
+ad73be430e3a483a61209bacf4bfa170d6eec6597d3c0efcf5de167f9c129fbf656581dcdceeba88bd98e530371db2542894ded793f9d46e4155c612e2b7cac5  Test-MockTime-0.17.tar.gz
+"
diff --git a/main/perl-test-needs/APKBUILD b/main/perl-test-needs/APKBUILD
index 923e302999a..f0b6fd669a7 100644
--- a/main/perl-test-needs/APKBUILD
+++ b/main/perl-test-needs/APKBUILD
@@ -1,34 +1,35 @@
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-test-needs
-_pkgreal="Test-Needs"
-pkgver=0.002006
-pkgrel=0
-pkgdesc="Test::Needs perl module"
-url="https://metacpan.org/release/Test-Needs"
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Test-Needs
+pkgver=0.002010
+pkgrel=1
+pkgdesc="Skip tests when modules not available"
+url="https://metacpan.org/release/Test-Needs/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Test-Needs-$pkgver.tar.gz"
-
-builddir="$srcdir"/$_pkgreal-$pkgver
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="d0c1c527f486250a5c1e4b6e34e4ddcb1e7ab9233f9535b877cc36c8577592be28bf5f78567f45ec0388b276333742d1d15d7841827b64a8d170f475bd4488b7  Test-Needs-0.002006.tar.gz"
+sha512sums="
+1dde33f0b161a9cb99d1add141706ae015472a16620c38c159e3ae9654d749c275c7a4a979082c2720999305bf25129e7b178a9afdd6f4b4dfc9ee00281c76eb  Test-Needs-0.002010.tar.gz
+"
diff --git a/main/perl-test-notabs/APKBUILD b/main/perl-test-notabs/APKBUILD
index b4af58757f0..326485dc02d 100644
--- a/main/perl-test-notabs/APKBUILD
+++ b/main/perl-test-notabs/APKBUILD
@@ -3,43 +3,33 @@
 pkgname=perl-test-notabs
 _pkgreal=Test-NoTabs
 pkgver=2.02
-pkgrel=1
+pkgrel=3
 pkgdesc="Check the presence of tabs in your project"
 url="https://metacpan.org/release/Test-NoTabs/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends=""
-cpancheckdepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
 	default_prepare
-
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
 check() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
diff --git a/main/perl-test-nowarnings/APKBUILD b/main/perl-test-nowarnings/APKBUILD
index 87f9a0ee866..79ffcf75355 100644
--- a/main/perl-test-nowarnings/APKBUILD
+++ b/main/perl-test-nowarnings/APKBUILD
@@ -1,39 +1,36 @@
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-test-nowarnings
-pkgver=1.04
-pkgrel=2
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Test-NoWarnings
+pkgver=1.06
+pkgrel=1
 pkgdesc="Test::NoWarnings perl module"
 url="https://metacpan.org/release/Test-NoWarnings/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
-depends="perl perl-test-simple"
-makedepends="perl-dev"
-install=""
+license="LGPL-2.1-only"
+depends="perl"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/A/AD/ADAMK/Test-NoWarnings-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/H/HA/HAARG/Test-NoWarnings-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir"/Test-NoWarnings-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="48126d2385e6f7863067f541763f64bc72132f6093f316f75d15ad7dca9b863dc469dff18c6e3f93105647844acb5cd10e4d056d3aa19217cb9588eb8a5f0d7a  Test-NoWarnings-1.04.tar.gz"
+sha512sums="
+e8ceef3d56942996107a20843fd75fb4353f7ec787029e0f43c2d64f57267f2cb5be3b07d6744d32d41770181ce1c712f50f57df7bdea141acca75897485d7af  Test-NoWarnings-1.06.tar.gz
+"
diff --git a/main/perl-test-number-delta/APKBUILD b/main/perl-test-number-delta/APKBUILD
index 254b1255761..0ec6cae387e 100644
--- a/main/perl-test-number-delta/APKBUILD
+++ b/main/perl-test-number-delta/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-test-number-delta
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-Number-Delta
 pkgver=1.06
-pkgrel=1
+pkgrel=4
 pkgdesc="Compare the difference between numbers against a given tolerance"
 url="https://metacpan.org/release/Test-Number-Delta/"
 arch="noarch"
 license="Apache-2.0"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/Test-Number-Delta-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="87d64aad1ffc180ac9105d8f80aa1086ae9f6d11d7fead6f77daca6b0440320ed49dc628bed88b67836c091116fa43402b4a902e8319997fbad7a0fa19edfd79  Test-Number-Delta-1.06.tar.gz"
+sha512sums="
+87d64aad1ffc180ac9105d8f80aa1086ae9f6d11d7fead6f77daca6b0440320ed49dc628bed88b67836c091116fa43402b4a902e8319997fbad7a0fa19edfd79  Test-Number-Delta-1.06.tar.gz
+"
diff --git a/main/perl-test-output/APKBUILD b/main/perl-test-output/APKBUILD
index 95764654a51..bbb5f804225 100644
--- a/main/perl-test-output/APKBUILD
+++ b/main/perl-test-output/APKBUILD
@@ -1,44 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-test-output
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-Output
-pkgver=1.031
-pkgrel=1
+pkgver=1.034
+pkgrel=0
 pkgdesc="Utilities to test STDOUT and STDERR messages."
 url="https://metacpan.org/release/Test-Output/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-capture-tiny perl-sub-exporter perl-test-simple"
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="Artistic-2.0"
+depends="perl perl-capture-tiny perl-sub-exporter"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/B/BD/BDFOY/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/B/BD/BDFOY/Test-Output-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-check() {
-	cd "$builddir"
-	make test
-}
-
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="b443d5a4ab7be1c308b74ebc9a1a50022b404886e8a1dbd2700d974ead506a6976ec6d5c141528cf1c2833174c3afd9023362cb0b4e000f0e878d2e3e9f90e90  Test-Output-1.031.tar.gz"
+sha512sums="
+f7e6a121dbcaa6644b5128ba27c70894775bcb77e5c4abb3a2546d935cb1a99b3190230b2be76161377d0151665ec97303c48746b224d1b2301803e6082b0283  Test-Output-1.034.tar.gz
+"
diff --git a/main/perl-test-pod-coverage/APKBUILD b/main/perl-test-pod-coverage/APKBUILD
index d2c7700636f..7125dad7606 100644
--- a/main/perl-test-pod-coverage/APKBUILD
+++ b/main/perl-test-pod-coverage/APKBUILD
@@ -1,36 +1,33 @@
 # Contributor: Mika Havela <mika.havela@gmail.com>
 # Maintainer: Mika Havela <mika.havela@gmail.com>
 pkgname=perl-test-pod-coverage
-_realname=Test-Pod-Coverage
+_pkgreal=Test-Pod-Coverage
 pkgver=1.10
-pkgrel=1
+pkgrel=5
 pkgdesc="Perl - Check for pod coverage in your distribution."
 url="https://metacpan.org/release/Test-Pod-Coverage/"
 arch="noarch"
-license="Artistic GPL"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl perl-pod-coverage perl-test-pod perl-devel-symdump"
-makedepends="perl-dev"
-install=
 source="https://cpan.metacpan.org/authors/id/N/NE/NEILB/Test-Pod-Coverage-$pkgver.tar.gz"
 
-_builddir="$srcdir/$_realname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$_builddir"
+build() {
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
-	make test || return 1
+check() {
+	make test
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="ebcebb900f4367984245d1915937200e2de8586a6e6ea9c9b71588e56caf68808ee73c21e633434ab5c43b80b42dd56cb0cbd4e67519e928270e1eda06c1d02c  Test-Pod-Coverage-1.10.tar.gz"
+sha512sums="
+ebcebb900f4367984245d1915937200e2de8586a6e6ea9c9b71588e56caf68808ee73c21e633434ab5c43b80b42dd56cb0cbd4e67519e928270e1eda06c1d02c  Test-Pod-Coverage-1.10.tar.gz
+"
diff --git a/main/perl-test-pod/APKBUILD b/main/perl-test-pod/APKBUILD
index df26895d77f..c85086c8ef9 100644
--- a/main/perl-test-pod/APKBUILD
+++ b/main/perl-test-pod/APKBUILD
@@ -1,44 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-test-pod
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-Pod
 pkgver=1.52
-pkgrel=1
+pkgrel=4
 pkgdesc="check for POD errors in files"
 url="https://metacpan.org/release/Test-Pod/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Test-Pod-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="9b078488e1da8b907f5f3a46452aa9bfd49db61f1539d076dccebf9a8b476eaf0f539f00badc9c500b1e732a8827331b2286375924986efb990367767eeb8365  Test-Pod-1.52.tar.gz"
+sha512sums="
+9b078488e1da8b907f5f3a46452aa9bfd49db61f1539d076dccebf9a8b476eaf0f539f00badc9c500b1e732a8827331b2286375924986efb990367767eeb8365  Test-Pod-1.52.tar.gz
+"
diff --git a/main/perl-test-refcount/APKBUILD b/main/perl-test-refcount/APKBUILD
index a587a0f5787..6e15f8a47a0 100644
--- a/main/perl-test-refcount/APKBUILD
+++ b/main/perl-test-refcount/APKBUILD
@@ -1,29 +1,24 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Sheila Aman <sheila@vulpine.house>
+# Maintainer: Sheila Aman <sheila@vulpine.house>
 pkgname=perl-test-refcount
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-Refcount
 pkgver=0.10
-pkgrel=1
+pkgrel=5
 pkgdesc="assert reference counts on objects"
-url="https://metacpan.org/release/Test-Refcount"
+url="https://metacpan.org/release/Test-Refcount/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+depends="perl"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/Test-Refcount-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	perl Build.PL installdirs=vendor
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
 	./Build
 }
 
@@ -32,9 +27,10 @@ check() {
 }
 
 package() {
-	cd "$builddir"
-	./Build install destdir="$pkgdir"
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="7fac2a6bcb96da0ed61c53aaa2278e1ac998bd62314b95f307fe6ee032fd7d89264968f3ad78066186b112af0ba45960d5d1c81822bcd5f218418ea81236c4e1  Test-Refcount-0.10.tar.gz"
+sha512sums="
+7fac2a6bcb96da0ed61c53aaa2278e1ac998bd62314b95f307fe6ee032fd7d89264968f3ad78066186b112af0ba45960d5d1c81822bcd5f218418ea81236c4e1  Test-Refcount-0.10.tar.gz
+"
diff --git a/main/perl-test-requires/APKBUILD b/main/perl-test-requires/APKBUILD
index 3b1b60f0803..3c518de9d53 100644
--- a/main/perl-test-requires/APKBUILD
+++ b/main/perl-test-requires/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-test-requires
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-Requires
-pkgver=0.10
-pkgrel=1
+pkgver=0.11
+pkgrel=3
 pkgdesc="Checks to see if the module can be loaded"
 url="https://metacpan.org/release/Test-Requires/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/T/TO/TOKUHIROM/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/T/TO/TOKUHIROM/Test-Requires-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="5bc6bf52ae5ab3c56f49b7b17faedf7d6afef2cadfca8aab4770f2c2f91cd4fcb98921e1af159d1dc42684b80f50d4b7fc12bd05ef9dccdcbeeeb6100a9e5ae6  Test-Requires-0.10.tar.gz"
+sha512sums="
+770ea2469e386296fe1ded3630fa9b7f30ee22acd3522fb83ad95171ccb96812ef2fc5fa30d658a405dc1c435d35b6d476cc054021d74e04b419b517f6f898fa  Test-Requires-0.11.tar.gz
+"
diff --git a/main/perl-test-requiresinternet/APKBUILD b/main/perl-test-requiresinternet/APKBUILD
index 63d28a3bbaa..20839a85675 100644
--- a/main/perl-test-requiresinternet/APKBUILD
+++ b/main/perl-test-requiresinternet/APKBUILD
@@ -2,38 +2,33 @@
 pkgname=perl-test-requiresinternet
 _pkgreal=Test-RequiresInternet
 pkgver=0.05
-pkgrel=2
+pkgrel=4
 pkgdesc="Easily test network connectivity"
 url="https://metacpan.org/release/Test-RequiresInternet/"
 arch="noarch"
-license="GPL PerlArtistic"
-makedepends="perl-dev"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/M/MA/MALLEN/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
 	default_prepare
-
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
 check() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
diff --git a/main/perl-test-script/APKBUILD b/main/perl-test-script/APKBUILD
index 2771d00b6b1..6998a64493f 100644
--- a/main/perl-test-script/APKBUILD
+++ b/main/perl-test-script/APKBUILD
@@ -1,41 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-test-script
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-Script
-pkgver=1.26
-pkgrel=0
+pkgver=1.29
+pkgrel=2
 pkgdesc="Basic cross-platform tests for scripts"
-url="https://metacpan.org/release/Test-Script"
+url="https://metacpan.org/release/Test-Script/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl-ipc-run3 perl-probe-perl perl-test-simple"
+depends="perl perl-probe-perl perl-capture-tiny"
 makedepends="perl-dev $cpanmakedepends"
-checkdepends="perl-test2-suite perl-capture-tiny"
+checkdepends="perl-test2-suite"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Test-Script-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-check() {
-	cd "$builddir"
-	make test
-}
-
-prepare() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="9cca12ff9cb8de394cac760da16b39d371a70fa9624adc8d4e97ee45f0b18ccb41add99716ed6a969aaeb2df5ee3f1aa7cb287e2d93ee8533c89bbd0cf6b2c96  Test-Script-1.26.tar.gz"
+sha512sums="
+979fade0abc83f8d7d4c1c094fa928e27bd7c9db52140b156689d3b192d9ea84f5824554d6788c9144cf2923a04b1d8a8bdfdcc05a0be5514de92353c9a7d10f  Test-Script-1.29.tar.gz
+"
diff --git a/main/perl-test-sharedfork/APKBUILD b/main/perl-test-sharedfork/APKBUILD
index f8c9014d63c..9f7da3d0d77 100644
--- a/main/perl-test-sharedfork/APKBUILD
+++ b/main/perl-test-sharedfork/APKBUILD
@@ -2,13 +2,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-test-sharedfork
 pkgver=0.35
-pkgrel=1
+pkgrel=3
 pkgdesc="Test::SharedFork perl module"
 url="https://metacpan.org/release/Test-SharedFork"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-test-requires"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test-SharedFork-$pkgver.tar.gz"
 
diff --git a/main/perl-test-simple/APKBUILD b/main/perl-test-simple/APKBUILD
index 910ef42d721..3ad4148519e 100644
--- a/main/perl-test-simple/APKBUILD
+++ b/main/perl-test-simple/APKBUILD
@@ -1,46 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-test-simple
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-Simple
-pkgver=1.302174
+pkgver=1.302198
 pkgrel=0
-pkgdesc="Basic utilities for writing tests."
-url="https://metacpan.org/release/Test-Simple"
+pkgdesc="Basic utilities for writing tests"
+url="https://metacpan.org/release/Test-Simple/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-provides="perl-test-tester"
 depends="perl"
-makedepends="perl-dev"
-subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test-Simple-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
-package() {
-	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
 check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
-doc() {
-	default_doc
-	replaces="perl-doc"
+package() {
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+
+	# prevent conflict with main/perl
+	rm -rf "$pkgdir"/usr/share/man
 }
 
-sha512sums="c6ab88fec0ed4bac5a9342451b993c61ecf254fe8fab678c904ede01a09a5d8bc772103a29830829cb10fc852ea4571d7bd74b9f3cbb5efb28c9514c6c90e0c3  Test-Simple-1.302174.tar.gz"
+sha512sums="
+b59ed1033338219cd6352f825ed3657b6dc8e2cd38ac7ccd062181b2e2076d6ba48a7d559a20f75e68718165874231c2434f3a73b78d645947d129ebf1d8b04e  Test-Simple-1.302198.tar.gz
+"
diff --git a/main/perl-test-taint/APKBUILD b/main/perl-test-taint/APKBUILD
index 2049b47a15e..d63873605e8 100644
--- a/main/perl-test-taint/APKBUILD
+++ b/main/perl-test-taint/APKBUILD
@@ -1,33 +1,29 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-test-taint
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-Taint
 pkgver=1.08
-pkgrel=2
+pkgrel=8
 pkgdesc="Checks for taintedness of variables"
-url="https://metacpan.org/release/Test-Taint"
+url="https://metacpan.org/release/Test-Taint/"
 arch="all"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpanmakedepends="perl-test-pod perl-test-pod-coverage"
 depends="perl"
-makedepends="perl-dev $cpanmakedepends"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/Test-Taint-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -36,4 +32,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="2a7e3a60756c802dc33ac0b2a4102463de59fe92ba3cd83cb02e01e9f7aa13978c7a8ac7dcfdcf3c0d934af40e5189421874da819be9258e91080b777be71b20  Test-Taint-1.08.tar.gz"
+sha512sums="
+2a7e3a60756c802dc33ac0b2a4102463de59fe92ba3cd83cb02e01e9f7aa13978c7a8ac7dcfdcf3c0d934af40e5189421874da819be9258e91080b777be71b20  Test-Taint-1.08.tar.gz
+"
diff --git a/main/perl-test-tcp/APKBUILD b/main/perl-test-tcp/APKBUILD
index 71881fd5009..84e1e4a130a 100644
--- a/main/perl-test-tcp/APKBUILD
+++ b/main/perl-test-tcp/APKBUILD
@@ -1,36 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-test-tcp
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-TCP
 pkgver=2.22
-pkgrel=0
-pkgdesc="Testing TCP program"
-url="https://metacpan.org/release/Test-TCP"
+pkgrel=3
+pkgdesc="testing TCP program"
+url="https://metacpan.org/release/Test-TCP/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends="perl-test-sharedfork"
-depends="$cpandepends"
-makedepends="perl-dev perl-module-build"
+depends="perl perl-test-sharedfork"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA/Test-TCP-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
-	make install DESTDIR=$pkgdir
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="2e0c8cf710f9702eee9b00422d7133efe87575805361d72becd2c3de671c765baf84827b601d26091e8a6b8595e6d9f168f90b7cfda402d668deb6fc277e37ad  Test-TCP-2.22.tar.gz"
+sha512sums="
+2e0c8cf710f9702eee9b00422d7133efe87575805361d72becd2c3de671c765baf84827b601d26091e8a6b8595e6d9f168f90b7cfda402d668deb6fc277e37ad  Test-TCP-2.22.tar.gz
+"
diff --git a/main/perl-test-warn/APKBUILD b/main/perl-test-warn/APKBUILD
index 97361cd5fd6..ad1a05beba8 100644
--- a/main/perl-test-warn/APKBUILD
+++ b/main/perl-test-warn/APKBUILD
@@ -1,33 +1,29 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-test-warn
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-Warn
-pkgver=0.36
-pkgrel=1
+pkgver=0.37
+pkgrel=2
 pkgdesc="Perl extension to test methods for warnings"
-url="https://metacpan.org/release/Test-Warn"
+url="https://metacpan.org/release/Test-Warn/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl-sub-uplevel"
+depends="perl perl-sub-uplevel"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/B/BI/BIGJ/Test-Warn-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -36,4 +32,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="f1f671d740267f8f360011ae1f2fede9894ad02e099f8fc9707d39a1bfec5507b113bb630e4dfeb56113e121b3ffeef8c7f112be5b201995fc21b3c2efdad2d2  Test-Warn-0.36.tar.gz"
+sha512sums="
+908f3c5c68463ab72f70759032116465f4f63519dd5112666dd6ddcfd5e52163fd433d9eb459dafd721d85c64464549476c6e0bfcfff56d27cf44689fadfce67  Test-Warn-0.37.tar.gz
+"
diff --git a/main/perl-test-warnings/APKBUILD b/main/perl-test-warnings/APKBUILD
index c4ee2c3f9d2..eabf9347265 100644
--- a/main/perl-test-warnings/APKBUILD
+++ b/main/perl-test-warnings/APKBUILD
@@ -4,15 +4,13 @@
 pkgname=perl-test-warnings
 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test-Warnings
-pkgver=0.030
+pkgver=0.033
 pkgrel=0
 pkgdesc="Test for warnings and the lack of them"
 url="https://metacpan.org/release/Test-Warnings/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
-checkdeps="perl-cpan-meta-check"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Test-Warnings-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
@@ -33,4 +31,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="bb9fe480263b700d499fb6bff4321711807f63c0c96d1dd9b27fa8ee1d8a629fe23c46f37125a4c569c5bf784ff35fccce5815dfa93af55b2dfdcc99311fb40b  Test-Warnings-0.030.tar.gz"
+sha512sums="
+dc49e345b2b5d2dd42d83b4351025f2c0db0216ef8388b02db77d5078e5eda0b5aab1491b07a0009923acc73b30c4ef6d77d406e85b0f958f575007c6ca1e6e8  Test-Warnings-0.033.tar.gz
+"
diff --git a/main/perl-test-without-module/APKBUILD b/main/perl-test-without-module/APKBUILD
index f525492cc28..263b3079083 100644
--- a/main/perl-test-without-module/APKBUILD
+++ b/main/perl-test-without-module/APKBUILD
@@ -1,14 +1,13 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-test-without-module
 _pkgreal="Test-Without-Module"
-pkgver=0.20
+pkgver=0.21
 pkgrel=1
 pkgdesc="Test::Without::Module perl module"
 url="https://metacpan.org/pod/Test::Without::Module"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/C/CO/CORION/Test-Without-Module-$pkgver.tar.gz"
 
@@ -28,4 +27,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="e92353cee46e712ddc6515c5872a61a84eb4186f9ce736bbf0fcca2979bfa7143588c05e683d31fc22cbaaa792ce8364768310f9de621e881cc207b80cf14d87  Test-Without-Module-0.20.tar.gz"
+sha512sums="
+0d9230e15fa46001458a8e4a1ad97d24a8766b9df8326d166da92763a01624d01972d023951d3c58e9bbfd4e0d23e92d610565873a622eaaf87c8ec2a4f0a7f7  Test-Without-Module-0.21.tar.gz
+"
diff --git a/main/perl-test-without/APKBUILD b/main/perl-test-without/APKBUILD
index f1e86237212..01fa3d1b8a6 100644
--- a/main/perl-test-without/APKBUILD
+++ b/main/perl-test-without/APKBUILD
@@ -2,13 +2,12 @@
 pkgname=perl-test-without
 _pkgreal="Test-Without"
 pkgver=0.10
-pkgrel=1
+pkgrel=3
 pkgdesc="Test::Without perl module"
 url="https://metacpan.org/pod/Test::Without"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/R/RJ/RJRAY/Test-Without-$pkgver.tar.gz"
 
diff --git a/main/perl-test2-plugin-nowarnings/APKBUILD b/main/perl-test2-plugin-nowarnings/APKBUILD
index a801bb3f9c6..e7f34310b49 100644
--- a/main/perl-test2-plugin-nowarnings/APKBUILD
+++ b/main/perl-test2-plugin-nowarnings/APKBUILD
@@ -1,35 +1,38 @@
+# Automatically generated by apkbuild-cpan, template 4
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-test2-plugin-nowarnings
-_pkgreal="Test2-Plugin-NoWarnings"
-pkgver=0.08
-pkgrel=1
-pkgdesc="Test2::Plugin::NoWarnings perl module"
-url="https://metacpan.org/release/Test2-Plugin-NoWarnings"
+pkgver=0.10
+pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Test2-Plugin-NoWarnings
+pkgdesc="Fail tests if warnings are generated"
+url="https://metacpan.org/release/Test2-Plugin-NoWarnings/"
 arch="noarch"
 license="Artistic-2.0"
-depends="perl-ipc-run3 perl-test2-suite perl-test-simple"
-makedepends="perl-dev"
-checkdepends="perl-capture-tiny"
+depends="perl perl-test2-suite"
+checkdepends="perl-ipc-run3 perl-module-pluggable"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="cf641f77b8466bbaf9d9fc166526853f64c9c66e4b1c415af521e81df76760aa3bde0634827d19c9e760c2b763c86e3923af0df83a4e2ddb4c28b8ebbc64eb63  Test2-Plugin-NoWarnings-0.08.tar.gz"
+sha512sums="
+31f749911e9df452e20d17c4cff30afea1f4ef10a11c7d7de92d60b6701b84bf98190ccb5d70867804793fe269b0027a8f9b494a21c1d676480e8ce2823a4b4d  Test2-Plugin-NoWarnings-0.10.tar.gz
+"
diff --git a/main/perl-test2-suite/APKBUILD b/main/perl-test2-suite/APKBUILD
index e53abe347dd..014e473c96f 100644
--- a/main/perl-test2-suite/APKBUILD
+++ b/main/perl-test2-suite/APKBUILD
@@ -1,33 +1,28 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-test2-suite
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Test2-Suite
-pkgver=0.000129
+pkgver=0.000159
 pkgrel=0
 pkgdesc="Distribution with a rich set of tools built upon the Test2 framework."
-url="https://metacpan.org/release/Test2-Suite"
+url="https://metacpan.org/release/Test2-Suite/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends="perl-test-simple perl-importer perl-term-table perl-sub-info
-	perl-scope-guard perl-module-pluggable"
-depends="$cpandepends"
-makedepends="perl-dev"
+depends="perl perl-term-table perl-scope-guard perl-sub-info perl-importer perl-module-pluggable"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Test2-Suite-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -36,4 +31,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="0d72ab6998f741ba016e1398a45b751930a016488b7b02117d476d6e8d6656a4de0f2ceae379260472d0eba7e8ca00e6bfa59240ee09c71ed9963be3dfd249da  Test2-Suite-0.000129.tar.gz"
+sha512sums="
+ab132e87f0db5dde0ebd95b260236d95120445c89db497e92519335e989d8571481f2497898cd5fae25cb2065db1aa8902a9f2d37cf2163475caca1298629a3f  Test2-Suite-0.000159.tar.gz
+"
diff --git a/main/perl-text-autoformat/APKBUILD b/main/perl-text-autoformat/APKBUILD
index 35f2e610ab3..32b02697b82 100644
--- a/main/perl-text-autoformat/APKBUILD
+++ b/main/perl-text-autoformat/APKBUILD
@@ -1,33 +1,29 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-text-autoformat
-_pkgname=Text-Autoformat
+_pkgreal=Text-Autoformat
 pkgver=1.75
-pkgrel=0
+pkgrel=2
 pkgdesc="Text::Autoformat perl module"
 url="https://metacpan.org/release/Text-Autoformat"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl perl-text-reform"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/N/NE/NEILB/Text-Autoformat-$pkgver.tar.gz"
 
-builddir="$srcdir/$_pkgname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-text-csv/APKBUILD b/main/perl-text-csv/APKBUILD
index 18db46c1187..5893edeee39 100644
--- a/main/perl-text-csv/APKBUILD
+++ b/main/perl-text-csv/APKBUILD
@@ -1,35 +1,33 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-text-csv
-_pkgname=Text-CSV
-pkgver=2.00
+_pkgreal=Text-CSV
+pkgver=2.04
 pkgrel=0
 pkgdesc="Manipulate comma-separated value strings"
 url="https://metacpan.org/release/Text-CSV"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/Text-CSV-$pkgver.tar.gz"
 
-builddir="$srcdir/$_pkgname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" -name '.packlist' -delete
 	find "$pkgdir" -name '*.pod' -delete
 }
 
-sha512sums="ac41e8e1a56f30eac9076e8c53584186df83e4b1bf32ac52aef862ff7a02ada2801df2eac710b89e06901342c8513844d3dbbc86fc53d7a3d3da5f91f69dd88f  Text-CSV-2.00.tar.gz"
+sha512sums="
+72673380a955ee888a78aca4188326c1adbdc9508a25752d76eb6f50064181763336b4983bffb944c88110ceb48dde356c092f8189369001513799f220d5021d  Text-CSV-2.04.tar.gz
+"
diff --git a/main/perl-text-password-pronounceable/APKBUILD b/main/perl-text-password-pronounceable/APKBUILD
index 615ca9f7d49..d20f75d4c8d 100644
--- a/main/perl-text-password-pronounceable/APKBUILD
+++ b/main/perl-text-password-pronounceable/APKBUILD
@@ -2,31 +2,28 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-text-password-pronounceable
 pkgver=0.30
-pkgrel=2
+pkgrel=5
 pkgdesc="Text::Password::Pronounceable perl module"
 url="https://metacpan.org/release/Text-Password-Pronounceable/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev perl-module-install"
+makedepends="perl-module-install"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/T/TS/TSIBLEY/Text-Password-Pronounceable-$pkgver.tar.gz"
 
 builddir="$srcdir/Text-Password-Pronounceable-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-text-reform/APKBUILD b/main/perl-text-reform/APKBUILD
index 6ea064da356..ba249c3820d 100644
--- a/main/perl-text-reform/APKBUILD
+++ b/main/perl-text-reform/APKBUILD
@@ -2,13 +2,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-text-reform
 pkgver=1.20
-pkgrel=1
+pkgrel=4
 pkgdesc="Text::Reform perl module"
 url="https://metacpan.org/release/Text-Reform"
 arch="noarch"
-license="GPL-1.0-or-later or Artistic-1.0-Perl"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/C/CH/CHORNY/Text-Reform-$pkgver.tar.gz"
 
diff --git a/main/perl-text-soundex/APKBUILD b/main/perl-text-soundex/APKBUILD
index 8d8fe7df26c..c164d338e3f 100644
--- a/main/perl-text-soundex/APKBUILD
+++ b/main/perl-text-soundex/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-text-soundex
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Text-Soundex
 pkgver=3.05
-pkgrel=3
-pkgdesc="Implementation of the soundex algorithm"
+pkgrel=9
+pkgdesc="Perl module for Text-Soundex"
 url="https://metacpan.org/release/Text-Soundex/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Text-Soundex-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="f7ea405cb5960cc2e3f5e257c18c1bbb499c5244ad6a6d14612f07329fd2177ad71dcdde85129e65c65541d61e45d7e9e4097c37ca6cead9783838900b3ebbec  Text-Soundex-3.05.tar.gz"
+sha512sums="
+f7ea405cb5960cc2e3f5e257c18c1bbb499c5244ad6a6d14612f07329fd2177ad71dcdde85129e65c65541d61e45d7e9e4097c37ca6cead9783838900b3ebbec  Text-Soundex-3.05.tar.gz
+"
diff --git a/main/perl-text-vfile-asdata/APKBUILD b/main/perl-text-vfile-asdata/APKBUILD
index 2ffd7a36548..9dc088a99dc 100644
--- a/main/perl-text-vfile-asdata/APKBUILD
+++ b/main/perl-text-vfile-asdata/APKBUILD
@@ -1,37 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-text-vfile-asdata
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Text-vFile-asData
 pkgver=0.08
-pkgrel=1
+pkgrel=4
 pkgdesc="parse vFile formatted files into data structures"
 url="https://metacpan.org/release/Text-vFile-asData/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-class-accessor-chained"
-cpanmakedepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-class-accessor-chained"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/Text-vFile-asData-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="04ec51061a7dc1c19d00edfcb3740deae7c70372e8d5eba868e2e62326f0084fbb3f8237f7cffaf1a5d2f49a5ceac7dcc7ea391e1effe78923b6b0e523b2728b  Text-vFile-asData-0.08.tar.gz"
+sha512sums="
+04ec51061a7dc1c19d00edfcb3740deae7c70372e8d5eba868e2e62326f0084fbb3f8237f7cffaf1a5d2f49a5ceac7dcc7ea391e1effe78923b6b0e523b2728b  Text-vFile-asData-0.08.tar.gz
+"
diff --git a/main/perl-text-wikiformat/APKBUILD b/main/perl-text-wikiformat/APKBUILD
index 512d92209e5..775ca00ec23 100644
--- a/main/perl-text-wikiformat/APKBUILD
+++ b/main/perl-text-wikiformat/APKBUILD
@@ -1,39 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-text-wikiformat
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Text-WikiFormat
 pkgver=0.81
-pkgrel=1
+pkgrel=4
 pkgdesc="module for translating Wiki formatted text into other formats"
 url="https://metacpan.org/release/Text-WikiFormat/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends="perl-uri"
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends perl-module-build"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-uri"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/C/CY/CYCLES/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/C/CY/CYCLES/Text-WikiFormat-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	perl Build.PL installdirs=vendor || return 1
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	./Build && ./Build test
+check() {
+	./Build test
 }
 
 package() {
-	cd "$_builddir"
-	./Build install destdir="$pkgdir" || return 1
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="60c781b9bda9dbd5f533a1cef326110f7aebe79078e38ba8ecf2e9d6c1b93cad552077a2015748186d04b7cd457fc63ab297ca24c01e321f1869dfafc4f1b4e2  Text-WikiFormat-0.81.tar.gz"
+sha512sums="
+60c781b9bda9dbd5f533a1cef326110f7aebe79078e38ba8ecf2e9d6c1b93cad552077a2015748186d04b7cd457fc63ab297ca24c01e321f1869dfafc4f1b4e2  Text-WikiFormat-0.81.tar.gz
+"
diff --git a/main/perl-text-wrapper/APKBUILD b/main/perl-text-wrapper/APKBUILD
index b8779cafd41..87a04763547 100644
--- a/main/perl-text-wrapper/APKBUILD
+++ b/main/perl-text-wrapper/APKBUILD
@@ -1,44 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-text-wrapper
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Text-Wrapper
 pkgver=1.05
-pkgrel=2
+pkgrel=5
 pkgdesc="Word wrap text by breaking long lines"
 url="https://metacpan.org/release/Text-Wrapper/"
 arch="noarch"
-license="GPL PerlArtistic"
-depends="$cpandepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/C/CJ/CJM/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/C/CJ/CJM/Text-Wrapper-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="8efd94ad7880069a37205a4b6e38d4b03ce8d83869994916abb831498e1e3d1bc23df39e8546b5b0953db7e0c8e7ef29aa237f8cf20452dc9e4263e49e31dad9  Text-Wrapper-1.05.tar.gz"
+sha512sums="
+8efd94ad7880069a37205a4b6e38d4b03ce8d83869994916abb831498e1e3d1bc23df39e8546b5b0953db7e0c8e7ef29aa237f8cf20452dc9e4263e49e31dad9  Text-Wrapper-1.05.tar.gz
+"
diff --git a/main/perl-time-hires/APKBUILD b/main/perl-time-hires/APKBUILD
index 62744fd67f4..8645529a083 100644
--- a/main/perl-time-hires/APKBUILD
+++ b/main/perl-time-hires/APKBUILD
@@ -1,49 +1,39 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-time-hires
-_pkgname=Time-HiRes
-pkgver=1.9760
-pkgrel=2
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Time-HiRes
+pkgver=1.9764
+pkgrel=7
 pkgdesc="High resolution alarm, sleep, gettimeofday, interval timers"
-url="http://search.cpan.org/~jhi/Time-HiRes/"
+url="https://metacpan.org/release/Time-HiRes/"
 arch="all"
-license="GPL-1.0-only Artistic-1.0-Perl"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-subpackages="$pkgname-doc"
-options="!check" # see comment below
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 source="https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/Time-HiRes-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-check() {
-	# tests depends on hi res support of timestamps in filesystem
-	# we cannot guarantee that we have that so skip tests for now
-	# make test
-	return 0
-}
 
-doc() {
-	default_doc
-	replaces="perl-doc"
+	# man pages are already provided by perl-doc
+	rm -rf "$pkgdir"/usr/share/man
 }
 
-sha512sums="f355566740cb5d4dd533da2cb9209d955e5b7f6ed9e67c7fa37ca8336bacffe32d037700104915580c5a00534b5f2ff502542c4c4114e5f67e51e46856128b2a  Time-HiRes-1.9760.tar.gz"
+sha512sums="
+2c250784e0375539690173eaf19390389c59c218dade036ff150e2e4445e7916438d9598000bc3dbffaa2da5ee183850dedf0b6d9c99d76bfc75bb23fa7022bc  Time-HiRes-1.9764.tar.gz
+"
diff --git a/main/perl-time-parsedate/APKBUILD b/main/perl-time-parsedate/APKBUILD
index 962bc577eda..39896d5a915 100644
--- a/main/perl-time-parsedate/APKBUILD
+++ b/main/perl-time-parsedate/APKBUILD
@@ -1,19 +1,21 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timothy Legge <timlegge@gmail.com>
 # Maintainer: Timothy Legge <timlegge@gmail.com>
 pkgname=perl-time-parsedate
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Time-ParseDate
 pkgver=2015.103
-pkgrel=3
+pkgrel=6
 pkgdesc="Parse and format time values"
+replaces="perl-time-modules"
 url="https://metacpan.org/release/Time-ParseDate/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/M/MU/MUIR/modules/Time-ParseDate-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
-replaces=perl-time-modules
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
@@ -31,4 +33,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="3c5bf09198289a889e606c806fbb225e729fa1a0af6d04056b75c4c61110e6135fce0eccd8c58a2f1db364d7d624b417f4960bdfa376d2fb9b16ecf090879fd0  Time-ParseDate-2015.103.tar.gz"
+sha512sums="
+3c5bf09198289a889e606c806fbb225e729fa1a0af6d04056b75c4c61110e6135fce0eccd8c58a2f1db364d7d624b417f4960bdfa376d2fb9b16ecf090879fd0  Time-ParseDate-2015.103.tar.gz
+"
diff --git a/main/perl-timedate/APKBUILD b/main/perl-timedate/APKBUILD
index 3979c3953b7..52d6f8f6929 100644
--- a/main/perl-timedate/APKBUILD
+++ b/main/perl-timedate/APKBUILD
@@ -1,36 +1,30 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-timedate
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=TimeDate
-pkgver=2.32
-pkgrel=0
-pkgdesc="Perl TimeDate module"
-url="https://metacpan.org/release/TimeDate"
+pkgver=2.33
+pkgrel=4
+pkgdesc="Perl module for TimeDate"
+provides="perl-time-date=$pkgver-r$pkgrel perl-date-format=$pkgver-r$pkgrel"
+replaces="perl-time-date perl-date-format"
+url="https://metacpan.org/release/TimeDate/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/TimeDate-$pkgver.tar.gz"
-
-replaces="perl-time-date"
-provides="perl-time-date=$pkgver"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -39,4 +33,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="7c451c3a69b32db1ec8ec21462eef2ac5e3a63f8eb6521260362a396f39c0c0f93efaf6f2903ade82175b391f09b7d6f6121b68fbf9f5dde421a8b5dd65476bf  TimeDate-2.32.tar.gz"
+sha512sums="
+a3a20a0d9439e68bf621c66fad0598e6257345727be79c87c7cc99994b3a58eb738787fedb720beb069e9758ad1347c15313f64411806dd0f4dfbcca5061c820  TimeDate-2.33.tar.gz
+"
diff --git a/main/perl-tk/APKBUILD b/main/perl-tk/APKBUILD
new file mode 100644
index 00000000000..216fc8e127b
--- /dev/null
+++ b/main/perl-tk/APKBUILD
@@ -0,0 +1,35 @@
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Timothy Legge <timlegge@gmail.com>
+# Maintainer: Timothy Legge <timlegge@gmail.com>
+pkgname=perl-tk
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Tk
+pkgver=804.036
+pkgrel=5
+pkgdesc="Tk - a Graphical User Interface Toolkit"
+url="https://metacpan.org/release/Tk/"
+arch="all"
+license="TCL AND HPND-Pbmplus AND CC-BY-SA-3.0 AND MIT-open-group AND MIT"
+depends="perl"
+makedepends="perl-dev libx11-dev libpng-dev"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/S/SR/SREZIC/Tk-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
+}
+
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="7d8b82127a5fdbb2f0387f541af8844a09f1230f377b92d511ecb12e81bfd5ef56d4fe925cac064a798a96a003bb8465b6df37cff18a960f3631bb3a214cd812  Tk-804.036.tar.gz"
diff --git a/main/perl-tree-dag_node/APKBUILD b/main/perl-tree-dag_node/APKBUILD
index 93c4de6316b..181a89a7079 100644
--- a/main/perl-tree-dag_node/APKBUILD
+++ b/main/perl-tree-dag_node/APKBUILD
@@ -1,37 +1,34 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-tree-dag_node
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Tree-DAG_Node
-pkgver=1.31
+pkgver=1.32
 pkgrel=1
 pkgdesc="An N-ary tree"
 url="https://metacpan.org/release/Tree-DAG_Node/"
 arch="noarch"
-license="Artistic-2.0"
-cpandepends="perl-file-slurp-tiny"
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl perl-file-slurp-tiny"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE/Tree-DAG_Node-$pkgver.tgz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="6821a146c55887a8973a8f61512805a3d209bb855f5b2f121cbac11a5fe685073019b958837289e781d1c294212c387bdb8434499712a39ab6b74f7ca2ccaa74  Tree-DAG_Node-1.31.tgz"
+sha512sums="3ab6b48495abd09643555cf0160d00db39dc7ce576299b24eb4bc39e799ba478d88f863d8b2ec95853dc173e97c6efc3faff14e1d7c080f5166150f6fce2f817  Tree-DAG_Node-1.32.tgz"
diff --git a/main/perl-try-tiny/APKBUILD b/main/perl-try-tiny/APKBUILD
index 2c2c94ed759..0115df9cc7c 100644
--- a/main/perl-try-tiny/APKBUILD
+++ b/main/perl-try-tiny/APKBUILD
@@ -1,45 +1,38 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-try-tiny
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Try-Tiny
-pkgver=0.30
-pkgrel=1
-pkgdesc="minimal try/catch with proper preservation of $@"
-url="https://search.cpan.org/dist/Try-Tiny/"
+pkgver=0.31
+pkgrel=2
+pkgdesc="Minimal try/catch with proper preservation of \$@"
+url="https://metacpan.org/release/Try-Tiny/"
 arch="noarch"
 license="MIT"
-cpandepends="perl-capture-tiny perl-pod-coverage"
-cpanmakedepends="grep perl-sub-name"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://search.cpan.org/CPAN/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Try-Tiny-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="f523736ab0504ca0f7150be312e62988c4b9473a9e8469b0746dc8364945e2922c64c92e95e6c2b5792c5d6399dabea3d00aa45c065155b95519d5658a07216c  Try-Tiny-0.30.tar.gz"
+sha512sums="
+1a3c852e56797d81da60a4f4887cb70fc575eca83d10b8cd12fe5d5d0008a967801218f3a5277a2f1347ade95b9515c1f237333e491742d06614c0beecf44768  Try-Tiny-0.31.tar.gz
+"
diff --git a/main/perl-type-tiny/APKBUILD b/main/perl-type-tiny/APKBUILD
index de673e329a0..777e58b810e 100644
--- a/main/perl-type-tiny/APKBUILD
+++ b/main/perl-type-tiny/APKBUILD
@@ -1,33 +1,29 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-type-tiny
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Type-Tiny
-pkgver=1.010001
-pkgrel=0
+pkgver=2.004000
+pkgrel=1
 pkgdesc="tiny, yet Moo(se)-compatible type constraint"
-url="https://metacpan.org/release/Type-Tiny"
+url="https://metacpan.org/release/Type-Tiny/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl-exporter-tiny"
-makedepends="perl-dev perl-test-warnings"
+depends="perl perl-exporter-tiny"
+checkdepends="perl-test-warnings"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/T/TO/TOBYINK/Type-Tiny-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -36,4 +32,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="857cafe1c4c24bd18ab80303be705b051534e12862ce84692823d4a2285823c8d21ef1959aca8613b487e0183d542e1aa0ea55b7cf112c1a85444c95b64fef85  Type-Tiny-1.010001.tar.gz"
+sha512sums="
+a28a0fdfe48c8ce7f7313bfa6645094337dfb12d76401d9947a649763379a912f480ff418f0023d1e0c5851ffa347823669192a9eb8081341db7525d84c82220  Type-Tiny-2.004000.tar.gz
+"
diff --git a/main/perl-universal-can/APKBUILD b/main/perl-universal-can/APKBUILD
index 7caafa8d0eb..8778e46c7ea 100644
--- a/main/perl-universal-can/APKBUILD
+++ b/main/perl-universal-can/APKBUILD
@@ -1,23 +1,19 @@
-# Automatically generated by apkbuild-cpan, template 2
-# Contributor: 
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-universal-can
-_pkgname=UNIVERSAL-can
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=UNIVERSAL-can
 pkgver=1.20140328
-pkgrel=0
+pkgrel=3
 pkgdesc="work around buggy code calling UNIVERSAL::can() as a function"
 url="https://metacpan.org/release/UNIVERSAL-can/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends=""
-cpanmakedepends=""
-cpancheckdepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
@@ -35,4 +31,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="6fb032b968fa87d95e6fa6897575c6374a2d43fe9d505e339e593bad398b444b9818c8214fe7ac67fa2cfa1013e5c6337c507c3ea6104c711e3ee3d5635f0bc0  UNIVERSAL-can-1.20140328.tar.gz"
+sha512sums="
+6fb032b968fa87d95e6fa6897575c6374a2d43fe9d505e339e593bad398b444b9818c8214fe7ac67fa2cfa1013e5c6337c507c3ea6104c711e3ee3d5635f0bc0  UNIVERSAL-can-1.20140328.tar.gz
+"
diff --git a/main/perl-universal-isa/APKBUILD b/main/perl-universal-isa/APKBUILD
index 6ebbf8cc68c..3bbf8663990 100644
--- a/main/perl-universal-isa/APKBUILD
+++ b/main/perl-universal-isa/APKBUILD
@@ -1,23 +1,19 @@
-# Automatically generated by apkbuild-cpan, template 2
-# Contributor: 
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-universal-isa
-_pkgname=UNIVERSAL-isa
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=UNIVERSAL-isa
 pkgver=1.20171012
-pkgrel=0
+pkgrel=3
 pkgdesc="Attempt to recover from people calling UNIVERSAL::isa as a function"
 url="https://metacpan.org/release/UNIVERSAL-isa/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends=""
-cpanmakedepends=""
-cpancheckdepends=""
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/UNIVERSAL-isa-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
@@ -35,4 +31,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="abc2943b1706c681734cc03d995859a7d853741ab2013b530aa9f290d8625c5074ec594062c97760044cc1261a20448b9f059287a8f3dae7ba8c303397610518  UNIVERSAL-isa-1.20171012.tar.gz"
+sha512sums="
+abc2943b1706c681734cc03d995859a7d853741ab2013b530aa9f290d8625c5074ec594062c97760044cc1261a20448b9f059287a8f3dae7ba8c303397610518  UNIVERSAL-isa-1.20171012.tar.gz
+"
diff --git a/main/perl-universal-require/APKBUILD b/main/perl-universal-require/APKBUILD
deleted file mode 100644
index fb9ecdd360f..00000000000
--- a/main/perl-universal-require/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=perl-universal-require
-pkgver=0.18
-pkgrel=1
-pkgdesc="Require() modules from a variable"
-url="https://metacpan.org/release/UNIVERSAL-require/"
-arch="noarch"
-license="GPL+ or Artistic"
-depends="perl"
-makedepends="perl-dev"
-install=""
-subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/N/NE/NEILB/UNIVERSAL-require-$pkgver.tar.gz"
-
-builddir="$srcdir"/UNIVERSAL-require-$pkgver
-
-build() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-	make
-}
-
-check() {
-	cd "$builddir"
-	make test
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
-sha512sums="4e1dbb62f850a2f3da3301e37862d03ad89106e9fd55ac8161ae56eff936948f87b9215c734c103d8031e1b712847bff86de43329f65f00e7e34ee83bb66c22d  UNIVERSAL-require-0.18.tar.gz"
diff --git a/main/perl-unix-syslog/APKBUILD b/main/perl-unix-syslog/APKBUILD
index e240e8972ec..318030313a6 100644
--- a/main/perl-unix-syslog/APKBUILD
+++ b/main/perl-unix-syslog/APKBUILD
@@ -1,31 +1,34 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=perl-unix-syslog
-_realname=Unix-Syslog
+_pkgreal=Unix-Syslog
 pkgver=1.1
-pkgrel=14
+pkgrel=21
 pkgdesc="Perl interface to the UNIX syslog(3) calls"
-url="http://search.cpan.org/~mharnisch/Unix-Syslog/"
+url="https://metacpan.org/dist/Unix-Syslog"
 arch="all"
 license="Artistic-2.0"
 depends="perl"
 makedepends="perl-dev"
-install=
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/M/MH/MHARNISCH/$_realname-$pkgver.tar.gz"
-builddir="$srcdir/$_realname-$pkgver"
+source="https://cpan.metacpan.org/authors/id/M/MH/MHARNISCH/Unix-Syslog-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
+check() {
+	make test
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	# creates file collision among perl modules
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="cb1ea3846844b7c82e081f3bb778c698b681d1875b83201b1beef2267a288890c6fc62af8edbfbc04553a9caa1ebafa429130e784f31c9531719b11a4c47c3ba  Unix-Syslog-1.1.tar.gz"
+sha512sums="
+cb1ea3846844b7c82e081f3bb778c698b681d1875b83201b1beef2267a288890c6fc62af8edbfbc04553a9caa1ebafa429130e784f31c9531719b11a4c47c3ba  Unix-Syslog-1.1.tar.gz
+"
diff --git a/main/perl-uri/APKBUILD b/main/perl-uri/APKBUILD
index 5d367ee007f..8b32466ae03 100644
--- a/main/perl-uri/APKBUILD
+++ b/main/perl-uri/APKBUILD
@@ -1,24 +1,27 @@
+# Automatically generated by apkbuild-cpan, template 4
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-uri
-_pkgreal=URI
-pkgver=1.76
+pkgver=5.28
 pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=URI
 pkgdesc="Uniform Resource Identifiers (absolute and relative)"
+replaces="perl-uri-escape"
 url="https://metacpan.org/release/URI/"
 arch="noarch"
-license="GPL-1.0-or-later Artistic-1.0-Perl"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-cpancheckdepends="perl-test-needs"
-makedepends="perl-dev"
-checkdepends="$cpancheckdepends"
-replaces="perl-uri-escape"
+checkdepends="perl-test-warnings perl-test-needs perl-test-fatal"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/URI-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
 	make
 }
 
@@ -29,7 +32,8 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="1fcb02692bdf5f223c2878569615d153b3c4c5adc04c33aee23f3f015e08b4895b03536ef3a8c7cb7a334c2faa056e5e46c805d56d810704cba63d96136e0a83  URI-1.76.tar.gz"
+sha512sums="
+ffa2a560641cbb81f720d1b572371a237826627974735684e130ad42c5184cd143c4cd337d600346258892165f3b658cc94711d189a870f990ff8148c72968e5  URI-5.28.tar.gz
+"
diff --git a/main/perl-variable-magic/APKBUILD b/main/perl-variable-magic/APKBUILD
index aa9cfea2c0f..b5d8e76c3c6 100644
--- a/main/perl-variable-magic/APKBUILD
+++ b/main/perl-variable-magic/APKBUILD
@@ -1,39 +1,39 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 4
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-variable-magic
+pkgver=0.64
+pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Variable-Magic
-pkgver=0.62
-pkgrel=3
-pkgdesc="Associate user-defined magic to variables from Perl."
+pkgdesc="Associate user-defined magic to variables from Perl"
 url="https://metacpan.org/release/Variable-Magic/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/V/VP/VPIT/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/V/VP/VPIT/Variable-Magic-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="fdaad8ab1a16a4723e30a155086f7f9ecad60b021b0ca5d449a0bc001b858a53e2857cfdc3fc4e3dcc28e2f59a14f3531afd93e3f71fda3b8fcaa8bc50d0c380  Variable-Magic-0.62.tar.gz"
+sha512sums="
+ba7eead52b9684a7ce0112a6b29b9739d52bd111d7985cf6b721a3d193d7a0513205c3547ec9504239cf4a3bd50de844cb6f7bb83906118c12b8d7b92c455a6a  Variable-Magic-0.64.tar.gz
+"
diff --git a/main/perl-want/APKBUILD b/main/perl-want/APKBUILD
index ba1b1dcdb0f..3d396e33e5b 100644
--- a/main/perl-want/APKBUILD
+++ b/main/perl-want/APKBUILD
@@ -1,39 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-want
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=Want
 pkgver=0.29
-pkgrel=4
-pkgdesc="unknown"
+pkgrel=10
+pkgdesc="Perl module for Want"
 url="https://metacpan.org/release/Want/"
 arch="all"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="   "
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/R/RO/ROBIN/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/R/RO/ROBIN/Want-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	make && make test
+check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="08df985de16b5e9dd67d6ed38d319da2511e92098f95a861a5a695eed8d77eaf412671b626e4da29b536147ad4da4a8cfdfd789ef204dac240073091481f3c1a  Want-0.29.tar.gz"
+sha512sums="
+08df985de16b5e9dd67d6ed38d319da2511e92098f95a861a5a695eed8d77eaf412671b626e4da29b536147ad4da4a8cfdfd789ef204dac240073091481f3c1a  Want-0.29.tar.gz
+"
diff --git a/main/perl-www-robotrules/APKBUILD b/main/perl-www-robotrules/APKBUILD
index 13f9d41e09e..c0d58e3940c 100644
--- a/main/perl-www-robotrules/APKBUILD
+++ b/main/perl-www-robotrules/APKBUILD
@@ -2,14 +2,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-www-robotrules
 pkgver=6.02
-pkgrel=2
+pkgrel=5
 pkgdesc="WWW::RobotRules perl module"
 url="https://metacpan.org/release/WWW-RobotRules/"
 arch="noarch"
-license="GPL-2.0 or Artistic"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
 depends="perl perl-uri"
-makedepends="perl-dev"
-install=""
 replaces="perl-libwww"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/G/GA/GAAS/WWW-RobotRules-$pkgver.tar.gz"
@@ -17,18 +15,15 @@ source="https://cpan.metacpan.org/authors/id/G/GA/GAAS/WWW-RobotRules-$pkgver.ta
 builddir="$srcdir"/WWW-RobotRules-$pkgver
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/main/perl-x10/APKBUILD b/main/perl-x10/APKBUILD
index 6cb00a57d03..01d10d013e9 100644
--- a/main/perl-x10/APKBUILD
+++ b/main/perl-x10/APKBUILD
@@ -1,16 +1,15 @@
 # Automatically generated by apkbuild-cpan, template 3
-# Contributor:  Francesco Colista <francesco.colista@gmail.com>
-# Maintainer:  Francesco Colista <francesco.colista@gmail.com>
+# Contributor:  Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-x10
 _pkgreal=X10
 pkgver=0.04
-pkgrel=3
+pkgrel=6
 pkgdesc="Perl module for X10"
 url="https://metacpan.org/release/X10/"
 arch="noarch"
 license="GPL-3.0-only"
 depends="perl perl-time-parsedate perl-device-serialport perl-astro-suntime"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/R/RO/ROBF/X10-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/main/perl-xml-namespacesupport/APKBUILD b/main/perl-xml-namespacesupport/APKBUILD
index a8c21c0f45d..2ff7b6ef267 100644
--- a/main/perl-xml-namespacesupport/APKBUILD
+++ b/main/perl-xml-namespacesupport/APKBUILD
@@ -1,34 +1,31 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-xml-namespacesupport
 pkgver=1.12
-pkgrel=1
+pkgrel=5
 pkgdesc="Generic namespace helpers (ported from SAX2)"
 url="https://metacpan.org/release/XML-NamespaceSupport"
 arch="noarch"
-license="GPL"
+license="GPL-1.0-or-later"
 depends="perl"
-makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="http://www.cpan.org/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-$pkgver.tar.gz"
 builddir="$srcdir"/XML-NamespaceSupport-$pkgver
 
-check() {
-	cd "$builddir"
-	make test
-}
-
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
+check() {
+	make test
+}
+
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="8a29698acc152888b3abd53b277f89209252830cc3b57d587a5b66e5019445d7c1858a08fa548d42387c1143b726da1440e36eb0c69b0b59c3770b5f528f38b2  XML-NamespaceSupport-1.12.tar.gz"
+sha512sums="
+8a29698acc152888b3abd53b277f89209252830cc3b57d587a5b66e5019445d7c1858a08fa548d42387c1143b726da1440e36eb0c69b0b59c3770b5f528f38b2  XML-NamespaceSupport-1.12.tar.gz
+"
diff --git a/main/perl-xml-parser/APKBUILD b/main/perl-xml-parser/APKBUILD
index f3af4e2a838..98326450b57 100644
--- a/main/perl-xml-parser/APKBUILD
+++ b/main/perl-xml-parser/APKBUILD
@@ -1,40 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-xml-parser
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=XML-Parser
-pkgver=2.46
+pkgver=2.47
 pkgrel=0
 pkgdesc="A perl module for parsing XML documents"
-url="https://metacpan.org/release/XML-Parser"
+url="https://metacpan.org/release/XML-Parser/"
 arch="all"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends="perl-libwww"
-depends="$cpandepends"
+depends="perl perl-libwww"
 makedepends="perl-dev expat-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="c4609495cc5ca34952f61876a690ef76d42eee6689d1bedb8036c9eab918525ec5213f1639c7178c029ee0f8765a2ca5eb0197f6e39b8be6d5dbc3f3c1d0b389  XML-Parser-2.46.tar.gz"
+sha512sums="
+3f9de53341bc85b87c88ad31e04b13f1f95516eec0d7e5fd1c1a3b3e66a91ca3d4de7c649978599219a4d4372f6218764ab5e1805b7155b5ca200006e1b0908f  XML-Parser-2.47.tar.gz
+"
diff --git a/main/perl-xml-rss/APKBUILD b/main/perl-xml-rss/APKBUILD
index 21b4a648096..b049fdbadb9 100644
--- a/main/perl-xml-rss/APKBUILD
+++ b/main/perl-xml-rss/APKBUILD
@@ -1,40 +1,36 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-xml-rss
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=XML-RSS
-pkgver=1.61
+pkgver=1.63
 pkgrel=0
 pkgdesc="creates and updates RSS files"
-url="https://metacpan.org/release/XML-RSS"
+url="https://metacpan.org/release/XML-RSS/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-cpandepends="perl-xml-parser perl-html-parser perl-datetime-format-mail
-	perl-datetime-format-w3cdtf perl-datetime"
-cpanmakedepends="perl-test-manifest"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+depends="perl perl-datetime-format-w3cdtf perl-xml-parser perl-html-parser perl-datetime-format-mail"
+makedepends="perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/XML-RSS-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-	make
+	perl Build.PL --installdirs=vendor
+	./Build
 }
 
 check() {
-	cd "$builddir"
-	make test
+	./Build test
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	./Build install --destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="320b1a26d88f0db4861e1eb701a34110362293b24861e804a5be7c77be58c7f41730b67462c391edf50cd27444e2b86a8e4d8013dacd64578cb30cfd48f79c8b  XML-RSS-1.61.tar.gz"
+sha512sums="
+ce094ed0018d639a8a4bc88b3a7a5212f86e93426145045ef906e189ff0495556749d12e6b88abc13e5baa9ae6b2bb471048dd238f826ebe37569ae4ebba3115  XML-RSS-1.63.tar.gz
+"
diff --git a/main/perl-xml-sax-base/APKBUILD b/main/perl-xml-sax-base/APKBUILD
index a99f26acee9..919ab8ed38c 100644
--- a/main/perl-xml-sax-base/APKBUILD
+++ b/main/perl-xml-sax-base/APKBUILD
@@ -1,40 +1,31 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=perl-xml-sax-base
 pkgver=1.09
-pkgrel=1
+pkgrel=5
 pkgdesc="Base class SAX Drivers and Filters"
 url="https://metacpan.org/release/XML-SAX-Base"
 arch="noarch"
-license="GPL"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-depends_dev=""
-makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
-source="http://www.cpan.org/authors/id/G/GR/GRANTM/XML-SAX-Base-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/G/GR/GRANTM/XML-SAX-Base-$pkgver.tar.gz"
+builddir="$srcdir"/XML-SAX-Base-$pkgver
 
-_builddir="$srcdir"/XML-SAX-Base-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+build() {
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
-	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make || return 1
+check() {
+	make test
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="72a34fd2b0375222cad3a42a0e2d92f793d7a2ac27d831a8a8d3322fdc75ba246ca53c33cdc0fbade81f3a96ad977ebf5d4cddc6d75d76be79b2e655f316d532  XML-SAX-Base-1.09.tar.gz"
+sha512sums="
+72a34fd2b0375222cad3a42a0e2d92f793d7a2ac27d831a8a8d3322fdc75ba246ca53c33cdc0fbade81f3a96ad977ebf5d4cddc6d75d76be79b2e655f316d532  XML-SAX-Base-1.09.tar.gz
+"
diff --git a/main/perl-xml-sax/APKBUILD b/main/perl-xml-sax/APKBUILD
index 3763e6590f5..27cd56bcca6 100644
--- a/main/perl-xml-sax/APKBUILD
+++ b/main/perl-xml-sax/APKBUILD
@@ -1,15 +1,14 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=perl-xml-sax
 pkgver=1.02
-pkgrel=0
+pkgrel=3
 pkgdesc="Simple API for XML"
 url="https://metacpan.org/release/XML-SAX"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-depends="perl-xml-sax-base perl-xml-namespacesupport"
-makedepends="perl-dev"
+depends="perl perl-xml-sax-base perl-xml-namespacesupport"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/G/GR/GRANTM/XML-SAX-$pkgver.tar.gz"
@@ -17,20 +16,19 @@ source="https://cpan.metacpan.org/authors/id/G/GR/GRANTM/XML-SAX-$pkgver.tar.gz"
 builddir="$srcdir"/XML-SAX-$pkgver
 
 build() {
-	cd "$builddir"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	PERLLIB=blib/lib make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="bb30ddbbcf27803825d2f0936257e102999a197cb14bd77fa8b7a469f3a24fb7d861ef4eb03230e5581e4ed88beb8676cbb907b2cb63e9ef1a64b2c211ebdc5a  XML-SAX-1.02.tar.gz"
+sha512sums="
+bb30ddbbcf27803825d2f0936257e102999a197cb14bd77fa8b7a469f3a24fb7d861ef4eb03230e5581e4ed88beb8676cbb907b2cb63e9ef1a64b2c211ebdc5a  XML-SAX-1.02.tar.gz
+"
diff --git a/main/perl-xml-simple/APKBUILD b/main/perl-xml-simple/APKBUILD
index 20369a9fa55..133bbe5f308 100644
--- a/main/perl-xml-simple/APKBUILD
+++ b/main/perl-xml-simple/APKBUILD
@@ -1,31 +1,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-xml-simple
 pkgver=2.25
-pkgrel=1
+pkgrel=3
 pkgdesc="Simple XML parser for Perl"
 url="https://metacpan.org/release/XML-Simple"
 arch="noarch"
 license="Artistic-1.0-Perl"
 subpackages="$pkgname-doc"
-depends="perl-xml-parser perl"
-makedepends="perl-dev"
+depends="perl perl-xml-parser"
 source="https://cpan.metacpan.org/authors/id/G/GR/GRANTM/XML-Simple-$pkgver.tar.gz"
 
 builddir="$srcdir"/XML-Simple-$pkgver
 
 build() {
-	cd "$builddir"
 	perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" -name '.packlist' -delete
 	find "$pkgdir" -name 'perllocal.pod' -delete
diff --git a/main/perl-xml-xpath/APKBUILD b/main/perl-xml-xpath/APKBUILD
index 740d48a9aeb..c5ba392ff86 100644
--- a/main/perl-xml-xpath/APKBUILD
+++ b/main/perl-xml-xpath/APKBUILD
@@ -1,30 +1,25 @@
-# Automatically generated by apkbuild-cpan, template 2
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house>
+# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
 pkgname=perl-xml-xpath
 _pkgreal=XML-XPath
-pkgver=1.44
-pkgrel=0
+pkgver=1.48
+pkgrel=1
 pkgdesc="Parse and evaluate XPath statements."
 url="https://metacpan.org/release/XML-XPath/"
 arch="noarch"
-license="Artistic-2.0"
-cpandepends="perl-xml-parser"
-cpanmakedepends="perl-path-tiny"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
+depends="perl perl-xml-parser"
+makedepends="perl-path-tiny"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/M/MA/MANWAR/XML-XPath-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 build() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -33,4 +28,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="9314523baa55b48b8e684fbf9cc53006ef39829e2bcbd61a432508a96946c50384dff7eba47bd9f54aadc67c12fae6c1219104b017063d23ec3ee350a67eb12e  XML-XPath-1.44.tar.gz"
+sha512sums="
+c7347dd6e052e0145577ee624da5cef2ee8088ea434351ea2461e0bb3746c114fe571af1bc971333e046feb7dab808c6c84ab385310acbc9e8a9a89025969e48  XML-XPath-1.48.tar.gz
+"
diff --git a/main/perl-xs-parse-keyword/APKBUILD b/main/perl-xs-parse-keyword/APKBUILD
new file mode 100644
index 00000000000..46a7aa6efb6
--- /dev/null
+++ b/main/perl-xs-parse-keyword/APKBUILD
@@ -0,0 +1,37 @@
+# Automatically generated by apkbuild-cpan, template 3
+# Contributor: Milan P. Stanić <mps@arvanta.net>
+# Maintainer: Milan P. Stanić <mps@arvanta.net>
+pkgname=perl-xs-parse-keyword
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=XS-Parse-Keyword
+pkgver=0.39
+pkgrel=0
+pkgdesc="XS functions to assist in parsing keyword syntax"
+url="https://metacpan.org/release/XS-Parse-Keyword/"
+arch="all"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev perl-module-build perl-extutils-cchecker"
+checkdepends="perl-test2-suite"
+subpackages="$pkgname-doc"
+source="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/XS-Parse-Keyword-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+build() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL --installdirs=vendor
+	./Build
+}
+
+check() {
+	./Build test
+}
+
+package() {
+	./Build install --destdir="$pkgdir"
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+sha512sums="
+41ac31707b473d729a7e63d4607caa77fca9da00580b931576361416d78002f56acd04a0fee0c4dd09ffc1796a914f6ae934bdbce8fcc4c9222064c6e419b7ce  XS-Parse-Keyword-0.39.tar.gz
+"
diff --git a/main/perl-yaml-libyaml/APKBUILD b/main/perl-yaml-libyaml/APKBUILD
index f15868c406c..59727ac686d 100644
--- a/main/perl-yaml-libyaml/APKBUILD
+++ b/main/perl-yaml-libyaml/APKBUILD
@@ -1,42 +1,48 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 4
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=perl-yaml-libyaml
-_pkgreal=YAML-LibYAML
-pkgver=0.81
+pkgver=0.89
 pkgrel=0
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=YAML-LibYAML
 pkgdesc="Perl YAML Serialization using XS and libyaml"
-url="https://metacpan.org/release/YAML-LibYAML"
+provides="perl-yaml-xs=$pkgver-r$pkgrel"
+url="https://metacpan.org/release/YAML-LibYAML/"
 arch="all"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
-provides="perl-yaml-xs=$pkgver-r$pkgrel"
 depends="perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/T/TI/TINITA/YAML-LibYAML-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL \
+		INSTALLDIRS=vendor \
+		NO_PACKLIST=1 \
+		NO_PERLLOCAL=1
+	make
 }
 
-build() {
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
+doc() {
+	local file; find "$pkgdir" -name "*.pod" | while read -r file; do
+		amove "${file#"$pkgdir"}"
+	done
+	default_doc
 }
 
-sha512sums="469ac568f5b7562cb4e58150121f7dbaaf129ce2ae72690e94c644da980a43fb0e1b372c4d674ca5413741af1d2756971341631f03c51bd99479cfe775b7c6e2  YAML-LibYAML-0.81.tar.gz"
+sha512sums="
+24697f9625534facf23c22a96af26468c48cc91225af9879baa3039db8158fe0ff740acea527d33651d90e1c8ce24e804b02744812b72aae7b28aa6d88ba68c7  YAML-LibYAML-0.89.tar.gz
+"
diff --git a/main/perl-yaml-syck/APKBUILD b/main/perl-yaml-syck/APKBUILD
index 92c1580d00f..c55f1d838b3 100644
--- a/main/perl-yaml-syck/APKBUILD
+++ b/main/perl-yaml-syck/APKBUILD
@@ -1,12 +1,13 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=perl-yaml-syck
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=YAML-Syck
-pkgver=1.32
-pkgrel=0
+pkgver=1.34
+pkgrel=4
 pkgdesc="Fast, lightweight YAML loader and dumper"
-url="https://metacpan.org/release/YAML-Syck"
+url="https://metacpan.org/release/YAML-Syck/"
 arch="all"
 license="MIT"
 depends="perl"
@@ -15,16 +16,15 @@ subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/T/TO/TODDR/YAML-Syck-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	default_prepare
-
+build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
+	make
 }
 
-build() {
+check() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make
+	make test
 }
 
 package() {
@@ -32,9 +32,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-check() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	make test
-}
-
-sha512sums="284d62f1fabdcca9fbdc57b732f5b9b2c2739020c620dbb66e84a89ea83e0a80580ec8fd8516a1c080dd9de9a817dbe357ee66041daa5103a8bf49c436355c99  YAML-Syck-1.32.tar.gz"
+sha512sums="18288f54026823e84b2d642d880d7758c5d95ba4b56d3fcf758efe59303ea71a49822d7c000b4c7b0629eccd4dcf3c940bc1c26f2b2ef89e4fdba78a35c04760  YAML-Syck-1.34.tar.gz"
diff --git a/main/perl-yaml-tiny/APKBUILD b/main/perl-yaml-tiny/APKBUILD
index bf504646b4d..bec8f5fe525 100644
--- a/main/perl-yaml-tiny/APKBUILD
+++ b/main/perl-yaml-tiny/APKBUILD
@@ -1,43 +1,37 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-yaml-tiny
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=YAML-Tiny
-pkgver=1.73
+pkgver=1.74
 pkgrel=1
 pkgdesc="Read/Write YAML files with as little code as possible"
 url="https://metacpan.org/release/YAML-Tiny/"
 arch="noarch"
-license="GPL PerlArtistic"
-cpandepends=""
-cpanmakedepends="perl-json-maybexs"
-depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+license="GPL-1.0-or-later OR Artistic-1.0-Perl"
+depends="perl"
+makedepends="perl-dev"
+checkdepends="perl-json-maybexs"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$_pkgreal-$pkgver.tar.gz"
-
+source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/YAML-Tiny-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
-prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
-
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-        cd "$builddir"
-        make test
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	make test
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="5999e220025aa8076e5e0e9e73e80c2da21660e77f6744d73e8e29962221d02d33a36e9829c44abf7d4f45abae069d8e121c8019bd1600b7e64db5e54efd9987  YAML-Tiny-1.73.tar.gz"
+sha512sums="
+2da59bf583b09a60e8e1bac7c21fc4300ae3ee2092ffd77cbf3778c65c7d0bdf68fa3616665d276f4d4df2437526d36d497ac53be79baa182f84f37640bfcad4  YAML-Tiny-1.74.tar.gz
+"
diff --git a/main/perl-yaml/APKBUILD b/main/perl-yaml/APKBUILD
index 4403af01f26..14b529226d2 100644
--- a/main/perl-yaml/APKBUILD
+++ b/main/perl-yaml/APKBUILD
@@ -1,33 +1,30 @@
-# Automatically generated by apkbuild-cpan, template 1
+# Automatically generated by apkbuild-cpan, template 3
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-yaml
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
 _pkgreal=YAML
-pkgver=1.30
-pkgrel=1
-pkgdesc="YAML Ain't Markup Language (tm)"
-url="https://metacpan.org/release/YAML"
+pkgver=1.31
+pkgrel=0
+pkgdesc="YAML Ain't Markup Language™"
+url="https://metacpan.org/release/YAML/"
 arch="noarch"
 license="GPL-1.0-or-later OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 checkdepends="perl-test-yaml perl-test-deep"
-options="!check" # multiple test dependencies are in community and several packages in main depends on it
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/T/TI/TINITA/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/I/IN/INGY/YAML-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
-
-prepare() {
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-}
+options="!check" # checkdepends in community
 
 build() {
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make test
 }
 
@@ -36,4 +33,6 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="f73f2d9f3cd96edeb05ec098c859755dd6b80bf1a00049f8de2889ebbf4f41df9fcc1540116afa8648e965a0b780d993f256af2c5ffc03a9f1ba7df1f0cc8941  YAML-1.30.tar.gz"
+sha512sums="
+7f6af46348c4288541b611cb0d0f6d63a3d671417cadb3e9d60fed1c2c7664b35202b3ee8d15ef68400758604a3b2cb8a04c11b3e9badfd6f9222cf24f4a9edc  YAML-1.31.tar.gz
+"
diff --git a/main/perl/APKBUILD b/main/perl/APKBUILD
index 178994733cc..b4150eb2a3c 100644
--- a/main/perl/APKBUILD
+++ b/main/perl/APKBUILD
@@ -2,23 +2,38 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 pkgname=perl
-pkgver=5.30.2
+pkgver=5.38.2
 pkgrel=0
 pkgdesc="Larry Wall's Practical Extraction and Report Language"
 url="https://www.perl.org/"
 arch="all"
-license="Artistic-Perl OR GPL-1.0-or-later"
-options="!fhs"
-depends_dev="perl-utils"
+license="Artistic-1.0-Perl OR GPL-1.0-or-later"
+depends_dev="perl-utils=$pkgver-r$pkgrel"
 makedepends="bzip2-dev zlib-dev"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-utils::noarch miniperl"
-source="https://www.cpan.org/src/5.0/perl-$pkgver.tar.gz
-	musl-locale.patch
+source="https://www.cpan.org/src/5.0/perl-$pkgver.tar.xz
+	digest-sha-cflags.patch
 	musl-skip-dst-test.patch
 	skip-test-due-to-busybox-ps.patch
+	musl-stack-size.patch
+	"
+# creates empty usr/local/{lib,share} for local sitedirs
+options="!fhs"
+
+# in perl core, removed from main/perl-scalar-list-utils
+provides="
+	perl-scalar-list-utils=$pkgver-r$pkgrel
 	"
 
 # secfixes:
+#   5.38.1-r0:
+#     - CVE-2023-47038
+#   5.34.0-r1:
+#     - CVE-2021-36770
+#   5.30.3-r0:
+#     - CVE-2020-10543
+#     - CVE-2020-10878
+#     - CVE-2020-12723
 #   5.26.3-r0:
 #     - CVE-2018-18311
 #     - CVE-2018-18312
@@ -34,16 +49,13 @@ source="https://www.cpan.org/src/5.0/perl-$pkgver.tar.gz
 #     - CVE-2017-12837
 #     - CVE-2017-12883
 
-
 _privlib=/usr/share/perl5/core_perl
 _archlib=/usr/lib/perl5/core_perl
 
 prepare() {
+	# most sources are readonly but we patch some
 	chmod +w "$builddir"/*.c
 	default_prepare
-	sed	-e 's/less -R/less/g' \
-		-e 's/libswanted="\(.*\) nsl\(.*\)"/libswanted="\1\2"/g' \
-		-i ./Configure
 
 	# Ensure that we never accidentally bundle zlib or bzip2
 	rm -rf cpan/Compress-Raw-Zlib/zlib-src
@@ -52,15 +64,16 @@ prepare() {
 }
 
 build() {
-	BUILD_ZLIB=0
-	BUILD_BZIP2=0
-	BZIP2_LIB=/usr/lib
-	BZIP2_INCLUDE=/usr/inculde
+	export BUILD_ZLIB=0
+	export BUILD_BZIP2=0
+	export BZIP2_LIB=/usr/lib
+	export BZIP2_INCLUDE=/usr/include
+
+	# language runtime
+	export CFLAGS="$CFLAGS -O2 -flto=auto"
 
-	export BUILD_ZLIB BUILD_BZIP2 BZIP2_LIB BZIP2_INCLUDE
 	./Configure -des \
 		-Dcccdlflags='-fPIC' \
-		-Dcccdlflags='-fPIC' \
 		-Dccdlflags='-rdynamic' \
 		-Dprefix=/usr \
 		-Dprivlib=$_privlib \
@@ -85,6 +98,8 @@ build() {
 		-Dman3ext='3pm' \
 		-Dcf_by='Alpine' \
 		-Ud_csh \
+		-Ud_fpos64_t \
+		-Ud_off64_t \
 		-Dusenm
 	make libperl.so && make
 }
@@ -92,76 +107,89 @@ build() {
 check() {
 	export CI=true
 	export LC_ALL=C
-	make test-notty
+
+	# Perl tests HARNESS_OPTIONS against the regex
+	# /^j(\d*)$/, if $JOBS is unset, it defaults to 9
+	export HARNESS_OPTIONS=j"$JOBS"
+	export PERL_TEST_HARNESS_ASAP=1
+
+	make test_harness_notty
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
-	if [ -n "$(find $pkgdir/usr/local -type f)" ]; then
+
+	# omit global flto afterward
+	# perl saves compile-time cflags and applies them to every future build
+	sed -i \
+		-e "s| -flto=auto||g" \
+		"$pkgdir"/usr/lib/perl5/core_perl/Config_heavy.pl
+
+	if [ -n "$(find "$pkgdir"/usr/local -type f)" ]; then
 		error "files found under /usr/local"
 		return 1
 	fi
+
+	install -Dm755 miniperl \
+		-t "$pkgdir"/usr/bin/
+
+	# delete files starting with a dot,
+	# but really just usr/lib/perl5/core_perl/.packlist
 	find "$pkgdir" -name '.*' -delete
 }
 
 miniperl() {
-	install -Dm755 "$builddir"/$subpkgname \
-		"$subpkgdir"/usr/bin/$subpkgname
+	amove usr/bin/miniperl
 }
 
 doc() {
-	default_doc
-	local file; for file in $(find "$pkgdir" -name "*.pod"); do
-		file=${file#$pkgdir/}
-		mkdir -p "$subpkgdir"/${file%/*}
-		mv "$pkgdir"/$file "$subpkgdir"/$file
+	local file; find "$pkgdir" -name "*.pod" | while read -r file; do
+		amove "${file#"$pkgdir"}"
 	done
+	default_doc
 }
 
 dev() {
-	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/$_archlib "$subpkgdir"/$_privlib
-	mv "$pkgdir"/$_archlib/Devel "$subpkgdir"/$_archlib/
-	mv "$pkgdir"/$_privlib/Encode "$subpkgdir"/$_privlib/
-
-	mv "$pkgdir"/usr/bin/h2xs \
-		"$pkgdir"/usr/bin/perlivp \
-		"$pkgdir"/usr/bin/enc2xs \
-		"$pkgdir"/usr/bin/xsubpp \
-		"$subpkgdir"/usr/bin/
+	amove \
+		$_archlib/Devel \
+		$_privlib/Encode \
+		usr/bin/h2xs \
+		usr/bin/perlivp \
+		usr/bin/enc2xs \
+		usr/bin/xsubpp
 
 	default_dev
 }
 
 utils() {
 	pkgdesc="$pkgdesc (misc utilities)"
-	depends="$pkgname"
-	mkdir -p "$subpkgdir"/usr/bin
-	local file
-	for file in \
-		corelist \
-		cpan \
-		encguess \
-		libnetcfg \
-		h2ph \
-		instmodsh \
-		json_pp \
-		perlbug \
-		perlthanks \
-		piconv \
-		pl2pm \
-		prove \
-		ptar \
-		ptardiff \
-		ptargrep \
-		shasum \
-		splain \
-		zipdetails
-	do
-		mv "$pkgdir"/usr/bin/$file "$subpkgdir"/usr/bin/
-	done
+	depends="$pkgname=$pkgver-r$pkgrel"
+
+	amove \
+		usr/bin/corelist \
+		usr/bin/cpan \
+		usr/bin/encguess \
+		usr/bin/libnetcfg \
+		usr/bin/h2ph \
+		usr/bin/instmodsh \
+		usr/bin/json_pp \
+		usr/bin/perlbug \
+		usr/bin/perlthanks \
+		usr/bin/piconv \
+		usr/bin/pl2pm \
+		usr/bin/prove \
+		usr/bin/ptar \
+		usr/bin/ptardiff \
+		usr/bin/ptargrep \
+		usr/bin/shasum \
+		usr/bin/splain \
+		usr/bin/zipdetails
 }
 
-sha512sums="e10b1fba8fb454d94b01bdda2179d5b0f22cbfdd6b67ab91b64a272838fd8b3e476d79f216dc5ebc74f5dbde5666e6efed54c526801592a60418d12f1b1f39bc  perl-5.30.2.tar.gz
-a78b5fb1a2b6f60b401329cfd2d8349d4fdcc19628cde0e9b840b82e1a02e705f7d7413fe206aa13ed714ab93a65b62ac3d85dfd526ca8048621d5d89b22f0ef  musl-locale.patch
+sha512sums="
+0ca51e447c7a18639627c281a1c7ae6662c773745ea3c86bede46336d5514ecc97ded2c61166e1ac15635581489dc596368907aa3a775b34db225b76d7402d10  perl-5.38.2.tar.xz
+59afa4c166e4808d355e19cd70748540ffce9da5c6919c71648be7678de328409f9121ddea33415add73fc01a22e95ed9d9629f31b8ba20b3bbfc04dab926c63  digest-sha-cflags.patch
 3eaec691bc38e208ba4f34130ae45e50b6c339fa50093d0b0f6d7f24cb5b7c2a3734ca714a279c4b51173f82e46a8e7a3e70bfc7d7471a18c55a2102140e4186  musl-skip-dst-test.patch
-4e7a3be3291a851b41e484daf5b87d5bc6e372a6f1aea7ad0718fec24fda3719286baa97045255d5d7c0a327a533ff6c32e1bf4d8436550f328fb9b5e602d727  skip-test-due-to-busybox-ps.patch"
+ba9cb1ff4a6e8e4c31bf4ef132c071ac919ffe45842cf5e98c8ca72d78ef4803883b57a0e7b8037da0079561a6ce9e6bd8d127892ac1bcb047638cb3ba3157f6  skip-test-due-to-busybox-ps.patch
+c004d6612ec754e5947255a2e2d15b5581f187c32495aeeec9f4fa286919bd9f40c72b63db61e3f4004b09288af2063a6a14b67e5c289e9a8b23ebd7c216e16f  musl-stack-size.patch
+"
diff --git a/main/perl/digest-sha-cflags.patch b/main/perl/digest-sha-cflags.patch
new file mode 100644
index 00000000000..0e4e8b369a1
--- /dev/null
+++ b/main/perl/digest-sha-cflags.patch
@@ -0,0 +1,17 @@
+don't override cflags with -O1 on x86*
+--
+diff --git a/cpan/Digest-SHA/Makefile.PL b/cpan/Digest-SHA/Makefile.PL
+index af2c0c3..3606225 100644
+--- a/cpan/Digest-SHA/Makefile.PL
++++ b/cpan/Digest-SHA/Makefile.PL
+@@ -66,10 +66,6 @@ if ($^O eq 'VMS') {
+ 
+ 	# Enhance performance on Intel when using gcc
+ 
+-if ($Config{archname} =~ /^i[3456]86/ && $Config{ccname} eq 'gcc') {
+-	push(@extra, OPTIMIZE => '-O1 -fomit-frame-pointer');
+-}
+-
+ my $fussy = '-Wall -Wextra -Wconversion -Wcast-align -Wpointer-arith ';
+ push(@extra, CCFLAGS => $fussy . $Config{ccflags}) if $opt_w;
+ 
diff --git a/main/perl/musl-locale.patch b/main/perl/musl-locale.patch
deleted file mode 100644
index 65839f1fe75..00000000000
--- a/main/perl/musl-locale.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/locale.c b/locale.c
-index 7653340..7243cb1 100644
---- a/locale.c
-+++ b/locale.c
-@@ -581,6 +581,10 @@ S_emulate_setlocale(const int category,
- 
-         return (char *) querylocale(mask, cur_obj);
- 
-+#  elif defined(_NL_LOCALE_NAME)
-+
-+        return (char *) nl_langinfo_l(_NL_LOCALE_NAME(category), cur_obj);
-+
- #  else
- 
-         /* If this assert fails, adjust the size of curlocales in intrpvar.h */
-@@ -737,7 +741,7 @@ S_emulate_setlocale(const int category,
- 
-     /* Here, we are switching locales. */
- 
--#  ifndef HAS_QUERYLOCALE
-+#  if !defined(HAS_QUERYLOCALE) && !defined(_NL_LOCALE_NAME)
- 
-     if (strEQ(locale, "")) {
- 
-@@ -1094,6 +1098,12 @@ S_emulate_setlocale(const int category,
-         locale = querylocale(mask, new_obj);
-     }
- 
-+#  elif defined(_NL_LOCALE_NAME)
-+
-+    if (strEQ(locale, "")) {
-+        locale = nl_langinfo_l(_NL_LOCALE_NAME(category), new_obj);
-+    }
-+
- #  else
- 
-     /* Here, 'locale' is the return value */
diff --git a/main/perl/musl-stack-size.patch b/main/perl/musl-stack-size.patch
new file mode 100644
index 00000000000..08a9ef0e81a
--- /dev/null
+++ b/main/perl/musl-stack-size.patch
@@ -0,0 +1,16 @@
+Tests fails on s390x due to low thread stack size
+upstream report: https://github.com/Perl/perl5/issues/18160
+
+diff --git a/t/thread_it.pl b/t/thread_it.pl
+index f38a580..e8c450a 100644
+--- a/t/thread_it.pl
++++ b/t/thread_it.pl
+@@ -36,7 +36,7 @@ my $curr = threads->create({
+                             stack_size => $^O eq 'hpux'   ? 524288 :
+                                           $^O eq 'darwin' ? 2000000:
+                                           $^O eq 'VMS'    ? 150000 :
+-                                          $^O eq 'aix'    ? 1500000 : 0,
++                                          $^O eq 'aix'    ? 1500000 : 256*1024,
+                            }, sub {
+ 			       run_tests();
+ 			       return defined &curr_test ? curr_test() : ()
diff --git a/main/perl/skip-test-due-to-busybox-ps.patch b/main/perl/skip-test-due-to-busybox-ps.patch
index 88a19b7139f..ac3becc0f36 100644
--- a/main/perl/skip-test-due-to-busybox-ps.patch
+++ b/main/perl/skip-test-due-to-busybox-ps.patch
@@ -11,12 +11,3 @@ index 27c1d43..91882f4 100644
  
      # We don't really need these tests. prctl() is tested in the
      # Kernel, but test it anyway for our sanity. If something doesn't
-@@ -807,7 +807,7 @@ SKIP: {
- 	    my $me = (split /\0/, $line)[0];
- 	    is $me, $0, 'altering $0 is effective (testing with /proc/)';
- 	    close CMDLINE;
--            skip("\$0 check with 'ps' only on Linux (but not Android) and FreeBSD", 1) if $^O eq 'android';
-+            skip("\$0 check with 'ps' only on Linux (but not Android) and FreeBSD", 1); # if $^O eq 'android';
-             # perlbug #22811
-             my $mydollarzero = sub {
-               my($arg) = shift;
diff --git a/main/pgpool/APKBUILD b/main/pgpool/APKBUILD
index 838f837b18f..ea7bbc0ebe0 100644
--- a/main/pgpool/APKBUILD
+++ b/main/pgpool/APKBUILD
@@ -1,30 +1,43 @@
 # Contributor: Cameron <cbanta@gmail.com>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=pgpool
-_pkgname="$pkgname-II"
-pkgver=4.1.1
+pkgver=4.5.1
+_pkgver="${pkgver//./_}"
 pkgrel=0
 pkgdesc="A connection pooling/replication server for PostgreSQL"
 url="https://www.pgpool.net/"
 arch="all"
-license="pgpool-II"
-makedepends="postgresql-dev linux-headers"
+license="custom"
+makedepends="
+	autoconf
+	automake
+	bison
+	flex
+	libpq-dev
+	libtool
+	linux-headers
+	openssl-dev
+	"
 pkgusers="postgres"
 pkggroups="postgres"
 install="$pkgname.pre-install $pkgname.post-upgrade"
 subpackages="$pkgname-openrc $pkgname-doc $pkgname-static $pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::https://www.pgpool.net/download.php?f=$_pkgname-$pkgver.tar.gz
+source="https://github.com/pgpool/pgpool2/archive/V$_pkgver/pgpool2-$_pkgver.tar.gz
 	$pkgname.initd
 	$pkgname.confd
 	$pkgname.logrotated
-	musl-compat.patch
-	fix-listen_address.patch
 	"
-builddir="$srcdir/$_pkgname-$pkgver"
+builddir="$srcdir/pgpool2-$_pkgver"
 
 prepare() {
 	default_prepare
-	update_config_sub
+
+	autoreconf -fiv
+
+	# Fix listen address.
+	# pgpool resolves localhost to ::1 (IPv6) and fails to bind on ::1:9999.
+	sed -Ei "s/^(listen_addresses\s*=\s*)'localhost'/\1'127.0.0.1'/" \
+		src/sample/pgpool.conf*
 }
 
 build() {
@@ -35,8 +48,9 @@ build() {
 		--sysconfdir=/etc/$pkgname \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--with-openssl
-	make
+		--with-openssl \
+		--disable-rpath
+	make -j1
 }
 
 check() {
@@ -53,10 +67,12 @@ package() {
 	install -m644 -D "$srcdir"/$pkgname.logrotated "$pkgdir"/etc/logrotate.d/$pkgname
 
 	install -d -o "$pkgusers" -g "$pkggroups" -m755 "$pkgdir"/var/log/$pkgname
+
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
 doc() {
-	local docdir="$subpkgdir"/usr/share/doc/$_pkgname
+	local docdir="$subpkgdir"/usr/share/doc/$pkgname
 	default_doc
 
 	mkdir -p "$docdir"
@@ -67,9 +83,9 @@ doc() {
 	done
 }
 
-sha512sums="cd20fdd4893d780a7775626ff6b41b82db6043be198efe05985581dfa8446c29bc977e2b0bfab60caf8306ea228a31f91f893b4b51413b162bfe93a3354d34d0  pgpool-4.1.1.tar.gz
-71b8239b1b29e2c4a8312b300122ced1452bbe60fc7937e80172c7c5e3d6be71e5aee58f6d3d687b0e35df6ccdc27125a12ae9098f7c2d07e76b8103abca3556  pgpool.initd
-0e40a681b068ce5c7f03c342c1217b170601a507cacdf120b9a308df65f2065e6085b292a393802d1955079f7ec434a412e6d871f688ad83bc33fa34aca37cfe  pgpool.confd
+sha512sums="
+fee71e1c5513fa82f5263028e2a26e5dee88c792fc925edf1390642d7ae90e93615ffc1c1a6755302aac5b15ad09540d172899545022c423c92c04b6e147b72a  pgpool2-4_5_1.tar.gz
+9e54835f2a907f4b7a521d7d52cf04f69e1edfe591d9618cb2a1514953e5ba9e0d5ef543f0d6ee281fef21e64b7a6ff4a26a7f54fadbfc2d3bc7009d10dbccbf  pgpool.initd
+7e605cea31ae32127ec1aca9e47a6652e87243214bde202d49a405652784e68b4dbff7d364345259d327bc37041c60c146e6f674a4aa72c6214bdba3740e700e  pgpool.confd
 c9aa2ea9484ed29cb57cdff4004fa9dd4780d73c69db3378effb2e0ecd3ae178771c6a847a28e1a9cc6492ada4321584afb92c9b592119fb11898b42191f22b1  pgpool.logrotated
-37e8314f2dab6889c35edb679906db3997c4d5eba704a7337ff82926d400f2ab780103b6a162b1effa74c0d7f8d6655b62cddd2017d3ea7a5de5f370871ab088  musl-compat.patch
-625447bd0e5ef7687bcff2d020ddbdf788eec05abeb4f7979f078c15e6969fada8569fe233a543f133a939dac1fae4eb6513d7bbd7333f6f976c9d583ba5857a  fix-listen_address.patch"
+"
diff --git a/main/pgpool/fix-listen_address.patch b/main/pgpool/fix-listen_address.patch
deleted file mode 100644
index f2c7eb394ed..00000000000
--- a/main/pgpool/fix-listen_address.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-pgpool resolves localhost to ::1 (IPv6) and fails to bind on ::1:9999.
-
---- a/src/sample/pgpool.conf.sample
-+++ b/src/sample/pgpool.conf.sample
-@@ -24,7 +24,7 @@
- 
- # - pgpool Connection Settings -
- 
--listen_addresses = 'localhost'
-+listen_addresses = '127.0.0.1'
-                                    # Host name or IP address to listen on:
-                                    # '*' for all, '' for no TCP/IP connections
-                                    # (change requires restart)
---- a/src/sample/pgpool.conf.sample-logical
-+++ b/src/sample/pgpool.conf.sample-logical
-@@ -24,7 +24,7 @@
- 
- # - pgpool Connection Settings -
- 
--listen_addresses = 'localhost'
-+listen_addresses = '127.0.0.1'
-                                    # Host name or IP address to listen on:
-                                    # '*' for all, '' for no TCP/IP connections
-                                    # (change requires restart)
---- a/src/sample/pgpool.conf.sample-master-slave
-+++ b/src/sample/pgpool.conf.sample-master-slave
-@@ -24,7 +24,7 @@
- 
- # - pgpool Connection Settings -
- 
--listen_addresses = 'localhost'
-+listen_addresses = '127.0.0.1'
-                                    # Host name or IP address to listen on:
-                                    # '*' for all, '' for no TCP/IP connections
-                                    # (change requires restart)
---- a/src/sample/pgpool.conf.sample-replication
-+++ b/src/sample/pgpool.conf.sample-replication
-@@ -24,7 +24,7 @@
- 
- # - pgpool Connection Settings -
- 
--listen_addresses = 'localhost'
-+listen_addresses = '127.0.0.1'
-                                    # Host name or IP address to listen on:
-                                    # '*' for all, '' for no TCP/IP connections
-                                    # (change requires restart)
---- a/src/sample/pgpool.conf.sample-stream
-+++ b/src/sample/pgpool.conf.sample-stream
-@@ -24,7 +24,7 @@
- 
- # - pgpool Connection Settings -
- 
--listen_addresses = 'localhost'
-+listen_addresses = '127.0.0.1'
-                                    # Host name or IP address to listen on:
-                                    # '*' for all, '' for no TCP/IP connections
-                                    # (change requires restart)
diff --git a/main/pgpool/musl-compat.patch b/main/pgpool/musl-compat.patch
deleted file mode 100644
index 04a74ec10fa..00000000000
--- a/main/pgpool/musl-compat.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/tools/pgproto/read.c
-+++ b/src/tools/pgproto/read.c
-@@ -26,6 +26,7 @@
- #include "pgproto/fe_memutils.h"
- #include <libpq-fe.h>
- #include "pgproto/read.h"
-+#include <sys/select.h>
- 
- static char read_char(PGconn *conn);
- static int	read_int32(PGconn *conn);
diff --git a/main/pgpool/pgpool.confd b/main/pgpool/pgpool.confd
index 938bd56b529..e83c55d0ca6 100644
--- a/main/pgpool/pgpool.confd
+++ b/main/pgpool/pgpool.confd
@@ -1,4 +1,4 @@
-# Configuration file for /etc/init.d/pgpool
+# Configuration for /etc/init.d/pgpool
 
 # Path to the pgpool.conf configuration file.
 #config_file="/etc/pgpool/pgpool.conf"
@@ -18,3 +18,6 @@
 
 # Additional options for pgpool(1).
 #command_args=""
+
+# Uncomment to run with process supervisor.
+# supervisor="supervise-daemon"
diff --git a/main/pgpool/pgpool.initd b/main/pgpool/pgpool.initd
index effd4a75f26..2d676a1c7f4 100644
--- a/main/pgpool/pgpool.initd
+++ b/main/pgpool/pgpool.initd
@@ -1,13 +1,15 @@
 #!/sbin/openrc-run
 
+name="pgpool-II"
+
 : ${command_user:="postgres:postgres"}
 : ${config_file:="/etc/pgpool/pgpool.conf"}
 : ${hba_file:="/etc/pgpool/pool_hba.conf"}
 : ${key_file:="/etc/pgpool/pool_key"}
 : ${pcp_file:="/etc/pgpool/pcp.conf"}
 : ${logfile="/var/log/pgpool/pgpool.log"}
+: ${start_wait:=2}
 
-name="pgpool-II"
 command="/usr/bin/pgpool"
 command_args="
 	--dont-detach
@@ -18,8 +20,13 @@ command_args="
 	$command_args
 	"
 command_background="yes"
+
 pidfile="/run/$RC_SVCNAME.pid"
-start_stop_daemon_args="--wait 2 ${logfile:+"--stderr $logfile"}"
+error_log="$logfile"
+start_stop_daemon_args="--wait $start_wait"
+# The leading space is to avoid fallback to $start_stop_daemon_args when this
+# is empty (supervise-daemon doesn't support --wait).
+supervise_daemon_args=" $supervise_daemon_args"
 
 required_files="$config_file"
 
diff --git a/main/pgtcl/APKBUILD b/main/pgtcl/APKBUILD
index 98eef964834..e804851dc5b 100644
--- a/main/pgtcl/APKBUILD
+++ b/main/pgtcl/APKBUILD
@@ -1,30 +1,40 @@
 # Contributor: G.J.R. Timmer <gjr.timmer@gmail.com>
-# Maintainer: G.J.R. Timmer <gjr.timmer@gmail.com>
+# Maintainer: rubicon <rubicon@mailo.com>
 pkgname=pgtcl
-_pkgname=Pgtcl
-pkgver=2.1.0
+pkgver=3.0.1
 pkgrel=0
 pkgdesc="Tcl client side interface to PostgreSQL (libpgtcl)"
 url="https://flightaware.github.io/Pgtcl/"
 arch="all"
-license="BSD"
-makedepends="postgresql-dev tcl-dev docbook2x"
-subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/flightaware/$_pkgname/archive/v$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+license="BSD-3-Clause"
+depends="tcl"
+makedepends="autoconf libpq-dev tcl-dev"
+checkdepends="postgresql"
+subpackages="$pkgname-doc $pkgname-dev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/flightaware/Pgtcl/archive/v$pkgver.tar.gz
+	pgtcl-tests.patch
+	"
+builddir="$srcdir/Pgtcl-$pkgver"
 
-prepare() {
-	default_prepare || return 1
+ERROR_CLEANUP="$ERROR_CLEANUP srcdir"
 
-	cd "$builddir"
-	sed -i -e 's/docbook2man/docbook2x-man/g' \
-		-e 's|sh \./fix-fi\.sh man/\*||g' \
-		doc/Makefile
+cleanup_srcdir() {
+	if [ -f "$_data_dir"/postmaster.pid ]; then
+		local pg_pid="$(head -1 "$_data_dir"/postmaster.pid)"
+		msg "Killing PostgreSQL test server with PID: $pg_pid"
+		kill "$pg_pid"
+	fi
+	default_cleanup_srcdir
 }
 
-build() {
-	cd "$builddir"
+prepare() {
+	default_prepare
+	sed -i "s/@USER@/${USER:-$(id -un)}/" tests/conninfo.tcl
+	autoupdate
+	autoreconf -fiv
+}
 
+build() {
 	local x64_flags
 	case "$CARCH" in
 	aarch64 | x86_64) x64_flags="--enable-64bit";;
@@ -37,19 +47,40 @@ build() {
 		--mandir=/usr/share/man \
 		--disable-rpath \
 		--enable-threads \
-		$x64_flags \
-		|| return 1
-	make || return 1
+		$x64_flags
+	make
 }
 
-package() {
-	cd "$builddir"
+check() {
+	export PATH="/usr/libexec/postgresql:$PATH"
+	_data_dir="$srcdir"/pgtcltest
+	local socket_dir="$srcdir"
 
-	make DESTDIR="$pkgdir" install || return 1
-	make -C doc DESTDIR="$pkgdir" all || return 1
+	rm -vrf "$_data_dir"
+	mkdir -vp "$_data_dir"
+	pg_ctl initdb -D "$_data_dir"
+	pg_ctl start -D "$_data_dir" -o -k"$socket_dir"
+	createdb -h "$socket_dir" pgtcl
+
+	make test TESTFLAGS="-verbose pbtels -notfile 'sqlite3.test'"
+	cd tests
+	psql -h "$socket_dir" -d pgtcl -c '\i create.sql'
+	local test; for test in import*.tcl; do
+		msg "Testing $test"
+		time tclsh $test
+	done
+
+	pg_ctl stop -D "$_data_dir" -m immediate
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
 
 	# Remove empty directories.
-	rmdir "$pkgdir"/usr/bin "$pkgdir"/usr/include
+	rmdir -v "$pkgdir"/usr/bin
 }
 
-sha512sums="895f81548d5fde128b258cfb9cad732f539089a7c89bad08b7bc8a229d7f2ecdb9b31a374ddb3fb392ed3e20ba45cca47c2dccfa6ab86e617177f7021d08b3b3  pgtcl-2.1.0.tar.gz"
+sha512sums="
+a50eca8d48b88439747e43e32c7e79e325ac73d2864467e0713b3c8e2ea811942780baef3283796c4eb9ee618b55fa10af75737e4972f77293c6eca831213e66  pgtcl-3.0.1.tar.gz
+8c9f5bf024919dd59f29ecc99d1be305169c1a6a8dcad1ff0bcaefda4e1d206731b867340167adf44f7e607745152a7745a4d1dc4a67f835de469990ed9e1cd8  pgtcl-tests.patch
+"
diff --git a/main/pgtcl/pgtcl-tests.patch b/main/pgtcl/pgtcl-tests.patch
new file mode 100644
index 00000000000..445c2232aac
--- /dev/null
+++ b/main/pgtcl/pgtcl-tests.patch
@@ -0,0 +1,91 @@
+--- a/tests/conninfo.tcl
++++ b/tests/conninfo.tcl
+@@ -4,8 +4,8 @@
+ array set conninfo {
+     host    localhost
+     port    5432
+-    dbname  ####
+-    user    ####
++    dbname  pgtcl
++    user    @USER@
+ }
+ 
+ # Or copy and fill out the above datastructure into ~/.conninfo
+--- a/tests/pgtcl.test
++++ b/tests/pgtcl.test
+@@ -1045,7 +1045,7 @@
+     lappend res [string equal $val $val2]
+     ::pg::disconnect $conn
+ 
+-    lappend res [regexp {(7|8|9|10|11|12)0([0-9])[012]([0-9])} $val]
++    lappend res [regexp {(7|8|9|10|11|12|13|14)0([0-9])[012]([0-9])} $val]
+ 
+ } -result [list 1 1]
+ 
+@@ -1079,9 +1079,9 @@
+     lappend res [string equal $val $val2]
+     ::pg::disconnect $conn
+ 
+-    set match [regexp {(7|8|9|10|11|12)\.([0-9])\.([0-9])} $val]
++    set match [regexp {(7|8|9|10|11|12|13|14)\.([0-9])\.([0-9])} $val]
+     if {!$match} {
+-	set match [regexp {^(10|11|12)\.[1-9][0-9]* \(.*} $val]
++	set match [regexp {^(10|11|12|13|14)\.[1-9][0-9]*} $val]
+     }
+     lappend res $match
+ 
+--- a/tests/import_sampledata.tcl
++++ b/tests/import_sampledata.tcl
+@@ -4,6 +4,8 @@
+ # $Id$
+ #
+ 
++lappend auto_path ..
++
+ package require Pgtcl
+ 
+ if {[file exists conninfo.tcl]} {
+--- a/tests/import_sampledata_connobj.tcl
++++ b/tests/import_sampledata_connobj.tcl
+@@ -5,6 +5,8 @@
+ # $Id$
+ #
+ 
++lappend auto_path ..
++
+ package require Pgtcl
+ 
+ if {[file exists conninfo.tcl]} {
+--- a/tests/import_sampledata_onetransaction.tcl
++++ b/tests/import_sampledata_onetransaction.tcl
+@@ -5,6 +5,8 @@
+ # $Id$
+ #
+ 
++lappend auto_path ..
++
+ package require Pgtcl
+ 
+ if {[file exists conninfo.tcl]} {
+--- a/tests/import_sampledata_prepared.tcl
++++ b/tests/import_sampledata_prepared.tcl
+@@ -5,6 +5,8 @@
+ # $Id$
+ #
+ 
++lappend auto_path ..
++
+ package require Pgtcl
+ 
+ if {[file exists conninfo.tcl]} {
+--- a/tests/import_sampledata_prepared_onetransaction.tcl
++++ b/tests/import_sampledata_prepared_onetransaction.tcl
+@@ -5,6 +5,8 @@
+ # $Id$
+ #
+ 
++lappend auto_path ..
++
+ package require Pgtcl
+ 
+ if {[file exists conninfo.tcl]} {
diff --git a/main/pigz/APKBUILD b/main/pigz/APKBUILD
index f1d97e2ee59..a7749a567e1 100644
--- a/main/pigz/APKBUILD
+++ b/main/pigz/APKBUILD
@@ -1,7 +1,7 @@
-# Contributor:
-# Maintainer:
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pigz
-pkgver=2.4
+pkgver=2.8
 pkgrel=1
 pkgdesc="Parallel implementation of gzip"
 url="https://zlib.net/pigz/"
@@ -12,21 +12,19 @@ subpackages="$pkgname-doc"
 source="https://zlib.net/pigz/pigz-$pkgver.tar.gz"
 
 build() {
-	export CXXFLAGS="$CXXFLAGS -std=gnu++98"
-	make
+	make LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS -O3 -flto=auto" pigz
 }
 
 check() {
-	make tests
+	make test
 }
 
 package() {
-	mkdir -p "$pkgdir"/usr/bin
-	mkdir -p "$pkgdir"/usr/share/man/man1
-	for i in pigz unpigz; do
-		install -m755 $i "$pkgdir"/usr/bin
-	done
-	install -m644 pigz.1 "$pkgdir"/usr/share/man/man1
+	install -Dm755 pigz -t "$pkgdir"/usr/bin
+	ln -s pigz "$pkgdir"/usr/bin/unpigz
+	install -Dm644 pigz.1 -t "$pkgdir"/usr/share/man/man1
 }
 
-sha512sums="79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba  pigz-2.4.tar.gz"
+sha512sums="
+ae3d9d593e1645d65f9ab77aa828600c9af4bb30d0a073da7ae3dd805e65b87efaf6a0efb980f2d0168e475ae506eba194547d6479956dabb9d88293a9078a7f  pigz-2.8.tar.gz
+"
diff --git a/main/pinentry/APKBUILD b/main/pinentry/APKBUILD
index 51d14fc0be4..169813b8f94 100644
--- a/main/pinentry/APKBUILD
+++ b/main/pinentry/APKBUILD
@@ -1,29 +1,51 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pinentry
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.3.0
+pkgrel=0
 pkgdesc="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
-url="http://www.gnupg.org/aegypten2"
+url="https://www.gnupg.org/aegypten2/"
 arch="all"
 license="GPL-2.0-or-later"
-install="pinentry.post-install"
-makedepends="ncurses-dev libcap-dev libgpg-error-dev libassuan-dev gcr-dev libsecret-dev"
-subpackages="$pkgname-doc"
-source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2"
+install="
+	$pkgname.post-install
+	$pkgname.post-upgrade
+	$pkgname-curses-ss.post-install
+	$pkgname-curses-ss.post-deinstall
+	"
+makedepends="ncurses-dev libcap-dev libgpg-error-dev libassuan-dev libsecret-dev"
+subpackages="$pkgname-doc $pkgname-tty $pkgname-curses-ss:_curses_ss"
+source="https://gnupg.org/ftp/gcrypt/pinentry/pinentry-$pkgver.tar.bz2"
 
-build () {
+prepare() {
+	default_prepare
+
+	cp -ar "$builddir" "$builddir-libsecret"
+}
+
+build() {
+	_build \
+		--disable-libsecret \
+		--enable-pinentry-curses \
+		--enable-pinentry-tty
+
+	cd "$builddir-libsecret"
+	_build \
+		--enable-libsecret \
+		--enable-pinentry-curses \
+		--disable-pinentry-tty
+}
+
+_build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--disable-pinentry-gtk \
 		--disable-pinentry-gtk2 \
 		--disable-pinentry-gnome3 \
 		--disable-pinentry-qt \
-		--enable-pinentry-curses \
 		--enable-fallback-curses \
-		--enable-libsecret
+		"$@"
 	make
 }
 
@@ -32,10 +54,25 @@ check() {
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	make -C "$builddir" DESTDIR="$pkgdir" install
 
 	# created by post install scripts so we can override with other UI versions
 	rm -f "$pkgdir"/usr/bin/pinentry
 }
 
-sha512sums="5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd  pinentry-1.1.0.tar.bz2"
+_curses_ss() {
+	pkgdesc="Curses-based PIN or pass-phrase entry dialog for GnuPG with Secret Service support"
+
+	install -D -m 755 "$builddir-libsecret"/curses/pinentry-curses \
+		"$subpkgdir"/usr/bin/pinentry-curses-ss
+}
+
+tty() {
+	pkgdesc="Minimal dumb-terminal PIN or pass-phrase entry dialog for GnuPG"
+
+	amove usr/bin/pinentry-tty
+}
+
+sha512sums="
+1bbac81c6811cffc8969a46494e6daa6b8447802f47ff6fa3e4dc9ac244cf6e5f629834c9b6a60770d06bff6c9932ad4059f10d2fdf93fd9e26fd5d21c0e3732  pinentry-1.3.0.tar.bz2
+"
diff --git a/main/pinentry/pinentry-curses-ss.post-deinstall b/main/pinentry/pinentry-curses-ss.post-deinstall
new file mode 100644
index 00000000000..3be22979758
--- /dev/null
+++ b/main/pinentry/pinentry-curses-ss.post-deinstall
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ "$(readlink /usr/bin/pinentry)" = "pinentry-curses-ss" ]; then
+	rm /usr/bin/pinentry
+
+	# restore symlink to pinentry-curses, if exists
+	if [ -x "/usr/bin/pinentry-curses" ]; then
+		ln -sfv pinentry-curses /usr/bin/pinentry
+	fi
+fi
+
+exit 0
diff --git a/main/pinentry/pinentry-curses-ss.post-install b/main/pinentry/pinentry-curses-ss.post-install
new file mode 100644
index 00000000000..40354690416
--- /dev/null
+++ b/main/pinentry/pinentry-curses-ss.post-install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+for i in gtk-2 gnome qt; do
+	[ -f /usr/bin/pinentry-$i ] && exit 0
+done
+
+ln -sf pinentry-curses-ss /usr/bin/pinentry
+
+exit 0
diff --git a/main/pinentry/pinentry.post-install b/main/pinentry/pinentry.post-install
index 895cdef59f5..73ef9c0454f 100644
--- a/main/pinentry/pinentry.post-install
+++ b/main/pinentry/pinentry.post-install
@@ -1,6 +1,9 @@
 #!/bin/sh
 
-if ! [ -f /usr/bin/pinentry-gtk-2 ] && ! [ -f /usr/bin/pinentry-gnome ] && ! [ -f /usr/bin/pinentry-qt ]; then
-	ln -sf pinentry-curses /usr/bin/pinentry
-fi
+for i in curses-ss gtk-2 gnome qt; do
+	[ -f /usr/bin/pinentry-$i ] && exit 0
+done
 
+ln -sf pinentry-curses /usr/bin/pinentry
+
+exit 0
diff --git a/main/pinentry/pinentry.post-upgrade b/main/pinentry/pinentry.post-upgrade
new file mode 100644
index 00000000000..ac193c7d00e
--- /dev/null
+++ b/main/pinentry/pinentry.post-upgrade
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+ver_old="$2"
+
+if [ "$(apk version -t "$ver_old" '1.1.1-r1')" = '<' ]; then
+	cat >&2 <<-EOF
+	*
+	* If you use pinentry-curses with Secret Service (for password caching),
+	* install package pinentry-curses-ss.
+	*
+	EOF
+fi
diff --git a/main/pingu/APKBUILD b/main/pingu/APKBUILD
index 5f8f21f3435..3aa13c1941c 100644
--- a/main/pingu/APKBUILD
+++ b/main/pingu/APKBUILD
@@ -2,22 +2,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pingu
 pkgver=1.5
-pkgrel=2
+pkgrel=5
 pkgdesc="Small daemon that pings hosts and executes a script when status change"
-url="https://git.alpinelinux.org/cgit/pingu"
+url="https://github.com/ncopa/pingu"
 arch="all"
 license="GPL"
 makedepends="libev-dev lua-dev asciidoc linux-headers"
-depends=
-subpackages="$pkgname-doc lua-pingu:_lua mtu"
+subpackages="$pkgname-doc $pkgname-openrc lua-pingu:_lua mtu"
+options="!check"
 source="pingu-$pkgver.tar.gz::https://github.com/ncopa/pingu/archive/v$pkgver.tar.gz
 	pingu.initd
 	"
 
-builddir="$srcdir"/$pkgname-$pkgver
-
 build() {
-	cd "$_builddir"
 	./configure \
 		--prefix=/usr \
 		--localstatedir=/var \
@@ -27,7 +24,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -m644 -D pingu.conf "$pkgdir"/etc/pingu/pingu.conf
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
@@ -35,14 +31,12 @@ package() {
 
 mtu() {
 	pkgdesc="Utility to detect MTU"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+	amove usr/bin
 }
 
 _lua() {
 	pkgdesc="lua module for pingu client"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr/
+	amove usr/lib usr/share
 }
 
 sha512sums="71e5fbe93f831f24d168957cdeaff2817a22f407575316d6515755bec760d10724821070549eaab562924237b96976a1a776ca903d5fe0cd9f9b69a38eadd8c9  pingu-1.5.tar.gz
diff --git a/main/pixman/APKBUILD b/main/pixman/APKBUILD
index 0fe2707c8c2..d8e6936e092 100644
--- a/main/pixman/APKBUILD
+++ b/main/pixman/APKBUILD
@@ -1,45 +1,50 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pixman
-pkgver=0.38.4
+pkgver=0.43.2
 pkgrel=0
 pkgdesc="Low-level pixel manipulation library"
-url="http://xorg.freedesktop.org"
+url="https://gitlab.freedesktop.org/pixman"
 arch="all"
 license="MIT"
+makedepends="meson libpng-dev linux-headers"
 subpackages="$pkgname-static $pkgname-dev $pkgname-dbg"
-makedepends="perl linux-headers"
-source="https://www.x.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2
-	stacksize-reduction.patch
+source="https://www.x.org/releases/individual/lib/pixman-$pkgver.tar.xz
+	scaling-test.patch
 	"
-builddir="$srcdir/$pkgname-$pkgver"
+
+case "$CARCH" in
+	# broken test (likely due to endianness assumptions)
+	s390x) options="!check" ;;
+esac
 
 build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--enable-static \
-		--disable-openmp \
-		--disable-arm-iwmmxt
-	make
+	case "$CARCH" in
+	armhf)
+		# target-specific builtin not available
+		local lto=false
+		;;
+	*)
+		local lto=true
+		;;
+	esac
+	# We need to increase the stacksize here: https://gitlab.gnome.org/GNOME/librsvg/-/issues/595
+	LDFLAGS="$LDFLAGS -Wl,-z,stack-size=2097152" \
+	abuild-meson \
+		-Db_lto=$lto \
+		-Ddefault_library=both \
+		. output
+	meson compile -C output
 }
 
 check() {
-	cd "$builddir"
-	make check
+	meson test --no-rebuild --print-errorlogs -C output -t 10
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-static() {
-	pkgdesc="Static libraries for pixman"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-sha512sums="0683b7f67caa0881b23188b7e6f8487c7e0a1257a912686616b7d862efd5a9efdb51641c81ec54905a6f6b1029d796ca4e25c0909db28fc29fa3617bf09f9cf9  pixman-0.38.4.tar.bz2
-3d75e7328e6eaaa6e8f4defa4402db815764369f94b81be38fba07933267fe24b03b591dd4c3f3544cb090650153728bfbdd81a91acaf19524c3d08f61427f63  stacksize-reduction.patch"
+sha512sums="
+1a1d21b86b3c6784c4c2606b7069723b4dbb747eac9fce95bca86516787840379ffd49abc42d11e7143e85c32c85496f33c2562c7a910ca6f963599affdc3224  pixman-0.43.2.tar.xz
+78837937b59bd1b6d2a916bf73152908186fbedebf2be4fe2a89e978ac787b7827a3858970c9b69445d737545f786732394b62ac54751f5996cbedc492aefd59  scaling-test.patch
+"
diff --git a/main/pixman/scaling-test.patch b/main/pixman/scaling-test.patch
new file mode 100644
index 00000000000..0c52cdadd5b
--- /dev/null
+++ b/main/pixman/scaling-test.patch
@@ -0,0 +1,14 @@
+fails on arm most likely due to comments in
+https://gitlab.freedesktop.org/pixman/pixman/-/merge_requests/40
+diff --git a/test/meson.build b/test/meson.build
+index 59a0d42..42c7ef3 100644
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -48,7 +48,6 @@ tests = [
+   'cover-test',
+   'blitters-test',
+   'affine-test',
+-  'scaling-test',
+   'composite',
+   'tolerance-test',
+ ]
diff --git a/main/pixman/stacksize-reduction.patch b/main/pixman/stacksize-reduction.patch
deleted file mode 100644
index 38da9b3ff1f..00000000000
--- a/main/pixman/stacksize-reduction.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Reduce the stack footprint of pixman's function
-general_composite_rect() which allocates a large buffer
-`stack_scanline_buffer`. Make it `static __thread` instead.
-
---- a/pixman/pixman-general.c	2015-12-27 21:37:37.000000000 +0100
-+++ b/pixman/pixman-general.c	2016-05-05 12:24:47.346661080 +0200
-@@ -128,8 +128,8 @@
-                          pixman_composite_info_t *info)
- {
-     PIXMAN_COMPOSITE_ARGS (info);
--    uint8_t stack_scanline_buffer[3 * SCANLINE_BUFFER_LENGTH];
--    uint8_t *scanline_buffer = (uint8_t *) stack_scanline_buffer;
-+    static __thread uint8_t static_scanline_buffer[3 * SCANLINE_BUFFER_LENGTH];
-+    uint8_t *scanline_buffer = (uint8_t *) static_scanline_buffer;
-     uint8_t *src_buffer, *mask_buffer, *dest_buffer;
-     pixman_iter_t src_iter, mask_iter, dest_iter;
-     pixman_combine_32_func_t compose;
-@@ -158,7 +158,7 @@
-     if (width <= 0 || _pixman_multiply_overflows_int (width, Bpp * 3))
- 	return;
- 
--    if (width * Bpp * 3 > sizeof (stack_scanline_buffer) - 15 * 3)
-+    if (width * Bpp * 3 > sizeof (static_scanline_buffer) - 15 * 3)
-     {
- 	scanline_buffer = pixman_malloc_ab_plus_c (width, Bpp * 3, 15 * 3);
- 
-@@ -232,7 +232,7 @@
-     if (dest_iter.fini)
- 	dest_iter.fini (&dest_iter);
-     
--    if (scanline_buffer != (uint8_t *) stack_scanline_buffer)
-+    if (scanline_buffer != (uint8_t *) static_scanline_buffer)
- 	free (scanline_buffer);
- }
- 
diff --git a/main/pjproject/APKBUILD b/main/pjproject/APKBUILD
index 0a2b501e70f..af2f64f24fe 100644
--- a/main/pjproject/APKBUILD
+++ b/main/pjproject/APKBUILD
@@ -1,20 +1,55 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pjproject
-pkgver=2.9
-pkgrel=0
-pkgdesc="CLI Softphone"
+pkgver=2.14
+pkgrel=1
+pkgdesc="Open source multimedia communication library"
 url="https://www.pjsip.org/pjsua.htm"
 arch="all"
 license="GPL-2.0-or-later"
-depends_dev="openssl-dev alsa-lib-dev gsm-dev speex-dev speexdsp-dev
+depends_dev="openssl-dev>3 alsa-lib-dev gsm-dev speex-dev speexdsp-dev
 	portaudio-dev libsrtp-dev libsamplerate-dev"
-makedepends="$depends_dev"
-subpackages="$pkgname-dbg $pkgname-dev pjsua"
-source="http://www.pjsip.org/release/$pkgver/pjproject-$pkgver.tar.bz2
-	fix-bb-cp-uniqueness.patch
+makedepends="$depends_dev linux-headers python3-dev py3-setuptools swig"
+subpackages="$pkgname-dbg $pkgname-dev py3-pjsua-pyc py3-pjsua:py3 pjsua"
+source="$pkgname-$pkgver.tar.gz::https://github.com/pjsip/pjproject/archive/refs/tags/$pkgver.tar.gz
 	pjproject_no_third_party.patch
 	"
+options="!check"
+
+# secfixes:
+#   2.14-r0:
+#     - CVE-2023-38703
+#   2.13.1-r0:
+#     - CVE-2023-27585
+#   2.13-r0:
+#     - CVE-2022-31031
+#     - CVE-2022-39244
+#     - CVE-2022-39269
+#   2.12.1-r0:
+#     - CVE-2022-24754
+#     - CVE-2022-24763
+#     - CVE-2022-24764
+#     - CVE-2022-24786
+#     - CVE-2022-24792
+#     - CVE-2022-24793
+#   2.12-r0:
+#     - CVE-2021-37706
+#     - CVE-2021-41141
+#     - CVE-2021-43299
+#     - CVE-2021-43300
+#     - CVE-2021-43301
+#     - CVE-2021-43302
+#     - CVE-2021-43303
+#     - CVE-2021-43804
+#     - CVE-2021-43845
+#     - CVE-2022-21722
+#     - CVE-2022-21723
+#     - CVE-2022-23608
+#   2.11.1-r0:
+#     - CVE-2021-32686
+#   2.11-r0:
+#     - CVE-2020-15260
+#     - CVE-2021-21375
 
 prepare() {
 	default_prepare
@@ -41,7 +76,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	export CFLAGS="-DNDEBUG $CFLAGS"
 	./configure \
 		--build=$CBUILD \
@@ -62,22 +96,33 @@ build() {
 	# TODO: make it build with only shared libs from system
 	# rm -r third_party
 	make dep
-	make -j1 all
+	make all
+
+	cd pjsip-apps/src/swig/python
+	make
 }
 
 package() {
-	cd "$builddir"
 	install -d "$pkgdir"/usr/lib
 	make -j1 DESTDIR="$pkgdir" prefix=/usr install
 	rm -f "$pkgdir"/usr/lib/*.a
+
+	cd pjsip-apps/src/swig/python
+	python3 setup.py install --skip-build --root="$pkgdir"
 }
 
 pjsua() {
-	pkgdesc="pjsua is an open source command line SIP user agent (softphone)"
+	pkgdesc="Open source command line SIP user agent (softphone)"
 	cd "$builddir"/pjsip-apps/bin/
 	install -D -m755 pjsua "$subpkgdir"/usr/bin/pjsua
 }
 
-sha512sums="a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b  pjproject-2.9.tar.bz2
-8688885d5d7b4c6725c6b9a98935401a292757533ac859cdec6bcd5210c9668206fc4be09561890541de8842c4b7beba456ae1a044b4793dfc1275278d7f2cd5  fix-bb-cp-uniqueness.patch
-fe53b4e8a654dc4025a4bf6350f405953609abc9e7ed967882cb9eb9e6a659e348a0c3c7496c8093562a0dcc4a40459896d8ee1da7275dd089244338111bccbb  pjproject_no_third_party.patch"
+py3() {
+	pkgdesc="$pkgdesc (Python bindings)"
+	amove usr/lib/python*
+}
+
+sha512sums="
+5732f3cc46a6a3021d57da9abf4d4ef5233466379557e9c27fc529b4476f439ec2664d567bea802cd032a1c1db5bd0baeabfc70638f557be5e4b4a1faa910d2b  pjproject-2.14.tar.gz
+fe53b4e8a654dc4025a4bf6350f405953609abc9e7ed967882cb9eb9e6a659e348a0c3c7496c8093562a0dcc4a40459896d8ee1da7275dd089244338111bccbb  pjproject_no_third_party.patch
+"
diff --git a/main/pjproject/fix-bb-cp-uniqueness.patch b/main/pjproject/fix-bb-cp-uniqueness.patch
deleted file mode 100644
index e844204e70d..00000000000
--- a/main/pjproject/fix-bb-cp-uniqueness.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru pjproject-2.2.1.orig/Makefile pjproject-2.2.1/Makefile
---- pjproject-2.2.1.orig/Makefile	2014-04-15 08:14:35.075716775 -0300
-+++ pjproject-2.2.1/Makefile	2014-04-15 08:21:39.683417350 -0300
-@@ -119,7 +119,7 @@
- install:
- 	mkdir -p $(DESTDIR)$(libdir)/
- #	cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/
--	cp -af $(APP_LIBXX_FILES) $(DESTDIR)$(libdir)/
-+	cp -af $(sort $(APP_LIBXX_FILES)) $(DESTDIR)$(libdir)/
- 	mkdir -p $(DESTDIR)$(includedir)/
- 	for d in pjlib pjlib-util pjnath pjmedia pjsip; do \
- 		cp -RLf $$d/include/* $(DESTDIR)$(includedir)/; \
diff --git a/main/pkgconf/APKBUILD b/main/pkgconf/APKBUILD
index 48568c3bffe..9cac699d7e8 100644
--- a/main/pkgconf/APKBUILD
+++ b/main/pkgconf/APKBUILD
@@ -1,16 +1,21 @@
-# Maintainer: Drew DeVault <sir@cmpwn.com>
+# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
 pkgname=pkgconf
-pkgver=1.6.3
-pkgrel=2
+pkgver=2.2.0
+pkgrel=0
 pkgdesc="development framework configuration tools"
-url="https://git.sr.ht/~kaniini/pkgconf"
+url="https://gitea.treehouse.systems/ariadne/pkgconf"
 arch="all"
 license="ISC"
 replaces="pkgconfig"
 provides="pkgconfig=1"
-subpackages="$pkgname-doc $pkgname-dev"
-source="https://distfiles.dereferenced.org/pkgconf/pkgconf-$pkgver.tar.xz"
 checkdepends="kyua atf"
+subpackages="$pkgname-doc $pkgname-dev"
+source="https://distfiles.ariadne.space/pkgconf/pkgconf-$pkgver.tar.xz
+	"
+
+# secfixes:
+#   1.9.4-r0:
+#     - CVE-2023-24056
 
 build() {
 	./configure \
@@ -45,4 +50,6 @@ dev() {
 	mv "$subpkgdir"/usr/share/aclocal/pkg.m4 "$pkgdir"/usr/share/aclocal/
 }
 
-sha512sums="437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1  pkgconf-1.6.3.tar.xz"
+sha512sums="
+c4ff254c7323bdebc2595037df60e33f17fc5c222d7500a4b9d8b18c8b451ac35cd3ac90d31c920c23e9495ece2b82422de61e13286d43de3a5d1fe8211bd944  pkgconf-2.2.0.tar.xz
+"
diff --git a/main/pm-utils/APKBUILD b/main/pm-utils/APKBUILD
index 70c311f4709..13d61aaf48f 100644
--- a/main/pm-utils/APKBUILD
+++ b/main/pm-utils/APKBUILD
@@ -2,12 +2,15 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=pm-utils
 pkgver=1.4.1
-pkgrel=2
-pkgdesc="A small collection of scripts that handle suspend and resume on behalf of HAL"
+pkgrel=5
+pkgdesc="small collection of scripts that handle suspend and resume on behalf of HAL"
 url="https://pm-utils.freedesktop.org/wiki/"
 arch="all"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
+# bash->usr/lib/pm-utils/sleep.d/98video-quirk-db-handler
+# kbd->usr/lib/pm-utils/sleep.d/99video
+depends="bash kbd"
 makedepends="linux-headers"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://pm-utils.freedesktop.org/releases/pm-utils-$pkgver.tar.gz"
diff --git a/main/pmacct/APKBUILD b/main/pmacct/APKBUILD
index 1b5db02230a..d0b55fb0925 100644
--- a/main/pmacct/APKBUILD
+++ b/main/pmacct/APKBUILD
@@ -1,13 +1,28 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=pmacct
-pkgver=1.7.4
-pkgrel=0
+pkgver=1.7.8
+pkgrel=1
 pkgdesc="Measure, account, classify, aggregate and export IPv4 and IPv6 traffic"
 url="http://www.pmacct.net/"
 arch="all"
 license="GPL-2.0-or-later"
-makedepends="bsd-compat-headers libpcap-dev mariadb-connector-c-dev postgresql-dev
-	zlib-dev jansson-dev sqlite-dev libnetfilter_log-dev"
+makedepends="
+	autoconf
+	automake
+	bsd-compat-headers
+	hiredis-dev
+	jansson-dev
+	libmaxminddb-dev
+	libnetfilter_log-dev
+	libpcap-dev
+	libpq-dev
+	libtool
+	mariadb-connector-c-dev
+	numactl-dev
+	rabbitmq-c-dev
+	sqlite-dev
+	zlib-dev
+	"
 subpackages="$pkgname-doc $pkgname-openrc"
 source="http://www.pmacct.net/pmacct-$pkgver.tar.gz
 	pmacctd.initd
@@ -17,8 +32,16 @@ source="http://www.pmacct.net/pmacct-$pkgver.tar.gz
 	nfacctd.conf
 	uacctd.conf
 	"
+options="!check"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
+	CFLAGS="$CFLAGS -flto=auto" \
+	CXXFLAGS="$CXXFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,9 +49,12 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
+		--enable-ebfp \
+		--enable-geoipv2 \
 		--enable-pgsql \
-		--enable-64bit \
 		--enable-mysql \
+		--enable-rabbitmq \
+		--enable-redis \
 		--enable-sqlite3 \
 		--enable-jansson \
 		--enable-nflog
@@ -44,18 +70,20 @@ package() {
 	install -m644 -D "$srcdir"/nfacctd.conf "$pkgdir"/etc/nfacctd.conf
 	install -m644 -D "$srcdir"/sfacctd.conf "$pkgdir"/etc/sfacctd.conf
 	install -m644 -D "$srcdir"/uacctd.conf "$pkgdir"/etc/uacctd.conf
-	ln -s /etc/init.d/pmacctd "$pkgdir"/etc/init.d/nfacctd &>/dev/null
-	ln -s /etc/init.d/pmacctd "$pkgdir"/etc/init.d/sfacctd &>/dev/null
-	ln -s /etc/init.d/pmacctd "$pkgdir"/etc/init.d/uacctd &>/dev/null
-	mkdir -p $pkgdir/usr/share/doc/pmacct/sql
-	cp sql/README.* $pkgdir/usr/share/doc/pmacct
-	cp sql/* $pkgdir/usr/share/doc/pmacct/sql
+	ln -s /etc/init.d/pmacctd "$pkgdir"/etc/init.d/nfacctd
+	ln -s /etc/init.d/pmacctd "$pkgdir"/etc/init.d/sfacctd
+	ln -s /etc/init.d/pmacctd "$pkgdir"/etc/init.d/uacctd
+	mkdir -p "$pkgdir"/usr/share/doc/pmacct/sql
+	cp sql/README.* "$pkgdir"/usr/share/doc/pmacct
+	cp sql/* "$pkgdir"/usr/share/doc/pmacct/sql
 }
 
-sha512sums="780b6cc25562fb7b5a1f55b48ce9719b36c1ee0d9ee2b6db8d7f238cd5d9f204938313b13e3ff3f62c7b9b179279f18314eba38ad787ffc346a4b217da239ca1  pmacct-1.7.4.tar.gz
+sha512sums="
+df576644688ddb1957aa1583b101b96d86ab404c1416e0709b1bc85d691d13841bdb92a37a4526bc9273101dd11e3134d2fb35c06d2cbcde8e5bf7e84751a1c2  pmacct-1.7.8.tar.gz
 62418cf66d44099ca93926d3ef9fc2d9b93922fd6edbb1d079d4f10063ad63bf922e60ebf128a86282bd0891afbddc380f9723fa1e82e128dd79feccc759645d  pmacctd.initd
 6078607dde8619f8fa5698f217c40a7e46ed85843923abecc87652d2e9df6db677898ee1965367247e6ac838d907533a8b1c7ab0515f3f2dc6f3fd4eb14bd5be  pmacctd.confd
 119f69c0ba49609ddbe8455cfa53cb45f94b5dc26b745292bc30422f97a3002dfc5e8b6d63ef17e8a8a5497adbcd64c9edf4476336e5c27144e1d2094a8e6c0a  pmacctd.conf
 a02d3b0c2ce56a11d965c395033ebec8e64581b7e9f60a128e8864521eeacf69a0d6a3994b47d3f3c252cd4b8ebbdc3406711fe305a80267aa151bc2da60f93f  sfacctd.conf
 8534411d0bb2c56d627c30f7fa60253fe5a4a2cf3119eb429f414d71cf181fa1ce94b1bb31d5e0f9fbf996afeb2cf7af39e14bd86948f00de8d2ee44ad874434  nfacctd.conf
-a02d3b0c2ce56a11d965c395033ebec8e64581b7e9f60a128e8864521eeacf69a0d6a3994b47d3f3c252cd4b8ebbdc3406711fe305a80267aa151bc2da60f93f  uacctd.conf"
+a02d3b0c2ce56a11d965c395033ebec8e64581b7e9f60a128e8864521eeacf69a0d6a3994b47d3f3c252cd4b8ebbdc3406711fe305a80267aa151bc2da60f93f  uacctd.conf
+"
diff --git a/main/pngcrush/APKBUILD b/main/pngcrush/APKBUILD
deleted file mode 100644
index 19948ec7c7c..00000000000
--- a/main/pngcrush/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=pngcrush
-pkgver=1.8.13
-pkgrel=0
-pkgdesc="PNG recompression utility"
-url="http://pmt.sourceforge.net/pngcrush/"
-arch="all"
-license="zlib"
-depends=""
-makedepends="zlib-dev libpng-dev"
-source="https://downloads.sourceforge.net/pmt/${pkgname}-${pkgver}-nolib.tar.xz"
-builddir="$srcdir/$pkgname-$pkgver-nolib"
-
-build() {
-	cd "$builddir"
-	make CC="${CC:-gcc}" \
-		CFLAGS="$CFLAGS" \
-		LDFLAGS="$LDFLAGS"
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-sha512sums="c073d573e9b13b72fa39b178271ce65d1a19fef35943ef0a9e6121a5c66d9db212aaad38ab777c5b44e20a107eb677003acbdb4a354bcb2dc40f535a97d9df0e  pngcrush-1.8.13-nolib.tar.xz"
diff --git a/main/po4a/APKBUILD b/main/po4a/APKBUILD
index 72cecfeac6a..427aedbd5d5 100644
--- a/main/po4a/APKBUILD
+++ b/main/po4a/APKBUILD
@@ -1,33 +1,34 @@
-# Maintainer: Christian Kampka <christian@kampka.net>
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Contributor: Christian Kampka <christian@kampka.net>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=po4a
-pkgver=0.57
+pkgver=0.71
 pkgrel=0
 pkgdesc="Tools for helping translation of documentation"
 url="https://po4a.org"
 arch="noarch"
 license="GPL-2.0-or-later"
 options="!check" # test_requires missing: SGMLS and Unicode::GCString
-depends="gettext perl"
+depends="gettext perl perl-pod-parser perl-syntax-keyword-try"
 makedepends="diffutils docbook-xsl perl-module-build"
 subpackages="$pkgname-doc $pkgname-lang"
-source="$pkgname-$pkgver.tar.gz::https://github.com/mquinson/po4a/archive/v$pkgver.tar.gz"
+source="https://github.com/mquinson/po4a/releases/download/v$pkgver/po4a-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
-	perl Build.PL installdirs=vendor create_packlist=0
-	perl Build
+	perl Build.PL \
+		--installdirs=vendor \
+		--create_packlist=0
+	./Build
 }
 
 check() {
-	cd "$builddir"
-	perl Build test
+	./Build test
 }
 
 package() {
-	cd "$builddir"
-	perl Build destdir=${pkgdir} install
-	# remove perllocal.pod and .packlist
-	find ${pkgdir} -name .packlist -o -name perllocal.pod -delete
+	./Build install --destdir="$pkgdir"
 }
 
-sha512sums="d01a19d4702c2bba1ef26e3149e865927aec7e6f3e5d7495aa3927fa34228e795cb76786b6a119d7eafc62de38949ab1b9e176bfcf8ead8875b9813124a6dab5  po4a-0.57.tar.gz"
+sha512sums="
+67ba925433d95ebd6675ce2e58b2664a07a00016ca4b5029845e485dfad1804737a00935e2da162e2488e4c21b947e7fa32b40ac3d9b28d4729d8f93c3f2040b  po4a-0.71.tar.gz
+"
diff --git a/main/policyd-spf-fs/APKBUILD b/main/policyd-spf-fs/APKBUILD
index ab95fbb761e..1a849883480 100644
--- a/main/policyd-spf-fs/APKBUILD
+++ b/main/policyd-spf-fs/APKBUILD
@@ -2,33 +2,33 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=policyd-spf-fs
 pkgver=23
-pkgrel=3
+pkgrel=8
 pkgdesc="Policy daemon for checking SPF records in postfix"
-url="http://www.freestone.net/software/policyd-spf-fs/"
+url="https://www.freestone.net/software/policyd-spf-fs/"
 arch="all"
-license="GPL"
-depends=""
+license="LGPL-2.1-or-later OR BSD-2-Clause"
 makedepends="libspf2-dev"
-install=
-subpackages=""
-source="http://www.freestone.net/ftp/policyd-spf-fs/${pkgname}_$pkgver.tar.gz
+source="https://www.freestone.net/ftp/policyd-spf-fs/policyd-spf-fs_$pkgver.tar.gz
+	format-security.patch
 	policyd-spf-fs-localpolicy-fix.patch
 	fix-makefile.patch
 	"
 
 builddir="$srcdir"/${pkgname}_$pkgver
+options="!check"
 
 build() {
-	cd "$builddir"
-	make CFLAGS+=-DHAVE_NS_TYPE LIBS="-lspf2" || return 1
+	make CFLAGS+=-DHAVE_NS_TYPE LIBS="-lspf2"
 }
 
 package() {
-	cd "$builddir"
 	mkdir -p "$pkgdir"/usr/bin
 	make PREFIX="$pkgdir"/usr install
 }
 
-sha512sums="2288ea42f25a20261a24ac33dc0ade0e6bdb4266a1f14db5d2cc2a0a5929aa0884c7e55578039d6205c6bb467e351a75231619a48bd0db80ed8c9988bde390f7  policyd-spf-fs_23.tar.gz
+sha512sums="
+2288ea42f25a20261a24ac33dc0ade0e6bdb4266a1f14db5d2cc2a0a5929aa0884c7e55578039d6205c6bb467e351a75231619a48bd0db80ed8c9988bde390f7  policyd-spf-fs_23.tar.gz
+ca7956954c8d8344e473a95eaa680b5f14da8656ef3904d60a56c426e109e051ec923b1c9ee990d664dd984d6e8923c530ba6193b89c0a416ad5a4cc9bd59f92  format-security.patch
 89a90f717538f0440d7ad98a979f3b3209dc1d85751786dc5eae867c009db8902a65694614e105aea4ed79c64a8d57cae8fc9f8902b01fdd395bd95e50e53f78  policyd-spf-fs-localpolicy-fix.patch
-b2df1dc4e7982a2e9766f2d80d1a60d9f7a5d5eea9dbb8e8c64cab9c8aebbfb62f786e1f1f5d0e946f28d77009a4c50fd18ac9fac08767aaa888e321ddd308d5  fix-makefile.patch"
+b2df1dc4e7982a2e9766f2d80d1a60d9f7a5d5eea9dbb8e8c64cab9c8aebbfb62f786e1f1f5d0e946f28d77009a4c50fd18ac9fac08767aaa888e321ddd308d5  fix-makefile.patch
+"
diff --git a/main/policyd-spf-fs/format-security.patch b/main/policyd-spf-fs/format-security.patch
new file mode 100644
index 00000000000..8a0dee35e7e
--- /dev/null
+++ b/main/policyd-spf-fs/format-security.patch
@@ -0,0 +1,22 @@
+diff --git a/policyd-spf-fs.c b/policyd-spf-fs.c
+index 198ba98..fd03019 100644
+--- a/policyd-spf-fs.c
++++ b/policyd-spf-fs.c
+@@ -359,7 +359,7 @@ static void pf_response(SPF_client_options_t    *opts, SPF_response_t *spf_respo
+                 case SPF_RESULT_PASS:
+                         strcpy(result, POSTFIX_DUNNO);
+                         printf("action=PREPEND X-%s\n",SPF_response_get_received_spf(spf_response));
+-                        snprintf(spf_comment, RESULTSIZE, SPF_response_get_received_spf(spf_response));
++                        snprintf(spf_comment, RESULTSIZE, "%s", SPF_response_get_received_spf(spf_response));
+                         break;
+                 case SPF_RESULT_FAIL:
+                 	strcpy(result, POSTFIX_REJECT);
+@@ -386,7 +386,7 @@ static void pf_response(SPF_client_options_t    *opts, SPF_response_t *spf_respo
+                 default:
+                         strcpy(result, POSTFIX_DUNNO);
+                         printf("action=PREPEND X-%s\n",SPF_response_get_received_spf(spf_response));
+-                        snprintf(spf_comment, RESULTSIZE, SPF_response_get_received_spf(spf_response));
++                        snprintf(spf_comment, RESULTSIZE, "%s", SPF_response_get_received_spf(spf_response));
+                         break;
+         }
+         
diff --git a/main/polkit/APKBUILD b/main/polkit/APKBUILD
deleted file mode 100644
index 60135fabfce..00000000000
--- a/main/polkit/APKBUILD
+++ /dev/null
@@ -1,77 +0,0 @@
-# Contributor: Carlo Landmeter
-# Contributor: Rasmus Thomsen <oss@cogitri.dev>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=polkit
-pkgver=0.116
-pkgrel=1
-pkgdesc="Application development toolkit for controlling system-wide privileges"
-url="https://www.freedesktop.org/wiki/Software/polkit/"
-arch="all"
-license="GPL-2.0-or-later"
-options="suid !check" # Needs a functioning dbus daemon
-depends_dev="dbus-glib-dev"
-makedepends="$depends_dev expat-dev glib-dev gtk-doc gobject-introspection-dev
-	intltool autoconf automake libtool bash mozjs60-dev linux-pam-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://www.freedesktop.org/software/polkit/releases/polkit-$pkgver.tar.gz
-	make-innetgr-optional.patch
-	alpine-polkit.pam
-	polkit.initd
-	"
-install="polkit.pre-install polkit.pre-upgrade"
-pkgusers="polkitd"
-pkggroups="polkitd"
-
-prepare() {
-	default_prepare
-	autoreconf -fi
-}
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--libexecdir=/usr/lib/polkit-1 \
-		--localstatedir=/var \
-		--disable-static \
-		--enable-introspection \
-		--with-authfw=pam \
-		--with-os-type=alpine \
-		--disable-gtk-doc \
-		--disable-gtk-doc-html \
-		--disable-gtk-doc-pdf \
-		--disable-libelogind \
-		--disable-systemd \
-		--disable-libsystemd-login
-
-	make
-}
-
-check() {
-	make check
-}
-
-package() {
-	# Set SHELL as a workaround for #10081
-	make SHELL=/bin/bash DESTDIR="$pkgdir" install
-
-	# Use our own polkit rules, upstream may change them
-	install -m644 "$srcdir"/alpine-polkit.pam "$pkgdir"/etc/pam.d/polkit-1
-
-	# See polkit's configure script which tells us what permissions to set
-	chown -R polkitd:polkitd "$pkgdir"/etc/polkit-1/rules.d "$pkgdir"/usr/share/polkit-1/rules.d
-	chmod -R 700 "$pkgdir"/etc/polkit-1/rules.d "$pkgdir"/usr/share/polkit-1/rules.d
-	chmod 4755 "$pkgdir"/usr/lib/polkit-1/polkit-agent-helper-1
-	chmod 4755 "$pkgdir"/usr/bin/pkexec
-
-	install -Dm755 "$srcdir"/polkit.initd "$pkgdir"/etc/init.d/polkit
-}
-
-sha512sums="b66b01cc2bb4349de70147f41f161f0f6f41e7230b581dfb054058b48969ec57041ab05b51787c749ccfc36aa5f317952d7e7ba337b4f6f6c0a923ed5866c2d5  polkit-0.116.tar.gz
-05a4fa21a42237a68d40f581d70a84937ba94f703e5342f37a59cca171ed5446acf7ae83fd5b05a3a92600ad38ad74d0c735a20f1b932750f91c0988ba900f60  make-innetgr-optional.patch
-f5102dc00d390b3a3c957b62e1712db778c7ffb7378f3d8e816c0757c11a308c5d5303e42595b0d6add9839247c773880cd34e56afacc89eb6efaadf9aae7826  alpine-polkit.pam
-f6e5ac0ed41feb392dfd104979ec577c5936f3db2bd252b12b7b9b2609a0901dae38bebec1ea65ccf4f427860b520383ae4d2c66fb74ab986c715f6b0ad50473  polkit.initd"
diff --git a/main/polkit/alpine-polkit.pam b/main/polkit/alpine-polkit.pam
deleted file mode 100644
index e718f7ee15c..00000000000
--- a/main/polkit/alpine-polkit.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-session         required        pam_unix.so
-session         required        pam_limits.so
-password        required        pam_unix.so
diff --git a/main/polkit/make-innetgr-optional.patch b/main/polkit/make-innetgr-optional.patch
deleted file mode 100644
index 36eabbbd7b5..00000000000
--- a/main/polkit/make-innetgr-optional.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-See https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10
-
-From 778bb45e0e0cbabe2b04adf67a500af1dab09768 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Wed, 11 Jul 2018 04:54:26 -0500
-Subject: [PATCH] make netgroup support optional
-
-On at least Linux/musl and Linux/uclibc, netgroup support is not
-available.  PolKit fails to compile on these systems for that reason.
-
-This change makes netgroup support conditional on the presence of the
-setnetgrent(3) function which is required for the support to work.  If
-that function is not available on the system, an error will be returned
-to the administrator if unix-netgroup: is specified in configuration.
-
-Fixes bug 50145.
-
-Closes polkit/polkit#14.
-
-Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com>
----
- configure.ac                                     |  2 +-
- src/polkit/polkitidentity.c                      | 16 ++++++++++++++++
- src/polkit/polkitunixnetgroup.c                  |  3 +++
- .../polkitbackendinteractiveauthority.c          | 14 ++++++++------
- src/polkitbackend/polkitbackendjsauthority.cpp   |  2 ++
- test/polkit/polkitidentitytest.c                 |  9 ++++++++-
- test/polkit/polkitunixnetgrouptest.c             |  3 +++
- .../test-polkitbackendjsauthority.c              |  2 ++
- 8 files changed, 43 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5cedb4e..87aa0ad 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -99,7 +99,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"],
- 	     [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
- AC_SUBST(EXPAT_LIBS)
- 
--AC_CHECK_FUNCS(clearenv fdatasync)
-+AC_CHECK_FUNCS(clearenv fdatasync setnetgrent)
- 
- if test "x$GCC" = "xyes"; then
-   LDFLAGS="-Wl,--as-needed $LDFLAGS"
-diff --git a/src/polkit/polkitidentity.c b/src/polkit/polkitidentity.c
-index 3aa1f7f..10e9c17 100644
---- a/src/polkit/polkitidentity.c
-+++ b/src/polkit/polkitidentity.c
-@@ -182,7 +182,15 @@ polkit_identity_from_string  (const gchar   *str,
-     }
-   else if (g_str_has_prefix (str, "unix-netgroup:"))
-     {
-+#ifndef HAVE_SETNETGRENT
-+      g_set_error (error,
-+                   POLKIT_ERROR,
-+                   POLKIT_ERROR_FAILED,
-+                   "Netgroups are not available on this machine ('%s')",
-+                   str);
-+#else
-       identity = polkit_unix_netgroup_new (str + sizeof "unix-netgroup:" - 1);
-+#endif
-     }
- 
-   if (identity == NULL && (error != NULL && *error == NULL))
-@@ -344,6 +352,13 @@ polkit_identity_new_for_gvariant (GVariant  *variant,
-       GVariant *v;
-       const char *name;
- 
-+#ifndef HAVE_SETNETGRENT
-+      g_set_error (error,
-+                   POLKIT_ERROR,
-+                   POLKIT_ERROR_FAILED,
-+                   "Netgroups are not available on this machine");
-+      goto out;
-+#else
-       v = lookup_asv (details_gvariant, "name", G_VARIANT_TYPE_STRING, error);
-       if (v == NULL)
-         {
-@@ -353,6 +368,7 @@ polkit_identity_new_for_gvariant (GVariant  *variant,
-       name = g_variant_get_string (v, NULL);
-       ret = polkit_unix_netgroup_new (name);
-       g_variant_unref (v);
-+#endif
-     }
-   else
-     {
-diff --git a/src/polkit/polkitunixnetgroup.c b/src/polkit/polkitunixnetgroup.c
-index 8a2b369..83f8d4a 100644
---- a/src/polkit/polkitunixnetgroup.c
-+++ b/src/polkit/polkitunixnetgroup.c
-@@ -194,6 +194,9 @@ polkit_unix_netgroup_set_name (PolkitUnixNetgroup *group,
- PolkitIdentity *
- polkit_unix_netgroup_new (const gchar *name)
- {
-+#ifndef HAVE_SETNETGRENT
-+  g_assert_not_reached();
-+#endif
-   g_return_val_if_fail (name != NULL, NULL);
-   return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_NETGROUP,
-                                        "name", name,
-diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c
-index 056d9a8..36c2f3d 100644
---- a/src/polkitbackend/polkitbackendinteractiveauthority.c
-+++ b/src/polkitbackend/polkitbackendinteractiveauthority.c
-@@ -2233,25 +2233,26 @@ get_users_in_net_group (PolkitIdentity                    *group,
-   GList *ret;
- 
-   ret = NULL;
-+#ifdef HAVE_SETNETGRENT
-   name = polkit_unix_netgroup_get_name (POLKIT_UNIX_NETGROUP (group));
- 
--#ifdef HAVE_SETNETGRENT_RETURN
-+# ifdef HAVE_SETNETGRENT_RETURN
-   if (setnetgrent (name) == 0)
-     {
-       g_warning ("Error looking up net group with name %s: %s", name, g_strerror (errno));
-       goto out;
-     }
--#else
-+# else
-   setnetgrent (name);
--#endif
-+# endif /* HAVE_SETNETGRENT_RETURN */
- 
-   for (;;)
-     {
--#if defined(HAVE_NETBSD) || defined(HAVE_OPENBSD)
-+# if defined(HAVE_NETBSD) || defined(HAVE_OPENBSD)
-       const char *hostname, *username, *domainname;
--#else
-+# else
-       char *hostname, *username, *domainname;
--#endif
-+# endif /* defined(HAVE_NETBSD) || defined(HAVE_OPENBSD) */
-       PolkitIdentity *user;
-       GError *error = NULL;
- 
-@@ -2282,6 +2283,7 @@ get_users_in_net_group (PolkitIdentity                    *group,
- 
-  out:
-   endnetgrent ();
-+#endif /* HAVE_SETNETGRENT */
-   return ret;
- }
- 
-diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp
-index 9b752d1..09b2878 100644
---- a/src/polkitbackend/polkitbackendjsauthority.cpp
-+++ b/src/polkitbackend/polkitbackendjsauthority.cpp
-@@ -1502,6 +1502,7 @@ js_polkit_user_is_in_netgroup (JSContext  *cx,
- 
-   JS::CallArgs args = JS::CallArgsFromVp (argc, vp);
- 
-+#ifdef HAVE_SETNETGRENT
-   JS::RootedString usrstr (authority->priv->cx);
-   usrstr = args[0].toString();
-   user = JS_EncodeStringToUTF8 (cx, usrstr);
-@@ -1519,6 +1520,7 @@ js_polkit_user_is_in_netgroup (JSContext  *cx,
- 
-   JS_free (cx, netgroup);
-   JS_free (cx, user);
-+#endif
- 
-   ret = true;
- 
-diff --git a/test/polkit/polkitidentitytest.c b/test/polkit/polkitidentitytest.c
-index e91967b..e829aaa 100644
---- a/test/polkit/polkitidentitytest.c
-+++ b/test/polkit/polkitidentitytest.c
-@@ -19,6 +19,7 @@
-  * Author: Nikki VonHollen <vonhollen@google.com>
-  */
- 
-+#include "config.h"
- #include "glib.h"
- #include <polkit/polkit.h>
- #include <polkit/polkitprivate.h>
-@@ -145,11 +146,15 @@ struct ComparisonTestData comparison_test_data [] = {
-   {"unix-group:root", "unix-group:jane", FALSE},
-   {"unix-group:jane", "unix-group:jane", TRUE},
- 
-+#ifdef HAVE_SETNETGRENT
-   {"unix-netgroup:foo", "unix-netgroup:foo", TRUE},
-   {"unix-netgroup:foo", "unix-netgroup:bar", FALSE},
-+#endif
- 
-   {"unix-user:root", "unix-group:root", FALSE},
-+#ifdef HAVE_SETNETGRENT
-   {"unix-user:jane", "unix-netgroup:foo", FALSE},
-+#endif
- 
-   {NULL},
- };
-@@ -181,11 +186,13 @@ main (int argc, char *argv[])
-   g_test_add_data_func ("/PolkitIdentity/group_string_2", "unix-group:jane", test_string);
-   g_test_add_data_func ("/PolkitIdentity/group_string_3", "unix-group:users", test_string);
- 
-+#ifdef HAVE_SETNETGRENT
-   g_test_add_data_func ("/PolkitIdentity/netgroup_string", "unix-netgroup:foo", test_string);
-+  g_test_add_data_func ("/PolkitIdentity/netgroup_gvariant", "unix-netgroup:foo", test_gvariant);
-+#endif
- 
-   g_test_add_data_func ("/PolkitIdentity/user_gvariant", "unix-user:root", test_gvariant);
-   g_test_add_data_func ("/PolkitIdentity/group_gvariant", "unix-group:root", test_gvariant);
--  g_test_add_data_func ("/PolkitIdentity/netgroup_gvariant", "unix-netgroup:foo", test_gvariant);
- 
-   add_comparison_tests ();
- 
-diff --git a/test/polkit/polkitunixnetgrouptest.c b/test/polkit/polkitunixnetgrouptest.c
-index 3701ba1..e3352eb 100644
---- a/test/polkit/polkitunixnetgrouptest.c
-+++ b/test/polkit/polkitunixnetgrouptest.c
-@@ -19,6 +19,7 @@
-  * Author: Nikki VonHollen <vonhollen@google.com>
-  */
- 
-+#include "config.h"
- #include "glib.h"
- #include <polkit/polkit.h>
- #include <string.h>
-@@ -69,7 +70,9 @@ int
- main (int argc, char *argv[])
- {
-   g_test_init (&argc, &argv, NULL);
-+#ifdef HAVE_SETNETGRENT
-   g_test_add_func ("/PolkitUnixNetgroup/new", test_new);
-   g_test_add_func ("/PolkitUnixNetgroup/set_name", test_set_name);
-+#endif
-   return g_test_run ();
- }
-diff --git a/test/polkitbackend/test-polkitbackendjsauthority.c b/test/polkitbackend/test-polkitbackendjsauthority.c
-index 71aad23..fdd28f3 100644
---- a/test/polkitbackend/test-polkitbackendjsauthority.c
-+++ b/test/polkitbackend/test-polkitbackendjsauthority.c
-@@ -137,12 +137,14 @@ test_get_admin_identities (void)
-         "unix-group:users"
-       }
-     },
-+#ifdef HAVE_SETNETGRENT
-     {
-       "net.company.action3",
-       {
-         "unix-netgroup:foo"
-       }
-     },
-+#endif
-   };
-   guint n;
- 
--- 
-2.18.1
-
diff --git a/main/polkit/polkit.initd b/main/polkit/polkit.initd
deleted file mode 100644
index 30d23874478..00000000000
--- a/main/polkit/polkit.initd
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/openrc-run
-supervisor=supervise-daemon
-
-name="Polkit System Daemon"
-description="Provide System authentication via PolicyKit1 D-Bus service"
-
-command=/usr/lib/polkit-1/polkitd
-command_args="${POLKIT_OPTS:---no-debug}"
-
-depend() {
-	need dbus
-}
diff --git a/main/polkit/polkit.pre-install b/main/polkit/polkit.pre-install
deleted file mode 100644
index 7c4e3eff881..00000000000
--- a/main/polkit/polkit.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S polkitd 2>/dev/null
-adduser -S -D -H -h /var/empty -s /sbin/nologin -G polkitd -g polkitd polkitd 2>/dev/null
-
-exit 0
diff --git a/main/polkit/polkit.pre-upgrade b/main/polkit/polkit.pre-upgrade
deleted file mode 120000
index df3972187eb..00000000000
--- a/main/polkit/polkit.pre-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-polkit.pre-install
\ No newline at end of file
diff --git a/main/poppler/APKBUILD b/main/poppler/APKBUILD
index b8cbde85238..b39d45cacab 100644
--- a/main/poppler/APKBUILD
+++ b/main/poppler/APKBUILD
@@ -1,26 +1,42 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=poppler
-pkgver=0.86.1
+pkgver=24.02.0
 pkgrel=0
 pkgdesc="PDF rendering library based on xpdf 3.0"
 url="https://poppler.freedesktop.org/"
 arch="all"
-options="!check" # No test suite.
 license="GPL-2.0-or-later"
 depends_dev="cairo-dev glib-dev"
-makedepends="$depends_dev cmake fontconfig-dev
-	gobject-introspection-dev lcms2-dev libjpeg-turbo-dev
-	libpng-dev libxml2-dev openjpeg-dev openjpeg-tools
-	tiff-dev zlib-dev"
+makedepends="
+	$depends_dev
+	boost-dev
+	cmake
+	fontconfig-dev
+	gobject-introspection-dev
+	lcms2-dev
+	libjpeg-turbo-dev
+	libpng-dev
+	libxml2-dev
+	nss-dev
+	openjpeg-dev
+	openjpeg-tools
+	samurai
+	tiff-dev
+	zlib-dev
+	"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-glib $pkgname-utils"
 source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz"
-builddir="$srcdir/$pkgname-$pkgver/build"
+options="!check" # Requires dl of testfiles and only checks qt5 libs
 
 # secfixes:
 #   0.80.0-r0:
 #     - CVE-2019-9959
+#   0.76.0-r0:
+#     - CVE-2020-27778
 
 prepare() {
+	default_prepare
+
 	local _linked_pkg=poppler-qt5
 	local _linked_apkbuild="$startdir"/../../community/$_linked_pkg/APKBUILD
 	mkdir -p "$builddir"
@@ -37,43 +53,54 @@ build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
-	cmake .. \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_INSTALL_PREFIX=/usr \
+	cmake -B build -G Ninja \
+		-DBUILD_CPP_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DBUILD_GTK_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DBUILD_MANUAL_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DBUILD_QT5_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DBUILD_QT6_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_LIBDIR=lib \
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
-		-DBUILD_QT5_TESTS=OFF \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DENABLE_BOOST=ON \
+		-DENABLE_GPGME=OFF \
+		-DENABLE_LIBCURL=OFF \
 		-DENABLE_QT5=OFF \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
-	make
+		-DENABLE_QT6=OFF \
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
+		$CMAKE_CROSSOPTS
+	cmake --build build
+}
+
+check() {
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
 utils() {
 	pkgdesc="Poppler's xpdf-workalike command line utilities"
-	install -d "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+
+	amove usr/bin
 }
 
 glib() {
 	pkgdesc="Glib wrapper for poppler"
 	replaces="poppler-gtk"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libpoppler-glib.so.* \
-		"$pkgdir"/usr/lib/girepository* \
-		"$subpkgdir"/usr/lib/
+
+	amove usr/lib/libpoppler-glib.so.*
+	amove usr/lib/girepository*
 }
 
 _cpp() {
 	pkgdesc="Pure C++ wrapper for poppler"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libpoppler-cpp.so.* \
-		"$subpkgdir"/usr/lib/
+
+	amove usr/lib/libpoppler-cpp.so.*
 }
 
-sha512sums="435fc1e7f3e8123e0adde9aa60c0d7dc17db367cde8908932abfef913cee6f27efeb1c4f2d6f316019a69a87f1fa5251be4216d0a81a681a24f24a70ac571670  poppler-0.86.1.tar.xz"
+sha512sums="
+95a208d21ac4d2d308a7ab3da43b95092ef78cd55ebe873c97e0d6c12d8b9d5c4614f83087616c35e1ed9d67ca606a5e008a98698bd12a332a8206ed4cf55500  poppler-24.02.0.tar.xz
+"
diff --git a/main/popt/APKBUILD b/main/popt/APKBUILD
index 7d6d72d89e5..86a349d7f08 100644
--- a/main/popt/APKBUILD
+++ b/main/popt/APKBUILD
@@ -1,42 +1,41 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=popt
-pkgver=1.16
-pkgrel=7
-pkgdesc="A commandline option parser"
-url="http://rpm5.org"
+pkgver=1.19
+pkgrel=3
+pkgdesc="commandline option parser"
+url="https://github.com/rpm-software-management/popt"
 arch="all"
-license="custom"
-depends=
-makedepends=""
-source="$pkgname-$pkgver.tar.gz::https://deb.debian.org/debian/pool/main/p/$pkgname/${pkgname}_${pkgver}.orig.tar.gz"
-subpackages="$pkgname-doc $pkgname-dev"
+license="MIT"
+subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
+source="http://ftp.rpm.org/popt/releases/popt-${pkgver%.*}.x/popt-$pkgver.tar.gz"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--libdir=/lib \
-		--disable-static
+		--libdir=/lib
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+
+	mkdir -p "$pkgdir"/usr/lib
+	mv "$pkgdir"/lib/pkgconfig "$pkgdir"/usr/lib
 }
 
-sha512sums="bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694  popt-1.16.tar.gz"
+sha512sums="
+5d1b6a15337e4cd5991817c1957f97fc4ed98659870017c08f26f754e34add31d639d55ee77ca31f29bb631c0b53368c1893bd96cf76422d257f7997a11f6466  popt-1.19.tar.gz
+"
diff --git a/main/portaudio/APKBUILD b/main/portaudio/APKBUILD
index 2a51128bd99..10f87419b76 100644
--- a/main/portaudio/APKBUILD
+++ b/main/portaudio/APKBUILD
@@ -2,34 +2,42 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=portaudio
-pkgver=190600.20161030
-pkgrel=1
-pkgdesc="Cross platform, open-source, audio I/O library"
+pkgver=19.7.0
+pkgrel=2
+pkgdesc="A cross-platform, open-source C language library for real-time audio input and output"
 url="http://www.portaudio.com/"
-arch="all"
 license="MIT"
-options="!check" # No unit tests, requires hardware to execute tests
-makedepends="alsa-lib-dev jack-dev linux-headers autoconf automake libtool"
-checkdepends="jack alsa-lib"
+arch="all"
+makedepends="
+	alsa-lib-dev
+	autoconf
+	automake
+	jack-dev
+	libtool
+	linux-headers
+	"
+checkdepends="
+	alsa-lib
+	jack
+	"
 subpackages="$pkgname-dev libportaudiocxx:_cxx"
-source="http://www.portaudio.com/archives/pa_stable_v${pkgver/./_}.tgz
+source="https://github.com/PortAudio/portaudio/archive/v$pkgver/portaudio-v$pkgver.tar.gz
 	portaudio-pkgconfig-alsa.patch
 	portaudio-audacity.patch
 	"
-builddir="$srcdir"/portaudio
+options="!check" # No unit tests, requires hardware to execute tests
 
 prepare() {
-	cd "$builddir"
-	update_config_sub
 	default_prepare
+
+	update_config_sub
 	autoreconf -if
+
 	cd bindings/cpp
-	update_config_sub
 	autoreconf -if
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -39,6 +47,7 @@ build() {
 		--with-alsa \
 		--enable-cxx
 	# race conditions in build cause build failures otherwise
+	# https://github.com/PortAudio/portaudio/issues/540
 	make -j1
 }
 
@@ -60,20 +69,20 @@ check() {
 		msg patest_"$t2":
 		./patest_"$t2"
 	done
-
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
 _cxx() {
 	pkgdesc="C++ bindings library for portaudio"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libportaudiocpp* "$subpkgdir"/usr/lib
+
+	amove usr/lib/libportaudiocpp*
 }
 
-sha512sums="7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c  pa_stable_v190600_20161030.tgz
+sha512sums="
+7e347a174109b661a685bcd617cc8fe00929c6fbf28f142fd7709a8ddbb9b5ed6e805be6647a44b4b9441b79e3474561de6f8e351b4ffc024952ed3e0e27ac1c  portaudio-v19.7.0.tar.gz
 d58e7f8717f9d451535546e16939a959f63ccdd21bcbbc8e08efde2722382b068603bae6d93449476b206c85160d8084d39b39748b4fb43ab2b6eaee704ba1f8  portaudio-pkgconfig-alsa.patch
-e5a83dedadd8d66d24efc5062f339b2518dd707ccb856235f2beb6bb0f78a61b5439b708e52a64a62a02b5e55f97eaa8644b5f057b582d542730a42a5b731571  portaudio-audacity.patch"
+b66fb7abe707c3621bbbb05c42df58192a6ff91a563973c196028ac50aa85ad9a803dee3e172d11e1bec34e02d435af653cf38304467637a95384a05210a8bdb  portaudio-audacity.patch
+"
diff --git a/main/portaudio/portaudio-audacity.patch b/main/portaudio/portaudio-audacity.patch
index 6a0434e33ff..61883ebf7d0 100644
--- a/main/portaudio/portaudio-audacity.patch
+++ b/main/portaudio/portaudio-audacity.patch
@@ -1,4 +1,35 @@
---- a/include/pa_unix_oss.h
+From 42dc9c90a703b8dd251d71389a7e6220a50a43a9 Mon Sep 17 00:00:00 2001
+From: Uwe Klotz <uwe.klotz@gmail.com>
+Date: Fri, 26 Mar 2021 10:43:46 +0100
+Subject: [PATCH] portaudio-audacity.patch
+
+---
+ configure.in                  |  1 +
+ include/pa_unix_oss.h         | 52 +++++++++++++++++++++++++++++++++++
+ include/portaudio.h           |  9 ++++++
+ src/common/pa_front.c         | 32 ++++++++++++++++++++-
+ src/common/pa_stream.c        |  2 ++
+ src/common/pa_stream.h        |  1 +
+ src/hostapi/oss/pa_unix_oss.c | 26 ++++++++++++++++++
+ 7 files changed, 122 insertions(+), 1 deletion(-)
+ create mode 100644 include/pa_unix_oss.h
+
+diff --git a/configure.in b/configure.in
+index bb4ae96..fe0e112 100644
+--- a/configure.in
++++ b/configure.in
+@@ -415,6 +415,7 @@ case "${host_os}" in
+                    DLL_LIBS="$DLL_LIBS -lossaudio"
+                    LIBS="$LIBS -lossaudio"
+            fi
++           INCLUDES="$INCLUDES pa_unix_oss.h"
+            AC_DEFINE(PA_USE_OSS,1)
+         fi
+
+diff --git a/include/pa_unix_oss.h b/include/pa_unix_oss.h
+new file mode 100644
+index 0000000..2351e64
+--- /dev/null
 +++ b/include/pa_unix_oss.h
 @@ -0,0 +1,52 @@
 +#ifndef PA_UNIX_OSS_H
@@ -53,14 +84,14 @@
 +#endif
 +
 +#endif
-
-
+diff --git a/include/portaudio.h b/include/portaudio.h
+index 5d84731..7660c8a 100644
 --- a/include/portaudio.h
 +++ b/include/portaudio.h
-@@ -1197,6 +1197,15 @@
+@@ -1200,6 +1200,15 @@ signed long Pa_GetStreamReadAvailable( PaStream* stream );
  signed long Pa_GetStreamWriteAvailable( PaStream* stream );
- 
- 
+
+
 +/** Retrieve the host type handling an open stream.
 +
 + @return Returns a non-negative value representing the host API type
@@ -72,25 +103,27 @@
 +
  /* Miscellaneous utilities */
 
- 
+
+diff --git a/src/common/pa_front.c b/src/common/pa_front.c
+index 65a656f..02a67a8 100644
 --- a/src/common/pa_front.c
 +++ b/src/common/pa_front.c
-@@ -1257,8 +1257,10 @@
+@@ -1257,8 +1257,10 @@ PaError Pa_OpenStream( PaStream** stream,
                                    hostApiInputParametersPtr, hostApiOutputParametersPtr,
                                    sampleRate, framesPerBuffer, streamFlags, streamCallback, userData );
- 
+
 -    if( result == paNoError )
 +    if( result == paNoError ) {
          AddOpenStream( *stream );
 +        PA_STREAM_REP(*stream)->hostApiType = hostApi->info.type;
 +    }
- 
- 
+
+
      PA_LOGAPI(("Pa_OpenStream returned:\n" ));
-@@ -1770,6 +1772,32 @@
-     return result;
+@@ -1771,6 +1773,34 @@ signed long Pa_GetStreamWriteAvailable( PaStream* stream )
  }
- 
+
+
 +PaHostApiTypeId Pa_GetStreamHostApiType( PaStream* stream )
 +{
 +    PaError error = PaUtil_ValidateStreamPointer( stream );
@@ -117,25 +150,29 @@
 +
 +    return result;
 +}
- 
++
++
  PaError Pa_GetSampleSize( PaSampleFormat format )
  {
-
-
+     int result;
+diff --git a/src/common/pa_stream.c b/src/common/pa_stream.c
+index ffbf530..305f7c8 100644
 --- a/src/common/pa_stream.c
 +++ b/src/common/pa_stream.c
-@@ -93,6 +93,8 @@
+@@ -93,6 +93,8 @@ void PaUtil_InitializeStreamRepresentation( PaUtilStreamRepresentation *streamRe
      streamRepresentation->streamInfo.inputLatency = 0.;
      streamRepresentation->streamInfo.outputLatency = 0.;
      streamRepresentation->streamInfo.sampleRate = 0.;
 +
 +    streamRepresentation->hostApiType = 0;
  }
- 
 
+
+diff --git a/src/common/pa_stream.h b/src/common/pa_stream.h
+index 4afda39..0a5cd1e 100644
 --- a/src/common/pa_stream.h
 +++ b/src/common/pa_stream.h
-@@ -152,6 +152,7 @@
+@@ -152,6 +152,7 @@ typedef struct PaUtilStreamRepresentation {
      PaStreamFinishedCallback *streamFinishedCallback;
      void *userData;
      PaStreamInfo streamInfo;
@@ -143,12 +180,16 @@
  } PaUtilStreamRepresentation;
 
 
+diff --git a/src/hostapi/oss/pa_unix_oss.c b/src/hostapi/oss/pa_unix_oss.c
+index 20113e2..9dedc3f 100644
 --- a/src/hostapi/oss/pa_unix_oss.c
 +++ b/src/hostapi/oss/pa_unix_oss.c
-@@ -2043,3 +2043,26 @@
+@@ -2050,3 +2050,29 @@ error:
+     return result;
  #endif
  }
- 
++
++
 +const char *PaOSS_GetStreamInputDevice( PaStream* s )
 +{
 +    PaOssStream *stream = (PaOssStream*)s;
@@ -161,6 +202,7 @@
 +   return NULL;
 +}
 +
++
 +const char *PaOSS_GetStreamOutputDevice( PaStream* s )
 +{
 +    PaOssStream *stream = (PaOssStream*)s;
@@ -172,16 +214,6 @@
 +
 +   return NULL;
 +}
+--
+2.30.2
 
-
---- a/configure.in
-+++ b/configure.in
-@@ -402,7 +402,7 @@
-            DLL_LIBS="$DLL_LIBS -lasound"
-            LIBS="$LIBS -lasound"
-            OTHER_OBJS="$OTHER_OBJS src/hostapi/alsa/pa_linux_alsa.o"
--           INCLUDES="$INCLUDES pa_linux_alsa.h"
-+           INCLUDES="$INCLUDES pa_linux_alsa.h pa_unix_oss.h"
-            AC_DEFINE(PA_USE_ALSA,1)
-         fi
- 
diff --git a/main/postfix-policyd-spf-perl/APKBUILD b/main/postfix-policyd-spf-perl/APKBUILD
index 2a4c2818803..67d203601cf 100644
--- a/main/postfix-policyd-spf-perl/APKBUILD
+++ b/main/postfix-policyd-spf-perl/APKBUILD
@@ -1,20 +1,19 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=postfix-policyd-spf-perl
 pkgver=2.011
-pkgrel=0
+pkgrel=2
 pkgdesc="A Sender Policy Framework implementation"
 url="http://www.openspf.org/Software"
 arch="all"
-license="GPL"
+license="GPL-2.0-or-later"
+options="!check"
 depends="perl perl-mail-spf perl-netaddr-ip perl-sys-hostname-long"
-makedepends=""
-install=
-subpackages=""
 source="https://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz"
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	install -m755 -D "$srcdir"/$pkgname-$pkgver/$pkgname "$pkgdir"/usr/bin/$pkgname
+	install -Dm755 -D postfix-policyd-spf-perl -t "$pkgdir"/usr/bin
 }
 
-sha512sums="22fc00bf74912056a67e937a460ac1fd878f1cb1a3bfa7b19bc5f1e6bc1c36d815dcf8c945e818d242ed5e72a6295bb0e1569446e06b09aefb2842993b8016ba  postfix-policyd-spf-perl-2.011.tar.gz"
+sha512sums="
+22fc00bf74912056a67e937a460ac1fd878f1cb1a3bfa7b19bc5f1e6bc1c36d815dcf8c945e818d242ed5e72a6295bb0e1569446e06b09aefb2842993b8016ba  postfix-policyd-spf-perl-2.011.tar.gz
+"
diff --git a/main/postfix/APKBUILD b/main/postfix/APKBUILD
index 555b9db7056..5952532043b 100644
--- a/main/postfix/APKBUILD
+++ b/main/postfix/APKBUILD
@@ -2,25 +2,25 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=postfix
-pkgver=3.5.0
-pkgrel=0
+pkgver=3.9.0
+pkgrel=1
 pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)"
-url="http://www.postfix.org/"
+url="https://www.postfix.org/"
 arch="all"
 license="IPL-1.0 EPL-2.0"
 makedepends="
 	coreutils
 	cyrus-sasl-dev
-	db-dev
+	icu-dev
+	libpq-dev
 	linux-headers
 	lmdb-dev
 	m4
 	mariadb-connector-c-dev
 	openldap-dev
-	openssl-dev
-	pcre-dev
+	openssl-dev>3
+	pcre2-dev
 	perl
-	postgresql-dev
 	sqlite-dev
 	"
 
@@ -29,7 +29,6 @@ subpackages="
 	$pkgname-doc
 	$pkgname-openrc
 	$pkgname-ldap:_mv_dict
-	$pkgname-lmdb:_mv_dict
 	$pkgname-mysql:_mv_dict
 	$pkgname-pcre:_mv_dict
 	$pkgname-pgsql:_mv_dict
@@ -43,6 +42,7 @@ pkggroups="postfix postdrop"
 source="https://de.postfix.org/ftpmirror/official/postfix-$pkgver.tar.gz
 	$pkgname.initd
 	postfix-install.patch
+	lmdb-default.patch
 	"
 
 _shared_libs() {
@@ -64,8 +64,11 @@ build() {
 	local ccargs="-DHAS_SHL_LOAD"
 	local auxlibs="$LDFLAGS"
 
-	# pcre
-	ccargs="$ccargs -DHAS_PCRE $(pkg-config --cflags libpcre)"
+	# berkeley-db
+	ccargs="$ccargs -DNO_DB"
+
+	# pcre2
+	ccargs="$ccargs -DHAS_PCRE=2 $(pcre2-config --cflags)"
 
 	# ssl
 	ccargs="$ccargs -DUSE_TLS"
@@ -90,11 +93,8 @@ build() {
 	# sqlite
 	ccargs="$ccargs -DHAS_SQLITE $(pkg-config --cflags sqlite3)"
 
-	# lmdb
-	ccargs="$ccargs -DHAS_LMDB $(pkg-config --cflags lmdb)"
-
-	#
-	#	AUXLIBS_CDB="$cdb_libs" \
+	# lmdb (make it default)
+	ccargs="$ccargs -DHAS_LMDB $(pkg-config --cflags lmdb) -DDEF_DB_TYPE=\\\"lmdb\\\""
 
 	# compile
 	make DEBUG="" \
@@ -103,7 +103,7 @@ build() {
 		AUXLIBS="$auxlibs" \
 		AUXLIBS_LDAP="-lldap -llber" \
 		AUXLIBS_MYSQL="$(mysql_config --libs)" \
-		AUXLIBS_PCRE="$(pkg-config --libs libpcre)" \
+		AUXLIBS_PCRE="$(pkg-config --libs libpcre2-8)" \
 		AUXLIBS_PGSQL="$(pkg-config --libs libpq)" \
 		AUXLIBS_SQLITE="$(pkg-config --libs sqlite3)" \
 		AUXLIBS_LMDB="$(pkg-config --libs lmdb)" \
@@ -134,6 +134,10 @@ package() {
 		readme_directory=/usr/share/doc/$pkgname/readme \
 		manpage_directory=/usr/share/man
 
+	# Install qshape auxiliary script
+	install -Dm644 man/man1/qshape.1 -t "$pkgdir"/usr/share/man/man1
+	install -Dm755 auxiliary/qshape/qshape.pl -t "$pkgdir"/usr/bin
+
 	for i in postdrop postqueue; do
 		chgrp postdrop "$pkgdir"/usr/sbin/$i
 		chmod g+s "$pkgdir"/usr/sbin/$i
@@ -188,7 +192,9 @@ stone() {
 	install -Dm755 src/fsstone/fsstone "$subpkgdir"/usr/bin/fsstone
 	find src/smtpstone -mindepth 1 -perm 0755 -exec cp {} "$subpkgdir"/usr/bin \;
 }
-
-sha512sums="7633687c8f9fb4f7204443dda66c1234b8ae121ae750916b23ea7cd16f2fd5944c0e4541c51cbdeb66f51437e3186433bbb9d2b1f538002a3c8aaeb6ddbfe154  postfix-3.5.0.tar.gz
+sha512sums="
+46faaf529a6d2edc5ea747ee0d73a028f7061a923da0ea4b1e1828d935b15f5782d83f7a8472e7c74b45ea0e96666c871efd352934bead28a88ddd3561ade324  postfix-3.9.0.tar.gz
 2752e69c4e1857bdcf29444ffb458bca818bc60b9c77c20823c5f5b87c36cb5e0f3217a625a7fe5788d5bfcef7570a1f2149e1233fcd23ccf7ee14190aff47a2  postfix.initd
-25cd34f23ca909d4e33aaf3239d1e397260abc7796d9a4456dee4f005682fd3a58aab8106126e5218c95bdddae415a3ef7e2223cd3b0d7b1e2bd76158bb7eaf8  postfix-install.patch"
+25cd34f23ca909d4e33aaf3239d1e397260abc7796d9a4456dee4f005682fd3a58aab8106126e5218c95bdddae415a3ef7e2223cd3b0d7b1e2bd76158bb7eaf8  postfix-install.patch
+0769e2e503486f8dd6fa21f2c534ad7df7a9f1bb57dde2f0ad61863a3e615d0a6dc18132b27796eb28cd81afb2b4e97c65c9d490a391f835aa3b7b18e74252c5  lmdb-default.patch
+"
diff --git a/main/postfix/lmdb-default.patch b/main/postfix/lmdb-default.patch
new file mode 100644
index 00000000000..949b2a8406f
--- /dev/null
+++ b/main/postfix/lmdb-default.patch
@@ -0,0 +1,27 @@
+Upstream: Not applicable
+Reason: Make LMDB the default configuration
+
+Author: Duncan Bellamy <dunk@denkimushi.com>
+
+diff --git a/src/global/mail_params.h b/src/global/mail_params.h
+index a6119f1..9639c60 100644
+--- a/src/global/mail_params.h
++++ b/src/global/mail_params.h
+@@ -2826,7 +2826,7 @@ extern int var_vrfy_pend_limit;
+ extern char *var_verify_service;
+ 
+ #define VAR_VERIFY_MAP			"address_verify_map"
+-#define DEF_VERIFY_MAP			"btree:$data_directory/verify_cache"
++#define DEF_VERIFY_MAP			"lmdb:$data_directory/verify_cache"
+ extern char *var_verify_map;
+ 
+ #define VAR_VERIFY_POS_EXP		"address_verify_positive_expire_time"
+@@ -3594,7 +3594,7 @@ extern char *var_multi_cntrl_cmds;
+   * postscreen(8)
+   */
+ #define VAR_PSC_CACHE_MAP	"postscreen_cache_map"
+-#define DEF_PSC_CACHE_MAP	"btree:$data_directory/postscreen_cache"
++#define DEF_PSC_CACHE_MAP "lmdb:$data_directory/postscreen_cache"
+ extern char *var_psc_cache_map;
+ 
+ #define VAR_SMTPD_SERVICE	"smtpd_service_name"
diff --git a/main/postgresql-bdr-extension/APKBUILD b/main/postgresql-bdr-extension/APKBUILD
deleted file mode 100644
index 63746a85ce6..00000000000
--- a/main/postgresql-bdr-extension/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
-pkgname=postgresql-bdr-extension
-pkgver=1.0.3
-pkgrel=0
-pkgdesc="PostgreSQL bidirectional replication (BDR) extension"
-url="https://wiki.postgresql.org/wiki/BDR_Administration"
-arch="all"
-license="PostgreSQL"
-makedepends="$depends_dev postgresql-bdr-dev"
-subpackages="$pkgname-doc"
-# FIXME: mkdir: can't create directory 'tmp_check/data': File exists
-options="!check"
-source="http://packages.2ndquadrant.com/postgresql-bdr94-2ndquadrant/tarballs/bdr-$pkgver.tar.bz2"
-builddir="$srcdir/bdr-$pkgver"
-
-build() {
-	cd "$builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--enable-bdr
-	make
-}
-
-check() {
-	make DESTDIR="$pkgdir" check
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="45da12fd3411f2f243ddf16870890042653ca603129c78ce4a54ec128a350c8671cce72c3433971094d0d2b9be699b7aebdefa01ce09380b7d56dc927c0ebea7  bdr-1.0.3.tar.bz2"
diff --git a/main/postgresql-bdr/APKBUILD b/main/postgresql-bdr/APKBUILD
deleted file mode 100644
index 438c4b25c8c..00000000000
--- a/main/postgresql-bdr/APKBUILD
+++ /dev/null
@@ -1,136 +0,0 @@
-# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
-pkgname=postgresql-bdr
-pkgver=9.4.14_p1
-_pkgver=${pkgver/_p/_bdr}
-pkgrel=7
-pkgdesc="A sophisticated object-relational DBMS with bidirectional replication support (BDR)"
-url="https://www.2ndquadrant.com/en/resources/postgres-bdr-2ndquadrant/"
-arch="all"
-license="PostgreSQL"
-depends="bash libpq"
-install="$pkgname.pre-install $pkgname.pre-upgrade"
-depends_dev="readline-dev openssl-dev zlib-dev libxml2-dev"
-makedepends="$depends_dev perl bison flex-dev"
-subpackages="$pkgname-dev $pkgname-contrib $pkgname-client $pkgname-openrc
-	$pkgname-libs"
-provides="postgresql=$pkgver"
-# Avoid conflicts in provided so:* names with postgresql package.
-# sonameprefix="$pkgname:"
-source="http://packages.2ndquadrant.com/postgresql-bdr94-2ndquadrant/tarballs/postgresql-bdr-$_pkgver.tar.bz2
-	initdb.patch
-	postgresql-bdr-osxflags.patch
-	$pkgname.initd
-	$pkgname.confd
-	pgbdr-restore.initd
-	pgbdr-restore.confd
-	"
-builddir="$srcdir/$pkgname-$_pkgver"
-
-prepare() {
-	default_prepare
-
-	# sanity check of conf.d
-	(
-		. "$srcdir"/$pkgname.confd
-		_datadir=/var/lib/postgresql/${pkgver%.*}/data
-		if [ "$_datadir" != "$PGDATA" ]; then
-			die "PGDATA is $PGDATA while $_datadir is expected"
-		fi
-	)
-	#rm doc/src/Makefile
-}
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-openssl
-
-	# configure/programs.m4 doesn't properly detect flex
-	# and offers manual user override
-	#make FLEX="/usr/bin/flex" JADEFLAGS="-E 999999" OSXFLAGS="-E 999999" \
-	 #world
-	# Dont' build doc since it throws tons of openjade/osx errors
-	make FLEX="/usr/bin/flex" all
-}
-
-check() {
-	make check
-}
-
-package() {
-	# Don't install docs
-	make DESTDIR="$pkgdir" install
-
-	install -D -m755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-	install -D -m755 "$srcdir"/pgbdr-restore.initd \
-		"$pkgdir"/etc/init.d/pgbdr-restore
-	install -D -m644 "$srcdir"/pgbdr-restore.confd \
-		"$pkgdir"/etc/conf.d/pgbdr-restore
-	# conflicts with libpq mainline
-	rm "$pkgdir"/usr/lib/libpq.so*
-}
-
-client() {
-	pkgdesc="PostgreSQL Client Utilities"
-	provides="postgresql-client=$pkgver"
-
-	mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/bin
-	# mv "$pkgdir"/usr/lib/libpq.so* "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/bin/clusterdb \
-		"$pkgdir"/usr/bin/createdb \
-		"$pkgdir"/usr/bin/createuser \
-		"$pkgdir"/usr/bin/dropdb \
-		"$pkgdir"/usr/bin/dropuser \
-		"$pkgdir"/usr/bin/pg_basebackup \
-		"$pkgdir"/usr/bin/pg_dump \
-		"$pkgdir"/usr/bin/pg_dumpall \
-		"$pkgdir"/usr/bin/pg_isready \
-		"$pkgdir"/usr/bin/pg_recvlogical \
-		"$pkgdir"/usr/bin/pg_restore \
-		"$pkgdir"/usr/bin/psql \
-		"$pkgdir"/usr/bin/reindexdb \
-		"$pkgdir"/usr/bin/vacuumdb \
-		"$subpkgdir"/usr/bin
-}
-
-contrib() {
-	pkgdesc="Extension modules distributed with PostgreSQL"
-	provides="postgresql-contrib=$pkgver"
-
-	cd "$builddir"
-	make DESTDIR="$subpkgdir" FLEX="/usr/bin/flex" -C contrib install
-}
-
-dev() {
-	provides="postgresql-dev=$pkgver"
-        default_dev
-
-        _submv usr/bin/pg_config \
-                usr/bin/ecpg \
-                usr/lib/postgresql/pgxs
-}
-
-libs() {
-	depends=""
-	provides="postgresql-libs=$pkgver"
-	default_libs
-}
-
-_submv() {
-        local path; for path in "$@"; do
-                mkdir -p "$subpkgdir/${path%/*}"
-                mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/
-        done
-}
-
-sha512sums="cd8fec782c201270270d4abfa59296083889bf22f63b4e18f758e8262ee52deeae247d813a3e8633861819d803cb369157854de446affdde65c1e12477bbc0b8  postgresql-bdr-9.4.14_bdr1.tar.bz2
-6f7fdceb1a5aba3f00894ae88afdf25e5f9c7a0ffc00b11211011a6415ea73639d6a67f516cab66c6487484bab26ded3c93471d6d41ac0d3822926c22274f2ba  initdb.patch
-1973863bfc208ce20ca2dd82557ebbd4fcddd1219d6a80f2e83550d0110d39f034cb829cca3ee9208f513a24b032267b94559c740ddddb10a4f24c630194eb5e  postgresql-bdr-osxflags.patch
-85b863cfcae1db37ee914721fc9eb7e85ab90a77a65879bccb0bbf34eb044329425fae0411baff1d769a700ca63b4ab4040d145ca90e2d3728c3a74e61d9b4ff  postgresql-bdr.initd
-e906e23241bed2624719c1e7e5305695cce1cb520f26f6a4c6bbb994f59db3cc4c63afcfe0e7fb705ad4691dd0a911770012fc16819e4c2686c7029e1e4a4a45  postgresql-bdr.confd
-a20f4b2f7f6e2500b6f2b649d8e27a59d82f07768d7a1ee503cea3a88d21d86344f3b7e89ea10f9ce8509b44d71dbee1c9d8ca60ec0c968f36867270120c913f  pgbdr-restore.initd
-c14a5684e914abb3b0ee71bbf15eed71a9264deacaa404a6e3af6bfc330d93e7598624d0ed11a94263106cc660f7f54c8ff57e759033cf606a795f69ff6c1c7c  pgbdr-restore.confd"
diff --git a/main/postgresql-bdr/initdb.patch b/main/postgresql-bdr/initdb.patch
deleted file mode 100644
index e919d9fc1bd..00000000000
--- a/main/postgresql-bdr/initdb.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./src/bin/initdb/initdb.c.orig	2013-09-09 14:38:21.712409752 +0000
-+++ ./src/bin/initdb/initdb.c	2013-09-09 14:40:19.453755379 +0000
-@@ -3652,14 +3652,6 @@
- 	strlcpy(bin_dir, argv[0], sizeof(bin_dir));
- 	get_parent_directory(bin_dir);
- 
--	printf(_("\nSuccess. You can now start the database server using:\n\n"
--			 "    %s%s%spostgres%s -D %s%s%s\n"
--			 "or\n"
--			 "    %s%s%spg_ctl%s -D %s%s%s -l logfile start\n\n"),
--	   QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
--		   QUOTE_PATH, pgdata_native, QUOTE_PATH,
--	   QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
--		   QUOTE_PATH, pgdata_native, QUOTE_PATH);
--
-+	printf(_("\nSuccess.\n\n"));
- 	return 0;
- }
diff --git a/main/postgresql-bdr/pgbdr-restore.confd b/main/postgresql-bdr/pgbdr-restore.confd
deleted file mode 100644
index 84a179f6cda..00000000000
--- a/main/postgresql-bdr/pgbdr-restore.confd
+++ /dev/null
@@ -1,16 +0,0 @@
-
-# Enable this to dump databases on shutdown and restore on boot
-#
-#PGDUMP="/var/lib/postgresql/backup/databases.pgdump"
-
-# The dump file will be deleted once restored unless KEEP_DUMP is set.
-# This is to avoid accidental restoring of running database. If you know what
-# you are doing and want keep the dump, then enable the KEEP_DUMP option
-# below.
-#
-#KEEP_DUMP=yes
-
-# If you enable KEEP_DUMP above you probably also want the --clean option
-# the the pg_dumpall command.
-#PG_DUMPALL_OPTS="--clean"
-
diff --git a/main/postgresql-bdr/pgbdr-restore.initd b/main/postgresql-bdr/pgbdr-restore.initd
deleted file mode 100644
index 27744396239..00000000000
--- a/main/postgresql-bdr/pgbdr-restore.initd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-
-extra_commands="${opts} dump restore purge"
-
-depend() {
-	need postgresql-bdr
-}
-
-restore() {
-	yesno "$PGDUMP" && return 0
-	ebegin "Restoring PostgreSQL $PGDUMP"
-	psql -U ${PG_USER:-postgres} ${PSQL_OPTS} -f "$PGDUMP" >/dev/null 2>/dev/null
-	local res=$?
-	yesno "$KEEP_DUMP" || rm -f "$PGDUMP"
-	eend $res
-	/etc/init.d/postgresql-bdr reload
-}
-
-dump() {
-	yesno "$PGDUMP" && return 0
-	mkdir -p "$( dirname "$PGDUMP" )"
-	ebegin "Saving PostgreSQL databases to $PGDUMP"
-	pg_dumpall -U ${PG_USER:-postgres} ${PG_DUMPALL_OPTS} -f "$PGDUMP"
-	eend $?
-}
-
-purge() {
-	yesno "$PGDUMP" && return 0
-	ebegin "Removing temporary $PGDUMP PostgreSQL backup"
-	rm -f "$PGDUMP"
-	eend $?
-}
-
-start() {
-	restore	
-}
diff --git a/main/postgresql-bdr/postgresql-bdr-osxflags.patch b/main/postgresql-bdr/postgresql-bdr-osxflags.patch
deleted file mode 100644
index fd3d9c14b5c..00000000000
--- a/main/postgresql-bdr/postgresql-bdr-osxflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/doc/src/sgml/Makefile
-+++ b/doc/src/sgml/Makefile
-@@ -245,7 +245,7 @@
- # if we try to do "make all" in a VPATH build without the explicit
- # $(srcdir) on the postgres.sgml dependency in this rule.  GNU make bug?
- postgres.xml: $(srcdir)/postgres.sgml $(ALMOSTALLSGML)
--	$(OSX) -D. -x lower -i include-xslt-index $< >postgres.xmltmp
-+	$(OSX) $(OSXFLAGS) -D. -x lower -i include-xslt-index $< >postgres.xmltmp
- 	$(PERL) -p -e 's/\[(aacute|acirc|aelig|agrave|amp|aring|atilde|auml|bull|copy|eacute|egrave|gt|iacute|lt|mdash|nbsp|ntilde|oacute|ocirc|oslash|ouml|pi|quot|scaron|uuml) *\]/\&\1;/gi;' \
- 	           -e '$$_ .= qq{<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">\n} if $$. == 1;' \
- 	  <postgres.xmltmp > $@
diff --git a/main/postgresql-bdr/postgresql-bdr.confd b/main/postgresql-bdr/postgresql-bdr.confd
deleted file mode 100644
index c6e8c6d9937..00000000000
--- a/main/postgresql-bdr/postgresql-bdr.confd
+++ /dev/null
@@ -1,55 +0,0 @@
-# Which port and socket to bind PostgreSQL
-PGPORT="5432"
-
-# How long to wait for server to start in seconds
-START_TIMEOUT=10
-
-# NICE_QUIT ignores new connections and wait for clients to disconnect from
-# server before shutting down. NICE_TIMEOUT in seconds determines how long to
-# wait for this to succeed.
-NICE_TIMEOUT=60
-
-# Forecfully disconnect clients from server and shut down. This is performed
-# after NICE_QUIT. Terminated client connections have their open transactions
-# rolled back.
-# Set RUDE_QUIT to "NO" to disable. RUDE_TIMEOUT in seconds.
-RUDE_QUIT="YES"
-RUDE_TIMEOUT=30
-
-# If the server still fails to shutdown, you can force it to quit by setting
-# this to YES and a recover-run will execute on the next startup.
-# Set FORCE_QUIT to "YES" to enable. FORCE_TIMEOUT in seconds.
-FORCE_QUIT="NO"
-FORCE_TIMEOUT=2
-
-# Extra options to run postmaster with, e.g.:
-# -N is the maximal number of client connections
-# -B is the number of shared buffers and has to be at least 2x the value for -N
-# Please read the man-page to postmaster for more options. Many of these
-# options can be set directly in the configuration file.
-#PGOPTS="-N 512 -B 1024"
-
-# Pass extra environment variables. If you have to export environment variables
-# for the database process, this can be done here.
-# Don't forget to escape quotes.
-#PG_EXTRA_ENV="PGPASSFILE=\"/path/to/.pgpass\""
-
-##############################################################################
-#
-# The following values should not be arbitrarily changed.
-#
-# The initscript uses these variables to inform PostgreSQL where to find
-# its data directory and configuration files.
-#
-##############################################################################
-
-# PostgreSQL's Database Directory
-PGDATA="/var/lib/postgresql/9.4/data"
-
-# Additional options to pass to initdb.
-# See `man initdb' for available options.
-#PG_INITDB_OPTS="--locale=en_US.UTF-8"
-
-# Automatically set up a new database if missing on startup
-AUTO_SETUP=yes
-
diff --git a/main/postgresql-bdr/postgresql-bdr.initd b/main/postgresql-bdr/postgresql-bdr.initd
deleted file mode 100644
index 673cd7b2af3..00000000000
--- a/main/postgresql-bdr/postgresql-bdr.initd
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.3,v 1.4 2008/09/28 22:53:02 caleb Exp $
-# Modifications to support Alpine Linux pg-restore
-
-extra_started_commands="reload"
-extra_stopped_commands="setup"
-
-depend() {
-	use net
-	after firewall
-}
-
-get_config() {
-	[ -f ${PGDATA%/}/postgresql.conf ] || return 1
-	eval echo $(sed -e 's:#.*::' ${PGDATA%/}/postgresql.conf | awk '$1 == "'$1'" { print ($2 == "=" ? $3 : $2) }')
-}
-
-
-checkconfig() {
-	configured_port=$(get_config port)
-	: ${configured_port:=${PGPORT:-5432}}
-	socket_path=$(get_config unix_socket_directories)
-	: ${socket_path:=/var/run/postgresql}
-
-	checkpath -d -m 0770 -o postgres:postgres ${socket_path}
-
-	if [ -n "$WAIT_FOR_START" ]; then
-		START_TIMEOUT=$WAIT_FOR_START
-	fi
-
-	[ -d "$PGDATA/base" ] && return 0
-	if [ -z "$AUTO_SETUP" ] ; then
-		eerror "Database not found at: $PGDATA"
-		eerror "Please make sure that PGDATA points to the right path."
-		eerror "You can run '/etc/init.d/postgresql setup' to setup a new database cluster."
-		return 1
-	fi
-	setup
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting PostgreSQL"
-
-	if [ -f "$PGDATA/postmaster.pid" ] ; then
-		rm -f "$PGDATA/postmaster.pid"
-	fi
-
-	local retval= x= extraenv=
-	for x in ${PG_EXTRA_ENV} ; do
-		extraenv="${extraenv} --env ${x}"
-	done
-
-	start-stop-daemon --start \
-		--user ${PGUSER:-postgres} \
-		--group ${PGGROUP:-postgres} \
-		--env "PGPORT=${configured_port}" \
-		${extraenv} \
-		--pidfile ${PGDATA}/postmaster.pid \
-		--wait 5000 \
-		--exec /usr/bin/pg_ctl \
-		-- \
-		start -s -w -t ${START_TIMEOUT:-10} \
-		-l ${PGDATA}/postmaster.log \
-		-D ${PGDATA} -o "$PGOPTS"
-	retval=$?
-
-	if [ $retval -ne 0 ] ; then
-		eerror "Check the log for a possible explanation of the above error."
-		eerror "    ${PGDATA}/postmaster.log"
-	fi
-	eend $retval
-}
-
-stop() {
-	if [ -n "$WAIT_FOR_DISCONNECT" ]; then
-		NICE_TIMEOUT=$WAIT_FOR_DISCONNECT
-	fi
-	if [ -n "$WAIT_FOR_CLEANUP" ]; then
-		RUDE_QUIT=YES
-		RUDE_TIMEOUT=$WAIT_FOR_CLEANUP
-	fi
-	if [ -n "$WAIT_FOR_QUIT" ] && [ $WAIT_FOR_QUIT -ne 0 ]; then
-		FORCE_QUIT=YES
-		FORCE_TIMEOUT=$WAIT_FOR_QUIT
-	fi
-
-	local seconds=${NICE_TIMEOUT}
-	local retval
-	local retries=SIGTERM/${NICE_TIMEOUT}
-	if [ "${RUDE_QUIT}" != "NO" ] ; then
-		retries="${retries}/SIGINT/${RUDE_TIMEOUT}"
-		seconds=$(( $seconds + ${NICE_TIMEOUT} ))
-	fi
-	if [ "${FORCE_QUIT}" = "YES" ] ; then
-		retries="${retries}/SIGQUIT/${FORCE_TIMEOUT}"
-		seconds=$(( $seconds + ${FORCE_TIMEOUT} ))
-	fi
-
-	ebegin "Stopping PostgreSQL (this can take up to ${seconds} seconds)"
-
-	# Loops through nice, rude, and force quit in one go.
-	start-stop-daemon --stop \
-		--exec /usr/bin/postgres \
-		--retry ${retries} \
-		--progress \
-		--pidfile ${PGDATA}/postmaster.pid
-	eend
-}
-
-reload() {
-	ebegin "Reloading PostgreSQL configuration"
-	kill -HUP $(head -n1 ${PGDATA}/postmaster.pid)
-	eend $?
-}
-
-setup() { 
-	ebegin "Creating a new PostgreSQL database cluster" 
-	
-	if [ -d "${PGDATA}/base" ] ; then 
-		eend 1 "${PGDATA}/base already exists" 
-		return 
-	fi 
-
-	mkdir -p "${PGDATA}"  2>/dev/null
-
-	# If the pg_hba.conf and friends exist, move them
-	local tmpdir="$( dirname "$PGDATA" )/tmp"
-	mkdir -p "${tmpdir}" >/dev/null
-	echo mv "${PGDATA}"/* "${tmpdir}" 
-	mv "${PGDATA}"/* "${tmpdir}"  2>/dev/null
-
-	rm -rf "${PGDATA}"/* 2>/dev/null
-	chown -Rf postgres:postgres "${PGDATA}" 
-	chmod 0700 "${PGDATA}" 
-	cd "${PGDATA}" # to avoid the: could not change directory to "/root" 
-	su -c "/usr/bin/initdb --pgdata ${PGDATA}" postgres
-	local res=$?
-
-	# move the pg_hba.conf and friends
-	mv $tmpdir/* "$PGDATA" 2>/dev/null 
-	rm -rf $tmpdir 2>/dev/null
-
-	# Do not send a SIGHUP to postmaster;  its not necessary for a new database
-	# and allows pg-restore to do a blind restore of an old database
-
-	eend $res
-} 
-
diff --git a/main/postgresql-bdr/postgresql-bdr.pre-install b/main/postgresql-bdr/postgresql-bdr.pre-install
deleted file mode 100644
index dd347062242..00000000000
--- a/main/postgresql-bdr/postgresql-bdr.pre-install
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Fixed GID/UID values as this users was previously included in the
-# default /etc/passwd as shipped by main/alpine-baselayout.
-
-addgroup -g 70 -S postgres 2>/dev/null
-adduser -u 70 -S -D -H -h /var/lib/postgresql -g "Postgres user" \
-	-s /bin/sh -G postgres postgres 2>/dev/null
-
-exit 0
diff --git a/main/postgresql-bdr/postgresql-bdr.pre-upgrade b/main/postgresql-bdr/postgresql-bdr.pre-upgrade
deleted file mode 100644
index 6116252c193..00000000000
--- a/main/postgresql-bdr/postgresql-bdr.pre-upgrade
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-new="$1"
-old="$2"
-
-pgver=${new%.*}
-compare=$(apk version -t "$old" $pgver)
-
-# check if we upgrade from earlier than $pgver and if it is running
-if [ "$compare" != "<" ] || ! /etc/init.d/postgresql --quiet status; then
-	exit 0
-fi
-
-if [ -f /etc/conf.d/postgresql ]; then
-	. /etc/conf.d/postgresql
-fi
-
-cat <<EOF
-* You are upgrading to postgres $pgver wich is not compatible with the running
-* See: http://www.postgresql.org/docs/$pgver/static/upgrading.html
-*
-* The corresponding steps for Alpine Linux is:
-*
-*  pg_dumpall -U ${PGUSER:-postgres} > dumpfile
-*  /etc/init.d/postgresql stop
-*  apk add -u postgresql
-*  /etc/init.d/postgresql setup
-*  /etc/init.d/postgresql start
-*  psql -U ${PGUSER:-postgres} -f dumpfile
-*
-EOF
-exit 1
diff --git a/main/postgresql-common/APKBUILD b/main/postgresql-common/APKBUILD
new file mode 100644
index 00000000000..cba62e5a1fb
--- /dev/null
+++ b/main/postgresql-common/APKBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=postgresql-common
+pkgver=1.2
+pkgrel=1
+pkgdesc="Common files for PostgreSQL"
+url="https://www.postgresql.org/"
+arch="noarch"
+license="MIT"
+install="$pkgname.pre-install $pkgname.pre-deinstall"
+triggers="$pkgname.trigger=/usr/libexec/postgresql*:/usr/share/postgresql*"
+subpackages="$pkgname-openrc"
+source="pg_versions
+	postgresql.initd
+	postgresql.confd
+	"
+builddir="$srcdir"
+options="!check"  # no tests
+
+# secfixes:
+#   0:
+#     - CVE-2019-3466
+
+package() {
+	mkdir -p "$pkgdir"
+
+	install -D -m755 "$srcdir"/pg_versions "$pkgdir"/usr/sbin/pg_versions
+}
+
+openrc() {
+	pkgdesc="OpenRC init scripts for PostgreSQL"
+	depends=""
+	replaces="postgresql-openrc"  # for backward compatibility
+	# Do not set install_if here.
+
+	install -D -m755 "$srcdir"/postgresql.initd "$subpkgdir"/etc/init.d/postgresql
+	install -D -m644 "$srcdir"/postgresql.confd "$subpkgdir"/etc/conf.d/postgresql
+}
+
+sha512sums="
+3da6244dc23d89fd337ff76cdf619d9a13ef0545cb169b8592ad871e3e79719667e685d42acbd0aacee4c2aa556753530642cb24cc1322a2068f639d0b874b2b  pg_versions
+6db1ae70b0a2ac1e5985139f56a0f2e3e0e93e0604a79807e73052097718141c16865473cd372a03e02565360ef92b28ef53b7a8d477841be65e541a8821b66b  postgresql.initd
+b82351afd7eb89530b1b86aa6d362e8710035a3623c4b8125723038103634274312fc88dd8a18b2e387cca9e9ae4158b76479b59bc7ff6ba0b15a7a806e21cd5  postgresql.confd
+"
diff --git a/main/postgresql-common/pg_versions b/main/postgresql-common/pg_versions
new file mode 100644
index 00000000000..c40fb08c7c3
--- /dev/null
+++ b/main/postgresql-common/pg_versions
@@ -0,0 +1,216 @@
+#!/bin/sh
+#---help---
+# Usage: pg_versions [options] [action [args...]]
+#
+# Change the default PostgreSQL version, i.e. update symlinks in /etc, /usr/bin
+# and /usr/share/man to the selected major version.
+#
+# Actions:
+#   get-default
+#     Print the current default version (major version number).
+#     Exits with status 101 if no default version is set (i.e. path
+#     /usr/libexec/postgresql/PG_VERSION does not exist).
+#
+#   set-default <pgver>
+#     Install symlinks for version <pgver>; either a major version number of
+#     installed postgresql package or "latest" for the latest installed
+#     version.
+#
+#   fix
+#     Re-install symlinks for the current default version and/or remove broken
+#     symlinks.
+#
+#   list
+#     List all installed PostgreSQL versions (major version numbers) sorted
+#     from the highest to the lowest. Exits with status 101 if no version found.
+#
+#   uninstall
+#     Remove all symlinks (it does *not* uninstall any packages).
+#
+# Options:
+#   -q         Be quiet, don't print errors.
+#   -v         Be verbose.
+#   -h --help  Show this message and exit.
+#
+# Please report bugs at <https://gitlab.alpinelinux.org/alpine/aports/-/issues>.
+#---help---
+#
+# NOTE: This is a poor man's "alternatives" replacement specifically for PostgreSQL.
+#  It will be replaced by a generic "alternatives" mechanism in the future.
+set -eu -o pipefail
+
+readonly PROGNAME='pg_versions'
+readonly DIR_LINKS='/etc/postgresql /usr/libexec/postgresql /usr/share/postgresql'
+
+
+help() {
+	local tag='#---help---'
+	sed -n "/^$tag/,/^$tag/{/^$tag/d; s/^# \\?//; p}" "$0"
+}
+
+err() {
+	$QUIET || printf "$PROGNAME: %s\n" "$@" >&2
+}
+
+die() {
+	err "$2"
+	exit $1
+}
+
+_ln() {
+	local opt=''; $VERBOSE && opt='-v'
+	ln $opt "$@"
+}
+
+_rm() {
+	local opt=''; $VERBOSE && opt='-v'
+	rm $opt "$@"
+}
+
+mklink() {
+	local target=$1
+	local link=$2
+
+	if [ -e "$link" ] && ! [ -L "$link" ]; then
+		err "WARN: $link exists and it's not a symlink!"
+		return 1
+	else
+		_ln -sfn "$target" "$link"
+	fi
+}
+
+must_run_as_root() {
+	[ "$(id -u)" -eq 0 ] || die 100 'must be run as root'
+}
+
+create_links() {
+	local pgver=$1
+	local dir file rc=0
+
+	for dir in $DIR_LINKS; do
+		[ -d "$dir$pgver" ] || continue
+		mklink postgresql$pgver $dir || rc=1
+	done
+
+	for file in /usr/libexec/postgresql/*; do
+		[ -f "$file" ] || continue
+		mklink $file /usr/bin/${file##*/} || rc=1
+	done
+
+	local mandir='/usr/share/postgresql/man'
+	for dir in "$mandir"/man[0-9]; do
+		[ -d "$dir" ] || continue
+		mkdir -p /usr/share/man/${dir##*/} || rc=1
+
+		for file in $dir/*; do
+			[ -f "$file" ] || continue
+			mklink $file /usr/share/man/${file#$mandir} || rc=1
+		done
+	done
+
+	return $rc
+}
+
+clean_broken_links() {
+	local link
+
+	for link in $DIR_LINKS; do
+		[ -e "$link" ] || _rm -f "$link"
+	done
+
+	for link in $(find /usr/bin /usr/share/man -type l ! -exec test -e {} \; -print); do
+		case "$(readlink $link)" in
+			/usr/libexec/postgresql/* | /usr/share/postgresql/*) _rm "$link";;
+		esac
+	done
+}
+
+list() {
+	cat /usr/libexec/postgresql[0-9]*/PG_VERSION 2>/dev/null | sort -nr \
+		|| die 101 'no postgresql is installed'
+}
+
+get_default() {
+	cat /usr/libexec/postgresql/PG_VERSION 2>/dev/null \
+		|| die 101 'symlink for the default version does not exist'
+}
+
+set_default() {
+	local pgver=$1
+	local rc=0
+
+	[ "$pgver" = latest ] && pgver=$(list | head -n1)
+
+	[ -f /usr/libexec/postgresql"$pgver"/PG_VERSION ] \
+		|| die 101 "postgresql$pgver-client is not installed"
+
+	create_links "$pgver" || rc=1
+	clean_broken_links || rc=1
+
+	return $rc
+}
+
+fix() {
+	local pgver rc=0
+
+	if pgver=$(cat /usr/libexec/postgresql/PG_VERSION 2>/dev/null); then
+		create_links "$pgver" || rc=1
+	fi
+	clean_broken_links || rc=1
+
+	return $rc
+}
+
+uninstall() {
+	local rc=0
+
+	local link; for link in $DIR_LINKS; do
+		[ -L $link ] || continue
+		_rm $link || rc=1
+	done
+	clean_broken_links || rc=1
+
+	return $rc
+}
+
+
+ACTION=
+case "${1:-}" in
+	-h | --help) help; exit 0;;
+	'' | -*) ;;
+	*) ACTION=$1; shift;;
+esac
+
+QUIET=false
+VERBOSE=false
+while getopts ':hqv' OPT; do
+	case "$OPT" in
+		h) help; exit 0;;
+		q) QUIET=true; VERBOSE=false;;
+		v) QUIET=false; VERBOSE=true;;
+		\?) die 100 "unknown option -$OPTARG (see '$PROGNAME -h')";;
+	esac
+done
+shift $((OPTIND - 1))
+
+if ! [ "$ACTION" ] && [ $# -gt 0 ]; then
+	ACTION=$1; shift
+fi
+
+case "$ACTION" in
+	get-default | '')
+		ACTION='get_default'
+	;;
+	set-default)
+		[ $# -ge 1 ] || die 100 "missing argument <pgver> (see '$PROGNAME -h')"
+		must_run_as_root
+		ACTION='set_default'
+	;;
+	fix | uninstall)
+		must_run_as_root
+	;;
+	list) ;;
+	*) die 100 "unknown action '$ACTION' (see '$PROGNAME -h')";;
+esac
+
+$ACTION "$@"
diff --git a/main/postgresql-common/postgresql-common.pre-deinstall b/main/postgresql-common/postgresql-common.pre-deinstall
new file mode 100644
index 00000000000..486bdf1b38b
--- /dev/null
+++ b/main/postgresql-common/postgresql-common.pre-deinstall
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+pg_versions uninstall
+
+exit 0
diff --git a/main/postgresql-common/postgresql-common.pre-install b/main/postgresql-common/postgresql-common.pre-install
new file mode 100644
index 00000000000..b849173aa5f
--- /dev/null
+++ b/main/postgresql-common/postgresql-common.pre-install
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Fixed GID/UID values as this users was previously included in the
+# default /etc/passwd as shipped by main/alpine-baselayout.
+
+addgroup -g 70 -S postgres 2>/dev/null
+adduser -u 70 -S -D -H -h /var/lib/postgresql -g "PostgreSQL user" \
+	-s /bin/sh -G postgres postgres 2>/dev/null
+
+exit 0
diff --git a/main/postgresql-common/postgresql-common.trigger b/main/postgresql-common/postgresql-common.trigger
new file mode 100644
index 00000000000..da2e2dc02b3
--- /dev/null
+++ b/main/postgresql-common/postgresql-common.trigger
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+# Sort dirs in reverse order to prefer a higher version if the user installed
+# multiple versions at once.
+for dir in $(printf '%s\n' "$@" | sort -r); do
+	pgver=${dir#*postgresql}
+	expr "$pgver" : '[0-9]*$' >/dev/null || continue
+
+	case "$dir" in
+		# This is needed for creating man pages symlinks after a -doc
+		# package is installed.
+		/usr/share/postgresql[0-9]*)
+				pg_versions fix
+				continue
+		;;
+		/usr/libexec/postgresql[0-9]*)
+			# 1. If the default version is already linked and provides postgres server.
+			if [ -f /usr/libexec/postgresql/postgres ]; then
+				pg_versions fix
+
+			# 2. If the default version is already linked and both the default version
+			#    and the affected version provides only client programs.
+			elif [ -f /usr/libexec/postgresql/psql ] && ! [ -f "$dir"/postgres ]; then
+				pg_versions fix
+
+			# 3. If a new version has been installed and no default version has been
+			#    set yet or the new version provides postgres server while the current
+			#    default does not.
+			elif [ -f "$dir"/psql ]; then
+				echo "* Setting postgresql$pgver as the default version" >&2
+				pg_versions set-default "$pgver"
+
+			# 4. If the default version has not been set yet or it was uninstalled
+			#    and there is some postgresql version installed.
+			elif pg_versions list -q >/dev/null; then
+				pgver=$(pg_versions list | head -n1)
+				echo "* Setting postgresql$pgver as the default version" >&2
+
+			# 5. There's no postgresql version installed.
+			else
+				pg_versions uninstall
+			fi
+		;;
+		*)
+			continue
+		;;
+	esac
+done
+
+
+# APK cannot offer the user an upgrade to a newer major version because it's
+# provided by a different package. Thus we use this trigger and inform the user
+# about a new major version if the current default version is not the latest.
+
+# Find the latest available major version.
+latest_ver=$(apk list -Pa postgresql \
+             	| sed -En 's/.*\{postgresql([0-9]+)\}.*/\1/p' \
+             	| sort | tail -n1) || exit 0
+
+default_ver=$(pg_versions get-default -q) || exit 0
+
+if [ "$latest_ver" ] && [ "$default_ver" -lt "$latest_ver" ]; then
+	cat >&2 <<-EOF
+	*
+	* You are using 'postgresql$default_ver'. It's recommended to upgrade to the latest
+	* major version provided by package 'postgresql$latest_ver'.
+	* Use command 'pg_versions' to switch between versions.
+	*
+	EOF
+fi
+
+exit 0
diff --git a/main/postgresql-common/postgresql.confd b/main/postgresql-common/postgresql.confd
new file mode 100644
index 00000000000..fbf2b04c0bb
--- /dev/null
+++ b/main/postgresql-common/postgresql.confd
@@ -0,0 +1,79 @@
+# Configuration for /etc/init.d/postgresql
+#
+# For more information about shutdown modes see
+# https://www.postgresql.org/docs/13/server-shutdown.html.
+#
+# NOTE: If you need to export environment variables for the database process,
+#  just add `export VAR=VAL` here (e.g. `export PGPASSFILE="/path/to/.pgpass"`).
+#  Config variable 'env_vars' is deprecated.
+
+# Which port and socket to bind PostgreSQL.
+# This may be overriden in postgresql.conf.
+#port="5432"
+
+# How long to wait for server to start in seconds.
+#start_timeout=10
+
+# Timeout in seconds for Smart Shutdown (SIGTERM) - disallow new connections
+# and wait for clients to disconnect from the server before shutting down.
+# Set to 0 to skip Smart Shutdown phase when executing 'stop' command.
+#stop_smart_timeout=5
+
+# Timeout in seconds for Fast Shutdown (SIGINT) - forcefully disconnect clients
+# from server, abort their transactions and shut down. This is performed after
+# $stop_smart_timeout has exceeded (or skipped) when executing 'stop' command.
+# Set to 0 to skip Fast Shutdown phase.
+#stop_fast_timeout=10
+
+# Timeout in seconds for Immediate Shutdown (SIGQUIT) - terminate client
+# connections and quit without doing normal database shutdown processing.
+# This will lead to recovery (by replaying the WAL log) upon next start-up.
+# This is performed after both $stop_smart_timeout and $stop_fast_timeout has
+# exceeded (or skipped) when executing 'stop' command. Set to non-zero value
+# to enable Immediate Shutdown.
+#stop_force_timeout=0
+
+# Extra options to run postmaster with, e.g.:
+#   -N is the maximal number of client connections
+#   -B is the number of shared buffers (has to be at least 2x the value for -N)
+# Please read man postgres(1) for more options. Many of these options can be
+# set directly in the configuration file.
+# pg_opts="-N 512 -B 1024"
+
+# Location of postmaster.log.
+#logfile="/var/log/postgresql/postmaster.log"
+
+# Automatically set up a new database if missing on startup.
+#auto_setup="yes"
+
+
+##############################################################################
+#
+# The following values should NOT be arbitrarily changed!
+#
+# The initscript uses these variables to inform PostgreSQL where to find
+# its data directory and configuration files.
+
+# Which PostgreSQL major version to use? Defaults to the default version
+# as configured by /usr/sbin/pg_versions.
+#pg_version=$(pg_versions get-default)
+
+# Where the data directory is located/to be created.
+#data_dir="/var/lib/postgresql/$pg_version/data"
+
+# Where the configuration files are localed/to be created.
+# If left at the default value and /etc/postgresql/postgresql.conf doesn't
+# exist when starting the service, it fallbacks to $data_dir.
+#conf_dir="/etc/postgresql"
+
+# Additional options to pass to initdb. See man initdb(1) for available options.
+#
+# The init script's default is
+# "-E UTF-8 --locale-provider=icu --icu-locale=en-001-x-icu --data-checksums",
+# for PostgreSQL 15+ and "-E UTF-8 --locale=C --data-checksums" for older.
+#
+# NOTE: musl libc doesn't support locales; if you use a locale other than "C",
+#   postgres will work, but it will still behave like with "C". You can and
+#   should use ICU-based collations instead of libc, but only since
+#   PostgreSQL 15, they can be used as the (default) database collation.
+# initdb_opts=
diff --git a/main/postgresql-common/postgresql.initd b/main/postgresql-common/postgresql.initd
new file mode 100644
index 00000000000..bb487f40cc5
--- /dev/null
+++ b/main/postgresql-common/postgresql.initd
@@ -0,0 +1,337 @@
+#!/sbin/openrc-run
+
+: ${pg_version:=$(pg_versions get-default)}
+
+name="PostgreSQL $pg_version"
+description="PostgreSQL server"
+
+extra_started_commands="stop_fast stop_force stop_smart reload reload_force promote"
+description_stop_fast="Stop using Fast Shutdown mode (SIGINT)"
+description_stop_force="Stop using Immediate Shutdown mode (SIGQUIT)"
+description_stop_smart="Stop using Smart Shutdown mode (SIGTERM)"
+description_reload="Reload configuration"
+description_reload_force="Reload configuration and restart if needed"
+description_promote="Promote standby server to master - exit recovery and begin read-write operations"
+
+extra_stopped_commands="setup"
+description_setup="Initialize a new $name cluster"
+
+: ${user:="postgres"}
+: ${group:="postgres"}
+
+: ${auto_setup:="yes"}
+: ${start_timeout:=10}
+# nice_timeout, rude_timeout and force_timeout are for backward compatibility.
+: ${stop_smart_timeout:=${nice_timeout:-5}}
+: ${stop_fast_timeout:=${rude_timeout:-10}}
+: ${stop_force_timeout:=${force_timeout:-0}}
+
+: ${data_dir:="/var/lib/postgresql/$pg_version/data"}
+: ${conf_dir:="/etc/postgresql"}
+: ${logfile:="/var/log/postgresql/postmaster.log"}
+: ${env_vars:=}
+: ${pg_opts:=}
+: ${port:=5432}
+
+command="/usr/libexec/postgresql$pg_version/postgres"
+
+conffile="$conf_dir/postgresql.conf"
+pidfile="$data_dir/postmaster.pid"
+start_stop_daemon_args="
+	--user $user
+	--group $group
+	--pidfile $pidfile
+	--wait 100"
+
+depend() {
+	use net
+	after firewall
+
+	if [ "$(get_config log_destination)" = "syslog" ]; then
+		use logger
+	fi
+}
+
+start_pre() {
+	check_deprecated_var nice_timeout stop_smart_timeout
+	check_deprecated_var rude_timeout stop_fast_timeout
+	check_deprecated_var rude_quit stop_fast_timeout
+	check_deprecated_var force_timeout stop_force_timeout
+	check_deprecated_var force_quit stop_force_timeout
+	check_deprecated_var env_vars 'export NAME=VALUE'
+
+	# For backward compatibility only.
+	[ "$rude_quit" = no ] && [ "stop_fast_timeout" -eq 10 ] && stop_fast_timeout=0
+	[ "$force_quit" = yes ] && [ "$stop_force_timeout" -eq 0 ] && stop_force_timeout=2
+
+	if [ ! -d "$data_dir/base" ]; then
+		if yesno "$auto_setup"; then
+			setup || return 1
+		else
+			eerror "Database not found at: $data_dir"
+			eerror "Please make sure that 'data_dir' points to the right path."
+			eerror "You can run '/etc/init.d/postgresql setup' to setup a new database cluster."
+			return 1
+		fi
+	fi
+
+	# This is mainly for backward compatibility with the former $conf_dir default value.
+	if [ "$conf_dir" = /etc/postgresql ] && ! [ -f "$conf_dir/postgresql.conf" ]; then
+		conf_dir=$data_dir
+	fi
+
+	local socket_dirs=$(get_config "unix_socket_directories" "/run/postgresql")
+	local port=$(get_config "port" "$port")
+
+	start_stop_daemon_args="$start_stop_daemon_args --env PGPORT=$port"
+
+	local var; for var in $env_vars; do
+		start_stop_daemon_args="$start_stop_daemon_args --env $var"
+	done
+
+	(
+		# Set the proper permission for the socket paths and create them if
+		# they don't exist.
+		set -f; IFS=","
+		for dir in $socket_dirs; do
+			if [ -e "${dir%/}/.s.PGSQL.$port" ]; then
+				eerror "Socket conflict. A server is already listening on:"
+				eerror "    ${dir%/}/.s.PGSQL.$port"
+				eerror "Hint: Change 'port' to listen on a different socket."
+				return 1
+			elif [ "${dir%/}" != "/tmp" ]; then
+				checkpath -d -m 1775 -o $user:$group "$dir"
+			fi
+		done
+	)
+}
+
+start() {
+	ebegin "Starting $name"
+
+	rm -f "$pidfile"
+	start-stop-daemon --start \
+		$start_stop_daemon_args \
+		--exec /usr/bin/pg_ctl \
+		-- start \
+			--silent \
+			-w --timeout="$start_timeout" \
+			--log="$logfile" \
+			--pgdata="$conf_dir" \
+			-o "--data-directory=$data_dir $pg_opts"
+
+	if eend $? "Failed to start $name"; then
+		service_set_value "command" "$command"
+		service_set_value "pidfile" "$pidfile"
+	else
+		eerror "Check the log for a possible explanation of the above error:"
+		eerror "    $logfile"
+		return 1
+	fi
+}
+
+stop() {
+	local command=$(service_get_value "command" || echo "$command")
+	local pidfile=$(service_get_value "pidfile" || echo "$pidfile")
+	local retry=''
+
+	[ "$stop_smart_timeout" -eq 0 ] \
+		|| retry="SIGTERM/$stop_smart_timeout"
+	[ "$stop_fast_timeout" -eq 0 ] \
+		|| retry="${retry:+$retry/}SIGINT/$stop_fast_timeout"
+	[ "$stop_force_timeout" -eq 0 ] \
+		|| retry="${retry:+$retry/}SIGQUIT/$stop_force_timeout"
+	[ "$retry" ] \
+		|| retry='SIGINT/5'
+
+	local seconds=$(( $stop_smart_timeout + $stop_fast_timeout + $stop_force_timeout ))
+
+	ebegin "Stopping $name (this can take up to $seconds seconds)"
+
+	start-stop-daemon --stop \
+		--exec "$command" \
+		--retry "$retry" \
+		--progress \
+		--pidfile "$pidfile"
+	eend $? "Failed to stop $name"
+}
+
+stop_smart() {
+	_stop SIGTERM "smart shutdown"
+}
+
+stop_fast() {
+	_stop SIGINT "fast shutdown"
+}
+
+stop_force() {
+	_stop SIGQUIT "immediate shutdown"
+}
+
+_stop() {
+	local command=$(service_get_value "command" || echo "$command")
+	local pidfile=$(service_get_value "pidfile" || echo "$pidfile")
+
+	ebegin "Stopping $name ($2)"
+
+	start-stop-daemon --stop \
+		--exec "$command" \
+		--signal "$1" \
+		--pidfile "$pidfile" \
+		&& mark_service_stopped "$RC_SVCNAME"
+	eend $? "Failed to stop $name"
+}
+
+reload() {
+	ebegin "Reloading $name configuration"
+
+	start-stop-daemon --signal HUP --pidfile "$pidfile" && check_config_errors
+	local retval=$?
+
+	is_pending_restart || true
+
+	eend $retval
+}
+
+reload_force() {
+	ebegin "Reloading $name configuration"
+
+	start-stop-daemon --signal HUP --pidfile "$pidfile" && check_config_errors
+	local retval=$?
+
+	if [ $retval -eq 0 ] && is_pending_restart; then
+		rc-service --nodeps "$RC_SVCNAME" restart
+		retval=$?
+	fi
+	eend $retval
+}
+
+promote() {
+	ebegin "Promoting $name to master"
+
+	cd "$data_dir"  # to avoid the: could not change directory to "/root"
+	su $user -c "pg_ctl promote --wait --log=$logfile --pgdata=$conf_dir -o '--data-directory=$data_dir'"
+	eend $?
+}
+
+setup() {
+	local bkpdir
+
+	ebegin "Creating a new $name database cluster"
+
+	if [ -d "$data_dir/base" ]; then
+		eend 1 "$data_dir/base already exists!"; return 1
+	fi
+
+	if [ "$pg_version" -ge 15 ]; then
+		: ${initdb_opts:="-E UTF-8 --locale-provider=icu --icu-locale=en-001-x-icu --data-checksums"}
+	else
+		: ${initdb_opts:="-E UTF-8 --locale=C --data-checksums"}
+	fi
+
+	# If data_dir exists, backup configs.
+	if [ -d "$data_dir" ]; then
+		bkpdir="$(mktemp -d)"
+		find "$data_dir" -type f -name "*.conf" -maxdepth 1 \
+			-exec mv -v {} "$bkpdir"/ \;
+		rm -rf "$data_dir"/*
+	fi
+
+	install -d -m 0700 -o $user -g $group "$data_dir"
+	install -d -m 0750 -o $user -g $group "$conf_dir"
+
+	cd "$data_dir"  # to avoid the: could not change directory to "/root"
+	su $user -c "/usr/bin/initdb $initdb_opts --pgdata $data_dir"
+	local retval=$?
+
+	if [ -d "$bkpdir" ]; then
+		# Move backuped configs back.
+		mv -v "$bkpdir"/* "$data_dir"/
+		rm -rf "$bkpdir"
+	fi
+
+	local conf_dir=$(readlink -f "$conf_dir")
+
+	if [ "${data_dir%/}" != "${conf_dir%/}" ]; then
+		# Move configs from data_dir to conf_dir and symlink them to data_dir.
+		local name newname
+		for name in postgresql.conf pg_hba.conf pg_ident.conf; do
+			newname="$name"
+			[ ! -e "$conf_dir"/$name ] || newname="$name.new"
+
+			mv "$data_dir"/$name "$conf_dir"/$newname
+			ln -s "$conf_dir"/$name "$data_dir"/$name
+		done
+	fi
+
+	eend $retval
+} 
+
+
+get_config() {
+	local name="$1"
+	local default="${2:-}"
+
+	if [ ! -f "$conffile" ]; then
+		printf '%s\n' "$default"
+		return 1
+	fi
+	sed -En "/^\s*${name}\b/{                      # find line starting with the name
+		  s/^\s*${name}\s*=?\s*([^#]+).*/\1/;  # capture the value
+		  s/\s*$//;                            # trim trailing whitespaces
+		  s/^['\"](.*)['\"]$/\1/;              # remove delimiting quotes
+		  p
+		}" "$conffile" \
+		| grep . || printf '%s\n' "$default"
+}
+
+check_config_errors() {
+	local out; out=$(psql_command "
+		select
+		  sourcefile || ': line ' || sourceline || ': ' || error ||
+		    case when name is not null
+		    then ': ' || name || ' = ''' || setting || ''''
+		    else ''
+		    end
+		from pg_file_settings
+		where error is not null
+		  and name not in (select name from pg_settings where pending_restart = true);
+		")
+	if [ $? -eq 0 ] && [ "$out" ]; then
+		eerror 'Configuration file contains errors:'
+		printf '%s\n' "$out" | while read line; do
+			eerror "  $line"
+		done
+		return 1
+	fi
+}
+
+is_pending_restart() {
+	local out; out=$(psql_command "select name from pg_settings where pending_restart = true;")
+
+	if [ $? -eq 0 ] && [ "$out" ]; then
+		ewarn 'PostgreSQL must be restarted to apply changes in the following parameters:'
+		local line; for line in $out; do
+			ewarn "  $line"
+		done
+		return 0
+	fi
+	return 1
+}
+
+check_deprecated_var() {
+	local old_name="$1"
+	local new_name="$2"
+
+	if [ -n "$(getval "$old_name")" ]; then
+		ewarn "Variable '$old_name' is deprecated, please use '$new_name' instead."
+	fi
+}
+
+getval() {
+	eval "printf '%s\n' \"\$$1\""
+}
+
+psql_command() {
+	su $user -c "psql --no-psqlrc --no-align --tuples-only -q -c \"$1\""
+}
diff --git a/main/postgresql-pllua/APKBUILD b/main/postgresql-pllua/APKBUILD
deleted file mode 100644
index 35680381a0d..00000000000
--- a/main/postgresql-pllua/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Contributor: Jakub Jirutka <jakub@jirutka.cz>
-# Maintainer: Michael Mason <ms13sp@gmail.com>
-pkgname=postgresql-pllua
-_pkgname=pllua-ng
-pkgver=2.0.4
-_pkgver="REL_${pkgver//./_}"
-pkgrel=1
-pkgdesc="Procedural language for PostgreSQL using Lua"
-url="https://github.com/RhodiumToad/pllua-ng"
-arch="all"
-license="MIT"
-depends="postgresql"
-makedepends="postgresql-dev luajit-dev"
-options="!check"  # tests require running PostgreSQL
-provides="pllua=$pkgver-r$pkgrel"  # for backward compatibility
-replaces="pllua"  # for backward compatibility
-subpackages="$pkgname-dev"
-source="https://github.com/RhodiumToad/$_pkgname/archive/$_pkgver/$_pkgname-$_pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$_pkgver"
-
-case "$CARCH" in
-	s390x) makedepends="$makedepends llvm clang" ;;
-esac
-
-build() {
-	make \
-		LUAJIT=luajit \
-		LUA_INCDIR=$(pkgconf --variable=includedir luajit) \
-		LUALIB=$(pkgconf --libs luajit) \
-		USE_PGXS=1
-}
-
-package() {
-	make USE_PGXS=1 DESTDIR="$pkgdir" install
-}
-
-sha512sums="64d6bc74d09d8aeb3f479a18f526599caee4217af383b49bb38f798ac42f5f3644cafc09d1e817951ed60b828a03a7bd96af4f35fad1835ce8040969a97ad99e  pllua-ng-REL_2_0_4.tar.gz"
diff --git a/main/postgresql/APKBUILD b/main/postgresql/APKBUILD
deleted file mode 100644
index b1191b39dc4..00000000000
--- a/main/postgresql/APKBUILD
+++ /dev/null
@@ -1,263 +0,0 @@
-# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
-# Contributor: G.J.R. Timmer <gjr.timmer@gmail.com>
-# Contributor: Jakub Jirutka <jakub@jirutka.cz>
-pkgname=postgresql
-pkgver=12.2
-pkgrel=2
-pkgdesc="A sophisticated object-relational DBMS"
-url="https://www.postgresql.org/"
-arch="all"
-license="PostgreSQL"
-depends="postgresql-client tzdata"
-install="$pkgname.pre-install $pkgname.pre-upgrade"
-pkgusers="postgres"
-pkggroups="postgres"
-checkdepends="diffutils"
-depends_dev="clang llvm openssl-dev"
-makedepends="$depends_dev libedit-dev zlib-dev libxml2-dev util-linux-dev
-	openldap-dev tcl-dev perl-dev python3-dev linux-headers llvm-dev"
-subpackages="$pkgname-contrib $pkgname-dev $pkgname-doc libpq $pkgname-libs
-	$pkgname-client $pkgname-pltcl
-	$pkgname-plperl $pkgname-plperl-contrib:plperl_contrib
-	$pkgname-plpython3 $pkgname-plpython3-contrib:plpython3_contrib"
-source="https://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz2
-	initdb.patch
-	perl-rpath.patch
-	conf-unix_socket_directories.patch
-	disable-broken-tests.patch
-	$pkgname.initd
-	$pkgname.confd
-	pg-restore.initd
-	pg-restore.confd
-	pltcl_create_tables.sql
-	"
-
-# secfixes:
-#   12.2-r0:
-#     - CVE-2020-1720
-#   11.5-r0:
-#     - CVE-2019-10208
-#     - CVE-2019-10209
-#   11.4-r0:
-#     - CVE-2019-10164
-#   11.3-r0:
-#     - CVE-2019-10129
-#     - CVE-2019-10130
-#   11.1-r0:
-#     - CVE-2018-16850
-#   10.5-r0:
-#     - CVE-2018-10915
-#     - CVE-2018-10925
-#   10.4-r0:
-#     - CVE-2018-1115
-#   10.3-r0:
-#     - CVE-2018-1058
-#   10.2-r0:
-#     - CVE-2018-1052
-#     - CVE-2018-1053
-#   10.1-r0:
-#     - CVE-2017-15098
-#     - CVE-2017-15099
-#   9.6.4-r0:
-#     - CVE-2017-7546
-#     - CVE-2017-7547
-#     - CVE-2017-7548
-#   9.6.3-r0:
-#     - CVE-2017-7484
-#     - CVE-2017-7485
-#     - CVE-2017-7486
-
-prepare() {
-	default_prepare
-
-	local file; for file in $pkgname.initd $pkgname.confd; do
-		sed "s|@VERSION@|${pkgver%.*}|" "$srcdir"/$file > $file
-	done
-}
-
-build() {
-	export PYTHON=/usr/bin/python3
-	export CFLAGS="${CFLAGS/-Os/-O2}"
-	export CPPFLAGS="${CPPFLAGS/-Os/-O2}"
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-system-tzdata=/usr/share/zoneinfo \
-		--with-ldap \
-		--with-libedit-preferred \
-		--with-libxml \
-		--with-openssl \
-		--with-uuid=e2fs \
-		--disable-rpath \
-		--with-llvm \
-		--with-perl \
-		--with-python \
-		--with-tcl
-	make world
-}
-
-check() {
-	_run_tests src/test
-	_run_tests src/pl
-	_run_tests contrib
-}
-
-package() {
-	make DESTDIR="$pkgdir" install install-docs
-
-	cd "$pkgdir"
-
-	install -d -m750 -o postgres -g postgres \
-		./var/lib/postgresql \
-		./var/log/$pkgname
-
-	install -D -m755 "$builddir"/postgresql.initd ./etc/init.d/postgresql
-	install -D -m644 "$builddir"/postgresql.confd ./etc/conf.d/postgresql
-
-	install -D -m755 "$srcdir"/pg-restore.initd ./etc/init.d/pg-restore
-	install -D -m644 "$srcdir"/pg-restore.confd ./etc/conf.d/pg-restore
-}
-
-dev() {
-	default_dev
-
-	amove usr/bin/pg_config \
-		usr/bin/ecpg \
-		usr/lib/postgresql/pgxs
-}
-
-libpq() {
-	pkgdesc="PostgreSQL libraries"
-	depends=""
-
-	amove usr/lib/libpq.so.*
-}
-
-libs() {
-	depends=""
-	default_libs
-}
-
-client() {
-	pkgdesc="PostgreSQL client"
-	depends=""
-
-	cd "$pkgdir"/usr/bin
-	mkdir -p "$subpkgdir"/usr/bin
-	mv clusterdb \
-		createdb \
-		createuser \
-		dropdb \
-		dropuser \
-		pg_basebackup \
-		pg_dump \
-		pg_dumpall \
-		pg_isready \
-		pg_receivewal \
-		pg_recvlogical \
-		pg_restore \
-		psql \
-		reindexdb \
-		vacuumdb \
-		"$subpkgdir"/usr/bin/
-}
-
-contrib() {
-	pkgdesc="Extension modules distributed with PostgreSQL"
-	depends=""
-
-	cd "$builddir"
-
-	# Avoid installing plperl and plpython extensions, these will be
-	# installed into separate subpackages.
-	sed -Ei -e 's/(.*_plperl)/#\1/' \
-		-e 's/(.*_plpython)/#\1/' \
-		contrib/Makefile
-
-	make -C contrib DESTDIR="$subpkgdir" install
-
-	mv "$subpkgdir"/usr/share/doc/postgresql/extension \
-		"$pkgdir"/usr/share/doc/postgresql/
-	rmdir -p "$subpkgdir"/usr/share/doc/postgresql || true
-}
-
-pltcl() {
-	pkgdesc="PL/Tcl procedural language for PostgreSQL"
-	depends="pgtcl"
-
-	amove usr/lib/postgresql/pltcl.so \
-		usr/share/postgresql/extension/pltcl*
-
-	install -m 644 "$srcdir"/pltcl_create_tables.sql \
-		"$subpkgdir"/usr/share/postgresql/
-}
-
-plperl() {
-	pkgdesc="PL/Perl procedural language for PostgreSQL"
-	depends=""
-
-	amove usr/lib/postgresql/plperl.so \
-		usr/share/postgresql/extension/plperl*
-}
-
-plperl_contrib() {
-	_plcontrib plperl "PL/Perl"
-
-	cd "$builddir"
-	make -C contrib/hstore_plperl DESTDIR="$subpkgdir" install
-}
-
-plpython3() {
-	pkgdesc="PL/Python3 procedural language for PostgreSQL"
-	depends="python3"
-
-	amove usr/lib/postgresql/plpython3.so \
-		usr/share/postgresql/extension/plpython*
-}
-
-plpython3_contrib() {
-	_plcontrib plpython3 "PL/Python 3"
-
-	cd "$builddir"
-	make -C contrib/hstore_plpython DESTDIR="$subpkgdir" install
-	make -C contrib/ltree_plpython DESTDIR="$subpkgdir" install
-
-	cd "$subpkgdir"/usr/share/postgresql/extension/
-	rm *plpython2* *plpythonu*
-}
-
-_plcontrib() {
-	local subname="$1"
-	pkgdesc="$2 extension modules distributed with PostgreSQL"
-	depends="$pkgname-$subname"
-	install_if="$pkgname-$subname=$pkgver-r$pkgrel $pkgname-contrib=$pkgver-r$pkgrel"
-}
-
-_run_tests() {
-	local path="$1"; shift
-
-	msg "Running test suite at $path..."
-	# Note: some tests fail when running in parallel.
-	make -k -j 1 -C "$path" $@ check MAX_CONNECTIONS=5 || {
-		printf "\n%s\n\n" "Trying to find all regression.diffs files in build directory..." >&2
-		find "$path" -name regression.diffs | while read file; do
-			echo "=== test failure: $file ===" >&2
-			cat "$file" >&2
-		done
-		return 1
-	}
-}
-
-sha512sums="0e0ce8e21856e8f43e58b840c10c4e3ffae6d5207e0d778e9176e36f8e20e34633cbb06f0030a7c963c3491bb7e941456d91b55444c561cfc6f283fba76f33ee  postgresql-12.2.tar.bz2
-1f8e7dc58f5b0a12427cf2fd904ffa898a34f23f3332c8382b94e0d991c007289e7913a69e04498f3d93fc5701855796c207b4b1cc4a0b366f586050124d7fcc  initdb.patch
-5f9d8bb4957194069d01af8ab3abc6d4d83a7e7f8bd7ebe1caae5361d621a3e58f91b14b952958138a794e0a80bc154fbb7e3e78d211e2a95b9b7901335de854  perl-rpath.patch
-8439a6fdfdea0a4867daeb8bc23d6c825f30c00d91d4c39f48653f5ee77341f23282ce03a77aad94b5369700f11d2cb28d5aee360e59138352a9ab331a9f9d0f  conf-unix_socket_directories.patch
-c4179fcd8b71791cdc41ea7b622cf82e9bd42ac1de66999234b98a83c0c508c79c492a9301274fe859c06a3f1a8b17b53ab97541ab76801a985f8f0b9b8716e7  disable-broken-tests.patch
-224e80f9e62843fd248e625abdd0d9fe477729ff3f9a64fc5c86dd37bb7176d3504107fbed7ce578e3a1db7f60b8cf2abf5fe4862c81f76b6d026e29ca495cfc  postgresql.initd
-a6d9cba5c7270484b3a22083b2b37742faefb01b6643040050c92235840c601b2e206ebda32804937b729c6cf42c79a558b921900e52fc420df2a03b5f29e1f7  postgresql.confd
-f5a1cba051e7d846c2d16703514601cb25729ed96b677c9bd0c199d64552120a8b14b238af01917fdb87106681e12dee6fff7447558155ba273e4f96be5e2892  pg-restore.initd
-c14a5684e914abb3b0ee71bbf15eed71a9264deacaa404a6e3af6bfc330d93e7598624d0ed11a94263106cc660f7f54c8ff57e759033cf606a795f69ff6c1c7c  pg-restore.confd
-5c9bfd9e295dcf678298bf0aa974347a7c311d6e7c2aa76a6920fcb751d01fd1ab77abbec11f3c672f927ad9deaa88e04e370c0b5cd1b60087554c474b748731  pltcl_create_tables.sql"
diff --git a/main/postgresql/conf-unix_socket_directories.patch b/main/postgresql/conf-unix_socket_directories.patch
deleted file mode 100644
index 24c51e7b99b..00000000000
--- a/main/postgresql/conf-unix_socket_directories.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Creating socket in /tmp is silly, but unfortunately it's default location,
-so many clients expect it. Thus we preconfigure PostgreSQL to create socket
-both in /run/postgresql and /tmp.
---- a/src/backend/utils/misc/postgresql.conf.sample
-+++ b/src/backend/utils/misc/postgresql.conf.sample
-@@ -63,7 +63,7 @@
- #port = 5432				# (change requires restart)
- #max_connections = 100			# (change requires restart)
- #superuser_reserved_connections = 3	# (change requires restart)
--#unix_socket_directories = '/tmp'	# comma-separated list of directories
-+unix_socket_directories = '/run/postgresql,/tmp'	# comma-separated list of directories
- 					# (change requires restart)
- #unix_socket_group = ''			# (change requires restart)
- #unix_socket_permissions = 0777		# begin with 0 to use octal notation
diff --git a/main/postgresql/disable-broken-tests.patch b/main/postgresql/disable-broken-tests.patch
deleted file mode 100644
index 1ebccbc416b..00000000000
--- a/main/postgresql/disable-broken-tests.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-These tests fail due to some really weird linking issue like:
-
-    ERROR:  could not load library "<builddir>/tmp_install/usr/lib/postgresql/libpqwalreceiver.so": Error loading shared library libpq.so.5: No such file or directory (needed by <builddir>/tmp_install/usr/lib/postgresql/libpqwalreceiver.so)
-
-psql dynamically loads libpq and libpqwalreceiver libs using pg_dlopen()
-which is an alias for dlopen() on Linux.  The above message comes from
-src/backend/utils/fmgr/dfmgr.c.  The part "Error loading ..." is from
-pg_dlerror() which is alias for dlerror().
-
-LD_LIBRARY_PATH is set and passed correctly.  However, the error
-disappeared when I've copied libpq.so* to /usr/lib...
-
-Also:
-
-    $ LD_LIBRARY_PATH=$(pwd) ldd postgresql/libpqwalreceiver.so
-    	ldd (0x280d565e000)
-    	libpq.so.5 => <builddir>/tmp_install/usr/lib/libpq.so.5 (0x280d520d000)
-    	libc.musl-x86_64.so.1 => ldd (0x280d565e000)
-    	libssl.so.43 => /lib/libssl.so.43 (0x280d4fc2000)
-    	libcrypto.so.41 => /lib/libcrypto.so.41 (0x280d4c1c000)
-    	libldap_r-2.4.so.2 => /usr/lib/libldap_r-2.4.so.2 (0x280d49d6000)
-    	liblber-2.4.so.2 => /usr/lib/liblber-2.4.so.2 (0x280d47c9000)
-    	libsasl2.so.3 => /usr/lib/libsasl2.so.3 (0x280d45b0000)
-    Error relocating postgresql/libpqwalreceiver.so: appendStringInfoChar: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: MyLatch: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: MemoryContextDelete: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: errstart: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: pg_atoi: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: TupleDescGetAttInMetadata: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: WalReceiverFunctions: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: WaitLatchOrSocket: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: MemoryContextReset: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: pfree: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: errmsg: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: tuplestore_puttuple: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: pchomp: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: appendStringInfoString: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: errfinish: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: pstrdup: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: palloc0: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: errdetail: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: ResetLatch: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: work_mem: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: AllocSetContextCreate: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: CurrentMemoryContext: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: tuplestore_begin_heap: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: BuildTupleFromCStrings: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: errcode: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: MyDatabaseId: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: GetDatabaseEncodingName: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: palloc: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: pg_lsn_in: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: ProcessInterrupts: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: elog_start: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: DirectFunctionCall1Coll: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: elog_finish: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: CreateTemplateTupleDesc: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: InterruptPending: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: TupleDescInitEntry: symbol not found
-    Error relocating postgresql/libpqwalreceiver.so: initStringInfo: symbol not found w
-
-These symbols are really not provided by libpq.
-
-I wasted one day trying to figure out what's going on here, but still
-have no idea. :(
-
---- a/src/test/regress/parallel_schedule
-+++ b/src/test/regress/parallel_schedule
-@@ -73,7 +73,7 @@
- # ----------
- # Another group of parallel tests
- # ----------
--test: brin gin gist spgist privileges init_privs security_label collate matview lock replica_identity rowsecurity object_address tablesample groupingsets drop_operator password identity generated join_hash
-+test: brin gin gist spgist privileges init_privs security_label collate matview lock replica_identity rowsecurity tablesample groupingsets drop_operator password identity generated join_hash
- 
- # ----------
- # Another group of parallel tests
-@@ -89,7 +89,7 @@
- test: write_parallel
- 
- # no relation related tests can be put in this group
--test: publication subscription
-+test: publication
- 
- # ----------
- # Another group of parallel tests
---- a/src/test/modules/dummy_seclabel/Makefile
-+++ b/src/test/modules/dummy_seclabel/Makefile
-@@ -6,7 +6,7 @@
- EXTENSION = dummy_seclabel
- DATA = dummy_seclabel--1.0.sql
- 
--REGRESS = dummy_seclabel
-+#REGRESS = dummy_seclabel
- 
- ifdef USE_PGXS
- PG_CONFIG = pg_config
---- a/contrib/postgres_fdw/Makefile
-+++ b/contrib/postgres_fdw/Makefile
-@@ -10,7 +10,7 @@
- EXTENSION = postgres_fdw
- DATA = postgres_fdw--1.0.sql
- 
--REGRESS = postgres_fdw
-+#REGRESS = postgres_fdw
- 
- ifdef USE_PGXS
- PG_CONFIG = pg_config
---- a/contrib/dblink/Makefile
-+++ b/contrib/dblink/Makefile
-@@ -10,7 +10,7 @@
- 	dblink--unpackaged--1.0.sql
- PGFILEDESC = "dblink - connect to other PostgreSQL databases"
- 
--REGRESS = paths dblink
-+#REGRESS = paths dblink
- REGRESS_OPTS = --dlpath=$(top_builddir)/src/test/regress
- EXTRA_CLEAN = sql/paths.sql expected/paths.out
- 
diff --git a/main/postgresql/initdb.patch b/main/postgresql/initdb.patch
deleted file mode 100644
index 59a872a4998..00000000000
--- a/main/postgresql/initdb.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
---- a/src/bin/initdb/initdb.c
-+++ b/src/bin/initdb/initdb.c
-@@ -3259,9 +3259,7 @@
- 	/* translator: This is a placeholder in a shell command. */
- 	appendPQExpBuffer(start_db_cmd, " -l %s start", _("logfile"));
- 
--	printf(_("\nSuccess. You can now start the database server using:\n\n"
--			 "    %s\n\n"),
--		   start_db_cmd->data);
-+	printf(_("\nSuccess.\n\n"));
- 
- 	destroyPQExpBuffer(start_db_cmd);
- 
diff --git a/main/postgresql/perl-rpath.patch b/main/postgresql/perl-rpath.patch
deleted file mode 100644
index a2505acf751..00000000000
--- a/main/postgresql/perl-rpath.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-We configure Postgres with --disable-rpath because for the most part we
-want to leave it to ldconfig to determine where libraries are.  However,
-for some reason the Perl package puts libperl.so in a nonstandard place
-and doesn't add that place to the ldconfig search path.  I think this
-is a Perl packaging bug, myself, but apparently it's not going to change.
-So work around it by adding an rpath spec to plperl.so (only).
-
-Alpine notes:
-This patch is copied from Fedora.
-
---- a/src/pl/plperl/GNUmakefile
-+++ b/src/pl/plperl/GNUmakefile
-@@ -43,6 +43,9 @@
- 
- SHLIB_LINK = $(perl_embed_ldflags)
- 
-+# Force rpath to be used even though we disable it everywhere else
-+SHLIB_LINK += $(rpath)
-+
- REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=plperl  --load-extension=plperlu
- REGRESS = plperl plperl_lc plperl_trigger plperl_shared plperl_elog plperl_util plperl_init plperlu plperl_array
- # if Perl can support two interpreters in one backend,
diff --git a/main/postgresql/pg-restore.confd b/main/postgresql/pg-restore.confd
deleted file mode 100644
index 84a179f6cda..00000000000
--- a/main/postgresql/pg-restore.confd
+++ /dev/null
@@ -1,16 +0,0 @@
-
-# Enable this to dump databases on shutdown and restore on boot
-#
-#PGDUMP="/var/lib/postgresql/backup/databases.pgdump"
-
-# The dump file will be deleted once restored unless KEEP_DUMP is set.
-# This is to avoid accidental restoring of running database. If you know what
-# you are doing and want keep the dump, then enable the KEEP_DUMP option
-# below.
-#
-#KEEP_DUMP=yes
-
-# If you enable KEEP_DUMP above you probably also want the --clean option
-# the the pg_dumpall command.
-#PG_DUMPALL_OPTS="--clean"
-
diff --git a/main/postgresql/pg-restore.initd b/main/postgresql/pg-restore.initd
deleted file mode 100644
index e9fe65c1900..00000000000
--- a/main/postgresql/pg-restore.initd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-
-extra_commands="${opts} dump restore purge"
-
-depend() {
-	need postgresql
-}
-
-restore() {
-	yesno "$PGDUMP" && return 0
-	ebegin "Restoring PostgreSQL $PGDUMP"
-	psql -U ${PG_USER:-postgres} ${PSQL_OPTS} -f "$PGDUMP" >/dev/null 2>/dev/null
-	local res=$?
-	yesno "$KEEP_DUMP" || rm -f "$PGDUMP"
-	eend $res
-	/etc/init.d/postgresql reload
-}
-
-dump() {
-	yesno "$PGDUMP" && return 0
-	mkdir -p "$( dirname "$PGDUMP" )"
-	ebegin "Saving PostgreSQL databases to $PGDUMP"
-	pg_dumpall -U ${PG_USER:-postgres} ${PG_DUMPALL_OPTS} -f "$PGDUMP"
-	eend $?
-}
-
-purge() {
-	yesno "$PGDUMP" && return 0
-	ebegin "Removing temporary $PGDUMP PostgreSQL backup"
-	rm -f "$PGDUMP"
-	eend $?
-}
-
-start() {
-	restore	
-}
diff --git a/main/postgresql/postgresql-contrib.post-upgrade b/main/postgresql/postgresql-contrib.post-upgrade
deleted file mode 100644
index c6a8825d902..00000000000
--- a/main/postgresql/postgresql-contrib.post-upgrade
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-ver_new="$1"
-ver_old="$2"
-
-if [ "$(apk version -t "$ver_old" "10.2-r0")" = "<" ]; then
-	cat >&2 <<-EOF
-	*
-	* If you use contrib/cube's cube ~> int operator, you have to reindex/refresh
-	* all expression indexes and materialized views using this operator.
-	* Read https://www.postgresql.org/docs/10/static/release-10-2.html.
-	*
-	EOF
-fi
-
-exit 0
diff --git a/main/postgresql/postgresql.confd b/main/postgresql/postgresql.confd
deleted file mode 100644
index 6a25cc381ad..00000000000
--- a/main/postgresql/postgresql.confd
+++ /dev/null
@@ -1,59 +0,0 @@
-# Which port and socket to bind PostgreSQL.
-# This may be overriden in postgresql.conf.
-#port="5432"
-
-# How long to wait for server to start in seconds.
-#start_timeout=10
-
-# Number of seconds to wait for clients to disconnect from the server before
-# shutting down. Set to zero to disable this timeout.
-#nice_timeout=60
-
-# Timeout in seconds for rude quit - forecfully disconnect clients from server
-# and shut down. This is performed after nice_timeout exceeded. Terminated
-# client connections have their open transactions rolled back.
-# Set "rude_quit=no" to disable.
-#rude_quit="yes"
-#rude_timeout=30
-
-# Timeout in seconds for force quit - if the server still fails to shutdown,
-# you can force it to quit and a recover-run will execute on the next startup.
-# Set "force_quit=yes" to enable.
-#force_quit="no"
-#force_timeout="2"
-
-# Extra options to run postmaster with, e.g.:
-#   -N is the maximal number of client connections
-#   -B is the number of shared buffers (has to be at least 2x the value for -N)
-# Please read man postgres(1) for more options. Many of these options can be
-# set directly in the configuration file.
-#pg_opts="-N 512 -B 1024"
-
-# Pass extra environment variables. If you have to export environment variables
-# for the database process, this can be done here.
-# Don't forget to escape quotes.
-#env_vars="PGPASSFILE=\"/path/to/.pgpass\""
-
-# Location of postmaster.log. Default is $data_dir/postmaster.log.
-logfile="/var/log/postgresql/postmaster.log"
-
-# Automatically set up a new database if missing on startup.
-#auto_setup="yes"
-
-
-##############################################################################
-#
-# The following values should NOT be arbitrarily changed!
-#
-# The initscript uses these variables to inform PostgreSQL where to find
-# its data directory and configuration files.
-
-# Where the data directory is located/to be created.
-#data_dir="/var/lib/postgresql/@VERSION@/data"
-
-# Location of configuration files. Default is $data_dir.
-conf_dir="/etc/postgresql"
-
-# Additional options to pass to initdb.
-# See man initdb(1) for available options.
-#initdb_opts="--locale=en_US.UTF-8"
diff --git a/main/postgresql/postgresql.initd b/main/postgresql/postgresql.initd
deleted file mode 100644
index 846229a40c1..00000000000
--- a/main/postgresql/postgresql.initd
+++ /dev/null
@@ -1,220 +0,0 @@
-#!/sbin/openrc-run
-
-extra_started_commands="reload"
-description_reload="Reload configuration"
-
-extra_stopped_commands="setup"
-description_setup="Initialize a new PostgreSQL cluster"
-
-# Note: Uppercase variables are here for backward compatibility.
-
-: ${user:=${PGUSER:-"postgres"}}
-: ${group:=${PGGROUP:-"postgres"}}
-
-: ${auto_setup:=${AUTO_SETUP:-"yes"}}
-: ${start_timeout:=${START_TIMEOUT:-10}}
-: ${nice_timeout:=${NICE_TIMEOUT:-60}}
-: ${rude_quit:=${RUDE_QUIT:-"yes"}}
-: ${rude_timeout:=${RUDE_TIMEOUT:-30}}
-: ${force_quit:=${FORCE_QUIT:-"no"}}
-: ${force_timeout:=${FORCE_TIMEOUT:-2}}
-
-: ${data_dir:=${PGDATA:-"/var/lib/postgresql/@VERSION@/data"}}
-: ${conf_dir:=$data_dir}
-: ${env_vars:=${PG_EXTRA_ENV:-}}
-: ${initdb_opts:=${PG_INITDB_OPTS:-}}
-: ${logfile:="$data_dir/postmaster.log"}
-: ${pg_opts:=${PGOPTS:-}}
-: ${port:=${PGPORT:-5432}}
-
-command="/usr/bin/postgres"
-
-conffile="$conf_dir/postgresql.conf"
-pidfile="$data_dir/postmaster.pid"
-start_stop_daemon_args="
-	--user $user
-	--group $group
-	--pidfile $pidfile
-	--wait 100"
-
-depend() {
-	use net
-	after firewall
-
-	if [ "$(get_config log_destination)" = "syslog" ]; then
-		use logger
-	fi
-}
-
-start_pre() {
-	check_deprecated_var WAIT_FOR_START start_timeout
-	check_deprecated_var WAIT_FOR_DISCONNECT nice_timeout
-	check_deprecated_var WAIT_FOR_CLEANUP rude_timeout
-	check_deprecated_var WAIT_FOR_QUIT force_timeout
-
-	if [ ! -d "$data_dir/base" ]; then
-		if yesno "$auto_setup"; then
-			setup || return 1
-		else
-			eerror "Database not found at: $data_dir"
-			eerror "Please make sure that 'data_dir' points to the right path."
-			eerror "You can run '/etc/init.d/postgresql setup' to setup a new database cluster."
-			return 1
-		fi
-	fi
-
-	local socket_dirs=$(get_config "unix_socket_directories" "/run/postgresql")
-	local port=$(get_config "port" "$port")
-
-	start_stop_daemon_args="$start_stop_daemon_args --env PGPORT=$port"
-
-	(
-		# Set the proper permission for the socket paths and create them if
-		# then don't exist.
-		set -f; IFS=","
-		for dir in $socket_dirs; do
-			if [ -e "${dir%/}/.s.PGSQL.$port" ]; then
-				eerror "Socket conflict. A server is already listening on:"
-				eerror "    ${dir%/}/.s.PGSQL.$port"
-				eerror "Hint: Change 'port' to listen on a different socket."
-				return 1
-			elif [ "${dir%/}" != "/tmp" ]; then
-				checkpath -d -m 1775 -o $user:$group "$dir"
-			fi
-		done
-	)
-}
-
-start() {
-	local retval
-
-	ebegin "Starting PostgreSQL"
-
-	local var; for var in $env_vars; do
-		start_stop_daemon_args="$start_stop_daemon_args --env $var"
-	done
-
-	rm -f "$pidfile"
-	start-stop-daemon --start \
-		$start_stop_daemon_args \
-		--exec /usr/bin/pg_ctl \
-		-- start \
-			--silent \
-			-w --timeout="$start_timeout" \
-			--log="$logfile" \
-			--pgdata="$conf_dir" \
-			-o "--data-directory=$data_dir $pg_opts"
-	retval=$?
-
-	if [ $retval -ne 0 ]; then
-		eerror "Check the log for a possible explanation of the above error:"
-		eerror "    $logfile"
-	fi
-	eend $retval
-}
-
-stop() {
-	local retry="SIGTERM/$nice_timeout"
-
-	yesno "$rude_quit" \
-		&& retry="$retry/SIGINT/$rude_timeout" \
-		|| rude_timeout=0
-
-	yesno "$force_quit" \
-		&& retry="$retry/SIGQUIT/$force_timeout" \
-		|| force_timeout=0
-
-	local seconds=$(( $nice_timeout + $rude_timeout + $force_timeout ))
-
-	ebegin "Stopping PostgreSQL (this can take up to $seconds seconds)"
-
-	start-stop-daemon --stop \
-		--exec "$command" \
-		--retry "$retry" \
-		--progress \
-		--pidfile "$pidfile"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading PostgreSQL configuration"
-
-	start-stop-daemon --signal HUP --pidfile "$pidfile"
-	eend $?
-}
-
-setup() {
-	local bkpdir
-
-	ebegin "Creating a new PostgreSQL database cluster"
-
-	if [ -d "$data_dir/base" ]; then
-		eend 1 "$data_dir/base already exists!"; return 1
-	fi
-
-	# If data_dir exists, backup configs.
-	if [ -d "$data_dir" ]; then
-		bkpdir="$(mktemp -d)"
-		find "$data_dir" -type f -name "*.conf" -maxdepth 1 \
-			-exec mv -v {} "$bkpdir"/ \;
-		rm -rf "$data_dir"/*
-	fi
-
-	install -d -m 0700 -o $user -g $group "$data_dir"
-	install -d -m 0750 -o $user -g $group "$conf_dir"
-
-	cd "$data_dir"  # to avoid the: could not change directory to "/root"
-	su $user -c "/usr/bin/initdb $initdb_opts --pgdata $data_dir"
-	local retval=$?
-
-	if [ -d "$bkpdir" ]; then
-		# Move backuped configs back.
-		mv -v "$bkpdir"/* "$data_dir"/
-		rm -rf "$bkpdir"
-	fi
-
-	if [ "${data_dir%/}" != "${conf_dir%/}" ]; then
-		# Move configs from data_dir to conf_dir and symlink them to data_dir.
-		local name newname
-		for name in postgresql.conf pg_hba.conf pg_ident.conf; do
-			newname="$name"
-			[ ! -e "$conf_dir"/$name ] || newname="$name.new"
-
-			mv "$data_dir"/$name "$conf_dir"/$newname
-			ln -s "$conf_dir"/$name "$data_dir"/$name
-		done
-	fi
-
-	eend $retval
-} 
-
-
-get_config() {
-	local name="$1"
-	local default="${2:-}"
-
-	if [ ! -f "$conffile" ]; then
-		printf '%s\n' "$default"
-		return 1
-	fi
-	sed -En "/^\s*${name}\b/{                      # find line starting with the name
-		  s/^\s*${name}\s*=?\s*([^#]+).*/\1/;  # capture the value
-		  s/\s*$//;                            # trim trailing whitespaces
-		  s/^['\"](.*)['\"]$/\1/;              # remove delimiting quotes
-		  p
-		}" "$conffile" \
-		| grep . || printf '%s\n' "$default"
-}
-
-check_deprecated_var() {
-	local old_name="$1"
-	local new_name="$2"
-
-	if [ -n "$(getval "$old_name")" ]; then
-		ewarn "Variable '$old_name' has been removed, please use '$new_name' instead."
-	fi
-}
-
-getval() {
-	eval "printf '%s\n' \"\$$1\""
-}
diff --git a/main/postgresql/postgresql.pre-install b/main/postgresql/postgresql.pre-install
deleted file mode 100644
index dd347062242..00000000000
--- a/main/postgresql/postgresql.pre-install
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Fixed GID/UID values as this users was previously included in the
-# default /etc/passwd as shipped by main/alpine-baselayout.
-
-addgroup -g 70 -S postgres 2>/dev/null
-adduser -u 70 -S -D -H -h /var/lib/postgresql -g "Postgres user" \
-	-s /bin/sh -G postgres postgres 2>/dev/null
-
-exit 0
diff --git a/main/postgresql/postgresql.pre-upgrade b/main/postgresql/postgresql.pre-upgrade
deleted file mode 100644
index 18b265d1d4d..00000000000
--- a/main/postgresql/postgresql.pre-upgrade
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-new="$1"
-old="$2"
-
-pgver=${new%.*}
-compare=$(apk version -t "$old" $pgver)
-
-# check if we upgrade from earlier than $pgver and if it is running
-if [ "$compare" != "<" ] || ! /etc/init.d/postgresql --quiet status; then
-	exit 0
-fi
-
-if [ -f /etc/conf.d/postgresql ]; then
-	. /etc/conf.d/postgresql
-fi
-
-cat <<EOF
-* You are upgrading to postgres $pgver, which is not compatible with the running
-* version. See: http://www.postgresql.org/docs/$pgver/static/upgrading.html
-*
-* The corresponding steps for Alpine Linux is:
-*
-*  pg_dumpall -U ${PGUSER:-postgres} > dumpfile
-*  /etc/init.d/postgresql stop
-*  apk add -u postgresql
-*  /etc/init.d/postgresql setup
-*  /etc/init.d/postgresql start
-*  psql -U ${PGUSER:-postgres} -f dumpfile
-*
-EOF
-exit 1
diff --git a/main/postgresql15/APKBUILD b/main/postgresql15/APKBUILD
new file mode 100644
index 00000000000..ebe3c4b302f
--- /dev/null
+++ b/main/postgresql15/APKBUILD
@@ -0,0 +1,560 @@
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+# Contributor: G.J.R. Timmer <gjr.timmer@gmail.com>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+_pkgname=postgresql
+pkgver=15.6
+pkgrel=1
+_majorver=${pkgver%%[_.]*}
+# Should this aport provide libpq* and libecpg*? true/false
+# Exactly one postgresql aport must be the default one!
+_default_ver=false
+pkgname=$_pkgname$_majorver
+pkgdesc="A sophisticated object-relational DBMS, version $_majorver"
+url="https://www.postgresql.org/"
+arch="all !riscv64 !loongarch64"
+license="PostgreSQL"
+_llvmver=14
+depends="$pkgname-client postgresql-common tzdata"
+depends_dev="
+	libpq-dev
+	libecpg-dev
+	clang$_llvmver
+	icu-dev
+	llvm$_llvmver
+	lz4-dev
+	openssl-dev
+	zstd-dev
+	"
+checkdepends="
+	diffutils
+	icu-data-full
+	perl-ipc-run
+	"
+makedepends="$depends_dev
+	bison
+	flex
+	libxml2-dev
+	linux-headers
+	llvm$_llvmver-dev
+	openldap-dev
+	perl-dev
+	python3-dev
+	readline-dev
+	tcl-dev
+	util-linux-dev
+	zlib-dev
+	"
+pkgusers="postgres"
+pkggroups="postgres"
+install="$pkgname.post-install $pkgname.pre-deinstall"
+provider_priority=$_majorver
+provides="postgresql"
+replaces="postgresql"  # for backward compatibility
+$_default_ver && subpackages="
+	libpq
+	libpq-dev:libpq_dev
+	libecpg
+	libecpg-dev:libecpg_dev
+	"
+subpackages="
+	$subpackages
+	$pkgname-client
+	$pkgname-jit
+	$pkgname-contrib
+	$pkgname-plperl
+	$pkgname-plperl-contrib:plperl_contrib
+	$pkgname-plpython3
+	$pkgname-plpython3-contrib:plpython3_contrib
+	$pkgname-pltcl
+	$pkgname-contrib-jit:contrib_jit
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-openrc
+	"
+source="https://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz2
+	initdb.patch
+	perl-rpath.patch
+	per-version-dirs.patch
+	unix_socket_directories.patch
+	disable-html-docs.patch
+	remove-libecpg_compat.patch
+	czech-snowball-stemmer.patch
+	make-split-headers.patch
+	jit-datalayout-mismatch-on-s390x-and-x86.patch
+	pg_config-add-major-version.patch
+	dont-use-locale-a-on-musl.patch
+	icu-collations-hack.patch
+	libpgport-pkglibdir.patch.txt
+	external-libpq.patch.txt
+
+	pltcl_create_tables.sql
+	"
+builddir="$srcdir/$_pkgname-$pkgver"
+# FIXME: https://gitlab.alpinelinux.org/alpine/aports/-/issues/14359
+options="net !check"
+
+# secfixes:
+#   15.6-r0:
+#     - CVE-2024-0985
+#   15.5-r0:
+#     - CVE-2023-5868
+#     - CVE-2023-5869
+#     - CVE-2023-5870
+#   15.4-r0:
+#     - CVE-2023-39418
+#     - CVE-2023-39417
+#   15.3-r0:
+#     - CVE-2023-2454
+#     - CVE-2023-2455
+#   15.2-r0:
+#     - CVE-2022-41862
+#   14.5-r0:
+#     - CVE-2022-2625
+#   14.3-r0:
+#     - CVE-2022-1552
+#   14.1-r0:
+#     - CVE-2021-23214
+#     - CVE-2021-23222
+#   13.4-r0:
+#     - CVE-2021-3677
+#   13.3-r0:
+#     - CVE-2021-32027
+#     - CVE-2021-32028
+#     - CVE-2021-32029
+#   13.2-r0:
+#     - CVE-2021-3393
+#     - CVE-2021-20229
+#   12.5-r0:
+#     - CVE-2020-25694
+#     - CVE-2020-25695
+#     - CVE-2020-25696
+#   12.4-r0:
+#     - CVE-2020-14349
+#     - CVE-2020-14350
+#   12.2-r0:
+#     - CVE-2020-1720
+#   11.5-r0:
+#     - CVE-2019-10208
+#     - CVE-2019-10209
+#   11.4-r0:
+#     - CVE-2019-10164
+#   11.3-r0:
+#     - CVE-2019-10129
+#     - CVE-2019-10130
+#   11.1-r0:
+#     - CVE-2018-16850
+#   10.5-r0:
+#     - CVE-2018-10915
+#     - CVE-2018-10925
+#   10.4-r0:
+#     - CVE-2018-1115
+#   10.3-r0:
+#     - CVE-2018-1058
+#   10.2-r0:
+#     - CVE-2018-1052
+#     - CVE-2018-1053
+#   10.1-r0:
+#     - CVE-2017-15098
+#     - CVE-2017-15099
+#   9.6.4-r0:
+#     - CVE-2017-7546
+#     - CVE-2017-7547
+#     - CVE-2017-7548
+#   9.6.3-r0:
+#     - CVE-2017-7484
+#     - CVE-2017-7485
+#     - CVE-2017-7486
+
+_bindir=usr/libexec/$pkgname
+_datadir=usr/share/$pkgname
+_docdir=usr/share/doc/$pkgname
+_mandir=$_datadir/man
+_includedir=usr/include/postgresql
+# Directory for server-related libraries. This is hard-coded in
+# per-version-dirs.patch.
+_srvlibdir=usr/lib/$pkgname
+
+# Programs to be included in the -client subpackage.
+# TODO: This was probably originally copied from Debian and I have no idea
+#   why these are considered as front-end (client) programs and the rest of
+#   the programs are not. So it should be reviewed.
+_client_cmds="
+	clusterdb
+	createdb
+	createuser
+	dropdb
+	dropuser
+	pg_amcheck
+	pg_basebackup
+	pg_dump
+	pg_dumpall
+	pg_isready
+	pg_receivewal
+	pg_recvlogical
+	pg_restore
+	pg_verifybackup
+	pgbench
+	psql
+	reindexdb
+	vacuumdb
+	"
+
+prepare() {
+	default_prepare
+
+	if $_default_ver; then
+		cp -rl "$builddir" "$builddir-ifaces"
+	else
+		msg 'external-libpq.patch'
+		patch -p1 < "$srcdir"/external-libpq.patch.txt
+	fi
+	# Note: This must be applied after clonning $builddir-ifaces.
+	patch -p1 < "$srcdir"/libpgport-pkglibdir.patch.txt
+}
+
+build() {
+	export LLVM_CONFIG="/usr/lib/llvm$_llvmver/bin/llvm-config"
+	export PYTHON=/usr/bin/python3
+	export CFLAGS="${CFLAGS/-Os/-O2}"
+	export CPPFLAGS="${CPPFLAGS/-Os/-O2}"
+	# older clang versions don't have a 'clang' exe anymore.
+	export CLANG=clang-$_llvmver
+
+	_configure --with-ldap
+	make world
+
+	if $_default_ver; then
+		cd "$builddir-ifaces"
+
+		_configure --without-ldap
+		local dir; for dir in include common port interfaces bin/pg_config; do
+			make -C src/$dir
+		done
+	fi
+}
+
+_configure() {
+	local _extra_opts
+	# When disable-spinlocks is no longer required - check postgresql-bdr package.
+	case "$CARCH" in
+		riscv64) _extra_opts='--disable-spinlocks';;
+	esac
+	want_check && _extra_opts="$_extra_opts --enable-tap-tests"
+
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--bindir=/$_bindir \
+		--datarootdir=/usr/share \
+		--datadir=/$_datadir \
+		--docdir=/$_docdir \
+		--includedir=/$_includedir \
+		--libdir=/usr/lib \
+		--mandir=/$_mandir \
+		--sysconfdir=/etc/postgresql \
+		--disable-rpath \
+		--with-system-tzdata=/usr/share/zoneinfo \
+		--with-libxml \
+		--with-openssl \
+		--with-uuid=e2fs \
+		--with-llvm \
+		--with-icu \
+		--with-perl \
+		--with-python \
+		--with-tcl \
+		--with-lz4 \
+		--with-zstd \
+		$_extra_opts \
+		"$@"
+}
+
+check() {
+	_run_tests src/test
+	_run_tests src/pl
+	_run_tests contrib
+}
+
+package() {
+	make DESTDIR="$pkgdir" install install-docs
+
+	if $_default_ver; then
+		cd "$builddir-ifaces"
+
+		# Override libpq and libecpg files with the build without LDAP support.
+		local dir; for dir in common port interfaces bin/pg_config; do
+			make -C src/$dir DESTDIR="$pkgdir" bindir=/usr/bin install
+		done
+		make -C src/include DESTDIR="$pkgdir" install-interfaces
+	fi
+
+	cd "$pkgdir"
+
+	# Duplicate of usr/bin/ecpg.
+	rm -f ./$_bindir/ecpg
+
+	mkdir -p ./usr/bin
+	ln -s /$_bindir/postgres ./usr/bin/postgres$_majorver
+
+	# This file is used by pg_versions and init script.
+	echo "$_majorver" > ./$_bindir/PG_VERSION
+
+	install -d -m750 -o postgres -g postgres \
+		./etc/postgresql$_majorver \
+		./var/lib/postgresql \
+		./var/log/postgresql
+
+	local server_cmds=$(_setdiff "$(ls -1 $_bindir)" "$_client_cmds pg_config ecpg PG_VERSION")
+	[ "$server_cmds" ] || die 'package: variable server_cmds is empty'
+
+	# These commands are symlinked to /usr/bin by pg_versions script after
+	# installation.
+	provides="$provides $(echo "$server_cmds" | sed 's/^/cmd:&/')"
+}
+
+libpq() {
+	pkgdesc="PostgreSQL client library"
+	depends=""
+	replaces=""
+
+	amove usr/lib/libpq.so.*
+}
+
+libpq_dev() {
+	pkgdesc="PostgreSQL client library (development files)"
+	depends=""
+	replaces=""
+
+	amove usr/bin/pg_config
+
+	amove $_includedir/internal/*
+	amove $_includedir/libpq-*.h
+	amove $_includedir/libpq/*
+	amove $_includedir/pg_config*.h
+	amove $_includedir/postgres_ext.h
+
+	amove usr/lib/libpq.*
+	amove usr/lib/libpgcommon*.a
+	amove usr/lib/libpgport*.a
+	amove usr/lib/pkgconfig/libpq.pc
+}
+
+libecpg() {
+	pkgdesc="ECPG - Embedded SQL in C"
+	depends=""
+	provides="postgresql-libs"  # for backward compatibility (Alpine <3.15)
+	replaces="$provides"  # for backward compatibility (Alpine <3.15)
+
+	amove usr/lib/libecpg.so.*
+	amove usr/lib/libpgtypes.so.*
+}
+
+libecpg_dev() {
+	pkgdesc="ECPG - Embedded SQL in C (development files)"
+	depends="libpq-dev=$pkgver-r$pkgrel"
+	replaces=""
+
+	amove usr/bin/ecpg
+
+	amove $_includedir/ecpg*.h
+	amove $_includedir/informix/*
+	amove $_includedir/pgtypes*.h
+	amove $_includedir/sql3types.h
+	amove $_includedir/sqlca.h
+	amove $_includedir/sqlda*.h
+
+	amove usr/lib/libecpg.*
+	amove usr/lib/libpgtypes.*
+	amove usr/lib/pkgconfig/libecpg.pc
+	amove usr/lib/pkgconfig/libpgtypes.pc
+}
+
+client() {
+	pkgdesc="PostgreSQL client"
+	depends="postgresql-common"
+	_subpkg_common
+
+	local cmd; for cmd in $_client_cmds; do
+		amove $_bindir/$cmd
+		# These commands are symlinked to /usr/bin by pg_versions script after
+		# installation.
+		provides="$provides cmd:$cmd"
+	done
+	amove $_bindir/PG_VERSION
+}
+
+jit() {
+	pkgdesc="Just-in-time compilation support for PostgreSQL"
+	depends="$pkgname=$pkgver-r$pkgrel"
+	_subpkg_common
+
+	amove $_srvlibdir/bitcode/*
+	amove $_srvlibdir/llvmjit.so
+	amove $_srvlibdir/llvmjit_types.bc
+}
+
+contrib() {
+	pkgdesc="Extension modules distributed with PostgreSQL"
+	depends="$pkgname=$pkgver-r$pkgrel"
+	_subpkg_common
+
+	cd "$builddir"
+
+	# Avoid installing plperl and plpython extensions, these will be
+	# installed into separate subpackages.
+	sed -Ei -e 's/(.*_plperl)/#\1/' \
+		-e 's/(.*_plpython)/#\1/' \
+		contrib/Makefile
+
+	make -C contrib DESTDIR="$subpkgdir" install
+
+	_contrib_common
+
+	provides="$provides $(ls -1 "$subpkgdir"/$_bindir | sed 's/^/cmd:&/')"
+}
+
+pltcl() {
+	pkgdesc="PL/Tcl procedural language for PostgreSQL"
+	depends="$pkgname=$pkgver-r$pkgrel pgtcl"
+	_subpkg_common
+
+	amove $_srvlibdir/pltcl.so
+	amove $_datadir/extension/pltcl*
+
+	install -m 644 "$srcdir"/pltcl_create_tables.sql -t "$subpkgdir"/$_datadir/
+}
+
+plperl() {
+	pkgdesc="PL/Perl procedural language for PostgreSQL"
+	depends="$pkgname=$pkgver-r$pkgrel"
+	_subpkg_common
+
+	amove $_srvlibdir/plperl.so
+	amove $_datadir/extension/plperl*
+}
+
+plperl_contrib() {
+	_plcontrib plperl "PL/Perl"
+
+	cd "$builddir"
+	make -C contrib/hstore_plperl DESTDIR="$subpkgdir" install
+
+	_contrib_common
+}
+
+plpython3() {
+	pkgdesc="PL/Python3 procedural language for PostgreSQL"
+	depends="$pkgname=$pkgver-r$pkgrel python3"
+	_subpkg_common
+
+	amove $_srvlibdir/plpython3.so
+	amove $_datadir/extension/plpython*
+}
+
+plpython3_contrib() {
+	_plcontrib plpython3 "PL/Python 3"
+
+	cd "$builddir"
+	make -C contrib/hstore_plpython DESTDIR="$subpkgdir" install
+	make -C contrib/ltree_plpython DESTDIR="$subpkgdir" install
+
+	_contrib_common
+}
+
+contrib_jit() {
+	pkgdesc="Extension modules distributed with PostgreSQL (JIT support)"
+	depends="$pkgname-contrib=$pkgver-r$pkgrel"
+	install_if="$pkgname-jit $pkgname-contrib=$pkgver-r$pkgrel"
+	_subpkg_common
+
+	amove $_srvlibdir/bitcode/*
+}
+
+dev() {
+	default_dev
+	_subpkg_common
+	replaces=""
+
+	amove $_srvlibdir/pgxs/*
+}
+
+doc() {
+	default_doc
+	_subpkg_common
+
+	amove $_mandir
+}
+
+openrc() {
+	default_openrc
+	depends="postgresql-common-openrc"
+
+	mkdir -p "$subpkgdir"
+}
+
+_plcontrib() {
+	local subname="$1"
+	pkgdesc="$2 extension modules distributed with PostgreSQL"
+	depends="$pkgname-$subname=$pkgver-r$pkgrel"
+	install_if="$pkgname-$subname=$pkgver-r$pkgrel $pkgname-contrib=$pkgver-r$pkgrel"
+	_subpkg_common
+}
+
+_subpkg_common() {
+	provides="postgresql${subpkgname#$pkgname}"
+	replaces="$provides"  # for backward compatibility
+}
+
+_contrib_common() {
+	# Move headers, bitcode and docs from subpackage back to pkgdir, so it
+	# can be catched by subsequent split functions.
+	local dir; for dir in $_includedir $_srvlibdir/bitcode $_docdir; do
+		[ -d "$subpkgdir"/$dir ] || continue
+
+		mkdir -p "$pkgdir"/$dir
+		cp -rf "$subpkgdir"/$dir/* "$pkgdir"/$dir/
+		rm -rf "$subpkgdir"/$dir/*
+		rmdir -p "$subpkgdir"/$dir || true
+	done
+}
+
+_run_tests() {
+	local path="$1"; shift
+
+	msg "Running test suite at $path..."
+	# Note: some tests fail when running in parallel.
+	make -k -j 1 -C "$path" "$@" check MAX_CONNECTIONS=5 || {
+		printf "\n%s\n\n" "Trying to find all regression.diffs files in build directory..." >&2
+		find "$path" -name regression.diffs | while read -r file; do
+			echo "=== test failure: $file ===" >&2
+			cat "$file" >&2
+		done
+		return 1
+	}
+}
+
+# $1: whitespace-separated items of set A
+# $2: whitespace-separated items of set B
+# stdout: newline-separated items of A - B
+_setdiff() {
+	python3 -c 'import sys;print("\n".join(set(sys.argv[1].split()).difference(set(sys.argv[2].split()))))' "$@"
+}
+
+sha512sums="
+d9f158d844ec21bc5a7eccad9193dfe026d3df46a011980412ad7d150b3894c01754be0053bed530976047d7eff657204ac321138ba8da6eac8fb7b93b9520ad  postgresql-15.6.tar.bz2
+73080f61ae274a214966d2d010de49c8c90eb3180e4f56d86a9e23063eaddbe7f8d2c40ed414591c16bc9cfe88577866af2a965c2b6effb54965d19ef96a3fa9  initdb.patch
+27e00b58fe5c3899c66fc0dde51846c14701bcfedd132b106d676783ba603e8cbdc6e620f29b52dc892bdaa9302052788cf5e575a1659f61c017a12e0d2ee4d0  perl-rpath.patch
+413e979745f81a5b95b7ad9ea44452217d095e3ee6b4a82b636a7b3c89093fefbe7b8d210e4f6bfdab1d6f81309133719e90b7eab93ba60ef2bb78308c52b3b9  per-version-dirs.patch
+d0040599d7646b709af4e3413bf0c228090f256395e806f3fee230ccc6037ed9c0df1cd160d01b6a73b25a742fdd3fb070733a14a78f53d297fbdbbb44f6f878  unix_socket_directories.patch
+2e33e1ae38d60e0daf3ed18e6eaa9ddf6762b4b1bb7e51f1d2690e3df9d602aa1a700e603ba3ee69314a75a963131c7dc67c1b1f8b7eb5564e9c4253e81a4db4  disable-html-docs.patch
+d8eb4274a54b94bed4a2ded7ae775c5a95ca0f051b831b859ccf78bf6d2ea6fe89a9a0611771f6ad85573995a7e3af1fdf5859e20cae3267a52239f12e1b61c3  remove-libecpg_compat.patch
+673707b331cd09c105d18f39e83ec39371886d5d8cf706b6ebbd30ace294fa3377c391bea1ab409c001644c90ac718e3250cbc4acd9224bc0e7ac1f86c832424  czech-snowball-stemmer.patch
+5262f4944844bccc839c4441570b9eb2e0792390234ebfdb8ebb7b83380ce5f5de84b038cb03045526da202a185af9c3972c2ae1b9e0e743a95c6e84f4621cf9  make-split-headers.patch
+c24986becfd73546a062612335e53b4da34829e42a0c30e85ed7481924f13b1fd0a0e5079d680905a52afea1e99f2210cc3692c529a34a74cd6961c88cce9163  jit-datalayout-mismatch-on-s390x-and-x86.patch
+7790e4e4374f7bdc6b4484ba87a5fa709d30d3cbdce61ee7bf9c5dfce40cb51c7bd54ab42f4050fb48eede08ef573624d819128e57cc8c976e01202854740308  pg_config-add-major-version.patch
+b0688d66fdd7d612c24d9aa69bdd80d30787d2d6409b4524c79b41797144fc743213460e6de9c536bfb72da089f92cf89731f15137b1407fd04ca97fd393bfd2  dont-use-locale-a-on-musl.patch
+a98e5ecdd421f68f11b55bf07bf60280cf80508f89c5d21a084c7e7aa3be0a22c88b8e2ce611a13dd5c11efdd052eb9018271b549040c30663b9fd9b7c4fc611  icu-collations-hack.patch
+cde5fbf5a39e5de18a40ec1d9ac919dcf166e0ca178a6b9dbdfded8d16b4969b91917a2550bbf33eccd1ecb3bd9e0753a47012e60f4efe720bbef2a2c5368529  libpgport-pkglibdir.patch.txt
+6078defb3da67e7df96665cc130d32b69eebfcaf49d92eef368ea8eea8bb311fab56064c104bc97f53da9cd925301bef696b506af33e0b66d65bc6cd41ec7499  external-libpq.patch.txt
+5c9bfd9e295dcf678298bf0aa974347a7c311d6e7c2aa76a6920fcb751d01fd1ab77abbec11f3c672f927ad9deaa88e04e370c0b5cd1b60087554c474b748731  pltcl_create_tables.sql
+"
diff --git a/main/postgresql15/czech-snowball-stemmer.patch b/main/postgresql15/czech-snowball-stemmer.patch
new file mode 100644
index 00000000000..eb84c0511b0
--- /dev/null
+++ b/main/postgresql15/czech-snowball-stemmer.patch
@@ -0,0 +1,1064 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Thu, 7 Jan 2021 00:55:21 +0100
+Subject: [PATCH] Add Czech Snowball Stemmer
+
+This patch is based on [1] from Jan Dedek. It includes C implementation of
+the Czech Snowball stemmer generated automatically using Snowball utility
+from sources available at https://snowballstem.org/otherapps/oregan/
+(licensed under BSD).
+
+File czech.stop was extracted from http://www.pgsql.cz/data/czech.tar.gz
+(author of this tarball is Pavel Stehule).
+
+[1]: https://github.com/datlowe/postgres_snowball_czech/commit/4363325f719a463fce04c04cbcdcc7e625cdbca5
+
+diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c
+--- a/src/backend/snowball/dict_snowball.c
++++ b/src/backend/snowball/dict_snowball.c
+@@ -49,6 +49,7 @@
+ #include "snowball/libstemmer/stem_UTF_8_armenian.h"
+ #include "snowball/libstemmer/stem_UTF_8_basque.h"
+ #include "snowball/libstemmer/stem_UTF_8_catalan.h"
++#include "snowball/libstemmer/stem_UTF_8_czech.h"
+ #include "snowball/libstemmer/stem_UTF_8_danish.h"
+ #include "snowball/libstemmer/stem_UTF_8_dutch.h"
+ #include "snowball/libstemmer/stem_UTF_8_english.h"
+@@ -123,6 +124,7 @@
+ 	STEMMER_MODULE(armenian, PG_UTF8, UTF_8),
+ 	STEMMER_MODULE(basque, PG_UTF8, UTF_8),
+ 	STEMMER_MODULE(catalan, PG_UTF8, UTF_8),
++	STEMMER_MODULE(czech, PG_UTF8, UTF_8),
+ 	STEMMER_MODULE(danish, PG_UTF8, UTF_8),
+ 	STEMMER_MODULE(dutch, PG_UTF8, UTF_8),
+ 	STEMMER_MODULE(english, PG_UTF8, UTF_8),
+diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile
+--- a/src/backend/snowball/Makefile
++++ b/src/backend/snowball/Makefile
+@@ -46,6 +46,7 @@
+ 	stem_UTF_8_armenian.o \
+ 	stem_UTF_8_basque.o \
+ 	stem_UTF_8_catalan.o \
++	stem_UTF_8_czech.o \
+ 	stem_UTF_8_danish.o \
+ 	stem_UTF_8_dutch.o \
+ 	stem_UTF_8_english.o \
+@@ -81,6 +82,7 @@
+ 	armenian	armenian	\
+ 	basque		basque		\
+ 	catalan		catalan		\
++	czech		czech		\
+ 	danish		danish		\
+ 	dutch		dutch		\
+ 	english		english		\
+diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_czech.c b/src/backend/snowball/libstemmer/stem_UTF_8_czech.c
+new file mode 100644
+index 000000000000..d23663fa077f
+--- /dev/null
++++ b/src/backend/snowball/libstemmer/stem_UTF_8_czech.c
+@@ -0,0 +1,894 @@
++/* This file was generated automatically by the Snowball to ISO C compiler */
++/* http://snowballstem.org/ */
++
++#include "header.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++extern int czech_UTF_8_stem(struct SN_env * z);
++#ifdef __cplusplus
++}
++#endif
++static int r_do_aggressive(struct SN_env * z);
++static int r_do_deriv_single(struct SN_env * z);
++static int r_do_derivational(struct SN_env * z);
++static int r_do_augmentative(struct SN_env * z);
++static int r_do_diminutive(struct SN_env * z);
++static int r_do_comparative(struct SN_env * z);
++static int r_do_case(struct SN_env * z);
++static int r_do_possessive(struct SN_env * z);
++static int r_mark_regions(struct SN_env * z);
++static int r_palatalise(struct SN_env * z);
++static int r_R1(struct SN_env * z);
++static int r_RV(struct SN_env * z);
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++
++extern struct SN_env * czech_UTF_8_create_env(void);
++extern void czech_UTF_8_close_env(struct SN_env * z);
++
++
++#ifdef __cplusplus
++}
++#endif
++static const symbol s_0_0[2] = { 'c', 'e' };
++static const symbol s_0_1[2] = { 'z', 'e' };
++static const symbol s_0_2[3] = { 0xC2, 0xBE, 'e' };
++static const symbol s_0_3[2] = { 'c', 'i' };
++static const symbol s_0_4[4] = { 0xC3, 0xA8, 't', 'i' };
++static const symbol s_0_5[4] = { 0xC2, 0xB9, 't', 'i' };
++static const symbol s_0_6[2] = { 'z', 'i' };
++static const symbol s_0_7[3] = { 0xC3, 0xA8, 'i' };
++static const symbol s_0_8[3] = { 0xC2, 0xBE, 'i' };
++static const symbol s_0_9[2] = { 0xC3, 0xA8 };
++static const symbol s_0_10[5] = { 0xC3, 0xA8, 't', 0xC3, 0xA9 };
++static const symbol s_0_11[5] = { 0xC2, 0xB9, 't', 0xC3, 0xA9 };
++static const symbol s_0_12[5] = { 0xC3, 0xA8, 't', 0xC3, 0xAC };
++static const symbol s_0_13[5] = { 0xC2, 0xB9, 't', 0xC3, 0xAC };
++
++static const struct among a_0[14] =
++{
++/*  0 */ { 2, s_0_0, -1, 1, 0},
++/*  1 */ { 2, s_0_1, -1, 2, 0},
++/*  2 */ { 3, s_0_2, -1, 2, 0},
++/*  3 */ { 2, s_0_3, -1, 1, 0},
++/*  4 */ { 4, s_0_4, -1, 3, 0},
++/*  5 */ { 4, s_0_5, -1, 4, 0},
++/*  6 */ { 2, s_0_6, -1, 2, 0},
++/*  7 */ { 3, s_0_7, -1, 1, 0},
++/*  8 */ { 3, s_0_8, -1, 2, 0},
++/*  9 */ { 2, s_0_9, -1, 1, 0},
++/* 10 */ { 5, s_0_10, -1, 3, 0},
++/* 11 */ { 5, s_0_11, -1, 4, 0},
++/* 12 */ { 5, s_0_12, -1, 3, 0},
++/* 13 */ { 5, s_0_13, -1, 4, 0}
++};
++
++static const symbol s_1_0[2] = { 'i', 'n' };
++static const symbol s_1_1[2] = { 'o', 'v' };
++static const symbol s_1_2[3] = { 0xC3, 0xB9, 'v' };
++
++static const struct among a_1[3] =
++{
++/*  0 */ { 2, s_1_0, -1, 2, 0},
++/*  1 */ { 2, s_1_1, -1, 1, 0},
++/*  2 */ { 3, s_1_2, -1, 1, 0}
++};
++
++static const symbol s_2_0[1] = { 'a' };
++static const symbol s_2_1[3] = { 'a', 'm', 'a' };
++static const symbol s_2_2[3] = { 'a', 't', 'a' };
++static const symbol s_2_3[1] = { 'e' };
++static const symbol s_2_4[4] = { 0xC3, 0xAC, 't', 'e' };
++static const symbol s_2_5[3] = { 'e', 'c', 'h' };
++static const symbol s_2_6[5] = { 'a', 't', 'e', 'c', 'h' };
++static const symbol s_2_7[3] = { 'i', 'c', 'h' };
++static const symbol s_2_8[4] = { 0xC3, 0xA1, 'c', 'h' };
++static const symbol s_2_9[4] = { 0xC3, 0xAD, 'c', 'h' };
++static const symbol s_2_10[4] = { 0xC3, 0xBD, 'c', 'h' };
++static const symbol s_2_11[1] = { 'i' };
++static const symbol s_2_12[2] = { 'm', 'i' };
++static const symbol s_2_13[3] = { 'a', 'm', 'i' };
++static const symbol s_2_14[3] = { 'e', 'm', 'i' };
++static const symbol s_2_15[4] = { 0xC3, 0xAC, 'm', 'i' };
++static const symbol s_2_16[4] = { 0xC3, 0xAD, 'm', 'i' };
++static const symbol s_2_17[4] = { 0xC3, 0xBD, 'm', 'i' };
++static const symbol s_2_18[4] = { 0xC3, 0xAC, 't', 'i' };
++static const symbol s_2_19[3] = { 'o', 'v', 'i' };
++static const symbol s_2_20[2] = { 'e', 'm' };
++static const symbol s_2_21[5] = { 0xC3, 0xAC, 't', 'e', 'm' };
++static const symbol s_2_22[3] = { 0xC3, 0xA1, 'm' };
++static const symbol s_2_23[3] = { 0xC3, 0xA9, 'm' };
++static const symbol s_2_24[3] = { 0xC3, 0xAD, 'm' };
++static const symbol s_2_25[5] = { 'a', 't', 0xC3, 0xB9, 'm' };
++static const symbol s_2_26[3] = { 0xC3, 0xBD, 'm' };
++static const symbol s_2_27[1] = { 'o' };
++static const symbol s_2_28[3] = { 'i', 'h', 'o' };
++static const symbol s_2_29[4] = { 0xC3, 0xA9, 'h', 'o' };
++static const symbol s_2_30[4] = { 0xC3, 0xAD, 'h', 'o' };
++static const symbol s_2_31[2] = { 'e', 's' };
++static const symbol s_2_32[2] = { 'o', 's' };
++static const symbol s_2_33[2] = { 'u', 's' };
++static const symbol s_2_34[2] = { 'a', 't' };
++static const symbol s_2_35[1] = { 'u' };
++static const symbol s_2_36[3] = { 'i', 'm', 'u' };
++static const symbol s_2_37[4] = { 0xC3, 0xA9, 'm', 'u' };
++static const symbol s_2_38[2] = { 'o', 'u' };
++static const symbol s_2_39[1] = { 'y' };
++static const symbol s_2_40[3] = { 'a', 't', 'y' };
++static const symbol s_2_41[2] = { 0xC3, 0xA1 };
++static const symbol s_2_42[2] = { 0xC3, 0xA9 };
++static const symbol s_2_43[4] = { 'o', 'v', 0xC3, 0xA9 };
++static const symbol s_2_44[2] = { 0xC3, 0xAC };
++static const symbol s_2_45[2] = { 0xC3, 0xAD };
++static const symbol s_2_46[2] = { 0xC3, 0xB9 };
++static const symbol s_2_47[2] = { 0xC3, 0xBD };
++
++static const struct among a_2[48] =
++{
++/*  0 */ { 1, s_2_0, -1, 1, 0},
++/*  1 */ { 3, s_2_1, 0, 1, 0},
++/*  2 */ { 3, s_2_2, 0, 1, 0},
++/*  3 */ { 1, s_2_3, -1, 2, 0},
++/*  4 */ { 4, s_2_4, 3, 2, 0},
++/*  5 */ { 3, s_2_5, -1, 2, 0},
++/*  6 */ { 5, s_2_6, 5, 1, 0},
++/*  7 */ { 3, s_2_7, -1, 2, 0},
++/*  8 */ { 4, s_2_8, -1, 1, 0},
++/*  9 */ { 4, s_2_9, -1, 2, 0},
++/* 10 */ { 4, s_2_10, -1, 1, 0},
++/* 11 */ { 1, s_2_11, -1, 2, 0},
++/* 12 */ { 2, s_2_12, 11, 1, 0},
++/* 13 */ { 3, s_2_13, 12, 1, 0},
++/* 14 */ { 3, s_2_14, 12, 2, 0},
++/* 15 */ { 4, s_2_15, 12, 2, 0},
++/* 16 */ { 4, s_2_16, 12, 2, 0},
++/* 17 */ { 4, s_2_17, 12, 1, 0},
++/* 18 */ { 4, s_2_18, 11, 2, 0},
++/* 19 */ { 3, s_2_19, 11, 1, 0},
++/* 20 */ { 2, s_2_20, -1, 3, 0},
++/* 21 */ { 5, s_2_21, 20, 1, 0},
++/* 22 */ { 3, s_2_22, -1, 1, 0},
++/* 23 */ { 3, s_2_23, -1, 2, 0},
++/* 24 */ { 3, s_2_24, -1, 2, 0},
++/* 25 */ { 5, s_2_25, -1, 1, 0},
++/* 26 */ { 3, s_2_26, -1, 1, 0},
++/* 27 */ { 1, s_2_27, -1, 1, 0},
++/* 28 */ { 3, s_2_28, 27, 2, 0},
++/* 29 */ { 4, s_2_29, 27, 2, 0},
++/* 30 */ { 4, s_2_30, 27, 2, 0},
++/* 31 */ { 2, s_2_31, -1, 2, 0},
++/* 32 */ { 2, s_2_32, -1, 1, 0},
++/* 33 */ { 2, s_2_33, -1, 1, 0},
++/* 34 */ { 2, s_2_34, -1, 1, 0},
++/* 35 */ { 1, s_2_35, -1, 1, 0},
++/* 36 */ { 3, s_2_36, 35, 2, 0},
++/* 37 */ { 4, s_2_37, 35, 2, 0},
++/* 38 */ { 2, s_2_38, 35, 1, 0},
++/* 39 */ { 1, s_2_39, -1, 1, 0},
++/* 40 */ { 3, s_2_40, 39, 1, 0},
++/* 41 */ { 2, s_2_41, -1, 1, 0},
++/* 42 */ { 2, s_2_42, -1, 1, 0},
++/* 43 */ { 4, s_2_43, 42, 1, 0},
++/* 44 */ { 2, s_2_44, -1, 2, 0},
++/* 45 */ { 2, s_2_45, -1, 2, 0},
++/* 46 */ { 2, s_2_46, -1, 1, 0},
++/* 47 */ { 2, s_2_47, -1, 1, 0}
++};
++
++static const symbol s_3_0[2] = { 'o', 'b' };
++static const symbol s_3_1[3] = { 'i', 't', 'b' };
++static const symbol s_3_2[2] = { 'e', 'c' };
++static const symbol s_3_3[4] = { 'i', 'n', 'e', 'c' };
++static const symbol s_3_4[6] = { 'o', 'b', 'i', 'n', 'e', 'c' };
++static const symbol s_3_5[4] = { 'o', 'v', 'e', 'c' };
++static const symbol s_3_6[2] = { 'i', 'c' };
++static const symbol s_3_7[4] = { 'e', 'n', 'i', 'c' };
++static const symbol s_3_8[3] = { 'o', 'c', 'h' };
++static const symbol s_3_9[5] = { 0xC3, 0xA1, 's', 'e', 'k' };
++static const symbol s_3_10[2] = { 'n', 'k' };
++static const symbol s_3_11[3] = { 'i', 's', 'k' };
++static const symbol s_3_12[5] = { 'o', 'v', 'i', 's', 'k' };
++static const symbol s_3_13[2] = { 't', 'k' };
++static const symbol s_3_14[2] = { 'v', 'k' };
++static const symbol s_3_15[3] = { 0xC3, 0xA8, 'k' };
++static const symbol s_3_16[4] = { 'n', 0xC3, 0xAD, 'k' };
++static const symbol s_3_17[6] = { 'o', 'v', 'n', 0xC3, 0xAD, 'k' };
++static const symbol s_3_18[5] = { 'o', 'v', 0xC3, 0xAD, 'k' };
++static const symbol s_3_19[4] = { 'i', 0xC2, 0xB9, 'k' };
++static const symbol s_3_20[4] = { 'u', 0xC2, 0xB9, 'k' };
++static const symbol s_3_21[2] = { 'd', 'l' };
++static const symbol s_3_22[4] = { 'i', 't', 'e', 'l' };
++static const symbol s_3_23[2] = { 'u', 'l' };
++static const symbol s_3_24[2] = { 'a', 'n' };
++static const symbol s_3_25[4] = { 0xC3, 0xA8, 'a', 'n' };
++static const symbol s_3_26[2] = { 'e', 'n' };
++static const symbol s_3_27[2] = { 'i', 'n' };
++static const symbol s_3_28[5] = { 0xC2, 0xB9, 't', 'i', 'n' };
++static const symbol s_3_29[4] = { 'o', 'v', 'i', 'n' };
++static const symbol s_3_30[4] = { 't', 'e', 'l', 'n' };
++static const symbol s_3_31[4] = { 0xC3, 0xA1, 'r', 'n' };
++static const symbol s_3_32[4] = { 0xC3, 0xAD, 'r', 'n' };
++static const symbol s_3_33[3] = { 'o', 'u', 'n' };
++static const symbol s_3_34[4] = { 'l', 'o', 'u', 'n' };
++static const symbol s_3_35[3] = { 'o', 'v', 'n' };
++static const symbol s_3_36[2] = { 'y', 'n' };
++static const symbol s_3_37[3] = { 'k', 'y', 'n' };
++static const symbol s_3_38[3] = { 0xC3, 0xA1, 'n' };
++static const symbol s_3_39[4] = { 'i', 0xC3, 0xA1, 'n' };
++static const symbol s_3_40[3] = { 0xC3, 0xA8, 'n' };
++static const symbol s_3_41[3] = { 0xC3, 0xAC, 'n' };
++static const symbol s_3_42[3] = { 0xC3, 0xAD, 'n' };
++static const symbol s_3_43[2] = { 'a', 's' };
++static const symbol s_3_44[2] = { 'i', 't' };
++static const symbol s_3_45[2] = { 'o', 't' };
++static const symbol s_3_46[3] = { 'i', 's', 't' };
++static const symbol s_3_47[3] = { 'o', 's', 't' };
++static const symbol s_3_48[4] = { 'n', 'o', 's', 't' };
++static const symbol s_3_49[3] = { 'o', 'u', 't' };
++static const symbol s_3_50[6] = { 'o', 'v', 'i', 0xC2, 0xB9, 't' };
++static const symbol s_3_51[2] = { 'i', 'v' };
++static const symbol s_3_52[2] = { 'o', 'v' };
++static const symbol s_3_53[2] = { 't', 'v' };
++static const symbol s_3_54[3] = { 'c', 't', 'v' };
++static const symbol s_3_55[3] = { 's', 't', 'v' };
++static const symbol s_3_56[5] = { 'o', 'v', 's', 't', 'v' };
++static const symbol s_3_57[4] = { 'o', 'v', 't', 'v' };
++static const symbol s_3_58[3] = { 'a', 0xC3, 0xA8 };
++static const symbol s_3_59[4] = { 0xC3, 0xA1, 0xC3, 0xA8 };
++static const symbol s_3_60[3] = { 'o', 0xC3, 0xB2 };
++static const symbol s_3_61[4] = { 0xC3, 0xA1, 0xC3, 0xB8 };
++static const symbol s_3_62[5] = { 'k', 0xC3, 0xA1, 0xC3, 0xB8 };
++static const symbol s_3_63[7] = { 'i', 'o', 'n', 0xC3, 0xA1, 0xC3, 0xB8 };
++static const symbol s_3_64[4] = { 0xC3, 0xA9, 0xC3, 0xB8 };
++static const symbol s_3_65[5] = { 'n', 0xC3, 0xA9, 0xC3, 0xB8 };
++static const symbol s_3_66[4] = { 0xC3, 0xAD, 0xC3, 0xB8 };
++static const symbol s_3_67[4] = { 'o', 'u', 0xC2, 0xB9 };
++
++static const struct among a_3[68] =
++{
++/*  0 */ { 2, s_3_0, -1, 1, 0},
++/*  1 */ { 3, s_3_1, -1, 2, 0},
++/*  2 */ { 2, s_3_2, -1, 3, 0},
++/*  3 */ { 4, s_3_3, 2, 2, 0},
++/*  4 */ { 6, s_3_4, 3, 1, 0},
++/*  5 */ { 4, s_3_5, 2, 1, 0},
++/*  6 */ { 2, s_3_6, -1, 2, 0},
++/*  7 */ { 4, s_3_7, 6, 3, 0},
++/*  8 */ { 3, s_3_8, -1, 1, 0},
++/*  9 */ { 5, s_3_9, -1, 1, 0},
++/* 10 */ { 2, s_3_10, -1, 1, 0},
++/* 11 */ { 3, s_3_11, -1, 2, 0},
++/* 12 */ { 5, s_3_12, 11, 1, 0},
++/* 13 */ { 2, s_3_13, -1, 1, 0},
++/* 14 */ { 2, s_3_14, -1, 1, 0},
++/* 15 */ { 3, s_3_15, -1, 1, 0},
++/* 16 */ { 4, s_3_16, -1, 1, 0},
++/* 17 */ { 6, s_3_17, 16, 1, 0},
++/* 18 */ { 5, s_3_18, -1, 1, 0},
++/* 19 */ { 4, s_3_19, -1, 2, 0},
++/* 20 */ { 4, s_3_20, -1, 1, 0},
++/* 21 */ { 2, s_3_21, -1, 1, 0},
++/* 22 */ { 4, s_3_22, -1, 2, 0},
++/* 23 */ { 2, s_3_23, -1, 1, 0},
++/* 24 */ { 2, s_3_24, -1, 1, 0},
++/* 25 */ { 4, s_3_25, 24, 1, 0},
++/* 26 */ { 2, s_3_26, -1, 3, 0},
++/* 27 */ { 2, s_3_27, -1, 2, 0},
++/* 28 */ { 5, s_3_28, 27, 1, 0},
++/* 29 */ { 4, s_3_29, 27, 1, 0},
++/* 30 */ { 4, s_3_30, -1, 1, 0},
++/* 31 */ { 4, s_3_31, -1, 1, 0},
++/* 32 */ { 4, s_3_32, -1, 6, 0},
++/* 33 */ { 3, s_3_33, -1, 1, 0},
++/* 34 */ { 4, s_3_34, 33, 1, 0},
++/* 35 */ { 3, s_3_35, -1, 1, 0},
++/* 36 */ { 2, s_3_36, -1, 1, 0},
++/* 37 */ { 3, s_3_37, 36, 1, 0},
++/* 38 */ { 3, s_3_38, -1, 1, 0},
++/* 39 */ { 4, s_3_39, 38, 2, 0},
++/* 40 */ { 3, s_3_40, -1, 1, 0},
++/* 41 */ { 3, s_3_41, -1, 5, 0},
++/* 42 */ { 3, s_3_42, -1, 6, 0},
++/* 43 */ { 2, s_3_43, -1, 1, 0},
++/* 44 */ { 2, s_3_44, -1, 2, 0},
++/* 45 */ { 2, s_3_45, -1, 1, 0},
++/* 46 */ { 3, s_3_46, -1, 2, 0},
++/* 47 */ { 3, s_3_47, -1, 1, 0},
++/* 48 */ { 4, s_3_48, 47, 1, 0},
++/* 49 */ { 3, s_3_49, -1, 1, 0},
++/* 50 */ { 6, s_3_50, -1, 1, 0},
++/* 51 */ { 2, s_3_51, -1, 2, 0},
++/* 52 */ { 2, s_3_52, -1, 1, 0},
++/* 53 */ { 2, s_3_53, -1, 1, 0},
++/* 54 */ { 3, s_3_54, 53, 1, 0},
++/* 55 */ { 3, s_3_55, 53, 1, 0},
++/* 56 */ { 5, s_3_56, 55, 1, 0},
++/* 57 */ { 4, s_3_57, 53, 1, 0},
++/* 58 */ { 3, s_3_58, -1, 1, 0},
++/* 59 */ { 4, s_3_59, -1, 1, 0},
++/* 60 */ { 3, s_3_60, -1, 1, 0},
++/* 61 */ { 4, s_3_61, -1, 1, 0},
++/* 62 */ { 5, s_3_62, 61, 1, 0},
++/* 63 */ { 7, s_3_63, 61, 2, 0},
++/* 64 */ { 4, s_3_64, -1, 4, 0},
++/* 65 */ { 5, s_3_65, 64, 1, 0},
++/* 66 */ { 4, s_3_66, -1, 6, 0},
++/* 67 */ { 4, s_3_67, -1, 1, 0}
++};
++
++static const symbol s_4_0[1] = { 'c' };
++static const symbol s_4_1[1] = { 'k' };
++static const symbol s_4_2[1] = { 'l' };
++static const symbol s_4_3[1] = { 'n' };
++static const symbol s_4_4[1] = { 't' };
++static const symbol s_4_5[2] = { 0xC3, 0xA8 };
++
++static const struct among a_4[6] =
++{
++/*  0 */ { 1, s_4_0, -1, 1, 0},
++/*  1 */ { 1, s_4_1, -1, 1, 0},
++/*  2 */ { 1, s_4_2, -1, 1, 0},
++/*  3 */ { 1, s_4_3, -1, 1, 0},
++/*  4 */ { 1, s_4_4, -1, 1, 0},
++/*  5 */ { 2, s_4_5, -1, 1, 0}
++};
++
++static const symbol s_5_0[3] = { 'i', 's', 'k' };
++static const symbol s_5_1[3] = { 0xC3, 0xA1, 'k' };
++static const symbol s_5_2[3] = { 'i', 'z', 'n' };
++static const symbol s_5_3[4] = { 'a', 'j', 'z', 'n' };
++
++static const struct among a_5[4] =
++{
++/*  0 */ { 3, s_5_0, -1, 2, 0},
++/*  1 */ { 3, s_5_1, -1, 1, 0},
++/*  2 */ { 3, s_5_2, -1, 2, 0},
++/*  3 */ { 4, s_5_3, -1, 1, 0}
++};
++
++static const symbol s_6_0[1] = { 'k' };
++static const symbol s_6_1[2] = { 'a', 'k' };
++static const symbol s_6_2[2] = { 'e', 'k' };
++static const symbol s_6_3[4] = { 'a', 'n', 'e', 'k' };
++static const symbol s_6_4[4] = { 'e', 'n', 'e', 'k' };
++static const symbol s_6_5[4] = { 'i', 'n', 'e', 'k' };
++static const symbol s_6_6[4] = { 'o', 'n', 'e', 'k' };
++static const symbol s_6_7[4] = { 'u', 'n', 'e', 'k' };
++static const symbol s_6_8[5] = { 0xC3, 0xA1, 'n', 'e', 'k' };
++static const symbol s_6_9[5] = { 'a', 0xC3, 0xA8, 'e', 'k' };
++static const symbol s_6_10[5] = { 'e', 0xC3, 0xA8, 'e', 'k' };
++static const symbol s_6_11[5] = { 'i', 0xC3, 0xA8, 'e', 'k' };
++static const symbol s_6_12[5] = { 'o', 0xC3, 0xA8, 'e', 'k' };
++static const symbol s_6_13[5] = { 'u', 0xC3, 0xA8, 'e', 'k' };
++static const symbol s_6_14[6] = { 0xC3, 0xA1, 0xC3, 0xA8, 'e', 'k' };
++static const symbol s_6_15[6] = { 0xC3, 0xA9, 0xC3, 0xA8, 'e', 'k' };
++static const symbol s_6_16[6] = { 0xC3, 0xAD, 0xC3, 0xA8, 'e', 'k' };
++static const symbol s_6_17[6] = { 'o', 'u', 0xC2, 0xB9, 'e', 'k' };
++static const symbol s_6_18[2] = { 'i', 'k' };
++static const symbol s_6_19[3] = { 'a', 'n', 'k' };
++static const symbol s_6_20[3] = { 'e', 'n', 'k' };
++static const symbol s_6_21[3] = { 'i', 'n', 'k' };
++static const symbol s_6_22[3] = { 'o', 'n', 'k' };
++static const symbol s_6_23[3] = { 'u', 'n', 'k' };
++static const symbol s_6_24[4] = { 0xC3, 0xA1, 'n', 'k' };
++static const symbol s_6_25[4] = { 0xC3, 0xA9, 'n', 'k' };
++static const symbol s_6_26[4] = { 0xC3, 0xAD, 'n', 'k' };
++static const symbol s_6_27[2] = { 'o', 'k' };
++static const symbol s_6_28[4] = { 0xC3, 0xA1, 't', 'k' };
++static const symbol s_6_29[2] = { 'u', 'k' };
++static const symbol s_6_30[3] = { 0xC3, 0xA1, 'k' };
++static const symbol s_6_31[4] = { 'a', 0xC3, 0xA8, 'k' };
++static const symbol s_6_32[4] = { 'e', 0xC3, 0xA8, 'k' };
++static const symbol s_6_33[4] = { 'i', 0xC3, 0xA8, 'k' };
++static const symbol s_6_34[4] = { 'o', 0xC3, 0xA8, 'k' };
++static const symbol s_6_35[4] = { 'u', 0xC3, 0xA8, 'k' };
++static const symbol s_6_36[5] = { 0xC3, 0xA1, 0xC3, 0xA8, 'k' };
++static const symbol s_6_37[5] = { 0xC3, 0xA9, 0xC3, 0xA8, 'k' };
++static const symbol s_6_38[5] = { 0xC3, 0xAD, 0xC3, 0xA8, 'k' };
++static const symbol s_6_39[3] = { 0xC3, 0xA9, 'k' };
++static const symbol s_6_40[3] = { 0xC3, 0xAD, 'k' };
++static const symbol s_6_41[4] = { 'u', 0xC2, 0xB9, 'k' };
++
++static const struct among a_6[42] =
++{
++/*  0 */ { 1, s_6_0, -1, 1, 0},
++/*  1 */ { 2, s_6_1, 0, 7, 0},
++/*  2 */ { 2, s_6_2, 0, 2, 0},
++/*  3 */ { 4, s_6_3, 2, 1, 0},
++/*  4 */ { 4, s_6_4, 2, 2, 0},
++/*  5 */ { 4, s_6_5, 2, 4, 0},
++/*  6 */ { 4, s_6_6, 2, 1, 0},
++/*  7 */ { 4, s_6_7, 2, 1, 0},
++/*  8 */ { 5, s_6_8, 2, 1, 0},
++/*  9 */ { 5, s_6_9, 2, 1, 0},
++/* 10 */ { 5, s_6_10, 2, 2, 0},
++/* 11 */ { 5, s_6_11, 2, 4, 0},
++/* 12 */ { 5, s_6_12, 2, 1, 0},
++/* 13 */ { 5, s_6_13, 2, 1, 0},
++/* 14 */ { 6, s_6_14, 2, 1, 0},
++/* 15 */ { 6, s_6_15, 2, 3, 0},
++/* 16 */ { 6, s_6_16, 2, 5, 0},
++/* 17 */ { 6, s_6_17, 2, 1, 0},
++/* 18 */ { 2, s_6_18, 0, 4, 0},
++/* 19 */ { 3, s_6_19, 0, 1, 0},
++/* 20 */ { 3, s_6_20, 0, 1, 0},
++/* 21 */ { 3, s_6_21, 0, 1, 0},
++/* 22 */ { 3, s_6_22, 0, 1, 0},
++/* 23 */ { 3, s_6_23, 0, 1, 0},
++/* 24 */ { 4, s_6_24, 0, 1, 0},
++/* 25 */ { 4, s_6_25, 0, 1, 0},
++/* 26 */ { 4, s_6_26, 0, 1, 0},
++/* 27 */ { 2, s_6_27, 0, 8, 0},
++/* 28 */ { 4, s_6_28, 0, 1, 0},
++/* 29 */ { 2, s_6_29, 0, 9, 0},
++/* 30 */ { 3, s_6_30, 0, 6, 0},
++/* 31 */ { 4, s_6_31, 0, 1, 0},
++/* 32 */ { 4, s_6_32, 0, 1, 0},
++/* 33 */ { 4, s_6_33, 0, 1, 0},
++/* 34 */ { 4, s_6_34, 0, 1, 0},
++/* 35 */ { 4, s_6_35, 0, 1, 0},
++/* 36 */ { 5, s_6_36, 0, 1, 0},
++/* 37 */ { 5, s_6_37, 0, 1, 0},
++/* 38 */ { 5, s_6_38, 0, 1, 0},
++/* 39 */ { 3, s_6_39, 0, 3, 0},
++/* 40 */ { 3, s_6_40, 0, 5, 0},
++/* 41 */ { 4, s_6_41, 0, 1, 0}
++};
++
++static const symbol s_7_0[4] = { 'e', 'j', 0xC2, 0xB9 };
++static const symbol s_7_1[5] = { 0xC3, 0xAC, 'j', 0xC2, 0xB9 };
++
++static const struct among a_7[2] =
++{
++/*  0 */ { 4, s_7_0, -1, 2, 0},
++/*  1 */ { 5, s_7_1, -1, 1, 0}
++};
++
++static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 25, 4, 19 };
++
++static const symbol s_0[] = { 'k' };
++static const symbol s_1[] = { 'h' };
++static const symbol s_2[] = { 'c', 'k' };
++static const symbol s_3[] = { 's', 'k' };
++static const symbol s_4[] = { 'e' };
++static const symbol s_5[] = { 'i' };
++static const symbol s_6[] = { 'e' };
++static const symbol s_7[] = { 0xC3, 0xA9 };
++static const symbol s_8[] = { 0xC3, 0xAC };
++static const symbol s_9[] = { 0xC3, 0xAD };
++static const symbol s_10[] = { 'i' };
++static const symbol s_11[] = { 'e' };
++static const symbol s_12[] = { 0xC3, 0xA9 };
++static const symbol s_13[] = { 'i' };
++static const symbol s_14[] = { 0xC3, 0xAD };
++static const symbol s_15[] = { 0xC3, 0xA1 };
++static const symbol s_16[] = { 'a' };
++static const symbol s_17[] = { 'o' };
++static const symbol s_18[] = { 'u' };
++static const symbol s_19[] = { 0xC3, 0xAC };
++static const symbol s_20[] = { 'e' };
++
++static int r_mark_regions(struct SN_env * z) { /* forwardmode */
++    z->I[0] = z->l; /* $pV = <integer expression>, line 45 */
++    z->I[1] = z->l; /* $p1 = <integer expression>, line 46 */
++    {   int c1 = z->c; /* do, line 48 */
++        {    /* gopast */ /* non v, line 49 */
++            int ret = in_grouping_U(z, g_v, 97, 253, 1);
++            if (ret < 0) goto lab0;
++            z->c += ret;
++        }
++        z->I[0] = z->c; /* setmark pV, line 49 */
++        {    /* gopast */ /* non v, line 50 */
++            int ret = in_grouping_U(z, g_v, 97, 253, 1);
++            if (ret < 0) goto lab0;
++            z->c += ret;
++        }
++        {    /* gopast */ /* grouping v, line 50 */
++            int ret = out_grouping_U(z, g_v, 97, 253, 1);
++            if (ret < 0) goto lab0;
++            z->c += ret;
++        }
++        z->I[1] = z->c; /* setmark p1, line 50 */
++    lab0:
++        z->c = c1;
++    }
++    return 1;
++}
++
++static int r_RV(struct SN_env * z) { /* backwardmode */
++    if (!(z->I[0] <= z->c)) return 0; /* $pV <= <integer expression>, line 56 */
++    return 1;
++}
++
++static int r_R1(struct SN_env * z) { /* backwardmode */
++    if (!(z->I[1] <= z->c)) return 0; /* $p1 <= <integer expression>, line 57 */
++    return 1;
++}
++
++static int r_palatalise(struct SN_env * z) { /* backwardmode */
++    int among_var;
++    z->ket = z->c; /* [, line 60 */
++    among_var = find_among_b(z, a_0, 14); /* substring, line 60 */
++    if (!(among_var)) return 0;
++    z->bra = z->c; /* ], line 60 */
++    {   int ret = r_RV(z); /* call RV, line 60 */
++        if (ret <= 0) return ret;
++    }
++    switch (among_var) { /* among, line 60 */
++        case 0: return 0;
++        case 1:
++            {   int ret = slice_from_s(z, 1, s_0); /* <-, line 62 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 2:
++            {   int ret = slice_from_s(z, 1, s_1); /* <-, line 64 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 3:
++            {   int ret = slice_from_s(z, 2, s_2); /* <-, line 66 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 4:
++            {   int ret = slice_from_s(z, 2, s_3); /* <-, line 68 */
++                if (ret < 0) return ret;
++            }
++            break;
++    }
++    return 1;
++}
++
++static int r_do_possessive(struct SN_env * z) { /* backwardmode */
++    int among_var;
++    z->ket = z->c; /* [, line 73 */
++    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 110 && z->p[z->c - 1] != 118)) return 0; /* substring, line 73 */
++    among_var = find_among_b(z, a_1, 3);
++    if (!(among_var)) return 0;
++    z->bra = z->c; /* ], line 73 */
++    {   int ret = r_RV(z); /* call RV, line 73 */
++        if (ret <= 0) return ret;
++    }
++    switch (among_var) { /* among, line 73 */
++        case 0: return 0;
++        case 1:
++            {   int ret = slice_del(z); /* delete, line 75 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 2:
++            {   int ret = slice_del(z); /* delete, line 78 */
++                if (ret < 0) return ret;
++            }
++            {   int m1 = z->l - z->c; (void)m1; /* try, line 79 */
++                {   int ret = r_palatalise(z); /* call palatalise, line 79 */
++                    if (ret == 0) { z->c = z->l - m1; goto lab0; }
++                    if (ret < 0) return ret;
++                }
++            lab0:
++                ;
++            }
++            break;
++    }
++    return 1;
++}
++
++static int r_do_case(struct SN_env * z) { /* backwardmode */
++    int among_var;
++    z->ket = z->c; /* [, line 85 */
++    among_var = find_among_b(z, a_2, 48); /* substring, line 85 */
++    if (!(among_var)) return 0;
++    z->bra = z->c; /* ], line 85 */
++    switch (among_var) { /* among, line 85 */
++        case 0: return 0;
++        case 1:
++            {   int ret = slice_del(z); /* delete, line 92 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 2:
++            {   int ret = slice_del(z); /* delete, line 99 */
++                if (ret < 0) return ret;
++            }
++            {   int m1 = z->l - z->c; (void)m1; /* try, line 100 */
++                {   int ret = r_palatalise(z); /* call palatalise, line 100 */
++                    if (ret == 0) { z->c = z->l - m1; goto lab0; }
++                    if (ret < 0) return ret;
++                }
++            lab0:
++                ;
++            }
++            break;
++        case 3:
++            {   int ret = slice_from_s(z, 1, s_4); /* <-, line 104 */
++                if (ret < 0) return ret;
++            }
++            {   int m2 = z->l - z->c; (void)m2; /* try, line 105 */
++                {   int ret = r_palatalise(z); /* call palatalise, line 105 */
++                    if (ret == 0) { z->c = z->l - m2; goto lab1; }
++                    if (ret < 0) return ret;
++                }
++            lab1:
++                ;
++            }
++            break;
++    }
++    return 1;
++}
++
++static int r_do_derivational(struct SN_env * z) { /* backwardmode */
++    int among_var;
++    z->ket = z->c; /* [, line 111 */
++    among_var = find_among_b(z, a_3, 68); /* substring, line 111 */
++    if (!(among_var)) return 0;
++    z->bra = z->c; /* ], line 111 */
++    {   int ret = r_R1(z); /* call R1, line 111 */
++        if (ret <= 0) return ret;
++    }
++    switch (among_var) { /* among, line 111 */
++        case 0: return 0;
++        case 1:
++            {   int ret = slice_del(z); /* delete, line 120 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 2:
++            {   int ret = slice_from_s(z, 1, s_5); /* <-, line 126 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 127 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 3:
++            {   int ret = slice_from_s(z, 1, s_6); /* <-, line 131 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 132 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 4:
++            {   int ret = slice_from_s(z, 2, s_7); /* <-, line 136 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 137 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 5:
++            {   int ret = slice_from_s(z, 2, s_8); /* <-, line 141 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 142 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 6:
++            {   int ret = slice_from_s(z, 2, s_9); /* <-, line 147 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 148 */
++                if (ret <= 0) return ret;
++            }
++            break;
++    }
++    return 1;
++}
++
++static int r_do_deriv_single(struct SN_env * z) { /* backwardmode */
++    int among_var;
++    z->ket = z->c; /* [, line 153 */
++    among_var = find_among_b(z, a_4, 6); /* substring, line 153 */
++    if (!(among_var)) return 0;
++    z->bra = z->c; /* ], line 153 */
++    switch (among_var) { /* among, line 153 */
++        case 0: return 0;
++        case 1:
++            {   int ret = slice_del(z); /* delete, line 155 */
++                if (ret < 0) return ret;
++            }
++            break;
++    }
++    return 1;
++}
++
++static int r_do_augmentative(struct SN_env * z) { /* backwardmode */
++    int among_var;
++    z->ket = z->c; /* [, line 161 */
++    if (z->c - 2 <= z->lb || (z->p[z->c - 1] != 107 && z->p[z->c - 1] != 110)) return 0; /* substring, line 161 */
++    among_var = find_among_b(z, a_5, 4);
++    if (!(among_var)) return 0;
++    z->bra = z->c; /* ], line 161 */
++    switch (among_var) { /* among, line 161 */
++        case 0: return 0;
++        case 1:
++            {   int ret = slice_del(z); /* delete, line 163 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 2:
++            {   int ret = slice_from_s(z, 1, s_10); /* <-, line 166 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 167 */
++                if (ret <= 0) return ret;
++            }
++            break;
++    }
++    return 1;
++}
++
++static int r_do_diminutive(struct SN_env * z) { /* backwardmode */
++    int among_var;
++    z->ket = z->c; /* [, line 173 */
++    if (z->c <= z->lb || z->p[z->c - 1] != 107) return 0; /* substring, line 173 */
++    among_var = find_among_b(z, a_6, 42);
++    if (!(among_var)) return 0;
++    z->bra = z->c; /* ], line 173 */
++    switch (among_var) { /* among, line 173 */
++        case 0: return 0;
++        case 1:
++            {   int ret = slice_del(z); /* delete, line 180 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 2:
++            {   int ret = slice_from_s(z, 1, s_11); /* <-, line 183 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 184 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 3:
++            {   int ret = slice_from_s(z, 2, s_12); /* <-, line 188 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 189 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 4:
++            {   int ret = slice_from_s(z, 1, s_13); /* <-, line 193 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 194 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 5:
++            {   int ret = slice_from_s(z, 2, s_14); /* <-, line 198 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 199 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 6:
++            {   int ret = slice_from_s(z, 2, s_15); /* <-, line 202 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 7:
++            {   int ret = slice_from_s(z, 1, s_16); /* <-, line 204 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 8:
++            {   int ret = slice_from_s(z, 1, s_17); /* <-, line 206 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 9:
++            {   int ret = slice_from_s(z, 1, s_18); /* <-, line 208 */
++                if (ret < 0) return ret;
++            }
++            break;
++    }
++    return 1;
++}
++
++static int r_do_comparative(struct SN_env * z) { /* backwardmode */
++    int among_var;
++    z->ket = z->c; /* [, line 213 */
++    if (z->c - 3 <= z->lb || z->p[z->c - 1] != 185) return 0; /* substring, line 213 */
++    among_var = find_among_b(z, a_7, 2);
++    if (!(among_var)) return 0;
++    z->bra = z->c; /* ], line 213 */
++    switch (among_var) { /* among, line 213 */
++        case 0: return 0;
++        case 1:
++            {   int ret = slice_from_s(z, 2, s_19); /* <-, line 216 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 217 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 2:
++            {   int ret = slice_from_s(z, 1, s_20); /* <-, line 221 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 222 */
++                if (ret <= 0) return ret;
++            }
++            break;
++    }
++    return 1;
++}
++
++static int r_do_aggressive(struct SN_env * z) { /* backwardmode */
++    {   int m1 = z->l - z->c; (void)m1; /* do, line 228 */
++        {   int ret = r_do_comparative(z); /* call do_comparative, line 228 */
++            if (ret == 0) goto lab0;
++            if (ret < 0) return ret;
++        }
++    lab0:
++        z->c = z->l - m1;
++    }
++    {   int m2 = z->l - z->c; (void)m2; /* do, line 229 */
++        {   int ret = r_do_diminutive(z); /* call do_diminutive, line 229 */
++            if (ret == 0) goto lab1;
++            if (ret < 0) return ret;
++        }
++    lab1:
++        z->c = z->l - m2;
++    }
++    {   int m3 = z->l - z->c; (void)m3; /* do, line 230 */
++        {   int ret = r_do_augmentative(z); /* call do_augmentative, line 230 */
++            if (ret == 0) goto lab2;
++            if (ret < 0) return ret;
++        }
++    lab2:
++        z->c = z->l - m3;
++    }
++    {   int m4 = z->l - z->c; (void)m4; /* or, line 231 */
++        {   int ret = r_do_derivational(z); /* call do_derivational, line 231 */
++            if (ret == 0) goto lab4;
++            if (ret < 0) return ret;
++        }
++        goto lab3;
++    lab4:
++        z->c = z->l - m4;
++        {   int ret = r_do_deriv_single(z); /* call do_deriv_single, line 231 */
++            if (ret <= 0) return ret;
++        }
++    }
++lab3:
++    return 1;
++}
++
++extern int czech_UTF_8_stem(struct SN_env * z) { /* forwardmode */
++    {   int c1 = z->c; /* do, line 236 */
++        {   int ret = r_mark_regions(z); /* call mark_regions, line 236 */
++            if (ret == 0) goto lab0;
++            if (ret < 0) return ret;
++        }
++    lab0:
++        z->c = c1;
++    }
++    z->lb = z->c; z->c = z->l; /* backwards, line 237 */
++
++    {   int ret = r_do_case(z); /* call do_case, line 238 */
++        if (ret <= 0) return ret;
++    }
++    {   int ret = r_do_possessive(z); /* call do_possessive, line 239 */
++        if (ret <= 0) return ret;
++    }
++    {   int ret = r_do_aggressive(z); /* call do_aggressive, line 242 */
++        if (ret <= 0) return ret;
++    }
++    z->c = z->lb;
++    return 1;
++}
++
++extern struct SN_env * czech_UTF_8_create_env(void) { return SN_create_env(0, 2); }
++
++extern void czech_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); }
++
+diff --git a/src/include/snowball/libstemmer/stem_UTF_8_czech.h b/src/include/snowball/libstemmer/stem_UTF_8_czech.h
+new file mode 100644
+--- /dev/null
++++ b/src/include/snowball/libstemmer/stem_UTF_8_czech.h
+@@ -0,0 +1,16 @@
++/* This file was generated automatically by the Snowball to ISO C compiler */
++/* http://snowballstem.org/ */
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++extern struct SN_env * czech_UTF_8_create_env(void);
++extern void czech_UTF_8_close_env(struct SN_env * z);
++
++extern int czech_UTF_8_stem(struct SN_env * z);
++
++#ifdef __cplusplus
++}
++#endif
++
+diff --git a/src/backend/snowball/stopwords/czech.stop b/src/backend/snowball/stopwords/czech.stop
+new file mode 100644
+--- /dev/null
++++ b/src/backend/snowball/stopwords/czech.stop
+@@ -0,0 +1,86 @@
++a
++ale
++ano
++atd
++by
++být
++co
++čí
++čím
++do
++i
++já
++jak
++je
++jeho
++jemu
++její
++jejich
++ji
++jí
++jim
++již
++jsem
++jsi
++jsou
++k
++kde
++kdo
++kdy
++který
++mě
++mém
++mne
++mně
++můj
++my
++na
++nad
++nám
++náš
++ne
++o
++on
++ona
++oni
++ono
++pak
++po
++pod
++pro
++proto
++proč
++před
++s
++se
++sem
++si
++svůj
++ta
++tady
++tak
++také
++tam
++tato
++teď
++ten
++ti
++tím
++to
++tobě
++tomu
++tvůj
++ty
++tyto
++u
++už
++v
++ve
++vám
++váš
++viz
++vy
++z
++za
++ze
++že
diff --git a/main/postgresql15/disable-html-docs.patch b/main/postgresql15/disable-html-docs.patch
new file mode 100644
index 00000000000..6fbf90373c9
--- /dev/null
+++ b/main/postgresql15/disable-html-docs.patch
@@ -0,0 +1,38 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Thu, 28 Oct 2021 01:27:53 +0200
+Subject: [PATCH] Disable HTML docs, install only man pages
+
+HTML docs are big and they are available only anyway.
+
+--- a/doc/src/sgml/Makefile
++++ b/doc/src/sgml/Makefile
+@@ -26,9 +26,9 @@
+ include $(top_builddir)/src/Makefile.global
+ 
+ 
+-all: html man
++all: man
+ 
+-distprep: html distprep-man
++distprep: distprep-man
+ 
+ 
+ ifndef DBTOEPUB
+@@ -220,14 +220,14 @@
+ ## Install
+ ##
+ 
+-install: install-html install-man
++install: install-man
+ 
+ installdirs:
+-	$(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
++	$(MKDIR_P) $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
+ 
+ # If the install used a man directory shared with other applications, this will remove all files.
+ uninstall:
+-	rm -f '$(DESTDIR)$(htmldir)/html/'* $(addprefix  '$(DESTDIR)$(mandir)'/man, 1/* 3/* $(sqlmansectnum)/*)
++	rm -f $(addprefix  '$(DESTDIR)$(mandir)'/man, 1/* 3/* $(sqlmansectnum)/*)
+ 
+ 
+ ## Install html
diff --git a/main/postgresql15/dont-use-locale-a-on-musl.patch b/main/postgresql15/dont-use-locale-a-on-musl.patch
new file mode 100644
index 00000000000..ce61856d4e2
--- /dev/null
+++ b/main/postgresql15/dont-use-locale-a-on-musl.patch
@@ -0,0 +1,31 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Wed, 03 Aug 2022 20:40:33 +0200
+Subject: [PATCH] Don't generate collations based on locale(1)
+
+When the PostgreSQL cluster is initialized (using initdb(1)) or the
+DB administrator calls `pg_import_system_collations()` directly, this
+function creates COLLATIONs in the system catalog (pg_collations).
+If the locale(1) command is available, this function creates COLLATIONs
+based on the `locale -a` output.
+
+The locale(1) command is normally not available on Alpine Linux, so it
+does nothing and only the default and ICU-based COLLATIONs are created.
+However, there's a musl-locales package that provides locale(1), but it
+doesn't implement any collations. This package just provides locale
+translations. So if the user happens to have locale(1) installed and they
+initialize the cluster or call `pg_import_system_collations()`, they end
+up with dozens of libc-based COLLATIONs in the system catalog that
+actually do not work! They will all behave like "C", because musl libc
+doesn't implement locales.
+
+--- a/src/backend/commands/collationcmds.c
++++ b/src/backend/commands/collationcmds.c
+@@ -401,7 +401,7 @@
+ 
+ 
+ /* will we use "locale -a" in pg_import_system_collations? */
+-#if defined(HAVE_LOCALE_T) && !defined(WIN32)
++#if defined(HAVE_LOCALE_T) && !defined(WIN32) && defined(__GLIBC__)  // XXX-Patched
+ #define READ_LOCALE_A_OUTPUT
+ #endif
+ 
diff --git a/main/postgresql15/external-libpq.patch.txt b/main/postgresql15/external-libpq.patch.txt
new file mode 100644
index 00000000000..e148edd1b8f
--- /dev/null
+++ b/main/postgresql15/external-libpq.patch.txt
@@ -0,0 +1,41 @@
+Patch-Source: https://src.fedoraproject.org/rpms/postgresql/blob/f35/f/postgresql-external-libpq.patch
+
+This patch is applied only when building non-default postgresql aport, i.e.
+we want to link against libpq provided by the default postgresql aport.
+
+diff --git a/src/Makefile b/src/Makefile
+index bcdbd95..4bea236 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -20,7 +20,6 @@ SUBDIRS = \
+ 	backend/utils/mb/conversion_procs \
+ 	backend/snowball \
+ 	include \
+-	interfaces \
+ 	backend/replication/libpqwalreceiver \
+ 	backend/replication/pgoutput \
+ 	fe_utils \
+diff --git a/src/Makefile.global.in b/src/Makefile.global.in
+index b9d86ac..29df69f 100644
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -549,7 +549,7 @@ endif
+ # How to link to libpq.  (This macro may be used as-is by backend extensions.
+ # Client-side code should go through libpq_pgport or libpq_pgport_shlib,
+ # instead.)
+-libpq = -L$(libpq_builddir) -lpq
++libpq = -lpq
+ 
+ # libpq_pgport is for use by client executables (not libraries) that use libpq.
+ # We force clients to pull symbols from the non-shared libraries libpgport
+@@ -579,7 +579,6 @@ endif
+ # Commonly used submake targets
+ 
+ submake-libpq: | submake-generated-headers
+-	$(MAKE) -C $(libpq_builddir) all
+ 
+ submake-libpgport: | submake-generated-headers
+ 	$(MAKE) -C $(top_builddir)/src/port all
+-- 
+2.21.0
+
diff --git a/main/postgresql15/icu-collations-hack.patch b/main/postgresql15/icu-collations-hack.patch
new file mode 100644
index 00000000000..1e12ebe84df
--- /dev/null
+++ b/main/postgresql15/icu-collations-hack.patch
@@ -0,0 +1,893 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Wed, 03 Aug 2022 20:40:33 +0200
+Subject: [PATCH] Hack to generate usable ICU-based collations with
+  icu-data-en
+
+This is a downstream patch for Alpine Linux, it should never be
+upstreamed in this form!
+
+When the PostgreSQL cluster is initialized (using initdb(1)) or the
+DB administrator calls `pg_import_system_collations()` directly, this
+function creates COLLATIONs in the system catalog (pg_collations).
+There are two types: libc-based and ICU-based. The latter are created
+based on *locales* (not collations) known to ICU, i.e. based on the ICU
+data installed at the time.
+
+collationcmds.c includes the following comment:
+> We use uloc_countAvailable()/uloc_getAvailable() rather than
+> ucol_countAvailable()/ucol_getAvailable().  The former returns a full
+> set of language+region combinations, whereas the latter only returns
+> language+region combinations if they are distinct from the language's
+> base collation.  So there might not be a de-DE or en-GB, which would be
+> confusing.
+
+There's a problem with this approach: locales and collations are two
+different things. ICU data may include collation algorithms and data for
+all or some languages, but not locales (language + country/region).
+The collation data is small compared to locales. There are ~800 locales
+(combinations of language, country and variants), but only 98 collations.
+There's a mapping between collations and locales hidden somewhere in ICU
+data.
+
+Since full ICU data is very big (30 MiB), we have created a stripped down
+variant with only English locale (package icu-data-en, 2.6 MiB). It also
+includes a subset of 18 collations that cover hundreds of languages.
+
+When the cluster is initialized or `pg_import_system_collations()` is
+called directly and only icu-data-en (default) is installed, the user
+ends up with only und, en and en_GB ICU-based COLLATIONs. The user can
+create missing COLLATIONs manually, but this a) is not expected nor
+reasonable behaviour, b) it's not easy to find out for which locales
+there's a collation available for.
+
+I couldn't find any way how to list all language+country variants for the
+given collation. It can be constructed when we iterate over all locales,
+but this approach is useless when we don't have the locale data
+available... I should also note that the reverse lookup (locale ->
+collation) is not a problem for ICU when full locale data is stripped.
+
+So I ended up with a very ugly workaround: pre-generating a list of
+collation -> locale mapping and embedding it in the collationcmds.c
+source. Then we replace `uloc_countAvailable()`/`uloc_getAvailable()`
+with `ucol_countAvailable()` / `ucol_getAvailable()` to iterate over
+the collations instead of locales and lookup the locales in the
+pre-generated list.
+
+This data is quite stable, there's a very low risk of getting outdated in
+a way that would be a problem.
+
+`icu_coll_locales` has been generated using the following code:
+
+    #include <stdio.h>
+    #include <string.h>
+    #include <unicode/ucol.h>
+    
+    // Copy-pasted from collationcmds.c.
+    static char *get_icu_language_tag(const char *localename) {
+        char buf[ULOC_FULLNAME_CAPACITY];
+        UErrorCode status = U_ZERO_ERROR;
+    
+        uloc_toLanguageTag(localename, buf, sizeof(buf), true, &status);
+    
+        if (U_FAILURE(status)) {
+            fprintf(stderr, "could not convert locale name \"%s\" to language tag: %s\n",
+                    localename, u_errorName(status));
+            return strdup(localename);
+        }
+        return strdup(buf);
+    }
+    
+    int main() {
+        UErrorCode status = U_ZERO_ERROR;
+    
+        for (int i = 0; i < uloc_countAvailable(); i++) {
+            const char *locale = uloc_getAvailable(i);
+    
+            UCollator *collator = ucol_open(locale, &status);
+            const char *actual_locale = ucol_getLocaleByType(collator, ULOC_ACTUAL_LOCALE, &status);
+    
+            // Strip @.*
+            char *ptr = strchr(actual_locale, '@');
+            if (ptr != NULL) {
+                *ptr = '\0';
+            }
+            if (strcmp(actual_locale, "root") == 0) {
+                actual_locale = "";
+            }
+            if (strcmp(actual_locale, locale) != 0) {
+                printf("\"%s\", \"%s\",\n", actual_locale, get_icu_language_tag(locale));
+            }
+            ucol_close(collator);
+        }
+        return 0;
+    }
+
+compiled and executed using:
+
+    gcc -o main main.c $(pkg-config --libs icu-uc icu-io) && ./main | sort | uniq
+
+--- a/src/backend/commands/collationcmds.c
++++ b/src/backend/commands/collationcmds.c
+@@ -572,6 +572,715 @@
+ 
+ 	return result;
+ }
++
++/*
++ * XXX-Patched: Added a static mapping: collation name (parent) to locale (children)
++ * I'm gonna burn in hell for this...
++ */
++static char* icu_coll_locales[] = {
++	"", "agq",
++	"", "agq-CM",
++	"", "ak",
++	"", "ak-GH",
++	"", "asa",
++	"", "asa-TZ",
++	"", "ast",
++	"", "ast-ES",
++	"", "bas",
++	"", "bas-CM",
++	"", "bem",
++	"", "bem-ZM",
++	"", "bez",
++	"", "bez-TZ",
++	"", "bm",
++	"", "bm-ML",
++	"", "brx",
++	"", "brx-IN",
++	"", "ca",
++	"", "ca-AD",
++	"", "ca-ES",
++	"", "ca-FR",
++	"", "ca-IT",
++	"", "ccp",
++	"", "ccp-BD",
++	"", "ccp-IN",
++	"", "ce",
++	"", "ce-RU",
++	"", "cgg",
++	"", "cgg-UG",
++	"", "ckb",
++	"", "ckb-IQ",
++	"", "ckb-IR",
++	"", "dav",
++	"", "dav-KE",
++	"", "de",
++	"", "de-AT",
++	"", "de-BE",
++	"", "de-CH",
++	"", "de-DE",
++	"", "de-IT",
++	"", "de-LI",
++	"", "de-LU",
++	"", "dje",
++	"", "dje-NE",
++	"", "doi",
++	"", "doi-IN",
++	"", "dua",
++	"", "dua-CM",
++	"", "dyo",
++	"", "dyo-SN",
++	"", "dz",
++	"", "dz-BT",
++	"", "ebu",
++	"", "ebu-KE",
++	"", "en",
++	"", "en-001",
++	"", "en-150",
++	"", "en-AE",
++	"", "en-AG",
++	"", "en-AI",
++	"", "en-AS",
++	"", "en-AT",
++	"", "en-AU",
++	"", "en-BB",
++	"", "en-BE",
++	"", "en-BI",
++	"", "en-BM",
++	"", "en-BS",
++	"", "en-BW",
++	"", "en-BZ",
++	"", "en-CA",
++	"", "en-CC",
++	"", "en-CH",
++	"", "en-CK",
++	"", "en-CM",
++	"", "en-CX",
++	"", "en-CY",
++	"", "en-DE",
++	"", "en-DG",
++	"", "en-DK",
++	"", "en-DM",
++	"", "en-ER",
++	"", "en-FI",
++	"", "en-FJ",
++	"", "en-FK",
++	"", "en-FM",
++	"", "en-GB",
++	"", "en-GD",
++	"", "en-GG",
++	"", "en-GH",
++	"", "en-GI",
++	"", "en-GM",
++	"", "en-GU",
++	"", "en-GY",
++	"", "en-HK",
++	"", "en-IE",
++	"", "en-IL",
++	"", "en-IM",
++	"", "en-IN",
++	"", "en-IO",
++	"", "en-JE",
++	"", "en-JM",
++	"", "en-KE",
++	"", "en-KI",
++	"", "en-KN",
++	"", "en-KY",
++	"", "en-LC",
++	"", "en-LR",
++	"", "en-LS",
++	"", "en-MG",
++	"", "en-MH",
++	"", "en-MO",
++	"", "en-MP",
++	"", "en-MS",
++	"", "en-MT",
++	"", "en-MU",
++	"", "en-MV",
++	"", "en-MW",
++	"", "en-MY",
++	"", "en-NA",
++	"", "en-NF",
++	"", "en-NG",
++	"", "en-NL",
++	"", "en-NR",
++	"", "en-NU",
++	"", "en-NZ",
++	"", "en-PG",
++	"", "en-PH",
++	"", "en-PK",
++	"", "en-PN",
++	"", "en-PR",
++	"", "en-PW",
++	"", "en-RW",
++	"", "en-SB",
++	"", "en-SC",
++	"", "en-SD",
++	"", "en-SE",
++	"", "en-SG",
++	"", "en-SH",
++	"", "en-SI",
++	"", "en-SL",
++	"", "en-SS",
++	"", "en-SX",
++	"", "en-SZ",
++	"", "en-TC",
++	"", "en-TK",
++	"", "en-TO",
++	"", "en-TT",
++	"", "en-TV",
++	"", "en-TZ",
++	"", "en-UG",
++	"", "en-UM",
++	"", "en-US",
++	"", "en-VC",
++	"", "en-VG",
++	"", "en-VI",
++	"", "en-VU",
++	"", "en-WS",
++	"", "en-ZA",
++	"", "en-ZM",
++	"", "en-ZW",
++	"", "eu",
++	"", "eu-ES",
++	"", "ewo",
++	"", "ewo-CM",
++	"", "ff",
++	"", "ff-Latn",
++	"", "ff-Latn-BF",
++	"", "ff-Latn-CM",
++	"", "ff-Latn-GH",
++	"", "ff-Latn-GM",
++	"", "ff-Latn-GN",
++	"", "ff-Latn-GW",
++	"", "ff-Latn-LR",
++	"", "ff-Latn-MR",
++	"", "ff-Latn-NE",
++	"", "ff-Latn-NG",
++	"", "ff-Latn-SL",
++	"", "ff-Latn-SN",
++	"", "fr",
++	"", "fr-BE",
++	"", "fr-BF",
++	"", "fr-BI",
++	"", "fr-BJ",
++	"", "fr-BL",
++	"", "fr-CD",
++	"", "fr-CF",
++	"", "fr-CG",
++	"", "fr-CH",
++	"", "fr-CI",
++	"", "fr-CM",
++	"", "fr-DJ",
++	"", "fr-DZ",
++	"", "fr-FR",
++	"", "fr-GA",
++	"", "fr-GF",
++	"", "fr-GN",
++	"", "fr-GP",
++	"", "fr-GQ",
++	"", "fr-HT",
++	"", "fr-KM",
++	"", "fr-LU",
++	"", "fr-MA",
++	"", "fr-MC",
++	"", "fr-MF",
++	"", "fr-MG",
++	"", "fr-ML",
++	"", "fr-MQ",
++	"", "fr-MR",
++	"", "fr-MU",
++	"", "fr-NC",
++	"", "fr-NE",
++	"", "fr-PF",
++	"", "fr-PM",
++	"", "fr-RE",
++	"", "fr-RW",
++	"", "fr-SC",
++	"", "fr-SN",
++	"", "fr-SY",
++	"", "fr-TD",
++	"", "fr-TG",
++	"", "fr-TN",
++	"", "fr-VU",
++	"", "fr-WF",
++	"", "fr-YT",
++	"", "fur",
++	"", "fur-IT",
++	"", "fy",
++	"", "fy-NL",
++	"", "ga",
++	"", "ga-GB",
++	"", "ga-IE",
++	"", "gd",
++	"", "gd-GB",
++	"", "gsw",
++	"", "gsw-CH",
++	"", "gsw-FR",
++	"", "gsw-LI",
++	"", "guz",
++	"", "guz-KE",
++	"", "gv",
++	"", "gv-IM",
++	"", "ia",
++	"", "ia-001",
++	"", "id",
++	"", "id-ID",
++	"", "ii",
++	"", "ii-CN",
++	"", "it",
++	"", "it-CH",
++	"", "it-IT",
++	"", "it-SM",
++	"", "it-VA",
++	"", "jgo",
++	"", "jgo-CM",
++	"", "jmc",
++	"", "jmc-TZ",
++	"", "jv",
++	"", "jv-ID",
++	"", "kab",
++	"", "kab-DZ",
++	"", "kam",
++	"", "kam-KE",
++	"", "kde",
++	"", "kde-TZ",
++	"", "kea",
++	"", "kea-CV",
++	"", "kgp",
++	"", "kgp-BR",
++	"", "khq",
++	"", "khq-ML",
++	"", "ki",
++	"", "ki-KE",
++	"", "kkj",
++	"", "kkj-CM",
++	"", "kln",
++	"", "kln-KE",
++	"", "ks",
++	"", "ks-Arab",
++	"", "ks-Arab-IN",
++	"", "ks-Deva",
++	"", "ks-Deva-IN",
++	"", "ksb",
++	"", "ksb-TZ",
++	"", "ksf",
++	"", "ksf-CM",
++	"", "ksh",
++	"", "ksh-DE",
++	"", "kw",
++	"", "kw-GB",
++	"", "lag",
++	"", "lag-TZ",
++	"", "lb",
++	"", "lb-LU",
++	"", "lg",
++	"", "lg-UG",
++	"", "lrc",
++	"", "lrc-IQ",
++	"", "lrc-IR",
++	"", "lu",
++	"", "lu-CD",
++	"", "luo",
++	"", "luo-KE",
++	"", "luy",
++	"", "luy-KE",
++	"", "mai",
++	"", "mai-IN",
++	"", "mas",
++	"", "mas-KE",
++	"", "mas-TZ",
++	"", "mer",
++	"", "mer-KE",
++	"", "mfe",
++	"", "mfe-MU",
++	"", "mg",
++	"", "mg-MG",
++	"", "mgh",
++	"", "mgh-MZ",
++	"", "mgo",
++	"", "mgo-CM",
++	"", "mi",
++	"", "mi-NZ",
++	"", "mni",
++	"", "mni-Beng",
++	"", "mni-Beng-IN",
++	"", "ms",
++	"", "ms-BN",
++	"", "ms-ID",
++	"", "ms-MY",
++	"", "ms-SG",
++	"", "mua",
++	"", "mua-CM",
++	"", "mzn",
++	"", "mzn-IR",
++	"", "naq",
++	"", "naq-NA",
++	"", "nd",
++	"", "nd-ZW",
++	"", "nl",
++	"", "nl-AW",
++	"", "nl-BE",
++	"", "nl-BQ",
++	"", "nl-CW",
++	"", "nl-NL",
++	"", "nl-SR",
++	"", "nl-SX",
++	"", "nmg",
++	"", "nmg-CM",
++	"", "nnh",
++	"", "nnh-CM",
++	"", "nus",
++	"", "nus-SS",
++	"", "nyn",
++	"", "nyn-UG",
++	"", "os",
++	"", "os-GE",
++	"", "os-RU",
++	"", "pcm",
++	"", "pcm-NG",
++	"", "pt",
++	"", "pt-AO",
++	"", "pt-BR",
++	"", "pt-CH",
++	"", "pt-CV",
++	"", "pt-GQ",
++	"", "pt-GW",
++	"", "pt-LU",
++	"", "pt-MO",
++	"", "pt-MZ",
++	"", "pt-PT",
++	"", "pt-ST",
++	"", "pt-TL",
++	"", "qu",
++	"", "qu-BO",
++	"", "qu-EC",
++	"", "qu-PE",
++	"", "rm",
++	"", "rm-CH",
++	"", "rn",
++	"", "rn-BI",
++	"", "rof",
++	"", "rof-TZ",
++	"", "rw",
++	"", "rw-RW",
++	"", "rwk",
++	"", "rwk-TZ",
++	"", "sa",
++	"", "sa-IN",
++	"", "sah",
++	"", "sah-RU",
++	"", "saq",
++	"", "saq-KE",
++	"", "sat",
++	"", "sat-Olck",
++	"", "sat-Olck-IN",
++	"", "sbp",
++	"", "sbp-TZ",
++	"", "sc",
++	"", "sc-IT",
++	"", "sd",
++	"", "sd-Arab",
++	"", "sd-Arab-PK",
++	"", "sd-Deva",
++	"", "sd-Deva-IN",
++	"", "seh",
++	"", "seh-MZ",
++	"", "ses",
++	"", "ses-ML",
++	"", "sg",
++	"", "sg-CF",
++	"", "shi",
++	"", "shi-Latn",
++	"", "shi-Latn-MA",
++	"", "shi-Tfng",
++	"", "shi-Tfng-MA",
++	"", "sn",
++	"", "sn-ZW",
++	"", "so",
++	"", "so-DJ",
++	"", "so-ET",
++	"", "so-KE",
++	"", "so-SO",
++	"", "su",
++	"", "su-Latn",
++	"", "su-Latn-ID",
++	"", "sw",
++	"", "sw-CD",
++	"", "sw-KE",
++	"", "sw-TZ",
++	"", "sw-UG",
++	"", "teo",
++	"", "teo-KE",
++	"", "teo-UG",
++	"", "tg",
++	"", "tg-TJ",
++	"", "ti",
++	"", "ti-ER",
++	"", "ti-ET",
++	"", "tt",
++	"", "tt-RU",
++	"", "twq",
++	"", "twq-NE",
++	"", "tzm",
++	"", "tzm-MA",
++	"", "vai",
++	"", "vai-Latn",
++	"", "vai-Latn-LR",
++	"", "vai-Vaii",
++	"", "vai-Vaii-LR",
++	"", "vun",
++	"", "vun-TZ",
++	"", "wae",
++	"", "wae-CH",
++	"", "xh",
++	"", "xh-ZA",
++	"", "xog",
++	"", "xog-UG",
++	"", "yav",
++	"", "yav-CM",
++	"", "yrl",
++	"", "yrl-BR",
++	"", "yrl-CO",
++	"", "yrl-VE",
++	"", "zgh",
++	"", "zgh-MA",
++	"", "zu",
++	"", "zu-ZA",
++	"af", "af-NA",
++	"af", "af-ZA",
++	"am", "am-ET",
++	"ar", "ar-001",
++	"ar", "ar-AE",
++	"ar", "ar-BH",
++	"ar", "ar-DJ",
++	"ar", "ar-DZ",
++	"ar", "ar-EG",
++	"ar", "ar-EH",
++	"ar", "ar-ER",
++	"ar", "ar-IL",
++	"ar", "ar-IQ",
++	"ar", "ar-JO",
++	"ar", "ar-KM",
++	"ar", "ar-KW",
++	"ar", "ar-LB",
++	"ar", "ar-LY",
++	"ar", "ar-MA",
++	"ar", "ar-MR",
++	"ar", "ar-OM",
++	"ar", "ar-PS",
++	"ar", "ar-QA",
++	"ar", "ar-SA",
++	"ar", "ar-SD",
++	"ar", "ar-SO",
++	"ar", "ar-SS",
++	"ar", "ar-SY",
++	"ar", "ar-TD",
++	"ar", "ar-TN",
++	"ar", "ar-YE",
++	"as", "as-IN",
++	"az", "az-Cyrl",
++	"az", "az-Cyrl-AZ",
++	"az", "az-Latn",
++	"az", "az-Latn-AZ",
++	"be", "be-BY",
++	"bg", "bg-BG",
++	"bn", "bn-BD",
++	"bn", "bn-IN",
++	"bo", "bo-CN",
++	"bo", "bo-IN",
++	"br", "br-FR",
++	"bs", "bs-Latn",
++	"bs", "bs-Latn-BA",
++	"bs_Cyrl", "bs-Cyrl-BA",
++	"ceb", "ceb-PH",
++	"chr", "chr-US",
++	"cs", "cs-CZ",
++	"cy", "cy-GB",
++	"da", "da-DK",
++	"da", "da-GL",
++	"dsb", "dsb-DE",
++	"ee", "ee-GH",
++	"ee", "ee-TG",
++	"el", "el-CY",
++	"el", "el-GR",
++	"eo", "eo-001",
++	"es", "es-419",
++	"es", "es-AR",
++	"es", "es-BO",
++	"es", "es-BR",
++	"es", "es-BZ",
++	"es", "es-CL",
++	"es", "es-CO",
++	"es", "es-CR",
++	"es", "es-CU",
++	"es", "es-DO",
++	"es", "es-EA",
++	"es", "es-EC",
++	"es", "es-ES",
++	"es", "es-GQ",
++	"es", "es-GT",
++	"es", "es-HN",
++	"es", "es-IC",
++	"es", "es-MX",
++	"es", "es-NI",
++	"es", "es-PA",
++	"es", "es-PE",
++	"es", "es-PH",
++	"es", "es-PR",
++	"es", "es-PY",
++	"es", "es-SV",
++	"es", "es-US",
++	"es", "es-UY",
++	"es", "es-VE",
++	"et", "et-EE",
++	"fa", "fa-IR",
++	"ff_Adlm", "ff-Adlm-BF",
++	"ff_Adlm", "ff-Adlm-CM",
++	"ff_Adlm", "ff-Adlm-GH",
++	"ff_Adlm", "ff-Adlm-GM",
++	"ff_Adlm", "ff-Adlm-GN",
++	"ff_Adlm", "ff-Adlm-GW",
++	"ff_Adlm", "ff-Adlm-LR",
++	"ff_Adlm", "ff-Adlm-MR",
++	"ff_Adlm", "ff-Adlm-NE",
++	"ff_Adlm", "ff-Adlm-NG",
++	"ff_Adlm", "ff-Adlm-SL",
++	"ff_Adlm", "ff-Adlm-SN",
++	"fi", "fi-FI",
++	"fil", "fil-PH",
++	"fo", "fo-DK",
++	"fo", "fo-FO",
++	"gl", "gl-ES",
++	"gu", "gu-IN",
++	"ha", "ha-GH",
++	"ha", "ha-NE",
++	"ha", "ha-NG",
++	"haw", "haw-US",
++	"he", "he-IL",
++	"hi", "hi-IN",
++	"hi", "hi-Latn",
++	"hi", "hi-Latn-IN",
++	"hr", "hr-BA",
++	"hr", "hr-HR",
++	"hsb", "hsb-DE",
++	"hu", "hu-HU",
++	"hy", "hy-AM",
++	"ig", "ig-NG",
++	"is", "is-IS",
++	"ja", "ja-JP",
++	"ka", "ka-GE",
++	"kk", "kk-KZ",
++	"kl", "kl-GL",
++	"km", "km-KH",
++	"kn", "kn-IN",
++	"ko", "ko-KP",
++	"ko", "ko-KR",
++	"kok", "kok-IN",
++	"ku", "ku-TR",
++	"ky", "ky-KG",
++	"lkt", "lkt-US",
++	"ln", "ln-AO",
++	"ln", "ln-CD",
++	"ln", "ln-CF",
++	"ln", "ln-CG",
++	"lo", "lo-LA",
++	"lt", "lt-LT",
++	"lv", "lv-LV",
++	"mk", "mk-MK",
++	"ml", "ml-IN",
++	"mn", "mn-MN",
++	"mr", "mr-IN",
++	"mt", "mt-MT",
++	"my", "my-MM",
++	"ne", "ne-IN",
++	"ne", "ne-NP",
++	"no", "nb",
++	"no", "nb-NO",
++	"no", "nb-SJ",
++	"no", "nn",
++	"no", "nn-NO",
++	"om", "om-ET",
++	"om", "om-KE",
++	"or", "or-IN",
++	"pa", "pa-Arab",
++	"pa", "pa-Arab-PK",
++	"pa", "pa-Guru",
++	"pa", "pa-Guru-IN",
++	"pl", "pl-PL",
++	"ps", "ps-AF",
++	"ps", "ps-PK",
++	"ro", "ro-MD",
++	"ro", "ro-RO",
++	"ru", "ru-BY",
++	"ru", "ru-KG",
++	"ru", "ru-KZ",
++	"ru", "ru-MD",
++	"ru", "ru-RU",
++	"ru", "ru-UA",
++	"se", "se-FI",
++	"se", "se-NO",
++	"se", "se-SE",
++	"si", "si-LK",
++	"sk", "sk-SK",
++	"sl", "sl-SI",
++	"smn", "smn-FI",
++	"sq", "sq-AL",
++	"sq", "sq-MK",
++	"sq", "sq-XK",
++	"sr", "sr-Cyrl",
++	"sr", "sr-Cyrl-BA",
++	"sr", "sr-Cyrl-ME",
++	"sr", "sr-Cyrl-RS",
++	"sr", "sr-Cyrl-XK",
++	"sr_Latn", "sr-Latn-BA",
++	"sr_Latn", "sr-Latn-ME",
++	"sr_Latn", "sr-Latn-RS",
++	"sr_Latn", "sr-Latn-XK",
++	"sv", "sv-AX",
++	"sv", "sv-FI",
++	"sv", "sv-SE",
++	"ta", "ta-IN",
++	"ta", "ta-LK",
++	"ta", "ta-MY",
++	"ta", "ta-SG",
++	"te", "te-IN",
++	"th", "th-TH",
++	"tk", "tk-TM",
++	"to", "to-TO",
++	"tr", "tr-CY",
++	"tr", "tr-TR",
++	"ug", "ug-CN",
++	"uk", "uk-UA",
++	"ur", "ur-IN",
++	"ur", "ur-PK",
++	"uz", "uz-Arab",
++	"uz", "uz-Arab-AF",
++	"uz", "uz-Cyrl",
++	"uz", "uz-Cyrl-UZ",
++	"uz", "uz-Latn",
++	"uz", "uz-Latn-UZ",
++	"vi", "vi-VN",
++	"wo", "wo-SN",
++	"yi", "yi-001",
++	"yo", "yo-BJ",
++	"yo", "yo-NG",
++	"zh", "yue",
++	"zh", "yue-Hans",
++	"zh", "yue-Hans-CN",
++	"zh", "yue-Hant",
++	"zh", "yue-Hant-HK",
++	"zh", "zh-Hans",
++	"zh", "zh-Hans-CN",
++	"zh", "zh-Hans-HK",
++	"zh", "zh-Hans-MO",
++	"zh", "zh-Hans-SG",
++	"zh", "zh-Hant",
++	"zh", "zh-Hant-HK",
++	"zh", "zh-Hant-MO",
++	"zh", "zh-Hant-TW",
++	NULL, NULL,
++};
++
+ #endif							/* USE_ICU */
+ 
+ 
+@@ -772,18 +1481,19 @@
+ 		 * Start the loop at -1 to sneak in the root locale without too much
+ 		 * code duplication.
+ 		 */
+-		for (i = -1; i < uloc_countAvailable(); i++)
++		for (i = -1; i < ucol_countAvailable(); i++)  /* XXX-Patched: changed from uloc_countAvailable() */
+ 		{
+ 			const char *name;
+ 			char	   *langtag;
+ 			char	   *icucomment;
+ 			const char *iculocstr;
+ 			Oid			collid;
++			char	   **ptr;  /* XXX-Patched: added */
+ 
+ 			if (i == -1)
+ 				name = "";		/* ICU root locale */
+ 			else
+-				name = uloc_getAvailable(i);
++				name = ucol_getAvailable(i);  /* XXX-Patched: changed from uloc_getAvailable() */
+ 
+ 			langtag = get_icu_language_tag(name);
+ 			iculocstr = U_ICU_VERSION_MAJOR_NUM >= 54 ? langtag : name;
+@@ -812,6 +1523,44 @@
+ 					CreateComments(collid, CollationRelationId, 0,
+ 								   icucomment);
+ 			}
++
++			/*
++			 * XXX-Patched: The following block is added to create collations also for derived
++			 * locales (combination of language+country/region).
++			 * It's terribly inefficient, but in the big picture, it doesn't matter that much
++			 * (it's typically called only once in the life of the cluster).
++			 */
++			for (ptr = icu_coll_locales; *ptr != NULL; ptr++)
++			{
++				/*
++				 * icu_coll_locales is a 1D array of pairs: collation name and locale (langtag).
++				 * ptr++ moves pointer to the second string of the pair and it's a post-increment,
++				 * so after the comparison with name is evaluated.
++				 */
++				if (strcmp(*ptr++, name) == 0) {
++					const char *langtag;
++
++					langtag = pstrdup(*ptr);
++					collid = CollationCreate(psprintf("%s-x-icu", langtag),
++										 nspid, GetUserId(),
++										 COLLPROVIDER_ICU, true, -1,
++										 NULL, NULL, langtag,
++										 get_collation_actual_version(COLLPROVIDER_ICU, langtag),
++										 true, true);
++
++					if (OidIsValid(collid))
++					{
++						ncreated++;
++
++						CommandCounterIncrement();
++
++						icucomment = get_icu_locale_comment(langtag);
++						if (icucomment)
++							CreateComments(collid, CollationRelationId, 0,
++										   icucomment);
++					}
++				}
++			}
+ 		}
+ 	}
+ #endif							/* USE_ICU */
diff --git a/main/postgresql15/initdb.patch b/main/postgresql15/initdb.patch
new file mode 100644
index 00000000000..e7607100f7e
--- /dev/null
+++ b/main/postgresql15/initdb.patch
@@ -0,0 +1,14 @@
+diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
+--- a/src/bin/initdb/initdb.c
++++ b/src/bin/initdb/initdb.c
+@@ -3259,9 +3259,7 @@
+ 		/* translator: This is a placeholder in a shell command. */
+ 		appendPQExpBuffer(start_db_cmd, " -l %s start", _("logfile"));
+ 
+-		printf(_("\nSuccess. You can now start the database server using:\n\n"
+-				 "    %s\n\n"),
+-			   start_db_cmd->data);
++		printf(_("\nSuccess.\n\n"));
+ 
+ 		destroyPQExpBuffer(start_db_cmd);
+ 	}
diff --git a/main/postgresql15/jit-datalayout-mismatch-on-s390x-and-x86.patch b/main/postgresql15/jit-datalayout-mismatch-on-s390x-and-x86.patch
new file mode 100644
index 00000000000..807a5f1b767
--- /dev/null
+++ b/main/postgresql15/jit-datalayout-mismatch-on-s390x-and-x86.patch
@@ -0,0 +1,111 @@
+From: Tom Stellard <tstellar@redhat.com>
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sat, 18 Dec 2021 23:09:03 +0100
+Subject: [PATCH] jit: Workaround datalayout mismatch on s390x and x86
+
+This patch is based on https://src.fedoraproject.org/rpms/postgresql/blob/f35/f/postgresql-datalayout-mismatch-on-s390.patch.
+
+Original description:
+
+> LLVM's s390x target uses a different datalayout for z13 and newer processors.
+> If llvmjit_types.bc is compiled to target a processor older than z13, and
+> then the JIT runs on a z13 or newer processor, then there will be a mismatch
+> in datalayouts between llvmjit_types.bc and the JIT engine.  This mismatch
+> causes the JIT to fail at runtime.
+
+We encountered an analogous problem even on x86 (legacy 32bit arch).
+However, I didn't wanna waste my time researching what exact CPU features
+are problematic on this dead architecture, so I just disabled usage of any
+host specific CPU features when creating the JIT on x86. And while I was on
+it, I also conditioned the s390x workaround for s390x only. -jirutka
+
+diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c
+index 98a27f08bf..05b6438ba8 100644
+--- a/src/backend/jit/llvm/llvmjit.c
++++ b/src/backend/jit/llvm/llvmjit.c
+@@ -776,7 +776,38 @@
+ 			 errhidecontext(true)));
+ }
+ 
++#if defined(__s390__) || defined(__s390x__)
+ /*
++ * For the systemz target, LLVM uses a different datalayout for z13 and newer
++ * CPUs than it does for older CPUs.  This can cause a mismatch in datalayouts
++ * in the case where the llvm_types_module is compiled with a pre-z13 CPU
++ * and the JIT is running on z13 or newer.
++ * See computeDataLayout() function in
++ * llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp for information on the
++ * datalayout differences.
++ */
++static bool
++needs_systemz_workaround(void)
++{
++	bool ret = false;
++	LLVMContextRef llvm_context;
++	LLVMTypeRef vec_type;
++	LLVMTargetDataRef llvm_layoutref;
++	if (strncmp(LLVMGetTargetName(llvm_targetref), "systemz", strlen("systemz")))
++	{
++		return false;
++	}
++
++	llvm_context = LLVMGetModuleContext(llvm_types_module);
++	vec_type = LLVMVectorType(LLVMIntTypeInContext(llvm_context, 32), 4);
++	llvm_layoutref = LLVMCreateTargetData(llvm_layout);
++	ret = (LLVMABIAlignmentOfType(llvm_layoutref, vec_type) == 16);
++	LLVMDisposeTargetData(llvm_layoutref);
++	return ret;
++}
++#endif
++
++/*
+  * Per session initialization.
+  */
+ static void
+@@ -785,6 +816,7 @@
+ 	MemoryContext oldcontext;
+ 	char	   *error = NULL;
+ 	char	   *cpu = NULL;
++	char       *host_features = NULL;
+ 	char	   *features = NULL;
+ 	LLVMTargetMachineRef opt0_tm;
+ 	LLVMTargetMachineRef opt3_tm;
+@@ -815,11 +847,22 @@
+ 	 * latter is needed because some CPU architectures default to enabling
+ 	 * features not all CPUs have (weird, huh).
+ 	 */
++#if !defined(__i386__) && !defined(__i386)  // XXX: quick workaround for 32-bit x86
+ 	cpu = LLVMGetHostCPUName();
+-	features = LLVMGetHostCPUFeatures();
++	features = host_features = LLVMGetHostCPUFeatures();
+ 	elog(DEBUG2, "LLVMJIT detected CPU \"%s\", with features \"%s\"",
+ 		 cpu, features);
++#endif
+ 
++#if defined(__s390__) || defined(__s390x__)
++	if (needs_systemz_workaround())
++	{
++		const char *no_vector =",-vector";
++		features = malloc(sizeof(char) * (strlen(host_features) + strlen(no_vector) + 1));
++		sprintf(features, "%s%s", host_features, no_vector);
++	}
++#endif
++
+ 	opt0_tm =
+ 		LLVMCreateTargetMachine(llvm_targetref, llvm_triple, cpu, features,
+ 								LLVMCodeGenLevelNone,
+@@ -833,8 +876,13 @@
+ 
+ 	LLVMDisposeMessage(cpu);
+ 	cpu = NULL;
+-	LLVMDisposeMessage(features);
++	if (features != host_features)
++	{
++		free(features);
++	}
+ 	features = NULL;
++	LLVMDisposeMessage(host_features);
++	host_features = NULL;
+ 
+ 	/* force symbols in main binary to be loaded */
+ 	LLVMLoadLibraryPermanently(NULL);
diff --git a/main/postgresql15/libpgport-pkglibdir.patch.txt b/main/postgresql15/libpgport-pkglibdir.patch.txt
new file mode 100644
index 00000000000..cb862fc344d
--- /dev/null
+++ b/main/postgresql15/libpgport-pkglibdir.patch.txt
@@ -0,0 +1,91 @@
+Patch-Source: https://sources.debian.org/src/postgresql-14/14.0-1/debian/patches/libpgport-pkglibdir
+Author: Christoph Berg <myon@debian.org>
+Description: Move libpgport/libpgcommon/libpgfeutils from libdir to pkglibdir
+ This allows client applications to link to version-specific libraries.
+ Used by pg-checksums.
+
+--- a/src/common/Makefile
++++ b/src/common/Makefile
+@@ -68,15 +68,15 @@ all: libpgcommon.a libpgcommon_shlib.a l
+ 
+ # libpgcommon is needed by some contrib
+ install: all installdirs
+-	$(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(libdir)/libpgcommon.a'
+-	$(INSTALL_STLIB) libpgcommon_shlib.a '$(DESTDIR)$(libdir)/libpgcommon_shlib.a'
++	$(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
++	$(INSTALL_STLIB) libpgcommon_shlib.a '$(DESTDIR)$(pkglibdir)/libpgcommon_shlib.a'
+ 
+ installdirs:
+-	$(MKDIR_P) '$(DESTDIR)$(libdir)'
++	$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
+ 
+ uninstall:
+-	rm -f '$(DESTDIR)$(libdir)/libpgcommon.a'
+-	rm -f '$(DESTDIR)$(libdir)/libpgcommon_shlib.a'
++	rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
++	rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon_shlib.a'
+ 
+ libpgcommon.a: $(OBJS_FRONTEND)
+ 	rm -f $@
+--- a/src/fe_utils/Makefile
++++ b/src/fe_utils/Makefile
+@@ -35,13 +35,13 @@ distprep: psqlscan.c
+ 
+ # libpgfeutils could be useful to contrib, so install it
+ install: all installdirs
+-	$(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(libdir)/libpgfeutils.a'
++	$(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(pkglibdir)/libpgfeutils.a'
+ 
+ installdirs:
+-	$(MKDIR_P) '$(DESTDIR)$(libdir)'
++	$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
+ 
+ uninstall:
+-	rm -f '$(DESTDIR)$(libdir)/libpgfeutils.a'
++	rm -f '$(DESTDIR)$(pkglibdir)/libpgfeutils.a'
+ 
+ clean distclean:
+ 	rm -f libpgfeutils.a $(OBJS) lex.backup
+--- a/src/port/Makefile
++++ b/src/port/Makefile
+@@ -54,15 +54,15 @@ all: libpgport.a libpgport_shlib.a libpg
+ 
+ # libpgport is needed by some contrib
+ install: all installdirs
+-	$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
+-	$(INSTALL_STLIB) libpgport_shlib.a '$(DESTDIR)$(libdir)/libpgport_shlib.a'
++	$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(pkglibdir)/libpgport.a'
++	$(INSTALL_STLIB) libpgport_shlib.a '$(DESTDIR)$(pkglibdir)/libpgport_shlib.a'
+ 
+ installdirs:
+-	$(MKDIR_P) '$(DESTDIR)$(libdir)'
++	$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
+ 
+ uninstall:
+-	rm -f '$(DESTDIR)$(libdir)/libpgport.a'
+-	rm -f '$(DESTDIR)$(libdir)/libpgport_shlib.a'
++	rm -f '$(DESTDIR)$(pkglibdir)/libpgport.a'
++	rm -f '$(DESTDIR)$(pkglibdir)/libpgport_shlib.a'
+ 
+ libpgport.a: $(OBJS)
+ 	rm -f $@
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -599,7 +599,7 @@
+ ifeq ($(PORTNAME),darwin)
+ libpq_pgport = $(libpq)
+ else ifdef PGXS
+-libpq_pgport = -L$(libdir) -lpgcommon -lpgport $(libpq)
++libpq_pgport = -L$(pkglibdir) -lpgcommon -lpgport $(libpq)
+ else
+ libpq_pgport = -L$(top_builddir)/src/common -lpgcommon -L$(top_builddir)/src/port -lpgport $(libpq)
+ endif
+@@ -610,7 +610,7 @@
+ # done if they don't, since they will have satisfied all their references
+ # from these libraries.)
+ ifdef PGXS
+-libpq_pgport_shlib = -L$(libdir) -lpgcommon_shlib -lpgport_shlib $(libpq)
++libpq_pgport_shlib = -L$(pkglibdir) -lpgcommon_shlib -lpgport_shlib $(libpq)
+ else
+ libpq_pgport_shlib = -L$(top_builddir)/src/common -lpgcommon_shlib -L$(top_builddir)/src/port -lpgport_shlib $(libpq)
+ endif
diff --git a/main/postgresql15/make-split-headers.patch b/main/postgresql15/make-split-headers.patch
new file mode 100644
index 00000000000..1a280a49c98
--- /dev/null
+++ b/main/postgresql15/make-split-headers.patch
@@ -0,0 +1,50 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Mon, 08 Nov 2021 14:56:33 +0100
+Subject: [PATCH] Allow to install interfaces headers and server headers separately
+
+Don't install headers of the interfaces (libpq and libecpg) by the install
+target, allow to install them separately from the headers needed for server.
+We need this for two reasons:
+
+a. Allow building PostgreSQL server with LDAP support, but libpq without
+   dependency on LDAP.
+b. Allow building/installing PostgreSQL server without the interfaces.
+   This is used for non-default postgresql aports (older versions of
+   PostgreSQL) - we want to provide just one version of libpq and libecpg
+   library provided by the default (newest) postgresql aport.
+
+--- a/src/include/Makefile
++++ b/src/include/Makefile
+@@ -26,8 +26,10 @@
+ 	port/win32_msvc/sys port/win32/arpa port/win32/netinet \
+ 	port/win32/sys portability
+ 
+-# Install all headers
+-install: all installdirs
++# Install server headers
++install: install-server
++install-interfaces: all
++	$(MKDIR_P) '$(DESTDIR)$(includedir)/libpq' '$(DESTDIR)$(includedir_internal)/libpq'
+ # These headers are needed by the public headers of the interfaces.
+ 	$(INSTALL_DATA) $(srcdir)/postgres_ext.h   '$(DESTDIR)$(includedir)'
+ 	$(INSTALL_DATA) $(srcdir)/libpq/libpq-fs.h '$(DESTDIR)$(includedir)/libpq'
+@@ -40,6 +42,8 @@
+ 	$(INSTALL_DATA) $(srcdir)/port.h         '$(DESTDIR)$(includedir_internal)'
+ 	$(INSTALL_DATA) $(srcdir)/postgres_fe.h  '$(DESTDIR)$(includedir_internal)'
+ 	$(INSTALL_DATA) $(srcdir)/libpq/pqcomm.h '$(DESTDIR)$(includedir_internal)/libpq'
++install-server: all
++	$(MKDIR_P) $(addprefix '$(DESTDIR)$(includedir_server)'/, $(SUBDIRS))
+ # These headers are needed for server-side development
+ 	$(INSTALL_DATA) pg_config.h     '$(DESTDIR)$(includedir_server)'
+ 	$(INSTALL_DATA) pg_config_ext.h '$(DESTDIR)$(includedir_server)'
+@@ -64,10 +68,6 @@
+ 	  chmod $(INSTALL_DATA_MODE) *.h || exit; \
+ 	done
+ 
+-installdirs:
+-	$(MKDIR_P) '$(DESTDIR)$(includedir)/libpq' '$(DESTDIR)$(includedir_internal)/libpq'
+-	$(MKDIR_P) $(addprefix '$(DESTDIR)$(includedir_server)'/, $(SUBDIRS))
+-
+ 
+ uninstall:
+ 	rm -f $(addprefix '$(DESTDIR)$(includedir)'/, pg_config.h pg_config_ext.h pg_config_os.h pg_config_manual.h postgres_ext.h libpq/libpq-fs.h)
diff --git a/main/postgresql15/per-version-dirs.patch b/main/postgresql15/per-version-dirs.patch
new file mode 100644
index 00000000000..ae091cee670
--- /dev/null
+++ b/main/postgresql15/per-version-dirs.patch
@@ -0,0 +1,69 @@
+Author: Martin Pitt <mpitt@debian.org>
+Description: Use version specific installation directories so that several major versions can be installed in parallel.
+
+ * Install server lib files into /usr/lib/postgresql<version>/
+ * Install server related header files into /usr/include/postgresql/<version>/server/
+ * Disable PostgreSQL's automagic path mangling and fix libdir for pg_config,
+   so that pg_config in /usr/bin and /usr/libexec/postgresql<version> behave
+   identically.
+
+Bug-Debian: http://bugs.debian.org/462037
+Patch-Source: https://sources.debian.org/src/postgresql-14/14.0-1/debian/patches/50-per-version-dirs.patch
+
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -119,7 +119,7 @@ libdir := @libdir@
+ pkglibdir = $(libdir)
+ ifeq "$(findstring pgsql, $(pkglibdir))" ""
+ ifeq "$(findstring postgres, $(pkglibdir))" ""
+-override pkglibdir := $(pkglibdir)/postgresql
++override pkglibdir := /usr/lib/postgresql@PG_MAJORVERSION@
+ endif
+ endif
+ 
+@@ -167,7 +167,7 @@ endif # PGXS
+ 
+ # These derived path variables aren't separately configurable.
+ 
+-includedir_server = $(pkgincludedir)/server
++includedir_server = $(pkgincludedir)/@PG_MAJORVERSION@/server
+ includedir_internal = $(pkgincludedir)/internal
+ pgxsdir = $(pkglibdir)/pgxs
+ bitcodedir = $(pkglibdir)/bitcode
+--- a/src/bin/pg_config/pg_config.c
++++ b/src/bin/pg_config/pg_config.c
+@@ -27,6 +27,8 @@
+ #include "common/config_info.h"
+ #include "port.h"
+ 
++#include "../port/pg_config_paths.h"
++
+ static const char *progname;
+ 
+ /*
+@@ -149,11 +151,7 @@ main(int argc, char **argv)
+ 		}
+ 	}
+ 
+-	if (find_my_exec(argv[0], my_exec_path) < 0)
+-	{
+-		fprintf(stderr, _("%s: could not find own program executable\n"), progname);
+-		exit(1);
+-	}
++	snprintf(my_exec_path, sizeof(my_exec_path), "%s/%s", PGBINDIR, progname);
+ 
+ 	configdata = get_configdata(my_exec_path, &configdata_len);
+ 	/* no arguments -> print everything */
+--- a/src/test/perl/PostgreSQL/Test/Utils.pm
++++ b/src/test/perl/PostgreSQL/Test/Utils.pm
+@@ -688,6 +688,10 @@
+ 	chomp($stdout);
+ 	$stdout =~ s/\r$//;
++	# Alpine's pg_config is not relocatable, manually check for correct location
++	if (-d "../../../build/tmp_install/usr/include/postgresql") {
++		$stdout = "../../../build/tmp_install/usr/include/postgresql";
++	}
+
+ 	open my $pg_config_h, '<', "$stdout/pg_config.h" or die "$!";
+ 	my $match = (grep { /^$regexp/ } <$pg_config_h>);
+ 	close $pg_config_h;
diff --git a/main/postgresql15/perl-rpath.patch b/main/postgresql15/perl-rpath.patch
new file mode 100644
index 00000000000..6e522dbe67e
--- /dev/null
+++ b/main/postgresql15/perl-rpath.patch
@@ -0,0 +1,22 @@
+We configure Postgres with --disable-rpath because for the most part we
+want to leave it to ldconfig to determine where libraries are.  However,
+for some reason the Perl package puts libperl.so in a nonstandard place
+and doesn't add that place to the ldconfig search path.  I think this
+is a Perl packaging bug, myself, but apparently it's not going to change.
+So work around it by adding an rpath spec to plperl.so (only).
+
+Alpine notes:
+This patch is copied from Fedora.
+
+--- a/src/pl/plperl/GNUmakefile
++++ b/src/pl/plperl/GNUmakefile
+@@ -55,6 +55,9 @@
+ 
+ SHLIB_LINK = $(perl_embed_ldflags)
+ 
++# Force rpath to be used even though we disable it everywhere else
++SHLIB_LINK += $(rpath)
++
+ REGRESS_OPTS = --dbname=$(PL_TESTDB)
+ REGRESS = plperl_setup plperl plperl_lc plperl_trigger plperl_shared \
+ 	plperl_elog plperl_util plperl_init plperlu plperl_array \
diff --git a/main/postgresql15/pg_config-add-major-version.patch b/main/postgresql15/pg_config-add-major-version.patch
new file mode 100644
index 00000000000..8f10f366d4e
--- /dev/null
+++ b/main/postgresql15/pg_config-add-major-version.patch
@@ -0,0 +1,49 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Tue, 09 Nov 2021 00:33:22 +0100
+Subject: [PATCH] pg_config: Add new option --major-version
+
+We use this option in aports for PostgreSQL extensions to easily get major
+version of the default postgresql.
+
+--- a/src/bin/pg_config/pg_config.c
++++ b/src/bin/pg_config/pg_config.c
+@@ -65,6 +65,7 @@
+ 	{"--ldflags_ex", "LDFLAGS_EX"},
+ 	{"--ldflags_sl", "LDFLAGS_SL"},
+ 	{"--libs", "LIBS"},
++	{"--major-version", "MAJOR-VERSION"},
+ 	{"--version", "VERSION"},
+ 	{NULL, NULL}
+ };
+@@ -101,6 +102,8 @@
+ 	printf(_("  --ldflags_ex          show LDFLAGS_EX value used when PostgreSQL was built\n"));
+ 	printf(_("  --ldflags_sl          show LDFLAGS_SL value used when PostgreSQL was built\n"));
+ 	printf(_("  --libs                show LIBS value used when PostgreSQL was built\n"));
++	printf(_("  --major-version       show the PostgreSQL major version number\n"
++			 "                        (Alpine Linux specific option)\n"));
+ 	printf(_("  --version             show the PostgreSQL version\n"));
+ 	printf(_("  -?, --help            show this help, then exit\n"));
+ 	printf(_("\nWith no arguments, all known items are shown.\n\n"));
+--- a/src/common/config_info.c
++++ b/src/common/config_info.c
+@@ -38,7 +38,7 @@
+ 	int			i = 0;
+ 
+ 	/* Adjust this to match the number of items filled below */
+-	*configdata_len = 23;
++	*configdata_len = 24;
+ 	configdata = (ConfigData *) palloc(*configdata_len * sizeof(ConfigData));
+ 
+ 	configdata[i].name = pstrdup("BINDIR");
+@@ -193,6 +193,11 @@
+ 
+ 	configdata[i].name = pstrdup("VERSION");
+ 	configdata[i].setting = pstrdup("PostgreSQL " PG_VERSION);
++	i++;
++
++	// XXX-Patched: Alpine Linux specific, used in extension aports.
++	configdata[i].name = pstrdup("MAJOR-VERSION");
++	configdata[i].setting = pstrdup(PG_MAJORVERSION);
+ 	i++;
+ 
+ 	Assert(i == *configdata_len);
diff --git a/main/postgresql/pltcl_create_tables.sql b/main/postgresql15/pltcl_create_tables.sql
index 76c7a954af3..76c7a954af3 100644
--- a/main/postgresql/pltcl_create_tables.sql
+++ b/main/postgresql15/pltcl_create_tables.sql
diff --git a/main/postgresql15/postgresql15.post-install b/main/postgresql15/postgresql15.post-install
new file mode 100644
index 00000000000..476959a55a3
--- /dev/null
+++ b/main/postgresql15/postgresql15.post-install
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+majorver=${1%%.*}
+
+cat >&2 <<EOF
+*
+* If you want to use JIT in PostgreSQL, install postgresql$majorver-jit or
+* postgresql-jit (if you didn't install specific major version of postgresql).
+*
+EOF
+
+exit 0
diff --git a/main/postgresql15/postgresql15.pre-deinstall b/main/postgresql15/postgresql15.pre-deinstall
new file mode 100644
index 00000000000..db24e86452f
--- /dev/null
+++ b/main/postgresql15/postgresql15.pre-deinstall
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+pkgver=$1
+pkgver_major=${pkgver%%.*}
+default_ver=$(pg_versions get-default 2>/dev/null) || true
+
+# If this package is not set as the default PostgreSQL version (see
+# pg_versions), let it go.
+[ "$default_ver" = "$pkgver_major" ] || exit 0
+
+# If this package ('postgresql<majorver>') has been installed explicitly, i.e.
+# not via 'postgresql' provider or as a dependency, the user is apparently
+# uninstalling it intentionally, so let it go.
+grep -Fqx "postgresql$pkgver_major" /etc/apk/world 2>/dev/null && exit 0
+
+data_dir=$(
+	. /etc/conf.d/postgresql 2>/dev/null
+	echo "${data_dir:-"/var/lib/postgresql/$pkgver_major/data"}"
+)
+# If data_dir for this version does not exist or is empty, let it go.
+[ -f "$data_dir"/PG_VERSION ] || exit 0
+
+
+cat >&2 <<EOF
+*
+* You are uninstalling your default PostgreSQL version ($default_ver) which seems to be
+* in use! If it's *not* intentional and you want to preserve this version,
+* install it explicitly: \`apk add postgresql$default_ver\`.
+*
+* Please note that to upgrade your cluster to a new major version using
+* pg_upgrade(1), you must have both the old and new versions installed.
+*
+EOF
+
+exit 1
diff --git a/main/postgresql15/remove-libecpg_compat.patch b/main/postgresql15/remove-libecpg_compat.patch
new file mode 100644
index 00000000000..ff5fab07fad
--- /dev/null
+++ b/main/postgresql15/remove-libecpg_compat.patch
@@ -0,0 +1,18 @@
+Nothing ever depended on libecpg_compat.so.3 in Fedora, so don't build
+it now, at least till somebody explicitly requests that.
+
+Patch-Source: https://src.fedoraproject.org/rpms/libecpg/blob/f35/f/libecpg-10.5-no-compat-lib.patch
+
+diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile
+index 41460a1..cc3dd37 100644
+--- a/src/interfaces/ecpg/Makefile
++++ b/src/interfaces/ecpg/Makefile
+@@ -2,7 +2,7 @@ subdir = src/interfaces/ecpg
+ top_builddir = ../../..
+ include $(top_builddir)/src/Makefile.global
+ 
+-SUBDIRS = include pgtypeslib ecpglib compatlib preproc
++SUBDIRS = include pgtypeslib ecpglib preproc
+ 
+ # Suppress parallel build of subdirectories to avoid a bug in GNU make 3.82, cf
+ # http://savannah.gnu.org/bugs/?30653
diff --git a/main/postgresql15/unix_socket_directories.patch b/main/postgresql15/unix_socket_directories.patch
new file mode 100644
index 00000000000..e7de03ed664
--- /dev/null
+++ b/main/postgresql15/unix_socket_directories.patch
@@ -0,0 +1,29 @@
+Using /tmp for sockets allows everyone to spoof a PostgreSQL server. Thus use
+/run/postgresql/ for "system" clusters which run as 'postgres' (user
+clusters will still use /tmp). Since system cluster are by far the common case,
+set it as default.
+
+This is inspired by Fedora and Debian patches.
+
+--- a/src/backend/utils/misc/postgresql.conf.sample
++++ b/src/backend/utils/misc/postgresql.conf.sample
+@@ -63,7 +63,7 @@
+ #port = 5432				# (change requires restart)
+ #max_connections = 100			# (change requires restart)
+ #superuser_reserved_connections = 3	# (change requires restart)
+-#unix_socket_directories = '/tmp'	# comma-separated list of directories
++unix_socket_directories = '/run/postgresql'	# comma-separated list of directories
+ 					# (change requires restart)
+ #unix_socket_group = ''			# (change requires restart)
+ #unix_socket_permissions = 0777		# begin with 0 to use octal notation
+--- a/src/include/pg_config_manual.h
++++ b/src/include/pg_config_manual.h
+@@ -201,7 +201,7 @@
+  * support them yet.
+  */
+ #ifndef WIN32
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/run/postgresql"
+ #else
+ #define DEFAULT_PGSOCKET_DIR ""
+ #endif
diff --git a/main/postgresql16/APKBUILD b/main/postgresql16/APKBUILD
new file mode 100644
index 00000000000..746c833b7a8
--- /dev/null
+++ b/main/postgresql16/APKBUILD
@@ -0,0 +1,495 @@
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+# Contributor: G.J.R. Timmer <gjr.timmer@gmail.com>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+_pkgname=postgresql
+pkgver=16.2
+pkgrel=2
+_majorver=${pkgver%%[_.]*}
+# Should this aport provide libpq* and libecpg*? true/false
+# Exactly one postgresql aport must be the default one!
+_default_ver=true
+pkgname=$_pkgname$_majorver
+pkgdesc="A sophisticated object-relational DBMS, version $_majorver"
+url="https://www.postgresql.org/"
+arch="all"
+license="PostgreSQL"
+_llvmver=16
+depends="$pkgname-client postgresql-common tzdata"
+depends_dev="
+	libpq-dev
+	libecpg-dev
+	clang$_llvmver
+	icu-dev
+	llvm$_llvmver
+	lz4-dev
+	openssl-dev
+	zstd-dev
+	"
+checkdepends="
+	diffutils
+	icu-data-full
+	perl-ipc-run
+	"
+makedepends="$depends_dev
+	bison
+	flex
+	libxml2-dev
+	linux-headers
+	llvm$_llvmver-dev
+	openldap-dev
+	perl-dev
+	python3-dev
+	readline-dev
+	tcl-dev
+	util-linux-dev
+	zlib-dev
+	"
+pkgusers="postgres"
+pkggroups="postgres"
+install="$pkgname.post-install $pkgname.pre-deinstall"
+provider_priority=$_majorver
+provides="postgresql"
+replaces="postgresql"  # for backward compatibility
+$_default_ver && subpackages="
+	libpq
+	libpq-dev:libpq_dev
+	libecpg
+	libecpg-dev:libecpg_dev
+	"
+subpackages="
+	$subpackages
+	$pkgname-client
+	$pkgname-jit
+	$pkgname-contrib
+	$pkgname-plperl
+	$pkgname-plperl-contrib:plperl_contrib
+	$pkgname-plpython3
+	$pkgname-plpython3-contrib:plpython3_contrib
+	$pkgname-pltcl
+	$pkgname-contrib-jit:contrib_jit
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-openrc
+	"
+source="https://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz2
+	initdb.patch
+	perl-rpath.patch
+	per-version-dirs.patch
+	unix_socket_directories.patch
+	disable-html-docs.patch
+	remove-libecpg_compat.patch
+	czech-snowball-stemmer.patch
+	make-split-headers.patch
+	jit-datalayout-mismatch-on-s390x-and-x86.patch
+	pg_config-add-major-version.patch
+	dont-use-locale-a-on-musl.patch
+	icu-collations-hack.patch
+	libpgport-pkglibdir.patch.txt
+	external-libpq.patch.txt
+
+	pltcl_create_tables.sql
+	"
+builddir="$srcdir/$_pkgname-$pkgver"
+options="net !check"  # TODO: reenable check
+
+# secfixes:
+#   16.2-r0:
+#     - CVE-2024-0985
+#   16.1-r0:
+#     - CVE-2023-5868
+#     - CVE-2023-5869
+#     - CVE-2023-5870
+
+_bindir=usr/libexec/$pkgname
+_datadir=usr/share/$pkgname
+_docdir=usr/share/doc/$pkgname
+_mandir=$_datadir/man
+_includedir=usr/include/postgresql
+# Directory for server-related libraries. This is hard-coded in
+# per-version-dirs.patch.
+_srvlibdir=usr/lib/$pkgname
+
+# Programs to be included in the -client subpackage.
+# TODO: This was probably originally copied from Debian and I have no idea
+#   why these are considered as front-end (client) programs and the rest of
+#   the programs are not. So it should be reviewed.
+_client_cmds="
+	clusterdb
+	createdb
+	createuser
+	dropdb
+	dropuser
+	pg_amcheck
+	pg_basebackup
+	pg_dump
+	pg_dumpall
+	pg_isready
+	pg_receivewal
+	pg_recvlogical
+	pg_restore
+	pg_verifybackup
+	pgbench
+	psql
+	reindexdb
+	vacuumdb
+	"
+
+prepare() {
+	default_prepare
+
+	if $_default_ver; then
+		cp -rl "$builddir" "$builddir-ifaces"
+	else
+		msg 'external-libpq.patch'
+		patch -p1 < "$srcdir"/external-libpq.patch.txt
+	fi
+	# Note: This must be applied after clonning $builddir-ifaces.
+	msg 'libpgport-pkglibdir.patch'
+	patch -p1 < "$srcdir"/libpgport-pkglibdir.patch.txt
+}
+
+build() {
+	export LLVM_CONFIG="/usr/lib/llvm$_llvmver/bin/llvm-config"
+	export PYTHON=/usr/bin/python3
+	export CFLAGS="${CFLAGS/-Os/-O2}"
+	export CPPFLAGS="${CPPFLAGS/-Os/-O2}"
+	# older clang versions don't have a 'clang' exe anymore.
+	export CLANG=clang-$_llvmver
+
+	_configure --with-ldap
+	make world
+
+	if $_default_ver; then
+		cd "$builddir-ifaces"
+
+		_configure --without-ldap
+		local dir; for dir in include common port interfaces bin/pg_config; do
+			make -C src/$dir
+		done
+	fi
+}
+
+_configure() {
+	local _extra_opts
+	# When disable-spinlocks is no longer required - check postgresql-bdr package.
+	case "$CARCH" in
+		riscv64) _extra_opts='--disable-spinlocks';;
+	esac
+	want_check && _extra_opts="$_extra_opts --enable-tap-tests"
+
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--bindir=/$_bindir \
+		--datarootdir=/usr/share \
+		--datadir=/$_datadir \
+		--docdir=/$_docdir \
+		--includedir=/$_includedir \
+		--libdir=/usr/lib \
+		--mandir=/$_mandir \
+		--sysconfdir=/etc/postgresql \
+		--disable-rpath \
+		--with-system-tzdata=/usr/share/zoneinfo \
+		--with-libxml \
+		--with-openssl \
+		--with-uuid=e2fs \
+		--with-llvm \
+		--with-perl \
+		--with-python \
+		--with-tcl \
+		--with-lz4 \
+		--with-zstd \
+		$_extra_opts \
+		"$@"
+}
+
+check() {
+	#_run_tests src/test
+	#_run_tests src/pl
+	_run_tests contrib
+}
+
+package() {
+	make DESTDIR="$pkgdir" install install-docs
+
+	if $_default_ver; then
+		cd "$builddir-ifaces"
+
+		# Override libpq and libecpg files with the build without LDAP support.
+		local dir; for dir in common port interfaces bin/pg_config; do
+			make -C src/$dir DESTDIR="$pkgdir" bindir=/usr/bin install
+		done
+		make -C src/include DESTDIR="$pkgdir" install-interfaces
+	fi
+
+	cd "$pkgdir"
+
+	# Duplicate of usr/bin/ecpg.
+	rm -f ./$_bindir/ecpg
+
+	mkdir -p ./usr/bin
+	ln -s /$_bindir/postgres ./usr/bin/postgres$_majorver
+
+	# This file is used by pg_versions and init script.
+	echo "$_majorver" > ./$_bindir/PG_VERSION
+
+	install -d -m750 -o postgres -g postgres \
+		./etc/postgresql$_majorver \
+		./var/lib/postgresql \
+		./var/log/postgresql
+
+	local server_cmds=$(_setdiff "$(ls -1 $_bindir)" "$_client_cmds pg_config ecpg PG_VERSION")
+	[ "$server_cmds" ] || die 'package: variable server_cmds is empty'
+
+	# These commands are symlinked to /usr/bin by pg_versions script after
+	# installation.
+	provides="$provides $(echo "$server_cmds" | sed 's/^/cmd:&/')"
+}
+
+libpq() {
+	pkgdesc="PostgreSQL client library"
+	depends=""
+	replaces=""
+
+	amove usr/lib/libpq.so.*
+}
+
+libpq_dev() {
+	pkgdesc="PostgreSQL client library (development files)"
+	depends=""
+	replaces=""
+
+	amove usr/bin/pg_config
+
+	amove $_includedir/internal/*
+	amove $_includedir/libpq-*.h
+	amove $_includedir/libpq/*
+	amove $_includedir/pg_config*.h
+	amove $_includedir/postgres_ext.h
+
+	amove usr/lib/libpq.*
+	amove usr/lib/libpgcommon*.a
+	amove usr/lib/libpgport*.a
+	amove usr/lib/pkgconfig/libpq.pc
+}
+
+libecpg() {
+	pkgdesc="ECPG - Embedded SQL in C"
+	depends=""
+	provides="postgresql-libs"  # for backward compatibility (Alpine <3.15)
+	replaces="$provides"  # for backward compatibility (Alpine <3.15)
+
+	amove usr/lib/libecpg.so.*
+	amove usr/lib/libpgtypes.so.*
+}
+
+libecpg_dev() {
+	pkgdesc="ECPG - Embedded SQL in C (development files)"
+	depends="libpq-dev=$pkgver-r$pkgrel"
+	replaces=""
+
+	amove usr/bin/ecpg
+
+	amove $_includedir/ecpg*.h
+	amove $_includedir/informix/*
+	amove $_includedir/pgtypes*.h
+	amove $_includedir/sql3types.h
+	amove $_includedir/sqlca.h
+	amove $_includedir/sqlda*.h
+
+	amove usr/lib/libecpg.*
+	amove usr/lib/libpgtypes.*
+	amove usr/lib/pkgconfig/libecpg.pc
+	amove usr/lib/pkgconfig/libpgtypes.pc
+}
+
+client() {
+	pkgdesc="PostgreSQL client"
+	depends="postgresql-common"
+	_subpkg_common
+
+	local cmd; for cmd in $_client_cmds; do
+		amove $_bindir/$cmd
+		# These commands are symlinked to /usr/bin by pg_versions script after
+		# installation.
+		provides="$provides cmd:$cmd"
+	done
+	amove $_bindir/PG_VERSION
+}
+
+jit() {
+	pkgdesc="Just-in-time compilation support for PostgreSQL"
+	depends="$pkgname=$pkgver-r$pkgrel"
+	_subpkg_common
+
+	amove $_srvlibdir/bitcode/*
+	amove $_srvlibdir/llvmjit.so
+	amove $_srvlibdir/llvmjit_types.bc
+}
+
+contrib() {
+	pkgdesc="Extension modules distributed with PostgreSQL"
+	depends="$pkgname=$pkgver-r$pkgrel"
+	_subpkg_common
+
+	cd "$builddir"
+
+	# Avoid installing plperl and plpython extensions, these will be
+	# installed into separate subpackages.
+	sed -Ei -e 's/(.*_plperl)/#\1/' \
+		-e 's/(.*_plpython)/#\1/' \
+		contrib/Makefile
+
+	make -C contrib DESTDIR="$subpkgdir" install
+
+	_contrib_common
+
+	provides="$provides $(ls -1 "$subpkgdir"/$_bindir | sed 's/^/cmd:&/')"
+}
+
+pltcl() {
+	pkgdesc="PL/Tcl procedural language for PostgreSQL"
+	depends="$pkgname=$pkgver-r$pkgrel pgtcl"
+	_subpkg_common
+
+	amove $_srvlibdir/pltcl.so
+	amove $_datadir/extension/pltcl*
+
+	install -m 644 "$srcdir"/pltcl_create_tables.sql -t "$subpkgdir"/$_datadir/
+}
+
+plperl() {
+	pkgdesc="PL/Perl procedural language for PostgreSQL"
+	depends="$pkgname=$pkgver-r$pkgrel"
+	_subpkg_common
+
+	amove $_srvlibdir/plperl.so
+	amove $_datadir/extension/plperl*
+}
+
+plperl_contrib() {
+	_plcontrib plperl "PL/Perl"
+
+	cd "$builddir"
+	make -C contrib/hstore_plperl DESTDIR="$subpkgdir" install
+
+	_contrib_common
+}
+
+plpython3() {
+	pkgdesc="PL/Python3 procedural language for PostgreSQL"
+	depends="$pkgname=$pkgver-r$pkgrel python3"
+	_subpkg_common
+
+	amove $_srvlibdir/plpython3.so
+	amove $_datadir/extension/plpython*
+}
+
+plpython3_contrib() {
+	_plcontrib plpython3 "PL/Python 3"
+
+	cd "$builddir"
+	make -C contrib/hstore_plpython DESTDIR="$subpkgdir" install
+	make -C contrib/ltree_plpython DESTDIR="$subpkgdir" install
+
+	_contrib_common
+}
+
+contrib_jit() {
+	pkgdesc="Extension modules distributed with PostgreSQL (JIT support)"
+	depends="$pkgname-contrib=$pkgver-r$pkgrel"
+	install_if="$pkgname-jit $pkgname-contrib=$pkgver-r$pkgrel"
+	_subpkg_common
+
+	amove $_srvlibdir/bitcode/*
+}
+
+dev() {
+	default_dev
+	_subpkg_common
+	replaces=""
+
+	amove $_srvlibdir/pgxs/*
+}
+
+doc() {
+	default_doc
+	_subpkg_common
+
+	amove $_mandir
+}
+
+openrc() {
+	default_openrc
+	depends="postgresql-common-openrc"
+
+	mkdir -p "$subpkgdir"
+}
+
+_plcontrib() {
+	local subname="$1"
+	pkgdesc="$2 extension modules distributed with PostgreSQL"
+	depends="$pkgname-$subname=$pkgver-r$pkgrel"
+	install_if="$pkgname-$subname=$pkgver-r$pkgrel $pkgname-contrib=$pkgver-r$pkgrel"
+	_subpkg_common
+}
+
+_subpkg_common() {
+	provides="postgresql${subpkgname#$pkgname}"
+	replaces="$provides"  # for backward compatibility
+}
+
+_contrib_common() {
+	# Move headers, bitcode and docs from subpackage back to pkgdir, so it
+	# can be catched by subsequent split functions.
+	local dir; for dir in $_includedir $_srvlibdir/bitcode $_docdir; do
+		[ -d "$subpkgdir"/$dir ] || continue
+
+		mkdir -p "$pkgdir"/$dir
+		cp -rf "$subpkgdir"/$dir/* "$pkgdir"/$dir/
+		rm -rf "$subpkgdir"/$dir/*
+		rmdir -p "$subpkgdir"/$dir || true
+	done
+}
+
+_run_tests() {
+	local path="$1"; shift
+
+	msg "Running test suite at $path..."
+	# Note: some tests fail when running in parallel.
+	make -k -j 1 -C "$path" "$@" check MAX_CONNECTIONS=5 || {
+		printf "\n%s\n\n" "Trying to find all regression.diffs files in build directory..." >&2
+		find "$path" -name regression.diffs | while read -r file; do
+			echo "=== test failure: $file ===" >&2
+			cat "$file" >&2
+		done
+		return 1
+	}
+}
+
+# $1: whitespace-separated items of set A
+# $2: whitespace-separated items of set B
+# stdout: newline-separated items of A - B
+_setdiff() {
+	python3 -c 'import sys;print("\n".join(set(sys.argv[1].split()).difference(set(sys.argv[2].split()))))' "$@"
+}
+
+sha512sums="
+3194941cc3f1ec86b6cf4f08c6422d268d99890441f8fc9ab87b6a7fd16c990fa230b544308644cbef54e6960c4984e3703752e40930bdc0537b7bfda3ab7ccf  postgresql-16.2.tar.bz2
+73080f61ae274a214966d2d010de49c8c90eb3180e4f56d86a9e23063eaddbe7f8d2c40ed414591c16bc9cfe88577866af2a965c2b6effb54965d19ef96a3fa9  initdb.patch
+27e00b58fe5c3899c66fc0dde51846c14701bcfedd132b106d676783ba603e8cbdc6e620f29b52dc892bdaa9302052788cf5e575a1659f61c017a12e0d2ee4d0  perl-rpath.patch
+413e979745f81a5b95b7ad9ea44452217d095e3ee6b4a82b636a7b3c89093fefbe7b8d210e4f6bfdab1d6f81309133719e90b7eab93ba60ef2bb78308c52b3b9  per-version-dirs.patch
+d0040599d7646b709af4e3413bf0c228090f256395e806f3fee230ccc6037ed9c0df1cd160d01b6a73b25a742fdd3fb070733a14a78f53d297fbdbbb44f6f878  unix_socket_directories.patch
+2e33e1ae38d60e0daf3ed18e6eaa9ddf6762b4b1bb7e51f1d2690e3df9d602aa1a700e603ba3ee69314a75a963131c7dc67c1b1f8b7eb5564e9c4253e81a4db4  disable-html-docs.patch
+d8eb4274a54b94bed4a2ded7ae775c5a95ca0f051b831b859ccf78bf6d2ea6fe89a9a0611771f6ad85573995a7e3af1fdf5859e20cae3267a52239f12e1b61c3  remove-libecpg_compat.patch
+9cd5fa30f98acf11c5e4bd4593ea5bc8dbda81309133f30925d4c1689e9125f73d08d22208964b5fdcd1b328af2dc9ccdd6a6fe588e448b33a030f984a7b357f  czech-snowball-stemmer.patch
+5262f4944844bccc839c4441570b9eb2e0792390234ebfdb8ebb7b83380ce5f5de84b038cb03045526da202a185af9c3972c2ae1b9e0e743a95c6e84f4621cf9  make-split-headers.patch
+c24986becfd73546a062612335e53b4da34829e42a0c30e85ed7481924f13b1fd0a0e5079d680905a52afea1e99f2210cc3692c529a34a74cd6961c88cce9163  jit-datalayout-mismatch-on-s390x-and-x86.patch
+04751b23c7085b40829c6d2d63bb428e04b11d79aa58804045f2ed52d096e75304b1c7d0f8f37e3398156f18f69e6f6f2879ece46209c091b4348bc39d181511  pg_config-add-major-version.patch
+b0688d66fdd7d612c24d9aa69bdd80d30787d2d6409b4524c79b41797144fc743213460e6de9c536bfb72da089f92cf89731f15137b1407fd04ca97fd393bfd2  dont-use-locale-a-on-musl.patch
+e1949917fa3ea7cfc25b843d22139694628f73b0eb763a92a23f19d0a87230d805a2454657652c200e916d6fc6ef1b16d2d7cb27b0195d4b69f8583f64d11b65  icu-collations-hack.patch
+cde5fbf5a39e5de18a40ec1d9ac919dcf166e0ca178a6b9dbdfded8d16b4969b91917a2550bbf33eccd1ecb3bd9e0753a47012e60f4efe720bbef2a2c5368529  libpgport-pkglibdir.patch.txt
+6078defb3da67e7df96665cc130d32b69eebfcaf49d92eef368ea8eea8bb311fab56064c104bc97f53da9cd925301bef696b506af33e0b66d65bc6cd41ec7499  external-libpq.patch.txt
+5c9bfd9e295dcf678298bf0aa974347a7c311d6e7c2aa76a6920fcb751d01fd1ab77abbec11f3c672f927ad9deaa88e04e370c0b5cd1b60087554c474b748731  pltcl_create_tables.sql
+"
diff --git a/main/postgresql16/czech-snowball-stemmer.patch b/main/postgresql16/czech-snowball-stemmer.patch
new file mode 100644
index 00000000000..96d9d72c78e
--- /dev/null
+++ b/main/postgresql16/czech-snowball-stemmer.patch
@@ -0,0 +1,1067 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Thu, 7 Jan 2021 00:55:21 +0100
+Subject: [PATCH] Add Czech Snowball Stemmer
+
+This patch is based on [1] from Jan Dedek. It includes C implementation of
+the Czech Snowball stemmer generated automatically using Snowball utility
+from sources available at https://snowballstem.org/otherapps/oregan/
+(licensed under BSD).
+
+File czech.stop was extracted from http://www.pgsql.cz/data/czech.tar.gz
+(author of this tarball is Pavel Stehule).
+
+[1]: https://github.com/datlowe/postgres_snowball_czech/commit/4363325f719a463fce04c04cbcdcc7e625cdbca5
+
+diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c
+--- a/src/backend/snowball/dict_snowball.c
++++ b/src/backend/snowball/dict_snowball.c
+@@ -49,6 +49,7 @@
+ #include "snowball/libstemmer/stem_UTF_8_armenian.h"
+ #include "snowball/libstemmer/stem_UTF_8_basque.h"
+ #include "snowball/libstemmer/stem_UTF_8_catalan.h"
++#include "snowball/libstemmer/stem_UTF_8_czech.h"
+ #include "snowball/libstemmer/stem_UTF_8_danish.h"
+ #include "snowball/libstemmer/stem_UTF_8_dutch.h"
+ #include "snowball/libstemmer/stem_UTF_8_english.h"
+@@ -123,6 +124,7 @@
+ 	STEMMER_MODULE(armenian, PG_UTF8, UTF_8),
+ 	STEMMER_MODULE(basque, PG_UTF8, UTF_8),
+ 	STEMMER_MODULE(catalan, PG_UTF8, UTF_8),
++	STEMMER_MODULE(czech, PG_UTF8, UTF_8),
+ 	STEMMER_MODULE(danish, PG_UTF8, UTF_8),
+ 	STEMMER_MODULE(dutch, PG_UTF8, UTF_8),
+ 	STEMMER_MODULE(english, PG_UTF8, UTF_8),
+diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile
+--- a/src/backend/snowball/Makefile
++++ b/src/backend/snowball/Makefile
+@@ -46,6 +46,7 @@
+ 	stem_UTF_8_armenian.o \
+ 	stem_UTF_8_basque.o \
+ 	stem_UTF_8_catalan.o \
++	stem_UTF_8_czech.o \
+ 	stem_UTF_8_danish.o \
+ 	stem_UTF_8_dutch.o \
+ 	stem_UTF_8_english.o \
+diff --git a/src/backend/snowball/snowball_create.pl b/src/backend/snowball/snowball_create.pl
+--- a/src/backend/snowball/snowball_create.pl
++++ b/src/backend/snowball/snowball_create.pl
+@@ -14,6 +14,7 @@
+   armenian
+   basque
+   catalan
++  czech
+   danish
+   dutch
+   english
+diff --git a/src/backend/snowball/libstemmer/stem_UTF_8_czech.c b/src/backend/snowball/libstemmer/stem_UTF_8_czech.c
+new file mode 100644
+index 000000000000..d23663fa077f
+--- /dev/null
++++ b/src/backend/snowball/libstemmer/stem_UTF_8_czech.c
+@@ -0,0 +1,894 @@
++/* This file was generated automatically by the Snowball to ISO C compiler */
++/* http://snowballstem.org/ */
++
++#include "header.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++extern int czech_UTF_8_stem(struct SN_env * z);
++#ifdef __cplusplus
++}
++#endif
++static int r_do_aggressive(struct SN_env * z);
++static int r_do_deriv_single(struct SN_env * z);
++static int r_do_derivational(struct SN_env * z);
++static int r_do_augmentative(struct SN_env * z);
++static int r_do_diminutive(struct SN_env * z);
++static int r_do_comparative(struct SN_env * z);
++static int r_do_case(struct SN_env * z);
++static int r_do_possessive(struct SN_env * z);
++static int r_mark_regions(struct SN_env * z);
++static int r_palatalise(struct SN_env * z);
++static int r_R1(struct SN_env * z);
++static int r_RV(struct SN_env * z);
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++
++extern struct SN_env * czech_UTF_8_create_env(void);
++extern void czech_UTF_8_close_env(struct SN_env * z);
++
++
++#ifdef __cplusplus
++}
++#endif
++static const symbol s_0_0[2] = { 'c', 'e' };
++static const symbol s_0_1[2] = { 'z', 'e' };
++static const symbol s_0_2[3] = { 0xC2, 0xBE, 'e' };
++static const symbol s_0_3[2] = { 'c', 'i' };
++static const symbol s_0_4[4] = { 0xC3, 0xA8, 't', 'i' };
++static const symbol s_0_5[4] = { 0xC2, 0xB9, 't', 'i' };
++static const symbol s_0_6[2] = { 'z', 'i' };
++static const symbol s_0_7[3] = { 0xC3, 0xA8, 'i' };
++static const symbol s_0_8[3] = { 0xC2, 0xBE, 'i' };
++static const symbol s_0_9[2] = { 0xC3, 0xA8 };
++static const symbol s_0_10[5] = { 0xC3, 0xA8, 't', 0xC3, 0xA9 };
++static const symbol s_0_11[5] = { 0xC2, 0xB9, 't', 0xC3, 0xA9 };
++static const symbol s_0_12[5] = { 0xC3, 0xA8, 't', 0xC3, 0xAC };
++static const symbol s_0_13[5] = { 0xC2, 0xB9, 't', 0xC3, 0xAC };
++
++static const struct among a_0[14] =
++{
++/*  0 */ { 2, s_0_0, -1, 1, 0},
++/*  1 */ { 2, s_0_1, -1, 2, 0},
++/*  2 */ { 3, s_0_2, -1, 2, 0},
++/*  3 */ { 2, s_0_3, -1, 1, 0},
++/*  4 */ { 4, s_0_4, -1, 3, 0},
++/*  5 */ { 4, s_0_5, -1, 4, 0},
++/*  6 */ { 2, s_0_6, -1, 2, 0},
++/*  7 */ { 3, s_0_7, -1, 1, 0},
++/*  8 */ { 3, s_0_8, -1, 2, 0},
++/*  9 */ { 2, s_0_9, -1, 1, 0},
++/* 10 */ { 5, s_0_10, -1, 3, 0},
++/* 11 */ { 5, s_0_11, -1, 4, 0},
++/* 12 */ { 5, s_0_12, -1, 3, 0},
++/* 13 */ { 5, s_0_13, -1, 4, 0}
++};
++
++static const symbol s_1_0[2] = { 'i', 'n' };
++static const symbol s_1_1[2] = { 'o', 'v' };
++static const symbol s_1_2[3] = { 0xC3, 0xB9, 'v' };
++
++static const struct among a_1[3] =
++{
++/*  0 */ { 2, s_1_0, -1, 2, 0},
++/*  1 */ { 2, s_1_1, -1, 1, 0},
++/*  2 */ { 3, s_1_2, -1, 1, 0}
++};
++
++static const symbol s_2_0[1] = { 'a' };
++static const symbol s_2_1[3] = { 'a', 'm', 'a' };
++static const symbol s_2_2[3] = { 'a', 't', 'a' };
++static const symbol s_2_3[1] = { 'e' };
++static const symbol s_2_4[4] = { 0xC3, 0xAC, 't', 'e' };
++static const symbol s_2_5[3] = { 'e', 'c', 'h' };
++static const symbol s_2_6[5] = { 'a', 't', 'e', 'c', 'h' };
++static const symbol s_2_7[3] = { 'i', 'c', 'h' };
++static const symbol s_2_8[4] = { 0xC3, 0xA1, 'c', 'h' };
++static const symbol s_2_9[4] = { 0xC3, 0xAD, 'c', 'h' };
++static const symbol s_2_10[4] = { 0xC3, 0xBD, 'c', 'h' };
++static const symbol s_2_11[1] = { 'i' };
++static const symbol s_2_12[2] = { 'm', 'i' };
++static const symbol s_2_13[3] = { 'a', 'm', 'i' };
++static const symbol s_2_14[3] = { 'e', 'm', 'i' };
++static const symbol s_2_15[4] = { 0xC3, 0xAC, 'm', 'i' };
++static const symbol s_2_16[4] = { 0xC3, 0xAD, 'm', 'i' };
++static const symbol s_2_17[4] = { 0xC3, 0xBD, 'm', 'i' };
++static const symbol s_2_18[4] = { 0xC3, 0xAC, 't', 'i' };
++static const symbol s_2_19[3] = { 'o', 'v', 'i' };
++static const symbol s_2_20[2] = { 'e', 'm' };
++static const symbol s_2_21[5] = { 0xC3, 0xAC, 't', 'e', 'm' };
++static const symbol s_2_22[3] = { 0xC3, 0xA1, 'm' };
++static const symbol s_2_23[3] = { 0xC3, 0xA9, 'm' };
++static const symbol s_2_24[3] = { 0xC3, 0xAD, 'm' };
++static const symbol s_2_25[5] = { 'a', 't', 0xC3, 0xB9, 'm' };
++static const symbol s_2_26[3] = { 0xC3, 0xBD, 'm' };
++static const symbol s_2_27[1] = { 'o' };
++static const symbol s_2_28[3] = { 'i', 'h', 'o' };
++static const symbol s_2_29[4] = { 0xC3, 0xA9, 'h', 'o' };
++static const symbol s_2_30[4] = { 0xC3, 0xAD, 'h', 'o' };
++static const symbol s_2_31[2] = { 'e', 's' };
++static const symbol s_2_32[2] = { 'o', 's' };
++static const symbol s_2_33[2] = { 'u', 's' };
++static const symbol s_2_34[2] = { 'a', 't' };
++static const symbol s_2_35[1] = { 'u' };
++static const symbol s_2_36[3] = { 'i', 'm', 'u' };
++static const symbol s_2_37[4] = { 0xC3, 0xA9, 'm', 'u' };
++static const symbol s_2_38[2] = { 'o', 'u' };
++static const symbol s_2_39[1] = { 'y' };
++static const symbol s_2_40[3] = { 'a', 't', 'y' };
++static const symbol s_2_41[2] = { 0xC3, 0xA1 };
++static const symbol s_2_42[2] = { 0xC3, 0xA9 };
++static const symbol s_2_43[4] = { 'o', 'v', 0xC3, 0xA9 };
++static const symbol s_2_44[2] = { 0xC3, 0xAC };
++static const symbol s_2_45[2] = { 0xC3, 0xAD };
++static const symbol s_2_46[2] = { 0xC3, 0xB9 };
++static const symbol s_2_47[2] = { 0xC3, 0xBD };
++
++static const struct among a_2[48] =
++{
++/*  0 */ { 1, s_2_0, -1, 1, 0},
++/*  1 */ { 3, s_2_1, 0, 1, 0},
++/*  2 */ { 3, s_2_2, 0, 1, 0},
++/*  3 */ { 1, s_2_3, -1, 2, 0},
++/*  4 */ { 4, s_2_4, 3, 2, 0},
++/*  5 */ { 3, s_2_5, -1, 2, 0},
++/*  6 */ { 5, s_2_6, 5, 1, 0},
++/*  7 */ { 3, s_2_7, -1, 2, 0},
++/*  8 */ { 4, s_2_8, -1, 1, 0},
++/*  9 */ { 4, s_2_9, -1, 2, 0},
++/* 10 */ { 4, s_2_10, -1, 1, 0},
++/* 11 */ { 1, s_2_11, -1, 2, 0},
++/* 12 */ { 2, s_2_12, 11, 1, 0},
++/* 13 */ { 3, s_2_13, 12, 1, 0},
++/* 14 */ { 3, s_2_14, 12, 2, 0},
++/* 15 */ { 4, s_2_15, 12, 2, 0},
++/* 16 */ { 4, s_2_16, 12, 2, 0},
++/* 17 */ { 4, s_2_17, 12, 1, 0},
++/* 18 */ { 4, s_2_18, 11, 2, 0},
++/* 19 */ { 3, s_2_19, 11, 1, 0},
++/* 20 */ { 2, s_2_20, -1, 3, 0},
++/* 21 */ { 5, s_2_21, 20, 1, 0},
++/* 22 */ { 3, s_2_22, -1, 1, 0},
++/* 23 */ { 3, s_2_23, -1, 2, 0},
++/* 24 */ { 3, s_2_24, -1, 2, 0},
++/* 25 */ { 5, s_2_25, -1, 1, 0},
++/* 26 */ { 3, s_2_26, -1, 1, 0},
++/* 27 */ { 1, s_2_27, -1, 1, 0},
++/* 28 */ { 3, s_2_28, 27, 2, 0},
++/* 29 */ { 4, s_2_29, 27, 2, 0},
++/* 30 */ { 4, s_2_30, 27, 2, 0},
++/* 31 */ { 2, s_2_31, -1, 2, 0},
++/* 32 */ { 2, s_2_32, -1, 1, 0},
++/* 33 */ { 2, s_2_33, -1, 1, 0},
++/* 34 */ { 2, s_2_34, -1, 1, 0},
++/* 35 */ { 1, s_2_35, -1, 1, 0},
++/* 36 */ { 3, s_2_36, 35, 2, 0},
++/* 37 */ { 4, s_2_37, 35, 2, 0},
++/* 38 */ { 2, s_2_38, 35, 1, 0},
++/* 39 */ { 1, s_2_39, -1, 1, 0},
++/* 40 */ { 3, s_2_40, 39, 1, 0},
++/* 41 */ { 2, s_2_41, -1, 1, 0},
++/* 42 */ { 2, s_2_42, -1, 1, 0},
++/* 43 */ { 4, s_2_43, 42, 1, 0},
++/* 44 */ { 2, s_2_44, -1, 2, 0},
++/* 45 */ { 2, s_2_45, -1, 2, 0},
++/* 46 */ { 2, s_2_46, -1, 1, 0},
++/* 47 */ { 2, s_2_47, -1, 1, 0}
++};
++
++static const symbol s_3_0[2] = { 'o', 'b' };
++static const symbol s_3_1[3] = { 'i', 't', 'b' };
++static const symbol s_3_2[2] = { 'e', 'c' };
++static const symbol s_3_3[4] = { 'i', 'n', 'e', 'c' };
++static const symbol s_3_4[6] = { 'o', 'b', 'i', 'n', 'e', 'c' };
++static const symbol s_3_5[4] = { 'o', 'v', 'e', 'c' };
++static const symbol s_3_6[2] = { 'i', 'c' };
++static const symbol s_3_7[4] = { 'e', 'n', 'i', 'c' };
++static const symbol s_3_8[3] = { 'o', 'c', 'h' };
++static const symbol s_3_9[5] = { 0xC3, 0xA1, 's', 'e', 'k' };
++static const symbol s_3_10[2] = { 'n', 'k' };
++static const symbol s_3_11[3] = { 'i', 's', 'k' };
++static const symbol s_3_12[5] = { 'o', 'v', 'i', 's', 'k' };
++static const symbol s_3_13[2] = { 't', 'k' };
++static const symbol s_3_14[2] = { 'v', 'k' };
++static const symbol s_3_15[3] = { 0xC3, 0xA8, 'k' };
++static const symbol s_3_16[4] = { 'n', 0xC3, 0xAD, 'k' };
++static const symbol s_3_17[6] = { 'o', 'v', 'n', 0xC3, 0xAD, 'k' };
++static const symbol s_3_18[5] = { 'o', 'v', 0xC3, 0xAD, 'k' };
++static const symbol s_3_19[4] = { 'i', 0xC2, 0xB9, 'k' };
++static const symbol s_3_20[4] = { 'u', 0xC2, 0xB9, 'k' };
++static const symbol s_3_21[2] = { 'd', 'l' };
++static const symbol s_3_22[4] = { 'i', 't', 'e', 'l' };
++static const symbol s_3_23[2] = { 'u', 'l' };
++static const symbol s_3_24[2] = { 'a', 'n' };
++static const symbol s_3_25[4] = { 0xC3, 0xA8, 'a', 'n' };
++static const symbol s_3_26[2] = { 'e', 'n' };
++static const symbol s_3_27[2] = { 'i', 'n' };
++static const symbol s_3_28[5] = { 0xC2, 0xB9, 't', 'i', 'n' };
++static const symbol s_3_29[4] = { 'o', 'v', 'i', 'n' };
++static const symbol s_3_30[4] = { 't', 'e', 'l', 'n' };
++static const symbol s_3_31[4] = { 0xC3, 0xA1, 'r', 'n' };
++static const symbol s_3_32[4] = { 0xC3, 0xAD, 'r', 'n' };
++static const symbol s_3_33[3] = { 'o', 'u', 'n' };
++static const symbol s_3_34[4] = { 'l', 'o', 'u', 'n' };
++static const symbol s_3_35[3] = { 'o', 'v', 'n' };
++static const symbol s_3_36[2] = { 'y', 'n' };
++static const symbol s_3_37[3] = { 'k', 'y', 'n' };
++static const symbol s_3_38[3] = { 0xC3, 0xA1, 'n' };
++static const symbol s_3_39[4] = { 'i', 0xC3, 0xA1, 'n' };
++static const symbol s_3_40[3] = { 0xC3, 0xA8, 'n' };
++static const symbol s_3_41[3] = { 0xC3, 0xAC, 'n' };
++static const symbol s_3_42[3] = { 0xC3, 0xAD, 'n' };
++static const symbol s_3_43[2] = { 'a', 's' };
++static const symbol s_3_44[2] = { 'i', 't' };
++static const symbol s_3_45[2] = { 'o', 't' };
++static const symbol s_3_46[3] = { 'i', 's', 't' };
++static const symbol s_3_47[3] = { 'o', 's', 't' };
++static const symbol s_3_48[4] = { 'n', 'o', 's', 't' };
++static const symbol s_3_49[3] = { 'o', 'u', 't' };
++static const symbol s_3_50[6] = { 'o', 'v', 'i', 0xC2, 0xB9, 't' };
++static const symbol s_3_51[2] = { 'i', 'v' };
++static const symbol s_3_52[2] = { 'o', 'v' };
++static const symbol s_3_53[2] = { 't', 'v' };
++static const symbol s_3_54[3] = { 'c', 't', 'v' };
++static const symbol s_3_55[3] = { 's', 't', 'v' };
++static const symbol s_3_56[5] = { 'o', 'v', 's', 't', 'v' };
++static const symbol s_3_57[4] = { 'o', 'v', 't', 'v' };
++static const symbol s_3_58[3] = { 'a', 0xC3, 0xA8 };
++static const symbol s_3_59[4] = { 0xC3, 0xA1, 0xC3, 0xA8 };
++static const symbol s_3_60[3] = { 'o', 0xC3, 0xB2 };
++static const symbol s_3_61[4] = { 0xC3, 0xA1, 0xC3, 0xB8 };
++static const symbol s_3_62[5] = { 'k', 0xC3, 0xA1, 0xC3, 0xB8 };
++static const symbol s_3_63[7] = { 'i', 'o', 'n', 0xC3, 0xA1, 0xC3, 0xB8 };
++static const symbol s_3_64[4] = { 0xC3, 0xA9, 0xC3, 0xB8 };
++static const symbol s_3_65[5] = { 'n', 0xC3, 0xA9, 0xC3, 0xB8 };
++static const symbol s_3_66[4] = { 0xC3, 0xAD, 0xC3, 0xB8 };
++static const symbol s_3_67[4] = { 'o', 'u', 0xC2, 0xB9 };
++
++static const struct among a_3[68] =
++{
++/*  0 */ { 2, s_3_0, -1, 1, 0},
++/*  1 */ { 3, s_3_1, -1, 2, 0},
++/*  2 */ { 2, s_3_2, -1, 3, 0},
++/*  3 */ { 4, s_3_3, 2, 2, 0},
++/*  4 */ { 6, s_3_4, 3, 1, 0},
++/*  5 */ { 4, s_3_5, 2, 1, 0},
++/*  6 */ { 2, s_3_6, -1, 2, 0},
++/*  7 */ { 4, s_3_7, 6, 3, 0},
++/*  8 */ { 3, s_3_8, -1, 1, 0},
++/*  9 */ { 5, s_3_9, -1, 1, 0},
++/* 10 */ { 2, s_3_10, -1, 1, 0},
++/* 11 */ { 3, s_3_11, -1, 2, 0},
++/* 12 */ { 5, s_3_12, 11, 1, 0},
++/* 13 */ { 2, s_3_13, -1, 1, 0},
++/* 14 */ { 2, s_3_14, -1, 1, 0},
++/* 15 */ { 3, s_3_15, -1, 1, 0},
++/* 16 */ { 4, s_3_16, -1, 1, 0},
++/* 17 */ { 6, s_3_17, 16, 1, 0},
++/* 18 */ { 5, s_3_18, -1, 1, 0},
++/* 19 */ { 4, s_3_19, -1, 2, 0},
++/* 20 */ { 4, s_3_20, -1, 1, 0},
++/* 21 */ { 2, s_3_21, -1, 1, 0},
++/* 22 */ { 4, s_3_22, -1, 2, 0},
++/* 23 */ { 2, s_3_23, -1, 1, 0},
++/* 24 */ { 2, s_3_24, -1, 1, 0},
++/* 25 */ { 4, s_3_25, 24, 1, 0},
++/* 26 */ { 2, s_3_26, -1, 3, 0},
++/* 27 */ { 2, s_3_27, -1, 2, 0},
++/* 28 */ { 5, s_3_28, 27, 1, 0},
++/* 29 */ { 4, s_3_29, 27, 1, 0},
++/* 30 */ { 4, s_3_30, -1, 1, 0},
++/* 31 */ { 4, s_3_31, -1, 1, 0},
++/* 32 */ { 4, s_3_32, -1, 6, 0},
++/* 33 */ { 3, s_3_33, -1, 1, 0},
++/* 34 */ { 4, s_3_34, 33, 1, 0},
++/* 35 */ { 3, s_3_35, -1, 1, 0},
++/* 36 */ { 2, s_3_36, -1, 1, 0},
++/* 37 */ { 3, s_3_37, 36, 1, 0},
++/* 38 */ { 3, s_3_38, -1, 1, 0},
++/* 39 */ { 4, s_3_39, 38, 2, 0},
++/* 40 */ { 3, s_3_40, -1, 1, 0},
++/* 41 */ { 3, s_3_41, -1, 5, 0},
++/* 42 */ { 3, s_3_42, -1, 6, 0},
++/* 43 */ { 2, s_3_43, -1, 1, 0},
++/* 44 */ { 2, s_3_44, -1, 2, 0},
++/* 45 */ { 2, s_3_45, -1, 1, 0},
++/* 46 */ { 3, s_3_46, -1, 2, 0},
++/* 47 */ { 3, s_3_47, -1, 1, 0},
++/* 48 */ { 4, s_3_48, 47, 1, 0},
++/* 49 */ { 3, s_3_49, -1, 1, 0},
++/* 50 */ { 6, s_3_50, -1, 1, 0},
++/* 51 */ { 2, s_3_51, -1, 2, 0},
++/* 52 */ { 2, s_3_52, -1, 1, 0},
++/* 53 */ { 2, s_3_53, -1, 1, 0},
++/* 54 */ { 3, s_3_54, 53, 1, 0},
++/* 55 */ { 3, s_3_55, 53, 1, 0},
++/* 56 */ { 5, s_3_56, 55, 1, 0},
++/* 57 */ { 4, s_3_57, 53, 1, 0},
++/* 58 */ { 3, s_3_58, -1, 1, 0},
++/* 59 */ { 4, s_3_59, -1, 1, 0},
++/* 60 */ { 3, s_3_60, -1, 1, 0},
++/* 61 */ { 4, s_3_61, -1, 1, 0},
++/* 62 */ { 5, s_3_62, 61, 1, 0},
++/* 63 */ { 7, s_3_63, 61, 2, 0},
++/* 64 */ { 4, s_3_64, -1, 4, 0},
++/* 65 */ { 5, s_3_65, 64, 1, 0},
++/* 66 */ { 4, s_3_66, -1, 6, 0},
++/* 67 */ { 4, s_3_67, -1, 1, 0}
++};
++
++static const symbol s_4_0[1] = { 'c' };
++static const symbol s_4_1[1] = { 'k' };
++static const symbol s_4_2[1] = { 'l' };
++static const symbol s_4_3[1] = { 'n' };
++static const symbol s_4_4[1] = { 't' };
++static const symbol s_4_5[2] = { 0xC3, 0xA8 };
++
++static const struct among a_4[6] =
++{
++/*  0 */ { 1, s_4_0, -1, 1, 0},
++/*  1 */ { 1, s_4_1, -1, 1, 0},
++/*  2 */ { 1, s_4_2, -1, 1, 0},
++/*  3 */ { 1, s_4_3, -1, 1, 0},
++/*  4 */ { 1, s_4_4, -1, 1, 0},
++/*  5 */ { 2, s_4_5, -1, 1, 0}
++};
++
++static const symbol s_5_0[3] = { 'i', 's', 'k' };
++static const symbol s_5_1[3] = { 0xC3, 0xA1, 'k' };
++static const symbol s_5_2[3] = { 'i', 'z', 'n' };
++static const symbol s_5_3[4] = { 'a', 'j', 'z', 'n' };
++
++static const struct among a_5[4] =
++{
++/*  0 */ { 3, s_5_0, -1, 2, 0},
++/*  1 */ { 3, s_5_1, -1, 1, 0},
++/*  2 */ { 3, s_5_2, -1, 2, 0},
++/*  3 */ { 4, s_5_3, -1, 1, 0}
++};
++
++static const symbol s_6_0[1] = { 'k' };
++static const symbol s_6_1[2] = { 'a', 'k' };
++static const symbol s_6_2[2] = { 'e', 'k' };
++static const symbol s_6_3[4] = { 'a', 'n', 'e', 'k' };
++static const symbol s_6_4[4] = { 'e', 'n', 'e', 'k' };
++static const symbol s_6_5[4] = { 'i', 'n', 'e', 'k' };
++static const symbol s_6_6[4] = { 'o', 'n', 'e', 'k' };
++static const symbol s_6_7[4] = { 'u', 'n', 'e', 'k' };
++static const symbol s_6_8[5] = { 0xC3, 0xA1, 'n', 'e', 'k' };
++static const symbol s_6_9[5] = { 'a', 0xC3, 0xA8, 'e', 'k' };
++static const symbol s_6_10[5] = { 'e', 0xC3, 0xA8, 'e', 'k' };
++static const symbol s_6_11[5] = { 'i', 0xC3, 0xA8, 'e', 'k' };
++static const symbol s_6_12[5] = { 'o', 0xC3, 0xA8, 'e', 'k' };
++static const symbol s_6_13[5] = { 'u', 0xC3, 0xA8, 'e', 'k' };
++static const symbol s_6_14[6] = { 0xC3, 0xA1, 0xC3, 0xA8, 'e', 'k' };
++static const symbol s_6_15[6] = { 0xC3, 0xA9, 0xC3, 0xA8, 'e', 'k' };
++static const symbol s_6_16[6] = { 0xC3, 0xAD, 0xC3, 0xA8, 'e', 'k' };
++static const symbol s_6_17[6] = { 'o', 'u', 0xC2, 0xB9, 'e', 'k' };
++static const symbol s_6_18[2] = { 'i', 'k' };
++static const symbol s_6_19[3] = { 'a', 'n', 'k' };
++static const symbol s_6_20[3] = { 'e', 'n', 'k' };
++static const symbol s_6_21[3] = { 'i', 'n', 'k' };
++static const symbol s_6_22[3] = { 'o', 'n', 'k' };
++static const symbol s_6_23[3] = { 'u', 'n', 'k' };
++static const symbol s_6_24[4] = { 0xC3, 0xA1, 'n', 'k' };
++static const symbol s_6_25[4] = { 0xC3, 0xA9, 'n', 'k' };
++static const symbol s_6_26[4] = { 0xC3, 0xAD, 'n', 'k' };
++static const symbol s_6_27[2] = { 'o', 'k' };
++static const symbol s_6_28[4] = { 0xC3, 0xA1, 't', 'k' };
++static const symbol s_6_29[2] = { 'u', 'k' };
++static const symbol s_6_30[3] = { 0xC3, 0xA1, 'k' };
++static const symbol s_6_31[4] = { 'a', 0xC3, 0xA8, 'k' };
++static const symbol s_6_32[4] = { 'e', 0xC3, 0xA8, 'k' };
++static const symbol s_6_33[4] = { 'i', 0xC3, 0xA8, 'k' };
++static const symbol s_6_34[4] = { 'o', 0xC3, 0xA8, 'k' };
++static const symbol s_6_35[4] = { 'u', 0xC3, 0xA8, 'k' };
++static const symbol s_6_36[5] = { 0xC3, 0xA1, 0xC3, 0xA8, 'k' };
++static const symbol s_6_37[5] = { 0xC3, 0xA9, 0xC3, 0xA8, 'k' };
++static const symbol s_6_38[5] = { 0xC3, 0xAD, 0xC3, 0xA8, 'k' };
++static const symbol s_6_39[3] = { 0xC3, 0xA9, 'k' };
++static const symbol s_6_40[3] = { 0xC3, 0xAD, 'k' };
++static const symbol s_6_41[4] = { 'u', 0xC2, 0xB9, 'k' };
++
++static const struct among a_6[42] =
++{
++/*  0 */ { 1, s_6_0, -1, 1, 0},
++/*  1 */ { 2, s_6_1, 0, 7, 0},
++/*  2 */ { 2, s_6_2, 0, 2, 0},
++/*  3 */ { 4, s_6_3, 2, 1, 0},
++/*  4 */ { 4, s_6_4, 2, 2, 0},
++/*  5 */ { 4, s_6_5, 2, 4, 0},
++/*  6 */ { 4, s_6_6, 2, 1, 0},
++/*  7 */ { 4, s_6_7, 2, 1, 0},
++/*  8 */ { 5, s_6_8, 2, 1, 0},
++/*  9 */ { 5, s_6_9, 2, 1, 0},
++/* 10 */ { 5, s_6_10, 2, 2, 0},
++/* 11 */ { 5, s_6_11, 2, 4, 0},
++/* 12 */ { 5, s_6_12, 2, 1, 0},
++/* 13 */ { 5, s_6_13, 2, 1, 0},
++/* 14 */ { 6, s_6_14, 2, 1, 0},
++/* 15 */ { 6, s_6_15, 2, 3, 0},
++/* 16 */ { 6, s_6_16, 2, 5, 0},
++/* 17 */ { 6, s_6_17, 2, 1, 0},
++/* 18 */ { 2, s_6_18, 0, 4, 0},
++/* 19 */ { 3, s_6_19, 0, 1, 0},
++/* 20 */ { 3, s_6_20, 0, 1, 0},
++/* 21 */ { 3, s_6_21, 0, 1, 0},
++/* 22 */ { 3, s_6_22, 0, 1, 0},
++/* 23 */ { 3, s_6_23, 0, 1, 0},
++/* 24 */ { 4, s_6_24, 0, 1, 0},
++/* 25 */ { 4, s_6_25, 0, 1, 0},
++/* 26 */ { 4, s_6_26, 0, 1, 0},
++/* 27 */ { 2, s_6_27, 0, 8, 0},
++/* 28 */ { 4, s_6_28, 0, 1, 0},
++/* 29 */ { 2, s_6_29, 0, 9, 0},
++/* 30 */ { 3, s_6_30, 0, 6, 0},
++/* 31 */ { 4, s_6_31, 0, 1, 0},
++/* 32 */ { 4, s_6_32, 0, 1, 0},
++/* 33 */ { 4, s_6_33, 0, 1, 0},
++/* 34 */ { 4, s_6_34, 0, 1, 0},
++/* 35 */ { 4, s_6_35, 0, 1, 0},
++/* 36 */ { 5, s_6_36, 0, 1, 0},
++/* 37 */ { 5, s_6_37, 0, 1, 0},
++/* 38 */ { 5, s_6_38, 0, 1, 0},
++/* 39 */ { 3, s_6_39, 0, 3, 0},
++/* 40 */ { 3, s_6_40, 0, 5, 0},
++/* 41 */ { 4, s_6_41, 0, 1, 0}
++};
++
++static const symbol s_7_0[4] = { 'e', 'j', 0xC2, 0xB9 };
++static const symbol s_7_1[5] = { 0xC3, 0xAC, 'j', 0xC2, 0xB9 };
++
++static const struct among a_7[2] =
++{
++/*  0 */ { 4, s_7_0, -1, 2, 0},
++/*  1 */ { 5, s_7_1, -1, 1, 0}
++};
++
++static const unsigned char g_v[] = { 17, 65, 16, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 25, 4, 19 };
++
++static const symbol s_0[] = { 'k' };
++static const symbol s_1[] = { 'h' };
++static const symbol s_2[] = { 'c', 'k' };
++static const symbol s_3[] = { 's', 'k' };
++static const symbol s_4[] = { 'e' };
++static const symbol s_5[] = { 'i' };
++static const symbol s_6[] = { 'e' };
++static const symbol s_7[] = { 0xC3, 0xA9 };
++static const symbol s_8[] = { 0xC3, 0xAC };
++static const symbol s_9[] = { 0xC3, 0xAD };
++static const symbol s_10[] = { 'i' };
++static const symbol s_11[] = { 'e' };
++static const symbol s_12[] = { 0xC3, 0xA9 };
++static const symbol s_13[] = { 'i' };
++static const symbol s_14[] = { 0xC3, 0xAD };
++static const symbol s_15[] = { 0xC3, 0xA1 };
++static const symbol s_16[] = { 'a' };
++static const symbol s_17[] = { 'o' };
++static const symbol s_18[] = { 'u' };
++static const symbol s_19[] = { 0xC3, 0xAC };
++static const symbol s_20[] = { 'e' };
++
++static int r_mark_regions(struct SN_env * z) { /* forwardmode */
++    z->I[0] = z->l; /* $pV = <integer expression>, line 45 */
++    z->I[1] = z->l; /* $p1 = <integer expression>, line 46 */
++    {   int c1 = z->c; /* do, line 48 */
++        {    /* gopast */ /* non v, line 49 */
++            int ret = in_grouping_U(z, g_v, 97, 253, 1);
++            if (ret < 0) goto lab0;
++            z->c += ret;
++        }
++        z->I[0] = z->c; /* setmark pV, line 49 */
++        {    /* gopast */ /* non v, line 50 */
++            int ret = in_grouping_U(z, g_v, 97, 253, 1);
++            if (ret < 0) goto lab0;
++            z->c += ret;
++        }
++        {    /* gopast */ /* grouping v, line 50 */
++            int ret = out_grouping_U(z, g_v, 97, 253, 1);
++            if (ret < 0) goto lab0;
++            z->c += ret;
++        }
++        z->I[1] = z->c; /* setmark p1, line 50 */
++    lab0:
++        z->c = c1;
++    }
++    return 1;
++}
++
++static int r_RV(struct SN_env * z) { /* backwardmode */
++    if (!(z->I[0] <= z->c)) return 0; /* $pV <= <integer expression>, line 56 */
++    return 1;
++}
++
++static int r_R1(struct SN_env * z) { /* backwardmode */
++    if (!(z->I[1] <= z->c)) return 0; /* $p1 <= <integer expression>, line 57 */
++    return 1;
++}
++
++static int r_palatalise(struct SN_env * z) { /* backwardmode */
++    int among_var;
++    z->ket = z->c; /* [, line 60 */
++    among_var = find_among_b(z, a_0, 14); /* substring, line 60 */
++    if (!(among_var)) return 0;
++    z->bra = z->c; /* ], line 60 */
++    {   int ret = r_RV(z); /* call RV, line 60 */
++        if (ret <= 0) return ret;
++    }
++    switch (among_var) { /* among, line 60 */
++        case 0: return 0;
++        case 1:
++            {   int ret = slice_from_s(z, 1, s_0); /* <-, line 62 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 2:
++            {   int ret = slice_from_s(z, 1, s_1); /* <-, line 64 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 3:
++            {   int ret = slice_from_s(z, 2, s_2); /* <-, line 66 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 4:
++            {   int ret = slice_from_s(z, 2, s_3); /* <-, line 68 */
++                if (ret < 0) return ret;
++            }
++            break;
++    }
++    return 1;
++}
++
++static int r_do_possessive(struct SN_env * z) { /* backwardmode */
++    int among_var;
++    z->ket = z->c; /* [, line 73 */
++    if (z->c - 1 <= z->lb || (z->p[z->c - 1] != 110 && z->p[z->c - 1] != 118)) return 0; /* substring, line 73 */
++    among_var = find_among_b(z, a_1, 3);
++    if (!(among_var)) return 0;
++    z->bra = z->c; /* ], line 73 */
++    {   int ret = r_RV(z); /* call RV, line 73 */
++        if (ret <= 0) return ret;
++    }
++    switch (among_var) { /* among, line 73 */
++        case 0: return 0;
++        case 1:
++            {   int ret = slice_del(z); /* delete, line 75 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 2:
++            {   int ret = slice_del(z); /* delete, line 78 */
++                if (ret < 0) return ret;
++            }
++            {   int m1 = z->l - z->c; (void)m1; /* try, line 79 */
++                {   int ret = r_palatalise(z); /* call palatalise, line 79 */
++                    if (ret == 0) { z->c = z->l - m1; goto lab0; }
++                    if (ret < 0) return ret;
++                }
++            lab0:
++                ;
++            }
++            break;
++    }
++    return 1;
++}
++
++static int r_do_case(struct SN_env * z) { /* backwardmode */
++    int among_var;
++    z->ket = z->c; /* [, line 85 */
++    among_var = find_among_b(z, a_2, 48); /* substring, line 85 */
++    if (!(among_var)) return 0;
++    z->bra = z->c; /* ], line 85 */
++    switch (among_var) { /* among, line 85 */
++        case 0: return 0;
++        case 1:
++            {   int ret = slice_del(z); /* delete, line 92 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 2:
++            {   int ret = slice_del(z); /* delete, line 99 */
++                if (ret < 0) return ret;
++            }
++            {   int m1 = z->l - z->c; (void)m1; /* try, line 100 */
++                {   int ret = r_palatalise(z); /* call palatalise, line 100 */
++                    if (ret == 0) { z->c = z->l - m1; goto lab0; }
++                    if (ret < 0) return ret;
++                }
++            lab0:
++                ;
++            }
++            break;
++        case 3:
++            {   int ret = slice_from_s(z, 1, s_4); /* <-, line 104 */
++                if (ret < 0) return ret;
++            }
++            {   int m2 = z->l - z->c; (void)m2; /* try, line 105 */
++                {   int ret = r_palatalise(z); /* call palatalise, line 105 */
++                    if (ret == 0) { z->c = z->l - m2; goto lab1; }
++                    if (ret < 0) return ret;
++                }
++            lab1:
++                ;
++            }
++            break;
++    }
++    return 1;
++}
++
++static int r_do_derivational(struct SN_env * z) { /* backwardmode */
++    int among_var;
++    z->ket = z->c; /* [, line 111 */
++    among_var = find_among_b(z, a_3, 68); /* substring, line 111 */
++    if (!(among_var)) return 0;
++    z->bra = z->c; /* ], line 111 */
++    {   int ret = r_R1(z); /* call R1, line 111 */
++        if (ret <= 0) return ret;
++    }
++    switch (among_var) { /* among, line 111 */
++        case 0: return 0;
++        case 1:
++            {   int ret = slice_del(z); /* delete, line 120 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 2:
++            {   int ret = slice_from_s(z, 1, s_5); /* <-, line 126 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 127 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 3:
++            {   int ret = slice_from_s(z, 1, s_6); /* <-, line 131 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 132 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 4:
++            {   int ret = slice_from_s(z, 2, s_7); /* <-, line 136 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 137 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 5:
++            {   int ret = slice_from_s(z, 2, s_8); /* <-, line 141 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 142 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 6:
++            {   int ret = slice_from_s(z, 2, s_9); /* <-, line 147 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 148 */
++                if (ret <= 0) return ret;
++            }
++            break;
++    }
++    return 1;
++}
++
++static int r_do_deriv_single(struct SN_env * z) { /* backwardmode */
++    int among_var;
++    z->ket = z->c; /* [, line 153 */
++    among_var = find_among_b(z, a_4, 6); /* substring, line 153 */
++    if (!(among_var)) return 0;
++    z->bra = z->c; /* ], line 153 */
++    switch (among_var) { /* among, line 153 */
++        case 0: return 0;
++        case 1:
++            {   int ret = slice_del(z); /* delete, line 155 */
++                if (ret < 0) return ret;
++            }
++            break;
++    }
++    return 1;
++}
++
++static int r_do_augmentative(struct SN_env * z) { /* backwardmode */
++    int among_var;
++    z->ket = z->c; /* [, line 161 */
++    if (z->c - 2 <= z->lb || (z->p[z->c - 1] != 107 && z->p[z->c - 1] != 110)) return 0; /* substring, line 161 */
++    among_var = find_among_b(z, a_5, 4);
++    if (!(among_var)) return 0;
++    z->bra = z->c; /* ], line 161 */
++    switch (among_var) { /* among, line 161 */
++        case 0: return 0;
++        case 1:
++            {   int ret = slice_del(z); /* delete, line 163 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 2:
++            {   int ret = slice_from_s(z, 1, s_10); /* <-, line 166 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 167 */
++                if (ret <= 0) return ret;
++            }
++            break;
++    }
++    return 1;
++}
++
++static int r_do_diminutive(struct SN_env * z) { /* backwardmode */
++    int among_var;
++    z->ket = z->c; /* [, line 173 */
++    if (z->c <= z->lb || z->p[z->c - 1] != 107) return 0; /* substring, line 173 */
++    among_var = find_among_b(z, a_6, 42);
++    if (!(among_var)) return 0;
++    z->bra = z->c; /* ], line 173 */
++    switch (among_var) { /* among, line 173 */
++        case 0: return 0;
++        case 1:
++            {   int ret = slice_del(z); /* delete, line 180 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 2:
++            {   int ret = slice_from_s(z, 1, s_11); /* <-, line 183 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 184 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 3:
++            {   int ret = slice_from_s(z, 2, s_12); /* <-, line 188 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 189 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 4:
++            {   int ret = slice_from_s(z, 1, s_13); /* <-, line 193 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 194 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 5:
++            {   int ret = slice_from_s(z, 2, s_14); /* <-, line 198 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 199 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 6:
++            {   int ret = slice_from_s(z, 2, s_15); /* <-, line 202 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 7:
++            {   int ret = slice_from_s(z, 1, s_16); /* <-, line 204 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 8:
++            {   int ret = slice_from_s(z, 1, s_17); /* <-, line 206 */
++                if (ret < 0) return ret;
++            }
++            break;
++        case 9:
++            {   int ret = slice_from_s(z, 1, s_18); /* <-, line 208 */
++                if (ret < 0) return ret;
++            }
++            break;
++    }
++    return 1;
++}
++
++static int r_do_comparative(struct SN_env * z) { /* backwardmode */
++    int among_var;
++    z->ket = z->c; /* [, line 213 */
++    if (z->c - 3 <= z->lb || z->p[z->c - 1] != 185) return 0; /* substring, line 213 */
++    among_var = find_among_b(z, a_7, 2);
++    if (!(among_var)) return 0;
++    z->bra = z->c; /* ], line 213 */
++    switch (among_var) { /* among, line 213 */
++        case 0: return 0;
++        case 1:
++            {   int ret = slice_from_s(z, 2, s_19); /* <-, line 216 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 217 */
++                if (ret <= 0) return ret;
++            }
++            break;
++        case 2:
++            {   int ret = slice_from_s(z, 1, s_20); /* <-, line 221 */
++                if (ret < 0) return ret;
++            }
++            {   int ret = r_palatalise(z); /* call palatalise, line 222 */
++                if (ret <= 0) return ret;
++            }
++            break;
++    }
++    return 1;
++}
++
++static int r_do_aggressive(struct SN_env * z) { /* backwardmode */
++    {   int m1 = z->l - z->c; (void)m1; /* do, line 228 */
++        {   int ret = r_do_comparative(z); /* call do_comparative, line 228 */
++            if (ret == 0) goto lab0;
++            if (ret < 0) return ret;
++        }
++    lab0:
++        z->c = z->l - m1;
++    }
++    {   int m2 = z->l - z->c; (void)m2; /* do, line 229 */
++        {   int ret = r_do_diminutive(z); /* call do_diminutive, line 229 */
++            if (ret == 0) goto lab1;
++            if (ret < 0) return ret;
++        }
++    lab1:
++        z->c = z->l - m2;
++    }
++    {   int m3 = z->l - z->c; (void)m3; /* do, line 230 */
++        {   int ret = r_do_augmentative(z); /* call do_augmentative, line 230 */
++            if (ret == 0) goto lab2;
++            if (ret < 0) return ret;
++        }
++    lab2:
++        z->c = z->l - m3;
++    }
++    {   int m4 = z->l - z->c; (void)m4; /* or, line 231 */
++        {   int ret = r_do_derivational(z); /* call do_derivational, line 231 */
++            if (ret == 0) goto lab4;
++            if (ret < 0) return ret;
++        }
++        goto lab3;
++    lab4:
++        z->c = z->l - m4;
++        {   int ret = r_do_deriv_single(z); /* call do_deriv_single, line 231 */
++            if (ret <= 0) return ret;
++        }
++    }
++lab3:
++    return 1;
++}
++
++extern int czech_UTF_8_stem(struct SN_env * z) { /* forwardmode */
++    {   int c1 = z->c; /* do, line 236 */
++        {   int ret = r_mark_regions(z); /* call mark_regions, line 236 */
++            if (ret == 0) goto lab0;
++            if (ret < 0) return ret;
++        }
++    lab0:
++        z->c = c1;
++    }
++    z->lb = z->c; z->c = z->l; /* backwards, line 237 */
++
++    {   int ret = r_do_case(z); /* call do_case, line 238 */
++        if (ret <= 0) return ret;
++    }
++    {   int ret = r_do_possessive(z); /* call do_possessive, line 239 */
++        if (ret <= 0) return ret;
++    }
++    {   int ret = r_do_aggressive(z); /* call do_aggressive, line 242 */
++        if (ret <= 0) return ret;
++    }
++    z->c = z->lb;
++    return 1;
++}
++
++extern struct SN_env * czech_UTF_8_create_env(void) { return SN_create_env(0, 2); }
++
++extern void czech_UTF_8_close_env(struct SN_env * z) { SN_close_env(z, 0); }
++
+diff --git a/src/include/snowball/libstemmer/stem_UTF_8_czech.h b/src/include/snowball/libstemmer/stem_UTF_8_czech.h
+new file mode 100644
+--- /dev/null
++++ b/src/include/snowball/libstemmer/stem_UTF_8_czech.h
+@@ -0,0 +1,16 @@
++/* This file was generated automatically by the Snowball to ISO C compiler */
++/* http://snowballstem.org/ */
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++extern struct SN_env * czech_UTF_8_create_env(void);
++extern void czech_UTF_8_close_env(struct SN_env * z);
++
++extern int czech_UTF_8_stem(struct SN_env * z);
++
++#ifdef __cplusplus
++}
++#endif
++
+diff --git a/src/backend/snowball/stopwords/czech.stop b/src/backend/snowball/stopwords/czech.stop
+new file mode 100644
+--- /dev/null
++++ b/src/backend/snowball/stopwords/czech.stop
+@@ -0,0 +1,86 @@
++a
++ale
++ano
++atd
++by
++být
++co
++čí
++čím
++do
++i
++já
++jak
++je
++jeho
++jemu
++její
++jejich
++ji
++jí
++jim
++již
++jsem
++jsi
++jsou
++k
++kde
++kdo
++kdy
++který
++mě
++mém
++mne
++mně
++můj
++my
++na
++nad
++nám
++náš
++ne
++o
++on
++ona
++oni
++ono
++pak
++po
++pod
++pro
++proto
++proč
++před
++s
++se
++sem
++si
++svůj
++ta
++tady
++tak
++také
++tam
++tato
++teď
++ten
++ti
++tím
++to
++tobě
++tomu
++tvůj
++ty
++tyto
++u
++už
++v
++ve
++vám
++váš
++viz
++vy
++z
++za
++ze
++že
diff --git a/main/postgresql16/disable-html-docs.patch b/main/postgresql16/disable-html-docs.patch
new file mode 100644
index 00000000000..6fbf90373c9
--- /dev/null
+++ b/main/postgresql16/disable-html-docs.patch
@@ -0,0 +1,38 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Thu, 28 Oct 2021 01:27:53 +0200
+Subject: [PATCH] Disable HTML docs, install only man pages
+
+HTML docs are big and they are available only anyway.
+
+--- a/doc/src/sgml/Makefile
++++ b/doc/src/sgml/Makefile
+@@ -26,9 +26,9 @@
+ include $(top_builddir)/src/Makefile.global
+ 
+ 
+-all: html man
++all: man
+ 
+-distprep: html distprep-man
++distprep: distprep-man
+ 
+ 
+ ifndef DBTOEPUB
+@@ -220,14 +220,14 @@
+ ## Install
+ ##
+ 
+-install: install-html install-man
++install: install-man
+ 
+ installdirs:
+-	$(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
++	$(MKDIR_P) $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
+ 
+ # If the install used a man directory shared with other applications, this will remove all files.
+ uninstall:
+-	rm -f '$(DESTDIR)$(htmldir)/html/'* $(addprefix  '$(DESTDIR)$(mandir)'/man, 1/* 3/* $(sqlmansectnum)/*)
++	rm -f $(addprefix  '$(DESTDIR)$(mandir)'/man, 1/* 3/* $(sqlmansectnum)/*)
+ 
+ 
+ ## Install html
diff --git a/main/postgresql16/dont-use-locale-a-on-musl.patch b/main/postgresql16/dont-use-locale-a-on-musl.patch
new file mode 100644
index 00000000000..ce61856d4e2
--- /dev/null
+++ b/main/postgresql16/dont-use-locale-a-on-musl.patch
@@ -0,0 +1,31 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Wed, 03 Aug 2022 20:40:33 +0200
+Subject: [PATCH] Don't generate collations based on locale(1)
+
+When the PostgreSQL cluster is initialized (using initdb(1)) or the
+DB administrator calls `pg_import_system_collations()` directly, this
+function creates COLLATIONs in the system catalog (pg_collations).
+If the locale(1) command is available, this function creates COLLATIONs
+based on the `locale -a` output.
+
+The locale(1) command is normally not available on Alpine Linux, so it
+does nothing and only the default and ICU-based COLLATIONs are created.
+However, there's a musl-locales package that provides locale(1), but it
+doesn't implement any collations. This package just provides locale
+translations. So if the user happens to have locale(1) installed and they
+initialize the cluster or call `pg_import_system_collations()`, they end
+up with dozens of libc-based COLLATIONs in the system catalog that
+actually do not work! They will all behave like "C", because musl libc
+doesn't implement locales.
+
+--- a/src/backend/commands/collationcmds.c
++++ b/src/backend/commands/collationcmds.c
+@@ -401,7 +401,7 @@
+ 
+ 
+ /* will we use "locale -a" in pg_import_system_collations? */
+-#if defined(HAVE_LOCALE_T) && !defined(WIN32)
++#if defined(HAVE_LOCALE_T) && !defined(WIN32) && defined(__GLIBC__)  // XXX-Patched
+ #define READ_LOCALE_A_OUTPUT
+ #endif
+ 
diff --git a/main/postgresql16/external-libpq.patch.txt b/main/postgresql16/external-libpq.patch.txt
new file mode 100644
index 00000000000..e148edd1b8f
--- /dev/null
+++ b/main/postgresql16/external-libpq.patch.txt
@@ -0,0 +1,41 @@
+Patch-Source: https://src.fedoraproject.org/rpms/postgresql/blob/f35/f/postgresql-external-libpq.patch
+
+This patch is applied only when building non-default postgresql aport, i.e.
+we want to link against libpq provided by the default postgresql aport.
+
+diff --git a/src/Makefile b/src/Makefile
+index bcdbd95..4bea236 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -20,7 +20,6 @@ SUBDIRS = \
+ 	backend/utils/mb/conversion_procs \
+ 	backend/snowball \
+ 	include \
+-	interfaces \
+ 	backend/replication/libpqwalreceiver \
+ 	backend/replication/pgoutput \
+ 	fe_utils \
+diff --git a/src/Makefile.global.in b/src/Makefile.global.in
+index b9d86ac..29df69f 100644
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -549,7 +549,7 @@ endif
+ # How to link to libpq.  (This macro may be used as-is by backend extensions.
+ # Client-side code should go through libpq_pgport or libpq_pgport_shlib,
+ # instead.)
+-libpq = -L$(libpq_builddir) -lpq
++libpq = -lpq
+ 
+ # libpq_pgport is for use by client executables (not libraries) that use libpq.
+ # We force clients to pull symbols from the non-shared libraries libpgport
+@@ -579,7 +579,6 @@ endif
+ # Commonly used submake targets
+ 
+ submake-libpq: | submake-generated-headers
+-	$(MAKE) -C $(libpq_builddir) all
+ 
+ submake-libpgport: | submake-generated-headers
+ 	$(MAKE) -C $(top_builddir)/src/port all
+-- 
+2.21.0
+
diff --git a/main/postgresql16/icu-collations-hack.patch b/main/postgresql16/icu-collations-hack.patch
new file mode 100644
index 00000000000..f9b42ba330b
--- /dev/null
+++ b/main/postgresql16/icu-collations-hack.patch
@@ -0,0 +1,892 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Wed, 03 Aug 2022 20:40:33 +0200
+Subject: [PATCH] Hack to generate usable ICU-based collations with
+  icu-data-en
+
+This is a downstream patch for Alpine Linux, it should never be
+upstreamed in this form!
+
+When the PostgreSQL cluster is initialized (using initdb(1)) or the
+DB administrator calls `pg_import_system_collations()` directly, this
+function creates COLLATIONs in the system catalog (pg_collations).
+There are two types: libc-based and ICU-based. The latter are created
+based on *locales* (not collations) known to ICU, i.e. based on the ICU
+data installed at the time.
+
+collationcmds.c includes the following comment:
+> We use uloc_countAvailable()/uloc_getAvailable() rather than
+> ucol_countAvailable()/ucol_getAvailable().  The former returns a full
+> set of language+region combinations, whereas the latter only returns
+> language+region combinations if they are distinct from the language's
+> base collation.  So there might not be a de-DE or en-GB, which would be
+> confusing.
+
+There's a problem with this approach: locales and collations are two
+different things. ICU data may include collation algorithms and data for
+all or some languages, but not locales (language + country/region).
+The collation data is small compared to locales. There are ~800 locales
+(combinations of language, country and variants), but only 98 collations.
+There's a mapping between collations and locales hidden somewhere in ICU
+data.
+
+Since full ICU data is very big (30 MiB), we have created a stripped down
+variant with only English locale (package icu-data-en, 2.6 MiB). It also
+includes a subset of 18 collations that cover hundreds of languages.
+
+When the cluster is initialized or `pg_import_system_collations()` is
+called directly and only icu-data-en (default) is installed, the user
+ends up with only und, en and en_GB ICU-based COLLATIONs. The user can
+create missing COLLATIONs manually, but this a) is not expected nor
+reasonable behaviour, b) it's not easy to find out for which locales
+there's a collation available for.
+
+I couldn't find any way how to list all language+country variants for the
+given collation. It can be constructed when we iterate over all locales,
+but this approach is useless when we don't have the locale data
+available... I should also note that the reverse lookup (locale ->
+collation) is not a problem for ICU when full locale data is stripped.
+
+So I ended up with a very ugly workaround: pre-generating a list of
+collation -> locale mapping and embedding it in the collationcmds.c
+source. Then we replace `uloc_countAvailable()`/`uloc_getAvailable()`
+with `ucol_countAvailable()` / `ucol_getAvailable()` to iterate over
+the collations instead of locales and lookup the locales in the
+pre-generated list.
+
+This data is quite stable, there's a very low risk of getting outdated in
+a way that would be a problem.
+
+`icu_coll_locales` has been generated using the following code:
+
+    #include <stdio.h>
+    #include <string.h>
+    #include <unicode/ucol.h>
+    
+    // Copy-pasted from collationcmds.c.
+    static char *get_icu_language_tag(const char *localename) {
+        char buf[ULOC_FULLNAME_CAPACITY];
+        UErrorCode status = U_ZERO_ERROR;
+    
+        uloc_toLanguageTag(localename, buf, sizeof(buf), true, &status);
+    
+        if (U_FAILURE(status)) {
+            fprintf(stderr, "could not convert locale name \"%s\" to language tag: %s\n",
+                    localename, u_errorName(status));
+            return strdup(localename);
+        }
+        return strdup(buf);
+    }
+    
+    int main() {
+        UErrorCode status = U_ZERO_ERROR;
+    
+        for (int i = 0; i < uloc_countAvailable(); i++) {
+            const char *locale = uloc_getAvailable(i);
+    
+            UCollator *collator = ucol_open(locale, &status);
+            const char *actual_locale = ucol_getLocaleByType(collator, ULOC_ACTUAL_LOCALE, &status);
+    
+            // Strip @.*
+            char *ptr = strchr(actual_locale, '@');
+            if (ptr != NULL) {
+                *ptr = '\0';
+            }
+            if (strcmp(actual_locale, "root") == 0) {
+                actual_locale = "";
+            }
+            if (strcmp(actual_locale, locale) != 0) {
+                printf("\"%s\", \"%s\",\n", actual_locale, get_icu_language_tag(locale));
+            }
+            ucol_close(collator);
+        }
+        return 0;
+    }
+
+compiled and executed using:
+
+    gcc -o main main.c $(pkg-config --libs icu-uc icu-io) && ./main | sort | uniq
+
+--- a/src/backend/commands/collationcmds.c
++++ b/src/backend/commands/collationcmds.c
+@@ -632,6 +632,715 @@
+ 
+ 	return result;
+ }
++
++/*
++ * XXX-Patched: Added a static mapping: collation name (parent) to locale (children)
++ * I'm gonna burn in hell for this...
++ */
++static char* icu_coll_locales[] = {
++	"", "agq",
++	"", "agq-CM",
++	"", "ak",
++	"", "ak-GH",
++	"", "asa",
++	"", "asa-TZ",
++	"", "ast",
++	"", "ast-ES",
++	"", "bas",
++	"", "bas-CM",
++	"", "bem",
++	"", "bem-ZM",
++	"", "bez",
++	"", "bez-TZ",
++	"", "bm",
++	"", "bm-ML",
++	"", "brx",
++	"", "brx-IN",
++	"", "ca",
++	"", "ca-AD",
++	"", "ca-ES",
++	"", "ca-FR",
++	"", "ca-IT",
++	"", "ccp",
++	"", "ccp-BD",
++	"", "ccp-IN",
++	"", "ce",
++	"", "ce-RU",
++	"", "cgg",
++	"", "cgg-UG",
++	"", "ckb",
++	"", "ckb-IQ",
++	"", "ckb-IR",
++	"", "dav",
++	"", "dav-KE",
++	"", "de",
++	"", "de-AT",
++	"", "de-BE",
++	"", "de-CH",
++	"", "de-DE",
++	"", "de-IT",
++	"", "de-LI",
++	"", "de-LU",
++	"", "dje",
++	"", "dje-NE",
++	"", "doi",
++	"", "doi-IN",
++	"", "dua",
++	"", "dua-CM",
++	"", "dyo",
++	"", "dyo-SN",
++	"", "dz",
++	"", "dz-BT",
++	"", "ebu",
++	"", "ebu-KE",
++	"", "en",
++	"", "en-001",
++	"", "en-150",
++	"", "en-AE",
++	"", "en-AG",
++	"", "en-AI",
++	"", "en-AS",
++	"", "en-AT",
++	"", "en-AU",
++	"", "en-BB",
++	"", "en-BE",
++	"", "en-BI",
++	"", "en-BM",
++	"", "en-BS",
++	"", "en-BW",
++	"", "en-BZ",
++	"", "en-CA",
++	"", "en-CC",
++	"", "en-CH",
++	"", "en-CK",
++	"", "en-CM",
++	"", "en-CX",
++	"", "en-CY",
++	"", "en-DE",
++	"", "en-DG",
++	"", "en-DK",
++	"", "en-DM",
++	"", "en-ER",
++	"", "en-FI",
++	"", "en-FJ",
++	"", "en-FK",
++	"", "en-FM",
++	"", "en-GB",
++	"", "en-GD",
++	"", "en-GG",
++	"", "en-GH",
++	"", "en-GI",
++	"", "en-GM",
++	"", "en-GU",
++	"", "en-GY",
++	"", "en-HK",
++	"", "en-IE",
++	"", "en-IL",
++	"", "en-IM",
++	"", "en-IN",
++	"", "en-IO",
++	"", "en-JE",
++	"", "en-JM",
++	"", "en-KE",
++	"", "en-KI",
++	"", "en-KN",
++	"", "en-KY",
++	"", "en-LC",
++	"", "en-LR",
++	"", "en-LS",
++	"", "en-MG",
++	"", "en-MH",
++	"", "en-MO",
++	"", "en-MP",
++	"", "en-MS",
++	"", "en-MT",
++	"", "en-MU",
++	"", "en-MV",
++	"", "en-MW",
++	"", "en-MY",
++	"", "en-NA",
++	"", "en-NF",
++	"", "en-NG",
++	"", "en-NL",
++	"", "en-NR",
++	"", "en-NU",
++	"", "en-NZ",
++	"", "en-PG",
++	"", "en-PH",
++	"", "en-PK",
++	"", "en-PN",
++	"", "en-PR",
++	"", "en-PW",
++	"", "en-RW",
++	"", "en-SB",
++	"", "en-SC",
++	"", "en-SD",
++	"", "en-SE",
++	"", "en-SG",
++	"", "en-SH",
++	"", "en-SI",
++	"", "en-SL",
++	"", "en-SS",
++	"", "en-SX",
++	"", "en-SZ",
++	"", "en-TC",
++	"", "en-TK",
++	"", "en-TO",
++	"", "en-TT",
++	"", "en-TV",
++	"", "en-TZ",
++	"", "en-UG",
++	"", "en-UM",
++	"", "en-US",
++	"", "en-VC",
++	"", "en-VG",
++	"", "en-VI",
++	"", "en-VU",
++	"", "en-WS",
++	"", "en-ZA",
++	"", "en-ZM",
++	"", "en-ZW",
++	"", "eu",
++	"", "eu-ES",
++	"", "ewo",
++	"", "ewo-CM",
++	"", "ff",
++	"", "ff-Latn",
++	"", "ff-Latn-BF",
++	"", "ff-Latn-CM",
++	"", "ff-Latn-GH",
++	"", "ff-Latn-GM",
++	"", "ff-Latn-GN",
++	"", "ff-Latn-GW",
++	"", "ff-Latn-LR",
++	"", "ff-Latn-MR",
++	"", "ff-Latn-NE",
++	"", "ff-Latn-NG",
++	"", "ff-Latn-SL",
++	"", "ff-Latn-SN",
++	"", "fr",
++	"", "fr-BE",
++	"", "fr-BF",
++	"", "fr-BI",
++	"", "fr-BJ",
++	"", "fr-BL",
++	"", "fr-CD",
++	"", "fr-CF",
++	"", "fr-CG",
++	"", "fr-CH",
++	"", "fr-CI",
++	"", "fr-CM",
++	"", "fr-DJ",
++	"", "fr-DZ",
++	"", "fr-FR",
++	"", "fr-GA",
++	"", "fr-GF",
++	"", "fr-GN",
++	"", "fr-GP",
++	"", "fr-GQ",
++	"", "fr-HT",
++	"", "fr-KM",
++	"", "fr-LU",
++	"", "fr-MA",
++	"", "fr-MC",
++	"", "fr-MF",
++	"", "fr-MG",
++	"", "fr-ML",
++	"", "fr-MQ",
++	"", "fr-MR",
++	"", "fr-MU",
++	"", "fr-NC",
++	"", "fr-NE",
++	"", "fr-PF",
++	"", "fr-PM",
++	"", "fr-RE",
++	"", "fr-RW",
++	"", "fr-SC",
++	"", "fr-SN",
++	"", "fr-SY",
++	"", "fr-TD",
++	"", "fr-TG",
++	"", "fr-TN",
++	"", "fr-VU",
++	"", "fr-WF",
++	"", "fr-YT",
++	"", "fur",
++	"", "fur-IT",
++	"", "fy",
++	"", "fy-NL",
++	"", "ga",
++	"", "ga-GB",
++	"", "ga-IE",
++	"", "gd",
++	"", "gd-GB",
++	"", "gsw",
++	"", "gsw-CH",
++	"", "gsw-FR",
++	"", "gsw-LI",
++	"", "guz",
++	"", "guz-KE",
++	"", "gv",
++	"", "gv-IM",
++	"", "ia",
++	"", "ia-001",
++	"", "id",
++	"", "id-ID",
++	"", "ii",
++	"", "ii-CN",
++	"", "it",
++	"", "it-CH",
++	"", "it-IT",
++	"", "it-SM",
++	"", "it-VA",
++	"", "jgo",
++	"", "jgo-CM",
++	"", "jmc",
++	"", "jmc-TZ",
++	"", "jv",
++	"", "jv-ID",
++	"", "kab",
++	"", "kab-DZ",
++	"", "kam",
++	"", "kam-KE",
++	"", "kde",
++	"", "kde-TZ",
++	"", "kea",
++	"", "kea-CV",
++	"", "kgp",
++	"", "kgp-BR",
++	"", "khq",
++	"", "khq-ML",
++	"", "ki",
++	"", "ki-KE",
++	"", "kkj",
++	"", "kkj-CM",
++	"", "kln",
++	"", "kln-KE",
++	"", "ks",
++	"", "ks-Arab",
++	"", "ks-Arab-IN",
++	"", "ks-Deva",
++	"", "ks-Deva-IN",
++	"", "ksb",
++	"", "ksb-TZ",
++	"", "ksf",
++	"", "ksf-CM",
++	"", "ksh",
++	"", "ksh-DE",
++	"", "kw",
++	"", "kw-GB",
++	"", "lag",
++	"", "lag-TZ",
++	"", "lb",
++	"", "lb-LU",
++	"", "lg",
++	"", "lg-UG",
++	"", "lrc",
++	"", "lrc-IQ",
++	"", "lrc-IR",
++	"", "lu",
++	"", "lu-CD",
++	"", "luo",
++	"", "luo-KE",
++	"", "luy",
++	"", "luy-KE",
++	"", "mai",
++	"", "mai-IN",
++	"", "mas",
++	"", "mas-KE",
++	"", "mas-TZ",
++	"", "mer",
++	"", "mer-KE",
++	"", "mfe",
++	"", "mfe-MU",
++	"", "mg",
++	"", "mg-MG",
++	"", "mgh",
++	"", "mgh-MZ",
++	"", "mgo",
++	"", "mgo-CM",
++	"", "mi",
++	"", "mi-NZ",
++	"", "mni",
++	"", "mni-Beng",
++	"", "mni-Beng-IN",
++	"", "ms",
++	"", "ms-BN",
++	"", "ms-ID",
++	"", "ms-MY",
++	"", "ms-SG",
++	"", "mua",
++	"", "mua-CM",
++	"", "mzn",
++	"", "mzn-IR",
++	"", "naq",
++	"", "naq-NA",
++	"", "nd",
++	"", "nd-ZW",
++	"", "nl",
++	"", "nl-AW",
++	"", "nl-BE",
++	"", "nl-BQ",
++	"", "nl-CW",
++	"", "nl-NL",
++	"", "nl-SR",
++	"", "nl-SX",
++	"", "nmg",
++	"", "nmg-CM",
++	"", "nnh",
++	"", "nnh-CM",
++	"", "nus",
++	"", "nus-SS",
++	"", "nyn",
++	"", "nyn-UG",
++	"", "os",
++	"", "os-GE",
++	"", "os-RU",
++	"", "pcm",
++	"", "pcm-NG",
++	"", "pt",
++	"", "pt-AO",
++	"", "pt-BR",
++	"", "pt-CH",
++	"", "pt-CV",
++	"", "pt-GQ",
++	"", "pt-GW",
++	"", "pt-LU",
++	"", "pt-MO",
++	"", "pt-MZ",
++	"", "pt-PT",
++	"", "pt-ST",
++	"", "pt-TL",
++	"", "qu",
++	"", "qu-BO",
++	"", "qu-EC",
++	"", "qu-PE",
++	"", "rm",
++	"", "rm-CH",
++	"", "rn",
++	"", "rn-BI",
++	"", "rof",
++	"", "rof-TZ",
++	"", "rw",
++	"", "rw-RW",
++	"", "rwk",
++	"", "rwk-TZ",
++	"", "sa",
++	"", "sa-IN",
++	"", "sah",
++	"", "sah-RU",
++	"", "saq",
++	"", "saq-KE",
++	"", "sat",
++	"", "sat-Olck",
++	"", "sat-Olck-IN",
++	"", "sbp",
++	"", "sbp-TZ",
++	"", "sc",
++	"", "sc-IT",
++	"", "sd",
++	"", "sd-Arab",
++	"", "sd-Arab-PK",
++	"", "sd-Deva",
++	"", "sd-Deva-IN",
++	"", "seh",
++	"", "seh-MZ",
++	"", "ses",
++	"", "ses-ML",
++	"", "sg",
++	"", "sg-CF",
++	"", "shi",
++	"", "shi-Latn",
++	"", "shi-Latn-MA",
++	"", "shi-Tfng",
++	"", "shi-Tfng-MA",
++	"", "sn",
++	"", "sn-ZW",
++	"", "so",
++	"", "so-DJ",
++	"", "so-ET",
++	"", "so-KE",
++	"", "so-SO",
++	"", "su",
++	"", "su-Latn",
++	"", "su-Latn-ID",
++	"", "sw",
++	"", "sw-CD",
++	"", "sw-KE",
++	"", "sw-TZ",
++	"", "sw-UG",
++	"", "teo",
++	"", "teo-KE",
++	"", "teo-UG",
++	"", "tg",
++	"", "tg-TJ",
++	"", "ti",
++	"", "ti-ER",
++	"", "ti-ET",
++	"", "tt",
++	"", "tt-RU",
++	"", "twq",
++	"", "twq-NE",
++	"", "tzm",
++	"", "tzm-MA",
++	"", "vai",
++	"", "vai-Latn",
++	"", "vai-Latn-LR",
++	"", "vai-Vaii",
++	"", "vai-Vaii-LR",
++	"", "vun",
++	"", "vun-TZ",
++	"", "wae",
++	"", "wae-CH",
++	"", "xh",
++	"", "xh-ZA",
++	"", "xog",
++	"", "xog-UG",
++	"", "yav",
++	"", "yav-CM",
++	"", "yrl",
++	"", "yrl-BR",
++	"", "yrl-CO",
++	"", "yrl-VE",
++	"", "zgh",
++	"", "zgh-MA",
++	"", "zu",
++	"", "zu-ZA",
++	"af", "af-NA",
++	"af", "af-ZA",
++	"am", "am-ET",
++	"ar", "ar-001",
++	"ar", "ar-AE",
++	"ar", "ar-BH",
++	"ar", "ar-DJ",
++	"ar", "ar-DZ",
++	"ar", "ar-EG",
++	"ar", "ar-EH",
++	"ar", "ar-ER",
++	"ar", "ar-IL",
++	"ar", "ar-IQ",
++	"ar", "ar-JO",
++	"ar", "ar-KM",
++	"ar", "ar-KW",
++	"ar", "ar-LB",
++	"ar", "ar-LY",
++	"ar", "ar-MA",
++	"ar", "ar-MR",
++	"ar", "ar-OM",
++	"ar", "ar-PS",
++	"ar", "ar-QA",
++	"ar", "ar-SA",
++	"ar", "ar-SD",
++	"ar", "ar-SO",
++	"ar", "ar-SS",
++	"ar", "ar-SY",
++	"ar", "ar-TD",
++	"ar", "ar-TN",
++	"ar", "ar-YE",
++	"as", "as-IN",
++	"az", "az-Cyrl",
++	"az", "az-Cyrl-AZ",
++	"az", "az-Latn",
++	"az", "az-Latn-AZ",
++	"be", "be-BY",
++	"bg", "bg-BG",
++	"bn", "bn-BD",
++	"bn", "bn-IN",
++	"bo", "bo-CN",
++	"bo", "bo-IN",
++	"br", "br-FR",
++	"bs", "bs-Latn",
++	"bs", "bs-Latn-BA",
++	"bs_Cyrl", "bs-Cyrl-BA",
++	"ceb", "ceb-PH",
++	"chr", "chr-US",
++	"cs", "cs-CZ",
++	"cy", "cy-GB",
++	"da", "da-DK",
++	"da", "da-GL",
++	"dsb", "dsb-DE",
++	"ee", "ee-GH",
++	"ee", "ee-TG",
++	"el", "el-CY",
++	"el", "el-GR",
++	"eo", "eo-001",
++	"es", "es-419",
++	"es", "es-AR",
++	"es", "es-BO",
++	"es", "es-BR",
++	"es", "es-BZ",
++	"es", "es-CL",
++	"es", "es-CO",
++	"es", "es-CR",
++	"es", "es-CU",
++	"es", "es-DO",
++	"es", "es-EA",
++	"es", "es-EC",
++	"es", "es-ES",
++	"es", "es-GQ",
++	"es", "es-GT",
++	"es", "es-HN",
++	"es", "es-IC",
++	"es", "es-MX",
++	"es", "es-NI",
++	"es", "es-PA",
++	"es", "es-PE",
++	"es", "es-PH",
++	"es", "es-PR",
++	"es", "es-PY",
++	"es", "es-SV",
++	"es", "es-US",
++	"es", "es-UY",
++	"es", "es-VE",
++	"et", "et-EE",
++	"fa", "fa-IR",
++	"ff_Adlm", "ff-Adlm-BF",
++	"ff_Adlm", "ff-Adlm-CM",
++	"ff_Adlm", "ff-Adlm-GH",
++	"ff_Adlm", "ff-Adlm-GM",
++	"ff_Adlm", "ff-Adlm-GN",
++	"ff_Adlm", "ff-Adlm-GW",
++	"ff_Adlm", "ff-Adlm-LR",
++	"ff_Adlm", "ff-Adlm-MR",
++	"ff_Adlm", "ff-Adlm-NE",
++	"ff_Adlm", "ff-Adlm-NG",
++	"ff_Adlm", "ff-Adlm-SL",
++	"ff_Adlm", "ff-Adlm-SN",
++	"fi", "fi-FI",
++	"fil", "fil-PH",
++	"fo", "fo-DK",
++	"fo", "fo-FO",
++	"gl", "gl-ES",
++	"gu", "gu-IN",
++	"ha", "ha-GH",
++	"ha", "ha-NE",
++	"ha", "ha-NG",
++	"haw", "haw-US",
++	"he", "he-IL",
++	"hi", "hi-IN",
++	"hi", "hi-Latn",
++	"hi", "hi-Latn-IN",
++	"hr", "hr-BA",
++	"hr", "hr-HR",
++	"hsb", "hsb-DE",
++	"hu", "hu-HU",
++	"hy", "hy-AM",
++	"ig", "ig-NG",
++	"is", "is-IS",
++	"ja", "ja-JP",
++	"ka", "ka-GE",
++	"kk", "kk-KZ",
++	"kl", "kl-GL",
++	"km", "km-KH",
++	"kn", "kn-IN",
++	"ko", "ko-KP",
++	"ko", "ko-KR",
++	"kok", "kok-IN",
++	"ku", "ku-TR",
++	"ky", "ky-KG",
++	"lkt", "lkt-US",
++	"ln", "ln-AO",
++	"ln", "ln-CD",
++	"ln", "ln-CF",
++	"ln", "ln-CG",
++	"lo", "lo-LA",
++	"lt", "lt-LT",
++	"lv", "lv-LV",
++	"mk", "mk-MK",
++	"ml", "ml-IN",
++	"mn", "mn-MN",
++	"mr", "mr-IN",
++	"mt", "mt-MT",
++	"my", "my-MM",
++	"ne", "ne-IN",
++	"ne", "ne-NP",
++	"no", "nb",
++	"no", "nb-NO",
++	"no", "nb-SJ",
++	"no", "nn",
++	"no", "nn-NO",
++	"om", "om-ET",
++	"om", "om-KE",
++	"or", "or-IN",
++	"pa", "pa-Arab",
++	"pa", "pa-Arab-PK",
++	"pa", "pa-Guru",
++	"pa", "pa-Guru-IN",
++	"pl", "pl-PL",
++	"ps", "ps-AF",
++	"ps", "ps-PK",
++	"ro", "ro-MD",
++	"ro", "ro-RO",
++	"ru", "ru-BY",
++	"ru", "ru-KG",
++	"ru", "ru-KZ",
++	"ru", "ru-MD",
++	"ru", "ru-RU",
++	"ru", "ru-UA",
++	"se", "se-FI",
++	"se", "se-NO",
++	"se", "se-SE",
++	"si", "si-LK",
++	"sk", "sk-SK",
++	"sl", "sl-SI",
++	"smn", "smn-FI",
++	"sq", "sq-AL",
++	"sq", "sq-MK",
++	"sq", "sq-XK",
++	"sr", "sr-Cyrl",
++	"sr", "sr-Cyrl-BA",
++	"sr", "sr-Cyrl-ME",
++	"sr", "sr-Cyrl-RS",
++	"sr", "sr-Cyrl-XK",
++	"sr_Latn", "sr-Latn-BA",
++	"sr_Latn", "sr-Latn-ME",
++	"sr_Latn", "sr-Latn-RS",
++	"sr_Latn", "sr-Latn-XK",
++	"sv", "sv-AX",
++	"sv", "sv-FI",
++	"sv", "sv-SE",
++	"ta", "ta-IN",
++	"ta", "ta-LK",
++	"ta", "ta-MY",
++	"ta", "ta-SG",
++	"te", "te-IN",
++	"th", "th-TH",
++	"tk", "tk-TM",
++	"to", "to-TO",
++	"tr", "tr-CY",
++	"tr", "tr-TR",
++	"ug", "ug-CN",
++	"uk", "uk-UA",
++	"ur", "ur-IN",
++	"ur", "ur-PK",
++	"uz", "uz-Arab",
++	"uz", "uz-Arab-AF",
++	"uz", "uz-Cyrl",
++	"uz", "uz-Cyrl-UZ",
++	"uz", "uz-Latn",
++	"uz", "uz-Latn-UZ",
++	"vi", "vi-VN",
++	"wo", "wo-SN",
++	"yi", "yi-001",
++	"yo", "yo-BJ",
++	"yo", "yo-NG",
++	"zh", "yue",
++	"zh", "yue-Hans",
++	"zh", "yue-Hans-CN",
++	"zh", "yue-Hant",
++	"zh", "yue-Hant-HK",
++	"zh", "zh-Hans",
++	"zh", "zh-Hans-CN",
++	"zh", "zh-Hans-HK",
++	"zh", "zh-Hans-MO",
++	"zh", "zh-Hans-SG",
++	"zh", "zh-Hant",
++	"zh", "zh-Hant-HK",
++	"zh", "zh-Hant-MO",
++	"zh", "zh-Hant-TW",
++	NULL, NULL,
++};
++
+ #endif							/* USE_ICU */
+ 
+ 
+@@ -942,17 +1651,18 @@
+ 		 * Start the loop at -1 to sneak in the root locale without too much
+ 		 * code duplication.
+ 		 */
+-		for (i = -1; i < uloc_countAvailable(); i++)
++		for (i = -1; i < ucol_countAvailable(); i++)  /* XXX-Patched: changed from uloc_countAvailable() */
+ 		{
+ 			const char *name;
+ 			char	   *langtag;
+ 			char	   *icucomment;
+ 			Oid			collid;
++			char	   **ptr;  /* XXX-Patched: added */
+ 
+ 			if (i == -1)
+ 				name = "";		/* ICU root locale */
+ 			else
+-				name = uloc_getAvailable(i);
++				name = ucol_getAvailable(i);  /* XXX-Patched: changed from uloc_getAvailable() */
+ 
+ 			langtag = icu_language_tag(name, ERROR);
+ 
+@@ -979,6 +1689,44 @@
+ 				if (icucomment)
+ 					CreateComments(collid, CollationRelationId, 0,
+ 								   icucomment);
++			}
++
++			/*
++			 * XXX-Patched: The following block is added to create collations also for derived
++			 * locales (combination of language+country/region).
++			 * It's terribly inefficient, but in the big picture, it doesn't matter that much
++			 * (it's typically called only once in the life of the cluster).
++			 */
++			for (ptr = icu_coll_locales; *ptr != NULL; ptr++)
++			{
++				/*
++				 * icu_coll_locales is a 1D array of pairs: collation name and locale (langtag).
++				 * ptr++ moves pointer to the second string of the pair and it's a post-increment,
++				 * so after the comparison with name is evaluated.
++				 */
++				if (strcmp(*ptr++, name) == 0) {
++					const char *langtag;
++
++					langtag = pstrdup(*ptr);
++					collid = CollationCreate(psprintf("%s-x-icu", langtag),
++										 nspid, GetUserId(),
++										 COLLPROVIDER_ICU, true, -1,
++										 NULL, NULL, langtag, NULL,
++										 get_collation_actual_version(COLLPROVIDER_ICU, langtag),
++										 true, true);
++
++					if (OidIsValid(collid))
++					{
++						ncreated++;
++
++						CommandCounterIncrement();
++
++						icucomment = get_icu_locale_comment(langtag);
++						if (icucomment)
++							CreateComments(collid, CollationRelationId, 0,
++										   icucomment);
++					}
++				}
+ 			}
+ 		}
+ 	}
diff --git a/main/postgresql16/initdb.patch b/main/postgresql16/initdb.patch
new file mode 100644
index 00000000000..e7607100f7e
--- /dev/null
+++ b/main/postgresql16/initdb.patch
@@ -0,0 +1,14 @@
+diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
+--- a/src/bin/initdb/initdb.c
++++ b/src/bin/initdb/initdb.c
+@@ -3259,9 +3259,7 @@
+ 		/* translator: This is a placeholder in a shell command. */
+ 		appendPQExpBuffer(start_db_cmd, " -l %s start", _("logfile"));
+ 
+-		printf(_("\nSuccess. You can now start the database server using:\n\n"
+-				 "    %s\n\n"),
+-			   start_db_cmd->data);
++		printf(_("\nSuccess.\n\n"));
+ 
+ 		destroyPQExpBuffer(start_db_cmd);
+ 	}
diff --git a/main/postgresql16/jit-datalayout-mismatch-on-s390x-and-x86.patch b/main/postgresql16/jit-datalayout-mismatch-on-s390x-and-x86.patch
new file mode 100644
index 00000000000..807a5f1b767
--- /dev/null
+++ b/main/postgresql16/jit-datalayout-mismatch-on-s390x-and-x86.patch
@@ -0,0 +1,111 @@
+From: Tom Stellard <tstellar@redhat.com>
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sat, 18 Dec 2021 23:09:03 +0100
+Subject: [PATCH] jit: Workaround datalayout mismatch on s390x and x86
+
+This patch is based on https://src.fedoraproject.org/rpms/postgresql/blob/f35/f/postgresql-datalayout-mismatch-on-s390.patch.
+
+Original description:
+
+> LLVM's s390x target uses a different datalayout for z13 and newer processors.
+> If llvmjit_types.bc is compiled to target a processor older than z13, and
+> then the JIT runs on a z13 or newer processor, then there will be a mismatch
+> in datalayouts between llvmjit_types.bc and the JIT engine.  This mismatch
+> causes the JIT to fail at runtime.
+
+We encountered an analogous problem even on x86 (legacy 32bit arch).
+However, I didn't wanna waste my time researching what exact CPU features
+are problematic on this dead architecture, so I just disabled usage of any
+host specific CPU features when creating the JIT on x86. And while I was on
+it, I also conditioned the s390x workaround for s390x only. -jirutka
+
+diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c
+index 98a27f08bf..05b6438ba8 100644
+--- a/src/backend/jit/llvm/llvmjit.c
++++ b/src/backend/jit/llvm/llvmjit.c
+@@ -776,7 +776,38 @@
+ 			 errhidecontext(true)));
+ }
+ 
++#if defined(__s390__) || defined(__s390x__)
+ /*
++ * For the systemz target, LLVM uses a different datalayout for z13 and newer
++ * CPUs than it does for older CPUs.  This can cause a mismatch in datalayouts
++ * in the case where the llvm_types_module is compiled with a pre-z13 CPU
++ * and the JIT is running on z13 or newer.
++ * See computeDataLayout() function in
++ * llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp for information on the
++ * datalayout differences.
++ */
++static bool
++needs_systemz_workaround(void)
++{
++	bool ret = false;
++	LLVMContextRef llvm_context;
++	LLVMTypeRef vec_type;
++	LLVMTargetDataRef llvm_layoutref;
++	if (strncmp(LLVMGetTargetName(llvm_targetref), "systemz", strlen("systemz")))
++	{
++		return false;
++	}
++
++	llvm_context = LLVMGetModuleContext(llvm_types_module);
++	vec_type = LLVMVectorType(LLVMIntTypeInContext(llvm_context, 32), 4);
++	llvm_layoutref = LLVMCreateTargetData(llvm_layout);
++	ret = (LLVMABIAlignmentOfType(llvm_layoutref, vec_type) == 16);
++	LLVMDisposeTargetData(llvm_layoutref);
++	return ret;
++}
++#endif
++
++/*
+  * Per session initialization.
+  */
+ static void
+@@ -785,6 +816,7 @@
+ 	MemoryContext oldcontext;
+ 	char	   *error = NULL;
+ 	char	   *cpu = NULL;
++	char       *host_features = NULL;
+ 	char	   *features = NULL;
+ 	LLVMTargetMachineRef opt0_tm;
+ 	LLVMTargetMachineRef opt3_tm;
+@@ -815,11 +847,22 @@
+ 	 * latter is needed because some CPU architectures default to enabling
+ 	 * features not all CPUs have (weird, huh).
+ 	 */
++#if !defined(__i386__) && !defined(__i386)  // XXX: quick workaround for 32-bit x86
+ 	cpu = LLVMGetHostCPUName();
+-	features = LLVMGetHostCPUFeatures();
++	features = host_features = LLVMGetHostCPUFeatures();
+ 	elog(DEBUG2, "LLVMJIT detected CPU \"%s\", with features \"%s\"",
+ 		 cpu, features);
++#endif
+ 
++#if defined(__s390__) || defined(__s390x__)
++	if (needs_systemz_workaround())
++	{
++		const char *no_vector =",-vector";
++		features = malloc(sizeof(char) * (strlen(host_features) + strlen(no_vector) + 1));
++		sprintf(features, "%s%s", host_features, no_vector);
++	}
++#endif
++
+ 	opt0_tm =
+ 		LLVMCreateTargetMachine(llvm_targetref, llvm_triple, cpu, features,
+ 								LLVMCodeGenLevelNone,
+@@ -833,8 +876,13 @@
+ 
+ 	LLVMDisposeMessage(cpu);
+ 	cpu = NULL;
+-	LLVMDisposeMessage(features);
++	if (features != host_features)
++	{
++		free(features);
++	}
+ 	features = NULL;
++	LLVMDisposeMessage(host_features);
++	host_features = NULL;
+ 
+ 	/* force symbols in main binary to be loaded */
+ 	LLVMLoadLibraryPermanently(NULL);
diff --git a/main/postgresql16/libpgport-pkglibdir.patch.txt b/main/postgresql16/libpgport-pkglibdir.patch.txt
new file mode 100644
index 00000000000..cb862fc344d
--- /dev/null
+++ b/main/postgresql16/libpgport-pkglibdir.patch.txt
@@ -0,0 +1,91 @@
+Patch-Source: https://sources.debian.org/src/postgresql-14/14.0-1/debian/patches/libpgport-pkglibdir
+Author: Christoph Berg <myon@debian.org>
+Description: Move libpgport/libpgcommon/libpgfeutils from libdir to pkglibdir
+ This allows client applications to link to version-specific libraries.
+ Used by pg-checksums.
+
+--- a/src/common/Makefile
++++ b/src/common/Makefile
+@@ -68,15 +68,15 @@ all: libpgcommon.a libpgcommon_shlib.a l
+ 
+ # libpgcommon is needed by some contrib
+ install: all installdirs
+-	$(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(libdir)/libpgcommon.a'
+-	$(INSTALL_STLIB) libpgcommon_shlib.a '$(DESTDIR)$(libdir)/libpgcommon_shlib.a'
++	$(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
++	$(INSTALL_STLIB) libpgcommon_shlib.a '$(DESTDIR)$(pkglibdir)/libpgcommon_shlib.a'
+ 
+ installdirs:
+-	$(MKDIR_P) '$(DESTDIR)$(libdir)'
++	$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
+ 
+ uninstall:
+-	rm -f '$(DESTDIR)$(libdir)/libpgcommon.a'
+-	rm -f '$(DESTDIR)$(libdir)/libpgcommon_shlib.a'
++	rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
++	rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon_shlib.a'
+ 
+ libpgcommon.a: $(OBJS_FRONTEND)
+ 	rm -f $@
+--- a/src/fe_utils/Makefile
++++ b/src/fe_utils/Makefile
+@@ -35,13 +35,13 @@ distprep: psqlscan.c
+ 
+ # libpgfeutils could be useful to contrib, so install it
+ install: all installdirs
+-	$(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(libdir)/libpgfeutils.a'
++	$(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(pkglibdir)/libpgfeutils.a'
+ 
+ installdirs:
+-	$(MKDIR_P) '$(DESTDIR)$(libdir)'
++	$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
+ 
+ uninstall:
+-	rm -f '$(DESTDIR)$(libdir)/libpgfeutils.a'
++	rm -f '$(DESTDIR)$(pkglibdir)/libpgfeutils.a'
+ 
+ clean distclean:
+ 	rm -f libpgfeutils.a $(OBJS) lex.backup
+--- a/src/port/Makefile
++++ b/src/port/Makefile
+@@ -54,15 +54,15 @@ all: libpgport.a libpgport_shlib.a libpg
+ 
+ # libpgport is needed by some contrib
+ install: all installdirs
+-	$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
+-	$(INSTALL_STLIB) libpgport_shlib.a '$(DESTDIR)$(libdir)/libpgport_shlib.a'
++	$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(pkglibdir)/libpgport.a'
++	$(INSTALL_STLIB) libpgport_shlib.a '$(DESTDIR)$(pkglibdir)/libpgport_shlib.a'
+ 
+ installdirs:
+-	$(MKDIR_P) '$(DESTDIR)$(libdir)'
++	$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
+ 
+ uninstall:
+-	rm -f '$(DESTDIR)$(libdir)/libpgport.a'
+-	rm -f '$(DESTDIR)$(libdir)/libpgport_shlib.a'
++	rm -f '$(DESTDIR)$(pkglibdir)/libpgport.a'
++	rm -f '$(DESTDIR)$(pkglibdir)/libpgport_shlib.a'
+ 
+ libpgport.a: $(OBJS)
+ 	rm -f $@
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -599,7 +599,7 @@
+ ifeq ($(PORTNAME),darwin)
+ libpq_pgport = $(libpq)
+ else ifdef PGXS
+-libpq_pgport = -L$(libdir) -lpgcommon -lpgport $(libpq)
++libpq_pgport = -L$(pkglibdir) -lpgcommon -lpgport $(libpq)
+ else
+ libpq_pgport = -L$(top_builddir)/src/common -lpgcommon -L$(top_builddir)/src/port -lpgport $(libpq)
+ endif
+@@ -610,7 +610,7 @@
+ # done if they don't, since they will have satisfied all their references
+ # from these libraries.)
+ ifdef PGXS
+-libpq_pgport_shlib = -L$(libdir) -lpgcommon_shlib -lpgport_shlib $(libpq)
++libpq_pgport_shlib = -L$(pkglibdir) -lpgcommon_shlib -lpgport_shlib $(libpq)
+ else
+ libpq_pgport_shlib = -L$(top_builddir)/src/common -lpgcommon_shlib -L$(top_builddir)/src/port -lpgport_shlib $(libpq)
+ endif
diff --git a/main/postgresql16/make-split-headers.patch b/main/postgresql16/make-split-headers.patch
new file mode 100644
index 00000000000..1a280a49c98
--- /dev/null
+++ b/main/postgresql16/make-split-headers.patch
@@ -0,0 +1,50 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Mon, 08 Nov 2021 14:56:33 +0100
+Subject: [PATCH] Allow to install interfaces headers and server headers separately
+
+Don't install headers of the interfaces (libpq and libecpg) by the install
+target, allow to install them separately from the headers needed for server.
+We need this for two reasons:
+
+a. Allow building PostgreSQL server with LDAP support, but libpq without
+   dependency on LDAP.
+b. Allow building/installing PostgreSQL server without the interfaces.
+   This is used for non-default postgresql aports (older versions of
+   PostgreSQL) - we want to provide just one version of libpq and libecpg
+   library provided by the default (newest) postgresql aport.
+
+--- a/src/include/Makefile
++++ b/src/include/Makefile
+@@ -26,8 +26,10 @@
+ 	port/win32_msvc/sys port/win32/arpa port/win32/netinet \
+ 	port/win32/sys portability
+ 
+-# Install all headers
+-install: all installdirs
++# Install server headers
++install: install-server
++install-interfaces: all
++	$(MKDIR_P) '$(DESTDIR)$(includedir)/libpq' '$(DESTDIR)$(includedir_internal)/libpq'
+ # These headers are needed by the public headers of the interfaces.
+ 	$(INSTALL_DATA) $(srcdir)/postgres_ext.h   '$(DESTDIR)$(includedir)'
+ 	$(INSTALL_DATA) $(srcdir)/libpq/libpq-fs.h '$(DESTDIR)$(includedir)/libpq'
+@@ -40,6 +42,8 @@
+ 	$(INSTALL_DATA) $(srcdir)/port.h         '$(DESTDIR)$(includedir_internal)'
+ 	$(INSTALL_DATA) $(srcdir)/postgres_fe.h  '$(DESTDIR)$(includedir_internal)'
+ 	$(INSTALL_DATA) $(srcdir)/libpq/pqcomm.h '$(DESTDIR)$(includedir_internal)/libpq'
++install-server: all
++	$(MKDIR_P) $(addprefix '$(DESTDIR)$(includedir_server)'/, $(SUBDIRS))
+ # These headers are needed for server-side development
+ 	$(INSTALL_DATA) pg_config.h     '$(DESTDIR)$(includedir_server)'
+ 	$(INSTALL_DATA) pg_config_ext.h '$(DESTDIR)$(includedir_server)'
+@@ -64,10 +68,6 @@
+ 	  chmod $(INSTALL_DATA_MODE) *.h || exit; \
+ 	done
+ 
+-installdirs:
+-	$(MKDIR_P) '$(DESTDIR)$(includedir)/libpq' '$(DESTDIR)$(includedir_internal)/libpq'
+-	$(MKDIR_P) $(addprefix '$(DESTDIR)$(includedir_server)'/, $(SUBDIRS))
+-
+ 
+ uninstall:
+ 	rm -f $(addprefix '$(DESTDIR)$(includedir)'/, pg_config.h pg_config_ext.h pg_config_os.h pg_config_manual.h postgres_ext.h libpq/libpq-fs.h)
diff --git a/main/postgresql16/per-version-dirs.patch b/main/postgresql16/per-version-dirs.patch
new file mode 100644
index 00000000000..ae091cee670
--- /dev/null
+++ b/main/postgresql16/per-version-dirs.patch
@@ -0,0 +1,69 @@
+Author: Martin Pitt <mpitt@debian.org>
+Description: Use version specific installation directories so that several major versions can be installed in parallel.
+
+ * Install server lib files into /usr/lib/postgresql<version>/
+ * Install server related header files into /usr/include/postgresql/<version>/server/
+ * Disable PostgreSQL's automagic path mangling and fix libdir for pg_config,
+   so that pg_config in /usr/bin and /usr/libexec/postgresql<version> behave
+   identically.
+
+Bug-Debian: http://bugs.debian.org/462037
+Patch-Source: https://sources.debian.org/src/postgresql-14/14.0-1/debian/patches/50-per-version-dirs.patch
+
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -119,7 +119,7 @@ libdir := @libdir@
+ pkglibdir = $(libdir)
+ ifeq "$(findstring pgsql, $(pkglibdir))" ""
+ ifeq "$(findstring postgres, $(pkglibdir))" ""
+-override pkglibdir := $(pkglibdir)/postgresql
++override pkglibdir := /usr/lib/postgresql@PG_MAJORVERSION@
+ endif
+ endif
+ 
+@@ -167,7 +167,7 @@ endif # PGXS
+ 
+ # These derived path variables aren't separately configurable.
+ 
+-includedir_server = $(pkgincludedir)/server
++includedir_server = $(pkgincludedir)/@PG_MAJORVERSION@/server
+ includedir_internal = $(pkgincludedir)/internal
+ pgxsdir = $(pkglibdir)/pgxs
+ bitcodedir = $(pkglibdir)/bitcode
+--- a/src/bin/pg_config/pg_config.c
++++ b/src/bin/pg_config/pg_config.c
+@@ -27,6 +27,8 @@
+ #include "common/config_info.h"
+ #include "port.h"
+ 
++#include "../port/pg_config_paths.h"
++
+ static const char *progname;
+ 
+ /*
+@@ -149,11 +151,7 @@ main(int argc, char **argv)
+ 		}
+ 	}
+ 
+-	if (find_my_exec(argv[0], my_exec_path) < 0)
+-	{
+-		fprintf(stderr, _("%s: could not find own program executable\n"), progname);
+-		exit(1);
+-	}
++	snprintf(my_exec_path, sizeof(my_exec_path), "%s/%s", PGBINDIR, progname);
+ 
+ 	configdata = get_configdata(my_exec_path, &configdata_len);
+ 	/* no arguments -> print everything */
+--- a/src/test/perl/PostgreSQL/Test/Utils.pm
++++ b/src/test/perl/PostgreSQL/Test/Utils.pm
+@@ -688,6 +688,10 @@
+ 	chomp($stdout);
+ 	$stdout =~ s/\r$//;
++	# Alpine's pg_config is not relocatable, manually check for correct location
++	if (-d "../../../build/tmp_install/usr/include/postgresql") {
++		$stdout = "../../../build/tmp_install/usr/include/postgresql";
++	}
+
+ 	open my $pg_config_h, '<', "$stdout/pg_config.h" or die "$!";
+ 	my $match = (grep { /^$regexp/ } <$pg_config_h>);
+ 	close $pg_config_h;
diff --git a/main/postgresql16/perl-rpath.patch b/main/postgresql16/perl-rpath.patch
new file mode 100644
index 00000000000..6e522dbe67e
--- /dev/null
+++ b/main/postgresql16/perl-rpath.patch
@@ -0,0 +1,22 @@
+We configure Postgres with --disable-rpath because for the most part we
+want to leave it to ldconfig to determine where libraries are.  However,
+for some reason the Perl package puts libperl.so in a nonstandard place
+and doesn't add that place to the ldconfig search path.  I think this
+is a Perl packaging bug, myself, but apparently it's not going to change.
+So work around it by adding an rpath spec to plperl.so (only).
+
+Alpine notes:
+This patch is copied from Fedora.
+
+--- a/src/pl/plperl/GNUmakefile
++++ b/src/pl/plperl/GNUmakefile
+@@ -55,6 +55,9 @@
+ 
+ SHLIB_LINK = $(perl_embed_ldflags)
+ 
++# Force rpath to be used even though we disable it everywhere else
++SHLIB_LINK += $(rpath)
++
+ REGRESS_OPTS = --dbname=$(PL_TESTDB)
+ REGRESS = plperl_setup plperl plperl_lc plperl_trigger plperl_shared \
+ 	plperl_elog plperl_util plperl_init plperlu plperl_array \
diff --git a/main/postgresql16/pg_config-add-major-version.patch b/main/postgresql16/pg_config-add-major-version.patch
new file mode 100644
index 00000000000..577317ee0d8
--- /dev/null
+++ b/main/postgresql16/pg_config-add-major-version.patch
@@ -0,0 +1,49 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Tue, 09 Nov 2021 00:33:22 +0100
+Subject: [PATCH] pg_config: Add new option --major-version
+
+We use this option in aports for PostgreSQL extensions to easily get major
+version of the default postgresql.
+
+--- a/src/bin/pg_config/pg_config.c
++++ b/src/bin/pg_config/pg_config.c
+@@ -65,6 +65,7 @@
+ 	{"--ldflags_ex", "LDFLAGS_EX"},
+ 	{"--ldflags_sl", "LDFLAGS_SL"},
+ 	{"--libs", "LIBS"},
++	{"--major-version", "MAJOR-VERSION"},
+ 	{"--version", "VERSION"},
+ 	{NULL, NULL}
+ };
+@@ -101,6 +102,8 @@
+ 	printf(_("  --ldflags_ex          show LDFLAGS_EX value used when PostgreSQL was built\n"));
+ 	printf(_("  --ldflags_sl          show LDFLAGS_SL value used when PostgreSQL was built\n"));
+ 	printf(_("  --libs                show LIBS value used when PostgreSQL was built\n"));
++	printf(_("  --major-version       show the PostgreSQL major version number\n"
++			 "                        (Alpine Linux specific option)\n"));
+ 	printf(_("  --version             show the PostgreSQL version\n"));
+ 	printf(_("  -?, --help            show this help, then exit\n"));
+ 	printf(_("\nWith no arguments, all known items are shown.\n\n"));
+--- a/src/common/config_info.c
++++ b/src/common/config_info.c
+@@ -38,7 +38,7 @@
+ 	int			i = 0;
+ 
+ 	/* Adjust this to match the number of items filled below */
+-	*configdata_len = 23;
++	*configdata_len = 24;
+ 	configdata = palloc_array(ConfigData, *configdata_len);
+ 
+ 	configdata[i].name = pstrdup("BINDIR");
+@@ -193,6 +193,11 @@
+ 
+ 	configdata[i].name = pstrdup("VERSION");
+ 	configdata[i].setting = pstrdup("PostgreSQL " PG_VERSION);
++	i++;
++
++	// XXX-Patched: Alpine Linux specific, used in extension aports.
++	configdata[i].name = pstrdup("MAJOR-VERSION");
++	configdata[i].setting = pstrdup(PG_MAJORVERSION);
+ 	i++;
+ 
+ 	Assert(i == *configdata_len);
diff --git a/main/postgresql16/pltcl_create_tables.sql b/main/postgresql16/pltcl_create_tables.sql
new file mode 100644
index 00000000000..76c7a954af3
--- /dev/null
+++ b/main/postgresql16/pltcl_create_tables.sql
@@ -0,0 +1,13 @@
+-- Create tables needed for PL/Tcl autoloading. This script should be run by
+-- the database administrator only.
+--
+-- Statements in this script are extracted from pltcl_loadmod script.
+--
+-- Author: G.J.R. Timmer
+-- Date: 2017-01-28
+
+create table pltcl_modules (modname name, modseq int2, modsrc text);
+create index pltcl_modules_i on pltcl_modules using btree (modname name_ops);
+
+create table pltcl_modfuncs (funcname name, modname name);
+create index pltcl_modfuncs_i on pltcl_modfuncs using hash (funcname name_ops);
diff --git a/main/postgresql16/postgresql16.post-install b/main/postgresql16/postgresql16.post-install
new file mode 100644
index 00000000000..476959a55a3
--- /dev/null
+++ b/main/postgresql16/postgresql16.post-install
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+majorver=${1%%.*}
+
+cat >&2 <<EOF
+*
+* If you want to use JIT in PostgreSQL, install postgresql$majorver-jit or
+* postgresql-jit (if you didn't install specific major version of postgresql).
+*
+EOF
+
+exit 0
diff --git a/main/postgresql16/postgresql16.pre-deinstall b/main/postgresql16/postgresql16.pre-deinstall
new file mode 100644
index 00000000000..db24e86452f
--- /dev/null
+++ b/main/postgresql16/postgresql16.pre-deinstall
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+pkgver=$1
+pkgver_major=${pkgver%%.*}
+default_ver=$(pg_versions get-default 2>/dev/null) || true
+
+# If this package is not set as the default PostgreSQL version (see
+# pg_versions), let it go.
+[ "$default_ver" = "$pkgver_major" ] || exit 0
+
+# If this package ('postgresql<majorver>') has been installed explicitly, i.e.
+# not via 'postgresql' provider or as a dependency, the user is apparently
+# uninstalling it intentionally, so let it go.
+grep -Fqx "postgresql$pkgver_major" /etc/apk/world 2>/dev/null && exit 0
+
+data_dir=$(
+	. /etc/conf.d/postgresql 2>/dev/null
+	echo "${data_dir:-"/var/lib/postgresql/$pkgver_major/data"}"
+)
+# If data_dir for this version does not exist or is empty, let it go.
+[ -f "$data_dir"/PG_VERSION ] || exit 0
+
+
+cat >&2 <<EOF
+*
+* You are uninstalling your default PostgreSQL version ($default_ver) which seems to be
+* in use! If it's *not* intentional and you want to preserve this version,
+* install it explicitly: \`apk add postgresql$default_ver\`.
+*
+* Please note that to upgrade your cluster to a new major version using
+* pg_upgrade(1), you must have both the old and new versions installed.
+*
+EOF
+
+exit 1
diff --git a/main/postgresql16/remove-libecpg_compat.patch b/main/postgresql16/remove-libecpg_compat.patch
new file mode 100644
index 00000000000..ff5fab07fad
--- /dev/null
+++ b/main/postgresql16/remove-libecpg_compat.patch
@@ -0,0 +1,18 @@
+Nothing ever depended on libecpg_compat.so.3 in Fedora, so don't build
+it now, at least till somebody explicitly requests that.
+
+Patch-Source: https://src.fedoraproject.org/rpms/libecpg/blob/f35/f/libecpg-10.5-no-compat-lib.patch
+
+diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile
+index 41460a1..cc3dd37 100644
+--- a/src/interfaces/ecpg/Makefile
++++ b/src/interfaces/ecpg/Makefile
+@@ -2,7 +2,7 @@ subdir = src/interfaces/ecpg
+ top_builddir = ../../..
+ include $(top_builddir)/src/Makefile.global
+ 
+-SUBDIRS = include pgtypeslib ecpglib compatlib preproc
++SUBDIRS = include pgtypeslib ecpglib preproc
+ 
+ # Suppress parallel build of subdirectories to avoid a bug in GNU make 3.82, cf
+ # http://savannah.gnu.org/bugs/?30653
diff --git a/main/postgresql16/unix_socket_directories.patch b/main/postgresql16/unix_socket_directories.patch
new file mode 100644
index 00000000000..e7de03ed664
--- /dev/null
+++ b/main/postgresql16/unix_socket_directories.patch
@@ -0,0 +1,29 @@
+Using /tmp for sockets allows everyone to spoof a PostgreSQL server. Thus use
+/run/postgresql/ for "system" clusters which run as 'postgres' (user
+clusters will still use /tmp). Since system cluster are by far the common case,
+set it as default.
+
+This is inspired by Fedora and Debian patches.
+
+--- a/src/backend/utils/misc/postgresql.conf.sample
++++ b/src/backend/utils/misc/postgresql.conf.sample
+@@ -63,7 +63,7 @@
+ #port = 5432				# (change requires restart)
+ #max_connections = 100			# (change requires restart)
+ #superuser_reserved_connections = 3	# (change requires restart)
+-#unix_socket_directories = '/tmp'	# comma-separated list of directories
++unix_socket_directories = '/run/postgresql'	# comma-separated list of directories
+ 					# (change requires restart)
+ #unix_socket_group = ''			# (change requires restart)
+ #unix_socket_permissions = 0777		# begin with 0 to use octal notation
+--- a/src/include/pg_config_manual.h
++++ b/src/include/pg_config_manual.h
+@@ -201,7 +201,7 @@
+  * support them yet.
+  */
+ #ifndef WIN32
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/run/postgresql"
+ #else
+ #define DEFAULT_PGSOCKET_DIR ""
+ #endif
diff --git a/main/postgrey/APKBUILD b/main/postgrey/APKBUILD
deleted file mode 100644
index b65f2cfdd7d..00000000000
--- a/main/postgrey/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: Michael Mason <ms13sp@gmail.com>
-# Maintainer: Michael Mason <ms13sp@gmail.com>
-pkgname=postgrey
-pkgver=1.37
-pkgrel=2
-pkgdesc="Postfix policy server implementing greylisting"
-url="http://postgrey.schweikert.ch/"
-arch="noarch"
-license="GPL-2.0-or-later"
-depends="perl perl-db perl-net-dns perl-net-server perl-io-multiplex
-	perl-net-rblclient perl-parse-syslog perl-netaddr-ip"
-pkgusers="postgrey"
-pkggroups="postgrey"
-checkdepends="perl-file-slurper"
-install=postgrey.pre-install
-source="https://postgrey.schweikert.ch/pub/postgrey-$pkgver.tar.gz
-	postgrey.confd
-	postgrey.initd"
-
-check() {
-	cd test
-	perl test.pl
-}
-
-package() {
-	install -m755 -D $pkgname  "$pkgdir"/usr/sbin/$pkgname
-	mkdir -p "$pkgdir"/var/spool/postfix/$pkgname
-	chown postgrey:postgrey "$pkgdir"/var/spool/postfix/$pkgname
-	chmod 770 "$pkgdir"/var/spool/postfix/$pkgname
-	install -m755 -D contrib/postgreyreport "$pkgdir"/usr/bin/postgreyreport
-	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -m644 -D postgrey_whitelist_clients "$pkgdir"/etc/postfix/postgrey_whitelist_clients
-	install -m644 -D postgrey_whitelist_recipients "$pkgdir"/etc/postfix/postgrey_whitelist_recipients
-	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-}
-
-sha512sums="369968212ea60539efc0d4a7ae84f7c3ce13f5622e6ee070a0089423ef81ca8f7541ebd20289291d0e6a3aec2ca30dbc9c0d9c0a6f0a686adfadb5d0dd7830ca  postgrey-1.37.tar.gz
-cf74ad36c07a3807d85de9c60cfaea31b3c04adebbe306e72d61bf14c1a17e4a07654f0a96919091735b94ea5e3b7847de5e02d4801b3f58240e5622d8ac0d10  postgrey.confd
-fdfdf29d4eae3e74cb673bfd51dea205949afc55630d05ca62a95c45e94b1091aea57d47ea7ddece3957922ece04b23f484320bf374ab2520119e1cd95dc2f3f  postgrey.initd"
diff --git a/main/postgrey/postgrey.confd b/main/postgrey/postgrey.confd
deleted file mode 100644
index 7a6deb587fc..00000000000
--- a/main/postgrey/postgrey.confd
+++ /dev/null
@@ -1,55 +0,0 @@
-# Config file for /etc/init.d/postgrey
-
-# LISTEN TYPE
-#  Set to 'inet' if you want to use a TCP socket.
-#  Set to 'unix' if you want to use an UNIX socket.
-POSTGREY_TYPE="inet"
-
-# HOST
-#  What IP should postgrey bind to?
-#  Leave unchanged unless you know what you are doing.
-#  (ignored if POSTGREY_TYPE is set to 'unix')
-POSTGREY_HOST="127.0.0.1"
-
-# PORT
-#  What TCP port should postgrey listen on?
-#  (ignored if POSTGREY_TYPE is set to 'unix')
-POSTGREY_PORT="10030"
-
-# SOCKET
-#  Unix socket to listen on, if POSTGREY_TYPE is set to 'unix'.
-#  Leave unchanged unless you know what you are doing.
-#  (ignored if POSTGREY_TYPE is set to 'inet')
-POSTGREY_SOCKET="/var/spool/postfix/private/postgrey"
-
-# PID
-#  Postgrey pid file.
-#  Do not change, if you don't know what this is!
-POSTGREY_PID="/var/run/postgrey.pid"
-
-# DELAY
-#  How long to delay mail that is greylisted in seconds.
-POSTGREY_DELAY=300
-
-# TEXT
-#  The response we'll send back with delayed mail.
-POSTGREY_TEXT="Greylisted for %s seconds"
-
-# Additional Postgrey options
-#
-# -v, --verbose			increase verbosity level
-# --max-age=N			delete entries older than N days since the last time
-#				that they have been seen (default: 30)
-# --retry-window=N		allow only N days for the first retrial (default: 2)
-#				append 'h' if you want to specify it in hours
-# --greylist-action=A		if greylisted, return A to Postfix (default: DEFER_IF_PERMIT)
-# --lookup-by-subnet		strip the last 8 bits from IP addresses (default)
-# --lookup-by-host		do not strip the last 8 bits from IP addresses
-# --whitelist-clients=FILE	default: /etc/postfix/postgrey_whitelist_clients
-# --whitelist-recipients=FILE	default: /etc/postfix/postgrey_whitelist_recipients
-#
-# Note that the --whitelist-x options can be specified multiple times, and that
-# per default /etc/postfix/postgrey_whitelist_clients.local is also read, so
-# that you can put there local entries.
-#
-POSTGREY_OPTS=""
diff --git a/main/postgrey/postgrey.initd b/main/postgrey/postgrey.initd
deleted file mode 100644
index 7bd92319a62..00000000000
--- a/main/postgrey/postgrey.initd
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/mail-filter/postgrey/files/postgrey.rc.new,v 1.10 2008/05/21 18:45:44 dertobi123 Exp $
-
-conf="/etc/conf.d/postgrey"
-
-extra_started_commands="reload"
-
-depend() {
-	need net
-	after firewall
-	before postfix
-	provide postfix_greylist
-}
-
-conf_error() {
-	eerror "You need to setup ${conf} first"
-	return 1
-}
-
-checkconfig() {
-if [ -z "${POSTGREY_TYPE}" ]
-	then
-		einfo "You need to choose the server type you want"
-		einfo "by setting the POSTGREY_TYPE variable in ${conf}."
-	else
-	if [ "x${POSTGREY_TYPE}" = "xinet" ]
-		then
-			if [ -z "${POSTGREY_PORT}" ] || [ -z "${POSTGREY_HOST}" ]
-				then
-					einfo "The following entries are missing in ${conf}:"
-					[ -z "${POSTGREY_HOST}" ] && einfo "  - POSTGREY_HOST"
-					[ -z "${POSTGREY_PORT}" ] && einfo "  - POSTGREY_PORT"
-					conf_error
-			fi
-			POSTGREY_ADDR="${POSTGREY_TYPE}=${POSTGREY_HOST}:${POSTGREY_PORT}"
-		else
-			if [ -z "${POSTGREY_SOCKET}" ]
-			then
-				einfo "The following entries are missing in ${conf}:"
-				[ -z "${POSTGREY_SOCKET}" ] && einfo "  - POSTGREY_SOCKET"
-				conf_error
-			fi
-			POSTGREY_ADDR="${POSTGREY_TYPE}=${POSTGREY_SOCKET}"
-	fi
-fi
-
-	if [ -z "${POSTGREY_PID}" ]
-		then
-		einfo "The following entries are missing in ${conf}:"
-		[ -z "${POSTGREY_PID}" ] && einfo "  - POSTGREY_PID"
-		conf_error
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting Postgrey"
-	
-	# HACK -- start a subshell and corrects perms on the socket...
-	( if [ "x${POSTGREY_TYPE}" = "xunix" ]; then
-	rm -f ${POSTGREY_SOCKET};
-	while ! test -S ${POSTGREY_SOCKET}; do sleep 1; done;
-	chmod a+rw,a-x ${POSTGREY_SOCKET}; fi ) &
-
-	if [ -z ${POSTGREY_DELAY} ] ; then
-		POSTGREY_DELAY_ARG=""
-	else
-		POSTGREY_DELAY_ARG="--delay=${POSTGREY_DELAY}"
-	fi
-
-	if [ -z "${POSTGREY_TEXT}" ] ; then
-		POSTGREY_TEXT_ARG=""
-	else
-		POSTGREY_TEXT_ARG="--greylist-text=${POSTGREY_TEXT}"
-	fi
-
-	start-stop-daemon --start --quiet --background \
-		--pidfile=${POSTGREY_PID} \
-		--name postgrey \
-		--exec /usr/sbin/postgrey -- \
-		--${POSTGREY_ADDR} \
-		--daemonize \
-		--pidfile=${POSTGREY_PID} \
-		${POSTGREY_DELAY_ARG} \
-		${POSTGREY_OPTS} \
-		"${POSTGREY_TEXT_ARG}"
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping Postgrey"
-	start-stop-daemon --stop --quiet --pidfile ${POSTGREY_PID}
-	eend ${?}
-}
-
-reload() {
-	ebegin "Reloading Postgrey"
-	start-stop-daemon --stop --signal HUP --oknodo --pidfile ${POSTGREY_PID}
-	eend $?
-}
diff --git a/main/postgrey/postgrey.pre-install b/main/postgrey/postgrey.pre-install
deleted file mode 100644
index bb4269656d0..00000000000
--- a/main/postgrey/postgrey.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S postgrey 2>/dev/null
-adduser -S -D -H -h /dev/null -s /sbin/nologin -G postgrey -g postgrey postgrey 2>/dev/null
-
-exit 0
diff --git a/main/pound/APKBUILD b/main/pound/APKBUILD
deleted file mode 100644
index 8b03bbb7c77..00000000000
--- a/main/pound/APKBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=pound
-pkgver=2.8
-pkgrel=0
-pkgdesc="A reverse proxy, load balancer, and SSL wrapper"
-url="http://www.apsis.ch/pound/index_html"
-arch="all"
-license="GPL"
-depends=
-makedepends="pcre-dev openssl-dev"
-subpackages="$pkgname-doc"
-source="http://www.apsis.ch/$pkgname/Pound-$pkgver.tgz
-	openssl-1.1.patch
-	pound.cfg
-	$pkgname.initd"
-
-builddir="$srcdir"/Pound-$pkgver
-prepare() {
-	default_prepare
-	update_config_sub
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc/pound \
-		--with-owner=root \
-		--with-group=root
-	make
-}
-
-package() {
-	cd "$builddir"
-	install -d "$pkgdir"/usr/sbin
-	make DESTDIR="$pkgdir" install
-	install -Dm755 "$srcdir"/pound.initd "$pkgdir"/etc/init.d/pound
-	install -Dm644 "$srcdir"/pound.cfg "$pkgdir"/etc/pound.cfg
-}
-
-sha512sums="cf0b865b17d3628e273626e07733f1320e4768702c0f64c8ef0f78d46667f770b223bdc7dca88016a95e5ebd23ae646f95a9b2f4a54a5a80001a10047f07eacc  Pound-2.8.tgz
-bc1ba9b6cca1e0cddc95ba519fb2ef11c8252e6585582d0ee26d083d360edc8e8baf52c2708c77895aa2c1453297180f80b9e2aa2a9f8c3c2cafd188447603b1  openssl-1.1.patch
-9471e5abe3e0ee83165ed01a7081a4d14075c6c21b9f9d7c3fb239aa78c38eae74394a7c7e7e7753d218a7ce5cae388823570d19b702a829baa93e949a8946b8  pound.cfg
-cd014677ef7e724d5bd0a101436d0269d2fc18b4cd90ff71eaa690967754d3e4bfe5d0a439099967487b6256121ccc734b01880d96dff50d28242829715e7776  pound.initd"
diff --git a/main/pound/openssl-1.1.patch b/main/pound/openssl-1.1.patch
deleted file mode 100644
index d16b5ef7330..00000000000
--- a/main/pound/openssl-1.1.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-From a2c9dde4d055ea8942afb150b7fc3a807d4e5d60 Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff <gray@gnu.org>
-Date: Wed, 28 Feb 2018 13:44:01 +0000
-Subject: [PATCH] Support for Openssl 1.1
-
----
- .gitignore |  15 ++++++++
- config.c   |  17 +++++++--
- http.c     |  12 ++++++-
- pound.h    |   4 ++-
- svc.c      | 101 +++++++++++++++++++++++++++++++++++++++++++----------
- 5 files changed, 125 insertions(+), 24 deletions(-)
- create mode 100644 .gitignore
-
-diff --git a/.gitignore b/.gitignore
-new file mode 100644
-index 0000000..1afa3b2
---- /dev/null
-+++ b/.gitignore
-@@ -0,0 +1,15 @@
-+Makefile
-+*.orig
-+*.rej
-+core
-+config.h
-+config.log
-+config.status
-+stamp-h1
-+.emacs*
-+*.o
-+*~
-+dh2048.h
-+dh512.h
-+pound
-+poundctl
-diff --git a/config.c b/config.c
-index d41a3ee..e8fec0f 100644
---- a/config.c
-+++ b/config.c
-@@ -174,6 +174,16 @@ conf_fgets(char *buf, const int max)
-     }
- }
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+# define general_name_string(n) \
-+	strndup(ASN1_STRING_get0_data(n->d.dNSName),	\
-+	        ASN1_STRING_length(n->d.dNSName) + 1)
-+#else
-+# define general_name_string(n) \
-+	strndup(ASN1_STRING_data(n->d.dNSName),	\
-+	       ASN1_STRING_length(n->d.dNSName) + 1)
-+#endif
-+
- unsigned char **
- get_subjectaltnames(X509 *x509, unsigned int *count)
- {
-@@ -194,8 +204,7 @@ get_subjectaltnames(X509 *x509, unsigned int *count)
-         name = sk_GENERAL_NAME_pop(san_stack);
-         switch(name->type) {
-             case GEN_DNS:
--                temp[local_count] = strndup(ASN1_STRING_data(name->d.dNSName), ASN1_STRING_length(name->d.dNSName)
--                                    + 1);
-+ 	        temp[local_count] = general_name_string(name);
-                 if(temp[local_count] == NULL)
-                     conf_err("out of memory");
-                 local_count++;
-@@ -565,7 +574,9 @@ parse_service(const char *svc_name)
-     pthread_mutex_init(&res->mut, NULL);
-     if(svc_name)
-         strncpy(res->name, svc_name, KEY_SIZE);
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    if((res->sessions = lh_TABNODE_new(t_hash, t_cmp)) == NULL)    
-+#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
-     if((res->sessions = LHM_lh_new(TABNODE, t)) == NULL)
- #else
-     if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL)
-diff --git a/http.c b/http.c
-index dd211e4..c8e756a 100644
---- a/http.c
-+++ b/http.c
-@@ -527,12 +527,22 @@ log_bytes(char *res, const LONG cnt)
- 
- /* Cleanup code. This should really be in the pthread_cleanup_push, except for bugs in some implementations */
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+# define clear_error()
-+#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
-+# define clear_error() \
-+	if(ssl != NULL) { ERR_clear_error(); ERR_remove_thread_state(NULL); }
-+#else
-+# define clear_error() \
-+	if(ssl != NULL) { ERR_clear_error(); ERR_remove_state(0); }
-+#endif
-+
- #define clean_all() {   \
-     if(ssl != NULL) { BIO_ssl_shutdown(cl); } \
-     if(be != NULL) { BIO_flush(be); BIO_reset(be); BIO_free_all(be); be = NULL; } \
-     if(cl != NULL) { BIO_flush(cl); BIO_reset(cl); BIO_free_all(cl); cl = NULL; } \
-     if(x509 != NULL) { X509_free(x509); x509 = NULL; } \
--    if(ssl != NULL) { ERR_clear_error(); ERR_remove_state(0); } \
-+    clear_error(); \
- }
- 
- /*
-diff --git a/pound.h b/pound.h
-index fa22c36..9603b91 100644
---- a/pound.h
-+++ b/pound.h
-@@ -344,7 +344,9 @@ typedef struct _tn {
- /* maximal session key size */
- #define KEY_SIZE    127
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+  DEFINE_LHASH_OF(TABNODE);
-+#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
- DECLARE_LHASH_OF(TABNODE);
- #endif
- 
-diff --git a/svc.c b/svc.c
-index 60ba488..063b92c 100644
---- a/svc.c
-+++ b/svc.c
-@@ -27,10 +27,17 @@
- 
- #include    "pound.h"
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+# define TABNODE_GET_DOWN_LOAD(t) lh_TABNODE_get_down_load(t)
-+# define TABNODE_SET_DOWN_LOAD(t,n) lh_TABNODE_set_down_load(t,n)
-+#else
- #ifndef LHASH_OF
- #define LHASH_OF(x) LHASH
- #define CHECKED_LHASH_OF(type, h) h
- #endif
-+# define TABNODE_GET_DOWN_LOAD(t) (CHECKED_LHASH_OF(TABNODE, t)->down_load)
-+# define TABNODE_SET_DOWN_LOAD(t,n) (CHECKED_LHASH_OF(TABNODE, t)->down_load = n)
-+#endif
- 
- /*
-  * Add a new key/content pair to a hash table
-@@ -58,7 +65,9 @@ t_add(LHASH_OF(TABNODE) *const tab, const char *key, const void *content, const
-     }
-     memcpy(t->content, content, cont_len);
-     t->last_acc = time(NULL);
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    if((old = lh_TABNODE_insert(tab, t)) != NULL) {
-+#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
-     if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) {
- #else
-     if((old = (TABNODE *)lh_insert(tab, t)) != NULL) {
-@@ -82,7 +91,9 @@ t_find(LHASH_OF(TABNODE) *const tab, char *const key)
-     TABNODE t, *res;
- 
-     t.key = key;
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    if((res = lh_TABNODE_retrieve(tab, &t)) != NULL) {
-+#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
-     if((res = (TABNODE *)LHM_lh_retrieve(TABNODE, tab, &t)) != NULL) {
- #else
-     if((res = (TABNODE *)lh_retrieve(tab, &t)) != NULL) {
-@@ -102,7 +113,9 @@ t_remove(LHASH_OF(TABNODE) *const tab, char *const key)
-     TABNODE t, *res;
- 
-     t.key = key;
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    if((res = lh_TABNODE_delete(tab, &t)) != NULL) {    
-+#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
-     if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) {
- #else
-     if((res = (TABNODE *)lh_delete(tab, &t)) != NULL) {
-@@ -127,7 +140,9 @@ t_old_doall_arg(TABNODE *t, ALL_ARG *a)
-     TABNODE *res;
- 
-     if(t->last_acc < a->lim)
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+        if((res = lh_TABNODE_delete(a->tab, t)) != NULL) {	    
-+#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
-         if((res = LHM_lh_delete(TABNODE, a->tab, t)) != NULL) {
- #else
-         if((res = lh_delete(a->tab, t)) != NULL) {
-@@ -145,6 +160,10 @@ IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE, ALL_ARG)
- IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, ALL_ARG *)
- #endif
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+IMPLEMENT_LHASH_DOALL_ARG(TABNODE,ALL_ARG);
-+#endif
-+
- /*
-  * Expire all old nodes
-  */
-@@ -156,14 +175,16 @@ t_expire(LHASH_OF(TABNODE) *const tab, const time_t lim)
- 
-     a.tab = tab;
-     a.lim = lim;
--    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
--    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    down_load = TABNODE_GET_DOWN_LOAD(tab);
-+    TABNODE_SET_DOWN_LOAD(tab, 0);
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    lh_TABNODE_doall_ALL_ARG(tab, t_old_doall_arg, &a);
-+#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
-     LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a);
- #else
-     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_old), &a);
- #endif
--    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
-+    TABNODE_SET_DOWN_LOAD(tab, down_load);
-     return;
- }
- 
-@@ -173,7 +194,9 @@ t_cont_doall_arg(TABNODE *t, ALL_ARG *arg)
-     TABNODE *res;
- 
-     if(memcmp(t->content, arg->content, arg->cont_len) == 0)
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+        if((res = lh_TABNODE_delete(arg->tab, t)) != NULL) {
-+#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
-         if((res = LHM_lh_delete(TABNODE, arg->tab, t)) != NULL) {
- #else
-         if((res = lh_delete(arg->tab, t)) != NULL) {
-@@ -203,15 +226,16 @@ t_clean(LHASH_OF(TABNODE) *const tab, void *const content, const size_t cont_len
-     a.tab = tab;
-     a.content = content;
-     a.cont_len = cont_len;
--    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
--    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    down_load = TABNODE_GET_DOWN_LOAD(tab);
-+    TABNODE_SET_DOWN_LOAD(tab, 0);
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    lh_TABNODE_doall_ALL_ARG(tab, t_cont_doall_arg, &a);
-+#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
-     LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a);
- #else
-     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_cont), &a);
- #endif
--    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
--    return;
-+    TABNODE_SET_DOWN_LOAD(tab, down_load);
- }
- 
- /*
-@@ -1262,6 +1286,31 @@ RSA_tmp_callback(/* not used */SSL *ssl, /* not used */int is_export, int keylen
-     return res;
- }
- 
-+static int
-+generate_key(RSA **ret_rsa, unsigned long bits)
-+{
-+#if OPENSSL_VERSION_NUMBER > 0x00908000L
-+    int rc = 0;
-+    RSA *rsa;
-+
-+    rsa = RSA_new();
-+    if (rsa) {
-+	BIGNUM *bne = BN_new();
-+	if (BN_set_word(bne, RSA_F4))
-+	    rc = RSA_generate_key_ex(rsa, bits, bne, NULL);
-+	BN_free(bne);
-+	if (rc)
-+	    *ret_rsa = rsa;
-+	else
-+	    RSA_free(rsa);
-+    }
-+    return rc;
-+#else
-+    *ret_rsa = RSA_generate_key(bits, RSA_F4, NULL, NULL);
-+    return *ret_rsa != NULL;
-+#endif
-+}
-+
- /*
-  * Periodically regenerate ephemeral RSA keys
-  * runs every T_RSA_KEYS seconds
-@@ -1274,8 +1323,9 @@ do_RSAgen(void)
-     RSA *t_RSA1024_keys[N_RSA_KEYS];
- 
-     for(n = 0; n < N_RSA_KEYS; n++) {
--        t_RSA512_keys[n] = RSA_generate_key(512, RSA_F4, NULL, NULL);
--        t_RSA1024_keys[n] = RSA_generate_key(1024, RSA_F4, NULL, NULL);
-+        /* FIXME: Error handling */
-+        generate_key(&t_RSA512_keys[n], 512);
-+	generate_key(&t_RSA1024_keys[n], 1024);
-     }
-     if(ret_val = pthread_mutex_lock(&RSA_mut))
-         logmsg(LOG_WARNING, "thr_RSAgen() lock: %s", strerror(ret_val));
-@@ -1329,11 +1379,11 @@ init_timer(void)
-      * Pre-generate ephemeral RSA keys
-      */
-     for(n = 0; n < N_RSA_KEYS; n++) {
--        if((RSA512_keys[n] = RSA_generate_key(512, RSA_F4, NULL, NULL)) == NULL) {
-+        if(!generate_key(&RSA512_keys[n], 512)) {
-             logmsg(LOG_WARNING,"RSA_generate(%d, 512) failed", n);
-             return;
-         }
--        if((RSA1024_keys[n] = RSA_generate_key(1024, RSA_F4, NULL, NULL)) == NULL) {
-+        if(!generate_key(&RSA1024_keys[n], 1024)) {
-             logmsg(LOG_WARNING,"RSA_generate(%d, 1024) failed", n);
-             return;
-         }
-@@ -1420,6 +1470,10 @@ IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE, DUMP_ARG)
- IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, DUMP_ARG *)
- #endif
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+IMPLEMENT_LHASH_DOALL_ARG(TABNODE,DUMP_ARG);
-+#endif
-+	
- /*
-  * write sessions to the control socket
-  */
-@@ -1430,7 +1484,9 @@ dump_sess(const int control_sock, LHASH_OF(TABNODE) *const sess, BACKEND *const
- 
-     a.control_sock = control_sock;
-     a.backends = backends;
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    lh_TABNODE_doall_DUMP_ARG(sess, t_dump_doall_arg, &a);
-+#elif OPENSSL_VERSION_NUMBER >= 0x10000000L
-     LHM_lh_doall_arg(TABNODE, sess, LHASH_DOALL_ARG_FN(t_dump), DUMP_ARG, &a);
- #else
-     lh_doall_arg(sess, LHASH_DOALL_ARG_FN(t_dump), &a);
-@@ -1664,6 +1720,13 @@ thr_control(void *arg)
-     }
- }
- 
-+#ifndef SSL3_ST_SR_CLNT_HELLO_A
-+# define SSL3_ST_SR_CLNT_HELLO_A (0x110|SSL_ST_ACCEPT)
-+#endif
-+#ifndef SSL23_ST_SR_CLNT_HELLO_A
-+# define SSL23_ST_SR_CLNT_HELLO_A (0x210|SSL_ST_ACCEPT)
-+#endif
-+		
- void
- SSLINFO_callback(const SSL *ssl, int where, int rc)
- {
diff --git a/main/pound/pound.cfg b/main/pound/pound.cfg
deleted file mode 100644
index 664ea53c9ed..00000000000
--- a/main/pound/pound.cfg
+++ /dev/null
@@ -1,54 +0,0 @@
-## Minimal sample pound.cfg
-##
-## see pound(8) for details
-
-
-######################################################################
-## global options:
-
-User		"nobody"
-Group		"nobody"
-#RootJail	/chroot/pound
-
-## Logging: (goes to syslog by default)
-##	0	no logging
-##	1	normal
-##	2	extended
-##	3	Apache-style (common log format)
-LogLevel	1
-
-## check backend every X secs:
-Alive		30
-
-## use hardware-accelleration card supported by openssl(1):
-#SSLEngine	<hw>
-
-
-######################################################################
-## listen, redirect and ... to:
-
-## redirect all requests on port 8888 ("ListenHTTP") to the local webserver see "UrlGroup" below):
-ListenHTTP 
-Address 127.0.0.1
-Port 8888
-
-## allow PUT and DELETE also (by default only GET, POST and HEAD)?:
-xHTTP 0
-
-Service
-URL ".*"
-
-BackEnd
-Address 127.0.0.1
-Port 80
-Priority 1
-
-## End Backend
-End
-
-## End Service
-End
-
-## End listener
-End
-
diff --git a/main/pound/pound.initd b/main/pound/pound.initd
deleted file mode 100644
index 51be0ecc4ee..00000000000
--- a/main/pound/pound.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/pound/files/pound.init-1.9,v 1.1 2005/07/07 15:45:08 mkennedy Exp $
-
-depend() {
-	need net
-	after firewall
-}
-
-start() {
-	ebegin "Starting pound"
-	if [ ! -f "/etc/pound.cfg" ]; then
-		eend 1 "configfile /etc/pound.cfg not found."
-	fi
-	start-stop-daemon --quiet --start --exec /usr/sbin/pound \
-		-- -f /etc/pound.cfg -p /var/run/pound.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping pound"
-	start-stop-daemon --quiet --stop --pidfile /var/run/pound.pid
-	eend $?
-}
-
diff --git a/main/powerpc-utils/APKBUILD b/main/powerpc-utils/APKBUILD
index 40f2956e07f..7a27182b821 100644
--- a/main/powerpc-utils/APKBUILD
+++ b/main/powerpc-utils/APKBUILD
@@ -1,26 +1,23 @@
 # Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com>
 pkgname=powerpc-utils
 pkgver=1.3.6
-pkgrel=0
+pkgrel=1
 pkgdesc="Maintenance utilities for PowerPC platforms"
 url="https://github.com/nfont/powerpc-utils"
 arch="ppc ppc64 ppc64le"
 options="!check"  # No test suite.
-license="GPL-2.0+"
+license="GPL-2.0-or-later"
 makedepends="autoconf automake zlib-dev"
 depends="bash bc"
 subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/nfont/$pkgname/archive/v$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
+source="$pkgname-$pkgver.tar.gz::https://github.com/nfont/powerpc-utils/archive/v$pkgver.tar.gz"
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 	./autogen.sh
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -31,7 +28,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/powertop/APKBUILD b/main/powertop/APKBUILD
index 4c3ce3898ae..0572da47217 100644
--- a/main/powertop/APKBUILD
+++ b/main/powertop/APKBUILD
@@ -1,30 +1,45 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Steven Guikal <void@fluix.one>
 pkgname=powertop
-pkgver=2.11
-pkgrel=1
+pkgver=2.15
+pkgrel=4
 pkgdesc="Power consumption monitor"
-url="https://01.org/powertop"
+url="https://github.com/fenrus75/powertop"
 arch="all"
 license="GPL-2.0-only"
-makedepends="linux-headers ncurses-dev pciutils-dev zlib-dev libnl-dev
-	gettext-dev automake autoconf libtool"
+makedepends="
+	autoconf
+	autoconf-archive
+	automake
+	gettext-dev
+	libnl3-dev
+	libtool
+	linux-headers
+	ncurses-dev
+	pciutils-dev
+	xz
+	zlib-dev
+	"
 subpackages="
 	$pkgname-doc
-	$pkgname-bash-completion:bashcomp:noarch
-	"
-source="$pkgname-$pkgver.tar.gz::https://github.com/fenrus75/powertop/archive/v$pkgver.tar.gz
-	musl-fix-headers.patch
+	$pkgname-bash-completion
 	"
+source="$pkgname-$pkgver.tar.gz::https://github.com/fenrus75/powertop/releases/download/v$pkgver/powertop.tar.gz"
+builddir="$srcdir/$pkgname"
+options="!check" # no tests
 
 prepare() {
 	default_prepare
-	sed -i "s:RUN-VERSION-SCRIPT-IN-GIT-REPOSITORY-ONLY:v$pkgver:" scripts/version
-	./autogen.sh
+	NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-	LIBS="-lintl" ./configure --prefix=/usr --disable-nls
+	LIBS="-lintl" \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-nls
 	make
 }
 
@@ -32,13 +47,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
-	amove usr/share/bash-completion
-}
-
-sha512sums="bbe2882196f1b3ae39885d38dd86018576bfac5b5e8f16ea10c7dfd197197d0493ae4ce83c969417a4c4239c41dbcfada989063f14e2943c088a7489e43953b7  powertop-2.11.tar.gz
-d3bb0e8eaa56fe9ef5aed5d7bea4860be2135fc163ec0c669dc2d01f5ee46ee22ee58cac0835518dc1a4e2939748cf57f2ab37e8d0d879bbc0161d66db7d1919  musl-fix-headers.patch"
+sha512sums="
+8aa71c15a3931f1b62fd22920c8f16d552a3b81335d87ad210121419fd74263ac6956eec7fb0d607247fee71658923a0e049717de946031604085e5d8c108a85  powertop-2.15.tar.gz
+"
diff --git a/main/powertop/musl-fix-headers.patch b/main/powertop/musl-fix-headers.patch
deleted file mode 100644
index 9839d15bf6f..00000000000
--- a/main/powertop/musl-fix-headers.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./src/devices/devfreq.h.orig
-+++ ./src/devices/devfreq.h
-@@ -25,6 +25,7 @@
- #ifndef _INCLUDE_GUARD_DEVFREQ_H
- #define _INCLUDE_GUARD_DEVFREQ_H
- 
-+#include <sys/time.h>
- #include "device.h"
- #include "../parameters/parameters.h"
- 
-diff --git a/src/perf/perf.h b/src/perf/perf.h
-index ee072ae06d24..932588a684f9 100644
---- a/src/perf/perf.h
-+++ b/src/perf/perf.h
-@@ -26,6 +26,7 @@
- #define _INCLUDE_GUARD_PERF_H_
- 
- #include <iostream>
-+#include <stdio.h>
- 
- 
- extern "C" {
diff --git a/main/ppp/0001-Revert-lock-path-to-var-lock-435.patch b/main/ppp/0001-Revert-lock-path-to-var-lock-435.patch
new file mode 100644
index 00000000000..4a81b255674
--- /dev/null
+++ b/main/ppp/0001-Revert-lock-path-to-var-lock-435.patch
@@ -0,0 +1,61 @@
+From 99cbf5e269994482edaf64624be8b1c806f9587c Mon Sep 17 00:00:00 2001
+From: Dominique Martinet <asmadeus@codewreck.org>
+Date: Tue, 10 Oct 2023 10:05:50 +0900
+Subject: [PATCH] Revert lock path to /var/lock (#435)
+
+lock dir changed on linux from /var/lock to /run/pppd/lock with
+pppd-2.5.0, which makes pppd fail to start if the distribution does not
+pre-create the directory.
+
+This reverts it back to /var/lock.
+
+The paths for other OS should be identical as LOCALSTATEDIR should be
+/var, but also revert them back as well just in case.
+Since the variable is no longer used remove it from makefiles.
+
+Fixes: 66a8c74c3f73 ("Let ./configure control the paths for pppd")
+Fixes: #419
+
+Signed-off-by: Dominique Martinet <dominique.martinet@atmark-techno.com>
+Co-authored-by: Dominique Martinet <dominique.martinet@atmark-techno.com>
+---
+ pppd/Makefile.am | 2 +-
+ pppd/pathnames.h | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pppd/Makefile.am b/pppd/Makefile.am
+index e5bedf26af96..7cb30053322e 100644
+--- a/pppd/Makefile.am
++++ b/pppd/Makefile.am
+@@ -83,7 +83,7 @@ pppd_SOURCES = \
+     upap.c \
+     utils.c
+ 
+-pppd_CPPFLAGS = -DSYSCONFDIR=\"${sysconfdir}\" -DLOCALSTATEDIR=\"${localstatedir}\" -DPPPD_RUNTIME_DIR='"@PPPD_RUNTIME_DIR@"' -DPPPD_LOGFILE_DIR='"@PPPD_LOGFILE_DIR@"'
++pppd_CPPFLAGS = -DSYSCONFDIR=\"${sysconfdir}\" -DPPPD_RUNTIME_DIR='"@PPPD_RUNTIME_DIR@"' -DPPPD_LOGFILE_DIR='"@PPPD_LOGFILE_DIR@"'
+ pppd_LDFLAGS =
+ pppd_LIBS =
+ 
+diff --git a/pppd/pathnames.h b/pppd/pathnames.h
+index de2fb6889005..12609a969429 100644
+--- a/pppd/pathnames.h
++++ b/pppd/pathnames.h
+@@ -120,12 +120,12 @@
+ #define PPP_PATH_PPPDB          PPP_PATH_VARRUN  "/pppd2.tdb"
+ 
+ #ifdef __linux__
+-#define PPP_PATH_LOCKDIR        PPP_PATH_VARRUN  "/lock"
++#define PPP_PATH_LOCKDIR        "/var/lock"
+ #else
+ #ifdef SVR4
+-#define PPP_PATH_LOCKDIR        LOCALSTATEDIR "/spool/locks"
++#define PPP_PATH_LOCKDIR        "/var/spool/locks"
+ #else
+-#define PPP_PATH_LOCKDIR        LOCALSTATEDIR "/spool/lock"
++#define PPP_PATH_LOCKDIR        "/var/spool/lock"
+ #endif
+ #endif
+ 
+-- 
+2.39.2
+
diff --git a/main/ppp/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch b/main/ppp/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
index a99cc1ca763..5ab5c98de4f 100644
--- a/main/ppp/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
+++ b/main/ppp/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
@@ -23,55 +23,19 @@ index 6d10836..78d6939 100644
  .LP
  \fBSAY\fR strings must be enclosed in single or double quotes. If
  carriage return and line feed are needed in the string to be output,
-diff --git a/linux/Makefile.top b/linux/Makefile.top
-index f63d45e..f42efd5 100644
---- a/linux/Makefile.top
-+++ b/linux/Makefile.top
-@@ -5,6 +5,8 @@ BINDIR = $(DESTDIR)/sbin
- INCDIR = $(DESTDIR)/include
- MANDIR = $(DESTDIR)/share/man
- ETCDIR = $(INSTROOT)@SYSCONF@/ppp
-+RUNDIR = $(INSTROOT)/var/run/ppp
-+LOGDIR = $(INSTROOT)/var/log/ppp
- 
- # uid 0 = root
- INSTALL= install
-@@ -16,7 +18,7 @@ all:
- 	cd pppstats; $(MAKE) $(MFLAGS) all
- 	cd pppdump; $(MAKE) $(MFLAGS) all
- 
--install: $(BINDIR) $(MANDIR)/man8 install-progs install-devel
-+install: $(BINDIR) $(RUNDIR) $(LOGDIR) $(MANDIR)/man8 install-progs install-devel
- 
- install-progs:
- 	cd chat; $(MAKE) $(MFLAGS) install
-@@ -44,6 +46,10 @@ $(MANDIR)/man8:
- 	$(INSTALL) -d -m 755 $@
- $(ETCDIR):
- 	$(INSTALL) -d -m 755 $@
-+$(RUNDIR):
-+	$(INSTALL) -d -m 755 $@
-+$(LOGDIR):
-+	$(INSTALL) -d -m 755 $@
- 
- clean:
- 	rm -f `find . -name '*.[oas]' -print`
 diff --git a/pppd/pathnames.h b/pppd/pathnames.h
-index a427cb8..bef3160 100644
+index de2fb68..84cf008 100644
 --- a/pppd/pathnames.h
 +++ b/pppd/pathnames.h
-@@ -28,9 +28,9 @@
- #define _PATH_AUTHUP	 _ROOT_PATH "/etc/ppp/auth-up"
- #define _PATH_AUTHDOWN	 _ROOT_PATH "/etc/ppp/auth-down"
- #define _PATH_TTYOPT	 _ROOT_PATH "/etc/ppp/options."
--#define _PATH_CONNERRS	 _ROOT_PATH "/etc/ppp/connect-errors"
-+#define _PATH_CONNERRS	 _ROOT_PATH "/var/log/ppp/connect-errors"
- #define _PATH_PEERFILES	 _ROOT_PATH "/etc/ppp/peers/"
--#define _PATH_RESOLV	 _ROOT_PATH "/etc/ppp/resolv.conf"
-+#define _PATH_RESOLV	 _ROOT_PATH "/var/run/ppp/resolv.conf"
+@@ -105,9 +105,9 @@
+ #define PPP_PATH_AUTHDOWN       PPP_PATH_CONFDIR "/auth-down"
+ #define PPP_PATH_TTYOPT         PPP_PATH_CONFDIR "/options."
+ #define PPP_PATH_PEERFILES      PPP_PATH_CONFDIR "/peers/"
+-#define PPP_PATH_RESOLV         PPP_PATH_CONFDIR "/resolv.conf"
++#define PPP_PATH_RESOLV         "/run/ppp/resolv.conf"
  
- #define _PATH_USEROPT	 ".ppprc"
- #define	_PATH_PSEUDONYM	 ".ppp_pseudonym"
--- 
-1.8.3.1
-
+-#define PPP_PATH_CONNERRS       PPP_PATH_VARLOG  "/connect-errors"
++#define PPP_PATH_CONNERRS       "/var/log/ppp/connect-errors"
+ 
+ #define PPP_PATH_USEROPT        ".ppprc"
+ #define PPP_PATH_PSEUDONYM	    ".ppp_pseudonym"
diff --git a/main/ppp/APKBUILD b/main/ppp/APKBUILD
index 0c1f6da5c14..2630b615505 100644
--- a/main/ppp/APKBUILD
+++ b/main/ppp/APKBUILD
@@ -1,81 +1,104 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ppp
-pkgver=2.4.8
-pkgrel=2
+pkgver=2.5.0
+pkgrel=5
 pkgdesc="A daemon which implements the PPP protocol for dial-up networking"
 url="https://ppp.samba.org/"
 arch="all"
-license="BSD and LGPL-2.0-or-later and GPL-2.0-or-later and Public-Domain"
-makedepends="bsd-compat-headers linux-headers"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-chat $pkgname-radius
-	    $pkgname-atm $pkgname-pppoe $pkgname-l2tp $pkgname-winbind
-	    $pkgname-passprompt $pkgname-passwordfd $pkgname-minconn
-	    $pkgname-openrc $pkgname-daemon
-	    "
-
+license="BSD-3-Clause AND BSD-4-Clause AND BSD-4-Clause-Shortened AND GPL-2.0-or-later AND HPND AND LGPL-2.0-or-later AND Public-Domain AND RSA-MD"
 # for compatibility reasons the 'ppp' package is an empty meta package
 # that pulls in all except -dev and -doc subpackages
-depends="$pkgname-chat $pkgname-radius
-	    $pkgname-atm $pkgname-pppoe $pkgname-l2tp $pkgname-winbind
-	    $pkgname-passprompt $pkgname-passwordfd $pkgname-minconn
-	    $pkgname-daemon
-	    "
-
+depends="
+	$pkgname-chat
+	$pkgname-radius
+	$pkgname-atm
+	$pkgname-pppoe
+	$pkgname-l2tp
+	$pkgname-winbind
+	$pkgname-passprompt
+	$pkgname-passwordfd
+	$pkgname-minconn
+	$pkgname-daemon
+	"
+makedepends="
+	autoconf
+	automake
+	bsd-compat-headers
+	libpcap-dev
+	libtool
+	linux-headers
+	openssl-dev>3
+	"
+subpackages="
+	$pkgname-doc
+	$pkgname-dev
+	$pkgname-chat
+	$pkgname-radius
+	$pkgname-atm
+	$pkgname-pppoe
+	$pkgname-l2tp
+	$pkgname-winbind
+	$pkgname-passprompt
+	$pkgname-passwordfd
+	$pkgname-minconn
+	$pkgname-openrc
+	$pkgname-daemon
+	"
 source="https://github.com/paulusmack/ppp/archive/ppp-$pkgver.tar.gz
-	musl-fix-headers.patch
-	fix-paths.patch
 	0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
-	fix-pppd-magic.h.patch
-	fix-pppd-pppoe.h.patch
-	radius-Prevent-buffer-overflow-in-rc_mksid.patch
-	fix-bound-check-eap.patch
-	pppd-Ignore-received-EAP-messages-when-not-doing-EAP.patch
+	fix-paths.patch
+	musl-fix-headers.patch
+	0001-Revert-lock-path-to-var-lock-435.patch
 	ip-down
 	ip-up
-	pppd.initd"
-
+	pppd.initd
+	pppd.confd
+	"
 builddir="$srcdir"/$pkgname-$pkgname-$pkgver
+options="!check"
 
 # secfixes:
+#   2.4.9-r6:
+#     - CVE-2022-4603
 #   2.4.8-r1:
 #     - CVE-2020-8597
 
-build() {
+prepare() {
+	default_prepare
 
+	autoreconf -fvi
+}
+
+build() {
 	# fix CFLAGS
 	# -D_GNU_SOURCE is needed for IPv6 to work apparently
 	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
-	sed -i "s:-O2 -pipe -Wall -g:${CFLAGS}:" pppd/Makefile.linux
-	sed -i "s:-g -O2:${CFLAGS}:" pppd/plugins/Makefile.linux
-	sed -i "s:-O2:${CFLAGS}:" pppstats/Makefile.linux
-	sed -i "s:-O2 -g -pipe:${CFLAGS}:" chat/Makefile.linux
-	sed -i "s:-O:${CFLAGS}:" pppdump/Makefile.linux
-	# enable active filter
-	sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux
-	# enable ipv6 support
-	sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux
-	# Enable Microsoft proprietary Callback Control Protocol
-	sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux
-	sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux
-	sed -i "s:^#USE_CRYPT=y:USE_CRYPT=y:" pppd/Makefile.linux
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--localstatedir=/var
-	make COPTS="$CFLAGS"
+		--localstatedir=/var \
+		--sysconfdir=/etc \
+		--with-runtime-dir=/run/ppp \
+		--with-logfile-dir=/var/log/ppp \
+		--enable-cbcp \
+		--enable-microsoft-extensions \
+		--enable-multilink \
+		--enable-peap \
+		--disable-systemd
+	make
 }
 
 package() {
-	make INSTROOT="$pkgdir" install
+	make DESTDIR="$pkgdir" install
 	install -Dm644 include/net/ppp_defs.h \
 		"$pkgdir"/usr/include/net/ppp_defs.h
 	install -D -m755 "$srcdir"/ip-up "$pkgdir"/etc/ppp/ip-up
 	install -D -m755 "$srcdir"/ip-down "$pkgdir"/etc/ppp/ip-down
 	install -D -m755 "$srcdir"/pppd.initd "$pkgdir"/etc/init.d/pppd
-	install -D -m644 etc.ppp/options "$pkgdir"/etc/ppp/options
-	install -D -m600 etc.ppp/pap-secrets "$pkgdir"/etc/ppp/pap-secrets
-	install -D -m600 etc.ppp/chap-secrets "$pkgdir"/etc/ppp/chap-secrets
+	install -D -m644 "$srcdir"/pppd.confd "$pkgdir"/etc/conf.d/pppd
+
+	mkdir -p "$pkgdir"/var/log/ppp/
 
 	# busybox ifup/ifdown needs pon/poff
 	install -D -m644 scripts/pon.1 "$pkgdir"/usr/share/man/man1/pon.1
@@ -85,7 +108,7 @@ package() {
 	install -d "$pkgdir"/usr/share/doc/ppp
 	for i in scripts/*; do
 		case $i in
-		pon|poff|*.1) continue;
+		pon|poff|*.1|Makefile*) continue;
 		esac
 		if [ -f "$i" ]; then
 			cp $i "$pkgdir"/usr/share/doc/ppp/
@@ -97,25 +120,28 @@ package() {
 atm() {
 	pkgdesc="pppd plugin to implement PPPoATM protocol"
 	depends="ppp-daemon"
+	license="GPL-2.0-or-later AND LGPL-2.0-or-later"
 	_mv usr/lib/pppd/$pkgver/pppoatm.so 755
 }
 
 minconn() {
 	pkgdesc="pppd plugin to implement a 'minconnect' option"
 	depends="ppp-daemon"
+	license="BSD-4-Clause"
 	_mv usr/lib/pppd/$pkgver/minconn.so 755
 }
 
 winbind() {
 	pkgdesc="WINBIND plugin for pppd"
 	depends="ppp-daemon"
+	license="GPL-2.0-or-later"
 	_mv usr/lib/pppd/$pkgver/winbind.so 755
 }
 
-
 passprompt() {
 	pkgdesc="pppd plugin to invoke an external PAP password prompter"
 	depends="ppp-daemon"
+	license="GPL-2.0-or-later"
 	_mv usr/lib/pppd/$pkgver/passprompt.so 755
 }
 
@@ -128,12 +154,14 @@ passwordfd() {
 chat() {
 	pkgdesc="a program for automatic ppp session establishment"
 	depends=
+	license="Public-Domain"
 	_mv usr/sbin/chat 755
 }
 
 l2tp() {
 	pkgdesc="pppd plugin to implement PPPoL2TP protocol"
 	depends="ppp-daemon"
+	license="GPL-2.0-or-later"
 	_mv usr/lib/pppd/$pkgver/openl2tp.so 755
 	_mv usr/lib/pppd/$pkgver/pppol2tp.so 755
 }
@@ -141,13 +169,15 @@ l2tp() {
 pppoe() {
 	pkgdesc="pppd plugin for kernel-mode PPPoE on Linux"
 	depends="ppp-daemon"
-	_mv usr/lib/pppd/$pkgver/rp-pppoe.so 755
+	license="GPL-2.0-or-later"
+	_mv usr/lib/pppd/$pkgver/pppoe.so 755
 	_mv usr/sbin/pppoe-discovery 755
 }
 
 radius() {
 	pkgdesc="RADIUS plugin for pppd"
 	depends="ppp-daemon"
+	license="GPL-2.0-or-later AND HPND"
 	_mv usr/lib/pppd/$pkgver/radius.so 755
 	_mv usr/lib/pppd/$pkgver/radattr.so 755
 	_mv usr/lib/pppd/$pkgver/radrealms.so 755
@@ -166,19 +196,24 @@ _mv() {
 daemon() {
 	pkgdesc="A daemon which implements the PPP protocol"
 	depends=
+	license="BSD-3-Clause AND BSD-4-Clause AND BSD-4-Clause-Shortened AND GPL-2.0-or-later AND LGPL-2.0-or-later AND Public-Domain AND RSA-MD"
 	mkdir -p "$subpkgdir"
 	mv "$pkgdir"/* "$subpkgdir"/
 }
 
-sha512sums="a99b3b6c7bd80cd133bda4e29d33c793a76f3b67e1f8db774547e88932ce29564fad390a4f51d3fe30a75e006499b95000b042ae0f64cd360548426f8091a478  ppp-2.4.8.tar.gz
-55642ce365a7cf7dda05366ac6e74f6badba3cc7bc980760e0a2ee7bfa768ea033c4a3880b3387e0787d719742698f627c624f890d68800344d31c0309c0374d  musl-fix-headers.patch
-8384afb992a98a7f97b484866e6aa1b1de51e901d7837f84f7ce2beba6815591450fab43957f03b65804424c4940c59640a9cd878979240a171aa77427e9c4ff  fix-paths.patch
-b490971d03fef4de66b61123f80a0087270bcb88466ae8ed98ea9a08b35d4c7c46b2dadd304e2970a4206bb5760a14370d7e3873de6240119d88e927ecef840c  0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
-d1067defff79d6c9f67121a9214e41a1bcca1e3b8a345ad905d223fdb8835142bad7cc3b556a3eca509ddf51cf808741773f31f4dca74e834b612a15854a5e6b  fix-pppd-magic.h.patch
-d76237c82af0a3ed7ede9e814d6849b94221f1fd15e4ee68cadd33a308a32d87d635acd14f84508c9e38a10ad0a9e96ce391044da37e217d11b89a4f6631abf7  fix-pppd-pppoe.h.patch
-d175085eaa93ccf8ade7be4f9818efe353017da7cec41d9312ad2c6685e3763834aff76d673e9d2bb0b44336f926537569ddb86a6035ec33ab8b6a7de2340132  radius-Prevent-buffer-overflow-in-rc_mksid.patch
-ba0c062f93400008ddf47897ac2ab6a2f5017bc7f4167d1a93dd3a5c04068a922490eb4082b0da80f0c3aea6c87fdfbca3568548724a0abc148588ab86a6df32  fix-bound-check-eap.patch
-ce1bf3298f3f99a7de643bd070cb0e7e7b1dd9621926637ffc93fd2ef552781424ce9a68c88de6eb25dc2593d543e8e329eccc2d00982bde2493e8efb7903051  pppd-Ignore-received-EAP-messages-when-not-doing-EAP.patch
+openrc() {
+	default_openrc
+	install_if="ppp-daemon=$pkgver-r$pkgrel openrc"
+}
+
+sha512sums="
+cf62410a952053f9aa71c5179453831152e958fcad9e77df2ddac864e39aa71af0b746e54b91e8fa3ad6295d6d2b1bb736e36dc05521b495f573468679133324  ppp-2.5.0.tar.gz
+1e1962503ea7639b2683920c73a848d680d1daf444fb978a42639f1671b2c38282d181be120fbf035220bcfe8768229897b7e5a59e6ddf09d4edb3666ebf3399  0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
+f8ad85423ccf19a6cea66e9debea81dc1842bf499b279b77c058cc2ff10aae7f48c3430a63050b97c4f535f5dcca449261fc7476f90cb2d30dfca9359490d6bd  fix-paths.patch
+8efb0750fb64cc6cbb3e5fce4a79e842db3c7fd08c3c1899cda4201a80f9ec7a4c88d88be833579b9470c1d851f01fbf2cd82b51912ebc4f05bbb168f6e73bc3  musl-fix-headers.patch
+218f5ae25f059f4ab614d6c613f8317dd136a59378f31e3b7c868f79869a17a79f1d88bf226828e7a21db07337f5c2328ce3f4579d747b9bfe1082b1023193f0  0001-Revert-lock-path-to-var-lock-435.patch
 160260bd2a788beaac395eadb38efbfd1e0e1a458fe151555acacf2c4f3a12381d644672c664f9793db6e3459a4f05a54e3ff6d407b0d37e8014b15bd0f11bcc  ip-down
 8258c95a6b6e8e94d6001b5cd3a99bd3270f29ba0f2e5050a26c8d5f1b67eead8d039e71ce86a784d45e620047b0a2bb14b258d80a9ea62084ba588a4c2e2d84  ip-up
-bd6f43588b037367ffdb57f5e331492dcaa5969003e219c2dc8b90e6be1aa407282ff6114b91d1379ebeff766983fa0622456520cc0ac592b4f0b1496acf21bf  pppd.initd"
+845d99cefd9e3ebfd4ff61dbf86d5bc1a698abbf204fed5a577fbc873e378c6d5d35712331b97dfd9fa37d1f7157a034f2584521f3a28ec18b883ab8d420e028  pppd.initd
+9ffc7c98662491694f305bd4b2e245acef0a6b36d31a8b6b8d7aea742c350369b780285745b111529373a4b5b7fe46f4673efd60b4a3250030d33204a30f5b8c  pppd.confd
+"
diff --git a/main/ppp/fix-bound-check-eap.patch b/main/ppp/fix-bound-check-eap.patch
deleted file mode 100644
index 746eb70961a..00000000000
--- a/main/ppp/fix-bound-check-eap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001
-From: Paul Mackerras <paulus@ozlabs.org>
-Date: Mon, 3 Feb 2020 15:53:28 +1100
-Subject: [PATCH] pppd: Fix bounds check in EAP code
-
-Given that we have just checked vallen < len, it can never be the case
-that vallen >= len + sizeof(rhostname).  This fixes the check so we
-actually avoid overflowing the rhostname array.
-
-Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
-Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
----
- pppd/eap.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pppd/eap.c b/pppd/eap.c
-index 94407f5..1b93db0 100644
---- a/pppd/eap.c
-+++ b/pppd/eap.c
-@@ -1420,7 +1420,7 @@ int len;
- 		}
- 
- 		/* Not so likely to happen. */
--		if (vallen >= len + sizeof (rhostname)) {
-+		if (len - vallen >= sizeof (rhostname)) {
- 			dbglog("EAP: trimming really long peer name down");
- 			BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
- 			rhostname[sizeof (rhostname) - 1] = '\0';
-@@ -1846,7 +1846,7 @@ int len;
- 		}
- 
- 		/* Not so likely to happen. */
--		if (vallen >= len + sizeof (rhostname)) {
-+		if (len - vallen >= sizeof (rhostname)) {
- 			dbglog("EAP: trimming really long peer name down");
- 			BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
- 			rhostname[sizeof (rhostname) - 1] = '\0';
--- 
-2.25.0
-
diff --git a/main/ppp/fix-paths.patch b/main/ppp/fix-paths.patch
index 0b08f7fb4ef..5d2b7228a9b 100644
--- a/main/ppp/fix-paths.patch
+++ b/main/ppp/fix-paths.patch
@@ -1,24 +1,13 @@
---- a/pppd/plugins/pppol2tp/Makefile.linux
-+++ b/pppd/plugins/pppol2tp/Makefile.linux
-@@ -6,7 +6,7 @@
- 
- #***********************************************************************
- 
--DESTDIR = @DESTDIR@
-+DESTDIR = $(INSTROOT)@DESTDIR@
- LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
- 
- VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
-
+diff --git a/pppd/plugins/radius/pathnames.h b/pppd/plugins/radius/pathnames.h
+index 3a00d2c..c606f33 100644
 --- a/pppd/plugins/radius/pathnames.h
 +++ b/pppd/plugins/radius/pathnames.h
 @@ -22,7 +22,7 @@
  
  /* normally defined in the Makefile */
- #ifndef _PATH_ETC_RADIUSCLIENT_CONF
--#define _PATH_ETC_RADIUSCLIENT_CONF       "/etc/radiusclient.conf"
-+#define _PATH_ETC_RADIUSCLIENT_CONF       "/etc/radiusclient/radiusclient.conf"
+ #ifndef PPP_PATH_ETC_RADIUSCLIENT_CONF
+-#define PPP_PATH_ETC_RADIUSCLIENT_CONF       SYSCONFDIR "/radiusclient.conf"
++#define PPP_PATH_ETC_RADIUSCLIENT_CONF       SYSCONFDIR "/radiusclient/radiusclient.conf"
  #endif
  
  #endif /* PATHNAMES_H */
-
diff --git a/main/ppp/fix-pppd-magic.h.patch b/main/ppp/fix-pppd-magic.h.patch
deleted file mode 100644
index 01a89d52041..00000000000
--- a/main/ppp/fix-pppd-magic.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pppd/magic.h	2019-12-31 02:31:26.000000000 +0100
-+++ b/pppd/magic.h	2020-02-06 20:52:49.263657502 +0100
-@@ -42,6 +42,8 @@
-  * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $
-  */
- 
-+#include <sys/cdefs.h>
-+
- void magic_init (void);	/* Initialize the magic number generator */
- u_int32_t magic (void);	/* Returns the next magic number */
- 
diff --git a/main/ppp/fix-pppd-pppoe.h.patch b/main/ppp/fix-pppd-pppoe.h.patch
deleted file mode 100644
index 1fc452a894f..00000000000
--- a/main/ppp/fix-pppd-pppoe.h.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/pppd/plugins/rp-pppoe/pppoe.h	2020-02-06 09:59:38.086103782 +0100
-+++ b/pppd/plugins/rp-pppoe/pppoe.h	2020-02-06 20:50:20.159705281 +0100
-@@ -84,18 +84,6 @@
- #include <linux/if_ether.h>
- #endif
- 
--#ifdef HAVE_NETINET_IF_ETHER_H
--#include <sys/types.h>
--
--#ifdef HAVE_SYS_SOCKET_H
--#include <sys/socket.h>
--#endif
--#ifndef HAVE_SYS_DLPI_H
--#include <netinet/if_ether.h>
--#endif
--#endif
--
--
- /* Ethernet frame types according to RFC 2516 */
- #define ETH_PPPOE_DISCOVERY 0x8863
- #define ETH_PPPOE_SESSION   0x8864
diff --git a/main/ppp/musl-fix-headers.patch b/main/ppp/musl-fix-headers.patch
index 47042dc674c..9e0ee3b88b6 100644
--- a/main/ppp/musl-fix-headers.patch
+++ b/main/ppp/musl-fix-headers.patch
@@ -1,85 +1,8 @@
-diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h
-index b06eda5..dafa36c 100644
---- a/include/net/ppp_defs.h
-+++ b/include/net/ppp_defs.h
-@@ -38,6 +38,8 @@
- #ifndef _PPP_DEFS_H_
- #define _PPP_DEFS_H_
- 
-+#include <sys/time.h>
-+
- /*
-  * The basic PPP frame.
-  */
-diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index a74c914..7acd2cf 100644
---- a/pppd/Makefile.linux
-+++ b/pppd/Makefile.linux
-@@ -126,7 +126,7 @@ LIBS	+= -lcrypt
- endif
- 
- ifdef USE_LIBUTIL
--CFLAGS	+= -DHAVE_LOGWTMP=1
-+#CFLAGS	+= -DHAVE_LOGWTMP=1
- LIBS	+= -lutil
- endif
- 
-diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c
-index 91e9a57..9c0fac3 100644
---- a/pppd/plugins/rp-pppoe/if.c
-+++ b/pppd/plugins/rp-pppoe/if.c
-@@ -30,10 +30,6 @@ static char const RCSID[] =
- #include <linux/if_packet.h>
- #endif
- 
--#ifdef HAVE_NET_ETHERNET_H
--#include <net/ethernet.h>
--#endif
--
- #ifdef HAVE_ASM_TYPES_H
- #include <asm/types.h>
- #endif
-diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c
-index a8c2bb4..ca34d79 100644
---- a/pppd/plugins/rp-pppoe/plugin.c
-+++ b/pppd/plugins/rp-pppoe/plugin.c
-@@ -46,7 +46,6 @@ static char const RCSID[] =
- #include <unistd.h>
- #include <fcntl.h>
- #include <signal.h>
--#include <net/ethernet.h>
- #include <net/if_arp.h>
- #include <linux/ppp_defs.h>
- #include <linux/if_pppox.h>
-diff --git a/pppd/plugins/rp-pppoe/pppoe-discovery.c b/pppd/plugins/rp-pppoe/pppoe-discovery.c
-index 3d3bf4e..b5f82d3 100644
---- a/pppd/plugins/rp-pppoe/pppoe-discovery.c
-+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c
-@@ -27,10 +27,6 @@
- #include <linux/if_packet.h>
- #endif
- 
--#ifdef HAVE_NET_ETHERNET_H
--#include <net/ethernet.h>
--#endif
--
- #ifdef HAVE_ASM_TYPES_H
- #include <asm/types.h>
- #endif
-@@ -55,6 +51,8 @@ void die(int status)
- 	exit(status);
- }
- 
-+#define error(x...) fprintf(stderr, x)
-+
- /* Initialize frame types to RFC 2516 values.  Some broken peers apparently
-    use different frame types... sigh... */
- 
 diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
-index 6d71530..86d224e 100644
+index 561b150..c9a8469 100644
 --- a/pppd/sys-linux.c
 +++ b/pppd/sys-linux.c
-@@ -102,19 +102,11 @@
+@@ -110,19 +110,11 @@
  #define MAX_ADDR_LEN 7
  #endif
  
diff --git a/main/ppp/pppd-Ignore-received-EAP-messages-when-not-doing-EAP.patch b/main/ppp/pppd-Ignore-received-EAP-messages-when-not-doing-EAP.patch
deleted file mode 100644
index e5442079ef0..00000000000
--- a/main/ppp/pppd-Ignore-received-EAP-messages-when-not-doing-EAP.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 8d45443bb5c9372b4c6a362ba2f443d41c5636af Mon Sep 17 00:00:00 2001
-From: Paul Mackerras <paulus@ozlabs.org>
-Date: Mon, 3 Feb 2020 16:31:42 +1100
-Subject: [PATCH] pppd: Ignore received EAP messages when not doing EAP
-
-This adds some basic checks to the subroutines of eap_input to check
-that we have requested or agreed to doing EAP authentication before
-doing any processing on the received packet.  The motivation is to
-make it harder for a malicious peer to disrupt the operation of pppd
-by sending unsolicited EAP packets.  Note that eap_success() already
-has a check that the EAP client state is reasonable, and does nothing
-(apart from possibly printing a debug message) if not.
-
-Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
----
- pppd/eap.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/pppd/eap.c b/pppd/eap.c
-index 1b93db0..082e953 100644
---- a/pppd/eap.c
-+++ b/pppd/eap.c
-@@ -1328,6 +1328,12 @@ int len;
- 	int fd;
- #endif /* USE_SRP */
- 
-+	/*
-+	 * Ignore requests if we're not open
-+	 */
-+	if (esp->es_client.ea_state <= eapClosed)
-+		return;
-+
- 	/*
- 	 * Note: we update es_client.ea_id *only if* a Response
- 	 * message is being generated.  Otherwise, we leave it the
-@@ -1736,6 +1742,12 @@ int len;
- 	u_char dig[SHA_DIGESTSIZE];
- #endif /* USE_SRP */
- 
-+	/*
-+	 * Ignore responses if we're not open
-+	 */
-+	if (esp->es_server.ea_state <= eapClosed)
-+		return;
-+
- 	if (esp->es_server.ea_id != id) {
- 		dbglog("EAP: discarding Response %d; expected ID %d", id,
- 		    esp->es_server.ea_id);
-@@ -2047,6 +2059,12 @@ u_char *inp;
- int id;
- int len;
- {
-+	/*
-+	 * Ignore failure messages if we're not open
-+	 */
-+	if (esp->es_client.ea_state <= eapClosed)
-+		return;
-+
- 	if (!eap_client_active(esp)) {
- 		dbglog("EAP unexpected failure message in state %s (%d)",
- 		    eap_state_name(esp->es_client.ea_state),
--- 
-2.24.1
-
diff --git a/main/ppp/pppd.confd b/main/ppp/pppd.confd
new file mode 100644
index 00000000000..76357a494f0
--- /dev/null
+++ b/main/ppp/pppd.confd
@@ -0,0 +1 @@
+PPPD_OPTS=""
diff --git a/main/ppp/pppd.initd b/main/ppp/pppd.initd
index 30bd641da16..df26ef867f7 100755
--- a/main/ppp/pppd.initd
+++ b/main/ppp/pppd.initd
@@ -3,11 +3,11 @@
 name="pppd"
 command="/usr/sbin/${SVCNAME}"
 command_args="nodetach ${PPPD_OPTS}"
-pidfile="/var/run/$SVCNAME.pid"
+pidfile="/run/$RC_SVCNAME.pid"
 command_background=true
 
 start_pre() {
-	checkpath --directory /var/run/ppp
+	checkpath --directory /run/ppp
 	modprobe pptp
 }
 
diff --git a/main/ppp/radius-Prevent-buffer-overflow-in-rc_mksid.patch b/main/ppp/radius-Prevent-buffer-overflow-in-rc_mksid.patch
deleted file mode 100644
index 112b2598020..00000000000
--- a/main/ppp/radius-Prevent-buffer-overflow-in-rc_mksid.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 858976b1fc3107f1261aae337831959b511b83c2 Mon Sep 17 00:00:00 2001
-From: Paul Mackerras <paulus@ozlabs.org>
-Date: Sat, 4 Jan 2020 12:01:32 +1100
-Subject: [PATCH] radius: Prevent buffer overflow in rc_mksid()
-
-On some systems getpid() can return a value greater than 65535.
-Increase the size of buf[] to allow for this, and use slprintf()
-to make sure we never overflow it.
-
-Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
----
- pppd/plugins/radius/util.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pppd/plugins/radius/util.c b/pppd/plugins/radius/util.c
-index 6f976a7..740131e 100644
---- a/pppd/plugins/radius/util.c
-+++ b/pppd/plugins/radius/util.c
-@@ -73,9 +73,9 @@ void rc_mdelay(int msecs)
- char *
- rc_mksid (void)
- {
--  static char buf[15];
-+  static char buf[32];
-   static unsigned short int cnt = 0;
--  sprintf (buf, "%08lX%04X%02hX",
-+  slprintf(buf, sizeof(buf), "%08lX%04X%02hX",
- 	   (unsigned long int) time (NULL),
- 	   (unsigned int) getpid (),
- 	   cnt & 0xFF);
--- 
-2.24.1
-
diff --git a/main/pptpd/APKBUILD b/main/pptpd/APKBUILD
deleted file mode 100644
index 1c1ed0d0776..00000000000
--- a/main/pptpd/APKBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Contributor: Danilo Godec <danilo.godec@agenda.si>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=pptpd
-pkgver=1.4.0
-pkgrel=2
-pkgdesc="PoPToP - PPTP Daemon, Linux as Microsoft VPN Server"
-url="http://www.poptop.org/"
-arch="all"
-license="GPL-2.0-or-later"
-depends="ppp-daemon"
-makedepends="ppp-dev"
-install=""
-subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://sourceforge.net/projects/poptop/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz/download
-	fix_MSG_TRYHARD.patch
-	pptpd.patch
-	pptpd.confd
-	pptpd.initd
-	options.pptp
-	pptpd.conf
-	"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr --sysconfdir=/etc || return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-	install -Dm755 "$srcdir"/pptpd.initd "$pkgdir"/etc/init.d/pptpd
-	install -Dm644 "$srcdir"/pptpd.confd "$pkgdir"/etc/conf.d/pptpd
-	install -Dm644 "$srcdir"/options.pptp "$pkgdir"/etc/ppp/options.pptp
-	install -Dm644 "$srcdir"/pptpd.conf "$pkgdir"/etc/
-}
-
-sha512sums="cfb4caef3025c0721e7fabf8b7bf595739f2d3048555b30616cdadc37e70ba9e1c50561c25091dd617b5448da2816aeaf83aea0fc2ef6b0dd5e3fe35d9591484  pptpd-1.4.0.tar.gz
-718e9fd6a53322f2f390ee4d07b2b4f88b6dd3ad130d4471a4e12e82910942982a06865c06296ff26f08e87aa65f4f7ee4a020cf7c2ff0d67ca5bfb794fe10bc  fix_MSG_TRYHARD.patch
-2adbd7203451fe63472fdd443afcf9c85b66d1d4965574f94a7e99a29fdd7f37cfe1eb0f82afebef0e6e11726e0702208e75e90f9867b1103f1d5e401f8ba47f  pptpd.patch
-59f118715cf6c36442687a58f46a54519fb5125383e85c4fa352a4c97f8a4e19f46c9715330550755eb9691e8174b70cdfab48fbd14c2707364e8083d6baa488  pptpd.confd
-7ccca8dd0c5ecc8bc0352b8e3bed30c7e9ab3591d07ffdf62a7305406a4685b638446d4b0a65753ceaa5bae4f63fb39f9bf6b590e1837851c0a6676d305b3612  pptpd.initd
-acf235a1c34f34cded7f2c56d6757fec099032ffaefae003e79b0517ad3fc53e19698e8c644193da9613707f8923b9c78f9e642aa0d9c785db1d4e51717a486e  options.pptp
-ed6022b6711b0e6b3e336220d6da7ec9dd7d3a0679fc9219d0931f3b165296b80bc21e23123cc0ed621d76d06d5ad3435659eb7b924daa735ee1a069c1ebcbc1  pptpd.conf"
diff --git a/main/pptpd/fix_MSG_TRYHARD.patch b/main/pptpd/fix_MSG_TRYHARD.patch
deleted file mode 100644
index 3e30295ca68..00000000000
--- a/main/pptpd/fix_MSG_TRYHARD.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/bcrelay.c
-+++ b/bcrelay.c
-@@ -61,6 +61,10 @@
- // software to your hearts content.  You are free to redistribute it as
- // long as it is accompanied with the source and my credit is included.
- 
-+#ifndef MSG_TRYHARD
-+	# define MSG_TRYHARD    MSG_DONTROUTE
-+#endif
-+
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
diff --git a/main/pptpd/options.pptp b/main/pptpd/options.pptp
deleted file mode 100644
index 645c6e24d76..00000000000
--- a/main/pptpd/options.pptp
+++ /dev/null
@@ -1,11 +0,0 @@
-lock
-debug
-auth
-+chap
-+chapms
-+chapms-v2
-mppe-40
-mppe-128
-mppe-stateless
-name test02
-proxyarp
diff --git a/main/pptpd/pptpd.conf b/main/pptpd/pptpd.conf
deleted file mode 100644
index 258f5d5ccc1..00000000000
--- a/main/pptpd/pptpd.conf
+++ /dev/null
@@ -1,88 +0,0 @@
-################################################################################
-#
-# Sample PoPToP configuration file
-#
-# for PoPToP version 1.0.0
-#
-################################################################################
-
-# TAG: speed
-#
-#	Specifies the speed for the PPP daemon to talk at.
-#	Some PPP daemons will ignore this value.
-#
-speed 115200
-
-# TAG: option
-#
-#	Specifies the location of the PPP options file.
-#	By default PPP looks in '/etc/ppp/options'
-#
-#option /this/is/the/options/file
-option /etc/ppp/options.pptp
-
-# TAG: debug
-#
-#	Turns on (more) debugging to syslog.
-#
-debug
-
-# TAG: localip
-# TAG: remoteip
-#
-#	Specifies the local and remote IP address ranges.
-#
-#	You can specify single IP addresses seperated by commas or you can
-#	specify ranges, or both. For example:
-#
-#		192.168.0.234,192.168.0.245-249,192.168.0.254
-#
-#	IMPORTANT RESTRICTIONS:
-#
-#	1. No spaces are permitted between commas or within addresses.
-#
-#	2. If you give more IP addresses than MAX_CONNECTIONS, it will
-#	   start at the beginning of the list and go until it gets 
-#	   MAX_CONNECTIONS IPs. Others will be ignored.
-#
-#	3. No shortcuts in ranges! ie. 234-8 does not mean 234 to 238,
-#	   you must type 234-238 if you mean this.
-#
-#	4. If you give a single localIP, that's ok - all local IPs will
-#	   be set to the given one. You MUST still give at least one remote
-#	   IP for each simultaneous client.
-#
-#localip 192.168.0.234-238,192.168.0.245
-#remoteip 192.168.1.234-238,192.168.1.245
-
-localip 192.168.0.1
-remoteip 192.168.1.100-199
-
-# TAG: ipxnets
-#
-#	This gives the range of IPX networks to allocate to clients.  By
-#	default IPX network number allocation is not handled internally.
-#	By putting a low and high network number here a pool of IPX networks
-#	can be defined.  If this is done then there must be one IPX network
-#	per client.
-#
-#	The format is a pair of hex numbers without any 0x prefix separated
-#	by a hyphen.
-#
-#ipxnets 00001000-00001FFF
-
-# TAG: listen
-#
-#	Defines the IP address of the local interface on which pptpd
-#	should listen for connections.  The default is to listen on all
-#	local interfaces (even ones brought up by pptp connections, thus
-#	permitting pptp tunnels inside the pptp tunnels).
-#
-#listen 192.168.0.1
-
-# TAG: pidfile
-#
-#	This defines the file name in which pptpd should store its process
-#	ID (or pid).  The default is /var/run/pptpd.pid.
-#
-pidfile /var/run/pptpd.pid
diff --git a/main/pptpd/pptpd.confd b/main/pptpd/pptpd.confd
deleted file mode 100644
index 1169e57f1c7..00000000000
--- a/main/pptpd/pptpd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for /etc/init.d/pptpd
-
-# Any extra options you want to pass to pptpd
-# on start-up should be put here.
-PPTPD_OPTS=""
diff --git a/main/pptpd/pptpd.initd b/main/pptpd/pptpd.initd
deleted file mode 100644
index d2dc4d107af..00000000000
--- a/main/pptpd/pptpd.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting pptpd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/pptpd -- ${PPTPD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping pptpd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/pptpd.pid
-	result=$?
-	start-stop-daemon --stop --quiet --exec /usr/sbin/pptpctrl
-	result=$(( $result + $? ))
-	eend $result
-}
diff --git a/main/pptpd/pptpd.patch b/main/pptpd/pptpd.patch
deleted file mode 100644
index c2118889da1..00000000000
--- a/main/pptpd/pptpd.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- pptpd-1.3.4/Makefile.am
-+++ pptpd-1.3.4-orig/Makefile.am
-@@ -11,7 +11,8 @@
- ##  warning with -Wmissing-prototypes).
- ## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers
- ##  aren't up to it).
--CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
-+OPTFLAGS=-O2
-+CFLAGS = $(OPTFLAGS) -fno-builtin -Wall -DSBINDIR='"$(sbindir)"'
- #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
- #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
- 
---- pptpd-1.3.4/plugins/Makefile
-+++ pptpd-1.3.4-orig/plugins/Makefile
-@@ -3,7 +3,7 @@
- CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
- LDFLAGS	= -shared
- LDADD   = -lutil
--INSTALL	= install -o root
-+INSTALL	= install
- prefix  = /usr/local
- 
- PLUGINS = pptpd-logwtmp.so
-@@ -18,7 +18,7 @@
- %.so: %.c
- 	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD)
- 
--LIBDIR	?= $(DESTDIR)$(prefix)/lib/pptpd
-+LIBDIR	= $(DESTDIR)$(prefix)/lib/pptpd
- 
- install: $(PLUGINS)
- 	$(INSTALL) -d $(LIBDIR)
diff --git a/main/privoxy/APKBUILD b/main/privoxy/APKBUILD
index 77b6c5b9f58..9aba1bb019c 100644
--- a/main/privoxy/APKBUILD
+++ b/main/privoxy/APKBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=privoxy
-pkgver=3.0.28
-pkgrel=0
-pkgdesc="A web proxy with advanced filtering capabilities"
-url="https://www.privoxy.org"
+pkgver=3.0.34
+pkgrel=2
+pkgdesc="web proxy with advanced filtering capabilities"
+url="https://www.privoxy.org/"
 arch="all"
-license="GPL"
+license="GPL-2.0-or-later"
 pkgusers="privoxy"
 pkggroups="privoxy"
 makedepends="autoconf automake pcre-dev zlib-dev coreutils"
 install="privoxy.pre-install"
 subpackages="$pkgname-doc $pkgname-openrc"
-source="https://downloads.sourceforge.net/ijbswa/$pkgname-$pkgver-stable-src.tar.gz
+source="https://downloads.sourceforge.net/ijbswa/privoxy-$pkgver-stable-src.tar.gz
 	$pkgname.initd
 	$pkgname.logrotate
 	privoxy-alpine.patch
@@ -19,18 +19,36 @@ source="https://downloads.sourceforge.net/ijbswa/$pkgname-$pkgver-stable-src.tar
 options="!check" # No test suite
 builddir="$srcdir/$pkgname-$pkgver-stable"
 
-prepare() {
-	cd "$builddir"
+# secfixes:
+#   3.0.33-r0:
+#     - CVE-2021-44540
+#     - CVE-2021-44541
+#     - CVE-2021-44542
+#     - CVE-2021-44543
+#   3.0.32-r0:
+#     - CVE-2021-20272
+#     - CVE-2021-20273
+#     - CVE-2021-20274
+#     - CVE-2021-20275
+#     - CVE-2021-20276
+#   3.0.31-r0:
+#     - CVE-2021-20216
+#     - CVE-2021-20217
+#   3.0.29-r0:
+#     - CVE-2021-20210
+#     - CVE-2021-20211
+#     - CVE-2021-20212
+#     - CVE-2021-20213
+#     - CVE-2021-20214
+#     - CVE-2021-20215
 
-	update_config_sub
+prepare() {
 	default_prepare
 
-	aclocal && autoheader && autoconf
+	autoreconf -fvi
 }
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -46,8 +64,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 
 	rm -f "$pkgdir"/var/log/privoxy/*
@@ -56,14 +72,16 @@ package() {
 	install -D -m644 "$srcdir"/privoxy.logrotate \
 		"$pkgdir"/etc/logrotate.d/privoxy
 
-	find "$pkgdir"/etc/privoxy/ -type d | xargs chmod 770
-	find "$pkgdir"/etc/privoxy/ -type f | xargs chmod 660
+	find "$pkgdir"/etc/privoxy/ -type d -exec chmod 770 {} \;
+	find "$pkgdir"/etc/privoxy/ -type f -exec chmod 660 {} \;
 
 	chown -R privoxy:privoxy "$pkgdir"/var/log/privoxy \
 		"$pkgdir"/etc/privoxy
 }
 
-sha512sums="5d58024ae73d623a2b8fb2ac49e18f047dfe252c9441388f025cf888c0e4b11546b8796cfa559759ee137002b1b31b30ad28b356ae226836454f32591eb835fc  privoxy-3.0.28-stable-src.tar.gz
+sha512sums="
+f963419ae2cb6dd72cd892fa043768d99a4118792833de2e666d6a800fbe9a7fcb0641f15e3211e0b01a74609c65aeb60af1051f1a19daa1048314599679b685  privoxy-3.0.34-stable-src.tar.gz
 346bda3a2108547569af3397c77e092c54fa0c20bc6d3bb1d4c202b4e2b8d9c13018eab0a326cd9632310ec8052600ee7db4b6011610faec386c399cdd01af9c  privoxy.initd
-118caaeac3aba751584c5bdfc737bf5bfeddf1a62fda1f44bcd4654ae2e33183bc1ce6fc66d4a1bdd79766e42e669b1615a6d46d528a1bd49cabdf98385a3bb9  privoxy.logrotate
-0220785fff0b34b75e3c8cecbeb302e0137e96039e0663ae44d7450e334a3c1d742c2760de55d52817fb9ed2efb19f505e1fb7406d055b387b7b084f5f52011f  privoxy-alpine.patch"
+18fc06c7f0c0dff5e1ace89c5557fc52bb207e183ca2227361512894895888134156fbb0b80ab14cbe8b1458cbe214739b2d797b249a4e658c2410d62021d642  privoxy.logrotate
+1059feed20a31d7d2b5d1f44b7b1af40373d87dbd9e7e83c8998ac1b4e27dfbfdfeb6a9ea7934e15d0c14fed1fd03fb63d2ec8d2a6b53e5884a21dc8df4828fc  privoxy-alpine.patch
+"
diff --git a/main/privoxy/privoxy-alpine.patch b/main/privoxy/privoxy-alpine.patch
index c04030613c7..7f46879d024 100644
--- a/main/privoxy/privoxy-alpine.patch
+++ b/main/privoxy/privoxy-alpine.patch
@@ -2,9 +2,9 @@ diff --git a/GNUmakefile.in b/GNUmakefile.in
 index 2593901..c3a681a 100644
 --- a/GNUmakefile.in
 +++ b/GNUmakefile.in
-@@ -62,8 +62,8 @@ MAN_DIR      = @mandir@
- MAN_DEST     = $(MAN_DIR)/man1
- MAN_PAGE     = privoxy.1
+@@ -62,8 +62,8 @@
+ MAN_DEST     = $(MAN_DIR)/man8
+ MAN_PAGE     = privoxy.8
  SHARE_DEST   = @datadir@
 -DOC_DEST     = $(SHARE_DEST)/doc/privoxy
 -VAR_DEST     = @localstatedir@
@@ -13,17 +13,17 @@ index 2593901..c3a681a 100644
  LOGS_DEST    = $(VAR_DEST)/log/privoxy
  PIDS_DEST    = $(VAR_DEST)/run
  
-@@ -922,34 +922,8 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
+@@ -964,34 +964,8 @@
  	fi ;\
  	$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
  	for i in $(CONFIGS); do \
 -		if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
 -			$(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
 -			$(ECHO) Installing fresh $$i;\
- 			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
--		elif [ -s "$(CONF_DEST)/$$i" ]; then \
+-			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
+-		elif [ -s "$(DESTDIR)$(CONF_DEST)/$$i" ]; then \
 -			$(ECHO) Installing $$i as $$i.new ;\
--			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
+ 			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
 -			NEW=1;\
 -		else \
 -			$(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
@@ -47,7 +47,7 @@ index 2593901..c3a681a 100644
 -	$(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
  	if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \
  		if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \
-                $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \
+                $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.in | \
 diff --git a/config b/config
 index 8b20f92..25596d6 100644
 --- a/config
diff --git a/main/privoxy/privoxy.logrotate b/main/privoxy/privoxy.logrotate
index aa7463bd572..b9182120f25 100644
--- a/main/privoxy/privoxy.logrotate
+++ b/main/privoxy/privoxy.logrotate
@@ -4,6 +4,6 @@
 	create 0640 privoxy privoxy
 	sharedscripts
 	postrotate
-		killall -HUP privoxy 2>/dev/null || true
+		busybox killall -HUP privoxy 2>/dev/null || true
 	endscript
 }
diff --git a/main/procps-ng/APKBUILD b/main/procps-ng/APKBUILD
new file mode 100644
index 00000000000..31e78a8021b
--- /dev/null
+++ b/main/procps-ng/APKBUILD
@@ -0,0 +1,88 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=procps-ng
+pkgver=4.0.4
+pkgrel=0
+pkgdesc="Utilities for monitoring your system and processes on your system"
+url="https://gitlab.com/procps-ng/procps"
+arch="all"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later"
+makedepends="
+	gettext-dev
+	ncurses-dev
+	"
+checkdepends="dejagnu"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang libproc2"
+source="$pkgname-$pkgver.tar.xz::https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-$pkgver.tar.xz/download"
+
+# used to be named procps
+provides="procps=$pkgver-r$pkgrel"
+replaces="procps"
+
+case "$CARCH" in
+x86)
+	# TODO, FAIL: strtod_nol_or_err("123") != 123.000000
+	# https://gitlab.com/procps-ng/procps/-/issues/271
+	options="$options !check"
+	;;
+esac
+
+# secfixes:
+#   4.0.4-r0:
+#     - CVE-2023-4016
+
+build() {
+	export LIBS="$LIBS -lintl"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/ \
+		--bindir=/bin \
+		--sbindir=/sbin \
+		--libdir=/lib \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc \
+		--docdir=/usr/share/doc/procps \
+		--datarootdir=/usr/share \
+		--disable-static \
+		--disable-w-from \
+		--disable-kill \
+		--disable-rpath \
+		--with-ncurses \
+		--disable-modern-top
+	make
+}
+
+check() {
+	make check || {
+		cat test-suite.log
+		return 1
+	}
+}
+
+package() {
+	make DESTDIR="$pkgdir" ldconfig=true install="install -D" \
+		install
+
+	# These binaries are identical.
+	ln -sf pgrep "$pkgdir"/bin/pkill
+
+	# Override BusyBox symlinks
+	mkdir -p "$pkgdir"/usr/bin
+	for i in free pgrep pkill pmap pwdx top uptime; do
+		mv "$pkgdir"/bin/$i "$pkgdir"/usr/bin/$i
+	done
+
+	install -d "$pkgdir"/usr/lib
+	mv "$pkgdir"/include "$pkgdir"/usr/ \
+		&& mv "$pkgdir"/lib/pkgconfig "$pkgdir"/usr/lib/
+}
+
+libproc2() {
+	pkgdesc="Library for monitoring system and processes"
+
+	amove lib
+}
+
+sha512sums="
+94375544e2422fefc23d7634063c49ef1be62394c46039444f85e6d2e87e45cfadc33accba5ca43c96897b4295bfb0f88d55a30204598ddb26ef66f0420cefb4  procps-ng-4.0.4.tar.xz
+"
diff --git a/main/procps/APKBUILD b/main/procps/APKBUILD
deleted file mode 100644
index 5927aaa0578..00000000000
--- a/main/procps/APKBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=procps
-pkgver=3.3.16
-pkgrel=0
-pkgdesc="Utilities for monitoring your system and processes on your system"
-url="https://gitlab.com/procps-ng/procps"
-arch="all"
-license="GPL-2.0 LGPL-2.1+"
-makedepends="ncurses-dev gettext-dev autoconf automake libtool"
-checkdepends="dejagnu"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang libproc"
-source="$pkgname-$pkgver.tar.gz::https://gitlab.com/procps-ng/procps/repository/archive.tar.gz?ref=v$pkgver"
-builddir="$srcdir/$pkgname-v$pkgver"
-
-prepare() {
-	# NOTE: Name of the tarball's top-level directory contains SHA1.
-	ln -fs $srcdir/$pkgname-v$pkgver-* "$builddir"
-
-	default_prepare
-
-	# force misc/git-version-gen use the correct version (instead of UNKNOWN);
-	# however only do it if the upstream tarball really misses it.
-	if test ! -f .tarball_version ; then
-		rm -f .version
-		echo "$pkgver" > .tarball-version
-	fi
-	./autogen.sh
-}
-
-build() {
-	export LIBS="$LIBS -lintl"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/ \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--libdir=/lib \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc \
-		--docdir=/usr/share/doc \
-		--datarootdir=/usr/share \
-		--disable-static \
-		--disable-w-from \
-		--disable-kill \
-		--disable-rpath \
-		--with-ncurses
-	make
-}
-
-check() {
-	make check
-}
-
-package() {
-	make DESTDIR="$pkgdir" ldconfig=true install="install -D" \
-		install
-
-	# These binaries are identical.
-	ln -sf pgrep "$pkgdir"/bin/pkill
-
-	# Override BusyBox symlinks
-	mkdir -p "$pkgdir"/usr/bin
-	for i in free pgrep pkill pmap pwdx top uptime; do
-		mv "$pkgdir"/bin/$i "$pkgdir"/usr/bin/$i
-	done
-
-	install -d "$pkgdir"/usr/lib
-	mv "$pkgdir"/include "$pkgdir"/usr/ \
-		&& mv "$pkgdir"/lib/pkgconfig "$pkgdir"/usr/lib/
-}
-
-libproc() {
-	pkgdesc="Library for monitoring system and processes"
-
-	install -d "$subpkgdir"/
-	mv "$pkgdir"/lib "$subpkgdir"/
-}
-
-sha512sums="d7a1da31a24832400cbf1d9e072dac21de7bf72c5680f7368a6054c5f12271ebbc1d4bcb3215622c5b6a70602413642e3ceebbf2b2d8e1b7310cfa8051bd0e3c  procps-3.3.16.tar.gz"
diff --git a/main/protobuf-c/APKBUILD b/main/protobuf-c/APKBUILD
index 5851fb79f25..3924f8cf0d6 100644
--- a/main/protobuf-c/APKBUILD
+++ b/main/protobuf-c/APKBUILD
@@ -1,23 +1,31 @@
 # Contributor: TBK <alpin@jjtc.eu>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=protobuf-c
-pkgver=1.3.3
+pkgver=1.5.0
 pkgrel=0
-pkgdesc="C bindings for Google's Protocol Buffers"
-url="https://github.com/protobuf-c/protobuf-c/wiki"
+pkgdesc="Protocol Buffers implementation in C"
+url="https://github.com/protobuf-c/protobuf-c"
 arch="all"
 license="BSD-2-Clause"
-makedepends="protobuf-dev"
-subpackages="$pkgname-dev"
-source="https://github.com/protobuf-c/protobuf-c/releases/download/v$pkgver/protobuf-c-$pkgver.tar.gz
-	"
+depends_dev="$pkgname-compiler=$pkgver-r$pkgrel"
+makedepends="autoconf automake libtool abseil-cpp-dev protobuf-dev"
+subpackages="$pkgname-compiler $pkgname-dev"
+source="https://github.com/protobuf-c/protobuf-c/releases/download/v$pkgver/protobuf-c-$pkgver.tar.gz"
+
+# secfixes:
+#   1.4.1-r0:
+#     - CVE-2022-33070
+#   1.3.2-r0:
+#     - CVE-2021-3121
 
 build() {
-	./configure --prefix=/usr \
+	CFLAGS="$CFLAGS -flto=auto" \
+	CXXFLAGS="$CXXFLAGS -std=c++17 -flto=auto" \
+	./configure \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
-
 	make
 }
 
@@ -29,4 +37,13 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="85308348929487e3a89158c6078dab39cee0b39a0611a4d5ba73d20520e41d96915e42a0d6060ebd3eb7d922c82444f5ca000ea4f8791b37734485cbb7e283b1  protobuf-c-1.3.3.tar.gz"
+compiler() {
+	pkgdesc="Protocol Buffers C compiler"
+
+	amove usr/bin/protoc-c
+	amove usr/bin/protoc-gen-c
+}
+
+sha512sums="
+175c9fc901cab88308730eea982dd62b1e0decdceb80aa53be163f17a440b4acecb834a784beab5cd71186413a322a323f4539758a8727ca51801cf92f9bd3da  protobuf-c-1.5.0.tar.gz
+"
diff --git a/main/protobuf/APKBUILD b/main/protobuf/APKBUILD
index 8cf0ddb956a..f29be63c6d8 100644
--- a/main/protobuf/APKBUILD
+++ b/main/protobuf/APKBUILD
@@ -1,18 +1,34 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=protobuf
 _gemname=google-protobuf
-pkgver=3.11.4
-_tstver=5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081
+pkgver=24.4
+_rubyver=3.$pkgver
 pkgrel=1
 pkgdesc="Library for extensible, efficient structure packing"
-url="https://github.com/google/protobuf"
+url="https://github.com/protocolbuffers/protobuf"
 arch="all"
 license="BSD-3-Clause"
-depends="protoc=$pkgver-r$pkgrel libprotoc=$pkgver-r$pkgrel
-	libprotobuf=$pkgver-r$pkgrel libprotobuf-lite=$pkgver-r$pkgrel"
-depends_dev="zlib-dev"
-makedepends="$depends_dev autoconf automake libtool ruby ruby-dev ruby-rake"
+depends="
+	protoc=$pkgver-r$pkgrel
+	libprotoc=$pkgver-r$pkgrel
+	libprotobuf=$pkgver-r$pkgrel
+	libprotobuf-lite=$pkgver-r$pkgrel
+	"
+depends_dev="
+	protoc=$pkgver-r$pkgrel
+	zlib-dev
+	"
+makedepends="
+	$depends_dev
+	abseil-cpp-dev
+	cmake
+	ruby
+	ruby-dev
+	ruby-rake
+	samurai
+	"
+checkdepends="gtest-dev"
 subpackages="
 	ruby-$_gemname:_ruby
 	$pkgname-dev
@@ -22,39 +38,40 @@ subpackages="
 	libprotobuf
 	libprotobuf-lite
 	"
-# googletest 1.8 is not enought for protobuf
-# https://github.com/google/googletest/issues/2267
-source="$pkgname-$pkgver.tar.gz::https://github.com/google/protobuf/archive/v$pkgver.tar.gz
-	googletest-$_tstver.tar.gz::https://github.com/google/googletest/archive/$_tstver.tar.gz
-	musl-fix.patch
-	trim-rakefile.patch
+	# exclude.patch
+source="$pkgname-$pkgver.tar.gz::https://github.com/protocolbuffers/protobuf/archive/refs/tags/v$pkgver.tar.gz
+	exclude.patch
+	protoc-cmake.patch
 	ruby-fix-cflags.patch
+	skip-failing-tests.patch
+	soversion.patch
+	trim-rakefile.patch
 	"
 
-prepare() {
-	default_prepare
-
-	./autogen.sh
-
-	# symlink tests to the test directory
-	rm -rf third_party/*
-	ln -sf "$srcdir"/googletest-$_tstver \
-		"$builddir"/third_party/googletest
-}
+# fails some
+case "$CARCH" in
+armhf) options="$options !check" ;;
+esac
 
 build() {
-	case "$CARCH" in mips|mipsel) export LIBS="$LIBS -latomic";; esac
-
-	CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks" \
-		./configure --prefix=/usr \
-			--sysconfdir=/etc \
-			--mandir=/usr/share/man \
-			--infodir=/usr/share/info \
-			--localstatedir=/var
-	make
+	export CFLAGS="$CFLAGS -DNDEBUG -O2 -flto=auto"
+	export CXXFLAGS="$CXXFLAGS -DNDEBUG -O2 -flto=auto -Wno-deprecated-declarations"
+
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_SHARED_LIBS=ON \
+		-Dprotobuf_BUILD_TESTS="$(want_check && echo ON || echo OFF)" \
+		-Dprotobuf_BUILD_LIBPROTOC=ON \
+		-Dprotobuf_ABSL_PROVIDER="package" \
+		-Dprotobuf_ALLOW_CCACHE=ON \
+		-Dprotobuf_USE_EXTERNAL_GTEST=ON
+	cmake --build build
 
 	cd "$builddir"/ruby
 
+	export PATH="$PATH:$builddir/build"
+
 	# Generate proto files for built-in protocols.
 	rake genproto
 
@@ -65,31 +82,26 @@ build() {
 		--no-document \
 		--verbose \
 		$_gemname
-
-	# build test-suite
-	local test; for test in googletest googlemock; do
-		cd "$builddir/third_party/googletest/$test"
-		autoreconf -vfi
-		./configure
-		make
-	done
 }
 
 # TODO: Run tests for ruby gem.
 check() {
-	make check
+	ctest --test-dir build --output-on-failure
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
-}
+	DESTDIR="$pkgdir" cmake --install build
 
-_ruby() {
-	depends=""
-	pkgdesc="Ruby bindings to Google's data interchange format"
+	sed -i \
+		-e "/Requires:/s|;| |g" \
+		-e "/Requires:/s|::|_|g" \
+		"$pkgdir"/usr/lib/pkgconfig/protobuf.pc
 
-	local gemdir="$subpkgdir/$(ruby -e 'puts Gem.default_dir')"
-	cd "$builddir"/ruby/dist
+	install -Dm644 editors/proto.vim \
+		"$pkgdir"/usr/share/vim/vimfiles/syntax/proto.vim
+
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+	cd ruby/dist
 
 	mkdir -p "$gemdir"
 	cp -r extensions gems specifications "$gemdir"/
@@ -98,8 +110,15 @@ _ruby() {
 	find "$gemdir"/gems/ -name "*.so" -delete
 
 	# Remove unnecessary files.
-	cd "$gemdir"/gems/$_gemname-$pkgver
-	rm -r ext/ tests/
+	cd "$gemdir"/gems/$_gemname-$_rubyver
+	rm -r ext/
+}
+
+_ruby() {
+	depends=""
+	pkgdesc="Ruby bindings to Google's data interchange format"
+
+	amove usr/lib/ruby/gems
 }
 
 vim() {
@@ -107,49 +126,43 @@ vim() {
 	depends=""
 	install_if="$pkgname=$pkgver-r$pkgrel vim"
 
-	install -Dm644 "$builddir"/editors/proto.vim \
-		"$subpkgdir"/usr/share/vim/vimfiles/syntax/proto.vim
+	amove usr/share/vim/vimfiles/syntax/proto.vim
 }
 
 libprotoc() {
 	depends=""
 	pkgdesc="Runtime library for Protocol Buffer compiler"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libprotoc*.so.* "$subpkgdir"/usr/lib
+	amove usr/lib/libprotoc.so.*
 }
 
 protoc() {
 	depends=""
 	pkgdesc="Protocol buffer compiler binary and library"
 
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/protoc "$subpkgdir"/usr/bin
+	amove usr/bin/protoc*
 }
 
 libprotobuf() {
 	depends=""
 	pkgdesc="Runtime library for C++ users of protocol buffers"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libprotobuf.so.* "$subpkgdir"/usr/lib
+	amove usr/lib/libprotobuf.so.*
 }
 
 lite() {
 	depends=""
 	pkgdesc="Runtime library for C++ users with 'lite runtime' setting of protocol buffers"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libprotobuf-lite.so.* "$subpkgdir"/usr/lib
-}
-
-dev() {
-	depends_dev="$depends_dev protoc=$pkgver-r$pkgrel"
-	default_dev
+	amove usr/lib/libprotobuf-lite.so.*
 }
 
-sha512sums="777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261  protobuf-3.11.4.tar.gz
-623b077b3334958fafcbc34aa85891883277994af33be530efd903f47738a3e3562001cbf3b6da1a5e7d03803c5bd51bcc1fab81490db85d5a4f2b15e7de1495  googletest-5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081.tar.gz
-875592bc5dc5efe9087ea1b340673f54c984ecd5aa3b110a2da136bdc28009af7ce1a9c57f4747ff809fc02eb6c39a0209c277177172af467a54172d9700188a  musl-fix.patch
-495ba43f1e43e49caee6f44bb7e8e1cc52d46b158b946598c2b296a9efa07fd9abadc8649c3751aad34d26380dcdef782239449cbc5fd7654df144d249dd9de2  trim-rakefile.patch
-e2063bfb3f323625449d71cc2fe91e848a93af50cb1688ec5635bb1088aacd17a3282b0e91e05109abcc5fdbd62dff88f2b90bb78273b24f98998ed0009b1170  ruby-fix-cflags.patch"
+sha512sums="
+52b6ab5587d03cbd1f35cf3cdc388e1710fa50f3031559ac53cf754965407ded7602cdead56080444ab695588112cc3391a1d7fdd5e565d90d0af7ad08706315  protobuf-24.4.tar.gz
+0d46d105a0670ab5cfcb04ed534927a71613234a88efede0b20d426e1caaa708e6ff275a09c5dab7786fe26e69e0882f022b893302e4869006b4ac55fc6172e5  exclude.patch
+16b8ee0e50dbb2144ddb83654a63e410b4218e667b6b8b77c7b6f9797508f63c3e8be0f9711841bb6ebbed0883cda2394b219a62b468240f65f4dac418b5a56e  protoc-cmake.patch
+0cb202a6151ae3746c09e85f2e4ce9abb0d810d4a3c84cb647fde407cf8d13894d3c9b340e06d7a3a85669da1899db265d26d8309d59249f841a40a66e045c83  ruby-fix-cflags.patch
+46b6644ccf6e142ef26cddd818466caab2696b685f3865061fe0e45b65cefc5598add4a8479842ca1aae948d37b3c2c6944913c62a00422fa91b694277986c73  skip-failing-tests.patch
+850dc1d6fd3ea01f1689fd700ac35e7da0882092ab34c616702e01bdf4b5327b8ab27381ecf291431a94f54c89d31707a4a171929937e880543974cb64f9e685  soversion.patch
+13514a456a50d7243baa23fe43586fc4544cda87b9e2a5afe9d2fac8afca8e8853f9b42232c3fff4c5cf2df443af32f944f451daa1d604d80fd03ee4e7abed3e  trim-rakefile.patch
+"
diff --git a/main/protobuf/exclude.patch b/main/protobuf/exclude.patch
new file mode 100644
index 00000000000..9c63c0a01b8
--- /dev/null
+++ b/main/protobuf/exclude.patch
@@ -0,0 +1,40 @@
+don't install the utf8_range lib into disk.
+also remove it from .pc/cmake, it's statically linked into protobuf and never needed on disk after
+--
+diff --git a/cmake/install.cmake b/cmake/install.cmake
+index e7eb210..73e1897 100644
+--- a/cmake/install.cmake
++++ b/cmake/install.cmake
+@@ -4,7 +4,6 @@ foreach(_target IN LISTS protobuf_ABSL_USED_TARGETS)
+   string(REPLACE :: _ _modified_target ${_target})
+   list(APPEND _pc_targets ${_modified_target})
+ endforeach()
+-list(APPEND _pc_targets "utf8_range")
+ 
+ set(_protobuf_PC_REQUIRES "")
+ set(_sep "")
+diff --git a/cmake/protobuf-config.cmake.in b/cmake/protobuf-config.cmake.in
+index 44805c7..1a8d243 100644
+--- a/cmake/protobuf-config.cmake.in
++++ b/cmake/protobuf-config.cmake.in
+@@ -4,7 +4,6 @@ include("${CMAKE_CURRENT_LIST_DIR}/protobuf-options.cmake")
+ # Depend packages
+ @_protobuf_FIND_ZLIB@
+ @_protobuf_FIND_ABSL@
+-@_protobuf_FIND_UTF8_RANGE@
+ 
+ # Imported targets
+ include("${CMAKE_CURRENT_LIST_DIR}/protobuf-targets.cmake")
+diff --git a/cmake/utf8_range.cmake b/cmake/utf8_range.cmake
+index f411a8c..770f94c 100644
+--- a/cmake/utf8_range.cmake
++++ b/cmake/utf8_range.cmake
+@@ -8,7 +8,7 @@ if (NOT TARGET utf8_range)
+   endif()
+ 
+   set(utf8_range_ENABLE_INSTALL ${protobuf_INSTALL} CACHE BOOL "Set install")
+-  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/utf8_range third_party/utf8_range)
++  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/utf8_range third_party/utf8_range EXCLUDE_FROM_ALL)
+   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/utf8_range)
+ endif ()
+ 
diff --git a/main/protobuf/musl-fix.patch b/main/protobuf/musl-fix.patch
deleted file mode 100644
index 442ca20edb3..00000000000
--- a/main/protobuf/musl-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-seems like both musl libc and android has byteswap.h
-
---- a/src/google/protobuf/stubs/port.h
-+++ b/src/google/protobuf/stubs/port.h
-@@ -94,7 +94,7 @@
- #include <intrin.h>
- #elif defined(__APPLE__)
- #include <libkern/OSByteOrder.h>
--#elif defined(__GLIBC__) || defined(__BIONIC__) || defined(__CYGWIN__)
-+#elif defined(__linux__) || defined(__BIONIC__) || defined(__CYGWIN__)
- #include <byteswap.h>  // IWYU pragma: export
- #endif
- 
-@@ -380,7 +380,7 @@ inline void GOOGLE_UNALIGNED_STORE64(voi
- #define bswap_32(x) OSSwapInt32(x)
- #define bswap_64(x) OSSwapInt64(x)
- 
--#elif !defined(__GLIBC__) && !defined(__BIONIC__) && !defined(__CYGWIN__)
-+#elif !defined(__linux__) && !defined(__BIONIC__) && !defined(__CYGWIN__)
- 
- static inline uint16 bswap_16(uint16 x) {
-   return static_cast<uint16>(((x & 0xFF) << 8) | ((x & 0xFF00) >> 8));
diff --git a/main/protobuf/protoc-cmake.patch b/main/protobuf/protoc-cmake.patch
new file mode 100644
index 00000000000..4c1ae7af075
--- /dev/null
+++ b/main/protobuf/protoc-cmake.patch
@@ -0,0 +1,27 @@
+Patch-Source: https://github.com/protocolbuffers/protobuf/pull/13206
+--
+From 2e62ef1eaa2e712afc5f87aa2c55d478fe96230d Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Wed, 5 Jul 2023 13:03:11 +0200
+Subject: [PATCH] Handle BUILD_TYPE=None in protobuf-module.cmake
+
+Fixes Protobuf_PROTOC_EXECUTABLE being undefined in that case.
+---
+ cmake/protobuf-module.cmake.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cmake/protobuf-module.cmake.in b/cmake/protobuf-module.cmake.in
+index 0bb05e38fad..e5b2b2e4b3a 100644
+--- a/cmake/protobuf-module.cmake.in
++++ b/cmake/protobuf-module.cmake.in
+@@ -153,6 +153,10 @@ if(NOT Protobuf_PROTOC_EXECUTABLE AND TARGET protobuf::protoc)
+     get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
+       IMPORTED_LOCATION_NOCONFIG)
+   endif()
++  if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
++    get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
++      IMPORTED_LOCATION_NONE)
++  endif()
+ endif()
+ 
+ # Version info variable
diff --git a/main/protobuf/ruby-fix-cflags.patch b/main/protobuf/ruby-fix-cflags.patch
index 690868d1ea7..24b1d57c0d0 100644
--- a/main/protobuf/ruby-fix-cflags.patch
+++ b/main/protobuf/ruby-fix-cflags.patch
@@ -1,17 +1,18 @@
-This fixes problem with missing symbol __va_copy, see
-https://github.com/protocolbuffers/protobuf/pull/6848.
+Using builder flags
 
+diff --git a/ruby/ext/google/protobuf_c/extconf.rb b/ruby/ext/google/protobuf_c/extconf.rb
+index b7c439b..0bbc15c 100755
 --- a/ruby/ext/google/protobuf_c/extconf.rb
 +++ b/ruby/ext/google/protobuf_c/extconf.rb
-@@ -3,9 +3,9 @@
- require 'mkmf'
+@@ -7,9 +7,9 @@ ext_name = "google/protobuf_c"
+ dir_config(ext_name)
  
- if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/
--  $CFLAGS += " -std=gnu90 -O3 -DNDEBUG -Wall -Wdeclaration-after-statement -Wsign-compare"
-+  $CFLAGS += " -std=gnu99 -DNDEBUG -Wall -Wdeclaration-after-statement -Wsign-compare"
+ if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/ || RUBY_PLATFORM =~ /freebsd/
+-  $CFLAGS += " -std=gnu99 -O3 -DNDEBUG -fvisibility=hidden -Wall -Wsign-compare -Wno-declaration-after-statement"
++  $CFLAGS += " -std=gnu99 -DNDEBUG -fvisibility=hidden -Wall -Wsign-compare -Wno-declaration-after-statement"
  else
--  $CFLAGS += " -std=gnu90 -O3 -DNDEBUG"
+-  $CFLAGS += " -std=gnu99 -O3 -DNDEBUG"
 +  $CFLAGS += " -std=gnu99 -DNDEBUG"
  end
  
- 
+ if RUBY_PLATFORM =~ /linux/
diff --git a/main/protobuf/skip-failing-tests.patch b/main/protobuf/skip-failing-tests.patch
new file mode 100644
index 00000000000..9333d494906
--- /dev/null
+++ b/main/protobuf/skip-failing-tests.patch
@@ -0,0 +1,84 @@
+--- a/src/google/protobuf/any_test.cc
++++ b/src/google/protobuf/any_test.cc
+@@ -62,16 +62,6 @@
+   EXPECT_EQ(12345, submessage.int32_value());
+ }
+ 
+-TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {
+-#if defined(_MSC_VER) && defined(_M_IX86)
+-  GTEST_SKIP() << "This toolchain can't allocate that much memory.";
+-#endif
+-  protobuf_unittest::TestAny submessage;
+-  submessage.mutable_text()->resize(INT_MAX, 'a');
+-  protobuf_unittest::TestAny message;
+-  EXPECT_FALSE(message.mutable_any_value()->PackFrom(submessage));
+-}
+-
+ TEST(AnyTest, TestUnpackWithTypeMismatch) {
+   protobuf_unittest::TestAny payload;
+   payload.set_int32_value(13);
+--- a/src/google/protobuf/arena_unittest.cc
++++ b/src/google/protobuf/arena_unittest.cc
+@@ -1392,11 +1392,9 @@
+   options.initial_block_size = arena_block.size();
+   Arena arena_2(options);
+   EXPECT_EQ(1024, arena_2.SpaceAllocated());
+-  EXPECT_EQ(0, arena_2.SpaceUsed());
+   EXPECT_EQ(1024, arena_2.Reset());
+   Arena::CreateArray<char>(&arena_2, 55);
+   EXPECT_EQ(1024, arena_2.SpaceAllocated());
+-  EXPECT_EQ(Align8(55), arena_2.SpaceUsed());
+   EXPECT_EQ(1024, arena_2.Reset());
+ }
+ 
+@@ -1460,11 +1458,9 @@
+ 
+     *Arena::Create<int64_t>(&arena) = 42;
+     EXPECT_GE(arena.SpaceAllocated(), 8);
+-    EXPECT_EQ(8, arena.SpaceUsed());
+ 
+     *Arena::Create<int64_t>(&arena) = 42;
+     EXPECT_GE(arena.SpaceAllocated(), 16);
+-    EXPECT_EQ(16, arena.SpaceUsed());
+   }
+ }
+ 
+--- a/src/google/protobuf/extension_set_unittest.cc
++++ b/src/google/protobuf/extension_set_unittest.cc
+@@ -779,17 +779,11 @@
+   } while (0)
+ 
+   TEST_SCALAR_EXTENSIONS_SPACE_USED(int32, 101);
+-  TEST_SCALAR_EXTENSIONS_SPACE_USED(int64, 102);
+   TEST_SCALAR_EXTENSIONS_SPACE_USED(uint32, 103);
+-  TEST_SCALAR_EXTENSIONS_SPACE_USED(uint64, 104);
+   TEST_SCALAR_EXTENSIONS_SPACE_USED(sint32, 105);
+-  TEST_SCALAR_EXTENSIONS_SPACE_USED(sint64, 106);
+   TEST_SCALAR_EXTENSIONS_SPACE_USED(fixed32, 107);
+-  TEST_SCALAR_EXTENSIONS_SPACE_USED(fixed64, 108);
+   TEST_SCALAR_EXTENSIONS_SPACE_USED(sfixed32, 109);
+-  TEST_SCALAR_EXTENSIONS_SPACE_USED(sfixed64, 110);
+   TEST_SCALAR_EXTENSIONS_SPACE_USED(float, 111);
+-  TEST_SCALAR_EXTENSIONS_SPACE_USED(double, 112);
+   TEST_SCALAR_EXTENSIONS_SPACE_USED(bool, true);
+ #undef TEST_SCALAR_EXTENSIONS_SPACE_USED
+   {
+--- a/src/google/protobuf/wire_format_unittest.inc
++++ b/src/google/protobuf/wire_format_unittest.inc
+@@ -1591,6 +1591,7 @@
+ 
+ // Test the old VerifyUTF8String() function, which may still be called by old
+ // generated code.
++#if 0
+ TEST_F(Utf8ValidationTest, OldVerifyUTF8String) {
+   std::string data(kInvalidUTF8String);
+ 
+@@ -1609,7 +1610,7 @@
+                                  WireFormat::SERIALIZE);
+   }
+ }
+-
++#endif
+ 
+ TEST(RepeatedVarint, Int32) {
+   RepeatedField<int32_t> v;
diff --git a/main/protobuf/soversion.patch b/main/protobuf/soversion.patch
new file mode 100644
index 00000000000..25d695927e8
--- /dev/null
+++ b/main/protobuf/soversion.patch
@@ -0,0 +1,39 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/protobuf/-/blob/e93df92fead2d46cc2825a866af3f402d498439c/soversion.patch
+use an soversion that actually makes sense and not just the full pkgver
+--
+diff --git a/cmake/libprotobuf-lite.cmake b/cmake/libprotobuf-lite.cmake
+index 9b1de677b4f..276c99c489e 100644
+--- a/cmake/libprotobuf-lite.cmake
++++ b/cmake/libprotobuf-lite.cmake
+@@ -30,6 +30,7 @@ if(protobuf_BUILD_SHARED_LIBS)
+ endif()
+ set_target_properties(libprotobuf-lite PROPERTIES
+     VERSION ${protobuf_VERSION}
++    SOVERSION ${protobuf_VERSION_MINOR}
+     OUTPUT_NAME ${LIB_PREFIX}protobuf-lite
+     DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
+ add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite)
+diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake
+index aa3efc9a68a..0f34d20b97d 100644
+--- a/cmake/libprotobuf.cmake
++++ b/cmake/libprotobuf.cmake
+@@ -33,6 +33,7 @@ if(protobuf_BUILD_SHARED_LIBS)
+ endif()
+ set_target_properties(libprotobuf PROPERTIES
+     VERSION ${protobuf_VERSION}
++    SOVERSION ${protobuf_VERSION_MINOR}
+     OUTPUT_NAME ${LIB_PREFIX}protobuf
+     DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
+ add_library(protobuf::libprotobuf ALIAS libprotobuf)
+diff --git a/cmake/libprotoc.cmake b/cmake/libprotoc.cmake
+index 72b4a1abb92..91e8bbeb04e 100644
+--- a/cmake/libprotoc.cmake
++++ b/cmake/libprotoc.cmake
+@@ -24,6 +24,7 @@ endif()
+ set_target_properties(libprotoc PROPERTIES
+     COMPILE_DEFINITIONS LIBPROTOC_EXPORTS
+     VERSION ${protobuf_VERSION}
++    SOVERSION ${protobuf_VERSION_MINOR}
+     OUTPUT_NAME ${LIB_PREFIX}protoc
+     DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
+ add_library(protobuf::libprotoc ALIAS libprotoc)
diff --git a/main/protobuf/trim-rakefile.patch b/main/protobuf/trim-rakefile.patch
index 497a92dde31..d8a3b87803b 100644
--- a/main/protobuf/trim-rakefile.patch
+++ b/main/protobuf/trim-rakefile.patch
@@ -1,4 +1,5 @@
-Remove code that we don't use to avoid installing additional dependencies.
+diff --git a/ruby/Rakefile b/ruby/Rakefile
+index c05e115..20144b7 100644
 --- a/ruby/Rakefile
 +++ b/ruby/Rakefile
 @@ -1,6 +1,4 @@
@@ -8,22 +9,11 @@ Remove code that we don't use to avoid installing additional dependencies.
  require "rake/testtask"
  
  spec = Gem::Specification.load("google-protobuf.gemspec")
-@@ -39,51 +37,6 @@ unless ENV['IN_DOCKER'] == 'true'
+@@ -95,57 +93,6 @@ else
+     FileUtils.cp(utf8_root+"/range2-neon.c", "ext/google/protobuf_c")
+     FileUtils.cp(utf8_root+"/range2-sse.c", "ext/google/protobuf_c")
    end
- end
- 
--if RUBY_PLATFORM == "java"
--  if `which mvn` == ''
--    raise ArgumentError, "maven needs to be installed"
--  end
--  task :clean do
--    system("mvn --batch-mode clean")
--  end
 -
--  task :compile do
--    system("mvn --batch-mode package")
--  end
--else
 -  Rake::ExtensionTask.new("protobuf_c", spec) do |ext|
 -    unless RUBY_PLATFORM =~ /darwin/
 -      # TODO: also set "no_native to true" for mac if possible. As is,
@@ -35,38 +25,55 @@ Remove code that we don't use to avoid installing additional dependencies.
 -    ext.lib_dir = "lib/google"
 -    ext.cross_compile = true
 -    ext.cross_platform = [
--      'x86-mingw32', 'x64-mingw32',
+-      'x86-mingw32', 'x64-mingw32', 'x64-mingw-ucrt',
 -      'x86_64-linux', 'x86-linux',
--      'universal-darwin'
+-      'x86_64-darwin', 'arm64-darwin',
 -    ]
 -  end
 -
+-  task 'gem:java' do
+-    sh "rm Gemfile.lock"
+-    require 'rake_compiler_dock'
+-    # Specify the repo root as the working and mount directory to provide access
+-    # to the java directory
+-    repo_root = File.realdirpath File.join(Dir.pwd, '..')
+-    RakeCompilerDock.sh <<-"EOT", platform: 'jruby', rubyvm: :jruby, mountdir: repo_root, workdir: repo_root
+-      sudo apt-get install maven -y && \
+-      cd java && mvn install -Dmaven.test.skip=true && cd ../ruby && \
+-      bundle && \
+-      IN_DOCKER=true rake compile gem
+-    EOT
+-  end
+-
 -  task 'gem:windows' do
+-    sh "rm Gemfile.lock"
 -    require 'rake_compiler_dock'
--    RakeCompilerDock.sh "bundle && IN_DOCKER=true rake cross native gem RUBY_CC_VERSION=2.6.0:2.5.0:2.4.0:2.3.0"
+-    ['x86-mingw32', 'x64-mingw32', 'x64-mingw-ucrt', 'x86_64-linux', 'x86-linux'].each do |plat|
+-      RakeCompilerDock.sh <<-"EOT", platform: plat
+-        bundle && \
+-        IN_DOCKER=true rake native:#{plat} pkg/#{spec.full_name}-#{plat}.gem RUBY_CC_VERSION=3.1.0:3.0.0:2.7.0:2.6.0
+-      EOT
+-    end
 -  end
 -
 -  if RUBY_PLATFORM =~ /darwin/
 -    task 'gem:native' do
 -      system "rake genproto"
--      system "rake cross native gem RUBY_CC_VERSION=2.6.0:2.5.1:2.4.0:2.3.0"
+-      system "rake cross native gem RUBY_CC_VERSION=3.1.0:3.0.0:2.7.0:2.6.0"
 -    end
 -  else
--    task 'gem:native' => [:genproto, 'gem:windows']
+-    task 'gem:native' => [:genproto, 'gem:windows', 'gem:java']
 -  end
--end
--
--
- # Proto for tests.
- genproto_output << "tests/generated_code.rb"
- genproto_output << "tests/generated_code_proto2.rb"
-@@ -134,9 +87,7 @@ task :genproto => genproto_output
+ end
  
- task :clean do
+ task :genproto => genproto_output
+@@ -154,9 +101,6 @@ task :clean do
    sh "rm -f #{genproto_output.join(' ')}"
--end
- 
--Gem::PackageTask.new(spec) do |pkg|
  end
  
- Rake::TestTask.new(:test => :build) do |t|
\ No newline at end of file
+-Gem::PackageTask.new(spec) do |pkg|
+-end
+-
+ # Skip build/genproto in Bazel builds, where we expect this to
+ # be done already.
+ Rake::TestTask.new(:test => ENV['BAZEL'] == 'true' ? [] : [:build, :genproto]) do |t|
diff --git a/main/proxychains-ng/APKBUILD b/main/proxychains-ng/APKBUILD
index 668440fa7c2..8dca750a763 100644
--- a/main/proxychains-ng/APKBUILD
+++ b/main/proxychains-ng/APKBUILD
@@ -1,18 +1,16 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=proxychains-ng
-pkgver=4.14
-pkgrel=0
+pkgver=4.17
+pkgrel=1
 pkgdesc="This tool provides proxy server support to any app."
 url="https://github.com/rofl0r/proxychains-ng"
 arch="all"
-license="GPL-2.0"
+license="GPL-2.0-only"
 options="!check"
-source="https://github.com/rofl0r/$pkgname/archive/v$pkgver.zip"
-builddir="$srcdir"/$pkgname-$pkgver
+source="https://github.com/rofl0r/proxychains-ng/releases/download/v$pkgver/proxychains-ng-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,9 +20,10 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install install-config
 	ln -s proxychains4 "$pkgdir"/usr/bin/proxychains
 }
 
-sha512sums="261c26ae942f3f70d0e058ebc9b7e862062a0357fb96483908a8ef925698b4d76c5e1231f7fc3c51c9c6a16bb5831054e9fef72da68f47cb3ed0c80ebc1fc6cb  v4.14.zip"
+sha512sums="
+aa35ae27305065a7f296cbf99b3308b2ac759287761a5d234ddaa558292467fae88c33a3ced1d71329cf6a7e8f56aa4e2ffd4274d57d87857f13ca8393d5d983  proxychains-ng-4.17.tar.xz
+"
diff --git a/main/psmisc/APKBUILD b/main/psmisc/APKBUILD
index c6365ab745a..31d0ef61399 100644
--- a/main/psmisc/APKBUILD
+++ b/main/psmisc/APKBUILD
@@ -1,20 +1,20 @@
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=psmisc
-pkgver=23.3
+pkgver=23.7
 pkgrel=0
-pkgdesc="A set of some small useful utilities that use the proc filesystem"
-url="http://psmisc.sourceforge.net/"
+pkgdesc="set of some small useful utilities that use the proc filesystem"
+url="https://gitlab.com/psmisc/psmisc"
 arch="all"
 license="GPL-2.0-or-later"
-makedepends="gettext-dev libintl ncurses-dev"
+makedepends="gettext-dev linux-headers ncurses-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://downloads.sourceforge.net/psmisc/psmisc-$pkgver.tar.xz
-	include_limits.patch
-	musl_ptregs.patch
-	"
+source="https://downloads.sourceforge.net/psmisc/psmisc-$pkgver.tar.xz"
 
 build() {
-	./configure --prefix=/usr \
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
@@ -29,6 +29,6 @@ check() {
 	make check
 }
 
-sha512sums="791ffef78d87b092d653da98710b338017466a9e1e1935968b9f0194ccef8da941317aa0c39d821d46b20d95d6539ccf78e5ebb71ad1032ae62337a397180d58  psmisc-23.3.tar.xz
-63dea6a65c4cabcfa06d225950bc78fd6ac42f7445b8d10bde5e86dd8d96eb89823e486d7635b78562da058642f87289356c416225563a8e1ccfc2e32d81e884  include_limits.patch
-73dec9791e8cdb85cd3d9ef9be4d16e0fef481c6edc334ed9e954829444b1a92b87f7a3a2e6c1d09ac207bed828f214f5f2a95caa66540a7f2a6c58a6b8f6f2c  musl_ptregs.patch"
+sha512sums="
+8180d24355b3b0f3102044916d078b1aa9a1af3d84f1e14db79e33e505390167012adbb1a8a5f47a692f3a14aba1eb5f1f8f37f328392e8635b89966af9b2128  psmisc-23.7.tar.xz
+"
diff --git a/main/psmisc/include_limits.patch b/main/psmisc/include_limits.patch
deleted file mode 100644
index 1b474bc8f60..00000000000
--- a/main/psmisc/include_limits.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Author: Breno Leitao <brenohl@br.ibm.com>
-Date:   Thu Apr 6 13:59:57 2017 -0300
-
-    peekfd: Include headers for ppc64
-    
-    Currently peekfd fails to build on ppc64le architecture with musl
-    because it does not find reference for __WORDSIZE.
-    
-    This patch just includes reference for this macro if it was not
-    previously defined.
-
-Index: psmisc-22.21/src/peekfd.c
-===================================================================
---- psmisc-22.21.orig/src/peekfd.c
-+++ psmisc-22.21/src/peekfd.c
-@@ -37,6 +37,14 @@
- 
- #include "i18n.h"
- 
-+#if !defined(PATH_MAX)
-+#include <limits.h>
-+#endif
-+
-+#if !defined(__WORDSIZE)
-+#include <bits/reg.h>
-+#endif
-+
- #ifdef I386
- 	#define REG_ORIG_ACCUM orig_eax
- 	#define REG_ACCUM eax
-Index: psmisc-22.21/src/pstree.c
-===================================================================
---- psmisc-22.21.orig/src/pstree.c
-+++ psmisc-22.21/src/pstree.c
-@@ -45,6 +45,10 @@
- #include "i18n.h"
- #include "comm.h"
- 
-+#if !defined(PATH_MAX)
-+#include <limits.h>
-+#endif
-+
- #ifdef WITH_SELINUX
- #include <selinux/selinux.h>
- #else
diff --git a/main/psmisc/musl_ptregs.patch b/main/psmisc/musl_ptregs.patch
deleted file mode 100644
index 29fee6a2a10..00000000000
--- a/main/psmisc/musl_ptregs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Breno Leitao <brenohl@br.ibm.com>
-Date:   Thu Apr 6 14:03:00 2017 -0300
-
-    peekfd: Avoid pt_regs clash
-
-Index: psmisc-22.21/src/peekfd.c
-===================================================================
---- a/src/peekfd.c.old
-+++ b/src/peekfd.c
-@@ -27,7 +27,9 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/syscall.h>
-+#define pt_regs uapi_pt_regs
- #include <asm/ptrace.h>
-+#undef pt_regs
- #include <byteswap.h>
- #include <endian.h>
- #include <sys/user.h>
-
diff --git a/main/pspg/APKBUILD b/main/pspg/APKBUILD
index 6d20b0a5f16..eda09046c3a 100644
--- a/main/pspg/APKBUILD
+++ b/main/pspg/APKBUILD
@@ -1,16 +1,16 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=pspg
-pkgver=2.6.6
+pkgver=5.8.2
 pkgrel=0
 pkgdesc="A unix pager optimized for psql"
 url="https://github.com/okbob/pspg"
 arch="all"
+options="!check" # there is no tests
 license="BSD-2-Clause"
-makedepends="automake autoconf ncurses-dev readline-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/okbob/$pkgname/archive/$pkgver.tar.gz
-	fix-musl.patch
-	"
+makedepends="automake autoconf libpq-dev ncurses-dev readline-dev"
+subpackages="$pkgname-doc"
+source="https://github.com/okbob/pspg/archive/$pkgver/pspg-$pkgver.tar.gz"
 
 prepare() {
 	default_prepare
@@ -18,7 +18,8 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
+	# getpass
+	CFLAGS="$CFLAGS -D_BSD_SOURCE" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,15 +29,11 @@ build() {
 	make
 }
 
-check() {
-	cd "$builddir"
-	./pspg -V
-}
-
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+	install -Dm644 pspg.1 -t "$pkgdir"/usr/share/man/man1/
 }
 
-sha512sums="963a4bb3e93880c5dd8538b2ba777977585b2e9766a29001f1e5dd8d4692ccc333cf8bdcf0d7ae3f0cf02568e5645d4534cc58dc540d22df5debc5b4e034114c  pspg-2.6.6.tar.gz
-b1538580f0ba1d24f3b66cad611c0ddcc9d5b74e6f7e5a46a74b1271db957b7094d64b0eefbdea51a6e7c9297a5d914ef7e6e759d24da724bc1276bdf1614940  fix-musl.patch"
+sha512sums="
+b64fd77c201e99881c8bc1afe435341ffedbd2ca40577e4f5a6e24bf8b0529f2106317452f87551a26b8c8a1907595440bce77dfd79b6293144165b106ec9517  pspg-5.8.2.tar.gz
+"
diff --git a/main/pspg/fix-musl.patch b/main/pspg/fix-musl.patch
deleted file mode 100644
index 9b66808d53c..00000000000
--- a/main/pspg/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/unicode.c
-+++ b/src/unicode.c
-@@ -11,6 +11,8 @@
-  *-------------------------------------------------------------------------
-  */
- 
-+#define _GNU_SOURCE 1
-+#include <sys/types.h>
- #include <ctype.h>
- #include <stdbool.h>
- 
diff --git a/main/psqlodbc/APKBUILD b/main/psqlodbc/APKBUILD
index 1c6f38ff524..c5c21bf598d 100644
--- a/main/psqlodbc/APKBUILD
+++ b/main/psqlodbc/APKBUILD
@@ -1,20 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=psqlodbc
-pkgver=09.06.0410
-pkgrel=1
+pkgver=16.00.0000
+pkgrel=0
 pkgdesc="PostgreSQL ODBC driver"
-url="https://www.postgresql.org"
+url="https://odbc.postgresql.org/"
 arch="all"
-license="GPL"
-depends=
-makedepends="postgresql-dev unixodbc-dev libtool"
-subpackages=
+license="GPL-2.0-or-later"
+makedepends="libpq-dev unixodbc-dev libtool"
 source="https://ftp.postgresql.org/pub/odbc/versions/src/psqlodbc-$pkgver.tar.gz"
 
-builddir="$srcdir/$pkgname-$pkgver"
+prepare() {
+	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,12 +23,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="f129f7de1ec1dcec3d17d5d21eabb438ca9b9c1b76dd3b5571f6566460c61438a7c69bfda0057697e8669cd33ae5b8213d19e3c526c04eeb21b6632e62b761f8  psqlodbc-09.06.0410.tar.gz"
+
+sha512sums="
+ad971cd29e431225d03faf5ebc0ba7a9f17d20dd70106867f05df8dc1e509413d4db533101a1b3418480ad758b7626c178ec345c5ff7e9409f7fcfbea9427166  psqlodbc-16.00.0000.tar.gz
+"
diff --git a/main/pssh/APKBUILD b/main/pssh/APKBUILD
index 746237b33f7..5102e3708e5 100644
--- a/main/pssh/APKBUILD
+++ b/main/pssh/APKBUILD
@@ -1,36 +1,36 @@
 # Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr>
-# Maintainer: Johannes Matheis <jomat+alpinebuild@jmt.gr>
+# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
 pkgname=pssh
-pkgver=2.3.1
-pkgrel=3
+pkgver=2.3.5
+pkgrel=2
 pkgdesc="PSSH provides parallel versions of OpenSSH and related tools: pssh, pscp, prsync, pnuke, and pslurp"
-url="https://code.google.com/p/parallel-ssh/"
+url="https://github.com/lilydjwg/pssh"
 arch="noarch"
 license="BSD-3-Clause"
 depends="python3 cmd:ssh"
-makedepends="py3-setuptools"
-subpackages="$pkgname-doc"
-source="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/parallel-ssh/pssh-$pkgver.tar.gz
-	python3.patch
-	"
+makedepends="py3-setuptools py3-gpep517 py3-wheel py3-installer"
+options="!check" # failing test
+subpackages="$pkgname-pyc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/lilydjwg/pssh/archive/v$pkgver.tar.gz"
 
-prepare() {
-	default_prepare
-	sed -i -e "s|man/man1'|share/&|g" setup.py
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
-build() {
-	cd "$builddir"
-	python3 setup.py build
+check() {
+	python3 -m unittest discover
 }
 
 package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 
 	install -d "$pkgdir"/usr/libexec/pssh
 	mv "$pkgdir"/usr/bin/pssh-askpass "$pkgdir"/usr/libexec/pssh
 }
 
-sha512sums="c39e1c2b0a3bc2bd736f1e7d2f402db6a128e81d6a80ce7e97f39e7fae93f7a20037b43b5725bed5ba911f54e36a9b65c509d858a53c696989b76b1322e7680f  pssh-2.3.1.tar.gz
-d37666fcf8a274a594c8f16c69e569aa6c8bd9d9496ea47657f3267c1b4d3ed2a0c106c365f5e0631fbb51f2bcfacc78a2c708d8a62f3ce2ea018e8c185b16f9  python3.patch"
+sha512sums="
+47515b05c9ee2bb302e25d5404736184ad04e22afdeb77bea799d80adadd977af2744e124bd06b751bb06ad05baed6b577cc636b808f32db83edda669598e3ee  pssh-2.3.5.tar.gz
+"
diff --git a/main/pssh/python3.patch b/main/pssh/python3.patch
deleted file mode 100644
index 3f3dcc99736..00000000000
--- a/main/pssh/python3.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 8afbefc445059be55dfd20785ee81e4533ae3af1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rogut=C4=97s=20Sparnuotos?= <rogutes@googlemail.com>
-Date: Sun, 26 Feb 2012 11:05:48 +0200
-Subject: [PATCH] Imports are absolute by default in Python3.
-
----
- psshlib/cli.py |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/psshlib/cli.py b/psshlib/cli.py
-index c14b309..c342cde 100644
---- a/psshlib/cli.py
-+++ b/psshlib/cli.py
-@@ -6,7 +6,8 @@ import os
- import shlex
- import sys
- import textwrap
--import version
-+
-+from psshlib import version
- 
- _DEFAULT_PARALLELISM = 32
- _DEFAULT_TIMEOUT     = 0 # "infinity" by default
--- 
-1.7.9.1
-
---- a/psshlib/manager.py.orig	2012-02-02 17:13:09.000000000 +0100
-+++ b/psshlib/manager.py	2016-01-17 11:52:13.764088460 +0100
-@@ -4,0 +5 @@
-+import fcntl
-@@ -211,0 +213 @@
-+        fcntl.fcntl(wakeup_writefd, fcntl.F_SETFL, os.O_NONBLOCK)
-
---- a/psshlib/askpass_server.py.orig	2012-02-02 17:13:09.000000000 +0100
-+++ b/psshlib/askpass_server.py	2016-01-17 11:43:37.006779012 +0100
-@@ -72 +72 @@
--            bytes_written = conn.send(buffer)
-+            bytes_written = conn.send(buffer.encode())
-
-diff --git a/bin/pssh b/bin/pssh
-index 860bad2..5fe726d 100755
---- a/bin/pssh
-+++ b/bin/pssh
-@@ -65,7 +65,10 @@ def do_pssh(hosts, cmdline, opts):
-     if opts.errdir and not os.path.exists(opts.errdir):
-         os.makedirs(opts.errdir)
-     if opts.send_input:
--        stdin = sys.stdin.read()
-+        if hasattr(sys.stdin, 'buffer'):
-+            stdin = sys.stdin.buffer.read()
-+        else:
-+            stdin = sys.stdin.read()
-     else:
-         stdin = None
-     manager = Manager(opts)
-
diff --git a/main/pstree/APKBUILD b/main/pstree/APKBUILD
index 1df0f42fb7e..84916c88958 100644
--- a/main/pstree/APKBUILD
+++ b/main/pstree/APKBUILD
@@ -1,26 +1,28 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
 pkgname=pstree
-pkgver=2.39
-pkgrel=1
+pkgver=2.40
+pkgrel=2
 pkgdesc="A small tool to list processes as a tree"
-url="http://www.thp.uni-duisburg.de/pstree/"
+url="https://github.com/FredHucht/pstree"
 arch="all"
-license="GPL"
+license="GPL-3.0-or-later"
 depends="!psmisc" # also provides pstree
 subpackages="$pkgname-doc"
-source="ftp://ftp.thp.uni-duisburg.de/pub/source/$pkgname-$pkgver.tar.gz"
+options="!check" # no test suite
+source="$pkgname-$pkgver.tar.gz::https://github.com/FredHucht/pstree/archive/refs/tags/v$pkgver.tar.gz"
 
 build() {
-	${CC:-gcc} ${CFLAGS} -o "$srcdir"/$pkgname \
-		"$srcdir"/$pkgname.c || return 1
+	${CC:-gcc} $CFLAGS -o $pkgname $pkgname.c
 }
 
 package() {
-	install -Dm755 "$srcdir"/$pkgname \
-		"$pkgdir"/usr/bin/$pkgname || return 1
-	install -Dm644 "$srcdir"/$pkgname.1 \
-		"$pkgdir"/usr/share/man/man1/$pkgname.1 || return 1
+	install -Dm755 $pkgname \
+		"$pkgdir"/usr/bin/$pkgname
+	install -Dm644 $pkgname.1 \
+		"$pkgdir"/usr/share/man/man1/$pkgname.1
 }
 
-sha512sums="31ec81b4adb563068a3006312e1e42b026d41107c7756c54f8b38d143b32426fc702602c7eb925a55c62be5cb3ef7d562e6ba032ec7a0788d0c45f5d5b5b0662  pstree-2.39.tar.gz"
+sha512sums="
+574e6ff5b476a5831ada91965755600ba487a13e4a4121357ee322583f61ec3a129df9dffd169e47071b15a6b57487d26d1180a5c8e8c05031eec56797e75b33  pstree-2.40.tar.gz
+"
diff --git a/main/pth/APKBUILD b/main/pth/APKBUILD
deleted file mode 100644
index adf49401cf5..00000000000
--- a/main/pth/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=pth
-pkgver=2.0.7
-pkgrel=5
-pkgdesc="GNU Portable Threads"
-options="!libc_musl" # This is only for uclibc
-url="https://www.gnu.org/software/pth"
-arch="all"
-license="LGPL-2.1-or-later"
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://ftp.gnu.org/gnu/pth/pth-$pkgver.tar.gz
-	pth-2.0.5-parallelfix.patch
-	pth-2.0.6-ldflags.patch
-	pth-2.0.6-sigstack.patch
-	"
-
-prepare() {
-	default_prepare
-	update_config_sub
-}
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--mandir=/usr/share/man
-	make
-}
-
-package() {
-	make -j1 DESTDIR="$pkgdir" install
-}
-
-sha512sums="f79d74047c50e06f3198356f88647c5c1c8a04ebdd94641fc31d5ab0fd2750d86615fcb81da2f98d7ea73d012a501195d3fa09060571d18dcfdaec5d7a0ecb12  pth-2.0.7.tar.gz
-bda7d23a6dd15097c72428003ece7e453b8c1791573853a711dda7bb432593d847053bef436b55050f4a80edd7574e1178ef9fbe001eb20d91c717b8cae43957  pth-2.0.5-parallelfix.patch
-099c8221d0011dd5284a96d216ed5315619ae377c3c0a01d15af2976aec57e286166601740b139852f340b36fdc7c5ce62f69faf268d6feaabe70db2bbfdf372  pth-2.0.6-ldflags.patch
-0011405ae5e8371390adb2a718277d675db5bc085fe5c5f6054ba1bb08f2276d9e5f4d5c083e833417893173210b1e791a2d0f0a9b6d13194f11c9f587397635  pth-2.0.6-sigstack.patch"
diff --git a/main/pth/pth-2.0.5-parallelfix.patch b/main/pth/pth-2.0.5-parallelfix.patch
deleted file mode 100644
index 1c8200a4cb2..00000000000
--- a/main/pth/pth-2.0.5-parallelfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.in	2005-11-08 05:58:55.000000000 +1100
-+++ b/Makefile.in	2005-11-08 06:29:02.000000000 +1100
-@@ -148,10 +148,9 @@
- 
- #   be aware of libtool when building the objects
- .SUFFIXES:
--.SUFFIXES: .c .o .lo
--.c.o:
-+%.o: %.c $(TARGET_PREQ)
- 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
--.c.lo:
-+%.lo: %.c $(TARGET_PREQ)
- 	$(LIBTOOL) --mode=compile --quiet $(CC) -c $(CPPFLAGS) $(CFLAGS) $<
- 
- #   the default target
diff --git a/main/pth/pth-2.0.6-ldflags.patch b/main/pth/pth-2.0.6-ldflags.patch
deleted file mode 100644
index 7a4a5ab3000..00000000000
--- a/main/pth/pth-2.0.6-ldflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: pth-2.0.6/Makefile.in
-===================================================================
---- pth-2.0.6.orig/Makefile.in
-+++ pth-2.0.6/Makefile.in
-@@ -168,10 +168,10 @@ pth_p.h: $(S)pth_p.h.in
- 
- #   build the static and possibly shared libraries
- libpth.la: $(LOBJS)
--	$(LIBTOOL) --mode=link --quiet $(CC) -o libpth.la $(LOBJS) \
-+	$(LIBTOOL) --mode=link --quiet $(CC) $(LDFLAGS) -o libpth.la $(LOBJS) \
- 	-rpath $(libdir) -version-info `$(SHTOOL) version -lc -dlibtool $(_VERSION_FILE)`
- libpthread.la: pthread.lo $(LOBJS)
--	$(LIBTOOL) --mode=link --quiet $(CC) -o libpthread.la pthread.lo $(LOBJS) \
-+	$(LIBTOOL) --mode=link --quiet $(CC) $(LDFLAGS) -o libpthread.la pthread.lo $(LOBJS) \
- 	-rpath $(libdir) -version-info `$(SHTOOL) version -lc -dlibtool $(_VERSION_FILE)`
- 
- #   build the manual pages
diff --git a/main/pth/pth-2.0.6-sigstack.patch b/main/pth/pth-2.0.6-sigstack.patch
deleted file mode 100644
index 3914dea7ac6..00000000000
--- a/main/pth/pth-2.0.6-sigstack.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urNp pth-2.0.6.old/aclocal.m4 pth-2.0.6/aclocal.m4
---- pth-2.0.6.old/aclocal.m4	2004-12-31 21:33:19.000000000 +0200
-+++ pth-2.0.6/aclocal.m4	2006-09-20 14:46:59.000000000 +0300
-@@ -1522,6 +1522,7 @@ int main(int argc, char *argv[])
-     int sksize;
-     char result[1024];
-     int i;
-+exit (1);
-     sksize = 32768;
-     skbuf = (char *)malloc(sksize*2+2*sizeof(union alltypes));
-     if (skbuf == NULL)
-diff -urNp pth-2.0.6.old/configure pth-2.0.6/configure
---- pth-2.0.6.old/configure	2005-11-22 09:49:21.000000000 +0200
-+++ pth-2.0.6/configure	2006-09-20 14:55:23.000000000 +0300
-@@ -24735,6 +24735,7 @@ int main(int argc, char *argv[])
-     int sksize;
-     char result[1024];
-     int i;
-+exit (1);
-     sksize = 32768;
-     skbuf = (char *)malloc(sksize*2+2*sizeof(union alltypes));
-     if (skbuf == NULL)
diff --git a/main/putty/APKBUILD b/main/putty/APKBUILD
index 01e9151d29b..5c250ea981a 100644
--- a/main/putty/APKBUILD
+++ b/main/putty/APKBUILD
@@ -1,19 +1,26 @@
 # Maintainer: Jeff Bilyk <jbilyk@alpinelinux.org>
 pkgname=putty
-pkgver=0.73
-pkgrel=2
+pkgver=0.81
+pkgrel=0
 pkgdesc="SSH and telnet client"
 url="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
 arch="all"
 license="MIT"
 depends="ncurses-terminfo-base"
-makedepends="linux-headers"
+makedepends="cmake gtk+3.0-dev linux-headers perl samurai"
 subpackages="$pkgname-doc"
-source="http://the.earth.li/~sgtatham/putty/$pkgver/putty-$pkgver.tar.gz
-	fix-ppc64le-disable-werror.patch"
+source="https://the.earth.li/~sgtatham/putty/$pkgver/putty-$pkgver.tar.gz"
 options="!check" # no test suite
 
 # secfixes:
+#   0.81-r0:
+#     - CVE-2024-31497
+#   0.80-r0:
+#     - CVE-2023-48795
+#   0.76-r0:
+#     - CVE-2021-36367
+#   0.74-r0:
+#     - CVE-2020-14002
 #   0.73-r0:
 #     - CVE-2019-17068
 #     - CVE-2019-17069
@@ -24,16 +31,16 @@ options="!check" # no test suite
 #     - CVE-2019-9898
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
+	cmake -B build -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=None
+	cmake --build build
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
-sha512sums="4ada4b8c6d68be44afede2676bc661fedfd1ea0b574b8232ad9aaa6f3a48baa9f4f0ded2955b3f2677a14db85a508f53c965cb00fcd7538a1ed9844031f0c5e5  putty-0.73.tar.gz
-b10b2332ca0592db5664311d1bba7549ded79f16f6eef13dab3caca21626d97657f31e8603766e00b1a06f42cf229107eb53929730fe48e97cfc9216093fcc4c  fix-ppc64le-disable-werror.patch"
+sha512sums="
+d86f2fd0e126b18275d58cf64334b3b27c450899a1c2be2502de9faa2ef58f7fc8efc5d45f25c8395623f1e21917aa02407343bb2fee44c4c00b9f81267d5ecd  putty-0.81.tar.gz
+"
diff --git a/main/putty/fix-ppc64le-disable-werror.patch b/main/putty/fix-ppc64le-disable-werror.patch
deleted file mode 100644
index 2dba28bdb73..00000000000
--- a/main/putty/fix-ppc64le-disable-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure b/configure
-index d68c382..5db360e 100755
---- a/configure
-+++ b/configure
-@@ -5995,7 +5995,7 @@ fi
- 
- if test "x$GCC" = "xyes"; then
-   :
--  WARNINGOPTS='-Wall -Werror -Wpointer-arith -Wvla'
-+  WARNINGOPTS='-Wall -Wpointer-arith -Wvla'
- 
- else
-   :
diff --git a/main/pwgen/APKBUILD b/main/pwgen/APKBUILD
index bf1f6c38e92..147fbd7d029 100644
--- a/main/pwgen/APKBUILD
+++ b/main/pwgen/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=pwgen
 pkgver=2.08
-pkgrel=1
+pkgrel=3
 pkgdesc="A Password Generator"
 url="https://github.com/tytso/pwgen"
 arch="all"
diff --git a/main/py-bluez/APKBUILD b/main/py-bluez/APKBUILD
deleted file mode 100644
index 38df4b719c0..00000000000
--- a/main/py-bluez/APKBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=py-bluez
-_pkgname=pybluez
-pkgver=0.22
-pkgrel=4
-pkgdesc="Python API for the BlueZ bluetooth stack"
-url="http://karulis.github.io/pybluez/"
-arch="all"
-license="GPL-2.0-or-later"
-makedepends="python2-dev python3-dev py3-setuptools py2-setuptools bluez-dev"
-subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
-source="$pkgname-$pkgver.tar.gz::https://github.com/karulis/$_pkgname/archive/$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-prepare() {
-	default_prepare
-
-	# Soure files are modified during build with 2to3 tool, so we cannot
-	# build it for both Python versions in the same location.
-	local python; for python in python2 python3; do
-		cp -r "$builddir" "$builddir-$python"
-	done
-}
-
-build() {
-	local python; for python in python2 python3; do
-		cd "$builddir"-$python
-		$python setup.py build
-	done
-}
-
-package() {
-	mkdir -p "$pkgdir"
-}
-
-_py2() {
-	replaces="$pkgname"
-	_py python2
-}
-
-_py3() {
-	_py python3
-}
-
-_py() {
-	local python="$1"
-	pkgdesc="$pkgdesc (for $python)"
-	install_if="$pkgname=$pkgver-r$pkgrel $python"
-
-	cd "$builddir"-$python
-	$python setup.py install --prefix=/usr --root="$subpkgdir"
-}
-
-sha512sums="5b35b9e0eae1c6ebabb29892fcff583479ac0627ad7d6549f3d2de90f89a1ba465b7452fa263045298ccfcf063ba070bfd346a6433b5567f8e3e646886017165  py-bluez-0.22.tar.gz"
diff --git a/main/py-olefile/APKBUILD b/main/py-olefile/APKBUILD
deleted file mode 100644
index fab78866145..00000000000
--- a/main/py-olefile/APKBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Contributor: Francesco Colista <fcolista@alpinelinux.org>
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname=py-olefile
-pkgver=0.46
-pkgrel=3
-pkgdesc="Python module to read/write MS OLE2 files"
-url="http://www.decalage.info/olefile"
-arch="noarch"
-license="BSD-2-Clause"
-makedepends="python2-dev py-setuptools python3-dev py3-setuptools"
-subpackages="py3-${pkgname/py-/}:_py3 py2-${pkgname/py-/}:_py2"
-source="https://github.com/decalage2/olefile/releases/download/v$pkgver/olefile-$pkgver.tar.gz"
-
-builddir="$srcdir"/${pkgname/py-/}-$pkgver
-
-build() {
-	python2 setup.py build
-	python3 setup.py build
-}
-
-package() {
-	mkdir -p "$pkgdir"
-}
-
-_py() {
-	local python=$1
-	pkgdesc="$pkgdesc - $python"
-	install_if="$pkgname=$pkgver-r$pkgrel $python"
-	cd "$builddir"
-	$python setup.py install --prefix=/usr --root="$subpkgdir"
-}
-
-_py2() {
-	_py python2
-	replaces="$pkgname"
-}
-
-_py3() {
-	_py python3
-}
-
-
-sha512sums="285dff1eb250d464e338f892dca3e465504523fd956ceeb8bfe40eb9a82510713f64f490749a23bfdc911555f8d9c49580af5b03a15063c2598bb1a39999778f  olefile-0.46.tar.gz"
diff --git a/main/py-pillow/APKBUILD b/main/py-pillow/APKBUILD
deleted file mode 100644
index e693484b440..00000000000
--- a/main/py-pillow/APKBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=py-pillow
-_pkgname=Pillow
-pkgver=6.2.2
-pkgrel=1
-pkgdesc="Python Imaging Library"
-options="!check"
-url="https://python-pillow.org"
-arch="all"
-license="custom:PIL"
-depends="py-olefile"
-makedepends="python2-dev python3-dev py2-setuptools py3-setuptools freetype-dev
-	jpeg-dev libwebp-dev tiff-dev libpng-dev lcms2-dev libjpeg-turbo-dev
-	zlib-dev"
-subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
-	py-pillow-fix-pytest-ver.patch"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-# secfixes:
-#   6.2.2-r0:
-#     - CVE-2019-19911
-#     - CVE-2020-5310
-#     - CVE-2020-5311
-#     - CVE-2020-5312
-#     - CVE-2020-5313
-
-build() {
-	# zlib resides in lib
-	export CFLAGS="$CFLAGS -L/lib"
-	python2 setup.py build
-	python3 setup.py build
-}
-
-check() {
-	rm -f Tests/test_imageshow.py
-	python2 setup.py test -v
-	python3 setup.py test -v
-}
-
-package() {
-	mkdir -p "$pkgdir"
-}
-
-_py2() {
-	replaces="$pkgname py-imaging"
-	depends="${depends//py-/py2-}"
-	_py python2
-}
-
-_py3() {
-	depends="${depends//py-/py3-}"
-	_py python3
-}
-
-_py() {
-	local python="$1"
-	pkgdesc="$pkgdesc (for $python)"
-	install_if="$pkgname=$pkgver-r$pkgrel $python"
-
-	cd "$builddir"
-	$python setup.py install --prefix=/usr --root="$subpkgdir"
-}
-
-sha512sums="517c971d4fb23a47466a7e8326c8c29291f7832d4521001c1898d6223ea25d4b0a8b7c8f7e78dd706f421229a8261b558b9fbdc43e47a0a2a7b2b4bbc1a21eff  Pillow-6.2.2.tar.gz
-b33216541d7cdeb481d650b7cafeb44333244abbdab035ff5aa086c8dc9c5b2e1e9e294048f299f803d251c7a70ac4ea0a68ba28e7a9ced136287d61310708cf  py-pillow-fix-pytest-ver.patch"
diff --git a/main/py-pillow/py-pillow-fix-pytest-ver.patch b/main/py-pillow/py-pillow-fix-pytest-ver.patch
deleted file mode 100644
index 5b2a867e68e..00000000000
--- a/main/py-pillow/py-pillow-fix-pytest-ver.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./setup.py.orig
-+++ ./setup.py
-@@ -881,7 +881,7 @@
-         ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
-         include_package_data=True,
-         setup_requires=pytest_runner,
--        tests_require=["pytest"],
-+        tests_require=["pytest < 5"],
-         packages=["PIL"],
-         package_dir={"": "src"},
-         keywords=["Imaging"],
diff --git a/main/py-simplejson/APKBUILD b/main/py-simplejson/APKBUILD
deleted file mode 100644
index 2040f6b7c28..00000000000
--- a/main/py-simplejson/APKBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Contributor: Francesco Colista <fcolista@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=py-simplejson
-_pkgname=simplejson
-pkgver=3.17.0
-pkgrel=0
-pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python"
-url="https://pypi.python.org/pypi/simplejson"
-arch="all"
-license="MIT"
-makedepends="py3-setuptools py2-setuptools python2-dev python3-dev"
-subpackages="py2-$_pkgname:_py2 py3-$_pkgname:_py3"
-source="$pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/archive/v$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-build() {
-	cd "$builddir"
-	python2 setup.py build
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	python2 setup.py test
-	python3 setup.py test
-}
-
-package() {
-	mkdir -p "$pkgdir"
-}
-
-_py2() {
-	replaces="$pkgname"
-	_py python2
-}
-
-_py3() {
-	_py python3
-}
-
-_py() {
-	local python="$1"
-	pkgdesc="$pkgdesc (for $python)"
-	install_if="$pkgname=$pkgver-r$pkgrel $python"
-
-	cd "$builddir"
-	$python setup.py install --prefix=/usr --root="$subpkgdir"
-	rm -Rf "$subpkgdir"/usr/lib/python*/site-packages/simplejson/tests/
-}
-
-sha512sums="3057edfa8c8a16fa1c2027a880ac71531afc70d087a12a6fa085b3e09705ab049850dbabe60acc6fc11f51d9e0cf98f58407be03980182dca2ca070c298fd023  py-simplejson-3.17.0.tar.gz"
diff --git a/main/py2-setuptools/APKBUILD b/main/py2-setuptools/APKBUILD
deleted file mode 100644
index e4f52f6ca70..00000000000
--- a/main/py2-setuptools/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Andrew Manison <amanison@anselsystems.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=py2-setuptools
-_pkgname=${pkgname#py2-}
-pkgver=44.0.0
-pkgrel=0
-pkgdesc="Collection of enhancements to the Python2 distutils"
-url="https://pypi.python.org/pypi/setuptools"
-arch="noarch"
-license="MIT"
-depends="python2"
-options="!check" #no testsuite
-source="$_pkgname-$pkgver.tar.gz::https://github.com/pypa/$_pkgname/archive/v$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-prepare() {
-	python2 bootstrap.py
-}
-
-build() {
-	python2 setup.py build
-}
-
-package() {
-	python2 setup.py install --prefix=/usr --root="$pkgdir"
-	# we don't provide a non-suffixed easy_install
-	rm -f "$pkgdir"/usr/bin/easy_install
-}
-
-sha512sums="48febee840612a56c7f4cb0bc3983bf61a6a08c53dfcb95403f6631061481ba391fc0472d608ea6c0078fda8bcc7bb9f6dd8b73d473f5e4349d6eaeb2ab0050b  setuptools-44.0.0.tar.gz"
diff --git a/main/py3-alabaster/APKBUILD b/main/py3-alabaster/APKBUILD
index 472b9108e94..41f07c61aa4 100644
--- a/main/py3-alabaster/APKBUILD
+++ b/main/py3-alabaster/APKBUILD
@@ -1,27 +1,31 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py3-alabaster
 _pkgname=alabaster
-pkgver=0.7.12
-pkgrel=3
-pkgdesc="Modified Kr Sphinx doc theme"
-url="https://github.com/bitprophet/alabaster"
+pkgver=0.7.16
+pkgrel=1
+pkgdesc="Lightweight, configurable Sphinx theme"
+url="https://alabaster.readthedocs.io/en/latest/"
 arch="noarch"
 license="BSD-3-Clause"
 depends="python3"
-makedepends="py3-setuptools"
-source="$_pkgname-$pkgver.tar.gz::https://github.com/bitprophet/$_pkgname/archive/$pkgver.tar.gz"
+makedepends="py3-flit-core py3-gpep517"
+subpackages="$pkgname-pyc"
+source="$_pkgname-$pkgver.tar.gz::https://github.com/sphinx-doc/alabaster/archive/$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 replaces="py-alabaster" # Backwards compatibility
 provides="py-alabaster=$pkgver-r$pkgrel" # Backwards compatibility
+options="!check"
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 }
 
-sha512sums="e6bcfbf02ee83eaa33c71b8a3d1cb767cc4bfc2b95f79a86a59292988e28abea32a7d55be9a9cdfa9592efed5de3afd7604f9bb65e1f90ba5f377ec54d540f9e  alabaster-0.7.12.tar.gz"
+sha512sums="
+a2a38a4923e47a89310de0128a8be3b1304b548810ef9f04bc2b4db0664f752e8db85c32bcdaec1565c9310753ab1d2b4a69789bf75ea5ba2d1ff60bd04a20d2  alabaster-0.7.16.tar.gz
+"
diff --git a/main/py3-appdirs/APKBUILD b/main/py3-appdirs/APKBUILD
index bfde737a756..fff9502cfbd 100644
--- a/main/py3-appdirs/APKBUILD
+++ b/main/py3-appdirs/APKBUILD
@@ -1,27 +1,34 @@
 # Contributor: TBK <alpine@jjtc.eu>
-# Maintainer:
+# Maintainer: Keith Maxwell <keith.maxwell@gmail.com>
 pkgname=py3-appdirs
-_pkgname=${pkgname#py3-}
-pkgver=1.4.3
-pkgrel=2
+_pkgname=appdirs
+pkgver=1.4.4
+pkgrel=8
 pkgdesc="A small Python module for determining appropriate platform-specific dirs."
 url="https://pypi.org/project/appdirs/"
 arch="noarch"
 license="MIT"
 depends="python3"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="py3-pytest"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/a/appdirs/appdirs-$pkgver.tar.gz"
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
 }
 
 check() {
-	PYTHONPATH="$PWD" python3 test/test_api.py
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 }
 
-sha512sums="964db6c9f830c9b23d78f0230c5f574f214f08faf3fd24f10ccc941d23e38de66186461d754f7effb94aa0553c25df4843c9ff5dcd375c992c322550b3d98cce  appdirs-1.4.3.tar.gz"
+sha512sums="
+8b0cdd9fd471d45b186aa47607691cf378dabd3edc7b7026a57bd6d6f57698e86f440818a5e23ba4288b35d6bb8cb6eb0106eae8aab09d8863ee15025d300883  appdirs-1.4.4.tar.gz
+"
diff --git a/main/py3-argparse/APKBUILD b/main/py3-argparse/APKBUILD
deleted file mode 100644
index 81e2aa16990..00000000000
--- a/main/py3-argparse/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: Francesco Colista <fcolista@alpinelinux.org>
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname=py3-argparse
-_pkgname=argparse
-pkgver=1.4.0
-pkgrel=5
-pkgdesc="Python3 command-line parsing library"
-url="https://pypi.python.org/pypi/argparse/"
-arch="noarch"
-license="MIT"
-depends="python3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-argparse" # Backwards compatibility
-provides="py-argparse=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	python3 setup.py check
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="9941f9d26c43169f947c9efadda6239349e1f9df80ff5fcdba3070bc7b43c43ab6bb4b7f0c7eee8e5d06231a17a7e9ee9eb73c7a9bb68ebe5d13f879686d61b2  argparse-1.4.0.tar.gz"
diff --git a/main/py3-asn1-modules/APKBUILD b/main/py3-asn1-modules/APKBUILD
deleted file mode 100644
index 215339dbdaa..00000000000
--- a/main/py3-asn1-modules/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=py3-asn1-modules
-_pkgname=pyasn1-modules
-pkgver=0.2.7
-pkgrel=1
-pkgdesc="A collection of ASN.1-based protocols modules"
-url="https://pypi.python.org/pypi/pyasn1-modules"
-arch="noarch"
-license="BSD-2-Clause"
-depends="py3-asn1<0.5.0"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-replaces="py-asn1-modules" # Backwards compatibility
-provides="py-asn1-modules=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	python3 setup.py test
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="5854cb2eebe7ef7eaae701fba8c8b847f84115c699037d9cd29ddbfb8f0142172031155404d34f004a454227659b8726631f0e3082c856f6311544148768655f  pyasn1-modules-0.2.7.tar.gz"
diff --git a/main/py3-asn1/APKBUILD b/main/py3-asn1/APKBUILD
deleted file mode 100644
index ad666c712be..00000000000
--- a/main/py3-asn1/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: Peter Bui <pnutzh4x0r@gmail.com>
-# Maintainer: Drew DeVault <sir@cmpwn.com>
-pkgname=py3-asn1
-_pkgname=pyasn1
-pkgver=0.4.7
-pkgrel=2
-pkgdesc="Python3 ASN1 library"
-url="http://snmplabs.com/pyasn1/"
-arch="noarch"
-license="BSD"
-depends="python3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-asn1" # Backwards compatibility
-provides="py-asn1=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	python3 setup.py test
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="b187bb500ad0af3d0c8f8ef249fd40d9a1d152a8755e9454f441febb3522245f5447f83a70294f33c0b3a537a214a4fec660b9baf80ebef5f6256bcaedeb8abd  pyasn1-0.4.7.tar.gz"
diff --git a/main/py3-asn1crypto/APKBUILD b/main/py3-asn1crypto/APKBUILD
deleted file mode 100644
index 8633f0d4367..00000000000
--- a/main/py3-asn1crypto/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: André Klitzing <aklitzing@gmail.com>
-# Maintainer: André Klitzing <aklitzing@gmail.com>
-pkgname=py3-asn1crypto
-_pkgname=asn1crypto
-pkgver=1.3.0
-pkgrel=0
-pkgdesc="Python3 ASN.1 library with a focus on performance and a pythonic API"
-url="https://github.com/wbond/asn1crypto"
-arch="noarch"
-license="MIT"
-depends="python3"
-makedepends="py3-setuptools"
-source="$_pkgname-$pkgver.tar.gz::https://github.com/wbond/asn1crypto/archive/$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-asn1crypto" # Backwards compatibility
-provides="py-asn1crypto=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 run.py tests
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="822eb3b7d2d73383f271d3c2c3eeff7353b3869cdec31166f0b6ce4751271843c41b136abbf5829ce9de82f8ec49121e8aac21ed84d795976706243dbc1200ea  asn1crypto-1.3.0.tar.gz"
diff --git a/main/py3-atomicwrites/APKBUILD b/main/py3-atomicwrites/APKBUILD
deleted file mode 100644
index ae40fc0bf83..00000000000
--- a/main/py3-atomicwrites/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Jakub Jirutka <jakub@jirutka.cz>
-# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
-pkgname=py3-atomicwrites
-_pkgname=python-atomicwrites
-pkgver=1.3.0
-pkgrel=2
-pkgdesc="Powerful Python3 library for atomic file writes"
-url="https://github.com/untitaker/python-atomicwrites"
-arch="noarch"
-license="MIT"
-depends="python3"
-makedepends="py3-setuptools"
-options="!check"  # requires pytest which depends on this aport (cyclic dep)
-source="https://github.com/untitaker/python-atomicwrites/archive/$pkgver/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-atomicwrites" # Backwards compatibility
-provides="py-atomicwrites=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="7a257286ba35d6f0db3772ef9666283f29c36719fe35eeb1cb9c36341f0f6a0d7c316d236927ef031f2b8ac6c245320481f51c59e0e1ccf2cbea49065a13d474  python-atomicwrites-1.3.0.tar.gz"
diff --git a/main/py3-attrs/APKBUILD b/main/py3-attrs/APKBUILD
deleted file mode 100644
index 22f6ac740d0..00000000000
--- a/main/py3-attrs/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
-# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
-pkgname=py3-attrs
-pkgver=19.3.0
-pkgrel=1
-pkgdesc="Python classes without boilerplate"
-url="http://www.attrs.org"
-arch="noarch"
-license="MIT"
-depends="python3"
-makedepends="py3-setuptools"
-source="py-attrs-$pkgver.tar.gz::https://github.com/python-attrs/attrs/archive/$pkgver.tar.gz
-	check.py
-	"
-builddir="$srcdir/attrs-$pkgver"
-
-replaces="py-attrs" # Backwards compatibility
-provides="py-attrs=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	PYTHONPATH="$builddir/src" python3 "$srcdir"/check.py
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-sha512sums="f050ff707cb95f0639b239435b65dacc164a540b5a456d27be5f47615ee7a860ae38096cd16769b0d07fe8e5e952ccaa5af0eb0aafb5166421f9eb3edf248425  py-attrs-19.3.0.tar.gz
-36bcb4ec145f29e79fc019dc39672f13dc94e1c07225968af51f19e17b2aede0b23dafdff265f1e77a251e53af9802bcf1db5068900ee0a03e1bfc1051c01ef9  check.py"
diff --git a/main/py3-attrs/check.py b/main/py3-attrs/check.py
deleted file mode 100644
index 08af9829fb7..00000000000
--- a/main/py3-attrs/check.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import attr
-
-@attr.s
-class SomeClass(object):
-    a_number = attr.ib(default=42)
-    list_of_numbers = attr.ib(default=attr.Factory(list))
-
-a = SomeClass()
-assert a.a_number == 42
-assert isinstance(a.list_of_numbers, list)
diff --git a/main/py3-babel/APKBUILD b/main/py3-babel/APKBUILD
index 6a0ff2388e2..ab015d2fa9f 100644
--- a/main/py3-babel/APKBUILD
+++ b/main/py3-babel/APKBUILD
@@ -1,27 +1,45 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
 pkgname=py3-babel
 _pkgname=Babel
-pkgver=2.8.0
-pkgrel=0
+pkgver=2.14.0
+pkgrel=2
 pkgdesc="Python3 i18n tool"
-url="http://babel.pocoo.org/"
+url="https://babel.pocoo.org/"
 arch="noarch"
 license="BSD-3-Clause"
-depends="python3 py3-tz"
-makedepends="py3-setuptools"
+depends="py3-tz py3-setuptools"
+makedepends="py3-gpep517 py3-wheel"
+checkdepends="py3-pytest py3-pytest-freezegun"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
+options="!check" # freezegun not in main
 
 replaces="py-babel" # Backwards compatibility
 provides="py-babel=$pkgver-r$pkgrel" # Backwards compatibility
 
+# secfixes:
+#   2.9.1-r0:
+#     - CVE-2021-42771
+
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="f9687b36176c146a8ace073197111463d24fca343bb1dbee8b0e37a7f37b68b4cd77ffbe3bf14a20f8f64c701aa860e0b5e6076658a95dbee2556f0688d68d91  Babel-2.8.0.tar.gz"
+sha512sums="
+cfcd93bc5e57e3d23b8fb67f77fdeeb08183cc5ef9a6e044085a090cec3d722cf658e740c639f5a834df11a4cff0dacafdbba435184d77a78d56fc0bb6b62fd2  Babel-2.14.0.tar.gz
+"
diff --git a/main/py3-bcrypt/APKBUILD b/main/py3-bcrypt/APKBUILD
deleted file mode 100644
index 43360fd6dcb..00000000000
--- a/main/py3-bcrypt/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Francesco Colista <fcolista@alpinelinux.org>
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname=py3-bcrypt
-_pkgname=bcrypt
-pkgver=3.1.7
-pkgrel=2
-pkgdesc="Modern password hashing for your software and your servers"
-url="https://github.com/pyca/bcrypt"
-arch="all"
-license="Apache-2.0"
-makedepends="python3-dev py3-setuptools py3-wheel libffi-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/pyca/$_pkgname/archive/$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-bcrypt" # Backwards compatibility
-provides="py-bcrypt=$pkgver-r$pkgrel" # Backwards compatibility
-
-check() {
-	cd "$builddir"
-	python3 setup.py check
-}
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="bfe487ac43aa5081a16c7f67787c2aec777a9c42f3f0f64d4dd238e6cf135e248e806a675ecdc5240066e2b5a31773f9c5dd939479e96ec25357e27bced01409  py3-bcrypt-3.1.7.tar.gz"
diff --git a/main/py3-boto/APKBUILD b/main/py3-boto/APKBUILD
deleted file mode 100644
index 46b3a8298a4..00000000000
--- a/main/py3-boto/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Contributor: Matt Smith <mcs@darkregion.net>
-# Maintainer: Matt Smith <mcs@darkregion.net>
-pkgname=py3-boto
-_pkgname=boto
-pkgver=2.49.0
-pkgrel=2
-pkgdesc="An interface to infrastructural services offered by Amazon Web Services"
-url="http://docs.pythonboto.org/en/latest/index.html"
-arch="noarch"
-license="MIT"
-depends="python3"
-makedepends="py3-setuptools"
-subpackages="$pkgname-doc"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-replaces="py-boto" # Backwards compatibility
-provides="py-boto=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --root "$pkgdir"
-}
-
-doc() {
-	cd "$builddir"
-
-	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname
-	install -Dm644 README.rst "$subpkgdir"/usr/share/doc/$pkgname/README
-
-	# Note: The documentation in the 'docs' directory can only be generated
-	# (via sphinx-build from the py-sphinx package) once this package has
-	# been installed.  Copying it off for the user.
-	mkdir -p "$subpkgdir"/usr/share/doc/$pkgname/docs
-	cp -R ./docs/* "$subpkgdir"/usr/share/doc/$pkgname/docs/
-	chmod -R 644 "$subpkgdir"/usr/share/doc/$pkgname/docs/
-
-	# Fix subdir perms
-	find "$subpkgdir"/usr/share/doc/$pkgname/ -type d -exec chmod 755 '{}' \;
-}
-
-sha512sums="2175cf30cd25bbc05812e83e5ade7668c3e21b1bb09aa1b43f0f0ac7d6967a646394fb52c9be673ebb65618c5b33a52d6f31f6da702f5cd1d6c9a18169476dd4  boto-2.49.0.tar.gz"
diff --git a/main/py3-cairo/APKBUILD b/main/py3-cairo/APKBUILD
index 49098c95dd0..ea3c52c61e6 100644
--- a/main/py3-cairo/APKBUILD
+++ b/main/py3-cairo/APKBUILD
@@ -1,30 +1,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py3-cairo
-pkgver=1.19.1
-pkgrel=0
+pkgver=1.26.0
+pkgrel=1
 pkgdesc="Python3 bindings for the cairo graphics library"
 url="http://cairographics.org/pycairo/"
 arch="all"
 license="LGPL-2.0-or-later"
-makedepends="python3-dev cairo-dev"
-subpackages="$pkgname-dev"
-source="https://github.com/pygobject/pycairo/releases/download/v$pkgver/pycairo-$pkgver.tar.gz
-	"
+makedepends="python3-dev cairo-dev meson"
+checkdepends="py3-pytest"
+subpackages="$pkgname-pyc $pkgname-dev"
+source="https://github.com/pygobject/pycairo/releases/download/v$pkgver/pycairo-$pkgver.tar.gz"
 builddir="$srcdir"/pycairo-$pkgver
 
 replaces="py-cairo" # Backwards compatibility
 provides="py-cairo=$pkgver-r$pkgrel" # Backwards compatibility
 
 build() {
-	python3 setup.py build
+	abuild-meson \
+		-Db_lto=true \
+		-Dtests="$(want_check && echo true || echo false)" \
+		. output
+	meson compile -C output
 }
 
 check() {
-	python3 setup.py check
+	meson test --print-errorlogs --no-rebuild -C output
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+	python3 -m compileall "$pkgdir"/usr/lib
 }
 
-sha512sums="a7955a2566d5e5586154b62f3aeef824e1e6076cbd3eb86af8288fedcc7d61c4e36a53691298cf9df2e2df7fc96292f96dec92c5d4343e6c1b4c971e97d0650f  pycairo-1.19.1.tar.gz"
+sha512sums="
+5313f0d408a6e6ce6e70ac92291be5dd8651e01fbf9411d0467061afa21849cde27db273f2a13b4c3c931183f63f75f31fc0f0d3283b8f339ba88e71eab432f1  pycairo-1.26.0.tar.gz
+"
diff --git a/main/py3-calver/APKBUILD b/main/py3-calver/APKBUILD
new file mode 100644
index 00000000000..05b16e16d86
--- /dev/null
+++ b/main/py3-calver/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: Michał Polański <michal@polanski.me>
+# Maintainer: Michał Polański <michal@polanski.me>
+pkgname=py3-calver
+pkgver=2022.06.26
+pkgrel=3
+pkgdesc="Setuptools extension for CalVer package versions"
+url="https://github.com/di/calver"
+license="Apache-2.0"
+arch="noarch"
+depends="python3"
+makedepends="py3-gpep517 py3-installer py3-setuptools py3-wheel"
+checkdepends="py3-pretend"
+subpackages="$pkgname-pyc"
+source="https://github.com/di/calver/archive/$pkgver/py3-calver-$pkgver.tar.gz
+	version-placeholder.patch"
+builddir="$srcdir/calver-$pkgver"
+options="!check" #pytest circular dep
+
+prepare() {
+	default_prepare
+
+	# set module version
+	sed "s/@VERSION@/$pkgver/" -i setup.py
+}
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	PYTHONPATH=build/lib pytest
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
+}
+
+sha512sums="
+4d436cead8930cae1a71eddef9f0ecd2881f8cb632c3814dc75390b061a909e7ca969a604a5fded1c66647947856d540e2180bd3ce4bed5087b4dbc9d5edb393  py3-calver-2022.06.26.tar.gz
+32920f16e7efd7a463b1ff2fc584d348a92e33ea4ced27678fb8740c72de722da23ceab83dc9855d31e86fd7f617a92eb6ebbac351fa9596c0f2e9f401bd6ada  version-placeholder.patch
+"
diff --git a/main/py3-calver/version-placeholder.patch b/main/py3-calver/version-placeholder.patch
new file mode 100644
index 00000000000..0e5d9c987d7
--- /dev/null
+++ b/main/py3-calver/version-placeholder.patch
@@ -0,0 +1,11 @@
+Prepare placeholder for setting the module version
+
+--- a/setup.py
++++ b/setup.py
+@@ -42,5 +42,5 @@ setup(
+             "use_calver = calver.integration:version",
+         ],
+     },
+-    version=calver_version(True),
++    version="@VERSION@",
+ )
diff --git a/main/py3-certifi/APKBUILD b/main/py3-certifi/APKBUILD
index 24319ffbe81..cc1323a522d 100644
--- a/main/py3-certifi/APKBUILD
+++ b/main/py3-certifi/APKBUILD
@@ -1,31 +1,39 @@
 # Contributor: Peter Bui <pnutzh4x0r@gmail.com>
 # Maintainer: Dmitry Romanenko <dmitry@romanenko.in>
 pkgname=py3-certifi
-_pkgname=certifi
-pkgver=2019.11.28
-pkgrel=0
+pkgver=2024.2.2
+pkgrel=1
 pkgdesc="Python3 package for providing Mozilla's CA Bundle"
-url="https://pypi.python.org/pypi/certifi"
+url="https://pypi.org/project/certifi"
 arch="noarch"
 license="MPL-2.0"
-depends="python3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+depends="ca-certificates-bundle"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/c/certifi/certifi-$pkgver.tar.gz
+	use-alpine-system-certs.patch
+	"
+builddir="$srcdir/certifi-$pkgver"
+options="!check" # no tests
 
 replaces="py-certifi" # Backwards compatibility
 provides="py-certifi=$pkgver-r$pkgrel" # Backwards compatibility
 
-check() {
-	python3 setup.py check
-}
-
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
+
+	# Remove bundled certificates, we use system certificates
+	rm -f "$pkgdir"/usr/lib/python3*/site-packages/certifi/cacert.pem
 }
 
-sha512sums="6821444f02db0d9d03ab1891731178af1d7858df3c729f079147a9c588cf97a456e050da3421a0d2a3559145610826669034a8d46cd50b7c76e90249db1b09ad  certifi-2019.11.28.tar.gz"
+sha512sums="
+2191710dc2cfdf781df498c3ecd5f38dfc5215e2c2dc402cdcd484376dbd7fe2e442793cc856e93f6033c1fc43cb77c71d2dc785dbfe0d8cd10fd3120ee3c2fd  certifi-2024.2.2.tar.gz
+1002ff4648c79ced36c27dde110415091685d0a73f346068b38f0110a3439ce01a5db94121a709bda4b91c1a6d1d760c69f7e304aec27690cfe28ca5be725796  use-alpine-system-certs.patch
+"
diff --git a/main/py3-certifi/use-alpine-system-certs.patch b/main/py3-certifi/use-alpine-system-certs.patch
new file mode 100644
index 00000000000..586af64e5cc
--- /dev/null
+++ b/main/py3-certifi/use-alpine-system-certs.patch
@@ -0,0 +1,66 @@
+NEVER EVER REMOVE THIS PATCH
+REBASE IT ON TOP OF THE VERSION YOU'RE UPGRADING
+
+This makes py3-certifi use the system certificates provided by Alpine Linux
+instead of the ones provided with py3-certifi instead, this allows us to add
+this package as a dependency for other packages without worries.
+
+This is based on the patch used by Debian
+
+diff --git a/certifi/core.py b/certifi/core.py
+index de02898..9c0235f 100644
+--- a/certifi/core.py
++++ b/certifi/core.py
+@@ -6,13 +6,13 @@ This module returns the installation location of cacert.pem or its contents.
+ """
+ import sys
+ 
++ALPINE_CA_CERTS_PATH = '/etc/ssl/certs/ca-certificates.crt'
+ 
+ if sys.version_info >= (3, 11):
+ 
+     from importlib.resources import as_file, files
+ 
+-    _CACERT_CTX = None
+-    _CACERT_PATH = None
++    _CACERT_PATH = ALPINE_CA_CERTS_PATH
+ 
+     def where() -> str:
+         # This is slightly terrible, but we want to delay extracting the file
+@@ -45,8 +45,7 @@ elif sys.version_info >= (3, 7):
+ 
+     from importlib.resources import path as get_path, read_text
+ 
+-    _CACERT_CTX = None
+-    _CACERT_PATH = None
++    _CACERT_PATH = ALPINE_CA_CERTS_PATH
+ 
+     def where() -> str:
+         # This is slightly terrible, but we want to delay extracting the
+@@ -71,10 +70,11 @@ elif sys.version_info >= (3, 7):
+             _CACERT_CTX = get_path("certifi", "cacert.pem")
+             _CACERT_PATH = str(_CACERT_CTX.__enter__())
+ 
+-        return _CACERT_PATH
++        return ALPINE_CA_CERTS_PATH
+ 
+     def contents() -> str:
+-        return read_text("certifi", "cacert.pem", encoding="ascii")
++        with open(where(), "r", encoding="ascii") as data:
++            return data.read()
+ 
+ else:
+     import os
+@@ -100,9 +100,7 @@ else:
+     # If we don't have importlib.resources, then we will just do the old logic
+     # of assuming we're on the filesystem and munge the path directly.
+     def where() -> str:
+-        f = os.path.dirname(__file__)
+-
+-        return os.path.join(f, "cacert.pem")
+-
++        return ALPINE_CA_CERTS_PATH
+     def contents() -> str:
+-        return read_text("certifi", "cacert.pem", encoding="ascii")
++        with open(where(), "r", encoding="ascii") as data:
++            return data.read()
diff --git a/main/py3-cffi/APKBUILD b/main/py3-cffi/APKBUILD
index ecabf6a6576..01e4692e1b0 100644
--- a/main/py3-cffi/APKBUILD
+++ b/main/py3-cffi/APKBUILD
@@ -1,39 +1,52 @@
 # Contributor:
-# Maintainer:
+# Maintainer: Peter Shkenev <santurysim@gmail.com>
 pkgname=py3-cffi
 _pkgname=cffi
-pkgver=1.14.0
-pkgrel=0
-pkgdesc="A foreign function interface for calling C code from Python3"
+pkgver=1.16.0
+pkgrel=1
+pkgdesc="Foreign function interface for calling C code from Python3"
 url="http://cffi.readthedocs.org/"
 arch="all"
 license="MIT"
 depends="py3-cparser"
-makedepends="python3-dev py3-setuptools libffi-dev"
+makedepends="
+	libffi-dev
+	python3-dev
+	py3-gpep517
+	py3-setuptools
+	py3-wheel
+	"
 checkdepends="py3-pytest"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
-	musl-compat.patch"
+	fix-setuptools-deprecation.patch
+	"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 replaces="py-cffi" # Backwards compatibility
 provides="py-cffi=$pkgver-r$pkgrel" # Backwards compatibility
 
-case "$CARCH" in
-	ppc64le|x86|aarch64) options="!check" # test failures
-esac
-
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 setup.py build_ext -i
-	python3 -m pytest --disable-pytest-warnings c/ testing/ || true
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+
+	PYTHONPATH="$(echo "$builddir"/build/lib.linux-*)" \
+	.testenv/bin/python3 -m pytest \
+		--disable-pytest-warnings testing/
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="4c5451eeede1d48a8f4b40e25b845ad1863b8bf3bd39624e6c693c2800d89a13efedc4c43b37e317a035613bffc2e3fd5f7e583c46cb283cb5cb930356f86253  cffi-1.14.0.tar.gz
-dd8d1ee2bc8965baa9e9caf7c29d4bb7616d5429de931c11845f7e4cab0d3a065429cd2a93d493eaf81a7ea2e8d25e4d3d3f330ab65c0f9b3bb3a6994f2f8ee9  musl-compat.patch"
+sha512sums="
+fd2588115092202aa9289c9d4e0a0b3e264b5e9ec1dc192950f31aeb412fd9f9d4e5c96a3f9c6762987b58ccc1e229f2012ddda89211797104df672d8ed51152  cffi-1.16.0.tar.gz
+cf6fd617176abb034d2f781712ffecff440202b6d21868a02857e9a47748c76b0cf5712907d45fc05b745a18e9b5dd603b32771912d3bd2bd594421a7f607297  fix-setuptools-deprecation.patch
+"
diff --git a/main/py3-cffi/fix-setuptools-deprecation.patch b/main/py3-cffi/fix-setuptools-deprecation.patch
new file mode 100644
index 00000000000..b52590d29d5
--- /dev/null
+++ b/main/py3-cffi/fix-setuptools-deprecation.patch
@@ -0,0 +1,8 @@
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,5 +1,4 @@
+ [metadata]
+-license_file = LICENSE
+ license_files = LICENSE
+ project_urls = 
+ 	Documentation = http://cffi.readthedocs.org/
diff --git a/main/py3-cffi/musl-compat.patch b/main/py3-cffi/musl-compat.patch
deleted file mode 100644
index 1145250a1b7..00000000000
--- a/main/py3-cffi/musl-compat.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/c/test_c.py
-+++ b/c/test_c.py
-@@ -86,7 +86,6 @@
-     if sys.platform.startswith("linux"):
-         RTLD_NODELETE
-         RTLD_NOLOAD
--        RTLD_DEEPBIND
- 
- def test_new_primitive_type():
-     py.test.raises(KeyError, new_primitive_type, "foo")
-@@ -1237,8 +1236,7 @@
- def test_write_variable():
-     ## FIXME: this test assumes glibc specific behavior, it's not compliant with C standard
-     ## https://bugs.pypy.org/issue1643
--    if not sys.platform.startswith("linux"):
--        py.test.skip("untested")
-+    py.test.skip("'stderr' is read-only in musl")
-     BVoidP = new_pointer_type(new_void_type())
-     ll = find_and_load_library('c')
-     stderr = ll.read_variable(BVoidP, "stderr")
---- a/testing/cffi0/test_function.py
-+++ b/testing/cffi0/test_function.py
-@@ -166,7 +166,7 @@
-                        b"hello, world!\n"
-                        b"hello, world2!\n"
-                        b"hello int 42 long 84 long long 168\n"
--                       b"hello (nil)\n")
-+                       b"hello 0\n")
- 
-     def test_must_specify_type_of_vararg(self):
-         ffi = FFI(backend=self.Backend())
-@@ -249,8 +249,7 @@
-         assert res == 5
- 
-     def test_write_variable(self):
--        if not sys.platform.startswith('linux'):
--            py.test.skip("probably no symbol 'stdout' in the lib")
-+        py.test.skip("'stdout' is read-only in musl")
-         ffi = FFI(backend=self.Backend())
-         ffi.cdef("""
-             void *stdout;
---- a/testing/cffi0/test_verify.py
-+++ b/testing/cffi0/test_verify.py
-@@ -1612,8 +1612,7 @@
-     assert func() == 42
- 
- def test_FILE_stored_in_stdout():
--    if not sys.platform.startswith('linux'):
--        py.test.skip("likely, we cannot assign to stdout")
-+    py.test.skip("'stdout' is read-only in musl")
-     ffi = FFI()
-     ffi.cdef("int printf(const char *, ...); FILE *setstdout(FILE *);")
-     lib = ffi.verify("""
---- a/testing/cffi1/test_verify1.py
-+++ b/testing/cffi1/test_verify1.py
-@@ -1576,8 +1576,7 @@
-     assert func() == 42
- 
- def test_FILE_stored_in_stdout():
--    if not sys.platform.startswith('linux'):
--        py.test.skip("likely, we cannot assign to stdout")
-+    py.test.skip("'stdout' is read-only in musl")
-     ffi = FFI()
-     ffi.cdef("int printf(const char *, ...); FILE *setstdout(FILE *);")
-     lib = ffi.verify("""
diff --git a/main/py3-chardet/APKBUILD b/main/py3-chardet/APKBUILD
index 134e9ac730a..f2d19947898 100644
--- a/main/py3-chardet/APKBUILD
+++ b/main/py3-chardet/APKBUILD
@@ -2,32 +2,39 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 _pkgname=chardet
 pkgname=py3-$_pkgname
-pkgver=3.0.4
-pkgrel=3
+pkgver=5.2.0
+pkgrel=1
 pkgdesc="The Universal Character Encoding Detector"
-options="!check" # Requires 'hypothesis'
 url="https://github.com/chardet/chardet/"
 arch="noarch"
 license="LGPL-2.1-or-later"
 depends="python3"
-makedepends="py3-setuptools"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
 checkdepends="py3-pytest"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+subpackages="$pkgname-pyc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/chardet/chardet/archive/refs/tags/$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 replaces="py-chardet" # Backwards compatibility
 provides="py-chardet=$pkgver-r$pkgrel" # Backwards compatibility
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 setup.py test
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="61a03b23447a2bfe52ceed4dd1b9afdb5784da1933a623776883ee9f297e341f633e27f0ce0230bd5fdc5fdb5382105ab42736a74a417ddeb9f83af57455dba5  chardet-3.0.4.tar.gz"
+sha512sums="
+3c6614882b251e53322eb75fdd01c3d7664c5f611bbfc1480fa10d57f02906b4be42a8b7ff4d3bdc00465340a2ca46b31f1f0d25f64d4f69df0ac0876e71e87f  py3-chardet-5.2.0.tar.gz
+"
diff --git a/main/py3-charset-normalizer/APKBUILD b/main/py3-charset-normalizer/APKBUILD
new file mode 100644
index 00000000000..34814ed43f7
--- /dev/null
+++ b/main/py3-charset-normalizer/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Andy Postnikov <apostnikov@gmail.com>
+pkgname=py3-charset-normalizer
+pkgver=3.3.2
+pkgrel=1
+pkgdesc="offers you an alternative to Universal Charset Encoding Detector, also known as Chardet"
+url="https://github.com/ousret/charset_normalizer"
+arch="noarch"
+license="MIT"
+depends="python3"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="py3-pytest"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/c/charset-normalizer/charset-normalizer-$pkgver.tar.gz"
+builddir="$srcdir/charset-normalizer-$pkgver"
+
+prepare() {
+	default_prepare
+
+	# community/py3-pytest-cov not available
+	sed -i '/cov-report/d' setup.cfg
+}
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
+}
+
+sha512sums="
+227dd9496e080310b3262fe0ffc32b5ebed16e5b3a294877555c0b04dee0cb073a2a0a4fa8dbad3029703ffaf1857acf24d9b87ca74d75fa2f0ba8fd3413e9c4  charset-normalizer-3.3.2.tar.gz
+"
diff --git a/main/py3-click/APKBUILD b/main/py3-click/APKBUILD
deleted file mode 100644
index 137a51e0a61..00000000000
--- a/main/py3-click/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=py3-click
-pkgver=7.1.1
-pkgrel=0
-pkgdesc="Simple wrapper around optparse for powerful command line utilities"
-url="https://click.palletsprojects.com"
-arch="noarch"
-license="BSD-3-Clause"
-depends="python3"
-makedepends="py3-setuptools"
-checkdepends="py3-pytest"
-source="https://files.pythonhosted.org/packages/source/c/click/click-$pkgver.tar.gz"
-builddir="$srcdir/click-$pkgver"
-
-replaces="py-click" # Backwards compatibility
-provides="py-click=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	PYTHONPATH="$PWD"/build/lib pytest -v tests
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="421450e4a3c9baa562ae9f3af602cefe70dfd7273aaa5ea47c7feb4d38b03e5b28c13d5e63a6fc5e7bfc89c9997a60836e79c51397509970726d2b832ced68e6  click-7.1.1.tar.gz"
diff --git a/main/py3-constantly/APKBUILD b/main/py3-constantly/APKBUILD
deleted file mode 100644
index 00e35e30238..00000000000
--- a/main/py3-constantly/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: prspkt <prspkt@protonmail.com>
-# Maintainer: prspkt <prspkt@protonmail.com>
-pkgname=py3-constantly
-_pkgname=constantly
-pkgver=15.1.0
-pkgrel=3
-pkgdesc="Library that provides symbolic constant support"
-url="https://github.com/twisted/constantly"
-arch="noarch"
-license="MIT"
-depends="python3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-constantly" # Backwards compatibility
-provides="py-constantly=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="ccc6f41b0bd552d2bb5346cc9d64cd7b91a59dd30e0cf66b01e82f7e0e079c01c34bc6c66b69c5fee9d2eed35ae5455258d309e66278d708d5f576ddf2e00ac3  constantly-15.1.0.tar.gz"
diff --git a/main/py3-coverage/APKBUILD b/main/py3-coverage/APKBUILD
new file mode 100644
index 00000000000..b422281517a
--- /dev/null
+++ b/main/py3-coverage/APKBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Valery Kartel <valery.kartel@gmail.com>
+# Contributor: Valery Kartel <valery.kartel@gmail.com>
+pkgname=py3-coverage
+pkgver=6.5.0
+pkgrel=6
+pkgdesc="Code coverage measurement for Python"
+options="!check" # Requires 'xdist'
+url="https://pypi.org/project/coverage"
+arch="all"
+license="Apache-2.0"
+makedepends="python3-dev py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="py3-pytest"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/c/coverage/coverage-$pkgver.tar.gz"
+builddir="$srcdir/coverage-$pkgver"
+
+replaces="py-coverage" # Backwards compatibility
+provides="py-coverage=$pkgver-r$pkgrel" # Backwards compatibility
+
+build() {
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" .dist/*.whl
+}
+
+sha512sums="
+4f2ec0bf69a83471a2b5a73b6a2212372ee6e32ccc4c72e0d33eef915939152f3213ab60e1a22ce2b72791e706c2223b0c81c87b95bbfadd1e828fa1a9fff120  coverage-6.5.0.tar.gz
+"
diff --git a/main/py3-cparser/APKBUILD b/main/py3-cparser/APKBUILD
index eb4becab7b2..2e3525542f3 100644
--- a/main/py3-cparser/APKBUILD
+++ b/main/py3-cparser/APKBUILD
@@ -1,15 +1,17 @@
 # Contributor:
-# Maintainer:
+# Maintainer: Peter Shkenev <santurysim@gmail.com>
 pkgname=py3-cparser
 _pkgname=pycparser
-pkgver=2.20
-pkgrel=0
+pkgver=2.22
+pkgrel=1
 pkgdesc="C parser written in Python3"
 url="https://github.com/eliben/pycparser"
 arch="noarch"
 license="BSD-3-Clause"
 depends="python3"
-makedepends="py3-setuptools"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="py3-pytest"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
@@ -17,15 +19,22 @@ replaces="py-cparser" # Backwards compatibility
 provides="py-cparser=$pkgver-r$pkgrel" # Backwards compatibility
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 tests/all_tests.py
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="ff0853c9f981b43b4f2e879350715c07b02cf9dab223d4980d8fe0a3138c98041b5f848a9355ae4f1cb45e7f137c03a88843008e18d77af9250e0d9c55f5ca1b  pycparser-2.20.tar.gz"
+sha512sums="
+c9a81c78d87162f71281a32a076b279f4f7f2e17253fe14c89c6db5f9b3554a6563ff700c385549a8b51ef8832f99f7bb4ac07f22754c7c475dd91feeb0cf87f  pycparser-2.22.tar.gz
+"
diff --git a/main/py3-cryptography/APKBUILD b/main/py3-cryptography/APKBUILD
deleted file mode 100644
index 67d5daaa250..00000000000
--- a/main/py3-cryptography/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: August Klein <amatcoder@gmail.com>
-# Maintainer: August Klein <amatcoder@gmail.com>
-pkgname=py3-cryptography
-_pkgname=cryptography
-pkgver=2.8
-pkgrel=1
-pkgdesc="A package which provides cryptographic recipes and primitives"
-url="https://pypi.python.org/pypi/cryptography"
-arch="all"
-license="Apache-2.0 OR BSD-3-Clause"
-depends="python3 py3-cffi py3-idna py3-asn1crypto py3-six"
-makedepends="python3-dev py3-setuptools libffi-dev openssl-dev"
-source="
-	https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
-"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-cryptography" # Backwards compatibility
-provides="py-cryptography=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	python3 setup.py check
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="bf3ca44123c693b0602be19445925f9efebd46c469909e47b7907d57141fb6bd99268c33e1fe3f42a08ab8b4edd4f98f21b6a682f530352313334dfd31ba91e7  cryptography-2.8.tar.gz"
diff --git a/main/py3-curl/APKBUILD b/main/py3-curl/APKBUILD
deleted file mode 100644
index f11b6387236..00000000000
--- a/main/py3-curl/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=py3-curl
-_pkgname=pycurl
-pkgver=7.43.0.5
-pkgrel=0
-pkgdesc="Python3 interface to libcurl"
-url="http://pycurl.io/"
-arch="all"
-license="LGPL-2.0-or-later MIT"
-makedepends="curl-dev openssl-dev python3-dev py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-curl" # Backwards compatibility
-provides="py-curl=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	export PYCURL_SSL_LIBRARY=openssl
-	python3 setup.py build
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-	rm -Rf "$pkgdir"/usr/share  # remove docs
-}
-
-sha512sums="835ed6cca25d2dd3e7084f905f3b0b082d4af04761fa9d4dc4714865863a97c095c08e6f55ada91b9f60ccad7838328a82fb2add8108aea12056200cf1f12845  pycurl-7.43.0.5.tar.gz"
diff --git a/main/py3-dateutil/APKBUILD b/main/py3-dateutil/APKBUILD
deleted file mode 100644
index f439dfbb3d6..00000000000
--- a/main/py3-dateutil/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor:
-# Maintainer:
-pkgname=py3-dateutil
-_pkgname=python-dateutil
-pkgver=2.8.1
-pkgrel=0
-pkgdesc="Python3 extensions for datetime module"
-url="https://dateutil.readthedocs.io"
-arch="noarch"
-license="Apache-2.0 AND BSD-3-Clause"
-depends="python3 py3-six"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-dateutil" # Backwards compatibility
-provides="py-dateutil=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="337000216e0f8ce32d6363768444144183ab9268f69082f20858f2b3322b1c449e53b2f2b5dcb3645be22294659ce7838f74ace2fd7a7c4f2adc6cf806a9fa2c  python-dateutil-2.8.1.tar.gz"
diff --git a/main/py3-dbus/APKBUILD b/main/py3-dbus/APKBUILD
index da8eed10ef6..6a744492b60 100644
--- a/main/py3-dbus/APKBUILD
+++ b/main/py3-dbus/APKBUILD
@@ -2,43 +2,39 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py3-dbus
 _pkgname=dbus-python
-pkgver=1.2.16
-pkgrel=2
+pkgver=1.3.2
+pkgrel=5
 pkgdesc="Python3 bindings for DBUS"
-url="http://www.freedesktop.org/wiki/Software/DBusBindings"
+url="https://www.freedesktop.org/wiki/Software/DBusBindings"
 arch="all"
 license="MIT"
 depends="python3"
 depends_dev="py3-dbus"
-makedepends="dbus-glib-dev python3-dev py3-sphinx"
+makedepends="dbus-glib-dev python3-dev meson"
 checkdepends="bash dbus py3-gobject3 py3-tappy"
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-dev"
 source="https://dbus.freedesktop.org/releases/dbus-python/$_pkgname-$pkgver.tar.gz"
-
 builddir="$srcdir/$_pkgname-$pkgver"
 
-replaces="py-dbus" # Backwards compatibility
-provides="py-dbus=$pkgver-r$pkgrel" # Backwards compatibility
-
-
 build() {
-	python3 setup.py build
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--enable-documentation \
-		PYTHON_VERSION=3
-	make
+	abuild-meson \
+		-Dtests="$(want_check && echo true || echo false)" \
+		. output
+	meson compile -C output
 }
 
 check() {
-	make check
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	python3 setup.py install --skip-build --prefix=/usr --root="$pkgdir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+
+	local pyminor="$(python3 -c 'import sys; print("%i" % sys.version_info.minor)')"
+
+	mv dbus_python.egg-info/ "$pkgdir"/usr/lib/python3.$pyminor/site-packages/dbus_python-$pkgver-py3.$pyminor.egg-info/
 }
 
-sha512sums="e76c00c5fd3fe6884e4c24f258987fd3b80d21bd4e0f96aa8fda152078a860b62321324f6efcbfe7226d5ab2521a14b5bda7cf2468d2cae5f376c124a71aa05c  dbus-python-1.2.16.tar.gz"
+sha512sums="
+9b2885c9c2914142c72487f766b1cdd28a255d9f5a87eaf8f4eb420c6e096a77f210ac5a4fac9843c6531974872880cc28b7e45940e198856e984dcc0715519a  dbus-python-1.3.2.tar.gz
+"
diff --git a/main/py3-distlib/10-remove-funky-test.patch b/main/py3-distlib/10-remove-funky-test.patch
new file mode 100644
index 00000000000..34b3a098dd8
--- /dev/null
+++ b/main/py3-distlib/10-remove-funky-test.patch
@@ -0,0 +1,11 @@
+--- distlib-0.3.7.orig/tests/test_util.py
++++ distlib-0.3.7/tests/test_util.py
+@@ -717,8 +717,6 @@
+         os.makedirs(path)
+         path = os.path.join(path, 'test')
+         self.assertTrue(self.fileop.is_writable(path))
+-        if os.name == 'posix':
+-            self.assertFalse(self.fileop.is_writable('/etc'))
+ 
+     def test_byte_compile(self):
+         path = os.path.join(self.workdir, 'hello.py')
diff --git a/main/py3-distlib/APKBUILD b/main/py3-distlib/APKBUILD
new file mode 100644
index 00000000000..69fdf1238cc
--- /dev/null
+++ b/main/py3-distlib/APKBUILD
@@ -0,0 +1,38 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Peter Shkenev <santurysim@gmail.com>
+pkgname=py3-distlib
+pkgver=0.3.8
+pkgrel=1
+pkgdesc="Distribution utilities"
+url="https://github.com/pypa/distlib"
+arch="noarch"
+license="PSF-2.0"
+depends="python3"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+subpackages="$pkgname-pyc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/pypa/distlib/archive/refs/tags/$pkgver.tar.gz
+	10-remove-funky-test.patch
+	"
+builddir="$srcdir/distlib-$pkgver"
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	PYTHONHASHSEED=0 python3 -m unittest discover tests
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/distlib*.whl
+
+	rm "$pkgdir"/usr/lib/python3*/site-packages/distlib/*.exe
+}
+
+sha512sums="
+98dc6459f54783598aad8ee3b8d80c0092a5d08d4272ad212faeef5e30cf9029b718231681f39d26e48588bb676bae7919f1431ddb51eb3917725f99a5c90457  py3-distlib-0.3.8.tar.gz
+c77d21ec087abe6dbd80bcfc20f3b26d881ff7f42e2ba37185fe6315934afda5be23eed7cc522ecf01d696ba031ed83a2a43e87cd7be6ee7a7963eaa95afebe7  10-remove-funky-test.patch
+"
diff --git a/main/py3-django-contact-form/APKBUILD b/main/py3-django-contact-form/APKBUILD
deleted file mode 100644
index f0a65460765..00000000000
--- a/main/py3-django-contact-form/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-pkgname=py3-django-contact-form
-pkgver=1.7
-pkgrel=0
-pkgdesc="Generic contact-form application for Django"
-url=https://bitbucket.org/ubernostrum/django-contact-form/
-arch=noarch
-license=BSD
-depends=py3-django
-makedepends=py3-setuptools
-replaces=py-django-contact-form
-source="https://files.pythonhosted.org/packages/source/d/django-contact-form/django-contact-form-$pkgver.tar.gz"
-
-_builddir=$srcdir/django-contact-form-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$_builddir"
-	python3 setup.py install --root "$pkgdir"
-}
-
-sha512sums="cb0281833e1a20cee0fe68d41698eb40312d345e380ec5ed352d83ddaea9d0018a41a4ebb00a39b1756c667dffcff4beb2cd36686369f1f6bf03f71e64265e28  django-contact-form-1.7.tar.gz"
diff --git a/main/py3-django-djblets/APKBUILD b/main/py3-django-djblets/APKBUILD
deleted file mode 100644
index f6140b2a1f2..00000000000
--- a/main/py3-django-djblets/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: <xmingske@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_pkgname=django-djblets
-pkgname=py3-$_pkgname
-pkgver=0.6.31
-pkgrel=0
-pkgdesc="set of utilty classes and functions for web applications written using Django"
-url="https://github.com/djblets/djblets/"
-arch="noarch"
-license="MIT"
-depends="python3 py3-django-pipeline"
-makedepends="py3-setuptools"
-source="$pkgname-$pkgver.tar.gz::https://github.com/djblets/djblets/archive/release-$pkgver.tar.gz"
-
-builddir="$srcdir/djblets-release-$pkgver"
-
-build() {
-	python3 setup.py build
-}
-
-package() {
-	export PIPELINE_JS_COMPRESSOR='pipeline.compressors.jsmin.JSMinCompressor'
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="8874070fca77fce8a823ce0155ca0314758c7a6d7dd423a30aea5b23990bcec3675a9e22751f4bf6b6db75c6f0688cfaab85e59a344e13135c0f55a6edc35b6d  py3-django-djblets-0.6.31.tar.gz"
diff --git a/main/py3-django-extra-views/APKBUILD b/main/py3-django-extra-views/APKBUILD
deleted file mode 100644
index 90b1fbf43ad..00000000000
--- a/main/py3-django-extra-views/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-pkgname=py3-django-extra-views
-pkgver=0.12.0
-pkgrel=1
-pkgdesc="Extra class-based views for Django"
-options="!check" # Requires unpackaged django-nose
-url="https://github.com/AndrewIngram/django-extra-views"
-arch="noarch"
-license="MIT"
-depends="py3-django py3-six"
-makedepends="py3-setuptools"
-source="$pkgname-$pkgver.tar.gz::https://github.com/AndrewIngram/django-extra-views/archive/$pkgver.tar.gz"
-
-builddir="$srcdir/django-extra-views-$pkgver"
-
-replaces="py-django-extra-views" # Backwards compatibility
-provides="py-django-extra-views=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	python3 runtests.py
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --root "$pkgdir"
-}
-
-sha512sums="ca42f99272ae4e6539a80826be07d06fa018e11a57a623d519f77fe06a9c607b5bc5486ce04b7bde1f898e359158544a52e545d1f5123863e5159e19e7df0628  py3-django-extra-views-0.12.0.tar.gz"
diff --git a/main/py3-django-haystack/APKBUILD b/main/py3-django-haystack/APKBUILD
deleted file mode 100644
index d99494020f6..00000000000
--- a/main/py3-django-haystack/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-pkgname=py3-django-haystack
-pkgver=2.8.1
-pkgrel=1
-pkgdesc="Modular search for Django"
-options="!check" # requires unpackaged pysolr and whoosh
-url="https://github.com/django-haystack/django-haystack"
-arch="noarch"
-license="BSD-3-Clause"
-depends="py3-django py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/d/django-haystack/django-haystack-$pkgver.tar.gz"
-
-builddir="$srcdir/django-haystack-$pkgver"
-
-replaces="py-django-haystack" # Backwards compatibility
-provides="py-django-haystack=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --root "$pkgdir"
-}
-
-sha512sums="019defd304334657f5a4ef849fedcf2915800c816f4ff7a53d68a61f5506fc4b94dc43fffda2a4d4ce105a55ac37076e73edcc1ae4acd1c85240320e0af2f069  django-haystack-2.8.1.tar.gz"
diff --git a/main/py3-django-phonenumber-field/APKBUILD b/main/py3-django-phonenumber-field/APKBUILD
deleted file mode 100644
index 831470088bf..00000000000
--- a/main/py3-django-phonenumber-field/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-pkgname=py3-django-phonenumber-field
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="An international phone number field for django models"
-url="https://github.com/stefanfoulis/django-phonenumber-field"
-arch="noarch"
-license="MIT"
-depends="py3-babel py3-django py3-phonenumbers"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/d/django-phonenumber-field/django-phonenumber-field-$pkgver.tar.gz"
-builddir="$srcdir/django-phonenumber-field-$pkgver"
-options="!check" # test fails. its unclear how tests are supposed to be executed
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	python3 setup.py test
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --root "$pkgdir"
-}
-
-sha512sums="04558e43183f7607502e62555477bc9849873593a594dcc552e74366ed1b54cf0d3b808597503f7e6a47fe4aaa09c98eaec421d94785c10a529ccec1d994d73a  django-phonenumber-field-3.0.1.tar.gz"
diff --git a/main/py3-django-pipeline/APKBUILD b/main/py3-django-pipeline/APKBUILD
deleted file mode 100644
index 7e6c497df85..00000000000
--- a/main/py3-django-pipeline/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Contributor: <xmingske@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_pkgname=django-pipeline
-pkgname=py3-$_pkgname
-pkgver=1.3.25
-pkgrel=1
-pkgdesc="an asset packaging library for Django"
-url="https://github.com/cyberdelia/django-pipeline"
-arch="noarch"
-license="JSON"
-depends="python3"
-makedepends="py3-setuptools"
-source="$pkgname-$pkgver.tar.gz::https://github.com/cyberdelia/django-pipeline/archive/$pkgver.tar.gz"
-
-builddir="$srcdir/$_pkgname-$pkgver"
-
-build() {
-	python3 setup.py build
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="2c66b8b60076a8d19049947a9465d96fd80098c6e560f6cb6ffa26fd17d267830d87913041f9876da1276b0224ef3e8b0183c56367741e11c0f010a236b87169  py3-django-pipeline-1.3.25.tar.gz"
diff --git a/main/py3-django-registration/APKBUILD b/main/py3-django-registration/APKBUILD
deleted file mode 100644
index a8f3c7c7510..00000000000
--- a/main/py3-django-registration/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Contributor: <xmingske@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_pkgname=django-registration
-pkgname=py3-$_pkgname
-pkgver=1.0
-pkgrel=3
-pkgdesc="simple user-registration application for Django"
-url="https://github.com/ubernostrum/django-registration"
-arch="noarch"
-license="BSD-3-Clause"
-depends="python3"
-makedepends="py3-setuptools"
-source="$_pkgname-$pkgver.tar.gz::https://github.com/ubernostrum/django-registration/archive/$pkgver.tar.gz"
-
-builddir="$srcdir/$_pkgname-$pkgver"
-
-build() {
-	python3 setup.py build
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="d47863a4fd0d5b68d2fe8419c85d7dda631ddb3afbeb32dbc530ec7f3e1a78bd795485cc295376e54d3da5e87b92b987b45ca4c11cc75a83cec537a77fe84e8f  django-registration-1.0.tar.gz"
diff --git a/main/py3-django-sorl-thumbnail/APKBUILD b/main/py3-django-sorl-thumbnail/APKBUILD
deleted file mode 100644
index c86f55a4976..00000000000
--- a/main/py3-django-sorl-thumbnail/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-pkgname=py3-django-sorl-thumbnail
-pkgver=12.5.0
-pkgrel=1
-pkgdesc="Thumbnails for Django"
-options="!check" # Requires running django
-url="https://github.com/mariocesar/sorl-thumbnail"
-arch="noarch"
-license="BSD-3-Clause"
-depends="py3-django py3-pillow"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/s/sorl-thumbnail/sorl-thumbnail-$pkgver.tar.gz"
-
-builddir="$srcdir/sorl-thumbnail-$pkgver"
-
-replaces="py-django-sorl-thumbnail" # Backwards compatibility
-provides="py-django-sorl-thumbnail=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --root "$pkgdir"
-}
-
-sha512sums="8cf58cc68f8430ca5a57581b7d0cae54e1a3c3219445cb8204a2bccf547294eba888f79433152bfb7d257cfbbf0a22b4520e3810337e0df286cee8ad8e2b247e  sorl-thumbnail-12.5.0.tar.gz"
diff --git a/main/py3-django-tables2/APKBUILD b/main/py3-django-tables2/APKBUILD
deleted file mode 100644
index 18f9f491c36..00000000000
--- a/main/py3-django-tables2/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-pkgname=py3-django-tables2
-pkgver=1.21.2
-pkgrel=3
-pkgdesc="Table/data-grid framework for Django"
-url="https://github.com/bradleyayers/django-tables2/"
-arch="noarch"
-license="BSD-2-Clause"
-depends="python3 py3-django py3-six"
-makedepends="py3-setuptools"
-options="!check" #no testsuite
-source="https://files.pythonhosted.org/packages/source/d/django-tables2/django-tables2-$pkgver.tar.gz"
-builddir="$srcdir"/django-tables2-$pkgver
-
-build() {
-	python3 setup.py --quiet build
-}
-
-package() {
-	python3 setup.py --quiet install --prefix=/usr --root="$pkgdir"
-}
-
-
-sha512sums="9af04144e2928cd0246bc7406064ec959b7eddb1d29f013ca53cd6244df07b07a2abe0e4a79b05c572bc164ceb475c954e3f84eea6b53c631c5f958f25aece62  django-tables2-1.21.2.tar.gz"
diff --git a/main/py3-django-treebeard/APKBUILD b/main/py3-django-treebeard/APKBUILD
deleted file mode 100644
index 244d8ff1a25..00000000000
--- a/main/py3-django-treebeard/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-pkgname=py3-django-treebeard
-pkgver=4.3.1
-pkgrel=0
-pkgdesc="Efficient tree implementations for Django"
-url="https://github.com/django-treebeard/django-treebeard"
-arch="noarch"
-license="Apache-2.0"
-depends="py3-django"
-makedepends="py3-setuptools"
-checkdepends="py3-pytest"
-source="$pkgname-$pkgver.tar.gz::https://github.com/django-treebeard/django-treebeard/archive/$pkgver.tar.gz"
-
-builddir="$srcdir/django-treebeard-$pkgver"
-
-replaces="py-django-treebeard" # Backwards compatibility
-provides="py-django-treebeard=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 -m pytest
-}
-
-package() {
-	python3 setup.py install --root "$pkgdir"
-}
-
-sha512sums="0028bec918e3a269eade270842dac29bdbff4c87ad2606b240fc6796b04c2ff723b0fafae9c7c110aee3ef72e11f3a1a5877e6f21e29ea70c3e059f4cf32435a  py3-django-treebeard-4.3.1.tar.gz"
diff --git a/main/py3-django-widget-tweaks/APKBUILD b/main/py3-django-widget-tweaks/APKBUILD
deleted file mode 100644
index 85d7401c03b..00000000000
--- a/main/py3-django-widget-tweaks/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-pkgname=py3-django-widget-tweaks
-pkgver=1.4.5
-pkgrel=1
-pkgdesc="Tweak the form field rendering in templates, not in python-level form definitions"
-url="https://github.com/jazzband/django-widget-tweaks"
-arch="noarch"
-license="MIT"
-depends="py3-django"
-makedepends="py3-setuptools"
-source="$pkgname-$pkgver.tar.gz::https://github.com/jazzband/django-widget-tweaks/archive/$pkgver.tar.gz"
-
-builddir="$srcdir/django-widget-tweaks-$pkgver"
-
-replaces="py-django-widget-tweaks" # Backwards compatibility
-provides="py-django-widget-tweaks=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	python3 runtests.py
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --root "$pkgdir"
-}
-
-sha512sums="e35c5360bfe016c470cd50b8d500d9e3f8648e1a909508c5a516ecf82d98d2808432bb2a5738ec2dd6d1e77e63e9beb454237ba44e5a4060cf812ddd43ace18e  py3-django-widget-tweaks-1.4.5.tar.gz"
diff --git a/main/py3-django/APKBUILD b/main/py3-django/APKBUILD
deleted file mode 100644
index 866eb62a3bc..00000000000
--- a/main/py3-django/APKBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# Contributor: Andrew Wilcox <AWilcox@Wilcox-Tech.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=py3-django
-_pkgname=Django
-pkgver=1.11.29
-pkgrel=0
-pkgdesc="A high-level Python3 Web framework"
-url="https://djangoproject.com/"
-arch="noarch"
-license="BSD-3-Clause"
-depends="python3 py3-tz"
-makedepends="py3-setuptools"
-options="!check" # some depends missing, others in community/testing
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-replaces="py-django" # Backwards compatibility
-provides="py-django=$pkgver-r$pkgrel" # Backwards compatibility
-
-# secfixes:
-#   1.11.29-r0:
-#     - CVE-2020-9402
-#   1.11.28-r0:
-#     - CVE-2020-7471
-#   1.11.27-r0:
-#     - CVE-2019-19844
-#   1.11.23-r0:
-#     - CVE-2019-14232
-#     - CVE-2019-14233
-#     - CVE-2019-14234
-#     - CVE-2019-14235
-#   1.11.22-r0:
-#     - CVE-2019-12781
-#   1.8.16-r0:
-#     - CVE-2016-9013
-#     - CVE-2016-9014
-#   1.10.7-r0:
-#     - CVE-2017-7233
-#     - CVE-2017-7234
-#   1.11.5-r0:
-#     - CVE-2017-12794
-#   1.11.10-r0:
-#     - CVE-2018-6188
-#   1.11.11-r0:
-#     - CVE-2018-7536
-#     - CVE-2018-7537
-#   1.11.15-r0:
-#     - CVE-2018-14574
-#   1.11.18-r0:
-#     - CVE-2019-3498
-#   1.11.19-r0:
-#     - CVE-2019-6975
-#   1.11.21-r0:
-#     - CVE-2019-12308
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	cd tests
-	python3 runtests.py
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-
-	mv "$pkgdir"/usr/bin/django-admin.py "$pkgdir"/usr/bin/django-admin
-	ln -s django-admin "$pkgdir"/usr/bin/django-admin-3
-}
-
-sha512sums="dc8d1c5c09f998bf7015967961247e56a9c1dd55701534c6bce6dac2270a5531e1162d9bcbf5ec5f4d411d2d0dc820c82fd9b69628c5ff944bb9f1a22290a562  Django-1.11.29.tar.gz"
diff --git a/main/py3-dnspython/APKBUILD b/main/py3-dnspython/APKBUILD
index 5b0a6a24d17..1a909923733 100644
--- a/main/py3-dnspython/APKBUILD
+++ b/main/py3-dnspython/APKBUILD
@@ -1,29 +1,43 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-dnspython
-_pkgname=dnspython
-pkgver=1.16.0
-pkgrel=3
-pkgdesc="A DNS toolkit for Python3"
-url="http://www.dnspython.org"
+_pyname=dnspython
+pkgver=2.6.1
+pkgrel=1
+pkgdesc="DNS toolkit for Python3"
+url="https://www.dnspython.org/"
 arch="all"
 license="ISC"
-makedepends="py3-setuptools python3-dev cython"
-source="http://www.dnspython.org/kits/$pkgver/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+makedepends="
+	cython
+	py3-gpep517
+	py3-hatchling
+	py3-wheel
+	python3-dev
+	"
+checkdepends="py3-pytest"
+subpackages="$pkgname-pyc"
+source="https://github.com/rthalley/dnspython/archive/v$pkgver/dnspython-$pkgver.tar.gz
+	pyproject-set-license-to-table.patch
+	"
+builddir="$srcdir/$_pyname-$pkgver"
+options="!check" # network tests are failing on CI
 
 replaces="py-dnspython" # Backwards compatibility
 provides="py-dnspython=$pkgver-r$pkgrel" # Backwards compatibility
 
 build() {
-	python3 setup.py build --cython-compile
-}
-
-check() {
-	python3 setup.py check --cython-compile
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 package() {
-	python3 setup.py install --cython-compile --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
-sha512sums="41ddca2faf696d5d682551f517efd90c007011c1f6d9355d297d71a3fe84222a1e528945343d8c2276ad3957ceaab578f3df7c2c1709418ffcca01ccbb379359  dnspython-1.16.0.tar.gz"
+
+sha512sums="
+77e9c69ac70e9e31a11188b968d28b8f2890b053b2cce0e608eefad7fd2c2b0f30c074222b2e5e85c0b4b8705f2e45acfa8b016a7808cc421df1d77f2561d978  dnspython-2.6.1.tar.gz
+38830a1f23146d3f2f38dd0030334e630142514c913be388af29c680d023e13fbce0944cef6744f43ce0e9680e1e3850f530de26ed3f9f170f84876707c3a8be  pyproject-set-license-to-table.patch
+"
diff --git a/main/py3-dnspython/pyproject-set-license-to-table.patch b/main/py3-dnspython/pyproject-set-license-to-table.patch
new file mode 100644
index 00000000000..5070563be03
--- /dev/null
+++ b/main/py3-dnspython/pyproject-set-license-to-table.patch
@@ -0,0 +1,23 @@
+From a542004a4272e38403c7d0e2ce0b7329fc6df669 Mon Sep 17 00:00:00 2001
+From: Bob Halley <halley@dnspython.org>
+Date: Tue, 5 Mar 2024 05:58:28 -0800
+Subject: [PATCH] Set license to a TOML table to avoid PEP 639 metadata for
+ now.
+
+---
+ pyproject.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 3108d587..6f60295d 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
+ name = "dnspython"
+ description = "DNS toolkit"
+ authors = [{ name = "Bob Halley", email = "halley@dnspython.org" }]
+-license = "ISC"
++license = { text = "ISC" }
+ classifiers = [
+     "Development Status :: 5 - Production/Stable",
+     "Intended Audience :: Developers",
diff --git a/main/py3-docutils/APKBUILD b/main/py3-docutils/APKBUILD
index 1c15c82efb8..fe9d2dca83e 100644
--- a/main/py3-docutils/APKBUILD
+++ b/main/py3-docutils/APKBUILD
@@ -1,64 +1,43 @@
 # Contributor: Matt Smith <mcs@darkregion.net>
 # Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=py3-docutils
-_pkgname=docutils
-pkgver=0.15.2
-pkgrel=0
+pkgver=0.20.1
+pkgrel=2
 pkgdesc="Documentation Utilities for Python3"
-# 3 Tests fail with such message (same expected and actual len)
-# AssertionError: content.xml not equal: expected len: 1961  actual len: 1961
-options="!check"
-url="https://pypi.python.org/pypi/docutils"
+url="https://pypi.org/project/docutils"
 arch="noarch"
-license="Public-Domain"
-depends="python3 py3-pillow"
-makedepends="py3-setuptools"
-subpackages="$pkgname-doc::noarch"
-source="https://files.pythonhosted.org/packages/source/d/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+license="BSD-2-Clause AND GPL-3.0-or-later AND Python-2.0"
+depends="python3"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="py3-pytest"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/d/docutils/docutils-$pkgver.tar.gz"
+builddir="$srcdir/docutils-$pkgver"
 
 replaces="py-docutils" # Backwards compatibility
 provides="py-docutils=$pkgver-r$pkgrel" # Backwards compatibility
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
 }
 
 check() {
-	cd test3
-	python3 alltests.py
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 
 	# Remove .py extension and add version suffix to executable files.
 	local path; for path in "$pkgdir"/usr/bin/*.py; do
-		mv "$path" "${path/.py/-3}"
+		mv "$path" "${path/.py/}"
+		ln -sfv "$(basename "${path/.py/}")" "$path"
+		ln -sfv "$(basename "${path/.py/}")" "${path/.py/}-3"
 	done
-
-	cd "$pkgdir"/usr/bin
-	local name; for name in *-3; do
-		ln -s -- ${name} "$pkgdir"/usr/bin/${name%-3}
-	done
-}
-
-doc() {
-	replaces=""
-	provides=""
-	pkgdesc="$pkgdesc (documentation)"
-	local docdir="$subpkgdir/usr/share/doc/$pkgname"
-	local licdir="$subpkgdir/usr/share/licenses/$pkgname"
-
-	cd "$builddir"
-
-	mkdir -p "$docdir"
-	cp -R docs/* "$docdir"/
-	cp *.txt "$docdir"/
-
-	mkdir -p "$licdir"
-	rm -f licenses/docutils.conf
-	cp licenses/* "$licdir"/
 }
 
-sha512sums="b4528c7eba5a27e40f290a9df6894c277d11906d02f6842b9f364b29af9aa1e46f6008c87e4355947bcfa9f2db1cae9f38cf9fa7b8008ba45fa6d685922003a6  docutils-0.15.2.tar.gz"
+sha512sums="
+a0ddca315d03677003036d6a8052ac96fbd3fcc4508564938ea684d79bedb4d322d83449c7b26e55b19b0aadd6e46ca9ac409bb16279a20f06c70e9c15ef5eb0  docutils-0.20.1.tar.gz
+"
diff --git a/main/py3-editables/APKBUILD b/main/py3-editables/APKBUILD
new file mode 100644
index 00000000000..9dc7f3dc502
--- /dev/null
+++ b/main/py3-editables/APKBUILD
@@ -0,0 +1,30 @@
+# Contributor: Duncan Bellamy <dunk@denkimushi.com>
+# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
+pkgname=py3-editables
+pkgver=0.5
+pkgrel=2
+pkgdesc="library for creating editable wheels"
+url="https://github.com/pfmoore/editables"
+arch="noarch"
+license="MIT"
+options="!check" #pytest circular dep
+depends="python3"
+makedepends="py3-gpep517 py3-installer py3-flit-core py3-wheel"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/e/editables/editables-$pkgver.tar.gz"
+builddir="$srcdir/editables-$pkgver"
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
+}
+
+sha512sums="
+eba54a4624d4df6b2aaf33a46da1dfd4b218da4f89c5832401b074eae089bc59e1eae9e16291374c9f0406923e4c9d02682dabbc91ad263203cb897ba7dc796f  editables-0.5.tar.gz
+"
diff --git a/main/py3-elementpath/APKBUILD b/main/py3-elementpath/APKBUILD
new file mode 100644
index 00000000000..09750158a9f
--- /dev/null
+++ b/main/py3-elementpath/APKBUILD
@@ -0,0 +1,47 @@
+# Contributor: Aiden Grossman <agrossman154@yahoo.com>
+# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
+pkgname=py3-elementpath
+pkgver=4.1.5
+pkgrel=2
+pkgdesc="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
+url="https://github.com/sissaschool/elementpath"
+arch="noarch"
+license="MIT"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="py3-pytest py3-lxml"
+subpackages="$pkgname-pyc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/sissaschool/elementpath/archive/refs/tags/v$pkgver.tar.gz"
+builddir="$srcdir/elementpath-$pkgver/"
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	# first four disabled tests fails on locale differences
+	# Rest of the tests need more investigation, started with upgrade to 4.1.0
+	.testenv/bin/python3 -m pytest \
+		--ignore=tests/test_sequence_types.py \
+		--deselect tests/test_xpath2_functions.py::XPath2FunctionsTest::test_compare_function \
+		--deselect tests/test_xpath30.py::XPath30FunctionsTest::test_compare_function \
+		--deselect tests/test_xpath31.py::XPath31FunctionsTest::test_compare_function \
+		--deselect tests/test_collations.py::CollationsTest::test_context_activation \
+		--deselect tests/test_xpath2_functions.py::LxmlXPath2FunctionsTest::test_compare_function \
+		--deselect tests/test_xpath30.py::LxmlXPath30FunctionsTest::test_compare_function \
+		--deselect tests/test_xpath31.py::LxmlXPath31FunctionsTest::test_compare_function \
+		--deselect tests/test_validators.py::ValidatorsTest::test_validate_analyzed_string \
+		--deselect tests/test_validators.py::ValidatorsTest::test_validate_json_to_xml
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
+}
+
+sha512sums="
+29989210238aacdf111cba49d09488254a6bd479b381e57699c8d1eca8ec21badf666744402aae891210142ce56cfce66b55bf372e5de8b7b48a45bed46b0cf3  py3-elementpath-4.1.5.tar.gz
+"
diff --git a/main/py3-elftools/APKBUILD b/main/py3-elftools/APKBUILD
index 9937219db13..021cbe13b62 100644
--- a/main/py3-elftools/APKBUILD
+++ b/main/py3-elftools/APKBUILD
@@ -1,32 +1,39 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer:
+# Maintainer: Peter Shkenev <santurysim@gmail.com>
 pkgname=py3-elftools
 _pkgname=py${pkgname##py3-}
-pkgver=0.26
-pkgrel=0
+pkgver=0.30
+pkgrel=1
 pkgdesc="Parsing ELF and DWARF in Python"
 url="https://github.com/eliben/pyelftools"
 arch="noarch"
 license="Unlicense"
-depends="python3 py3-setuptools"
-subpackages="$pkgname-doc"
+depends="python3"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+subpackages="$pkgname-pyc $pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/eliben/$_pkgname/archive/v$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 test/run_all_unittests.py
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 test/run_all_unittests.py
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 
 	mkdir -p "$pkgdir"/usr/share/doc/$pkgname
 	install -m644 README.rst CHANGES \
 		"$pkgdir"/usr/share/doc/$pkgname/doc
 }
 
-sha512sums="dd166f56654592f6a0d7a91bc41c01b9300de6d2f08b204a61ac48eb3f4b3224f89271c5fe66adc41d71a5e2bed8ddfa4ad495098df917623f7aa90c2caffeca  py3-elftools-0.26.tar.gz"
+sha512sums="
+5bd4c797f90307e351d541b8de8f76124c66e497b68b811f7012e1271c902beb6ab530a424b338777d12277d44f9b5f89f049e05d9fc2ec36a90b6fa16f1c1a4  py3-elftools-0.30.tar.gz
+"
diff --git a/main/py3-exifread/APKBUILD b/main/py3-exifread/APKBUILD
deleted file mode 100644
index bf13d8599ba..00000000000
--- a/main/py3-exifread/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer:
-pkgname=py3-exifread
-_pkgname=ExifRead
-pkgver=2.2.0
-pkgrel=1
-pkgdesc="Read Exif metadata from tiff and jpeg files"
-options="!check" # No testsuite
-url="https://github.com/ianare/exif-py"
-arch="noarch"
-license="BSD-3-Clause"
-depends="python3"
-makedepends="py3-setuptools"
-source="$pkgname-$pkgver.tar.gz::https://github.com/ianare/exif-py/archive/$pkgver.tar.gz"
-
-builddir="$srcdir"/exif-py-$pkgver
-
-replaces="py-exifread" # Backwards compatibility
-provides="py-exifread=$pkgver-r$pkgrel" # Backwards compatibility
-
-prepare() {
-	default_prepare
-	sed -i "s/2.1.2/$version/" exifread/__init__.py
-}
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="a1e6b27e7092ef8ce8c1a6c5fe095f0641ff942aa4bcd2a9f96eda688fe8cf7544bd6b9e48b4b29586906dac95ed717578de6b8bb691d8a4a1864992da0e00f5  py3-exifread-2.2.0.tar.gz"
diff --git a/main/py3-extras/APKBUILD b/main/py3-extras/APKBUILD
index 411b7123f10..5056db7f198 100644
--- a/main/py3-extras/APKBUILD
+++ b/main/py3-extras/APKBUILD
@@ -3,28 +3,38 @@
 pkgname=py3-extras
 _pkgname=extras
 pkgver=1.0.0
-pkgrel=3
+pkgrel=10
 pkgdesc="Useful extra bits for Python - things that shold be in the standard library"
-url="https://pypi.python.org/pypi/extras/"
+url="https://pypi.org/project/extras/"
 arch="noarch"
 license="MIT"
 depends="python3"
-makedepends="py3-setuptools"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="py3-testtools"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir"/$_pkgname-$pkgver
 replaces="py-extras" # Backwards Compatibility
 provides="py-extras=$pkgver-r$pkgrel" # Backwards Compatibility
+options="!check" # py3-testtools depends on this
 
-check() {
-	python3 setup.py check
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
-build() {
-	python3 setup.py build
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m unittest -v
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="510c796628f28db90bb96c7c9ba5fc9b2b950d2968e219efe67f3899bbe7ef68fe5de1494f8fd640f13a1ccd329e7dac9cd38aa965ab1e07c4cd287c04da50fb  extras-1.0.0.tar.gz"
+sha512sums="
+510c796628f28db90bb96c7c9ba5fc9b2b950d2968e219efe67f3899bbe7ef68fe5de1494f8fd640f13a1ccd329e7dac9cd38aa965ab1e07c4cd287c04da50fb  extras-1.0.0.tar.gz
+"
diff --git a/main/py3-fasteners/APKBUILD b/main/py3-fasteners/APKBUILD
deleted file mode 100644
index 82d3a567e4d..00000000000
--- a/main/py3-fasteners/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
-# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
-pkgname=py3-fasteners
-pkgver=0.15
-pkgrel=2
-pkgdesc="A python package that provides useful locks"
-url="https://github.com/harlowja/fasteners/"
-arch="noarch"
-license="Apache-2.0"
-depends="python3 py3-monotonic py3-six"
-makedepends="python3-dev py3-setuptools"
-source="fasteners-$pkgver.tar.gz::https://github.com/harlowja/fasteners/archive/$pkgver.tar.gz"
-builddir="$srcdir/fasteners-$pkgver"
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	python3 setup.py check
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="0c77c7061c8b76d0d018b07a3d33fc71701842f5b686456ebf31069694baa27a6cc47196267f24bc296078e7503ab0709fa28c9f0088c3cf777ea0e133bb5832  fasteners-0.15.tar.gz"
diff --git a/main/py3-filelock/APKBUILD b/main/py3-filelock/APKBUILD
deleted file mode 100644
index fb1ed381445..00000000000
--- a/main/py3-filelock/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Dmitry Romanenko <dmitry@romanenko.in>
-# Maintainer: Dmitry Romanenko <dmitry@romanenko.in>
-pkgname=py3-filelock
-_pkgname=filelock
-pkgver=3.0.12
-pkgrel=2
-pkgdesc="A platform independent file lock for Python3"
-url="https://github.com/benediktschmitt/py-filelock"
-arch="noarch"
-license="Unlicense"
-depends="python3"
-checkdepends="py3-pytest"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/f/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-replaces="py-filelock" # Backwards compatibility
-provides="py-filelock=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 -m pytest -xvv test.py
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="09b8b16c12a60044a259a5d644bc8066660871104a7f4cd431431173d475b9f15744adfb8d86ec8cda69f2a1b52bd14cb8a066d70fa5e49c449bc5ee702ec2a0  filelock-3.0.12.tar.gz"
diff --git a/main/py3-fixtures/APKBUILD b/main/py3-fixtures/APKBUILD
index 7d38b8db94e..a3a11dc4080 100644
--- a/main/py3-fixtures/APKBUILD
+++ b/main/py3-fixtures/APKBUILD
@@ -1,30 +1,50 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-fixtures
-_pkgname=fixtures
-pkgver=3.0.0
-pkgrel=3
+pkgver=4.1.0
+pkgrel=2
 pkgdesc="Fixtures, reusable state for writing clean tests and more."
-url="https://pypi.python.org/pypi/fixtures/"
+url="https://pypi.org/project/fixtures/"
 arch="noarch"
 license="MIT"
-depends="python3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
+depends="
+	py3-pbr
+	python3
+	"
+makedepends="
+	py3-gpep517
+	py3-setuptools
+	py3-wheel
+	"
+checkdepends="
+	py3-mock
+	py3-testtools
+	"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/f/fixtures/fixtures-$pkgver.tar.gz"
+builddir="$srcdir/fixtures-$pkgver"
+options="!check" # py3-testtools depends on this
 
 replaces="py-fixtures" # Backwards compatibility
 provides="py-fixtures=$pkgver-r$pkgrel" # Backwards compatibility
 
-check() {
-	python3 setup.py check
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
-build() {
-	python3 setup.py build
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m testtools.run
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
-sha512sums="e52ba864c42d15a8baa60583761006b2dd78e3cd5f3f043f5702346aef428b933d62e8fa5889b7cb4196e4072acc5df3b7ffa39702a1b782887bdc109299b695  fixtures-3.0.0.tar.gz"
+
+sha512sums="
+6897449fdefd07abe7714186b366fdf4505283f6747f8fa4d17044bc45da58eb36e69d89381527ccecb98e6c62c58bc6d4f558af41cbfc87b0221ae60ba71ff6  fixtures-4.1.0.tar.gz
+"
diff --git a/main/py3-flit-core/APKBUILD b/main/py3-flit-core/APKBUILD
new file mode 100644
index 00000000000..c1cc6fc2800
--- /dev/null
+++ b/main/py3-flit-core/APKBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
+pkgname=py3-flit-core
+pkgver=3.9.0
+pkgrel=1
+pkgdesc="simple packaging tool for simple packages (core)"
+url="https://flit.readthedocs.io/"
+arch="noarch"
+license="BSD-3-Clause"
+makedepends="py3-installer"
+checkdepends="py3-pytest py3-testpath"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/f/flit/flit-$pkgver.tar.gz"
+builddir="$srcdir/flit-$pkgver/flit_core"
+options="!check" # py3-testpath depends on this
+
+# split from py3-flit, allow replacing files
+replaces="py3-flit<3.5.1-r3"
+
+build() {
+	# don't need this with py3.11 for tomli
+	rm -rf flit_core/vendor/
+	python3 build_dists.py
+}
+
+check() {
+	python3 -m pytest
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		dist/flit_core-$pkgver-py3-none-any.whl
+
+	# remove installed tests
+	rm -r "$pkgdir"/usr/lib/python3*/site-packages/flit_core/tests
+}
+
+sha512sums="
+3cbca4530fe463e27fb43130e0d00681e63434bdd552bd61b4a2f3b7967729d9d9a49c69b1a2380ed99bcca1e66a38e592f41cbe38a471d3e7297ab00cdabc29  flit-3.9.0.tar.gz
+"
diff --git a/main/py3-funcsigs/APKBUILD b/main/py3-funcsigs/APKBUILD
index bd293955a27..3c6b37e41a2 100644
--- a/main/py3-funcsigs/APKBUILD
+++ b/main/py3-funcsigs/APKBUILD
@@ -3,25 +3,32 @@
 pkgname=py3-funcsigs
 _pkgname=funcsigs
 pkgver=1.0.2
-pkgrel=4
+pkgrel=10
 pkgdesc="Python3 function signatures from PEP362 for Python 3.2+"
 url="http://funcsigs.readthedocs.org"
 arch="noarch"
 license="Apache-2.0"
 depends="python3"
-makedepends="py3-setuptools"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 replaces="py-funcsigs" # Backwards compatibility
 provides="py-funcsigs=$pkgver-r$pkgrel" # Backwards compatibility
+options="!check"
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="4e583bb7081bb1d6c0fe5a6935ca03032d562b93ef5c11b51a72ce9e7ac12902451cc2233c7e6f70440629d88d8e6e9625965ee408100b80b0024f3a6204afda  funcsigs-1.0.2.tar.gz"
+sha512sums="
+4e583bb7081bb1d6c0fe5a6935ca03032d562b93ef5c11b51a72ce9e7ac12902451cc2233c7e6f70440629d88d8e6e9625965ee408100b80b0024f3a6204afda  funcsigs-1.0.2.tar.gz
+"
diff --git a/main/py3-future/APKBUILD b/main/py3-future/APKBUILD
index 498125248f3..646dd8bfbce 100644
--- a/main/py3-future/APKBUILD
+++ b/main/py3-future/APKBUILD
@@ -1,33 +1,41 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-future
-_pkgname=python-future
-pkgver=0.18.2
-pkgrel=0
+_pkgname=future
+pkgver=1.0.0
+pkgrel=1
 pkgdesc="Easy, clean, reliable Python 2/3 compatibility"
-url="http://python-future.org/"
+url="https://python-future.org/"
 arch="noarch"
 license="MIT"
 depends="python3"
-makedepends="py3-setuptools"
+# It can be built without it but it misses a lot of functionality
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="py3-pytest"
+subpackages="$pkgname-pyc"
 source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/f/future/future-$pkgver.tar.gz"
-builddir="$srcdir/${_pkgname/python-/}-$pkgver"
+builddir="$srcdir/$_pkgname-$pkgver"
 
 replaces="py-future" # Backwards compatibility
 provides="py-future=$pkgver-r$pkgrel" # Backwards compatibility
 
 build() {
-	cd "$builddir"
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 check() {
-	cd "$builddir"
-	python3 setup.py check
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest -v -k "not test_isinstance_recursion_limit and not test_subclass_recursion_limit"
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="91c025f7d94bcdf93df838fab67053165a414fc84e8496f92ecbb910dd55f6b6af5e360bbd051444066880c5a6877e75157bd95e150ead46e5c605930dfc50f2  py3-future-0.18.2.tar.gz"
+sha512sums="
+8e28d53172e3ae7b3b27c424a48fb698a6e86bf1c648cdf74e7fd57d34901a9bda18429fe4e176d70be67fc6c80b7f961b3021356594e38b5f294406af40bc61  py3-future-1.0.0.tar.gz
+"
diff --git a/main/py3-gobject3/APKBUILD b/main/py3-gobject3/APKBUILD
index 2a1c5227cc5..06110b898e8 100644
--- a/main/py3-gobject3/APKBUILD
+++ b/main/py3-gobject3/APKBUILD
@@ -1,43 +1,44 @@
 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py3-gobject3
-pkgver=3.36.0
+pkgver=3.48.2
 pkgrel=0
 pkgdesc="Python bindings for the GObject library"
 url="https://wiki.gnome.org/Projects/PyGObject/"
 arch="all"
 license="LGPL-2.1-or-later"
-makedepends="python3-dev py3-cairo-dev gobject-introspection-dev
-	libffi-dev glib-dev meson"
-checkdepends="py3-pytest gtk+3.0-dev xvfb-run ibus"
+makedepends="
+	glib-dev
+	gobject-introspection-dev
+	libffi-dev
+	meson
+	py3-cairo-dev
+	py3-setuptools
+	python3-dev
+	"
+checkdepends="py3-pytest gtk+3.0-dev xvfb-run ibus font-dejavu"
+depends="python3"
 subpackages="$pkgname-dev:_dev"
-options="!check" # https://gitlab.gnome.org/GNOME/pygobject/issues/391
+options="!check" # Need ibus which is in community/
 source="https://download.gnome.org/sources/pygobject/${pkgver%.*}/pygobject-$pkgver.tar.xz"
 builddir="$srcdir"/pygobject-$pkgver
 
 replaces="py-gobject3" # Backwards compatibility
 provides="py-gobject3=$pkgver-r$pkgrel" # Backwards compatibility
 
-build()	{
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--buildtype=plain \
-		-Dpython=python3 \
-		. output
-
-	ninja -C output
+build() {
+	abuild-meson -Db_lto=true . output
+
+	meson compile -C output
 }
 
 check() {
-	PYGI_TEST_VERBOSE="1" xvfb-run ninja -C output test
+	PYGI_TEST_VERBOSE="1" xvfb-run -a meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C "$builddir"/output install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
 _dev() {
@@ -47,4 +48,6 @@ _dev() {
 	default_dev
 }
 
-sha512sums="e07375e758d1ca0aefa7f12c9af739301371a857154577b62a17f3179adf1d9d37889d4f432cb6ac7804fb4c23f68a05d3ac5446df2800ecbca6fa27ed9b783d  pygobject-3.36.0.tar.xz"
+sha512sums="
+11619f73be5894fae82b261779f33390d1aec51b02bcf285c58f3c76ee46dfc1b3f435e4662176fde5ca899aee5afc453f8f0ba28e15e15330a52354cf737d45  pygobject-3.48.2.tar.xz
+"
diff --git a/main/py3-gpep517/APKBUILD b/main/py3-gpep517/APKBUILD
new file mode 100644
index 00000000000..0ed1ad62edd
--- /dev/null
+++ b/main/py3-gpep517/APKBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Peter Shkenev <santurysim@gmail.com>
+pkgname=py3-gpep517
+_pkgname=gpep517
+pkgver=15
+pkgrel=2
+pkgdesc="Minimal backend script to aid installing Python packages through PEP 517-compliant build systems"
+url="https://github.com/mgorny/gpep517/"
+arch="noarch"
+license="MIT"
+depends="py3-installer python3"
+subpackages="$pkgname-pyc"
+source="https://github.com/mgorny/gpep517/archive/v$pkgver/gpep517-v$pkgver.tar.gz
+	gpep517
+
+	default-bytecode-levels.patch
+	"
+builddir="$srcdir/$_pkgname-$pkgver"
+
+check() {
+	python3 -m gpep517 --help
+}
+
+package() {
+	local sitedir="$(python3 -c 'import site;print(site.getsitepackages()[0])')"
+	mkdir -p "$pkgdir/$sitedir"
+	cp -a gpep517 "$pkgdir/$sitedir"
+	python3 -m compileall "$pkgdir/$sitedir"
+
+	install -Dm755 "$srcdir"/gpep517 -t "$pkgdir"/usr/bin
+}
+
+sha512sums="
+7c3b878220e907ef801301eadc0e3031dd3c31770cc50bb7119ab32f9244c8a33792b4896ddeffc5d4b7be9f1d881fba5179de155f11845f510e455be59fb92e  gpep517-v15.tar.gz
+3e90bf2d94006672c66f5082812115903054b6e05a5d37aa9a0fd33f7b2c8368f13e5fbd3ea815c386d6155dcbf8babd69faa9ca27b95f35b35a4ef47974efd7  gpep517
+d3174ce9ac13d124578fc5ace0bd7a2c8582a8075d5355bf781bfa7218155cd00a7a707e76f26bcb933c6f49786a59bb63147b3e2f9645d36c97647865250894  default-bytecode-levels.patch
+"
diff --git a/main/py3-gpep517/default-bytecode-levels.patch b/main/py3-gpep517/default-bytecode-levels.patch
new file mode 100644
index 00000000000..55aa77ab718
--- /dev/null
+++ b/main/py3-gpep517/default-bytecode-levels.patch
@@ -0,0 +1,16 @@
+diff --git a/gpep517/__main__.py b/gpep517/__main__.py
+index d519c75..2dc0b49 100644
+--- a/gpep517/__main__.py
++++ b/gpep517/__main__.py
+@@ -350,9 +350,9 @@ def add_install_args(parser):
+                        f"(default: {sys.executable})")
+     group.add_argument("--optimize",
+                        type=parse_optimize_arg,
+-                       default=[],
++                       default=[0],
+                        help="Comma-separated list of optimization levels "
+-                       "to compile bytecode for (default: none), pass 'all' "
++                       "to compile bytecode for (default: 0), 0s 'all' "
+                        "to enable all known optimization levels (currently: "
+                        f"{', '.join(str(x) for x in ALL_OPT_LEVELS)})")
+ 
diff --git a/main/py3-gpep517/gpep517 b/main/py3-gpep517/gpep517
new file mode 100644
index 00000000000..b8b10c0c09d
--- /dev/null
+++ b/main/py3-gpep517/gpep517
@@ -0,0 +1,6 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+import sys
+from gpep517.__main__ import main
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/main/py3-hatch-vcs/APKBUILD b/main/py3-hatch-vcs/APKBUILD
new file mode 100644
index 00000000000..23fd62f173b
--- /dev/null
+++ b/main/py3-hatch-vcs/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Duncan Bellamy <dunk@denkimushi.com>
+# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
+pkgname=py3-hatch-vcs
+pkgver=0.4.0
+pkgrel=2
+pkgdesc="Hatch plugin for versioning with your preferred VCS"
+url="https://github.com/ofek/hatch-vcs"
+arch="noarch"
+license="MIT"
+depends="python3 py3-hatchling py3-setuptools_scm"
+makedepends="py3-gpep517 py3-installer py3-wheel"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/h/hatch-vcs/hatch_vcs-$pkgver.tar.gz"
+builddir="$srcdir/hatch_vcs-$pkgver"
+options="!check" #pytest circular dep
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" .dist/*.whl
+}
+
+sha512sums="
+8689d3939b384b66c8153b88e82c55c4ec59a971dae6138c8d70995d332d62c870d611f0be5d2e47640f6c80cb55d1d8e556d6b3f0085f94dd505aaf7fdb93bd  hatch_vcs-0.4.0.tar.gz
+"
diff --git a/main/py3-hatchling/APKBUILD b/main/py3-hatchling/APKBUILD
new file mode 100644
index 00000000000..cf46c214638
--- /dev/null
+++ b/main/py3-hatchling/APKBUILD
@@ -0,0 +1,25 @@
+# Contributor: Duncan Bellamy <dunk@denkimushi.com>
+# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
+pkgname=py3-hatchling
+pkgver=1.22.5
+pkgrel=1
+pkgdesc="Modern, extensible Python build backend"
+url="https://hatch.pypa.io/latest/"
+license="MIT"
+arch="noarch"
+depends="python3 py3-editables py3-packaging py3-pathspec py3-pluggy py3-trove-classifiers"
+makedepends="py3-installer"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/py3/h/hatchling/hatchling-$pkgver-py3-none-any.whl"
+options="!check"
+
+package() {
+	# this causes a lot of circular dependencies, namely this depends on
+	# poetry-core, which needs jsonschema, which needs this
+	python3 -m installer -d "$pkgdir" \
+		"$srcdir"/hatchling-$pkgver-py3-none-any.whl
+}
+
+sha512sums="
+d0969cabce858348ca01e3446bc76e6045d4b012c8f5a86c88cb6d71c168f1d23e83227b894d358474b39581fbea6c636932adc51b529b56444b19ed9714c007  hatchling-1.22.5-py3-none-any.whl
+"
diff --git a/main/py3-hiredis/APKBUILD b/main/py3-hiredis/APKBUILD
deleted file mode 100644
index 52de17544b9..00000000000
--- a/main/py3-hiredis/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Eivind Uggedal <eu@eju.no>
-pkgname=py3-hiredis
-_pkgname=${pkgname#py3-}
-pkgver=1.0.1
-pkgrel=0
-pkgdesc="Python extension that wraps hiredis"
-url="https://github.com/redis/hiredis-py"
-arch="all"
-license="BSD-3-Clause"
-makedepends="python3-dev py3-setuptools hiredis-dev"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
-	system-hiredis.patch
-	hiredis-0.14-compat.patch"
-
-# keep these til after alpine v3.11
-provides="py-$_pkgname=$pkgver-r$pkgrel"  # for backward compatibility
-replaces="py-$_pkgname"  # for backward compatibility
-
-builddir="$srcdir"/$_pkgname-$pkgver
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 test.py
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="8aa5e29b09f42826d746857d55b8042b40ffa3977386b0f8b2ea1b2ede0c28337f3df4bbd177192d8873570810bc9d0987f1f2b29f094f27adaa4aaf409c3a6b  hiredis-1.0.1.tar.gz
-4be1599851215547b4b994a966087024cc86b495dbfdcb9807dabcffb5505509f25398c55a07b2a8fb7221cf9c5d27738a38f8c87fe2e37d991a2de3cfa38451  system-hiredis.patch
-a066ceab985be6ae87f0c30b98a496e6929909ac5d94b21fac9544bc8f649b0c1f0b66760441a90dc8bc50f4d748775f3d3a042fe8a4b466b5371bfb49b16f7a  hiredis-0.14-compat.patch"
diff --git a/main/py3-hiredis/hiredis-0.14-compat.patch b/main/py3-hiredis/hiredis-0.14-compat.patch
deleted file mode 100644
index 86e0d3f585a..00000000000
--- a/main/py3-hiredis/hiredis-0.14-compat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- hiredis-1.0.0/src/reader.c
-+++ hiredis-1.0.0_p/src/reader.c
-@@ -167,7 +167,7 @@
- static void Reader_dealloc(hiredis_ReaderObject *self) {
-     // we don't need to free self->encoding as the buffer is managed by Python
-     // https://docs.python.org/3/c-api/arg.html#strings-and-buffers
--    redisReplyReaderFree(self->reader);
-+    redisReaderFree(self->reader);
-     Py_XDECREF(self->protocolErrorClass);
-     Py_XDECREF(self->replyErrorClass);
- 
-@@ -272,7 +272,7 @@
-       goto error;
-     }
- 
--    redisReplyReaderFeed(self->reader, (char *)buf.buf + off, len);
-+    redisReaderFeed(self->reader, (char *)buf.buf + off, len);
-     PyBuffer_Release(&buf);
-     Py_RETURN_NONE;
- 
-@@ -291,8 +291,8 @@
-         return NULL;
-     }
- 
--    if (redisReplyReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
--        errstr = redisReplyReaderGetError(self->reader);
-+    if (redisReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
-+        errstr = redisReaderGetError(self->reader);
-         /* protocolErrorClass might be a callable. call it, then use it's type */
-         err = createError(self->protocolErrorClass, errstr, strlen(errstr));
-         if (err != NULL) {
diff --git a/main/py3-hiredis/system-hiredis.patch b/main/py3-hiredis/system-hiredis.patch
deleted file mode 100644
index e5aaa28bc4f..00000000000
--- a/main/py3-hiredis/system-hiredis.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- hiredis-1.0.0/setup.py
-+++ hiredis-1.0.0_p/setup.py
-@@ -11,9 +11,8 @@
-   return module.__version__
- 
- ext = Extension("hiredis.hiredis",
--  sources=sorted(glob.glob("src/*.c") +
--                 ["vendor/hiredis/%s.c" % src for src in ("read", "sds")]),
--  include_dirs=["vendor"])
-+  sources=sorted(glob.glob("src/*.c")),
-+  libraries=["hiredis"])
- 
- setup(
-   name="hiredis",
diff --git a/main/py3-hoedown/APKBUILD b/main/py3-hoedown/APKBUILD
deleted file mode 100644
index 3769fb47535..00000000000
--- a/main/py3-hoedown/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Contributor: Eivind Uggedal <eu@eju.no>
-# Maintainer:
-pkgname=py3-hoedown
-_pkgname=hoedown
-pkgver=0.3.0
-pkgrel=1
-pkgdesc="Python binding for hoedown, a markdown parsing library"
-options="!check" # PyPi has no tests in tarball, github releases have broken versioning
-url="https://github.com/hhatto/python-hoedown"
-arch="all"
-license="MIT"
-makedepends="python3-dev py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-
-builddir="$srcdir"/$_pkgname-$pkgver
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="e0a51566ad19c1ee774b93b81092d8ab3c8de335e4789ac08f415fdf6f2aa3441ded88f165089cd7874e5dcf5ac1276dcafbb9481ec70d4d89b5d751a905fe18  hoedown-0.3.0.tar.gz"
diff --git a/main/py3-html5lib/APKBUILD b/main/py3-html5lib/APKBUILD
new file mode 100644
index 00000000000..37cee3bcd72
--- /dev/null
+++ b/main/py3-html5lib/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Contributor: Stefan Wagner <stw@bit-strickerei.de>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+pkgname=py3-html5lib
+_pkgname=html5lib
+pkgver=1.1
+pkgrel=5
+pkgdesc="A Python HTML parser"
+options="!check" # 1 test fail TypeError: object of type 'MarkDecorator' has no len()
+url="https://github.com/html5lib/html5lib-python"
+arch="noarch"
+license="MIT"
+depends="py3-six py3-webencodings"
+#checkdepends="py3-pytest py3-pytest-expect py3-mock"
+makedepends="py3-setuptools"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+builddir="$srcdir"/$_pkgname-$pkgver
+
+replaces="py-html5lib" # Backwards compatibility
+provides="py-html5lib=$pkgver-r$pkgrel" # Backwards compatibility
+
+build() {
+	python3 setup.py build
+}
+
+check() {
+	py.test-3
+}
+
+package() {
+	python3 setup.py install --skip-build --root="$pkgdir"
+}
+
+sha512sums="
+af7c29591007fded99be6c38e3d0ae5a4ac32d71d26046a615918ae732cb1c1ecbf754f47ceca1a53726c3843f3ecea7af87a7362281b45ff3af495815818626  html5lib-1.1.tar.gz
+"
diff --git a/main/py3-httplib2/APKBUILD b/main/py3-httplib2/APKBUILD
deleted file mode 100644
index 532085771f5..00000000000
--- a/main/py3-httplib2/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Peter Bui <pnutzh4x0r@gmail.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=py3-httplib2
-_pkgname=httplib2
-pkgver=0.15.0
-pkgrel=0
-pkgdesc="Python3 HTTP client library"
-url="https://github.com/httplib2/httplib2"
-arch="noarch"
-license="MIT"
-depends="python3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-httplib2" # Backwards compatibility
-provides="py-httplib2=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="be6884238fee6c2a75093204fb3c760da33d5ac04ebbb86f6a09f48ec70d44d8dbfccfe20b5d9c72745f42afedaf56bb783200b982dd2853b6bc91922961d390  httplib2-0.15.0.tar.gz"
diff --git a/main/py3-icu/APKBUILD b/main/py3-icu/APKBUILD
deleted file mode 100644
index 4726a556f72..00000000000
--- a/main/py3-icu/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=py3-icu
-_pkgname=PyICU
-pkgver=2.4.3
-pkgrel=1
-pkgdesc="Python3 binding for ICU"
-url="https://pypi.org/project/PyICU/"
-arch="all"
-license="MIT"
-makedepends="py3-setuptools python3-dev icu-dev"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-replaces="py-icu" # Backwards compatibility
-provides="py-icu=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 setup.py check
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="77b81b0e9a17972696967ebc0421d05c1119a43c7e853f8d939390dddefa4a2a35dd316e08c10c10a283472bb64738016e47c5f45c7c6191d9dba296057740a0  PyICU-2.4.3.tar.gz"
diff --git a/main/py3-idna/APKBUILD b/main/py3-idna/APKBUILD
index 50f5c05bc6d..5bcd5454669 100644
--- a/main/py3-idna/APKBUILD
+++ b/main/py3-idna/APKBUILD
@@ -1,27 +1,49 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-idna
 _pkgname=idna
-pkgver=2.9
+pkgver=3.7
 pkgrel=0
 pkgdesc="IDNA 2008 and UTS #46 for Python3"
 url="https://github.com/kjd/idna"
 arch="noarch"
 license="BSD-3-Clause"
 depends="python3"
-makedepends="py3-setuptools"
-source="idna-$pkgver.tar.gz::https://github.com/kjd/idna/archive/v$pkgver.tar.gz"
+makedepends="
+	py3-gpep517
+	py3-flit-core
+	py3-installer
+	py3-wheel
+	"
+checkdepends="py3-pytest"
+subpackages="$pkgname-pyc"
+source="$_pkgname-$pkgver.tar.gz::https://github.com/kjd/idna/archive/v$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 replaces="py-idna" # Backwards compatibility
 provides="py-idna=$pkgver-r$pkgrel" # Backwards compatibility
 
+# secfixes:
+#   3.7-r0:
+#     - CVE-2024-3651
+
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/$_pkgname-$pkgver-py3-none-any.whl
 }
 
-sha512sums="af15fefeaf3b4d90b2edf83a1ac15ffd0290678f43d734d27477d2a4866b01d4042558ddd26a3c80f6035f36d4760618708c5a86bf4f5b420fcbf203de4b82b1  idna-2.9.tar.gz"
+sha512sums="
+f753f37ae58fdb7b776c37757f7827c874eb13535db6427bc2a724e7ff1e28c2e3eb287a13eb97c37ee588d2c5217fe592f64ec305b122726ef5576c5317a34b  idna-3.7.tar.gz
+"
diff --git a/main/py3-imagesize/APKBUILD b/main/py3-imagesize/APKBUILD
index f3e5b0155f2..ee31cc88fe4 100644
--- a/main/py3-imagesize/APKBUILD
+++ b/main/py3-imagesize/APKBUILD
@@ -1,15 +1,16 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=py3-imagesize
-pkgver=1.2.0
-pkgrel=0
+pkgver=1.4.1
+pkgrel=4
 pkgdesc="Getting image size from png/jpeg/jpeg2000/gif file"
 url="https://github.com/shibukawa/imagesize_py"
 arch="noarch"
 license="MIT"
 depends="python3"
-makedepends="py3-setuptools"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
 checkdepends="py3-pytest"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/i/imagesize/imagesize-$pkgver.tar.gz"
 builddir="$srcdir/imagesize-$pkgver"
 
@@ -17,15 +18,20 @@ replaces="py-imagesize" # Backwards compatibility
 provides="py-imagesize=$pkgver-r$pkgrel" # Backwards compatibility
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
 }
 
 check() {
-	py.test-3 test/test_get.py -v
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest -v \
+		--deselect=test/test_get_filelike.py
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 }
 
-sha512sums="c82a7fe433064c3a60ed664bad8ce4e602c527bcf2f7c9ab9be6ed650654626d9e0907028b2b0c5a484712bc989335b2b4f66494c8d445f5043ed4c2bc519700  imagesize-1.2.0.tar.gz"
+sha512sums="
+f191d7fe34a01ab21b0f4f6519df8ab2a53c1ca54956f4d825d9cec5bd5f4c569491bdc26cb36fcaad2c453c35e51f69379f091362e206453aaefbda4802daa4  imagesize-1.4.1.tar.gz
+"
diff --git a/main/py3-importlib-metadata/APKBUILD b/main/py3-importlib-metadata/APKBUILD
deleted file mode 100644
index 114c810174f..00000000000
--- a/main/py3-importlib-metadata/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: prspkt <prspkt@protonmail.com>
-# Maintainer: prspkt <prspkt@protonmail.com>
-pkgname=py3-importlib-metadata
-_pkgname=importlib_metadata
-pkgver=1.6.0
-pkgrel=0
-pkgdesc="Tool to read metadata from Python packages"
-url="https://gitlab.com/python-devs/importlib_metadata"
-arch="noarch"
-license="Apache-2.0"
-depends="py3-zipp"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-replaces="py-importlib-metadata" # Backwards compatibility
-provides="py-importlib-metadata=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 setup.py check
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="4108d84a39da3c892a3b448027cca2835f6a68ac790b51b7cc4eb4ec925f5e8322847d86d8e89fbcec474258f592220f283116c82c536130aab70b96cea0435c  importlib_metadata-1.6.0.tar.gz"
diff --git a/main/py3-incremental/APKBUILD b/main/py3-incremental/APKBUILD
deleted file mode 100644
index d0fe29426eb..00000000000
--- a/main/py3-incremental/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: prspkt <prspkt@protonmail.com>
-# Maintainer: prspkt <prspkt@protonmail.com>
-pkgname=py3-incremental
-_pkgname=incremental
-pkgver=17.5.0
-pkgrel=3
-pkgdesc="Library that versions your Python3 projects"
-url="https://github.com/twisted/incremental"
-arch="noarch"
-license="MIT"
-makedepends="python3-dev py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-replaces="py-incremental" # Backwards compatibility
-provides="py-incremental=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc  incremental-17.5.0.tar.gz"
diff --git a/main/py3-iniconfig/APKBUILD b/main/py3-iniconfig/APKBUILD
new file mode 100644
index 00000000000..ffc96ae8a3b
--- /dev/null
+++ b/main/py3-iniconfig/APKBUILD
@@ -0,0 +1,53 @@
+# Contributor: mio <miyopan@e.email>
+# Contributor: Justin Berthault <justin.berthault@zaclys.net>
+# Maintainer: Will Sinatra <wpsinatra@gmail.com>
+pkgname=py3-iniconfig
+_pyname=iniconfig
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="brain-dead simple config-ini parsing"
+url="https://github.com/pytest-dev/iniconfig"
+arch="noarch"
+license="MIT"
+makedepends="
+	py3-gpep517
+	py3-setuptools
+	py3-wheel
+	py3-py
+	py3-hatch-vcs
+	py3-hatchling
+	"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/i/$_pyname/$_pyname-$pkgver.tar.gz
+	https://github.com/pytest-dev/$_pyname/raw/v$pkgver/testing/test_iniconfig.py
+	unittest_tests.patch
+	"
+builddir="$srcdir/$_pyname-$pkgver"
+
+prepare() {
+	cp "$srcdir"/test_iniconfig.py "$builddir"/test_iniconfig.py
+	default_prepare
+}
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m unittest -v
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
+}
+
+sha512sums="
+f0287115595a1ba074c5c77c3f7840efc2fef6c95c5ff3deaaf278c78b328f92187c358d5dd074b62c033db47952d99fc6d5164d4a48c81ba2c53d571eb76090  iniconfig-2.0.0.tar.gz
+3c0023cce2d7c37ae7e8086ab35a68d1b482502f241ed54de46830e09a4692cc548906f4ff70a638d03f5e0a5e06c079b6ef83a8398880ecf510b9db2e1d68a6  test_iniconfig.py
+c0c1344e284745f39fd27b053cab81a9f34d7a94583e66e696060968b00b089bf05bdbff3f5e03cd2168387a6511a5453eed586db4ab3256a660b2ccc6516920  unittest_tests.patch
+"
diff --git a/main/py3-iniconfig/unittest_tests.patch b/main/py3-iniconfig/unittest_tests.patch
new file mode 100644
index 00000000000..6a9f744132a
--- /dev/null
+++ b/main/py3-iniconfig/unittest_tests.patch
@@ -0,0 +1,477 @@
+--- a/test_iniconfig.py
++++ b/test_iniconfig.py
+@@ -1,5 +1,5 @@
+ from __future__ import annotations
+-import pytest
++import unittest
+ from iniconfig import IniConfig, ParseError, __all__ as ALL
+ from iniconfig._parse import _ParsedLine as PL
+ from iniconfig import iscommentline
+@@ -42,264 +42,270 @@
+ }
+ 
+ 
+-@pytest.fixture(params=sorted(check_tokens))
+-def input_expected(request: pytest.FixtureRequest) -> tuple[str, list[PL]]:
++class TestIniConfig(unittest.TestCase):
+ 
+-    return check_tokens[request.param]
+ 
++    def input_expected(self, key: str) -> tuple[str, list[PL]]:
++        # Sample usage: self.input_expected("value")
++        # Sample output: ('value = 1', [_ParsedLine(lineno=0, section=None,
++        # name='value', value='1')])
++        return check_tokens[key]
+ 
+-@pytest.fixture
+-def input(input_expected: tuple[str, list[PL]]) -> str:
+-    return input_expected[0]
+ 
++    def input(self, input_expected: tuple[str, list[PL]]) -> str:
++        # Sample usage: self.input(self.input_expected("value"))
++        return input_expected[0]
+ 
+-@pytest.fixture
+-def expected(input_expected: tuple[str, list[PL]]) -> list[PL]:
+-    return input_expected[1]
+ 
++    def expected(self, input_expected: tuple[str, list[PL]]) -> list[PL]:
++        # Sample usage: self.expected(self.input_expected("value"))
++        return input_expected[1]
+ 
+-def parse(input: str) -> list[PL]:
+-    from iniconfig._parse import parse_lines
+ 
+-    return parse_lines("sample", input.splitlines(True))
++    def parse(self, input: str) -> list[PL]:
++        # Sample usage: self.parse(self.input(self.input_expected("value")))
++        from iniconfig._parse import parse_lines
++        return parse_lines("sample", input.splitlines(True))
+ 
+ 
+-def parse_a_error(input: str) -> ParseError:
+-    try:
+-        parse(input)
+-    except ParseError as e:
+-        return e
+-    else:
+-        raise ValueError(input)
++    def parse_a_error(self, input: str) -> ParseError:
++        try:
++            self.parse(input)
++        except ParseError as e:
++            return e
++        else:
++            raise ValueError(input)
+ 
+ 
+-def test_tokenize(input: str, expected: list[PL]) -> None:
+-    parsed = parse(input)
+-    assert parsed == expected
++    def test_tokenize(self) -> None:
++        for i in sorted(check_tokens):
++            with self.subTest(i=i):
++                input_expected = self.input_expected(i)
++                parsed = self.parse(self.input(input_expected))
++                expected = self.expected(input_expected)
++                self.assertEqual(parsed, expected)
+ 
+ 
+-def test_parse_empty() -> None:
+-    parsed = parse("")
+-    assert not parsed
+-    ini = IniConfig("sample", "")
+-    assert not ini.sections
++    def test_parse_empty(self) -> None:
++        parsed = self.parse("")
++        self.assertFalse(parsed)
++        ini = IniConfig("sample", "")
++        self.assertFalse(ini.sections)
+ 
+ 
+-def test_ParseError() -> None:
+-    e = ParseError("filename", 0, "hello")
+-    assert str(e) == "filename:1: hello"
++    def test_ParseError(self) -> None:
++        e = ParseError("filename", 0, "hello")
++        self.assertEqual(str(e), "filename:1: hello")
+ 
+ 
+-def test_continuation_needs_perceeding_token() -> None:
+-    err = parse_a_error(" Foo")
+-    assert err.lineno == 0
++    def test_continuation_needs_perceeding_token(self) -> None:
++        err = self.parse_a_error(" Foo")
++        self.assertEqual(err.lineno, 0)
+ 
+ 
+-def test_continuation_cant_be_after_section() -> None:
+-    err = parse_a_error("[section]\n Foo")
+-    assert err.lineno == 1
++    def test_continuation_cant_be_after_section(self) -> None:
++        err = self.parse_a_error("[section]\n Foo")
++        self.assertEqual(err.lineno, 1)
+ 
+ 
+-def test_section_cant_be_empty() -> None:
+-    err = parse_a_error("[]")
+-    assert err.lineno == 0
++    def test_section_cant_be_empty(self) -> None:
++        err = self.parse_a_error("[]")
++        self.assertEqual(err.lineno, 0)
+ 
+ 
+-@pytest.mark.parametrize(
+-    "line",
+-    [
+-        "!!",
+-    ],
+-)
+-def test_error_on_weird_lines(line: str) -> None:
+-    parse_a_error(line)
++    def test_error_on_weird_lines(self) -> None:
++        line = [ "!!", ]
++        for l in line:
++            with self.subTest(l=l):
++                self.parse_a_error(l)
+ 
+ 
+-def test_iniconfig_from_file(tmp_path: Path) -> None:
+-    path = tmp_path / "test.txt"
+-    path.write_text("[metadata]\nname=1")
++    def test_iniconfig_from_file(self) -> None:
++        path = Path("test.txt")
++        path.write_text("[metadata]\nname=1")
+ 
+-    config = IniConfig(path=str(path))
+-    assert list(config.sections) == ["metadata"]
+-    config = IniConfig(str(path), "[diff]")
+-    assert list(config.sections) == ["diff"]
+-    with pytest.raises(TypeError):
+-        IniConfig(data=path.read_text())  # type: ignore
++        config = IniConfig(path=str(path))
++        self.assertEqual(list(config.sections), ["metadata"])
++        config = IniConfig(str(path), "[diff]")
++        self.assertEqual(list(config.sections), ["diff"])
++        with self.assertRaises(TypeError):
++            IniConfig(data=path.read_text())  # type: ignore
+ 
+ 
+-def test_iniconfig_section_first() -> None:
+-    with pytest.raises(ParseError) as excinfo:
+-        IniConfig("x", data="name=1")
+-    assert excinfo.value.msg == "no section header defined"
++    def test_iniconfig_section_first(self) -> None:
++        with self.assertRaisesRegex(ParseError, "no section header defined"):
++            IniConfig("x", data="name=1")
+ 
+ 
+-def test_iniconig_section_duplicate_fails() -> None:
+-    with pytest.raises(ParseError) as excinfo:
+-        IniConfig("x", data="[section]\n[section]")
+-    assert "duplicate section" in str(excinfo.value)
++    def test_iniconfig_section_duplicate_fails(self) -> None:
++        with self.assertRaisesRegex(ParseError, "duplicate section"):
++            IniConfig("x", data="[section]\n[section]")
+ 
+ 
+-def test_iniconfig_duplicate_key_fails() -> None:
+-    with pytest.raises(ParseError) as excinfo:
+-        IniConfig("x", data="[section]\nname = Alice\nname = bob")
++    def test_iniconfig_duplicate_key_fails(self) -> None:
++        with self.assertRaisesRegex(ParseError, "duplicate name"):
++            IniConfig("x", data="[section]\nname = Alice\nname = bob")
+ 
+-    assert "duplicate name" in str(excinfo.value)
+ 
++    def test_iniconfig_lineof(self) -> None:
++        config = IniConfig(
++            "x.ini",
++            data=("[section]\nvalue = 1\n[section2]\n# comment\nvalue =2"),
++        )
+ 
+-def test_iniconfig_lineof() -> None:
+-    config = IniConfig(
+-        "x.ini",
+-        data=("[section]\nvalue = 1\n[section2]\n# comment\nvalue =2"),
+-    )
++        self.assertIs(config.lineof("missing"), None)
++        self.assertEqual(config.lineof("section"), 1)
++        self.assertEqual(config.lineof("section2"), 3)
++        self.assertEqual(config.lineof("section", "value"), 2)
++        self.assertEqual(config.lineof("section2", "value"), 5)
+ 
+-    assert config.lineof("missing") is None
+-    assert config.lineof("section") == 1
+-    assert config.lineof("section2") == 3
+-    assert config.lineof("section", "value") == 2
+-    assert config.lineof("section2", "value") == 5
++        self.assertEqual(config["section"].lineof("value"), 2)
++        self.assertEqual(config["section2"].lineof("value"), 5)
+ 
+-    assert config["section"].lineof("value") == 2
+-    assert config["section2"].lineof("value") == 5
+ 
++    def test_iniconfig_get_convert(self) -> None:
++        config = IniConfig("x", data="[section]\nint = 1\nfloat = 1.1")
++        self.assertEqual(config.get("section", "int"), "1")
++        self.assertEqual(config.get("section", "int", convert=int), 1)
+ 
+-def test_iniconfig_get_convert() -> None:
+-    config = IniConfig("x", data="[section]\nint = 1\nfloat = 1.1")
+-    assert config.get("section", "int") == "1"
+-    assert config.get("section", "int", convert=int) == 1
+ 
++    def test_iniconfig_get_missing(self) -> None:
++        config = IniConfig("x", data="[section]\nint = 1\nfloat = 1.1")
++        self.assertEqual(config.get("section", "missing", default=1), 1)
++        self.assertIs(config.get("section", "missing"), None)
+ 
+-def test_iniconfig_get_missing() -> None:
+-    config = IniConfig("x", data="[section]\nint = 1\nfloat = 1.1")
+-    assert config.get("section", "missing", default=1) == 1
+-    assert config.get("section", "missing") is None
+ 
++    def test_section_get(self) -> None:
++        config = IniConfig("x", data="[section]\nvalue=1")
++        section = config["section"]
++        self.assertEqual(section.get("value", convert=int), 1)
++        self.assertEqual(section.get("value", 1), "1")
++        self.assertEqual(section.get("missing", 2), 2)
+ 
+-def test_section_get() -> None:
+-    config = IniConfig("x", data="[section]\nvalue=1")
+-    section = config["section"]
+-    assert section.get("value", convert=int) == 1
+-    assert section.get("value", 1) == "1"
+-    assert section.get("missing", 2) == 2
+ 
++    def test_missing_section(self) -> None:
++        config = IniConfig("x", data="[section]\nvalue=1")
++        with self.assertRaises(KeyError):
++            config["other"]
+ 
+-def test_missing_section() -> None:
+-    config = IniConfig("x", data="[section]\nvalue=1")
+-    with pytest.raises(KeyError):
+-        config["other"]
+ 
++    def test_section_getitem(self) -> None:
++        config = IniConfig("x", data="[section]\nvalue=1")
++        self.assertEqual(config["section"]["value"], "1")
++        self.assertEqual(config["section"]["value"], "1")
+ 
+-def test_section_getitem() -> None:
+-    config = IniConfig("x", data="[section]\nvalue=1")
+-    assert config["section"]["value"] == "1"
+-    assert config["section"]["value"] == "1"
+ 
++    def test_section_iter(self) -> None:
++        config = IniConfig("x", data="[section]\nvalue=1")
++        names = list(config["section"])
++        self.assertEqual(names, ["value"])
++        items = list(config["section"].items())
++        self.assertEqual(items, [("value", "1")])
+ 
+-def test_section_iter() -> None:
+-    config = IniConfig("x", data="[section]\nvalue=1")
+-    names = list(config["section"])
+-    assert names == ["value"]
+-    items = list(config["section"].items())
+-    assert items == [("value", "1")]
+ 
++    def test_config_iter(self) -> None:
++        config = IniConfig(
++            "x.ini",
++            data=dedent(
++                """
++            [section1]
++            value=1
++            [section2]
++            value=2
++        """
++            ),
++        )
++        l = list(config)
++        self.assertEqual(len(l), 2)
++        self.assertEqual(l[0].name, "section1")
++        self.assertEqual(l[0]["value"], "1")
++        self.assertEqual(l[1].name, "section2")
++        self.assertEqual(l[1]["value"], "2")
+ 
+-def test_config_iter() -> None:
+-    config = IniConfig(
+-        "x.ini",
+-        data=dedent(
+-            """
+-          [section1]
+-          value=1
+-          [section2]
+-          value=2
+-    """
+-        ),
+-    )
+-    l = list(config)
+-    assert len(l) == 2
+-    assert l[0].name == "section1"
+-    assert l[0]["value"] == "1"
+-    assert l[1].name == "section2"
+-    assert l[1]["value"] == "2"
+ 
++    def test_config_contains(self) -> None:
++        config = IniConfig(
++            "x.ini",
++            data=dedent(
++                """
++            [section1]
++            value=1
++            [section2]
++            value=2
++        """
++            ),
++        )
++        self.assertNotIn("xyz", config)
++        self.assertIn("section1", config)
++        self.assertIn("section2", config)
+ 
+-def test_config_contains() -> None:
+-    config = IniConfig(
+-        "x.ini",
+-        data=dedent(
+-            """
+-          [section1]
+-          value=1
+-          [section2]
+-          value=2
+-    """
+-        ),
+-    )
+-    assert "xyz" not in config
+-    assert "section1" in config
+-    assert "section2" in config
+ 
++    def test_iter_file_order(self) -> None:
++        config = IniConfig(
++            "x.ini",
++            data=dedent("""
++        [section2] #cpython dict ordered before section
++        value = 1
++        value2 = 2 # dict ordered before value
++        [section]
++        a = 1
++        b = 2
++        """
++            ),
++        )
++        l = list(config)
++        secnames = [x.name for x in l]
++        self.assertEqual(secnames, ["section2", "section"])
++        self.assertEqual(list(config["section2"]), ["value", "value2"])
++        self.assertEqual(list(config["section"]), ["a", "b"])
+ 
+-def test_iter_file_order() -> None:
+-    config = IniConfig(
+-        "x.ini",
+-        data="""
+-[section2] #cpython dict ordered before section
+-value = 1
+-value2 = 2 # dict ordered before value
+-[section]
+-a = 1
+-b = 2
+-""",
+-    )
+-    l = list(config)
+-    secnames = [x.name for x in l]
+-    assert secnames == ["section2", "section"]
+-    assert list(config["section2"]) == ["value", "value2"]
+-    assert list(config["section"]) == ["a", "b"]
+ 
++    def test_example_pypirc(self) -> None:
++        config = IniConfig(
++            "pypirc",
++            data=dedent(
++                """
++            [distutils]
++            index-servers =
++                pypi
++                other
+ 
+-def test_example_pypirc() -> None:
+-    config = IniConfig(
+-        "pypirc",
+-        data=dedent(
+-            """
+-        [distutils]
+-        index-servers =
+-            pypi
+-            other
++            [pypi]
++            repository: <repository-url>
++            username: <username>
++            password: <password>
+ 
+-        [pypi]
+-        repository: <repository-url>
+-        username: <username>
+-        password: <password>
++            [other]
++            repository: http://example.com/pypi
++            username: <username>
++            password: <password>
++        """
++            ),
++        )
++        distutils, pypi, other = list(config)
++        self.assertEqual(distutils["index-servers"], "pypi\nother")
++        self.assertEqual(pypi["repository"], "<repository-url>")
++        self.assertEqual(pypi["username"], "<username>")
++        self.assertEqual(pypi["password"], "<password>")
++        self.assertEqual(["repository", "username", "password"], list(other))
+ 
+-        [other]
+-        repository: http://example.com/pypi
+-        username: <username>
+-        password: <password>
+-    """
+-        ),
+-    )
+-    distutils, pypi, other = list(config)
+-    assert distutils["index-servers"] == "pypi\nother"
+-    assert pypi["repository"] == "<repository-url>"
+-    assert pypi["username"] == "<username>"
+-    assert pypi["password"] == "<password>"
+-    assert ["repository", "username", "password"] == list(other)
+ 
++    def test_api_import(self) -> None:
++        self.assertEqual(ALL, ["IniConfig", "ParseError", "COMMENTCHARS",
++            "iscommentline"])
+ 
+-def test_api_import() -> None:
+-    assert ALL == ["IniConfig", "ParseError", "COMMENTCHARS", "iscommentline"]
+ 
++    def test_iscommentline_true(self) -> None:
++        line = [
++            "#qwe",
++            "  #qwe",
++            ";qwe",
++            " ;qwe",
++        ]
++        for l in line:
++            with self.subTest(l=l):
++                self.assertTrue(iscommentline(l))
+ 
+-@pytest.mark.parametrize(
+-    "line",
+-    [
+-        "#qwe",
+-        "  #qwe",
+-        ";qwe",
+-        " ;qwe",
+-    ],
+-)
+-def test_iscommentline_true(line: str) -> None:
+-    assert iscommentline(line)
++
++if __name__ == "__main__":
++    unittest.main()
diff --git a/main/py3-installer/APKBUILD b/main/py3-installer/APKBUILD
new file mode 100644
index 00000000000..e90fbb381fb
--- /dev/null
+++ b/main/py3-installer/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Sean McAvoy <seanmcavoy@gmail.com>
+# Maintainer: Sean McAvoy <seanmcavoy@gmail.com>
+pkgname=py3-installer
+pkgver=0.7.0
+pkgrel=2
+pkgdesc="low-level library for installing from a Python wheel distribution"
+url="https://github.com/pypa/installer"
+arch="noarch"
+license="MIT"
+depends="python3"
+checkdepends="py3-pytest"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/py3/i/installer/installer-$pkgver-py3-none-any.whl
+	default-bytecode-levels.patch
+	"
+# checkdepends causes weird circular behaviour,
+# because py3-pytest depends on this down the chain
+options="!check"
+
+unpack() {
+	default_unpack
+
+	# we have to use the wheel because py3-installer is the base to be able to
+	# install generated wheels, so we don't have it when building it itself
+	mkdir -p "$builddir"
+	unzip -d "$builddir" "$srcdir"/installer-$pkgver-py3-none-any.whl
+}
+
+package() {
+	local sitedir="$(python3 -c 'import site;print(site.getsitepackages()[0])')"
+	mkdir -p "$pkgdir/$sitedir"
+	cp -a installer* "$pkgdir/$sitedir"
+
+	python3 -m compileall "$pkgdir/$sitedir"
+}
+
+sha512sums="
+8e10013521238ef8fb2f5ab4bd00f6154c05046011cad8824d96b7cdc4ed235b87e534d1e163a47a11dbfb5bb3cf19d9a2ea3edd1e9c9ce5fbc9a375010c36dc  installer-0.7.0-py3-none-any.whl
+d389b34e2de943823978b1a8a782a6e14a50b577870e71a95a4482ffbbf3a79217e0aa00673166f5e75d6ce9c07ee4d029d7baa8b37c0914a2429e2e04df4dd4  default-bytecode-levels.patch
+"
diff --git a/main/py3-installer/default-bytecode-levels.patch b/main/py3-installer/default-bytecode-levels.patch
new file mode 100644
index 00000000000..d588e66f447
--- /dev/null
+++ b/main/py3-installer/default-bytecode-levels.patch
@@ -0,0 +1,26 @@
+the previous default of 0, 1 causes opt-1 bytecode to also be generated,
+which is not used without passing `-O` to `python3` anyway, and doubles
+the size of the resulting package
+
+diff --git a/installer/__main__.py b/installer/__main__.py
+index 51014b9..2a389e8 100644
+--- a/installer/__main__.py
++++ b/installer/__main__.py
+@@ -36,7 +36,7 @@ def _get_main_parser() -> argparse.ArgumentParser:
+         metavar="level",
+         type=int,
+         choices=[0, 1, 2],
+-        help="generate bytecode for the specified optimization level(s) (default=0, 1)",
++        help="generate bytecode for the specified optimization level(s) (default=0)",
+     )
+     parser.add_argument(
+         "--no-compile-bytecode",
+@@ -81,7 +81,7 @@ def _main(cli_args: Sequence[str], program: Optional[str] = None) -> None:
+     if args.no_compile_bytecode:
+         bytecode_levels = []
+     elif not bytecode_levels:
+-        bytecode_levels = [0, 1]
++        bytecode_levels = [0]
+ 
+     with WheelFile.open(args.wheel) as source:
+         destination = SchemeDictionaryDestination(
diff --git a/main/py3-ipaddress/APKBUILD b/main/py3-ipaddress/APKBUILD
deleted file mode 100644
index dd39f8ac263..00000000000
--- a/main/py3-ipaddress/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname=py3-ipaddress
-_pkgname=ipaddress
-pkgver=1.0.23
-pkgrel=1
-pkgdesc="IPv4/IPv6 manipulation library"
-url="https://github.com/phihag/ipaddress"
-arch="noarch"
-license="Python-2.0"
-depends="python3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-ipaddress" # Backwards compatibility
-provides="py-ipaddress=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="340e2a8698df1868038f55889671442eba17f06ec3f493759d8d0a9bf406eefbe1f67c14ca616f52e5bf2280942dcece7e89fb19de0923bee1ee20e60f48896e  ipaddress-1.0.23.tar.gz"
diff --git a/main/py3-itsdangerous/APKBUILD b/main/py3-itsdangerous/APKBUILD
deleted file mode 100644
index ef04edb1077..00000000000
--- a/main/py3-itsdangerous/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Maintainer:
-pkgname=py3-itsdangerous
-_pkgname=itsdangerous
-pkgver=0.24
-pkgrel=6
-pkgdesc="Python3 helper to pass trusted data to untrusted environments"
-url="https://github.com/mitsuhiko/itsdangerous"
-arch="noarch"
-license="BSD-3-Clause"
-depends="python3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-itsdangerous" # Backwards compatibility
-provides="py-itsdangerous=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="2863b6e5fda178db59bd214c6d24d04422c1021bb41bf11598aba1cbc43053aff3bb1e0539940b5769de04b68c03e8bd01d728dcbfc4bd0ba05867688574a297  itsdangerous-0.24.tar.gz"
diff --git a/main/py3-jinja2/APKBUILD b/main/py3-jinja2/APKBUILD
index db4f6ec4f33..f07971ebd4a 100644
--- a/main/py3-jinja2/APKBUILD
+++ b/main/py3-jinja2/APKBUILD
@@ -2,29 +2,35 @@
 # Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=py3-jinja2
 _pkgname=Jinja2
-pkgver=2.11.1
-pkgrel=0
+pkgver=3.1.3
+pkgrel=1
 pkgdesc="A small but fast and easy to use stand-alone python template engine"
 url="https://palletsprojects.com/p/jinja/"
 arch="noarch"
 license="BSD-3-Clause"
 depends="py3-markupsafe"
 checkdepends="py3-pytest"
-makedepends="python3-dev py3-setuptools"
-subpackages="$pkgname-doc $pkgname-vim"
+makedepends="python3-dev py3-gpep517 py3-setuptools py3-wheel"
+subpackages="$pkgname-pyc $pkgname-doc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
+# secfixes:
+#   1.11.3-r0:
+#     - CVE-2020-28493
+
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
 }
 
 check() {
-	PYTHONPATH="$builddir/src" python3 -m pytest .
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest -W ignore::DeprecationWarning
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 
 	local docdir="$pkgdir/usr/share/doc/$pkgname"
 	# Note: The documentation in the docs directory needs to be generated
@@ -36,13 +42,6 @@ package() {
 	install -m 644 -D LICENSE.rst "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.rst
 }
 
-vim() {
-	pkgdesc="Vim syntax for Jinja2"
-	depends="vim"
-	install_if="$pkgname=$pkgver-r$pkgrel vim"
-
-	install -m 644 -D "$builddir"/ext/Vim/jinja.vim \
-		"$subpkgdir"/usr/share/vim/vimfiles/syntax/jinja.vim
-}
-
-sha512sums="a9b7c1c0151f3b1a0764dc36f489104f30cc84f61d81cf018d7a5e9b5390ad07eb27d3d3d497812ea4130ddbd9142060117947c3283b1a646ce196709183ada6  Jinja2-2.11.1.tar.gz"
+sha512sums="
+5c36d0cd094b40626511f30c561176c095c49ef4066c2752a9edc3e6feb2430dafa866c17deebddcd0168aa1f0fd3944916d592c5c999639b8152e7c1009c700  Jinja2-3.1.3.tar.gz
+"
diff --git a/main/py3-jwt/APKBUILD b/main/py3-jwt/APKBUILD
deleted file mode 100644
index 5ff43079d0e..00000000000
--- a/main/py3-jwt/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Contributor: Eivind Uggedal <eu@eju.no>
-# Maintainer:
-pkgname=py3-jwt
-_pkgname=PyJWT
-pkgver=1.7.1
-pkgrel=3
-pkgdesc="Python3 JSON Web Token implementation"
-url="https://github.com/jpadilla/pyjwt"
-arch="noarch"
-license="MIT"
-depends="python3"
-makedepends="py3-setuptools"
-checkdepends="py3-pytest"
-subpackages="$pkgname-cli"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
-	no-cov-report.patch
-	"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-jwt" # Backwards compatibility
-provides="py-jwt=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	python3 -m pytest .
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-cli() {
-	pkgdesc="$pkgdesc (CLI utility)"
-	depends="py3-jwt=$pkgver-r$pkgrel"
-
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
-}
-
-sha512sums="70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4  PyJWT-1.7.1.tar.gz
-886877c4e40005d254abf6f00389e7e69e1a781119c29da7632e3f475b526e15b2387ab1bc5bade07234932c3a7396c06298540bdd1596a79a4a5e62b64517fc  no-cov-report.patch"
diff --git a/main/py3-jwt/no-cov-report.patch b/main/py3-jwt/no-cov-report.patch
deleted file mode 100644
index 9efb3d22198..00000000000
--- a/main/py3-jwt/no-cov-report.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Avoid installing additional test dependencies.
-
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -8,7 +8,6 @@
- universal = 1
- 
- [tool:pytest]
--addopts = --cov-report term-missing --cov-config=.coveragerc --cov .
- 
- [aliases]
- test = pytest
diff --git a/main/py3-libvirt/APKBUILD b/main/py3-libvirt/APKBUILD
deleted file mode 100644
index 570491cf14c..00000000000
--- a/main/py3-libvirt/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname=py3-libvirt
-_pkgname=libvirt-python
-pkgver=6.1.0
-pkgrel=0
-pkgdesc="The libvirt virtualization API python binding"
-url="http://libvirt.org"
-arch="all"
-license="LGPL-2.0-or-later"
-makedepends="py3-setuptools python3-dev libvirt-dev"
-source="https://libvirt.org/sources/python/$_pkgname-$pkgver.tar.gz
-	musl-gnuc-prereq.patch
-	"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-libvirt" # Backwards compatibility
-provides="py-libvirt=$pkgver" # Backwards compatibility
-
-check() {
-	cd "$builddir"
-	python3 setup.py check
-}
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="a7994e21cbd5aa9c16aa4baa0e314ab3d71b15692e50da8f243994aee7393cc4dd2a27b39def87599ecfc32764980c71069ce4c904edc379219bd76a6344ce1e  libvirt-python-6.1.0.tar.gz
-8aa1d814f8388ebff0736ee138c780323381cd4cf39b4a4faed2e2a1fe5911facc34505a85b0977d8b4240b8ce2f4a6d0414790693c4f45ff7d9592e9d6a3ff8  musl-gnuc-prereq.patch"
diff --git a/main/py3-libvirt/musl-gnuc-prereq.patch b/main/py3-libvirt/musl-gnuc-prereq.patch
deleted file mode 100644
index 2e3c95e3f4a..00000000000
--- a/main/py3-libvirt/musl-gnuc-prereq.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- libvirt-python-1.2.0.orig/libvirt-utils.h
-+++ libvirt-python-1.2.0/libvirt-utils.h
-@@ -28,6 +28,15 @@
- #  define MIN(a,b) (((a) < (b)) ? (a) : (b))
- # endif
- 
-+# ifndef __GNUC_PREREQ
-+#  if defined __GNUC__ && defined __GNUC_MINOR__
-+#   define __GNUC_PREREQ(maj, min) \
-+        ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-+# else
-+#  define __GNUC_PREREQ(maj, min) 0
-+# endif
-+#endif
-+
- /**
-  * libvirt.h provides this as of version 1.2.0, but we want to be able
-  * to support older versions of libvirt so copy and paste the macro from
diff --git a/main/py3-lockfile/APKBUILD b/main/py3-lockfile/APKBUILD
deleted file mode 100644
index c18384937a0..00000000000
--- a/main/py3-lockfile/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=py3-lockfile
-_pkgname=lockfile
-pkgver=0.12.2
-pkgrel=3
-pkgdesc="A Python file locking module"
-url="https://github.com/openstack/pylockfile"
-arch="noarch"
-license="MIT"
-depends="python3"
-makedepends="py3-pbr py3-setuptools"
-checkdepends="py3-nose"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-replaces=py-lockfile # Backwards compatibility
-provides=py-lockfile=$pkgver-r$pkgrel # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	nosetests
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="67b7d651d7e963a497c2604912c61eed90181cdd09c744a0ceaa26e6bbe09d1a871ce48be3949b7da7ea6b366b15492c8c8de589edeca2641ca5e6cb3804df07  lockfile-0.12.2.tar.gz"
diff --git a/main/py3-lxc/APKBUILD b/main/py3-lxc/APKBUILD
index 88f7b8a7181..985a74bfbb5 100644
--- a/main/py3-lxc/APKBUILD
+++ b/main/py3-lxc/APKBUILD
@@ -1,24 +1,27 @@
 # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=py3-lxc
-pkgver=3.0.4
-pkgrel=1
+pkgver=5.0.0
+pkgrel=4
 pkgdesc="Python3 bindings for LXC"
 options="!check" # No testsuite
 url="https://linuxcontainers.org"
 arch="all"
 license="LGPL-2.1-or-later"
 depends="python3"
-makedepends="python3-dev py3-setuptools lxc-dev"
+makedepends="lxc-dev python3-dev py3-gpep517 py3-setuptools py3-wheel"
+subpackages="$pkgname-pyc"
 source="https://linuxcontainers.org/downloads/lxc/python3-lxc-$pkgver.tar.gz"
 builddir="$srcdir/python3-lxc-$pkgver"
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 }
 
-sha512sums="37660fe97a2171cc3346c31e736ead8a38e328bfcbea621d6b563042fcd1e70c48b97440f6263fb0f6f02a4f1704af2241661bc526921c124a6456c06a497828  python3-lxc-3.0.4.tar.gz"
+sha512sums="
+4a1c9af0c322fbfe13ab0778e438ad4bc4ffde153e7fb55b594b6381c6875a93b7d0476bd1d7bcd7344a2d6de81ce6f5fd96519926a32b4acea27acf1bcd2011  python3-lxc-5.0.0.tar.gz
+"
diff --git a/main/py3-lxml/APKBUILD b/main/py3-lxml/APKBUILD
index e62e5e974be..41c720d0fd3 100644
--- a/main/py3-lxml/APKBUILD
+++ b/main/py3-lxml/APKBUILD
@@ -3,29 +3,63 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-lxml
 _pkgname=lxml
-pkgver=4.5.0
+pkgver=5.1.0
 pkgrel=0
 pkgdesc="Python3 LXML Library"
 url="https://lxml.de/"
 arch="all"
 license="BSD-3-Clause AND ZPL-2.0 AND ElementTree"
-makedepends="python3-dev libxml2-dev libxslt-dev py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+makedepends="
+	cython
+	libxml2-dev
+	libxslt-dev
+	py3-gpep517
+	py3-setuptools
+	py3-wheel
+	python3-dev
+	"
+checkdepends="py3-html5lib"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
+	libxml-2.11.0.patch
+	tests-fix-encoding-name.patch
+	fix-test_elementtree-with-expat-2.6.0.patch
+	"
 builddir="$srcdir/$_pkgname-$pkgver"
 
-replaces="py-lxml" # Backwards compatibility
-provides="py-lxml=$pkgver-r$pkgrel" # Backwards compatibility
+# secfixes:
+#   4.9.2-r0:
+#     - CVE-2022-2309
+#   4.6.5-r0:
+#     - CVE-2021-43818
+#   4.6.2-r0:
+#     - CVE-2020-27783
+#   4.6.3-r0:
+#     - CVE-2021-28957
 
 build() {
-	python3 setup.py build
+	export CFLAGS="$CFLAGS -flto=auto"
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--config-json '{"--build-option": ["--with-cython"]}' \
+		--output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 setup.py check
+	local testpy3="$builddir"/.testenv/bin/python3
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	make PYTHON="$testpy3" PYTHON3="$testpy3" test
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="7cb957b2ab9931c32984ad0808f51e650e82e2d9b14df3fd8df2dd8f2c5c261d26ebf2c672b723e89b00b867a0a8dbb9130023e48a5f302fd02d5409e1c8cd6c  lxml-4.5.0.tar.gz"
+sha512sums="
+a538f322686a1b2c63211d915db900116b7db467a1cce0a0ad7a93e6c15195a66dc6d091301d1918f2cb513ee3168be939945ae60aa470fd9604f6d46e9eb375  lxml-5.1.0.tar.gz
+6436f87042563bb3a08bd7d0216fdb284d639b1a72fde77dce75d7c3e63f4f18ba115df9540fe4298f558df53f9dbfbd781374138544e8e5d9cb5ca5928f343c  libxml-2.11.0.patch
+ef5ba4064166443e07040db315173a4d0cb0d83eb3cd49623f210253a25433ec1c408d6d8e538f93498a211bc1695fdaa3e39f8ac75f36a3319c38bd96ba73eb  tests-fix-encoding-name.patch
+7edb98daa4ea776c18c0b59fed6e54d4bb6e1c14101cdc768a4e5c803b6d94147dc2e13dc5fb3a48e6faa952ef1f7a16712fb6b0306351db6c4e0063f432fac1  fix-test_elementtree-with-expat-2.6.0.patch
+"
diff --git a/main/py3-lxml/fix-test_elementtree-with-expat-2.6.0.patch b/main/py3-lxml/fix-test_elementtree-with-expat-2.6.0.patch
new file mode 100644
index 00000000000..a75644bc2c4
--- /dev/null
+++ b/main/py3-lxml/fix-test_elementtree-with-expat-2.6.0.patch
@@ -0,0 +1,100 @@
+From 3ccc7d583e325ceb0ebdf8fc295bbb7fc8cd404d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Sat, 2 Mar 2024 06:51:01 +0100
+Subject: [PATCH] Fix test_elementtree with Expat 2.6.0 (GH-407)
+
+Feeding the parser by too small chunks defers parsing to prevent
+CVE-2023-52425. Future versions of Expat may be more reactive.
+
+Heavily inspired by https://github.com/python/cpython/commit/4a08e7b3431cd32a0daf22a33421cd3035343dc4
+
+We cannot use a @fails_with_expat_2_6_0 decorator
+because the test passes in ETreePullTestCase.
+
+See https://github.com/python/cpython/issues/115133
+See https://github.com/advisories/GHSA-gh68-jm46-84rf
+Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
+---
+ src/lxml/tests/test_elementtree.py | 62 +++++++++++++++++++-----------
+ 1 file changed, 39 insertions(+), 23 deletions(-)
+
+diff --git a/src/lxml/tests/test_elementtree.py b/src/lxml/tests/test_elementtree.py
+index 8ccf4442a..ef923c5ce 100644
+--- a/src/lxml/tests/test_elementtree.py
++++ b/src/lxml/tests/test_elementtree.py
+@@ -10,6 +10,7 @@
+ import io
+ import operator
+ import os
++import pyexpat
+ import re
+ import sys
+ import textwrap
+@@ -4383,29 +4384,44 @@ def assert_event_tags(self, parser, expected, max_events=None):
+         self.assertEqual([(action, elem.tag) for action, elem in events],
+                          expected)
+ 
+-    def test_simple_xml(self):
+-        for chunk_size in (None, 1, 5):
+-            #with self.subTest(chunk_size=chunk_size):
+-                parser = self.etree.XMLPullParser()
+-                self.assert_event_tags(parser, [])
+-                self._feed(parser, "<!-- comment -->\n", chunk_size)
+-                self.assert_event_tags(parser, [])
+-                self._feed(parser,
+-                           "<root>\n  <element key='value'>text</element",
+-                           chunk_size)
+-                self.assert_event_tags(parser, [])
+-                self._feed(parser, ">\n", chunk_size)
+-                self.assert_event_tags(parser, [('end', 'element')])
+-                self._feed(parser, "<element>text</element>tail\n", chunk_size)
+-                self._feed(parser, "<empty-element/>\n", chunk_size)
+-                self.assert_event_tags(parser, [
+-                    ('end', 'element'),
+-                    ('end', 'empty-element'),
+-                    ])
+-                self._feed(parser, "</root>\n", chunk_size)
+-                self.assert_event_tags(parser, [('end', 'root')])
+-                root = self._close_and_return_root(parser)
+-                self.assertEqual(root.tag, 'root')
++    def test_simple_xml(self, chunk_size=None):
++        parser = self.etree.XMLPullParser()
++        self.assert_event_tags(parser, [])
++        self._feed(parser, "<!-- comment -->\n", chunk_size)
++        self.assert_event_tags(parser, [])
++        self._feed(parser,
++                   "<root>\n  <element key='value'>text</element",
++                   chunk_size)
++        self.assert_event_tags(parser, [])
++        self._feed(parser, ">\n", chunk_size)
++        self.assert_event_tags(parser, [('end', 'element')])
++        self._feed(parser, "<element>text</element>tail\n", chunk_size)
++        self._feed(parser, "<empty-element/>\n", chunk_size)
++        self.assert_event_tags(parser, [
++            ('end', 'element'),
++            ('end', 'empty-element'),
++            ])
++        self._feed(parser, "</root>\n", chunk_size)
++        self.assert_event_tags(parser, [('end', 'root')])
++        root = self._close_and_return_root(parser)
++        self.assertEqual(root.tag, 'root')
++
++    def test_simple_xml_chunk_1(self):
++        if self.etree is not etree and pyexpat.version_info >= (2, 6, 0):
++            raise unittest.SkipTest(
++                "Feeding the parser by too small chunks defers parsing"
++            )
++        self.test_simple_xml(chunk_size=1)
++
++    def test_simple_xml_chunk_5(self):
++        if self.etree is not etree and pyexpat.version_info >= (2, 6, 0):
++            raise unittest.SkipTest(
++                "Feeding the parser by too small chunks defers parsing"
++            )
++        self.test_simple_xml(chunk_size=5)
++
++    def test_simple_xml_chunk_22(self):
++        self.test_simple_xml(chunk_size=22)
+ 
+     def test_feed_while_iterating(self):
+         parser = self.etree.XMLPullParser()
diff --git a/main/py3-lxml/libxml-2.11.0.patch b/main/py3-lxml/libxml-2.11.0.patch
new file mode 100644
index 00000000000..fc039a2c485
--- /dev/null
+++ b/main/py3-lxml/libxml-2.11.0.patch
@@ -0,0 +1,12 @@
+diff --git a/src/lxml/tests/test_io.py b/src/lxml/tests/test_io.py
+index cbdbcef..efbd3fd 100644
+--- a/src/lxml/tests/test_io.py
++++ b/src/lxml/tests/test_io.py
+@@ -312,6 +312,7 @@ class _IOTestCaseBase(HelperTestCase):
+         self.assertEqual(5, len(boms))
+         xml = uxml.encode("utf-16")
+         self.assertTrue(xml[:2] in boms, repr(xml[:2]))
++        return True
+ 
+         f = tempfile.NamedTemporaryFile(delete=False)
+         try:
diff --git a/main/py3-lxml/tests-fix-encoding-name.patch b/main/py3-lxml/tests-fix-encoding-name.patch
new file mode 100644
index 00000000000..c25246dff93
--- /dev/null
+++ b/main/py3-lxml/tests-fix-encoding-name.patch
@@ -0,0 +1,14 @@
+From: Patrycja Rosa <alpine@ptrcnull.me>
+Date: Thu, 10 Feb 2022 14:09:24 +0100
+Subject: test_incremental_xmlfile: fix encoding name
+
+diff --git a/src/lxml/tests/test_incremental_xmlfile.py b/src/lxml/tests/test_incremental_xmlfile.py
+--- a/src/lxml/tests/test_incremental_xmlfile.py
++++ b/src/lxml/tests/test_incremental_xmlfile.py
+@@ -173,4 +173,4 @@
+-        with etree.xmlfile(self._file, encoding='utf16') as xf:
++        with etree.xmlfile(self._file, encoding='utf-16') as xf:
+             with xf.element('test'):
+                 xf.write('toast')
+-        self.assertXml('<test>toast</test>', encoding='utf16')
++        self.assertXml('<test>toast</test>', encoding='utf-16')
diff --git a/main/py3-mako/APKBUILD b/main/py3-mako/APKBUILD
index f52209876b7..e98ab795de5 100644
--- a/main/py3-mako/APKBUILD
+++ b/main/py3-mako/APKBUILD
@@ -2,26 +2,41 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py3-mako
 _pkgname=Mako
-pkgver=1.1.2
-pkgrel=0
+pkgver=1.3.2
+pkgrel=2
 pkgdesc="Python3 fast templating language"
 url="https://www.makotemplates.org/"
 arch="noarch"
 license="MIT"
 depends="python3 py3-markupsafe"
-makedepends="py3-setuptools"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="py3-babel py3-pytest"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir"/$_pkgname-$pkgver
 
 replaces="py-mako" # Backwards compatibility
 provides="py-mako=$pkgver-r$pkgrel" # Backwards compatibility
 
+# secfixes:
+#   1.2.2-r0:
+#     - CVE-2022-40023
+
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	# unpackaged py3-lingua
+	.testenv/bin/python3 -m pytest --ignore test/ext/test_linguaplugin.py
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 }
 
-sha512sums="73b7a32ceb6e39dc2491734546c83a752bf0c8bc7546bb236801c02a5bccc5b59f2440333a328ff747eee936612dd12279f08d27d76f065fd589081d232692a8  Mako-1.1.2.tar.gz"
+sha512sums="
+acde7b4be929fdd97f2a3fc133966ffc44b5706dbdd3f1af0fee16620b3c82d12b1a67b7292a229084ebb4f0c392e8db1b2844112baa3c6a5fd2be8777b04897  Mako-1.3.2.tar.gz
+"
diff --git a/main/py3-markdown/APKBUILD b/main/py3-markdown/APKBUILD
new file mode 100644
index 00000000000..5feeb2432c6
--- /dev/null
+++ b/main/py3-markdown/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+pkgname=py3-markdown
+_pkgname=Markdown
+pkgver=3.6
+pkgrel=0
+pkgdesc="Python3 implementation of Markdown"
+url="https://python-markdown.github.io/"
+arch="noarch"
+license="BSD-3-Clause"
+makedepends="
+	py3-gpep517
+	py3-setuptools
+	py3-wheel
+	"
+checkdepends="py3-coverage py3-yaml"
+subpackages="$pkgname-pyc"
+source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$pkgver"
+
+replaces="py-markdown" # Backwards compatibility
+provides="py-markdown=$pkgver-r$pkgrel" # Backwards compatibility
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m unittest discover tests
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
+}
+
+sha512sums="
+a523f75ea72fa71f4f0f1a59523bb1a6c5c7605ba5a0be4dc37aa5bd5c87e32563f5253404485c99c13caa27501c9003aea524154a7999a22e6497829492b997  py3-markdown-3.6.tar.gz
+"
diff --git a/main/py3-markupsafe/APKBUILD b/main/py3-markupsafe/APKBUILD
index 897b14ed0b1..410d4ed0e36 100644
--- a/main/py3-markupsafe/APKBUILD
+++ b/main/py3-markupsafe/APKBUILD
@@ -2,14 +2,16 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py3-markupsafe
 _pkgname=MarkupSafe
-pkgver=1.1.1
-pkgrel=3
+pkgver=2.1.5
+pkgrel=1
 pkgdesc="Implements a XML/HTML/XHTML Markup safe string"
-url="https://github.com/mitsuhiko/markupsafe"
+url="https://github.com/pallets/markupsafe"
 arch="all"
 license="BSD-3-Clause"
 depends="python3"
-makedepends="python3-dev py3-setuptools"
+makedepends="python3-dev py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="pytest"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
@@ -17,16 +19,20 @@ replaces="py-markupsafe" # Backwards compatibility
 provides="py-markupsafe=$pkgver-r$pkgrel" # Backwards compatibility
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 setup.py test
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 	find "$pkgdir" -name "*.c" -delete
 }
 
-sha512sums="f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6  MarkupSafe-1.1.1.tar.gz"
+sha512sums="
+3ba5af43d23c266377f5d32b11e1faa7955ea8c67eb1c32886c308527f93e75e387294d0eec7794c0c20aad0c705b27f3d1f86b04202f3b63068d12d4053cc71  MarkupSafe-2.1.5.tar.gz
+"
diff --git a/main/py3-meld3/APKBUILD b/main/py3-meld3/APKBUILD
index 5aa56c9e167..54a60bbcc52 100644
--- a/main/py3-meld3/APKBUILD
+++ b/main/py3-meld3/APKBUILD
@@ -1,15 +1,16 @@
 # Contributor: Peter Bui <pnutzh4x0r@gmail.com>
-# Maintainer:
+# Maintainer: Peter Shkenev <santurysim@gmail.com>
 pkgname=py3-meld3
 _pkgname=meld3
-pkgver=2.0.0
-pkgrel=1
+pkgver=2.0.1
+pkgrel=8
 pkgdesc="An HTML/XML templating engine"
 url="https://github.com/supervisor/meld3"
 arch="noarch"
-license="ZPL"
+license="ZPL-2.1"
 depends="python3"
-makedepends="python3-dev py3-setuptools"
+makedepends="python3-dev py3-gpep517 py3-setuptools py3-wheel"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 
 builddir="$srcdir"/$_pkgname-$pkgver
@@ -17,11 +18,22 @@ replaces="py-meld3"			# Backwards compatibility
 provides="py-meld3=$pkgver-r$pkgrel"	# Backwards compatibility
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m unittest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="97f1a892835b8f01dd82de681e684547f1e0b54b74ce63b92eb77fbd2fe436217b84a3c03400256ffca97add3d41e50ca563ec6f15f4f4b0fcda4e849a2d0bbf  meld3-2.0.0.tar.gz"
+sha512sums="
+b8203e0a71c7a0e5e38b265d80365b4b86a5bf66cc7e9c58d67e6beca563b992bc71f8e1afd8782ab2a60f0ada60405279dea894d6767326ff1ffcf66f255e1e  meld3-2.0.1.tar.gz
+"
diff --git a/main/py3-mimeparse/APKBUILD b/main/py3-mimeparse/APKBUILD
index 4f2e436f70b..79a3b107b2c 100644
--- a/main/py3-mimeparse/APKBUILD
+++ b/main/py3-mimeparse/APKBUILD
@@ -1,30 +1,38 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer:
+# Maintainer: Peter Shkenev <santurysim@gmail.com>
 pkgname=py3-mimeparse
 _pkgname=python-mimeparse
 pkgver=1.6.0
-pkgrel=2
+pkgrel=10
 pkgdesc="Basic functions for parsing mime-types and matching media-ranges"
-url="https://github.com/dbtsai/python-mimeparse"
+url="https://github.com/falconry/python-mimeparse"
 arch="noarch"
 license="MIT"
-makedepends="py3-setuptools"
-source="$pkgname-$pkgver.tar.gz::https://github.com/dbtsai/python-mimeparse/archive/$pkgver.tar.gz"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+subpackages="$pkgname-pyc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/falconry/python-mimeparse/archive/$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 replaces="py-mimeparse" # Backwards compatibility
 provides="py-mimeparse=$pkgver-r$pkgrel" # Backwards compatibility
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 mimeparse_test.py
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 mimeparse_test.py
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="31752e6019be3a766fa429d27eab071bb77e1c812e6a241d8b84838eda206549877fb3369200338a603d4d93fbbbaaa16f6cf47391aeac65675fd271a5f39259  py3-mimeparse-1.6.0.tar.gz"
+sha512sums="
+31752e6019be3a766fa429d27eab071bb77e1c812e6a241d8b84838eda206549877fb3369200338a603d4d93fbbbaaa16f6cf47391aeac65675fd271a5f39259  py3-mimeparse-1.6.0.tar.gz
+"
diff --git a/main/py3-mock/APKBUILD b/main/py3-mock/APKBUILD
index 45ea092157c..5e1922433e2 100644
--- a/main/py3-mock/APKBUILD
+++ b/main/py3-mock/APKBUILD
@@ -2,26 +2,36 @@
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py3-mock
 _pkgname=mock
-pkgver=2.0.0
-pkgrel=6
+pkgver=5.1.0
+pkgrel=2
 pkgdesc="Python3 Mocking and Patching Library for Testing"
 url="https://github.com/testing-cabal/mock"
 arch="noarch"
 license="BSD-2-Clause"
-depends="python3 py3-pbr py3-six"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+makedepends="py3-gpep517 py3-setuptools py3-wheel py3-pbr"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/m/mock/mock-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
+checkdepends="py3-pytest"
 
 replaces="py-mock" # Backwards compatibility
 provides="py-mock=$pkgver-r$pkgrel" # Backwards compatibility
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	# The skipped test checks internal Python unittest behavior and fails
+	.testenv/bin/python3 -m pytest -k "not test_bool_not_called"
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 }
 
-sha512sums="a08007651b749d2843b94f5045d74c122958888290aea21930455538a854e6b04c07115e21d82edde996154bf597d7a8784a2f4213cbabc49a98dec22dd92238  mock-2.0.0.tar.gz"
+sha512sums="
+26b7350fddf2eca82b6dfaafc58cacbd4031fd787b1afc463ee13eff778846941120fd89755e4783bfad389f01cfbdd64f2feab5a12ac2bd4ca6407c0f2e973c  mock-5.1.0.tar.gz
+"
diff --git a/main/py3-monotonic/APKBUILD b/main/py3-monotonic/APKBUILD
deleted file mode 100644
index 6f6b331039f..00000000000
--- a/main/py3-monotonic/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
-# Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
-pkgname=py3-monotonic
-pkgver=1.5
-pkgrel=2
-pkgdesc="Provides a clock which never goes backwards."
-url="https://github.com/atdt/monotonic/"
-arch="noarch"
-license="Apache-2.0"
-depends="python3"
-makedepends="python3-dev"
-source="monotonic-$pkgver.tar.gz::https://github.com/atdt/monotonic/archive/$pkgver.tar.gz"
-builddir="$srcdir/monotonic-$pkgver"
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	python3 setup.py check
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="acee69916a82059a027e7bcc03c58deb5ce773a1aff45938699cf09c3ab49b7827c2c01b431593ed76ae49009728c3d52923267eccfc7e15390f8730351a39e2  monotonic-1.5.tar.gz"
diff --git a/main/py3-more-itertools/APKBUILD b/main/py3-more-itertools/APKBUILD
index 29e22564041..c020c4681d8 100644
--- a/main/py3-more-itertools/APKBUILD
+++ b/main/py3-more-itertools/APKBUILD
@@ -2,30 +2,36 @@
 # Maintainer: TBK <alpine@jjtc.eu>
 pkgname=py3-more-itertools
 _pkgname=more-itertools
-pkgver=8.2.0
-pkgrel=0
-pkgdesc="More routines for operating on iterables, beyond itertools."
-url="https://github.com/erikrose/more-itertools"
+pkgver=10.2.0
+pkgrel=1
+pkgdesc="More routines for operating on iterables, beyond itertools"
+url="https://github.com/more-itertools/more-itertools"
 arch="noarch"
 license="MIT"
 depends="python3"
-makedepends="py3-setuptools"
-source="$_pkgname-$pkgver.tar.gz::https://github.com/erikrose/more-itertools/archive/v$pkgver.tar.gz"
+makedepends="py3-gpep517 py3-flit-core py3-wheel py3-installer"
+subpackages="$pkgname-pyc"
+source="https://github.com/more-itertools/more-itertools/archive/v$pkgver/more-itertools-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 replaces="py-more-itertools" # Backwards compatibility
 provides="py-more-itertools=$pkgver-r$pkgrel" # Backwards compatibility
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 setup.py test
+	python3 -m unittest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="faa273d97bf9e8423a048715361cd21d3eb983609d61024d2cd49ce1165a460003bc62293561c92b4ecc9a5f9515b18a05f198aa74249f516b1e548e601ce585  more-itertools-8.2.0.tar.gz"
+sha512sums="
+910f053338a4e9ac2786e22d4736bad3bf0f424e65372815b80cb2c62a5a8eda08ca4b7802b0576ac79a1d56b070827a033fdbe6497888f6f373e7e37137c727  more-itertools-10.2.0.tar.gz
+"
diff --git a/main/py3-munkres/APKBUILD b/main/py3-munkres/APKBUILD
deleted file mode 100644
index fa77eb16b89..00000000000
--- a/main/py3-munkres/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=py3-munkres
-_pkgname=munkres
-pkgver=1.1.2
-pkgrel=1
-pkgdesc="Munkres algorithm for the assignment problem"
-url="http://software.clapper.org/munkres/"
-arch="noarch"
-license="BSD"
-makedepends="py3-setuptools"
-checkdepends="py3-nose"
-source="$_pkgname-$pkgver.tar.gz::https://github.com/bmc/munkres/archive/release-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-release-$pkgver"
-
-replaces="py-munkres" # Backwards compatibility
-provides="py-munkres=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	python3 setup.py test
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-
-sha512sums="4a8b698f53812303f5020b4fc357f859a63d97370fe311d16ae959addd9cacee65667e430cd0d00496e423c1f0c7a3c8d4219ba49600a982de323fadd2c03bec  munkres-1.1.2.tar.gz"
diff --git a/main/py3-musicbrainzngs/APKBUILD b/main/py3-musicbrainzngs/APKBUILD
deleted file mode 100644
index ad038bc84de..00000000000
--- a/main/py3-musicbrainzngs/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
-pkgname=py3-musicbrainzngs
-_pkgname=musicbrainzngs
-pkgver=0.7.1
-pkgrel=0
-pkgdesc="Bindings for the MusicBrainz NGS service"
-url="https://github.com/alastair/python-musicbrainzngs"
-arch="noarch"
-license="BSD-2-Clause AND ISC"
-depends="python3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/m/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-musicbrainzngs" # Backwards compatibility
-provides="py-musicbrainzngs=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="df4a8aa184831301adae66f00638667a4a1c7124f61a7e00ef9051c33e35f2acf7aaf304ac4fcdf113566abd3164abe924f2cee91ca2015343b5bae308b91b9d  musicbrainzngs-0.7.1.tar.gz"
diff --git a/main/py3-nose/APKBUILD b/main/py3-nose/APKBUILD
deleted file mode 100644
index 6ebb4574e46..00000000000
--- a/main/py3-nose/APKBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Contributor: Eivind Uggedal <eu@eju.no>
-# Maintainer:
-pkgname=py3-nose
-_pkgname=nose
-pkgver=1.3.7
-pkgrel=5
-pkgdesc="Python3 unittest module"
-url="http://readthedocs.org/docs/nose/"
-arch="noarch"
-license="LGPL-2.0-or-later"
-depends="python3"
-makedepends="py3-setuptools"
-subpackages="$pkgname-doc"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
-	coverage4-compat.patch
-	python3.5-compat.patch
-	fix-crashing-from-UnicodeDecodeError.patch
-	fix-doctests-unicode.patch
-	python3.6-compat.patch"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-nose" # Backwards compatiblity
-provides="py-nose=$pkgver-r$pkgrel" # Backwards compatiblity
-
-prepare() {
-	default_prepare
-
-	cd "$builddir"/examples
-	cat attrib_plugin.py | tr -d '\r' > attrib_plugin.py.fixed
-	mv attrib_plugin.py.fixed attrib_plugin.py
-}
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	(
-		export PYTHONPATH="$(pwd)/build/lib"
-		python3 setup.py build_tests
-		python3 selftest.py
-	)
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-
-	# setup.py installs to "$pkgdir"/usr/man/man1
-	install -D -m 644 nosetests.1 "$pkgdir"/usr/share/man/man1/nosetests.1
-	rm -rf "$pkgdir"/usr/man
-}
-
-sha512sums="e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62  nose-1.3.7.tar.gz
-90238837b7d67a425c816e2160641aa55b8b0193d8b86c46efdd3d15b2d73880c8d6ad658bac40216bc9d8104de491bcec629cf7bfcf9f7a2022b7deec668f39  coverage4-compat.patch
-68693cda7a9d5787f56a26bd98949817e67d8795c324c968cb8af599e1e5f190531f80fc71de1233b88918f21f558f4d81f92dde529f908a0a66e5dd80b7ec21  python3.5-compat.patch
-741b97c6f8e33a8a712bb9db148cf869189065d0ea0c07b361356470b370a78e5075e6f631eb7fc714ace29c6904ee0324494b86cfe3414a6bb97193b5d77e52  fix-crashing-from-UnicodeDecodeError.patch
-bcc01fb8283ea097739db5d52be6c1835cbc6f8a14a235f921d1b2b1d70ac0d91a039781e40dba55d5b5380aa963409223cf79a636fce756fe100a37e500503b  fix-doctests-unicode.patch
-9c47a73a16766e77d086c1a0bb1cc59064eb5755c0d46bfd1814b1aa90dc90c672dda03547abff389f5a05633eff7a3991e41c5e61c12cf51080a08a71f79199  python3.6-compat.patch"
diff --git a/main/py3-nose/coverage4-compat.patch b/main/py3-nose/coverage4-compat.patch
deleted file mode 100644
index e77a080f24b..00000000000
--- a/main/py3-nose/coverage4-compat.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Dmitry Shachnev <mitya57@gmail.com>
-Date: Wed, 29 Jun 2016 13:15:16 +0300
-Subject: [PATCH] Make coverage plugin compatible with Coverage.py 4.1
-
-According to the Coverage.py 4.1 changelog:
-
-- The `Coverage.report` function had two parameters with non-None defaults,
-  which have been changed.  `show_missing` used to default to True, but now
-  defaults to None.  If you had been calling `Coverage.report` without
-  specifying `show_missing`, you'll need to explicitly set it to True to keep
-  the same behavior.
-
-Without that option, four tests in nose fail:
-
-- test_coverage_plugin.TestCoverageMinPercentagePlugin
-- test_coverage_plugin.TestCoverageMinPercentageSinglePackagePlugin
-- test_coverage_plugin.TestCoverageMinPercentageSinglePackageWithBranchesPlugin
-- test_coverage_plugin.TestCoveragePlugin
-
-Patch-Source: https://github.com/nose-devs/nose/pull/1004
-
---- a/nose/plugins/cover.py
-+++ b/nose/plugins/cover.py
-@@ -187,7 +187,7 @@
-                     for name, module in sys.modules.items()
-                     if self.wantModuleCoverage(name, module)]
-         log.debug("Coverage report will cover modules: %s", modules)
--        self.coverInstance.report(modules, file=stream)
-+        self.coverInstance.report(modules, file=stream, show_missing=True)
- 
-         import coverage
-         if self.coverHtmlDir:
-@@ -207,7 +207,7 @@
-         # make sure we have minimum required coverage
-         if self.coverMinPercentage:
-             f = StringIO.StringIO()
--            self.coverInstance.report(modules, file=f)
-+            self.coverInstance.report(modules, file=f, show_missing=True)
- 
-             multiPackageRe = (r'-------\s\w+\s+\d+\s+\d+(?:\s+\d+\s+\d+)?'
-                               r'\s+(\d+)%\s+\d*\s{0,1}$')
diff --git a/main/py3-nose/fix-crashing-from-UnicodeDecodeError.patch b/main/py3-nose/fix-crashing-from-UnicodeDecodeError.patch
deleted file mode 100644
index 9154ab08626..00000000000
--- a/main/py3-nose/fix-crashing-from-UnicodeDecodeError.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From: Jordan Moldow <jmoldow@box.com>
-Date: Wed, 23 Mar 2016 01:42:37 -0700
-Subject: [PATCH] Prevent crashing from UnicodeDecodeError
-
-On Python 2, `sys.stdout` and `print` can normally handle any
-combination of `str` and `unicode` objects. However,
-`StringIO.StringIO` can only safely handle one or the other. If
-the program writes both a `unicode` string, and a non-ASCII
-`str` string, then the `getvalue()` method will fail with
-`UnicodeDecodeError` [1].
-
-In nose, that causes the script to suddenly abort, with the
-cryptic `UnicodeDecodeError`.
-
-This fix catches `UnicodeError` when trying to get the captured
-output, and will replace the captured output with a warning
-message.
-
-Fixes #816
-
-[1] <https://github.com/python/cpython/blob/2.7/Lib/StringIO.py#L258>
-
-Patch-Source: https://github.com/nose-devs/nose/pull/988
-
-diff --git a/nose/plugins/capture.py b/nose/plugins/capture.py
-index c81f21ec..e7bbdd55 100644
---- a/nose/plugins/capture.py
-+++ b/nose/plugins/capture.py
-@@ -12,6 +12,7 @@
- import logging
- import os
- import sys
-+import traceback
- from nose.plugins.base import Plugin
- from nose.pyversion import exc_to_unicode, force_unicode
- from nose.util import ln
-@@ -71,26 +72,56 @@ def beforeTest(self, test):
-     def formatError(self, test, err):
-         """Add captured output to error report.
-         """
--        test.capturedOutput = output = self.buffer
-+        test.capturedOutput = output = ''
-+        output_exc_info = None
-+        try:
-+            test.capturedOutput = output = self.buffer
-+        except UnicodeError:
-+            # python2's StringIO.StringIO [1] class has this warning:
-+            #
-+            #     The StringIO object can accept either Unicode or 8-bit strings,
-+            #     but mixing the two may take some care. If both are used, 8-bit
-+            #     strings that cannot be interpreted as 7-bit ASCII (that use the
-+            #     8th bit) will cause a UnicodeError to be raised when getvalue()
-+            #     is called.
-+            #
-+            # This exception handler is a protection against issue #816 [2].
-+            # Capturing the exception info allows us to display it back to the
-+            # user.
-+            #
-+            # [1] <https://github.com/python/cpython/blob/2.7/Lib/StringIO.py#L258>
-+            # [2] <https://github.com/nose-devs/nose/issues/816>
-+            output_exc_info = sys.exc_info()
-         self._buf = None
--        if not output:
-+        if (not output) and (not output_exc_info):
-             # Don't return None as that will prevent other
-             # formatters from formatting and remove earlier formatters
-             # formats, instead return the err we got
-             return err
-         ec, ev, tb = err
--        return (ec, self.addCaptureToErr(ev, output), tb)
-+        return (ec, self.addCaptureToErr(ev, output, output_exc_info=output_exc_info), tb)
- 
-     def formatFailure(self, test, err):
-         """Add captured output to failure report.
-         """
-         return self.formatError(test, err)
- 
--    def addCaptureToErr(self, ev, output):
-+    def addCaptureToErr(self, ev, output, output_exc_info=None):
-+        # If given, output_exc_info should be a 3-tuple from sys.exc_info(),
-+        # from an exception raised while trying to get the captured output.
-         ev = exc_to_unicode(ev)
-         output = force_unicode(output)
--        return u'\n'.join([ev, ln(u'>> begin captured stdout <<'),
--                           output, ln(u'>> end captured stdout <<')])
-+        error_text = [ev, ln(u'>> begin captured stdout <<'),
-+                      output, ln(u'>> end captured stdout <<')]
-+        if output_exc_info:
-+            error_text.extend([u'OUTPUT ERROR: Could not get captured output.',
-+                               # <https://github.com/python/cpython/blob/2.7/Lib/StringIO.py#L258>
-+                               # <https://github.com/nose-devs/nose/issues/816>
-+                               u"The test might've printed both 'unicode' strings and non-ASCII 8-bit 'str' strings.",
-+                               ln(u'>> begin captured stdout exception traceback <<'),
-+                               u''.join(traceback.format_exception(*output_exc_info)),
-+                               ln(u'>> end captured stdout exception traceback <<')])
-+        return u'\n'.join(error_text)
- 
-     def start(self):
-         self.stdout.append(sys.stdout)
-diff --git a/unit_tests/test_capture_plugin.py b/unit_tests/test_capture_plugin.py
-index edab7de0..90125d3e 100644
---- a/unit_tests/test_capture_plugin.py
-+++ b/unit_tests/test_capture_plugin.py
-@@ -4,6 +4,12 @@
- from optparse import OptionParser
- from nose.config import Config
- from nose.plugins.capture import Capture
-+from nose.pyversion import force_unicode
-+
-+if sys.version_info[0] == 2:
-+    py2 = True
-+else:
-+    py2 = False
- 
- class TestCapturePlugin(unittest.TestCase):
- 
-@@ -62,6 +68,35 @@ def test_captures_nonascii_stdout(self):
-         c.end()
-         self.assertEqual(c.buffer, "test 日本\n")
- 
-+    def test_does_not_crash_with_mixed_unicode_and_nonascii_str(self):
-+        class Dummy:
-+            pass
-+        d = Dummy()
-+        c = Capture()
-+        c.start()
-+        printed_nonascii_str = force_unicode("test 日本").encode('utf-8')
-+        printed_unicode = force_unicode("Hello")
-+        print printed_nonascii_str
-+        print printed_unicode
-+        try:
-+            raise Exception("boom")
-+        except:
-+            err = sys.exc_info()
-+        formatted = c.formatError(d, err)
-+        _, fev, _ = formatted
-+
-+        if py2:
-+            for string in [force_unicode(printed_nonascii_str, encoding='utf-8'), printed_unicode]:
-+                assert string not in fev, "Output unexpectedly found in error message"
-+            assert d.capturedOutput == '', "capturedOutput unexpectedly non-empty"
-+            assert "OUTPUT ERROR" in fev
-+            assert "captured stdout exception traceback" in fev
-+            assert "UnicodeDecodeError" in fev
-+        else:
-+            for string in [repr(printed_nonascii_str), printed_unicode]:
-+                assert string in fev, "Output not found in error message"
-+                assert string in d.capturedOutput, "Output not attached to test"
-+
-     def test_format_error(self):
-         class Dummy:
-             pass
diff --git a/main/py3-nose/fix-doctests-unicode.patch b/main/py3-nose/fix-doctests-unicode.patch
deleted file mode 100644
index a788ed9c438..00000000000
--- a/main/py3-nose/fix-doctests-unicode.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Patch-Source: https://src.fedoraproject.org/cgit/rpms/python-nose.git/tree/python-nose-coverage4.patch
-
---- a/nose/plugins/doctests.py
-+++ b/nose/plugins/doctests.py
-@@ -49,6 +49,7 @@ test.
- """
- from __future__ import generators
- 
-+import codecs
- import logging
- import os
- import sys
-@@ -259,7 +260,7 @@ class Doctest(Plugin):
-         """
-         if self.extension and anyp(filename.endswith, self.extension):
-             name = os.path.basename(filename)
--            dh = open(filename)
-+            dh = codecs.open(filename, encoding='utf-8')
-             try:
-                 doc = dh.read()
-             finally:
diff --git a/main/py3-nose/python3.5-compat.patch b/main/py3-nose/python3.5-compat.patch
deleted file mode 100644
index 2eb58e085cc..00000000000
--- a/main/py3-nose/python3.5-compat.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Dmitry Shachnev <mitya57@gmail.com>
-Date: Mon, 1 Feb 2016 00:05:30 +0300
-Subject: [PATCH] Set __qualname__ equal to __name__ on derived classes
-
-To make output on Python ≥ 3.5 the same as on previous Python versions.
-
-This fixes #928.
-
-Patch-Source: https://github.com/nose-devs/nose/pull/983
-
-index 42f8563d..13d0c8a2 100644
---- a/functional_tests/test_load_tests_from_test_case.py
-+++ b/functional_tests/test_load_tests_from_test_case.py
-@@ -29,6 +29,7 @@ def setUp(self):
-                 pass
-             def tearDown(self):
-                 pass
-+        Derived.__qualname__ = Derived.__name__
-         # must use nose loader here because the default loader in 2.3
-         # won't load tests from base classes
-         l = loader.TestLoader()
-index bfe16589..80ab1d4e 100644
---- a/nose/util.py
-+++ b/nose/util.py
-@@ -643,6 +643,7 @@ class C(cls):
-         pass
-     C.__module__ = module
-     C.__name__ = cls.__name__
-+    C.__qualname__ = cls.__name__
-     return C
- 
- 
-index 944d2859..261436b0 100644
---- a/unit_tests/test_xunit.py
-+++ b/unit_tests/test_xunit.py
-@@ -16,6 +16,7 @@ def mktest():
-     class TC(unittest.TestCase):
-         def runTest(self):
-             pass
-+    TC.__qualname__ = TC.__name__
-     test = TC()
-     return test
diff --git a/main/py3-nose/python3.6-compat.patch b/main/py3-nose/python3.6-compat.patch
deleted file mode 100644
index e6831bce80f..00000000000
--- a/main/py3-nose/python3.6-compat.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Tomas Orsava <torsava@redhat.com>
-Date: Mon, 12 Dec 2016 14:35:50 +0100
-Subject: [PATCH] Fix compatibility with Python 3.6
-
-Python 3.6 returns ModuleNotFoundError instead of the previous ImportError.
-
-Patch-Source: https://github.com/nose-devs/nose/pull/1029
-
-index 104f2209..906e2ba2 100644
---- a/functional_tests/test_loader.py
-+++ b/functional_tests/test_loader.py
-@@ -372,7 +372,7 @@ def test_failed_import_module_name(self):
-         assert res.errors, "Expected errors but got none"
-         assert not res.failures, res.failures
-         err = res.errors[0][0].test.exc_class
--        assert err is ImportError, \
-+        assert issubclass(err, ImportError), \
-             "Expected import error, got %s" % err
- 
-     def test_load_nonsense_name(self):
-index cf09d4fb..cb20886b 100644
---- a/functional_tests/test_withid_failures.rst
-+++ b/functional_tests/test_withid_failures.rst
-@@ -7,16 +7,16 @@
-     >>> support = os.path.join(os.path.dirname(__file__), 'support', 'id_fails')
-     >>> argv = [__file__, '-v', '--with-id', '--id-file', idfile, support]
-     >>> run(argv=argv, plugins=[TestId()]) # doctest: +ELLIPSIS
--    #1 Failure: ImportError (No module ...apackagethatdoesntexist...) ... ERROR
-+    #1 Failure: ... (No module ...apackagethatdoesntexist...) ... ERROR
-     #2 test_b.test ... ok
-     #3 test_b.test_fail ... FAIL
-     <BLANKLINE>
-     ======================================================================
--    ERROR: Failure: ImportError (No module ...apackagethatdoesntexist...)
-+    ERROR: Failure: ... (No module ...apackagethatdoesntexist...)
-     ----------------------------------------------------------------------
-     Traceback (most recent call last):
-     ...
--    ImportError: No module ...apackagethatdoesntexist...
-+    ...: No module ...apackagethatdoesntexist...
-     <BLANKLINE>
-     ======================================================================
-     FAIL: test_b.test_fail
-@@ -35,14 +35,14 @@ Addressing failures works (sometimes).
-     >>> argv.append('1')
-     >>> _junk = sys.modules.pop('test_a', None) # 2.3 requires
-     >>> run(argv=argv, plugins=[TestId()]) #doctest: +ELLIPSIS
--    #1 Failure: ImportError (No module ...apackagethatdoesntexist...) ... ERROR
-+    #1 Failure: ... (No module ...apackagethatdoesntexist...) ... ERROR
-     <BLANKLINE>
-     ======================================================================
--    ERROR: Failure: ImportError (No module ...apackagethatdoesntexist...)
-+    ERROR: Failure: ... (No module ...apackagethatdoesntexist...)
-     ----------------------------------------------------------------------
-     Traceback (most recent call last):
-     ...
--    ImportError: No module ...apackagethatdoesntexist...
-+    ...: No module ...apackagethatdoesntexist...
-     <BLANKLINE>
-     ----------------------------------------------------------------------
-     Ran 1 test in ...s
diff --git a/main/py3-oauth2/APKBUILD b/main/py3-oauth2/APKBUILD
deleted file mode 100644
index 06c43714919..00000000000
--- a/main/py3-oauth2/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Peter Bui <pnutzh4x0r@gmail.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=py3-oauth2
-_pkgname=oauth2
-pkgver=1.9.0
-pkgrel=2
-pkgdesc="Python3 library for OAuth"
-url="https://github.com/simplegeo/python-oauth2"
-arch="noarch"
-license="MIT"
-depends="python3 py3-httplib2"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.post1.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver.post1
-
-replaces="py-oauth2" # Bakcwards compatibility
-provides="py-oauth2=$pkgver-r$pkgrel" # Bakcwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	python3 setup.py test
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-
-	# Tests don't need to be installed
-	rm -rf "$pkgdir"/usr/lib/python3*/site-packages/tests/
-}
-
-sha512sums="a3b64eef331d4c4f59c275f14efb2dfb48ad60de47a59a88106f60d64428a09b76d8bedf08c98c113493968d83708b1478b4b61b2b5528b5b01fa22777daff4c  oauth2-1.9.0.post1.tar.gz"
diff --git a/main/py3-oauth2client/APKBUILD b/main/py3-oauth2client/APKBUILD
deleted file mode 100644
index b66d860063a..00000000000
--- a/main/py3-oauth2client/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer:
-pkgname=py3-oauth2client
-_pkgname=oauth2client
-pkgver=4.1.3
-pkgrel=2
-pkgdesc="A client library for OAuth 2.0"
-options="!check" # Requires 'sqlalchemy' , 'fasteners' and 'flask'
-url="https://github.com/google/oauth2client"
-arch="noarch"
-license="Apache"
-depends="python3 py3-asn1 py3-httplib2 py3-asn1-modules py3-rsa py3-six"
-makedepends="py3-setuptools"
-checkdepends="py3-mock py3-openssl py3-django"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-replaces="py-oauth2client" # Backwards compatibility
-provides="py-oauth2client=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	python3 setup.py test
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="6ca6830c0461295b60598ef3e7ee047aa9fa463d1d2c19c18d6b8606a5b30b11f0798e06c51bd5be63afd8d408442fd846c2867f112655186f55c7dc8e0b7786  oauth2client-4.1.3.tar.gz"
diff --git a/main/py3-oauthlib/APKBUILD b/main/py3-oauthlib/APKBUILD
deleted file mode 100644
index f6d668ffc9d..00000000000
--- a/main/py3-oauthlib/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: Eivind Uggedal <eu@eju.no>
-# Maintainer:
-pkgname=py3-oauthlib
-_pkgname=oauthlib
-pkgver=2.1.0
-pkgrel=3
-pkgdesc="Python3 implementation of the OAuth request-signing logic"
-options="!check" # requires 'blinker' that is in testing/
-url="https://github.com/idan/oauthlib"
-arch="noarch"
-license="BSD"
-depends="python3"
-makedepends="py3-setuptools"
-checkdepends="py3-nose py3-cryptography py3-jwt" # py3-blinker"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-oauthlib" # Backwards compatibility
-provides="py-oauthlib=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	python3 setup.py test
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="bd749c7b65de00cc0c371053577623aca5767a0b20e41b2d5e3e20f8246e84bf360472b4ec983023227d6164ecd7ed4647c41cd8f425fe21200a2c25a9049ffd  oauthlib-2.1.0.tar.gz"
diff --git a/main/py3-olefile/APKBUILD b/main/py3-olefile/APKBUILD
new file mode 100644
index 00000000000..d578f432bd3
--- /dev/null
+++ b/main/py3-olefile/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
+pkgname=py3-olefile
+pkgver=0.46
+pkgrel=10
+pkgdesc="Python module to read/write MS OLE2 files"
+url="https://www.decalage.info/olefile"
+arch="noarch"
+license="BSD-2-Clause"
+makedepends="python3-dev py3-gpep517 py3-setuptools py3-wheel"
+subpackages="$pkgname-pyc"
+source="https://github.com/decalage2/olefile/releases/download/v$pkgver/olefile-$pkgver.tar.gz"
+builddir="$srcdir"/${pkgname/py3-/}-$pkgver
+
+provides="py-olefile=$pkgver-r$pkgrel" # backwards compatibility
+replaces="py-olefile" # backwards compatiblity
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m unittest
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
+}
+
+sha512sums="
+285dff1eb250d464e338f892dca3e465504523fd956ceeb8bfe40eb9a82510713f64f490749a23bfdc911555f8d9c49580af5b03a15063c2598bb1a39999778f  olefile-0.46.tar.gz
+"
diff --git a/main/py3-openssl/APKBUILD b/main/py3-openssl/APKBUILD
deleted file mode 100644
index 6860582f45a..00000000000
--- a/main/py3-openssl/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=py3-openssl
-_pkgname=pyOpenSSL
-pkgver=19.1.0
-pkgrel=0
-pkgdesc="Python3 wrapper module around the OpenSSL library"
-url="https://github.com/pyca/pyopenssl"
-arch="noarch"
-license="Apache-2.0"
-depends="python3 py3-cryptography py3-six"
-makedepends="py3-setuptools"
-checkdepends="py3-pytest"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-options="!check" # depends on flaky
-
-replaces="py-openssl" # Backwards compatibility
-provides="py-openssl=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 setup.py test
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="4acd96f287d72eb11bd812697d28cd6eb6a96a4653248b65f967187830a6b17cc1254775a18a3405469f3d45abdae6f02d165f2f35f035f3174c2826fba82916  pyOpenSSL-19.1.0.tar.gz"
diff --git a/main/py3-ordered-set/APKBUILD b/main/py3-ordered-set/APKBUILD
index f06a3022113..00ff89b299f 100644
--- a/main/py3-ordered-set/APKBUILD
+++ b/main/py3-ordered-set/APKBUILD
@@ -1,25 +1,36 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Peter Shkenev <santurysim@gmail.com>
 pkgname=py3-ordered-set
-pkgver=3.1.1
-pkgrel=0
+pkgver=4.1.0
+pkgrel=6
 pkgdesc="MutableSet that remembers its order"
-url="https://github.com/LuminosoInsight/ordered-set"
+url="https://github.com/rspeer/ordered-set"
 arch="noarch"
 license="MIT"
 depends="python3"
+makedepends="py3-gpep517 py3-flit-core py3-installer"
+checkdepends="py3-pytest"
+subpackages="$pkgname-pyc"
 source="https://pypi.io/packages/source/o/ordered-set/ordered-set-$pkgver.tar.gz"
 builddir="$srcdir/ordered-set-$pkgver"
+# pytest -> setuptools -> setuptools-stage0 -> this
+options="!check"
 
-package() {
-	# Can't use setuptools since setuptools depends on this
-	mkdir -p "$pkgdir"/usr/lib/python3.8/site-packages
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
 
-	cp -rv ordered_set.egg-info \
-		"$pkgdir"/usr/lib/python3.8/site-packages/ordered_set-$pkgver-py3.8.egg-info
-	cp -rv ordered_set.py "$pkgdir"/usr/lib/python3.8/site-packages/
+check() {
+	pytest
+}
 
-	python3 -m compileall -f -q "$pkgdir"/usr/lib/python3.8/site-packages/*.py
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/ordered_set-*.whl
 }
 
-sha512sums="9a0d6c2fe1e678ebc5e4bb8229f2a97cfd0b579624f1f5e7153a9fe41937069a845271e431d626dff799136c3c90d8ecd7a7094de8b6f638c581ebe9c4e71ec6  ordered-set-3.1.1.tar.gz"
+sha512sums="
+f12d19f7d9cf0ebcc414d97798f0959ff69a77146839cc6a9067c864f9e0be795795c4d648f736fd7448ddf89666ce37f23e7380d1c9b1678a4787961e4e1e79  ordered-set-4.1.0.tar.gz
+"
diff --git a/main/py3-packaging/APKBUILD b/main/py3-packaging/APKBUILD
index f63a873601f..f57125de743 100644
--- a/main/py3-packaging/APKBUILD
+++ b/main/py3-packaging/APKBUILD
@@ -1,27 +1,47 @@
-# Maintainer: Breno Leitao <breno.leitao@gmail.com>
+# Contributor: Breno Leitao <breno.leitao@gmail.com>
+# Maintainer: Peter Shkenev <santurysim@gmail.com>
 pkgname=py3-packaging
 _pkgname=packaging
-pkgver=20.3
-pkgrel=0
+pkgver=24.0
+pkgrel=1
 pkgdesc="Core utilities for Python3 packages"
-options="!check" # Requires python  module 'pretend'
-url="https://pypi.python.org/pypi/packaging"
+options="!check" # Requires py3-pytest which requires py3-setuptools
+url="https://pypi.org/project/packaging"
 arch="noarch"
 license="Apache-2.0 AND BSD-2-Clause"
-depends="python3 py3-parsing py3-six"
-source="https://files.pythonhosted.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz"
+depends="python3 py3-parsing"
+makedepends="py3-flit-core py3-gpep517"
+# disable check to break circular dep with py3-setuptools
+checkdepends="py3-pytest py3-pretend"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/p/packaging/packaging-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 replaces="py-packaging" # Backwards compatibility
 provides="py-packaging=$pkgver-r$pkgrel" # Backwards compatibility
 
+[ "$CARCH" = s390x ] && options="$options !check" # fails a lot
+
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest \
+		--ignore=tests/test_tags.py \
+		--deselect \
+		tests/test_manylinux.py::test_is_manylinux_compatible_old
+}
 
-sha512sums="b27ad6f72bfe0965a6e6bff78e4e37d4cbab73dc0a1b019673c85615c9d99edf237effeb9756702c6e8c1575a2d981f6d1af364c73d0a451fbb167d64678630f  packaging-20.3.tar.gz"
+sha512sums="
+b6af704f93bcb7611a06eb2bfa94d8dc4bb1e5e9898af7c0eb85e67cf1ebdb858e272ca18019be4daaa43ac3f73b1cb2e690d8b50a4252380a2dc9f2d0e03a58  packaging-24.0.tar.gz
+"
diff --git a/main/py3-paramiko/APKBUILD b/main/py3-paramiko/APKBUILD
deleted file mode 100644
index 59ea83e3133..00000000000
--- a/main/py3-paramiko/APKBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=py3-paramiko
-_pkgname=paramiko
-pkgver=2.7.1
-pkgrel=0
-pkgdesc="An SSH2 protocol library for Python3"
-url="https://www.paramiko.org/"
-arch="noarch"
-license="LGPL-2.0-or-later"
-options="!check" # missing pytest-relaxed module
-depends="python3 py3-asn1 py3-cryptography py3-bcrypt py3-pynacl"
-makedepends="py3-setuptools"
-checkdepends="py3-mock py3-pytest"
-subpackages="$pkgname-doc $pkgname-demos"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-paramiko" # Backwards compatibility
-provides="py-paramiko=$pkgver-r$pkgrel" # Backwards compatibility
-
-# secfixes:
-#   2.4.2-r0:
-#     - CVE-2018-1000805
-#   2.4.1-r0:
-#     - CVE-2018-7750
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 setup.py test
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-demos() {
-	depends="$pkgname=$pkgver-r$pkgrel"
-	pkgdesc="$pkgdesc (demos)"
-
-	mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/demos
-	mv "$builddir"/demos "$subpkgdir"/usr/share/doc/"$pkgname"/
-}
-
-doc() {
-	depends=""
-	pkgdesc="$pkgdesc (documentation)"
-
-	mkdir -p "$subpkgdir"/usr/share/doc/"$pkgname"/docs
-	mv "$builddir"/docs "$subpkgdir"/usr/share/doc/"$pkgname"/
-}
-
-sha512sums="80068c8f72ab8c98d84188caa074deecead9fb459b1a71cedb3cfa627736730928a2b9c6eb2b5a8b60acb9bccb0f68aefbef9d0d55554001c835b5cf897751ab  paramiko-2.7.1.tar.gz"
diff --git a/main/py3-parsing/APKBUILD b/main/py3-parsing/APKBUILD
index 2694969b529..a1b61ae1eb4 100644
--- a/main/py3-parsing/APKBUILD
+++ b/main/py3-parsing/APKBUILD
@@ -2,32 +2,37 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py3-parsing
 _pkgname=pyparsing
-pkgver=2.4.6
+pkgver=3.1.2
 pkgrel=1
-pkgdesc="An object-oriented approach to text processing"
-url="http://pyparsing.wikispaces.com/"
+pkgdesc="Object-oriented approach to text processing"
+url="https://github.com/pyparsing/pyparsing"
 arch="noarch"
 license="MIT"
 depends="python3"
+makedepends="py3-flit-core py3-gpep517"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir"/$_pkgname-$pkgver
+options="!check" # too low level, and needs unpackaged railroad
 
 replaces="py-parsing" # Backwards compatibility
 provides="py-parsing=$pkgver-r$pkgrel" # Backwards compatibility
 
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
 check() {
 	python3 -m unittest
 }
 
 package() {
-	# Can't use setuptools since setuptools depends on this
-	mkdir -p "$pkgdir"/usr/lib/python3.8/site-packages
-
-	cp -rv $_pkgname.egg-info \
-		"$pkgdir"/usr/lib/python3.8/site-packages/$_pkgname-$pkgver-py3.8.egg-info
-	cp -rv pyparsing.py "$pkgdir"/usr/lib/python3.8/site-packages/
-
-	python3 -m compileall -f -q "$pkgdir"/usr/lib/python3.8/site-packages/*.py
+	python3 -m installer -d "$pkgdir" \
+		.dist/pyparsing-$pkgver-py3-none-any.whl
 }
 
-sha512sums="6c8e7e2ecd633d26eb6a0547fe805b5c5ce459d4ed7ec7a5db1431b563125fdbce0b76dc05a6ff220f26e906d21e70691a008dfed06642a52e962bbbf1d21cd4  pyparsing-2.4.6.tar.gz"
+sha512sums="
+1134949f3576edbec4438eefe952eb5cc6e734fb060905d714b6a77f71e90d364b01345df5e7b8fb5ffa798c530be9c65f6d152b3f591cba787660c4dd8894d2  pyparsing-3.1.2.tar.gz
+"
diff --git a/main/py3-pathspec/APKBUILD b/main/py3-pathspec/APKBUILD
new file mode 100644
index 00000000000..c397848883e
--- /dev/null
+++ b/main/py3-pathspec/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: Michał Polański <michal@polanski.me>
+# Maintainer: Michał Polański <michal@polanski.me>
+pkgname=py3-pathspec
+_pyname=pathspec
+pkgver=0.12.1
+pkgrel=2
+pkgdesc="Utility library for gitignore style pattern matching of file paths"
+url="https://github.com/cpburnz/python-path-specification"
+license="MPL-2.0"
+arch="noarch"
+depends="python3"
+makedepends="py3-flit-core py3-gpep517"
+subpackages="$pkgname-pyc"
+source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/p/pathspec/pathspec-$pkgver.tar.gz"
+builddir="$srcdir/$_pyname-$pkgver"
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m unittest
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/pathspec-$pkgver-py3-none-any.whl
+}
+
+sha512sums="
+19d1a8ae5936e76eacd691b0e2fb33d0de376556751a9ae007f6b09d0aa36af7d171101df620cab3e93c9913be578ff3d6bba9d4460351ac248e5c9e015380ad  py3-pathspec-0.12.1.tar.gz
+"
diff --git a/main/py3-pbr/APKBUILD b/main/py3-pbr/APKBUILD
index 4780cf222c3..17b479df393 100644
--- a/main/py3-pbr/APKBUILD
+++ b/main/py3-pbr/APKBUILD
@@ -2,30 +2,33 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-pbr
 _pkgname=pbr
-pkgver=5.4.4
-pkgrel=0
+pkgver=5.11.1
+pkgrel=5
 pkgdesc="Python3 Build Reasonableness"
-url="https://pypi.python.org/pypi/pbr"
+url="https://pypi.org/project/pbr"
 arch="noarch"
 license="Apache-2.0"
-depends="python3"
-makedepends="py3-setuptools"
+depends="py3-setuptools"
+makedepends="py3-gpep517 py3-wheel"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
+options="!check" # requires testscenarios from pypi
 
-replaces="py-pbr" # Backwarwds compatibility
-provides="py-pbr=$pkgver-r$pkgrel" # Backwarwds compatibility
-
-check() {
-	python3 setup.py check
-}
+replaces="py-pbr" # Backwards compatibility
+provides="py-pbr=$pkgver-r$pkgrel" # Backwards compatibility
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="da2c6c3020692215e02770ab5a31f2eccb489375e78ac2d796e3a413446c849699537d1188f0f5f83b4c8eea420af05c46cc6e2059b62ac530009ba4934e151f  pbr-5.4.4.tar.gz"
+sha512sums="
+466dc5ce2622c43451186698f00d405141878449ffe9f7771b0057e8356bf12b426a9bfefff7e5843f1b3f963af3ffc9c4a42fa91a9407b79617abea046ff438  pbr-5.11.1.tar.gz
+"
diff --git a/main/py3-pexpect/APKBUILD b/main/py3-pexpect/APKBUILD
index bc90112d73a..5734e8c767b 100644
--- a/main/py3-pexpect/APKBUILD
+++ b/main/py3-pexpect/APKBUILD
@@ -2,29 +2,41 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-pexpect
 _pkgname=pexpect
-pkgver=4.8.0
-pkgrel=0
+pkgver=4.9
+pkgrel=1
 pkgdesc="Make Python a better tool for controlling and automating other programs"
-url="http://pexpect.readthedocs.org/en/stable"
+url="https://pexpect.readthedocs.io/en/stable/"
 arch="noarch"
 license="ISC"
 depends="python3 py3-ptyprocess"
-makedepends="py3-setuptools"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="py3-pytest bash coreutils"
+subpackages="$pkgname-pyc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/pexpect/$_pkgname/archive/$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
-replaces="py-pexpect" # Backwards compatibility
-provides="py-pexpect=$pkgver-r$pkgrel" # Backwards compatibility
-
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 setup.py check
+	# tests that don't expect ansi colors
+	_tests_colors="not test_async_replwrap_multiline and not REPLWrapTestCase"
+	# tests that have 'python' hardcoded
+	_tests_py2="not test_100000 and not test_run_exit"
+
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest -k "$_tests_colors and $_tests_py2"
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
-sha512sums="f141e1368ceea15209b04555a524443cd9cf36d4a3677b63f7a2b079d41aae3fb8656612772732f4097b803c55a05f9bb7e3b427d11ae5357666406669ae6867  py3-pexpect-4.8.0.tar.gz"
+
+sha512sums="
+222aa3a2aba174f1f9c9e5bbf71aa59fbc1c1830fce6691ecb01ec4f0613b1f2141da489a6bd7bfd226f46d98d52a16e1f5a5b7345bcf6557110bfd52cd5f31e  py3-pexpect-4.9.tar.gz
+"
diff --git a/main/py3-phonenumbers/APKBUILD b/main/py3-phonenumbers/APKBUILD
deleted file mode 100644
index 64779296134..00000000000
--- a/main/py3-phonenumbers/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-pkgname=py3-phonenumbers
-_pkgname=phonenumbers
-pkgver=8.12.0
-pkgrel=0
-pkgdesc="International phone number library for Python"
-url="https://github.com/daviddrysdale/python-phonenumbers"
-arch="noarch"
-license="Apache-2.0"
-depends="python3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-phonenumbers" # Backwards compatibility
-provides="py-phonenumbers=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 setup.py test
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="b3e0c6e33b43e696fa74d394b42a04b02a3b46c9129a21e286ef657e556bb50f4e2f8ceff5648527eeb2b2e83097bb43561c7cb907d78f357c7a250b24322beb  phonenumbers-8.12.0.tar.gz"
diff --git a/main/py3-pluggy/APKBUILD b/main/py3-pluggy/APKBUILD
index 2e24e1565c5..a60df3a8a47 100644
--- a/main/py3-pluggy/APKBUILD
+++ b/main/py3-pluggy/APKBUILD
@@ -1,30 +1,45 @@
 # Contributor: Stuart Cardall <developer@it-offshore.co.uk>
+# Contributor: Maxim Karasev <begs@disroot.org>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=py3-pluggy
-_pkgname=${pkgname#py3-*}
-pkgver=0.13.1
-pkgrel=0
+_pkgname=pluggy
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="Plugin management and hook calling for Python"
-options="!check" # Requires py3-flake8 which is not in main
+# Needs py3-pytest for checkdepends, which require py3-pluggy
+# in depends, so disable here to break a circular dependency
+options="!check"
 url="https://pluggy.readthedocs.io/en/latest/"
 arch="noarch"
 license="MIT"
-depends="python3"
-makedepends="py3-setuptools"
-checkdepends="py3-flake8 py3-pytest py3-zipp"
+makedepends="
+	py3-gpep517
+	py3-setuptools_scm
+	py3-wheel
+	"
+checkdepends="py3-pytest"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	python3 setup.py build
+	SETUPTOOLS_SCM_PRETEND_VERSION="$pkgver" \
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }
 
-check() {
-	python3 -m pytest
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="eb747ff341cedacbd90eb20e22ad3d1ddf5588056f14d069f56331f4141a15b7eccaee23ea196d2f4906964ddb77a79b156bbf3ef8c8083e9952c55d13d55f3e  pluggy-0.13.1.tar.gz"
+sha512sums="
+ac21a0c68cfcb9c7c401e5c48404f7447489b75befe8bc8b6e7ea84f24a1c6dbfb3de024577dd9e36ca9f538f9867ef836ba13018e3b8b348bba3e9bbd0c4dfd  pluggy-1.4.0.tar.gz
+"
diff --git a/main/py3-ply/APKBUILD b/main/py3-ply/APKBUILD
deleted file mode 100644
index ff6ef94fc96..00000000000
--- a/main/py3-ply/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: tcely <py3-ply+aports@tcely.33mail.com>
-# Contributor: Keith Maxwell <keith.maxwell@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_pkgname='ply'
-pkgname="py3-$_pkgname"
-pkgver='3.11'
-pkgrel=2
-pkgdesc="Python Lex & Yacc"
-url="https://www.dabeaz.com/ply/"
-arch="noarch"
-license="BSD-3-Clause"
-depends="python3"
-checkdepends="py3-six"
-makedepends="python3-dev"
-install=""
-subpackages=""
-source="${_pkgname}-${pkgver}.tar.gz::https://github.com/dabeaz/${_pkgname}/archive/${pkgver}.tar.gz"
-builddir="${srcdir}/${_pkgname}-${pkgver}"
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	PYTHON=python3 make test
-
-	cd test
-	python3 testcpp.py
-}
-
-package() {
-	#pip3 install --ignore-installed --root "$pkgdir" .
-	python3 setup.py install --prefix="/usr" --root="$pkgdir"
-}
-
-sha512sums="c36e4ea0eb5bb7cca8cc34aa62dd711be755e44f1336a0093d7c9c1ea4d5d8cae8316416a2109ba24bb2b71f7a971b0b34a7ea45c43d4c7c63c513156945fc17  ply-3.11.tar.gz"
diff --git a/main/py3-pretend/APKBUILD b/main/py3-pretend/APKBUILD
new file mode 100644
index 00000000000..bffb0d5fca2
--- /dev/null
+++ b/main/py3-pretend/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: Michał Polański <michal@polanski.me>
+# Maintainer: Michał Polański <michal@polanski.me>
+pkgname=py3-pretend
+pkgver=1.0.9
+pkgrel=7
+pkgdesc="Library for stubbing in Python"
+url="https://github.com/alex/pretend"
+license="BSD-3-Clause"
+arch="noarch"
+depends="python3"
+makedepends="py3-gpep517 py3-installer py3-setuptools py3-wheel"
+checkdepends="py3-pytest"
+subpackages="$pkgname-pyc"
+source="https://github.com/alex/pretend/archive/v$pkgver/py3-pretend-$pkgver.tar.gz"
+builddir="$srcdir/pretend-$pkgver"
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	pytest
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/pretend-$pkgver-py2.py3-none-any.whl
+}
+
+sha512sums="
+976e3272557aecfb11e4147a868ea96e23546e277d57d726f41b945103bef3451039716e6bbc5082d691fa1fd331c06b3d0f8b254deb0510948153571326eaf0  py3-pretend-1.0.9.tar.gz
+"
diff --git a/main/py3-ptyprocess/APKBUILD b/main/py3-ptyprocess/APKBUILD
index 1a98d2418a0..ed4d9e006ef 100644
--- a/main/py3-ptyprocess/APKBUILD
+++ b/main/py3-ptyprocess/APKBUILD
@@ -2,14 +2,16 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-ptyprocess
 _pkgname=ptyprocess
-pkgver=0.6.0
-pkgrel=3
+pkgver=0.7.0
+pkgrel=6
 pkgdesc="Run a subprocess in a pseudo terminal"
 url="https://github.com/pexpect/ptyprocess"
 arch="noarch"
 license="ISC"
 depends="python3"
 makedepends="py3-setuptools"
+checkdepends="bash"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
@@ -25,8 +27,9 @@ check() {
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 setup.py install --skip-build --root="$pkgdir"
 }
 
-
-sha512sums="b34b6bca977f09d1443b210e338e1300e12d6ef35857f9543b3a116ef3b500ad4844357a7a283321756f886af41bddb1f02b27bf200ef1e82a96fd9e431bed86  ptyprocess-0.6.0.tar.gz"
+sha512sums="
+791d8f2e79900627215ce80ce67ee9c79173dbc08297c6219d5058f9b80c5e323b93049e6836a70c4073f43548d22e3cf310f2e9948ef12f96bcaa15b0ddb2f3  ptyprocess-0.7.0.tar.gz
+"
diff --git a/main/py3-purl/APKBUILD b/main/py3-purl/APKBUILD
deleted file mode 100644
index 06595bb3b99..00000000000
--- a/main/py3-purl/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=py3-purl
-_pkgname=purl
-pkgver=1.5
-pkgrel=3
-pkgdesc="An immutable Python3 URL class for easy URL-building and manipulation"
-url="https://github.com/codeinthehole/purl"
-arch="noarch"
-license="MIT"
-depends="py3-six"
-# Tests are not included in the tarball
-options="!check"
-depends="python3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-purl" # Backwards compatibility
-provides="py-purl=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="e7ef3dbe51117c2807a5cd472967d90c9f16fc1090f2edcaf3c4fe0bbc95b8ef8d612d5ca98401caf5a94c5b0335949ac0ac490bc694e571ff516b7bf53fae32  purl-1.5.tar.gz"
diff --git a/main/py3-py/0001-remove-setuptools_scm.patch b/main/py3-py/0001-remove-setuptools_scm.patch
new file mode 100644
index 00000000000..aa036573814
--- /dev/null
+++ b/main/py3-py/0001-remove-setuptools_scm.patch
@@ -0,0 +1,20 @@
+diff --git a/setup.py b/setup.py
+index 5948ef0..97d5f10 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,13 +1,13 @@
+ from setuptools import setup, find_packages
++from py._version import version
+ 
+ 
+ def main():
+     setup(
+         name='py',
++        version=version,
+         description='library with cross-python path, ini-parsing, io, code, log facilities',
+         long_description=open('README.rst').read(),
+-        use_scm_version={"write_to": "py/_version.py"},
+-        setup_requires=["setuptools_scm"],
+         url='https://py.readthedocs.io/',
+         license='MIT license',
+         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
diff --git a/main/py3-py/APKBUILD b/main/py3-py/APKBUILD
index 30340de5f38..c110743c11a 100644
--- a/main/py3-py/APKBUILD
+++ b/main/py3-py/APKBUILD
@@ -1,31 +1,51 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py3-py
-_pkgname=py
-pkgver=1.8.1
-pkgrel=0
+pkgver=1.11.0
+pkgrel=3
 pkgdesc="Python3 library with cross-python path, ini-parsing, io, code, log facilities"
 url="https://py.readthedocs.io"
 arch="noarch"
 license="MIT"
 depends="python3"
 makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/p/py/py-$pkgver.tar.gz
+	0001-remove-setuptools_scm.patch
+	"
+builddir="$srcdir/py-$pkgver"
 
 replaces="py-py" # Backwards compatibility
 provides="py-py=$pkgver-r$pkgrel" # Backwards compatibility
 
+prepare() {
+	default_prepare
+
+	# Split version into semver variables
+	local RE='[^0-9]*\([0-9]*\)[.]\([0-9]*\)[.]\([0-9]*\)\([0-9A-Za-z-]*\)'
+	_major=$(echo "$pkgver" | sed -e "s/$RE/\1/")
+	_minor=$(echo "$pkgver" | sed -e "s/$RE/\2/")
+	_patch=$(echo "$pkgver" | sed -e "s/$RE/\3/")
+
+	echo "version = '$pkgver'" > py/_version.py
+	echo "version_tuple = ($_major, $_minor, $_patch)" >> py/_version.py
+}
+
 build() {
 	python3 setup.py build
 }
 
 check() {
-	python3 setup.py check
+	# python3 setup.py test
+	# TypeError: <module>.__dict__ is not a dictionary
+	PYTHONPATH=build/lib python3 -c 'import py'
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 setup.py install --skip-build --root="$pkgdir"
 }
 
-sha512sums="ba18fc5cc7a291c251f04e8565a35e94603eae718aad48252821f9d3b115a7cca4e640ea54d800eb71ec8ce345052d731fec9a115778b068526f394c5c45fb2a  py-1.8.1.tar.gz"
+sha512sums="
+ce8dd791f9f6dd7e60a6caad32ff5cb816389a0840436efdedf4e0d4b0bfa09f7aea9e7c31d89903c72fe6ef17170a85af480525ba92c458ed73501a0420f2c4  py-1.11.0.tar.gz
+eedb84da521cda62ccca158faaae39f7e5915ec11123d8083a4a5817766e388e4b3ed2ca09c0f91fe2b6f7efd3f0212fd8b73e54097ea444c2c4b7da0151d0e7  0001-remove-setuptools_scm.patch
+"
diff --git a/main/py3-pycountry/APKBUILD b/main/py3-pycountry/APKBUILD
deleted file mode 100644
index 17f3694d3f1..00000000000
--- a/main/py3-pycountry/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=py3-pycountry
-_pkgname=pycountry
-pkgver=19.8.18
-pkgrel=1
-pkgdesc="ISO country, subdivision, language, currency and script definitions and their translations"
-url="https://pypi.org/project/pycountry"
-arch="noarch"
-license="LGPL-2.1-only"
-depends="python3"
-makedepends="py3-setuptools"
-checkdepends="py3-pytest"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-replaces="py-country py-pycountry" # Backwards compatibility
-provides="py-country=$pkgver-r$pkgrel py-pycountry=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	PYTHONPATH="$builddir/build/lib" py.test-3 -v
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="39ba06629eeea55460424d06992ca5f1e5bf6168b219dc4880ec326f6aa0c92a4fdc54d4143a8b8bb1490149af793e760e291c6d704104a57ba91e88228ab669  pycountry-19.8.18.tar.gz"
diff --git a/main/py3-pycryptodome/APKBUILD b/main/py3-pycryptodome/APKBUILD
deleted file mode 100644
index 3d12df4b881..00000000000
--- a/main/py3-pycryptodome/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
-# Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
-pkgname=py3-pycryptodome
-pkgver=3.9.7
-pkgrel=0
-pkgdesc="Self-contained cryptographic library"
-url="https://www.pycryptodome.org"
-arch="all"
-license="BSD-2-Clause Unlicense"
-makedepends="python3-dev py3-setuptools"
-source="$pkgname-$pkgver.tar.gz::https://github.com/Legrandin/pycryptodome/archive/v$pkgver.tar.gz"
-builddir="$srcdir"/pycryptodome-$pkgver
-
-replaces="py-pycryptodome py3-crypto" # Backwards compatibility
-provides="py-pycryptodome=$pkgver-r$pkgrel py3-crypto=$pkgrel-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py --quiet build
-}
-
-check() {
-	python3 setup.py test
-}
-
-package() {
-	python3 setup.py --quiet install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="3b0361d7afc772d9dec068b42d6a36732faeec55b7317cbe31fa86d65069b314c735fcfce03e68381d86f64dcb7abd751b0225c05f760631266063c1664fca4c  py3-pycryptodome-3.9.7.tar.gz"
diff --git a/main/py3-pygments/APKBUILD b/main/py3-pygments/APKBUILD
index 94ee6c9d955..e111445af76 100644
--- a/main/py3-pygments/APKBUILD
+++ b/main/py3-pygments/APKBUILD
@@ -1,32 +1,44 @@
+# Maintainer: Julien Voisin <julien.voisin@dustri.org>
 # Contributor: Peter Bui <pnutzh4x0r@gmail.com>
-# Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=py3-pygments
-_pkgname=Pygments
-pkgver=2.6.1
-pkgrel=0
+pkgver=2.17.2
+pkgrel=1
 pkgdesc="Syntax highlighting package written in Python"
 url="https://pygments.org/"
 arch="noarch"
 license="BSD-2-Clause"
-depends="python3 py3-setuptools"
-checkdepends="py3-pytest"
-subpackages="$pkgname-doc::noarch"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+depends="python3"
+makedepends="py3-setuptools py3-gpep517 py3-wheel py3-installer"
+checkdepends="py3-pytest py3-lxml py3-wcag-contrast-ratio"
+subpackages="$pkgname-pyc $pkgname-doc"
+source="https://files.pythonhosted.org/packages/source/P/Pygments/pygments-$pkgver.tar.gz
+	build-with-setuptools.patch
+	"
+builddir="$srcdir/pygments-$pkgver"
+options="!check" # causes issues when bootstrapping (py3-pytest depends on this)
 
 replaces="py-pygments" # Backwards compatibility
 provides="py-pygments=$pkgver-r$pkgrel" # Backwards compatibility
 
+# secfixes:
+#   2.7.4-r0:
+#     - CVE-2021-20270
+
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 -m pytest
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/Pygments*.whl
 
 	mkdir -p "$pkgdir"/usr/bin
 	ln -s pygmentize "$pkgdir"/usr/bin/pygmentize-3
@@ -50,4 +62,7 @@ doc() {
 	default_doc
 }
 
-sha512sums="0d793bb6eabe43645541347e44932ee50ccd4309f40e7a327422bcbe57d40a7cb8bbf2fb0911744ed6f316c6c08f4216462be88d79192a2ea004d6da51329932  Pygments-2.6.1.tar.gz"
+sha512sums="
+a3408a21f4c0a9f1a81d4fae5c2924f66f1f17daf98a52c4379d6953625354f47bb8db3005e6ab09407627f592843efde12afb14e1271c1e685973eb4c238d89  pygments-2.17.2.tar.gz
+132d410a0964fc27624e53c13bc72fc5b13a726752cb60ce8ab082c29ba24aba80a49a32805f942258cd10e07e334428695b4cae9ae0ddc984e934df0c2e1f08  build-with-setuptools.patch
+"
diff --git a/main/py3-pygments/build-with-setuptools.patch b/main/py3-pygments/build-with-setuptools.patch
new file mode 100644
index 00000000000..db620c52a86
--- /dev/null
+++ b/main/py3-pygments/build-with-setuptools.patch
@@ -0,0 +1,31 @@
+py3-hatchling is currently in community/ while py3-pygments is in main/.
+An aport in main/ cannot depend upon one in community/, so build with
+py3-setuptools while waiting for py3-hatchling to be moved to main/.
+
+
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,6 +1,7 @@
+ [build-system]
+-requires = ["hatchling"]
+-build-backend = "hatchling.build"
++# setuptools added pyproject.toml support in v61.0.0
++requires = ["setuptools >= 61"]
++build-backend = "setuptools.build_meta"
+ 
+ [project]
+ name = "Pygments"
+@@ -54,9 +55,8 @@
+ [project.scripts]
+ pygmentize = "pygments.cmdline:main"
+ 
+-# Temporary workaround for https://github.com/pypa/hatch/issues/1054
+-[tool.hatch.build.targets.wheel]
+-packages = ["pygments"]
++[tool.setuptools.dynamic]
++version = {attr = "pygments.__version__" }
+ 
+-[tool.hatch.version]
+-path = "pygments/__init__.py"
++[tool.setuptools.packages.find]
++include = ["pygments", "pygments.*"]
diff --git a/main/py3-pylast/APKBUILD b/main/py3-pylast/APKBUILD
deleted file mode 100644
index 2ddb3bb7762..00000000000
--- a/main/py3-pylast/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=py3-pylast
-pkgver=3.2.1
-pkgrel=0
-pkgdesc="A Python interface to the last.fm API"
-url="https://github.com/pylast/pylast"
-arch="noarch"
-license="Apache"
-replaces="py-pylast"
-# Requires unpackaged flaky
-options="!check"
-depends="python3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/p/pylast/pylast-$pkgver.tar.gz"
-builddir="$srcdir"/pylast-$pkgver
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 setup.py test
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-
-sha512sums="982324745c92adaaed6be94c2d947fbc4a3d716e56cbd84c797ba85b4160a169e19ccb6b735a6904665b346aa41cef851e2756b9620055f4e441aae3fb245372  pylast-3.2.1.tar.gz"
diff --git a/main/py3-pynacl/APKBUILD b/main/py3-pynacl/APKBUILD
deleted file mode 100644
index 00f2eee0399..00000000000
--- a/main/py3-pynacl/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: Francesco Colista <fcolista@alpinelinux.org>
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname=py3-pynacl
-_pkgname=pynacl
-pkgver=1.3.0
-pkgrel=4
-pkgdesc="Python3 binding to the Networking and Cryptography (NaCl) library"
-url="https://github.com/pyca/pynacl"
-arch="all"
-license="Apache-2.0"
-depends="py3-cffi py3-six"
-makedepends="py3-setuptools python3-dev libffi-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/pyca/$_pkgname/archive/$pkgver.tar.gz
-	ppc64le-disable-configure-segfaultcheck.patch"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-replaces="py-pynacl" # Backwards compatibility
-provides="py-pynacl=$pkgver-r$pkgrel" # Backwards compatibility
-
-check() {
-	cd "$builddir"
-	python3 setup.py check
-}
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="815c31a2069cbee1091d7e0ebf0b5572875c4a537311af561b5bce0b9d8051028e367a516b46481453d9780e60e9e7e2a4640d320164059c3974b0319d1cf96d  py3-pynacl-1.3.0.tar.gz
-a96f649bb7d1552612f46668ce1c27dd4bb62e0e6459a02e9769a967c54ebe8467c3e8c515789a65838f5c55c96f381fabea4cc07fde8857a65f7dafa062c07c  ppc64le-disable-configure-segfaultcheck.patch"
diff --git a/main/py3-pynacl/ppc64le-disable-configure-segfaultcheck.patch b/main/py3-pynacl/ppc64le-disable-configure-segfaultcheck.patch
deleted file mode 100644
index ccc61af682a..00000000000
--- a/main/py3-pynacl/ppc64le-disable-configure-segfaultcheck.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/libsodium/configure
-+++ b/src/libsodium/configure
-@@ -8742,7 +8742,11 @@
- signal(SIGSEGV, sig);
- signal(SIGBUS, sig);
- #if !defined(__SANITIZE_ADDRESS__) && !defined(__EMSCRIPTEN__)
-+#ifndef __powerpc64__
- for (i = 0; i < 10000000; i += 1024) { x[-i] = x[i] = (unsigned char) i; }
-+#else
-+exit(0);
-+#endif
- #endif
- free((void *) x);
- exit(1)
diff --git a/main/py3-pytest-timeout/APKBUILD b/main/py3-pytest-timeout/APKBUILD
new file mode 100644
index 00000000000..12dc3c92dda
--- /dev/null
+++ b/main/py3-pytest-timeout/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Oleg Titov <oleg.titov@gmail.com>
+# Maintainer: Oleg Titov <oleg.titov@gmail.com>
+pkgname=py3-pytest-timeout
+_pyname=pytest-timeout
+pkgver=2.3.1
+pkgrel=1
+pkgdesc="py.test plugin to abort hanging tests"
+url="https://github.com/pytest-dev/pytest-timeout/"
+arch="noarch"
+license="MIT"
+depends="py3-pytest"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="py3-pexpect"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/p/pytest-timeout/pytest-timeout-$pkgver.tar.gz"
+builddir="$srcdir/$_pyname-$pkgver"
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest -x
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
+}
+
+sha512sums="
+f200d625d11f76173521f4e2e4e09d57f6613d9b1420c57893b454ec496d5f11b32390b95eb995b403d15f8563b742a58fa0e0cbad42246b4049787a389ad83e  pytest-timeout-2.3.1.tar.gz
+"
diff --git a/main/py3-pytest/APKBUILD b/main/py3-pytest/APKBUILD
index 6ad21371cf7..58c22ba9062 100644
--- a/main/py3-pytest/APKBUILD
+++ b/main/py3-pytest/APKBUILD
@@ -1,26 +1,46 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py3-pytest
-pkgver=5.4.1
-pkgrel=0
+pkgver=8.1.1
+pkgrel=1
 pkgdesc="Python3 testing library"
 url="https://docs.pytest.org/en/latest/"
 arch="noarch"
 license="MIT"
-depends="py3-atomicwrites py3-py py3-six py3-attrs py3-more-itertools py3-pluggy py3-wcwidth
-	py3-setuptools py3-packaging"
-source="https://files.pythonhosted.org/packages/source/p/pytest/pytest-$pkgver.tar.gz"
+depends="
+	py3-iniconfig
+	py3-packaging
+	py3-pluggy
+	py3-py
+	"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="bash py3-hypothesis py3-virtualenv py3-xmlschema"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/p/pytest/pytest-$pkgver.tar.gz
+	"
 builddir="$srcdir/pytest-$pkgver"
+options="!check" # causes bootstrapping issues because of checkdepends
 
 replaces="pytest" # Backwards compatibility
 provides="pytest=$pkgver-r$pkgrel" # Backwards compatibility
 
+prepare() {
+	default_prepare
+
+	sed -e "/^\[metadata\]/a version = $pkgver" -i setup.cfg
+}
+
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 setup.py check
+	python3 -m venv --clear --without-pip --system-site-packages test-env
+	test-env/bin/python3 -m installer .dist/pytest*.whl
+
+	test-env/bin/python3 -m pytest
 }
 
 package() {
@@ -30,7 +50,10 @@ package() {
 		ln -s $name-3 "$pkgdir"/usr/bin/$name
 	done
 
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/pytest*.whl
 }
 
-sha512sums="50d94158817561316cfb4c6ad4481858a76cfe44ba964cc7a3bb81d3701eb621ca5cd46c4be24644134417d8bf7e7771f4b3a30af71fde5ea9705c3241fa2878  pytest-5.4.1.tar.gz"
+sha512sums="
+f1a9f69cd4eca3ab36c36bc666bf70b099125ed6e17b89d13554c3f13b100d05abfd0b35516660d00ca4fb9eca81164ab02bc8f7a9a8d90fd4302bf399cd88c0  pytest-8.1.1.tar.gz
+"
diff --git a/main/py3-redis/APKBUILD b/main/py3-redis/APKBUILD
deleted file mode 100644
index f32c5f31613..00000000000
--- a/main/py3-redis/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Eivind Uggedal <eu@eju.no>
-pkgname=py3-redis
-_pkgname=redis
-pkgver=3.2.1
-pkgrel=2
-pkgdesc="Python3 client for Redis key-value store"
-url="https://github.com/andymccurdy/redis-py"
-arch="noarch"
-license="MIT"
-depends="python3"
-makedepends="py3-setuptools"
-checkdepends="py3-pytest py3-mock redis"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-replaces="py-redis" # Backwards compatibility
-provides="py-redis=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	redis-server --dir "$builddir"&
-	local _redispid=$!
-
-	python3 setup.py test || (kill $_redispid && false)
-	kill $_redispid
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="be51642a8895325c3c61993dd83c3299a9e2cefc1010e04f182833f720ff161bea43d3a57d28afba991949fcf6e967c4f778002967641bffe651d5db384f2e08  redis-3.2.1.tar.gz"
diff --git a/main/py3-requests/APKBUILD b/main/py3-requests/APKBUILD
index 7847bba53a1..893fb80d308 100644
--- a/main/py3-requests/APKBUILD
+++ b/main/py3-requests/APKBUILD
@@ -1,29 +1,40 @@
 # Contributor: Peter Bui <pnutzh4x0r@gmail.com>
-# Maintainer: Drew DeVault <sir@cmpwn.com>
+# Maintainer: Steven Guikal <void@fluix.one>
 pkgname=py3-requests
-_pkgname=requests
-pkgver=2.23.0
-pkgrel=0
-pkgdesc="A HTTP request library for Python3"
-url="http://www.python-requests.org/"
+pkgver=2.31.0
+pkgrel=2
+pkgdesc="HTTP request library for Python3"
+url="https://requests.readthedocs.io/"
 arch="noarch"
 license="Apache-2.0"
 # Requirements for tests are not available in main
 options="!check"
-depends="python3 py3-chardet py3-idna py3-certifi py3-urllib3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+depends="
+	py3-certifi
+	py3-charset-normalizer
+	py3-idna
+	py3-urllib3
+	python3
+	"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/r/requests/requests-$pkgver.tar.gz"
+builddir="$srcdir/requests-$pkgver"
 
 replaces="py-requests" # Backwards compatibility
 provides="py-requests=$pkgver-r$pkgrel" # Backwards compatibility
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="a0f7db5cc9ce67af9f6f81b72e41491735a102f2a1da2fbde98e279846e2140cd26b6370aa5ec79c148c397885a7ae2bbce45c4587215f510dd02b8ac57cb46e  requests-2.23.0.tar.gz"
+sha512sums="
+ce50d64973752f4cf7f7c7c91401669854b55c66d7465bea3689772fae8a6b646cf6720d84a2984bbe6fd78fc8b9ce0aa377f291fb6d7c20c7c2a4be8193acdd  requests-2.31.0.tar.gz
+"
diff --git a/main/py3-roman/APKBUILD b/main/py3-roman/APKBUILD
deleted file mode 100644
index 4c854067fe5..00000000000
--- a/main/py3-roman/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: Matt Smith <mcs@darkregion.net>
-# Maintainer: Matt Smith <mcs@darkregion.net>
-pkgname=py3-roman
-_pkgname=roman
-pkgver=3.2
-pkgrel=2
-pkgdesc="Integer to Roman numerals converter"
-url="https://pypi.python.org/pypi/roman"
-arch="noarch"
-license="Python-2.0"
-depends="python3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-roman" # Backwards compatibility
-provides="py-roman=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 setup.py test
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="142904551745c8b7874d52c8d04f483b0c18b18ba8bc3d3a51fcf509e09b3a3f8a28d0b88bdd8282957bf3d698b1bab86de7fb4808cde9b0e5cfb910deca35ab  roman-3.2.tar.gz"
diff --git a/main/py3-rsa/APKBUILD b/main/py3-rsa/APKBUILD
deleted file mode 100644
index 4ccb77b6f53..00000000000
--- a/main/py3-rsa/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer:
-# Contributor: Valery Kartel <valery.kartel@gmail.com>
-pkgname=py3-rsa
-_pkgname=rsa
-pkgver=3.4.2
-pkgrel=5
-pkgdesc="Pure-Python3 RSA implementation"
-url="https://stuvel.eu/rsa"
-arch="noarch"
-license="Apache-2.0"
-depends="python3 py3-asn1"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-rsa" # Backwards compatibility
-provides="py-rsa=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="62b0ff31fb3b9c18ae65bd102329e69726b853560576b1b66b9b89b26d3ff79154239af7e7a581b6a27c7017cc013f738762cd9662777ef594cc11c5b1f8e267  rsa-3.4.2.tar.gz"
diff --git a/main/py3-setuptools/APKBUILD b/main/py3-setuptools/APKBUILD
index 1320de81b9b..be5dcb3d449 100644
--- a/main/py3-setuptools/APKBUILD
+++ b/main/py3-setuptools/APKBUILD
@@ -1,31 +1,47 @@
 # Contributor: Andrew Manison <amanison@anselsystems.com>
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Peter Shkenev <santurysim@gmail.com>
 pkgname=py3-setuptools
-_pkgname=${pkgname#py3-}
-pkgver=46.1.3
+pkgver=69.5.1
 pkgrel=0
 pkgdesc="Collection of enhancements to the Python3 distutils"
 options="!check" # Tests require packages out of main/
-url="https://pypi.python.org/pypi/setuptools"
+url="https://pypi.org/project/setuptools"
 arch="noarch"
 license="MIT"
-depends="python3 py3-ordered-set py3-appdirs py3-packaging"
-source="$_pkgname-$pkgver.tar.gz::https://github.com/pypa/$_pkgname/archive/v$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
+# everything is vendored
+depends="
+	py3-packaging
+	python3
+	"
+# depends="
+# 	py3-appdirs
+# 	py3-more-itertools
+# 	py3-ordered-set
+# 	py3-packaging
+# 	python3
+# 	"
+subpackages="$pkgname-pyc"
+source="$pkgname-$pkgver.tar.gz::https://pypi.io/packages/source/s/setuptools/setuptools-$pkgver.tar.gz"
+builddir="$srcdir"/setuptools-$pkgver
 
 provides="py-setuptools=$pkgver-r$pkgrel" # Backwards compatibility
 replaces="py-setuptools" # Backwards compatiblity
 
+# py3-setuptools needs itself to build, bootstrapped with a lower version
+# in main/py3-setuptools-stage0
+provides="$provides py3-setuptools-bootstrap"
+provider_priority=100 # highest
+
 export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
 
 prepare() {
 	default_prepare
 
 	# Unbundle
-	rm -rf pkg_resources/extern pkg_resources/_vendor \
-		setuptools/extern setuptools/_vendor
+	# rm -rf pkg_resources/extern pkg_resources/_vendor \
+	# 	setuptools/extern setuptools/_vendor
 
 	# Upstream devendoring logic is badly broken, see:
 	# https://bugs.archlinux.org/task/58670
@@ -33,24 +49,19 @@ prepare() {
 	# https://github.com/pypa/setuptools/issues/1383
 	# The simplest fix is to simply rewrite import paths to use the canonical
 	# location in the first place
-	for _module in setuptools pkg_resources '' ; do
-		find . -name \*.py -exec sed -i \
-			-e 's/from '$_module.extern' import/import/' \
-			-e 's/from '$_module.extern'./from /' \
-			-e 's/import '$_module.extern'./import /' \
-			-e "s/__import__('$_module.extern./__import__('/" \
-			{} +
-	done
+	# for _module in setuptools pkg_resources '' ; do
+	# 	find . -name \*.py -exec sed -i \
+	# 		-e 's/from '$_module.extern' import/import/' \
+	# 		-e 's/from '$_module.extern'./from /' \
+	# 		-e 's/import '$_module.extern'./import /' \
+	# 		-e "s/__import__('$_module.extern./__import__('/" \
+	# 		{} +
+	# done
 
 	# Fix post-release tag
 	sed -e '/tag_build = .post/d' \
 		-e '/tag_date = 1/d' \
 		-i setup.cfg
-
-	# Fix shebang
-	sed -i -e "s|^#\!.*/usr/bin/env python|#!/usr/bin/env python3|" setuptools/command/easy_install.py
-
-	python3 bootstrap.py
 }
 
 build() {
@@ -58,8 +69,14 @@ build() {
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-	# we don't provide a non-suffixed easy_install
-	rm -f "$pkgdir"/usr/bin/easy_install
+	local pyver="$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')"
+	# Otherwise it complains that build/scripts-3.12 cannot be found
+	# no other changes noted
+	mkdir -p build/scripts-"$pyver"
+
+	python3 setup.py install --root="$pkgdir" --skip-build
 }
-sha512sums="863dfde80d522c899102a51500b2ade49a6f80a7c41715dbcec7ed92681e24ad044bffb04c2c6673ccdc9865ad9749911fd0d598a1651a2d3ef0625b19425f55  setuptools-46.1.3.tar.gz"
+
+sha512sums="
+81f4a5184976a0d4aa070261bb56458c54ec6a479786fa469e98cb336e9a1691b281ae771abe41bc5398fac15b2dd039c07cf014ee00572f46908ce6830fcb6a  py3-setuptools-69.5.1.tar.gz
+"
diff --git a/main/py3-setuptools_scm/APKBUILD b/main/py3-setuptools_scm/APKBUILD
new file mode 100644
index 00000000000..3b6ff8c0c72
--- /dev/null
+++ b/main/py3-setuptools_scm/APKBUILD
@@ -0,0 +1,44 @@
+# Contributor: Dmitry Romanenko <dmitry@romanenko.in>
+# Maintainer: Peter Shkenev <santurysim@gmail.com>
+pkgname=py3-setuptools_scm
+_pkgname=setuptools-scm
+pkgver=8.0.4
+pkgrel=2
+pkgdesc="The blessed package to manage your versions by scm tags"
+url="https://github.com/pypa/setuptools_scm"
+arch="noarch"
+license="MIT"
+depends="py3-setuptools py3-packaging"
+makedepends="py3-gpep517 py3-wheel"
+checkdepends="py3-pytest"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
+	typing-ext.patch
+	"
+builddir="$srcdir"/$_pkgname-$pkgver
+options="!check" # here -> pytest -> pluggin -> here
+
+replaces="py-setuptools_scm" # Backwards compatibility
+provides="py-setuptools_scm=$pkgver-r$pkgrel" # Backwards compatibility
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	TZ=UTC .testenv/bin/python3 -m pytest -k 'not test_pip_download and not test_pyproject_support_with_git and not test_pretend_version_named_pyproject_integration'
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
+}
+
+sha512sums="
+1b584f20dfad115f379a97de9e96bb3b36ab00986381748c2f395facd26ce01a6556ccfbabeb8f0cf9ce8720b26ce3a00040dba02cc689701ccf1d31f13277da  setuptools-scm-8.0.4.tar.gz
+152457a9d480ebf6e48bc1b7546c95df3aebd540991348f95202ddaa162d765f71bbf1e9cd4ce4afa20532d0016a3ed138d4626a4a45de6d3069558a0e691c2e  typing-ext.patch
+"
diff --git a/main/py3-setuptools_scm/typing-ext.patch b/main/py3-setuptools_scm/typing-ext.patch
new file mode 100644
index 00000000000..e137e62582d
--- /dev/null
+++ b/main/py3-setuptools_scm/typing-ext.patch
@@ -0,0 +1,67 @@
+--- a/src/setuptools_scm/_file_finders/__init__.py
++++ b/src/setuptools_scm/_file_finders/__init__.py
+@@ -10,7 +10,7 @@
+ from .._entrypoints import iter_entry_points
+ 
+ if TYPE_CHECKING:
+-    from typing_extensions import TypeGuard
++    from typing import TypeGuard
+ 
+ 
+ log = _log.log.getChild("file_finder")
+--- a/src/setuptools_scm/_integration/toml.py
++++ b/src/setuptools_scm/_integration/toml.py
+@@ -15,7 +15,7 @@
+     from tomli import loads as load_toml
+ 
+ if TYPE_CHECKING:
+-    from typing_extensions import TypeAlias
++    from typing import TypeAlias
+ 
+ from .. import _log
+ 
+--- a/src/setuptools_scm/_types.py
++++ b/src/setuptools_scm/_types.py
+@@ -10,7 +10,7 @@
+ 
+ 
+ if TYPE_CHECKING:
+-    from typing_extensions import TypeAlias
++    from typing import TypeAlias
+     from . import version
+ 
+ PathT: TypeAlias = Union["os.PathLike[str]", str]
+--- a/src/setuptools_scm/version.py
++++ b/src/setuptools_scm/version.py
+@@ -17,8 +17,8 @@
+ from . import _modify_version
+ 
+ if TYPE_CHECKING:
+-    from typing_extensions import Concatenate
+-    from typing_extensions import ParamSpec
++    from typing import Concatenate
++    from typing import ParamSpec
+ 
+     _P = ParamSpec("_P")
+ 
+--- a/testing/conftest.py
++++ b/testing/conftest.py
+@@ -8,7 +8,7 @@
+ from typing import Iterator
+ 
+ import pytest
+-from typing_extensions import Self
++from typing import Self
+ 
+ from .wd_wrapper import WorkDir
+ from setuptools_scm._run_cmd import run
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -42,7 +42,6 @@
+   "packaging>=20",
+   "setuptools",
+   'tomli>=1; python_version < "3.11"',
+-  "typing-extensions",
+ ]
+ [project.optional-dependencies]
+ docs = [
diff --git a/main/py3-simpleparse/APKBUILD b/main/py3-simpleparse/APKBUILD
deleted file mode 100644
index c97b17bbe69..00000000000
--- a/main/py3-simpleparse/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
-pkgname=py3-simpleparse
-_pkgname=SimpleParse
-pkgver=2.2.0
-pkgrel=2
-pkgdesc="Python library providing simple and fast parser generator"
-url="https://launchpad.net/simpleparse"
-arch="all"
-license="eGenix ISC"
-depends="python3"
-makedepends="python3-dev"
-options="!check" # no test suite
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.zip"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --skip-build --root="$pkgdir"
-}
-
-sha512sums="90956843384739b52a0dc5397633f089c519b4acf922ad953dba49686a4e2c243f8bff6586c1f54c84cdef0c9555fbf6681c41ca70a4bf0f716f2892ae913b0e  SimpleParse-2.2.0.zip"
diff --git a/main/py3-six/APKBUILD b/main/py3-six/APKBUILD
index 9bd1df74822..94da874f65b 100644
--- a/main/py3-six/APKBUILD
+++ b/main/py3-six/APKBUILD
@@ -1,33 +1,36 @@
-# Maintainer: Drew DeVault <sir@cmpwn.com>
+# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
 pkgname=py3-six
 _pkgname=six
-pkgver=1.14.0
-pkgrel=1
+pkgver=1.16.0
+pkgrel=9
 pkgdesc="Python 2 and 3 compatibility library"
-url="https://pypi.python.org/pypi/six"
+url="https://pypi.org/project/six"
 arch="noarch"
 license="MIT"
 depends="python3"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="py3-pytest"
+subpackages="$pkgname-pyc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/benjaminp/$_pkgname/archive/$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 replaces="py-six" # Backwards compatibility
 provides="py-six=$pkgver-r$pkgrel" # Backwards compatibility
 
-# circular dependency with pytest
-#checkdepends="pytest py3-pytest"
-options="!check"
-
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 -m pytest -rfsxX
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest -rfsxX
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 }
 
-sha512sums="1604c083841693beac32a67bdab0c01f8bb77f648f5da408c68c7fa61137843371ae75c7c0a0a19172ad77e737b35a2a762e22a3908b90958a65945b476bfb65  py3-six-1.14.0.tar.gz"
+sha512sums="
+630179b9994e10573225dcfa4ff7a40449a58bbe57ccff06434fa40ded10c6e3e1d72a230860a8e6c839c7c17357aca9e1f38aede9566782339331eef65fed3a  py3-six-1.16.0.tar.gz
+"
diff --git a/main/py3-snowballstemmer/APKBUILD b/main/py3-snowballstemmer/APKBUILD
index 4e443589ad0..a516991e630 100644
--- a/main/py3-snowballstemmer/APKBUILD
+++ b/main/py3-snowballstemmer/APKBUILD
@@ -1,27 +1,31 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py3-snowballstemmer
 _pkgname=snowballstemmer
-pkgver=2.0.0
-pkgrel=1
+pkgver=2.2.0
+pkgrel=4
 pkgdesc="Snowball stemming library collection for Python3"
 url="https://github.com/shibukawa/snowball_py"
 arch="noarch"
 license="BSD-3-Clause"
 depends="python3"
-makedepends="py3-setuptools"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 replaces="py-snowballstemmer" # Backwards compatibility
 provides="py-snowballstemmer=$pkgver-r$pkgrel" # Backwards compatibility
+options="!check"
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 }
 
-sha512sums="d673205cacc7f6e81eaee23e6c50064af77c3c4464dbdf5dc1c3f5682dec2688fe6e7069b7ed2e59259312ba926d3be84bd846a132b6138e30b4ff2b9a9353e8  snowballstemmer-2.0.0.tar.gz"
+sha512sums="
+f1dee83e06fc79ffb250892fe62c75e3393b9af07fbf7cde413e6391870aa74934302771239dea5c9bc89806684f95059b00c9ffbcf7340375c9dd8f1216cd37  snowballstemmer-2.2.0.tar.gz
+"
diff --git a/main/py3-sortedcontainers/APKBUILD b/main/py3-sortedcontainers/APKBUILD
new file mode 100644
index 00000000000..0b6cdb32f4e
--- /dev/null
+++ b/main/py3-sortedcontainers/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: André Klitzing <aklitzing@gmail.com>
+# Maintainer: André Klitzing <aklitzing@gmail.com>
+pkgname=py3-sortedcontainers
+_pkgname=python-sortedcontainers
+pkgver=2.4.0
+pkgrel=5
+pkgdesc="Python library for sorting collections and containers"
+url="http://www.grantjenks.com/docs/sortedcontainers"
+license="Apache-2.0"
+arch="noarch"
+depends="python3"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="py3-pytest"
+subpackages="$pkgname-pyc"
+source="$_pkgname-$pkgver.tar.gz::https://github.com/grantjenks/python-sortedcontainers/archive/v$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$pkgver"
+
+replaces="py-sortedcontainers" # Backwards compatibility
+provides="py-sortedcontainers=$pkgver-r$pkgrel" # Backwards compatibility
+
+build() {
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" .dist/*.whl
+}
+
+sha512sums="
+f80185c6f95a85cc78f88f6f6cf389eb48be22cf94d5fcd84f3592873f17de37ec7f44c1627b7f02956ac4b4f74ca4febefc47d3c6232f70ee05dbb2449ad770  python-sortedcontainers-2.4.0.tar.gz
+"
diff --git a/main/py3-sphinx/APKBUILD b/main/py3-sphinx/APKBUILD
index e6853c3e1cd..2ab562ea724 100644
--- a/main/py3-sphinx/APKBUILD
+++ b/main/py3-sphinx/APKBUILD
@@ -1,27 +1,46 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py3-sphinx
-_pkgname=${pkgname#py3-}
-pkgver=2.2.1
+pkgver=7.2.6
 pkgrel=1
 pkgdesc="Python Documentation Generator"
-url="http://sphinx.pocoo.org/"
+# checkdepends require 'imagemagick' and 'py3-html5lib' which
+# are in community/, 'imagemagick' itself also needs 'librsvg'
+# and 'libheif', which bring in 'rust', 'x265' and others, this
+# is too much of a burden to put on main/
+options="!check"
+url="https://www.sphinx-doc.org/"
 arch="noarch"
 license="BSD-2-Clause"
-depends="py3-docutils py3-jinja2 py3-pygments py3-six py3-sphinx_rtd_theme
-	py3-alabaster<0.8 py3-babel py3-snowballstemmer py3-imagesize
-	py3-requests py3-sphinxcontrib-websupport py3-setuptools py3-packaging
-	py3-sphinxcontrib-applehelp py3-sphinxcontrib-devhelp
-	py3-sphinxcontrib-jsmath py3-sphinxcontrib-htmlhelp
-	py3-sphinxcontrib-serializinghtml py3-sphinxcontrib-qthelp
-	py3-attrs make"
-checkdepends="py3-pytest py3-funcsigs py3-pluggy"
-options="!check" # py3-pluggy and some other packages needs to be moved to main first
-source="$_pkgname-$pkgver.tar.gz::https://github.com/sphinx-doc/sphinx/archive/v$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+depends="
+	py3-babel
+	py3-docutils
+	py3-imagesize
+	py3-jinja2
+	py3-packaging
+	py3-pygments
+	py3-requests
+	py3-snowballstemmer
+	py3-alabaster
+	py3-sphinxcontrib-applehelp
+	py3-sphinxcontrib-devhelp
+	py3-sphinxcontrib-htmlhelp
+	py3-sphinxcontrib-jsmath
+	py3-sphinxcontrib-serializinghtml
+	py3-sphinxcontrib-qthelp
+	"
+makedepends="py3-gpep517 py3-flit-core py3-installer"
+# imagemagick is for tests/test_ext_imgconverter.py::test_ext_imgconverter
+# which calls the 'convert' binary
+checkdepends="py3-pytest py3-funcsigs py3-pluggy imagemagick py3-html5lib"
+subpackages="$pkgname-pyc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/sphinx-doc/sphinx/archive/v$pkgver.tar.gz"
+builddir="$srcdir/sphinx-$pkgver"
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 check() {
@@ -29,18 +48,10 @@ check() {
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-
-	# TODO: The binaries with the -3 postfix should be
-	# considered deprecated and removed in a future release.
-	local path; for path in "$pkgdir"/usr/bin/*; do
-		mv "$path" "$path"-3
-	done
-
-	cd "$pkgdir"/usr/bin
-	local name; for name in *-3; do
-		ln -s -- $name "$pkgdir"/usr/bin/${name%-3}
-	done
+	python3 -m installer -d "$pkgdir" \
+		.dist/sphinx-*.whl
 }
 
-sha512sums="d3f3f89ddf7d007ac271e6351223852918f028ba0ce39f06f4a75babeb4525cdc65c625162b2d1e732db448f77aeb9cae656eb484a7c9eab7ad6dd563b92fe52  sphinx-2.2.1.tar.gz"
+sha512sums="
+204e859318ad5044639f2e682098b07c7cc675b54ba801feeb3322290bfd15316cc15a2cae8fa6a55e6ec6d1e9690790e5402652eb04720bfe96e172f4c8bdbc  py3-sphinx-7.2.6.tar.gz
+"
diff --git a/main/py3-sphinx_rtd_theme/APKBUILD b/main/py3-sphinx_rtd_theme/APKBUILD
deleted file mode 100644
index 1cba57c54c0..00000000000
--- a/main/py3-sphinx_rtd_theme/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=py3-sphinx_rtd_theme
-_pkgname=sphinx_rtd_theme
-pkgver=0.4.3
-pkgrel=3
-pkgdesc="Sphinx theme for readthedocs.org"
-url="https://github.com/snide/sphinx_rtd_theme"
-arch="noarch"
-license="MIT"
-depends="python3"
-makedepends="py3-setuptools"
-checkdepends="py3-pytest"
-options="!check" # readthedocs_ext is missing
-source="$_pkgname-$pkgver.tar.gz::https://github.com/snide/$_pkgname/archive/$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-sphinx_rtd_theme" # Backwards compatibility
-provides="py-sphinx_rtd_theme=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	py.test-3
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="6e5d4d0c44ea8acdf382dd589a194be2777e4c4f66f27705eb32d0507cf71b9d289df860bc3d9845242629cd92d62154040f9063f1c05ff6f329e210e14a6a9a  sphinx_rtd_theme-0.4.3.tar.gz"
diff --git a/main/py3-sphinxcontrib-applehelp/APKBUILD b/main/py3-sphinxcontrib-applehelp/APKBUILD
index 0c4eab45cb8..d78dfa4b7cf 100644
--- a/main/py3-sphinxcontrib-applehelp/APKBUILD
+++ b/main/py3-sphinxcontrib-applehelp/APKBUILD
@@ -1,23 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py3-sphinxcontrib-applehelp
 _pyname=sphinxcontrib-applehelp
-pkgver=1.0.2
-pkgrel=0
+pkgver=1.0.4
+pkgrel=3
 pkgdesc="Sphinx applehelp extension"
-url="https://pypi.python.org/pypi/sphinxcontrib-applehelp"
+url="https://pypi.org/project/sphinxcontrib-applehelp"
 arch="noarch"
 license="BSD-2-Clause"
 depends="python3"
-makedepends="py3-setuptools"
+makedepends="
+	py3-gpep517
+	py3-setuptools
+	py3-wheel
+	"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pyname%${_pyname#?}}/$_pyname/$_pyname-$pkgver.tar.gz"
 builddir="$srcdir"/$_pyname-$pkgver
+options="!check"
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="1325ac83ff15dd28d6f2791caf64e6c08d1dd2f0946dc8891f5c4d8fd062a1e8650c9c39a7459195ef41f3b425f5b8d6c5e277ea85621a36dd870ca5162508da  sphinxcontrib-applehelp-1.0.2.tar.gz"
+sha512sums="
+998249b6ac2061d3fefec508396f407af450794d2c08a255c9384e9b1a6222bb83af5421115790cb689ebf5dce1ca846ae3fcb71b60ea6183d79262969a26218  sphinxcontrib-applehelp-1.0.4.tar.gz
+"
diff --git a/main/py3-sphinxcontrib-devhelp/APKBUILD b/main/py3-sphinxcontrib-devhelp/APKBUILD
index 02b582a6bb5..a4d3d6f35d6 100644
--- a/main/py3-sphinxcontrib-devhelp/APKBUILD
+++ b/main/py3-sphinxcontrib-devhelp/APKBUILD
@@ -1,23 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py3-sphinxcontrib-devhelp
 _pyname=sphinxcontrib-devhelp
-pkgver=1.0.2
-pkgrel=0
+pkgver=1.0.5
+pkgrel=2
 pkgdesc="Sphinx devhelp extension"
-url="https://pypi.python.org/pypi/sphinxcontrib-devhelp"
+url="https://pypi.org/project/sphinxcontrib-devhelp"
 arch="noarch"
 license="BSD-2-Clause"
 depends="python3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pyname%${_pyname#?}}/$_pyname/$_pyname-$pkgver.tar.gz"
+makedepends="py3-gpep517 py3-flit-core py3-setuptools py3-wheel"
+checkdepends="py3-pytest py3-sphinx"
+subpackages="$pkgname-pyc"
+source="$_pyname-$pkgver.tar.gz::https://github.com/sphinx-doc/sphinxcontrib-devhelp/archive/refs/tags/$pkgver.tar.gz"
 builddir="$srcdir"/$_pyname-$pkgver
+options="!check" # py3-sphinx is a circular dep
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 }
 
-sha512sums="83b46eaf26df3932ea2136cfda1c0fca4fc08ce8bca564845b3efe5bb00d6c8c93991f4edd4913d4ec796e2d85bd2c7265adf28e98f42e8094daeb5ac11a0eb1  sphinxcontrib-devhelp-1.0.2.tar.gz"
+sha512sums="
+d8d6f5429389c100bf81f0030a34713f6d9b0285866b4e912f21e0b490f3a501360f54be2fae9ce82ba025568f9a2f761013a64397289f94bdc06607baeb5bd0  sphinxcontrib-devhelp-1.0.5.tar.gz
+"
diff --git a/main/py3-sphinxcontrib-htmlhelp/APKBUILD b/main/py3-sphinxcontrib-htmlhelp/APKBUILD
index 2e4c86d7e1d..2f1e824b834 100644
--- a/main/py3-sphinxcontrib-htmlhelp/APKBUILD
+++ b/main/py3-sphinxcontrib-htmlhelp/APKBUILD
@@ -1,23 +1,40 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py3-sphinxcontrib-htmlhelp
 _pyname=sphinxcontrib-htmlhelp
-pkgver=1.0.3
-pkgrel=0
+pkgver=2.0.1
+pkgrel=3
 pkgdesc="Sphinx htmlhelp extension"
-url="https://pypi.python.org/pypi/sphinxcontrib-htmlhelp"
+url="https://pypi.org/project/sphinxcontrib-htmlhelp"
 arch="noarch"
 license="BSD-2-Clause"
 depends="python3"
-makedepends="py3-setuptools"
+makedepends="
+	py3-gpep517
+	py3-setuptools
+	py3-wheel
+	"
+options="!check" # cyclic dependency
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pyname%${_pyname#?}}/$_pyname/$_pyname-$pkgver.tar.gz"
 builddir="$srcdir"/$_pyname-$pkgver
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m unittest discover
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="f37542c5789340bb26c41b84512e08998e4ef45ff2eb0fdb0e10f585cff27a145d5821b8eb3766d009e2b5a38c3d7efb127ab898982e1b6fd1d4ff7e26907db4  sphinxcontrib-htmlhelp-1.0.3.tar.gz"
+sha512sums="
+7957ad688d7f9d44c0413fd747147e8e261136d48ed159fef4e668dcab76c54103028102a9ed893bfadbd175b88543e0d1414b8e01a716810d44b92edfbd79e5  sphinxcontrib-htmlhelp-2.0.1.tar.gz
+"
diff --git a/main/py3-sphinxcontrib-jsmath/APKBUILD b/main/py3-sphinxcontrib-jsmath/APKBUILD
index 8eaa36661a8..e705037ba47 100644
--- a/main/py3-sphinxcontrib-jsmath/APKBUILD
+++ b/main/py3-sphinxcontrib-jsmath/APKBUILD
@@ -2,22 +2,26 @@
 pkgname=py3-sphinxcontrib-jsmath
 _pyname=sphinxcontrib-jsmath
 pkgver=1.0.1
-pkgrel=0
+pkgrel=8
 pkgdesc="Sphinx jsmath extension"
-url="https://pypi.python.org/pypi/sphinxcontrib-jsmath"
+url="https://pypi.org/project/sphinxcontrib-jsmath"
 arch="noarch"
 license="BSD-2-Clause"
 depends="python3"
-makedepends="py3-setuptools"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pyname%${_pyname#?}}/$_pyname/$_pyname-$pkgver.tar.gz"
 builddir="$srcdir"/$_pyname-$pkgver
+options="!check"
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 }
 
-sha512sums="c1e6488f5c0ca4567c27ec7c597c9db321ac32ce354c4ad62fea534b2ae1c0acb183a921f46216bbc3891f14acfaac05ddf324b8fdaf99828df07bc91aa7e5c7  sphinxcontrib-jsmath-1.0.1.tar.gz"
+sha512sums="
+c1e6488f5c0ca4567c27ec7c597c9db321ac32ce354c4ad62fea534b2ae1c0acb183a921f46216bbc3891f14acfaac05ddf324b8fdaf99828df07bc91aa7e5c7  sphinxcontrib-jsmath-1.0.1.tar.gz
+"
diff --git a/main/py3-sphinxcontrib-qthelp/APKBUILD b/main/py3-sphinxcontrib-qthelp/APKBUILD
index 560da2d2d35..fc8fb7347f4 100644
--- a/main/py3-sphinxcontrib-qthelp/APKBUILD
+++ b/main/py3-sphinxcontrib-qthelp/APKBUILD
@@ -1,23 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py3-sphinxcontrib-qthelp
 _pyname=sphinxcontrib-qthelp
-pkgver=1.0.3
-pkgrel=0
+pkgver=1.0.6
+pkgrel=2
 pkgdesc="Sphinx qthelp extension"
-url="https://pypi.python.org/pypi/sphinxcontrib-qthelp"
+url="https://pypi.org/project/sphinxcontrib-qthelp"
 arch="noarch"
 license="BSD-2-Clause"
 depends="python3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pyname%${_pyname#?}}/$_pyname/$_pyname-$pkgver.tar.gz"
+makedepends="py3-gpep517 py3-flit-core py3-setuptools py3-wheel"
+checkdepends="py3-pytest py3-sphinx"
+subpackages="$pkgname-pyc"
+source="$_pyname-$pkgver.tar.gz::https://github.com/sphinx-doc/sphinxcontrib-qthelp/archive/refs/tags/$pkgver.tar.gz"
 builddir="$srcdir"/$_pyname-$pkgver
+options="!check" # py3-sphinx is a circular dep
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 }
 
-sha512sums="29f77e4b3f1a4868c2a34dbd853415e5d813f482cd23b982aeed42d53acba09b896d77ba930c34cce8af043bb7d64a19acff610430e942038d95a410b6e0b5fa  sphinxcontrib-qthelp-1.0.3.tar.gz"
+sha512sums="
+44948edcb892ff2873ef9fee588a5685ae267cb374d3fe5dc25a29d72a77ee5ed195999d08228508cac4b3043d3db6392ce329b4548d91e0b9e6f72b7cf4bc07  sphinxcontrib-qthelp-1.0.6.tar.gz
+"
diff --git a/main/py3-sphinxcontrib-serializinghtml/APKBUILD b/main/py3-sphinxcontrib-serializinghtml/APKBUILD
index 929f5970913..a2a0e32a31c 100644
--- a/main/py3-sphinxcontrib-serializinghtml/APKBUILD
+++ b/main/py3-sphinxcontrib-serializinghtml/APKBUILD
@@ -1,23 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py3-sphinxcontrib-serializinghtml
 _pyname=sphinxcontrib-serializinghtml
-pkgver=1.1.4
-pkgrel=0
+pkgver=1.1.9
+pkgrel=2
 pkgdesc="Sphinx serializinghtml extension"
-url="https://pypi.python.org/pypi/sphinxcontrib-serializinghtml"
+url="https://pypi.org/project/sphinxcontrib-serializinghtml"
 arch="noarch"
 license="BSD-2-Clause"
 depends="python3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pyname%${_pyname#?}}/$_pyname/$_pyname-$pkgver.tar.gz"
+makedepends="py3-gpep517 py3-flit-core py3-setuptools py3-wheel"
+checkdepends="py3-pytest py3-sphinx"
+subpackages="$pkgname-pyc"
+source="$_pyname-$pkgver.tar.gz::https://github.com/sphinx-doc/sphinxcontrib-serializinghtml/archive/refs/tags/$pkgver.tar.gz"
 builddir="$srcdir"/$_pyname-$pkgver
+options="!check" # py3-sphinx is a circular dep
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 }
 
-sha512sums="d132f75f1e0491167cd6d0f5b3697ac0fc1b16e63fd3dcd480b961e332b521932e405679a695522a4aeb56f57949eb9b1ed7635e9807dd059ae44a6384bdc6d0  sphinxcontrib-serializinghtml-1.1.4.tar.gz"
+sha512sums="
+f40dc6159232a39e4926bbb867470314b060574c6f5b39117bab5d15f97126b4833ee97777131bf60b3a8e4968419ad4c32d8b42e5fe175ce70fc3fe9ef8a1cd  sphinxcontrib-serializinghtml-1.1.9.tar.gz
+"
diff --git a/main/py3-sphinxcontrib-websupport/APKBUILD b/main/py3-sphinxcontrib-websupport/APKBUILD
index 6cc9e04b15d..85bd6e32b45 100644
--- a/main/py3-sphinxcontrib-websupport/APKBUILD
+++ b/main/py3-sphinxcontrib-websupport/APKBUILD
@@ -1,29 +1,39 @@
 # Maintainer: André Klitzing <aklitzing@gmail.com>
 pkgname=py3-sphinxcontrib-websupport
 _pkgname=sphinxcontrib-websupport
-pkgver=1.1.2
-pkgrel=0
+pkgver=1.2.4
+pkgrel=8
 pkgdesc="Sphinx API for Web Apps"
-url="https://pypi.python.org/pypi/sphinxcontrib-websupport"
+url="https://pypi.org/project/sphinxcontrib-websupport"
 arch="noarch"
-license="BSD"
-depends=""
-makedepends="python3-dev py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
+license="BSD-2-Clause"
+depends="python3 py3-jinja2 py3-docutils py3-sphinx"
+makedepends="python3-dev py3-setuptools py3-wheel py3-gpep517"
+checkdepends="py3-sphinxcontrib-serializinghtml py3-pytest"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
+	remove-six.patch
+	"
 builddir="$srcdir"/$_pkgname-$pkgver
 
-check() {
-	cd "$builddir"
-	python3 setup.py check
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
-build() {
-	cd "$builddir"
-	python3 setup.py build
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages test-env
+	test-env/bin/python3 -m installer .dist/*.whl
+	test-env/bin/python3 -m pytest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="55754f6304f38abd50f410da164f401a1b9a1d289b19f0077a38f72ce11a2dd64eff0713bb99471e470ff15fbd6a0042d49bab14c92f82cdd61019adbb88397e  sphinxcontrib-websupport-1.1.2.tar.gz"
+sha512sums="
+d1ccfb6a9ecfa6adbdf2298f4ded345cacefbc5a450b8dafc6faadbcd0dd79a8dbefcab4d1cedf34c65fc271aab754392bea8ab8ae82852323784a9e1717914c  sphinxcontrib-websupport-1.2.4.tar.gz
+675cea49f1ae25d250e84d95808fbd5e551f469b1d1be73400971eab8a43e28acd8675d01493d452c9a7b794ad7c1f77e8e46338c2bdf4ec297976056f4f3367  remove-six.patch
+"
diff --git a/main/py3-sphinxcontrib-websupport/remove-six.patch b/main/py3-sphinxcontrib-websupport/remove-six.patch
new file mode 100644
index 00000000000..5f5c821141d
--- /dev/null
+++ b/main/py3-sphinxcontrib-websupport/remove-six.patch
@@ -0,0 +1,26 @@
+Patch-Source: https://github.com/sphinx-doc/sphinxcontrib-websupport/pull/47
+--
+From a249f8f962bb4687b780482c6c5a1cc3dc60629f Mon Sep 17 00:00:00 2001
+From: Takeshi KOMIYA <i.tkomiya@gmail.com>
+Date: Mon, 15 Mar 2021 01:23:16 +0900
+Subject: [PATCH] Drop test dependency: six
+
+---
+ setup.py                     | 1 -
+ tests/test_searchadapters.py | 3 ++-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_searchadapters.py b/tests/test_searchadapters.py
+index 9589633..eb6e19f 100644
+--- a/tests/test_searchadapters.py
++++ b/tests/test_searchadapters.py
+@@ -9,7 +9,8 @@
+     :license: BSD, see LICENSE for details.
+ """
+ 
+-from six import StringIO
++from io import StringIO
++
+ import pytest
+ 
+ from sphinxcontrib.websupport import WebSupport
diff --git a/main/py3-tappy/APKBUILD b/main/py3-tappy/APKBUILD
index 2d8250861a5..60cdb85a06d 100644
--- a/main/py3-tappy/APKBUILD
+++ b/main/py3-tappy/APKBUILD
@@ -1,30 +1,35 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=py3-tappy
 _pkgname=tap.py
-pkgver=3.0
-pkgrel=0
+pkgver=3.1
+pkgrel=4
 pkgdesc="Python3 Test Anything Protocol (TAP) tools"
 url="https://github.com/python-tap/tappy"
 arch="noarch"
 license="BSD-2-Clause"
 depends="python3"
-makedepends="py3-setuptools py3-babel"
+makedepends="py3-babel py3-gpep517 py3-setuptools py3-wheel"
+subpackages="$pkgname-pyc"
 source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/t/tap.py/tap.py-$pkgver.tar.gz"
-builddir="$srcdir/tap.py-$pkgver"
+builddir="$srcdir/$_pkgname-$pkgver"
 
 replaces="py-tappy" # Backwards compatibility
 provides="py-tappy=$pkgver-r$pkgrel" # Backwards compatibility
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 -m tap
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m tap
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 }
 
-sha512sums="58b0928dd28ba525d9bb5edfab5606cb67af15e75a5f03d2648280d30377e2aa23b314ed41dba3b09b7dfa1aefead53674df43b6087e552b9aa937472838e7db  py3-tappy-3.0.tar.gz"
+sha512sums="
+4a3b5c5fb54ee1343cfee9bc154e812066d745c020a2c3391761c3e407b7b8428412c799df4963a385e4563ffe3b31e16055cb76ab5940ab6156e57dcf4a4d3a  py3-tappy-3.1.tar.gz
+"
diff --git a/main/py3-testtools/APKBUILD b/main/py3-testtools/APKBUILD
index 5043df1ecd0..594f01f0f41 100644
--- a/main/py3-testtools/APKBUILD
+++ b/main/py3-testtools/APKBUILD
@@ -2,28 +2,30 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-testtools
 _pkgname=testtools
-pkgver=2.4.0
-pkgrel=0
+pkgver=2.7.1
+pkgrel=1
 pkgdesc="Extensions to the Python standard library unit testing framework"
-url="https://pypi.python.org/pypi/testtools"
+url="https://pypi.org/project/testtools"
 arch="noarch"
 license="MIT"
-depends="python3 py3-pbr py3-setuptools py3-fixtures py3-extras py3-six py3-mimeparse"
+depends="python3 py3-hatch-vcs py3-fixtures"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir"/$_pkgname-$pkgver
-
-replaces="py-testtools" # Backwards compatibility
-provides="py-testtools=$pkgver-r$pkgrel" # Backwards compatibility
+options="!check" # needs community/py3-twisted and testscenarios from pypi
 
 build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 setup.py check
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
-sha512sums="af26e163a4caeb207a554b19f86c7892ab5ebe904c144d85273464e880cd18a991c70a77ff817aefb15768fa38f382e9ed853cdefb212dc697b24072e17535c0  testtools-2.4.0.tar.gz"
+
+sha512sums="
+78af1c2af6f93671074dafedeaaf3ddbcc806e78c3153a3b90f88874c967e34a18cb85e5649b08fabb4ba4ae649eeb401e79c77c3b9233d9eee2a3c2267a4596  testtools-2.7.1.tar.gz
+"
diff --git a/main/py3-toml/APKBUILD b/main/py3-toml/APKBUILD
deleted file mode 100644
index c864a46e201..00000000000
--- a/main/py3-toml/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=py3-toml
-_pyname=toml
-pkgver=0.10.0
-pkgrel=3
-pkgdesc="Python3 library for TOML"
-options="!check" # No testsuite on PYPI
-url="https://github.com/uiri/toml"
-arch="noarch"
-license="MIT"
-depends="python3"
-makedepends="py3-setuptools"
-checkdepends="py3-pytest"
-source="https://files.pythonhosted.org/packages/source/${_pyname%${_pyname#?}}/$_pyname/$_pyname-$pkgver.tar.gz"
-builddir="$srcdir/"$_pyname-$pkgver
-
-replaces="py-toml" # Backwards compatibility
-provides="py-toml=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	python3 setup.py test
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-sha512sums="26f26c38ce9cd48305218c2c34c5a5407b00aefc25a933f044bb7be22c23cfdfa3b8cf2da952d17760c4b9038df62e405fa039cc7b63dd3e94c9c312f04f9182  toml-0.10.0.tar.gz"
diff --git a/main/py3-tox/APKBUILD b/main/py3-tox/APKBUILD
deleted file mode 100644
index 7582dcfb025..00000000000
--- a/main/py3-tox/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
-# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
-pkgname=py3-tox
-_pkgname=${pkgname#py3-*}
-pkgver=3.14.6
-pkgrel=0
-pkgdesc="virtualenv management and test command line tool"
-options="!check" # Requires unpackaged py3-pytest extensions
-url="https://tox.readthedocs.org/"
-arch="noarch"
-license="MIT"
-makedepends="py3-setuptools"
-depends="
-	py3-packaging
-	py3-pluggy
-	py3-py
-	py3-six
-	py3-virtualenv
-	py3-toml
-	py3-filelock
-	"
-checkdepends="py3-pytest"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-tox" # Backwards compatibility
-provides="py-tox=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-check() {
-	python3 setup.py test
-}
-
-sha512sums="54fd836c7667aa4f7be80716d1f1f2aea3ef3f73a5e2d3999303f3bdb7463c9751e77d9cc338064ec11ab28e01ea59af5cdbe2c57abdd741b9d3e3f419ace473  tox-3.14.6.tar.gz"
diff --git a/main/py3-trove-classifiers/APKBUILD b/main/py3-trove-classifiers/APKBUILD
new file mode 100644
index 00000000000..2e841aec7b2
--- /dev/null
+++ b/main/py3-trove-classifiers/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Michał Polański <michal@polanski.me>
+# Maintainer: Michał Polański <michal@polanski.me>
+pkgname=py3-trove-classifiers
+pkgver=2024.3.3
+pkgrel=2
+pkgdesc="Canonical source for classifiers on PyPI"
+url="https://github.com/pypa/trove-classifiers"
+license="Apache-2.0"
+arch="noarch"
+depends="python3"
+makedepends="py3-calver py3-gpep517 py3-installer py3-setuptools py3-wheel"
+subpackages="$pkgname-pyc"
+source="https://github.com/pypa/trove-classifiers/archive/$pkgver/py3-trove-classifiers-$pkgver.tar.gz"
+builddir="$srcdir/trove-classifiers-$pkgver"
+options="!check" #pytest circular dep
+
+prepare() {
+	default_prepare
+
+	echo "Version: $pkgver" > PKG-INFO
+}
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	pytest
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/trove_classifiers-$pkgver-py3-none-any.whl
+}
+
+sha512sums="
+f4298eeb69881aa17f6559bf3749ae7a23c3c48e31bcefc19748290be59296e0bacc2bb5ba12410ab1c45ee13f2c5858295cd4ceb5755185efccd74f96b5a4a8  py3-trove-classifiers-2024.3.3.tar.gz
+"
diff --git a/main/py3-tz/APKBUILD b/main/py3-tz/APKBUILD
index 91542f16bc1..f24592da9c8 100644
--- a/main/py3-tz/APKBUILD
+++ b/main/py3-tz/APKBUILD
@@ -1,32 +1,36 @@
 # Contributor: Peter Bui <pnutzh4x0r@gmail.com>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py3-tz
-_pkgname=pytz
-pkgver=2019.3
-pkgrel=2
+pkgver=2024.1
+pkgrel=1
 pkgdesc="Python3 definitions of world timezone"
-url="http://pytz.sourceforge.net/"
+url="https://pythonhosted.org/pytz/"
 arch="noarch"
 license="MIT"
 depends="python3"
-makedepends="py3-setuptools"
-source="https://pypi.io/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+subpackages="$pkgname-pyc"
+source="https://pypi.python.org/packages/source/p/pytz/pytz-$pkgver.tar.gz"
+builddir="$srcdir/pytz-$pkgver"
 
 replaces="py-tz" # Backwards compatibility
 provides="py-tz=$pkgver-r$pkgrel" # Backwards compatibility
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
 }
 
 check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
 	cd pytz/tests
-	python3 test_tzinfo.py
+	../../.testenv/bin/python3 test_tzinfo.py
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 }
 
-sha512sums="b925b59d197e7007dae8098d35518a470e4b7588d9114f51e4d8816813243a9f816f662055f690bedf56b86cc9ece06428ed8c55e5b3ed676ba0f504f7cb43af  pytz-2019.3.tar.gz"
+sha512sums="
+cc1e4c9b34c62791cea277a0ce188d975e62135cb15bccfb49dc1a9366c7697ead9c67956846699f18b90db4c66e6c5fe1a91a524d01ae821c0eaa613550ea74  pytz-2024.1.tar.gz
+"
diff --git a/main/py3-unidecode/APKBUILD b/main/py3-unidecode/APKBUILD
deleted file mode 100644
index 1bb2266e65b..00000000000
--- a/main/py3-unidecode/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=py3-unidecode
-_pkgname=Unidecode
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="Python3 ASCII transliterations of Unicode text"
-url="https://pypi.python.org/pypi/Unidecode"
-arch="noarch"
-license="GPL-2.0-or-later"
-depends="python3 py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-check() {
-	cd "$builddir"
-	python3 setup.py test
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-
-	# Add version suffix to executable files.
-	local path; for path in "$pkgdir"/usr/bin/*; do
-		mv "$path" "$path"-3
-	done
-
-	mkdir -p "$pkgdir"/usr/bin
-	ln -s unidecode-3 "$pkgdir"/usr/bin/unidecode
-}
-
-sha512sums="5474f04be843ed94ddceb1a7e5f1ca986ee5f2e88ee35bd9347784c7a11b51e1d94d61e1a2a10dd2e71b3587c5b7b76717756f6cf4e2446d83222178c2360696  Unidecode-1.1.1.tar.gz"
diff --git a/main/py3-uritemplate/APKBUILD b/main/py3-uritemplate/APKBUILD
deleted file mode 100644
index 39bf0a632bc..00000000000
--- a/main/py3-uritemplate/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Peter Bui <pnutzh4x0r@gmail.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=py3-uritemplate
-_pkgname=uritemplate
-pkgver=3.0.1
-pkgrel=0
-pkgdesc="Python3 module to use URO templates"
-url="https://uritemplate.readthedocs.org"
-arch="noarch"
-license="BSD-3-Clause OR Apache-2.0"
-options="!check"
-depends="python3"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-uritemplate" # Backwards compatibility
-provides="py-uritemplate=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="260da5901d28ca2354d972e00ed468c9bcf2901f948cb7759ff3e9d3a7b67da90ba754e555d6695c5095801b106ffd422459f0860b901a75e01575e159eb8f48  uritemplate-3.0.1.tar.gz"
diff --git a/main/py3-urlgrabber/APKBUILD b/main/py3-urlgrabber/APKBUILD
deleted file mode 100644
index 6759d4d3196..00000000000
--- a/main/py3-urlgrabber/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=py3-urlgrabber
-pkgver=4.1.0
-pkgrel=1
-pkgdesc="Python3 module for fetching files"
-url="http://urlgrabber.baseurl.org/"
-arch="noarch"
-license="LGPL-2.0-or-later"
-depends="python3 py3-curl py3-six"
-makedepends="py3-setuptools"
-subpackages="$pkgname-doc"
-source="https://github.com/rpm-software-management/urlgrabber/releases/download/urlgrabber-${pkgver//./-}/urlgrabber-$pkgver.tar.gz"
-
-# keep those til after alpine v3.11
-provides="py-urlgrabber=$pkgver-r$pkgrel" # for backward compatibility
-replaces="py-urlgrabber" # for backward compatibility
-
-builddir="$srcdir"/urlgrabber-$pkgver
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 setup.py test
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="ab2e2707eb45cf460e2d7cebb0669ea1d20d9edc33ba526c19961314b76a3d8dd2bd932627c17756eac773e2f8bc63e8c9bba35a26487fc50735066c6404611a  urlgrabber-4.1.0.tar.gz"
diff --git a/main/py3-urllib3/APKBUILD b/main/py3-urllib3/APKBUILD
index 3bf5895d9fb..5e7b08a6dfe 100644
--- a/main/py3-urllib3/APKBUILD
+++ b/main/py3-urllib3/APKBUILD
@@ -1,32 +1,48 @@
 # Contributor: Yura Kushnir <kushnir.yura@gmail.com>
-# Maintainer: Yura Kushnir <kushnir.yura@gmail.com>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-urllib3
 _pkgname=urllib3
-pkgver=1.25.8
-pkgrel=0
+pkgver=1.26.18
+pkgrel=1
 pkgdesc="HTTP library with thread-safe connection pooling, file post, and more"
-url="https://github.com/shazow/urllib3"
+url="https://github.com/urllib3/urllib3"
 arch="noarch"
 license="MIT"
 depends="python3"
-makedepends="py3-setuptools"
-source="$pkgname-$pkgver.tar.gz::https://github.com/shazow/urllib3/archive/$pkgver.tar.gz"
+makedepends="
+	py3-gpep517
+	py3-setuptools
+	py3-wheel
+	"
+subpackages="$pkgname-pyc"
+source="https://github.com/urllib3/urllib3/releases/download/$pkgver/urllib3-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
+options="!check" # needs py3-tornado from community
 
 replaces="py-urllib3" # Backwards compatibility
 provides="py-urllib3=$pkgver-r$pkgrel" # Backwards compatibility
 
-build() {
-	python3 setup.py build
-}
+# secfixes:
+#   1.26.18-r0:
+#     - CVE-2023-45803
+#   1.26.17-r0:
+#     - CVE-2023-43804
+#   1.25.9-r0:
+#     - CVE-2020-26137
+#   1.26.4-r0:
+#     - CVE-2021-28363
 
-check() {
-	python3 setup.py check
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="813f8a6d0f848444a7807d9ea46a93b576220ca50d364af2107ca46ff572f828e35c1a076bc477a269f33bf95e430a89d22d8e4de1dc8d8628ae687fa3551d6b  py3-urllib3-1.25.8.tar.gz"
+sha512sums="
+c89e93a032bf6b11375c06ef7c5abc1868f93e7655cfdca09e9bd939ad415d206ea159fe151ecd2e5f725e0e18a831c7a5382ad01dbc32264154fc8af7aec156  urllib3-1.26.18.tar.gz
+"
diff --git a/main/py3-virtualenv/APKBUILD b/main/py3-virtualenv/APKBUILD
deleted file mode 100644
index f497458e73e..00000000000
--- a/main/py3-virtualenv/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Sam Dodrill <shadowh511@gmail.com>
-# Contributor: TBK <alpine@jjtc.eu>
-# Maintainer: Sam Dodrill <shadowh511@gmail.com>
-pkgname=py3-virtualenv
-_pkgname=virtualenv
-pkgver=16.7.9
-pkgrel=0
-pkgdesc="Virtual Python3 Environment builder"
-url="https://www.virtualenv.org/en/latest/"
-arch="noarch"
-license="MIT"
-depends="python3"
-makedepends="py3-setuptools"
-checkdepends="py3-pytest py3-mock"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-virtualenv" # Backwards compatibility
-provides="py-virtualenv=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 setup.py test
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="ba2d08ec3425929806506c4c33e48d250153b02bd454eb340ab959519dd82ede8b12f2d2ab839e2a8711f29695d3956a457a1ca366a3b4fb4fb26c4c8d48c6cd  virtualenv-16.7.9.tar.gz"
diff --git a/main/py3-vobject/APKBUILD b/main/py3-vobject/APKBUILD
deleted file mode 100644
index 8544d7b2163..00000000000
--- a/main/py3-vobject/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=py3-vobject
-pkgver=0.9.6.1
-pkgrel=3
-pkgdesc="Module for parsing and generating vCard and vCalendar files"
-url="http://eventable.github.io/vobject/"
-arch="noarch"
-license="Apache-2.0"
-depends="python3 py3-dateutil"
-makedepends="py3-setuptools"
-source="$pkgname-$pkgver.tar.gz::https://github.com/eventable/vobject/archive/$pkgver.tar.gz"
-builddir="$srcdir"/vobject-$pkgver
-
-replaces="py-vobject" # Backwards compatibility
-provides="py-vobject=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-check() {
-	cd "$builddir"
-	python3 tests.py
-}
-
-sha512sums="499f22a1a9e60398a89d3d6fa472a0b4c9dd00b98440a4ce873da824f83cef1b0a5eb9e5051267931707a3eef00a1d3fb83ff63ffe857b403c4ac3a131f18dff  py3-vobject-0.9.6.1.tar.gz"
diff --git a/main/py3-wcwidth/APKBUILD b/main/py3-wcwidth/APKBUILD
index 82a5efc1022..d6f5a1f6205 100644
--- a/main/py3-wcwidth/APKBUILD
+++ b/main/py3-wcwidth/APKBUILD
@@ -2,30 +2,40 @@
 # Maintainer: Thomas Boerger <thomas@webhippie.de>
 pkgname=py3-wcwidth
 _pkgname=wcwidth
-pkgver=0.1.9
-pkgrel=0
+pkgver=0.2.13
+pkgrel=1
 pkgdesc="Measures number of Terminal column cells of wide-character codes"
-url="https://pypi.python.org/pypi/wcwidth"
+url="https://pypi.org/project/wcwidth"
 arch="noarch"
 license="MIT"
-depends="python3"
-makedepends="py3-setuptools"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="py3-pytest-cov"
+subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 replaces="py-wcwidth" # Backwards compatibility
 provides="py-wcwidth=$pkgver-r$pkgrel" # Backwards compatibility
+# circular dependency on pytest
+options="$options !check"
 
-check() {
-	python3 setup.py check
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
-build() {
-	python3 setup.py build
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="3aee69efb8714f4426bfd424b80f4f4e5758174d84f725dd0e1448de1b4b4dd385ffd4f72440d5f763b7a82325857e9164742dbb7fa9e15d5db54744c262d0ba  wcwidth-0.1.9.tar.gz"
+sha512sums="
+1eadda149936cf2eefe5d09c411774dc87c8a358f2dd92d74f427d7b47f07c05557e849c46122d44788c2bd7c97eb85fc5f902d9a158d68ab9e352c5185ba2d5  wcwidth-0.2.13.tar.gz
+"
diff --git a/main/py3-webencodings/APKBUILD b/main/py3-webencodings/APKBUILD
new file mode 100644
index 00000000000..7b138f19cb6
--- /dev/null
+++ b/main/py3-webencodings/APKBUILD
@@ -0,0 +1,32 @@
+# Contributor: Stefan Wagner <stw@bit-strickerei.de>
+# Maintainer: Stefan Wagner <stw@bit-strickerei.de>
+pkgname=py3-webencodings
+_pkgname=webencodings
+pkgver=0.5.1
+pkgrel=8
+pkgdesc="Character encoding for the web"
+url="https://github.com/gsnedders/python-webencodings"
+arch="noarch"
+license="MIT"
+depends="python3"
+makedepends="py3-setuptools"
+checkdepends="pytest"
+subpackages="$pkgname-pyc"
+source="$_pkgname-$pkgver.tar.gz::https://github.com/gsnedders/python-$_pkgname/archive/v$pkgver.tar.gz"
+builddir="$srcdir"/python-$_pkgname-$pkgver
+
+build() {
+	python3 setup.py build
+}
+
+check() {
+	py.test-3
+}
+
+package() {
+	python3 setup.py install --skip-build --root="$pkgdir"
+}
+
+sha512sums="
+c5cb34f35fb5bc7ffb88c19eb3262dedbf6231c0ee2871dccbc0f9497193d8209fc20703d451a2bb41a5ff913e63abf7481f7a8f9886c953724e9cf71c34cb74  webencodings-0.5.1.tar.gz
+"
diff --git a/main/py3-werkzeug/APKBUILD b/main/py3-werkzeug/APKBUILD
deleted file mode 100644
index 3ac83bc5e9f..00000000000
--- a/main/py3-werkzeug/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor:
-# Maintainer: prspkt <prspkt@protonmail.com>
-pkgname=py3-werkzeug
-_pkgname=Werkzeug
-pkgver=0.16.1
-pkgrel=0
-pkgdesc="The WSGI swiss-army knife"
-url="http://werkzeug.pocoo.org/"
-arch="noarch"
-license="MIT"
-depends="python3"
-makedepends="py3-setuptools"
-options="!check" # doesn't find its own modules even with PYTHONPATH set
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-replaces="py-werkzeug" # Backwards compatibility
-provides="py-werkzeug=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="1f27ea5b890c10df67726299c7656bab492e356021beec8f7a08413b386b7a884b64aaa16b80b60d7060a59c8c8e497ccc4c1e1e9104e8800dbfd7cf8b5b0d9c  Werkzeug-0.16.1.tar.gz"
diff --git a/main/py3-wheel/APKBUILD b/main/py3-wheel/APKBUILD
index b278363cc66..adf2df19127 100644
--- a/main/py3-wheel/APKBUILD
+++ b/main/py3-wheel/APKBUILD
@@ -1,30 +1,49 @@
 # Contributor: Antoine Fontaine <antoine.fontaine@epfl.ch>
-# Maintainer: Antoine Fontaine <antoine.fontaine@epfl.ch>
-pkgname="py3-wheel"
-_pyname="wheel"
-pkgver="0.34.2"
-pkgrel=0
-pkgdesc="A built-package format for Python"
+# Maintainer: Peter Shkenev <santurysim@gmail.com>
+pkgname=py3-wheel
+pkgver=0.42.0
+pkgrel=1
+pkgdesc="built-package format for Python"
 url="https://github.com/pypa/wheel"
 arch="noarch"
 license="MIT"
-subpackages="$pkgname-doc"
-depends="python3"
-makedepends="py3-setuptools"
-_pypiprefix="${_pyname%${_pyname#?}}"
-source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz"
-builddir="$srcdir"/$_pyname-$pkgver
+depends="python3 py3-packaging"
+makedepends="
+	py3-flit-core
+	py3-gpep517
+	"
+checkdepends="py3-pytest py3-setuptools python3-dev"
+subpackages="$pkgname-pyc"
+source="https://files.pythonhosted.org/packages/source/w/wheel/wheel-$pkgver.tar.gz
+	use-system-packaging.patch
+	"
+builddir="$srcdir"/wheel-$pkgver
+options="!check" # circular with pytest
+
+prepare() {
+	default_prepare
+
+	rm -rf src/wheel/vendored
+}
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 setup.py test
+	python3 -m venv --clear --without-pip --system-site-packages test-env
+	test-env/bin/python3 setup.py install
+	test-env/bin/python3 -m pytest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-	install -Dm 0644 "$srcdir"/$_pyname-$pkgver/docs/index.rst "$pkgdir/usr/share/doc/py3-wheel"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
-sha512sums="7f2143b26812f94330671ab5d2bbc31f0a4fc103dbc8d7b971afd5e5ca7e72140cb61fa264a39ec8e80bae61ebb22c738bfbb803242b52a32eee6a3e90aa1513  wheel-0.34.2.tar.gz"
+
+sha512sums="
+4816261c0f6d8971a80665f66868ec9cb082f2189b6e31e083a0d3a6080e159f06a4152f44eda1147a2b907b5aead0f63bbac725aacb56bb8be13fc77da2b79c  wheel-0.42.0.tar.gz
+ce2081deefbbddf020a6e3fa4be7eed57f8cc53103fb4c7aa0fe2d129482d040df6b246768832979237f755d7af6f7779db085bc2c5d1485b25ffb26d302898e  use-system-packaging.patch
+"
diff --git a/main/py3-wheel/use-system-packaging.patch b/main/py3-wheel/use-system-packaging.patch
new file mode 100644
index 00000000000..9437d983b7d
--- /dev/null
+++ b/main/py3-wheel/use-system-packaging.patch
@@ -0,0 +1,63 @@
+Upstream vendors packaging, use system packaging instead
+
+diff --git a/setup.py b/setup.py
+index 78b124e..e5025c9 100644
+--- a/setup.py
++++ b/setup.py
+@@ -4,7 +4,7 @@
+ from distutils.core import setup
+ 
+ packages = \
+-['wheel', 'wheel.cli', 'wheel.vendored', 'wheel.vendored.packaging']
++['wheel', 'wheel.cli']
+ 
+ package_data = \
+ {'': ['*']}
+diff --git a/src/wheel/bdist_wheel.py b/src/wheel/bdist_wheel.py
+index 2f93c47..78cdd90 100644
+--- a/src/wheel/bdist_wheel.py
++++ b/src/wheel/bdist_wheel.py
+@@ -19,6 +19,7 @@ from email.policy import EmailPolicy
+ from glob import iglob
+ from shutil import rmtree
+ from zipfile import ZIP_DEFLATED, ZIP_STORED
++from packaging import tags
+ 
+ import setuptools
+ from setuptools import Command
+@@ -27,8 +28,7 @@ from . import __version__ as wheel_version
+ from .macosx_libfile import calculate_macosx_platform_tag
+ from .metadata import pkginfo_to_metadata
+ from .util import log
+-from .vendored.packaging import tags
+-from .vendored.packaging import version as _packaging_version
++from packaging import version as _packaging_version
+ from .wheelfile import WheelFile
+ 
+ 
+diff --git a/src/wheel/metadata.py b/src/wheel/metadata.py
+index b391c96..ffa1706 100644
+--- a/src/wheel/metadata.py
++++ b/src/wheel/metadata.py
+@@ -12,7 +12,7 @@ from email.message import Message
+ from email.parser import Parser
+ from typing import Iterator
+ 
+-from .vendored.packaging.requirements import Requirement
++from packaging.requirements import Requirement
+ 
+ 
+ def _nonblank(str):
+diff --git a/tests/test_bdist_wheel.py b/tests/test_bdist_wheel.py
+index d202469..95ea27d 100644
+--- a/tests/test_bdist_wheel.py
++++ b/tests/test_bdist_wheel.py
+@@ -20,7 +20,7 @@ from wheel.bdist_wheel import (
+     remove_readonly,
+     remove_readonly_exc,
+ )
+-from wheel.vendored.packaging import tags
++from packaging import tags
+ from wheel.wheelfile import WheelFile
+ 
+ DEFAULT_FILES = {
diff --git a/main/py3-wtforms/APKBUILD b/main/py3-wtforms/APKBUILD
deleted file mode 100644
index 245f5e3f7d8..00000000000
--- a/main/py3-wtforms/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Contributor: Eivind Uggedal <eivind@uggedal.com>
-# Maintainer:
-pkgname=py3-wtforms
-_pkgname=WTForms
-pkgver=2.2.1
-pkgrel=3
-pkgdesc="A flexible forms validation and rendering Python library"
-options="!check" # No tests for python3
-url="http://wtforms.simplecodes.com/"
-arch="noarch"
-license="BSD-3-Clause"
-depends="python3"
-makedepends="py3-setuptools"
-checkdepends="py3-pytest"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-replaces="py-wtforms" # Backwards compatibility
-provides="py-wtforms=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	cd "$builddir"
-	python3 setup.py build
-}
-
-package() {
-	cd "$builddir"
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="06478790a8a4bf728e5436edaa63c7c0e596f71d63b273e1f296f9255d9fa3e31a7bfa95971c214a8cea684034ac3c77b05371f4b4e14da9d9ef2c5afadabde0  WTForms-2.2.1.tar.gz"
diff --git a/main/py3-xmlschema/APKBUILD b/main/py3-xmlschema/APKBUILD
new file mode 100644
index 00000000000..9523c84b9ed
--- /dev/null
+++ b/main/py3-xmlschema/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Aiden Grossman <agrossman154@yahoo.com>
+# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
+pkgname=py3-xmlschema
+pkgver=3.0.1
+pkgrel=1
+pkgdesc="XML schema validator and conversion library"
+url="https://github.com/sissaschool/xmlschema"
+arch="noarch"
+license="MIT"
+depends="py3-elementpath"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="py3-pytest py3-jinja2"
+options="net" # tests access xml.xsd from w3.org
+subpackages="$pkgname-pyc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/sissaschool/xmlschema/archive/refs/tags/v$pkgver.tar.gz"
+builddir="$srcdir/xmlschema-$pkgver/"
+
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
+}
+
+check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
+}
+
+sha512sums="
+c7f76d459f70315d65177bf46d43d491402477f38f0efd737604fd246390726625262be8aecb4b14f7c6eec63ed460dc811cab67fd4e0940b30b757071d208bc  py3-xmlschema-3.0.1.tar.gz
+"
diff --git a/main/py3-yaml/APKBUILD b/main/py3-yaml/APKBUILD
index e392890b1e9..05f3f674653 100644
--- a/main/py3-yaml/APKBUILD
+++ b/main/py3-yaml/APKBUILD
@@ -1,22 +1,34 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=py3-yaml
 _pkgname=PyYAML
-pkgver=5.3.1
-pkgrel=0
+pkgver=6.0.1
+pkgrel=3
 pkgdesc="Python3 bindings for YAML"
-url="http://pyyaml.org"
+url="https://pyyaml.org/"
 arch="all"
 license="MIT"
-makedepends="python3-dev yaml-dev cython"
-source="$_pkgname-$pkgver.tar.gz::https://github.com/yaml/pyyaml/archive/$pkgver.tar.gz"
+makedepends="
+	cython
+	py3-gpep517
+	py3-setuptools
+	py3-wheel
+	python3-dev
+	yaml-dev
+	"
+subpackages="$pkgname-pyc"
+source="$_pkgname-$pkgver.tar.gz::https://github.com/yaml/pyyaml/archive/$pkgver.tar.gz
+	cython3.patch
+	"
 builddir="$srcdir/pyyaml-$pkgver"
 
 replaces="py-yaml" # Backwards compatibility
 provides="py-yaml=$pkgver-r$pkgrel" # Backwards compatibility
 
 # secfixes:
+#   5.4-r0:
+#     - CVE-2020-14343
 #   5.3.1-r0:
 #     - CVE-2020-1747
 
@@ -26,15 +38,23 @@ prepare() {
 }
 
 build() {
-	python3 setup.py --with-libyaml build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 setup.py test
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 setup.py test
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	python3 -m installer -d "$pkgdir" \
+		.dist/*.whl
 }
 
-sha512sums="27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556  PyYAML-5.3.1.tar.gz"
+sha512sums="
+1c74a92a4ad7d47854dc7bcb2e89b3c8e0b14fa815c7dbfbc22b24480dbba6c81e971c77ee384c494a960914b95f06edf943d7431925a5ed674a0ba830d258e0  PyYAML-6.0.1.tar.gz
+73c76d8e1f83a5b938bdf2c2ff7503db5c0391b8c90a3c2b60049ba0c2f62e6b541c1ed68093c24eb3675dcffbe8d27289ae0966a0bf8b076f35ca98396f1e17  cython3.patch
+"
diff --git a/main/py3-yaml/cython3.patch b/main/py3-yaml/cython3.patch
new file mode 100644
index 00000000000..7a750b4499f
--- /dev/null
+++ b/main/py3-yaml/cython3.patch
@@ -0,0 +1,296 @@
+Patch-Source: https://github.com/yaml/pyyaml/pull/607
+works for us as is
+--
+From 6ee5f07061e53e98b6b8a76c0d1555fdc1399397 Mon Sep 17 00:00:00 2001
+From: Thomas A Caswell <tcaswell@gmail.com>
+Date: Mon, 24 Jan 2022 18:39:55 -0500
+Subject: [PATCH] WIP: Attempt to get pyyaml to build with cython 3.0
+
+This is cribbed from h5py's setup_build.py.
+
+While this works and the tests pass, it drops a lot of the configuration that
+used to be possible / support for other Pythons / setting the include path /
+...
+---
+ setup.py | 236 ++++++++++++++++++++-----------------------------------
+ 1 file changed, 86 insertions(+), 150 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 944e7fa2..6be43400 100644
+--- a/setup.py
++++ b/setup.py
+@@ -66,23 +66,29 @@
+ 
+ 
+ import sys, os, os.path, pathlib, platform, shutil, tempfile, warnings
+-
++import os.path as op
+ # for newer setuptools, enable the embedded distutils before importing setuptools/distutils to avoid warnings
+-os.environ['SETUPTOOLS_USE_DISTUTILS'] = 'local'
++os.environ["SETUPTOOLS_USE_DISTUTILS"] = "local"
+ 
+-from setuptools import setup, Command, Distribution as _Distribution, Extension as _Extension
++from setuptools import setup, Command, Distribution, Extension
+ from setuptools.command.build_ext import build_ext as _build_ext
++
+ # NB: distutils imports must remain below setuptools to ensure we use the embedded version
+ from distutils import log
+-from distutils.errors import DistutilsError, CompileError, LinkError, DistutilsPlatformError
++from distutils.errors import (
++    DistutilsError,
++    CompileError,
++    LinkError,
++    DistutilsPlatformError,
++)
+ 
+ with_cython = False
+-if 'sdist' in sys.argv or os.environ.get('PYYAML_FORCE_CYTHON') == '1':
++if "sdist" in sys.argv or os.environ.get("PYYAML_FORCE_CYTHON") == "1":
+     # we need cython here
+     with_cython = True
+ try:
+-    from Cython.Distutils.extension import Extension as _Extension
+-    from Cython.Distutils import build_ext as _build_ext
++    import Cython  # noqa
++
+     with_cython = True
+ except ImportError:
+     if with_cython:
+@@ -96,147 +102,82 @@
+ 
+ # on Windows, disable wheel generation warning noise
+ windows_ignore_warnings = [
+-"Unknown distribution option: 'python_requires'",
+-"Config variable 'Py_DEBUG' is unset",
+-"Config variable 'WITH_PYMALLOC' is unset",
+-"Config variable 'Py_UNICODE_SIZE' is unset",
+-"Cython directive 'language_level' not set"
++    "Unknown distribution option: 'python_requires'",
++    "Config variable 'Py_DEBUG' is unset",
++    "Config variable 'WITH_PYMALLOC' is unset",
++    "Config variable 'Py_UNICODE_SIZE' is unset",
++    "Cython directive 'language_level' not set",
+ ]
+ 
+-if platform.system() == 'Windows':
++if platform.system() == "Windows":
+     for w in windows_ignore_warnings:
+-        warnings.filterwarnings('ignore', w)
+-
+-
+-class Distribution(_Distribution):
+-    def __init__(self, attrs=None):
+-        _Distribution.__init__(self, attrs)
+-        if not self.ext_modules:
+-            return
+-        for idx in range(len(self.ext_modules)-1, -1, -1):
+-            ext = self.ext_modules[idx]
+-            if not isinstance(ext, Extension):
+-                continue
+-            setattr(self, ext.attr_name, None)
+-            self.global_options = [
+-                    (ext.option_name, None,
+-                        "include %s (default if %s is available)"
+-                        % (ext.feature_description, ext.feature_name)),
+-                    (ext.neg_option_name, None,
+-                        "exclude %s" % ext.feature_description),
+-            ] + self.global_options
+-            self.negative_opt = self.negative_opt.copy()
+-            self.negative_opt[ext.neg_option_name] = ext.option_name
+-
+-    def has_ext_modules(self):
+-        if not self.ext_modules:
+-            return False
+-        for ext in self.ext_modules:
+-            with_ext = self.ext_status(ext)
+-            if with_ext is None or with_ext:
+-                return True
+-        return False
+-
+-    def ext_status(self, ext):
+-        implementation = platform.python_implementation()
+-        if implementation not in ['CPython', 'PyPy']:
+-            return False
+-        if isinstance(ext, Extension):
+-            # the "build by default" behavior is implemented by this returning None
+-            with_ext = getattr(self, ext.attr_name) or os.environ.get('PYYAML_FORCE_{0}'.format(ext.feature_name.upper()))
+-            try:
+-                with_ext = int(with_ext)  # attempt coerce envvar to int
+-            except TypeError:
+-                pass
+-            return with_ext
+-        else:
+-            return True
+-
+-
+-class Extension(_Extension):
+-
+-    def __init__(self, name, sources, feature_name, feature_description,
+-            feature_check, **kwds):
+-        if not with_cython:
+-            for filename in sources[:]:
+-                base, ext = os.path.splitext(filename)
+-                if ext == '.pyx':
+-                    sources.remove(filename)
+-                    sources.append('%s.c' % base)
+-        _Extension.__init__(self, name, sources, **kwds)
+-        self.feature_name = feature_name
+-        self.feature_description = feature_description
+-        self.feature_check = feature_check
+-        self.attr_name = 'with_' + feature_name.replace('-', '_')
+-        self.option_name = 'with-' + feature_name
+-        self.neg_option_name = 'without-' + feature_name
++        warnings.filterwarnings("ignore", w)
++
++
++COMPILER_SETTINGS = {
++    "libraries": ["yaml"],
++    "include_dirs": ["yaml"],
++    "library_dirs": [],
++    "define_macros": [],
++}
++
++MODULES = ["_yaml"]
++EXTRA_LIBRARIES = {}
++EXTRA_SRC = {}
++
++
++def localpath(*args):
++    return op.abspath(op.join(op.dirname(__file__), *args))
+ 
+ 
+ class build_ext(_build_ext):
++    @staticmethod
++    def _make_extensions():
++        """Produce a list of Extension instances which can be passed to
++        cythonize().
++
++        This is the point at which custom directories, MPI options, etc.
++        enter the build process.
++        """
++        settings = COMPILER_SETTINGS.copy()
++
++        # TODO: should this only be done on UNIX?
++        if os.name != "nt":
++            settings["runtime_library_dirs"] = settings["library_dirs"]
++
++        def make_extension(module):
++            sources = [localpath("yaml", module + ".pyx")] + EXTRA_SRC.get(module, [])
++            settings["libraries"] += EXTRA_LIBRARIES.get(module, [])
++            print(("yaml." + module, sources, settings))
++            ext = Extension("yaml." + module, sources, **settings)
++            ext._needs_stub = False
++            return ext
++
++        return [make_extension(m) for m in MODULES]
+ 
+     def run(self):
+-        optional = True
+-        disabled = True
+-        for ext in self.extensions:
+-            with_ext = self.distribution.ext_status(ext)
+-            if with_ext is None:
+-                disabled = False
+-            elif with_ext:
+-                optional = False
+-                disabled = False
+-                break
+-        if disabled:
+-            return
+-        try:
+-            _build_ext.run(self)
+-        except DistutilsPlatformError:
+-            exc = sys.exc_info()[1]
+-            if optional:
+-                log.warn(str(exc))
+-                log.warn("skipping build_ext")
+-            else:
+-                raise
+-
+-    def get_source_files(self):
+-        self.check_extensions_list(self.extensions)
+-        filenames = []
+-        for ext in self.extensions:
+-            if with_cython:
+-                self.cython_sources(ext.sources, ext)
+-            for filename in ext.sources:
+-                filenames.append(filename)
+-                base = os.path.splitext(filename)[0]
+-                for ext in ['c', 'h', 'pyx', 'pxd']:
+-                    filename = '%s.%s' % (base, ext)
+-                    if filename not in filenames and os.path.isfile(filename):
+-                        filenames.append(filename)
+-        return filenames
+-
+-    def get_outputs(self):
+-        self.check_extensions_list(self.extensions)
+-        outputs = []
+-        for ext in self.extensions:
+-            fullname = self.get_ext_fullname(ext.name)
+-            filename = os.path.join(self.build_lib,
+-                                    self.get_ext_filename(fullname))
+-            if os.path.isfile(filename):
+-                outputs.append(filename)
+-        return outputs
+-
+-    def build_extensions(self):
+-        self.check_extensions_list(self.extensions)
+-        for ext in self.extensions:
+-            with_ext = self.distribution.ext_status(ext)
+-            if with_ext is not None and not with_ext:
+-                continue
+-            if with_cython:
+-                ext.sources = self.cython_sources(ext.sources, ext)
+-            try:
+-                self.build_extension(ext)
+-            except (CompileError, LinkError):
+-                if with_ext is not None:
+-                    raise
+-                log.warn("Error compiling module, falling back to pure Python")
++        """Distutils calls this method to run the command"""
++
++        from Cython.Build import cythonize
++
++        # This allows ccache to recognise the files when pip builds in a temp
++        # directory. It speeds up repeatedly running tests through tox with
++        # ccache configured (CC="ccache gcc"). It should have no effect if
++        # ccache is not in use.
++        os.environ["CCACHE_BASEDIR"] = op.dirname(op.abspath(__file__))
++        os.environ["CCACHE_NOHASHDIR"] = "1"
++
++        # Run Cython
++        print("Executing cythonize()")
++        self.extensions = cythonize(
++            self._make_extensions(), force=self.force, language_level=3
++        )
++
++        print(self.extensions)
++        for ex in self.extensions:
++            ex._needs_stub = False
++        # Perform the build
++        super().run()
+ 
+ 
+ class test(Command):
+@@ -299,16 +240,11 @@ def run(self):
+         download_url=DOWNLOAD_URL,
+         classifiers=CLASSIFIERS,
+         project_urls=PROJECT_URLS,
+-
+-        package_dir={'': 'lib'},
+-        packages=['yaml', '_yaml'],
+-        ext_modules=[
+-            Extension('yaml._yaml', ['yaml/_yaml.pyx'],
+-                'libyaml', "LibYAML bindings", LIBYAML_CHECK,
+-                libraries=['yaml']),
+-        ],
+-
++        package_dir={"": "lib"},
++        packages=["yaml", "_yaml"],
++        # To trick build into running build_ext
++        ext_modules=[Extension("yaml.x", ["x.c"])],
+         distclass=Distribution,
+         cmdclass=cmdclass,
+-        python_requires='>=3.6',
++        python_requires=">=3.6",
+     )
diff --git a/main/py3-zipp/APKBUILD b/main/py3-zipp/APKBUILD
deleted file mode 100644
index f8921483f4f..00000000000
--- a/main/py3-zipp/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor: prspkt <prspkt@protonmail.com>
-# Maintainer: prspkt <prspkt@protonmail.com>
-pkgname=py3-zipp
-_pkgname=zipp
-pkgver=1.0.0
-pkgrel=0
-pkgdesc="Pathlib-compatible object wrapper for zip files"
-url="https://github.com/jaraco/zipp"
-arch="noarch"
-license="MIT"
-depends="py3-more-itertools py3-six"
-makedepends="py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-replaces="py-zipp" # Backwards compatibility
-provides="py-zipp=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 setup.py test
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="dbfadfedd30ca4cb31ac4163f367134d96e57405ef00d5f4c19c0af7a141f78487dec29a0ba94975584fcb462d22c8b536bf29c67b7e298368072e897b0e9d82  zipp-1.0.0.tar.gz"
diff --git a/main/py3-zope-interface/APKBUILD b/main/py3-zope-interface/APKBUILD
deleted file mode 100644
index 4669e02902b..00000000000
--- a/main/py3-zope-interface/APKBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=py3-zope-interface
-_pkgname=zope.interface
-pkgver=5.0.2
-pkgrel=0
-pkgdesc="Separate distribution of the zope.interface package used in Zope"
-url="https://zopeinterface.readthedocs.io"
-arch="all"
-license="ZPL-2.1"
-makedepends="python3-dev py3-setuptools"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-replaces="py-zope-interface" # Backwards compatibility
-provides="py-zope-interface=$pkgver-r$pkgrel" # Backwards compatibility
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 setup.py test
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-sha512sums="3e7ae0b6f8410a5baa8ade4728dde45af262584d3057149070fe025ae544d22b980fe566b0f18ff2c247a91256b2f84f0a8fbd0656e6528476b538efdd2f2520  zope.interface-5.0.2.tar.gz"
diff --git a/main/python2/APKBUILD b/main/python2/APKBUILD
deleted file mode 100644
index 7e2aa94d9a7..00000000000
--- a/main/python2/APKBUILD
+++ /dev/null
@@ -1,150 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-
-pkgname=python2
-# the python2-tkinter's pkgver needs to be synchronized with this.
-pkgver=2.7.17
-_verbase=${pkgver%.*}
-pkgrel=0
-pkgdesc="A high-level scripting language"
-url="https://www.python.org/"
-arch="all"
-license="custom"
-provides="python=$pkgver-r$pkgrel"
-replaces="python"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-tests py-gdbm:gdbm
-	$pkgname-wininst"
-makedepends="expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev
-	gdbm-dev sqlite-dev libffi-dev readline-dev linux-headers paxmark"
-source="https://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz
-	musl-find_library.patch
-	unchecked-ioctl.patch
-	"
-builddir="$srcdir/Python-$pkgver"
-
-# secfixes:
-#   2.7.17-r0:
-#   - CVE-2019-15903
-#   2.7.16-r3:
-#   - CVE-2019-16056
-#   - CVE-2019-16935
-#   2.7.16-r1:
-#   - CVE-2019-9636
-#   - CVE-2019-9948
-#   2.7.16-r0:
-#   - CVE-2018-14647
-#   2.7.15-r3:
-#   - CVE-2019-5010
-#   2.7.15-r0:
-#   - CVE-2018-1060
-#   - CVE-2018-1061
-
-prepare() {
-	default_prepare
-
-	# Make sure we use system libs
-	rm -r Modules/expat Modules/_ctypes/libffi* Modules/zlib
-
-	# make sure our /dev/shm is world writeable
-	if ! touch /dev/shm/$pkgname-$pkgver; then
-		error "/dev/shm is not world writeable. this will cause a broken python2 build"
-		return 1
-	fi
-	rm /dev/shm/$pkgname-$pkgver
-}
-
-build() {
-	cd "$builddir"
-	export OPT="$CFLAGS -DTHREAD_STACK_SIZE=0x100000"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--enable-ipv6 \
-		--enable-optimizations \
-		--enable-shared \
-		--enable-unicode=ucs4 \
-		--with-system-expat \
-		--with-system-ffi \
-		--with-system-zlib \
-		--with-threads
-	make
-}
-
-check() {
-	cd "$builddir"
-
-	# test that we reach recursionlimit before we segfault
-	cat > test-stacksize.py <<-EOF
-	import threading
-	import sys
-
-	def fun(i):
-	  try:
-	    fun(i+1)
-	  except:
-	    sys.exit(0)
-
-	t = threading.Thread(target=fun, args=[1])
-	t.start()
-EOF
-	LD_LIBRARY_PATH=$PWD ./python test-stacksize.py
-}
-
-package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install
-	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-	rm "$pkgdir/usr/bin/2to3"
-	# we need to enable emutramp - needed for virt-manager
-	# disable mprotect - needed for cffi
-	paxmark -zm "$pkgdir"/usr/bin/python$_verbase
-}
-
-_mv_files() {
-	local i
-	for i in "$@"; do
-		mkdir -p "$subpkgdir"/${i%/*}
-		mv "$pkgdir"/$i "$subpkgdir"/$i
-	done
-}
-
-dev() {
-	provides="python-dev=$pkgver-r$pkgrel"
-	replaces="python-dev"
-
-	# pyconfig.h is needed runtime so we move it back
-	default_dev
-	mkdir -p "$pkgdir"/usr/include/python$_verbase
-	mv "$subpkgdir"/usr/include/python$_verbase/pyconfig.h \
-		"$pkgdir"/usr/include/python$_verbase/
-}
-
-tests() {
-	pkgdesc="The test modules from the main python package"
-	provides="python-tests=$pkgver-r$pkgrel"
-	replaces="python-tests"
-
-	cd "$pkgdir"
-	_mv_files usr/lib/python*/*/test \
-		usr/lib/python*/test
-}
-
-gdbm() {
-	pkgdesc="GNU dbm database support for Python"
-	provides="python-gdbm=$pkgver-r$pkgrel"
-	replaces="python-gdbm py-gdbm"
-
-	cd "$pkgdir"
-	_mv_files $(find usr/lib -name '*gdbm*')
-}
-
-wininst() {
-	pkgdesc="Python wininst files"
-	mkdir -p "$subpkgdir"/usr/lib/python$_verbase/distutils/command
-	mv "$pkgdir"/usr/lib/python$_verbase/distutils/command/*.exe \
-		"$subpkgdir"/usr/lib/python$_verbase/distutils/command
-}
-
-sha512sums="2dc19a0b0d818c71429dae94783e58b2aac0fa31f5faa1e840cac06245a59932ecc4658d913515736601bcf70a78c9ec60367aed75f4567d1e41ff3bb104da9a  Python-2.7.17.tar.xz
-ab8eaa2858d5109049b1f9f553198d40e0ef8d78211ad6455f7b491af525bffb16738fed60fc84e960c4889568d25753b9e4a1494834fea48291b33f07000ec2  musl-find_library.patch
-5a8e013a4132d71c4360771f130d27b37275ae59330cf9a75378dc8a11236017f540eb224f2a148984e82ca3fb6b29129375b1080ba05b81044faa717520ab82  unchecked-ioctl.patch"
diff --git a/main/python2/musl-find_library.patch b/main/python2/musl-find_library.patch
deleted file mode 100644
index 7899abb7360..00000000000
--- a/main/python2/musl-find_library.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ru Python-2.7.12.orig/Lib/ctypes/util.py Python-2.7.12/Lib/ctypes/util.py
---- Python-2.7.12.orig/Lib/ctypes/util.py	2016-06-26 00:49:30.000000000 +0300
-+++ Python-2.7.12/Lib/ctypes/util.py	2016-11-03 16:05:46.954665040 +0200
-@@ -204,6 +204,41 @@
-         def find_library(name, is64 = False):
-             return _get_soname(_findLib_crle(name, is64) or _findLib_gcc(name))
- 
-+    elif True:
-+
-+        # Patched for Alpine Linux / musl - search manually system paths
-+        def _is_elf(filepath):
-+            try:
-+                with open(filepath, 'rb') as fh:
-+                    return fh.read(4) == b'\x7fELF'
-+            except:
-+                return False
-+
-+        def find_library(name):
-+            from glob import glob
-+            # absolute name?
-+            if os.path.isabs(name):
-+                return name
-+            # special case for libm, libcrypt and libpthread and musl
-+            if name in ['m', 'crypt', 'pthread']:
-+                name = 'c'
-+            elif name in ['libm.so', 'libcrypt.so', 'libpthread.so']:
-+                name = 'libc.so'
-+            # search in standard locations (musl order)
-+            paths = ['/lib', '/usr/local/lib', '/usr/lib']
-+            if 'LD_LIBRARY_PATH' in os.environ:
-+                paths = os.environ['LD_LIBRARY_PATH'].split(':') + paths
-+            for d in paths:
-+                f = os.path.join(d, name)
-+                if _is_elf(f):
-+                    return os.path.basename(f)
-+
-+                prefix = os.path.join(d, 'lib'+name)
-+                for suffix in ['.so', '.so.*']:
-+                    for f in glob('{0}{1}'.format(prefix, suffix)):
-+                        if _is_elf(f):
-+                            return os.path.basename(f)
-+
-     else:
- 
-         def _findSoname_ldconfig(name):
diff --git a/main/python2/unchecked-ioctl.patch b/main/python2/unchecked-ioctl.patch
deleted file mode 100644
index 4d5564c2cb8..00000000000
--- a/main/python2/unchecked-ioctl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Modules/fcntlmodule.c.orig
-+++ ./Modules/fcntlmodule.c
-@@ -118,7 +118,7 @@
-     int mutate_arg = 1;
-     char buf[IOCTL_BUFSZ+1];  /* argument plus NUL byte */
- 
--    if (PyArg_ParseTuple(args, "O&Iw#|i:ioctl",
-+    if (PyArg_ParseTuple(args, "O&Iw#|n:ioctl",
-                          conv_descriptor, &fd, &code,
-                          &str, &len, &mutate_arg)) {
-         char *arg;
diff --git a/main/python3/APKBUILD b/main/python3/APKBUILD
index b6d9b68e6fc..6d580da114b 100644
--- a/main/python3/APKBUILD
+++ b/main/python3/APKBUILD
@@ -1,61 +1,120 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-
+# Contributor: Sheila Aman <sheila@vulpine.house>
 pkgname=python3
 # the python3-tkinter's pkgver needs to be synchronized with this.
-pkgver=3.8.2
-_bluez_ver=5.53
+pkgver=3.12.3
 _basever="${pkgver%.*}"
-pkgrel=0
-pkgdesc="A high-level scripting language"
+pkgrel=1
+pkgdesc="High-level scripting language"
 url="https://www.python.org/"
 arch="all"
 license="PSF-2.0"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-tests::noarch
-	$pkgname-wininst"
-makedepends="expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev xz-dev
-	sqlite-dev libffi-dev tcl-dev linux-headers gdbm-dev readline-dev
-	!gettext-dev"
+# pyc0 comes last because the files are named without a unique substring
+subpackages="
+	$pkgname-dbg
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-tests::noarch
+	$pkgname-pyc:_default_pyc
+	$pkgname-pycache-pyc2
+	$pkgname-pycache-pyc1
+	$pkgname-pycache-pyc0
+	$pkgname-gdbm
+	pyc:_pyc_meta:noarch
+	"
+depends="libssl3>=3.3.0"
+makedepends="
+	!gettext-dev
+	bluez-headers
+	bzip2-dev
+	expat-dev
+	gdbm-dev
+	libffi-dev
+	linux-headers
+	mpdecimal-dev
+	musl-libintl
+	ncurses-dev
+	openssl-dev
+	readline-dev
+	sqlite-dev
+	tcl-dev
+	xz-dev
+	zlib-dev
+	"
 source="https://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz
-	https://www.kernel.org/pub/linux/bluetooth/bluez-$_bluez_ver.tar.xz
-	fix-xattrs-glibc.patch
+	externally-managed
 	musl-find_library.patch
 	"
+options="net" # Required for tests
 builddir="$srcdir/Python-$pkgver"
 
 # secfixes:
+#   3.11.5-r0:
+#     - CVE-2023-40217
+#   3.11.1-r0:
+#     - CVE-2022-45061
+#   3.10.5-r0:
+#     - CVE-2015-20107
+#   3.9.5-r0:
+#     - CVE-2021-29921
+#   3.9.4-r0:
+#     - CVE-2021-3426
+#   3.8.8-r0:
+#     - CVE-2021-23336
+#   3.8.7-r2:
+#     - CVE-2021-3177
+#   3.8.5-r0:
+#     - CVE-2019-20907
+#   3.8.4-r0:
+#     - CVE-2020-14422
 #   3.8.2-r0:
 #     - CVE-2020-8315
+#     - CVE-2020-8492
 #   3.7.5-r0:
 #     - CVE-2019-16056
 #     - CVE-2019-16935
 #   3.6.8-r1:
 #     - CVE-2019-5010
 
+# was briefly present, and is in 3.16
+provides="pythonispython3=$pkgver-r$pkgrel"
+
 prepare() {
 	default_prepare
 
 	# force system libs
-	rm -r Modules/expat \
-		Modules/_ctypes/darwin* \
-		Modules/_ctypes/libffi*
-
-	mv "$srcdir"/bluez-$_bluez_ver/lib "$srcdir"/bluez-$_bluez_ver/bluetooth
+	rm -r Modules/expat
 }
 
 build() {
-	# --enable-optimizations is not enabled because it
-	# is very, very slow as many tests are ran sequentially
-	# for profile guided optimizations. additionally it
-	# seems some of the training tests hang on certain
-	# e.g. architectures (x86) possibly due to grsec or musl.
-
-	# Include bluez headers. Python only needs bluetooth/bluetoot.h and doesn't
-	# link against bluez. Depending on bluez-dev introduces a circular dep:
-	# Python -> bluez -> glib -> meson -> python
-	CFLAGS="$CFLAGS -I$srcdir/bluez-$_bluez_ver" ./configure \
+	# set thread stack size to 2MB so we don't segfault before we hit
+	# sys.getrecursionlimit()
+	# note: raised from 1 as we ran into some stack limit on x86_64 too
+	# sometimes, but not recursion
+	local stacksize=0x200000
+
+	# we want -O2 here for more speed for such a large interpreter.
+	export CFLAGS_NODIST="$CFLAGS -O2 -DTHREAD_STACK_SIZE=$stacksize"
+	export CXXFLAGS_NODIST="$CXXFLAGS -O2"
+	export LDFLAGS_NODIST="$LDFLAGS"
+
+	case "$CARCH" in
+	ppc64le)
+		# FIXME: on ppc64le, the stack-clash-protection from gcc seems to segfault
+		# python.. sometimes. not sure if python or gcc bug (probably former)
+		# for an easy reproduction, run the testsuite of community/py3-lmdb
+		export CFLAGS_NODIST="${CFLAGS_NODIST/-fstack-clash-protection}"
+		export CXXFLAGS_NODIST="${CXXFLAGS_NODIST/-fstack-clash-protection}"
+		;;
+	esac
+
+	# we set them via NODIST to not propagate them and duplicate them to modules
+	unset LDFLAGS CFLAGS CXXFLAGS CPPFLAGS
+
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--prefix=/usr \
-		--disable-rpath \
 		--enable-ipv6 \
 		--enable-loadable-sqlite-extensions \
 		--enable-optimizations \
@@ -64,13 +123,10 @@ build() {
 		--with-computed-gotos \
 		--with-dbmliborder=gdbm:ndbm \
 		--with-system-expat \
-		--with-system-ffi \
-		--with-threads \
+		--with-system-libmpdec \
 		--without-ensurepip
 
-	# set thread stack size to 1MB so we don't segfault before we hit
-	# sys.getrecursionlimit()
-	make EXTRA_CFLAGS="$CFLAGS -DTHREAD_STACK_SIZE=0x100000"
+	make
 }
 
 check() {
@@ -93,36 +149,23 @@ EOF
 	local fail
 
 	# musl related
-	fail="test__locale test_locale test_strptime test_re"	# various musl locale deficiencies
+	fail="test__locale"					# various musl locale deficiencies
+	fail="$fail test_locale"
+	fail="$fail test_re"
 	fail="$fail test_c_locale_coercion"
 	fail="$fail test_datetime"				# hangs if 'tzdata' installed
 	fail="$fail test_os"					# fpathconf, ttyname errno values
-	fail="$fail test_posix"					# sched_[gs]etscheduler not impl
-	fail="$fail test_shutil"				# lchmod, requires real unzip
 
 	# FIXME: failures needing investigation
-	fail="$fail test_faulthandler test_gdb"			# hangs(?)
-	fail="$fail test_tokenize test_tools"			# SLOW (~60s)
-	fail="$fail test_capi"					# test.test_capi.EmbeddingTests
-	fail="$fail test_threadsignals"				# test_{,r}lock_acquire_interruption
-	fail="$fail test_time"					# strftime/strptime %Z related
-	fail="$fail test_cmath test_math"			# hang(?) on x86
-	fail="$fail test_hash test_plistlib"			# fail on armhf
 	fail="$fail test_ctypes"				# fail on aarch64 (ctypes.test.test_win32.Structures)
-	fail="$fail test_cmd_line_script"			# fails on x86_64
-	fail="$fail test_multiprocessing_main_handling"		# fails on x86_64
-	fail="$fail test_runpy"					# fails on x86_64
 
 	# kernel related
 	fail="$fail test_fcntl"					# wants DNOTIFY, we don't have it
 
-	# just a single subtest test_memoryview_struct_module is breaking on pc64le.
-	if [ "$CARCH" = "ppc64le" ]; then
-		fail="$fail test_buffer"			# fail on ppc64le
-	fi
+	# test_clock_settime returns Function not implemented instead of the
+	# expected permission error in docker (CI). Disable for now.
 	case "$CARCH" in
-		s390x|ppc64le|arm*)	fail="$fail test_threading" ;;	# FIXME: hangs
-		mips64)			fail="$fail test_compileall" ;;	# FIXME: crashes on octeon3
+		ppc64le) fail="$fail test_time";;
 	esac
 
 	make quicktest TESTOPTS="-j${JOBS:-$(nproc)} --exclude $fail"
@@ -131,9 +174,16 @@ EOF
 package() {
 	make -j1 DESTDIR="$pkgdir" EXTRA_CFLAGS="$CFLAGS" install maninstall
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+	install -Dm644 "$srcdir"/externally-managed \
+		"$pkgdir"/usr/lib/python$_basever/EXTERNALLY-MANAGED
+
 	# those are provided by python3-tkinter
 	rm -r "$pkgdir"/usr/bin/idle* "$pkgdir"/usr/lib/python*/idlelib \
 		"$pkgdir"/usr/lib/python*/tkinter
+
+	ln -s python3 "$pkgdir"/usr/bin/python
+	ln -s python3-config "$pkgdir"/usr/bin/python-config
 }
 
 dev() {
@@ -148,24 +198,56 @@ dev() {
 tests() {
 	pkgdesc="The test modules from the main python package"
 
-	cd "$pkgdir"/usr/lib/python$_basever
-	local i; for i in */test */tests; do
-		mkdir -p "$subpkgdir"/usr/lib/python$_basever/"$i"
-		mv "$i"/* "$subpkgdir"/usr/lib/python$_basever/"$i"
-		rm -rf "$i"
-	done
-	mv "$pkgdir"/usr/lib/python$_basever/test \
-		"$subpkgdir"/usr/lib/python$_basever/
+	amove usr/lib/python$_basever/test
 }
 
-wininst() {
-	pkgdesc="Python wininst files"
-	mkdir -p "$subpkgdir"/usr/lib/python$_basever/distutils/command
-	mv "$pkgdir"/usr/lib/python$_basever/distutils/command/*.exe \
-		"$subpkgdir"/usr/lib/python$_basever/distutils/command
+gdbm() {
+	pkgdesc="Python backend for GNU gdbm"
+
+	amove usr/lib/python3*/lib-dynload/_gdbm.cpython*
+}
+
+_pyc_meta() {
+	pkgdesc="Meta package for pulling in all -pyc packages"
+	depends=""
+	mkdir -p "$subpkgdir"
+}
+
+# python3-pyc, to install pyc by default
+_default_pyc() {
+	pkgdesc="$pkgdesc (install .pyc cache files)"
+	install_if="$pkgname=$pkgver-r$pkgrel"
+	depends="
+		$pkgname-pycache-pyc0=$pkgver-r$pkgrel
+		pyc
+		"
+
+	mkdir -p "$subpkgdir"
+}
+
+pyc0() {
+	pkgdesc="$pkgdesc (.pyc pycache files)"
+
+	cd "$pkgdir"
+	amove $(find usr/lib/python3* -name "*.pyc")
+}
+
+pyc1() {
+	pkgdesc="$pkgdesc (.opt-1.pyc pycache files)"
+
+	cd "$pkgdir"
+	amove $(find usr/lib/python3* -name "*.opt-1.pyc")
+}
+
+pyc2() {
+	pkgdesc="$pkgdesc (.opt-2.pyc pycache files)"
+
+	cd "$pkgdir"
+	amove $(find usr/lib/python3* -name "*.opt-2.pyc")
 }
 
-sha512sums="ca37ad0e7c5845f5f228566aa8ff654a8f428c7d4a5aaabff29baebb0ca3219b31ba8bb2607f89e37cf3fc564f023b8407e53a4f2c47bd99122c1cc222613e37  Python-3.8.2.tar.xz
-62956e6293ec2517ec453dc7a6c82d34a8c446df8add8fe411b0a45fd5604817f3a19fbc646ad6f68df435f3cd2bd10ae040890e30db83b022f90b54cc6b3c74  bluez-5.53.tar.xz
-37b6ee5d0d5de43799316aa111423ba5a666c17dc7f81b04c330f59c1d1565540eac4c585abe2199bbed52ebe7426001edb1c53bd0a17486a2a8e052d0f494ad  fix-xattrs-glibc.patch
-ab8eaa2858d5109049b1f9f553198d40e0ef8d78211ad6455f7b491af525bffb16738fed60fc84e960c4889568d25753b9e4a1494834fea48291b33f07000ec2  musl-find_library.patch"
+sha512sums="
+4a2213b108e7f1f1525baa8348e68b2a2336d925e60d0a59f0225fc470768a2c8031edafc0b8243f94dbae18afda335ee5adf2785328c2218fd64cbb439f13a4  Python-3.12.3.tar.xz
+46dd8230ee2ab66e9c4157c10b2bd9c414fd7f30be0bee73e21a9eea88f63fff362d47828e0fc77ddc59df097b414b21505f8b5f98bc866381115c58ae3f4862  externally-managed
+ab8eaa2858d5109049b1f9f553198d40e0ef8d78211ad6455f7b491af525bffb16738fed60fc84e960c4889568d25753b9e4a1494834fea48291b33f07000ec2  musl-find_library.patch
+"
diff --git a/main/python3/externally-managed b/main/python3/externally-managed
new file mode 100644
index 00000000000..b13f594df8c
--- /dev/null
+++ b/main/python3/externally-managed
@@ -0,0 +1,22 @@
+[externally-managed]
+Error=
+ The system-wide python installation should be maintained using the system
+ package manager (apk) only.
+
+ If the package in question is not packaged already (and hence installable via
+ "apk add py3-somepackage"), please consider installing it inside a virtual
+ environment, e.g.:
+
+   python3 -m venv /path/to/venv
+   . /path/to/venv/bin/activate
+   pip install mypackage
+
+ To exit the virtual environment, run:
+
+   deactivate
+
+ The virtual environment is not deleted, and can be re-entered by re-sourcing
+ the activate file.
+
+ To automatically manage virtual environments, consider using pipx (from the
+ pipx package).
diff --git a/main/python3/fix-xattrs-glibc.patch b/main/python3/fix-xattrs-glibc.patch
deleted file mode 100644
index 57a8fb73ab7..00000000000
--- a/main/python3/fix-xattrs-glibc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
-index 8f8ba25..72b92da 100644
---- a/Modules/posixmodule.c
-+++ b/Modules/posixmodule.c
-@@ -103,8 +103,9 @@ corresponding Unix manual entries for more information on calls.");
- #undef HAVE_SCHED_SETAFFINITY
- #endif
- 
--#if defined(HAVE_SYS_XATTR_H) && defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__GNU__)
-+#if defined(HAVE_SYS_XATTR_H) && defined(__linux__) && !defined(__FreeBSD_kernel__) && !defined(__GNU__)
- #define USE_XATTRS
-+#include <linux/limits.h>
- #endif
- 
- #ifdef USE_XATTRS
diff --git a/main/quagga/0001-nhrpd-change-ipsec-SA-count-to-32-bit.patch b/main/quagga/0001-nhrpd-change-ipsec-SA-count-to-32-bit.patch
new file mode 100644
index 00000000000..79ecaebfb3d
--- /dev/null
+++ b/main/quagga/0001-nhrpd-change-ipsec-SA-count-to-32-bit.patch
@@ -0,0 +1,28 @@
+From fc6fefacad2a82f1d0470ba73015e117076b6116 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Sun, 19 Jul 2020 18:07:31 +0300
+Subject: [PATCH] nhrpd: change ipsec SA count to 32-bit
+
+Under certain misconfigurations, the SA count can be unusually high
+and wrap 8-bit counter. That leads to premature free, and crash.
+Make the count 32-bit to avoid crash in these rare conditions.
+---
+ nhrpd/nhrpd.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nhrpd/nhrpd.h b/nhrpd/nhrpd.h
+index 9222ad4e..7c73717f 100644
+--- a/nhrpd/nhrpd.h
++++ b/nhrpd/nhrpd.h
+@@ -123,7 +123,7 @@ enum nhrp_notify_type {
+ 
+ struct nhrp_vc {
+ 	struct notifier_list notifier_list;
+-	uint8_t ipsec;
++	uint32_t ipsec;
+ 	uint8_t updating;
+ 	uint8_t abort_migration;
+ 
+-- 
+2.27.0
+
diff --git a/main/quagga/APKBUILD b/main/quagga/APKBUILD
index 381b8fb3074..918febefd0f 100644
--- a/main/quagga/APKBUILD
+++ b/main/quagga/APKBUILD
@@ -1,21 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=quagga
 pkgver=1.2.4
-pkgrel=3
+pkgrel=9
 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF, BGP and NHRP"
-url="http://quagga.net/"
+url="https://www.nongnu.org/quagga/"
 arch="all"
 license="GPL-2.0-or-later"
+options="!check" # no testsuite
 depends="iproute2"
 replaces="quagga-nhrp"
 provides="quagga-nhrp=$pkgver"
 makedepends="linux-headers readline-dev ncurses-dev c-ares-dev net-snmp-dev
 	gawk texinfo perl"
 install="$pkgname.pre-install $pkgname.post-install $pkgname.post-upgrade"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg $pkgname-openrc"
 pkgusers="quagga"
 pkggroups="quagga"
-source="https://download.savannah.gnu.org/releases/quagga/quagga-$pkgver.tar.gz
+source="https://github.com/Quagga/quagga/releases/download/quagga-$pkgver/quagga-$pkgver.tar.gz
+	0001-nhrpd-change-ipsec-SA-count-to-32-bit.patch
 	1001-bgpd-allow-using-ebgp-multihop-for-ibgp-connections.patch
 	dont-hook-core-signals.patch
 
@@ -28,6 +30,10 @@ source="https://download.savannah.gnu.org/releases/quagga/quagga-$pkgver.tar.gz
 #   1.1.1-r0:
 #     - CVE-2017-5495
 
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
 	quagga_cv_ipforward_method=proc \
@@ -50,7 +56,9 @@ build() {
 		--localstatedir=/var/run/quagga
 
 	# add CFLAGS to work around textrel issue
-	make CFLAGS+="-fPIC"
+	# adding -fcommon as a workaround for multiple __packed definition
+	# same as in Gentoo
+	make CFLAGS="$CFLAGS -fcommon -fPIC"
 }
 
 package() {
@@ -66,9 +74,13 @@ package() {
 	install -Dm644 "$srcdir/zebra.confd" "$pkgdir"/etc/conf.d/zebra
 	install -o quagga -g quagga -d -m755 "$pkgdir"/etc/quagga
 }
-sha512sums="3e72440bcccfd3c1a449a62b7ff8623441256399a2bee0a39fa0a19694a5a78ac909c5c2128a24735bc034ea8b0811827293b480a2584a3a4c8ae36be9cf1fcd  quagga-1.2.4.tar.gz
+
+sha512sums="
+3e72440bcccfd3c1a449a62b7ff8623441256399a2bee0a39fa0a19694a5a78ac909c5c2128a24735bc034ea8b0811827293b480a2584a3a4c8ae36be9cf1fcd  quagga-1.2.4.tar.gz
+264103030fa8d57e7e7bd8a271b258dd8bae86242e15431060e20827b62de46be6f59617c216161aa7bc141c9e18a5aecbdb342545288340024c40f46c717aa4  0001-nhrpd-change-ipsec-SA-count-to-32-bit.patch
 dfa33341119fe51caa7bc33b44256f57361f2e3f8192862cca215b312ceb68e6a8c264dbf2a43d6244e6152bfad110cb0fdbefb065d95dd50389cf613d9720b3  1001-bgpd-allow-using-ebgp-multihop-for-ibgp-connections.patch
 5ef5c5e6d70d991b33b13a062e25b6fbde395dceee36aea29384b0640a48d2957ed5f50d416a1f2f770bf69bae2340133e35b1114be7e1fa722eb6d3d021f37a  dont-hook-core-signals.patch
 13b5b57e10df013bd2d931abc49bf76b8c4dee59dbceab22c9f151ccb988b2c5f7167f2909027d5e0f990b59da8de115667b02484aee9a67d347625700f6cacd  bgpd.initd
 7099135b6e20ad81322e7ec5ec4f0734c0ace60a69c282ad458b9700e39258831ecf29d5eaba0cd0f44bf17004283f17a80c0c1d90e8f407ababe89a75e60850  zebra.initd
-900972c6f98e561dfacf384111251db262326e8764b8c763a5ef639fa11c7949c03eef5e3bce324a4b1964fe45416d2db74ae1b6bc967f7d4ba48c2eeda017c4  zebra.confd"
+900972c6f98e561dfacf384111251db262326e8764b8c763a5ef639fa11c7949c03eef5e3bce324a4b1964fe45416d2db74ae1b6bc967f7d4ba48c2eeda017c4  zebra.confd
+"
diff --git a/main/rabbitmq-c/APKBUILD b/main/rabbitmq-c/APKBUILD
index a2103c6d96d..20c11c7ac13 100644
--- a/main/rabbitmq-c/APKBUILD
+++ b/main/rabbitmq-c/APKBUILD
@@ -1,29 +1,32 @@
 # Contributor: Fabio Ribeiro <fabiorphp@gmail.com>
 # Maintainer: Fabio Ribeiro <fabiorphp@gmail.com>
 pkgname=rabbitmq-c
-pkgver=0.10.0
-pkgrel=1
+pkgver=0.14.0
+pkgrel=0
 pkgdesc="RabbitMQ C client"
 url="https://github.com/alanxz/rabbitmq-c"
 arch="all"
 license="MIT"
 depends_dev="popt-dev"
-makedepends="$depends_dev openssl-dev cmake xmlto doxygen"
-subpackages="$pkgname-utils $pkgname-doc::noarch $pkgname-dev"
+makedepends="$depends_dev openssl-dev>3 cmake xmlto doxygen samurai"
+subpackages="$pkgname-utils $pkgname-doc::noarch $pkgname-static $pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/alanxz/rabbitmq-c/archive/v$pkgver.tar.gz"
 
+# secfixes:
+#   0.14.0-r0:
+#     - CVE-2023-35789
+
 build() {
-	cmake -B build . \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=None \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DBUILD_STATIC_LIBS=ON \
 		-DBUILD_SHARED_LIBS=ON \
 		-DENABLE_SSL_SUPPORT=ON \
-		-DBUILD_TESTS=ON \
-		-DBUILD_TOOLS=ON
-	make -C build
+		-DBUILD_TOOLS=ON \
+		-DBUILD_TOOLS_DOCS=ON
+	cmake --build build
 }
 
 check() {
@@ -32,23 +35,15 @@ check() {
 }
 
 package() {
-	make -C build DESTDIR="$pkgdir" install
-	rm -f "$pkgdir"/usr/lib/*.a
+	DESTDIR="$pkgdir" cmake --build build --target install
 }
 
 utils() {
 	pkgdesc="$pkgdesc (command line utilities)"
 
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
-}
-
-doc() {
-	pkgdesc="$pkgdesc (documentation and examples)"
-
-	mkdir -p "$subpkgdir"/usr/share/"$pkgname"
-	cp -a "$builddir"/build/docs "$builddir"/examples \
-		"$subpkgdir"/usr/share/"$pkgname"/
+	amove usr/bin
 }
 
-sha512sums="52a1194fab2dc8698ed065d63898e32aa004a4d68080d4aaf5cb7148cc28ad967283f7a99910d7f054cbba92b487b3a67b839b6f0bd88486ef9be043c9517d4c  rabbitmq-c-0.10.0.tar.gz"
+sha512sums="
+18cb429bcfa457e359128bf458c8b9f60b1c929a8ca3a8206f40d6390d7d4c6f4c5140eb7e9ab7b401d035fc48324cbe963d058100ab65ef3faba59e7f95607e  rabbitmq-c-0.14.0.tar.gz
+"
diff --git a/main/radvd/APKBUILD b/main/radvd/APKBUILD
index b5e3f6aeeaf..d8b40d390d1 100644
--- a/main/radvd/APKBUILD
+++ b/main/radvd/APKBUILD
@@ -1,30 +1,32 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=radvd
-pkgver=2.18
-pkgrel=0
+pkgver=2.19
+pkgrel=4
 pkgdesc="IPv6 router advertisement daemon"
 url="http://www.litech.org/radvd"
 arch="all"
-license="BSD with advertising"
-depends=""
+license="BSD-Advertising-Acknowledgement"
 makedepends="flex bison libdaemon-dev linux-headers check-dev"
-checkdepends=""
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-openrc"
 source="http://www.litech.org/radvd/dist/radvd-$pkgver.tar.xz
 	radvd.initd
 	radvd.confd
+	fix-alpine-plz.patch
 	"
-builddir="$srcdir/$pkgname-$pkgver"
 
 # test failure on builders due to kernel issue
 case "$CARCH" in
 mips*)	options="!check";;
 esac
 
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -41,7 +43,6 @@ check() {
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 	install -Dm755 "$srcdir"/radvd.initd "$pkgdir"/etc/init.d/radvd
 	install -Dm644 "$srcdir"/radvd.confd "$pkgdir"/etc/conf.d/radvd
@@ -49,6 +50,9 @@ package() {
 		"$pkgdir"/usr/share/doc/radvd/radvd.conf.example
 }
 
-sha512sums="f45a600d63a93fc58cc3d1c33545ed641337a82281dbeca2f98a9fee224d38e7c547c1624e02682df007e0215b39b5756f60093bae9264d54e4b388f89b6d108  radvd-2.18.tar.xz
-5f96261f3914ff10966828231d1c8df0d7b0e432d5e075eb6405f923a25f1218e647ec8a2c5b7fa995cf44cc521fd226b4bacfe86920d108130852f00623d8c5  radvd.initd
-386a6cdee43a0aa157760a590b9daa52e06e2c344a8d191a188c6174281734df95b82121e92d3c01e6c0fe76658dbdf6467dee2b30e2e010fc57dc8e0666b2cc  radvd.confd"
+sha512sums="
+a1eb40af90fc83ebab2517c16a0f7e85c11338ab276bec400b7c33177748d1e36bc5abd7e373b6742f12f7c690dd7ae6b951bc832c7de9bbb56f7e9bc844ed22  radvd-2.19.tar.xz
+fd78249b8ae25d1c55fc0b5cc2b3dd202388c0ca7be2737ecbd33ed5cd3c8616858aa46350967350fe8e8c0032552126918c8b9c36b13d799f3c5d8fb576fdf8  radvd.initd
+31cca1d48e5f0c4fe96a7a32ca6339e7aa9e478f7e9086f05bbc79ca59b1637d99e46079d7be77ef717a8fb975fada7664058e3bc61117309025b72f3e87d294  radvd.confd
+dffe4167c54c430fc38953e70d546fdf443944eceee4c610f14d63947fe8c04960b48a8acf5742edf8721558c4b811c9a4033ad9abe787ead9cc1bb0721b654c  fix-alpine-plz.patch
+"
diff --git a/main/radvd/fix-alpine-plz.patch b/main/radvd/fix-alpine-plz.patch
new file mode 100644
index 00000000000..cf7806e305c
--- /dev/null
+++ b/main/radvd/fix-alpine-plz.patch
@@ -0,0 +1,32 @@
+From 06689f8c06f44c7e87f7ff1d814428f88375b53f Mon Sep 17 00:00:00 2001
+From: Jonathan Davies <jpds@protonmail.com>
+Date: Thu, 25 Nov 2021 15:29:18 +0000
+Subject: [PATCH] Reverts the include.h change in
+ 46883f8a1a02fe42040dd8e48aec0ed871545d4d
+
+Closes: #158
+
+Signed-off-by: Jonathan Davies <jpds@protonmail.com>
+---
+ includes.h | 5 -----
+ 1 file changed, 5 deletions(-)
+
+Patch-Origin: https://github.com/radvd-project/radvd/commit/06689f8c06f44c7e87f7ff1d814428f88375b53f
+
+diff --git a/includes.h b/includes.h
+index ef30b10..c528c86 100644
+--- a/includes.h
++++ b/includes.h
+@@ -76,12 +76,7 @@
+ #include <sys/sysctl.h>
+ #endif
+ 
+-#if !defined(__GLIBC__) && defined(linux)
+-#include <linux/if.h>
+-#define IF_NAMESIZE IFNAMSIZ
+-#else
+ #include <net/if.h>
+-#endif
+ 
+ #ifdef HAVE_NET_IF_DL_H
+ #include <net/if_dl.h>
diff --git a/main/radvd/radvd.confd b/main/radvd/radvd.confd
index e025c6862f6..2c230eab992 100644
--- a/main/radvd/radvd.confd
+++ b/main/radvd/radvd.confd
@@ -4,8 +4,3 @@
 
 # Extra options to pass to radvd
 OPTIONS=""
-
-# Set this to "no" to tell the init script NOT to set up IPv6 forwarding
-# using /proc/sys/net/ipv6/conf/all/forwarding
-# Only change this if you know what you're doing!
-FORWARD="yes"
diff --git a/main/radvd/radvd.initd b/main/radvd/radvd.initd
index 4dacae6d9ae..108e483294e 100644
--- a/main/radvd/radvd.initd
+++ b/main/radvd/radvd.initd
@@ -26,12 +26,6 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 
-	if [ "${FORWARD}" != "no" ]; then
-		ebegin "Enabling IPv6 forwarding"
-		sysctl -w "${SYSCTL_FORWARD}=1" >/dev/null
-		eend $?
-	fi
-
 	ebegin "Starting IPv6 Router Advertisement Daemon"
 	start-stop-daemon --start --exec /usr/sbin/radvd \
 		--pidfile "${PIDFILE}" \
@@ -43,23 +37,11 @@ stop() {
 	ebegin "Stopping IPv6 Router Advertisement Daemon"
 	start-stop-daemon --stop --exec /usr/sbin/radvd --pidfile "${PIDFILE}"
 	eend $?
-
-	if [ "${FORWARD}" != "no" ]; then
-		ebegin "Disabling IPv6 forwarding"
-		sysctl -w "${SYSCTL_FORWARD}=0" > /dev/null
-		eend $?
-	fi
 }
 
 reload() {
 	checkconfig || return 1
 
-	if [ "${FORWARD}" != "no" ]; then
-		ebegin "Enabling IPv6 forwarding"
-		sysctl -w "${SYSCTL_FORWARD}=1" >/dev/null
-		eend $?
-	fi
-
 	ebegin "Reloading IPv6 Router Advertisement Daemon"
 	start-stop-daemon --stop --signal HUP --oknodo \
 		--exec /usr/sbin/radvd --pidfile "${PIDFILE}"
diff --git a/main/ragel/APKBUILD b/main/ragel/APKBUILD
deleted file mode 100644
index 5c570e5318f..00000000000
--- a/main/ragel/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=ragel
-pkgver=6.10
-pkgrel=0
-pkgdesc="Finite state machine compiler"
-url="http://www.complang.org/ragel/"
-arch="all"
-license="GPL-2.0-or-later"
-depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-doc"
-source="https://www.colm.net/files/ragel/ragel-$pkgver.tar.gz"
-
-_builddir="$srcdir"/ragel-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	export CXXFLAGS="$CXXFLAGS -std=gnu++98"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-sha512sums="6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38  ragel-6.10.tar.gz"
diff --git a/main/rarian/APKBUILD b/main/rarian/APKBUILD
index d41be593fc9..16371131305 100644
--- a/main/rarian/APKBUILD
+++ b/main/rarian/APKBUILD
@@ -1,26 +1,24 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rarian
 pkgver=0.8.1
-pkgrel=7
+pkgrel=11
 pkgdesc="Documentation meta-data library, designed as a replacement for Scrollkeeper."
 url="https://rarian.freedesktop.org/"
 arch="all"
 options="!check"  # No test suite.
-license="GPL-2.0+, LGPL-2.1+, Zlib"
+license="GPL-2.0-or-later AND LGPL-2.1-or-later AND Zlib"
 subpackages="$pkgname-dev"
 depends="bash"
 makedepends="libxslt-dev"
-source="https://download.gnome.org/sources/$pkgname/0.8/$pkgname-$pkgver.tar.bz2
+source="https://download.gnome.org/sources/rarian/0.8/rarian-$pkgver.tar.bz2
 	user-segfault.patch"
 
 prepare() {
-	cd "$builddir"
 	update_config_sub
 	default_prepare
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,7 +31,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
diff --git a/main/raspberrypi-bootloader/APKBUILD b/main/raspberrypi-bootloader/APKBUILD
index affa7b26543..210f4c0b53d 100644
--- a/main/raspberrypi-bootloader/APKBUILD
+++ b/main/raspberrypi-bootloader/APKBUILD
@@ -1,52 +1,70 @@
 # Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=raspberrypi-bootloader
-pkgver=1.20200212
+# To match Alpine kernel schedule, use master branch commit id rather than older stable tagged releases
+# Keep by-the-date release numbering for consistency
+_commit=545545d44d2f33cae473889b6e94687d578a89e9
+pkgver=1.20240229
 pkgrel=0
 pkgdesc="Bootloader files for the Raspberry Pi"
-url=https://github.com/raspberrypi/firmware
+url="https://github.com/raspberrypi/rpi-firmware"
 arch="armhf armv7 aarch64"
 license="custom"
-depends=""
-makedepends=""
-install=
+triggers="raspberrypi-bootloader-common.trigger=/boot"
 options="!check !strip !tracedeps !spdx"
-source="$pkgname-$pkgver.tar.gz::https://github.com/raspberrypi/firmware/archive/$pkgver.tar.gz"
-subpackages="$pkgname-experimental $pkgname-debug $pkgname-cutdown $pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/raspberrypi/rpi-firmware/archive/$_commit.tar.gz
+	update-raspberrypi-bootloader"
+subpackages="$pkgname-common $pkgname-experimental $pkgname-debug $pkgname-cutdown $pkgname-doc"
+depends="$pkgname-common=$pkgver-r$pkgrel"
 
-builddir="${srcdir}/firmware-${pkgver}"
+builddir="$srcdir/rpi-firmware-$_commit"
 
 package() {
 	local fw; for fw in bootcode.bin fixup.dat fixup4.dat start.elf start4.elf; do
-		install -D "$builddir"/boot/$fw \
+		install -D "$builddir"/$fw \
 			"$pkgdir"/boot/$fw
 	done
-	install -Dm 644 "$builddir"/boot/LICENCE.broadcom \
+	install -Dm 644 "$builddir"/LICENCE.broadcom \
 		"$pkgdir"/usr/share/licenses/$pkgname/COPYING
+	install -D -m755 "$srcdir"/update-raspberrypi-bootloader \
+		"$pkgdir"/sbin/update-raspberrypi-bootloader
+}
+
+common() {
+	pkgdesc="Common files used by Raspberry Pi bootloaders"
+	depends=
+	amove boot/bootcode.bin \
+		sbin/update-raspberrypi-bootloader
 }
 
 experimental() {
 	pkgdesc="Experimental firmware with additional codecs"
+	depends="$pkgname-common=$pkgver-r$pkgrel"
 	local fw; for fw in start_x.elf start4x.elf fixup_x.dat fixup4x.dat; do
-		install -D "$builddir"/boot/$fw \
+		install -D "$builddir"/$fw \
 				"$subpkgdir"/boot/$fw
 	done
 }
 
 debug() {
 	pkgdesc="Debug firmware"
-    local fw; for fw in start_db.elf start4db.elf fixup_db.dat fixup4db.dat; do
-		install -D "$builddir"/boot/$fw \
+	depends="$pkgname-common=$pkgver-r$pkgrel"
+	local fw; for fw in start_db.elf start4db.elf fixup_db.dat fixup4db.dat; do
+		install -D "$builddir"/$fw \
 			"$subpkgdir"/boot/$fw
 	done
 }
 
 cutdown() {
 	pkgdesc="Cut-down firmware for lower memory settings"
+	depends="$pkgname-common=$pkgver-r$pkgrel"
 	local fw; for fw in start_cd.elf start4cd.elf fixup_cd.dat fixup4cd.dat; do
-		install -D "$builddir"/boot/$fw \
+		install -D "$builddir"/$fw \
 			"$subpkgdir"/boot/$fw
 	done
 }
 
-sha512sums="f79192f45c3ffc4c9774687f3bdb1d78b223ff18d8f6c587f2547876455504a753512c54bf90688a13a0909472561313f6328ccf73a20ac4986bb24f83ebb9f1  raspberrypi-bootloader-1.20200212.tar.gz"
+sha512sums="
+58dab41bf17926b0a07daeaa4d2d68e4950793d30c4acad1127917801e12cc4e773437a7658f7f3d196ce91074e9584abc9fa240444a5ea25c75da6dfff85d86  raspberrypi-bootloader-1.20240229.tar.gz
+35af8c7bdd3ab6f2bbc0290d8cb2adbe333639e9e3d9d03f3d0b981e6814a0ab56fb508e0e34e44ae3a325909cab3a76819fb6844d7eafe394996f7a0db83c0e  update-raspberrypi-bootloader
+"
diff --git a/main/raspberrypi-bootloader/raspberrypi-bootloader-common.trigger b/main/raspberrypi-bootloader/raspberrypi-bootloader-common.trigger
new file mode 100644
index 00000000000..037e2183963
--- /dev/null
+++ b/main/raspberrypi-bootloader/raspberrypi-bootloader-common.trigger
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec update-raspberrypi-bootloader
diff --git a/main/raspberrypi-bootloader/update-raspberrypi-bootloader b/main/raspberrypi-bootloader/update-raspberrypi-bootloader
new file mode 100644
index 00000000000..899bd73e852
--- /dev/null
+++ b/main/raspberrypi-bootloader/update-raspberrypi-bootloader
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+if grep -q '^disable_trigger=1' /etc/update-raspberrypi-bootloader.conf 2>/dev/null; then
+	exit 0
+fi
+
+# see https://www.raspberrypi.com/documentation/computers/config_txt.html#kernel
+# use the last found kernel for for example vmlinuz-rpi16k gets preference over
+# vmlinuz-rpi
+for i in /boot/vmlinuz* /boot/vmlinuz-lts /boot/vmlinuz-rpi /boot/vmlinuz-rpi*; do
+	if [ -e "$i" ]; then
+		kernel="${i#/boot/}"
+		initramfs="initramfs${kernel#vmlinuz}"
+	fi
+done
+
+if [ -z "$kernel" ]; then
+	echo "$0: WARNING: no kernel found" >&2
+	exit
+fi
+
+case "$(uname -m)" in
+	aarch64) arm_64bit=1;;
+	*) arm_64bit=0;;
+esac
+
+cat > /boot/config.txt.new <<-EOF
+	# do not modify this file as it will be overwritten on upgrade.
+	# create and/or modify usercfg.txt instead.
+	# https://www.raspberrypi.com/documentation/computers/config_txt.html
+	#
+
+	kernel=$kernel
+	initramfs $initramfs
+	arm_64bit=$arm_64bit
+	include usercfg.txt
+EOF
+
+if diff -bBN /boot/config.txt.new /boot/config.txt >/dev/null; then
+	rm -f /boot/config.txt.new
+else
+	mv -f /boot/config.txt /boot/config.txt.old 2>/dev/null
+	mv -f /boot/config.txt.new /boot/config.txt
+	echo "$0: INFO: replaced config.txt and saved config.txt.old"
+fi
+
+echo "Configured kernel $kernel / $initramfs"
diff --git a/main/raspberrypi-userland/10-local-rpi.rules b/main/raspberrypi-userland/10-local-rpi.rules
new file mode 100644
index 00000000000..43ad6db430c
--- /dev/null
+++ b/main/raspberrypi-userland/10-local-rpi.rules
@@ -0,0 +1,7 @@
+# VC4 GPU devices created by vchiq driver: make them accessible to video group
+
+KERNEL=="vchiq", GROUP="video", MODE="0660"
+KERNEL=="vc-mem", GROUP="video", MODE="0660"
+KERNEL=="vcsm-cma", GROUP="video", MODE="0660"
+KERNEL=="vcio", GROUP="video", MODE="0660"
+
diff --git a/main/raspberrypi-userland/APKBUILD b/main/raspberrypi-userland/APKBUILD
new file mode 100644
index 00000000000..95f203a5a27
--- /dev/null
+++ b/main/raspberrypi-userland/APKBUILD
@@ -0,0 +1,104 @@
+# Maintainer: Timo Teräs <timo.teras@iki.fi>
+pkgname=raspberrypi-userland
+pkgver=0.20231020
+pkgrel=0
+_commit="96a7334ae9d5fc9db7ac92e59852377df63f1848"
+pkgdesc="Raspberry Pi tools for interfacing to GPU (deprecated)'"
+url="https://github.com/raspberrypi/userland"
+arch="armhf armv7 aarch64"
+license="BSD-3-Clause"
+provides="raspberrypi=$pkgver-r$pkgrel"  # for backward compatibility
+replaces="raspberrypi"  # for backward compatibility
+depends_dev="linux-headers $pkgname-static $pkgname-libs"
+makedepends="cmake samurai $depends_dev"
+options="!fhs !check"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-static $pkgname-libs $pkgname-udev:udev"
+source="$pkgname-$_commit.tar.gz::https://github.com/raspberrypi/userland/archive/$_commit.tar.gz
+	dont-build-moved-utils.patch
+	10-local-rpi.rules
+	"
+builddir="$srcdir/userland-$_commit"
+
+prepare() {
+	default_prepare
+	sed -i 's/ bash / sh /g' host_applications/linux/apps/raspicam/CMakeLists.txt
+}
+
+build() {
+	case "$CARCH" in
+		arm*) local _arm64=off;;
+		aarch64) local _arm64=on;;
+	esac
+	cmake -B build -G Ninja \
+		-DCMAKE_C_FLAGS="$CFLAGS -D_GNU_SOURCE" \
+		-DARM64=$_arm64 \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_INSTALL_RPATH=/opt/vc/lib \
+		-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-as-needed"
+	cmake --build build
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --build build --target install
+
+	# nuke the unwanted stuff
+	rm -rf "$pkgdir"/opt/vc/src
+
+	# move main binaries to /usr/bin (purposely omit those moved into utils package)
+	mkdir -p "$pkgdir"/usr/bin
+	for _app in mmal_vc_diag raspistill raspivid raspividyuv raspiyuv vcsmem \
+		tvservice vchiq_test; do
+			[ -f "$pkgdir"/opt/vc/bin/"$_app" ] && mv "$pkgdir"/opt/vc/bin/"$_app" "$pkgdir"/usr/bin/"$_app"
+	done
+
+	install -Dm644 -t "$pkgdir"/lib/udev/rules.d/ "$srcdir"/10-local-rpi.rules
+
+	mkdir -p "$pkgdir"/usr/share
+	mv "$pkgdir"/opt/vc/man "$pkgdir"/usr/share
+}
+
+static() {
+	pkgdesc="Static files for $pkgname (deprecated)"
+	provides="raspberrypi-static=$pkgver-r$pkgrel"  # for backward compatibility
+	replaces="raspberrypi-static"  # for backward compatibility
+
+	amove opt/vc/lib/*.a
+}
+
+libs() {
+	pkgdesc="Raspberry Pi libraries for interfacing to GPU (deprecated)"
+	provides="raspberrypi-libs=$pkgver-r$pkgrel"  # for backward compatibility
+	replaces="raspberrypi-libs"  # for backward compatibility
+
+	amove opt/vc/lib
+}
+
+dev() {
+	pkgdesc="Raspberry Pi tools for interfacing to GPU (deprecated development files)"
+	provides="raspberrypi-dev=$pkgver-r$pkgrel"  # for backward compatibility
+	replaces="raspberrypi-dev"  # for backward compatibility
+	default_dev
+	amove opt/vc/lib/pkgconfig
+}
+
+udev() {
+	pkgdesc="VC4 GPU vchiq udev rules"
+	install="$subpkgname.post-install"
+	install_if="$pkgname-libs=$pkgver-r$pkgrel eudev"
+	depends=""
+
+	amove lib/udev/rules.d
+}
+
+doc() {
+	provides="raspberrypi-doc=$pkgver-r$pkgrel"  # for backward compatibility
+	replaces="raspberrypi-doc"  # for backward compatibility
+
+	default_doc
+}
+
+sha512sums="
+246a547cd411f893fe903b92a362b27467e2a3d7f3fd8bab6d9dc6f826d09781a341482826926bd3e94b7609c6a1a8a05726548e6e577f5b64d2130cc3e0fb71  raspberrypi-userland-96a7334ae9d5fc9db7ac92e59852377df63f1848.tar.gz
+b9bc1dd0c596b81eeab90238685b7bc6b6a7d8606467d7444892dd4b2f0f53c43964087f3a2f5c8072fcc90549476453331542f9eff44c883e0c6fc2be8d7ad5  dont-build-moved-utils.patch
+256d1faa31ff43fbbc0fbbf814cb92aaa66f3fc1630e2260fefa6d206baa3bf2c98fc44aefb70a34ea0a092bf208b151a9c0ed1dc0f140fcc59d08ca1a629d6a  10-local-rpi.rules
+"
diff --git a/main/raspberrypi-userland/dont-build-moved-utils.patch b/main/raspberrypi-userland/dont-build-moved-utils.patch
new file mode 100644
index 00000000000..7daa1d91771
--- /dev/null
+++ b/main/raspberrypi-userland/dont-build-moved-utils.patch
@@ -0,0 +1,20 @@
+--- a/host_applications/linux/CMakeLists.txt
++++ b/host_applications/linux/CMakeLists.txt
+@@ -1,17 +1,13 @@
+ # linux apps
+ 
+ add_subdirectory(libs/bcm_host)
+-add_subdirectory(apps/gencmd)
+ add_subdirectory(apps/tvservice)
+-add_subdirectory(apps/vcmailbox)
+ if(NOT ARM64)
+    add_subdirectory(apps/raspicam)
+    add_subdirectory(libs/sm)
+    add_subdirectory(apps/smem)
+ endif()
+ add_subdirectory(libs/debug_sym)
+-add_subdirectory(apps/dtoverlay)
+-add_subdirectory(apps/dtmerge)
+ 
+ if(ALL_APPS)
+  add_subdirectory(apps/vcdbg)
diff --git a/main/raspberrypi-userland/raspberrypi-userland-udev.post-install b/main/raspberrypi-userland/raspberrypi-userland-udev.post-install
new file mode 100644
index 00000000000..c2ba0a207f9
--- /dev/null
+++ b/main/raspberrypi-userland/raspberrypi-userland-udev.post-install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -S /run/udev/control ]; then
+	udevadm control --reload-rules
+	udevadm trigger --sysname-match=vcio --sysname-match=vchiq --sysname-match=vc-mem --sysname-match=vcsm-cma
+fi
+
+exit 0
+
diff --git a/main/raspberrypi/APKBUILD b/main/raspberrypi/APKBUILD
deleted file mode 100644
index 9f634dd9f05..00000000000
--- a/main/raspberrypi/APKBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# Maintainer: Timo Teräs <timo.teras@iki.fi>
-pkgname=raspberrypi
-pkgver=0.20190416
-_commitid=ff2bd4552145e8dc190276d8fbdbadc7e8e0da78
-pkgrel=1
-pkgdesc="Raspberry Pi support tools"
-url="https://github.com/raspberrypi/userland"
-arch="armhf armv7 aarch64"
-license="BSD"
-depends=""
-depends_dev="linux-headers raspberrypi-static raspberrypi-libs"
-makedepends="cmake $depends_dev"
-install=""
-options="!fhs !check"
-subpackages="$pkgname-dev $pkgname-static $pkgname-libs $pkgname-openrc"
-source="raspberrypi-$pkgver.tar.gz::https://github.com/raspberrypi/userland/archive/$_commitid.tar.gz
-	"
-
-builddir="$srcdir"/userland-$_commitid
-
-prepare() {
-	default_prepare
-	sed -i 's/ bash / sh /g' host_applications/linux/apps/raspicam/CMakeLists.txt
-}
-
-build() {
-	cd "$builddir"
-	case "$CARCH" in
-		arm*) local ARM64=off;;
-		aarch64) local ARM64=on;;
-	esac
-	cmake -DCMAKE_C_FLAGS="$CFLAGS -D_GNU_SOURCE" \
-		-DARM64=$ARM64 \
-		-DCMAKE_BUILD_TYPE=MinSizeRel \
-		-DCMAKE_INSTALL_RPATH=/opt/vc/lib \
-		-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-as-needed" \
-		$_sourcedir
-	make
-}
-
-package() {
-	cd "$builddir"
-	make install DESTDIR="$pkgdir"
-
-	# nuke the unwanted stuff
-	rm -rf "$pkgdir"/opt/vc/src
-	mv "$pkgdir"/opt/vc/etc "$pkgdir"
-}
-
-static() {
-	pkgdesc="Static files for $pkgname"
-
-	mkdir -p "$subpkgdir"/opt/vc/lib
-	mv "$pkgdir"/opt/vc/lib/*.a "$subpkgdir"/opt/vc/lib
-}
-
-libs() {
-	pkgdesc="Raspberry Pi support libraries"
-
-	mkdir -p "$subpkgdir"/opt/vc/lib
-	mv "$pkgdir"/opt/vc/lib/* "$subpkgdir"/opt/vc/lib
-}
-
-sha512sums="dad48bd88d11a3f6807250275950235122bf5f35c47c5891f4e2c40964adbf69de6dbc014cea561540e516bed369257fc134a0114b9bdfa6e6a689a48bfd9f40  raspberrypi-0.20190416.tar.gz"
diff --git a/main/razor/APKBUILD b/main/razor/APKBUILD
index 97a13b11130..c388721f75b 100644
--- a/main/razor/APKBUILD
+++ b/main/razor/APKBUILD
@@ -3,38 +3,41 @@
 pkgname=razor
 _realname=razor-agents
 pkgver=2.85
-pkgrel=9
+pkgrel=15
 pkgdesc="Vipul's Razor is a distributed, collaborative spam detection and filtering network"
-url="http://razor.sourceforge.net/"
+url="https://razor.sourceforge.net/"
 arch="all"
-license="Artistic"
+license="Artistic-2.0"
 depends="perl perl-digest-sha1 perl-getopt-long perl-uri"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/razor/razor-agents/$_realname-$pkgver.tar.bz2"
+source="https://downloads.sourceforge.net/razor/razor-agents/$_realname-$pkgver.tar.bz2
+	fix-cosmetic-pv.patch
+	fix-manpage-quoting.patch
+	"
 builddir="$srcdir/$_realname-$pkgver"
 
 prepare() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	default_prepare
+
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
-	cd "$builddir"
-	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	make -j1
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
-sha512sums="31dded1969dde963389a5939514c29638ad07f45dbb2f4c633cf20ebc4abab94e65e9a6d8885233cdde686ef365aab11fa5eba2ca38d79c5b8fab689143ff5db  razor-agents-2.85.tar.bz2"
+sha512sums="31dded1969dde963389a5939514c29638ad07f45dbb2f4c633cf20ebc4abab94e65e9a6d8885233cdde686ef365aab11fa5eba2ca38d79c5b8fab689143ff5db  razor-agents-2.85.tar.bz2
+75c18cbf22172657976eb3140e736134115c072be46c5165326237f73af592afbe49229058d9c80f8a99f486cae075e16b36822b73f194034b20e83afee382ec  fix-cosmetic-pv.patch
+25b5449f4b13d3c8373ed3bb67970c187d7ea3235a6e4f0baf60618004addc124321b36bf0a4c320b5b7370498c857c6477bfecb1658e441e0edacde149d361e  fix-manpage-quoting.patch"
diff --git a/main/razor/fix-cosmetic-pv.patch b/main/razor/fix-cosmetic-pv.patch
new file mode 100644
index 00000000000..6082392b313
--- /dev/null
+++ b/main/razor/fix-cosmetic-pv.patch
@@ -0,0 +1,24 @@
+Taken from Arch Linux
+
+--- a/lib/Razor2/Client/Version.pm	2007-05-10 22:32:10.000000000 +0200
++++ b/lib/Razor2/Client/Version.pm	2010-03-25 11:11:36.911409707 +0100
+@@ -14,7 +14,7 @@
+ 
+ $PROTOCOL = 3;
+ 
+-$VERSION = '2.84';
++$VERSION = '2.85';
+ 
+ 1;
+ 
+--- a/META.yml	2007-05-23 20:29:34.000000000 +0200
++++ b/META.yml	2010-03-25 11:11:43.691408628 +0100
+@@ -1,7 +1,7 @@
+ # http://module-build.sourceforge.net/META-spec.html
+ #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
+ name:         razor-agents
+-version:      2.84
++version:      2.85
+ version_from: lib/Razor2/Client/Version.pm
+ installdirs:  site
+ requires:
diff --git a/main/razor/fix-manpage-quoting.patch b/main/razor/fix-manpage-quoting.patch
new file mode 100644
index 00000000000..6be965cc548
--- /dev/null
+++ b/main/razor/fix-manpage-quoting.patch
@@ -0,0 +1,17 @@
+Taken from Arch Linux
+
+diff -uprw razor-agents-2.85.orig/Makefile.PL razor-agents-2.85/Makefile.PL
+--- razor-agents-2.85.orig/Makefile.PL	2007-05-09 01:47:53.000000000 +0300
++++ razor-agents-2.85/Makefile.PL	2015-06-14 20:36:23.677213987 +0300
+@@ -140,9 +140,9 @@ sub MY::install {
+   my $inherited = $self->SUPER::install(@_);
+ 
+   my $man5 = q{ \\
+-		$(INST_MAN5DIR) $(INSTALLMAN5DIR)};
++		"$(INST_MAN5DIR)" "$(INSTALLMAN5DIR)"};
+ 
+-  $inherited =~ s/(\$\((?:DEST)?INSTALL\w*MAN1DIR\))/$1$man5/gm;
++  $inherited =~ s/("?\$\((?:DEST)?INSTALL\w*MAN1DIR\)"?)/$1$man5/gm;
+ 
+   return $inherited;
+ }
diff --git a/main/rdesktop/APKBUILD b/main/rdesktop/APKBUILD
deleted file mode 100644
index 67e4aa1763a..00000000000
--- a/main/rdesktop/APKBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=rdesktop
-pkgver=1.9.0
-pkgrel=0
-pkgdesc="rdesktop is used to connect to windows terminal servers"
-options="!check" # No testsuite
-url="https://www.rdesktop.org/"
-arch="all"
-license="GPL-3.0-or-later"
-subpackages="$pkgname-doc"
-makedepends="linux-headers libx11-dev libao-dev libsamplerate-dev
-	libxrandr-dev automake libtool autoconf libxcursor-dev
-	libtasn1-dev nettle-dev gnutls-dev"
-source="https://github.com/rdesktop/rdesktop/releases/download/v$pkgver/rdesktop-$pkgver.tar.gz"
-
-# secfixes:
-#   1.8.6-r0:
-#     - CVE-2018-8794
-#     - CVE-2018-8795
-#     - CVE-2018-8797
-#     - CVE-2018-20175
-#     - CVE-2018-20175
-#     - CVE-2018-20176
-#     - CVE-2018-20176
-#     - CVE-2018-8791
-#     - CVE-2018-8792
-#     - CVE-2018-8793
-#     - CVE-2018-8796
-#     - CVE-2018-8798
-#     - CVE-2018-8799
-#     - CVE-2018-8800
-#     - CVE-2018-20174
-#     - CVE-2018-20177
-#     - CVE-2018-20178
-#     - CVE-2018-20179
-#     - CVE-2018-20180
-#     - CVE-2018-20181
-#     - CVE-2018-20182
-
-prepare() {
-	cd "$builddir"
-	default_prepare
-	update_config_sub
-	autoreconf -fi # https://github.com/rdesktop/rdesktop/issues/331
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--with-sound=ao \
-		--disable-smartcard \
-		--disable-credssp
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5  rdesktop-1.9.0.tar.gz"
diff --git a/main/rdfind/APKBUILD b/main/rdfind/APKBUILD
new file mode 100644
index 00000000000..396c0bc75f3
--- /dev/null
+++ b/main/rdfind/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
+pkgname=rdfind
+pkgver=1.6.0
+pkgrel=1
+pkgdesc="Redundant data find - a program that finds duplicate files"
+url="http://rdfind.pauldreik.se"
+arch="all"
+license="GPL-2.0-or-later"
+makedepends="nettle-dev automake autoconf libtool"
+subpackages="$pkgname-doc"
+source="https://rdfind.pauldreik.se/rdfind-$pkgver.tar.gz
+	disable-makefile-test-failing.patch"
+
+prepare() {
+	default_prepare
+	./bootstrap.sh
+}
+
+build() {
+	./configure	--prefix=/usr
+	make -s
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir/" install
+}
+
+sha512sums="
+21d135551bd2d71a71dfe1e4faece6e980db3df18f34433b7b0a5da9e21ccc9067337892025afa9b4b1fd6069732a144b5b7b8e0441cbc9821a71a8b934cced1  rdfind-1.6.0.tar.gz
+ab53fabe698ed9fa31f31ed4828ce8f8b5582412a8ad97d2706aac3d1f6b21150ac8a73443e89c18a26b479b1cb4139e640d5c08c463cd01c7387dc311d10f1d  disable-makefile-test-failing.patch
+"
diff --git a/main/rdfind/disable-makefile-test-failing.patch b/main/rdfind/disable-makefile-test-failing.patch
new file mode 100644
index 00000000000..50fcf3c9c81
--- /dev/null
+++ b/main/rdfind/disable-makefile-test-failing.patch
@@ -0,0 +1,44 @@
+diff --git a/Makefile.in b/Makefile.in
+index fc5907f..9c91865 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -497,16 +497,12 @@ rdfind_SOURCES = rdfind.cc Checksum.cc  Dirlist.cc  Fileinfo.cc  Rdutil.cc \
+ #these are the test scripts to execute - I do not know how to glob here,
+ #feedback welcome.
+ TESTS = testcases/largefilesupport.sh \
+-      testcases/hardlink_fails.sh \
+-      testcases/symlinking_action.sh \
+       testcases/verify_filesize_option.sh \
+       testcases/verify_maxfilesize_option.sh \
+-      testcases/verify_dryrun_option.sh \
+       testcases/verify_ranking.sh \
+       testcases/verify_deterministic_operation.sh \
+       testcases/checksum_options.sh \
+-      testcases/md5collisions.sh \
+-      testcases/sha1collisions.sh
++      testcases/md5collisions.sh 
+ 
+ AUXFILES = testcases/common_funcs.sh \
+          testcases/md5collisions/letter_of_rec.ps \
+diff --git a/Makefile.am b/Makefile.am
+index 446eb39..aad38f7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -9,16 +9,12 @@ rdfind_SOURCES = rdfind.cc Checksum.cc  Dirlist.cc  Fileinfo.cc  Rdutil.cc \
+ #these are the test scripts to execute - I do not know how to glob here,
+ #feedback welcome.
+ TESTS=testcases/largefilesupport.sh \
+-      testcases/hardlink_fails.sh \
+-      testcases/symlinking_action.sh \
+       testcases/verify_filesize_option.sh \
+       testcases/verify_maxfilesize_option.sh \
+-      testcases/verify_dryrun_option.sh \
+       testcases/verify_ranking.sh \
+       testcases/verify_deterministic_operation.sh \
+       testcases/checksum_options.sh \
+-      testcases/md5collisions.sh \
+-      testcases/sha1collisions.sh
++      testcases/md5collisions.sh
+ 
+ AUXFILES=testcases/common_funcs.sh \
+          testcases/md5collisions/letter_of_rec.ps \
diff --git a/main/rdiff-backup/0002-remove-setuptools_scm.patch b/main/rdiff-backup/0002-remove-setuptools_scm.patch
new file mode 100644
index 00000000000..1f462330b5a
--- /dev/null
+++ b/main/rdiff-backup/0002-remove-setuptools_scm.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index 834eefd..2386da0 100755
+--- a/setup.py
++++ b/setup.py
+@@ -227,7 +227,6 @@ class clean(distutils.command.clean.clean):
+ 
+ setup(
+     name="rdiff-backup",
+-    use_scm_version=True,
+     description="Backup and Restore utility, easy to use, efficient, locally and remotely usable",
+     long_description="""
+         rdiff-backup is a simple backup tool which can be used locally and remotely,
+@@ -355,5 +354,4 @@ setup(
+             'psutil',
+         ]
+     },
+-    setup_requires=['setuptools_scm'],
+ )
diff --git a/main/rdiff-backup/0003-fix-version.patch b/main/rdiff-backup/0003-fix-version.patch
new file mode 100644
index 00000000000..510faecc7a7
--- /dev/null
+++ b/main/rdiff-backup/0003-fix-version.patch
@@ -0,0 +1,11 @@
+diff --git a/setup.cfg b/setup.cfg
+index 8bfd5a1..ed1b664 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,3 +1,6 @@
++[metadata]
++version = %%PKGVER%%
++
+ [egg_info]
+ tag_build = 
+ tag_date = 0
diff --git a/main/rdiff-backup/APKBUILD b/main/rdiff-backup/APKBUILD
index e590492157d..616bfe7a4fc 100644
--- a/main/rdiff-backup/APKBUILD
+++ b/main/rdiff-backup/APKBUILD
@@ -1,34 +1,50 @@
 # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com>
 # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com>
 pkgname=rdiff-backup
-pkgver=2.0.0
-pkgrel=0
+pkgver=2.2.6
+pkgrel=1
 pkgdesc="Reverse differential backup tool"
-options="!check" # Requires unpacakged 'xattr'
+# Requires unpackaged 'xattr'
+options="!check"
 url="https://rdiff-backup.net/"
 arch="all"
 license="GPL-2.0-or-later"
-makedepends="librsync-dev python3-dev py3-setuptools"
+depends="python3 py3-yaml"
+makedepends="
+	librsync-dev
+	python3-dev
+	py3-gpep517
+	py3-setuptools
+	py3-wheel
+	"
 subpackages="
+	$pkgname-pyc
 	$pkgname-doc
-	$pkgname-bash-completion:bashcomp:noarch
+	$pkgname-bash-completion
+	"
+source="https://github.com/rdiff-backup/rdiff-backup/releases/download/v$pkgver/rdiff-backup-$pkgver.tar.gz
+	0002-remove-setuptools_scm.patch
+	0003-fix-version.patch
 	"
-source="https://github.com/rdiff-backup/rdiff-backup/releases/download/v$pkgver/rdiff-backup-$pkgver.tar.gz"
 
-build() {
-	python3 setup.py build
+prepare() {
+	default_prepare
+	sed -e "s/%%PKGVER%%/$pkgver/" \
+		-i setup.cfg
 }
 
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+build() {
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }
 
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
-	amove usr/share/bash-completion
+package() {
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 }
 
-sha512sums="0bf06d4eefffd41e86224d798e6ac6852ca0fd356be73d651ffaf63c37aaa043a6d22f8025619ab4a86e54f6e98e61f445ab68a6f87f4f2f48e635507ea110ec  rdiff-backup-2.0.0.tar.gz"
+sha512sums="
+7370dcbb71f087252f8c599b0fbf58260ec7e026e023648bfab63c39b062120862ab8b60173e2bf2352e16d404bb561c72fe19aa9aed9d49cff56225b91f5c63  rdiff-backup-2.2.6.tar.gz
+01014af9e1c562398b153900fe2db3e429408ce75dd72211121277d3f1b9133416f4ed4adedfe9d1da0a26fdb12c6c59f152cb02a717bf96bf61c64ef25f8586  0002-remove-setuptools_scm.patch
+236314c5d51d600abbfb55f084b47e0d60e3182be69803bb0abeff50e0d8750ab29b603abbf39b1a6aa94fe7a6593e121abb330bb8a348fcc27c7a0c3f4bed0b  0003-fix-version.patch
+"
diff --git a/main/rdiff-backup/rdiff-backup-1.2.8-librsync-1.0.0.patch b/main/rdiff-backup/rdiff-backup-1.2.8-librsync-1.0.0.patch
deleted file mode 100644
index ce23c8a8124..00000000000
--- a/main/rdiff-backup/rdiff-backup-1.2.8-librsync-1.0.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Patch by Roman Tereshonkov and Kari Hautio for rdiff-backup <= 1.2.8 to avoid a build failure with
-librsync >= 1.0.0 (which is a security bugfix release). The discussion and solution finding can be
-found at https://bugs.launchpad.net/duplicity/+bug/1416344 (for duplicity).
-
---- rdiff-backup-1.2.8/_librsyncmodule.c			2009-03-16 15:36:21.000000000 +0100
-+++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0		2015-03-02 00:54:24.000000000 +0100
-@@ -59,8 +59,13 @@
-   if (sm == NULL) return NULL;
-   sm->x_attr = NULL;
- 
-+#ifdef RS_DEFAULT_STRONG_LEN
-   sm->sig_job = rs_sig_begin((size_t)blocklen,
- 							 (size_t)RS_DEFAULT_STRONG_LEN);
-+#else
-+  sm->sig_job = rs_sig_begin((size_t)blocklen,
-+							 (size_t)8, RS_MD4_SIG_MAGIC);
-+#endif
-   return (PyObject*)sm;
- }
- 
diff --git a/main/re2c/APKBUILD b/main/re2c/APKBUILD
index 9bcbeb4fc84..6f5fb03118f 100644
--- a/main/re2c/APKBUILD
+++ b/main/re2c/APKBUILD
@@ -1,17 +1,27 @@
 # Contributor: Jeff Bilyk <jbilyk at gmail>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=re2c
-pkgver=1.3
+pkgver=3.1
 pkgrel=0
-pkgdesc="A tool for writing fast and flexible scanners in C from regular expressions"
+pkgdesc="Lexer generator for C, C++ and Go"
 url="http://www.re2c.org"
 arch="all"
 license="Public-Domain"
-checkdepends="bash"
+makedepends="python3"
 subpackages="$pkgname-doc"
 source="https://github.com/skvadrik/re2c/releases/download/$pkgver/re2c-$pkgver.tar.xz"
 
+# secfixes:
+#   1.3-r1:
+#     - CVE-2020-11958
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
+
 build() {
+	CXXFLAGS="$CXXFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,11 +33,13 @@ build() {
 }
 
 check() {
-	make tests
+	make check
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c7084ab2399fb6b96cef74c1393715d90830f43b82b96af46feb71ef008c0215381c3dbea0b003ff810d869db6021e28001b9d588ad55c616642244b2da09c0e  re2c-1.3.tar.xz"
+sha512sums="
+649c5e103f8012e2717a0c36af135601dfa0a090c3e400bbf466537e7038ad73bc9e0ed36c3717b7c3c785c24ad024d40c7c31998325a14caf4984c4f19cd998  re2c-3.1.tar.xz
+"
diff --git a/main/readline/APKBUILD b/main/readline/APKBUILD
index a3cb80f55b1..21908b9a6bd 100644
--- a/main/readline/APKBUILD
+++ b/main/readline/APKBUILD
@@ -1,23 +1,29 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=readline
-pkgver=8.0.4
+pkgver=8.2.10
 pkgrel=0
 _myver=${pkgver%.*}
 pkgdesc="GNU readline library"
 url="https://tiswww.cwru.edu/php/chet/readline/rltop.html"
 arch="all"
 options="!check"
-license="GPL-2.0-or-later"
+license="GPL-3.0-or-later"
 makedepends_host="ncurses-dev chrpath"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc libhistory"
 source="https://ftp.gnu.org/gnu/readline/readline-$_myver.tar.gz
 	fix-ncurses-underlinking.patch
+	fix-rl_do_undo-crash.patch
 	inputrc
 	"
+patch_args="-p0" # patchlevel used by upstream patches
 
-for _patch in $(seq -w 001 ${pkgver##*.}); do
+_i=1
+while [ $_i -le ${pkgver##*.} ]; do
+	_patch=$(printf "%03d" $_i)
 	_name=$pkgname${_myver//./}-$_patch
-	source="$source $_name.diff::https://ftp.gnu.org/gnu/$pkgname/$pkgname-$_myver-patches/$_name"
+	source="$source
+		$_name.patch::https://ftp.gnu.org/gnu/readline/readline-$_myver-patches/$_name"
+	_i=$((_i+1))
 done
 
 builddir="$srcdir/$pkgname-$_myver"
@@ -36,27 +42,35 @@ build() {
 
 package() {
 	make -C "$builddir" DESTDIR="$pkgdir" install
-	# verfy that its not underlinked as upstream designed it
+	# verify that it is not underlinked as upstream designed it
 	if ! readelf -d "$pkgdir"/usr/lib/libreadline.so | grep -q 'NEEDED.*ncurses'; then
 		error "readline needs to be linked against ncurses"
 		return 1
 	fi
 	rmdir "$pkgdir"/usr/bin
-	mkdir -p "$pkgdir"/etc
-	install -m644 "$srcdir"/inputrc "$pkgdir"/etc/inputrc
+	install -Dm644 "$srcdir"/inputrc "$pkgdir"/etc/inputrc
 	chrpath -d "$pkgdir"/usr/lib/*.so.*
 }
 
 libhistory() {
 	pkgdesc="GNU History Library"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/$subpkgname.* "$subpkgdir"/usr/lib
+
+	amove usr/lib/libhistory.so.*
 }
 
-sha512sums="41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f  readline-8.0.tar.gz
-325dcf74e9f463a74fb116cb6f3ff8d9708dbec24b423a778eeda3a5ac4fe6df131e0e99d034053ad356b01502894ecc8facc09160d4c29b2291bd95cff6b635  fix-ncurses-underlinking.patch
+sha512sums="
+0a451d459146bfdeecc9cdd94bda6a6416d3e93abd80885a40b334312f16eb890f8618a27ca26868cebbddf1224983e631b1cbc002c1a4d1cd0d65fba9fea49a  readline-8.2.tar.gz
+b8e2f9a5c9294b49d35c2e1bbde523f01390dd3c8729f3a78e79799a236515ec723af795ba91b0a662a30e8c31df0f63bc80771e82cd31b4673f41428a5049ae  fix-ncurses-underlinking.patch
+ddb9308005996106c4bc369ed5726c2479aeb73287ef30a1dc4d6c54fad78f8b1ea46d89b75bd7b00c54acd0ee0d9d17debf922e2260caea2df212e2f9d5109e  fix-rl_do_undo-crash.patch
 5dbe872e94166aaed7ca2edec5a34ef9b13b254381e252cc6d851877b461579903cbb5b5dc588eabececcf1ebe636f6cb4da406cd01b64757f8c7e7f62e9a276  inputrc
-a148cda6ac97935d51ede1bbacf847d7d2cba8861cf3941d32e3da2f45f16dcc05b20845b63d4264692520db8329e1236cf2bc4fd8ccbe6e40921bbbdeb2cb1c  readline80-001.diff
-a941d142a59fe592cc45c1cf4d416e2fc0ab543dd6a0496fb8b2ec6f651cedd6fb9e0c105f14880700b69b2d6912653b3f66371e45cbe4adc0cc9554801afd3c  readline80-002.diff
-85235fca047b4ac87b846d998fffc67ae67ed365b068fd2743e84f11fd00086f85e622955192e07e3560965e32ff5f6d014e0146cde528fb0d0f7b5b829875ca  readline80-003.diff
-301ced2361e7583468f9932038936387a016c20d1c41966658a78c7f7c48c70308bf66b3228de0a3c6fc880427b6a90ee1ac4d2693daed432e5ae970671a7461  readline80-004.diff"
+ea3800a62e992b3e594d78e77b6c4b662fb8c501b81010277e478656bb3b56db7747ba40c6c3d68c3ec5ab8e9e41be104788ec52268135d7e642ff40dea421a8  readline82-001.patch
+2d4058c5c886498486d8514c238c0a05c0a97409011a7da40745e842977f0a29754e8b678f7e6e7a47c00df7e2e4c522d34d473118a24524af3824eed912e74a  readline82-002.patch
+796df5a5bc4fc4077158621ac5359a7ccf81261e55880e6e70577ba24b50bd4fce4f2c70521d69a776f6ae8890d14d4f5c95cb9ba7c10f1065978c70626faeab  readline82-003.patch
+dc5e4cb6b7a058f433c9c6a587772a4c63e0aeef9c59f45f3f859a007cdbaa46dfd560c43cfe51b9c5c0a3a4d662c100540afc6026b2f8544984867ea3b52661  readline82-004.patch
+f20bcea5ce592edd0e41e0d725611ce536ceffc9ab176511ba6786ae802160b277c412ccbb2ce175da656bdfe5f0fd3f3ace11752cf1a152abff64c90f67a53a  readline82-005.patch
+0a2737b2e566fafd60da8c0c7abcbaef24139165fb62a422d257b4cf38835b1e9b7a639c9e64228bbaac432d6a9ce62363b134284e55f3473df788f6433fbe63  readline82-006.patch
+e96dafe28f20b1092af08422b9be99965e3a973a0c19f7c57669a6a7fbf74ad4cc3490fa2ad50a1845644a65b0a0e001cfc7ad29528b3b36827a1b9a2c9a96e7  readline82-007.patch
+a92a00a6b6fefc576ef26cf7522525ac99c1a05de510ca8bd5a72a6db40fb4dc5c277931efa1f4a91e7cf72c9da5287bb14bfa8f0668d36bec40e3ccd7cbe418  readline82-008.patch
+57c084c6186befac58a3432c483c9f879cd199d6947ad7dd29f0d60e67ae4ddf5ee8d861b0231b41582868dd6556ae2dda95a849caf11cbd3692fcd2f8663452  readline82-009.patch
+b611b42e31601ea5fcd7de59e6c1cdd3fece7cc8287e0e495ddfc4d5e8f765b3c6567b728fe0a317d6cb00240b772fa4c26f374c8bf361355a9d262bc5133874  readline82-010.patch
+"
diff --git a/main/readline/fix-ncurses-underlinking.patch b/main/readline/fix-ncurses-underlinking.patch
index 2c3c823d384..b33ff14cc73 100644
--- a/main/readline/fix-ncurses-underlinking.patch
+++ b/main/readline/fix-ncurses-underlinking.patch
@@ -1,5 +1,5 @@
---- ./shlib/Makefile.in.orig
-+++ ./shlib/Makefile.in
+--- shlib/Makefile.in.orig
++++ shlib/Makefile.in
 @@ -86,7 +86,7 @@
  SHOBJ_LIBS = @SHOBJ_LIBS@
  
diff --git a/main/readline/fix-rl_do_undo-crash.patch b/main/readline/fix-rl_do_undo-crash.patch
new file mode 100644
index 00000000000..513c8b144a9
--- /dev/null
+++ b/main/readline/fix-rl_do_undo-crash.patch
@@ -0,0 +1,127 @@
+Patch-Source: https://sources.debian.org/data/main/r/readline/8.2-3/debian/patches/fix-rl_do_undo-crash.diff
+
+https://git.savannah.gnu.org/cgit/bash.git/patch/?id=277c21d2b2c6730f6cbda428180b08bacdcecc80
+
+From 277c21d2b2c6730f6cbda428180b08bacdcecc80 Mon Sep 17 00:00:00 2001
+From: Chet Ramey <chet.ramey@case.edu>
+Date: Mon, 6 Mar 2023 10:50:45 -0500
+Subject: readline fix for rl_undo_list pointer aliasing; arith command sets
+ word_top
+
+--- histlib.h
++++ histlib.h
+@@ -1,6 +1,6 @@
+ /* histlib.h -- internal definitions for the history library. */
+ 
+-/* Copyright (C) 1989-2009,2021-2022 Free Software Foundation, Inc.
++/* Copyright (C) 1989-2009,2021-2023 Free Software Foundation, Inc.
+ 
+    This file contains the GNU History Library (History), a set of
+    routines for managing the text of previously typed lines.
+@@ -84,6 +84,7 @@ extern int _hs_history_patsearch (const
+ 
+ /* history.c */
+ extern void _hs_replace_history_data (int, histdata_t *, histdata_t *);
++extern int _hs_search_history_data (histdata_t *);
+ extern int _hs_at_end_of_history (void);
+ 
+ /* histfile.c */
+--- history.c
++++ history.c
+@@ -1,6 +1,6 @@
+ /* history.c -- standalone history library */
+ 
+-/* Copyright (C) 1989-2021 Free Software Foundation, Inc.
++/* Copyright (C) 1989-2023 Free Software Foundation, Inc.
+ 
+    This file contains the GNU History Library (History), a set of
+    routines for managing the text of previously typed lines.
+@@ -460,7 +460,7 @@ _hs_replace_history_data (int which, his
+     }
+ 
+   last = -1;
+-  for (i = 0; i < history_length; i++)
++  for (i = history_length - 1; i >= 0; i--)
+     {
+       entry = the_history[i];
+       if (entry == 0)
+@@ -477,7 +477,27 @@ _hs_replace_history_data (int which, his
+       entry = the_history[last];
+       entry->data = new;	/* XXX - we don't check entry->old */
+     }
+-}      
++}
++
++int
++_hs_search_history_data (histdata_t *needle)
++{
++  register int i;
++  HIST_ENTRY *entry;
++
++  if (history_length == 0 || the_history == 0)
++    return -1;
++
++  for (i = history_length - 1; i >= 0; i--)
++    {
++      entry = the_history[i];
++      if (entry == 0)
++	continue;
++      if (entry->data == needle)
++	return i;
++    }
++  return -1;
++}
+   
+ /* Remove history element WHICH from the history.  The removed
+    element is returned to you so you can free the line, data,
+--- misc.c
++++ misc.c
+@@ -339,6 +339,9 @@ rl_maybe_replace_line (void)
+       xfree (temp->line);
+       FREE (temp->timestamp);
+       xfree (temp);
++      /* XXX - what about _rl_saved_line_for_history? if the saved undo list
++	 is rl_undo_list, and we just put that into a history entry, should
++	 we set the saved undo list to NULL? */
+     }
+   return 0;
+ }
+@@ -386,14 +389,16 @@ _rl_free_saved_history_line (void)
+ 
+   if (_rl_saved_line_for_history)
+     {
+-      if (rl_undo_list && rl_undo_list == (UNDO_LIST *)_rl_saved_line_for_history->data)
+-	rl_undo_list = 0;
+-      /* Have to free this separately because _rl_free_history entry can't:
+-	 it doesn't know whether or not this has application data. Only the
+-	 callers that know this is _rl_saved_line_for_history can know that
+-	 it's an undo list. */
+-      if (_rl_saved_line_for_history->data)
+-	_rl_free_undo_list ((UNDO_LIST *)_rl_saved_line_for_history->data);
++      UNDO_LIST *sentinel;
++
++      sentinel = (UNDO_LIST *)_rl_saved_line_for_history->data;
++
++      /* We should only free `data' if it's not the current rl_undo_list and
++	 it's not the `data' member in a history entry somewhere. We have to
++	 free it separately because only the callers know it's an undo list. */
++      if (sentinel && sentinel != rl_undo_list && _hs_search_history_data ((histdata_t *)sentinel) < 0)
++	_rl_free_undo_list (sentinel);
++
+       _rl_free_history_entry (_rl_saved_line_for_history);
+       _rl_saved_line_for_history = (HIST_ENTRY *)NULL;
+     }
+--- search.c
++++ search.c
+@@ -88,8 +88,10 @@ make_history_line_current (HIST_ENTRY *e
+ 
+   xlist = _rl_saved_line_for_history ? (UNDO_LIST *)_rl_saved_line_for_history->data : 0;
+   /* At this point, rl_undo_list points to a private search string list. */
+-  if (rl_undo_list && rl_undo_list != (UNDO_LIST *)entry->data && rl_undo_list != xlist)
++  if (rl_undo_list && rl_undo_list != (UNDO_LIST *)entry->data && rl_undo_list != xlist &&
++	_hs_search_history_data ((histdata_t *)rl_undo_list) < 0)
+     rl_free_undo_list ();
++  rl_undo_list = 0;	/* XXX */
+ 
+   /* Now we create a new undo list with a single insert for this text.
+      WE DON'T CHANGE THE ORIGINAL HISTORY ENTRY UNDO LIST */
diff --git a/main/redis/APKBUILD b/main/redis/APKBUILD
index a81e993c658..b6b9fb91d1b 100644
--- a/main/redis/APKBUILD
+++ b/main/redis/APKBUILD
@@ -2,20 +2,20 @@
 # Contributor: Eivind Uggedal <eu@eju.no>
 # Maintainer: TBK <alpine@jjtc.eu>
 pkgname=redis
-pkgver=5.0.8
-pkgrel=0
+# CAUTION: Do not upgrade to 7.3+ (non-free license).
+pkgver=7.2.4
+pkgrel=1
 pkgdesc="Advanced key-value store"
 url="https://redis.io/"
 arch="all"
 license="BSD-3-Clause"
 pkgusers="redis"
 pkggroups="redis"
-makedepends="linux-headers"
+makedepends="linux-headers openssl-dev>3"
 checkdepends="tcl procps"
 install="$pkgname.pre-install $pkgname.post-install"
 subpackages="$pkgname-openrc"
-source="http://download.redis.io/releases/redis-$pkgver.tar.gz
-	makefile-dont-duplicate-binary.patch
+source="https://download.redis.io/releases/redis-$pkgver.tar.gz
 	redis.conf.patch
 	sentinel.conf.patch
 	$pkgname.initd
@@ -23,44 +23,66 @@ source="http://download.redis.io/releases/redis-$pkgver.tar.gz
 	$pkgname-sentinel.initd
 	$pkgname.logrotate
 	"
-builddir="$srcdir/$pkgname-$pkgver"
 
 # secfixes:
+#   7.2.4-r0:
+#     - CVE-2023-41056
+#   7.2.2-r0:
+#     - CVE-2023-45145
+#   7.2.1-r0:
+#     - CVE-2023-41053
+#   7.0.12-r0:
+#     - CVE-2022-24834
+#     - CVE-2023-36824
+#   7.0.8-r0:
+#     - CVE-2022-35977
+#     - CVE-2023-22458
+#   7.0.6-r0:
+#     - CVE-2022-3647
+#   7.0.5-r0:
+#     - CVE-2022-35951
+#   7.0.4-r0:
+#     - CVE-2022-31144
+#   6.2.7-r0:
+#     - CVE-2022-24735
+#     - CVE-2022-24736
+#   6.2.6-r0:
+#     - CVE-2021-32626
+#     - CVE-2021-32627
+#     - CVE-2021-32628
+#     - CVE-2021-32672
+#     - CVE-2021-32675
+#     - CVE-2021-32687
+#     - CVE-2021-32762
+#     - CVE-2021-41099
+#   6.2.5-r0:
+#     - CVE-2021-32761
+#   6.2.4-r0:
+#     - CVE-2021-32625
+#   6.2.0-r0:
+#     - CVE-2021-21309
+#     - CVE-2021-3470
+#   6.0.3-r0:
+#     - CVE-2020-14147
 #   5.0.8-r0:
 #     - CVE-2015-8080
 #   5.0.4-r0:
 #     - CVE-2019-10192
 #     - CVE-2019-10193
 
-prepare() {
-	default_prepare
-	cd "$builddir"
-
-	# Disable broken tests:
-	# integration/logging.tcl is not working because musl does not provide BACKTRACE like glibc
-	# https://github.com/antirez/redis/blob/5.0.4/src/config.h#L64-L67
-	sed -i -e '/integration\/logging/d' \
-		tests/test_helper.tcl
-}
-
 build() {
-	cd "$builddir"
-	case "$CARCH" in mips|mipsel*) _libatomic="-latomic";; esac
-	make PREFIX=/usr \
-		INSTALL_BIN="$pkgdir"/usr/bin \
+	export CFLAGS="$CFLAGS -DUSE_MALLOC_USABLE_SIZE -O2 -flto=auto"
+	make USE_JEMALLOC=no \
 		MALLOC=libc \
-		FINAL_LIBS="-lm -ldl -pthread $_libatomic" \
+		BUILD_TLS=yes \
 		all
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
-
 	make install PREFIX=/usr INSTALL_BIN="$pkgdir/usr/bin"
 
 	cd "$pkgdir"
@@ -80,11 +102,12 @@ package() {
 		var/log/redis
 }
 
-sha512sums="106a74ab910267472fb418fdeb4f39e29efe9d73ed5af78b7847c91eaabd473dd729a63078e72d8e87c842169502946e9a0a97c42dea415db82732864c7c46dc  redis-5.0.8.tar.gz
-0bfe894843a0b0b1800c5ff1c570cbc631d0bf94e5911210ae8780f57e661c8a61bb7309181fb8492392747deb340025a5380db168418aaf46b273a8120a4169  makefile-dont-duplicate-binary.patch
-c8a35e3c30be99fef8678acb2502f424bcca478dcc1ef1750f8c8c8e9e9c462f97586159f32ebba84b6a4eb398a9d568e3200241fb0de1f96293c9fdaafb06c9  redis.conf.patch
-e8cd03ab08b354d7d852cc43719ef537586c024f3911e27f0be052de471d3e6c1af947313ba0b045af3f2212afd41eb0cd4e0464cc6568853cfbfd4718b09fa5  sentinel.conf.patch
+sha512sums="
+78590fb6680f229905c240ed8ce7a9a7153e5f8563577dbbb26aebf9bfbdcd7495d687f452bd95e0a86c76d772e1c497b506cf8d29bc97b62c9267f7d1e76f72  redis-7.2.4.tar.gz
+7725486329f2aba8fe03a768f6d8ab78cc96ab6f2ca403af56c252ef7978f7628b580587b372969ca5dd6257780ef58571ce6dc5aca468c3b2a299033b41047f  redis.conf.patch
+a5dc411c2bd7edf61400e29accb375275dd888fda72a8f7e3889be475010c695a22f536be818ef9441e47285c00b451966db924362a7f56806586078c9e3ff8c  sentinel.conf.patch
 f6dcdad1edd6b5fb6aa28ba774bfc8aba035f316695da261fb2ad291b76f00f177479f9d74434d06c26bd15f131edc9a2f55c9880758cf0987800d2031069738  redis.initd
 6752e99df632b14d62a3266929e80c3d667be5c270e4f34e0dcf2b7f9b1754fe0ce9d4569fa413dbbe207e406ff2848a64e0c47629997536ae1d14ca84ebd56b  redis.confd
 e7a60a090df53eef05d58d73709f07536135a93efb34e48ad933e3859d3d1c0f476975a3232df18f57476bf7fc3b0548471e1c86445878457ac8507b3da71384  redis-sentinel.initd
-bf2def2077a989047e9bfff8a7f754bcdf96e020fd4a470f8967ee1fca601e11f044cfb3742f00e932cc013e0d0b199045d78c8878a0e529715c9f77786d353f  redis.logrotate"
+bf2def2077a989047e9bfff8a7f754bcdf96e020fd4a470f8967ee1fca601e11f044cfb3742f00e932cc013e0d0b199045d78c8878a0e529715c9f77786d353f  redis.logrotate
+"
diff --git a/main/redis/makefile-dont-duplicate-binary.patch b/main/redis/makefile-dont-duplicate-binary.patch
deleted file mode 100644
index 085fcc4cc72..00000000000
--- a/main/redis/makefile-dont-duplicate-binary.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-redis-check-rdb and redis-check-aof binaries are identical to redis-server.
-
-See https://github.com/antirez/redis/pull/3494
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -307,9 +307,9 @@
- 	$(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_BIN)
- 	$(REDIS_INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN)
- 	$(REDIS_INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN)
--	$(REDIS_INSTALL) $(REDIS_CHECK_RDB_NAME) $(INSTALL_BIN)
--	$(REDIS_INSTALL) $(REDIS_CHECK_AOF_NAME) $(INSTALL_BIN)
- 	@ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME)
-+	@ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_RDB_NAME)
-+	@ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_AOF_NAME)
- 
- uninstall:
- 	rm -f $(INSTALL_BIN)/{$(REDIS_SERVER_NAME),$(REDIS_BENCHMARK_NAME),$(REDIS_CLI_NAME),$(REDIS_CHECK_RDB_NAME),$(REDIS_CHECK_AOF_NAME),$(REDIS_SENTINEL_NAME)}
diff --git a/main/redis/redis.conf.patch b/main/redis/redis.conf.patch
index 282a6a7f006..a28e21fffcd 100644
--- a/main/redis/redis.conf.patch
+++ b/main/redis/redis.conf.patch
@@ -7,31 +7,32 @@ convenient to have it enabled by default.
 
 --- a/redis.conf
 +++ b/redis.conf
-@@ -106,8 +106,8 @@
+@@ -112,8 +112,8 @@
  # incoming connections. There is no default, so Redis will not listen
  # on a unix socket when not specified.
  #
--# unixsocket /tmp/redis.sock
+-# unixsocket /run/redis.sock
 -# unixsocketperm 700
 +unixsocket /run/redis/redis.sock
 +unixsocketperm 770
  
  # Close the connection after a client is idle for N seconds (0 to disable)
  timeout 0
-@@ -131,10 +131,6 @@
+@@ -241,11 +241,6 @@
  
  ################################# GENERAL #####################################
  
 -# By default Redis does not run as a daemon. Use 'yes' if you need it.
 -# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+-# When Redis is supervised by upstart or systemd, this parameter has no impact.
 -daemonize no
 -
  # If you run Redis from upstart or systemd, Redis can interact with your
  # supervision tree. Options:
  #   supervised no      - no supervision interaction
-@@ -146,17 +142,6 @@
- #       They do not enable continuous liveness pings back to your supervisor.
- supervised no
+@@ -264,20 +259,6 @@
+ #
+ # supervised auto
  
 -# If a pid file is specified, Redis writes it where specified at startup
 -# and removes it at exit.
@@ -42,12 +43,15 @@ convenient to have it enabled by default.
 -#
 -# Creating a pid file is best effort: if Redis is not able to create it
 -# nothing bad happens, the server will start and run normally.
+-#
+-# Note that on modern Linux systems "/run/redis.pid" is more conforming
+-# and should be used instead.
 -pidfile /var/run/redis_6379.pid
 -
  # Specify the server verbosity level.
  # This can be one of:
  # debug (a lot of information, useful for development/testing)
-@@ -168,7 +153,7 @@
+@@ -289,7 +270,7 @@
  # Specify the log file name. Also the empty string can be used to force
  # Redis to log on the standard output. Note that if you use standard
  # output for logging but daemonize, logs will be sent to /dev/null
@@ -56,16 +60,7 @@ convenient to have it enabled by default.
  
  # To enable logging to the system logger, just set 'syslog-enabled' to yes,
  # and optionally update the other syslog parameters to suit your needs.
-@@ -191,7 +176,7 @@
- #
- # However it is possible to force the pre-4.0 behavior and always show a
- # ASCII art logo in startup logs by setting the following option to yes.
--always-show-logo yes
-+always-show-logo no
- 
- ################################ SNAPSHOTTING  ################################
- #
-@@ -260,7 +245,7 @@
+@@ -441,7 +422,7 @@
  # The Append Only File will also be created inside this directory.
  #
  # Note that you must specify a directory here, not a file name.
diff --git a/main/redis/redis.pre-install b/main/redis/redis.pre-install
index f7321312665..22622e58400 100644
--- a/main/redis/redis.pre-install
+++ b/main/redis/redis.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S redis 2>/dev/null
-adduser -S -D -H -h /var/lib/redis -s /bin/false -G redis -g redis redis 2>/dev/null
+adduser -S -D -H -h /var/lib/redis -s /sbin/nologin -G redis -g redis redis 2>/dev/null
 
 exit 0
diff --git a/main/redis/sentinel.conf.patch b/main/redis/sentinel.conf.patch
index 4938eb3522e..9c18168bad7 100644
--- a/main/redis/sentinel.conf.patch
+++ b/main/redis/sentinel.conf.patch
@@ -1,3 +1,5 @@
+Upstream: No
+Reason: Hardcode log file path
 --- a/sentinel.conf
 +++ b/sentinel.conf
 @@ -33,7 +33,7 @@
diff --git a/main/restool/APKBUILD b/main/restool/APKBUILD
new file mode 100644
index 00000000000..ad48197a3f9
--- /dev/null
+++ b/main/restool/APKBUILD
@@ -0,0 +1,27 @@
+# Contributor: Ariadne Conill <ariadne@dereferenced.org>
+# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
+pkgname=restool
+pkgver=2.3.0
+pkgrel=0
+pkgdesc="configuration tool for DPAA2 management complex"
+url="https://source.codeaurora.org/external/qoriq/qoriq-components/restool"
+arch="aarch64"
+license="BSD-3-Clause OR GPL-2.0-or-later"
+makedepends="coreutils linux-headers"
+subpackages="$pkgname-bash-completion"
+source="https://dev.alpinelinux.org/~nenolod/restool-$pkgver.tar.xz
+	no-manpage.patch"
+options="!check" # No test suite.
+
+build() {
+	make MANPAGE=
+}
+
+package() {
+	make MANPAGE= DESTDIR="$pkgdir" prefix="/usr" install
+}
+
+sha512sums="
+ab538bdc5e71616b1d028d6ad576fef80b53effdb31e5f1c681c6b1179bbd8ccb3aafbe634201f71fcc41c85614586549b1fe587cc8396cda252a8af1b0b73cd  restool-2.3.0.tar.xz
+621ff51b740fee17298974ba9922a4b631151c6f0222435a61c559d96166e22c644fcedfc7f246fd29be0fa5f67dd7308b457b94e28edb10ca53a680426f909e  no-manpage.patch
+"
diff --git a/main/restool/no-manpage.patch b/main/restool/no-manpage.patch
new file mode 100644
index 00000000000..b1f5c463c1d
--- /dev/null
+++ b/main/restool/no-manpage.patch
@@ -0,0 +1,10 @@
+--- restool-2.4.0.orig/Makefile
++++ restool-2.4.0/Makefile
+@@ -62,7 +62,6 @@
+ 	install -D -m 755 scripts/ls-debug $(DESTDIR)$(bindir)/ls-debug
+ 	$(foreach symlink, $(RESTOOL_SCRIPT_SYMLINKS), sh -c "cd $(DESTDIR)$(bindir) && ln -sf ls-main $(symlink)" ;)
+ 	install -D -m 755 scripts/restool_completion.sh $(DESTDIR)$(bindir_completion)/restool
+-	install -m 0644 -D $(MANPAGE) $(call get_manpage_destination,$(MANPAGE))
+ 
+ clean:
+ 	rm -f $(OBJ) $(MANPAGE) \
diff --git a/main/rgb/APKBUILD b/main/rgb/APKBUILD
index 23ca4b04d12..a2895b026b6 100644
--- a/main/rgb/APKBUILD
+++ b/main/rgb/APKBUILD
@@ -1,19 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rgb
-pkgver=1.0.6
-pkgrel=2
+pkgver=1.1.0
+pkgrel=5
 pkgdesc="X.org utility to display an RGB color-name database"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="all"
 options="!check"  # No tests.
 license="MIT"
 subpackages="$pkgname-doc"
-depends=
-makedepends="xorgproto"
-source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
+makedepends="util-macros xorgproto"
+source="https://www.x.org/releases/individual/app/rgb-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,7 +21,9 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e  rgb-1.0.6.tar.bz2"
+
+sha512sums="
+640888d64b2d328fff4a1652ba1299436e348bc3cbc90710d79c635acfa7f2fce0018adb818123b41ca008197ff1cbf87aab60501de36c163bed2d80d8556008  rgb-1.1.0.tar.xz
+"
diff --git a/main/rhash/APKBUILD b/main/rhash/APKBUILD
index da59e0342eb..63678d02679 100644
--- a/main/rhash/APKBUILD
+++ b/main/rhash/APKBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Przemyslaw Pawelczyk <przemoc@zoho.com>
 pkgname=rhash
-pkgver=1.3.9
-pkgrel=1
+pkgver=1.4.4
+pkgrel=0
 pkgdesc="Utility for calculation and verification of hash sums and magnet links"
 url="http://rhash.anz.ru"
 arch="all"
 license="0BSD"
-makedepends="openssl-dev"
+makedepends="openssl-dev>3"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-libs"
-source="https://downloads.sourceforge.net/rhash/rhash-$pkgver-src.tar.gz
-	byteorder.patch"
+source="https://downloads.sourceforge.net/rhash/rhash-$pkgver-src.tar.gz"
 builddir="$srcdir/RHash-$pkgver"
 
 build() {
+	# not autotools
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -22,14 +22,13 @@ build() {
 }
 
 check() {
-	make -C "$builddir" test-shared
+	make test-shared
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
-	make DESTDIR="$pkgdir" \
-		install-lib-headers install-lib-shared install-lib-so-link
+	make -j1 DESTDIR="$pkgdir" install install-lib-headers install-lib-shared install-lib-so-link
 }
 
-sha512sums="6fae0587cdeb42df59d542c58bad734259d1ff39fba92531c10a469b51310644669ffbe0453e72d85c2cf38b176962f6dca9062a121ac019f1b30f207a176e60  rhash-1.3.9-src.tar.gz
-a216a7cf5e1ea5fcb7b574a57bb8137e3dc0251bdefb2c30aacba08c54079d61a595c8c5636687c70e14724efa3a4b9ca7d9f98d9170eaa66ccb278834cf56d5  byteorder.patch"
+sha512sums="
+00a7e5e058b53ce20ae79509815452ed9cb699d1322b678220b72c61dea3ea2f8fa131acfade8bb6d9f6af913f0c3c472330841181b22314b8755166310c946f  rhash-1.4.4-src.tar.gz
+"
diff --git a/main/rhash/byteorder.patch b/main/rhash/byteorder.patch
deleted file mode 100644
index a0cb83d6bcb..00000000000
--- a/main/rhash/byteorder.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/librhash/byte_order.h b/librhash/byte_order.h
-index 1ea1096..b248b57 100644
---- a/librhash/byte_order.h
-+++ b/librhash/byte_order.h
-@@ -4,7 +4,7 @@
- #include "ustd.h"
- #include <stdlib.h>
- 
--#if defined(__GLIBC__)
-+#if defined(__linux__)
- # include <endian.h>
- #endif
- #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__APPLE__)
diff --git a/main/rlog/APKBUILD b/main/rlog/APKBUILD
index 404dbb3c5e0..ce9715ef654 100644
--- a/main/rlog/APKBUILD
+++ b/main/rlog/APKBUILD
@@ -2,43 +2,32 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rlog
 pkgver=1.4
-pkgrel=4
+pkgrel=7
 pkgdesc="A flexible message logging facility for C++ programs and libraries."
-url="http://www.arg0.net/rlog"
+url="https://code.google.com/archive/p/rlog/"
 arch="all"
-license="LGPL"
-depends=""
-depends_dev=""
-makedepends=""
-install=""
+license="LGPL-2.1-or-later"
+options="!check" # no testsuite
 subpackages="$pkgname-doc $pkgname-dev"
 source="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/rlog/rlog-$pkgver.tar.gz"
 
-_builddir=${srcdir}/${pkgname}-${pkgver}
 prepare() {
-	local i
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
-		|| return 1
+		--prefix=/usr
 	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="${pkgdir}/" install
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a0af9afd6c5329ec4269a7778c3236b9e0b438cba65ed0a6f9cd7e802d196b7908eed5ab663f52905869cacffc7f1964b20ab2a53b37dbe65f1c8a9226cc423e  rlog-1.4.tar.gz"
+sha512sums="
+a0af9afd6c5329ec4269a7778c3236b9e0b438cba65ed0a6f9cd7e802d196b7908eed5ab663f52905869cacffc7f1964b20ab2a53b37dbe65f1c8a9226cc423e  rlog-1.4.tar.gz
+"
diff --git a/main/rng-tools/01-fix-ignorefail.patch b/main/rng-tools/01-fix-ignorefail.patch
new file mode 100644
index 00000000000..9e5c7cb4f19
--- /dev/null
+++ b/main/rng-tools/01-fix-ignorefail.patch
@@ -0,0 +1,27 @@
+From: Dermot Bradley <dermot_bradley@yahoo.com>
+Date: Mon, 10 Apr 2023 14:25 +0100
+
+When -i used, the fips_run_rng_test() should not be called in
+update_kernel_random().
+
+Upstream PR #189, already merged in master.
+
+---
+
+diff -aur a/rngd.c b/rngd.c
+--- a/rngd.c
++++ b/rngd.c
+@@ -728,10 +728,11 @@
+ 	unsigned char *buf, fips_ctx_t *fipsctx_in)
+ {
+ 	unsigned char *p;
+-	int fips;
++	int fips = 0;
+ 	int rc;
+ 
+-	fips = fips_run_rng_test(fipsctx_in, buf);
++	if (!arguments->ignorefail)
++		fips = fips_run_rng_test(fipsctx_in, buf);
+ 	if (fips && !arguments->ignorefail)
+ 		return 1;
+ 
diff --git a/main/rng-tools/02-fix-random_step-boundary.patch b/main/rng-tools/02-fix-random_step-boundary.patch
new file mode 100644
index 00000000000..66ec854aad9
--- /dev/null
+++ b/main/rng-tools/02-fix-random_step-boundary.patch
@@ -0,0 +1,23 @@
+From: Dermot Bradley <dermot_bradley@yahoo.com>
+Date: Mon, 10 Apr 2023 14:25 +0100
+
+As buffer size in do_loop() is FIPS_RNG_BUFFER_SIZE, so the random_step
+should not bigger. If random_step > FIPS_RNG_BUFFER_SIZE,
+update_kernel_random() will not write any date.
+
+Upstream PR #190, already merged in master.
+
+---
+
+diff -aur a/rngd.c b/rngd.c
+--- a/rngd.c
++++ b/rngd.c
+@@ -623,6 +623,8 @@
+ 	case 's':
+ 		if (sscanf(arg, "%i", &arguments->random_step) == 0)
+ 			argp_usage(state);
++		if (arguments->random_step > FIPS_RNG_BUFFER_SIZE || arguments->random_step < 0)
++			arguments->random_step = FIPS_RNG_BUFFER_SIZE;
+ 		break;
+ 	case 'W': {
+ 		int n;
diff --git a/main/rng-tools/03-correct-linux-poolsize.patch b/main/rng-tools/03-correct-linux-poolsize.patch
new file mode 100644
index 00000000000..f5134164c26
--- /dev/null
+++ b/main/rng-tools/03-correct-linux-poolsize.patch
@@ -0,0 +1,55 @@
+From: Dermot Bradley <dermot_bradley@yahoo.com>
+Date: Mon, 24 Apr 2023 15:37 +0100
+
+Change the size of the Linux poolsize from 4096 to 256 to reflect
+that of modern/recent Linux kernels.
+
+Upstream PR #196 submitted.
+
+---
+
+diff -aur a/rngd.8.in b/rngd.8.in
+--- a/rngd.8.in
++++ b/rngd.8.in
+@@ -108,7 +108,7 @@
+ Setting this too high will cause \fIrngd\fR to dominate the contents of the
+ entropy pool.  Low values will hurt system performance during entropy
+ starves.  Do not set \fIfill-watermark\fR above the size of the
+-entropy pool (usually 4096 bits).  A value of 0 to this option will cause no
++entropy pool (usually 256 bits).  A value of 0 to this option will cause no
+ watermark to be set.
+ .TP
+ \fB\-R\fI n\fR, \fB\-\-force-reseed=\fInnn\fR
+diff -aur a/rngd.c b/rngd.c
+--- a/rngd.c
++++ b/rngd.c
+@@ -120,7 +120,7 @@
+ 	  "Number of bytes written to random-device at a time (default: 64)" },
+ 
+ 	{ "fill-watermark", 'W', "n", 0,
+-	  "Do not stop feeding entropy to random-device until at least n bits of entropy are available in the pool (default: 3/4 of poolsize), 0 <= n <= 4096" },
++	  "Do not stop feeding entropy to random-device until at least n bits of entropy are available in the pool (default: 3/4 of poolsize), 0 <= n <= 256" },
+ 
+ 	{ "quiet", 'q', 0, 0, "Suppress all messages" },
+ 
+@@ -628,7 +628,7 @@
+ 		break;
+ 	case 'W': {
+ 		int n;
+-		if ((sscanf(arg, "%i", &n) == 0) || (n < 0) || (n > 4096))
++		if ((sscanf(arg, "%i", &n) == 0) || (n < 0) || (n > 256))
+ 			argp_usage(state);
+ 		else
+ 			arguments->fill_watermark = n;
+diff -aur a/rngd_linux.c b/rngd_linux.c
+--- a/rngd_linux.c
++++ b/rngd_linux.c
+@@ -60,7 +60,7 @@
+  * randomdev is the path to the random device
+  */
+ 
+-#define DEFAULT_WATERMARK_GUESS 4096
++#define DEFAULT_WATERMARK_GUESS 256
+ 
+ void init_kernel_rng(const char* randomdev)
+ {
diff --git a/main/rng-tools/APKBUILD b/main/rng-tools/APKBUILD
index b2e0c36088c..3a9a58c2ddf 100644
--- a/main/rng-tools/APKBUILD
+++ b/main/rng-tools/APKBUILD
@@ -1,25 +1,59 @@
 # Contributor: Dennis Przytarski <dennis@przytarski.com>
-# Maintainer: ScrumpyJack <scrumypjack@st.ilet.to>
+# Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
+# Contributor: Dermot Bradley <dermot_bradley@yahoo.com>
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=rng-tools
-pkgver=6.9
-pkgrel=0
-pkgdesc="A random number generator daemon"
+#
+# NOTE: The package depends on jitterentropy-library and care needs to
+# be taken that both are aligned (i.e. some necessary changes in
+# *both* packages may not be released at the same time and potentially
+# upgrading rng-tools alone could break the rngd jitter functionality).
+#
+pkgver=6.16
+pkgrel=4
+pkgdesc="Random number generator daemon"
 url="https://github.com/nhorman/rng-tools"
 arch="all"
 license="GPL-2.0-or-later"
-makedepends="argp-standalone autoconf automake linux-headers libtool sysfsutils-dev"
-subpackages="$pkgname-doc $pkgname-openrc"
+makedepends="
+	argp-standalone
+	autoconf
+	automake
+	curl-dev
+	jansson-dev
+	jitterentropy-library-dev
+	libcap-dev
+	librtlsdr-dev
+	libtool
+	libxml2-dev
+	linux-headers
+	openssl-dev>3
+	"
+options="!check"  # No useful tests to be performed.
+subpackages="
+	$pkgname-doc
+	$pkgname-openrc
+	rng-tools-extra:extra
+	rng-tools-extra-openrc:extra_openrc
+	"
 source="rng-tools-$pkgver.tar.gz::https://github.com/nhorman/rng-tools/archive/v$pkgver.tar.gz
-	fix-textrels-on-PIC-x86.patch
+	01-fix-ignorefail.patch
+	02-fix-random_step-boundary.patch
+	03-correct-linux-poolsize.patch
+	README.Alpine
 	rngd.confd
+	rngd.confd-arm
 	rngd.initd
+	rngd-extra.confd
+	rngd-extra.confd-arm
+	rngd-extra.initd
+	"
+install="
+	$pkgname.pre-install
+	$pkgname.pre-upgrade
+	$pkgname-extra.pre-install
+	$pkgname-extra.pre-upgrade
 	"
-
-# power DARN support requires libgcrypt
-case "$CARCH" in
-	ppc64le) makedepends="$makedepends libgcrypt-dev";;
-	*) _flags="--without-libgcrypt";;
-esac
 
 prepare() {
 	default_prepare
@@ -29,9 +63,26 @@ prepare() {
 build() {
 	export LIBS="-largp"
 
-	# NOTE: nistbeacon depends on libxml2 and libcurl, so it would
-	# significantly increase rng-tools' total size.
-	# Likewise for libgcrypt.
+	# Build rng-tools-extra version which has NIST and RTLSDR entropy
+	# sources enabled in addition to the "normal" set.
+	cp -r "$builddir" "$builddir"-extra
+	cd "$builddir"-extra
+	msg "Building $pkgname-extra"
+	./configure \
+		--prefix=/usr \
+		--libexecdir=/usr/lib/rng-tools \
+		--sysconfdir=/etc \
+		--disable-silent-rules \
+		--with-nistbeacon \
+		--without-pkcs11 \
+		--with-qrypt \
+		--with-rtlsdr
+	make rngd rngtest
+
+	# Build rng-tools normal version which has only a small
+	# set of entropy sources included.
+	cd "$builddir"
+	msg "Building $pkgname"
 	./configure \
 		--prefix=/usr \
 		--libexecdir=/usr/lib/rng-tools \
@@ -39,18 +90,68 @@ build() {
 		--disable-silent-rules \
 		--without-nistbeacon \
 		--without-pkcs11 \
-		$_flags
+		--without-qrypt \
+		--without-rtlsdr
 	make
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
 
-	install -m 644 -D "$srcdir"/rngd.confd "$pkgdir"/etc/conf.d/rngd
+	case "$CARCH" in
+		aarch64 | armhf | armv7 )
+			_confd_file="rngd.confd-arm"
+			;;
+		* )
+			_confd_file="rngd.confd"
+			;;
+	esac
+	install -m 644 -D "$srcdir"/"$_confd_file" "$pkgdir"/etc/conf.d/rngd
 	install -m 755 -D "$srcdir"/rngd.initd "$pkgdir"/etc/init.d/rngd
+
+	install -m 644 -D "$srcdir"/README.Alpine \
+		-t "$pkgdir"/usr/share/doc/$pkgname
+}
+
+extra() {
+	pkgdesc="Random number generator daemon with extra entropy sources"
+	provides="rng-tools"
+
+	cd "$builddir-extra"
+	mkdir -p "$subpkgdir"
+	make DESTDIR="$subpkgdir" install-binPROGRAMS install-sbinPROGRAMS
+}
+
+extra_openrc() {
+	pkgdesc="Random number generator daemon with extra entropy sources (OpenRC init scripts)"
+	install_if="openrc $pkgname-extra=$pkgver-r$pkgrel"
+
+	mkdir -p \
+		"$subpkgdir"/etc/conf.d \
+		"$subpkgdir"/etc/init.d
+
+	case "$CARCH" in
+		aarch64 | armhf | armv7 )
+			_confd_file="rngd-extra.confd-arm"
+			;;
+		* )
+			_confd_file="rngd-extra.confd"
+			;;
+	esac
+	install -m 644 -D "$srcdir"/"$_confd_file" "$subpkgdir"/etc/conf.d/rngd
+	install -m 755 -D "$srcdir"/rngd-extra.initd "$subpkgdir"/etc/init.d/rngd
 }
 
-sha512sums="08d0b19c309331fd2a2cfb5523a980d5ab1a2e727d06e2b3ecc8851aa94b6fffe9021714f33b5bd1eeb8e6a1d28ab865845520d8e4c96ab3f63019718c08ae7b  rng-tools-6.9.tar.gz
-241b56146ec8e55572711b7aa36fa2afbe7a9527d25f03098f35f4c52a9049933d9bc2a82b0e2e0dbc836409d7f650f3a88ef546d6c5a687f7be8fbe4a013b7e  fix-textrels-on-PIC-x86.patch
-363b5aa431a0da37fc9eb8c93cffed0b75f43064530318fb41c774acd8aab8a1e109cf6c294b77fa6b8f97aa355b2849f56e83d8b06bcd9e0e9f3aa4f3ba49ac  rngd.confd
-86a6a7446eda64c075e468bc304008314b710629e06146582c5ce3fcc307a6b4baf5f8e8a47b72f1bab0bb608d76f953f2712cddd35809abcb02b8320c682535  rngd.initd"
+sha512sums="
+f4155dca8a54f47227f49ccf5f8453ddd50bd91a37b3b1659b5ad02278ed119028cee42918dd48552c79e19f2e2477277a41afa8e422395b2778b17fab09484d  rng-tools-6.16.tar.gz
+6cef58eb21f814d2f74484114f1c8d5a57fcdf2eb1c0c34377716df5ff3b15a37f582099b67f9b75be1dd56a34c8c85573b1057a002efdd585af68d41f1e403d  01-fix-ignorefail.patch
+5999206a5d35e58973c5a5d3d4f73e1060b9d02b4653fd6bd3d140fa127a7bbdb2fe1108fc556ee6cf9628d6699a561e414a56e14fff125f0fb401c236ef5fd3  02-fix-random_step-boundary.patch
+11941117d3125529464b277b7d0e719a783c49ebb80d7132a89f134fe2b4e7c7c5f36f101ef2eca1d4ad65affcb889bc9542de0a98613bf8214e322af0aa8367  03-correct-linux-poolsize.patch
+ed483460a47f92d3debf8ba4cc14781b87b8b5dc0fc98f6ac84a3f5996355a69f4d077226e7aa5a0b07e8e1cbcabef86bc626ec5635f5e0c121cdf9f1728d72e  README.Alpine
+489b9ea52b31c7e3aef495a76184df23becea679422a3e2232c8f2217f3d6b9bddd3fdd8d17e04cd9ab4a014e234daddd98078938a6afb0197cae71c5969baf1  rngd.confd
+c315e6306bb93233bcd75d216b778eea3487a75244335e13b9586c267dd4423c2a5f93119f3dd2da6aed847b8a0fe97d2cc62fc6a40141c1ea1cd9caf0f3ff8f  rngd.confd-arm
+bcd342c69e8bfd2f281d4e759d94d66207b353b41e2f86d8530a5b463a601c114dafab03c21ec3845f762a8e5f8a594f01492311eabc7b94758234665de71f2a  rngd.initd
+e46bedde2b543098e629d7ab43f7249ac7c30d0f97ade3be6411c453c30edd4a895c0d3fec1ad17d8296feb84535980bbd3e5de4d5ab754f3eebaf343382e310  rngd-extra.confd
+b5057431e379234a194c4ebe0b22d8b2e46a758aef4bdd7292d420a781cfb038fb6eb032e25bedd88e86f78ae8fffa0523fc52ed9a8f60f791130a040007c9c3  rngd-extra.confd-arm
+830f53b3ba54c662ecdb1a282b9719f15eec4856f2a78a4fa0922044e275ca6a867b8104d55b603027c8d97481b9c4bf10aa8105259a5025f7e7cc4038476b62  rngd-extra.initd
+"
diff --git a/main/rng-tools/README.Alpine b/main/rng-tools/README.Alpine
new file mode 100644
index 00000000000..d106e444efb
--- /dev/null
+++ b/main/rng-tools/README.Alpine
@@ -0,0 +1,8 @@
+Recent linux kernels contain substantial changes to the way entropy is
+handled.
+
+I discussed the current situation of rngd and modern Linux kernels with the
+rng-tools maintainer in https://github.com/nhorman/rng-tools/issues/195"
+
+Based on his feedback it appears that rngd serves no practical purpose with
+modern Linux kernels and running it is not recommended.
diff --git a/main/rng-tools/fix-textrels-on-PIC-x86.patch b/main/rng-tools/fix-textrels-on-PIC-x86.patch
deleted file mode 100644
index ee6fe108b98..00000000000
--- a/main/rng-tools/fix-textrels-on-PIC-x86.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/rdrand_asm.S
-+++ b/rdrand_asm.S
-@@ -83,6 +83,7 @@
- 	jmp	4b
- ENDPROC(x86_rdseed_or_rdrand_bytes)
- 
-+#define INIT_PIC()
- #define SETPTR(var,ptr)	leaq var(%rip),ptr
- #define PTR0	%rdi
- #define PTR1	%rsi
-@@ -180,6 +190,7 @@
- #define NPTR2	1	/* %rcx = %r1 */
- 
- #endif
-+	INIT_PIC()
- 
- ENTRY(x86_aes_mangle)
- #ifdef __i386__
-@@ -283,6 +294,17 @@
- #endif
- 	ret
- ENDPROC(x86_aes_mangle)
-+
-+#if defined(__i386__) && defined(__PIC__)
-+	.section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
-+.globl __i686.get_pc_thunk.bx
-+	.hidden  __i686.get_pc_thunk.bx
-+	.type    __i686.get_pc_thunk.bx,@function
-+__i686.get_pc_thunk.bx:
-+	movl (%esp), %ebx
-+	ret
-+#endif
-+
- 
- /* aeskeygenassist $imm,%xmm0,%xmm1 */
- #define AESKEYGENASSIST(imm) .byte 0x66,0x0f,0x3a,0xdf,0xc8,imm
diff --git a/main/rng-tools/rng-tools-extra.pre-install b/main/rng-tools/rng-tools-extra.pre-install
new file mode 120000
index 00000000000..8c512f8dd42
--- /dev/null
+++ b/main/rng-tools/rng-tools-extra.pre-install
@@ -0,0 +1 @@
+rng-tools.pre-install
\ No newline at end of file
diff --git a/main/rng-tools/rng-tools-extra.pre-upgrade b/main/rng-tools/rng-tools-extra.pre-upgrade
new file mode 120000
index 00000000000..8c512f8dd42
--- /dev/null
+++ b/main/rng-tools/rng-tools-extra.pre-upgrade
@@ -0,0 +1 @@
+rng-tools.pre-install
\ No newline at end of file
diff --git a/main/rng-tools/rng-tools.pre-install b/main/rng-tools/rng-tools.pre-install
new file mode 100644
index 00000000000..3ddcf93115e
--- /dev/null
+++ b/main/rng-tools/rng-tools.pre-install
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+addgroup -S rngd 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G rngd \
+	-g "rngd" rngd 2>/dev/null
+
+exit 0
diff --git a/main/rng-tools/rng-tools.pre-upgrade b/main/rng-tools/rng-tools.pre-upgrade
new file mode 120000
index 00000000000..8c512f8dd42
--- /dev/null
+++ b/main/rng-tools/rng-tools.pre-upgrade
@@ -0,0 +1 @@
+rng-tools.pre-install
\ No newline at end of file
diff --git a/main/rng-tools/rngd-extra.confd b/main/rng-tools/rngd-extra.confd
new file mode 100644
index 00000000000..8b6c760de47
--- /dev/null
+++ b/main/rng-tools/rngd-extra.confd
@@ -0,0 +1,99 @@
+# Configuration for /etc/init.d/rngd
+
+# Space-delimited list of entropy sources to enable.
+# No need to include any source that is enabled by default.
+#
+# Choose from list:
+#     nist: NIST radio beacon. Not recommended.
+#     tpm:  Is deprecated, will be removed in future version.
+#
+INCLUDE_ENTROPY_SOURCES=""
+
+# Space-delimited list of entropy sources to disable.
+# Useful for disabling certain entropy sources even when supported on system.
+#
+EXCLUDE_ENTROPY_SOURCES=""
+
+
+# Number of entropy bits to support, 1 <= n <= 8.
+#
+#ENTROPY_COUNT=8
+
+# Time in seconds to periodically add fresh entropy to kernel entropy pool.
+#
+#FORCE_RESEED=300
+
+# Device used for random number input.
+#
+#HWRNG_DEVICE="/dev/hwrng"
+
+# Kernel device used for random number output.
+#
+#RANDOM_DEVICE="/dev/random"
+
+# Number of bytes written to random-device at a time.
+#
+#STEP=64
+
+# Do not stop feeding entropy to random device until at least this
+# many bits of entropy are available in pool. Value can be
+# 0 <= n <= `sysctl kernel.random.poolsize` but is usually 75% of pool size.
+#
+#WATERMARK=192
+
+
+# Entropy source specific options:
+#
+#
+# darn options:
+#         use_aes:(BOOLEAN)
+#
+#DARN_OPTIONS="use_aes:1"
+#
+#
+# jitter options:
+#         buffer_size:(INTEGER)
+#         force_soft_timer:(BOOLEAN)
+#         refill_thresh:(INTEGER)
+#         retry_count:(INTEGER)
+#         retry_delay:(INTEGER)
+#         thread_count:(INTEGER)
+#         use_aes:(BOOLEAN)
+#
+#JITTER_OPTIONS="buffer_size:16535 force_soft_timer:0 refill_thresh:16535"
+#JITTER_OPTIONS="${JITTER_OPTIONS} retry_count:1 retry_delay:-1"
+#JITTER_OPTIONS="${JITTER_OPTIONS} thread_count:4 timeout:5 use_aes:1"
+#
+#
+# nist options:
+#         use_aes:(BOOLEAN)
+#
+#NIST_OPTIONS="use_aes:1"
+#
+#
+# rdrand options:
+#         use_aes:(BOOLEAN)
+#
+#RDRAND_OPTIONS="use_aes:0"
+#
+#
+# rndr options:
+#         use_aes:(BOOLEAN)
+#
+#RNDR_OPTIONS="use_aes:0"
+#
+#
+# rtlsdr options:
+#         device_id:(INTEGER)
+#         freq_min:(INTEGER)
+#         freq_max:(INTEGER)
+#         sample_min:(INTEGER)
+#         sample_max:(INTEGER)
+#
+#RTLSDR_OPTIONS="device_id:0 freq_min:90000000 freq_max:110000000"
+#RTLSDR_OPTIONS="${RTLSDR_OPTIONS} sample_min:1000000 sample_max:2800000"
+
+
+# Any extra arguments for rngd
+#
+EXTRA_ARGS="-q"
diff --git a/main/rng-tools/rngd-extra.confd-arm b/main/rng-tools/rngd-extra.confd-arm
new file mode 100644
index 00000000000..af6bf0c2f35
--- /dev/null
+++ b/main/rng-tools/rngd-extra.confd-arm
@@ -0,0 +1,112 @@
+# Configuration for /etc/init.d/rngd
+
+# Space-delimited list of entropy sources to enable.
+# No need to include any source that is enabled by default.
+#
+# Choose from list:
+#     nist: NIST radio beacon. Not recommended.
+#     tpm:  Is deprecated, will be removed in future version.
+#
+INCLUDE_ENTROPY_SOURCES=""
+
+# Space-delimited list of entropy sources to disable.
+# Useful for disabling certain entropy sources even when supported on system.
+#
+EXCLUDE_ENTROPY_SOURCES=""
+
+
+# Number of entropy bits to support, 1 <= n <= 8.
+#
+#ENTROPY_COUNT=8
+
+# Time in seconds to periodically add fresh entropy to kernel entropy pool.
+#
+#FORCE_RESEED=300
+
+# Device used for random number input.
+#
+#HWRNG_DEVICE="/dev/hwrng"
+
+# Kernel device used for random number output.
+#
+#RANDOM_DEVICE="/dev/random"
+
+# Number of bytes written to random-device at a time.
+#
+#STEP=64
+
+# Do not stop feeding entropy to random device until at least this
+# many bits of entropy are available in pool. Value can be
+# 0 <= n <= `sysctl kernel.random.poolsize` but is usually 75% of pool size.
+#
+#WATERMARK=192
+
+
+# Entropy source specific options:
+#
+#
+# darn options:
+#         use_aes:(BOOLEAN)
+#
+#DARN_OPTIONS="use_aes:1"
+#
+#
+# jitter options:
+#         buffer_size:(INTEGER)
+#         force_soft_timer:(BOOLEAN)
+#         refill_thresh:(INTEGER)
+#         retry_count:(INTEGER)
+#         retry_delay:(INTEGER)
+#         thread_count:(INTEGER)
+#         use_aes:(BOOLEAN)
+#
+#JITTER_OPTIONS="buffer_size:16535 force_soft_timer:0 refill_thresh:16535"
+#JITTER_OPTIONS="${JITTER_OPTIONS} retry_count:1 retry_delay:-1"
+#JITTER_OPTIONS="${JITTER_OPTIONS} thread_count:4 timeout:5 use_aes:1"
+#
+# With the default jitter options Arm CPU-based devices typically experience
+# continuous high CPU utilisation for several minutes after rngd starts.
+# See https://gitlab.alpinelinux.org/alpine/aports/-/issues/13035 and
+# https://github.com/nhorman/rng-tools/issues/150
+# In order to address this the following configuration changes have been made:
+#
+#   - reduce the number of threads used to 1 in total, rather than 1 per core.
+#   - reduce the buffer size from 16535 to 4133 which reduces the time taken
+#     to fill the buffer (and so reduces the duration of CPU load).
+#   - increase the timeout from 5 to 20 seconds.
+#
+JITTER_OPTIONS="buffer_size:4133 refill_thresh:4133 thread_count:1 timeout:20"
+#
+#
+# nist options:
+#         use_aes:(BOOLEAN)
+#
+#NIST_OPTIONS="use_aes:1"
+#
+#
+# rdrand options:
+#         use_aes:(BOOLEAN)
+#
+#RDRAND_OPTIONS="use_aes:0"
+#
+#
+# rndr options:
+#         use_aes:(BOOLEAN)
+#
+#RNDR_OPTIONS="use_aes:0"
+#
+#
+# rtlsdr options:
+#         device_id:(INTEGER)
+#         freq_min:(INTEGER)
+#         freq_max:(INTEGER)
+#         sample_min:(INTEGER)
+#         sample_max:(INTEGER)
+#
+#RTLSDR_OPTIONS="device_id:0 freq_min:90000000 freq_max:110000000"
+#RTLSDR_OPTIONS="${RTLSDR_OPTIONS} sample_min:1000000 sample_max:2800000"
+
+
+# Any extra arguments for rngd
+#
+EXTRA_ARGS="-q"
diff --git a/main/rng-tools/rngd-extra.initd b/main/rng-tools/rngd-extra.initd
new file mode 100644
index 00000000000..9a98209da90
--- /dev/null
+++ b/main/rng-tools/rngd-extra.initd
@@ -0,0 +1,72 @@
+#!/sbin/openrc-run
+
+description="Random number generator daemon"
+
+pidfile="/run/$RC_SVCNAME.pid"
+command="/usr/sbin/rngd"
+command_args="-b -p $pidfile -D rngd:rngd"
+
+depend() {
+	after procfs urandom
+	provide entropy
+}
+
+start_pre() {
+	command_args="${command_args} ${EXTRA_ARGS}"
+
+	for entsrc in ${INCLUDE_ENTROPY_SOURCES}; do
+		command_args="${command_args} -n ${entsrc}"
+	done
+
+	for entsrc in ${EXCLUDE_ENTROPY_SOURCES}; do
+		command_args="${command_args} -x ${entsrc}"
+	done
+
+	if [ "x${ENTROPY_COUNT}" != "x" ]; then
+		command_args="${command_args} -e ${ENTROPY_COUNT}"
+	fi
+
+	if [ "x${FORCE_RESEED}" != "x" ]; then
+		command_args="${command_args} -R ${FORCE_RESEED}"
+	fi
+
+	if [ "x${HWRNG_DEVICE}" != "x" ]; then
+		command_args="${command_args} -r ${HWRNG_DEVICE}"
+	fi
+
+	if [ "x${RANDOM_DEVICE}" != "x" ]; then
+		command_args="${command_args} -o ${RANDOM_DEVICE}"
+	fi
+
+	if [ "x${STEP}" != "x" ]; then
+		command_args="${command_args} -s ${STEP}"
+	fi
+
+	if [ "x${WATERMARK}" != "x" ]; then
+		command_args="${command_args} -W ${WATERMARK}"
+	fi
+
+	for entsrc_opt in ${DARN_OPTIONS}; do
+		command_args="${command_args} -O darn:${entsrc_opt}"
+	done
+
+	for entsrc_opt in ${JITTER_OPTIONS}; do
+		command_args="${command_args} -O jitter:${entsrc_opt}"
+	done
+
+	for entsrc_opt in ${NIST_OPTIONS}; do
+		command_args="${command_args} -O nist:${entsrc_opt}"
+	done
+
+	for entsrc_opt in ${RDRAND_OPTIONS}; do
+		command_args="${command_args} -O rdrand:${entsrc_opt}"
+	done
+
+	for entsrc_opt in ${RNDR_OPTIONS}; do
+		command_args="${command_args} -O rndr:${entsrc_opt}"
+	done
+
+	for entsrc_opt in ${RTLSDR_OPTIONS}; do
+		command_args="${command_args} -O rtlsdr:${entsrc_opt}"
+	done
+}
diff --git a/main/rng-tools/rngd.confd b/main/rng-tools/rngd.confd
index 65187508df1..5211c1c27da 100644
--- a/main/rng-tools/rngd.confd
+++ b/main/rng-tools/rngd.confd
@@ -1,4 +1,81 @@
 # Configuration for /etc/init.d/rngd
 
-# Additional options to pass into rngd(8).
-# RNGD_OPTS=""
+# Space-delimited list of entropy sources to enable.
+# No need to include any source that is enabled by default.
+#
+# Choose from list:
+#     tpm:  Is deprecated, will be removed in future version.
+#
+INCLUDE_ENTROPY_SOURCES=""
+
+# Space-delimited list of entropy sources to disable.
+# Useful for disabling certain entropy sources even when supported on system.
+#
+EXCLUDE_ENTROPY_SOURCES=""
+
+
+# Number of entropy bits to support, 1 <= n <= 8.
+#
+#ENTROPY_COUNT=8
+
+# Time in seconds to periodically add fresh entropy to kernel entropy pool.
+#
+#FORCE_RESEED=300
+
+# Device used for random number input.
+#
+#HWRNG_DEVICE="/dev/hwrng"
+
+# Kernel device used for random number output.
+#
+#RANDOM_DEVICE="/dev/random"
+
+# Number of bytes written to random-device at a time.
+#
+#STEP=64
+
+# Do not stop feeding entropy to random device until at least this
+# many bits of entropy are available in pool. Value can be
+# 0 <= n <= `sysctl kernel.random.poolsize` but is usually 75% of pool size.
+#
+#WATERMARK=192
+
+
+# Entropy source specific options:
+#
+#
+# darn options:
+#         use_aes:(BOOLEAN)
+#
+#DARN_OPTIONS="use_aes:1"
+#
+#
+# jitter options:
+#         buffer_size:(INTEGER)
+#         force_soft_timer:(BOOLEAN)
+#         refill_thresh:(INTEGER)
+#         retry_count:(INTEGER)
+#         retry_delay:(INTEGER)
+#         thread_count:(INTEGER)
+#         use_aes:(BOOLEAN)
+#
+#JITTER_OPTIONS="buffer_size:16535 force_soft_timer:0 refill_thresh:16535"
+#JITTER_OPTIONS="${JITTER_OPTIONS} retry_count:1 retry_delay:-1"
+#JITTER_OPTIONS="${JITTER_OPTIONS} thread_count:4 timeout:5 use_aes:1"
+#
+#
+# rdrand options:
+#         use_aes:(BOOLEAN)
+#
+#RDRAND_OPTIONS="use_aes:0"
+#
+#
+# rndr options:
+#         use_aes:(BOOLEAN)
+#
+#RNDR_OPTIONS="use_aes:0"
+
+
+# Any extra arguments for rngd
+#
+EXTRA_ARGS="-q"
diff --git a/main/rng-tools/rngd.confd-arm b/main/rng-tools/rngd.confd-arm
new file mode 100644
index 00000000000..d7a75790b2e
--- /dev/null
+++ b/main/rng-tools/rngd.confd-arm
@@ -0,0 +1,94 @@
+# Configuration for /etc/init.d/rngd
+
+# Space-delimited list of entropy sources to enable.
+# No need to include any source that is enabled by default.
+#
+# Choose from list:
+#     tpm:  Is deprecated, will be removed in future version.
+#
+INCLUDE_ENTROPY_SOURCES=""
+
+# Space-delimited list of entropy sources to disable.
+# Useful for disabling certain entropy sources even when supported on system.
+#
+EXCLUDE_ENTROPY_SOURCES=""
+
+
+# Number of entropy bits to support, 1 <= n <= 8.
+#
+#ENTROPY_COUNT=8
+
+# Time in seconds to periodically add fresh entropy to kernel entropy pool.
+#
+#FORCE_RESEED=300
+
+# Device used for random number input.
+#
+#HWRNG_DEVICE="/dev/hwrng"
+
+# Kernel device used for random number output.
+#
+#RANDOM_DEVICE="/dev/random"
+
+# Number of bytes written to random-device at a time.
+#
+#STEP=64
+
+# Do not stop feeding entropy to random device until at least this
+# many bits of entropy are available in pool. Value can be
+# 0 <= n <= `sysctl kernel.random.poolsize` but is usually 75% of pool size.
+#
+#WATERMARK=192
+
+
+# Entropy source specific options:
+#
+#
+# darn options:
+#         use_aes:(BOOLEAN)
+#
+#DARN_OPTIONS="use_aes:1"
+#
+#
+# jitter options:
+#         buffer_size:(INTEGER)
+#         force_soft_timer:(BOOLEAN)
+#         refill_thresh:(INTEGER)
+#         retry_count:(INTEGER)
+#         retry_delay:(INTEGER)
+#         thread_count:(INTEGER)
+#         use_aes:(BOOLEAN)
+#
+#JITTER_OPTIONS="buffer_size:16535 force_soft_timer:0 refill_thresh:16535"
+#JITTER_OPTIONS="${JITTER_OPTIONS} retry_count:1 retry_delay:-1"
+#JITTER_OPTIONS="${JITTER_OPTIONS} thread_count:4 timeout:5 use_aes:1"
+#
+# With the default jitter options Arm CPU-based devices typically experience
+# continuous high CPU utilisation for several minutes after rngd starts.
+# See https://gitlab.alpinelinux.org/alpine/aports/-/issues/13035 and
+# https://github.com/nhorman/rng-tools/issues/150
+# In order to address this the following configuration changes have been made:
+#
+#   - reduce the number of threads used to 1 in total, rather than 1 per core.
+#   - reduce the buffer size from 16535 to 4133 which reduces the time taken
+#     to fill the buffer (and so reduces the duration of CPU load).
+#   - increase the timeout from 5 to 20 seconds.
+#
+JITTER_OPTIONS="buffer_size:4133 refill_thresh:4133 thread_count:1 timeout:20"
+#
+#
+# rdrand options:
+#         use_aes:(BOOLEAN)
+#
+#RDRAND_OPTIONS="use_aes:0"
+#
+#
+# rndr options:
+#         use_aes:(BOOLEAN)
+#
+#RNDR_OPTIONS="use_aes:0"
+
+
+# Any extra arguments for rngd
+#
+EXTRA_ARGS="-q"
diff --git a/main/rng-tools/rngd.initd b/main/rng-tools/rngd.initd
index 92ca90aa35a..fde93885cad 100644
--- a/main/rng-tools/rngd.initd
+++ b/main/rng-tools/rngd.initd
@@ -4,11 +4,61 @@ description="Random number generator daemon"
 
 pidfile="/run/$RC_SVCNAME.pid"
 command="/usr/sbin/rngd"
-command_args="--quiet --background --pid-file $pidfile $RNGD_OPTS"
-start_stop_daemon_args="--wait 5"
+command_args="-b -p $pidfile -D rngd:rngd"
 
 depend() {
-	need localmount
-	after urandom
+	after procfs urandom
 	provide entropy
 }
+
+start_pre() {
+	command_args="${command_args} ${EXTRA_ARGS}"
+
+	for entsrc in ${INCLUDE_ENTROPY_SOURCES}; do
+		command_args="${command_args} -n ${entsrc}"
+	done
+
+	for entsrc in ${EXCLUDE_ENTROPY_SOURCES}; do
+		command_args="${command_args} -x ${entsrc}"
+	done
+
+	if [ "x${ENTROPY_COUNT}" != "x" ]; then
+		command_args="${command_args} -e ${ENTROPY_COUNT}"
+	fi
+
+	if [ "x${FORCE_RESEED}" != "x" ]; then
+		command_args="${command_args} -R ${FORCE_RESEED}"
+	fi
+
+	if [ "x${HWRNG_DEVICE}" != "x" ]; then
+		command_args="${command_args} -r ${HWRNG_DEVICE}"
+	fi
+
+	if [ "x${RANDOM_DEVICE}" != "x" ]; then
+		command_args="${command_args} -o ${RANDOM_DEVICE}"
+	fi
+
+	if [ "x${STEP}" != "x" ]; then
+		command_args="${command_args} -s ${STEP}"
+	fi
+
+	if [ "x${WATERMARK}" != "x" ]; then
+		command_args="${command_args} -W ${WATERMARK}"
+	fi
+
+	for entsrc_opt in ${DARN_OPTIONS}; do
+		command_args="${command_args} -O darn:${entsrc_opt}"
+	done
+
+	for entsrc_opt in ${JITTER_OPTIONS}; do
+		command_args="${command_args} -O jitter:${entsrc_opt}"
+	done
+
+	for entsrc_opt in ${RDRAND_OPTIONS}; do
+		command_args="${command_args} -O rdrand:${entsrc_opt}"
+	done
+
+	for entsrc_opt in ${RNDR_OPTIONS}; do
+		command_args="${command_args} -O rndr:${entsrc_opt}"
+	done
+}
diff --git a/main/rp-pppoe/APKBUILD b/main/rp-pppoe/APKBUILD
index 40ec9301058..fce486c908d 100644
--- a/main/rp-pppoe/APKBUILD
+++ b/main/rp-pppoe/APKBUILD
@@ -1,22 +1,23 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=rp-pppoe
-pkgver=3.13
-pkgrel=0
+pkgver=4.0
+pkgrel=1
 pkgdesc="PPP over Ethernet client (for xDSL support)"
 url="https://dianne.skoll.ca/projects/rp-pppoe/"
 arch="all"
 license="GPL-2.0-or-later"
 makedepends="ppp-dev linux-headers"
 subpackages="$pkgname-doc $pkgname-openrc"
-source="https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-$pkgver.tar.gz
-	musl-fix.patch
+source="$pkgname-$pkgver.tgz::https://salsa.debian.org/dskoll/rp-pppoe/-/archive/$pkgver/rp-pppoe-$pkgver.tar.gz
 	rp-pppoe.initd
 	"
-builddir="$srcdir"/$pkgname-$pkgver
+options="!check"
 
 build() {
 	cd "$builddir"/src
+	# strlcpy
+	CFLAGS="$CFLAGS -D_BSD_SOURCE" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -34,6 +35,7 @@ package() {
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
-sha512sums="e29ddc39252a0e71d509096e275f6f195f86a5871052dd558e8fb174d13086b1c601e6652f45619279a1eb2fbda96ba0ec85dea9edb27459af56ded4a52b5f36  rp-pppoe-3.13.tar.gz
-5f7e9d50be7c4b007bc2f86cee42b8e5dc4ead6a8def618441c0db0ecb083a6631bd90d6292279c2188986820f7b8f488b41ff6cb186bb541e3e705858a21034  musl-fix.patch
-6d3457af1353f875cc007b69322636a89534f9c0cd4d598ad24fb29de4a38bdfabc8a717ca17896ca859eac2aea4a037e113c61c4d322cdf7247ca78a8609fa6  rp-pppoe.initd"
+sha512sums="
+67d6bdc919826cb84363beb5e58cd27f9aeafa0082f58d697ea30d717ce6bca9aff9158df7afd0eca9ac2b3948929c616a8d25676b3fe6f18df1c10acb6bfd72  rp-pppoe-4.0.tgz
+6d3457af1353f875cc007b69322636a89534f9c0cd4d598ad24fb29de4a38bdfabc8a717ca17896ca859eac2aea4a037e113c61c4d322cdf7247ca78a8609fa6  rp-pppoe.initd
+"
diff --git a/main/rp-pppoe/musl-fix.patch b/main/rp-pppoe/musl-fix.patch
deleted file mode 100644
index d62fc8293d5..00000000000
--- a/main/rp-pppoe/musl-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./src/pppoe.h.orig
-+++ ./src/pppoe.h
-@@ -127,10 +127,6 @@
- #error Could not find a 32-bit integer type
- #endif
- 
--#ifdef HAVE_LINUX_IF_ETHER_H
--#include <linux/if_ether.h>
--#endif
--
- #include <netinet/in.h>
- 
- #ifdef HAVE_NETINET_IF_ETHER_H
diff --git a/main/rpcbind/0001-rpcinfo-Fix-stack-buffer-overflow.patch b/main/rpcbind/0001-rpcinfo-Fix-stack-buffer-overflow.patch
deleted file mode 100644
index 77937b73f41..00000000000
--- a/main/rpcbind/0001-rpcinfo-Fix-stack-buffer-overflow.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 0bc1c0ae7ce61a7ac8a8e9a9b2086268f011abf0 Mon Sep 17 00:00:00 2001
-From: Steve Dickson <steved@redhat.com>
-Date: Tue, 9 Oct 2018 09:19:50 -0400
-Subject: [PATCH] rpcinfo: Fix stack buffer overflow
-
-*** buffer overflow detected ***: rpcinfo terminated
-======= Backtrace: =========
-/lib64/libc.so.6(+0x721af)[0x7ff24c4451af]
-/lib64/libc.so.6(__fortify_fail+0x37)[0x7ff24c4ccdc7]
-/lib64/libc.so.6(+0xf8050)[0x7ff24c4cb050]
-rpcinfo(+0x435f)[0xef3be2635f]
-rpcinfo(+0x1c62)[0xef3be23c62]
-/lib64/libc.so.6(__libc_start_main+0xf5)[0x7ff24c3f36e5]
-rpcinfo(+0x2739)[0xef3be24739]
-======= Memory map: ========
-...
-The patch below fixes it.
-
-Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
-Signed-off-by: Thomas Blume <thomas.blume@suse.com>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- src/rpcinfo.c | 23 +++++++++++++++++------
- 1 file changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/src/rpcinfo.c b/src/rpcinfo.c
-index 9b46864..cfdba88 100644
---- a/src/rpcinfo.c
-+++ b/src/rpcinfo.c
-@@ -973,6 +973,7 @@ rpcbdump (dumptype, netid, argc, argv)
- 	("   program version(s) netid(s)                         service     owner\n");
-       for (rs = rs_head; rs; rs = rs->next)
- 	{
-+	  size_t netidmax = sizeof(buf) - 1;
- 	  char *p = buf;
- 
- 	  printf ("%10ld  ", rs->prog);
-@@ -985,12 +986,22 @@ rpcbdump (dumptype, netid, argc, argv)
- 	    }
- 	  printf ("%-10s", buf);
- 	  buf[0] = '\0';
--	  for (nl = rs->nlist; nl; nl = nl->next)
--	    {
--	      strcat (buf, nl->netid);
--	      if (nl->next)
--		strcat (buf, ",");
--	    }
-+
-+          for (nl = rs->nlist; nl; nl = nl->next)
-+            {
-+              strncat (buf, nl->netid, netidmax);
-+              if (strlen (nl->netid) < netidmax)
-+                netidmax -= strlen(nl->netid);
-+              else
-+                break;
-+
-+              if (nl->next && netidmax > 1)
-+                {
-+                  strncat (buf, ",", netidmax);
-+                  netidmax --;
-+                }
-+            }
-+
- 	  printf ("%-32s", buf);
- 	  rpc = getrpcbynumber (rs->prog);
- 	  if (rpc)
--- 
-2.21.0
-
diff --git a/main/rpcbind/APKBUILD b/main/rpcbind/APKBUILD
index 497e421e400..8220611f16c 100644
--- a/main/rpcbind/APKBUILD
+++ b/main/rpcbind/APKBUILD
@@ -1,35 +1,30 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rpcbind
-pkgver=1.2.5
-pkgrel=0
+pkgver=1.2.6
+pkgrel=2
 pkgdesc="portmap replacement which supports RPC over various protocols"
-url="http://rpcbind.sourceforge.net"
+url="https://rpcbind.sourceforge.net/"
 arch="all"
 options="!check"  # No test suite.
 license="BSD-3-Clause"
-depends=
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 makedepends="libtirpc-dev autoconf automake bsd-compat-headers"
 subpackages="$pkgname-dbg $pkgname-doc $pkgname-openrc"
 source="https://downloads.sourceforge.net/project/rpcbind/rpcbind/$pkgver/rpcbind-$pkgver.tar.bz2
-	0001-rpcinfo-Fix-stack-buffer-overflow.patch
 	rpcbind.initd
 	rpcbind.confd
 	"
 
 # secfixes:
 #   0.2.4-r0:
-#   - CVE-2017-8779
+#     - CVE-2017-8779
 
-builddir="$srcdir"/rpcbind-$pkgver
 prepare() {
-	cd "$builddir"
 	default_prepare
 	sh autogen.sh
 }
 
 build() {
-	cd "$builddir"
 	unset CC
 	unset CFLAGS
 	./configure \
@@ -47,13 +42,13 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm755 "$srcdir"/rpcbind.initd "$pkgdir"/etc/init.d/rpcbind
 	install -Dm644 "$srcdir"/rpcbind.confd "$pkgdir"/etc/conf.d/rpcbind
 	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/rpcbind/COPYING
 }
-sha512sums="e884c4757950ccead0f9a07f50625a63e6f18f9bfae9fcfffa3e5fa4b7a66c3a99d9fa303061848fe8211509d5456f24ff26e4579af6e161a35522268f3ef3e4  rpcbind-1.2.5.tar.bz2
-84289e99b918fd138e6327a39481e74c80581746087d2e7e55d0c0bdbe068875b6136a6296c0d24a1be01d54b38a9d446794a3d08b53e7d884804a2b375519a2  0001-rpcinfo-Fix-stack-buffer-overflow.patch
+sha512sums="
+fb89c61be4c533fe2e6057749d97079a2d1c9fac0d35d6be1a159a0edbf86092b3fc121f19fa920e75aac5ecdd3f59f5978e6401d5cad16cd438c977736206a7  rpcbind-1.2.6.tar.bz2
 1cd655d86226a45fa3e927f8ac2bb580537644d2fb3684e0f4a956bf3721c95d95b8b8c1d9a2a742fb714eeba9277e0400a7493bf1bf676466d70adb2b35a88e  rpcbind.initd
-0641087162ebc8fb10c5cb329105261d77cad073daed3f9a6c92574177298cd8a19a87b62dde14161cc554b5e68680cfd870b5334f3cfd8d6074ec8a43f4dfe3  rpcbind.confd"
+0641087162ebc8fb10c5cb329105261d77cad073daed3f9a6c92574177298cd8a19a87b62dde14161cc554b5e68680cfd870b5334f3cfd8d6074ec8a43f4dfe3  rpcbind.confd
+"
diff --git a/main/rpcsvc-proto/APKBUILD b/main/rpcsvc-proto/APKBUILD
index a55f138f926..3b389b00e75 100644
--- a/main/rpcsvc-proto/APKBUILD
+++ b/main/rpcsvc-proto/APKBUILD
@@ -1,15 +1,20 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname="rpcsvc-proto"
-pkgver="1.4"
+pkgname=rpcsvc-proto
+pkgver=1.4.4
 pkgrel=0
 pkgdesc="rpcsvc protocol definitions from glibc"
 url="https://github.com/thkukuk/rpcsvc-proto"
 arch="all"
-license="BSD-3.0"
+license="BSD-3-Clause"
 makedepends="musl-libintl"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://github.com/thkukuk/rpcsvc-proto/releases/download/v$pkgver/rpcsvc-proto-$pkgver.tar.gz"
+source="https://github.com/thkukuk/rpcsvc-proto/releases/download/v$pkgver/rpcsvc-proto-$pkgver.tar.xz"
+
+prepare() {
+ 	default_prepare
+	update_config_guess
+}
 
 build() {
 	./configure --prefix=/usr
@@ -24,4 +29,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d1ad662e8036f17cd013b7becbf811caa62ef444f1c48ba6864c3c3cb28c5d69366b0c18b21692d1ad3f8445f33805e6bffe12c00d07e30324f8b930eae418d4  rpcsvc-proto-1.4.tar.gz"
+sha512sums="
+0138ac8fb2d8de3cb56f661bd1b6435fa0a35d3bd12c5cb7081c9ae1701e3620f47fe3dd002263db456655b61316749768e9a1a44325a1a6a542beae364a0393  rpcsvc-proto-1.4.4.tar.xz
+"
diff --git a/main/rrdcollect/APKBUILD b/main/rrdcollect/APKBUILD
index a549269b188..72652f60279 100644
--- a/main/rrdcollect/APKBUILD
+++ b/main/rrdcollect/APKBUILD
@@ -2,21 +2,20 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=rrdcollect
 pkgver=0.2.10
-pkgrel=1
+pkgrel=5
 pkgdesc="Read system statistical data and feed it to RRDtool"
-url="http://rrdcollect.sourceforge.net/"
+url="https://rrdcollect.sourceforge.net/"
 arch="all"
 license="GPL-2.0-or-later"
 depends="rrdtool"
 makedepends="libpcap-dev"
-subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+subpackages="$pkgname-doc $pkgname-openrc"
+source="https://downloads.sourceforge.net/rrdcollect/rrdcollect-$pkgver.tar.bz2
 		rrdcollect.conf.patch
 		rrdcollect.initd"
+options="!check"
 
-builddir="$srcdir/$pkgname-$pkgver"
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,7 +28,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -m755 -D "$srcdir"/rrdcollect.initd \
 		"$pkgdir"/etc/init.d/rrdcollect
diff --git a/main/rrdtool/APKBUILD b/main/rrdtool/APKBUILD
index d4ce2204a37..645d28f683d 100644
--- a/main/rrdtool/APKBUILD
+++ b/main/rrdtool/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rrdtool
-pkgver=1.7.2
-pkgrel=3
+pkgver=1.8.0
+pkgrel=5
 pkgdesc="Data logging and graphing application"
 url="http://www.rrdtool.org"
 arch="all"
@@ -12,12 +12,12 @@ makedepends="libart-lgpl-dev libpng-dev freetype-dev perl-dev cairo-dev libxml2-
 	pango-dev lua lua-dev groff autoconf automake libtool"
 checkdepends="diffutils"
 subpackages="$pkgname-dev $pkgname-doc perl-rrd:perl_rrd lua-rrd:lua_rrd
-	$pkgname-cached $pkgname-cgi $pkgname-utils librrd:libs"
-source="http://oss.oetiker.ch/rrdtool/pub/rrdtool-$pkgver.tar.gz
+	$pkgname-cached $pkgname-cached-openrc:cached_openrc $pkgname-cgi $pkgname-utils librrd:libs"
+source="https://github.com/oetiker/rrdtool-1.x/releases/download/v$pkgver/rrdtool-$pkgver.tar.gz
 	lua-install-cmod.patch
-	libm-underlinking.patch
-	no-posix-fallocate.patch
 	dont-install-in-usr-local.patch
+	fix-build-date-output.patch
+
 	rrdcached.initd
 	"
 options="!check" # As of 1.7.2 1/22 tests fails.
@@ -25,13 +25,13 @@ options="!check" # As of 1.7.2 1/22 tests fails.
 replaces="py-rrd" # Removed due to depending on EOL python 2
 
 prepare() {
-	cd "$builddir"
 	default_prepare
+	update_config_sub
+
 	libtoolize --force && aclocal && autoconf --force && automake --add-missing
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -47,12 +47,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	export INSTALLDIRS=vendor
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" -name '.packlist' -delete
@@ -88,6 +86,13 @@ cached() {
 		"$subpkgdir"/var/lib/rrdcached/db \
 		"$subpkgdir"/var/lib/rrdcached/journal
 	mv "$pkgdir"/usr/bin/rrdcached "$subpkgdir"/usr/sbin
+}
+
+cached_openrc() {
+	depends=
+	pkgdesc="RRDtool data caching daemon (OpenRC init scripts)"
+	install_if="openrc ${subpkgname%-openrc}=$pkgver-r$pkgrel"
+
 	install -Dm755 "$srcdir"/rrdcached.initd "$subpkgdir"/etc/init.d/rrdcached
 }
 
@@ -113,9 +118,10 @@ libs() {
 	default_libs
 }
 
-sha512sums="453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29  rrdtool-1.7.2.tar.gz
+sha512sums="
+8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1  rrdtool-1.8.0.tar.gz
 904fb16b065d879d8cec95e1f4bf67f5a3ff29afc023e8ba2b5636ba1cf5213f24279f2e9179e8a1acb889eee68b0b6527803aad14fcae9c3b98afdbf9e1f89f  lua-install-cmod.patch
-49c1d9a8523d9b5a3e4df8e9cc8da58490d4329e88ec12021d50db0b45c780ed465a30521f3a397c0d28bab5d5c1a3839bbe1ae062d8bc645420d16690b9797c  libm-underlinking.patch
-853f21b1d4935fd25184e8ac1be683a95952237705e6f7b9072a8247d1307e38c4b31117bcdc12ce1a812d7a6ac711cebfba833ef640b01e4fff1f2b7d0018ef  no-posix-fallocate.patch
 7b01d5b7c83270e0e45f3186cd0882c206173d2801678c98f1a427be1927898e602535a4cd9c808e2ab8fd393a1fb5267efae53c889c368a502a06d18cfae9aa  dont-install-in-usr-local.patch
-c0c27b2c2dfa8e7ec1cb1160d2bda8d7996bbea67f4ce7779da029f583c35e5e415cf46e2a1e5cb8ed2e63d2c58a68fd7471ee6bd820db4c0f4eeeb5c252f8a3  rrdcached.initd"
+616552f49f6a265b8e7112251277e5793d0cc2408b4ec80c2ba81a7edecba427d41b97adcff038b1ebad1aadaf9d272ebb09b1f15e03c1b4e0ef4fd7445596a8  fix-build-date-output.patch
+c0c27b2c2dfa8e7ec1cb1160d2bda8d7996bbea67f4ce7779da029f583c35e5e415cf46e2a1e5cb8ed2e63d2c58a68fd7471ee6bd820db4c0f4eeeb5c252f8a3  rrdcached.initd
+"
diff --git a/main/rrdtool/fix-build-date-output.patch b/main/rrdtool/fix-build-date-output.patch
new file mode 100644
index 00000000000..ba6d7639e8c
--- /dev/null
+++ b/main/rrdtool/fix-build-date-output.patch
@@ -0,0 +1,53 @@
+From e59f703bbcc0af949ee365206426b6394c340c6f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= <c72578@yahoo.de>
+Date: Wed, 23 Mar 2022 17:58:45 +0100
+Subject: [PATCH] Fix BUILD_DATE in rrdtool help output
+
+- This is a followup to #1102
+- Fixes segfault when running "rrdtool --help"
+- Change DATE_FMT to the same date format as the __DATE__ macro [1]:
+  mmm dd yyyy
+
+[1] https://gcc.gnu.org/onlinedocs/cpp/Standard-Predefined-Macros.html
+---
+ configure.ac   | 2 +-
+ src/rrd_tool.c | 8 ++++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4d2345855..5169b0d49 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -695,7 +695,7 @@ AC_MSG_RESULT(${COMP_PERL:-No Perl Modules will be built})
+ 
+ # Use reproducible build date and time
+ if test "$SOURCE_DATE_EPOCH"; then
+-	DATE_FMT="%d %b %Y %H:%M:%S"
++	DATE_FMT="%b %d %Y %H:%M:%S"
+ 	BUILD_DATE=$(LC_ALL=C date -u -d "@$SOURCE_DATE_EPOCH" "+$DATE_FMT")
+ 	AC_DEFINE_UNQUOTED([BUILD_DATE], ["$BUILD_DATE"], [Use reproducible build date])
+ fi
+diff --git a/src/rrd_tool.c b/src/rrd_tool.c
+index 930d08272..cc6119d9a 100644
+--- a/src/rrd_tool.c
++++ b/src/rrd_tool.c
+@@ -45,11 +45,19 @@ static void PrintUsage(
+     char *cmd)
+ {
+ 
++#ifdef BUILD_DATE
++    const char *help_main =
++        N_("RRDtool %s"
++           "  Copyright by Tobias Oetiker <tobi@oetiker.ch>\n"
++           "               Compiled %s\n\n"
++           "Usage: rrdtool [options] command command_options\n");
++#else
+     const char *help_main =
+         N_("RRDtool %s"
+            "  Copyright by Tobias Oetiker <tobi@oetiker.ch>\n"
+            "               Compiled %s %s\n\n"
+            "Usage: rrdtool [options] command command_options\n");
++#endif
+ 
+     const char *help_list =
+         N_
diff --git a/main/rrdtool/libm-underlinking.patch b/main/rrdtool/libm-underlinking.patch
deleted file mode 100644
index 7de545f3957..00000000000
--- a/main/rrdtool/libm-underlinking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -128,7 +128,7 @@
- 
- rrdtool_SOURCES = rrd_tool.c
- rrdtool_DEPENDENCIES = librrd.la
--rrdtool_LDADD	= librrd.la
-+rrdtool_LDADD	= librrd.la -lm
- 
- rrdcached_SOURCES = rrd_daemon.c
- rrdcached_DEPENDENCIES = librrd.la librrdupd.la
diff --git a/main/rrdtool/no-posix-fallocate.patch b/main/rrdtool/no-posix-fallocate.patch
deleted file mode 100644
index 975aaa3a6f8..00000000000
--- a/main/rrdtool/no-posix-fallocate.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -316,9 +316,6 @@
- #include <fcntl.h>])
- AC_CHECK_FUNCS(posix_fadvise)
- 
--dnl can we use posix_fallocate
--AC_CHECK_FUNCS(posix_fallocate)
--
- CONFIGURE_PART(Libintl Processing)
- 
- AM_GNU_GETTEXT_VERSION(0.17)
diff --git a/main/rsnapshot/APKBUILD b/main/rsnapshot/APKBUILD
index 0fd3da07f25..735a44625e1 100644
--- a/main/rsnapshot/APKBUILD
+++ b/main/rsnapshot/APKBUILD
@@ -1,16 +1,17 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rsnapshot
-pkgver=1.4.3
+pkgver=1.4.5
 pkgrel=0
 pkgdesc="Local and remote filesystem snapshot utility"
-url="http://www.rsnapshot.org/"
+url="https://rsnapshot.org/"
 arch="noarch"
 license="GPL-2.0-or-later"
 depends="perl rsync openssh-client"
 makedepends="$depends_dev"
+options="!check" # failing tests
 subpackages="$pkgname-doc"
-source="http://www.rsnapshot.org/downloads/rsnapshot-$pkgver.tar.gz"
+source="https://rsnapshot.org/downloads/rsnapshot-$pkgver.tar.gz"
 
 build() {
 	./configure \
@@ -24,8 +25,14 @@ build() {
 	make
 }
 
+check() {
+	make test
+}
+
 package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="606b5c195e609197ae6711a9764c07a0f0822fe228aba07014155636bd5caa7ad7dbf8f42316275a71490b5c9dd33bf04c42580b92f4910c38ef871694ae09e3  rsnapshot-1.4.3.tar.gz"
+sha512sums="
+6caa2d7c425d084d0bb393421a0ed1ba78fdd27f7d8cec4810bc4a9f88b3232aeff7e4682282178f7702e2adc7abc8e9201249bf2bcaa28faa16e30aaa62e18a  rsnapshot-1.4.5.tar.gz
+"
diff --git a/main/rssh/APKBUILD b/main/rssh/APKBUILD
new file mode 100644
index 00000000000..856a207d56b
--- /dev/null
+++ b/main/rssh/APKBUILD
@@ -0,0 +1,52 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=rssh
+pkgver=2.3.4
+pkgrel=4
+pkgdesc="Restricted shell for use with OpenSSH, allowing only scp, sftp, and/or rsync"
+url="http://www.pizzashack.org/rssh/"
+arch="all"
+license="BSD-2-Clause"
+depends="openssh"
+makedepends="rsync"
+install="$pkgname.post-install $pkgname.post-deinstall"
+subpackages="$pkgname-doc"
+source="https://prdownloads.sourceforge.net/rssh/rssh-$pkgver.tar.gz
+	makefile.patch
+	fix-error-message-for-invalid-option.patch
+	handle-rsync-v3-e-option.patch
+	verify-scp-options.patch
+	check-command-line-after-chroot.patch"
+options="suid !check"
+
+# secfixes:
+#   2.3.4-r2:
+#     - CVE-2019-3463
+#     - CVE-2019-1000018
+#   2.3.4-r1:
+#     - CVE-2019-3464
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--libexecdir=/usr/lib/$pkgname \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+c1a77abdf4abe5f936fb1c9c008fc81fabf7b624d69ed31fe2ae5619dfa4a79f1d4a4f2daa5291a36d40353fa2168e74e5ba61294230d702fcdc88ae0d520487  rssh-2.3.4.tar.gz
+7b1120b47a1c5d251f002d4196ffac66bcc4518b34284831932d7ef0aae839777c8188cb2addacb57241b6208c03c5b14f1845a50bb5b72461f80a7f943ef051  makefile.patch
+abad4a707f7851c60549d6073c331a4a2b47bdcf97956d5cbad3af9bcb83d6ad33694ac3270df5c7df6ec709026e0253c49024fa20a33a453524547031df77aa  fix-error-message-for-invalid-option.patch
+942dd8e0495cf13bbb679332cab6c1781560e32ade0905527fe71e5399f930edfe0c442653deb218a182b11e49599c3bd78d0fc715de45cf9aa078e6a586b9c7  handle-rsync-v3-e-option.patch
+1be9e3be58e44359e51ad16e10fa3674bf322059131a93ed44487f0fefa89130806f7851d725e20eeff5af40f5b5558ca471ab5eba932a8ce654b25845a7328e  verify-scp-options.patch
+d4d8518b109c6d2d99a8c9a3a49f4df1b29e621f9826e80c599aa2c991ca9c4b6fe683d2475da7935e375e5049a8c33e8dd9019e83ed2111804bba02e03c6f48  check-command-line-after-chroot.patch
+"
diff --git a/main/rssh/check-command-line-after-chroot.patch b/main/rssh/check-command-line-after-chroot.patch
new file mode 100644
index 00000000000..8ef515d4756
--- /dev/null
+++ b/main/rssh/check-command-line-after-chroot.patch
@@ -0,0 +1,30 @@
+From: Russ Allbery <rra@debian.org>
+Date: Mon, 28 Jan 2019 20:15:30 -0800
+Subject: Check command line after chroot
+
+When a command was configured with a chroot, rssh did not check
+the safety of the command line after chroot, allowing various
+vectors of remote code execution inside the chroot environment.
+Perform the same check after chroot as is performed before running
+the command when a chroot is not configured.
+---
+ rssh_chroot_helper.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/rssh_chroot_helper.c b/rssh_chroot_helper.c
+index 8a35cdc..73d8c7b 100644
+--- a/rssh_chroot_helper.c
++++ b/rssh_chroot_helper.c
+@@ -218,6 +218,12 @@ int main( int argc, char **argv )
+ 		ch_fatal_error("build_arg_vector()", argv[2],
+ 				"bad expansion");
+ 
++	/* check the command for safety */
++	if ( !check_command_line(argvec, &opts) ){
++		fprintf(stderr, "\n");
++		exit(1);
++	}
++
+ 	/* 
+ 	 * This is the old way to figure out what program to run.  Since we're
+ 	 * re-parsing the config file in rssh_chroot helper, we could get rid
diff --git a/main/rssh/fix-error-message-for-invalid-option.patch b/main/rssh/fix-error-message-for-invalid-option.patch
new file mode 100644
index 00000000000..10ed0583f3e
--- /dev/null
+++ b/main/rssh/fix-error-message-for-invalid-option.patch
@@ -0,0 +1,18 @@
+From: Russ Allbery <rra@debian.org>
+Subject: [PATCH] Fix error message from invalid options
+
+Don't refer to all invalid options as invalid scp options.
+
+Signed-off-by: Russ Allbery <rra@debian.org>
+
+--- a/util.c
++++ b/util.c
+@@ -152,7 +152,7 @@ bool opt_filter(char **vec, const char opt)
+ 	while (vec && *vec){
+ 		if (opt_exist(*vec, opt)){
+ 			fprintf(stderr, "\nillegal insecure %c option", opt);
+-			log_msg("insecure %c option in scp command line!", opt);
++			log_msg("insecure %c option in command line!", opt);
+ 			return TRUE;
+ 		}
+ 		vec++;
diff --git a/main/rssh/handle-rsync-v3-e-option.patch b/main/rssh/handle-rsync-v3-e-option.patch
new file mode 100644
index 00000000000..e1694ee0adc
--- /dev/null
+++ b/main/rssh/handle-rsync-v3-e-option.patch
@@ -0,0 +1,130 @@
+From: Russ Allbery <rra@stanford.edu>
+Subject: [PATCH] Handle the rsync v3 -e option for protocol information
+
+As of rsync 3, rsync reused the -e option to pass protocol information
+from the client to the server.  We therefore cannot reject all -e
+options to rsync, only ones not sent with --server or containing
+something other than protocol information as an argument.
+
+Also scan the rsync command line for any --rsh option and reject it as
+well.  This replaces and improves the upstream strategy for rejecting
+that command-line option, taking advantage of the parsing added to
+check the -e option.
+
+Based on work by Robert Hardy.
+
+Debian Bug#471803
+
+Signed-off-by: Russ Allbery <rra@stanford.edu>
+
+---
+ util.c |   80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 72 insertions(+), 8 deletions(-)
+
+diff --git a/util.c b/util.c
+index f98d2bc..a257b06 100644
+--- a/util.c
++++ b/util.c
+@@ -56,6 +56,7 @@
+ #ifdef HAVE_LIBGEN_H
+ #include <libgen.h>
+ #endif /* HAVE_LIBGEN_H */
++#include <regex.h>
+ 
+ /* LOCAL INCLUDES */
+ #include "pathnames.h"
+@@ -198,6 +199,73 @@ bool check_command( char *cl, ShellOptions_t *opts, char *cmd, int cmdflag )
+ 
+ 
+ /*
++ * rsync_e_okay() - take the command line passed to rssh and look for an -e
++ *		    option.  If one is found, make sure --server is provided
++ *		    and the option contains only the protocol information.
++ *		    Also check for and reject any --rsh option.	 Returns FALSE
++ *		    if the command line should not be allowed, TRUE if it is
++ *		    okay.
++ */
++static int rsync_e_okay( char **vec )
++{
++	regex_t	re;
++	int	server = FALSE;
++	int	e_found = FALSE;
++
++	/*
++	 * rsync will send -e, followed by either just "." (meaning no special
++	 * protocol) or "N.N" (meaning a pre-release protocol version),
++	 * followed by some number of alphabetic flags indicating various
++	 * supported options.  There may be other options between - and the e,
++	 * but -e will always be the last option in the string.	 A typical
++	 * option passed by the client is "-ltpre.iL".
++	 *
++	 * Note that if --server is given, this should never be parsed as a
++	 * shell, but we'll tightly verify it anyway, just in case.
++	 *
++	 * This regex matches the acceptable flags containing -e, so if it
++	 * does not match, the command line should be rejected.
++	 */
++	static const char pattern[]
++	    = "^-[a-df-zA-Z]*e[0-9]*\\.[0-9]*[a-zA-Z]*$";
++
++	/*
++	 * Only recognize --server if it's the first option.  rsync itself
++	 * always passes it that way, and if it's not the first argument, it
++	 * could be hidden from the server as an argument to some other
++	 * option.
++	 */
++	if ( vec && vec[0] && vec[1] && strcmp(vec[1], "--server") == 0 ){
++		server = TRUE;
++	}
++
++	/* Check the remaining options for -e or --rsh. */
++	if ( regcomp(&re, pattern, REG_EXTENDED | REG_NOSUB) != 0 ){
++		return FALSE;
++	}
++	while (vec && *vec){
++		if ( strcmp(*vec, "--") == 0 ) break;
++		if ( strcmp(*vec, "--rsh") == 0
++		     || strncmp(*vec, "--rsh=", strlen("--rsh=")) == 0 ){
++			regfree(&re);
++			return FALSE;
++		}
++		if ( strncmp(*vec, "--", 2) != 0 && opt_exist(*vec, 'e') ){
++			e_found = TRUE;
++			if ( regexec(&re, *vec, 0, NULL, 0) != 0 ){
++				regfree(&re);
++				return FALSE;
++			}
++		}
++		vec++;
++	}
++	regfree(&re);
++	if ( e_found && !server ) return FALSE;
++	return TRUE;
++}
++
++
++/*
+  * check_command_line() - take the command line passed to rssh, and verify
+  *			  that the specified command is one the user is
+  *			  allowed to run and validate the arguments.  Return the
+@@ -230,14 +298,10 @@ char *check_command_line( char **cl, ShellOptions_t *opts )
+ 
+ 	if ( check_command(*cl, opts, PATH_RSYNC, RSSH_ALLOW_RSYNC) ){
+ 		/* filter -e option */
+-		if ( opt_filter(cl, 'e') ) return NULL;
+-		while (cl && *cl){
+-			if ( strstr(*cl, "--rsh" ) ){
+-				fprintf(stderr, "\ninsecure --rsh= not allowed.");
+-				log_msg("insecure --rsh option in rsync command line!");
+-				return NULL;
+-			}
+-			cl++;
++		if ( !rsync_e_okay(cl) ){
++			fprintf(stderr, "\ninsecure -e or --rsh option not allowed.");
++			log_msg("insecure -e or --rsh option in rsync command line!");
++			return NULL;
+ 		}
+ 		return PATH_RSYNC;
+ 	}
+-- 
+tg: (f8b36e2..) fixes/rsync-protocol (depends on: upstream)
diff --git a/main/rssh/makefile.patch b/main/rssh/makefile.patch
new file mode 100644
index 00000000000..ad75dd30a67
--- /dev/null
+++ b/main/rssh/makefile.patch
@@ -0,0 +1,18 @@
+Upstream: No
+Reason: Respect required environment variables
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -727,10 +727,10 @@ uninstall-man: uninstall-man1 uninstall-
+ 
+ 
+ .c.o:
+-	$(CC) -c $(DEFS) $(ourdefs) $(AM_CFLAGS) $(CPPFLAGS) $(LDFLAGS) $<
++	$(CC) -c $(DEFS) $(ourdefs) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $<
+ 
+ install-exec-hook:
+-	chmod u+s $(libexecdir)/rssh_chroot_helper
++	chmod u+s $(DESTDIR)$(libexecdir)/rssh_chroot_helper
+ 
+ rpm:	dist
+ 	rpmbuild -ta --sign $(base).tar.gz
diff --git a/main/rssh/rssh.post-deinstall b/main/rssh/rssh.post-deinstall
new file mode 100644
index 00000000000..5cf5331a113
--- /dev/null
+++ b/main/rssh/rssh.post-deinstall
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+remove-shell /usr/bin/rssh
+exit 0
diff --git a/main/rssh/rssh.post-install b/main/rssh/rssh.post-install
new file mode 100644
index 00000000000..926f2582244
--- /dev/null
+++ b/main/rssh/rssh.post-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+add-shell /usr/bin/rssh
+exit 0
diff --git a/main/rssh/verify-scp-options.patch b/main/rssh/verify-scp-options.patch
new file mode 100644
index 00000000000..3b256966b8a
--- /dev/null
+++ b/main/rssh/verify-scp-options.patch
@@ -0,0 +1,89 @@
+From: Russ Allbery <rra@debian.org>
+Date: Thu, 17 Jan 2019 19:21:40 -0800
+Subject: Verify scp command options
+
+ESnet discovered a security vulnerability in the scp backend for
+rssh.  Since the arguments to scp on the server side were not
+checked, the client could pass in arbitrary scp command-line flags,
+including setting arbitrary scp options.  This allows setting the
+option PKCS11Provider, which loads and executes code from a shared
+module.
+
+Even if the -o flag is blocked, this is still possible via -F to
+load an already-uploaded ssh configuration file, or, if .ssh/config
+is writable, by just uploading that configuration file directly
+first.
+
+Attempt to protect against this attack by checking the command line
+of scp and only allowing the options that are passed to the server
+end of the connection.  Require either -f or -t be given, which
+disables scp's attempts to connect to a remote host.  Allow these as
+-pf and -pt, which are sent by libssh2.
+
+Debian Bug#919623
+---
+ util.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 42 insertions(+), 2 deletions(-)
+
+diff --git a/util.c b/util.c
+index dc8c8fb..4203eac 100644
+--- a/util.c
++++ b/util.c
+@@ -266,6 +266,43 @@ static int rsync_okay( char **vec )
+ }
+ 
+ 
++/*
++ * scp_okay() - take the command line and check that it is a hopefully-safe scp
++ *		server command line, accepting only very specific options.
++ *		Returns FALSE if the command line should not be allowed, TRUE
++ *		if it is okay.
++ */
++static int scp_okay( char **vec )
++{
++	int saw_f_or_t = FALSE;
++
++	for ( vec++; vec && *vec; vec++ ){
++		/* Allowed options. */
++		if ( strcmp(*vec, "-v") == 0 ) continue;
++		if ( strcmp(*vec, "-r") == 0 ) continue;
++		if ( strcmp(*vec, "-p") == 0 ) continue;
++		if ( strcmp(*vec, "-d") == 0 ) continue;
++		if ( strcmp(*vec, "-f") == 0 || strcmp(*vec, "-pf") == 0 ){
++			saw_f_or_t = TRUE;
++			continue;
++		}
++		if ( strcmp(*vec, "-t") == 0 || strcmp(*vec, "-pt") == 0 ){
++			saw_f_or_t = TRUE;
++			continue;
++		}
++
++		/* End of arguments. */
++		if ( strcmp(*vec, "--") == 0 ) break;
++
++		/* Any other argument is not allowed. */
++		if ( *vec[0] == '-' ) return FALSE;
++	}
++
++	/* Either -f or -t must have been given. */
++	return saw_f_or_t;
++}
++
++
+ /*
+  * check_command_line() - take the command line passed to rssh, and verify
+  *			  that the specified command is one the user is
+@@ -281,8 +318,11 @@ char *check_command_line( char **cl, ShellOptions_t *opts )
+ 		return PATH_SFTP_SERVER;
+ 
+ 	if ( check_command(*cl, opts, PATH_SCP, RSSH_ALLOW_SCP) ){
+-		/* filter -S option */
+-		if ( opt_filter(cl, 'S') ) return NULL;
++		if ( !scp_okay(cl) ){
++			fprintf(stderr, "\ninsecure scp option not allowed.");
++			log_msg("insecure scp option in scp command line");
++			return NULL;
++		}
+ 		return PATH_SCP;
+ 	}
+ 
diff --git a/main/rsync/APKBUILD b/main/rsync/APKBUILD
index 144eff8bd11..a4adb4ef543 100644
--- a/main/rsync/APKBUILD
+++ b/main/rsync/APKBUILD
@@ -1,13 +1,22 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rsync
-pkgver=3.1.3
-pkgrel=3
+pkgver=3.3.0
+pkgrel=0
 pkgdesc="A file transfer program to keep remote files in sync"
 url="https://rsync.samba.org/"
 arch="all"
 license="GPL-3.0-or-later"
-makedepends="perl acl-dev attr-dev popt-dev zlib-dev"
-subpackages="$pkgname-doc $pkgname-openrc rrsync"
+makedepends="
+	acl-dev
+	attr-dev
+	lz4-dev
+	perl
+	popt-dev
+	xxhash-dev
+	zlib-dev
+	zstd-dev
+	"
+subpackages="$pkgname-doc $pkgname-openrc rrsync::noarch"
 source="https://download.samba.org/pub/rsync/rsync-$pkgver.tar.gz
 	rsyncd.initd
 	rsyncd.confd
@@ -16,21 +25,28 @@ source="https://download.samba.org/pub/rsync/rsync-$pkgver.tar.gz
 	"
 
 # secfixes:
+#   3.2.4-r2:
+#     - CVE-2022-29154
 #   3.1.2-r7:
 #     - CVE-2017-16548
 #     - CVE-2017-17433
 #     - CVE-2017-17434
+#   0:
+#     - CVE-2020-14387
 
 # delete the itemize test because it is flawed and depends on filesystem-specific behavior
 prepare() {
 	default_prepare
+	update_config_sub
+
 	rm testsuite/itemize.test
+
+	# Prevent the aports version being used
+	printf '#!/bin/sh\n\necho "#define RSYNC_GITVER RSYNC_VERSION" >git-version.h\n' >mkgitver
 }
 
 build() {
-	# Force IPv6 enabled, upstream bug https://bugzilla.samba.org/show_bug.cgi?id=10715
-	CFLAGS="$CFLAGS -DINET6" \
-
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -39,7 +55,12 @@ build() {
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
 		--enable-acl-support \
-		--enable-xattr-support
+		--enable-xattr-support \
+		--enable-xxhash \
+		--without-included-popt \
+		--without-included-zlib \
+		--disable-openssl
+		# openssl is disabled since xxh checksums are faster anyway
 	make
 }
 
@@ -54,19 +75,21 @@ package() {
 	install -Dm644 "$srcdir"/rsyncd.conf "$pkgdir"/etc/rsyncd.conf
 	install -Dm644 "$srcdir"/rsyncd.confd "$pkgdir"/etc/conf.d/rsyncd
 	install -Dm644 "$srcdir"/rsyncd.logrotate "$pkgdir"/etc/logrotate.d/rsyncd
+	install -Dm755 support/rrsync -t "$pkgdir"/usr/bin/
+	install -Dm644 rrsync.1 -t "$pkgdir"/usr/share/man/man1/
 }
 
 rrsync() {
 	pkgdesc="Restricted rsync, restricts rsync to a subdir declared in .ssh/authorized_keys"
-	depends="rsync perl"
-	arch="noarch"
+	depends="rsync python3"
 
-	cd "$builddir"
-	install -D -m 755 ./support/rrsync "$subpkgdir"/usr/bin/rrsync
+	amove usr/bin/rrsync
 }
 
-sha512sums="8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99  rsync-3.1.3.tar.gz
-a970a1a991df32ea28678791d6599f3302e32e2c5c53f44fae567c191db7951bc07e4001f34864fec63e0005dcaa5dc939e77edf652481ff8820e7f422895dfb  rsyncd.initd
-94308fa7c0f80156d0863a446ec4630afeafed7b458c6c83e93aba41192327d113b712cde875ce2967bc98cd8fb6a9ebc57841d58ae9759aa232643fb72fb005  rsyncd.confd
+sha512sums="
+df5c53bc2f2b0e7e30f475903e5e4296dc2fbcf08e9ea6c3c61462d0e52b067c27e82deeb4be79102c86e9aa55a825182e126f22df44dabf5b7328acb2a01d10  rsync-3.3.0.tar.gz
+b9bf1aa02f96e4294642ead5751bd529ca1267c08e83a16342fba5736c3a8ec89568feb11fb737e974cb1bee7e00e7a8898d25844892366c6167b9ea8d1e647c  rsyncd.initd
+d91337cfb57e6e3b2a8ba1e24f7d851dd927bfc327da2212b9eb0acda0e1ca2f24987f6dcc4903eccc3bf170e0f115172b3cfa5a172700495296f26302c834d7  rsyncd.confd
 3db8a2b364fc89132af6143af90513deb6be3a78c8180d47c969e33cb5edde9db88aad27758a6911f93781e3c9846aeadc80fffc761c355d6a28358853156b62  rsyncd.conf
-b8d6c0bb467a5c963317dc55478d2c10874564cd264d943d4a42037e2fce134fe001fabc92af5c6b5775e84dc310b1c8da147afaa61c99e5663c36580d8651a5  rsyncd.logrotate"
+e7ff164926785c4eff2ea641c7ce2d270b25f1c26d93a6108bb6ff2c0207a28ebfd93dca39596243446ce41aceaeae62fc2b34084eb9c9086fcdbc03a657eed8  rsyncd.logrotate
+"
diff --git a/main/rsync/rsyncd.confd b/main/rsync/rsyncd.confd
index 6cf9f3c6bdd..48a58b70f49 100644
--- a/main/rsync/rsyncd.confd
+++ b/main/rsync/rsyncd.confd
@@ -1,8 +1,11 @@
-# Config file for /etc/init.d/rsyncd
+# Configuration file for /etc/init.d/rsyncd
 
 # Path to configuration file.
 #cfgfile="/etc/rsyncd.conf"
 
 # See man pages for rsync or run `rsync --daemon --help`
 # for valid cmdline options.
-#RSYNC_OPTS=""
+#command_args=""
+
+# Uncomment to use process supervisor.
+#supervisor=supervise-daemon
diff --git a/main/rsync/rsyncd.initd b/main/rsync/rsyncd.initd
index 8d60a9399af..b5d67f8ddef 100644
--- a/main/rsync/rsyncd.initd
+++ b/main/rsync/rsyncd.initd
@@ -1,16 +1,13 @@
 #!/sbin/openrc-run
 
-supervisor=supervise-daemon
-
 : ${cfgfile:="/etc/rsyncd.conf"}
 
-name="rsync daemon"
-description="A file transfer program to keep remote files in sync"
-
 command="/usr/bin/rsync"
-command_args="--daemon --config=$cfgfile $RSYNC_OPTS"
-command_args_foreground="--no-detach"
+command_args="--daemon --no-detach --config=$cfgfile
+	$command_args $RSYNC_OPTS"  # RSYNC_OPTS is here for backward compatibility
+command_background="yes"
 
+pidfile="/run/$RC_SVCNAME.pid"
 required_files="$cfgfile"
 
 depend() {
diff --git a/main/rsync/rsyncd.logrotate b/main/rsync/rsyncd.logrotate
index 34bcf72d210..ec8a98284e2 100644
--- a/main/rsync/rsyncd.logrotate
+++ b/main/rsync/rsyncd.logrotate
@@ -2,7 +2,7 @@
 	compress
 	maxage 365
 	rotate 7
-	size=+1024k
+	size 1024k
 	notifempty
 	missingok
 	copytruncate
diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD
index 95582437e1f..ff38f87fbfa 100644
--- a/main/rsyslog/APKBUILD
+++ b/main/rsyslog/APKBUILD
@@ -5,16 +5,17 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Cameron Banta <cbanta@gmail.com>
 pkgname=rsyslog
-pkgver=8.2002.0
-pkgrel=1
-pkgdesc="Enhanced multi-threaded syslogd with database support and more."
+pkgver=8.2404.0
+pkgrel=0
+pkgdesc="Enhanced multi-threaded syslogd with database support and more"
 url="https://www.rsyslog.com/"
 arch="all !s390x" # limited by czmq
-license="Apache-2.0 GPL-3.0-or-later LGPL-3.0-or-later"
+license="Apache-2.0 AND GPL-3.0-or-later AND LGPL-3.0-or-later"
 options="!check"
 makedepends="
 	autoconf
 	automake
+	bsd-compat-headers
 	byacc
 	curl-dev
 	czmq-dev
@@ -30,12 +31,12 @@ makedepends="
 	liblognorm-dev
 	libmaxminddb-dev
 	libnet-dev
+	libpq-dev
 	librelp-dev
 	libtool
 	linux-headers
 	mariadb-connector-c-dev
 	net-snmp-dev
-	postgresql-dev
 	py3-docutils
 	rabbitmq-c-dev
 	util-linux-dev
@@ -47,8 +48,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/rsyslog/rsyslog/archive/v$pk
 	$pkgname.initd
 	$pkgname.logrotate
 	$pkgname.conf
-	musl-fix.patch
-	queue.patch
 	"
 
 # <subpackage>[:<module>...]
@@ -70,6 +69,7 @@ _plugins="
 	mmrm1stspace
 	mmsequence
 	mmsnmptrapd
+	mmtaghostname
 	mmutf8fix
 	mysql:ommysql
 	pgsql:ompgsql
@@ -92,6 +92,8 @@ for _i in $_plugins; do
 done
 
 # secfixes:
+#   8.2204.1-r0:
+#     - CVE-2022-24903
 #   8.1908.0-r1:
 #     - CVE-2019-17040
 #     - CVE-2019-17041
@@ -103,6 +105,7 @@ prepare() {
 }
 
 build() {
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -134,6 +137,7 @@ build() {
 		--enable-mmdblookup \
 		--enable-mmfields \
 		--enable-mmpstrucdata \
+		--enable-mmtaghostname \
 		--enable-relp \
 		--enable-imfile \
 		--enable-imptcp \
@@ -168,7 +172,7 @@ package() {
 }
 
 _plugin() {
-	local name="${subpkgname#$pkgname-}"
+	local name="${subpkgname#"$pkgname"-}"
 	pkgdesc="$name support for $pkgname"
 	depends="$pkgname=$pkgver-r$pkgrel"
 
@@ -187,9 +191,9 @@ _plugin() {
 	done
 }
 
-sha512sums="9eac3b4d159a7dcc1a66db9d59a5f57e548d12721393486ae5d22bd4d0ed8642a2d18bba7fc2d74fb8df7f118f1eed30d99bca0441fcd724964d134e78712cd3  rsyslog-8.2002.0.tar.gz
+sha512sums="
+e7a615878fad6add84acd5029e0c6df0ad1669b8944771ddbf17ea968e073227fda005794e8d83ecd0c7d262ccdf0830c81dcf3ffff54ced6adbb5431ba96eef  rsyslog-8.2404.0.tar.gz
 bcd63c8df2ac63b80f3cb51ba7f544988df6cd875f4e81020e762dff30d7537f21b72c95a4b1c08baf15f4ed5f03defbf3f061673aabada5841f45ab9f579374  rsyslog.initd
-b5cbdcfa601ae8e7617289e7805fe71daa17bd03a7a30e1e1aad7a58a4ad4c1d89c9a203228f15816232ab6ab6d7a2752f7bbf4d259bbd5eccbe9728dc7e8aaa  rsyslog.logrotate
-9c9913b3367ac4d0b0f998ffa3aaaf136cf939ed4275f13f79d4c7336d0978007af13cb2c6f35d17ef25a53907fb064705f23c3b3a6a6fcd06ae85c3c51c7e38  rsyslog.conf
-15745c8cdb730ae548d038ca4c04f9f48ef55c6e04949a8e86df356877563c0fcb9660445e47d3f9530925092d6dd80b2b2fc3f64a114ee85103d137327524cb  musl-fix.patch
-ef2e000b1c42cb5beffb26393952c2a692791e78972ee4b6f187ca53e338122b2004cc5216381c042195f12cc58f37f186a04e12a65b5bdfdcdf76b73393efb7  queue.patch"
+acf0679e0aa7d8d28a2426d6744d3d6d857969b4a5307c4934fe1639868497769194b0fed59b85111bda3e2af5e69d99c130245cb149fed34cadba78d93def98  rsyslog.logrotate
+451b861dc82d7a2810e6c9ff8f80b2c5149cc6b440baf5901149e7b6524a1179826787a924c84403c2e9d8fa7d4df2c909e7f0877ac0cd4e6faf2e37cba7c6c1  rsyslog.conf
+"
diff --git a/main/rsyslog/musl-fix.patch b/main/rsyslog/musl-fix.patch
deleted file mode 100644
index 160a74c7d22..00000000000
--- a/main/rsyslog/musl-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/runtime/rsyslog.h
-+++ b/runtime/rsyslog.h
-@@ -786,3 +786,10 @@
- #endif
- 
- #endif /* multi-include protection */
-+
-+/*  musl patches for alpine */
-+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO)
-+#define GLOB_BRACE 0
-+#ifndef WAIT_ANY
-+#define WAIT_ANY (-1)
-+#endif
diff --git a/main/rsyslog/queue.patch b/main/rsyslog/queue.patch
deleted file mode 100644
index d35fc96fdf4..00000000000
--- a/main/rsyslog/queue.patch
+++ /dev/null
@@ -1,614 +0,0 @@
-From 444b2739a06c3995a47d37a193f579fdf2d1086a Mon Sep 17 00:00:00 2001
-From: Leonardo Arena <rnalrd@alpinelinux.org>
-Date: Tue, 2 May 2017 07:25:35 +0000
-Subject: [PATCH] queue
-
----
- plugins/imptcp/imptcp.c |   2 +-
- plugins/imptcp/queue.h  | 574 ++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 575 insertions(+), 1 deletion(-)
- create mode 100644 plugins/imptcp/queue.h
-
-diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c
-index f50d513..8a6874e 100644
---- a/plugins/imptcp/imptcp.c
-+++ b/plugins/imptcp/imptcp.c
-@@ -50,7 +50,6 @@
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <sys/epoll.h>
--#include <sys/queue.h>
- #include <netinet/tcp.h>
- #include <stdint.h>
- #include <zlib.h>
-@@ -59,6 +58,7 @@
- #if HAVE_FCNTL_H
- #include <fcntl.h>
- #endif
-+#include "queue.h"
- #include "rsyslog.h"
- #include "cfsysline.h"
- #include "prop.h"
-diff --git a/plugins/imptcp/queue.h b/plugins/imptcp/queue.h
-new file mode 100644
-index 0000000..daf4553
---- /dev/null
-+++ b/plugins/imptcp/queue.h
-@@ -0,0 +1,574 @@
-+/*
-+ * Copyright (c) 1991, 1993
-+ *	The Regents of the University of California.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ *
-+ *	@(#)queue.h	8.5 (Berkeley) 8/20/94
-+ */
-+
-+#ifndef	_SYS_QUEUE_H_
-+#define	_SYS_QUEUE_H_
-+
-+/*
-+ * This file defines five types of data structures: singly-linked lists,
-+ * lists, simple queues, tail queues, and circular queues.
-+ *
-+ * A singly-linked list is headed by a single forward pointer. The
-+ * elements are singly linked for minimum space and pointer manipulation
-+ * overhead at the expense of O(n) removal for arbitrary elements. New
-+ * elements can be added to the list after an existing element or at the
-+ * head of the list.  Elements being removed from the head of the list
-+ * should use the explicit macro for this purpose for optimum
-+ * efficiency. A singly-linked list may only be traversed in the forward
-+ * direction.  Singly-linked lists are ideal for applications with large
-+ * datasets and few or no removals or for implementing a LIFO queue.
-+ *
-+ * A list is headed by a single forward pointer (or an array of forward
-+ * pointers for a hash table header). The elements are doubly linked
-+ * so that an arbitrary element can be removed without a need to
-+ * traverse the list. New elements can be added to the list before
-+ * or after an existing element or at the head of the list. A list
-+ * may only be traversed in the forward direction.
-+ *
-+ * A simple queue is headed by a pair of pointers, one the head of the
-+ * list and the other to the tail of the list. The elements are singly
-+ * linked to save space, so elements can only be removed from the
-+ * head of the list. New elements can be added to the list after
-+ * an existing element, at the head of the list, or at the end of the
-+ * list. A simple queue may only be traversed in the forward direction.
-+ *
-+ * A tail queue is headed by a pair of pointers, one to the head of the
-+ * list and the other to the tail of the list. The elements are doubly
-+ * linked so that an arbitrary element can be removed without a need to
-+ * traverse the list. New elements can be added to the list before or
-+ * after an existing element, at the head of the list, or at the end of
-+ * the list. A tail queue may be traversed in either direction.
-+ *
-+ * A circle queue is headed by a pair of pointers, one to the head of the
-+ * list and the other to the tail of the list. The elements are doubly
-+ * linked so that an arbitrary element can be removed without a need to
-+ * traverse the list. New elements can be added to the list before or after
-+ * an existing element, at the head of the list, or at the end of the list.
-+ * A circle queue may be traversed in either direction, but has a more
-+ * complex end of list detection.
-+ *
-+ * For details on the use of these macros, see the queue(3) manual page.
-+ */
-+
-+/*
-+ * List definitions.
-+ */
-+#define	LIST_HEAD(name, type)						\
-+struct name {								\
-+	struct type *lh_first;	/* first element */			\
-+}
-+
-+#define	LIST_HEAD_INITIALIZER(head)					\
-+	{ NULL }
-+
-+#define	LIST_ENTRY(type)						\
-+struct {								\
-+	struct type *le_next;	/* next element */			\
-+	struct type **le_prev;	/* address of previous next element */	\
-+}
-+
-+/*
-+ * List functions.
-+ */
-+#define	LIST_INIT(head) do {						\
-+	(head)->lh_first = NULL;					\
-+} while (/*CONSTCOND*/0)
-+
-+#define	LIST_INSERT_AFTER(listelm, elm, field) do {			\
-+	if (((elm)->field.le_next = (listelm)->field.le_next) != NULL)	\
-+		(listelm)->field.le_next->field.le_prev =		\
-+		    &(elm)->field.le_next;				\
-+	(listelm)->field.le_next = (elm);				\
-+	(elm)->field.le_prev = &(listelm)->field.le_next;		\
-+} while (/*CONSTCOND*/0)
-+
-+#define	LIST_INSERT_BEFORE(listelm, elm, field) do {			\
-+	(elm)->field.le_prev = (listelm)->field.le_prev;		\
-+	(elm)->field.le_next = (listelm);				\
-+	*(listelm)->field.le_prev = (elm);				\
-+	(listelm)->field.le_prev = &(elm)->field.le_next;		\
-+} while (/*CONSTCOND*/0)
-+
-+#define	LIST_INSERT_HEAD(head, elm, field) do {				\
-+	if (((elm)->field.le_next = (head)->lh_first) != NULL)		\
-+		(head)->lh_first->field.le_prev = &(elm)->field.le_next;\
-+	(head)->lh_first = (elm);					\
-+	(elm)->field.le_prev = &(head)->lh_first;			\
-+} while (/*CONSTCOND*/0)
-+
-+#define	LIST_REMOVE(elm, field) do {					\
-+	if ((elm)->field.le_next != NULL)				\
-+		(elm)->field.le_next->field.le_prev = 			\
-+		    (elm)->field.le_prev;				\
-+	*(elm)->field.le_prev = (elm)->field.le_next;			\
-+} while (/*CONSTCOND*/0)
-+
-+#define	LIST_FOREACH(var, head, field)					\
-+	for ((var) = ((head)->lh_first);				\
-+		(var);							\
-+		(var) = ((var)->field.le_next))
-+
-+/*
-+ * List access methods.
-+ */
-+#define	LIST_EMPTY(head)		((head)->lh_first == NULL)
-+#define	LIST_FIRST(head)		((head)->lh_first)
-+#define	LIST_NEXT(elm, field)		((elm)->field.le_next)
-+
-+
-+/*
-+ * Singly-linked List definitions.
-+ */
-+#define	SLIST_HEAD(name, type)						\
-+struct name {								\
-+	struct type *slh_first;	/* first element */			\
-+}
-+
-+#define	SLIST_HEAD_INITIALIZER(head)					\
-+	{ NULL }
-+
-+#define	SLIST_ENTRY(type)						\
-+struct {								\
-+	struct type *sle_next;	/* next element */			\
-+}
-+
-+/*
-+ * Singly-linked List functions.
-+ */
-+#define	SLIST_INIT(head) do {						\
-+	(head)->slh_first = NULL;					\
-+} while (/*CONSTCOND*/0)
-+
-+#define	SLIST_INSERT_AFTER(slistelm, elm, field) do {			\
-+	(elm)->field.sle_next = (slistelm)->field.sle_next;		\
-+	(slistelm)->field.sle_next = (elm);				\
-+} while (/*CONSTCOND*/0)
-+
-+#define	SLIST_INSERT_HEAD(head, elm, field) do {			\
-+	(elm)->field.sle_next = (head)->slh_first;			\
-+	(head)->slh_first = (elm);					\
-+} while (/*CONSTCOND*/0)
-+
-+#define	SLIST_REMOVE_HEAD(head, field) do {				\
-+	(head)->slh_first = (head)->slh_first->field.sle_next;		\
-+} while (/*CONSTCOND*/0)
-+
-+#define	SLIST_REMOVE(head, elm, type, field) do {			\
-+	if ((head)->slh_first == (elm)) {				\
-+		SLIST_REMOVE_HEAD((head), field);			\
-+	}								\
-+	else {								\
-+		struct type *curelm = (head)->slh_first;		\
-+		while(curelm->field.sle_next != (elm))			\
-+			curelm = curelm->field.sle_next;		\
-+		curelm->field.sle_next =				\
-+		    curelm->field.sle_next->field.sle_next;		\
-+	}								\
-+} while (/*CONSTCOND*/0)
-+
-+#define	SLIST_FOREACH(var, head, field)					\
-+	for((var) = (head)->slh_first; (var); (var) = (var)->field.sle_next)
-+
-+/*
-+ * Singly-linked List access methods.
-+ */
-+#define	SLIST_EMPTY(head)	((head)->slh_first == NULL)
-+#define	SLIST_FIRST(head)	((head)->slh_first)
-+#define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
-+
-+
-+/*
-+ * Singly-linked Tail queue declarations.
-+ */
-+#define	STAILQ_HEAD(name, type)					\
-+struct name {								\
-+	struct type *stqh_first;	/* first element */			\
-+	struct type **stqh_last;	/* addr of last next element */		\
-+}
-+
-+#define	STAILQ_HEAD_INITIALIZER(head)					\
-+	{ NULL, &(head).stqh_first }
-+
-+#define	STAILQ_ENTRY(type)						\
-+struct {								\
-+	struct type *stqe_next;	/* next element */			\
-+}
-+
-+/*
-+ * Singly-linked Tail queue functions.
-+ */
-+#define	STAILQ_INIT(head) do {						\
-+	(head)->stqh_first = NULL;					\
-+	(head)->stqh_last = &(head)->stqh_first;				\
-+} while (/*CONSTCOND*/0)
-+
-+#define	STAILQ_INSERT_HEAD(head, elm, field) do {			\
-+	if (((elm)->field.stqe_next = (head)->stqh_first) == NULL)	\
-+		(head)->stqh_last = &(elm)->field.stqe_next;		\
-+	(head)->stqh_first = (elm);					\
-+} while (/*CONSTCOND*/0)
-+
-+#define	STAILQ_INSERT_TAIL(head, elm, field) do {			\
-+	(elm)->field.stqe_next = NULL;					\
-+	*(head)->stqh_last = (elm);					\
-+	(head)->stqh_last = &(elm)->field.stqe_next;			\
-+} while (/*CONSTCOND*/0)
-+
-+#define	STAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-+	if (((elm)->field.stqe_next = (listelm)->field.stqe_next) == NULL)\
-+		(head)->stqh_last = &(elm)->field.stqe_next;		\
-+	(listelm)->field.stqe_next = (elm);				\
-+} while (/*CONSTCOND*/0)
-+
-+#define	STAILQ_REMOVE_HEAD(head, field) do {				\
-+	if (((head)->stqh_first = (head)->stqh_first->field.stqe_next) == NULL) \
-+		(head)->stqh_last = &(head)->stqh_first;			\
-+} while (/*CONSTCOND*/0)
-+
-+#define	STAILQ_REMOVE(head, elm, type, field) do {			\
-+	if ((head)->stqh_first == (elm)) {				\
-+		STAILQ_REMOVE_HEAD((head), field);			\
-+	} else {							\
-+		struct type *curelm = (head)->stqh_first;		\
-+		while (curelm->field.stqe_next != (elm))			\
-+			curelm = curelm->field.stqe_next;		\
-+		if ((curelm->field.stqe_next =				\
-+			curelm->field.stqe_next->field.stqe_next) == NULL) \
-+			    (head)->stqh_last = &(curelm)->field.stqe_next; \
-+	}								\
-+} while (/*CONSTCOND*/0)
-+
-+#define	STAILQ_FOREACH(var, head, field)				\
-+	for ((var) = ((head)->stqh_first);				\
-+		(var);							\
-+		(var) = ((var)->field.stqe_next))
-+
-+#define	STAILQ_CONCAT(head1, head2) do {				\
-+	if (!STAILQ_EMPTY((head2))) {					\
-+		*(head1)->stqh_last = (head2)->stqh_first;		\
-+		(head1)->stqh_last = (head2)->stqh_last;		\
-+		STAILQ_INIT((head2));					\
-+	}								\
-+} while (/*CONSTCOND*/0)
-+
-+/*
-+ * Singly-linked Tail queue access methods.
-+ */
-+#define	STAILQ_EMPTY(head)	((head)->stqh_first == NULL)
-+#define	STAILQ_FIRST(head)	((head)->stqh_first)
-+#define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
-+
-+
-+/*
-+ * Simple queue definitions.
-+ */
-+#define	SIMPLEQ_HEAD(name, type)					\
-+struct name {								\
-+	struct type *sqh_first;	/* first element */			\
-+	struct type **sqh_last;	/* addr of last next element */		\
-+}
-+
-+#define	SIMPLEQ_HEAD_INITIALIZER(head)					\
-+	{ NULL, &(head).sqh_first }
-+
-+#define	SIMPLEQ_ENTRY(type)						\
-+struct {								\
-+	struct type *sqe_next;	/* next element */			\
-+}
-+
-+/*
-+ * Simple queue functions.
-+ */
-+#define	SIMPLEQ_INIT(head) do {						\
-+	(head)->sqh_first = NULL;					\
-+	(head)->sqh_last = &(head)->sqh_first;				\
-+} while (/*CONSTCOND*/0)
-+
-+#define	SIMPLEQ_INSERT_HEAD(head, elm, field) do {			\
-+	if (((elm)->field.sqe_next = (head)->sqh_first) == NULL)	\
-+		(head)->sqh_last = &(elm)->field.sqe_next;		\
-+	(head)->sqh_first = (elm);					\
-+} while (/*CONSTCOND*/0)
-+
-+#define	SIMPLEQ_INSERT_TAIL(head, elm, field) do {			\
-+	(elm)->field.sqe_next = NULL;					\
-+	*(head)->sqh_last = (elm);					\
-+	(head)->sqh_last = &(elm)->field.sqe_next;			\
-+} while (/*CONSTCOND*/0)
-+
-+#define	SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-+	if (((elm)->field.sqe_next = (listelm)->field.sqe_next) == NULL)\
-+		(head)->sqh_last = &(elm)->field.sqe_next;		\
-+	(listelm)->field.sqe_next = (elm);				\
-+} while (/*CONSTCOND*/0)
-+
-+#define	SIMPLEQ_REMOVE_HEAD(head, field) do {				\
-+	if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL) \
-+		(head)->sqh_last = &(head)->sqh_first;			\
-+} while (/*CONSTCOND*/0)
-+
-+#define	SIMPLEQ_REMOVE(head, elm, type, field) do {			\
-+	if ((head)->sqh_first == (elm)) {				\
-+		SIMPLEQ_REMOVE_HEAD((head), field);			\
-+	} else {							\
-+		struct type *curelm = (head)->sqh_first;		\
-+		while (curelm->field.sqe_next != (elm))			\
-+			curelm = curelm->field.sqe_next;		\
-+		if ((curelm->field.sqe_next =				\
-+			curelm->field.sqe_next->field.sqe_next) == NULL) \
-+			    (head)->sqh_last = &(curelm)->field.sqe_next; \
-+	}								\
-+} while (/*CONSTCOND*/0)
-+
-+#define	SIMPLEQ_FOREACH(var, head, field)				\
-+	for ((var) = ((head)->sqh_first);				\
-+		(var);							\
-+		(var) = ((var)->field.sqe_next))
-+
-+/*
-+ * Simple queue access methods.
-+ */
-+#define	SIMPLEQ_EMPTY(head)		((head)->sqh_first == NULL)
-+#define	SIMPLEQ_FIRST(head)		((head)->sqh_first)
-+#define	SIMPLEQ_NEXT(elm, field)	((elm)->field.sqe_next)
-+
-+
-+/*
-+ * Tail queue definitions.
-+ */
-+#define	_TAILQ_HEAD(name, type, qual)					\
-+struct name {								\
-+	qual type *tqh_first;		/* first element */		\
-+	qual type *qual *tqh_last;	/* addr of last next element */	\
-+}
-+#define TAILQ_HEAD(name, type)	_TAILQ_HEAD(name, struct type,)
-+
-+#define	TAILQ_HEAD_INITIALIZER(head)					\
-+	{ NULL, &(head).tqh_first }
-+
-+#define	_TAILQ_ENTRY(type, qual)					\
-+struct {								\
-+	qual type *tqe_next;		/* next element */		\
-+	qual type *qual *tqe_prev;	/* address of previous next element */\
-+}
-+#define TAILQ_ENTRY(type)	_TAILQ_ENTRY(struct type,)
-+
-+/*
-+ * Tail queue functions.
-+ */
-+#define	TAILQ_INIT(head) do {						\
-+	(head)->tqh_first = NULL;					\
-+	(head)->tqh_last = &(head)->tqh_first;				\
-+} while (/*CONSTCOND*/0)
-+
-+#define	TAILQ_INSERT_HEAD(head, elm, field) do {			\
-+	if (((elm)->field.tqe_next = (head)->tqh_first) != NULL)	\
-+		(head)->tqh_first->field.tqe_prev =			\
-+		    &(elm)->field.tqe_next;				\
-+	else								\
-+		(head)->tqh_last = &(elm)->field.tqe_next;		\
-+	(head)->tqh_first = (elm);					\
-+	(elm)->field.tqe_prev = &(head)->tqh_first;			\
-+} while (/*CONSTCOND*/0)
-+
-+#define	TAILQ_INSERT_TAIL(head, elm, field) do {			\
-+	(elm)->field.tqe_next = NULL;					\
-+	(elm)->field.tqe_prev = (head)->tqh_last;			\
-+	*(head)->tqh_last = (elm);					\
-+	(head)->tqh_last = &(elm)->field.tqe_next;			\
-+} while (/*CONSTCOND*/0)
-+
-+#define	TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-+	if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
-+		(elm)->field.tqe_next->field.tqe_prev = 		\
-+		    &(elm)->field.tqe_next;				\
-+	else								\
-+		(head)->tqh_last = &(elm)->field.tqe_next;		\
-+	(listelm)->field.tqe_next = (elm);				\
-+	(elm)->field.tqe_prev = &(listelm)->field.tqe_next;		\
-+} while (/*CONSTCOND*/0)
-+
-+#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
-+	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
-+	(elm)->field.tqe_next = (listelm);				\
-+	*(listelm)->field.tqe_prev = (elm);				\
-+	(listelm)->field.tqe_prev = &(elm)->field.tqe_next;		\
-+} while (/*CONSTCOND*/0)
-+
-+#define	TAILQ_REMOVE(head, elm, field) do {				\
-+	if (((elm)->field.tqe_next) != NULL)				\
-+		(elm)->field.tqe_next->field.tqe_prev = 		\
-+		    (elm)->field.tqe_prev;				\
-+	else								\
-+		(head)->tqh_last = (elm)->field.tqe_prev;		\
-+	*(elm)->field.tqe_prev = (elm)->field.tqe_next;			\
-+} while (/*CONSTCOND*/0)
-+
-+#define	TAILQ_FOREACH(var, head, field)					\
-+	for ((var) = ((head)->tqh_first);				\
-+		(var);							\
-+		(var) = ((var)->field.tqe_next))
-+
-+#define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
-+	for ((var) = (*(((struct headname *)((head)->tqh_last))->tqh_last));	\
-+		(var);							\
-+		(var) = (*(((struct headname *)((var)->field.tqe_prev))->tqh_last)))
-+
-+#define	TAILQ_CONCAT(head1, head2, field) do {				\
-+	if (!TAILQ_EMPTY(head2)) {					\
-+		*(head1)->tqh_last = (head2)->tqh_first;		\
-+		(head2)->tqh_first->field.tqe_prev = (head1)->tqh_last;	\
-+		(head1)->tqh_last = (head2)->tqh_last;			\
-+		TAILQ_INIT((head2));					\
-+	}								\
-+} while (/*CONSTCOND*/0)
-+
-+/*
-+ * Tail queue access methods.
-+ */
-+#define	TAILQ_EMPTY(head)		((head)->tqh_first == NULL)
-+#define	TAILQ_FIRST(head)		((head)->tqh_first)
-+#define	TAILQ_NEXT(elm, field)		((elm)->field.tqe_next)
-+
-+#define	TAILQ_LAST(head, headname) \
-+	(*(((struct headname *)((head)->tqh_last))->tqh_last))
-+#define	TAILQ_PREV(elm, headname, field) \
-+	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
-+
-+
-+/*
-+ * Circular queue definitions.
-+ */
-+#define	CIRCLEQ_HEAD(name, type)					\
-+struct name {								\
-+	struct type *cqh_first;		/* first element */		\
-+	struct type *cqh_last;		/* last element */		\
-+}
-+
-+#define	CIRCLEQ_HEAD_INITIALIZER(head)					\
-+	{ (void *)&head, (void *)&head }
-+
-+#define	CIRCLEQ_ENTRY(type)						\
-+struct {								\
-+	struct type *cqe_next;		/* next element */		\
-+	struct type *cqe_prev;		/* previous element */		\
-+}
-+
-+/*
-+ * Circular queue functions.
-+ */
-+#define	CIRCLEQ_INIT(head) do {						\
-+	(head)->cqh_first = (void *)(head);				\
-+	(head)->cqh_last = (void *)(head);				\
-+} while (/*CONSTCOND*/0)
-+
-+#define	CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-+	(elm)->field.cqe_next = (listelm)->field.cqe_next;		\
-+	(elm)->field.cqe_prev = (listelm);				\
-+	if ((listelm)->field.cqe_next == (void *)(head))		\
-+		(head)->cqh_last = (elm);				\
-+	else								\
-+		(listelm)->field.cqe_next->field.cqe_prev = (elm);	\
-+	(listelm)->field.cqe_next = (elm);				\
-+} while (/*CONSTCOND*/0)
-+
-+#define	CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do {		\
-+	(elm)->field.cqe_next = (listelm);				\
-+	(elm)->field.cqe_prev = (listelm)->field.cqe_prev;		\
-+	if ((listelm)->field.cqe_prev == (void *)(head))		\
-+		(head)->cqh_first = (elm);				\
-+	else								\
-+		(listelm)->field.cqe_prev->field.cqe_next = (elm);	\
-+	(listelm)->field.cqe_prev = (elm);				\
-+} while (/*CONSTCOND*/0)
-+
-+#define	CIRCLEQ_INSERT_HEAD(head, elm, field) do {			\
-+	(elm)->field.cqe_next = (head)->cqh_first;			\
-+	(elm)->field.cqe_prev = (void *)(head);				\
-+	if ((head)->cqh_last == (void *)(head))				\
-+		(head)->cqh_last = (elm);				\
-+	else								\
-+		(head)->cqh_first->field.cqe_prev = (elm);		\
-+	(head)->cqh_first = (elm);					\
-+} while (/*CONSTCOND*/0)
-+
-+#define	CIRCLEQ_INSERT_TAIL(head, elm, field) do {			\
-+	(elm)->field.cqe_next = (void *)(head);				\
-+	(elm)->field.cqe_prev = (head)->cqh_last;			\
-+	if ((head)->cqh_first == (void *)(head))			\
-+		(head)->cqh_first = (elm);				\
-+	else								\
-+		(head)->cqh_last->field.cqe_next = (elm);		\
-+	(head)->cqh_last = (elm);					\
-+} while (/*CONSTCOND*/0)
-+
-+#define	CIRCLEQ_REMOVE(head, elm, field) do {				\
-+	if ((elm)->field.cqe_next == (void *)(head))			\
-+		(head)->cqh_last = (elm)->field.cqe_prev;		\
-+	else								\
-+		(elm)->field.cqe_next->field.cqe_prev =			\
-+		    (elm)->field.cqe_prev;				\
-+	if ((elm)->field.cqe_prev == (void *)(head))			\
-+		(head)->cqh_first = (elm)->field.cqe_next;		\
-+	else								\
-+		(elm)->field.cqe_prev->field.cqe_next =			\
-+		    (elm)->field.cqe_next;				\
-+} while (/*CONSTCOND*/0)
-+
-+#define	CIRCLEQ_FOREACH(var, head, field)				\
-+	for ((var) = ((head)->cqh_first);				\
-+		(var) != (const void *)(head);				\
-+		(var) = ((var)->field.cqe_next))
-+
-+#define	CIRCLEQ_FOREACH_REVERSE(var, head, field)			\
-+	for ((var) = ((head)->cqh_last);				\
-+		(var) != (const void *)(head);				\
-+		(var) = ((var)->field.cqe_prev))
-+
-+/*
-+ * Circular queue access methods.
-+ */
-+#define	CIRCLEQ_EMPTY(head)		((head)->cqh_first == (void *)(head))
-+#define	CIRCLEQ_FIRST(head)		((head)->cqh_first)
-+#define	CIRCLEQ_LAST(head)		((head)->cqh_last)
-+#define	CIRCLEQ_NEXT(elm, field)	((elm)->field.cqe_next)
-+#define	CIRCLEQ_PREV(elm, field)	((elm)->field.cqe_prev)
-+
-+#define CIRCLEQ_LOOP_NEXT(head, elm, field)				\
-+	(((elm)->field.cqe_next == (void *)(head))			\
-+	    ? ((head)->cqh_first)					\
-+	    : (elm->field.cqe_next))
-+#define CIRCLEQ_LOOP_PREV(head, elm, field)				\
-+	(((elm)->field.cqe_prev == (void *)(head))			\
-+	    ? ((head)->cqh_last)					\
-+	    : (elm->field.cqe_prev))
-+
-+#endif	/* sys/queue.h */
--- 
-2.12.2
-
diff --git a/main/rsyslog/rsyslog.conf b/main/rsyslog/rsyslog.conf
index d2706daa273..a279fdd09ae 100644
--- a/main/rsyslog/rsyslog.conf
+++ b/main/rsyslog/rsyslog.conf
@@ -23,9 +23,6 @@ $Umask 0022
 # Reduce repeating messages (default off).
 #$RepeatedMsgReduction on
 
-# Include all config files in /etc/rsyslog.d/.
-include(file="/etc/rsyslog.d/*.conf" mode="optional")
-
 
 #### Modules ####
 
@@ -38,6 +35,10 @@ module(load="imuxsock")
 # Reads kernel messages.
 module(load="imklog")
 
+#### Config files ####
+
+# Include all config files in /etc/rsyslog.d/.
+include(file="/etc/rsyslog.d/*.conf" mode="optional")
 
 #### Rules ####
 
@@ -61,9 +62,6 @@ cron.*							-/var/log/cron.log
 # Everybody gets emergency messages.
 *.emerg							:omusrmsg:*
 
-# Save boot messages also to boot.log.
-local7.*						/var/log/boot.log
-
 # Log all kernel messages to the console.
 # Logging much else clutters up the screen.
 #kern.*							/dev/console
diff --git a/main/rsyslog/rsyslog.logrotate b/main/rsyslog/rsyslog.logrotate
index 6a3d01a7401..86ff3d79b6b 100644
--- a/main/rsyslog/rsyslog.logrotate
+++ b/main/rsyslog/rsyslog.logrotate
@@ -1,12 +1,12 @@
+/var/log/messages
 /var/log/auth.log
-/var/log/boot.log
 /var/log/cron.log
 /var/log/kern.log
 /var/log/mail.log
-/var/log/messages
 {
 	notifempty
 	compress
+	missingok
 	sharedscripts
 	postrotate
 		/etc/init.d/rsyslog --ifstarted reload >/dev/null
diff --git a/main/rtapd/APKBUILD b/main/rtapd/APKBUILD
index d6c3d7fc0ab..575f8d8f53f 100644
--- a/main/rtapd/APKBUILD
+++ b/main/rtapd/APKBUILD
@@ -1,39 +1,27 @@
 # Contributor: Jeff Bilyk <jbilyk@alpinelinux.org>
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=rtapd
-_altpkgname="rtnppd"
 pkgver=1.7
-pkgrel=6
+pkgrel=10
 pkgdesc="daemon for routing packets to rtnppd"
 url="https://sourceforge.net/projects/rtnppd/"
 arch="all"
-license="GPL"
+license="BSD-2-Clause"
 depends="rtnppd"
-makedepends="postgresql-dev"
-install=
-subpackages="$pkgname-dbg"
-source="https://downloads.sourceforge.net/$_altpkgname/$pkgname-$pkgver.tar.gz
+makedepends="libpq-dev"
+subpackages="$pkgname-dbg $pkgname-openrc"
+source="https://downloads.sourceforge.net/rtnppd/rtapd-$pkgver.tar.gz
 	musl-strtoq.patch
 	Makefile.patch
 	$pkgname.initd
 	$pkgname.confd"
-
-_builddir="$srcdir"/$pkgname
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/$pkgname
+options="!check"
 
 build() {
-	cd "$_builddir"
-	make || return 1
+	make
 }
 package() {
-	cd "$_builddir"
 	#make DESTDIR="$pkgdir" install
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
@@ -44,8 +32,10 @@ package() {
 	install -m644 -D ./tap_route.conf "$pkgdir"/etc/rtnppd/tag_route.conf
 }
 
-sha512sums="a4759b5af9710e8658f38494f88cfd727e6697b4793655fd80555405dd7fd04e69aaef63692991653f75ff7e2702ec068547d82778bf1cb51c3aa3d8a1178f63  rtapd-1.7.tar.gz
+sha512sums="
+a4759b5af9710e8658f38494f88cfd727e6697b4793655fd80555405dd7fd04e69aaef63692991653f75ff7e2702ec068547d82778bf1cb51c3aa3d8a1178f63  rtapd-1.7.tar.gz
 57d7c6fe5530bcd6c2c27dfa8c2cf473d27cc6cde4e8eb50e302b5c13ffec180523ba93179586cf031a50abb8274383245c41dc20beb35765f7ce42300845e10  musl-strtoq.patch
-29b6575e571369ef00579cf6a2f73a799e93521a29a9b6fee13bf043ccfb220e1a428005cb4d1229ae9a0a9b7cc8a27b77d04096017f32eda29b938a45a13879  Makefile.patch
+77d0fadea46c610e9b4de3b95f5d4c8b596637fff9501c1eddbdb4e23d49869692a223c75dc7a7f2c9ea057972dc6f0fffe477ea88e7fbbc9af010b29e7cb922  Makefile.patch
 5452ae881b1d88fdab95b8987f550ef6d26cb60d6697e38b8ab81010aa40dfb9fa4bee8c053069a882fd9f749882cb96777e3a4866299a6651f1e213e6a4448c  rtapd.initd
-77c3c5bb295b2f3a8c7271ec52a9d4c02bdebc45d7830cb3b0b64b100a2b2649fb28a3e6b615385f9c50f5c847c12064caf981b1dcca2f78432d230649b326fd  rtapd.confd"
+77c3c5bb295b2f3a8c7271ec52a9d4c02bdebc45d7830cb3b0b64b100a2b2649fb28a3e6b615385f9c50f5c847c12064caf981b1dcca2f78432d230649b326fd  rtapd.confd
+"
diff --git a/main/rtapd/Makefile.patch b/main/rtapd/Makefile.patch
index 197cce501da..ccbbe8571e9 100644
--- a/main/rtapd/Makefile.patch
+++ b/main/rtapd/Makefile.patch
@@ -6,7 +6,7 @@
  # and libs in /usr/lib
 -#CFLAGS		= -DUSE_POSTGRESQL -I/usr/include/pgsql
 -#LIBS		= -lpq
-+CFLAGS		= -DUSE_POSTGRESQL -I/usr/include/pgsql
++CFLAGS		= -DUSE_POSTGRESQL -I/usr/include/postgresql
 +LIBS		= -lpq
  
  PREFIX		= /usr/local
diff --git a/main/rtmpdump/APKBUILD b/main/rtmpdump/APKBUILD
index 62035c4edba..7b3c7d52269 100644
--- a/main/rtmpdump/APKBUILD
+++ b/main/rtmpdump/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rtmpdump
 pkgver=2.4_git20190330
-pkgrel=0
+pkgrel=4
 pkgdesc="A tool to download rtmp:// and rtmpe:// streams"
 url="http://rtmpdump.mplayerhq.hu/"
 arch="all"
diff --git a/main/rtnppd/APKBUILD b/main/rtnppd/APKBUILD
index f394452dc35..c3a3846d227 100644
--- a/main/rtnppd/APKBUILD
+++ b/main/rtnppd/APKBUILD
@@ -2,28 +2,27 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=rtnppd
 pkgver=1.7b
-pkgrel=8
+pkgrel=12
 pkgdesc="A program route TNPP 3.8 (Telocator Network Paging Protocol) packets between serial and other links"
 url="https://sourceforge.net/projects/rtnppd/"
 arch="all"
-license="GPL"
-depends=""
-makedepends="postgresql-dev"
+license="BSD-2-Clause"
+makedepends="libpq-dev"
 install="$pkgname.pre-install"
-subpackages="$pkgname-dbg"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+subpackages="$pkgname-dbg $pkgname-openrc"
+source="https://downloads.sourceforge.net/rtnppd/rtnppd-$pkgver.tar.gz
 	$pkgname.initd
 	$pkgname.confd"
 pkgusers="rtnppd"
 pkggroups="rtnppd"
-builddir=$srcdir/"$pkgname"
+builddir="$srcdir/$pkgname"
+options="!check"
 
 build() {
-	cd "$builddir"
-	make || return 1
+	make
 }
+
 package() {
-	cd "$builddir"
 	#make DESTDIR="$pkgdir" install
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
diff --git a/main/rtpproxy/APKBUILD b/main/rtpproxy/APKBUILD
index 649978a2302..d685f13ceb7 100644
--- a/main/rtpproxy/APKBUILD
+++ b/main/rtpproxy/APKBUILD
@@ -1,25 +1,31 @@
 # Contributor: Jeff Bilyk <jbilyk@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=rtpproxy
-pkgver=2.1.0
-pkgrel=0
+pkgver=2.1.1
+pkgrel=3
 pkgdesc="RTP proxy"
 url="https://www.rtpproxy.org/"
 arch="all"
-license="BSD-2-CLause"
+license="BSD-2-Clause"
 makedepends="libsndfile-dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-debug $pkgname-tools $pkgname-openrc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/sippy/rtpproxy/archive/v${pkgver}.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/sippy/rtpproxy/archive/v$pkgver.tar.gz
 	DEFFILEMODE.patch
 	musl-fix-headers.patch
 	define-byte-order.patch
+	format-security.patch
 	prevent-pthread-from-running-macro.patch
 	rtpproxy.confd
 	rtpproxy.initd"
+options="!check"
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -45,16 +51,18 @@ tools() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
-sha512sums="8aa3d1ee7d00518032628c6237cb8ab537924608c66b4421a48436e7d49abc73de41c5b76a2f36b2d481b4d0e7bf31a90ba4495a1faa11fd383eba4b1bc56e57  rtpproxy-2.1.0.tar.gz
+sha512sums="
+f8e520117671e8b46e5e99845efb6eca76d0861d6edae8dcd445dffb970a572e5eeb6e88ba5c9af0603b30dcf197feecb470716c3e32cfff5120ad21420556bd  rtpproxy-2.1.1.tar.gz
 9191c99c98e7576381f6da3fce44c8470b8cad150e8c23c22332caef5b7db81561694390934548cf855b45be895517d370d66cbec39565285f66e0e04c66ee1e  DEFFILEMODE.patch
 bd05f24bfa66cd9491135efe341359cc4b16b80fd9c45fbfc880c7a82ba53ad5f2317dd6bfbaecfd0dd42ba0d54a55041403ba6409b8deff568fcb095892956d  musl-fix-headers.patch
 8ab21c20ee87c0d9ef9a113b436eaecd34d93c596d761b2f4b8d746c34946acb41421ab24be6446dd2ad2c0c3e1cd894637d945e945a90e1af1eda091d91306f  define-byte-order.patch
+6f51719aab8ddbb2870cff110e588a02aa19675a4e52113fc91f4bc271d38ac3d01e6186366aa0039e46d66e90308cd40bb4de4ba0d8dda5984b0551ff07abdf  format-security.patch
 ba54855fd147c8f166939b37a18c0576c55481c762c3f5b9e0ffa45e00eedeeaabb1d3fd4e45fe8f59f43064ecd852d87f83bcc8f746923219e9e3a795cf592e  prevent-pthread-from-running-macro.patch
 e2ab3705329ffd10a8a5723ac3a07a2f98547f29b7055e1616ebbd141d6beff9c81d44579af9f3486f7835a7ac7228ecfe49cf09208438ed490843c6b100a104  rtpproxy.confd
-84f05c765369aa5ef747361e57c557b2560ac734225f5aad99ba28f4178a73d2c937a316fa45f0d42cab27b1c9d033019d98ec67601f0b272b9b45c9196bf2fb  rtpproxy.initd"
+84f05c765369aa5ef747361e57c557b2560ac734225f5aad99ba28f4178a73d2c937a316fa45f0d42cab27b1c9d033019d98ec67601f0b272b9b45c9196bf2fb  rtpproxy.initd
+"
diff --git a/main/rtpproxy/format-security.patch b/main/rtpproxy/format-security.patch
new file mode 100644
index 00000000000..6411bec6f6d
--- /dev/null
+++ b/main/rtpproxy/format-security.patch
@@ -0,0 +1,13 @@
+diff --git a/src/rtpp_log_stand.c b/src/rtpp_log_stand.c
+index c1e4331..d02eeb4 100644
+--- a/src/rtpp_log_stand.c
++++ b/src/rtpp_log_stand.c
+@@ -273,7 +273,7 @@ _rtpp_log_write_va(struct rtpp_log_inst *rli, int level, const char *function,
+     fprintf(stderr, rli->format_se[0], rtpp_time_buff, strlvl(level),
+       call_id, function);
+     vfprintf(stderr, format, ap);
+-    fprintf(stderr, rli->format_se[1]);
++    fprintf(stderr, "%s", rli->format_se[1]);
+     fflush(stderr);
+     _rtpp_log_unlock();
+ }
diff --git a/main/ruby-augeas/APKBUILD b/main/ruby-augeas/APKBUILD
index 0afeb026049..c150c10c8b2 100644
--- a/main/ruby-augeas/APKBUILD
+++ b/main/ruby-augeas/APKBUILD
@@ -1,33 +1,63 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-_gemname=ruby-augeas
-pkgname=$_gemname
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
+pkgname=ruby-augeas
+_gemname=$pkgname
 pkgver=0.5.0
-pkgrel=6
-pkgdesc="Augeas bindings for Ruby"
-url=http://rubygems.org/gems/$_gemname
-arch=all
+pkgrel=13
+pkgdesc="Ruby bindings for Augeas"
+url="https://augeas.net/"
+arch="all"
 license="LGPL-2.1-or-later"
-depends=ruby
-makedepends="augeas-dev ruby-dev"
-source=https://rubygems.org/downloads/$_gemname-$pkgver.gem
+depends="ruby"
+checkdepends="ruby-test-unit"
+makedepends="augeas-dev ruby-dev ruby-rake"
+subpackages="$pkgname-doc"
+source="https://github.com/hercules-team/ruby-augeas/archive/release-$pkgver/$_gemname-$pkgver.tar.gz"
+builddir="$srcdir/$_gemname-release-$pkgver"
 
-builddir=$srcdir/$_realname-$pkgver
 build() {
-	return 0
+	rake gem
+
+	gem install \
+		--local \
+		--install-dir dist \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		pkg/$_gemname-$pkgver.gem
+
+	# Remove duplicated files (sdbm.so is loaded from extensions directory).
+	rm -f dist/gems/$_gemname-*/lib/*.so
+	rm -rf dist/gems/$_gemname-*/ext
+}
+
+check() {
+	GEM_PATH='./dist' rake test
 }
 
 package() {
-	local _gemdir="$(ruby -e 'puts Gem.default_dir')"
-	local _geminstdir=$_gemdir/gems/$_gemname-$pkgver
-	mkdir -p "$pkgdir"
-
-	gem install --local --install-dir "$pkgdir"/$_gemdir \
-		--ignore-dependencies --verbose \
-		"$srcdir"/$_gemname-$pkgver.gem
-	rm -rf "$pkgdir"/$_gemdir/cache \
-		"$pkgdir"/$_geminstdir/ext \
-		"$pkgdir"/$_geminstdir/.require_paths
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+	local geminstdir="$gemdir/gems/$_gemname-$pkgver"
+
+	cd "$builddir"/dist
+
+	mkdir -p "$gemdir"
+	cp -r doc extensions gems specifications "$gemdir"/
+
+	# Remove unnecessary files.
+	find "$gemdir"/extensions/ -name mkmf.log -delete
+
+	cd "$geminstdir"
+	rm -rf COPYING NEWS README.* Rakefile tests
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
 }
 
-sha512sums="523742368543c617baa2b393e4682451d7fe20aecbcf9ab50fed0f5575119b3fbc06f79f0894cca728d2fee7d441cdd9f075dbcf81628835ba870930c3d2ac8d  ruby-augeas-0.5.0.gem"
+sha512sums="
+6d1b152214d77bdc32a053627388398dcd01f1d9901f267e50a01edcf6aa64d2480275bdd8f4b13e4de48034af67ed02ba0f5c03cecc155bb528ad96ff1db8f0  ruby-augeas-0.5.0.tar.gz
+"
diff --git a/main/ruby-bundler/APKBUILD b/main/ruby-bundler/APKBUILD
index f8118008e60..fe2bf42c781 100644
--- a/main/ruby-bundler/APKBUILD
+++ b/main/ruby-bundler/APKBUILD
@@ -1,31 +1,43 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-bundler
 _gemname=bundler
-pkgname=ruby-$_gemname
-pkgver=2.1.4
+pkgver=2.5.7
 pkgrel=0
 pkgdesc="Manage an application's gem dependencies"
 url="https://bundler.io/"
 arch="noarch"
 license="MIT"
-depends="ruby ruby-etc ruby-io-console"
+depends="ruby"
+makedepends="
+	ruby-rake
+	ruby-rdoc
+	"
 subpackages="$pkgname-doc"
-source="https://rubygems.org/downloads/$_gemname-$pkgver.gem"
-builddir="$srcdir/$_gemname-$pkgver"
+source="https://github.com/rubygems/rubygems/archive/bundler-v$pkgver.tar.gz
+	manpages.patch
+	"
+builddir="$srcdir/rubygems-bundler-v$pkgver/bundler"
+options="!check"  # tests require deps not available in main repo
+
+build() {
+	gem build $_gemname.gemspec
+}
 
 package() {
 	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
 
-	gem install --local \
+	gem install \
+		--local \
 		--install-dir "$gemdir" \
 		--bindir "$pkgdir/usr/bin" \
 		--ignore-dependencies \
 		--no-document \
 		--verbose \
-		"$srcdir"/$_gemname-$pkgver.gem
+		$_gemname
 
 	local n; for n in 1 5; do
 		mkdir -p "$pkgdir"/usr/share/man/man$n
-		mv "$gemdir"/gems/$_gemname-$pkgver/man/*.$n "$pkgdir"/usr/share/man/man$n/
+		mv "$gemdir"/gems/$_gemname-$pkgver/lib/bundler/man/*.$n "$pkgdir"/usr/share/man/man$n/
 	done
 
 	rm -rf "$gemdir"/cache \
@@ -35,4 +47,7 @@ package() {
 		"$gemdir"/gems/$_gemname-$pkgver/*.md
 }
 
-sha512sums="6c870061a78e17d97a9219433c7ef8fbf1112de17d0e0f3d8b6db1a518318528e3803184278412aabe65008e93f451ffa59465062856918ef488f9438399eff6  bundler-2.1.4.gem"
+sha512sums="
+2cfca0887246cd4ac7cfea7bed02be1aaad4d77bc334306aad5205b6ebb6b9372e9898b0a7f557cc11455430bc3146c98c267bc9326da29868b181309283007a  bundler-v2.5.7.tar.gz
+76c008a71af25db5dda7055c98330fcb864fe7ffb4a5de34a0ad2bea403b28e0d945faf05685abf525b98c67c305068808fc596882676bbb1eb418d83377db41  manpages.patch
+"
diff --git a/main/ruby-bundler/manpages.patch b/main/ruby-bundler/manpages.patch
new file mode 100644
index 00000000000..338f93c179c
--- /dev/null
+++ b/main/ruby-bundler/manpages.patch
@@ -0,0 +1,38 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Fri, 26 Mar 2021 23:17:29 +0100
+Subject: [PATCH] Fix --help when man pages are moved out
+
+* Allow to move man pages from the gem's directory to the standard
+  system location (/usr/share/man) without breaking `bundler --help`.
+* Fallback to the bundled ronn pages when the man command is available,
+  but the bundler man pages are not (i.e. ruby-bundler-doc is not
+  installed).
+* Execute man with '-c' option to print the man page to the terminal
+  instead of using pager.
+
+--- a/lib/bundler/cli.rb
++++ b/lib/bundler/cli.rb
+@@ -121,16 +121,18 @@
+       end
+ 
+       man_path = File.expand_path("man", __dir__)
+-      man_pages = Hash[Dir.glob(File.join(man_path, "**", "*")).grep(/.*\.\d*\Z/).collect do |f|
+-        [File.basename(f, ".*"), f]
++      man_pages = Hash[Dir.glob(File.join(man_path, "**", "*")).grep(/.*\.\d*\.ronn\Z/).collect do |f|
++        man_name = File.basename(f, ".ronn")
++        [File.basename(man_name, ".*"), man_name]
+       end]
+ 
++
+       if man_pages.include?(command)
+         man_page = man_pages[command]
+-        if Bundler.which("man") && !man_path.match?(%r{^file:/.+!/META-INF/jruby.home/.+})
+-          Kernel.exec("man", man_page)
++        if Bundler.which("man") && Kernel.system("man -w #{command} >/dev/null 2>&1") && !man_path.match?(%r{^file:/.+!/META-INF/jruby.home/.+})
++          Kernel.exec "man -c #{command}"
+         else
+-          puts File.read("#{man_path}/#{File.basename(man_page)}.ronn")
++          puts File.read("#{man_path}/#{man_page}.ronn")
+         end
+       elsif command_path = Bundler.which("bundler-#{cli}")
+         Kernel.exec(command_path, "--help")
diff --git a/main/ruby-debug/APKBUILD b/main/ruby-debug/APKBUILD
new file mode 100644
index 00000000000..94bea280b5c
--- /dev/null
+++ b/main/ruby-debug/APKBUILD
@@ -0,0 +1,84 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-debug
+_gemname=debug
+# Keep version in sync with "Bundled gems" (https://stdgems.org) for the
+# packaged Ruby version.
+pkgver=1.9.2
+pkgrel=0
+pkgdesc="Debugging functionality for Ruby"
+url="https://github.com/ruby/debug"
+arch="all"
+license="BSD-2-Clause AND Ruby"
+depends="ruby"
+checkdepends="
+	ruby-rake
+	ruby-test-unit
+	ruby-test-unit-rr
+	"
+makedepends="ruby-dev ruby-rdoc"
+subpackages="$pkgname-doc"
+source="https://github.com/ruby/debug/archive/v$pkgver/$_gemname-$pkgver.tar.gz
+	gemspec.patch
+	"
+builddir="$srcdir/$_gemname-$pkgver"
+
+case "$CARCH" in
+	# XXX: Tests are flaky on riscv64.
+	riscv64) options="!check";;
+esac
+
+prepare() {
+	default_prepare
+	sed -i '/require .bundler/d' Rakefile
+}
+
+build() {
+	gem build $_gemname.gemspec
+
+	gem install \
+		--local \
+		--install-dir dist \
+		--bindir dist/bin \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+}
+
+check() {
+	export RUBY_DEBUG_TEST_NO_REMOTE=1
+	# XXX: This test fails on GitLab CI, but passes locally.
+	export TESTOPTS="--ignore-name=/^test_list_socks$/"
+
+	GEM_PATH='dist' rake test
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	cd "$builddir"/dist
+
+	mkdir -p "$gemdir"
+	cp -r doc extensions gems specifications "$gemdir"/
+
+	mkdir -p "$pkgdir"/usr/bin
+	cp -r bin/* "$pkgdir"/usr/bin/
+
+	# Remove unnecessary files and rubbish...
+	find "$gemdir"/extensions/ -name mkmf.log -delete
+
+	cd "$gemdir"/gems/$_gemname-$pkgver
+	rm -r ext/
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+b65e7952f0020f79481273175abc382827283f667c52a29eee4f77303368e65ff71c517f8cd278b011ae81c335281d4303ab83e6c5d5c71cab9784cee56b8c63  debug-1.9.2.tar.gz
+7d08028768c0a5024b32d1254f131204610db68f4ecbd72cca0677f499c5e426fba079e65a127453ca1d9685b094cb8feeddaa27bce72821e03a73e3f2bf5244  gemspec.patch
+"
diff --git a/main/ruby-debug/gemspec.patch b/main/ruby-debug/gemspec.patch
new file mode 100644
index 00000000000..2092357b245
--- /dev/null
+++ b/main/ruby-debug/gemspec.patch
@@ -0,0 +1,11 @@
+--- a/debug.gemspec
++++ b/debug.gemspec
+@@ -18,7 +18 @@
+-  # Specify which files should be added to the gem when it is released.
+-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+-    `git ls-files -z`.split("\x0").reject do |f|
+-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+-    end
+-  end
++  spec.files         = Dir["exe/*", "ext/**/*", "lib/**/*.rb"]
diff --git a/main/ruby-matrix/APKBUILD b/main/ruby-matrix/APKBUILD
new file mode 100644
index 00000000000..53ae4290e17
--- /dev/null
+++ b/main/ruby-matrix/APKBUILD
@@ -0,0 +1,57 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-matrix
+_gemname=matrix
+# Keep version in sync with "Bundled gems" (https://stdgems.org) for the
+# packaged Ruby version.
+pkgver=0.4.2
+pkgrel=2
+pkgdesc="An implementation of Matrix and Vector classes"
+url="https://github.com/ruby/matrix"
+arch="noarch"
+license="BSD-2-Clause AND Ruby"
+depends="ruby"
+checkdepends="ruby-rake ruby-test-unit"
+makedepends="ruby-rdoc"
+subpackages="$pkgname-doc"
+source="https://github.com/ruby/matrix/archive/v$pkgver/$_gemname-$pkgver.tar.gz"
+builddir="$srcdir/$_gemname-$pkgver"
+
+prepare() {
+	default_prepare
+	sed -i '/require .bundler/d' Rakefile
+}
+
+build() {
+	gem build $_gemname.gemspec
+}
+
+check() {
+	rake test
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	gem install \
+		--local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+
+	# Remove unnessecary files
+	cd "$gemdir"
+	rm -rf build_info cache extensions plugins
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+b47d1d662acdca703afd323fe9293726e051b0ef87162ff45c26c62fad2f3158f71d943f36f7c6706702885e2fdea8483b37ee45f25295225e86dec5f88590a4  matrix-0.4.2.tar.gz
+"
diff --git a/main/ruby-minitest/APKBUILD b/main/ruby-minitest/APKBUILD
new file mode 100644
index 00000000000..31a92fb822f
--- /dev/null
+++ b/main/ruby-minitest/APKBUILD
@@ -0,0 +1,70 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-minitest
+_gemname=minitest
+# Keep version in sync with "Bundled gems" (https://stdgems.org) for the
+# packaged Ruby version.
+pkgver=5.20.0
+pkgrel=0
+pkgdesc="Suite of testing facilities supporting TDD, BDD, mocking, and benchmarking for Ruby"
+url="https://github.com/minitest/minitest"
+arch="noarch"
+license="MIT"
+depends="ruby"
+makedepends="ruby-rdoc"
+checkdepends="ruby-rake"
+subpackages="$pkgname-doc"
+source="https://github.com/minitest/minitest/archive/v$pkgver/$_gemname-$pkgver.tar.gz
+	https://rubygems.org/downloads/$_gemname-$pkgver.gem
+	test-remove-hoe.patch
+	"
+builddir="$srcdir/$_gemname-$pkgver"
+options="!check"  # circular dependency on ruby-rake
+
+prepare() {
+	default_prepare
+
+	# Generate gemspec (there's no gemspec in the source).
+	gem specification -l --ruby "$srcdir"/$_gemname-$pkgver.gem \
+		> "$builddir"/$_gemname.gemspec
+}
+
+build() {
+	gem build $_gemname.gemspec
+}
+
+check() {
+	ruby -Ilib -Itest -e "Dir.glob('./test/**/test_*.rb', &method(:require))"
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+	local geminstdir="$gemdir/gems/$_gemname-$pkgver"
+
+	gem install \
+		--local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+
+	# Remove unnessecary files
+	cd "$gemdir"
+	rm -rf build_info cache extensions plugins
+
+	cd "$geminstdir"
+	rm -rf History.* Manifest.* README.* Rakefile test/
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+4872ad67a92c3065e821042165b2a1feafbd71ef4713e522fcc04293c8262d09d916947a73e1709560ccf2491a67a1badaf9a8626fddf1643a7a429d719b125d  minitest-5.20.0.tar.gz
+906dba1226ed301ad0d7aae2fa138670101e87b11ced69e0c362e65d74fee58a5341756fed8be1f2900863e19c11adcae35ed6ebe7372bb93be0c131dae85a3c  minitest-5.20.0.gem
+fdfc066799a351c1b237c2991501dc0c5e394c6066c873e8cc32941adc4ef956b5550fffae5d62a275917c82075264504dd1b457370703c2b870bfb28510f2ef  test-remove-hoe.patch
+"
diff --git a/main/ruby-minitest/test-remove-hoe.patch b/main/ruby-minitest/test-remove-hoe.patch
new file mode 100644
index 00000000000..5fd963daff9
--- /dev/null
+++ b/main/ruby-minitest/test-remove-hoe.patch
@@ -0,0 +1,16 @@
+Get rid of the "hoe" dependency.
+
+--- a/test/minitest/test_minitest_test_task.rb
++++ b/test/minitest/test_minitest_test_task.rb
+@@ -1,9 +1,9 @@
+ require "minitest/autorun"
+-require "hoe"
++#require "hoe"  XXX-Patched
+ 
+ require "minitest/test_task"
+ 
+-Hoe.load_plugins # make sure Hoe::Test is loaded
++#Hoe.load_plugins # make sure Hoe::Test is loaded  XXX-Patched
+ 
+ class TestHoeTest < Minitest::Test
+   PATH = "test/minitest/test_minitest_test_task.rb"
diff --git a/main/ruby-net-ftp/APKBUILD b/main/ruby-net-ftp/APKBUILD
new file mode 100644
index 00000000000..0cf69b52e3e
--- /dev/null
+++ b/main/ruby-net-ftp/APKBUILD
@@ -0,0 +1,60 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-net-ftp
+_gemname=net-ftp
+# Keep version in sync with "Bundled gems" (https://stdgems.org) for the
+# packaged Ruby version.
+pkgver=0.3.4
+pkgrel=0
+pkgdesc="Support for the File Transfer Protocol"
+url="https://github.com/ruby/net-ftp"
+arch="noarch"
+license="BSD-2-Clause AND Ruby"
+depends="ruby"
+checkdepends="ruby-rake ruby-test-unit"
+makedepends="ruby-rdoc"
+subpackages="$pkgname-doc"
+source="https://github.com/ruby/net-ftp/archive/v$pkgver/$_gemname-$pkgver.tar.gz
+	gemspec.patch
+	"
+builddir="$srcdir/$_gemname-$pkgver"
+
+prepare() {
+	default_prepare
+	sed -i '/require .bundler/d' Rakefile
+}
+
+build() {
+	gem build $_gemname.gemspec
+}
+
+check() {
+	rake test
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	gem install \
+		--local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+
+	# Remove unnessecary files
+	cd "$gemdir"
+	rm -rf build_info cache extensions plugins
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+1f289b8b0481abf66bbe000cfdc08d8f32559d02ccee186159696e1b563aecc1178d975946d969064bdb8abf8f76d50b5d5bde0423e12bf2ba0b757796c9b046  net-ftp-0.3.4.tar.gz
+67384f6752b6446bf59197a0e95769f3e2ddbfdc019bee183154af9923adb805893206e7d03bd1d206718b154e649778b90338c69dc8f1c0a6b434eb0029e0a2  gemspec.patch
+"
diff --git a/main/ruby-net-ftp/gemspec.patch b/main/ruby-net-ftp/gemspec.patch
new file mode 100644
index 00000000000..f3647299783
--- /dev/null
+++ b/main/ruby-net-ftp/gemspec.patch
@@ -0,0 +1,8 @@
+--- a/net-ftp.gemspec
++++ b/net-ftp.gemspec
+@@ -26,4 +26 @@
+-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+-    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(bin|test|spec|features)/}) }
+-  end
++  spec.files         = Dir["lib/**/*.rb"]
diff --git a/main/ruby-net-imap/APKBUILD b/main/ruby-net-imap/APKBUILD
new file mode 100644
index 00000000000..ae7d348ae24
--- /dev/null
+++ b/main/ruby-net-imap/APKBUILD
@@ -0,0 +1,64 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-net-imap
+_gemname=net-imap
+# Keep version in sync with "Bundled gems" (https://stdgems.org) for the
+# packaged Ruby version.
+pkgver=0.4.10
+pkgrel=0
+pkgdesc="Ruby client api for Internet Message Access Protocol"
+url="https://github.com/ruby/net-imap"
+arch="noarch"
+license="BSD-2-Clause AND Ruby"
+depends="ruby"
+makedepends="ruby-rdoc"
+checkdepends="
+	ruby-rake
+	ruby-test-unit
+	ruby-test-unit-ruby-core
+	"
+subpackages="$pkgname-doc"
+source="https://github.com/ruby/net-imap/archive/v$pkgver/$_gemname-$pkgver.tar.gz
+	gemspec.patch
+	"
+builddir="$srcdir/$_gemname-$pkgver"
+
+prepare() {
+	default_prepare
+	sed -i '/require .bundler/d' Rakefile
+}
+
+build() {
+	gem build $_gemname.gemspec
+}
+
+check() {
+	rake test
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	gem install \
+		--local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+
+	# Remove unnessecary files
+	cd "$gemdir"
+	rm -rf build_info cache extensions plugins
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+0f05588dc80cef7f121cbb40e2e9ddd6cd44e5ba96ca8451ea32339275d394f1233bc6a8bc30aa1de6852f49a469e0ee64a3821d08e12199e4af51fca4e79ccf  net-imap-0.4.10.tar.gz
+5ea3ff02e7faffc61400df54a7ebfbd7d2c034e135c0211355a0603b587405271a978db8876aaf4f2f06c0247fb55b1ad02b2ec85e536ce3df4480e9e89b69f9  gemspec.patch
+"
diff --git a/main/ruby-net-imap/gemspec.patch b/main/ruby-net-imap/gemspec.patch
new file mode 100644
index 00000000000..d1b9ca2eeb8
--- /dev/null
+++ b/main/ruby-net-imap/gemspec.patch
@@ -0,0 +1,16 @@
+--- a/net-imap.gemspec
++++ b/net-imap.gemspec
+@@ -23,12 +23,7 @@
+   spec.metadata["source_code_uri"] = spec.homepage
+   spec.metadata["changelog_uri"] = spec.homepage + "/releases"
+ 
+-  # Specify which files should be added to the gem when it is released.
+-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+-    `git ls-files -z 2>/dev/null`.split("\x0")
+-      .reject {|f| f.match(%r{^(bin|test|spec|benchmarks|features|rfcs)/}) }
+-  end
++  spec.files         = Dir["lib/**/*.rb"]
+   spec.bindir        = "exe"
+   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+   spec.require_paths = ["lib"]
diff --git a/main/ruby-net-pop/APKBUILD b/main/ruby-net-pop/APKBUILD
new file mode 100644
index 00000000000..94ed0332580
--- /dev/null
+++ b/main/ruby-net-pop/APKBUILD
@@ -0,0 +1,60 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-net-pop
+_gemname=net-pop
+# Keep version in sync with "Bundled gems" (https://stdgems.org) for the
+# packaged Ruby version.
+pkgver=0.1.2
+pkgrel=1
+pkgdesc="Ruby client library for POP3"
+url="https://github.com/ruby/net-pop"
+arch="noarch"
+license="BSD-2-Clause AND Ruby"
+depends="ruby"
+checkdepends="ruby-rake ruby-test-unit"
+makedepends="ruby-rdoc"
+subpackages="$pkgname-doc"
+source="https://github.com/ruby/net-pop/archive/v$pkgver/$_gemname-$pkgver.tar.gz
+	gemspec.patch
+	"
+builddir="$srcdir/$_gemname-$pkgver"
+
+prepare() {
+	default_prepare
+	sed -i '/require .bundler/d' Rakefile
+}
+
+build() {
+	gem build $_gemname.gemspec
+}
+
+check() {
+	rake test
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	gem install \
+		--local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+
+	# Remove unnessecary files
+	cd "$gemdir"
+	rm -rf build_info cache extensions plugins
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+5f7e78cb5499f1049c93732f88857d0b2bf9e864bcfc897beddd3fc86883204ff6c153ae9fc24715b1625fec5e2ec673e913a1495e43ec0e077e52d88aaf3448  net-pop-0.1.2.tar.gz
+7e618379d57cb5b2cab63ee4a489290c39e29783ffbbd32675f1acfab29d0590a5a0e1752b1abdd9a6019eb5a70fe7925a4b153626c3431f8b57aeac1cad0385  gemspec.patch
+"
diff --git a/main/ruby-net-pop/gemspec.patch b/main/ruby-net-pop/gemspec.patch
new file mode 100644
index 00000000000..f4f6f87fa8d
--- /dev/null
+++ b/main/ruby-net-pop/gemspec.patch
@@ -0,0 +1,7 @@
+--- a/net-pop.gemspec
++++ b/net-pop.gemspec
+@@ -24,3 +24 @@
+-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+-    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(bin|test|spec|features)/}) }
+-  end
++  spec.files         = Dir["lib/**/*.rb"]
diff --git a/main/ruby-net-smtp/APKBUILD b/main/ruby-net-smtp/APKBUILD
new file mode 100644
index 00000000000..adfd958c330
--- /dev/null
+++ b/main/ruby-net-smtp/APKBUILD
@@ -0,0 +1,60 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-net-smtp
+_gemname=net-smtp
+# Keep version in sync with "Bundled gems" (https://stdgems.org) for the
+# packaged Ruby version.
+pkgver=0.4.0
+pkgrel=0
+pkgdesc="Simple Mail Transfer Protocol client library for Ruby"
+url="https://github.com/ruby/net-smtp"
+arch="noarch"
+license="BSD-2-Clause AND Ruby"
+depends="ruby"
+checkdepends="ruby-rake ruby-test-unit"
+makedepends="ruby-rdoc"
+subpackages="$pkgname-doc"
+source="https://github.com/ruby/net-smtp/archive/v$pkgver/$_gemname-$pkgver.tar.gz
+	gemspec.patch
+	"
+builddir="$srcdir/$_gemname-$pkgver"
+
+prepare() {
+	default_prepare
+	sed -i '/require .bundler/d' Rakefile
+}
+
+build() {
+	gem build $_gemname.gemspec
+}
+
+check() {
+	rake test
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	gem install \
+		--local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+
+	# Remove unnessecary files
+	cd "$gemdir"
+	rm -rf build_info cache extensions plugins
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+3a130daac6392dd9328bdc644e1089eb34f290658b06f4aee48ab9f407086446af9fe674c5f417251ffb04478e5a6f14829f2b13b3e62fadb65ac09a2fa35bc1  net-smtp-0.4.0.tar.gz
+82265f30a418ecf1248faec6f307aa4c4e4c3176325b0691d600a0fe85803caf8a10fd58391459e16bbd451b3482f543261ee3a4a6b580cc5a1576fe8afebc6e  gemspec.patch
+"
diff --git a/main/ruby-net-smtp/gemspec.patch b/main/ruby-net-smtp/gemspec.patch
new file mode 100644
index 00000000000..fb71b9482b3
--- /dev/null
+++ b/main/ruby-net-smtp/gemspec.patch
@@ -0,0 +1,5 @@
+--- a/net-smtp.gemspec
++++ b/net-smtp.gemspec
+@@ -25 +25 @@
+-  spec.files = `git ls-files README.md NEWS.md LICENSE.txt lib`.split
++  spec.files = Dir["lib/**/*.rb"]
diff --git a/main/ruby-power_assert/APKBUILD b/main/ruby-power_assert/APKBUILD
new file mode 100644
index 00000000000..fd7a2222e78
--- /dev/null
+++ b/main/ruby-power_assert/APKBUILD
@@ -0,0 +1,62 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-power_assert
+_gemname=power_assert
+# Keep version in sync with "Bundled gems" (https://stdgems.org) for the
+# packaged Ruby version.
+pkgver=2.0.3
+pkgrel=1
+pkgdesc="Debug tool for Ruby that displays intermediate results of a method chain"
+url="https://github.com/ruby/power_assert"
+arch="noarch"
+license="BSD-2-Clause AND Ruby"
+depends="ruby"
+checkdepends="ruby-pry ruby-rake ruby-test-unit"
+makedepends="ruby-rdoc"
+subpackages="$pkgname-doc"
+source="https://github.com/ruby/power_assert/archive/v$pkgver/$_gemname-$pkgver.tar.gz
+	gemspec.patch
+	"
+builddir="$srcdir/$_gemname-$pkgver"
+# Avoid circular dependency with ruby-test-unit.
+options="!check"
+
+prepare() {
+	default_prepare
+	sed -i '/require .bundler/d' Rakefile
+}
+
+build() {
+	gem build $_gemname.gemspec
+}
+
+check() {
+	rake test
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	gem install \
+		--local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+
+	# Remove unnessecary files
+	cd "$gemdir"
+	rm -rf build_info cache extensions plugins
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+f5658d18b3b78e7757ddfc1ccdabc011076c009a7343eaad2748ca7aeb4d112bf19c70621cb938e7dcf1582c8bb7c5512017885ea51503b3ed274980b7d7c0b1  power_assert-2.0.3.tar.gz
+eb4321b8ce33476e21f0cd6da92f1f2be93e0892f5e6043d6d5f5578160f1793993b10645c0b06b3b2df3e8190a10c83e5325c367001e222d98b290222c2edfe  gemspec.patch
+"
diff --git a/main/ruby-power_assert/gemspec.patch b/main/ruby-power_assert/gemspec.patch
new file mode 100644
index 00000000000..ace46ba3741
--- /dev/null
+++ b/main/ruby-power_assert/gemspec.patch
@@ -0,0 +1,9 @@
+--- a/power_assert.gemspec
++++ b/power_assert.gemspec
+@@ -15,5 +15 @@
+-  s.files         = `git ls-files -z`.split("\x0").reject do |f|
+-    f.match(%r{\A(?:test|spec|features|benchmark|bin)/})
+-  end
+-  s.bindir        = 'exe'
+-  s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
++  s.files         = Dir['lib/**/*.rb']
diff --git a/main/ruby-prime/APKBUILD b/main/ruby-prime/APKBUILD
new file mode 100644
index 00000000000..3847d144cfd
--- /dev/null
+++ b/main/ruby-prime/APKBUILD
@@ -0,0 +1,60 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-prime
+_gemname=prime
+# Keep version in sync with "Bundled gems" (https://stdgems.org) for the
+# packaged Ruby version.
+pkgver=0.1.2
+pkgrel=2
+pkgdesc="Prime numbers and factorization library"
+url="https://github.com/ruby/prime"
+arch="noarch"
+license="BSD-2-Clause AND Ruby"
+depends="ruby"
+checkdepends="ruby-rake ruby-test-unit"
+makedepends="ruby-rdoc"
+subpackages="$pkgname-doc"
+source="https://github.com/ruby/prime/archive/v$pkgver/$_gemname-$pkgver.tar.gz
+	gemspec.patch
+	"
+builddir="$srcdir/$_gemname-$pkgver"
+
+prepare() {
+	default_prepare
+	sed -i '/require .bundler/d' Rakefile
+}
+
+build() {
+	gem build $_gemname.gemspec
+}
+
+check() {
+	rake test
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	gem install \
+		--local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+
+	# Remove unnessecary files
+	cd "$gemdir"
+	rm -rf build_info cache extensions plugins
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+a766426884d6b3cd7a586676799db146974ec9a4a7c30ca53b5f279ad55ee9960c9b5bb26988cb66253b4fe974f9b5087f48ef5b216772464d03b8ed78a817d6  prime-0.1.2.tar.gz
+ea60d064edd9247a0a1450d9e43385cd8fc84dfcb610bd4ab174fd104727eb8066b4ad8439b9b33a715aa93890a2b0a06127d58912752919aecbc2950e419a3e  gemspec.patch
+"
diff --git a/main/ruby-prime/gemspec.patch b/main/ruby-prime/gemspec.patch
new file mode 100644
index 00000000000..0569bb2c6df
--- /dev/null
+++ b/main/ruby-prime/gemspec.patch
@@ -0,0 +1,5 @@
+--- a/prime.gemspec
++++ b/prime.gemspec
+@@ -19 +19 @@
+-  spec.files         = [".gitignore", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "lib/prime.rb", "prime.gemspec"]
++  spec.files         = Dir["lib/**/*.rb"]
diff --git a/main/ruby-racc/APKBUILD b/main/ruby-racc/APKBUILD
new file mode 100644
index 00000000000..fe257638e13
--- /dev/null
+++ b/main/ruby-racc/APKBUILD
@@ -0,0 +1,79 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-racc
+_gemname=racc
+# Keep version in sync with "Bundled gems" (https://stdgems.org) for the
+# packaged Ruby version.
+pkgver=1.7.3
+pkgrel=0
+pkgdesc="LALR(1) parser generator for Ruby"
+url="https://github.com/ruby/racc"
+arch="all"
+license="BSD-2-Clause AND Ruby"
+depends="ruby"
+makedepends="
+	ruby-dev
+	ruby-rake
+	ruby-rake-compiler
+	ruby-rdoc
+	"
+checkdepends="
+	ruby-test-unit
+	ruby-test-unit-ruby-core
+	"
+subpackages="$pkgname-doc"
+source="https://github.com/ruby/racc/archive/v$pkgver/$_gemname-$pkgver.tar.gz"
+builddir="$srcdir/$_gemname-$pkgver"
+
+prepare() {
+	default_prepare
+	sed -i '/require .bundler/d' Rakefile
+}
+
+build() {
+	rake compile
+
+	gem build $_gemname.gemspec
+
+	gem install \
+		--local \
+		--install-dir dist \
+		--bindir dist/bin \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+}
+
+check() {
+	rake test
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	cd "$builddir"/dist
+
+	mkdir -p "$gemdir"
+	cp -r doc extensions gems specifications "$gemdir"/
+
+	mkdir -p "$pkgdir"/usr/bin
+	cp -r bin/* "$pkgdir"/usr/bin/
+
+	# Remove unnecessary files and rubbish...
+	find "$gemdir"/extensions/ -name mkmf.log -delete
+
+	cd "$gemdir"/gems/$_gemname-$pkgver
+	rm -r doc/ ext/
+	rm -f ChangeLog README.* TODO
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+8412c021d3fc7f25ccf3a61d56c11df0d8c0b09852d99cc314c8b4931f9c22939dc43ef599801de9a64a69acbd897fb6f215f56702634f2c8b6d69ae3bdfa2b3  racc-1.7.3.tar.gz
+"
diff --git a/main/ruby-rake-compiler/APKBUILD b/main/ruby-rake-compiler/APKBUILD
new file mode 100644
index 00000000000..f1ab36b5656
--- /dev/null
+++ b/main/ruby-rake-compiler/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-rake-compiler
+_gemname=${pkgname#ruby-}
+pkgver=1.2.7
+pkgrel=0
+pkgdesc="Provide a standard and simplified way to build and package Ruby extensions"
+url="https://github.com/rake-compiler/rake-compiler"
+arch="noarch"
+license="MIT"
+depends="ruby ruby-rake"
+checkdepends="ruby-rspec"
+source="$pkgname-$pkgver.tar.gz::https://github.com/rake-compiler/$_gemname/archive/v$pkgver.tar.gz
+	gemfile-remove-unwanted-files.patch"
+builddir="$srcdir/$_gemname-$pkgver"
+options="!check"  # ruby-rspec is not in main
+
+build() {
+	gem build $_gemname.gemspec
+}
+
+check() {
+	rspec spec
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	gem install --local \
+		--install-dir "$gemdir" \
+		--bindir "$pkgdir/usr/bin" \
+		--ignore-dependencies \
+		--no-document \
+		--verbose \
+		$_gemname
+
+	# Remove unnecessary files and empty directories.
+	cd "$gemdir"
+	rm -r cache build_info doc
+}
+
+sha512sums="
+7405037092446e245028f73494acbeeb9b67cdcbc4e90832180d3c53d36df008b05a83e88e1919b884754e39365ca5685aa22cf8caf9e7f96786c11ac7208ead  ruby-rake-compiler-1.2.7.tar.gz
+2744f66714b893e18491346db8c9691a5bed666ab14281506e4f370dbef2ba640f567deedfd028f3a7b698ab6004af8a2ea20702d72045df833cdbcaf77317a2  gemfile-remove-unwanted-files.patch
+"
diff --git a/main/ruby-rake-compiler/gemfile-remove-unwanted-files.patch b/main/ruby-rake-compiler/gemfile-remove-unwanted-files.patch
new file mode 100644
index 00000000000..6dba7a56c50
--- /dev/null
+++ b/main/ruby-rake-compiler/gemfile-remove-unwanted-files.patch
@@ -0,0 +1,25 @@
+--- a/rake-compiler.gemspec
++++ b/rake-compiler.gemspec
+@@ -23,12 +23,8 @@
+   s.add_development_dependency 'cucumber', '~> 1.1.4'
+ 
+   # components, files and paths
+-  s.files = Dir.glob("features/**/*.{feature,rb}")
+-  s.files += ["bin/rake-compiler"]
++  s.files = ["bin/rake-compiler"]
+   s.files += Dir.glob("lib/**/*.rb")
+-  s.files += Dir.glob("tasks/**/*.rake")
+-  s.files += ["Rakefile", "Gemfile"]
+-  s.files += Dir.glob("*.{md,rdoc,txt,yml}")
+ 
+   s.bindir      = 'bin'
+   s.executables = ['rake-compiler']
+@@ -37,8 +33,6 @@
+ 
+   # documentation
+   s.rdoc_options << '--main'  << 'README.md' << '--title' << 'rake-compiler -- Documentation'
+-
+-  s.extra_rdoc_files = %w(README.md LICENSE.txt History.md)
+ 
+   # project information
+   s.homepage          = 'https://github.com/rake-compiler/rake-compiler'
diff --git a/main/ruby-rake/APKBUILD b/main/ruby-rake/APKBUILD
new file mode 100644
index 00000000000..872f37b9b2b
--- /dev/null
+++ b/main/ruby-rake/APKBUILD
@@ -0,0 +1,58 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-rake
+_gemname=rake
+# Keep version in sync with "Bundled gems" (https://stdgems.org) for the
+# packaged Ruby version.
+pkgver=13.1.0
+pkgrel=0
+pkgdesc="A Ruby task runner, inspired by make"
+url="https://github.com/ruby/rake"
+arch="noarch"
+license="MIT"
+depends="ruby"
+checkdepends="ruby-minitest"
+makedepends="ruby-rdoc"
+subpackages="$pkgname-doc"
+source="https://github.com/ruby/rake/archive/v$pkgver/$_gemname-$pkgver.tar.gz"
+builddir="$srcdir/$_gemname-$pkgver"
+
+build() {
+	gem build $_gemname.gemspec
+}
+
+check() {
+	# FIXME: Fix test_signal_propagation_in_tests
+	ruby -Ilib -Itest -e "Dir.glob('./test/**/test_*.rb', &method(:require))" -- \
+		--exclude=test_signal_propagation_in_tests
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	gem install \
+		--local \
+		--install-dir "$gemdir" \
+		--bindir "$pkgdir/usr/bin" \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+
+	# Remove unnessecary files
+	cd "$gemdir"
+	rm -rf build_info cache extensions plugins
+
+	cd gems/rake-*
+	rm -rf doc *.rdoc MIT-LICENSE
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+aaea4566834e588ff5cf9f48892cb7aea40f0057db949eb0053755b2f601d5c19073128aedb1f3c98cace441518bbf9bc215ba45d9135123d5b3a48a1625a995  rake-13.1.0.tar.gz
+"
diff --git a/main/ruby-rbs/APKBUILD b/main/ruby-rbs/APKBUILD
new file mode 100644
index 00000000000..2701211898e
--- /dev/null
+++ b/main/ruby-rbs/APKBUILD
@@ -0,0 +1,64 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-rbs
+_gemname=rbs
+# Keep version in sync with "Bundled gems" (https://stdgems.org) for the
+# packaged Ruby version.
+pkgver=3.3.2
+pkgrel=0
+pkgdesc="Type Signature for Ruby"
+url="https://github.com/ruby/rbs"
+arch="all"
+license="BSD-2-Clause AND Ruby"
+depends="ruby ruby-bundler"
+checkdepends="ruby-rake ruby-test-unit"
+makedepends="ruby-dev ruby-rdoc"
+subpackages="$pkgname-doc"
+source="https://github.com/ruby/rbs/archive/v$pkgver/$_gemname-$pkgver.tar.gz
+	gemspec.patch
+	"
+builddir="$srcdir/$_gemname-$pkgver"
+options="!check"  # FIXME: require gems that are not packaged yet
+
+build() {
+	gem build $_gemname.gemspec
+
+	gem install \
+		--local \
+		--install-dir dist \
+		--bindir dist/bin \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+}
+
+check() {
+	GEM_PATH='dist' rake test
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	cd "$builddir"/dist
+
+	mkdir -p "$gemdir"
+	cp -r doc extensions gems specifications "$gemdir"/
+
+	# Remove unnecessary files and rubbish...
+	find "$gemdir"/extensions/ -name mkmf.log -delete
+
+	cd "$gemdir"/gems/$_gemname-$pkgver
+	rm -r ext/
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+ef0ac2bf65cebd12596c2e7cecd5eeb41abf169f18cdd8cfe056195150ebcb2544b2c65cbfdd63f6e9f2af3e95d5a312aa7db230b2bb03d44f995cf0522ae754  rbs-3.3.2.tar.gz
+39f59efc8ed4af86314e630c19cbefdf5df740c3baf8e51e184a58f8a42df7fb5c47d8f3563e97fff1f41d38d3d4d80ba665378ac82b24983a9aa49d4f7e11e4  gemspec.patch
+"
diff --git a/main/ruby-rbs/gemspec.patch b/main/ruby-rbs/gemspec.patch
new file mode 100644
index 00000000000..63b477964da
--- /dev/null
+++ b/main/ruby-rbs/gemspec.patch
@@ -0,0 +1,15 @@
+--- a/rbs.gemspec
++++ b/rbs.gemspec
+@@ -25,11 +25,7 @@
+       "public gem pushes."
+   end
+ 
+-  # Specify which files should be added to the gem when it is released.
+-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|bin|steep)/}) }
+-  end
++  spec.files         = Dir["core/**/*.rbs", "exe/*", "ext/**/*", "lib/**/*.rb", "schema/**/*.json", "sig/**/*.rbs", "stdlib/**/*.rbs"]
+   spec.extensions = %w{ext/rbs_extension/extconf.rb}
+ 
+   spec.bindir        = "exe"
diff --git a/main/ruby-rexml/APKBUILD b/main/ruby-rexml/APKBUILD
new file mode 100644
index 00000000000..7425456daa3
--- /dev/null
+++ b/main/ruby-rexml/APKBUILD
@@ -0,0 +1,58 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-rexml
+_gemname=rexml
+# Keep version in sync with "Bundled gems" (https://stdgems.org) for the
+# packaged Ruby version.
+pkgver=3.2.6
+pkgrel=1
+pkgdesc="An XML toolkit for Ruby"
+url="https://github.com/ruby/rexml"
+arch="noarch"
+license="BSD-2-Clause"
+depends="ruby"
+checkdepends="ruby-test-unit"
+makedepends="ruby-rdoc"
+subpackages="$pkgname-doc"
+source="https://github.com/ruby/rexml/archive/v$pkgver/ruby-rexml-$pkgver.tar.gz"
+builddir="$srcdir/$_gemname-$pkgver"
+
+[ "$CARCH" = "s390x" ] && options="!check"
+
+build() {
+	gem build $_gemname.gemspec
+}
+
+check() {
+	ruby test/run.rb
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+	local geminstdir="$gemdir/gems/$_gemname-$pkgver"
+
+	gem install \
+		--local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+
+	# Remove unnecessary files and rubbish...
+	cd "$gemdir"
+	rm -r cache build_info extensions plugins
+
+	cd "$geminstdir"
+	rm -r doc LICENSE* *.md
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+bbf278ed25fbf4d814de9df3cbca691ab43d4e502a02b081e894ce82c161b1931d850df54074ef81c9cb470dca10a81c631da7ccbf908401818fca4c9a4aa5c4  ruby-rexml-3.2.6.tar.gz
+"
diff --git a/main/ruby-rr/APKBUILD b/main/ruby-rr/APKBUILD
new file mode 100644
index 00000000000..5d6018a43ff
--- /dev/null
+++ b/main/ruby-rr/APKBUILD
@@ -0,0 +1,58 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-rr
+_gemname=rr
+pkgver=3.1.0
+pkgrel=2
+pkgdesc="Test double framework that features a rich selection of double techniques"
+url="https://github.com/rr/rr"
+arch="noarch"
+license="MIT"
+depends="ruby"
+checkdepends="
+	ruby-minitest
+	ruby-test-unit
+	ruby-test-unit-rr
+	"
+makedepends="ruby-rdoc"
+subpackages="$pkgname-doc"
+source="https://github.com/rr/rr/archive/v$pkgver/$_gemname-$pkgver.tar.gz
+	gemspec.patch
+	"
+builddir="$srcdir/$_gemname-$pkgver"
+options="!check"  # avoid circular dependency with ruby-test-unit-rr
+
+build() {
+	gem build $_gemname.gemspec
+}
+
+check() {
+	RR_INTEGRATION=minitest ruby test/run-test.rb
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	gem install \
+		--local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+
+	# Remove unnessecary files
+	cd "$gemdir"
+	rm -rf build_info cache extensions plugins
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+d05d8421d5cd6e9225cbf5ca183c54cc510a3212f0629f7cee60887b18c874618cb67836503aed7665cef8443cc579306b84e030ae1ec0834f56298f5044a2fa  rr-3.1.0.tar.gz
+6712e6b870d6145718ef656e0e299f1cf8749b9f695d9227f3ad7fd3ad19ec001f49be523ef245dccd84bca6ce24b4e397d8468b7a0c1c6af5edb7ef2508f11d  gemspec.patch
+"
diff --git a/main/ruby-rr/gemspec.patch b/main/ruby-rr/gemspec.patch
new file mode 100644
index 00000000000..93439e87ead
--- /dev/null
+++ b/main/ruby-rr/gemspec.patch
@@ -0,0 +1,31 @@
+diff --git a/rr.gemspec b/rr.gemspec
+index 398b1a8..9b12ebc 100644
+--- a/rr.gemspec
++++ b/rr.gemspec
+@@ -1,5 +1,4 @@
+ # encoding: utf-8
+-
+ require File.expand_path('../lib/rr/version', __FILE__)
+ 
+ Gem::Specification.new do |gem|
+@@ -13,19 +12,8 @@ Gem::Specification.new do |gem|
+   gem.license = 'MIT'
+ 
+   gem.files = Dir[
+-    'Appraisals',
+-    'CHANGES.md',
+-    'CREDITS.md',
+-    'Gemfile',
+-    'LICENSE',
+-    'README.md',
+-    'Rakefile',
+-    'doc/*.md',
+-    'gemfiles/**/*',
+     'lib/**/*.rb',
+-    'rr.gemspec',
+-    'spec/**/*'
+-  ].to_a
++  ]
+ 
+   gem.require_paths = ['lib']
+ 
diff --git a/main/ruby-rss/APKBUILD b/main/ruby-rss/APKBUILD
new file mode 100644
index 00000000000..a20275c9ff4
--- /dev/null
+++ b/main/ruby-rss/APKBUILD
@@ -0,0 +1,58 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-rss
+_gemname=rss
+pkgver=0.3.0
+pkgrel=0
+pkgdesc="RSS reading and writing for Ruby"
+url="https://github.com/ruby/rss"
+arch="noarch"
+license="BSD-2-Clause"
+depends="ruby ruby-rexml"
+checkdepends="ruby-test-unit"
+makedepends="ruby-rdoc"
+subpackages="$pkgname-doc"
+source="https://github.com/ruby/rss/archive/$pkgver/ruby-rss-$pkgver.tar.gz"
+builddir="$srcdir/$_gemname-$pkgver"
+
+prepare() {
+	default_prepare
+	sed -i '/require .bundler/d' Rakefile
+}
+
+build() {
+	gem build $_gemname.gemspec
+}
+
+check() {
+	ruby test/run-test.rb
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	gem install \
+		--local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+
+	# Remove unnessecary files
+	cd "$gemdir"
+	rm -rf build_info cache extensions plugins
+
+	cd "$gemdir"/gems/$_gemname-$pkgver
+	rm README.* NEWS.*
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+86b7097e3dcf0da03284b44493be43e972a1facb2f20e81cc3303ea0c39336a364858f3d37e04a2397851ca897bd484284eb81cd6d6b55f4c0d77d811350688e  ruby-rss-0.3.0.tar.gz
+"
diff --git a/main/ruby-test-unit-rr/APKBUILD b/main/ruby-test-unit-rr/APKBUILD
new file mode 100644
index 00000000000..11213afe540
--- /dev/null
+++ b/main/ruby-test-unit-rr/APKBUILD
@@ -0,0 +1,53 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-test-unit-rr
+_gemname=test-unit-rr
+pkgver=1.0.5
+pkgrel=2
+pkgdesc="RR adapter for test-unit"
+url="https://github.com/test-unit/test-unit-rr"
+arch="noarch"
+license="LGPL-2.0-or-later"
+depends="ruby ruby-rr"
+checkdepends="ruby-test-unit"
+makedepends="ruby-rdoc"
+subpackages="$pkgname-doc"
+source="https://github.com/test-unit/test-unit-rr/archive/$pkgver/$_gemname-$pkgver.tar.gz
+	gemspec.patch
+	"
+builddir="$srcdir/$_gemname-$pkgver"
+
+build() {
+	gem build $_gemname.gemspec
+}
+
+check() {
+	ruby test/run-test.rb
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	gem install \
+		--local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+
+	# Remove unnessecary files
+	cd "$gemdir"
+	rm -rf build_info cache extensions plugins
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+f91e9d9c041b84c4eed80850c3d5e3567c7082d1a6643b6ffb4e3464184ed703f9e8f03a2f2cbd4acc7d9cb7ded3d60fe9db4d08ed19c7daf91d46a410d6c29a  test-unit-rr-1.0.5.tar.gz
+ea137126afec2aa750a6e1bfd73a0fb19acae84e2b415e78b2519c3cbfbe899169c295ee418df9319640238d651e1fe22cf3cfd59d00b9ad7502382b3ef41828  gemspec.patch
+"
diff --git a/main/ruby-test-unit-rr/gemspec.patch b/main/ruby-test-unit-rr/gemspec.patch
new file mode 100644
index 00000000000..a1329b9c5bd
--- /dev/null
+++ b/main/ruby-test-unit-rr/gemspec.patch
@@ -0,0 +1,8 @@
+--- a/test-unit-rr.gemspec
++++ b/test-unit-rr.gemspec
+@@ -38,4 +38 @@
+-  spec.files = ["README.md", "Rakefile", "#{spec.name}.gemspec", "Gemfile"]
+-  spec.files += Dir.glob("lib/**/*.rb")
+-  spec.files += Dir.glob("doc/text/**/*.*")
+-  spec.test_files += Dir.glob("test/**/*")
++  spec.files = Dir.glob("lib/**/*.rb")
diff --git a/main/ruby-test-unit-ruby-core/APKBUILD b/main/ruby-test-unit-ruby-core/APKBUILD
new file mode 100644
index 00000000000..a56758186dc
--- /dev/null
+++ b/main/ruby-test-unit-ruby-core/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-test-unit-ruby-core
+_gemname=test-unit-ruby-core
+pkgver=1.0.5
+pkgrel=0
+pkgdesc="Additional test assertions for Ruby standard libraries"
+url="https://github.com/ruby/test-unit-ruby-core"
+arch="noarch"
+license="BSD-2-Clause AND Ruby"
+depends="ruby"
+makedepends="ruby-rdoc"
+subpackages="$pkgname-doc"
+source="https://github.com/ruby/test-unit-ruby-core/archive/v$pkgver/$_gemname-$pkgver.tar.gz"
+builddir="$srcdir/$_gemname-$pkgver"
+options="!check"  # no tests provided
+
+build() {
+	gem build $_gemname.gemspec
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	gem install \
+		--local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+
+	# Remove unnessecary files
+	cd "$gemdir"
+	rm -rf build_info cache extensions plugins
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+5f107cc054abfa422c5a82c58b4a67de4c6c6cf60a0c3e18cc8408162cff5dd1689e1c61cff4900635f09b8ba908ec4394c2b5ef7e072c3eb4759463dc4b4f90  test-unit-ruby-core-1.0.5.tar.gz
+"
diff --git a/main/ruby-test-unit/APKBUILD b/main/ruby-test-unit/APKBUILD
new file mode 100644
index 00000000000..2f7107c12f9
--- /dev/null
+++ b/main/ruby-test-unit/APKBUILD
@@ -0,0 +1,54 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-test-unit
+_gemname=test-unit
+# Keep version in sync with "Bundled gems" (https://stdgems.org) for the
+# packaged Ruby version.
+pkgver=3.6.2
+pkgrel=0
+pkgdesc="An xUnit family unit testing framework for Ruby"
+url="https://test-unit.github.io"
+arch="noarch"
+license="BSD-2-Clause AND Python-2.0 AND Ruby"
+depends="ruby ruby-power_assert"
+makedepends="ruby-rdoc"
+subpackages="$pkgname-doc"
+source="https://github.com/test-unit/test-unit/archive/$pkgver/$_gemname-$pkgver.tar.gz
+	gemspec.patch
+	"
+builddir="$srcdir/$_gemname-$pkgver"
+
+build() {
+	gem build $_gemname.gemspec
+}
+
+check() {
+	ruby test/run-test.rb
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	gem install \
+		--local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+
+	# Remove unnessecary files
+	cd "$gemdir"
+	rm -rf build_info cache extensions plugins
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+d523412e080ea0ce1ac968c64279fbdc90afaed3b2052f357993583ed89a77d9977022aac74f3170bfc3cb7e716f1665a9705e0ed95a8db5f205f1b984f52d94  test-unit-3.6.2.tar.gz
+22f54fcf272856a9455d5a7276896ec329377b106ab47e3d376158eee72cf570f4487dd87606d730d061e7b06e5d7a0ff561cd8d279a64d8af0ac04e0f2dba92  gemspec.patch
+"
diff --git a/main/ruby-test-unit/gemspec.patch b/main/ruby-test-unit/gemspec.patch
new file mode 100644
index 00000000000..f2beca1e3ed
--- /dev/null
+++ b/main/ruby-test-unit/gemspec.patch
@@ -0,0 +1,8 @@
+--- a/test-unit.gemspec
++++ b/test-unit.gemspec
+@@ -27,4 +27 @@
+-  spec.files = ["README.md", "Rakefile"]
+-  spec.files += ["COPYING", "BSDL", "PSFL"]
+-  spec.files += Dir.glob("{lib,sample}/**/*.rb")
+-  spec.files += Dir.glob("doc/text/**/*.*")
++  spec.files += Dir.glob("lib/**/*.rb")
diff --git a/main/ruby-typeprof/APKBUILD b/main/ruby-typeprof/APKBUILD
new file mode 100644
index 00000000000..929514715fe
--- /dev/null
+++ b/main/ruby-typeprof/APKBUILD
@@ -0,0 +1,57 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=ruby-typeprof
+_gemname=typeprof
+# Keep version in sync with "Bundled gems" (https://stdgems.org) for the
+# packaged Ruby version.
+pkgver=0.21.11
+pkgrel=0
+pkgdesc="A type analysis tool for Ruby code based on abstract interpretation"
+url="https://github.com/ruby/typeprof"
+arch="noarch"
+license="MIT"
+depends="ruby ruby-rbs"
+checkdepends="ruby-bundler ruby-rake ruby-test-unit"
+makedepends="ruby-rdoc"
+subpackages="$pkgname-doc"
+source="https://github.com/ruby/typeprof/archive/v$pkgver/$_gemname-$pkgver.tar.gz
+	gemspec.patch
+	"
+builddir="$srcdir/$_gemname-$pkgver"
+options="!check"  # FIXME
+
+build() {
+	gem build $_gemname.gemspec
+}
+
+check() {
+	rake test
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	gem install \
+		--local \
+		--install-dir "$gemdir" \
+		--bindir "$pkgdir/usr/bin" \
+		--ignore-dependencies \
+		--document ri \
+		--verbose \
+		$_gemname
+
+	# Remove unnessecary files
+	cd "$gemdir"
+	rm -rf build_info cache extensions plugins
+}
+
+doc() {
+	pkgdesc="$pkgdesc (ri docs)"
+
+	amove "$(ruby -e 'puts Gem.default_dir')"/doc
+}
+
+sha512sums="
+3ef58d5cee24f037a32984a7f9757958f0276732918a58c27aed15b11e43d57da92d4fcf41eeb017d7fe8cacfd801f0fc9cdcf03cfc2e663f8660097cde8fb61  typeprof-0.21.11.tar.gz
+38b5f848ecf7c60c8c82bd57fabb4a1113789c31602058cc32de4d2c186acb5ec8f6d966b7ec09ccbc080640b5137477b49b5918015fd4859b1b91a7069869e2  gemspec.patch
+"
diff --git a/main/ruby-typeprof/gemspec.patch b/main/ruby-typeprof/gemspec.patch
new file mode 100644
index 00000000000..c5c89753d52
--- /dev/null
+++ b/main/ruby-typeprof/gemspec.patch
@@ -0,0 +1,9 @@
+--- a/typeprof.gemspec
++++ b/typeprof.gemspec
+@@ -24,5 +24 @@
+-  # Specify which files should be added to the gem when it is released.
+-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(doc|test|spec|features|smoke|testbed|vscode)/}) }
+-  end
++  spec.files         = Dir["exe/*", "lib/**/*.rb"]
diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD
index ecc1ba9a5a5..b7c061773db 100644
--- a/main/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
@@ -1,8 +1,32 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 #
 # secfixes:
+#   3.1.4-r0:
+#     - CVE-2023-28755
+#     - CVE-2023-28756
+#   3.1.3-r0:
+#     - CVE-2021-33621
+#   3.1.2-r0:
+#     - CVE-2022-28738
+#     - CVE-2022-28739
+#   3.0.3-r0:
+#     - CVE-2021-41817
+#     - CVE-2021-41816
+#     - CVE-2021-41819
+#   2.7.4-r0:
+#     - CVE-2021-31799
+#     - CVE-2021-31810
+#     - CVE-2021-32066
+#   2.7.3-r0:
+#     - CVE-2021-28965
+#     - CVE-2021-28966
+#   2.7.2-r0:
+#     - CVE-2020-25613
+#   2.6.6-r0:
+#     - CVE-2020-10663
+#     - CVE-2020-10933
 #   2.6.5-r0:
 #     - CVE-2019-16255
 #     - CVE-2019-16254
@@ -31,49 +55,52 @@
 #     - CVE-2017-17405
 #
 pkgname=ruby
-pkgver=2.6.5
+# When upgrading, upgrade also each ruby-<name> aport listed in file
+# gems/bundled_gems. If some aport is missing or not in the main repo,
+# create/move it.
+pkgver=3.3.0
 _abiver="${pkgver%.*}.0"
-pkgrel=2
+pkgrel=0
 pkgdesc="An object-oriented language for quick and easy programming"
 url="https://www.ruby-lang.org/"
 arch="all"
-license="Ruby BSD-2-Clause"
+license="Ruby AND BSD-2-Clause AND MIT"
 depends="ca-certificates"
-depends_dev="$pkgname=$pkgver-r$pkgrel gmp-dev"
-makedepends="$depends_dev zlib-dev openssl-dev gdbm-dev db-dev readline-dev
-	libffi-dev coreutils yaml-dev linux-headers autoconf"
+depends_dev="
+	$pkgname=$pkgver-r$pkgrel
+	$pkgname-rdoc=$pkgver-r$pkgrel
+	gmp-dev
+	libucontext-dev
+	"
+makedepends="$depends_dev
+	autoconf
+	cargo
+	gdbm-dev
+	libffi-dev
+	linux-headers
+	openssl-dev>3
+	readline-dev
+	yaml-dev
+	zlib-dev
+	"
 install="$pkgname.post-upgrade"
-subpackages="$pkgname-doc $pkgname-dev
-	$pkgname-bigdecimal
-	$pkgname-dbm
-	$pkgname-did_you_mean::noarch
-	$pkgname-etc
-	$pkgname-fiddle
-	$pkgname-gdbm
-	$pkgname-io-console:io_console
-	$pkgname-irb::noarch
-	$pkgname-json
-	$pkgname-minitest::noarch
-	$pkgname-net-telnet:net_telnet:noarch
-	$pkgname-power_assert::noarch
-	$pkgname-rake::noarch
+subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev
 	$pkgname-rdoc::noarch
-	$pkgname-sdbm
-	$pkgname-test-unit:test_unit:noarch
-	$pkgname-webrick::noarch
-	$pkgname-xmlrpc::noarch
 	$pkgname-libs
 	$pkgname-full::noarch
 	"
-source="https://cache.ruby-lang.org/pub/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz
-	rubygems-avoid-platform-specific-gems.patch
+source="https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-$pkgver.tar.gz
 	test_insns-lower-recursion-depth.patch
 	fix-get_main_stack.patch
-	avoid-rdoc-hook-when-its-failed-to-load-rdoc-library.patch
-	openssl-config-support-include-directive.patch
+	dont-install-bundled-gems.patch
+	fix-riscv64-build.patch
 	"
 replaces="ruby-gems"
-builddir="$srcdir/$pkgname-$pkgver"
+
+# For backward compatibility (pre 3.x).
+for _i in bigdecimal etc fiddle gdbm io-console irb json; do
+	provides="$provides ruby-$_i=$pkgver-r$pkgrel"
+done
 
 _gemdir="/usr/lib/ruby/gems/$_abiver"
 _rubydir="/usr/lib/ruby/$_abiver"
@@ -84,40 +111,49 @@ case "$CARCH" in
 	*) _arch="$CARCH";;
 esac
 
-_bundled_gems=""
-for _i in $subpackages; do
-	case "$_i" in
-		*-dev | *-doc | *-libs | *-full:*) continue;;
-		*) _bundled_gems="$_bundled_gems ${_i%%:*}";;
-	esac
-done
-
 prepare() {
 	default_prepare
+	autoconf
 
-	cd "$builddir"
-
-	# XXX: Fix broken symlinks pointing to nowhere.
-	rm tool/config.sub tool/config.guess
-	touch tool/config.sub tool/config.guess
-	update_config_sub
-	update_config_guess
+	# v2.7.1 - Of all the bootstraptest only test_fiber fails on s390x:
+	# test_fiber.rb bootstraptest.tmp.rb:8: [BUG] vm_call_cfunc: cfp consistency error (0x000003ffb63fefb0, 0x000003ffb42f5f58)
+	case "$CARCH" in
+		s390x) rm bootstraptest/test_fiber.rb;;
+	esac
 
-	autoconf
+	local name ver; while read -r name ver _; do
+		case "$name=$ver" in
+			[a-z]*=[0-9]*.[0-9]*)
+				if ! apk add -qs "ruby-$name>=$ver" >/dev/null 2>&1; then
+					warning "bump package ruby-$name to version $ver"
+				fi
+				echo "ruby-$name>=$ver" >> "$srcdir"/.ruby-full.depends
+		esac
+	done < "$builddir"/gems/bundled_gems
 }
 
 build() {
-	cd "$builddir"
-
 	# -fomit-frame-pointer makes ruby segfault, see gentoo bug #150413
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	export CFLAGS="$CFLAGS -fno-omit-frame-pointer -fno-strict-aliasing"
-	export CPPFLAGS="$CPPFLAGS -fno-omit-frame-pointer -fno-strict-aliasing"
+	#  In many places aliasing rules are broken; play it safe
+	#  as it's risky with newer compilers to leave it as it is.
+	# -O2 - ruby is a language runtime, so performance is crucial. Moreover,
+	#  ruby 3.1.1 fails with Bus Error when compiled with -Os on armhf/armv7.
+	#  This makes ruby-libs 7% bigger (13.4 -> 14.4 MiB).
+	export CFLAGS="${CFLAGS/-Os/} -fno-omit-frame-pointer -fno-strict-aliasing"
+	export CPPFLAGS="${CPPFLAGS/-Os/} -fno-omit-frame-pointer -fno-strict-aliasing"
+
+	# Needed for coroutine stuff
+	export LIBS="-lucontext"
 
 	# ruby saves path to install. we want use $PATH
 	export INSTALL=install
 
+	case "$CARCH" in
+		# Ruby segfaults when built with default (-O3).
+		# See https://bugs.ruby-lang.org/issues/20099.
+		s390x) export optflags="-O2";;
+	esac
+
 	# the configure script does not detect isnan/isinf as macros
 	export ac_cv_func_isnan=yes
 	export ac_cv_func_isinf=yes
@@ -129,7 +165,7 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--with-sitedir='/usr/local/lib/site_ruby' \
+		--with-sitedir=/usr/local/lib/site_ruby \
 		--with-search-path="/usr/lib/site_ruby/\$(ruby_ver)/$_arch-linux" \
 		--enable-pthread \
 		--disable-rpath \
@@ -139,228 +175,85 @@ build() {
 }
 
 check() {
-	cd "$builddir"
-	make test
+	# https://bugs.ruby-lang.org/issues/18380
+	local disable_tests="-n !/TestAddressResolve#test_socket_getnameinfo_domain_blocking/"
+
+	case "$CARCH" in
+		x86 | armhf | armv7)
+			# TestReadline#test_interrupt_in_other_thread fails on 32 bit arches according
+			# to upstream, but the test is disabled just on Travis, not in test suite.
+			# https://bugs.ruby-lang.org/issues/18393
+			disable_tests="$disable_tests -n !/TestReadline#test_interrupt_in_other_thread/"
+		;;
+	esac
+
+	make test TESTS="$disable_tests"
 }
 
 package() {
-	cd "$builddir"
-
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" SUDO="" install
 
 	install -m 644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 
+	cd "$pkgdir"
+
 	# Remove bundled gem bundler; it's provided by a separate aport/package
 	# ruby-bundler.
-	subpkgdir=".trash" _mvgem bundler && rm -Rf .trash
+	rm -rf ./$_rubydir/bundler
+	rm ./$_rubydir/bundler.rb
+	rm -rf ./$_gemdir/gems/bundler-*
+	rm ./$_gemdir/specifications/default/bundler-*.gemspec
 	rm usr/bin/bundle usr/bin/bundler
 
 	# Remove bundled CA certificates; they are provided by ca-certificates.
-	rm "$pkgdir"/$_rubydir/rubygems/ssl_certs/*/*.pem
-	rmdir "$pkgdir"/$_rubydir/rubygems/ssl_certs/* || true
+	rm ./$_rubydir/rubygems/ssl_certs/*/*.pem
+	rmdir ./$_rubydir/rubygems/ssl_certs/* || true
 
-	rm -Rf "$pkgdir"/$_gemdir/cache/*
+	rm -Rf ./$_gemdir/cache/*
 
-	if [ -d "$pkgdir"/usr/local ]; then
-		local f=$(cd "$pkgdir" ; find usr/local -type f)
+	if [ -d usr/local ]; then
+		local f=$(find usr/local -type f)
 		if [ -n "$f" ]; then
 			error "Found files in /usr/local:"
 			echo "$f"
 			return 1
 		fi
-		rm -r "$pkgdir"/usr/local
+		rm -r usr/local
 	fi
 }
 
-bigdecimal() {
-	pkgdesc="Ruby arbitrary-precision floating point decimal arithmetic"
-	license="Ruby"
-	depends="$pkgname-libs"
-
-	_mvgem bigdecimal
-}
-
-dbm() {
-	pkgdesc="A Ruby wrapper for the UNIX-style Database Manager Library"
-	license="BSD-2-Clause"
-	depends=""
-
-	_mvgem dbm
-}
-
-did_you_mean() {
-	pkgdesc="Did you mean? experience in Ruby"
-	license="MIT"
-	depends="$pkgname-libs"
-
-	_mvgem did_you_mean
-}
-
-etc() {
-	pkgdesc="Provides access to information typically stored in UNIX /etc directory"
-	license="BSD-2-Clause"
-	depends=""
-
-	_mvgem etc
-}
-
-fiddle() {
-	pkgdesc="A libffi wrapper for Ruby"
-	license="BSD-2-Clause"
-	depends=""
-
-	_mvgem fiddle
-}
-
-gdbm() {
-	pkgdesc="Ruby extension for GNU dbm"
-	license="BSD-2-Clause"
-	depends=""
-
-	_mvgem gdbm
-}
-
-io_console() {
-	pkgdesc="Ruby simple console IO library"
-	license="BSD-2-Clause"
-	depends=""
-
-	_mvgem io-console
-	_mv $_rubydir/io \
-		$_rubydir/$_chost/io/console.so
-}
-
-irb() {
-	pkgdesc="The Interactive Ruby"
-	replaces="$pkgname"
-	depends="$pkgname"
-
-	cd "$pkgdir"
-	_mvgem irb
-	_mv usr/bin/irb
-}
-
-json() {
-	pkgdesc="JSON implementation as a Ruby extension in C"
-	license="Ruby"
-	depends=""
-
-	_mvgem json
-}
-
-minitest() {
-	pkgdesc="Ruby suite of testing facilities"
-	license="MIT"
-	depends="$pkgname"
-
-	_mvgem minitest
-}
-
-net_telnet() {
-	pkgdesc="Telnet client functionality for Ruby"
-	depends="$pkgname-libs"
-
-	_mvgem net-telnet
-}
-
-power_assert() {
-	pkgdesc="Power Assert for Ruby"
-	depends="$pkgname-libs"
-
-	_mvgem power_assert
-}
-
-rake() {
-	pkgdesc="Ruby based make-like utility"
-	license="MIT"
-	depends="$pkgname"
-
-	_mvgem rake
-	_mv usr/bin/rake
-}
-
 rdoc() {
 	pkgdesc="Ruby documentation tool"
 	license="Ruby"
-	depends="$pkgname $pkgname-json $pkgname-io-console"
-
-	_mvgem rdoc
-	_mv usr/bin/ri \
-		usr/bin/rdoc
-}
-
-sdbm() {
-	pkgdesc="A simple file-based key-value store with String keys and values for Ruby"
-	license="BSD-2-Clause"
-	depends=""
-
-	_mvgem sdbm
-}
-
-test_unit() {
-	pkgdesc="An xUnit family unit testing framework for Ruby"
-	license="Ruby PSFL"
-	depends="$pkgname $pkgname-power_assert"
-
-	_mvgem test-unit
-}
-
-webrick() {
-	pkgdesc="HTTP server toolkit for Ruby"
-	license="BSD-2-Clause"
 	depends="$pkgname"
 
-	_mvgem webrick
-}
-
-xmlrpc() {
-	pkgdesc="XMLRPC library for Ruby"
-	license="Ruby"
-	depends="$pkgname-libs"
-
-	_mvgem xmlrpc
+	amove $_rubydir/rdoc
+	amove $_gemdir/gems/rdoc-*
+	amove $_gemdir/specifications/default/rdoc-*
+	amove usr/bin/ri
+	amove usr/bin/rdoc
 }
 
 libs() {
 	pkgdesc="Libraries necessary to run Ruby"
 	depends=""
 
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
+	amove usr/lib
 }
 
 full() {
 	pkgdesc="Ruby with all bundled gems"
 	# bundler is bundled since Ruby 2.6, so include it in ruby-full despite
 	# that it's provided by a seprate aport/package.
-	depends="ruby $_bundled_gems ruby-bundler"
+	depends="ruby ruby-rdoc ruby-bundler $(cat "$srcdir"/.ruby-full.depends)"
 
 	mkdir -p "$subpkgdir"
 }
 
-_mv() {
-	local i; for i in "$@"; do
-		mkdir -p "$subpkgdir"/${i%/*}
-		mv "$pkgdir"/${i} "$subpkgdir"/${i%/*}/
-	done
-}
-
-_mvgem() {
-	cd "$pkgdir"
-	local path; for path in ./$_rubydir/${1}.rb \
-			./$_rubydir/${1} \
-			./$_rubydir/$_chost/${1} \
-			./$_rubydir/$_chost/${1}.so \
-			./$_gemdir/gems/${1}-* \
-			./$_gemdir/specifications/${1}-* \
-			./$_gemdir/specifications/default/${1}-* ; do
-		[ ! -e "$pkgdir/$path" ] || _mv "$path"
-	done
-}
-
-sha512sums="7ab7a0cdaf4863152efc86dbcfada7f10ab3fe33590eee3b6ab7b26fc27835a8a0ded4ec02b58e9969175582a2be5410da3dc9f8694a3cd2db97708bd72773e1  ruby-2.6.5.tar.gz
-cfdc5ea3b2e2ea69c51f38e8e2180cb1dc27008ca55cc6301f142ebafdbab31c3379b3b6bba9ff543153876dd98ed2ad194df3255b7ea77a62e931c935f80538  rubygems-avoid-platform-specific-gems.patch
-814fe6359505b70d8ff680adf22f20a74b4dbd3fecc9a63a6c2456ee9824257815929917b6df5394ed069a6869511b8c6dce5b95b4acbbb7867c1f3a975a0150  test_insns-lower-recursion-depth.patch
-8d730f02f76e53799f1c220eb23e3d2305940bb31216a7ab1e42d3256149c0721c7d173cdbfe505023b1af2f5cb3faa233dcc1b5d560fa8f980c17c2d29a9d81  fix-get_main_stack.patch
-cc6acabcf8d237ba75309f7c3b5fbe6bd68b2e355d2c4a656a50dea6dda4ab8153db90399b23d301ee463d56274f629aa40b2958646122f71925b4e2e602304d  avoid-rdoc-hook-when-its-failed-to-load-rdoc-library.patch
-a67813d7aa3553ed336f04b17461c5129546afb71a2a7cca6d1b1c860f8dd5839ca2f7695c971369f295aced3580687a28881ccd6c305f6dbdfe6b0ecf584d0e  openssl-config-support-include-directive.patch"
+sha512sums="
+26074009b501fc793d71a74e419f34a6033c9353433919ca74ba2d24a3de432dbb11fd92c2bc285f0e4d951a6d6c74bf5b69a2ab36200c8c26e871746d6e0fc6  ruby-3.3.0.tar.gz
+16fc1f35aee327d1ecac420b091beaa53c675e0504d5a6932004f17ca68a2c38f57b053b0a3903696f2232c5add160d363e3972a962f7f7bcb52e4e998c7315d  test_insns-lower-recursion-depth.patch
+42cd45c1db089a1ae57834684479a502e357ddba82ead5fa34e64c13971e7ab7ad2919ddd60a104a817864dd3e2e35bdbedb679210eb41d82cab36a0687e43d4  fix-get_main_stack.patch
+a77da5e5eb7d60caf3f1cabb81e09b88dc505ddd746e34efd1908c0096621156d81cc65095b846ba9bdb66028891aefce883a43ddec6b56b5beb4aac5e4ee33f  dont-install-bundled-gems.patch
+000530316af1fca007fe8cee694b59e2e801674bcc1a2ebea95e67745d4afc0ce66c902fdbc88ee847a4fbf55115b183cd803cbf7c98ef685938efb3e2b7c991  fix-riscv64-build.patch
+"
diff --git a/main/ruby/avoid-rdoc-hook-when-its-failed-to-load-rdoc-library.patch b/main/ruby/avoid-rdoc-hook-when-its-failed-to-load-rdoc-library.patch
deleted file mode 100644
index 690d245a57b..00000000000
--- a/main/ruby/avoid-rdoc-hook-when-its-failed-to-load-rdoc-library.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c16675582a68800ef17b6056110e0a8bcdb38b55 Mon Sep 17 00:00:00 2001
-From: SHIBATA Hiroshi <hsbt@ruby-lang.org>
-Date: Tue, 22 Jan 2019 09:37:23 +0900
-Subject: [PATCH] Avoid rdoc hook when it's failed to load rdoc library.
-
-  Fixed #2483
----
- lib/rubygems/rdoc.rb | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/rubygems/rdoc.rb b/lib/rubygems/rdoc.rb
-index dfaf7c55bf..4e16fbb86f 100644
---- a/lib/rubygems/rdoc.rb
-+++ b/lib/rubygems/rdoc.rb
-@@ -18,7 +18,7 @@
-   module Gem
-     RDoc = ::RDoc::RubygemsHook
-   end
-+
-+  Gem.done_installing(&Gem::RDoc.method(:generation_hook))
- rescue LoadError
- end
--
--Gem.done_installing(&Gem::RDoc.method(:generation_hook))
diff --git a/main/ruby/dont-install-bundled-gems.patch b/main/ruby/dont-install-bundled-gems.patch
new file mode 100644
index 00000000000..b125fa0629e
--- /dev/null
+++ b/main/ruby/dont-install-bundled-gems.patch
@@ -0,0 +1,20 @@
+Don't install bundled gems - we package them separately.
+
+--- a/tool/rbinstall.rb
++++ b/tool/rbinstall.rb
+@@ -990,6 +990,7 @@
+   end
+ end
+ 
++=begin XXX-Patched
+ install?(:ext, :comm, :gem, :'bundled-gems') do
+   gem_dir = Gem.default_dir
+   install_dir = with_destdir(gem_dir)
+@@ -1057,6 +1058,7 @@
+     puts "skipped bundled gems: #{gems.join(' ')}"
+   end
+ end
++=end
+ 
+ parse_args()
+ 
diff --git a/main/ruby/fix-get_main_stack.patch b/main/ruby/fix-get_main_stack.patch
index 4bb9a093249..864a3144b2a 100644
--- a/main/ruby/fix-get_main_stack.patch
+++ b/main/ruby/fix-get_main_stack.patch
@@ -1,8 +1,6 @@
-diff --git a/thread_pthread.c b/thread_pthread.c
-index 951885ffa0..cf90321d1d 100644
 --- a/thread_pthread.c
 +++ b/thread_pthread.c
-@@ -530,9 +530,6 @@ hpux_attr_getstackaddr(const pthread_attr_t *attr, void **addr)
+@@ -858,9 +858,6 @@
  #   define MAINSTACKADDR_AVAILABLE 0
  # endif
  #endif
@@ -12,7 +10,7 @@ index 951885ffa0..cf90321d1d 100644
  
  #ifdef STACKADDR_AVAILABLE
  /*
-@@ -614,6 +611,55 @@ get_stack(void **addr, size_t *size)
+@@ -942,6 +939,55 @@
      return 0;
  #undef CHECK_ERR
  }
diff --git a/main/ruby/fix-riscv64-build.patch b/main/ruby/fix-riscv64-build.patch
new file mode 100644
index 00000000000..e81e8b62c78
--- /dev/null
+++ b/main/ruby/fix-riscv64-build.patch
@@ -0,0 +1,38 @@
+Patch-Source: https://lists.openembedded.org/g/openembedded-core/message/161168
+partially extracted to actually apply onto a release tarball
+
+---
+From dfb22e4d6662bf72879eda806eaa78c7b52b519e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 25 Jan 2022 20:29:14 -0800
+Subject: [PATCH] vm_dump.c: Define REG_S1 and REG_S2 for musl/riscv
+
+These defines are missing in musl, there is a possible
+patch to add them to musl, but we need a full list of
+these names for mcontext that can be added once for all
+
+Upstream-Status: Inappropriate [musl bug]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ vm_dump.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/vm_dump.c b/vm_dump.c
+index a98f5aa..957b785 100644
+--- a/vm_dump.c
++++ b/vm_dump.c
+@@ -39,6 +39,11 @@
+ 
+ #define MAX_POSBUF 128
+ 
++#if defined(__riscv) && !defined(__GLIBC__)
++# define REG_S1 9
++# define REG_S2 18
++#endif
++
+ #define VM_CFP_CNT(ec, cfp) \
+   ((rb_control_frame_t *)((ec)->vm_stack + (ec)->vm_stack_size) - \
+    (rb_control_frame_t *)(cfp))
+-- 
+2.35.0
+
diff --git a/main/ruby/openssl-config-support-include-directive.patch b/main/ruby/openssl-config-support-include-directive.patch
deleted file mode 100644
index 2abf463760a..00000000000
--- a/main/ruby/openssl-config-support-include-directive.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From f46bac1f3e8634e24c747d06b28e11b874f1e488 Mon Sep 17 00:00:00 2001
-From: Kazuki Yamaguchi <k@rhe.jp>
-Date: Thu, 16 Aug 2018 19:40:48 +0900
-Subject: [PATCH] config: support .include directive
-
-OpenSSL 1.1.1 introduces a new '.include' directive. Update our config
-parser to support that.
-
-As mentioned in the referenced GitHub issue, we should use the OpenSSL
-API instead of implementing the parsing logic ourselves, but it will
-need backwards-incompatible changes which we can't backport to stable
-versions. So continue to use the Ruby implementation for now.
-
-Reference: https://github.com/ruby/openssl/issues/208
-
-Patch-Source: https://src.fedoraproject.org/rpms/ruby/blob/04b63f48ea89ff10fcffafe2ff3815dfa0e16e99/f/ruby-2.6.0-config-support-include-directive.patch
----
- ext/openssl/lib/openssl/config.rb | 54 ++++++++++++++++++++-----------
- test/openssl/test_config.rb       | 54 +++++++++++++++++++++++++++++++
- 2 files changed, 90 insertions(+), 18 deletions(-)
-
-diff --git a/ext/openssl/lib/openssl/config.rb b/ext/openssl/lib/openssl/config.rb
-index 88225451..ba3a54c8 100644
---- a/ext/openssl/lib/openssl/config.rb
-+++ b/ext/openssl/lib/openssl/config.rb
-@@ -77,29 +77,44 @@ def get_key_string(data, section, key) # :nodoc:
-       def parse_config_lines(io)
-         section = 'default'
-         data = {section => {}}
--        while definition = get_definition(io)
-+        io_stack = [io]
-+        while definition = get_definition(io_stack)
-           definition = clear_comments(definition)
-           next if definition.empty?
--          if definition[0] == ?[
-+          case definition
-+          when /\A\[/
-             if /\[([^\]]*)\]/ =~ definition
-               section = $1.strip
-               data[section] ||= {}
-             else
-               raise ConfigError, "missing close square bracket"
-             end
--          else
--            if /\A([^:\s]*)(?:::([^:\s]*))?\s*=(.*)\z/ =~ definition
--              if $2
--                section = $1
--                key = $2
--              else
--                key = $1
-+          when /\A\.include (\s*=\s*)?(.+)\z/
-+            path = $2
-+            if File.directory?(path)
-+              files = Dir.glob(File.join(path, "*.{cnf,conf}"), File::FNM_EXTGLOB)
-+            else
-+              files = [path]
-+            end
-+
-+            files.each do |filename|
-+              begin
-+                io_stack << StringIO.new(File.read(filename))
-+              rescue
-+                raise ConfigError, "could not include file '%s'" % filename
-               end
--              value = unescape_value(data, section, $3)
--              (data[section] ||= {})[key] = value.strip
-+            end
-+          when /\A([^:\s]*)(?:::([^:\s]*))?\s*=(.*)\z/
-+            if $2
-+              section = $1
-+              key = $2
-             else
--              raise ConfigError, "missing equal sign"
-+              key = $1
-             end
-+            value = unescape_value(data, section, $3)
-+            (data[section] ||= {})[key] = value.strip
-+          else
-+            raise ConfigError, "missing equal sign"
-           end
-         end
-         data
-@@ -212,10 +227,10 @@ def clear_comments(line)
-         scanned.join
-       end
- 
--      def get_definition(io)
--        if line = get_line(io)
-+      def get_definition(io_stack)
-+        if line = get_line(io_stack)
-           while /[^\\]\\\z/ =~ line
--            if extra = get_line(io)
-+            if extra = get_line(io_stack)
-               line += extra
-             else
-               break
-@@ -225,9 +240,12 @@ def get_definition(io)
-         end
-       end
- 
--      def get_line(io)
--        if line = io.gets
--          line.gsub(/[\r\n]*/, '')
-+      def get_line(io_stack)
-+        while io = io_stack.last
-+          if line = io.gets
-+            return line.gsub(/[\r\n]*/, '')
-+          end
-+          io_stack.pop
-         end
-       end
-     end
-diff --git a/test/openssl/test_config.rb b/test/openssl/test_config.rb
-index 99dcc497..5653b5d0 100644
---- a/test/openssl/test_config.rb
-+++ b/test/openssl/test_config.rb
-@@ -120,6 +120,49 @@ def test_s_parse_format
-     assert_equal("error in line 7: missing close square bracket", excn.message)
-   end
- 
-+  def test_s_parse_include
-+    in_tmpdir("ossl-config-include-test") do |dir|
-+      Dir.mkdir("child")
-+      File.write("child/a.conf", <<~__EOC__)
-+        [default]
-+        file-a = a.conf
-+        [sec-a]
-+        a = 123
-+      __EOC__
-+      File.write("child/b.cnf", <<~__EOC__)
-+        [default]
-+        file-b = b.cnf
-+        [sec-b]
-+        b = 123
-+      __EOC__
-+      File.write("include-child.conf", <<~__EOC__)
-+        key_outside_section = value_a
-+        .include child
-+      __EOC__
-+
-+      include_file = <<~__EOC__
-+        [default]
-+        file-main = unnamed
-+        [sec-main]
-+        main = 123
-+        .include = include-child.conf
-+      __EOC__
-+
-+      # Include a file by relative path
-+      c1 = OpenSSL::Config.parse(include_file)
-+      assert_equal(["default", "sec-a", "sec-b", "sec-main"], c1.sections.sort)
-+      assert_equal(["file-main", "file-a", "file-b"], c1["default"].keys)
-+      assert_equal({"a" => "123"}, c1["sec-a"])
-+      assert_equal({"b" => "123"}, c1["sec-b"])
-+      assert_equal({"main" => "123", "key_outside_section" => "value_a"}, c1["sec-main"])
-+
-+      # Relative paths are from the working directory
-+      assert_raise(OpenSSL::ConfigError) do
-+        Dir.chdir("child") { OpenSSL::Config.parse(include_file) }
-+      end
-+    end
-+  end
-+
-   def test_s_load
-     # alias of new
-     c = OpenSSL::Config.load
-@@ -299,6 +342,17 @@ def test_clone
-     @it['newsection'] = {'a' => 'b'}
-     assert_not_equal(@it.sections.sort, c.sections.sort)
-   end
-+
-+  private
-+
-+  def in_tmpdir(*args)
-+    Dir.mktmpdir(*args) do |dir|
-+      dir = File.realpath(dir)
-+      Dir.chdir(dir) do
-+        yield dir
-+      end
-+    end
-+  end
- end
- 
- end
diff --git a/main/ruby/rubygems-avoid-platform-specific-gems.patch b/main/ruby/rubygems-avoid-platform-specific-gems.patch
deleted file mode 100644
index 74a53655824..00000000000
--- a/main/ruby/rubygems-avoid-platform-specific-gems.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Fri, 19 May 2017 19:56:00 +0200
-Subject: [PATCH] Rubygems: don't install platform-specific gems
-
-Gems with native extensions typically contain just source code that is
-built during installation on user's system. However, Rubygems allows to
-publish even platform-specific gems with prebuilt binaries for specific
-platform. The problem is that Rubygems uses only short platform
-identification like x86_64-linux; it does not identify used libc.
-And sadly platform-specific gems for linux are built against glibc, so
-they may not work on musl libc.
-
-This patch is a workaround for the aforesaid problem. It removes local
-platform from Rubygems' supported platforms to force it always pick
-a platform-agnostic (source) gem. Users can override it using
-`--platform` option.
-
---- a/lib/rubygems.rb
-+++ b/lib/rubygems.rb
-@@ -743,7 +743,10 @@
-   def self.platforms
-     @platforms ||= []
-     if @platforms.empty?
--      @platforms = [Gem::Platform::RUBY, Gem::Platform.local]
-+      # XXX: Patched to avoid installing platform-specific gems with binaries
-+      # linked against glibc.
-+      @platforms = [Gem::Platform::RUBY]
-+      #@platforms = [Gem::Platform::RUBY, Gem::Platform.local]
-     end
-     @platforms
-   end
diff --git a/main/ruby/test_insns-lower-recursion-depth.patch b/main/ruby/test_insns-lower-recursion-depth.patch
index 48e88dfd60c..006972097cc 100644
--- a/main/ruby/test_insns-lower-recursion-depth.patch
+++ b/main/ruby/test_insns-lower-recursion-depth.patch
@@ -36,7 +36,7 @@ so we hit SystemStackError sooner than on other platforms.
 
 --- a/bootstraptest/test_insns.rb
 +++ b/bootstraptest/test_insns.rb
-@@ -248,7 +248,7 @@
+@@ -274,7 +274,7 @@
          end
        }/ox
      end
@@ -44,4 +44,4 @@ so we hit SystemStackError sooner than on other platforms.
 +    x = once(32); x = once(7); x = once(16);
      x =~ "true" && $~
    },
-   [ 'once', <<~'},', ],         # {
+   [ 'once', <<-'},', ],         # {
diff --git a/main/run-parts/APKBUILD b/main/run-parts/APKBUILD
index 38ee322b610..b19dbd04745 100644
--- a/main/run-parts/APKBUILD
+++ b/main/run-parts/APKBUILD
@@ -1,27 +1,29 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=run-parts
-_pkgname=debianutils
-pkgver=4.9.1
-pkgrel=0
+pkgver=4.11.2
+pkgrel=2
 pkgdesc="run-parts from the debianutils package"
 url="https://packages.qa.debian.org/d/debianutils.html"
 arch="all"
 license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
-source="http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_$pkgver.tar.xz"
-builddir="$srcdir"/$_pkgname-$pkgver
-
+source="https://deb.debian.org/debian/pool/main/d/debianutils/debianutils_$pkgver.tar.xz"
+builddir="$srcdir"/debianutils
+options="!check"
 
 build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/usr \
+		--bindir=/bin
 	make
 }
 
 package() {
-	install -D -m755 run-parts $pkgdir/usr/bin/run-parts
+	# Install binaries to /bin to overwrite busybox's run-parts version.
+	install -D -m755 run-parts $pkgdir/bin/run-parts
 	install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8
 }
-sha512sums="b442950febe6df9e15ec04a6fec0ee8be12d3eac38dc3f9331438d871e3382f4e0f599da0eaeff0e7e9ba0fa5136ce3c3b51c6718e4d7f11c1675f745052a9b1  debianutils_4.9.1.tar.xz"
+
+sha512sums="0bd9098beee78b3c8dae839f0c29e9f142cbb22f2ced473cf7ae47a14d9493ba882c1829eba213780392a87a3223b3689729754c8ded80a091efaef3f6f903fd  debianutils_4.11.2.tar.xz"
diff --git a/main/rust-bindgen/APKBUILD b/main/rust-bindgen/APKBUILD
new file mode 100644
index 00000000000..3605fa58a52
--- /dev/null
+++ b/main/rust-bindgen/APKBUILD
@@ -0,0 +1,30 @@
+# Contributor: Milan P. Stanić <mps@arvanta.net>
+# Maintainer: Milan P. Stanić <mps@arvanta.net>
+
+pkgname=rust-bindgen
+pkgver=0.66.1
+pkgrel=0
+pkgdesc="automatically generates Rust FFI bindings to C (and some C++) libraries"
+url="https://github.com/rust-lang/rust-bindgen"
+makedepends="cargo clang cargo-auditable"
+arch="all"
+license="BSD-3-Clause"
+options="net !check" # no test
+source="$pkgname-$pkgver.tar.gz::https://github.com/rust-lang/rust-bindgen/archive/v$pkgver.tar.gz"
+
+prepare() {
+	default_prepare
+	cargo fetch --target="$CTARGET" --locked
+}
+
+build() {
+	cargo auditable build --release --frozen
+}
+
+package() {
+	install -Dm755 target/release/bindgen "$pkgdir"/usr/bin/bindgen
+}
+
+sha512sums="
+71e1ec6ce4933a7a5451aa5baa47f885b9ec6b692bf2a2b3d8c1f2cce2c3cd3d941f8b8e4dfd7c776e954a9d3824b67c435897521f726553b63a2f1cb81bba99  rust-bindgen-0.66.1.tar.gz
+"
diff --git a/main/rust/0001-Add-new-Tier-3-target-loongarch64-unknown-linux-musl.patch b/main/rust/0001-Add-new-Tier-3-target-loongarch64-unknown-linux-musl.patch
new file mode 100644
index 00000000000..dc119b781df
--- /dev/null
+++ b/main/rust/0001-Add-new-Tier-3-target-loongarch64-unknown-linux-musl.patch
@@ -0,0 +1,64 @@
+From 9499baeeabc8f4494460770714a9805ff8aeaaa8 Mon Sep 17 00:00:00 2001
+From: WANG Rui <wangrui@loongson.cn>
+Date: Mon, 5 Jun 2023 19:51:24 +0800
+Subject: [PATCH 01/12] Add new Tier-3 target: `loongarch64-unknown-linux-musl`
+
+MCP: https://github.com/rust-lang/compiler-team/issues/518
+---
+ compiler/rustc_target/src/spec/mod.rs          |  1 +
+ .../targets/loongarch64_unknown_linux_musl.rs  | 18 ++++++++++++++++++
+ src/doc/rustc/src/platform-support.md          |  1 +
+ 3 files changed, 20 insertions(+)
+ create mode 100644 compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_musl.rs
+
+diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
+index 6c698c5b0..b3ee709c2 100644
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1402,6 +1402,7 @@ supported_targets! {
+     ("i686-unknown-linux-gnu", i686_unknown_linux_gnu),
+     ("i586-unknown-linux-gnu", i586_unknown_linux_gnu),
+     ("loongarch64-unknown-linux-gnu", loongarch64_unknown_linux_gnu),
++    ("loongarch64-unknown-linux-musl", loongarch64_unknown_linux_musl),
+     ("m68k-unknown-linux-gnu", m68k_unknown_linux_gnu),
+     ("csky-unknown-linux-gnuabiv2", csky_unknown_linux_gnuabiv2),
+     ("csky-unknown-linux-gnuabiv2hf", csky_unknown_linux_gnuabiv2hf),
+diff --git a/compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_musl.rs
+new file mode 100644
+index 000000000..01a003ce8
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/targets/loongarch64_unknown_linux_musl.rs
+@@ -0,0 +1,18 @@
++use crate::spec::{base, Target, TargetOptions};
++
++pub fn target() -> Target {
++    Target {
++        llvm_target: "loongarch64-unknown-linux-musl".into(),
++        pointer_width: 64,
++        data_layout: "e-m:e-p:64:64-i64:64-i128:128-n64-S128".into(),
++        arch: "loongarch64".into(),
++        options: TargetOptions {
++            cpu: "generic".into(),
++            features: "+f,+d".into(),
++            llvm_abiname: "lp64d".into(),
++            max_atomic_width: Some(64),
++            crt_static_default: false,
++            ..base::linux_musl::opts()
++        },
++    }
++}
+diff --git a/src/doc/rustc/src/platform-support.md b/src/doc/rustc/src/platform-support.md
+index f648a60b6..bc2427d6a 100644
+--- a/src/doc/rustc/src/platform-support.md
++++ b/src/doc/rustc/src/platform-support.md
+@@ -167,6 +167,7 @@ target | std | notes
+ `i686-unknown-freebsd` | ✓ | 32-bit FreeBSD [^x86_32-floats-return-ABI]
+ `i686-unknown-linux-musl` | ✓ | 32-bit Linux with MUSL [^x86_32-floats-return-ABI]
+ [`i686-unknown-uefi`](platform-support/unknown-uefi.md) | * | 32-bit UEFI
++[`loongarch64-unknown-linux-musl`](platform-support/loongarch-linux.md) | ? |  | LoongArch64 Linux (LP64D ABI)
+ [`loongarch64-unknown-none`](platform-support/loongarch-none.md) | * |  | LoongArch64 Bare-metal (LP64D ABI)
+ [`loongarch64-unknown-none-softfloat`](platform-support/loongarch-none.md) | * |  | LoongArch64 Bare-metal (LP64S ABI)
+ [`nvptx64-nvidia-cuda`](platform-support/nvptx64-nvidia-cuda.md) | * | --emit=asm generates PTX code that [runs on NVIDIA GPUs]
+-- 
+2.44.0
+
diff --git a/main/rust/0002-tests-Add-loongarch64-unknown-linux-musl-target.patch b/main/rust/0002-tests-Add-loongarch64-unknown-linux-musl-target.patch
new file mode 100644
index 00000000000..1b2e31fd4f1
--- /dev/null
+++ b/main/rust/0002-tests-Add-loongarch64-unknown-linux-musl-target.patch
@@ -0,0 +1,26 @@
+From 440278d4971c82b366077d61f682105e197f9680 Mon Sep 17 00:00:00 2001
+From: WANG Rui <wangrui@loongson.cn>
+Date: Fri, 1 Mar 2024 11:43:27 +0800
+Subject: [PATCH 02/12] tests: Add loongarch64-unknown-linux-musl target
+
+---
+ tests/assembly/targets/targets-elf.rs | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tests/assembly/targets/targets-elf.rs b/tests/assembly/targets/targets-elf.rs
+index 41f5df0fb..bf89790a5 100644
+--- a/tests/assembly/targets/targets-elf.rs
++++ b/tests/assembly/targets/targets-elf.rs
+@@ -231,6 +231,9 @@
+ // revisions: loongarch64_unknown_linux_gnu
+ // [loongarch64_unknown_linux_gnu] compile-flags: --target loongarch64-unknown-linux-gnu
+ // [loongarch64_unknown_linux_gnu] needs-llvm-components: loongarch
++// revisions: loongarch64_unknown_linux_musl
++// [loongarch64_unknown_linux_musl] compile-flags: --target loongarch64-unknown-linux-musl
++// [loongarch64_unknown_linux_musl] needs-llvm-components: loongarch
+ // revisions: loongarch64_unknown_none
+ // [loongarch64_unknown_none] compile-flags: --target loongarch64-unknown-none
+ // [loongarch64_unknown_none] needs-llvm-components: loongarch
+-- 
+2.44.0
+
diff --git a/main/rust/0005-configure.py-add-flag-for-loongarch64-musl-root.patch b/main/rust/0005-configure.py-add-flag-for-loongarch64-musl-root.patch
new file mode 100644
index 00000000000..9a6bccbe9d4
--- /dev/null
+++ b/main/rust/0005-configure.py-add-flag-for-loongarch64-musl-root.patch
@@ -0,0 +1,25 @@
+From ac3ab633b1d4ca35e49c7dfe8dbe5a6be7cbc303 Mon Sep 17 00:00:00 2001
+From: WANG Rui <wangrui@loongson.cn>
+Date: Mon, 11 Mar 2024 11:28:34 +0800
+Subject: [PATCH 05/12] configure.py: add flag for loongarch64 musl-root
+
+---
+ src/bootstrap/configure.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
+index d34c19a47..cba7f98e8 100755
+--- a/src/bootstrap/configure.py
++++ b/src/bootstrap/configure.py
+@@ -130,6 +130,8 @@ v("musl-root-riscv32gc", "target.riscv32gc-unknown-linux-musl.musl-root",
+   "riscv32gc-unknown-linux-musl install directory")
+ v("musl-root-riscv64gc", "target.riscv64gc-unknown-linux-musl.musl-root",
+   "riscv64gc-unknown-linux-musl install directory")
++v("musl-root-loongarch64", "target.loongarch64-unknown-linux-musl.musl-root",
++  "loongarch64-unknown-linux-musl install directory")
+ v("qemu-armhf-rootfs", "target.arm-unknown-linux-gnueabihf.qemu-rootfs",
+   "rootfs in qemu testing, you probably don't want to use this")
+ v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",
+-- 
+2.44.0
+
diff --git a/main/rust/0006-ci-Add-support-for-dist-loongarch64-musl.patch b/main/rust/0006-ci-Add-support-for-dist-loongarch64-musl.patch
new file mode 100644
index 00000000000..46cd5c22913
--- /dev/null
+++ b/main/rust/0006-ci-Add-support-for-dist-loongarch64-musl.patch
@@ -0,0 +1,121 @@
+From fb5f17d6958e86af31e719482001b13bec3b29ce Mon Sep 17 00:00:00 2001
+From: WANG Rui <wangrui@loongson.cn>
+Date: Tue, 5 Mar 2024 16:04:02 +0800
+Subject: [PATCH 06/12] ci: Add support for dist-loongarch64-musl
+
+---
+ src/ci/docker/README.md                       | 16 +++++++++
+ .../dist-loongarch64-musl/Dockerfile          | 36 +++++++++++++++++++
+ .../loongarch64-unknown-linux-musl.defconfig  | 15 ++++++++
+ src/ci/github-actions/ci.yml                  |  3 ++
+ 4 files changed, 70 insertions(+)
+ create mode 100644 src/ci/docker/host-x86_64/dist-loongarch64-musl/Dockerfile
+ create mode 100644 src/ci/docker/host-x86_64/dist-loongarch64-musl/loongarch64-unknown-linux-musl.defconfig
+
+diff --git a/src/ci/docker/README.md b/src/ci/docker/README.md
+index 2e6456837..c53cf28c0 100644
+--- a/src/ci/docker/README.md
++++ b/src/ci/docker/README.md
+@@ -274,6 +274,22 @@ For targets: `loongarch64-unknown-linux-gnu`
+ - C compiler > gcc version = 13.2.0
+ - C compiler > C++ = ENABLE -- to cross compile LLVM
+ 
++### `loongarch64-linux-musl.defconfig`
++
++For targets: `loongarch64-unknown-linux-musl`
++
++- Path and misc options > Prefix directory = /x-tools/${CT\_TARGET}
++- Path and misc options > Use a mirror = ENABLE
++- Path and misc options > Base URL = https://ci-mirrors.rust-lang.org/rustc
++- Target options > Target Architecture = loongarch
++- Target options > Bitness = 64-bit
++- Operating System > Target OS = linux
++- Operating System > Linux kernel version = 5.19.16
++- Binary utilities > Version of binutils = 2.41
++- C-library > musl version = 1.2.5
++- C compiler > gcc version = 13.2.0
++- C compiler > C++ = ENABLE -- to cross compile LLVM
++
+ ### `mips-linux-gnu.defconfig`
+ 
+ For targets: `mips-unknown-linux-gnu`
+diff --git a/src/ci/docker/host-x86_64/dist-loongarch64-musl/Dockerfile b/src/ci/docker/host-x86_64/dist-loongarch64-musl/Dockerfile
+new file mode 100644
+index 000000000..201e83b2c
+--- /dev/null
++++ b/src/ci/docker/host-x86_64/dist-loongarch64-musl/Dockerfile
+@@ -0,0 +1,36 @@
++FROM ubuntu:22.04
++
++COPY scripts/cross-apt-packages.sh /scripts/
++RUN sh /scripts/cross-apt-packages.sh
++
++COPY scripts/crosstool-ng.sh /scripts/
++RUN sh /scripts/crosstool-ng.sh
++
++COPY scripts/rustbuild-setup.sh /scripts/
++RUN sh /scripts/rustbuild-setup.sh
++WORKDIR /tmp
++
++COPY scripts/crosstool-ng-build.sh /scripts/
++COPY host-x86_64/dist-loongarch64-linux/loongarch64-unknown-linux-musl.defconfig /tmp/crosstool.defconfig
++RUN /scripts/crosstool-ng-build.sh
++
++COPY scripts/sccache.sh /scripts/
++RUN sh /scripts/sccache.sh
++
++ENV PATH=$PATH:/x-tools/loongarch64-unknown-linux-musl/bin
++
++ENV CC_loongarch64_unknown_linux_musl=loongarch64-unknown-linux-musl-gcc \
++    AR_loongarch64_unknown_linux_musl=loongarch64-unknown-linux-musl-ar \
++    CXX_loongarch64_unknown_linux_musl=loongarch64-unknown-linux-musl-g++
++
++ENV HOSTS=loongarch64-unknown-linux-musl
++
++ENV RUST_CONFIGURE_ARGS \
++      --enable-extended \
++      --enable-lld \
++      --disable-docs \
++      --set target.loongarch64-unknown-linux-musl.crt-static=false \
++      --set target.loongarch64-unknown-linux-musl.musl-root=/x-tools/loongarch64-unknown-linux-musl/loongarch64-unknown-linux-musl/sysroot/usr \
++      --build $HOSTS
++
++ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
+diff --git a/src/ci/docker/host-x86_64/dist-loongarch64-musl/loongarch64-unknown-linux-musl.defconfig b/src/ci/docker/host-x86_64/dist-loongarch64-musl/loongarch64-unknown-linux-musl.defconfig
+new file mode 100644
+index 000000000..3ab676ed9
+--- /dev/null
++++ b/src/ci/docker/host-x86_64/dist-loongarch64-musl/loongarch64-unknown-linux-musl.defconfig
+@@ -0,0 +1,15 @@
++CT_CONFIG_VERSION="4"
++CT_EXPERIMENTAL=y
++CT_PREFIX_DIR="/x-tools/${CT_TARGET}"
++CT_USE_MIRROR=y
++CT_MIRROR_BASE_URL="https://ci-mirrors.rust-lang.org/rustc"
++CT_ARCH_LOONGARCH=y
++# CT_DEMULTILIB is not set
++CT_ARCH_USE_MMU=y
++CT_ARCH_ARCH="loongarch64"
++CT_KERNEL_LINUX=y
++CT_LINUX_V_5_19=y
++CT_LIBC_MUSL=y
++CT_CC_GCC_ENABLE_DEFAULT_PIE=y
++CT_CC_LANG_CXX=y
++CT_GETTEXT_NEEDED=y
+diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
+index f2effcbd8..81fc89ab8 100644
+--- a/src/ci/github-actions/ci.yml
++++ b/src/ci/github-actions/ci.yml
+@@ -392,6 +392,9 @@ jobs:
+           - name: dist-loongarch64-linux
+             <<: *job-linux-8c
+ 
++          - name: dist-loongarch64-musl
++            <<: *job-linux-8c
++
+           - name: dist-powerpc-linux
+             <<: *job-linux-8c
+ 
+-- 
+2.44.0
+
diff --git a/main/rust/0007-Promote-loongarch64-unknown-linux-musl-to-Tier-2-wit.patch b/main/rust/0007-Promote-loongarch64-unknown-linux-musl-to-Tier-2-wit.patch
new file mode 100644
index 00000000000..f42bb2ef2ae
--- /dev/null
+++ b/main/rust/0007-Promote-loongarch64-unknown-linux-musl-to-Tier-2-wit.patch
@@ -0,0 +1,47 @@
+From 713ed86a10cc2a95937d7165c05603ab12984f87 Mon Sep 17 00:00:00 2001
+From: WANG Rui <wangrui@loongson.cn>
+Date: Mon, 13 Nov 2023 19:45:27 +0800
+Subject: [PATCH 07/12] Promote loongarch64-unknown-linux-musl to Tier 2 with
+ host tools
+
+MCP: https://github.com/rust-lang/compiler-team/issues/518
+---
+ src/bootstrap/src/core/build_steps/llvm.rs | 1 +
+ src/tools/build-manifest/src/main.rs       | 2 ++
+ 2 files changed, 3 insertions(+), 0 deletion(-)
+
+diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs
+index 4b2d3e9ab..1409acc3b 100644
+--- a/src/bootstrap/src/core/build_steps/llvm.rs
++++ b/src/bootstrap/src/core/build_steps/llvm.rs
+@@ -201,6 +201,7 @@ pub(crate) fn is_ci_llvm_available(config: &Config, asserts: bool) -> bool {
+         ("arm-unknown-linux-gnueabihf", false),
+         ("armv7-unknown-linux-gnueabihf", false),
+         ("loongarch64-unknown-linux-gnu", false),
++        ("loongarch64-unknown-linux-musl", false),
+         ("mips-unknown-linux-gnu", false),
+         ("mips64-unknown-linux-gnuabi64", false),
+         ("mips64el-unknown-linux-gnuabi64", false),
+diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
+index 1ef8cf7de..8fb36c3c7 100644
+--- a/src/tools/build-manifest/src/main.rs
++++ b/src/tools/build-manifest/src/main.rs
+@@ -25,6 +25,7 @@ static HOSTS: &[&str] = &[
+     "i686-pc-windows-msvc",
+     "i686-unknown-linux-gnu",
+     "loongarch64-unknown-linux-gnu",
++    "loongarch64-unknown-linux-musl",
+     "mips-unknown-linux-gnu",
+     "mips64-unknown-linux-gnuabi64",
+     "mips64el-unknown-linux-gnuabi64",
+@@ -99,6 +100,7 @@ static TARGETS: &[&str] = &[
+     "i686-unknown-linux-musl",
+     "i686-unknown-uefi",
+     "loongarch64-unknown-linux-gnu",
++    "loongarch64-unknown-linux-musl",
+     "loongarch64-unknown-none",
+     "loongarch64-unknown-none-softfloat",
+     "m68k-unknown-linux-gnu",
+-- 
+2.44.0
+
diff --git a/main/rust/0008-vendor-libc-Add-support-for-loongarch64-linux-musl.patch b/main/rust/0008-vendor-libc-Add-support-for-loongarch64-linux-musl.patch
new file mode 100644
index 00000000000..6d541d1843f
--- /dev/null
+++ b/main/rust/0008-vendor-libc-Add-support-for-loongarch64-linux-musl.patch
@@ -0,0 +1,760 @@
+From 2e312d2600215e12e88ab9827f7b7c92abaa6606 Mon Sep 17 00:00:00 2001
+From: WANG Rui <wangrui@loongson.cn>
+Date: Tue, 26 Mar 2024 17:37:01 +0800
+Subject: [PATCH 08/12] vendor: libc: Add support for loongarch64-linux-musl
+
+---
+ .../linux/musl/b64/loongarch64/align.rs       |  40 ++
+ .../linux/musl/b64/loongarch64/mod.rs         | 663 ++++++++++++++++++
+ .../src/unix/linux_like/linux/musl/b64/mod.rs |   3 +
+ .../src/unix/linux_like/linux/musl/mod.rs     |   3 +-
+ 4 files changed, 708 insertions(+), 1 deletions(-)
+ create mode 100644 vendor/libc/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs
+ create mode 100644 vendor/libc/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs
+
+diff --git a/vendor/libc/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs b/vendor/libc/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs
+new file mode 100644
+index 000000000..dc191f51f
+--- /dev/null
++++ b/vendor/libc/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs
+@@ -0,0 +1,40 @@
++s_no_extra_traits! {
++    #[allow(missing_debug_implementations)]
++    #[repr(align(16))]
++    pub struct max_align_t {
++        priv_: [f64; 4]
++    }
++}
++
++s! {
++    pub struct ucontext_t {
++        pub uc_flags: ::c_ulong,
++        pub uc_link: *mut ucontext_t,
++        pub uc_stack: ::stack_t,
++        pub uc_sigmask: ::sigset_t,
++        pub uc_mcontext: mcontext_t,
++    }
++
++    #[repr(align(16))]
++    pub struct mcontext_t {
++        pub __pc: ::c_ulonglong,
++        pub __gregs: [::c_ulonglong; 32],
++        pub __flags: ::c_uint,
++        pub __extcontext: [::c_ulonglong; 0],
++    }
++
++    #[repr(align(8))]
++    pub struct clone_args {
++        pub flags: ::c_ulonglong,
++        pub pidfd: ::c_ulonglong,
++        pub child_tid: ::c_ulonglong,
++        pub parent_tid: ::c_ulonglong,
++        pub exit_signal: ::c_ulonglong,
++        pub stack: ::c_ulonglong,
++        pub stack_size: ::c_ulonglong,
++        pub tls: ::c_ulonglong,
++        pub set_tid: ::c_ulonglong,
++        pub set_tid_size: ::c_ulonglong,
++        pub cgroup: ::c_ulonglong,
++    }
++}
+diff --git a/vendor/libc/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs b/vendor/libc/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs
+new file mode 100644
+index 000000000..dffbc2341
+--- /dev/null
++++ b/vendor/libc/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs
+@@ -0,0 +1,663 @@
++//! LoongArch-specific definitions for 64-bit linux-like values
++
++pub type c_char = i8;
++pub type wchar_t = ::c_int;
++
++pub type nlink_t = ::c_uint;
++pub type blksize_t = ::c_int;
++pub type fsblkcnt64_t = ::c_ulong;
++pub type fsfilcnt64_t = ::c_ulong;
++pub type __u64 = ::c_ulonglong;
++pub type __s64 = ::c_longlong;
++
++s! {
++    pub struct pthread_attr_t {
++        __size: [::c_ulong; 7],
++    }
++
++    pub struct stat {
++        pub st_dev: ::dev_t,
++        pub st_ino: ::ino_t,
++        pub st_mode: ::mode_t,
++        pub st_nlink: ::nlink_t,
++        pub st_uid: ::uid_t,
++        pub st_gid: ::gid_t,
++        pub st_rdev: ::dev_t,
++        __pad1: ::dev_t,
++        pub st_size: ::off_t,
++        pub st_blksize: ::blksize_t,
++        __pad2: ::c_int,
++        pub st_blocks: ::blkcnt_t,
++        pub st_atime: ::time_t,
++        pub st_atime_nsec: ::c_long,
++        pub st_mtime: ::time_t,
++        pub st_mtime_nsec: ::c_long,
++        pub st_ctime: ::time_t,
++        pub st_ctime_nsec: ::c_long,
++        __unused: [::c_int; 2usize],
++    }
++
++    pub struct stat64 {
++        pub st_dev: ::dev_t,
++        pub st_ino: ::ino64_t,
++        pub st_mode: ::mode_t,
++        pub st_nlink: ::nlink_t,
++        pub st_uid: ::uid_t,
++        pub st_gid: ::gid_t,
++        pub st_rdev: ::dev_t,
++        pub __pad1: ::dev_t,
++        pub st_size: ::off64_t,
++        pub st_blksize: ::blksize_t,
++        pub __pad2: ::c_int,
++        pub st_blocks: ::blkcnt_t,
++        pub st_atime: ::time_t,
++        pub st_atime_nsec: ::c_long,
++        pub st_mtime: ::time_t,
++        pub st_mtime_nsec: ::c_long,
++        pub st_ctime: ::time_t,
++        pub st_ctime_nsec: ::c_long,
++        __unused: [::c_int; 2],
++    }
++
++    pub struct statfs {
++        pub f_type: ::c_long,
++        pub f_bsize: ::c_long,
++        pub f_blocks: ::fsblkcnt_t,
++        pub f_bfree: ::fsblkcnt_t,
++        pub f_bavail: ::fsblkcnt_t,
++        pub f_files: ::fsfilcnt_t,
++        pub f_ffree: ::fsfilcnt_t,
++        pub f_fsid: ::fsid_t,
++        pub f_namelen: ::c_long,
++        pub f_frsize: ::c_long,
++        pub f_flags: ::c_long,
++        pub f_spare: [::c_long; 4],
++    }
++
++    pub struct statfs64 {
++        pub f_type: ::c_long,
++        pub f_bsize: ::c_long,
++        pub f_blocks: ::fsblkcnt64_t,
++        pub f_bfree: ::fsblkcnt64_t,
++        pub f_bavail: ::fsblkcnt64_t,
++        pub f_files: ::fsfilcnt64_t,
++        pub f_ffree: ::fsfilcnt64_t,
++        pub f_fsid: ::fsid_t,
++        pub f_namelen: ::c_long,
++        pub f_frsize: ::c_long,
++        pub f_flags: ::c_long,
++        pub f_spare: [::c_long; 4],
++    }
++
++    pub struct ipc_perm {
++        pub __key: ::key_t,
++        pub uid: ::uid_t,
++        pub gid: ::gid_t,
++        pub cuid: ::uid_t,
++        pub cgid: ::gid_t,
++        pub mode: ::c_uint,
++        pub __seq: ::c_ushort,
++        __pad2: ::c_ushort,
++        __unused1: ::c_ulong,
++        __unused2: ::c_ulong,
++    }
++
++    pub struct user_regs_struct {
++        pub regs: [u64; 32],
++        pub orig_a0: u64,
++        pub csr_era: u64,
++        pub csr_badv: u64,
++        pub reserved: [u64; 10],
++
++    }
++
++    pub struct user_fp_struct {
++        pub fpr: [u64; 32],
++        pub fcc: u64,
++        pub fcsr: u32,
++    }
++}
++
++pub const SYS_io_setup: ::c_long = 0;
++pub const SYS_io_destroy: ::c_long = 1;
++pub const SYS_io_submit: ::c_long = 2;
++pub const SYS_io_cancel: ::c_long = 3;
++pub const SYS_io_getevents: ::c_long = 4;
++pub const SYS_setxattr: ::c_long = 5;
++pub const SYS_lsetxattr: ::c_long = 6;
++pub const SYS_fsetxattr: ::c_long = 7;
++pub const SYS_getxattr: ::c_long = 8;
++pub const SYS_lgetxattr: ::c_long = 9;
++pub const SYS_fgetxattr: ::c_long = 10;
++pub const SYS_listxattr: ::c_long = 11;
++pub const SYS_llistxattr: ::c_long = 12;
++pub const SYS_flistxattr: ::c_long = 13;
++pub const SYS_removexattr: ::c_long = 14;
++pub const SYS_lremovexattr: ::c_long = 15;
++pub const SYS_fremovexattr: ::c_long = 16;
++pub const SYS_getcwd: ::c_long = 17;
++pub const SYS_lookup_dcookie: ::c_long = 18;
++pub const SYS_eventfd2: ::c_long = 19;
++pub const SYS_epoll_create1: ::c_long = 20;
++pub const SYS_epoll_ctl: ::c_long = 21;
++pub const SYS_epoll_pwait: ::c_long = 22;
++pub const SYS_dup: ::c_long = 23;
++pub const SYS_dup3: ::c_long = 24;
++pub const SYS_fcntl: ::c_long = 25;
++pub const SYS_inotify_init1: ::c_long = 26;
++pub const SYS_inotify_add_watch: ::c_long = 27;
++pub const SYS_inotify_rm_watch: ::c_long = 28;
++pub const SYS_ioctl: ::c_long = 29;
++pub const SYS_ioprio_set: ::c_long = 30;
++pub const SYS_ioprio_get: ::c_long = 31;
++pub const SYS_flock: ::c_long = 32;
++pub const SYS_mknodat: ::c_long = 33;
++pub const SYS_mkdirat: ::c_long = 34;
++pub const SYS_unlinkat: ::c_long = 35;
++pub const SYS_symlinkat: ::c_long = 36;
++pub const SYS_linkat: ::c_long = 37;
++pub const SYS_umount2: ::c_long = 39;
++pub const SYS_mount: ::c_long = 40;
++pub const SYS_pivot_root: ::c_long = 41;
++pub const SYS_nfsservctl: ::c_long = 42;
++pub const SYS_statfs: ::c_long = 43;
++pub const SYS_fstatfs: ::c_long = 44;
++pub const SYS_truncate: ::c_long = 45;
++pub const SYS_ftruncate: ::c_long = 46;
++pub const SYS_fallocate: ::c_long = 47;
++pub const SYS_faccessat: ::c_long = 48;
++pub const SYS_chdir: ::c_long = 49;
++pub const SYS_fchdir: ::c_long = 50;
++pub const SYS_chroot: ::c_long = 51;
++pub const SYS_fchmod: ::c_long = 52;
++pub const SYS_fchmodat: ::c_long = 53;
++pub const SYS_fchownat: ::c_long = 54;
++pub const SYS_fchown: ::c_long = 55;
++pub const SYS_openat: ::c_long = 56;
++pub const SYS_close: ::c_long = 57;
++pub const SYS_vhangup: ::c_long = 58;
++pub const SYS_pipe2: ::c_long = 59;
++pub const SYS_quotactl: ::c_long = 60;
++pub const SYS_getdents64: ::c_long = 61;
++pub const SYS_lseek: ::c_long = 62;
++pub const SYS_read: ::c_long = 63;
++pub const SYS_write: ::c_long = 64;
++pub const SYS_readv: ::c_long = 65;
++pub const SYS_writev: ::c_long = 66;
++pub const SYS_pread64: ::c_long = 67;
++pub const SYS_pwrite64: ::c_long = 68;
++pub const SYS_preadv: ::c_long = 69;
++pub const SYS_pwritev: ::c_long = 70;
++pub const SYS_sendfile: ::c_long = 71;
++pub const SYS_pselect6: ::c_long = 72;
++pub const SYS_ppoll: ::c_long = 73;
++pub const SYS_signalfd4: ::c_long = 74;
++pub const SYS_vmsplice: ::c_long = 75;
++pub const SYS_splice: ::c_long = 76;
++pub const SYS_tee: ::c_long = 77;
++pub const SYS_readlinkat: ::c_long = 78;
++pub const SYS_sync: ::c_long = 81;
++pub const SYS_fsync: ::c_long = 82;
++pub const SYS_fdatasync: ::c_long = 83;
++pub const SYS_sync_file_range: ::c_long = 84;
++pub const SYS_timerfd_create: ::c_long = 85;
++pub const SYS_timerfd_settime: ::c_long = 86;
++pub const SYS_timerfd_gettime: ::c_long = 87;
++pub const SYS_utimensat: ::c_long = 88;
++pub const SYS_acct: ::c_long = 89;
++pub const SYS_capget: ::c_long = 90;
++pub const SYS_capset: ::c_long = 91;
++pub const SYS_personality: ::c_long = 92;
++pub const SYS_exit: ::c_long = 93;
++pub const SYS_exit_group: ::c_long = 94;
++pub const SYS_waitid: ::c_long = 95;
++pub const SYS_set_tid_address: ::c_long = 96;
++pub const SYS_unshare: ::c_long = 97;
++pub const SYS_futex: ::c_long = 98;
++pub const SYS_set_robust_list: ::c_long = 99;
++pub const SYS_get_robust_list: ::c_long = 100;
++pub const SYS_nanosleep: ::c_long = 101;
++pub const SYS_getitimer: ::c_long = 102;
++pub const SYS_setitimer: ::c_long = 103;
++pub const SYS_kexec_load: ::c_long = 104;
++pub const SYS_init_module: ::c_long = 105;
++pub const SYS_delete_module: ::c_long = 106;
++pub const SYS_timer_create: ::c_long = 107;
++pub const SYS_timer_gettime: ::c_long = 108;
++pub const SYS_timer_getoverrun: ::c_long = 109;
++pub const SYS_timer_settime: ::c_long = 110;
++pub const SYS_timer_delete: ::c_long = 111;
++pub const SYS_clock_settime: ::c_long = 112;
++pub const SYS_clock_gettime: ::c_long = 113;
++pub const SYS_clock_getres: ::c_long = 114;
++pub const SYS_clock_nanosleep: ::c_long = 115;
++pub const SYS_syslog: ::c_long = 116;
++pub const SYS_ptrace: ::c_long = 117;
++pub const SYS_sched_setparam: ::c_long = 118;
++pub const SYS_sched_setscheduler: ::c_long = 119;
++pub const SYS_sched_getscheduler: ::c_long = 120;
++pub const SYS_sched_getparam: ::c_long = 121;
++pub const SYS_sched_setaffinity: ::c_long = 122;
++pub const SYS_sched_getaffinity: ::c_long = 123;
++pub const SYS_sched_yield: ::c_long = 124;
++pub const SYS_sched_get_priority_max: ::c_long = 125;
++pub const SYS_sched_get_priority_min: ::c_long = 126;
++pub const SYS_sched_rr_get_interval: ::c_long = 127;
++pub const SYS_restart_syscall: ::c_long = 128;
++pub const SYS_kill: ::c_long = 129;
++pub const SYS_tkill: ::c_long = 130;
++pub const SYS_tgkill: ::c_long = 131;
++pub const SYS_sigaltstack: ::c_long = 132;
++pub const SYS_rt_sigsuspend: ::c_long = 133;
++pub const SYS_rt_sigaction: ::c_long = 134;
++pub const SYS_rt_sigprocmask: ::c_long = 135;
++pub const SYS_rt_sigpending: ::c_long = 136;
++pub const SYS_rt_sigtimedwait: ::c_long = 137;
++pub const SYS_rt_sigqueueinfo: ::c_long = 138;
++pub const SYS_rt_sigreturn: ::c_long = 139;
++pub const SYS_setpriority: ::c_long = 140;
++pub const SYS_getpriority: ::c_long = 141;
++pub const SYS_reboot: ::c_long = 142;
++pub const SYS_setregid: ::c_long = 143;
++pub const SYS_setgid: ::c_long = 144;
++pub const SYS_setreuid: ::c_long = 145;
++pub const SYS_setuid: ::c_long = 146;
++pub const SYS_setresuid: ::c_long = 147;
++pub const SYS_getresuid: ::c_long = 148;
++pub const SYS_setresgid: ::c_long = 149;
++pub const SYS_getresgid: ::c_long = 150;
++pub const SYS_setfsuid: ::c_long = 151;
++pub const SYS_setfsgid: ::c_long = 152;
++pub const SYS_times: ::c_long = 153;
++pub const SYS_setpgid: ::c_long = 154;
++pub const SYS_getpgid: ::c_long = 155;
++pub const SYS_getsid: ::c_long = 156;
++pub const SYS_setsid: ::c_long = 157;
++pub const SYS_getgroups: ::c_long = 158;
++pub const SYS_setgroups: ::c_long = 159;
++pub const SYS_uname: ::c_long = 160;
++pub const SYS_sethostname: ::c_long = 161;
++pub const SYS_setdomainname: ::c_long = 162;
++pub const SYS_getrusage: ::c_long = 165;
++pub const SYS_umask: ::c_long = 166;
++pub const SYS_prctl: ::c_long = 167;
++pub const SYS_getcpu: ::c_long = 168;
++pub const SYS_gettimeofday: ::c_long = 169;
++pub const SYS_settimeofday: ::c_long = 170;
++pub const SYS_adjtimex: ::c_long = 171;
++pub const SYS_getpid: ::c_long = 172;
++pub const SYS_getppid: ::c_long = 173;
++pub const SYS_getuid: ::c_long = 174;
++pub const SYS_geteuid: ::c_long = 175;
++pub const SYS_getgid: ::c_long = 176;
++pub const SYS_getegid: ::c_long = 177;
++pub const SYS_gettid: ::c_long = 178;
++pub const SYS_sysinfo: ::c_long = 179;
++pub const SYS_mq_open: ::c_long = 180;
++pub const SYS_mq_unlink: ::c_long = 181;
++pub const SYS_mq_timedsend: ::c_long = 182;
++pub const SYS_mq_timedreceive: ::c_long = 183;
++pub const SYS_mq_notify: ::c_long = 184;
++pub const SYS_mq_getsetattr: ::c_long = 185;
++pub const SYS_msgget: ::c_long = 186;
++pub const SYS_msgctl: ::c_long = 187;
++pub const SYS_msgrcv: ::c_long = 188;
++pub const SYS_msgsnd: ::c_long = 189;
++pub const SYS_semget: ::c_long = 190;
++pub const SYS_semctl: ::c_long = 191;
++pub const SYS_semtimedop: ::c_long = 192;
++pub const SYS_semop: ::c_long = 193;
++pub const SYS_shmget: ::c_long = 194;
++pub const SYS_shmctl: ::c_long = 195;
++pub const SYS_shmat: ::c_long = 196;
++pub const SYS_shmdt: ::c_long = 197;
++pub const SYS_socket: ::c_long = 198;
++pub const SYS_socketpair: ::c_long = 199;
++pub const SYS_bind: ::c_long = 200;
++pub const SYS_listen: ::c_long = 201;
++pub const SYS_accept: ::c_long = 202;
++pub const SYS_connect: ::c_long = 203;
++pub const SYS_getsockname: ::c_long = 204;
++pub const SYS_getpeername: ::c_long = 205;
++pub const SYS_sendto: ::c_long = 206;
++pub const SYS_recvfrom: ::c_long = 207;
++pub const SYS_setsockopt: ::c_long = 208;
++pub const SYS_getsockopt: ::c_long = 209;
++pub const SYS_shutdown: ::c_long = 210;
++pub const SYS_sendmsg: ::c_long = 211;
++pub const SYS_recvmsg: ::c_long = 212;
++pub const SYS_readahead: ::c_long = 213;
++pub const SYS_brk: ::c_long = 214;
++pub const SYS_munmap: ::c_long = 215;
++pub const SYS_mremap: ::c_long = 216;
++pub const SYS_add_key: ::c_long = 217;
++pub const SYS_request_key: ::c_long = 218;
++pub const SYS_keyctl: ::c_long = 219;
++pub const SYS_clone: ::c_long = 220;
++pub const SYS_execve: ::c_long = 221;
++pub const SYS_mmap: ::c_long = 222;
++pub const SYS_fadvise64: ::c_long = 223;
++pub const SYS_swapon: ::c_long = 224;
++pub const SYS_swapoff: ::c_long = 225;
++pub const SYS_mprotect: ::c_long = 226;
++pub const SYS_msync: ::c_long = 227;
++pub const SYS_mlock: ::c_long = 228;
++pub const SYS_munlock: ::c_long = 229;
++pub const SYS_mlockall: ::c_long = 230;
++pub const SYS_munlockall: ::c_long = 231;
++pub const SYS_mincore: ::c_long = 232;
++pub const SYS_madvise: ::c_long = 233;
++pub const SYS_remap_file_pages: ::c_long = 234;
++pub const SYS_mbind: ::c_long = 235;
++pub const SYS_get_mempolicy: ::c_long = 236;
++pub const SYS_set_mempolicy: ::c_long = 237;
++pub const SYS_migrate_pages: ::c_long = 238;
++pub const SYS_move_pages: ::c_long = 239;
++pub const SYS_rt_tgsigqueueinfo: ::c_long = 240;
++pub const SYS_perf_event_open: ::c_long = 241;
++pub const SYS_accept4: ::c_long = 242;
++pub const SYS_recvmmsg: ::c_long = 243;
++pub const SYS_arch_specific_syscall: ::c_long = 244;
++pub const SYS_wait4: ::c_long = 260;
++pub const SYS_prlimit64: ::c_long = 261;
++pub const SYS_fanotify_init: ::c_long = 262;
++pub const SYS_fanotify_mark: ::c_long = 263;
++pub const SYS_name_to_handle_at: ::c_long = 264;
++pub const SYS_open_by_handle_at: ::c_long = 265;
++pub const SYS_clock_adjtime: ::c_long = 266;
++pub const SYS_syncfs: ::c_long = 267;
++pub const SYS_setns: ::c_long = 268;
++pub const SYS_sendmmsg: ::c_long = 269;
++pub const SYS_process_vm_readv: ::c_long = 270;
++pub const SYS_process_vm_writev: ::c_long = 271;
++pub const SYS_kcmp: ::c_long = 272;
++pub const SYS_finit_module: ::c_long = 273;
++pub const SYS_sched_setattr: ::c_long = 274;
++pub const SYS_sched_getattr: ::c_long = 275;
++pub const SYS_renameat2: ::c_long = 276;
++pub const SYS_seccomp: ::c_long = 277;
++pub const SYS_getrandom: ::c_long = 278;
++pub const SYS_memfd_create: ::c_long = 279;
++pub const SYS_bpf: ::c_long = 280;
++pub const SYS_execveat: ::c_long = 281;
++pub const SYS_userfaultfd: ::c_long = 282;
++pub const SYS_membarrier: ::c_long = 283;
++pub const SYS_mlock2: ::c_long = 284;
++pub const SYS_copy_file_range: ::c_long = 285;
++pub const SYS_preadv2: ::c_long = 286;
++pub const SYS_pwritev2: ::c_long = 287;
++pub const SYS_pkey_mprotect: ::c_long = 288;
++pub const SYS_pkey_alloc: ::c_long = 289;
++pub const SYS_pkey_free: ::c_long = 290;
++pub const SYS_statx: ::c_long = 291;
++pub const SYS_io_pgetevents: ::c_long = 292;
++pub const SYS_rseq: ::c_long = 293;
++pub const SYS_kexec_file_load: ::c_long = 294;
++pub const SYS_pidfd_send_signal: ::c_long = 424;
++pub const SYS_io_uring_setup: ::c_long = 425;
++pub const SYS_io_uring_enter: ::c_long = 426;
++pub const SYS_io_uring_register: ::c_long = 427;
++pub const SYS_open_tree: ::c_long = 428;
++pub const SYS_move_mount: ::c_long = 429;
++pub const SYS_fsopen: ::c_long = 430;
++pub const SYS_fsconfig: ::c_long = 431;
++pub const SYS_fsmount: ::c_long = 432;
++pub const SYS_fspick: ::c_long = 433;
++pub const SYS_pidfd_open: ::c_long = 434;
++pub const SYS_clone3: ::c_long = 435;
++pub const SYS_close_range: ::c_long = 436;
++pub const SYS_openat2: ::c_long = 437;
++pub const SYS_pidfd_getfd: ::c_long = 438;
++pub const SYS_faccessat2: ::c_long = 439;
++pub const SYS_process_madvise: ::c_long = 440;
++pub const SYS_epoll_pwait2: ::c_long = 441;
++pub const SYS_mount_setattr: ::c_long = 442;
++pub const SYS_quotactl_fd: ::c_long = 443;
++pub const SYS_landlock_create_ruleset: ::c_long = 444;
++pub const SYS_landlock_add_rule: ::c_long = 445;
++pub const SYS_landlock_restrict_self: ::c_long = 446;
++pub const SYS_process_mrelease: ::c_long = 448;
++pub const SYS_futex_waitv: ::c_long = 449;
++pub const SYS_set_mempolicy_home_node: ::c_long = 450;
++
++pub const O_APPEND: ::c_int = 1024;
++pub const O_DIRECT: ::c_int = 0x4000;
++pub const O_DIRECTORY: ::c_int = 0x10000;
++pub const O_LARGEFILE: ::c_int = 0;
++pub const O_NOFOLLOW: ::c_int = 0x20000;
++pub const O_CREAT: ::c_int = 64;
++pub const O_EXCL: ::c_int = 128;
++pub const O_NOCTTY: ::c_int = 256;
++pub const O_NONBLOCK: ::c_int = 2048;
++pub const O_SYNC: ::c_int = 1052672;
++pub const O_RSYNC: ::c_int = 1052672;
++pub const O_DSYNC: ::c_int = 4096;
++pub const O_ASYNC: ::c_int = 4096;
++
++pub const SIGSTKSZ: ::size_t = 16384;
++pub const MINSIGSTKSZ: ::size_t = 4096;
++
++pub const ENAMETOOLONG: ::c_int = 36;
++pub const ENOLCK: ::c_int = 37;
++pub const ENOSYS: ::c_int = 38;
++pub const ENOTEMPTY: ::c_int = 39;
++pub const ELOOP: ::c_int = 40;
++pub const ENOMSG: ::c_int = 42;
++pub const EIDRM: ::c_int = 43;
++pub const ECHRNG: ::c_int = 44;
++pub const EL2NSYNC: ::c_int = 45;
++pub const EL3HLT: ::c_int = 46;
++pub const EL3RST: ::c_int = 47;
++pub const ELNRNG: ::c_int = 48;
++pub const EUNATCH: ::c_int = 49;
++pub const ENOCSI: ::c_int = 50;
++pub const EL2HLT: ::c_int = 51;
++pub const EBADE: ::c_int = 52;
++pub const EBADR: ::c_int = 53;
++pub const EXFULL: ::c_int = 54;
++pub const ENOANO: ::c_int = 55;
++pub const EBADRQC: ::c_int = 56;
++pub const EBADSLT: ::c_int = 57;
++pub const EMULTIHOP: ::c_int = 72;
++pub const EOVERFLOW: ::c_int = 75;
++pub const ENOTUNIQ: ::c_int = 76;
++pub const EBADFD: ::c_int = 77;
++pub const EBADMSG: ::c_int = 74;
++pub const EREMCHG: ::c_int = 78;
++pub const ELIBACC: ::c_int = 79;
++pub const ELIBBAD: ::c_int = 80;
++pub const ELIBSCN: ::c_int = 81;
++pub const ELIBMAX: ::c_int = 82;
++pub const ELIBEXEC: ::c_int = 83;
++pub const EILSEQ: ::c_int = 84;
++pub const ERESTART: ::c_int = 85;
++pub const ESTRPIPE: ::c_int = 86;
++pub const EUSERS: ::c_int = 87;
++pub const ENOTSOCK: ::c_int = 88;
++pub const EDESTADDRREQ: ::c_int = 89;
++pub const EMSGSIZE: ::c_int = 90;
++pub const EPROTOTYPE: ::c_int = 91;
++pub const ENOPROTOOPT: ::c_int = 92;
++pub const EPROTONOSUPPORT: ::c_int = 93;
++pub const ESOCKTNOSUPPORT: ::c_int = 94;
++pub const EOPNOTSUPP: ::c_int = 95;
++pub const ENOTSUP: ::c_int = EOPNOTSUPP;
++pub const EPFNOSUPPORT: ::c_int = 96;
++pub const EAFNOSUPPORT: ::c_int = 97;
++pub const EADDRINUSE: ::c_int = 98;
++pub const EADDRNOTAVAIL: ::c_int = 99;
++pub const ENETDOWN: ::c_int = 100;
++pub const ENETUNREACH: ::c_int = 101;
++pub const ENETRESET: ::c_int = 102;
++pub const ECONNABORTED: ::c_int = 103;
++pub const ECONNRESET: ::c_int = 104;
++pub const ENOBUFS: ::c_int = 105;
++pub const EISCONN: ::c_int = 106;
++pub const ENOTCONN: ::c_int = 107;
++pub const ESHUTDOWN: ::c_int = 108;
++pub const ETOOMANYREFS: ::c_int = 109;
++pub const ETIMEDOUT: ::c_int = 110;
++pub const ECONNREFUSED: ::c_int = 111;
++pub const EHOSTDOWN: ::c_int = 112;
++pub const EHOSTUNREACH: ::c_int = 113;
++pub const EALREADY: ::c_int = 114;
++pub const EINPROGRESS: ::c_int = 115;
++pub const ESTALE: ::c_int = 116;
++pub const EUCLEAN: ::c_int = 117;
++pub const ENOTNAM: ::c_int = 118;
++pub const ENAVAIL: ::c_int = 119;
++pub const EISNAM: ::c_int = 120;
++pub const EREMOTEIO: ::c_int = 121;
++pub const EDQUOT: ::c_int = 122;
++pub const ENOMEDIUM: ::c_int = 123;
++pub const EMEDIUMTYPE: ::c_int = 124;
++pub const ECANCELED: ::c_int = 125;
++pub const ENOKEY: ::c_int = 126;
++pub const EKEYEXPIRED: ::c_int = 127;
++pub const EKEYREVOKED: ::c_int = 128;
++pub const EKEYREJECTED: ::c_int = 129;
++pub const EOWNERDEAD: ::c_int = 130;
++pub const ENOTRECOVERABLE: ::c_int = 131;
++pub const EHWPOISON: ::c_int = 133;
++pub const ERFKILL: ::c_int = 132;
++
++pub const SA_ONSTACK: ::c_int = 0x08000000;
++pub const SA_SIGINFO: ::c_int = 0x00000004;
++pub const SA_NOCLDWAIT: ::c_int = 0x00000002;
++
++pub const SIGCHLD: ::c_int = 17;
++pub const SIGBUS: ::c_int = 7;
++pub const SIGTTIN: ::c_int = 21;
++pub const SIGTTOU: ::c_int = 22;
++pub const SIGXCPU: ::c_int = 24;
++pub const SIGXFSZ: ::c_int = 25;
++pub const SIGVTALRM: ::c_int = 26;
++pub const SIGPROF: ::c_int = 27;
++pub const SIGWINCH: ::c_int = 28;
++pub const SIGUSR1: ::c_int = 10;
++pub const SIGUSR2: ::c_int = 12;
++pub const SIGCONT: ::c_int = 18;
++pub const SIGSTOP: ::c_int = 19;
++pub const SIGTSTP: ::c_int = 20;
++pub const SIGURG: ::c_int = 23;
++pub const SIGIO: ::c_int = 29;
++pub const SIGSYS: ::c_int = 31;
++pub const SIGSTKFLT: ::c_int = 16;
++pub const SIGPOLL: ::c_int = 29;
++pub const SIGPWR: ::c_int = 30;
++pub const SIG_SETMASK: ::c_int = 2;
++pub const SIG_BLOCK: ::c_int = 0;
++pub const SIG_UNBLOCK: ::c_int = 1;
++
++pub const F_GETLK: ::c_int = 5;
++pub const F_GETOWN: ::c_int = 9;
++pub const F_SETLK: ::c_int = 6;
++pub const F_SETLKW: ::c_int = 7;
++pub const F_SETOWN: ::c_int = 8;
++
++pub const VEOF: usize = 4;
++
++pub const POLLWRNORM: ::c_short = 0x100;
++pub const POLLWRBAND: ::c_short = 0x200;
++
++pub const SOCK_STREAM: ::c_int = 1;
++pub const SOCK_DGRAM: ::c_int = 2;
++
++pub const MAP_ANON: ::c_int = 0x0020;
++pub const MAP_GROWSDOWN: ::c_int = 0x0100;
++pub const MAP_DENYWRITE: ::c_int = 0x0800;
++pub const MAP_EXECUTABLE: ::c_int = 0x01000;
++pub const MAP_LOCKED: ::c_int = 0x02000;
++pub const MAP_NORESERVE: ::c_int = 0x04000;
++pub const MAP_POPULATE: ::c_int = 0x08000;
++pub const MAP_NONBLOCK: ::c_int = 0x010000;
++pub const MAP_STACK: ::c_int = 0x020000;
++pub const MAP_HUGETLB: ::c_int = 0x040000;
++pub const MAP_SYNC: ::c_int = 0x080000;
++
++pub const MCL_CURRENT: ::c_int = 0x0001;
++pub const MCL_FUTURE: ::c_int = 0x0002;
++pub const MCL_ONFAULT: ::c_int = 0x0004;
++pub const CBAUD: ::tcflag_t = 0o0010017;
++pub const TAB1: ::c_int = 0x00000800;
++pub const TAB2: ::c_int = 0x00001000;
++pub const TAB3: ::c_int = 0x00001800;
++pub const CR1: ::c_int = 0x00000200;
++pub const CR2: ::c_int = 0x00000400;
++pub const CR3: ::c_int = 0x00000600;
++pub const FF1: ::c_int = 0x00008000;
++pub const BS1: ::c_int = 0x00002000;
++pub const VT1: ::c_int = 0x00004000;
++pub const VWERASE: usize = 14;
++pub const VREPRINT: usize = 12;
++pub const VSUSP: usize = 10;
++pub const VSTART: usize = 8;
++pub const VSTOP: usize = 9;
++pub const VDISCARD: usize = 13;
++pub const VTIME: usize = 5;
++pub const IXON: ::tcflag_t = 0x00000400;
++pub const IXOFF: ::tcflag_t = 0x00001000;
++pub const ONLCR: ::tcflag_t = 0x4;
++pub const CSIZE: ::tcflag_t = 0x00000030;
++pub const CS6: ::tcflag_t = 0x00000010;
++pub const CS7: ::tcflag_t = 0x00000020;
++pub const CS8: ::tcflag_t = 0x00000030;
++pub const CSTOPB: ::tcflag_t = 0x00000040;
++pub const CREAD: ::tcflag_t = 0x00000080;
++pub const PARENB: ::tcflag_t = 0x00000100;
++pub const PARODD: ::tcflag_t = 0x00000200;
++pub const HUPCL: ::tcflag_t = 0x00000400;
++pub const CLOCAL: ::tcflag_t = 0x00000800;
++pub const ECHOKE: ::tcflag_t = 0x00000800;
++pub const ECHOE: ::tcflag_t = 0x00000010;
++pub const ECHOK: ::tcflag_t = 0x00000020;
++pub const ECHONL: ::tcflag_t = 0x00000040;
++pub const ECHOPRT: ::tcflag_t = 0x00000400;
++pub const ECHOCTL: ::tcflag_t = 0x00000200;
++pub const ISIG: ::tcflag_t = 0x00000001;
++pub const ICANON: ::tcflag_t = 0x00000002;
++pub const PENDIN: ::tcflag_t = 0x00004000;
++pub const NOFLSH: ::tcflag_t = 0x00000080;
++pub const CIBAUD: ::tcflag_t = 0o02003600000;
++pub const CBAUDEX: ::tcflag_t = 0o010000;
++pub const VSWTC: usize = 7;
++pub const OLCUC: ::tcflag_t = 0o000002;
++pub const NLDLY: ::tcflag_t = 0o000400;
++pub const CRDLY: ::tcflag_t = 0o003000;
++pub const TABDLY: ::tcflag_t = 0o014000;
++pub const BSDLY: ::tcflag_t = 0o020000;
++pub const FFDLY: ::tcflag_t = 0o100000;
++pub const VTDLY: ::tcflag_t = 0o040000;
++pub const XTABS: ::tcflag_t = 0o014000;
++pub const B57600: ::speed_t = 0o010001;
++pub const B115200: ::speed_t = 0o010002;
++pub const B230400: ::speed_t = 0o010003;
++pub const B460800: ::speed_t = 0o010004;
++pub const B500000: ::speed_t = 0o010005;
++pub const B576000: ::speed_t = 0o010006;
++pub const B921600: ::speed_t = 0o010007;
++pub const B1000000: ::speed_t = 0o010010;
++pub const B1152000: ::speed_t = 0o010011;
++pub const B1500000: ::speed_t = 0o010012;
++pub const B2000000: ::speed_t = 0o010013;
++pub const B2500000: ::speed_t = 0o010014;
++pub const B3000000: ::speed_t = 0o010015;
++pub const B3500000: ::speed_t = 0o010016;
++pub const B4000000: ::speed_t = 0o010017;
++
++pub const EDEADLK: ::c_int = 35;
++pub const EDEADLOCK: ::c_int = EDEADLK;
++pub const EXTPROC: ::tcflag_t = 0x00010000;
++pub const VEOL: usize = 11;
++pub const VEOL2: usize = 16;
++pub const VMIN: usize = 6;
++pub const IEXTEN: ::tcflag_t = 0x00008000;
++pub const TOSTOP: ::tcflag_t = 0x00000100;
++pub const FLUSHO: ::tcflag_t = 0x00001000;
++
++cfg_if! {
++    if #[cfg(libc_align)] {
++        mod align;
++        pub use self::align::*;
++    }
++}
+diff --git a/vendor/libc/src/unix/linux_like/linux/musl/b64/mod.rs b/vendor/libc/src/unix/linux_like/linux/musl/b64/mod.rs
+index 05586cdb4..d59343064 100644
+--- a/vendor/libc/src/unix/linux_like/linux/musl/b64/mod.rs
++++ b/vendor/libc/src/unix/linux_like/linux/musl/b64/mod.rs
+@@ -157,6 +157,9 @@ cfg_if! {
+     } else if #[cfg(any(target_arch = "riscv64"))] {
+         mod riscv64;
+         pub use self::riscv64::*;
++    } else if #[cfg(any(target_arch = "loongarch64"))] {
++        mod loongarch64;
++        pub use self::loongarch64::*;
+     } else {
+         // Unknown target_arch
+     }
+diff --git a/vendor/libc/src/unix/linux_like/linux/musl/mod.rs b/vendor/libc/src/unix/linux_like/linux/musl/mod.rs
+index 97429a7f3..bb7c9b2de 100644
+--- a/vendor/libc/src/unix/linux_like/linux/musl/mod.rs
++++ b/vendor/libc/src/unix/linux_like/linux/musl/mod.rs
+@@ -905,7 +905,8 @@ cfg_if! {
+                  target_arch = "mips64",
+                  target_arch = "powerpc64",
+                  target_arch = "s390x",
+-                 target_arch = "riscv64"))] {
++                 target_arch = "riscv64",
++                 target_arch = "loongarch64"))] {
+         mod b64;
+         pub use self::b64::*;
+     } else if #[cfg(any(target_arch = "x86",
+-- 
+2.44.0
+
diff --git a/main/rust/0009-vendor-libc-0.2.148-Add-support-for-loongarch64-linu.patch b/main/rust/0009-vendor-libc-0.2.148-Add-support-for-loongarch64-linu.patch
new file mode 100644
index 00000000000..c7d1985eb6e
--- /dev/null
+++ b/main/rust/0009-vendor-libc-0.2.148-Add-support-for-loongarch64-linu.patch
@@ -0,0 +1,761 @@
+From 82b58c66bc60152236fc3009147681dff0bc364e Mon Sep 17 00:00:00 2001
+From: WANG Rui <wangrui@loongson.cn>
+Date: Tue, 26 Mar 2024 16:27:33 +0800
+Subject: [PATCH 09/12] vendor: libc-0.2.148: Add support for
+ loongarch64-linux-musl
+
+---
+ .../linux/musl/b64/loongarch64/align.rs       |  40 ++
+ .../linux/musl/b64/loongarch64/mod.rs         | 663 ++++++++++++++++++
+ .../src/unix/linux_like/linux/musl/b64/mod.rs |   3 +
+ .../src/unix/linux_like/linux/musl/mod.rs     |   3 +-
+ 4 files changed, 708 insertions(+), 1 deletions(-)
+ create mode 100644 vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs
+ create mode 100644 vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs
+
+diff --git a/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs b/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs
+new file mode 100644
+index 000000000..dc191f51f
+--- /dev/null
++++ b/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs
+@@ -0,0 +1,40 @@
++s_no_extra_traits! {
++    #[allow(missing_debug_implementations)]
++    #[repr(align(16))]
++    pub struct max_align_t {
++        priv_: [f64; 4]
++    }
++}
++
++s! {
++    pub struct ucontext_t {
++        pub uc_flags: ::c_ulong,
++        pub uc_link: *mut ucontext_t,
++        pub uc_stack: ::stack_t,
++        pub uc_sigmask: ::sigset_t,
++        pub uc_mcontext: mcontext_t,
++    }
++
++    #[repr(align(16))]
++    pub struct mcontext_t {
++        pub __pc: ::c_ulonglong,
++        pub __gregs: [::c_ulonglong; 32],
++        pub __flags: ::c_uint,
++        pub __extcontext: [::c_ulonglong; 0],
++    }
++
++    #[repr(align(8))]
++    pub struct clone_args {
++        pub flags: ::c_ulonglong,
++        pub pidfd: ::c_ulonglong,
++        pub child_tid: ::c_ulonglong,
++        pub parent_tid: ::c_ulonglong,
++        pub exit_signal: ::c_ulonglong,
++        pub stack: ::c_ulonglong,
++        pub stack_size: ::c_ulonglong,
++        pub tls: ::c_ulonglong,
++        pub set_tid: ::c_ulonglong,
++        pub set_tid_size: ::c_ulonglong,
++        pub cgroup: ::c_ulonglong,
++    }
++}
+diff --git a/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs b/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs
+new file mode 100644
+index 000000000..dffbc2341
+--- /dev/null
++++ b/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs
+@@ -0,0 +1,663 @@
++//! LoongArch-specific definitions for 64-bit linux-like values
++
++pub type c_char = i8;
++pub type wchar_t = ::c_int;
++
++pub type nlink_t = ::c_uint;
++pub type blksize_t = ::c_int;
++pub type fsblkcnt64_t = ::c_ulong;
++pub type fsfilcnt64_t = ::c_ulong;
++pub type __u64 = ::c_ulonglong;
++pub type __s64 = ::c_longlong;
++
++s! {
++    pub struct pthread_attr_t {
++        __size: [::c_ulong; 7],
++    }
++
++    pub struct stat {
++        pub st_dev: ::dev_t,
++        pub st_ino: ::ino_t,
++        pub st_mode: ::mode_t,
++        pub st_nlink: ::nlink_t,
++        pub st_uid: ::uid_t,
++        pub st_gid: ::gid_t,
++        pub st_rdev: ::dev_t,
++        __pad1: ::dev_t,
++        pub st_size: ::off_t,
++        pub st_blksize: ::blksize_t,
++        __pad2: ::c_int,
++        pub st_blocks: ::blkcnt_t,
++        pub st_atime: ::time_t,
++        pub st_atime_nsec: ::c_long,
++        pub st_mtime: ::time_t,
++        pub st_mtime_nsec: ::c_long,
++        pub st_ctime: ::time_t,
++        pub st_ctime_nsec: ::c_long,
++        __unused: [::c_int; 2usize],
++    }
++
++    pub struct stat64 {
++        pub st_dev: ::dev_t,
++        pub st_ino: ::ino64_t,
++        pub st_mode: ::mode_t,
++        pub st_nlink: ::nlink_t,
++        pub st_uid: ::uid_t,
++        pub st_gid: ::gid_t,
++        pub st_rdev: ::dev_t,
++        pub __pad1: ::dev_t,
++        pub st_size: ::off64_t,
++        pub st_blksize: ::blksize_t,
++        pub __pad2: ::c_int,
++        pub st_blocks: ::blkcnt_t,
++        pub st_atime: ::time_t,
++        pub st_atime_nsec: ::c_long,
++        pub st_mtime: ::time_t,
++        pub st_mtime_nsec: ::c_long,
++        pub st_ctime: ::time_t,
++        pub st_ctime_nsec: ::c_long,
++        __unused: [::c_int; 2],
++    }
++
++    pub struct statfs {
++        pub f_type: ::c_long,
++        pub f_bsize: ::c_long,
++        pub f_blocks: ::fsblkcnt_t,
++        pub f_bfree: ::fsblkcnt_t,
++        pub f_bavail: ::fsblkcnt_t,
++        pub f_files: ::fsfilcnt_t,
++        pub f_ffree: ::fsfilcnt_t,
++        pub f_fsid: ::fsid_t,
++        pub f_namelen: ::c_long,
++        pub f_frsize: ::c_long,
++        pub f_flags: ::c_long,
++        pub f_spare: [::c_long; 4],
++    }
++
++    pub struct statfs64 {
++        pub f_type: ::c_long,
++        pub f_bsize: ::c_long,
++        pub f_blocks: ::fsblkcnt64_t,
++        pub f_bfree: ::fsblkcnt64_t,
++        pub f_bavail: ::fsblkcnt64_t,
++        pub f_files: ::fsfilcnt64_t,
++        pub f_ffree: ::fsfilcnt64_t,
++        pub f_fsid: ::fsid_t,
++        pub f_namelen: ::c_long,
++        pub f_frsize: ::c_long,
++        pub f_flags: ::c_long,
++        pub f_spare: [::c_long; 4],
++    }
++
++    pub struct ipc_perm {
++        pub __key: ::key_t,
++        pub uid: ::uid_t,
++        pub gid: ::gid_t,
++        pub cuid: ::uid_t,
++        pub cgid: ::gid_t,
++        pub mode: ::c_uint,
++        pub __seq: ::c_ushort,
++        __pad2: ::c_ushort,
++        __unused1: ::c_ulong,
++        __unused2: ::c_ulong,
++    }
++
++    pub struct user_regs_struct {
++        pub regs: [u64; 32],
++        pub orig_a0: u64,
++        pub csr_era: u64,
++        pub csr_badv: u64,
++        pub reserved: [u64; 10],
++
++    }
++
++    pub struct user_fp_struct {
++        pub fpr: [u64; 32],
++        pub fcc: u64,
++        pub fcsr: u32,
++    }
++}
++
++pub const SYS_io_setup: ::c_long = 0;
++pub const SYS_io_destroy: ::c_long = 1;
++pub const SYS_io_submit: ::c_long = 2;
++pub const SYS_io_cancel: ::c_long = 3;
++pub const SYS_io_getevents: ::c_long = 4;
++pub const SYS_setxattr: ::c_long = 5;
++pub const SYS_lsetxattr: ::c_long = 6;
++pub const SYS_fsetxattr: ::c_long = 7;
++pub const SYS_getxattr: ::c_long = 8;
++pub const SYS_lgetxattr: ::c_long = 9;
++pub const SYS_fgetxattr: ::c_long = 10;
++pub const SYS_listxattr: ::c_long = 11;
++pub const SYS_llistxattr: ::c_long = 12;
++pub const SYS_flistxattr: ::c_long = 13;
++pub const SYS_removexattr: ::c_long = 14;
++pub const SYS_lremovexattr: ::c_long = 15;
++pub const SYS_fremovexattr: ::c_long = 16;
++pub const SYS_getcwd: ::c_long = 17;
++pub const SYS_lookup_dcookie: ::c_long = 18;
++pub const SYS_eventfd2: ::c_long = 19;
++pub const SYS_epoll_create1: ::c_long = 20;
++pub const SYS_epoll_ctl: ::c_long = 21;
++pub const SYS_epoll_pwait: ::c_long = 22;
++pub const SYS_dup: ::c_long = 23;
++pub const SYS_dup3: ::c_long = 24;
++pub const SYS_fcntl: ::c_long = 25;
++pub const SYS_inotify_init1: ::c_long = 26;
++pub const SYS_inotify_add_watch: ::c_long = 27;
++pub const SYS_inotify_rm_watch: ::c_long = 28;
++pub const SYS_ioctl: ::c_long = 29;
++pub const SYS_ioprio_set: ::c_long = 30;
++pub const SYS_ioprio_get: ::c_long = 31;
++pub const SYS_flock: ::c_long = 32;
++pub const SYS_mknodat: ::c_long = 33;
++pub const SYS_mkdirat: ::c_long = 34;
++pub const SYS_unlinkat: ::c_long = 35;
++pub const SYS_symlinkat: ::c_long = 36;
++pub const SYS_linkat: ::c_long = 37;
++pub const SYS_umount2: ::c_long = 39;
++pub const SYS_mount: ::c_long = 40;
++pub const SYS_pivot_root: ::c_long = 41;
++pub const SYS_nfsservctl: ::c_long = 42;
++pub const SYS_statfs: ::c_long = 43;
++pub const SYS_fstatfs: ::c_long = 44;
++pub const SYS_truncate: ::c_long = 45;
++pub const SYS_ftruncate: ::c_long = 46;
++pub const SYS_fallocate: ::c_long = 47;
++pub const SYS_faccessat: ::c_long = 48;
++pub const SYS_chdir: ::c_long = 49;
++pub const SYS_fchdir: ::c_long = 50;
++pub const SYS_chroot: ::c_long = 51;
++pub const SYS_fchmod: ::c_long = 52;
++pub const SYS_fchmodat: ::c_long = 53;
++pub const SYS_fchownat: ::c_long = 54;
++pub const SYS_fchown: ::c_long = 55;
++pub const SYS_openat: ::c_long = 56;
++pub const SYS_close: ::c_long = 57;
++pub const SYS_vhangup: ::c_long = 58;
++pub const SYS_pipe2: ::c_long = 59;
++pub const SYS_quotactl: ::c_long = 60;
++pub const SYS_getdents64: ::c_long = 61;
++pub const SYS_lseek: ::c_long = 62;
++pub const SYS_read: ::c_long = 63;
++pub const SYS_write: ::c_long = 64;
++pub const SYS_readv: ::c_long = 65;
++pub const SYS_writev: ::c_long = 66;
++pub const SYS_pread64: ::c_long = 67;
++pub const SYS_pwrite64: ::c_long = 68;
++pub const SYS_preadv: ::c_long = 69;
++pub const SYS_pwritev: ::c_long = 70;
++pub const SYS_sendfile: ::c_long = 71;
++pub const SYS_pselect6: ::c_long = 72;
++pub const SYS_ppoll: ::c_long = 73;
++pub const SYS_signalfd4: ::c_long = 74;
++pub const SYS_vmsplice: ::c_long = 75;
++pub const SYS_splice: ::c_long = 76;
++pub const SYS_tee: ::c_long = 77;
++pub const SYS_readlinkat: ::c_long = 78;
++pub const SYS_sync: ::c_long = 81;
++pub const SYS_fsync: ::c_long = 82;
++pub const SYS_fdatasync: ::c_long = 83;
++pub const SYS_sync_file_range: ::c_long = 84;
++pub const SYS_timerfd_create: ::c_long = 85;
++pub const SYS_timerfd_settime: ::c_long = 86;
++pub const SYS_timerfd_gettime: ::c_long = 87;
++pub const SYS_utimensat: ::c_long = 88;
++pub const SYS_acct: ::c_long = 89;
++pub const SYS_capget: ::c_long = 90;
++pub const SYS_capset: ::c_long = 91;
++pub const SYS_personality: ::c_long = 92;
++pub const SYS_exit: ::c_long = 93;
++pub const SYS_exit_group: ::c_long = 94;
++pub const SYS_waitid: ::c_long = 95;
++pub const SYS_set_tid_address: ::c_long = 96;
++pub const SYS_unshare: ::c_long = 97;
++pub const SYS_futex: ::c_long = 98;
++pub const SYS_set_robust_list: ::c_long = 99;
++pub const SYS_get_robust_list: ::c_long = 100;
++pub const SYS_nanosleep: ::c_long = 101;
++pub const SYS_getitimer: ::c_long = 102;
++pub const SYS_setitimer: ::c_long = 103;
++pub const SYS_kexec_load: ::c_long = 104;
++pub const SYS_init_module: ::c_long = 105;
++pub const SYS_delete_module: ::c_long = 106;
++pub const SYS_timer_create: ::c_long = 107;
++pub const SYS_timer_gettime: ::c_long = 108;
++pub const SYS_timer_getoverrun: ::c_long = 109;
++pub const SYS_timer_settime: ::c_long = 110;
++pub const SYS_timer_delete: ::c_long = 111;
++pub const SYS_clock_settime: ::c_long = 112;
++pub const SYS_clock_gettime: ::c_long = 113;
++pub const SYS_clock_getres: ::c_long = 114;
++pub const SYS_clock_nanosleep: ::c_long = 115;
++pub const SYS_syslog: ::c_long = 116;
++pub const SYS_ptrace: ::c_long = 117;
++pub const SYS_sched_setparam: ::c_long = 118;
++pub const SYS_sched_setscheduler: ::c_long = 119;
++pub const SYS_sched_getscheduler: ::c_long = 120;
++pub const SYS_sched_getparam: ::c_long = 121;
++pub const SYS_sched_setaffinity: ::c_long = 122;
++pub const SYS_sched_getaffinity: ::c_long = 123;
++pub const SYS_sched_yield: ::c_long = 124;
++pub const SYS_sched_get_priority_max: ::c_long = 125;
++pub const SYS_sched_get_priority_min: ::c_long = 126;
++pub const SYS_sched_rr_get_interval: ::c_long = 127;
++pub const SYS_restart_syscall: ::c_long = 128;
++pub const SYS_kill: ::c_long = 129;
++pub const SYS_tkill: ::c_long = 130;
++pub const SYS_tgkill: ::c_long = 131;
++pub const SYS_sigaltstack: ::c_long = 132;
++pub const SYS_rt_sigsuspend: ::c_long = 133;
++pub const SYS_rt_sigaction: ::c_long = 134;
++pub const SYS_rt_sigprocmask: ::c_long = 135;
++pub const SYS_rt_sigpending: ::c_long = 136;
++pub const SYS_rt_sigtimedwait: ::c_long = 137;
++pub const SYS_rt_sigqueueinfo: ::c_long = 138;
++pub const SYS_rt_sigreturn: ::c_long = 139;
++pub const SYS_setpriority: ::c_long = 140;
++pub const SYS_getpriority: ::c_long = 141;
++pub const SYS_reboot: ::c_long = 142;
++pub const SYS_setregid: ::c_long = 143;
++pub const SYS_setgid: ::c_long = 144;
++pub const SYS_setreuid: ::c_long = 145;
++pub const SYS_setuid: ::c_long = 146;
++pub const SYS_setresuid: ::c_long = 147;
++pub const SYS_getresuid: ::c_long = 148;
++pub const SYS_setresgid: ::c_long = 149;
++pub const SYS_getresgid: ::c_long = 150;
++pub const SYS_setfsuid: ::c_long = 151;
++pub const SYS_setfsgid: ::c_long = 152;
++pub const SYS_times: ::c_long = 153;
++pub const SYS_setpgid: ::c_long = 154;
++pub const SYS_getpgid: ::c_long = 155;
++pub const SYS_getsid: ::c_long = 156;
++pub const SYS_setsid: ::c_long = 157;
++pub const SYS_getgroups: ::c_long = 158;
++pub const SYS_setgroups: ::c_long = 159;
++pub const SYS_uname: ::c_long = 160;
++pub const SYS_sethostname: ::c_long = 161;
++pub const SYS_setdomainname: ::c_long = 162;
++pub const SYS_getrusage: ::c_long = 165;
++pub const SYS_umask: ::c_long = 166;
++pub const SYS_prctl: ::c_long = 167;
++pub const SYS_getcpu: ::c_long = 168;
++pub const SYS_gettimeofday: ::c_long = 169;
++pub const SYS_settimeofday: ::c_long = 170;
++pub const SYS_adjtimex: ::c_long = 171;
++pub const SYS_getpid: ::c_long = 172;
++pub const SYS_getppid: ::c_long = 173;
++pub const SYS_getuid: ::c_long = 174;
++pub const SYS_geteuid: ::c_long = 175;
++pub const SYS_getgid: ::c_long = 176;
++pub const SYS_getegid: ::c_long = 177;
++pub const SYS_gettid: ::c_long = 178;
++pub const SYS_sysinfo: ::c_long = 179;
++pub const SYS_mq_open: ::c_long = 180;
++pub const SYS_mq_unlink: ::c_long = 181;
++pub const SYS_mq_timedsend: ::c_long = 182;
++pub const SYS_mq_timedreceive: ::c_long = 183;
++pub const SYS_mq_notify: ::c_long = 184;
++pub const SYS_mq_getsetattr: ::c_long = 185;
++pub const SYS_msgget: ::c_long = 186;
++pub const SYS_msgctl: ::c_long = 187;
++pub const SYS_msgrcv: ::c_long = 188;
++pub const SYS_msgsnd: ::c_long = 189;
++pub const SYS_semget: ::c_long = 190;
++pub const SYS_semctl: ::c_long = 191;
++pub const SYS_semtimedop: ::c_long = 192;
++pub const SYS_semop: ::c_long = 193;
++pub const SYS_shmget: ::c_long = 194;
++pub const SYS_shmctl: ::c_long = 195;
++pub const SYS_shmat: ::c_long = 196;
++pub const SYS_shmdt: ::c_long = 197;
++pub const SYS_socket: ::c_long = 198;
++pub const SYS_socketpair: ::c_long = 199;
++pub const SYS_bind: ::c_long = 200;
++pub const SYS_listen: ::c_long = 201;
++pub const SYS_accept: ::c_long = 202;
++pub const SYS_connect: ::c_long = 203;
++pub const SYS_getsockname: ::c_long = 204;
++pub const SYS_getpeername: ::c_long = 205;
++pub const SYS_sendto: ::c_long = 206;
++pub const SYS_recvfrom: ::c_long = 207;
++pub const SYS_setsockopt: ::c_long = 208;
++pub const SYS_getsockopt: ::c_long = 209;
++pub const SYS_shutdown: ::c_long = 210;
++pub const SYS_sendmsg: ::c_long = 211;
++pub const SYS_recvmsg: ::c_long = 212;
++pub const SYS_readahead: ::c_long = 213;
++pub const SYS_brk: ::c_long = 214;
++pub const SYS_munmap: ::c_long = 215;
++pub const SYS_mremap: ::c_long = 216;
++pub const SYS_add_key: ::c_long = 217;
++pub const SYS_request_key: ::c_long = 218;
++pub const SYS_keyctl: ::c_long = 219;
++pub const SYS_clone: ::c_long = 220;
++pub const SYS_execve: ::c_long = 221;
++pub const SYS_mmap: ::c_long = 222;
++pub const SYS_fadvise64: ::c_long = 223;
++pub const SYS_swapon: ::c_long = 224;
++pub const SYS_swapoff: ::c_long = 225;
++pub const SYS_mprotect: ::c_long = 226;
++pub const SYS_msync: ::c_long = 227;
++pub const SYS_mlock: ::c_long = 228;
++pub const SYS_munlock: ::c_long = 229;
++pub const SYS_mlockall: ::c_long = 230;
++pub const SYS_munlockall: ::c_long = 231;
++pub const SYS_mincore: ::c_long = 232;
++pub const SYS_madvise: ::c_long = 233;
++pub const SYS_remap_file_pages: ::c_long = 234;
++pub const SYS_mbind: ::c_long = 235;
++pub const SYS_get_mempolicy: ::c_long = 236;
++pub const SYS_set_mempolicy: ::c_long = 237;
++pub const SYS_migrate_pages: ::c_long = 238;
++pub const SYS_move_pages: ::c_long = 239;
++pub const SYS_rt_tgsigqueueinfo: ::c_long = 240;
++pub const SYS_perf_event_open: ::c_long = 241;
++pub const SYS_accept4: ::c_long = 242;
++pub const SYS_recvmmsg: ::c_long = 243;
++pub const SYS_arch_specific_syscall: ::c_long = 244;
++pub const SYS_wait4: ::c_long = 260;
++pub const SYS_prlimit64: ::c_long = 261;
++pub const SYS_fanotify_init: ::c_long = 262;
++pub const SYS_fanotify_mark: ::c_long = 263;
++pub const SYS_name_to_handle_at: ::c_long = 264;
++pub const SYS_open_by_handle_at: ::c_long = 265;
++pub const SYS_clock_adjtime: ::c_long = 266;
++pub const SYS_syncfs: ::c_long = 267;
++pub const SYS_setns: ::c_long = 268;
++pub const SYS_sendmmsg: ::c_long = 269;
++pub const SYS_process_vm_readv: ::c_long = 270;
++pub const SYS_process_vm_writev: ::c_long = 271;
++pub const SYS_kcmp: ::c_long = 272;
++pub const SYS_finit_module: ::c_long = 273;
++pub const SYS_sched_setattr: ::c_long = 274;
++pub const SYS_sched_getattr: ::c_long = 275;
++pub const SYS_renameat2: ::c_long = 276;
++pub const SYS_seccomp: ::c_long = 277;
++pub const SYS_getrandom: ::c_long = 278;
++pub const SYS_memfd_create: ::c_long = 279;
++pub const SYS_bpf: ::c_long = 280;
++pub const SYS_execveat: ::c_long = 281;
++pub const SYS_userfaultfd: ::c_long = 282;
++pub const SYS_membarrier: ::c_long = 283;
++pub const SYS_mlock2: ::c_long = 284;
++pub const SYS_copy_file_range: ::c_long = 285;
++pub const SYS_preadv2: ::c_long = 286;
++pub const SYS_pwritev2: ::c_long = 287;
++pub const SYS_pkey_mprotect: ::c_long = 288;
++pub const SYS_pkey_alloc: ::c_long = 289;
++pub const SYS_pkey_free: ::c_long = 290;
++pub const SYS_statx: ::c_long = 291;
++pub const SYS_io_pgetevents: ::c_long = 292;
++pub const SYS_rseq: ::c_long = 293;
++pub const SYS_kexec_file_load: ::c_long = 294;
++pub const SYS_pidfd_send_signal: ::c_long = 424;
++pub const SYS_io_uring_setup: ::c_long = 425;
++pub const SYS_io_uring_enter: ::c_long = 426;
++pub const SYS_io_uring_register: ::c_long = 427;
++pub const SYS_open_tree: ::c_long = 428;
++pub const SYS_move_mount: ::c_long = 429;
++pub const SYS_fsopen: ::c_long = 430;
++pub const SYS_fsconfig: ::c_long = 431;
++pub const SYS_fsmount: ::c_long = 432;
++pub const SYS_fspick: ::c_long = 433;
++pub const SYS_pidfd_open: ::c_long = 434;
++pub const SYS_clone3: ::c_long = 435;
++pub const SYS_close_range: ::c_long = 436;
++pub const SYS_openat2: ::c_long = 437;
++pub const SYS_pidfd_getfd: ::c_long = 438;
++pub const SYS_faccessat2: ::c_long = 439;
++pub const SYS_process_madvise: ::c_long = 440;
++pub const SYS_epoll_pwait2: ::c_long = 441;
++pub const SYS_mount_setattr: ::c_long = 442;
++pub const SYS_quotactl_fd: ::c_long = 443;
++pub const SYS_landlock_create_ruleset: ::c_long = 444;
++pub const SYS_landlock_add_rule: ::c_long = 445;
++pub const SYS_landlock_restrict_self: ::c_long = 446;
++pub const SYS_process_mrelease: ::c_long = 448;
++pub const SYS_futex_waitv: ::c_long = 449;
++pub const SYS_set_mempolicy_home_node: ::c_long = 450;
++
++pub const O_APPEND: ::c_int = 1024;
++pub const O_DIRECT: ::c_int = 0x4000;
++pub const O_DIRECTORY: ::c_int = 0x10000;
++pub const O_LARGEFILE: ::c_int = 0;
++pub const O_NOFOLLOW: ::c_int = 0x20000;
++pub const O_CREAT: ::c_int = 64;
++pub const O_EXCL: ::c_int = 128;
++pub const O_NOCTTY: ::c_int = 256;
++pub const O_NONBLOCK: ::c_int = 2048;
++pub const O_SYNC: ::c_int = 1052672;
++pub const O_RSYNC: ::c_int = 1052672;
++pub const O_DSYNC: ::c_int = 4096;
++pub const O_ASYNC: ::c_int = 4096;
++
++pub const SIGSTKSZ: ::size_t = 16384;
++pub const MINSIGSTKSZ: ::size_t = 4096;
++
++pub const ENAMETOOLONG: ::c_int = 36;
++pub const ENOLCK: ::c_int = 37;
++pub const ENOSYS: ::c_int = 38;
++pub const ENOTEMPTY: ::c_int = 39;
++pub const ELOOP: ::c_int = 40;
++pub const ENOMSG: ::c_int = 42;
++pub const EIDRM: ::c_int = 43;
++pub const ECHRNG: ::c_int = 44;
++pub const EL2NSYNC: ::c_int = 45;
++pub const EL3HLT: ::c_int = 46;
++pub const EL3RST: ::c_int = 47;
++pub const ELNRNG: ::c_int = 48;
++pub const EUNATCH: ::c_int = 49;
++pub const ENOCSI: ::c_int = 50;
++pub const EL2HLT: ::c_int = 51;
++pub const EBADE: ::c_int = 52;
++pub const EBADR: ::c_int = 53;
++pub const EXFULL: ::c_int = 54;
++pub const ENOANO: ::c_int = 55;
++pub const EBADRQC: ::c_int = 56;
++pub const EBADSLT: ::c_int = 57;
++pub const EMULTIHOP: ::c_int = 72;
++pub const EOVERFLOW: ::c_int = 75;
++pub const ENOTUNIQ: ::c_int = 76;
++pub const EBADFD: ::c_int = 77;
++pub const EBADMSG: ::c_int = 74;
++pub const EREMCHG: ::c_int = 78;
++pub const ELIBACC: ::c_int = 79;
++pub const ELIBBAD: ::c_int = 80;
++pub const ELIBSCN: ::c_int = 81;
++pub const ELIBMAX: ::c_int = 82;
++pub const ELIBEXEC: ::c_int = 83;
++pub const EILSEQ: ::c_int = 84;
++pub const ERESTART: ::c_int = 85;
++pub const ESTRPIPE: ::c_int = 86;
++pub const EUSERS: ::c_int = 87;
++pub const ENOTSOCK: ::c_int = 88;
++pub const EDESTADDRREQ: ::c_int = 89;
++pub const EMSGSIZE: ::c_int = 90;
++pub const EPROTOTYPE: ::c_int = 91;
++pub const ENOPROTOOPT: ::c_int = 92;
++pub const EPROTONOSUPPORT: ::c_int = 93;
++pub const ESOCKTNOSUPPORT: ::c_int = 94;
++pub const EOPNOTSUPP: ::c_int = 95;
++pub const ENOTSUP: ::c_int = EOPNOTSUPP;
++pub const EPFNOSUPPORT: ::c_int = 96;
++pub const EAFNOSUPPORT: ::c_int = 97;
++pub const EADDRINUSE: ::c_int = 98;
++pub const EADDRNOTAVAIL: ::c_int = 99;
++pub const ENETDOWN: ::c_int = 100;
++pub const ENETUNREACH: ::c_int = 101;
++pub const ENETRESET: ::c_int = 102;
++pub const ECONNABORTED: ::c_int = 103;
++pub const ECONNRESET: ::c_int = 104;
++pub const ENOBUFS: ::c_int = 105;
++pub const EISCONN: ::c_int = 106;
++pub const ENOTCONN: ::c_int = 107;
++pub const ESHUTDOWN: ::c_int = 108;
++pub const ETOOMANYREFS: ::c_int = 109;
++pub const ETIMEDOUT: ::c_int = 110;
++pub const ECONNREFUSED: ::c_int = 111;
++pub const EHOSTDOWN: ::c_int = 112;
++pub const EHOSTUNREACH: ::c_int = 113;
++pub const EALREADY: ::c_int = 114;
++pub const EINPROGRESS: ::c_int = 115;
++pub const ESTALE: ::c_int = 116;
++pub const EUCLEAN: ::c_int = 117;
++pub const ENOTNAM: ::c_int = 118;
++pub const ENAVAIL: ::c_int = 119;
++pub const EISNAM: ::c_int = 120;
++pub const EREMOTEIO: ::c_int = 121;
++pub const EDQUOT: ::c_int = 122;
++pub const ENOMEDIUM: ::c_int = 123;
++pub const EMEDIUMTYPE: ::c_int = 124;
++pub const ECANCELED: ::c_int = 125;
++pub const ENOKEY: ::c_int = 126;
++pub const EKEYEXPIRED: ::c_int = 127;
++pub const EKEYREVOKED: ::c_int = 128;
++pub const EKEYREJECTED: ::c_int = 129;
++pub const EOWNERDEAD: ::c_int = 130;
++pub const ENOTRECOVERABLE: ::c_int = 131;
++pub const EHWPOISON: ::c_int = 133;
++pub const ERFKILL: ::c_int = 132;
++
++pub const SA_ONSTACK: ::c_int = 0x08000000;
++pub const SA_SIGINFO: ::c_int = 0x00000004;
++pub const SA_NOCLDWAIT: ::c_int = 0x00000002;
++
++pub const SIGCHLD: ::c_int = 17;
++pub const SIGBUS: ::c_int = 7;
++pub const SIGTTIN: ::c_int = 21;
++pub const SIGTTOU: ::c_int = 22;
++pub const SIGXCPU: ::c_int = 24;
++pub const SIGXFSZ: ::c_int = 25;
++pub const SIGVTALRM: ::c_int = 26;
++pub const SIGPROF: ::c_int = 27;
++pub const SIGWINCH: ::c_int = 28;
++pub const SIGUSR1: ::c_int = 10;
++pub const SIGUSR2: ::c_int = 12;
++pub const SIGCONT: ::c_int = 18;
++pub const SIGSTOP: ::c_int = 19;
++pub const SIGTSTP: ::c_int = 20;
++pub const SIGURG: ::c_int = 23;
++pub const SIGIO: ::c_int = 29;
++pub const SIGSYS: ::c_int = 31;
++pub const SIGSTKFLT: ::c_int = 16;
++pub const SIGPOLL: ::c_int = 29;
++pub const SIGPWR: ::c_int = 30;
++pub const SIG_SETMASK: ::c_int = 2;
++pub const SIG_BLOCK: ::c_int = 0;
++pub const SIG_UNBLOCK: ::c_int = 1;
++
++pub const F_GETLK: ::c_int = 5;
++pub const F_GETOWN: ::c_int = 9;
++pub const F_SETLK: ::c_int = 6;
++pub const F_SETLKW: ::c_int = 7;
++pub const F_SETOWN: ::c_int = 8;
++
++pub const VEOF: usize = 4;
++
++pub const POLLWRNORM: ::c_short = 0x100;
++pub const POLLWRBAND: ::c_short = 0x200;
++
++pub const SOCK_STREAM: ::c_int = 1;
++pub const SOCK_DGRAM: ::c_int = 2;
++
++pub const MAP_ANON: ::c_int = 0x0020;
++pub const MAP_GROWSDOWN: ::c_int = 0x0100;
++pub const MAP_DENYWRITE: ::c_int = 0x0800;
++pub const MAP_EXECUTABLE: ::c_int = 0x01000;
++pub const MAP_LOCKED: ::c_int = 0x02000;
++pub const MAP_NORESERVE: ::c_int = 0x04000;
++pub const MAP_POPULATE: ::c_int = 0x08000;
++pub const MAP_NONBLOCK: ::c_int = 0x010000;
++pub const MAP_STACK: ::c_int = 0x020000;
++pub const MAP_HUGETLB: ::c_int = 0x040000;
++pub const MAP_SYNC: ::c_int = 0x080000;
++
++pub const MCL_CURRENT: ::c_int = 0x0001;
++pub const MCL_FUTURE: ::c_int = 0x0002;
++pub const MCL_ONFAULT: ::c_int = 0x0004;
++pub const CBAUD: ::tcflag_t = 0o0010017;
++pub const TAB1: ::c_int = 0x00000800;
++pub const TAB2: ::c_int = 0x00001000;
++pub const TAB3: ::c_int = 0x00001800;
++pub const CR1: ::c_int = 0x00000200;
++pub const CR2: ::c_int = 0x00000400;
++pub const CR3: ::c_int = 0x00000600;
++pub const FF1: ::c_int = 0x00008000;
++pub const BS1: ::c_int = 0x00002000;
++pub const VT1: ::c_int = 0x00004000;
++pub const VWERASE: usize = 14;
++pub const VREPRINT: usize = 12;
++pub const VSUSP: usize = 10;
++pub const VSTART: usize = 8;
++pub const VSTOP: usize = 9;
++pub const VDISCARD: usize = 13;
++pub const VTIME: usize = 5;
++pub const IXON: ::tcflag_t = 0x00000400;
++pub const IXOFF: ::tcflag_t = 0x00001000;
++pub const ONLCR: ::tcflag_t = 0x4;
++pub const CSIZE: ::tcflag_t = 0x00000030;
++pub const CS6: ::tcflag_t = 0x00000010;
++pub const CS7: ::tcflag_t = 0x00000020;
++pub const CS8: ::tcflag_t = 0x00000030;
++pub const CSTOPB: ::tcflag_t = 0x00000040;
++pub const CREAD: ::tcflag_t = 0x00000080;
++pub const PARENB: ::tcflag_t = 0x00000100;
++pub const PARODD: ::tcflag_t = 0x00000200;
++pub const HUPCL: ::tcflag_t = 0x00000400;
++pub const CLOCAL: ::tcflag_t = 0x00000800;
++pub const ECHOKE: ::tcflag_t = 0x00000800;
++pub const ECHOE: ::tcflag_t = 0x00000010;
++pub const ECHOK: ::tcflag_t = 0x00000020;
++pub const ECHONL: ::tcflag_t = 0x00000040;
++pub const ECHOPRT: ::tcflag_t = 0x00000400;
++pub const ECHOCTL: ::tcflag_t = 0x00000200;
++pub const ISIG: ::tcflag_t = 0x00000001;
++pub const ICANON: ::tcflag_t = 0x00000002;
++pub const PENDIN: ::tcflag_t = 0x00004000;
++pub const NOFLSH: ::tcflag_t = 0x00000080;
++pub const CIBAUD: ::tcflag_t = 0o02003600000;
++pub const CBAUDEX: ::tcflag_t = 0o010000;
++pub const VSWTC: usize = 7;
++pub const OLCUC: ::tcflag_t = 0o000002;
++pub const NLDLY: ::tcflag_t = 0o000400;
++pub const CRDLY: ::tcflag_t = 0o003000;
++pub const TABDLY: ::tcflag_t = 0o014000;
++pub const BSDLY: ::tcflag_t = 0o020000;
++pub const FFDLY: ::tcflag_t = 0o100000;
++pub const VTDLY: ::tcflag_t = 0o040000;
++pub const XTABS: ::tcflag_t = 0o014000;
++pub const B57600: ::speed_t = 0o010001;
++pub const B115200: ::speed_t = 0o010002;
++pub const B230400: ::speed_t = 0o010003;
++pub const B460800: ::speed_t = 0o010004;
++pub const B500000: ::speed_t = 0o010005;
++pub const B576000: ::speed_t = 0o010006;
++pub const B921600: ::speed_t = 0o010007;
++pub const B1000000: ::speed_t = 0o010010;
++pub const B1152000: ::speed_t = 0o010011;
++pub const B1500000: ::speed_t = 0o010012;
++pub const B2000000: ::speed_t = 0o010013;
++pub const B2500000: ::speed_t = 0o010014;
++pub const B3000000: ::speed_t = 0o010015;
++pub const B3500000: ::speed_t = 0o010016;
++pub const B4000000: ::speed_t = 0o010017;
++
++pub const EDEADLK: ::c_int = 35;
++pub const EDEADLOCK: ::c_int = EDEADLK;
++pub const EXTPROC: ::tcflag_t = 0x00010000;
++pub const VEOL: usize = 11;
++pub const VEOL2: usize = 16;
++pub const VMIN: usize = 6;
++pub const IEXTEN: ::tcflag_t = 0x00008000;
++pub const TOSTOP: ::tcflag_t = 0x00000100;
++pub const FLUSHO: ::tcflag_t = 0x00001000;
++
++cfg_if! {
++    if #[cfg(libc_align)] {
++        mod align;
++        pub use self::align::*;
++    }
++}
+diff --git a/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/mod.rs b/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/mod.rs
+index f437355d9..fc1e275df 100644
+--- a/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/mod.rs
++++ b/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/b64/mod.rs
+@@ -161,6 +161,9 @@ cfg_if! {
+     } else if #[cfg(any(target_arch = "riscv64"))] {
+         mod riscv64;
+         pub use self::riscv64::*;
++    } else if #[cfg(any(target_arch = "loongarch64"))] {
++        mod loongarch64;
++        pub use self::loongarch64::*;
+     } else {
+         // Unknown target_arch
+     }
+diff --git a/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/mod.rs b/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/mod.rs
+index 4c6053389..40b7ac786 100644
+--- a/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/mod.rs
++++ b/vendor/libc-0.2.148/src/unix/linux_like/linux/musl/mod.rs
+@@ -791,7 +791,8 @@ cfg_if! {
+                  target_arch = "mips64",
+                  target_arch = "powerpc64",
+                  target_arch = "s390x",
+-                 target_arch = "riscv64"))] {
++                 target_arch = "riscv64",
++                 target_arch = "loongarch64"))] {
+         mod b64;
+         pub use self::b64::*;
+     } else if #[cfg(any(target_arch = "x86",
+-- 
+2.44.0
+
diff --git a/main/rust/0010-vendor-libc-0.2.150-Add-support-for-loongarch64-linu.patch b/main/rust/0010-vendor-libc-0.2.150-Add-support-for-loongarch64-linu.patch
new file mode 100644
index 00000000000..8c88f920c8b
--- /dev/null
+++ b/main/rust/0010-vendor-libc-0.2.150-Add-support-for-loongarch64-linu.patch
@@ -0,0 +1,761 @@
+From 6396be7ffc6ca273bba0958c80547cb32281a964 Mon Sep 17 00:00:00 2001
+From: WANG Rui <wangrui@loongson.cn>
+Date: Mon, 4 Mar 2024 19:28:13 +0800
+Subject: [PATCH 10/12] vendor: libc-0.2.150: Add support for
+ loongarch64-linux-musl
+
+---
+ .../linux/musl/b64/loongarch64/align.rs       |  40 ++
+ .../linux/musl/b64/loongarch64/mod.rs         | 663 ++++++++++++++++++
+ .../src/unix/linux_like/linux/musl/b64/mod.rs |   3 +
+ .../src/unix/linux_like/linux/musl/mod.rs     |   3 +-
+ 4 files changed, 708 insertions(+), 1 deletions(-)
+ create mode 100644 vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs
+ create mode 100644 vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs
+
+diff --git a/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs b/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs
+new file mode 100644
+index 000000000..dc191f51f
+--- /dev/null
++++ b/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/loongarch64/align.rs
+@@ -0,0 +1,40 @@
++s_no_extra_traits! {
++    #[allow(missing_debug_implementations)]
++    #[repr(align(16))]
++    pub struct max_align_t {
++        priv_: [f64; 4]
++    }
++}
++
++s! {
++    pub struct ucontext_t {
++        pub uc_flags: ::c_ulong,
++        pub uc_link: *mut ucontext_t,
++        pub uc_stack: ::stack_t,
++        pub uc_sigmask: ::sigset_t,
++        pub uc_mcontext: mcontext_t,
++    }
++
++    #[repr(align(16))]
++    pub struct mcontext_t {
++        pub __pc: ::c_ulonglong,
++        pub __gregs: [::c_ulonglong; 32],
++        pub __flags: ::c_uint,
++        pub __extcontext: [::c_ulonglong; 0],
++    }
++
++    #[repr(align(8))]
++    pub struct clone_args {
++        pub flags: ::c_ulonglong,
++        pub pidfd: ::c_ulonglong,
++        pub child_tid: ::c_ulonglong,
++        pub parent_tid: ::c_ulonglong,
++        pub exit_signal: ::c_ulonglong,
++        pub stack: ::c_ulonglong,
++        pub stack_size: ::c_ulonglong,
++        pub tls: ::c_ulonglong,
++        pub set_tid: ::c_ulonglong,
++        pub set_tid_size: ::c_ulonglong,
++        pub cgroup: ::c_ulonglong,
++    }
++}
+diff --git a/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs b/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs
+new file mode 100644
+index 000000000..dffbc2341
+--- /dev/null
++++ b/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs
+@@ -0,0 +1,663 @@
++//! LoongArch-specific definitions for 64-bit linux-like values
++
++pub type c_char = i8;
++pub type wchar_t = ::c_int;
++
++pub type nlink_t = ::c_uint;
++pub type blksize_t = ::c_int;
++pub type fsblkcnt64_t = ::c_ulong;
++pub type fsfilcnt64_t = ::c_ulong;
++pub type __u64 = ::c_ulonglong;
++pub type __s64 = ::c_longlong;
++
++s! {
++    pub struct pthread_attr_t {
++        __size: [::c_ulong; 7],
++    }
++
++    pub struct stat {
++        pub st_dev: ::dev_t,
++        pub st_ino: ::ino_t,
++        pub st_mode: ::mode_t,
++        pub st_nlink: ::nlink_t,
++        pub st_uid: ::uid_t,
++        pub st_gid: ::gid_t,
++        pub st_rdev: ::dev_t,
++        __pad1: ::dev_t,
++        pub st_size: ::off_t,
++        pub st_blksize: ::blksize_t,
++        __pad2: ::c_int,
++        pub st_blocks: ::blkcnt_t,
++        pub st_atime: ::time_t,
++        pub st_atime_nsec: ::c_long,
++        pub st_mtime: ::time_t,
++        pub st_mtime_nsec: ::c_long,
++        pub st_ctime: ::time_t,
++        pub st_ctime_nsec: ::c_long,
++        __unused: [::c_int; 2usize],
++    }
++
++    pub struct stat64 {
++        pub st_dev: ::dev_t,
++        pub st_ino: ::ino64_t,
++        pub st_mode: ::mode_t,
++        pub st_nlink: ::nlink_t,
++        pub st_uid: ::uid_t,
++        pub st_gid: ::gid_t,
++        pub st_rdev: ::dev_t,
++        pub __pad1: ::dev_t,
++        pub st_size: ::off64_t,
++        pub st_blksize: ::blksize_t,
++        pub __pad2: ::c_int,
++        pub st_blocks: ::blkcnt_t,
++        pub st_atime: ::time_t,
++        pub st_atime_nsec: ::c_long,
++        pub st_mtime: ::time_t,
++        pub st_mtime_nsec: ::c_long,
++        pub st_ctime: ::time_t,
++        pub st_ctime_nsec: ::c_long,
++        __unused: [::c_int; 2],
++    }
++
++    pub struct statfs {
++        pub f_type: ::c_long,
++        pub f_bsize: ::c_long,
++        pub f_blocks: ::fsblkcnt_t,
++        pub f_bfree: ::fsblkcnt_t,
++        pub f_bavail: ::fsblkcnt_t,
++        pub f_files: ::fsfilcnt_t,
++        pub f_ffree: ::fsfilcnt_t,
++        pub f_fsid: ::fsid_t,
++        pub f_namelen: ::c_long,
++        pub f_frsize: ::c_long,
++        pub f_flags: ::c_long,
++        pub f_spare: [::c_long; 4],
++    }
++
++    pub struct statfs64 {
++        pub f_type: ::c_long,
++        pub f_bsize: ::c_long,
++        pub f_blocks: ::fsblkcnt64_t,
++        pub f_bfree: ::fsblkcnt64_t,
++        pub f_bavail: ::fsblkcnt64_t,
++        pub f_files: ::fsfilcnt64_t,
++        pub f_ffree: ::fsfilcnt64_t,
++        pub f_fsid: ::fsid_t,
++        pub f_namelen: ::c_long,
++        pub f_frsize: ::c_long,
++        pub f_flags: ::c_long,
++        pub f_spare: [::c_long; 4],
++    }
++
++    pub struct ipc_perm {
++        pub __key: ::key_t,
++        pub uid: ::uid_t,
++        pub gid: ::gid_t,
++        pub cuid: ::uid_t,
++        pub cgid: ::gid_t,
++        pub mode: ::c_uint,
++        pub __seq: ::c_ushort,
++        __pad2: ::c_ushort,
++        __unused1: ::c_ulong,
++        __unused2: ::c_ulong,
++    }
++
++    pub struct user_regs_struct {
++        pub regs: [u64; 32],
++        pub orig_a0: u64,
++        pub csr_era: u64,
++        pub csr_badv: u64,
++        pub reserved: [u64; 10],
++
++    }
++
++    pub struct user_fp_struct {
++        pub fpr: [u64; 32],
++        pub fcc: u64,
++        pub fcsr: u32,
++    }
++}
++
++pub const SYS_io_setup: ::c_long = 0;
++pub const SYS_io_destroy: ::c_long = 1;
++pub const SYS_io_submit: ::c_long = 2;
++pub const SYS_io_cancel: ::c_long = 3;
++pub const SYS_io_getevents: ::c_long = 4;
++pub const SYS_setxattr: ::c_long = 5;
++pub const SYS_lsetxattr: ::c_long = 6;
++pub const SYS_fsetxattr: ::c_long = 7;
++pub const SYS_getxattr: ::c_long = 8;
++pub const SYS_lgetxattr: ::c_long = 9;
++pub const SYS_fgetxattr: ::c_long = 10;
++pub const SYS_listxattr: ::c_long = 11;
++pub const SYS_llistxattr: ::c_long = 12;
++pub const SYS_flistxattr: ::c_long = 13;
++pub const SYS_removexattr: ::c_long = 14;
++pub const SYS_lremovexattr: ::c_long = 15;
++pub const SYS_fremovexattr: ::c_long = 16;
++pub const SYS_getcwd: ::c_long = 17;
++pub const SYS_lookup_dcookie: ::c_long = 18;
++pub const SYS_eventfd2: ::c_long = 19;
++pub const SYS_epoll_create1: ::c_long = 20;
++pub const SYS_epoll_ctl: ::c_long = 21;
++pub const SYS_epoll_pwait: ::c_long = 22;
++pub const SYS_dup: ::c_long = 23;
++pub const SYS_dup3: ::c_long = 24;
++pub const SYS_fcntl: ::c_long = 25;
++pub const SYS_inotify_init1: ::c_long = 26;
++pub const SYS_inotify_add_watch: ::c_long = 27;
++pub const SYS_inotify_rm_watch: ::c_long = 28;
++pub const SYS_ioctl: ::c_long = 29;
++pub const SYS_ioprio_set: ::c_long = 30;
++pub const SYS_ioprio_get: ::c_long = 31;
++pub const SYS_flock: ::c_long = 32;
++pub const SYS_mknodat: ::c_long = 33;
++pub const SYS_mkdirat: ::c_long = 34;
++pub const SYS_unlinkat: ::c_long = 35;
++pub const SYS_symlinkat: ::c_long = 36;
++pub const SYS_linkat: ::c_long = 37;
++pub const SYS_umount2: ::c_long = 39;
++pub const SYS_mount: ::c_long = 40;
++pub const SYS_pivot_root: ::c_long = 41;
++pub const SYS_nfsservctl: ::c_long = 42;
++pub const SYS_statfs: ::c_long = 43;
++pub const SYS_fstatfs: ::c_long = 44;
++pub const SYS_truncate: ::c_long = 45;
++pub const SYS_ftruncate: ::c_long = 46;
++pub const SYS_fallocate: ::c_long = 47;
++pub const SYS_faccessat: ::c_long = 48;
++pub const SYS_chdir: ::c_long = 49;
++pub const SYS_fchdir: ::c_long = 50;
++pub const SYS_chroot: ::c_long = 51;
++pub const SYS_fchmod: ::c_long = 52;
++pub const SYS_fchmodat: ::c_long = 53;
++pub const SYS_fchownat: ::c_long = 54;
++pub const SYS_fchown: ::c_long = 55;
++pub const SYS_openat: ::c_long = 56;
++pub const SYS_close: ::c_long = 57;
++pub const SYS_vhangup: ::c_long = 58;
++pub const SYS_pipe2: ::c_long = 59;
++pub const SYS_quotactl: ::c_long = 60;
++pub const SYS_getdents64: ::c_long = 61;
++pub const SYS_lseek: ::c_long = 62;
++pub const SYS_read: ::c_long = 63;
++pub const SYS_write: ::c_long = 64;
++pub const SYS_readv: ::c_long = 65;
++pub const SYS_writev: ::c_long = 66;
++pub const SYS_pread64: ::c_long = 67;
++pub const SYS_pwrite64: ::c_long = 68;
++pub const SYS_preadv: ::c_long = 69;
++pub const SYS_pwritev: ::c_long = 70;
++pub const SYS_sendfile: ::c_long = 71;
++pub const SYS_pselect6: ::c_long = 72;
++pub const SYS_ppoll: ::c_long = 73;
++pub const SYS_signalfd4: ::c_long = 74;
++pub const SYS_vmsplice: ::c_long = 75;
++pub const SYS_splice: ::c_long = 76;
++pub const SYS_tee: ::c_long = 77;
++pub const SYS_readlinkat: ::c_long = 78;
++pub const SYS_sync: ::c_long = 81;
++pub const SYS_fsync: ::c_long = 82;
++pub const SYS_fdatasync: ::c_long = 83;
++pub const SYS_sync_file_range: ::c_long = 84;
++pub const SYS_timerfd_create: ::c_long = 85;
++pub const SYS_timerfd_settime: ::c_long = 86;
++pub const SYS_timerfd_gettime: ::c_long = 87;
++pub const SYS_utimensat: ::c_long = 88;
++pub const SYS_acct: ::c_long = 89;
++pub const SYS_capget: ::c_long = 90;
++pub const SYS_capset: ::c_long = 91;
++pub const SYS_personality: ::c_long = 92;
++pub const SYS_exit: ::c_long = 93;
++pub const SYS_exit_group: ::c_long = 94;
++pub const SYS_waitid: ::c_long = 95;
++pub const SYS_set_tid_address: ::c_long = 96;
++pub const SYS_unshare: ::c_long = 97;
++pub const SYS_futex: ::c_long = 98;
++pub const SYS_set_robust_list: ::c_long = 99;
++pub const SYS_get_robust_list: ::c_long = 100;
++pub const SYS_nanosleep: ::c_long = 101;
++pub const SYS_getitimer: ::c_long = 102;
++pub const SYS_setitimer: ::c_long = 103;
++pub const SYS_kexec_load: ::c_long = 104;
++pub const SYS_init_module: ::c_long = 105;
++pub const SYS_delete_module: ::c_long = 106;
++pub const SYS_timer_create: ::c_long = 107;
++pub const SYS_timer_gettime: ::c_long = 108;
++pub const SYS_timer_getoverrun: ::c_long = 109;
++pub const SYS_timer_settime: ::c_long = 110;
++pub const SYS_timer_delete: ::c_long = 111;
++pub const SYS_clock_settime: ::c_long = 112;
++pub const SYS_clock_gettime: ::c_long = 113;
++pub const SYS_clock_getres: ::c_long = 114;
++pub const SYS_clock_nanosleep: ::c_long = 115;
++pub const SYS_syslog: ::c_long = 116;
++pub const SYS_ptrace: ::c_long = 117;
++pub const SYS_sched_setparam: ::c_long = 118;
++pub const SYS_sched_setscheduler: ::c_long = 119;
++pub const SYS_sched_getscheduler: ::c_long = 120;
++pub const SYS_sched_getparam: ::c_long = 121;
++pub const SYS_sched_setaffinity: ::c_long = 122;
++pub const SYS_sched_getaffinity: ::c_long = 123;
++pub const SYS_sched_yield: ::c_long = 124;
++pub const SYS_sched_get_priority_max: ::c_long = 125;
++pub const SYS_sched_get_priority_min: ::c_long = 126;
++pub const SYS_sched_rr_get_interval: ::c_long = 127;
++pub const SYS_restart_syscall: ::c_long = 128;
++pub const SYS_kill: ::c_long = 129;
++pub const SYS_tkill: ::c_long = 130;
++pub const SYS_tgkill: ::c_long = 131;
++pub const SYS_sigaltstack: ::c_long = 132;
++pub const SYS_rt_sigsuspend: ::c_long = 133;
++pub const SYS_rt_sigaction: ::c_long = 134;
++pub const SYS_rt_sigprocmask: ::c_long = 135;
++pub const SYS_rt_sigpending: ::c_long = 136;
++pub const SYS_rt_sigtimedwait: ::c_long = 137;
++pub const SYS_rt_sigqueueinfo: ::c_long = 138;
++pub const SYS_rt_sigreturn: ::c_long = 139;
++pub const SYS_setpriority: ::c_long = 140;
++pub const SYS_getpriority: ::c_long = 141;
++pub const SYS_reboot: ::c_long = 142;
++pub const SYS_setregid: ::c_long = 143;
++pub const SYS_setgid: ::c_long = 144;
++pub const SYS_setreuid: ::c_long = 145;
++pub const SYS_setuid: ::c_long = 146;
++pub const SYS_setresuid: ::c_long = 147;
++pub const SYS_getresuid: ::c_long = 148;
++pub const SYS_setresgid: ::c_long = 149;
++pub const SYS_getresgid: ::c_long = 150;
++pub const SYS_setfsuid: ::c_long = 151;
++pub const SYS_setfsgid: ::c_long = 152;
++pub const SYS_times: ::c_long = 153;
++pub const SYS_setpgid: ::c_long = 154;
++pub const SYS_getpgid: ::c_long = 155;
++pub const SYS_getsid: ::c_long = 156;
++pub const SYS_setsid: ::c_long = 157;
++pub const SYS_getgroups: ::c_long = 158;
++pub const SYS_setgroups: ::c_long = 159;
++pub const SYS_uname: ::c_long = 160;
++pub const SYS_sethostname: ::c_long = 161;
++pub const SYS_setdomainname: ::c_long = 162;
++pub const SYS_getrusage: ::c_long = 165;
++pub const SYS_umask: ::c_long = 166;
++pub const SYS_prctl: ::c_long = 167;
++pub const SYS_getcpu: ::c_long = 168;
++pub const SYS_gettimeofday: ::c_long = 169;
++pub const SYS_settimeofday: ::c_long = 170;
++pub const SYS_adjtimex: ::c_long = 171;
++pub const SYS_getpid: ::c_long = 172;
++pub const SYS_getppid: ::c_long = 173;
++pub const SYS_getuid: ::c_long = 174;
++pub const SYS_geteuid: ::c_long = 175;
++pub const SYS_getgid: ::c_long = 176;
++pub const SYS_getegid: ::c_long = 177;
++pub const SYS_gettid: ::c_long = 178;
++pub const SYS_sysinfo: ::c_long = 179;
++pub const SYS_mq_open: ::c_long = 180;
++pub const SYS_mq_unlink: ::c_long = 181;
++pub const SYS_mq_timedsend: ::c_long = 182;
++pub const SYS_mq_timedreceive: ::c_long = 183;
++pub const SYS_mq_notify: ::c_long = 184;
++pub const SYS_mq_getsetattr: ::c_long = 185;
++pub const SYS_msgget: ::c_long = 186;
++pub const SYS_msgctl: ::c_long = 187;
++pub const SYS_msgrcv: ::c_long = 188;
++pub const SYS_msgsnd: ::c_long = 189;
++pub const SYS_semget: ::c_long = 190;
++pub const SYS_semctl: ::c_long = 191;
++pub const SYS_semtimedop: ::c_long = 192;
++pub const SYS_semop: ::c_long = 193;
++pub const SYS_shmget: ::c_long = 194;
++pub const SYS_shmctl: ::c_long = 195;
++pub const SYS_shmat: ::c_long = 196;
++pub const SYS_shmdt: ::c_long = 197;
++pub const SYS_socket: ::c_long = 198;
++pub const SYS_socketpair: ::c_long = 199;
++pub const SYS_bind: ::c_long = 200;
++pub const SYS_listen: ::c_long = 201;
++pub const SYS_accept: ::c_long = 202;
++pub const SYS_connect: ::c_long = 203;
++pub const SYS_getsockname: ::c_long = 204;
++pub const SYS_getpeername: ::c_long = 205;
++pub const SYS_sendto: ::c_long = 206;
++pub const SYS_recvfrom: ::c_long = 207;
++pub const SYS_setsockopt: ::c_long = 208;
++pub const SYS_getsockopt: ::c_long = 209;
++pub const SYS_shutdown: ::c_long = 210;
++pub const SYS_sendmsg: ::c_long = 211;
++pub const SYS_recvmsg: ::c_long = 212;
++pub const SYS_readahead: ::c_long = 213;
++pub const SYS_brk: ::c_long = 214;
++pub const SYS_munmap: ::c_long = 215;
++pub const SYS_mremap: ::c_long = 216;
++pub const SYS_add_key: ::c_long = 217;
++pub const SYS_request_key: ::c_long = 218;
++pub const SYS_keyctl: ::c_long = 219;
++pub const SYS_clone: ::c_long = 220;
++pub const SYS_execve: ::c_long = 221;
++pub const SYS_mmap: ::c_long = 222;
++pub const SYS_fadvise64: ::c_long = 223;
++pub const SYS_swapon: ::c_long = 224;
++pub const SYS_swapoff: ::c_long = 225;
++pub const SYS_mprotect: ::c_long = 226;
++pub const SYS_msync: ::c_long = 227;
++pub const SYS_mlock: ::c_long = 228;
++pub const SYS_munlock: ::c_long = 229;
++pub const SYS_mlockall: ::c_long = 230;
++pub const SYS_munlockall: ::c_long = 231;
++pub const SYS_mincore: ::c_long = 232;
++pub const SYS_madvise: ::c_long = 233;
++pub const SYS_remap_file_pages: ::c_long = 234;
++pub const SYS_mbind: ::c_long = 235;
++pub const SYS_get_mempolicy: ::c_long = 236;
++pub const SYS_set_mempolicy: ::c_long = 237;
++pub const SYS_migrate_pages: ::c_long = 238;
++pub const SYS_move_pages: ::c_long = 239;
++pub const SYS_rt_tgsigqueueinfo: ::c_long = 240;
++pub const SYS_perf_event_open: ::c_long = 241;
++pub const SYS_accept4: ::c_long = 242;
++pub const SYS_recvmmsg: ::c_long = 243;
++pub const SYS_arch_specific_syscall: ::c_long = 244;
++pub const SYS_wait4: ::c_long = 260;
++pub const SYS_prlimit64: ::c_long = 261;
++pub const SYS_fanotify_init: ::c_long = 262;
++pub const SYS_fanotify_mark: ::c_long = 263;
++pub const SYS_name_to_handle_at: ::c_long = 264;
++pub const SYS_open_by_handle_at: ::c_long = 265;
++pub const SYS_clock_adjtime: ::c_long = 266;
++pub const SYS_syncfs: ::c_long = 267;
++pub const SYS_setns: ::c_long = 268;
++pub const SYS_sendmmsg: ::c_long = 269;
++pub const SYS_process_vm_readv: ::c_long = 270;
++pub const SYS_process_vm_writev: ::c_long = 271;
++pub const SYS_kcmp: ::c_long = 272;
++pub const SYS_finit_module: ::c_long = 273;
++pub const SYS_sched_setattr: ::c_long = 274;
++pub const SYS_sched_getattr: ::c_long = 275;
++pub const SYS_renameat2: ::c_long = 276;
++pub const SYS_seccomp: ::c_long = 277;
++pub const SYS_getrandom: ::c_long = 278;
++pub const SYS_memfd_create: ::c_long = 279;
++pub const SYS_bpf: ::c_long = 280;
++pub const SYS_execveat: ::c_long = 281;
++pub const SYS_userfaultfd: ::c_long = 282;
++pub const SYS_membarrier: ::c_long = 283;
++pub const SYS_mlock2: ::c_long = 284;
++pub const SYS_copy_file_range: ::c_long = 285;
++pub const SYS_preadv2: ::c_long = 286;
++pub const SYS_pwritev2: ::c_long = 287;
++pub const SYS_pkey_mprotect: ::c_long = 288;
++pub const SYS_pkey_alloc: ::c_long = 289;
++pub const SYS_pkey_free: ::c_long = 290;
++pub const SYS_statx: ::c_long = 291;
++pub const SYS_io_pgetevents: ::c_long = 292;
++pub const SYS_rseq: ::c_long = 293;
++pub const SYS_kexec_file_load: ::c_long = 294;
++pub const SYS_pidfd_send_signal: ::c_long = 424;
++pub const SYS_io_uring_setup: ::c_long = 425;
++pub const SYS_io_uring_enter: ::c_long = 426;
++pub const SYS_io_uring_register: ::c_long = 427;
++pub const SYS_open_tree: ::c_long = 428;
++pub const SYS_move_mount: ::c_long = 429;
++pub const SYS_fsopen: ::c_long = 430;
++pub const SYS_fsconfig: ::c_long = 431;
++pub const SYS_fsmount: ::c_long = 432;
++pub const SYS_fspick: ::c_long = 433;
++pub const SYS_pidfd_open: ::c_long = 434;
++pub const SYS_clone3: ::c_long = 435;
++pub const SYS_close_range: ::c_long = 436;
++pub const SYS_openat2: ::c_long = 437;
++pub const SYS_pidfd_getfd: ::c_long = 438;
++pub const SYS_faccessat2: ::c_long = 439;
++pub const SYS_process_madvise: ::c_long = 440;
++pub const SYS_epoll_pwait2: ::c_long = 441;
++pub const SYS_mount_setattr: ::c_long = 442;
++pub const SYS_quotactl_fd: ::c_long = 443;
++pub const SYS_landlock_create_ruleset: ::c_long = 444;
++pub const SYS_landlock_add_rule: ::c_long = 445;
++pub const SYS_landlock_restrict_self: ::c_long = 446;
++pub const SYS_process_mrelease: ::c_long = 448;
++pub const SYS_futex_waitv: ::c_long = 449;
++pub const SYS_set_mempolicy_home_node: ::c_long = 450;
++
++pub const O_APPEND: ::c_int = 1024;
++pub const O_DIRECT: ::c_int = 0x4000;
++pub const O_DIRECTORY: ::c_int = 0x10000;
++pub const O_LARGEFILE: ::c_int = 0;
++pub const O_NOFOLLOW: ::c_int = 0x20000;
++pub const O_CREAT: ::c_int = 64;
++pub const O_EXCL: ::c_int = 128;
++pub const O_NOCTTY: ::c_int = 256;
++pub const O_NONBLOCK: ::c_int = 2048;
++pub const O_SYNC: ::c_int = 1052672;
++pub const O_RSYNC: ::c_int = 1052672;
++pub const O_DSYNC: ::c_int = 4096;
++pub const O_ASYNC: ::c_int = 4096;
++
++pub const SIGSTKSZ: ::size_t = 16384;
++pub const MINSIGSTKSZ: ::size_t = 4096;
++
++pub const ENAMETOOLONG: ::c_int = 36;
++pub const ENOLCK: ::c_int = 37;
++pub const ENOSYS: ::c_int = 38;
++pub const ENOTEMPTY: ::c_int = 39;
++pub const ELOOP: ::c_int = 40;
++pub const ENOMSG: ::c_int = 42;
++pub const EIDRM: ::c_int = 43;
++pub const ECHRNG: ::c_int = 44;
++pub const EL2NSYNC: ::c_int = 45;
++pub const EL3HLT: ::c_int = 46;
++pub const EL3RST: ::c_int = 47;
++pub const ELNRNG: ::c_int = 48;
++pub const EUNATCH: ::c_int = 49;
++pub const ENOCSI: ::c_int = 50;
++pub const EL2HLT: ::c_int = 51;
++pub const EBADE: ::c_int = 52;
++pub const EBADR: ::c_int = 53;
++pub const EXFULL: ::c_int = 54;
++pub const ENOANO: ::c_int = 55;
++pub const EBADRQC: ::c_int = 56;
++pub const EBADSLT: ::c_int = 57;
++pub const EMULTIHOP: ::c_int = 72;
++pub const EOVERFLOW: ::c_int = 75;
++pub const ENOTUNIQ: ::c_int = 76;
++pub const EBADFD: ::c_int = 77;
++pub const EBADMSG: ::c_int = 74;
++pub const EREMCHG: ::c_int = 78;
++pub const ELIBACC: ::c_int = 79;
++pub const ELIBBAD: ::c_int = 80;
++pub const ELIBSCN: ::c_int = 81;
++pub const ELIBMAX: ::c_int = 82;
++pub const ELIBEXEC: ::c_int = 83;
++pub const EILSEQ: ::c_int = 84;
++pub const ERESTART: ::c_int = 85;
++pub const ESTRPIPE: ::c_int = 86;
++pub const EUSERS: ::c_int = 87;
++pub const ENOTSOCK: ::c_int = 88;
++pub const EDESTADDRREQ: ::c_int = 89;
++pub const EMSGSIZE: ::c_int = 90;
++pub const EPROTOTYPE: ::c_int = 91;
++pub const ENOPROTOOPT: ::c_int = 92;
++pub const EPROTONOSUPPORT: ::c_int = 93;
++pub const ESOCKTNOSUPPORT: ::c_int = 94;
++pub const EOPNOTSUPP: ::c_int = 95;
++pub const ENOTSUP: ::c_int = EOPNOTSUPP;
++pub const EPFNOSUPPORT: ::c_int = 96;
++pub const EAFNOSUPPORT: ::c_int = 97;
++pub const EADDRINUSE: ::c_int = 98;
++pub const EADDRNOTAVAIL: ::c_int = 99;
++pub const ENETDOWN: ::c_int = 100;
++pub const ENETUNREACH: ::c_int = 101;
++pub const ENETRESET: ::c_int = 102;
++pub const ECONNABORTED: ::c_int = 103;
++pub const ECONNRESET: ::c_int = 104;
++pub const ENOBUFS: ::c_int = 105;
++pub const EISCONN: ::c_int = 106;
++pub const ENOTCONN: ::c_int = 107;
++pub const ESHUTDOWN: ::c_int = 108;
++pub const ETOOMANYREFS: ::c_int = 109;
++pub const ETIMEDOUT: ::c_int = 110;
++pub const ECONNREFUSED: ::c_int = 111;
++pub const EHOSTDOWN: ::c_int = 112;
++pub const EHOSTUNREACH: ::c_int = 113;
++pub const EALREADY: ::c_int = 114;
++pub const EINPROGRESS: ::c_int = 115;
++pub const ESTALE: ::c_int = 116;
++pub const EUCLEAN: ::c_int = 117;
++pub const ENOTNAM: ::c_int = 118;
++pub const ENAVAIL: ::c_int = 119;
++pub const EISNAM: ::c_int = 120;
++pub const EREMOTEIO: ::c_int = 121;
++pub const EDQUOT: ::c_int = 122;
++pub const ENOMEDIUM: ::c_int = 123;
++pub const EMEDIUMTYPE: ::c_int = 124;
++pub const ECANCELED: ::c_int = 125;
++pub const ENOKEY: ::c_int = 126;
++pub const EKEYEXPIRED: ::c_int = 127;
++pub const EKEYREVOKED: ::c_int = 128;
++pub const EKEYREJECTED: ::c_int = 129;
++pub const EOWNERDEAD: ::c_int = 130;
++pub const ENOTRECOVERABLE: ::c_int = 131;
++pub const EHWPOISON: ::c_int = 133;
++pub const ERFKILL: ::c_int = 132;
++
++pub const SA_ONSTACK: ::c_int = 0x08000000;
++pub const SA_SIGINFO: ::c_int = 0x00000004;
++pub const SA_NOCLDWAIT: ::c_int = 0x00000002;
++
++pub const SIGCHLD: ::c_int = 17;
++pub const SIGBUS: ::c_int = 7;
++pub const SIGTTIN: ::c_int = 21;
++pub const SIGTTOU: ::c_int = 22;
++pub const SIGXCPU: ::c_int = 24;
++pub const SIGXFSZ: ::c_int = 25;
++pub const SIGVTALRM: ::c_int = 26;
++pub const SIGPROF: ::c_int = 27;
++pub const SIGWINCH: ::c_int = 28;
++pub const SIGUSR1: ::c_int = 10;
++pub const SIGUSR2: ::c_int = 12;
++pub const SIGCONT: ::c_int = 18;
++pub const SIGSTOP: ::c_int = 19;
++pub const SIGTSTP: ::c_int = 20;
++pub const SIGURG: ::c_int = 23;
++pub const SIGIO: ::c_int = 29;
++pub const SIGSYS: ::c_int = 31;
++pub const SIGSTKFLT: ::c_int = 16;
++pub const SIGPOLL: ::c_int = 29;
++pub const SIGPWR: ::c_int = 30;
++pub const SIG_SETMASK: ::c_int = 2;
++pub const SIG_BLOCK: ::c_int = 0;
++pub const SIG_UNBLOCK: ::c_int = 1;
++
++pub const F_GETLK: ::c_int = 5;
++pub const F_GETOWN: ::c_int = 9;
++pub const F_SETLK: ::c_int = 6;
++pub const F_SETLKW: ::c_int = 7;
++pub const F_SETOWN: ::c_int = 8;
++
++pub const VEOF: usize = 4;
++
++pub const POLLWRNORM: ::c_short = 0x100;
++pub const POLLWRBAND: ::c_short = 0x200;
++
++pub const SOCK_STREAM: ::c_int = 1;
++pub const SOCK_DGRAM: ::c_int = 2;
++
++pub const MAP_ANON: ::c_int = 0x0020;
++pub const MAP_GROWSDOWN: ::c_int = 0x0100;
++pub const MAP_DENYWRITE: ::c_int = 0x0800;
++pub const MAP_EXECUTABLE: ::c_int = 0x01000;
++pub const MAP_LOCKED: ::c_int = 0x02000;
++pub const MAP_NORESERVE: ::c_int = 0x04000;
++pub const MAP_POPULATE: ::c_int = 0x08000;
++pub const MAP_NONBLOCK: ::c_int = 0x010000;
++pub const MAP_STACK: ::c_int = 0x020000;
++pub const MAP_HUGETLB: ::c_int = 0x040000;
++pub const MAP_SYNC: ::c_int = 0x080000;
++
++pub const MCL_CURRENT: ::c_int = 0x0001;
++pub const MCL_FUTURE: ::c_int = 0x0002;
++pub const MCL_ONFAULT: ::c_int = 0x0004;
++pub const CBAUD: ::tcflag_t = 0o0010017;
++pub const TAB1: ::c_int = 0x00000800;
++pub const TAB2: ::c_int = 0x00001000;
++pub const TAB3: ::c_int = 0x00001800;
++pub const CR1: ::c_int = 0x00000200;
++pub const CR2: ::c_int = 0x00000400;
++pub const CR3: ::c_int = 0x00000600;
++pub const FF1: ::c_int = 0x00008000;
++pub const BS1: ::c_int = 0x00002000;
++pub const VT1: ::c_int = 0x00004000;
++pub const VWERASE: usize = 14;
++pub const VREPRINT: usize = 12;
++pub const VSUSP: usize = 10;
++pub const VSTART: usize = 8;
++pub const VSTOP: usize = 9;
++pub const VDISCARD: usize = 13;
++pub const VTIME: usize = 5;
++pub const IXON: ::tcflag_t = 0x00000400;
++pub const IXOFF: ::tcflag_t = 0x00001000;
++pub const ONLCR: ::tcflag_t = 0x4;
++pub const CSIZE: ::tcflag_t = 0x00000030;
++pub const CS6: ::tcflag_t = 0x00000010;
++pub const CS7: ::tcflag_t = 0x00000020;
++pub const CS8: ::tcflag_t = 0x00000030;
++pub const CSTOPB: ::tcflag_t = 0x00000040;
++pub const CREAD: ::tcflag_t = 0x00000080;
++pub const PARENB: ::tcflag_t = 0x00000100;
++pub const PARODD: ::tcflag_t = 0x00000200;
++pub const HUPCL: ::tcflag_t = 0x00000400;
++pub const CLOCAL: ::tcflag_t = 0x00000800;
++pub const ECHOKE: ::tcflag_t = 0x00000800;
++pub const ECHOE: ::tcflag_t = 0x00000010;
++pub const ECHOK: ::tcflag_t = 0x00000020;
++pub const ECHONL: ::tcflag_t = 0x00000040;
++pub const ECHOPRT: ::tcflag_t = 0x00000400;
++pub const ECHOCTL: ::tcflag_t = 0x00000200;
++pub const ISIG: ::tcflag_t = 0x00000001;
++pub const ICANON: ::tcflag_t = 0x00000002;
++pub const PENDIN: ::tcflag_t = 0x00004000;
++pub const NOFLSH: ::tcflag_t = 0x00000080;
++pub const CIBAUD: ::tcflag_t = 0o02003600000;
++pub const CBAUDEX: ::tcflag_t = 0o010000;
++pub const VSWTC: usize = 7;
++pub const OLCUC: ::tcflag_t = 0o000002;
++pub const NLDLY: ::tcflag_t = 0o000400;
++pub const CRDLY: ::tcflag_t = 0o003000;
++pub const TABDLY: ::tcflag_t = 0o014000;
++pub const BSDLY: ::tcflag_t = 0o020000;
++pub const FFDLY: ::tcflag_t = 0o100000;
++pub const VTDLY: ::tcflag_t = 0o040000;
++pub const XTABS: ::tcflag_t = 0o014000;
++pub const B57600: ::speed_t = 0o010001;
++pub const B115200: ::speed_t = 0o010002;
++pub const B230400: ::speed_t = 0o010003;
++pub const B460800: ::speed_t = 0o010004;
++pub const B500000: ::speed_t = 0o010005;
++pub const B576000: ::speed_t = 0o010006;
++pub const B921600: ::speed_t = 0o010007;
++pub const B1000000: ::speed_t = 0o010010;
++pub const B1152000: ::speed_t = 0o010011;
++pub const B1500000: ::speed_t = 0o010012;
++pub const B2000000: ::speed_t = 0o010013;
++pub const B2500000: ::speed_t = 0o010014;
++pub const B3000000: ::speed_t = 0o010015;
++pub const B3500000: ::speed_t = 0o010016;
++pub const B4000000: ::speed_t = 0o010017;
++
++pub const EDEADLK: ::c_int = 35;
++pub const EDEADLOCK: ::c_int = EDEADLK;
++pub const EXTPROC: ::tcflag_t = 0x00010000;
++pub const VEOL: usize = 11;
++pub const VEOL2: usize = 16;
++pub const VMIN: usize = 6;
++pub const IEXTEN: ::tcflag_t = 0x00008000;
++pub const TOSTOP: ::tcflag_t = 0x00000100;
++pub const FLUSHO: ::tcflag_t = 0x00001000;
++
++cfg_if! {
++    if #[cfg(libc_align)] {
++        mod align;
++        pub use self::align::*;
++    }
++}
+diff --git a/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/mod.rs b/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/mod.rs
+index 05586cdb4..d59343064 100644
+--- a/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/mod.rs
++++ b/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/b64/mod.rs
+@@ -157,6 +157,9 @@ cfg_if! {
+     } else if #[cfg(any(target_arch = "riscv64"))] {
+         mod riscv64;
+         pub use self::riscv64::*;
++    } else if #[cfg(any(target_arch = "loongarch64"))] {
++        mod loongarch64;
++        pub use self::loongarch64::*;
+     } else {
+         // Unknown target_arch
+     }
+diff --git a/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/mod.rs b/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/mod.rs
+index b67d55e99..d4cc61484 100644
+--- a/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/mod.rs
++++ b/vendor/libc-0.2.150/src/unix/linux_like/linux/musl/mod.rs
+@@ -794,7 +794,8 @@ cfg_if! {
+                  target_arch = "mips64",
+                  target_arch = "powerpc64",
+                  target_arch = "s390x",
+-                 target_arch = "riscv64"))] {
++                 target_arch = "riscv64",
++                 target_arch = "loongarch64"))] {
+         mod b64;
+         pub use self::b64::*;
+     } else if #[cfg(any(target_arch = "x86",
+-- 
+2.44.0
+
diff --git a/main/rust/0011-vendor-compiler_builtins-Add-support-for-loongarch64.patch b/main/rust/0011-vendor-compiler_builtins-Add-support-for-loongarch64.patch
new file mode 100644
index 00000000000..f62dd43fc0f
--- /dev/null
+++ b/main/rust/0011-vendor-compiler_builtins-Add-support-for-loongarch64.patch
@@ -0,0 +1,42 @@
+From cb7423b824e8ca224f93cad7fa196b608dff8655 Mon Sep 17 00:00:00 2001
+From: WANG Rui <wangrui@loongson.cn>
+Date: Tue, 26 Mar 2024 17:41:40 +0800
+Subject: [PATCH 11/12] vendor: compiler_builtins: Add support for
+ loongarch64-linux-musl
+
+---
+ vendor/compiler_builtins/build.rs             | 18 ++++++++++++++++++
+ 1 files changed, 18 insertions(+), 0 deletion(-)
+
+diff --git a/vendor/compiler_builtins/build.rs b/vendor/compiler_builtins/build.rs
+index 048611677..afbac6247 100644
+--- a/vendor/compiler_builtins/build.rs
++++ b/vendor/compiler_builtins/build.rs
+@@ -541,6 +541,24 @@ mod c {
+             ]);
+         }
+ 
++        if target_arch == "loongarch64" {
++            sources.extend(&[
++                ("__extenddftf2", "extenddftf2.c"),
++                ("__netf2", "comparetf2.c"),
++                ("__addtf3", "addtf3.c"),
++                ("__multf3", "multf3.c"),
++                ("__subtf3", "subtf3.c"),
++                ("__fixtfsi", "fixtfsi.c"),
++                ("__floatsitf", "floatsitf.c"),
++                ("__fixunstfsi", "fixunstfsi.c"),
++                ("__floatunsitf", "floatunsitf.c"),
++                ("__fe_getround", "fp_mode.c"),
++                ("__divtf3", "divtf3.c"),
++                ("__trunctfdf2", "trunctfdf2.c"),
++                ("__trunctfsf2", "trunctfsf2.c"),
++            ]);
++        }
++
+         // Remove the assembly implementations that won't compile for the target
+         if llvm_target[0] == "thumbv6m" || llvm_target[0] == "thumbv8m.base" || target_os == "uefi"
+         {
+-- 
+2.44.0
+
diff --git a/main/rust/0012-vendor-openssl-src-Add-support-for-loongarch64-linux.patch b/main/rust/0012-vendor-openssl-src-Add-support-for-loongarch64-linux.patch
new file mode 100644
index 00000000000..45cacb45814
--- /dev/null
+++ b/main/rust/0012-vendor-openssl-src-Add-support-for-loongarch64-linux.patch
@@ -0,0 +1,25 @@
+From 7179bedc985cebe2ff945ecf280754b3c0abae36 Mon Sep 17 00:00:00 2001
+From: WANG Rui <wangrui@loongson.cn>
+Date: Tue, 26 Mar 2024 17:42:25 +0800
+Subject: [PATCH 12/12] vendor: openssl-src: Add support for
+ loongarch64-linux-musl
+
+---
+ vendor/openssl-src/src/lib.rs           | 1 +
+ 1 files changed, 1 insertions(+), 0 deletion(-)
+
+diff --git a/vendor/openssl-src/src/lib.rs b/vendor/openssl-src/src/lib.rs
+index 1264742dc..1ef018081 100644
+--- a/vendor/openssl-src/src/lib.rs
++++ b/vendor/openssl-src/src/lib.rs
+@@ -265,6 +265,7 @@ impl Build {
+             "i686-unknown-linux-gnu" => "linux-elf",
+             "i686-unknown-linux-musl" => "linux-elf",
+             "loongarch64-unknown-linux-gnu" => "linux-generic64",
++            "loongarch64-unknown-linux-musl" => "linux-generic64",
+             "mips-unknown-linux-gnu" => "linux-mips32",
+             "mips-unknown-linux-musl" => "linux-mips32",
+             "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
+-- 
+2.44.0
+
diff --git a/main/rust/APKBUILD b/main/rust/APKBUILD
new file mode 100644
index 00000000000..d7208dc1849
--- /dev/null
+++ b/main/rust/APKBUILD
@@ -0,0 +1,504 @@
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Contributor: Shiz <hi@shiz.me>
+# Contributor: Jeizsm <jeizsm@gmail.com>
+# Contributor: Ariadne Conill <ariadne@dereferenced.org>
+# Contributor: Celeste <cielesti@protonmail.com>
+# Contributor: omni <omni+alpine@hack.org>
+# Maintainer: team/rust <alpine@ptrcnull.me>
+pkgname=rust
+pkgver=1.77.0
+_llvmver=17
+_bootver=1.76.0
+pkgrel=1
+pkgdesc="Rust Programming Language toolchain"
+url="https://www.rust-lang.org/"
+arch="all"
+license="Apache-2.0 AND MIT"
+
+# 'cc' is needed at runtime just for linking. Someday rustc might invoke
+# the linker directly, and then we'll only need 'ld'.
+# See: https://github.com/rust-lang/rust/issues/11937
+depends="gcc musl-dev"
+
+# * Rust is self-hosted, so you need rustc (and cargo) to build rustc...
+#   The last revision of this abuild that does not depend on itself (uses
+#   prebuilt rustc and cargo) is 2e6769eb39eaff3029d8298fc02856623c563cd8.
+# * Don't add libgit2-dev into make dependencies. There's no compatibility
+#   guarantees between libgit2-sys and arbitrary system libgit2 versions;
+#   when system libgit2 is upgraded to a new minor version, it may break
+#   cargo and since we need cargo to rebuild cargo... this already happened
+#   several times. For this reason we build cargo with vendored libgit2.
+makedepends_build="
+	!libgit2-dev
+	cargo-bootstrap>=$_bootver
+	coreutils
+	curl-dev
+	file
+	libssh2-dev
+	llvm$_llvmver-dev
+	llvm$_llvmver-test-utils
+	openssl-dev
+	python3
+	rust-bootstrap>=$_bootver
+	tar
+	wasi-libc
+	xz-dev
+	zlib-dev
+	"
+makedepends_host="
+	curl-dev
+	libssh2-dev
+	llvm$_llvmver-dev
+	openssl-dev
+	zlib-dev
+	"
+
+# XXX: This is a hack to allow this abuild to depend on itself. Adding "rust"
+# to makedepends would not work, because abuild implicitly removes $pkgname
+# and $subpackages from the abuild's dependencies.
+provides="rust-bootstrap=$pkgver-r$pkgrel"
+# This is needed for -src that contains some testing binaries.
+options="!archcheck"
+
+case "$CARCH" in
+arm*|riscv64)
+	# +crt-static still broken here, last checked with rust 1.75.0
+	options="$options !check"
+	;;
+*)
+	;;
+esac
+
+subpackages="
+	$pkgname-dbg
+	$pkgname-doc
+	$pkgname-clippy
+	$pkgname-gdb::noarch
+	$pkgname-lldb::noarch
+	$pkgname-src::noarch
+	$pkgname-wasm
+	cargo
+	cargo-bash-completions:_cargo_bashcomp:noarch
+	cargo-zsh-completion:_cargo_zshcomp:noarch
+	cargo-doc:_cargo_doc:noarch
+	rustfmt
+	"
+source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.xz
+	alpine-move-py-scripts-to-share.patch
+	alpine-target.patch
+	do-not-install-libunwind-source.patch
+	gcc-eh-libunwind.patch
+	install-template-shebang.patch
+	musl-fix-linux_musl_base.patch
+	need-rpath.patch
+	need-ssp_nonshared.patch
+	no-export-ld-library-path.patch
+	revert-rustc_codegen_ssa-use-try_canonicalize-in-rpath.patch
+	system-wasm-ld.patch
+
+	0001-Add-new-Tier-3-target-loongarch64-unknown-linux-musl.patch
+	0002-tests-Add-loongarch64-unknown-linux-musl-target.patch
+	0005-configure.py-add-flag-for-loongarch64-musl-root.patch
+	0006-ci-Add-support-for-dist-loongarch64-musl.patch
+	0007-Promote-loongarch64-unknown-linux-musl-to-Tier-2-wit.patch
+	0008-vendor-libc-Add-support-for-loongarch64-linux-musl.patch
+	0009-vendor-libc-0.2.148-Add-support-for-loongarch64-linu.patch
+	0010-vendor-libc-0.2.150-Add-support-for-loongarch64-linu.patch
+	0011-vendor-compiler_builtins-Add-support-for-loongarch64.patch
+	0012-vendor-openssl-src-Add-support-for-loongarch64-linux.patch
+
+	check-rustc
+	"
+builddir="$srcdir/rustc-$pkgver-src"
+
+# secfixes:
+#   1.71.1-r0:
+#     - CVE-2023-38497
+#   1.66.1-r0:
+#     - CVE-2022-46176
+#   1.56.1-r0:
+#     - CVE-2021-42574
+#   1.52.1-r1:
+#     - CVE-2021-29922
+#   1.51.0-r2:
+#     - CVE-2020-36323
+#     - CVE-2021-31162
+#   1.34.2-r0:
+#     - CVE-2019-12083
+#   1.26.0-r0:
+#     - CVE-2019-16760
+
+if [ -z "$BOOTSTRAP" ]; then
+	makedepends_build="
+		$makedepends_build
+		patchelf
+		"
+	makedepends_host="
+		$makedepends_host
+		scudo-malloc
+		"
+fi
+
+# We have to add new architectures in multiple steps:
+# 1. Compile with the upstream triplets, compiling alpine's triplets in
+# 2. Compile again, now with our triplets selected as build/target, now that
+#    rustc knows about them
+_build="$CBUILD"
+_target="$CTARGET"
+
+_rlibdir="usr/lib/rustlib/$_target/lib"
+_sharedir="usr/share/rust"
+
+ldpath="/$_rlibdir"
+
+export OPENSSL_NO_VENDOR=1
+export RUST_BACKTRACE=1
+
+export gztool="$(command -v pigz || echo gzip)"
+
+# this is useful for when we have to patch vendored projects
+_clear_vendor_checksums() {
+	sed -i 's/\("files":{\)[^}]*/\1/' vendor/$1/.cargo-checksum.json
+}
+
+_unpack_build_dist() {
+	local distname="$1" destdir="$2" tarball=
+
+	case "$distname" in
+	rust-src)
+		tarball="$builddir"/build/dist/rust-src-$pkgver.tar.gz
+		;;
+	rust-std-*)
+		tarball="$builddir"/build/dist/rust-std-$pkgver-${distname#rust-std-*}.tar.gz
+		;;
+	*)
+		tarball="$builddir"/build/dist/$distname-$pkgver-$_target.tar.gz
+		;;
+	esac
+
+	tar -I "$gztool -d" -xf "$tarball" \
+		-C "$destdir" --strip-components=2 \
+		--exclude=manifest.in --no-same-owner
+}
+
+prepare() {
+	default_prepare
+	_clear_vendor_checksums libc
+	_clear_vendor_checksums libc-0.2.148
+	_clear_vendor_checksums libc-0.2.150
+	_clear_vendor_checksums compiler_builtins
+	_clear_vendor_checksums openssl-src
+}
+
+build() {
+	if [ "$_build" != "$_target" ]; then
+		export PKG_CONFIG_ALLOW_CROSS=1
+	fi
+
+	# absolutely do not set these here, rust "knows" what it's doing
+	unset CARGO_PROFILE_RELEASE_LTO
+	unset CARGO_PROFILE_RELEASE_OPT_LEVEL
+	unset CARGO_PROFILE_RELEASE_PANIC
+	unset CARGO_PROFILE_RELEASE_CODEGEN_UNITS
+
+	export CFLAGS="$CFLAGS -O2"
+	export CXXFLAGS="$CXXFLAGS -O2"
+
+	case "$CARCH" in
+	riscv64)
+		;;
+	*)
+		local lto=--set="rust.lto=thin"
+		;;
+	esac
+
+	case "$CARCH" in
+	aarch64|ppc64le|x86_64)
+		# this doesn't build on s390x, but since it's only useful with rust-analyzer,
+		# and we enable it on these arches only, just do that
+		local rust_analyzer="rust-analyzer-proc-macro-srv,"
+		;;
+	*)
+		local rust_analyzer=""
+		;;
+	esac
+
+	local targets="$_target" extra_conf_opts=
+	if subpackage_types_has wasm; then
+		targets="$targets,wasm32-wasi,wasm32-unknown-unknown"
+		extra_conf_opts='
+			--set=target.wasm32-unknown-unknown.sanitizers=false
+			--set=target.wasm32-unknown-unknown.profiler=false
+			--set=target.wasm32-unknown-unknown.linker=lld
+			--set=target.wasm32-wasi.sanitizers=false
+			--set=target.wasm32-wasi.profiler=false
+			--set=target.wasm32-wasi.wasi-root=/usr/share/wasi-sysroot
+			'
+	fi
+
+	./configure \
+		--build="$_build" \
+		--host="$_target" \
+		--target="$targets" \
+		--prefix="/usr" \
+		--release-channel="stable" \
+		--enable-local-rust \
+		--local-rust-root="/usr" \
+		--llvm-root="/usr/lib/llvm$_llvmver" \
+		--disable-docs \
+		--enable-extended \
+		--tools="cargo,clippy,src,${rust_analyzer}rustdoc,rustfmt,rust-demangler" \
+		--enable-llvm-link-shared \
+		--enable-option-checking \
+		--enable-locked-deps \
+		--enable-profiler \
+		--enable-vendor \
+		--dist-compression-formats=gz \
+		--python="python3" \
+		--set="rust.musl-root=/usr" \
+		--set="rust.backtrace-on-ice=true" \
+		--set="rust.codegen-units=1" \
+		--set="rust.codegen-units-std=1" \
+		--set="rust.deny-warnings=false" \
+		--set="rust.parallel-compiler=false" \
+		--set="rust.remap-debuginfo=true" \
+		--set="rust.description=Alpine Linux $pkgver-r$pkgrel" \
+		$lto \
+		--set="target.$_target.llvm-config=/usr/lib/llvm$_llvmver/bin/llvm-config" \
+		--set="target.$_target.musl-root=/usr" \
+		--set="target.$_target.crt-static=false" \
+		--set="target.$_target.cc=${CROSS_COMPILE}cc" \
+		--set="target.$_target.cxx=${CROSS_COMPILE}c++" \
+		--set="target.$_target.ar=${CROSS_COMPILE}ar" \
+		--set="target.$_target.linker=${CROSS_COMPILE}cc" \
+		--set="target.$_build.musl-root=/usr" \
+		--set="target.$_build.crt-static=false" \
+		--set="target.$_build.cc=cc" \
+		--set="target.$_build.cxx=c++" \
+		--set="target.$_build.ar=ar" \
+		--set="target.$_build.linker=cc" \
+		$extra_conf_opts
+
+	python3 ./x.py dist --jobs ${JOBS:-2}
+}
+
+check() {
+	# At this moment lib/rustlib/$CTARGET/lib does not contain a complete
+	# copy of the .so libs from lib (they will be copied there during
+	# 'x.py install'). Thus we must set LD_LIBRARY_PATH for tests to work.
+
+	msg "Setting up test env..."
+
+	mkdir -p "$builddir/test-rustc"
+
+	_unpack_build_dist rustc "$builddir/test-rustc" &
+	_unpack_build_dist rust-std "$builddir/test-rustc" &
+	wait
+
+	export LD_LIBRARY_PATH="$builddir/test-rustc/lib/rustlib/$CTARGET/lib"
+
+	msg "Sanity checks..."
+	"$srcdir"/check-rustc "$builddir"/test-rustc/bin/rustc
+
+	# XXX: There's some problem with these tests, we will figure it out later.
+	#	make check \
+	#		LD_LIBRARY_PATH="$_stage0dir/lib" \
+	#		VERBOSE=1
+
+	# these rebuild the whole compiler which takes a long time
+	# msg "Running tests for cargo..."
+	# CFG_DISABLE_CROSS_TESTS=1 python3 ./x.py test --no-fail-fast src/tools/cargo
+
+	unset LD_LIBRARY_PATH
+}
+
+package() {
+	# merged into main package
+	provides="$provides rust-stdlib=$pkgver-r$pkgrel"
+	replaces="rust-stdlib"
+
+	mkdir -p "$pkgdir/usr"
+
+	cd "$pkgdir"
+
+	_unpack_build_dist rustc "$pkgdir/usr" &
+	_unpack_build_dist rust-std "$pkgdir/usr" &
+	_unpack_build_dist rustc-dev "$pkgdir/usr" &
+	_unpack_build_dist rust-src "$pkgdir/usr" &
+	wait
+	_unpack_build_dist cargo "$pkgdir/usr" &
+	_unpack_build_dist clippy "$pkgdir/usr" &
+	_unpack_build_dist rustfmt "$pkgdir/usr" &
+	if subpackage_types_has wasm; then
+		_unpack_build_dist rust-std-wasm32-unknown-unknown "$pkgdir/usr" &
+		_unpack_build_dist rust-std-wasm32-wasi "$pkgdir/usr" &
+	fi
+	wait
+
+	# We don't want to include stuff like rust-llvm-* tools, as we will use the
+	# system tools.
+	rm -f usr/lib/rustlib/"$_target"/bin/rust-llvm-*
+
+	# Python scripts are noarch, so move them to /usr/share.
+	# Requires move-py-scripts-to-share.patch to be applied.
+	_mv usr/lib/rustlib/etc/*.py $_sharedir/etc/
+	rmdir -p usr/lib/rustlib/etc 2>/dev/null || true
+
+	_mv usr/etc/bash_completion.d/cargo usr/share/bash-completion/completions/
+	rmdir -p usr/etc/bash_completion.d 2>/dev/null || true
+
+	_mv usr/lib/rustlib/src/rust usr/src/
+	ln -s ../../../src/rust usr/lib/rustlib/src/rust
+
+	# Remove some clutter.
+	cd "$pkgdir"/usr/lib/rustlib
+	rm -f components install.log manifest-* rust-installer-version uninstall.sh
+	if [ "$_build" != "$_target" ]; then
+		rm -rf "$pkgdir"/usr/lib/rustlib/$_build
+	fi
+
+	# for some reason the tar archive gets some root-only files for rlibs
+	find "$pkgdir"/usr/lib/rustlib -type f -perm -600 -exec chmod 0644 {} \+
+	find "$pkgdir"/usr/lib/rustlib -type f -perm -700 -exec chmod 0755 {} \+
+
+	if [ -z "$BOOTSTRAP" ]; then
+		# link scudo to tools by default on architectures where it works well
+		# this is roughly 20+% faster with no downside except slightly higher
+		# memory use, but this is a compiler that already uses a ton of memory
+		case "$CARCH" in
+		arm*) ;;
+		*)
+			patchelf --add-needed libscudo.so \
+				"$pkgdir"/usr/bin/cargo \
+				"$pkgdir"/usr/bin/rustc \
+				"$pkgdir"/usr/bin/rustdoc
+			;;
+		esac
+	fi
+}
+
+wasm() {
+	pkgdesc="WebAssembly targets for rust"
+	depends="rust=$pkgver-r$pkgrel lld wasi-libc"
+
+	amove usr/lib/rustlib/wasm32-*
+}
+
+analysis() {
+	pkgdesc="Compiler analysis data for the Rust standard library"
+	depends="$pkgname=$pkgver-r$pkgrel"
+
+	amove $_rlibdir/../analysis
+}
+
+gdb() {
+	pkgdesc="GDB pretty printers for Rust"
+	depends="$pkgname=$pkgver-r$pkgrel gdb"
+
+	amove usr/bin/rust-gdb*
+	amove $_sharedir/etc/gdb_*.py
+}
+
+lldb() {
+	pkgdesc="LLDB pretty printers for Rust"
+	depends="$pkgname=$pkgver-r$pkgrel lldb py3-lldb"
+
+	amove usr/bin/rust-lldb
+	amove $_sharedir/etc/lldb_*.py
+	amove usr/lib/rustlib/etc/lldb_commands
+}
+
+clippy() {
+	pkgdesc="Lints to catch common mistakes and improve your Rust code"
+	depends="$pkgname=$pkgver-r$pkgrel"
+
+	amove usr/bin/cargo-clippy
+	amove usr/bin/clippy-driver
+}
+
+src() {
+	pkgdesc="$pkgdesc (source code)"
+	depends="$pkgname=$pkgver-r$pkgrel"
+	license="$license OFL-1.1 GPL-3.0-or-later GPL-3.0-with-GCC-exception CC-BY-SA-3.0 LGPL-3.0"
+
+	amove usr/src
+	amove usr/lib/rustlib/src
+}
+
+cargo() {
+	pkgdesc="The Rust package manager"
+	license="Apache-2.0 MIT UNLICENSE"
+	depends="$pkgname=$pkgver-r$pkgrel"
+	# XXX: See comment on top-level provides=.
+	provides="cargo-bootstrap=$pkgver-r$pkgrel"
+
+	amove usr/bin/cargo
+}
+
+rustfmt() {
+	pkgdesc="Rust Code Formatter"
+	license="Apache-2.0"
+	depends="cargo=$pkgver-r$pkgrel"
+
+	amove usr/bin/rustfmt
+	amove usr/bin/cargo-fmt
+}
+
+_cargo_bashcomp() {
+	default_bashcomp
+
+	pkgdesc="Bash completions for cargo"
+	license="Apache-2.0 MIT"
+	install_if="cargo=$pkgver-r$pkgrel bash-completion"
+}
+
+_cargo_zshcomp() {
+	default_zshcomp
+
+	pkgdesc="ZSH completions for cargo"
+	license="Apache-2.0 MIT"
+	install_if="cargo=$pkgver-r$pkgrel zsh"
+}
+
+_cargo_doc() {
+	pkgdesc="The Rust package manager (documentation)"
+	license="Apache-2.0 MIT"
+	install_if="docs cargo=$pkgver-r$pkgrel"
+
+	# XXX: This is hackish!
+	cd "$pkgdir"/../$pkgname-doc
+	_mv usr/share/man/man1/cargo* "$subpkgdir"/usr/share/man/man1/
+}
+
+_mv() {
+	local dest; for dest; do true; done  # get last argument
+	mkdir -p "$dest"
+	mv "$@"
+}
+
+sha512sums="
+59f19d9def93b613ac72925625e6662622f445506489b8f1cd405d037c28becd53ae1446b46edfd63734f6f236af2dc326a57a184f01bc10d497c96227f09034  rustc-1.77.0-src.tar.xz
+9de9d7ad05584e3cafddedcac409a4605a1d67e82260220deb3efd965603ee3148062b081c0cd736e50d82daad3a723fb6a7493fdf4dddfe36288645425a7946  alpine-move-py-scripts-to-share.patch
+3ff7914ff697b3ba29c5225fe8db58587c1a109d0690ef968b7e0d9453ece81be96aa502453292af3ba5d841d49e41d7e0d45b3ed700dcb944adb009ae7ef4cd  alpine-target.patch
+b4f09270f4e1677975d12447be9960271b00ffb8ab55987864c306fa45b8f70bdb82fd89e5fa7ad1cf604a1c91fbac8f3753b29dc98e10e7f47edf13d9071d77  do-not-install-libunwind-source.patch
+d4531905520b3fc699fbf57b267130bdbca94e2773a710e8b4c618ae3895149312934dd92d1988860c6dd102af50e05264b49a01662d5621c26de3604c753d6a  gcc-eh-libunwind.patch
+b283d31cc8d6559aa639d44f776e97c2a1e0f23c717b6784e549861b881555bd467fa6023180866aae81a9a58c5f83e306940ee645f3c6733a1bdef6130036c9  install-template-shebang.patch
+a32f3a9bcab771cce6be2ad936cd4edad3bb638f38da02e79c29cfed967eb0edcdf47ae892bbdd2959cebb5c74dee3fcc752dc2405f761d5c8ecc0021abb24a0  musl-fix-linux_musl_base.patch
+fdcfa99321d6913321e9cc5e7ec8a204bbcd78fbb9cc4a3ddac363ab313d7b00ffca95a70670190342cb8bbf7af8ca5547edffe06a79ead68e921ebbf0561d86  need-rpath.patch
+b6bf7be0b2eb2d31b4d9979852d5ec3ebc05d005b82e2f6b02394da6c43502729d32086ec2ffaf42f1006838ea5c2898b82a4172f9053fe08e978adcb711d5fa  need-ssp_nonshared.patch
+da5ea8ea2360ba6fdc2b3f29063baf978af19f7ff106d0511912b1357e1e613dae0417d3b55fb2aafb4e97d1749cb01046d76c6a27a03e384468e2d26c2a30dc  no-export-ld-library-path.patch
+74c0d14a68c2d7355f15ec3704d387556ad337e4991831e94951906d17aeb60387d20586a63cf6cdc62b46c60e1874340a250196ec2b3e75c268af1c41fae7e9  revert-rustc_codegen_ssa-use-try_canonicalize-in-rpath.patch
+5216e083a1709b3ecbbdeaaaf0e112ec88e7534952fdadf834ce864b55768e15d7d181c14127d4ef39f66ca2a94dd40eddb2c4ab297081d75e5f3a09dcbcfa56  system-wasm-ld.patch
+403cf84bf18587b0092d34bc17848bf4a9c46ebf053a696f026cb744559f2f93973258de3a1362cd369e5aae55bec90f77c835c8c583c8fe981e94d6351d25ee  0001-Add-new-Tier-3-target-loongarch64-unknown-linux-musl.patch
+ec62ef0adf45b1a066508b19c2791b3f2c5c97399b7f77c8c6340ce08e0e6489db81959c703fd22544dc4228cd35b98efe2229da4f13c655bcb179c4fb216a9d  0002-tests-Add-loongarch64-unknown-linux-musl-target.patch
+10ab89038206ed875fab64b7fa2d92500c19ecb5cdb3341bad37f37aebe1e253b0647469794a8afa344e9ade207bdc32b6d3418db1ce5872e7ee312179ced374  0005-configure.py-add-flag-for-loongarch64-musl-root.patch
+a776824a63752cd46bfe954985558502751f3a9e4cf70b46a3fd4513b188209b99e7c7b11e1998a89d2155a199b3b9f8ecc4389df4e8fc4b983a3d387a4fea06  0006-ci-Add-support-for-dist-loongarch64-musl.patch
+2473d80908b936cefdd99cb3c7e56ec6c714af0ae6d606f5459bfbe2d3713ac9e11ea642a8481b224d6c89074386802eb005a8a9d666d6a597a0cbcd35a19af9  0007-Promote-loongarch64-unknown-linux-musl-to-Tier-2-wit.patch
+6c4eee378995816f6da26bdea6c781e106be79ba9772d91544fbde781ab2f6de98809c6a8a6b553f1feef79ace06fb712ba87c3e554e227ad39426834fcd069a  0008-vendor-libc-Add-support-for-loongarch64-linux-musl.patch
+f3b3253106d391d0ea5390b3566704ee4d7aa4c08a5fc0b095b8ca0f0e8272c265ac99b500110653d9321438429f374726fb8291ab98017507df17e23879ef42  0009-vendor-libc-0.2.148-Add-support-for-loongarch64-linu.patch
+039a25e1ed0eae1226a021ce51b76b2ab287d2d807c912e835cef758b5ff6e97e37f8ce29ea3297c8258fd587c08ecc33665371335e3bd227549b901e2f4b8af  0010-vendor-libc-0.2.150-Add-support-for-loongarch64-linu.patch
+808e5cb5e3e0cc991ded0875e6f9cad7b72854f004ce5b626f45169ca10dc1d0d6f6b30bbe573b7daec82636edac94792522e7d9f5a13a67fd9fb0d9db1a0757  0011-vendor-compiler_builtins-Add-support-for-loongarch64.patch
+54ed2846e621aea0dd42e7a1e65bdea0d6ff2dcd396770f33ee1b9a3ed33e6b36e230643e3d444dd12285f30eceed7c66a9c83fbcd23c784fa5b9785aaf37ad1  0012-vendor-openssl-src-Add-support-for-loongarch64-linux.patch
+c31fdfe8a9b3411576c75da46645cf0465b9053000a2ab49cf9b2f2733f679d6d33acbf236d67a20e14935d094a685453b7f1840180249f39d610fd0902c3125  check-rustc
+"
diff --git a/main/rust/alpine-move-py-scripts-to-share.patch b/main/rust/alpine-move-py-scripts-to-share.patch
new file mode 100644
index 00000000000..a51d9b8612f
--- /dev/null
+++ b/main/rust/alpine-move-py-scripts-to-share.patch
@@ -0,0 +1,26 @@
+diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
+index 9abed30..c5326ae 100755
+--- a/src/etc/rust-gdb
++++ b/src/etc/rust-gdb
+@@ -12,7 +12,7 @@ fi
+ 
+ # Find out where the pretty printer Python module is
+ RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
+-GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
++GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust/etc"
+ # Get the commit hash for path remapping
+ RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')"
+ 
+diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb
+index bce72f1..ecac488 100755
+--- a/src/etc/rust-lldb
++++ b/src/etc/rust-lldb
+@@ -8,7 +8,7 @@ host=$(rustc -vV | sed -n -e 's/^host: //p')
+ 
+ # Find out where to look for the pretty printer Python module
+ RUSTC_SYSROOT=$(rustc --print sysroot)
+-RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
++RUST_LLDB="$RUSTC_SYSROOT/share/rust/etc"
+ 
+ lldb=lldb
+ if [ -f "$RUST_LLDB" ]; then
diff --git a/main/rust/alpine-target.patch b/main/rust/alpine-target.patch
new file mode 100644
index 00000000000..fd79a882c0e
--- /dev/null
+++ b/main/rust/alpine-target.patch
@@ -0,0 +1,209 @@
+From: Shiz <hi@shiz.me>
+Updated by Rasmus Thomsen <oss@cogitri.dev> on 28th of July 2019
+Updated again by Ariadne Conill <ariadne@dereferenced.org> on 31 October 2020
+Date: Thu, 20 Aug 2017 01:52:36 +0200
+Last-Updated: Sat, 28 Oct 2017 20:23:00 +0200
+Subject: [PATCH] Add Alpine targets
+
+This adds `$arch-alpine-linux-musl` targets to Rust to encode our toolchain
+and distribution-specific quirks instead of polluting the main musl target of
+`$arch-unknown-linux-musl`.
+
+--- /dev/null
++++ rustc-1.48.0-src/compiler/rustc_target/src/spec/targets/aarch64_alpine_linux_musl.rs
+@@ -0,0 +1,13 @@
++use crate::spec::Target;
++
++pub fn target() -> Target {
++    let mut base = super::aarch64_unknown_linux_musl::target();
++
++    base.llvm_target = "aarch64-alpine-linux-musl".into();
++    base.options.vendor = "alpine".into();
++    base.options.crt_static_default = false;
++    base.options.static_position_independent_executables = true;
++    base.options.need_rpath = true;
++
++    base
++}
+--- /dev/null
++++ rustc-1.48.0-src/compiler/rustc_target/src/spec/targets/armv6_alpine_linux_musleabihf.rs
+@@ -0,0 +1,13 @@
++use crate::spec::Target;
++
++pub fn target() -> Target {
++    let mut base = super::arm_unknown_linux_musleabihf::target();
++
++    base.llvm_target = "armv6-alpine-linux-musleabihf".into();
++    base.options.vendor = "alpine".into();
++    base.options.crt_static_default = false;
++    base.options.static_position_independent_executables = true;
++    base.options.need_rpath = true;
++
++    base
++}
+--- /dev/null
++++ rustc-1.48.0-src/compiler/rustc_target/src/spec/targets/armv7_alpine_linux_musleabihf.rs
+@@ -0,0 +1,14 @@
++use crate::spec::Target;
++
++pub fn target() -> Target {
++    let mut base = super::armv7_unknown_linux_musleabihf::target();
++
++    base.llvm_target = "armv7-alpine-linux-musleabihf".into();
++    base.options.vendor = "alpine".into();
++    base.options.crt_static_default = false;
++    base.options.static_position_independent_executables = true;
++    base.options.need_rpath = true;
++    base.options.features = "+v7,+vfp3,-d32,+thumb-mode,+thumb2".into();
++
++    base
++}
+--- /dev/null
++++ rustc-1.48.0-src/compiler/rustc_target/src/spec/targets/i586_alpine_linux_musl.rs
+@@ -0,0 +1,14 @@
++use crate::spec::Target;
++
++pub fn target() -> Target {
++    let mut base = super::i686_unknown_linux_musl::target();
++
++    base.options.cpu = "pentium4".into();
++    base.llvm_target = "i586-alpine-linux-musl".into();
++    base.options.vendor = "alpine".into();
++    base.options.crt_static_default = false;
++    base.options.static_position_independent_executables = true;
++    base.options.need_rpath = true;
++
++    base
++}
+--- rustc-1.48.0-src.orig/compiler/rustc_target/src/spec/mod.rs
++++ rustc-1.48.0-src/compiler/rustc_target/src/spec/mod.rs
+@@ -1397,6 +1397,17 @@
+ }
+ 
+ supported_targets! {
++    ("i586-alpine-linux-musl", i586_alpine_linux_musl),
++    ("x86_64-alpine-linux-musl", x86_64_alpine_linux_musl),
++    ("aarch64-alpine-linux-musl", aarch64_alpine_linux_musl),
++    ("armv6-alpine-linux-musleabihf", armv6_alpine_linux_musleabihf),
++    ("armv7-alpine-linux-musleabihf", armv7_alpine_linux_musleabihf),
++    ("powerpc-alpine-linux-musl", powerpc_alpine_linux_musl),
++    ("powerpc64-alpine-linux-musl", powerpc64_alpine_linux_musl),
++    ("powerpc64le-alpine-linux-musl", powerpc64le_alpine_linux_musl),
++    ("s390x-alpine-linux-musl", s390x_alpine_linux_musl),
++    ("riscv64-alpine-linux-musl", riscv64_alpine_linux_musl),
++    ("loongarch64-alpine-linux-musl", loongarch64_alpine_linux_musl),
+     ("x86_64-unknown-linux-gnu", x86_64_unknown_linux_gnu),
+     ("x86_64-unknown-linux-gnux32", x86_64_unknown_linux_gnux32),
+     ("i686-unknown-linux-gnu", i686_unknown_linux_gnu),
+--- /dev/null
++++ rustc-1.48.0-src/compiler/rustc_target/src/spec/targets/powerpc64_alpine_linux_musl.rs
+@@ -0,0 +1,13 @@
++use crate::spec::Target;
++
++pub fn target() -> Target {
++    let mut base = super::powerpc64_unknown_linux_musl::target();
++
++    base.llvm_target = "powerpc64-alpine-linux-musl".into();
++    base.options.vendor = "alpine".into();
++    base.options.crt_static_default = false;
++    base.options.static_position_independent_executables = true;
++    base.options.need_rpath = true;
++
++    base
++}
+--- /dev/null
++++ rustc-1.48.0-src/compiler/rustc_target/src/spec/targets/powerpc64le_alpine_linux_musl.rs
+@@ -0,0 +1,13 @@
++use crate::spec::Target;
++
++pub fn target() -> Target {
++    let mut base = super::powerpc64le_unknown_linux_musl::target();
++
++    base.llvm_target = "powerpc64le-alpine-linux-musl".into();
++    base.options.vendor = "alpine".into();
++    base.options.crt_static_default = false;
++    base.options.static_position_independent_executables = true;
++    base.options.need_rpath = true;
++
++    base
++}
+--- /dev/null
++++ rustc-1.48.0-src/compiler/rustc_target/src/spec/targets/powerpc_alpine_linux_musl.rs
+@@ -0,0 +1,13 @@
++use crate::spec::Target;
++
++pub fn target() -> Target {
++    let mut base = super::powerpc_unknown_linux_musl::target();
++
++    base.llvm_target = "powerpc-alpine-linux-musl".into();
++    base.options.vendor = "alpine".into();
++    base.options.crt_static_default = false;
++    base.options.static_position_independent_executables = true;
++    base.options.need_rpath = true;
++
++    base
++}
+--- /dev/null
++++ rustc-1.48.0-src/compiler/rustc_target/src/spec/targets/s390x_alpine_linux_musl.rs
+@@ -0,0 +1,13 @@
++use crate::spec::Target;
++
++pub fn target() -> Target {
++    let mut base = super::s390x_unknown_linux_musl::target();
++
++    base.llvm_target = "s390x-alpine-linux-musl".into();
++    base.options.vendor = "alpine".into();
++    base.options.crt_static_default = false;
++    base.options.static_position_independent_executables = true;
++    base.options.need_rpath = true;
++
++    base
++}
+--- /dev/null
++++ rustc-1.48.0-src/compiler/rustc_target/src/spec/targets/x86_64_alpine_linux_musl.rs
+@@ -0,0 +1,13 @@
++use crate::spec::Target;
++
++pub fn target() -> Target {
++    let mut base = super::x86_64_unknown_linux_musl::target();
++
++    base.llvm_target = "x86_64-alpine-linux-musl".into();
++    base.options.vendor = "alpine".into();
++    base.options.crt_static_default = false;
++    base.options.static_position_independent_executables = true;
++    base.options.need_rpath = true;
++
++    base
++}
+--- /dev/null
++++ rustc-1.52.1-src/compiler/rustc_target/src/spec/targets/riscv64_alpine_linux_musl.rs
+@@ -0,0 +1,13 @@
++use crate::spec::Target;
++
++pub fn target() -> Target {
++    let mut base = super::riscv64gc_unknown_linux_musl::target();
++
++    base.llvm_target = "riscv64-alpine-linux-musl".into();
++    base.options.vendor = "alpine".into();
++    base.options.crt_static_default = false;
++    base.options.static_position_independent_executables = true;
++    base.options.need_rpath = true;
++
++    base
++}
+--- /dev/null
++++ rustc-1.77.0-src/compiler/rustc_target/src/spec/targets/loongarch64_alpine_linux_musl.rs
+@@ -0,0 +1,13 @@
++use crate::spec::Target;
++
++pub fn target() -> Target {
++    let mut base = super::loongarch64_unknown_linux_musl::target();
++
++    base.llvm_target = "loongarch64-alpine-linux-musl".into();
++    base.options.vendor = "alpine".into();
++    base.options.crt_static_default = false;
++    base.options.static_position_independent_executables = true;
++    base.options.need_rpath = true;
++
++    base
++}
diff --git a/main/rust/check-rustc b/main/rust/check-rustc
new file mode 100755
index 00000000000..d4b85be764d
--- /dev/null
+++ b/main/rust/check-rustc
@@ -0,0 +1,109 @@
+#!/bin/sh
+# vim: set ts=4:
+set -eu
+
+RUSTC="$1"
+TMPDIR="$(pwd)/.tmp-${0##*/}-$RANDOM"
+failed=0
+
+unset RUST_BACKTRACE
+unset RUSTC_CRT_STATIC
+
+
+_rustc() {
+	printf '\n$ rustc %s\n' "$*"
+	"$RUSTC" "$@"
+}
+
+die() {
+	printf '\033[1;31mERROR:\033[0m %s\n' "$1" >&2  # bold red
+	exit 1
+}
+
+fail() {
+	printf '\033[1;31mFAIL:\033[0m %s\n' "$1" >&2  # bold red
+	failed=$(( failed + 1 ))
+}
+
+assert_dynamic() {
+	readelf -l "$1" | grep -Fqw INTERP \
+		&& readelf -d "$1" | grep -Fqw NEEDED || {
+			fail "$1 is not a dynamic executable!"
+			readelf -ld "$1"
+		}
+}
+
+assert_ok() {
+	"$1" || fail "$1 exited with status $?"
+}
+
+assert_panic() {
+	local status=0
+	"$1" || status=$? && [ "$status" = 101 ] \
+		|| fail "$1 exited with status $status, but expected 101"
+}
+
+assert_pie() {
+	readelf -d "$1" | grep -Fw FLAGS_1 | grep -Fqw PIE || {
+		fail "$1 is not a PIE executable!"
+		readelf -d "$1"
+	}
+}
+
+assert_static() {
+	test -f "$1" \
+		&& ! readelf -l "$1" | grep -Fqw INTERP \
+		&& ! readelf -d "$1" | grep -Fqw NEEDED || {
+			fail "$1 is not a static executable!"
+			readelf -ld "$1"
+		}
+}
+
+
+#--------------------  M a i n  --------------------
+
+test -d "$TMPDIR" && die "$TMPDIR already exists!"
+mkdir -p "$TMPDIR"
+trap "rm -R '$TMPDIR'" EXIT
+
+cd "$TMPDIR"
+
+cat >> hello_world.rs <<-EOF
+	fn main() {
+	    println!("Hello, world!");
+	}
+EOF
+
+_rustc hello_world.rs
+assert_ok ./hello_world
+assert_dynamic hello_world
+assert_pie hello_world
+rm -f hello_world
+
+_rustc -C target-feature=-crt-static hello_world.rs
+assert_ok ./hello_world
+assert_dynamic hello_world
+assert_pie hello_world
+rm -f hello_world
+
+_rustc -C target-feature=+crt-static hello_world.rs
+assert_ok ./hello_world
+assert_static hello_world
+assert_pie hello_world
+rm -f hello_world
+
+
+cat >> panic.rs <<-EOF
+	fn main() {
+	    panic!("This should panic");
+	}
+EOF
+
+_rustc -C target-feature=-crt-static panic.rs
+assert_panic ./panic
+
+_rustc -C target-feature=+crt-static panic.rs
+assert_panic ./panic
+
+
+[ "$failed" -eq 0 ] || die "$failed assertion(s) has failed"
diff --git a/main/rust/do-not-install-libunwind-source.patch b/main/rust/do-not-install-libunwind-source.patch
new file mode 100644
index 00000000000..3bcf3999749
--- /dev/null
+++ b/main/rust/do-not-install-libunwind-source.patch
@@ -0,0 +1,19 @@
+From: Dominic Meiser <alpine@msrd0.de>
+Date: Tue, 22 Dec 2020 23:31:28 +0100
+Subject: [PATCH] Do not install libunwind source
+
+This was added in rustc 1.48, but is incompatible with the Alpine Linux package since it removes all bundled
+dependencies prior to building.
+
+diff -Naur rustc-1.48.0-src.orig/src/bootstrap/dist.rs rustc-1.48.0-src/src/bootstrap/dist.rs
+--- a/src/bootstrap/src/core/build_steps/dist.rs
++++ b/src/bootstrap/src/core/build_steps/dist.rs
+@@ -909,7 +909,7 @@
+         copy_src_dirs(
+             builder,
+             &builder.src,
+-            &["library", "src/llvm-project/libunwind"],
++            &["library"],
+             &[
+                 // not needed and contains symlinks which rustup currently
+                 // chokes on when unpacking.
diff --git a/main/rust/gcc-eh-libunwind.patch b/main/rust/gcc-eh-libunwind.patch
new file mode 100644
index 00000000000..eb29bf6cbed
--- /dev/null
+++ b/main/rust/gcc-eh-libunwind.patch
@@ -0,0 +1,37 @@
+From 88526c161aa3d0f0489639ee0c21c1c086ed13ea Mon Sep 17 00:00:00 2001
+From: Aleksei Nikiforov <aleksei.nikiforov@linux.ibm.com>
+Date: Thu, 28 Apr 2022 16:48:55 +0200
+Subject: [PATCH 1/2] When linking statically on musl-based system, also link
+ libc when gcc_eh is used instead of libunwind.
+
+Otherwise following errors are possible:
+
+$ rustc -C target-feature=+crt-static hello_world.rs
+error: linking with `cc` failed: exit status: 1
+  |
+  = note: "cc" "hello_world.hello_world.85b1eb1f-cgu.0.rcgu.o" "hello_world.hello_world.85b1eb1f-cgu.1.rcgu.o" "hello_world.hello_world.85b1eb1f-cgu.2.rcgu.o" "hello_world.hello_world.85b1eb1f-cgu.3.rcgu.o" "hello_world.hello_world.85b1eb1f-cgu.4.rcgu.o" "hello_world.hello_world.85b1eb1f-cgu.5.rcgu.o" "hello_world.hello_world.85b1eb1f-cgu.6.rcgu.o" "hello_world.hello_world.85b1eb1f-cgu.7.rcgu.o" "hello_world.p360wm7isvrz3vl.rcgu.o" "-Wl,--as-needed" "-L" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib" "-Wl,--start-group" "-Wl,-Bstatic" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/libstd-290453869c457fa2.rlib" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/libpanic_unwind-cbf6379a7da8bab0.rlib" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/libminiz_oxide-a92dd9c70c39c672.rlib" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/libadler-d4dbc2eb60b8d045.rlib" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/libobject-e23cb707e37f1c09.rlib" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/libmemchr-70d429b287cab148.rlib" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/libaddr2line-ad67e2e2488bac33.rlib" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/libgimli-af4695e3f837f020.rlib" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/librustc_demangle-af414388b3a5e049.rlib" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/libstd_detect-0cbfc57a1d48d386.rlib" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/libhashbrown-542ee322b311bdfb.rlib" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/librustc_std_workspace_alloc-f412568a9ae32e92.rlib" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/libunwind-624d853e4eabb73e.rlib" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/libcfg_if-3afcf6ee80435613.rlib" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/liblibc-db67086a5554dc7a.rlib" "-lc" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/liballoc-55707620a5208b22.rlib" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/librustc_std_workspace_core-dbebf5ac373a4d82.rlib" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/libcore-8f983ad6f90a3ca2.rlib" "-Wl,--end-group" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib/libcompiler_builtins-8976cae3a94d0248.rlib" "-Wl,-Bdynamic" "-lssp_nonshared" "-lgcc_eh" "-Wl,--eh-frame-hdr" "-Wl,-znoexecstack" "-L" "/usr/lib/rustlib/s390x-alpine-linux-musl/lib" "-o" "hello_world" "-Wl,--gc-sections" "-static-pie" "-Wl,-zrelro,-znow" "-nodefaultlibs"
+  = note: /usr/lib/gcc/s390x-alpine-linux-musl/11.2.1/../../../../s390x-alpine-linux-musl/bin/ld: /usr/lib/gcc/s390x-alpine-linux-musl/11.2.1/libgcc_eh.a(unwind-dw2.o): in function `__gthread_once':
+          /home/buildozer/aports/main/gcc/src/build/s390x-alpine-linux-musl/libgcc/./gthr-default.h:700: undefined reference to `pthread_once'
+          collect2: error: ld returned 1 exit status
+
+  = help: some `extern` functions couldn't be found; some native libraries may need to be installed or have their path specified
+  = note: use the `-l` flag to specify native libraries to link
+  = note: use the `cargo:rustc-link-lib` directive to specify the native libraries to link with Cargo (see https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorustc-link-libkindname)
+
+error: aborting due to previous error
+---
+
+--- a/library/unwind/src/lib.rs
++++ b/library/unwind/src/lib.rs
+@@ -53,7 +53,10 @@
+         #[link(name = "unwind", cfg(not(target_feature = "crt-static")))]
+         extern "C" {}
+     } else {
+-        #[link(name = "unwind", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))]
++        // on musl gcc_eh needs pthread_once from libc
++        #[link(name = "gcc_eh", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))]
++        #[link(name = "c", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))]
++        extern "C" {}
+         #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
+         extern "C" {}
+     }
diff --git a/main/rust/install-template-shebang.patch b/main/rust/install-template-shebang.patch
new file mode 100644
index 00000000000..db77ee9e5cf
--- /dev/null
+++ b/main/rust/install-template-shebang.patch
@@ -0,0 +1,10 @@
+The script seems to be POSIX-sh (+ local) compatible.
+
+--- a/src/tools/rust-installer/install-template.sh
++++ b/src/tools/rust-installer/install-template.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # No undefined variables
+ set -u
diff --git a/main/rust/musl-fix-linux_musl_base.patch b/main/rust/musl-fix-linux_musl_base.patch
new file mode 100644
index 00000000000..4ddb919425a
--- /dev/null
+++ b/main/rust/musl-fix-linux_musl_base.patch
@@ -0,0 +1,58 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sat, 08 Aug 2016 15:06:00 +0200
+Subject: [PATCH] Fix linux_musl_base for native musl host
+
+See https://github.com/rust-lang/rust/pull/40113
+
+--- a/compiler/rustc_target/src/spec/base/linux_musl.rs
++++ b/compiler/rustc_target/src/spec/base/linux_musl.rs
+@@ -1,16 +1,12 @@
+-use crate::spec::crt_objects;
+-use crate::spec::{base, LinkSelfContainedDefault, TargetOptions};
++use crate::spec::{base, TargetOptions};
+ 
+ pub fn opts() -> TargetOptions {
+     let mut base = base::linux::opts();
+ 
+     base.env = "musl".into();
+-    base.pre_link_objects_self_contained = crt_objects::pre_musl_self_contained();
+-    base.post_link_objects_self_contained = crt_objects::post_musl_self_contained();
+-    base.link_self_contained = LinkSelfContainedDefault::InferredForMusl;
+ 
+     // These targets statically link libc by default
+-    base.crt_static_default = true;
++    base.crt_static_default = false;
+ 
+     base
+ }
+--- a/compiler/rustc_target/src/spec/crt_objects.rs
++++ b/compiler/rustc_target/src/spec/crt_objects.rs
+@@ -58,28 +61,6 @@
+         (LinkOutputKind::StaticPicExe, &[obj]),
+         (LinkOutputKind::DynamicDylib, &[obj]),
+         (LinkOutputKind::StaticDylib, &[obj]),
+-    ])
+-}
+-
+-pub(super) fn pre_musl_self_contained() -> CrtObjects {
+-    new(&[
+-        (LinkOutputKind::DynamicNoPicExe, &["crt1.o", "crti.o", "crtbegin.o"]),
+-        (LinkOutputKind::DynamicPicExe, &["Scrt1.o", "crti.o", "crtbeginS.o"]),
+-        (LinkOutputKind::StaticNoPicExe, &["crt1.o", "crti.o", "crtbegin.o"]),
+-        (LinkOutputKind::StaticPicExe, &["rcrt1.o", "crti.o", "crtbeginS.o"]),
+-        (LinkOutputKind::DynamicDylib, &["crti.o", "crtbeginS.o"]),
+-        (LinkOutputKind::StaticDylib, &["crti.o", "crtbeginS.o"]),
+-    ])
+-}
+-
+-pub(super) fn post_musl_self_contained() -> CrtObjects {
+-    new(&[
+-        (LinkOutputKind::DynamicNoPicExe, &["crtend.o", "crtn.o"]),
+-        (LinkOutputKind::DynamicPicExe, &["crtendS.o", "crtn.o"]),
+-        (LinkOutputKind::StaticNoPicExe, &["crtend.o", "crtn.o"]),
+-        (LinkOutputKind::StaticPicExe, &["crtendS.o", "crtn.o"]),
+-        (LinkOutputKind::DynamicDylib, &["crtendS.o", "crtn.o"]),
+-        (LinkOutputKind::StaticDylib, &["crtendS.o", "crtn.o"]),
+     ])
+ }
+ 
diff --git a/main/rust/need-rpath.patch b/main/rust/need-rpath.patch
new file mode 100644
index 00000000000..6d3fb74c5eb
--- /dev/null
+++ b/main/rust/need-rpath.patch
@@ -0,0 +1,62 @@
+From: Shiz <hi@shiz.me>
+Date: Thu, 20 Aug 2017 01:48:22 +0200
+Subject: [PATCH] Add need_rpath target option to force RPATH generation
+
+This adds a `need_rpath` option to the target options in order to implicitly
+have the equivalent of `-C rpath` specified by default for final products
+(executables and dynamic libraries), so that RPATHs are always added.
+
+We have to skip this step in the bootstrap phase as it does its own manual
+RPATH additions, but unfortunately there's no clean way to detect this.
+As such, we have to resort to checking the `RUSTC_BOOTSTRAP` variable.
+Hacky hacky!
+
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1983,6 +1983,8 @@ pub struct TargetOptions {
+     pub allows_weak_linkage: bool,
+     /// Whether the linker support rpaths or not. Defaults to false.
+     pub has_rpath: bool,
++    /// Whether to force rpath support on by default. Defaults to false.
++    pub need_rpath: bool,
+     /// Whether to disable linking to the default libraries, typically corresponds
+     /// to `-nodefaultlibs`. Defaults to true.
+     pub no_default_libraries: bool,
+@@ -2317,6 +2319,7 @@ impl Default for TargetOptions {
+             default_dwarf_version: 4,
+             allows_weak_linkage: true,
+             has_rpath: false,
++            need_rpath: false,
+             no_default_libraries: true,
+             position_independent_executables: false,
+             static_position_independent_executables: false,
+@@ -3042,6 +3045,7 @@ impl Target {
+         key!(default_dwarf_version, u32);
+         key!(allows_weak_linkage, bool);
+         key!(has_rpath, bool);
++        key!(need_rpath, bool);
+         key!(no_default_libraries, bool);
+         key!(position_independent_executables, bool);
+         key!(static_position_independent_executables, bool);
+@@ -3297,6 +3301,7 @@ impl ToJson for Target {
+         target_option_val!(default_dwarf_version);
+         target_option_val!(allows_weak_linkage);
+         target_option_val!(has_rpath);
++        target_option_val!(need_rpath);
+         target_option_val!(no_default_libraries);
+         target_option_val!(position_independent_executables);
+         target_option_val!(static_position_independent_executables);
+--- a/compiler/rustc_codegen_ssa/src/back/link.rs.orig
++++ b/compiler/rustc_codegen_ssa/src/back/link.rs
+@@ -2036,7 +2036,10 @@
+     // FIXME (#2397): At some point we want to rpath our guesses as to
+     // where extern libraries might live, based on the
+     // add_lib_search_paths
+-    if sess.opts.cg.rpath {
++    // XXX: hacky hacky
++    let bootstrap = env::var("RUSTC_BOOTSTRAP").is_ok();
++    if !bootstrap && !sess.crt_static(None) &&
++    (sess.opts.cg.rpath || sess.target.options.need_rpath) {
+         let libs = codegen_results
+             .crate_info
+             .used_crates
diff --git a/main/rust/need-ssp_nonshared.patch b/main/rust/need-ssp_nonshared.patch
new file mode 100644
index 00000000000..68b652e25d9
--- /dev/null
+++ b/main/rust/need-ssp_nonshared.patch
@@ -0,0 +1,29 @@
+this is needed for libssp-less __stack_chk_fail_local (on x86),
+the other Bdynamic patch seems to break the top hunk,
+so we need the bottom hack
+--
+diff --git a/library/std/src/sys/unix/mod.rs b/library/std/src/sys/unix/mod.rs
+index 68c9520..63f8a48 100644
+--- a/library/std/src/sys/pal/unix/mod.rs
++++ b/library/std/src/sys/pal/unix/mod.rs
+@@ -379,6 +379,9 @@ cfg_if::cfg_if! {
+         #[link(name = "dl", cfg(not(target_feature = "crt-static")))]
+         #[link(name = "log", cfg(not(target_feature = "crt-static")))]
+         extern "C" {}
++    } else if #[cfg(all(target_os = "linux", target_env = "musl"))] {
++        #[link(name = "ssp_nonshared", kind = "static")]
++        extern "C" {}
+     } else if #[cfg(target_os = "freebsd")] {
+         #[link(name = "execinfo")]
+         #[link(name = "pthread")]
+--- a/compiler/rustc_llvm/build.rs
++++ b/compiler/rustc_llvm/build.rs
+@@ -110,6 +110,8 @@
+         return;
+     }
+ 
++    println!("cargo:rustc-link-lib=ssp_nonshared");
++
+     restore_library_path();
+ 
+     let target = env::var("TARGET").expect("TARGET was not set");
diff --git a/main/rust/no-export-ld-library-path.patch b/main/rust/no-export-ld-library-path.patch
new file mode 100644
index 00000000000..feff239bdaa
--- /dev/null
+++ b/main/rust/no-export-ld-library-path.patch
@@ -0,0 +1,30 @@
+Patch-Source: https://github.com/chimera-linux/cports/blob/3dc313d1c83d20cc9ac221e6fe2992d80c64c071/main/rust/patches/0010-do-not-export-LD_LIBRARY_PATH.patch
+From 6f363ca048383740bdbebd63013bcedbb10f814a Mon Sep 17 00:00:00 2001
+From: Daniel Kolesa <daniel@octaforge.org>
+Date: Fri, 25 Feb 2022 00:39:21 +0100
+Subject: [PATCH 10/11] do not export LD_LIBRARY_PATH
+
+---
+ src/bootstrap/bootstrap.py | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
+index 7c36bb264..b4f9b7066 100644
+--- a/src/bootstrap/bootstrap.py
++++ b/src/bootstrap/bootstrap.py
+@@ -893,12 +893,6 @@ class RustBuild(object):
+             del env["CARGO_BUILD_TARGET"]
+         env["CARGO_TARGET_DIR"] = build_dir
+         env["RUSTC"] = self.rustc()
+-        env["LD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \
+-            (os.pathsep + env["LD_LIBRARY_PATH"]) \
+-            if "LD_LIBRARY_PATH" in env else ""
+-        env["DYLD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \
+-            (os.pathsep + env["DYLD_LIBRARY_PATH"]) \
+-            if "DYLD_LIBRARY_PATH" in env else ""
+         env["LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \
+             (os.pathsep + env["LIBRARY_PATH"]) \
+             if "LIBRARY_PATH" in env else ""
+-- 
+2.35.1
+
diff --git a/main/rust/revert-rustc_codegen_ssa-use-try_canonicalize-in-rpath.patch b/main/rust/revert-rustc_codegen_ssa-use-try_canonicalize-in-rpath.patch
new file mode 100644
index 00000000000..5d5794083a6
--- /dev/null
+++ b/main/rust/revert-rustc_codegen_ssa-use-try_canonicalize-in-rpath.patch
@@ -0,0 +1,39 @@
+This reverts upstream 5aeb6a326f2fa941061b60c9286665847fe0401e that is
+part of https://github.com/rust-lang/rust/pull/116487
+
+Since we always enable `-Crpath` with need-rpath.patch things like running
+`rustc hello_world.rs` would break, as we noticed with our check-rustc
+test.
+
+Related issue: https://github.com/rust-lang/rust/issues/119571
+
+--- a/compiler/rustc_codegen_ssa/src/back/rpath.rs
++++ b/compiler/rustc_codegen_ssa/src/back/rpath.rs
+@@ -1,7 +1,8 @@
+ use pathdiff::diff_paths;
+ use rustc_data_structures::fx::FxHashSet;
+-use rustc_fs_util::try_canonicalize;
++use std::env;
+ use std::ffi::OsString;
++use std::fs;
+ use std::path::{Path, PathBuf};
+ 
+ pub struct RPathConfig<'a> {
+@@ -81,11 +82,12 @@ fn get_rpath_relative_to_output(config:
+     // Mac doesn't appear to support $ORIGIN
+     let prefix = if config.is_like_osx { "@loader_path" } else { "$ORIGIN" };
+ 
+-    // Strip filenames
+-    let lib = lib.parent().unwrap();
+-    let output = config.out_filename.parent().unwrap();
+-    let lib = try_canonicalize(lib).unwrap();
+-    let output = try_canonicalize(output).unwrap();
++    let cwd = env::current_dir().unwrap();
++    let mut lib = fs::canonicalize(&cwd.join(lib)).unwrap_or_else(|_| cwd.join(lib));
++    lib.pop(); // strip filename
++    let mut output = cwd.join(&config.out_filename);
++    output.pop(); // strip filename
++    let output = fs::canonicalize(&output).unwrap_or(output);
+     let relative = path_relative_from(&lib, &output)
+         .unwrap_or_else(|| panic!("couldn't create relative path from {output:?} to {lib:?}"));
+ 
diff --git a/main/rust/system-wasm-ld.patch b/main/rust/system-wasm-ld.patch
new file mode 100644
index 00000000000..c4422eb5019
--- /dev/null
+++ b/main/rust/system-wasm-ld.patch
@@ -0,0 +1,13 @@
+--- a/compiler/rustc_target/src/spec/base/wasm.rs
++++ b/compiler/rustc_target/src/spec/base/wasm.rs
+@@ -88,8 +88,8 @@ pub fn options() -> TargetOptions {
+         // arguments just yet
+         limit_rdylib_exports: false,
+ 
+-        // we use the LLD shipped with the Rust toolchain by default
+-        linker: Some("rust-lld".into()),
++        // we use the LLD shipped with the system by default
++        linker: Some("wasm-ld".into()),
+         linker_flavor: LinkerFlavor::WasmLld(Cc::No),
+ 
+         pre_link_args,
diff --git a/main/s390-tools/0002-musl-fixes.patch b/main/s390-tools/0002-musl-fixes.patch
index bfaa279b0b7..50da3b256f6 100644
--- a/main/s390-tools/0002-musl-fixes.patch
+++ b/main/s390-tools/0002-musl-fixes.patch
@@ -1,25 +1,23 @@
-diff --git a/dasdfmt/dasdfmt.h b/dasdfmt/dasdfmt.h
-index b9edabd..b642342 100644
 --- a/dasdfmt/dasdfmt.h
 +++ b/dasdfmt/dasdfmt.h
-@@ -65,13 +65,13 @@
+@@ -69,13 +69,13 @@
  	"is in invalid format\n",prog_name);}
  
  typedef struct bootstrap1 {
--        u_int32_t key;
--        u_int32_t data[6];
-+        uint32_t key;
-+        uint32_t data[6];
+-	u_int32_t key;
+-	u_int32_t data[6];
++	uint32_t key;
++	uint32_t data[6];
  } __attribute__ ((packed)) bootstrap1_t;
  
  typedef struct bootstrap2 {
--        u_int32_t key;
--        u_int32_t data[36];
-+        uint32_t key;
-+        uint32_t data[36];
+-	u_int32_t key;
+-	u_int32_t data[36];
++	uint32_t key;
++	uint32_t data[36];
  } __attribute__ ((packed)) bootstrap2_t;
  
- typedef struct dasdfmt_info {
+ 
 diff --git a/dasdview/dasdview.c b/dasdview/dasdview.c
 index 0c1581a..8515fb6 100644
 --- a/dasdview/dasdview.c
@@ -803,3 +801,16 @@ index f2d4a02..9299e7c 100644
  	unsigned int i;
  
  	rec = (struct splink_record *) &buf->data;
+--- a/include/lib/util_sys.h
++++ b/include/lib/util_sys.h
+@@ -14,6 +14,10 @@
+ 
+ #include <stdbool.h>
+ 
++#ifndef	__dev_t_defined
++#include <sys/types.h>
++#endif /* __dev_t_defined */
++
+ int util_sys_get_dev_addr(const char *dev, char *addr);
+ bool util_sys_dev_is_partition(dev_t dev);
+ int util_sys_get_partnum(dev_t dev);
diff --git a/main/s390-tools/0009-link-libexecinfo.patch b/main/s390-tools/0009-link-libexecinfo.patch
deleted file mode 100644
index be78bc13827..00000000000
--- a/main/s390-tools/0009-link-libexecinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/common.mak b/common.mak
-index 9c349e5..0a5fd69 100644
---- a/common.mak
-+++ b/common.mak
-@@ -228,6 +228,7 @@ else
- 	NO_PIE_LINKFLAGS :=
- 	NO_PIE_LDFLAGS :=
- endif
-+LDLIBS += $(LIBEXECINFO_LIBS)
- 
- # Overwrite implicite makefile rules for having nice compile output
- %.o: %.c
diff --git a/main/s390-tools/0101-zipl-dont-optimize-size.patch b/main/s390-tools/0101-zipl-dont-optimize-size.patch
deleted file mode 100644
index 39d8d793a71..00000000000
--- a/main/s390-tools/0101-zipl-dont-optimize-size.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/zipl/boot/Makefile b/zipl/boot/Makefile
-index 52b3a23..9dfb146 100644
---- a/zipl/boot/Makefile
-+++ b/zipl/boot/Makefile
-@@ -1,6 +1,9 @@
- # Common definitions
- include ../../common.mak
- 
-+ALL_CPPFLAGS := $(filter-out -Os,$(ALL_CPPFLAGS))
-+ALL_CFLAGS := $(filter-out -Os,$(ALL_CFLAGS))
-+
- ALL_CFLAGS = $(NO_PIE_CFLAGS) -Os -g -I $(rootdir)/zipl/include \
- 	   -I $(rootdir)/include -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
- 	  -fno-builtin -ffreestanding -fno-asynchronous-unwind-tables \
-
-diff --git a/zipl/src/Makefile b/zipl/src/Makefile
-index 1f39d06..f6bcb97 100644
---- a/zipl/src/Makefile
-+++ b/zipl/src/Makefile
-@@ -5,6 +5,8 @@
- 	    -DZFCPDUMP_IMAGE="STRINGIFY($(ZFCPDUMP_DIR)/$(ZFCPDUMP_IMAGE))" \
- 	    -DZFCPDUMP_INITRD="STRINGIFY($(ZFCPDUMP_DIR)/$(ZFCPDUMP_INITRD))" \
- 	    -D_FILE_OFFSET_BITS=64 $(NO_PIE_CFLAGS)
-+ALL_CPPFLAGS := $(filter-out -Os,$(ALL_CPPFLAGS))
-+ALL_CFLAGS := $(filter-out -Os,$(ALL_CFLAGS))
- ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
- 
- libs = $(rootdir)/libutil/libutil.a
diff --git a/main/s390-tools/0300-disable-program-using-gnu-ext.patch b/main/s390-tools/0300-disable-program-using-gnu-ext.patch
index e6c302cc2ad..be3a8a8b44b 100644
--- a/main/s390-tools/0300-disable-program-using-gnu-ext.patch
+++ b/main/s390-tools/0300-disable-program-using-gnu-ext.patch
@@ -1,15 +1,13 @@
 cpuplugd : feenableexcept function
 
-diff --git a/Makefile b/Makefile
-index a760c0f..7fe2694 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -6,7 +6,7 @@
- LIB_DIRS = libvtoc libutil libzds libdasd libvmdump libccw libvmcp
+ LIB_DIRS = libvtoc libutil libzds libdasd libvmdump libccw libvmcp libekmfweb
  TOOL_DIRS = zipl zdump fdasd dasdfmt dasdview tunedasd \
  	   tape390 osasnmpd qetharp ip_watcher qethconf scripts zconf \
 -	   vmconvert vmcp man mon_tools dasdinfo vmur cpuplugd ipl_tools \
 +	   vmconvert vmcp man mon_tools dasdinfo vmur ipl_tools \
  	   ziomon iucvterm hyptop cmsfs-fuse qethqoat zfcpdump zdsfs cpumf \
- 	   systemd hmcdrvfs cpacfstats zdev dump2tar zkey netboot etc zpcictl
- SUB_DIRS = $(LIB_DIRS) $(TOOL_DIRS)
+ 	   systemd hmcdrvfs cpacfstats zdev dump2tar zkey netboot etc zpcictl \
+ 	   genprotimg lsstp hsci
diff --git a/main/s390-tools/0400-busybox-compat.patch b/main/s390-tools/0400-busybox-compat.patch
new file mode 100644
index 00000000000..102e63d6eb7
--- /dev/null
+++ b/main/s390-tools/0400-busybox-compat.patch
@@ -0,0 +1,85 @@
+diff --git a/libekmfweb/Makefile b/libekmfweb/Makefile
+index 1c77699..16f89c3 100644
+--- a/libekmfweb/Makefile
++++ b/libekmfweb/Makefile
+@@ -91,13 +91,13 @@ libekmfweb.so.$(VERSION): ALL_LDFLAGS += -shared -Wl,--version-script=libekmfweb
+ 	-Wl,-z,defs,-Bsymbolic -Wl,-soname,libekmfweb.so.$(VERM)
+ libekmfweb.so.$(VERSION): ekmfweb.o utilities.o cca.o $(libs)
+ 	$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
+-	ln -srf libekmfweb.so.$(VERSION) libekmfweb.so.$(VERM)
+-	ln -srf libekmfweb.so.$(VERSION) libekmfweb.so
++	ln -sf libekmfweb.so.$(VERSION) libekmfweb.so.$(VERM)
++	ln -sf libekmfweb.so.$(VERSION) libekmfweb.so
+ 
+ install-libekmfweb.so.$(VERSION): libekmfweb.so.$(VERSION)
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 -T libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION)
+-	ln -srf $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERM)
+-	ln -srf $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so
++	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION)
++	ln -sf $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERM)
++	ln -sf $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so
+ 	$(INSTALL) -d -m 770 $(DESTDIR)$(USRINCLUDEDIR)/ekmfweb
+ 	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 $(rootdir)include/ekmfweb/ekmfweb.h $(DESTDIR)$(USRINCLUDEDIR)/ekmfweb
+ 
+diff --git a/libkmipclient/Makefile b/libkmipclient/Makefile
+index addd096..9a0b776 100644
+--- a/libkmipclient/Makefile
++++ b/libkmipclient/Makefile
+@@ -114,13 +114,13 @@ libkmipclient.so.$(VERSION): ALL_LDFLAGS += -shared -Wl,--version-script=libkmip
+ libkmipclient.so.$(VERSION): kmip.o request.o response.o attribute.o key.o ttlv.o json.o \
+ 	xml.o https.o tls.o names.o utils.o
+ 	$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
+-	ln -srf libkmipclient.so.$(VERSION) libkmipclient.so.$(VERM)
+-	ln -srf libkmipclient.so.$(VERSION) libkmipclient.so
++	ln -sf libkmipclient.so.$(VERSION) libkmipclient.so.$(VERM)
++	ln -sf libkmipclient.so.$(VERSION) libkmipclient.so
+ 
+ install-libkmipclient.so.$(VERSION): libkmipclient.so.$(VERSION)
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 -T libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION)
+-	ln -srf $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERM)
+-	ln -srf $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so
++	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION)
++	ln -sf $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERM)
++	ln -sf $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libkmipclient.so
+ 	$(INSTALL) -d -m 770 $(DESTDIR)$(USRINCLUDEDIR)/kmipclient
+ 	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 $(rootdir)include/kmipclient/kmipclient.h $(DESTDIR)$(USRINCLUDEDIR)/kmipclient
+ 
+diff --git a/zkey/ekmfweb/Makefile b/zkey/ekmfweb/Makefile
+index 013beb8..c8de734 100644
+--- a/zkey/ekmfweb/Makefile
++++ b/zkey/ekmfweb/Makefile
+@@ -49,7 +49,7 @@ install: all install-libekmfweb.dep zkey-ekmfweb.so
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(MANDIR)/man1
+ 	$(INSTALL) -m 644 -c zkey-ekmfweb.1 $(DESTDIR)$(MANDIR)/man1
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(ZKEYKMSPLUGINDIR)
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 -T zkey-ekmfweb.so $(DESTDIR)$(ZKEYKMSPLUGINDIR)/zkey-ekmfweb.so
++	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 zkey-ekmfweb.so $(DESTDIR)$(ZKEYKMSPLUGINDIR)/zkey-ekmfweb.so
+ 
+ clean:
+ 	rm -f *.o zkey-ekmfweb.so install-libekmfweb.dep libekmfweb.dep
+diff --git a/zkey/kmip/Makefile b/zkey/kmip/Makefile
+index 14a532e..ca604de 100644
+--- a/zkey/kmip/Makefile
++++ b/zkey/kmip/Makefile
+@@ -50,7 +50,7 @@ install: all install-libkmipclient.dep zkey-kmip.so
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(MANDIR)/man1
+ 	$(INSTALL) -m 644 -c zkey-kmip.1 $(DESTDIR)$(MANDIR)/man1
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(ZKEYKMSPLUGINDIR)
+-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 -T zkey-kmip.so $(DESTDIR)$(ZKEYKMSPLUGINDIR)/zkey-kmip.so
++	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 zkey-kmip.so $(DESTDIR)$(ZKEYKMSPLUGINDIR)/zkey-kmip.so
+ 	$(INSTALL) -d -m 770 $(DESTDIR)$(SYSCONFDIR)/zkey/kmip
+ 	$(INSTALL) -d -m 770 $(DESTDIR)$(SYSCONFDIR)/zkey/kmip/profiles
+ 	$(INSTALL) -m 644 -c profiles/*.profile $(DESTDIR)$(SYSCONFDIR)/zkey/kmip/profiles
+diff --git a/chreipl-fcp-mpath/Makefile b/chreipl-fcp-mpath/Makefile
+index e7fb920..f628390 100644
+--- a/chreipl-fcp-mpath/Makefile
++++ b/chreipl-fcp-mpath/Makefile
+@@ -130,7 +130,7 @@ else # $(ENABLE_DOC) != 1
+ # freshness of the man page can be checked, even if `pandoc` is not available,
+ # or ENABLE_DOC disabled.
+ 
+-MANPAGE_FRESH	:= $(shell sha256sum --check .chreipl-fcp-mpath.7.cksum >/dev/null && echo 1 || echo 0)
++MANPAGE_FRESH	:= $(shell sha256sum -c .chreipl-fcp-mpath.7.cksum >/dev/null && echo 1 || echo 0)
+ ifeq ($(MANPAGE_FRESH),0)
+ $(warning chreipl-fcp-mpath.7 is outdated, please regenerate it by calling `make ENABLE_DOC=1`)
+ endif
diff --git a/main/s390-tools/0500-remove-lib64.patch b/main/s390-tools/0500-remove-lib64.patch
new file mode 100644
index 00000000000..d1e5497cc29
--- /dev/null
+++ b/main/s390-tools/0500-remove-lib64.patch
@@ -0,0 +1,24 @@
+diff --git a/common.mak b/common.mak
+index 78c678e..ba7cbb4 100644
+--- a/common.mak
++++ b/common.mak
+@@ -181,7 +181,7 @@ USRBINDIR       = $(INSTALLDIR)/usr/bin
+ BINDIR          = $(INSTALLDIR)/sbin
+ LIBDIR          = $(INSTALLDIR)/lib
+ USRLIBDIR	= $(INSTALLDIR)/usr/lib
+-USRLIB64DIR     = $(INSTALLDIR)/usr/lib64
++USRLIB64DIR     = $(INSTALLDIR)/usr/lib
+ SYSCONFDIR      = $(INSTALLDIR)/etc
+ MANDIR          = $(INSTALLDIR)/usr/share/man
+ VARDIR          = $(INSTALLDIR)/var
+--- a/genprotimg/src/Makefile
++++ b/genprotimg/src/Makefile
+@@ -43,7 +43,7 @@ LIBCRYPTO_LIBS := $(shell pkg-config --s
+ LIBCURL_CFLAGS := $(shell pkg-config --silence-errors --cflags libcurl)
+ LIBCURL_LIBS := $(shell pkg-config --silence-errors --libs libcurl)
+ else
+-GLIB2_CFLAGS := -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
++GLIB2_CFLAGS := -I/usr/include/glib-2.0
+ GLIB2_LIBS := -lglib-2.0
+ LIBCRYPTO_CFLAGS :=
+ LIBCRYPTO_LIBS := -lcrypto
diff --git a/main/s390-tools/APKBUILD b/main/s390-tools/APKBUILD
index 8bb31448dac..13933582b2c 100644
--- a/main/s390-tools/APKBUILD
+++ b/main/s390-tools/APKBUILD
@@ -1,31 +1,37 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Tuan Hoang <tmhoang@linux.ibm.com>
 pkgname=s390-tools
-pkgver=2.12.0
-pkgrel=0
+pkgver=2.23.0
+pkgrel=2
 pkgdesc="Tools for use with the s390 Linux kernel and device drivers"
 url="https://github.com/ibm-s390-tools/s390-tools"
 arch="s390x"
 license="MIT"
+options="!check" # No test suite
 depends="bash"
-makedepends="$depends_dev linux-headers libexecinfo-dev zlib-dev fuse-dev ncurses-dev openssl-dev cryptsetup-dev json-c-dev"
+makedepends="linux-headers zlib-dev fuse3-dev ncurses-dev openssl-dev>3 libxml2-dev
+	cryptsetup-dev json-c-dev net-snmp-dev curl-dev liblockfile-dev"
 triggers="$pkgname.trigger=/boot"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-dbg"
 source="$pkgname-$pkgver.tar.gz::https://github.com/ibm-s390-tools/s390-tools/archive/v$pkgver.tar.gz
 	0002-musl-fixes.patch
 	0004-missing-time-header.patch
 	0006-define-path-mounted.patch
 	0007-tunedasd-no-need-error-h.patch
 	0008-iucvterm-no-nls.patch
-	0009-link-libexecinfo.patch
 	0010-musl-s390x-signal-def.patch
 
-	0101-zipl-dont-optimize-size.patch
-
 	0200-dasdinfo-gnu-ext-hack.patch
 	0300-disable-program-using-gnu-ext.patch
+	0400-busybox-compat.patch
+	0500-remove-lib64.patch
 	bash.patch
 	argz.patch
+	iucvterm-gettext.patch
+	no-execinfo.patch
+	zipl-disable-fortify-source.patch
+	osasnmpd-Fix-missing-semicolon.patch
+	lfs64.patch
 
 	argz.c
 	argz.h
@@ -38,33 +44,46 @@ build() {
 	cp "$srcdir"/argz.h "$builddir"/include/argz.h
 	cp "$srcdir"/argz.c "$builddir"/libargz/argz.c
 	cp "$srcdir"/Makefile.argz "$builddir"/libargz/Makefile
-	make -j1 V=1 CFLAGS="$CFLAGS -D_GNU_SOURCE" \
-		HAVE_SNMP=0 \
+	make V=1 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" \
+		HAVE_GLIB=0 \
+		HAVE_GLIB2=0 \
 		HAVE_PFM=0 \
-		DISTRELEASE="Alpine" \
-		LIBEXECINFO_LIBS="-lexecinfo"
+		HAVE_LIBUDEV=0 \
+		DISTRELEASE="Alpine"
 	gcc -Wall -o mk-s390-cdboot "$srcdir"/mk-s390-cdboot.c
 }
 
 package() {
-	make HAVE_SNMP=0 HAVE_PFM=0 DESTDIR="$pkgdir" DISTRELEASE="Alpine" install
+	make DESTDIR="$pkgdir" DISTRELEASE="Alpine" \
+		HAVE_GLIB=0 \
+		HAVE_GLIB2=0 \
+		HAVE_PFM=0 \
+		HAVE_LIBUDEV=0 \
+		install
 	install -Dm755 mk-s390-cdboot "$pkgdir"/sbin/mk-s390-cdboot
 }
 
-sha512sums="4903ded5368966513e1090faca04482316870cf5fc53206d17ab98b821541e2836a016bd18cd1ca49ed6b5df0dff92dd1ed257ff712920a7aa3fd74e4a6bc6a0  s390-tools-2.12.0.tar.gz
-32ef9d80a1385df3dca9c749cd0fc15c112ab662b736cef271ed70cbdaa7c8b66c41995b42f350377860a5de754bf8721cb27dc095c2e1293cfe7f5e434ef182  0002-musl-fixes.patch
+sha512sums="
+839ea737db0bbfb2c726c757867e5d38b771282aa3484b90c3cc6376efa6c564874fe62879dccc8c5547a768e29aa5389ecf20d244574c5479887504addaee3b  s390-tools-2.23.0.tar.gz
+ca1ba0f4c76c1441589138fafbd9f6fc2423cc086301fcb18eb9f47f7884c279cf73cc9e74f4cde305775bd6fa5bf2f9450385ad02b5a20671e59c604823efb5  0002-musl-fixes.patch
 6e0f8d999eef08677e9f80d1a07e01556474723b9b00435d463428eee22babe4489257ad5c8fffb650bd0fd5714cdac01dc926e1402f9741fc1327d177ece897  0004-missing-time-header.patch
 e41548d83d53e4371afcee3601505520506d05b932aeb91f1ca86e589c010fa5d22777d4617c1e25adfc04fbcf45289cf65a8100108c878323e125e312579220  0006-define-path-mounted.patch
 ecfbba213d2a705e2a5a2697090f659670ca1a12e4568c1de87f17d11d72a1a6c524b23b4db25c0558b4e8239c27afddb94d8887d93170b359d77985018f9b9c  0007-tunedasd-no-need-error-h.patch
 bdbeb6f3873ede82487c7e4fcac84aa2bf8a922991ec32d029a64cd7142625f5a99920db0f1b6935805d7371ae5a7640c5ea577969937dd96c4f4f996b909ac3  0008-iucvterm-no-nls.patch
-798ae2128a2e419a2e76f3198ac7563e84470069571beffd673b9cfc1755f432afaa32d730fd1c43db890009f37bc11a7a00af6e7e6b41ea7ffd789469eaef25  0009-link-libexecinfo.patch
 f785a899583de8592422e5e46c4e4893196e3c7885e4a0bb4c717c3587db8c1a4c264c80337b1d0c31b39150f3c3b71b876fe156086ace3a542c12678ae7c85e  0010-musl-s390x-signal-def.patch
-f8565253e87e717ea943101b3d270109260099481764ba7905a72c2c5817885a7071ce656ff59a697d075dd4c0b2eb8d02f6aeeb2cb98e47ac1f27d08b109137  0101-zipl-dont-optimize-size.patch
 f5e06e28f77c44f591d74f383ce308a6bfb129b00b291601f2be8866dd1382c597348794be2109c9dc0fa8fdbbee509d036fa6c215e73c4c99f476d3c1cb5a83  0200-dasdinfo-gnu-ext-hack.patch
-78ec9fa561f039ea44c2efb9ce7ad396746f1c2889165836342a0584266fc514599aff9f8ace7ac420d62de3543d09d2082bcdccaebb616ba4928b847d7466ab  0300-disable-program-using-gnu-ext.patch
-0c4b8da70b6e64ff2da56cda6e89c95654b4c9c75376e9a5165c1083c832e85386f70990539c6ab101ed64fe30bf94ae4709aabf967fdd773b0b6b19b8c4aee8  bash.patch
-96e204ffde62e6c9e43a9d7d5e4120054fa9ae8cd8a94e7ea02569228115d2e8c903faf9db093bf9a2341089e0384c4155fcf0fd8d6e8030bff3f5c28ca9884c  argz.patch
+89ca081aabb5d0f8868ce171cf27265f127585dc57f9950b3ee24d31c1a9a0c25026da77724dc96be8d579768625fee9b2b1214647355dffb49e338dfce18092  0300-disable-program-using-gnu-ext.patch
+6d07d0c1f380da42f092038a1434dc1934dead821d6f7c3f8a9e2e85c38e477cf2e34a98d33ac515b67bb0202ca5a469c059d59678c19d9e9bd01456518608e1  0400-busybox-compat.patch
+63853e3fbd07b17884509d949fd0386956fc05f17d85ecf70a00a2828b1624b96d41e0957cf5aa000d1fc276408dc50c586c9468d56111d9397db392282bbaec  0500-remove-lib64.patch
+3577c2e0715a5553f5061354b3ff9d9ab2e52712b140fb24a84471c3d3e0d47acf74e00d4f05d7a94aa82942cf84f8ae0b30ac15dfe32d10ff2d24a7a7c0c41f  bash.patch
+5bc7b2b51bd298d0942ff2f96bb9e30d258100ce87b48285fd4dfeb24448f33a3c679789187d4355c487e64057d7f49a44c0d934bb5f427d18fd625e55de5b0c  argz.patch
+c3746ea9e5c638a7adc51bfd8ffebc34f2be45d8d816e9f5711ba8f238fe028f711c91c6732a08a8088e32261f769e2e41a079997295e146082212b8fa84a246  iucvterm-gettext.patch
+797ea51f24b2bb0ff0e14a5626d8b13d5ed93f083f7c3366d2e7b6be7102fc5f092c241686e6f5738ee0096d389e0d1490ebc87402541cba83b92c8059cacbdc  no-execinfo.patch
+bb4925d3ad1c128af5f7072b94228a2efa4bd2a227dd2de6badec6b5d846b1fbf116228f8f514f3c5d86b1b51597d9bc2c47149d723e3b1944ceed6c5fe7fd60  zipl-disable-fortify-source.patch
+6563c53138d9a1a385a947bede29661c1c862d05102ee271cfda7270333e737444c2c576af99fa567a75b8659b03193bb0a437b0910d0476c6b6dbe4554e7fcf  osasnmpd-Fix-missing-semicolon.patch
+ab1bc0273fdd529fe4dcf20d3d8760d30702d670bbef1f173951d12fe2a62344c8b81209296c103c2ae06c62b2a771121eb41e2d88c08b6a0e19027f9b23a947  lfs64.patch
 2e573314d4c4ed90b61da28de22ae8e2f68ced5489f7e5e0b30f51b776efaf40c1f781d3b485418572d8f33a169fa6946b7358cbd4a7de5a3724b20ed622262b  argz.c
 50bd5c0f555963dadbfaa72df5bf0801a48743d6d0feddb6ebfa4ffa410196216c1860d3a577361e035169fea4217aef3f04d69394c59db65b60c5ea29eba8cb  argz.h
 5e19ccfce59a2a79863db676b0ea4280cb9016cda1a30dc233526f52425c305410dd148453b75c2613acac37e364305ee25f8e545d57c5059cca19a13bac2a5e  Makefile.argz
-349eb06895016d16194819c4a04f604720f1373ea61a9bc4c58467281c9a2ed3539bd4e8b6984f4e5177630dbe8b928aa95912c9a3e3b0e1fe275d59f9fe573d  mk-s390-cdboot.c"
+349eb06895016d16194819c4a04f604720f1373ea61a9bc4c58467281c9a2ed3539bd4e8b6984f4e5177630dbe8b928aa95912c9a3e3b0e1fe275d59f9fe573d  mk-s390-cdboot.c
+"
diff --git a/main/s390-tools/argz.patch b/main/s390-tools/argz.patch
index 25484742d08..c2d13fcb68d 100644
--- a/main/s390-tools/argz.patch
+++ b/main/s390-tools/argz.patch
@@ -1,21 +1,21 @@
 diff --git a/Makefile b/Makefile
-index 6081acc..fe8dd2f 100644
+index 31c4065..95dce2d 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -3,7 +3,7 @@ ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/ar
- # Include common definitions
- include common.mak
- 
--LIB_DIRS = libvtoc libutil libzds libdasd libvmdump libccw libvmcp
-+LIB_DIRS = libargz libvtoc libutil libzds libdasd libvmdump libccw libvmcp
+@@ -8,7 +8,7 @@ include common.mak
+ # LIBS: Libraries that can have a dependency to base libraries
+ # TOOLS: Tools that can have a dependency to base libraries or libraries
+ #
+-BASELIB_DIRS = libutil libseckey
++BASELIB_DIRS = libargz libutil libseckey
+ LIB_DIRS = libvtoc libzds libdasd libvmdump libccw libvmcp libekmfweb \
+	   libkmipclient libcpumf
  TOOL_DIRS = zipl zdump fdasd dasdfmt dasdview tunedasd \
- 	   tape390 osasnmpd qetharp ip_watcher qethconf scripts zconf \
- 	   vmconvert vmcp man mon_tools dasdinfo vmur ipl_tools \
 diff --git a/common.mak b/common.mak
 index 0a5fd69..c6f429c 100644
 --- a/common.mak
 +++ b/common.mak
-@@ -312,6 +312,10 @@ endif
+@@ -329,6 +329,10 @@ endif
  # check the library directory via "make -C" when the tools Makefile is
  # processed.
  
@@ -96,29 +96,50 @@ diff --git a/zkey/Makefile b/zkey/Makefile
 index a44b14b..48c02fb 100644
 --- a/zkey/Makefile
 +++ b/zkey/Makefile
-@@ -22,7 +22,7 @@
+@@ -32,7 +32,7 @@
  	INSTALL_TARGETS += zkey-cryptsetup-skip-cryptsetup2
  endif
  
 -libs = $(rootdir)/libutil/libutil.a
 +libs = $(rootdir)/libutil/libutil.a $(rootdir)/libargz/libargz.a
  
- detect-libcryptsetup.dep:
- 	echo "#include <libcryptsetup.h>" > detect-libcryptsetup.dep
-@@ -72,11 +72,11 @@
- keystore.o: keystore.c keystore.h properties.h pkey.h cca.h utils.h
- zkey-cryptsetup.o: check-dep-zkey-cryptsetup zkey-cryptsetup.c pkey.h cca.h misc.h
+ CFLAGS += -DKMS_PLUGIN_LOCATION=\"$(ZKEYKMSPLUGINDIR)\"
+
+@@ -90,11 +90,11 @@
+ 			ep11.h misc.h utils.h
+ kms.o: kms.c kms.h kms-plugin.h utils.h pkey.h
  
 -zkey: LDLIBS = -ldl -lcrypto
 +zkey: LDLIBS = -ldl -lcrypto $(LIBEXECINFO_LIBS)
- zkey: zkey.o pkey.o cca.o properties.o keystore.o utils.o $(libs)
+ zkey: zkey.o pkey.o cca.o ep11.o properties.o keystore.o utils.o kms.o $(libs)
  	$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
  
--zkey-cryptsetup: LDLIBS = -ldl -lcryptsetup -ljson-c
-+zkey-cryptsetup: LDLIBS = -ldl -lcryptsetup -ljson-c $(LIBEXECINFO_LIBS)
- zkey-cryptsetup: zkey-cryptsetup.o pkey.o cca.o utils.o $(libs)
+-zkey-cryptsetup: LDLIBS = -ldl -lcryptsetup -ljson-c -lcrypto
++zkey-cryptsetup: LDLIBS = -ldl -lcryptsetup -ljson-c -lcrypto $(LIBEXECINFO_LIBS)
+ zkey-cryptsetup: zkey-cryptsetup.o pkey.o cca.o ep11.o utils.o $(libs)
  	$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
  
+--- a/zkey/ekmfweb/Makefile
++++ b/zkey/ekmfweb/Makefile
+@@ -5,7 +5,7 @@ VERM = $(shell echo $(VERSION) | cut -d
+ 
+ all: zkey-ekmfweb.so
+ 
+-libs = $(rootdir)/libutil/libutil.a
++libs = $(rootdir)/libutil/libutil.a $(rootdir)/libargz/libargz.a
+ 
+ zkey-ekmfweb.o: zkey-ekmfweb.c zkey-ekmfweb.h ../kms-plugin.h \
+ 	../cca.h ../utils.h ../pkey.h ../properties.h \
+@@ -27,7 +27,8 @@ utils.o: ../utils.c ../utils.h ../pkey.h
+ 	$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -fPIC -c $< -o $@
+ 
+ zkey-ekmfweb.so: ALL_CFLAGS += -fPIC
+-zkey-ekmfweb.so: LDLIBS = -L$(rootdir)/libekmfweb -lekmfweb -ldl -lcrypto
++zkey-ekmfweb.so: LDLIBS = -L$(rootdir)/libekmfweb -lekmfweb -ldl -lcrypto \
++	$(LIBEXECINFO_LIBS)
+ zkey-ekmfweb.so: ALL_LDFLAGS += -shared -Wl,--version-script=zkey-ekmfweb.map \
+ 	-Wl,-z,defs,-Bsymbolic -Wl,-soname,zkey-ekmfweb.so.$(VERM)
+ zkey-ekmfweb.so: zkey-ekmfweb.o properties.o pkey.o cca.o ep11.o utils.o $(libs)
 diff --git a/zkey/keystore.c b/zkey/keystore.c
 index 9dcac07..2f87798 100644
 --- a/zkey/keystore.c
@@ -132,14 +153,36 @@ index 9dcac07..2f87798 100644
  #include "lib/util_base.h"
  #include "lib/util_libc.h"
 diff --git a/libutil/Makefile b/libutil/Makefile
-index ca90f2a..3042f3d 100644
+index 508df5b..647bbbe 100644
 --- a/libutil/Makefile
 +++ b/libutil/Makefile
 @@ -1,6 +1,6 @@
  include ../common.mak
  
--lib = libutil.a
-+lib = libutil.a $(rootdir)/libargz/libargz.a
- 
- examples =	util_base_example \
- 		util_panic_example \
+-lib := libutil.a
++lib := libutil.a $(rootdir)/libargz/libargz.a
+ 
+ sources := $(filter-out %_example.c,$(wildcard *.c))
+ objects := $(patsubst %.c,%.o,$(sources))
+diff --git a/zkey/kmip/Makefile b/zkey/kmip/Makefile
+index 14a532e..597c851 100644
+--- a/zkey/kmip/Makefile
++++ b/zkey/kmip/Makefile
+@@ -5,7 +5,7 @@ VERM = $(shell echo $(VERSION) | cut -d '.' -f 1)
+ 
+ all: zkey-kmip.so
+ 
+-libs = $(rootdir)/libutil/libutil.a $(rootdir)/libseckey/libseckey.a
++libs = $(rootdir)/libutil/libutil.a $(rootdir)/libargz/libargz.a $(rootdir)/libseckey/libseckey.a
+ 
+ zkey-kmip.o: zkey-kmip.c zkey-kmip.h ../kms-plugin.h ../plugin-utils.h \
+ 	../cca.h ../utils.h ../pkey.h ../properties.h \
+@@ -31,7 +31,7 @@ utils.o: ../utils.c ../utils.h ../pkey.h ../cca.h ../ep11.h ../kms-plugin.h
+ 	$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -fPIC -c $< -o $@
+ 
+ zkey-kmip.so: ALL_CFLAGS += -fPIC
+-zkey-kmip.so: LDLIBS = -L$(rootdir)/libkmipclient -lkmipclient -ldl -lcrypto
++zkey-kmip.so: LDLIBS = -L$(rootdir)/libkmipclient -lkmipclient -ldl -lcrypto $(LIBEXECINFO_LIBS)
+ zkey-kmip.so: ALL_LDFLAGS += -shared -Wl,--version-script=zkey-kmip.map \
+ 	-Wl,-z,defs,-Bsymbolic -Wl,-soname,zkey-kmip.so.$(VERM)
+ zkey-kmip.so: zkey-kmip.o plugin-utils.o properties.o pkey.o cca.o ep11.o \
diff --git a/main/s390-tools/bash.patch b/main/s390-tools/bash.patch
index bf067f920b1..4affeb4f97e 100644
--- a/main/s390-tools/bash.patch
+++ b/main/s390-tools/bash.patch
@@ -1,16 +1,3 @@
-diff --git a/scripts/dbginfo.sh b/scripts/dbginfo.sh
-index bac62f0..3bed72a 100755
---- a/scripts/dbginfo.sh
-+++ b/scripts/dbginfo.sh
-@@ -1194,7 +1194,7 @@ exec 8>&1 9>&2 >"${LOGFILE}" 2>&1
- trap emergency_exit SIGHUP SIGINT SIGTERM
- 
- pr_log_stdout ""
--pr_log_stdout "Hardware platform     = $(uname -i)"
-+pr_log_stdout "Hardware platform     = $(uname -m)"
- pr_log_stdout "Kernel version        = ${KERNEL_VERSION}.${KERNEL_MAJOR_REVISION}.${KERNEL_MINOR_REVISION} ($(uname -r 2>/dev/null))"
- pr_log_stdout "Runtime environment   = ${RUNTIME_ENVIRONMENT}"
- pr_log_stdout ""
 diff --git a/zconf/chccwdev b/zconf/chccwdev
 index b1140c0..2c3ca6a 100755
 --- a/zconf/chccwdev
diff --git a/main/s390-tools/iucvterm-gettext.patch b/main/s390-tools/iucvterm-gettext.patch
new file mode 100644
index 00000000000..9d8ded6e842
--- /dev/null
+++ b/main/s390-tools/iucvterm-gettext.patch
@@ -0,0 +1,11 @@
+--- s390-tools-2.16.0.orig/iucvterm/Makefile
++++ s390-tools-2.16.0/iucvterm/Makefile
+@@ -7,7 +7,7 @@
+ export GETTEXT_TEXTDOMAIN
+ 
+ 
+-SUBDIRS = src po doc bin etc test
++SUBDIRS = src doc bin etc test
+ RECURSIVE_TARGETS = all-recursive install-recursive clean-recursive \
+                     check-recursive
+ 
diff --git a/main/s390-tools/lfs64.patch b/main/s390-tools/lfs64.patch
new file mode 100644
index 00000000000..ec15af585d4
--- /dev/null
+++ b/main/s390-tools/lfs64.patch
@@ -0,0 +1,43 @@
+diff --git a/dasdview/dasdview.c b/dasdview/dasdview.c
+index 92a30ea..8c999af 100644
+--- a/dasdview/dasdview.c
++++ b/dasdview/dasdview.c
+@@ -1865,7 +1865,7 @@ static void dasdview_view_standard(dasdview_info_t *info)
+ 
+ 	/* seek in SEEK_STEP steps */
+ 	for (i = 1; i <= j; i++) {
+-		rc = lseek64(fd, SEEK_STEP, SEEK_CUR);
++		rc = lseek(fd, SEEK_STEP, SEEK_CUR);
+ 		if (rc == -1) {
+ 			printf("*** rc: %d (%d) ***\n", rc, errno);
+ 			printf("*** j: %llu ***\n", j);
+diff --git a/zipl/src/zipl-editenv.c b/zipl/src/zipl-editenv.c
+index a55e9df..2d62824 100644
+--- a/zipl/src/zipl-editenv.c
++++ b/zipl/src/zipl-editenv.c
+@@ -128,7 +128,7 @@ static int envblk_update(struct zipl_envblk *zeb)
+ 	if (fs_map(zeb->fd, zeb->offset, &blknr, zeb->size) != 0)
+ 		goto error_close;
+ 
+-	if (lseek64(dev_fd, blknr * (uint64_t)zeb->size, SEEK_SET) < 0) {
++	if (lseek(dev_fd, blknr * (off_t)zeb->size, SEEK_SET) < 0) {
+ 		error_reason(strerror(errno));
+ 		goto error_close;
+ 	}
+diff --git a/zkey/zkey-cryptsetup.c b/zkey/zkey-cryptsetup.c
+index fae78c7..3238b69 100644
+--- a/zkey/zkey-cryptsetup.c
++++ b/zkey/zkey-cryptsetup.c
+@@ -490,10 +490,10 @@ static int keyfile_seek(int fd, size_t bytes)
+ {
+ 	size_t next_read;
+ 	ssize_t bytes_r;
+-	off64_t r;
++	off_t r;
+ 	char *tmp;
+ 
+-	r = lseek64(fd, bytes, SEEK_CUR);
++	r = lseek(fd, bytes, SEEK_CUR);
+ 	if (r > 0)
+ 		return 0;
+ 	if (r < 0 && errno != ESPIPE)
diff --git a/main/s390-tools/no-execinfo.patch b/main/s390-tools/no-execinfo.patch
new file mode 100644
index 00000000000..ba2f0c2fb05
--- /dev/null
+++ b/main/s390-tools/no-execinfo.patch
@@ -0,0 +1,56 @@
+diff --git a/libutil/util_panic.c b/libutil/util_panic.c
+index 59a9a9e..cc21e3d 100644
+--- a/libutil/util_panic.c
++++ b/libutil/util_panic.c
+@@ -9,7 +9,6 @@
+  * it under the terms of the MIT license. See LICENSE for details.
+  */
+ 
+-#include <execinfo.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -26,6 +25,7 @@
+  */
+ static void print_backtrace(void)
+ {
++	#if 0
+ 	void *array[256];
+ 	size_t i, size;
+ 	char **strings;
+@@ -41,6 +41,7 @@ static void print_backtrace(void)
+ 		fprintf(stderr, "  %s\n", strings[i]);
+ 
+ 	free(strings);
++	#endif
+ }
+ 
+ /*
+diff --git a/zdev/src/misc.c b/zdev/src/misc.c
+index 2f5cbc2..08a2524 100644
+--- a/zdev/src/misc.c
++++ b/zdev/src/misc.c
+@@ -10,7 +10,6 @@
+ #include <ctype.h>
+ #include <dirent.h>
+ #include <errno.h>
+-#include <execinfo.h>
+ #include <limits.h>
+ #include <signal.h>
+ #include <stdarg.h>
+@@ -1258,6 +1257,7 @@ void line_free(int argc, char **argv)
+ /* Used for debugging. */
+ void print_trace(void)
+ {
++	#if 0
+ 	void *bt[BACKTRACE_MAX];
+ 	char **bt_sym;
+ 	int num, i;
+@@ -1268,6 +1268,7 @@ void print_trace(void)
+ 	for (i = 0; i < num; i++)
+ 		fprintf(stderr, "DEBUG:  %s\n", bt_sym[i]);
+ 	free(bt_sym);
++	#endif
+ }
+ 
+ /* Return a textual representation of @config. */
diff --git a/main/s390-tools/osasnmpd-Fix-missing-semicolon.patch b/main/s390-tools/osasnmpd-Fix-missing-semicolon.patch
new file mode 100644
index 00000000000..5d595fadce9
--- /dev/null
+++ b/main/s390-tools/osasnmpd-Fix-missing-semicolon.patch
@@ -0,0 +1,32 @@
+From c62f9306347f6d27a9130547693e1e456ac64a72 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
+Date: Fri, 1 Sep 2023 09:31:39 +0200
+Subject: [PATCH] osasnmpd: Fix missing semicolon
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+5.9.4 net-snmp started to require semicolon on the config_require there
+are no docs covering this change.
+
+Link: https://bugzilla.redhat.com/show_bug.cgi?id=2235734
+Closes: https://github.com/ibm-s390-linux/s390-tools/pull/155
+Signed-off-by: Jakub Čajka <jcajka@redhat.com>
+Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
+---
+ osasnmpd/ibmOSAMib.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/osasnmpd/ibmOSAMib.h b/osasnmpd/ibmOSAMib.h
+index 6dc2345d5..2b20684b0 100644
+--- a/osasnmpd/ibmOSAMib.h
++++ b/osasnmpd/ibmOSAMib.h
+@@ -16,7 +16,7 @@
+ 
+ /* we may use header_generic and header_simple_table from the util_funcs module */
+ 
+-config_require(util_funcs)
++config_require(util_funcs);
+ 
+ 
+ /* function prototypes */
diff --git a/main/s390-tools/zipl-disable-fortify-source.patch b/main/s390-tools/zipl-disable-fortify-source.patch
new file mode 100644
index 00000000000..dda888a8473
--- /dev/null
+++ b/main/s390-tools/zipl-disable-fortify-source.patch
@@ -0,0 +1,13 @@
+diff --git a/zipl/src/Makefile b/zipl/src/Makefile
+index 786bb7f..2a1e10a 100644
+--- a/zipl/src/Makefile
++++ b/zipl/src/Makefile
+@@ -4,7 +4,7 @@ include ../../common.mak
+ ALL_CPPFLAGS += -I../include -I../boot \
+ 	    -DZFCPDUMP_IMAGE="STRINGIFY($(ZFCPDUMP_DIR)/$(ZFCPDUMP_IMAGE))" \
+ 	    -DZFCPDUMP_INITRD="STRINGIFY($(ZFCPDUMP_DIR)/$(ZFCPDUMP_INITRD))" \
+-	    -D_FILE_OFFSET_BITS=64 $(NO_PIE_CFLAGS)
++	    -D_FILE_OFFSET_BITS=64 -U_FORTIFY_SOURCE $(NO_PIE_CFLAGS)
+ ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
+ 
+ libs = $(rootdir)/libutil/libutil.a
diff --git a/main/s6-dns/APKBUILD b/main/s6-dns/APKBUILD
index 626b9e7c54e..c4b187426b5 100644
--- a/main/s6-dns/APKBUILD
+++ b/main/s6-dns/APKBUILD
@@ -1,17 +1,21 @@
-# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 # Contributor: John Regan <john@jrjrtech.com>
+# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 pkgname=s6-dns
-pkgver=2.3.2.0
+pkgver=2.3.7.1
 pkgrel=0
 pkgdesc="skarnet.org's DNS client libraries and command-line DNS client utilities"
-url="http://skarnet.org/software/$pkgname/"
+url=https://skarnet.org/software/s6-dns/
 arch="all"
 license="ISC"
-depends="skalibs"
 options="!check"
-makedepends="skalibs-dev"
+makedepends="skalibs-dev>=2.14"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="http://skarnet.org/software/s6-dns/s6-dns-$pkgver.tar.gz"
+source="https://skarnet.org/software/s6-dns/s6-dns-$pkgver.tar.gz s6-dns.pc"
+
+prepare() {
+	default_prepare
+	sed -i -e "s/@@VERSION@@/$pkgver/g" -- "$srcdir"/*.pc
+}
 
 build() {
 	./configure \
@@ -27,6 +31,7 @@ build() {
 
 package() {
 	make DESTDIR="$pkgdir" install
+	install -D -m644 "$srcdir/s6-dns.pc" "$pkgdir/usr/lib/pkgconfig/s6-dns.pc"
 }
 
 doc() {
@@ -40,4 +45,7 @@ static() {
 	rmdir -p "$pkgdir"/usr/lib/"$pkgname" || :
 }
 
-sha512sums="c4b833a944e6c99f52283d7c27c4a4937995b99afb1e9a9d601bb20efec7b23e05fb8500b1653c3a1c045811087acd0bc800cebfdd2fb60c6eba2fd85cfd580d  s6-dns-2.3.2.0.tar.gz"
+sha512sums="
+9dabee86d9a27fb0e4a3c10563694bb5734c08c4d730a69daec17dad140274aa104bd6edbd501261c7a7c7bcee505f79134b7119457d5fbedcbb2be6b352ebb0  s6-dns-2.3.7.1.tar.gz
+2b285cf8691ad30e8ada115d2ee81b4d356eda042b0ab18cf3006069707963bedc922c9f3bf2051c11e4abc30abed2932fd6c3f1f8d4e0d54bf11e30c3741090  s6-dns.pc
+"
diff --git a/main/s6-dns/s6-dns.pc b/main/s6-dns/s6-dns.pc
new file mode 100644
index 00000000000..3f3ace8a825
--- /dev/null
+++ b/main/s6-dns/s6-dns.pc
@@ -0,0 +1,7 @@
+Name: s6-dns
+Description: DNS clients and libraries from skarnet.org
+URL: https://skarnet.org/software/s6-dns/
+Version: @@VERSION@@
+Requires.private: skalibs
+Libs: -ls6dns
+Cflags: -I/usr/include/s6-dns
diff --git a/main/s6-linux-init/APKBUILD b/main/s6-linux-init/APKBUILD
index dac1fcdb79e..bde97b69b74 100644
--- a/main/s6-linux-init/APKBUILD
+++ b/main/s6-linux-init/APKBUILD
@@ -1,16 +1,16 @@
-# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 # Contributor: Laurent Bercot <ska-devel@skarnet.org>
+# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 pkgname=s6-linux-init
-pkgver=1.0.4.0
+pkgver=1.1.2.0
 pkgrel=0
 pkgdesc="Set of tools to create and run an s6-based init system"
-url="http://skarnet.org/software/$pkgname/"
+url=https://skarnet.org/software/s6-linux-init/
 arch="all"
 license="ISC"
 options="!check"
-makedepends="skalibs-dev execline-dev s6-dev linux-headers"
+makedepends="skalibs-dev>=2.14 execline-dev s6-dev>=2.12 linux-headers"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="http://skarnet.org/software/s6-linux-init/s6-linux-init-$pkgver.tar.gz"
+source="https://skarnet.org/software/s6-linux-init/s6-linux-init-$pkgver.tar.gz"
 
 build() {
 	./configure \
@@ -33,4 +33,6 @@ doc() {
 	cp -a "$builddir"/doc "$subpkgdir"/usr/share/doc/$pkgname
 }
 
-sha512sums="791e376911c9217adace72c6048a295d4b486fc51c0a73578a40a0b020a735d9444f58e5f49d613e99a81aadd63d016ae60c8b056c49c1b50693a7b054890926  s6-linux-init-1.0.4.0.tar.gz"
+sha512sums="
+76376c4d407e665f67f733f1366dbacca58d268ebdbe22a9147cb102d519bd4c5887a345f66db2005d29ed9a841cb5a388c73c7d8df00d984cc4a25b9a813786  s6-linux-init-1.1.2.0.tar.gz
+"
diff --git a/main/s6-linux-utils/APKBUILD b/main/s6-linux-utils/APKBUILD
index c3e7e4f5f28..4e633b6bc03 100644
--- a/main/s6-linux-utils/APKBUILD
+++ b/main/s6-linux-utils/APKBUILD
@@ -1,16 +1,16 @@
-# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 # Contributor: Christian Kampka <christian@kampka.net>
+# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 pkgname=s6-linux-utils
-pkgver=2.5.1.2
-pkgrel=0
+pkgver=2.6.2.0
+pkgrel=3
 pkgdesc="A set of tiny Linux-specific utilities optimized for simplicity and small size."
-url="http://skarnet.org/software/$pkgname/"
+url=https://skarnet.org/software/s6-linux-utils/
 arch="all"
 license="ISC"
 options="!check"
-makedepends="skalibs-dev linux-headers"
+makedepends="skalibs-dev>=2.14 linux-headers"
 subpackages="$pkgname-doc"
-source="http://skarnet.org/software/s6-linux-utils/s6-linux-utils-$pkgver.tar.gz"
+source="https://skarnet.org/software/s6-linux-utils/s6-linux-utils-$pkgver.tar.gz"
 
 build() {
 	./configure \
@@ -18,12 +18,15 @@ build() {
 		--enable-static \
 		--disable-allstatic \
 		--prefix=/usr \
-		--libdir=/usr/lib
+		--libdir=/usr/lib \
+		--enable-multicall
 	make
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
+	rm "$pkgdir"/usr/include/s6-linux-utils/config.h
+	rmdir -p "$pkgdir"/usr/include/s6-linux-utils || :
 }
 
 doc() {
@@ -32,4 +35,6 @@ doc() {
 	cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
-sha512sums="4557148c3e739471a8846d3e0425da826d77ab3b7fc8d6c777d110152343596d17fde37fddcb099b107663138a5447866c3ff00a05f59d034379d26b1e147331  s6-linux-utils-2.5.1.2.tar.gz"
+sha512sums="
+b7bc96ef3aa81bc01c6ca2a82591201be0966d8aa2b71545c963f67dba8441a05631e0ea593f0a693ee04d6d2637754e9543eddbfe70ed9c0529ff49081aa54d  s6-linux-utils-2.6.2.0.tar.gz
+"
diff --git a/main/s6-networking/APKBUILD b/main/s6-networking/APKBUILD
index c58af36c0d0..673fccd4954 100644
--- a/main/s6-networking/APKBUILD
+++ b/main/s6-networking/APKBUILD
@@ -1,16 +1,16 @@
-# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 # Contributor: John Regan <john@jrjrtech.com>
+# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 pkgname=s6-networking
-pkgver=2.3.1.2
+pkgver=2.7.0.2
 pkgrel=0
-pkgdesc="skarnet.org's UCSPI Unix and TCP tools, access control tools, and network time management utilities."
-url="http://skarnet.org/software/$pkgname/"
+pkgdesc="skarnet.org's UCSPI TCP and TLS tools, access control tools, and network time management utilities."
+url=https://skarnet.org/software/s6-networking/
 arch="all"
 license="ISC"
 options="!check"
-makedepends="skalibs-dev execline-dev s6-dev s6-dns-dev bearssl bearssl-dev"
+makedepends="skalibs-dev>=2.14 execline-dev s6-dev>=2.12 s6-dns-dev bearssl bearssl-dev"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="http://skarnet.org/software/s6-networking/s6-networking-$pkgver.tar.gz"
+source="https://skarnet.org/software/s6-networking/s6-networking-$pkgver.tar.gz"
 
 build() {
 	./configure \
@@ -40,4 +40,6 @@ static() {
 	rmdir -p "$pkgdir"/usr/lib/"$pkgname" || :
 }
 
-sha512sums="292bba150fcf4567073690411caebb66b407dbac20dfcc07f8a79d55962ef07f1fcfcf25bac21734605bc171e22805812788b0c12ec01e79f320eef782479d1c  s6-networking-2.3.1.2.tar.gz"
+sha512sums="
+49f80c68d639f2b7ac7451ca2ace828ca4e8c1eeffec4a9b31f8157c26a87228275ea14d8b6495b0af0879a961b37910aa2b769d8db56d8731d0827c96053631  s6-networking-2.7.0.2.tar.gz
+"
diff --git a/main/s6-portable-utils/APKBUILD b/main/s6-portable-utils/APKBUILD
index 3f62491ec53..9803924b03d 100644
--- a/main/s6-portable-utils/APKBUILD
+++ b/main/s6-portable-utils/APKBUILD
@@ -1,16 +1,16 @@
-# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 # Contributor: John Regan <john@jrjrtech.com>
+# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 pkgname=s6-portable-utils
-pkgver=2.2.2.2
-pkgrel=0
+pkgver=2.3.0.3
+pkgrel=1
 pkgdesc="skarnet.org's tiny portable generic utilities"
-url="http://skarnet.org/software/$pkgname/"
+url=https://skarnet.org/software/s6-portable-utils/
 arch="all"
 license="ISC"
-makedepends="skalibs-dev"
+makedepends="skalibs-dev>=2.14"
 options="!check"
 subpackages="$pkgname-doc"
-source="http://skarnet.org/software/s6-portable-utils/s6-portable-utils-$pkgver.tar.gz"
+source="https://skarnet.org/software/s6-portable-utils/s6-portable-utils-$pkgver.tar.gz"
 
 build() {
 	./configure \
@@ -18,12 +18,15 @@ build() {
 		--enable-static \
 		--disable-allstatic \
 		--prefix=/usr \
-		--libdir=/usr/lib
+		--libdir=/usr/lib \
+		--enable-multicall
 	make
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
+	rm "$pkgdir"/usr/include/s6-portable-utils/config.h
+	rmdir -p "$pkgdir"/usr/include/s6-portable-utils || :
 }
 
 doc() {
@@ -32,4 +35,6 @@ doc() {
 	cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
-sha512sums="ed7df36757780201ccfc0c35a4ab1f6eab16f9fd8a23a6c739a469b9b82862dbb60823748e82c4c902fac835a801f3f0ab0f3d90f20628d6ac8bf744a4fb44a2  s6-portable-utils-2.2.2.2.tar.gz"
+sha512sums="
+f75242ac6c06ffd5bd66b8a35bbdf39938cf3bfa6e79abd214af37e9e4acc732ca1760566862482bc964a5cca05bbce8bd24d7167b02dc66c5f397c85ee0d37f  s6-portable-utils-2.3.0.3.tar.gz
+"
diff --git a/main/s6-rc/APKBUILD b/main/s6-rc/APKBUILD
index fcbee18b246..28efb4c0d02 100644
--- a/main/s6-rc/APKBUILD
+++ b/main/s6-rc/APKBUILD
@@ -1,16 +1,16 @@
-# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 # Contributor: Eivind Uggedal <eu@eju.no>
+# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 pkgname=s6-rc
-pkgver=0.5.1.2
+pkgver=0.5.4.2
 pkgrel=0
-pkgdesc="A service manager for s6-based systems."
-url="http://skarnet.org/software/$pkgname/"
+pkgdesc="Service manager for s6-based systems"
+url=https://skarnet.org/software/s6-rc/
 arch="all"
 license="ISC"
 options="!check"
-makedepends="skalibs-dev execline-dev s6-dev"
+makedepends="skalibs-dev>=2.14 execline-dev s6-dev>=2.12"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="http://skarnet.org/software/s6-rc/s6-rc-$pkgver.tar.gz"
+source="https://skarnet.org/software/s6-rc/s6-rc-$pkgver.tar.gz"
 
 build() {
 	./configure \
@@ -38,4 +38,6 @@ static() {
 	rmdir -p "$pkgdir"/usr/lib || :
 }
 
-sha512sums="d52b8b22c709f5d8df7d54d70363f06f7b64b841019d046e9ecaf2cb5f1d319ce8995da5eb5aafb9627f993abfe213c4f75ae3ad6cadad2b3a3175271989ac95  s6-rc-0.5.1.2.tar.gz"
+sha512sums="
+f04e94db957e6d0033e328cc63530f64c9db101815bcafdb00a23205f4e75039dd3e593f93d48e4d9877b0696ea734ca62f672d92ff31e4e07aa19d26d809443  s6-rc-0.5.4.2.tar.gz
+"
diff --git a/main/s6/APKBUILD b/main/s6/APKBUILD
index f0784159bdd..f458f368a86 100644
--- a/main/s6/APKBUILD
+++ b/main/s6/APKBUILD
@@ -1,19 +1,21 @@
-# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 # Contributor: John Regan <john@jrjrtech.com>
+# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 pkgname=s6
-pkgver=2.9.1.0
-pkgrel=0
+pkgver=2.12.0.3
+pkgrel=2
 pkgdesc="skarnet.org's small & secure supervision software suite."
-url="https://skarnet.org/software/$pkgname/"
+url=https://skarnet.org/software/s6/
 arch="all"
 license="ISC"
-makedepends="skalibs-dev execline-dev"
+makedepends="skalibs-dev>=2.14 execline-dev"
+depends="s6-ipcserver execline"
 options="!check"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-openrc"
+subpackages="$pkgname-ipcserver $pkgname-static $pkgname-dev $pkgname-doc $pkgname-openrc"
 source="https://skarnet.org/software/s6/s6-$pkgver.tar.gz s6-svscanboot s6.initd"
 install="s6.pre-install s6.pre-upgrade"
 triggers="s6.trigger=/run/service"
 
+_ipcserver_binaries="bin/s6-ipcserver bin/s6-ipcserver-socketbinder bin/s6-ipcserverd bin/s6-applyuidgid"
 
 build() {
 	./configure \
@@ -28,10 +30,8 @@ build() {
 
 package() {
 	make DESTDIR="$pkgdir" install
-	cp -f "$srcdir/s6-svscanboot" "$pkgdir/lib/s6/s6-svscanboot"
-	mkdir -p "$pkgdir/etc/init.d"
-	cp -f "$srcdir/s6.initd" "$pkgdir/etc/init.d/s6"
-	chmod 0755 "$pkgdir/lib/s6/s6-svscanboot" "$pkgdir/etc/init.d/s6"
+	install -D "$srcdir/s6-svscanboot" "$pkgdir/lib/s6/s6-svscanboot"
+	install -D "$srcdir/s6.initd" "$pkgdir/etc/init.d/s6"
 }
 
 doc() {
@@ -40,11 +40,13 @@ doc() {
 	cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
-static() {
-	default_static
-	rmdir -p "$pkgdir"/usr/lib || :
+ipcserver() {
+	depends=""
+	amove $_ipcserver_binaries
 }
 
-sha512sums="190660ed3af678b304230c688d3364a20dfb8d6e944314506bc27c90fc2ccf1062c7b2931df93620dd3b6f5f794d6119d984f28cb2f4562c1abb8609270b90f5  s6-2.9.1.0.tar.gz
-871ca1f86b354b7c63ce1d3bef8794627e176f993144ed67a17d0a069f5ac2164d94aba980711f61ad349dcd4fe2bf928195f2121a75e611c9897d73f1af12a0  s6-svscanboot
-e7f4fcdc04fc7f72df4419018d048e14f80d50d01ebc284b6d208d6bada3201ca91be0a110930618a26fb0e6bcc1603de01467f6f1dc635c8dcae60f1a0b1b9b  s6.initd"
+sha512sums="
+ecc57b5a06fb413d74337324f8942c905075cf14d87c1471568a836c747271cf95d0edecac69dea54cee55f7a3dbd102493876356c2d36065ab35962b87b559a  s6-2.12.0.3.tar.gz
+bcb503c64fe4644b8f33775e94f03f08e422854247d14c9ff85f5d593b37fb2373fadf373da4226a1e2f4eba17a99fdcd40acb3645f8533f2f3e1a55c984f053  s6-svscanboot
+d4ff33bbd674160f3d47ed8d566fe756ee5a54e1e8febd7d873f5f5158d1c4eeac1ddf460fbc6f23b75a8ee2d007117c3ababa6311ae9dcc5ad087dc4a154eee  s6.initd
+"
diff --git a/main/s6/s6-svscanboot b/main/s6/s6-svscanboot
index 2b41d29160e..6f3f5b78717 100644
--- a/main/s6/s6-svscanboot
+++ b/main/s6/s6-svscanboot
@@ -8,7 +8,7 @@ foreground { redirfd -w 2 /dev/null ln -sf /bin/false ${1}/.s6-svscan/crash }
 if
 {
   redirfd -w 1 ${1}/.s6-svscan/finish
-  heredoc 0 "#!/bin/execlineb -P\ns6-svc -X -- \"${1}/s6-svscan-log\"\n"
+  heredoc 0 "#!/bin/execlineb -P\ns6-svc -x -- \"${1}/s6-svscan-log\"\n"
   cat
 }
 if { chmod 0755 ${1}/.s6-svscan/finish }
@@ -29,4 +29,4 @@ if { chmod 0755 ${1}/s6-svscan-log/run }
 redirfd -r 0 /dev/null
 redirfd -wnb 1 ${1}/s6-svscan-log/fifo
 fdmove -c 2 1
-s6-svscan -St0 ${1}
+s6-svscan -- ${1}
diff --git a/main/s6/s6.initd b/main/s6/s6.initd
index 9f984cc1356..38f1e7c9552 100644
--- a/main/s6/s6.initd
+++ b/main/s6/s6.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 2016 Laurent Bercot
+# Copyright 2016-2023 Laurent Bercot
 # Distributed under the terms of the ISC License.
 #
 # We currently start the supervision tree under OpenRC because
diff --git a/main/s6/s6.pre-install b/main/s6/s6.pre-install
index 19804af6d35..6337333a93b 100644
--- a/main/s6/s6.pre-install
+++ b/main/s6/s6.pre-install
@@ -1,6 +1,5 @@
 #!/bin/sh
 
 addgroup -S catchlog 2>/dev/null
-adduser -S -D -H -s /bin/false -G catchlog -g catchlog catchlog 2>/dev/null
-echo 'Run "rc-update add s6 default" to automatically start a s6 supervision tree on /run/service at boot time.' 1>&2
+adduser -S -D -h / -H -s /sbin/nologin -G catchlog -g catchlog catchlog 2>/dev/null
 exit 0
diff --git a/main/s6/s6.pre-upgrade b/main/s6/s6.pre-upgrade
index 19804af6d35..81d576db4ee 100644..120000
--- a/main/s6/s6.pre-upgrade
+++ b/main/s6/s6.pre-upgrade
@@ -1,6 +1 @@
-#!/bin/sh
-
-addgroup -S catchlog 2>/dev/null
-adduser -S -D -H -s /bin/false -G catchlog -g catchlog catchlog 2>/dev/null
-echo 'Run "rc-update add s6 default" to automatically start a s6 supervision tree on /run/service at boot time.' 1>&2
-exit 0
+s6.pre-install
\ No newline at end of file
diff --git a/main/s6/s6.trigger b/main/s6/s6.trigger
index 8db8d9a5aa8..36aa838412f 100644
--- a/main/s6/s6.trigger
+++ b/main/s6/s6.trigger
@@ -1,3 +1,3 @@
 #!/bin/execlineb -P
 
-s6-svscanctl -aN /run/service
+s6-svscanctl -an /run/service
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index 154f6bfda30..f3fede60785 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,29 +1,32 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
-pkgver=4.12.0
-pkgrel=0
+pkgver=4.19.5
+pkgrel=1
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="https://www.samba.org/"
 arch="all"
-license="GPL-3.0-or-later LGPL-3.0-or-later"
+license="GPL-3.0-or-later AND LGPL-3.0-or-later"
+options="!check" # fixme: missing dependencies for '--enable-selftest'
 subpackages="
-	$pkgname-dev $pkgname-doc $pkgname-server-openrc
-	$pkgname-common::noarch
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-server-openrc
+	libwbclient
+	$pkgname-util-libs:_util_libs
+
+	$pkgname-common:_common:noarch
 	$pkgname-common-tools:_common_tools
 	$pkgname-common-server-libs:_common_server_libs
-	$pkgname-common-libs:_common_libs
 	libsmbclient
 	$pkgname-client
 	$pkgname-client-libs:_client_libs
 
 	$pkgname-winbind
-	libwbclient
 	$pkgname-winbind-clients:_winbind_clients
 	$pkgname-winbind-krb5-locator:_winbind_krb5_locator
 	$pkgname-libnss-winbind:_libnss_winbind
 	pam-winbind:_pam_winbind
 
-	$pkgname-heimdal-libs:_heimdal_libs
 	$pkgname-dc
 	$pkgname-dc-libs:_dc_libs
 
@@ -33,6 +36,7 @@ subpackages="
 	py3-$pkgname:_py3
 	$pkgname-test:_test
 	$pkgname-libs-py3:_libs_py3
+	libauth-$pkgname:_libauth
 	$pkgname-libs
 	"
 
@@ -42,7 +46,7 @@ depends="
 	$pkgname-common-tools=$pkgver-r$pkgrel
 	"
 
-_dc_deps="py3-dnspython tdb"
+_dc_deps="py3-dnspython py3-markdown tdb"
 # note that heimdal is required (over mit krb5) for AD DC functionality
 makedepends="
 	acl-dev
@@ -51,7 +55,6 @@ makedepends="
 	dbus-dev
 	docbook-xsl
 	e2fsprogs-dev
-	fuse-dev
 	gnutls-dev
 	iniparser-dev
 	jansson-dev
@@ -59,13 +62,16 @@ makedepends="
 	libarchive-dev
 	libcap-dev
 	libtirpc-dev
+	liburing-dev
 	linux-pam-dev
 	musl-nscd-dev
 	ncurses-dev
 	openldap-dev
 	perl
+	perl-json
 	perl-parse-yapp
 	popt-dev
+	py3-ldb
 	py3-tdb
 	py3-tevent
 	python3-dev
@@ -79,15 +85,16 @@ makedepends="
 	"
 source="
 	https://download.samba.org/pub/samba/stable/samba-$pkgver.tar.gz
-	bind-9.14.patch
+	netgroup.patch
 	getpwent_r.patch
 	musl_uintptr.patch
-	netdb-defines.patch
-	netapp.patch
 	missing-headers.patch
 	musl_rm_unistd_incl.patch
 	add_missing___compar_fn_t.patch
 	pidl.patch
+	samba-bgqd-include-signal-h.patch
+	default-config.patch
+
 	$pkgname.initd
 	$pkgname.confd
 	$pkgname.logrotate
@@ -95,6 +102,61 @@ source="
 pkggroups="winbind"
 
 # secfixes:
+#   4.18.9-r0:
+#     - CVE-2018-14628
+#   4.18.8-r0:
+#     - CVE-2023-3961
+#     - CVE-2023-4091
+#     - CVE-2023-4154
+#     - CVE-2023-42669
+#     - CVE-2023-42670
+#   4.18.1-r0:
+#     - CVE-2023-0225
+#   4.17.0-r0:
+#     - CVE-2022-1615
+#     - CVE-2022-32743
+#   4.16.7-r0:
+#     - CVE-2022-42898
+#   4.16.6-r0:
+#     - CVE-2022-3437
+#     - CVE-2022-3592
+#   4.15.9-r0:
+#     - CVE-2022-2031
+#     - CVE-2021-3670
+#     - CVE-2022-32744
+#     - CVE-2022-32745
+#     - CVE-2022-32746
+#     - CVE-2022-32742
+#   4.15.2-r0:
+#     - CVE-2016-2124
+#     - CVE-2020-25717
+#     - CVE-2020-25718
+#     - CVE-2020-25719
+#     - CVE-2020-25721
+#     - CVE-2020-25722
+#     - CVE-2021-23192
+#     - CVE-2021-3738
+#   4.15.0-r0:
+#     - CVE-2021-3671
+#   4.14.4-r0:
+#     - CVE-2021-20254
+#   4.14.2-r0:
+#     - CVE-2020-27840
+#     - CVE-2021-20277
+#   4.12.9-r0:
+#     - CVE-2020-14318
+#     - CVE-2020-14323
+#     - CVE-2020-14383
+#   4.12.7-r0:
+#     - CVE-2020-1472
+#   4.12.5-r0:
+#     - CVE-2020-10730
+#     - CVE-2020-10745
+#     - CVE-2020-10760
+#     - CVE-2020-14303
+#   4.12.2-r0:
+#     - CVE-2020-10700
+#     - CVE-2020-10704
 #   4.11.5-r0:
 #     - CVE-2019-14902
 #     - CVE-2019-14907
@@ -116,7 +178,6 @@ pkggroups="winbind"
 #     - CVE-2018-14629
 #     - CVE-2019-3880
 #   4.8.7-r0:
-#     - CVE-2018-14629
 #     - CVE-2018-16841
 #     - CVE-2018-16851
 #     - CVE-2018-16853
@@ -140,17 +201,14 @@ pkggroups="winbind"
 #     - CVE-2017-2619
 
 build() {
-	local _jobs=$JOBS
 	local _idmap_modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2
 	local _pdb_modules=pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4
 	local _auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4
 
-	if [ -z "$_jobs" ]; then
-		_jobs=$(awk '/^core id/ {n++} END{print n}' /proc/cpuinfo)
-	fi
+	# pclose, ..
+	export CFLAGS="$CFLAGS -O2 -D_BSD_SOURCE -flto=auto"
 	./configure \
 		--prefix=/usr \
-		--jobs=${_jobs:-2} \
 		--sysconfdir=/etc/$pkgname \
 		--with-configdir=/etc/$pkgname \
 		--localstatedir=/var \
@@ -162,15 +220,20 @@ build() {
 		--with-pam \
 		--without-systemd \
 		--with-ads \
-		--with-shared-modules=$_idmap_modules,$_pdb_modules,$_auth_modules \
+		--with-shared-modules=$_idmap_modules,$_pdb_modules,$_auth_modules,vfs_io_uring \
 		--enable-cups \
 		--without-gettext \
 		--bundled-libraries=NONE,ntdb,roken,wind,hx509,asn1,heimbase,hcrypto,krb5,gssapi,heimntlm,hdb,kdc,cmocka \
 		--disable-rpath-install \
-		--without-gpgme
+		--without-gpgme \
+		--disable-fault-handling
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
 	make DESTDIR="$pkgdir" install
 
@@ -188,24 +251,10 @@ package() {
 	install -Dm644 "$srcdir/$pkgname.confd" "$pkgdir/etc/conf.d/$pkgname"
 }
 
-_mv_files() {
-	local i
-	for i in "$@"; do
-		case $i in
-		*/*) mkdir -p "$subpkgdir"/${i%/*};;
-		*) mkdir -p "$subpkgdir";;
-		esac
-		mv "$pkgdir"/$i "$subpkgdir"/$i
-	done
-}
-
-common() {
+_common() {
 	pkgdesc="Samba common files for both client an servers"
 	depends=
-	cd "$pkgdir"
-	_mv_files \
-		etc \
-		var
+	amove etc var
 	install -d -m700 "$subpkgdir"/var/lib/$pkgname/private
 }
 
@@ -213,21 +262,21 @@ common() {
 _libs_py3() {
 	pkgdesc="Libraries that require libpython"
 	depends=
-	cd "$pkgdir"
-	_mv_files \
+	amove \
 		usr/lib/$pkgname/libsamba-net*samba4.so \
 		usr/lib/$pkgname/libsamba-python*samba4.so
 	return 0
 }
 
+# may depend on samba-common-server-libs but not samba-server-libs
 _common_tools() {
 	pkgdesc="Tools for Samba servers and clients"
 	depends=
-	cd "$pkgdir"
-	_mv_files \
+	amove \
 		usr/bin/net \
 		usr/bin/pdbedit \
 		usr/bin/profiles \
+		usr/bin/samba-log-parser \
 		usr/bin/smbcontrol \
 		usr/bin/smbpasswd \
 		usr/bin/testparm \
@@ -235,83 +284,58 @@ _common_tools() {
 		usr/lib/$pkgname/libnet-keytab-samba4.so
 }
 
+# should not depend on client libs
 _common_server_libs() {
-	pkgdesc="Samba libraries shared by common-tools and servers"
+	pkgdesc="Samba libraries shared by common-tools and servers" # not shared with clients
 	depends=""
-	cd "$pkgdir"
-	_mv_files \
+	amove \
+		usr/lib/libdcerpc-server-core.so.* \
 		usr/lib/libnetapi.so.* \
-		usr/lib/libsmbldap.so.* \
-		usr/lib/$pkgname/libads-samba4.so \
-		usr/lib/$pkgname/libauth-samba4.so \
+		usr/lib/$pkgname/libRPC-SERVER-LOOP-samba4.so \
 		usr/lib/$pkgname/libdfs-server-ad-samba4.so \
-		usr/lib/$pkgname/libnpa-tstream-samba4.so \
 		usr/lib/$pkgname/libprinting-migrate-samba4.so \
 		usr/lib/$pkgname/libsmbd-base-samba4.so \
-		usr/lib/$pkgname/libsmbd-conn-samba4.so \
 		usr/lib/$pkgname/libsmbldaphelper-samba4.so \
 		usr/lib/$pkgname/pdb
 }
 
-_common_libs() {
-	pkgdesc="Samba libraries shared by common-tools, server and clients"
-	depends=""
-	cd "$pkgdir"
-	_mv_files \
-		usr/lib/$pkgname/libcli-spoolss-samba4.so \
-		usr/lib/$pkgname/libtrusts-util-samba4.so \
-		usr/lib/libdcerpc-binding.so.* \
-		usr/lib/libsamba-passdb.so.* \
-		usr/lib/$pkgname/libdcerpc-samba-samba4.so \
-		usr/lib/$pkgname/liblibcli-lsa3-samba4.so \
-		usr/lib/$pkgname/liblibcli-netlogon3-samba4.so \
-		usr/lib/$pkgname/liblibsmb-samba4.so \
-		usr/lib/$pkgname/libmsrpc3-samba4.so \
-		usr/lib/$pkgname/libndr-samba4.so \
-		usr/lib/$pkgname/libMESSAGING-SEND-samba4.so
-}
-
 libsmbclient() {
 	pkgdesc="The SMB client library"
 	depends=
-	cd "$pkgdir"
-	_mv_files \
+	amove \
 		usr/lib/libsmbclient.so.*
 }
 
+# should only depend on samba-util-libs, libwbclient and samba-libs
 _client_libs() {
 	pkgdesc="Samba libraries used by clients"
 	depends=
-	cd "$pkgdir"
-	_mv_files \
-		usr/lib/libdcerpc.so.* \
+	amove \
+		usr/lib/$pkgname/libad-claims-samba4.so \
+		usr/lib/$pkgname/libauthn-policy-util-samba4.so \
 		usr/lib/$pkgname/libcli-ldap-samba4.so \
-		usr/lib/$pkgname/libclidns-samba4.so \
 		usr/lib/$pkgname/libcmdline-contexts-samba4.so \
-		usr/lib/$pkgname/libcmdline-credentials-samba4.so \
 		usr/lib/$pkgname/libdsdb-garbage-collect-tombstones-samba4.so \
-		usr/lib/$pkgname/libevents-samba4.so \
+		usr/lib/$pkgname/libdsdb-module-samba4.so \
+		usr/lib/$pkgname/libgpo-samba4.so \
 		usr/lib/$pkgname/libhttp-samba4.so \
 		usr/lib/$pkgname/libmscat-samba4.so \
 		usr/lib/$pkgname/libnetif-samba4.so \
-		usr/lib/$pkgname/libpopt-samba3-cmdline-samba4.so \
+		usr/lib/$pkgname/libprinter-driver-samba4.so \
 		usr/lib/$pkgname/libregistry-samba4.so \
 		usr/lib/$pkgname/libsmbclient-raw-samba4.so \
-		usr/lib/$pkgname/libcom_err-samba4.so.* \
-		usr/lib/$pkgname/libgpo-samba4.so \
-		usr/lib/$pkgname/libprinter-driver-samba4.so
+		usr/lib/libdcerpc.so.*
 }
 
 client() {
 	pkgdesc="Samba client programs"
 	depends="$pkgname-common=$pkgver-r$pkgrel"
 	cd "$pkgdir"
-	_mv_files \
+	amove \
 		usr/bin/cifsdd \
 		usr/bin/dumpmscat \
-		usr/bin/findsmb \
 		usr/bin/dbwrap_tool \
-		usr/bin/mdfind \
+		usr/bin/mdsearch \
 		usr/bin/mvxattr \
 		usr/bin/nmblookup \
 		usr/bin/oLschema2ldif \
@@ -333,25 +357,23 @@ client() {
 		usr/lib/$pkgname/smbspool_krb5_wrapper
 }
 
+# should not pull in samba-client-libs
 _server_libs() {
 	pkgdesc="Samba libraries shared by server and windbind"
 	depends=
-	cd "$pkgdir"
-	_mv_files \
-		usr/lib/$pkgname/libMESSAGING-samba4.so \
+	amove \
 		usr/lib/$pkgname/libdcerpc-samba4.so \
 		usr/lib/$pkgname/libidmap-samba4.so \
 		usr/lib/$pkgname/libnss-info-samba4.so
 }
 
-
+# should not pull in samba-client-libs
 winbind() {
 	pkgdesc="Samba user and group resolver"
 	depends="$pkgname-common=$pkgver-r$pkgrel"
 	install="winbind.pre-install winbind.pre-upgrade winbind.post-install
 		winbind.post-upgrade"
-	cd "$pkgdir"
-	_mv_files \
+	amove \
 		usr/sbin/winbindd \
 		usr/lib/$pkgname/idmap \
 		usr/lib/$pkgname/nss_info
@@ -359,21 +381,34 @@ winbind() {
 		"$subpkgdir"/var/cache/$pkgname/winbindd_privileged
 }
 
+# should not depend on any other samba package
+_util_libs() {
+	pkgdesc="Samba utility libraries"
+	depends=
+	amove \
+		usr/lib/libsamba-util.so.* \
+		usr/lib/$pkgname/libgenrand-samba4.so \
+		usr/lib/$pkgname/libsocket-blocking-samba4.so \
+		usr/lib/$pkgname/libsamba-debug-samba4.so \
+		usr/lib/$pkgname/libtime-basic-samba4.so \
+		usr/lib/$pkgname/libsys-rw-samba4.so \
+		usr/lib/$pkgname/libiov-buf-samba4.so \
+		usr/lib/$pkgname/libcom-err-samba4.so \
+		usr/lib/$pkgname/libreplace-samba4.so \
+		usr/lib/$pkgname/libstable-sort-samba4.so
+}
+
+# should only depend on samba-util-libs
 libwbclient() {
 	pkgdesc="Samba winbind client libraries"
 	depends=
-	cd "$pkgdir"
-	_mv_files \
-		usr/lib/libwbclient.so.* \
-		usr/lib/$pkgname/libreplace-samba4.so \
-		usr/lib/$pkgname/libwinbind-client-samba4.so
+	amove usr/lib/libwbclient.so.*
 }
 
 _winbind_clients() {
 	pkgdesc="Samba winbind client tools"
 	depends=
-	cd "$pkgdir"
-	_mv_files \
+	amove \
 		usr/bin/ntlm_auth \
 		usr/bin/wbinfo
 }
@@ -381,8 +416,7 @@ _winbind_clients() {
 _libnss_winbind() {
 	pkgdesc="Samba winbind NSS plugin"
 	depends=
-	cd "$pkgdir"
-	_mv_files \
+	amove \
 		usr/lib/libnss_winbind.so* \
 		usr/lib/libnss_wins.so*
 }
@@ -390,17 +424,17 @@ _libnss_winbind() {
 _winbind_krb5_locator() {
 	pkgdesc="Samba winbind krb5 locator"
 	depends=
-	cd "$pkgdir"
-	_mv_files \
+	amove \
 		usr/lib/samba/krb5
 }
 
 _pam_winbind() {
 	pkgdesc="PAM module for winbind"
 	depends=
-	cd "$pkgdir"
-	_mv_files \
-		usr/lib/security
+
+	mkdir -p "$subpkgdir"/lib/security
+	mv "$pkgdir"/usr/lib/security/* "$subpkgdir"/lib/security/
+	rmdir -p "$pkgdir"/usr/lib/security || true
 }
 
 dc() {
@@ -410,8 +444,7 @@ dc() {
 		$pkgname-winbind=$pkgver-r$pkgrel
 		py3-$pkgname=$pkgver-r$pkgrel
 		$_dc_deps"
-	cd "$pkgdir"
-	_mv_files \
+	amove \
 		usr/bin/samba-tool \
 		usr/sbin/samba* \
 		usr/share/$pkgname \
@@ -424,23 +457,20 @@ dc() {
 
 _dc_libs() {
 	pkgdesc="Samba AD Domain Controller libraries"
-	cd "$pkgdir"
-	_mv_files \
+	amove \
 		usr/lib/libdcerpc-samr.so.* \
 		usr/lib/libdcerpc-server.so.* \
-		usr/lib/libdcerpc-server-core.so.* \
 		usr/lib/libsamba-policy.* \
 		usr/lib/$pkgname/bind9 \
 		usr/lib/$pkgname/libHDB-SAMBA4-samba4.so \
 		usr/lib/$pkgname/libLIBWBCLIENT-OLD-samba4.so \
 		usr/lib/$pkgname/libauth-unix-token-samba4.so \
 		usr/lib/$pkgname/libauth4-samba4.so \
-		usr/lib/$pkgname/libcluster-samba4.so \
 		usr/lib/$pkgname/libdb-glue-samba4.so \
 		usr/lib/$pkgname/libdnsserver-common-samba4.so \
-		usr/lib/$pkgname/libdsdb-module-samba4.so \
-		usr/lib/$pkgname/libhdb-samba4.so.* \
-		usr/lib/$pkgname/libkdc-samba4.so.* \
+		usr/lib/$pkgname/libgss-preauth-samba4.so \
+		usr/lib/$pkgname/libhdb-samba4.so* \
+		usr/lib/$pkgname/libkdc-samba4.so* \
 		usr/lib/$pkgname/libpac-samba4.so \
 		usr/lib/$pkgname/libposix-eadb-samba4.so \
 		usr/lib/$pkgname/libprocess-model-samba4.so \
@@ -451,43 +481,29 @@ _dc_libs() {
 		usr/lib/$pkgname/service
 }
 
-_heimdal_libs() {
-	pkgdesc="Samba heimdal libraries"
-	depends=
-	cd "$pkgdir"
-	_mv_files \
-		usr/lib/$pkgname/libasn1-samba4.so.* \
-		usr/lib/$pkgname/libgssapi-samba4.so.* \
-		usr/lib/$pkgname/libhcrypto-samba4.so.* \
-		usr/lib/$pkgname/libheimbase-samba4.so.* \
-		usr/lib/$pkgname/libheimntlm-samba4.so.* \
-		usr/lib/$pkgname/libhx509-samba4.so.* \
-		usr/lib/$pkgname/libkrb5-samba4.so.* \
-		usr/lib/$pkgname/libroken-samba4.so.* \
-		usr/lib/$pkgname/libwind-samba4.so.*
-}
-
 server() {
 	pkgdesc="Samba server"
 	depends="$pkgname-common=$pkgver-r$pkgrel"
-	cd "$pkgdir"
-	_mv_files \
+	amove \
 		usr/sbin/nmbd \
 		usr/sbin/smbd \
 		usr/sbin/eventlogadm \
 		usr/bin/smbstatus \
 		\
 		usr/lib/$pkgname/auth \
+		usr/lib/$pkgname/libREG-FULL-samba4.so \
+		usr/lib/$pkgname/libRPC-WORKER-samba4.so \
 		usr/lib/$pkgname/libxattr-tdb-samba4.so \
+		usr/lib/$pkgname/rpcd_* \
+		usr/lib/$pkgname/samba-bgqd \
+		usr/lib/$pkgname/samba-dcerpcd \
 		usr/lib/$pkgname/vfs
 }
 
-
 pidl() {
 	pkgdesc="Perl IDL compiler"
 	depends="perl"
-	cd "$pkgdir"
-	_mv_files \
+	amove \
 		usr/bin/pidl \
 		usr/share/perl*
 }
@@ -502,8 +518,7 @@ _py3() {
 _test() {
 	pkgdesc="Samba server and client testing tools"
 	depends=
-	cd "$pkgdir"
-	_mv_files \
+	amove \
 		usr/bin/gentest \
 		usr/bin/locktest \
 		usr/bin/masktest \
@@ -513,49 +528,70 @@ _test() {
 		usr/lib/$pkgname/libtorture-samba4.so
 }
 
+# avoid samba-libs and libsmbclient depending on pam
+_libauth() {
+	pkgdesc="Samba auth library shared by common-tools, server and clients"
+	depends=
+
+	amove usr/lib/$pkgname/libauth-samba4.so
+}
+
+# should only depend on samba-util-libs and libwbclient
 libs() {
-	pkgdesc="Samba core libraries"
+	pkgdesc="Samba core libraries shared by common-tools, server and clients"
 	depends=
-	cd "$pkgdir"
-	_mv_files \
-		usr/lib/libndr-krb5pac.so.* \
-		usr/lib/libndr-nbt.so.* \
-		usr/lib/libndr-standard.so.* \
-		usr/lib/libndr.so.* \
-		usr/lib/libsamba-credentials.so.* \
-		usr/lib/libsamba-errors.so.* \
-		usr/lib/libsamba-hostconfig.so.* \
-		usr/lib/libsamba-util.so.* \
-		usr/lib/libsamdb.so.* \
-		usr/lib/libsmbconf.so.* \
-		usr/lib/libtevent-util.so.* \
+	# heimdal libs
+	amove \
+		usr/lib/$pkgname/libasn1-samba4.so* \
+		usr/lib/$pkgname/libgssapi-samba4.so* \
+		usr/lib/$pkgname/libhcrypto-samba4.so* \
+		usr/lib/$pkgname/libheimbase-samba4.so* \
+		usr/lib/$pkgname/libheimntlm-samba4.so* \
+		usr/lib/$pkgname/libhx509-samba4.so* \
+		usr/lib/$pkgname/libkrb5-samba4.so* \
+		usr/lib/$pkgname/libroken-samba4.so* \
+		usr/lib/$pkgname/libwind-samba4.so*
+
+	amove \
 		usr/lib/$pkgname/libCHARSET3-samba4.so \
+		usr/lib/$pkgname/libMESSAGING-SEND-samba4.so \
+		usr/lib/$pkgname/libMESSAGING-samba4.so \
 		usr/lib/$pkgname/libaddns-samba4.so \
+		usr/lib/$pkgname/libads-samba4.so \
 		usr/lib/$pkgname/libasn1util-samba4.so \
 		usr/lib/$pkgname/libauthkrb5-samba4.so \
 		usr/lib/$pkgname/libcli-cldap-samba4.so \
 		usr/lib/$pkgname/libcli-ldap-common-samba4.so \
 		usr/lib/$pkgname/libcli-nbt-samba4.so \
 		usr/lib/$pkgname/libcli-smb-common-samba4.so \
+		usr/lib/$pkgname/libcli-spoolss-samba4.so \
 		usr/lib/$pkgname/libcliauth-samba4.so \
-		usr/lib/$pkgname/libcommon-auth-samba4.so \
+		usr/lib/$pkgname/libclidns-samba4.so \
+		usr/lib/$pkgname/libcluster-samba4.so \
+		usr/lib/$pkgname/libcmdline-samba4.so \
 		usr/lib/$pkgname/libcmocka-samba4.so \
+		usr/lib/$pkgname/libcommon-auth-samba4.so \
 		usr/lib/$pkgname/libdbwrap-samba4.so \
+		usr/lib/$pkgname/libdcerpc-pkt-auth-samba4.so \
+		usr/lib/$pkgname/libdcerpc-samba-samba4.so \
+		usr/lib/$pkgname/libevents-samba4.so \
 		usr/lib/$pkgname/libflag-mapping-samba4.so \
-		usr/lib/$pkgname/libgenrand-samba4.so \
 		usr/lib/$pkgname/libgensec-samba4.so \
 		usr/lib/$pkgname/libgse-samba4.so \
 		usr/lib/$pkgname/libinterfaces-samba4.so \
-		usr/lib/$pkgname/libiov-buf-samba4.so \
 		usr/lib/$pkgname/libkrb5samba-samba4.so \
 		usr/lib/$pkgname/libldbsamba-samba4.so \
+		usr/lib/$pkgname/liblibcli-lsa3-samba4.so \
+		usr/lib/$pkgname/liblibcli-netlogon3-samba4.so \
+		usr/lib/$pkgname/liblibsmb-samba4.so \
 		usr/lib/$pkgname/libmessages-dgm-samba4.so \
 		usr/lib/$pkgname/libmessages-util-samba4.so \
 		usr/lib/$pkgname/libmsghdr-samba4.so \
+		usr/lib/$pkgname/libmsrpc3-samba4.so \
 		usr/lib/$pkgname/libndr-samba-samba4.so \
-		usr/lib/$pkgname/libpopt-samba3-samba4.so \
+		usr/lib/$pkgname/libndr-samba4.so \
+		usr/lib/$pkgname/libnpa-tstream-samba4.so \
 		usr/lib/$pkgname/libsamba-cluster-support-samba4.so \
-		usr/lib/$pkgname/libsamba-debug-samba4.so \
 		usr/lib/$pkgname/libsamba-modules-samba4.so \
 		usr/lib/$pkgname/libsamba-security-samba4.so \
 		usr/lib/$pkgname/libsamba-sockets-samba4.so \
@@ -566,35 +602,48 @@ libs() {
 		usr/lib/$pkgname/libserver-role-samba4.so \
 		usr/lib/$pkgname/libsmb-transport-samba4.so \
 		usr/lib/$pkgname/libsmbd-shim-samba4.so \
-		usr/lib/$pkgname/libsocket-blocking-samba4.so \
-		usr/lib/$pkgname/libsys-rw-samba4.so \
-		usr/lib/$pkgname/libtalloc-report-samba4.so \
 		usr/lib/$pkgname/libtalloc-report-printf-samba4.so \
+		usr/lib/$pkgname/libtalloc-report-samba4.so \
 		usr/lib/$pkgname/libtdb-wrap-samba4.so \
-		usr/lib/$pkgname/libtime-basic-samba4.so \
-		usr/lib/$pkgname/libutil-cmdline-samba4.so \
+		usr/lib/$pkgname/libtrusts-util-samba4.so \
 		usr/lib/$pkgname/libutil-reg-samba4.so \
 		usr/lib/$pkgname/libutil-setid-samba4.so \
-		usr/lib/$pkgname/libutil-tdb-samba4.so
+		usr/lib/$pkgname/libutil-tdb-samba4.so \
+		usr/lib/libdcerpc-binding.so.* \
+		usr/lib/libndr-krb5pac.so.* \
+		usr/lib/libndr-nbt.so.* \
+		usr/lib/libndr-standard.so.* \
+		usr/lib/libndr.so.* \
+		usr/lib/libsamba-credentials.so.* \
+		usr/lib/libsamba-errors.so.* \
+		usr/lib/libsamba-hostconfig.so.* \
+		usr/lib/libsamba-passdb.so.* \
+		usr/lib/libsamdb.so.* \
+		usr/lib/libsmbconf.so.* \
+		usr/lib/libsmbldap.so.* \
+		usr/lib/libtevent-util.so.*
+
 	# exit with error if some stuff stayed at main pack
-	rmdir "$pkgdir"/usr/lib/$pkgname \
-		"$pkgdir"/usr/share \
-		"$pkgdir"/usr/sbin \
-		"$pkgdir"/usr/bin \
-		"$pkgdir"/usr/lib \
-		"$pkgdir"/usr
+	local leftovers="$(find "$pkgdir" -type f)"
+	if [ -n "$leftovers" ]; then
+		error "files left in main package:"
+		echo "$leftovers" >&2
+		return 1
+	fi
 }
 
-sha512sums="d50be899675b8e3504311e73bb75fbb8264e918e0d1765239ecb5b14e15c0917565f8a9ce1877fb604151bf4f23dfc4c2f7f30a53c872681e3d2571d3ed5ef82  samba-4.12.0.tar.gz
-c3e7f2af16f0ed640ae3c71d1f474f17442c5f75e187d4c037c090646157f698aec7d3621e97f40af564426b5b848994ec916ce63268088509694b342a39665a  bind-9.14.patch
+sha512sums="
+5b0934f2e44a28ffc4aa07e5495b339cf3a7548c49e29d1bae87de6c3a6f57c2a9130592dce782895079f559ed3bc8b5e4514c9c0fd8d5638aef68f0d0a3391f  samba-4.19.5.tar.gz
+f997d0bca9de64a567bccc245bec41e4aa00bacb379d8e348678dcafcf7e723e8716608c5d2d266ad816439b8b93bb8ee28371308a01c9d9c50229f1fc8deb67  netgroup.patch
 58de5e79fdfd06e828d478e112d581d333a8bee88d2602b92204d780f0d707b27dd84f8e2e6b00fca40da81c8fe99aa5bcec70d8b393d3a0a83199c72a4aa48b  getpwent_r.patch
 b7906d66fe55a980a54161ee3f311b51bcbce76b8d4c8cc1ba6d0c5bdf98232cb192b9d2c1aa7b3e2742f5b9848c6cf429347940eefe66c3e0eda1d5aac1bf93  musl_uintptr.patch
-1854577d0e4457e27da367a6c7ec0fb5cfd63cefea0a39181c9d6e78cf8d3eb50878cdddeea3daeec955d00263151c2f86ea754ff4276ef98bc52c0276d9ffe8  netdb-defines.patch
-3b4759dfcf6ec54f2131390c9eb7fd7dd23071e304905cdeaf7a9828fa888cb3dcb5c5bb6a07a634c51d0392ac47f6e22b937faf4354e3b07cfc0de7fdfa28e9  netapp.patch
-c0afe8b1dfddc5290c9aa611163d20adc3a546f54bba0081f739cda4255829f1a72bae422b6cb049aca82e58d4daf63ad5553f4c5c51671019bfbbc2781460f0  missing-headers.patch
+9642e0de5a39ab940e0f53040ae20fccdbde471bed9bcca713482f26e7c88451e405bd63d719d0548975c7c4c045b51b0006672d34ec4390c3b5a618ea6c8d85  missing-headers.patch
 9bf4bbc8b03d9ea17d2f8ffeaf3a83541b171936a90bb8d75b08cc5afbdbaaec545c1b3782c90ae2ffc4568ab4e6f15fb21899d80c654a796301e16429c93b65  musl_rm_unistd_incl.patch
 bc2df70e327fea5dfbd923600225f1448815d842c37d6937dd74eab7f7699d7f52cd7a8e28a61233974649cf86661a0107dce5019d33b71205e4b41bac73f4e2  add_missing___compar_fn_t.patch
 c0bbe1186b150a9bb2a0b741a8cfbd7a5109e5fed1eaa07aaa38cf026ebe054d38cc01e2496f0cab7b40f743e1b7ecfbf8a4d5820810226c4152021df65f36dc  pidl.patch
-96070e2461370437f48571e7de550c13a332fef869480cfe92e7cac73a998f6c2ee85d2580df58211953bebd0e577691aa710c8edddf3ea0f30e9d47d0a2fd44  samba.initd
+e98fd19f65d954f04f7e3b5be86e9c4bcc9ac090c40037de77bfeb266617747c514aeb42f3daf84113b2f3374480d25e368bc1fdebc1870458eda12329d2062e  samba-bgqd-include-signal-h.patch
+14666954aec4a0bc7a6730ba3a9afdbd4e27c083a038d9a1f5a033e4f0a42bc8408906612ea51f74bf743ff8a225242e54b0a518367fe526b110639bfbfdd071  default-config.patch
+e4ce11b699c5841d0aa83e0e912bb86cff1d8726308e7b75548e0fcc349518d3fefb68b902bf75404643494d610e491b080cfc2a4e4d82385c5d9b6657434771  samba.initd
 e2b49cb394e758447ca97de155a61b4276499983a0a5c00b44ae621c5559b759a766f8d1c8d3ee98ad5560f4064a847a7a20cfa2e14f85c061bec8b80fd649eb  samba.confd
-3458a4e1f8a8b44c966afb339b2dca51615be049f594c14911fc4d8203623deee416b6fe881436e246fc7d49c97a2b3bf9c5f33ba774302b24190a1103d6b67d  samba.logrotate"
+3458a4e1f8a8b44c966afb339b2dca51615be049f594c14911fc4d8203623deee416b6fe881436e246fc7d49c97a2b3bf9c5f33ba774302b24190a1103d6b67d  samba.logrotate
+"
diff --git a/main/samba/bind-9.14.patch b/main/samba/bind-9.14.patch
deleted file mode 100644
index 3f0cfef06d8..00000000000
--- a/main/samba/bind-9.14.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- a/source4/dns_server/wscript_build.orig
-+++ b/source4/dns_server/wscript_build
-@@ -68,6 +68,26 @@
-                   deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
-                   enabled=bld.AD_DC_BUILD_IS_ENABLED())
- 
-+bld.SAMBA_LIBRARY('dlz_bind9_13',
-+                  source='dlz_bind9.c',
-+                  cflags='-DBIND_VERSION_9_13',
-+                  private_library=True,
-+                  link_name='modules/bind9/dlz_bind9_13.so',
-+                  realname='dlz_bind9_13.so',
-+                  install_path='${MODULESDIR}/bind9',
-+                  deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
-+                  enabled=bld.AD_DC_BUILD_IS_ENABLED())
-+
-+bld.SAMBA_LIBRARY('dlz_bind9_14',
-+                  source='dlz_bind9.c',
-+                  cflags='-DBIND_VERSION_9_14',
-+                  private_library=True,
-+                  link_name='modules/bind9/dlz_bind9_14.so',
-+                  realname='dlz_bind9_14.so',
-+                  install_path='${MODULESDIR}/bind9',
-+                  deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
-+                  enabled=bld.AD_DC_BUILD_IS_ENABLED())
-+
- bld.SAMBA_LIBRARY('dlz_bind9_for_torture',
-                   source='dlz_bind9.c',
-                   cflags='-DBIND_VERSION_9_8',
---- a/source4/dns_server/dlz_minimal.h.orig
-+++ b/source4/dns_server/dlz_minimal.h
-@@ -31,10 +31,7 @@
- #elif defined (BIND_VERSION_9_10)
- # define DLZ_DLOPEN_VERSION 3
- # define DNS_CLIENTINFO_VERSION 1
--#elif defined (BIND_VERSION_9_11)
--# define DLZ_DLOPEN_VERSION 3
--# define DNS_CLIENTINFO_VERSION 2
--#elif defined (BIND_VERSION_9_12)
-+#elif defined (BIND_VERSION_9_11) || defined (BIND_VERSION_9_12) || defined (BIND_VERSION_9_13) || defined (BIND_VERSION_9_14)
- # define DLZ_DLOPEN_VERSION 3
- # define DNS_CLIENTINFO_VERSION 2
- #else
---- a/source4/setup/named.conf.dlz.orig
-+++ b/source4/setup/named.conf.dlz
-@@ -24,5 +24,11 @@
- 
-     # For BIND 9.12.x
-     ${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so";
-+    
-+    # For BIND 9.13.x
-+    ${BIND9_13} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_13.so";
-+    
-+    # For BIND 9.14.x
-+    ${BIND9_14} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_14.so";
- };
- 
---- a/python/samba/provision/sambadns.py.orig
-+++ b/python/samba/provision/sambadns.py
-@@ -962,6 +962,8 @@
-         bind9_10 = '#'
-         bind9_11 = '#'
-         bind9_12 = '#'
-+        bind9_13 = '#'
-+        bind9_14 = '#'
-         if bind_info.upper().find('BIND 9.8') != -1:
-             bind9_8 = ''
-         elif bind_info.upper().find('BIND 9.9') != -1:
-@@ -972,6 +974,10 @@
-             bind9_11 = ''
-         elif bind_info.upper().find('BIND 9.12') != -1:
-             bind9_12 = ''
-+        elif bind_info.upper().find('BIND 9.13') != -1:
-+            bind9_13 = ''
-+        elif bind_info.upper().find('BIND 9.14') != -1:
-+            bind9_14 = ''
-         elif bind_info.upper().find('BIND 9.7') != -1:
-             raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
-         else:
-@@ -983,7 +989,9 @@
-                     "BIND9_9": bind9_9,
-                     "BIND9_10": bind9_10,
-                     "BIND9_11": bind9_11,
--                    "BIND9_12": bind9_12
-+                    "BIND9_12": bind9_12,
-+                    "BIND9_13": bind9_13,
-+                    "BIND9_14": bind9_14
- 
-                     })
- 
diff --git a/main/samba/default-config.patch b/main/samba/default-config.patch
new file mode 100644
index 00000000000..d7369c2447a
--- /dev/null
+++ b/main/samba/default-config.patch
@@ -0,0 +1,41 @@
+--- a/examples/smb.conf.default
++++ b/examples/smb.conf.default
+@@ -52,7 +52,7 @@
+ 
+ # this tells Samba to use a separate log file for each machine
+ # that connects
+-   log file = /usr/local/samba/var/log.%m
++   log file = /var/log/samba/%m.log
+ 
+ # Put a capping on the size of the log files (in Kb).
+    max log size = 50
+@@ -70,7 +70,7 @@
+ # of the machine that is connecting.
+ # Note: Consider carefully the location in the configuration file of
+ #       this line.  The included file is read at that point.
+-;   include = /usr/local/samba/lib/smb.conf.%m
++;   include = /etc/samba/smb.%m.conf
+ 
+ # Configure Samba to use multiple interfaces
+ # If you have multiple network interfaces then you must list them
+@@ -108,6 +108,20 @@
+ ;  delete user from group script = /usr/sbin/deluser %u %g
+ ;  delete group script = /usr/sbin/groupdel %g
+ 
++# Enable usershares to give non-root users the capability to add, modify and
++# delete their own share definitions. See smb.conf(5).
++# To enable this, do:
++#
++#   addgroup -S sambashare
++#   mkdir /var/lib/samba/usershares
++#   chown root:sambashare /var/lib/samba/usershares
++#   chmod 1770 /var/lib/samba/usershares
++#
++# and uncomment the lines below
++;  usershare path = /var/lib/samba/usershares
++;  usershare max shares = 100
++;  usershare allow guests = yes
++;  usershare owner only = yes
+ 
+ #============================ Share Definitions ==============================
+ [homes]
diff --git a/main/samba/missing-headers.patch b/main/samba/missing-headers.patch
index 58c26aece68..6dd38420e62 100644
--- a/main/samba/missing-headers.patch
+++ b/main/samba/missing-headers.patch
@@ -1,5 +1,5 @@
 diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
-index b5d79b9..3f4eae0 100644
+index af6b530..ad799f6 100644
 --- a/lib/param/loadparm.h
 +++ b/lib/param/loadparm.h
 @@ -31,6 +31,7 @@
@@ -11,7 +11,7 @@ index b5d79b9..3f4eae0 100644
  struct parmlist_entry {
  	struct parmlist_entry *prev, *next;
 diff --git a/source3/lib/system_smbd.c b/source3/lib/system_smbd.c
-index 3b1ac9c..4044d75 100644
+index 73bffe0..2a03571 100644
 --- a/source3/lib/system_smbd.c
 +++ b/source3/lib/system_smbd.c
 @@ -27,6 +27,8 @@
@@ -24,7 +24,7 @@ index 3b1ac9c..4044d75 100644
  #ifndef HAVE_GETGROUPLIST
  
 diff --git a/source4/torture/local/nss_tests.c b/source4/torture/local/nss_tests.c
-index 2cd6122..0c84ec2 100644
+index 2943122..c9b4da7 100644
 --- a/source4/torture/local/nss_tests.c
 +++ b/source4/torture/local/nss_tests.c
 @@ -20,6 +20,8 @@
diff --git a/main/samba/netapp.patch b/main/samba/netapp.patch
deleted file mode 100644
index fea413c3b41..00000000000
--- a/main/samba/netapp.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-https://bugzilla.samba.org/show_bug.cgi?id=12776
-
-diff --git a/source3/include/client.h b/source3/include/client.h
-index db8260d..becdf77 100644
---- a/source3/include/client.h
-+++ b/source3/include/client.h
-@@ -61,6 +61,9 @@ struct cli_state {
- 	char *server_os;
- 	char *server_domain;
- 
-+	/* is server_os spinstream2? true/false/not-yet-checked(-1) */
-+	int is_spinstream2;
-+
- 	char *share;
- 	char *dev;
- 
-diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
-index bc5c1b1..6d6b725 100644
---- a/source3/libsmb/clientgen.c
-+++ b/source3/libsmb/clientgen.c
-@@ -111,6 +111,7 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
- 	if (!cli->server_os) {
- 		goto error;
- 	}
-+	cli->is_spinstream2 = -1;
- 	cli->server_type = talloc_strdup(cli, "");
- 	if (!cli->server_type) {
- 		goto error;
-@@ -467,6 +468,24 @@ time_t cli_state_server_time(struct cli_state *cli)
- 	return t;
- }
- 
-+bool cli_state_server_is_spinstream2(struct cli_state *cli)
-+{
-+	int *ret = &cli->is_spinstream2;
-+	if (*ret == -1) {
-+		if (*cli->server_os == '\0') {
-+			DEBUG(1, ("when checking if server is SpinStream2:"
-+				  " server_os field is empty (should have"
-+				  " been sent in Session Setup protocol"
-+				  " response), so ... presuming not"));
-+			*ret = 0;
-+		}
-+		else {
-+			*ret = strequal(cli->server_os, "SpinStream2") ? 1 : 0;
-+		}
-+	}
-+	return *ret == 1;
-+}
-+
- struct cli_echo_state {
- 	bool is_smb2;
- };
-diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
-index 3987477..6371bc2 100644
---- a/source3/libsmb/clireadwrite.c
-+++ b/source3/libsmb/clireadwrite.c
-@@ -89,6 +89,13 @@ static size_t cli_write_max_bufsize(struct cli_state *cli,
- 		useable_space = 0xFFFFFF - data_offset;
- 	} else if (smb1cli_conn_capabilities(cli->conn) & CAP_LARGE_WRITEX) {
- 		useable_space = 0x1FFFF - data_offset;
-+		if (cli_state_server_is_spinstream2(cli))
-+			/*
-+			 * SpinStream2 (NetApp OnTAP, up to 8.3.2, at least;
-+			 * XXX may need to be more discerning than this)
-+			 * can't handle writes > 64k
-+			 */
-+			useable_space = MIN(useable_space, 64 * 1024);
- 	} else {
- 		return min_space;
- 	}
-diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
-index b453733..e334cc6 100644
---- a/source3/libsmb/proto.h
-+++ b/source3/libsmb/proto.h
-@@ -203,6 +203,7 @@ uint16_t cli_state_set_uid(struct cli_state *cli, uint16_t uid);
- bool cli_set_case_sensitive(struct cli_state *cli, bool case_sensitive);
- uint32_t cli_state_available_size(struct cli_state *cli, uint32_t ofs);
- time_t cli_state_server_time(struct cli_state *cli);
-+bool cli_state_server_is_spinstream2(struct cli_state *cli);
- struct tevent_req *cli_echo_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
- 				 struct cli_state *cli, uint16_t num_echos,
- 				 DATA_BLOB data);
-
-
diff --git a/main/samba/netdb-defines.patch b/main/samba/netdb-defines.patch
deleted file mode 100644
index d7d6446abd6..00000000000
--- a/main/samba/netdb-defines.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/nsswitch/wins.c b/nsswitch/wins.c
-index dccb6dd..bb24acb 100644
---- a/nsswitch/wins.c
-+++ b/nsswitch/wins.c
-@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = PTHREAD_MUTEX_INITIALIZER;
- #define INADDRSZ 4
- #endif
- 
-+#ifndef NETDB_INTERNAL
-+#define NETDB_INTERNAL -1
-+#endif
-+
-+#ifndef NETDB_SUCCESS
-+#define NETDB_SUCCESS 0
-+#endif
-+
- NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname,
- 				     struct hostent *he,
- 				     char *buffer,
diff --git a/main/samba/netgroup.patch b/main/samba/netgroup.patch
new file mode 100644
index 00000000000..59237bdc5e4
--- /dev/null
+++ b/main/samba/netgroup.patch
@@ -0,0 +1,15 @@
+diff --git a/source3/wscript b/source3/wscript
+index b664b6f..db1fc8b 100644
+--- a/source3/wscript
++++ b/source3/wscript
+@@ -629,8 +629,8 @@ msg.msg_accrightslen = sizeof(fd);
+                                 headers='unistd.h sys/types.h dirent.h',
+                                 define='HAVE_DIRENT_D_OFF')
+ 
+-    if (conf.CONFIG_SET('HAVE_GETDOMAINNAME')):
+-        conf.DEFINE('HAVE_NETGROUP', '1')
++ #   if (conf.CONFIG_SET('HAVE_GETDOMAINNAME')):
++ #       conf.DEFINE('HAVE_NETGROUP', '1')
+ 
+     # Look for CUPS
+     if Options.options.with_cups:
\ No newline at end of file
diff --git a/main/samba/samba-bgqd-include-signal-h.patch b/main/samba/samba-bgqd-include-signal-h.patch
new file mode 100644
index 00000000000..c0662233833
--- /dev/null
+++ b/main/samba/samba-bgqd-include-signal-h.patch
@@ -0,0 +1,13 @@
+SIGTERM and SIGPIPE are used but undefined.
+diff --git a/source3/printing/samba-bgqd.c b/source3/printing/samba-bgqd.c
+index 8ac6ec5..09a5d12 100644
+--- a/source3/printing/samba-bgqd.c
++++ b/source3/printing/samba-bgqd.c
+@@ -41,6 +41,7 @@
+ #include "source3/auth/proto.h"
+ #include "source3/printing/queue_process.h"
+ #include "source3/lib/substitute.h"
++#include <signal.h>
+ 
+ static void watch_handler(struct tevent_req *req)
+ {
diff --git a/main/samba/samba.initd b/main/samba/samba.initd
index 71c7fb2c6f6..1de64e4a8f6 100644
--- a/main/samba/samba.initd
+++ b/main/samba/samba.initd
@@ -72,7 +72,7 @@ stop() {
 reload() {
 	for i in $daemon_list; do
 		ebegin "Reloading $i"
-		killall -HUP $i
+		busybox killall -HUP $i
 		eend $?
 	done
 }
diff --git a/main/samurai/APKBUILD b/main/samurai/APKBUILD
index c0c9159eeb2..908367aa0b0 100644
--- a/main/samurai/APKBUILD
+++ b/main/samurai/APKBUILD
@@ -1,20 +1,27 @@
-# Contributor: Drew DeVault <sir@cmpwn.com>
-# Maintainer: Drew DeVault <sir@cmpwn.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samurai
-pkgver=1.1
-pkgrel=0
+pkgver=1.2
+pkgrel=5
 pkgdesc="ninja-compatible build tool written in C"
 url="https://github.com/michaelforney/samurai"
 arch="all"
 license="Apache-2.0"
 options="!check"  # No test suite.
 subpackages="$pkgname-doc"
-source="https://github.com/michaelforney/samurai/releases/download/$pkgver/samurai-$pkgver.tar.gz"
+source="https://github.com/michaelforney/samurai/releases/download/$pkgver/samurai-$pkgver.tar.gz
+	CVE-2021-30218.patch
+	CVE-2021-30219.patch"
 provides="ninja"
 replaces="ninja"
+provider_priority=10
+
+# secfixes:
+#   1.2-r1:
+#     - CVE-2021-30218
+#     - CVE-2021-30219
 
 build() {
-	make
+	make CFLAGS="$CFLAGS -O2"
 }
 
 package() {
@@ -22,4 +29,8 @@ package() {
 	ln -s samu "$pkgdir"/usr/bin/ninja
 }
 
-sha512sums="b27302c34d736f483909e57c8b162609eaa4c86571c1167b71a5564b521cc3af2861307a16bb6dca55e80952088989e9526b103160d2ea054d15f4ed85b1cedb  samurai-1.1.tar.gz"
+sha512sums="
+bbe6a582c34b04f1df53b76c1647aa3e03c4698ebf7591a203935f11ffa05971bbcb86dc1a8c06aeb904cdc741abb08918122810fc47216fed0a6d9f87fd1225  samurai-1.2.tar.gz
+6e1c3a0bd92e006f364a81e9e51394f1bc583efa96120306fe33dc0a48cb4babaa8e8c97d754d3c37cda4b4936e77f64e4c138ccb8cfedfdce43adb09c393edb  CVE-2021-30218.patch
+0504b137fc9ac113453075a22bdfac4ab7616f668e640b7125041400729aaecad1173c528934223246035f68a95d92c6a85e62d1ea5fea996d85647cb33483eb  CVE-2021-30219.patch
+"
diff --git a/main/samurai/CVE-2021-30218.patch b/main/samurai/CVE-2021-30218.patch
new file mode 100644
index 00000000000..1d66638651f
--- /dev/null
+++ b/main/samurai/CVE-2021-30218.patch
@@ -0,0 +1,29 @@
+From e84b6d99c85043fa1ba54851ee500540ec206918 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Fri, 2 Apr 2021 17:27:48 -0700
+Subject: [PATCH] util: Check for NULL string in writefile
+
+This check was there previously, but was removed in f549b757 with
+the addition of a check during parse that every rule has rspfile
+if and only if it has rspfile_content. However, this fails to
+consider the possibility of those variables coming from the edge
+or global environment. So, re-add the check.
+
+Fixes #67.
+---
+ util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util.c b/util.c
+index ea5c3ce..2a59881 100644
+--- a/util.c
++++ b/util.c
+@@ -258,7 +258,7 @@ writefile(const char *name, struct string *s)
+ 		return -1;
+ 	}
+ 	ret = 0;
+-	if (fwrite(s->s, 1, s->n, f) != s->n || fflush(f) != 0) {
++	if (s && (fwrite(s->s, 1, s->n, f) != s->n || fflush(f) != 0)) {
+ 		warn("write %s:", name);
+ 		ret = -1;
+ 	}
diff --git a/main/samurai/CVE-2021-30219.patch b/main/samurai/CVE-2021-30219.patch
new file mode 100644
index 00000000000..fbc97b03d47
--- /dev/null
+++ b/main/samurai/CVE-2021-30219.patch
@@ -0,0 +1,26 @@
+From d2af3bc375e2a77139c3a28d6128c60cd8d08655 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sun, 4 Apr 2021 03:50:09 -0700
+Subject: [PATCH] parse: Check for non-empty command/rspfile/rspfile_content
+
+This matches ninja behavior and prevents the possibility of a rule
+with an empty (NULL) command string.
+
+Fixes #68.
+---
+ parse.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/parse.c b/parse.c
+index f79a5ee..b4b98a1 100644
+--- a/parse.c
++++ b/parse.c
+@@ -42,6 +42,8 @@ parserule(struct scanner *s, struct environment *env)
+ 		var = scanname(s);
+ 		parselet(s, &val);
+ 		ruleaddvar(r, var, val);
++		if (!val)
++			continue;
+ 		if (strcmp(var, "command") == 0)
+ 			hascommand = true;
+ 		else if (strcmp(var, "rspfile") == 0)
diff --git a/main/sanlock/APKBUILD b/main/sanlock/APKBUILD
new file mode 100644
index 00000000000..6997099d6e1
--- /dev/null
+++ b/main/sanlock/APKBUILD
@@ -0,0 +1,60 @@
+# Contributor: Patrycja Rosa <alpine@ptrcnull.me>
+# Maintainer: Guy Godfroy <guy.godfroy@gugod.fr>
+pkgname=sanlock
+pkgver=3.9.2
+pkgrel=0
+pkgdesc="lease manager that uses shared storage"
+url="https://pagure.io/sanlock"
+arch="all"
+license="LGPL-2.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later"
+install="sanlock.pre-install"
+makedepends="
+	linux-headers
+	libaio-dev
+	util-linux-dev
+	python3
+	python3-dev
+	py3-setuptools
+	"
+checkdepends="py3-pytest"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc py3-sanlock:py3"
+source="
+	https://releases.pagure.org/sanlock/sanlock-$pkgver.tar.gz
+	c23.patch
+	basename-include.patch
+	sanlock.initd
+	sanlock.confd
+	wdmd.initd
+	wdmd.confd
+	"
+options="!check" # all tests are failing
+
+build() {
+	make
+}
+
+package() {
+	make DESTDIR="$pkgdir" LIBDIR="/usr/lib" install
+	install -Dm644 "$srcdir"/sanlock.confd \
+		"$pkgdir"/etc/conf.d/sanlock
+	install -Dm755 "$srcdir"/sanlock.initd \
+		"$pkgdir"/etc/init.d/sanlock
+	install -Dm644 "$srcdir"/wdmd.confd \
+		"$pkgdir"/etc/conf.d/wdmd
+	install -Dm755 "$srcdir"/wdmd.initd \
+		"$pkgdir"/etc/init.d/wdmd
+}
+
+py3() {
+	amove usr/lib/python3*
+}
+
+sha512sums="
+83dba53e730a0722f91fb25a5e4188b1677a038dbdc9a0b37513eea86125cc347b90544b4358027d5961322ae019eac31ed8788963f99fe1716be3ed697bf619  sanlock-3.9.2.tar.gz
+be8b51e1ca7cb66ff9f9f02977770c0b72115658985c3d272aab10bc98428f3851b1654b0c74d5b0ac1b935ddaf71af67c3919ca32d5c133ac7208890301833b  c23.patch
+b95420bd114249b0680c6624f96c851a063038a84af85f2d31af949dc934753c2fccfda37af2274743cbf05b3bd5490a04d2d4e0472ecf232dc1726fb85f40e1  basename-include.patch
+51f0c88bb0aff1670dc01fec8c025cc347bca88d4e5e5555e31486d6d5de560c12e6404eaeac651c35037022555e79e6c6a2bb897d0f2c0e6a38ff884cbd9743  sanlock.initd
+0e8924efc6048e712497a8cdc8f272ae222017cb623583dd8308c7c4120242aecf08f2521b0ec6615952b6eca461762ac5a65b789295678311d02c5f7af2aaac  sanlock.confd
+b447f28a3b7b14aafb3795ee97579644b299d8684945a663c18c9f0845ac35593ca6f337af74310ecfd3eb59c1ec8c1758c94055010d978579756cb1b49e5b3b  wdmd.initd
+75191a957052f14f8ebb0cf9f89c93c03b1920be984d83f48cd812717a057bfe2682ccd8b7f5318cbe0b110ac04ca3cfde5a723540ac0b7b7c91a3e6415b7a6f  wdmd.confd
+"
diff --git a/main/sanlock/basename-include.patch b/main/sanlock/basename-include.patch
new file mode 100644
index 00000000000..af51ead1b5f
--- /dev/null
+++ b/main/sanlock/basename-include.patch
@@ -0,0 +1,8 @@
+diff --git a/wdmd/main.c b/wdmd/main.c
+index 38a99f3..4483da3 100644
+--- a/wdmd/main.c
++++ b/wdmd/main.c
+@@ -36,2 +36,3 @@
+ #include <linux/watchdog.h>
++#include <libgen.h>
+ 
diff --git a/main/sanlock/c23.patch b/main/sanlock/c23.patch
new file mode 100644
index 00000000000..d19e51c7665
--- /dev/null
+++ b/main/sanlock/c23.patch
@@ -0,0 +1,40 @@
+diff --git a/src/sanlock_sock.c b/src/sanlock_sock.c
+index b83f9ae..305c16f 100644
+--- a/src/sanlock_sock.c
++++ b/src/sanlock_sock.c
+@@ -15,6 +15,8 @@
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ 
++#include <string.h>
++
+ #include "sanlock.h"
+ #include "sanlock_sock.h"
+ 
+diff --git a/src/sanlock_sock.h b/src/sanlock_sock.h
+index 0121b9c..144e8d4 100644
+--- a/src/sanlock_sock.h
++++ b/src/sanlock_sock.h
+@@ -10,6 +10,8 @@
+ #ifndef __SANLOCK_SOCK_H__
+ #define __SANLOCK_SOCK_H__
+ 
++#include <stdint.h>
++
+ #define SANLK_SOCKET_NAME "sanlock.sock"
+ 
+ #define SM_MAGIC 0x04282010
+diff --git a/wdmd/wdmd.h b/wdmd/wdmd.h
+index b32598f..fd8427b 100644
+--- a/wdmd/wdmd.h
++++ b/wdmd/wdmd.h
+@@ -12,6 +12,9 @@
+ 
+ #define WDMD_NAME_SIZE 128
+ 
++#include <stdint.h>
++#include <string.h>
++
+ int wdmd_connect(void);
+ int wdmd_register(int con, char *name);
+ int wdmd_refcount_set(int con);
diff --git a/main/sanlock/sanlock.confd b/main/sanlock/sanlock.confd
new file mode 100644
index 00000000000..5cd18f14750
--- /dev/null
+++ b/main/sanlock/sanlock.confd
@@ -0,0 +1,5 @@
+#
+# Specify daemon options here.
+#
+
+sanlock_opts="-w 0 -U sanlock -G sanlock"
diff --git a/main/sanlock/sanlock.initd b/main/sanlock/sanlock.initd
new file mode 100644
index 00000000000..a776e9d9e9d
--- /dev/null
+++ b/main/sanlock/sanlock.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+
+name=sanlock
+command="/usr/sbin/$name"
+command_args="daemon $sanlock_opts"
+
+pidfile="/run/$name/$name.pid"
+
+depend() {
+	want wdmd
+}
diff --git a/main/sanlock/sanlock.pre-install b/main/sanlock/sanlock.pre-install
new file mode 100644
index 00000000000..f77b38e2562
--- /dev/null
+++ b/main/sanlock/sanlock.pre-install
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+addgroup -S sanlock 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G sanlock -g sanlock sanlock 2>/dev/null
+addgroup sanlock disk 2>/dev/null
+
+exit 0
diff --git a/main/sanlock/wdmd.confd b/main/sanlock/wdmd.confd
new file mode 100644
index 00000000000..802e7460b82
--- /dev/null
+++ b/main/sanlock/wdmd.confd
@@ -0,0 +1,5 @@
+#
+# Specify daemon options here.
+#
+
+wdmd_opts=""
diff --git a/main/sanlock/wdmd.initd b/main/sanlock/wdmd.initd
new file mode 100644
index 00000000000..eef1ba9b019
--- /dev/null
+++ b/main/sanlock/wdmd.initd
@@ -0,0 +1,7 @@
+#!/sbin/openrc-run
+
+name=wdmd
+command="/usr/sbin/$name"
+command_args="$wdmd_opts"
+
+pidfile="/run/$name/$name.pid"
diff --git a/main/sbsigntool/APKBUILD b/main/sbsigntool/APKBUILD
index b3cea7c3807..c28aa66021f 100644
--- a/main/sbsigntool/APKBUILD
+++ b/main/sbsigntool/APKBUILD
@@ -1,16 +1,15 @@
 # Contributor: Tero Hilpinen <tero.hilpinen@symbio.com>
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
-
 pkgname=sbsigntool
-pkgver=0.9.3
-pkgrel=0
-_ccancommit=261b10869ddbb4ac650ef8886c5052b1a8dbeecd
+pkgver=0.9.5
+pkgrel=2
+_ccancommit=b1f28e17227f2320d07fe052a8a48942fe17caa5
 pkgdesc="Secure Boot signing tools"
 url="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/"
-arch="x86_64"
-license="GPL-3.0-only"
-makedepends="autoconf automake bash binutils-dev gnu-efi-dev help2man openssl-dev util-linux-dev"
+arch="all !armhf !s390x !ppc64le !mips !mips64"  # limited by gnu-efi
+license="GPL-3.0-or-later WITH cryptsetup-OpenSSL-exception"
+makedepends="autoconf automake bash binutils-dev gnu-efi-dev help2man openssl-dev>3 util-linux-dev"
 options="!check"	# testsuite is not functional
 subpackages="$pkgname-doc"
 source="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/snapshot/sbsigntools-$pkgver.tar.gz
@@ -37,6 +36,7 @@ prepare() {
 }
 
 build() {
+	CFLAGS="$CFLAGS -Wno-error" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -51,6 +51,8 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="15150bed2e8eb919b0f4e7e7c7acda9cd54742aaf4c6785d2f41c6be5c2b48deed2d5eabea987a73d3867127b2870f59e9d68e86f88f2d19fccdc2d131f46b76  sbsigntools-0.9.3.tar.gz
-730c70cf88cfbf23796053aa689e419f433285c7fec7a6f4b5cf13efead12f99752db70790ff321da374180e3178aed105ce5bd3f66daadf545ef9b5bb02f6cd  ccan-261b10869ddbb4ac650ef8886c5052b1a8dbeecd.tar.gz
-9bf0a12c7735d09e1562ad901676a7ca9572265abee88580d4f830723a28423062d5b77fe02f21414884aeb046e84cf09da599754eafaad660c5938469c460a9  0001-fix-autogen.patch"
+sha512sums="
+3b23bdf1855132a91e2063039bd4d14c5564e9cd8f551711aa89a91646ff783afb6e318479e9cf46eedbc914a1eade142398c774d8dbfef8fd1d65cbbe60aabd  sbsigntools-0.9.5.tar.gz
+35a1c1de05a755df50a75440865146dd363c47015be6fa84250888f01e6bab1661c3af5db0340e1fd7f9f84db388fb2d5fcd0d86d0e1bde34ed13b23d673d740  ccan-b1f28e17227f2320d07fe052a8a48942fe17caa5.tar.gz
+9bf0a12c7735d09e1562ad901676a7ca9572265abee88580d4f830723a28423062d5b77fe02f21414884aeb046e84cf09da599754eafaad660c5938469c460a9  0001-fix-autogen.patch
+"
diff --git a/main/sc/APKBUILD b/main/sc/APKBUILD
index 9b30983bec7..1c1fb57c6cc 100644
--- a/main/sc/APKBUILD
+++ b/main/sc/APKBUILD
@@ -2,20 +2,18 @@
 # Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
 pkgname=sc
 pkgver=7.16
-pkgrel=5
+pkgrel=8
 pkgdesc="Speadsheet Calculator"
-url="https://github.com/dkastner/sc"
+url="https://github.com/erithmetic/sc"
 arch="all"
 license="Public-Domain"
-depends=""
-depends_dev=""
 makedepends="ncurses-dev byacc"
-install=""
 subpackages="$pkgname-doc"
-source="http://ibiblio.org/pub/linux/apps/financial/spreadsheet/$pkgname-$pkgver.tar.gz
-       sc_7.16-2.patch"
-
-builddir="$srcdir/$pkgname-$pkgver"
+source="http://ibiblio.org/pub/linux/apps/financial/spreadsheet/sc-$pkgver.tar.gz
+	format-security.patch
+	sc_7.16-2.patch
+	"
+options="!check"
 
 prepare() {
 	default_prepare
@@ -25,15 +23,17 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
 	mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/lib" "$pkgdir/usr/share/doc" \
-           "$pkgdir/usr/share/man/man1"
+		"$pkgdir/usr/share/man/man1"
 	make prefix="$pkgdir"/usr MANDIR="$pkgdir/usr/share/man/man1" install
 }
-sha512sums="efa495ba21d01b578a53f09101ccc28b564437317e0860904ad59136a24df9619dfc8715339296ae1567eaa8d620cdabc9bc2784962bc1c93e3bbd086856407b  sc-7.16.tar.gz
-cb025e84148085e37bfb0ee02bdda60e5ab146ded14f5f0da2f17b3dbf0ba330eef87e534f8a0085265e53295591de222350eb918bb0d1d2994894ce19b16862  sc_7.16-2.patch"
+
+sha512sums="
+efa495ba21d01b578a53f09101ccc28b564437317e0860904ad59136a24df9619dfc8715339296ae1567eaa8d620cdabc9bc2784962bc1c93e3bbd086856407b  sc-7.16.tar.gz
+c5298dc9a7debf185027df30144efdc7ab4db425ff672b4466a542f1d376d28346ef82b6b5ba7e7d6e777420217724f8f474f495d558bbaa8164d4a6beb10de1  format-security.patch
+cb025e84148085e37bfb0ee02bdda60e5ab146ded14f5f0da2f17b3dbf0ba330eef87e534f8a0085265e53295591de222350eb918bb0d1d2994894ce19b16862  sc_7.16-2.patch
+"
diff --git a/main/sc/format-security.patch b/main/sc/format-security.patch
new file mode 100644
index 00000000000..7fce1960a84
--- /dev/null
+++ b/main/sc/format-security.patch
@@ -0,0 +1,49 @@
+diff --git a/vmtbl.c b/vmtbl.c
+index 8fb6b90..09f4dc4 100644
+--- a/vmtbl.c
++++ b/vmtbl.c
+@@ -18,6 +18,8 @@
+ 
+ #include "sc.h"
+ 
++#define error(fmt, ...) printf(fmt, __VA_ARGS__)
++
+ /*
+  * check to see if *rowp && *colp are currently allocated, if not expand the
+  * current size if we can.
+@@ -55,7 +57,7 @@ checkbounds(int *rowp, int *colp)
+     newptr = (type *)scxrealloc((char *)oldptr, \
+ 	    (unsigned)(nelem * sizeof(type))); \
+     if (newptr == (type *)NULL) { \
+-	error(msg); \
++	error("%s", msg); \
+ 	return (FALSE); \
+     } \
+     oldptr = newptr /* wait incase we can't alloc */
+@@ -117,7 +119,7 @@ growtbl(int rowcol, int toprow, int topcol)
+     if ((rowcol == GROWCOL) || (rowcol == GROWBOTH)) {
+ 	if ((rowcol == GROWCOL) && ((maxcols == ABSMAXCOLS) ||
+ 		(topcol >= ABSMAXCOLS))) {
+-	    error(nowider);
++	    error("%s", nowider);
+ 	    return (FALSE);
+ 	}
+ 
+@@ -172,7 +174,7 @@ growtbl(int rowcol, int toprow, int topcol)
+ 	for (i = 0; i < maxrows; i++) {
+ 	    if ((tbl[i] = (struct ent **)scxrealloc((char *)tbl[i],
+ 		(unsigned)(newcols * sizeof(struct ent **)))) == (struct ent **)0) {
+-	    error(nowider);
++	    error("%s", nowider);
+ 	    return(FALSE);
+ 	    }
+ 	for (nullit = ATBL(tbl, i, maxcols), cnt = 0;
+@@ -190,7 +192,7 @@ growtbl(int rowcol, int toprow, int topcol)
+     for (; i < newrows; i++) {
+ 	if ((tbl[i] = (struct ent **)scxmalloc((unsigned)(newcols *
+ 		sizeof(struct ent **)))) == (struct ent **)0) {
+-	    error(nowider);
++	    error("%s", nowider);
+ 	    return(FALSE);
+ 	}
+ 	for (nullit = tbl[i], cnt = 0; cnt < newcols; cnt++, nullit++)
diff --git a/main/scdoc/APKBUILD b/main/scdoc/APKBUILD
new file mode 100644
index 00000000000..4e1fa41d54b
--- /dev/null
+++ b/main/scdoc/APKBUILD
@@ -0,0 +1,28 @@
+# Contributor: Henrik Riomar <henrik.riomar@gmail.com>
+# Contributor:
+# Maintainer: Henrik Riomar <henrik.riomar@gmail.com>
+pkgname=scdoc
+pkgver=1.11.3
+pkgrel=0
+pkgdesc="Simple man page generator written for POSIX systems written in C99"
+url="https://git.sr.ht/~sircmpwn/scdoc"
+license="MIT"
+arch="all"
+subpackages="$pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/scdoc/archive/$pkgver.tar.gz"
+
+build() {
+	make PREFIX="/usr"
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" PREFIX="/usr" install
+}
+
+sha512sums="
+fbecc505b44c396890c53c05183d34336160dbd02993ee120421fc6e2a3ec78ba349747e8acfe97af956a0081c923309290ff97fb7babafbc3ca8addc9ec92f9  scdoc-1.11.3.tar.gz
+"
diff --git a/main/scons/APKBUILD b/main/scons/APKBUILD
index 91f6505f851..d6d700b95fd 100644
--- a/main/scons/APKBUILD
+++ b/main/scons/APKBUILD
@@ -1,26 +1,61 @@
-# Contributor:
-# Maintainer:
+# Contributor: Nicolas Lorin <androw95220@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=scons
-pkgver=3.1.2
-pkgrel=0
+pkgver=4.7.0
+pkgrel=1
 pkgdesc="Software construction system"
-url="http://www.scons.org"
+url="https://scons.org/"
 arch="noarch"
 license="MIT"
 depends="python3"
-makedepends="py3-setuptools"
-source="https://downloads.sourceforge.net/scons/scons-$pkgver.tar.gz"
+makedepends="py3-gpep517 py3-setuptools py3-wheel"
+checkdepends="xz"
+subpackages="$pkgname-pyc $pkgname-doc"
+# fetching both sources, because only github tarball has tests
+# and only sourceforge tarball has prebuilt manpages
+# building the scons manpages requires working scons install...
+source="https://github.com/SCons/scons/archive/$pkgver/scons-$pkgver.tar.gz
+	https://downloads.sourceforge.net/project/scons/scons/$pkgver/SCons-$pkgver.tar.gz
+	dont-install-manpages.patch
+	"
 
-build() {
-	python3 setup.py build
+# tests need py3-psutil from community
+options="!check"
+
+prepare() {
+	default_prepare
+
+	# remove failing test
+	case $CARCH in
+	ppc64le) rm test/builderrors.py ;;
+	esac
 }
 
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+build() {
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 setup.py check
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 runtest.py -a
+}
+
+package() {
+	python3 -m installer -d "$pkgdir" .dist/*.whl
+
+	# find and remove directories containing docbook files
+	find "$pkgdir" -name 'docbook' -type d -exec rm -rf {} +
+
+	install -Dm644 \
+		"$srcdir"/SCons-$pkgver/scons.1 \
+		"$srcdir"/SCons-$pkgver/scons-time.1 \
+		"$srcdir"/SCons-$pkgver/sconsign.1 \
+		-t "$pkgdir"/usr/share/man/man1/
 }
 
-sha512sums="bfc0d58d33408a03eb37c1eff166af8139078026e6b43d6274afceac889d0a6743e359e89ad9a30be5ca43aeed26fba92fa4732854750b7d53091ef3e99b3d33  scons-3.1.2.tar.gz"
+sha512sums="
+8be4d611c375c13467a1a437e0d47873f973584d9a1be0d1cbbd345685a8f477fc19fa59ab01bca1ab7be8af0034d5cfda360090ee4b347c41f7bfea363bfe6c  scons-4.7.0.tar.gz
+d08fba3e7f058eb2eeee4a129d10b55affada6b192932f069271fcbc28fd8216b2bf7e94285d9c448235a3965a789d3a91db9ebae1945aa73306788009dd2e77  SCons-4.7.0.tar.gz
+286dbd5230119237b2ef2ece572d70c8b22d78ac71c5ac7a7a23e1c8597ca6379f324293560276777b608eb7b7af070374e8df91b593e6c656d81e13367efccd  dont-install-manpages.patch
+"
diff --git a/main/scons/dont-install-manpages.patch b/main/scons/dont-install-manpages.patch
new file mode 100644
index 00000000000..0d56f3b5d93
--- /dev/null
+++ b/main/scons/dont-install-manpages.patch
@@ -0,0 +1,17 @@
+From: Patrycja Rosa <alpine@ptrcnull.me>
+Date: Fri, 11 Feb 2022 19:02:34 +0100
+Subject: Don't install manpages with setup.py
+
+They're not in the correct place when using the GitHub release
+and from what I can see, they get installed to /usr anyway
+
+diff --git a/setup.cfg b/setup.cfg
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -67,6 +67,0 @@
+-
+-[options.data_files]
+-. = scons.1
+-    scons-time.1
+-    sconsign.1
+-
diff --git a/main/screen/APKBUILD b/main/screen/APKBUILD
index 0e17dda5c8a..735904a7a13 100644
--- a/main/screen/APKBUILD
+++ b/main/screen/APKBUILD
@@ -1,30 +1,46 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=screen
-pkgver=4.8.0
-pkgrel=0
+pkgver=4.9.1
+pkgrel=1
 pkgdesc="Window manager that multiplexes a physical terminal"
 url="https://www.gnu.org/software/screen/"
 arch="all"
 license="GPL-3.0-or-later"
 options="!check"  # No test suite.
-makedepends="ncurses-dev ncurses"
+makedepends="autoconf automake utmps-dev ncurses-dev libutempter-dev ncurses"
 subpackages="$pkgname-doc"
-source="https://ftp.gnu.org/gnu/screen/screen-$pkgver.tar.gz"
+source="https://ftp.gnu.org/gnu/screen/screen-$pkgver.tar.gz
+	utmpx.patch
+	"
 
 # secfixes:
+#   4.9.0-r3:
+#     - CVE-2023-24626
+#   4.8.0-r4:
+#     - CVE-2021-26937
 #   4.8.0-r0:
 #     - CVE-2020-9366
 
+prepare() {
+	default_prepare
+	./autogen.sh
+}
+
 build() {
+	CFLAGS="$CFLAGS -DNONETHACK -DGETUTENT -I/usr/include/utmps -flto=auto" \
+	LIBS="-lutmps -lskarnet" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
+		--with-sys-screenrc=/etc/screenrc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--enable-colors256
+		--enable-colors256 \
+		--enable-telnet \
+		--enable-rxvt_osc
 	make
 }
 
@@ -39,4 +55,7 @@ package() {
 	install -Dm644 etc/screenrc "$pkgdir"/etc/skel/.screenrc
 }
 
-sha512sums="770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c  screen-4.8.0.tar.gz"
+sha512sums="
+1f278313528815f4246bb162ced611c5d77321d11055e8d853168dc804c75d5f78568056a23e46db0640e1605e5cad4a5ce05e95e50cf02bb322cb6f57e5a126  screen-4.9.1.tar.gz
+82aca3e16c8cd7a3029d3b589ff2dd3471708d6287979ebb5cfdaedbd1f3012c0cd660b131e0cbe142b99786e49ef8b24c63159523d870e95ccf71ec94b82634  utmpx.patch
+"
diff --git a/main/screen/utmpx.patch b/main/screen/utmpx.patch
new file mode 100644
index 00000000000..c8c6f444bd1
--- /dev/null
+++ b/main/screen/utmpx.patch
@@ -0,0 +1,21 @@
+--- screen-4.6.2/os.h.old	2018-09-27 23:11:11.655480028 -0700
++++ screen-4.6.2/os.h	2018-09-27 23:11:34.745808665 -0700
+@@ -250,17 +250,13 @@
+ #endif
+ 
+ #if defined(UTMPOK) || defined(BUGGYGETLOGIN)
+-# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)
++# if defined(linux)
+ #  include <utmpx.h>
+ #  define UTMPFILE	UTMPX_FILE
+ #  define utmp		utmpx
+-#  define getutent	getutxent
+ #  define getutid	getutxid
+ #  define getutline	getutxline
+ #  define pututline	pututxline
+-#  define setutent	setutxent
+-#  define endutent	endutxent
+-#  define ut_time	ut_xtime
+ # else /* SVR4 */
+ #  include <utmp.h>
+ # endif /* SVR4 */
diff --git a/main/scstadmin/APKBUILD b/main/scstadmin/APKBUILD
index e706689ea19..638a602928e 100644
--- a/main/scstadmin/APKBUILD
+++ b/main/scstadmin/APKBUILD
@@ -2,36 +2,35 @@
 # Maintainer:
 pkgname=scstadmin
 pkgver=2.2.0
-pkgrel=2
+pkgrel=7
 pkgdesc="SCST administration tool written in perl"
-url="http://scst.sourceforge.net"
+url="https://scst.sourceforge.net/"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-only"
+options="!check" # no testsuite
 depends="perl"
 makedepends="perl-dev"
-install=
-subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/scst/$pkgname-$pkgver.tar.bz2
+subpackages="$pkgname-doc $pkgname-openrc"
+source="https://downloads.sourceforge.net/scst/scstadmin-$pkgver.tar.bz2
 	scstadmin.initd
 	"
 
-_builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-        cd "$_builddir"/scstadmin.sysfs/scst-0.9.10
-        PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	cd "$_builddir"
+build() {
+	cd scstadmin.sysfs/scst-0.9.10
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 package() {
-	cd "$_builddir"/scstadmin.sysfs/scst-0.9.10
-	make DESTDIR="$pkgdir" install || return 1
+	cd scstadmin.sysfs/scst-0.9.10
+	make DESTDIR="$pkgdir" install
 
-        cd "$_builddir"
+	cd "$builddir"
 	mkdir -p "$pkgdir"/var/lib/scst/pr
-	install -Dm755 scstadmin.sysfs/scstadmin "$pkgdir"/usr/sbin/scstadmin || return 1
-	install -Dm755 "$srcdir"/scstadmin.initd "$pkgdir"/etc/init.d/scstadmin || return 1
+	install -Dm755 scstadmin.sysfs/scstadmin "$pkgdir"/usr/sbin/scstadmin
+	install -Dm755 "$srcdir"/scstadmin.initd "$pkgdir"/etc/init.d/scstadmin
 }
 
-sha512sums="0c1ebf27203c63f3ec16a6c4ca159d4203da902ed8cc3fc6b8a415847c39a83294609c325e0c736e60a8e7cbb445ab2f3914dd9df980238363c6d8be98f0d08e  scstadmin-2.2.0.tar.bz2
-ba39bb8e7bfd77cfcdac42c8f34867d1dbccd0f153307e1630ecc0d11a02fb8275aecd87ea8a05c2d1fa939457e434a5a8c26c69f6f1cf9a47ef486eb0ab43a3  scstadmin.initd"
+sha512sums="
+0c1ebf27203c63f3ec16a6c4ca159d4203da902ed8cc3fc6b8a415847c39a83294609c325e0c736e60a8e7cbb445ab2f3914dd9df980238363c6d8be98f0d08e  scstadmin-2.2.0.tar.bz2
+ba39bb8e7bfd77cfcdac42c8f34867d1dbccd0f153307e1630ecc0d11a02fb8275aecd87ea8a05c2d1fa939457e434a5a8c26c69f6f1cf9a47ef486eb0ab43a3  scstadmin.initd
+"
diff --git a/main/scudo-malloc/0001-Add-makefile.patch b/main/scudo-malloc/0001-Add-makefile.patch
new file mode 100644
index 00000000000..47a0cc2d9cd
--- /dev/null
+++ b/main/scudo-malloc/0001-Add-makefile.patch
@@ -0,0 +1,68 @@
+From 64853e3c0a51103ffef34bb899ca92a3ea0cde1e Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Mon, 30 Oct 2023 21:59:49 +0100
+Subject: [PATCH] Add makefile
+
+---
+ compiler-rt/lib/scudo/standalone/Makefile | 42 +++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+ create mode 100644 compiler-rt/lib/scudo/standalone/Makefile
+
+diff --git a/compiler-rt/lib/scudo/standalone/Makefile b/compiler-rt/lib/scudo/standalone/Makefile
+new file mode 100644
+index 00000000000..e9e5b95dd42
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,49 @@
++CXX = c++
++AR = ar
++
++override CXXFLAGS+= -Wall -Wextra -Wno-mismatched-new-delete -std=c++17 -fvisibility=hidden -fno-exceptions -fno-rtti -pthread -fPIC -O3 -Iinclude -I. -DNDEBUG -DSCUDO_CAN_USE_PRIMARY64=0
++
++sources = $(wildcard *.cpp)
++objects = $(sources:%.cpp=%.o)
++
++test_skip = $(wildcard tests/wrappers_*_test.cpp)
++test_sources = $(filter-out $(test_skip), $(wildcard tests/*_test.cpp)) tests/scudo_unit_test_main.cpp
++test_objects = $(test_sources:%.cpp=%.o)
++
++gtest_libs = -lgtest
++
++CXXFLAGS_crc32 = -mcrc32
++
++TESTS ?= yes
++
++SCUDO_TEST=
++ifneq ($(TESTS),no)
++SCUDO_TEST=scudo_test
++endif
++
++.PHONY: all
++all: libscudo.so libscudo.a $(SCUDO_TEST)
++
++libscudo.so: $(objects)
++	$(CXX) $(objects) $(CXXFLAGS) $(LDFLAGS) -shared -o $@
++
++libscudo.a: $(objects)
++	$(AR) rcs $@ $(objects)
++
++scudo_test: $(objects) $(test_objects) libscudo.a
++	$(CXX) $(test_objects) -o $@ $(CXXFLAGS) -g $(LDFLAGS) -L. libscudo.a $(gtest_libs)
++
++.PHONY: test
++test: scudo_test
++	./scudo_test
++
++crc32_hw.o: CXXFLAGS += $(CXXFLAGS_crc32)
++$(objects): CXXFLAGS += -ffreestanding -nostdinc++
++
++%.o: %.cpp
++	$(CXX) $< $(CXXFLAGS) -c -o $@
++
++clean:
++	-rm -f $(test_objects) $(objects) libscudo.a libscudo.so scudo_test
++
++
+-- 
+2.42.0
+
diff --git a/main/scudo-malloc/0001-scudo-Detach-the-hooks-from-Scudo-s-internal-impleme.patch b/main/scudo-malloc/0001-scudo-Detach-the-hooks-from-Scudo-s-internal-impleme.patch
new file mode 100644
index 00000000000..ac7ad9f9427
--- /dev/null
+++ b/main/scudo-malloc/0001-scudo-Detach-the-hooks-from-Scudo-s-internal-impleme.patch
@@ -0,0 +1,782 @@
+From 4f76810d4860d851f069aa0caca24c54ab698c3b Mon Sep 17 00:00:00 2001
+From: Chia-hung Duan <chiahungduan@google.com>
+Date: Thu, 24 Aug 2023 17:52:35 +0000
+Subject: [PATCH] [scudo] Detach the hooks from Scudo's internal implementation
+
+Move the invocation of hooks from Scudo internal to wrapper_c.cpp and
+wrapper_c_bionic.cpp respectively. Therefore, Scudo's core algorithm
+doesnt need to worry about the reentrant of hooks and leave the caring
+of reentrant to the hook users.
+
+Reviewed By: hctim, cferris, chelfi
+
+Differential Revision: https://reviews.llvm.org/D152188
+---
+ compiler-rt/lib/scudo/standalone/combined.h   |  10 --
+ .../lib/scudo/standalone/tests/CMakeLists.txt |   8 --
+ .../standalone/tests/scudo_hooks_test.cpp     | 114 ------------------
+ .../standalone/tests/wrappers_c_test.cpp      |  64 +++++++++-
+ .../standalone/tests/wrappers_cpp_test.cpp    |  34 ++++++
+ .../lib/scudo/standalone/wrappers_c.cpp       |   1 +
+ .../lib/scudo/standalone/wrappers_c.inc       |  73 ++++++++---
+ .../scudo/standalone/wrappers_c_bionic.cpp    |   1 +
+ .../lib/scudo/standalone/wrappers_cpp.cpp     |  63 ++++++++--
+ 9 files changed, 206 insertions(+), 162 deletions(-)
+ delete mode 100644 compiler-rt/lib/scudo/standalone/tests/scudo_hooks_test.cpp
+
+diff --git a/compiler-rt/lib/scudo/standalone/combined.h b/compiler-rt/lib/scudo/standalone/combined.h
+index e1db7a703011..8cc84adcd484 100644
+--- a/combined.h
++++ b/combined.h
+@@ -329,8 +329,6 @@ public:
+ #ifdef GWP_ASAN_HOOKS
+     if (UNLIKELY(GuardedAlloc.shouldSample())) {
+       if (void *Ptr = GuardedAlloc.allocate(Size, Alignment)) {
+-        if (UNLIKELY(&__scudo_allocate_hook))
+-          __scudo_allocate_hook(Ptr, Size);
+         Stats.lock();
+         Stats.add(StatAllocated, GuardedAllocSlotSize);
+         Stats.sub(StatFree, GuardedAllocSlotSize);
+@@ -535,9 +533,6 @@ public:
+         Chunk::SizeOrUnusedBytesMask;
+     Chunk::storeHeader(Cookie, Ptr, &Header);
+ 
+-    if (UNLIKELY(&__scudo_allocate_hook))
+-      __scudo_allocate_hook(TaggedPtr, Size);
+-
+     return TaggedPtr;
+   }
+ 
+@@ -551,9 +546,6 @@ public:
+     // being destroyed properly. Any other heap operation will do a full init.
+     initThreadMaybe(/*MinimalInit=*/true);
+ 
+-    if (UNLIKELY(&__scudo_deallocate_hook))
+-      __scudo_deallocate_hook(Ptr);
+-
+     if (UNLIKELY(!Ptr))
+       return;
+ 
+@@ -697,8 +689,6 @@ public:
+     void *NewPtr = allocate(NewSize, Chunk::Origin::Malloc, Alignment);
+     if (LIKELY(NewPtr)) {
+       memcpy(NewPtr, OldTaggedPtr, Min(NewSize, OldSize));
+-      if (UNLIKELY(&__scudo_deallocate_hook))
+-        __scudo_deallocate_hook(OldTaggedPtr);
+       quarantineOrDeallocateChunk(Options, OldTaggedPtr, &OldHeader, OldSize);
+     }
+     return NewPtr;
+diff --git a/compiler-rt/lib/scudo/standalone/tests/CMakeLists.txt b/compiler-rt/lib/scudo/standalone/tests/CMakeLists.txt
+index cbb85ce3ec2e..71ad3830c88c 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -137,11 +137,3 @@ set(SCUDO_CXX_UNIT_TEST_SOURCES
+ add_scudo_unittest(ScudoCxxUnitTest
+   SOURCES ${SCUDO_CXX_UNIT_TEST_SOURCES}
+   ADDITIONAL_RTOBJECTS RTScudoStandaloneCWrappers RTScudoStandaloneCxxWrappers)
+-
+-set(SCUDO_HOOKS_UNIT_TEST_SOURCES
+-  scudo_hooks_test.cpp
+-  scudo_unit_test_main.cpp
+-  )
+-
+-add_scudo_unittest(ScudoHooksUnitTest
+-  SOURCES ${SCUDO_HOOKS_UNIT_TEST_SOURCES})
+diff --git a/compiler-rt/lib/scudo/standalone/tests/scudo_hooks_test.cpp b/compiler-rt/lib/scudo/standalone/tests/scudo_hooks_test.cpp
+deleted file mode 100644
+index 7184ec12a8bb..000000000000
+--- a/tests/scudo_hooks_test.cpp
++++ /dev/null
+@@ -1,114 +0,0 @@
+-//===-- scudo_hooks_test.cpp ------------------------------------*- C++ -*-===//
+-//
+-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+-// See https://llvm.org/LICENSE.txt for license information.
+-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+-//
+-//===----------------------------------------------------------------------===//
+-
+-#include "tests/scudo_unit_test.h"
+-
+-#include "allocator_config.h"
+-#include "combined.h"
+-
+-namespace {
+-void *LastAllocatedPtr = nullptr;
+-size_t LastRequestSize = 0;
+-void *LastDeallocatedPtr = nullptr;
+-} // namespace
+-
+-// Scudo defines weak symbols that can be defined by a client binary
+-// to register callbacks at key points in the allocation timeline.  In
+-// order to enforce those invariants, we provide definitions that
+-// update some global state every time they are called, so that tests
+-// can inspect their effects.  An unfortunate side effect of this
+-// setup is that because those symbols are part of the binary, they
+-// can't be selectively enabled; that means that they will get called
+-// on unrelated tests in the same compilation unit. To mitigate this
+-// issue, we insulate those tests in a separate compilation unit.
+-extern "C" {
+-__attribute__((visibility("default"))) void __scudo_allocate_hook(void *Ptr,
+-                                                                  size_t Size) {
+-  LastAllocatedPtr = Ptr;
+-  LastRequestSize = Size;
+-}
+-__attribute__((visibility("default"))) void __scudo_deallocate_hook(void *Ptr) {
+-  LastDeallocatedPtr = Ptr;
+-}
+-}
+-
+-// Simple check that allocation callbacks, when registered, are called:
+-//   1) __scudo_allocate_hook is called when allocating.
+-//   2) __scudo_deallocate_hook is called when deallocating.
+-//   3) Both hooks are called when reallocating.
+-//   4) Neither are called for a no-op reallocation.
+-TEST(ScudoHooksTest, AllocateHooks) {
+-  scudo::Allocator<scudo::DefaultConfig> Allocator;
+-  constexpr scudo::uptr DefaultSize = 16U;
+-  constexpr scudo::Chunk::Origin Origin = scudo::Chunk::Origin::Malloc;
+-
+-  // Simple allocation and deallocation.
+-  {
+-    LastAllocatedPtr = nullptr;
+-    LastRequestSize = 0;
+-
+-    void *Ptr = Allocator.allocate(DefaultSize, Origin);
+-
+-    EXPECT_EQ(Ptr, LastAllocatedPtr);
+-    EXPECT_EQ(DefaultSize, LastRequestSize);
+-
+-    LastDeallocatedPtr = nullptr;
+-
+-    Allocator.deallocate(Ptr, Origin);
+-
+-    EXPECT_EQ(Ptr, LastDeallocatedPtr);
+-  }
+-
+-  // Simple no-op, same size reallocation.
+-  {
+-    void *Ptr = Allocator.allocate(DefaultSize, Origin);
+-
+-    LastAllocatedPtr = nullptr;
+-    LastRequestSize = 0;
+-    LastDeallocatedPtr = nullptr;
+-
+-    void *NewPtr = Allocator.reallocate(Ptr, DefaultSize);
+-
+-    EXPECT_EQ(Ptr, NewPtr);
+-    EXPECT_EQ(nullptr, LastAllocatedPtr);
+-    EXPECT_EQ(0U, LastRequestSize);
+-    EXPECT_EQ(nullptr, LastDeallocatedPtr);
+-  }
+-
+-  // Reallocation in increasing size classes. This ensures that at
+-  // least one of the reallocations will be meaningful.
+-  {
+-    void *Ptr = Allocator.allocate(0, Origin);
+-
+-    for (scudo::uptr ClassId = 1U;
+-         ClassId <= scudo::DefaultConfig::Primary::SizeClassMap::LargestClassId;
+-         ++ClassId) {
+-      const scudo::uptr Size =
+-          scudo::DefaultConfig::Primary::SizeClassMap::getSizeByClassId(
+-              ClassId);
+-
+-      LastAllocatedPtr = nullptr;
+-      LastRequestSize = 0;
+-      LastDeallocatedPtr = nullptr;
+-
+-      void *NewPtr = Allocator.reallocate(Ptr, Size);
+-
+-      if (NewPtr != Ptr) {
+-        EXPECT_EQ(NewPtr, LastAllocatedPtr);
+-        EXPECT_EQ(Size, LastRequestSize);
+-        EXPECT_EQ(Ptr, LastDeallocatedPtr);
+-      } else {
+-        EXPECT_EQ(nullptr, LastAllocatedPtr);
+-        EXPECT_EQ(0U, LastRequestSize);
+-        EXPECT_EQ(nullptr, LastDeallocatedPtr);
+-      }
+-
+-      Ptr = NewPtr;
+-    }
+-  }
+-}
+diff --git a/compiler-rt/lib/scudo/standalone/tests/wrappers_c_test.cpp b/compiler-rt/lib/scudo/standalone/tests/wrappers_c_test.cpp
+index c921da980cad..d0cc0fa3c650 100644
+--- a/tests/wrappers_c_test.cpp
++++ b/tests/wrappers_c_test.cpp
+@@ -37,6 +37,16 @@
+ #define HAVE_VALLOC 1
+ #endif
+ 
++struct AllocContext {
++  void *Ptr;
++  size_t Size;
++};
++struct DeallocContext {
++  void *Ptr;
++};
++static AllocContext AC;
++static DeallocContext DC;
++
+ extern "C" {
+ void malloc_enable(void);
+ void malloc_disable(void);
+@@ -45,6 +55,15 @@ int malloc_iterate(uintptr_t base, size_t size,
+                    void *arg);
+ void *valloc(size_t size);
+ void *pvalloc(size_t size);
++
++__attribute__((visibility("default"))) void __scudo_allocate_hook(void *Ptr,
++                                                                  size_t Size) {
++  AC.Ptr = Ptr;
++  AC.Size = Size;
++}
++__attribute__((visibility("default"))) void __scudo_deallocate_hook(void *Ptr) {
++  DC.Ptr = Ptr;
++}
+ }
+ 
+ // Note that every C allocation function in the test binary will be fulfilled
+@@ -64,6 +83,8 @@ TEST(ScudoWrappersCDeathTest, Malloc) {
+   EXPECT_NE(P, nullptr);
+   EXPECT_LE(Size, malloc_usable_size(P));
+   EXPECT_EQ(reinterpret_cast<uintptr_t>(P) % FIRST_32_SECOND_64(8U, 16U), 0U);
++  EXPECT_EQ(P, AC.Ptr);
++  EXPECT_EQ(Size, AC.Size);
+ 
+   // An update to this warning in Clang now triggers in this line, but it's ok
+   // because the check is expecting a bad pointer and should fail.
+@@ -78,6 +99,7 @@ TEST(ScudoWrappersCDeathTest, Malloc) {
+ #endif
+ 
+   free(P);
++  EXPECT_EQ(P, DC.Ptr);
+   EXPECT_DEATH(free(P), "");
+ 
+   P = malloc(0U);
+@@ -93,9 +115,12 @@ TEST(ScudoWrappersCTest, Calloc) {
+   void *P = calloc(1U, Size);
+   EXPECT_NE(P, nullptr);
+   EXPECT_LE(Size, malloc_usable_size(P));
++  EXPECT_EQ(P, AC.Ptr);
++  EXPECT_EQ(Size, AC.Size);
+   for (size_t I = 0; I < Size; I++)
+     EXPECT_EQ((reinterpret_cast<uint8_t *>(P))[I], 0U);
+   free(P);
++  EXPECT_EQ(P, DC.Ptr);
+ 
+   P = calloc(1U, 0U);
+   EXPECT_NE(P, nullptr);
+@@ -146,14 +171,20 @@ TEST(ScudoWrappersCTest, Memalign) {
+     EXPECT_NE(P, nullptr);
+     EXPECT_LE(Size, malloc_usable_size(P));
+     EXPECT_EQ(reinterpret_cast<uintptr_t>(P) % Alignment, 0U);
++    EXPECT_EQ(P, AC.Ptr);
++    EXPECT_EQ(Size, AC.Size);
+     free(P);
++    EXPECT_EQ(P, DC.Ptr);
+ 
+     P = nullptr;
+     EXPECT_EQ(posix_memalign(&P, Alignment, Size), 0);
+     EXPECT_NE(P, nullptr);
+     EXPECT_LE(Size, malloc_usable_size(P));
+     EXPECT_EQ(reinterpret_cast<uintptr_t>(P) % Alignment, 0U);
++    EXPECT_EQ(P, AC.Ptr);
++    EXPECT_EQ(Size, AC.Size);
+     free(P);
++    EXPECT_EQ(P, DC.Ptr);
+   }
+ 
+   EXPECT_EQ(memalign(4096U, SIZE_MAX), nullptr);
+@@ -165,7 +196,10 @@ TEST(ScudoWrappersCTest, Memalign) {
+     for (size_t Alignment = 0U; Alignment <= 128U; Alignment++) {
+       P = memalign(Alignment, 1024U);
+       EXPECT_NE(P, nullptr);
++      EXPECT_EQ(P, AC.Ptr);
++      EXPECT_EQ(Size, AC.Size);
+       free(P);
++      EXPECT_EQ(P, DC.Ptr);
+     }
+   }
+ }
+@@ -176,7 +210,10 @@ TEST(ScudoWrappersCTest, AlignedAlloc) {
+   EXPECT_NE(P, nullptr);
+   EXPECT_LE(Alignment * 4U, malloc_usable_size(P));
+   EXPECT_EQ(reinterpret_cast<uintptr_t>(P) % Alignment, 0U);
++  EXPECT_EQ(P, AC.Ptr);
++  EXPECT_EQ(Alignment * 4U, AC.Size);
+   free(P);
++  EXPECT_EQ(P, DC.Ptr);
+ 
+   errno = 0;
+   P = aligned_alloc(Alignment, Size);
+@@ -186,31 +223,52 @@ TEST(ScudoWrappersCTest, AlignedAlloc) {
+ 
+ TEST(ScudoWrappersCDeathTest, Realloc) {
+   // realloc(nullptr, N) is malloc(N)
+-  void *P = realloc(nullptr, 0U);
++  void *P = realloc(nullptr, Size);
+   EXPECT_NE(P, nullptr);
++  EXPECT_EQ(P, AC.Ptr);
++  EXPECT_EQ(Size, AC.Size);
+   free(P);
++  EXPECT_EQ(P, DC.Ptr);
+ 
+   P = malloc(Size);
+   EXPECT_NE(P, nullptr);
+   // realloc(P, 0U) is free(P) and returns nullptr
+   EXPECT_EQ(realloc(P, 0U), nullptr);
++  EXPECT_EQ(P, DC.Ptr);
+ 
+   P = malloc(Size);
+   EXPECT_NE(P, nullptr);
+   EXPECT_LE(Size, malloc_usable_size(P));
+   memset(P, 0x42, Size);
+ 
++  AC.Ptr = reinterpret_cast<void *>(0xdeadbeef);
++  void *OldP = P;
+   P = realloc(P, Size * 2U);
+   EXPECT_NE(P, nullptr);
+   EXPECT_LE(Size * 2U, malloc_usable_size(P));
+   for (size_t I = 0; I < Size; I++)
+     EXPECT_EQ(0x42, (reinterpret_cast<uint8_t *>(P))[I]);
++  if (OldP == P) {
++    EXPECT_EQ(AC.Ptr, reinterpret_cast<void *>(0xdeadbeef));
++  } else {
++    EXPECT_EQ(P, AC.Ptr);
++    EXPECT_EQ(Size * 2U, AC.Size);
++    EXPECT_EQ(OldP, DC.Ptr);
++  }
+ 
++  AC.Ptr = reinterpret_cast<void *>(0xdeadbeef);
++  OldP = P;
+   P = realloc(P, Size / 2U);
+   EXPECT_NE(P, nullptr);
+   EXPECT_LE(Size / 2U, malloc_usable_size(P));
+   for (size_t I = 0; I < Size / 2U; I++)
+     EXPECT_EQ(0x42, (reinterpret_cast<uint8_t *>(P))[I]);
++  if (OldP == P) {
++    EXPECT_EQ(AC.Ptr, reinterpret_cast<void *>(0xdeadbeef));
++  } else {
++    EXPECT_EQ(P, AC.Ptr);
++    EXPECT_EQ(Size / 2U, AC.Size);
++  }
+   free(P);
+ 
+   EXPECT_DEATH(P = realloc(P, Size), "");
+@@ -273,7 +331,11 @@ TEST(ScudoWrappersCTest, OtherAlloc) {
+   EXPECT_NE(P, nullptr);
+   EXPECT_EQ(reinterpret_cast<uintptr_t>(P) & (PageSize - 1), 0U);
+   EXPECT_LE(PageSize, malloc_usable_size(P));
++  EXPECT_EQ(P, AC.Ptr);
++  // Size will be rounded up to PageSize.
++  EXPECT_EQ(PageSize, AC.Size);
+   free(P);
++  EXPECT_EQ(P, DC.Ptr);
+ 
+   EXPECT_EQ(pvalloc(SIZE_MAX), nullptr);
+ 
+diff --git a/compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp b/compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp
+index 987e4099aa77..654bf5473178 100644
+--- a/tests/wrappers_cpp_test.cpp
++++ b/tests/wrappers_cpp_test.cpp
+@@ -24,47 +24,81 @@
+ #define SKIP_MISMATCH_TESTS 0
+ #endif
+ 
++struct AllocContext {
++  void *Ptr;
++  size_t Size;
++};
++struct DeallocContext {
++  void *Ptr;
++};
++static AllocContext AC;
++static DeallocContext DC;
++
+ void operator delete(void *, size_t) noexcept;
+ void operator delete[](void *, size_t) noexcept;
+ 
++extern "C" {
++__attribute__((visibility("default"))) void __scudo_allocate_hook(void *Ptr,
++                                                                  size_t Size) {
++  AC.Ptr = Ptr;
++  AC.Size = Size;
++}
++__attribute__((visibility("default"))) void __scudo_deallocate_hook(void *Ptr) {
++  DC.Ptr = Ptr;
++}
++}
+ // Note that every Cxx allocation function in the test binary will be fulfilled
+ // by Scudo. See the comment in the C counterpart of this file.
+ 
+ template <typename T> static void testCxxNew() {
+   T *P = new T;
+   EXPECT_NE(P, nullptr);
++  EXPECT_EQ(P, AC.Ptr);
++  EXPECT_EQ(sizeof(T), AC.Size);
+   memset(P, 0x42, sizeof(T));
+   EXPECT_DEATH(delete[] P, "");
+   delete P;
++  EXPECT_EQ(P, DC.Ptr);
+   EXPECT_DEATH(delete P, "");
+ 
+   P = new T;
+   EXPECT_NE(P, nullptr);
+   memset(P, 0x42, sizeof(T));
+   operator delete(P, sizeof(T));
++  EXPECT_EQ(P, DC.Ptr);
+ 
+   P = new (std::nothrow) T;
++  EXPECT_EQ(P, AC.Ptr);
++  EXPECT_EQ(sizeof(T), AC.Size);
+   EXPECT_NE(P, nullptr);
+   memset(P, 0x42, sizeof(T));
+   delete P;
++  EXPECT_EQ(P, DC.Ptr);
+ 
+   const size_t N = 16U;
+   T *A = new T[N];
+   EXPECT_NE(A, nullptr);
++  EXPECT_EQ(A, AC.Ptr);
++  EXPECT_EQ(sizeof(T) * N, AC.Size);
+   memset(A, 0x42, sizeof(T) * N);
+   EXPECT_DEATH(delete A, "");
+   delete[] A;
++  EXPECT_EQ(A, DC.Ptr);
+   EXPECT_DEATH(delete[] A, "");
+ 
+   A = new T[N];
+   EXPECT_NE(A, nullptr);
+   memset(A, 0x42, sizeof(T) * N);
+   operator delete[](A, sizeof(T) * N);
++  EXPECT_EQ(A, DC.Ptr);
+ 
+   A = new (std::nothrow) T[N];
++  EXPECT_EQ(A, AC.Ptr);
++  EXPECT_EQ(sizeof(T) * N, AC.Size);
+   EXPECT_NE(A, nullptr);
+   memset(A, 0x42, sizeof(T) * N);
+   delete[] A;
++  EXPECT_EQ(A, DC.Ptr);
+ }
+ 
+ class Pixel {
+diff --git a/compiler-rt/lib/scudo/standalone/wrappers_c.cpp b/compiler-rt/lib/scudo/standalone/wrappers_c.cpp
+index b4d51be716cc..0b204271c81c 100644
+--- a/wrappers_c.cpp
++++ b/wrappers_c.cpp
+@@ -12,6 +12,7 @@
+ #if !SCUDO_ANDROID || !_BIONIC
+ 
+ #include "allocator_config.h"
++#include "scudo/interface.h"
+ #include "wrappers_c.h"
+ #include "wrappers_c_checks.h"
+ 
+diff --git a/compiler-rt/lib/scudo/standalone/wrappers_c.inc b/compiler-rt/lib/scudo/standalone/wrappers_c.inc
+index a475927b9f51..0bd5eddfa0b1 100644
+--- a/wrappers_c.inc
++++ b/wrappers_c.inc
+@@ -17,6 +17,16 @@
+ #define SCUDO_MALLOC_ALIGNMENT FIRST_32_SECOND_64(8U, 16U)
+ #endif
+ 
++static void reportAllocation(void *ptr, size_t size) {
++  if (__scudo_allocate_hook && ptr)
++    __scudo_allocate_hook(ptr, size);
++}
++
++static void reportDeallocation(void *ptr) {
++  if (__scudo_deallocate_hook)
++    __scudo_deallocate_hook(ptr);
++}
++
+ extern "C" {
+ 
+ INTERFACE WEAK void *SCUDO_PREFIX(calloc)(size_t nmemb, size_t size) {
+@@ -28,11 +38,14 @@ INTERFACE WEAK void *SCUDO_PREFIX(calloc)(size_t nmemb, size_t size) {
+     }
+     scudo::reportCallocOverflow(nmemb, size);
+   }
+-  return scudo::setErrnoOnNull(SCUDO_ALLOCATOR.allocate(
+-      Product, scudo::Chunk::Origin::Malloc, SCUDO_MALLOC_ALIGNMENT, true));
++  void *Ptr = SCUDO_ALLOCATOR.allocate(Product, scudo::Chunk::Origin::Malloc,
++                                       SCUDO_MALLOC_ALIGNMENT, true);
++  reportAllocation(Ptr, Product);
++  return scudo::setErrnoOnNull(Ptr);
+ }
+ 
+ INTERFACE WEAK void SCUDO_PREFIX(free)(void *ptr) {
++  reportDeallocation(ptr);
+   SCUDO_ALLOCATOR.deallocate(ptr, scudo::Chunk::Origin::Malloc);
+ }
+ 
+@@ -75,8 +88,10 @@ INTERFACE WEAK struct __scudo_mallinfo2 SCUDO_PREFIX(mallinfo2)(void) {
+ #endif
+ 
+ INTERFACE WEAK void *SCUDO_PREFIX(malloc)(size_t size) {
+-  return scudo::setErrnoOnNull(SCUDO_ALLOCATOR.allocate(
+-      size, scudo::Chunk::Origin::Malloc, SCUDO_MALLOC_ALIGNMENT));
++  void *Ptr = SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Malloc,
++                                       SCUDO_MALLOC_ALIGNMENT);
++  reportAllocation(Ptr, size);
++  return scudo::setErrnoOnNull(Ptr);
+ }
+ 
+ #if SCUDO_ANDROID
+@@ -105,8 +120,10 @@ INTERFACE WEAK void *SCUDO_PREFIX(memalign)(size_t alignment, size_t size) {
+       scudo::reportAlignmentNotPowerOfTwo(alignment);
+     }
+   }
+-  return SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Memalign,
+-                                  alignment);
++  void *Ptr =
++      SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Memalign, alignment);
++  reportAllocation(Ptr, size);
++  return Ptr;
+ }
+ 
+ INTERFACE WEAK int SCUDO_PREFIX(posix_memalign)(void **memptr, size_t alignment,
+@@ -120,6 +137,8 @@ INTERFACE WEAK int SCUDO_PREFIX(posix_memalign)(void **memptr, size_t alignment,
+       SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Memalign, alignment);
+   if (UNLIKELY(!Ptr))
+     return ENOMEM;
++  reportAllocation(Ptr, size);
++
+   *memptr = Ptr;
+   return 0;
+ }
+@@ -134,26 +153,42 @@ INTERFACE WEAK void *SCUDO_PREFIX(pvalloc)(size_t size) {
+     scudo::reportPvallocOverflow(size);
+   }
+   // pvalloc(0) should allocate one page.
+-  return scudo::setErrnoOnNull(
++  void *Ptr =
+       SCUDO_ALLOCATOR.allocate(size ? scudo::roundUp(size, PageSize) : PageSize,
+-                               scudo::Chunk::Origin::Memalign, PageSize));
++                               scudo::Chunk::Origin::Memalign, PageSize);
++  reportAllocation(Ptr, scudo::roundUp(size, PageSize));
++
++  return scudo::setErrnoOnNull(Ptr);
+ }
+ 
+ INTERFACE WEAK void *SCUDO_PREFIX(realloc)(void *ptr, size_t size) {
+-  if (!ptr)
+-    return scudo::setErrnoOnNull(SCUDO_ALLOCATOR.allocate(
+-        size, scudo::Chunk::Origin::Malloc, SCUDO_MALLOC_ALIGNMENT));
++  if (!ptr) {
++    void *Ptr = SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Malloc,
++                                         SCUDO_MALLOC_ALIGNMENT);
++    reportAllocation(Ptr, size);
++    return scudo::setErrnoOnNull(Ptr);
++  }
+   if (size == 0) {
++    reportDeallocation(ptr);
+     SCUDO_ALLOCATOR.deallocate(ptr, scudo::Chunk::Origin::Malloc);
+     return nullptr;
+   }
+-  return scudo::setErrnoOnNull(
+-      SCUDO_ALLOCATOR.reallocate(ptr, size, SCUDO_MALLOC_ALIGNMENT));
++
++  void *NewPtr = SCUDO_ALLOCATOR.reallocate(ptr, size, SCUDO_MALLOC_ALIGNMENT);
++  if (NewPtr != ptr) {
++    reportAllocation(NewPtr, size);
++    reportDeallocation(ptr);
++  }
++
++  return scudo::setErrnoOnNull(NewPtr);
+ }
+ 
+ INTERFACE WEAK void *SCUDO_PREFIX(valloc)(size_t size) {
+-  return scudo::setErrnoOnNull(SCUDO_ALLOCATOR.allocate(
+-      size, scudo::Chunk::Origin::Memalign, scudo::getPageSizeCached()));
++  void *Ptr = SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Memalign,
++                                       scudo::getPageSizeCached());
++  reportAllocation(Ptr, size);
++
++  return scudo::setErrnoOnNull(Ptr);
+ }
+ 
+ INTERFACE WEAK int SCUDO_PREFIX(malloc_iterate)(
+@@ -234,8 +269,12 @@ INTERFACE WEAK void *SCUDO_PREFIX(aligned_alloc)(size_t alignment,
+     }
+     scudo::reportInvalidAlignedAllocAlignment(alignment, size);
+   }
+-  return scudo::setErrnoOnNull(
+-      SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Malloc, alignment));
++
++  void *Ptr =
++      SCUDO_ALLOCATOR.allocate(size, scudo::Chunk::Origin::Malloc, alignment);
++  reportAllocation(Ptr, size);
++
++  return scudo::setErrnoOnNull(Ptr);
+ }
+ 
+ INTERFACE WEAK int SCUDO_PREFIX(malloc_info)(UNUSED int options, FILE *stream) {
+diff --git a/compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cpp b/compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cpp
+index 1b9fe67d920c..db824e6f7547 100644
+--- a/wrappers_c_bionic.cpp
++++ b/wrappers_c_bionic.cpp
+@@ -12,6 +12,7 @@
+ #if SCUDO_ANDROID && _BIONIC
+ 
+ #include "allocator_config.h"
++#include "scudo/interface.h"
+ #include "wrappers_c.h"
+ #include "wrappers_c_checks.h"
+ 
+diff --git a/compiler-rt/lib/scudo/standalone/wrappers_cpp.cpp b/compiler-rt/lib/scudo/standalone/wrappers_cpp.cpp
+index 374e36d72b3d..9ea2aaed1e78 100644
+--- a/wrappers_cpp.cpp
++++ b/wrappers_cpp.cpp
+@@ -12,6 +12,7 @@
+ #if !SCUDO_ANDROID || !_BIONIC
+ 
+ #include "allocator_config.h"
++#include "scudo/interface.h"
+ #include "wrappers_c.h"
+ 
+ #include <stdint.h>
+@@ -21,86 +22,124 @@ struct nothrow_t {};
+ enum class align_val_t : size_t {};
+ } // namespace std
+ 
++static void reportAllocation(void *ptr, size_t size) {
++  if (__scudo_allocate_hook && ptr)
++    __scudo_allocate_hook(ptr, size);
++}
++
++static void reportDeallocation(void *ptr) {
++  if (__scudo_deallocate_hook)
++    __scudo_deallocate_hook(ptr);
++}
++
+ INTERFACE WEAK void *operator new(size_t size) {
+-  return Allocator.allocate(size, scudo::Chunk::Origin::New);
++  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::New);
++  reportAllocation(Ptr, size);
++  return Ptr;
+ }
+ INTERFACE WEAK void *operator new[](size_t size) {
+-  return Allocator.allocate(size, scudo::Chunk::Origin::NewArray);
++  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::NewArray);
++  reportAllocation(Ptr, size);
++  return Ptr;
+ }
+ INTERFACE WEAK void *operator new(size_t size,
+                                   std::nothrow_t const &) NOEXCEPT {
+-  return Allocator.allocate(size, scudo::Chunk::Origin::New);
++  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::New);
++  reportAllocation(Ptr, size);
++  return Ptr;
+ }
+ INTERFACE WEAK void *operator new[](size_t size,
+                                     std::nothrow_t const &) NOEXCEPT {
+-  return Allocator.allocate(size, scudo::Chunk::Origin::NewArray);
++  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::NewArray);
++  reportAllocation(Ptr, size);
++  return Ptr;
+ }
+ INTERFACE WEAK void *operator new(size_t size, std::align_val_t align) {
+-  return Allocator.allocate(size, scudo::Chunk::Origin::New,
+-                            static_cast<scudo::uptr>(align));
++  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::New,
++                                 static_cast<scudo::uptr>(align));
++  reportAllocation(Ptr, size);
++  return Ptr;
+ }
+ INTERFACE WEAK void *operator new[](size_t size, std::align_val_t align) {
+-  return Allocator.allocate(size, scudo::Chunk::Origin::NewArray,
+-                            static_cast<scudo::uptr>(align));
++  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::NewArray,
++                                 static_cast<scudo::uptr>(align));
++  reportAllocation(Ptr, size);
++  return Ptr;
+ }
+ INTERFACE WEAK void *operator new(size_t size, std::align_val_t align,
+                                   std::nothrow_t const &) NOEXCEPT {
+-  return Allocator.allocate(size, scudo::Chunk::Origin::New,
+-                            static_cast<scudo::uptr>(align));
++  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::New,
++                                 static_cast<scudo::uptr>(align));
++  reportAllocation(Ptr, size);
++  return Ptr;
+ }
+ INTERFACE WEAK void *operator new[](size_t size, std::align_val_t align,
+                                     std::nothrow_t const &) NOEXCEPT {
+-  return Allocator.allocate(size, scudo::Chunk::Origin::NewArray,
+-                            static_cast<scudo::uptr>(align));
++  void *Ptr = Allocator.allocate(size, scudo::Chunk::Origin::NewArray,
++                                 static_cast<scudo::uptr>(align));
++  reportAllocation(Ptr, size);
++  return Ptr;
+ }
+ 
+ INTERFACE WEAK void operator delete(void *ptr) NOEXCEPT {
++  reportDeallocation(ptr);
+   Allocator.deallocate(ptr, scudo::Chunk::Origin::New);
+ }
+ INTERFACE WEAK void operator delete[](void *ptr) NOEXCEPT {
++  reportDeallocation(ptr);
+   Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray);
+ }
+ INTERFACE WEAK void operator delete(void *ptr,
+                                     std::nothrow_t const &) NOEXCEPT {
++  reportDeallocation(ptr);
+   Allocator.deallocate(ptr, scudo::Chunk::Origin::New);
+ }
+ INTERFACE WEAK void operator delete[](void *ptr,
+                                       std::nothrow_t const &) NOEXCEPT {
++  reportDeallocation(ptr);
+   Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray);
+ }
+ INTERFACE WEAK void operator delete(void *ptr, size_t size) NOEXCEPT {
++  reportDeallocation(ptr);
+   Allocator.deallocate(ptr, scudo::Chunk::Origin::New, size);
+ }
+ INTERFACE WEAK void operator delete[](void *ptr, size_t size) NOEXCEPT {
++  reportDeallocation(ptr);
+   Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray, size);
+ }
+ INTERFACE WEAK void operator delete(void *ptr,
+                                     std::align_val_t align) NOEXCEPT {
++  reportDeallocation(ptr);
+   Allocator.deallocate(ptr, scudo::Chunk::Origin::New, 0,
+                        static_cast<scudo::uptr>(align));
+ }
+ INTERFACE WEAK void operator delete[](void *ptr,
+                                       std::align_val_t align) NOEXCEPT {
++  reportDeallocation(ptr);
+   Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray, 0,
+                        static_cast<scudo::uptr>(align));
+ }
+ INTERFACE WEAK void operator delete(void *ptr, std::align_val_t align,
+                                     std::nothrow_t const &) NOEXCEPT {
++  reportDeallocation(ptr);
+   Allocator.deallocate(ptr, scudo::Chunk::Origin::New, 0,
+                        static_cast<scudo::uptr>(align));
+ }
+ INTERFACE WEAK void operator delete[](void *ptr, std::align_val_t align,
+                                       std::nothrow_t const &) NOEXCEPT {
++  reportDeallocation(ptr);
+   Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray, 0,
+                        static_cast<scudo::uptr>(align));
+ }
+ INTERFACE WEAK void operator delete(void *ptr, size_t size,
+                                     std::align_val_t align) NOEXCEPT {
++  reportDeallocation(ptr);
+   Allocator.deallocate(ptr, scudo::Chunk::Origin::New, size,
+                        static_cast<scudo::uptr>(align));
+ }
+ INTERFACE WEAK void operator delete[](void *ptr, size_t size,
+                                       std::align_val_t align) NOEXCEPT {
++  reportDeallocation(ptr);
+   Allocator.deallocate(ptr, scudo::Chunk::Origin::NewArray, size,
+                        static_cast<scudo::uptr>(align));
+ }
+-- 
+2.42.0
+
diff --git a/main/scudo-malloc/APKBUILD b/main/scudo-malloc/APKBUILD
new file mode 100644
index 00000000000..0685090c0de
--- /dev/null
+++ b/main/scudo-malloc/APKBUILD
@@ -0,0 +1,52 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=scudo-malloc
+# tied to llvm version
+pkgver=17.0.6
+pkgrel=0
+pkgdesc="Standalone scudo malloc from compiler-rt"
+url="https://llvm.org"
+arch="all"
+license="Apache-2.0 WITH LLVM-exception"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+makedepends="linux-headers"
+checkdepends="gtest-dev"
+subpackages="$pkgname-static $pkgname-dev"
+source="https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver//_/-}/compiler-rt-${pkgver//_/}.src.tar.xz
+	0001-Add-makefile.patch
+	0001-scudo-Detach-the-hooks-from-Scudo-s-internal-impleme.patch
+	"
+builddir="$srcdir/compiler-rt-${pkgver//_/}.src/lib/scudo/standalone"
+
+build() {
+	local cflags_crc32=
+	unset CXXFLAGS
+	case "$CARCH" in
+		aarch64)
+			# this has broken emulation in aarch64 qemu (incl qemu-user),
+			# which causes it to abort instantly
+			CXXFLAGS="-DSCUDO_DISABLE_TBI"
+			cflags_crc32="-march=armv8-a+crc"
+			;;
+		x86*)	cflags_crc32="-mcrc32"
+			;;
+	esac
+
+	msg "building libscudo"
+	make CXXFLAGS="$CXXFLAGS" CXXFLAGS_crc32="$cflags_crc32" TESTS="$(want_check && echo yes || echo no)"
+}
+
+check() {
+	make test
+}
+
+package() {
+	install -Dm755 libscudo.so -t "$pkgdir"/usr/lib/
+	install -Dm644 libscudo.a -t "$pkgdir"/usr/lib/
+	install -Dm644 include/scudo/interface.h -t "$pkgdir"/usr/include/scudo/
+}
+
+sha512sums="
+56dc9d304dd4ba8d28179077dd99ca7c820ce26dbc70d33b2ba41769928adc900f7618d3efef756b2fc92e322d2f25dba49be966d6583d2d8f1fce9283a9cdf7  compiler-rt-17.0.6.src.tar.xz
+1102a512adde2ef31aafa6011a4293d5fa361aa920f88ac20599aab84711e973315e6f6719631be11007aea869ae700e34ed57c7dc7724e8aacbc5b493632849  0001-Add-makefile.patch
+366aff393f2e4d0798e28e504f1d06d7a9fd56f3e4093e3057129a69a2ec9f0acbb789138ab52a006eab4f1f2008970fe283218c75f562076475f913e307e963  0001-scudo-Detach-the-hooks-from-Scudo-s-internal-impleme.patch
+"
diff --git a/main/sdl/0001-CVE-2019-7572.patch b/main/sdl/0001-CVE-2019-7572.patch
deleted file mode 100644
index 2c17831dfcb..00000000000
--- a/main/sdl/0001-CVE-2019-7572.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 6086741bda4d43cc227500bc7645a829380e6326 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 15 Feb 2019 09:21:45 +0100
-Subject: [PATCH] CVE-2019-7572: Fix a buffer overwrite in IMA_ADPCM_decode
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If data chunk was longer than expected based on a WAV format
-definition, IMA_ADPCM_decode() tried to write past the output
-buffer. This patch fixes it.
-
-Based on patch from
-<https://bugzilla.libsdl.org/show_bug.cgi?id=4496>.
-
-CVE-2019-7572
-https://bugzilla.libsdl.org/show_bug.cgi?id=4495
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- src/audio/SDL_wave.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
-index 69d62dc..91e89e8 100644
---- a/src/audio/SDL_wave.c
-+++ b/src/audio/SDL_wave.c
-@@ -336,7 +336,7 @@ static void Fill_IMA_ADPCM_block(Uint8 *decoded, Uint8 *encoded,
- static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- {
- 	struct IMA_ADPCM_decodestate *state;
--	Uint8 *freeable, *encoded, *encoded_end, *decoded;
-+	Uint8 *freeable, *encoded, *encoded_end, *decoded, *decoded_end;
- 	Sint32 encoded_len, samplesleft;
- 	unsigned int c, channels;
- 
-@@ -363,6 +363,7 @@ static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- 		return(-1);
- 	}
- 	decoded = *audio_buf;
-+	decoded_end = decoded + *audio_len;
- 
- 	/* Get ready... Go! */
- 	while ( encoded_len >= IMA_ADPCM_state.wavefmt.blockalign ) {
-@@ -382,6 +383,7 @@ static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- 			}
- 
- 			/* Store the initial sample we start with */
-+			if (decoded + 2 > decoded_end) goto invalid_size;
- 			decoded[0] = (Uint8)(state[c].sample&0xFF);
- 			decoded[1] = (Uint8)(state[c].sample>>8);
- 			decoded += 2;
-@@ -392,6 +394,8 @@ static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- 		while ( samplesleft > 0 ) {
- 			for ( c=0; c<channels; ++c ) {
- 				if (encoded + 4 > encoded_end) goto invalid_size;
-+				if (decoded + 4 * 4 * channels > decoded_end)
-+					goto invalid_size;
- 				Fill_IMA_ADPCM_block(decoded, encoded,
- 						c, channels, &state[c]);
- 				encoded += 4;
--- 
-2.20.1
-
diff --git a/main/sdl/0001-CVE-2019-7573.patch b/main/sdl/0001-CVE-2019-7573.patch
deleted file mode 100644
index 767a3b20740..00000000000
--- a/main/sdl/0001-CVE-2019-7573.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 3e2c89e516701f3586dfeadec13932f665371d2a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 15 Feb 2019 10:36:13 +0100
-Subject: [PATCH] CVE-2019-7573, CVE-2019-7576: Fix buffer overreads in
- InitMS_ADPCM
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If MS ADPCM format chunk was too short, InitMS_ADPCM() parsing it
-could read past the end of chunk data. This patch fixes it.
-
-CVE-2019-7573
-https://bugzilla.libsdl.org/show_bug.cgi?id=4491
-CVE-2019-7576
-https://bugzilla.libsdl.org/show_bug.cgi?id=4490
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- src/audio/SDL_wave.c | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
-index 91e89e8..1d446ed 100644
---- a/src/audio/SDL_wave.c
-+++ b/src/audio/SDL_wave.c
-@@ -44,12 +44,13 @@ static struct MS_ADPCM_decoder {
- 	struct MS_ADPCM_decodestate state[2];
- } MS_ADPCM_state;
- 
--static int InitMS_ADPCM(WaveFMT *format)
-+static int InitMS_ADPCM(WaveFMT *format, int length)
- {
--	Uint8 *rogue_feel;
-+	Uint8 *rogue_feel, *rogue_feel_end;
- 	int i;
- 
- 	/* Set the rogue pointer to the MS_ADPCM specific data */
-+	if (length < sizeof(*format)) goto too_short;
- 	MS_ADPCM_state.wavefmt.encoding = SDL_SwapLE16(format->encoding);
- 	MS_ADPCM_state.wavefmt.channels = SDL_SwapLE16(format->channels);
- 	MS_ADPCM_state.wavefmt.frequency = SDL_SwapLE32(format->frequency);
-@@ -58,9 +59,11 @@ static int InitMS_ADPCM(WaveFMT *format)
- 	MS_ADPCM_state.wavefmt.bitspersample =
- 					 SDL_SwapLE16(format->bitspersample);
- 	rogue_feel = (Uint8 *)format+sizeof(*format);
-+	rogue_feel_end = (Uint8 *)format + length;
- 	if ( sizeof(*format) == 16 ) {
- 		rogue_feel += sizeof(Uint16);
- 	}
-+	if (rogue_feel + 4 > rogue_feel_end) goto too_short;
- 	MS_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1]<<8)|rogue_feel[0]);
- 	rogue_feel += sizeof(Uint16);
- 	MS_ADPCM_state.wNumCoef = ((rogue_feel[1]<<8)|rogue_feel[0]);
-@@ -70,12 +73,16 @@ static int InitMS_ADPCM(WaveFMT *format)
- 		return(-1);
- 	}
- 	for ( i=0; i<MS_ADPCM_state.wNumCoef; ++i ) {
-+		if (rogue_feel + 4 > rogue_feel_end) goto too_short;
- 		MS_ADPCM_state.aCoeff[i][0] = ((rogue_feel[1]<<8)|rogue_feel[0]);
- 		rogue_feel += sizeof(Uint16);
- 		MS_ADPCM_state.aCoeff[i][1] = ((rogue_feel[1]<<8)|rogue_feel[0]);
- 		rogue_feel += sizeof(Uint16);
- 	}
- 	return(0);
-+too_short:
-+	SDL_SetError("Unexpected length of a chunk with a MS ADPCM format");
-+	return(-1);
- }
- 
- static Sint32 MS_ADPCM_nibble(struct MS_ADPCM_decodestate *state,
-@@ -485,7 +492,7 @@ SDL_AudioSpec * SDL_LoadWAV_RW (SDL_RWops *src, int freesrc,
- 			break;
- 		case MS_ADPCM_CODE:
- 			/* Try to understand this */
--			if ( InitMS_ADPCM(format) < 0 ) {
-+			if ( InitMS_ADPCM(format, lenread) < 0 ) {
- 				was_error = 1;
- 				goto done;
- 			}
--- 
-2.20.1
-
diff --git a/main/sdl/0001-CVE-2019-7574.patch b/main/sdl/0001-CVE-2019-7574.patch
deleted file mode 100644
index 0bae80ff875..00000000000
--- a/main/sdl/0001-CVE-2019-7574.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 9b2eee24768889378032077423cb6a3221a8ad18 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Thu, 14 Feb 2019 15:41:47 +0100
-Subject: [PATCH] CVE-2019-7574: Fix a buffer overread in IMA_ADPCM_decode
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If data chunk was shorter than expected based on a WAV format
-definition, IMA_ADPCM_decode() tried to read past the data chunk
-buffer. This patch fixes it.
-
-CVE-2019-7574
-https://bugzilla.libsdl.org/show_bug.cgi?id=4496
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- src/audio/SDL_wave.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
-index b6c49de..2968b3d 100644
---- a/src/audio/SDL_wave.c
-+++ b/src/audio/SDL_wave.c
-@@ -334,7 +334,7 @@ static void Fill_IMA_ADPCM_block(Uint8 *decoded, Uint8 *encoded,
- static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- {
- 	struct IMA_ADPCM_decodestate *state;
--	Uint8 *freeable, *encoded, *decoded;
-+	Uint8 *freeable, *encoded, *encoded_end, *decoded;
- 	Sint32 encoded_len, samplesleft;
- 	unsigned int c, channels;
- 
-@@ -350,6 +350,7 @@ static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- 	/* Allocate the proper sized output buffer */
- 	encoded_len = *audio_len;
- 	encoded = *audio_buf;
-+	encoded_end = encoded + encoded_len;
- 	freeable = *audio_buf;
- 	*audio_len = (encoded_len/IMA_ADPCM_state.wavefmt.blockalign) * 
- 				IMA_ADPCM_state.wSamplesPerBlock*
-@@ -365,6 +366,7 @@ static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- 	while ( encoded_len >= IMA_ADPCM_state.wavefmt.blockalign ) {
- 		/* Grab the initial information for this block */
- 		for ( c=0; c<channels; ++c ) {
-+			if (encoded + 4 > encoded_end) goto invalid_size;
- 			/* Fill the state information for this block */
- 			state[c].sample = ((encoded[1]<<8)|encoded[0]);
- 			encoded += 2;
-@@ -387,6 +389,7 @@ static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- 		samplesleft = (IMA_ADPCM_state.wSamplesPerBlock-1)*channels;
- 		while ( samplesleft > 0 ) {
- 			for ( c=0; c<channels; ++c ) {
-+				if (encoded + 4 > encoded_end) goto invalid_size;
- 				Fill_IMA_ADPCM_block(decoded, encoded,
- 						c, channels, &state[c]);
- 				encoded += 4;
-@@ -398,6 +401,10 @@ static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- 	}
- 	SDL_free(freeable);
- 	return(0);
-+invalid_size:
-+	SDL_SetError("Unexpected chunk length for an IMA ADPCM decoder");
-+	SDL_free(freeable);
-+	return(-1);
- }
- 
- SDL_AudioSpec * SDL_LoadWAV_RW (SDL_RWops *src, int freesrc,
--- 
-2.20.1
-
diff --git a/main/sdl/0001-CVE-2019-7575.patch b/main/sdl/0001-CVE-2019-7575.patch
deleted file mode 100644
index 53965aa2f23..00000000000
--- a/main/sdl/0001-CVE-2019-7575.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From e1f80cadb079e35103e6eebf160a818815c823df Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Thu, 14 Feb 2019 14:51:52 +0100
-Subject: [PATCH] CVE-2019-7575: Fix a buffer overwrite in MS_ADPCM_decode
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If a WAV format defines shorter audio stream and decoded MS ADPCM data chunk
-is longer, decoding continued past the output audio buffer.
-
-This fix is based on a patch from
-<https://bugzilla.libsdl.org/show_bug.cgi?id=4492>.
-
-https://bugzilla.libsdl.org/show_bug.cgi?id=4493
-CVE-2019-7575
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- src/audio/SDL_wave.c | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
-index e42d01c..b6c49de 100644
---- a/src/audio/SDL_wave.c
-+++ b/src/audio/SDL_wave.c
-@@ -115,7 +115,7 @@ static Sint32 MS_ADPCM_nibble(struct MS_ADPCM_decodestate *state,
- static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- {
- 	struct MS_ADPCM_decodestate *state[2];
--	Uint8 *freeable, *encoded, *encoded_end, *decoded;
-+	Uint8 *freeable, *encoded, *encoded_end, *decoded, *decoded_end;
- 	Sint32 encoded_len, samplesleft;
- 	Sint8 nybble, stereo;
- 	Sint16 *coeff[2];
-@@ -135,6 +135,7 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- 		return(-1);
- 	}
- 	decoded = *audio_buf;
-+	decoded_end = decoded + *audio_len;
- 
- 	/* Get ready... Go! */
- 	stereo = (MS_ADPCM_state.wavefmt.channels == 2);
-@@ -142,7 +143,7 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- 	state[1] = &MS_ADPCM_state.state[stereo];
- 	while ( encoded_len >= MS_ADPCM_state.wavefmt.blockalign ) {
- 		/* Grab the initial information for this block */
--		if (encoded + 7 + (stereo ? 7 : 0) > encoded_end) goto too_short;
-+		if (encoded + 7 + (stereo ? 7 : 0) > encoded_end) goto invalid_size;
- 		state[0]->hPredictor = *encoded++;
- 		if ( stereo ) {
- 			state[1]->hPredictor = *encoded++;
-@@ -169,6 +170,7 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- 		coeff[1] = MS_ADPCM_state.aCoeff[state[1]->hPredictor];
- 
- 		/* Store the two initial samples we start with */
-+		if (decoded + 4 + (stereo ? 4 : 0) > decoded_end) goto invalid_size;
- 		decoded[0] = state[0]->iSamp2&0xFF;
- 		decoded[1] = state[0]->iSamp2>>8;
- 		decoded += 2;
-@@ -190,7 +192,8 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- 		samplesleft = (MS_ADPCM_state.wSamplesPerBlock-2)*
- 					MS_ADPCM_state.wavefmt.channels;
- 		while ( samplesleft > 0 ) {
--			if (encoded + 1 > encoded_end) goto too_short;
-+			if (encoded + 1 > encoded_end) goto invalid_size;
-+			if (decoded + 4 > decoded_end) goto invalid_size;
- 
- 			nybble = (*encoded)>>4;
- 			new_sample = MS_ADPCM_nibble(state[0],nybble,coeff[0]);
-@@ -213,8 +216,8 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- 	}
- 	SDL_free(freeable);
- 	return(0);
--too_short:
--	SDL_SetError("Too short chunk for a MS ADPCM decoder");
-+invalid_size:
-+	SDL_SetError("Unexpected chunk length for a MS ADPCM decoder");
- 	SDL_free(freeable);
- 	return(-1);
- }
--- 
-2.20.1
-
diff --git a/main/sdl/0001-CVE-2019-7577.patch b/main/sdl/0001-CVE-2019-7577.patch
deleted file mode 100644
index 23cbf98192b..00000000000
--- a/main/sdl/0001-CVE-2019-7577.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From ac3d0d365b1f01a6782565feda0c7432a5795671 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Thu, 14 Feb 2019 14:12:22 +0100
-Subject: [PATCH] CVE-2019-7577: Fix a buffer overread in MS_ADPCM_decode
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If RIFF/WAV data chunk length is shorter then expected for an audio
-format defined in preceeding RIFF/WAV format headers, a buffer
-overread can happen.
-
-This patch fixes it by checking a MS ADPCM data to be decoded are not
-past the initialized buffer.
-
-CVE-2019-7577
-Reproducer: https://bugzilla.libsdl.org/show_bug.cgi?id=4492
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- src/audio/SDL_wave.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
-index b4ad6c7..e42d01c 100644
---- a/src/audio/SDL_wave.c
-+++ b/src/audio/SDL_wave.c
-@@ -115,7 +115,7 @@ static Sint32 MS_ADPCM_nibble(struct MS_ADPCM_decodestate *state,
- static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- {
- 	struct MS_ADPCM_decodestate *state[2];
--	Uint8 *freeable, *encoded, *decoded;
-+	Uint8 *freeable, *encoded, *encoded_end, *decoded;
- 	Sint32 encoded_len, samplesleft;
- 	Sint8 nybble, stereo;
- 	Sint16 *coeff[2];
-@@ -124,6 +124,7 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- 	/* Allocate the proper sized output buffer */
- 	encoded_len = *audio_len;
- 	encoded = *audio_buf;
-+	encoded_end = encoded + encoded_len;
- 	freeable = *audio_buf;
- 	*audio_len = (encoded_len/MS_ADPCM_state.wavefmt.blockalign) * 
- 				MS_ADPCM_state.wSamplesPerBlock*
-@@ -141,6 +142,7 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- 	state[1] = &MS_ADPCM_state.state[stereo];
- 	while ( encoded_len >= MS_ADPCM_state.wavefmt.blockalign ) {
- 		/* Grab the initial information for this block */
-+		if (encoded + 7 + (stereo ? 7 : 0) > encoded_end) goto too_short;
- 		state[0]->hPredictor = *encoded++;
- 		if ( stereo ) {
- 			state[1]->hPredictor = *encoded++;
-@@ -188,6 +190,8 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- 		samplesleft = (MS_ADPCM_state.wSamplesPerBlock-2)*
- 					MS_ADPCM_state.wavefmt.channels;
- 		while ( samplesleft > 0 ) {
-+			if (encoded + 1 > encoded_end) goto too_short;
-+
- 			nybble = (*encoded)>>4;
- 			new_sample = MS_ADPCM_nibble(state[0],nybble,coeff[0]);
- 			decoded[0] = new_sample&0xFF;
-@@ -209,6 +213,10 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- 	}
- 	SDL_free(freeable);
- 	return(0);
-+too_short:
-+	SDL_SetError("Too short chunk for a MS ADPCM decoder");
-+	SDL_free(freeable);
-+	return(-1);
- }
- 
- struct IMA_ADPCM_decodestate {
--- 
-2.20.1
-
diff --git a/main/sdl/0001-CVE-2019-7578.patch b/main/sdl/0001-CVE-2019-7578.patch
deleted file mode 100644
index b0a89de20df..00000000000
--- a/main/sdl/0001-CVE-2019-7578.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 0eb76f6cabcffa2104e34c26e0f41e6de95356ff Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 15 Feb 2019 10:56:59 +0100
-Subject: [PATCH] CVE-2019-7578: Fix a buffer overread in InitIMA_ADPCM
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If IMA ADPCM format chunk was too short, InitIMA_ADPCM() parsing it
-could read past the end of chunk data. This patch fixes it.
-
-CVE-2019-7578
-https://bugzilla.libsdl.org/show_bug.cgi?id=4494
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- src/audio/SDL_wave.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
-index 1d446ed..08f65cb 100644
---- a/src/audio/SDL_wave.c
-+++ b/src/audio/SDL_wave.c
-@@ -240,11 +240,12 @@ static struct IMA_ADPCM_decoder {
- 	struct IMA_ADPCM_decodestate state[2];
- } IMA_ADPCM_state;
- 
--static int InitIMA_ADPCM(WaveFMT *format)
-+static int InitIMA_ADPCM(WaveFMT *format, int length)
- {
--	Uint8 *rogue_feel;
-+	Uint8 *rogue_feel, *rogue_feel_end;
- 
- 	/* Set the rogue pointer to the IMA_ADPCM specific data */
-+	if (length < sizeof(*format)) goto too_short;
- 	IMA_ADPCM_state.wavefmt.encoding = SDL_SwapLE16(format->encoding);
- 	IMA_ADPCM_state.wavefmt.channels = SDL_SwapLE16(format->channels);
- 	IMA_ADPCM_state.wavefmt.frequency = SDL_SwapLE32(format->frequency);
-@@ -253,11 +254,16 @@ static int InitIMA_ADPCM(WaveFMT *format)
- 	IMA_ADPCM_state.wavefmt.bitspersample =
- 					 SDL_SwapLE16(format->bitspersample);
- 	rogue_feel = (Uint8 *)format+sizeof(*format);
-+	rogue_feel_end = (Uint8 *)format + length;
- 	if ( sizeof(*format) == 16 ) {
- 		rogue_feel += sizeof(Uint16);
- 	}
-+	if (rogue_feel + 2 > rogue_feel_end) goto too_short;
- 	IMA_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1]<<8)|rogue_feel[0]);
- 	return(0);
-+too_short:
-+	SDL_SetError("Unexpected length of a chunk with an IMA ADPCM format");
-+	return(-1);
- }
- 
- static Sint32 IMA_ADPCM_nibble(struct IMA_ADPCM_decodestate *state,Uint8 nybble)
-@@ -500,7 +506,7 @@ SDL_AudioSpec * SDL_LoadWAV_RW (SDL_RWops *src, int freesrc,
- 			break;
- 		case IMA_ADPCM_CODE:
- 			/* Try to understand this */
--			if ( InitIMA_ADPCM(format) < 0 ) {
-+			if ( InitIMA_ADPCM(format, lenread) < 0 ) {
- 				was_error = 1;
- 				goto done;
- 			}
--- 
-2.20.1
-
diff --git a/main/sdl/0001-CVE-2019-7635.patch b/main/sdl/0001-CVE-2019-7635.patch
deleted file mode 100644
index ebf8b91e7fd..00000000000
--- a/main/sdl/0001-CVE-2019-7635.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-CVE-2019-7635: Reject BMP images with pixel colors out the palette
-If a 1-, 4-, or 8-bit per pixel BMP image declares less used colors
-than the palette offers an SDL_Surface with a palette of the indicated
-number of used colors is created. If some of the image's pixel
-refer to a color number higher then the maximal used colors, a subsequent
-bliting operation on the surface will look up a color past a blit map
-(that is based on the palette) memory. I.e. passing such SDL_Surface
-to e.g. an SDL_DisplayFormat() function will result in a buffer overread in
-a blit function.
-
-This patch fixes it by validing each pixel's color to be less than the
-maximal color number in the palette. A validation failure raises an
-error from a SDL_LoadBMP_RW() function.
-
-CVE-2019-7635
-https://bugzilla.libsdl.org/show_bug.cgi?id=4498
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
-
-diff -r a936f9bd3e38 -r f1f5878be5db src/video/SDL_bmp.c
---- a/src/video/SDL_bmp.c	Mon Jun 10 09:25:05 2019 -0700
-+++ b/src/video/SDL_bmp.c	Tue Jun 11 06:28:12 2019 -0700
-@@ -308,6 +308,12 @@
- 				}
- 				*(bits+i) = (pixel>>shift);
- 				pixel <<= ExpandBMP;
-+				if ( bits[i] >= biClrUsed ) {
-+					SDL_SetError(
-+						"A BMP image contains a pixel with a color out of the palette");
-+					was_error = SDL_TRUE;
-+					goto done;
-+				}
- 			} }
- 			break;
- 
-@@ -318,6 +324,16 @@
- 				was_error = SDL_TRUE;
- 				goto done;
- 			}
-+			if ( 8 == biBitCount && palette && biClrUsed < (1 << biBitCount ) ) {
-+				for ( i=0; i<surface->w; ++i ) {
-+					if ( bits[i] >= biClrUsed ) {
-+						SDL_SetError(
-+							"A BMP image contains a pixel with a color out of the palette");
-+						was_error = SDL_TRUE;
-+						goto done;
-+					}
-+				}
-+			}
- #if SDL_BYTEORDER == SDL_BIG_ENDIAN
- 			/* Byte-swap the pixels if needed. Note that the 24bpp
- 			   case has already been taken care of above. */
-
diff --git a/main/sdl/0001-CVE-2019-7636.patch b/main/sdl/0001-CVE-2019-7636.patch
deleted file mode 100644
index 51e40ef1cec..00000000000
--- a/main/sdl/0001-CVE-2019-7636.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fixed bug 4500 - Heap-Buffer Overflow in Map1toN pertaining to SDL_pixels.c
-
-Petr Pisar
-
-The reproducer has these data in BITMAPINFOHEADER:
-
-biSize = 40
-biBitCount = 8
-biClrUsed = 131075
-
-SDL_LoadBMP_RW() function passes biBitCount as a color depth to SDL_CreateRGBSurface(), thus 256-color pallete is allocated. But then biClrUsed colors are read from a file and stored into the palette. SDL_LoadBMP_RW should report an error if biClrUsed is greater than 2^biBitCount.
-
-Also fixes CVE-2019-7638
-
-diff -r 8586f153eede -r 19d8c3b9c251 src/video/SDL_bmp.c
---- a/src/video/SDL_bmp.c	Sun Jan 13 15:27:50 2019 +0100
-+++ b/src/video/SDL_bmp.c	Mon Feb 18 07:48:23 2019 -0800
-@@ -233,6 +233,10 @@
- 	if ( palette ) {
- 		if ( biClrUsed == 0 ) {
- 			biClrUsed = 1 << biBitCount;
-+		} else if ( biClrUsed > (1 << biBitCount) ) {
-+			SDL_SetError("BMP file has an invalid number of colors");
-+			was_error = SDL_TRUE;
-+			goto done;
- 		}
- 		if ( biSize == 12 ) {
- 			for ( i = 0; i < (int)biClrUsed; ++i ) {
-
diff --git a/main/sdl/0001-CVE-2019-7637.patch b/main/sdl/0001-CVE-2019-7637.patch
deleted file mode 100644
index 90a734f8ae8..00000000000
--- a/main/sdl/0001-CVE-2019-7637.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-CVE-2019-7637: Fix in integer overflow in SDL_CalculatePitch
-If a too large width is passed to SDL_SetVideoMode() the width travels
-to SDL_CalculatePitch() where the width (e.g. 65535) is multiplied by
-BytesPerPixel (e.g. 4) and the result is stored into Uint16 pitch
-variable. During this arithmetics an integer overflow can happen (e.g.
-the value is clamped as 65532). As a result SDL_Surface with a pitch
-smaller than width * BytesPerPixel is created, too small pixel buffer
-is allocated and when the SDL_Surface is processed in SDL_FillRect()
-a buffer overflow occurs.
-
-This can be reproduced with "./graywin -width 21312312313123213213213"
-command.
-
-This patch fixes is by using a very careful arithmetics in
-SDL_CalculatePitch(). If an overflow is detected, an error is reported
-back as a special 0 value. We assume that 0-width surfaces do not
-occur in the wild. Since SDL_CalculatePitch() is a private function,
-we can change the semantics.
-
-CVE-2019-7637
-https://bugzilla.libsdl.org/show_bug.cgi?id=4497
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
-
-diff -r 4646533663ae -r 9b0e5c555c0f src/video/SDL_pixels.c
---- a/src/video/SDL_pixels.c	Sat Mar 16 18:35:33 2019 -0700
-+++ b/src/video/SDL_pixels.c	Sat Mar 16 19:16:24 2019 -0700
-@@ -286,26 +286,53 @@
- 	}
- }
- /* 
-- * Calculate the pad-aligned scanline width of a surface
-+ * Calculate the pad-aligned scanline width of a surface. Return 0 in case of
-+ * an error.
-  */
- Uint16 SDL_CalculatePitch(SDL_Surface *surface)
- {
--	Uint16 pitch;
-+	unsigned int pitch = 0;
- 
- 	/* Surface should be 4-byte aligned for speed */
--	pitch = surface->w*surface->format->BytesPerPixel;
-+	/* The code tries to prevent from an Uint16 overflow. */;
-+	for (Uint8 byte = surface->format->BytesPerPixel; byte; byte--) {
-+		pitch += (unsigned int)surface->w;
-+		if (pitch < surface->w) {
-+			SDL_SetError("A scanline is too wide");
-+			return(0);
-+		}
-+	}
- 	switch (surface->format->BitsPerPixel) {
- 		case 1:
--			pitch = (pitch+7)/8;
-+			if (pitch % 8) {
-+				pitch = pitch / 8 + 1;
-+			} else {
-+				pitch = pitch / 8;
-+			}
- 			break;
- 		case 4:
--			pitch = (pitch+1)/2;
-+			if (pitch % 2) {
-+				pitch = pitch / 2 + 1;
-+			} else {
-+				pitch = pitch / 2;
-+			}
- 			break;
- 		default:
- 			break;
- 	}
--	pitch = (pitch + 3) & ~3;	/* 4-byte aligning */
--	return(pitch);
-+	/* 4-byte aligning */
-+	if (pitch & 3) {
-+		if (pitch + 3 < pitch) {
-+			SDL_SetError("A scanline is too wide");
-+			return(0);
-+		}
-+		pitch = (pitch + 3) & ~3;
-+	}
-+	if (pitch > 0xFFFF) {
-+		SDL_SetError("A scanline is too wide");
-+		return(0);
-+	}
-+	return((Uint16)pitch);
- }
- /*
-  * Match an RGB value to a particular palette index
-diff -r 4646533663ae -r 9b0e5c555c0f src/video/gapi/SDL_gapivideo.c
---- a/src/video/gapi/SDL_gapivideo.c	Sat Mar 16 18:35:33 2019 -0700
-+++ b/src/video/gapi/SDL_gapivideo.c	Sat Mar 16 19:16:24 2019 -0700
-@@ -733,6 +733,9 @@
- 	video->w = gapi->w = width;
- 	video->h = gapi->h = height;
- 	video->pitch = SDL_CalculatePitch(video); 
-+	if (!current->pitch) {
-+		return(NULL);
-+	}
- 
- 	/* Small fix for WinCE/Win32 - when activating window
- 	   SDL_VideoSurface is equal to zero, so activating code
-diff -r 4646533663ae -r 9b0e5c555c0f src/video/nanox/SDL_nxvideo.c
---- a/src/video/nanox/SDL_nxvideo.c	Sat Mar 16 18:35:33 2019 -0700
-+++ b/src/video/nanox/SDL_nxvideo.c	Sat Mar 16 19:16:24 2019 -0700
-@@ -378,6 +378,10 @@
-         current -> w = width ;
-         current -> h = height ;
-         current -> pitch = SDL_CalculatePitch (current) ;
-+        if (!current->pitch) {
-+            current = NULL;
-+            goto done;
-+        }
-         NX_ResizeImage (this, current, flags) ;
-     }
- 
-diff -r 4646533663ae -r 9b0e5c555c0f src/video/ps2gs/SDL_gsvideo.c
---- a/src/video/ps2gs/SDL_gsvideo.c	Sat Mar 16 18:35:33 2019 -0700
-+++ b/src/video/ps2gs/SDL_gsvideo.c	Sat Mar 16 19:16:24 2019 -0700
-@@ -479,6 +479,9 @@
- 	current->w = width;
- 	current->h = height;
- 	current->pitch = SDL_CalculatePitch(current);
-+	if (!current->pitch) {
-+		return(NULL);
-+	}
- 
- 	/* Memory map the DMA area for block memory transfer */
- 	if ( ! mapped_mem ) {
-diff -r 4646533663ae -r 9b0e5c555c0f src/video/ps3/SDL_ps3video.c
---- a/src/video/ps3/SDL_ps3video.c	Sat Mar 16 18:35:33 2019 -0700
-+++ b/src/video/ps3/SDL_ps3video.c	Sat Mar 16 19:16:24 2019 -0700
-@@ -339,6 +339,9 @@
- 	current->w = width;
- 	current->h = height;
- 	current->pitch = SDL_CalculatePitch(current);
-+	if (!current->pitch) {
-+		return(NULL);
-+	}
- 
- 	/* Alloc aligned mem for current->pixels */
- 	s_pixels = memalign(16, current->h * current->pitch);
-diff -r 4646533663ae -r 9b0e5c555c0f src/video/windib/SDL_dibvideo.c
---- a/src/video/windib/SDL_dibvideo.c	Sat Mar 16 18:35:33 2019 -0700
-+++ b/src/video/windib/SDL_dibvideo.c	Sat Mar 16 19:16:24 2019 -0700
-@@ -675,6 +675,9 @@
- 	video->w = width;
- 	video->h = height;
- 	video->pitch = SDL_CalculatePitch(video);
-+	if (!current->pitch) {
-+		return(NULL);
-+	}
- 
- 	/* Small fix for WinCE/Win32 - when activating window
- 	   SDL_VideoSurface is equal to zero, so activating code
-diff -r 4646533663ae -r 9b0e5c555c0f src/video/windx5/SDL_dx5video.c
---- a/src/video/windx5/SDL_dx5video.c	Sat Mar 16 18:35:33 2019 -0700
-+++ b/src/video/windx5/SDL_dx5video.c	Sat Mar 16 19:16:24 2019 -0700
-@@ -1127,6 +1127,9 @@
- 		video->w = width;
- 		video->h = height;
- 		video->pitch = SDL_CalculatePitch(video);
-+		if (!current->pitch) {
-+			return(NULL);
-+		}
- 
- #ifndef NO_CHANGEDISPLAYSETTINGS
- 		/* Set fullscreen mode if appropriate.
-diff -r 4646533663ae -r 9b0e5c555c0f src/video/x11/SDL_x11video.c
---- a/src/video/x11/SDL_x11video.c	Sat Mar 16 18:35:33 2019 -0700
-+++ b/src/video/x11/SDL_x11video.c	Sat Mar 16 19:16:24 2019 -0700
-@@ -1225,6 +1225,10 @@
- 		current->w = width;
- 		current->h = height;
- 		current->pitch = SDL_CalculatePitch(current);
-+		if (!current->pitch) {
-+			current = NULL;
-+			goto done;
-+		}
- 		if (X11_ResizeImage(this, current, flags) < 0) {
- 			current = NULL;
- 			goto done;
-
diff --git a/main/sdl/0002-CVE-2019-7572.patch b/main/sdl/0002-CVE-2019-7572.patch
deleted file mode 100644
index 0f242be4e40..00000000000
--- a/main/sdl/0002-CVE-2019-7572.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From bb11ffcff5ae2f25bead921c2a299e7e63d8a759 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Thu, 14 Feb 2019 16:51:54 +0100
-Subject: [PATCH] CVE-2019-7572: Fix a buffer overread in IMA_ADPCM_nibble
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If an IMA ADPCM block contained an initial index out of step table
-range (loaded in IMA_ADPCM_decode()), IMA_ADPCM_nibble() blindly used
-this bogus value and that lead to a buffer overread.
-
-This patch fixes it by moving clamping the index value at the
-beginning of IMA_ADPCM_nibble() function instead of the end after
-an update.
-
-CVE-2019-7572
-https://bugzilla.libsdl.org/show_bug.cgi?id=4495
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- src/audio/SDL_wave.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
-index 2968b3d..69d62dc 100644
---- a/src/audio/SDL_wave.c
-+++ b/src/audio/SDL_wave.c
-@@ -275,6 +275,14 @@ static Sint32 IMA_ADPCM_nibble(struct IMA_ADPCM_decodestate *state,Uint8 nybble)
- 	};
- 	Sint32 delta, step;
- 
-+	/* Clamp index value. The inital value can be invalid. */
-+	if ( state->index > 88 ) {
-+		state->index = 88;
-+	} else
-+	if ( state->index < 0 ) {
-+		state->index = 0;
-+	}
-+
- 	/* Compute difference and new sample value */
- 	step = step_table[state->index];
- 	delta = step >> 3;
-@@ -286,12 +294,6 @@ static Sint32 IMA_ADPCM_nibble(struct IMA_ADPCM_decodestate *state,Uint8 nybble)
- 
- 	/* Update index value */
- 	state->index += index_table[nybble];
--	if ( state->index > 88 ) {
--		state->index = 88;
--	} else
--	if ( state->index < 0 ) {
--		state->index = 0;
--	}
- 
- 	/* Clamp output sample */
- 	if ( state->sample > max_audioval ) {
--- 
-2.20.1
-
diff --git a/main/sdl/0002-CVE-2019-7577.patch b/main/sdl/0002-CVE-2019-7577.patch
deleted file mode 100644
index 06b429cb6dd..00000000000
--- a/main/sdl/0002-CVE-2019-7577.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 69cd6157644cb0a5c9edd7b5920232c2ca31c151 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Tue, 12 Mar 2019 16:21:41 +0100
-Subject: [PATCH] CVE-2019-7577: Fix a buffer overread in MS_ADPCM_nibble and
- MS_ADPCM_decode
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If a chunk of RIFF/WAV file with MS ADPCM encoding contains an invalid
-predictor (a valid predictor's value is between 0 and 6 inclusive),
-a buffer overread can happen when the predictor is used as an index
-into an array of MS ADPCM coefficients.
-
-The overead happens when indexing MS_ADPCM_state.aCoeff[] array in
-MS_ADPCM_decode() and later when dereferencing a coef pointer in
-MS_ADPCM_nibble().
-
-This patch fixes it by checking the MS ADPCM predictor values fit
-into the valid range.
-
-CVE-2019-7577
-Reproducer: https://bugzilla.libsdl.org/show_bug.cgi?id=4492
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- src/audio/SDL_wave.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
-index 08f65cb..5f93651 100644
---- a/src/audio/SDL_wave.c
-+++ b/src/audio/SDL_wave.c
-@@ -155,6 +155,9 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
- 		if ( stereo ) {
- 			state[1]->hPredictor = *encoded++;
- 		}
-+		if (state[0]->hPredictor >= 7 || state[1]->hPredictor >= 7) {
-+			goto invalid_predictor;
-+		}
- 		state[0]->iDelta = ((encoded[1]<<8)|encoded[0]);
- 		encoded += sizeof(Sint16);
- 		if ( stereo ) {
-@@ -227,6 +230,10 @@ invalid_size:
- 	SDL_SetError("Unexpected chunk length for a MS ADPCM decoder");
- 	SDL_free(freeable);
- 	return(-1);
-+invalid_predictor:
-+	SDL_SetError("Invalid predictor value for a MS ADPCM decoder");
-+	SDL_free(freeable);
-+	return(-1);
- }
- 
- struct IMA_ADPCM_decodestate {
--- 
-2.20.1
-
diff --git a/main/sdl/0002-CVE-2019-7635.patch b/main/sdl/0002-CVE-2019-7635.patch
deleted file mode 100644
index 01a111ccc4f..00000000000
--- a/main/sdl/0002-CVE-2019-7635.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -r 19d8c3b9c251 -r 08f3b4992538 src/video/SDL_bmp.c
---- a/src/video/SDL_bmp.c	Mon Feb 18 07:48:23 2019 -0800
-+++ b/src/video/SDL_bmp.c	Sat Mar 16 18:35:11 2019 -0700
-@@ -163,6 +163,14 @@
- 			ExpandBMP = biBitCount;
- 			biBitCount = 8;
- 			break;
-+		case 2:
-+		case 3:
-+		case 5:
-+		case 6:
-+		case 7:
-+			SDL_SetError("%d-bpp BMP images are not supported", biBitCount);
-+			was_error = SDL_TRUE;
-+			goto done;
- 		default:
- 			ExpandBMP = 0;
- 			break;
-
-
-
diff --git a/main/sdl/0002-CVE-2019-7637.patch b/main/sdl/0002-CVE-2019-7637.patch
deleted file mode 100644
index bf28310d5eb..00000000000
--- a/main/sdl/0002-CVE-2019-7637.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-fix copy+paste mistakes in commit 9b0e5c555c0f (CVE-2019-7637 fix):
-
-http://hg.libsdl.org/SDL/rev/9b0e5c555c0f made copy+paste mistakes which
-resulted in windows versions failing to set video mode.
-
-diff -r 37d0eba8fa17 -r 32075e9e2135 src/video/gapi/SDL_gapivideo.c
---- a/src/video/gapi/SDL_gapivideo.c	Wed Jul 31 23:50:10 2019 +0300
-+++ b/src/video/gapi/SDL_gapivideo.c	Fri Aug 02 00:35:05 2019 +0300
-@@ -733,7 +733,7 @@
- 	video->w = gapi->w = width;
- 	video->h = gapi->h = height;
- 	video->pitch = SDL_CalculatePitch(video); 
--	if (!current->pitch) {
-+	if (!video->pitch) {
- 		return(NULL);
- 	}
- 
-diff -r 37d0eba8fa17 -r 32075e9e2135 src/video/windib/SDL_dibvideo.c
---- a/src/video/windib/SDL_dibvideo.c	Wed Jul 31 23:50:10 2019 +0300
-+++ b/src/video/windib/SDL_dibvideo.c	Fri Aug 02 00:35:05 2019 +0300
-@@ -675,7 +675,7 @@
- 	video->w = width;
- 	video->h = height;
- 	video->pitch = SDL_CalculatePitch(video);
--	if (!current->pitch) {
-+	if (!video->pitch) {
- 		return(NULL);
- 	}
- 
-diff -r 37d0eba8fa17 -r 32075e9e2135 src/video/windx5/SDL_dx5video.c
---- a/src/video/windx5/SDL_dx5video.c	Wed Jul 31 23:50:10 2019 +0300
-+++ b/src/video/windx5/SDL_dx5video.c	Fri Aug 02 00:35:05 2019 +0300
-@@ -1127,7 +1127,7 @@
- 		video->w = width;
- 		video->h = height;
- 		video->pitch = SDL_CalculatePitch(video);
--		if (!current->pitch) {
-+		if (!video->pitch) {
- 			return(NULL);
- 		}
- 
-
diff --git a/main/sdl/APKBUILD b/main/sdl/APKBUILD
deleted file mode 100644
index df1bec315a0..00000000000
--- a/main/sdl/APKBUILD
+++ /dev/null
@@ -1,99 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=sdl
-pkgver=1.2.15
-pkgrel=12
-pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
-url="http://www.libsdl.org"
-arch="all"
-options="!check"  # Tests are all interactive.
-license="LGPL-2.1-or-later"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-depends_dev="libx11-dev"
-makedepends="$depends_dev libxext-dev libxrender-dev libice-dev
-	libsm-dev libxrandr-dev mesa-dev alsa-lib-dev glu-dev"
-source="https://www.libsdl.org/release/SDL-$pkgver.tar.gz
-	SDL-1.2.10-GrabNotViewable.patch
-	SDL-1.2.15-const_XData32.patch
-	0001-CVE-2019-7574.patch
-	0001-CVE-2019-7572.patch
-	0002-CVE-2019-7572.patch
-	0001-CVE-2019-7573.patch
-	0001-CVE-2019-7577.patch
-	0002-CVE-2019-7577.patch
-	0001-CVE-2019-7575.patch
-	0001-CVE-2019-7578.patch
-	0001-CVE-2019-7635.patch
-	0002-CVE-2019-7635.patch
-	0001-CVE-2019-7636.patch
-	0001-CVE-2019-7637.patch
-	0002-CVE-2019-7637.patch
-	CVE-2019-13616.patch::https://hg.libsdl.org/SDL/raw-diff/ad1bbfbca760/src/video/SDL_bmp.c
-	"
-builddir="$srcdir"/SDL-$pkgver
-
-# secfixes:
-#   1.2.15-r12:
-#     - CVE-2019-13616
-#   1.2.15-r11:
-#     - CVE-2019-7572
-#     - CVE-2019-7573
-#     - CVE-2019-7574
-#     - CVE-2019-7575
-#     - CVE-2019-7576
-#     - CVE-2019-7577
-#     - CVE-2019-7577
-#     - CVE-2019-7578
-#     - CVE-2019-7635
-#     - CVE-2019-7636
-#     - CVE-2019-7637
-#     - CVE-2019-7638
-
-prepare() {
-	update_config_sub
-	default_prepare
-}
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--disable-nasm \
-		--disable-esd \
-		--disable-video-svga \
-		--disable-video-ggi \
-		--disable-video-aalib \
-		--enable-alsa \
-		--with-x \
-		--disable-rpath
-	make
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-}
-
-static() {
-	depends=""
-	pkgdesc="$pkgdesc (static libraries)"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
-}
-
-sha512sums="ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc  SDL-1.2.15.tar.gz
-20049408d4c00d895c39a7901d889d1874ebcd382e93b2e8df38bd3726e2236f4e9a980720724cf176a35d05fb0db5dbcabd42089423adeb404f2dba16d52b7b  SDL-1.2.10-GrabNotViewable.patch
-c414a088350e4b039edf46b109721bea01300ad959b84c313f34d5bc085cab97107abb55a71cb8343f092546e4a36c52febf029ffa7d5bacbd580aee43c07bf3  SDL-1.2.15-const_XData32.patch
-8c287d6ffcc159f19d934d560e073a716325b6a62d9dea974b92b2d4a417defc4f8441769b4761c5a2600b10a45ff401b0afbab6823880e3d54eab09e22f9859  0001-CVE-2019-7574.patch
-e713d0f3d24d73831d9f116d4e15e965c5f09e19b15634e8cbf92714612b0172f24a5c542b3fde09732d17b03d7dac3aaac0d8f4e359a45c1c538970413d6e7c  0001-CVE-2019-7572.patch
-3274f91e41b72cd98b6d7962013dd45289952b7af78cc7bc5fe99d4f143434243c8ef0743117d3ec6b090784dfcba8dd460679cc5b49f298ebd8b5afab78a108  0002-CVE-2019-7572.patch
-3bf62a71988feff2329e298cee8ce48c636c65100959385b73953c95eea21cb069a7ed096165c252e5ef1db133330da5d095cf5ad145d9875b1197d3b5517b81  0001-CVE-2019-7573.patch
-f364161069ceb5d05d329ff04f6e72d2c52baff68d0d3f2203f8a7ee3ace1efe8fc63676ea7d097ccc8eb696dcc20c6b141319ddf0c2bb6efc4fd92cb1dba038  0001-CVE-2019-7577.patch
-d2f0664cc0388908ec621c84e7f889ef5abda31dc4e4d23e6e379e26475ed73863ad47b2f13d282c96ba269bdbc77e7effaf5f01032d0683ad991b506063ef19  0002-CVE-2019-7577.patch
-abe54d9f29b5e6c1a91cba2bb44e0988b7ceb5a94c3f63569f436f49f282b80280cecd79ee48b9926fff458efbdf0fff019b0fdbf6530692a11a68dbec73e7ca  0001-CVE-2019-7575.patch
-a31d5c685fafbca72fdc5336343b74b90b1bfd5af4b6f632b4d8271bb1a218ec6419a7994290f65e7a5fc36d921c2d3c1a25ddf0cdf29bffb7229229415eaa9f  0001-CVE-2019-7578.patch
-47729b56a7d323fecd4e4cccddce06061c4f53b723cb08108e1800897da54bae0bede862a09d219dce515696d9e270d062c7aa0af1ba445cc3160cdac8e3d3f7  0001-CVE-2019-7635.patch
-8e2c04d8a8167c479f56aa2b363bd3b5ee302c473642717445385210871e0c7b6bfb3020c553c4b0ca849b8a290602b20e7e398d396fdbf47980c38b0969f230  0002-CVE-2019-7635.patch
-8e9fa28015e64f08d7d8124398ee5b268546105b73313490cfffdd547e67e729455535407177827e485c4132badfc48a73cce18c0ff7ff8a1c8706613acf180c  0001-CVE-2019-7636.patch
-0ad1e445a067afb726df48eac55d593075c945199bd718b4116af84c15df6f5c095f541a5c8a008aef4474dda874e68517236f2f37e1539e0e5684240b058231  0001-CVE-2019-7637.patch
-105378cf7609872198c83b8824a1c36463b01f5696cda6c184252b728cdd1054cdc2e68a338f5d728facd182628d2a8b29b961664e89d7f9022abc0268c9afc1  0002-CVE-2019-7637.patch
-1b97970d0bcb7c49a3edfab2dd8c622a591ee64543ebe9e03b1de29a5cfb87820100444ff5ba0ce319911d1020ad94f6a8678c31aa13e370d1c9aeed6e3fd669  CVE-2019-13616.patch"
diff --git a/main/sdl/SDL-1.2.10-GrabNotViewable.patch b/main/sdl/SDL-1.2.10-GrabNotViewable.patch
deleted file mode 100644
index 128cf3510d9..00000000000
--- a/main/sdl/SDL-1.2.10-GrabNotViewable.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Makes SDL-1.2 SDL_WM_GrabInput() non-blocking in case of SDL window is not
-viewable. Patch provided by <pbonzini@redhat.com>.
-See <http://bugzilla.libsdl.org/show_bug.cgi?id=1155>.
-
---- ./src/video/x11/SDL_x11wm.c	2007-12-31 04:48:13.000000000 +0000
-+++ ./src/video/x11/SDL_x11wm.c	2009-01-15 10:27:14.000000000 +0000
-@@ -351,13 +351,14 @@ SDL_GrabMode X11_GrabInputNoLock(_THIS, 
- 			result = XGrabPointer(SDL_Display, SDL_Window, True, 0,
- 						GrabModeAsync, GrabModeAsync,
- 						SDL_Window, None, CurrentTime);
--			if ( result == GrabSuccess ) {
-+			if ( result == GrabSuccess || result == GrabNotViewable ) {
- 				break;
- 			}
- 			SDL_Delay(100);
- 		}
- 		if ( result != GrabSuccess ) {
- 			/* Uh, oh, what do we do here? */ ;
-+			return(SDL_GRAB_OFF);
- 		}
- 		/* Now grab the keyboard */
- 		XGrabKeyboard(SDL_Display, WMwindow, True,
diff --git a/main/sdl/SDL-1.2.15-const_XData32.patch b/main/sdl/SDL-1.2.15-const_XData32.patch
deleted file mode 100644
index 0f1c07cfb11..00000000000
--- a/main/sdl/SDL-1.2.15-const_XData32.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-libX11-1.5.99.901 has changed prototype of _XData32
-
-<http://bugzilla.libsdl.org/show_bug.cgi?id=1769>
-
-diff -r b6b2829cd7ef src/video/x11/SDL_x11sym.h
---- a/src/video/x11/SDL_x11sym.h	Wed Feb 27 15:20:31 2013 -0800
-+++ b/src/video/x11/SDL_x11sym.h	Wed Mar 27 16:07:23 2013 +0100
-@@ -165,7 +165,7 @@
-  */
- #ifdef LONG64
- SDL_X11_MODULE(IO_32BIT)
--SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
-+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
- SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
- #endif
- 
diff --git a/main/seabios/APKBUILD b/main/seabios/APKBUILD
index 92e464bab80..32aac7025ab 100644
--- a/main/seabios/APKBUILD
+++ b/main/seabios/APKBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=seabios
-pkgver=1.13.0
+pkgver=1.16.2
 pkgrel=0
 pkgdesc="Open-source legacy BIOS implementation"
-url="http://www.coreboot.org/SeaBIOS"
+url="https://seabios.org/SeaBIOS"
 arch="x86 x86_64"
-license="LGPL-3.0"
+license="LGPL-3.0-or-later"
 depends="$pkgname-bin=$pkgver-r$pkgrel seavgabios-bin=$pkgver-r$pkgrel"
 makedepends="python3 iasl"
-subpackages="$pkgname-bin:_seabios seavgabios-bin:_seavgabios"
-source="$pkgname-$pkgver.tar.gz::https://github.com/coreboot/seabios/archive/rel-$pkgver.tar.gz
+subpackages="$pkgname-doc $pkgname-bin:_seabios seavgabios-bin:_seavgabios"
+source="https://www.seabios.org/downloads/seabios-$pkgver.tar.gz
 	0001-Workaround-for-a-win8.1-32-S4-resume-bug.patch
 	0002-reserve-more-memory-on-fseg.patch
 
@@ -24,6 +24,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/coreboot/seabios/archive/rel
 	config.vga.virtio
 	config.vga.vmware
 	"
+options="!check"
 
 _debug_level=1
 _build_bios() {
@@ -36,8 +37,6 @@ _build_bios() {
 	cp out/"$2" binaries/"$3"
 }
 
-builddir="$srcdir/seabios-rel-$pkgver"
-
 build() {
 	mkdir binaries
 	# seabois
@@ -75,6 +74,11 @@ package() {
 	done
 
 	rm -f "$pkgdir"/.dummy
+
+	install -Ddm0755 "$pkgdir"/usr/share/doc/"$pkgname"
+	cp docs/* "$pkgdir"/usr/share/doc/"$pkgname"
+	install -Dm0644 -t "$pkgdir"/usr/share/licenses/"$pkgname" \
+		COPYING COPYING.LESSER
 }
 
 _seabios() {
@@ -91,16 +95,18 @@ _seavgabios() {
 	mv "$pkgdir"/usr/share/seavgabios "$subpkgdir"/usr/share/
 }
 
-sha512sums="7f158badf7deecc2998eab2a08f3615dfe5a7c0a51323f7b4568a4d1280935bc32bb466c8226d87d2ca7e13f9f117ff0092befcc0699bc31c5018e84754e8393  seabios-1.13.0.tar.gz
+sha512sums="
+46786f0dd50cc533610adab268313bf66ebf0ad16cd6919c29f8a80e8f908e641206e2b1559e8722e2e780ec817917dcdb6781d6ecd402287228db4038003b7a  seabios-1.16.2.tar.gz
 cb8d74650e3b7136cfb62cd63e4bb5db16664dc6207cff034e17f0ae89b21b350994d375ba40a16037951a5c6d924cf517afa5eae1365b279478216e9a64a0c7  0001-Workaround-for-a-win8.1-32-S4-resume-bug.patch
 56d0120bb84dc9dad863438d5651d220ca8d84e272427b1d5e7cd143b69d7ccde6d2dd9b950062fa81b5892fb4afb7ab3cfad3a461b696c600770b243622af42  0002-reserve-more-memory-on-fseg.patch
 dc77f693e2426a8a9b084f22d607d9bf6dfd0776cb86373a55d6e02f154f546b6fd616bb981783e914be51eb843311652a90b111fb573e32b3a8207d66aea218  config.coreboot
 a2238723fbbb96184bb52b018633701aeb929bfae43f50659258dee854acaf4f1bdf2c201c65fb46d2712372d11ab345eac1c41068f82d6dcbef91ef9d1d39cd  config.csm
-6f6659dc7e6a14b4a9ab14ebb2c1769cc8ec5d520dc1ab5125437e213baa660b5cce1cad71c65fc8b4978c467e7a8d67ad1a42ad8accfb46e3bc654b0a1f64b9  config.seabios-128k
+12efff4676132a4623fbe00ebaa06a57a9e89eb453e0e1adf03ab79111da24eb2e63cddd21725d3adccb79df2abfeb5b97d2ecc2df228f291fd3cdefae8450ec  config.seabios-128k
 3d41739944da088edafb3ea298c0d3db59ed638b614c258209a30635caccf86a284f03492612694e3a56f40357743a0a36053e8ec11b7d93853b91ba9e5a502f  config.seabios-256k
 e9ef2d6bec9419e69bc90adf1a4bb7c174284cd722e53903deea0411f88074cc247069116e03e124715072ec82f153cf6014168febba41369a2569983d3265b6  config.vga.cirrus
 aada61232f4834c1e9bec921b1e1365ce5ecb4adf42c659f34cdf051efb56f0ec2e62f0ccf66bb25d9bb0b8601e2df49b712265f19185068d45353c3aacf1cd9  config.vga.isavga
 9ebcb6702cf28685daf1821be26bab8ddc791ef2c118217c984c03c5fb77c8b9691c0fa6931367a63b8d97d67c973cd4b620fe9ca9c76da51a9b2ab3b4b5653b  config.vga.qxl
 4a1b7fcc729d78dc8fd4e73d1cb6258ed9d49f8a91e6e00cc184e07c89a304f8d38ef5446d1c4ba5e8e929c82693d82c21526e42992ad6e1a008f39bb7c90448  config.vga.stdvga
 4d627be11d79f0b8bd814a49e608826375aba6b59a0189dcba9afe24a181347b92e6ab18e0d9199e2f7a78f8fb02f03dad84c63fbbc2ffe9af76777ef28c5f8a  config.vga.virtio
-2a82f75ca6dbf48546ffa5a756136dd7085855d9411c3b37a74cc53281027b4916cf628dba784bcad915682d94705b5f8116f7a1b7ec6a99d9b2fb3fffba01c0  config.vga.vmware"
+2a82f75ca6dbf48546ffa5a756136dd7085855d9411c3b37a74cc53281027b4916cf628dba784bcad915682d94705b5f8116f7a1b7ec6a99d9b2fb3fffba01c0  config.vga.vmware
+"
diff --git a/main/seabios/config.seabios-128k b/main/seabios/config.seabios-128k
index d8948a48fb8..859134cfec6 100644
--- a/main/seabios/config.seabios-128k
+++ b/main/seabios/config.seabios-128k
@@ -18,3 +18,4 @@ CONFIG_VGAHOOKS=n
 CONFIG_SERCON=n
 CONFIG_SDCARD=n
 CONFIG_MPT_SCSI=n
+CONFIG_ACPI_PARSE=n
diff --git a/main/secureboot-hook/APKBUILD b/main/secureboot-hook/APKBUILD
new file mode 100644
index 00000000000..976f359888c
--- /dev/null
+++ b/main/secureboot-hook/APKBUILD
@@ -0,0 +1,28 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=secureboot-hook
+pkgver=0.2
+pkgrel=1
+pkgdesc="A kernel hook for generating signed UEFI Unified Kernel Image"
+url="https://gitlab.alpinelinux.org/alpine/aports"
+arch="noarch !armhf !s390x !ppc64le !mips !mips64"  # limited by sbsigntool
+license="MIT"
+depends="efi-mkuki kernel-hooks initramfs-generator sbsigntool"
+install="$pkgname.post-install $pkgname.pre-deinstall"
+source="secureboot.hook
+	secureboot.conf
+	"
+options="!check"  # no tests provided
+
+package() {
+	local name='secureboot'
+
+	install -D -m755 "$srcdir"/$name.hook "$pkgdir"/usr/share/kernel-hooks.d/$name.hook
+	install -D -m644 "$srcdir"/$name.conf "$pkgdir"/etc/kernel-hooks.d/$name.conf
+	install -d -m700 "$pkgdir"/etc/uefi-keys
+}
+
+sha512sums="
+8cf0ea83f32f7cc546f2235dcf0258ada36cf738c5738d6ac31b935b158ac40de51d53784c310810be0f8f6ce3947d9e09d781eab716f6cc303948d47384f6a8  secureboot.hook
+0777b1ec63d7d21a2144737fb913a52b8deedadbec69b7450799c228950adf9213d5d40e52617841dbae3bf4451f37a18f833e94860fab2c7779779b5fa9f66d  secureboot.conf
+"
diff --git a/main/secureboot-hook/secureboot-hook.post-install b/main/secureboot-hook/secureboot-hook.post-install
new file mode 100644
index 00000000000..709e5ada549
--- /dev/null
+++ b/main/secureboot-hook/secureboot-hook.post-install
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+ln -s /usr/share/kernel-hooks.d/secureboot.hook /etc/kernel-hooks.d/50-secureboot.hook
+
+case "$(. /etc/mkinitfs/mkinitfs.conf 2>/dev/null; printf %s "$disable_trigger")" in
+	yes | true | 1) exit 0;;
+esac
+
+cat >&2 <<EOF
+*
+* After configuring Secure Boot, disable mkinitfs trigger:
+*   echo 'disable_trigger=yes' >> /etc/mkinitfs/mkinitfs.conf
+*
+EOF
+
+exit 0
diff --git a/main/secureboot-hook/secureboot-hook.pre-deinstall b/main/secureboot-hook/secureboot-hook.pre-deinstall
new file mode 100644
index 00000000000..1638e3badf8
--- /dev/null
+++ b/main/secureboot-hook/secureboot-hook.pre-deinstall
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+HOOK_FILE='/usr/share/kernel-hooks.d/secureboot.hook'
+
+for link in /etc/kernel-hooks.d/*; do
+	if [ "$(readlink -f "$link")" = "$HOOK_FILE" ]; then
+		rm "$link"
+	fi
+done
+
+exit 0
diff --git a/main/secureboot-hook/secureboot.conf b/main/secureboot-hook/secureboot.conf
new file mode 100644
index 00000000000..39118c9e5a1
--- /dev/null
+++ b/main/secureboot-hook/secureboot.conf
@@ -0,0 +1,51 @@
+# Configuration for secureboot kernel hook
+
+# Kernel command line to embed into UEFI image.
+# Value starting with "/" or "." will be interpreted as a path to a file that
+# contains kernel command line parameters (lines starting with "#" will be
+# stripped and newlines replaced with spaces).
+#
+# It should *not* contain an initrd= parameter! Example of a valid cmdline:
+# root=UUID=<uuid-of-your-root-partition> modules=ext4
+#
+# Hook will be inactive until you set this parameter.
+cmdline=
+
+# Location of your UEFI kernel-signing key pair in PEM format.
+# You can generate it using efi-mkkeys package.
+#signing_cert="/etc/uefi-keys/db.crt"
+#signing_key="/etc/uefi-keys/db.key"
+
+# Set to "yes" to disable signing. This should be used for testing only!
+#signing_disabled=no
+
+# Use the specified OpenSSL engine(1) to load the private key.
+#openssl_engine=
+
+# Location of CPU microcode updates. Defaults to /boot/amd-ucode.img
+# or /boot/intel-ucode.img, if available.
+#microcode=
+
+# Location of splash image file. Use "/dev/null" to disable splash.
+#splash_image="/dev/null"
+
+# Absolute path to a directory on EFI System Partition where to put signed
+# UEFI image.
+#output_dir="/boot/efi/Alpine"
+
+# Name of the output UEFI image file. It can contain placeholders:
+# '{flavor}' will be replaced with the kernel flavor (e.g. "lts", "virt"),
+# '{version}' will be replaced with the kernel version (e.g. "5.10.51-0").
+#output_name="linux-{flavor}.efi"
+
+# Whether to backup old signed UEFI image (appends ".bak" to the file name).
+#backup_old=yes
+
+# Kernel flavors to skip this hook for (e.g. "edge virt"). If empty, it runs
+# for all installed flavors.
+#skip_flavors=
+
+# Absolute path to the EFI Stub file to use. It can contain placeholders:
+# '{march}' will be replaced with the machine's architecture (e.g. "aa64",
+# "x64").
+#efistub_file="/usr/lib/gummiboot/linux{march}.efi.stub"
diff --git a/main/secureboot-hook/secureboot.hook b/main/secureboot-hook/secureboot.hook
new file mode 100644
index 00000000000..39b778d6663
--- /dev/null
+++ b/main/secureboot-hook/secureboot.hook
@@ -0,0 +1,114 @@
+#!/bin/ash
+# vim: set ts=4:
+set -euo pipefail
+
+readonly HOOK_NAME='secureboot'
+
+# Defaults
+cmdline=
+signing_cert='/etc/uefi-keys/db.crt'
+signing_key='/etc/uefi-keys/db.key'
+signing_disabled=no
+openssl_engine=
+microcode=
+splash_image='/dev/null'
+output_dir='/boot/efi/Alpine'
+output_name='linux-{flavor}.efi'
+backup_old=yes
+skip_flavors=
+efistub_file='/usr/lib/gummiboot/linux{march}.efi.stub'
+
+die() {
+	printf "$HOOK_NAME: %s\n" "$2" >&2
+	exit $1
+}
+
+
+if [ $# -lt 2 ]; then
+	echo "Usage: $0 <flavor> <new-version> <old-version>" >&2
+	exit 1
+fi
+
+readonly FLAVOR=$1
+readonly NEW_VERSION=$2
+readonly OLD_VERSION=${3:-}
+case "$(cat /etc/apk/arch)" in
+	aarch64) readonly MARCH="aa64";;
+	arm*)    readonly MARCH="arm";;
+	riscv64) readonly MARCH="riscv64";;
+	x86)     readonly MARCH="ia32";;
+	x86_64)  readonly MARCH="x64";;
+esac
+
+# Hook triggered for the kernel removal, nothing to do here.
+[ "$NEW_VERSION" ] || exit 0
+
+. /etc/kernel-hooks.d/secureboot.conf
+
+[ "$skip_flavors" ] && for flavor in $skip_flavors; do
+	[ "$flavor" = "$FLAVOR" ] \
+		&& die 0 "skipping UEFI image creation for $FLAVOR kernel"
+done
+
+[ "$cmdline" ] \
+	|| die 0 "cmdline is not specified in /etc/kernel-hooks.d/$HOOK_NAME.conf, skipping hook!"
+
+if [ "$signing_disabled" != yes ]; then
+	[ -r "$signing_cert" ] \
+		|| die 2 "ERROR: signing cert '$signing_cert' does not exist or not readable!"
+
+	[ -r "$signing_key" ] \
+		|| die 2 "ERROR: signing key '$signing_key' does not exist or not readable!"
+fi
+
+vmlinuz="/boot/vmlinuz-$FLAVOR"
+output_name=$(echo "$output_name" \
+	| sed "s/{flavor}/$FLAVOR/; s/{version}/$NEW_VERSION/")
+output="$output_dir/$output_name"
+efistub_file=$(echo "$efistub_file" | sed "s/{march}/$MARCH/")
+
+[ "$microcode" ] || for path in /boot/intel-ucode.img /boot/amd-ucode.img; do
+	[ -f "$path" ] && microcode="$path"
+done
+
+tmpdir=$(mktemp -dt "$HOOK_NAME.XXXXXX")
+trap "rm -f '$tmpdir'/*; rmdir '$tmpdir'" EXIT HUP INT TERM
+
+if [ "$backup_old" = yes ] && [ -f "$output" ]; then
+	cp -a "$output" "$output.bak"
+fi
+
+/sbin/mkinitfs -o "$tmpdir"/initramfs "$NEW_VERSION-$FLAVOR"
+
+echo "==> $HOOK_NAME: creating UEFI Unified Kernel Image with $vmlinuz"
+/usr/bin/efi-mkuki \
+	-c "$cmdline" \
+	-s "$splash_image" \
+	-S "$efistub_file" \
+	-o "$tmpdir"/unsigned.efi \
+	"$vmlinuz" $microcode "$tmpdir"/initramfs
+
+mkdir -p "$output_dir"
+
+if [ "$signing_disabled" = yes ]; then
+	echo "==> $HOOK_NAME: writing *unsigned* UEFI image to $output (signing is disabled!)"
+	mv "$tmpdir"/unsigned.efi "$output"
+else
+	echo "==> $HOOK_NAME: signing UEFI image and writing to $output"
+	/usr/bin/sbsign \
+		--cert "$signing_cert" \
+		--key "$signing_key" \
+		--output "$output" \
+		${openssl_engine:+--engine $openssl_engine} \
+		"$tmpdir"/unsigned.efi \
+		2>&1 | { grep -Fv -e ' gaps between PE/COFF ' -e 'Signing Unsigned ' ||:; } >&2
+		# this is not an issue ^
+fi
+
+# Just a simple sanity check.
+dir="/${output_dir#/}"
+while [ "$dir" ]; do
+	mount -t vfat | grep -Fq " on $dir type vfat " && exit 0
+	dir=${dir%/*}
+done
+die 0 "WARNING: $output_dir is not on UEFI System Partition as it should be!"
diff --git a/main/sed/APKBUILD b/main/sed/APKBUILD
index a4f9f5cd9dd..2aca13464a1 100644
--- a/main/sed/APKBUILD
+++ b/main/sed/APKBUILD
@@ -1,23 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sed
-pkgver=4.8
-pkgrel=0
-subpackages="$pkgname-doc"
+pkgver=4.9
+pkgrel=2
 pkgdesc="GNU stream editor"
 url="https://www.gnu.org/software/sed"
 arch="all"
 license="GPL-3.0-or-later"
-makedepends="perl"
-checkdepends="diffutils"
 install="$pkgname.post-deinstall"
-# GNU's master site seems to be down. use a mirror for now
-#source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz
-source="https://ftp.heanet.ie/mirrors/ftp.gnu.org/gnu/sed/sed-$pkgver.tar.xz
-	"
-# testsuite fails because busybox provides a /usr/bin/timeout
-options="!check"
+makedepends="perl"
+checkdepends="diffutils coreutils"
+subpackages="$pkgname-doc"
+source="https://ftp.gnu.org/pub/gnu/sed/sed-$pkgver.tar.xz"
 
 build() {
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -41,4 +37,6 @@ package() {
 	rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
 }
 
-sha512sums="7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8  sed-4.8.tar.xz"
+sha512sums="
+36157a4b4a2430cf421b7bd07f1675d680d9f1616be96cf6ad6ee74a9ec0fe695f8d0b1e1f0b008bbb33cc7fcde5e1c456359bbbc63f8aebdd4fedc3982cf6dc  sed-4.9.tar.xz
+"
diff --git a/main/sendpage/APKBUILD b/main/sendpage/APKBUILD
index 5ef152f5025..82b8bba14b6 100644
--- a/main/sendpage/APKBUILD
+++ b/main/sendpage/APKBUILD
@@ -2,45 +2,34 @@
 pkgname=sendpage
 pkgver=1.0.3
 _pkgver=1.000003
-pkgrel=5
+pkgrel=9
 pkgdesc="SNPP server, client, queueing engine, modem control and TAP system"
-url="http://www.sendpage.org"
+url="https://sourceforge.net/projects/sendpage/"
 arch="noarch"
-license="GPL"
+license="GPL-2.0-or-later"
 depends="perl-mailtools perl-net-snpp perl-device-serialport
 	perl-dbi perl-sys-hostname-long perl-test-mockobject"
 makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$_pkgver.tar.gz"
-
-_builddir="$srcdir"/$pkgname-$_pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+source="https://downloads.sourceforge.net/sourceforge/sendpage/sendpage-$_pkgver.tar.gz"
+builddir="$srcdir/sendpage-$_pkgver"
+options="!check"
 
 build() {
-	cd "$_builddir"
 	perl ./Makefile.PL \
 		PREFIX="/usr" \
-		INSTALLSITELIB="/usr/lib/perl5/vendor_perl" \
-		|| return 1
-	make || return 1
+		INSTALLSITELIB="/usr/lib/perl5/vendor_perl"
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	# Remove useless folder, since it has nothing of value in it
 	rm -r "$pkgdir"/usr/local
 	# Prevent perl file collisions
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="d2ebf5332529baca94ab6de91556600a881d99991355915cfd373f658a0e8ba5d8322518f4ec39351f21f3e561c2c32d784159bc856969c05a306f1754767235  sendpage-1.000003.tar.gz"
+sha512sums="
+d2ebf5332529baca94ab6de91556600a881d99991355915cfd373f658a0e8ba5d8322518f4ec39351f21f3e561c2c32d784159bc856969c05a306f1754767235  sendpage-1.000003.tar.gz
+"
diff --git a/main/ser2net/APKBUILD b/main/ser2net/APKBUILD
index b970722c445..3e0ad3929b4 100644
--- a/main/ser2net/APKBUILD
+++ b/main/ser2net/APKBUILD
@@ -1,25 +1,26 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ser2net
 pkgver=3.5.1
-pkgrel=0
+pkgrel=4
 pkgdesc="A proxy that allows telnet/tcp connections to be made to serial ports"
-url="https://sourceforge.net/projects/ser2net"
+url="https://sourceforge.net/projects/ser2net/"
 arch="all"
-license="GPL"
-depends=""
-depends_dev=""
+license="LGPL-2.1-only AND GPL-2.0-only"
 makedepends="$depends_dev linux-headers"
-install=""
 subpackages="$pkgname-doc $pkgname-openrc"
-source="https://sourceforge.net/projects/ser2net/files/ser2net/$pkgname-$pkgver.tar.gz
+source="https://sourceforge.net/projects/ser2net/files/ser2net/ser2net-$pkgver.tar.gz
 	$pkgname.confd
 	$pkgname.initd
 "
-builddir="$srcdir/$pkgname-$pkgver"
+options="!check"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,7 +33,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -D -m755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
diff --git a/main/serf/APKBUILD b/main/serf/APKBUILD
index 41c5c913a0b..2c3bf2f5f66 100644
--- a/main/serf/APKBUILD
+++ b/main/serf/APKBUILD
@@ -1,20 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=serf
-pkgver=1.3.9
-pkgrel=5
+pkgver=1.3.10
+pkgrel=0
 pkgdesc="High-Performance Asynchronous HTTP Client Library"
-url="http://serf.apache.org/"
+url="https://serf.apache.org/"
 arch="all"
 license="Apache-2.0"
-makedepends="apr-util-dev apr-dev openssl-dev zlib-dev scons chrpath"
+makedepends="apr-util-dev apr-dev openssl-dev>3 zlib-dev scons chrpath"
 subpackages="$pkgname-dev"
-source="https://archive.apache.org/dist/serf/serf-$pkgver.tar.bz2
-	scons-py3.patch
-	"
+source="https://archive.apache.org/dist/serf/serf-$pkgver.tar.bz2"
+options="!check"
 
 build() {
-	ln -s /usr/bin/python3 python
-	export PATH="$PATH:."
 	scons CFLAGS="$CFLAGS" LINKFLAGS="$LDFLAGS" PREFIX=/usr
 }
 
@@ -23,5 +20,6 @@ package() {
 	chrpath -d "$pkgdir"/usr/lib/libserf-1.so*
 }
 
-sha512sums="9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d  serf-1.3.9.tar.bz2
-61547b360d92c29569d60c1e137f009c214e95cffd2edd20a7374da5b659c258d34759252d6ad6958eb7da0aa58fbb374153ee92323f0b84dc4b350f2ede17a1  scons-py3.patch"
+sha512sums="
+19165274d35c694935cda33f99ef92a7663a5d9c540fb7fd6792aa0efe39941b2fa87ff8b61afd060c6676baec634fd33dc2e9d34ecbee45ed99dfaed077802c  serf-1.3.10.tar.bz2
+"
diff --git a/main/serf/scons-py3.patch b/main/serf/scons-py3.patch
deleted file mode 100644
index 144f5e39eae..00000000000
--- a/main/serf/scons-py3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- serf-1.3.9/SConstruct.orig	2019-07-26 17:49:30.910189251 +0000
-+++ serf-1.3.9/SConstruct	2019-07-26 17:49:54.073821735 +0000
-@@ -163,9 +163,9 @@
-               suffix='.def', src_suffix='.h')
-   })
- 
--match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
--                  'SERF_MINOR_VERSION ([0-9]+).*'
--                  'SERF_PATCH_VERSION ([0-9]+)',
-+match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*'
-+                  b'SERF_MINOR_VERSION ([0-9]+).*'
-+                  b'SERF_PATCH_VERSION ([0-9]+)',
-                   env.File('serf.h').get_contents(),
-                   re.DOTALL)
- MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
-@@ -183,7 +183,7 @@
- 
- unknown = opts.UnknownVariables()
- if unknown:
--  print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
-+  print ('Warning: Used unknown variables:', ', '.join(unknown.keys()))
- 
- apr = str(env['APR'])
- apu = str(env['APU'])
diff --git a/main/setup-box/APKBUILD b/main/setup-box/APKBUILD
index 678a14984fd..e4a17bfdbcf 100644
--- a/main/setup-box/APKBUILD
+++ b/main/setup-box/APKBUILD
@@ -2,47 +2,28 @@
 # Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
 pkgname=setup-box
 pkgver=1.0.1
-pkgrel=0
+pkgrel=2
 pkgdesc="A tool to setup a variety of Alpine Linux Environments"
-url="https://git.alpinelinux.org/cgit/alacerda/setup-box/"
+url="https://git-old.alpinelinux.org/user/alacerda/setup-box/"
 arch="noarch"
 license="MIT"
 depends="jq"
-depends_dev=""
-makedepends="$depends_dev"
-install=""
 subpackages="$pkgname-doc"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.bz2"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-doc () {
-	mkdir -p "$subpkgdir"/usr/share/man/man1 || return 1
-	mv "$_builddir"/usr/share/man/setup-box.1.gz "$subpkgdir"/usr/share/man/man1/ || return 1
-}
+source="https://dev.alpinelinux.org/archive/setup-box/setup-box-$pkgver.tar.bz2"
+options="!check"
 
 build() {
-	cd "$_builddir"
+	sed -i \
+		-e 's:@CONFIG_DIR@:/etc/setup-box:g' \
+		-e 's:@JSON_DIR@:/etc/setup-box/json:g' \
+		-e 's:@VERSION@:v$pkgver:g' \
+		setup-box
 }
 
 package() {
-	cd "$_builddir"
-	mkdir -p "$pkgdir"/etc/setup-box/json
-	mkdir "$pkgdir"/sbin
-	install -m 755 setup-box "$pkgdir"/sbin/$pkgname
-	cp json/* "$pkgdir"/etc/setup-box/json
-	sed -e 's:@CONFIG_DIR@:/etc/setup-box:g' -i "$pkgdir"/sbin/$pkgname
-	sed -e 's:@JSON_DIR@:/etc/setup-box/json:g' -i "$pkgdir"/sbin/$pkgname
-	sed -e 's:@VERSION@:v$pkgver:g' -i "$pkgdir"/sbin/$pkgname
+	install -Dm755 setup-box -t "$pkgdir"/sbin
+	install -Dm644 json/* -t "$pkgdir"/etc/setup-box/json
+	install -Dm644 usr/share/man/setup-box.1.gz -t "$pkgdir"/usr/share/man/man1
 }
 
 sha512sums="22891037b4a0ed8a60103959e21b2d99e4bdf0a518419141623373b6a7a1c0160c8bd761ca81637bef069078849d06952817eaef83fd5c426ae9693329c29e48  setup-box-1.0.1.tar.bz2"
diff --git a/main/setxkbmap/APKBUILD b/main/setxkbmap/APKBUILD
deleted file mode 100644
index b9491de40a2..00000000000
--- a/main/setxkbmap/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=setxkbmap
-pkgver=1.3.2
-pkgrel=0
-pkgdesc="set the keyboard using the X Keyboard Extension"
-url="http://xorg.freedesktop.org/"
-arch="all"
-options="!check"  # No test suite.
-license="MIT"
-makedepends="libxkbfile-dev util-macros"
-subpackages="$pkgname-doc"
-source="https://www.x.org/releases/individual/app/setxkbmap-$pkgver.tar.bz2"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="bfa8015dee0d8d3fdbbd89afbd71c8606ce168d6edca8521d5ed05a00fecbea39bc4bfcce84b71458bdeb34c60bd80a5df27e0691ccee3966443ecdc937faf38  setxkbmap-1.3.2.tar.bz2"
diff --git a/main/sfic/APKBUILD b/main/sfic/APKBUILD
index 6e3365ae8a8..972edc4c55a 100644
--- a/main/sfic/APKBUILD
+++ b/main/sfic/APKBUILD
@@ -1,27 +1,18 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=sfic
 pkgver=0.1.7
-pkgrel=6
+pkgrel=10
 pkgdesc="Small and Simple File Integrity Checker"
-url="http://sfic.sourceforge.net/"
+url="https://sfic.sourceforge.net/"
 arch="all"
-license="GPL"
-depends=""
+license="GPL-2.0-or-later"
 makedepends="autoconf automake tdb-dev"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+subpackages="$pkgname-doc"
+source="https://downloads.sourceforge.net/sfic/sfic-$pkgver.tar.gz
 	sfic-0.1.7-signal.patch
 	limits.patch
 	automake.patch"
 
-subpackages="$pkgname-doc"
-
-builddir="$srcdir/$pkgname-$pkgver"
-
-check() {
-	cd "$builddir"
-	make check
-}
-
 prepare() {
 	default_prepare
 	sed -i -e 's/^        /\t/' src/Makefile.am
@@ -31,7 +22,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -39,8 +29,11 @@ build() {
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
-	cd "$builddir"
 	make install DESTDIR="$pkgdir"
 }
 
diff --git a/main/shared-mime-info/APKBUILD b/main/shared-mime-info/APKBUILD
index 174aa7412e1..896b5f56695 100644
--- a/main/shared-mime-info/APKBUILD
+++ b/main/shared-mime-info/APKBUILD
@@ -1,42 +1,32 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=shared-mime-info
-pkgver=1.15
+pkgver=2.4
 pkgrel=0
 pkgdesc="Freedesktop.org Shared MIME Info"
-url="http://freedesktop.org/Software/shared-mime-info"
+url="https://freedesktop.org/Software/shared-mime-info"
 arch="all"
 license="GPL-2.0-or-later"
-makedepends="libxml2-dev libxml2-utils glib-dev intltool itstool"
+makedepends="meson itstool libxml2-utils xmlto libxml2-dev glib-dev"
 install="$pkgname.post-deinstall"
 triggers="$pkgname.trigger=/usr/share/mime"
 subpackages="$pkgname-doc $pkgname-lang"
-source="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/b27eb88e4155d8fccb8bb3cd12025d5b/shared-mime-info-$pkgver.tar.xz"
-
-# Tests fail with itstool < 2.0.6
-# https://gitlab.freedesktop.org/xdg/shared-mime-info/issues/115
-options="!check"
+source="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/$pkgver/shared-mime-info-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
-	ac_cv_func_fdatasync=no ./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--disable-update-mimedb
-	make -j1
+	abuild-meson \
+		-Dupdate-mimedb=false \
+		. output
+	meson compile -C output
 }
 
 check() {
-	cd "$builddir"
-	make check
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install
-
-	mkdir -p "$pkgdir"/usr/lib
-	mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-sha512sums="3666aa500dfa6a28bd0524400c47fa16d90ae61f8c80f350fd895972319ec2f511618b8a7fa3cbde621edee46fde19e4506bda62f0bd2d0ede1b08d7bdb9aef2  shared-mime-info-1.15.tar.xz"
+sha512sums="
+17b443c2c09a432d09e4c83db956f8c0c3a768cfa9ffb8c87cd2d7c9002b95d010094e2bc64dd35946205a0f8b2d87c4f8f0a1faec86443e2edd502aa8f7cc8f  shared-mime-info-2.4.tar.gz
+"
diff --git a/main/shared-mime-info/shared-mime-info.trigger b/main/shared-mime-info/shared-mime-info.trigger
index be5371242ae..7b2de5398e1 100644
--- a/main/shared-mime-info/shared-mime-info.trigger
+++ b/main/shared-mime-info/shared-mime-info.trigger
@@ -2,7 +2,7 @@
 
 for i in "$@"; do
 	if [ -d "$i" ]; then
+		PKGSYSTEM_ENABLE_FSYNC=0 \
 		update-mime-database "$i" > /dev/null 2>&1
 	fi
 done
-sync
diff --git a/main/sharutils/APKBUILD b/main/sharutils/APKBUILD
index cc0003cfc94..e078a5fafd9 100644
--- a/main/sharutils/APKBUILD
+++ b/main/sharutils/APKBUILD
@@ -1,20 +1,27 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Maintainer:
+# Maintainer: Will Sinatra <wpsinatra@gmail.com>
 pkgname=sharutils
 pkgver=4.15.2
-pkgrel=1
+pkgrel=6
 pkgdesc="Utilities for manipulating shell archives"
 url="https://www.gnu.org/software/sharutils/"
 arch="all"
-license="GPL-3.0+"
+license="GPL-3.0-or-later"
 depends="bzip2 xz"
 makedepends="gettext-dev texinfo"
 checkdepends="diffutils"
 subpackages="$pkgname-lang $pkgname-doc"
-source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://ftp.gnu.org/gnu/sharutils/sharutils-$pkgver.tar.xz
+	format-security.patch
+	gcc-10.patch
+	"
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,14 +34,16 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	rm "$pkgdir"/usr/lib/charset.alias
 }
 
-sha512sums="80d0b804a0617e11e5c23dc0d59b218bbf93e40aaf5e9a5401a18ef9cb700390aab711e2b2e2f26c8fd5b8ef99a91d3405e01d02cadabcba7639979314e59f8d  sharutils-4.15.2.tar.xz"
+sha512sums="
+80d0b804a0617e11e5c23dc0d59b218bbf93e40aaf5e9a5401a18ef9cb700390aab711e2b2e2f26c8fd5b8ef99a91d3405e01d02cadabcba7639979314e59f8d  sharutils-4.15.2.tar.xz
+51d1cc212d812c7756fe219803e24a57a87de1362f44fdba22568d09b04234899465607ef7caab230bae40ab634971e744b421afedcede229d987616b305c73d  format-security.patch
+4b5addb5dd738a3f8ef07fdbfd3dc2b5c31c86062419388249fe324dc64450b5dcb19269b7f47236df1ba926254211c41b8ecfa39f0efe7b537ffd1b2de5bdba  gcc-10.patch
+"
diff --git a/main/sharutils/format-security.patch b/main/sharutils/format-security.patch
new file mode 100644
index 00000000000..978b8c35fbf
--- /dev/null
+++ b/main/sharutils/format-security.patch
@@ -0,0 +1,31 @@
+diff --git a/src/shar.c b/src/shar.c
+index 11cbada..2c3251d 100644
+--- a/src/shar.c
++++ b/src/shar.c
+@@ -931,7 +931,7 @@ print_header_stamp (FILE * fp)
+         free (c_dir);
+       }
+     else
+-      error (0, errno, _("Cannot get current directory name"));
++      error (0, errno, "%s", _("Cannot get current directory name"));
+   }
+ }
+ 
+@@ -2154,7 +2154,7 @@ configure_shar (int * argc_p, char *** argv_p)
+        */
+       FILE * fp = freopen ("/dev/null", "w" FOPEN_BINARY, stderr);
+       if (fp != stderr)
+-        error (SHAR_EXIT_FAILED, errno,
++        error (SHAR_EXIT_FAILED, errno, "%s",
+                _("reopening stderr to /dev/null"));
+     }
+ 
+@@ -2225,7 +2225,7 @@ configure_shar (int * argc_p, char *** argv_p)
+   if (HAVE_OPT(QUERY_USER))
+     {
+       if (HAVE_OPT(NET_HEADERS))
+-	error (0, 0, _("PLEASE avoid -X shars on Usenet or public networks"));
++	error (0, 0, "%s", _("PLEASE avoid -X shars on Usenet or public networks"));
+ 
+       fputs ("shar_wish=\n", output);
+     }
diff --git a/main/sharutils/gcc-10.patch b/main/sharutils/gcc-10.patch
new file mode 100644
index 00000000000..10e64227b93
--- /dev/null
+++ b/main/sharutils/gcc-10.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/706256
+
+Fix build failure on gcc-10/-fno-common.
+
+--- a/src/shar-opts.h
++++ b/src/shar-opts.h
+@@ -352,7 +352,7 @@ extern "C" {
+  *  global exported definitions
+  */
+ #include "local.h"
+-char const * const program_name;
++extern char const * const program_name;
+ 
+ extern bool initialization_done;
+ extern int optidx;
+--- a/src/unshar-opts.h
++++ b/src/unshar-opts.h
+@@ -192,7 +192,7 @@ extern "C" {
+ extern size_t       separator_str_len;
+ 
+ #include "local.h"
+-char const * const program_name;
++extern char const * const program_name;
+ 
+ 
+ /* * * * * *
+--- a/src/uudecode-opts.h
++++ b/src/uudecode-opts.h
+@@ -170,7 +170,7 @@ extern "C" {
+  *  global exported definitions
+  */
+ #include "local.h"
+-char const * const program_name;
++extern char const * const program_name;
+ 
+ 
+ /* * * * * *
+--- a/src/uuencode-opts.h
++++ b/src/uuencode-opts.h
+@@ -166,7 +166,7 @@ extern "C" {
+  *  global exported definitions
+  */
+ #include "local.h"
+-char const * const program_name;
++extern char const * const program_name;
+ 
+ 
+ /* * * * * *
+
diff --git a/main/shorewall-core/APKBUILD b/main/shorewall-core/APKBUILD
index 6e54b7589de..d2fc22e79bf 100644
--- a/main/shorewall-core/APKBUILD
+++ b/main/shorewall-core/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=shorewall-core
-pkgver=5.2.4
+pkgver=5.2.8
 
 _maj_min_patch=$pkgver
 case $pkgver in
@@ -9,7 +9,7 @@ case $pkgver in
 esac
 _maj_min=${_maj_min_patch%.*}
 
-pkgrel=0
+pkgrel=1
 pkgdesc="Core libraries for Shorewall"
 url="https://shorewall.org/"
 arch="noarch"
@@ -36,5 +36,5 @@ package() {
 	DESTDIR="$pkgdir" ./install.sh shorewallrc.alpine
 }
 
-sha512sums="40add35f175abd62ede0b0b8f84151d7a81d56bcc3d622ed9ac676e382bd33cfee648da205f23ead462b5e6e577784c79ffdcdde5f45c731c6d93c11788d982d  shorewall-core-5.2.4.tar.bz2
+sha512sums="f0d4f41b2614cc4c6f834ac2a7bdfae181789bc97044171b0fa1e968cda930cfdc86fa1ff4b54b43a8ae22b7b6f80b66b77888644c5a7751edf814cc49d491c6  shorewall-core-5.2.8.tar.bz2
 c076ae42e7b404cecf521fdc32f92ba3a6b77d61579726abde2f00b6b6282e55b0b334b9fe5e43a6e4ae56361cce3214d9a38099f9f8714f03ae4fb888c744b7  shorewallrc.alpine"
diff --git a/main/shorewall/APKBUILD b/main/shorewall/APKBUILD
index eeddd7c0664..4ae4bf7aad3 100644
--- a/main/shorewall/APKBUILD
+++ b/main/shorewall/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=shorewall
-pkgver=5.2.4
+pkgver=5.2.8
 
 _maj_min_patch=$pkgver
 case $pkgver in
@@ -9,7 +9,7 @@ case $pkgver in
 esac
 _maj_min=${_maj_min_patch%.*}
 
-pkgrel=0
+pkgrel=1
 pkgdesc="An iptables front end for firewall configuration"
 url="https://shorewall.org/"
 arch="noarch"
@@ -22,6 +22,7 @@ subpackages="$pkgname-doc $pkgname-openrc"
 source="https://shorewall.org/pub/shorewall/$_maj_min/shorewall-$_maj_min_patch/shorewall-$pkgver.tar.bz2
 	shorewall.initd
 	shorewallrc.alpine
+	shorewall-find.patch
 	"
 prepare() {
 	default_prepare
@@ -38,6 +39,9 @@ package() {
 	install -Dm755 "$srcdir"/shorewall.initd "$pkgdir"/etc/init.d/shorewall
 }
 
-sha512sums="2eee8b8e86aef29f646f324dcbd156eae7a687db179361e03172ef4792f2665fd3623830028a748ea3506ffbb2f59afa9f7deba7862643aff7628857aa2ac63c  shorewall-5.2.4.tar.bz2
+sha512sums="
+d5fc562f59e97cb462c6c0d7cf2b0f6211d413c2e3db72d93e8ad4f23cd1d0f69c90fff602d6891bbee1725c2505a72f3677c3050758e36f38f0248e8c6c7e52  shorewall-5.2.8.tar.bz2
 7e226f42f74ce92d4c40bd0e812fbe744f0e343de7d7d68f59328b57829b0a10e2226fa9ef78e3465846bb2f691f761810774672b0a8510f96b80d7645982dc5  shorewall.initd
-c076ae42e7b404cecf521fdc32f92ba3a6b77d61579726abde2f00b6b6282e55b0b334b9fe5e43a6e4ae56361cce3214d9a38099f9f8714f03ae4fb888c744b7  shorewallrc.alpine"
+c076ae42e7b404cecf521fdc32f92ba3a6b77d61579726abde2f00b6b6282e55b0b334b9fe5e43a6e4ae56361cce3214d9a38099f9f8714f03ae4fb888c744b7  shorewallrc.alpine
+101403794e9ac4947702de9303e8364c74a2ffba007310b6a6dc8a99388cd2d152fa74e145c2dab9e71518a01fe0ebfb4c6a6bb0fa8225329416ebc0ad917b87  shorewall-find.patch
+"
diff --git a/main/shorewall/shorewall-find.patch b/main/shorewall/shorewall-find.patch
new file mode 100644
index 00000000000..3722b798e3e
--- /dev/null
+++ b/main/shorewall/shorewall-find.patch
@@ -0,0 +1,58 @@
+From 747275264d10401d15905f1f7d1a9e2e5a00904d Mon Sep 17 00:00:00 2001
+From: Alex <alex-gitlab.x6izqcc7@alxu.ca>
+Date: Sat, 31 Jul 2021 23:18:14 +0000
+Subject: [PATCH] lib.cli-std: stop checking for busybox
+
+it doesn't actually check if find supports -quit (i.e. will break in hardlink or reflink mode), the code path is broken ($AUTOMAKE is not quoted), and busybox has supported -quit for three years now
+---
+ Shorewall/lib.cli-std | 27 ++++-----------------------
+ 1 file changed, 4 insertions(+), 23 deletions(-)
+
+diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std
+index a5a497674..62fffdc08 100644
+--- a/lib.cli-std
++++ b/lib.cli-std
+@@ -381,36 +381,17 @@ uptodate() {
+     [ -x $1 ] || return 1
+ 
+     local dir
+-    local busybox
+-    local find
+-
+-    find=$(mywhich find)
+-
+-    [ -n "${find}" ] || return 1
+-    [ -h "${find}" ] && busybox=Yes
+-    find="${find} -L"
+ 
+     for dir in $g_shorewalldir $(split $CONFIG_PATH); do
+-	if [ -n "${busybox}" ]; then
+-	    #
+-	    # Busybox 'find' doesn't support -quit.
+-	    #
+-	    if [ $AUTOMAKE = recursive ]; then
+-		if [ -n "$(${find} ${dir} -newer $1 -print)" ]; then
+-		    return 1;
+-		fi
+-	    elif  [ -n "$(${find} ${dir} -maxdepth $AUTOMAKE -type f -newer $1 -print)" ]; then
+-		return 1;
+-	    fi
+-	elif [ "$AUTOMAKE" = recursive ]; then
+-	    if [ -n "$(${find} ${dir} -newer $1 -print -quit)" ]; then
++	if [ "$AUTOMAKE" = recursive ]; then
++	    if [ -n "$(find ${dir} -newer $1 -print -quit)" ]; then
+ 		return 1;
+ 	    fi
+ 	elif [ -z "$AUTOMAKE" ]; then
+-	    if [ -n "$(${find} ${dir} -maxdepth 1 -type f -newer $1 -print -quit)" ]; then
++	    if [ -n "$(find ${dir} -maxdepth 1 -type f -newer $1 -print -quit)" ]; then
+ 		return 1;
+ 	    fi
+-	elif [ -n "$(${find} ${dir} -maxdepth $AUTOMAKE -type f -newer $1 -print -quit)" ]; then
++	elif [ -n "$(find ${dir} -maxdepth $AUTOMAKE -type f -newer $1 -print -quit)" ]; then
+ 	    return 1;
+ 	fi
+     done
+-- 
+GitLab
+
diff --git a/main/shorewall6/APKBUILD b/main/shorewall6/APKBUILD
index cefed6cef56..669ad745657 100644
--- a/main/shorewall6/APKBUILD
+++ b/main/shorewall6/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=shorewall6
-pkgver=5.2.4
+pkgver=5.2.8
 
 _maj_min_patch=$pkgver
 case $pkgver in
@@ -9,13 +9,13 @@ case $pkgver in
 esac
 _maj_min=${_maj_min_patch%.*}
 
-pkgrel=0
+pkgrel=1
 pkgdesc="Files for the IPV6 Shorewall Firewall"
 url="https://shorewall.org/"
 arch="noarch"
 license="GPL-2.0-or-later"
 options="!check" # No test suite
-depends="shorewall-core perl ip6tables iproute2"
+depends="shorewall-core perl iproute2 perl-socket6"
 # coreutils for install -T
 makedepends="coreutils bash"
 subpackages="$pkgname-doc $pkgname-openrc"
@@ -39,6 +39,6 @@ package() {
 		"$pkgdir"/etc/init.d/shorewall6
 }
 
-sha512sums="b4dce7043b44fc1b84c5f8b07c524b0c9b5a83e06f694646115c448ad1e0407a77613ace99b5866cfa8b7078a98c1aba79a94c094e40453745d6cccc453d8934  shorewall6-5.2.4.tar.bz2
+sha512sums="7044efe84b2c585fcd0bfb661666c71cea140157f22ba7d4881006e24d785eb0091c071c825fa5948bc1383e7fd4617cc8f3d4e68865cf472ddea3811bf1833d  shorewall6-5.2.8.tar.bz2
 c8cb512c487f30e26b63bd8e42cf506d032ced2364e0e79e86a3cff84f778ddf00efcbf1e23b07ba0aea9b5b7fcf5f0d10cd4b9884df46ee73ee6b2dff5cd672  shorewall6.initd
 c076ae42e7b404cecf521fdc32f92ba3a6b77d61579726abde2f00b6b6282e55b0b334b9fe5e43a6e4ae56361cce3214d9a38099f9f8714f03ae4fb888c744b7  shorewallrc.alpine"
diff --git a/main/sic/APKBUILD b/main/sic/APKBUILD
deleted file mode 100644
index 9d6f90b8889..00000000000
--- a/main/sic/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=sic
-pkgver=1.2
-pkgrel=1
-pkgdesc="an extremely simple IRC client"
-url="https://tools.suckless.org/sic"
-arch="all"
-license="MIT"
-depends=""
-options="!check" # upstream doesn't have a test suite
-subpackages="$pkgname-doc"
-source="https://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz
-	musl-fix.patch"
-builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	default_prepare
-	sed -i "$builddir/config.mk" \
-		-e '/CFLAGS/{s/-g -O0//;s/=/+=/}' \
-		-e '/LDFLAGS/{s/-s//;s/=/+=/}'
-}
-
-build() {
-	cd "$builddir"
-	make PREFIX=/usr
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" PREFIX=/usr install
-}
-
-sha512sums="5659ed9d8a5986dda90dbe1155c27a5fd0ab4b1fcad2c1a20997c530bf03864e6c08bdeffc025c728629ab11872af6a1250761160b91f148dc37d77a49046dc9  sic-1.2.tar.gz
-94d9dc44a1a33c67141db312004a2c9d2113223c921ae210a6451b1c0f408d93fff4b16049f49d393ab4ca3ffca3fb5fc62265ec6195317abfbb70abdcd8ad5e  musl-fix.patch"
diff --git a/main/sic/musl-fix.patch b/main/sic/musl-fix.patch
deleted file mode 100644
index f04e3296989..00000000000
--- a/main/sic/musl-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d8e9e4a013196b98576a3a759b4b27c3edb2a0d2 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 4 Feb 2014 10:06:53 +0000
-Subject: [PATCH] build fix for musl libc
-
-It fixes the following compile error with musl libc:
-sic.c:137:17: error: storage size of 'tv' isn't known
-  struct timeval tv;
-                 ^
----
- sic.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/sic.c b/sic.c
-index d93c2ec..e4bdb74 100644
---- a/sic.c
-+++ b/sic.c
-@@ -8,6 +8,8 @@
- #include <time.h>
- #include <unistd.h>
- 
-+#include <sys/time.h>
-+
- static char *host = "irc.oftc.net";
- static char *port = "6667";
- static char *password;
--- 
-1.8.5.3
-
diff --git a/main/simdjson/APKBUILD b/main/simdjson/APKBUILD
new file mode 100644
index 00000000000..dda766fc152
--- /dev/null
+++ b/main/simdjson/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Grigory Kirillov <txgk@bk.ru>
+# Maintainer: Simon Zeni <simon@bl4ckb0ne.ca>
+pkgname=simdjson
+pkgver=3.6.0
+pkgrel=0
+pkgdesc="Parsing gigabytes of JSON per second"
+url="https://simdjson.org"
+arch="all"
+license="Apache-2.0"
+# tests take a very long time to compile and require downloading other JSON parsers
+options="!check"
+makedepends="cmake samurai"
+subpackages="$pkgname-static $pkgname-dev"
+source="https://github.com/simdjson/simdjson/archive/v$pkgver/simdjson-$pkgver.tar.gz"
+
+build() {
+	cmake -B builddir -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DBUILD_SHARED_LIBS=ON
+	cmake -B builddir-static -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release
+	cmake --build builddir
+	cmake --build builddir-static
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install builddir
+	DESTDIR="$pkgdir" cmake --install builddir-static
+}
+
+sha512sums="
+9e99093ac9f2d6490684210c2e8d80e6817e5b9fb391cd30494c0536cd3a3220623eeeac4af7aff604d73f558c2dffa07c8e17d2524f2b9b1904b1e2c91b8c81  simdjson-3.6.0.tar.gz
+"
diff --git a/main/sipcalc/APKBUILD b/main/sipcalc/APKBUILD
index 8655128b38e..12ba8561eae 100644
--- a/main/sipcalc/APKBUILD
+++ b/main/sipcalc/APKBUILD
@@ -2,40 +2,25 @@
 # Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
 pkgname=sipcalc
 pkgver=1.1.6
-pkgrel=0
+pkgrel=4
 pkgdesc="Advanced console based ip subnet calculator"
-url="http://www.routemeister.net/projects/sipcalc/"
+url="https://www.routemeister.net/projects/sipcalc/"
 arch="all"
-license="BSD"
-depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
+license="BSD-3-Clause"
+options="!check" # no tests
 subpackages="$pkgname-doc"
-source="http://www.routemeister.net/projects/sipcalc/files/${pkgname}-${pkgver}.tar.gz"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+source="https://www.routemeister.net/projects/sipcalc/files/sipcalc-$pkgver.tar.gz"
 
 build() {
-	cd "$_builddir"
-	./configure || return 1
-	make || return 1
+	./configure
+	make
 }
 
 package() {
-	cd "$_builddir"
-        mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/lib" "$pkgdir/usr/share/man/man1"
-        make prefix="$pkgdir"/usr MANDIR="$pkgdir"/usr/share/man/man1 install || return 1
-
+	mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/lib" "$pkgdir/usr/share/man/man1"
+	make prefix="$pkgdir"/usr MANDIR="$pkgdir"/usr/share/man/man1 install
 }
 
-sha512sums="9d2047a6fb6ef177d455f44abea19bab7d0131b16eb2444b2b074e94e776854fa74084ab625d2be9b64d136979ede71722c2e24dca12ff54e4a5bb02f947570e  sipcalc-1.1.6.tar.gz"
+sha512sums="
+9d2047a6fb6ef177d455f44abea19bab7d0131b16eb2444b2b074e94e776854fa74084ab625d2be9b64d136979ede71722c2e24dca12ff54e4a5bb02f947570e  sipcalc-1.1.6.tar.gz
+"
diff --git a/main/sipp/APKBUILD b/main/sipp/APKBUILD
index fa36910f77b..37c2b1660c7 100644
--- a/main/sipp/APKBUILD
+++ b/main/sipp/APKBUILD
@@ -2,37 +2,43 @@
 # Contributor: Robert Boisvert <rdboisvert@gmail.com>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=sipp
-pkgver=3.6.0
+pkgver=3.7.2
 pkgrel=0
-pkgdesc="A test tool / traffic generator for the SIP protocol"
+pkgdesc="Test tool / traffic generator for the SIP protocol"
 url="https://github.com/SIPp/sipp"
 arch="all"
 license="GPL-2.0-or-later"
-depends=""
-depends_dev=""
-makedepends="linux-headers autoconf automake openssl-dev libpcap-dev ncurses-dev lksctp-tools-dev"
-install=""
-subpackages=""
+makedepends="
+	cmake
+	libpcap-dev
+	linux-headers
+	lksctp-tools-dev
+	ncurses-dev
+	openssl-dev>3
+	samurai
+	"
 source="https://github.com/SIPp/sipp/releases/download/v$pkgver/sipp-$pkgver.tar.gz
+	libtinfo.patch
 	"
-
-builddir="$srcdir"/$pkgname-$pkgver
+options="!check" # tests have no direct target
 
 build() {
-	cd "$builddir"
-	CFLAGS="$CFLAGS -D_GNU_SOURCE" \
-	./configure --prefix=/usr \
-		--with-openssl \
-		--with-pcap \
-		--with-sctp
-	make
+	cmake -B build -G Ninja -Wno-dev \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=None \
+		-DUSE_PCAP=1 \
+		-DUSE_SSL=1 \
+		-DUSE_SCTP=1
+
+	cmake --build build
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	mkdir -p "$pkgdir"/usr/share/"$pkgname"
-	install -m444 -D pcap/* "$pkgdir"/usr/share/"$pkgname"/
+	DESTDIR="$pkgdir" cmake --install build
+	install -m444 -D pcap/* -t "$pkgdir"/usr/share/"$pkgname"/
 }
 
-sha512sums="eecbc18a18558a3fbc4f7c841d1fc8bd5be4b0c5d2bb363a12faf730f3c6a0773a24f07dbf062e68baf1a93b21686fa09258d0e08b45b4f941eb5d573bb25c12  sipp-3.6.0.tar.gz"
+sha512sums="
+5ccd73efe0dd9b9e2788a61c0a423726e3bb7002d1266931838bc18307c975f7cd15b795c1aedb900a7f97a929df4b085b0875914db6e96984bc3bd3952d390b  sipp-3.7.2.tar.gz
+92b62f605b92a81ed56ba3f992d126ee70b06f3b08d5c30a3a6614f0844d6ebf1d9e0094ac93dd8c80271414ff414b3efb22117ab2c8eb5ff76fc49327a1dea0  libtinfo.patch
+"
diff --git a/main/sipp/libtinfo.patch b/main/sipp/libtinfo.patch
new file mode 100644
index 00000000000..27f211aabed
--- /dev/null
+++ b/main/sipp/libtinfo.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9ef0cf9..1ac7131 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -180,7 +180,7 @@ endif()
+ if(CURSES_LIBRARY)
+   target_link_libraries(sipp dl ${CURSES_LIBRARY} pthread)
+   target_link_libraries(sipp_unittest dl ${CURSES_LIBRARY} pthread)
+-  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
++  if(false)
+     if(TINFO_LIBRARY)
+       target_link_libraries(sipp ${TINFO_LIBRARY})
+       target_link_libraries(sipp_unittest ${TINFO_LIBRARY})
diff --git a/main/sipsak/APKBUILD b/main/sipsak/APKBUILD
index 5047f6f1bc5..0d5647e2bc3 100644
--- a/main/sipsak/APKBUILD
+++ b/main/sipsak/APKBUILD
@@ -1,13 +1,13 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=sipsak
-pkgver=0.9.7
-pkgrel=0
+pkgver=0.9.8.1
+pkgrel=1
 pkgdesc="SIP swiss army knife"
 url="https://github.com/nils-ohlmeier/sipsak"
 arch="all"
 license="GPL-2.0-or-later"
-makedepends="openssl-dev c-ares-dev autoconf automake"
+makedepends="openssl-dev>3 c-ares-dev autoconf automake"
 subpackages="$pkgname-dbg $pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/nils-ohlmeier/sipsak/archive/$pkgver.tar.gz
 	musl-fix-strcasestr.patch
@@ -20,6 +20,10 @@ prepare() {
 }
 
 build() {
+	# Fix for -fno-common being worked upstream
+	# Issue:https://github.com/nils-ohlmeier/sipsak/issues/60
+	# PR: https://github.com/nils-ohlmeier/sipsak/pull/61
+	CFLAGS="$CFLAGS -fcommon" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -38,6 +42,8 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="088da5b5b81e7ff89bdc920dc8fdfc559ba36d599de9ba5ca22c35f2bea24f0c7c76e10125baa8ae517c3f03b1b936adacde4e236be8a13797651adc624f14a7  sipsak-0.9.7.tar.gz
+sha512sums="
+b018a463e028b1e6cb31507957b7d2c1836341e2456d0df366edc12937d788ac548da6434d310917c9e32e12c02b7ae1462443c2461152ee3a3ee9cbf35d4618  sipsak-0.9.8.1.tar.gz
 95fb13a5b3bc108544e6ac3a0c5e7a00890926df02b390c1fdb3e28a3cf4aa7ef3ffafd904cc4665547135fe45b412c4b676ae1c52d133d8deef62f062ac909f  musl-fix-strcasestr.patch
-7bdad66145b37ca1039f01e4b523b1555bda8fc387e6b4745d53e89473c0b23d675b403b83ff9b59a75002fd26345699d71720e4c15fd419a56122dbc68c8682  fix-aaaa-record-segfault.patch"
+7bdad66145b37ca1039f01e4b523b1555bda8fc387e6b4745d53e89473c0b23d675b403b83ff9b59a75002fd26345699d71720e4c15fd419a56122dbc68c8682  fix-aaaa-record-segfault.patch
+"
diff --git a/main/sircbot/APKBUILD b/main/sircbot/APKBUILD
index e9328623202..5ca68541f1d 100644
--- a/main/sircbot/APKBUILD
+++ b/main/sircbot/APKBUILD
@@ -1,17 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=sircbot
 pkgver=0.4
-pkgrel=2
+pkgrel=6
 pkgdesc="Minimalistic IRC bot"
-url="https://git.alpinelinux.org/cgit/sircbot/"
+url="https://git-old.alpinelinux.org/hosted/sircbot/"
 arch="all"
-license="GPL-2.0"
+license="GPL-2.0-only"
 pkgusers="sircbot"
 pkggroups="sircbot"
-depends=
-makedepends=""
-subpackages="lua-sircbot:luamod"
+subpackages="lua-sircbot:luamod $pkgname-openrc"
 for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev"
 	subpackages="$subpackages lua$_i-sircbot:split_${_i/./_}"
@@ -22,11 +20,9 @@ source="https://dev.alpinelinux.org/archive/sircbot/sircbot-$pkgver.tar.xz
 	sircbot.initd
 	sircbot.confd
 	"
-
-builddir="$srcdir"/$pkgname-$pkgver
+options="!check"
 
 build() {
-	cd "$builddir"
 	make
 	for i in $_luaversions; do
 		make LUA_VERSION=$i
@@ -34,7 +30,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make install DESTDIR="$pkgdir" prefix=/usr
 	for i in $_luaversions; do
 		make install-lua DESTDIR="$pkgdir" prefix=/usr LUA_VERSION=$i
@@ -63,7 +58,6 @@ _split() {
 	done
 }
 
-
 for _v in $_luaversions; do
 	eval "split_${_v/./_}() { _split $_v; }"
 done
diff --git a/main/skalibs/APKBUILD b/main/skalibs/APKBUILD
index a9a65b66cf1..397592a33cc 100644
--- a/main/skalibs/APKBUILD
+++ b/main/skalibs/APKBUILD
@@ -1,15 +1,27 @@
-# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 # Contributor: John Regan <john@jrjrtech.com>
+# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 pkgname=skalibs
-pkgver=2.9.2.0
+# NOTE: If you're upgrading to a new version that fixes some security
+# vulnerability in the APIs used by utmps (mainly timed ipcs),
+# rebuild the following aports:
+# - busybox
+# - mingetty
+# - openssh
+# - util-linux
+pkgver=2.14.1.1
 pkgrel=0
 pkgdesc="Set of general-purpose C programming libraries for skarnet.org software."
-url="http://skarnet.org/software/skalibs/"
+url=https://skarnet.org/software/skalibs/
 arch="all"
 license="ISC"
 options="!check"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="http://skarnet.org/software/skalibs/skalibs-$pkgver.tar.gz"
+source="https://skarnet.org/software/skalibs/skalibs-$pkgver.tar.gz skalibs.pc"
+
+prepare() {
+	default_prepare
+	sed -i "s|@@VERSION@@|$pkgver|" -i "$srcdir"/*.pc
+}
 
 build() {
 	./configure \
@@ -21,6 +33,9 @@ build() {
 
 package() {
 	make DESTDIR="$pkgdir" install
+	install -D -m 0644 "$srcdir/skalibs.pc" "$pkgdir/usr/lib/pkgconfig/skalibs.pc"
+	mkdir -p "$pkgdir/usr/share/doc"
+	cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
 }
 
 dev() {
@@ -28,18 +43,10 @@ dev() {
 	mkdir -p "$subpkgdir"/usr/lib/"$pkgname"/sysdeps
 	mv "$pkgdir/usr/lib/$pkgname"/sysdeps/* \
 		"$subpkgdir/usr/lib/$pkgname"/sysdeps
-	rm -rf "$pkgdir"/usr
-}
-
-doc() {
-	default_doc
-	mkdir -p "$subpkgdir/usr/share/doc"
-	cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
-}
-
-static() {
-	default_static
-	rmdir -p "$pkgdir"/usr/lib || :
+	rm -rf "$pkgdir/usr/lib"
 }
 
-sha512sums="a351cb8d048cefa495cc35fd2758579879d5ac11d2a1fc00c694d5655aa9e430228517c01fc91bdbc70c3992f73429a68a5365cb46039a7b7bb11358f0f4506d  skalibs-2.9.2.0.tar.gz"
+sha512sums="
+01b3da7614ee626f838b62aff6fa2d4677ab5c5dfffcb3145232db9ac0b5bf70c063f4d83abdee809139fee721c75550eb997e2c3e265417b9493c98886236f9  skalibs-2.14.1.1.tar.gz
+5771f0e72e7e7e9a45cafdf2e4508938a29ff9474845c897e383004b031ad142dee1b65d83a9a0168696782163cb4a32f82db4d7360413b433e68282cd4cc487  skalibs.pc
+"
diff --git a/main/skalibs/skalibs.pc b/main/skalibs/skalibs.pc
new file mode 100644
index 00000000000..33849426f3f
--- /dev/null
+++ b/main/skalibs/skalibs.pc
@@ -0,0 +1,5 @@
+Name: skalibs
+Description: The skarnet.org general-purpose C library.
+URL: https://skarnet.org/software/skalibs/
+Version: @@VERSION@@
+Libs: -lskarnet
diff --git a/main/skytraq-datalogger/APKBUILD b/main/skytraq-datalogger/APKBUILD
index d8fba7a44ce..16563746b37 100644
--- a/main/skytraq-datalogger/APKBUILD
+++ b/main/skytraq-datalogger/APKBUILD
@@ -3,42 +3,30 @@
 pkgname=skytraq-datalogger
 pkgver=0.5.1
 _pkgver=0.5-1
-pkgrel=1
+pkgrel=4
 pkgdesc="Configuration and download tool for GPS data loggers based on Skytraq Venus 5 and 6 chipsets"
-url="http://code.google.com/p/skytraq-datalogger/"
+url="https://code.google.com/p/skytraq-datalogger/"
 arch="all"
-license="GPL-2.0"
-depends=""
+license="GPL-2.0-or-later"
 depends_dev="curl-dev"
 makedepends="$depends_dev"
-install=""
-subpackages=""
-source="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/skytraq-datalogger/${pkgname}_${_pkgver}.tar.gz
+source="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/skytraq-datalogger/skytraq-datalogger_$_pkgver.tar.gz
 	Makefile.patch
 	agps-download.c.patch
 	"
-
-_builddir="$srcdir/${pkgname}-${_pkgver}"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir/$pkgname-$_pkgver"
+options="!check"
 
 build() {
-	cd "$_builddir"
-	make || return 1
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="053cf6b65fcda439fc41ee517b3bf5ac91f531afeacfcad8f5216dc1a344896cd653bbd8af9584fc88c34c8cb281b903d17b50cb26e39f98e2beb31d37164893  skytraq-datalogger_0.5-1.tar.gz
+sha512sums="
+053cf6b65fcda439fc41ee517b3bf5ac91f531afeacfcad8f5216dc1a344896cd653bbd8af9584fc88c34c8cb281b903d17b50cb26e39f98e2beb31d37164893  skytraq-datalogger_0.5-1.tar.gz
 c1437638aba221bd9e8c412661519f8821540a213474274580f57ea82d209bb84268b190efbfd8f54be4c1bb9b709c0c31dae003bf75684a441e21528d56174d  Makefile.patch
-98970245e68a025586fb806913af328f4c9ab2bdd18954b5abb19f5f921725283d0df4ecff5503ea2f595d3d837488b874ec33b6e80b1858c22405403f900e83  agps-download.c.patch"
+98970245e68a025586fb806913af328f4c9ab2bdd18954b5abb19f5f921725283d0df4ecff5503ea2f595d3d837488b874ec33b6e80b1858c22405403f900e83  agps-download.c.patch
+"
diff --git a/main/slang/APKBUILD b/main/slang/APKBUILD
index cae08a4ce4b..11e20732bde 100644
--- a/main/slang/APKBUILD
+++ b/main/slang/APKBUILD
@@ -1,33 +1,74 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=slang
-pkgver=2.3.2
-pkgrel=0
+pkgver=2.3.3
+pkgrel=3
 pkgdesc="Powerful interpreted language"
-url="http://www.jedsoft.org/slang"
+url="https://www.jedsoft.org/slang"
 arch="all"
 license="GPL-2.0-or-later"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends="pcre-dev ncurses-dev"
-source="http://www.jedsoft.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2"
+makedepends="
+	libpng-dev
+	ncurses-dev
+	oniguruma-dev
+	zlib-dev
+	"
+subpackages="
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-oniguruma
+	$pkgname-png
+	$pkgname-zlib
+	"
+source="https://www.jedsoft.org/releases/slang/slang-$pkgver.tar.bz2
+	disable-rpath.patch
+	terminfo-in-etc.patch
+	skip-slsh-process-test.patch
+	"
 
-builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make -j1 elf static
-	cd slsh && make
+		--localstatedir=/var \
+		--without-pcre \
+		--with-zlib=/usr/lib \
+		--with-zinc=/usr/include
+	make -j1
+}
+
+check() {
+	make check
 }
 
 package() {
-	cd "$builddir"
-	make -j1 install-all DESTDIR="$pkgdir"
+	make -j1 DESTDIR="$pkgdir" install-all
+}
+
+oniguruma() {
+	pkgdesc="$pkgdesc (oniguruma module)"
+
+	amove usr/lib/slang/v2/modules/onig-module.so
+}
+
+png() {
+	pkgdesc="$pkgdesc (png module)"
+
+	amove usr/lib/slang/v2/modules/png-module.so
+}
+
+zlib() {
+	pkgdesc="$pkgdesc (zlib module)"
+
+	amove usr/lib/slang/v2/modules/zlib-module.so
 }
 
-sha512sums="35cdfe8af66dac62ee89cca60fa87ddbd02cae63b30d5c0e3786e77b1893c45697ace4ac7e82d9832b8a9ac342560bc35997674846c5022341481013e76f74b5  slang-2.3.2.tar.bz2"
+sha512sums="
+f882f09e3fcd53427de0f233c9fc3ab15497f2323007be9a084696c8cf810ffe2726cd003149e757df26198b390b9f8c1ff411dc6473513457bd0f94722f8490  slang-2.3.3.tar.bz2
+0cb78c65faade7cb1ec683ba3ae84d7514df7af92a465a6af262979b43ae86bdd9fd289c9680e9158a0b01e2df4ddaa7c547d9707afc3c3b75d798f2225cbc0f  disable-rpath.patch
+a9fe12d220ec3458932784f1f7d40816cad9664ad5a3e19fe684e8f32eccc67ffc48acfa9852fccbe6741519f2acadbafc4b72817ae70804f93e2d913831d786  terminfo-in-etc.patch
+4a499a61a0abf119a362c46e761a4cd659a0de03f22acd2004a09fce339cde848f114a3a0beca176e3a42beeb8d0d2cd73ba788ccb01330b741afe9d8528164c  skip-slsh-process-test.patch
+"
diff --git a/main/slang/disable-rpath.patch b/main/slang/disable-rpath.patch
new file mode 100644
index 00000000000..a2715863538
--- /dev/null
+++ b/main/slang/disable-rpath.patch
@@ -0,0 +1,29 @@
+Upstream: no.
+Reason: >>> WARNING: slang*: Redundant /usr/lib in rpath found
+
+diff --git a/modules/Makefile.in b/modules/Makefile.in
+index 34ac674..84e2b84 100644
+--- a/modules/Makefile.in
++++ b/modules/Makefile.in
+@@ -89,7 +89,7 @@ DEST_HELPDIR	= $(DESTDIR)$(HELP_DIR)
+ # ---------------------------------------------------------------------------
+ RPATH = @RPATH@
+ 
+-LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) @M_LIB@
++LIBS = $(LDFLAGS) $(SLANG_LIB) $(DL_LIB) @M_LIB@
+ INCS = $(SLANG_SRCINC)
+ COMPILE_CMD = $(CC_SHARED) $(INCS)
+ # ---------------------------------------------------------------------------
+diff --git a/slsh/Makefile.in b/slsh/Makefile.in
+index addd343..8e4cc7b 100644
+--- a/slsh/Makefile.in
++++ b/slsh/Makefile.in
+@@ -77,7 +77,7 @@ SLSYSWRAP_LIB = @LIB_SLSYSWRAP@
+ #----------------------------------------------------------------------------
+ @SET_MAKE@
+ SHELL = /bin/sh
+-INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(LDFLAGS) $(READLINE_LIB) $(DYNAMIC_LIBS)
++INST_LIBS = $(DEST_LIB_DIR) $(SLANG_INST_LIB) -lslang $(LDFLAGS) $(READLINE_LIB) $(DYNAMIC_LIBS)
+ DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
+  -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
+  -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' $(SLSYSWRAP_DEF)
diff --git a/main/slang/skip-slsh-process-test.patch b/main/slang/skip-slsh-process-test.patch
new file mode 100644
index 00000000000..917bf67fdab
--- /dev/null
+++ b/main/slang/skip-slsh-process-test.patch
@@ -0,0 +1,15 @@
+Upstream: no
+Reason: this test fails only on builders with "wc: standard input: Bad file descriptor"
+diff --git a/slsh/lib/test/test_process.sl b/slsh/lib/test/test_process.sl
+index d72b232..54d0796 100644
+--- a/slsh/lib/test/test_process.sl
++++ b/slsh/lib/test/test_process.sl
+@@ -37,6 +37,8 @@ private define test_process ()
+ define slsh_main ()
+ {
+    start_test ("process");
++   () = fprintf(stdout, "Skipped\n");
++   return;
+    test_process ();
+    end_test ();
+ }
diff --git a/main/slang/terminfo-in-etc.patch b/main/slang/terminfo-in-etc.patch
new file mode 100644
index 00000000000..275c3f6f784
--- /dev/null
+++ b/main/slang/terminfo-in-etc.patch
@@ -0,0 +1,16 @@
+Upstream: no
+Reason: ncurses-terminfo-base puts terminfo in /etc, which is not inspected.
+When terminfo is not found, it tries link against termcap, which is also not
+present
+Url: n/a
+
+--- a/configure
++++ b/configure
+@@ -7021,6 +7021,7 @@
+    MISC_TERMINFO_DIRS=""
+ fi
+ JD_Terminfo_Dirs="$MISC_TERMINFO_DIRS \
++                  /etc/terminfo \
+                   /usr/lib/terminfo \
+                   /usr/share/terminfo \
+                   /usr/share/lib/terminfo \
diff --git a/main/slibtool/APKBUILD b/main/slibtool/APKBUILD
deleted file mode 100644
index 1a414512e87..00000000000
--- a/main/slibtool/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=slibtool
-pkgver=0.5.28
-pkgrel=0
-pkgdesc="Surrogate libtool implementation written in C"
-options="!check" # No testsuite
-url="https://git.midipix.org/cgit.cgi/slibtool"
-arch="all"
-license="MIT"
-source="https://midipix.org/dl/slibtool/$pkgname-$pkgver.tar.xz"
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--mandir=/usr/share/man
-	make
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="bfd9a39a60203606286af53ba9acc8d06490691cec7edae5ab6978b8547029412881b9895e8e0470c4f70bc9c349fdc6918200aaac810df99cf628e5848c6563  slibtool-0.5.28.tar.xz"
diff --git a/main/smartmontools/APKBUILD b/main/smartmontools/APKBUILD
index adccf2c1e5c..a4e26186b6f 100644
--- a/main/smartmontools/APKBUILD
+++ b/main/smartmontools/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=smartmontools
-pkgver=7.1
-pkgrel=2
+pkgver=7.4
+pkgrel=0
 pkgdesc="Control and monitor S.M.A.R.T. enabled hard drives"
 url="https://www.smartmontools.org/"
 arch="all"
@@ -12,6 +12,10 @@ source="https://downloads.sourceforge.net/sourceforge/smartmontools/smartmontool
 	smartd.initd
 	smartd.confd
 	"
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
 
 build() {
 	./configure \
@@ -33,6 +37,8 @@ package() {
 	install -Dm644 "$srcdir"/smartd.confd "$pkgdir"/etc/conf.d/smartd
 }
 
-sha512sums="440b2a957da10d240a8ef0008bd3358b83adb9eaca0f8d3e049b25d56a139c61dcd0bb4b27898faef6f189a27e159bdca3331e52e445c0eebf35e5d930f9e295  smartmontools-7.1.tar.gz
-a813a68102e76385c09353a5713e82d4b3205cc7bbd69574ade4729c5e68a00c6ada7414fba10e04ebcadad33900ef7886db62ea2bfb6f8bf53e2e5121a369a0  smartd.initd
-ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437  smartd.confd"
+sha512sums="
+439fbf8d0e77fbe1d5a9fb100e655a7e47a82382ce8e1a4e942541a4dfbdff3391caa635e8d354d0e87c10ae79cb97aa6d24915f9f193620d763b384baf2e753  smartmontools-7.4.tar.gz
+4a2cbdab37cf0d761924854be4a2f2deebed22ca8d8754dee9a5ec44229c608f5fffb19545d2b9c687ab010460acde51d4f5fccd74d6c80dab2b1a7401d59b9f  smartd.initd
+9088b97fbaac45e677e5ac14bc8a9edb4bd7a924717bb201db92f4a85447bb0e0254e716c8c8e60d4830b96e3221488fc80b30442b2e4a1b57741535aa2c3e7b  smartd.confd
+"
diff --git a/main/smartmontools/smartd.confd b/main/smartmontools/smartd.confd
index 4b7db4dfd82..7411cb051ed 100644
--- a/main/smartmontools/smartd.confd
+++ b/main/smartmontools/smartd.confd
@@ -1,4 +1,10 @@
-# /etc/conf.d/smartd: config file for /etc/init.d/smartd
+# Configuration file for /etc/init.d/smartd
 
-# Insert any other options needed
-SMARTD_OPTS=""
+# Path to the configuration file.
+#cfgfile=/etc/smartd.conf
+
+# Additional options to pass to smartd.
+#command_args=
+
+# Uncomment to use process supervisor.
+#supervisor=supervise-daemon
diff --git a/main/smartmontools/smartd.initd b/main/smartmontools/smartd.initd
index 8c35bf1e024..b117aa95688 100644
--- a/main/smartmontools/smartd.initd
+++ b/main/smartmontools/smartd.initd
@@ -1,23 +1,31 @@
 #!/sbin/openrc-run
-supervisor=supervise-daemon
 
 name=smartd
-description="Daemon to monitor the SMART system built into storage devices"
+description="Daemon to monitor the S.M.A.R.T. system built into storage devices"
 description_reload="Reload configuration without exiting"
+extra_started_commands="reload"
+
+: ${cfgfile:="/etc/smartd.conf"}
 
 command=/usr/sbin/smartd
-command_args="$SMARTD_OPTS"
-command_args_foreground="--no-fork"
+command_args="--configfile=$cfgfile --no-fork ${command_args:-$SMARTD_OPTS}"
+command_background="yes"
+pidfile="/run/$RC_SVCNAME.pid"
+
+required_files="$cfgfile"
 
 depend() {
     need localmount
     after bootmisc
 }
 
-extra_started_commands="reload"
-
 reload() {
-	ebegin "Reloading configuration"
-	$supervisor $RC_SVCNAME --signal HUP
+	ebegin "Reloading $name configuration"
+
+	if [ "$supervisor" ]; then
+		$supervisor "$RC_SVCNAME" --signal HUP
+	else
+		start-stop-daemon --signal HUP --pidfile "$pidfile"
+	fi
 	eend $?
 }
diff --git a/main/smokeping/APKBUILD b/main/smokeping/APKBUILD
index c8a9fe1451d..933d6117b01 100644
--- a/main/smokeping/APKBUILD
+++ b/main/smokeping/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Jeff Bilyk <jbilyk@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=smokeping
-pkgver=2.7.3
+pkgver=2.8.2
 pkgrel=3
 pkgdesc="Smokeping network latency monitoring"
 pkgusers="smokeping"
@@ -12,8 +12,13 @@ options="!check"  # No test suite
 source="https://oss.oetiker.ch/smokeping/pub/smokeping-$pkgver.tar.gz
 	smokeping.initd
 	musl-lc_numeric-utf8.patch
+	smokeping-config.patch
+	smokeping-silence.patch
+	smokeping-2.8.2-no-3rd-party.patch
+	smokeping-2.8.2-paths.patch
 	"
 depends="
+	font-dejavu
 	fping
 	perl
 	perl-cgi
@@ -40,28 +45,27 @@ depends="
 	rrdtool
 	"
 makedepends="
-	openssl-dev
+	autoconf
+	automake
+	openssl-dev>3
 	perl-dev
 	perl-try-tiny
 	zlib-dev
 	"
-arch="all"
-license="GPL"
-subpackages="$pkgname-doc"
-builddir="$srcdir/$pkgname-$pkgver"
+arch="noarch !riscv64"
+license="GPL-2.0-or-later"
+subpackages="$pkgname-doc $pkgname-openrc"
 
 _vendorlib=/usr/share/perl5/vendor_perl
 
 prepare() {
 	default_prepare
 
-	cd "$builddir"
 	# provided by perl-snmp-session
 	rm -r lib/BER.pm lib/SNMP_Session.pm lib/SNMP_util.pm
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -72,81 +76,55 @@ build() {
 		--libexecdir=/usr/libexec \
 		--datarootdir=/usr/share \
 		--mandir=/usr/share/man \
-		--with-htdocs-dir=/usr/share/webapps/smokeping \
-		|| return 1
+		--with-htdocs-dir=/usr/share/webapps/smokeping
+
+	make DESTDIR="$pkgdir"
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 
 	for i in basepage.html config smokemail smokeping_secrets tmail; do
-		mv "$pkgdir"/etc/smokeping/${i}.dist "$pkgdir"/etc/smokeping/${i}
+		mv "$pkgdir"/etc/smokeping/$i.dist "$pkgdir"/etc/smokeping/$i
 	done
 
 	# Next part here cleans up the mess that the Makefile leaves behind...
 
-	mkdir -p "$pkgdir"/$_vendorlib
-	mv "$pkgdir"/usr/lib/Smokeping.pm "$pkgdir"/$_vendorlib/
-	mv "$pkgdir"/usr/lib/Smokeping "$pkgdir"/$_vendorlib/
-
-	# Fix path to config file
-	sed -i -e 's#/usr/etc/config#/etc/smokeping/config#' "$pkgdir"/usr/share/webapps/smokeping/smokeping.fcgi.dist
-
 	# Install cgi in the right spot and fix permissions
-	mv "$pkgdir"/usr/share/webapps/smokeping/smokeping.fcgi.dist "$pkgdir"/usr/share/webapps/smokeping/smokeping.cgi
+	mv "$pkgdir"/usr/share/webapps/smokeping/smokeping.fcgi.dist \
+		"$pkgdir"/usr/share/webapps/smokeping/smokeping.cgi
 	chmod 755 "$pkgdir"/usr/share/webapps/smokeping/smokeping.cgi
 
-	# Fix up some paths within smokeping.cgi
-	sed -i -e 's:^use lib:#use lib:' \
-		-e 's:/etc/config:/etc/smokeping/config:' \
-		-e '1s:.*:#!/usr/bin/perl:' \
-		"$pkgdir"/usr/bin/smokeping_cgi || return 1
-
-	for i in smokeping smokeinfo; do
-		sed -e 's:^use lib:#use lib:g' \
-			-e 's:etc/config:etc/smokeping/config:' \
-			-i "$pkgdir"/usr/bin/$i
-	done
-
-	sed -e 's#Smokeping::main("$FindBin::Bin/../etc/config")#Smokeping::main("/etc/smokeping/config")#' \
-		-i "$pkgdir"/usr/bin/smokeping
+	# Fix path to config
+	sed -e 's:etc/config:etc/smokeping/config:' \
+		-i "$pkgdir"/usr/bin/smokeinfo
 
 	sed -e 's:etc/config.dist:etc/smokeping/config:' \
 		-i "$pkgdir"/usr/bin/tSmoke
 
-	# config
-	sed -e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \
-		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 img:}' \
-		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
-		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /var/run/smokeping:}' \
-		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
-		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
-		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
-		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \
-		-e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \
-		-e '/^sendmail/{s:usr/lib:usr/sbin:}' \
-		-i "$pkgdir"/etc/smokeping/config || return 1
-
 	# Create softlink for image directory
-	ln -s /var/lib/smokeping/.simg/ "$pkgdir"/usr/share/webapps/smokeping/img
+	ln -s /var/lib/smokeping/images/ "$pkgdir"/usr/share/webapps/smokeping/img
 
 	sed -e '/^<script/{s:cropper/:/cropper/:}' \
-		-i "$pkgdir"/etc/smokeping/basepage.html \
-		|| return 1
+		-i "$pkgdir"/etc/smokeping/basepage.html
 
 	chmod 700 "$pkgdir"/etc/smokeping/smokeping_secrets
 
 	# initscript
-	install -Dm755 "$srcdir"/smokeping.initd "$pkgdir"/etc/init.d/smokeping\
-		|| return 1
+	install -Dm755 "$srcdir"/smokeping.initd "$pkgdir"/etc/init.d/smokeping
 
 	install -d -o smokeping -g smokeping -m755 \
 		"$pkgdir"/var/lib/smokeping \
-		"$pkgdir"/var/lib/smokeping/.simg \
-		"$pkgdir"/var/run/smokeping
+		"$pkgdir"/var/lib/smokeping/images \
+		"$pkgdir"/run/smokeping
 }
 
-sha512sums="d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830  smokeping-2.7.3.tar.gz
-58189cb39bb085022b0c1197ccc59e06412d1cfb62bace79a168a8c63952c1ccc051cddb48c1d9260a2b1246306d90e5c08323e35c21de66fa663e3f98325e02  smokeping.initd
-e6bc389d8edbc000f5ad65848308197b3eb1ddb24bfa9df9c05fa027103952484383b7e021bea86795dceccdcf3f3d51a24c22cae3a68dc5afa30a72b2dbf803  musl-lc_numeric-utf8.patch"
+sha512sums="
+6145d2da9c479b379def750ef97167cf8a7cdc8a68337829b8aee5d4303099b0e88f29c485fa22ddf4ee17e44d66b769a1fae49a414068c647cbc27d4d741a1b  smokeping-2.8.2.tar.gz
+a1771417350b7e670877646752abdbaec901d6fb5ae360655dbdca2107b69ae48b1c218811fdaf0bc1ca57ea7c956993a8f095ef83e2f079ccb9d65511930caf  smokeping.initd
+e6bc389d8edbc000f5ad65848308197b3eb1ddb24bfa9df9c05fa027103952484383b7e021bea86795dceccdcf3f3d51a24c22cae3a68dc5afa30a72b2dbf803  musl-lc_numeric-utf8.patch
+fc54c97977b043174ca26a475154c9f819a2d4b257d02c92a8850651c943da041c2e10d337d96e154f3c320102671b688ab2d9cac11393e0510d3c2b1a48c401  smokeping-config.patch
+e8dcb91da86b8ff02a264ec3ef564a15492f6d96c2ca9d15fe15dd913c259801c88bdfb03151a557abeea2b775425da9ee23c3e20e478c426c086637ae706763  smokeping-silence.patch
+f35c1f793d5765c7060fffd069fb691213f26048308af9bbb908cd6328080f6b1d155bffe60ff0281eb094dbfc28534b37d2ed955f103c9bac91915207c14c58  smokeping-2.8.2-no-3rd-party.patch
+acfee65f8b0f66521089ffbd000bf34d7e2c8bf0a23d77b1167288f390e651602621179121573bd0a3dc1129fc9a4dd3aa7c1206500ed92c7825f6625960d60a  smokeping-2.8.2-paths.patch
+"
diff --git a/main/smokeping/smokeping-2.8.2-no-3rd-party.patch b/main/smokeping/smokeping-2.8.2-no-3rd-party.patch
new file mode 100644
index 00000000000..bd4734cb4e9
--- /dev/null
+++ b/main/smokeping/smokeping-2.8.2-no-3rd-party.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile.am b/Makefile.am
+index 1dc34c7..8c00ec5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,7 +16,7 @@
+ 
+ AUTOMAKE_OPTIONS =  foreign
+ 
+-SUBDIRS = lib thirdparty bin doc etc htdocs
++SUBDIRS = lib bin doc etc htdocs
+ 
+ EXTRA_DIST = COPYRIGHT CHANGES CONTRIBUTORS LICENSE cpanfile VERSION README.md
+ 
+diff --git a/configure.ac b/configure.ac
+index 33b75c5..4ce4a12 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -140,7 +140,7 @@ NOTES
+    exit 1
+ fi
+ 
+-AC_CONFIG_FILES([Makefile bin/Makefile doc/Makefile htdocs/Makefile etc/Makefile lib/Makefile thirdparty/Makefile etc/config.dist])
++AC_CONFIG_FILES([Makefile bin/Makefile doc/Makefile htdocs/Makefile etc/Makefile lib/Makefile etc/config.dist])
+ 
+ AC_SUBST(VERSION)
+ 
diff --git a/main/smokeping/smokeping-2.8.2-paths.patch b/main/smokeping/smokeping-2.8.2-paths.patch
new file mode 100644
index 00000000000..aef723204b7
--- /dev/null
+++ b/main/smokeping/smokeping-2.8.2-paths.patch
@@ -0,0 +1,107 @@
+diff --git a/bin/Makefile.am b/bin/Makefile.am
+index 2c6f3bc..68be89e 100644
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
+@@ -15,7 +15,8 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ 
+ 
+-dist_bin_SCRIPTS = smokeinfo smokeping smokeping_cgi tSmoke
++dist_bin_SCRIPTS = smokeinfo smokeping_cgi tSmoke
++dist_sbin_SCRIPTS = smokeping
+ 
+ install-exec-hook:
+ 	test "$(PERL5LIB)" = ""  || cd "$(DESTDIR)$(bindir)" && $(PERL) -i -p -e 's{.*# PERL5LIB}{use lib (split /:/, q{$(PERL5LIB)}); # PERL5LIB}'  $(dist_bin_SCRIPTS)
+diff --git a/bin/smokeinfo b/bin/smokeinfo
+index 2b38b86..ff96674 100755
+--- a/bin/smokeinfo
++++ b/bin/smokeinfo
+@@ -2,8 +2,7 @@
+ use strict;
+ use warnings;
+ 
+-use lib (split /:/, q{}); # PERL5LIB
+-use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
++use lib qw(/usr/share/smokeping);
+ 
+ use Smokeping::Info;
+ use Getopt::Long 2.25 qw(:config no_ignore_case);
+diff --git a/bin/smokeping b/bin/smokeping
+index 1dae42a..550beb5 100755
+--- a/bin/smokeping
++++ b/bin/smokeping
+@@ -4,13 +4,10 @@
+ use strict;
+ use warnings;
+ 
+-use FindBin;
+-use lib (split /:/, q{}); # PERL5LIB
+-use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
+-
++use lib qw(/usr/share/smokeping);
+ use Smokeping;
+  
+-Smokeping::main("$FindBin::RealBin/../etc/config");
++Smokeping::main("/etc/smokeping/config");
+ 
+ =head1 NAME
+ 
+diff --git a/bin/smokeping_cgi b/bin/smokeping_cgi
+index 610118c..9a995c1 100755
+--- a/bin/smokeping_cgi
++++ b/bin/smokeping_cgi
+@@ -4,9 +4,7 @@
+ use strict;
+ use warnings;
+ 
+-use FindBin;
+-use lib (split /:/, q{}); # PERL5LIB
+-use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
++use lib qw(/usr/share/smokeping);
+ 
+ # don't bother with zombies
+ $SIG{CHLD} = 'IGNORE';
+@@ -17,7 +15,7 @@ use Smokeping;
+ 
+ use CGI::Fast;
+ 
+-my $cfg = (shift @ARGV) || "$FindBin::Bin/../etc/config";
++my $cfg = (shift @ARGV) || "/etc/smokeping/config";
+ 
+ 
+ while (my $q = new CGI::Fast) {
+diff --git a/bin/tSmoke b/bin/tSmoke
+index 6b56479..db9ef92 100755
+--- a/bin/tSmoke
++++ b/bin/tSmoke
+@@ -52,9 +52,7 @@ use warnings;
+ #
+ # Point the lib variables to your implementation
+ 
+-use lib (split /:/, q{}); # PERL5LIB
+-use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
+-
++use lib qw(/usr/share/smokeping);
+ 
+ use Smokeping;
+ use Net::SMTP;
+@@ -63,7 +61,7 @@ use Pod::Usage;
+ use RRDs;
+ 
+ # Point to your Smokeping config file
+-my $cfgfile = (shift @ARGV) || "$FindBin::Bin/../etc/config";
++my $cfgfile = "etc/config.dist";
+ 
+ # global variables
+ my $cfg;
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 2209134..ab09330 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -31,5 +31,5 @@ MATCH := $(wildcard Smokeping/matchers/*.pm)
+ 
+ EXTRA_DIST = $(PM) $(SP) $(SORT) $(PROBE) $(MATCH)
+ 
+-perllibdir = $(prefix)/lib
++perllibdir = $(prefix)/share/smokeping
+ nobase_perllib_DATA = $(EXTRA_DIST)
diff --git a/main/smokeping/smokeping-config.patch b/main/smokeping/smokeping-config.patch
new file mode 100644
index 00000000000..febaa842c40
--- /dev/null
+++ b/main/smokeping/smokeping-config.patch
@@ -0,0 +1,135 @@
+diff --git a/etc/config.dist.in b/etc/config.dist.in
+index 8b9fdf3..b6f6180 100644
+--- a/etc/config.dist.in
++++ b/etc/config.dist.in
+@@ -1,19 +1,19 @@
+ *** General ***
+ 
+-owner    = Peter Random
+-contact  = some@address.nowhere
++owner    = Super User
++contact  = root@localhost
+ mailhost = my.mail.host
+-sendmail = @SENDMAIL@
++sendmail = /usr/sbin/sendmail
+ # NOTE: do not put the Image Cache below cgi-bin
+ # since all files under cgi-bin will be executed ... this is not
+ # good for images.
+-imgcache = @prefix@/cache
+-imgurl   = cache
+-datadir  = @prefix@/data
+-piddir  = @prefix@/var
+-cgiurl   = http://some.url/smokeping.cgi
+-smokemail = @prefix@/etc/smokemail.dist
+-tmail = @prefix@/etc/tmail.dist
++imgcache = /var/lib/smokeping/images
++imgurl   = /smokeping/images
++datadir  = /var/lib/smokeping
++piddir   = /run/smokeping
++cgiurl   = http://localhost/smokeping/sm.cgi
++smokemail = /etc/smokeping/smokemail
++tmail     = /etc/smokeping/tmail
+ # specify this to get syslog logging
+ syslogfacility = local0
+ # each probe is now run in its own process
+@@ -21,8 +21,8 @@ syslogfacility = local0
+ # concurrentprobes = no
+ 
+ *** Alerts ***
+-to = alertee@address.somewhere
+-from = smokealert@company.xy
++to = root@localhost
++from = root@localhost
+ 
+ +someloss
+ type = loss
+@@ -47,7 +47,7 @@ AVERAGE  0.5 144   720
+ 
+ *** Presentation ***
+ 
+-template = @prefix@/etc/basepage.html.dist
++template = /etc/smokeping/basepage.html
+ htmltitle = yes
+ graphborders = no
+ 
+@@ -110,7 +110,7 @@ unison_tolerance = 2
+ binary = /usr/sbin/fping
+ 
+ *** Slaves ***
+-secrets=@prefix@/etc/smokeping_secrets.dist
++secrets=/etc/smokeping/smokeping_secrets
+ +boomer
+ display_name=boomer
+ color=0000ff
+@@ -121,28 +121,57 @@ color=00ff00
+ 
+ *** Targets ***
+ 
++#menuextra = <a target='_blank' href='/smokeping/tr.html{HOST}' class='{CLASS}' \
++#               onclick="window.open(this.href,this.target, \
++#               'width=800,height=500,toolbar=no,location=no,status=no,scrollbars=no'); \
++#                return false;">*</a>
++#
+ probe = FPing
+ 
+ menu = Top
+ title = Network Latency Grapher
+-remark = Welcome to the SmokePing website of xxx Company. \
++remark = Welcome to the SmokePing website of <b>Insert Company Name Here</b>. \
+          Here you will learn all about the latency of our network.
+ 
+-+ Test
+-menu= Targets
+-#parents = owner:/Test/James location:/
+++ Ping
+ 
+-++ James
++menu = Alpine
++title = Alpine Pings
+ 
+-menu = James
+-title =James
+-alerts = someloss
+-slaves = boomer slave2
+-host = james.address
++++ AlpinelinuxOrg
+ 
+-++ MultiHost
++menu = alpinelinux.org
++title = Alpine Linux Webserver
++host = alpinelinux.org
+ 
+-menu = Multihost
+-title = James and James as seen from Boomer
+-host = /Test/James /Test/James~boomer
++++ DocsAlpinelinuxOrg
++
++menu = docs.alpinelinux.org
++title = Alpine Linux Docs Webserver
++host = docs.alpinelinux.org
++
++++ PkgsAlpinelinuxOrg
++
++menu = pkgs.alpinelinux.org
++title = Alpine Linux Packages
++host = pkgs.alpinelinux.org
++
++#
++# Lots of more options are available, please have a look in the included documentation.
++#
++
++
++#++ James
++
++#menu = James
++#title =James
++#alerts = someloss
++#slaves = boomer slave2
++#host = james.address
++
++#++ MultiHost
++
++#menu = Multihost
++#title = James and James as seen from Boomer
++#host = /Test/James /Test/James~boomer
+ 
diff --git a/main/smokeping/smokeping-silence.patch b/main/smokeping/smokeping-silence.patch
new file mode 100644
index 00000000000..f515635846f
--- /dev/null
+++ b/main/smokeping/smokeping-silence.patch
@@ -0,0 +1,22 @@
+diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
+index 7b512e1..fe7d9dc 100644
+--- a/lib/Smokeping.pm
++++ b/lib/Smokeping.pm
+@@ -3658,7 +3658,7 @@ sub daemonize_me ($) {
+     }
+     print "Warning: no logging method specified. Messages will be lost.\n"
+         unless $logging;
+-    print "Daemonizing $0 ...\n";
++    #print "Daemonizing $0 ...\n";
+     defined (my $pid = fork) or die "Can't fork: $!";
+     if ($pid) {
+         exit;
+@@ -3718,7 +3718,7 @@ sub daemonize_me ($) {
+                 die "missing facility?" unless defined $fac;
+                 $syslog_facility = $fac if defined $fac;
+                 $syslog_priority = $pri if defined $pri;
+-                print "Note: logging to syslog as $syslog_facility/$syslog_priority.\n";
++                #print "Note: logging to syslog as $syslog_facility/$syslog_priority.\n";
+                 openlog(basename($0), 'pid', $syslog_facility);
+                 eval {
+                         syslog($syslog_priority, 'Starting syslog logging');
diff --git a/main/smokeping/smokeping.initd b/main/smokeping/smokeping.initd
index a497c7d132a..97001fa223b 100644
--- a/main/smokeping/smokeping.initd
+++ b/main/smokeping/smokeping.initd
@@ -20,13 +20,13 @@ checkconfig() {
 
 start() {
 	checkconfig || return 1
-	checkpath --directory --owner smokeping:smokeping /var/run/smokeping
+	checkpath --directory --owner smokeping:smokeping /run/smokeping
 
 	ebegin "Starting smokeping"
 	LC_ALL=C \
 	start-stop-daemon --start --name smokeping \
-		--pidfile /var/run/smokeping/smokeping.pid \
-		--exec /usr/bin/smokeping \
+		--pidfile /run/smokeping/smokeping.pid \
+		--exec /usr/sbin/smokeping \
 		--user smokeping:smokeping \
 		-- --config=/etc/smokeping/config
 	eend $?
@@ -35,7 +35,7 @@ start() {
 stop() {
 	ebegin "Stopping smokeping"
 	start-stop-daemon --stop \
-		--pidfile /var/run/smokeping/smokeping.pid
+		--pidfile /run/smokeping/smokeping.pid
 	eend $?
 }
 
diff --git a/main/snappy/APKBUILD b/main/snappy/APKBUILD
index 40cd04dba7f..4483d164fff 100644
--- a/main/snappy/APKBUILD
+++ b/main/snappy/APKBUILD
@@ -1,41 +1,53 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=snappy
-pkgver=1.1.8
+pkgver=1.1.10
 pkgrel=2
+_googletest_commit=18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6
 pkgdesc="Fast compression and decompression library"
-url="https://google.github.io/snappy/"
+url="https://github.com/google/snappy"
 arch="all"
 license="BSD-3-Clause"
-makedepends="cmake"
+makedepends="cmake samurai"
 subpackages="$pkgname-dbg $pkgname-static $pkgname-dev $pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/google/snappy/archive/$pkgver.tar.gz
-	optimize-mips-s390x.patch
+	googletest-$_googletest_commit.tar.gz::https://github.com/google/googletest/archive/$_googletest_commit.tar.gz
 	cmakelists.patch
+	no-include-gtest.patch
+	rtti.patch
 	"
 
+prepare() {
+	rmdir third_party/googletest
+	ln -s "$srcdir"/googletest-$_googletest_commit third_party/googletest
+	default_prepare
+}
+
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
-	cmake \
+	CFLAGS="$CFLAGS -O2 -flto=auto -ffat-lto-objects -DNDEBUG" \
+	CXXFLAGS="$CXXFLAGS -O2 -flto=auto -ffat-lto-objects -DNDEBUG" \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=None \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
 		-DBUILD_SHARED_LIBS=ON \
 		-DBUILD_STATIC_LIBS=ON \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS} .
-	cmake --build .
+		-DSNAPPY_BUILD_BENCHMARKS=OFF \
+		-DSNAPPY_BUILD_TESTS=ON \
+		$CMAKE_CROSSOPTS
+	cmake --build build
 }
 
 check() {
-	ctest --verbose
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 
 	local file; for file in AUTHORS CONTRIBUTING.md COPYING NEWS README.md \
 		format_description.txt framing_format.txt; do
@@ -43,6 +55,10 @@ package() {
 	done
 }
 
-sha512sums="efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c  snappy-1.1.8.tar.gz
-a14b0159631beac628cf99cf9ad970631dfdbf607ca2c3911a64124d1133694689dc76a70f25d4f780ce7093584249905aec2926ef7a3d9350952f7648938392  optimize-mips-s390x.patch
-6a379a1bd026282d98d5f2ffd316e126d5383b7c32852f81102c7a2aa0754e0c5567f82766dbd72b62552ef8a9569795c5f667387d3f1b2c9ef2bfffc578de18  cmakelists.patch"
+sha512sums="
+3578597f1d4ec09104ce0296b825b013590351230dfe56c635081fd282ce7a13a34caf2c283ac77bd24065e2d27af6db068d1f84b98cec2fd39a0e37a0d77070  snappy-1.1.10.tar.gz
+f77c747218dc5ae4858b2b4c58a401eb895493adf470a331d6bac32cd20542533ff3a77081db653bbc18b9f55f6864be04e1739ef4afaed7db39d7c698abf880  googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6.tar.gz
+8a891edf2f0b267b05c67d54945f11d723b058ddab5ac3f27b4f00678759d4a52b617d0c5724c7170a285eb068ffa4ffbbc5a9efa250964979b3969fc8730eb3  cmakelists.patch
+1e9ad24b9ab0adf82922cd7042cad7dd1709c147812b775870a8ef67f47ddc81ee3fe697a04a4cc54f78d17e74c45d2770976be10468a7df32e5205f50ca8e93  no-include-gtest.patch
+ec6a83d5e58deffd23f4b47e899b6645145548a823c2e1542812f05848a844839580a1b27aefa9beadba6b43f472abc38c42ea379db91da938837f4e69ae9cc0  rtti.patch
+"
diff --git a/main/snappy/cmakelists.patch b/main/snappy/cmakelists.patch
index 40704452b37..9c168534dd5 100644
--- a/main/snappy/cmakelists.patch
+++ b/main/snappy/cmakelists.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -41,6 +41,8 @@
+@@ -86,6 +86,8 @@
  # it prominent in the GUI.
  option(BUILD_SHARED_LIBS "Build shared libraries(DLLs)." OFF)
  
@@ -8,8 +8,8 @@
 +
  option(SNAPPY_BUILD_TESTS "Build Snappy's own tests." ON)
  
- option(SNAPPY_FUZZING_BUILD "Build Snappy for fuzzing." OFF)
-@@ -51,6 +53,10 @@
+ option(SNAPPY_BUILD_BENCHMARKS "Build Snappy's benchmarks" ON)
+@@ -98,6 +100,10 @@
  
  option(SNAPPY_INSTALL "Install Snappy's header and library" ON)
  
@@ -20,7 +20,7 @@
  include(TestBigEndian)
  test_big_endian(SNAPPY_IS_BIG_ENDIAN)
  
-@@ -166,19 +172,28 @@
+@@ -213,19 +219,28 @@
    "snappy-stubs-public.h.in"
    "${PROJECT_BINARY_DIR}/snappy-stubs-public.h")
  
@@ -54,7 +54,7 @@
      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/snappy-c.h>
      $<INSTALL_INTERFACE:include/snappy-c.h>
      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/snappy-sinksource.h>
-@@ -186,18 +201,32 @@
+@@ -233,18 +248,32 @@
      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/snappy.h>
      $<INSTALL_INTERFACE:include/snappy.h>
      $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/snappy-stubs-public.h>
diff --git a/main/snappy/no-include-gtest.patch b/main/snappy/no-include-gtest.patch
new file mode 100644
index 00000000000..84bfb877d01
--- /dev/null
+++ b/main/snappy/no-include-gtest.patch
@@ -0,0 +1,14 @@
+skips installing gtest
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c3062e2..75f1265 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -313,7 +313,7 @@ if(SNAPPY_BUILD_TESTS)
+   set(build_gmock ON)
+ 
+   # This project is tested using GoogleTest.
+-  add_subdirectory("third_party/googletest")
++  add_subdirectory("third_party/googletest" EXCLUDE_FROM_ALL)
+ 
+   # GoogleTest triggers a missing field initializers warning.
+   if(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)
diff --git a/main/snappy/optimize-mips-s390x.patch b/main/snappy/optimize-mips-s390x.patch
deleted file mode 100644
index 07c95096aeb..00000000000
--- a/main/snappy/optimize-mips-s390x.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/snappy-stubs-internal.h b/snappy-stubs-internal.h
-index f834bdb..22407ef 100644
---- a/snappy-stubs-internal.h
-+++ b/snappy-stubs-internal.h
-@@ -123,7 +123,7 @@ static const int64 kint64max = static_cast<int64>(0x7FFFFFFFFFFFFFFFLL);
- // x86, PowerPC, and ARM64 can simply do these loads and stores native.
- 
- #if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__s390x__)
- 
- #define UNALIGNED_LOAD16(_p) (*reinterpret_cast<const uint16 *>(_p))
- #define UNALIGNED_LOAD32(_p) (*reinterpret_cast<const uint32 *>(_p))
-@@ -150,6 +150,8 @@ static const int64 kint64max = static_cast<int64>(0x7FFFFFFFFFFFFFFFLL);
- // (it ignores __attribute__((packed)) on individual variables). However,
- // we can tell it that a _struct_ is unaligned, which has the same effect,
- // so we do that.
-+//
-+// On pre-R6 MIPS just let the compiler use LWL/LWR, SWL/SWR etc.
- 
- #elif defined(__arm__) && \
-       !defined(__ARM_ARCH_4__) && \
-@@ -163,7 +165,8 @@ static const int64 kint64max = static_cast<int64>(0x7FFFFFFFFFFFFFFFLL);
-       !defined(__ARM_ARCH_6K__) && \
-       !defined(__ARM_ARCH_6Z__) && \
-       !defined(__ARM_ARCH_6ZK__) && \
--      !defined(__ARM_ARCH_6T2__)
-+      !defined(__ARM_ARCH_6T2__) || \
-+      (defined(__mips__) && (!defined(__mips_isa_rev) || __mips_isa_rev < 6))
- 
- #if __GNUC__
- #define ATTRIBUTE_PACKED __attribute__((__packed__))
-@@ -184,6 +187,11 @@ struct Unaligned32Struct {
-   uint8 dummy;  // To make the size non-power-of-two.
- } ATTRIBUTE_PACKED;
- 
-+struct Unaligned64Struct {
-+  uint64 value;
-+  uint8 dummy;  // To make the size non-power-of-two.
-+} ATTRIBUTE_PACKED;
-+
- }  // namespace internal
- }  // namespace base
- 
-@@ -203,6 +211,7 @@ struct Unaligned32Struct {
- // See if that would be more efficient on platforms supporting it,
- // at least for copies.
- 
-+#ifndef __mips__
- inline uint64 UNALIGNED_LOAD64(const void *p) {
-   uint64 t;
-   memcpy(&t, p, sizeof t);
-@@ -212,6 +221,13 @@ inline uint64 UNALIGNED_LOAD64(const void *p) {
- inline void UNALIGNED_STORE64(void *p, uint64 v) {
-   memcpy(p, &v, sizeof v);
- }
-+#else
-+#define UNALIGNED_LOAD64(_p) \
-+    ((reinterpret_cast<const ::snappy::base::internal::Unaligned64Struct *>(_p))->value)
-+#define UNALIGNED_STORE64(_p, _val) \
-+    ((reinterpret_cast< ::snappy::base::internal::Unaligned64Struct *>(_p))->value = \
-+         (_val))
-+#endif
- 
- #else
- 
-@@ -274,6 +290,13 @@ inline void UNALIGNED_STORE64(void *p, uint64 v) {
- #define bswap_32(x) OSSwapInt32(x)
- #define bswap_64(x) OSSwapInt64(x)
- 
-+#elif defined(__GNUC__)
-+/* musl provides suboptimal (generic) bswap_xx implementations in <byteswap.h> */
-+
-+#define bswap_16	__builtin_bswap16
-+#define bswap_32	__builtin_bswap32
-+#define bswap_64	__builtin_bswap64
-+
- #elif defined(HAVE_BYTESWAP_H)
- #include <byteswap.h>
- 
diff --git a/main/snappy/rtti.patch b/main/snappy/rtti.patch
new file mode 100644
index 00000000000..80f89ffd781
--- /dev/null
+++ b/main/snappy/rtti.patch
@@ -0,0 +1,56 @@
+From f73b11e87dfbe1cb4862b8ee489679d99534f40b Mon Sep 17 00:00:00 2001
+From: Tim Serong <tserong@suse.com>
+Date: Wed, 27 Oct 2021 18:49:04 +1100
+Subject: [PATCH] Re-enable RTTI (needed in order to subclass Source, etc.)
+
+Commit c98344f in snappy 1.1.9 disabled RTTI, which means the
+snappy library no longer exports typeinfo for snappy::Source,
+snappy::Sink, ..., so users of the library can't subclass these
+classes anymore.
+
+Here's a trivial reproducer:
+
+  #include <snappy-sinksource.h>
+  class MySource : snappy::Source {
+  public:
+    size_t Available() const override { return 0; }
+    const char *Peek(size_t *len) override { return NULL; }
+    void Skip(size_t n) override {}
+  };
+  int main(int argc, char **argv) {
+    MySource m;
+    return 0;
+  }
+
+Try `g++ -o snappy-test ./snappy-test.cc -lsnappy` with the above
+and the linker will fail with "undefined reference to `typeinfo
+for snappy::Source'" if RTTI was disabled in the snappy build.
+---
+ CMakeLists.txt | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6eef485..755605d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,10 +51,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+   string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHs-c-")
+   add_definitions(-D_HAS_EXCEPTIONS=0)
+-
+-  # Disable RTTI.
+-  string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
+ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+   # Use -Wall for clang and gcc.
+   if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
+@@ -77,9 +73,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+   string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
+ 
+-  # Disable RTTI.
+-  string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
+ endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+ 
+ # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make
diff --git a/main/sngtc_client/APKBUILD b/main/sngtc_client/APKBUILD
index 75cb3fbfaf0..53dcdd4a6de 100644
--- a/main/sngtc_client/APKBUILD
+++ b/main/sngtc_client/APKBUILD
@@ -1,27 +1,29 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sngtc_client
-pkgver=1.3.9
-pkgrel=0
+pkgver=1.3.11
+pkgrel=4
 pkgdesc="Sangoma Media Transcode client and lib"
-url="https://wiki.sangoma.com/Transcoding-distributed-install"
+url="https://wiki.freepbx.org/display/MTC/Media+Transcoding"
 arch="all"
-license="LGPL"
+license="custom AND GPL-2.0-or-later AND BSD-3-Clause"
 options="!check" #no test suite
 makedepends="ortp-dev linux-headers bctoolbox-dev"
 subpackages="$pkgname-dev"
 depends_dev="$pkgname=$pkgver-r$pkgrel"
 # they ship firmware updater and server lib as precompiled closed source
 # thats why the source package holds <arch>. The client code appears to
-# be equal on both i686 an x86_64 so we just pick i686 package for all
+# be equal on both i686 an x86_64 so we just pick x86_64 package for all
 # our archs.
-source="ftp://ftp.sangoma.com/linux/transcoding/sng-tc-linux-$pkgver.i686.tgz
+source="https://ftp.sangoma.com/linux/transcoding/sng-tc-linux-$pkgver.x86_64.tgz
 	sngtc_client-dynamic-ortp.patch
 	musl-fix-types.patch
-	ortp.patch"
-builddir="$srcdir"/sng-tc-linux-$pkgver.i686
+	int-conversion.patch
+	ortp.patch
+	bctoolbox-underlinking.patch"
+builddir="$srcdir"/sng-tc-linux-$pkgver.x86_64
 
-prepare() {	
+prepare() {
 	default_prepare
 	# use dynamic ortp from system
 	rm -r client/sngtc_client/*ortp*
@@ -41,7 +43,11 @@ package() {
 	cp server/libsngtc/*.h "$pkgdir"/usr/include/sng_tc/
 }
 
-sha512sums="c0449499418260a2bc2aafe7ae864ec72865a38e5af621a438265c32ae348f6c954f5029b0f56abecfc31a1a1022f7a3fb8b301589f98f681009db56d43d1afc  sng-tc-linux-1.3.9.i686.tgz
+sha512sums="
+6bf871f7f0e9c70f1c7adae6f80756de335e3b1fd9afaa451c9adbc6896941157c17cf5e79ed8e753190057ac2d5ea03a0d40d587f13ec19c49d4d83f7baca90  sng-tc-linux-1.3.11.x86_64.tgz
 2b784c56d1482ad9069502c408138d0c0b0ea6b393902d45b09200a3a588e02138c21a1fbee4d5715711e578130c30c607cae59f7ee24b8ce5bccd5a9c2fce14  sngtc_client-dynamic-ortp.patch
 008447bf7c8f690cc9ee5efd232dee1b4f3f35e94827a518f88a7c46b4741b6d1e8418c32f099c807e61d7ae815467aed3a3b0134114e75574397ae324540067  musl-fix-types.patch
-5d1dcf45834e192f9c14681aa9e7f5fc58ae08b283f25f0565ac6522f8af06bf71585e3dd7c92ae727c86fa7bfbe7a27bd7bfcafe4913ab005d857a1fef34a56  ortp.patch"
+f590257aeaadc000bee7892b0d7ce2c5296ecdd84022b6d33fb50262b2de04bdf8bc89b155c6cf844c404fa885e3340fd3e6306f88d391ccec728e1faf06b1e1  int-conversion.patch
+5d1dcf45834e192f9c14681aa9e7f5fc58ae08b283f25f0565ac6522f8af06bf71585e3dd7c92ae727c86fa7bfbe7a27bd7bfcafe4913ab005d857a1fef34a56  ortp.patch
+be6cc8a349b2dede19223cef2d888fc6ab183d832d75d77dfbd8b029b31814f9391d9b6af08d81e9765231faef0cdc9a3c50e7f847401d6ccc740f2cedd2f39c  bctoolbox-underlinking.patch
+"
diff --git a/main/sngtc_client/bctoolbox-underlinking.patch b/main/sngtc_client/bctoolbox-underlinking.patch
new file mode 100644
index 00000000000..6b28a99a581
--- /dev/null
+++ b/main/sngtc_client/bctoolbox-underlinking.patch
@@ -0,0 +1,18 @@
+Upstream: no
+Reason: Fix underlinking due to bctoolbox symbol usage.
+
+diff -urN sng-tc-linux-1.3.9.i686.orig/client/sngtc_client/Makefile sng-tc-linux-1.3.9.i686/client/sngtc_client/Makefile
+--- sng-tc-linux-1.3.9.i686.orig/client/sngtc_client/Makefile	2020-04-30 13:17:32.005717991 -0600
++++ sng-tc-linux-1.3.9.i686/client/sngtc_client/Makefile	2020-04-30 13:17:53.909139976 -0600
+@@ -7,9 +7,9 @@
+ NO_NODE = 0
+ 
+ ifeq ($(NO_NODE),0)          
+-LIBS = -lsngtc_node -lrt -lortp -lpthread
++LIBS = -lsngtc_node -lrt -lortp -lpthread -lbctoolbox
+ else
+-LIBS = -lsng-tc -lrt -lortp -lpthread
++LIBS = -lsng-tc -lrt -lortp -lpthread -lbctoolbox
+ CFLAGS += -DSNGTC_LIB_BIND
+ endif
+ 
diff --git a/main/sngtc_client/int-conversion.patch b/main/sngtc_client/int-conversion.patch
new file mode 100644
index 00000000000..0c5cc120c21
--- /dev/null
+++ b/main/sngtc_client/int-conversion.patch
@@ -0,0 +1,13 @@
+diff --git a/client/sngtc_client/sngtc_client.c b/client/sngtc_client/sngtc_client.c
+index b01c106..25e85af 100644
+--- a/client/sngtc_client/sngtc_client.c
++++ b/client/sngtc_client/sngtc_client.c
+@@ -1134,7 +1134,7 @@ static void *run_transcoding_session(void *arg)
+ 	/* go! */
+ 	globals.sessions_streaming++;
+ 
+-	thread_id = syscall(SYS_gettid);
++	thread_id = (pthread_t)syscall(SYS_gettid);
+ 	pthread_setspecific(globals.thread_id_key, (void *)(long)thread_id);
+ 	local_sngtc_logger(SNGTC_LOGLEVEL_DEBUG, "Running session %d in thread %d\n", sessindex, thread_id);
+ 
diff --git a/main/snmptt/APKBUILD b/main/snmptt/APKBUILD
index 5b9eeb924e6..56935f4e225 100644
--- a/main/snmptt/APKBUILD
+++ b/main/snmptt/APKBUILD
@@ -1,30 +1,31 @@
 # Contributor: Jeff Bilyk <jbilyk at gmail>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=snmptt
-pkgver=1.4
+pkgver=1.5
 pkgrel=0
 pkgdesc="Translates traps received from snmptrapd into easy to understand messages"
-url="http://www.snmptt.org"
+url="http://www.snmptt.org/"
 arch="noarch"
 license="GPL-2.0-or-later"
 pkgusers="snmptt"
 pkggroups="snmptt"
 depends="perl perl-config-inifiles perl-list-moreutils"
 install="$pkgname.pre-install"
+options="!check"
 subpackages="$pkgname-openrc"
-source="https://downloads.sourceforge.net/$pkgname/${pkgname}_$pkgver.tgz
+source="https://downloads.sourceforge.net/snmptt/snmptt_$pkgver.tgz
 	snmptt.initd
 	snmptt.confd
 	"
+builddir="$srcdir/snmptt_$pkgver"
 
-build() {
-	return 0
-}
+# secfixes:
+#   1.4.2-r0:
+#     - CVE-2020-24361
 
 package() {
-	cd "$srcdir"/snmptt_${pkgver}
 	for dir in /var/log/snmptt /var/spool/snmptt; do
-		mkdir -p "$pkgdir"${dir} && chown snmptt "$pkgdir"${dir}
+		mkdir -p "$pkgdir"$dir && chown snmptt "$pkgdir"$dir
 	done
 	install -D -m755 snmptt "$pkgdir"/usr/bin/snmptt
 	install -D -m755 snmptthandler "$pkgdir"/usr/bin/snmptthandler
@@ -32,10 +33,12 @@ package() {
 	install -D -m755 snmpttconvertmib "$pkgdir"/usr/bin/snmpttconvertmib
 	install -D -m644 snmptt.ini "$pkgdir"/etc/snmptt/snmptt.ini
 	install -D -m644 snmptt.logrotate "$pkgdir"/etc/logrotate.d/snmptt
-	install -D -m755 ../snmptt.initd "$pkgdir"/etc/init.d/snmptt
-	install -D -m644 ../snmptt.confd "$pkgdir"/etc/conf.d/snmptt
+	install -D -m755 "$srcdir"/snmptt.initd "$pkgdir"/etc/init.d/snmptt
+	install -D -m644 "$srcdir"/snmptt.confd "$pkgdir"/etc/conf.d/snmptt
 }
 
-sha512sums="200ebe565766c15f85b9b9cbc178baeef740663efc951af4c790c4b28d27398c14a95c4b38306ec3503cefe9b86634d5f24ec5f2482694f07789e9025ea39a80  snmptt_1.4.tgz
+sha512sums="
+e6ec9cbe864bd4f897e71410562e303393674051f9cd2f27d8a9c0dad1c3449ebbe9ff676c2c784a40e25937ca25b76a0deba11b3187243e238014f70a74463e  snmptt_1.5.tgz
 233e781150fdb217991e0d9eae4de1430e01f54c9ae7354a6ebef6676595c5497863a4ab2a829e67473c7a901c120b2dbb7aa51e67fd49fd7643ff9efca633f8  snmptt.initd
-905f9c10b6daa43b112166c90d569c0737d569117c320a4a652ca22533195b559fe62628bf67bfc4df107db6af88a44ac4ffc58514c8dcc5bb45981240b90776  snmptt.confd"
+905f9c10b6daa43b112166c90d569c0737d569117c320a4a652ca22533195b559fe62628bf67bfc4df107db6af88a44ac4ffc58514c8dcc5bb45981240b90776  snmptt.confd
+"
diff --git a/main/snort-extra/APKBUILD b/main/snort-extra/APKBUILD
new file mode 100644
index 00000000000..fd162357b7d
--- /dev/null
+++ b/main/snort-extra/APKBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Steve McMaster <code@mcmaster.io>
+pkgname=snort-extra
+pkgver=3.1.82.0
+pkgrel=0
+pkgdesc="External plugins for snort"
+url="https://github.com/snort3/snort3_extra"
+# snort
+arch="all !ppc64le !riscv64 !loongarch64"
+license="GPL-2.0-only"
+makedepends="
+	daq-dev
+	cmake
+	samurai
+	snort-dev
+	"
+source="https://www.snort.org/downloads/snortplus/snort3_extra-$pkgver.tar.gz"
+builddir="$srcdir/snort3_extra-$pkgver"
+options="!check" # doesn't have any tests
+
+build() {
+	CXXFLAGS="$CXXFLAGS -flto=auto" \
+	cmake -B build -G Ninja -Wno-dev \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	cmake --build build
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+ebd2e96f4aa0c2d373879a53a8f61935033581f527a8a336c3dc165ce9341645ac335462e6b4f5b43c84158e135f9330f6e81ebad629ff1da67157fe73bd4113  snort3_extra-3.1.82.0.tar.gz
+"
diff --git a/main/snort/APKBUILD b/main/snort/APKBUILD
index 683c93cb3b0..2b6cdb69e2f 100644
--- a/main/snort/APKBUILD
+++ b/main/snort/APKBUILD
@@ -1,78 +1,86 @@
+# Contributor: Steve McMaster <code@mcmaster.io>
 # Contributor: Karim Kanso <kaz.kanso@gmail.com>
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=snort
-pkgver=2.9.14.1
+# pair with snort-extra
+pkgver=3.1.82.0
 pkgrel=0
-pkgdesc="An open source network intrusion prevention and detection system"
+pkgdesc="Open source network intrusion prevention and detection system"
 url="https://www.snort.org/"
-arch="all"
+# luajit
+arch="all !ppc64le !riscv64 !loongarch64"
 license="GPL-2.0-only"
-makedepends="pcre-dev libpcap-dev libnet-dev libdnet-dev daq-dev daq-static
-	bison flex zlib-dev libtirpc-dev xz-dev
-	libnfnetlink-dev libnetfilter_queue-dev"
+depends="bash"
+makedepends="
+	bison
+	cmake
+	daq-dev
+	daq-static
+	flex-dev
+	hwloc-dev
+	libdnet-dev
+	libmnl-dev
+	libnet-dev
+	libnetfilter_queue-dev
+	libnfnetlink-dev
+	libpcap-dev
+	libtirpc-dev
+	luajit-dev
+	openssl-dev
+	pcre-dev
+	samurai
+	xz-dev
+	zlib-dev
+	"
 install="$pkgname.pre-install"
+pkgusers="snort"
+pkggroups="snort"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-openrc"
-source="https://www.snort.org/downloads/archive/snort/snort-$pkgver.tar.gz
+source="https://www.snort.org/downloads/snortplus/snort3-$pkgver.tar.gz
+	gcc13.patch
+	no-libunwind.patch
+	logrotate
 	snort.initd
 	snort.confd
 	"
-pkgusers="snort"
-pkggroups="snort"
+builddir="$srcdir/snort3-$pkgver"
+options="!check" # needs cpputest from community
 
-prepare() {
-	default_prepare
-	# fix parallel builds
-	# sed -i -e 's/^all-local:.*/all-local: $(LTLIBRARIES)/' \
-	#	src/dynamic-preprocessors/*/Makefile.am
-	#	src/dynamic-preprocessors/*/Makefile.am
-	# correct paths in default config file
-	sed -i -e 's|/usr/local|/usr|' etc/snort.conf
-	sed -i -e 's|\.\./|/var/lib/snort/|' etc/snort.conf
-}
+# secfixes:
+#   2.9.18-r0:
+#     - CVE-2021-40114
 
 build() {
-	export CFLAGS="$CFLAGS $(pkgconf --cflags libtirpc)"
-	export LDFLAGS="$LDFLAGS $(pkgconf --libs libtirpc)"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--enable-ipv6 \
-		--enable-gre \
-		--enable-non-ether-decoders \
-		--disable-open-appid
-	make
+	CXXFLAGS="$CXXFLAGS -flto=auto" \
+	cmake -B build -G Ninja -Wno-dev \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc \
+		-DENABLE_UNIT_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DENABLE_BENCHMARK_TESTS=OFF
+	cmake --build build
 }
 
 check() {
-	./src/snort --version > /dev/null
+	ctest --test-dir build --output-on-failure
 }
 
 package() {
-	make -j1 DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 
-	install -D -m 755 ../snort.initd "$pkgdir"/etc/init.d/snort
-	install -D -m 644 ../snort.confd "$pkgdir"/etc/conf.d/snort
-	install -D -m 644 etc/snort.conf "$pkgdir"/etc/snort/snort.conf
-	install -D -m 644 etc/gen-msg.map "$pkgdir"/etc/snort/gen-msg.map
-	install -D -m 644 rpm/snort.logrotate "$pkgdir"/etc/logrotate.d/snort
-	mkdir -p "$pkgdir"/usr/lib/snort_dynamicrules
-	mkdir -p "$pkgdir"/var/lib/snort/rules
-	mkdir -m 770 -p "$pkgdir"/var/log/snort && chown snort.snort "$pkgdir"/var/log/snort
-	for file in classification.config reference.config threshold.conf \
-		unicode.map sid-msg.map
-	do
-		ln -s /var/lib/snort/etc/$file "$pkgdir"/etc/snort/$file
-	done
-	touch "$pkgdir"/var/lib/snort/rules/white_list.rules
-	touch "$pkgdir"/var/lib/snort/rules/black_list.rules
+	install -Dm 755 "$srcdir"/snort.initd "$pkgdir"/etc/init.d/snort
+	install -Dm 644 "$srcdir"/snort.confd "$pkgdir"/etc/conf.d/snort
+	install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/snort
+	install -d -o snort -g snort -m 770 "$pkgdir"/var/log/snort "$pkgdir"/var/lib/snort
 }
 
-sha512sums="e6ba293437cc1555a746106c664f00f7170af8cbb7df4e5eb23679a03048b2e80dc7407474dead40fb0fb125cddffe5bafba4b9afe3a02d6bb834ef9b657f822  snort-2.9.14.1.tar.gz
-c71d11f4cde4aba432641d3915faec8070e9fea5b33c71f6b2872b2208871180b3c7dbbadd2ddaebe5f3280adf7c5c9daf1585afd331fe552486a675ff676e52  snort.initd
-b21491ba5798a5ce3a03a61ada391a667f1684aaf86e7536abb9dd975f6acefe75688c60b8ce28cbfb0c4e66ec19078e468792289d26f1f2e2d401609fd22771  snort.confd"
+sha512sums="
+b7ed9e67946d857a9545e3a4616de11668d4f9f64d1d3b58d9c7218b105f8b7d6b2ce195239a1506d5a86fe80faa097860e35216d686bd3e5e495dd659d0324e  snort3-3.1.82.0.tar.gz
+741c1d30a19f18ec33c9f10a696e510d5edc35969e12121920c2a05e6de18d3d74bda42ef7e9d01f60124c08b1e8f3f47e06b6baaa52f4fb7f6834a0d1ad77e6  gcc13.patch
+9fdf8bdf17fa84326fc1f04ee3bf0d14ce4df60c62f7ed3e6303644ae674316f6d6e4c5318791a01921a9bb64dd0de2304688eb98243e0f313ed3f2d93e1d33e  no-libunwind.patch
+2d845baa9cd02237a6e60dc280ede896bf1facf7906d7d08e8dfa99d596a9fbe3de4227e6bedbd95375598b6940b9d874ccdd12d3f2c1ede282bac3a8e26b47e  logrotate
+769840c6e8a7e353a2b2866b7b161195ce780fb3d5dda747325a95fcaf964c9aad29c5aba8c8ea48aa26ef810d81e82c1321104dd3e7374319e8176635e9b7d8  snort.initd
+8a1139cdd07a03a96c7f5f75164bf95cae4dbc24f637d8b4008b0cf41e4a7f97148621fe4a1c867e956e16dbe226eaf2284a50b73547d1afaacbd32ca9befae5  snort.confd
+"
diff --git a/main/snort/gcc13.patch b/main/snort/gcc13.patch
new file mode 100644
index 00000000000..7bb01acc0a2
--- /dev/null
+++ b/main/snort/gcc13.patch
@@ -0,0 +1,12 @@
+diff --git a/src/network_inspectors/packet_capture/packet_capture.h b/src/network_inspectors/packet_capture/packet_capture.h
+index 3417f91..78aab9c 100644
+--- a/src/network_inspectors/packet_capture/packet_capture.h
++++ b/src/network_inspectors/packet_capture/packet_capture.h
+@@ -20,6 +20,7 @@
+ #ifndef PACKET_CAPTURE_H
+ #define PACKET_CAPTURE_H
+ 
++#include <cstdint>
+ #include <string>
+ 
+ void packet_capture_enable(const std::string&, const int16_t g = -1);
diff --git a/main/snort/logrotate b/main/snort/logrotate
new file mode 100644
index 00000000000..166debb0356
--- /dev/null
+++ b/main/snort/logrotate
@@ -0,0 +1,10 @@
+/var/log/snort/alert /var/log/snort/*log /var/log/snort/*/alert /var/log/snort/*/*log  {
+	daily
+	rotate 7
+	missingok
+	compress
+	sharedscripts
+	postrotate
+		/etc/init.d/snortd restart 1>/dev/null || true
+	endscript
+}                                                                                       
diff --git a/main/snort/no-libunwind.patch b/main/snort/no-libunwind.patch
new file mode 100644
index 00000000000..95b38e825b6
--- /dev/null
+++ b/main/snort/no-libunwind.patch
@@ -0,0 +1,25 @@
+we never want libunwind for runtime backtrace on SIG*, so explicitly disable it
+--
+diff --git a/cmake/include_libraries.cmake b/cmake/include_libraries.cmake
+index 1a0b197..090af47 100644
+--- a/cmake/include_libraries.cmake
++++ b/cmake/include_libraries.cmake
+@@ -26,5 +26,4 @@ if (ENABLE_SAFEC)
+ endif (ENABLE_SAFEC)
+ find_package(ICONV QUIET)
+ find_package(UUID QUIET)
+-find_package(Libunwind)
+ find_package(NUMA QUIET)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 4cf2456..5153f35 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -43,7 +43,7 @@ if ( HAVE_ICONV )
+     LIST(APPEND EXTERNAL_INCLUDES ${ICONV_INCLUDE_DIR})
+ endif ()
+ 
+-if ( HAVE_LIBUNWIND )
++if ( false )
+     LIST(APPEND EXTERNAL_LIBRARIES ${LIBUNWIND_LIBRARIES})
+     LIST(APPEND EXTERNAL_INCLUDES ${LIBUNWIND_INCLUDE_DIRS})
+ endif ()
diff --git a/main/snort/snort.confd b/main/snort/snort.confd
index 83bc5eadb34..6a03b3bdf68 100644
--- a/main/snort/snort.confd
+++ b/main/snort/snort.confd
@@ -10,7 +10,7 @@ PIDFILE=/var/lib/snort/snort_$IFACE.pid
 LOGDIR="/var/log/snort"
 
 # Probably not this either
-CONF=/etc/snort/snort.conf
+CONF=/etc/snort/snort.lua
 
 # Allow log files to be read by members of snort group (default is 077).
 UMASK=037
diff --git a/main/snort/snort.initd b/main/snort/snort.initd
index 84e26741677..0000cc40776 100644
--- a/main/snort/snort.initd
+++ b/main/snort/snort.initd
@@ -1,38 +1,15 @@
 #!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-analyzer/snort/files/snort.rc7,v 1.3 2007/04/22 06:21:15 dragonheart Exp $
 
+command="/usr/bin/snort"
+command_args="$SNORT_OPTS"
 extra_commands="reload"
+required_files="$CONF"
 
 depend() {
 	need net
 	after firewall
 }
 
-checkconfig() {
-	if [ ! -e $CONF ] ; then
-		eerror "You need a configuration file to run snort"
-		eerror "There is an example config in /etc/snort/snort.conf.distrib"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting snort"
-	start-stop-daemon --start --quiet --exec /usr/bin/snort \
-		--pidfile ${PIDFILE} \
-		-- ${SNORT_OPTS} >/dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping snort"
-	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
-	eend $?
-}
-
 reload() {
 	ebegin "Reloading snort rules"
 	start-stop-daemon --stop --quiet --signal HUP --pidfile ${PIDFILE}
diff --git a/main/snowball/APKBUILD b/main/snowball/APKBUILD
new file mode 100644
index 00000000000..d977b639d2a
--- /dev/null
+++ b/main/snowball/APKBUILD
@@ -0,0 +1,47 @@
+# Contributor: Duncan Bellamy <dunk@denkimushi.com>
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
+pkgname=snowball
+pkgver=2.2.0
+pkgrel=0
+pkgdesc="Snowball rule-based stemming algorithms"
+url="https://snowballstem.org/"
+arch="all"
+license="BSD-3-Clause"
+makedepends="perl"
+subpackages="$pkgname-doc libstemmer:_libstemmer libstemmer-dev:_libstemmerdev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/snowballstem/snowball/archive/refs/tags/v$pkgver.tar.gz
+	libstemmer-library.patch"
+
+build() {
+	make
+}
+
+check() {
+	#check_utf8 check_iso_8859_1 check_iso_8859_2 check_koi8r
+	#all have missing sub-targets
+	make check_stemtest
+}
+
+package() {
+	install -d "$pkgdir"/usr/bin "$pkgdir"/usr/lib "$pkgdir"/usr/include
+	install snowball stemwords "$pkgdir"/usr/bin
+	install libstemmer.a "$pkgdir"/usr/lib
+	install include/libstemmer.h "$pkgdir"/usr/include
+	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+_libstemmer() {
+	install -d "$subpkgdir"/usr/lib
+	install "$builddir"/libstemmer.so.* "$subpkgdir"/usr/lib
+}
+
+_libstemmerdev() {
+	pkgdesc="Header files and development libraries for libstemmer"
+	default_dev
+	mv "$builddir"/libstemmer.so $subpkgdir/usr/lib
+}
+sha512sums="
+02c43313de9de2518ea51cfb11f1c29145fc046c7838329bfdefd70b604009ad44b6db8175c25b0db31f03db30a6aec5857aa35775a9c204ec976df9cae62957  snowball-2.2.0.tar.gz
+6e8976313c91b71a13e50c213b74cc037ff794bf38451e1a053813c00b963527c6ff1f7baece1645f15a38bce893c4484247f71a945275276cb7aa16a1414817  libstemmer-library.patch
+"
diff --git a/main/snowball/libstemmer-library.patch b/main/snowball/libstemmer-library.patch
new file mode 100644
index 00000000000..a71142535c9
--- /dev/null
+++ b/main/snowball/libstemmer-library.patch
@@ -0,0 +1,47 @@
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -8,6 +8,8 @@
+ EXEEXT = .exe
+ endif
+ 
++MAJOR_VERSION := $(shell echo $(SNOWBALL_VERSION) | cut -d. -f1)
++
+ c_src_dir = src_c
+ 
+ JAVAC ?= javac
+@@ -170,12 +172,12 @@
+ JAVA_CLASSES = $(JAVA_SOURCES:.java=.class)
+ JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class)
+ 
+-CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
++CFLAGS=-fPIC -O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
+ CPPFLAGS=
+ 
+ INCLUDES=-Iinclude
+ 
+-all: snowball$(EXEEXT) libstemmer.a stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball$(EXEEXT) libstemmer.a libstemmer.so stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ algorithms.mk: libstemmer/mkalgorithms.pl libstemmer/modules.txt
+ 	libstemmer/mkalgorithms.pl algorithms.mk libstemmer/modules.txt
+@@ -224,6 +226,11 @@
+ 
+ libstemmer.a: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
+ 	$(AR) -cru $@ $^
++
++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.$(MAJOR_VERSION),-version-script,libstemmer/symbol.map -o $@.$(SNOWBALL_VERSION) $^
++	ln -s $@.$(SNOWBALL_VERSION) $@.$(MAJOR_VERSION)
++	ln -s $@.$(SNOWBALL_VERSION) $@
+ 
+ examples/%.o: examples/%.c
+ 	$(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $<
+--- /dev/null
++++ b/libstemmer/symbol.map
+@@ -0,0 +1,6 @@
++SB_STEMMER_0 {
++    global:
++        sb_stemmer_*;
++    local:
++        *;
++};
diff --git a/main/snownews/APKBUILD b/main/snownews/APKBUILD
deleted file mode 100644
index 885b336619e..00000000000
--- a/main/snownews/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
-# Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
-pkgname=snownews
-pkgver=1.5.12
-pkgrel=8
-pkgdesc="Snownews is a text mode RSS/RDF newsreader"
-url="https://kiza.eu/software/snownews/"
-arch=""
-license="GPL"
-depends="ncurses"
-depends_dev="libintl openssl-dev perl ncurses-dev libxml2-dev readline-dev gettext-dev"
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-lang $pkgname-doc"
-source="https://kiza.eu/media/software/snownews/${pkgname}-${pkgver}.tar.gz
-	configure.patch
-	openssl-1.1.patch
-	"
-
-builddir="$srcdir/$pkgname-$pkgver"
-
-build() {
-	cd "$builddir"
-        ./configure --prefix=/usr
-        make
-}
-
-package() {
-	cd "$builddir"
-        make DESTDIR="$pkgdir" install
-}
-
-sha512sums="7a7ccd5ea57f8bbb73f1429ab931a38203e858c74a383c5347e66088b84f6a7240feeee99e179687ce0a7a89c6c1406ce20d6c5d6771d25a0a0301fa5526e220  snownews-1.5.12.tar.gz
-d7ed00a401c1963a5619b0b221ae354e5a8a8423f75313e906f43b5a64c099fac8239d7eb1a34d47c284e96b9ad2965f1ecdad58fb28101f7397143847a5e230  configure.patch
-4e5e2b6d2859ed68ced43df31463c1d6a4d817c4cafcf3889cdaed6b744f2d3d061a53395b6e3c72889afefa71371d8e26e777110d6fe9ea3875e1a5e2af4c77  openssl-1.1.patch"
diff --git a/main/snownews/configure.patch b/main/snownews/configure.patch
deleted file mode 100644
index 8f2699bbc9f..00000000000
--- a/main/snownews/configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- snownews-1.5.12/configure
-+++ snownews-1.5.12/configure.patched
-@@ -13,7 +13,7 @@
-
- my $prefix = "/usr/local";
- my $cflags = "-Wall -Wno-format-y2k -O2 -DLOCALEPATH=\"\\\"\$(LOCALEPATH)\\\"\" -DOS=\\\"$os\\\" $xmlcflags \$(EXTRA_CFLAGS) ";
--my $ldflags = "-lncurses -lcrypto $xmlldflags \$(EXTRA_LDFLAGS) ";
-+my $ldflags = "-lintl -lncursesw -lcrypto $xmlldflags \$(EXTRA_LDFLAGS) ";
-
- my $use_nls = 1;
- parse_cmdl_line();
diff --git a/main/snownews/openssl-1.1.patch b/main/snownews/openssl-1.1.patch
deleted file mode 100644
index c0fb5e86cec..00000000000
--- a/main/snownews/openssl-1.1.patch
+++ /dev/null
@@ -1,1674 +0,0 @@
-From cff110ac98012042c58694169d5722eb55f60635 Mon Sep 17 00:00:00 2001
-From: Mike Sharov <msharov@users.sourceforge.net>
-Date: Wed, 25 Apr 2018 11:17:06 -0400
-Subject: [PATCH] Make it compile cleanly 	Fix openssl MD5 hash
- calculations; context struct is private 		and must be created
- with helper functions. 	Add -Wextra to compile flags and fix all
- warnings.
-
----
- about.c          | 125 +++++++++++++-------------
- configure        |   2 +-
- conversions.c    | 222 ++++++++++++++++++++++-------------------------
- conversions.h    |   4 +-
- digcalc.c        | 189 ++++++++++++++--------------------------
- digcalc.h        |  39 +++------
- interface.c      |   2 +-
- main.c           |  10 +--
- netio.c          |   2 +-
- os-support.c     |  26 ++----
- os-support.h     |   6 +-
- ui-support.c     |   2 +-
- updatecheck.c    |   2 -
- xmlparse.c       |   8 +-
- zlib_interface.c |  41 ++++-----
- zlib_interface.h |   2 -
- 16 files changed, 284 insertions(+), 398 deletions(-)
-
-diff --git a/about.c b/about.c
-index 2bff040..753e7db 100644
---- a/about.c
-+++ b/about.c
-@@ -117,15 +117,15 @@ void Snowfall (int christmastree) {
- 	int wind = 1;			/* 1: wind active, 0: inactive 
- 							   set to 1 here so the first loop run clears it. */
- 	int newflake = 0;		/* Time until a new flake appears. */
--	
-+
- 	/* Set ncurses halfdelay mode. */
- 	halfdelay (3);
--	
-+
- 	/* White snowflakes! */
- 	/* Doesn't work on white terminal background... obviously.
- 	attron (COLOR_PAIR(16));
- 	attron (WA_BOLD); */
--	
-+
- 	while (1) {
- 		/* Set up the storm. */
- 		if (windtimer == 0) {
-@@ -161,7 +161,7 @@ void Snowfall (int christmastree) {
- 			new->oldchar = new->oldchar2 = ' ';
- 			new->vspeed = 1+(float)rand() / (float)RAND_MAX * 2;
- 			new->hspeed = (1+(float)rand() / (float)RAND_MAX * 7)-4;
--			
-+
- 			/* Add our new snowflake to the pointer chain. */
- 			new->next = NULL;
- 			if (first == NULL) {
-@@ -173,7 +173,7 @@ void Snowfall (int christmastree) {
- 					new->prev = new->prev->next;
- 				new->prev->next = new;
- 			}
--			
-+
- 			/* Set new counter until next snowflake. */
- 			newflake = 1+(float)rand() / (float)RAND_MAX * 2;
- 			/*
-@@ -181,7 +181,7 @@ void Snowfall (int christmastree) {
- 			mvprintw (1,1,"New flake in %d rounds.", newflake);
- 			*/
- 		}
--		
-+
- 		for (cur = first; cur != NULL; cur = curnext) {
- 			curnext = cur->next;
- 			/* Draw every snowflake at its coordinates to the screen. */
-@@ -204,7 +204,7 @@ void Snowfall (int christmastree) {
- 					if ((cur->oldx < 14) && (cur->oldx > 9) && (cur->oldy < 24) && (cur->oldy > 20)) {
- 						attroff (COLOR_PAIR(12));
- 					}
--					
-+
- 					if (christmastree)
- 						ChristmasTree();
- 				}
-@@ -214,7 +214,7 @@ void Snowfall (int christmastree) {
- 			}
- 			/* Set new hspeed for flake */
- 			cur->hspeed = (1+(float)rand() / (float)RAND_MAX * 7)-4;
--			
-+
- 			/* Advance every flake downwards by a random amount and to
- 			   the left or right.
- 			   Check if the next position would obscure a character on the screen
-@@ -223,7 +223,7 @@ void Snowfall (int christmastree) {
- 			if (wind)
- 				cur->hspeed += windspeed;
- 			cur->x += cur->hspeed;
--			
-+
- 			if (cur->y > LINES) {
- 				if (cur == first) {
- 					first = first->next;
-@@ -237,7 +237,7 @@ void Snowfall (int christmastree) {
- 				free (cur);
- 				continue;
- 			}
--			
-+
- 			/* Only draw if we're still inside the window. */
- 			if (cur->y <= LINES) {
- 				/*
-@@ -254,12 +254,12 @@ void Snowfall (int christmastree) {
- 					cur->oldchar = ' ';
- 			}
- 		}
--	
-+
- 		windtimer--;
- 		newflake--;
--		
-+
- 		refresh();
--		
-+
- 		/* Leave loop if anykey(tm) was pressed. */
- 		if (getch() != ERR)
- 			break;
-@@ -319,7 +319,7 @@ void xmasAbout (void) {
- 	mvaddstr (19, 29, "Fernando J. Pereda, Marco Cova");
- 	mvaddstr (20, 29, "Cheng-Lung Sung, Dmitry Petukhov");
- 	mvaddstr (21, 29, "Douglas Campos");
--	
-+
- 	Snowfall(1);
- }
- 
-@@ -331,7 +331,7 @@ void SHDrawGun (int gun_pos) {
- 	clrtoeol();
- 	move (LINES-2, 0);
- 	clrtoeol();
--	
-+
- 	attron (WA_BOLD);
- 	mvaddstr (LINES-3, gun_pos-3, "___/\\___");
- 	mvaddstr (LINES-2, gun_pos-3, "|######|");
-@@ -350,27 +350,27 @@ void SHDrawScore (int score, int level) {
- 	int i, len;
- 	char scorestr[16];
- 	char levelstr[16];
--	
-+
- 	attron (WA_REVERSE);
- 	for (i = 0; i < COLS; i++) {
- 		mvaddch (0, i, ' ');
- 	}
- 	mvaddstr (0, 1, "Santa Hunta!");
--	
-+
- 	snprintf (scorestr, sizeof(scorestr), _("Score: %d"), score);
- 	len = strlen (scorestr);
- 	mvaddstr (0, COLS-1-len, scorestr);
--	
-+
- 	snprintf (levelstr, sizeof(levelstr), _("Level: %d"), level);
- 	len = strlen (levelstr);
- 	mvaddstr (0, COLS/2-len/2, levelstr);
--	
-+
- 	attroff (WA_REVERSE);
- }
- 
- void SHClearScreen (void) {
- 	int i;
--	
-+
- 	for (i = 0; i < LINES; i++) {
- 		move (i, 0);
- 		clrtoeol();
-@@ -386,9 +386,9 @@ void SHDrawProjectile (shot shot) {
- void SHDrawSanta (santa santa) {
- 	int len;
- 	char *draw_string;
--	
-+
- 	len = COLS - santa.x;
--	
-+
- 	if (santa.anim == 0) {
- 		if (santa.x < 0) {
- 			draw_string = santa.gfx+abs(santa.x);
-@@ -412,7 +412,7 @@ void SHDrawSanta (santa santa) {
- 		} else
- 			mvaddnstr (santa.y+1, santa.x, santa.altgfx_line2, len);
- 	}
--	
-+
- 	attron (COLOR_PAIR(10));
- 	mvaddch (santa.y, santa.x + santa.length - 1, '*');
- 	attroff (COLOR_PAIR(10));
-@@ -445,9 +445,9 @@ int SHAddScore (santa santa) {
- 
- void SHDrawHitScore (scoreDisplay score) {
- 	int rand_color;
--	
-+
- 	rand_color = 10 + ((float)rand() / (float)RAND_MAX * 6);
--	
-+
- 	attron (WA_BOLD);
- 	attron (COLOR_PAIR(rand_color));
- 	mvprintw (score.y, score.x, "%d", score.score);
-@@ -472,15 +472,15 @@ void printFinalScore (int score) {
- 	int y;
- 	int divisor;
- 	int digit;
--	
-+
- 	if (score == 0)
- 		number_count = 1;
- 	else
- 		number_count = log10(score) + 1;
--	
--	
-+
-+
- 	pos = COLS/2 - ((number_count * 8) / 2);
--	
-+
- 	for (i = 0; i < number_count; i++) {
- 		y = 12;
- 		divisor = pow (10, number_count-1-i);
-@@ -491,30 +491,30 @@ void printFinalScore (int score) {
- 			mvaddstr (y, pos + (i * 8), numbers[digit][j]);
- 			y++;
- 		}
--	}	
-+	}
- 	refresh();
- }
- 
- void SHFinalScore (int score) {
- 	int rand_color;
- 
--	attron (WA_BOLD);	
-+	attron (WA_BOLD);
- 	mvaddstr (9, COLS/2-6, "Final score:");
- 	refresh();
- 	sleep(1);
--	
--	
-+
-+
- 	for (;;) {
- 		if (getch() == 'q')
- 			break;
--		
-+
- 		rand_color = 10 + ((float)rand() / (float)RAND_MAX * 6);
- 		attron (WA_BOLD);
- 		attron (COLOR_PAIR(rand_color));
- 		printFinalScore(score);
- 		attroff (COLOR_PAIR(rand_color));
- 		attroff (WA_BOLD);
--		
-+
- 		move (LINES-1, COLS-1);
- 		refresh();
- 	}
-@@ -530,7 +530,6 @@ void santaHunta (void) {
- 	int level = 1;
- 	struct timeval before;
- 	struct timeval after;
--	struct timeval delay;
- 	int draw_loop = 0;
- 	long draw_delay = 0;
- 	shot shot;
-@@ -538,31 +537,27 @@ void santaHunta (void) {
- 	int targets = 0;
- 	int hitcount = 0;
- 	scoreDisplay scoreDisplay;
--	
-+
- 	shot.fired = 0;
- 	shot.x = 0;
- 	shot.y = 0;
--	
-+
- 	scoreDisplay.rounds = 0;
--	
-+
- 	/* Set ncurses halfdelay mode.
- 	 * Max resolution is 1/10sec */
- 	halfdelay (1);
--	
--	for (;;) {	
-+
-+	for (;;) {
- 		gettimeofday (&before, NULL);
- 		input = getch();
- 		gettimeofday (&after, NULL);
- 
- 		if (after.tv_sec > before.tv_sec)
- 			after.tv_usec += 1000000;
--		
--		delay.tv_sec = 0;
--		delay.tv_usec = abs(100000 - (after.tv_usec - before.tv_usec));
- 
- 		if (!targets) {
- 			newSanta(&santa, level);
--			
- 			targets = 1;
- 		}
- 
-@@ -576,41 +571,41 @@ void santaHunta (void) {
- 
- 			if (targets)
- 				SHDrawSanta(santa);
--			
-+
- 			if (santa.anim == 0)
- 				santa.anim = 1;
- 			else
- 				santa.anim = 0;
--				
-+
- 			if (santa.x >= COLS)
- 				targets = 0;
--			
-+
- 			if (shot.fired)
- 				SHDrawProjectile(shot);
--				
-+
- 			if (scoreDisplay.rounds > 0)
- 				SHDrawHitScore(scoreDisplay);
--			
-+
- 			if (SHHit(shot, santa)) {
- 				targets = 0;
- 				hitcount++;
- 				last_score = SHAddScore(santa);
- 				score += last_score;
--				
-+
- 				scoreDisplay.x = shot.x;
- 				scoreDisplay.y = shot.y;
- 				scoreDisplay.score = last_score;
- 				scoreDisplay.rounds = 20;
- 			}
--			
-+
- 			santa.x += santa.speed;
--			
-+
- 			scoreDisplay.rounds--;
--			
-+
- 			shot.y--;
- 			if (shot.y == 0)
- 				shot.fired = 0;
--			
-+
- 			if (hitcount == 10) {
- 				hitcount = 0;
- 				level++;
-@@ -618,7 +613,7 @@ void santaHunta (void) {
- 		}
- 
- 		count++;
--		
-+
- 		if ((input == KEY_RIGHT) || (input == keybindings.next)) {
- 			if (gun_pos < COLS-5)
- 				gun_pos++;
-@@ -632,7 +627,7 @@ void santaHunta (void) {
- 				mvaddstr (LINES-4, gun_pos-2, "\\***/");
- 				attroff (COLOR_PAIR(12));
- 				attroff (WA_BOLD);
--				
-+
- 				shot.x = gun_pos;
- 				shot.y = LINES-4;
- 				shot.fired = 1;
-@@ -641,33 +636,33 @@ void santaHunta (void) {
- 			SHFinalScore(score);
- 			break;
- 		}
--			
-+
- 		SHDrawGun(gun_pos);
- 		SHDrawScore(score, level);
- 		SHDrawStatus();
--		
-+
- 		refresh();
- 	}
--	
-+
- 	/* Leave halfdelay mode. */
- 	cbreak();
- }
- 
- void UIAbout (void) {
- 	int xpos;
--	
-+
- 	clear();				/* Get the crap off the screen to make room
- 							   for our wonderful ASCII logo. :) */
- 
- 	xpos = COLS/2 - 40;
--	
-+
- 	if (COLS < 80) {
- 		mvprintw (0, 0, _("Need at least 80 COLS terminal, sorry!"));
- 		refresh();
- 		getch();
- 		return;
- 	}
--	
-+
- 	if (easterEgg()) {
- 		santaHunta();
- 	} else {
-@@ -679,7 +674,7 @@ void UIAbout (void) {
- 		mvaddstr (6, xpos, "/______  / / ___|___/ \\____/  /__|__/  / ___|___/ \\____ \\   /__|__/  /______  /");
- 		mvaddstr (7, xpos, "       \\/  \\/                          \\/              \\/                   \\/");
- 		mvprintw (9, COLS/2-(strlen("Version")+strlen(VERSION)+1)/2, "Version %s", VERSION);
--		
-+
- 		mvaddstr (11, COLS/2-(strlen(_("Brought to you by:")))/2, _("Brought to you by:"));
- 		mvaddstr (13, COLS/2-(strlen(_("Main code")))/2, _("Main code"));
- 		mvaddstr (14, COLS/2-6, "Oliver Feiler");
-@@ -690,7 +685,7 @@ void UIAbout (void) {
- 		mvaddstr (21, COLS/2-32, "Fernando J. Pereda, Marco Cova, Cheng-Lung Sung, Dmitry Petukhov");
- 		mvaddstr (22, COLS/2-26, "Douglas Campos, Ray Iwata, Piotr Ozarowski, Yang Huan");
- 		mvaddstr (23, COLS/2-15, "Ihar Hrachyshka, Mats Berglund");
--		
-+
- 		refresh();
- 		getch();
- 	}
-diff --git a/conversions.c b/conversions.c
-index a6155a1..b17348a 100644
---- a/conversions.c
-+++ b/conversions.c
-@@ -1,6 +1,6 @@
- /* Snownews - A lightweight console RSS newsreader
-  * $Id: conversions.c 1173 2006-10-14 21:41:42Z kiza $
-- * 
-+ *
-  * Copyright 2003-2009 Oliver Feiler <kiza@kcore.de> and
-  *                     Rene Puls <rpuls@gmx.net>
-  *
-@@ -20,8 +20,9 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  *
-  */
-- 
--#include <sys/types.h> 
-+
-+#define _GNU_SOURCE
-+#include <sys/types.h>
- #include <string.h>
- #include <iconv.h>
- #include <stdio.h>
-@@ -29,22 +30,12 @@
- #include <string.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <time.h>
- #include <libxml/HTMLparser.h>
- #include <langinfo.h>
- #include <openssl/evp.h>
--
-+#include <openssl/md5.h>
- #include "os-support.h"
--
--/* I have no idea what needs to be defined to get strptime() on glibc.
-- * This is stolen from somewhere else and it works for me(tm).
-- * If you know how it's supposed to work, tell me. Manpage says
-- * define _XOPEN_SOURCE for glibc2, but that doesn't work. */
--#define _XOPEN_SOURCE 500		/* Needed for glibc2 strptime(). What's the 500 for? */
--#define __USE_XOPEN
--#include <time.h>
--#undef __USE_XOPEN
--#undef _XOPEN_SOURCE
--
- #include "conversions.h"
- #include "config.h"
- #include "interface.h"
-@@ -57,7 +48,7 @@ extern struct entity *first_entity;
- 
- extern char *forced_target_charset;
- 
--int calcAgeInDays (struct tm * t);
-+static int calcAgeInDays (const struct tm* t);
- 
- #ifdef STATIC_CONST_ICONV
- char * iconvert (const char * inbuf) {
-@@ -72,11 +63,11 @@ char * iconvert (char * inbuf) {
- 
- 	/*(void)strlcpy(target_charset, nl_langinfo(CODESET), sizeof(target_charset));*/
- 	strncpy(target_charset, nl_langinfo(CODESET), sizeof(target_charset));
--		
-+
- 	/* Take a shortcut. */
- 	if (strcasecmp (target_charset, "UTF-8") == 0)
- 		return strdup(inbuf);
--	
-+
- 	inbytesleft = strlen(inbuf);
- 	outbytesleft = strlen(inbuf);
- 
-@@ -92,20 +83,20 @@ char * iconvert (char * inbuf) {
- 	if (cd == (iconv_t) -1) {
- 		return NULL;
- 	}
--	
-+
- 	outbuf = malloc (outbytesleft+1);
- 	outbuf_first = outbuf;
- 
--	if (iconv (cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft) == -1) {
-+	if (iconv (cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft) == (size_t)-1) {
- 		free(outbuf_first);
- 		iconv_close(cd);
- 		return NULL;
- 	}
- 
- 	*outbuf = 0;
--	
-+
- 	iconv_close (cd);
--	
-+
- 	return outbuf_first;
- }
- 
-@@ -135,18 +126,18 @@ char * UIDejunk (char * feed_description) {
- 	unsigned long ch;			/* Decoded numeric entity */
- #endif
- 	const htmlEntityDesc *ep;	/* For looking up HTML entities */
--	
-+
- 	/* Gracefully handle passed NULL ptr. */
- 	if (feed_description == NULL) {
- 		newtext = strdup("(null)");
- 		return newtext;
- 	}
--	
-+
- 	/* Make a copy and point *start to it so we can free the stuff again! */
- 	text = strdup (feed_description);
- 	start = text;
--	
--	
-+
-+
- 	/* If text begins with a tag, discard all of them. */
- 	while (1) {
- 		if (text[0] == '<') {
-@@ -162,14 +153,14 @@ char * UIDejunk (char * feed_description) {
- 	}
- 	newtext = malloc (1);
- 	newtext[0] = '\0';
--	
-+
- 	while (1) {
- 		/* Strip tags... tagsoup mode. */
- 		/* strsep puts everything before "<" into detagged. */
- 		detagged = strsep (&text, "<");
- 		if (detagged == NULL)
- 			break;
--		
-+
- 		/* Replace <p> and <br> (in all incarnations) with newlines, but only
- 		   if there isn't already a following newline. */
- 		if (text != NULL) {
-@@ -188,12 +179,12 @@ char * UIDejunk (char * feed_description) {
- 
- 		/* Now append detagged to newtext. */
- 		strcat (newtext, detagged);
--		
-+
- 		/* Advance *text to next position after the closed tag. */
- 		htmltag = strsep (&text, ">");
- 		if (htmltag == NULL)
- 			break;
--		
-+
- 		if (s_strcasestr(htmltag, "img src") != NULL) {
- /*			attribute = s_strcasestr(htmltag, "alt=");
- 			if (attribute == NULL)
-@@ -216,25 +207,25 @@ char * UIDejunk (char * feed_description) {
- 		}*/
- 	}
- 	free (start);
--	
-+
- 	CleanupString (newtext, 0);
--	
-+
- 	/* See if there are any entities in the string at all. */
- 	if (strchr(newtext, '&') != NULL) {
- 		text = strdup (newtext);
- 		start = text;
- 		free (newtext);
--	
-+
- 		newtext = malloc (1);
- 		newtext[0] = '\0';
--		
-+
- 		while (1) {
- 			/* Strip HTML entities. */
- 			detagged = strsep (&text, "&");
- 			if (detagged == NULL)
- 				break;
--			
--			if (detagged != '\0') {
-+
-+			if (*detagged) {
- 				newtext = realloc (newtext, strlen(newtext)+strlen(detagged)+1);
- 				strcat (newtext, detagged);
- 			}
-@@ -260,29 +251,29 @@ char * UIDejunk (char * feed_description) {
- 					strcat (newtext, "'");
- 					continue;
- 				}
--				
-+
- 				/* Decode user defined entities. */
- 				found = 0;
- 				for (cur_entity = first_entity; cur_entity != NULL; cur_entity = cur_entity->next_ptr) {
- 					if (strcmp (entity, cur_entity->entity) == 0) {
- 						/* We have found a matching entity. */
--						
-+
- 						/* If entity_length is more than 1 char we need to realloc
- 						   more space in newtext. */
- 						if (cur_entity->entity_length > 1)
- 							newtext = realloc (newtext,  strlen(newtext)+cur_entity->entity_length+1);
--						
-+
- 						/* Append new entity. */
- 						strcat (newtext, cur_entity->converted_entity);
--						
-+
- 						/* Set found flag. */
- 						found = 1;
--						
-+
- 						/* We can now leave the for loop. */
- 						break;
- 					}
- 				}
--								
-+
- 				/* Try to parse some standard entities. */
- 				if (!found) {
- 					/* See if it was a numeric entity. */
-@@ -330,7 +321,7 @@ char * UIDejunk (char * feed_description) {
- 				break;
- 		}
- 		free (start);
--	}	
-+	}
- 	return newtext;
- }
- 
-@@ -340,7 +331,7 @@ char * UIDejunk (char * feed_description) {
-  * the 4th version which corrupted some random memory unfortunately...
-  * but this one works. Heureka!
-  */
--char * WrapText (char * text, int width) {
-+char* WrapText (const char* text, unsigned width) {
- 	char *newtext;
- 	char *textblob;			/* Working copy of text. */
- 	char *chapter;
-@@ -352,14 +343,14 @@ char * WrapText (char * text, int width) {
- 	char *p;
- 	int lena, lenb;
- 	*/
--	
-+
- 	textblob = strdup (text);
- 	start = textblob;
--	
-+
- 
- 	line = malloc (1);
- 	line[0] = '\0';
--	
-+
- 	newtext = malloc(1);
- 	memset (newtext, 0, 1);
- 
-@@ -371,14 +362,14 @@ char * WrapText (char * text, int width) {
- 		while (1) {
- 			savepos = chapter;
- 			chunk = strsep (&chapter, " ");
--			
-+
- 			/* Last chunk. */
- 			if (chunk == NULL) {
- 				if (line != NULL) {
- 					newtext = realloc (newtext, strlen(newtext)+strlen(line)+2);
- 					strcat (newtext, line);
- 					strcat (newtext, "\n");
--					
-+
- 					/* Faster replacement with memcpy.
- 					 * Overkill, overcomplicated and smelling of bugs all over.
- 					 */
-@@ -393,22 +384,22 @@ char * WrapText (char * text, int width) {
- 					p++;
- 					*p=0;
- 					*/
--					
-+
- 					line[0] = '\0';
- 				}
- 				break;
- 			}
--			
-+
- 			if (strlen(chunk) > width) {
- 				/* First copy remaining stuff in line to newtext. */
- 				newtext = realloc (newtext, strlen(newtext)+strlen(line)+2);
- 				strcat (newtext, line);
- 				strcat (newtext, "\n");
--				
-+
- 				free (line);
- 				line = malloc (1);
- 				line[0] = '\0';
--				
-+
- 				/* Then copy chunk with max length of line to newtext. */
- 				line = realloc (line, width+1);
- 				strncat (line, chunk, width-5);
-@@ -442,10 +433,10 @@ char * WrapText (char * text, int width) {
- 			}
- 		}
- 	}
--	
--	free (line);	
--	free (start);	
--	
-+
-+	free (line);
-+	free (start);
-+
- 	return newtext;
- }
- 
-@@ -458,14 +449,14 @@ char *base64encode(char const *inbuf, unsigned int inbuf_size) {
- 	unsigned int outbuf_size = 0;
- 	int bits = 0;
- 	int char_count = 0;
--	
-+
- 	outbuf = malloc(1);
--	
-+
- 	while (inbuf_pos < inbuf_size) {
--	
-+
- 		bits |= *inbuf;
- 		char_count++;
--		
-+
- 		if (char_count == 3) {
- 			outbuf = realloc(outbuf, outbuf_size+4);
- 			outbuf_size += 4;
-@@ -477,12 +468,12 @@ char *base64encode(char const *inbuf, unsigned int inbuf_size) {
- 			bits = 0;
- 			char_count = 0;
- 		}
--		
-+
- 		inbuf++;
- 		inbuf_pos++;
- 		bits <<= 8;
- 	}
--	
-+
- 	if (char_count > 0) {
- 		bits <<= 16 - (8 * char_count);
- 		outbuf = realloc(outbuf, outbuf_size+4);
-@@ -498,10 +489,10 @@ char *base64encode(char const *inbuf, unsigned int inbuf_size) {
- 		}
- 		outbuf_pos += 4;
- 	}
--	
-+
- 	outbuf = realloc(outbuf, outbuf_size+1);
- 	outbuf[outbuf_pos] = 0;
--	
-+
- 	return outbuf;
- }
- 
-@@ -531,7 +522,7 @@ char* decodechunked(char * chunked, unsigned int *inputlen) {
- 	}
- 	*dest = '\0';
- 	*inputlen = dest - chunked;
--	
-+
- 	return chunked;
- }
- #endif
-@@ -543,13 +534,13 @@ char* decodechunked(char * chunked, unsigned int *inputlen) {
-  */
- void CleanupString (char * string, int tidyness) {
- 	int len, i;
--	
-+
- 	/* If we are passed a NULL pointer, leave it alone and return. */
- 	if (string == NULL)
- 		return;
--	
-+
- 	len = strlen(string);
--	
-+
- 	while ((string[0] == '\n' || string [0] == ' ' || string [0] == '\t') &&
- 			(len > 0)) {
- 		/* len=strlen(string) does not include \0 of string.
-@@ -558,13 +549,13 @@ void CleanupString (char * string, int tidyness) {
- 		memmove (string, string+1, len);
- 		len--;
- 	}
--	
-+
- 	/* Remove trailing spaces. */
- 	while ((len > 1) && (string[len-1] == ' ')) {
- 		string[len-1] = 0;
- 		len--;
- 	}
--	
-+
- 	len = strlen(string);
- 	/* Eat newlines and tabs along the whole string. */
- 	for (i = 0; i < len; i++) {
-@@ -574,18 +565,18 @@ void CleanupString (char * string, int tidyness) {
- 		if (tidyness == 1 && string[i] == '\n') {
- 			string[i] = ' ';
- 		}
--	}	
-+	}
- }
- 
- /* http://foo.bar/address.rdf -> http:__foo.bar_address.rdf */
- char * Hashify (const char * url) {
- 	int i, len;
- 	char *hashed_url;
--	
-+
- 	hashed_url = strdup(url);
--	
-+
- 	len = strlen(hashed_url);
--	
-+
- 	/* Don't allow filenames > 128 chars for teeny weeny
- 	 * operating systems.
- 	 */
-@@ -593,7 +584,7 @@ char * Hashify (const char * url) {
- 		len = 128;
- 		hashed_url[128] = '\0';
- 	}
--	
-+
- 	for (i = 0; i < len; i++) {
- 		if (((hashed_url[i] < 32) || (hashed_url[i] > 38)) &&
- 			((hashed_url[i] < 43) || (hashed_url[i] > 46)) &&
-@@ -601,7 +592,7 @@ char * Hashify (const char * url) {
- 			((hashed_url[i] < 97) || (hashed_url[i] > 122)) &&
- 			(hashed_url[i] != 0))
- 			hashed_url[i] = '_';
--		
-+
- 		/* Cygwin doesn't seem to like anything besides a-z0-9 in filenames.
- 		   Zap'em! */
- #ifdef __CYGWIN__
-@@ -612,31 +603,26 @@ char * Hashify (const char * url) {
- 			hashed_url[i] = '_';
- #endif
- 	}
--	
-+
- 	return hashed_url;
- }
- 
--char * genItemHash (char ** hashitems, int items) {
--	int i;
--	EVP_MD_CTX mdctx;
--	unsigned char md_value[EVP_MAX_MD_SIZE];
--	unsigned int md_len;
--	char md5_hex[33];
--
--	EVP_DigestInit(&mdctx, EVP_md5());
--	
--	for (i = 0; i < items; i++) {
--		if (hashitems[i] != NULL)
--			EVP_DigestUpdate(&mdctx, hashitems[i], (size_t) strlen(hashitems[i]));
--	}
--	
--	EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
--	EVP_MD_CTX_cleanup(&mdctx);
--	
--	for (i = 0; i < md_len; i++) {
--		sprintf(&md5_hex[2*i], "%02x", md_value[i]);
--	}
--	
-+char * genItemHash (const char* const* hashitems, int items) {
-+	EVP_MD_CTX* mdctx = EVP_MD_CTX_new();
-+	EVP_DigestInit(mdctx, EVP_md5());
-+
-+	for (int i = 0; i < items; ++i)
-+		if (hashitems[i])
-+			EVP_DigestUpdate (mdctx, hashitems[i], strlen(hashitems[i]));
-+
-+	unsigned char md_value [EVP_MAX_MD_SIZE];
-+	unsigned md_len = 0;
-+	EVP_DigestFinal_ex (mdctx, md_value, &md_len);
-+	EVP_MD_CTX_free (mdctx);
-+
-+	char md5_hex [MD5_DIGEST_LENGTH*2+1];
-+	for (unsigned i = 0; i < md_len; ++i)
-+		sprintf (&md5_hex[2*i], "%02x", md_value[i]);
- 	return strdup(md5_hex);
- }
- 
-@@ -646,14 +632,14 @@ int ISODateToUnix (char const * const ISODate) {
- 	struct tm *t;
- 	time_t tt = 0;
- 	int time_unix = 0;
--	
-+
- 	/* Do not crash with an empty tag */
- 	if (ISODate == NULL)
- 		return 0;
--	
-+
- 	t = malloc(sizeof(struct tm));
- 	gmtime_r(&tt, t);
--	
-+
- 	/* OpenBSD does not know %F == %Y-%m-%d
- 	 * <insert inflamatory comment here> */
- 	if (strptime(ISODate, "%Y-%m-%dT%T", t)) {
-@@ -669,7 +655,7 @@ int ISODateToUnix (char const * const ISODate) {
- 		time_unix = timegm(t);
- #endif
- 	}
--	
-+
- 	free (t);
- 	return time_unix;
- }
-@@ -680,17 +666,17 @@ int pubDateToUnix (char const * const pubDate) {
- 	time_t tt = 0;
- 	int time_unix = 0;
- 	char *oldlocale;
--	
-+
- 	/* Do not crash with an empty Tag */
- 	if (pubDate == NULL)
- 		return 0;
--	
-+
- 	start_here = pubDate;
- 	start_here += 5;
--	
-+
- 	t = malloc(sizeof(struct tm));
- 	gmtime_r(&tt, t);
--	
-+
- #ifdef LOCALEPATH
- 	/* Cruft!
- 	 * Save old locale so we can parse the stupid pubDate format.
-@@ -708,7 +694,7 @@ int pubDateToUnix (char const * const pubDate) {
- 		setlocale(LC_TIME, "C");
- 	}
- #endif
--	
-+
- 	if (strptime(start_here, "%d %b %Y %T", t)) {
- #ifdef __CYGWIN__
- 		time_unix = mktime(t);
-@@ -723,7 +709,7 @@ int pubDateToUnix (char const * const pubDate) {
- 		free (oldlocale);
- 	}
- #endif
--	
-+
- 	free (t);
- 	return time_unix;
- }
-@@ -736,21 +722,21 @@ char * unixToPostDateString (int unixDate) {
- 	int strfstr_len = 32;
- 	char tmpstr[32];
- 	int age;
--	
-+
- 	time_str = malloc(len);
- 	time_strfstr = malloc(strfstr_len);
--	
-+
- 	unix_t = unixDate;
- 	gmtime_r(&unix_t, &t);
--	
-+
- 	age = calcAgeInDays(&t);
--	
-+
- 	strftime(time_strfstr, strfstr_len, _(", %H:%M"), &t);
- 	strcpy(time_str, _("Posted "));
- 	len -= strlen(_("Posted "));
- 	if (len <= 0)
- 		return NULL;
--	
-+
- 	if (age == 0) {
- 		strncat(time_str, _("today"), len-1);
- 		len -= strlen(_("today"));
-@@ -796,15 +782,13 @@ char * unixToPostDateString (int unixDate) {
- 		strncat(time_str, time_strfstr, len-1);
- 	}
- 	free (time_strfstr);
--	
-+
- 	return time_str;
- }
- 
--int calcAgeInDays (struct tm * t) {
--	time_t unix_t;
-+static int calcAgeInDays (const struct tm* t) {
-+	time_t unix_t = time(NULL);
- 	struct tm current_t;
--	
--	unix_t = time(NULL);
- 	gmtime_r(&unix_t, &current_t);
- 
- 	/* (((current year - passed year) * 365) + current year day) - passed year day */
-diff --git a/conversions.h b/conversions.h
-index 6816df4..148becc 100644
---- a/conversions.h
-+++ b/conversions.h
-@@ -30,11 +30,11 @@ char * iconvert (const char * inbuf);
- char * iconvert (char * inbuf);
- #endif
- char * UIDejunk (char * feed_description);
--char * WrapText (char * text, int width);
-+char* WrapText (const char* text, unsigned width);
- char *base64encode(char const *inbuf, unsigned int inbuf_size);
- void CleanupString (char * string, int tidyness);
- char * Hashify (const char * url);
--char * genItemHash (char ** hashitems, int items);
-+char* genItemHash (const char* const* hashitems, int items);
- int ISODateToUnix (char const * const ISODate);
- int pubDateToUnix (char const * const pubDate);
- char * unixToPostDateString (int unixDate);
-diff --git a/digcalc.c b/digcalc.c
-index fef39a2..7a99b26 100644
---- a/digcalc.c
-+++ b/digcalc.c
-@@ -15,144 +15,87 @@
- #include "digcalc.h"
- #include <openssl/evp.h>
- 
--
- /* calculate H(A1) as per spec */
--void DigestCalcHA1(
--    IN char * pszAlg,
--    IN char * pszUserName,
--    IN char * pszRealm,
--    IN char * pszPassword,
--    IN char * pszNonce,
--    IN char * pszCNonce,
--    OUT HASHHEX SessionKey
--    )
-+void DigestCalcHA1 (const char* pszAlg, const char* pszUserName, const char* pszRealm,
-+	const char* pszPassword, const char* pszNonce, const char* pszCNonce,
-+	HASHHEX SessionKey)
- {
--	EVP_MD_CTX mdctx;
--	unsigned char md_value[EVP_MAX_MD_SIZE];
--	unsigned int md_len;
--	int i;
--	HASH HA1;
--	
--	EVP_DigestInit(&mdctx, EVP_md5());
--	EVP_DigestUpdate(&mdctx, pszUserName, strlen(pszUserName));
--	EVP_DigestUpdate(&mdctx, ":", 1);
--	EVP_DigestUpdate(&mdctx, pszRealm, strlen(pszRealm));
--	EVP_DigestUpdate(&mdctx, ":", 1);
--	EVP_DigestUpdate(&mdctx, pszPassword, strlen(pszPassword));
--	EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
--	EVP_MD_CTX_cleanup(&mdctx);
--	
-+	EVP_MD_CTX* mdctx = EVP_MD_CTX_new();
-+	EVP_DigestInit (mdctx, EVP_md5());
-+	EVP_DigestUpdate (mdctx, pszUserName, strlen(pszUserName));
-+	EVP_DigestUpdate (mdctx, ":", 1);
-+	EVP_DigestUpdate (mdctx, pszRealm, strlen(pszRealm));
-+	EVP_DigestUpdate (mdctx, ":", 1);
-+	EVP_DigestUpdate (mdctx, pszPassword, strlen(pszPassword));
-+	unsigned char md_value [EVP_MAX_MD_SIZE];
-+	unsigned md_len;
-+	EVP_DigestFinal_ex (mdctx, md_value, &md_len);
-+
- 	if (strcmp(pszAlg, "md5-sess") == 0) {
--		EVP_DigestInit(&mdctx, EVP_md5());
--		EVP_DigestUpdate(&mdctx, HA1, HASHLEN);
--		EVP_DigestUpdate(&mdctx, ":", 1);
--		EVP_DigestUpdate(&mdctx, pszNonce, strlen(pszNonce));
--		EVP_DigestUpdate(&mdctx, ":", 1);
--		EVP_DigestUpdate(&mdctx, pszCNonce, strlen(pszCNonce));
--		EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
--		EVP_MD_CTX_cleanup(&mdctx);
--	};
--	
--	for (i = 0; i < md_len; i++) {
--		sprintf(&SessionKey[2*i], "%02x", md_value[i]);
-+		EVP_DigestInit (mdctx, EVP_md5());
-+		HASH HA1;
-+		EVP_DigestUpdate (mdctx, HA1, HASHLEN);
-+		EVP_DigestUpdate (mdctx, ":", 1);
-+		EVP_DigestUpdate (mdctx, pszNonce, strlen(pszNonce));
-+		EVP_DigestUpdate (mdctx, ":", 1);
-+		EVP_DigestUpdate (mdctx, pszCNonce, strlen(pszCNonce));
-+		EVP_DigestFinal_ex (mdctx, md_value, &md_len);
- 	}
-+	EVP_MD_CTX_free (mdctx);
-+
-+	for (unsigned i = 0; i < md_len; ++i)
-+		sprintf (&SessionKey[2*i], "%02x", md_value[i]);
- };
- 
- /* calculate request-digest/response-digest as per HTTP Digest spec */
- void DigestCalcResponse(
--    IN HASHHEX HA1,           /* H(A1) */
--    IN char * pszNonce,       /* nonce from server */
--    IN char * pszNonceCount,  /* 8 hex digits */
--    IN char * pszCNonce,      /* client nonce */
--    IN char * pszQop,         /* qop-value: "", "auth", "auth-int" */
--    IN char * pszMethod,      /* method from the request */
--    IN char * pszDigestUri,   /* requested URL */
--    IN HASHHEX HEntity,       /* H(entity body) if qop="auth-int" */
--    OUT HASHHEX Response      /* request-digest or response-digest */
-+    const HASHHEX HA1,		/* H(A1) */
-+    const char* pszNonce,	/* nonce from server */
-+    const char* pszNonceCount,	/* 8 hex digits */
-+    const char* pszCNonce,	/* client nonce */
-+    const char* pszQop,		/* qop-value: "", "auth", "auth-int" */
-+    const char* pszMethod,	/* method from the request */
-+    const char* pszDigestUri,	/* requested URL */
-+    const HASHHEX HEntity,	/* H(entity body) if qop="auth-int" */
-+    HASHHEX Response		/* request-digest or response-digest */
-     )
- {
--	EVP_MD_CTX mdctx;
--	HASHHEX HA2Hex;
--	unsigned char md_value[EVP_MAX_MD_SIZE];
--	unsigned int md_len;
--	int i;
--	
- 	/* calculate H(A2) */
--	EVP_DigestInit(&mdctx, EVP_md5());
--	EVP_DigestUpdate(&mdctx, pszMethod, strlen(pszMethod));
--	EVP_DigestUpdate(&mdctx, ":", 1);
--	EVP_DigestUpdate(&mdctx, pszDigestUri, strlen(pszDigestUri));
-+	EVP_MD_CTX* mdctx = EVP_MD_CTX_new();
-+	EVP_DigestInit (mdctx, EVP_md5());
-+	EVP_DigestUpdate (mdctx, pszMethod, strlen(pszMethod));
-+	EVP_DigestUpdate (mdctx, ":", 1);
-+	EVP_DigestUpdate (mdctx, pszDigestUri, strlen(pszDigestUri));
- 	if (strcmp(pszQop, "auth-int") == 0) {
--		EVP_DigestUpdate(&mdctx, ":", 1);
--		EVP_DigestUpdate(&mdctx, HEntity, HASHHEXLEN);
--	};
--	EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
--	EVP_MD_CTX_cleanup(&mdctx);
--	
--	for (i = 0; i < md_len; i++) {
--		sprintf(&HA2Hex[2*i], "%02x", md_value[i]);
-+		EVP_DigestUpdate (mdctx, ":", 1);
-+		EVP_DigestUpdate (mdctx, HEntity, HASHHEXLEN);
- 	}
--	
-+	unsigned char md_value [EVP_MAX_MD_SIZE];
-+	unsigned md_len = 0;
-+	EVP_DigestFinal_ex (mdctx, md_value, &md_len);
-+
-+	HASHHEX HA2Hex;
-+	for (unsigned i = 0; i < md_len; ++i)
-+		sprintf (&HA2Hex[2*i], "%02x", md_value[i]);
-+
- 	/* calculate response */
--	EVP_DigestInit(&mdctx, EVP_md5());
--	EVP_DigestUpdate(&mdctx, HA1, HASHHEXLEN);
--	EVP_DigestUpdate(&mdctx, ":", 1);
--	EVP_DigestUpdate(&mdctx, pszNonce, strlen(pszNonce));
--	EVP_DigestUpdate(&mdctx, ":", 1);
-+	EVP_DigestInit (mdctx, EVP_md5());
-+	EVP_DigestUpdate (mdctx, HA1, HASHHEXLEN);
-+	EVP_DigestUpdate (mdctx, ":", 1);
-+	EVP_DigestUpdate (mdctx, pszNonce, strlen(pszNonce));
-+	EVP_DigestUpdate (mdctx, ":", 1);
- 	if (*pszQop) {
--		EVP_DigestUpdate(&mdctx, pszNonceCount, strlen(pszNonceCount));
--		EVP_DigestUpdate(&mdctx, ":", 1);
--		EVP_DigestUpdate(&mdctx, pszCNonce, strlen(pszCNonce));
--		EVP_DigestUpdate(&mdctx, ":", 1);
--		EVP_DigestUpdate(&mdctx, pszQop, strlen(pszQop));
--		EVP_DigestUpdate(&mdctx, ":", 1);
-+		EVP_DigestUpdate (mdctx, pszNonceCount, strlen(pszNonceCount));
-+		EVP_DigestUpdate (mdctx, ":", 1);
-+		EVP_DigestUpdate (mdctx, pszCNonce, strlen(pszCNonce));
-+		EVP_DigestUpdate (mdctx, ":", 1);
-+		EVP_DigestUpdate (mdctx, pszQop, strlen(pszQop));
-+		EVP_DigestUpdate (mdctx, ":", 1);
- 	};
--	EVP_DigestUpdate(&mdctx, HA2Hex, HASHHEXLEN);
--	EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
--	EVP_MD_CTX_cleanup(&mdctx);
--	
--	for (i = 0; i < md_len; i++) {
--		sprintf(&Response[2*i], "%02x", md_value[i]);
--	}
--	
--#if 0
--	/* This is the old MD5 digest calculator for a reference until I am sure
--	 * the new code works for sure */
--	/* *************************** */
--      struct MD5Context Md5Ctx;
--      HASH HA2;
--      HASH RespHash;
--      HASHHEX HA2Hex;
--
--      /* calculate H(A2) */
--      MD5Init(&Md5Ctx);
--      MD5Update(&Md5Ctx, pszMethod, strlen(pszMethod));
--      MD5Update(&Md5Ctx, ":", 1);
--      MD5Update(&Md5Ctx, pszDigestUri, strlen(pszDigestUri));
--      if (strcmp(pszQop, "auth-int") == 0) {
--            MD5Update(&Md5Ctx, ":", 1);
--            MD5Update(&Md5Ctx, HEntity, HASHHEXLEN);
--      };
--      MD5Final(HA2, &Md5Ctx);
--       CvtHex(HA2, HA2Hex);
--
--      /* calculate response */
--      MD5Init(&Md5Ctx);
--      MD5Update(&Md5Ctx, HA1, HASHHEXLEN);
--      MD5Update(&Md5Ctx, ":", 1);
--      MD5Update(&Md5Ctx, pszNonce, strlen(pszNonce));
--      MD5Update(&Md5Ctx, ":", 1);
--      if (*pszQop) {
-+	EVP_DigestUpdate (mdctx, HA2Hex, HASHHEXLEN);
-+	EVP_DigestFinal_ex (mdctx, md_value, &md_len);
-+	EVP_MD_CTX_free (mdctx);
- 
--          MD5Update(&Md5Ctx, pszNonceCount, strlen(pszNonceCount));
--          MD5Update(&Md5Ctx, ":", 1);
--          MD5Update(&Md5Ctx, pszCNonce, strlen(pszCNonce));
--          MD5Update(&Md5Ctx, ":", 1);
--          MD5Update(&Md5Ctx, pszQop, strlen(pszQop));
--          MD5Update(&Md5Ctx, ":", 1);
--      };
--      MD5Update(&Md5Ctx, HA2Hex, HASHHEXLEN);
--      MD5Final(RespHash, &Md5Ctx);
--      CvtHex(RespHash, Response);
--#endif
-+	for (unsigned i = 0; i < md_len; ++i)
-+		sprintf (&Response[2*i], "%02x", md_value[i]);
- };
-diff --git a/digcalc.h b/digcalc.h
-index e17cdde..86d1cb2 100644
---- a/digcalc.h
-+++ b/digcalc.h
-@@ -18,36 +18,23 @@
- typedef char HASH[HASHLEN];
- #define HASHHEXLEN 32
- typedef char HASHHEX[HASHHEXLEN+1];
--#define IN
--#define OUT
- 
- /* calculate H(A1) as per HTTP Digest spec */
--void DigestCalcHA1(
--    IN char * pszAlg,
--    IN char * pszUserName,
--    IN char * pszRealm,
--    IN char * pszPassword,
--    IN char * pszNonce,
--    IN char * pszCNonce,
--    OUT HASHHEX SessionKey
--    );
-+void DigestCalcHA1 (const char* pszAlg, const char* pszUserName, const char* pszRealm,
-+			const char* pszPassword, const char* pszNonce, const char* pszCNonce,
-+			HASHHEX SessionKey);
- 
- /* calculate request-digest/response-digest as per HTTP Digest spec */
--void DigestCalcResponse(
--    IN HASHHEX HA1,           /* H(A1) */
--    IN char * pszNonce,       /* nonce from server */
--    IN char * pszNonceCount,  /* 8 hex digits */
--    IN char * pszCNonce,      /* client nonce */
--    IN char * pszQop,         /* qop-value: "", "auth", "auth-int" */
--    IN char * pszMethod,      /* method from the request */
--    IN char * pszDigestUri,   /* requested URL */
--    IN HASHHEX HEntity,       /* H(entity body) if qop="auth-int" */
--    OUT HASHHEX Response      /* request-digest or response-digest */
--    );
--
--void CvtHex(
--    IN HASH Bin,
--    OUT HASHHEX Hex
-+void DigestCalcResponse (
-+    const HASHHEX HA1,		/* H(A1) */
-+    const char* pszNonce,	/* nonce from server */
-+    const char* pszNonceCount,	/* 8 hex digits */
-+    const char* pszCNonce,	/* client nonce */
-+    const char* pszQop,		/* qop-value: "", "auth", "auth-int" */
-+    const char* pszMethod,	/* method from the request */
-+    const char* pszDigestUri,	/* requested URL */
-+    const HASHHEX HEntity,	/* H(entity body) if qop="auth-int" */
-+    HASHHEX Response		/* request-digest or response-digest */
-     );
- 
- #endif
-diff --git a/interface.c b/interface.c
-index 1fa7a1e..5e798d3 100644
---- a/interface.c
-+++ b/interface.c
-@@ -67,7 +67,7 @@ struct scrolltext {
- };
- 
- #ifdef SIGWINCH
--void sig_winch(int p)
-+void sig_winch (int p __attribute__((unused)))
- {
- 	resize_dirty = 1;
- }
-diff --git a/main.c b/main.c
-index c031912..0318178 100644
---- a/main.c
-+++ b/main.c
-@@ -155,15 +155,9 @@ void MainSignalHandler (int sig) {
- }
- 
- /* Automatic child reaper. */
--void sigChildHandler (int sig) {
--	int status, child_val;
--
-+static void sigChildHandler (int sig __attribute__((unused))) {
- 	/* Wait for any child without blocking */
--	if (waitpid(-1, &status, WNOHANG) < 0)
--			return;
--
--	if (WIFEXITED(status))
--		child_val = WEXITSTATUS(status);
-+	waitpid (-1, NULL, WNOHANG);
- }
- 
- void printHelp (void) {
-diff --git a/netio.c b/netio.c
-index 5d3bae0..4a08e1e 100644
---- a/netio.c
-+++ b/netio.c
-@@ -129,7 +129,7 @@ int NetPoll (struct feed * cur_ptr, int * my_socket, int rw) {
-  *	0	Connected
-  *	-1	Error occured (netio_error is set)
-  */
--int NetConnect (int * my_socket, char * host, struct feed * cur_ptr, int httpproto, int suppressoutput) {
-+int NetConnect (int * my_socket, char * host, struct feed * cur_ptr, int httpproto __attribute__((unused)), int suppressoutput) {
- 	char tmp[512];
- 	struct sockaddr_in address;	
- 	struct hostent *remotehost;
-diff --git a/os-support.c b/os-support.c
-index a590a58..8b61f35 100644
---- a/os-support.c
-+++ b/os-support.c
-@@ -39,7 +39,7 @@
-  * The following function was written by Fran�ois Gouget.
-  */
- #ifdef SUN
--char* strsep(char** str, const char* delims)
-+char* strsep (char** str, const char* delims)
- {
-     char* token;
- 
-@@ -93,29 +93,21 @@ time_t timegm(struct tm *t)
- #endif
- 
- /* strcasestr stolen from: http://www.unixpapa.com/incnote/string.html */
--char *s_strcasestr(char *a, char *b) {
--	size_t l;
-+const char* s_strcasestr (const char* a, const char* b) {
-+	const size_t lena = strlen(a), lenb = strlen(b);
- 	char f[3];
--	int lena = strlen(a);
--	int lenb = strlen(b);
--	
- 	snprintf(f, sizeof(f), "%c%c", tolower(*b), toupper(*b));
--	for (l = strcspn(a, f); l != lena; l += strcspn(a + l + 1, f) + 1)
-+	for (size_t l = strcspn(a, f); l != lena; l += strcspn(a + l + 1, f) + 1)
- 		if (strncasecmp(a + l, b, lenb) == 0)
--			return(a + l);
--	return(NULL);
-+			return a + l;
-+	return NULL;
- }
- 
- 
- /* Private malloc wrapper. Aborts program execution if malloc fails. */
--void * s_malloc (size_t size) {
--	void *newmem;
--	
--	newmem = malloc (size);
--	
--	if (newmem == NULL) {
-+void* s_malloc (size_t size) {
-+	void* newmem = malloc (size);
-+	if (!newmem)
- 		MainQuit ("Allocating memory", strerror(errno));
--	}
--	
- 	return newmem;
- }
-diff --git a/os-support.h b/os-support.h
-index 3eb1068..d5ef6a1 100644
---- a/os-support.h
-+++ b/os-support.h
-@@ -27,10 +27,10 @@
- #define OS_SUPPORT_H
- 
- #ifdef SUN
--char* strsep(char** str, const char* delims);
-+char* strsep (char** str, const char* delims);
- #endif
- 
--char *s_strcasestr(char *a, char *b);
--void * s_malloc (size_t size);
-+const char* s_strcasestr (const char* a, const char* b);
-+void* s_malloc (size_t size);
- 
- #endif
-diff --git a/ui-support.c b/ui-support.c
-index cc56c8e..c498833 100644
---- a/ui-support.c
-+++ b/ui-support.c
-@@ -223,7 +223,7 @@ void UISupportDrawHeader (const char * headerstring) {
- 	
- 	mvprintw (0, 1, "* Snownews %s", VERSION);
- 	if (headerstring != NULL) {
--		if (strlen(headerstring) > COLS-18)
-+		if (strlen(headerstring) > COLS-18u)
- 			mvaddnstr (0, 19, headerstring, COLS-20);
- 		else
- 			mvaddstr (0, COLS-strlen(headerstring)-1, headerstring);
-diff --git a/updatecheck.c b/updatecheck.c
-index e7b55a7..cf328eb 100644
---- a/updatecheck.c
-+++ b/updatecheck.c
-@@ -45,7 +45,6 @@ void AutoVersionCheck (void) {
- 	int oldtime;
- 	char *versionstring = NULL;
- 	char *url;
--	char *freeme;
- 	
- 	update = newFeedStruct();
- 	
-@@ -77,7 +76,6 @@ void AutoVersionCheck (void) {
- 	
- 	url = strdup ("http://kiza.kcore.de/software/snownews/version");
- 	update->feedurl = strdup(url);
--	freeme = url;
- 	versionstring = DownloadFeed (url, update, 1);
- 	free (url);
- 	
-diff --git a/xmlparse.c b/xmlparse.c
-index ef93745..11241fb 100644
---- a/xmlparse.c
-+++ b/xmlparse.c
-@@ -183,7 +183,6 @@ void parse_rdf10_item(struct feed *feed, xmlDocPtr doc, xmlNodePtr node)
- {
- 	xmlNodePtr cur;
- 	xmlChar *readstatusstring;
--	char **hashitems = NULL;
- 	char *guid = NULL;
- 	char *date_str = NULL;
- 	struct newsitem *item;
-@@ -277,14 +276,9 @@ void parse_rdf10_item(struct feed *feed, xmlDocPtr doc, xmlNodePtr node)
- 	   <guid> is not saved in the cache, thus we would generate a different
- 	   hash than the one from the live feed. */
- 	if (item->data->hash == NULL) {
--		hashitems = malloc (sizeof(char *) * 4);
--		hashitems[0] = item->data->title;
--		hashitems[1] = item->data->link;
--		hashitems[2] = guid;
--		hashitems[3] = NULL;
-+		const char* hashitems[] = { item->data->title, item->data->link, guid, NULL };
- 		item->data->hash = genItemHash (hashitems, 3);
- 		xmlFree (guid);
--		free (hashitems);
- 	}
- 	
- 	/* If saverestore == 1, restore readstatus. */
-diff --git a/zlib_interface.c b/zlib_interface.c
-index 9a9b325..12cdf45 100644
---- a/zlib_interface.c
-+++ b/zlib_interface.c
-@@ -26,7 +26,7 @@
- #include <zlib.h>
- #include <string.h>
- 
--int JG_ZLIB_DEBUG = 0;
-+static const int JG_ZLIB_DEBUG = 0;
- 
- struct gzip_header {
- 	unsigned char magic[2];
-@@ -50,33 +50,33 @@ int jg_zlib_uncompress(void const *in_buf, int in_size,
- 	z_stream stream;
- 	char *out_buf = NULL;
- 	int out_buf_bytes = 0;
--	char tmp_buf[4096];
-+	unsigned char tmp_buf[4096];
- 	int result;
- 	int new_bytes;
--	
-+
- 	/* Prepare the stream structure. */
- 	stream.zalloc = NULL;
- 	stream.zfree = NULL;
- 	stream.opaque = NULL;
--	stream.next_in = (void *)in_buf;	
-+	stream.next_in = (void*) in_buf;
- 	stream.avail_in = in_size;
- 	stream.next_out = tmp_buf;
- 	stream.avail_out = sizeof tmp_buf;
--	
-+
- 	if (out_size != NULL)
- 		*out_size = 0;
--	
-+
- 	if (gzip)
- 		result = inflateInit2(&stream, MAX_WBITS + 32); /* UNTESTED */
- 	else
- 		result = inflateInit2(&stream, -MAX_WBITS);
--	
-+
- 	if (result != 0) {
- 		if (JG_ZLIB_DEBUG)
- 			fprintf(stderr, "inflateInit2 failed: %d\n", result);
- 		return JG_ZLIB_ERROR_OLDVERSION;
- 	}
--	
-+
- 	do {
- 		/* Should be Z_FINISH? */
- 		result = inflate(&stream, Z_NO_FLUSH);
-@@ -84,6 +84,7 @@ int jg_zlib_uncompress(void const *in_buf, int in_size,
- 			case Z_BUF_ERROR:
- 				if (stream.avail_in == 0)
- 					goto DONE; /* zlib bug */
-+				/* fallthrough */
- 			case Z_ERRNO:
- 			case Z_NEED_DICT:
- 			case Z_MEM_ERROR:
-@@ -114,19 +115,19 @@ int jg_zlib_uncompress(void const *in_buf, int in_size,
- 			return JG_ZLIB_ERROR_NODATA;
- 		}
- 	} while (result != Z_STREAM_END);
--	
-+
- DONE:
--	
-+
- 	inflateEnd(&stream);
--	
-+
- 	/* Null-terminate the output buffer so it can be handled like a string. */
- 	out_buf = realloc(out_buf, out_buf_bytes + 1);
- 	out_buf[out_buf_bytes] = 0;
--	
-+
- 	/* The returned size does NOT include the additionall null byte! */
- 	if (out_size != NULL)
- 		*out_size = out_buf_bytes;
--	
-+
- 	*out_buf_ptr = out_buf;
- 
- 	return 0;
-@@ -141,24 +142,24 @@ int jg_gzip_uncompress(void const *in_buf, int in_size,
- 	struct gzip_header const *header;
- 	char *data_start;
- 	int offset = sizeof *header;
--	
-+
- 	header = in_buf;
--	
-+
- 	if (out_size != NULL)
- 		*out_size = 0;
--	
-+
- 	if ((header->magic[0] != 0x1F) || (header->magic[1] != 0x8B)) {
- 		if (JG_ZLIB_DEBUG)
- 			fprintf(stderr, "ERROR: Invalid magic bytes for GZIP data\n");
- 		return JG_ZLIB_ERROR_BAD_MAGIC;
- 	}
--	
-+
- 	if (header->method != 8) {
- 		if (JG_ZLIB_DEBUG)
- 			fprintf(stderr, "ERROR: Compression method is not deflate\n");
- 		return JG_ZLIB_ERROR_BAD_METHOD;
- 	}
--	
-+
- 	if (header->flags != 0 && header->flags != 8) {
- 		if (JG_ZLIB_DEBUG) {
- 			snprintf (tmpstring, sizeof(tmpstring), "ERROR: Unsupported flags %d", header->flags);
-@@ -166,7 +167,7 @@ int jg_gzip_uncompress(void const *in_buf, int in_size,
- 		}
- 		return JG_ZLIB_ERROR_BAD_FLAGS;
- 	}
--	
-+
- 	if (header->flags & 8) {
- 		/* skip the file name */
- 		while (offset < in_size) {
-@@ -177,7 +178,7 @@ int jg_gzip_uncompress(void const *in_buf, int in_size,
- 			offset++;
- 		}
- 	}
--	
-+
- 	data_start = (char *)in_buf + offset;
- 
- 	return jg_zlib_uncompress(data_start, in_size - offset - 8, 
-diff --git a/zlib_interface.h b/zlib_interface.h
-index 4644284..cc6f62d 100644
---- a/zlib_interface.h
-+++ b/zlib_interface.h
-@@ -32,8 +32,6 @@ enum JG_ZLIB_ERROR {
- 	JG_ZLIB_ERROR_BAD_FLAGS = -6
- };
- 
--extern int JG_ZLIB_DEBUG;
--
- int jg_zlib_uncompress(void const *in_buf, int in_size, 
-                        void **out_buf_ptr, int *out_size,
-                        int gzip);   
---- ./configure.orig	2018-10-30 09:16:43.691589791 +0000
-+++ ./configure	2018-10-30 10:02:13.380306557 +0000
-@@ -12,7 +12,7 @@
- chomp($xmlldflags);
- 
- my $prefix = "/usr/local";
--my $cflags = "-Wall -Wno-format-y2k -O2 -DLOCALEPATH=\"\\\"\$(LOCALEPATH)\\\"\" -DOS=\\\"$os\\\" $xmlcflags \$(EXTRA_CFLAGS) ";
-+my $cflags = "-Wall -O2 -DLOCALEPATH=\"\\\"\$(LOCALEPATH)\\\"\" -DOS=\\\"$os\\\" $xmlcflags \$(EXTRA_CFLAGS) ";
- my $ldflags = "-lintl -lncursesw -lcrypto $xmlldflags \$(EXTRA_LDFLAGS) ";
- 
- my $use_nls = 1;
diff --git a/main/sntpc/APKBUILD b/main/sntpc/APKBUILD
index 63011f7bdbb..9c725fcfe3a 100644
--- a/main/sntpc/APKBUILD
+++ b/main/sntpc/APKBUILD
@@ -2,30 +2,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sntpc
 pkgver=0.9
-pkgrel=6
+pkgrel=12
 pkgdesc="Simple NTP client"
-url="https://git.alpinelinux.org/cgit/hosted/sntpc/"
+options="!check" # No testsuite
+url="https://git-old.alpinelinux.org/hosted/sntpc/"
 arch="all"
-license="GPL-2.0"
-depends=""
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
+license="GPL-2.0-only"
+subpackages="$pkgname-openrc"
+source="https://dev.alpinelinux.org/archive/sntpc/sntpc-$pkgver.tar.xz
+	format-security.patch
+	gcc-10.patch
 	sntpc.initd
 	sntpc.confd
 	"
-builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
-	make || return 1
+	make
 }
 
 package() {
-	cd "$builddir"
-	install -m755 -D sntpc "$pkgdir"/usr/sbin/sntpc || return 1
+	install -m755 -D sntpc "$pkgdir"/usr/sbin/sntpc
 	install -m755 -D "$srcdir"/sntpc.initd "$pkgdir"/etc/init.d/sntpc
 	install -m644 -D "$srcdir"/sntpc.confd "$pkgdir"/etc/conf.d/sntpc
 }
 
-sha512sums="c18bb0da4b7804bcbb81da65dd4ab6de4288d2475c441a7b1246631d2500b474d4e95e60cc7752762fb092b49bb6c9fd5e5290c69e247293b3e094e45d18f76d  sntpc-0.9.tar.xz
-72a803a7393424c996b176d0e4df078b2af26b84650793cf3b7b187416878f467aca3a0c96a9cadead065d169ac80a29ae0ceb46ec4b3b26d6d552e30f3562e3  sntpc.initd
-2fcb7d45f4c6588fd5281c02161a4aebb7e0a9d259a2ac3aa6c3187617dc7029f05fbebbb227feace61cc706e37ca0acb18b0019a67c674c444498fd289a9975  sntpc.confd"
+sha512sums="
+c18bb0da4b7804bcbb81da65dd4ab6de4288d2475c441a7b1246631d2500b474d4e95e60cc7752762fb092b49bb6c9fd5e5290c69e247293b3e094e45d18f76d  sntpc-0.9.tar.xz
+d70f0360aad0ab759a0d8eb3595347a0b8298d307a0a047c8ec357e0f7e08c3e09b7ec4b51215846ffd6cba12a0f80c5e811af6bb8051e8ceb9178eb0e926948  format-security.patch
+f8f6801f5eb3da257f60a1cb97aed52816226638d7ddb850864a8ebfd76355ba6c9c0fb8921dc10422bb68c782489fac107c776e84feb9ff20b5b4bfda25ec09  gcc-10.patch
+7f48bb5be6e8cbebfc9c6d63f1dc1dd1bf51e4a5d3aa66fcffde27a4c41528a47f6a8ccfe6da054edf1025ae75b204de12e6852e4b321c4c0435d80c439607bb  sntpc.initd
+2fcb7d45f4c6588fd5281c02161a4aebb7e0a9d259a2ac3aa6c3187617dc7029f05fbebbb227feace61cc706e37ca0acb18b0019a67c674c444498fd289a9975  sntpc.confd
+"
diff --git a/main/sntpc/format-security.patch b/main/sntpc/format-security.patch
new file mode 100644
index 00000000000..dfbe676be13
--- /dev/null
+++ b/main/sntpc/format-security.patch
@@ -0,0 +1,22 @@
+diff --git a/sntpc.c b/sntpc.c
+index 61724ad..13af85a 100644
+--- a/sntpc.c
++++ b/sntpc.c
+@@ -249,7 +249,7 @@ int main(int argc, char * const argv[])
+ 			background++;
+ 			break;
+ 		case 'h':
+-			printf(usage_str);
++			printf("%s", usage_str);
+ 			return(0);
+ 		case 'i':
+ 			interval = atoi(optarg);
+@@ -267,7 +267,7 @@ int main(int argc, char * const argv[])
+ 		}
+ 	}
+ 	if (optind != (argc - 1)) {
+-		printf(usage_str);
++		printf("%s", usage_str);
+ 		return 1;
+ 	}
+ 	ntphost = argv[optind];
diff --git a/main/sntpc/gcc-10.patch b/main/sntpc/gcc-10.patch
new file mode 100644
index 00000000000..ed7dbb0cfd4
--- /dev/null
+++ b/main/sntpc/gcc-10.patch
@@ -0,0 +1,16 @@
+Upstream: Should be
+Reason: Fixes compilation under gcc-10
+
+diff --git a/ntp.h b/ntp.h
+index bfca553..5f8f581 100644
+--- a/ntp.h
++++ b/ntp.h
+@@ -107,7 +107,7 @@ struct ntp_msg {
+ 	struct l_fixedpt orgtime;
+ 	struct l_fixedpt rectime;
+ 	struct l_fixedpt xmttime;
+-} __packed;
++} __attribute__((__packed__));
+ 
+ struct ntp_query {
+ 	int			fd;
diff --git a/main/sntpc/sntpc.initd b/main/sntpc/sntpc.initd
index f22af44bcc3..a9c6e973ce3 100644
--- a/main/sntpc/sntpc.initd
+++ b/main/sntpc/sntpc.initd
@@ -17,7 +17,7 @@ start() {
 		opts="-d"
 	fi
 	ebegin "$msg"
-		start-stop-daemon --start --quiet --name sntpc \
+		start-stop-daemon --start --quiet \
 			--exec ${DAEMON} -- \
 			-i ${SNTPC_INTERVAL} $opts ${SNTPC_HOST}
 	eend $?
diff --git a/main/socat/APKBUILD b/main/socat/APKBUILD
index 0f3b7a78e84..72107e27e4f 100644
--- a/main/socat/APKBUILD
+++ b/main/socat/APKBUILD
@@ -1,7 +1,7 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Sheila Aman <sheila@vulpine.house>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=socat
-pkgver=1.7.3.4
+pkgver=1.8.0.0
 pkgrel=0
 pkgdesc="Multipurpose relay for binary protocols"
 # test  58 CHILDDEFAULT: child process default properties... FAILED:
@@ -9,11 +9,11 @@ pkgdesc="Multipurpose relay for binary protocols"
 options="!check"
 url="http://www.dest-unreach.org/socat/"
 arch="all"
-license="GPL-2.0-only"
-makedepends="openssl-dev readline-dev linux-headers"
+license="GPL-2.0-only WITH OpenSSL-Exception"
+makedepends="openssl-dev>3 readline-dev linux-headers"
 checkdepends="bash"
-subpackages="$pkgname-doc"
-source="http://www.dest-unreach.org/socat/download/socat-$pkgver.tar.bz2
+subpackages="$pkgname-doc $pkgname-scripts"
+source="http://www.dest-unreach.org/socat/download/socat-$pkgver.tar.gz
 	use-linux-headers.patch
 	netdb-internal.patch
 	"
@@ -40,6 +40,15 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123  socat-1.7.3.4.tar.bz2
+scripts() {
+	pkgdesc="$pkgdesc (helper scripts)"
+	depends="$pkgname=$pkgver-r$pkgrel bash"
+
+	amove usr/bin/socat-*.sh
+}
+
+sha512sums="
+edf459a9f1907a14025e13b3101ad29787f9a72795cffcd00017ce98847562884db29a95b9ae478a6a50868137548b142947c43fb18e975eb5853a763c42902c  socat-1.8.0.0.tar.gz
 2032b6528cb27b69d8fb6a6f64af32fcc1f6e4934bb0d7c8931b38ab7ad5e27f6f4344a6cf49751fa3178cd725f954e195373362f7d5929e587d7f0309346059  use-linux-headers.patch
-22a6e0c2317a9317997c98114daac258ebbcc3d8e58e49a6ebf24781b98967afed47c63807282582fa0909076fe349281f05e4462faacb90e7aabc853903d6e6  netdb-internal.patch"
+22a6e0c2317a9317997c98114daac258ebbcc3d8e58e49a6ebf24781b98967afed47c63807282582fa0909076fe349281f05e4462faacb90e7aabc853903d6e6  netdb-internal.patch
+"
diff --git a/main/sofia-sip/APKBUILD b/main/sofia-sip/APKBUILD
new file mode 100644
index 00000000000..a7604db36b4
--- /dev/null
+++ b/main/sofia-sip/APKBUILD
@@ -0,0 +1,57 @@
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
+pkgname=sofia-sip
+pkgver=1.13.17
+pkgrel=0
+pkgdesc="RFC3261 compliant SIP User-Agent library"
+url="https://github.com/freeswitch/sofia-sip"
+arch="all"
+license="LGPL-2.1-only"
+options="!check" #tests are broken
+makedepends="automake autoconf libtool m4
+glib-dev openssl-dev>3 lksctp-tools-dev"
+checkdepends="check-dev"
+subpackages="$pkgname-dev $pkgname-dbg"
+source="$pkgname-$pkgver.tar.gz::https://github.com/freeswitch/sofia-sip/archive/v$pkgver.tar.gz
+	Support-forking-SIP-calls.patch
+	"
+
+# secfixes:
+#   1.13.11-r0:
+#     - CVE-2023-22741
+#   1.13.8-r0:
+#     - CVE-2022-31001
+#     - CVE-2022-31002
+#     - CVE-2022-31003
+
+prepare() {
+	default_prepare
+	sh autogen.sh
+}
+
+build() {
+	./configure \
+		--prefix=/usr \
+		--with-openssl \
+		--enable-sctp \
+		--enable-static=no \
+		--disable-rpath
+	make
+}
+
+check() {
+	TPORT_DEBUG=9 TPORT_TEST_HOST=0.0.0.0 make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+doc() {
+	default_doc
+	make doxygen
+}
+sha512sums="
+356577d415d6dc4191f0f49f7fa1d6f33fafdb9e455556f83e091159055a215fc1ebfa9c7dc23b5f5e533b85e23afa7b1444170419fdf137aeb2ea048de77e08  sofia-sip-1.13.17.tar.gz
+e79ba6dbc742e0dba9bb7364cf78cf192950900c139f74a59dd4e1713e97d947959a4d4987c06d29fadfd9e7dd0f970389ba640756a88e80f3093d697396a1e4  Support-forking-SIP-calls.patch
+"
diff --git a/main/sofia-sip/Support-forking-SIP-calls.patch b/main/sofia-sip/Support-forking-SIP-calls.patch
new file mode 100644
index 00000000000..b2e785f1ebe
--- /dev/null
+++ b/main/sofia-sip/Support-forking-SIP-calls.patch
@@ -0,0 +1,186 @@
+From 5cdc3a4866bf6e09c10a3cb18581ae32f6e42be1 Mon Sep 17 00:00:00 2001
+From: Alex Dowad <alexinbeijing@gmail.com>
+Date: Fri, 11 Aug 2023 16:00:49 +0200
+Subject: [PATCH] Support forking SIP calls
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When a SIP call is forked, the client will send an INVITE with the
+same Call ID and same From tag as an earlier INVITE, but with a
+different Branch ID in the topmost Via header.
+
+There were two issues with sofia-sip which prevented call forking from
+working; first, its logic for merging SIP requests (as per RFC3261
+section 8.2.2.2) did not respect the Branch ID. It would merge requests
+with a different Branch ID, which is contrary to RFC3261 section 17.2.3.
+
+Second, sofia-sip has some logic for checking whether incoming requests
+are part of an established SIP dialog or not. The matching criteria
+were such that incoming INVITE requests forking a call would be
+treated as part of the already established dialog, and then an error
+would be returned to the client, essentially telling the client that
+this new INVITE is invalid because the call is already established.
+
+Therefore, add some extra matching conditions which ensure that an
+INVITE forking a call will not be treated as part of the previously
+established call leg. The matching conditions are as specific as
+possible, to minimize the chances of unintentionally affecting how
+other types of SIP messages are handled.
+
+Implementing these new matching conditions can only be done by
+recording the Branch ID for established calls, so we can check whether
+another INVITE which comes later has the same Branch ID or a different
+one. This requires adding a new member to nta_leg_s.
+
+Co-Authored-By: João Arruda <joao.arruda@gmail.com>
+---
+ libsofia-sip-ua/nta/nta.c       | 49 +++++++++++++++++++++++++--------
+ libsofia-sip-ua/nua/nua_stack.c |  1 +
+ 2 files changed, 39 insertions(+), 11 deletions(-)
+
+diff --git a/libsofia-sip-ua/nta/nta.c b/libsofia-sip-ua/nta/nta.c
+index 773d2fa1..8b23bbad 100644
+--- a/libsofia-sip-ua/nta/nta.c
++++ b/libsofia-sip-ua/nta/nta.c
+@@ -399,6 +399,7 @@ struct nta_leg_s
+ 
+   url_t const      *leg_url;	/**< Match incoming requests. */
+   char const       *leg_method;	/**< Match incoming requests. */
++  char const       *leg_branch_id; /**< Match incoming INVITE to identify forked calls */
+ 
+   uint32_t	    leg_seq;    /**< Sequence number for next transaction */
+   uint32_t	    leg_rseq;   /**< Remote sequence number */
+@@ -685,7 +686,8 @@ static nta_leg_t *leg_find(nta_agent_t const *sa,
+ 			   url_t const *request_uri,
+ 			   sip_call_id_t const *i,
+ 			   char const *from_tag,
+-			   char const *to_tag);
++			   char const *to_tag,
++			   char const *branch_id);
+ static nta_leg_t *dst_find(nta_agent_t const *sa, url_t const *u0,
+ 			   char const *method);
+ static void leg_recv(nta_leg_t *, msg_t *, sip_t *, tport_t *);
+@@ -3134,7 +3136,8 @@ void agent_recv_request(nta_agent_t *agent,
+ 		      method_name, url,
+ 		      sip->sip_call_id,
+ 		      sip->sip_from->a_tag,
+-		      sip->sip_to->a_tag))) {
++		      sip->sip_to->a_tag,
++		      sip->sip_via ? sip->sip_via->v_branch : NULL))) {
+     /* Try existing dialog */
+     SU_DEBUG_5(("nta: %s (%u) %s\n",
+ 		method_name, cseq, "going to existing leg"));
+@@ -4316,6 +4319,7 @@ nta_leg_t *nta_leg_tcreate(nta_agent_t *agent,
+   su_home_t *home;
+   url_t *url;
+   char const *what = NULL;
++  sip_via_t *via = NULL;
+ 
+   if (agent == NULL)
+     return su_seterrno(EINVAL), NULL;
+@@ -4333,6 +4337,7 @@ nta_leg_t *nta_leg_tcreate(nta_agent_t *agent,
+ 	  SIPTAG_TO_REF(to),
+ 	  SIPTAG_TO_STR_REF(to_str),
+ 	  SIPTAG_ROUTE_REF(route),
++	  SIPTAG_VIA_REF(via),
+ 	  NTATAG_TARGET_REF(contact),
+ 	  NTATAG_REMOTE_CSEQ_REF(rseq),
+ 	  SIPTAG_CSEQ_REF(cs),
+@@ -4353,6 +4358,13 @@ nta_leg_t *nta_leg_tcreate(nta_agent_t *agent,
+     return NULL;
+   home = leg->leg_home;
+ 
++  if (via) {
++    SU_DEBUG_9(("nta_leg_tcreate(): setting branch ID to: %s\n", via->v_branch));
++    leg->leg_branch_id = su_strdup(home, via->v_branch);
++  } else {
++    leg->leg_branch_id = NULL;
++  }
++
+   leg->leg_agent = agent;
+   nta_leg_bind(leg, callback, magic);
+ 
+@@ -4821,12 +4833,12 @@ nta_leg_by_replaces(nta_agent_t *sa, sip_replaces_t const *rp)
+ 
+     id->i_hash = msg_hash_string(id->i_id = rp->rp_call_id);
+ 
+-    leg = leg_find(sa, NULL, NULL, id, from_tag, to_tag);
++    leg = leg_find(sa, NULL, NULL, id, from_tag, to_tag, NULL);
+ 
+     if (leg == NULL && strcmp(from_tag, "0") == 0)
+-      leg = leg_find(sa, NULL, NULL, id, NULL, to_tag);
++      leg = leg_find(sa, NULL, NULL, id, NULL, to_tag, NULL);
+     if (leg == NULL && strcmp(to_tag, "0") == 0)
+-      leg = leg_find(sa, NULL, NULL, id, from_tag, NULL);
++      leg = leg_find(sa, NULL, NULL, id, from_tag, NULL, NULL);
+   }
+ 
+   return leg;
+@@ -5054,7 +5066,8 @@ nta_leg_t *nta_leg_by_dialog(nta_agent_t const *agent,
+ 		 NULL, url,
+ 		 call_id,
+ 		 remote_tag,
+-		 local_tag);
++		 local_tag,
++		 NULL);
+ 
+   if (to_be_freed) su_free(NULL, to_be_freed);
+ 
+@@ -5073,7 +5086,8 @@ nta_leg_t *leg_find(nta_agent_t const *sa,
+ 		    url_t const *request_uri,
+ 		    sip_call_id_t const *i,
+ 		    char const *from_tag,
+-		    char const *to_tag)
++		    char const *to_tag,
++		    char const *branch_id)
+ {
+   hash_value_t hash = i->i_hash;
+   leg_htable_t const *lht = sa->sa_dialogs;
+@@ -5123,6 +5137,13 @@ nta_leg_t *leg_find(nta_agent_t const *sa,
+     if (leg_method && method_name && !su_casematch(method_name, leg_method))
+       continue;
+ 
++    /* Do not match if incoming INVITE To header has no tag AND the topmost Via
++     * Header branch ID in the incoming is different from the existing leg
++     * (this means it's a call being forked)
++     */
++    if (!to_tag && su_casematch(method_name, "INVITE") && branch_id && leg->leg_branch_id && !su_casematch(branch_id, leg->leg_branch_id))
++      continue;
++
+     /* Perfect match if both local and To have tag
+      * or local does not have tag.
+      */
+@@ -6238,10 +6259,16 @@ static nta_incoming_t *incoming_find(nta_agent_t const *agent,
+ 
+     /* RFC3261 - section 8.2.2.2 Merged Requests */
+     if (return_merge) {
+-      if (irq->irq_cseq->cs_method == cseq->cs_method &&
+-	  strcmp(irq->irq_cseq->cs_method_name,
+-		 cseq->cs_method_name) == 0)
+-	*return_merge = irq, return_merge = NULL;
++      /* RFC3261 - section 17.2.3 Matching Requests to Server Transactions */
++      if (irq->irq_via->v_branch &&
++	  su_casematch(irq->irq_via->v_branch, v->v_branch) &&
++	  su_casematch(irq->irq_via->v_host, v->v_host) &&
++	  su_strmatch(irq->irq_via->v_port, v->v_port)) {
++        if (irq->irq_cseq->cs_method == cseq->cs_method &&
++	    strcmp(irq->irq_cseq->cs_method_name,
++		   cseq->cs_method_name) == 0)
++	  *return_merge = irq, return_merge = NULL;
++      }
+     }
+   }
+ 
+diff --git a/libsofia-sip-ua/nua/nua_stack.c b/libsofia-sip-ua/nua/nua_stack.c
+index 2e4dacba..ddbea532 100644
+--- a/libsofia-sip-ua/nua/nua_stack.c
++++ b/libsofia-sip-ua/nua/nua_stack.c
+@@ -1084,6 +1084,7 @@ nua_handle_t *nua_stack_incoming_handle(nua_t *nua,
+ 				 SIPTAG_CALL_ID(sip->sip_call_id),
+ 				 SIPTAG_FROM(sip->sip_to),
+ 				 SIPTAG_TO(sip->sip_from),
++				 SIPTAG_VIA(sip->sip_via),
+ 				 NTATAG_REMOTE_CSEQ(sip->sip_cseq->cs_seq),
+ 				 TAG_END());
+ 
diff --git a/main/softhsm/APKBUILD b/main/softhsm/APKBUILD
index 6c3d6adcd7a..60207bcc8c4 100644
--- a/main/softhsm/APKBUILD
+++ b/main/softhsm/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Frank Felhoffer <silveraid@hackme.ca>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=softhsm
-pkgver=2.6.0
-pkgrel=0
+pkgver=2.6.1
+pkgrel=4
 pkgdesc="cryptographic store accessible through a PKCS #11"
 url="https://www.opendnssec.org/softhsm/"
 arch="all"
@@ -13,6 +13,13 @@ makedepends="autoconf automake botan-dev libtool p11-kit-dev sqlite-dev"
 subpackages="$pkgname-doc"
 source="https://dist.opendnssec.org/source/softhsm-$pkgver.tar.gz
 	"
+options="!check"  # hangs on the builders
+
+prepare() {
+ 	default_prepare
+	update_config_guess
+	update_config_sub
+}
 
 build() {
 	./configure \
@@ -35,4 +42,4 @@ package() {
 	make -j1 DESTDIR="$pkgdir/" install
 }
 
-sha512sums="9d70fd05817a9ea4b0c8acad5f9f2a33ce38115414e84e5f43ec433a6f07440ea29c3b81ae5150ee7f324080c4603951406fa22052f4b6dbcc0c4e5cfd3e1723  softhsm-2.6.0.tar.gz"
+sha512sums="e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb  softhsm-2.6.1.tar.gz"
diff --git a/main/source-highlight/APKBUILD b/main/source-highlight/APKBUILD
new file mode 100644
index 00000000000..fe28b5a17bf
--- /dev/null
+++ b/main/source-highlight/APKBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=source-highlight
+pkgver=3.1.9
+pkgrel=11
+pkgdesc="Produces a document with syntax highlighting"
+url="https://www.gnu.org/software/src-highlite/"
+arch="all"
+license="GPL-3.0-or-later"
+depends_dev="boost-dev"
+makedepends="bison flex $depends_dev"
+checkdepends="diffutils"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://ftp.gnu.org/gnu/src-highlite/source-highlight-$pkgver.tar.gz
+	gcc11.patch
+	gcc12.patch
+	"
+
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--disable-static
+	make
+}
+
+check() {
+	make -j1 check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="
+d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195  source-highlight-3.1.9.tar.gz
+91b009a754648a32a6332ffcac99853f12bd3b88a462b524180bfd366d736fac79570401599ca67c820117768aea781c96931c730f6fe757a471cf83f1110eb7  gcc11.patch
+1348aa9eaf4167b65e197b82e7e21897e4a0290181a08999450dcac7a060f589fa9b644ecb7786a654f2fba216d2cab405955f506ab7da96ac1ff36f2b641156  gcc12.patch
+"
diff --git a/main/source-highlight/gcc11.patch b/main/source-highlight/gcc11.patch
new file mode 100644
index 00000000000..278e3c1d473
--- /dev/null
+++ b/main/source-highlight/gcc11.patch
@@ -0,0 +1,35 @@
+Patch-Source: https://github.com/archlinux/svntogit-packages/blob/6594be43e84dfa33f9fcf2b2c51f0ab13e89b710/trunk/source-highlight-gcc11.patch
+From 904949c9026cb772dc93fbe0947a252ef47127f4 Mon Sep 17 00:00:00 2001
+From: Tom Tromey <tom@tromey.com>
+Date: Wed, 10 Jun 2020 20:38:27 -0600
+Subject: Remove "throw" specifications
+
+diff --git a/lib/srchilite/fileutil.cc b/lib/srchilite/fileutil.cc
+index 59a6d64..963178c 100644
+--- a/lib/srchilite/fileutil.cc
++++ b/lib/srchilite/fileutil.cc
+@@ -48,7 +48,7 @@ void set_file_util_verbose(bool b) {
+ // FIXME avoid using a global variable
+ std::string start_path;
+ 
+-string readFile(const string &fileName) throw (IOException) {
++string readFile(const string &fileName) {
+     ifstream file(fileName.c_str());
+ 
+     if (!file.is_open()) {
+diff --git a/lib/srchilite/fileutil.h b/lib/srchilite/fileutil.h
+index 7335a9b..042eb56 100644
+--- a/lib/srchilite/fileutil.h
++++ b/lib/srchilite/fileutil.h
+@@ -27,7 +27,7 @@ extern std::string start_path;
+  * @return the contents of the file
+  * @throw IOException
+  */
+-string readFile(const string &fileName) throw (IOException);
++string readFile(const string &fileName);
+ 
+ //char *read_file(const string &fileName);
+ 
+-- 
+cgit v1.2.1
+
diff --git a/main/source-highlight/gcc12.patch b/main/source-highlight/gcc12.patch
new file mode 100644
index 00000000000..b062f5df057
--- /dev/null
+++ b/main/source-highlight/gcc12.patch
@@ -0,0 +1,82 @@
+Patch-Source: https://git.savannah.gnu.org/cgit/src-highlite.git/commit/?id=ab9fe5cb9b85c5afab94f2a7f4b6d7d473c14ee9
+From ab9fe5cb9b85c5afab94f2a7f4b6d7d473c14ee9 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Mon, 8 Nov 2021 23:30:42 +0000
+Subject: Fix tests build failure on clang and gcc-12
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Both gcc-12 and clang can't find ostream<<(..., std::pair<...>)
+overload when compile lib/tests/test_wordtokenizer_main.cpp and
+fail as:
+
+  ./../srchilite/tostringcollection.h:103:9:
+    error no match for «operator<<» (operand types are «std::ostringstream»
+      {aka «std::__cxx11::basic_ostringstream<char>»}
+      and «const std::pair<std::__cxx11::basic_string<char>,
+                           std::__cxx11::basic_string<char> >»)
+      103 |     buf << (*it);
+          |     ~~~~^~~~~~~~
+
+We fix it by placing overload to std namespace where std::pair<...>
+is defined to make ADL work predictably.
+
+clang also has a trouble compiling lib/tests/stdboosterror.h as:
+
+    ./stdboosterror.h:7:72: error: parameter declarator cannot be qualified
+            std_boost_exception(boost::regex_error(boost::regex_constants::error_bad_pattern));
+                                                   ~~~~~~~~~~~~~~~~~~~~~~~~^
+
+gcc compiles it by accident: https://gcc.gnu.org/PR86564
+
+Let's disambiguate syntax by making it an explicit constructor call.
+---
+ lib/tests/stdboosterror.h             |  2 +-
+ lib/tests/test_wordtokenizer_main.cpp | 10 ++++++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/lib/tests/stdboosterror.h b/lib/tests/stdboosterror.h
+index 568545b..d59bfa6 100644
+--- a/lib/tests/stdboosterror.h
++++ b/lib/tests/stdboosterror.h
+@@ -4,7 +4,7 @@
+ #include <boost/regex/pattern_except.hpp>
+ 
+ static boost::regex_error
+-        std_boost_exception(boost::regex_error(boost::regex_constants::error_bad_pattern));
++        std_boost_exception = boost::regex_error(boost::regex_constants::error_bad_pattern);
+ 
+ /**
+  * returns the string representing a standard exception (which
+diff --git a/lib/tests/test_wordtokenizer_main.cpp b/lib/tests/test_wordtokenizer_main.cpp
+index 40e23b1..11ba389 100644
+--- a/lib/tests/test_wordtokenizer_main.cpp
++++ b/lib/tests/test_wordtokenizer_main.cpp
+@@ -11,6 +11,14 @@
+ using namespace std;
+ using namespace srchilite;
+ 
++/*
++ * We have to use 'std' namespaces because 'WordTokenizer::WordTokenizerResults::value_type'
++ * is an std::pair<std::string, std::string> in disguise. We have to place 'operator<<()'
++ * into the same namespace for ADL to work. Otherwise gcc-12 or clang-13 can't find the
++ * overload.
++ */
++namespace std {
++
+ static ostream &operator <<(ostream &os, const WordTokenizer::WordTokenizerResults::value_type &);
+ 
+ ostream &operator <<(ostream &os, const WordTokenizer::WordTokenizerResults::value_type &token) {
+@@ -23,6 +31,8 @@ ostream &operator <<(ostream &os, const WordTokenizer::WordTokenizerResults::val
+     return os;
+ }
+ 
++}
++
+ int main() {
+     WordTokenizer::WordTokenizerResults tokens;
+ 
+-- 
+cgit v1.1
+
diff --git a/main/spamassassin/APKBUILD b/main/spamassassin/APKBUILD
index c0f8c833656..9c9dd346103 100644
--- a/main/spamassassin/APKBUILD
+++ b/main/spamassassin/APKBUILD
@@ -1,29 +1,37 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Maintainer:  Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=spamassassin
 _pkgreal=Mail-SpamAssassin
-pkgver=3.4.4
-pkgrel=0
+pkgver=3.4.6
+pkgrel=7
 pkgdesc="The Powerful #1 Open-Source Spam Filter"
 url="https://metacpan.org/pod/Mail::SpamAssassin"
 arch="all"
 license="Apache-2.0"
-cpandepends="perl-html-parser perl-digest-sha1 perl-netaddr-ip perl-net-dns perl-mail-dkim
-	perl-mime-base64 perl-db_file perl-time-hires perl-libwww perl gnupg"
-cpanmakedepends="$cpandepends"
+_perl_depends="perl-html-parser perl-digest-sha1 perl-netaddr-ip perl-net-dns perl-mail-dkim
+	perl-mime-base64 perl-time-hires perl-libwww perl gpg"
 depends="perl-mail-$pkgname curl"
-makedepends="perl-dev $cpanmakedepends re2c"
-subpackages="$pkgname-doc $pkgname-client $pkgname-compiler perl-mail-$pkgname:cpan"
-source="https://cpan.metacpan.org/authors/id/K/KM/KMCGRAIL/${_pkgreal#*-}/$_pkgreal-$pkgver.tar.gz
+makedepends="perl-dev $_perl_depends re2c"
+subpackages="
+	$pkgname-doc
+	$pkgname-client
+	$pkgname-compiler
+	$pkgname-openrc
+	perl-mail-$pkgname:cpan:noarch
+	"
+source="https://cpan.metacpan.org/authors/id/S/SI/SIDNEY/Mail-SpamAssassin-$pkgver.tar.gz
 	spamd.initd
 	spamd.confd
 	spamd.crond
 	Mail-SpamAssassin.patch
 	fix-test.patch
+	taint.patch
 	"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 # secfixes:
+#   3.4.5-r0:
+#     - CVE-2020-1946
 #   3.4.4-r0:
 #     - CVE-2020-1930
 #     - CVE-2020-1931
@@ -37,20 +45,17 @@ builddir="$srcdir/$_pkgreal-$pkgver"
 #     - CVE-2018-11781
 
 build() {
-	cd "$builddir"
 	rm t/dnsbl_subtests.t
-	export CFLAGS="$(perl -MConfig -E 'say $Config{ccflags}')"
+	export CFLAGS="$CFLAGS $(perl -MConfig -E 'say $Config{ccflags}')"
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 	install -Dm755 "$srcdir"/spamd.crond "$pkgdir"/etc/periodic/daily/$pkgname-update
@@ -76,19 +81,21 @@ compiler() {
 
 cpan() {
 	pkgdesc="SpamAssassin perl library"
-	depends="$cpandepends"
+	depends="$_perl_depends"
 	mkdir -p "$subpkgdir"/usr "$subpkgdir"/etc "$subpkgdir"/var/lib/$pkgname
 	mv "$pkgdir"/etc/mail "$subpkgdir"/etc
 	mv "$pkgdir"/usr/lib "$pkgdir"/usr/share "$subpkgdir"/usr
-	find "$subpkgdir" -name *.pod -delete
 	mv "$subpkgdir"/usr/share/$pkgname/user_prefs.template \
 		"$subpkgdir"/etc/mail/$pkgname/user_prefs
 	sed -i '/^#\*/d' "$subpkgdir"/etc/mail/$pkgname/user_prefs
 }
 
-sha512sums="b6efa1c733ddf810b189ec69445faeae6488ee2671f87f56b49ec3bf85690bf7950aa5ce251c1f1371b2bbe4fb88dbce0a162c9a24a48ed5e6584f9019611552  Mail-SpamAssassin-3.4.4.tar.gz
+sha512sums="
+7910852f04463a7363a2fc3b70a35adadf5714552e57c5b8ca57beaa534ee18d9f06526cdbcf8bcd5781e5ca778f98d2f84ef2efd1872fa550cfe1689440364a  Mail-SpamAssassin-3.4.6.tar.gz
 0a22933290a3abd147689bf3a9de4b6b277628c22966f353c5da932cd98560babf1d0bb9d92c456ea24decfb5af0bbc960192d29a90d9cab437e7986c75c8278  spamd.initd
 274d3aa0d9aab05e83c8d5ad3e93a457649360021a67c8cb19088365bed681ebe26889cfa86f8c46a6044c7ee969231f2a71e3227adf8ad9e38d0286b9caf48d  spamd.confd
-e0bbdb21020f4b4e5b11fb3ec18ad7e496fa4521d24275d806db96fc91cde3c0b8e8c8215e51b18903bf5916de74e9e2584fe7f62a9ec7da2f185641e533916d  spamd.crond
+2ad52adfb6eb2ab28d59311853572ef4c5858e5b3cee1b8ff8c16f1d605e537e823746376bf468b6f041d953f24d5592940686024bc91153d5ec886d65fd16b3  spamd.crond
 66a6daa7e9898864497e7d8e17efc6094aabc5a9a94afbc7da08acf4cf2430fad2cb0128b8db4be637f5dcabe3fa9f03490f9d7cbba3c1cc02b7824f63cd0965  Mail-SpamAssassin.patch
-6eda2d1073bcf999a976de3e4e2c928a044d46962ce1a4f169078bfc017fb7d0f39d2fc78b17734c2d936649b34638abed3cf9ebeb51614531134289eb23afa6  fix-test.patch"
+6eda2d1073bcf999a976de3e4e2c928a044d46962ce1a4f169078bfc017fb7d0f39d2fc78b17734c2d936649b34638abed3cf9ebeb51614531134289eb23afa6  fix-test.patch
+a2d0625b2224641abd338879044f7dcb4c47d09cbc6318c978b88e70e40d0129a7d68e97458ea2d23afcc465f99805a6359153d09e9fc9da881de31ad7a27c4a  taint.patch
+"
diff --git a/main/spamassassin/spamd.crond b/main/spamassassin/spamd.crond
index 9c1a6cd3bfa..7e281536234 100644..100755
--- a/main/spamassassin/spamd.crond
+++ b/main/spamassassin/spamd.crond
@@ -2,13 +2,25 @@
 
 set -e
 
-. /etc/conf.d/spamd
+if [ -f /etc/conf.d/spamd ]; then
+    . /etc/conf.d/spamd
+fi
 pidfile="${pidfile:-/run/spamd.pid}"
 
 if [ -f "$pidfile" ]; then
 	_pid="$(cat "$pidfile")"
 fi
-/usr/bin/sa-update
+/usr/bin/sa-update && R=0 || R=$?
+case "$R" in
+0)
+	;;
+1)
+	# "No fresh updates were available"; see sa-update(1)
+	exit 0
+	;;
+*)
+	exit $R
+esac
 if [ -n "$_pid" ]; then
 	kill -SIGHUP "$_pid"
 fi
diff --git a/main/spamassassin/taint.patch b/main/spamassassin/taint.patch
new file mode 100644
index 00000000000..c5a2c1cc5a5
--- /dev/null
+++ b/main/spamassassin/taint.patch
@@ -0,0 +1,27 @@
+--- a/t/SATest.pm
++++ b/t/SATest.pm
+@@ -58,7 +58,7 @@
+   };
+ 
+   # Clean PATH so taint doesn't complain
+-  $ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin';
++  $ENV{'PATH'} = '/bin:/usr/bin';
+   # Remove tainted envs, at least ENV used in FreeBSD
+   delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
+ }
+--- a/t/config_tree_recurse.t
++++ b/t/config_tree_recurse.t
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -T
++#!/usr/bin/perl
+ #
+ # Test that config_tree_recurse works ok in taint mode; bug 6019
+ 
+--- a/t/spamd_utf8.t
++++ b/t/spamd_utf8.t
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -T
++#!/usr/bin/perl
+ 
+ use lib '.'; use lib 't';
+ use SATest; sa_t_init("spamd_utf8");
diff --git a/main/spandsp/APKBUILD b/main/spandsp/APKBUILD
index 7447f74bf34..ef6c36ae16d 100644
--- a/main/spandsp/APKBUILD
+++ b/main/spandsp/APKBUILD
@@ -1,26 +1,25 @@
 # Contributor: Carlo Landmeter
-# Maintainer:  Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=spandsp
 pkgver=0.0.6
 _ver=${pkgver/_/}
-pkgrel=1
+pkgrel=5
 pkgdesc="SpanDSP is a library of DSP functions for telephony"
 url="https://www.soft-switch.org/installing-spandsp.html"
 arch="all"
 license="LGPL-2.1-only"
 makedepends="tiff-dev"
 subpackages="$pkgname-dev"
-source="http://deb.debian.org/debian/pool/main/s/spandsp/spandsp_$pkgver+dfsg.orig.tar.xz"
+source="https://deb.debian.org/debian/pool/main/s/spandsp/spandsp_$pkgver+dfsg.orig.tar.xz"
 builddir="$srcdir"/$pkgname-$pkgver+dfsg
+options="!check"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,7 +31,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
diff --git a/main/spandsp3/APKBUILD b/main/spandsp3/APKBUILD
new file mode 100644
index 00000000000..5ebce5b2c96
--- /dev/null
+++ b/main/spandsp3/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
+pkgname=spandsp3
+pkgver=0_git20201102
+pkgrel=3
+pkgdesc="SpanDSP is a library of DSP functions for telephony"
+url="https://www.soft-switch.org/installing-spandsp.html"
+arch="all"
+license="LGPL-2.1-only"
+makedepends="autoconf automake libtool m4
+util-linux tiff-dev jpeg-dev libxslt-dev"
+subpackages="$pkgname-dev"
+_commit=6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6
+source="$pkgname-$pkgver.tar.gz::https://github.com/freeswitch/spandsp/archive/$_commit.tar.gz"
+builddir="$srcdir"/spandsp-$_commit
+
+prepare() {
+	default_prepare
+	sh bootstrap.sh
+}
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make -j1 DESTDIR="$pkgdir" install
+}
+
+sha512sums="f8d3dd97158a235325c7ef78a7e0c8c56ee726ba0dfc68fe96a1f17603a491fed89088e18a6c43c37a8ecb062d80e4bb9d3fe308994e66870055ed81959ff77b  spandsp3-0_git20201102.tar.gz"
diff --git a/main/spawn-fcgi/APKBUILD b/main/spawn-fcgi/APKBUILD
index 7452809d193..1ba254b503a 100644
--- a/main/spawn-fcgi/APKBUILD
+++ b/main/spawn-fcgi/APKBUILD
@@ -1,35 +1,33 @@
-# Maintainer:
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 # Contributor: Eivind Uggedal <eu@eju.no>
 pkgname=spawn-fcgi
-pkgver=1.6.4
-pkgrel=3
+pkgver=1.6.5
+pkgrel=4
 pkgdesc="Spawn FastCGI applications"
-url="http://redmine.lighttpd.net/projects/spawn-fcgi/"
+url="https://redmine.lighttpd.net/projects/spawn-fcgi/"
 arch="all"
-license="BSD"
-depends=""
-makedepends=""
-subpackages="$pkgname-doc"
-source="https://www.lighttpd.net/download/$pkgname-$pkgver.tar.bz2
+license="BSD-3-Clause"
+subpackages="$pkgname-doc $pkgname-openrc"
+source="https://download.lighttpd.net/spawn-fcgi/releases-${pkgver%.*}.x/spawn-fcgi-$pkgver.tar.xz
 	$pkgname.confd
 	$pkgname.initd
 	"
-builddir="$srcdir/$pkgname-$pkgver"
+options="!check"
 
 build() {
-	cd "$builddir"
 	./configure --prefix=/usr
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
-sha512sums="defe3b0e21952f6a852237f4677b446757bd0dbccc6609beb2094c59b12de7814a76525554731ad3b52d10060bb0b4060b4f5c4fc3e14cd35f59c30cc583b6b9  spawn-fcgi-1.6.4.tar.bz2
+sha512sums="
+a6dc2a977953e1092c0b6808b134dfda77869a5c86801d04cfe9e00ee1dcd528d4e2c3adc906f6b6130d6f2cdafd436ba550197701c8b27bbc5a8419e02d269c  spawn-fcgi-1.6.5.tar.xz
 44fdc908b868d890713b1eee8f8f5a7ff1a26d0665aa368e76587d479934bbda0a3e4ccd53953fef524103630261c40495cd58963fdea11a47e2cd0f23e1dcf6  spawn-fcgi.confd
-c6b44dbdac2ac53d7c26acfa1d433dd81d12fce35e9ba0c7d1341e5da16c6453fdd65de073b22a091b425799b01f08385b3293e33f505d4c26764826e5ab9084  spawn-fcgi.initd"
+c6b44dbdac2ac53d7c26acfa1d433dd81d12fce35e9ba0c7d1341e5da16c6453fdd65de073b22a091b425799b01f08385b3293e33f505d4c26764826e5ab9084  spawn-fcgi.initd
+"
diff --git a/main/speedtest-cli/APKBUILD b/main/speedtest-cli/APKBUILD
deleted file mode 100644
index 31fa952742e..00000000000
--- a/main/speedtest-cli/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Francesco Colista <fcolista@alpinelinux.org>
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname=speedtest-cli
-pkgver=2.1.2
-pkgrel=1
-pkgdesc="Command line interface for testing internet bandwidth using speedtest.net"
-url="https://github.com/sivel/speedtest-cli"
-arch="noarch"
-license="Apache-2.0"
-depends="python3"
-makedepends="py3-setuptools"
-source="$pkgname-$pkgver.tar.gz::https://github.com/sivel/speedtest-cli/archive/v$pkgver.tar.gz"
-
-build() {
-	python3 setup.py build
-}
-
-check() {
-	python3 setup.py check
-}
-
-package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-	install -Dm755 speedtest.py "$pkgdir"/usr/bin/speedtest-cli
-}
-
-sha512sums="f2eb125116f42075d3248e1c0590cce4f822f383ff7c54c158504b16de72bf35b35d55a78014413a95a5f5bafa98c71c3ea011f20f480f1db272d6e8800c40bd  speedtest-cli-2.1.2.tar.gz"
diff --git a/main/speex/APKBUILD b/main/speex/APKBUILD
index 4170301f236..eb210102dc8 100644
--- a/main/speex/APKBUILD
+++ b/main/speex/APKBUILD
@@ -1,21 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=speex
-pkgver=1.2.0
-pkgrel=0
+pkgver=1.2.1
+pkgrel=2
 pkgdesc="an audio compression format designed for speech"
 url="https://www.speex.org/"
 arch="all"
 options="!check"  # Test suite is for Win32 only.
 license="BSD-3-Clause"
-depends=
-makedepends="libogg-dev speexdsp-dev"
-install=
+makedepends="autoconf automake libtool libogg-dev speexdsp-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
-source="http://downloads.us.xiph.org/releases/speex/speex-$pkgver.tar.gz"
+source="https://gitlab.xiph.org/xiph/speex/-/archive/Speex-$pkgver/speex-Speex-$pkgver.tar.bz2"
+builddir="$srcdir/$pkgname-Speex-$pkgver"
+
+prepare() {
+	default_prepare
+	autoreconf -vif
+}
 
-builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,14 +31,14 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
 tools() {
 	pkgdesc="$pkgdesc - command line tools"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+	amove usr/bin
 }
 
-sha512sums="7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b  speex-1.2.0.tar.gz"
+sha512sums="
+f2d87681e082e44c4afdd04f7f3f11b5bff5c4216f6921a4dfcc244695451d01059a8c6c9916a818fe10330a8cb9976419befbb61b52536f3182871d800850ea  speex-Speex-1.2.1.tar.bz2
+"
diff --git a/main/speexdsp/APKBUILD b/main/speexdsp/APKBUILD
index f54c4caf859..a515568641d 100644
--- a/main/speexdsp/APKBUILD
+++ b/main/speexdsp/APKBUILD
@@ -1,30 +1,24 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=speexdsp
-pkgver=1.2.0
-pkgrel=0
+pkgver=1.2.1
+pkgrel=2
 pkgdesc="A voice compression format (DSP)"
 url="https://www.speex.org/"
 arch="all"
 options="!check"  # No test suite.
 license="BSD-3-Clause"
-depends=
 makedepends="autoconf automake libtool"
-install=
 subpackages="$pkgname-dev $pkgname-doc"
 replaces="libspeex"
-source="https://downloads.xiph.org/releases/speex/speexdsp-$pkgver.tar.gz"
+source="https://gitlab.xiph.org/xiph/speexdsp/-/archive/SpeexDSP-$pkgver/speexdsp-SpeexDSP-$pkgver.tar.bz2"
+builddir="$srcdir/speexdsp-SpeexDSP-$pkgver"
 
-builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$builddir"
 	default_prepare
 	autoreconf -vif
 }
 
 build() {
-	local _neon
-	cd "$builddir"
-	[ "$CARCH" = "aarch64" ] && _neon="--disable-neon"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,14 +26,14 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-static \
-		$_neon
+		--disable-static
 	make
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
-sha512sums="e357cd5377415ea66c862302c7cf8bf6a10063cacd903f0846478975b87974cf5bdf00e2c6759d8f4f453c4c869cf284e9dc948a84a83d7b2ab96bd5405c05ec  speexdsp-1.2.0.tar.gz"
+sha512sums="
+5b82a87390976cfe1272c896a6a29b6b7eacd0b747adf707e7286b9c5612d486686e24bdb3112e8b6b044f413e7cb9b6a580d0222def87fbbad58c0be49335ba  speexdsp-SpeexDSP-1.2.1.tar.bz2
+"
diff --git a/main/spice-protocol/APKBUILD b/main/spice-protocol/APKBUILD
index cfb7eac6815..a920128ecaf 100644
--- a/main/spice-protocol/APKBUILD
+++ b/main/spice-protocol/APKBUILD
@@ -1,27 +1,25 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=spice-protocol
-pkgver=0.14.1
-pkgrel=0
+pkgver=0.14.4
+pkgrel=1
 pkgdesc="Spice protocol header files"
 url="http://www.spice-space.org/"
 arch="noarch"
-license="BSD-3-Clause LGPL-2.1-or-later"
+license="BSD-3-Clause AND LGPL-2.1-or-later"
 options="!check" # No test suite
 makedepends="meson"
-source="https://www.spice-space.org/download/releases/spice-protocol-$pkgver.tar.bz2"
+source="https://www.spice-space.org/download/releases/spice-protocol-$pkgver.tar.xz"
 
 build() {
-	meson build/ \
-		--buildtype=plain \
-		--prefix=/usr \
-		--datadir=lib
-
-	ninja -C build/
+	abuild-meson build
+	meson compile -C build/
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C build/ install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C build
 }
 
-sha512sums="88b0e652564a1f826ee6d3c165ab05c40d13f366567db3840805f03d433d13d7f722225219c26759770d2cde33221fe6d97528521d0eb14bc069cd7ce9af8482  spice-protocol-0.14.1.tar.bz2"
+sha512sums="
+c55677fd6da37303487f8245388cbd555715c736e15bca4a305c4374feafc655b74e549ea401949d72e17b2e6ad76f16c5add3963008a18a1fefedd4b4a001c1  spice-protocol-0.14.4.tar.xz
+"
diff --git a/main/spice/APKBUILD b/main/spice/APKBUILD
index 98e6f2fa24a..5daef9f8b4b 100644
--- a/main/spice/APKBUILD
+++ b/main/spice/APKBUILD
@@ -1,36 +1,40 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=spice
-pkgver=0.14.3
-pkgrel=0
+pkgver=0.15.2
+pkgrel=1
 pkgdesc="Implements the SPICE protocol"
 url="http://www.spice-space.org/"
 arch="all"
 license="LGPL-2.0-or-later"
 makedepends="
-	meson
-	spice-protocol
-	glib-dev
+	cyrus-sasl-dev
 	gdk-pixbuf-dev
-	pixman-dev
-	openssl-dev
+	glib-dev
+	gst-plugins-base-dev
+	gstreamer-dev
 	libjpeg-turbo-dev
-	zlib-dev
+	lz4-dev
+	meson
+	openssl-dev>3
 	opus-dev
-	gstreamer-dev
-	gst-plugins-base-dev
 	orc-dev
-	lz4-dev
-	cyrus-sasl-dev
-	py3-six
+	pixman-dev
 	py3-parsing
+	py3-six
+	spice-protocol
+	zlib-dev
 	"
-subpackages="$pkgname-static $pkgname-dev $pkgname-server"
+subpackages="$pkgname-dev"
 source="https://www.spice-space.org/download/releases/spice-server/spice-$pkgver.tar.bz2
 	failing-tests.patch
 	"
 
 # secfixes:
+#   0.15.0-r0:
+#     - CVE-2020-14355
+#   0.14.3-r1:
+#     - CVE-2021-20201
 #   0.14.1-r4:
 #     - CVE-2019-3813
 #   0.14.1-r0:
@@ -42,34 +46,27 @@ source="https://www.spice-space.org/download/releases/spice-server/spice-$pkgver
 #     - CVE-2016-9578
 
 build() {
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--buildtype=plain \
+	abuild-meson \
+		-Db_lto=true \
 		-Dgstreamer=1.0 \
 		-Dlz4=true \
 		-Dsasl=true \
 		-Dopus=enabled \
 		-Dsmartcard=disabled \
 		. output
-	ninja -C output
+	meson compile -C output
 }
 
 check() {
-	ninja -C output test
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C output install
-}
-
-server() {
-	pkgdesc="Server library for SPICE"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*server.so.* "$subpkgdir"/usr/lib/
+	provides="$pkgname-server=$pkgver-r$pkgrel"
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-sha512sums="9ecdc455ff25c71ac1fe6c576654b51efbfb860110bd6828065d23f7462d5c5cac772074d1a40f033386258d970b77275b2007bcfdffb23fdff2137154ea46e4  spice-0.14.3.tar.bz2
-10104feb05ce9d70074cad58efb9772cc8521666ea1c694bedf5c3ecfaa15a755324ac989b94d3be61e69be4286ab8369b900452fe98864596dcbc45d4a896b5  failing-tests.patch"
+sha512sums="
+c8f273b9e97ef38a03b331f7d32c5f0a09d540523fe626568c845152cbd22273a92b3a08bc13fa2e061b913ad16ceb7cbddf142655cd9cdcd8eb5f646fa6aa26  spice-0.15.2.tar.bz2
+4fe7665ba7ef63d92570a870eb74f907e9d68f465e6607de7f16233c1d4cd209f390b3d51e2f9da1dd2365027e0402c042396d049d8e78e1eebdd3f5c56686d5  failing-tests.patch
+"
diff --git a/main/spice/failing-tests.patch b/main/spice/failing-tests.patch
index b78756b7e16..413d7fd387d 100644
--- a/main/spice/failing-tests.patch
+++ b/main/spice/failing-tests.patch
@@ -1,16 +1,26 @@
 diff --git a/server/tests/meson.build b/server/tests/meson.build
-index 09ba0f2..9833746 100644
+index 1ae7d37..e93334e 100644
 --- a/server/tests/meson.build
 +++ b/server/tests/meson.build
-@@ -50,7 +50,6 @@ tests = [
+@@ -42,17 +42,14 @@ tests = [
+   ['test-dispatcher', true, 'cpp'],
+   ['test-options', true],
+   ['test-stat', true],
+-  ['test-agent-msg-filter', true],
+   ['test-loop', true],
+   ['test-qxl-parsing', true, 'cpp'],
+-  ['test-leaks', true],
+   ['test-vdagent', true],
+   ['test-fail-on-null-core-interface', true],
    ['test-empty-success', true],
-   ['test-channel', true],
-   ['test-stream-device', true],
+   ['test-channel', true, 'cpp'],
+   ['test-stream-device', true, 'cpp'],
+   ['test-set-ticket', true],
 -  ['test-listen', true],
    ['test-record', true],
    ['test-display-no-ssl', false],
    ['test-display-streaming', false],
-@@ -60,10 +59,6 @@ tests = [
+@@ -62,10 +59,6 @@ tests = [
    ['test-display-width-stride', false],
  ]
  
@@ -19,5 +29,5 @@ index 09ba0f2..9833746 100644
 -endif
 -
  if spice_server_has_smartcard == true
-   tests += [['test-smartcard', true]]
+   tests += [['test-smartcard', true, 'cpp']]
  endif
diff --git a/main/spirv-headers/APKBUILD b/main/spirv-headers/APKBUILD
index be73507631b..99fadf30ced 100644
--- a/main/spirv-headers/APKBUILD
+++ b/main/spirv-headers/APKBUILD
@@ -1,32 +1,31 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Simon Zeni <simon@bl4ckb0ne.ca>
 pkgname=spirv-headers
 _pkgname=SPIRV-Headers
-pkgver=1.5.1
-pkgrel=5
+pkgver=1.3.261.1
+pkgrel=0
 pkgdesc="Machine-readable files for the SPIR-V Registry"
 options="!check" # No testsuite
 url="https://github.com/KhronosGroup/SPIRV-Headers"
 arch="noarch"
 license="GPL-3.0-or-later"
 makedepends="cmake samurai"
-source="$pkgname-$pkgver.corrected.tar.gz::https://github.com/KhronosGroup/$_pkgname/archive/$pkgver.corrected.tar.gz"
-
-builddir="$srcdir/$_pkgname-$pkgver.corrected"
+source="$pkgname-$pkgver.tar.gz::https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/sdk-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-sdk-$pkgver"
 
 build() {
-	cmake \
-		-GNinja \
+	cmake -B build -G Ninja \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DBUILD_SHARED_LIBS=True \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_INSTALL_LIBDIR=lib \
-		${CMAKE_CROSSOPTS} .
-	ninja
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_INSTALL_LIBDIR=lib
+	cmake --build build
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
-sha512sums="92447b1b1eca6f0253265f36d67b00c0c79e93f6a707e27bd8239bd2f693c468a92b7f7c3bb3fde6bb091383baaff42d3b0bbfeb9ff5f952d8a0b9626b03848e  spirv-headers-1.5.1.corrected.tar.gz"
+sha512sums="
+46d14e993d58e641ec4d2bb96e76f4f2bd8426fb1e33b77e7d053cea80dcf5ffae3d4d6136559d4a66387fba3a4e4a4a74ad5af83445a3be0d171e47414599e1  spirv-headers-1.3.261.1.tar.gz
+"
diff --git a/main/spirv-llvm-translator/APKBUILD b/main/spirv-llvm-translator/APKBUILD
new file mode 100644
index 00000000000..03c827da582
--- /dev/null
+++ b/main/spirv-llvm-translator/APKBUILD
@@ -0,0 +1,65 @@
+# Contributor: Dennis Krupenik <dennis@krupenik.com>
+# Maintainer: Simon Zeni <simon@bl4ckb0ne.ca>
+pkgname=spirv-llvm-translator
+_pkgname=SPIRV-LLVM-Translator
+pkgver=17.0.0
+pkgrel=0
+pkgdesc="Library for bi-directional translation between SPIR-V and LLVM IR"
+url="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+arch="all"
+license="NCSA"
+_llvmver=${pkgver%%.*}
+depends_dev="
+	$pkgname=$pkgver-r$pkgrel
+	llvm$_llvmver-dev
+	spirv-tools-dev
+	"
+makedepends="
+	$depends_dev
+	clang
+	cmake
+	libxml2-dev
+	llvm$_llvmver-static
+	llvm$_llvmver-gtest
+	samurai
+	"
+checkdepends="llvm$_llvmver-test-utils"
+subpackages="$pkgname-dev $pkgname-libs"
+source="https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v$pkgver/$_pkgname-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$pkgver"
+options="!check" # invalid files passed to lit?
+
+case "$CARCH" in
+x86_64) ;;
+# Failing tests
+*) options="!check";;
+esac
+
+build() {
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	CC=clang \
+	CXX=clang++ \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_SHARED_LIBS=True \
+		-DLLVM_SPIRV_INCLUDE_TESTS=1 \
+		-DLLVM_EXTERNAL_LIT=/usr/lib/llvm$_llvmver/bin/lit \
+		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=/usr/include/spirv \
+		$CMAKE_CROSSOPTS
+	cmake --build build
+}
+
+check() {
+	ctest --test-dir build --output-on-failure
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+ee54e597c678755cb48d677f81184d66616c7be934b570e04f0106e64c15f1cab124177b757f08a7713fa7fce981c74d61304d4554e6d198e6c14c53abf1e81c  SPIRV-LLVM-Translator-17.0.0.tar.gz
+"
diff --git a/main/spirv-tools/APKBUILD b/main/spirv-tools/APKBUILD
index c79cb322a16..ded624d43ac 100644
--- a/main/spirv-tools/APKBUILD
+++ b/main/spirv-tools/APKBUILD
@@ -1,45 +1,49 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Leo <thinkabit.ukim@gmail.com>
+# Maintainer: Simon Zeni <simon@bl4ckb0ne.ca>
 pkgname=spirv-tools
 _pkgname=SPIRV-Tools
-pkgver=2020.1
-pkgrel=1
+pkgver=1.3.261.1
+pkgrel=0
 pkgdesc="API and commands for processing SPIR-V modules"
-options="!check" # Requires git checkout of gtest in external/
 url="https://github.com/KhronosGroup/SPIRV-Tools"
 arch="all"
 license="Apache-2.0"
 depends_dev="spirv-headers $pkgname=$pkgver-r$pkgrel"
 makedepends="$depends_dev cmake samurai python3"
-subpackages="$pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/KhronosGroup/$_pkgname/archive/v$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
+subpackages="$pkgname-dev $pkgname-dbg"
+source="$pkgname-$pkgver.tar.gz::https://github.com/KhronosGroup/SPIRV-tools/archive/refs/tags/sdk-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-sdk-$pkgver"
 
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
-	cmake \
-		-GNinja \
+
+	# reduce size of debug syms, lto
+	CXXFLAGS="$CXXFLAGS -g1 -flto=auto" \
+	cmake -B build -G Ninja \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
-		-DBUILD_SHARED_LIBS=True \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DBUILD_SHARED_LIBS=ON \
 		-DSPIRV_WERROR=OFF \
-		-DSPIRV_SKIP_TESTS=ON \
 		-DSPIRV-Headers_SOURCE_DIR=/usr \
-		${CMAKE_CROSSOPTS} .
-	ninja
+		-DSPIRV_TOOLS_BUILD_STATIC=OFF \
+		$CMAKE_CROSSOPTS
+	cmake --build build
 }
 
 check() {
-	ninja check
+	# Not all test are enabled, because they rely on googletest source
+	# folder. While it is easy to add, the (extra) tests then also need
+	# effcee and re2 as well.
+	ctest --test-dir build --output-on-failure
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
-sha512sums="edd434e06cba44c402900684b8fea16c394f80951ff993b3962617a21630d2d8ff9be9a5203bc8eb9b402e9cafe8c68f13099cbc1eaf66a546df08cb43668c46  spirv-tools-2020.1.tar.gz"
+sha512sums="
+cb356885d105083744abf97a88aebd0d3c462eaa9cbb7e556afcab5d574546a2156ef212b91c317767ccd0006b6020a5accc10ffcccb56cadcabadc98af82521  spirv-tools-1.3.261.1.tar.gz
+"
diff --git a/main/sprunge/APKBUILD b/main/sprunge/APKBUILD
index 9b00edf6671..66fc085e643 100644
--- a/main/sprunge/APKBUILD
+++ b/main/sprunge/APKBUILD
@@ -2,17 +2,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sprunge
 pkgver=0.7
-pkgrel=0
+pkgrel=2
 pkgdesc="Helper script to paste things to http://sprunge.us"
 url="http://sprunge.us"
 arch="noarch"
 license="GPL-2.0-only"
 depends="curl"
 subpackages="tpaste dpaste dpaste-de:dpaste_de ix"
+options="!check"
 
 builddir="$srcdir"
 package() {
-	cd "$builddir"
 	mkdir -p "$pkgdir"/usr/bin
 	printf "#!/bin/sh\n\nexec curl -F 'sprunge=<-' http://sprunge.us" > \
 		"$pkgdir"/usr/bin/sprunge
@@ -20,11 +20,10 @@ package() {
 }
 
 tpaste() {
-	cd "$builddir"
-	url="http://tpaste.us"
+	url="https://tpaste.us"
 	pkgdesc="Helper script to paste things to $url"
 	mkdir -p "$subpkgdir"/usr/bin
-	printf "#!/bin/sh\n\nexec curl -F 'tpaste=<-' http://tpaste.us" > \
+	printf "#!/bin/sh\n\nexec curl -F 'tpaste=<-' https://tpaste.us" > \
 		"$subpkgdir"/usr/bin/tpaste
 	chmod 755 "$subpkgdir"/usr/bin/tpaste
 }
@@ -36,27 +35,26 @@ dpaste() {
 
 	printf > dpaste -- '%s\n' \
 		'#!/bin/sh' '' \
-		"exec curl --silent -F 'content=<-' 'http://dpaste.com/api/v2/' | sed -e 's/\$/.txt/'"
+		"exec curl --silent -F 'content=<-' "$url/api/v2/" | sed -e 's/\$/.txt/'"
 	install -Dm 0755 dpaste "$subpkgdir/usr/bin/dpaste"
 }
 
 dpaste_de() {
 	cd "$builddir"
-	url="https://dpaste.de/"
+	url="https://dpaste.de"
 	pkgdesc="Helper script to paste things to $url"
 
 	printf > dpaste-de -- '%s\n' \
 		'#!/bin/sh' '' \
-		"exec curl --silent -F 'format=url' -F 'lexer=_text' -F 'content=<-' 'https://dpaste.de/api/' | sed -e 's,\$,/raw,'"
+		"exec curl --silent -F 'format=url' -F 'lexer=_text' -F 'content=<-' "$url/api/" | sed -e 's,\$,/raw,'"
 	install -Dm 0755 dpaste-de "$subpkgdir/usr/bin/dpaste-de"
 }
 
 ix() {
-	cd "$builddir"
 	url="http://ix.io"
 	pkgdesc="Helper script to paste things to $url"
 	mkdir -p "$subpkgdir"/usr/bin
-	printf "#!/bin/sh\n\nexec curl -F f:1='<-' ix.io/" > \
+	printf "#!/bin/sh\n\nexec curl -F f:1='<-' $url/" > \
 		 "$subpkgdir"/usr/bin/ix
 	chmod 755 "$subpkgdir"/usr/bin/ix
 }
diff --git a/main/sqlite-tcl/APKBUILD b/main/sqlite-tcl/APKBUILD
new file mode 100644
index 00000000000..7136ae14295
--- /dev/null
+++ b/main/sqlite-tcl/APKBUILD
@@ -0,0 +1,72 @@
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Contributor: Łukasz Jendrysik <scadu@yandex.com>
+pkgname=sqlite-tcl
+pkgver=3.45.3
+pkgrel=0
+pkgdesc="Sqlite Tcl Extension Architecture (TEA)"
+url="https://www.sqlite.org/"
+arch="all"
+license="blessing"
+makedepends="readline-dev tcl-dev sqlite-dev libtool autoconf automake"
+subpackages="$pkgname-doc"
+options="!check" # no testsuite from upstream
+
+# compute _ver
+_a=${pkgver%%.*}
+_b=${pkgver#"$_a".}
+_b=${_b%%.*}
+_c=${pkgver#"$_a"."$_b".}
+_c=${_c%%.*}
+case $pkgver in
+	*.*.*.*)_d=${pkgver##*.};;
+	*.*.*)	_d=0;;
+esac
+[ $_b -lt 10 ] && _b=0$_b
+[ $_c -lt 10 ] && _c=0$_c
+[ $_d -lt 10 ] && _d=0$_d
+_ver=${_a}${_b}${_c}$_d
+
+# these variables depend on _ver being set
+source="https://www.sqlite.org/2024/sqlite-autoconf-$_ver.tar.gz
+	include-stdint.patch
+	"
+builddir="$srcdir/sqlite-autoconf-$_ver/tea"
+
+prepare() {
+	default_prepare
+
+	if [ -f "$startdir"/../sqlite/APKBUILD ]; then
+		(
+		_tclver=$pkgver
+		. "$startdir"/../sqlite/APKBUILD
+		if [ "$_tclver" != "$pkgver" ]; then
+			die "sqlite version mismatch ($_tclver != $pkgver)"
+		fi
+		)
+	fi
+}
+
+build() {
+	./configure \
+		--build="$CBUILD" \
+		--host="$CHOST" \
+		--prefix=/usr \
+		--with-system-sqlite \
+		--enable-threads
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	install -Dm644 license.terms \
+		"$pkgdir"/usr/share/licenses/$pkgname/license.terms
+}
+
+sha512sums="
+ab4bb99186ccf81d288bc5150dacd5f8a32561303fbc0c607c24b5bb5ad44e0974655cea57d05122c62e957329f5260d170d2a71cbcf818501af29903c99a391  sqlite-autoconf-3450300.tar.gz
+65d9153a2460832f0a49c07a6306af039cf6c0993df63da62f6d093ac77344605186aa16b29d7c34ffa2f2e6d3d94872af5bad5ca2e2d739a3870b68610fd21a  include-stdint.patch
+"
diff --git a/main/sqlite-tcl/include-stdint.patch b/main/sqlite-tcl/include-stdint.patch
new file mode 100644
index 00000000000..e545a874b7f
--- /dev/null
+++ b/main/sqlite-tcl/include-stdint.patch
@@ -0,0 +1,10 @@
+--- a/generic/tclsqlite3.c
++++ b/generic/tclsqlite3.c
+@@ -73,6 +73,7 @@
+ #   endif
+ # endif /* SQLITE_PTRSIZE */
+ # if defined(HAVE_STDINT_H)
++#   include <stdint.h>
+     typedef uintptr_t uptr;
+ # elif SQLITE_PTRSIZE==4
+     typedef unsigned int uptr;
diff --git a/main/sqlite/APKBUILD b/main/sqlite/APKBUILD
index 8c892a23ca0..ef0cdb26b69 100644
--- a/main/sqlite/APKBUILD
+++ b/main/sqlite/APKBUILD
@@ -1,20 +1,22 @@
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 pkgname=sqlite
-pkgver=3.31.1
-pkgrel=1
+# NOTE: pkgver needs to correspond with sqlite-tcl
+pkgver=3.45.3
+pkgrel=0
 pkgdesc="C library that implements an SQL database engine"
 url="https://www.sqlite.org/"
 arch="all"
-license="Public-Domain"
-makedepends="readline-dev tcl-dev libtool autoconf automake"
-subpackages="$pkgname-static $pkgname-dev $pkgname-tcl:_tcl $pkgname-libs $pkgname-doc"
+license="blessing"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+makedepends="readline-dev"
+subpackages="$pkgname-static $pkgname-doc $pkgname-dev $pkgname-libs"
 
 # compute _ver
 _a=${pkgver%%.*}
-_b=${pkgver#${_a}.}
+_b=${pkgver#"$_a".}
 _b=${_b%%.*}
-_c=${pkgver#${_a}.${_b}.}
+_c=${pkgver#"$_a"."$_b".}
 _c=${_c%%.*}
 case $pkgver in
 	*.*.*.*)_d=${pkgver##*.};;
@@ -23,27 +25,33 @@ esac
 [ $_b -lt 10 ] && _b=0$_b
 [ $_c -lt 10 ] && _c=0$_c
 [ $_d -lt 10 ] && _d=0$_d
-_ver=${_a}${_b}${_c}${_d}
+_ver=${_a}${_b}${_c}$_d
 
 # these variables depend on _ver being set
 builddir="$srcdir/$pkgname-autoconf-$_ver"
-source="https://www.sqlite.org/2020/sqlite-autoconf-$_ver.tar.gz
-	license.txt
+source="https://www.sqlite.org/2024/sqlite-autoconf-$_ver.tar.gz
+	$pkgname-$_ver-LICENSE.md::https://www.sqlite.org/src/raw?name=LICENSE.md&ci=version-$pkgver
 	"
 
 # secfixes:
+#   3.34.1-r0:
+#     - CVE-2021-20227
+#   3.32.1-r0:
+#     - CVE-2020-13434
+#     - CVE-2020-13435
+#   3.30.1-r3:
+#     - CVE-2020-11655
 #   3.30.1-r1:
 #     - CVE-2019-19242
-#     - CVE-2019-19242
+#     - CVE-2019-19244
 #   3.28.0-r0:
 #     - CVE-2019-5018
 #     - CVE-2019-8457
+#   0:
+#     - CVE-2022-35737
 
 # additional CFLAGS to set
-_amalgamation="-DSQLITE_ENABLE_FTS4 \
-	-DSQLITE_ENABLE_FTS3_PARENTHESIS \
-	-DSQLITE_ENABLE_FTS3 \
-	-DSQLITE_ENABLE_FTS5 \
+_amalgamation="-DSQLITE_ENABLE_FTS3_PARENTHESIS \
 	-DSQLITE_ENABLE_COLUMN_METADATA \
 	-DSQLITE_SECURE_DELETE \
 	-DSQLITE_ENABLE_UNLOCK_NOTIFY \
@@ -51,11 +59,24 @@ _amalgamation="-DSQLITE_ENABLE_FTS4 \
 	-DSQLITE_ENABLE_GEOPOLY \
 	-DSQLITE_USE_URI \
 	-DSQLITE_ENABLE_DBSTAT_VTAB \
-	-DSQLITE_MAX_VARIABLE_NUMBER=250000 \
-	-DSQLITE_ENABLE_JSON1"
+	-DSQLITE_MAX_VARIABLE_NUMBER=250000"
+
+prepare() {
+	if [ -f "$startdir"/../sqlite-tcl/APKBUILD ]; then
+		(
+		_sqlitever=$pkgver
+		. "$startdir"/../sqlite-tcl/APKBUILD
+		if [ "$_sqlitever" != "$pkgver" ]; then
+			warning "sqlite-tcl version mismatch ($_sqlitever != $pkgver)"
+		fi
+		)
+	fi
+
+	default_prepare
+}
 
 build() {
-	export CFLAGS="$CFLAGS $_amalgamation"
+	export CFLAGS="$CFLAGS $_amalgamation -O2"
 	./configure \
 		--build="$CBUILD" \
 		--host="$CHOST" \
@@ -64,24 +85,15 @@ build() {
 		--enable-readline \
 		--enable-static \
 		--enable-dynamic-extensions \
-		--enable-fts3
-
-	cd tea
-	./configure \
-		--build="$CBUILD" \
-		--host="$CHOST" \
-		--prefix=/usr \
-		--with-system-sqlite \
-		--enable-threads
-	cd "$builddir"
-
+		--enable-fts3 \
+		--enable-fts4 \
+		--enable-fts5
 
 	# rpath removal
 	sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 	sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 	make
-	make -C tea
 }
 
 check() {
@@ -90,34 +102,14 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
-	make -C tea DESTDIR="$pkgdir" install
 
 	install -Dm0644 sqlite3.1 \
 		"$pkgdir"/usr/share/man/man1/sqlite3.1
-	install -Dm644 "$srcdir"/license.txt \
-		"$pkgdir"/usr/share/licenses/$pkgname/license.txt
-}
-
-libs() {
-	replaces="sqlite"
-	pkgdesc="Sqlite3 library"
-
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
-}
-
-static() {
-	pkgdesc="Sqlite3 static library"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.a "$subpkgdir"/usr/lib/
-}
-
-_tcl() {
-	pkgdesc="sqlite Tcl Extension Architecture (TEA)"
-
-	mkdir -p "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/sqlite$pkgver "$subpkgdir"/usr/lib/
+	install -Dm644 "$srcdir"/$pkgname-$_ver-LICENSE.md \
+		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE.md
 }
 
-sha512sums="d85250ba5f78f0c918880f663741709aba662192f04888b2324a0df17affdf5b8540e8428c6c7315119806e7adad758ea281c9b403c0ad94ac6a9bd1b93fd617  sqlite-autoconf-3310100.tar.gz
-5bde14bec5bf18cc686b8b90a8b2324c8c6600bca1ae56431a795bb34b8b5ae85527143f3b5f0c845c776bce60eaa537624104cefc3a47b3820d43083f40c6e9  license.txt"
+sha512sums="
+ab4bb99186ccf81d288bc5150dacd5f8a32561303fbc0c607c24b5bb5ad44e0974655cea57d05122c62e957329f5260d170d2a71cbcf818501af29903c99a391  sqlite-autoconf-3450300.tar.gz
+8a347c292363e55a8c0fa0321e3f399bfe9c9aedcb6c838123f0eb3e2a4e078d096b7c152a4981e18ee9fa50c4ef913a33ed840aeed33aee0a46e95cd17f0814  sqlite-3450300-LICENSE.md
+"
diff --git a/main/sqlite/license.txt b/main/sqlite/license.txt
deleted file mode 100644
index 118c5d5e60e..00000000000
--- a/main/sqlite/license.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-SQLite Copyright
-SQLite is in the
-Public Domain 
-
-
-All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. 
-
-The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library. 
-
-All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects. 
-Obtaining An Explicit License To Use SQLite
-
-Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include: 
-You are using SQLite in a jurisdiction that does not recognize the public domain. 
-You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain. 
-You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite. 
-Your legal department tells you that you have to purchase a license. 
-
-If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one. 
-Contributed Code
-
-In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement: 
-The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law. 
-
-We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to:
-Hwaci
-6200 Maple Cove Lane
-Charlotte, NC 28269
-USA 
-
-A template copyright release is available in PDF or HTML. You can use this release to make future changes.
-
-see http://www.sqlite.org/copyright.html
\ No newline at end of file
diff --git a/main/sqsh/APKBUILD b/main/sqsh/APKBUILD
index 11d9ccb907d..53dbb9263b7 100644
--- a/main/sqsh/APKBUILD
+++ b/main/sqsh/APKBUILD
@@ -7,34 +7,26 @@ case $pkgver in
 *.*.*) _v=${pkgver%.*};;
 *) _v=$pkgver;;
 esac
-pkgrel=3
+pkgrel=8
 pkgdesc="Sybase iSQL replacement"
-url="http://www.sqsh.org"
+url="https://sourceforge.net/projects/sqsh/"
 arch="all"
-license="GPL"
-depends=""
-depends_dev=""
+license="GPL-2.0-or-later"
 makedepends="freetds-dev readline-dev ncurses-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://downloads.sourceforge.net/project/sqsh/sqsh/sqsh-$_v/sqsh-$pkgver.tgz
 	tds-version.patch
-	datetime.patch
+	freetds-1.2.patch
 	"
+options="!check"
 
-builddir="$srcdir"/$pkgname-$_v
 prepare() {
-	local i
-	cd "$builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
+	update_config_sub
 }
 
+builddir="$srcdir"/$pkgname-$_v
 build() {
-	cd "$builddir"
 	SYBASE=/usr
 	export SYBASE
 	./configure \
@@ -43,17 +35,15 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/doc \
-		--with-readline \
-		|| return 1
-	make || return 1
+		--with-readline
+	make
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	make DESTDIR="$pkgdir" install.man || return 1
+	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install.man
 }
 
 sha512sums="d011d413f5a21059e1b043c75f0a15ea29d10972b59ea980ebcb010b1b0e16eb377a66d21ba4f3ea4433c4deac5ba80b1af7e858129a306a6611de32da48981c  sqsh-2.5.16.1.tgz
 f73696f016e6a0f3c8f4020ba79b7dc9618c1958872dbb531e31c1b2709d7d7af227a3206b466bda932d8319443c838f6b05042b79b50560a9de842502274798  tds-version.patch
-6b424d995755d07fab6986a0594350e3d045c36fd4852f28608dee918d1052e0ec8e92b8758347c18f39a2eefa42a8421d44d54c799386a533a606b6b4802352  datetime.patch"
+563bb6805025f2560b0c0bae4528e3ee54d17598c51669848f988d2948dc45b177412d5113259d2af5509ab77ae70e5dfdb4e0eebe9fe5252293d9b57f325934  freetds-1.2.patch"
diff --git a/main/sqsh/datetime.patch b/main/sqsh/datetime.patch
deleted file mode 100644
index 2a02504c591..00000000000
--- a/main/sqsh/datetime.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/dsp_conv.c b/src/dsp_conv.c
-index 6c6878c..e141b99 100644
---- a/src/dsp_conv.c
-+++ b/src/dsp_conv.c
-@@ -660,11 +660,6 @@ CS_RETCODE dsp_datetime_conv( ctx, dt_fmt, dt, buf, len, type )
-      * type of date that we are processing and replace the ms
-      * field if it exists.
-      */
--#if defined(CS_BIGDATETIME_TYPE) && defined(CS_BIGTIME_TYPE)
--    if (dt_fmt->datatype == CS_BIGDATETIME_TYPE || dt_fmt->datatype == CS_BIGTIME_TYPE)
--        fmt = dsp_datetime_strip( dt_fmt->datatype, conv_fmt, (int) dr.datesecfrac );
--    else
--#endif
-         fmt = dsp_datetime_strip( dt_fmt->datatype, conv_fmt, (int) dr.datemsecond );
- 
-     /*
diff --git a/main/sqsh/freetds-1.2.patch b/main/sqsh/freetds-1.2.patch
new file mode 100644
index 00000000000..1679341ce3d
--- /dev/null
+++ b/main/sqsh/freetds-1.2.patch
@@ -0,0 +1,25 @@
+FreeTDS 1.2 introduces CS_SEC_NETWORKAUTH but does not have CS_SEC_CHANBIND,
+CS_SEC_CONFIDENTIALITY, CS_SEC_INTEGRITY, etc
+
+diff --git a/src/cmd_connect.c b/src/cmd_connect.c
+index 2956050..c81b3dd 100644
+--- a/src/cmd_connect.c
++++ b/src/cmd_connect.c
+@@ -1875,7 +1875,7 @@ static CS_RETCODE SetNetAuth (conn, principal, keytab_file, secmech, req_options
+     CS_CHAR       *req_options;
+ {
+ 
+-#if defined(CS_SEC_NETWORKAUTH)
++#if defined(CS_SEC_NETWORKAUTH) && defined(CS_SEC_CHANBIND) && defined(CS_SEC_CONFIDENTIALITY) && defined(CS_SEC_INTEGRITY)
+ 
+     CS_CHAR buf[CS_MAX_CHAR+1];
+     CS_INT  buflen;
+@@ -2051,7 +2051,7 @@ static CS_RETCODE ShowNetAuthCredExp (conn, cmdname)
+     CS_CONNECTION *conn;
+     CS_CHAR       *cmdname;
+ {
+-#if defined(CS_SEC_NETWORKAUTH)
++#if defined(CS_SEC_NETWORKAUTH) && defined(CS_SEC_CREDTIMEOUT)
+     CS_INT     CredTimeOut;
+     CS_BOOL    NETWORKAUTH;
+     char      *datetime;
diff --git a/main/squark/APKBUILD b/main/squark/APKBUILD
index 1930e64cbe8..1b27d74be91 100644
--- a/main/squark/APKBUILD
+++ b/main/squark/APKBUILD
@@ -1,39 +1,33 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=squark
 pkgver=0.6.1
-pkgrel=2
-pkgdesc="Squark - Squid User Authentication and Rating Kit"
-subpackages="$pkgname-dbg $pkgname-doc"
+pkgrel=6
+pkgdesc="Squid User Authentication and Rating Kit"
+url="https://git-old.alpinelinux.org/hosted/squark/"
+arch="all"
+license="GPL-2.0-only"
 depends="haserl"
 makedepends="net-snmp-dev cmph-dev lua-dev"
-source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
-	"
-url="https://git.alpinelinux.org/cgit/squark/"
-arch="all"
-license=GPL2
 install="$pkgname.post-install"
+subpackages="$pkgname-dbg $pkgname-doc"
+source="https://dev.alpinelinux.org/archive/squark/squark-$pkgver.tar.xz
+	gcc-10.patch
+	"
+options="!check"
 
 prepare() {
-	cd "$srcdir"
-	ln -s squark-master $pkgname-$pkgver
-	cd "$srcdir/$pkgname-$pkgver"
+	default_prepare
 	sed -i -e 's:-Werror::' Make.rules
-	for i in $source; do
-		case $i in
-		*.patch) patch -p1 -i "$srcdir"/$i || return 1
-		esac
-	done
-	sed -i -e 's:lua5.1:lua:g' "$srcdir"/"$pkgname-$pkgver"/src/Makefile
+	sed -i -e 's:lua5.1:lua:g' src/Makefile
 }
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make FULL_VERSION="$pkgver-r$pkgrel" || return 1
+	make FULL_VERSION="$pkgver-r$pkgrel"
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
 	make FULL_VERSION="$pkgver-r$pkgrel" DESTDIR="$pkgdir" install
 }
 
-sha512sums="f04b0cf5e300bab43bbc768a30cb8339e8a026d6fc090ccf3c98c0fa932a4cf3ef2ed11e5b5b94a68e1f7577fa3875cd537c6ed535e2af012b6d464b20123f3e  squark-0.6.1.tar.xz"
+sha512sums="f04b0cf5e300bab43bbc768a30cb8339e8a026d6fc090ccf3c98c0fa932a4cf3ef2ed11e5b5b94a68e1f7577fa3875cd537c6ed535e2af012b6d464b20123f3e  squark-0.6.1.tar.xz
+1e9f0996b766c4b9e4eb12ec29c0760ec1f7c963a4150f9e09cf217a51ad19aad6c2889a6ab217ad7cd63f9600ce559269a444f73fec1d400d8a761ea4bc6131  gcc-10.patch"
diff --git a/main/squark/gcc-10.patch b/main/squark/gcc-10.patch
new file mode 100644
index 00000000000..0f713b507f3
--- /dev/null
+++ b/main/squark/gcc-10.patch
@@ -0,0 +1,29 @@
+Upstream: Should be
+Reason: Fixes compilation with -fno-common
+
+diff --git a/src/filterdb.c b/src/filterdb.c
+index 5ee85ac..b69497d 100644
+--- a/src/filterdb.c
++++ b/src/filterdb.c
+@@ -12,7 +12,7 @@
+ #define PAGE_SIZE		4096
+ #define ALIGN(s,a)		(((s) + a - 1) & ~(a - 1))
+ 
+-const char *sqdb_section_names[SQDB_SECTION_MAX] = {
++extern const char *sqdb_section_names[SQDB_SECTION_MAX] = {
+ 	[SQDB_SECTION_STRINGS]		= "strings",
+ 	[SQDB_SECTION_CATEGORIES]	= "categories",
+ 	[SQDB_SECTION_INDEX]		= "index",
+diff --git a/src/filterdb.h b/src/filterdb.h
+index 2d16572..cbd55af 100644
+--- a/src/filterdb.h
++++ b/src/filterdb.h
+@@ -46,7 +46,7 @@ struct sqdb_index_entry {
+ };
+ 
+ 
+-const char *sqdb_section_names[SQDB_SECTION_MAX];
++extern const char *sqdb_section_names[SQDB_SECTION_MAX];
+ 
+ int sqdb_create(struct sqdb *db, const char *fn);
+ int sqdb_open(struct sqdb *db, const char *fn);
diff --git a/main/squashfs-tools/APKBUILD b/main/squashfs-tools/APKBUILD
index 44121f25db5..4ac7d72728e 100644
--- a/main/squashfs-tools/APKBUILD
+++ b/main/squashfs-tools/APKBUILD
@@ -1,28 +1,44 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=squashfs-tools
-pkgver=4.4
-pkgrel=0
-pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux."
+pkgver=4.6.1
+pkgrel=1
+pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux"
 url="https://github.com/plougher/squashfs-tools"
 arch="all"
-license="GPL"
-makedepends="zlib-dev xz-dev lzo-dev lz4-dev attr-dev zstd-dev"
+license="GPL-2.0-or-later"
+makedepends="
+	attr-dev
+	lz4-dev
+	lzo-dev
+	xz-dev
+	zlib-dev
+	zstd-dev
+	"
+subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/plougher/squashfs-tools/archive/$pkgver.tar.gz
-	fix-compat.patch
-"
+	"
+options="!check" # no testsuite
 
-_builddir="$srcdir"/$pkgname-$pkgver
+# secfixes:
+#   4.5-r1:
+#     - CVE-2021-41072
+#   4.5-r0:
+#     - CVE-2021-40153
 
 build() {
-	cd "$builddir"/$pkgname
-	CFLAGS="$CFLAGS -std=gnu89" \
-	make XZ_SUPPORT=1 LZO_SUPPORT=1 LZ4_SUPPORT=1 ZSTD_SUPPORT=1
+	CFLAGS="$CFLAGS -O2 -flto=auto"\
+	CPPFLAGS="$CPPFLAGS -O2 -flto=auto" \
+		make -C squashfs-tools XZ_SUPPORT=1 LZO_SUPPORT=1 LZ4_SUPPORT=1 ZSTD_SUPPORT=1
 }
 
 package() {
-	cd "$builddir"/$pkgname
-	mkdir -p "$pkgdir"/sbin
-	cp -a mksquashfs unsquashfs "$pkgdir"/sbin
+	make -C squashfs-tools \
+		INSTALL_MANPAGES_DIR="$pkgdir/usr/share/man/man1" \
+		INSTALL_PREFIX="$pkgdir/usr" \
+		USE_PREBUILT_MANPAGES=y \
+		install
 }
-sha512sums="133ce437fb8c929933d52cff710b61dd9181f6f8be58250b0d6a59a7bb79a2b350f68f456b06a0e17c469409a71272d586802d570248273ddcd5dad088c00308  squashfs-tools-4.4.tar.gz
-157379cf4bafb72d717f14b1bc5dc350c97a9e68a7018e0febba4b1e59f9fd90c1de8485c4ffc48a035b53be8c3aa62046281291664bee4699100cec637b0bfa  fix-compat.patch"
+
+sha512sums="
+10e8a4b1e2327e062aef4f85860e76ebcd7a29e4c19e152ff7edec4a38316982b5bcfde4ab69da6bcb931258d264c2b6cb40cb5f635f9e6f6eba1ed5976267cb  squashfs-tools-4.6.1.tar.gz
+"
diff --git a/main/squashfs-tools/fix-compat.patch b/main/squashfs-tools/fix-compat.patch
deleted file mode 100644
index 8a5ff0697de..00000000000
--- a/main/squashfs-tools/fix-compat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/squashfs-tools/action.c
-+++ b/squashfs-tools/action.c
-@@ -1905,6 +1905,9 @@
- 	return 1;
- }
- 
-+#ifndef FNM_EXTMATCH
-+#define FNM_EXTMATCH 0
-+#endif
- 
- TEST_FN(name, ACTION_ALL_LNK, \
- 	return fnmatch(atom->argv[0], action_data->name,
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index 55536f05de4..1e46a2de75e 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -1,34 +1,70 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=squid
-pkgver=4.10
+pkgver=6.9
 pkgrel=0
-pkgdesc="A full-featured Web proxy cache server."
-url="http://www.squid-cache.org"
+_langpack=20240307
+pkgdesc="Full-featured Web proxy cache server"
+url="https://www.squid-cache.org/"
 install="squid.pre-install squid.pre-upgrade"
-pkgusers="squid"
-pkggroups="squid"
 arch="all"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
 depends="logrotate"
-makedepends="openssl-dev perl-dev autoconf automake heimdal-dev libtool
-	libcap-dev linux-headers"
-subpackages="$pkgname-doc"
+makedepends="
+	heimdal-dev
+	libcap-dev
+	linux-headers
+	openssl-dev>3
+	perl-dev
+	"
+subpackages="$pkgname-openrc $pkgname-doc"
 linguas="af ar az bg ca cs da de el es et fa fi fr he hu hy id it ja ka ko lt
-	lv ms nl oc pl pt ro ru sk sl sr sv th tr uk uz vi zh"
+	lv ms nl oc pl pt ro ru sk sl spq sr sv th tr uk uz vi zh"
 langdir="/usr/share/squid/errors"
-source="http://www.squid-cache.org/Versions/v4/squid-${pkgver}.tar.xz
-
+source="https://www.squid-cache.org/Versions/v${pkgver%%.*}/squid-$pkgver.tar.xz
+	squid-langpack-$_langpack.tar.gz.noauto::https://www.squid-cache.org/Versions/langpack/squid-langpack-$_langpack.tar.gz
 	$pkgname.initd
 	$pkgname.confd
 	$pkgname.logrotate
 	"
 pkgusers="squid"
 pkggroups="squid"
-builddir="$srcdir"/$pkgname-$pkgver
-options="!check"  # does not work. Error message is about "applet not found", some issue with the installed busybox
+options="!check"
 
 # secfixes:
+#   6.6-r0:
+#     - CVE-2023-50269
+#   6.5-r0:
+#     - CVE-2023-49285
+#     - CVE-2023-49286
+#   6.4-r0:
+#     - CVE-2023-46847
+#     - CVE-2023-46846
+#     - CVE-2023-46724
+#     - CVE-2023-46848
+#   6.1-r0:
+#     - CVE-2023-49288
+#   5.7-r0:
+#     - CVE-2022-41317
+#   5.2-r0:
+#     - CVE-2021-41611
+#     - CVE-2021-28116
+#   5.0.6-r0:
+#     - CVE-2021-28651
+#     - CVE-2021-28652
+#     - CVE-2021-28662
+#     - CVE-2021-31806
+#     - CVE-2021-31807
+#     - CVE-2021-31808
+#     - CVE-2021-33620
+#   5.0.5-r0:
+#     - CVE-2020-25097
+#   4.13.0-r0:
+#     - CVE-2020-15810
+#     - CVE-2020-15811
+#     - CVE-2020-24606
+#   4.12.0-r0:
+#     - CVE-2020-15049
 #   4.10-r0:
 #     - CVE-2020-8449
 #     - CVE-2020-8450
@@ -43,9 +79,24 @@ options="!check"  # does not work. Error message is about "applet not found", so
 #     - CVE-2018-1000027
 #     - CVE-2018-1172
 
+unpack() {
+	default_unpack
+	mkdir -p "$srcdir"/langpack
+	tar -xzf "$srcdir"/squid-langpack-$_langpack.tar.gz.noauto -C "$srcdir"/langpack
+}
+
+prepare() {
+	default_prepare
+
+	cd "$srcdir"/langpack
+	# create symlink names for languages
+	./alias-link.sh ln rm . aliases
+	# delete non-translation files already installed
+	rm -r templates COPYRIGHT TRANSLATORS aliases alias-link.sh
+}
+
 build() {
-	cd "$builddir"
-	case "$CARCH" in mips|mipsel*) export ac_cv_search___atomic_load_8=-latomic ;; esac
+	CXXFLAGS="$CXXFLAGS -O2 -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -61,7 +112,7 @@ build() {
 		--enable-auth-digest \
 		--enable-auth-basic="getpwnam,NCSA,SMB,SMB_LM,RADIUS" \
 		--enable-epoll \
-		--enable-external-acl-helpers="file_userip,unix_group,wbinfo_group,session" \
+		--enable-external-acl-helpers="file_userip,unix_group,wbinfo_group" \
 		--enable-auth-ntlm="fake,SMB_LM" \
 		--enable-auth-negotiate="kerberos,wrapper" \
 		--disable-mit \
@@ -90,7 +141,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
@@ -103,14 +153,20 @@ package() {
 		"$pkgdir"/var/log/squid \
 		"$pkgdir"/var/run/squid
 	chmod +x "$pkgdir"/usr/lib/squid/*
+
+	cp -r "$srcdir"/langpack/* "$pkgdir"/usr/share/squid/errors/
 }
 
 squid_kerb_auth() {
-	pkgdesc="Squid kerberos authetication helper"
-	install -d "$subpkgdir"/usr/lib/squid
-	mv "$pkgdir"/usr/lib/squid/squid_kerb_auth "$subpkgdir"/usr/lib/squid/
+	pkgdesc="Squid kerberos authentication helper"
+
+	amove usr/lib/squid/squid_kerb_auth
 }
-sha512sums="033891f84789fe23a23fabcfb6f51a5b044c16892600f94380b5f0bcbceaef67b95c7047154d940511146248ca9846a949f00a609c6ed27f9af8829325eb08e0  squid-4.10.tar.xz
-8320820c02c824ed96065e0b66cabdd80b11c23e911880a42f5bd7e3f6e7a5c1c6def910a1843cca810c62a7dc8ccdb9ae82c0cf52bf08259c3b50058232132d  squid.initd
+
+sha512sums="
+2666551caca39fa6ca49b56b537645dd043ee0c99b805c433cf714172e6062590fd6ed942043df1a3b543f30c039f3ab701493187dc6a0a4a8311217417c366e  squid-6.9.tar.xz
+e41fc9bca1f0f98943bc647fc7b468de808814579b39b204ae72d7bea77b26c9d8959764c559faef7873feb8d8dde504cd1d21cf1289b78f3b87b13da834f473  squid-langpack-20240307.tar.gz.noauto
+e3968a6b97baebfe18e1e978c76f6ef7a8a60cfb96dfc2d5199e91a84a065fe964aed6531aa04fe3824c5fd0644adec28ff81ff2f4fed424a29e636829b118d8  squid.initd
 7292661de344e8a87d855c83afce49511685d2680effab3afab110e45144c0117935f3bf73ab893c9e6d43f7fb5ba013635e24f6da6daf0eeb895ef2e9b5baa9  squid.confd
-89a703fa4f21b6c7c26e64a46fd52407e20f00c34146ade0bea0c4b63d050117c0f8e218f2256a1fbf6abb84f4ec9b0472c9a4092ff6e78f07c4f5a25d0892a5  squid.logrotate"
+89a703fa4f21b6c7c26e64a46fd52407e20f00c34146ade0bea0c4b63d050117c0f8e218f2256a1fbf6abb84f4ec9b0472c9a4092ff6e78f07c4f5a25d0892a5  squid.logrotate
+"
diff --git a/main/squid/squid.initd b/main/squid/squid.initd
index 8a910001069..786393dd0da 100644
--- a/main/squid/squid.initd
+++ b/main/squid/squid.initd
@@ -72,6 +72,7 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	checkpath -d /var/run/squid -m 0755 -o squid:squid
+	checkpath -d /var/log/squid -m 0750 -o squid:squid
 	ebegin "Starting ${SVCNAME}"
 	KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf
 	eend $? && sleep 1
diff --git a/main/squid/squid.pre-install b/main/squid/squid.pre-install
index 3c49c8642d1..7b2652b049d 100644
--- a/main/squid/squid.pre-install
+++ b/main/squid/squid.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-addgroup -S squid 2>/dev/null
-adduser -S -D -h /var/cache/squid -G squid -g squid squid 2>/dev/null
+addgroup -S -g 31 squid 2>/dev/null
+adduser -S -D -h /var/cache/squid -G squid -u 31 -g squid squid 2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup squid winbind 2>/dev/null
 
diff --git a/main/ssh-getkey-ldap/APKBUILD b/main/ssh-getkey-ldap/APKBUILD
index d40e3abdd55..cfa5b9558f6 100644
--- a/main/ssh-getkey-ldap/APKBUILD
+++ b/main/ssh-getkey-ldap/APKBUILD
@@ -2,23 +2,17 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=ssh-getkey-ldap
 pkgver=0.1.2
-pkgrel=0
+pkgrel=1
 pkgdesc="A simple script to be used as AuthorizedKeysCommand in OpenSSH server to look up user's public keys in LDAP."
 url="https://github.com/jirutka/ssh-getkey-ldap"
 arch="noarch"
 license="MIT"
 depends="lua lua-ldap"
-makedepends=""
 install="$pkgname.post-install"
-source="$pkgname-$pkgver.tar.gz::https://github.com/jirutka/$pkgname/archive/v$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
-
-build() {
-	return 0
-}
+source="$pkgname-$pkgver.tar.gz::https://github.com/jirutka/ssh-getkey-ldap/archive/v$pkgver.tar.gz"
+options="!check"
 
 package() {
-	cd "$builddir"
 	DESTDIR="$pkgdir" PREFIX="/usr" ./install
 }
 
diff --git a/main/sshfs/APKBUILD b/main/sshfs/APKBUILD
index 0478a8b4d8a..bd21e64fcdf 100644
--- a/main/sshfs/APKBUILD
+++ b/main/sshfs/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sshfs
-pkgver=3.7.0
-pkgrel=4
+pkgver=3.7.3
+pkgrel=1
 pkgdesc="FUSE client based on the SSH File Transfer Protocol"
 url="https://github.com/libfuse/sshfs"
 arch="all"
@@ -13,22 +13,21 @@ source="https://github.com/libfuse/sshfs/releases/download/sshfs-$pkgver/sshfs-$
 options="!check" # requires FUSE kernel module to run tests
 
 build() {
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--buildtype=plain \
-		. output
-	ninja -C output
+	abuild-meson . output
+	meson compile -C output
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C output install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 
 	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
 	install -Dm644 README.rst ChangeLog.rst AUTHORS COPYING \
 		"$pkgdir"/usr/share/doc/$pkgname/
+
+	mkdir -p "$pkgdir"/sbin
+	ln -s /usr/sbin/mount.sshfs "$pkgdir"/sbin/mount.sshfs
 }
 
-sha512sums="bd8bcd45dd9a5e9686c6fb442e877ffdb592ba0d3424d5dab84a955bfafb17e8666abefba6857467833f5b285842bdadd5a9b6c9e8128ac2e564c36df79aa570  sshfs-3.7.0.tar.xz"
+sha512sums="
+ba0928f85819984a3eb83d2debab658b2cd4e958ed1c3ba9787e361f452687d42b82d478b7d95e7a7c5580bae5c1cdebe4cf3c9b6cb5eb6a570311f276903d99  sshfs-3.7.3.tar.xz
+"
diff --git a/main/sshguard/APKBUILD b/main/sshguard/APKBUILD
index 660c475641f..99af6ad06cf 100644
--- a/main/sshguard/APKBUILD
+++ b/main/sshguard/APKBUILD
@@ -1,14 +1,15 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Michał Polański <michal@polanski.me>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sshguard
-pkgver=2.4.0
+pkgver=2.4.3
 pkgrel=1
-pkgdesc="Log monitor that blocks with iptables on bad behaviour"
+pkgdesc="Protects hosts from brute-force attacks against SSH and other services"
 url="https://www.sshguard.net/"
 arch="all"
 license="ISC"
 depends="iptables"
-makedepends="$depends_dev flex bison autoconf automake libtool"
+makedepends="flex bison autoconf automake libtool"
 subpackages="$pkgname-openrc $pkgname-doc"
 source="https://downloads.sourceforge.net/project/sshguard/sshguard/$pkgver/sshguard-$pkgver.tar.gz
 	sshguard.initd
@@ -16,6 +17,7 @@ source="https://downloads.sourceforge.net/project/sshguard/sshguard/$pkgver/sshg
 	"
 
 build() {
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,10 +32,13 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
+
 	install -Dm755 "$srcdir"/sshguard.initd "$pkgdir"/etc/init.d/sshguard
-	install -Dm755 "$srcdir"/sshguard.confd "$pkgdir"/etc/conf.d/sshguard
+	install -Dm644 "$srcdir"/sshguard.confd "$pkgdir"/etc/conf.d/sshguard
 }
 
-sha512sums="64293700ef85f0843c333c3a27b04c5b2f69bf8dddf46353a371d4178915deb931362b3641ded0eeb5365f30cb63ce6ce17256d8d094383d1cfe661065b9c1c6  sshguard-2.4.0.tar.gz
-f21d5346c2e74910bd901229ddf194d40ee5afa41d5c4f75d33923cf65ec0a350f2fa0ed603222064184ceb912521661bb68bcb1f918f27ad2b0444732fa2bf6  sshguard.initd
-fc59e273e481dc7256a33114fc3b113f8b85406401a7d7113d0daba012dfd413c7bf85a0106539b859d90442976fe265355ccdf943a455f37c8ad7e5891e4b26  sshguard.confd"
+sha512sums="
+eeecea1007c1a21a28835a6d29c2cbffc647b3ab09a3525600e91b978d4ebdda9e6a7e2884da26bb1d7f64de561ac8bd1788bb776730d37b7a4fa49b22885b4a  sshguard-2.4.3.tar.gz
+3dfd291b74fd7082ade5e3339e5641e546fb98cf88be29cc9744e5cd316b128580a17c4d1d36f6b03eec73491645c670759ca6f82fe2555eff34adb090df69cb  sshguard.initd
+be29acae12bc51019febc283bb1c4fff0cd0a475a330a0ca1b4196bbc88a9a70922b82b7d56250e04d6491a4670ebb36d39c65c28fa0f20093355bd7ad3e4d2f  sshguard.confd
+"
diff --git a/main/sshguard/sshguard.confd b/main/sshguard/sshguard.confd
index 050c2f3589c..c3a50036b45 100644
--- a/main/sshguard/sshguard.confd
+++ b/main/sshguard/sshguard.confd
@@ -1,22 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/files/sshguard.confd,v 1.3 2011/04/23 16:59:59 jer Exp $
+# Configuration for /etc/init.d/sshguard
 
-# Config file for /etc/init.d/sshguard
-#   See SSHGUARD(8) for details.
+# You need to create /etc/sshguard.conf configuration file
+# or SSHGuard won't start. See sshguard-setup(7) for reference.
 
-# Initial (empty) options.
-SSHGUARD_OPTS=""
+# See sshguard(8) for available options.
+#command_args=""
 
-# Files to monitor
-#   -l <source>
-SSHGUARD_OPTS="${SSHGUARD_OPTS} -l /var/log/messages"
-
-# White listing
-#   -w <addr/host/block/file>
-#SSHGUARD_OPTS="${SSHGUARD_OPTS} -w 192.168.0.0/24"
-
-# Define how long in milliseconds start-stop-daemon waits to check that
-# sshguard is still running before calling success or failure.
-# Values lower than the default of 999 are probably not useful.
-SSHGUARD_WAIT="999"
+# Run with process supervisor. If you want to run the daemon with
+# start-stop-daemon instead, comment it out.
+supervisor="supervise-daemon"
diff --git a/main/sshguard/sshguard.initd b/main/sshguard/sshguard.initd
index 97348a0a96a..615a35c5e21 100644
--- a/main/sshguard/sshguard.initd
+++ b/main/sshguard/sshguard.initd
@@ -1,25 +1,18 @@
 #!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/files/sshguard.initd,v 1.3 2011/04/25 04:59:43 jer Exp $
 
-depend() {
-	after iptables
-	use logger
-}
+name="SSHGuard"
+description="Protects hosts from brute-force attacks against SSH and other services"
 
-SSHGUARD_PIDFILE=${SSHGUARD_PIDFILE:-/var/run/${SVCNAME}.pid}
+# Log startup errrors to syslog.
+: ${error_logger="logger -t sshguard -p daemon.err >/dev/null 2>&1"}
 
-start() {
-	ebegin "Starting sshguard"
-	[[ -z ${SSHGUARD_WAIT} ]] && SSHGUARD_WAIT=999
-	start-stop-daemon --start --wait ${SSHGUARD_WAIT} --pidfile ${SSHGUARD_PIDFILE} --background --quiet --exec \
-		/usr/sbin/sshguard -- -i ${SSHGUARD_PIDFILE} ${SSHGUARD_OPTS}
-	eend $?
-}
+command="/usr/sbin/sshguard"
+# $SSHGUARD_OPTS is only for backward compatibility (Alpine <3.19)
+command_args="$SSHGUARD_OPTS $command_args"
+command_background="yes"
+pidfile="/run/$RC_SVCNAME.pid"
 
-stop() {
-	ebegin "Stopping sshguard"
-	start-stop-daemon --stop -p ${SSHGUARD_PIDFILE}
-	eend $?
+depend() {
+	after firewall
+	use logger
 }
diff --git a/main/sshpass/APKBUILD b/main/sshpass/APKBUILD
index 48419f30d4c..a38060680a1 100644
--- a/main/sshpass/APKBUILD
+++ b/main/sshpass/APKBUILD
@@ -1,31 +1,17 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sshpass
-pkgver=1.06
+pkgver=1.10
 pkgrel=0
 pkgdesc="Non-interactive SSH authentication utility"
-url="http://sshpass.sourceforge.net/"
+url="https://sourceforge.net/projects/sshpass/"
 arch="all"
-license="GPL-2.0"
-depends=""
-makedepends=""
-install=""
+license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
 source="https://downloads.sourceforge.net/sshpass/sshpass-$pkgver.tar.gz"
-
-_builddir="$srcdir"/sshpass-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+options="!check"
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,14 +19,14 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
+		--localstatedir=/var
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="fc08fcca5aaa5e4958f16d38116d828739a5d53f8e2a83506ef78ee602941a7bfc0e3f07154dc390660df490dbdf7601e0c7ec17c68c9627d72d565e4c6717f8  sshpass-1.06.tar.gz"
+sha512sums="
+d0fbceb956baee79803fec8bd9a2e0d1e342cbc90fb8bb4baa5a01914f870393f43bd07b62aa1da208318b4971005b9bbccf0e926c590124de11a272169db81d  sshpass-1.10.tar.gz
+"
diff --git a/main/ssmtp/APKBUILD b/main/ssmtp/APKBUILD
index 139151b7cf9..fff903b57c5 100644
--- a/main/ssmtp/APKBUILD
+++ b/main/ssmtp/APKBUILD
@@ -3,24 +3,22 @@
 
 pkgname=ssmtp
 pkgver=2.64
-pkgrel=14
+pkgrel=21
 pkgdesc="Extremely simple MTA to get mail off the system to a mail hub"
 subpackages="$pkgname-doc"
 arch="all"
 url="https://packages.debian.org/stable/mail/ssmtp"
-license="GPL-2.0"
-depends=
-makedepends="openssl-dev autoconf"
+license="GPL-2.0-or-later"
+makedepends="openssl-dev>3 autoconf"
 options="!check"
-source="http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2
+source="https://deb.debian.org/debian/pool/main/s/ssmtp/ssmtp_$pkgver.orig.tar.bz2
+	cast.patch
 	generate_config.patch
 	libcrypto-underlinking.patch
 	inet6-getaddrinfo.patch
 	"
-_builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
-	cd "$_builddir"
 	sed -i -e 's:$(CC) -o:$(CC) @LDFLAGS@ -o:' Makefile.in
 	autoconf
 
@@ -31,21 +29,22 @@ build() {
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc \
 		--enable-ssl \
-		--enable-inet6 \
-		|| return 1
+		--enable-inet6
 	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
 	make prefix="$pkgdir"/usr \
 		etcdir="$pkgdir"/etc \
-		mandir="$pkgdir"/usr/share/man \
+		mandir="$pkgdir"/usr/share/man/man8 \
 		install
 	ln -s ssmtp "$pkgdir"/usr/sbin/sendmail
 }
 
-sha512sums="911752e744420adf58552b9cf3a6e558d8b39103e5ad33a9ed4429b9a3a2091f7674aac11fe9bbd66747a61cdabe6bd638b80efcaadc86b057c12e2e235cca72  ssmtp_2.64.orig.tar.bz2
+sha512sums="
+911752e744420adf58552b9cf3a6e558d8b39103e5ad33a9ed4429b9a3a2091f7674aac11fe9bbd66747a61cdabe6bd638b80efcaadc86b057c12e2e235cca72  ssmtp_2.64.orig.tar.bz2
+e25707d508a220c24105078c2e1ec32c5c37b2aea68e43cb90a885bb31467ff693daf498b6c131244d638bf5facd5ca1446ee64ed79cb4fdf080fadc36f5b3dc  cast.patch
 a4273d7c5b50984994b35de052c450a872f0014c45c1d3bfe36f2edd4f224281aacea234be61c6e966da2c4d3e033042628b79b2216340001487e6bb3a55b6cd  generate_config.patch
 9da89ec5ea66dae8b7a22ffcf196c45005c0403e6505162dba05003feac38eb397f8aff4f140d720f826ea057f92e47302ec3c24bddf5786c10b214ec906e82f  libcrypto-underlinking.patch
-92dc128b2f6ce234843e8f1e6ddb72653825652544cd68f693457b3fdc4ee22b0f9861feec0dfd123d012c294c7083dd8d24a9a589a3c2ae5bcdde697d30a290  inet6-getaddrinfo.patch"
+92dc128b2f6ce234843e8f1e6ddb72653825652544cd68f693457b3fdc4ee22b0f9861feec0dfd123d012c294c7083dd8d24a9a589a3c2ae5bcdde697d30a290  inet6-getaddrinfo.patch
+"
diff --git a/main/ssmtp/cast.patch b/main/ssmtp/cast.patch
new file mode 100644
index 00000000000..ec534948844
--- /dev/null
+++ b/main/ssmtp/cast.patch
@@ -0,0 +1,38 @@
+fixes -Werror=int-conversion
+--
+diff --git a/ssmtp.c b/ssmtp.c
+index af4d1e5..9a28320 100644
+--- a/ssmtp.c
++++ b/ssmtp.c
+@@ -55,21 +55,21 @@ bool_t use_oldauth = False;		/* use old AUTH LOGIN username style */
+ 
+ #define ARPADATE_LENGTH 32		/* Current date in RFC format */
+ char arpadate[ARPADATE_LENGTH];
+-char *auth_user = (char)NULL;
+-char *auth_pass = (char)NULL;
+-char *auth_method = (char)NULL;		/* Mechanism for SMTP authentication */
+-char *mail_domain = (char)NULL;
+-char *from = (char)NULL;		/* Use this as the From: address */
++char *auth_user = NULL;
++char *auth_pass = NULL;
++char *auth_method = NULL;		/* Mechanism for SMTP authentication */
++char *mail_domain = NULL;
++char *from = NULL;		/* Use this as the From: address */
+ char *hostname;
+ char *mailhost = "mailhub";
+-char *minus_f = (char)NULL;
+-char *minus_F = (char)NULL;
++char *minus_f = NULL;
++char *minus_F = NULL;
+ char *gecos;
+-char *prog = (char)NULL;
++char *prog = NULL;
+ char *root = NULL;
+ char *tls_cert = "/etc/ssl/certs/ssmtp.pem";	/* Default Certificate */
+-char *uad = (char)NULL;
+-char *config_file = (char)NULL;		/* alternate configuration file */
++char *uad = NULL;
++char *config_file = NULL;		/* alternate configuration file */
+ 
+ headers_t headers, *ht;
+ 
diff --git a/main/static-routing/APKBUILD b/main/static-routing/APKBUILD
index 6374ca2e1ee..cc903720c41 100644
--- a/main/static-routing/APKBUILD
+++ b/main/static-routing/APKBUILD
@@ -1,18 +1,14 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
 pkgname=static-routing
 pkgver=1.0
-pkgrel=0
+pkgrel=2
 pkgdesc="Script for configuring static routing"
-url=http://git.alpinelinux.org/cgit/aports/tree/testing/static-routing
-arch=noarch
-license=GPL-2
-depends=
-source=static-routing
-
-build() {
-	:
-}
+url="https://git.alpinelinux.org/cgit/aports/tree/main/static-routing"
+arch="noarch"
+license="GPL-2.0-only"
+source="static-routing"
+options="!check"
 
 package() {
 	install -D -m 755 "$srcdir/static-routing" "$pkgdir/etc/network/if-up.d/static-routing"
@@ -20,4 +16,4 @@ package() {
 	ln -s ../if-up.d/static-routing "$pkgdir/etc/network/if-down.d"
 }
 
-sha512sums="89ace46345ee43961ca38c67d841d598c38f5c6765317b8353e360d761ea31f128c656095632b20eeedf683e4ae4337c5d177422779491e9bb027289e82a34a8  static-routing"
+sha512sums="9a714dcef641f021c9619a2239575c96109f92aaee08a3665b7817689d8050ca6507847f529d1f70f35a16ff2d03dcf40be963cb2245495a9d93fb21622bc86c  static-routing"
diff --git a/main/static-routing/static-routing b/main/static-routing/static-routing
index b4459f51eb3..0e21eda1274 100644
--- a/main/static-routing/static-routing
+++ b/main/static-routing/static-routing
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Static routing configuration script
-# Copyright (c) 2016 Kaarle Ritvanen
+# Copyright (c) 2016-2020 Kaarle Ritvanen
 
 if [ $MODE = start ]; then
 	ACTION=add
@@ -23,5 +23,5 @@ configure() {
 	done
 }
 
-configure route src $IF_ADDRESS dev $IFACE
+configure route src ${IF_ADDRESS%/*} dev $IFACE
 configure rule
diff --git a/main/statserial/APKBUILD b/main/statserial/APKBUILD
index e2eaf869230..f9395ec4220 100644
--- a/main/statserial/APKBUILD
+++ b/main/statserial/APKBUILD
@@ -1,43 +1,31 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=statserial
 pkgver=1.1
-pkgrel=4
+pkgrel=8
 pkgdesc="Display serial port modem status lines"
-url="http://sunsite.unc.edu/pub/Linux/system/Serial"
+url="https://ibiblio.org/pub/linux/system/serial"
 arch="all"
-license="GPL"
-depends=""
-depends_dev="ncurses-dev"
-makedepends="$depends_dev"
-install=""
-subpackages=""
-source="http://ibiblio.org/pub/linux/system/serial/statserial-$pkgver.tar.gz
+license="GPL-2.0-or-later"
+makedepends="ncurses-dev"
+source="https://ibiblio.org/pub/linux/system/serial/statserial-$pkgver.tar.gz
 	statserial-1.patch
 	statserial-c.patch
 	makefile.patch
 	"
-_builddir="$srcdir"/$pkgname-$pkgver
+options="!check"
+
 prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
 	sed -i -e "s/\/local//" Makefile
 }
 
 build() {
-	cd "$_builddir"
-	make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="${CC:-gcc}" || return 1
+	make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="${CC:-gcc}"
 }
 
 package() {
-	cd "$_builddir"
-	mkdir -p $pkgdir/usr/bin
-	install -m755 $pkgname $pkgdir/usr/bin/$pkgname
+	install -Dm755 statserial -t "$pkgdir"/usr/bin
 }
 
 sha512sums="070ec4b6fb4a432fd406571319d9431d55c6dd43ee9298c1907011038a57dd3efd5def434aeb6884fb195cc90aa961d2ad2ff0567c9c69173e6f4adc0509a805  statserial-1.1.tar.gz
diff --git a/main/stfl/APKBUILD b/main/stfl/APKBUILD
deleted file mode 100644
index 41a7eb0ec8c..00000000000
--- a/main/stfl/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=stfl
-pkgver=0.24
-pkgrel=2
-pkgdesc="The Structured Terminal Forms Language/Library"
-url="http://www.clifford.at/stfl/"
-arch="all"
-license="LGPL-3.0-or-later"
-depends=""
-depends_dev=""
-makedepends="$depends_dev ncurses-dev"
-install=""
-subpackages="$pkgname-dev"
-source="http://www.clifford.at/stfl/stfl-$pkgver.tar.gz
-	ncurses.patch"
-
-_builddir="$srcdir"/stfl-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	make prefix=/usr || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make prefix=/usr DESTDIR="$pkgdir" install || return 1
-	cd "$pkgdir"/usr/lib
-	ln -s libstfl.so.0.24 libstfl.so.0
-}
-
-sha512sums="95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0  stfl-0.24.tar.gz
-d445b7bebd53ab23765f8386d8e69080df1cf95ca7368dee98594176e5a99f73d741a14e81af1500dc249c2a485574a5323d16fffa12536f7f3f20049b636de6  ncurses.patch"
diff --git a/main/stfl/ncurses.patch b/main/stfl/ncurses.patch
deleted file mode 100644
index 215d35d0243..00000000000
--- a/main/stfl/ncurses.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-We need -D_XOPEN_SOURCE_EXTENDED for widechar in ncurses
-
-diff --git a/stfl_internals.h b/stfl_internals.h
-index 3f9f45b..1559626 100644
---- a/stfl_internals.h
-+++ b/stfl_internals.h
-@@ -28,7 +28,7 @@ extern "C" {
- #endif
- 
- #include "stfl.h"
--#include <ncursesw/ncurses.h>
-+#include <ncurses.h>
- #include <pthread.h>
- 
- struct stfl_widget_type;
---- ./Makefile.orig
-+++ ./Makefile
-@@ -21,7 +21,7 @@
- include Makefile.cfg
- 
- export CC = gcc -pthread
--export CFLAGS += -I. -Wall -Os -ggdb -D_GNU_SOURCE -fPIC
-+export CFLAGS += -I. -Wall -Os -ggdb -D_GNU_SOURCE -D_XOPEN_SOURCE_EXTENDED -fPIC
- export LDLIBS += -lncursesw
- 
- SONAME  := libstfl.so.0
diff --git a/main/strace/APKBUILD b/main/strace/APKBUILD
index 872163556f4..c5143adb948 100644
--- a/main/strace/APKBUILD
+++ b/main/strace/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=strace
-pkgver=5.5
+pkgver=6.8
 pkgrel=0
 pkgdesc="Diagnostic, debugging and instructional userspace tracer"
 url="https://strace.io"
@@ -8,19 +8,16 @@ arch="all"
 # disable checks for now, due to testsuite failure
 options="!check"
 license="BSD-3-Clause"
-makedepends="linux-headers autoconf automake gawk"
+# strace with libunwind doesn't work right on musl
+makedepends="binutils-dev elfutils-dev gawk linux-headers"
 subpackages="$pkgname-doc"
 source="https://github.com/strace/strace/releases/download/v$pkgver/strace-$pkgver.tar.xz
 	disable-fortify.patch
 	nlattr-fix.patch
 	"
 
-
 build() {
-	case "$CLIBC" in
-	musl) export CFLAGS="$CFLAGS -Dsigcontext_struct=sigcontext" ;;
-	esac
-
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -37,9 +34,11 @@ check() {
 }
 
 package() {
-	make -j1 DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="317fe6341000b452cf038433c2a9a7bcdc8ce736e97b242673ce066dd9dbd3b2c3435a014b529429fdf2ac8af5c3a72d62971b293d007b7d3efcbb684c216231  strace-5.5.tar.xz
+sha512sums="
+c477724a77112a74a5236a38b7dbaa9b6199622a1d21cc6253cac80dc4ddea78aeaf8cddf4a51ee4119e00e1adaf95f64f64e20d9775ec3edd77cd82c8f7b30e  strace-6.8.tar.xz
 273b92ebf0069f19bef7ec26c7860e2af7ef01e782255c70ded1ae5e967f8f6bf031ecba96612c6083bf58f46278ba4ab3ec0fb35b08c8c8d668191f97adee52  disable-fortify.patch
-44b1872cf996caa4970fa6c2875a3a2cffe4a38455e328d968bd7855ef9a05cf41190794dc137bc8667576635f5271057cf0e6cde9a6c7aee66afd1dba9bdba0  nlattr-fix.patch"
+44b1872cf996caa4970fa6c2875a3a2cffe4a38455e328d968bd7855ef9a05cf41190794dc137bc8667576635f5271057cf0e6cde9a6c7aee66afd1dba9bdba0  nlattr-fix.patch
+"
diff --git a/main/strongswan/0001-charon-add-optional-source-and-remote-overrides-for-.patch b/main/strongswan/0001-charon-add-optional-source-and-remote-overrides-for-.patch
new file mode 100644
index 00000000000..5bfb92b8d19
--- /dev/null
+++ b/main/strongswan/0001-charon-add-optional-source-and-remote-overrides-for-.patch
@@ -0,0 +1,580 @@
+From 9be9c9d0c677725bd5b3353bf2ae032b1693285e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Mon, 21 Sep 2015 13:41:58 +0300
+Subject: [PATCH 1/3] charon: add optional source and remote overrides for
+ initiate
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This introduces support for specifying optional IKE SA specific
+source and remote address for child sa initiation. This allows
+to initiate wildcard connection for known address via vici.
+
+In addition this allows impler implementation of trap-any patches
+and is a prerequisite for dmvpn support.
+
+Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+---
+ src/charon-cmd/cmd/cmd_connection.c           |  2 +-
+ src/libcharon/control/controller.c            | 42 +++++++++++-
+ src/libcharon/control/controller.h            |  3 +
+ src/libcharon/plugins/stroke/stroke_control.c |  5 +-
+ src/libcharon/plugins/vici/vici_config.c      |  2 +-
+ src/libcharon/plugins/vici/vici_control.c     | 65 ++++++++++++++++---
+ .../processing/jobs/start_action_job.c        |  2 +-
+ src/libcharon/sa/ike_sa_manager.c             | 50 +++++++++++++-
+ src/libcharon/sa/ike_sa_manager.h             |  8 ++-
+ src/libcharon/sa/trap_manager.c               | 44 +++++--------
+ src/swanctl/commands/initiate.c               | 40 +++++++++++-
+ 11 files changed, 216 insertions(+), 47 deletions(-)
+
+diff --git a/src/charon-cmd/cmd/cmd_connection.c b/src/charon-cmd/cmd/cmd_connection.c
+index 8e8d8236e..7df5bc9bf 100644
+--- a/src/charon-cmd/cmd/cmd_connection.c
++++ b/src/charon-cmd/cmd/cmd_connection.c
+@@ -439,7 +439,7 @@ static job_requeue_t initiate(private_cmd_connection_t *this)
+ 	child_cfg = create_child_cfg(this, peer_cfg);
+ 
+ 	if (charon->controller->initiate(charon->controller, peer_cfg, child_cfg,
+-				controller_cb_empty, NULL, LEVEL_SILENT, 0, FALSE) != SUCCESS)
++				NULL, NULL, controller_cb_empty, NULL, LEVEL_SILENT, 0, FALSE) != SUCCESS)
+ 	{
+ 		terminate(pid);
+ 	}
+diff --git a/src/libcharon/control/controller.c b/src/libcharon/control/controller.c
+index 027f48e93..4ce8616a5 100644
+--- a/src/libcharon/control/controller.c
++++ b/src/libcharon/control/controller.c
+@@ -15,6 +15,28 @@
+  * for more details.
+  */
+ 
++/*
++ * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++ * THE SOFTWARE.
++ */
++
+ #include "controller.h"
+ 
+ #include <sys/types.h>
+@@ -107,6 +129,16 @@ struct interface_listener_t {
+ 	 */
+ 	ike_sa_t *ike_sa;
+ 
++	/**
++	 * Our host hint.
++	 */
++	host_t *my_host;
++
++	/**
++	 * Other host hint.
++	 */
++	host_t *other_host;
++
+ 	/**
+ 	 * unique ID, used for various methods
+ 	 */
+@@ -417,10 +449,15 @@ METHOD(job_t, initiate_execute, job_requeue_t,
+ 	ike_sa_t *ike_sa;
+ 	interface_listener_t *listener = &job->listener;
+ 	peer_cfg_t *peer_cfg = listener->peer_cfg;
++	host_t *my_host = listener->my_host;
++	host_t *other_host = listener->other_host;
+ 
+ 	ike_sa = charon->ike_sa_manager->checkout_by_config(charon->ike_sa_manager,
+-														peer_cfg);
++														peer_cfg, my_host, other_host);
+ 	peer_cfg->destroy(peer_cfg);
++	DESTROY_IF(my_host);
++	DESTROY_IF(other_host);
++
+ 	if (!ike_sa)
+ 	{
+ 		DESTROY_IF(listener->child_cfg);
+@@ -499,6 +536,7 @@ METHOD(job_t, initiate_execute, job_requeue_t,
+ 
+ METHOD(controller_t, initiate, status_t,
+ 	private_controller_t *this, peer_cfg_t *peer_cfg, child_cfg_t *child_cfg,
++	host_t *my_host, host_t *other_host,
+ 	controller_cb_t callback, void *param, level_t max_level, u_int timeout,
+ 	bool limits)
+ {
+@@ -523,6 +561,8 @@ METHOD(controller_t, initiate, status_t,
+ 			.status = FAILED,
+ 			.child_cfg = child_cfg,
+ 			.peer_cfg = peer_cfg,
++			.my_host = my_host ? my_host->clone(my_host) : NULL,
++			.other_host = other_host ? other_host->clone(other_host) : NULL,
+ 			.lock = spinlock_create(),
+ 			.options.limits = limits,
+ 		},
+diff --git a/src/libcharon/control/controller.h b/src/libcharon/control/controller.h
+index 36a1d4631..a130fbb6b 100644
+--- a/src/libcharon/control/controller.h
++++ b/src/libcharon/control/controller.h
+@@ -81,6 +81,8 @@ struct controller_t {
+ 	 *
+ 	 * @param peer_cfg		peer_cfg to use for IKE_SA setup
+ 	 * @param child_cfg		optional child_cfg to set up CHILD_SA from
++	 * @param my_host		optional address hint for source
++	 * @param other_host		optional address hint for destination
+ 	 * @param cb			logging callback
+ 	 * @param param			parameter to include in each call of cb
+ 	 * @param max_level		maximum log level for which cb is invoked
+@@ -95,6 +97,7 @@ struct controller_t {
+ 	 */
+ 	status_t (*initiate)(controller_t *this,
+ 						 peer_cfg_t *peer_cfg, child_cfg_t *child_cfg,
++						 host_t *my_host, host_t *other_host,
+ 						 controller_cb_t callback, void *param,
+ 						 level_t max_level, u_int timeout, bool limits);
+ 
+diff --git a/src/libcharon/plugins/stroke/stroke_control.c b/src/libcharon/plugins/stroke/stroke_control.c
+index 2824c93cb..21ff6b31f 100644
+--- a/src/libcharon/plugins/stroke/stroke_control.c
++++ b/src/libcharon/plugins/stroke/stroke_control.c
+@@ -109,7 +109,7 @@ static void charon_initiate(private_stroke_control_t *this, peer_cfg_t *peer_cfg
+ 	if (msg->output_verbosity < 0)
+ 	{
+ 		charon->controller->initiate(charon->controller, peer_cfg, child_cfg,
+-									 NULL, NULL, 0, 0, FALSE);
++									 NULL, NULL, NULL, NULL, 0, 0, FALSE);
+ 	}
+ 	else
+ 	{
+@@ -117,7 +117,8 @@ static void charon_initiate(private_stroke_control_t *this, peer_cfg_t *peer_cfg
+ 		status_t status;
+ 
+ 		status = charon->controller->initiate(charon->controller,
+-							peer_cfg, child_cfg, (controller_cb_t)stroke_log,
++							peer_cfg, child_cfg, NULL, NULL,
++							(controller_cb_t)stroke_log,
+ 							&info, msg->output_verbosity, this->timeout, FALSE);
+ 		switch (status)
+ 		{
+diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c
+index 522122562..b1486e337 100644
+--- a/src/libcharon/plugins/vici/vici_config.c
++++ b/src/libcharon/plugins/vici/vici_config.c
+@@ -2252,7 +2252,7 @@ static void run_start_action(private_vici_config_t *this, peer_cfg_t *peer_cfg,
+ 		DBG1(DBG_CFG, "initiating '%s'", child_cfg->get_name(child_cfg));
+ 		charon->controller->initiate(charon->controller,
+ 					peer_cfg->get_ref(peer_cfg), child_cfg->get_ref(child_cfg),
+-					NULL, NULL, 0, 0, FALSE);
++					NULL, NULL, NULL, NULL, 0, 0, FALSE);
+ 	}
+ }
+ 
+diff --git a/src/libcharon/plugins/vici/vici_control.c b/src/libcharon/plugins/vici/vici_control.c
+index 1c236d249..811d8dbc7 100644
+--- a/src/libcharon/plugins/vici/vici_control.c
++++ b/src/libcharon/plugins/vici/vici_control.c
+@@ -15,6 +15,28 @@
+  * for more details.
+  */
+ 
++/*
++ * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++ * THE SOFTWARE.
++ */
++
+ #include "vici_control.h"
+ #include "vici_builder.h"
+ 
+@@ -173,9 +195,11 @@ static child_cfg_t* find_child_cfg(char *name, char *pname, peer_cfg_t **out)
+ CALLBACK(initiate, vici_message_t*,
+ 	private_vici_control_t *this, char *name, u_int id, vici_message_t *request)
+ {
++	vici_message_t* msg;
+ 	peer_cfg_t *peer_cfg = NULL;
+ 	child_cfg_t *child_cfg;
+-	char *child, *ike, *type, *sa;
++	host_t *my_host = NULL, *other_host = NULL;
++	char *child, *ike, *type, *sa, *my_host_str, *other_host_str;
+ 	int timeout;
+ 	bool limits;
+ 	controller_cb_t log_cb = NULL;
+@@ -189,6 +213,8 @@ CALLBACK(initiate, vici_message_t*,
+ 	timeout = request->get_int(request, 0, "timeout");
+ 	limits = request->get_bool(request, FALSE, "init-limits");
+ 	log.level = request->get_int(request, 1, "loglevel");
++	my_host_str = request->get_str(request, NULL, "my-host");
++	other_host_str = request->get_str(request, NULL, "other-host");
+ 
+ 	if (!child && !ike)
+ 	{
+@@ -199,31 +225,52 @@ CALLBACK(initiate, vici_message_t*,
+ 		log_cb = (controller_cb_t)log_vici;
+ 	}
+ 
++	if (my_host_str)
++	{
++		my_host = host_create_from_string(my_host_str, 0);
++	}
++	if (other_host_str)
++	{
++		other_host = host_create_from_string(other_host_str, 0);
++	}
++
++
+ 	type = child ? "CHILD_SA" : "IKE_SA";
+ 	sa = child ?: ike;
+ 
+ 	child_cfg = find_child_cfg(child, ike, &peer_cfg);
+ 
+-	DBG1(DBG_CFG, "vici initiate %s '%s'", type, sa);
++	DBG1(DBG_CFG, "vici initiate %s '%s', me %H, other %H, limits %d", type, sa, my_host, other_host, limits);
+ 	if (!peer_cfg)
+ 	{
+-		return send_reply(this, "%s config '%s' not found", type, sa);
++		msg = send_reply(this, "%s config '%s' not found", type, sa);
++		goto ret;
+ 	}
+-	switch (charon->controller->initiate(charon->controller, peer_cfg, child_cfg,
+-										 log_cb, &log, log.level, timeout, limits))
++	switch (charon->controller->initiate(charon->controller,
++				peer_cfg, child_cfg,
++										 my_host, other_host,
++				log_cb, &log, log.level, timeout, limits))
+ 	{
+ 		case SUCCESS:
+-			return send_reply(this, NULL);
++			msg = send_reply(this, NULL);
++			break;
+ 		case OUT_OF_RES:
+-			return send_reply(this, "%s '%s' not established after %dms", type,
++			msg = send_reply(this, "%s '%s' not established after %dms", type,
+ 							  sa, timeout);
++			break;
+ 		case INVALID_STATE:
+-			return send_reply(this, "establishing %s '%s' not possible at the "
++			msg = send_reply(this, "establishing %s '%s' not possible at the "
+ 							  "moment due to limits", type, sa);
++			break;
+ 		case FAILED:
+ 		default:
+-			return send_reply(this, "establishing %s '%s' failed", type, sa);
++			msg = send_reply(this, "establishing %s '%s' failed", type, sa);
++			break;
+ 	}
++ret:
++	if (my_host) my_host->destroy(my_host);
++	if (other_host) other_host->destroy(other_host);
++	return msg;
+ }
+ 
+ /**
+diff --git a/src/libcharon/processing/jobs/start_action_job.c b/src/libcharon/processing/jobs/start_action_job.c
+index 122e5cee9..dec458c84 100644
+--- a/src/libcharon/processing/jobs/start_action_job.c
++++ b/src/libcharon/processing/jobs/start_action_job.c
+@@ -84,7 +84,7 @@ METHOD(job_t, execute, job_requeue_t,
+ 				charon->controller->initiate(charon->controller,
+ 											 peer_cfg->get_ref(peer_cfg),
+ 											 child_cfg->get_ref(child_cfg),
+-											 NULL, NULL, 0, 0, FALSE);
++											 NULL, NULL, NULL, NULL, 0, 0, FALSE);
+ 			}
+ 		}
+ 		children->destroy(children);
+diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c
+index 7763ae844..f653cc514 100644
+--- a/src/libcharon/sa/ike_sa_manager.c
++++ b/src/libcharon/sa/ike_sa_manager.c
+@@ -16,6 +16,28 @@
+  * for more details.
+  */
+ 
++/*
++ * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++ * THE SOFTWARE.
++ */
++
+ #include <string.h>
+ #include <inttypes.h>
+ 
+@@ -1498,7 +1520,8 @@ typedef struct {
+ } config_entry_t;
+ 
+ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
+-	private_ike_sa_manager_t *this, peer_cfg_t *peer_cfg)
++	private_ike_sa_manager_t *this, peer_cfg_t *peer_cfg,
++	host_t *my_host, host_t *other_host)
+ {
+ 	enumerator_t *enumerator;
+ 	entry_t *entry;
+@@ -1509,7 +1532,17 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
+ 	u_int segment;
+ 	int i;
+ 
+-	DBG2(DBG_MGR, "checkout IKE_SA by config");
++	if (my_host && my_host->get_port(my_host) == 0)
++	{
++		my_host->set_port(my_host, IKEV2_UDP_PORT);
++	}
++	if (other_host && other_host->get_port(other_host) == 0)
++	{
++		other_host->set_port(other_host, IKEV2_UDP_PORT);
++	}
++
++	DBG2(DBG_MGR, "checkout IKE_SA by config '%s', me %H, other %H",
++		 peer_cfg->get_name(peer_cfg), my_host, other_host);
+ 
+ 	if (!this->reuse_ikesa && peer_cfg->get_ike_version(peer_cfg) != IKEV1)
+ 	{	/* IKE_SA reuse disabled by config (not possible for IKEv1) */
+@@ -1567,6 +1600,15 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
+ 			continue;
+ 		}
+ 
++		if (my_host && !my_host->ip_equals(my_host, entry->ike_sa->get_my_host(entry->ike_sa)))
++		{
++			continue;
++		}
++		if (other_host && !other_host->ip_equals(other_host, entry->ike_sa->get_other_host(entry->ike_sa)))
++		{
++			continue;
++		}
++
+ 		current_peer = entry->ike_sa->get_peer_cfg(entry->ike_sa);
+ 		if (current_peer && current_peer->equals(current_peer, peer_cfg))
+ 		{
+@@ -1593,6 +1635,10 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
+ 		{
+ 			ike_sa->set_peer_cfg(ike_sa, peer_cfg);
+ 			checkout_new(this, ike_sa);
++			if (my_host || other_host)
++			{
++				ike_sa->update_hosts(ike_sa, my_host, other_host, TRUE);
++			}
+ 		}
+ 	}
+ 	charon->bus->set_sa(charon->bus, ike_sa);
+diff --git a/src/libcharon/sa/ike_sa_manager.h b/src/libcharon/sa/ike_sa_manager.h
+index 004cc2216..50f8246f8 100644
+--- a/src/libcharon/sa/ike_sa_manager.h
++++ b/src/libcharon/sa/ike_sa_manager.h
+@@ -123,7 +123,8 @@ struct ike_sa_manager_t {
+ 	ike_sa_t* (*checkout_by_message) (ike_sa_manager_t* this, message_t *message);
+ 
+ 	/**
+-	 * Checkout an IKE_SA for initiation by a peer_config.
++	 * Checkout an IKE_SA for initiation by a peer_config and optional
++	 * source and remote host addresses.
+ 	 *
+ 	 * To initiate, a CHILD_SA may be established within an existing IKE_SA.
+ 	 * This call checks for an existing IKE_SA by comparing the configuration.
+@@ -136,9 +137,12 @@ struct ike_sa_manager_t {
+ 	 * @note The peer_config is always set on the returned IKE_SA.
+ 	 *
+ 	 * @param peer_cfg			configuration used to find an existing IKE_SA
++	 * @param my_host			source host address for wildcard peer_cfg
++	 * @param other_host		remote host address for wildcard peer_cfg
+ 	 * @return					checked out/created IKE_SA
+ 	 */
+-	ike_sa_t *(*checkout_by_config)(ike_sa_manager_t* this, peer_cfg_t *peer_cfg);
++	ike_sa_t *(*checkout_by_config)(ike_sa_manager_t* this, peer_cfg_t *peer_cfg,
++									host_t *my_host, host_t *other_host);
+ 
+ 	/**
+ 	 * Reset initiator SPI.
+diff --git a/src/libcharon/sa/trap_manager.c b/src/libcharon/sa/trap_manager.c
+index 1b85c66a5..35e19f86d 100644
+--- a/src/libcharon/sa/trap_manager.c
++++ b/src/libcharon/sa/trap_manager.c
+@@ -523,7 +523,7 @@ METHOD(trap_manager_t, acquire, void,
+ 	peer_cfg_t *peer;
+ 	child_cfg_t *child;
+ 	ike_sa_t *ike_sa;
+-	host_t *host;
++	host_t *host, *my_host = NULL, *other_host = NULL;
+ 	uint32_t allocated_reqid;
+ 	bool wildcard, ignore = FALSE;
+ 
+@@ -603,37 +603,27 @@ METHOD(trap_manager_t, acquire, void,
+ 	this->lock->unlock(this->lock);
+ 
+ 	if (wildcard)
+-	{	/* the peer config would match IKE_SAs with other peers */
+-		ike_sa = charon->ike_sa_manager->create_new(charon->ike_sa_manager,
+-											peer->get_ike_version(peer), TRUE);
+-		if (ike_sa)
+-		{
+-			ike_cfg_t *ike_cfg;
+-			uint16_t port;
+-			uint8_t mask;
+-
+-			ike_sa->set_peer_cfg(ike_sa, peer);
+-			ike_cfg = ike_sa->get_ike_cfg(ike_sa);
++	{
++		ike_cfg_t *ike_cfg;
++		uint16_t port;
++		uint8_t mask;
+ 
+-			port = ike_cfg->get_other_port(ike_cfg);
+-			data->dst->to_subnet(data->dst, &host, &mask);
+-			host->set_port(host, port);
+-			ike_sa->set_other_host(ike_sa, host);
++		ike_cfg = peer->get_ike_cfg(peer);
+ 
+-			port = ike_cfg->get_my_port(ike_cfg);
+-			data->src->to_subnet(data->src, &host, &mask);
+-			host->set_port(host, port);
+-			ike_sa->set_my_host(ike_sa, host);
++		port = ike_cfg->get_other_port(ike_cfg);
++		data->dst->to_subnet(data->dst, &other_host, &mask);
++		other_host->set_port(other_host, port);
+ 
+-			charon->bus->set_sa(charon->bus, ike_sa);
+-		}
+-	}
+-	else
+-	{
+-		ike_sa = charon->ike_sa_manager->checkout_by_config(
+-											charon->ike_sa_manager, peer);
++		port = ike_cfg->get_my_port(ike_cfg);
++		data->src->to_subnet(data->src, &my_host, &mask);
++		my_host->set_port(my_host, port);
+ 	}
++	ike_sa = charon->ike_sa_manager->checkout_by_config(
++											charon->ike_sa_manager, peer,
++											my_host, other_host);
+ 	peer->destroy(peer);
++	DESTROY_IF(my_host);
++	DESTROY_IF(other_host);
+ 
+ 	if (ike_sa)
+ 	{
+diff --git a/src/swanctl/commands/initiate.c b/src/swanctl/commands/initiate.c
+index e0fffb907..dcaded59d 100644
+--- a/src/swanctl/commands/initiate.c
++++ b/src/swanctl/commands/initiate.c
+@@ -14,6 +14,28 @@
+  * for more details.
+  */
+ 
++/*
++ * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++ * THE SOFTWARE.
++ */
++
+ #include "command.h"
+ 
+ #include <errno.h>
+@@ -38,7 +60,7 @@ static int initiate(vici_conn_t *conn)
+ 	vici_req_t *req;
+ 	vici_res_t *res;
+ 	command_format_options_t format = COMMAND_FORMAT_NONE;
+-	char *arg, *child = NULL, *ike = NULL;
++	char *arg, *child = NULL, *ike = NULL, *my_host = NULL, *other_host = NULL;
+ 	int ret = 0, timeout = 0, level = 1;
+ 
+ 	while (TRUE)
+@@ -65,6 +87,12 @@ static int initiate(vici_conn_t *conn)
+ 			case 'l':
+ 				level = atoi(arg);
+ 				continue;
++			case 'S':
++				my_host = arg;
++				continue;
++			case 'R':
++				other_host = arg;
++				continue;
+ 			case EOF:
+ 				break;
+ 			default:
+@@ -88,6 +116,14 @@ static int initiate(vici_conn_t *conn)
+ 	{
+ 		vici_add_key_valuef(req, "ike", "%s", ike);
+ 	}
++	if (my_host)
++	{
++		vici_add_key_valuef(req, "my-host", "%s", my_host);
++	}
++	if (other_host)
++	{
++		vici_add_key_valuef(req, "other-host", "%s", other_host);
++	}
+ 	if (timeout)
+ 	{
+ 		vici_add_key_valuef(req, "timeout", "%d", timeout * 1000);
+@@ -134,6 +170,8 @@ static void __attribute__ ((constructor))reg()
+ 			{"help",		'h', 0, "show usage information"},
+ 			{"child",		'c', 1, "initiate a CHILD_SA configuration"},
+ 			{"ike",			'i', 1, "initiate an IKE_SA, or name of child's parent"},
++			{"source",		'S', 1, "override source address"},
++			{"remote",		'R', 1, "override remote address"},
+ 			{"timeout",		't', 1, "timeout in seconds before detaching"},
+ 			{"raw",			'r', 0, "dump raw response message"},
+ 			{"pretty",		'P', 0, "dump raw response message in pretty print"},
+-- 
+2.43.0
+
diff --git a/main/strongswan/0002-vici-send-certificates-for-ike-sa-events.patch b/main/strongswan/0002-vici-send-certificates-for-ike-sa-events.patch
new file mode 100644
index 00000000000..e8c0cccf020
--- /dev/null
+++ b/main/strongswan/0002-vici-send-certificates-for-ike-sa-events.patch
@@ -0,0 +1,140 @@
+From 4e40c18f1f8706602f7dad9ded8904b7d60e79a1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Mon, 21 Sep 2015 13:42:05 +0300
+Subject: [PATCH 2/3] vici: send certificates for ike-sa events
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+---
+ src/libcharon/plugins/vici/vici_query.c | 50 +++++++++++++++++++++----
+ 1 file changed, 42 insertions(+), 8 deletions(-)
+
+diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c
+index bacb7b101..19acc0789 100644
+--- a/src/libcharon/plugins/vici/vici_query.c
++++ b/src/libcharon/plugins/vici/vici_query.c
+@@ -402,7 +402,7 @@ static void list_vips(private_vici_query_t *this, vici_builder_t *b,
+  * List details of an IKE_SA
+  */
+ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
+-					 ike_sa_t *ike_sa, time_t now)
++					 ike_sa_t *ike_sa, time_t now, bool add_certs)
+ {
+ 	time_t t;
+ 	ike_sa_id_t *id;
+@@ -411,6 +411,8 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
+ 	uint32_t if_id;
+ 	uint16_t alg, ks;
+ 	host_t *host;
++	auth_cfg_t *auth_cfg;
++	enumerator_t *enumerator;
+ 
+ 	b->add_kv(b, "uniqueid", "%u", ike_sa->get_unique_id(ike_sa));
+ 	b->add_kv(b, "version", "%u", ike_sa->get_version(ike_sa));
+@@ -420,11 +422,43 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
+ 	b->add_kv(b, "local-host", "%H", host);
+ 	b->add_kv(b, "local-port", "%d", host->get_port(host));
+ 	b->add_kv(b, "local-id", "%Y", ike_sa->get_my_id(ike_sa));
++	if (add_certs)
++	{
++		enumerator = ike_sa->create_auth_cfg_enumerator(ike_sa, TRUE);
++		if (enumerator->enumerate(enumerator, &auth_cfg))
++		{
++			certificate_t *cert = auth_cfg->get(auth_cfg, AUTH_RULE_SUBJECT_CERT);
++			chunk_t encoding;
++
++			if (cert && cert->get_encoding(cert, CERT_ASN1_DER, &encoding))
++			{
++				b->add(b, VICI_KEY_VALUE, "local-cert-data", encoding);
++				free(encoding.ptr);
++			}
++		}
++		enumerator->destroy(enumerator);
++	}
+ 
+ 	host = ike_sa->get_other_host(ike_sa);
+ 	b->add_kv(b, "remote-host", "%H", host);
+ 	b->add_kv(b, "remote-port", "%d", host->get_port(host));
+ 	b->add_kv(b, "remote-id", "%Y", ike_sa->get_other_id(ike_sa));
++	if (add_certs)
++	{
++		enumerator = ike_sa->create_auth_cfg_enumerator(ike_sa, FALSE);
++		if (enumerator->enumerate(enumerator, &auth_cfg))
++		{
++			certificate_t *cert = auth_cfg->get(auth_cfg, AUTH_RULE_SUBJECT_CERT);
++			chunk_t encoding;
++
++			if (cert && cert->get_encoding(cert, CERT_ASN1_DER, &encoding))
++			{
++				b->add(b, VICI_KEY_VALUE, "remote-cert-data", encoding);
++				free(encoding.ptr);
++			}
++		}
++		enumerator->destroy(enumerator);
++	}
+ 
+ 	eap = ike_sa->get_other_eap_id(ike_sa);
+ 
+@@ -556,7 +590,7 @@ CALLBACK(list_sas, vici_message_t*,
+ 		b = vici_builder_create();
+ 		b->begin_section(b, ike_sa->get_name(ike_sa));
+ 
+-		list_ike(this, b, ike_sa, now);
++		list_ike(this, b, ike_sa, now, TRUE);
+ 
+ 		b->begin_section(b, "child-sas");
+ 		csas = ike_sa->create_child_sa_enumerator(ike_sa);
+@@ -1774,7 +1808,7 @@ METHOD(listener_t, ike_updown, bool,
+ 	}
+ 
+ 	b->begin_section(b, ike_sa->get_name(ike_sa));
+-	list_ike(this, b, ike_sa, now);
++	list_ike(this, b, ike_sa, now, up);
+ 	b->end_section(b);
+ 
+ 	this->dispatcher->raise_event(this->dispatcher,
+@@ -1799,10 +1833,10 @@ METHOD(listener_t, ike_rekey, bool,
+ 	b = vici_builder_create();
+ 	b->begin_section(b, old->get_name(old));
+ 	b->begin_section(b, "old");
+-	list_ike(this, b, old, now);
++	list_ike(this, b, old, now, TRUE);
+ 	b->end_section(b);
+ 	b->begin_section(b, "new");
+-	list_ike(this, b, new, now);
++	list_ike(this, b, new, now, TRUE);
+ 	b->end_section(b);
+ 	b->end_section(b);
+ 
+@@ -1833,7 +1867,7 @@ METHOD(listener_t, ike_update, bool,
+ 	b->add_kv(b, "remote-port", "%d", remote->get_port(remote));
+ 
+ 	b->begin_section(b, ike_sa->get_name(ike_sa));
+-	list_ike(this, b, ike_sa, now);
++	list_ike(this, b, ike_sa, now, TRUE);
+ 	b->end_section(b);
+ 
+ 	this->dispatcher->raise_event(this->dispatcher,
+@@ -1863,7 +1897,7 @@ METHOD(listener_t, child_updown, bool,
+ 	}
+ 
+ 	b->begin_section(b, ike_sa->get_name(ike_sa));
+-	list_ike(this, b, ike_sa, now);
++	list_ike(this, b, ike_sa, now, up);
+ 	b->begin_section(b, "child-sas");
+ 
+ 	snprintf(buf, sizeof(buf), "%s-%u", child_sa->get_name(child_sa),
+@@ -1898,7 +1932,7 @@ METHOD(listener_t, child_rekey, bool,
+ 	b = vici_builder_create();
+ 
+ 	b->begin_section(b, ike_sa->get_name(ike_sa));
+-	list_ike(this, b, ike_sa, now);
++	list_ike(this, b, ike_sa, now, TRUE);
+ 	b->begin_section(b, "child-sas");
+ 
+ 	b->begin_section(b, old->get_name(old));
+-- 
+2.43.0
+
diff --git a/main/strongswan/0003-vici-add-support-for-individual-sa-state-changes.patch b/main/strongswan/0003-vici-add-support-for-individual-sa-state-changes.patch
new file mode 100644
index 00000000000..a3b8d4abb0c
--- /dev/null
+++ b/main/strongswan/0003-vici-add-support-for-individual-sa-state-changes.patch
@@ -0,0 +1,159 @@
+From a2c62d06d4640643cc5a216c80aded4a20aee715 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Mon, 21 Sep 2015 13:42:11 +0300
+Subject: [PATCH 3/3] vici: add support for individual sa state changes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Useful for monitoring and tracking full SA.
+
+Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+---
+ src/libcharon/plugins/vici/vici_query.c | 105 ++++++++++++++++++++++++
+ 1 file changed, 105 insertions(+)
+
+diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c
+index 19acc0789..e008885f7 100644
+--- a/src/libcharon/plugins/vici/vici_query.c
++++ b/src/libcharon/plugins/vici/vici_query.c
+@@ -1774,8 +1774,16 @@ static void manage_commands(private_vici_query_t *this, bool reg)
+ 	this->dispatcher->manage_event(this->dispatcher, "ike-updown", reg);
+ 	this->dispatcher->manage_event(this->dispatcher, "ike-rekey", reg);
+ 	this->dispatcher->manage_event(this->dispatcher, "ike-update", reg);
++	this->dispatcher->manage_event(this->dispatcher, "ike-state-established", reg);
++	this->dispatcher->manage_event(this->dispatcher, "ike-state-destroying", reg);
+ 	this->dispatcher->manage_event(this->dispatcher, "child-updown", reg);
+ 	this->dispatcher->manage_event(this->dispatcher, "child-rekey", reg);
++	this->dispatcher->manage_event(this->dispatcher, "child-state-installing", reg);
++	this->dispatcher->manage_event(this->dispatcher, "child-state-installed", reg);
++	this->dispatcher->manage_event(this->dispatcher, "child-state-updating", reg);
++	this->dispatcher->manage_event(this->dispatcher, "child-state-rekeying", reg);
++	this->dispatcher->manage_event(this->dispatcher, "child-state-rekeyed", reg);
++	this->dispatcher->manage_event(this->dispatcher, "child-state-destroying", reg);
+ 	manage_command(this, "list-sas", list_sas, reg);
+ 	manage_command(this, "list-policies", list_policies, reg);
+ 	manage_command(this, "list-conns", list_conns, reg);
+@@ -1876,6 +1884,45 @@ METHOD(listener_t, ike_update, bool,
+ 	return TRUE;
+ }
+ 
++METHOD(listener_t, ike_state_change, bool,
++	private_vici_query_t *this, ike_sa_t *ike_sa, ike_sa_state_t state)
++{
++	char *event;
++	vici_builder_t *b;
++	time_t now;
++
++	switch (state)
++	{
++	case IKE_ESTABLISHED:
++		event = "ike-state-established";
++		break;
++	case IKE_DESTROYING:
++		event = "ike-state-destroying";
++		break;
++	default:
++		return TRUE;
++	}
++
++	if (!this->dispatcher->has_event_listeners(this->dispatcher, event))
++	{
++		return TRUE;
++	}
++
++	now = time_monotonic(NULL);
++
++	b = vici_builder_create();
++	b->begin_section(b, ike_sa->get_name(ike_sa));
++	list_ike(this, b, ike_sa, now, state != IKE_DESTROYING);
++	b->begin_section(b, "child-sas");
++	b->end_section(b);
++	b->end_section(b);
++
++	this->dispatcher->raise_event(this->dispatcher,
++								  event, 0, b->finalize(b));
++
++	return TRUE;
++}
++
+ METHOD(listener_t, child_updown, bool,
+ 	private_vici_query_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa, bool up)
+ {
+@@ -1955,6 +2002,62 @@ METHOD(listener_t, child_rekey, bool,
+ 	return TRUE;
+ }
+ 
++METHOD(listener_t, child_state_change, bool,
++	private_vici_query_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa, child_sa_state_t state)
++{
++	char *event;
++	vici_builder_t *b;
++	time_t now;
++
++	switch (state)
++	{
++	case CHILD_INSTALLING:
++		event = "child-state-installing";
++		break;
++	case CHILD_INSTALLED:
++		event = "child-state-installed";
++		break;
++	case CHILD_UPDATING:
++		event = "child-state-updating";
++		break;
++	case CHILD_REKEYING:
++		event = "child-state-rekeying";
++		break;
++	case CHILD_REKEYED:
++		event = "child-state-rekeyed";
++		break;
++	case CHILD_DESTROYING:
++		event = "child-state-destroying";
++		break;
++	default:
++		return TRUE;
++	}
++
++	if (!this->dispatcher->has_event_listeners(this->dispatcher, event))
++	{
++		return TRUE;
++	}
++
++	now = time_monotonic(NULL);
++
++	b = vici_builder_create();
++	b->begin_section(b, ike_sa->get_name(ike_sa));
++	list_ike(this, b, ike_sa, now, state != CHILD_DESTROYING);
++	b->begin_section(b, "child-sas");
++
++	b->begin_section(b, child_sa->get_name(child_sa));
++	list_child(this, b, child_sa, now);
++	b->end_section(b);
++
++	b->end_section(b);
++	b->end_section(b);
++
++	this->dispatcher->raise_event(this->dispatcher,
++								  event, 0, b->finalize(b));
++
++	return TRUE;
++}
++
+ METHOD(vici_query_t, destroy, void,
+ 	private_vici_query_t *this)
+ {
+@@ -1975,8 +2078,10 @@ vici_query_t *vici_query_create(vici_dispatcher_t *dispatcher)
+ 				.ike_updown = _ike_updown,
+ 				.ike_rekey = _ike_rekey,
+ 				.ike_update = _ike_update,
++				.ike_state_change = _ike_state_change,
+ 				.child_updown = _child_updown,
+ 				.child_rekey = _child_rekey,
++				.child_state_change = _child_state_change,
+ 			},
+ 			.destroy = _destroy,
+ 		},
+-- 
+2.43.0
+
diff --git a/main/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch b/main/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch
deleted file mode 100644
index c4a8b9d8f2f..00000000000
--- a/main/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 82ac8405bede7a0b950812ef940d5c15023bfd70 Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias@strongswan.org>
-Date: Fri, 17 Jul 2015 11:53:58 +0200
-Subject: [PATCH 1/4] ike: Adhere to IKE_SA limit when checking out by config
-
-This prevents new SAs from getting created if we hit the global IKE_SA
-limit (we still allow checkout_new(), which is used for rekeying).
----
- src/libcharon/sa/ike_sa_manager.c | 71 ++++++++++++++++---------------
- 1 file changed, 37 insertions(+), 34 deletions(-)
-
-diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c
-index 1de410d6c..440894e9b 100644
---- a/src/libcharon/sa/ike_sa_manager.c
-+++ b/src/libcharon/sa/ike_sa_manager.c
-@@ -1434,48 +1434,51 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
- 
- 	DBG2(DBG_MGR, "checkout IKE_SA by config");
- 
--	if (!this->reuse_ikesa && peer_cfg->get_ike_version(peer_cfg) != IKEV1)
--	{	/* IKE_SA reuse disabled by config (not possible for IKEv1) */
--		ike_sa = checkout_new(this, peer_cfg->get_ike_version(peer_cfg), TRUE);
--		charon->bus->set_sa(charon->bus, ike_sa);
--		goto out;
--	}
--
--	enumerator = create_table_enumerator(this);
--	while (enumerator->enumerate(enumerator, &entry, &segment))
-+	if (this->reuse_ikesa || peer_cfg->get_ike_version(peer_cfg) == IKEV1)
- 	{
--		if (!wait_for_entry(this, entry, segment))
-+		enumerator = create_table_enumerator(this);
-+		while (enumerator->enumerate(enumerator, &entry, &segment))
- 		{
--			continue;
--		}
--		if (entry->ike_sa->get_state(entry->ike_sa) == IKE_DELETING ||
--			entry->ike_sa->get_state(entry->ike_sa) == IKE_REKEYED)
--		{	/* skip IKE_SAs which are not usable, wake other waiting threads */
--			entry->condvar->signal(entry->condvar);
--			continue;
--		}
--
--		current_peer = entry->ike_sa->get_peer_cfg(entry->ike_sa);
--		if (current_peer && current_peer->equals(current_peer, peer_cfg))
--		{
--			current_ike = current_peer->get_ike_cfg(current_peer);
--			if (current_ike->equals(current_ike, peer_cfg->get_ike_cfg(peer_cfg)))
-+			if (!wait_for_entry(this, entry, segment))
- 			{
--				entry->checked_out = thread_current();
--				ike_sa = entry->ike_sa;
--				DBG2(DBG_MGR, "found existing IKE_SA %u with a '%s' config",
--						ike_sa->get_unique_id(ike_sa),
--						current_peer->get_name(current_peer));
--				break;
-+				continue;
- 			}
-+			if (entry->ike_sa->get_state(entry->ike_sa) == IKE_DELETING ||
-+				entry->ike_sa->get_state(entry->ike_sa) == IKE_REKEYED)
-+			{	/* skip IKE_SAs which are not usable, wake other waiting threads */
-+				entry->condvar->signal(entry->condvar);
-+				continue;
-+			}
-+			current_peer = entry->ike_sa->get_peer_cfg(entry->ike_sa);
-+			if (current_peer && current_peer->equals(current_peer, peer_cfg))
-+			{
-+				current_ike = current_peer->get_ike_cfg(current_peer);
-+				if (current_ike->equals(current_ike,
-+										peer_cfg->get_ike_cfg(peer_cfg)))
-+				{
-+					entry->checked_out = thread_current();
-+					ike_sa = entry->ike_sa;
-+					DBG2(DBG_MGR, "found existing IKE_SA %u with a '%s' config",
-+							ike_sa->get_unique_id(ike_sa),
-+							current_peer->get_name(current_peer));
-+					break;
-+				}
-+			}
-+			/* other threads might be waiting for this entry */
-+			entry->condvar->signal(entry->condvar);
- 		}
--		/* other threads might be waiting for this entry */
--		entry->condvar->signal(entry->condvar);
-+		enumerator->destroy(enumerator);
- 	}
--	enumerator->destroy(enumerator);
- 
- 	if (!ike_sa)
--	{	/* no IKE_SA using such a config, hand out a new */
-+	{	/* no IKE_SA using such a config, or reuse disabled, hand out a new */
-+		if (this->ikesa_limit &&
-+			this->public.get_count(&this->public) >= this->ikesa_limit)
-+		{
-+			DBG1(DBG_MGR, "IKE_SA creation failed, hitting IKE_SA limit (%u)",
-+				 this->ikesa_limit);
-+			return NULL;
-+		}
- 		ike_sa = checkout_new(this, peer_cfg->get_ike_version(peer_cfg), TRUE);
- 	}
- 	charon->bus->set_sa(charon->bus, ike_sa);
--- 
-2.24.0
-
diff --git a/main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch b/main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch
deleted file mode 100644
index 72a7b59e29c..00000000000
--- a/main/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch
+++ /dev/null
@@ -1,588 +0,0 @@
-From 809c18140e39d9f16137e478c2142f7c55f39b1c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Mon, 21 Sep 2015 13:41:58 +0300
-Subject: [PATCH 2/4] charon: add optional source and remote overrides for
- initiate
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This introduces support for specifying optional IKE SA specific
-source and remote address for child sa initiation. This allows
-to initiate wildcard connection for known address via vici.
-
-In addition this allows impler implementation of trap-any patches
-and is a prerequisite for dmvpn support.
-
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
----
- src/charon-cmd/cmd/cmd_connection.c           |  2 +-
- src/libcharon/control/controller.c            | 43 ++++++++++++-
- src/libcharon/control/controller.h            |  3 +
- src/libcharon/plugins/stroke/stroke_control.c |  5 +-
- src/libcharon/plugins/vici/vici_config.c      |  2 +-
- src/libcharon/plugins/vici/vici_control.c     | 64 ++++++++++++++++---
- .../processing/jobs/start_action_job.c        |  2 +-
- src/libcharon/sa/ike_sa_manager.c             | 51 ++++++++++++++-
- src/libcharon/sa/ike_sa_manager.h             |  8 ++-
- src/libcharon/sa/trap_manager.c               | 45 ++++++-------
- src/swanctl/commands/initiate.c               | 40 +++++++++++-
- 11 files changed, 218 insertions(+), 47 deletions(-)
-
-diff --git a/src/charon-cmd/cmd/cmd_connection.c b/src/charon-cmd/cmd/cmd_connection.c
-index b91c89830..55f8d224f 100644
---- a/src/charon-cmd/cmd/cmd_connection.c
-+++ b/src/charon-cmd/cmd/cmd_connection.c
-@@ -439,7 +439,7 @@ static job_requeue_t initiate(private_cmd_connection_t *this)
- 	child_cfg = create_child_cfg(this, peer_cfg);
- 
- 	if (charon->controller->initiate(charon->controller, peer_cfg, child_cfg,
--								controller_cb_empty, NULL, 0, FALSE) != SUCCESS)
-+								NULL, NULL, controller_cb_empty, NULL, 0, FALSE) != SUCCESS)
- 	{
- 		terminate(pid);
- 	}
-diff --git a/src/libcharon/control/controller.c b/src/libcharon/control/controller.c
-index 0c86275e2..baa83f440 100644
---- a/src/libcharon/control/controller.c
-+++ b/src/libcharon/control/controller.c
-@@ -15,6 +15,28 @@
-  * for more details.
-  */
- 
-+/*
-+ * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+ * THE SOFTWARE.
-+ */
-+
- #include "controller.h"
- 
- #include <sys/types.h>
-@@ -102,6 +124,16 @@ struct interface_listener_t {
- 	 */
- 	ike_sa_t *ike_sa;
- 
-+	/**
-+	 * Our host hint.
-+	 */
-+	host_t *my_host;
-+
-+	/**
-+	 * Other host hint.
-+	 */
-+	host_t *other_host;
-+
- 	/**
- 	 * unique ID, used for various methods
- 	 */
-@@ -414,9 +446,14 @@ METHOD(job_t, initiate_execute, job_requeue_t,
- 	ike_sa_t *ike_sa;
- 	interface_listener_t *listener = &job->listener;
- 	peer_cfg_t *peer_cfg = listener->peer_cfg;
-+	host_t *my_host = listener->my_host;
-+	host_t *other_host = listener->other_host;
- 
- 	ike_sa = charon->ike_sa_manager->checkout_by_config(charon->ike_sa_manager,
--														peer_cfg);
-+														peer_cfg, my_host, other_host);
-+	DESTROY_IF(my_host);
-+	DESTROY_IF(other_host);
-+
- 	if (!ike_sa)
- 	{
- 		DESTROY_IF(listener->child_cfg);
-@@ -425,6 +462,7 @@ METHOD(job_t, initiate_execute, job_requeue_t,
- 		listener_done(listener);
- 		return JOB_REQUEUE_NONE;
- 	}
-+
- 	listener->lock->lock(listener->lock);
- 	listener->ike_sa = ike_sa;
- 	listener->lock->unlock(listener->lock);
-@@ -497,6 +535,7 @@ METHOD(job_t, initiate_execute, job_requeue_t,
- 
- METHOD(controller_t, initiate, status_t,
- 	private_controller_t *this, peer_cfg_t *peer_cfg, child_cfg_t *child_cfg,
-+	host_t *my_host, host_t *other_host,
- 	controller_cb_t callback, void *param, u_int timeout, bool limits)
- {
- 	interface_job_t *job;
-@@ -519,6 +558,8 @@ METHOD(controller_t, initiate, status_t,
- 			.status = FAILED,
- 			.child_cfg = child_cfg,
- 			.peer_cfg = peer_cfg,
-+			.my_host = my_host ? my_host->clone(my_host) : NULL,
-+			.other_host = other_host ? other_host->clone(other_host) : NULL,
- 			.lock = spinlock_create(),
- 			.options.limits = limits,
- 		},
-diff --git a/src/libcharon/control/controller.h b/src/libcharon/control/controller.h
-index b4ccfced2..7a088b122 100644
---- a/src/libcharon/control/controller.h
-+++ b/src/libcharon/control/controller.h
-@@ -79,6 +79,8 @@ struct controller_t {
- 	 *
- 	 * @param peer_cfg		peer_cfg to use for IKE_SA setup
- 	 * @param child_cfg		optional child_cfg to set up CHILD_SA from
-+	 * @param my_host		optional address hint for source
-+	 * @param other_host		optional address hint for destination
- 	 * @param cb			logging callback
- 	 * @param param			parameter to include in each call of cb
- 	 * @param timeout		timeout in ms to wait for callbacks, 0 to disable
-@@ -92,6 +94,7 @@ struct controller_t {
- 	 */
- 	status_t (*initiate)(controller_t *this,
- 						 peer_cfg_t *peer_cfg, child_cfg_t *child_cfg,
-+						 host_t *my_host, host_t *other_host,
- 						 controller_cb_t callback, void *param, u_int timeout,
- 						 bool limits);
- 
-diff --git a/src/libcharon/plugins/stroke/stroke_control.c b/src/libcharon/plugins/stroke/stroke_control.c
-index 8d84b934e..b00d0e62d 100644
---- a/src/libcharon/plugins/stroke/stroke_control.c
-+++ b/src/libcharon/plugins/stroke/stroke_control.c
-@@ -108,7 +108,7 @@ static void charon_initiate(private_stroke_control_t *this, peer_cfg_t *peer_cfg
- 	if (msg->output_verbosity < 0)
- 	{
- 		charon->controller->initiate(charon->controller, peer_cfg, child_cfg,
--									 NULL, NULL, 0, FALSE);
-+									 NULL, NULL, NULL, NULL, 0, FALSE);
- 	}
- 	else
- 	{
-@@ -116,7 +116,8 @@ static void charon_initiate(private_stroke_control_t *this, peer_cfg_t *peer_cfg
- 		status_t status;
- 
- 		status = charon->controller->initiate(charon->controller,
--							peer_cfg, child_cfg, (controller_cb_t)stroke_log,
-+							peer_cfg, child_cfg, NULL, NULL,
-+							(controller_cb_t)stroke_log,
- 							&info, this->timeout, FALSE);
- 		switch (status)
- 		{
-diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c
-index 1ff0754f4..6a133decd 100644
---- a/src/libcharon/plugins/vici/vici_config.c
-+++ b/src/libcharon/plugins/vici/vici_config.c
-@@ -2122,7 +2122,7 @@ static void run_start_action(private_vici_config_t *this, peer_cfg_t *peer_cfg,
- 			DBG1(DBG_CFG, "initiating '%s'", child_cfg->get_name(child_cfg));
- 			charon->controller->initiate(charon->controller,
- 					peer_cfg->get_ref(peer_cfg), child_cfg->get_ref(child_cfg),
--					NULL, NULL, 0, FALSE);
-+					NULL, NULL, NULL, NULL, 0, FALSE);
- 			break;
- 		case ACTION_ROUTE:
- 			DBG1(DBG_CFG, "installing '%s'", child_cfg->get_name(child_cfg));
-diff --git a/src/libcharon/plugins/vici/vici_control.c b/src/libcharon/plugins/vici/vici_control.c
-index 4c09b578d..abd7b5d4b 100644
---- a/src/libcharon/plugins/vici/vici_control.c
-+++ b/src/libcharon/plugins/vici/vici_control.c
-@@ -16,6 +16,28 @@
-  * for more details.
-  */
- 
-+/*
-+ * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+ * THE SOFTWARE.
-+ */
-+
- #include "vici_control.h"
- #include "vici_builder.h"
- 
-@@ -174,9 +196,11 @@ static child_cfg_t* find_child_cfg(char *name, char *pname, peer_cfg_t **out)
- CALLBACK(initiate, vici_message_t*,
- 	private_vici_control_t *this, char *name, u_int id, vici_message_t *request)
- {
-+	vici_message_t* msg;
- 	peer_cfg_t *peer_cfg = NULL;
- 	child_cfg_t *child_cfg;
--	char *child, *ike, *type, *sa;
-+	host_t *my_host = NULL, *other_host = NULL;
-+	char *child, *ike, *type, *sa, *my_host_str, *other_host_str;
- 	int timeout;
- 	bool limits;
- 	controller_cb_t log_cb = NULL;
-@@ -190,6 +214,8 @@ CALLBACK(initiate, vici_message_t*,
- 	timeout = request->get_int(request, 0, "timeout");
- 	limits = request->get_bool(request, FALSE, "init-limits");
- 	log.level = request->get_int(request, 1, "loglevel");
-+	my_host_str = request->get_str(request, NULL, "my-host");
-+	other_host_str = request->get_str(request, NULL, "other-host");
- 
- 	if (!child && !ike)
- 	{
-@@ -200,31 +226,51 @@ CALLBACK(initiate, vici_message_t*,
- 		log_cb = (controller_cb_t)log_vici;
- 	}
- 
-+	if (my_host_str)
-+	{
-+		my_host = host_create_from_string(my_host_str, 0);
-+	}
-+	if (other_host_str)
-+	{
-+		other_host = host_create_from_string(other_host_str, 0);
-+	}
-+
-+
- 	type = child ? "CHILD_SA" : "IKE_SA";
- 	sa = child ?: ike;
- 
- 	child_cfg = find_child_cfg(child, ike, &peer_cfg);
- 
--	DBG1(DBG_CFG, "vici initiate %s '%s'", type, sa);
-+	DBG1(DBG_CFG, "vici initiate %s '%s', me %H, other %H, limits %d", type, sa, my_host, other_host, limits);
- 	if (!peer_cfg)
- 	{
--		return send_reply(this, "%s config '%s' not found", type, sa);
-+		msg = send_reply(this, "%s config '%s' not found", type, sa);
-+		goto ret;
- 	}
--	switch (charon->controller->initiate(charon->controller, peer_cfg,
--									child_cfg, log_cb, &log, timeout, limits))
-+	switch (charon->controller->initiate(charon->controller,
-+				peer_cfg, child_cfg, my_host, other_host,
-+				log_cb, &log, timeout, limits))
- 	{
- 		case SUCCESS:
--			return send_reply(this, NULL);
-+			msg = send_reply(this, NULL);
-+			break;
- 		case OUT_OF_RES:
--			return send_reply(this, "%s '%s' not established after %dms", type,
-+			msg = send_reply(this, "%s '%s' not established after %dms", type,
- 							  sa, timeout);
-+			break;
- 		case INVALID_STATE:
--			return send_reply(this, "establishing %s '%s' not possible at the "
-+			msg = send_reply(this, "establishing %s '%s' not possible at the "
- 							  "moment due to limits", type, sa);
-+			break;
- 		case FAILED:
- 		default:
--			return send_reply(this, "establishing %s '%s' failed", type, sa);
-+			msg = send_reply(this, "establishing %s '%s' failed", type, sa);
-+			break;
- 	}
-+ret:
-+	if (my_host) my_host->destroy(my_host);
-+	if (other_host) other_host->destroy(other_host);
-+	return msg;
- }
- 
- CALLBACK(terminate, vici_message_t*,
-diff --git a/src/libcharon/processing/jobs/start_action_job.c b/src/libcharon/processing/jobs/start_action_job.c
-index 3a0ed879f..e3399007b 100644
---- a/src/libcharon/processing/jobs/start_action_job.c
-+++ b/src/libcharon/processing/jobs/start_action_job.c
-@@ -61,7 +61,7 @@ METHOD(job_t, execute, job_requeue_t,
- 					charon->controller->initiate(charon->controller,
- 												 peer_cfg->get_ref(peer_cfg),
- 												 child_cfg->get_ref(child_cfg),
--												 NULL, NULL, 0, FALSE);
-+												 NULL, NULL, NULL, NULL, 0, FALSE);
- 					break;
- 				case ACTION_ROUTE:
- 					DBG1(DBG_JOB, "start action: route '%s'", name);
-diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c
-index 440894e9b..493599413 100644
---- a/src/libcharon/sa/ike_sa_manager.c
-+++ b/src/libcharon/sa/ike_sa_manager.c
-@@ -17,6 +17,28 @@
-  * for more details.
-  */
- 
-+/*
-+ * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+ * THE SOFTWARE.
-+ */
-+
- #include <string.h>
- #include <inttypes.h>
- 
-@@ -1423,7 +1445,8 @@ out:
- }
- 
- METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
--	private_ike_sa_manager_t *this, peer_cfg_t *peer_cfg)
-+	private_ike_sa_manager_t *this, peer_cfg_t *peer_cfg,
-+	host_t *my_host, host_t *other_host)
- {
- 	enumerator_t *enumerator;
- 	entry_t *entry;
-@@ -1432,7 +1455,17 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
- 	ike_cfg_t *current_ike;
- 	u_int segment;
- 
--	DBG2(DBG_MGR, "checkout IKE_SA by config");
-+	if (my_host && my_host->get_port(my_host) == 0)
-+	{
-+		my_host->set_port(my_host, IKEV2_UDP_PORT);
-+	}
-+	if (other_host && other_host->get_port(other_host) == 0)
-+	{
-+		other_host->set_port(other_host, IKEV2_UDP_PORT);
-+	}
-+
-+	DBG2(DBG_MGR, "checkout IKE_SA by config '%s', me %H, other %H",
-+		 peer_cfg->get_name(peer_cfg), my_host, other_host);
- 
- 	if (this->reuse_ikesa || peer_cfg->get_ike_version(peer_cfg) == IKEV1)
- 	{
-@@ -1449,6 +1482,16 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
- 				entry->condvar->signal(entry->condvar);
- 				continue;
- 			}
-+
-+			if (my_host && !my_host->ip_equals(my_host, entry->ike_sa->get_my_host(entry->ike_sa)))
-+			{
-+				continue;
-+			}
-+			if (other_host && !other_host->ip_equals(other_host, entry->ike_sa->get_other_host(entry->ike_sa)))
-+			{
-+				continue;
-+			}
-+
- 			current_peer = entry->ike_sa->get_peer_cfg(entry->ike_sa);
- 			if (current_peer && current_peer->equals(current_peer, peer_cfg))
- 			{
-@@ -1480,6 +1523,10 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
- 			return NULL;
- 		}
- 		ike_sa = checkout_new(this, peer_cfg->get_ike_version(peer_cfg), TRUE);
-+		if (my_host || other_host)
-+		{
-+			ike_sa->update_hosts(ike_sa, my_host, other_host, TRUE);
-+		}
- 	}
- 	charon->bus->set_sa(charon->bus, ike_sa);
- 
-diff --git a/src/libcharon/sa/ike_sa_manager.h b/src/libcharon/sa/ike_sa_manager.h
-index efad2e4d6..c43edabbb 100644
---- a/src/libcharon/sa/ike_sa_manager.h
-+++ b/src/libcharon/sa/ike_sa_manager.h
-@@ -93,7 +93,8 @@ struct ike_sa_manager_t {
- 	ike_sa_t* (*checkout_by_message) (ike_sa_manager_t* this, message_t *message);
- 
- 	/**
--	 * Checkout an IKE_SA for initiation by a peer_config.
-+	 * Checkout an IKE_SA for initiation by a peer_config and optional
-+	 * source and remote host addresses.
- 	 *
- 	 * To initiate, a CHILD_SA may be established within an existing IKE_SA.
- 	 * This call checks for an existing IKE_SA by comparing the configuration.
-@@ -103,10 +104,13 @@ struct ike_sa_manager_t {
- 	 * the found IKE_SA is in the DELETING state.
- 	 *
- 	 * @param peer_cfg			configuration used to find an existing IKE_SA
-+	 * @param my_host			source host address for wildcard peer_cfg
-+	 * @param other_host		remote host address for wildcard peer_cfg
- 	 * @return					checked out/created IKE_SA
- 	 */
- 	ike_sa_t* (*checkout_by_config) (ike_sa_manager_t* this,
--									 peer_cfg_t *peer_cfg);
-+									 peer_cfg_t *peer_cfg,
-+									 host_t *my_host, host_t *other_host);
- 
- 	/**
- 	 * Reset initiator SPI.
-diff --git a/src/libcharon/sa/trap_manager.c b/src/libcharon/sa/trap_manager.c
-index 2bc531b38..7220ea597 100644
---- a/src/libcharon/sa/trap_manager.c
-+++ b/src/libcharon/sa/trap_manager.c
-@@ -432,7 +432,7 @@ METHOD(trap_manager_t, acquire, void,
- 	peer_cfg_t *peer;
- 	child_cfg_t *child;
- 	ike_sa_t *ike_sa;
--	host_t *host;
-+	host_t *host, *my_host = NULL, *other_host = NULL;
- 	bool wildcard, ignore = FALSE;
- 
- 	this->lock->read_lock(this->lock);
-@@ -508,36 +508,27 @@ METHOD(trap_manager_t, acquire, void,
- 	this->lock->unlock(this->lock);
- 
- 	if (wildcard)
--	{	/* the peer config would match IKE_SAs with other peers */
--		ike_sa = charon->ike_sa_manager->checkout_new(charon->ike_sa_manager,
--											peer->get_ike_version(peer), TRUE);
--		if (ike_sa)
--		{
--			ike_cfg_t *ike_cfg;
--			uint16_t port;
--			uint8_t mask;
--
--			ike_sa->set_peer_cfg(ike_sa, peer);
--			ike_cfg = ike_sa->get_ike_cfg(ike_sa);
-+	{
-+		ike_cfg_t *ike_cfg;
-+		uint16_t port;
-+		uint8_t mask;
- 
--			port = ike_cfg->get_other_port(ike_cfg);
--			dst->to_subnet(dst, &host, &mask);
--			host->set_port(host, port);
--			ike_sa->set_other_host(ike_sa, host);
-+		ike_cfg = peer->get_ike_cfg(peer);
- 
--			port = ike_cfg->get_my_port(ike_cfg);
--			src->to_subnet(src, &host, &mask);
--			host->set_port(host, port);
--			ike_sa->set_my_host(ike_sa, host);
-+		port = ike_cfg->get_other_port(ike_cfg);
-+		dst->to_subnet(dst, &other_host, &mask);
-+		other_host->set_port(other_host, port);
- 
--			charon->bus->set_sa(charon->bus, ike_sa);
--		}
--	}
--	else
--	{
--		ike_sa = charon->ike_sa_manager->checkout_by_config(
--											charon->ike_sa_manager, peer);
-+		port = ike_cfg->get_my_port(ike_cfg);
-+		src->to_subnet(src, &my_host, &mask);
-+		my_host->set_port(my_host, port);
- 	}
-+	ike_sa = charon->ike_sa_manager->checkout_by_config(
-+											charon->ike_sa_manager, peer,
-+											my_host, other_host);
-+	DESTROY_IF(my_host);
-+	DESTROY_IF(other_host);
-+
- 	if (ike_sa)
- 	{
- 		if (ike_sa->get_peer_cfg(ike_sa) == NULL)
-diff --git a/src/swanctl/commands/initiate.c b/src/swanctl/commands/initiate.c
-index 8ade8bf41..03b2cb0f4 100644
---- a/src/swanctl/commands/initiate.c
-+++ b/src/swanctl/commands/initiate.c
-@@ -13,6 +13,28 @@
-  * for more details.
-  */
- 
-+/*
-+ * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+ * THE SOFTWARE.
-+ */
-+
- #include "command.h"
- 
- #include <errno.h>
-@@ -37,7 +59,7 @@ static int initiate(vici_conn_t *conn)
- 	vici_req_t *req;
- 	vici_res_t *res;
- 	command_format_options_t format = COMMAND_FORMAT_NONE;
--	char *arg, *child = NULL, *ike = NULL;
-+	char *arg, *child = NULL, *ike = NULL, *my_host = NULL, *other_host = NULL;
- 	int ret = 0, timeout = 0, level = 1;
- 
- 	while (TRUE)
-@@ -64,6 +86,12 @@ static int initiate(vici_conn_t *conn)
- 			case 'l':
- 				level = atoi(arg);
- 				continue;
-+			case 'S':
-+				my_host = arg;
-+				continue;
-+			case 'R':
-+				other_host = arg;
-+				continue;
- 			case EOF:
- 				break;
- 			default:
-@@ -87,6 +115,14 @@ static int initiate(vici_conn_t *conn)
- 	{
- 		vici_add_key_valuef(req, "ike", "%s", ike);
- 	}
-+	if (my_host)
-+	{
-+		vici_add_key_valuef(req, "my-host", "%s", my_host);
-+	}
-+	if (other_host)
-+	{
-+		vici_add_key_valuef(req, "other-host", "%s", other_host);
-+	}
- 	if (timeout)
- 	{
- 		vici_add_key_valuef(req, "timeout", "%d", timeout * 1000);
-@@ -133,6 +169,8 @@ static void __attribute__ ((constructor))reg()
- 			{"help",		'h', 0, "show usage information"},
- 			{"child",		'c', 1, "initiate a CHILD_SA configuration"},
- 			{"ike",			'i', 1, "initiate an IKE_SA, or name of child's parent"},
-+			{"source",		'S', 1, "override source address"},
-+			{"remote",		'R', 1, "override remote address"},
- 			{"timeout",		't', 1, "timeout in seconds before detaching"},
- 			{"raw",			'r', 0, "dump raw response message"},
- 			{"pretty",		'P', 0, "dump raw response message in pretty print"},
--- 
-2.24.0
-
diff --git a/main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch b/main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch
deleted file mode 100644
index 3438942a7fa..00000000000
--- a/main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 62802d545bc6c9143d44511d25d2df435d3099aa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Mon, 21 Sep 2015 13:42:05 +0300
-Subject: [PATCH 3/4] vici: send certificates for ike-sa events
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
----
- src/libcharon/plugins/vici/vici_query.c | 48 +++++++++++++++++++++----
- 1 file changed, 41 insertions(+), 7 deletions(-)
-
-diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c
-index 16e3c8b1f..2ca885e8b 100644
---- a/src/libcharon/plugins/vici/vici_query.c
-+++ b/src/libcharon/plugins/vici/vici_query.c
-@@ -348,7 +348,7 @@ static void list_vips(private_vici_query_t *this, vici_builder_t *b,
-  * List details of an IKE_SA
-  */
- static void list_ike(private_vici_query_t *this, vici_builder_t *b,
--					 ike_sa_t *ike_sa, time_t now)
-+					 ike_sa_t *ike_sa, time_t now, bool add_certs)
- {
- 	time_t t;
- 	ike_sa_id_t *id;
-@@ -357,6 +357,8 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
- 	uint32_t if_id;
- 	uint16_t alg, ks;
- 	host_t *host;
-+	auth_cfg_t *auth_cfg;
-+	enumerator_t *enumerator;
- 
- 	b->add_kv(b, "uniqueid", "%u", ike_sa->get_unique_id(ike_sa));
- 	b->add_kv(b, "version", "%u", ike_sa->get_version(ike_sa));
-@@ -366,11 +368,43 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
- 	b->add_kv(b, "local-host", "%H", host);
- 	b->add_kv(b, "local-port", "%d", host->get_port(host));
- 	b->add_kv(b, "local-id", "%Y", ike_sa->get_my_id(ike_sa));
-+	if (add_certs)
-+	{
-+		enumerator = ike_sa->create_auth_cfg_enumerator(ike_sa, TRUE);
-+		if (enumerator->enumerate(enumerator, &auth_cfg))
-+		{
-+			certificate_t *cert = auth_cfg->get(auth_cfg, AUTH_RULE_SUBJECT_CERT);
-+			chunk_t encoding;
-+
-+			if (cert && cert->get_encoding(cert, CERT_ASN1_DER, &encoding))
-+			{
-+				b->add(b, VICI_KEY_VALUE, "local-cert-data", encoding);
-+				free(encoding.ptr);
-+			}
-+		}
-+		enumerator->destroy(enumerator);
-+	}
- 
- 	host = ike_sa->get_other_host(ike_sa);
- 	b->add_kv(b, "remote-host", "%H", host);
- 	b->add_kv(b, "remote-port", "%d", host->get_port(host));
- 	b->add_kv(b, "remote-id", "%Y", ike_sa->get_other_id(ike_sa));
-+	if (add_certs)
-+	{
-+		enumerator = ike_sa->create_auth_cfg_enumerator(ike_sa, FALSE);
-+		if (enumerator->enumerate(enumerator, &auth_cfg))
-+		{
-+			certificate_t *cert = auth_cfg->get(auth_cfg, AUTH_RULE_SUBJECT_CERT);
-+			chunk_t encoding;
-+
-+			if (cert && cert->get_encoding(cert, CERT_ASN1_DER, &encoding))
-+			{
-+				b->add(b, VICI_KEY_VALUE, "remote-cert-data", encoding);
-+				free(encoding.ptr);
-+			}
-+		}
-+		enumerator->destroy(enumerator);
-+	}
- 
- 	eap = ike_sa->get_other_eap_id(ike_sa);
- 
-@@ -500,7 +534,7 @@ CALLBACK(list_sas, vici_message_t*,
- 		b = vici_builder_create();
- 		b->begin_section(b, ike_sa->get_name(ike_sa));
- 
--		list_ike(this, b, ike_sa, now);
-+		list_ike(this, b, ike_sa, now, TRUE);
- 
- 		b->begin_section(b, "child-sas");
- 		csas = ike_sa->create_child_sa_enumerator(ike_sa);
-@@ -1673,7 +1707,7 @@ METHOD(listener_t, ike_updown, bool,
- 	}
- 
- 	b->begin_section(b, ike_sa->get_name(ike_sa));
--	list_ike(this, b, ike_sa, now);
-+	list_ike(this, b, ike_sa, now, up);
- 	b->end_section(b);
- 
- 	this->dispatcher->raise_event(this->dispatcher,
-@@ -1698,10 +1732,10 @@ METHOD(listener_t, ike_rekey, bool,
- 	b = vici_builder_create();
- 	b->begin_section(b, old->get_name(old));
- 	b->begin_section(b, "old");
--	list_ike(this, b, old, now);
-+	list_ike(this, b, old, now, TRUE);
- 	b->end_section(b);
- 	b->begin_section(b, "new");
--	list_ike(this, b, new, now);
-+	list_ike(this, b, new, now, TRUE);
- 	b->end_section(b);
- 	b->end_section(b);
- 
-@@ -1731,7 +1765,7 @@ METHOD(listener_t, child_updown, bool,
- 	}
- 
- 	b->begin_section(b, ike_sa->get_name(ike_sa));
--	list_ike(this, b, ike_sa, now);
-+	list_ike(this, b, ike_sa, now, up);
- 	b->begin_section(b, "child-sas");
- 
- 	b->begin_section(b, child_sa->get_name(child_sa));
-@@ -1763,7 +1797,7 @@ METHOD(listener_t, child_rekey, bool,
- 	b = vici_builder_create();
- 
- 	b->begin_section(b, ike_sa->get_name(ike_sa));
--	list_ike(this, b, ike_sa, now);
-+	list_ike(this, b, ike_sa, now, TRUE);
- 	b->begin_section(b, "child-sas");
- 
- 	b->begin_section(b, old->get_name(old));
--- 
-2.24.0
-
diff --git a/main/strongswan/1003-vici-add-support-for-individual-sa-state-changes.patch b/main/strongswan/1003-vici-add-support-for-individual-sa-state-changes.patch
deleted file mode 100644
index 522f691eec7..00000000000
--- a/main/strongswan/1003-vici-add-support-for-individual-sa-state-changes.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 85538df79427beec3556505f2f74eb2f328171df Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Mon, 21 Sep 2015 13:42:11 +0300
-Subject: [PATCH 4/4] vici: add support for individual sa state changes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Useful for monitoring and tracking full SA.
-
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
----
- src/libcharon/plugins/vici/vici_query.c | 105 ++++++++++++++++++++++++
- 1 file changed, 105 insertions(+)
-
-diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c
-index 2ca885e8b..29f77c769 100644
---- a/src/libcharon/plugins/vici/vici_query.c
-+++ b/src/libcharon/plugins/vici/vici_query.c
-@@ -1673,8 +1673,16 @@ static void manage_commands(private_vici_query_t *this, bool reg)
- 	this->dispatcher->manage_event(this->dispatcher, "list-cert", reg);
- 	this->dispatcher->manage_event(this->dispatcher, "ike-updown", reg);
- 	this->dispatcher->manage_event(this->dispatcher, "ike-rekey", reg);
-+	this->dispatcher->manage_event(this->dispatcher, "ike-state-established", reg);
-+	this->dispatcher->manage_event(this->dispatcher, "ike-state-destroying", reg);
- 	this->dispatcher->manage_event(this->dispatcher, "child-updown", reg);
- 	this->dispatcher->manage_event(this->dispatcher, "child-rekey", reg);
-+	this->dispatcher->manage_event(this->dispatcher, "child-state-installing", reg);
-+	this->dispatcher->manage_event(this->dispatcher, "child-state-installed", reg);
-+	this->dispatcher->manage_event(this->dispatcher, "child-state-updating", reg);
-+	this->dispatcher->manage_event(this->dispatcher, "child-state-rekeying", reg);
-+	this->dispatcher->manage_event(this->dispatcher, "child-state-rekeyed", reg);
-+	this->dispatcher->manage_event(this->dispatcher, "child-state-destroying", reg);
- 	manage_command(this, "list-sas", list_sas, reg);
- 	manage_command(this, "list-policies", list_policies, reg);
- 	manage_command(this, "list-conns", list_conns, reg);
-@@ -1745,6 +1753,45 @@ METHOD(listener_t, ike_rekey, bool,
- 	return TRUE;
- }
- 
-+METHOD(listener_t, ike_state_change, bool,
-+	private_vici_query_t *this, ike_sa_t *ike_sa, ike_sa_state_t state)
-+{
-+	char *event;
-+	vici_builder_t *b;
-+	time_t now;
-+
-+	switch (state)
-+	{
-+	case IKE_ESTABLISHED:
-+		event = "ike-state-established";
-+		break;
-+	case IKE_DESTROYING:
-+		event = "ike-state-destroying";
-+		break;
-+	default:
-+		return TRUE;
-+	}
-+
-+	if (!this->dispatcher->has_event_listeners(this->dispatcher, event))
-+	{
-+		return TRUE;
-+	}
-+
-+	now = time_monotonic(NULL);
-+
-+	b = vici_builder_create();
-+	b->begin_section(b, ike_sa->get_name(ike_sa));
-+	list_ike(this, b, ike_sa, now, state != IKE_DESTROYING);
-+	b->begin_section(b, "child-sas");
-+	b->end_section(b);
-+	b->end_section(b);
-+
-+	this->dispatcher->raise_event(this->dispatcher,
-+								  event, 0, b->finalize(b));
-+
-+	return TRUE;
-+}
-+
- METHOD(listener_t, child_updown, bool,
- 	private_vici_query_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa, bool up)
- {
-@@ -1820,6 +1867,62 @@ METHOD(listener_t, child_rekey, bool,
- 	return TRUE;
- }
- 
-+METHOD(listener_t, child_state_change, bool,
-+	private_vici_query_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa, child_sa_state_t state)
-+{
-+	char *event;
-+	vici_builder_t *b;
-+	time_t now;
-+
-+	switch (state)
-+	{
-+	case CHILD_INSTALLING:
-+		event = "child-state-installing";
-+		break;
-+	case CHILD_INSTALLED:
-+		event = "child-state-installed";
-+		break;
-+	case CHILD_UPDATING:
-+		event = "child-state-updating";
-+		break;
-+	case CHILD_REKEYING:
-+		event = "child-state-rekeying";
-+		break;
-+	case CHILD_REKEYED:
-+		event = "child-state-rekeyed";
-+		break;
-+	case CHILD_DESTROYING:
-+		event = "child-state-destroying";
-+		break;
-+	default:
-+		return TRUE;
-+	}
-+
-+	if (!this->dispatcher->has_event_listeners(this->dispatcher, event))
-+	{
-+		return TRUE;
-+	}
-+
-+	now = time_monotonic(NULL);
-+
-+	b = vici_builder_create();
-+	b->begin_section(b, ike_sa->get_name(ike_sa));
-+	list_ike(this, b, ike_sa, now, state != CHILD_DESTROYING);
-+	b->begin_section(b, "child-sas");
-+
-+	b->begin_section(b, child_sa->get_name(child_sa));
-+	list_child(this, b, child_sa, now);
-+	b->end_section(b);
-+
-+	b->end_section(b);
-+	b->end_section(b);
-+
-+	this->dispatcher->raise_event(this->dispatcher,
-+								  event, 0, b->finalize(b));
-+
-+	return TRUE;
-+}
-+
- METHOD(vici_query_t, destroy, void,
- 	private_vici_query_t *this)
- {
-@@ -1839,8 +1942,10 @@ vici_query_t *vici_query_create(vici_dispatcher_t *dispatcher)
- 			.listener = {
- 				.ike_updown = _ike_updown,
- 				.ike_rekey = _ike_rekey,
-+				.ike_state_change = _ike_state_change,
- 				.child_updown = _child_updown,
- 				.child_rekey = _child_rekey,
-+				.child_state_change = _child_state_change,
- 			},
- 			.destroy = _destroy,
- 		},
--- 
-2.24.0
-
diff --git a/main/strongswan/APKBUILD b/main/strongswan/APKBUILD
index f3585a028bd..668a9f8113e 100644
--- a/main/strongswan/APKBUILD
+++ b/main/strongswan/APKBUILD
@@ -1,31 +1,59 @@
 # Contributor: Jesse Young <jlyo@jlyo.org>
+# Contributor: Nicolas Lorin <androw95220@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=strongswan
-pkgver=5.8.4
-_pkgver=${pkgver//_rc/rc}
-pkgrel=0
+pkgver=5.9.13
+pkgrel=1
 pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
 url="https://www.strongswan.org/"
 arch="all"
 pkgusers="ipsec"
 pkggroups="ipsec"
-license="GPL-2.0-or-later"
+license="GPL-2.0-or-later WITH OpenSSL-Exception"
 depends="iproute2"
-makedepends="linux-headers python3 sqlite-dev openssl-dev curl-dev
-	gmp-dev libcap-dev"
+makedepends="
+	curl-dev
+	gettext-dev
+	gmp-dev
+	libcap-dev
+	linux-headers
+	openssl-dev>3
+	py3-setuptools
+	python3
+	sqlite-dev
+	"
 install="$pkgname.pre-install"
-subpackages="$pkgname-doc $pkgname-dbg $pkgname-openrc"
-source="https://download.strongswan.org/strongswan-$_pkgver.tar.bz2
-	0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch
-	1001-charon-add-optional-source-and-remote-overrides-for-.patch
-	1002-vici-send-certificates-for-ike-sa-events.patch
-	1003-vici-add-support-for-individual-sa-state-changes.patch
+subpackages="$pkgname-doc $pkgname-dbg $pkgname-logfile $pkgname-openrc py3-vici-pyc py3-vici::noarch"
+source="https://download.strongswan.org/strongswan-$pkgver.tar.bz2
+	0001-charon-add-optional-source-and-remote-overrides-for-.patch
+	0002-vici-send-certificates-for-ike-sa-events.patch
+	0003-vici-add-support-for-individual-sa-state-changes.patch
+
+	disable_test_time_printf_hook.patch
 
 	strongswan.initd
 	charon.initd
+	charon.logrotate
+	charon-logfile.conf
 	"
 
+# 32bit archs seem to get stuck in rsa test suite at "generate" or "load"
+case "$CARCH" in
+	arm*|x86) options="!check";;
+esac
+
 # secfixes:
+#   5.9.12-r0:
+#     - CVE-2023-41913
+#   5.9.10-r0:
+#     - CVE-2023-26463
+#   5.9.8-r0:
+#     - CVE-2022-40617
+#   5.9.1-r4:
+#     - CVE-2021-45079
+#   5.9.1-r3:
+#     - CVE-2021-41990
+#     - CVE-2021-41991
 #   5.7.1-r0:
 #     - CVE-2018-17540
 #   5.7.0-r0:
@@ -38,26 +66,6 @@ source="https://download.strongswan.org/strongswan-$_pkgver.tar.bz2
 #     - CVE-2017-9022
 #     - CVE-2017-9023
 
-prepare() {
-	local i
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -Np1 -i "$srcdir"/$i || _err="$_err $i" ;;
-		esac
-	done
-
-	if [ -n "$_err" ]; then
-		error "The following patches failed:"
-		for i in $_err; do
-			echo "  $i"
-		done
-		return 1
-	fi
-
-	# the headers they ship conflicts with the real thing.
-	#rm -r src/include/linux
-}
-
 build() {
 	# notes about configuration:
 	# - try to keep options in ./configure --help order
@@ -109,11 +117,21 @@ build() {
 		--enable-unity \
 		--enable-ha \
 		--enable-cmd \
+		--enable-python-eggs \
 		--enable-swanctl \
 		--enable-shared \
 		--disable-static \
+		--enable-bypass-lan \
 		$_aesni
 	make
+
+	cd src/libcharon/plugins/vici/python
+	make
+	python3 setup.py build
+}
+
+check() {
+	make check
 }
 
 package() {
@@ -123,12 +141,35 @@ package() {
 
 	# for CRL caching
 	chown ipsec:ipsec "$pkgdir"/etc/ipsec.d/crls "$pkgdir"/etc/swanctl/x509crl
+
+	cd src/libcharon/plugins/vici/python/
+	python setup.py install --root="$pkgdir" --skip-build
+}
+
+logfile() {
+	pkgdesc="Dedicated log file configuration for charon"
+	depends=$pkgname
+
+	install -m 644 -D charon.logrotate "$subpkgdir/etc/logrotate.d/charon"
+	install -m 644 -D charon-logfile.conf \
+		"$subpkgdir/etc/strongswan.d/charon-logfile.conf"
+	install -m 2750 -o ipsec -g wheel -d "$subpkgdir/var/log/ipsec"
+}
+
+vici() {
+	pkgdesc="Native Python interface for strongSwan's VICI protocol"
+
+	amove usr/lib/python*
 }
 
-sha512sums="15e866b0d6cc4ea94f17856b519d926ae08c15d3b62f675f62685d0722ca8fa26b46afb1ad1c866e9d5f347d77a747f57d0c6d7f6bd57762f37d7798f9e28103  strongswan-5.8.4.tar.bz2
-c829b59d33f5dcffd86fbc81d824b51397ed48dc94da6271ec2d7d70e5975cff0c13d235147f92e1981b391857d5573507972593fed0ce831968da10d119da0f  0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch
-cdc8b9d56fbd7c079dfa37e8de822cfa925d3b6741ff7d04afbc8b856d717ed090750e85b19af2296e28ee030c2d91597d2492f4b9b3540a5647b120bf609556  1001-charon-add-optional-source-and-remote-overrides-for-.patch
-f92609a1f6810786baeae1688688cbdd2a3116200cdba8d23e13da08992f5280bcbe04712cc89402f1e39aff6f4ebc8da05a2529b1e61e25a5229deb74c4dc3f  1002-vici-send-certificates-for-ike-sa-events.patch
-da39b5654c6f39d175c5491dabd5ed5c1b552857af7cbe7eeb8d0ecb34dad265bb8cd7725930eb75ceb99d51813f8e59631e687b09c1ff5c6437388f5f4d9647  1003-vici-add-support-for-individual-sa-state-changes.patch
+sha512sums="
+a929c1fb2a5e7d3064f6cd0be76703198406dad981f4b345311a004c18aa3c12adcb49eb33705fe4c3c31daf556cef5906d8753f5d9fbff5a27b732f93d8f19f  strongswan-5.9.13.tar.bz2
+50ddcaa115237a31aa021c7be46ae9ec84f5f7c1f340af254026ebf47a0e53147373bf691c71d51cae3a871cb3d9635542c209d47457f608780f67f376258a13  0001-charon-add-optional-source-and-remote-overrides-for-.patch
+378060da77cd3ecec98f033953cf26170b765b12500b96067517e31f9cc904bff9bb2637b520906f6a9ccd2db39d085c38c3fcabedef8c441353f14920f7e33a  0002-vici-send-certificates-for-ike-sa-events.patch
+da04054d30adee03b9f21cbb7649cc30c7dfcef50a9aaea038ac8f35e5e9cb199a62c9e666ed6b7c4520dfca39d00eaee85a1ebe7de2def3b003e92e0b2bb4cc  0003-vici-add-support-for-individual-sa-state-changes.patch
+23e175fdd7445e06e5d7275903380a6a5e4c76d833b2680c8c9fcd704d5908990ded0bb408bba718cd67a41cb32c7ad308a6c93aeb7eae82f8bc5803f8e1bbc4  disable_test_time_printf_hook.patch
 8b61e3ffbb39b837733e602ec329e626dc519bf7308d3d4192b497d18f38176789d23ef5afec51f8463ee1ddaf4d74546b965c03184132e217cbc27017e886c9  strongswan.initd
-4ac8dc83f08998fe672d5446dc6071f95a6a437b9df7c19d5f1a41707fb44451ec37aa237d0b86b0a9edf36a9ce7c29ba8959a38b04536c994dd4300daf737e5  charon.initd"
+4ac8dc83f08998fe672d5446dc6071f95a6a437b9df7c19d5f1a41707fb44451ec37aa237d0b86b0a9edf36a9ce7c29ba8959a38b04536c994dd4300daf737e5  charon.initd
+3eb0cd762a186d611a6322c1470581298c953b3e729fc85a13801611940eb896e8f6935e10eaa36884bd5c36600ba778d4af4c0ed1e9063436bd748268fd733b  charon.logrotate
+5896a9c5ecbef1a6c36b7bd31c83e18603f49105aedd4af80c42b0036c75950eac6e92abccfca09c9cb5bb3f3c4010f0daba068208e7dff05e7b1849d5a6e363  charon-logfile.conf
+"
diff --git a/main/strongswan/charon-logfile.conf b/main/strongswan/charon-logfile.conf
new file mode 100644
index 00000000000..f71317f32fd
--- /dev/null
+++ b/main/strongswan/charon-logfile.conf
@@ -0,0 +1,10 @@
+charon {
+	filelog {
+		/var/log/ipsec/charon {
+			default = 1
+			flush_line = yes
+			ike_name = yes
+			time_format = %b %e %T
+		}
+	}
+}
diff --git a/main/strongswan/charon.logrotate b/main/strongswan/charon.logrotate
new file mode 100644
index 00000000000..2de03d817c2
--- /dev/null
+++ b/main/strongswan/charon.logrotate
@@ -0,0 +1,6 @@
+/var/log/ipsec/charon {
+	missingok
+	postrotate
+		busybox killall -HUP charon
+	endscript
+}
diff --git a/main/strongswan/disable_test_time_printf_hook.patch b/main/strongswan/disable_test_time_printf_hook.patch
new file mode 100644
index 00000000000..00adee2411e
--- /dev/null
+++ b/main/strongswan/disable_test_time_printf_hook.patch
@@ -0,0 +1,51 @@
+This test fail with
+
+    Running case 'printf_hooks': ++-+-+++++++++++++++++
+      Failure in 'test_time_printf_hook': buf != time_data[_i].out ("Jan 01 00:00:01 1970" != "Jan 01 01:00:01 1970") (suites/test_utils.c:967, i = 2)
+      Failure in 'test_time_printf_hook': buf != time_data[_i].out ("Jul 01 13:43:16 2012" != "Jul 01 15:43:16 2012") (suites/test_utils.c:967, i = 4)
+
+--- a/src/libstrongswan/tests/suites/test_utils.c
++++ b/src/libstrongswan/tests/suites/test_utils.c
+@@ -941,34 +941,6 @@ START_TEST(test_path_absolute)
+ END_TEST
+ 
+ /*******************************************************************************
+- * time_printf_hook
+- */
+-
+-static struct {
+-	time_t in;
+-	bool utc;
+-	char *out;
+-} time_data[] = {
+-	{UNDEFINED_TIME, FALSE, "--- -- --:--:-- ----"},
+-	{UNDEFINED_TIME, TRUE , "--- -- --:--:-- UTC ----"},
+-	{1, FALSE, "Jan 01 01:00:01 1970"},
+-	{1, TRUE , "Jan 01 00:00:01 UTC 1970"},
+-	{1341150196, FALSE, "Jul 01 15:43:16 2012"},
+-	{1341150196, TRUE , "Jul 01 13:43:16 UTC 2012"},
+-};
+-
+-START_TEST(test_time_printf_hook)
+-{
+-	char buf[32];
+-	int len;
+-
+-	len = snprintf(buf, sizeof(buf), "%T", &time_data[_i].in, time_data[_i].utc);
+-	ck_assert(len >= 0 && len < sizeof(buf));
+-	ck_assert_str_eq(buf, time_data[_i].out);
+-}
+-END_TEST
+-
+-/*******************************************************************************
+  * time_delta_printf_hook
+  */
+ 
+@@ -1321,7 +1293,6 @@ Suite *utils_suite_create()
+ 	suite_add_tcase(s, tc);
+ 
+ 	tc = tcase_create("printf_hooks");
+-	tcase_add_loop_test(tc, test_time_printf_hook, 0, countof(time_data));
+ 	tcase_add_loop_test(tc, test_time_delta_printf_hook, 0, countof(time_delta_data));
+ 	suite_add_tcase(s, tc);
+ 
diff --git a/main/su-exec/APKBUILD b/main/su-exec/APKBUILD
index 43b6058cd47..f5c9222391b 100644
--- a/main/su-exec/APKBUILD
+++ b/main/su-exec/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=su-exec
 pkgver=0.2
-pkgrel=1
+pkgrel=3
 pkgdesc="switch user and group id, setgroups and exec"
 url="https://github.com/ncopa/su-exec"
 arch="all"
@@ -14,7 +14,7 @@ build() {
 }
 
 package() {
-	install -D su-exec "$pkgdir"/sbin/su-exec || return 1
+	install -D su-exec "$pkgdir"/sbin/su-exec
 }
 
 sha512sums="68155a06c716b362aee1214f22cd325b3e934c05b653d3b084a720458fb04207c0681d218b72adfd5ae8fab0262f7ab90e49eb2e218d1b0d7d7af7911715d4e1  su-exec-0.2.tar.gz"
diff --git a/main/subunit/APKBUILD b/main/subunit/APKBUILD
index b4b3e701f34..a2e0fcfbe87 100644
--- a/main/subunit/APKBUILD
+++ b/main/subunit/APKBUILD
@@ -1,24 +1,23 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=subunit
-pkgver=1.3.0
-pkgrel=0
+pkgver=1.4.2
+pkgrel=7
 pkgdesc="A streaming protocol for test results"
 options="!check" # Dependencies for checking stuff are in testing/
 url="https://launchpad.net/subunit"
 arch="all"
 license="Apache-2.0 AND BSD-3-Clause"
 depends="python3 py3-extras py3-testtools"
-makedepends="check-dev cppunit-dev perl-dev python3-dev automake
-	autoconf libtool"
-subpackages="$pkgname-dev $pkgname-libs"
-source="https://launchpad.net/subunit/trunk/${pkgver%.*}/+download/subunit-$pkgver.tar.gz"
-builddir="$srcdir"
-
-prepare() {
-	default_prepare
-	autoreconf -fi
-}
+makedepends="
+	check-dev
+	cppunit-dev
+	perl-dev
+	py3-setuptools
+	python3-dev
+	"
+subpackages="$pkgname-pyc $pkgname-dev $pkgname-libs"
+source="https://launchpad.net/subunit/trunk/$pkgver/+download/subunit-$pkgver.tar.gz"
 
 build() {
 	./configure \
@@ -28,8 +27,12 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--localstatedir=/var
+		--localstatedir=/var \
+		--disable-dependency-tracking \
+		--disable-static \
+		--with-pic
 	make
+	python3 setup.py build
 }
 
 check() {
@@ -38,8 +41,12 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
+	python3 setup.py install --skip-build --root="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-	rm -f "$pkgdir"/usr/lib/*.a
+	sed -i '1s|/usr/bin/env python$|/usr/bin/python3|' "$pkgdir"/usr/bin/*
+	rm -r "$pkgdir"/usr/lib/python3*/site-packages/subunit/tests/
 }
 
-sha512sums="7b37890546345cc481779f4bf1dc7eeca4fbda0efff1b7d7a6ca7ec574fe72e9801b7b70b8efcb0d78bb6a0a181fcdb6e49a2ff280d73f0d3dfcd1df219b2765  subunit-1.3.0.tar.gz"
+sha512sums="
+3acf96055ec0c49c4ac17c43a398c4e5173c9904652f54edd7597130e69224475670308b405d336e824dad667f51ec856cfca3a5e681fae756a67a0a400efabe  subunit-1.4.2.tar.gz
+"
diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD
index 207cf611c27..4146e5daede 100644
--- a/main/subversion/APKBUILD
+++ b/main/subversion/APKBUILD
@@ -1,27 +1,56 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=subversion
-pkgver=1.13.0
-pkgrel=2
+pkgver=1.14.3
+pkgrel=1
+_py3c_ver=1.4
 pkgdesc="Replacement for CVS, another versioning system (svn)"
 url="https://subversion.apache.org/"
 arch="all"
-license="Apache-2.0 BSD"
-makedepends="apache2-dev apr-util-dev autoconf automake e2fsprogs-dev libtool
-	lz4-dev neon-dev perl-dev python3-dev serf-dev swig boost-dev"
+license="Apache-2.0 AND BSD-2-Clause"
+makedepends="
+	apache2-dev
+	apr-util-dev
+	autoconf
+	automake
+	boost-dev
+	e2fsprogs-dev
+	libtool
+	lz4-dev
+	neon-dev
+	perl-dev
+	python3-dev
+	serf-dev
+	swig
+	"
 install="$pkgname.pre-install"
-subpackages="$pkgname-dev $pkgname-doc mod_dav_svn
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	mod_dav_svn
 	$pkgname-bash-completion:bashcomp:noarch
-	perl-$pkgname:pl py3-$pkgname:py $pkgname-libs
-	$pkgname-openrc"
-source="https://archive.apache.org/dist/subversion/$pkgname-$pkgver.tar.bz2
+	perl-$pkgname:pl
+	py3-$pkgname-pyc
+	py3-$pkgname:py
+	$pkgname-libs
+	$pkgname-openrc
+	$pkgname-tools
+	"
+source="https://archive.apache.org/dist/subversion/subversion-$pkgver.tar.bz2
+	py3c-$_py3c_ver.tar.gz::https://github.com/encukou/py3c/archive/v$_py3c_ver.tar.gz
 	subversion-1.7.0-deplibs.patch
 	subversion-perl-deplibs.patch
 	subversion-1.12.0-linking.patch
 	svnserve.confd
-	svnserve.initd"
+	svnserve.initd
+	"
 
 # secfixes:
+#   1.14.2-r0:
+#     - CVE-2021-28544
+#     - CVE-2022-24070
+#   1.14.1-r0:
+#     - CVE-2020-17525
 #   1.12.2-r0:
 #     - CVE-2019-0203
 #     - CVE-2018-11782
@@ -34,9 +63,6 @@ prepare() {
 	default_prepare
 	mv build-outputs.mk build-outputs.mk.old
 	PYTHON=python3 LIBTOOL_CONFIG=/usr/share/libtool/build-aux ./autogen.sh --release
-	# fix shebangs
-	sed -i -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
-	sed -e 's|/usr/bin/env python.*|/usr/bin/python3|' subversion/tests/cmdline/svneditor.py
 }
 
 build() {
@@ -50,6 +76,7 @@ build() {
 		--disable-nls \
 		--with-apxs \
 		--with-apache-libexecdir \
+		--with-py3c=../py3c-$_py3c_ver \
 		--with-swig \
 		--disable-javahl \
 		--disable-static \
@@ -57,8 +84,7 @@ build() {
 		--without-jdk \
 		--with-serf \
 		--with-utf8proc=internal
-	make all
-	make swig-pl-lib
+	make all swig-pl-lib tools
 	(cd subversion/bindings/swig/perl/native ; perl Makefile.PL)
 	# need override LD_RUN_PATH with something valid, otherwise we get
 	# empty rpath which is not a good idea.
@@ -83,7 +109,8 @@ package() {
 	make -j1 DESTDIR="$pkgdir" \
 		swig_pydir="$_pydir/libsvn"\
 		swig_pydir_extra="$_pydir/svn" \
-		install install-swig-pl-lib install-swig-py
+		toolsdir=/usr/bin \
+		install install-swig-pl-lib install-swig-py install-tools
 	make pure_vendor_install -C subversion/bindings/swig/perl/native \
 		PERL_INSTALL_ROOT="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
@@ -91,46 +118,56 @@ package() {
 	install -Dm755 "$srcdir"/svnserve.initd "$pkgdir"/etc/init.d/svnserve
 	install -Dm644 "$srcdir"/svnserve.confd "$pkgdir"/etc/conf.d/svnserve
 
-	mkdir -p "pkgdir"/usr/lib
+	mkdir -p "$pkgdir"/usr/lib
 	mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib
+
+	install -Dm644 tools/client-side/bash_completion \
+		"$pkgdir"/usr/share/bash-completion/completions/$pkgname
+	cd "$pkgdir"/usr/share/bash-completion/completions
+	local i; for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do
+		ln -sf $pkgname $i
+	done
 }
 
 mod_dav_svn() {
 	pkgdesc="Apache httpd module for $pkgname server"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/apache2 "$subpkgdir"/usr/lib/
-}
-
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completion for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
 
-	install -Dm644 "$builddir"/tools/client-side/bash_completion \
-		"$subpkgdir"/usr/share/bash-completion/completions/$pkgname
-	cd "$subpkgdir"/usr/share/bash-completion/completions
-	local i; for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do
-		ln -sf $pkgname $i
-	done
+	amove usr/lib/apache2
 }
 
 pl() {
 	pkgdesc="Perl bindings to $pkgname"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*perl* "$subpkgdir"/usr/lib/
+
+	amove usr/lib/*perl*
 }
 
 py() {
 	pkgdesc="Python bindings to $pkgname"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*swig*py* \
-		"$pkgdir"/usr/lib/python* \
-		"$subpkgdir"/usr/lib/
+
+	amove usr/lib/lib*swig*py*
+	amove usr/lib/python*
+}
+
+tools() {
+	pkgdesc="extra tools for subversion"
+
+	# this is the list from install-tools into toolsdir
+	amove usr/bin/diff* \
+		usr/bin/fsfs-* \
+		usr/bin/svn-* \
+		usr/bin/svnauthz* \
+		usr/bin/svnconflict \
+		usr/bin/svnmover \
+		usr/bin/svnraisetreeconflict \
+		usr/bin/x509-parser
 }
 
-sha512sums="36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2  subversion-1.13.0.tar.bz2
+sha512sums="
+40b172492005fd3b0cd9e457b4444af8ea5d8ff8fc161a9a0c6dc3a7314c6ad4ff75a4676f68a1919ae6273ae03e34d04eba8c1c37b8c0b4ec70d6731b527b41  subversion-1.14.3.tar.bz2
+db71db2c19a16ba5a430b676beb357faee5b67b161478932af13dd06be23b5505da85dbaf5b2447f95590fea55b833ee33fa19d3350ba3117f3364a9ab012ee6  py3c-1.4.tar.gz
 fb219c45b80602d919176cc191394df09f90d0f5c7d24e6a36b166bd92777ecae67eeac1e49c0ffbb0e724396b3d2094dbb0bef17d01dc87d418b1cd554bd7c4  subversion-1.7.0-deplibs.patch
 fd6e5f45cff4d3cf0d885a34c822b32141b13b199d99ad8e1b04d641c9c1ee27e73f5c556a4ad54a900b6d39cc14afad17b6738d8af44c76758f1a27b4d49f9a  subversion-perl-deplibs.patch
 7d46f2ee0bbba53b6dc9312b35000b1433a46edb09f61030da1ff66951bc204fc90598e5b07ce2554d46508d5a9e8193152131ae21050901c7b40cb034fb5cc3  subversion-1.12.0-linking.patch
 7fe993443d4d3ef5e1e75f60e85036ee0b2bb2636c2c830210e64f525f95ae4c10ca1dc4504fc36915ec9391815becbe7cbf5f589c28609386d8d079ed02c630  svnserve.confd
-f6392193cc65aaceee9b6e5e66f80af4b095ba4007e8536e8b1c4e8b2c75610d7f5596b83e5edd504672f021c074887fc6464cf4fc1dfe9446741105f11cd855  svnserve.initd"
+f6392193cc65aaceee9b6e5e66f80af4b095ba4007e8536e8b1c4e8b2c75610d7f5596b83e5edd504672f021c074887fc6464cf4fc1dfe9446741105f11cd855  svnserve.initd
+"
diff --git a/main/sudo/APKBUILD b/main/sudo/APKBUILD
deleted file mode 100644
index 8e993d21cb2..00000000000
--- a/main/sudo/APKBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=sudo
-pkgver=1.8.31
-if [ "${pkgver%_*}" != "$pkgver" ]; then
-	_realver=${pkgver%_*}${pkgver#*_}
-else
-	_realver=$pkgver
-fi
-pkgrel=0
-pkgdesc="Give certain users the ability to run some commands as root"
-url="https://www.sudo.ws/sudo/"
-arch="all"
-license="custom ISC"
-makedepends="zlib-dev bash mdocml"
-subpackages="$pkgname-doc $pkgname-dev"
-source="https://www.sudo.ws/dist/sudo-$_realver.tar.gz
-	fix-cross-compile.patch
-	SIGUNUSED.patch
-	"
-options="suid"
-
-# secfixes:
-#   1.8.31-r0:
-#     - CVE-2019-18634
-#   1.8.28-r0:
-#     - CVE-2019-14287
-#   1.8.20_p2-r0:
-#     - CVE-2017-1000368
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--libexecdir=/usr/lib \
-		--mandir=/usr/share/man \
-		--disable-nls \
-		--enable-pie \
-		--with-env-editor \
-		--with-mdoc \
-		--without-pam \
-		--without-skey \
-		--with-passprompt="[sudo] password for %p: "
-
-	# Workaround until SIGUNUSED.patch is not needed anymore
-	rm lib/util/mksiglist.h lib/util/mksigname.h
-	make -C lib/util DEVEL=1 mksiglist.h mksigname.h
-	make
-}
-
-check() {
-	make check
-}
-
-package() {
-	# the sudo's mkinstalldir script miscreates the leading
-	# path components with bad permissions. fix this.
-	install -d -m0755 "$pkgdir"/var "$pkgdir"/var/db
-	make -j1 DESTDIR="$pkgdir" install
-	rm -rf "$pkgdir"/var/run
-}
-
-sha512sums="b9e408a322938c7a712458e9012d8a5f648fba5b23a5057cf5d8372c7f931262595f1575c32c32b9cb1a04af670ff4611e7df48d197e5c4cc038d6b65439a28a  sudo-1.8.31.tar.gz
-f0f462f40502da2194310fe4a72ec1a16ba40f95a821ba9aa6aabaa423d28c4ab26b684afa7fb81c2407cf60de9327bdab01de51b878c5d4de49b0d62645f53c  fix-cross-compile.patch
-1f81f85f9dea6ee7e66d9b180611115cf8945f01cde19f5666ac09c759ae0c9a49fb464672650ec216e43d9159ff97c9ba786d5cae5917642ab1f31c29af8546  SIGUNUSED.patch"
diff --git a/main/sudo/SIGUNUSED.patch b/main/sudo/SIGUNUSED.patch
deleted file mode 100644
index 890aa57b510..00000000000
--- a/main/sudo/SIGUNUSED.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/lib/util/siglist.in	2019-10-10 11:32:54.000000000 -0500
-+++ b/lib/util/siglist.in	2019-10-14 16:42:46.259938722 -0500
-@@ -17,11 +17,12 @@
-     EMT     EMT trap
-     FPE     Floating point exception
-     KILL    Killed
-+# before UNUSED (musl defines them as the same number)
-+    SYS     Bad system call
- # before BUS (Older Linux doesn't really have a BUS, but defines it to UNUSED)
-     UNUSED  Unused
-     BUS     Bus error
-     SEGV    Memory fault
--    SYS     Bad system call
-     PIPE    Broken pipe
-     ALRM    Alarm clock
-     TERM    Terminated
diff --git a/main/sudo/fix-cross-compile.patch b/main/sudo/fix-cross-compile.patch
deleted file mode 100644
index d2fc97cca2e..00000000000
--- a/main/sudo/fix-cross-compile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./lib/util/Makefile.in.orig
-+++ ./lib/util/Makefile.in
-@@ -160,10 +160,10 @@
- 	./mksigname > $@
- 
- mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/sudo_compat.h $(top_builddir)/config.h
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksiglist.c -o $@
-+	$${HOSTCC:-gcc} $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksiglist.c -o $@
- 
- mksigname: $(srcdir)/mksigname.c $(srcdir)/mksigname.h $(incdir)/sudo_compat.h $(top_builddir)/config.h
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksigname.c -o $@
-+	$${HOSTCC:-gcc} $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksigname.c -o $@
- 
- $(srcdir)/mksiglist.h: $(srcdir)/siglist.in
- 	@if [ -n "$(DEVEL)" ]; then \
diff --git a/main/supervisor/APKBUILD b/main/supervisor/APKBUILD
index c0f716b5070..d2a1dd2c157 100644
--- a/main/supervisor/APKBUILD
+++ b/main/supervisor/APKBUILD
@@ -1,14 +1,18 @@
 # Contributor: Peter Bui <pnutzh4x0r@gmail.com>
-# Maintainer:
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=supervisor
-pkgver=4.1.0
-pkgrel=1
-pkgdesc="A system for controlling process state under UNIX"
-url="http://supervisord.org"
+pkgver=4.2.5
+pkgrel=5
+pkgdesc="system for controlling process state under UNIX"
+url="http://supervisord.org/"
 arch="noarch"
-license="BSD"
-depends="python3 py3-meld3 py3-setuptools"
-makedepends="$depends_dev"
+license="BSD-4-Clause AND BSD-3-Clause-Clear"
+# setuptools is a runtime dependency,
+# see 4a92a58b46bf23924e243fb36bf3ba769a476178
+depends="python3 py3-setuptools"
+makedepends="py3-gpep517 py3-wheel"
+checkdepends="py3-pytest"
+subpackages="$pkgname-pyc supervisor-openrc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/Supervisor/supervisor/archive/$pkgver.tar.gz
 	supervisord.conf
 	supervisord.initrd
@@ -21,21 +25,25 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/Supervisor/supervisor/archiv
 #     - CVE-2017-11610
 
 build() {
-	python3 setup.py build
+	gpep517 build-wheel --wheel-dir .dist --output-fd 3 3>&1 >&2
 }
 
 check() {
-	python3 setup.py test
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 -m installer -d "$pkgdir" .dist/*.whl
 	install -Dm600 "$srcdir/supervisord.conf" "$pkgdir/etc/supervisord.conf"
 	install -Dm755 "$srcdir/supervisord.initrd" "$pkgdir/etc/init.d/supervisord"
 	install -Dm644 "$srcdir/supervisord.logrotate" "$pkgdir/etc/logrotate.d/supervisord"
 }
 
-sha512sums="da518db7785fa368cf398cd7268a37561030268c413b7583a8917d70231f2e93810e7de9013219fffccaa9a86e1143345ffc0f3ceef7ee72205e3c496e779cd1  supervisor-4.1.0.tar.gz
-21038df7be7ce3d1fbe1f90f019b9602bf7ec526fdbf8c90fbc996c5721faba90a474cdacb297d9aa33f9a5c6b7281113384bafaccf62ef9984718ee751639d6  supervisord.conf
+sha512sums="
+54feb6f9779326aad90f00a88097f2e68a3aefebfa2529782768c097f28d4d94583b345da6a95593f92bdf04177d61761e4f9e1f0bb48afa4abee005a0a078d1  supervisor-4.2.5.tar.gz
+efdb2dba28cf310aebd730a9096838c5b879c457e4961c6b54d4da1db7238300f584cd714ca48a71ba891f780d819ee719c3b3dbbf92eb1213794833544f01b6  supervisord.conf
 7f7c51239c2360c4d03e1167e90650e0474ce8a0ca79c5d491f5f04a78eb95c343ed25d81983cde2f82535420e9b663cde532665114124b06a98fd7d08410416  supervisord.initrd
-881fd0893280cb5053f56128838af51b6c79d715559e7b04a268102fd7b6121c99ff4411ed7f443f21232146925d40e1fbe269e5fcefa3f86fa35ba9d3625193  supervisord.logrotate"
+881fd0893280cb5053f56128838af51b6c79d715559e7b04a268102fd7b6121c99ff4411ed7f443f21232146925d40e1fbe269e5fcefa3f86fa35ba9d3625193  supervisord.logrotate
+"
diff --git a/main/supervisor/supervisord.conf b/main/supervisor/supervisord.conf
index 81705efbbdb..625e50321ba 100644
--- a/main/supervisor/supervisord.conf
+++ b/main/supervisor/supervisord.conf
@@ -48,6 +48,7 @@ logfile=/var/log/supervisord.log ; main log file; default $CWD/supervisord.log
 ;loglevel=info                   ; log level; default info; others: debug,warn,trace
 ;pidfile=/run/supervisord.pid    ; supervisord pidfile; default supervisord.pid
 ;nodaemon=false                  ; start in foreground if true; default false
+;silent=false                    ; no logs to stdout if true; default false
 ;minfds=1024                     ; min. avail startup file descriptors; default 1024
 ;minprocs=200                    ; min. avail process descriptors;default 200
 ;umask=022                       ; process file creation umask; default 022
diff --git a/main/swig/APKBUILD b/main/swig/APKBUILD
index 73425409320..3faa53916b8 100644
--- a/main/swig/APKBUILD
+++ b/main/swig/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=swig
-pkgver=4.0.1
-pkgrel=0
+pkgver=4.2.1
+pkgrel=1
 pkgdesc="A compiler that makes it easy to integrate C and C++ code with scripting languages"
-url="http://www.swig.org/"
+url="https://www.swig.org/"
 arch="all"
-license="GPL-3.0 BSD"
+license="GPL-3.0-only"
 depends="guile"
-makedepends="zlib-dev pcre-dev bison"
+makedepends="zlib-dev pcre2-dev bison"
 checkdepends="boost-dev perl-dev python3-dev diffutils"
 subpackages="$pkgname-doc"
 source="https://downloads.sourceforge.net/swig/swig-$pkgver.tar.gz
@@ -25,8 +25,8 @@ build() {
 
 check() {
 	(
-#	export PATH="/usr/bin:/bin:/usr/sbin:/sbin"
-	env
+	# ccache test seems broken with ccache in the path..
+	export PATH="/usr/bin:/bin:/usr/sbin:/sbin"
 	make -C CCache check
 	)
 }
@@ -37,5 +37,7 @@ package() {
 	install -D -m644 LICENSE-UNIVERSITIES "$pkgdir"/usr/share/licenses/$pkgname/LICENSE-UNIVERSITIES
 }
 
-sha512sums="595ef01cb83adfa960ceed9c325a9429192549e8d1e9aa3ab35a4301512a61d82e2e89a8c7939c2a5a0811254ea1832a443bd387e11459eb2b0bafc563ad1308  swig-4.0.1.tar.gz
-62d6eecba01abe8ddd5a3b8a5512b57e63182b49d957bb81903c29dfccfaa62e75555dabc2c7b163afb8432328dd10e23bec0e3bf1d1d7622ec1119f5dab0a64  fix-test-sed-PATH.patch"
+sha512sums="
+019dee5a46d57e1030eef47cd5d007ccaadbdcd4e53cd30d7c795f0118ecf4406a78185534502c81c5f6d7bac0713256e7e19b20b5a2d14e2c552219edbaf5cf  swig-4.2.1.tar.gz
+62d6eecba01abe8ddd5a3b8a5512b57e63182b49d957bb81903c29dfccfaa62e75555dabc2c7b163afb8432328dd10e23bec0e3bf1d1d7622ec1119f5dab0a64  fix-test-sed-PATH.patch
+"
diff --git a/main/swish-e/APKBUILD b/main/swish-e/APKBUILD
index 3adbbe5f52e..110692611fe 100644
--- a/main/swish-e/APKBUILD
+++ b/main/swish-e/APKBUILD
@@ -2,42 +2,41 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=swish-e
 pkgver=2.4.7
-pkgrel=11
+pkgrel=16
 pkgdesc="Simple Web Indexing System for Humans - Enhanced"
 url="http://www.swish-e.org/"
 arch="all"
-license="GPL"
+license="GPL-2.0-or-later"
+options="!check" # fixme: failing tests
 depends="perl-html-parser perl-html-tagset perl-libwww"
 makedepends="perl-dev"
-install=
 subpackages="$pkgname-dev $pkgname-doc"
 #source="http://www.swish-e.org/distribution/$pkgname-$pkgver.tar.gz"
 source="https://distfiles.macports.org/swish-e/swish-e-$pkgver.tar.gz
+	format-security.patch
 	zlib-shadowing.patch"
 
-builddir="$srcdir/$pkgname-$pkgver"
-
 prepare() {
 	default_prepare
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
-	make || return 1
+		--infodir=/usr/share/info
+	make
+}
+
+check() {
+	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	# Move SwishSpiderConfig.pl because spider.pl won't run without default settings
@@ -45,5 +44,8 @@ package() {
 
 }
 
-sha512sums="859cb0cacea093f4d6c19353cafe723067569b832485689128b5a86e416aca3a03e1f852b96acc4cb5e6b0f6814cac364d4bbce0a2928fd5ac5224e14022a666  swish-e-2.4.7.tar.gz
-33c637ac734a7a5e7be398728e3f109a20c9cb69fdb739339d3fbd0a2392fa135e442d8e682889b881e9bf049a3344f4f0e7b0cf5e009bd2ad40b1772e8910ec  zlib-shadowing.patch"
+sha512sums="
+859cb0cacea093f4d6c19353cafe723067569b832485689128b5a86e416aca3a03e1f852b96acc4cb5e6b0f6814cac364d4bbce0a2928fd5ac5224e14022a666  swish-e-2.4.7.tar.gz
+8cadd53fb39ee17c85faba20acfd6e323f2253d2f90d57528600e61173c81d8a898309e0ba8fd2ec176f2b98833fb2c4d3b6a4ee90f8f2ad942186d77bd45c4f  format-security.patch
+33c637ac734a7a5e7be398728e3f109a20c9cb69fdb739339d3fbd0a2392fa135e442d8e682889b881e9bf049a3344f4f0e7b0cf5e009bd2ad40b1772e8910ec  zlib-shadowing.patch
+"
diff --git a/main/swish-e/format-security.patch b/main/swish-e/format-security.patch
new file mode 100644
index 00000000000..9b42ac936b2
--- /dev/null
+++ b/main/swish-e/format-security.patch
@@ -0,0 +1,13 @@
+diff --git a/src/result_output.c b/src/result_output.c
+index 48eeeca..9293e50 100644
+--- a/src/result_output.c
++++ b/src/result_output.c
+@@ -752,7 +752,7 @@ static void printPropertyResultControl(FILE * f, char *propname, char *subfmt, R
+             s = (char *) emalloc(MAXWORDLEN + 1);
+             n = strftime(s, (size_t) MAXWORDLEN, fmt, localtime(&(pv->value.v_date)));
+             if (n && f)
+-                fprintf(f, s);
++                fprintf(f, "%s", s);
+             efree(s);
+         }
+         break;
diff --git a/main/sysfsutils/APKBUILD b/main/sysfsutils/APKBUILD
index 14b86ef3699..5cbd7164751 100644
--- a/main/sysfsutils/APKBUILD
+++ b/main/sysfsutils/APKBUILD
@@ -1,25 +1,23 @@
+# Contributor: omni <omni+alpine@hack.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sysfsutils
-pkgver=2.1.0
-pkgrel=8
+pkgver=2.1.1
+pkgrel=3
 pkgdesc="System Utilities Based on Sysfs"
-url="http://linux-diag.sourceforge.net/Sysfsutils.html"
+url="https://github.com/linux-ras/sysfsutils"
 arch="all"
-options="!check"  # No test suite.
-license="GPL-2.0-only, LGPL-2.1-only"
-depends=""
-makedepends=""
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://downloads.sourceforge.net/sourceforge/linux-diag/$pkgname-$pkgver.tar.gz"
+makedepends="autoconf automake libtool"
+options="!check" # FIXME: A test suite exist but need to be configured
+license="GPL-2.0-only AND LGPL-2.1-only"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/linux-ras/sysfsutils/archive/v$pkgver.tar.gz"
 
 prepare() {
-	cd "$builddir"
-	update_config_sub
 	default_prepare
+	./autogen
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,7 +27,8 @@ build() {
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir"/ install
+	make DESTDIR="$pkgdir" install
+	install -Dm0644 COPYING -t "$pkgdir"/usr/share/licenses/"$pkgname"
 }
-sha512sums="485902d98b41a69343cb037883d0c0a1de8a1a4aed657cd4528fe10bc845ac51629657dff01deef042e57c9bd9243095e23fc931d06d74db31b03c5f0a18cf07  sysfsutils-2.1.0.tar.gz"
+
+sha512sums="7e1c8535be3c29dec8e23e8b6e8d3ec794bbdc696f161fa38731844c82cc1d37ff04f94c8b0ec0cf8da7147fc696dad0086262641984fa67378ffd2f162dc358  sysfsutils-2.1.1.tar.gz"
diff --git a/main/sysklogd/APKBUILD b/main/sysklogd/APKBUILD
index 3e15a8444db..4969083cc72 100644
--- a/main/sysklogd/APKBUILD
+++ b/main/sysklogd/APKBUILD
@@ -1,16 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sysklogd
 pkgver=1.5.1
-pkgrel=1
+pkgrel=5
 pkgdesc="System and kernel log daemons"
-url="http://www.infodrom.org/projects/sysklogd/"
+url="https://github.com/troglobit/sysklogd"
 arch="all"
-license="GPL BSD"
-subpackages="$pkgname-doc"
-depends=""
+license="GPL-2.0-or-later"
+subpackages="$pkgname-doc $pkgname-openrc"
 makedepends="linux-headers"
 options="!check"  # requires kernel sources to build oops.ko
-source="http://www.infodrom.org/projects/$pkgname/download/$pkgname-$pkgver.tar.gz
+source="http://www.infodrom.org/projects/sysklogd/download/sysklogd-$pkgver.tar.gz
 	sysklogd.logrotate
 	sysklogd.daily
 	sysklogd.initd
@@ -22,16 +21,13 @@ source="http://www.infodrom.org/projects/$pkgname/download/$pkgname-$pkgver.tar.
 	ksym-fclose-fix.patch
 	fix-includes.patch
 	syslog.conf
-	LICENSE"
+	"
 
-builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$builddir"
 	make CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
 }
 
 package() {
-	cd "$builddir"
 	make INSTALL="install -D" prefix="$pkgdir" install
 
 	install -D -m644 "$srcdir"/sysklogd.logrotate \
@@ -41,13 +37,12 @@ package() {
 	install -D -m755 "$srcdir"/sysklogd.initd "$pkgdir"/etc/init.d/sysklogd
 	install -D -m644 "$srcdir"/sysklogd.confd "$pkgdir"/etc/conf.d/sysklogd
 	install -D -m644 "$srcdir"/syslog.conf "$pkgdir"/etc/syslog.conf
-	install -D -m644 "$srcdir"/LICENSE \
-		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="a72196a1a172d25be1c4791ef6256fe71fa2ba8c1383d230e646e93f8a65c3a57c535189726325da4c792fdb2e9cb119bba43c878816a8e78e78189fd32b12b7  sysklogd-1.5.1.tar.gz
+sha512sums="
+a72196a1a172d25be1c4791ef6256fe71fa2ba8c1383d230e646e93f8a65c3a57c535189726325da4c792fdb2e9cb119bba43c878816a8e78e78189fd32b12b7  sysklogd-1.5.1.tar.gz
 d82caedfa61bfefc0162e5c416ff75a5cd8f60abe1cf8a3c5c4e7775aeb7bb64e712c783031659d3793378c8753578adf73ef79aac6a0e7cfbc5bbba5a74bd81  sysklogd.logrotate
-87a95d612b9841a022c91a219ff4f69f57badb7f84178f06fc8abec242df948540582f27146b34c6ce730a451ddfc5195b24237cd70c70896ef040148789dd20  sysklogd.daily
+19e7a744f51a3fd4ec26a2c6ddd8c780b8de9cc238dce3b5ecf1c063b81b09b5ae306fccaea958630991c4a1273bb70c532022fc05a752c8a59ac818f81a9c3d  sysklogd.daily
 eb4c2c411d75315e113efe40c8445dd2eb7aa88e3318ce3d7624916005ec82325a877c83f5816231fc25d5103ac5be1fc58a4d9593b99fea24c87805abd03039  sysklogd.initd
 4553d85e93fb07e7d4a6ed0b47a3ea2044a5605adaac05223724c32a60bb8ae96d99ca95965c3931640beef234e976c1141b83f603aa8c6e8aca1dec20ca807c  sysklogd.confd
 1a5cf4a5dec3ecaa8258110820b64d6a8e1e768e841a3f0ade8d7827b91e73c2d8a49a9d8b74566373133627af88dd46d14e83ae1940a0b2e6cd6fe8710a7e7a  sysklogd-1.4.2-caen-owl-klogd-drop-root.patch
@@ -57,4 +52,4 @@ ab979b36f091c62ada916246723cd75a71319a6c3687c034167b9caafc53807e6d224e0d6c836bc4
 ceb1f7cb70f526dd285fc8bad5511cdef603fc1296f69cc0e7ec4901f11685fae083d028687765b233ca074dfbe0cdafa921de6c80a5cbced94de1059d9761ee  ksym-fclose-fix.patch
 0208662a0158ecb6b0a387bd1bf467c866105dac02767209aeaaaeb02762d6c2b814a2707315f8f6cd40f46c4b7744b74653e30973c31354998c27cd7c966dbd  fix-includes.patch
 49f73b8a16b92d0cda56db9cfc16d5322e797590dfc998282a62560d54205042af953837f5f94b45a3de403fdf5f63efe65d72e9908c7185a2cd5941275abf33  syslog.conf
-7b3de1d38b50df14ceaada900f2e8f23b0d5035278c9eacb06d2578ccdcf64ffc44bbb76ed6a10d80f4b883bf36a3ecd2bf60897321e4eae7aed7d8a5a36d86c  LICENSE"
+"
diff --git a/main/sysklogd/LICENSE b/main/sysklogd/LICENSE
deleted file mode 100644
index 7e9b5d59c32..00000000000
--- a/main/sysklogd/LICENSE
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 1983, 1988 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
diff --git a/main/sysklogd/sysklogd.daily b/main/sysklogd/sysklogd.daily
index 725c33e3175..197fe89f573 100755
--- a/main/sysklogd/sysklogd.daily
+++ b/main/sysklogd/sysklogd.daily
@@ -87,5 +87,5 @@ for LOG in $(syslogd_listfiles --auth); do
 	[ -f $LOG ] && savelog -g adm -m 640 -u root -c 7 $LOG
 done
 
-killall -HUP syslogd
+busybox killall -HUP syslogd
 
diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD
index 363f16ca399..7877769c51e 100644
--- a/main/syslinux/APKBUILD
+++ b/main/syslinux/APKBUILD
@@ -1,54 +1,42 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=syslinux
 pkgver=6.04_pre1
-pkgrel=6
+pkgrel=15
 _ver=${pkgver/_/-}
 pkgdesc="Boot loader for the Linux operating system"
-url="http://syslinux.org"
+url="https://syslinux.org"
 arch="x86 x86_64"
-license="GPL"
+license="GPL-2.0-or-later"
 makedepends="linux-headers nasm perl util-linux-dev gnu-efi-dev"
-depends="mtools blkid mkinitfs"
+depends="mtools blkid initramfs-generator"
 triggers="syslinux.trigger=/boot"
 install="syslinux.post-upgrade"
-options="textrels"
 ldpath="/usr/share/syslinux"
-
+subpackages="$pkgname-doc $pkgname-dev"
 source="https://www.kernel.org/pub/linux/utils/boot/syslinux/Testing/${pkgver%_pre*}/syslinux-$_ver.tar.xz
 	update-extlinux.conf
 	update-extlinux
 	0018-prevent-pow-optimization.patch
 	fix-sysmacros.patch
+	gcc-10.patch
 	"
-subpackages="$pkgname-doc $pkgname-dev"
 
-_loaderarch=
 case "$CARCH" in
 x86)	_loaderarch=efi32;;
 x86_64)	_loaderarch=efi64;;
 esac
 
 builddir="$srcdir"/$pkgname-$_ver
-prepare() {
-	cd "$builddir"
-	for i in $source; do
-		i=${i%%::*}
-		case "$i" in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+options="textrels !check"
 
 build() {
-	cd "$builddir"
 	unset LDFLAGS
-	make $_loaderarch installer || return 1
+	make $_loaderarch installer
 }
 
 package() {
-	cd "$builddir"
 	make -j1 INSTALLROOT="$pkgdir" MANDIR=/usr/share/man \
-		bios $_loaderarch install || return 1
+		bios $_loaderarch install
 
 	mkdir -p "$pkgdir"/etc/update-extlinux.d
 	cp "$srcdir"/update-extlinux.conf "$pkgdir"/etc/
@@ -57,8 +45,11 @@ package() {
 	chmod 755 "$pkgdir"/sbin/update-extlinux
 }
 
-sha512sums="7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98  syslinux-6.04-pre1.tar.xz
-9d2b82c91525de584daad6b0c0e2df5d13092c47e91a812e26405f5ff78d4587a8ae7f7a8590124687307f83efb15f686e4090193adc7b4e3601a4200f9283cd  update-extlinux.conf
-bfeb911507c079c8b01027a7823e562d81100b1fcd0786c707ad33c5ce18fa0eb6d6db34bc7b6cbbc419248188970cebe8286345f4aa3662d16644c51f50b98c  update-extlinux
+sha512sums="
+7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98  syslinux-6.04-pre1.tar.xz
+2fb759e483d51769d0259587fe1f48a92d4f95e350f8dc7f055a29da75670617260c0d1a467b63ac05c7719a8fe673ca7f6244011f78592cf750f11acb8d6bb4  update-extlinux.conf
+ebd33afdc8c0ea18867f9bc970e54da6b72fc8dddc0475b0d6b24f6c76a1d7d7b8568332f3f9b36122af273d5bd5ea940e8d4aaf978d86029d015329f74c480c  update-extlinux
 92fa48133ef702092d7acafae0e0e20f9355cd2b5fe199b96fcccba5a1e688c360de4d069391815255f5493228ad03998d20b99748323396d20d12a1f27c60cd  0018-prevent-pow-optimization.patch
-6fb63b50a6c746445a58badc81cbf8525f38e2a7868b97ac21aa9d20c162f2318fab6c25505614700033a840aa5c06c3cef3065f11b5b5f4e514474194ff4b54  fix-sysmacros.patch"
+6fb63b50a6c746445a58badc81cbf8525f38e2a7868b97ac21aa9d20c162f2318fab6c25505614700033a840aa5c06c3cef3065f11b5b5f4e514474194ff4b54  fix-sysmacros.patch
+62a45f94107300b05a93be18a228c15ae9ce90addeee39a1ef35845077b493e72ebed35791bf8db21c406c379a83220cc4db4e1919c01fcd387ae10b2cfc8861  gcc-10.patch
+"
diff --git a/main/syslinux/gcc-10.patch b/main/syslinux/gcc-10.patch
new file mode 100644
index 00000000000..b5bbad0ac05
--- /dev/null
+++ b/main/syslinux/gcc-10.patch
@@ -0,0 +1,109 @@
+From 951928f2cad5682c2844e6bd0f7201236c5d9b66 Mon Sep 17 00:00:00 2001
+From: Merlin Mathesius <mmathesi@redhat.com>
+Date: Wed, 13 May 2020 08:02:27 -0500
+Subject: [PATCH] Workaround multiple definition of symbol errors
+
+---
+ com32/cmenu/Makefile           | 2 +-
+ com32/elflink/ldlinux/Makefile | 2 +-
+ com32/gpllib/Makefile          | 2 +-
+ com32/hdt/Makefile             | 2 +-
+ core/Makefile                  | 2 +-
+ dos/Makefile                   | 2 +-
+ efi/Makefile                   | 2 +-
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/com32/cmenu/Makefile b/com32/cmenu/Makefile
+index b81b68ed..2ae989c4 100644
+--- a/com32/cmenu/Makefile
++++ b/com32/cmenu/Makefile
+@@ -49,7 +49,7 @@ makeoutputdirs:
+ 	@mkdir -p $(OBJ)/libmenu
+ 
+ libmenu/libmenu.elf: $(LIBMENU)
+-	$(LD) -shared $(LDFLAGS) -soname $(patsubst %.elf,%.c32,$(@F)) \
++	$(LD) -shared $(LDFLAGS) -z muldefs -soname $(patsubst %.elf,%.c32,$(@F)) \
+ 		-o $@ $^
+ 
+ tidy dist:
+diff --git a/com32/elflink/ldlinux/Makefile b/com32/elflink/ldlinux/Makefile
+index 87c0d362..2be2a01a 100644
+--- a/com32/elflink/ldlinux/Makefile
++++ b/com32/elflink/ldlinux/Makefile
+@@ -33,7 +33,7 @@ endif
+ all: $(BTARGET) ldlinux_lnx.a
+ 
+ ldlinux.elf : $(OBJS)
+-	$(LD) $(LDFLAGS) -soname $(SONAME) -o $@ $^ $(LIBS)
++	$(LD) $(LDFLAGS) -z muldefs -soname $(SONAME) -o $@ $^ $(LIBS)
+ 
+ LNXCFLAGS += -D__export='__attribute__((visibility("default")))'
+ LNXLIBOBJS = get_key.lo
+diff --git a/com32/gpllib/Makefile b/com32/gpllib/Makefile
+index 1fec9145..2d764d0b 100644
+--- a/com32/gpllib/Makefile
++++ b/com32/gpllib/Makefile
+@@ -24,7 +24,7 @@ makeoutputdirs:
+ 		$(addprefix $(OBJ),$(sort $(dir $(LIBOBJS)))),$(b))
+ 
+ libgpl.elf : $(LIBOBJS)
+-	$(LD) -shared $(LDFLAGS) -soname $(patsubst %.elf,%.c32,$(@F)) -o $@ $^
++	$(LD) -shared $(LDFLAGS) -z muldefs -soname $(patsubst %.elf,%.c32,$(@F)) -o $@ $^
+ 
+ tidy dist clean:
+ 	find . \( -name \*.o -o -name .\*.d -o -name \*.tmp \) -print0 | \
+diff --git a/com32/hdt/Makefile b/com32/hdt/Makefile
+index 61736d05..1d947857 100644
+--- a/com32/hdt/Makefile
++++ b/com32/hdt/Makefile
+@@ -52,7 +52,7 @@ QEMU			?= qemu-kvm
+ all: $(MODULES) $(TESTFILES)
+ 
+ hdt.elf : $(OBJS) $(LIBS) $(C_LIBS)
+-	$(LD) $(LDFLAGS) -o $@ $^
++	$(LD) $(LDFLAGS) -z muldefs -o $@ $^
+ 
+ memtest:
+ 	-[ ! -f $(FLOPPY_DIR)/$(MEMTEST) ] && $(WGET) $(MEMTEST_URL) -O $(FLOPPY_DIR)/$(MEMTEST)
+diff --git a/core/Makefile b/core/Makefile
+index 46cb037c..f0cfcbe9 100644
+--- a/core/Makefile
++++ b/core/Makefile
+@@ -156,7 +156,7 @@ LDSCRIPT = $(SRC)/$(ARCH)/syslinux.ld
+ NASM_ELF = elf
+ 
+ %.elf: %.o $(LIBDEP) $(LDSCRIPT) $(AUXLIBS)
+-	$(LD) $(LDFLAGS) -pie -Bsymbolic \
++	$(LD) $(LDFLAGS) -z muldefs -pie -Bsymbolic \
+ 		-T $(LDSCRIPT) \
+ 		--unresolved-symbols=report-all \
+ 		-E --hash-style=gnu -M -o $@ $< \
+diff --git a/dos/Makefile b/dos/Makefile
+index 4c930d19..5d1c72ca 100644
+--- a/dos/Makefile
++++ b/dos/Makefile
+@@ -19,7 +19,7 @@ include $(MAKEDIR)/embedded.mk
+ CFLAGS	+= -D__MSDOS__ -mregparm=3 -DREGPARM=3
+ # CFLAGS  += -DDEBUG
+ 
+-LDFLAGS	 = -T $(SRC)/dosexe.ld
++LDFLAGS	 = -T $(SRC)/dosexe.ld -z muldefs
+ OPTFLAGS = -g
+ INCLUDES = -include code16.h -nostdinc -iwithprefix include \
+ 	   -I$(SRC) -I$(SRC)/.. -I$(SRC)/../libfat \
+diff --git a/efi/Makefile b/efi/Makefile
+index bbf23f24..3dd922d5 100644
+--- a/efi/Makefile
++++ b/efi/Makefile
+@@ -69,7 +69,7 @@ $(OBJS): | $(OBJ)/$(ARCH)
+ BTARGET  = syslinux.efi
+ 
+ syslinux.so: $(OBJS) $(CORE_OBJS) $(LIB_OBJS)
+-	$(LD) $(LDFLAGS) --strip-debug -o $@ $^ -lgnuefi -lefi
++	$(LD) $(LDFLAGS) -z muldefs --strip-debug -o $@ $^ -lgnuefi -lefi
+ 
+ # We need to rename the .hash section because the EFI firmware
+ # linker really doesn't like it.
+-- 
+2.25.1
+
diff --git a/main/syslinux/update-extlinux b/main/syslinux/update-extlinux
index f82066f9e98..e3d44c4fe66 100755
--- a/main/syslinux/update-extlinux
+++ b/main/syslinux/update-extlinux
@@ -90,7 +90,16 @@ if [ "x$root" = "x" ]; then
 	everbose "Root device is: $root"
 fi
 
-rtimeout=$(( ${timeout} * 10 ))
+if [ -z "${timeout##*[!0-9]*}" ]; then
+	if [ -n "$warn_only" ]; then
+		ewarn "timeout ($timeout) must be an integer; flooring."
+		timeout=$(echo $timeout | cut -f1 -d.)
+	else
+		eerror "timeout ($timeout) must be an integer."
+		exit 1
+	fi
+fi
+rtimeout=$(( $timeout * 10 ))
 syslinux_menu=menu.c32
 menu_hidden=
 
@@ -126,19 +135,41 @@ if [ -f "/boot/xen.gz" ]; then
 		else
 			initramfs=
 		fi
+		initramfs_stage="${initramfs:+---} $initramfs"
+
+		if [ -f "/boot/amd-ucode.img" ]; then
+			everbose "Found microcode for AMD CPUs: /boot/amd-ucode.img"
+			ucode_image_amd="amd-ucode.img"
+			case "$xen_opts" in
+				*ucode=scan* ) ;;
+				* ) xen_opts="$xen_opts ucode=scan" ;;
+			esac
+		fi
+		if [ -f "/boot/intel-ucode.img" ]; then
+			everbose "Found microcode for Intel CPUs: /boot/intel-ucode.img"
+			ucode_image_intel="intel-ucode.img"
+			case "$xen_opts" in
+				*ucode=scan* ) ;;
+				* ) xen_opts="$xen_opts ucode=scan" ;;
+			esac
+		fi
+		ucode_image_stage="${ucode_image_amd:+---} $ucode_image_amd ${ucode_image_intel:+---} $ucode_image_intel"
+
 		label=xen-$(grep -w -l $tag /usr/share/kernel/*/kernel.release \
 				| cut -d/ -f5)
 		if [ "$label" = "xen-" ]; then
 			label=xen-$lst
 		fi
 
+		dom0_kernel_stage="--- $(basename $kernel) root=$root modules=${modules}${TYPE:+,$TYPE} $default_kernel_opts"
+
 		echo "LABEL $label" >> $conf.new
 		if [ "$label" = "$default" ]; then
 			echo "  MENU DEFAULT" >> $conf.new
 		fi
 		echo "  MENU LABEL Xen + Linux $tag" >> $conf.new
 		echo "  COM32 mboot.c32" >> $conf.new
-		echo "  APPEND xen.gz $xen_opts --- $(basename $kernel) root=$root modules=${modules}${TYPE:+,$TYPE} $default_kernel_opts --- $initramfs" >> $conf.new
+		echo "  APPEND xen.gz $xen_opts $dom0_kernel_stage $initramfs_stage $ucode_image_stage" >> $conf.new
 		echo "" >> $conf.new
 		lst=$(($lst + 1))
 	done
@@ -170,6 +201,10 @@ for kernel in $(find /boot -name "vmlinuz*" -type f); do
 		everbose "Found initramfs: /boot/initramfs-$tag"
 		initrd="initramfs-$tag"
 	fi
+	if [ -f "/boot/amd-ucode.img" ]; then
+		everbose "Found microcode for AMD CPUs: /boot/amd-ucode.img"
+		initrd="amd-ucode.img${initrd:+,}${initrd}"
+	fi
 	if [ -f "/boot/intel-ucode.img" ]; then
 		everbose "Found microcode for Intel CPUs: /boot/intel-ucode.img"
 		initrd="intel-ucode.img${initrd:+,}${initrd}"
diff --git a/main/syslinux/update-extlinux.conf b/main/syslinux/update-extlinux.conf
index 1dddff2263e..732ccbe4855 100644
--- a/main/syslinux/update-extlinux.conf
+++ b/main/syslinux/update-extlinux.conf
@@ -32,7 +32,7 @@ hidden=1
 
 # timeout
 # number of seconds to wait before booting default
-timeout=3
+timeout=1
 
 # default
 # default kernel to boot
diff --git a/main/syslog-ng/APKBUILD b/main/syslog-ng/APKBUILD
index 98d53c89d0e..28bc2b39fb5 100644
--- a/main/syslog-ng/APKBUILD
+++ b/main/syslog-ng/APKBUILD
@@ -4,29 +4,27 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: jv <jens@eisfair.org>
 pkgname=syslog-ng
-pkgver=3.26.1
-pkgrel=0
+pkgver=4.6.0
+pkgrel=1
 pkgdesc="Next generation logging daemon"
 url="https://www.syslog-ng.com/products/open-source-log-management/"
 arch="all"
 license="GPL-2.0-or-later"
 options="!check" # unit tests require https://github.com/Snaipe/Criterion with deps
 makedepends="
+	bison
 	curl-dev
 	eventlog-dev
 	file
-	bison
 	flex
-	autoconf
-	automake
-	libtool
 	glib-dev
 	hiredis-dev
-	ivykis-dev>=0.42.4
-	libdbi-dev
+	ivykis-dev
 	json-c-dev
+	libdbi-dev
 	openssl-dev
-	pcre-dev
+	pcre2-dev
+	py3-setuptools
 	python3-dev
 	rabbitmq-c-dev
 	"
@@ -36,9 +34,10 @@ subpackages="
 	$pkgname-dev
 	$pkgname-doc
 	$pkgname-openrc
-	py3-$pkgname:_python3
+	$pkgname-python
 	"
 source="https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$pkgver/syslog-ng-$pkgver.tar.gz
+	pyversion.patch
 	$pkgname.conf
 	$pkgname.logrotate
 	$pkgname.initd
@@ -63,17 +62,9 @@ for _i in $_modules; do
 	subpackages="$subpackages $pkgname-${_i%%:*}:_module"
 done
 
-prepare() {
-	default_prepare
-
-	# Remove bundled libraries
-	rm -rf lib/ivykis
-	rm -rf modules/afamqp/rabbitmq-c
-	rm -rf modules/afmongodb/mongo-c-driver
-	autoreconf -if
-}
-
 build() {
+	CFLAGS="$CFLAGS -flto=auto" \
+	CXXFLAGS="$CXXFLAGS -flto=auto" \
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc/syslog-ng \
@@ -82,27 +73,29 @@ build() {
 		--enable-ipv6 \
 		--enable-manpages \
 		\
-		--enable-sql \
+		--disable-geoip2 \
+		--disable-java \
+		--disable-java-modules \
 		--disable-linux-caps \
 		--disable-mongodb \
-		--enable-json \
-		--enable-amqp \
-		--enable-stomp \
-		--disable-smtp \
-		--enable-http \
-		--enable-redis \
-		--enable-geoip \
-		--disable-geoip2 \
+		--disable-python-modules \
 		--disable-riemann \
+		--disable-smtp \
 		--disable-systemd \
-		--enable-python \
-		--disable-java \
-		--disable-java-modules \
+		--enable-amqp \
+		--enable-geoip \
+		--enable-http \
+		--enable-json \
 		--enable-native \
+		--enable-python \
 		--enable-rdrand \
+		--enable-redis \
+		--enable-sql \
+		--enable-stomp \
 		--with-ivykis=system \
 		--with-jsonc=system \
-		--with-librabbitmq-client=system
+		--with-librabbitmq-client=system \
+		--with-python-packages=system
 	make
 }
 
@@ -111,15 +104,15 @@ package() {
 
 	cd "$pkgdir"
 
-	rm -rf run usr/lib/$pkgname/libtest
+	rm -r run
 
 	# getent module doesn't build properly as musl doesn't support reentrant
 	# getprotoby[number|name] funcs. The provided compat lib only patches
 	# solaris, which does provide reentrant versions under a different sig
-	rm -f usr/lib/$pkgname/libtfgetent.so
+	rm usr/lib/$pkgname/libtfgetent.so
 
 	# Remove static file
-	rm -f usr/lib/libsyslog-ng-native-connector.a
+	rm usr/lib/libsyslog-ng-native-connector.a
 
 	install -m 644 "$srcdir"/$pkgname.conf etc/$pkgname/$pkgname.conf
 	install -D -m 755 "$srcdir"/$pkgname.initd etc/init.d/$pkgname
@@ -133,46 +126,45 @@ scl() {
 	pkgdesc="$pkgdesc (configuration library)"
 	depends="$pkgname=$pkgver-r$pkgrel"
 
-	_submv usr/share/syslog-ng/include/scl
+	amove usr/share/syslog-ng/include/scl
 }
 
 dev() {
 	default_dev
 
-	_submv usr/share/syslog-ng/tools \
+	amove \
+		usr/share/syslog-ng/tools \
 		usr/share/syslog-ng/xsd
-}
 
-_python3() {
-	pkgdesc="$pkgdesc (python3 module)"
-
-	_submv usr/lib/syslog-ng/libmod-python.so
+	# this has to remain in main package
+	mkdir -p "$pkgdir"/usr/share/syslog-ng/include/
+	mv "$subpkgdir"/usr/share/syslog-ng/include/scl.conf \
+		"$pkgdir"/usr/share/syslog-ng/include/
+}
 
-	local site_pkgs="$(python3 -c 'import site; print(site.getsitepackages()[0])')"
+python() {
+	pkgdesc="$pkgdesc (python module)"
 
-	mkdir -p "$subpkgdir"/"$site_pkgs"
-	mv "$pkgdir"/usr/lib/syslog-ng/python/* \
-		"$subpkgdir"/"$site_pkgs"
+	amove \
+		usr/lib/syslog-ng/libmod-python.so \
+		usr/lib/syslog-ng/python \
+		etc/syslog-ng/python
 }
 
 _module() {
-	local name="${subpkgname#$pkgname-}"
+	local name="${subpkgname#"$pkgname"-}"
 	pkgdesc="$pkgdesc (${name//-/ } module)"
 
 	local libname=$(printf '%s\n' $_modules | grep "^$name:" | cut -d: -f2)
 	local soname="lib${libname:-$name}.so"
 
-	_submv usr/lib/syslog-ng/$soname
-}
-
-_submv() {
-	local path; for path in "$@"; do
-		mkdir -p "$subpkgdir/${path%/*}"
-		mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/
-	done
+	amove usr/lib/syslog-ng/$soname
 }
 
-sha512sums="2cf6a8bd70addec3bef0888539f4a4686c30655698835d0c211ea929a0cae91a6f3dc9903f29fe717fd9d48b5cdc9918796f196ca84af6f5733bedff09ffab5a  syslog-ng-3.26.1.tar.gz
-3e844f70564325f7b356e6cb6310c72473aedc14f8be3c3c7eb262184c84523648d3ea1de1aa40489529c97343026481e790ad92dfbcdc410a94e734fd744fc0  syslog-ng.conf
-1825b85fb584c5cecf0ad370e81a7473b5c973ce10adce386d1ba5f68432abe4e2f54c937d7d94edb22dbd9031eff483bd113bc3244ce0d0072cf4bf4ab5c2cc  syslog-ng.logrotate
-873fef8815131f0acc618fa4911cd1eda59e260adc1eaae6eb91034900ce789f05ee48fa8afa4a87763026c18c87aef351e7ea76e0cbb46bcd5297f9ca14d527  syslog-ng.initd"
+sha512sums="
+7c4fbf1ac5377240afa7a1db8d72772399d2c62657fffc3c59e82b2dea6f12031f02320c4f567f981311bd1d8bbfd98962aeb59720ca857867a51b6bf83afb4b  syslog-ng-4.6.0.tar.gz
+8faa3a07c1341c8c886703cd87a7a96dfb325687b8fb530a41f1cb5026f47ea4a55ca57d23487ab61b5a50bfc414ac2a55ef1a696332aa2f14c07f1ea7b4c10c  pyversion.patch
+06f79f7350d08c968a2b2b8e0511857a35b784bf6e8e4ba047d0ff24ad0e05f0f0915af049b10deb4ae8c9be788f3824f3818e350e07796ceed93e144838c6a5  syslog-ng.conf
+6b6c628f38bf82a47c38d4cdc1e04cf4cf604cca5b191bea6251a2977162a6da509e92690b7d6e7019d4dbb315fb30eb9531023caf7583d9e9abf24c28e1d06c  syslog-ng.logrotate
+873fef8815131f0acc618fa4911cd1eda59e260adc1eaae6eb91034900ce789f05ee48fa8afa4a87763026c18c87aef351e7ea76e0cbb46bcd5297f9ca14d527  syslog-ng.initd
+"
diff --git a/main/syslog-ng/pyversion.patch b/main/syslog-ng/pyversion.patch
new file mode 100644
index 00000000000..920eb2b2859
--- /dev/null
+++ b/main/syslog-ng/pyversion.patch
@@ -0,0 +1,15 @@
+lie about the version to rename the folder to help apk upgrade a file to
+a directory
+diff --git a/modules/python-modules/setup.py b/modules/python-modules/setup.py
+index 1cf5706..4707ec7 100755
+--- a/modules/python-modules/setup.py
++++ b/modules/python-modules/setup.py
+@@ -24,7 +24,7 @@
+ from setuptools import setup
+ 
+ setup(name='syslogng',
+-      version='1.0',
++      version='1.0.1',
+       description='syslog-ng Python Core & Modules',
+       author='Balazs Scheidler',
+       author_email='bazsi77@gmail.com',
diff --git a/main/syslog-ng/syslog-ng.conf b/main/syslog-ng/syslog-ng.conf
index 570d62ea08c..f4d391ce076 100644
--- a/main/syslog-ng/syslog-ng.conf
+++ b/main/syslog-ng/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version:3.22
+@version: 4.3
 @include "scl.conf"
 
 # syslog-ng configuration file.
@@ -23,7 +23,7 @@ options {
 	# The default action of syslog-ng is to log a STATS line to the file every
 	# 10 minutes. That's pretty ugly after a while. Change it to every 12 hours
 	# so you get a nice daily update of how many messages syslog-ng missed (0).
-	stats_freq(43200);
+	stats(freq(43200));
 
 	# Time to wait before a died connection is re-established (default is 60).
 	time_reopen(5);
diff --git a/main/syslog-ng/syslog-ng.logrotate b/main/syslog-ng/syslog-ng.logrotate
index 4b9ad18f359..6a08bca0bda 100644
--- a/main/syslog-ng/syslog-ng.logrotate
+++ b/main/syslog-ng/syslog-ng.logrotate
@@ -6,6 +6,7 @@
 /var/log/messages
 {
 	notifempty
+	missingok
 	compress
 	sharedscripts
 	postrotate
diff --git a/main/talloc/APKBUILD b/main/talloc/APKBUILD
index 3ccd7449ff5..8a9436964c3 100644
--- a/main/talloc/APKBUILD
+++ b/main/talloc/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor:
-# Maintainer:
+# Maintainer: Krassy Boykinov <kboykinov@teamcentrixx.com>
 pkgname=talloc
-pkgver=2.3.1
-pkgrel=0
+pkgver=2.4.2
+pkgrel=1
 pkgdesc="Memory pool management library"
 url="https://talloc.samba.org"
 arch="all"
@@ -46,10 +46,10 @@ package() {
 _py3() {
 	pkgdesc="Python 3 binding for libtalloc"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libpytalloc-util.cpython* \
-		"$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/
+	amove usr/lib/libpy* usr/lib/python3*
 }
 
-sha512sums="064fc39a9aaace6e0209f3251c8ff198d8a318b4cf4198006ff9892ca6e15e7d817b2fda43e0444fbbf04d2c3e70d06523dff5d57cbb796d27317ef4759e062e  talloc-2.3.1.tar.gz
-66d06f735fe591f3a888ced25c4c5a0068402001736ce52443d0670d42bf7144c7f69ff9c6299ecf4d9001f23c68403953c4bdc7325f4d094d304e4215ff90b1  always-libs.patch"
+sha512sums="
+fb91665ffbe0cce96b1359940ff3ed21330c81c5331140788a26aa94f82b50492176e6000ff54b31d1a434bb1cb53a6a2c7894153545252a1fd91bda7c05a213  talloc-2.4.2.tar.gz
+66d06f735fe591f3a888ced25c4c5a0068402001736ce52443d0670d42bf7144c7f69ff9c6299ecf4d9001f23c68403953c4bdc7325f4d094d304e4215ff90b1  always-libs.patch
+"
diff --git a/main/tar/APKBUILD b/main/tar/APKBUILD
index 92e804aa73b..5f703601116 100644
--- a/main/tar/APKBUILD
+++ b/main/tar/APKBUILD
@@ -1,23 +1,35 @@
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=tar
-pkgver=1.32
-pkgrel=1
+pkgver=1.35
+pkgrel=2
 pkgdesc="Utility used to store, backup, and transport files"
 url="https://www.gnu.org/software/tar/"
 arch="all"
 license="GPL-3.0-or-later"
 makedepends="acl-dev"
 subpackages="$pkgname-doc"
-source="https://ftp.gnu.org/gnu/tar/$pkgname-$pkgver.tar.xz
-	ignore-apk-tools-checksums.patch"
+source="https://ftp.gnu.org/gnu/tar/tar-$pkgver.tar.xz
+	ignore-apk-tools-checksums.patch
+	"
 
 # secfixes:
+#   1.34-r2:
+#     - CVE-2022-48303
+#   1.34-r0:
+#     - CVE-2021-20193
 #   1.29-r1:
 #     - CVE-2016-6321
 #   1.31-r0:
 #     - CVE-2018-20482
+#   0:
+#     - CVE-2021-32803
+#     - CVE-2021-32804
+#     - CVE-2021-37701
 
 build() {
+	if [ -z "$BOOTSTRAP" ]; then
+		export CFLAGS="$CFLAGS -flto=auto"
+	fi
 	gl_cv_func_gettimeofday_clobber=no \
 	gl_cv_func_tzset_clobber=no \
 	./configure \
@@ -31,19 +43,21 @@ build() {
 }
 
 check() {
-	make check
+	make check || {
+		cat tests/testsuite.log
+		return 1
+	}
 }
 
 package() {
 	make DESTDIR="$pkgdir/" install
 
-	rm -rf "$pkgdir"/usr/lib/charset.alias
-	rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
-
 	mkdir "$pkgdir"/bin
 	mv "$pkgdir"/usr/bin/tar "$pkgdir"/bin/
 	ln -s /bin/tar "$pkgdir"/usr/bin/tar
 }
 
-sha512sums="1bd13854009b6ee08958481738e6bf661e40216a2befe461d06b4b350eb882e431b3a4eeea7ca1d35d37102df76194c9d933df2b18b3c5401350e9fc17017750  tar-1.32.tar.xz
-9cde0f1509328bc5fe2cb46642b53c7681c548cf28a2fb83eda7e9374c9c0ad27a0cd55b9c0cc93951def58dafa55ee71cace5493ddcb7966ee94dc5f1099739  ignore-apk-tools-checksums.patch"
+sha512sums="
+8b84ed661e6c878fa33eb5c1808d20351e6f40551ac63f96014fb0d0b9c72d5d94d8865d39e36bcb184fd250f84778a3b271bbd8bd2ceb69eece0c3568577510  tar-1.35.tar.xz
+e60c479c41e8f9bdfbc933857e26b3b7844fb04021a7d4a9cbd7fb44cc2acac98ea109a41dca38bff9b388eac8e17348310e42eb3c70fe5594d83ee0aca27102  ignore-apk-tools-checksums.patch
+"
diff --git a/main/tar/ignore-apk-tools-checksums.patch b/main/tar/ignore-apk-tools-checksums.patch
index c0a6ea35882..cd6a1e1cbc6 100644
--- a/main/tar/ignore-apk-tools-checksums.patch
+++ b/main/tar/ignore-apk-tools-checksums.patch
@@ -2,17 +2,16 @@ Make GNU tar ignore the apk-tools header fields
 
 This should problably not be upstreamed
 
---- ./src/xheader.c.orig
-+++ ./src/xheader.c
-@@ -1779,7 +1779,10 @@
-   /* We are storing all extended attributes using this rule even if some of them
-      were stored by some previous rule (duplicates) -- we just have to make sure
+diff --git a/src/xheader.c b/src/xheader.c
+index 1347ce1..89b3a44 100644
+--- a/src/xheader.c
++++ b/src/xheader.c
+@@ -1777,5 +1777,8 @@ struct xhdr_tab const xhdr_tab[] = {
       they are restored *only once* during extraction later on. */
--  { "SCHILY.xattr", xattr_coder, xattr_decoder, 0, true },
-+  { "SCHILY.xattr", xattr_coder,  xattr_decoder, 0, true },
-+
-+  /* Ignore apk-tools headers */
-+  { "APK-TOOLS.", dummy_coder, dummy_decoder, 0, true },
+   { "SCHILY.xattr", xattr_coder, xattr_decoder, 0, true },
  
++  /* Ignore apk-tools headers */
++  { "APK-TOOLS", dummy_coder, dummy_decoder, 0, true },
++
    { NULL, NULL, NULL, 0, false }
  };
diff --git a/main/tarsnap/APKBUILD b/main/tarsnap/APKBUILD
deleted file mode 100644
index 8f3afcf887b..00000000000
--- a/main/tarsnap/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Eivind Uggedal <eu@eju.no>
-# Maintainer:
-pkgname=tarsnap
-pkgver=1.0.39
-pkgrel=4
-pkgdesc="Online backups for the truly paranoid"
-url="https://www.tarsnap.com/"
-arch="x86_64 x86 ppc64le aarch64"
-license="custom"
-makedepends="e2fsprogs-dev zlib-dev openssl-dev"
-subpackages="$pkgname-doc"
-source="https://www.tarsnap.com/download/$pkgname-autoconf-$pkgver.tgz"
-builddir="$srcdir"/$pkgname-autoconf-$pkgver
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc/$pkgname \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-sha512sums="dec8a72144a3a7fd42b006933c904b812894ca9fe2c57ecc4fbba817b9b49c8f15517530a00b0c3a9897e3182b4d9aee525334537806a9c4f7308086678fa2b4  tarsnap-autoconf-1.0.39.tgz"
diff --git a/main/tcl-tls/APKBUILD b/main/tcl-tls/APKBUILD
index 4f416c1440c..79067daa3df 100644
--- a/main/tcl-tls/APKBUILD
+++ b/main/tcl-tls/APKBUILD
@@ -1,19 +1,24 @@
 # Contributor: Emmanuel Frecon <efrecon@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tcl-tls
-pkgver=1.7.19
-pkgrel=0
+pkgver=1.7.22
+pkgrel=4
 pkgdesc="OpenSSL extension to Tcl"
 url="https://core.tcl.tk/tcltls/"
 arch="all"
 license="TCL"
-makedepends="tcl-dev openssl-dev"
+makedepends="tcl-dev openssl-dev>3"
 source="https://core.tcl.tk/tcltls/uv/tcltls-$pkgver.tar.gz"
 
 builddir="$srcdir/tcltls-$pkgver"
+options="!check"
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,8 +33,7 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d86621da806c133acc712e0985d7796fe09b5000ee9f86863b976bec5ffd468944a11a9406718589f6702fe4f3a9ee0694ac2be479004ac783ca087998e3fe39  tcltls-1.7.19.tar.gz"
+sha512sums="28c76a6e7333b6ed1d83234691d61c9e71a59d0a6a28182fc0f50e97cae7b54da63ac76527e3b16087f3eab0b9cfe19bad02362e485d0cf378724de534805e99  tcltls-1.7.22.tar.gz"
diff --git a/main/tcl/APKBUILD b/main/tcl/APKBUILD
index 9a24077f250..4603def9078 100644
--- a/main/tcl/APKBUILD
+++ b/main/tcl/APKBUILD
@@ -1,27 +1,27 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=tcl
-pkgver=8.6.10
+pkgver=8.6.14
+_major=${pkgver%.*}
 pkgrel=0
 pkgdesc="The Tcl scripting language"
-url="http://tcl.sourceforge.net/"
+url="https://www.tcl-lang.org/"
 arch="all"
 license="TCL"
+depends="tzdata"
 depends_dev="tcl"
 makedepends="zlib-dev sqlite-dev"
 subpackages="$pkgname-doc $pkgname-dev"
 source="https://downloads.sourceforge.net/sourceforge/tcl/tcl$pkgver-src.tar.gz
 	tcl-stat64.patch
 	"
-
-_major=${pkgver%.*}
 builddir="$srcdir"/tcl$pkgver/unix
 
 prepare() {
 	cd "$srcdir"/tcl$pkgver
 	for i in $source; do
 		case $i in
-		*.patch) msg "$i"; patch -p1 -i "$srcdir"/$i ;;
+			*.patch) msg "$i"; patch -p1 -i "$srcdir"/$i ;;
 		esac
 	done
 	rm -r pkgs/sqlite3*
@@ -46,9 +46,9 @@ build() {
 
 package() {
 	export LD_LIBRARY_PATH="$_builddir"
-	make -j1 INSTALL_ROOT="$pkgdir" install install-private-headers
+	make INSTALL_ROOT="$pkgdir" install install-private-headers
 
-	ln -sf tclsh${_major} "$pkgdir"/usr/bin/tclsh
+	ln -sf tclsh$_major "$pkgdir"/usr/bin/tclsh
 	install -Dm644 ../license.terms $pkgdir/usr/share/licenses/$pkgname/LICENSE
 
 	# remove buildroot traces
@@ -71,5 +71,7 @@ dev() {
 	done
 }
 
-sha512sums="c89b886e483320a284033de51b5363758ef4748d6248ae73eb8e90fbe76c180395f485135ca9bf1246dd567159a77ffc1e8cb537bc2fc4a09b01448928d0afd7  tcl8.6.10-src.tar.gz
-cd52cbe80fd2be227c9018dbe38fa0888302293402e7a57f2e231c195b7c1902f1b58bc87d19c9d123915ca757e871abf084c0ef23b1a7f187bc03ba93904cc2  tcl-stat64.patch"
+sha512sums="
+706603faa94153fcea2e2b2c594fb9d9862ce1aa3a65b864f14ce0757ea97c4106f065d1696e35f8cacc577db3d82ef1e93385c71a2399416816c4e1582237b0  tcl8.6.14-src.tar.gz
+cd52cbe80fd2be227c9018dbe38fa0888302293402e7a57f2e231c195b7c1902f1b58bc87d19c9d123915ca757e871abf084c0ef23b1a7f187bc03ba93904cc2  tcl-stat64.patch
+"
diff --git a/main/tcpdump/APKBUILD b/main/tcpdump/APKBUILD
index 42b4b98bd8f..aef73df7c85 100644
--- a/main/tcpdump/APKBUILD
+++ b/main/tcpdump/APKBUILD
@@ -1,45 +1,48 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tcpdump
-pkgver=4.9.3
+pkgver=4.99.4
 pkgrel=1
 pkgdesc="A tool for network monitoring and data acquisition"
 url="https://www.tcpdump.org/"
 arch="all"
 license="BSD-3-Clause"
-options="!check" # fail on ppc64le
-makedepends="libpcap-dev openssl-dev perl"
+makedepends="cmake samurai libpcap-dev openssl-dev>3"
+checkdepends="perl"
 subpackages="$pkgname-doc"
-source="https://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz"
+source="https://www.tcpdump.org/release/tcpdump-$pkgver.tar.gz
+	"
 
 # secfixes:
+#   4.9.3-r1:
+#     - CVE-2020-8037
 #   4.9.3-r0:
-#     - CVE-2017-16808 (AoE)
-#     - CVE-2018-14468 (FrameRelay)
-#     - CVE-2018-14469 (IKEv1)
-#     - CVE-2018-14470 (BABEL)
-#     - CVE-2018-14466 (AFS/RX)
-#     - CVE-2018-14461 (LDP)
-#     - CVE-2018-14462 (ICMP)
-#     - CVE-2018-14465 (RSVP)
-#     - CVE-2018-14881 (BGP)
-#     - CVE-2018-14464 (LMP)
-#     - CVE-2018-14463 (VRRP)
-#     - CVE-2018-14467 (BGP)
-#     - CVE-2018-10103 (SMB - partially fixed, but SMB printing disabled)
-#     - CVE-2018-10105 (SMB - too unreliably reproduced, SMB printing disabled)
-#     - CVE-2018-14880 (OSPF6)
-#     - CVE-2018-16451 (SMB)
-#     - CVE-2018-14882 (RPL)
-#     - CVE-2018-16227 (802.11)
-#     - CVE-2018-16229 (DCCP)
-#     - CVE-2018-16301 (was fixed in libpcap)
-#     - CVE-2018-16230 (BGP)
-#     - CVE-2018-16452 (SMB)
-#     - CVE-2018-16300 (BGP)
-#     - CVE-2018-16228 (HNCP)
-#     - CVE-2019-15166 (LMP)
-#     - CVE-2019-15167 (VRRP)
-#     - CVE-2018-14879 (tcpdump -V)
+#     - CVE-2017-16808 # (AoE)
+#     - CVE-2018-14468 # (FrameRelay)
+#     - CVE-2018-14469 # (IKEv1)
+#     - CVE-2018-14470 # (BABEL)
+#     - CVE-2018-14466 # (AFS/RX)
+#     - CVE-2018-14461 # (LDP)
+#     - CVE-2018-14462 # (ICMP)
+#     - CVE-2018-14465 # (RSVP)
+#     - CVE-2018-14881 # (BGP)
+#     - CVE-2018-14464 # (LMP)
+#     - CVE-2018-14463 # (VRRP)
+#     - CVE-2018-14467 # (BGP)
+#     - CVE-2018-10103 # (SMB - partially fixed, but SMB printing disabled)
+#     - CVE-2018-10105 # (SMB - too unreliably reproduced, SMB printing disabled)
+#     - CVE-2018-14880 # (OSPF6)
+#     - CVE-2018-16451 # (SMB)
+#     - CVE-2018-14882 # (RPL)
+#     - CVE-2018-16227 # (802.11)
+#     - CVE-2018-16229 # (DCCP)
+#     - CVE-2018-16301 # (was fixed in libpcap)
+#     - CVE-2018-16230 # (BGP)
+#     - CVE-2018-16452 # (SMB)
+#     - CVE-2018-16300 # (BGP)
+#     - CVE-2018-16228 # (HNCP)
+#     - CVE-2019-15166 # (LMP)
+#     - CVE-2019-15167 # (VRRP)
+#     - CVE-2018-14879 # (tcpdump -V)
 #   4.9.0-r0:
 #     - CVE-2016-7922
 #     - CVE-2016-7923
@@ -85,30 +88,22 @@ source="https://www.tcpdump.org/release/$pkgname-$pkgver.tar.gz"
 #   4.9.1-r0:
 #     - CVE-2017-11108
 
-
-builddir="$srcdir"/$pkgname-$pkgver
-
 build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
+	CFLAGS="$CFLAGS -flto=auto" \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	cmake --build build
 }
 
 check() {
-	cd "$builddir"
-	make check
+	cmake --build build --target check
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	rm -f "$pkgdir"/usr/sbin/tcpdump.4*
+	DESTDIR="$pkgdir" cmake --install build
 }
 
-sha512sums="3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22  tcpdump-4.9.3.tar.gz"
+sha512sums="
+cb51e19574707d07c0de90dd4c301955897f2c9f2a69beb7162c08f59189f55625346d1602c8d66ab2b4c626ea4b0df1f08ed8734d2d7f536d0a7840c2d6d8df  tcpdump-4.99.4.tar.gz
+"
diff --git a/main/tcpflow/APKBUILD b/main/tcpflow/APKBUILD
index d1e81a7317b..8512e17cf02 100644
--- a/main/tcpflow/APKBUILD
+++ b/main/tcpflow/APKBUILD
@@ -1,35 +1,32 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tcpflow
-pkgver=1.5.0
-pkgrel=2
+pkgver=1.6.1
+pkgrel=13
 pkgdesc="A Tool for monitoring, capturing and storing TCP connections flows"
 url="https://github.com/simsong/tcpflow"
 arch="all"
-license="GPL-3.0"
-depends=""
-makedepends="libpcap-dev zlib-dev boost-dev openssl-dev autoconf automake"
-install=""
+license="GPL-3.0-only"
+makedepends="libpcap-dev zlib-dev boost-dev openssl-dev>3 autoconf automake"
 subpackages="$pkgname-doc"
-source="https://fossies.org/linux/misc/$pkgname-$pkgver.tar.gz
-	CVE-2018-18409.patch
+source="https://fossies.org/linux/misc/tcpflow-$pkgver.tar.gz
+	format-security.patch
+	fix-type.patch
 	"
 
 # secfixes:
-#   1.5.2-r1:
-#   - CVE-2018-18409
-
-builddir="$srcdir"/tcpflow-$pkgver
+#   1.5.0-r1:
+#     - CVE-2018-18409
+#   1.5.0-r0:
+#     - CVE-2018-14938
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	sed -i 's/test-pdfs.sh//' tests/Makefile.am
 	autoreconf -fsiv
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -40,14 +37,15 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="eaf518e5e4d95ea9587542cec16a65a8e1518b54e6c23d84355ce11780c99758346db364ba502f90d938e54b01a1e32807d69ed35afb1e5e378a9a009c5609f5  tcpflow-1.5.0.tar.gz
-104ffc29954da657d52881491ed8f3102123f8ed36fbd8f435ffa24d05fe2ef7c34d84b16477c1408bac935497499d8550fec81ffaa84b9b783d09f4b6bab428  CVE-2018-18409.patch"
+sha512sums="
+8a54554f2e47f6b136396b245eaeeafbfe3833e250a1eaf1905fadc14ccf821ca0f7ed18bf976fefa1de3efeae4895413af2c675bb6690d87b1368639cb15148  tcpflow-1.6.1.tar.gz
+af26701e5cd89e13d35c13ce2ecafd3f8f819dcd239b433c77637e82402c6107973f15860af0dbac1888ae9e8d186e50674899d5f5e2bcbd8ffc89873069a00c  format-security.patch
+acd5a8df5cef383e881a6e0097a74ff77945bddb098a11c177bb5dd361a95c73ce666f5548667a2ff2fb3b926a9fdd93306d7a1f90406b8a221cd4ac13a47eeb  fix-type.patch
+"
diff --git a/main/tcpflow/CVE-2018-18409.patch b/main/tcpflow/CVE-2018-18409.patch
deleted file mode 100644
index fb324de7040..00000000000
--- a/main/tcpflow/CVE-2018-18409.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From 89c04b4fb0e46b3c4f1388686e83966e531cbea9 Mon Sep 17 00:00:00 2001
-From: "Simson L. Garfinkel" <simsong@acm.org>
-Date: Sat, 20 Oct 2018 07:31:32 -0400
-Subject: [PATCH] fixed theoretical stack overflow identified in #195)
-
----
- src/iptree.h | 21 ++++++++++++++-------
- 1 file changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/src/iptree.h b/src/iptree.h
-index 6332e8e..6abf25b 100644
---- a/src/iptree.h
-+++ b/src/iptree.h
-@@ -241,8 +241,10 @@ private:;
-         return (addr[i / 8]) & (1<<((7-i)&7));
-     }
-     /* set the ith bit to 1 */
--    static void setbit(uint8_t *addr,size_t i){
--        addr[i / 8] |= (1<<((7-i)&7));
-+    static void setbit(uint8_t *addr,size_t addr, size_t i){
-+        if ( i/8 < addr) {
-+            addr[i / 8] |= (1<<((7-i)&7));
-+        }
-     }
-     
-     virtual ~iptreet(){}                // required per compiler warnings
-@@ -388,7 +390,8 @@ private:;
-         uint8_t addr1[ADDRBYTES];
-         
-         memset(addr0,0,sizeof(addr0)); memcpy(addr0,addr,(depth+7)/8);
--        memset(addr1,0,sizeof(addr1)); memcpy(addr1,addr,(depth+7)/8); setbit(addr1,depth);
-+        memset(addr1,0,sizeof(addr1)); memcpy(addr1,addr,(depth+7)/8);
-+        setbit(addr1,sizeof(addr1),depth);
-         
-         if(ptr->ptr0) get_histogram(depth+1,addr0,ptr->ptr0,histogram);
-         if(ptr->ptr1) get_histogram(depth+1,addr1,ptr->ptr1,histogram);
-@@ -527,8 +530,10 @@ class ip2tree:public iptreet<uint64_t,32> {
-     /* de-interleave a pair of addresses */
-     static void un_pair(uint8_t *addr1,uint8_t *addr2,size_t addr12len,size_t *depth1,size_t *depth2,const uint8_t *addr,size_t addrlen,size_t depth){
-         for(size_t i=0;i<addrlen*8/2;i++){
--            if(iptreet<uint64_t,32>::bit(addr,i*2))   iptreet<uint64_t,32>::setbit(addr1,i);
--            if(iptreet<uint64_t,32>::bit(addr,i*2+1)) iptreet<uint64_t,32>::setbit(addr2,i);
-+            if(iptreet<uint64_t,32>::bit(addr,i*2))
-+                iptreet<uint64_t,32>::setbit(addr1,sizeof(addr1),i);
-+            if(iptreet<uint64_t,32>::bit(addr,i*2+1))
-+                iptreet<uint64_t,32>::setbit(addr2,sizeof(addr2),i);
-         }
-         *depth1 = (depth+1)/2;
-         *depth2 = (depth)/2;
-@@ -563,8 +568,10 @@ class ip2tree:public iptreet<uint64_t,32> {
-         memset(addr,0,sizeof(addr));
-         /* Interleave on the bit by bit level */
-         for(size_t i=0;i<addrlen*8;i++){
--            if(iptreet<uint64_t,32>::bit(addr1,i)) iptreet<uint64_t,32>::setbit(addr,i*2);
--            if(iptreet<uint64_t,32>::bit(addr2,i)) iptreet<uint64_t,32>::setbit(addr,i*2+1);
-+            if(iptreet<uint64_t,32>::bit(addr1,i))
-+                iptreet<uint64_t,32>::setbit(addr,sizeof(addr),i*2);
-+            if(iptreet<uint64_t,32>::bit(addr2,i))
-+                iptreet<uint64_t,32>::setbit(addr,sizeof(addr),i*2+1);
-         }
-         add(addr,addrlen*2,val); /* Add it */
-     }
-From f4097c7c99ebb7b54d93a426016840072946c410 Mon Sep 17 00:00:00 2001
-From: "Simson L. Garfinkel" <simsong@acm.org>
-Date: Wed, 21 Nov 2018 17:57:12 -0600
-Subject: [PATCH] fixed sizeof(addr1) and sizeof(addr2) error in un_pair
-
----
- src/iptree.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/iptree.h b/src/iptree.h
-index 2c717db..0ddfa14 100644
---- a/src/iptree.h
-+++ b/src/iptree.h
-@@ -530,9 +530,9 @@ class ip2tree:public iptreet<uint64_t,32> {
-     static void un_pair(uint8_t *addr1,uint8_t *addr2,size_t addr12len,size_t *depth1,size_t *depth2,const uint8_t *addr,size_t addrlen,size_t depth){
-         for(size_t i=0;i<addrlen*8/2;i++){
-             if(iptreet<uint64_t,32>::bit(addr,i*2))
--                iptreet<uint64_t,32>::setbit(addr1,sizeof(addr1),i);
-+                iptreet<uint64_t,32>::setbit(addr1, addr12len, i);
-             if(iptreet<uint64_t,32>::bit(addr,i*2+1))
--                iptreet<uint64_t,32>::setbit(addr2,sizeof(addr2),i);
-+                iptreet<uint64_t,32>::setbit(addr2, addr12len, i);
-         }
-         *depth1 = (depth+1)/2;
-         *depth2 = (depth)/2;
-From 0e96c3578a79c41eab1e597ccd38e1c612b47810 Mon Sep 17 00:00:00 2001
-From: "Simson L. Garfinkel" <simsong@acm.org>
-Date: Sun, 18 Nov 2018 16:29:57 -0500
-Subject: [PATCH] updated to 1.5.1; added -Wno-address-of-packed-member; fixed
- compile errors accidentally introduced.
-
----
- ChangeLog       |  4 ++++
- configure.ac    |  7 ++++++-
- src/iptree.h    |  4 ++--
- src/tcpflow.cpp | 10 ++++++++++
- 4 files changed, 22 insertions(+), 3 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index b0682c1..860ec23 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,7 @@
-+2018-11-18 Simson Garfinkel <simsong@acm.org>
-+	* updated for pcap_findalldevs
-+	* added -Wno-address-of-packed-member to avoid error
-+	
- 2017-07-12 Simson Garfinkel <simsong@acm.org>
- 	* updated to work with Fedora 26 compilers
- 	* Found bug in sbuf.cpp
-diff --git a/configure.ac b/configure.ac
-index fc48b63..866417e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,7 +7,7 @@
- # and http://www.openismus.com/documents/linux/automake/automake.shtml 
- 
- AC_PREREQ(2.57)
--AC_INIT(TCPFLOW, 1.5.0, simsong@acm.org)
-+AC_INIT(TCPFLOW, 1.5.1, simsong@acm.org)
- AC_CONFIG_MACRO_DIR([m4])
- 
- AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile doc/Makefile])
-@@ -70,6 +70,10 @@ case $host in
-      LDFLAGS="$LDFLAGS --static"
-      mingw="yes"
-      ;;		 		     
-+
-+   *)
-+     CXXFLAGS="$CXXFLAGS -Wno-address-of-packed-member"
-+     ;;
- esac
- 
- if test x"${mingw}" == "xno" ; then
-@@ -348,6 +352,7 @@ located.])
-         Mmissing_library="$Mmissing_library libpcap "
-     ])
- fi
-+AC_CHECK_FUNCS([pcap_findalldevs])
- 
- dnl set with_wifi to 0 if you do not want it
- AC_ARG_ENABLE([wifi],
-diff --git a/src/iptree.h b/src/iptree.h
-index 6abf25b..5732dbc 100644
---- a/src/iptree.h
-+++ b/src/iptree.h
-@@ -241,8 +241,8 @@ private:;
-         return (addr[i / 8]) & (1<<((7-i)&7));
-     }
-     /* set the ith bit to 1 */
--    static void setbit(uint8_t *addr,size_t addr, size_t i){
--        if ( i/8 < addr) {
-+    static void setbit(uint8_t *addr,size_t addrlen, size_t i){
-+        if ( i/8 < addrlen) {
-             addr[i / 8] |= (1<<((7-i)&7));
-         }
-     }
-diff --git a/src/tcpflow.cpp b/src/tcpflow.cpp
-index d85dff6..004107f 100644
---- a/src/tcpflow.cpp
-+++ b/src/tcpflow.cpp
-@@ -461,9 +461,19 @@ static int process_infile(tcpdemux &demux,const std::string &expression,const ch
-     } else {
- 	/* if the user didn't specify a device, try to find a reasonable one */
- 	if (device == NULL){
-+#ifdef HAVE_PCAP_FINDALLDEVS
-+            char errbuf[PCAP_ERRBUF_SIZE];
-+            pcap_if_t *alldevs = 0;
-+            if (pcap_findalldevs(&alldevs,errbuf)){
-+		die("%s", errbuf);
-+	    }
-+            device=strdup(alldevs[0].name);
-+            pcap_freealldevs(alldevs);
-+#else
- 	    if ((device = pcap_lookupdev(error)) == NULL){
- 		die("%s", error);
- 	    }
-+#endif
- 	}
- 
- 	/* make sure we can open the device */
diff --git a/main/tcpflow/fix-type.patch b/main/tcpflow/fix-type.patch
new file mode 100644
index 00000000000..b54a5974d1e
--- /dev/null
+++ b/main/tcpflow/fix-type.patch
@@ -0,0 +1,10 @@
+--- a/src/wifipcap/TimeVal.h
++++ b/src/wifipcap/TimeVal.h
+@@ -39,6 +39,7 @@
+ 
+ #include <iostream>
+ #include <iomanip>
++#include <cstdint>
+ 
+ #ifndef _WIN32
+ #include <sys/time.h>
diff --git a/main/tcpflow/format-security.patch b/main/tcpflow/format-security.patch
new file mode 100644
index 00000000000..7a86a20e2a5
--- /dev/null
+++ b/main/tcpflow/format-security.patch
@@ -0,0 +1,13 @@
+diff --git a/src/datalink.cpp b/src/datalink.cpp
+index 3e98285..f8b1322 100644
+--- a/src/datalink.cpp
++++ b/src/datalink.cpp
+@@ -174,7 +174,7 @@ void dl_ethernet(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
+         std::string s(std::string("warning: caught std::logic_error ")
+                       + e.what()
+                       + std::string(" in packet"));
+-        DEBUG(6)(s.c_str());
++        DEBUG(6)("%s", s.c_str());
+     }
+ }
+ 
diff --git a/main/tdb/APKBUILD b/main/tdb/APKBUILD
index 93956772a17..28127ef32e2 100644
--- a/main/tdb/APKBUILD
+++ b/main/tdb/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tdb
-pkgver=1.4.3
-pkgrel=0
+pkgver=1.4.9
+pkgrel=1
 pkgdesc="The tdb library"
 url="https://tdb.samba.org/"
 arch="all"
@@ -47,4 +47,6 @@ libs() {
 	replaces="tdb"
 }
 
-sha512sums="99488839e7da396f04df60412d21a7d3e09efeab52772d6cb5e9470a3dfd585d73ef2422c51cd0d8ccc123a65d455de400d5d6b24a21a2a50d3da60d9a70e67a  tdb-1.4.3.tar.gz"
+sha512sums="
+6b0109075826b8630f6b5a7e7ade2fcff95c5d05338340af78219422610947c520707b3e484ff13fbd40bbfffe13977976e8ddcb1be7b13e13ac78b4e3ec06c2  tdb-1.4.9.tar.gz
+"
diff --git a/main/terminus-font/APKBUILD b/main/terminus-font/APKBUILD
deleted file mode 100644
index 5ef3a264aa5..00000000000
--- a/main/terminus-font/APKBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Orion <systmkor@gmail.com>
-# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
-pkgname=terminus-font
-pkgver=4.48
-pkgrel=0
-pkgdesc="Monospace bitmap font (for X11 and console)"
-url="http://terminus-font.sourceforge.net/"
-arch="noarch"
-license="custom"
-depends=""
-depends_dev=""
-makedepends="bdftopcf fontconfig mkfontscale mkfontdir python3"
-options="!check"
-install=""
-subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz"
-
-builddir="$srcdir"/$pkgname-$pkgver
-build() {
-	cd "$builddir"
-	make \
-		prefix=/usr \
-		x11dir=/usr/share/fonts/misc \
-		psfdir=/usr/share/consolefonts
-}
-
-package() {
-	cd "$builddir"
-	make \
-		prefix=/usr \
-		x11dir=/usr/share/fonts/misc \
-		psfdir=/usr/share/consolefonts \
-		DESTDIR="$pkgdir" install \
-		|| return 1
-
-	install -d "$pkgdir"/usr/share/doc/$pkgname
-	install -Dm655 README README-BG \
-		"$pkgdir"/usr/share/doc/$pkgname/ || return 1
-
-	install -Dm644 75-yes-terminus.conf \
-		"$pkgdir"/etc/fonts/conf.avail/75-yes-terminus.conf
-	install -Dm644 OFL.TXT \
-		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-
-	install -d "$pkgdir/etc/fonts/conf.d"
-	cd "$pkgdir/etc/fonts/conf.d"
-	ln -s ../conf.avail/75-yes-terminus.conf . || return 1
-}
-
-sha512sums="5f45f7d0e7396f02158f4751aaafb3f0a3fb68dbe3e5501f86a5138c6d52f5106053e38c368d560e5979e29250074dbde5165702b8905a564d029663a2219af4  terminus-font-4.48.tar.gz"
diff --git a/main/termrec/APKBUILD b/main/termrec/APKBUILD
index b877df9e718..ed59a4b1172 100644
--- a/main/termrec/APKBUILD
+++ b/main/termrec/APKBUILD
@@ -1,34 +1,36 @@
 # Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
 # Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
 pkgname=termrec
-pkgver=0.18
-pkgrel=0
+pkgver=0.19
+pkgrel=3
 pkgdesc="termrec is a program for recording videos of terminal output"
 url="http://angband.pl/termrec.html"
 arch="all"
 license="LGPL-3.0-only"
-makedepends="zlib-dev bzip2-dev"
-checkdepends="xz-dev autoconf"
+makedepends="automake autoconf bzip2-dev libtool zlib-dev"
+checkdepends="xz-dev"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz
+source="termrec-$pkgver.tar.gz::https://github.com/kilobyte/termrec/archive/v$pkgver.tar.gz
 	disable-fuzz-test.patch"
 options="libtool"
 
+prepare() {
+	default_prepare
+	./autogen.sh
+}
+
 build() {
-	cd "$builddir"
 	./configure --prefix=/usr --disable-static
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir/" install
 }
 
-sha512sums="148ef0c267a8010af27b0b9185e3b22985a770386bc96d919c0d5276834f0cc45bd9619a3d6dc7dc974c465d0551c1e434d3fd697b9f0afb45b31dc862507427  termrec-0.18.tar.xz
+sha512sums="e2a99306bd519b1eb8bfd83c0aed8a5d1a97a33d2f8e1c3465a5c3ad4bbbc0fcbc443b038e84cd00fe2184bf5d1bdd5497e61e9f2f517a439ae070daef9e67d7  termrec-0.19.tar.gz
 d8759cef963c9ab4ed3de4414d16216fc40046b5b33dfcc032ea754482f610259e093e409c5c14fdda503fe397e8758bfb99be46ff80958d63769938946ee182  disable-fuzz-test.patch"
diff --git a/main/testdisk/APKBUILD b/main/testdisk/APKBUILD
index 04e18aa5be5..318d584b170 100644
--- a/main/testdisk/APKBUILD
+++ b/main/testdisk/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=testdisk
-pkgver=7.1
+pkgver=7.2
 pkgrel=0
 pkgdesc="A data recovery suite"
 url="https://www.cgsecurity.org/wiki/TestDisk"
@@ -11,7 +11,6 @@ subpackages="$pkgname-doc"
 source="https://www.cgsecurity.org/testdisk-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,13 +22,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5  testdisk-7.1.tar.bz2"
+sha512sums="
+f99dd1c8f547c3d06e5459ba072438192a49d76c569de7915994beb269645092522d8136a212999382f88ca1d29c50f6482306d47197dc0994d168bcd4141f26  testdisk-7.2.tar.bz2
+"
diff --git a/main/tevent/APKBUILD b/main/tevent/APKBUILD
index ceb7e2cbc79..8e131f182e3 100644
--- a/main/tevent/APKBUILD
+++ b/main/tevent/APKBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tevent
-pkgver=0.10.2
+pkgver=0.16.1
 pkgrel=0
 pkgdesc="The tevent library"
 url="https://tevent.samba.org/"
 arch="all"
 license="LGPL-3.0-or-later"
-makedepends="libtirpc-dev python3-dev talloc-dev"
+makedepends="libtirpc-dev python3-dev talloc-dev cmocka-dev"
 replaces="samba"
 subpackages="$pkgname-dev py3-$pkgname:_py3"
 source="https://samba.org/ftp/tevent/tevent-$pkgver.tar.gz
-	fix-public-header.patch"
+	"
 
 build() {
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -38,9 +39,9 @@ package() {
 _py3() {
 	pkgdesc="Python 3 binding for the tevent library"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/
+	amove usr/lib/python3*
 }
 
-sha512sums="1da8f28898f35daab515892b880d1de601062cc3e2b2570cd62e6913df17b0195a05acb7b484c628cddc0eb8b0cde893105ede3feb32bc5764e7d25684f332ba  tevent-0.10.2.tar.gz
-ee4cce8591dfe31288975596d8464b7cc160580715f88e4fd19b5ae7e1a831650b072954731f015f52d76600597faee894f0174b9e92d18dca9629f9d056230c  fix-public-header.patch"
+sha512sums="
+cda001d91728b2f28dd081e9c5f6d8ede345dcd9ce1dca04394860cd83090c15aa8dfef1c53b73e120bd17f0d95551fa9301eb4927963314556d016fe5420a39  tevent-0.16.1.tar.gz
+"
diff --git a/main/tevent/fix-public-header.patch b/main/tevent/fix-public-header.patch
deleted file mode 100644
index 2b60347aba8..00000000000
--- a/main/tevent/fix-public-header.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-tevent.h needs sys/types.h for pid_t
-
-diff -ru tevent-0.9.37.orig/tevent.h tevent-0.9.37/tevent.h
---- tevent-0.9.37.orig/tevent.h	2018-07-12 05:51:30.000000000 +0000
-+++ tevent-0.9.37/tevent.h	2018-07-19 10:13:15.360128807 +0000
-@@ -31,6 +31,7 @@
- #include <stdint.h>
- #include <talloc.h>
- #include <sys/time.h>
-+#include <sys/types.h>
- #include <stdbool.h>
- 
- struct tevent_context;
diff --git a/main/texinfo/APKBUILD b/main/texinfo/APKBUILD
index ee7fed953cd..761e2f09a81 100644
--- a/main/texinfo/APKBUILD
+++ b/main/texinfo/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=texinfo
-pkgver=6.7
-pkgrel=0
+pkgver=7.1
+pkgrel=1
 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file"
 url="https://www.gnu.org/software/texinfo/"
 arch="all"
@@ -12,6 +12,8 @@ makedepends="ncurses-dev perl-dev"
 subpackages="$pkgname-doc"
 source="https://ftp.gnu.org/gnu/texinfo/texinfo-$pkgver.tar.xz
 	fix-build-without-NLS.patch"
+install="texinfo.pre-deinstall"
+triggers="texinfo.trigger=/usr/share/info"
 
 build() {
 	./configure \
@@ -24,10 +26,9 @@ build() {
 
 package() {
 	make DESTDIR="$pkgdir"/ install
-
-	rm -f "$pkgdir"/usr/share/info/dir
-	gzip "$pkgdir"/usr/share/info/*
 }
 
-sha512sums="da55a0d0a760914386393c5e8e864540265d8550dc576f784781a6d72501918e8afce716ff343e5c2a0ce09cf921bfaf0a48ecb49f6182a7d10e920ae3ea17e7  texinfo-6.7.tar.xz
-1c33d8c8bf24ec139fa2a283e12d42a260027d354061d348b66f1d2ef4636573cb88442299595af946366c9e9cc5511450a32d1a1fb827bee30f38a7558b3edb  fix-build-without-NLS.patch"
+sha512sums="
+ceab03e8422d800b08c7b44e8263b0a1f35bb7758d83a81136df6f3304a14daecda98a12a282afb85406d2ca2f665b2295e10b6f4064156ea1285d80d5d355db  texinfo-7.1.tar.xz
+4e81263afa0d3c58316e8104f9c155f0c11946fae7a9fa98ff3d86637e56be377fe584ca82df0786f4c74a180813cbcf87f25e0ee7bbbea9073eac20660f08d9  fix-build-without-NLS.patch
+"
diff --git a/main/texinfo/fix-build-without-NLS.patch b/main/texinfo/fix-build-without-NLS.patch
index 105650c8564..cc14808a256 100644
--- a/main/texinfo/fix-build-without-NLS.patch
+++ b/main/texinfo/fix-build-without-NLS.patch
@@ -10,15 +10,3 @@
  
  #include <stdlib.h>
  #include <stdio.h>
---- a/tp/Texinfo/XS/parsetexi/errors.c
-+++ b/tp/Texinfo/XS/parsetexi/errors.c
-@@ -14,7 +14,9 @@
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
- 
- #include <config.h>
-+#if defined(HAVE_LIBINTL_H)
- #include <libintl.h>
-+#endif
- 
- #include <stdlib.h>
- #include <stdarg.h>
diff --git a/main/texinfo/texinfo.pre-deinstall b/main/texinfo/texinfo.pre-deinstall
new file mode 100644
index 00000000000..766dc679b7d
--- /dev/null
+++ b/main/texinfo/texinfo.pre-deinstall
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rm -f usr/share/info/dir
diff --git a/main/texinfo/texinfo.trigger b/main/texinfo/texinfo.trigger
new file mode 100755
index 00000000000..75b69c63b6f
--- /dev/null
+++ b/main/texinfo/texinfo.trigger
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+infodir='/usr/share/info'
+
+rm -f "$infodir"/dir
+find "$infodir" \( -name "*.info" -o -name "*.info.gz" \) \
+	-exec install-info {} "$infodir"/dir \;
diff --git a/main/tftp-hpa/APKBUILD b/main/tftp-hpa/APKBUILD
index 220a66c9ba5..d02190710e5 100644
--- a/main/tftp-hpa/APKBUILD
+++ b/main/tftp-hpa/APKBUILD
@@ -1,39 +1,40 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tftp-hpa
 pkgver=5.2
-pkgrel=2
+pkgrel=7
 pkgdesc="Official tftp server"
 url="https://www.kernel.org/pub/software/network/tftp/"
 arch="all"
-license="BSD"
-depends=""
-makedepends=""
-subpackages="$pkgname-doc"
-source="https://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgver.tar.xz
+license="BSD-4-Clause"
+subpackages="$pkgname-openrc $pkgname-doc"
+source="https://www.kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-$pkgver.tar.xz
 	in.tftpd.initd
 	in.tftpd.confd
+	fix-common.patch
+	fix-prompt-flush.patch
 	"
+options="!check"
 
-_builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--mandir=/usr/share/man \
-		|| return 1
-	make || return 1
+		--mandir=/usr/share/man
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make INSTALLROOT="$pkgdir" install || return 1
+	make INSTALLROOT="$pkgdir" install
 	install -d "$pkgdir"/var/tftpboot
-	install -Dm755 ../in.tftpd.initd "$pkgdir"/etc/init.d/in.tftpd
-	install -Dm755 ../in.tftpd.confd "$pkgdir"/etc/conf.d/in.tftpd
+	install -Dm755 "$srcdir"/in.tftpd.initd "$pkgdir"/etc/init.d/in.tftpd
+	install -Dm644 "$srcdir"/in.tftpd.confd "$pkgdir"/etc/conf.d/in.tftpd
 }
 
-sha512sums="a5198e923a6e58281f749dc77b3f3ed8579e56b6f0fd6a17482cc88bdc8d34b6702c7c709717885b9b937ecae459d9a832328a49a2e3536dc7432cdb39d2a394  tftp-hpa-5.2.tar.xz
+sha512sums="
+a5198e923a6e58281f749dc77b3f3ed8579e56b6f0fd6a17482cc88bdc8d34b6702c7c709717885b9b937ecae459d9a832328a49a2e3536dc7432cdb39d2a394  tftp-hpa-5.2.tar.xz
 a836823eda80e43b8914b7b045b91703faded83d2b1482a0d17f0fb903cbc0ce17dd9e0c06a2f6e35724099614ef5a74d9ba8be80237fbbb29c632cea983779a  in.tftpd.initd
-8a5de40dde8a5e569fce4309e01341a77a4e36cdcb5fe602948d5b34ee2646bd83840158d7d61a45c17e71cc893f3e9bd04a38ebcc7a6a8fff98f46a50d74e96  in.tftpd.confd"
+8a5de40dde8a5e569fce4309e01341a77a4e36cdcb5fe602948d5b34ee2646bd83840158d7d61a45c17e71cc893f3e9bd04a38ebcc7a6a8fff98f46a50d74e96  in.tftpd.confd
+40127e7ce276a2bc015255dbeef2665bfe8ff006b1e1d8fb79797e946d6030fd74606cffe0bea11eaad276a693f223faaaf1c1ccb5f276b40fdad40b366172b7  fix-common.patch
+6661c356710cfa44cf5170238242087be7d766e9363c7fb6655df6fd457562757be6069c39013a5311e3fbfc7e228e0924f15de747db782fbe35e10be7976bc9  fix-prompt-flush.patch
+"
diff --git a/main/tftp-hpa/fix-common.patch b/main/tftp-hpa/fix-common.patch
new file mode 100644
index 00000000000..1f082e81a8f
--- /dev/null
+++ b/main/tftp-hpa/fix-common.patch
@@ -0,0 +1,24 @@
+diff -urN tftp-hpa-5.2.orig/tftp/main.c tftp-hpa-5.2/tftp/main.c
+--- tftp-hpa-5.2.orig/tftp/main.c	2020-11-14 22:21:15.851650899 -0700
++++ tftp-hpa-5.2/tftp/main.c	2020-11-14 22:21:41.878327755 -0700
+@@ -95,7 +95,7 @@
+ int margc;
+ char *margv[20];
+ const char *prompt = "tftp> ";
+-sigjmp_buf toplevel;
++static sigjmp_buf toplevel;
+ void intr(int);
+ struct servent *sp;
+ int portrange = 0;
+diff -urN tftp-hpa-5.2.orig/tftp/tftp.c tftp-hpa-5.2/tftp/tftp.c
+--- tftp-hpa-5.2.orig/tftp/tftp.c	2020-11-14 22:21:15.851650899 -0700
++++ tftp-hpa-5.2/tftp/tftp.c	2020-11-14 22:21:51.304998113 -0700
+@@ -48,7 +48,7 @@
+ #define PKTSIZE    SEGSIZE+4
+ char ackbuf[PKTSIZE];
+ int timeout;
+-sigjmp_buf toplevel;
++static sigjmp_buf toplevel;
+ sigjmp_buf timeoutbuf;
+ 
+ static void nak(int, const char *);
diff --git a/main/tftp-hpa/fix-prompt-flush.patch b/main/tftp-hpa/fix-prompt-flush.patch
new file mode 100644
index 00000000000..a64b4a5b8bd
--- /dev/null
+++ b/main/tftp-hpa/fix-prompt-flush.patch
@@ -0,0 +1,13 @@
+doesn't flush by default, so the prompt is never printed
+diff --git a/tftp/main.c b/tftp/main.c
+index 4b09840..80e222e 100644
+--- a/tftp/main.c
++++ b/tftp/main.c
+@@ -806,6 +806,7 @@ static void command(void)
+             exit(0);            /* EOF */
+ #else
+         fputs(prompt, stdout);
++        fflush(stdout);
+         if (fgets(line, LBUFLEN, stdin) == 0) {
+             if (feof(stdin)) {
+                 exit(0);
diff --git a/main/thin-provisioning-tools/APKBUILD b/main/thin-provisioning-tools/APKBUILD
deleted file mode 100644
index 67a726955ba..00000000000
--- a/main/thin-provisioning-tools/APKBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: 
-pkgname=thin-provisioning-tools
-pkgver=0.7.1
-pkgrel=3
-pkgdesc="A suite of tools for manipulating the metadata of the dm-thin device-mapper target"
-url="https://github.com/jthornber/thin-provisioning-tools"
-arch="all"
-license="GPL-3.0"
-depends="expat boost libaio"
-makedepends="expat-dev boost-dev libaio-dev linux-headers autoconf automake libtool"
-install=""
-subpackages="$pkgname-doc"
-_realpkgver=${pkgver/_/-}
-options="!check" # no production testsuite, only development tests
-source="thin-provisioning-tools-${_realpkgver}.tar.gz::https://github.com/jthornber/thin-provisioning-tools/archive/v${_realpkgver}.tar.gz
-	page-size.patch"
-
-builddir="$srcdir"/thin-provisioning-tools-$_realpkgver
-prepare() {
-	default_prepare || return 1
-	update_config_guess || return 1
-}
-
-build() {
-	cd "$builddir"
-	autoreconf || return 1
-	export CXXFLAGS="$CXXFLAGS -fpermissive"
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--with-optimisation='' \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" \
-		BINDIR="${pkgdir}"/sbin \
-		MANDIR=/usr/share/man \
-		install || return 1
-}
-
-sha512sums="47ce2f0699e3bc21fa5bb1175e12fa8f545d2abfbed4529b144bd4812a4a0021635713c3e71228f20b30cbe067c77fb93db20b65075b2689ec2aa5b0385854b9  thin-provisioning-tools-0.7.1.tar.gz
-c914f7b318555b68c4d1aceffd3b571afe9570aaa2fcd9739fab1e8d85bdbe6902dc3e63d9af356feb1388e5a79474ee8d3e2bb9e501d8f673e52b9ae5e27987  page-size.patch"
diff --git a/main/thin-provisioning-tools/page-size.patch b/main/thin-provisioning-tools/page-size.patch
deleted file mode 100644
index ff0136b65ed..00000000000
--- a/main/thin-provisioning-tools/page-size.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- thin-provisioning-tools-0.7.0-rc6.orig/block-cache/io_engine.h
-+++ thin-provisioning-tools-0.7.0-rc6/block-cache/io_engine.h
-@@ -10,6 +10,8 @@
- #include <libaio.h>
- #include <vector>
- 
-+#undef PAGE_SIZE
-+
- //----------------------------------------------------------------
- 
- namespace bcache {
diff --git a/main/tiff/APKBUILD b/main/tiff/APKBUILD
index b7d8c7923c2..8cb8a133bc7 100644
--- a/main/tiff/APKBUILD
+++ b/main/tiff/APKBUILD
@@ -2,21 +2,80 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=tiff
-pkgver=4.1.0
+pkgver=4.6.0t
 pkgrel=0
 pkgdesc="Provides support for the Tag Image File Format or TIFF"
-url="http://www.libtiff.org"
+url="https://gitlab.com/libtiff/libtiff"
 arch="all"
 license="libtiff"
-depends_dev="zlib-dev libjpeg-turbo-dev"
-makedepends="libtool autoconf automake $depends_dev"
-checkdepends="diffutils"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-tools libtiffxx:_libtiffxx"
-source="http://download.osgeo.org/libtiff/tiff-$pkgver.tar.gz
-	CVE-2018-12900.patch
+depends_dev="
+	zlib-dev
+	zstd-dev
+	"
+makedepends="
+	$depends_dev
+	cmake
+	libjpeg-turbo-dev
+	libwebp-dev
+	python3
+	samurai
 	"
+checkdepends="diffutils"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-tools libtiffxx"
+source="http://www.libtiff.org/downloads/tiff-$pkgver.tar.gz"
 
 # secfixes:
+#   4.5.0-r5:
+#     - CVE-2023-0795
+#     - CVE-2023-0796
+#     - CVE-2023-0797
+#     - CVE-2023-0798
+#     - CVE-2023-0799
+#     - CVE-2023-0800
+#     - CVE-2023-0801
+#     - CVE-2023-0802
+#     - CVE-2023-0803
+#     - CVE-2023-0804
+#   4.5.0-r3:
+#     - CVE-2022-48281
+#   4.5.0-r0:
+#     - CVE-2022-2953
+#     - CVE-2022-3213
+#     - CVE-2022-3570
+#     - CVE-2022-3597
+#     - CVE-2022-3598
+#     - CVE-2022-3599
+#     - CVE-2022-3626
+#     - CVE-2022-3627
+#     - CVE-2022-3970
+#   4.4.0-r1:
+#     - CVE-2022-2056
+#     - CVE-2022-2057
+#     - CVE-2022-2058
+#     - CVE-2022-2519
+#     - CVE-2022-2520
+#     - CVE-2022-2521
+#     - CVE-2022-34526
+#   4.4.0-r0:
+#     - CVE-2022-2867
+#     - CVE-2022-2868
+#     - CVE-2022-2869
+#   4.3.0-r1:
+#     - CVE-2022-0561
+#     - CVE-2022-0562
+#     - CVE-2022-0865
+#     - CVE-2022-0891
+#     - CVE-2022-0907
+#     - CVE-2022-0908
+#     - CVE-2022-0909
+#     - CVE-2022-0924
+#     - CVE-2022-22844
+#     - CVE-2022-34266
+#   4.2.0-r0:
+#     - CVE-2020-35521
+#     - CVE-2020-35522
+#     - CVE-2020-35523
+#     - CVE-2020-35524
 #   4.1.0-r0:
 #     - CVE-2019-6128
 #   4.0.10-r2:
@@ -63,36 +122,35 @@ source="http://download.osgeo.org/libtiff/tiff-$pkgver.tar.gz
 #     - CVE-2017-5225
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--enable-cxx
-	make
+	CFLAGS="$CFLAGS -flto=auto" \
+	CXXFLAGS="$CXXFLAGS -flto=auto" \
+	cmake -B build -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=MinSizeRel
+
+	cmake --build build
 }
 
 check() {
-	make check
+	ctest --test-dir build --output-on-failure -j2
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
-_libtiffxx() {
+libtiffxx() {
 	pkgdesc="C++ binding to libtiff"
-	mkdir -p "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/libtiffxx.so.* "$subpkgdir"/usr/lib/
+
+	amove usr/lib/libtiffxx.so.*
 }
 
 tools() {
 	pkgdesc="Command-line utility programs for manipulating TIFF files"
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+
+	amove usr/bin
 }
 
-sha512sums="fd541dcb11e3d5afaa1ec2f073c9497099727a52f626b338ef87dc93ca2e23ca5f47634015a4beac616d4e8f05acf7b7cd5797fb218758cc2ad31b390491c5a6  tiff-4.1.0.tar.gz
-c321f1d4e5d334cdb3b0800299e8165055c040c0c030220769ccfdadcc7fd35a0f3231115f44dc86fe5e34f32eafe1074aa85495a744717f8fc10c0cab2ab085  CVE-2018-12900.patch"
+sha512sums="
+bd877b4311d58692e46d77731bdc1cf701b7486b4dbc4d1e77c1e27fbe356bfaf2655cfc44020c92f6cfbc269ccd17722ee9f8785bf367624f227a85b6a298b0  tiff-4.6.0t.tar.gz
+"
diff --git a/main/tiff/CVE-2018-12900.patch b/main/tiff/CVE-2018-12900.patch
deleted file mode 100644
index f95cd06a523..00000000000
--- a/main/tiff/CVE-2018-12900.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 86861b86f26be5301ccfa96f9bf765051f4e644a Mon Sep 17 00:00:00 2001
-From: pgajdos <pgajdos@suse.cz>
-Date: Tue, 13 Nov 2018 09:03:31 +0100
-Subject: [PATCH] prevent integer overflow
-
----
- tools/tiffcp.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/tools/tiffcp.c b/tools/tiffcp.c
-index 2f406e2d..ece7ba13 100644
---- a/tools/tiffcp.c
-+++ b/tools/tiffcp.c
-@@ -1435,6 +1435,12 @@ DECLAREreadFunc(readSeparateTilesIntoBuffer)
-             status = 0;
-             goto done;
-         }
-+        if (0xFFFFFFFF / tilew < spp)
-+        {
-+            TIFFError(TIFFFileName(in), "Error, either TileWidth (%u) or BitsPerSample (%u) is too large", tilew, bps);
-+            status = 0;
-+            goto done;
-+        }
- 	bytes_per_sample = bps/8;
- 
- 	for (row = 0; row < imagelength; row += tl) {
--- 
-2.18.1
-
diff --git a/main/tig/APKBUILD b/main/tig/APKBUILD
index c7051ef554c..ce6b31f3ec8 100644
--- a/main/tig/APKBUILD
+++ b/main/tig/APKBUILD
@@ -1,19 +1,21 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=tig
-pkgver=2.5.0
+pkgver=2.5.9
 pkgrel=0
 pkgdesc="Text-mode interface for the git revision control system"
 url="https://jonas.github.io/tig/"
 arch="all"
 license="GPL-2.0-or-later"
-options="!check" # Tests are broken
 depends="git"
-makedepends="ncurses-dev xmlto asciidoc"
+makedepends="ncurses-dev pcre2-dev"
+checkdepends="util-linux-misc"
 subpackages="$pkgname-doc"
 source="https://github.com/jonas/tig/releases/download/tig-$pkgver/tig-$pkgver.tar.gz"
 
 build() {
+	CFLAGS="$CFLAGS -O2 -flto=auto" \
+	CXXFLAGS="$CXXFLAGS -O2 -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -21,11 +23,17 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var
-	make all doc-man
+	make all
+}
+
+check() {
+	SHELL=/bin/sh script --return --quiet -c "make -j1 test" /dev/null
 }
 
 package() {
 	make DESTDIR="$pkgdir" install install-doc-man
 }
 
-sha512sums="26736fe241dd2dac25d5133ed847a7c1dab4bfeaad83af2effc8e523f8c6d8c179fe3ff05cd4343e4b1048c3c50309908aa32e81dd0789e35afe9bd8ff8772ee  tig-2.5.0.tar.gz"
+sha512sums="
+fbac05715812c49f1015f1da6999acaa5f994701025a64dc1283d3c8740d4887584d3fd274344c1f7f1638c8e63f938bb699d1d7cc8599d37ad43dcc53da789b  tig-2.5.9.tar.gz
+"
diff --git a/main/tinc/APKBUILD b/main/tinc/APKBUILD
index 4e8d25f90e6..ef0b4996aaa 100644
--- a/main/tinc/APKBUILD
+++ b/main/tinc/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tinc
 pkgver=1.0.36
-pkgrel=0
+pkgrel=6
 pkgdesc="Virtual Private Network (VPN) daemon"
 url="https://www.tinc-vpn.org"
 arch="all"
-license="GPL-2.0-or-later"
-makedepends="zlib-dev lzo-dev openssl-dev linux-headers"
-subpackages="$pkgname-doc"
+license="GPL-2.0-or-later WITH OpenSSL-Exception"
+makedepends="zlib-dev lzo-dev openssl-dev>3 linux-headers"
+subpackages="$pkgname-doc $pkgname-openrc"
 source="https://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz
 	tincd.initd
 	tincd.lo.initd
@@ -21,12 +21,15 @@ source="https://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz
 #     - CVE-2018-16758
 
 check() {
-	cd "$builddir"
 	make check
 }
 
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -42,8 +45,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 
 	install -m755 -D "$srcdir"/tincd.initd "$pkgdir"/etc/init.d/tincd
diff --git a/main/tiny-cloud/APKBUILD b/main/tiny-cloud/APKBUILD
new file mode 100644
index 00000000000..72f29419450
--- /dev/null
+++ b/main/tiny-cloud/APKBUILD
@@ -0,0 +1,104 @@
+# Contributor: Mike Crute <mike@crute.us>
+# Contributor: Jake Buchholz Göktürk <tomalok@gmail.com>
+# Maintainer: Jake Buchholz Göktürk <tomalok@gmail.com>
+pkgname=tiny-cloud
+pkgver=3.0.7
+pkgrel=0
+pkgdesc="Tiny Cloud instance bootstrapper"
+url="https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud"
+arch="noarch"
+license="MIT"
+_alpine_deps="ifupdown-ng"
+_aws_deps="nvme-cli ifupdown-ng iproute2-minimal"
+makedepends="$_alpine_deps $_aws_deps"
+checkdepends="kyua xz lz4 zstd"
+depends="e2fsprogs-extra partx sfdisk yx openssh-server"
+source="
+	$url/-/archive/$pkgver/tiny-cloud-$pkgver.tar.gz
+	tiny-cloud-alpine.post-install
+	tiny-cloud-aws.post-install
+	tiny-cloud-azure.post-install
+	tiny-cloud-gcp.post-install
+	tiny-cloud-nocloud.post-install
+	tiny-cloud-oci.post-install
+	tiny-cloud-openrc.pre-upgrade
+	tiny-cloud.pre-upgrade
+"
+subpackages="
+	$pkgname-openrc
+	$pkgname-alpine
+	$pkgname-aws
+	$pkgname-azure
+	$pkgname-gcp
+	$pkgname-oci
+	$pkgname-nocloud
+"
+
+check() {
+	make check
+}
+
+package() {
+	make PREFIX="$pkgdir" core openrc
+	install="$pkgname.pre-upgrade"
+}
+
+openrc() {
+	install="$pkgname-openrc.pre-upgrade"
+	default_openrc
+}
+
+alpine() {
+	pkgdesc="Tiny Cloud - Alpine installer module"
+	depends="$_alpine_deps $pkgname-nocloud=$pkgver-r$pkgrel"
+	install="$pkgname-alpine.post-install"
+	make -C "$builddir" PREFIX="$subpkgdir" alpine
+}
+
+aws() {
+	pkgdesc="Tiny Cloud - Amazon Web Services module"
+	depends="$_aws_deps $pkgname=$pkgver-r$pkgrel"
+	provides="tiny-ec2-bootstrap"
+	install="$pkgname-aws.post-install"
+	make -C "$builddir" PREFIX="$subpkgdir" aws
+}
+
+azure() {
+	pkgdesc="Tiny Cloud - Azure module"
+	depends="$pkgname=$pkgver-r$pkgrel"
+	install="$pkgname-azure.post-install"
+	make -C "$builddir" PREFIX="$subpkgdir" azure
+}
+
+gcp() {
+	pkgdesc="Tiny Cloud - Google Cloud Platform module"
+	depends="$pkgname=$pkgver-r$pkgrel"
+	install="$pkgname-gcp.post-install"
+	make -C "$builddir" PREFIX="$subpkgdir" gcp
+}
+
+oci() {
+	pkgdesc="Tiny Cloud - Oracle Cloud Infrastructure module"
+	depends="$pkgname=$pkgver-r$pkgrel"
+	install="$pkgname-oci.post-install"
+	make -C "$builddir" PREFIX="$subpkgdir" oci
+}
+
+nocloud() {
+	pkgdesc="Tiny Cloud - NoCloud module"
+	depends="$pkgname=$pkgver-r$pkgrel"
+	install="$pkgname-nocloud.post-install"
+	make -C "$builddir" PREFIX="$subpkgdir" nocloud
+}
+
+sha512sums="
+4fa37d2bfaa01e234e5a90e6cb173cb79d96497d33ac98e16f67624c533fedbf47e9013901a5b7954c297c876ba1f59fb49b4ed1cb090f0225ed582db676e32b  tiny-cloud-3.0.7.tar.gz
+9d41eae6f1eb7addec7aa8dfd8ebe8a2522772ae438e46b773121e9c7d3b9806b5abbe2e249361160727b4b0ed63df21e7cbc50e21aaecd6544310836ee7757e  tiny-cloud-alpine.post-install
+0165ac30c5e78448373f44d596930e68bdb8e4c9a10441f13b3ec44a879482eca2904b6a2a2702f2d66510a3cc58935ce373ce1fb5ae2fa786372883253f3245  tiny-cloud-aws.post-install
+04752ec96f25dd5ceb7d8b7c63ac0e9f8f92fea675d115c24f0bebaa4cb16af147550f9d4c148e800273389da2c64e6304dc45333e25ae08d9aa4e33aff431c9  tiny-cloud-azure.post-install
+05b7ccbb441f7635b13b1c81e8341e74cbf6cd158b257c9286d31ca736c45ef64ef2778990f57b3f880372b442e0a677e95a0fbe2ec357e89627363707089a7c  tiny-cloud-gcp.post-install
+df4f37aa7c27d7f011ef2aa6e3c1d88d25c9e117df947bd238c1fc3aa9aef9e9d66af679bb9e2c58564cbc8fb5a1ec51827063a91c0a8cb4efc1a7563cc5a172  tiny-cloud-nocloud.post-install
+e23482f9b6678a34c1ea98a55c76852e571f0c86717b26e449687e1691d4f00608a16e3f2a6119ee7d793c6853a3c4d4eac2e82a075ab0456d9f94f2e1110030  tiny-cloud-oci.post-install
+a2f795c1d9cce1a796cc92711b18459706b6573417d2ef43504c50a65f4808eaf8f8d48a20a4f198ade25c285188659a95d51e5cb34e4c64cf6384459397b850  tiny-cloud-openrc.pre-upgrade
+83217a30e495bcc18ad1a5d744806d499b5bdf929df3f18597216a25f465e5d4764ca66499d221bf5738b83639f1ec80de2a14e4b64aac80d51b285c01f0fc74  tiny-cloud.pre-upgrade
+"
diff --git a/main/tiny-cloud/tiny-cloud-alpine.post-install b/main/tiny-cloud/tiny-cloud-alpine.post-install
new file mode 100644
index 00000000000..9ba96683426
--- /dev/null
+++ b/main/tiny-cloud/tiny-cloud-alpine.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+sed -Ee 's/^#?CLOUD=.*/CLOUD=alpine/' \
+	-Ee 's/^HOTPLUG_MODULES=.*/#HOTPLUG_MODULES=/' \
+	/lib/tiny-cloud/tiny-cloud.conf > /etc/tiny-cloud.conf
diff --git a/main/tiny-cloud/tiny-cloud-aws.post-install b/main/tiny-cloud/tiny-cloud-aws.post-install
new file mode 100644
index 00000000000..f29d4a802cb
--- /dev/null
+++ b/main/tiny-cloud/tiny-cloud-aws.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+sed -Ee 's/^#?CLOUD=.*/CLOUD=aws/' \
+	-Ee 's/^HOTPLUG_MODULES=.*/#HOTPLUG_MODULES=/' \
+	/lib/tiny-cloud/tiny-cloud.conf > /etc/tiny-cloud.conf
diff --git a/main/tiny-cloud/tiny-cloud-azure.post-install b/main/tiny-cloud/tiny-cloud-azure.post-install
new file mode 100644
index 00000000000..69cf792f8ce
--- /dev/null
+++ b/main/tiny-cloud/tiny-cloud-azure.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+sed -Ee 's/^#?CLOUD=.*/CLOUD=azure/' \
+	-Ee 's/^HOTPLUG_MODULES=.*/#HOTPLUG_MODULES=/' \
+	/lib/tiny-cloud/tiny-cloud.conf > /etc/tiny-cloud.conf
diff --git a/main/tiny-cloud/tiny-cloud-gcp.post-install b/main/tiny-cloud/tiny-cloud-gcp.post-install
new file mode 100644
index 00000000000..b1eceae999b
--- /dev/null
+++ b/main/tiny-cloud/tiny-cloud-gcp.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+sed -Ee 's/^#?CLOUD=.*/CLOUD=gcp/' \
+	-Ee 's/^HOTPLUG_MODULES=.*/#HOTPLUG_MODULES=/' \
+	/lib/tiny-cloud/tiny-cloud.conf > /etc/tiny-cloud.conf
diff --git a/main/tiny-cloud/tiny-cloud-nocloud.post-install b/main/tiny-cloud/tiny-cloud-nocloud.post-install
new file mode 100644
index 00000000000..23c6b536ffa
--- /dev/null
+++ b/main/tiny-cloud/tiny-cloud-nocloud.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+sed -Ee 's/^#?CLOUD=.*/CLOUD=nocloud/' \
+	-Ee 's/^HOTPLUG_MODULES=.*/#HOTPLUG_MODULES=/' \
+	/lib/tiny-cloud/tiny-cloud.conf > /etc/tiny-cloud.conf
diff --git a/main/tiny-cloud/tiny-cloud-oci.post-install b/main/tiny-cloud/tiny-cloud-oci.post-install
new file mode 100644
index 00000000000..a7aca52cb3b
--- /dev/null
+++ b/main/tiny-cloud/tiny-cloud-oci.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+sed -Ee 's/^#?CLOUD=.*/CLOUD=oci/' \
+	-Ee 's/^HOTPLUG_MODULES=.*/#HOTPLUG_MODULES=/' \
+	/lib/tiny-cloud/tiny-cloud.conf > /etc/tiny-cloud.conf
diff --git a/main/tiny-cloud/tiny-cloud-openrc.pre-upgrade b/main/tiny-cloud/tiny-cloud-openrc.pre-upgrade
new file mode 100644
index 00000000000..7b386228d1a
--- /dev/null
+++ b/main/tiny-cloud/tiny-cloud-openrc.pre-upgrade
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# tiny-cloud-early needs to be in default, not sysinit or boot
+if [ -L /etc/runlevels/sysinit/tiny-cloud-early ] || \
+	[ -L /etc/runlevels/boot/tiny-cloud-early ]; then
+	rm /etc/runlevels/sysinit/tiny-cloud-early \
+		/etc/runlevels/boot/tiny-cloud-early
+	ln -sf /etc/init.d/tiny-cloud-early /etc/runlevels/default
+fi
+
+# tiny-cloud-net only existed during 3.0.0-rc
+if [ -L /etc/runlevels/default/tiny-cloud-net ]; then
+	rm /etc/runlevels/default/tiny-cloud-net
+	ln -sf /etc/init.d/tiny-cloud-boot /etc/runlevels/boot
+fi
diff --git a/main/tiny-cloud/tiny-cloud.pre-upgrade b/main/tiny-cloud/tiny-cloud.pre-upgrade
new file mode 100644
index 00000000000..c10f042180b
--- /dev/null
+++ b/main/tiny-cloud/tiny-cloud.pre-upgrade
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# move config file from the pre-3.0.0 location
+if [ -f /etc/conf.d/tiny-cloud ]; then
+	mv /etc/conf.d/tiny-cloud /etc/tiny-cloud.conf
+fi
diff --git a/main/tiny-ec2-bootstrap/APKBUILD b/main/tiny-ec2-bootstrap/APKBUILD
deleted file mode 100644
index 03bbcd687bd..00000000000
--- a/main/tiny-ec2-bootstrap/APKBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Contributor: Mike Crute <mike@crute.us>
-# Maintainer: Mike Crute <mike@crute.us>
-pkgname=tiny-ec2-bootstrap
-pkgver=1.3.1
-pkgrel=0
-pkgdesc="A tiny EC2 instance bootstrapper that uses instance metadata"
-url="https://github.com/mcrute/tiny-ec2-bootstrap"
-arch="noarch"
-license="MIT"
-options="!check"  # no tests provided
-depends="openrc e2fsprogs-extra"
-source="$pkgname-$pkgver.tar.gz::https://github.com/mcrute/$pkgname/archive/release-$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-release-$pkgver"
-
-package() {
-	cd "$builddir"
-	make install PREFIX=$pkgdir
-}
-
-sha512sums="c5ba19387862b1211b70415bb291b1178a18539faa0770d5e294992a8399a9bdb0b2db3427e77bc19127aafea2991a01ff40f9560212eb7d16580f8d55154f6a  tiny-ec2-bootstrap-1.3.1.tar.gz"
diff --git a/main/tinyproxy/APKBUILD b/main/tinyproxy/APKBUILD
index 0191ed7aeee..2699a9d04dc 100644
--- a/main/tinyproxy/APKBUILD
+++ b/main/tinyproxy/APKBUILD
@@ -1,33 +1,32 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=tinyproxy
-pkgver=1.10.0
-pkgrel=2
+pkgver=1.11.1
+pkgrel=3
 pkgdesc="Lightweight HTTP proxy"
-pkgusers="tinyproxy"
-pkggroups="tinyproxy"
-url="https://www.banu.com/tinyproxy/"
+url="https://tinyproxy.github.io/"
 arch="all"
 license="GPL-2.0-or-later"
-depends=
-makedepends="asciidoc"
 install="tinyproxy.pre-install"
 subpackages="$pkgname-doc $pkgname-openrc"
-source="https://github.com/$pkgname/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz
-	tinyproxy.initd"
+source="https://github.com/tinyproxy/tinyproxy/releases/download/$pkgver/tinyproxy-$pkgver.tar.gz
+	CVE-2022-40468.patch
+	tinyproxy.initd
+	"
+pkgusers="tinyproxy"
+pkggroups="tinyproxy"
+options="!check"
+
+# secfixes:
+#   1.11.1-r2:
+#     - CVE-2022-40468
 
-builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
-	default_prepare
-	# set default user to tinyproxy:tinyproxy and correct pidfile
-	sed -i -e 's:^User.*:User tinyproxy:' \
-		-e 's:^Group.*:Group tinyproxy:' \
-		-e 's:^PidFile.*:PidFile "/run/tinyproxy/tinyproxy.pid":' \
-		etc/tinyproxy.conf.in
+ 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -40,12 +39,13 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
-	install -d -D -o tinyproxy -g tinyproxy "$pkgdir"/run/tinyproxy
 	install -d -D -o tinyproxy -g tinyproxy "$pkgdir"/var/log/tinyproxy
 	install -Dm755 "$srcdir"/tinyproxy.initd "$pkgdir"/etc/init.d/tinyproxy
 }
 
-sha512sums="53187adef865672a6c29f126189cf896bd02f8b0789ee2ee00b82d93b952c70dacdd2c82b0845392e518560e75e6ee107ce7662d1ec71108f293ba1d7de6aa2a  tinyproxy-1.10.0.tar.gz
-cd440ed686e8128ed46441ca29da8376c4d28e9e34ae9b85c18eb2f1681d60c0c04b79401a7368f917eeab6768965d6c867d0ac6578a7858557c11b356446c02  tinyproxy.initd"
+sha512sums="
+6ac7b57c33dcc87d6945c2b14f262e98d8c349c2492b3dd71f8028c4937df2a8e6ed7c913e8f6598b3e8ae83d5b51b9d5144c77f14f229df4aac5e094bcae6a6  tinyproxy-1.11.1.tar.gz
+57728d1621f78d4eff07bc39757abca5034148cfaa9ee9110607afbe5f39910df3d10bcc797899883c9876ff8f218eca571223d2e5b0145e149ae9d8909c8f92  CVE-2022-40468.patch
+0b4cf9c0904c766d227fc50bcdba4a602f9352009ab9c5b4b73e260414e4963f8010d83016605bae5a681f5af4dec12a76a57b2a84ebbf9ffe3709e78a4e29e8  tinyproxy.initd
+"
diff --git a/main/tinyproxy/CVE-2022-40468.patch b/main/tinyproxy/CVE-2022-40468.patch
new file mode 100644
index 00000000000..c674c9b7f5a
--- /dev/null
+++ b/main/tinyproxy/CVE-2022-40468.patch
@@ -0,0 +1,28 @@
+From 3764b8551463b900b5b4e3ec0cd9bb9182191cb7 Mon Sep 17 00:00:00 2001
+From: rofl0r <rofl0r@users.noreply.github.com>
+Date: Thu, 8 Sep 2022 15:18:04 +0000
+Subject: [PATCH] prevent junk from showing up in error page in invalid
+ requests
+
+fixes #457
+---
+ src/reqs.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/reqs.c b/src/reqs.c
+index bce69819..45db118d 100644
+--- a/src/reqs.c
++++ b/src/reqs.c
+@@ -343,8 +343,12 @@ static struct request_s *process_request (struct conn_s *connptr,
+                 goto fail;
+         }
+ 
++        /* zero-terminate the strings so they don't contain junk in error page */
++        request->method[0] = url[0] = request->protocol[0] = 0;
++
+         ret = sscanf (connptr->request_line, "%[^ ] %[^ ] %[^ ]",
+                       request->method, url, request->protocol);
++
+         if (ret == 2 && !strcasecmp (request->method, "GET")) {
+                 request->protocol[0] = 0;
+ 
diff --git a/main/tinyproxy/tinyproxy.initd b/main/tinyproxy/tinyproxy.initd
index 48688a2c19c..817c98306fa 100644
--- a/main/tinyproxy/tinyproxy.initd
+++ b/main/tinyproxy/tinyproxy.initd
@@ -2,39 +2,27 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-get_config() {
-    res=$(awk '$1 == "'$1'" { s=$2 } END { print s }' "$CONFFILE")
-
-    if [ "x$res" = "x" ]; then
-	echo "$2"
-    else
-	eval echo "$res"
-    fi
-}
-
 : ${CONFFILE:="/etc/${SVCNAME}/${SVCNAME}.conf"}
 
 command=/usr/bin/tinyproxy
-command_args="-c ${CONFFILE}"
-pidfile=$(get_config PidFile /run/tinyproxy/${SVCNAME}.pid)
+command_args="-d -c ${CONFFILE}"
+command_user="tinyproxy:tinyproxy"
+command_background="true"
+
+pidfile=/run/${SVCNAME}.pid
+output_log=/var/log/tinyproxy/${SVCNAME}.log
 
 depend() {
 	config "$CONFFILE"
-
 	use dns
-
-	[ "$(get_config Syslog Off)" = "On" ] && \
-	    use logger
+	need net
+	after firewall
 }
 
-start_pre() {
-    piddir=$(dirname ${pidfile})
+extra_started_commands="reload"
+reload() {
+    ebegin "Reloading ${SVCNAME}"
 
-    if [ "${piddir}" = "/run" ]; then
-	eerror "Please change your PidFile settings to be within the"
-	eerror "/run/tinyproxy directory"
-	eend 1
-    else
-	checkpath -d -o $(get_config User tinyproxy):$(get_config Group tinyproxy) ${piddir}
-    fi
+    start-stop-daemon --signal SIGUSR1 \
+      --exec "${command}" --pidfile "${pidfile}"
 }
diff --git a/main/tinyproxy/tinyproxy.pre-install b/main/tinyproxy/tinyproxy.pre-install
index d2e1d624b21..8937ccdfbda 100755
--- a/main/tinyproxy/tinyproxy.pre-install
+++ b/main/tinyproxy/tinyproxy.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S tinyproxy 2>/dev/null
-adduser -S -D -H -h /var/run/tinyproxy -s /sbin/nologin -G tinyproxy \
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G tinyproxy \
 	-g "tinyproxy user" tinyproxy 2>/dev/null
 
 # return with success even if user already exist
diff --git a/main/tinyxml2/APKBUILD b/main/tinyxml2/APKBUILD
index 2c9e25ae1af..4caeb0e00d3 100644
--- a/main/tinyxml2/APKBUILD
+++ b/main/tinyxml2/APKBUILD
@@ -1,37 +1,31 @@
 # Contributor: André Klitzing <aklitzing@gmail.com>
 # Maintainer: André Klitzing <aklitzing@gmail.com>
 pkgname=tinyxml2
-pkgver=8.0.0
+pkgver=10.0.0
 pkgrel=0
 pkgdesc="Simple, small and efficient C++ XML parser"
-url="http://www.grinninglizard.com/tinyxml2"
+url="https://github.com/leethomason/tinyxml2"
 arch="all"
 license="Zlib"
-makedepends="cmake"
+makedepends="meson"
 subpackages="$pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/leethomason/tinyxml2/archive/$pkgver.tar.gz"
 
 build() {
-	if [ "$CBUILD" != "$CHOST" ]; then
-		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
-	fi
-	cmake \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib \
-		-DBUILD_SHARED_LIBS=True \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		$CMAKE_CROSSOPTS
-	make
+	abuild-meson \
+		-Dtests=true \
+		. output
+	meson compile -C output
 }
 
 check() {
-	make test
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-sha512sums="bcbb065c2af34ea681ec556377fd22e720b6f5d4caa73f432b1e34e08603a96f2233763f0ec5ae86b9ee71ddbe3062f58d3794cd3a162ce6903435530de0bba6  tinyxml2-8.0.0.tar.gz"
+sha512sums="
+a359d33bc12fad455b53d81011dbe12727cae0aabfaa5704f1a25807ca216dd854a571291029886c0beedeca5c3b6393dd49c4718773e18a0e008abbdb3de36a  tinyxml2-10.0.0.tar.gz
+"
diff --git a/main/tk/APKBUILD b/main/tk/APKBUILD
index 57f2411ee07..23f7658c1cd 100644
--- a/main/tk/APKBUILD
+++ b/main/tk/APKBUILD
@@ -1,9 +1,10 @@
-# Maintainer: Isaac Dunham <ibid.ag@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tk
-pkgver=8.6.10
-pkgrel=1
+pkgver=8.6.14
+_major=${pkgver%.*}
+pkgrel=0
 pkgdesc="GUI toolkit for the Tcl scripting language"
-url="http://tcl.sourceforge.net/"
+url="https://tcl.sourceforge.net/"
 arch="all"
 options="!check"  # Requires a running X11 server.
 license="TCL"
@@ -12,8 +13,6 @@ makedepends="$depends_dev libpng-dev"
 subpackages="$pkgname-doc $pkgname-dev"
 source="https://downloads.sourceforge.net/sourceforge/tcl/tk$pkgver-src.tar.gz
 	"
-
-_major=${pkgver%.*}
 builddir="$srcdir"/tk$pkgver/unix
 
 build() {
@@ -33,14 +32,14 @@ build() {
 
 package() {
 	export LD_LIBRARY_PATH="$builddir"
-	make -j1 INSTALL_ROOT="$pkgdir" install install-private-headers
+	make INSTALL_ROOT="$pkgdir" install install-private-headers
 
-	ln -sf wish${_major} "$pkgdir"/usr/bin/wish
+	ln -sf wish$_major "$pkgdir"/usr/bin/wish
 	install -Dm644 ../license.terms \
 		$pkgdir/usr/share/licenses/$pkgname/LICENSE
 
 	# remove buildroot traces
-	find "$pkgdir" -name '*Config.sh' | xargs sed -i -e "s#${srcdir}#/usr/src#"
+	find "$pkgdir" -name '*Config.sh' -print0 | xargs -0 sed -i -e "s#${srcdir}#/usr/src#"
 
 	# move demos to -doc directory
 	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/examples/
@@ -61,4 +60,6 @@ dev() {
 	done
 }
 
-sha512sums="d12ef3a5bde9e10209a24e9f978bd23360a979d8fa70a859cf750a79ca51067a11ef6df7589303b52fe2a2baed4083583ddaa19e2c7cb433ea523639927f1be5  tk8.6.10-src.tar.gz"
+sha512sums="
+756903dfa56cf77c7934bb3680c9bef6027f99196f4e6a2e823b85c342ca860cbb4b42154f576cc88f7f1265d28ce2d84ab5f52f848b16cca0cf9af4c770183f  tk8.6.14-src.tar.gz
+"
diff --git a/main/tmux/APKBUILD b/main/tmux/APKBUILD
index 9d53b8d64fd..53b8c02c10d 100644
--- a/main/tmux/APKBUILD
+++ b/main/tmux/APKBUILD
@@ -1,26 +1,31 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tmux
-pkgver=3.0a
+pkgver=3.4
 pkgrel=1
 pkgdesc="Tool to control multiple terminals from a single terminal"
 url="https://tmux.github.io"
 arch="all"
 license="ISC"
 depends="ncurses-terminfo-base"
-makedepends="autoconf automake bsd-compat-headers libevent-dev ncurses-dev"
+makedepends="bison libevent-dev ncurses-dev"
 subpackages="$pkgname-doc"
 source="https://github.com/tmux/tmux/releases/download/$pkgver/tmux-$pkgver.tar.gz"
 
+# secfixes:
+#   3.1c-r0:
+#     - CVE-2020-27347
 
 build() {
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--localstatedir=/var
+		--localstatedir=/var \
+		--enable-sixel
 	make
 }
 
@@ -38,4 +43,6 @@ package() {
 	done
 }
 
-sha512sums="f326ee9c0e5e9a46ce9c99c76407b8cf35feea5f898c3c937fd8c5e488ff9a809272de19226d9d10f864e11051dcf633327820b7f8d86d85962da61174bbfb0b  tmux-3.0a.tar.gz"
+sha512sums="
+bd3880211d99d8ee15947000abf8a1832fdfa48b29b2df81b66d5969cf3f4e64e746f984f6139bfc57e3ebee7fe8dc7cbb6bccb779307607de6c376969fecbff  tmux-3.4.tar.gz
+"
diff --git a/main/tolua++/APKBUILD b/main/tolua++/APKBUILD
index 50ceadec81f..94924cf585f 100644
--- a/main/tolua++/APKBUILD
+++ b/main/tolua++/APKBUILD
@@ -1,34 +1,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tolua++
 pkgver=1.0.93
-pkgrel=2
+pkgrel=5
 pkgdesc="a tool to integrate C/C++ code with Lua"
-url="http://www.codenix.com/~tolua/"
+url="https://github.com/LuaDist/toluapp"
 arch="all"
 license="MIT"
-depends=
 makedepends="lua-dev"
-install=
-subpackages=
+options="!check" # no test suite
 source="$pkgname-$pkgver.tar.gz::https://github.com/LuaDist/toluapp/archive/$pkgver.tar.gz"
-
-_builddir="$srcdir"/toluapp-$pkgver
-
-prepare() {
-	cd "$_builddir"
-}
+builddir="$srcdir"/toluapp-$pkgver
 
 build() {
-	cd "$_builddir"/src
+	cd "$builddir"/src
 	# see http://lua-users.org/wiki/CompilingToluappWithoutScons
 	gcc -fPIC -c lib/*.c  -I../include
-	ar rcsv libtolua++.a *.o
+	ar rcsv libtolua++.a ./*.o
 	gcc bin/tolua.c bin/toluabind.c -I../include -L. -llua -ltolua++ \
 		-o tolua++
 }
 
 package() {
-	cd "$_builddir"/src
+	cd "$builddir"/src
 	install -d "$pkgdir"/usr/lib/ "$pkgdir"/usr/bin "$pkgdir"/usr/include
 	install libtolua++.a "$pkgdir"/usr/lib/
 	install tolua++ "$pkgdir"/usr/bin/
diff --git a/main/tree/APKBUILD b/main/tree/APKBUILD
index 07a0f882592..c5fae5860b4 100644
--- a/main/tree/APKBUILD
+++ b/main/tree/APKBUILD
@@ -1,27 +1,25 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=tree
-pkgver=1.8.0
+pkgver=2.1.1
 pkgrel=0
-pkgdesc="A recursive directory indented listing of files"
-url="http://mama.indstate.edu/users/ice/tree/"
+pkgdesc="Recursive directory indented listing of files"
+url="https://oldmanprogrammer.net/source.php?dir=projects/tree"
 arch="all"
 license="GPL-2.0-or-later"
-depends=""
-depends_dev=""
 makedepends="$depends_dev"
-install=""
-options="!check"
 subpackages="$pkgname-doc"
-source="http://mama.indstate.edu/users/ice/tree/src/$pkgname-$pkgver.tgz"
+source="https://gitlab.com/OldManProgrammer/unix-tree/-/archive/$pkgver/unix-tree-$pkgver.tar.gz"
+builddir="$srcdir/unix-tree-$pkgver"
+options="!check" # no tests
 
 build() {
-	cd "$builddir"
-	make
+	make LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
 }
 
 package() {
-	cd "$builddir"
-	make prefix="$pkgdir/usr" MANDIR="${pkgdir}/usr/share/man/man1" install
+	make PREFIX="$pkgdir/usr" MANDIR="$pkgdir/usr/share/man" install
 }
 
-sha512sums="3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695  tree-1.8.0.tgz"
+sha512sums="
+997d20c5508d3eba026e9d621a4da2b3b0bf111d272bb7d705a9a0819d430887061e234f0a00ac3102c43413ef716c1371ee0620b8460fbd523d4a3790940a29  unix-tree-2.1.1.tar.gz
+"
diff --git a/main/tslib/APKBUILD b/main/tslib/APKBUILD
deleted file mode 100644
index f3df46fca5f..00000000000
--- a/main/tslib/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Clayton Craft <clayton@craftyguy.net>
-# Maintainer: Clayton Craft <clayton@craftyguy.net>
-pkgname=tslib
-pkgver=1.21
-pkgrel=0
-pkgdesc="Touchscreen Access Library"
-arch="all"
-url="https://github.com/kergoth/tslib"
-license="LGPL-2.0-or-later"
-makedepends="autoconf automake libtool linux-headers"
-source="https://github.com/kergoth/tslib/releases/download/$pkgver/tslib-$pkgver.tar.xz"
-subpackages="$pkgname-dev $pkgname-doc"
-
-prepare() {
-	cd "$builddir"
-	default_prepare
-	./autogen.sh
-}
-
-build() {
-	cd "$builddir"
-	./configure --prefix=/usr --sysconfdir=/etc
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="66c5e5dc4e2314277e19af29b5dce1181573579f13b0e79fa43e658838d4c19a77feb978b60d7c6458337e8d6100ee54a42fc4af3a99fd8d6840cccafa6323c4  tslib-1.21.tar.xz"
diff --git a/main/ttf-dejavu/APKBUILD b/main/ttf-dejavu/APKBUILD
deleted file mode 100644
index 3e7c77edd57..00000000000
--- a/main/ttf-dejavu/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=ttf-dejavu
-pkgver=2.37
-pkgrel=1
-pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters"
-url="https://dejavu-fonts.github.io/"
-arch="noarch"
-license="custom"
-options="!check"
-depends="fontconfig encodings mkfontdir mkfontscale"
-makedepends="font-util-dev"
-# added fontconfig configuration from:
-# https://github.com/bohoomil/fontconfig-ultimate/tree/master/fontconfig_patches/fonts-settings
-source="https://downloads.sourceforge.net/project/dejavu/dejavu/$pkgver/dejavu-fonts-ttf-$pkgver.tar.bz2
-	https://downloads.sourceforge.net/project/dejavu/dejavu/$pkgver/dejavu-lgc-fonts-ttf-$pkgver.tar.bz2
-	45-dejavu.conf
-	90-tt-dejavu.conf
-	"
-
-build() {
-	return 0
-}
-
-package() {
-	mkdir -p "$pkgdir"/usr/share/fonts/$pkgname \
-		"$pkgdir"/etc/fonts/conf.avail \
-		"$pkgdir"/etc/fonts/conf.d
-
-	install -m644 "$srcdir"/dejavu-fonts-ttf-$pkgver/ttf/*.ttf \
-		"$srcdir"/dejavu-lgc-fonts-ttf-$pkgver/ttf/*.ttf \
-		"$pkgdir"/usr/share/fonts/$pkgname
-
-	install -m644 "$srcdir"/dejavu-fonts-ttf-$pkgver/fontconfig/*.conf \
-		"$srcdir"/dejavu-lgc-fonts-ttf-$pkgver/fontconfig/*.conf \
-		"$pkgdir"/etc/fonts/conf.avail
-
-	cd "$pkgdir"/etc/fonts/conf.d
-	for j in "$srcdir"/*.conf; do
-		install -m644 "$j" "$pkgdir"/etc/fonts/conf.avail/
-		ln -sf /etc/fonts/conf.avail/${j##*/}
-	done
-}
-
-sha512sums="bafa39321021097432777f0825d700190c23f917d754a4504722cd8946716c22c083836294dab7f3ae7cf20af63c4d0944f3423bf4aa25dbca562d1f30e00654  dejavu-fonts-ttf-2.37.tar.bz2
-4bf36813b4143a482a50ee20377166cbc22e3aa62ccb453fe6ce27d2286acaf2b6f06759eb5d5000d2f868a7d93ecad851ad29de60fb531ed9ac2fcd7b9bdc1f  dejavu-lgc-fonts-ttf-2.37.tar.bz2
-df82fea7ad6c58edcc20c960fd2de9d49c70e23f9e63180b063c848a6f0d5592e2ce31dc0dc4a0b5abc8e682393c827c96b4a9da9203974672ebd3a77e5b9fc3  45-dejavu.conf
-bc12705369050739143eda6a2dadaada954112ea262bd297a4823b31861f3da0f61e17ad6fb61226caea16323c3bc9cd88e8b0e60f61b2af6d245af885a4399c  90-tt-dejavu.conf"
diff --git a/main/ttf-droid/APKBUILD b/main/ttf-droid/APKBUILD
deleted file mode 100644
index 0bb8833946e..00000000000
--- a/main/ttf-droid/APKBUILD
+++ /dev/null
@@ -1,74 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
-pkgname=ttf-droid
-pkgver=20200215
-pkgrel=0
-pkgdesc="General-purpose fonts released by Google as part of Android."
-url="http://code.google.com/android/"
-arch="noarch"
-license="Apache"
-depends="fontconfig"
-subpackages="$pkgname-nonlatin"
-# added fontconfig configuration from:
-# https://github.com/bohoomil/fontconfig-ultimate/tree/master/fontconfig_patches/fonts-settings
-source="https://dev.alpinelinux.org/archive/android-fonts/android-fonts-4.2.2_r1.2.tar.gz
-	http://www.cosmix.org/software/files/DroidSansMonoSlashed.zip
-	http://www.cosmix.org/software/files/DroidSansMonoDotted.zip
-	45-droid.conf
-	65-ttf-droid-sans.conf
-	65-ttf-droid-serif.conf
-	90-tt-droid.conf
-	"
-builddir="$srcdir"
-
-package() {
-	mkdir -p "$pkgdir"/usr/share/fonts/$pkgname \
-		"$pkgdir"/etc/fonts/conf.avail \
-		"$pkgdir"/etc/fonts/conf.d
-
-	local fonts="DroidSerif-Bold.ttf DroidSerif-BoldItalic.ttf
-		DroidSerif-Italic.ttf DroidSerif-Regular.ttf DroidSans-Bold.ttf
-		DroidSans.ttf DroidSansMono.ttf"
-
-	for i in $fonts; do
-		install -m644 "$srcdir"/"$i" \
-			"$pkgdir"/usr/share/fonts/$pkgname/
-	done
-
-	for j in "$srcdir"/*.conf; do
-		install -m644 "$j" \
-			"$pkgdir"/etc/fonts/conf.avail/
-		cd "$pkgdir"/etc/fonts/conf.d
-		ln -sf /etc/fonts/conf.avail/${j##*/}
-	done
-}
-
-nonlatin() {
-	pkgdesc="General-purpose fonts released by Google as part of Android. Non-Latin language support"
-	depends="fontconfig"
-	local fonts="DroidKufi-Bold.ttf DroidKufi-Regular.ttf DroidNaskh-Bold.ttf
-		DroidNaskh-Regular-SystemUI.ttf DroidNaskh-Regular.ttf
-		DroidSansArabic.ttf DroidSansArmenian.ttf
-		DroidSansDevanagari-Regular.ttf DroidSansEthiopic-Bold.ttf
-		DroidSansEthiopic-Regular.ttf DroidSansFallback.ttf
-		DroidSansFallbackFull.ttf DroidSansFallbackLegacy.ttf
-		DroidSansGeorgian.ttf DroidSansHebrew-Bold.ttf
-		DroidSansHebrew-Regular.ttf DroidSansJapanese.ttf
-		DroidSansTamil-Bold.ttf DroidSansTamil-Regular.ttf
-		DroidSansThai.ttf"
-
-	mkdir -p "$subpkgdir"/usr/share/fonts/$subpkgname
-
-	for k in $fonts; do
-		install -m644 "$srcdir"/"$k" \
-			"$subpkgdir"/usr/share/fonts/$subpkgname/
-	done
-}
-
-sha512sums="63ebea1be1dc1335ccc019b7d72aa54376985a93a0ce83a0c496895a77974c3ba440bf9a4d7196aa1c9d82b967895587ee5512ca7a74370e92fbe913778f974a  android-fonts-4.2.2_r1.2.tar.gz
-e279c650e18f5e3db462c016fd93516442e5bfbe92580e51b6759cfc19e3f81fbd7e262b1a521ecce6c5c4aa3c8e0687d3b00e1ecb46784a090b9fd92d01aa25  DroidSansMonoSlashed.zip
-cc891348632480dbf52f1d515059416bddf8433103904e4e6954b52089f7b736ed6b2c917d0f4d3f32348805a939aea1e5e014271c6aaf672c5800021039ffe3  DroidSansMonoDotted.zip
-96ddb50da19f4219544384417f9b8491e3e02ee1d922f475b2bcf13c38256d5ae0fc10b81e4d10ad0b6553430bf156e82ca2a7811b8e2a9c92bde2058e85c517  45-droid.conf
-07d4ab208c1c1dd4fe04f113daa5cb6361cf042eedade643f714b91ab77d3e1fa39f72db7b63cfcb8b69343e2f258920206d0f2ba204574f57292088e3a6e126  65-ttf-droid-sans.conf
-5257da5537202e742afb168dda000b41873cde45e49807546c3c09aca92fe2c83264a19c2f1835e449ef9c943bf0fdfa1d4020ec93d9b4ff9e505dc4cb7e2464  65-ttf-droid-serif.conf
-5ab9cb21e871be887060620061bafaf826cafca71fac8f58d6e63ea5be3af282ab138fbecc38ca3d4c48d58720bec407e179f804747b6c35c69b825d06ef035a  90-tt-droid.conf"
diff --git a/main/ttf-freefont/APKBUILD b/main/ttf-freefont/APKBUILD
deleted file mode 100644
index 910845f84c5..00000000000
--- a/main/ttf-freefont/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=ttf-freefont
-pkgver=20120503
-pkgrel=1
-pkgdesc="A set of free high-quality TrueType fonts covering the UCS character set"
-url="http://www.nongnu.org/freefont/"
-arch="noarch"
-license="GPL-3.0+ with exception"
-options="!check"  # No test suite.
-depends="fontconfig encodings mkfontdir mkfontscale"
-makedepends="font-util-dev"
-source="https://ftp.gnu.org/gnu/freefont/freefont-ttf-$pkgver.zip"
-builddir="$srcdir/freefont-$pkgver"
-
-build() {
-	return 0
-}
-
-package() {
-	cd "$builddir"
-	install -d "$pkgdir/usr/share/fonts/TTF"
-	install -m644 *.ttf "$pkgdir/usr/share/fonts/TTF/"
-	# Licensing exception is discussed in README in pkgver==20120503
-	install -Dm644 README "$pkgdir/usr/share/licenses/$pkgname/README"
-}
-
-sha512sums="dcd6f525e8f97631c6f84ab4cc2a31af4614dcdb9a4d434bd890baf18e0c2934032f2915384fc27fbecf60d259d792e48f52d357b07e3ed2616d3c8c3544268e  freefont-ttf-20120503.zip"
diff --git a/main/ttf-liberation/90-tt-liberation.conf b/main/ttf-liberation/90-tt-liberation.conf
deleted file mode 100644
index b31837d251f..00000000000
--- a/main/ttf-liberation/90-tt-liberation.conf
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
-<fontconfig>
-
-  <!-- Liberation Mono -->
-  <match target="font">
-    <test name="force_autohint">
-      <bool>false</bool>
-    </test>
-    <test name="family">
-      <string>Liberation Mono</string>
-    </test>
-    <edit name="antialias" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hinting" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hintstyle" mode="assign">
-      <const>hintslight</const>
-    </edit>
-    <edit name="autohint" mode="assign">
-      <bool>false</bool>
-    </edit>
-  </match>
-
-  <match target="font">
-    <test name="force_autohint">
-      <bool>false</bool>
-    </test>
-    <test name="family">
-      <string>Liberation Mono</string>
-    </test>
-    <test name="pixelsize" compare="more">
-      <double>10.5</double>
-    </test>
-    <test name="pixelsize" compare="less">
-      <double>13.5</double>
-    </test>
-    <edit name="autohint" mode="assign">
-      <bool>false</bool>
-    </edit>
-    <edit name="antialias" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hinting" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hintstyle" mode="assign">
-      <const>hintfull</const>
-    </edit>
-  </match>
-
-  <match target="font">
-    <test name="force_autohint">
-      <bool>false</bool>
-    </test>
-    <test name="family">
-      <string>Liberation Mono</string>
-    </test>
-    <test name="pixelsize" compare="more">
-      <double>15.5</double>
-    </test>
-    <test name="pixelsize" compare="less">
-      <double>17.5</double>
-    </test>
-    <edit name="autohint" mode="assign">
-      <bool>false</bool>
-    </edit>
-    <edit name="antialias" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hinting" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hintstyle" mode="assign">
-      <const>hintfull</const>
-    </edit>
-  </match>
-
-  <match target="font">
-    <test name="force_autohint">
-      <bool>false</bool>
-    </test>
-    <test name="family">
-      <string>Liberation Mono</string>
-    </test>
-    <test name="pixelsize" compare="more">
-      <double>19.5</double>
-    </test>
-    <test name="pixelsize" compare="less">
-      <double>22.5</double>
-    </test>
-    <edit name="autohint" mode="assign">
-      <bool>false</bool>
-    </edit>
-    <edit name="antialias" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hinting" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hintstyle" mode="assign">
-      <const>hintfull</const>
-    </edit>
-  </match>
-
-  <match target="font">
-    <test name="family">
-      <string>Liberation Mono</string>
-    </test>
-    <test name="pixelsize" compare="less_eq">
-      <double>12.0</double>
-    </test>
-    <edit name="lcd_filter" mode="assign">
-      <const>lcdlegacy</const>
-    </edit>
-  </match>
-
-  <!-- Liberation Sans -->
-  <match target="font">
-    <test name="force_autohint">
-      <bool>false</bool>
-    </test>
-    <test name="family">
-      <string>Liberation Sans</string>
-    </test>
-    <edit name="antialias" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hinting" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hintstyle" mode="assign">
-      <const>hintslight</const>
-    </edit>
-    <edit name="autohint" mode="assign">
-      <bool>false</bool>
-    </edit>
-  </match>
-
-  <match target="font">
-    <test name="force_autohint">
-      <bool>false</bool>
-    </test>
-    <test name="family">
-      <string>Liberation Sans</string>
-    </test>
-    <test name="pixelsize" compare="less">
-      <double>12.5</double>
-    </test>
-    <edit name="autohint" mode="assign">
-      <bool>false</bool>
-    </edit>
-    <edit name="antialias" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hinting" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hintstyle" mode="assign">
-      <const>hintfull</const>
-    </edit>
-    <edit name="lcd_filter" mode="assign">
-      <const>lcdlegacy</const>
-    </edit>
-  </match>
-
-  <!-- Liberation Sans Narrow -->
-  <match target="font">
-    <test name="force_autohint">
-      <bool>false</bool>
-    </test>
-    <test name="family">
-      <string>Liberation Sans Narrow</string>
-    </test>
-    <edit name="antialias" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hinting" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hintstyle" mode="assign">
-      <const>hintslight</const>
-    </edit>
-    <edit name="autohint" mode="assign">
-      <bool>false</bool>
-    </edit>
-  </match>
-
-  <!-- Liberation Serif -->
-  <match target="font">
-    <test name="force_autohint">
-      <bool>false</bool>
-    </test>
-    <test name="family">
-      <string>Liberation Serif</string>
-    </test>
-    <edit name="antialias" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hinting" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hintstyle" mode="assign">
-      <const>hintslight</const>
-    </edit>
-    <edit name="autohint" mode="assign">
-      <bool>false</bool>
-    </edit>
-  </match>
-
-</fontconfig>
diff --git a/main/ttf-liberation/APKBUILD b/main/ttf-liberation/APKBUILD
deleted file mode 100644
index cf68609826b..00000000000
--- a/main/ttf-liberation/APKBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=ttf-liberation
-pkgver=2.00.5
-# Note: 2.00.0 onward releases does not includes Liberation Sans Narrow font due to licensing problems.
-# we use narrowver to grab older release which does include narrow fonts
-_narrowver=1.07.6
-pkgrel=0
-pkgdesc="Red Hat's Liberation fonts"
-url="https://pagure.io/liberation-fonts/"
-license="custom GPL-2.0"
-arch="noarch"
-depends="fontconfig"
-options="!check"
-# added fontconfig configuration from:
-# https://github.com/bohoomil/fontconfig-ultimate/tree/master/fontconfig_patches/fonts-settings
-source="
-	https://github.com/liberationfonts/liberation-fonts/files/2926169/liberation-fonts-ttf-$pkgver.tar.gz
-	https://github.com/liberationfonts/liberation-sans-narrow/files/2579431/liberation-narrow-fonts-ttf-$_narrowver.tar.gz
-	30-liberation-mono.conf
-	30-liberation-sans-narrow.conf
-	30-liberation-sans.conf
-	30-liberation-serif.conf
-	45-liberation.conf
-	90-tt-liberation.conf"
-
-package() {
-	mkdir -p "$pkgdir"/usr/share/fonts/$pkgname \
-		"$pkgdir"/etc/fonts/conf.avail \
-		"$pkgdir"/etc/fonts/conf.d
-
-	install -m644 "$srcdir"/liberation-narrow-fonts-ttf-$_narrowver/*.ttf \
-		"$pkgdir"/usr/share/fonts/$pkgname
-
-	install -m644 "$srcdir"/liberation-fonts-ttf-$pkgver/*.ttf \
-		"$pkgdir"/usr/share/fonts/$pkgname
-
-	for j in "$srcdir"/*.conf; do
-		install -m644 "$j" \
-			"$pkgdir"/etc/fonts/conf.avail/
-		cd "$pkgdir"/etc/fonts/conf.d
-		ln -sf /etc/fonts/conf.avail/${j##*/}
-	done
-}
-
-sha512sums="fc00494842475d040c01029b6fb134fec9a37516a5e8e1b9ba945a2b38fe2ef3df6a0acfc00dc024cf2019f1106092d063c8322eece1be1cf8690db4ed8a653f  liberation-fonts-ttf-2.00.5.tar.gz
-bea2b8af3eaf32cc57faf1a582fdbef0ba3f2d5c2d9615f3c83c6b5aaac37856a25147cab26c3b18c3dca1b109b2a853874f5876dd6ae614676db3118f1bb804  liberation-narrow-fonts-ttf-1.07.6.tar.gz
-585b74555132098d1d89b118b92fb843471ae2882622dec16178f8e7690fe6b5d8bf46e27e59fc3324aebfbd52a4b511d2ad77a8ddf8ef319cbe89b1a2dac91a  30-liberation-mono.conf
-cf017383d4390d52bef7c79abb2f48fc4440880ca03ee4dc11647ced524e45a944c4c3e3b318837bef9632b5aa1445e8f29e87f2ea195a8a47899cdeef67aae7  30-liberation-sans-narrow.conf
-4983c7be59b451d9f5aec7ca0502155ca0307cc8e8e96da02de36d4b665fd45834da359131f2bc83d579e586e0f1b2158fba0036f3c7c10f6d1ff34f0407c03b  30-liberation-sans.conf
-3d54b6e92159860f16fef48e342bb46badb17d43f0f818a100e5e2fb344da77d7dc999ae35a6986dbb202d4e4423a102f4e100d6f3d67a72e604538c63e44178  30-liberation-serif.conf
-f1fd84174404a7deaf519c1084f8f0a6ca411dcff18e095ac1fa866366c42222c0833c7381400db9a73b5a354019f7be22caac82d711215c376527ec9fa11922  45-liberation.conf
-a56f9758166963f7896811a4ced35be08285c444499991006998de52d8edc6d413588511a529938fe630ef224b921ce06cf2f56e2f4a2a160ec9805605c7d326  90-tt-liberation.conf"
diff --git a/main/ttf-linux-libertine/APKBUILD b/main/ttf-linux-libertine/APKBUILD
deleted file mode 100644
index d195d98cb75..00000000000
--- a/main/ttf-linux-libertine/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=ttf-linux-libertine
-pkgver=5.3.0
-_date="2012_07_02"
-pkgrel=0
-pkgdesc="Serif (Libertine) and Sans Serif (Biolinum) OpenType fonts with large Unicode coverage"
-url="http://linuxlibertine.sourceforge.net/"
-arch="noarch"
-license="GPL custom:OFL"
-makedepends=
-depends="fontconfig encodings mkfontdir mkfontscale"
-install=
-subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/project/linuxlibertine/linuxlibertine/$pkgver/LinLibertineTTF_${pkgver}_$_date.tgz"
-
-_builddir="$srcdir"
-build () {
-	return 0
-}
-
-package() {
-	cd "$_builddir"
-#	install -dm755 "${pkgdir}"/usr/share/fonts/OTF || return 1
-	install -dm755 "${pkgdir}"/usr/share/fonts/TTF || return 1
-	install -m644 *.ttf "${pkgdir}"/usr/share/fonts/TTF || return 1
-#	install -m644 *.otf "${pkgdir}"/usr/share/fonts/OTF || return 1
-#	install -D -m644 OFL.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE || return 1
-	install -D -m644 LICENCE.txt "$pkgdir"/usr/share/licenses/$pkgname/README || return 1
-}
-sha512sums="ea9af8d47d22e5f35be65fbae08c7230602a57abe6f39e9a63a5761a69e519fe4e4ac41b878764035fdf8a2c8ee855c0cb9b0077a216d8ba5a2ddf615913e273  LinLibertineTTF_5.3.0_2012_07_02.tgz"
diff --git a/main/ttf-ubuntu-font-family/45-ubuntu.conf b/main/ttf-ubuntu-font-family/45-ubuntu.conf
deleted file mode 100644
index d660f28d3d2..00000000000
--- a/main/ttf-ubuntu-font-family/45-ubuntu.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-  <alias>
-    <family>Ubuntu</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-
-  <alias>
-    <family>Ubuntu Condensed</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-
-  <alias>
-    <family>Ubuntu Mono</family>
-    <default>
-      <family>monospace</family>
-    </default>
-  </alias>
-
-</fontconfig>
diff --git a/main/ttf-ubuntu-font-family/90-tt-ubuntu.conf b/main/ttf-ubuntu-font-family/90-tt-ubuntu.conf
deleted file mode 100644
index 9ed867b65cf..00000000000
--- a/main/ttf-ubuntu-font-family/90-tt-ubuntu.conf
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
-<fontconfig>
-
-  <!-- Ubuntu -->
-  <match target="font">
-    <test name="force_autohint">
-      <bool>false</bool>
-    </test>
-    <test name="family">
-      <string>Ubuntu</string>
-    </test>
-    <edit name="antialias" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hinting" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hintstyle" mode="assign">
-      <const>hintslight</const>
-    </edit>
-    <edit name="autohint" mode="assign">
-      <bool>false</bool>
-    </edit>
-  </match>
-
-  <!-- Ubuntu Condensed -->
-  <match target="font">
-    <test name="force_autohint">
-      <bool>false</bool>
-    </test>
-    <test name="family">
-      <string>Ubuntu Condensed</string>
-    </test>
-    <edit name="antialias" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hinting" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hintstyle" mode="assign">
-      <const>hintslight</const>
-    </edit>
-    <edit name="autohint" mode="assign">
-      <bool>false</bool>
-    </edit>
-  </match>
-
-  <!-- Ubuntu Mono -->
-  <match target="font">
-    <test name="force_autohint">
-      <bool>false</bool>
-    </test>
-    <test name="family">
-      <string>Ubuntu Mono</string>
-    </test>
-    <edit name="antialias" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hinting" mode="assign">
-      <bool>true</bool>
-    </edit>
-    <edit name="hintstyle" mode="assign">
-      <const>hintslight</const>
-    </edit>
-    <edit name="autohint" mode="assign">
-      <bool>true</bool>
-    </edit>
-  </match>
-
-</fontconfig>
diff --git a/main/ttf-ubuntu-font-family/APKBUILD b/main/ttf-ubuntu-font-family/APKBUILD
deleted file mode 100644
index d8ea98f6e82..00000000000
--- a/main/ttf-ubuntu-font-family/APKBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor: 
-# Maintainer: 
-pkgname=ttf-ubuntu-font-family
-pkgver=0.83
-pkgrel=0
-pkgdesc="Ubuntu font family"
-url="http://font.ubuntu.com/"
-arch="noarch"
-license="Custom"
-depends=
-depends_dev=
-makedepends="$depends_dev"
-install=""
-subpackages=
-# added fontconfig configuration from:
-# https://github.com/bohoomil/fontconfig-ultimate/tree/master/fontconfig_patches/fonts-settings
-source="https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-${pkgver}.zip
-	45-ubuntu.conf
-	90-tt-ubuntu.conf"
-
-_builddir="${srcdir}/ubuntu-font-family-${pkgver}"
-
-package() {
-	cd "$_builddir"
-
-        mkdir -p "$pkgdir"/usr/share/fonts/$pkgname \
-                "$pkgdir"/etc/fonts/conf.avail \
-                "$pkgdir"/etc/fonts/conf.d
-
-	for i in "$_builddir"/*.ttf; do
-                install -m644 "$i" \
-                        "$pkgdir"/usr/share/fonts/$pkgname/ || return 1
-        done
-
-	for j in "$srcdir"/*.conf; do
-                install -m644 "$j" \
-                        "$pkgdir"/etc/fonts/conf.avail/ || return 1
-                cd "$pkgdir"/etc/fonts/conf.d
-                ln -sf /etc/fonts/conf.avail/${j##*/}
-        done
-
-}
-
-sha512sums="d9ab7afc8aab55810de6e403aa02c0118bb35d94844cc14bb07b71daef4c6d63a9c927f0e81a9f97d29904512d94fa0226fbff2341351ac000fc233d2dc55727  fad7939b-ubuntu-font-family-0.83.zip
-5aad0801ef01921750ced9003d8896a0a58e20ed164ea59207a71967a28af6d54c34fb7763838e0b73cf4b4b4b72f8ba7f551b800557b09d1e1e25df3d8d6252  45-ubuntu.conf
-c12eb45f2e5c1418ecd0f4e42f9c0c661134db2169f26b67ccd48e3524efda6e42cb192b6b9535b5f447cbe3a2ffb582229ed2789b6758d3ce98254bdc31fc8e  90-tt-ubuntu.conf"
diff --git a/main/tunnel/APKBUILD b/main/tunnel/APKBUILD
index ccbb3948bdb..9121a25bebe 100644
--- a/main/tunnel/APKBUILD
+++ b/main/tunnel/APKBUILD
@@ -1,18 +1,15 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
+# Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org>
 pkgname=tunnel
-pkgver=1.0
+pkgver=1.1
 pkgrel=0
 pkgdesc="Script for configuring tunnel interfaces"
-url=http://git.alpinelinux.org/cgit/aports/tree/testing/tunnel
+url="https://git.alpinelinux.org/aports/tree/main/tunnel"
 arch=noarch
-license=GPL-2
-depends=
-source=tunnel
-
-build() {
-	:
-}
+depends="/bin/sh"
+license="GPL-2.0-only"
+source="tunnel"
+options="!check"
 
 package() {
 	install -D -m 755 "$srcdir/tunnel" "$pkgdir/etc/network/if-pre-up.d/tunnel"
diff --git a/main/txt2man/APKBUILD b/main/txt2man/APKBUILD
deleted file mode 100644
index e183cfc3d0b..00000000000
--- a/main/txt2man/APKBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=txt2man
-pkgver=1.6.0
-pkgrel=0
-pkgdesc="Convert flat ASCII text to man page format"
-url="https://github.com/mvertes/txt2man"
-arch="noarch"
-license="GPL-2.0-or-later"
-depends="gawk"
-makedepends=
-subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/mvertes/$pkgname/archive/$pkgname-$pkgver.tar.gz
-	makefile.patch"
-
-builddir="$srcdir/$pkgname-$pkgname-$pkgver"
-
-package() {
-	make -C "$builddir" \
-		DESTDIR="$pkgdir" \
-		prefix=/usr \
-		mandir=/usr/share/man \
-		install || return 1
-}
-
-sha512sums="7ec2cc0bb685d890cf06504d4faacf7a02c5a321963effb71ff63b7310f64f092e666c055c1dbdb699958a62272fe4dc0f31f3947ca6895aa425753a11b75379  txt2man-1.6.0.tar.gz
-e91ad93ddd646b06cb75c26e666e5122934172d25513424f04b9f56ce9cd57f1327f9c53c3d59002d76765c272aced5d75e0b48318d3b82d447560c3a031ef58  makefile.patch"
diff --git a/main/txt2man/makefile.patch b/main/txt2man/makefile.patch
deleted file mode 100644
index 47e99e4421b..00000000000
--- a/main/txt2man/makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./Makefile.orig
-+++ ./Makefile
-@@ -1,5 +1,7 @@
- # Makefile
- prefix ?= /usr/local
-+bindir ?= $(prefix)/bin
-+mandir ?= $(prefix)/share/man
- version = txt2man-1.6.0
- BIN = src2man bookman txt2man
- MAN1 = src2man.1 txt2man.1 bookman.1
-@@ -7,9 +9,9 @@
- all: $(MAN1)
- 
- install: $(MAN1)
--	mkdir -p $(prefix)/bin $(prefix)/share/man/man1
--	cp $(BIN) $(prefix)/bin/
--	cp $(MAN1) $(prefix)/share/man/man1
-+	mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
-+	cp $(BIN) $(DESTDIR)$(bindir)
-+	cp $(MAN1) $(DESTDIR)$(mandir)/man1
- 
- clean:
- 	rm -f *.1 *.txt *.ps *.pdf *.html
diff --git a/main/tzdata/APKBUILD b/main/tzdata/APKBUILD
index f971dc226e1..1364c0600c8 100644
--- a/main/tzdata/APKBUILD
+++ b/main/tzdata/APKBUILD
@@ -1,64 +1,70 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Ariadne Conill <ariadne@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tzdata
-pkgver=2019c
-_tzcodever=2019c
+pkgver=2024a
+_tzcodever=$pkgver
 _ptzver=0.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Timezone data"
 url="https://www.iana.org/time-zones"
 arch="all"
 license="Public-Domain"
-depends=""
-depends_dev=""
-makedepends=""
-install=""
-subpackages="$pkgname-doc"
+subpackages="$pkgname-right $pkgname-doc $pkgname-utils"
 source="https://www.iana.org/time-zones/repository/releases/tzcode$_tzcodever.tar.gz
 	https://www.iana.org/time-zones/repository/releases/tzdata$pkgver.tar.gz
 	https://dev.alpinelinux.org/archive/posixtz/posixtz-$_ptzver.tar.xz
 
 	0001-posixtz-ensure-the-file-offset-we-pass-to-lseek-is-o.patch
-	0002-fix-implicit-declaration-warnings-by-including-strin.patch"
+	0002-fix-implicit-declaration-warnings-by-including-strin.patch
+	"
 
 builddir="$srcdir"
 _timezones="africa antarctica asia australasia europe northamerica \
-	southamerica pacificnew etcetera backward systemv factory"
+	southamerica etcetera backward factory"
 options="!check" # Testsuite require nsgmls (SP)
 
 build() {
-	cd "$builddir"
-	make cc="${CC:-gcc}" CFLAGS="$CFLAGS -DHAVE_STDINT_H=1"
+	make cc="${CC:-gcc}" CFLAGS="$CFLAGS -DHAVE_STDINT_H=1" \
 		TZDIR="/usr/share/zoneinfo"
 
 	cd "$builddir"/posixtz-$_ptzver
 	make posixtz
 }
 
-package() {
-	cd "$builddir"
+utils() {
+	amove usr/bin
+	amove usr/sbin
+}
 
-	./zic -y ./yearistype -d "$pkgdir"/usr/share/zoneinfo ${_timezones}
-	./zic -y ./yearistype -d "$pkgdir"/usr/share/zoneinfo/right -L leapseconds ${_timezones}
-	#./zic -y ./yearistype -d "$pkgdir"/usr/share/zoneinfo/posix ${_timezones}
+package() {
+	./zic -b fat -y ./yearistype -d "$pkgdir"/usr/share/zoneinfo $_timezones
+	./zic -b fat -y ./yearistype -d "$pkgdir"/usr/share/zoneinfo/right -L leapseconds $_timezones
+	#./zic -b fat -y ./yearistype -d "$pkgdir"/usr/share/zoneinfo/posix $_timezones
 
-	./zic -y ./yearistype -d "$pkgdir"/usr/share/zoneinfo -p America/New_York
+	./zic -b fat -y ./yearistype -d "$pkgdir"/usr/share/zoneinfo -p America/New_York
 	install -m444 -t "$pkgdir"/usr/share/zoneinfo iso3166.tab zone1970.tab zone.tab
 
-	mkdir -p "$pkgdir"/usr/sbin
-	install -m755 zic zdump "$pkgdir"/usr/sbin
+	install -Dm755 -t "$pkgdir"/usr/sbin zic zdump
 
-	mkdir -p "$pkgdir"/usr/share/man/man8
-	install -m644 zic.8 zdump.8 "$pkgdir"/usr/share/man/man8
+	install -Dm644 -t "$pkgdir"/usr/share/man/man8 zic.8 zdump.8
 
 	rm -f "$pkgdir"/usr/share/zoneinfo/localtime
-	install -Dm755 "$srcdir"/posixtz-$_ptzver/posixtz \
-		"$pkgdir"/usr/bin/posixtz
+	install -Dm755 -t "$pkgdir"/usr/bin "$srcdir"/posixtz-$_ptzver/posixtz
+
+	install -Dm644 -t "$pkgdir"/usr/share/zoneinfo "$srcdir"/leap-seconds.list
+}
+
+right() {
+	pkgdesc="Timezone data for TAI-10 system clock"
+	amove usr/share/zoneinfo/right
 }
 
-sha512sums="61ef36385f501c338c263081486de0d1fccd454b86f8777b0dbad4ea3f21bbde059d0a91c23e207b167ed013127d3db8b7528f0188814a8b44d1f946b19d9b8b  tzcode2019c.tar.gz
-2921cbb2fd44a6b8f7f2ed42c13fbae28195aa5c2eeefa70396bc97cdbaad679c6cc3c143da82cca5b0279065c02389e9af536904288c12886bf345baa8c6565  tzdata2019c.tar.gz
+sha512sums="
+46da8bfa762c7d109db93e5c060789097fc0e1e38bdad5bb8fec886ef47f138bd03b913a743cd5f7e23dc359a72bfd63e7ffc0de199d2b51e6a174361dbdc43c  tzcode2024a.tar.gz
+1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236  tzdata2024a.tar.gz
 68dbaab9f4aef166ac2f2d40b49366527b840bebe17a47599fe38345835e4adb8a767910745ece9c384b57af815a871243c3e261a29f41d71f8054df3061b3fd  posixtz-0.5.tar.xz
 0f2a10ee2bb4007f57b59123d1a0b8ef6accf99e568f21537f0bb19f290fff46e24050f55f12569d7787be600e1b62aa790ea85a333153f3ea081a812c81b1b5  0001-posixtz-ensure-the-file-offset-we-pass-to-lseek-is-o.patch
-fb322ab7867517ba39265d56d3576cbcea107c205d524e87015c1819bbb7361f7322232ee3b86ea9b8df2886e7e06a6424e3ac83b2006be290a33856c7d40ac4  0002-fix-implicit-declaration-warnings-by-including-strin.patch"
+fb322ab7867517ba39265d56d3576cbcea107c205d524e87015c1819bbb7361f7322232ee3b86ea9b8df2886e7e06a6424e3ac83b2006be290a33856c7d40ac4  0002-fix-implicit-declaration-warnings-by-including-strin.patch
+"
diff --git a/main/u-boot/APKBUILD b/main/u-boot/APKBUILD
index 4aa36df3d1d..f49183a662c 100644
--- a/main/u-boot/APKBUILD
+++ b/main/u-boot/APKBUILD
@@ -1,53 +1,89 @@
 # Contributor: He Yangxuan <yangxuan8282@gmail.com>
 # Contributor: Timo Teras <timo.teras@iki.fi>
-# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
+# Maintainer: Milan P. Stanić <mps@arvanta.net>
 pkgname=u-boot
-pkgver=2020.01
-pkgrel=0
+pkgver=2024.04
+pkgrel=1
 pkgdesc="u-boot bootloader common files"
-url="http://www.denx.de/wiki/U-Boot/"
-arch="armhf armv7 aarch64"
-license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause eCos-2.0 IBM-pibs
+url="https://www.denx.de/wiki/U-Boot/"
+arch="all !s390x !ppc64le"
+license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause WITH eCos-exception-2.0 IBM-pibs
 	ISC LGPL-2.0-only LGPL-2.1-only X11"
-makedepends="$depends_dev bc dtc python3-dev swig bison flex openssl-dev"
+options="!check" # no tests
+makedepends="
+	bc
+	bison
+	dtc
+	flex
+	gnutls-dev
+	linux-headers
+	openssl-dev
+	py3-elftools
+	py3-setuptools
+	python3-dev
+	swig
+	util-linux-dev
+	"
 if [ "$CARCH" = "aarch64" ]; then
-	makedepends="$makedepends arm-trusted-firmware-sun50i"
+	makedepends="$makedepends arm-trusted-firmware"
 fi
-source="ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver//_/-}.tar.bz2
+source="https://ftp.denx.de/pub/u-boot/u-boot-${pkgver//_/-}.tar.bz2
 	README.txt
 	update-u-boot
+	fix-tools-build.patch
 	"
 builddir="$srcdir"/u-boot-${pkgver//_/-}
 
+if [ "$CARCH" = "riscv64" ]; then
+	makedepends="$makedepends opensbi"
+	export OPENSBI=/usr/share/opensbi/generic/firmware/fw_dynamic.bin
+fi
+
+# secfixes:
+#   2021.04-r0:
+#     - CVE-2021-27097
+#     - CVE-2021-27138
+
 case "$CARCH" in
 arm*) board_configs="
 	beagleboard:am335x_boneblack_vboot
-	cubieboard:Cubieboard,Cubieboard2
-	leemaker:Bananapi,Lamobo_R1
 	linksprite:Linksprite_pcDuino3_Nano
 	cuboxi:mx6cuboxi
 	raspberrypi:rpi_0_w,rpi,rpi_2,rpi_3_32b
 	wandboard:wandboard
 	qemu:qemu_arm
+	odroid:odroid,odroid-xu3
+	sunxi:LicheePi_Zero,Bananapi,Lamobo_R1,Cubieboard,Cubieboard2,orangepi_pc
 	";;
 aarch64) board_configs="
 	thunderx:thunderx_88xx
-	raspberrypi:rpi_3
-	odroid:odroid-c2
+	raspberrypi:rpi_3,rpi_arm64
+	odroid:odroid-c2,odroid-n2
+	snapdragon:starqltechn
+	exynos:a3y17lte,a5y17lte,a7y17lte
 	libretech:libretech-cc
+	rockchip:rockpro64-rk3399,roc-pc-rk3399,roc-cc-rk3328,pinebook-pro-rk3399
 	qemu:qemu_arm64
-	pine64:pine64-lts
+	sunxi:pine64-lts,pinebook,orangepi_3,teres_i,a64-olinuxino,a64-olinuxino-emmc,nanopi_neo2,pine64_plus
+	";;
+riscv64) board_configs="
+	qemu:qemu-riscv64,qemu-riscv64_smode
+	unleashed:sifive_unleashed
+	unmatched:sifive_unmatched
+	starfive:starfive_visionfive2
 	";;
 esac
 
-_allboards=""
 for board_config in $board_configs; do
 	_allboards="$_allboards $pkgname-${board_config%%:*}"
 done
-subpackages="$pkgname-all:_all $_allboards"
+
+subpackages="$_allboards $pkgname-tools"
+case "$CARCH" in
+	arm*|aarch64|riscv64) subpackages="$pkgname-all:_all $_allboards $pkgname-tools";;
+esac
 
 build() {
-	cd "$builddir"
 	touch include/config.h
 	LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > include/timestamp_autogenerated.h
 	LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> include/timestamp_autogenerated.h
@@ -59,24 +95,55 @@ build() {
 			msg "Building u-boot for $board"
 
 			case "$board" in
-				"pine64-lts")
-					export BL31="/usr/share/arm-trusted-firmware-sun50i/bl31.bin"
-					;;
+				"pine64-lts"|"pinebook"|"teres_i"|"a64-olinuxino"|"a64-olinuxino-emmc"|"pine64_plus")
+					export BL31="/usr/share/arm-trusted-firmware/sun50i_a64/bl31.bin"
+					export SCP=/dev/null;;
+				"orangepi_3")
+					export BL31="/usr/share/arm-trusted-firmware/sun50i_h6/bl31.bin";;
+				"pinebook-pro-rk3399"|"rockpro64-rk3399"|"roc-pc-rk3399")
+					export BL31="/usr/share/arm-trusted-firmware/rk3399/bl31.elf";;
+				"roc-cc-rk3328")
+					export BL31="/usr/share/arm-trusted-firmware/rk3328/bl31.elf";;
 			esac
 
 			export BUILD_DIR="$builddir"/build/$board
 			mkdir -p "$BUILD_DIR"
-			make O="$BUILD_DIR" ${board}_config || return 1
-			make O="$BUILD_DIR" all || return 1
+			make O="$BUILD_DIR" ${board}_config
+			make O="$BUILD_DIR" all
 		done
 	done
+	msg "Building u-boot-tools"
+	make tools-only_defconfig
+	make tools-all
 }
 
 package() {
+	case "$CARCH" in
+		mips64|x86*) return;;
+	esac
 	cd "$builddir"/build
 	mkdir -p "$pkgdir"/usr/share/$pkgname "$pkgdir"/usr/sbin
-	install "$srcdir"/README.txt "$pkgdir"/usr/share/$pkgname/README.txt || return 1
-	install "$srcdir"/update-u-boot "$pkgdir"/usr/sbin || return 1
+	install "$srcdir"/README.txt "$pkgdir"/usr/share/$pkgname/README.txt
+	install "$srcdir"/update-u-boot "$pkgdir"/usr/sbin
+}
+
+tools() {
+	pkgdesc="u-boot bootloader utility tools"
+	provides="uboot-tools"
+	replaces="uboot-tools"
+	mkdir -p $pkgdir
+	mkdir $subpkgdir
+	cd "$builddir"
+	for tool in dumpimage env/fw_printenv \
+		fit_check_sign fit_info gdb/gdbcont gdb/gdbsend gen_eth_addr img2srec \
+		mkenvimage mkimage ncb proftool; do
+		install -D tools/$tool \
+		$subpkgdir/usr/bin/"$(basename $tool)"
+		done
+	install -Dm644 tools/env/fw_env.config \
+		"$subpkgdir/usr/share/doc/$pkgname/examples/fw_env.config"
+	cd "$subpkgdir"/usr/bin
+	ln -sf fw_printenv fw_setenv
 }
 
 _all() {
@@ -96,28 +163,39 @@ _split_boards() {
 		msg "Including board $board"
 		mkdir -p "$subpkgdir"/usr/share/$pkgname/$board
 		export BUILD_DIR="$builddir"/build/$board
+
+		local board_images=""
+		case "$board" in
+			"sifive_unleashed") board_images="u-boot.itb spl/u-boot-spl.bin --" ;;
+			"sifive_unmatched") board_images="u-boot.itb spl/u-boot-spl.bin --" ;;
+			"starfive_visionfive2") board_images="u-boot.itb spl/u-boot-spl.bin.normal.out --" ;;
+			"pinebook-pro-rk3399"|"rockpro64-rk3399"|"roc-pc-rk3399"|"roc-cc-rk3328") board_images="u-boot-rockchip.bin --" ;;
+		esac
+
 		local ok=no
-		for image in u-boot-sunxi-with-spl.bin -- MLO SPL u-boot.img -- u-boot.bin; do
+		for image in $board_images u-boot-sunxi-with-spl.bin -- MLO SPL u-boot.img -- u-boot.bin; do
 			if [ "$image" = "--" ]; then
 				[ "$ok" = yes ] && break
 				continue
 			fi
 			if [ -e "$BUILD_DIR"/$image ]; then
-				cp "$BUILD_DIR"/$image "$subpkgdir"/usr/share/$pkgname/$board \
-					|| return 1
+				cp "$BUILD_DIR"/$image "$subpkgdir"/usr/share/$pkgname/$board
 				ok=yes
 			fi
 		done
-		[ "$ok" = yes ] || return 1
+		[ "$ok" = yes ] || return
 	done
 }
 
 for board_config in $board_configs; do
 	_board="${board_config%%:*}"
 	_configs="${board_config#*:}"
-	eval "${_board}() { _split_boards $_board ${_configs//,/ }; }"
+	eval "$_board() { _split_boards $_board ${_configs//,/ }; }"
 done
 
-sha512sums="073d4e0234095c1bda1ffa7a648972aa4530d106ee1a73035e0501b1aba2951653582c8b7bcf338d4e95012fa67e75f97b7e1fbac5cc764d609b671ef29617f7  u-boot-2020.01.tar.bz2
+sha512sums="
+a71270302b38e9e68a83b3acdf8f7635f72d9fa75169e3c2241cdfa21eab834b8f25dfd35c281191bccb2fcec1e86d6b64afcf1d2ed5cd4fdc02258cd75fc236  u-boot-2024.04.tar.bz2
 f8c9bb6e84d6f0620c976ac7ad5dd7ec7ff9dfdd4b1d03d2bf6653e7beccf80bdf2debfc92fb1f696dba92fb40287d3c45897e0078951451d0835cb61a5f16d1  README.txt
-b3b4fb70c4eea2034bae45c513bca7b738be7507b46d3f2d62b31c794cd238d492acf960c95078cb1c945520debd5d2762103df7cef0fc36acfe9ff9a94549fc  update-u-boot"
+6cf882785fa12abcfdfa82119f6a3446229bc75f4c19d5751676625dda81df5ca428c2b631187ecbc39261b081b1a8b53bceeac9f43a3229f7610abc4d9862a2  update-u-boot
+83fc42c698f8236ba1f7d71383863e0bda255ada85bb885856a24b2036944d230d918a9d965d5ff90720726c9ee85ffda5e88eefc27b94ef9e7b4f456dcfb195  fix-tools-build.patch
+"
diff --git a/main/u-boot/fix-tools-build.patch b/main/u-boot/fix-tools-build.patch
new file mode 100644
index 00000000000..f2606d5a345
--- /dev/null
+++ b/main/u-boot/fix-tools-build.patch
@@ -0,0 +1,17 @@
+Author: Milan P. Stanić <mps@arvanta.net>
+Date: 2023-04-04 10:07:00.033003320 +0200
+
+musl libc doesn't have c_ospeed and c_ispeed types so disable
+build of kwboot with this patch
+
+--- a/tools/Makefile	2023-04-04 10:07:00.033003320 +0200
++++ b/tools/Makefile	2023-04-04 10:07:26.345003333 +0200
+@@ -213,8 +213,6 @@
+ 
+ hostprogs-$(CONFIG_NETCONSOLE) += ncb
+ 
+-hostprogs-$(CONFIG_ARCH_KIRKWOOD) += kwboot
+-hostprogs-$(CONFIG_ARCH_MVEBU) += kwboot
+ 
+ hostprogs-y += proftool
+ proftool-objs = proftool.o lib/abuf.o
diff --git a/main/u-boot/update-u-boot b/main/u-boot/update-u-boot
index b012b5fedfa..bfef80a2da9 100755
--- a/main/u-boot/update-u-boot
+++ b/main/u-boot/update-u-boot
@@ -10,13 +10,16 @@ get_defaults() {
 	if [ -z "$board" -a -e /sys/firmware/devicetree/base/compatible ]; then
 		case "$(cat /sys/firmware/devicetree/base/compatible 2>/dev/null)" in
 		wand,*) board=wand ;;
+		pine64,pine64-plus*) board=pine64_plus ;;
+		pine64,pinebook-pro*) board=pinebook-pro-rk3399 ;;
 		esac
 	fi
 
 	if [ -z "$device" ]; then
 		case "$board" in
 		wand|cubie|cubie2) device=/dev/mmcblk0p0 ;;
-		mx6cuboxi) device=/dev/mmcblk0 ;;
+		pinebook-pro-rk3399) device=/dev/mmcblk2 ;;
+		mx6cuboxi|*rk33*|pine64_plus) device=/dev/mmcblk0 ;;
 		esac
 	fi
 
@@ -39,7 +42,7 @@ usage: $0 [-b|--board <board-type>] [-d|--device <device>]
 
 options:
 
- -b,--board <board>       Specify the board type: wand, cubie, cubie2, cuboxi
+ -b,--board <board>       Specify the board type: wand, cubie, cubie2, cuboxi, pine64-lts, etc.
                           (current default: ${board:-none})
 
  -d,--device <device>     Specify the device where to install u-boot
@@ -62,6 +65,7 @@ while [ $# -gt 0 ]; do
 		wand|wandboard) board="wand" ;;
 		cubie|cubieboard) board="cubie" ;;
 		cuboxi|mx6cuboxi) board="mx6cuboxi" ;;
+		pine64-lts|pinebook|orangepi_3|teres_i|a64-olinuxino|a64-olinuxino-emmc|nanopi_neo2|*rk33*|pine64_plus) board="$1" ;;
 		*) usage; exit 1;;
 		esac
 		shift
@@ -115,6 +119,16 @@ mx6cuboxi)
 	$dryrun dd if=$imagedir/mx6cuboxi/SPL of=$device bs=1k seek=1 status=none
 	$dryrun dd if=$imagedir/mx6cuboxi/u-boot.img of=$device bs=1k seek=69 status=none
 	;;
+pine64-lts|pinebook|orangepi_3|teres_i|a64-olinuxino|a64-olinuxino-emmc|nanopi_neo2|pine64_plus)
+	[ -e "$imagedir/$board" ] || die "sunxi images not installed, apk add u-boot-sunxi"
+	$dryrun dd if=$imagedir/$board/u-boot-sunxi-with-spl.bin of=$device bs=1k seek=8 status=none
+	;;
+*rk33*)
+	[ -e "$imagedir/$board" ] || die "$board images not installed, apk add u-boot-$board"
+
+	echo "Writing u-boot image"
+	$dryrun dd conv=notrunc if=$imagedir/$board/u-boot-rockchip.bin of=$device seek=64
+	;;
 esac
 $dryrun sync
 ) || die "U-Boot installation in $device failed"
diff --git a/main/uboot-tools/APKBUILD b/main/uboot-tools/APKBUILD
deleted file mode 100644
index 3c87c1ac166..00000000000
--- a/main/uboot-tools/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Fathi Boudra <fathi.boudra@linaro.org>
-pkgname=uboot-tools
-pkgver=2020.01
-pkgrel=0
-pkgdesc="U-Boot bootloader utility tools"
-url="https://www.denx.de/wiki/U-Boot/WebHome"
-arch="all !s390x !ppc64le"
-license="GPL"
-makedepends="$depends_dev bison flex openssl-dev linux-headers"
-subpackages="$pkgname-examples"
-options="!check" # No test suite
-source="http://ftp.denx.de/pub/u-boot/u-boot-$pkgver.tar.bz2
-	fix-ulong-typedef.patch
-	defang-efi-bootcmd.patch
-	"
-builddir="$srcdir/u-boot-$pkgver"
-
-build() {
-	cd "$builddir"
-	make defconfig
-	make tools-all
-}
-
-examples() {
-	mkdir -p "${subpkgdir}/usr/share/doc/${pkgname}"
-	mv "${pkgdir}/usr/share/doc/${pkgname}/examples/" \
-	   "${subpkgdir}/usr/share/doc/${pkgname}"
-}
-
-package() {
-	cd "$builddir"
-	for tool in bmp_logo dumpimage env/fw_printenv \
-		fit_check_sign fit_info gdb/gdbcont gdb/gdbsend gen_eth_addr img2srec \
-		mkenvimage mkimage ncb proftool ubsha1 xway-swap-bytes env/fw_printenv; do
-			install -D tools/$tool \
-				$pkgdir/usr/bin/$(basename $tool)
-	done
-	install -Dm644 tools/env/fw_env.config \
-	        "${pkgdir}/usr/share/doc/${pkgname}/examples/fw_env.config"
-	cd "$pkgdir"/usr/bin
-	ln -sf fw_printenv fw_setenv
-}
-
-sha512sums="073d4e0234095c1bda1ffa7a648972aa4530d106ee1a73035e0501b1aba2951653582c8b7bcf338d4e95012fa67e75f97b7e1fbac5cc764d609b671ef29617f7  u-boot-2020.01.tar.bz2
-813dd152afa8863d3c7456449c9b0b358232edae7c8575ebe4af71bfe74019d4c27f30dc6fcf307018e36f5afdaf7de32253c0a773955d5be74c625ddd5668c7  fix-ulong-typedef.patch
-ae4fa0a1e11fe862fc30d78d52616ede65b87893e656d7bca0c3e269d744ed477a23185f1d61e91e9beb765c5bafcbcba65699ca9835a516637098ef332644df  defang-efi-bootcmd.patch"
diff --git a/main/uboot-tools/defang-efi-bootcmd.patch b/main/uboot-tools/defang-efi-bootcmd.patch
deleted file mode 100644
index 74182fdd10c..00000000000
--- a/main/uboot-tools/defang-efi-bootcmd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN u-boot-2019.10.orig/include/config_distro_bootcmd.h u-boot-2019.10/include/config_distro_bootcmd.h
---- u-boot-2019.10.orig/include/config_distro_bootcmd.h	2020-01-08 00:18:39.088623768 +0000
-+++ u-boot-2019.10/include/config_distro_bootcmd.h	2020-01-08 00:19:27.963822184 +0000
-@@ -328,7 +328,8 @@
- #define BOOTENV_EFI_PXE_ARCH "0x1b"
- #define BOOTENV_EFI_PXE_VCI "PXEClient:Arch:00027:UNDI:003000"
- #elif defined(CONFIG_SANDBOX)
--# error "sandbox EFI support is only supported on ARM and x86"
-+#define BOOTENV_EFI_PXE_ARCH "0x0"
-+#define BOOTENV_EFI_PXE_VCI "PXEClient:Arch:00000:UNDI:003000"
- #else
- #error Please specify an EFI client identifier
- #endif
diff --git a/main/uboot-tools/fix-ulong-typedef.patch b/main/uboot-tools/fix-ulong-typedef.patch
deleted file mode 100644
index a02e4d0a350..00000000000
--- a/main/uboot-tools/fix-ulong-typedef.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/include/env.h	2019-10-07 23:14:02.000000000 +0200
-+++ b/include/env.h	2019-10-24 21:26:07.487200839 +0200
-@@ -13,6 +13,7 @@
- #include <stdbool.h>
- #include <linux/types.h>
- 
-+typedef unsigned long ulong;
- struct environment_s;
- 
- /* Value for environment validity */
diff --git a/main/ucarp/APKBUILD b/main/ucarp/APKBUILD
index 19ed70953ad..b74ccf64a41 100644
--- a/main/ucarp/APKBUILD
+++ b/main/ucarp/APKBUILD
@@ -2,31 +2,30 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ucarp
 pkgver=1.5.2
-pkgrel=7
+pkgrel=11
 pkgdesc="Share common IP and do fail over"
-url="http://www.ucarp.org"
+url="https://download.pureftpd.org/ucarp/README"
 arch="all"
-license="BSD"
-depends=""
+license="ISC"
 makedepends="libpcap-dev"
-install=""
-subpackages=""
-source="https://download.pureftpd.org/pub/ucarp/$pkgname-$pkgver.tar.gz
+subpackages="$pkgname-openrc"
+source="https://download.pureftpd.org/pub/ucarp/ucarp-$pkgver.tar.gz
 	ucarp.initd
 	ucarp.confd
 	vip-up-default.sh
 	vip-down-default.sh
 	"
+options="!check"
 
-_builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
-	cd "$_builddir"
+	default_prepare
 	find -name config.sub | xargs chmod u+w
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
+	# Workaround for gcc-10
+	CFLAGS="$CFLAGS -fcommon" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -34,19 +33,17 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-nls \
-		|| return 1
-	make || return 1
+		--disable-nls
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 	install -d "$pkgdir"/etc/ucarp
 	for i in vip-up-default.sh vip-down-default.sh; do
-		install -m755 -D "$srcdir"/$i "$pkgdir"/etc/ucarp/$i || return 1
+		install -m755 -D "$srcdir"/$i "$pkgdir"/etc/ucarp/$i
 	done
 }
 
diff --git a/main/udev-init-scripts/APKBUILD b/main/udev-init-scripts/APKBUILD
index 41708c925f5..5aa1cc1634b 100644
--- a/main/udev-init-scripts/APKBUILD
+++ b/main/udev-init-scripts/APKBUILD
@@ -1,30 +1,35 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=udev-init-scripts
-pkgver=33
-pkgrel=0
+pkgver=35
+pkgrel=1
 pkgdesc="udev startup scripts for openrc"
 url="https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-fs/udev-init-scripts"
 arch="noarch"
-options="!check"
+options="!check" # They are only scripts
 license="GPL-2.0-only"
 replaces="udev"
 subpackages="$pkgname-openrc"
-install="$pkgname.post-install $pkgname.post-upgrade"
 source="https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/snapshot/udev-gentoo-scripts-$pkgver.tar.gz
-	$pkgname.patch
+	modloop.patch
 	"
 builddir="$srcdir/udev-gentoo-scripts-$pkgver"
 
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="2119aace937da02f47a5adc9af720587d25c2852cf70a9bcb04138e3ee511308c8f30cf0301fbec58cf0432b7fd6672ae6a02d1740c774703959197b3511fbcc  udev-gentoo-scripts-33.tar.gz
-8f4ca4b0c7e2e51ff2e88ea724b55fe3178e5a72dfa8f0624aef5946f95f1b690f517be913bf295462866faa0085dbfac2d024982514a9d1d976ab8b79d29e06  udev-init-scripts.patch"
+openrc() {
+	provides="dev-openrc"
+	provider_priority=10
+	default_openrc
+}
+
+sha512sums="
+da9d2093149967e2e1b9bc7190ddfd55a87c9ae2177e3216f7cb2694fc9b64037eb6f2599ad8a4b7594ef32ced88fbb319c92904bc72a81ea5404945f8a8378a  udev-gentoo-scripts-35.tar.gz
+d68def2429e68dadae1c8f2c4f76207a5b21ef98f755792f2033695af9d28ae555588d02033179340edd4ce0de0436dbaf30f0e7ccd59ea0444ddb7c2a5495d0  modloop.patch
+"
diff --git a/main/udev-init-scripts/modloop.patch b/main/udev-init-scripts/modloop.patch
new file mode 100644
index 00000000000..7be6b03932e
--- /dev/null
+++ b/main/udev-init-scripts/modloop.patch
@@ -0,0 +1,12 @@
+diff --git a/init.d/udev b/init.d/udev
+index 724cb82..8c730e4 100644
+--- a/init.d/udev
++++ b/init.d/udev
+@@ -11,6 +11,7 @@ description_reload="Reload the udev rules and databases"
+ 
+ depend() {
+ 	need sysfs dev-mount
++	use modloop
+ 	before checkfs fsck
+ 	keyword -containers
+ }
diff --git a/main/udev-init-scripts/udev-init-scripts.patch b/main/udev-init-scripts/udev-init-scripts.patch
deleted file mode 100644
index d53b7d3fd71..00000000000
--- a/main/udev-init-scripts/udev-init-scripts.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/init.d/udev
-+++ b/init.d/udev
-@@ -9,9 +9,11 @@
- 
- depend()
- {
-+	use modloop
- 	need sysfs dev-mount
- 	before checkfs fsck
- 	keyword -lxc -systemd-nspawn -vserver
-+	provide dev
- }
- 
- get_udevd_binary() {
diff --git a/main/udev-init-scripts/udev-init-scripts.post-install b/main/udev-init-scripts/udev-init-scripts.post-install
deleted file mode 100644
index 0cc44989f8e..00000000000
--- a/main/udev-init-scripts/udev-init-scripts.post-install
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if ! [ -e /etc/runlevels/sysinit/udev ]; then
-	exit 0
-fi
-
-if ! [ /etc/runlevels/sysinit/udev-trigger ]; then
-	ln -s /etc/init.d/udev-trigger /etc/runlevels/sysinit/udev-trigger
-fi
-
diff --git a/main/udev-init-scripts/udev-init-scripts.post-upgrade b/main/udev-init-scripts/udev-init-scripts.post-upgrade
deleted file mode 120000
index 0b54cffe15f..00000000000
--- a/main/udev-init-scripts/udev-init-scripts.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-udev-init-scripts.post-install
\ No newline at end of file
diff --git a/main/udns/APKBUILD b/main/udns/APKBUILD
index 29d30b20dd7..38e83ba928f 100644
--- a/main/udns/APKBUILD
+++ b/main/udns/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=udns
-pkgver=0.4
-pkgrel=1
+pkgver=0.5
+pkgrel=0
 pkgdesc="DNS Resolver Library"
 options="!check" # No testsuite
 url="http://www.corpit.ru/mjt/udns.html"
 arch="all"
 license="LGPL-2.1-or-later"
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://www.corpit.ru/mjt/$pkgname/$pkgname-$pkgver.tar.gz"
+source="https://www.corpit.ru/mjt/udns/udns-$pkgver.tar.gz"
 
 build() {
 	./configure
@@ -17,17 +17,21 @@ build() {
 }
 
 package() {
-	install -D -m0755 dnsget "${pkgdir}/usr/bin/dnsget"
-	install -D -m0755 rblcheck "${pkgdir}/usr/bin/rblcheck"
-	install -D -m0755 ex-rdns "${pkgdir}/usr/bin/ex-rdns"
+	install -Dm755 dnsget rblcheck ex-rdns \
+		-t "$pkgdir"/usr/bin
 
-	install -D -m0644 udns.h "${pkgdir}/usr/include/udns.h"
-	install -D -m0755 libudns.so.0 "${pkgdir}/usr/lib/libudns.so.0"
-	ln -s libudns.so.0 "${pkgdir}/usr/lib/libudns.so"
+	install -Dm644 udns.h \
+		-t "$pkgdir"/usr/include
+	install -Dm755 libudns.so.0 \
+		-t "$pkgdir"/usr/lib
+	ln -s libudns.so.0 "$pkgdir"/usr/lib/libudns.so
 
-	install -D -m0644 dnsget.1 "${pkgdir}/usr/share/man/man1/dnsget.1"
-	install -D -m0644 rblcheck.1 "${pkgdir}/usr/share/man/man1/rblcheck.1"
-	install -D -m0644 udns.3 "${pkgdir}/usr/share/man/man3/udns.3"
+	install -Dm644 dnsget.1 rblcheck.1 \
+		-t "$pkgdir"/usr/share/man/man1
+	install -Dm644 udns.3 \
+		-t "$pkgdir"/usr/share/man/man3
 }
 
-sha512sums="2990d57b3b6bf176a12ee07fd4391921e13634fc8409e8ce4df8dbe7b3556a116ae59ab328a1b6a95ebc94298f6b56ec7197a06a649d8d642b371b8ecef3e40b  udns-0.4.tar.gz"
+sha512sums="
+ee6607a01a9b88563c180d9b48ead9e1e9ca606d8fa01daca23ec0756d10e6f9798c27bec35d0f322603a768571f815fbad505483b4d392eba422529d16bcc7f  udns-0.5.tar.gz
+"
diff --git a/main/ulogd/APKBUILD b/main/ulogd/APKBUILD
index 56d21beb99a..8b22191eb5e 100644
--- a/main/ulogd/APKBUILD
+++ b/main/ulogd/APKBUILD
@@ -1,35 +1,51 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
+# Contributor: Michał Polański <michal@polanski.me>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=ulogd
-pkgver=2.0.7
-pkgrel=6
-pkgdesc="A userspace logging daemon for netfilter/iptables related logging"
+pkgver=2.0.8
+pkgrel=3
+pkgdesc="Userspace logging daemon for netfilter/iptables related logging"
 url="https://netfilter.org/projects/ulogd/"
 arch="all"
 license="GPL-2.0-only"
-makedepends="libmnl-dev libpcap-dev libnetfilter_acct-dev bsd-compat-headers
-	libnfnetlink-dev libnetfilter_conntrack-dev libnetfilter_log-dev
-	pkgconfig mariadb-connector-c-dev openssl-dev postgresql-dev zlib-dev linux-headers
-	autoconf automake libtool jansson-dev sqlite-dev"
+makedepends="
+	bsd-compat-headers
+	jansson-dev
+	libmnl-dev
+	libnetfilter_acct-dev
+	libnetfilter_conntrack-dev
+	libnetfilter_log-dev
+	libnfnetlink-dev
+	libpcap-dev
+	libpq-dev
+	linux-headers
+	mariadb-connector-c-dev
+	openssl-dev>3
+	sqlite-dev
+	zlib-dev
+	"
 subpackages="
 	$pkgname-doc
 	$pkgname-openrc
 	"
 source="https://www.netfilter.org/projects/ulogd/files/ulogd-$pkgver.tar.bz2
-	musl-fixes.patch
 	ulogd.initd
 	ulogd.confd
 	ulogd.logrotate
 	"
+options="!check"
 
 _modules="mysql pgsql json xml sqlite3"
 for _module in $_modules; do
 	subpackages="$subpackages $pkgname-$_module:_plugin"
 done
 
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
+
 build() {
-	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
-	autoreconf -vif
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -45,15 +61,14 @@ build() {
 package() {
 	make DESTDIR="$pkgdir" install
 	install -Dm644 ulogd.conf "$pkgdir"/etc/ulogd.conf
-	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-	install -m644 -D "$srcdir"/$pkgname.logrotate "$pkgdir"/etc/logrotate.d/$pkgname
+	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+	install -Dm644 "$srcdir"/$pkgname.logrotate "$pkgdir"/etc/logrotate.d/$pkgname
 	install -dm755 "$pkgdir"/usr/share/doc/ulogd
 	install -Dm644 ulogd.conf "$pkgdir"/usr/share/doc/ulogd/ulogd.conf.sample
 	install -Dm644 doc/ulogd.sgml "$pkgdir"/usr/share/doc/ulogd/ulogd.sgml
 	install -dm0755 "$pkgdir"/usr/share/ulogd
-	for file in $(ls doc/*.sql)
-	do
+	for file in $(ls doc/*.sql); do
 		install -Dm644 $file "$pkgdir"/usr/share/ulogd/$file
 	done
 }
@@ -75,8 +90,9 @@ _plugin() {
 			;;
 	esac
 }
-sha512sums="1ad12bcf91bebe8bf8580de38693318cdabd17146f1f65acf714334885cf13adf5f783abdf2dd67474ef12f82d2cfb84dd4859439bc7af10a0df58e4c7e48b09  ulogd-2.0.7.tar.bz2
-f65e051520645c5e1618b1ef9d570ebac77ec8d05972c9b58ca93475a9612a725b26634a71e9fb8e117ae004a2dc13da2a1368b549d2808bd299e39b8f8d6bab  musl-fixes.patch
-ab60e367a18d6dafcf5ee22562e303d74944f97b1e42717607db85f11d15d94be3e0e9aaa422c2bac13cdeee1aabc550f751f3e6419b1c7b16d86d0ee8fad55a  ulogd.initd
-bdae1ff90c671b6847dfda1947a33e24bfbe16ad963f85769d923ba33021bc4ca315fd410b46fac102f0a24e879e4be4ad7bb5978c5a6755e74e6b5d7c3e18ee  ulogd.confd
-76d426411786010b73900b41cf2537c704cf48abbe464d10760d44420fd46fea72ae84f6b52c7c338f39630666ebe06ef05287d18e7dd7c5662bb72af0491b0e  ulogd.logrotate"
+sha512sums="
+9f99f6f35bad5da4559d788dc3ba3dae17d4ae972737cae3313ecf68f08eaf5f55514fce6f30503437e4158fd30a06438b9249d5d20f6343964cbf690f87309d  ulogd-2.0.8.tar.bz2
+1aef18f3c2f67231e9fd4ac3c8121ed337905e810714f817bc605b08f230396159d98072011d2aae4556dd241997d6abdba9fb804c3ae1b681a489c429662227  ulogd.initd
+0908e82de8b1a7be9281c4749d9cf396b6ef70b3eee868d83e390ffcea3bb2c4854351e0fde4be831282ec54da694bc4e4b144c2b2e13b314c625a8c10084e6d  ulogd.confd
+82768ec7ffc53f82f4914d80c38da0a269fcc4e68b7955746c1d6c1e4f3fce48a927b4f29b5929d7fc2a01701160c41e05960bbeb1fd682705d589912789e69e  ulogd.logrotate
+"
diff --git a/main/ulogd/musl-fixes.patch b/main/ulogd/musl-fixes.patch
deleted file mode 100644
index f50c65cce43..00000000000
--- a/main/ulogd/musl-fixes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/ulogd.c
-+++ b/src/ulogd.c
-@@ -65,6 +65,7 @@
- #include <sys/time.h>
- #include <sys/stat.h>
- #include <sched.h>
-+#include <linux/limits.h>
- #include <ulogd/conffile.h>
- #include <ulogd/ulogd.h>
- #ifdef DEBUG
diff --git a/main/ulogd/ulogd.confd b/main/ulogd/ulogd.confd
index ac035b24c94..9cf8d2747e6 100644
--- a/main/ulogd/ulogd.confd
+++ b/main/ulogd/ulogd.confd
@@ -1,2 +1,8 @@
-# Argument to be passed to ulog daemon
-ARGS="-d"
+# Configuration for /etc/init.d/ulogd
+
+# See ulogd(8) for available options.
+#command_args=""
+
+# Run with process supervisor. If you want to run the daemon with
+# start-stop-daemon instead, comment it out.
+supervisor="supervise-daemon"
diff --git a/main/ulogd/ulogd.initd b/main/ulogd/ulogd.initd
index 754cf2a3bcc..c44646f555d 100644
--- a/main/ulogd/ulogd.initd
+++ b/main/ulogd/ulogd.initd
@@ -1,41 +1,31 @@
 #!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/app-admin/ulogd/files/ulogd,v 1.2 2004/07/13 16:32:25 aliz Exp $
 
-description="Netfilter userspace log daemon"
-description_reload="Reload configuration"
+description="Netfilter userspace logging daemon"
 
 extra_started_commands="reload"
+description_reload="Reload configuration"
+
+command="/usr/sbin/ulogd"
+# $ulogd_opts is only for backward compatibility (Alpine <3.19)
+command_args="$ulogd_opts $command_args"
+command_background="yes"
+command_user="root:wheel"
+pidfile="/run/$RC_SVCNAME.pid"
+umask=027
+
+required_files="/etc/ulogd.conf"
 
 depend() {
 	before firewall
 }
 
-checkconfig() {
-	if [ ! -e /etc/ulogd.conf ]; then
-		eerror "You need /etc/ulogd.conf"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ulogd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/ulogd --group wheel \
-		--umask 027 -- $ARGS >/dev/null 2>&1
-	eend $?
-}	
-
-stop() {
-	ebegin "Stopping ulogd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/ulogd >/dev/null 2>&1
-	eend $?
-}	
-
 reload() {
-        ebegin "Reloading ulogd.conf file"
-	killall -HUP ulogd &>/dev/null
-	eend $?
-}	
+	ebegin "Reloading $RC_SVCNAME"
 
+	if [ "$supervisor" ]; then
+		$supervisor "$RC_SVCNAME" --signal HUP
+	else
+		start-stop-daemon --pidfile "$pidfile" --signal HUP
+	fi
+	eend $?
+}
diff --git a/main/ulogd/ulogd.logrotate b/main/ulogd/ulogd.logrotate
index 81a495cd77d..b6801173abf 100644
--- a/main/ulogd/ulogd.logrotate
+++ b/main/ulogd/ulogd.logrotate
@@ -2,6 +2,6 @@
     missingok
     sharedscripts
     postrotate
-	killall -HUP ulogd 2> /dev/null || true
+    busybox killall -HUP ulogd 2> /dev/null || true
     endscript
 }
diff --git a/main/umix/APKBUILD b/main/umix/APKBUILD
index 9fc08b2ca59..b650e6bd5b0 100644
--- a/main/umix/APKBUILD
+++ b/main/umix/APKBUILD
@@ -2,39 +2,35 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=umix
 pkgver=1.0.2
-pkgrel=7
+pkgrel=10
 pkgdesc="Program for adjusting soundcard volumes"
-url="http://umix.sf.net"
+url="https://umix.sourceforge.net/"
 arch="all"
 license="GPL-2.0-or-later"
-depends=""
 makedepends="linux-headers ncurses-dev"
-install=""
 subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+source="https://downloads.sourceforge.net/umix/umix-$pkgver.tar.gz"
+options="!check"
 
-_builddir="$srcdir"/umix-$pkgver
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
-	make || return 1
+		--infodir=/usr/share/info
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9e59a26c0b6cd60bbcfa715694ed58e023c119840080ccb46d9e6b17a9613fd42c1346233a5185d02ece77e3f3e456e18be25573fd34e2f265c5b0b3dc593468  umix-1.0.2.tar.gz"
+sha512sums="
+9e59a26c0b6cd60bbcfa715694ed58e023c119840080ccb46d9e6b17a9613fd42c1346233a5185d02ece77e3f3e456e18be25573fd34e2f265c5b0b3dc593468  umix-1.0.2.tar.gz
+"
diff --git a/main/umurmur/APKBUILD b/main/umurmur/APKBUILD
index a9c4cd66a58..4626dd35ef2 100644
--- a/main/umurmur/APKBUILD
+++ b/main/umurmur/APKBUILD
@@ -1,33 +1,31 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=umurmur
-pkgver=0.2.17
-pkgrel=4
+pkgver=0.2.20
+pkgrel=6
 pkgdesc="Minimalistic Mumble server primarily targeted to run on routers"
-url="http://umurmur.net/"
+url="https://umurmur.net/"
 arch="all"
-license="BSD"
-depends=""
-makedepends="libconfig-dev openssl-dev protobuf-c-dev autoconf automake"
+license="BSD-3-Clause"
+options="!check" # no test suite
+makedepends="libconfig-dev openssl-dev>3 protobuf-c-dev autoconf automake"
 install="$pkgname.post-install"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-openrc"
 pkgusers="umurmur"
 pkggroups="umurmur"
-source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/umurmur/umurmur/archive/$pkgver.tar.gz
+	remove-crypto-mem-ctrl.patch
+
 	$pkgname.initd
 	$pkgname.confd
 	$pkgname.conf"
-builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
-	default_prepare || return 1
-
-	cd "$builddir"
+	default_prepare
 	autoreconf -fi
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -35,29 +33,22 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
-		--with-ssl=openssl \
-		|| return 1
-	make || return 1
+		--with-ssl=openssl
+	make
 }
 
 package() {
-	cd "$builddir"
-
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 "$srcdir"/$pkgname.conf \
-		"$pkgdir"/etc/$pkgname/umurmurd.conf || return 1
-
-	install -Dm755 "$srcdir"/$pkgname.initd \
-		"$pkgdir"/etc/init.d/$pkgname || return 1
-	install -Dm644 "$srcdir"/$pkgname.confd \
-		"$pkgdir"/etc/conf.d/$pkgname || return 1
+	make DESTDIR="$pkgdir" install
+	install -Dm644 "$srcdir"/$pkgname.conf "$pkgdir"/etc/$pkgname/umurmurd.conf
 
-	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
-	install -Dm644 AUTHORS ChangeLog README.md \
-		"$pkgdir"/usr/share/doc/$pkgname/
+	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
-sha512sums="a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15  umurmur-0.2.17.tar.gz
-1c22da6478738b8ac77aecbbf8e41260a957ddffec350020e56b622c70445ebf8dc28feb563b878f2c64132742d8e1e0cbcbd2a50f0c0b29a309ca29598d8c94  umurmur.initd
-b6412621522c9148d5eaced25ff4fb023b0c84206a969120e261b4a89386c46961f1c485435a1763935f538c04c03f7b4b83d45779f1ba796b627cdb0d2436a0  umurmur.confd
-0a5882dca2daf686716d7b78f916e4506c7b98e3460ccd56aace087dca88b686b659e32b325bf253922cc824049a800b06e5006ea04cc5539c82b63cda5cccea  umurmur.conf"
+sha512sums="
+0913f5ba84b30fec4ae6a1521c442ff8c48121bbbca5de9082e04e41b36434fadb5f81cb2ea0bd0a8c63f6e541d15eeda3637667d8cc7113d38935ded320cef4  umurmur-0.2.20.tar.gz
+27ae0f9191f252313c10cde7ad1b89920e60279b219cc491c9b8280341c77740413c5287a0d94fc96e2a340ea3a4c0af78965b66cb4d8e86fdb55e83c69fedee  remove-crypto-mem-ctrl.patch
+0426bc25ae262712b5173ddb53a14257a12ea4794641169ebd4dc154a2f474511d8e03303669d4742e56d0f971d3c20fae9667283f729644b2f09c2dd234b19f  umurmur.initd
+ea5d4826d270f174b23ef4101586ffa3c6ba3311bc443595288dc1839f4127f5fa4bf64f9469037a2f947e3ddd22ac1895326db0fdd4122980d3fcaa0536621e  umurmur.confd
+0a5882dca2daf686716d7b78f916e4506c7b98e3460ccd56aace087dca88b686b659e32b325bf253922cc824049a800b06e5006ea04cc5539c82b63cda5cccea  umurmur.conf
+"
diff --git a/main/umurmur/remove-crypto-mem-ctrl.patch b/main/umurmur/remove-crypto-mem-ctrl.patch
new file mode 100644
index 00000000000..df794ea123a
--- /dev/null
+++ b/main/umurmur/remove-crypto-mem-ctrl.patch
@@ -0,0 +1,11 @@
+--- umurmur-0.2.20.orig/src/ssli_openssl.c
++++ umurmur-0.2.20/src/ssli_openssl.c
+@@ -142,8 +142,6 @@
+ 	
+ 	Log_info("Generating new server certificate.");
+ 	
+-	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+-	
+ 	x509 = X509_new();
+ 	if (!x509)
+ 		goto err_out;
diff --git a/main/umurmur/umurmur.confd b/main/umurmur/umurmur.confd
index df168aa9fc0..ec63afd8050 100644
--- a/main/umurmur/umurmur.confd
+++ b/main/umurmur/umurmur.confd
@@ -1,3 +1,2 @@
 # Additional flags to be passed to umurmurd
 UMURMURD_OPTS=""
-
diff --git a/main/umurmur/umurmur.initd b/main/umurmur/umurmur.initd
index 0f9b3dbb272..3f7dcff2a8f 100644
--- a/main/umurmur/umurmur.initd
+++ b/main/umurmur/umurmur.initd
@@ -7,7 +7,6 @@ description="umurmurd - A minimalistic mumble server"
 pidfile="/run/umurmurd/umurmurd.pid"
 command="/usr/bin/umurmurd"
 command_args="-c /etc/umurmur/umurmurd.conf -p ${pidfile} ${UMURMURD_OPTS}"
-start_stop_daemon_args="-p ${pidfile} -w 100"
 
 depend() {
 	need net
diff --git a/main/umurmur/umurmur.post-install b/main/umurmur/umurmur.post-install
index adff9264e41..aa8c0ab0f61 100644
--- a/main/umurmur/umurmur.post-install
+++ b/main/umurmur/umurmur.post-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S umurmur 2>/dev/null
-adduser -S -D -h /var/run/umurmurd -s /bin/false -G umurmur -g umurmur umurmur 2>/dev/null
+adduser -S -D -h /var/run/umurmurd -s /sbin/nologin -G umurmur -g umurmur umurmur 2>/dev/null
 
 exit 0
diff --git a/main/unbound/APKBUILD b/main/unbound/APKBUILD
index 919d146a4c3..56fce719924 100644
--- a/main/unbound/APKBUILD
+++ b/main/unbound/APKBUILD
@@ -1,23 +1,45 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=unbound
-pkgver=1.10.0
-pkgrel=0
+pkgver=1.19.3
+pkgrel=2
 pkgdesc="Unbound is a validating, recursive, and caching DNS resolver"
-url="http://unbound.net/"
+url="https://nlnetlabs.nl/projects/unbound/about/"
 arch="all"
 license="BSD-3-Clause"
-depends="dns-root-hints dnssec-root"
+depends="dnssec-root"
 depends_dev="expat-dev"
-_depends_migrate="/bin/sh apk-tools dns-root-hints openrc"
-makedepends="$depends_dev libevent-dev openssl-dev python3-dev swig linux-headers"
+_depends_migrate="
+	/bin/sh
+	apk-tools
+	openrc
+	"
+makedepends="$depends_dev
+	libevent-dev
+	linux-headers
+	openssl-dev>3
+	protobuf-c-dev
+	python3-dev
+	swig
+	"
+checkdepends="
+	bind-tools
+	ldns-tools
+	"
 install="$pkgname.pre-install"
-options="!check"
 pkgusers="unbound"
 pkggroups="unbound"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-dbg
-	$pkgname-openrc py-unbound:py $pkgname-migrate::noarch"
+subpackages="
+	$pkgname-dbg
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-libs
+	$pkgname-openrc
+	py-unbound:py
+	$pkgname-migrate::noarch
+	"
 source="https://unbound.net/downloads/unbound-$pkgver.tar.gz
 	conf.patch
 	migrate-dnscache-to-unbound
@@ -26,12 +48,27 @@ source="https://unbound.net/downloads/unbound-$pkgver.tar.gz
 	"
 
 # secfixes:
+#   1.19.2-r0:
+#     - CVE-2024-1931
+#   1.19.1-r0:
+#     - CVE-2023-50387
+#     - CVE-2023-50868
+#   1.16.3-r0:
+#     - CVE-2022-3204
+#   1.16.2-r0:
+#     - CVE-2022-30698
+#     - CVE-2022-30699
+#   1.10.1-r0:
+#     - CVE-2020-12662
+#     - CVE-2020-12663
 #   1.9.5-r0:
 #     - CVE-2019-18934
 #   1.9.4-r0:
 #     - CVE-2019-16866
 
 build() {
+	export CFLAGS="$CFLAGS -flto=auto"
+
 	PYTHON_VERSION=3 ./configure \
 		--build="$CBUILD" \
 		--host="$CHOST" \
@@ -47,6 +84,7 @@ build() {
 		--with-pthreads \
 		--disable-static \
 		--disable-rpath \
+		--enable-dnstap \
 		--with-ssl \
 		--without-pythonmodule \
 		--with-pyunbound
@@ -57,47 +95,31 @@ build() {
 	make
 }
 
+check() {
+	make test
+}
+
 package() {
 	make DESTDIR="$pkgdir" install
 	make DESTDIR="$pkgdir" unbound-event-install
 
-	install -m755 -D contrib/update-anchor.sh \
+	install -Dm755 contrib/update-anchor.sh \
 		"$pkgdir"/usr/share/$pkgname/update-anchor.sh
 
-	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
-	install -m644 doc/CREDITS doc/Changelog doc/FEATURES \
-		doc/README doc/TODO "$pkgdir"/usr/share/doc/$pkgname/
+	install -D -m644 doc/CREDITS doc/Changelog doc/FEATURES \
+		doc/README doc/TODO -t "$pkgdir"/usr/share/doc/$pkgname/
 
 	cd "$pkgdir"
 
-	mkdir -p ./etc/unbound
-	rm -f ./etc/unbound/root.hints
-	ln -s ../../usr/share/dns-root-hints/named.root ./etc/unbound/root.hints
-
-	install -m755 -D "$srcdir"/unbound.initd ./etc/init.d/unbound
-	install -m755 -D "$srcdir"/unbound.confd ./etc/conf.d/unbound
-}
-
-libs() {
-	pkgdesc="unbound shared libraries"
-	depends="$depends_libs"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/
-}
-
-openrc() {
-	depends="$depends_openrc"
-
-	default_openrc
+	install -Dm755 "$srcdir"/unbound.initd ./etc/init.d/unbound
+	install -Dm644 "$srcdir"/unbound.confd ./etc/conf.d/unbound
 }
 
 py() {
 	pkgdesc="Python bindings to libunbound"
 	depends="$depends_py"
 
-	mkdir -p "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
+	amove usr/lib/python*
 }
 
 migrate() {
@@ -108,8 +130,10 @@ migrate() {
 		"$subpkgdir"/usr/bin/migrate-dnscache-to-unbound
 }
 
-sha512sums="a64514990f5d614d749045a11f5ce9bb33cf856cc31895b4db3503f2b05a98f1ca57945b17dd7ec5befbd0c356fc42a717d3e2bae3d3510a0507d0445b1f6d59  unbound-1.10.0.tar.gz
-10e76b0c0e256cf81d55a6f089644693feb94bd2470730bcbcedb5f340397d2316f3a9ee57adc3d5e84e83cc26109c8cb48f6e2e3bfdbd186e40071b7b4284f1  conf.patch
-0a5c7b8f2b8c79c5384bce05962c8f8f5f31ce3aeb967b0e897361a24ea7065eb4e7c28ff3acfb0fb0d46be966d4e526e64b231f49b589ec63f576c25433bb59  migrate-dnscache-to-unbound
-8ceabe5efcccfa1d9e210a8166de60ce218ea0261b9edf620524f33216786fad64d6cd8551255942091ee171247222a49a99a1a1ca1999d43fff00ccb17b6276  unbound.initd
-40c660f275a78f93677761f52bdf7ef151941e8469dd17767a947dbe575880e0d113c320d15c7ea7e12ef636d8ec9453eeae804619678293fa35e3d4c7e75a71  unbound.confd"
+sha512sums="
+f860614f090a5a081cceff8ca7f4b3d416c00a251ae14ceb6b4159dc8cd022f025592074d3d78aee2f86c3eeae9d1a314713e4740aa91062579143199accd159  unbound-1.19.3.tar.gz
+05fec1829dfb5279f35a76eeab768d88b6dffee4477b1db693360021969bdcc89e309f71ea6cc63e0f921b1fc223a073b97892be2095ed93d7da917a59e09d00  conf.patch
+7ab3f57ade3fe8add60bfce208efccc968728fac5c94c759c34aaa09aa71e0da06dd7c24ae0fecf9e2ccc869594226d68b24fe2b0a0b161b833e22c0de1b03b6  migrate-dnscache-to-unbound
+7ca4c42c00a86f737fd8f5024efce218c9d0dee8fb8708df60f7b292c25b4d3a35ed46a8a0a32847451bca988b5de2dbdddb7fed352170c03263281fc579582b  unbound.initd
+0ceae15d69deb24baa16990226de31fe743d84779a2595f31b4910b46ef925fc132cec1683d0a06141f707d9cbe517d731015702c60d9df4958ccfb9abd5a23f  unbound.confd
+"
diff --git a/main/unbound/conf.patch b/main/unbound/conf.patch
index d43b3d2dd3e..e92cc373652 100644
--- a/main/unbound/conf.patch
+++ b/main/unbound/conf.patch
@@ -1,6 +1,7 @@
---- a/doc/example.conf.in
-+++ b/doc/example.conf.in
-@@ -337,12 +337,9 @@
+diff -upr unbound-1.13.0.orig/doc/example.conf.in unbound-1.13.0/doc/example.conf.in
+--- unbound-1.13.0.orig/doc/example.conf.in	2020-12-21 09:58:04.154390497 +0100
++++ unbound-1.13.0/doc/example.conf.in	2020-12-21 09:58:53.094583255 +0100
+@@ -355,9 +355,6 @@ server:
  	# print log lines that say why queries return SERVFAIL to clients.
  	# log-servfail: no
  
@@ -9,12 +10,8 @@
 -
  	# file to read root hints from.
  	# get one from https://www.internic.net/domain/named.cache
--	# root-hints: ""
-+	root-hints: /usr/share/dns-root-hints/named.root
- 
- 	# enable to not answer id.server and hostname.bind queries.
- 	# hide-identity: no
-@@ -489,7 +486,7 @@
+ 	# root-hints: ""
+@@ -507,7 +504,7 @@ server:
  	# you start unbound (i.e. in the system boot scripts).  And enable:
  	# Please note usage of unbound-anchor root anchor is at your own risk
  	# and under the terms of our LICENSE (see that file in the source).
@@ -23,7 +20,7 @@
  
  	# trust anchor signaling sends a RFC8145 key tag query after priming.
  	# trust-anchor-signaling: yes
-@@ -506,7 +503,7 @@
+@@ -519,7 +516,7 @@ server:
  	# with several entries, one file per entry.
  	# Zone file format, with DS and DNSKEY entries.
  	# Note this gets out of date, use auto-trust-anchor-file please.
@@ -32,7 +29,7 @@
  
  	# Trusted key for validation. DS or DNSKEY. specify the RR on a
  	# single line, surrounded by "". TTL is ignored. class is IN default.
-@@ -841,12 +838,13 @@
+@@ -900,12 +897,13 @@ dynlib:
  remote-control:
  	# Enable remote control with unbound-control(8) here.
  	# set up the keys and certificates with unbound-control-setup.
diff --git a/main/unbound/migrate-dnscache-to-unbound b/main/unbound/migrate-dnscache-to-unbound
index 368504f7f64..03b34cd9505 100644
--- a/main/unbound/migrate-dnscache-to-unbound
+++ b/main/unbound/migrate-dnscache-to-unbound
@@ -14,7 +14,6 @@ to_subnet() {
 gen_config() {
 	echo "# Config generated by $0, $(date)"
 	echo "server:"
-	echo -e "\troot-hints: /usr/share/dns-root-hints/named.root\n"
 
 	[ -n "$IP" ] && echo -e "\tinterface: $IP\n"
 	[ -n "$IPSEND" ] && echo -e "\toutgoing-interface: $IPSEND\n"
diff --git a/main/unbound/unbound.confd b/main/unbound/unbound.confd
index c42106dba8d..275081bfa84 100644
--- a/main/unbound/unbound.confd
+++ b/main/unbound/unbound.confd
@@ -6,3 +6,6 @@
 # Additional arguments for the unbound command.
 # Add "-v" to enable verbose logging (more times to increase verbosity).
 #command_args=""
+
+# Uncomment to use process supervisor.
+#supervisor=supervise-daemon
diff --git a/main/unbound/unbound.initd b/main/unbound/unbound.initd
index 9fba36cff7d..f0955fcda7c 100644
--- a/main/unbound/unbound.initd
+++ b/main/unbound/unbound.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
-supervisor=supervise-daemon
 
-extra_commands="checkconfig configtest"
+extra_commands="checkconfig"
 extra_started_commands="reload"
 
 name="unbound daemon"
@@ -13,8 +12,9 @@ description_reload="Kills all children and reloads the configuration."
 : ${cfgfile:=${UNBOUND_CONFFILE:-/etc/unbound/$RC_SVCNAME.conf}}
 
 command=/usr/sbin/unbound
-command_args="$command_args"
-command_args_foreground="-d"
+command_args="-d -c $cfgfile $command_args"
+command_background=yes
+pidfile="/run/$RC_SVCNAME.pid"
 
 required_files="$cfgfile"
 
@@ -39,6 +39,10 @@ reload() {
 	start_pre || return $?
 
 	ebegin "Reloading $name"
-	$supervisor "$RC_SVCNAME" --signal HUP
+	if [ "$supervisor" ]; then
+		$supervisor "$RC_SVCNAME" --signal HUP
+	else
+		start-stop-daemon --signal HUP --pidfile "$pidfile"
+	fi
 	eend $?
 }
diff --git a/main/unfs3/APKBUILD b/main/unfs3/APKBUILD
index fcf922d40ac..3805041deb8 100644
--- a/main/unfs3/APKBUILD
+++ b/main/unfs3/APKBUILD
@@ -1,50 +1,41 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=unfs3
-pkgver=0.9.22
-pkgrel=4
-pkgdesc="A user-space implementation of the NFSv3 server specification"
-url="http://unfs3.sourceforge.net/"
+pkgver=0.10.0
+pkgrel=2
+pkgdesc="user-space implementation of the NFSv3 server specification"
+options="!check" # No testsuite
+url="https://unfs3.github.io/"
 arch="all"
-license='GPL'
+license="BSD-3-Clause"
 depends="rpcbind"
-makedepends="flex-dev libtirpc-dev"
-subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-	unfs3-0.9.22-musl.patch
+makedepends="flex-dev libtirpc-dev byacc"
+subpackages="$pkgname-doc $pkgname-openrc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/unfs3/unfs3/releases/download/unfs3-$pkgver/unfs3-$pkgver.tar.gz
+	implicit.patch
+	lfs64.patch
 	unfs3.confd
 	unfs3.initd
 	"
-builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
-	export CFLAGS="$CFLAGS $(pkgconf --cflags libtirpc)"
-	export LDFLAGS="$LDFLAGS $(pkgconf --libs-only-L libtirpc)"
-	export LIBS="$LIBS $(pkgconf --libs-only-l libtirpc)"
-
-	sed -i '/LDFLAGS=/ s,-R/usr/ucblib,,' ./configure
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--mandir=/usr/share/man
-	make -j1
-}
-
-check() {
-	cd "$builddir"
-	./unfsd -h
+	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir/" install
 	install -D -m0644 "$srcdir"/unfs3.confd "$pkgdir"/etc/conf.d/unfs3
 	install -D -m0755 "$srcdir"/unfs3.initd "$pkgdir"/etc/init.d/unfs3
 }
 
-sha512sums="b1e4b7f5b7b7de27bb5411c69363a6b40be0fcf1f772e283f0868a2155fa9ea4b9b8e7f05b1706e41cf09dd2ee4baab472a01bc4640ae47e3be2a19d8d3f5f9e  unfs3-0.9.22.tar.gz
-f2221651fad842acb8b5fd637514caa07300f627efd5b168ee2939ab3b6ea55fdefa3c3f3336425e255ee7badd326528c722d4064a04936b5468aabc79cbca02  unfs3-0.9.22-musl.patch
+sha512sums="
+4d62b45f133a1929fc0faacfc7a483126767519332c5a311d44b1d048a6c580280299ffb70114a1c405666d730953d436957c04a3350329aa3de5256d0d3e85a  unfs3-0.10.0.tar.gz
+5b564890003d3d4ba28e2efcdd42d920ba679d2f4154fb64d33a064b90a956ca4918d943fca71e1ffa2fa4b43a1af12b322bd9c5400e9ec3b4a33db14c5fa47f  implicit.patch
+f02a60582f5959a9f5e504c3761a924e30180556432d262f3f12caf861d374d21da67d2ebed175db5acb16e97b70d2f730c8b1131bf6a1a3fc05bd739d7266c7  lfs64.patch
 e3a3b7a71117482fd3214eadfd957f5cd3f05da268f748f931945c390f1d8e46e19b33d53b2ce0505c61745f8dd6285f7a9de409196fedef07d23ae029f1c035  unfs3.confd
-105b1ac6d0a65b3ba19bb8ada17d1ae865cf14e71e6a3838df1e6d34d2738457f0019258fd10a4594783074c10be44db75417677290bdd6862ba73b4c370b07e  unfs3.initd"
+105b1ac6d0a65b3ba19bb8ada17d1ae865cf14e71e6a3838df1e6d34d2738457f0019258fd10a4594783074c10be44db75417677290bdd6862ba73b4c370b07e  unfs3.initd
+"
diff --git a/main/unfs3/implicit.patch b/main/unfs3/implicit.patch
new file mode 100644
index 00000000000..d87b1076b65
--- /dev/null
+++ b/main/unfs3/implicit.patch
@@ -0,0 +1,25 @@
+strcmp, strdup
+diff --git a/attr.c b/attr.c
+index 6253e84..66227fa 100644
+--- a/attr.c
++++ b/attr.c
+@@ -9,6 +9,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <string.h>
+ #include <rpc/rpc.h>
+ #include <fcntl.h>
+ #include <time.h>
+diff --git a/locate.c b/locate.c
+index 6bbe71f..84e0fe5 100644
+--- a/locate.c
++++ b/locate.c
+@@ -27,6 +27,7 @@
+ #include "nfs.h"
+ #include "fh.h"
+ #include "daemon.h"
++#include "attr.h"
+ 
+ /*
+  * these are the brute-force file searching routines that are used
diff --git a/main/unfs3/lfs64.patch b/main/unfs3/lfs64.patch
new file mode 100644
index 00000000000..9b04fb311b0
--- /dev/null
+++ b/main/unfs3/lfs64.patch
@@ -0,0 +1,30 @@
+Patch-Source: https://github.com/unfs3/unfs3/commit/a4e5d128a1b93a7bd05d5dc78c886a072cf0f76b
+needed since https://github.com/bminor/musl/commit/25e6fee27f4a293728dd15b659170e7b9c7db9bc
+--
+From a4e5d128a1b93a7bd05d5dc78c886a072cf0f76b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 14 Dec 2022 14:50:10 -0800
+Subject: [PATCH] Alias off64_t to off_t on linux if not defined
+
+Musl C library does not define off64_t and has 64-bit default off_t
+therefore define off64_t as an alias on linux as well when configure
+detects that off64_t is not provided by a linux system
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ nfs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nfs.h b/nfs.h
+index aded011..7996c67 100644
+--- a/nfs.h
++++ b/nfs.h
+@@ -62,7 +62,7 @@ typedef int32_t int32;
+ #endif
+ 
+ #ifndef HAVE_OFF64_T
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__linux__)
+ typedef off_t off64_t;
+ #endif
+ #endif
diff --git a/main/unfs3/unfs3-0.9.22-musl.patch b/main/unfs3/unfs3-0.9.22-musl.patch
deleted file mode 100644
index 31f3c6abdc3..00000000000
--- a/main/unfs3/unfs3-0.9.22-musl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- unfs3-0.9.22/daemon.c
-+++ unfs3-0.9.22-musl/daemon.c
-@@ -110,7 +110,8 @@
-  */
- struct in_addr get_remote(struct svc_req *rqstp)
- {
--    return (svc_getcaller(rqstp->rq_xprt))->sin_addr;
-+    struct sockaddr_in *sin = nfs_getrpccaller_in(rqstp->rq_xprt);
-+    return sin->sin_addr;
- }
- 
- /*
-@@ -118,7 +119,8 @@
-  */
- short get_port(struct svc_req *rqstp)
- {
--    return (svc_getcaller(rqstp->rq_xprt))->sin_port;
-+    struct sockaddr_in *sin = nfs_getrpccaller_in(rqstp->rq_xprt);
-+    return sin->sin_port;
- }
- 
- /*
---- unfs3-0.9.22/daemon.h
-+++ unfs3-0.9.22-musl/daemon.h
-@@ -46,4 +46,9 @@
- extern int	opt_brute_force;
- extern int	opt_readable_executables;
- 
-+static inline struct sockaddr_in *nfs_getrpccaller_in(SVCXPRT *xprt)
-+{
-+	return (struct sockaddr_in *)svc_getcaller(xprt);
-+}
-+
- #endif
diff --git a/main/unifont/APKBUILD b/main/unifont/APKBUILD
deleted file mode 100644
index 19cf94f9e39..00000000000
--- a/main/unifont/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Contributor: Breno Leitao <breno.leitao@gmail.com>
-# Maintainer: Breno Leitao <breno.leitao@gmail.com>
-pkgname=unifont
-pkgver=12.1.04
-pkgrel=0
-pkgdesc="GNU Unifont glyphs"
-url="http://unifoundry.com/unifont.html"
-arch="all"
-options="!check"  # No way to test fonts.
-license="GFDL-1.3-or-later GPL-2.0-or-later WITH Font-exception-2.0"
-depends="bdftopcf perl-gd"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://unifoundry.com/pub/unifont/unifont-$pkgver/unifont-$pkgver.tar.gz"
-
-build() {
-	make DESTDIR="$pkgdir"
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="c9e0269981e871ae60ca5c98c8cd17b861c41fa1a4ae2c81bc2d776c276b3c5b3746c608371c65420c0d009ec3dd6354e517904231ad821f64d3a3620d636078  unifont-12.1.04.tar.gz"
diff --git a/main/unionfs-fuse/APKBUILD b/main/unionfs-fuse/APKBUILD
index 114177a6255..8689aad785a 100644
--- a/main/unionfs-fuse/APKBUILD
+++ b/main/unionfs-fuse/APKBUILD
@@ -1,24 +1,35 @@
 # Maintainer: Michael Zhou <zhoumichaely@gmail.com>
 pkgname=unionfs-fuse
-pkgver=2.0
+pkgver=3.4
 pkgrel=0
 pkgdesc="Union Filesystem in Userspace"
 url="https://github.com/rpodgorny/unionfs-fuse"
 arch="all"
 license="BSD-3-Clause"
-makedepends="fuse-dev linux-headers"
+depends="fuse3"  # provides cmd:fusermount3
+makedepends="fuse3-dev linux-headers"
+checkdepends="py3-pytest cmd:fusermount"
+options="!check" # requires /dev/fuse
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/rpodgorny/unionfs-fuse/archive/v$pkgver.tar.gz
 	0001-include-asm-ioctl.h-for-_IOC_SIZE.patch
+	test-exepath.patch
 	"
 
 build() {
 	make
 }
 
+check() {
+	make test
+}
+
 package() {
 	make DESTDIR="$pkgdir" PREFIX=/usr install
 }
 
-sha512sums="5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758  unionfs-fuse-2.0.tar.gz
-a3dedebb86446a0b992c18d4cc27f223eac554e9688c0cfd6e4806302cb6afce3f691a1cabd540626cdbd7ee94171d6c39b361292c12f2ce43d885d04cf65412  0001-include-asm-ioctl.h-for-_IOC_SIZE.patch"
+sha512sums="
+fb719c8548ab1fa43f236d5c3207d7e8e7a7dc45efed453e447e29452a7c4d03483c84b00fd615bac115781b333c8171d811b87a0227172010a2ab34224150f7  unionfs-fuse-3.4.tar.gz
+a3dedebb86446a0b992c18d4cc27f223eac554e9688c0cfd6e4806302cb6afce3f691a1cabd540626cdbd7ee94171d6c39b361292c12f2ce43d885d04cf65412  0001-include-asm-ioctl.h-for-_IOC_SIZE.patch
+281674f7754dced5ee50cbc979024ef294ba29761c9fe928bed6a473f1860e817f06c293eab2e7c0ba4241f33cc9425893261769c3dc973a6d7793e7d554dfd1  test-exepath.patch
+"
diff --git a/main/unionfs-fuse/test-exepath.patch b/main/unionfs-fuse/test-exepath.patch
new file mode 100644
index 00000000000..6144a186e38
--- /dev/null
+++ b/main/unionfs-fuse/test-exepath.patch
@@ -0,0 +1,33 @@
+--- a/test_all.py
++++ b/test_all.py
+@@ -10,6 +10,7 @@
+ import platform
+ import errno
+ 
++unionfs_srcdir = os.path.abspath('src')
+ 
+ def call(cmd):
+ 	return subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
+@@ -37,8 +38,9 @@
+ 
+ class Common:
+ 	def setUp(self):
+-		self.unionfs_path = os.path.abspath('src/unionfs')
+-		self.unionfsctl_path = os.path.abspath('src/unionfsctl')
++		global unionfs_srcdir
++		self.unionfs_path = os.path.join(unionfs_srcdir, 'unionfs')
++		self.unionfsctl_path = os.path.join(unionfs_srcdir, 'unionfsctl')
+ 
+ 		self.tmpdir = tempfile.mkdtemp()
+ 		self.original_cwd = os.getcwd()
+--- a/Makefile
++++ b/Makefile
+@@ -12,7 +12,7 @@
+ clean: clean_coverage
+ 	$(MAKE) -C src/ clean
+ 
+-test: clean build
++test: build
+ 	python3 -m pytest
+ 
+ test_coverage: clean build_coverage coverage
diff --git a/main/unixodbc/APKBUILD b/main/unixodbc/APKBUILD
index e2f82ef8fd0..f8af3f90b29 100644
--- a/main/unixodbc/APKBUILD
+++ b/main/unixodbc/APKBUILD
@@ -1,21 +1,25 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=unixodbc
-pkgver=2.3.7
-pkgrel=2
+pkgver=2.3.12
+pkgrel=0
 pkgdesc="ODBC is an open specification to access Data Sources"
-url="http://www.unixodbc.org/"
+url="https://www.unixodbc.org/"
 arch="all"
 license="LGPL-2.0-or-later"
 options="!check"  # No test suite.
 makedepends="readline-dev"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="http://www.unixodbc.org/unixODBC-${pkgver}.tar.gz"
+source="https://www.unixodbc.org/unixODBC-$pkgver.tar.gz"
 
 builddir="$srcdir/unixODBC-$pkgver"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,8 +34,9 @@ build() {
 }
 
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a87afeaaa0476f4ae6345c7021b3af52718944e599abb595c864d9126744a21341889802512a1de3ebaf86ac89e7f8b1bbd7f8f5285e8f4bccf928bd1585ff70  unixODBC-2.3.7.tar.gz"
+sha512sums="
+ca9d8db943195679a44db1fc09391dc6662ab1721112c93d448f04011e98502462ffe14b8364eb03707d851db456eced20eb61a22370392ca88d917038d45b56  unixODBC-2.3.12.tar.gz
+"
diff --git a/main/unrar/APKBUILD b/main/unrar/APKBUILD
deleted file mode 100644
index 5863c599dee..00000000000
--- a/main/unrar/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=unrar
-pkgver=5.9.2
-pkgrel=0
-pkgdesc="RAR uncompression program"
-url="https://www.rarlab.com"
-arch="all"
-options="!check"  # No test suite.
-license="custom"
-subpackages="$pkgname-doc"
-source="https://www.rarlab.com/rar/unrarsrc-$pkgver.tar.gz
-	makefile.patch"
-builddir="$srcdir/$pkgname"
-
-build() {
-	make CXX="${CXX:-g++}" STRIP=: -f makefile
-}
-
-package() {
-	make DESTDIR="$pkgdir"/usr install
-
-	install -Dm644 license.txt \
-		"$pkgdir/usr/share/licenses/$pkgname/license.txt"
-}
-
-sha512sums="e48dd3327d57522aa676e8fd6e29b7133ee9921eb1525d90ddedc61716ecfeefb51a7eb3a667f4f81f21a5ce8654727617d33463a5b6a40a7bc32252fa9f25df  unrarsrc-5.9.2.tar.gz
-2caa145c2fb1257c3cea1f552cba7bf8a3f8772c65c9751aad3fb5bec4957c7fefdb7bbb016c94b73d4778cef76460ddc2abafa8a12d09ebd24bcb6f1dcb263c  makefile.patch"
diff --git a/main/unrar/makefile.patch b/main/unrar/makefile.patch
deleted file mode 100644
index f54b4533e4d..00000000000
--- a/main/unrar/makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -upr unrar.orig/makefile unrar/makefile
---- unrar.orig/makefile	2018-03-11 17:33:12.697132381 +0100
-+++ unrar/makefile	2018-03-11 17:33:48.763911497 +0100
-@@ -2,13 +2,14 @@
- # Makefile for UNIX - unrar
- 
- # Linux using GCC
--CXX=c++
--CXXFLAGS=-O2 -Wno-logical-op-parentheses -Wno-switch -Wno-dangling-else
-+CXX?=c++
-+CXXFLAGS?=-O2
-+CXXFLAGS+=-Wno-logical-op-parentheses -Wno-switch -Wno-dangling-else
- LIBFLAGS=-fPIC
- DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
- STRIP=strip
- AR=ar
--LDFLAGS=-pthread
-+LDFLAGS+=-pthread
- DESTDIR=/usr
- 
- # Linux using LCC
-@@ -140,7 +141,7 @@ uninstall:	uninstall-unrar
- clean:
- 	@rm -f *.o *.bak *~
- 
--unrar:	clean $(OBJECTS) $(UNRAR_OBJ)
-+unrar:	$(OBJECTS) $(UNRAR_OBJ)
- 	@rm -f unrar
- 	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
- 	$(STRIP) unrar
diff --git a/main/unzip/08-allow-greater-hostver-values.patch b/main/unzip/08-allow-greater-hostver-values.patch
new file mode 100644
index 00000000000..3460787b886
--- /dev/null
+++ b/main/unzip/08-allow-greater-hostver-values.patch
@@ -0,0 +1,14 @@
+From: Santiago Vila <sanvila@debian.org>
+Subject: zipinfo.c: Do not crash when hostver byte is >= 100
+
+--- a/zipinfo.c
++++ b/zipinfo.c
+@@ -2114,7 +2114,7 @@
+             else
+                 attribs[9] = (xattr & UNX_ISVTX)? 'T' : '-';  /* T==undefined */
+ 
+-            sprintf(&attribs[12], "%u.%u", hostver/10, hostver%10);
++            sprintf(&attribs[11], "%2u.%u", hostver/10, hostver%10);
+             break;
+ 
+     } /* end switch (hostnum: external attributes format) */
diff --git a/main/unzip/13-remove-build-date.patch b/main/unzip/13-remove-build-date.patch
new file mode 100644
index 00000000000..bb60533cb01
--- /dev/null
+++ b/main/unzip/13-remove-build-date.patch
@@ -0,0 +1,17 @@
+From: Jérémy Bobbio <lunar@debian.org>
+Subject: Remove build date
+Bug-Debian: https://bugs.debian.org/782851
+ In order to make unzip build reproducibly, we remove the
+ (already optional) build date from the binary.
+
+--- a/unix/unix.c
++++ b/unix/unix.c
+@@ -1705,7 +1705,7 @@
+ #endif /* Sun */
+ #endif /* SGI */
+ 
+-#ifdef __DATE__
++#if 0
+       " on ", __DATE__
+ #else
+       "", ""
diff --git a/main/unzip/21-fix-warning-messages-on-big-files.patch b/main/unzip/21-fix-warning-messages-on-big-files.patch
new file mode 100644
index 00000000000..55a115af774
--- /dev/null
+++ b/main/unzip/21-fix-warning-messages-on-big-files.patch
@@ -0,0 +1,15 @@
+From: "Steven M. Schweda" <sms@antinode.info>
+Subject: Fix lame code in fileio.c
+Bug-Debian: https://bugs.debian.org/929502
+X-Debian-version: 6.0-23
+
+--- a/fileio.c
++++ b/fileio.c
+@@ -2477,6 +2477,7 @@
+      */
+     return (((zusz_t)sig[7]) << 56)
+         + (((zusz_t)sig[6]) << 48)
++        + (((zusz_t)sig[5]) << 40)
+         + (((zusz_t)sig[4]) << 32)
+         + (zusz_t)((((ulg)sig[3]) << 24)
+                  + (((ulg)sig[2]) << 16)
diff --git a/main/unzip/APKBUILD b/main/unzip/APKBUILD
index 2e865171774..75003ac0fbf 100644
--- a/main/unzip/APKBUILD
+++ b/main/unzip/APKBUILD
@@ -3,30 +3,53 @@
 pkgname=unzip
 pkgver=6.0
 _pkgver=${pkgver//./}
-pkgrel=7
+pkgrel=14
 pkgdesc="Extract PKZIP-compatible .zip files"
 url="http://www.info-zip.org/UnZip.html"
 arch="all"
 license="custom"
 subpackages="$pkgname-doc"
-options="!check"
 # normally 	ftp://ftp.info-zip.org/pub/infozip/src/$pkgname$_pkgver.zip
 source="https://dev.alpinelinux.org/archive/unzip/unzip$_pkgver.tgz
+	08-allow-greater-hostver-values.patch
 	10-unzip-handle-pkware-verify.patch
+	13-remove-build-date.patch
 	20-unzip-uidgid-fix.patch
+	21-fix-warning-messages-on-big-files.patch
+	unzip-6.0-exec-shield.patch
+	unzip-6.0-format-secure.patch
 	unzip-6.0-heap-overflow-infloop.patch
+	unzip-6.0-timestamp.patch
+	CVE-2014-8139.patch
 	CVE-2014-8140.patch
 	CVE-2014-8141.patch
 	CVE-2014-9636.patch
 	CVE-2014-9913.patch
 	CVE-2016-9844.patch
 	CVE-2018-1000035.patch
-	fix-CVE-2014-8139.patch
-	CVE-2019-13232.patch
+	CVE-2018-18384.patch
+	large-symlinks.patch
+	CVE-2021-4217.patch
+	CVE-2022-0529-and-CVE-2022-0530.patch
+
+	zipbomb-manpage.patch
+	zipbomb-part1.patch
+	zipbomb-part2.patch
+	zipbomb-part3.patch
+	zipbomb-part4.patch
+	zipbomb-part5.patch
+	zipbomb-part6.patch
+	zipbomb-switch.patch
 	"
 builddir="$srcdir/$pkgname$_pkgver"
 
 # secfixes:
+#   6.0-r11:
+#     - CVE-2021-4217
+#     - CVE-2022-0529
+#     - CVE-2022-0530
+#   6.0-r9:
+#     - CVE-2018-18384
 #   6.0-r7:
 #     - CVE-2019-13232
 #   6.0-r3:
@@ -41,6 +64,11 @@ builddir="$srcdir/$pkgname$_pkgver"
 #     - CVE-2015-7696
 #     - CVE-2015-7697
 
+# failing tests
+case "$CARCH" in
+	arm*) options="$options !check" ;;
+esac
+
 build() {
 	make -f unix/Makefile \
 		CC="$CHOST-gcc" \
@@ -48,6 +76,10 @@ build() {
 		prefix=/usr generic
 }
 
+check() {
+	make -f unix/Makefile check
+}
+
 package() {
 	make -f unix/Makefile \
 		MANDIR=$pkgdir/usr/share/man/man1/ \
@@ -56,15 +88,34 @@ package() {
 		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d  unzip60.tgz
+sha512sums="
+0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d  unzip60.tgz
+d2d20e546c74e64b444b9d7053bc49119666e693e6ca32dfeed35245b86cdcae4430e49736b4c19ad6c0ea34e369b6015d7084afc5a61a015c506282cf6e0f32  08-allow-greater-hostver-values.patch
 9d2914f22fb0075a2b6f72825c235f46eafd8d47b6fb6fcc8303fc69336e256b15923c002d2615bb6af733344c2315e4a8504d77bae301e10c11d4736faa2c81  10-unzip-handle-pkware-verify.patch
+0fbc26fa0eb1097e1c5fa5d9a7b29766a9b5a0b6c16681ea2ef093c8752940bc9c0eac08dc1420cc2cc77f9280589a323deb331ccd9c04031b96a683bebd4eac  13-remove-build-date.patch
 57699582e9056af0817dcb67f8db67e6a1ff8208c137fbebcf559429e5f12b471b75d7e1ef938e5bbb5416074a51ac7342e4ce8057f4bbdcb0bf079b8d7832af  20-unzip-uidgid-fix.patch
-b1e3fac6a787828efaaef8ec7cc52e1573aea27a6f29830af37ec4ba8bcd2a6488c953ab10eee0561c78e82c7401833ef172bebee793405d93632ce788756301  unzip-6.0-heap-overflow-infloop.patch
+70545de519f522b0c0f3df516b019dd248f55f3e4e107a19ade5bd1774cc25fe1d012dad5ddde5915a807352dbbe5909a92136085308d24bbde3dd1324dcc4d1  21-fix-warning-messages-on-big-files.patch
+3c7f525687b198aaa8547a8b30e744f7f184943624279d5c70170d5b9bb3f0c0f27f3e69bc808dd0d144690107bc76a10c06e160bf99c54fd5684246208b7cff  unzip-6.0-exec-shield.patch
+94560c730437ac2561d5e7550b91688dad1b828e1da96c9477e228e17b37e455ecdcd3a774e7db94dd902bbe12547d910602c0656b803768e5865b045d452dd7  unzip-6.0-format-secure.patch
+b0b745cff474756447e699a13ff003871b33a4f7a24a91150e5a947eba5132fd90fbacf7580379fc13c5f638483b25cbc226f85b9cac9c7662b2f91927eb2bb3  unzip-6.0-heap-overflow-infloop.patch
+e387dc533142f0f702c04092da297e8dfc9b51e4ec7001e6e657d93a9a0f6382b1b39196f239190b8d52b8ecfa46a965627e503aaecdab86e59272af84bbc2c6  unzip-6.0-timestamp.patch
+13f9c54fcdde478c4afe391c8e7ef9c31b03228aaace5da38382612951cbfd60710fd3d931569297953be32b2c5906715aed4b1c05e28cc8fccbb27f38b57550  CVE-2014-8139.patch
 028a97e781fb4e277df331fd40b848bbc002f1a5ceeb40e74477cf68d2f063ac2623e24afbeddfa0456940ecc7694fdb66ecd031cbcecad63079e8427fb731c9  CVE-2014-8140.patch
 3dd21343d6e5ae7d19f2b2f9cf7310eac38dd7f598e1265e247559a48143c9dbffabd9fc0d7aff6d859ec9e646e85c2b7ee00a1b1a2e23bdf96192c22c58b058  CVE-2014-8141.patch
 281c524a9adb1c0f1cb861548d96115f55152c1d76adca34bbaabcca410c5aaf5dd53d99360d7ea8ee9d0ab9eb62031cb40c5de4b5ecfd91535ac178cd3e7098  CVE-2014-9636.patch
 9a62286acdbd5bf5f679d813017b93c25bdb06edaf48b2b53d3281ce3c30587158a777b07457c574d72350499f786dac6b4493092d7e08c17c07cb65ecc513b6  CVE-2014-9913.patch
 8c4a4313072ff0d87eadb0f5472eb48f2802b835dd282305811a96de87a41fed48be60fbdd434e6b6359418f0559f7793deaa1d68161a0c0ead9f8574bb9f14c  CVE-2016-9844.patch
 6f757385a23fe6a034f676df6bf233243afa8743761e3d715e532d066fcd7dc8f8dcd6192be693258f3855837e5534490784378768abe7ce710fb869258d49b7  CVE-2018-1000035.patch
-13f9c54fcdde478c4afe391c8e7ef9c31b03228aaace5da38382612951cbfd60710fd3d931569297953be32b2c5906715aed4b1c05e28cc8fccbb27f38b57550  fix-CVE-2014-8139.patch
-d11758bda3b022f1adb4031bfbc770c6391e3470f3126ec5a4d3d2800d5452245eee26256f539d60adee33f01ba8ba8345299736cd9568da1242f6f739e4a598  CVE-2019-13232.patch"
+1edd66fbca3cfbfad7b19db0b1564b93f13b27b10ff157cf9907228184b56f1f4c87c2dd2a09afc1307ee86622f3aaeea46f8336c249249c8452304cf4d25272  CVE-2018-18384.patch
+d1ea86ee591e6d73853798bfcafb368338129a698a65732715b5bff36a5f8c242de42b8d2ef87cd8c41c8cd271780bd9efcc664d7f9b4261a6f10b1c4a8cf792  large-symlinks.patch
+bb54397ac6f84c9eae012b9e782f768ac4c715e20f2060e7b17b1770921cd6edb31adde9ebd6d9b735f935d6dc08daa751115fd817390a3942bb84b80f38d489  CVE-2021-4217.patch
+bff17d21399a2189ed497602a735eab55746a17e6d414d843068c0374ae09d8d5958c00731e9f35dbfbce6ec9f802cb83d1e7436363392a36a2e34b724d0d71c  CVE-2022-0529-and-CVE-2022-0530.patch
+cb51b1ff5c1bc4a3acc8d4bb60c92cd74dec1b76799f00f542e793b1407964c00cfbda8153703e40a64d1cf89705d6ba16a4c11e7ca9a304eb3a14355546e5eb  zipbomb-manpage.patch
+4f940afa1f6628a47faf6eb13116eab384bda05c841b0b286b18cafad9c4b567ef332a301b8fbdf07259acdf8f6bdb452487e086bce2a3f092daa4e9d9daefa6  zipbomb-part1.patch
+e20e97722e0daf48b97df540added603325d356c6597634afd694af3972bb62952dd0f92c10d98f8c9f28eb9d089f6f5b022e0beb8c6224e32fd2cfaadffa200  zipbomb-part2.patch
+7e11e29dde260f0245bc25eeb811d794515d1c523b42ea6004c7c6a2eda19b9de4dd7a8ecc03e5ff7d376e28a96c6f1b2b922d6b8b3963a9e4746231f3c257f4  zipbomb-part3.patch
+27d45a25a6a51415af609a4fdefcb7c95a1105d511a6e18e2a7464e9d3773ba2ccb25f138a3cc6ddc6e5e9c558b633ee60d273cebf562c2a7d1e99d3f229d1ba  zipbomb-part4.patch
+48875d7e08d669637e26a7e800f8b2a3812d477e6f249c8d4962fdf93ba6d346f5b22b83d82cb65317b506dff84c441d42c0fe7d1c042a065619d39bdf25fdd0  zipbomb-part5.patch
+a788d57fe0fb9ae6106381d2a8fe566aa35bb037012139dc7c283fe5eb316056835dffa9ea9778c15a5b39e50a75329a135a0dffdfc6a53d575ef2013b1d478a  zipbomb-part6.patch
+d86aba51101fdbe855c35f034d33d65a79c5c707d01de4709619f5d1316185777048b72c293f9506186677bcecf54a808e106ad59bb36835ef80615641c85d63  zipbomb-switch.patch
+"
diff --git a/main/unzip/fix-CVE-2014-8139.patch b/main/unzip/CVE-2014-8139.patch
index 2465af0328c..2465af0328c 100644
--- a/main/unzip/fix-CVE-2014-8139.patch
+++ b/main/unzip/CVE-2014-8139.patch
diff --git a/main/unzip/CVE-2018-18384.patch b/main/unzip/CVE-2018-18384.patch
new file mode 100644
index 00000000000..ad28f8c4994
--- /dev/null
+++ b/main/unzip/CVE-2018-18384.patch
@@ -0,0 +1,13 @@
+diff --git a/list.c b/list.c
+index f7359c3..4c3d703 100644
+--- a/list.c
++++ b/list.c
+@@ -97,7 +97,7 @@ int list_files(__G)    /* return PK-type error code */
+ {
+     int do_this_file=FALSE, cfactor, error, error_in_archive=PK_COOL;
+ #ifndef WINDLL
+-    char sgn, cfactorstr[10];
++    char sgn, cfactorstr[13];
+     int longhdr=(uO.vflag>1);
+ #endif
+     int date_format;
diff --git a/main/unzip/CVE-2019-13232.patch b/main/unzip/CVE-2019-13232.patch
deleted file mode 100644
index 01e343a356f..00000000000
--- a/main/unzip/CVE-2019-13232.patch
+++ /dev/null
@@ -1,487 +0,0 @@
-From 47b3ceae397d21bf822bc2ac73052a4b1daf8e1c Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Tue, 11 Jun 2019 22:01:18 -0700
-Subject: [PATCH] Detect and reject a zip bomb using overlapped entries.
-
-This detects an invalid zip file that has at least one entry that
-overlaps with another entry or with the central directory to the
-end of the file. A Fifield zip bomb uses overlapped local entries
-to vastly increase the potential inflation ratio. Such an invalid
-zip file is rejected.
-
-See https://www.bamsoftware.com/hacks/zipbomb/ for David Fifield's
-analysis, construction, and examples of such zip bombs.
-
-The detection maintains a list of covered spans of the zip files
-so far, where the central directory to the end of the file and any
-bytes preceding the first entry at zip file offset zero are
-considered covered initially. Then as each entry is decompressed
-or tested, it is considered covered. When a new entry is about to
-be processed, its initial offset is checked to see if it is
-contained by a covered span. If so, the zip file is rejected as
-invalid.
-
-This commit depends on a preceding commit: "Fix bug in
-undefer_input() that misplaced the input state."
----
- extract.c | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
- globals.c |   1 +
- globals.h |   3 +
- process.c |  11 ++++
- unzip.h   |   1 +
- 5 files changed, 205 insertions(+), 1 deletion(-)
-
-diff --git a/extract.c b/extract.c
-index 1acd769..0973a33 100644
---- a/extract.c
-+++ b/extract.c
-@@ -319,6 +319,125 @@ static ZCONST char Far UnsupportedExtraField[] =
-   "\nerror:  unsupported extra-field compression type (%u)--skipping\n";
- static ZCONST char Far BadExtraFieldCRC[] =
-   "error [%s]:  bad extra-field CRC %08lx (should be %08lx)\n";
-+static ZCONST char Far NotEnoughMemCover[] =
-+  "error: not enough memory for bomb detection\n";
-+static ZCONST char Far OverlappedComponents[] =
-+  "error: invalid zip file with overlapped components (possible zip bomb)\n";
-+
-+
-+
-+
-+
-+/* A growable list of spans. */
-+typedef zoff_t bound_t;
-+typedef struct {
-+    bound_t beg;        /* start of the span */
-+    bound_t end;        /* one past the end of the span */
-+} span_t;
-+typedef struct {
-+    span_t *span;       /* allocated, distinct, and sorted list of spans */
-+    size_t num;         /* number of spans in the list */
-+    size_t max;         /* allocated number of spans (num <= max) */
-+} cover_t;
-+
-+/*
-+ * Return the index of the first span in cover whose beg is greater than val.
-+ * If there is no such span, then cover->num is returned.
-+ */
-+static size_t cover_find(cover, val)
-+    cover_t *cover;
-+    bound_t val;
-+{
-+    size_t lo = 0, hi = cover->num;
-+    while (lo < hi) {
-+        size_t mid = (lo + hi) >> 1;
-+        if (val < cover->span[mid].beg)
-+            hi = mid;
-+        else
-+            lo = mid + 1;
-+    }
-+    return hi;
-+}
-+
-+/* Return true if val lies within any one of the spans in cover. */
-+static int cover_within(cover, val)
-+    cover_t *cover;
-+    bound_t val;
-+{
-+    size_t pos = cover_find(cover, val);
-+    return pos > 0 && val < cover->span[pos - 1].end;
-+}
-+
-+/*
-+ * Add a new span to the list, but only if the new span does not overlap any
-+ * spans already in the list. The new span covers the values beg..end-1. beg
-+ * must be less than end.
-+ *
-+ * Keep the list sorted and merge adjacent spans. Grow the allocated space for
-+ * the list as needed. On success, 0 is returned. If the new span overlaps any
-+ * existing spans, then 1 is returned and the new span is not added to the
-+ * list. If the new span is invalid because beg is greater than or equal to
-+ * end, then -1 is returned. If the list needs to be grown but the memory
-+ * allocation fails, then -2 is returned.
-+ */
-+static int cover_add(cover, beg, end)
-+    cover_t *cover;
-+    bound_t beg;
-+    bound_t end;
-+{
-+    size_t pos;
-+    int prec, foll;
-+
-+    if (beg >= end)
-+    /* The new span is invalid. */
-+        return -1;
-+
-+    /* Find where the new span should go, and make sure that it does not
-+       overlap with any existing spans. */
-+    pos = cover_find(cover, beg);
-+    if ((pos > 0 && beg < cover->span[pos - 1].end) ||
-+        (pos < cover->num && end > cover->span[pos].beg))
-+        return 1;
-+
-+    /* Check for adjacencies. */
-+    prec = pos > 0 && beg == cover->span[pos - 1].end;
-+    foll = pos < cover->num && end == cover->span[pos].beg;
-+    if (prec && foll) {
-+        /* The new span connects the preceding and following spans. Merge the
-+           following span into the preceding span, and delete the following
-+           span. */
-+        cover->span[pos - 1].end = cover->span[pos].end;
-+        cover->num--;
-+        memmove(cover->span + pos, cover->span + pos + 1,
-+                (cover->num - pos) * sizeof(span_t));
-+    }
-+    else if (prec)
-+        /* The new span is adjacent only to the preceding span. Extend the end
-+           of the preceding span. */
-+        cover->span[pos - 1].end = end;
-+    else if (foll)
-+        /* The new span is adjacent only to the following span. Extend the
-+           beginning of the following span. */
-+        cover->span[pos].beg = beg;
-+    else {
-+        /* The new span has gaps between both the preceding and the following
-+           spans. Assure that there is room and insert the span.  */
-+        if (cover->num == cover->max) {
-+            size_t max = cover->max == 0 ? 16 : cover->max << 1;
-+            span_t *span = realloc(cover->span, max * sizeof(span_t));
-+            if (span == NULL)
-+                return -2;
-+            cover->span = span;
-+            cover->max = max;
-+        }
-+        memmove(cover->span + pos + 1, cover->span + pos,
-+                (cover->num - pos) * sizeof(span_t));
-+        cover->num++;
-+        cover->span[pos].beg = beg;
-+        cover->span[pos].end = end;
-+    }
-+    return 0;
-+}
- 
- 
- 
-@@ -374,6 +493,29 @@ int extract_or_test_files(__G)    /* return PK-type error code */
-     }
- #endif /* !SFX || SFX_EXDIR */
- 
-+    /* One more: initialize cover structure for bomb detection. Start with a
-+       span that covers the central directory though the end of the file. */
-+    if (G.cover == NULL) {
-+        G.cover = malloc(sizeof(cover_t));
-+        if (G.cover == NULL) {
-+            Info(slide, 0x401, ((char *)slide,
-+              LoadFarString(NotEnoughMemCover)));
-+            return PK_MEM;
-+        }
-+        ((cover_t *)G.cover)->span = NULL;
-+        ((cover_t *)G.cover)->max = 0;
-+    }
-+    ((cover_t *)G.cover)->num = 0;
-+    if ((G.extra_bytes != 0 &&
-+         cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
-+        cover_add((cover_t *)G.cover,
-+                  G.extra_bytes + G.ecrec.offset_start_central_directory,
-+                  G.ziplen) != 0) {
-+        Info(slide, 0x401, ((char *)slide,
-+          LoadFarString(NotEnoughMemCover)));
-+        return PK_MEM;
-+    }
-+
- /*---------------------------------------------------------------------------
-     The basic idea of this function is as follows.  Since the central di-
-     rectory lies at the end of the zipfile and the member files lie at the
-@@ -591,7 +733,8 @@ int extract_or_test_files(__G)    /* return PK-type error code */
-             if (error > error_in_archive)
-                 error_in_archive = error;
-             /* ...and keep going (unless disk full or user break) */
--            if (G.disk_full > 1 || error_in_archive == IZ_CTRLC) {
-+            if (G.disk_full > 1 || error_in_archive == IZ_CTRLC ||
-+                error == PK_BOMB) {
-                 /* clear reached_end to signal premature stop ... */
-                 reached_end = FALSE;
-                 /* ... and cancel scanning the central directory */
-@@ -1060,6 +1203,11 @@ static int extract_or_test_entrylist(__G__ numchunk,
- 
-         /* seek_zipf(__G__ pInfo->offset);  */
-         request = G.pInfo->offset + G.extra_bytes;
-+        if (cover_within((cover_t *)G.cover, request)) {
-+            Info(slide, 0x401, ((char *)slide,
-+              LoadFarString(OverlappedComponents)));
-+            return PK_BOMB;
-+        }
-         inbuf_offset = request % INBUFSIZ;
-         bufstart = request - inbuf_offset;
- 
-@@ -1591,6 +1739,18 @@ static int extract_or_test_entrylist(__G__ numchunk,
-             return IZ_CTRLC;        /* cancel operation by user request */
-         }
- #endif
-+        error = cover_add((cover_t *)G.cover, request,
-+                          G.cur_zipfile_bufstart + (G.inptr - G.inbuf));
-+        if (error < 0) {
-+            Info(slide, 0x401, ((char *)slide,
-+              LoadFarString(NotEnoughMemCover)));
-+            return PK_MEM;
-+        }
-+        if (error != 0) {
-+            Info(slide, 0x401, ((char *)slide,
-+              LoadFarString(OverlappedComponents)));
-+            return PK_BOMB;
-+        }
- #ifdef MACOS  /* MacOS is no preemptive OS, thus call event-handling by hand */
-         UserStop();
- #endif
-@@ -1992,6 +2152,34 @@ static int extract_or_test_member(__G)    /* return PK-type error code */
-     }
- 
-     undefer_input(__G);
-+
-+    if ((G.lrec.general_purpose_bit_flag & 8) != 0) {
-+        /* skip over data descriptor (harder than it sounds, due to signature
-+         * ambiguity)
-+         */
-+#       define SIG 0x08074b50
-+#       define LOW 0xffffffff
-+        uch buf[12];
-+        unsigned shy = 12 - readbuf((char *)buf, 12);
-+        ulg crc = shy ? 0 : makelong(buf);
-+        ulg clen = shy ? 0 : makelong(buf + 4);
-+        ulg ulen = shy ? 0 : makelong(buf + 8); /* or high clen if ZIP64 */
-+        if (crc == SIG &&                       /* if not SIG, no signature */
-+            (G.lrec.crc32 != SIG ||             /* if not SIG, have signature */
-+             (clen == SIG &&                    /* if not SIG, no signature */
-+              ((G.lrec.csize & LOW) != SIG ||   /* if not SIG, have signature */
-+               (ulen == SIG &&                  /* if not SIG, no signature */
-+                (G.zip64 ? G.lrec.csize >> 32 : G.lrec.ucsize) != SIG
-+                                                /* if not SIG, have signature */
-+                )))))
-+                   /* skip four more bytes to account for signature */
-+                   shy += 4 - readbuf((char *)buf, 4);
-+        if (G.zip64)
-+            shy += 8 - readbuf((char *)buf, 8); /* skip eight more for ZIP64 */
-+        if (shy)
-+            error = PK_ERR;
-+    }
-+
-     return error;
- 
- } /* end function extract_or_test_member() */
-diff --git a/globals.c b/globals.c
-index fa8cca5..1e0f608 100644
---- a/globals.c
-+++ b/globals.c
-@@ -181,6 +181,7 @@ Uz_Globs *globalsCtor()
- # if (!defined(NO_TIMESTAMPS))
-     uO.D_flag=1;    /* default to '-D', no restoration of dir timestamps */
- # endif
-+    G.cover = NULL;     /* not allocated yet */
- #endif
- 
-     uO.lflag=(-1);
-diff --git a/globals.h b/globals.h
-index 11b7215..2bdcdeb 100644
---- a/globals.h
-+++ b/globals.h
-@@ -260,12 +260,15 @@ typedef struct Globals {
-     ecdir_rec       ecrec;         /* used in unzip.c, extract.c */
-     z_stat   statbuf;              /* used by main, mapname, check_for_newer */
- 
-+    int zip64;                     /* true if Zip64 info in extra field */
-+
-     int      mem_mode;
-     uch      *outbufptr;           /* extract.c static */
-     ulg      outsize;              /* extract.c static */
-     int      reported_backslash;   /* extract.c static */
-     int      disk_full;
-     int      newfile;
-+    void     **cover;              /* used in extract.c for bomb detection */
- 
-     int      didCRlast;            /* fileio static */
-     ulg      numlines;             /* fileio static: number of lines printed */
-diff --git a/process.c b/process.c
-index 1e9a1e1..d2e4dc3 100644
---- a/process.c
-+++ b/process.c
-@@ -637,6 +637,13 @@ void free_G_buffers(__G)     /* releases all memory allocated in global vars */
-     }
- #endif
- 
-+    /* Free the cover span list and the cover structure. */
-+    if (G.cover != NULL) {
-+        free(*(G.cover));
-+        free(G.cover);
-+        G.cover = NULL;
-+    }
-+
- } /* end function free_G_buffers() */
- 
- 
-@@ -1890,6 +1897,8 @@ int getZip64Data(__G__ ef_buf, ef_len)
- #define Z64FLGS 0xffff
- #define Z64FLGL 0xffffffff
- 
-+    G.zip64 = FALSE;
-+
-     if (ef_len == 0 || ef_buf == NULL)
-         return PK_COOL;
- 
-@@ -1927,6 +1936,8 @@ int getZip64Data(__G__ ef_buf, ef_len)
- #if 0
-           break;                /* Expect only one EF_PKSZ64 block. */
- #endif /* 0 */
-+
-+          G.zip64 = TRUE;
-         }
-
-         /* Skip this extra field block. */
-diff --git a/unzip.h b/unzip.h
-index 5b2a326..ed24a5b 100644
---- a/unzip.h
-+++ b/unzip.h
-@@ -645,6 +645,7 @@ typedef struct _Uzp_cdir_Rec {
- #define PK_NOZIP           9   /* zipfile not found */
- #define PK_PARAM          10   /* bad or illegal parameters specified */
- #define PK_FIND           11   /* no files found */
-+#define PK_BOMB           12   /* likely zip bomb */
- #define PK_DISK           50   /* disk full */
- #define PK_EOF            51   /* unexpected EOF */
- 
-From 6d351831be705cc26d897db44f878a978f4138fc Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Thu, 25 Jul 2019 20:43:17 -0700
-Subject: [PATCH] Do not raise a zip bomb alert for a misplaced central
- directory.
-
-There is a zip-like file in the Firefox distribution, omni.ja,
-which is a zip container with the central directory placed at the
-start of the file instead of after the local entries as required
-by the zip standard. This commit marks the actual location of the
-central directory, as well as the end of central directory records,
-as disallowed locations. This now permits such containers to not
-raise a zip bomb alert, where in fact there are no overlaps.
----
- extract.c | 25 +++++++++++++++++++------
- process.c |  6 ++++++
- unzpriv.h | 10 ++++++++++
- 3 files changed, 35 insertions(+), 6 deletions(-)
-
-diff --git a/extract.c b/extract.c
-index 0973a33..1b73cb0 100644
---- a/extract.c
-+++ b/extract.c
-@@ -493,8 +493,11 @@ int extract_or_test_files(__G)    /* return PK-type error code */
-     }
- #endif /* !SFX || SFX_EXDIR */
- 
--    /* One more: initialize cover structure for bomb detection. Start with a
--       span that covers the central directory though the end of the file. */
-+    /* One more: initialize cover structure for bomb detection. Start with
-+       spans that cover any extra bytes at the start, the central directory,
-+       the end of central directory record (including the Zip64 end of central
-+       directory locator, if present), and the Zip64 end of central directory
-+       record, if present. */
-     if (G.cover == NULL) {
-         G.cover = malloc(sizeof(cover_t));
-         if (G.cover == NULL) {
-@@ -506,15 +509,25 @@ int extract_or_test_files(__G)    /* return PK-type error code */
-         ((cover_t *)G.cover)->max = 0;
-     }
-     ((cover_t *)G.cover)->num = 0;
--    if ((G.extra_bytes != 0 &&
--         cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
--        cover_add((cover_t *)G.cover,
-+    if (cover_add((cover_t *)G.cover,
-                   G.extra_bytes + G.ecrec.offset_start_central_directory,
--                  G.ziplen) != 0) {
-+                  G.extra_bytes + G.ecrec.offset_start_central_directory +
-+                  G.ecrec.size_central_directory) != 0) {
-         Info(slide, 0x401, ((char *)slide,
-           LoadFarString(NotEnoughMemCover)));
-         return PK_MEM;
-     }
-+    if ((G.extra_bytes != 0 &&
-+         cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
-+        (G.ecrec.have_ecr64 &&
-+         cover_add((cover_t *)G.cover, G.ecrec.ec64_start,
-+                   G.ecrec.ec64_end) != 0) ||
-+        cover_add((cover_t *)G.cover, G.ecrec.ec_start,
-+                  G.ecrec.ec_end) != 0) {
-+        Info(slide, 0x401, ((char *)slide,
-+          LoadFarString(OverlappedComponents)));
-+        return PK_BOMB;
-+    }
- 
- /*---------------------------------------------------------------------------
-     The basic idea of this function is as follows.  Since the central di-
-diff --git a/process.c b/process.c
-index d2e4dc3..d75d405 100644
---- a/process.c
-+++ b/process.c
-@@ -1408,6 +1408,10 @@ static int find_ecrec64(__G__ searchlen)         /* return PK-class error */
- 
-     /* Now, we are (almost) sure that we have a Zip64 archive. */
-     G.ecrec.have_ecr64 = 1;
-+    G.ecrec.ec_start -= ECLOC64_SIZE+4;
-+    G.ecrec.ec64_start = ecrec64_start_offset;
-+    G.ecrec.ec64_end = ecrec64_start_offset +
-+                       12 + makeint64(&byterec[ECREC64_LENGTH]);
- 
-     /* Update the "end-of-central-dir offset" for later checks. */
-     G.real_ecrec_offset = ecrec64_start_offset;
-@@ -1542,6 +1546,8 @@ static int find_ecrec(__G__ searchlen)          /* return PK-class error */
-       makelong(&byterec[OFFSET_START_CENTRAL_DIRECTORY]);
-     G.ecrec.zipfile_comment_length =
-       makeword(&byterec[ZIPFILE_COMMENT_LENGTH]);
-+    G.ecrec.ec_start = G.real_ecrec_offset;
-+    G.ecrec.ec_end = G.ecrec.ec_start + 22 + G.ecrec.zipfile_comment_length;
- 
-     /* Now, we have to read the archive comment, BEFORE the file pointer
-        is moved away backwards to seek for a Zip64 ECLOC64 structure.
-diff --git a/unzpriv.h b/unzpriv.h
-index dc9eff5..297b3c7 100644
---- a/unzpriv.h
-+++ b/unzpriv.h
-@@ -2185,6 +2185,16 @@ typedef struct VMStimbuf {
-        int have_ecr64;                  /* valid Zip64 ecdir-record exists */
-        int is_zip64_archive;            /* Zip64 ecdir-record is mandatory */
-        ush zipfile_comment_length;
-+       zusz_t ec_start, ec_end;         /* offsets of start and end of the
-+                                           end of central directory record,
-+                                           including if present the Zip64
-+                                           end of central directory locator,
-+                                           which immediately precedes the
-+                                           end of central directory record */
-+       zusz_t ec64_start, ec64_end;     /* if have_ecr64 is true, then these
-+                                           are the offsets of the start and
-+                                           end of the Zip64 end of central
-+                                           directory record */
-    } ecdir_rec;
- 
- 
-From 41beb477c5744bc396fa1162ee0c14218ec12213 Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Mon, 27 May 2019 08:20:32 -0700
-Subject: [PATCH] Fix bug in undefer_input() that misplaced the input state.
-
----
- fileio.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/fileio.c b/fileio.c
-index c042987..bc00d74 100644
---- a/fileio.c
-+++ b/fileio.c
-@@ -530,8 +530,10 @@ void undefer_input(__G)
-          * This condition was checked when G.incnt_leftover was set > 0 in
-          * defer_leftover_input(), and it is NOT allowed to touch G.csize
-          * before calling undefer_input() when (G.incnt_leftover > 0)
--         * (single exception: see read_byte()'s  "G.csize <= 0" handling) !!
-+         * (single exception: see readbyte()'s  "G.csize <= 0" handling) !!
-          */
-+        if (G.csize < 0L)
-+            G.csize = 0L;
-         G.incnt = G.incnt_leftover + (int)G.csize;
-         G.inptr = G.inptr_leftover - (int)G.csize;
-         G.incnt_leftover = 0;
-
diff --git a/main/unzip/CVE-2021-4217.patch b/main/unzip/CVE-2021-4217.patch
new file mode 100644
index 00000000000..5e5ae0e67d1
--- /dev/null
+++ b/main/unzip/CVE-2021-4217.patch
@@ -0,0 +1,54 @@
+From 731d698377dbd1f5b1b90efeb8094602ed59fc40 Mon Sep 17 00:00:00 2001
+From: Nils Bars <nils.bars@t-online.de>
+Date: Mon, 17 Jan 2022 16:53:16 +0000
+Subject: [PATCH] Fix null pointer dereference and use of uninitialized data
+
+This fixes a bug that causes use of uninitialized heap data if `readbuf` fails
+to read as many bytes as indicated by the extra field length attribute.
+Furthermore, this fixes a null pointer dereference if an archive contains an
+`EF_UNIPATH` extra field but does not have a filename set.
+---
+ fileio.c  | 5 ++++-
+ process.c | 6 +++++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/fileio.c b/fileio.c
+index 6290824..95ea68b 100644
+--- a/fileio.c
++++ b/fileio.c
+@@ -2308,8 +2308,11 @@ int do_string(__G__ length, option)   /* return PK-type error code */
+             seek_zipf(__G__ G.cur_zipfile_bufstart - G.extra_bytes +
+                       (G.inptr-G.inbuf) + length);
+         } else {
+-            if (readbuf(__G__ (char *)G.extra_field, length) == 0)
++            unsigned bytes_read = readbuf(__G__ (char *)G.extra_field, length);
++            if (bytes_read == 0)
+                 return PK_EOF;
++            if (bytes_read != length)
++                return PK_ERR;
+             /* Looks like here is where extra fields are read */
+             if (getZip64Data(__G__ G.extra_field, length) != PK_COOL)
+             {
+diff --git a/process.c b/process.c
+index d2a846e..cba2463 100644
+--- a/process.c
++++ b/process.c
+@@ -2064,10 +2064,14 @@ int getUnicodeData(__G__ ef_buf, ef_len)
+           G.unipath_checksum = makelong(offset + ef_buf);
+           offset += 4;
+ 
++          if (!G.filename_full) {
++            /* Check if we have a unicode extra section but no filename set */
++            return PK_ERR;
++          }
++
+           /*
+            * Compute 32-bit crc
+            */
+-
+           chksum = crc32(chksum, (uch *)(G.filename_full),
+                          strlen(G.filename_full));
+ 
+-- 
+2.25.1
+
diff --git a/main/unzip/CVE-2022-0529-and-CVE-2022-0530.patch b/main/unzip/CVE-2022-0529-and-CVE-2022-0530.patch
new file mode 100644
index 00000000000..8f5351e8cd8
--- /dev/null
+++ b/main/unzip/CVE-2022-0529-and-CVE-2022-0530.patch
@@ -0,0 +1,173 @@
+From: Steven M. Schweda <sms@antinode.info>
+Subject: Fix for CVE-2022-0529 and CVE-2022-0530
+Bug-Debian: https://bugs.debian.org/1010355
+X-Debian-version: 6.0-27
+
+--- a/fileio.c
++++ b/fileio.c
+@@ -171,8 +171,10 @@
+ static ZCONST char Far FilenameTooLongTrunc[] =
+   "warning:  filename too long--truncating.\n";
+ #ifdef UNICODE_SUPPORT
++   static ZCONST char Far UFilenameCorrupt[] =
++     "error: Unicode filename corrupt.\n";
+    static ZCONST char Far UFilenameTooLongTrunc[] =
+-     "warning:  Converted unicode filename too long--truncating.\n";
++     "warning:  Converted Unicode filename too long--truncating.\n";
+ #endif
+ static ZCONST char Far ExtraFieldTooLong[] =
+   "warning:  extra field too long (%d).  Ignoring...\n";
+@@ -2361,16 +2363,30 @@
+                   /* convert UTF-8 to local character set */
+                   fn = utf8_to_local_string(G.unipath_filename,
+                                             G.unicode_escape_all);
+-                  /* make sure filename is short enough */
+-                  if (strlen(fn) >= FILNAMSIZ) {
+-                    fn[FILNAMSIZ - 1] = '\0';
++
++                  /* 2022-07-22 SMS, et al.  CVE-2022-0530
++                   * Detect conversion failure, emit message.
++                   * Continue with unconverted name.
++                   */
++                  if (fn == NULL)
++                  {
+                     Info(slide, 0x401, ((char *)slide,
+-                      LoadFarString(UFilenameTooLongTrunc)));
+-                    error = PK_WARN;
++                     LoadFarString(UFilenameCorrupt)));
++                    error = PK_ERR;
++                  }
++                  else
++                  {
++                    /* make sure filename is short enough */
++                    if (strlen(fn) >= FILNAMSIZ) {
++                      fn[FILNAMSIZ - 1] = '\0';
++                      Info(slide, 0x401, ((char *)slide,
++                        LoadFarString(UFilenameTooLongTrunc)));
++                      error = PK_WARN;
++                    }
++                    /* replace filename with converted UTF-8 */
++                    strcpy(G.filename, fn);
++                    free(fn);
+                   }
+-                  /* replace filename with converted UTF-8 */
+-                  strcpy(G.filename, fn);
+-                  free(fn);
+                 }
+ # endif /* UNICODE_WCHAR */
+                 if (G.unipath_filename != G.filename_full)
+--- a/process.c
++++ b/process.c
+@@ -222,6 +222,8 @@
+      "\nwarning:  Unicode Path version > 1\n";
+    static ZCONST char Far UnicodeMismatchError[] =
+      "\nwarning:  Unicode Path checksum invalid\n";
++   static ZCONST char Far UFilenameTooLongTrunc[] =
++     "warning:  filename too long (P1) -- truncating.\n";
+ #endif
+ 
+ 
+@@ -1915,7 +1917,7 @@
+     Sets both local header and central header fields.  Not terribly clever,
+     but it means that this procedure is only called in one place.
+ 
+-    2014-12-05 SMS.
++    2014-12-05 SMS.  (oCERT.org report.)  CVE-2014-8141.
+     Added checks to ensure that enough data are available before calling
+     makeint64() or makelong().  Replaced various sizeof() values with
+     simple ("4" or "8") constants.  (The Zip64 structures do not depend
+@@ -1947,9 +1949,10 @@
+               ef_len - EB_HEADSIZE));
+             break;
+         }
++
+         if (eb_id == EF_PKSZ64)
+         {
+-          int offset = EB_HEADSIZE;
++          unsigned offset = EB_HEADSIZE;
+ 
+           if ((G.crec.ucsize == Z64FLGL) || (G.lrec.ucsize == Z64FLGL))
+           {
+@@ -2046,7 +2049,7 @@
+         }
+         if (eb_id == EF_UNIPATH) {
+ 
+-          int offset = EB_HEADSIZE;
++          unsigned offset = EB_HEADSIZE;
+           ush ULen = eb_len - 5;
+           ulg chksum = CRCVAL_INITIAL;
+ 
+@@ -2504,16 +2507,17 @@
+   int state_dependent;
+   int wsize = 0;
+   int max_bytes = MB_CUR_MAX;
+-  char buf[9];
++  char buf[ MB_CUR_MAX+ 1];             /* ("+1" not really needed?) */
+   char *buffer = NULL;
+   char *local_string = NULL;
++  size_t buffer_size;                   /* CVE-2022-0529 */
+ 
+   for (wsize = 0; wide_string[wsize]; wsize++) ;
+ 
+   if (max_bytes < MAX_ESCAPE_BYTES)
+     max_bytes = MAX_ESCAPE_BYTES;
+-
+-  if ((buffer = (char *)malloc(wsize * max_bytes + 1)) == NULL) {
++  buffer_size = wsize * max_bytes + 1;          /* Reused below. */
++  if ((buffer = (char *)malloc( buffer_size)) == NULL) {
+     return NULL;
+   }
+ 
+@@ -2551,8 +2555,28 @@
+     } else {
+       /* no MB for this wide */
+         /* use escape for wide character */
+-        char *escape_string = wide_to_escape_string(wide_string[i]);
+-        strcat(buffer, escape_string);
++        size_t buffer_len;
++        size_t escape_string_len;
++        char *escape_string;
++        int err_msg = 0;
++
++        escape_string = wide_to_escape_string(wide_string[i]);
++        buffer_len = strlen( buffer);
++        escape_string_len = strlen( escape_string);
++
++        /* Append escape string, as space allows. */
++        /* 2022-07-18 SMS, et al.  CVE-2022-0529 */
++        if (escape_string_len > buffer_size- buffer_len- 1)
++        {
++            escape_string_len = buffer_size- buffer_len- 1;
++            if (err_msg == 0)
++            {
++                err_msg = 1;
++                Info(slide, 0x401, ((char *)slide,
++                 LoadFarString( UFilenameTooLongTrunc)));
++            }
++        }
++        strncat( buffer, escape_string, escape_string_len);
+         free(escape_string);
+     }
+   }
+@@ -2604,9 +2628,18 @@
+   ZCONST char *utf8_string;
+   int escape_all;
+ {
+-  zwchar *wide = utf8_to_wide_string(utf8_string);
+-  char *loc = wide_to_local_string(wide, escape_all);
+-  free(wide);
++  zwchar *wide;
++  char *loc = NULL;
++
++  wide = utf8_to_wide_string( utf8_string);
++
++  /* 2022-07-25 SMS, et al.  CVE-2022-0530 */
++  if (wide != NULL)
++  {
++    loc = wide_to_local_string( wide, escape_all);
++    free( wide);
++  }
++
+   return loc;
+ }
+ 
diff --git a/main/unzip/large-symlinks.patch b/main/unzip/large-symlinks.patch
new file mode 100644
index 00000000000..842d258270c
--- /dev/null
+++ b/main/unzip/large-symlinks.patch
@@ -0,0 +1,38 @@
+From mboxrd@z Thu Jan  1 00:00:00 1970
+From: Andreas Schwab <schwab@linux-m68k.org>
+Subject: Re: "git archive" seems to be broken wrt zip files
+Date: Sun, 11 Sep 2011 15:14:36 +0200
+Jeff King <peff@peff.net> writes:
+
+> IOW, the zip file looks right. I wonder if this is actually a bug in
+> "unzip".
+
+It is.  This only happens if you have more then 16k entries and when one
+of the 16k entry infos is reused it happend to be previously used for a
+symlink entry.
+
+Here's a patch for unzip60 for reference:
+
+--- a/process.c
++++ b/process.c
+@@ -1751,6 +1751,12 @@ int process_cdir_file_hdr(__G)    /* ret
+         = (G.crec.general_purpose_bit_flag & (1 << 11)) == (1 << 11);
+ #endif
+ 
++#ifdef SYMLINKS
++    /* Initialize the symlink flag, may be set by the platform-specific
++       mapattr function.  */
++    G.pInfo->symlink = 0;
++#endif
++
+     return PK_COOL;
+ 
+ } /* end function process_cdir_file_hdr() */
+
+Andreas.
+
+-- 
+Andreas Schwab, schwab@linux-m68k.org
+GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
+"And now for something completely different."
+
diff --git a/main/unzip/unzip-6.0-exec-shield.patch b/main/unzip/unzip-6.0-exec-shield.patch
new file mode 100644
index 00000000000..74500aa5d48
--- /dev/null
+++ b/main/unzip/unzip-6.0-exec-shield.patch
@@ -0,0 +1,10 @@
+diff -up unzip60/crc_i386.S.exec-shield unzip60/crc_i386.S
+--- unzip60/crc_i386.S.exec-shield	2007-01-07 06:02:58.000000000 +0100
++++ unzip60/crc_i386.S	2009-11-18 11:16:39.630389312 +0100
+@@ -302,3 +302,6 @@ _crc32:                         /* ulg c
+ #endif /* i386 || _i386 || _I386 || __i386 */
+ 
+ #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
++
++.section .note.GNU-stack, "", @progbits
++.previous
diff --git a/main/unzip/unzip-6.0-format-secure.patch b/main/unzip/unzip-6.0-format-secure.patch
new file mode 100644
index 00000000000..81cf8605531
--- /dev/null
+++ b/main/unzip/unzip-6.0-format-secure.patch
@@ -0,0 +1,90 @@
+diff --git a/extract.c b/extract.c
+index eeb2f57..a0a4929 100644
+--- a/extract.c
++++ b/extract.c
+@@ -472,8 +472,8 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+                      */
+                     Info(slide, 0x401, ((char *)slide,
+                       LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1));
+-                    Info(slide, 0x401, ((char *)slide,
+-                      LoadFarString(ReportMsg)));
++                    Info(slide, 0x401,
++                         ((char *)slide,"%s", LoadFarString(ReportMsg)));
+                     error_in_archive = PK_BADERR;
+                 }
+                 reached_end = TRUE;     /* ...so no more left to do */
+@@ -752,8 +752,8 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+ 
+ #ifndef SFX
+     if (no_endsig_found) {                      /* just to make sure */
+-        Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
+-        Info(slide, 0x401, ((char *)slide, LoadFarString(ReportMsg)));
++        Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(EndSigMsg)));
++        Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(ReportMsg)));
+         if (!error_in_archive)       /* don't overwrite stronger error */
+             error_in_archive = PK_WARN;
+     }
+diff --git a/list.c b/list.c
+index 15e0011..f7359c3 100644
+--- a/list.c
++++ b/list.c
+@@ -181,7 +181,7 @@ int list_files(__G)    /* return PK-type error code */
+                 Info(slide, 0x401,
+                      ((char *)slide, LoadFarString(CentSigMsg), j));
+                 Info(slide, 0x401,
+-                     ((char *)slide, LoadFarString(ReportMsg)));
++                     ((char *)slide,"%s", LoadFarString(ReportMsg)));
+                 return PK_BADERR;   /* sig not found */
+             }
+         }
+@@ -507,7 +507,8 @@ int list_files(__G)    /* return PK-type error code */
+             && (!G.ecrec.is_zip64_archive)
+             && (memcmp(G.sig, end_central_sig, 4) != 0)
+            ) {          /* just to make sure again */
+-            Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
++            Info(slide, 0x401, 
++                 ((char *)slide,"%s", LoadFarString(EndSigMsg)));
+             error_in_archive = PK_WARN;   /* didn't find sig */
+         }
+ 
+@@ -591,7 +592,7 @@ int get_time_stamp(__G__ last_modtime, nmember)  /* return PK-type error code */
+                 Info(slide, 0x401,
+                      ((char *)slide, LoadFarString(CentSigMsg), j));
+                 Info(slide, 0x401,
+-                     ((char *)slide, LoadFarString(ReportMsg)));
++                     ((char *)slide,"%s", LoadFarString(ReportMsg)));
+                 return PK_BADERR;   /* sig not found */
+             }
+         }
+@@ -674,7 +675,7 @@ int get_time_stamp(__G__ last_modtime, nmember)  /* return PK-type error code */
+   ---------------------------------------------------------------------------*/
+ 
+     if (memcmp(G.sig, end_central_sig, 4)) {    /* just to make sure again */
+-        Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
++        Info(slide, 0x401, ((char *)slide,"%s", LoadFarString(EndSigMsg)));
+         error_in_archive = PK_WARN;
+     }
+     if (*nmember == 0L && error_in_archive <= PK_WARN)
+diff --git a/zipinfo.c b/zipinfo.c
+index 6e22cc8..ac5c61b 100644
+--- a/zipinfo.c
++++ b/zipinfo.c
+@@ -771,7 +771,7 @@ int zipinfo(__G)   /* return PK-type error code */
+                 Info(slide, 0x401,
+                      ((char *)slide, LoadFarString(CentSigMsg), j));
+                 Info(slide, 0x401,
+-                     ((char *)slide, LoadFarString(ReportMsg)));
++                     ((char *)slide,"%s", LoadFarString(ReportMsg)));
+                 error_in_archive = PK_BADERR;   /* sig not found */
+                 break;
+             }
+@@ -960,7 +960,8 @@ int zipinfo(__G)   /* return PK-type error code */
+             && (!G.ecrec.is_zip64_archive)
+             && (memcmp(G.sig, end_central_sig, 4) != 0)
+            ) {          /* just to make sure again */
+-            Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
++            Info(slide, 0x401, 
++                 ((char *)slide,"%s", LoadFarString(EndSigMsg)));
+             error_in_archive = PK_WARN;   /* didn't find sig */
+         }
+ 
diff --git a/main/unzip/unzip-6.0-heap-overflow-infloop.patch b/main/unzip/unzip-6.0-heap-overflow-infloop.patch
index 160c512f96b..b517c403ebe 100644
--- a/main/unzip/unzip-6.0-heap-overflow-infloop.patch
+++ b/main/unzip/unzip-6.0-heap-overflow-infloop.patch
@@ -86,7 +86,7 @@ index 29db027..b9ae667 100644
  
 -            if (G.pInfo->encrypted)
 +            if (G.pInfo->encrypted) {
-+                if (csiz_decrypted <= 12) {
++                if (csiz_decrypted < 12) {
 +                    /* handle the error now to prevent unsigned overflow */
 +                    Info(slide, 0x401, ((char *)slide,
 +                      LoadFarStringSmall(ErrUnzipNoFile),
diff --git a/main/unzip/unzip-6.0-timestamp.patch b/main/unzip/unzip-6.0-timestamp.patch
new file mode 100644
index 00000000000..2aa9424eb8c
--- /dev/null
+++ b/main/unzip/unzip-6.0-timestamp.patch
@@ -0,0 +1,41 @@
+From: "Steven M. Schweda" <sms@antinode.info>
+Subject: Do not ignore extra fields containing Unix Timestamps
+Bug-Debian: https://bugs.debian.org/842993
+X-Debian-version: 6.0-21
+
+--- a/process.c
++++ b/process.c
+@@ -2914,10 +2914,13 @@
+             break;
+ 
+           case EF_IZUNIX2:
+-            if (have_new_type_eb == 0) {
+-                flags &= ~0x0ff;        /* ignore any previous IZUNIX field */
++            if (have_new_type_eb == 0) {        /* (< 1) */
+                 have_new_type_eb = 1;
+             }
++            if (have_new_type_eb <= 1) {
++                /* Ignore any prior (EF_IZUNIX/EF_PKUNIX) UID/GID. */
++                flags &= 0x0ff;
++            }
+ #ifdef IZ_HAVE_UXUIDGID
+             if (have_new_type_eb > 1)
+                 break;          /* IZUNIX3 overrides IZUNIX2 e.f. block ! */
+@@ -2933,6 +2936,8 @@
+             /* new 3rd generation Unix ef */
+             have_new_type_eb = 2;
+ 
++            /* Ignore any prior EF_IZUNIX/EF_PKUNIX/EF_IZUNIX2 UID/GID. */
++            flags &= 0x0ff;
+         /*
+           Version       1 byte      version of this extra field, currently 1
+           UIDSize       1 byte      Size of UID field
+@@ -2953,8 +2958,6 @@
+                 uid_size = *((EB_HEADSIZE + 1) + ef_buf);
+                 gid_size = *((EB_HEADSIZE + uid_size + 2) + ef_buf);
+ 
+-                flags &= ~0x0ff;      /* ignore any previous UNIX field */
+-
+                 if ( read_ux3_value((EB_HEADSIZE + 2) + ef_buf,
+                                     uid_size, &z_uidgid[0])
+                     &&
diff --git a/main/unzip/zipbomb-manpage.patch b/main/unzip/zipbomb-manpage.patch
new file mode 100644
index 00000000000..bcee827a0e2
--- /dev/null
+++ b/main/unzip/zipbomb-manpage.patch
@@ -0,0 +1,25 @@
+From 6fe72291a5563cdbcd2bdd87e36528537b7cdcfb Mon Sep 17 00:00:00 2001
+From: Jakub Martisko <jamartis@redhat.com>
+Date: Mon, 18 Nov 2019 14:17:46 +0100
+Subject: [PATCH] update the man page
+
+---
+ man/unzip.1 | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/man/unzip.1 b/man/unzip.1
+index 21816d1..4d66073 100644
+--- a/man/unzip.1
++++ b/man/unzip.1
+@@ -850,6 +850,8 @@ the specified zipfiles were not found.
+ invalid options were specified on the command line.
+ .IP 11
+ no matching files were found.
++.IP 12
++invalid zip file with overlapped components (possible zip-bomb). The zip-bomb checks can be disabled by using the UNZIP_DISABLE_ZIPBOMB_DETECTION=TRUE environment variable.
+ .IP 50
+ the disk is (or was) full during extraction.
+ .IP 51
+-- 
+2.23.0
+
diff --git a/main/unzip/zipbomb-part1.patch b/main/unzip/zipbomb-part1.patch
new file mode 100644
index 00000000000..35cf8565229
--- /dev/null
+++ b/main/unzip/zipbomb-part1.patch
@@ -0,0 +1,25 @@
+From 41beb477c5744bc396fa1162ee0c14218ec12213 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Mon, 27 May 2019 08:20:32 -0700
+Subject: [PATCH] Fix bug in undefer_input() that misplaced the input state.
+
+---
+ fileio.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/fileio.c b/fileio.c
+index c042987..bc00d74 100644
+--- a/fileio.c
++++ b/fileio.c
+@@ -530,8 +530,10 @@ void undefer_input(__G)
+          * This condition was checked when G.incnt_leftover was set > 0 in
+          * defer_leftover_input(), and it is NOT allowed to touch G.csize
+          * before calling undefer_input() when (G.incnt_leftover > 0)
+-         * (single exception: see read_byte()'s  "G.csize <= 0" handling) !!
++         * (single exception: see readbyte()'s  "G.csize <= 0" handling) !!
+          */
++        if (G.csize < 0L)
++            G.csize = 0L;
+         G.incnt = G.incnt_leftover + (int)G.csize;
+         G.inptr = G.inptr_leftover - (int)G.csize;
+         G.incnt_leftover = 0;
diff --git a/main/unzip/zipbomb-part2.patch b/main/unzip/zipbomb-part2.patch
new file mode 100644
index 00000000000..903c8457636
--- /dev/null
+++ b/main/unzip/zipbomb-part2.patch
@@ -0,0 +1,349 @@
+From 47b3ceae397d21bf822bc2ac73052a4b1daf8e1c Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Tue, 11 Jun 2019 22:01:18 -0700
+Subject: [PATCH] Detect and reject a zip bomb using overlapped entries.
+
+This detects an invalid zip file that has at least one entry that
+overlaps with another entry or with the central directory to the
+end of the file. A Fifield zip bomb uses overlapped local entries
+to vastly increase the potential inflation ratio. Such an invalid
+zip file is rejected.
+
+See https://www.bamsoftware.com/hacks/zipbomb/ for David Fifield's
+analysis, construction, and examples of such zip bombs.
+
+The detection maintains a list of covered spans of the zip files
+so far, where the central directory to the end of the file and any
+bytes preceding the first entry at zip file offset zero are
+considered covered initially. Then as each entry is decompressed
+or tested, it is considered covered. When a new entry is about to
+be processed, its initial offset is checked to see if it is
+contained by a covered span. If so, the zip file is rejected as
+invalid.
+
+This commit depends on a preceding commit: "Fix bug in
+undefer_input() that misplaced the input state."
+---
+ extract.c | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ globals.c |   1 +
+ globals.h |   3 +
+ process.c |  11 ++++
+ unzip.h   |   1 +
+ 5 files changed, 205 insertions(+), 1 deletion(-)
+
+diff --git a/extract.c b/extract.c
+index 1acd769..0973a33 100644
+--- a/extract.c
++++ b/extract.c
+@@ -319,6 +319,125 @@ static ZCONST char Far UnsupportedExtraField[] =
+   "\nerror:  unsupported extra-field compression type (%u)--skipping\n";
+ static ZCONST char Far BadExtraFieldCRC[] =
+   "error [%s]:  bad extra-field CRC %08lx (should be %08lx)\n";
++static ZCONST char Far NotEnoughMemCover[] =
++  "error: not enough memory for bomb detection\n";
++static ZCONST char Far OverlappedComponents[] =
++  "error: invalid zip file with overlapped components (possible zip bomb)\n";
++
++
++
++
++
++/* A growable list of spans. */
++typedef zoff_t bound_t;
++typedef struct {
++    bound_t beg;        /* start of the span */
++    bound_t end;        /* one past the end of the span */
++} span_t;
++typedef struct {
++    span_t *span;       /* allocated, distinct, and sorted list of spans */
++    size_t num;         /* number of spans in the list */
++    size_t max;         /* allocated number of spans (num <= max) */
++} cover_t;
++
++/*
++ * Return the index of the first span in cover whose beg is greater than val.
++ * If there is no such span, then cover->num is returned.
++ */
++static size_t cover_find(cover, val)
++    cover_t *cover;
++    bound_t val;
++{
++    size_t lo = 0, hi = cover->num;
++    while (lo < hi) {
++        size_t mid = (lo + hi) >> 1;
++        if (val < cover->span[mid].beg)
++            hi = mid;
++        else
++            lo = mid + 1;
++    }
++    return hi;
++}
++
++/* Return true if val lies within any one of the spans in cover. */
++static int cover_within(cover, val)
++    cover_t *cover;
++    bound_t val;
++{
++    size_t pos = cover_find(cover, val);
++    return pos > 0 && val < cover->span[pos - 1].end;
++}
++
++/*
++ * Add a new span to the list, but only if the new span does not overlap any
++ * spans already in the list. The new span covers the values beg..end-1. beg
++ * must be less than end.
++ *
++ * Keep the list sorted and merge adjacent spans. Grow the allocated space for
++ * the list as needed. On success, 0 is returned. If the new span overlaps any
++ * existing spans, then 1 is returned and the new span is not added to the
++ * list. If the new span is invalid because beg is greater than or equal to
++ * end, then -1 is returned. If the list needs to be grown but the memory
++ * allocation fails, then -2 is returned.
++ */
++static int cover_add(cover, beg, end)
++    cover_t *cover;
++    bound_t beg;
++    bound_t end;
++{
++    size_t pos;
++    int prec, foll;
++
++    if (beg >= end)
++    /* The new span is invalid. */
++        return -1;
++
++    /* Find where the new span should go, and make sure that it does not
++       overlap with any existing spans. */
++    pos = cover_find(cover, beg);
++    if ((pos > 0 && beg < cover->span[pos - 1].end) ||
++        (pos < cover->num && end > cover->span[pos].beg))
++        return 1;
++
++    /* Check for adjacencies. */
++    prec = pos > 0 && beg == cover->span[pos - 1].end;
++    foll = pos < cover->num && end == cover->span[pos].beg;
++    if (prec && foll) {
++        /* The new span connects the preceding and following spans. Merge the
++           following span into the preceding span, and delete the following
++           span. */
++        cover->span[pos - 1].end = cover->span[pos].end;
++        cover->num--;
++        memmove(cover->span + pos, cover->span + pos + 1,
++                (cover->num - pos) * sizeof(span_t));
++    }
++    else if (prec)
++        /* The new span is adjacent only to the preceding span. Extend the end
++           of the preceding span. */
++        cover->span[pos - 1].end = end;
++    else if (foll)
++        /* The new span is adjacent only to the following span. Extend the
++           beginning of the following span. */
++        cover->span[pos].beg = beg;
++    else {
++        /* The new span has gaps between both the preceding and the following
++           spans. Assure that there is room and insert the span.  */
++        if (cover->num == cover->max) {
++            size_t max = cover->max == 0 ? 16 : cover->max << 1;
++            span_t *span = realloc(cover->span, max * sizeof(span_t));
++            if (span == NULL)
++                return -2;
++            cover->span = span;
++            cover->max = max;
++        }
++        memmove(cover->span + pos + 1, cover->span + pos,
++                (cover->num - pos) * sizeof(span_t));
++        cover->num++;
++        cover->span[pos].beg = beg;
++        cover->span[pos].end = end;
++    }
++    return 0;
++}
+ 
+ 
+ 
+@@ -374,6 +493,29 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+     }
+ #endif /* !SFX || SFX_EXDIR */
+ 
++    /* One more: initialize cover structure for bomb detection. Start with a
++       span that covers the central directory though the end of the file. */
++    if (G.cover == NULL) {
++        G.cover = malloc(sizeof(cover_t));
++        if (G.cover == NULL) {
++            Info(slide, 0x401, ((char *)slide,
++              LoadFarString(NotEnoughMemCover)));
++            return PK_MEM;
++        }
++        ((cover_t *)G.cover)->span = NULL;
++        ((cover_t *)G.cover)->max = 0;
++    }
++    ((cover_t *)G.cover)->num = 0;
++    if ((G.extra_bytes != 0 &&
++         cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
++        cover_add((cover_t *)G.cover,
++                  G.extra_bytes + G.ecrec.offset_start_central_directory,
++                  G.ziplen) != 0) {
++        Info(slide, 0x401, ((char *)slide,
++          LoadFarString(NotEnoughMemCover)));
++        return PK_MEM;
++    }
++
+ /*---------------------------------------------------------------------------
+     The basic idea of this function is as follows.  Since the central di-
+     rectory lies at the end of the zipfile and the member files lie at the
+@@ -591,7 +733,8 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+             if (error > error_in_archive)
+                 error_in_archive = error;
+             /* ...and keep going (unless disk full or user break) */
+-            if (G.disk_full > 1 || error_in_archive == IZ_CTRLC) {
++            if (G.disk_full > 1 || error_in_archive == IZ_CTRLC ||
++                error == PK_BOMB) {
+                 /* clear reached_end to signal premature stop ... */
+                 reached_end = FALSE;
+                 /* ... and cancel scanning the central directory */
+@@ -1060,6 +1203,11 @@ static int extract_or_test_entrylist(__G__ numchunk,
+ 
+         /* seek_zipf(__G__ pInfo->offset);  */
+         request = G.pInfo->offset + G.extra_bytes;
++        if (cover_within((cover_t *)G.cover, request)) {
++            Info(slide, 0x401, ((char *)slide,
++              LoadFarString(OverlappedComponents)));
++            return PK_BOMB;
++        }
+         inbuf_offset = request % INBUFSIZ;
+         bufstart = request - inbuf_offset;
+ 
+@@ -1591,6 +1739,18 @@ static int extract_or_test_entrylist(__G__ numchunk,
+             return IZ_CTRLC;        /* cancel operation by user request */
+         }
+ #endif
++        error = cover_add((cover_t *)G.cover, request,
++                          G.cur_zipfile_bufstart + (G.inptr - G.inbuf));
++        if (error < 0) {
++            Info(slide, 0x401, ((char *)slide,
++              LoadFarString(NotEnoughMemCover)));
++            return PK_MEM;
++        }
++        if (error != 0) {
++            Info(slide, 0x401, ((char *)slide,
++              LoadFarString(OverlappedComponents)));
++            return PK_BOMB;
++        }
+ #ifdef MACOS  /* MacOS is no preemptive OS, thus call event-handling by hand */
+         UserStop();
+ #endif
+@@ -1992,6 +2152,34 @@ static int extract_or_test_member(__G)    /* return PK-type error code */
+     }
+ 
+     undefer_input(__G);
++
++    if ((G.lrec.general_purpose_bit_flag & 8) != 0) {
++        /* skip over data descriptor (harder than it sounds, due to signature
++         * ambiguity)
++         */
++#       define SIG 0x08074b50
++#       define LOW 0xffffffff
++        uch buf[12];
++        unsigned shy = 12 - readbuf((char *)buf, 12);
++        ulg crc = shy ? 0 : makelong(buf);
++        ulg clen = shy ? 0 : makelong(buf + 4);
++        ulg ulen = shy ? 0 : makelong(buf + 8); /* or high clen if ZIP64 */
++        if (crc == SIG &&                       /* if not SIG, no signature */
++            (G.lrec.crc32 != SIG ||             /* if not SIG, have signature */
++             (clen == SIG &&                    /* if not SIG, no signature */
++              ((G.lrec.csize & LOW) != SIG ||   /* if not SIG, have signature */
++               (ulen == SIG &&                  /* if not SIG, no signature */
++                (G.zip64 ? G.lrec.csize >> 32 : G.lrec.ucsize) != SIG
++                                                /* if not SIG, have signature */
++                )))))
++                   /* skip four more bytes to account for signature */
++                   shy += 4 - readbuf((char *)buf, 4);
++        if (G.zip64)
++            shy += 8 - readbuf((char *)buf, 8); /* skip eight more for ZIP64 */
++        if (shy)
++            error = PK_ERR;
++    }
++
+     return error;
+ 
+ } /* end function extract_or_test_member() */
+diff --git a/globals.c b/globals.c
+index fa8cca5..1e0f608 100644
+--- a/globals.c
++++ b/globals.c
+@@ -181,6 +181,7 @@ Uz_Globs *globalsCtor()
+ # if (!defined(NO_TIMESTAMPS))
+     uO.D_flag=1;    /* default to '-D', no restoration of dir timestamps */
+ # endif
++    G.cover = NULL;     /* not allocated yet */
+ #endif
+ 
+     uO.lflag=(-1);
+diff --git a/globals.h b/globals.h
+index 11b7215..2bdcdeb 100644
+--- a/globals.h
++++ b/globals.h
+@@ -260,12 +260,15 @@ typedef struct Globals {
+     ecdir_rec       ecrec;         /* used in unzip.c, extract.c */
+     z_stat   statbuf;              /* used by main, mapname, check_for_newer */
+ 
++    int zip64;                     /* true if Zip64 info in extra field */
++
+     int      mem_mode;
+     uch      *outbufptr;           /* extract.c static */
+     ulg      outsize;              /* extract.c static */
+     int      reported_backslash;   /* extract.c static */
+     int      disk_full;
+     int      newfile;
++    void     **cover;              /* used in extract.c for bomb detection */
+ 
+     int      didCRlast;            /* fileio static */
+     ulg      numlines;             /* fileio static: number of lines printed */
+diff --git a/process.c b/process.c
+index 1e9a1e1..d2e4dc3 100644
+--- a/process.c
++++ b/process.c
+@@ -637,6 +637,13 @@ void free_G_buffers(__G)     /* releases all memory allocated in global vars */
+     }
+ #endif
+ 
++    /* Free the cover span list and the cover structure. */
++    if (G.cover != NULL) {
++        free(*(G.cover));
++        free(G.cover);
++        G.cover = NULL;
++    }
++
+ } /* end function free_G_buffers() */
+ 
+ 
+@@ -1890,6 +1897,8 @@ int getZip64Data(__G__ ef_buf, ef_len)
+ #define Z64FLGS 0xffff
+ #define Z64FLGL 0xffffffff
+ 
++    G.zip64 = FALSE;
++
+     if (ef_len == 0 || ef_buf == NULL)
+         return PK_COOL;
+ 
+@@ -1927,6 +1936,8 @@ int getZip64Data(__G__ ef_buf, ef_len)
+ #if 0
+           break;                /* Expect only one EF_PKSZ64 block. */
+ #endif /* 0 */
++
++          G.zip64 = TRUE;
+         }
+
+         /* Skip this extra field block. */
+diff --git a/unzip.h b/unzip.h
+index 5b2a326..ed24a5b 100644
+--- a/unzip.h
++++ b/unzip.h
+@@ -645,6 +645,7 @@ typedef struct _Uzp_cdir_Rec {
+ #define PK_NOZIP           9   /* zipfile not found */
+ #define PK_PARAM          10   /* bad or illegal parameters specified */
+ #define PK_FIND           11   /* no files found */
++#define PK_BOMB           12   /* likely zip bomb */
+ #define PK_DISK           50   /* disk full */
+ #define PK_EOF            51   /* unexpected EOF */
+ 
diff --git a/main/unzip/zipbomb-part3.patch b/main/unzip/zipbomb-part3.patch
new file mode 100644
index 00000000000..3b8d67b7732
--- /dev/null
+++ b/main/unzip/zipbomb-part3.patch
@@ -0,0 +1,112 @@
+From 6d351831be705cc26d897db44f878a978f4138fc Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Thu, 25 Jul 2019 20:43:17 -0700
+Subject: [PATCH] Do not raise a zip bomb alert for a misplaced central
+ directory.
+
+There is a zip-like file in the Firefox distribution, omni.ja,
+which is a zip container with the central directory placed at the
+start of the file instead of after the local entries as required
+by the zip standard. This commit marks the actual location of the
+central directory, as well as the end of central directory records,
+as disallowed locations. This now permits such containers to not
+raise a zip bomb alert, where in fact there are no overlaps.
+---
+ extract.c | 25 +++++++++++++++++++------
+ process.c |  6 ++++++
+ unzpriv.h | 10 ++++++++++
+ 3 files changed, 35 insertions(+), 6 deletions(-)
+
+diff --git a/extract.c b/extract.c
+index 0973a33..1b73cb0 100644
+--- a/extract.c
++++ b/extract.c
+@@ -493,8 +493,11 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+     }
+ #endif /* !SFX || SFX_EXDIR */
+ 
+-    /* One more: initialize cover structure for bomb detection. Start with a
+-       span that covers the central directory though the end of the file. */
++    /* One more: initialize cover structure for bomb detection. Start with
++       spans that cover any extra bytes at the start, the central directory,
++       the end of central directory record (including the Zip64 end of central
++       directory locator, if present), and the Zip64 end of central directory
++       record, if present. */
+     if (G.cover == NULL) {
+         G.cover = malloc(sizeof(cover_t));
+         if (G.cover == NULL) {
+@@ -506,15 +509,25 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+         ((cover_t *)G.cover)->max = 0;
+     }
+     ((cover_t *)G.cover)->num = 0;
+-    if ((G.extra_bytes != 0 &&
+-         cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
+-        cover_add((cover_t *)G.cover,
++    if (cover_add((cover_t *)G.cover,
+                   G.extra_bytes + G.ecrec.offset_start_central_directory,
+-                  G.ziplen) != 0) {
++                  G.extra_bytes + G.ecrec.offset_start_central_directory +
++                  G.ecrec.size_central_directory) != 0) {
+         Info(slide, 0x401, ((char *)slide,
+           LoadFarString(NotEnoughMemCover)));
+         return PK_MEM;
+     }
++    if ((G.extra_bytes != 0 &&
++         cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
++        (G.ecrec.have_ecr64 &&
++         cover_add((cover_t *)G.cover, G.ecrec.ec64_start,
++                   G.ecrec.ec64_end) != 0) ||
++        cover_add((cover_t *)G.cover, G.ecrec.ec_start,
++                  G.ecrec.ec_end) != 0) {
++        Info(slide, 0x401, ((char *)slide,
++          LoadFarString(OverlappedComponents)));
++        return PK_BOMB;
++    }
+ 
+ /*---------------------------------------------------------------------------
+     The basic idea of this function is as follows.  Since the central di-
+diff --git a/process.c b/process.c
+index d2e4dc3..d75d405 100644
+--- a/process.c
++++ b/process.c
+@@ -1408,6 +1408,10 @@ static int find_ecrec64(__G__ searchlen)         /* return PK-class error */
+ 
+     /* Now, we are (almost) sure that we have a Zip64 archive. */
+     G.ecrec.have_ecr64 = 1;
++    G.ecrec.ec_start -= ECLOC64_SIZE+4;
++    G.ecrec.ec64_start = ecrec64_start_offset;
++    G.ecrec.ec64_end = ecrec64_start_offset +
++                       12 + makeint64(&byterec[ECREC64_LENGTH]);
+ 
+     /* Update the "end-of-central-dir offset" for later checks. */
+     G.real_ecrec_offset = ecrec64_start_offset;
+@@ -1542,6 +1546,8 @@ static int find_ecrec(__G__ searchlen)          /* return PK-class error */
+       makelong(&byterec[OFFSET_START_CENTRAL_DIRECTORY]);
+     G.ecrec.zipfile_comment_length =
+       makeword(&byterec[ZIPFILE_COMMENT_LENGTH]);
++    G.ecrec.ec_start = G.real_ecrec_offset;
++    G.ecrec.ec_end = G.ecrec.ec_start + 22 + G.ecrec.zipfile_comment_length;
+ 
+     /* Now, we have to read the archive comment, BEFORE the file pointer
+        is moved away backwards to seek for a Zip64 ECLOC64 structure.
+diff --git a/unzpriv.h b/unzpriv.h
+index dc9eff5..297b3c7 100644
+--- a/unzpriv.h
++++ b/unzpriv.h
+@@ -2185,6 +2185,16 @@ typedef struct VMStimbuf {
+        int have_ecr64;                  /* valid Zip64 ecdir-record exists */
+        int is_zip64_archive;            /* Zip64 ecdir-record is mandatory */
+        ush zipfile_comment_length;
++       zusz_t ec_start, ec_end;         /* offsets of start and end of the
++                                           end of central directory record,
++                                           including if present the Zip64
++                                           end of central directory locator,
++                                           which immediately precedes the
++                                           end of central directory record */
++       zusz_t ec64_start, ec64_end;     /* if have_ecr64 is true, then these
++                                           are the offsets of the start and
++                                           end of the Zip64 end of central
++                                           directory record */
+    } ecdir_rec;
+ 
+ 
diff --git a/main/unzip/zipbomb-part4.patch b/main/unzip/zipbomb-part4.patch
new file mode 100644
index 00000000000..beffa2c9987
--- /dev/null
+++ b/main/unzip/zipbomb-part4.patch
@@ -0,0 +1,25 @@
+From 5e2efcd633a4a1fb95a129a75508e7d769e767be Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Sun, 9 Feb 2020 20:36:28 -0800
+Subject: [PATCH] Fix bug in UZbunzip2() that incorrectly updated G.incnt.
+
+The update assumed a full buffer, which is not always full. This
+could result in a false overlapped element detection when a small
+bzip2-compressed file was unzipped. This commit remedies that.
+---
+ extract.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extract.c b/extract.c
+index d9866f9..0cb7bfc 100644
+--- a/extract.c
++++ b/extract.c
+@@ -3010,7 +3010,7 @@ __GDEF
+ #endif
+ 
+     G.inptr = (uch *)bstrm.next_in;
+-    G.incnt = (G.inbuf + INBUFSIZ) - G.inptr;  /* reset for other routines */
++    G.incnt -= G.inptr - G.inbuf;       /* reset for other routines */
+ 
+ uzbunzip_cleanup_exit:
+     err = BZ2_bzDecompressEnd(&bstrm);
diff --git a/main/unzip/zipbomb-part5.patch b/main/unzip/zipbomb-part5.patch
new file mode 100644
index 00000000000..ca6a43a7c5b
--- /dev/null
+++ b/main/unzip/zipbomb-part5.patch
@@ -0,0 +1,26 @@
+From 5c572555cf5d80309a07c30cf7a54b2501493720 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Sun, 9 Feb 2020 21:39:09 -0800
+Subject: [PATCH] Fix bug in UZinflate() that incorrectly updated G.incnt.
+
+The update assumed a full buffer, which is not always full. This
+could result in a false overlapped element detection when a small
+deflate-compressed file was unzipped using an old zlib. This
+commit remedies that.
+---
+ inflate.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/inflate.c b/inflate.c
+index 2f5a015..70e3cc0 100644
+--- a/inflate.c
++++ b/inflate.c
+@@ -700,7 +700,7 @@ int UZinflate(__G__ is_defl64)
+       G.dstrm.total_out));
+ 
+     G.inptr = (uch *)G.dstrm.next_in;
+-    G.incnt = (G.inbuf + INBUFSIZ) - G.inptr;  /* reset for other routines */
++    G.incnt -= G.inptr - G.inbuf;       /* reset for other routines */
+ 
+ uzinflate_cleanup_exit:
+     err = inflateReset(&G.dstrm);
diff --git a/main/unzip/zipbomb-part6.patch b/main/unzip/zipbomb-part6.patch
new file mode 100644
index 00000000000..3dce6e3421e
--- /dev/null
+++ b/main/unzip/zipbomb-part6.patch
@@ -0,0 +1,95 @@
+From 122050bac16fae82a460ff739fb1ca0f106e9d85 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Sat, 2 Jan 2021 13:09:34 -0800
+Subject: [PATCH] Determine Zip64 status entry-by-entry instead of for entire
+ file.
+
+Fixes a bug for zip files with mixed Zip64 and not Zip64 entries,
+which resulted in an incorrect data descriptor length. The bug is
+seen when a Zip64 entry precedes a non-Zip64 entry, in which case
+the data descriptor would have been assumed to be larger than it
+is, resulting in an incorrect bomb warning due to a perceived
+overlap with the next entry. This commit determines and saves the
+Zip64 status for each entry based on the central directory, and
+then computes the length of each data descriptor accordingly.
+---
+ extract.c | 5 +++--
+ globals.h | 2 --
+ process.c | 4 +---
+ unzpriv.h | 1 +
+ 4 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/extract.c b/extract.c
+index 504afd6..878817d 100644
+--- a/extract.c
++++ b/extract.c
+@@ -658,6 +658,7 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+                     break;
+                 }
+             }
++            G.pInfo->zip64 = FALSE;
+             if ((error = do_string(__G__ G.crec.extra_field_length,
+                 EXTRA_FIELD)) != 0)
+             {
+@@ -2187,12 +2188,12 @@ static int extract_or_test_member(__G)    /* return PK-type error code */
+              (clen == SIG &&                    /* if not SIG, no signature */
+               ((G.lrec.csize & LOW) != SIG ||   /* if not SIG, have signature */
+                (ulen == SIG &&                  /* if not SIG, no signature */
+-                (G.zip64 ? G.lrec.csize >> 32 : G.lrec.ucsize) != SIG
++                (G.pInfo->zip64 ? G.lrec.csize >> 32 : G.lrec.ucsize) != SIG
+                                                 /* if not SIG, have signature */
+                 )))))
+                    /* skip four more bytes to account for signature */
+                    shy += 4 - readbuf((char *)buf, 4);
+-        if (G.zip64)
++        if (G.pInfo->zip64)
+             shy += 8 - readbuf((char *)buf, 8); /* skip eight more for ZIP64 */
+         if (shy)
+             error = PK_ERR;
+diff --git a/globals.h b/globals.h
+index f9c6daf..a883c90 100644
+--- a/globals.h
++++ b/globals.h
+@@ -261,8 +261,6 @@ typedef struct Globals {
+     ecdir_rec       ecrec;         /* used in unzip.c, extract.c */
+     z_stat   statbuf;              /* used by main, mapname, check_for_newer */
+ 
+-    int zip64;                     /* true if Zip64 info in extra field */
+-
+     int      mem_mode;
+     uch      *outbufptr;           /* extract.c static */
+     ulg      outsize;              /* extract.c static */
+diff --git a/process.c b/process.c
+index d75d405..d643c6f 100644
+--- a/process.c
++++ b/process.c
+@@ -1903,8 +1903,6 @@ int getZip64Data(__G__ ef_buf, ef_len)
+ #define Z64FLGS 0xffff
+ #define Z64FLGL 0xffffffff
+ 
+-    G.zip64 = FALSE;
+-
+     if (ef_len == 0 || ef_buf == NULL)
+         return PK_COOL;
+ 
+@@ -1943,7 +1941,7 @@ int getZip64Data(__G__ ef_buf, ef_len)
+           break;                /* Expect only one EF_PKSZ64 block. */
+ #endif /* 0 */
+ 
+-          G.zip64 = TRUE;
++          G.pInfo->zip64 = TRUE;
+         }
+ 
+         /* Skip this extra field block. */
+diff --git a/unzpriv.h b/unzpriv.h
+index 09f288e..75b3359 100644
+--- a/unzpriv.h
++++ b/unzpriv.h
+@@ -2034,6 +2034,7 @@ typedef struct min_info {
+ #ifdef UNICODE_SUPPORT
+     unsigned GPFIsUTF8: 1;   /* crec gen_purpose_flag UTF-8 bit 11 is set */
+ #endif
++    unsigned zip64: 1;       /* true if entry has Zip64 extra block */
+ #ifndef SFX
+     char Far *cfilname;      /* central header version of filename */
+ #endif
diff --git a/main/unzip/zipbomb-switch.patch b/main/unzip/zipbomb-switch.patch
new file mode 100644
index 00000000000..c6d33c026b9
--- /dev/null
+++ b/main/unzip/zipbomb-switch.patch
@@ -0,0 +1,215 @@
+From 5b44c818b96193b3e240f38f61985fa2bc780eb7 Mon Sep 17 00:00:00 2001
+From: Jakub Martisko <jamartis@redhat.com>
+Date: Tue, 30 Nov 2021 15:42:17 +0100
+Subject: [PATCH] Add an option to disable the zipbomb detection
+
+This can be done by settting a newly introduced environment variable
+UNZIP_DISABLE_ZIPBOMB_DETECTION to {TRUE,True,true}. If the variable is unset, or
+set to any other value the zipbomb detection is left enabled.
+
+Example:
+	UNZIP_DISABLE_ZIPBOMB_DETECTION=True unzip ./zbsm.zip -d ./test
+---
+ extract.c | 85 ++++++++++++++++++++++++++++++-------------------------
+ unzip.c   | 15 ++++++++--
+ unzip.h   |  1 +
+ 3 files changed, 60 insertions(+), 41 deletions(-)
+
+diff --git a/extract.c b/extract.c
+index 878817d..3e58071 100644
+--- a/extract.c
++++ b/extract.c
+@@ -322,7 +322,8 @@ static ZCONST char Far BadExtraFieldCRC[] =
+ static ZCONST char Far NotEnoughMemCover[] =
+   "error: not enough memory for bomb detection\n";
+ static ZCONST char Far OverlappedComponents[] =
+-  "error: invalid zip file with overlapped components (possible zip bomb)\n";
++  "error: invalid zip file with overlapped components (possible zip bomb)\n \
++To unzip the file anyway, rerun the command with UNZIP_DISABLE_ZIPBOMB_DETECTION=TRUE environmnent variable\n";
+ 
+ 
+ 
+@@ -502,35 +503,37 @@ int extract_or_test_files(__G)    /* return PK-type error code */
+        the end of central directory record (including the Zip64 end of central
+        directory locator, if present), and the Zip64 end of central directory
+        record, if present. */
+-    if (G.cover == NULL) {
++    if (uO.zipbomb == TRUE) {
++      if (G.cover == NULL) {
+         G.cover = malloc(sizeof(cover_t));
+         if (G.cover == NULL) {
+-            Info(slide, 0x401, ((char *)slide,
+-              LoadFarString(NotEnoughMemCover)));
+-            return PK_MEM;
++            Info(slide, 0x401, ((char *)slide,
++              LoadFarString(NotEnoughMemCover)));
++            return PK_MEM;
+         }
+         ((cover_t *)G.cover)->span = NULL;
+         ((cover_t *)G.cover)->max = 0;
+-    }
+-    ((cover_t *)G.cover)->num = 0;
+-    if (cover_add((cover_t *)G.cover,
+-                  G.extra_bytes + G.ecrec.offset_start_central_directory,
+-                  G.extra_bytes + G.ecrec.offset_start_central_directory +
+-                  G.ecrec.size_central_directory) != 0) {
++    }
++    ((cover_t *)G.cover)->num = 0;
++    if (cover_add((cover_t *)G.cover,
++                  G.extra_bytes + G.ecrec.offset_start_central_directory,
++                  G.extra_bytes + G.ecrec.offset_start_central_directory +
++                  G.ecrec.size_central_directory) != 0) {
+         Info(slide, 0x401, ((char *)slide,
+-          LoadFarString(NotEnoughMemCover)));
++          LoadFarString(NotEnoughMemCover)));
+         return PK_MEM;
+-    }
+-    if ((G.extra_bytes != 0 &&
+-         cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
+-        (G.ecrec.have_ecr64 &&
+-         cover_add((cover_t *)G.cover, G.ecrec.ec64_start,
+-                   G.ecrec.ec64_end) != 0) ||
+-        cover_add((cover_t *)G.cover, G.ecrec.ec_start,
+-                  G.ecrec.ec_end) != 0) {
++    }
++    if ((G.extra_bytes != 0 &&
++         cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) ||
++        (G.ecrec.have_ecr64 &&
++         cover_add((cover_t *)G.cover, G.ecrec.ec64_start,
++                   G.ecrec.ec64_end) != 0) ||
++        cover_add((cover_t *)G.cover, G.ecrec.ec_start,
++                  G.ecrec.ec_end) != 0) {
+         Info(slide, 0x401, ((char *)slide,
+-          LoadFarString(OverlappedComponents)));
++          LoadFarString(OverlappedComponents)));
+         return PK_BOMB;
++      }
+     }
+ 
+ /*---------------------------------------------------------------------------
+@@ -1222,10 +1225,12 @@ static int extract_or_test_entrylist(__G__ numchunk,
+ 
+         /* seek_zipf(__G__ pInfo->offset);  */
+         request = G.pInfo->offset + G.extra_bytes;
+-        if (cover_within((cover_t *)G.cover, request)) {
++        if (uO.zipbomb == TRUE) {
++          if (cover_within((cover_t *)G.cover, request)) {
+             Info(slide, 0x401, ((char *)slide,
+-              LoadFarString(OverlappedComponents)));
++              LoadFarString(OverlappedComponents)));
+             return PK_BOMB;
++          }
+         }
+         inbuf_offset = request % INBUFSIZ;
+         bufstart = request - inbuf_offset;
+@@ -1758,17 +1763,19 @@ reprompt:
+             return IZ_CTRLC;        /* cancel operation by user request */
+         }
+ #endif
+-        error = cover_add((cover_t *)G.cover, request,
+-                          G.cur_zipfile_bufstart + (G.inptr - G.inbuf));
+-        if (error < 0) {
++        if (uO.zipbomb == TRUE) {
++          error = cover_add((cover_t *)G.cover, request,
++                            G.cur_zipfile_bufstart + (G.inptr - G.inbuf));
++          if (error < 0) {
+             Info(slide, 0x401, ((char *)slide,
+-              LoadFarString(NotEnoughMemCover)));
++                                LoadFarString(NotEnoughMemCover)));
+             return PK_MEM;
+-        }
+-        if (error != 0) {
++          }
++          if (error != 0) {
+             Info(slide, 0x401, ((char *)slide,
+-              LoadFarString(OverlappedComponents)));
++                                LoadFarString(OverlappedComponents)));
+             return PK_BOMB;
++          }
+         }
+ #ifdef MACOS  /* MacOS is no preemptive OS, thus call event-handling by hand */
+         UserStop();
+@@ -2171,8 +2178,8 @@ static int extract_or_test_member(__G)    /* return PK-type error code */
+     }
+ 
+     undefer_input(__G);
+-
+-    if ((G.lrec.general_purpose_bit_flag & 8) != 0) {
++    if (uO.zipbomb == TRUE) {
++      if ((G.lrec.general_purpose_bit_flag & 8) != 0) {
+         /* skip over data descriptor (harder than it sounds, due to signature
+          * ambiguity)
+          */
+@@ -2189,16 +2196,16 @@ static int extract_or_test_member(__G)    /* return PK-type error code */
+               ((G.lrec.csize & LOW) != SIG ||   /* if not SIG, have signature */
+                (ulen == SIG &&                  /* if not SIG, no signature */
+                 (G.pInfo->zip64 ? G.lrec.csize >> 32 : G.lrec.ucsize) != SIG
+-                                                /* if not SIG, have signature */
++                /* if not SIG, have signature */
+                 )))))
+-                   /* skip four more bytes to account for signature */
+-                   shy += 4 - readbuf((char *)buf, 4);
++          /* skip four more bytes to account for signature */
++          shy += 4 - readbuf((char *)buf, 4);
+         if (G.pInfo->zip64)
+-            shy += 8 - readbuf((char *)buf, 8); /* skip eight more for ZIP64 */
++          shy += 8 - readbuf((char *)buf, 8); /* skip eight more for ZIP64 */
+         if (shy)
+-            error = PK_ERR;
++          error = PK_ERR;
++      }
+     }
+-
+     return error;
+ 
+ } /* end function extract_or_test_member() */
+diff --git a/unzip.c b/unzip.c
+index 8dbfc95..abb3644 100644
+--- a/unzip.c
++++ b/unzip.c
+@@ -1329,10 +1329,9 @@ int uz_opts(__G__ pargc, pargv)
+     int *pargc;
+     char ***pargv;
+ {
+-    char **argv, *s;
++    char **argv, *s, *zipbomb_envar;
+     int argc, c, error=FALSE, negative=0, showhelp=0;
+ 
+-
+     argc = *pargc;
+     argv = *pargv;
+ 
+@@ -1923,6 +1922,18 @@ opts_done:  /* yes, very ugly...but only used by UnZipSFX with -x xlist */
+     else
+         G.extract_flag = TRUE;
+ 
++    /* Disable the zipbomb detection, this is the only option set only via the shell variables but it should at least not clash with something in the future. */
++    zipbomb_envar = getenv("UNZIP_DISABLE_ZIPBOMB_DETECTION");
++    uO.zipbomb = TRUE;
++    if (zipbomb_envar != NULL) {
++      /* strcasecmp might be a better approach here but it is POSIX-only */
++      if ((strcmp ("TRUE", zipbomb_envar) == 0)
++       || (strcmp ("True", zipbomb_envar) == 0)
++       || (strcmp ("true",zipbomb_envar) == 0)) {
++        uO.zipbomb = FALSE;
++      }
++    }
++
+     *pargc = argc;
+     *pargv = argv;
+     return PK_OK;
+diff --git a/unzip.h b/unzip.h
+index ed24a5b..e7665e8 100644
+--- a/unzip.h
++++ b/unzip.h
+@@ -559,6 +559,7 @@ typedef struct _UzpOpts {
+ #ifdef UNIX
+     int cflxflag;       /* -^: allow control chars in extracted filenames */
+ #endif
++  int zipbomb;
+ #endif /* !FUNZIP */
+ } UzpOpts;
+ 
+-- 
+2.33.0
+
diff --git a/main/uriparser/APKBUILD b/main/uriparser/APKBUILD
deleted file mode 100644
index 8b464470cc7..00000000000
--- a/main/uriparser/APKBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Contributor: Leo <thinkabit.ukim@gmail.com>
-# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
-pkgname=uriparser
-pkgver=0.9.3
-pkgrel=1
-pkgdesc="A strictly RFC 3986 compliant URI parsing and handling library"
-url="https://uriparser.github.io/"
-arch="all"
-license="BSD-3-Clause"
-makedepends="cmake gtest-dev"
-subpackages="$pkgname-dev lib$pkgname:libs"
-source="https://github.com/uriparser/uriparser/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2
-	disable-test.patch"
-builddir="$srcdir/$pkgname-$pkgver"
-
-build() {
-	cd "$builddir"
-	if [ "$CBUILD" != "$CHOST" ]; then
-		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
-	fi
-	cmake \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib \
-		-DBUILD_SHARED_LIBS=True \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DURIPARSER_BUILD_DOCS=OFF \
-		-DURIPARSER_BUILD_TOOLS=ON \
-		-DURIPARSER_BUILD_TESTS=ON \
-		-DBUILD_SHARED_LIBS=ON \
-		${CMAKE_CROSSOPTS}
-	make
-}
-
-check() {
-	cd "$builddir"
-	make test ARGS=--verbose
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="424419ea7b5f945b37ea06091d59e731c6a7ee76e7998f8a4e598036b3de8b593d62d1af6c6ddc7c31b43fc6795d4a5fa8d50da2508ca19de100a2222106fa3e  uriparser-0.9.3.tar.bz2
-d4fb8786cf5580713ec5f8babfe6e4c91482e00e20c46bc700b05e8f01739ce692834b9bc7d76eabb9263afea2655a27f69cec4215ba39204a8476729fcf67f1  disable-test.patch"
diff --git a/main/uriparser/disable-test.patch b/main/uriparser/disable-test.patch
deleted file mode 100644
index 03c771d3d22..00000000000
--- a/main/uriparser/disable-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 749fea1..b112f9b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -245,7 +245,6 @@ if(URIPARSER_BUILD_TESTS)
- 
-     add_executable(testrunner
-         test/FourSuite.cpp
--        test/MemoryManagerSuite.cpp
-         test/test.cpp
-         test/VersionSuite.cpp
- 
-
diff --git a/main/usb-modeswitch/APKBUILD b/main/usb-modeswitch/APKBUILD
index 5c89f98de5c..1390c54e5f0 100644
--- a/main/usb-modeswitch/APKBUILD
+++ b/main/usb-modeswitch/APKBUILD
@@ -1,20 +1,22 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=usb-modeswitch
-pkgver=2.6.0
-pkgrel=1
-_pkgdata=20170806
+pkgver=2.6.1
+pkgrel=3
+_pkgdata=20191128
 pkgdesc="A mode switching tool for controlling flip flop (multiple device) USB gear"
-url="http://www.draisberghof.de/usb_modeswitch/"
+url="https://www.draisberghof.de/usb_modeswitch/"
 arch="all"
 license="GPL-2.0-or-later"
-makedepends="libusb-compat-dev coreutils"
-subpackages="$pkgname-doc $pkgname-udev"
+makedepends="libusb-dev coreutils"
+subpackages="$pkgname-doc $pkgname-udev::noarch"
 options="!check" # no testsuite
-source="http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-$pkgver.tar.bz2
-		http://www.draisberghof.de/usb_modeswitch/$pkgname-data-$_pkgdata.tar.bz2
-		usb_modeswitch.setup"
+source="https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-$pkgver.tar.bz2
+	https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-$_pkgdata.tar.bz2
+	usb_modeswitch.setup"
 
 prepare() {
+	default_prepare
+
 	make clean
 	sed -i -e 's/--mode=/-m/' Makefile
 
@@ -46,6 +48,8 @@ udev() {
 		"$subpkgdir"/usr/sbin/
 }
 
-sha512sums="43e6d885380602ddaaf771af73a302a7de30f7ae6ea58b2b572a9ad9ec77a453789020595de33a8b04ec209414fe08face2bbf84c67271d7b6b90700face09ef  usb-modeswitch-2.6.0.tar.bz2
-818bc9f3d9b75df245bb25f959075041667607e7681bdbca7006ec036613130a0fa5e41da9e939ca510e524a78a7a76aef82ecfbbe19611887b3735987b951cc  usb-modeswitch-data-20170806.tar.bz2
-48bc921849c529059c35f00e9cb10e92fee32622d63291bbd7184039bbe4c4324591b4011b24cf9b6c4ed2a7ad90fe0d5287a58631de5114b36f70d4f6f3c250  usb_modeswitch.setup"
+sha512sums="
+5d800b45257ca1182a13155dc37b614ee2d93273ed226cc9d05b6ae423f9e88b7c9aca6829604bdb86f68707ddf2c51c9ad2bcf898b8261b2c5bb56a21351e1e  usb-modeswitch-2.6.1.tar.bz2
+4b5954ad83f7281e42321c16f5cc5b956923cc0e2db5f238cc64b3ea37a419768f01f2e26310f2b4fe9a9a5b1d901517933effd6e6edd23bc9b8d0c039ed0ba2  usb-modeswitch-data-20191128.tar.bz2
+48bc921849c529059c35f00e9cb10e92fee32622d63291bbd7184039bbe4c4324591b4011b24cf9b6c4ed2a7ad90fe0d5287a58631de5114b36f70d4f6f3c250  usb_modeswitch.setup
+"
diff --git a/main/usbredir/APKBUILD b/main/usbredir/APKBUILD
deleted file mode 100644
index 9c3956b125b..00000000000
--- a/main/usbredir/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=usbredir
-pkgver=0.8.0
-pkgrel=0
-pkgdesc="USB network redirection protocol libraries"
-url="http://spice-space.org/page/UsbRedir"
-arch="all"
-options="!check"  # No test suite.
-license="GPL-2.0-or-later LGPL-2.1-or-later"
-makedepends="libusb-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-server"
-source="https://www.spice-space.org/download/$pkgname/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--disable-static
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-server() {
-	pkgdesc="Simple USB host TCP server"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/sbin "$subpkgdir"/usr/
-}
-
-sha512sums="976274adf08f8691b0961f5238021e988a4347873d0c67576038f44cbdaf25c2bb325d8cede0a507933b719f9715b1508ccd1d8f52fccd36f13a7640553dc108  usbredir-0.8.0.tar.bz2"
diff --git a/main/usbutils/APKBUILD b/main/usbutils/APKBUILD
index 326b4efd4b7..84a6d451537 100644
--- a/main/usbutils/APKBUILD
+++ b/main/usbutils/APKBUILD
@@ -1,28 +1,24 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=usbutils
-pkgver=012
+pkgver=017
 pkgrel=1
 pkgdesc="USB Device Utilities"
-url="http://linux-usb.sourceforge.net/"
+url="https://linux-usb.sourceforge.net/"
 arch="all"
 license="GPL-2.0-or-later"
-subpackages="$pkgname-doc"
-depends="hwids-usb"
+subpackages="$pkgname-doc $pkgname-dev"
+depends="hwdata-usb"
 makedepends="libusb-dev eudev-dev autoconf automake bash libtool linux-headers"
-source="https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-$pkgver.tar.xz
+source="$pkgname-$pkgver.tar.gz::https://github.com/gregkh/usbutils/archive/refs/tags/v$pkgver.tar.gz
 	hwdata.patch
 	"
 
-builddir="$srcdir"/$pkgname-$pkgver
-
 prepare() {
-	cd "$builddir"
 	default_prepare
 	./autogen.sh
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -34,14 +30,14 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e26a60229e6eed5de670d6511dd1fa5ee3453cc5a848820531b46a1678b69378a2a45c29e24a218a8e7065c2c345356f03a2992f8298ddae6c8026d181f8de66  usbutils-012.tar.xz
-a4528968287aca8ce752c133e4bae4d7f0253f4d5bcd2a0e66186ca5a81a237e2f088bd9a4cd595be8b08c6a1ab27ca88b92aac7ff9c3d36176dca9a2b7b44fe  hwdata.patch"
+sha512sums="
+46fbeaa7459cc6a34cc4f1c6b124ea138636c756956bde66ed291e693ebbd9520cd4d4851c94bb0b1a3a1164f550a67f618fba1070bbbbdd55b6968191ebae91  usbutils-017.tar.gz
+2d93f40bec3c9bd5a810b11449fbc1e8a7edbcd8bf4ca4ea8fd320eca81f31f0d8be1e886e0711fe18104d31c99f04aeb1e73970df3a2e40bfd50c17738c5b9d  hwdata.patch
+"
diff --git a/main/usbutils/hwdata.patch b/main/usbutils/hwdata.patch
index 8a3bfbdd173..13fa2f8b8f5 100644
--- a/main/usbutils/hwdata.patch
+++ b/main/usbutils/hwdata.patch
@@ -9,12 +9,12 @@
  	vid = 0
  	did = 0
  	modes = myenum('Vendor', 'Class', 'Misc')
-@@ -463,7 +463,7 @@
+@@ -470,7 +470,7 @@
  	print("  -C, --no-color        disable colors")
  	print("  -e, --endpoints       display endpoint info")
  	print("  -f FILE, --usbids-path FILE")
 -	print("                        override filename for /usr/share/usb.ids")
 +	print("                        override filename for /usr/share/hwdata/usb.ids")
+ 	print("  -w, --wakeup          display power wakeup setting")
  	print()
  	print("Use lsusb.py -ciu to get a nice overview of your USB devices.")
- 
diff --git a/main/userspace-rcu/APKBUILD b/main/userspace-rcu/APKBUILD
index 135ce35d353..1294d2a07c1 100644
--- a/main/userspace-rcu/APKBUILD
+++ b/main/userspace-rcu/APKBUILD
@@ -2,10 +2,10 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=userspace-rcu
-pkgver=0.11.1
-pkgrel=0
-pkgdesc="A userspace RCU (read-copy-update) library"
-url="http://liburcu.org/"
+pkgver=0.14.0
+pkgrel=2
+pkgdesc="Userspace RCU (read-copy-update) library"
+url="https://liburcu.org/"
 arch="all"
 license="LGPL-2.1-or-later"
 makedepends="bash perl perl-utils"
@@ -13,7 +13,6 @@ subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 source="https://lttng.org/files/urcu/userspace-rcu-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,13 +25,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 	#make regtest # Somewhat long regression tests
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
@@ -53,4 +50,6 @@ static() {
 	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib
 }
 
-sha512sums="112f7be1b72edfbad61582bb9962e2cf3c83415d12886cecb8239ab3263d1d07310b097813ac206aa9d4622953099100f0f54375d5ba345a3c87159c4b27bdc3  userspace-rcu-0.11.1.tar.bz2"
+sha512sums="
+7297e51012f4c44ee27c0e18ed9d87bf24be34db68a5398394c1e683a045bb561cf74aa913398404c0ed5cb8011af728ea12947717fa5f27627e5ca78e63a40f  userspace-rcu-0.14.0.tar.bz2
+"
diff --git a/main/util-linux/0001-libblkid-Fix-segfault-when-blkid.conf-doesn-t-exist.patch b/main/util-linux/0001-libblkid-Fix-segfault-when-blkid.conf-doesn-t-exist.patch
new file mode 100644
index 00000000000..b1d83c05a6f
--- /dev/null
+++ b/main/util-linux/0001-libblkid-Fix-segfault-when-blkid.conf-doesn-t-exist.patch
@@ -0,0 +1,78 @@
+From 7e357241b413a01c37b0b4d064bc0a47e3259361 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 1 Apr 2024 12:14:50 +0200
+Subject: [PATCH] libblkid: Fix segfault when blkid.conf doesn't exist
+
+* Move 'line' and 'uevent' to the beginning of the LIBECONF code.
+* Remove unwanted space between function name and arguments.
+* Check for 'line' pointer before dereferencing.
+
+References: https://github.com/util-linux/util-linux/pull/2883
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ libblkid/src/config.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/libblkid/src/config.c b/libblkid/src/config.c
+index 7b8b04f92..66c1864f0 100644
+--- a/libblkid/src/config.c
++++ b/libblkid/src/config.c
+@@ -153,6 +153,8 @@ struct blkid_config *blkid_read_config(const char *filename)
+ #else /* !HAVE_LIBECONF */
+ 
+ 	static econf_file *file = NULL;
++	char *line = NULL;
++	bool uevent = false;
+ 	econf_err error;
+ 
+ 	if (filename) {
+@@ -187,7 +189,6 @@ struct blkid_config *blkid_read_config(const char *filename)
+ 		}
+ 	}
+ 
+-	bool uevent = false;
+ 	if ((error = econf_getBoolValue(file, NULL, "SEND_UEVENT", &uevent))) {
+ 		if (error != ECONF_NOKEY) {
+ 			DBG(CONFIG, ul_debug("couldn't fetch SEND_UEVENT corrently: %s", econf_errString(error)));
+@@ -209,7 +210,6 @@ struct blkid_config *blkid_read_config(const char *filename)
+ 		}
+ 	}
+ 
+-	char *line = NULL;
+ 	if ((error = econf_getStringValue(file, NULL, "EVALUATE", &line))) {
+ 		conf->nevals = 0;
+ 		if (error != ECONF_NOKEY) {
+@@ -219,7 +219,7 @@ struct blkid_config *blkid_read_config(const char *filename)
+ 			DBG(CONFIG, ul_debug("key CACHE_FILE not found, using built-in default "));
+ 		}
+ 	} else {
+-		if (*line && parse_evaluate(conf, line) == -1)
++		if (line && *line && parse_evaluate(conf, line) == -1)
+ 			goto err;
+ 	}
+ 
+@@ -238,8 +238,8 @@ dflt:
+ 	if (f)
+ 		fclose(f);
+ #else
+-	econf_free (file);
+-	free (line);
++	econf_free(file);
++	free(line);
+ #endif
+ 	return conf;
+ err:
+@@ -248,8 +248,8 @@ err:
+ #ifndef HAVE_LIBECONF
+ 	fclose(f);
+ #else
+-	econf_free (file);
+-	free (line);
++	econf_free(file);
++	free(line);
+ #endif
+ 	return NULL;
+ }
+-- 
+2.44.0
+
diff --git a/main/util-linux/APKBUILD b/main/util-linux/APKBUILD
index f649168c6f2..aa29dc31dad 100644
--- a/main/util-linux/APKBUILD
+++ b/main/util-linux/APKBUILD
@@ -2,171 +2,357 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=util-linux
-pkgver=2.35.1
-
-case $pkgver in
-	*.*.*) _v=${pkgver%.*};;
-	*.*) _v=$pkgver;;
-esac
-
+pkgver=2.40
 pkgrel=1
 pkgdesc="Random collection of Linux utilities"
 url="https://git.kernel.org/cgit/utils/util-linux/util-linux.git"
 arch="all"
-license="GPL-2.0 GPL-2.0-or-later LGPL-2.0-or-later BSD Public-Domain"
-depends="findmnt"
-makedepends_build="autoconf automake libtool"
-makedepends_host="zlib-dev ncurses-dev linux-headers libcap-ng-dev"
-options="suid"
-source="https://www.kernel.org/pub/linux/utils/util-linux/v$_v/util-linux-$pkgver.tar.xz
-	ttydefaults.h
+license="GPL-3.0-or-later AND GPL-2.0-or-later AND GPL-2.0-only AND
+	GPL-1.0-only AND LGPL-2.1-or-later AND LGPL-1.0-only AND BSD-1-Clause AND
+	BSD-3-Clause AND BSD-4-Clause-UC AND MIT AND Public-Domain"
+checkdepends="bash findutils xz"
+makedepends_host="
+	libcap-ng-dev
+	linux-headers
+	ncurses-dev
+	sqlite-dev
+	zlib-dev
+	"
+subpackages="
+	$pkgname-bash-completion
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-openrc
+
+	libblkid:_mv_lib
+	libfdisk:_mv_lib
+	libmount:_mv_lib
+	libsmartcols:_mv_lib
+	libuuid:_mv_lib
+
+	agetty:_mv_bin
+	blkid:_mv_bin
+	cfdisk:_mv_bin
+	findmnt:_mv_bin
+	flock:_mv_bin
+	fstrim:_mv_bin
+	hexdump:_mv_bin
+	logger:_mv_bin
+	losetup:_mv_bin
+	lsblk:_mv_bin
+	mcookie:_mv_bin
+	mount:_mv_bin
+	partx:_mv_bin
+	setarch:_mv_bin
+	setpriv:_mv_bin
+	sfdisk:_mv_bin
+	umount:_mv_bin
+	uuidgen:_mv_bin
+	wipefs:_mv_bin
 	"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:bashcomp:noarch
-	libuuid libblkid libmount libsmartcols libfdisk sfdisk cfdisk
-	findmnt:_findmnt mcookie blkid setpriv"
 if [ -z "$BOOTSTRAP" ]; then
-	makedepends_host="$makedepends_host python3-dev"
-	subpackages="$subpackages py3-libmount:_py3"
+	checkdepends="bash findutils xz procps coreutils"
+	makedepends_build="$makedepends_build asciidoctor"
+	makedepends_host="$makedepends_host
+		linux-pam-dev
+		python3-dev
+		libeconf-dev
+		utmps-dev
+		utmps-static
+		"
+	subpackages="$subpackages
+		$pkgname-login
+		$pkgname-login-doc:_login_doc:noarch
+		runuser:_mv_bin
+		py3-libmount:_py3
+		"
+	_bootstrap_config="--enable-runuser --with-python=3 --with-econf"
 else
-	_bootstrap_config="--without-python"
+	options="!check"
+	_bootstrap_config="--without-python --without-econf --disable-asciidoc --disable-login"
 fi
+subpackages="$subpackages $pkgname-doc $pkgname-misc"
 makedepends="$makedepends_build $makedepends_host"
-replaces="e2fsprogs util-linux-ng"
+builddir="$srcdir/util-linux-$pkgver"
+options="$options suid"
+
+case $pkgver in
+	*.*.*) _v=${pkgver%.*};;
+	*.*) _v=$pkgver;;
+esac
+source="https://www.kernel.org/pub/linux/utils/util-linux/v$_v/util-linux-$pkgver.tar.xz
+	utmps.patch
+	0001-libblkid-Fix-segfault-when-blkid.conf-doesn-t-exist.patch
+	ttydefaults.h
+	rfkill.confd
+	rfkill.initd
+	su-l.pamd
+	"
+
+# secfixes:
+#   2.40-r0:
+#     - CVE-2024-28085
+#   2.37.4-r0:
+#     - CVE-2022-0563
+#   2.37.3-r0:
+#     - CVE-2021-3995
+#     - CVE-2021-3996
+#   2.37.2-r0:
+#     - CVE-2021-37600
+
+# login utils included in subpackage util-linux-login.
+_login_cmds='newgrp last lastb login lslogins nologin su sulogin'
 
 prepare() {
 	default_prepare
 
 	cp "$srcdir"/ttydefaults.h include/
-	libtoolize --force && aclocal -I m4 && autoconf \
-		&& automake --add-missing
+
+	# these fail on the package builders
+	rm -fv tests/ts/lsfd/mkfds-netlink-protocol
+	rm -fv tests/ts/lsfd/option-inet
+	# these are flakey on the package builders
+	rm -fv tests/ts/lsfd/mkfds-rw-character-device
+	rm -fv tests/ts/lsfd/mkfds-multiplexing
+
+	case "$CARCH" in
+	ppc64le)
+		# these fail on the CI builder
+		rm -fv tests/ts/lsfd/mkfds-unix-stream-requiring-sockdiag
+		rm -fv tests/ts/lsfd/mkfds-socketpair
+		;;
+	esac
 }
 
 build() {
-	# login utils are provided by shadow (with PAM) or busybox (no PAM) --nenolod
+	if [ -z "$BOOTSTRAP" ]; then
+		# Linking utmps statically is strongly preferred by the utmps author
+		# and also much more space efficient - adds 4 kiB to each binary, that's
+		# 20 kiB in total for util-linux-*, versus 196 kiB (libskarnet.so).
+		# TODO: Find a better way (libutmps.so w/o dependency on libskarnet.so)?
+		# also throw in lto when not bootstrapping
+		export CFLAGS="$CFLAGS -ffat-lto-objects -flto=auto $(pkg-config --cflags --static utmps)"
+		export LDFLAGS="$LDFLAGS $(pkg-config --libs --static utmps)"
+	fi
+
+	# --disable-chfn-chsh - chfn and chsh are provided by shadow package
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--with-sysroot=$CBUILDROOT \
 		--prefix=/usr \
-		--enable-raw \
+		--disable-silent-rules \
+		--enable-newgrp \
 		--disable-uuidd \
 		--disable-nls \
-		--disable-tls \
 		--disable-kill \
-		--disable-login \
-		--disable-last \
-		--disable-sulogin \
-		--disable-su \
-		--with-python=3 \
+		--disable-chfn-chsh \
+		--with-vendordir=/usr/lib \
+		--enable-fs-paths-extra=/usr/sbin \
 		$_bootstrap_config
 	make
 }
 
+check() {
+	make check
+}
+
 package() {
-	make -j1 DESTDIR="$pkgdir" -C "$builddir" install
+	make DESTDIR="$pkgdir" install
+
+	# Move to /bin to overwrite busybox's version.
+	mv "$pkgdir"/usr/bin/getopt \
+		"$pkgdir"/usr/bin/rev "$pkgdir"/bin
+
 	# use pkg-config
-}
+	install -D -m755 "$srcdir"/rfkill.initd "$pkgdir"/etc/init.d/rfkill
+	install -D -m644 "$srcdir"/rfkill.confd "$pkgdir"/etc/conf.d/rfkill
 
-dev() {
-	depends_dev="$depends_dev util-linux=$pkgver-r$pkgrel"
-	default_dev
-	replaces="e2fsprogs-dev util-linux-ng-dev"
+	install -D -m644 "$srcdir"/su-l.pamd "$pkgdir"/etc/pam.d/su-l
 }
 
-bashcomp() {
-	pkgdesc="Bash completions for $pkgname"
-	depends=""
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
+_mv_bin() {
+	local binname=$subpkgname
+	pkgdesc="$binname tool from util-linux"
+	depends=
+	install_if="$pkgname=$pkgver-r$pkgrel"
 
-	mkdir -p "$subpkgdir"/usr/share/
-	mv "$pkgdir"/usr/share/bash-completion \
-		"$subpkgdir"/usr/share/
+	case "$binname" in
+		agetty)
+			license="Public-Domain"
+			pkgdesc="agetty program from util-linux"
+			;;
+		blkid)
+			license="LGPL-1.0-only"
+			pkgdesc="Block device identification tool from util-linux"
+			;;
+		cfdisk)
+			license="GPL-2.0-or-later"
+			pkgdesc="Curses based partition table manipulator from util-linux"
+			;;
+		findmnt)
+			license="GPL-2.0-or-later"
+			pkgdesc="Find mount from util-linux"
+			;;
+		flock)
+			license="MIT"
+			pkgdesc="File locker from util-linux"
+			;;
+		fstrim)
+			license="GPL-2.0-or-later"
+			pkgdesc="File system trim from util-linux"
+			;;
+		hexdump)
+			license="BSD-4-Clause-UC"
+			pkgdesc="Hexdump from util-linux"
+			;;
+		logger)
+			license="BSD-4-Clause-UC"
+			pkgdesc="Logger from util-linux"
+			;;
+		losetup)
+			license="GPL-2.0-or-later"
+			pkgdesc="Loop disk setup from util-linux"
+			;;
+		lsblk)
+			license="GPL-2.0-or-later"
+			pkgdesc="Block device list tool from util-linux"
+			;;
+		runuser)
+			license="GPL-2.0-or-later"
+			pkgdesc="Run a program with substitute user and group ID"
+			;;
+		mcookie)
+			license="Public-Domain"
+			pkgdesc="Generate random numbers for xauth from util-linux"
+			;;
+		partx)
+			license="GPL-2.0-or-later"
+			pkgdesc="Tell the kernel about disk partition changes from util-linux"
+			;;
+		setpriv)
+			license="GPL-2.0-or-later"
+			pkgdesc="Run a program with different Linux privilege settings"
+			;;
+		sfdisk)
+			license="GPL-1.0-or-later"
+			pkgdesc="Partition table manipulator from util-linux"
+			;;
+		uuidgen)
+			license="GPL-1.0-only"
+			pkgdesc="UUID generator from util-linux"
+			;;
+		wipefs)
+			license="GPL-2.0-or-later"
+			pkgdesc="Utility to wipe filesystems from device from util-linux"
+			;;
+	esac
+	local dir; for dir in usr/bin usr/sbin bin sbin; do
+		if [ -e "$pkgdir"/$dir/$binname ]; then
+			amove $dir/$binname
+			return 0
+		fi
+	done
+	return 1
 }
 
-blkid() {
-	pkgdesc="block device identification tool"
-	depends=""
-	replaces="util-linux-ng"
-	mkdir -p "$subpkgdir"/sbin
-	mv "$pkgdir"/sbin/blkid "$subpkgdir"/sbin/
-}
+_mv_lib() {
+	local libname=$subpkgname
+	pkgdesc="$libname library from util-linux"
+	depends=
 
-libuuid() {
-	pkgdesc="DCE compatible Universally Unique Identifier library"
-	depends=""
-	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/libuuid* "$subpkgdir"/lib/
+	case "$libname" in
+		libblkid)
+			license="LGPL-2.1-or-later"
+			pkgdesc="Block device identification library from util-linux"
+			;;
+		libfdisk)
+			license="LGPL-2.1-or-later"
+			pkgdesc="Partitioning library for fdisk-like programs"
+			;;
+		libmount)
+			license="LGPL-2.1-or-later"
+			pkgdesc="Block device identification library from util-linux"
+			;;
+		libsmartcols)
+			license="LGPL-2.1-or-later"
+			pkgdesc="Formatting library for ls-like programs"
+			;;
+		libuuid)
+			license="BSD-3-Clause"
+			pkgdesc="DCE compatible Universally Unique Identifier library"
+			;;
+	esac
+	amove lib/$libname.so.*
 }
 
-libblkid() {
-	pkgdesc="Block device identification library from util-linux"
-	depends=""
-	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/libblkid* "$subpkgdir"/lib/
-}
+login() {
+	license="GPL-2.0-or-later AND BSD-1-Clause"
+	pkgdesc="Login utils from util-linux package: ${_login_cmds// /, }"
+	depends="runuser=$pkgver-r$pkgrel"
+	# Commands in conflict with shadow-login: newgrp login nologin su
+	provides="login-utils"
+	provider_priority=100  # highest (other provider is shadow-login)
+	replaces="$pkgname-misc"  # for backward compatibility (Alpine <3.16)
 
-libmount() {
-	pkgdesc="Block device identification library from util-linux"
-	depends=""
-	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/libmount.so.* "$subpkgdir"/lib/
-}
+	cd "$pkgdir"
 
-libsmartcols() {
-	pkgdesc="Formatting library for ls-like programs."
-	depends=""
-	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/libsmartcols.so.* "$subpkgdir"/lib/
-}
+	local cmd dir
+	for cmd in $_login_cmds; do
+		for dir in bin sbin usr/bin usr/sbin; do
+			if [ -e $dir/$cmd ] || [ -L $dir/$cmd ]; then
+				amove $dir/$cmd
+				continue 2
+			fi
+		done
+		error "file $cmd not found"
+		return 1
+	done
 
-libfdisk() {
-	pkgdesc="Partitioning library for fdisk-like programs"
-	depends=""
-	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/libfdisk.so.* "$subpkgdir"/lib/
+	amove etc/pam.d/su-l
 }
 
-sfdisk() {
-	pkgdesc="Partition table manipulator from util-linux"
-	depends=""
-	mkdir -p "$subpkgdir"/sbin
-	mv "$pkgdir"/sbin/sfdisk "$subpkgdir"/sbin/
-}
+_login_doc() {
+	pkgdesc="Login utils from util-linux package (documentation)"
+	depends="!shadow-login-doc"
+	replaces="$pkgname-doc shadow-doc"  # for backward compatibility (Alpine <3.16)
+	install_if="docs $pkgname-login=$pkgver-r$pkgrel"
 
-cfdisk() {
-	pkgdesc="Curses based partition table manipulator from util-linux"
-	depends=""
-	mkdir -p "$subpkgdir"/sbin
-	mv "$pkgdir"/sbin/cfdisk "$subpkgdir"/sbin/
-}
+	local cmd; for cmd in $_login_cmds; do
+		amove usr/share/man/man*/$cmd.*
+	done
 
-mcookie() {
-	pkgdesc="mcookie from util-linux"
-	replaces="util-linux-ng"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/mcookie "$subpkgdir"/usr/bin/
+	find "$subpkgdir"/usr/share/man -type f ! -name "*.gz" \
+		-exec gzip -9 {} \;
 }
 
-setpriv() {
-	pkgdesc="Run a program with different Linux privilege settings"
-	replaces="util-linux-ng"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/setpriv "$subpkgdir"/usr/bin/
-}
+misc() {
+	pkgdesc="Misc binaries for $pkgname"
+	depends=
+	install="$pkgname-misc.post-upgrade"
+	install_if="$pkgname=$pkgver-r$pkgrel"
 
-_findmnt() {
-	pkgdesc="findmnt from util-linux"
-	depends=""
-	replaces=""
-	mkdir -p "$subpkgdir"/bin
-	mv "$pkgdir"/bin/findmnt "$subpkgdir"/bin
+	local dir; for dir in usr/bin usr/sbin bin sbin; do
+		if [ -e "$pkgdir"/$dir ]; then
+			amove $dir
+		fi
+	done
 }
 
 _py3() {
+	license="LGPL-2.1-or-later"
 	pkgdesc="python3 bindings to libmount"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/
+	depends=
+
+	amove usr/lib/python*
 }
 
-sha512sums="6e27e08bfc02378970f015decfea5a52d6c342c4c8f4ac48dd07d248485eb797e506d91d290dbbca344c3e5cfe1fc150db80a23d510367427232f5abeabe591a  util-linux-2.35.1.tar.xz
-876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9  ttydefaults.h"
+sha512sums="
+f06e61d4ee0e196223f7341ec75a16a6671f82d6e353823490ecff17e947bb169a6b65177e3ab0da6e733e079b24d6a77905a0e8bbfed82ca9aa22a3facb6180  util-linux-2.40.tar.xz
+c1c9cd816d20582438cda75a9c0ea4e687eee124e657172729aff410f52558be19cc5d649dae07c03f7618411e5aa6c23bcebc3fdf25529517a61b6b343966ef  utmps.patch
+d0fbba3fb3a7ca56e6c2fbe63557bac01c25389e21c51ff5c111463a96a7b8e2eacbc5d02db811dbc3807031543ec1fc759a9669ed26e059dafdce8ae16a1558  0001-libblkid-Fix-segfault-when-blkid.conf-doesn-t-exist.patch
+876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9  ttydefaults.h
+401d2ccbdbfb0ebd573ac616c1077e2c2b79ff03e9221007759d8ac25eb522c401f705abbf7daac183d5e8017982b8ec5dd0a5ebad39507c5bb0a9f31f04ee97  rfkill.confd
+b0e11226c611fd52d54f599a40d23c4f748d5bd6971732dba2d25581aedaf5d2c62bcb49515d175569ff9aa1cf49a3dff25d1a5d4dcd89428c7020fc7ea3a581  rfkill.initd
+0c8e764308ac1d084ebb4246eb97203de983bc0170066c958a56b412d9fd2f98da7f78f059e59512542c56a2639d6b2da35eff6469a48ebce6b2c406e94a96a7  su-l.pamd
+"
diff --git a/main/util-linux/rfkill.confd b/main/util-linux/rfkill.confd
new file mode 100644
index 00000000000..29e9c9800c0
--- /dev/null
+++ b/main/util-linux/rfkill.confd
@@ -0,0 +1,13 @@
+# RESTORE_ON_START:
+# Do you want to apply rfkill device configuration on startup?
+# no - Do not restore configuration
+# yes - Restore configuration
+
+RESTORE_ON_START="yes"
+
+# SAVE_ON_STOP:
+# Do you want to save rfkill device configuration?
+# no - Do not save configuration
+# yes - Save configuration
+
+SAVE_ON_STOP="yes"
diff --git a/main/util-linux/rfkill.initd b/main/util-linux/rfkill.initd
new file mode 100644
index 00000000000..fc0c800d4f7
--- /dev/null
+++ b/main/util-linux/rfkill.initd
@@ -0,0 +1,52 @@
+#!/sbin/openrc-run
+
+description="Save/Restore rfkill configuration"
+
+rfkillstatedir=/var/lib/rfkill
+
+extra_commands="save restore"
+
+depend() {
+	need localmount
+	after bootmisc modules isapnp coldplug hotplug
+}
+
+restore() {
+	ebegin "Restoring rfkill configuration"
+	if [ -d "$rfkillstatedir" ]; then
+		for type in "$rfkillstatedir"/*; do
+			status=$(cat "$type")
+			type=$(basename "$type")
+			rfkill "$status" "$type"
+		done
+	fi
+	eend 0
+}
+
+save() {
+	ebegin "Storing rfkill configuration"
+	mkdir -p "$rfkillstatedir"
+	OLDIFS="$IFS"
+	IFS=$'\n'
+	for line in $(rfkill -r -n); do
+		type=$(echo "$line" | cut -d' ' -f2)
+		status=$(echo "$line" | cut -d' ' -f4 | tr -d 'ed')
+		echo "$status" > "$rfkillstatedir"/"$type"
+	done
+	IFS="$OLDIFS"
+	eend 0
+}
+
+start() {
+	if [ "${RESTORE_ON_START}" = "yes" ]; then
+		restore
+	fi
+	return 0
+}
+
+stop() {
+	if [ "${SAVE_ON_STOP}" = "yes" ]; then
+		save
+	fi
+	return 0
+}
diff --git a/main/util-linux/su-l.pamd b/main/util-linux/su-l.pamd
new file mode 100644
index 00000000000..2bcc9b2f64e
--- /dev/null
+++ b/main/util-linux/su-l.pamd
@@ -0,0 +1,6 @@
+# basic PAM configuration for Alpine.
+auth     sufficient pam_rootok.so
+auth     include    base-auth
+account  include    base-account
+password include    base-password
+session  include    base-session
diff --git a/main/util-linux/util-linux-misc.post-upgrade b/main/util-linux/util-linux-misc.post-upgrade
new file mode 100644
index 00000000000..aa911c41e03
--- /dev/null
+++ b/main/util-linux/util-linux-misc.post-upgrade
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+ver_old=$2
+
+if [ "$(apk version -t "$ver_old" '2.38-r2')" = '<' ]; then
+	cat >&2 <<-EOF
+	*
+	* The mount and umount programs have been moved from util-linux-misc to
+	* individual subpackages. If you use them, run: "apk add mount umount".
+	*
+	EOF
+fi
+
+exit 0
diff --git a/main/util-linux/utmps.patch b/main/util-linux/utmps.patch
new file mode 100644
index 00000000000..529bb2ac95e
--- /dev/null
+++ b/main/util-linux/utmps.patch
@@ -0,0 +1,25 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Mon, 20 Dec 2021 18:52:00 +0100
+Subject: [PATCH] Add support for utmps
+
+The following programs use utmpx.h: last, login, lslogins, agetty, wall, write.
+
+Programs 'su' and 'runuser' include utmpx.h, but use only btmp which is not
+supported on Alpine.
+
+--- a/include/pathnames.h
++++ b/include/pathnames.h
+@@ -214,5 +214,13 @@
+ #define _PATH_DEV_RFKILL	"/dev/rfkill"
+ #define _PATH_SYS_RFKILL	"/sys/class/rfkill"
+ 
++#ifdef UTMPS_UTMPX_H
++/* override stub paths from <paths.h> with ones for utmps */
++# undef _PATH_UTMP
++# define _PATH_UTMP		UTMPX_FILE
++# undef _PATH_WTMP
++# define _PATH_WTMP		"/var/log/wtmp"
++#endif
++
+ 
+ #endif /* PATHNAMES_H */
diff --git a/main/util-macros/APKBUILD b/main/util-macros/APKBUILD
index 0ef1d291cb5..c180957cb06 100644
--- a/main/util-macros/APKBUILD
+++ b/main/util-macros/APKBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=util-macros
-pkgver=1.19.2
-pkgrel=1
+pkgver=1.20.0
+pkgrel=0
 pkgdesc="X.Org Autotools macros"
 url="https://xorg.freedesktop.org"
 arch="noarch"
 license="MIT"
-source="https://www.x.org/releases/individual/util/$pkgname-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/util/util-macros-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -18,16 +17,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-
-	mkdir -p "$pkgdir"/usr/lib
-	mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib
+	make pkgconfigdir=/usr/lib/pkgconfig DESTDIR="$pkgdir" install
 }
 
-sha512sums="3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619  util-macros-1.19.2.tar.bz2"
+sha512sums="
+76caefb118bf1675d7b2b96e1bbb04eb9a320b02e120839e55a22ef98538ecf00d0e686a67186fc8fdc8492d277ffe3125ae8b7ac61ce4739edc0de3f468d2eb  util-macros-1.20.0.tar.xz
+"
diff --git a/main/utmps/0001-add-stub-utmp.h.patch b/main/utmps/0001-add-stub-utmp.h.patch
new file mode 100644
index 00000000000..74e6a92468c
--- /dev/null
+++ b/main/utmps/0001-add-stub-utmp.h.patch
@@ -0,0 +1,54 @@
+From 3a4d3fc3f2f24b873d881567bae34fe59d165e6e Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Sun, 25 Oct 2020 13:54:25 -0600
+Subject: [PATCH] add stub utmp.h
+
+---
+ src/include/utmps/utmp.h | 35 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 35 insertions(+)
+ create mode 100644 src/include/utmps/utmp.h
+
+diff --git a/src/include/utmps/utmp.h b/src/include/utmps/utmp.h
+new file mode 100644
+index 0000000..ccd0cee
+--- /dev/null
++++ b/src/include/utmps/utmp.h
+@@ -0,0 +1,35 @@
++/* ISC license. */
++
++#ifndef UTMPS_UTMP_H
++#define UTMPS_UTMP_H
++
++#include <utmpx.h>
++
++/* Unused, but some packages require this macro to be present */
++#define UTMP_FILE UTMPX_FILE
++#define WTMP_FILE "/var/log/wtmp"
++#define UTMP_FILENAME UTMP_FILE
++#define WTMP_FILENAME WTMP_FILE
++#define _PATH_UTMP UTMP_FILE
++#define _PATH_WTMP WTMP_FILE
++
++struct lastlog
++{
++  time_t ll_time ;
++  char ll_line[UTMPS_UT_LINESIZE] ;
++  char ll_host[UTMPS_UT_HOSTSIZE] ;
++} ;
++
++#define utmp utmpx
++
++#define endutent endutxent
++#define setutent setutxent
++#define getutent getutxent
++#define getutid getutxid
++#define getutline getutxline
++#define pututline pututxline
++
++#define utmpname utmpxname
++#define updwtmp updwtmpx
++
++#endif
+-- 
+2.29.1
+
diff --git a/main/utmps/APKBUILD b/main/utmps/APKBUILD
new file mode 100644
index 00000000000..a011c9d3a32
--- /dev/null
+++ b/main/utmps/APKBUILD
@@ -0,0 +1,81 @@
+# Contributor: Laurent Bercot <ska-devel@skarnet.org>
+# Maintainer: Laurent Bercot <ska-devel@skarnet.org>
+pkgname=utmps
+# NOTE: If you're upgrading to a new version that fixes some security
+# vulnerability, rebuild the following aports:
+# - busybox
+# - dropbear
+# - mingetty
+# - openssh
+# - util-linux
+pkgver=0.1.2.2
+pkgrel=1
+pkgdesc="A secure utmp/wtmp implementation"
+url=https://skarnet.org/software/utmps/
+arch="all"
+options="!check"  # No test suite
+license="ISC"
+depends="s6-ipcserver>=2.12"
+depends_static="skalibs-static"
+makedepends="skalibs-dev>=2.14"
+subpackages="$pkgname-static $pkgname-libs $pkgname-dev $pkgname-doc $pkgname-openrc"
+source="https://skarnet.org/software/utmps/utmps-$pkgver.tar.gz
+	utmp-prepare.initd
+	utmpd.initd
+	wtmpd.initd
+	btmpd.initd
+	utmp-init.initd
+	setup-utmp
+	utmps.pc
+	wtmpd.logrotate
+	btmpd.logrotate
+	0001-add-stub-utmp.h.patch"
+install="utmps.pre-install"
+
+prepare() {
+	default_prepare
+	sed -i -e "s/@@VERSION@@/$pkgver/g" -- "$srcdir"/*.pc
+}
+
+build() {
+	./configure \
+		--enable-shared \
+		--enable-static \
+		--disable-allstatic \
+		--libdir=/usr/lib \
+		--libexecdir="/lib/$pkgname" \
+		--with-lib=/usr/lib \
+		--with-dynlib=/lib
+	make
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+
+	install -D -m755 "$srcdir/utmp-prepare.initd" "$pkgdir/etc/init.d/utmp-prepare"
+	install -D -m755 "$srcdir/utmpd.initd" "$pkgdir/etc/init.d/utmpd"
+	install -D -m755 "$srcdir/wtmpd.initd" "$pkgdir/etc/init.d/wtmpd"
+	install -D -m755 "$srcdir/btmpd.initd" "$pkgdir/etc/init.d/btmpd"
+	install -D -m755 "$srcdir/utmp-init.initd" "$pkgdir/etc/init.d/utmp-init"
+	install -D -m644 "$srcdir/wtmpd.logrotate" "$pkgdir/etc/logrotate.d/wtmpd"
+	install -D -m644 "$srcdir/btmpd.logrotate" "$pkgdir/etc/logrotate.d/btmpd"
+	install -D -m755 "$srcdir/setup-utmp" "$pkgdir/sbin/setup-utmp"
+	install -D -m644 "$srcdir/utmps.pc" "$pkgdir/usr/lib/pkgconfig/utmps.pc"
+
+	mkdir -p "$pkgdir/usr/share/doc"
+	cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
+}
+
+sha512sums="
+57a73658ecb947af9dfad7a5e2931660ad1b8fa61d36c803c373e8aba13e9afa8398c1522765f5ea2b5df87d942cea17062faf30f589afa6acc744ff3ae4a409  utmps-0.1.2.2.tar.gz
+05d730a7ac770e91617a9db2b250c818f7733a3cbba3e539dbea23efeea71f65b059ec7778648bbedc2a6ac3b7907ac49d786cdadcfb716b29d8e9ce514d0f3a  utmp-prepare.initd
+c939657b36512ab092c51d45978fda6bb8d206f7295f733ef05c1bbce5ae68ea9bd3979e6c99bf8bf569363764467b85d68d61968a11903395c9561c6c82d59c  utmpd.initd
+248c60c4f769a311f8167a38473e0de34aa2f73286552bc9344ba46558badcaa0f7d2fee282f31a031df242e474bef1e86e6527a7fd190d76600136bee851182  wtmpd.initd
+c1bd4cc6b0ca88e59b6de4ba79e1a108ac717e88b3e7036e04abbeab6ec9593c63006fad8c0e7149d652928a9473fdc2b8417940a6db95f3b6c7070c272eb3db  btmpd.initd
+d817c43b47893777b88f8e7c20fa6294a096cfa060f22f6355add4202c86c420fe2a8be83982786c05410add5268e5d8e558105ef4105f40b83e0ce00dcc46f1  utmp-init.initd
+b6249ae817641b93aaa37842efe4fe6f9055f1fe4581edbc94f037e5d63b01ebd31136fb3cbf563c887ecd8f4764a5a92d351ca6f63e24e8e6bb423a2d5196ff  setup-utmp
+15347bd95f7e69409fb5849eeca0632d3e7cdd0ad6113ab89d9f6554ebce01996522783f3f4a29877fd0f74607a5367af8483396f70d075315c4f17acc182f5e  utmps.pc
+5ade986bbed30ea82b8806a3d7a0ab09a7203fb8e4c9b8785e2d549973b33644a51c522cc8891a09d5016d4b47bf848224d10d0b9834a4c77929e68c7b95d293  wtmpd.logrotate
+e085ca6d4ad3817dccb7de7f7feafad586ef567b7f81fcb7ffaf1cec75a0bc18a2023cfe0761f125d4a21975e4754d235e9bd54ed2246f9c1f17607fc0cb00de  btmpd.logrotate
+0512f0daa216919a886e6a8e5a73db1d29acd66d929f38d5df40bd55f0d446402610c59da12688b75c3c1230af9b1929793ed8bfc9b4593851bf496fc0a8d835  0001-add-stub-utmp.h.patch
+"
diff --git a/main/utmps/btmpd.initd b/main/utmps/btmpd.initd
new file mode 100644
index 00000000000..b9acc7296a6
--- /dev/null
+++ b/main/utmps/btmpd.initd
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 2020-2021 Laurent Bercot for Alpine Linux
+# Distributed under the terms of the ISC License.
+#
+name=btmpd
+description="utmps daemon for the btmp service"
+
+command=/bin/s6-ipcserver
+command_args="/run/utmps/.btmpd-socket utmps-wtmpd btmp"
+command_user=utmp
+command_background=yes
+directory=/var/log/btmpd
+pidfile=/run/utmps/btmpd.pid
+
+depend() {
+	need localmount utmp-prepare
+	after bootmisc
+	before networking
+}
+
+start_pre() {
+	checkpath -d -o utmp:utmp -m 0755 /run/utmps
+	checkpath -d -o utmp:utmp -m 2755 /var/log/btmpd
+}
diff --git a/main/utmps/btmpd.logrotate b/main/utmps/btmpd.logrotate
new file mode 100644
index 00000000000..b681d90dc62
--- /dev/null
+++ b/main/utmps/btmpd.logrotate
@@ -0,0 +1,6 @@
+/var/log/btmpd/btmp {
+    missingok
+    monthly
+    create 0644 utmp utmp
+    rotate 3
+}
diff --git a/main/utmps/setup-utmp b/main/utmps/setup-utmp
new file mode 100644
index 00000000000..031b1a637fb
--- /dev/null
+++ b/main/utmps/setup-utmp
@@ -0,0 +1,65 @@
+#!/bin/sh -e
+
+prog="${0##*/}"
+y=true
+
+cleanup () {
+  if test "$1" -ge 10 ; then
+    rc-service -i -s utmp-init stop
+  fi
+  if test "$1" -ge 9 ; then
+    rc-service -i -s btmpd stop
+  fi
+  if test "$1" -ge 8 ; then
+    rc-service -i -s wtmpd stop
+  fi
+  if test "$1" -ge 7 ; then
+    rc-service -i -s utmpd stop
+  fi
+  if test "$1" -ge 6 ; then
+    rc-service -i -s utmp-prepare stop
+  fi
+  if test "$1" -ge 5 ; then
+    rc-update delete utmp-init boot || :
+  fi
+  if test "$1" -ge 4 ; then
+    rc-update delete btmpd boot || :
+  fi
+  if test "$1" -ge 3 ; then
+    rc-update delete wtmpd boot || :
+  fi
+  if test "$1" -ge 2 ; then
+    rc-update delete utmpd boot || :
+  fi
+  if test "$1" -ge 1 ; then
+    rc-update delete utmp-prepare boot || :
+  fi
+}
+
+while getopts 'yn' opt ; do
+  case "$opt" in
+    y) y=true ;;
+    n) y=false ;;
+    ?) echo "$prog: usage: $prog [ -y | -n ]" 1>&2 ; exit 100 ;;
+  esac
+  shift
+done
+
+if $y ; then
+  rc-update add utmp-prepare boot || { cleanup 0 ; exit 1 ; }
+  rc-update add utmpd boot || { cleanup 1 ; exit 1 ; }
+  rc-update add wtmpd boot || { cleanup 2 ; exit 1 ; }
+  rc-update add btmpd boot || { cleanup 3 ; exit 1 ; }
+  rc-update add utmp-init boot || { cleanup 4 ; exit 1 ; }
+  rc-service utmp-prepare start || { cleanup 5 ; exit 1 ; }
+  rc-service utmpd start || { cleanup 6 ; exit 1 ; }
+  rc-service wtmpd start || { cleanup 7 ; exit 1 ; }
+  rc-service btmpd start || { cleanup 8 ; exit 1 ; }
+  # We don't run utmp-init because it's not boot time.
+  # : rc-service utmp-init start || { cleanup 9 ; exit 1 ; }
+  echo "$prog: utmps services are now enabled. Use $prog -n to disable them." 1>&2
+  echo "$prog: note that user accounting may not be accurate until the next reboot." 1>&2
+else
+  cleanup 10
+  echo "$prog: utmps services are disabled. Use $prog -y to reenable them." 1>&2
+fi
diff --git a/main/utmps/utmp-init.initd b/main/utmps/utmp-init.initd
new file mode 100644
index 00000000000..acb4dbe5dfe
--- /dev/null
+++ b/main/utmps/utmp-init.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 2020-2022 Laurent Bercot for Alpine Linux
+# Distributed under the terms of the ISC License.
+#
+description="clearing and initialization of the utmp database"
+
+depend() {
+	need utmp-prepare utmpd wtmpd
+	before networking
+	after clock
+}
+
+start() {
+	# Create an empty utmp file
+	checkpath -F -f -m 0644 -o utmp:utmp /run/utmps/utmp
+
+	# Write the initial records as sysvinit/busybox init would do.
+	# 20018 = 256 * 'N' + '2'. Don't ask.
+	utmps-write -t 2000 -uw -l reboot -p 0 -h "$(uname -r)" -- '~~' BOOT_TIME '~'
+	utmps-write -t 2000 -uw -l runlevel -p 20018 -h "$(uname -r)" -- '~~' RUN_LVL '~'
+}
diff --git a/main/utmps/utmp-prepare.initd b/main/utmps/utmp-prepare.initd
new file mode 100644
index 00000000000..9f61249eaa8
--- /dev/null
+++ b/main/utmps/utmp-prepare.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 2020-2022 Laurent Bercot for Alpine Linux
+# Distributed under the terms of the ISC License.
+#
+description="preparation of the utmp databases"
+
+depend() {
+	before networking
+	after clock
+}
+
+start() {
+	if ! test -L /var/log/utmp || test "$(readlink /var/log/utmp)" != /run/utmps/utmp ; then
+		rm -f /var/log/utmp
+		ln -s /run/utmps/utmp /var/log/utmp
+	fi
+	if ! test -L /var/log/wtmp || test "$(readlink /var/log/wtmp)" != wtmpd/wtmp ; then
+		rm -f /var/log/wtmp
+		ln -s wtmpd/wtmp /var/log/wtmp
+	fi
+	if ! test -L /var/log/btmp || test "$(readlink /var/log/btmp)" != btmpd/btmp ; then
+		rm -f /var/log/btmp
+		ln -s btmpd/btmp /var/log/btmp
+	fi
+}
diff --git a/main/utmps/utmpd.initd b/main/utmps/utmpd.initd
new file mode 100644
index 00000000000..d04c6b93573
--- /dev/null
+++ b/main/utmps/utmpd.initd
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 2020-2021 Laurent Bercot for Alpine Linux
+# Distributed under the terms of the ISC License.
+#
+name="utmpd"
+description="utmps daemon for the utmp service"
+
+command=/bin/s6-ipcserver
+command_args="/run/utmps/.utmpd-socket utmps-utmpd"
+command_user=utmp
+command_background=yes
+directory=/run/utmps
+pidfile=/run/utmps/utmpd.pid
+
+depend() {
+	need utmp-prepare
+	after bootmisc
+	before networking
+}
+
+start_pre() {
+	checkpath -d -o utmp:utmp -m 0755 /run/utmps
+}
diff --git a/main/utmps/utmps.pc b/main/utmps/utmps.pc
new file mode 100644
index 00000000000..1ca0eb6e685
--- /dev/null
+++ b/main/utmps/utmps.pc
@@ -0,0 +1,7 @@
+Name: utmps
+Description: A secure implementation of the utmp mechanism.
+URL: https://skarnet.org/software/utmps/
+Version: @@VERSION@@
+Requires.private: skalibs
+Libs: -lutmps
+Cflags: -I/usr/include/utmps
diff --git a/main/utmps/utmps.pre-install b/main/utmps/utmps.pre-install
new file mode 100644
index 00000000000..fd7b522bcfd
--- /dev/null
+++ b/main/utmps/utmps.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+addgroup -S utmp 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G utmp -g utmp utmp 2>/dev/null
+exit 0
diff --git a/main/utmps/wtmpd.initd b/main/utmps/wtmpd.initd
new file mode 100644
index 00000000000..8d3f6245ad9
--- /dev/null
+++ b/main/utmps/wtmpd.initd
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 2020-2021 Laurent Bercot for Alpine Linux
+# Distributed under the terms of the ISC License.
+#
+name=wtmpd
+description="utmps daemon for the wtmp service"
+
+command=/bin/s6-ipcserver
+command_args="/run/utmps/.wtmpd-socket utmps-wtmpd wtmp"
+command_user=utmp
+command_background=yes
+directory=/var/log/wtmpd
+pidfile=/run/utmps/wtmpd.pid
+
+depend() {
+	need localmount utmp-prepare
+	after bootmisc
+	before networking
+}
+
+start_pre() {
+	checkpath -d -o utmp:utmp -m 0755 /run/utmps
+	checkpath -d -o utmp:utmp -m 2755 /var/log/wtmpd
+}
diff --git a/main/utmps/wtmpd.logrotate b/main/utmps/wtmpd.logrotate
new file mode 100644
index 00000000000..bb23536e415
--- /dev/null
+++ b/main/utmps/wtmpd.logrotate
@@ -0,0 +1,6 @@
+/var/log/wtmpd/wtmp {
+    missingok
+    monthly
+    create 0644 utmp utmp
+    rotate 3
+}
diff --git a/main/uvncrepeater/APKBUILD b/main/uvncrepeater/APKBUILD
index 453273c9f21..f12d44b0c15 100644
--- a/main/uvncrepeater/APKBUILD
+++ b/main/uvncrepeater/APKBUILD
@@ -2,40 +2,35 @@
 # Maintainer:
 pkgname=uvncrepeater
 pkgver=014
-pkgrel=7
+pkgrel=11
 pkgdesc="VNC repeater based on ultravnc repeater"
 url="http://koti.mbnet.fi/jtko/"
 arch="all"
 license="GPL-2.0-or-later"
-depends="openrc>=0.6"
-makedepends=""
 install="$pkgname.pre-install"
-subpackages=""
+subpackages="$pkgname-openrc"
 source="http://distcache.freebsd.org/ports-distfiles/repeater$pkgver.zip
 	uvncrepeater.confd
 	uvncrepeater.initd"
+builddir="$srcdir/Ver$pkgver"
+options="!check"
 
-_builddir="$srcdir"/Ver$pkgver
 prepare() {
-	cd "$_builddir"
+	default_prepare
 	# respect our CXX and CFLAGS
 	sed -i -e 's/g++/$(CXX)/g' \
 		-e "/^CFLAGS/d" Makefile
 }
 
 build() {
-	cd "$_builddir"
-	make || return 1
+	make
 }
 
 package() {
-	cd "$_builddir"
 	install -Dm755 repeater "$pkgdir"/usr/bin/repeater
 	install -Dm644 uvncrepeater.ini "$pkgdir"/etc/uvncrepeater.ini
-	install -Dm755 "$srcdir"/uvncrepeater.initd \
-		"$pkgdir"/etc/init.d/uvncrepeater
-	install -Dm755 "$srcdir"/uvncrepeater.confd \
-		"$pkgdir"/etc/conf.d/uvncrepeater
+	install -Dm755 "$srcdir"/uvncrepeater.initd "$pkgdir"/etc/init.d/uvncrepeater
+	install -Dm644 "$srcdir"/uvncrepeater.confd "$pkgdir"/etc/conf.d/uvncrepeater
 }
 
 sha512sums="5b74943fef5b41202ad693c0d81e0f2f9a59c397ee9818da8c7e91dbee15f4309e3e9b32ad0d8ff8db5d7679fd8caa8e4e448d5f717393e45743705d106fede7  repeater014.zip
diff --git a/main/uwsgi/APKBUILD b/main/uwsgi/APKBUILD
index c2e57c48aae..fedace57f3b 100644
--- a/main/uwsgi/APKBUILD
+++ b/main/uwsgi/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Contributor: Kaarle Ritvanen <kunkku@alpinelinux.org>
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=uwsgi
-pkgver=2.0.18
-pkgrel=7
+pkgver=2.0.25.1
+pkgrel=0
 pkgdesc="uWSGI application container server"
-url="http://projects.unbit.it/uwsgi/"
+url="https://projects.unbit.it/uwsgi/"
 arch="all"
-license="custom" # GPL-2.0-only + linking exception
+license="GPL-2.0-only WITH GCC-exception-2.0"
 depends="mailcap"
 install="$pkgname.pre-install $pkgname.post-upgrade"
 pkgusers="uwsgi"
@@ -22,22 +22,22 @@ makedepends="
 	libucontext-dev
 	linux-headers
 	linux-pam-dev
+	libpq-dev
 	libxml2-dev
 	libxslt-dev
 	lua5.3-dev
-	paxmark
-	pcre-dev
-	postgresql-dev
+	openssl-dev
+	pcre2-dev
 	python3-dev
 	zeromq-dev
 	zlib-dev
 	"
-source="http://projects.unbit.it/downloads/uwsgi-$pkgver.tar.gz
+subpackages="$pkgname-openrc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/unbit/uwsgi/archive/refs/tags/$pkgver.tar.gz
 	uwsgi.initd
 	uwsgi.ini
 	readme.emperor
 	alpine.buildconf
-	musl-fix-python.patch
 	musl-ucontext.patch
 	"
 options="!check"
@@ -125,15 +125,12 @@ for _p in $_plugins; do
 	subpackages="$subpackages uwsgi-${_p#*:}:_plugin"
 done
 
-
 prepare() {
 	default_prepare
 	cp "$srcdir"/alpine.buildconf buildconf/alpine.ini
 }
 
 build() {
-	cd "$builddir"
-
 	msg "Building core"
 	# ccache seems to trigger some weird bug on musl
 	CC="gcc" python3 uwsgiconfig.py --build alpine
@@ -154,8 +151,6 @@ _build_plugin() {
 }
 
 package() {
-	cd "$builddir"
-
 	install -m 755 -D uwsgi "$pkgdir"/usr/sbin/uwsgi
 	install -m 644 -D "$srcdir"/readme.emperor "$pkgdir"/etc/uwsgi/conf.d/readme.emperor
 	install -m 644 -D "$srcdir"/uwsgi.ini "$pkgdir"/etc/uwsgi/uwsgi.ini
@@ -163,9 +158,6 @@ package() {
 
 	install -m 775 -d -o root -g uwsgi "$pkgdir"/var/log/uwsgi
 	install -D LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-
-	# Disable emutramp/mprotect, this is needed for luajit and cffi.
-	paxmark -em "$pkgdir"/usr/sbin/uwsgi
 }
 
 _plugin() {
@@ -208,10 +200,11 @@ _plugin() {
 	esac
 }
 
-sha512sums="6561703279bcc4a81311d033810ac066d0f113bab13b0942f3eef86cac29c584a6641b52476840d6895151aee5ed064ae2d03b18932cf7f47e62f4eeed76da61  uwsgi-2.0.18.tar.gz
+sha512sums="
+3b2a78917b129f5a2f38f3538e30b132e4cd6e270df55365ccc0dc6b94641a262af1484c62b252d0a24121eb68417cb061210e89e2b7885992ab4ffa07092119  uwsgi-2.0.25.1.tar.gz
 1fef8a30e8e20b0322cf464a2adf744a4b46a35f4c9e104acacab4c99b913c5a0b537783bdfedf8900a4e7397e08079b675be2414beb571fd0b330985ac676cc  uwsgi.initd
 370202e143d0e041a2e36905346080d3ca592c9a74705a8c4e142a1307d22b921c10e673d683ca284ea27d184474ed86edd7723a6e590d35a562ad7cf6afa529  uwsgi.ini
 2798c9d2e49e29292ffe6a5a29b866301c78d5f322fc5d07dfa9569efdaa5220237a5f6744652fbdd957be29311ddaff190541333f042cbf0e907dfa98ce3e2a  readme.emperor
 f3cff00926929a5bb40afafb65fd5228582af35fbf524562282020c4c4ae9c659231b2381f4b3cceb18e8f3f6c888c21bdd8ed4ddcd81e92fbc6a0891800ce38  alpine.buildconf
-de68b16b44e554a79c073c9befa10566796316dbf4c375b4d6b633d80b0282694cca233f0a70f3d6570584324f14276826bbeb8f38b550c00087a05f9ba9227f  musl-fix-python.patch
-d4b93e51619af5f8839cdc7279c69462947910df03104cfe6180d606403940fc60ad5dac66425ce8acbab67cc0c4f3e13126da0a329720cb03c67d447cd94ad9  musl-ucontext.patch"
+d4b93e51619af5f8839cdc7279c69462947910df03104cfe6180d606403940fc60ad5dac66425ce8acbab67cc0c4f3e13126da0a329720cb03c67d447cd94ad9  musl-ucontext.patch
+"
diff --git a/main/uwsgi/musl-fix-python.patch b/main/uwsgi/musl-fix-python.patch
deleted file mode 100644
index b4b8fd240f5..00000000000
--- a/main/uwsgi/musl-fix-python.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/plugins/python/uwsgi_python.h b/plugins/python/uwsgi_python.h
-index 0c5c1c8..5c0dc6d 100644
---- a/plugins/python/uwsgi_python.h
-+++ b/plugins/python/uwsgi_python.h
-@@ -1,4 +1,8 @@
- #include <uwsgi.h>
-+/* seems like Python.h explicitlyl redefines _GNU_SOURCE */
-+#ifdef _GNU_SOURCE
-+#undef _GNU_SOURCE
-+#endif
- #include <Python.h>
- 
- #include <frameobject.h>
diff --git a/main/v86d/APKBUILD b/main/v86d/APKBUILD
index 4e01aa78517..6f2e41a9b6f 100644
--- a/main/v86d/APKBUILD
+++ b/main/v86d/APKBUILD
@@ -1,29 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=v86d
 pkgver=0.1.10
-pkgrel=1
+pkgrel=4
 pkgdesc="Userspace helper for uvesafb that runs x86 code in an emulated environment"
 url="https://github.com/mjanusz/v86d"
 arch="x86 x86_64"
-license="GPL-2.0"
-depends=""
+license="GPL-2.0-only"
 makedepends="bash linux-headers"
 source="v86d-$pkgver.tar.gz::https://github.com/mjanusz/v86d/archive/v86d-$pkgver.tar.gz
 		modprobe.uvesafb"
+builddir="$srcdir"/v86d-86d-$pkgver
+options="!check"
 
-_builddir="$srcdir"/v86d-86d-$pkgver
-build () {
-	cd "$_builddir"
+build() {
 	./configure \
-		--with-x86emu \
-		|| return 1
-	make || return 1
+		--with-x86emu
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	install -D -m644 "$srcdir"/modprobe.uvesafb "$pkgdir"/etc/modprobe.d/uvesafb || return 1
+	make DESTDIR="$pkgdir" install
+	install -D -m644 "$srcdir"/modprobe.uvesafb "$pkgdir"/etc/modprobe.d/uvesafb
 }
 
 sha512sums="148b1676d932d1207da396defeae0fc39b664139eca5f29be98ceedc33e89566f7c35057df93249303c8e2c1bff0427430a077f88a85997e62ea96c29b5db9d1  v86d-0.1.10.tar.gz
diff --git a/main/vala/APKBUILD b/main/vala/APKBUILD
index 429b7dc4408..3e72ea70dd1 100644
--- a/main/vala/APKBUILD
+++ b/main/vala/APKBUILD
@@ -1,20 +1,29 @@
 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=vala
-pkgver=0.48.2
+pkgver=0.56.16
 pkgrel=0
 pkgdesc="Compiler for the GObject type system"
 url="https://wiki.gnome.org/Projects/Vala"
 arch="all"
 license="LGPL-2.0-or-later"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-devhelp $pkgname-dbg $pkgname-doc"
 depends="glib-dev"
 makedepends="libxslt-dev bash flex bison gobject-introspection-dev graphviz-dev"
 checkdepends="dbus-x11"
 source="https://download.gnome.org/sources/vala/${pkgver%.*}/vala-$pkgver.tar.xz"
 
+prepare() {
+	default_prepare
+	# 2 failures
+	sed -i "/constants\/member-access/d" \
+		tests/Makefile.in
+}
+
 build() {
+	CFLAGS="$CFLAGS -O2 -flto=auto" \
+	CXXFLAGS="$CXXFLAGS -O2 -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,4 +39,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="0ea2d2c56d6d01007fe41e13bc51faa5e780259bc55f34a2d84270a5b6a0a46d59cce5eb195f81c78f1acbfb118cc3c5882edf0d187788791ee3ce865faece89  vala-0.48.2.tar.xz"
+sha512sums="
+99f69c3c7a5ed89923b55cf035c6d9a5867577b2ecff92dddf5f21aaad1281786e5fcd775833b0f251417caf857f5fe7efbf134fbded427a7b29fa3acb00203a  vala-0.56.16.tar.xz
+"
diff --git a/main/valgrind/0001-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch b/main/valgrind/0001-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch
new file mode 100644
index 00000000000..1f6ae07b50b
--- /dev/null
+++ b/main/valgrind/0001-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch
@@ -0,0 +1,136 @@
+From d35005cef8ad8207542738812705ceabf137d7e0 Mon Sep 17 00:00:00 2001
+From: Paul Floyd <pjfloyd@wanadoo.fr>
+Date: Sun, 17 Dec 2023 14:18:51 +0100
+Subject: [PATCH] Bug 478624 - Valgrind incompatibility with binutils-2.42 on
+ x86 with new nop patterns (unhandled instruction bytes: 0x2E 0x8D 0xB4 0x26)
+
+It was a bit of a struggle to get the testcase to build
+with both clang and gcc (oddly enough gcc was more difficult) so
+I just resorted to using .byte arrays.
+---
+ .gitignore                                 |  1 +
+ NEWS                                       |  2 ++
+ VEX/priv/guest_x86_toIR.c                  | 22 +++++++++++++-
+ none/tests/x86/Makefile.am                 |  2 ++
+ none/tests/x86/gnu_binutils_nop.c          | 34 ++++++++++++++++++++++
+ none/tests/x86/gnu_binutils_nop.stderr.exp |  0
+ none/tests/x86/gnu_binutils_nop.vgtest     |  2 ++
+ 7 files changed, 62 insertions(+), 1 deletion(-)
+ create mode 100644 none/tests/x86/gnu_binutils_nop.c
+ create mode 100644 none/tests/x86/gnu_binutils_nop.stderr.exp
+ create mode 100644 none/tests/x86/gnu_binutils_nop.vgtest
+
+diff --git a/VEX/priv/guest_x86_toIR.c b/VEX/priv/guest_x86_toIR.c
+index 5d6e6dc64..3b6efb387 100644
+--- a/VEX/priv/guest_x86_toIR.c
++++ b/VEX/priv/guest_x86_toIR.c
+@@ -8198,7 +8198,7 @@ DisResult disInstr_X86_WRK (
+          delta += 5;
+          goto decode_success;
+       }
+-      /* Don't barf on recent binutils padding,
++      /* Don't barf on recent (2010) binutils padding,
+          all variants of which are: nopw %cs:0x0(%eax,%eax,1)
+          66 2e 0f 1f 84 00 00 00 00 00
+          66 66 2e 0f 1f 84 00 00 00 00 00
+@@ -8223,6 +8223,26 @@ DisResult disInstr_X86_WRK (
+          }
+       }
+ 
++      /* bug478624 GNU binutils uses a leal of esi into itself with
++         a zero offset and CS prefix as an 8 byte no-op (Dec 2023).
++         Since the CS prefix is hardly ever used we don't do much
++         to decode it, just a few cases for conditional branches.
++         So add handling here with other pseudo-no-ops.
++       */
++      if (code[0] == 0x2E && code[1] == 0x8D) {
++         if (code[2] == 0x74 && code[3] == 0x26 && code[4] == 0x00) {
++            DIP("leal %%cs:0(%%esi,%%eiz,1),%%esi\n");
++            delta += 5;
++            goto decode_success;
++         }
++         if (code[2] == 0xB4 && code[3] == 0x26 && code[4] == 0x00
++             && code[5] == 0x00 && code[6] == 0x00 && code[7] == 0x00) {
++            DIP("leal %%cs:0(%%esi,%%eiz,1),%%esi\n");
++            delta += 8;
++            goto decode_success;
++         }
++      }
++
+       // Intel CET requires the following opcodes to be treated as NOPs
+       // with any prefix and ModRM, SIB and disp combination:
+       // "0F 19", "0F 1C", "0F 1D", "0F 1E", "0F 1F"
+diff --git a/none/tests/x86/Makefile.am b/none/tests/x86/Makefile.am
+index 3ecd1ad3c..dbae86571 100644
+--- a/none/tests/x86/Makefile.am
++++ b/none/tests/x86/Makefile.am
+@@ -52,6 +52,7 @@ EXTRA_DIST = \
+ 	fxtract.stdout.exp fxtract.stderr.exp fxtract.vgtest \
+ 	fxtract.stdout.exp-older-glibc \
+ 	getseg.stdout.exp getseg.stderr.exp getseg.vgtest \
++	gnu_binutils_nop.stderr.exp gnu_binutils_nop.vgtest \
+ 	incdec_alt.stdout.exp incdec_alt.stderr.exp incdec_alt.vgtest \
+ 	int.stderr.exp int.stdout.exp int.disabled \
+ 	$(addsuffix .stderr.exp,$(INSN_TESTS)) \
+@@ -100,6 +101,7 @@ check_PROGRAMS = \
+ 	fpu_lazy_eflags \
+ 	fxtract \
+ 	getseg \
++	gnu_binutils_nop \
+ 	incdec_alt \
+ 	$(INSN_TESTS) \
+ 	int \
+diff --git a/none/tests/x86/gnu_binutils_nop.c b/none/tests/x86/gnu_binutils_nop.c
+new file mode 100644
+index 000000000..412a4c2cb
+--- /dev/null
++++ b/none/tests/x86/gnu_binutils_nop.c
+@@ -0,0 +1,34 @@
++int main(void)
++{
++    // GNU binutils uses various opcodes as alternatives for nop
++    // the idea is that it is faster to execute one large opcode
++    // with no side-effects than multiple repetitions of the
++    // single byte 'nop'. This gives more choice when code
++    // needs to be padded.
++   
++   // the following is based on
++   // https://sourceware.org/cgit/binutils-gdb/tree/gas/config/tc-i386.c#n1256
++
++    // one byte
++    __asm__ __volatile__("nop");
++    // two bytes
++    __asm__ __volatile__("xchg %ax,%ax");
++    // three bytes
++    //__asm__ __volatile__("leal 0(%esi),%esi");
++    __asm__ __volatile__(".byte 0x8d,0x76,0x00");
++    // four bytes
++    //__asm__ __volatile__("leal 0(%esi,%eiz),%esi");
++    __asm__ __volatile__(".byte 0x8d,0x74,0x26,0x00");
++    // five bytes
++    //__asm__ __volatile__("leal %cs:0(%esi,%eiz),%esi");
++    __asm__ __volatile__(".byte 0x2e,0x8d,0x74,0x26,0x00");
++    // six bytes
++    //__asm__ __volatile__("leal 0L(%esi),%esi");
++    __asm__ __volatile__(".byte 0x8d,0xb6,0x00,0x00,0x00,0x00");
++    // seven bytes
++    //__asm__ __volatile__("leal 0L(%esi,%eiz),%esi");
++    __asm__ __volatile__(".byte 0x8d,0xb4,0x26,0x00,0x00,0x00,0x00");
++    // eight bytes
++    //__asm__ __volatile__("leal %cs:0L(%esi,%eiz),%esi");
++    __asm__ __volatile__(".byte 0x2e,0x8d,0xb4,0x26,0x00,0x00,0x00,0x00");
++}
+diff --git a/none/tests/x86/gnu_binutils_nop.stderr.exp b/none/tests/x86/gnu_binutils_nop.stderr.exp
+new file mode 100644
+index 000000000..e69de29bb
+diff --git a/none/tests/x86/gnu_binutils_nop.vgtest b/none/tests/x86/gnu_binutils_nop.vgtest
+new file mode 100644
+index 000000000..7f378dd53
+--- /dev/null
++++ b/none/tests/x86/gnu_binutils_nop.vgtest
+@@ -0,0 +1,2 @@
++prog: gnu_binutils_nop
++vgopts: -q
+-- 
+2.44.0
+
diff --git a/main/valgrind/APKBUILD b/main/valgrind/APKBUILD
index 85c487ed38e..4ba0bcd6271 100644
--- a/main/valgrind/APKBUILD
+++ b/main/valgrind/APKBUILD
@@ -1,42 +1,36 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=valgrind
-pkgver=3.15.0
+pkgver=3.22.0
 pkgrel=1
-pkgdesc="A tool to help find memory-management problems in programs"
-url="http://valgrind.org/"
-arch="all"
+pkgdesc="Tool to help find memory-management problems in programs"
+url="https://valgrind.org/"
+# armv6/riscv64 not supported upstream
+arch="all !armhf !riscv64"
 license="GPL-2.0-or-later"
 # it seems like busybox sed works but the configure script requires GNU sed
-makedepends="sed paxmark perl bash autoconf automake libtool"
+makedepends="sed perl linux-headers"
 # from README_PACKAGERS:
 #   Don't strip the debug info off lib/valgrind/$platform/vgpreload*.so
 #   in the installation tree.  Either Valgrind won't work at all, or it
 #   will still work if you do, but will generate less helpful error
 #   messages.
-options="!strip !check"
-subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2
-	musl.supp
+options="!strip"
+subpackages="$pkgname-scripts $pkgname-dev $pkgname-doc"
+source="https://sourceware.org/pub/valgrind/valgrind-$pkgver.tar.bz2
+	0001-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch
+	"
 
-	activate-musl-supp.patch
-	uclibc.patch
-	arm.patch"
-#	musl-fixes.patch
-builddir="$srcdir"/$pkgname-$pkgver
-
-prepare() {
-	default_prepare
-	cd "$builddir"
-	cp "$srcdir"/musl.supp .
-	aclocal && autoconf && automake --add-missing
-	echo '#include <linux/a.out.h>' > include/a.out.h
-}
+# Valgrind 3.19.0 added support for compiling the tests on musl.
+# However, it seems they haven't tested this on many architectures.
+# Disable check on architectures where it doesn't work for now.
+#
+# TODO: Report upstream.
+case "$CARCH" in
+aarch64|s390x|armv7|x86) options="$options !check"
+esac
 
 build() {
-	cd "$builddir"
-	# fails to build with ccache
-	export CC="gcc"
-	export CFLAGS="$CFLAGS -fno-stack-protector -no-pie"
+	export CFLAGS="${CFLAGS/-fno-plt} -fno-stack-protector -no-pie -U_FORTIFY_SOURCE"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -50,31 +44,34 @@ build() {
 }
 
 check() {
-	cd "$buildir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	# we have options=!strip above so we strip the /usr/bin/* manually
 	if [ -z "$DEBUG" ]; then
-		strip "$pkgdir"/usr/bin/valgrind \
-			"$pkgdir"/usr/bin/valgrind-di-server \
-			"$pkgdir"/usr/bin/vgdb \
-			"$pkgdir"/usr/bin/valgrind-listener \
-			"$pkgdir"/usr/bin/cg_merge
+		scanelf -Ry "$pkgdir" \
+			| awk '$1=="ET_DYN"{printf("%s%c",$2,0)}' \
+			| xargs -0 strip
 	fi
+}
+
+scripts() {
+	pkgdesc="$pkgdesc (perl+python cachegrind/callgrind script tools)"
+	depends="$pkgname=$pkgver-r$pkgrel python3 perl"
 
-	# pax causes some issues
-	# http://marc.info/?l=gentoo-hardened&m=119512627126298&w=2
-	# http://bugs.alpinelinux.org/issues/999
-	paxmark -m "$pkgdir"/usr/lib/valgrind/*-*-linux
+	amove \
+		usr/bin/ms_print \
+		usr/bin/cg_merge \
+		usr/bin/cg_annotate \
+		usr/bin/cg_diff \
+		usr/bin/callgrind_control \
+		usr/bin/callgrind_annotate
 }
 
-sha512sums="5695d1355226fb63b0c80809ed43bb077b6eed4d427792d9d7ed944c38b557a84fe3c783517b921e32f161228e10e4625bea0550faa4685872bb4454450cfa7f  valgrind-3.15.0.tar.bz2
-49df485f158a7f4d354b2ed0d46dcc691f0490f50913c83dabfdd513b47ef1045f140fd59f54b560df05e4f3a4aba63de7124553b396189fa3ac89c908831e45  musl.supp
-09a992c39e755d92894f79cd95ed2a6e84daa3ac1af1fe8907ebb2c90dca27d224aae882389c2c246aff8a6bb7d8b9c57a6ca62bd7b36f6fb43e182471186821  activate-musl-supp.patch
-d59a10db9037e120df2ee94a103402ca95a79abee9d8be63e4e1bca29c82dca775cc402a79b854ec11a2160a4d2da202c237369418e221d1925267ea2613fd5d  uclibc.patch
-9ee297d1b2b86891584443ad0caadc4977e1447979611ccf1cc55dbee61911b0b063bc4ad936d86c451cedae410cb3219b5a088b2ad0aa17df182d564fe36cfe  arm.patch"
+sha512sums="
+2904c13f68245bbafcea70998c6bd20725271300a7e94b6751ca00916943595fc3fac8557da7ea8db31b54a43f092823a0a947bc142829da811d074e1fe49777  valgrind-3.22.0.tar.bz2
+250cac58cd1710d4d9a6a24b9acc596fa01e4d2255b98b46b8ed5c7af9e658489a69b51ca7e7d17ebf5b2a9023f561391e149311c20e99607d6b7e471110cbe5  0001-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch
+"
diff --git a/main/valgrind/activate-musl-supp.patch b/main/valgrind/activate-musl-supp.patch
deleted file mode 100644
index 1b20ac62d5e..00000000000
--- a/main/valgrind/activate-musl-supp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr valgrind-3.14.0.orig/configure.ac valgrind-3.14.0/configure.ac
---- valgrind-3.14.0.orig/configure.ac	2019-06-13 21:56:14.023469250 +0200
-+++ valgrind-3.14.0/configure.ac	2019-06-13 21:56:35.130452552 +0200
-@@ -1103,7 +1103,7 @@ case "${GLIBC_VERSION}" in
-      musl)
- 	AC_MSG_RESULT(Musl)
- 	AC_DEFINE([MUSL_LIBC], 1, [Define to 1 if you're using Musl libc])
--	# no DEFAULT_SUPP file yet for musl libc.
-+	DEFAULT_SUPP="musl.supp ${DEFAULT_SUPP}"
- 	;;
-      2.0|2.1|*)
- 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
diff --git a/main/valgrind/arm.patch b/main/valgrind/arm.patch
deleted file mode 100644
index 8281c8ba1f8..00000000000
--- a/main/valgrind/arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -234,7 +234,7 @@
-         ARCH_MAX="s390x"
-         ;;
- 
--     armv7*)
-+     arm*)
- 	AC_MSG_RESULT([ok (${host_cpu})])
- 	ARCH_MAX="arm"
- 	;;
diff --git a/main/valgrind/musl.supp b/main/valgrind/musl.supp
deleted file mode 100644
index 864172a2426..00000000000
--- a/main/valgrind/musl.supp
+++ /dev/null
@@ -1,46 +0,0 @@
-# Suppressions for musl libc
-# See: https://www.openwall.com/lists/musl/2017/06/15/4
-
-{
-   musl-dynlink-false-positive1
-   Memcheck:Leak
-   fun:calloc
-   fun:load_direct_deps
-   fun:load_deps
-   fun:load_deps
-   fun:__dls3
-   fun:__dls2b
-   fun:__dls2
-}
-
-{
-   musl-dynlink-false-positive2
-   Memcheck:Leak
-   fun:calloc
-   fun:load_direct_deps
-   fun:load_deps
-   fun:load_deps
-   fun:__dls3
-   fun:__dls2
-}
-
-{
-   musl-dynlink-false-positive3
-   Memcheck:Leak
-   fun:calloc
-   fun:load_library
-   fun:load_preload
-   fun:__dls3
-   fun:__dls2b
-   fun:__dls2
-}
-
-{
-   musl-dynlink-false-positive4
-   Memcheck:Leak
-   fun:calloc
-   fun:load_library
-   fun:load_preload
-   fun:__dls3
-   fun:__dls2
-}
diff --git a/main/valgrind/uclibc.patch b/main/valgrind/uclibc.patch
deleted file mode 100644
index 69281ab2cb9..00000000000
--- a/main/valgrind/uclibc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./coregrind/vg_preloaded.c.orig
-+++ ./coregrind/vg_preloaded.c
-@@ -42,6 +42,7 @@
-    originates from Valgrind.
-    ------------------------------------------------------------------ */
- 
-+#include <features.h>
- #include "pub_core_basics.h"
- #include "pub_core_clreq.h"
- #include "pub_core_debuginfo.h"  // Needed for pub_core_redir.h
diff --git a/main/vanessa_adt/APKBUILD b/main/vanessa_adt/APKBUILD
index 2c7e708ac3a..265f66e19fc 100644
--- a/main/vanessa_adt/APKBUILD
+++ b/main/vanessa_adt/APKBUILD
@@ -1,42 +1,40 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=vanessa_adt
 pkgver=0.0.9
-pkgrel=0
+pkgrel=3
 pkgdesc="Library of abstract data types"
 url="http://horms.net/projects/perdition/"
 arch="all"
 license="LGPL-2.0-or-later"
-depends=
 depends_dev="vanessa_logger-dev"
 makedepends="$depends_dev"
-install=""
 subpackages="$pkgname-dev"
-source="http://horms.net/projects/vanessa/download/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2"
+source="http://horms.net/projects/vanessa/download/vanessa_adt/$pkgver/vanessa_adt-$pkgver.tar.bz2"
 
-_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
-	return 0
+	update_config_sub
+	default_prepare
 }
 
 build() {
-	export LDFLAGS="$LDFLAGS -lvanessa_logger"
-	cd "$_builddir"
+	LDFLAGS="$LDFLAGS -lvanessa_logger" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
+		--disable-static \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
-	make || return 1
+		--infodir=/usr/share/info
+	make
+}
+
+check() {
+	make check
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="5066bb57c3ee314531cc5a45d5ac670277e98a868df46c7816f8b1049be3306be3711e62f397b34746fd7d13bbcbe109346704f26c8f3bd39754979070dd1cc4  vanessa_adt-0.0.9.tar.bz2"
diff --git a/main/vanessa_logger/APKBUILD b/main/vanessa_logger/APKBUILD
index 69a0837b1aa..99b462b4261 100644
--- a/main/vanessa_logger/APKBUILD
+++ b/main/vanessa_logger/APKBUILD
@@ -1,48 +1,35 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=vanessa_logger
 pkgver=0.0.10
-pkgrel=0
+pkgrel=3
 pkgdesc="Logging library"
 url="http://horms.net/projects/perdition/"
 arch="all"
 license="LGPL-2.0-or-later"
-depends=
-depends_dev=""
-makedepends="$depends_dev"
-install=
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://horms.net/projects/vanessa/download/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2
-		fix-standard.patch
-		"
+source="http://horms.net/projects/vanessa/download/vanessa_logger/$pkgver/vanessa_logger-$pkgver.tar.bz2
+	fix-standard.patch
+	"
+options="!check"
 
-_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	return 0
+	update_config_sub
+	default_prepare
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
-	make || return 1
+		--infodir=/usr/share/info
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="38accb1563485b8f1ab0fbfc424336df71d6ac9c0baee669000a0ff8f0b5c3475d0bd3e5629c831ab30e7920877026dd2d55309247dd4940339a852da61a35fa  vanessa_logger-0.0.10.tar.bz2
diff --git a/main/vanessa_socket/APKBUILD b/main/vanessa_socket/APKBUILD
index d701a2dde58..4807e54fd10 100644
--- a/main/vanessa_socket/APKBUILD
+++ b/main/vanessa_socket/APKBUILD
@@ -1,22 +1,23 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=vanessa_socket
 pkgver=0.0.13
-pkgrel=0
+pkgrel=2
 pkgdesc="User space TCP/IP pipe"
 url="http://horms.net/projects/perdition/"
 arch="all"
 license="LGPL-2.0-or-later"
-depends=
 depends_dev="popt-dev vanessa_logger-dev"
 makedepends="$depends_dev"
-install=""
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://horms.net/projects/vanessa/download/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2"
-builddir="$srcdir"/$pkgname-$pkgver
+source="http://horms.net/projects/vanessa/download/vanessa_socket/$pkgver/vanessa_socket-$pkgver.tar.bz2"
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
 
 build() {
 	export LDFLAGS="$LDFLAGS -lvanessa_logger"
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,12 +29,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/varnish/APKBUILD b/main/varnish/APKBUILD
index 9789eb528f0..d76232d4e1d 100644
--- a/main/varnish/APKBUILD
+++ b/main/varnish/APKBUILD
@@ -3,23 +3,21 @@
 # Contributor: V.Krishn <vkrishn4@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=varnish
-pkgver=6.3.2
+pkgver=7.5.0
 pkgrel=0
 pkgdesc="High-performance HTTP accelerator"
 url="https://www.varnish-cache.org/"
 arch="all"
 license="BSD-2-Clause"
-options="!check" # tests fail
 depends="gcc libc-dev libgcc"
-makedepends="pcre-dev ncurses-dev libedit-dev py3-docutils
-	linux-headers libexecinfo-dev py3-sphinx"
+makedepends="ncurses-dev libedit-dev py3-docutils
+	linux-headers pcre2-dev libunwind-dev py3-sphinx"
 install="$pkgname.pre-install"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-geoip::noarch $pkgname-openrc"
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc"
 pkgusers="varnish"
 pkggroups="varnish"
+
 source="https://varnish-cache.org/_downloads/varnish-$pkgver.tgz
-	musl-include-vpf.patch
-	musl-include-vsb.patch
 	varnishd.initd
 	varnishd.confd
 	varnishlog.initd
@@ -27,10 +25,26 @@ source="https://varnish-cache.org/_downloads/varnish-$pkgver.tgz
 	varnishncsa.initd
 	varnishncsa.confd
 	varnishd.logrotate
-	maxminddb.vcl"
+	varnishreload-$pkgver::https://github.com/varnishcache/pkg-varnish-cache/raw/35cba4e219b135b637bfd4fb27d98d548f21c20e/systemd/varnishreload"
 
+case "$CARCH" in
+	ppc64le) options="$options !check";; # tests fail
+esac
 
 # secfixes:
+#   7.5.0-r0:
+#     - CVE-2024-30156 VSV00014
+#   7.4.2-r0:
+#     - CVE-2023-44487 VSV00013
+#   7.2.1-r0:
+#     - CVE-2022-45059 VSV00010
+#     - CVE-2022-45060 VSV00011
+#   7.0.3-r0:
+#     - CVE-2022-38150
+#   7.0.2-r0:
+#     - CVE-2022-23959
+#   6.6.1-r0:
+#     - CVE-2021-36740
 #   6.2.1-r0:
 #     - CVE-2019-15892
 #   5.2.1-r0:
@@ -38,7 +52,6 @@ source="https://varnish-cache.org/_downloads/varnish-$pkgver.tgz
 #   5.1.3-r0:
 #     - CVE-2017-12425
 
-
 build() {
 	./configure \
 		--build="$CBUILD" \
@@ -48,15 +61,13 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var/lib \
+		--with-unwind \
 		--without-jemalloc
 	make
 }
 
 check() {
-	make -j1 check || {
-		find . -name 'test-suite.log' -print -exec cat '{}' \;
-		return 1
-	}
+	make check -k VERBOSE=1
 }
 
 package() {
@@ -77,6 +88,7 @@ package() {
 		"$pkgdir"/var/log/varnish \
 		"$pkgdir"/var/lib/varnish
 	install -d -o root -g varnish -m750 "$pkgdir"/etc/varnish
+	install -m755 "$srcdir"/varnishreload-$pkgver "$pkgdir"/usr/bin/varnishreload
 }
 
 libs() {
@@ -86,22 +98,14 @@ libs() {
 	mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir"/usr/lib/
 }
 
-geoip() {
-	pkgdesc="Maxmind GeoIP2 lookup plugin for varnish"
-	depends="libmaxminddb-dev"
-
-	install -m755 -D "$srcdir"/maxminddb.vcl \
-		"$subpkgdir"/usr/lib/varnish/plugins/maxminddb.vcl
-}
-
-sha512sums="0f476c642df834737d446b3bc6ac8afa5981d1de5810dc6e8556eb22b2ca26d64eb531f4ad3332eb86e231a7443fe35393177ec6dbee97a837f405d1aa9d03cd  varnish-6.3.2.tgz
-2123668169b055f2d88f9b5b8e0877ca8b3cbfcd61e03d91fd7d0513b3267e4ef01a4d858cc6a3298cca0a49aaea2f92ff4fd9c0baf52a6c67b452a53f7e54d0  musl-include-vpf.patch
-c51c8964880990c2b01807b2a38d886b146736a918bda9ea2e032c50085bf6745cab3cccb4ee4c561ab936a8b7cfb278cfcb758543ea6c605c15b8973c9f10ce  musl-include-vsb.patch
-5ac7867e85cbd721f903c524ed4b524423d9dada4acfeefb0e543214a208828df5cc4efe2f012991bea6b38c2b223c24b17d3890ec4ed2c57d2b441b8e5a6900  varnishd.initd
-98c8901e53f3c6adb908b9eb01fd441ea53f3c54d4a79aecb1fb1eddfa2fc93de3d0de403a4464a9baff15873b3a20623837e3a37cb225e924a329e32b9e37d6  varnishd.confd
+sha512sums="
+ca77abcb21299942b2bfd433e5f964d2e974cdae92d6a8889217fcd81933a3b7bc1e70ba87d7e842a4f90b59d7948242155380054d67ad49aab8dcea343055a2  varnish-7.5.0.tgz
+be449f7cab645f7e2db49f00992aaec254423bb90d4cabdfbf21b272871907420e30e07c0cc46562565739e9a226ce142abc274d99b9418c57ce359ed4be8c19  varnishd.initd
+494431a4cf37c5bbd0d533a08f0bc27ef58b66be7d82f78b3ccbc343368f4a159f9b76a7a5d4271dd16fe5e3b7bc47dfc828d0c821ffb5343dfc62c08e29f506  varnishd.confd
 c67a7898f40849989edcbe74e1a418e196f48e178ca30126bc13db226e4f4c2c2ba74d9d0650ef68ed88732917fc06b80ef1f62c2d9d2c14a89f26fd25aed0f7  varnishlog.initd
 88fe9b545a2b25d6e6e45f1cfecbeca5f503bc1fbe95856386e568edee41b487b162cddceba8cb152b0a37d8d96635a76c0715fc69d87d6c667ac403ebae0bb7  varnishlog.confd
 e0b7d67bbd710f0a17b77837c581f128e6b746eff2b12e81d03d1ad040037e95bb00fb8007d89bc6dab18cfa659456078f310ac268f104774ef85ad068efecca  varnishncsa.initd
 a5426ff66b89d2afb6273f05e4117b3eec5ce0162a624d52c92b418960f72e58bd01224165613221af76ec241bd98e1eb985b2ef7b83a5b615e9ece67234dcc8  varnishncsa.confd
 51cc6d46ff7439de93977ab87dfb0af399458c1e446475696f73342ae7a0c1a8ca8fc6e79e593659f1af30716a5f8a1ee5e3b1f5e7b35df40b45d47e7b0f2ffd  varnishd.logrotate
-69f088819cff6d4441813be284f4117f232d08908515bd15d96bd5bb9d41ba7100657a52fd408d44c396d004366062ae22fbf08e2a983cd8023b554539ccf596  maxminddb.vcl"
+282049f4d9ce2f64a3419678368e0933882e6bf959693df2125aa85e0fc280c59e0d42f830107e619d4760d01cc84e33dcf6b687a1ae9b40168f9c0a90c5d769  varnishreload-7.5.0
+"
diff --git a/main/varnish/maxminddb.vcl b/main/varnish/maxminddb.vcl
deleted file mode 100644
index db817030f30..00000000000
--- a/main/varnish/maxminddb.vcl
+++ /dev/null
@@ -1,78 +0,0 @@
-# Maxmind GeoIP2 API bindings
-# Copyright (c) 2013 Timo Teräs
-# GPLv2 applies
-
-# Use from your VCL by adding to your vcl_recv():
-#  call maxminddb_lookup;
-
-# You also need to modify the cc_command parameter to include
-# Maxmind database library (-lmaxminddb). In Alpine Linux this is
-# done by uncomminting the relevant VARNISHD_PLUGIN_CFLAGS line in
-# /etc/conf.d/varnishd.
-
-C{
-
-#include <maxminddb.h>
-#include <string.h>
-
-static MMDB_s mmdb;
-
-static void __attribute__((constructor)) __geoip_on_load(void)
-{
-	if (MMDB_open("/var/lib/libmaxminddb/GeoLite2-City.mmdb", MMDB_MODE_MMAP, &mmdb) != MMDB_SUCCESS)
-		mmdb.filename = NULL;
-}
-
-static void __attribute__((destructor)) __geoip_on_unload(void)
-{
-	if (mmdb.filename != NULL)
-		MMDB_close(&mmdb);
-}
-
-static inline void __geoip_set_header(struct sess *sp, const char *hdr, MMDB_lookup_result_s *res, const char * const* path)
-{
-	MMDB_entry_data_s entry;
-	const char *value = "FAIL";
-	char buf[64];
-	int s;
-
-	if (!res->found_entry)
-		goto set_and_exit;
-
-	s = MMDB_aget_value(&res->entry, &entry, path);
-	if (s != MMDB_SUCCESS || !entry.has_data)
-		goto set_and_exit;
-
-	if (entry.type != MMDB_DATA_TYPE_UTF8_STRING || entry.data_size+1 >= sizeof(buf))
-		goto set_and_exit;
-
-	memcpy(buf, entry.utf8_string, entry.data_size);
-	buf[entry.data_size] = 0;
-	value = buf;
-
-set_and_exit:
-	VRT_SetHdr(sp, HDR_REQ, hdr, value, vrt_magic_string_end);
-}
-
-static void __geoip_set_headers(struct sess *sp)
-{
-	static const char *continent_path[] = { "continent", "code", NULL };
-	static const char *country_path[] = { "country", "iso_code", NULL };
-	MMDB_lookup_result_s res = {0};
-	int e = MMDB_FILE_OPEN_ERROR;
-
-	if (mmdb.filename != NULL)
-		res = MMDB_lookup_sockaddr(&mmdb, (struct sockaddr*) VRT_r_client_ip(sp), &e);
-
-	if (e != MMDB_SUCCESS)
-		VRT_SetHdr(sp, HDR_REQ, "\016X-GeoIP-Error:", MMDB_strerror(e), vrt_magic_string_end);
-
-	__geoip_set_header(sp, "\022X-GeoIP-Continent:", &res, continent_path);
-	__geoip_set_header(sp, "\020X-GeoIP-Country:", &res, country_path);
-}
-
-}C
-
-sub maxminddb_lookup {
-	C{ __geoip_set_headers(sp); }C
-}
diff --git a/main/varnish/musl-include-vpf.patch b/main/varnish/musl-include-vpf.patch
deleted file mode 100644
index 04e86c26449..00000000000
--- a/main/varnish/musl-include-vpf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/include/vpf.h b/include/vpf.h
-index 822f2d3..61e2ee1 100644
---- a/include/vpf.h
-+++ b/include/vpf.h
-@@ -27,6 +27,10 @@
-  * $FreeBSD: src/lib/libutil/libutil.h,v 1.41 2005/08/24 17:21:38 pjd Exp $
-  */
- 
-+#ifdef HAVE_SYS_STAT_H
-+# include <sys/stat.h>
-+#endif
-+
- #ifndef VPF_H_INCLUDED
- #define VPF_H_INCLUDED
- 
diff --git a/main/varnish/musl-include-vsb.patch b/main/varnish/musl-include-vsb.patch
deleted file mode 100644
index 41e4f5ac6af..00000000000
--- a/main/varnish/musl-include-vsb.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/include/vsb.h b/include/vsb.h
-index d510884..d9820bf 100644
---- a/include/vsb.h
-+++ b/include/vsb.h
-@@ -28,6 +28,10 @@
-  *      $FreeBSD: head/sys/sys/vsb.h 221993 2011-05-16 16:18:40Z phk $
-  */
- 
-+#ifdef HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+
- #ifndef VSB_H_INCLUDED
- #define VSB_H_INCLUDED
- 
diff --git a/main/varnish/varnishd.confd b/main/varnish/varnishd.confd
index 1a18b648541..567bf10815d 100644
--- a/main/varnish/varnishd.confd
+++ b/main/varnish/varnishd.confd
@@ -1,7 +1,7 @@
 # /etc/conf.d/varnishd
 
 VARNISHD="/usr/sbin/varnishd"
-VARNISHADM="/usr/bin/varnishadm"
+VARNISHRELOAD="/usr/bin/varnishreload"
 
 #CONFIGFILES="/etc/varnish/${SVCNAME}.vcl"
 CONFIGFILE="/etc/varnish/default.vcl"
diff --git a/main/varnish/varnishd.initd b/main/varnish/varnishd.initd
index 4bc5061d235..7c3f8bc69d9 100644
--- a/main/varnish/varnishd.initd
+++ b/main/varnish/varnishd.initd
@@ -51,27 +51,8 @@ reload() {
 
 	ebegin "Reloading varnish"
 
-	$VARNISHADM vcl.list >/dev/null 2>&1
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eerror "${SVCNAME} cannot list configuration"
-		return 1
-	fi
-
-	new_config="reload_$(date +%FT%H:%M:%S)"
-	$VARNISHADM vcl.load $new_config $CONFIGFILE >/dev/null 2>&1
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eerror "${SVCNAME} cannot load configuration"
-		return 1
-	fi
-
-	$VARNISHADM vcl.use $new_config >/dev/null 2>&1
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eerror "${SVCNAME} cannot switch configuration"
-		return 1
-	fi
+	output="$VARNISHRELOAD 2>&1"
 
-	eend 0
+	eend $? "${SVCNAME} couldn't reload its configuration:
+$output"
 }
diff --git a/main/vblade/APKBUILD b/main/vblade/APKBUILD
deleted file mode 100644
index 2a9a004fac9..00000000000
--- a/main/vblade/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Pedro Filipe <xpecex@outlook.com>
-# Contributor: 
-# Maintainer: 
-pkgname=vblade
-pkgver=24
-pkgrel=0
-pkgdesc="A virtual AoE blade server"
-url="https://github.com/OpenAoE/vblade"
-arch="all"
-license="GPL-2.0-only"
-depends=""
-makedepends="linux-headers"
-install=""
-subpackages="$pkgname-doc"
-source="https://github.com/OpenAoE/$pkgname/archive/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$pkgname-$pkgname-$pkgver
-
-build() {
-	cd "$builddir"
-	make CFLAGS="$CFLAGS"
-}
-
-package() {
-	cd "$builddir"
-	mkdir -p "$pkgdir"/usr/sbin
-	mkdir -p "$pkgdir"/usr/share/man/man8
-	make sbindir="$pkgdir"/usr/sbin mandir="$pkgdir"/usr/share/man install
-}
-
-sha512sums="d5db85581db119b83a129fc00635d37b6d8fccfaf685dc58c68773c7299f7fe4e01735ec7fea6a0494a0cf2bc1400d643a720b55e4d6de37a0b8ec15d00d1f2a  vblade-24.tar.gz"
diff --git a/main/vde2/APKBUILD b/main/vde2/APKBUILD
deleted file mode 100644
index 23b0238f331..00000000000
--- a/main/vde2/APKBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# Maintainer: Michael Zhou <zhoumichaely@gmail.com>
-pkgname=vde2
-pkgver=2.3.2
-pkgrel=12
-pkgdesc="VDE: Virtual Distributed Ethernet. User mode networking for QEMU, UML, etc."
-url="http://vde.sf.net"
-arch="all"
-options="!check"  # No test suite.
-license="GPL"
-depends="openssl"
-install="vde2.pre-install"
-makedepends="linux-headers openssl-dev libpcap-dev python3-dev"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-libs"
-source="https://downloads.sourceforge.net/project/vde/vde2/$pkgver/vde2-$pkgver.tar.gz
-	musl-build-fix.patch
-	vde_cryptcab-compile-against-openssl-1.1.0.patch
-	inline.patch
-	vde2.pre-up
-	vde2.post-down
-	"
-
-builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$builddir"
-	default_prepare
-
-	update_config_sub
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc
-	make -C src/common
-	make -j1 -C src/lib
-	make
-}
-
-package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install
-
-	install -Dm755 "$srcdir"/vde2.pre-up \
-		"$pkgdir"/etc/network/if-pre-up.d/vde2
-	install -Dm755 "$srcdir"/vde2.post-down \
-		"$pkgdir"/etc/network/if-post-down.d/vde2
-}
-
-libs() {
-	pkgdesc="Virtual Distributed Ethernet libraries"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/
-}
-
-sha512sums="b502ceac8eebd30694a25d913c1d321b58ec8ae97dec0b09acc40455f7a97c05040ff395242c144580a9d9d5cb19292055bc94133ea1bde66bfdab40844533a8  vde2-2.3.2.tar.gz
-52d02c3a5a4f5526ed2e653e5720f012501215c0440e26105c585ea0501423da04047f6bad13a71b7378397a9d9274b191007d839876b675e206ed5be0f25372  musl-build-fix.patch
-e24f7728030c1bc89b885c58ecf443d0f7297f6c9f73d87fa37092a691dfac191e65fb07a11ed44b718bbd18011fdb4e034f66ef63a8fbb06dfb06fd51c3826a  vde_cryptcab-compile-against-openssl-1.1.0.patch
-76692aafd60b5c329dd6572a0ef8308f4fcc330f6f8eb4326e11678cf6946e6947bd18a32b0a84cf4cda4a2048e2c73e82c77013368d3335f3145f2121df68d6  inline.patch
-71b29d538bba80b881f239d683215279089c14e8feec05bf27c159ead51094cdfb168281900fa4527f588c624e8f7687df8d3f79377e07d13ad64de613177df3  vde2.pre-up
-d1cf18146145dbe608842c694b05d2906e36553b0ba3fa1ec2e53dbf06027b9e4937ea61aee77c1ccbb73b818f19d55787051eb6d5b09a38c7d18a1dad629190  vde2.post-down"
diff --git a/main/vde2/inline.patch b/main/vde2/inline.patch
deleted file mode 100644
index b11840fda45..00000000000
--- a/main/vde2/inline.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/vde_switch/fstp.c b/src/vde_switch/fstp.c
-index ac5e313..26c5a67 100644
---- a/src/vde_switch/fstp.c
-+++ b/src/vde_switch/fstp.c
-@@ -30,14 +30,14 @@ static int numports;
- #ifdef FSTP
- #include <fstp.h>
- /*********************** sending macro used by FSTP & Core ******************/
--void inline ltonstring(unsigned long l,unsigned char *s) {
-+static void ltonstring(unsigned long l,unsigned char *s) {
- 	s[3]=l; l>>=8;
- 	s[2]=l; l>>=8;
- 	s[1]=l; l>>=8;
- 	s[0]=l;
- }
- 
--unsigned long inline nstringtol(unsigned char *s) {
-+static unsigned long nstringtol(unsigned char *s) {
- 	return (s[0]<<24)+(s[1]<<16)+(s[2]<<8)+s[3];
- }
- 
diff --git a/main/vde2/musl-build-fix.patch b/main/vde2/musl-build-fix.patch
deleted file mode 100644
index c03459c6e9b..00000000000
--- a/main/vde2/musl-build-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/vdetaplib/libvdetap.c b/src/vdetaplib/libvdetap.c
-index 00cd401..c70f290 100644
---- a/src/vdetaplib/libvdetap.c
-+++ b/src/vdetaplib/libvdetap.c
-@@ -121,6 +121,10 @@ int open(const char *path, int flags, ...)
- 		return native_open(path, flags, data);
- }
- 
-+/* musl apparently defines open64 as a macro */
-+#ifdef open64
-+#undef open64
-+#endif
- int open64(const char *path, int flags, ...)
- {
- 	va_list ap;
diff --git a/main/vde2/vde2.post-down b/main/vde2/vde2.post-down
deleted file mode 100644
index be5f5b31d88..00000000000
--- a/main/vde2/vde2.post-down
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-VDE_SWITCH=/usr/bin/vde_switch
-SLIRPVDE=/usr/bin/slirpvde
-
-# this is not an interesting stanza for us
-if [ -z "$IF_VDE2_SWITCH" -a -z "$IF_VDE2_PLUG" -a -z "$IF_VDE2_SLIRP" ]; then
-  exit 0
-fi
-
-PIDFILE="/var/run/vde2/$IFACE-plug.pid"
-CTLFILE="/var/run/vde2/$IFACE.ctl"
-if [ -f $PIDFILE ]; then
-    start-stop-daemon --stop --quiet --pidfile $PIDFILE
-    rm -f $PIDFILE
-fi
-
-PIDFILE="/var/run/vde2/$IFACE-slirp.pid"
-if [ -f $PIDFILE ]; then
-    start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-        --exec $SLIRPVDE
-    rm -f $PIDFILE
-fi
-
-PIDFILE="/var/run/vde2/$IFACE.pid"
-CTLDIR="/var/run/vde2/$IFACE.ctl"
-if [ -f $PIDFILE ]; then
-    start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-        --exec $VDE_SWITCH
-    rm -f $PIDFILE
-
-    # set the tap interface to non-persistant, see #568363
-    vde_tunctl -b -d $IFACE 1>/dev/null
-fi
-
-rm -rf $CTLDIR
-rm -f $CTLDIR.*
diff --git a/main/vde2/vde2.pre-install b/main/vde2/vde2.pre-install
deleted file mode 100644
index 3c3e08d47bf..00000000000
--- a/main/vde2/vde2.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S vde2-net 2>/dev/null
-adduser -S -D -H -h /var/run/vde2 -s /sbin/nologin -G vde2-net -g vde2-net vde2-net 2>/dev/null
-
-exit 0
diff --git a/main/vde2/vde2.pre-up b/main/vde2/vde2.pre-up
deleted file mode 100644
index 991b382265b..00000000000
--- a/main/vde2/vde2.pre-up
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-
-VDE_SWITCH=/usr/bin/vde_switch
-VDE_PLUG=/usr/bin/vde_plug
-SLIRPVDE=/usr/bin/slirpvde
-DPIPE=/usr/bin/dpipe
-RUNDIR=/var/run/vde2
-
-USER=vde2-net
-GROUP=vde2-net
-
-if [ ! -x $VDE_SWITCH ] || [ ! -x $SLIRPVDE ]; then
-  exit 0
-fi
-
-# this is not an interesting stanza for us
-if [ -z "$IF_VDE2_SWITCH" -a -z "$IF_VDE2_PLUG" -a -z "$IF_VDE2_SLIRP" ]; then
-  exit 0
-fi
-
-
-# Create directory if missing
-if [ ! -d $RUNDIR ]; then
-    mkdir -p $RUNDIR
-    chown vde2-net:vde2-net $RUNDIR
-    chmod 2770 $RUNDIR
-fi
-
-# vde2-switch [-|<args>]
-if [ -n "$IF_VDE2_SWITCH" ]; then
-    set -- $IF_VDE2_SWITCH
-    test "$1" = "-" && shift
-    PIDFILE="$RUNDIR/$IFACE.pid"
-    CTLDIR="$RUNDIR/$IFACE.ctl"
-    MGMTFILE="$RUNDIR/$IFACE.mgmt"
-
-    if [ "$METHOD" = "manual" ]; then
-        TAPOPTS=""
-    else
-        TAPOPTS="-t $IFACE"
-    fi
-
-    # block to make sure the interface exists, see #568363
-    vde_tunctl -b -t $IFACE 1>/dev/null
-
-    start-stop-daemon --start --quiet --pidfile $PIDFILE \
-        --exec $VDE_SWITCH -- \
-        -s $CTLDIR -m 660 -g $GROUP -p $PIDFILE $TAPOPTS \
-        -M $MGMTFILE --mgmtmode 660 -d "$@"
-fi
-
-# vde2-plug <dpipe_cmd2>
-if [ -n "$IF_VDE2_PLUG" ]; then
-    set -- $IF_VDE2_PLUG
-    PIDFILE="$RUNDIR/$IFACE-plug.pid"
-    CTLDIR="$RUNDIR/$IFACE.ctl"
-
-    start-stop-daemon --start --quiet --pidfile $PIDFILE \
-        --make-pidfile --background \
-        --exec $DPIPE -- $VDE_PLUG -g $GROUP -m 660 $CTLDIR = "$@"
-fi
-
-# vde2-slirp [-|<args>]
-if [ -n "$IF_VDE2_SLIRP" ]; then
-    set -- $IF_VDE2_SLIRP
-    test "$1" = "-" && shift
-    PIDFILE="$RUNDIR/$IFACE-slirp.pid"
-    CTLDIR="$RUNDIR/$IFACE.ctl"
-
-    start-stop-daemon --start --quiet --pidfile $PIDFILE \
-        --chuid $USER \
-        --exec $SLIRPVDE -- \
-        -s $CTLDIR -m 660 -p $PIDFILE -d "$@"
-fi
diff --git a/main/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch b/main/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch
deleted file mode 100644
index 227312eabbd..00000000000
--- a/main/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/src/vde_cryptcab/cryptcab.c	2011-11-23 16:41:17.000000000 +0000
-+++ b/src/vde_cryptcab/cryptcab.c	2017-03-20 22:54:20.452975075 +0000
-@@ -22,7 +22,7 @@
- 	exit(1);
- }
- 	
--static EVP_CIPHER_CTX ctx;
-+static EVP_CIPHER_CTX *ctx;
- static int ctx_initialized = 0;
- static int encryption_disabled = 0;
- static int nfd;
-@@ -30,6 +30,10 @@
- static struct vde_open_args open_args={.port=0,.group=NULL,.mode=0700};
- static int verbose = 0;
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#define EVP_CIPHER_CTX_reset(x)	EVP_CIPHER_CTX_cleanup(x)
-+#endif
-+
- void vc_printlog(int priority, const char *format, ...)
- {
- 	va_list arg;
-@@ -103,19 +107,21 @@
- 	}
- 
- 	if (!ctx_initialized) {
--		EVP_CIPHER_CTX_init (&ctx);
-+		ctx = EVP_CIPHER_CTX_new ();
-+		if (!ctx)
-+			return -1;
- 		ctx_initialized = 1;
- 	}
- 	
--	EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
--	if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1)
-+	EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
-+	if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1)
- 	{
- 		fprintf (stderr,"error in encrypt update\n");
- 		olen = -1;
- 		goto cleanup;
- 	}
- 
--	if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1)
-+	if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1)
- 	{
- 		fprintf (stderr,"error in encrypt final\n");
- 		olen = -1;
-@@ -124,7 +130,7 @@
- 	olen += tlen;
- 
- cleanup:
--	EVP_CIPHER_CTX_cleanup(&ctx);	
-+	EVP_CIPHER_CTX_reset(ctx);
- 	return olen;
- }
- 
-@@ -138,19 +144,21 @@
- 	}
- 	
- 	if (!ctx_initialized) {
--		EVP_CIPHER_CTX_init (&ctx);
-+		ctx = EVP_CIPHER_CTX_new ();
-+		if (!ctx)
-+			return -1;
- 		ctx_initialized = 1;
- 	}
- 
--	EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
--	if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1)
-+	EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
-+	if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1)
- 	{
- 		fprintf (stderr,"error in decrypt update\n");
- 		olen = -1;
- 		goto cleanup;
- 	}
- 
--	if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1)
-+	if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1)
- 	{
- 		fprintf (stderr,"error in decrypt final\n");
- 		olen = -1;
-@@ -159,7 +167,7 @@
- 	olen += tlen;
- 
- cleanup:
--	EVP_CIPHER_CTX_cleanup(&ctx);	
-+	EVP_CIPHER_CTX_reset (ctx);
- 	return olen;
- }
- 
diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD
index d56682567fe..4ca0c1df109 100644
--- a/main/vim/APKBUILD
+++ b/main/vim/APKBUILD
@@ -3,22 +3,178 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=vim
-pkgver=8.2.0357
-pkgrel=0
+pkgver=9.1.0
+pkgrel=2
 pkgdesc="Improved vi-style text editor"
 url="https://www.vim.org/"
 arch="all"
 license="Vim"
 options="!check"  # some tests are failing
-depends="xxd"
-makedepends="ncurses-dev lua5.3-dev python3-dev gtk+3.0-dev libx11-dev libxt-dev"
-subpackages="$pkgname-doc ${pkgname}diff::noarch gvim xxd"
-source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
+makedepends="
+	gtk+3.0-dev
+	libx11-dev
+	libxt-dev
+	lua5.4-dev
+	ncurses-dev
+	python3-dev
+	ruby-dev
+	"
+subpackages="
+	$pkgname-doc
+	${pkgname}diff
+	$pkgname-tutor
+	$pkgname-common
+	gvim
+	xxd
+	"
+source="$pkgname-$pkgver.tar.gz::https://github.com/vim/vim/archive/refs/tags/v$pkgver.tar.gz
 	vimrc
 	"
 
 # secfixes:
-#   8.1.1365:
+#   9.0.2127-r0:
+#     - CVE-2023-48706
+#   9.0.2112-r0:
+#     - CVE-2023-48231
+#   9.0.2073-r0:
+#     - CVE-2023-5535
+#   9.0.1994-r0:
+#     - CVE-2023-5344
+#   9.0.1888-r0:
+#     - CVE-2023-4733
+#     - CVE-2023-4734
+#     - CVE-2023-4735
+#     - CVE-2023-4736
+#     - CVE-2023-4738
+#     - CVE-2023-4750
+#     - CVE-2023-4752
+#     - CVE-2023-4781
+#   9.0.1413-r0:
+#     - CVE-2023-1264
+#   9.0.1395-r0:
+#     - CVE-2023-1127
+#     - CVE-2023-1170
+#     - CVE-2023-1175
+#     - CVE-2023-1355
+#   9.0.1251-r0:
+#     - CVE-2023-0433
+#     - CVE-2023-0512
+#   9.0.1198-r0:
+#     - CVE-2023-0288
+#   9.0.1167-r0:
+#     - CVE-2023-0049
+#     - CVE-2023-0051
+#     - CVE-2023-0054
+#   9.0.0999-r0:
+#     - CVE-2022-4141
+#     - CVE-2022-4292
+#     - CVE-2022-4293
+#     - CVE-2022-47024
+#   9.0.0815-r0:
+#     - CVE-2022-3705
+#   9.0.0636-r0:
+#     - CVE-2022-3352
+#   9.0.0598-r0:
+#     - CVE-2022-3234
+#     - CVE-2022-3235
+#     - CVE-2022-3256
+#     - CVE-2022-3278
+#   9.0.0437-r0:
+#     - CVE-2022-3134
+#   9.0.0369-r0:
+#     - CVE-2022-2980
+#     - CVE-2022-2982
+#     - CVE-2022-3016
+#     - CVE-2022-3037
+#     - CVE-2022-3099
+#   9.0.0270-r0:
+#     - CVE-2022-2923
+#     - CVE-2022-2946
+#   9.0.0224-r0:
+#     - CVE-2022-2816
+#     - CVE-2022-2817
+#     - CVE-2022-2819
+#   9.0.0050-r0:
+#     - CVE-2022-2264
+#     - CVE-2022-2284
+#     - CVE-2022-2285
+#     - CVE-2022-2286
+#     - CVE-2022-2287
+#     - CVE-2022-2288
+#     - CVE-2022-2289
+#     - CVE-2022-2304
+#   8.2.5170-r0:
+#     - CVE-2022-2124
+#     - CVE-2022-2125
+#     - CVE-2022-2126
+#     - CVE-2022-2129
+#   8.2.5055-r0:
+#     - CVE-2022-1851
+#     - CVE-2022-1886
+#     - CVE-2022-1898
+#   8.2.5000-r0:
+#     - CVE-2022-1796
+#   8.2.4969-r0:
+#     - CVE-2022-1619
+#     - CVE-2022-1620
+#     - CVE-2022-1621
+#     - CVE-2022-1629
+#   8.2.4836-r0:
+#     - CVE-2022-1381
+#   8.2.4708-r0:
+#     - CVE-2022-1154
+#     - CVE-2022-1160
+#   8.2.4619-r0:
+#     - CVE-2022-0943
+#   8.2.4542-r0:
+#     - CVE-2022-0572
+#     - CVE-2022-0629
+#     - CVE-2022-0685
+#     - CVE-2022-0696
+#     - CVE-2022-0714
+#     - CVE-2022-0729
+#   8.2.4350-r0:
+#     - CVE-2022-0359
+#     - CVE-2022-0361
+#     - CVE-2022-0368
+#     - CVE-2022-0392
+#     - CVE-2022-0393
+#     - CVE-2022-0407
+#     - CVE-2022-0408
+#     - CVE-2022-0413
+#     - CVE-2022-0417
+#     - CVE-2022-0443
+#   8.2.4173-r0:
+#     - CVE-2021-4069
+#     - CVE-2021-4136
+#     - CVE-2021-4166
+#     - CVE-2021-4173
+#     - CVE-2021-4187
+#     - CVE-2021-4192
+#     - CVE-2021-4193
+#     - CVE-2021-46059
+#     - CVE-2022-0128
+#     - CVE-2022-0156
+#     - CVE-2022-0158
+#     - CVE-2022-0213
+#   8.2.3779-r0:
+#     - CVE-2021-4019
+#   8.2.3650-r0:
+#     - CVE-2021-3927
+#     - CVE-2021-3928
+#     - CVE-2021-3968
+#     - CVE-2021-3973
+#     - CVE-2021-3974
+#     - CVE-2021-3984
+#   8.2.3567-r0:
+#     - CVE-2021-3903
+#   8.2.3500-r0:
+#     - CVE-2021-3875
+#   8.2.3437-r0:
+#     - CVE-2021-3770
+#     - CVE-2021-3778
+#     - CVE-2021-3796
+#   8.1.1365-r0:
 #     - CVE-2019-12735
 #   8.0.1521-r0:
 #     - CVE-2017-6350
@@ -29,25 +185,28 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$
 #     - CVE-2016-1248
 
 prepare() {
-	cd "$builddir"
 	# Read vimrc from /etc/vim
 	echo '#define SYS_VIMRC_FILE "/etc/vim/vimrc"' >> src/feature.h
+
 	cp -r "$builddir" "$builddir"-gvim
+	default_prepare
 }
 
 build() {
-	cd "$builddir"
+	export CFLAGS="$CFLAGS -flto=auto"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--enable-luainterp \
+		--enable-luainterp=dynamic \
 		--enable-python3interp=dynamic \
+		--enable-rubyinterp=dynamic \
 		--without-x \
 		--disable-nls \
+		--enable-acl \
 		--enable-multibyte \
 		--enable-gui=no \
-		--with-lua-prefix=/usr/lua5.3 \
+		--with-lua-prefix=/usr/lua5.4 \
 		--with-compiledby="Alpine Linux"
 	make
 	cd "$builddir"-gvim
@@ -55,61 +214,92 @@ build() {
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--enable-luainterp \
+		--enable-luainterp=dynamic \
 		--enable-python3interp=dynamic \
+		--enable-rubyinterp=dynamic \
 		--with-x \
 		--disable-nls \
+		--enable-acl \
 		--enable-multibyte \
 		--enable-gui=gtk3 \
-		--with-lua-prefix=/usr/lua5.3 \
+		--with-lua-prefix=/usr/lua5.4 \
 		--with-compiledby="Alpine Linux"
 	make
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir/" install
+	depends="vim-common=$pkgver-r$pkgrel xxd=$pkgver-r$pkgrel"
+	provider_priority=10
+	replaces="gvim"
+
+	make -j1 DESTDIR="$pkgdir" install
 
 	install -Dm644 runtime/doc/uganda.txt \
 		"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 	install -Dm644 "$srcdir"/vimrc "$pkgdir"/etc/vim/vimrc
+
+	# only relevant to gvim
+	rm -r "$pkgdir"/usr/share/icons/
+	rm -r "$pkgdir"/usr/share/applications/
+}
+
+common() {
+	replaces="vim gvim"
+	arch="noarch"
+	amove etc/vim/vimrc
+	amove usr/share/vim
 }
 
 gvim() {
 	pkgdesc="advanced text editor, with GUI"
-	provides="vim"
-	cd "$builddir"-gvim
-	make -j1 DESTDIR="$subpkgdir/" install
+	depends="vim-common=$pkgver-r$pkgrel xxd=$pkgver-r$pkgrel"
+	provides="vim=$pkgver-r$pkgrel"
+	provider_priority=1
+	replaces="vim"
 
-	install -Dm644 runtime/doc/uganda.txt \
-		"$subpkgdir/usr/share/licenses/$pkgname/LICENSE"
-	install -Dm644 "$srcdir"/vimrc "$subpkgdir"/etc/vim/vimrc
-	rm -rf "$subpkgdir"/usr/share/man
-	rm "${subpkgdir}/usr/bin/xxd"
+	make -C "$builddir"-gvim -j1 DESTDIR="$subpkgdir" install
+
+	rm "$subpkgdir"/usr/bin/vimdiff
+	rm "$subpkgdir"/usr/bin/vimtutor
+	rm -r "$subpkgdir"/usr/share/man
+	rm -r "$subpkgdir"/usr/share/vim
+	rm "$subpkgdir"/usr/bin/xxd
 }
 
 vimdiff() {
 	pkgdesc="view file diffs in vim"
-	depends="diffutils vim"
+	depends="diffutils vim=$pkgver-r$pkgrel"
+	replaces="vim gvim"
+	arch="noarch"
 	options="!tracedeps"
+	provides="cmd:vimdiff=$pkgver-r$pkgrel"
 
-	install -d "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin
+	amove usr/bin/vimdiff
+}
+
+tutor() {
+	pkgdesc="vim tutor and tutor files"
+	depends="vim=$pkgver-r$pkgrel"
+	replaces="gvim vim"
+	arch="noarch"
+
+	amove usr/bin/vimtutor
+	amove usr/share/vim/vim*/tutor
 }
 
 xxd() {
 	pkgdesc="tool to make (or reverse) a hex dump"
 	depends=""
-	echo "${pkgdir}" "${subpkgdir}"
-	mkdir -p "${subpkgdir}/usr/bin"
-	mv "${pkgdir}/usr/bin/xxd" \
-	   "${subpkgdir}/usr/bin/"
+	replaces="gvim vim"
+
+	amove usr/bin/xxd
 }
 
-sha512sums="0327c19929ef0c0d8d0b1dae0121444d9d07a4d3c9037d85a52bd77206b7ba5534483ad75f65ba26746d4838b68d90b9bee1f9bc992c5898600d2a6c106039de  vim-8.2.0357.tar.gz
-d9586b777881973cb5e48e18750336a522ed72c3127b2d6b6991e2b943468ca5b694476e7fa39ab469178c1375fc8f52627484e0fe377aea5811a513e35a7b02  vimrc"
+sha512sums="
+d7038c5c413bfd1a125a893c0b1d3e498e9ce6b5df7d45ef536faac966ce2846b08fe2982010c31f30b34fda07ba2c6922d795806509d05d73768626edc70374  vim-9.1.0.tar.gz
+bb4ac5bd2862754e741e63d7b521fd9e0cb1ac19769b952672928fd26471e9486182cd8a46a7e6f25e5b87759106e642293534c5e90c3c3958308291acb26875  vimrc
+"
diff --git a/main/vim/vimrc b/main/vim/vimrc
index e3017342455..0c2ebe3ce04 100644
--- a/main/vim/vimrc
+++ b/main/vim/vimrc
@@ -12,4 +12,7 @@ set suffixes+=.info,.aux,.log,.dvi,.bbl,.out,.o,.lo
 
 set nomodeline
 syntax on
-autocmd BufRead APKBUILD set filetype=sh
+
+if filereadable("/etc/vim/vimrc.local")
+	source /etc/vim/vimrc.local
+endif
diff --git a/main/vlan/APKBUILD b/main/vlan/APKBUILD
index 2f3a2b86f1a..ab184a059ad 100644
--- a/main/vlan/APKBUILD
+++ b/main/vlan/APKBUILD
@@ -1,36 +1,31 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=vlan
-pkgver=2.2
-pkgrel=0
+pkgver=2.3
+pkgrel=1
 pkgdesc="Scripts for configuring VLAN network interfaces"
-url="http://wiki.alpinelinux.org/wiki/Vlan"
+url="https://wiki.alpinelinux.org/wiki/Vlan"
 arch="noarch"
-license="GPL"
-options="!check"
-depends=""
-makedepends=""
-install=""
-subpackages=""
+license="GPL-2.0-only"
+options="!check" # No testsuite
 source="mvlan.post-down
 	mvlan.pre-up
 	vlan.post-down
 	vlan.pre-up
 	"
 
-build() {
-	return 0
-}
-
 package() {
 	cd "$srcdir"
 	for i in vlan mvlan; do
 		for j in pre-up post-down; do
-			install -Dm755 $i.$j "$pkgdir"/etc/network/if-$j.d/$i || return 1
+			install -Dm755 $i.$j "$pkgdir"/etc/network/if-$j.d/$i
 		done
 	done
 }
-sha512sums="f00c8521830b1472f1e71223943c14446d28f2667f7e2fd3690c8402c7d3f34982bc4d27201b3dc9c1eb9a635e38ea23dee6e044487615cbc68ba519d940c0f7  mvlan.post-down
+
+sha512sums="
+f00c8521830b1472f1e71223943c14446d28f2667f7e2fd3690c8402c7d3f34982bc4d27201b3dc9c1eb9a635e38ea23dee6e044487615cbc68ba519d940c0f7  mvlan.post-down
 955ccc68398ed2d515f794d5ef4164fec2dcfc4504e2e29d427c1687c8b9d6ecff1ea7247dc751963bb7be1db5025940fb66efef3fb6287aa19fe014088573ac  mvlan.pre-up
 7a6e74957d2fcfb04023d2cf8246e8889a780171f669ec37a56882276d96fb0219180b37cc51ecd87421bcbd0f0d489602423859a6f5605781f703cf143e5bae  vlan.post-down
-0ebf1556de28eeabad0cf9ddb6c38e7c25672ca28fd708e1d4670d65ecc8573df4f4f651cb9f59c1ab8fcedcc382c8e834521dcf8ed10a554567823301aac10f  vlan.pre-up"
+0ebf1556de28eeabad0cf9ddb6c38e7c25672ca28fd708e1d4670d65ecc8573df4f4f651cb9f59c1ab8fcedcc382c8e834521dcf8ed10a554567823301aac10f  vlan.pre-up
+"
diff --git a/main/vulkan-headers/APKBUILD b/main/vulkan-headers/APKBUILD
new file mode 100644
index 00000000000..980ee7f80e0
--- /dev/null
+++ b/main/vulkan-headers/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Contributor: Simon Zeni <simon@bl4ckb0ne.ca>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=vulkan-headers
+_pkgname=Vulkan-Headers
+# Please be VERY careful upgrading this - vulkan-headers breaks API even
+# on point releases. So please make sure everything using this still builds
+# after upgrades
+pkgver=1.3.261.1
+pkgrel=0
+arch="noarch"
+url="https://www.vulkan.org/"
+pkgdesc="Vulkan header files"
+license="Apache-2.0"
+makedepends="cmake samurai"
+source="https://github.com/khronosgroup/vulkan-headers/archive/refs/tags/sdk-$pkgver/vulkan-headers-v$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-sdk-$pkgver"
+options="!check" # No tests
+
+build() {
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib
+	cmake --build build
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+ad896b76e229da538e5f1fd992fc2643daec5ca330e2ee42d3360ea855561773379302a9e666c502af0d10c7b2820ee48e4f17f78a1f1c1a614e3e0f10fc2c4f  vulkan-headers-v1.3.261.1.tar.gz
+"
diff --git a/main/vulkan-loader/APKBUILD b/main/vulkan-loader/APKBUILD
new file mode 100644
index 00000000000..beefb7dd069
--- /dev/null
+++ b/main/vulkan-loader/APKBUILD
@@ -0,0 +1,45 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Contributor: Simon Zeni <simon@bl4ckb0ne.ca>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=vulkan-loader
+_pkgname=Vulkan-Loader
+pkgver=1.3.261.1
+pkgrel=0
+arch="all"
+url="https://www.khronos.org/vulkan"
+pkgdesc="Vulkan Installable Client Driver (ICD) Loader"
+license="Apache-2.0"
+depends_dev="vulkan-headers"
+makedepends="$depends_dev
+	cmake
+	libx11-dev
+	libxrandr-dev
+	python3
+	samurai
+	wayland-dev
+	"
+source="https://github.com/khronosgroup/vulkan-loader/archive/refs/tags/sdk-$pkgver/vulkan-loader-sdk-$pkgver.tar.gz"
+subpackages="$pkgname-dbg $pkgname-dev"
+builddir="$srcdir/$_pkgname-sdk-$pkgver"
+options="!check" # No tests
+
+build() {
+	CXXFLAGS="$CXXFLAGS -flto=auto" \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc \
+		-DCMAKE_INSTALL_DATADIR=share \
+		-DCMAKE_SKIP_RPATH=True \
+		-DVULKAN_HEADERS_INSTALL_DIR=/usr
+	cmake --build build
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+24f233f8f0a765c442b471f59eeb4032c166d113017d873a758f591ac7c508271fc1d55ce632f59a86ab348ca9694e1df7d362752e8b86407037caf2a347a316  vulkan-loader-sdk-1.3.261.1.tar.gz
+"
diff --git a/main/vulkan-tools/APKBUILD b/main/vulkan-tools/APKBUILD
new file mode 100644
index 00000000000..c063df8fd83
--- /dev/null
+++ b/main/vulkan-tools/APKBUILD
@@ -0,0 +1,49 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Contributor: Simon Zeni <simon@bl4ckb0ne.ca>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=vulkan-tools
+_pkgname=Vulkan-Tools
+pkgver=1.3.261.1
+pkgrel=0
+arch="all"
+url="https://www.khronos.org/vulkan"
+pkgdesc="Vulkan Utilities and Tools"
+license="Apache-2.0"
+makedepends="
+	cmake
+	glslang-dev
+	libx11-dev
+	libxrandr-dev
+	python3
+	samurai
+	vulkan-headers
+	vulkan-loader-dev
+	wayland-dev
+	wayland-protocols-dev
+	"
+source="https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/sdk-$pkgver/vulkan-tools-sdk-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-sdk-$pkgver"
+options="!check" # No tests
+
+build() {
+	CXXFLAGS="$CXXFLAGS -flto=auto" \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc \
+		-DCMAKE_INSTALL_DATADIR=/usr/share \
+		-DCMAKE_SKIP_RPATH=True \
+		-DBUILD_CUBE=ON \
+		-DBUILD_VULKANINFO=ON \
+		-DGLSLANG_INSTALL_DIR=/usr
+	cmake --build build
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+43e180a74bdab839516352c8fcce24d0ea90b81571d9a55c72d67814c63b6515a80f242df8fbd47cfa51756858563060729260ea5b7edf64d9dbcb339e678f97  vulkan-tools-sdk-1.3.261.1.tar.gz
+"
diff --git a/main/wasi-compiler-rt/APKBUILD b/main/wasi-compiler-rt/APKBUILD
new file mode 100644
index 00000000000..5ef6695c996
--- /dev/null
+++ b/main/wasi-compiler-rt/APKBUILD
@@ -0,0 +1,66 @@
+# Contributor: Alex Yam <alex@alexyam.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=wasi-compiler-rt
+# match llvm ver
+pkgver=17.0.6
+_llvmver="${pkgver%%.*}"
+_wasi_sdk_ver=wasi-sdk-21
+pkgrel=1
+pkgdesc="WASI LLVM compiler runtime"
+url="https://compiler-rt.llvm.org/"
+arch="all"
+options="!check" # TODO: check
+license="Apache-2.0 WITH LLVM-exception"
+makedepends="
+	clang
+	cmake
+	libxml2-dev
+	llvm$_llvmver-dev
+	llvm$_llvmver-static
+	llvm$_llvmver-gtest
+	python3-dev
+	samurai
+	wasi-libc
+	wasi-libcxx
+	zlib-dev
+	"
+source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-project-$pkgver.src.tar.xz
+	wasi-sdk-$_wasi_sdk_ver.tar.gz::https://github.com/WebAssembly/wasi-sdk/archive/refs/tags/$_wasi_sdk_ver.tar.gz
+	"
+builddir="$srcdir"/llvm-project-$pkgver.src
+
+prepare() {
+	default_prepare
+
+	mv "$srcdir"/wasi-sdk-$_wasi_sdk_ver/wasi-sdk.cmake "$builddir"
+	mv "$srcdir"/wasi-sdk-$_wasi_sdk_ver/cmake/Platform cmake
+}
+
+build() {
+	export CFLAGS="$CFLAGS -fno-exceptions --sysroot=/usr/share/wasi-sysroot"
+	cmake -B build -G Ninja -S compiler-rt -Wno-dev \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_MODULE_PATH="$builddir"/cmake \
+		-DCMAKE_TOOLCHAIN_FILE="$builddir"/wasi-sdk.cmake \
+		-DCMAKE_C_COMPILER_WORKS=ON \
+		-DCMAKE_CXX_COMPILER_WORKS=ON \
+		-DCOMPILER_RT_BAREMETAL_BUILD=ON \
+		-DCOMPILER_RT_INCLUDE_TESTS=OFF \
+		-DCOMPILER_RT_HAS_FPIC_FLAG=OFF \
+		-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
+		-DCOMPILER_RT_OS_DIR=wasi \
+		-DWASI_SDK_PREFIX=/usr \
+		-DCMAKE_INSTALL_PREFIX=/usr/lib/llvm$_llvmver/lib/clang/$_llvmver/
+	cmake --build build
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+
+	rm -r "$pkgdir"/usr/lib/llvm$_llvmver/lib/clang/$_llvmver/include
+}
+
+sha512sums="
+6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30  llvm-project-17.0.6.src.tar.xz
+a4d3c857ebad46b46aee6f57cd2267f2d4a53ff439c5ea0ed0c33bcc07d373916d27631bb6640701d082773b3a10a0585a4212c64f0309b78d30e58866a76128  wasi-sdk-wasi-sdk-21.tar.gz
+"
diff --git a/main/wasi-libc/APKBUILD b/main/wasi-libc/APKBUILD
new file mode 100644
index 00000000000..978f5cfc6f1
--- /dev/null
+++ b/main/wasi-libc/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Alex Yam <alex@alexyam.com>
+# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
+pkgname=wasi-libc
+pkgver=0.20231215
+_gitrev=c5264e2bbe532994d06b039005f2af91bedcc1a6
+pkgrel=0
+pkgdesc="WASI libc implementation for WebAssembly"
+url="https://github.com/WebAssembly/wasi-libc"
+arch="all"
+options="!check" # no testsuite
+# https://github.com/WebAssembly/wasi-libc/blob/main/LICENSE
+#   wasi-libc			- Apache License v2.0 WITH LLVM Exceptions AND
+#				  Apache License v2.0 AND MIT
+#   dlmalloc/			- CC0
+#   libc-bottom-half/cloudlibc/	- BSD-2-Clause
+#   libc-top-half/musl/		- MIT
+license="Apache-2.0 WITH LLVM-exception AND Apache-2.0 AND MIT AND CC0-1.0 AND BSD-2-Clause"
+makedepends="clang llvm"
+source="wasi-libc-$_gitrev.tar.gz::https://github.com/WebAssembly/wasi-libc/archive/$_gitrev.tar.gz
+	no-double-build.patch
+	"
+builddir="$srcdir"/$pkgname-$_gitrev
+
+build() {
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=1773200#c4
+	make CC=clang BULK_MEMORY_SOURCES=
+	make CC=clang THREAD_MODEL=posix
+}
+
+package() {
+	make INSTALL_DIR="$pkgdir"/usr/share/wasi-sysroot install
+}
+
+sha512sums="
+dfd4ed2af4c00a47f8c475d841c8df574e2dce3a903ce461cc2b04c57b8cabd3ac0fc6ebb771a9b39c2c33c14b87d3edd3a0603ea02c9e759baef2399e42370a  wasi-libc-c5264e2bbe532994d06b039005f2af91bedcc1a6.tar.gz
+8241854f3331e4e22756f4414afcd6cd766d48e2a1a38ad6c95903f84b6f6b718b1ed0eae2ef0fe78f2ab5c87352ffb44f1eca3ea03983173b80f72af5948651  no-double-build.patch
+"
diff --git a/main/wasi-libc/no-double-build.patch b/main/wasi-libc/no-double-build.patch
new file mode 100644
index 00000000000..013d3322d13
--- /dev/null
+++ b/main/wasi-libc/no-double-build.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -547,7 +547,7 @@
+ 	# This ignores whitespace because on Windows the output has CRLF line endings.
+ 	diff -wur "$(CURDIR)/expected/$(MULTIARCH_TRIPLE)" "$(SYSROOT_SHARE)"
+ 
+-install: finish
++install:
+ 	mkdir -p "$(INSTALL_DIR)"
+ 	cp -r "$(SYSROOT)/lib" "$(SYSROOT)/share" "$(SYSROOT)/include" "$(INSTALL_DIR)"
+ 
diff --git a/main/wasi-libcxx/APKBUILD b/main/wasi-libcxx/APKBUILD
new file mode 100644
index 00000000000..0eee6f6b6c8
--- /dev/null
+++ b/main/wasi-libcxx/APKBUILD
@@ -0,0 +1,136 @@
+# Contributor: Alex Yam <alex@alexyam.com>
+# Maintainer:
+pkgname=wasi-libcxx
+# match llvm version
+pkgver=17.0.6
+_llvmver="${pkgver%%.*}"
+_wasi_sdk_ver=wasi-sdk-20
+pkgrel=1
+pkgdesc="WASI LLVM C++ standard library"
+url="https://libcxx.llvm.org/"
+arch="all"
+license="Apache-2.0 WITH LLVM-exception"
+makedepends="
+	clang
+	cmake
+	libxml2-dev
+	llvm$_llvmver-dev
+	llvm$_llvmver-static
+	python3-dev
+	samurai
+	wasi-libc
+	zlib-dev
+	"
+source="
+	https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-project-$pkgver.src.tar.xz
+	wasi-sdk-$_wasi_sdk_ver.tar.gz::https://github.com/WebAssembly/wasi-sdk/archive/refs/tags/$_wasi_sdk_ver.tar.gz
+	"
+builddir="$srcdir"/llvm-project-$pkgver.src
+# TODO: check, needs to somehow pass wasi sysroot include to lit..
+options="!check"
+
+prepare() {
+	default_prepare
+
+	mv "$srcdir"/wasi-sdk-$_wasi_sdk_ver/wasi-sdk.cmake "$builddir"
+	mv "$srcdir"/wasi-sdk-$_wasi_sdk_ver/cmake/Platform cmake
+}
+
+build() {
+	export CFLAGS="$CFLAGS -fno-exceptions --sysroot=/usr/share/wasi-sysroot"
+	export CXXFLAGS="$CXXFLAGS -fno-exceptions --sysroot=/usr/share/wasi-sysroot"
+
+	cmake -B build -G Ninja -S runtimes -Wno-dev \
+		-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_MODULE_PATH="$builddir"/cmake \
+		-DCMAKE_TOOLCHAIN_FILE="$builddir"/wasi-sdk.cmake \
+		-DCMAKE_C_COMPILER_WORKS=ON \
+		-DCMAKE_CXX_COMPILER_WORKS=ON \
+		-DCMAKE_STAGING_PREFIX=/usr/share/wasi-sysroot \
+		-DCXX_SUPPORTS_CXX11=ON \
+		-DLIBCXX_ABI_VERSION=2 \
+		-DLIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY=OFF \
+		-DLIBCXX_CXX_ABI=libcxxabi \
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=libcxxabi/include \
+		-DLIBCXX_ENABLE_EXCEPTIONS=OFF \
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF \
+		-DLIBCXX_ENABLE_FILESYSTEM=OFF \
+		-DLIBCXX_ENABLE_SHARED=OFF \
+		-DLIBCXX_ENABLE_THREADS=OFF \
+		-DLIBCXX_HAS_EXTERNAL_THREAD_API=OFF \
+		-DLIBCXX_HAS_MUSL_LIBC=ON \
+		-DLIBCXX_HAS_PTHREAD_API=OFF \
+		-DLIBCXX_HAS_WIN32_THREAD_API=OFF \
+		-DLIBCXX_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DLIBCXX_LIBDIR_SUFFIX=/wasm32-wasi \
+		-DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY=OFF \
+		-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF \
+		-DLIBCXXABI_ENABLE_PIC=OFF \
+		-DLIBCXXABI_ENABLE_SHARED=OFF \
+		-DLIBCXXABI_ENABLE_THREADS=OFF \
+		-DLIBCXXABI_HAS_EXTERNAL_THREAD_API=OFF \
+		-DLIBCXXABI_HAS_PTHREAD_API=OFF \
+		-DLIBCXXABI_HAS_WIN32_THREAD_API=OFF \
+		-DLIBCXXABI_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DLIBCXXABI_LIBCXX_INCLUDES="$builddir"/build-libcxx/include/c++/v1 \
+		-DLIBCXXABI_LIBCXX_PATH=libcxx \
+		-DLIBCXXABI_LIBDIR_SUFFIX=/wasm32-wasi \
+		-DLIBCXXABI_SILENT_TERMINATE:BOOL=ON \
+		-DUNIX=ON \
+		-DWASI_SDK_PREFIX=/usr
+	cmake --build build
+
+	cmake -B build-threads -G Ninja -S runtimes -Wno-dev \
+		-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		-DCMAKE_MODULE_PATH="$builddir"/cmake \
+		-DCMAKE_TOOLCHAIN_FILE="$builddir"/wasi-sdk.cmake \
+		-DCMAKE_C_COMPILER_WORKS=ON \
+		-DCMAKE_CXX_COMPILER_WORKS=ON \
+		-DCMAKE_C_FLAGS="$CFLAGS -pthread" \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS -pthread" \
+		-DCMAKE_STAGING_PREFIX=/usr/share/wasi-sysroot \
+		-DCXX_SUPPORTS_CXX11=ON \
+		-DLIBCXX_ABI_VERSION=2 \
+		-DLIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY=OFF \
+		-DLIBCXX_CXX_ABI=libcxxabi \
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=libcxxabi/include \
+		-DLIBCXX_ENABLE_EXCEPTIONS=OFF \
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF \
+		-DLIBCXX_ENABLE_FILESYSTEM=OFF \
+		-DLIBCXX_ENABLE_SHARED=OFF \
+		-DLIBCXX_ENABLE_THREADS=ON \
+		-DLIBCXX_HAS_EXTERNAL_THREAD_API=OFF \
+		-DLIBCXX_HAS_MUSL_LIBC=ON \
+		-DLIBCXX_HAS_PTHREAD_API=ON \
+		-DLIBCXX_HAS_WIN32_THREAD_API=OFF \
+		-DLIBCXX_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DLIBCXX_LIBDIR_SUFFIX=/wasm32-wasi-threads \
+		-DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY=OFF \
+		-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF \
+		-DLIBCXXABI_ENABLE_PIC=OFF \
+		-DLIBCXXABI_ENABLE_SHARED=OFF \
+		-DLIBCXXABI_ENABLE_THREADS=ON \
+		-DLIBCXXABI_HAS_EXTERNAL_THREAD_API=OFF \
+		-DLIBCXXABI_HAS_PTHREAD_API=ON \
+		-DLIBCXXABI_HAS_WIN32_THREAD_API=OFF \
+		-DLIBCXXABI_INCLUDE_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DLIBCXXABI_LIBCXX_INCLUDES="$builddir"/build-libcxx/include/c++/v1 \
+		-DLIBCXXABI_LIBCXX_PATH=libcxx \
+		-DLIBCXXABI_LIBDIR_SUFFIX=/wasm32-wasi-threads \
+		-DLIBCXXABI_SILENT_TERMINATE:BOOL=ON \
+		-DUNIX=ON \
+		-DWASI_SDK_PREFIX=/usr
+	cmake --build build-threads
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+	DESTDIR="$pkgdir" cmake --install build-threads
+}
+
+sha512sums="
+6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30  llvm-project-17.0.6.src.tar.xz
+130c2d7e709b8845e32d8d0f4b5361a570a5a11cbeefc65d5b8e42d571a9f7ed9279def336ff71eca368a4900ba8fa736cdf803e7820bf1459801e7da0d71c45  wasi-sdk-wasi-sdk-20.tar.gz
+"
diff --git a/main/wasi-sdk/APKBUILD b/main/wasi-sdk/APKBUILD
new file mode 100644
index 00000000000..010d5cd9ea4
--- /dev/null
+++ b/main/wasi-sdk/APKBUILD
@@ -0,0 +1,22 @@
+# Contributor: Alex Yam <alex@alexyam.com>
+# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
+pkgname=wasi-sdk
+pkgver=21
+pkgrel=0
+_llvmver=17
+pkgdesc="WASI-enabled WebAssembly C/C++ toolchain"
+url="https://github.com/WebAssembly/wasi-sdk"
+arch="noarch"
+depends="wasi-libc wasi-libcxx wasi-compiler-rt"
+options="!check" # no testsuite
+license="Apache-2.0"
+
+package() {
+	mkdir -p "$pkgdir"/etc/clang$_llvmver
+	cat > "$pkgdir"/etc/clang$_llvmver/wasm32-unknown-wasi.cfg <<-EOF
+	--sysroot /usr/share/wasi-sysroot
+	EOF
+
+	ln -svf wasm32-unknown-wasi.cfg \
+		"$pkgdir"/etc/clang$_llvmver/wasm32-unknown-wasi-threads.cfg
+}
diff --git a/main/wayland-protocols/APKBUILD b/main/wayland-protocols/APKBUILD
index c7a31ca5598..fe6141153b8 100644
--- a/main/wayland-protocols/APKBUILD
+++ b/main/wayland-protocols/APKBUILD
@@ -1,34 +1,37 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: Valery Kartel <valery.kartel@gmail.com>
+# Contributor: Valery Kartel <valery.kartel@gmail.com>
+# Maintainer: Peter Shkenev <santurysim@gmail.com>
 pkgname=wayland-protocols
-pkgver=1.20
+pkgver=1.35
 pkgrel=0
 pkgdesc="Protocols and protocol extensions complementing the Wayland core protocol"
 url="https://wayland.freedesktop.org"
 arch="noarch"
 license="MIT"
-provides="$pkgname-dev"
-makedepends="wayland-dev"
-source="https://wayland.freedesktop.org/releases/wayland-protocols-$pkgver.tar.xz"
+provides="$pkgname-dev=$pkgver-r$pkgrel"
+makedepends="meson wayland-dev"
+source="https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$pkgver/downloads/wayland-protocols-$pkgver.tar.xz"
+
+case "$CARCH" in
+ppc64le)
+	# xdg_toplevel_interface: symbol not found in a test
+	options="$options !check"
+	;;
+esac
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--with-noarch-pkgconfigdir=/usr/lib/pkgconfig
-	make
+	abuild-meson . output
+	meson compile -C output
 }
 
 check() {
-	make -C "$builddir" check
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	make -C "$builddir" DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-sha512sums="d13f65d03add2c39cc32bf6bda0e981e9f52504bf8505fceea045c8baeb73bea64fa4edb99cb837677fbab1b5b3023054adff36fac127e819690f366b81c4977  wayland-protocols-1.20.tar.xz"
+sha512sums="
+b4b915e145955f9c844d7ce4564ad13a854a4e7d4355913ef4cae7f09ab3e52ee69dceb6c76c9b7f82f1ab5c01071f0e5b00ce75cc7ab58274201eb4a4639710  wayland-protocols-1.35.tar.xz
+"
diff --git a/main/wayland/APKBUILD b/main/wayland/APKBUILD
index e078b69d405..9974f54e752 100644
--- a/main/wayland/APKBUILD
+++ b/main/wayland/APKBUILD
@@ -1,61 +1,73 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
-# Maintainer: Valery Kartel <valery.kartel@gmail.com>
+# Contributor: Valery Kartel <valery.kartel@gmail.com>
+# Maintainer: Peter Shkenev <santurysim@gmail.com>
 pkgname=wayland
-pkgver=1.18.0
-pkgrel=1
+pkgver=1.22.0
+pkgrel=4
 pkgdesc="A computer display server protocol"
 url="https://wayland.freedesktop.org"
 arch="all"
 license="MIT"
-depends="$pkgname-libs-client $pkgname-libs-cursor $pkgname-libs-egl $pkgname-libs-server"
-depends_dev="libffi-dev expat-dev"
-makedepends="$depends_dev doxygen xmlto graphviz grep libxml2-dev bash"
-subpackages="$pkgname-dev $pkgname-libs-client:_libs $pkgname-libs-egl:_libs
-	$pkgname-libs-cursor:_libs $pkgname-libs-server:_libs"
-source="https://wayland.freedesktop.org/releases/wayland-$pkgver.tar.xz
-	tests-ignore-debugger.patch
+depends_dev="
+	expat-dev
+	libffi-dev
 	"
+makedepends="
+	$depends_dev
+	libxml2-dev
+	meson
+	"
+subpackages="
+	$pkgname-dbg
+	$pkgname-dev
+	$pkgname-libs-client:_libs
+	$pkgname-libs-egl:_libs
+	$pkgname-libs-cursor:_libs
+	$pkgname-libs-server:_libs
+	"
+source="https://gitlab.freedesktop.org/wayland/wayland/-/releases/$pkgver/downloads/wayland-$pkgver.tar.xz"
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--disable-documentation \
-		--disable-static
-	make
+	abuild-meson \
+		-Db_lto=true \
+		-Ddocumentation=false \
+		. output
+
+	meson compile -C output
 }
 
 check() {
-	make check WAYLAND_TEST_IGNORE_DEBUGGER=1
+	XDG_RUNTIME_DIR="$(mktemp -d)" \
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	depends="
+		$pkgname-libs-client=$pkgver-r$pkgrel
+		$pkgname-libs-cursor=$pkgver-r$pkgrel
+		$pkgname-libs-egl=$pkgver-r$pkgrel
+		$pkgname-libs-server=$pkgver-r$pkgrel
+		"
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
 dev() {
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/bin "$pkgdir"/usr/share \
-		"$subpkgdir"/usr
+	amove usr/share
+	amove usr/bin
 	default_dev
 }
 
 _libs() {
 	depends=
-	local name=${subpkgname#$pkgname-libs-}
+	local name=${subpkgname#"$pkgname"-libs-}
 	pkgdesc="$pkgdesc ($name library)"
 	case "$name" in
 		egl) replaces="mesa-libwayland-egl";;
 	esac
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*-$name.so.* "$subpkgdir"/usr/lib
+	amove usr/lib/*-$name.so.*
 }
 
-sha512sums="e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc  wayland-1.18.0.tar.xz
-0f65a55265e9134ab08cabf67f9d1919c85c4cb6b69129e78bc6c50057cafcaf143007716a0fa73b2eb43d6b605944c320a12a36dbb5f15fcd2f5e770248c480  tests-ignore-debugger.patch"
+sha512sums="
+fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12  wayland-1.22.0.tar.xz
+"
diff --git a/main/wayland/tests-ignore-debugger.patch b/main/wayland/tests-ignore-debugger.patch
deleted file mode 100644
index a0cf97be467..00000000000
--- a/main/wayland/tests-ignore-debugger.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/tests/test-runner.c b/tests/test-runner.c
-index 82a0a7b..8c7e90d 100644
---- a/tests/test-runner.c
-+++ b/tests/test-runner.c
-@@ -287,6 +287,9 @@ is_debugger_attached(void)
- 	pid_t pid;
- 	int pipefd[2];
- 
-+	if (getenv("WAYLAND_TEST_IGNORE_DEBUGGER"))
-+		return 0;
-+
- 	if (pipe(pipefd) == -1) {
- 		perror("pipe");
- 		return 0;
diff --git a/main/websocket++/APKBUILD b/main/websocket++/APKBUILD
deleted file mode 100644
index cdfc37dd26e..00000000000
--- a/main/websocket++/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: prspkt <prspkt@protonmail.com>
-pkgname=websocket++
-pkgver=0.8.1
-pkgrel=1
-pkgdesc="C++/Boost Asio based websocket client/server library"
-url="https://github.com/zaphoyd/websocketpp"
-arch="all"
-license="BSD-3-Clause"
-depends=""
-depends_dev=""
-makedepends="$depends_dev cmake"
-install=""
-subpackages=""
-source="$pkgname-$pkgver.tar.gz::https://github.com/zaphoyd/websocketpp/archive/$pkgver.tar.gz"
-
-builddir="$srcdir"/websocketpp-$pkgver
-
-build() {
-	cd "$builddir"
-	if [ "$CBUILD" != "$CHOST" ]; then
-		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
-	fi
-	cmake \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c  websocket++-0.8.1.tar.gz"
diff --git a/main/wget/APKBUILD b/main/wget/APKBUILD
index 36dc613d920..df5de88eaec 100644
--- a/main/wget/APKBUILD
+++ b/main/wget/APKBUILD
@@ -1,15 +1,15 @@
 # Contributor: Sandro Jäckel <sandro.jaeckel@posteo.de>
 # Contributor: Sergei Lukin <sergej.lukin@gmail.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=wget
-pkgver=1.20.3
-pkgrel=1
-pkgdesc="A network utility to retrieve files from the Web"
+pkgver=1.24.5
+pkgrel=0
+pkgdesc="Network utility to retrieve files from the Web"
 url="https://www.gnu.org/software/wget/wget.html"
 arch="all"
-license="GPL-3.0-or-later"
-makedepends="libidn2-dev openssl-dev perl"
+license="GPL-3.0-or-later WITH OpenSSL-Exception"
+makedepends="libidn2-dev openssl-dev>3 perl zlib-dev pcre2-dev"
 checkdepends="perl-http-daemon"
 subpackages="$pkgname-doc"
 source="https://ftp.gnu.org/gnu/wget/wget-$pkgver.tar.gz"
@@ -27,6 +27,7 @@ source="https://ftp.gnu.org/gnu/wget/wget-$pkgver.tar.gz"
 #     - CVE-2017-13090
 
 build() {
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -52,4 +53,6 @@ package() {
 	rm -rf "$pkgdir"/usr/lib
 }
 
-sha512sums="e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c  wget-1.20.3.tar.gz"
+sha512sums="
+572aa54717e51a9eb9959e127c7afb696645088f32ff7df2cfe9d243957e34ee235e98988fa94649df023d2e3d62b6973e8c9f2eb92beba820dd96d5de2a950d  wget-1.24.5.tar.gz
+"
diff --git a/main/which/APKBUILD b/main/which/APKBUILD
index 29f04ad42fe..fdcc2022850 100644
--- a/main/which/APKBUILD
+++ b/main/which/APKBUILD
@@ -2,21 +2,15 @@
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=which
 pkgver=2.21
-pkgrel=1
+pkgrel=5
 pkgdesc="A utility to show the full path of commands"
-url="http://savannah.gnu.org/projects/which"
+url="https://savannah.gnu.org/projects/which"
 arch="all"
-license="GPL-3.0"
-depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
+license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
-source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
+source="https://ftp.gnu.org/gnu/which/which-$pkgver.tar.gz"
 
-builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,13 +19,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61  which-2.21.tar.gz"
+sha512sums="
+d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61  which-2.21.tar.gz
+"
diff --git a/main/wipe/APKBUILD b/main/wipe/APKBUILD
index c3c633ae207..5c6fc73736e 100644
--- a/main/wipe/APKBUILD
+++ b/main/wipe/APKBUILD
@@ -2,41 +2,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wipe
 pkgver=2.3.1
-pkgrel=0
+pkgrel=4
 pkgdesc="Secure file wiping utility"
-url="http://wipe.sourceforge.net/"
+url="https://wipe.sourceforge.net/"
 arch="all"
-license="GPL-2.0"
-depends=""
-depends_dev=""
-makedepends="$depends_dev linux-headers"
-install=""
+license="GPL-2.0-only"
+makedepends="linux-headers"
 subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+source="https://downloads.sourceforge.net/wipe/wipe-$pkgver.tar.bz2
 	stdint.patch
 	"
+options="!check"
 
-builddir="$srcdir"/wipe-$pkgver
 prepare() {
 	update_config_sub
 	default_prepare
 }
 
 build() {
-	cd "$builddir"
 	CPPFLAGS= ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--mandir=/usr/share/man \
-		|| return 1
-	make || return 1
+		--mandir=/usr/share/man
+	make
 }
 
 package() {
-	cd "$builddir"
 	install -d "$pkgdir"/usr/bin
-	make prefix="$pkgdir"/usr mandir="$pkgdir"/usr/share/man install || return 1
+	make prefix="$pkgdir"/usr mandir="$pkgdir"/usr/share/man install
 }
 
 sha512sums="63870e68fa5dbf90abb686052f8dcc216ccb93b0c4f5cc10d60ccf43f3606ba91b46dc1e3d8b34d201f7ea657f70b45a61d5d04facf5b2a3e47d2286c46e7110  wipe-2.3.1.tar.bz2
diff --git a/main/wireguard-tools/APKBUILD b/main/wireguard-tools/APKBUILD
new file mode 100644
index 00000000000..3b5ee7703ca
--- /dev/null
+++ b/main/wireguard-tools/APKBUILD
@@ -0,0 +1,56 @@
+# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
+# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
+pkgname=wireguard-tools
+pkgver=1.0.20210914
+pkgrel=3
+pkgdesc="Next generation secure network tunnel: userspace tools"
+arch="all"
+url="https://www.wireguard.com"
+# SPDX identifier headers tells us 'GPL-2.0' but considering it
+# is a kernel project i think it is safe to assume it is GPL-2.0-only just
+# like the kernel.
+license="GPL-2.0-only"
+_wg_quick_deps="iproute2 bash openresolv"
+makedepends="libmnl-dev $_wg_quick_deps"
+depends="$pkgname-wg $pkgname-wg-quick"
+subpackages="
+	$pkgname-doc
+	$pkgname-bash-completion
+	$pkgname-wg:_split
+	$pkgname-wg-quick:_split:noarch
+	"
+options="!check"
+source="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-$pkgver.tar.xz"
+
+build() {
+	make -C src
+}
+
+package() {
+	mkdir -p "$pkgdir/usr/share/doc/$pkgname"
+
+	make -C src \
+		DESTDIR="$pkgdir" \
+		WITH_BASHCOMPLETION=yes \
+		WITH_WGQUICK=yes \
+		WITH_SYSTEMDUNITS=no \
+		install
+
+	find "$builddir"/contrib -name '.gitignore' -delete
+	cp -rf "$builddir"/contrib "$pkgdir/usr/share/doc/$pkgname/"
+}
+
+_split() {
+	local cmd=${subpkgname/$pkgname-}
+	pkgdesc="$pkgdesc ($cmd)"
+	case $cmd in
+		wg-quick) depends="$pkgname-wg=$pkgver-r$pkgrel $_wg_quick_deps" ;;
+		*) depends= ;;
+	esac
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/$cmd "$subpkgdir"/usr/bin/
+}
+
+sha512sums="
+6727ea65551dbb064457449b93a943bd6534ca93bc7fa5704c2f6826266c98688ee9ea28731fda57a5245d5f63c05f3899fcca54e40c0b6251b7c4796e957445  wireguard-tools-1.0.20210914.tar.xz
+"
diff --git a/main/wireless-regdb/APKBUILD b/main/wireless-regdb/APKBUILD
index 7398c981e50..64f30c5216e 100644
--- a/main/wireless-regdb/APKBUILD
+++ b/main/wireless-regdb/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Stefan Wagner <stw@bit-strickerei.de>
 # Maintainer: Stefan Wagner <stw@bit-strickerei.de>
 pkgname=wireless-regdb
-pkgver=2019.06.03
+pkgver=2024.01.23
 pkgrel=0
 pkgdesc="Central Regulatory Domain Database"
 url="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
@@ -15,7 +15,10 @@ package() {
 	install -D -m644 "$builddir"/regulatory.bin "$pkgdir"/usr/lib/crda/regulatory.bin
 	install -D -m644 "$builddir"/regulatory.bin.5 "$pkgdir"/usr/share/man/man5/regulatory.bin.5
 	install -D -m644 "$builddir"/regulatory.db "$pkgdir"/lib/firmware/regulatory.db
+	install -D -m644 "$builddir"/regulatory.db.5 "$pkgdir"/usr/share/man/man5/regulatory.bin.5
 	install -D -m644 "$builddir"/regulatory.db.p7s "$pkgdir"/lib/firmware/regulatory.db.p7s
 }
 
-sha512sums="73209ca28c59d6760349ffb713f550300e80db1592bae52b6d252ac9401fa2bb2ace7e6c30cf55df7541da9cef4c8587f3790f7aa34529552468e4b63a3d8fdb  wireless-regdb-2019.06.03.tar.xz"
+sha512sums="
+09cf2308e459bbc5755cf648aa9afcfac7232391f189403000091eef3ae4265c99c0df3364160ef48a2efa3ce6443099ac735c1d82e03f0f24f7017872afbdba  wireless-regdb-2024.01.23.tar.xz
+"
diff --git a/main/wireless-tools/APKBUILD b/main/wireless-tools/APKBUILD
index ab1e40cd0f9..ef8a08ab76b 100644
--- a/main/wireless-tools/APKBUILD
+++ b/main/wireless-tools/APKBUILD
@@ -2,30 +2,32 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=wireless-tools
 pkgver=30_pre9
-pkgrel=1
+pkgrel=4
 pkgdesc="Open Source wireless tools"
-url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
+url="https://hewlettpackard.github.io/wireless-tools/Tools.html"
 arch="all"
 license="GPL-2.0-only"
 makedepends="linux-headers"
 options="!check"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${pkgver/_/.}.tar.gz
+subpackages="$pkgname-libs $pkgname-dev $pkgname-doc"
+source="https://hewlettpackard.github.io/wireless-tools/wireless_tools.${pkgver/_/.}.tar.gz
+	flags.patch
 	"
-
 builddir="$srcdir"/wireless_tools.30
 
 build() {
-	cd "$builddir"
+	CFLAGS="$CFLAGS -flto=auto" \
 	make
 }
 
 package() {
-	cd "$builddir"
 	make INSTALL_DIR="$pkgdir"/usr/sbin \
 		INSTALL_LIB="$pkgdir"/usr/lib \
 		INSTALL_INC="$pkgdir"/usr/include \
 		INSTALL_MAN="$pkgdir"/usr/share/man install
 }
 
-sha512sums="0561923bca075af4754d21e1be303cbd1ce3558cb6481c9c12bc7d330a353acf8ad81a822488570e859480287999c3bb2a698c993556a92f0699743e0a527ff1  wireless_tools.30.pre9.tar.gz"
+sha512sums="
+0561923bca075af4754d21e1be303cbd1ce3558cb6481c9c12bc7d330a353acf8ad81a822488570e859480287999c3bb2a698c993556a92f0699743e0a527ff1  wireless_tools.30.pre9.tar.gz
+b5a06be4e4aca5319433e6f559a1bf9441c6d1d365760b3121495fd49b6ee8248c4a4a1c7cabd24d1974281b999dba916fef6e8241a2a7101e5ff7981325ab99  flags.patch
+"
diff --git a/main/wireless-tools/flags.patch b/main/wireless-tools/flags.patch
new file mode 100644
index 00000000000..b9039f034a0
--- /dev/null
+++ b/main/wireless-tools/flags.patch
@@ -0,0 +1,54 @@
+pass ldflags, read cflags, build shared, respect toolchain
+diff --git a/Makefile b/Makefile
+index 0078324..d722946 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,17 +9,17 @@ ifndef PREFIX
+ endif
+ 
+ ## Compiler to use (modify this for cross compile).
+-CC = gcc
++CC ?= gcc
+ ## Other tools you need to modify for cross compile (static lib only).
+-AR = ar
+-RANLIB = ranlib
++AR ?= ar
++RANLIB ?= ranlib
+ 
+ ## Uncomment this to build tools using static version of the library.
+ ## Mostly useful for embedded platforms without ldd, or to create
+ ## a local version (non-root).
+ ## Standard distros should comment that option to save space and to
+ ## build libiw.so used by third parties...
+-BUILD_STATIC = y
++#BUILD_STATIC = y
+ 
+ ## Uncomment this to build without using libm (less efficient).
+ ## This is mostly useful for embedded platforms without maths.
+@@ -104,7 +104,7 @@ ifdef BUILD_WE_ESSENTIAL
+ endif
+ 
+ # Other flags
+-CFLAGS=-Os -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow \
++CFLAGS+=-W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow \
+ 	-Wpointer-arith -Wcast-qual -Winline -I.
+ #CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I.
+ DEPFLAGS=-MMD
+@@ -119,7 +119,7 @@ all:: $(IWLIB) $(PROGS)
+ %.o: %.c wireless.h
+ 	$(CC) $(XCFLAGS) -c $<
+ %.so: %.c wireless.h
+-	$(CC) $(XCFLAGS) $(PICFLAG) -c -o $@ $<
++	$(CC) $(XCFLAGS) $(PICFLAG) $(LDFLAGS) -c -o $@ $<
+ 
+ iwconfig: iwconfig.o $(IWLIB)
+ 
+@@ -147,7 +147,7 @@ wireless.h:
+ 
+ # Compilation of the dynamic library
+ $(DYNAMIC): $(OBJS:.o=.so)
+-	$(CC) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $(LIBS) -lc $^
++	$(CC) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $(LIBS) $(LDFLAGS) -lc $^
+ 
+ # Compilation of the static library
+ $(STATIC): $(OBJS:.o=.so)
diff --git a/main/wpa_supplicant/0001-nl80211-add-extra-ies-only-if-allowed-by-driver.patch b/main/wpa_supplicant/0001-nl80211-add-extra-ies-only-if-allowed-by-driver.patch
new file mode 100644
index 00000000000..5a395d57b35
--- /dev/null
+++ b/main/wpa_supplicant/0001-nl80211-add-extra-ies-only-if-allowed-by-driver.patch
@@ -0,0 +1,69 @@
+From: David Bauer <mail@david-bauer.net>
+Date: Sun, 30 Jan 2022 20:22:00 +0100
+Subject: nl80211: add extra-ies only if allowed by driver
+
+Upgrading wpa_supplicant from 2.9 to 2.10 breaks broadcom-wl
+based adapters. The reason for it is hostapd tries to install additional
+IEs for scanning while the driver does not support this.
+
+The kernel indicates the maximum number of bytes for additional scan IEs
+using the NL80211_ATTR_MAX_SCAN_IE_LEN attribute. Save this value and
+only add additional scan IEs in case the driver can accommodate these
+additional IEs.
+
+Reported-by: Étienne Morice <neon.emorice@mail.com>
+Tested-by: Étienne Morice <neon.emorice@mail.com>
+Signed-off-by: David Bauer <mail@david-bauer.net>
+
+Bug: http://lists.infradead.org/pipermail/hostap/2022-January/040178.html
+Bug-ArchLinux: https://bugs.archlinux.org/task/73495
+Bug-Debian: https://bugs.debian.org/1004524
+Origin: http://lists.infradead.org/pipermail/hostap/2022-January/040185.html
+---
+ src/drivers/driver.h              | 3 +++
+ src/drivers/driver_nl80211_capa.c | 4 ++++
+ src/drivers/driver_nl80211_scan.c | 2 +-
+ 3 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/drivers/driver.h b/src/drivers/driver.h
+index d3312a3..b5b6264 100644
+--- a/src/drivers/driver.h
++++ b/src/drivers/driver.h
+@@ -2052,6 +2052,9 @@ struct wpa_driver_capa {
+ 	/** Maximum number of iterations in a single scan plan */
+ 	u32 max_sched_scan_plan_iterations;
+ 
++	/** Maximum number of extra IE bytes for scans */
++	u16 max_scan_ie_len;
++
+ 	/** Whether sched_scan (offloaded scanning) is supported */
+ 	int sched_scan_supported;
+ 
+diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c
+index 83868b7..b33b6ba 100644
+--- a/src/drivers/driver_nl80211_capa.c
++++ b/src/drivers/driver_nl80211_capa.c
+@@ -885,6 +885,10 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
+ 			nla_get_u32(tb[NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS]);
+ 	}
+ 
++	if (tb[NL80211_ATTR_MAX_SCAN_IE_LEN])
++		capa->max_scan_ie_len =
++			nla_get_u16(tb[NL80211_ATTR_MAX_SCAN_IE_LEN]);
++
+ 	if (tb[NL80211_ATTR_MAX_MATCH_SETS])
+ 		capa->max_match_sets =
+ 			nla_get_u8(tb[NL80211_ATTR_MAX_MATCH_SETS]);
+diff --git a/src/drivers/driver_nl80211_scan.c b/src/drivers/driver_nl80211_scan.c
+index 1316084..b0f0951 100644
+--- a/src/drivers/driver_nl80211_scan.c
++++ b/src/drivers/driver_nl80211_scan.c
+@@ -207,7 +207,7 @@ nl80211_scan_common(struct i802_bss *bss, u8 cmd,
+ 		wpa_printf(MSG_DEBUG, "nl80211: Passive scan requested");
+ 	}
+ 
+-	if (params->extra_ies) {
++	if (params->extra_ies && drv->capa.max_scan_ie_len >= params->extra_ies_len) {
+ 		wpa_hexdump(MSG_MSGDUMP, "nl80211: Scan extra IEs",
+ 			    params->extra_ies, params->extra_ies_len);
+ 		if (nla_put(msg, NL80211_ATTR_IE, params->extra_ies_len,
diff --git a/main/wpa_supplicant/0002-AP-guard-FT-SAE-code-with-CONFIG_IEEE80211R_AP.patch b/main/wpa_supplicant/0002-AP-guard-FT-SAE-code-with-CONFIG_IEEE80211R_AP.patch
new file mode 100644
index 00000000000..6509bcd9a9f
--- /dev/null
+++ b/main/wpa_supplicant/0002-AP-guard-FT-SAE-code-with-CONFIG_IEEE80211R_AP.patch
@@ -0,0 +1,56 @@
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Mon, 4 Apr 2022 09:13:12 +0200
+Subject: AP: guard FT-SAE code with CONFIG_IEEE80211R_AP
+
+wpa_supplicant doesn't support FT in AP mode, but it still negotiates
+FT-SAE. This can lead to an authentication failure when the AP is
+started with key_mgmt="SAE FT-SAE" and the STA supports both.
+
+Ensure that FT-SAE is not negotiated when CONFIG_IEEE80211R_AP is not
+defined.
+
+Signed-off-by: Beniamino Galvani <bgalvani@redhat.com>
+---
+ src/ap/wpa_auth_ie.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/ap/wpa_auth_ie.c b/src/ap/wpa_auth_ie.c
+index 524922e..d63cbeb 100644
+--- a/src/ap/wpa_auth_ie.c
++++ b/src/ap/wpa_auth_ie.c
+@@ -228,11 +228,13 @@ int wpa_write_rsn_ie(struct wpa_auth_config *conf, u8 *buf, size_t len,
+ 		pos += RSN_SELECTOR_LEN;
+ 		num_suites++;
+ 	}
++#ifdef CONFIG_IEEE80211R_AP
+ 	if (conf->wpa_key_mgmt & WPA_KEY_MGMT_FT_SAE) {
+ 		RSN_SELECTOR_PUT(pos, RSN_AUTH_KEY_MGMT_FT_SAE);
+ 		pos += RSN_SELECTOR_LEN;
+ 		num_suites++;
+ 	}
++#endif /* CONFIG_IEEE80211R_AP */
+ #endif /* CONFIG_SAE */
+ 	if (conf->wpa_key_mgmt & WPA_KEY_MGMT_IEEE8021X_SUITE_B) {
+ 		RSN_SELECTOR_PUT(pos, RSN_AUTH_KEY_MGMT_802_1X_SUITE_B);
+@@ -670,8 +672,10 @@ wpa_validate_wpa_ie(struct wpa_authenticator *wpa_auth,
+ #ifdef CONFIG_SAE
+ 		else if (data.key_mgmt & WPA_KEY_MGMT_SAE)
+ 			selector = RSN_AUTH_KEY_MGMT_SAE;
++#ifdef CONFIG_IEEE80211R_AP
+ 		else if (data.key_mgmt & WPA_KEY_MGMT_FT_SAE)
+ 			selector = RSN_AUTH_KEY_MGMT_FT_SAE;
++#endif /* CONFIG_IEEE80211R_AP */
+ #endif /* CONFIG_SAE */
+ 		else if (data.key_mgmt & WPA_KEY_MGMT_IEEE8021X)
+ 			selector = RSN_AUTH_KEY_MGMT_UNSPEC_802_1X;
+@@ -778,8 +782,10 @@ wpa_validate_wpa_ie(struct wpa_authenticator *wpa_auth,
+ #ifdef CONFIG_SAE
+ 	else if (key_mgmt & WPA_KEY_MGMT_SAE)
+ 		sm->wpa_key_mgmt = WPA_KEY_MGMT_SAE;
++#ifdef CONFIG_IEEE80211R_AP
+ 	else if (key_mgmt & WPA_KEY_MGMT_FT_SAE)
+ 		sm->wpa_key_mgmt = WPA_KEY_MGMT_FT_SAE;
++#endif /* CONFIG_IEEE80211R_AP */
+ #endif /* CONFIG_SAE */
+ 	else if (key_mgmt & WPA_KEY_MGMT_IEEE8021X)
+ 		sm->wpa_key_mgmt = WPA_KEY_MGMT_IEEE8021X;
diff --git a/main/wpa_supplicant/APKBUILD b/main/wpa_supplicant/APKBUILD
index c0aa32f3836..366fa7320a3 100644
--- a/main/wpa_supplicant/APKBUILD
+++ b/main/wpa_supplicant/APKBUILD
@@ -1,32 +1,44 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wpa_supplicant
-pkgver=2.9
-pkgrel=5
-pkgdesc="A utility providing key negotiation for WPA wireless networks"
+pkgver=2.10
+pkgrel=11
+pkgdesc="utility providing key negotiation for WPA wireless networks"
 url="https://w1.fi/wpa_supplicant/"
 arch="all"
+options="!check" # has no tests
 license="BSD-3-Clause"
 subpackages="$pkgname-doc $pkgname-openrc"
-makedepends="linux-headers openssl-dev dbus-dev libnl3-dev pcsc-lite-dev"
+makedepends="linux-headers openssl-dev>3 dbus-dev libnl3-dev pcsc-lite-dev"
 source="https://w1.fi/releases/wpa_supplicant-$pkgver.tar.gz
-
 	wpa_supplicant.initd
 	wpa_supplicant.confd
 	wpa_cli.confd
 	wpa_cli.initd
 
-	eloop.patch
-	CVE-2019-16275.patch
+	CVE-2023-52160.patch
+
+	unsafe-renegotiation-1.patch
+	unsafe-renegotiation-2.patch
+
+	0001-nl80211-add-extra-ies-only-if-allowed-by-driver.patch
+	0002-AP-guard-FT-SAE-code-with-CONFIG_IEEE80211R_AP.patch
 
 	config
-	wpa_cli.sh"
+	wpa_cli.sh
+	"
 
 # secfixes:
+#   2.10-r11:
+#     - CVE-2023-52160
+#   2.9-r13:
+#     - CVE-2021-30004
+#   2.9-r12:
+#     - CVE-2021-27803
+#   2.9-r10:
+#     - CVE-2021-0326
 #   2.9-r5:
 #     - CVE-2019-16275
-#   2.8-r0:
-#     - CVE-2019-11555
 #   2.7-r3:
 #     - CVE-2019-11555
 #   2.7-r2:
@@ -35,16 +47,6 @@ source="https://w1.fi/releases/wpa_supplicant-$pkgver.tar.gz
 #     - CVE-2019-9497
 #     - CVE-2019-9498
 #     - CVE-2019-9499
-#   2.7-r0:
-#     - CVE-2017-13077
-#     - CVE-2017-13078
-#     - CVE-2017-13079
-#     - CVE-2017-13080
-#     - CVE-2017-13081
-#     - CVE-2017-13082
-#     - CVE-2017-13086
-#     - CVE-2017-13087
-#     - CVE-2017-13088
 #   2.6-r14:
 #     - CVE-2018-14526
 #   2.6-r7:
@@ -59,7 +61,6 @@ source="https://w1.fi/releases/wpa_supplicant-$pkgver.tar.gz
 #     - CVE-2017-13088
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 
 	# Copy our configuration file to the build directory
@@ -67,13 +68,10 @@ prepare() {
 }
 
 build() {
+	export CFLAGS="$CFLAGS -flto=auto"
 	cd "$builddir"/wpa_supplicant
 	make LIBDIR=/lib BINDIR=/sbin
-}
-
-check() {
-	cd "$builddir"/wpa_supplicant
-	make eapol_test
+	make LIBDIR=/lib BINDIR=/sbin eapol_test
 }
 
 package() {
@@ -93,13 +91,10 @@ package() {
 
 	# dbus
 	cd dbus
-	install -d "$pkgdir"/etc/dbus-1/system.d
-	install -m644 dbus-wpa_supplicant.conf \
-		"$pkgdir"/etc/dbus-1/system.d/wpa_supplicant.conf
-	install -d "$pkgdir"/usr/share/dbus-1/system-services
-	install fi.w1.wpa_supplicant1.service \
-		"$pkgdir"/usr/share/dbus-1/system-services
-	install -d "$pkgdir"/var/run/wpa_supplicant
+	install -Dm644 dbus-wpa_supplicant.conf \
+		"$pkgdir"/usr/share/dbus-1/system.d/wpa_supplicant.conf
+	install -Dm644 fi.w1.wpa_supplicant1.service \
+		-t "$pkgdir"/usr/share/dbus-1/system-services
 
 	# openrc runscripts
 	install -Dm755 "$srcdir"/wpa_supplicant.initd \
@@ -112,12 +107,17 @@ package() {
 		"$pkgdir"/etc/conf.d/wpa_cli
 }
 
-sha512sums="37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8  wpa_supplicant-2.9.tar.gz
-2be5eca8be4c1c7bc70f718d4bc122488ffe08360496b5af91014366f2d1ef34e2ad9724b8b8c476209b47ededdfb807e2aa6a04a200ed827d4c8cfbee9e04a7  wpa_supplicant.initd
+sha512sums="
+021c2a48f45d39c1dc6557730be5debaee071bc0ff82a271638beee6e32314e353e49d39e2f0dc8dff6e094dcc7008cfe1c32d0c7a34a1a345a12a3f1c1e11a1  wpa_supplicant-2.10.tar.gz
+8e5f0958f6086c465d7a13e793be7dedc021fae2162f0f3b29d00919c355f13e1c257744ae99ae063cca525fb8fa03abd5c117efe0ba9c6812b560ce62366846  wpa_supplicant.initd
 24bc4d46f3a8923890f233e433928c3f1204ab5f15a1c32b21dca220af89e2474026059e1040834db88cd3d8f6b61c46abb5cf18bda906e78dcd8fccd0f2a382  wpa_supplicant.confd
 c3db077fa78dd296d90d07626cb4e684f87618a77ffd51c1ae04b47be7bc0db1e9a3e0f7442acef21c081f6bb782f150cbbd3d0bf245d6ab43f19da3899b53b9  wpa_cli.confd
-b63dcf28c5a4be36b8a3c08c93967122f9001f7fc825940aa78746666d000ccda3038e0226bd5771d37b3bbc8ad617d9ac9c766003173b052bf0d974188898ca  wpa_cli.initd
-2be055dd1f7da5a3d8e79c2f2c0220ddd31df309452da18f290144d2112d6dbde0fc633bb2ad02c386a39d7785323acaf5f70e5969995a1e8303a094eb5fe232  eloop.patch
-63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38  CVE-2019-16275.patch
-6707991f9a071f2fcb09d164d31d12b1f52b91fbb5574b70b8d6f9727f72bbe42b03dd66d10fcc2126f5b7e49ac785657dec90e88b4bf54a9aa5638582f6e505  config
-212c4265afce2e72b95a32cd785612d6c3e821b47101ead154136d184ac4add01434ada6c87edbb9a98496552e76e1a4d79c6b5840e3a5cfe5e6d602fceae576  wpa_cli.sh"
+f4b9c86530a2b10cd50e6014c9bee1d143714ab9f86bf29119dcd2c86dec5239c356518a36147d6418e4eb31aa4a7df3e5c86647779d2b4626bffcfe6685f362  wpa_cli.initd
+955c219a9e4e3e89f7f880561755059ea9f1ea27f5a5ec9f6a5b7c29195b06123c8eecfba324f3695bdb8cb53c401745c3d030a97e133dd1730351dc36c92fec  CVE-2023-52160.patch
+9528735924faf876a7094de46760605e5e66e265187421a668be06dbf03d7b4db6b84cbad793fcd6bd614e3ba540f82f1f80660d75e8a6070eeb7e9abb54ed28  unsafe-renegotiation-1.patch
+a92ba3ed3f41022a8af9396d2b703ee47f78aa05c1fddb42919a7fe6a6fad71e3515c63457e97e252ae0a32c6c34d67ea6efe0278df1e141cf36e650237e5295  unsafe-renegotiation-2.patch
+fb328872087268056b035802f71df2f7af8d11699822fe68611201a07dc693c4fdb8c50dd4fd509ed6db4cca89f6003ce3303770951686a35633977f466f4fb5  0001-nl80211-add-extra-ies-only-if-allowed-by-driver.patch
+f8a5f5e18509b61ad6fb7ce78207c039fccfca6b71f494cbe9853bcb1b09025364554a45b6129a5b992f6327f72c8a97b660088d9c542f0e62a1c370a3c628a8  0002-AP-guard-FT-SAE-code-with-CONFIG_IEEE80211R_AP.patch
+9b8b1a914038e84ae2bf162d819d58aa449d249f3684bb86ecda6178956163941d4fc4e92fd14cc4ff3eec17a14e03f20c3a59e94841ed5b9811aef37fa9910e  config
+212c4265afce2e72b95a32cd785612d6c3e821b47101ead154136d184ac4add01434ada6c87edbb9a98496552e76e1a4d79c6b5840e3a5cfe5e6d602fceae576  wpa_cli.sh
+"
diff --git a/main/wpa_supplicant/CVE-2019-16275.patch b/main/wpa_supplicant/CVE-2019-16275.patch
deleted file mode 100644
index d764a9db016..00000000000
--- a/main/wpa_supplicant/CVE-2019-16275.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Thu, 29 Aug 2019 11:52:04 +0300
-Subject: [PATCH] AP: Silently ignore management frame from unexpected source
- address
-
-Do not process any received Management frames with unexpected/invalid SA
-so that we do not add any state for unexpected STA addresses or end up
-sending out frames to unexpected destination. This prevents unexpected
-sequences where an unprotected frame might end up causing the AP to send
-out a response to another device and that other device processing the
-unexpected response.
-
-In particular, this prevents some potential denial of service cases
-where the unexpected response frame from the AP might result in a
-connected station dropping its association.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/ap/drv_callbacks.c | 13 +++++++++++++
- src/ap/ieee802_11.c    | 12 ++++++++++++
- 2 files changed, 25 insertions(+)
-
-diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
-index 31587685fe3b..34ca379edc3d 100644
---- a/src/ap/drv_callbacks.c
-+++ b/src/ap/drv_callbacks.c
-@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
- 			   "hostapd_notif_assoc: Skip event with no address");
- 		return -1;
- 	}
-+
-+	if (is_multicast_ether_addr(addr) ||
-+	    is_zero_ether_addr(addr) ||
-+	    os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) {
-+		/* Do not process any frames with unexpected/invalid SA so that
-+		 * we do not add any state for unexpected STA addresses or end
-+		 * up sending out frames to unexpected destination. */
-+		wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR
-+			   " in received indication - ignore this indication silently",
-+			   __func__, MAC2STR(addr));
-+		return 0;
-+	}
-+
- 	random_add_randomness(addr, ETH_ALEN);
- 
- 	hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
-diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
-index c85a28db44b7..e7065372e158 100644
---- a/src/ap/ieee802_11.c
-+++ b/src/ap/ieee802_11.c
-@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len,
- 	fc = le_to_host16(mgmt->frame_control);
- 	stype = WLAN_FC_GET_STYPE(fc);
- 
-+	if (is_multicast_ether_addr(mgmt->sa) ||
-+	    is_zero_ether_addr(mgmt->sa) ||
-+	    os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) {
-+		/* Do not process any frames with unexpected/invalid SA so that
-+		 * we do not add any state for unexpected STA addresses or end
-+		 * up sending out frames to unexpected destination. */
-+		wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR
-+			   " in received frame - ignore this frame silently",
-+			   MAC2STR(mgmt->sa));
-+		return 0;
-+	}
-+
- 	if (stype == WLAN_FC_STYPE_BEACON) {
- 		handle_beacon(hapd, mgmt, len, fi);
- 		return 1;
--- 
-2.20.1
-
diff --git a/main/wpa_supplicant/CVE-2023-52160.patch b/main/wpa_supplicant/CVE-2023-52160.patch
new file mode 100644
index 00000000000..07263730fd4
--- /dev/null
+++ b/main/wpa_supplicant/CVE-2023-52160.patch
@@ -0,0 +1,210 @@
+From 8e6485a1bcb0baffdea9e55255a81270b768439c Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <j@w1.fi>
+Date: Sat, 8 Jul 2023 19:55:32 +0300
+Subject: PEAP client: Update Phase 2 authentication requirements
+
+The previous PEAP client behavior allowed the server to skip Phase 2
+authentication with the expectation that the server was authenticated
+during Phase 1 through TLS server certificate validation. Various PEAP
+specifications are not exactly clear on what the behavior on this front
+is supposed to be and as such, this ended up being more flexible than
+the TTLS/FAST/TEAP cases. However, this is not really ideal when
+unfortunately common misconfiguration of PEAP is used in deployed
+devices where the server trust root (ca_cert) is not configured or the
+user has an easy option for allowing this validation step to be skipped.
+
+Change the default PEAP client behavior to be to require Phase 2
+authentication to be successfully completed for cases where TLS session
+resumption is not used and the client certificate has not been
+configured. Those two exceptions are the main cases where a deployed
+authentication server might skip Phase 2 and as such, where a more
+strict default behavior could result in undesired interoperability
+issues. Requiring Phase 2 authentication will end up disabling TLS
+session resumption automatically to avoid interoperability issues.
+
+Allow Phase 2 authentication behavior to be configured with a new phase1
+configuration parameter option:
+'phase2_auth' option can be used to control Phase 2 (i.e., within TLS
+tunnel) behavior for PEAP:
+ * 0 = do not require Phase 2 authentication
+ * 1 = require Phase 2 authentication when client certificate
+   (private_key/client_cert) is no used and TLS session resumption was
+   not used (default)
+ * 2 = require Phase 2 authentication in all cases
+
+Signed-off-by: Jouni Malinen <j@w1.fi>
+---
+ src/eap_peer/eap_config.h          |  8 ++++++++
+ src/eap_peer/eap_peap.c            | 40 +++++++++++++++++++++++++++++++++++---
+ src/eap_peer/eap_tls_common.c      |  6 ++++++
+ src/eap_peer/eap_tls_common.h      |  5 +++++
+ wpa_supplicant/wpa_supplicant.conf |  7 +++++++
+ 5 files changed, 63 insertions(+), 3 deletions(-)
+
+diff --git a/src/eap_peer/eap_config.h b/src/eap_peer/eap_config.h
+index 26744ab68..58d5a1359 100644
+--- a/src/eap_peer/eap_config.h
++++ b/src/eap_peer/eap_config.h
+@@ -471,6 +471,14 @@ struct eap_peer_config {
+ 	 * 1 = use cryptobinding if server supports it
+ 	 * 2 = require cryptobinding
+ 	 *
++	 * phase2_auth option can be used to control Phase 2 (i.e., within TLS
++	 * tunnel) behavior for PEAP:
++	 * 0 = do not require Phase 2 authentication
++	 * 1 = require Phase 2 authentication when client certificate
++	 *  (private_key/client_cert) is no used and TLS session resumption was
++	 *  not used (default)
++	 * 2 = require Phase 2 authentication in all cases
++	 *
+ 	 * EAP-WSC (WPS) uses following options: pin=Device_Password and
+ 	 * uuid=Device_UUID
+ 	 *
+diff --git a/src/eap_peer/eap_peap.c b/src/eap_peer/eap_peap.c
+index 12e30df29..608069719 100644
+--- a/src/eap_peer/eap_peap.c
++++ b/src/eap_peer/eap_peap.c
+@@ -67,6 +67,7 @@ struct eap_peap_data {
+ 	u8 cmk[20];
+ 	int soh; /* Whether IF-TNCCS-SOH (Statement of Health; Microsoft NAP)
+ 		  * is enabled. */
++	enum { NO_AUTH, FOR_INITIAL, ALWAYS } phase2_auth;
+ };
+ 
+ 
+@@ -114,6 +115,19 @@ static void eap_peap_parse_phase1(struct eap_peap_data *data,
+ 		wpa_printf(MSG_DEBUG, "EAP-PEAP: Require cryptobinding");
+ 	}
+ 
++	if (os_strstr(phase1, "phase2_auth=0")) {
++		data->phase2_auth = NO_AUTH;
++		wpa_printf(MSG_DEBUG,
++			   "EAP-PEAP: Do not require Phase 2 authentication");
++	} else if (os_strstr(phase1, "phase2_auth=1")) {
++		data->phase2_auth = FOR_INITIAL;
++		wpa_printf(MSG_DEBUG,
++			   "EAP-PEAP: Require Phase 2 authentication for initial connection");
++	} else if (os_strstr(phase1, "phase2_auth=2")) {
++		data->phase2_auth = ALWAYS;
++		wpa_printf(MSG_DEBUG,
++			   "EAP-PEAP: Require Phase 2 authentication for all cases");
++	}
+ #ifdef EAP_TNC
+ 	if (os_strstr(phase1, "tnc=soh2")) {
+ 		data->soh = 2;
+@@ -142,6 +156,7 @@ static void * eap_peap_init(struct eap_sm *sm)
+ 	data->force_peap_version = -1;
+ 	data->peap_outer_success = 2;
+ 	data->crypto_binding = OPTIONAL_BINDING;
++	data->phase2_auth = FOR_INITIAL;
+ 
+ 	if (config && config->phase1)
+ 		eap_peap_parse_phase1(data, config->phase1);
+@@ -454,6 +469,20 @@ static int eap_tlv_validate_cryptobinding(struct eap_sm *sm,
+ }
+ 
+ 
++static bool peap_phase2_sufficient(struct eap_sm *sm,
++				   struct eap_peap_data *data)
++{
++	if ((data->phase2_auth == ALWAYS ||
++	     (data->phase2_auth == FOR_INITIAL &&
++	      !tls_connection_resumed(sm->ssl_ctx, data->ssl.conn) &&
++	      !data->ssl.client_cert_conf) ||
++	     data->phase2_eap_started) &&
++	    !data->phase2_eap_success)
++		return false;
++	return true;
++}
++
++
+ /**
+  * eap_tlv_process - Process a received EAP-TLV message and generate a response
+  * @sm: Pointer to EAP state machine allocated with eap_peer_sm_init()
+@@ -568,6 +597,11 @@ static int eap_tlv_process(struct eap_sm *sm, struct eap_peap_data *data,
+ 					   " - force failed Phase 2");
+ 				resp_status = EAP_TLV_RESULT_FAILURE;
+ 				ret->decision = DECISION_FAIL;
++			} else if (!peap_phase2_sufficient(sm, data)) {
++				wpa_printf(MSG_INFO,
++					   "EAP-PEAP: Server indicated Phase 2 success, but sufficient Phase 2 authentication has not been completed");
++				resp_status = EAP_TLV_RESULT_FAILURE;
++				ret->decision = DECISION_FAIL;
+ 			} else {
+ 				resp_status = EAP_TLV_RESULT_SUCCESS;
+ 				ret->decision = DECISION_UNCOND_SUCC;
+@@ -887,8 +921,7 @@ continue_req:
+ 			/* EAP-Success within TLS tunnel is used to indicate
+ 			 * shutdown of the TLS channel. The authentication has
+ 			 * been completed. */
+-			if (data->phase2_eap_started &&
+-			    !data->phase2_eap_success) {
++			if (!peap_phase2_sufficient(sm, data)) {
+ 				wpa_printf(MSG_DEBUG, "EAP-PEAP: Phase 2 "
+ 					   "Success used to indicate success, "
+ 					   "but Phase 2 EAP was not yet "
+@@ -1199,8 +1232,9 @@ static struct wpabuf * eap_peap_process(struct eap_sm *sm, void *priv,
+ static bool eap_peap_has_reauth_data(struct eap_sm *sm, void *priv)
+ {
+ 	struct eap_peap_data *data = priv;
++
+ 	return tls_connection_established(sm->ssl_ctx, data->ssl.conn) &&
+-		data->phase2_success;
++		data->phase2_success && data->phase2_auth != ALWAYS;
+ }
+ 
+ 
+diff --git a/src/eap_peer/eap_tls_common.c b/src/eap_peer/eap_tls_common.c
+index 6193b4bdb..966cbd6c7 100644
+--- a/src/eap_peer/eap_tls_common.c
++++ b/src/eap_peer/eap_tls_common.c
+@@ -242,6 +242,12 @@ static int eap_tls_params_from_conf(struct eap_sm *sm,
+ 
+ 	sm->ext_cert_check = !!(params->flags & TLS_CONN_EXT_CERT_CHECK);
+ 
++	if (!phase2)
++		data->client_cert_conf = params->client_cert ||
++			params->client_cert_blob ||
++			params->private_key ||
++			params->private_key_blob;
++
+ 	return 0;
+ }
+ 
+diff --git a/src/eap_peer/eap_tls_common.h b/src/eap_peer/eap_tls_common.h
+index 9ac00121f..334863413 100644
+--- a/src/eap_peer/eap_tls_common.h
++++ b/src/eap_peer/eap_tls_common.h
+@@ -79,6 +79,11 @@ struct eap_ssl_data {
+ 	 * tls_v13 - Whether TLS v1.3 or newer is used
+ 	 */
+ 	int tls_v13;
++
++	/**
++	 * client_cert_conf: Whether client certificate has been configured
++	 */
++	bool client_cert_conf;
+ };
+ 
+ 
+diff --git a/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf
+index f0b82443e..1b09f57d3 100644
+--- a/wpa_supplicant/wpa_supplicant.conf
++++ b/wpa_supplicant/wpa_supplicant.conf
+@@ -1370,6 +1370,13 @@ fast_reauth=1
+ #	 * 0 = do not use cryptobinding (default)
+ #	 * 1 = use cryptobinding if server supports it
+ #	 * 2 = require cryptobinding
++#	'phase2_auth' option can be used to control Phase 2 (i.e., within TLS
++#	tunnel) behavior for PEAP:
++#	 * 0 = do not require Phase 2 authentication
++#	 * 1 = require Phase 2 authentication when client certificate
++#	   (private_key/client_cert) is no used and TLS session resumption was
++#	   not used (default)
++#	 * 2 = require Phase 2 authentication in all cases
+ #	EAP-WSC (WPS) uses following options: pin=<Device Password> or
+ #	pbc=1.
+ #
+-- 
+cgit v1.2.3-18-g5258
+
diff --git a/main/wpa_supplicant/config b/main/wpa_supplicant/config
index f35daa0d17f..35301ebd372 100644
--- a/main/wpa_supplicant/config
+++ b/main/wpa_supplicant/config
@@ -32,7 +32,7 @@ CONFIG_DRIVER_WEXT=y
 CONFIG_DRIVER_NL80211=y
 
 # QCA vendor extensions to nl80211
-#CONFIG_DRIVER_NL80211_QCA=y
+CONFIG_DRIVER_NL80211_QCA=y
 
 # driver_nl80211.c requires libnl. If you are compiling it yourself
 # you may need to point hostapd to your version of libnl.
@@ -73,6 +73,12 @@ CONFIG_LIBNL32=y
 # Driver interface for wired Ethernet drivers
 CONFIG_DRIVER_WIRED=y
 
+# Driver interface for MACsec capable Qualcomm Atheros drivers
+#CONFIG_DRIVER_MACSEC_QCA=y
+
+# Driver interface for Linux MACsec drivers
+#CONFIG_DRIVER_MACSEC_LINUX=y
+
 # Driver interface for the Broadcom RoboSwitch family
 #CONFIG_DRIVER_ROBOSWITCH=y
 
@@ -83,8 +89,8 @@ CONFIG_DRIVER_WIRED=y
 #LIBS += -lsocket -ldlpi -lnsl
 #LIBS_c += -lsocket
 
-# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
-# included)
+# Enable IEEE 802.1X Supplicant (automatically included if any EAP method or
+# MACsec is included)
 CONFIG_IEEE8021X_EAPOL=y
 
 # EAP-MD5
@@ -108,6 +114,16 @@ CONFIG_EAP_TTLS=y
 # with openssl-0.9.8x-tls-extensions.patch, to add the needed functions.
 CONFIG_EAP_FAST=y
 
+# EAP-TEAP
+# Note: The current EAP-TEAP implementation is experimental and should not be
+# enabled for production use. The IETF RFC 7170 that defines EAP-TEAP has number
+# of conflicting statements and missing details and the implementation has
+# vendor specific workarounds for those and as such, may not interoperate with
+# any other implementation. This should not be used for anything else than
+# experimentation and interoperability testing until those issues has been
+# resolved.
+#CONFIG_EAP_TEAP=y
+
 # EAP-GTC
 CONFIG_EAP_GTC=y
 
@@ -117,11 +133,14 @@ CONFIG_EAP_OTP=y
 # EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
 CONFIG_EAP_SIM=y
 
+# Enable SIM simulator (Milenage) for EAP-SIM
+#CONFIG_SIM_SIMULATOR=y
+
 # EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
 CONFIG_EAP_PSK=y
 
 # EAP-pwd (secure authentication using only a password)
-#CONFIG_EAP_PWD=y
+CONFIG_EAP_PWD=y
 
 # EAP-PAX
 CONFIG_EAP_PAX=y
@@ -166,6 +185,9 @@ CONFIG_WPS=y
 # EAP-EKE
 #CONFIG_EAP_EKE=y
 
+# MACsec
+#CONFIG_MACSEC=y
+
 # PKCS#12 (PFX) support (used to read private key and certificate file from
 # a file that usually has extension .p12 or .pfx)
 CONFIG_PKCS12=y
@@ -179,14 +201,20 @@ CONFIG_SMARTCARD=y
 CONFIG_PCSC=y
 
 # Support HT overrides (disable HT/HT40, mask MCS rates, etc.)
-#CONFIG_HT_OVERRIDES=y
+CONFIG_HT_OVERRIDES=y
 
 # Support VHT overrides (disable VHT, mask MCS rates, etc.)
-#CONFIG_VHT_OVERRIDES=y
+CONFIG_VHT_OVERRIDES=y
 
 # Development testing
 #CONFIG_EAPOL_TEST=y
 
+# Enable IPv6 support in eapol_test.
+# See: https://gitlab.alpinelinux.org/alpine/aports/-/issues/12429
+#
+# XXX: This option is not documented in the wpa_supplicant defconfig.
+CONFIG_IPV6=y
+
 # Select control interface backend for external programs, e.g, wpa_cli:
 # unix = UNIX domain sockets (default for Linux/*BSD)
 # udp = UDP sockets using localhost (127.0.0.1)
@@ -226,6 +254,9 @@ CONFIG_WPA_CLI_EDIT=y
 # wpa_passphrase). This saves about 0.5 kB in code size.
 #CONFIG_NO_WPA_PASSPHRASE=y
 
+# Simultaneous Authentication of Equals (SAE), WPA3-Personal
+CONFIG_SAE=y
+
 # Disable scan result processing (ap_mode=1) to save code size by about 1 kB.
 # This can be used if ap_scan=1 mode is never enabled.
 #CONFIG_NO_SCAN_PROCESSING=y
@@ -288,17 +319,18 @@ CONFIG_BACKEND=file
 # bridge interfaces (commit 'bridge: respect RFC2863 operational state')').
 #CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y
 
-# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
-CONFIG_PEERKEY=y
-
 # IEEE 802.11w (management frame protection), also known as PMF
 # Driver support is also needed for IEEE 802.11w.
-#CONFIG_IEEE80211W=y
+CONFIG_IEEE80211W=y
+#
+# Support Operating Channel Validation
+CONFIG_OCV=y
 
 # Select TLS implementation
 # openssl = OpenSSL (default)
 # gnutls = GnuTLS
 # internal = Internal TLSv1 implementation (experimental)
+# linux = Linux kernel AF_ALG and internal TLSv1 implementation (experimental)
 # none = Empty template
 CONFIG_TLS=openssl
 
@@ -307,14 +339,18 @@ CONFIG_TLS=openssl
 # are used. It should be noted that some existing TLS v1.0 -based
 # implementation may not be compatible with TLS v1.1 message (ClientHello is
 # sent prior to negotiating which version will be used)
-#CONFIG_TLSV11=y
+CONFIG_TLSV11=y
 
 # TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2)
 # can be enabled to enable use of stronger crypto algorithms. It should be
 # noted that some existing TLS v1.0 -based implementation may not be compatible
 # with TLS v1.2 message (ClientHello is sent prior to negotiating which version
 # will be used)
-#CONFIG_TLSV12=y
+CONFIG_TLSV12=y
+
+# Select which ciphers to use by default with OpenSSL if the user does not
+# specify them.
+CONFIG_TLS_DEFAULT_CIPHERS="DEFAULT:@SECLEVEL=1"
 
 # If CONFIG_TLS=internal is used, additional library and include paths are
 # needed for LibTomMath. Alternatively, an integrated, minimal version of
@@ -370,16 +406,16 @@ CONFIG_CTRL_IFACE_DBUS_INTRO=y
 # amount of memory/flash.
 #CONFIG_DYNAMIC_EAP_METHODS=y
 
-# IEEE Std 802.11r-2008 (Fast BSS Transition)
+# IEEE Std 802.11r-2008 (Fast BSS Transition) for station mode
 #CONFIG_IEEE80211R=y
 
 # Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
 #CONFIG_DEBUG_FILE=y
 
 # Send debug messages to syslog instead of stdout
-#CONFIG_DEBUG_SYSLOG=y
+CONFIG_DEBUG_SYSLOG=y
 # Set syslog facility for debug messages
-#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
+CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
 
 # Add support for sending all debug messages (regardless of debug verbosity)
 # to the Linux kernel tracing facility. This helps debug the entire stack by
@@ -447,6 +483,11 @@ CONFIG_DELAYED_MIC_ERROR_REPORT=y
 # that meet the requirements described above.
 #CONFIG_NO_RANDOM_POOL=y
 
+# Should we attempt to use the getrandom(2) call that provides more reliable
+# yet secure randomness source than /dev/random on Linux 3.17 and newer.
+# Requires glibc 2.25 to build, falls back to /dev/random if unavailable.
+CONFIG_GETRANDOM=y
+
 # IEEE 802.11n (High Throughput) support (mainly for AP mode)
 #CONFIG_IEEE80211N=y
 
@@ -462,10 +503,10 @@ CONFIG_DELAYED_MIC_ERROR_REPORT=y
 # This can be used to enable functionality to improve interworking with
 # external networks (GAS/ANQP to learn more about the networks and network
 # selection based on available credentials).
-#CONFIG_INTERWORKING=y
+CONFIG_INTERWORKING=y
 
 # Hotspot 2.0
-#CONFIG_HS20=y
+CONFIG_HS20=y
 
 # Enable interface matching in wpa_supplicant
 #CONFIG_MATCH_IFACE=y
@@ -486,12 +527,12 @@ CONFIG_AP=y
 CONFIG_P2P=y
 
 # Enable TDLS support
-#CONFIG_TDLS=y
+CONFIG_TDLS=y
 
-# Wi-Fi Direct
-# This can be used to enable Wi-Fi Direct extensions for P2P using an external
+# Wi-Fi Display
+# This can be used to enable Wi-Fi Display extensions for P2P using an external
 # program to control the additional information exchanges in the messages.
-#CONFIG_WIFI_DISPLAY=y
+CONFIG_WIFI_DISPLAY=y
 
 # Autoscan
 # This can be used to enable automatic scan support in wpa_supplicant.
@@ -501,7 +542,7 @@ CONFIG_P2P=y
 # For exponential module:
 #CONFIG_AUTOSCAN_EXPONENTIAL=y
 # For periodic module:
-#CONFIG_AUTOSCAN_PERIODIC=y
+CONFIG_AUTOSCAN_PERIODIC=y
 
 # Password (and passphrase, etc.) backend for external storage
 # These optional mechanisms can be used to add support for storing passwords
@@ -544,7 +585,51 @@ CONFIG_P2P=y
 #
 # For more details refer to:
 # http://wireless.kernel.org/en/users/Documentation/acs
-#CONFIG_ACS=y
+CONFIG_ACS=y
 
 # Support Multi Band Operation
 #CONFIG_MBO=y
+
+# Fast Initial Link Setup (FILS) (IEEE 802.11ai)
+CONFIG_FILS=y
+# FILS shared key authentication with PFS
+CONFIG_FILS_SK_PFS=y
+
+# Support RSN on IBSS networks
+# This is needed to be able to use mode=1 network profile with proto=RSN and
+# key_mgmt=WPA-PSK (i.e., full key management instead of WPA-None).
+CONFIG_IBSS_RSN=y
+
+# External PMKSA cache control
+# This can be used to enable control interface commands that allow the current
+# PMKSA cache entries to be fetched and new entries to be added.
+#CONFIG_PMKSA_CACHE_EXTERNAL=y
+
+# Mesh Networking (IEEE 802.11s)
+#CONFIG_MESH=y
+
+# Background scanning modules
+# These can be used to request wpa_supplicant to perform background scanning
+# operations for roaming within an ESS (same SSID). See the bgscan parameter in
+# the wpa_supplicant.conf file for more details.
+# Periodic background scans based on signal strength
+CONFIG_BGSCAN_SIMPLE=y
+# Learn channels used by the network and try to avoid bgscans on other
+# channels (experimental)
+#CONFIG_BGSCAN_LEARN=y
+
+# Opportunistic Wireless Encryption (OWE)
+# Experimental implementation of draft-harkins-owe-07.txt
+CONFIG_OWE=y
+
+# Device Provisioning Protocol (DPP)
+# This requires CONFIG_IEEE80211W=y to be enabled, too. (see
+# wpa_supplicant/README-DPP for details)
+#CONFIG_DPP=y
+
+# WPA3-Enterprise (SuiteB-192)
+CONFIG_SUITEB=y
+CONFIG_SUITEB192=y
+
+# IEEE 802.11n (high throughput) support
+CONFIG_IEEE80211N=y
diff --git a/main/wpa_supplicant/eloop.patch b/main/wpa_supplicant/eloop.patch
deleted file mode 100644
index bab2cee4e59..00000000000
--- a/main/wpa_supplicant/eloop.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_utils_eloop_c,v 1.5 2015/09/29 11:57:54 dcoppa Exp $
-
-don't try to access list members to free them unless already initialised
-
---- a/src/utils/eloop.c.orig	Sun Sep 27 21:02:05 2015
-+++ b/src/utils/eloop.c	Mon Sep 28 09:35:05 2015
-@@ -1064,6 +1064,9 @@ void eloop_destroy(void)
- 	struct eloop_timeout *timeout, *prev;
- 	struct os_reltime now;
- 
-+	if (eloop.timeout.prev == NULL)
-+		return;
-+
- 	os_get_reltime(&now);
- 	dl_list_for_each_safe(timeout, prev, &eloop.timeout,
- 			      struct eloop_timeout, list) {
diff --git a/main/wpa_supplicant/unsafe-renegotiation-1.patch b/main/wpa_supplicant/unsafe-renegotiation-1.patch
new file mode 100644
index 00000000000..0802a1bab8d
--- /dev/null
+++ b/main/wpa_supplicant/unsafe-renegotiation-1.patch
@@ -0,0 +1,103 @@
+Patch-Source: https://w1.fi/cgit/hostap/commit/?id=566ce69a8d0e64093309cbde80235aa522fbf84e
+From 566ce69a8d0e64093309cbde80235aa522fbf84e Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <quic_jouni@quicinc.com>
+Date: Thu, 5 May 2022 00:07:44 +0300
+Subject: EAP peer: Workaround for servers that do not support safe TLS
+ renegotiation
+
+The TLS protocol design for renegotiation was identified to have a
+significant security flaw in 2009 and an extension to secure this design
+was published in 2010 (RFC 5746). However, some old RADIUS
+authentication servers without support for this are still used commonly.
+
+This is obviously not good from the security view point, but since there
+are cases where the user of a network service has no realistic means for
+getting the authentication server upgraded, TLS handshake may still need
+to be allowed to be able to use the network.
+
+OpenSSL 3.0 disabled the client side workaround by default and this
+resulted in issues connection to some networks with insecure
+authentication servers. With OpenSSL 3.0, the client is now enforcing
+security by refusing to authenticate with such servers. The pre-3.0
+behavior of ignoring this issue and leaving security to the server can
+now be enabled with a new phase1 parameter allow_unsafe_renegotiation=1.
+This should be used only when having to connect to a network that has an
+insecure authentication server that cannot be upgraded.
+
+The old (pre-2010) TLS renegotiation mechanism might open security
+vulnerabilities if the authentication server were to allow TLS
+renegotiation to be initiated. While this is unlikely to cause real
+issues with EAP-TLS, there might be cases where use of PEAP or TTLS with
+an authentication server that does not support RFC 5746 might result in
+a security vulnerability.
+
+Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
+---
+ src/crypto/tls.h                   | 1 +
+ src/crypto/tls_openssl.c           | 5 +++++
+ src/eap_peer/eap_tls_common.c      | 4 ++++
+ wpa_supplicant/wpa_supplicant.conf | 5 +++++
+ 4 files changed, 15 insertions(+)
+
+diff --git a/src/crypto/tls.h b/src/crypto/tls.h
+index ccaac94c9..7ea32ee4a 100644
+--- a/src/crypto/tls.h
++++ b/src/crypto/tls.h
+@@ -112,6 +112,7 @@ struct tls_config {
+ #define TLS_CONN_ENABLE_TLSv1_1 BIT(15)
+ #define TLS_CONN_ENABLE_TLSv1_2 BIT(16)
+ #define TLS_CONN_TEAP_ANON_DH BIT(17)
++#define TLS_CONN_ALLOW_UNSAFE_RENEGOTIATION BIT(18)
+ 
+ /**
+  * struct tls_connection_params - Parameters for TLS connection
+diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
+index 388c6b0f4..0d23f44ad 100644
+--- a/src/crypto/tls_openssl.c
++++ b/src/crypto/tls_openssl.c
+@@ -3081,6 +3081,11 @@ static int tls_set_conn_flags(struct tls_connection *conn, unsigned int flags,
+ 		SSL_clear_options(ssl, SSL_OP_NO_TICKET);
+ #endif /* SSL_OP_NO_TICKET */
+ 
++#ifdef SSL_OP_LEGACY_SERVER_CONNECT
++	if (flags & TLS_CONN_ALLOW_UNSAFE_RENEGOTIATION)
++		SSL_set_options(ssl, SSL_OP_LEGACY_SERVER_CONNECT);
++#endif /* SSL_OP_LEGACY_SERVER_CONNECT */
++
+ #ifdef SSL_OP_NO_TLSv1
+ 	if (flags & TLS_CONN_DISABLE_TLSv1_0)
+ 		SSL_set_options(ssl, SSL_OP_NO_TLSv1);
+diff --git a/src/eap_peer/eap_tls_common.c b/src/eap_peer/eap_tls_common.c
+index 06c9b211e..6193b4bdb 100644
+--- a/src/eap_peer/eap_tls_common.c
++++ b/src/eap_peer/eap_tls_common.c
+@@ -102,6 +102,10 @@ static void eap_tls_params_flags(struct tls_connection_params *params,
+ 		params->flags |= TLS_CONN_SUITEB_NO_ECDH;
+ 	if (os_strstr(txt, "tls_suiteb_no_ecdh=0"))
+ 		params->flags &= ~TLS_CONN_SUITEB_NO_ECDH;
++	if (os_strstr(txt, "allow_unsafe_renegotiation=1"))
++		params->flags |= TLS_CONN_ALLOW_UNSAFE_RENEGOTIATION;
++	if (os_strstr(txt, "allow_unsafe_renegotiation=0"))
++		params->flags &= ~TLS_CONN_ALLOW_UNSAFE_RENEGOTIATION;
+ }
+ 
+ 
+diff --git a/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf
+index a1dc769c9..b5304a77e 100644
+--- a/wpa_supplicant/wpa_supplicant.conf
++++ b/wpa_supplicant/wpa_supplicant.conf
+@@ -1370,6 +1370,11 @@ fast_reauth=1
+ # tls_suiteb=0 - do not apply Suite B 192-bit constraints on TLS (default)
+ # tls_suiteb=1 - apply Suite B 192-bit constraints on TLS; this is used in
+ #	particular when using Suite B with RSA keys of >= 3K (3072) bits
++# allow_unsafe_renegotiation=1 - allow connection with a TLS server that does
++#	not support safe renegotiation (RFC 5746); please note that this
++#	workaround should be only when having to authenticate with an old
++#	authentication server that cannot be updated to use secure TLS
++#	implementation.
+ #
+ # Following certificate/private key fields are used in inner Phase2
+ # authentication when using EAP-TTLS or EAP-PEAP.
+-- 
+cgit v1.2.3-18-g5258
+
diff --git a/main/wpa_supplicant/unsafe-renegotiation-2.patch b/main/wpa_supplicant/unsafe-renegotiation-2.patch
new file mode 100644
index 00000000000..20466378d6f
--- /dev/null
+++ b/main/wpa_supplicant/unsafe-renegotiation-2.patch
@@ -0,0 +1,105 @@
+Patch-Source: https://w1.fi/cgit/hostap/commit/?id=a561d12d24c2c8bb0f825d4a3a55a5e47e845853
+From a561d12d24c2c8bb0f825d4a3a55a5e47e845853 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <quic_jouni@quicinc.com>
+Date: Wed, 4 May 2022 23:55:38 +0300
+Subject: EAP peer status notification for server not supporting RFC 5746
+
+Add a notification message to indicate reason for TLS handshake failure
+due to the server not supporting safe renegotiation (RFC 5746).
+
+Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
+---
+ src/ap/authsrv.c         |  3 +++
+ src/crypto/tls.h         |  3 ++-
+ src/crypto/tls_openssl.c | 15 +++++++++++++--
+ src/eap_peer/eap.c       |  5 +++++
+ 4 files changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/src/ap/authsrv.c b/src/ap/authsrv.c
+index 516c1da74..fd9c96fad 100644
+--- a/src/ap/authsrv.c
++++ b/src/ap/authsrv.c
+@@ -169,6 +169,9 @@ static void authsrv_tls_event(void *ctx, enum tls_event ev,
+ 			wpa_printf(MSG_DEBUG, "authsrv: remote TLS alert: %s",
+ 				   data->alert.description);
+ 		break;
++	case TLS_UNSAFE_RENEGOTIATION_DISABLED:
++		/* Not applicable to TLS server */
++		break;
+ 	}
+ }
+ #endif /* EAP_TLS_FUNCS */
+diff --git a/src/crypto/tls.h b/src/crypto/tls.h
+index 7ea32ee4a..7a2ee32df 100644
+--- a/src/crypto/tls.h
++++ b/src/crypto/tls.h
+@@ -22,7 +22,8 @@ enum tls_event {
+ 	TLS_CERT_CHAIN_SUCCESS,
+ 	TLS_CERT_CHAIN_FAILURE,
+ 	TLS_PEER_CERTIFICATE,
+-	TLS_ALERT
++	TLS_ALERT,
++	TLS_UNSAFE_RENEGOTIATION_DISABLED,
+ };
+ 
+ /*
+diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
+index 0d23f44ad..912471ba2 100644
+--- a/src/crypto/tls_openssl.c
++++ b/src/crypto/tls_openssl.c
+@@ -4443,6 +4443,7 @@ int tls_connection_get_eap_fast_key(void *tls_ctx, struct tls_connection *conn,
+ static struct wpabuf *
+ openssl_handshake(struct tls_connection *conn, const struct wpabuf *in_data)
+ {
++	struct tls_context *context = conn->context;
+ 	int res;
+ 	struct wpabuf *out_data;
+ 
+@@ -4472,7 +4473,19 @@ openssl_handshake(struct tls_connection *conn, const struct wpabuf *in_data)
+ 			wpa_printf(MSG_DEBUG, "SSL: SSL_connect - want to "
+ 				   "write");
+ 		else {
++			unsigned long error = ERR_peek_last_error();
++
+ 			tls_show_errors(MSG_INFO, __func__, "SSL_connect");
++
++			if (context->event_cb &&
++			    ERR_GET_LIB(error) == ERR_LIB_SSL &&
++			    ERR_GET_REASON(error) ==
++			    SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED) {
++				context->event_cb(
++					context->cb_ctx,
++					TLS_UNSAFE_RENEGOTIATION_DISABLED,
++					NULL);
++			}
+ 			conn->failed++;
+ 			if (!conn->server && !conn->client_hello_generated) {
+ 				/* The server would not understand TLS Alert
+@@ -4495,8 +4508,6 @@ openssl_handshake(struct tls_connection *conn, const struct wpabuf *in_data)
+ 	if ((conn->flags & TLS_CONN_SUITEB) && !conn->server &&
+ 	    os_strncmp(SSL_get_cipher(conn->ssl), "DHE-", 4) == 0 &&
+ 	    conn->server_dh_prime_len < 3072) {
+-		struct tls_context *context = conn->context;
+-
+ 		/*
+ 		 * This should not be reached since earlier cert_cb should have
+ 		 * terminated the handshake. Keep this check here for extra
+diff --git a/src/eap_peer/eap.c b/src/eap_peer/eap.c
+index 429b20d3a..729388f4f 100644
+--- a/src/eap_peer/eap.c
++++ b/src/eap_peer/eap.c
+@@ -2172,6 +2172,11 @@ static void eap_peer_sm_tls_event(void *ctx, enum tls_event ev,
+ 			eap_notify_status(sm, "remote TLS alert",
+ 					  data->alert.description);
+ 		break;
++	case TLS_UNSAFE_RENEGOTIATION_DISABLED:
++		wpa_printf(MSG_INFO,
++			   "TLS handshake failed due to the server not supporting safe renegotiation (RFC 5746); phase1 parameter allow_unsafe_renegotiation=1 can be used to work around this");
++		eap_notify_status(sm, "unsafe server renegotiation", "failure");
++		break;
+ 	}
+ 
+ 	os_free(hash_hex);
+-- 
+cgit v1.2.3-18-g5258
+
diff --git a/main/wpa_supplicant/wpa_cli.initd b/main/wpa_supplicant/wpa_cli.initd
index f5a25a88966..2bf7c0d2c6a 100644
--- a/main/wpa_supplicant/wpa_cli.initd
+++ b/main/wpa_supplicant/wpa_cli.initd
@@ -2,6 +2,15 @@
 
 supervisor=supervise-daemon
 
+# The wpa_cli services depends on wpa_supplicant. If wpa_supplicant is
+# restarted, so is wpa_cli. Unfortunately, wpa_supplicant creates the
+# socket, used for communication with wpa_cli, rather late thereby
+# causing wpa_cli to be restarted before it is created and thus fail.
+# By default supervise-daemon will restart wpa_cli immediately, often
+# resulting in all restart attempts to be exhausted before the socket is
+# created. To work around this issue, add a respawn-delay to wpa_cli.
+supervise_daemon_args="--respawn-delay 3"
+
 name="WPA Command Line Client"
 description="Text-based frontend for interacting with WPA Supplicant"
 
diff --git a/main/wpa_supplicant/wpa_supplicant.initd b/main/wpa_supplicant/wpa_supplicant.initd
index 9aa828fea0d..91f57e619a2 100644
--- a/main/wpa_supplicant/wpa_supplicant.initd
+++ b/main/wpa_supplicant/wpa_supplicant.initd
@@ -18,6 +18,7 @@ depend() {
 	after bootmisc modules entropy udev-settle
 	before dns dhcpcd net
 	keyword -shutdown
+	provide wlan
 }
 
 find_wireless() {
@@ -74,4 +75,6 @@ start_pre() {
 		fi
 		;;
 	esac
+
+    checkpath -d -m 0755 -o root:root /var/run/wpa_supplicant
 }
diff --git a/main/xauth/APKBUILD b/main/xauth/APKBUILD
deleted file mode 100644
index aa629d484bd..00000000000
--- a/main/xauth/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xauth
-pkgver=1.1
-pkgrel=0
-pkgdesc="X.Org authorization settings program"
-url="http://xorg.freedesktop.org/"
-arch="all"
-options="!check"  # Requires unpackaged, unmaintained 'cmdtest' package
-license="custom"
-makedepends="libxau-dev libxext-dev libxmu-dev libx11-dev util-macros"
-subpackages="$pkgname-doc"
-source="https://www.x.org/releases/individual/app/xauth-$pkgver.tar.bz2"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="b6ecd59a853a491ef45bf8cfbff63bed36645f81cb79ae9d18458b57f7502bccf92f0d979d3337578518646f680ad379e67b1dac15a927cbb11372733e7a3a0c  xauth-1.1.tar.bz2"
diff --git a/main/xcb-proto/APKBUILD b/main/xcb-proto/APKBUILD
index 1d3606a9d35..d4f216dcfa7 100644
--- a/main/xcb-proto/APKBUILD
+++ b/main/xcb-proto/APKBUILD
@@ -1,13 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xcb-proto
-pkgver=1.14
-pkgrel=0
+pkgver=1.16.0
+pkgrel=1
 pkgdesc="XML-XCB protocol descriptions"
 options="!check" # no testsuite
 url="https://xcb.freedesktop.org"
 arch="noarch"
 license="MIT"
 makedepends="python3"
+subpackages="$pkgname-pyc"
 source="https://xorg.freedesktop.org/archive/individual/proto/xcb-proto-$pkgver.tar.xz"
 
 build() {
@@ -22,4 +23,6 @@ package() {
 	make DESTDIR=$pkgdir install
 }
 
-sha512sums="de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690  xcb-proto-1.14.tar.xz"
+sha512sums="
+54906f379a7aa2cbbfbbe54764c02dbf522ca8f6c54e07d4faae471aac3aee25d0359be38c808c8da887de228aed745582a78b2f56714b023bca8f3513b24972  xcb-proto-1.16.0.tar.xz
+"
diff --git a/main/xcb-util-cursor/APKBUILD b/main/xcb-util-cursor/APKBUILD
deleted file mode 100644
index b97c84f85ba..00000000000
--- a/main/xcb-util-cursor/APKBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xcb-util-cursor
-pkgver=0.1.3
-pkgrel=1
-pkgdesc="X C-language Binding - cursor library (port of libXcursor)"
-url="https://xcb.freedesktop.org/"
-arch="all"
-license="MIT"
-depends=
-depends_dev="xcb-util-dev"
-makedepends="$depends_dev m4 util-macros xcb-util-image-dev xcb-util-renderutil-dev"
-checkdepends="check-dev"
-install=""
-subpackages="$pkgname-dev"
-source="https://xcb.freedesktop.org/dist/xcb-util-cursor-$pkgver.tar.gz
-	"
-
-build() {
-	cd "$builddir"
-	export CFLAGS="$CFLAGS -std=gnu99"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="7be0950d9cef455e504ef5ac6c1872cc05bb27d1a8c844e0ddb19d718145ec05891315af6237e46ba615d01edc2d152c8901c8bc644a386d10757352a77fc57f  xcb-util-cursor-0.1.3.tar.gz"
diff --git a/main/xcb-util-image/APKBUILD b/main/xcb-util-image/APKBUILD
deleted file mode 100644
index 43f7fc3a45f..00000000000
--- a/main/xcb-util-image/APKBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xcb-util-image
-pkgver=0.4.0
-pkgrel=1
-pkgdesc="X C-language Binding - port of Xlib XImage and XShmImage"
-url="https://xcb.freedesktop.org/"
-arch="all"
-license="MIT"
-depends=
-depends_dev="xcb-util-dev"
-makedepends="$depends_dev m4 util-macros"
-checkdepends="check-dev"
-install=""
-replaces="xcb-util"
-subpackages="$pkgname-dev"
-source="https://xcb.freedesktop.org/dist/xcb-util-image-$pkgver.tar.gz
-	"
-
-build() {
-	cd "$builddir"
-	export CFLAGS="$CFLAGS -std=gnu99"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="2e580d205e4a054763146c70d735014c7e018322a43c76b07a306c091dca81b140cbbf6db41252e9204ff742f119b69e143b3fdc1fb13bd9d0b9e8e22eda2cd3  xcb-util-image-0.4.0.tar.gz"
diff --git a/main/xcb-util-keysyms/APKBUILD b/main/xcb-util-keysyms/APKBUILD
deleted file mode 100644
index 6e10e4ff6f5..00000000000
--- a/main/xcb-util-keysyms/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xcb-util-keysyms
-pkgver=0.4.0
-pkgrel=1
-pkgdesc="X C-language Binding - X constants and keycodes"
-url="https://xcb.freedesktop.org/"
-arch="all"
-license="MIT"
-depends=
-depends_dev="xcb-util-dev"
-makedepends="$depends_dev m4"
-checkdepends="check-dev"
-install=""
-replaces="xcb-util"
-subpackages="$pkgname-dev"
-source="https://xcb.freedesktop.org/dist/xcb-util-keysyms-$pkgver.tar.gz"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="d92959e11241e479a8f6c55d2a1f0d507a8e7baa8dd469b01167b6307ed87bba26e0c68808cf0de90ba4d6081aad786276998b9784b81433b4f1cb9054573755  xcb-util-keysyms-0.4.0.tar.gz"
diff --git a/main/xcb-util-renderutil/APKBUILD b/main/xcb-util-renderutil/APKBUILD
deleted file mode 100644
index 0d1dcc2c804..00000000000
--- a/main/xcb-util-renderutil/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xcb-util-renderutil
-pkgver=0.3.9
-pkgrel=1
-pkgdesc="X C-language Binding - Convenience functions for XRender extension"
-url="https://xcb.freedesktop.org/"
-arch="all"
-license="MIT"
-depends=
-depends_dev="xcb-util-dev"
-makedepends="$depends_dev m4 util-macros"
-checkdepends="check-dev"
-install=""
-replaces="xcb-util"
-subpackages="$pkgname-dev"
-source="https://xcb.freedesktop.org/dist/xcb-util-renderutil-$pkgver.tar.gz"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="c666f9eae18fa3fb603086e86ee4efc66dbed17b696bec637f07ea1334715cee01e03db26340ed3d1338887f4940cd3a435e4df8b36e59f439a0a2b8a0879463  xcb-util-renderutil-0.3.9.tar.gz"
diff --git a/main/xcb-util-wm/APKBUILD b/main/xcb-util-wm/APKBUILD
deleted file mode 100644
index 92e35c931e4..00000000000
--- a/main/xcb-util-wm/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xcb-util-wm
-pkgver=0.4.1
-pkgrel=1
-pkgdesc="X C-language Binding - helpers for ICCCM and EWMH"
-url="https://xcb.freedesktop.org/"
-arch="all"
-license="MIT"
-depends=
-depends_dev="xcb-util-dev"
-makedepends="$depends_dev m4 util-macros"
-checkdepends="check"
-install=""
-replaces="xcb-util"
-subpackages="$pkgname-dev"
-source="https://xcb.freedesktop.org/dist/xcb-util-wm-$pkgver.tar.gz"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="063d852367088a7129aacce95e7d81cb0925b146191e1114171e58f5a65dcb8cc7f4fb5a9ecb49e9da2e2d8be75375f5cfaafc04b756179750e230fb486b9e22  xcb-util-wm-0.4.1.tar.gz"
diff --git a/main/xcb-util/APKBUILD b/main/xcb-util/APKBUILD
index d8bd5a67666..216ce6d8860 100644
--- a/main/xcb-util/APKBUILD
+++ b/main/xcb-util/APKBUILD
@@ -1,20 +1,19 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xcb-util
-pkgver=0.4.0
-pkgrel=1
+pkgver=0.4.1
+pkgrel=3
 pkgdesc="Utility libraries for X C-language Binding"
-url="http://xcb.freedesktop.org"
+url="https://xcb.freedesktop.org/"
 arch="all"
-license="GPL"
+license="MIT"
 depends_dev="libxcb-dev util-macros"
 makedepends="$depends_dev m4 gperf"
 checkdepends="check-dev"
 subpackages="$pkgname-dev"
-source="https://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2"
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://xorg.freedesktop.org/archive/individual/lib/xcb-util-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
+	CFLAGS="$CFLAGS -flto=auto" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,13 +23,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e60aaa6f582eacd05896c5fd7c8417938318a1288146f3a5b339f77eed24e211c6099963f8813daa621c94173d2934228936b491c0ed79b09a8a67d835867d0e  xcb-util-0.4.0.tar.bz2"
+sha512sums="
+da67f2f017d2a1788dcf35f28d6956e171303a622a1dd085cd3d69fdb2ed77965d83c557cc926ebf9b32e905eb2cbb5921987250192d78a2f5edc4d437ed7d2b  xcb-util-0.4.1.tar.xz
+"
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index 9be6774d8ba..1810b054d63 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -1,21 +1,53 @@
 # Contributor: Roger Pau Monne <roger.pau@entel.upc.edu>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xen
-pkgver=4.13.0
-pkgrel=2
+pkgver=4.18.2
+pkgrel=1
 pkgdesc="Xen hypervisor"
 url="https://www.xenproject.org/"
-arch="x86_64 armhf aarch64" # enable armv7 when builds with gcc8
+arch="x86_64 armv7 aarch64"
 license="GPL-2.0-only"
 depends="bash iproute2 logrotate"
-depends_dev="openssl-dev python3-dev e2fsprogs-dev gettext zlib-dev ncurses-dev
-	dev86 texinfo perl pciutils-dev glib-dev yajl-dev libnl3-dev
-	spice-dev gnutls-dev curl-dev libaio-dev lzo-dev xz-dev util-linux-dev
-	e2fsprogs-dev linux-headers argp-standalone perl-dev flex bison"
-makedepends="$depends_dev autoconf automake libtool dnsmasq"
+depends_dev="
+	argp-standalone
+	attr-dev
+	bison
+	curl-dev
+	dev86
+	e2fsprogs-dev
+	flex
+	gnutls-dev
+	libaio-dev
+	libcap-ng-dev
+	libnl3-dev
+	linux-headers
+	lzo-dev
+	ncurses-dev
+	openssl-dev>3
+	pciutils-dev
+	perl
+	perl-dev
+	py3-setuptools
+	python3-dev
+	spice-dev
+	texinfo
+	util-linux-dev
+	xz-dev
+	yajl-dev
+	zlib-dev
+	zstd-dev
+	"
+makedepends="$depends_dev autoconf automake libtool dnsmasq samurai"
 options="!strip"
 
+# Follow security issues on: https://xenbits.xen.org/xsa/
+
 # secfixes:
+#   0:
+#     - CVE-2020-29568 XSA-349
+#     - CVE-2020-29569 XSA-350
+#     - CVE-2022-21127
+#     - CVE-2023-46840 XSA-450
 #   4.7.0-r0:
 #     - CVE-2016-6258 XSA-182
 #     - CVE-2016-6259 XSA-183
@@ -105,7 +137,7 @@ options="!strip"
 #     - XSA-249
 #     - XSA-250
 #     - XSA-251
-#     - XSA-253
+#     - CVE-2018-5244 XSA-253
 #     - XSA-254
 #   4.10.0-r2:
 #     - CVE-2018-7540 XSA-252
@@ -114,37 +146,37 @@ options="!strip"
 #   4.10.1-r0:
 #     - CVE-2018-10472 XSA-258
 #     - CVE-2018-10471 XSA-259
-#   4.10-1-r1:
+#   4.10.1-r1:
 #     - CVE-2018-8897 XSA-260
 #     - CVE-2018-10982 XSA-261
 #     - CVE-2018-10981 XSA-262
 #   4.11.0-r0:
-#     - CVE-2018-3639   XSA-263
-#     - CVE-2018-128911 XSA-264
-#     - CVE-2018-12893  XSA-265
-#     - CVE-2018-12892  XSA-266
-#     - CVE-2018-3665   XSA-267
+#     - CVE-2018-3639 XSA-263
+#     - CVE-2018-12891 XSA-264
+#     - CVE-2018-12893 XSA-265
+#     - CVE-2018-12892 XSA-266
+#     - CVE-2018-3665 XSA-267
 #   4.11.1-r0:
-#     - CVE-2018-15469  XSA-268
-#     - CVE-2018-15468  XSA-269
-#     - CVE-2018-15470  XSA-272
-#     - CVE-2018-3620   XSA-273
-#     - CVE-2018-3646   XSA-273
-#     - CVE-2018-19961  XSA-275
-#     - CVE-2018-19962  XSA-275
-#     - CVE-2018-19963  XSA-276
-#     - CVE-2018-19964  XSA-277
-#     - CVE-2018-18883  XSA-278
-#     - CVE-2018-19965  XSA-279
-#     - CVE-2018-19966  XSA-280
-#     - CVE-2018-19967  XSA-282
+#     - CVE-2018-15469 XSA-268
+#     - CVE-2018-15468 XSA-269
+#     - CVE-2018-15470 XSA-272
+#     - CVE-2018-3620 XSA-273
+#     - CVE-2018-3646 XSA-273
+#     - CVE-2018-19961 XSA-275
+#     - CVE-2018-19962 XSA-275
+#     - CVE-2018-19963 XSA-276
+#     - CVE-2018-19964 XSA-277
+#     - CVE-2018-18883 XSA-278
+#     - CVE-2018-19965 XSA-279
+#     - CVE-2018-19966 XSA-280
+#     - CVE-2018-19967 XSA-282
 #   4.12.0-r2:
-#     - CVE-2018-12126  XSA-297
-#     - CVE-2018-12127  XSA-297
-#     - CVE-2018-12130  XSA-297
-#     - CVE-2019-11091  XSA-297
+#     - CVE-2018-12126 XSA-297
+#     - CVE-2018-12127 XSA-297
+#     - CVE-2018-12130 XSA-297
+#     - CVE-2019-11091 XSA-297
 #   4.12.1-r0:
-#     - CVE-????-?????  XSA-295
+#     - CVE-2019-17349 CVE-2019-17350 XSA-295
 #   4.13.0-r0:
 #     - CVE-2019-18425 XSA-298
 #     - CVE-2019-18421 XSA-299
@@ -159,10 +191,190 @@ options="!strip"
 #     - CVE-2019-19578 XSA-309
 #     - CVE-2019-19580 XSA-310
 #     - CVE-2019-19577 XSA-311
+#   4.13.0-r3:
+#     - CVE-2020-11740 CVE-2020-11741 XSA-313
+#     - CVE-2020-11739 XSA-314
+#     - CVE-2020-11743 XSA-316
+#     - CVE-2020-11742 XSA-318
+#   4.13.1-r0:
+#     - XSA-312
+#   4.13.1-r3:
+#     - CVE-2020-0543 XSA-320
+#   4.13.1-r4:
+#     - CVE-2020-15566 XSA-317
+#     - CVE-2020-15563 XSA-319
+#     - CVE-2020-15565 XSA-321
+#     - CVE-2020-15564 XSA-327
+#     - CVE-2020-15567 XSA-328
+#   4.13.1-r5:
+#     - CVE-2020-14364 XSA-335
+#   4.14.0-r1:
+#     - CVE-2020-25602 XSA-333
+#     - CVE-2020-25598 XSA-334
+#     - CVE-2020-25604 XSA-336
+#     - CVE-2020-25595 XSA-337
+#     - CVE-2020-25597 XSA-338
+#     - CVE-2020-25596 XSA-339
+#     - CVE-2020-25603 XSA-340
+#     - CVE-2020-25600 XSA-342
+#     - CVE-2020-25599 XSA-343
+#     - CVE-2020-25601 XSA-344
+#   4.14.0-r2:
+#     - CVE-2020-27674 XSA-286
+#     - CVE-2020-27672 XSA-345
+#     - CVE-2020-27671 XSA-346
+#     - CVE-2020-27670 XSA-347
+#     - CVE-2020-28368 XSA-351
+#   4.14.0-r3:
+#     - CVE-2020-29040 XSA-355
+#   4.14.1-r0:
+#     - CVE-2020-29480 XSA-115
+#     - CVE-2020-29481 XSA-322
+#     - CVE-2020-29482 XSA-323
+#     - CVE-2020-29484 XSA-324
+#     - CVE-2020-29483 XSA-325
+#     - CVE-2020-29485 XSA-330
+#     - CVE-2020-29566 XSA-348
+#     - CVE-2020-29486 XSA-352
+#     - CVE-2020-29479 XSA-353
+#     - CVE-2020-29567 XSA-356
+#     - CVE-2020-29570 XSA-358
+#     - CVE-2020-29571 XSA-359
+#   4.14.1-r2:
+#     - CVE-2021-3308 XSA-360
+#   4.14.1-r3:
+#     - CVE-2021-26933 XSA-364
+#   4.15.0-r0:
+#     - CVE-2021-28687 XSA-368
+#   4.15.0-r1:
+#     - CVE-2021-28693 XSA-372
+#     - CVE-2021-28692 XSA-373
+#     - CVE-2021-0089 XSA-375
+#     - CVE-2021-28690 XSA-377
+#   4.15.0-r2:
+#     - CVE-2021-28694 XSA-378
+#     - CVE-2021-28695 XSA-378
+#     - CVE-2021-28696 XSA-378
+#     - CVE-2021-28697 XSA-379
+#     - CVE-2021-28698 XSA-380
+#     - CVE-2021-28699 XSA-382
+#     - CVE-2021-28700 XSA-383
+#   4.15.0-r3:
+#     - CVE-2021-28701 XSA-384
+#   4.15.1-r1:
+#     - CVE-2021-28702 XSA-386
+#     - CVE-2021-28703 XSA-387
+#     - CVE-2021-28710 XSA-390
+#   4.15.1-r2:
+#     - CVE-2021-28704 XSA-388
+#     - CVE-2021-28707 XSA-388
+#     - CVE-2021-28708 XSA-388
+#     - CVE-2021-28705 XSA-389
+#     - CVE-2021-28709 XSA-389
+#   4.16.1-r0:
+#     - CVE-2022-23033 XSA-393
+#     - CVE-2022-23034 XSA-394
+#     - CVE-2022-23035 XSA-395
+#     - CVE-2022-26356 XSA-397
+#     - XSA-398
+#     - CVE-2022-26357 XSA-399
+#     - CVE-2022-26358 XSA-400
+#     - CVE-2022-26359 XSA-400
+#     - CVE-2022-26360 XSA-400
+#     - CVE-2022-26361 XSA-400
+#   4.16.1-r2:
+#     - CVE-2022-26362 XSA-401
+#     - CVE-2022-26363 XSA-402
+#     - CVE-2022-26364 XSA-402
+#   4.16.1-r3:
+#     - CVE-2022-21123 XSA-404
+#     - CVE-2022-21125 XSA-404
+#     - CVE-2022-21166 XSA-404
+#   4.16.1-r4:
+#     - CVE-2022-26365 XSA-403
+#     - CVE-2022-33740 XSA-403
+#     - CVE-2022-33741 XSA-403
+#     - CVE-2022-33742 XSA-403
+#   4.16.1-r5:
+#     - CVE-2022-23816 XSA-407
+#     - CVE-2022-23825 XSA-407
+#     - CVE-2022-29900 XSA-407
+#   4.16.1-r6:
+#     - CVE-2022-33745 XSA-408
+#   4.16.2-r1:
+#     - CVE-2022-42327 XSA-412
+#     - CVE-2022-42309 XSA-414
+#   4.16.2-r2:
+#     - CVE-2022-23824 XSA-422
+#   4.17.0-r0:
+#     - CVE-2022-42311 XSA-326
+#     - CVE-2022-42312 XSA-326
+#     - CVE-2022-42313 XSA-326
+#     - CVE-2022-42314 XSA-326
+#     - CVE-2022-42315 XSA-326
+#     - CVE-2022-42316 XSA-326
+#     - CVE-2022-42317 XSA-326
+#     - CVE-2022-42318 XSA-326
+#     - CVE-2022-33747 XSA-409
+#     - CVE-2022-33746 XSA-410
+#     - CVE-2022-33748 XSA-411
+#     - CVE-2022-33749 XSA-413
+#     - CVE-2022-42310 XSA-415
+#     - CVE-2022-42319 XSA-416
+#     - CVE-2022-42320 XSA-417
+#     - CVE-2022-42321 XSA-418
+#     - CVE-2022-42322 XSA-419
+#     - CVE-2022-42323 XSA-419
+#     - CVE-2022-42324 XSA-420
+#     - CVE-2022-42325 XSA-421
+#     - CVE-2022-42326 XSA-421
+#   4.17.0-r2:
+#     - CVE-2022-42330 XSA-425
+#     - CVE-2022-27672 XSA-426
+#   4.17.0-r5:
+#     - CVE-2022-42332 XSA-427
+#     - CVE-2022-42333 CVE-2022-43334 XSA-428
+#     - CVE-2022-42331 XSA-429
+#     - CVE-2022-42335 XSA-430
+#   4.17.1-r1:
+#     - CVE-2022-42336 XSA-431
+#   4.17.1-r3:
+#     - CVE-2023-20593 XSA-433
+#   4.17.1-r5:
+#     - CVE-2023-34320 XSA-436
+#   4.17.2-r0:
+#     - CVE-2023-20569 XSA-434
+#     - CVE-2022-40982 XSA-435
+#   4.17.2-r1:
+#     - CVE-2023-34321 XSA-437
+#     - CVE-2023-34322 XSA-438
+#   4.17.2-r2:
+#     - CVE-2023-20588 XSA-439
+#   4.17.2-r3:
+#     - CVE-2023-34323 XSA-440
+#     - CVE-2023-34326 XSA-442
+#     - CVE-2023-34325 XSA-443
+#     - CVE-2023-34327 XSA-444
+#     - CVE-2023-34328 XSA-444
+#   4.17.2-r4:
+#     - CVE-2023-46835 XSA-445
+#     - CVE-2023-46836 XSA-446
+#   4.18.0-r2:
+#     - CVE-2023-46837 XSA-447
+#   4.18.0-r3:
+#     - CVE-2023-46839 XSA-449
+#   4.18.0-r4:
+#     - CVE-2023-46841 XSA-451
+#   4.18.0-r5:
+#     - CVE-2023-28746 XSA-452
+#     - CVE-2024-2193 XSA-453
+#   4.18.2-r0:
+#     - CVE-2023-46842 XSA-454
+#     - CVE-2024-31142 XSA-455
+#     - CVE-2024-2201 XSA-456
 
 case "$CARCH" in
 x86*)
-	depends="$depends syslinux"
 	makedepends="$makedepends iasl seabios-bin"
 	;;
 arm*)
@@ -177,7 +389,9 @@ esac
 #	subpackages="$pkgname-dbg"
 #fi
 subpackages="$subpackages $pkgname-doc $pkgname-dev $pkgname-libs
-	$pkgname-hypervisor $pkgname-bridge"
+	$pkgname-hypervisor $pkgname-pyc $pkgname-bridge
+	$pkgname-bridge-openrc:bridge_openrc $pkgname-qemu
+	$pkgname-qemu-openrc:qemu_openrc $pkgname-bash-completion"
 
 # grep _VERSION= stubdom/configure
 _ZLIB_VERSION="1.2.3"
@@ -185,13 +399,12 @@ _LIBPCI_VERSION="2.2.9"
 _NEWLIB_VERSION="1.16.0"
 _LWIP_VERSION="1.3.0"
 _GRUB_VERSION="0.97"
-_OCAML_VERSION="4.02.0"
 _GMP_VERSION="4.3.2"
 _POLARSSL_VERSION="1.1.4"
 _TPMEMU_VERSION="0.7.4"
 
 # grep ^IPXE_GIT_TAG tools/firmware/etherboot/Makefile
-_IPXE_GIT_TAG=1dd56dbd11082fb622c2ed21cfaced4f47d798a6
+_IPXE_GIT_TAG=1d1cf74a5e58811822bee4b3da3cff7282fcdfca
 
 source="https://downloads.xenproject.org/release/xen/$pkgver/xen-$pkgver.tar.gz
 	https://xenbits.xen.org/xen-extfiles/gmp-$_GMP_VERSION.tar.bz2
@@ -209,19 +422,9 @@ source="https://downloads.xenproject.org/release/xen/$pkgver/xen-$pkgver.tar.gz
 
 	hotplug-vif-vtrill.patch
 
-	musl-hvmloader-fix-stdint.patch
-	stdint_local.h
-	elf_local.h
-
-	xen-hotplug-lockfd.patch
-	xen-fd-is-file.c
-
-	xenqemu-xattr-size-max.patch
-
 	hotplug-Linux-iscsi-block-handle-lun-1.patch
 
-	drop-test.py.patch
-	py3-compat.patch
+	stubdom-hack.patch
 
 	xenstored.initd
 	xenstored.confd
@@ -241,12 +444,13 @@ _seabios=/usr/share/seabios/bios-256k.bin
 
 # Override wrong arch detection from xen-$pkgver/Config.mk.
 case "$CARCH" in
-armhf) export XEN_TARGET_ARCH="arm32";;
+armv7) export XEN_TARGET_ARCH="arm32";;
 aarch64) export XEN_TARGET_ARCH="arm64";;
 esac
 
 prepare() {
-	local i _failed= _series=
+	default_prepare
+	local i
 
 	for i in $source; do
 		case $i in
@@ -257,9 +461,6 @@ prepare() {
 			cp "$srcdir"/$p tools/firmware/etherboot/patches/
 			echo "$p" >> tools/firmware/etherboot/patches/series
 			;;
-		*.patch) msg $i; patch -s -N -p1 -i "$srcdir"/$i \
-				|| _failed="$_failed $i"
-			;;
 		*/ipxe-git-*)
 			ln -s "$srcdir"/${i##*/} \
 				tools/firmware/etherboot/ipxe.tar.gz
@@ -269,28 +470,18 @@ prepare() {
 			;;
 		esac
 	done
-	if [ -n "$_failed" ]; then
-		error "Patches failed:"
-		for i in $_failed; do
-			echo $i
-		done
-		return 1
-	fi
-
-	# install our stdint_local.h and elf_local.h
-	install "$srcdir"/stdint_local.h "$srcdir"/elf_local.h \
-		"$builddir"/tools/firmware/
-	ln -s ../firmware/stdint_local.h "$builddir"/tools/libxl/
 
 	# remove all -Werror
 	msg "Eradicating -Werror..."
-	find . -name '*.mk' -o -name 'Make*' | xargs sed -i -e 's/-Werror//g'
+	find . \( -name '*.mk' -o -name 'Make*' \) -exec sed -i -e 's/-Werror//g' {} +
+
+	sed -e 's,^#include <sys/signal.h>$,#include <signal.h>,g' -i tools/qemu-xen/include/qemu/osdep.h
 
 	msg "Updating config.sub..."
 	update_config_sub
 
 	msg "Autoreconf..."
-	autoreconf
+	autoreconf --install
 
 	unset CFLAGS
 	unset LDFLAGS
@@ -306,22 +497,34 @@ munge_cflags() {
 	unset LDFLAGS
 	unset LANG
 	unset LC_ALL
-
-	case "$CARCH" in
-	armhf) export CFLAGS="-mcpu=cortex-a15";;
-	aarch64) export CFLAGS="-mcpu=cortex-a53";;
-	esac
 }
 
 # These tasks are added as separate tasks to enable a packager
 # to invoke specific tasks like building the hypervisor.  i.e.
 #    $ abuild configure build_tools
 configure() {
-	msg "Running configure..."
-	./configure --prefix=/usr \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--with-system-seabios=$_seabios
+	case "$CARCH" in
+	x86*)
+		msg "Running configure..."
+		./configure --prefix=/usr \
+			--build=$CBUILD \
+			--host=$CHOST \
+			--with-system-seabios=$_seabios \
+			--enable-9pfs \
+			--enable-qemu-traditional \
+			--enable-pv-grub \
+			--disable-golang
+		;;
+	*)
+		msg "Running configure..."
+		./configure --prefix=/usr \
+			--build=$CBUILD \
+			--host=$CHOST \
+			--with-system-seabios=$_seabios \
+			--enable-9pfs \
+			--disable-golang
+		;;
+	esac
 }
 
 build_hypervisor() {
@@ -335,7 +538,7 @@ build_tools() {
 	munge_cflags
 
 	msg "Building tools..."
-	make tools
+	NO_WERROR=1 make tools
 }
 
 build_docs() {
@@ -360,20 +563,20 @@ build() {
 	case "$CARCH" in
 	x86*) build_stubdom;;
 	esac
-
-	${CC:-gcc} -o xen-fd-is-file "$srcdir"/xen-fd-is-file.c
 }
 
 package() {
+	munge_cflags
 
-	unset CFLAGS
-	unset LDFLAGS
-
-	make -j1 DESTDIR="$pkgdir" install-xen install-tools install-docs
+	local _studom=
 	case "$CARCH" in
-	x86*) make -j1 DESTDIR="$pkgdir" install-stubdom;;
+		x86*) _stubdom=install-stubdom;;
 	esac
 
+	make DESTDIR="$pkgdir" EFI_DIR=/usr/lib/efi \
+		BASH_COMPLETION_DIR=/usr/share/bash-completion/completions \
+		install-xen install-tools install-docs $_stubdom
+
 	# remove default xencommons
 	rm -rf "$pkgdir"/etc/init.d/xencommons
 	# remove default xendriverdomain
@@ -390,8 +593,6 @@ package() {
 	install -Dm644 "$srcdir"/xen-consoles.logrotate \
 		"$pkgdir"/etc/xen/xen-consoles.logrotate
 
-	install -m755 xen-fd-is-file "$pkgdir"/usr/lib/xen/bin/xen-fd-is-file
-
 	# we need to exclude /usr/share when stripping
 	msg "Stripping binaries"
 	scanelf --recursive --nobanner --etype "ET_DYN,ET_EXEC" "$pkgdir"/usr/lib \
@@ -420,14 +621,32 @@ hypervisor() {
 	depends=
 	mkdir -p "$subpkgdir"
 	mv "$pkgdir"/boot "$subpkgdir"/
+	if [ -d "$pkgdir"/usr/lib/efi ]; then
+		mkdir -p "$subpkgdir"/usr/lib
+		mv "$pkgdir"/usr/lib/efi "$subpkgdir"/usr/lib/
+	fi
 }
 
 bridge() {
 	depends="dnsmasq"
 	pkgdesc="Bridge interface for XEN with dhcp"
+
+	mkdir -p "$subpkgdir"/etc/xen
+
+	cat ->>"$subpkgdir"/etc/xen/dnsmasq.conf <<EOF
+		#dhcp-host=somehost,10.0.4.3
+		#dhcp-host=otherhost,10.0.4.4
+EOF
+
+}
+
+bridge_openrc() {
+	depends=
+	pkgdesc="Bridge interface for XEN with dhcp (OpenRC init scripts)"
+	install_if="openrc ${subpkgname%-openrc}=$pkgver-r$pkgrel"
+
 	mkdir -p "$subpkgdir"/etc/conf.d \
-		"$subpkgdir"/etc/init.d \
-		"$subpkgdir"/etc/xen
+		"$subpkgdir"/etc/init.d
 
 	ln -s dnsmasq "$subpkgdir"/etc/init.d/dnsmasq.xenbr0
 	cat ->>"$subpkgdir"/etc/conf.d/dnsmasq.xenbr0 <<EOF
@@ -439,14 +658,52 @@ bridge() {
 		BRIDGE_MAC="00:16:3f:00:00:00"
 		DNSMASQ_CONFFILE="/etc/xen/dnsmasq.conf"
 EOF
-	cat ->>"$subpkgdir"/etc/xen/dnsmasq.conf <<EOF
-		#dhcp-host=somehost,10.0.4.3
-		#dhcp-host=otherhost,10.0.4.4
-EOF
+}
+
+qemu() {
+	pkgdesc="QEMU for XEN"
+	case "$CARCH" in
+	x86*)
+		depends="$depends seabios-bin"
+		;;
+	esac
+	mkdir -p "$subpkgdir"/usr/lib/xen/bin \
+		"$subpkgdir"/usr/share/applications
+
+	amove usr/lib/xen/bin/qemu*
+	mv "$pkgdir"/usr/share/qemu-xen/applications/qemu.desktop \
+		"$subpkgdir"/usr/share/applications/qemu-xen.desktop
+	amove usr/share/qemu-xen
+
+	case "$CARCH" in
+	x86*)
+		# these files are only in the x86* builds
+		amove usr/lib/xen/libexec/qemu-bridge-helper
+		# qemu-traditional files not caught above
+		mkdir -p "$subpkgdir"/usr/lib/xen/bin "$subpkgdir"/usr/lib/xen/boot
+		amove usr/share/xen/qemu
+		amove usr/bin/qemu-img-xen
+		amove usr/bin/qemu-nbd-xen
+		amove etc/xen/scripts/qemu-ifup
+		amove usr/lib/xen/bin/stubdom-dm
+		amove usr/lib/xen/bin/stubdompath.sh
+		amove usr/lib/xen/boot/ioemu-stubdom.gz
+		amove usr/lib/xen/boot/ipxe.bin
+		;;
+	esac
+}
+
+qemu_openrc() {
+	depends=
+	pkgdesc="QEMU for XEN (OpenRC init scripts)"
+	install_if="openrc ${subpkgname%-openrc}=$pkgver-r$pkgrel"
 
+	amove etc/conf.d/xenqemu
+	amove etc/init.d/xenqemu
 }
 
-sha512sums="5b2ded9a2fe3f7ddf40eed1fa9858baead06233a01eb6099cc45b3c78b6c3823acfe7b731910733e87125dfa49d08c53f74c215fb1b320a92b44b87a0a105225  xen-4.13.0.tar.gz
+sha512sums="
+c5feb450155883b5d2e7f43b05a64e7215b661b7d2f438d8f5a0896bd57283379ee11ca8e2e7a1d8787813cc6f1a260253fcb8688ed7d61a2bfb636db1626941  xen-4.18.2.tar.gz
 2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf  gmp-4.3.2.tar.bz2
 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb  grub-0.97.tar.gz
 1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d  lwip-1.3.0.tar.gz
@@ -455,28 +712,22 @@ c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a36
 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad  polarssl-1.1.4-gpl.tgz
 4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35  tpm_emulator-0.7.4.tar.gz
 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e  zlib-1.2.3.tar.gz
-8120696ba6d79fd9189664deed9b0489825d8d1edf7b931023b3979b7b9f82248e5b808c4517036cd40a85442ddf51a8dcad3b05d7f3c3cc6650654d53da4050  ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz
+e27644cbb030c43e2841058003bedea6deb979ba71591f967e01312527ed869bb863f9a03fc7b5a266752433d30164929ea1b935953a245600ad713c9fb25cb5  ipxe-git-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz
 b9c754220187955d01ffbb6e030dace9d9aaae755db1765d07e407858c71a2cb0de04e0ab2099cd121d9e1bc1978af06c7dbd2fd805e06eca12ac5d527f15a52  mini-os-__divmoddi4.patch
-1936ab39a1867957fa640eb81c4070214ca4856a2743ba7e49c0cd017917071a9680d015f002c57fa7b9600dbadd29dcea5887f50e6c133305df2669a7a933f3  qemu-xen_paths.patch
-f095ea373f36381491ad36f0662fb4f53665031973721256b23166e596318581da7cbb0146d0beb2446729adfdb321e01468e377793f6563a67d68b8b0f7ffe3  hotplug-vif-vtrill.patch
-77b08e9655e091b0352e4630d520b54c6ca6d659d1d38fbb4b3bfc9ff3e66db433a2e194ead32bb10ff962c382d800a670e82b7a62835b238e294b22808290ea  musl-hvmloader-fix-stdint.patch
-8c3b57eab8641bcee3dbdc1937ea7874f77b9722a5a0aa3ddb8dff8cc0ced7e19703ef5d998621b3809bea7c16f3346cfa47610ec9ab014ad0de12651c94e5ff  stdint_local.h
-853467a2d055c5bfbdc7bdca175a334241be44a7c5ac3c0a84a4bc5463b5c070b66d37e2a557429ef860727a6b7350683af758cc2494d85b6be4d883143a2c0d  elf_local.h
-79cb1b6b81b17cb87a064dfe3548949dfb80f64f203cac11ef327102b7a25794549ce2d9c019ebf05f752214da8e05065e9219d069e679c0ae5bee3d090c685e  xen-hotplug-lockfd.patch
-e76816c6ad0e91dc5f81947f266da3429b20e6d976c3e8c41202c6179532eec878a3f0913921ef3ac853c5dbad8082da3c9cd53b65081910516feb492577b7fc  xen-fd-is-file.c
-2094ea964fa610b2bf72fd2c7ede7e954899a75c0f5b08030cf1d74460fb759ade84866176e32f8fe29c921dfdc6dafd2b31e23ab9b0a3874d3dceeabdd1913b  xenqemu-xattr-size-max.patch
+15de6a62394ef9f338fbe25a434fe5c3725abef5fd98966b863e14a58dc447014c49ed890c4d469f60d63a0db763f3e84f0407201d71eb9bfe42a00054eee1d8  qemu-xen_paths.patch
+1c9cb24bf67a2e84466572198315d5501627addf1ccd55d8d83df8d77d269a6696cd45e4a55601495168284e3bff58fb39853f56c46aaddd14f6191821678cf6  hotplug-vif-vtrill.patch
 8c9cfc6afca325df1d8026e21ed03fa8cd2c7e1a21a56cc1968301c5ab634bfe849951899e75d328951d7a41273d1e49a2448edbadec0029ed410c43c0549812  hotplug-Linux-iscsi-block-handle-lun-1.patch
-61f66bab603778fb41bfe8e85320c15f2bf3e5d8583e077b56a93784dbdb9b2c7c5e55ce18f06b87501429086f8410d102d3ed5f2a77d54bcfa328bc07681f4d  drop-test.py.patch
-8cb12dbfc05a53898a97d47d71ab6b8a6f81c5e5579fd765b37303faea95c645cb8dedc05e3d064bdf070e93814e00bf8939767acc1127513375bab0fe2f4436  py3-compat.patch
-52c43beb2596d645934d0f909f2d21f7587b6898ed5e5e7046799a8ed6d58f7a09c5809e1634fa26152f3fd4f3e7cfa07da7076f01b4a20cc8f5df8b9cb77e50  xenstored.initd
+ed0ab25cd1966df7df503d285c17ede434033665d1569f8fb28172f37a10222b30d662e2ea867519eb40843de58dc3a56883d6f66a4fafa0a6ee1056ba72c25d  stubdom-hack.patch
+9430940692d6bfb58b1438e0f5f84cb703fbca9ce9cc157a1313ab1ceff63222a1ae31c991543b20c8fc84300df2b22f4614b27bbff32f82e17f27fcd953143c  xenstored.initd
 093f7fbd43faf0a16a226486a0776bade5dc1681d281c5946a3191c32d74f9699c6bf5d0ab8de9d1195a2461165d1660788e92a3156c9b3c7054d7b2d52d7ff0  xenstored.confd
-3c86ed48fbee0af4051c65c4a3893f131fa66e47bf083caf20c9b6aa4b63fdead8832f84a58d0e27964bc49ec8397251b34e5be5c212c139f556916dc8da9523  xenconsoled.initd
+1dd04f4bf1890771aa7eef0b6e46f7139487da0907d28dcdbef9fbe335dcf731ca391cfcb175dd82924f637a308de00a69ae981f67348c34f04489ec5e5dc3b7  xenconsoled.initd
 30df69cc38d0bed26bc4d6e08a2b62cbdc654d5f663009a05cb3b83b3e3dc5e206362d3fd59abbb753ceb8d6d79eaa6e15d079bb8f4f35dc74667103faf4e85d  xenconsoled.confd
-b0526e2fd41aefc69894a8b5c92f6b219919e6ef33e664760329c2fb33e5abd736ebe57e603047193d81533ecab58a708ef50d41e46b04c9310029ebd10fb0f6  xendomains.initd
+71d464464130fbac0ffe6ce06337d8032b4a03a9da5fbb313b26538946d122f2531ef91e258faaff2636b29514cbb65ec0f62615a48437a8383f24f7e59df685  xendomains.initd
 c7c0eecd5f454d903b57a710902da27dcb2c6b200f88d4eadfab33a447be6b41454109d482aab849a690446ea5c928e619dfc6cf95b7955f00a476f2317bb82b  xendomains.confd
 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426  xen-consoles.logrotate
 bdbe15c924071cdc2d0f23e53ba8e3f837d4b5369bfb218abd3405f9bef25d105269aaf0784baeb69c073a5786b8c82ffdfd414e86874da34293cfdc2c497928  xenqemu.confd
-8475119369409efb8ad930c7735cd3d782191d18fab4fc322a51120c395162ff88e381182876036d1078afd30079dbf3f94a3568689e9b52ba235adead4b97d3  xenqemu.initd
-85afec835a374aac3d307b3226eee7a08a676b1daac7e39bb7463d564ef72438dc27dd188a871cfd031e80c6992b756951f26bdca0d445e07eab6dba5245de46  xendriverdomain.initd
+b833ed7334d912b519f317caefcf278274964838ca5588a0d58d9e91817e6c5519eab42521b78f7fc307ad24f25934e4f5d5d1097f783a847fc22d2cc38b27b5  xenqemu.initd
+bc40f7c0548162ce2181b34ea39064c0e1c529af95e0a282c78879916036cf7ac3c2cb7c433f8702a9fffe6e9257707d25fdccb6f8d045aef78b5e251a476309  xendriverdomain.initd
 a46337bebce24337f00adbe08095b9f5128c1f440e2033329e5ace9fd817a31fb772d75c0ecc7cc06f34b1522ebf8b21874ee4d0881a0f29851b1c1235f29cf3  xen-pci.initd
-2db5fa6edeeb028236460029b976a849f22b3a15d3929acc3911dc41f365b471c2b815eb111639bc230a69528b1571f3c2e9e8e1e81a6679e55387e39355aa99  xen-pci.confd"
+2db5fa6edeeb028236460029b976a849f22b3a15d3929acc3911dc41f365b471c2b815eb111639bc230a69528b1571f3c2e9e8e1e81a6679e55387e39355aa99  xen-pci.confd
+"
diff --git a/main/xen/drop-test.py.patch b/main/xen/drop-test.py.patch
deleted file mode 100644
index 5ff5cfe52e6..00000000000
--- a/main/xen/drop-test.py.patch
+++ /dev/null
@@ -1,1230 +0,0 @@
-From 0cd791c499bdc698d14a24050ec56d60b45732e0 Mon Sep 17 00:00:00 2001
-From: Andrew Cooper <andrew.cooper3@citrix.com>
-Date: Wed, 18 Dec 2019 12:43:48 +0000
-Subject: [PATCH] tools/python: Drop test.py
-
-This file hasn't been touched since it was introduced in 2005 (c/s 0c6f36628)
-and has a wildly obsolete shebang for Python 2.3.  Most importantly for us is
-that it isn't Python 3 compatible.
-
-Drop the file entirely.  Since the 2.3 days, automatic discovery of tests has
-been included in standard functionality.  Rewrite the test rule to use
-"$(PYTHON) -m unittest discover" which is equivelent.
-
-Dropping test.py drops the only piece of ZPL-2.0 code in the tree.  Drop the
-ancillary files, and adjust COPYING to match.
-
-Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Acked-by: Wei Liu <wl@xen.org>
-Reviewed-by: Lars Kurth <lars.kurth@citrix.com>
----
- COPYING               |    1 -
- tools/python/Makefile |    2 +-
- tools/python/README   |    3 -
- tools/python/ZPL-2.0  |   59 ---
- tools/python/test.py  | 1094 -----------------------------------------
- 5 files changed, 1 insertion(+), 1158 deletions(-)
- delete mode 100644 tools/python/README
- delete mode 100644 tools/python/ZPL-2.0
- delete mode 100644 tools/python/test.py
-
-diff --git a/COPYING b/COPYING
-index 80fac091d318..a4bc2b2dd43e 100644
---- a/COPYING
-+++ b/COPYING
-@@ -57,7 +57,6 @@ Xen tree, retaining the original license, such as
-   - Laurikari License
-   - Public Domain
-   - ZLIB License
--  - ZPL 2.0
- 
- Significant code imports are highlighted in a README.source file
- in the directory into which the file or code snippet was imported.
-diff --git a/tools/python/Makefile b/tools/python/Makefile
-index 541858e2f886..e99f78a5373a 100644
---- a/tools/python/Makefile
-+++ b/tools/python/Makefile
-@@ -33,7 +33,7 @@ uninstall:
- 
- .PHONY: test
- test:
--	export LD_LIBRARY_PATH=$$(readlink -f ../libxc):$$(readlink -f ../xenstore); $(PYTHON) test.py -b -u
-+	LD_LIBRARY_PATH=$$(readlink -f ../libxc):$$(readlink -f ../xenstore) $(PYTHON) -m unittest discover
- 
- .PHONY: clean
- clean:
-diff --git a/tools/python/README b/tools/python/README
-deleted file mode 100644
-index 8fffef3a0023..000000000000
---- a/tools/python/README
-+++ /dev/null
-@@ -1,3 +0,0 @@
--The file test.py here is from the Zope project, and is Copyright (c) 2001,
--2002 Zope Corporation and Contributors.  This file is released under the Zope
--Public License, version 2.0, a copy of which is in the file ZPL-2.0.
-diff --git a/tools/python/ZPL-2.0 b/tools/python/ZPL-2.0
-deleted file mode 100644
-index 5582f08b8999..000000000000
---- a/tools/python/ZPL-2.0
-+++ /dev/null
-@@ -1,59 +0,0 @@
--Zope Public License (ZPL) Version 2.0
-------------------------------------------------
--
--This software is Copyright (c) Zope Corporation (tm) and
--Contributors. All rights reserved.
--
--This license has been certified as open source. It has also
--been designated as GPL compatible by the Free Software
--Foundation (FSF).
--
--Redistribution and use in source and binary forms, with or
--without modification, are permitted provided that the
--following conditions are met:
--
--1. Redistributions in source code must retain the above
--   copyright notice, this list of conditions, and the following
--   disclaimer.
--
--2. Redistributions in binary form must reproduce the above
--   copyright notice, this list of conditions, and the following
--   disclaimer in the documentation and/or other materials
--   provided with the distribution.
--
--3. The name Zope Corporation (tm) must not be used to
--   endorse or promote products derived from this software
--   without prior written permission from Zope Corporation.
--
--4. The right to distribute this software or to use it for
--   any purpose does not give you the right to use Servicemarks
--   (sm) or Trademarks (tm) of Zope Corporation. Use of them is
--   covered in a separate agreement (see
--   http://www.zope.com/Marks).
--
--5. If any files are modified, you must cause the modified
--   files to carry prominent notices stating that you changed
--   the files and the date of any change.
--
--Disclaimer
--
--  THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ``AS IS''
--  AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
--  NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
--  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
--  NO EVENT SHALL ZOPE CORPORATION OR ITS CONTRIBUTORS BE
--  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
--  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
--  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
--  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
--  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
--  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
--  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
--  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
--  DAMAGE.
--
--
--This software consists of contributions made by Zope
--Corporation and many individuals on behalf of Zope
--Corporation.  Specific attributions are listed in the
--accompanying credits file.
-\ No newline at end of file
-diff --git a/tools/python/test.py b/tools/python/test.py
-deleted file mode 100644
-index 13912f61a631..000000000000
---- a/tools/python/test.py
-+++ /dev/null
-@@ -1,1094 +0,0 @@
--#! /usr/bin/env python2.3
--##############################################################################
--#
--# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
--# All Rights Reserved.
--#
--# This software is subject to the provisions of the Zope Public License,
--# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
--# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
--# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
--# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
--# FOR A PARTICULAR PURPOSE.
--#
--##############################################################################
--"""
--test.py [-abBcdDfFgGhklLmMPprstTuUv] [modfilter [testfilter]]
--
--Find and run tests written using the unittest module.
--
--The test runner searches for Python modules that contain test suites.
--It collects those suites, and runs the tests.  There are many options
--for controlling how the tests are run.  There are options for using
--the debugger, reporting code coverage, and checking for refcount problems.
--
--The test runner uses the following rules for finding tests to run.  It
--searches for packages and modules that contain "tests" as a component
--of the name, e.g. "frob.tests.nitz" matches this rule because tests is
--a sub-package of frob.  Within each "tests" package, it looks for
--modules that begin with the name "test."  For each test module, it
--imports the module and calls the module's test_suite() function, which must
--return a unittest TestSuite object.
--
--Options can be specified as command line arguments (see below). However,
--options may also be specified in a file named 'test.config', a Python
--script which, if found, will be executed before the command line
--arguments are processed.
--
--The test.config script should specify options by setting zero or more of the
--global variables: LEVEL, BUILD, and other capitalized variable names found in
--the test runner script (see the list of global variables in process_args().).
--
--
---a level
----at-level level
----all
--    Run the tests at the given level.  Any test at a level at or below
--    this is run, any test at a level above this is not run.  Level 0
--    runs all tests.  The default is to run tests at level 1.  --all is
--    a shortcut for -a 0.
--
---b
----build
--    Run "python setup.py build" before running tests, where "python"
--    is the version of python used to run test.py.  Highly recommended.
--    Tests will be run from the build directory.
--
---B
----build-inplace
--    Run "python setup.py build_ext -i" before running tests.  Tests will be
--    run from the source directory.
--
---c
----pychecker
--    use pychecker
--
---d
----debug
--    Instead of the normal test harness, run a debug version which
--    doesn't catch any exceptions.  This is occasionally handy when the
--    unittest code catching the exception doesn't work right.
--    Unfortunately, the debug harness doesn't print the name of the
--    test, so Use With Care.
--
---D
----debug-inplace
--    Works like -d, except that it loads pdb when an exception occurs.
--
----dir directory
---s directory
--    Option to limit where tests are searched for. This is important
--    when you *really* want to limit the code that gets run.  This can
--    be specified more than once to run tests in two different parts of
--    the source tree.
--    For example, if refactoring interfaces, you don't want to see the way
--    you have broken setups for tests in other packages. You *just* want to
--    run the interface tests.
--
---f
----skip-unit
--    Run functional tests but not unit tests.
--    Note that functional tests will be skipped if the module
--    zope.app.tests.functional cannot be imported.
--    Functional tests also expect to find the file ftesting.zcml,
--    which is used to configure the functional-test run.
--
---F
--    DEPRECATED. Run both unit and functional tests.
--    This option is deprecated, because this is the new default mode.
--    Note that functional tests will be skipped if the module
--    zope.app.tests.functional cannot be imported.
--
---g threshold
----gc-threshold threshold
--    Set the garbage collector generation0 threshold.  This can be used
--    to stress memory and gc correctness.  Some crashes are only
--    reproducible when the threshold is set to 1 (agressive garbage
--    collection).  Do "-g 0" to disable garbage collection altogether.
--
---G gc_option
----gc-option gc_option
--    Set the garbage collection debugging flags.  The argument must be one
--    of the DEBUG_ flags defined bythe Python gc module.  Multiple options
--    can be specified by using "-G OPTION1 -G OPTION2."
--
---k
----keepbytecode
--    Do not delete all stale bytecode before running tests
--
---l test_root
----libdir test_root
--    Search for tests starting in the specified start directory
--    (useful for testing components being developed outside the main
--    "src" or "build" trees).
--
---L
----loop
--    Keep running the selected tests in a loop.  You may experience
--    memory leakage.
--
---m
---M  minimal GUI. See -U.
--
---P
----profile
--    Run the tests under hotshot and display the top 50 stats, sorted by
--    cumulative time and number of calls.
--
---p
----progress
--    Show running progress.  It can be combined with -v or -vv.
--
---r
----refcount
--    Look for refcount problems.
--    This requires that Python was built --with-pydebug.
--
---t
----top-fifty
--    Time the individual tests and print a list of the top 50, sorted from
--    longest to shortest.
--
----times n
----times outfile
--    With an integer argument, time the tests and print a list of the top <n>
--    tests, sorted from longest to shortest.
--    With a non-integer argument, specifies a file to which timing information
--    is to be printed.
--
---T
----trace
--    Use the trace module from Python for code coverage.  The current
--    utility writes coverage files to a directory named `coverage' that
--    is parallel to `build'.  It also prints a summary to stdout.
--
---u
----skip-functional
--    CHANGED. Run unit tests but not functional tests.
--    Note that the meaning of -u is changed from its former meaning,
--    which is now specified by -U or --gui.
--
---U
----gui
--    Use the PyUnit GUI instead of output to the command line.  The GUI
--    imports tests on its own, taking care to reload all dependencies
--    on each run.  The debug (-d), verbose (-v), progress (-p), and
--    Loop (-L) options will be ignored.  The testfilter filter is also
--    not applied.
--
---m
---M
----minimal-gui
--    Note: -m is DEPRECATED in favour of -M or --minimal-gui.
--    -m starts the gui minimized.  Double-clicking the progress bar
--    will start the import and run all tests.
--
--
---v
----verbose
--    Verbose output.  With one -v, unittest prints a dot (".") for each
--    test run.  With -vv, unittest prints the name of each test (for
--    some definition of "name" ...).  With no -v, unittest is silent
--    until the end of the run, except when errors occur.
--
--    When -p is also specified, the meaning of -v is slightly
--    different.  With -p and no -v only the percent indicator is
--    displayed.  With -p and -v the test name of the current test is
--    shown to the right of the percent indicator.  With -p and -vv the
--    test name is not truncated to fit into 80 columns and it is not
--    cleared after the test finishes.
--
--
--modfilter
--testfilter
--    Case-sensitive regexps to limit which tests are run, used in search
--    (not match) mode.
--    In an extension of Python regexp notation, a leading "!" is stripped
--    and causes the sense of the remaining regexp to be negated (so "!bc"
--    matches any string that does not match "bc", and vice versa).
--    By default these act like ".", i.e. nothing is excluded.
--
--    modfilter is applied to a test file's path, starting at "build" and
--    including (OS-dependent) path separators.
--
--    testfilter is applied to the (method) name of the unittest methods
--    contained in the test files whose paths modfilter matched.
--
--Extreme (yet useful) examples:
--
--    test.py -vvb . "^testWriteClient$"
--
--    Builds the project silently, then runs unittest in verbose mode on all
--    tests whose names are precisely "testWriteClient".  Useful when
--    debugging a specific test.
--
--    test.py -vvb . "!^testWriteClient$"
--
--    As before, but runs all tests whose names aren't precisely
--    "testWriteClient".  Useful to avoid a specific failing test you don't
--    want to deal with just yet.
--
--    test.py -M . "!^testWriteClient$"
--
--    As before, but now opens up a minimized PyUnit GUI window (only showing
--    the progress bar).  Useful for refactoring runs where you continually want
--    to make sure all tests still pass.
--"""
--
--import gc
--import hotshot, hotshot.stats
--import os
--import re
--import pdb
--import sys
--import threading    # just to get at Thread objects created by tests
--import time
--import traceback
--import unittest
--import warnings
--
--def set_trace_doctest(stdin=sys.stdin, stdout=sys.stdout, trace=pdb.set_trace):
--    sys.stdin = stdin
--    sys.stdout = stdout
--    trace()
--
--pdb.set_trace_doctest = set_trace_doctest
--
--from distutils.util import get_platform
--
--PLAT_SPEC = "%s-%s" % (get_platform(), sys.version[0:3])
--
--class ImmediateTestResult(unittest._TextTestResult):
--
--    __super_init = unittest._TextTestResult.__init__
--    __super_startTest = unittest._TextTestResult.startTest
--    __super_printErrors = unittest._TextTestResult.printErrors
--
--    def __init__(self, stream, descriptions, verbosity, debug=False,
--                 count=None, progress=False):
--        self.__super_init(stream, descriptions, verbosity)
--        self._debug = debug
--        self._progress = progress
--        self._progressWithNames = False
--        self.count = count
--        self._testtimes = {}
--        if progress and verbosity == 1:
--            self.dots = False
--            self._progressWithNames = True
--            self._lastWidth = 0
--            self._maxWidth = 80
--            try:
--                import curses
--            except ImportError:
--                pass
--            else:
--                curses.setupterm()
--                self._maxWidth = curses.tigetnum('cols')
--            self._maxWidth -= len("xxxx/xxxx (xxx.x%): ") + 1
--
--    def stopTest(self, test):
--        self._testtimes[test] = time.time() - self._testtimes[test]
--        if gc.garbage:
--            print "The following test left garbage:"
--            print test
--            print gc.garbage
--            # XXX Perhaps eat the garbage here, so that the garbage isn't
--            #     printed for every subsequent test.
--
--        # Did the test leave any new threads behind?
--        new_threads = [t for t in threading.enumerate()
--                         if (t.isAlive()
--                             and
--                             t not in self._threads)]
--        if new_threads:
--            print "The following test left new threads behind:"
--            print test
--            print "New thread(s):", new_threads
--
--    def print_times(self, stream, count=None):
--        results = self._testtimes.items()
--        results.sort(lambda x, y: cmp(y[1], x[1]))
--        if count:
--            n = min(count, len(results))
--            if n:
--                print >>stream, "Top %d longest tests:" % n
--        else:
--            n = len(results)
--        if not n:
--            return
--        for i in range(n):
--            print >>stream, "%6dms" % int(results[i][1] * 1000), results[i][0]
--
--    def _print_traceback(self, msg, err, test, errlist):
--        if self.showAll or self.dots or self._progress:
--            self.stream.writeln("\n")
--            self._lastWidth = 0
--
--        tb = "".join(traceback.format_exception(*err))
--        self.stream.writeln(msg)
--        self.stream.writeln(tb)
--        errlist.append((test, tb))
--
--    def startTest(self, test):
--        if self._progress:
--            self.stream.write("\r%4d" % (self.testsRun + 1))
--            if self.count:
--                self.stream.write("/%d (%5.1f%%)" % (self.count,
--                                  (self.testsRun + 1) * 100.0 / self.count))
--            if self.showAll:
--                self.stream.write(": ")
--            elif self._progressWithNames:
--                # XXX will break with multibyte strings
--                name = self.getShortDescription(test)
--                width = len(name)
--                if width < self._lastWidth:
--                    name += " " * (self._lastWidth - width)
--                self.stream.write(": %s" % name)
--                self._lastWidth = width
--            self.stream.flush()
--        self._threads = threading.enumerate()
--        self.__super_startTest(test)
--        self._testtimes[test] = time.time()
--
--    def getShortDescription(self, test):
--        s = self.getDescription(test)
--        if len(s) > self._maxWidth:
--            pos = s.find(" (")
--            if pos >= 0:
--                w = self._maxWidth - (pos + 5)
--                if w < 1:
--                    # first portion (test method name) is too long
--                    s = s[:self._maxWidth-3] + "..."
--                else:
--                    pre = s[:pos+2]
--                    post = s[-w:]
--                    s = "%s...%s" % (pre, post)
--        return s[:self._maxWidth]
--
--    def addError(self, test, err):
--        if self._progress:
--            self.stream.write("\r")
--        if self._debug:
--            raise err[0], err[1], err[2]
--        self._print_traceback("Error in test %s" % test, err,
--                              test, self.errors)
--
--    def addFailure(self, test, err):
--        if self._progress:
--            self.stream.write("\r")
--        if self._debug:
--            raise err[0], err[1], err[2]
--        self._print_traceback("Failure in test %s" % test, err,
--                              test, self.failures)
--
--    def printErrors(self):
--        if self._progress and not (self.dots or self.showAll):
--            self.stream.writeln()
--        self.__super_printErrors()
--
--    def printErrorList(self, flavor, errors):
--        for test, err in errors:
--            self.stream.writeln(self.separator1)
--            self.stream.writeln("%s: %s" % (flavor, self.getDescription(test)))
--            self.stream.writeln(self.separator2)
--            self.stream.writeln(err)
--
--
--class ImmediateTestRunner(unittest.TextTestRunner):
--
--    __super_init = unittest.TextTestRunner.__init__
--
--    def __init__(self, **kwarg):
--        debug = kwarg.get("debug")
--        if debug is not None:
--            del kwarg["debug"]
--        progress = kwarg.get("progress")
--        if progress is not None:
--            del kwarg["progress"]
--        profile = kwarg.get("profile")
--        if profile is not None:
--            del kwarg["profile"]
--        self.__super_init(**kwarg)
--        self._debug = debug
--        self._progress = progress
--        self._profile = profile
--        # Create the test result here, so that we can add errors if
--        # the test suite search process has problems.  The count
--        # attribute must be set in run(), because we won't know the
--        # count until all test suites have been found.
--        self.result = ImmediateTestResult(
--            self.stream, self.descriptions, self.verbosity, debug=self._debug,
--            progress=self._progress)
--
--    def _makeResult(self):
--        # Needed base class run method.
--        return self.result
--
--    def run(self, test):
--        self.result.count = test.countTestCases()
--        if self._debug:
--            club_debug(test)
--        if self._profile:
--            prof = hotshot.Profile("tests_profile.prof")
--            args = (self, test)
--            r = prof.runcall(unittest.TextTestRunner.run, *args)
--            prof.close()
--            stats = hotshot.stats.load("tests_profile.prof")
--            stats.sort_stats('cumulative', 'calls')
--            stats.print_stats(50)
--            return r
--        return unittest.TextTestRunner.run(self, test)
--
--def club_debug(test):
--    # Beat a debug flag into debug-aware test cases
--    setDebugModeOn = getattr(test, 'setDebugModeOn', None)
--    if setDebugModeOn is not None:
--        setDebugModeOn()
--
--    for subtest in getattr(test, '_tests', ()):
--        club_debug(subtest)
--
--# setup list of directories to put on the path
--class PathInit:
--    def __init__(self, build, build_inplace, libdir=None):
--        self.inplace = None
--        # Figure out if we should test in-place or test in-build.  If the -b
--        # or -B option was given, test in the place we were told to build in.
--        # Otherwise, we'll look for a build directory and if we find one,
--        # we'll test there, otherwise we'll test in-place.
--        if build:
--            self.inplace = build_inplace
--        if self.inplace is None:
--            # Need to figure it out
--            if os.path.isdir(os.path.join("build", "lib.%s" % PLAT_SPEC)):
--                self.inplace = False
--            else:
--                self.inplace = True
--        # Calculate which directories we're going to add to sys.path, and cd
--        # to the appropriate working directory
--        self.org_cwd = os.getcwd()
--        if self.inplace:
--            self.libdir = "src"
--        else:
--            self.libdir = "lib.%s" % PLAT_SPEC
--            os.chdir("build")
--        # Hack sys.path
--        self.cwd = os.getcwd()
--        sys.path.insert(0, os.path.join(self.cwd, self.libdir))
--        # Hack again for external products.
--        global functional
--        kind = functional and "FUNCTIONAL" or "UNIT"
--        if libdir:
--            extra = os.path.join(self.org_cwd, libdir)
--            print "Running %s tests from %s" % (kind, extra)
--            self.libdir = extra
--            sys.path.insert(0, extra)
--        else:
--            print "Running %s tests from %s" % (kind, self.cwd)
--        # Make sure functional tests find ftesting.zcml
--        if functional:
--            config_file = 'ftesting.zcml'
--            if not self.inplace:
--                # We chdired into build, so ftesting.zcml is in the
--                # parent directory
--                config_file = os.path.join('..', 'ftesting.zcml')
--            print "Parsing %s" % config_file
--            from zope.app.tests.functional import FunctionalTestSetup
--            FunctionalTestSetup(config_file)
--
--def match(rx, s):
--    if not rx:
--        return True
--    if rx[0] == "!":
--        return re.search(rx[1:], s) is None
--    else:
--        return re.search(rx, s) is not None
--
--class TestFileFinder:
--    def __init__(self, prefix):
--        self.files = []
--        self._plen = len(prefix)
--        if not prefix.endswith(os.sep):
--            self._plen += 1
--        global functional
--        if functional:
--            self.dirname = "ftests"
--        else:
--            self.dirname = "tests"
--
--    def visit(self, rx, dir, files):
--        if os.path.split(dir)[1] != self.dirname:
--            # Allow tests/ftests module rather than package.
--            modfname = self.dirname + '.py'
--            if modfname in files:
--                path = os.path.join(dir, modfname)
--                if match(rx, path):
--                    self.files.append(path)
--                    return
--            return
--        # ignore tests that aren't in packages
--        if not "__init__.py" in files:
--            if not files or files == ["CVS"]:
--                return
--            print "not a package", dir
--            return
--
--        # Put matching files in matches.  If matches is non-empty,
--        # then make sure that the package is importable.
--        matches = []
--        for file in files:
--            if file.startswith('test') and os.path.splitext(file)[-1] == '.py':
--                path = os.path.join(dir, file)
--                if match(rx, path):
--                    matches.append(path)
--
--        # ignore tests when the package can't be imported, possibly due to
--        # dependency failures.
--        pkg = dir[self._plen:].replace(os.sep, '.')
--        try:
--            __import__(pkg)
--        # We specifically do not want to catch ImportError since that's useful
--        # information to know when running the tests.
--        except RuntimeError, e:
--            if VERBOSE:
--                print "skipping %s because: %s" % (pkg, e)
--            return
--        else:
--            self.files.extend(matches)
--
--    def module_from_path(self, path):
--        """Return the Python package name indicated by the filesystem path."""
--        assert path.endswith(".py")
--        path = path[self._plen:-3]
--        mod = path.replace(os.sep, ".")
--        return mod
--
--def walk_with_symlinks(top, func, arg):
--    """Like os.path.walk, but follows symlinks on POSIX systems.
--
--    This could theoreticaly result in an infinite loop, if you create symlink
--    cycles in your Zope sandbox, so don't do that.
--    """
--    try:
--        names = os.listdir(top)
--    except os.error:
--        return
--    func(arg, top, names)
--    exceptions = ('.', '..')
--    for name in names:
--        if name not in exceptions:
--            name = os.path.join(top, name)
--            if os.path.isdir(name):
--                walk_with_symlinks(name, func, arg)
--
--def find_test_dir(dir):
--    if os.path.exists(dir):
--        return dir
--    d = os.path.join(pathinit.libdir, dir)
--    if os.path.exists(d):
--        if os.path.isdir(d):
--            return d
--        raise ValueError("%s does not exist and %s is not a directory"
--                         % (dir, d))
--    raise ValueError("%s does not exist!" % dir)
--
--def find_tests(rx):
--    global finder
--    finder = TestFileFinder(pathinit.libdir)
--
--    if TEST_DIRS:
--        for d in TEST_DIRS:
--            d = find_test_dir(d)
--            walk_with_symlinks(d, finder.visit, rx)
--    else:
--        walk_with_symlinks(pathinit.libdir, finder.visit, rx)
--    return finder.files
--
--def package_import(modname):
--    mod = __import__(modname)
--    for part in modname.split(".")[1:]:
--        mod = getattr(mod, part)
--    return mod
--
--class PseudoTestCase:
--    """Minimal test case objects to create error reports.
--
--    If test.py finds something that looks like it should be a test but
--    can't load it or find its test suite, it will report an error
--    using a PseudoTestCase.
--    """
--
--    def __init__(self, name, descr=None):
--        self.name = name
--        self.descr = descr
--
--    def shortDescription(self):
--        return self.descr
--
--    def __str__(self):
--        return "Invalid Test (%s)" % self.name
--
--def get_suite(file, result):
--    modname = finder.module_from_path(file)
--    try:
--        mod = package_import(modname)
--        return mod.test_suite()
--    except:
--        result.addError(PseudoTestCase(modname), sys.exc_info())
--        return None
--
--def filter_testcases(s, rx):
--    new = unittest.TestSuite()
--    for test in s._tests:
--        # See if the levels match
--        dolevel = (LEVEL == 0) or LEVEL >= getattr(test, "level", 0)
--        if not dolevel:
--            continue
--        if isinstance(test, unittest.TestCase):
--            name = test.id() # Full test name: package.module.class.method
--            name = name[1 + name.rfind("."):] # extract method name
--            if not rx or match(rx, name):
--                new.addTest(test)
--        else:
--            filtered = filter_testcases(test, rx)
--            if filtered:
--                new.addTest(filtered)
--    return new
--
--def gui_runner(files, test_filter):
--    if BUILD_INPLACE:
--        utildir = os.path.join(os.getcwd(), "utilities")
--    else:
--        utildir = os.path.join(os.getcwd(), "..", "utilities")
--    sys.path.append(utildir)
--    import unittestgui
--    suites = []
--    for file in files:
--        suites.append(finder.module_from_path(file) + ".test_suite")
--
--    suites = ", ".join(suites)
--    minimal = (GUI == "minimal")
--    unittestgui.main(suites, minimal)
--
--class TrackRefs:
--    """Object to track reference counts across test runs."""
--
--    def __init__(self):
--        self.type2count = {}
--        self.type2all = {}
--
--    def update(self):
--        obs = sys.getobjects(0)
--        type2count = {}
--        type2all = {}
--        for o in obs:
--            all = sys.getrefcount(o)
--
--            if type(o) is str and o == '<dummy key>':
--                # avoid dictionary madness
--                continue
--            t = type(o)
--            if t in type2count:
--                type2count[t] += 1
--                type2all[t] += all
--            else:
--                type2count[t] = 1
--                type2all[t] = all
--
--        ct = [(type2count[t] - self.type2count.get(t, 0),
--               type2all[t] - self.type2all.get(t, 0),
--               t)
--              for t in type2count.iterkeys()]
--        ct.sort()
--        ct.reverse()
--        printed = False
--        for delta1, delta2, t in ct:
--            if delta1 or delta2:
--                if not printed:
--                    print "%-55s %8s %8s" % ('', 'insts', 'refs')
--                    printed = True
--                print "%-55s %8d %8d" % (t, delta1, delta2)
--
--        self.type2count = type2count
--        self.type2all = type2all
--
--def runner(files, test_filter, debug):
--    runner = ImmediateTestRunner(verbosity=VERBOSE, debug=DEBUG,
--                                 progress=PROGRESS, profile=PROFILE,
--                                 descriptions=False)
--    suite = unittest.TestSuite()
--    for file in files:
--        s = get_suite(file, runner.result)
--        # See if the levels match
--        dolevel = (LEVEL == 0) or LEVEL >= getattr(s, "level", 0)
--        if s is not None and dolevel:
--            s = filter_testcases(s, test_filter)
--            suite.addTest(s)
--    try:
--        r = runner.run(suite)
--        if TIMESFN:
--            r.print_times(open(TIMESFN, "w"))
--            if VERBOSE:
--                print "Wrote timing data to", TIMESFN
--        if TIMETESTS:
--            r.print_times(sys.stdout, TIMETESTS)
--    except:
--        if DEBUGGER:
--            print "%s:" % (sys.exc_info()[0], )
--            print sys.exc_info()[1]
--            pdb.post_mortem(sys.exc_info()[2])
--        else:
--            raise
--
--def remove_stale_bytecode(arg, dirname, names):
--    names = map(os.path.normcase, names)
--    for name in names:
--        if name.endswith(".pyc") or name.endswith(".pyo"):
--            srcname = name[:-1]
--            if srcname not in names:
--                fullname = os.path.join(dirname, name)
--                print "Removing stale bytecode file", fullname
--                os.unlink(fullname)
--
--def main(module_filter, test_filter, libdir):
--    if not KEEP_STALE_BYTECODE:
--        os.path.walk(os.curdir, remove_stale_bytecode, None)
--
--    configure_logging()
--
--    # Initialize the path and cwd
--    global pathinit
--    pathinit = PathInit(BUILD, BUILD_INPLACE, libdir)
--
--    files = find_tests(module_filter)
--    files.sort()
--
--    if GUI:
--        gui_runner(files, test_filter)
--    elif LOOP:
--        if REFCOUNT:
--            rc = sys.gettotalrefcount()
--            track = TrackRefs()
--        while True:
--            runner(files, test_filter, DEBUG)
--            gc.collect()
--            if gc.garbage:
--                print "GARBAGE:", len(gc.garbage), gc.garbage
--                return
--            if REFCOUNT:
--                prev = rc
--                rc = sys.gettotalrefcount()
--                print "totalrefcount=%-8d change=%-6d" % (rc, rc - prev)
--                track.update()
--    else:
--        runner(files, test_filter, DEBUG)
--
--    os.chdir(pathinit.org_cwd)
--
--
--def configure_logging():
--    """Initialize the logging module."""
--    import logging.config
--
--    # Get the log.ini file from the current directory instead of possibly
--    # buried in the build directory.  XXX This isn't perfect because if
--    # log.ini specifies a log file, it'll be relative to the build directory.
--    # Hmm...
--    logini = os.path.abspath("log.ini")
--
--    if os.path.exists(logini):
--        logging.config.fileConfig(logini)
--    else:
--        logging.basicConfig()
--
--    if os.environ.has_key("LOGGING"):
--        level = int(os.environ["LOGGING"])
--        logging.getLogger().setLevel(level)
--
--
--def process_args(argv=None):
--    import getopt
--    global MODULE_FILTER
--    global TEST_FILTER
--    global VERBOSE
--    global LOOP
--    global GUI
--    global TRACE
--    global REFCOUNT
--    global DEBUG
--    global DEBUGGER
--    global BUILD
--    global LEVEL
--    global LIBDIR
--    global TIMESFN
--    global TIMETESTS
--    global PROGRESS
--    global BUILD_INPLACE
--    global KEEP_STALE_BYTECODE
--    global TEST_DIRS
--    global PROFILE
--    global GC_THRESHOLD
--    global GC_FLAGS
--    global RUN_UNIT
--    global RUN_FUNCTIONAL
--    global PYCHECKER
--
--    if argv is None:
--        argv = sys.argv
--
--    MODULE_FILTER = None
--    TEST_FILTER = None
--    VERBOSE = 0
--    LOOP = False
--    GUI = False
--    TRACE = False
--    REFCOUNT = False
--    DEBUG = False # Don't collect test results; simply let tests crash
--    DEBUGGER = False
--    BUILD = False
--    BUILD_INPLACE = False
--    GC_THRESHOLD = None
--    gcdebug = 0
--    GC_FLAGS = []
--    LEVEL = 1
--    LIBDIR = None
--    PROGRESS = False
--    TIMESFN = None
--    TIMETESTS = 0
--    KEEP_STALE_BYTECODE = 0
--    RUN_UNIT = True
--    RUN_FUNCTIONAL = True
--    TEST_DIRS = []
--    PROFILE = False
--    PYCHECKER = False
--    config_filename = 'test.config'
--
--    # import the config file
--    if os.path.isfile(config_filename):
--        print 'Configuration file found.'
--        execfile(config_filename, globals())
--
--
--    try:
--        opts, args = getopt.getopt(argv[1:], "a:bBcdDfFg:G:hkl:LmMPprs:tTuUv",
--                                   ["all", "help", "libdir=", "times=",
--                                    "keepbytecode", "dir=", "build",
--                                    "build-inplace",
--                                    "at-level=",
--                                    "pychecker", "debug", "pdebug",
--                                    "gc-threshold=", "gc-option=",
--                                    "loop", "gui", "minimal-gui",
--                                    "profile", "progress", "refcount", "trace",
--                                    "top-fifty", "verbose",
--                                    ])
--    # fixme: add the long names
--    # fixme: add the extra documentation
--    # fixme: test for functional first!
--    except getopt.error, msg:
--        print msg
--        print "Try `python %s -h' for more information." % argv[0]
--        sys.exit(2)
--
--    for k, v in opts:
--        if k in ("-a", "--at-level"):
--            LEVEL = int(v)
--        elif k == "--all":
--            LEVEL = 0
--            os.environ["COMPLAIN_IF_TESTS_MISSED"]='1'
--        elif k in ("-b", "--build"):
--            BUILD = True
--        elif k in ("-B", "--build-inplace"):
--            BUILD = BUILD_INPLACE = True
--        elif k in("-c", "--pychecker"):
--            PYCHECKER = True
--        elif k in ("-d", "--debug"):
--            DEBUG = True
--        elif k in ("-D", "--pdebug"):
--            DEBUG = True
--            DEBUGGER = True
--        elif k in ("-f", "--skip-unit"):
--            RUN_UNIT = False
--        elif k in ("-u", "--skip-functional"):
--            RUN_FUNCTIONAL = False
--        elif k == "-F":
--            message = 'Unit plus functional is the default behaviour.'
--            warnings.warn(message, DeprecationWarning)
--            RUN_UNIT = True
--            RUN_FUNCTIONAL = True
--        elif k in ("-h", "--help"):
--            print __doc__
--            sys.exit(0)
--        elif k in ("-g", "--gc-threshold"):
--            GC_THRESHOLD = int(v)
--        elif k in ("-G", "--gc-option"):
--            if not v.startswith("DEBUG_"):
--                print "-G argument must be DEBUG_ flag, not", repr(v)
--                sys.exit(1)
--            GC_FLAGS.append(v)
--        elif k in ('-k', '--keepbytecode'):
--            KEEP_STALE_BYTECODE = 1
--        elif k in ('-l', '--libdir'):
--            LIBDIR = v
--        elif k in ("-L", "--loop"):
--            LOOP = 1
--        elif k == "-m":
--            GUI = "minimal"
--            msg = "Use -M or --minimal-gui instead of -m."
--            warnings.warn(msg, DeprecationWarning)
--        elif k in ("-M", "--minimal-gui"):
--            GUI = "minimal"
--        elif k in ("-P", "--profile"):
--            PROFILE = True
--        elif k in ("-p", "--progress"):
--            PROGRESS = True
--        elif k in ("-r", "--refcount"):
--                REFCOUNT = True
--        elif k in ("-T", "--trace"):
--            TRACE = True
--        elif k in ("-t", "--top-fifty"):
--            if not TIMETESTS:
--                TIMETESTS = 50
--        elif k in ("-u", "--gui"):
--            GUI = 1
--        elif k in ("-v", "--verbose"):
--            VERBOSE += 1
--        elif k == "--times":
--            try:
--                TIMETESTS = int(v)
--            except ValueError:
--                # must be a filename to write
--                TIMESFN = v
--        elif k in ('-s', '--dir'):
--            TEST_DIRS.append(v)
--
--    if PYCHECKER:
--        # make sure you have a recent version of pychecker
--        if not os.environ.get("PYCHECKER"):
--            os.environ["PYCHECKER"] = "-q"
--        import pychecker.checker
--
--    if REFCOUNT and not hasattr(sys, "gettotalrefcount"):
--        print "-r ignored, because it needs a debug build of Python"
--        REFCOUNT = False
--
--    if sys.version_info < ( 2,3,2 ):
--        print """\
--        ERROR: Your python version is not supported by Zope3.
--        Zope3 needs Python 2.3.2 or greater. You are running:""" + sys.version
--        sys.exit(1)
--
--    if GC_THRESHOLD is not None:
--        if GC_THRESHOLD == 0:
--            gc.disable()
--            print "gc disabled"
--        else:
--            gc.set_threshold(GC_THRESHOLD)
--            print "gc threshold:", gc.get_threshold()
--
--    if GC_FLAGS:
--        val = 0
--        for flag in GC_FLAGS:
--            v = getattr(gc, flag, None)
--            if v is None:
--                print "Unknown gc flag", repr(flag)
--                print gc.set_debug.__doc__
--                sys.exit(1)
--            val |= v
--        gcdebug |= v
--
--    if gcdebug:
--        gc.set_debug(gcdebug)
--
--    if BUILD:
--        # Python 2.3 is more sane in its non -q output
--        if sys.hexversion >= 0x02030000:
--            qflag = ""
--        else:
--            qflag = "-q"
--        cmd = sys.executable + " setup.py " + qflag + " build"
--        if BUILD_INPLACE:
--            cmd += "_ext -i"
--        if VERBOSE:
--            print cmd
--        sts = os.system(cmd)
--        if sts:
--            print "Build failed", hex(sts)
--            sys.exit(1)
--
--    k = []
--    if RUN_UNIT:
--        k.append(False)
--    if RUN_FUNCTIONAL:
--        k.append(True)
--
--    global functional
--    for functional in k:
--
--        if VERBOSE:
--            kind = functional and "FUNCTIONAL" or "UNIT"
--            if LEVEL == 0:
--                print "Running %s tests at all levels" % kind
--            else:
--                print "Running %s tests at level %d" % (kind, LEVEL)
--
--# This was to avoid functional tests outside of z3, but this doesn't really
--# work right.
--##         if functional:
--##             try:
--##                 from zope.app.tests.functional import FunctionalTestSetup
--##             except ImportError:
--##                 raise
--##                 print ('Skipping functional tests: could not import '
--##                        'zope.app.tests.functional')
--##                 continue
--
--        # XXX We want to change *visible* warnings into errors.  The next
--        # line changes all warnings into errors, including warnings we
--        # normally never see.  In particular, test_datetime does some
--        # short-integer arithmetic that overflows to long ints, and, by
--        # default, Python doesn't display the overflow warning that can
--        # be enabled when this happens.  The next line turns that into an
--        # error instead.  Guido suggests that a better to get what we're
--        # after is to replace warnings.showwarning() with our own thing
--        # that raises an error.
--        ## warnings.filterwarnings("error")
--        warnings.filterwarnings("ignore", module="logging")
--
--        if args:
--            if len(args) > 1:
--                TEST_FILTER = args[1]
--            MODULE_FILTER = args[0]
--        try:
--            if TRACE:
--                # if the trace module is used, then we don't exit with
--                # status if on a false return value from main.
--                coverdir = os.path.join(os.getcwd(), "coverage")
--                import trace
--                ignoremods = ["os", "posixpath", "stat"]
--                tracer = trace.Trace(ignoredirs=[sys.prefix, sys.exec_prefix],
--                                     ignoremods=ignoremods,
--                                     trace=False, count=True)
--
--                tracer.runctx("main(MODULE_FILTER, TEST_FILTER, LIBDIR)",
--                              globals=globals(), locals=vars())
--                r = tracer.results()
--                path = "/tmp/trace.%s" % os.getpid()
--                import cPickle
--                f = open(path, "wb")
--                cPickle.dump(r, f)
--                f.close()
--                print path
--                r.write_results(show_missing=True,
--                                summary=True, coverdir=coverdir)
--            else:
--                bad = main(MODULE_FILTER, TEST_FILTER, LIBDIR)
--                if bad:
--                    sys.exit(1)
--        except ImportError, err:
--            print err
--            print sys.path
--            raise
--
--
--if __name__ == "__main__":
--    process_args()
diff --git a/main/xen/elf_local.h b/main/xen/elf_local.h
deleted file mode 100644
index c6d67efb626..00000000000
--- a/main/xen/elf_local.h
+++ /dev/null
@@ -1,2819 +0,0 @@
-#ifndef _ELF_H
-#define _ELF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint_local.h>
-
-typedef uint16_t Elf32_Half;
-typedef uint16_t Elf64_Half;
-
-typedef uint32_t Elf32_Word;
-typedef	int32_t  Elf32_Sword;
-typedef uint32_t Elf64_Word;
-typedef	int32_t  Elf64_Sword;
-
-typedef uint64_t Elf32_Xword;
-typedef	int64_t  Elf32_Sxword;
-typedef uint64_t Elf64_Xword;
-typedef	int64_t  Elf64_Sxword;
-
-typedef uint32_t Elf32_Addr;
-typedef uint64_t Elf64_Addr;
-
-typedef uint32_t Elf32_Off;
-typedef uint64_t Elf64_Off;
-
-typedef uint16_t Elf32_Section;
-typedef uint16_t Elf64_Section;
-
-typedef Elf32_Half Elf32_Versym;
-typedef Elf64_Half Elf64_Versym;
-
-#define EI_NIDENT (16)
-
-typedef struct {
-  unsigned char	e_ident[EI_NIDENT];
-  Elf32_Half	e_type;
-  Elf32_Half	e_machine;
-  Elf32_Word	e_version;
-  Elf32_Addr	e_entry;
-  Elf32_Off	e_phoff;
-  Elf32_Off	e_shoff;
-  Elf32_Word	e_flags;
-  Elf32_Half	e_ehsize;
-  Elf32_Half	e_phentsize;
-  Elf32_Half	e_phnum;
-  Elf32_Half	e_shentsize;
-  Elf32_Half	e_shnum;
-  Elf32_Half	e_shstrndx;
-} Elf32_Ehdr;
-
-typedef struct {
-  unsigned char	e_ident[EI_NIDENT];
-  Elf64_Half	e_type;
-  Elf64_Half	e_machine;
-  Elf64_Word	e_version;
-  Elf64_Addr	e_entry;
-  Elf64_Off	e_phoff;
-  Elf64_Off	e_shoff;
-  Elf64_Word	e_flags;
-  Elf64_Half	e_ehsize;
-  Elf64_Half	e_phentsize;
-  Elf64_Half	e_phnum;
-  Elf64_Half	e_shentsize;
-  Elf64_Half	e_shnum;
-  Elf64_Half	e_shstrndx;
-} Elf64_Ehdr;
-
-#define EI_MAG0		0
-#define ELFMAG0		0x7f
-
-#define EI_MAG1		1
-#define ELFMAG1		'E'
-
-#define EI_MAG2		2
-#define ELFMAG2		'L'
-
-#define EI_MAG3		3
-#define ELFMAG3		'F'
-
-
-#define	ELFMAG		"\177ELF"
-#define	SELFMAG		4
-
-#define EI_CLASS	4
-#define ELFCLASSNONE	0
-#define ELFCLASS32	1
-#define ELFCLASS64	2
-#define ELFCLASSNUM	3
-
-#define EI_DATA		5
-#define ELFDATANONE	0
-#define ELFDATA2LSB	1
-#define ELFDATA2MSB	2
-#define ELFDATANUM	3
-
-#define EI_VERSION	6
-
-
-#define EI_OSABI	7
-#define ELFOSABI_NONE		0
-#define ELFOSABI_SYSV		0
-#define ELFOSABI_HPUX		1
-#define ELFOSABI_NETBSD		2
-#define ELFOSABI_LINUX		3
-#define ELFOSABI_GNU		3
-#define ELFOSABI_SOLARIS	6
-#define ELFOSABI_AIX		7
-#define ELFOSABI_IRIX		8
-#define ELFOSABI_FREEBSD	9
-#define ELFOSABI_TRU64		10
-#define ELFOSABI_MODESTO	11
-#define ELFOSABI_OPENBSD	12
-#define ELFOSABI_ARM		97
-#define ELFOSABI_STANDALONE	255
-
-#define EI_ABIVERSION	8
-
-#define EI_PAD		9
-
-
-
-#define ET_NONE		0
-#define ET_REL		1
-#define ET_EXEC		2
-#define ET_DYN		3
-#define ET_CORE		4
-#define	ET_NUM		5
-#define ET_LOOS		0xfe00
-#define ET_HIOS		0xfeff
-#define ET_LOPROC	0xff00
-#define ET_HIPROC	0xffff
-
-
-
-#define EM_NONE		 0
-#define EM_M32		 1
-#define EM_SPARC	 2
-#define EM_386		 3
-#define EM_68K		 4
-#define EM_88K		 5
-#define EM_860		 7
-#define EM_MIPS		 8
-#define EM_S370		 9
-#define EM_MIPS_RS3_LE	10
-
-#define EM_PARISC	15
-#define EM_VPP500	17
-#define EM_SPARC32PLUS	18
-#define EM_960		19
-#define EM_PPC		20
-#define EM_PPC64	21
-#define EM_S390		22
-
-#define EM_V800		36
-#define EM_FR20		37
-#define EM_RH32		38
-#define EM_RCE		39
-#define EM_ARM		40
-#define EM_FAKE_ALPHA	41
-#define EM_SH		42
-#define EM_SPARCV9	43
-#define EM_TRICORE	44
-#define EM_ARC		45
-#define EM_H8_300	46
-#define EM_H8_300H	47
-#define EM_H8S		48
-#define EM_H8_500	49
-#define EM_IA_64	50
-#define EM_MIPS_X	51
-#define EM_COLDFIRE	52
-#define EM_68HC12	53
-#define EM_MMA		54
-#define EM_PCP		55
-#define EM_NCPU		56
-#define EM_NDR1		57
-#define EM_STARCORE	58
-#define EM_ME16		59
-#define EM_ST100	60
-#define EM_TINYJ	61
-#define EM_X86_64	62
-#define EM_PDSP		63
-
-#define EM_FX66		66
-#define EM_ST9PLUS	67
-#define EM_ST7		68
-#define EM_68HC16	69
-#define EM_68HC11	70
-#define EM_68HC08	71
-#define EM_68HC05	72
-#define EM_SVX		73
-#define EM_ST19		74
-#define EM_VAX		75
-#define EM_CRIS		76
-#define EM_JAVELIN	77
-#define EM_FIREPATH	78
-#define EM_ZSP		79
-#define EM_MMIX		80
-#define EM_HUANY	81
-#define EM_PRISM	82
-#define EM_AVR		83
-#define EM_FR30		84
-#define EM_D10V		85
-#define EM_D30V		86
-#define EM_V850		87
-#define EM_M32R		88
-#define EM_MN10300	89
-#define EM_MN10200	90
-#define EM_PJ		91
-#define EM_OR1K		92
-#define EM_ARC_A5	93
-#define EM_XTENSA	94
-#define EM_AARCH64	183
-#define EM_TILEPRO	188
-#define EM_MICROBLAZE	189
-#define EM_TILEGX	191
-#define EM_NUM		192
-#define EM_ALPHA	0x9026
-
-#define EV_NONE		0
-#define EV_CURRENT	1
-#define EV_NUM		2
-
-typedef struct {
-  Elf32_Word	sh_name;
-  Elf32_Word	sh_type;
-  Elf32_Word	sh_flags;
-  Elf32_Addr	sh_addr;
-  Elf32_Off	sh_offset;
-  Elf32_Word	sh_size;
-  Elf32_Word	sh_link;
-  Elf32_Word	sh_info;
-  Elf32_Word	sh_addralign;
-  Elf32_Word	sh_entsize;
-} Elf32_Shdr;
-
-typedef struct {
-  Elf64_Word	sh_name;
-  Elf64_Word	sh_type;
-  Elf64_Xword	sh_flags;
-  Elf64_Addr	sh_addr;
-  Elf64_Off	sh_offset;
-  Elf64_Xword	sh_size;
-  Elf64_Word	sh_link;
-  Elf64_Word	sh_info;
-  Elf64_Xword	sh_addralign;
-  Elf64_Xword	sh_entsize;
-} Elf64_Shdr;
-
-
-
-#define SHN_UNDEF	0
-#define SHN_LORESERVE	0xff00
-#define SHN_LOPROC	0xff00
-#define SHN_BEFORE	0xff00
-
-#define SHN_AFTER	0xff01
-
-#define SHN_HIPROC	0xff1f
-#define SHN_LOOS	0xff20
-#define SHN_HIOS	0xff3f
-#define SHN_ABS		0xfff1
-#define SHN_COMMON	0xfff2
-#define SHN_XINDEX	0xffff
-#define SHN_HIRESERVE	0xffff
-
-
-
-#define SHT_NULL	  0
-#define SHT_PROGBITS	  1
-#define SHT_SYMTAB	  2
-#define SHT_STRTAB	  3
-#define SHT_RELA	  4
-#define SHT_HASH	  5
-#define SHT_DYNAMIC	  6
-#define SHT_NOTE	  7
-#define SHT_NOBITS	  8
-#define SHT_REL		  9
-#define SHT_SHLIB	  10
-#define SHT_DYNSYM	  11
-#define SHT_INIT_ARRAY	  14
-#define SHT_FINI_ARRAY	  15
-#define SHT_PREINIT_ARRAY 16
-#define SHT_GROUP	  17
-#define SHT_SYMTAB_SHNDX  18
-#define	SHT_NUM		  19
-#define SHT_LOOS	  0x60000000
-#define SHT_GNU_ATTRIBUTES 0x6ffffff5
-#define SHT_GNU_HASH	  0x6ffffff6
-#define SHT_GNU_LIBLIST	  0x6ffffff7
-#define SHT_CHECKSUM	  0x6ffffff8
-#define SHT_LOSUNW	  0x6ffffffa
-#define SHT_SUNW_move	  0x6ffffffa
-#define SHT_SUNW_COMDAT   0x6ffffffb
-#define SHT_SUNW_syminfo  0x6ffffffc
-#define SHT_GNU_verdef	  0x6ffffffd
-#define SHT_GNU_verneed	  0x6ffffffe
-#define SHT_GNU_versym	  0x6fffffff
-#define SHT_HISUNW	  0x6fffffff
-#define SHT_HIOS	  0x6fffffff
-#define SHT_LOPROC	  0x70000000
-#define SHT_HIPROC	  0x7fffffff
-#define SHT_LOUSER	  0x80000000
-#define SHT_HIUSER	  0x8fffffff
-
-#define SHF_WRITE	     (1 << 0)
-#define SHF_ALLOC	     (1 << 1)
-#define SHF_EXECINSTR	     (1 << 2)
-#define SHF_MERGE	     (1 << 4)
-#define SHF_STRINGS	     (1 << 5)
-#define SHF_INFO_LINK	     (1 << 6)
-#define SHF_LINK_ORDER	     (1 << 7)
-#define SHF_OS_NONCONFORMING (1 << 8)
-
-#define SHF_GROUP	     (1 << 9)
-#define SHF_TLS		     (1 << 10)
-#define SHF_MASKOS	     0x0ff00000
-#define SHF_MASKPROC	     0xf0000000
-#define SHF_ORDERED	     (1 << 30)
-#define SHF_EXCLUDE	     (1 << 31)
-
-#define GRP_COMDAT	0x1
-
-typedef struct {
-  Elf32_Word	st_name;
-  Elf32_Addr	st_value;
-  Elf32_Word	st_size;
-  unsigned char	st_info;
-  unsigned char	st_other;
-  Elf32_Section	st_shndx;
-} Elf32_Sym;
-
-typedef struct {
-  Elf64_Word	st_name;
-  unsigned char	st_info;
-  unsigned char st_other;
-  Elf64_Section	st_shndx;
-  Elf64_Addr	st_value;
-  Elf64_Xword	st_size;
-} Elf64_Sym;
-
-typedef struct {
-  Elf32_Half si_boundto;
-  Elf32_Half si_flags;
-} Elf32_Syminfo;
-
-typedef struct {
-  Elf64_Half si_boundto;
-  Elf64_Half si_flags;
-} Elf64_Syminfo;
-
-#define SYMINFO_BT_SELF		0xffff
-#define SYMINFO_BT_PARENT	0xfffe
-#define SYMINFO_BT_LOWRESERVE	0xff00
-
-#define SYMINFO_FLG_DIRECT	0x0001
-#define SYMINFO_FLG_PASSTHRU	0x0002
-#define SYMINFO_FLG_COPY	0x0004
-#define SYMINFO_FLG_LAZYLOAD	0x0008
-
-#define SYMINFO_NONE		0
-#define SYMINFO_CURRENT		1
-#define SYMINFO_NUM		2
-
-#define ELF32_ST_BIND(val)		(((unsigned char) (val)) >> 4)
-#define ELF32_ST_TYPE(val)		((val) & 0xf)
-#define ELF32_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
-
-#define ELF64_ST_BIND(val)		ELF32_ST_BIND (val)
-#define ELF64_ST_TYPE(val)		ELF32_ST_TYPE (val)
-#define ELF64_ST_INFO(bind, type)	ELF32_ST_INFO ((bind), (type))
-
-#define STB_LOCAL	0
-#define STB_GLOBAL	1
-#define STB_WEAK	2
-#define	STB_NUM		3
-#define STB_LOOS	10
-#define STB_GNU_UNIQUE	10
-#define STB_HIOS	12
-#define STB_LOPROC	13
-#define STB_HIPROC	15
-
-#define STT_NOTYPE	0
-#define STT_OBJECT	1
-#define STT_FUNC	2
-#define STT_SECTION	3
-#define STT_FILE	4
-#define STT_COMMON	5
-#define STT_TLS		6
-#define	STT_NUM		7
-#define STT_LOOS	10
-#define STT_GNU_IFUNC	10
-#define STT_HIOS	12
-#define STT_LOPROC	13
-#define STT_HIPROC	15
-
-#define STN_UNDEF	0
-
-#define ELF32_ST_VISIBILITY(o)	((o) & 0x03)
-#define ELF64_ST_VISIBILITY(o)	ELF32_ST_VISIBILITY (o)
-
-#define STV_DEFAULT	0
-#define STV_INTERNAL	1
-#define STV_HIDDEN	2
-#define STV_PROTECTED	3
-
-
-
-
-typedef struct
-{
-  Elf32_Addr	r_offset;
-  Elf32_Word	r_info;
-} Elf32_Rel;
-
-typedef struct {
-  Elf64_Addr	r_offset;
-  Elf64_Xword	r_info;
-} Elf64_Rel;
-
-
-
-typedef struct {
-  Elf32_Addr	r_offset;
-  Elf32_Word	r_info;
-  Elf32_Sword	r_addend;
-} Elf32_Rela;
-
-typedef struct {
-  Elf64_Addr	r_offset;
-  Elf64_Xword	r_info;
-  Elf64_Sxword	r_addend;
-} Elf64_Rela;
-
-
-
-#define ELF32_R_SYM(val)		((val) >> 8)
-#define ELF32_R_TYPE(val)		((val) & 0xff)
-#define ELF32_R_INFO(sym, type)		(((sym) << 8) + ((type) & 0xff))
-
-#define ELF64_R_SYM(i)			((i) >> 32)
-#define ELF64_R_TYPE(i)			((i) & 0xffffffff)
-#define ELF64_R_INFO(sym,type)		((((Elf64_Xword) (sym)) << 32) + (type))
-
-
-
-typedef struct {
-  Elf32_Word	p_type;
-  Elf32_Off	p_offset;
-  Elf32_Addr	p_vaddr;
-  Elf32_Addr	p_paddr;
-  Elf32_Word	p_filesz;
-  Elf32_Word	p_memsz;
-  Elf32_Word	p_flags;
-  Elf32_Word	p_align;
-} Elf32_Phdr;
-
-typedef struct {
-  Elf64_Word	p_type;
-  Elf64_Word	p_flags;
-  Elf64_Off	p_offset;
-  Elf64_Addr	p_vaddr;
-  Elf64_Addr	p_paddr;
-  Elf64_Xword	p_filesz;
-  Elf64_Xword	p_memsz;
-  Elf64_Xword	p_align;
-} Elf64_Phdr;
-
-
-
-#define	PT_NULL		0
-#define PT_LOAD		1
-#define PT_DYNAMIC	2
-#define PT_INTERP	3
-#define PT_NOTE		4
-#define PT_SHLIB	5
-#define PT_PHDR		6
-#define PT_TLS		7
-#define	PT_NUM		8
-#define PT_LOOS		0x60000000
-#define PT_GNU_EH_FRAME	0x6474e550
-#define PT_GNU_STACK	0x6474e551
-#define PT_GNU_RELRO	0x6474e552
-#define PT_LOSUNW	0x6ffffffa
-#define PT_SUNWBSS	0x6ffffffa
-#define PT_SUNWSTACK	0x6ffffffb
-#define PT_HISUNW	0x6fffffff
-#define PT_HIOS		0x6fffffff
-#define PT_LOPROC	0x70000000
-#define PT_HIPROC	0x7fffffff
-
-
-#define PN_XNUM 0xffff
-
-
-#define PF_X		(1 << 0)
-#define PF_W		(1 << 1)
-#define PF_R		(1 << 2)
-#define PF_MASKOS	0x0ff00000
-#define PF_MASKPROC	0xf0000000
-
-
-
-#define NT_PRSTATUS	1
-#define NT_FPREGSET	2
-#define NT_PRPSINFO	3
-#define NT_PRXREG	4
-#define NT_TASKSTRUCT	4
-#define NT_PLATFORM	5
-#define NT_AUXV		6
-#define NT_GWINDOWS	7
-#define NT_ASRS		8
-#define NT_PSTATUS	10
-#define NT_PSINFO	13
-#define NT_PRCRED	14
-#define NT_UTSNAME	15
-#define NT_LWPSTATUS	16
-#define NT_LWPSINFO	17
-#define NT_PRFPXREG	20
-#define NT_SIGINFO	0x53494749
-#define NT_FILE		0x46494c45
-#define NT_PRXFPREG	0x46e62b7f
-#define NT_PPC_VMX	0x100
-#define NT_PPC_SPE	0x101
-#define NT_PPC_VSX	0x102
-#define NT_386_TLS	0x200
-#define NT_386_IOPERM	0x201
-#define NT_X86_XSTATE	0x202
-#define NT_S390_HIGH_GPRS	0x300
-#define NT_S390_TIMER	0x301
-#define NT_S390_TODCMP	0x302
-#define NT_S390_TODPREG	0x303
-#define NT_S390_CTRS	0x304
-#define NT_S390_PREFIX	0x305
-#define NT_S390_LAST_BREAK	0x306
-#define NT_S390_SYSTEM_CALL	0x307
-#define NT_S390_TDB	0x308
-#define NT_ARM_VFP	0x400
-#define NT_ARM_TLS	0x401
-#define NT_ARM_HW_BREAK	0x402
-#define NT_ARM_HW_WATCH	0x403
-#define NT_METAG_CBUF	0x500
-#define NT_METAG_RPIPE	0x501
-#define NT_METAG_TLS	0x502
-#define NT_VERSION	1
-
-
-
-
-typedef struct {
-  Elf32_Sword d_tag;
-  union {
-      Elf32_Word d_val;
-      Elf32_Addr d_ptr;
-  } d_un;
-} Elf32_Dyn;
-
-typedef struct {
-  Elf64_Sxword d_tag;
-  union {
-      Elf64_Xword d_val;
-      Elf64_Addr d_ptr;
-  } d_un;
-} Elf64_Dyn;
-
-
-
-#define DT_NULL		0
-#define DT_NEEDED	1
-#define DT_PLTRELSZ	2
-#define DT_PLTGOT	3
-#define DT_HASH		4
-#define DT_STRTAB	5
-#define DT_SYMTAB	6
-#define DT_RELA		7
-#define DT_RELASZ	8
-#define DT_RELAENT	9
-#define DT_STRSZ	10
-#define DT_SYMENT	11
-#define DT_INIT		12
-#define DT_FINI		13
-#define DT_SONAME	14
-#define DT_RPATH	15
-#define DT_SYMBOLIC	16
-#define DT_REL		17
-#define DT_RELSZ	18
-#define DT_RELENT	19
-#define DT_PLTREL	20
-#define DT_DEBUG	21
-#define DT_TEXTREL	22
-#define DT_JMPREL	23
-#define	DT_BIND_NOW	24
-#define	DT_INIT_ARRAY	25
-#define	DT_FINI_ARRAY	26
-#define	DT_INIT_ARRAYSZ	27
-#define	DT_FINI_ARRAYSZ	28
-#define DT_RUNPATH	29
-#define DT_FLAGS	30
-#define DT_ENCODING	32
-#define DT_PREINIT_ARRAY 32
-#define DT_PREINIT_ARRAYSZ 33
-#define	DT_NUM		34
-#define DT_LOOS		0x6000000d
-#define DT_HIOS		0x6ffff000
-#define DT_LOPROC	0x70000000
-#define DT_HIPROC	0x7fffffff
-#define	DT_PROCNUM	DT_MIPS_NUM
-
-#define DT_VALRNGLO	0x6ffffd00
-#define DT_GNU_PRELINKED 0x6ffffdf5
-#define DT_GNU_CONFLICTSZ 0x6ffffdf6
-#define DT_GNU_LIBLISTSZ 0x6ffffdf7
-#define DT_CHECKSUM	0x6ffffdf8
-#define DT_PLTPADSZ	0x6ffffdf9
-#define DT_MOVEENT	0x6ffffdfa
-#define DT_MOVESZ	0x6ffffdfb
-#define DT_FEATURE_1	0x6ffffdfc
-#define DT_POSFLAG_1	0x6ffffdfd
-
-#define DT_SYMINSZ	0x6ffffdfe
-#define DT_SYMINENT	0x6ffffdff
-#define DT_VALRNGHI	0x6ffffdff
-#define DT_VALTAGIDX(tag)	(DT_VALRNGHI - (tag))
-#define DT_VALNUM 12
-
-#define DT_ADDRRNGLO	0x6ffffe00
-#define DT_GNU_HASH	0x6ffffef5
-#define DT_TLSDESC_PLT	0x6ffffef6
-#define DT_TLSDESC_GOT	0x6ffffef7
-#define DT_GNU_CONFLICT	0x6ffffef8
-#define DT_GNU_LIBLIST	0x6ffffef9
-#define DT_CONFIG	0x6ffffefa
-#define DT_DEPAUDIT	0x6ffffefb
-#define DT_AUDIT	0x6ffffefc
-#define	DT_PLTPAD	0x6ffffefd
-#define	DT_MOVETAB	0x6ffffefe
-#define DT_SYMINFO	0x6ffffeff
-#define DT_ADDRRNGHI	0x6ffffeff
-#define DT_ADDRTAGIDX(tag)	(DT_ADDRRNGHI - (tag))
-#define DT_ADDRNUM 11
-
-
-
-#define DT_VERSYM	0x6ffffff0
-
-#define DT_RELACOUNT	0x6ffffff9
-#define DT_RELCOUNT	0x6ffffffa
-
-
-#define DT_FLAGS_1	0x6ffffffb
-#define	DT_VERDEF	0x6ffffffc
-
-#define	DT_VERDEFNUM	0x6ffffffd
-#define	DT_VERNEED	0x6ffffffe
-
-#define	DT_VERNEEDNUM	0x6fffffff
-#define DT_VERSIONTAGIDX(tag)	(DT_VERNEEDNUM - (tag))
-#define DT_VERSIONTAGNUM 16
-
-
-
-#define DT_AUXILIARY    0x7ffffffd
-#define DT_FILTER       0x7fffffff
-#define DT_EXTRATAGIDX(tag)	((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
-#define DT_EXTRANUM	3
-
-
-#define DF_ORIGIN	0x00000001
-#define DF_SYMBOLIC	0x00000002
-#define DF_TEXTREL	0x00000004
-#define DF_BIND_NOW	0x00000008
-#define DF_STATIC_TLS	0x00000010
-
-
-
-#define DF_1_NOW	0x00000001
-#define DF_1_GLOBAL	0x00000002
-#define DF_1_GROUP	0x00000004
-#define DF_1_NODELETE	0x00000008
-#define DF_1_LOADFLTR	0x00000010
-#define DF_1_INITFIRST	0x00000020
-#define DF_1_NOOPEN	0x00000040
-#define DF_1_ORIGIN	0x00000080
-#define DF_1_DIRECT	0x00000100
-#define DF_1_TRANS	0x00000200
-#define DF_1_INTERPOSE	0x00000400
-#define DF_1_NODEFLIB	0x00000800
-#define DF_1_NODUMP	0x00001000
-#define DF_1_CONFALT	0x00002000
-#define DF_1_ENDFILTEE	0x00004000
-#define	DF_1_DISPRELDNE	0x00008000
-#define	DF_1_DISPRELPND	0x00010000
-#define	DF_1_NODIRECT	0x00020000
-#define	DF_1_IGNMULDEF	0x00040000
-#define	DF_1_NOKSYMS	0x00080000
-#define	DF_1_NOHDR	0x00100000
-#define	DF_1_EDITED	0x00200000
-#define	DF_1_NORELOC	0x00400000
-#define	DF_1_SYMINTPOSE	0x00800000
-#define	DF_1_GLOBAUDIT	0x01000000
-#define	DF_1_SINGLETON	0x02000000
-
-#define DTF_1_PARINIT	0x00000001
-#define DTF_1_CONFEXP	0x00000002
-
-
-#define DF_P1_LAZYLOAD	0x00000001
-#define DF_P1_GROUPPERM	0x00000002
-
-
-
-
-typedef struct {
-  Elf32_Half	vd_version;
-  Elf32_Half	vd_flags;
-  Elf32_Half	vd_ndx;
-  Elf32_Half	vd_cnt;
-  Elf32_Word	vd_hash;
-  Elf32_Word	vd_aux;
-  Elf32_Word	vd_next;
-} Elf32_Verdef;
-
-typedef struct {
-  Elf64_Half	vd_version;
-  Elf64_Half	vd_flags;
-  Elf64_Half	vd_ndx;
-  Elf64_Half	vd_cnt;
-  Elf64_Word	vd_hash;
-  Elf64_Word	vd_aux;
-  Elf64_Word	vd_next;
-} Elf64_Verdef;
-
-
-
-#define VER_DEF_NONE	0
-#define VER_DEF_CURRENT	1
-#define VER_DEF_NUM	2
-
-
-#define VER_FLG_BASE	0x1
-#define VER_FLG_WEAK	0x2
-
-
-#define	VER_NDX_LOCAL		0
-#define	VER_NDX_GLOBAL		1
-#define	VER_NDX_LORESERVE	0xff00
-#define	VER_NDX_ELIMINATE	0xff01
-
-
-
-typedef struct {
-  Elf32_Word	vda_name;
-  Elf32_Word	vda_next;
-} Elf32_Verdaux;
-
-typedef struct {
-  Elf64_Word	vda_name;
-  Elf64_Word	vda_next;
-} Elf64_Verdaux;
-
-
-
-
-typedef struct {
-  Elf32_Half	vn_version;
-  Elf32_Half	vn_cnt;
-  Elf32_Word	vn_file;
-  Elf32_Word	vn_aux;
-  Elf32_Word	vn_next;
-} Elf32_Verneed;
-
-typedef struct {
-  Elf64_Half	vn_version;
-  Elf64_Half	vn_cnt;
-  Elf64_Word	vn_file;
-  Elf64_Word	vn_aux;
-  Elf64_Word	vn_next;
-} Elf64_Verneed;
-
-
-
-#define VER_NEED_NONE	 0
-#define VER_NEED_CURRENT 1
-#define VER_NEED_NUM	 2
-
-
-
-typedef struct {
-  Elf32_Word	vna_hash;
-  Elf32_Half	vna_flags;
-  Elf32_Half	vna_other;
-  Elf32_Word	vna_name;
-  Elf32_Word	vna_next;
-} Elf32_Vernaux;
-
-typedef struct {
-  Elf64_Word	vna_hash;
-  Elf64_Half	vna_flags;
-  Elf64_Half	vna_other;
-  Elf64_Word	vna_name;
-  Elf64_Word	vna_next;
-} Elf64_Vernaux;
-
-
-
-#define VER_FLG_WEAK	0x2
-
-
-
-typedef struct {
-  uint32_t a_type;
-  union {
-      uint32_t a_val;
-  } a_un;
-} Elf32_auxv_t;
-
-typedef struct {
-  uint64_t a_type;
-  union {
-      uint64_t a_val;
-  } a_un;
-} Elf64_auxv_t;
-
-
-
-#define AT_NULL		0
-#define AT_IGNORE	1
-#define AT_EXECFD	2
-#define AT_PHDR		3
-#define AT_PHENT	4
-#define AT_PHNUM	5
-#define AT_PAGESZ	6
-#define AT_BASE		7
-#define AT_FLAGS	8
-#define AT_ENTRY	9
-#define AT_NOTELF	10
-#define AT_UID		11
-#define AT_EUID		12
-#define AT_GID		13
-#define AT_EGID		14
-#define AT_CLKTCK	17
-
-
-#define AT_PLATFORM	15
-#define AT_HWCAP	16
-
-
-
-
-#define AT_FPUCW	18
-
-
-#define AT_DCACHEBSIZE	19
-#define AT_ICACHEBSIZE	20
-#define AT_UCACHEBSIZE	21
-
-
-
-#define AT_IGNOREPPC	22
-
-#define	AT_SECURE	23
-
-#define AT_BASE_PLATFORM 24
-
-#define AT_RANDOM	25
-
-#define AT_HWCAP2	26
-
-#define AT_EXECFN	31
-
-
-
-#define AT_SYSINFO	32
-#define AT_SYSINFO_EHDR	33
-
-
-
-#define AT_L1I_CACHESHAPE	34
-#define AT_L1D_CACHESHAPE	35
-#define AT_L2_CACHESHAPE	36
-#define AT_L3_CACHESHAPE	37
-
-
-
-
-typedef struct {
-  Elf32_Word n_namesz;
-  Elf32_Word n_descsz;
-  Elf32_Word n_type;
-} Elf32_Nhdr;
-
-typedef struct {
-  Elf64_Word n_namesz;
-  Elf64_Word n_descsz;
-  Elf64_Word n_type;
-} Elf64_Nhdr;
-
-
-
-
-#define ELF_NOTE_SOLARIS	"SUNW Solaris"
-
-
-#define ELF_NOTE_GNU		"GNU"
-
-
-
-
-
-#define ELF_NOTE_PAGESIZE_HINT	1
-
-
-#define NT_GNU_ABI_TAG	1
-#define ELF_NOTE_ABI	NT_GNU_ABI_TAG
-
-
-
-#define ELF_NOTE_OS_LINUX	0
-#define ELF_NOTE_OS_GNU		1
-#define ELF_NOTE_OS_SOLARIS2	2
-#define ELF_NOTE_OS_FREEBSD	3
-
-#define NT_GNU_BUILD_ID	3
-#define NT_GNU_GOLD_VERSION	4
-
-
-
-typedef struct {
-  Elf32_Xword m_value;
-  Elf32_Word m_info;
-  Elf32_Word m_poffset;
-  Elf32_Half m_repeat;
-  Elf32_Half m_stride;
-} Elf32_Move;
-
-typedef struct {
-  Elf64_Xword m_value;
-  Elf64_Xword m_info;
-  Elf64_Xword m_poffset;
-  Elf64_Half m_repeat;
-  Elf64_Half m_stride;
-} Elf64_Move;
-
-
-#define ELF32_M_SYM(info)	((info) >> 8)
-#define ELF32_M_SIZE(info)	((unsigned char) (info))
-#define ELF32_M_INFO(sym, size)	(((sym) << 8) + (unsigned char) (size))
-
-#define ELF64_M_SYM(info)	ELF32_M_SYM (info)
-#define ELF64_M_SIZE(info)	ELF32_M_SIZE (info)
-#define ELF64_M_INFO(sym, size)	ELF32_M_INFO (sym, size)
-
-#define EF_CPU32	0x00810000
-
-#define R_68K_NONE	0
-#define R_68K_32	1
-#define R_68K_16	2
-#define R_68K_8		3
-#define R_68K_PC32	4
-#define R_68K_PC16	5
-#define R_68K_PC8	6
-#define R_68K_GOT32	7
-#define R_68K_GOT16	8
-#define R_68K_GOT8	9
-#define R_68K_GOT32O	10
-#define R_68K_GOT16O	11
-#define R_68K_GOT8O	12
-#define R_68K_PLT32	13
-#define R_68K_PLT16	14
-#define R_68K_PLT8	15
-#define R_68K_PLT32O	16
-#define R_68K_PLT16O	17
-#define R_68K_PLT8O	18
-#define R_68K_COPY	19
-#define R_68K_GLOB_DAT	20
-#define R_68K_JMP_SLOT	21
-#define R_68K_RELATIVE	22
-#define R_68K_NUM	23
-
-#define R_386_NONE	   0
-#define R_386_32	   1
-#define R_386_PC32	   2
-#define R_386_GOT32	   3
-#define R_386_PLT32	   4
-#define R_386_COPY	   5
-#define R_386_GLOB_DAT	   6
-#define R_386_JMP_SLOT	   7
-#define R_386_RELATIVE	   8
-#define R_386_GOTOFF	   9
-#define R_386_GOTPC	   10
-#define R_386_32PLT	   11
-#define R_386_TLS_TPOFF	   14
-#define R_386_TLS_IE	   15
-#define R_386_TLS_GOTIE	   16
-#define R_386_TLS_LE	   17
-#define R_386_TLS_GD	   18
-#define R_386_TLS_LDM	   19
-#define R_386_16	   20
-#define R_386_PC16	   21
-#define R_386_8		   22
-#define R_386_PC8	   23
-#define R_386_TLS_GD_32	   24
-#define R_386_TLS_GD_PUSH  25
-#define R_386_TLS_GD_CALL  26
-#define R_386_TLS_GD_POP   27
-#define R_386_TLS_LDM_32   28
-#define R_386_TLS_LDM_PUSH 29
-#define R_386_TLS_LDM_CALL 30
-#define R_386_TLS_LDM_POP  31
-#define R_386_TLS_LDO_32   32
-#define R_386_TLS_IE_32	   33
-#define R_386_TLS_LE_32	   34
-#define R_386_TLS_DTPMOD32 35
-#define R_386_TLS_DTPOFF32 36
-#define R_386_TLS_TPOFF32  37
-#define R_386_SIZE32       38
-#define R_386_TLS_GOTDESC  39
-#define R_386_TLS_DESC_CALL 40
-#define R_386_TLS_DESC     41
-#define R_386_IRELATIVE	   42
-#define R_386_NUM	   43
-
-
-
-
-
-#define STT_SPARC_REGISTER	13
-
-
-
-#define EF_SPARCV9_MM		3
-#define EF_SPARCV9_TSO		0
-#define EF_SPARCV9_PSO		1
-#define EF_SPARCV9_RMO		2
-#define EF_SPARC_LEDATA		0x800000
-#define EF_SPARC_EXT_MASK	0xFFFF00
-#define EF_SPARC_32PLUS		0x000100
-#define EF_SPARC_SUN_US1	0x000200
-#define EF_SPARC_HAL_R1		0x000400
-#define EF_SPARC_SUN_US3	0x000800
-
-
-
-#define R_SPARC_NONE		0
-#define R_SPARC_8		1
-#define R_SPARC_16		2
-#define R_SPARC_32		3
-#define R_SPARC_DISP8		4
-#define R_SPARC_DISP16		5
-#define R_SPARC_DISP32		6
-#define R_SPARC_WDISP30		7
-#define R_SPARC_WDISP22		8
-#define R_SPARC_HI22		9
-#define R_SPARC_22		10
-#define R_SPARC_13		11
-#define R_SPARC_LO10		12
-#define R_SPARC_GOT10		13
-#define R_SPARC_GOT13		14
-#define R_SPARC_GOT22		15
-#define R_SPARC_PC10		16
-#define R_SPARC_PC22		17
-#define R_SPARC_WPLT30		18
-#define R_SPARC_COPY		19
-#define R_SPARC_GLOB_DAT	20
-#define R_SPARC_JMP_SLOT	21
-#define R_SPARC_RELATIVE	22
-#define R_SPARC_UA32		23
-
-
-
-#define R_SPARC_PLT32		24
-#define R_SPARC_HIPLT22		25
-#define R_SPARC_LOPLT10		26
-#define R_SPARC_PCPLT32		27
-#define R_SPARC_PCPLT22		28
-#define R_SPARC_PCPLT10		29
-#define R_SPARC_10		30
-#define R_SPARC_11		31
-#define R_SPARC_64		32
-#define R_SPARC_OLO10		33
-#define R_SPARC_HH22		34
-#define R_SPARC_HM10		35
-#define R_SPARC_LM22		36
-#define R_SPARC_PC_HH22		37
-#define R_SPARC_PC_HM10		38
-#define R_SPARC_PC_LM22		39
-#define R_SPARC_WDISP16		40
-#define R_SPARC_WDISP19		41
-#define R_SPARC_GLOB_JMP	42
-#define R_SPARC_7		43
-#define R_SPARC_5		44
-#define R_SPARC_6		45
-#define R_SPARC_DISP64		46
-#define R_SPARC_PLT64		47
-#define R_SPARC_HIX22		48
-#define R_SPARC_LOX10		49
-#define R_SPARC_H44		50
-#define R_SPARC_M44		51
-#define R_SPARC_L44		52
-#define R_SPARC_REGISTER	53
-#define R_SPARC_UA64		54
-#define R_SPARC_UA16		55
-#define R_SPARC_TLS_GD_HI22	56
-#define R_SPARC_TLS_GD_LO10	57
-#define R_SPARC_TLS_GD_ADD	58
-#define R_SPARC_TLS_GD_CALL	59
-#define R_SPARC_TLS_LDM_HI22	60
-#define R_SPARC_TLS_LDM_LO10	61
-#define R_SPARC_TLS_LDM_ADD	62
-#define R_SPARC_TLS_LDM_CALL	63
-#define R_SPARC_TLS_LDO_HIX22	64
-#define R_SPARC_TLS_LDO_LOX10	65
-#define R_SPARC_TLS_LDO_ADD	66
-#define R_SPARC_TLS_IE_HI22	67
-#define R_SPARC_TLS_IE_LO10	68
-#define R_SPARC_TLS_IE_LD	69
-#define R_SPARC_TLS_IE_LDX	70
-#define R_SPARC_TLS_IE_ADD	71
-#define R_SPARC_TLS_LE_HIX22	72
-#define R_SPARC_TLS_LE_LOX10	73
-#define R_SPARC_TLS_DTPMOD32	74
-#define R_SPARC_TLS_DTPMOD64	75
-#define R_SPARC_TLS_DTPOFF32	76
-#define R_SPARC_TLS_DTPOFF64	77
-#define R_SPARC_TLS_TPOFF32	78
-#define R_SPARC_TLS_TPOFF64	79
-#define R_SPARC_GOTDATA_HIX22	80
-#define R_SPARC_GOTDATA_LOX10	81
-#define R_SPARC_GOTDATA_OP_HIX22	82
-#define R_SPARC_GOTDATA_OP_LOX10	83
-#define R_SPARC_GOTDATA_OP	84
-#define R_SPARC_H34		85
-#define R_SPARC_SIZE32		86
-#define R_SPARC_SIZE64		87
-#define R_SPARC_GNU_VTINHERIT	250
-#define R_SPARC_GNU_VTENTRY	251
-#define R_SPARC_REV32		252
-
-#define R_SPARC_NUM		253
-
-
-
-#define DT_SPARC_REGISTER 0x70000001
-#define DT_SPARC_NUM	2
-
-
-#define EF_MIPS_NOREORDER   1
-#define EF_MIPS_PIC	    2
-#define EF_MIPS_CPIC	    4
-#define EF_MIPS_XGOT	    8
-#define EF_MIPS_64BIT_WHIRL 16
-#define EF_MIPS_ABI2	    32
-#define EF_MIPS_ABI_ON32    64
-#define EF_MIPS_NAN2008     1024
-#define EF_MIPS_ARCH	    0xf0000000
-
-
-
-#define EF_MIPS_ARCH_1	    0x00000000
-#define EF_MIPS_ARCH_2	    0x10000000
-#define EF_MIPS_ARCH_3	    0x20000000
-#define EF_MIPS_ARCH_4	    0x30000000
-#define EF_MIPS_ARCH_5	    0x40000000
-#define EF_MIPS_ARCH_32     0x50000000
-#define EF_MIPS_ARCH_64     0x60000000
-#define EF_MIPS_ARCH_32R2   0x70000000
-#define EF_MIPS_ARCH_64R2   0x80000000
-
-
-#define E_MIPS_ARCH_1	  0x00000000
-#define E_MIPS_ARCH_2	  0x10000000
-#define E_MIPS_ARCH_3	  0x20000000
-#define E_MIPS_ARCH_4	  0x30000000
-#define E_MIPS_ARCH_5	  0x40000000
-#define E_MIPS_ARCH_32	  0x50000000
-#define E_MIPS_ARCH_64	  0x60000000
-
-
-
-#define SHN_MIPS_ACOMMON    0xff00
-#define SHN_MIPS_TEXT	    0xff01
-#define SHN_MIPS_DATA	    0xff02
-#define SHN_MIPS_SCOMMON    0xff03
-#define SHN_MIPS_SUNDEFINED 0xff04
-
-
-
-#define SHT_MIPS_LIBLIST       0x70000000
-#define SHT_MIPS_MSYM	       0x70000001
-#define SHT_MIPS_CONFLICT      0x70000002
-#define SHT_MIPS_GPTAB	       0x70000003
-#define SHT_MIPS_UCODE	       0x70000004
-#define SHT_MIPS_DEBUG	       0x70000005
-#define SHT_MIPS_REGINFO       0x70000006
-#define SHT_MIPS_PACKAGE       0x70000007
-#define SHT_MIPS_PACKSYM       0x70000008
-#define SHT_MIPS_RELD	       0x70000009
-#define SHT_MIPS_IFACE         0x7000000b
-#define SHT_MIPS_CONTENT       0x7000000c
-#define SHT_MIPS_OPTIONS       0x7000000d
-#define SHT_MIPS_SHDR	       0x70000010
-#define SHT_MIPS_FDESC	       0x70000011
-#define SHT_MIPS_EXTSYM	       0x70000012
-#define SHT_MIPS_DENSE	       0x70000013
-#define SHT_MIPS_PDESC	       0x70000014
-#define SHT_MIPS_LOCSYM	       0x70000015
-#define SHT_MIPS_AUXSYM	       0x70000016
-#define SHT_MIPS_OPTSYM	       0x70000017
-#define SHT_MIPS_LOCSTR	       0x70000018
-#define SHT_MIPS_LINE	       0x70000019
-#define SHT_MIPS_RFDESC	       0x7000001a
-#define SHT_MIPS_DELTASYM      0x7000001b
-#define SHT_MIPS_DELTAINST     0x7000001c
-#define SHT_MIPS_DELTACLASS    0x7000001d
-#define SHT_MIPS_DWARF         0x7000001e
-#define SHT_MIPS_DELTADECL     0x7000001f
-#define SHT_MIPS_SYMBOL_LIB    0x70000020
-#define SHT_MIPS_EVENTS	       0x70000021
-#define SHT_MIPS_TRANSLATE     0x70000022
-#define SHT_MIPS_PIXIE	       0x70000023
-#define SHT_MIPS_XLATE	       0x70000024
-#define SHT_MIPS_XLATE_DEBUG   0x70000025
-#define SHT_MIPS_WHIRL	       0x70000026
-#define SHT_MIPS_EH_REGION     0x70000027
-#define SHT_MIPS_XLATE_OLD     0x70000028
-#define SHT_MIPS_PDR_EXCEPTION 0x70000029
-
-
-
-#define SHF_MIPS_GPREL	 0x10000000
-#define SHF_MIPS_MERGE	 0x20000000
-#define SHF_MIPS_ADDR	 0x40000000
-#define SHF_MIPS_STRINGS 0x80000000
-#define SHF_MIPS_NOSTRIP 0x08000000
-#define SHF_MIPS_LOCAL	 0x04000000
-#define SHF_MIPS_NAMES	 0x02000000
-#define SHF_MIPS_NODUPE	 0x01000000
-
-
-
-
-
-#define STO_MIPS_DEFAULT		0x0
-#define STO_MIPS_INTERNAL		0x1
-#define STO_MIPS_HIDDEN			0x2
-#define STO_MIPS_PROTECTED		0x3
-#define STO_MIPS_PLT			0x8
-#define STO_MIPS_SC_ALIGN_UNUSED	0xff
-
-
-#define STB_MIPS_SPLIT_COMMON		13
-
-
-
-typedef union {
-  struct {
-      Elf32_Word gt_current_g_value;
-      Elf32_Word gt_unused;
-  } gt_header;
-  struct {
-      Elf32_Word gt_g_value;
-      Elf32_Word gt_bytes;
-  } gt_entry;
-} Elf32_gptab;
-
-
-
-typedef struct {
-  Elf32_Word	ri_gprmask;
-  Elf32_Word	ri_cprmask[4];
-  Elf32_Sword	ri_gp_value;
-} Elf32_RegInfo;
-
-
-
-typedef struct {
-  unsigned char kind;
-
-  unsigned char size;
-  Elf32_Section section;
-
-  Elf32_Word info;
-} Elf_Options;
-
-
-
-#define ODK_NULL	0
-#define ODK_REGINFO	1
-#define ODK_EXCEPTIONS	2
-#define ODK_PAD		3
-#define ODK_HWPATCH	4
-#define ODK_FILL	5
-#define ODK_TAGS	6
-#define ODK_HWAND	7
-#define ODK_HWOR	8
-
-
-
-#define OEX_FPU_MIN	0x1f
-#define OEX_FPU_MAX	0x1f00
-#define OEX_PAGE0	0x10000
-#define OEX_SMM		0x20000
-#define OEX_FPDBUG	0x40000
-#define OEX_PRECISEFP	OEX_FPDBUG
-#define OEX_DISMISS	0x80000
-
-#define OEX_FPU_INVAL	0x10
-#define OEX_FPU_DIV0	0x08
-#define OEX_FPU_OFLO	0x04
-#define OEX_FPU_UFLO	0x02
-#define OEX_FPU_INEX	0x01
-
-
-
-#define OHW_R4KEOP	0x1
-#define OHW_R8KPFETCH	0x2
-#define OHW_R5KEOP	0x4
-#define OHW_R5KCVTL	0x8
-
-#define OPAD_PREFIX	0x1
-#define OPAD_POSTFIX	0x2
-#define OPAD_SYMBOL	0x4
-
-
-
-typedef struct {
-  Elf32_Word hwp_flags1;
-  Elf32_Word hwp_flags2;
-} Elf_Options_Hw;
-
-
-
-#define OHWA0_R4KEOP_CHECKED	0x00000001
-#define OHWA1_R4KEOP_CLEAN	0x00000002
-
-
-
-#define R_MIPS_NONE		0
-#define R_MIPS_16		1
-#define R_MIPS_32		2
-#define R_MIPS_REL32		3
-#define R_MIPS_26		4
-#define R_MIPS_HI16		5
-#define R_MIPS_LO16		6
-#define R_MIPS_GPREL16		7
-#define R_MIPS_LITERAL		8
-#define R_MIPS_GOT16		9
-#define R_MIPS_PC16		10
-#define R_MIPS_CALL16		11
-#define R_MIPS_GPREL32		12
-
-#define R_MIPS_SHIFT5		16
-#define R_MIPS_SHIFT6		17
-#define R_MIPS_64		18
-#define R_MIPS_GOT_DISP		19
-#define R_MIPS_GOT_PAGE		20
-#define R_MIPS_GOT_OFST		21
-#define R_MIPS_GOT_HI16		22
-#define R_MIPS_GOT_LO16		23
-#define R_MIPS_SUB		24
-#define R_MIPS_INSERT_A		25
-#define R_MIPS_INSERT_B		26
-#define R_MIPS_DELETE		27
-#define R_MIPS_HIGHER		28
-#define R_MIPS_HIGHEST		29
-#define R_MIPS_CALL_HI16	30
-#define R_MIPS_CALL_LO16	31
-#define R_MIPS_SCN_DISP		32
-#define R_MIPS_REL16		33
-#define R_MIPS_ADD_IMMEDIATE	34
-#define R_MIPS_PJUMP		35
-#define R_MIPS_RELGOT		36
-#define R_MIPS_JALR		37
-#define R_MIPS_TLS_DTPMOD32	38
-#define R_MIPS_TLS_DTPREL32	39
-#define R_MIPS_TLS_DTPMOD64	40
-#define R_MIPS_TLS_DTPREL64	41
-#define R_MIPS_TLS_GD		42
-#define R_MIPS_TLS_LDM		43
-#define R_MIPS_TLS_DTPREL_HI16	44
-#define R_MIPS_TLS_DTPREL_LO16	45
-#define R_MIPS_TLS_GOTTPREL	46
-#define R_MIPS_TLS_TPREL32	47
-#define R_MIPS_TLS_TPREL64	48
-#define R_MIPS_TLS_TPREL_HI16	49
-#define R_MIPS_TLS_TPREL_LO16	50
-#define R_MIPS_GLOB_DAT		51
-#define R_MIPS_COPY		126
-#define R_MIPS_JUMP_SLOT        127
-
-#define R_MIPS_NUM		128
-
-
-
-#define PT_MIPS_REGINFO	0x70000000
-#define PT_MIPS_RTPROC  0x70000001
-#define PT_MIPS_OPTIONS 0x70000002
-
-
-
-#define PF_MIPS_LOCAL	0x10000000
-
-
-
-#define DT_MIPS_RLD_VERSION  0x70000001
-#define DT_MIPS_TIME_STAMP   0x70000002
-#define DT_MIPS_ICHECKSUM    0x70000003
-#define DT_MIPS_IVERSION     0x70000004
-#define DT_MIPS_FLAGS	     0x70000005
-#define DT_MIPS_BASE_ADDRESS 0x70000006
-#define DT_MIPS_MSYM	     0x70000007
-#define DT_MIPS_CONFLICT     0x70000008
-#define DT_MIPS_LIBLIST	     0x70000009
-#define DT_MIPS_LOCAL_GOTNO  0x7000000a
-#define DT_MIPS_CONFLICTNO   0x7000000b
-#define DT_MIPS_LIBLISTNO    0x70000010
-#define DT_MIPS_SYMTABNO     0x70000011
-#define DT_MIPS_UNREFEXTNO   0x70000012
-#define DT_MIPS_GOTSYM	     0x70000013
-#define DT_MIPS_HIPAGENO     0x70000014
-#define DT_MIPS_RLD_MAP	     0x70000016
-#define DT_MIPS_DELTA_CLASS  0x70000017
-#define DT_MIPS_DELTA_CLASS_NO    0x70000018
-
-#define DT_MIPS_DELTA_INSTANCE    0x70000019
-#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a
-
-#define DT_MIPS_DELTA_RELOC  0x7000001b
-#define DT_MIPS_DELTA_RELOC_NO 0x7000001c
-
-#define DT_MIPS_DELTA_SYM    0x7000001d
-
-#define DT_MIPS_DELTA_SYM_NO 0x7000001e
-
-#define DT_MIPS_DELTA_CLASSSYM 0x70000020
-
-#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021
-
-#define DT_MIPS_CXX_FLAGS    0x70000022
-#define DT_MIPS_PIXIE_INIT   0x70000023
-#define DT_MIPS_SYMBOL_LIB   0x70000024
-#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
-#define DT_MIPS_LOCAL_GOTIDX 0x70000026
-#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
-#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
-#define DT_MIPS_OPTIONS	     0x70000029
-#define DT_MIPS_INTERFACE    0x7000002a
-#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
-#define DT_MIPS_INTERFACE_SIZE 0x7000002c
-#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d
-
-#define DT_MIPS_PERF_SUFFIX  0x7000002e
-
-#define DT_MIPS_COMPACT_SIZE 0x7000002f
-#define DT_MIPS_GP_VALUE     0x70000030
-#define DT_MIPS_AUX_DYNAMIC  0x70000031
-
-#define DT_MIPS_PLTGOT	     0x70000032
-
-#define DT_MIPS_RWPLT        0x70000034
-#define DT_MIPS_NUM	     0x35
-
-
-
-#define RHF_NONE		   0
-#define RHF_QUICKSTART		   (1 << 0)
-#define RHF_NOTPOT		   (1 << 1)
-#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2)
-#define RHF_NO_MOVE		   (1 << 3)
-#define RHF_SGI_ONLY		   (1 << 4)
-#define RHF_GUARANTEE_INIT	   (1 << 5)
-#define RHF_DELTA_C_PLUS_PLUS	   (1 << 6)
-#define RHF_GUARANTEE_START_INIT   (1 << 7)
-#define RHF_PIXIE		   (1 << 8)
-#define RHF_DEFAULT_DELAY_LOAD	   (1 << 9)
-#define RHF_REQUICKSTART	   (1 << 10)
-#define RHF_REQUICKSTARTED	   (1 << 11)
-#define RHF_CORD		   (1 << 12)
-#define RHF_NO_UNRES_UNDEF	   (1 << 13)
-#define RHF_RLD_ORDER_SAFE	   (1 << 14)
-
-
-
-typedef struct
-{
-  Elf32_Word l_name;
-  Elf32_Word l_time_stamp;
-  Elf32_Word l_checksum;
-  Elf32_Word l_version;
-  Elf32_Word l_flags;
-} Elf32_Lib;
-
-typedef struct
-{
-  Elf64_Word l_name;
-  Elf64_Word l_time_stamp;
-  Elf64_Word l_checksum;
-  Elf64_Word l_version;
-  Elf64_Word l_flags;
-} Elf64_Lib;
-
-
-
-
-#define LL_NONE		  0
-#define LL_EXACT_MATCH	  (1 << 0)
-#define LL_IGNORE_INT_VER (1 << 1)
-#define LL_REQUIRE_MINOR  (1 << 2)
-#define LL_EXPORTS	  (1 << 3)
-#define LL_DELAY_LOAD	  (1 << 4)
-#define LL_DELTA	  (1 << 5)
-
-
-
-typedef Elf32_Addr Elf32_Conflict;
-
-
-
-
-
-
-#define EF_PARISC_TRAPNIL	0x00010000
-#define EF_PARISC_EXT		0x00020000
-#define EF_PARISC_LSB		0x00040000
-#define EF_PARISC_WIDE		0x00080000
-#define EF_PARISC_NO_KABP	0x00100000
-
-#define EF_PARISC_LAZYSWAP	0x00400000
-#define EF_PARISC_ARCH		0x0000ffff
-
-
-
-#define EFA_PARISC_1_0		    0x020b
-#define EFA_PARISC_1_1		    0x0210
-#define EFA_PARISC_2_0		    0x0214
-
-
-
-#define SHN_PARISC_ANSI_COMMON	0xff00
-
-#define SHN_PARISC_HUGE_COMMON	0xff01
-
-
-
-#define SHT_PARISC_EXT		0x70000000
-#define SHT_PARISC_UNWIND	0x70000001
-#define SHT_PARISC_DOC		0x70000002
-
-
-
-#define SHF_PARISC_SHORT	0x20000000
-#define SHF_PARISC_HUGE		0x40000000
-#define SHF_PARISC_SBP		0x80000000
-
-
-
-#define STT_PARISC_MILLICODE	13
-
-#define STT_HP_OPAQUE		(STT_LOOS + 0x1)
-#define STT_HP_STUB		(STT_LOOS + 0x2)
-
-
-
-#define R_PARISC_NONE		0
-#define R_PARISC_DIR32		1
-#define R_PARISC_DIR21L		2
-#define R_PARISC_DIR17R		3
-#define R_PARISC_DIR17F		4
-#define R_PARISC_DIR14R		6
-#define R_PARISC_PCREL32	9
-#define R_PARISC_PCREL21L	10
-#define R_PARISC_PCREL17R	11
-#define R_PARISC_PCREL17F	12
-#define R_PARISC_PCREL14R	14
-#define R_PARISC_DPREL21L	18
-#define R_PARISC_DPREL14R	22
-#define R_PARISC_GPREL21L	26
-#define R_PARISC_GPREL14R	30
-#define R_PARISC_LTOFF21L	34
-#define R_PARISC_LTOFF14R	38
-#define R_PARISC_SECREL32	41
-#define R_PARISC_SEGBASE	48
-#define R_PARISC_SEGREL32	49
-#define R_PARISC_PLTOFF21L	50
-#define R_PARISC_PLTOFF14R	54
-#define R_PARISC_LTOFF_FPTR32	57
-#define R_PARISC_LTOFF_FPTR21L	58
-#define R_PARISC_LTOFF_FPTR14R	62
-#define R_PARISC_FPTR64		64
-#define R_PARISC_PLABEL32	65
-#define R_PARISC_PLABEL21L	66
-#define R_PARISC_PLABEL14R	70
-#define R_PARISC_PCREL64	72
-#define R_PARISC_PCREL22F	74
-#define R_PARISC_PCREL14WR	75
-#define R_PARISC_PCREL14DR	76
-#define R_PARISC_PCREL16F	77
-#define R_PARISC_PCREL16WF	78
-#define R_PARISC_PCREL16DF	79
-#define R_PARISC_DIR64		80
-#define R_PARISC_DIR14WR	83
-#define R_PARISC_DIR14DR	84
-#define R_PARISC_DIR16F		85
-#define R_PARISC_DIR16WF	86
-#define R_PARISC_DIR16DF	87
-#define R_PARISC_GPREL64	88
-#define R_PARISC_GPREL14WR	91
-#define R_PARISC_GPREL14DR	92
-#define R_PARISC_GPREL16F	93
-#define R_PARISC_GPREL16WF	94
-#define R_PARISC_GPREL16DF	95
-#define R_PARISC_LTOFF64	96
-#define R_PARISC_LTOFF14WR	99
-#define R_PARISC_LTOFF14DR	100
-#define R_PARISC_LTOFF16F	101
-#define R_PARISC_LTOFF16WF	102
-#define R_PARISC_LTOFF16DF	103
-#define R_PARISC_SECREL64	104
-#define R_PARISC_SEGREL64	112
-#define R_PARISC_PLTOFF14WR	115
-#define R_PARISC_PLTOFF14DR	116
-#define R_PARISC_PLTOFF16F	117
-#define R_PARISC_PLTOFF16WF	118
-#define R_PARISC_PLTOFF16DF	119
-#define R_PARISC_LTOFF_FPTR64	120
-#define R_PARISC_LTOFF_FPTR14WR	123
-#define R_PARISC_LTOFF_FPTR14DR	124
-#define R_PARISC_LTOFF_FPTR16F	125
-#define R_PARISC_LTOFF_FPTR16WF	126
-#define R_PARISC_LTOFF_FPTR16DF	127
-#define R_PARISC_LORESERVE	128
-#define R_PARISC_COPY		128
-#define R_PARISC_IPLT		129
-#define R_PARISC_EPLT		130
-#define R_PARISC_TPREL32	153
-#define R_PARISC_TPREL21L	154
-#define R_PARISC_TPREL14R	158
-#define R_PARISC_LTOFF_TP21L	162
-#define R_PARISC_LTOFF_TP14R	166
-#define R_PARISC_LTOFF_TP14F	167
-#define R_PARISC_TPREL64	216
-#define R_PARISC_TPREL14WR	219
-#define R_PARISC_TPREL14DR	220
-#define R_PARISC_TPREL16F	221
-#define R_PARISC_TPREL16WF	222
-#define R_PARISC_TPREL16DF	223
-#define R_PARISC_LTOFF_TP64	224
-#define R_PARISC_LTOFF_TP14WR	227
-#define R_PARISC_LTOFF_TP14DR	228
-#define R_PARISC_LTOFF_TP16F	229
-#define R_PARISC_LTOFF_TP16WF	230
-#define R_PARISC_LTOFF_TP16DF	231
-#define R_PARISC_GNU_VTENTRY	232
-#define R_PARISC_GNU_VTINHERIT	233
-#define R_PARISC_TLS_GD21L	234
-#define R_PARISC_TLS_GD14R	235
-#define R_PARISC_TLS_GDCALL	236
-#define R_PARISC_TLS_LDM21L	237
-#define R_PARISC_TLS_LDM14R	238
-#define R_PARISC_TLS_LDMCALL	239
-#define R_PARISC_TLS_LDO21L	240
-#define R_PARISC_TLS_LDO14R	241
-#define R_PARISC_TLS_DTPMOD32	242
-#define R_PARISC_TLS_DTPMOD64	243
-#define R_PARISC_TLS_DTPOFF32	244
-#define R_PARISC_TLS_DTPOFF64	245
-#define R_PARISC_TLS_LE21L	R_PARISC_TPREL21L
-#define R_PARISC_TLS_LE14R	R_PARISC_TPREL14R
-#define R_PARISC_TLS_IE21L	R_PARISC_LTOFF_TP21L
-#define R_PARISC_TLS_IE14R	R_PARISC_LTOFF_TP14R
-#define R_PARISC_TLS_TPREL32	R_PARISC_TPREL32
-#define R_PARISC_TLS_TPREL64	R_PARISC_TPREL64
-#define R_PARISC_HIRESERVE	255
-
-
-
-#define PT_HP_TLS		(PT_LOOS + 0x0)
-#define PT_HP_CORE_NONE		(PT_LOOS + 0x1)
-#define PT_HP_CORE_VERSION	(PT_LOOS + 0x2)
-#define PT_HP_CORE_KERNEL	(PT_LOOS + 0x3)
-#define PT_HP_CORE_COMM		(PT_LOOS + 0x4)
-#define PT_HP_CORE_PROC		(PT_LOOS + 0x5)
-#define PT_HP_CORE_LOADABLE	(PT_LOOS + 0x6)
-#define PT_HP_CORE_STACK	(PT_LOOS + 0x7)
-#define PT_HP_CORE_SHM		(PT_LOOS + 0x8)
-#define PT_HP_CORE_MMF		(PT_LOOS + 0x9)
-#define PT_HP_PARALLEL		(PT_LOOS + 0x10)
-#define PT_HP_FASTBIND		(PT_LOOS + 0x11)
-#define PT_HP_OPT_ANNOT		(PT_LOOS + 0x12)
-#define PT_HP_HSL_ANNOT		(PT_LOOS + 0x13)
-#define PT_HP_STACK		(PT_LOOS + 0x14)
-
-#define PT_PARISC_ARCHEXT	0x70000000
-#define PT_PARISC_UNWIND	0x70000001
-
-
-
-#define PF_PARISC_SBP		0x08000000
-
-#define PF_HP_PAGE_SIZE		0x00100000
-#define PF_HP_FAR_SHARED	0x00200000
-#define PF_HP_NEAR_SHARED	0x00400000
-#define PF_HP_CODE		0x01000000
-#define PF_HP_MODIFY		0x02000000
-#define PF_HP_LAZYSWAP		0x04000000
-#define PF_HP_SBP		0x08000000
-
-
-
-
-
-
-#define EF_ALPHA_32BIT		1
-#define EF_ALPHA_CANRELAX	2
-
-
-
-
-#define SHT_ALPHA_DEBUG		0x70000001
-#define SHT_ALPHA_REGINFO	0x70000002
-
-
-
-#define SHF_ALPHA_GPREL		0x10000000
-
-
-#define STO_ALPHA_NOPV		0x80
-#define STO_ALPHA_STD_GPLOAD	0x88
-
-
-
-#define R_ALPHA_NONE		0
-#define R_ALPHA_REFLONG		1
-#define R_ALPHA_REFQUAD		2
-#define R_ALPHA_GPREL32		3
-#define R_ALPHA_LITERAL		4
-#define R_ALPHA_LITUSE		5
-#define R_ALPHA_GPDISP		6
-#define R_ALPHA_BRADDR		7
-#define R_ALPHA_HINT		8
-#define R_ALPHA_SREL16		9
-#define R_ALPHA_SREL32		10
-#define R_ALPHA_SREL64		11
-#define R_ALPHA_GPRELHIGH	17
-#define R_ALPHA_GPRELLOW	18
-#define R_ALPHA_GPREL16		19
-#define R_ALPHA_COPY		24
-#define R_ALPHA_GLOB_DAT	25
-#define R_ALPHA_JMP_SLOT	26
-#define R_ALPHA_RELATIVE	27
-#define R_ALPHA_TLS_GD_HI	28
-#define R_ALPHA_TLSGD		29
-#define R_ALPHA_TLS_LDM		30
-#define R_ALPHA_DTPMOD64	31
-#define R_ALPHA_GOTDTPREL	32
-#define R_ALPHA_DTPREL64	33
-#define R_ALPHA_DTPRELHI	34
-#define R_ALPHA_DTPRELLO	35
-#define R_ALPHA_DTPREL16	36
-#define R_ALPHA_GOTTPREL	37
-#define R_ALPHA_TPREL64		38
-#define R_ALPHA_TPRELHI		39
-#define R_ALPHA_TPRELLO		40
-#define R_ALPHA_TPREL16		41
-
-#define R_ALPHA_NUM		46
-
-
-#define LITUSE_ALPHA_ADDR	0
-#define LITUSE_ALPHA_BASE	1
-#define LITUSE_ALPHA_BYTOFF	2
-#define LITUSE_ALPHA_JSR	3
-#define LITUSE_ALPHA_TLS_GD	4
-#define LITUSE_ALPHA_TLS_LDM	5
-
-
-#define DT_ALPHA_PLTRO		(DT_LOPROC + 0)
-#define DT_ALPHA_NUM		1
-
-
-
-
-#define EF_PPC_EMB		0x80000000
-
-
-#define EF_PPC_RELOCATABLE	0x00010000
-#define EF_PPC_RELOCATABLE_LIB	0x00008000
-
-
-
-#define R_PPC_NONE		0
-#define R_PPC_ADDR32		1
-#define R_PPC_ADDR24		2
-#define R_PPC_ADDR16		3
-#define R_PPC_ADDR16_LO		4
-#define R_PPC_ADDR16_HI		5
-#define R_PPC_ADDR16_HA		6
-#define R_PPC_ADDR14		7
-#define R_PPC_ADDR14_BRTAKEN	8
-#define R_PPC_ADDR14_BRNTAKEN	9
-#define R_PPC_REL24		10
-#define R_PPC_REL14		11
-#define R_PPC_REL14_BRTAKEN	12
-#define R_PPC_REL14_BRNTAKEN	13
-#define R_PPC_GOT16		14
-#define R_PPC_GOT16_LO		15
-#define R_PPC_GOT16_HI		16
-#define R_PPC_GOT16_HA		17
-#define R_PPC_PLTREL24		18
-#define R_PPC_COPY		19
-#define R_PPC_GLOB_DAT		20
-#define R_PPC_JMP_SLOT		21
-#define R_PPC_RELATIVE		22
-#define R_PPC_LOCAL24PC		23
-#define R_PPC_UADDR32		24
-#define R_PPC_UADDR16		25
-#define R_PPC_REL32		26
-#define R_PPC_PLT32		27
-#define R_PPC_PLTREL32		28
-#define R_PPC_PLT16_LO		29
-#define R_PPC_PLT16_HI		30
-#define R_PPC_PLT16_HA		31
-#define R_PPC_SDAREL16		32
-#define R_PPC_SECTOFF		33
-#define R_PPC_SECTOFF_LO	34
-#define R_PPC_SECTOFF_HI	35
-#define R_PPC_SECTOFF_HA	36
-
-
-#define R_PPC_TLS		67
-#define R_PPC_DTPMOD32		68
-#define R_PPC_TPREL16		69
-#define R_PPC_TPREL16_LO	70
-#define R_PPC_TPREL16_HI	71
-#define R_PPC_TPREL16_HA	72
-#define R_PPC_TPREL32		73
-#define R_PPC_DTPREL16		74
-#define R_PPC_DTPREL16_LO	75
-#define R_PPC_DTPREL16_HI	76
-#define R_PPC_DTPREL16_HA	77
-#define R_PPC_DTPREL32		78
-#define R_PPC_GOT_TLSGD16	79
-#define R_PPC_GOT_TLSGD16_LO	80
-#define R_PPC_GOT_TLSGD16_HI	81
-#define R_PPC_GOT_TLSGD16_HA	82
-#define R_PPC_GOT_TLSLD16	83
-#define R_PPC_GOT_TLSLD16_LO	84
-#define R_PPC_GOT_TLSLD16_HI	85
-#define R_PPC_GOT_TLSLD16_HA	86
-#define R_PPC_GOT_TPREL16	87
-#define R_PPC_GOT_TPREL16_LO	88
-#define R_PPC_GOT_TPREL16_HI	89
-#define R_PPC_GOT_TPREL16_HA	90
-#define R_PPC_GOT_DTPREL16	91
-#define R_PPC_GOT_DTPREL16_LO	92
-#define R_PPC_GOT_DTPREL16_HI	93
-#define R_PPC_GOT_DTPREL16_HA	94
-
-
-
-#define R_PPC_EMB_NADDR32	101
-#define R_PPC_EMB_NADDR16	102
-#define R_PPC_EMB_NADDR16_LO	103
-#define R_PPC_EMB_NADDR16_HI	104
-#define R_PPC_EMB_NADDR16_HA	105
-#define R_PPC_EMB_SDAI16	106
-#define R_PPC_EMB_SDA2I16	107
-#define R_PPC_EMB_SDA2REL	108
-#define R_PPC_EMB_SDA21		109
-#define R_PPC_EMB_MRKREF	110
-#define R_PPC_EMB_RELSEC16	111
-#define R_PPC_EMB_RELST_LO	112
-#define R_PPC_EMB_RELST_HI	113
-#define R_PPC_EMB_RELST_HA	114
-#define R_PPC_EMB_BIT_FLD	115
-#define R_PPC_EMB_RELSDA	116
-
-
-#define R_PPC_DIAB_SDA21_LO	180
-#define R_PPC_DIAB_SDA21_HI	181
-#define R_PPC_DIAB_SDA21_HA	182
-#define R_PPC_DIAB_RELSDA_LO	183
-#define R_PPC_DIAB_RELSDA_HI	184
-#define R_PPC_DIAB_RELSDA_HA	185
-
-
-#define R_PPC_IRELATIVE		248
-
-
-#define R_PPC_REL16		249
-#define R_PPC_REL16_LO		250
-#define R_PPC_REL16_HI		251
-#define R_PPC_REL16_HA		252
-
-
-
-#define R_PPC_TOC16		255
-
-
-#define DT_PPC_GOT		(DT_LOPROC + 0)
-#define DT_PPC_NUM		1
-
-
-#define R_PPC64_NONE		R_PPC_NONE
-#define R_PPC64_ADDR32		R_PPC_ADDR32
-#define R_PPC64_ADDR24		R_PPC_ADDR24
-#define R_PPC64_ADDR16		R_PPC_ADDR16
-#define R_PPC64_ADDR16_LO	R_PPC_ADDR16_LO
-#define R_PPC64_ADDR16_HI	R_PPC_ADDR16_HI
-#define R_PPC64_ADDR16_HA	R_PPC_ADDR16_HA
-#define R_PPC64_ADDR14		R_PPC_ADDR14
-#define R_PPC64_ADDR14_BRTAKEN	R_PPC_ADDR14_BRTAKEN
-#define R_PPC64_ADDR14_BRNTAKEN	R_PPC_ADDR14_BRNTAKEN
-#define R_PPC64_REL24		R_PPC_REL24
-#define R_PPC64_REL14		R_PPC_REL14
-#define R_PPC64_REL14_BRTAKEN	R_PPC_REL14_BRTAKEN
-#define R_PPC64_REL14_BRNTAKEN	R_PPC_REL14_BRNTAKEN
-#define R_PPC64_GOT16		R_PPC_GOT16
-#define R_PPC64_GOT16_LO	R_PPC_GOT16_LO
-#define R_PPC64_GOT16_HI	R_PPC_GOT16_HI
-#define R_PPC64_GOT16_HA	R_PPC_GOT16_HA
-
-#define R_PPC64_COPY		R_PPC_COPY
-#define R_PPC64_GLOB_DAT	R_PPC_GLOB_DAT
-#define R_PPC64_JMP_SLOT	R_PPC_JMP_SLOT
-#define R_PPC64_RELATIVE	R_PPC_RELATIVE
-
-#define R_PPC64_UADDR32		R_PPC_UADDR32
-#define R_PPC64_UADDR16		R_PPC_UADDR16
-#define R_PPC64_REL32		R_PPC_REL32
-#define R_PPC64_PLT32		R_PPC_PLT32
-#define R_PPC64_PLTREL32	R_PPC_PLTREL32
-#define R_PPC64_PLT16_LO	R_PPC_PLT16_LO
-#define R_PPC64_PLT16_HI	R_PPC_PLT16_HI
-#define R_PPC64_PLT16_HA	R_PPC_PLT16_HA
-
-#define R_PPC64_SECTOFF		R_PPC_SECTOFF
-#define R_PPC64_SECTOFF_LO	R_PPC_SECTOFF_LO
-#define R_PPC64_SECTOFF_HI	R_PPC_SECTOFF_HI
-#define R_PPC64_SECTOFF_HA	R_PPC_SECTOFF_HA
-#define R_PPC64_ADDR30		37
-#define R_PPC64_ADDR64		38
-#define R_PPC64_ADDR16_HIGHER	39
-#define R_PPC64_ADDR16_HIGHERA	40
-#define R_PPC64_ADDR16_HIGHEST	41
-#define R_PPC64_ADDR16_HIGHESTA	42
-#define R_PPC64_UADDR64		43
-#define R_PPC64_REL64		44
-#define R_PPC64_PLT64		45
-#define R_PPC64_PLTREL64	46
-#define R_PPC64_TOC16		47
-#define R_PPC64_TOC16_LO	48
-#define R_PPC64_TOC16_HI	49
-#define R_PPC64_TOC16_HA	50
-#define R_PPC64_TOC		51
-#define R_PPC64_PLTGOT16	52
-#define R_PPC64_PLTGOT16_LO	53
-#define R_PPC64_PLTGOT16_HI	54
-#define R_PPC64_PLTGOT16_HA	55
-
-#define R_PPC64_ADDR16_DS	56
-#define R_PPC64_ADDR16_LO_DS	57
-#define R_PPC64_GOT16_DS	58
-#define R_PPC64_GOT16_LO_DS	59
-#define R_PPC64_PLT16_LO_DS	60
-#define R_PPC64_SECTOFF_DS	61
-#define R_PPC64_SECTOFF_LO_DS	62
-#define R_PPC64_TOC16_DS	63
-#define R_PPC64_TOC16_LO_DS	64
-#define R_PPC64_PLTGOT16_DS	65
-#define R_PPC64_PLTGOT16_LO_DS	66
-
-
-#define R_PPC64_TLS		67
-#define R_PPC64_DTPMOD64	68
-#define R_PPC64_TPREL16		69
-#define R_PPC64_TPREL16_LO	70
-#define R_PPC64_TPREL16_HI	71
-#define R_PPC64_TPREL16_HA	72
-#define R_PPC64_TPREL64		73
-#define R_PPC64_DTPREL16	74
-#define R_PPC64_DTPREL16_LO	75
-#define R_PPC64_DTPREL16_HI	76
-#define R_PPC64_DTPREL16_HA	77
-#define R_PPC64_DTPREL64	78
-#define R_PPC64_GOT_TLSGD16	79
-#define R_PPC64_GOT_TLSGD16_LO	80
-#define R_PPC64_GOT_TLSGD16_HI	81
-#define R_PPC64_GOT_TLSGD16_HA	82
-#define R_PPC64_GOT_TLSLD16	83
-#define R_PPC64_GOT_TLSLD16_LO	84
-#define R_PPC64_GOT_TLSLD16_HI	85
-#define R_PPC64_GOT_TLSLD16_HA	86
-#define R_PPC64_GOT_TPREL16_DS	87
-#define R_PPC64_GOT_TPREL16_LO_DS 88
-#define R_PPC64_GOT_TPREL16_HI	89
-#define R_PPC64_GOT_TPREL16_HA	90
-#define R_PPC64_GOT_DTPREL16_DS	91
-#define R_PPC64_GOT_DTPREL16_LO_DS 92
-#define R_PPC64_GOT_DTPREL16_HI	93
-#define R_PPC64_GOT_DTPREL16_HA	94
-#define R_PPC64_TPREL16_DS	95
-#define R_PPC64_TPREL16_LO_DS	96
-#define R_PPC64_TPREL16_HIGHER	97
-#define R_PPC64_TPREL16_HIGHERA	98
-#define R_PPC64_TPREL16_HIGHEST	99
-#define R_PPC64_TPREL16_HIGHESTA 100
-#define R_PPC64_DTPREL16_DS	101
-#define R_PPC64_DTPREL16_LO_DS	102
-#define R_PPC64_DTPREL16_HIGHER	103
-#define R_PPC64_DTPREL16_HIGHERA 104
-#define R_PPC64_DTPREL16_HIGHEST 105
-#define R_PPC64_DTPREL16_HIGHESTA 106
-
-
-#define R_PPC64_JMP_IREL	247
-#define R_PPC64_IRELATIVE	248
-#define R_PPC64_REL16		249
-#define R_PPC64_REL16_LO	250
-#define R_PPC64_REL16_HI	251
-#define R_PPC64_REL16_HA	252
-
-
-#define DT_PPC64_GLINK  (DT_LOPROC + 0)
-#define DT_PPC64_OPD	(DT_LOPROC + 1)
-#define DT_PPC64_OPDSZ	(DT_LOPROC + 2)
-#define DT_PPC64_NUM    3
-
-
-
-
-
-#define EF_ARM_RELEXEC		0x01
-#define EF_ARM_HASENTRY		0x02
-#define EF_ARM_INTERWORK	0x04
-#define EF_ARM_APCS_26		0x08
-#define EF_ARM_APCS_FLOAT	0x10
-#define EF_ARM_PIC		0x20
-#define EF_ARM_ALIGN8		0x40
-#define EF_ARM_NEW_ABI		0x80
-#define EF_ARM_OLD_ABI		0x100
-#define EF_ARM_SOFT_FLOAT	0x200
-#define EF_ARM_VFP_FLOAT	0x400
-#define EF_ARM_MAVERICK_FLOAT	0x800
-
-#define EF_ARM_ABI_FLOAT_SOFT	0x200
-#define EF_ARM_ABI_FLOAT_HARD	0x400
-
-
-#define EF_ARM_SYMSARESORTED	0x04
-#define EF_ARM_DYNSYMSUSESEGIDX	0x08
-#define EF_ARM_MAPSYMSFIRST	0x10
-#define EF_ARM_EABIMASK		0XFF000000
-
-
-#define EF_ARM_BE8	    0x00800000
-#define EF_ARM_LE8	    0x00400000
-
-#define EF_ARM_EABI_VERSION(flags)	((flags) & EF_ARM_EABIMASK)
-#define EF_ARM_EABI_UNKNOWN	0x00000000
-#define EF_ARM_EABI_VER1	0x01000000
-#define EF_ARM_EABI_VER2	0x02000000
-#define EF_ARM_EABI_VER3	0x03000000
-#define EF_ARM_EABI_VER4	0x04000000
-#define EF_ARM_EABI_VER5	0x05000000
-
-
-#define STT_ARM_TFUNC		STT_LOPROC
-#define STT_ARM_16BIT		STT_HIPROC
-
-
-#define SHF_ARM_ENTRYSECT	0x10000000
-#define SHF_ARM_COMDEF		0x80000000
-
-
-
-#define PF_ARM_SB		0x10000000
-
-#define PF_ARM_PI		0x20000000
-#define PF_ARM_ABS		0x40000000
-
-
-#define PT_ARM_EXIDX		(PT_LOPROC + 1)
-
-
-#define SHT_ARM_EXIDX		(SHT_LOPROC + 1)
-#define SHT_ARM_PREEMPTMAP	(SHT_LOPROC + 2)
-#define SHT_ARM_ATTRIBUTES	(SHT_LOPROC + 3)
-
-
-#define R_AARCH64_NONE            0
-#define R_AARCH64_ABS64         257
-#define R_AARCH64_ABS32         258
-#define R_AARCH64_ABS16		259
-#define R_AARCH64_PREL64	260
-#define R_AARCH64_PREL32	261
-#define R_AARCH64_PREL16	262
-#define R_AARCH64_MOVW_UABS_G0	263
-#define R_AARCH64_MOVW_UABS_G0_NC 264
-#define R_AARCH64_MOVW_UABS_G1	265
-#define R_AARCH64_MOVW_UABS_G1_NC 266
-#define R_AARCH64_MOVW_UABS_G2	267
-#define R_AARCH64_MOVW_UABS_G2_NC 268
-#define R_AARCH64_MOVW_UABS_G3	269
-#define R_AARCH64_MOVW_SABS_G0	270
-#define R_AARCH64_MOVW_SABS_G1	271
-#define R_AARCH64_MOVW_SABS_G2	272
-#define R_AARCH64_LD_PREL_LO19	273
-#define R_AARCH64_ADR_PREL_LO21	274
-#define R_AARCH64_ADR_PREL_PG_HI21 275
-#define R_AARCH64_ADR_PREL_PG_HI21_NC 276
-#define R_AARCH64_ADD_ABS_LO12_NC 277
-#define R_AARCH64_LDST8_ABS_LO12_NC 278
-#define R_AARCH64_TSTBR14	279
-#define R_AARCH64_CONDBR19	280
-#define R_AARCH64_JUMP26	282
-#define R_AARCH64_CALL26	283
-#define R_AARCH64_LDST16_ABS_LO12_NC 284
-#define R_AARCH64_LDST32_ABS_LO12_NC 285
-#define R_AARCH64_LDST64_ABS_LO12_NC 286
-#define R_AARCH64_MOVW_PREL_G0	287
-#define R_AARCH64_MOVW_PREL_G0_NC 288
-#define R_AARCH64_MOVW_PREL_G1	289
-#define R_AARCH64_MOVW_PREL_G1_NC 290
-#define R_AARCH64_MOVW_PREL_G2	291
-#define R_AARCH64_MOVW_PREL_G2_NC 292
-#define R_AARCH64_MOVW_PREL_G3	293
-#define R_AARCH64_LDST128_ABS_LO12_NC 299
-#define R_AARCH64_MOVW_GOTOFF_G0 300
-#define R_AARCH64_MOVW_GOTOFF_G0_NC 301
-#define R_AARCH64_MOVW_GOTOFF_G1 302
-#define R_AARCH64_MOVW_GOTOFF_G1_NC 303
-#define R_AARCH64_MOVW_GOTOFF_G2 304
-#define R_AARCH64_MOVW_GOTOFF_G2_NC 305
-#define R_AARCH64_MOVW_GOTOFF_G3 306
-#define R_AARCH64_GOTREL64	307
-#define R_AARCH64_GOTREL32	308
-#define R_AARCH64_GOT_LD_PREL19	309
-#define R_AARCH64_LD64_GOTOFF_LO15 310
-#define R_AARCH64_ADR_GOT_PAGE	311
-#define R_AARCH64_LD64_GOT_LO12_NC 312
-#define R_AARCH64_LD64_GOTPAGE_LO15 313
-#define R_AARCH64_TLSGD_ADR_PREL21 512
-#define R_AARCH64_TLSGD_ADR_PAGE21 513
-#define R_AARCH64_TLSGD_ADD_LO12_NC 514
-#define R_AARCH64_TLSGD_MOVW_G1	515
-#define R_AARCH64_TLSGD_MOVW_G0_NC 516
-#define R_AARCH64_TLSLD_ADR_PREL21 517
-#define R_AARCH64_TLSLD_ADR_PAGE21 518
-#define R_AARCH64_TLSLD_ADD_LO12_NC 519
-#define R_AARCH64_TLSLD_MOVW_G1	520
-#define R_AARCH64_TLSLD_MOVW_G0_NC 521
-#define R_AARCH64_TLSLD_LD_PREL19 522
-#define R_AARCH64_TLSLD_MOVW_DTPREL_G2 523
-#define R_AARCH64_TLSLD_MOVW_DTPREL_G1 524
-#define R_AARCH64_TLSLD_MOVW_DTPREL_G1_NC 525
-#define R_AARCH64_TLSLD_MOVW_DTPREL_G0 526
-#define R_AARCH64_TLSLD_MOVW_DTPREL_G0_NC 527
-#define R_AARCH64_TLSLD_ADD_DTPREL_HI12 528
-#define R_AARCH64_TLSLD_ADD_DTPREL_LO12 529
-#define R_AARCH64_TLSLD_ADD_DTPREL_LO12_NC 530
-#define R_AARCH64_TLSLD_LDST8_DTPREL_LO12 531
-#define R_AARCH64_TLSLD_LDST8_DTPREL_LO12_NC 532
-#define R_AARCH64_TLSLD_LDST16_DTPREL_LO12 533
-#define R_AARCH64_TLSLD_LDST16_DTPREL_LO12_NC 534
-#define R_AARCH64_TLSLD_LDST32_DTPREL_LO12 535
-#define R_AARCH64_TLSLD_LDST32_DTPREL_LO12_NC 536
-#define R_AARCH64_TLSLD_LDST64_DTPREL_LO12 537
-#define R_AARCH64_TLSLD_LDST64_DTPREL_LO12_NC 538
-#define R_AARCH64_TLSIE_MOVW_GOTTPREL_G1 539
-#define R_AARCH64_TLSIE_MOVW_GOTTPREL_G0_NC 540
-#define R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21 541
-#define R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC 542
-#define R_AARCH64_TLSIE_LD_GOTTPREL_PREL19 543
-#define R_AARCH64_TLSLE_MOVW_TPREL_G2 544
-#define R_AARCH64_TLSLE_MOVW_TPREL_G1 545
-#define R_AARCH64_TLSLE_MOVW_TPREL_G1_NC 546
-#define R_AARCH64_TLSLE_MOVW_TPREL_G0 547
-#define R_AARCH64_TLSLE_MOVW_TPREL_G0_NC 548
-#define R_AARCH64_TLSLE_ADD_TPREL_HI12 549
-#define R_AARCH64_TLSLE_ADD_TPREL_LO12 550
-#define R_AARCH64_TLSLE_ADD_TPREL_LO12_NC 551
-#define R_AARCH64_TLSLE_LDST8_TPREL_LO12 552
-#define R_AARCH64_TLSLE_LDST8_TPREL_LO12_NC 553
-#define R_AARCH64_TLSLE_LDST16_TPREL_LO12 554
-#define R_AARCH64_TLSLE_LDST16_TPREL_LO12_NC 555
-#define R_AARCH64_TLSLE_LDST32_TPREL_LO12 556
-#define R_AARCH64_TLSLE_LDST32_TPREL_LO12_NC 557
-#define R_AARCH64_TLSLE_LDST64_TPREL_LO12 558
-#define R_AARCH64_TLSLE_LDST64_TPREL_LO12_NC 559
-#define R_AARCH64_TLSDESC_LD_PREL19 560
-#define R_AARCH64_TLSDESC_ADR_PREL21 561
-#define R_AARCH64_TLSDESC_ADR_PAGE21 562
-#define R_AARCH64_TLSDESC_LD64_LO12 563
-#define R_AARCH64_TLSDESC_ADD_LO12 564
-#define R_AARCH64_TLSDESC_OFF_G1 565
-#define R_AARCH64_TLSDESC_OFF_G0_NC 566
-#define R_AARCH64_TLSDESC_LDR	567
-#define R_AARCH64_TLSDESC_ADD	568
-#define R_AARCH64_TLSDESC_CALL	569
-#define R_AARCH64_TLSLE_LDST128_TPREL_LO12 570
-#define R_AARCH64_TLSLE_LDST128_TPREL_LO12_NC 571
-#define R_AARCH64_TLSLD_LDST128_DTPREL_LO12 572
-#define R_AARCH64_TLSLD_LDST128_DTPREL_LO12_NC 573
-#define R_AARCH64_COPY         1024
-#define R_AARCH64_GLOB_DAT     1025
-#define R_AARCH64_JUMP_SLOT    1026
-#define R_AARCH64_RELATIVE     1027
-#define R_AARCH64_TLS_DTPMOD64 1028
-#define R_AARCH64_TLS_DTPREL64 1029
-#define R_AARCH64_TLS_TPREL64  1030
-#define R_AARCH64_TLSDESC      1031
-
-
-#define R_ARM_NONE		0
-#define R_ARM_PC24		1
-#define R_ARM_ABS32		2
-#define R_ARM_REL32		3
-#define R_ARM_PC13		4
-#define R_ARM_ABS16		5
-#define R_ARM_ABS12		6
-#define R_ARM_THM_ABS5		7
-#define R_ARM_ABS8		8
-#define R_ARM_SBREL32		9
-#define R_ARM_THM_PC22		10
-#define R_ARM_THM_PC8		11
-#define R_ARM_AMP_VCALL9	12
-#define R_ARM_TLS_DESC		13
-#define R_ARM_THM_SWI8		14
-#define R_ARM_XPC25		15
-#define R_ARM_THM_XPC22		16
-#define R_ARM_TLS_DTPMOD32	17
-#define R_ARM_TLS_DTPOFF32	18
-#define R_ARM_TLS_TPOFF32	19
-#define R_ARM_COPY		20
-#define R_ARM_GLOB_DAT		21
-#define R_ARM_JUMP_SLOT		22
-#define R_ARM_RELATIVE		23
-#define R_ARM_GOTOFF		24
-#define R_ARM_GOTPC		25
-#define R_ARM_GOT32		26
-#define R_ARM_PLT32		27
-#define R_ARM_CALL		28
-#define R_ARM_JUMP24		29
-#define R_ARM_THM_JUMP24	30
-#define R_ARM_BASE_ABS		31
-#define R_ARM_ALU_PCREL_7_0	32
-#define R_ARM_ALU_PCREL_15_8	33
-#define R_ARM_ALU_PCREL_23_15	34
-#define R_ARM_LDR_SBREL_11_0	35
-#define R_ARM_ALU_SBREL_19_12	36
-#define R_ARM_ALU_SBREL_27_20	37
-#define R_ARM_TARGET1		38
-#define R_ARM_SBREL31		39
-#define R_ARM_V4BX		40
-#define R_ARM_TARGET2		41
-#define R_ARM_PREL31		42
-#define R_ARM_MOVW_ABS_NC	43
-#define R_ARM_MOVT_ABS		44
-#define R_ARM_MOVW_PREL_NC	45
-#define R_ARM_MOVT_PREL		46
-#define R_ARM_THM_MOVW_ABS_NC	47
-#define R_ARM_THM_MOVT_ABS	48
-#define R_ARM_THM_MOVW_PREL_NC	49
-#define R_ARM_THM_MOVT_PREL	50
-#define R_ARM_THM_JUMP19	51
-#define R_ARM_THM_JUMP6		52
-#define R_ARM_THM_ALU_PREL_11_0	53
-#define R_ARM_THM_PC12		54
-#define R_ARM_ABS32_NOI		55
-#define R_ARM_REL32_NOI		56
-#define R_ARM_ALU_PC_G0_NC	57
-#define R_ARM_ALU_PC_G0		58
-#define R_ARM_ALU_PC_G1_NC	59
-#define R_ARM_ALU_PC_G1		60
-#define R_ARM_ALU_PC_G2		61
-#define R_ARM_LDR_PC_G1		62
-#define R_ARM_LDR_PC_G2		63
-#define R_ARM_LDRS_PC_G0	64
-#define R_ARM_LDRS_PC_G1	65
-#define R_ARM_LDRS_PC_G2	66
-#define R_ARM_LDC_PC_G0		67
-#define R_ARM_LDC_PC_G1		68
-#define R_ARM_LDC_PC_G2		69
-#define R_ARM_ALU_SB_G0_NC	70
-#define R_ARM_ALU_SB_G0		71
-#define R_ARM_ALU_SB_G1_NC	72
-#define R_ARM_ALU_SB_G1		73
-#define R_ARM_ALU_SB_G2		74
-#define R_ARM_LDR_SB_G0		75
-#define R_ARM_LDR_SB_G1		76
-#define R_ARM_LDR_SB_G2		77
-#define R_ARM_LDRS_SB_G0	78
-#define R_ARM_LDRS_SB_G1	79
-#define R_ARM_LDRS_SB_G2	80
-#define R_ARM_LDC_SB_G0		81
-#define R_ARM_LDC_SB_G1		82
-#define R_ARM_LDC_SB_G2		83
-#define R_ARM_MOVW_BREL_NC	84
-#define R_ARM_MOVT_BREL		85
-#define R_ARM_MOVW_BREL		86
-#define R_ARM_THM_MOVW_BREL_NC	87
-#define R_ARM_THM_MOVT_BREL	88
-#define R_ARM_THM_MOVW_BREL	89
-#define R_ARM_TLS_GOTDESC	90
-#define R_ARM_TLS_CALL		91
-#define R_ARM_TLS_DESCSEQ	92
-#define R_ARM_THM_TLS_CALL	93
-#define R_ARM_PLT32_ABS		94
-#define R_ARM_GOT_ABS		95
-#define R_ARM_GOT_PREL		96
-#define R_ARM_GOT_BREL12	97
-#define R_ARM_GOTOFF12		98
-#define R_ARM_GOTRELAX		99
-#define R_ARM_GNU_VTENTRY	100
-#define R_ARM_GNU_VTINHERIT	101
-#define R_ARM_THM_PC11		102
-#define R_ARM_THM_PC9		103
-#define R_ARM_TLS_GD32		104
-
-#define R_ARM_TLS_LDM32		105
-
-#define R_ARM_TLS_LDO32		106
-
-#define R_ARM_TLS_IE32		107
-
-#define R_ARM_TLS_LE32		108
-#define R_ARM_TLS_LDO12		109
-#define R_ARM_TLS_LE12		110
-#define R_ARM_TLS_IE12GP	111
-#define R_ARM_ME_TOO		128
-#define R_ARM_THM_TLS_DESCSEQ	129
-#define R_ARM_THM_TLS_DESCSEQ16	129
-#define R_ARM_THM_TLS_DESCSEQ32	130
-#define R_ARM_THM_GOT_BREL12	131
-#define R_ARM_IRELATIVE		160
-#define R_ARM_RXPC25		249
-#define R_ARM_RSBREL32		250
-#define R_ARM_THM_RPC22		251
-#define R_ARM_RREL32		252
-#define R_ARM_RABS22		253
-#define R_ARM_RPC24		254
-#define R_ARM_RBASE		255
-
-#define R_ARM_NUM		256
-
-
-
-
-#define EF_IA_64_MASKOS		0x0000000f
-#define EF_IA_64_ABI64		0x00000010
-#define EF_IA_64_ARCH		0xff000000
-
-
-#define PT_IA_64_ARCHEXT	(PT_LOPROC + 0)
-#define PT_IA_64_UNWIND		(PT_LOPROC + 1)
-#define PT_IA_64_HP_OPT_ANOT	(PT_LOOS + 0x12)
-#define PT_IA_64_HP_HSL_ANOT	(PT_LOOS + 0x13)
-#define PT_IA_64_HP_STACK	(PT_LOOS + 0x14)
-
-
-#define PF_IA_64_NORECOV	0x80000000
-
-
-#define SHT_IA_64_EXT		(SHT_LOPROC + 0)
-#define SHT_IA_64_UNWIND	(SHT_LOPROC + 1)
-
-
-#define SHF_IA_64_SHORT		0x10000000
-#define SHF_IA_64_NORECOV	0x20000000
-
-
-#define DT_IA_64_PLT_RESERVE	(DT_LOPROC + 0)
-#define DT_IA_64_NUM		1
-
-
-#define R_IA64_NONE		0x00
-#define R_IA64_IMM14		0x21
-#define R_IA64_IMM22		0x22
-#define R_IA64_IMM64		0x23
-#define R_IA64_DIR32MSB		0x24
-#define R_IA64_DIR32LSB		0x25
-#define R_IA64_DIR64MSB		0x26
-#define R_IA64_DIR64LSB		0x27
-#define R_IA64_GPREL22		0x2a
-#define R_IA64_GPREL64I		0x2b
-#define R_IA64_GPREL32MSB	0x2c
-#define R_IA64_GPREL32LSB	0x2d
-#define R_IA64_GPREL64MSB	0x2e
-#define R_IA64_GPREL64LSB	0x2f
-#define R_IA64_LTOFF22		0x32
-#define R_IA64_LTOFF64I		0x33
-#define R_IA64_PLTOFF22		0x3a
-#define R_IA64_PLTOFF64I	0x3b
-#define R_IA64_PLTOFF64MSB	0x3e
-#define R_IA64_PLTOFF64LSB	0x3f
-#define R_IA64_FPTR64I		0x43
-#define R_IA64_FPTR32MSB	0x44
-#define R_IA64_FPTR32LSB	0x45
-#define R_IA64_FPTR64MSB	0x46
-#define R_IA64_FPTR64LSB	0x47
-#define R_IA64_PCREL60B		0x48
-#define R_IA64_PCREL21B		0x49
-#define R_IA64_PCREL21M		0x4a
-#define R_IA64_PCREL21F		0x4b
-#define R_IA64_PCREL32MSB	0x4c
-#define R_IA64_PCREL32LSB	0x4d
-#define R_IA64_PCREL64MSB	0x4e
-#define R_IA64_PCREL64LSB	0x4f
-#define R_IA64_LTOFF_FPTR22	0x52
-#define R_IA64_LTOFF_FPTR64I	0x53
-#define R_IA64_LTOFF_FPTR32MSB	0x54
-#define R_IA64_LTOFF_FPTR32LSB	0x55
-#define R_IA64_LTOFF_FPTR64MSB	0x56
-#define R_IA64_LTOFF_FPTR64LSB	0x57
-#define R_IA64_SEGREL32MSB	0x5c
-#define R_IA64_SEGREL32LSB	0x5d
-#define R_IA64_SEGREL64MSB	0x5e
-#define R_IA64_SEGREL64LSB	0x5f
-#define R_IA64_SECREL32MSB	0x64
-#define R_IA64_SECREL32LSB	0x65
-#define R_IA64_SECREL64MSB	0x66
-#define R_IA64_SECREL64LSB	0x67
-#define R_IA64_REL32MSB		0x6c
-#define R_IA64_REL32LSB		0x6d
-#define R_IA64_REL64MSB		0x6e
-#define R_IA64_REL64LSB		0x6f
-#define R_IA64_LTV32MSB		0x74
-#define R_IA64_LTV32LSB		0x75
-#define R_IA64_LTV64MSB		0x76
-#define R_IA64_LTV64LSB		0x77
-#define R_IA64_PCREL21BI	0x79
-#define R_IA64_PCREL22		0x7a
-#define R_IA64_PCREL64I		0x7b
-#define R_IA64_IPLTMSB		0x80
-#define R_IA64_IPLTLSB		0x81
-#define R_IA64_COPY		0x84
-#define R_IA64_SUB		0x85
-#define R_IA64_LTOFF22X		0x86
-#define R_IA64_LDXMOV		0x87
-#define R_IA64_TPREL14		0x91
-#define R_IA64_TPREL22		0x92
-#define R_IA64_TPREL64I		0x93
-#define R_IA64_TPREL64MSB	0x96
-#define R_IA64_TPREL64LSB	0x97
-#define R_IA64_LTOFF_TPREL22	0x9a
-#define R_IA64_DTPMOD64MSB	0xa6
-#define R_IA64_DTPMOD64LSB	0xa7
-#define R_IA64_LTOFF_DTPMOD22	0xaa
-#define R_IA64_DTPREL14		0xb1
-#define R_IA64_DTPREL22		0xb2
-#define R_IA64_DTPREL64I	0xb3
-#define R_IA64_DTPREL32MSB	0xb4
-#define R_IA64_DTPREL32LSB	0xb5
-#define R_IA64_DTPREL64MSB	0xb6
-#define R_IA64_DTPREL64LSB	0xb7
-#define R_IA64_LTOFF_DTPREL22	0xba
-
-
-
-
-#define	R_SH_NONE		0
-#define	R_SH_DIR32		1
-#define	R_SH_REL32		2
-#define	R_SH_DIR8WPN		3
-#define	R_SH_IND12W		4
-#define	R_SH_DIR8WPL		5
-#define	R_SH_DIR8WPZ		6
-#define	R_SH_DIR8BP		7
-#define	R_SH_DIR8W		8
-#define	R_SH_DIR8L		9
-#define	R_SH_SWITCH16		25
-#define	R_SH_SWITCH32		26
-#define	R_SH_USES		27
-#define	R_SH_COUNT		28
-#define	R_SH_ALIGN		29
-#define	R_SH_CODE		30
-#define	R_SH_DATA		31
-#define	R_SH_LABEL		32
-#define	R_SH_SWITCH8		33
-#define	R_SH_GNU_VTINHERIT	34
-#define	R_SH_GNU_VTENTRY	35
-#define	R_SH_TLS_GD_32		144
-#define	R_SH_TLS_LD_32		145
-#define	R_SH_TLS_LDO_32		146
-#define	R_SH_TLS_IE_32		147
-#define	R_SH_TLS_LE_32		148
-#define	R_SH_TLS_DTPMOD32	149
-#define	R_SH_TLS_DTPOFF32	150
-#define	R_SH_TLS_TPOFF32	151
-#define	R_SH_GOT32		160
-#define	R_SH_PLT32		161
-#define	R_SH_COPY		162
-#define	R_SH_GLOB_DAT		163
-#define	R_SH_JMP_SLOT		164
-#define	R_SH_RELATIVE		165
-#define	R_SH_GOTOFF		166
-#define	R_SH_GOTPC		167
-
-#define	R_SH_NUM		256
-
-
-
-#define R_390_NONE		0
-#define R_390_8			1
-#define R_390_12		2
-#define R_390_16		3
-#define R_390_32		4
-#define R_390_PC32		5
-#define R_390_GOT12		6
-#define R_390_GOT32		7
-#define R_390_PLT32		8
-#define R_390_COPY		9
-#define R_390_GLOB_DAT		10
-#define R_390_JMP_SLOT		11
-#define R_390_RELATIVE		12
-#define R_390_GOTOFF32		13
-#define R_390_GOTPC		14
-#define R_390_GOT16		15
-#define R_390_PC16		16
-#define R_390_PC16DBL		17
-#define R_390_PLT16DBL		18
-#define R_390_PC32DBL		19
-#define R_390_PLT32DBL		20
-#define R_390_GOTPCDBL		21
-#define R_390_64		22
-#define R_390_PC64		23
-#define R_390_GOT64		24
-#define R_390_PLT64		25
-#define R_390_GOTENT		26
-#define R_390_GOTOFF16		27
-#define R_390_GOTOFF64		28
-#define R_390_GOTPLT12		29
-#define R_390_GOTPLT16		30
-#define R_390_GOTPLT32		31
-#define R_390_GOTPLT64		32
-#define R_390_GOTPLTENT		33
-#define R_390_PLTOFF16		34
-#define R_390_PLTOFF32		35
-#define R_390_PLTOFF64		36
-#define R_390_TLS_LOAD		37
-#define R_390_TLS_GDCALL	38
-
-#define R_390_TLS_LDCALL	39
-
-#define R_390_TLS_GD32		40
-
-#define R_390_TLS_GD64		41
-
-#define R_390_TLS_GOTIE12	42
-
-#define R_390_TLS_GOTIE32	43
-
-#define R_390_TLS_GOTIE64	44
-
-#define R_390_TLS_LDM32		45
-
-#define R_390_TLS_LDM64		46
-
-#define R_390_TLS_IE32		47
-
-#define R_390_TLS_IE64		48
-
-#define R_390_TLS_IEENT		49
-
-#define R_390_TLS_LE32		50
-
-#define R_390_TLS_LE64		51
-
-#define R_390_TLS_LDO32		52
-
-#define R_390_TLS_LDO64		53
-
-#define R_390_TLS_DTPMOD	54
-#define R_390_TLS_DTPOFF	55
-#define R_390_TLS_TPOFF		56
-
-#define R_390_20		57
-#define R_390_GOT20		58
-#define R_390_GOTPLT20		59
-#define R_390_TLS_GOTIE20	60
-
-
-#define R_390_NUM		61
-
-
-
-#define R_CRIS_NONE		0
-#define R_CRIS_8		1
-#define R_CRIS_16		2
-#define R_CRIS_32		3
-#define R_CRIS_8_PCREL		4
-#define R_CRIS_16_PCREL		5
-#define R_CRIS_32_PCREL		6
-#define R_CRIS_GNU_VTINHERIT	7
-#define R_CRIS_GNU_VTENTRY	8
-#define R_CRIS_COPY		9
-#define R_CRIS_GLOB_DAT		10
-#define R_CRIS_JUMP_SLOT	11
-#define R_CRIS_RELATIVE		12
-#define R_CRIS_16_GOT		13
-#define R_CRIS_32_GOT		14
-#define R_CRIS_16_GOTPLT	15
-#define R_CRIS_32_GOTPLT	16
-#define R_CRIS_32_GOTREL	17
-#define R_CRIS_32_PLT_GOTREL	18
-#define R_CRIS_32_PLT_PCREL	19
-
-#define R_CRIS_NUM		20
-
-
-
-#define R_X86_64_NONE		0
-#define R_X86_64_64		1
-#define R_X86_64_PC32		2
-#define R_X86_64_GOT32		3
-#define R_X86_64_PLT32		4
-#define R_X86_64_COPY		5
-#define R_X86_64_GLOB_DAT	6
-#define R_X86_64_JUMP_SLOT	7
-#define R_X86_64_RELATIVE	8
-#define R_X86_64_GOTPCREL	9
-
-#define R_X86_64_32		10
-#define R_X86_64_32S		11
-#define R_X86_64_16		12
-#define R_X86_64_PC16		13
-#define R_X86_64_8		14
-#define R_X86_64_PC8		15
-#define R_X86_64_DTPMOD64	16
-#define R_X86_64_DTPOFF64	17
-#define R_X86_64_TPOFF64	18
-#define R_X86_64_TLSGD		19
-
-#define R_X86_64_TLSLD		20
-
-#define R_X86_64_DTPOFF32	21
-#define R_X86_64_GOTTPOFF	22
-
-#define R_X86_64_TPOFF32	23
-#define R_X86_64_PC64		24
-#define R_X86_64_GOTOFF64	25
-#define R_X86_64_GOTPC32	26
-#define R_X86_64_GOT64		27
-#define R_X86_64_GOTPCREL64	28
-#define R_X86_64_GOTPC64	29
-#define R_X86_64_GOTPLT64	30
-#define R_X86_64_PLTOFF64	31
-#define R_X86_64_SIZE32		32
-#define R_X86_64_SIZE64		33
-
-#define R_X86_64_GOTPC32_TLSDESC 34
-#define R_X86_64_TLSDESC_CALL   35
-
-#define R_X86_64_TLSDESC        36
-#define R_X86_64_IRELATIVE	37
-#define R_X86_64_RELATIVE64	38
-#define R_X86_64_NUM		39
-
-
-
-#define R_MN10300_NONE		0
-#define R_MN10300_32		1
-#define R_MN10300_16		2
-#define R_MN10300_8		3
-#define R_MN10300_PCREL32	4
-#define R_MN10300_PCREL16	5
-#define R_MN10300_PCREL8	6
-#define R_MN10300_GNU_VTINHERIT	7
-#define R_MN10300_GNU_VTENTRY	8
-#define R_MN10300_24		9
-#define R_MN10300_GOTPC32	10
-#define R_MN10300_GOTPC16	11
-#define R_MN10300_GOTOFF32	12
-#define R_MN10300_GOTOFF24	13
-#define R_MN10300_GOTOFF16	14
-#define R_MN10300_PLT32		15
-#define R_MN10300_PLT16		16
-#define R_MN10300_GOT32		17
-#define R_MN10300_GOT24		18
-#define R_MN10300_GOT16		19
-#define R_MN10300_COPY		20
-#define R_MN10300_GLOB_DAT	21
-#define R_MN10300_JMP_SLOT	22
-#define R_MN10300_RELATIVE	23
-
-#define R_MN10300_NUM		24
-
-
-
-#define R_M32R_NONE		0
-#define R_M32R_16		1
-#define R_M32R_32		2
-#define R_M32R_24		3
-#define R_M32R_10_PCREL		4
-#define R_M32R_18_PCREL		5
-#define R_M32R_26_PCREL		6
-#define R_M32R_HI16_ULO		7
-#define R_M32R_HI16_SLO		8
-#define R_M32R_LO16		9
-#define R_M32R_SDA16		10
-#define R_M32R_GNU_VTINHERIT	11
-#define R_M32R_GNU_VTENTRY	12
-
-#define R_M32R_16_RELA		33
-#define R_M32R_32_RELA		34
-#define R_M32R_24_RELA		35
-#define R_M32R_10_PCREL_RELA	36
-#define R_M32R_18_PCREL_RELA	37
-#define R_M32R_26_PCREL_RELA	38
-#define R_M32R_HI16_ULO_RELA	39
-#define R_M32R_HI16_SLO_RELA	40
-#define R_M32R_LO16_RELA	41
-#define R_M32R_SDA16_RELA	42
-#define R_M32R_RELA_GNU_VTINHERIT	43
-#define R_M32R_RELA_GNU_VTENTRY	44
-#define R_M32R_REL32		45
-
-#define R_M32R_GOT24		48
-#define R_M32R_26_PLTREL	49
-#define R_M32R_COPY		50
-#define R_M32R_GLOB_DAT		51
-#define R_M32R_JMP_SLOT		52
-#define R_M32R_RELATIVE		53
-#define R_M32R_GOTOFF		54
-#define R_M32R_GOTPC24		55
-#define R_M32R_GOT16_HI_ULO	56
-
-#define R_M32R_GOT16_HI_SLO	57
-
-#define R_M32R_GOT16_LO		58
-#define R_M32R_GOTPC_HI_ULO	59
-
-#define R_M32R_GOTPC_HI_SLO	60
-
-#define R_M32R_GOTPC_LO		61
-
-#define R_M32R_GOTOFF_HI_ULO	62
-
-#define R_M32R_GOTOFF_HI_SLO	63
-
-#define R_M32R_GOTOFF_LO	64
-#define R_M32R_NUM		256
-
-#define R_MICROBLAZE_NONE 0
-#define R_MICROBLAZE_32 1
-#define R_MICROBLAZE_32_PCREL 2
-#define R_MICROBLAZE_64_PCREL 3
-#define R_MICROBLAZE_32_PCREL_LO 4
-#define R_MICROBLAZE_64 5
-#define R_MICROBLAZE_32_LO 6
-#define R_MICROBLAZE_SRO32 7
-#define R_MICROBLAZE_SRW32 8
-#define R_MICROBLAZE_64_NONE 9
-#define R_MICROBLAZE_32_SYM_OP_SYM 10
-#define R_MICROBLAZE_GNU_VTINHERIT 11
-#define R_MICROBLAZE_GNU_VTENTRY 12
-#define R_MICROBLAZE_GOTPC_64 13
-#define R_MICROBLAZE_GOT_64 14
-#define R_MICROBLAZE_PLT_64 15
-#define R_MICROBLAZE_REL 16
-#define R_MICROBLAZE_JUMP_SLOT 17
-#define R_MICROBLAZE_GLOB_DAT 18
-#define R_MICROBLAZE_GOTOFF_64 19
-#define R_MICROBLAZE_GOTOFF_32 20
-#define R_MICROBLAZE_COPY 21
-#define R_MICROBLAZE_TLS 22
-#define R_MICROBLAZE_TLSGD 23
-#define R_MICROBLAZE_TLSLD 24
-#define R_MICROBLAZE_TLSDTPMOD32 25
-#define R_MICROBLAZE_TLSDTPREL32 26
-#define R_MICROBLAZE_TLSDTPREL64 27
-#define R_MICROBLAZE_TLSGOTTPREL32 28
-#define R_MICROBLAZE_TLSTPREL32	 29
-
-#define R_OR1K_NONE		0
-#define R_OR1K_32		1
-#define R_OR1K_16		2
-#define R_OR1K_8		3
-#define R_OR1K_LO_16_IN_INSN	4
-#define R_OR1K_HI_16_IN_INSN	5
-#define R_OR1K_INSN_REL_26	6
-#define R_OR1K_GNU_VTENTRY	7
-#define R_OR1K_GNU_VTINHERIT	8
-#define R_OR1K_32_PCREL		9
-#define R_OR1K_16_PCREL		10
-#define R_OR1K_8_PCREL		11
-#define R_OR1K_GOTPC_HI16	12
-#define R_OR1K_GOTPC_LO16	13
-#define R_OR1K_GOT16		14
-#define R_OR1K_PLT26		15
-#define R_OR1K_GOTOFF_HI16	16
-#define R_OR1K_GOTOFF_LO16	17
-#define R_OR1K_COPY		18
-#define R_OR1K_GLOB_DAT		19
-#define R_OR1K_JMP_SLOT		20
-#define R_OR1K_RELATIVE		21
-#define R_OR1K_TLS_GD_HI16	22
-#define R_OR1K_TLS_GD_LO16	23
-#define R_OR1K_TLS_LDM_HI16	24
-#define R_OR1K_TLS_LDM_LO16	25
-#define R_OR1K_TLS_LDO_HI16	26
-#define R_OR1K_TLS_LDO_LO16	27
-#define R_OR1K_TLS_IE_HI16	28
-#define R_OR1K_TLS_IE_LO16	29
-#define R_OR1K_TLS_LE_HI16	30
-#define R_OR1K_TLS_LE_LO16	31
-#define R_OR1K_TLS_TPOFF	32
-#define R_OR1K_TLS_DTPOFF	33
-#define R_OR1K_TLS_DTPMOD	34
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
diff --git a/main/xen/hotplug-vif-vtrill.patch b/main/xen/hotplug-vif-vtrill.patch
index 6f9d894250c..a50d643725b 100644
--- a/main/xen/hotplug-vif-vtrill.patch
+++ b/main/xen/hotplug-vif-vtrill.patch
@@ -1,16 +1,16 @@
---- xen-4.3.0/tools/hotplug/Linux/Makefile
-+++ xen-4.3.0.mod/tools/hotplug/Linux/Makefile
-@@ -14,6 +14,7 @@
- XEN_SCRIPTS += network-route vif-route
- XEN_SCRIPTS += network-nat vif-nat
+--- a/tools/hotplug/Linux/Makefile
++++ b/tools/hotplug/Linux/Makefile
+@@ -6,6 +6,7 @@ XEN_SCRIPTS = vif-bridge
+ XEN_SCRIPTS += vif-route
+ XEN_SCRIPTS += vif-nat
  XEN_SCRIPTS += vif-openvswitch
 +XEN_SCRIPTS += vif-vtrill
- XEN_SCRIPTS += vif2
  XEN_SCRIPTS += vif-setup
+ XEN_SCRIPTS-$(CONFIG_LIBNL) += remus-netbuf-setup
  XEN_SCRIPTS += block
---- xen-4.3.0/tools/hotplug/Linux/vif-common.sh
-+++ xen-4.3.0.mod/tools/hotplug/Linux/vif-common.sh
-@@ -213,3 +213,31 @@
+--- a/tools/hotplug/Linux/vif-common.sh
++++ b/tools/hotplug/Linux/vif-common.sh
+@@ -244,3 +244,31 @@ dom0_ip()
    fi
    echo "$result"
  }
@@ -43,7 +43,7 @@
 +}
 +
 --- /dev/null
-+++ xen-4.3.0.mod/tools/hotplug/Linux/vif-vtrill
++++ b/tools/hotplug/Linux/vif-vtrill
 @@ -0,0 +1,91 @@
 +#!/bin/bash
 +#============================================================================
diff --git a/main/xen/musl-hvmloader-fix-stdint.patch b/main/xen/musl-hvmloader-fix-stdint.patch
deleted file mode 100644
index 0d42f034a12..00000000000
--- a/main/xen/musl-hvmloader-fix-stdint.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-musl's stdint does not support gcc -m32 so we need to make sure that we
-don't use system's stdint.h. We ship a stdind_local.h and make sure that
-we use that instead
-
-https://bugs.alpinelinux.org/issues/3308
-
-diff --git a/tools/firmware/Rules.mk b/tools/firmware/Rules.mk
-index 26bbddc..efad58c 100644
---- a/tools/firmware/Rules.mk
-+++ b/tools/firmware/Rules.mk
-@@ -12,6 +12,7 @@ CFLAGS += -DNDEBUG
- endif
- 
- CFLAGS += -Werror
-+CFLAGS += -I$(XEN_ROOT)/tools/firmware
- 
- $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS))
- 
-diff --git a/tools/firmware/hvmloader/32bitbios_support.c b/tools/firmware/hvmloader/32bitbios_support.c
-index fe770a3..cdab677 100644
---- a/tools/firmware/hvmloader/32bitbios_support.c
-+++ b/tools/firmware/hvmloader/32bitbios_support.c
-@@ -21,8 +21,8 @@
-  * Place - Suite 330, Boston, MA 02111-1307 USA.
-  */
- 
--#include <inttypes.h>
--#include <elf.h>
-+#include <stdint_local.h>
-+#include <elf_local.h>
- #ifdef __sun__
- #include <sys/machelf.h>
- #endif
-diff --git a/tools/firmware/hvmloader/acpi/acpi2_0.h b/tools/firmware/hvmloader/acpi/acpi2_0.h
-index 7b22d80..413c930 100644
---- a/tools/firmware/hvmloader/acpi/acpi2_0.h
-+++ b/tools/libacpi/acpi2_0.h
-@@ -18,7 +18,7 @@
- #ifndef _ACPI_2_0_H_
- #define _ACPI_2_0_H_
- 
--#include <stdint.h>
-+#include <stdint_local.h>
- #include <xen/xen.h>
- #include <xen/hvm/ioreq.h>
- 
-diff --git a/tools/firmware/hvmloader/config.h b/tools/firmware/hvmloader/config.h
-index b838cf9..33d48b3 100644
---- a/tools/firmware/hvmloader/config.h
-+++ b/tools/firmware/hvmloader/config.h
-@@ -1,7 +1,7 @@
- #ifndef __HVMLOADER_CONFIG_H__
- #define __HVMLOADER_CONFIG_H__
- 
--#include <stdint.h>
-+#include <stdint_local.h>
- 
- enum virtual_vga { VGA_none, VGA_std, VGA_cirrus, VGA_pt };
- extern enum virtual_vga virtual_vga;
-diff --git a/tools/firmware/hvmloader/hypercall.h b/tools/firmware/hvmloader/hypercall.h
-index 5368c30..c57bc86 100644
---- a/tools/firmware/hvmloader/hypercall.h
-+++ b/tools/firmware/hvmloader/hypercall.h
-@@ -31,7 +31,7 @@
- #ifndef __HVMLOADER_HYPERCALL_H__
- #define __HVMLOADER_HYPERCALL_H__
- 
--#include <stdint.h>
-+#include <stdint_local.h>
- #include <xen/xen.h>
- #include "config.h"
- 
-diff --git a/tools/firmware/hvmloader/mp_tables.c b/tools/firmware/hvmloader/mp_tables.c
-index fd636a0..b3b703e 100644
---- a/tools/firmware/hvmloader/mp_tables.c
-+++ b/tools/firmware/hvmloader/mp_tables.c
-@@ -28,7 +28,7 @@
-  * Place - Suite 330, Boston, MA 02111-1307 USA.
-  */
- 
--#include <stdint.h>
-+#include <stdint_local.h>
- #include "config.h"
- 
- /* number of non-processor MP table entries */
-diff --git a/tools/firmware/hvmloader/option_rom.h b/tools/firmware/hvmloader/option_rom.h
-index 0fefe08..66a93bc 100644
---- a/tools/firmware/hvmloader/option_rom.h
-+++ b/tools/firmware/hvmloader/option_rom.h
-@@ -1,7 +1,7 @@
- #ifndef __HVMLOADER_OPTION_ROM_H__
- #define __HVMLOADER_OPTION_ROM_H__
- 
--#include <stdint.h>
-+#include <stdint_local.h>
- 
- struct option_rom_header {
-     uint8_t signature[2]; /* "\x55\xaa" */
-diff --git a/tools/firmware/hvmloader/pir_types.h b/tools/firmware/hvmloader/pir_types.h
-index 6e50822..6134b01 100644
---- a/tools/firmware/hvmloader/pir_types.h
-+++ b/tools/firmware/hvmloader/pir_types.h
-@@ -24,7 +24,7 @@
- #ifndef PIR_TYPES_H
- #define PIR_TYPES_H
- 
--#include <stdint.h>
-+#include <stdint_local.h>
- 
- #define NR_PIR_SLOTS 6
- 
-diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/smbios.c
-index 4d3d692..60d144d 100644
---- a/tools/firmware/hvmloader/smbios.c
-+++ b/tools/firmware/hvmloader/smbios.c
-@@ -20,7 +20,7 @@
-  * Authors: Andrew D. Ball <aball@us.ibm.com>
-  */
- 
--#include <stdint.h>
-+#include <stdint_local.h>
- #include <xen/xen.h>
- #include <xen/version.h>
- #include "smbios_types.h"
-diff --git a/tools/firmware/hvmloader/smbios_types.h b/tools/firmware/hvmloader/smbios_types.h
-index ff36564..1b61d9a 100644
---- a/tools/firmware/hvmloader/smbios_types.h
-+++ b/tools/firmware/hvmloader/smbios_types.h
-@@ -26,7 +26,7 @@
- #ifndef SMBIOS_TYPES_H
- #define SMBIOS_TYPES_H
- 
--#include <stdint.h>
-+#include <stdint_local.h>
- 
- /* SMBIOS entry point -- must be written to a 16-bit aligned address
-    between 0xf0000 and 0xfffff. 
-diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
-index 80d822f..671d8cd 100644
---- a/tools/firmware/hvmloader/util.c
-+++ b/tools/firmware/hvmloader/util.c
-@@ -24,7 +24,7 @@
- #include "vnuma.h"
- #include <acpi2_0.h>
- #include <libacpi.h>
--#include <stdint.h>
-+#include <stdint_local.h>
- #include <xen/xen.h>
- #include <xen/memory.h>
- #include <xen/sched.h>
-
-diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h
-index a70e4aa..a8a2628 100644
---- a/tools/firmware/hvmloader/util.h
-+++ b/tools/firmware/hvmloader/util.h
-@@ -2,7 +2,7 @@
- #define __HVMLOADER_UTIL_H__
- 
- #include <stdarg.h>
--#include <stdint.h>
-+#include <stdint_local.h>
- #include <stddef.h>
- #include <xen/xen.h>
- #include <xen/hvm/hvm_info_table.h>
-diff --git a/tools/firmware/rombios/32bit/pmm.c b/tools/firmware/rombios/32bit/pmm.c
-index 4a279ca..b90b813 100644
---- a/tools/firmware/rombios/32bit/pmm.c
-+++ b/tools/firmware/rombios/32bit/pmm.c
-@@ -63,7 +63,7 @@
-  *     }
-  */
- 
--#include <stdint.h>
-+#include <stdint_local.h>
- #include <stddef.h>
- #include "config.h"
- #include "e820.h"
-diff --git a/tools/firmware/rombios/32bit/util.c b/tools/firmware/rombios/32bit/util.c
-index a47bb71..777f742 100644
---- a/tools/firmware/rombios/32bit/util.c
-+++ b/tools/firmware/rombios/32bit/util.c
-@@ -18,7 +18,7 @@
-  * Place - Suite 330, Boston, MA 02111-1307 USA.
-  */
- #include <stdarg.h>
--#include <stdint.h>
-+#include <stdint_local.h>
- #include "rombios_compat.h"
- #include "util.h"
- 
diff --git a/main/xen/py3-compat.patch b/main/xen/py3-compat.patch
deleted file mode 100644
index 371a4537d6a..00000000000
--- a/main/xen/py3-compat.patch
+++ /dev/null
@@ -1,472 +0,0 @@
-From 1430c5a8cad45d689b035255f3d7ca6a07ae02e4 Mon Sep 17 00:00:00 2001
-From: Andrew Cooper <andrew.cooper3@citrix.com>
-Date: Wed, 18 Dec 2019 14:00:16 +0000
-Subject: [PATCH] tools/python: Python 3 compatibility
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-convert-legacy-stream is only used for incomming migration from pre Xen 4.7,
-and verify-stream-v2 appears to only be used by me during migration
-development - it is little surprise that they missed the main converstion
-effort in Xen 4.13.
-
-Fix it all up.
-
-Move open_file_or_fd() into a new util.py to avoid duplication, making it a
-more generic wrapper around open() or fdopen().
-
-In libxc.py, drop all long() conversion.  Python 2 will DTRT with int => long
-promotion, even on 32bit builds.
-
-In convert-legacy-stream, don't pass empty strings to write_record().  Join on
-the empty argl will do the right thing.
-
-Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Acked-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
----
- tools/python/scripts/convert-legacy-stream | 77 +++++++---------------
- tools/python/scripts/verify-stream-v2      | 42 +++---------
- tools/python/xen/__init__.py               |  1 -
- tools/python/xen/lowlevel/__init__.py      |  1 -
- tools/python/xen/migration/libxc.py        | 34 +++++-----
- tools/python/xen/migration/libxl.py        |  2 +-
- tools/python/xen/migration/verify.py       |  4 +-
- tools/python/xen/util.py                   | 23 +++++++
- 8 files changed, 74 insertions(+), 110 deletions(-)
- create mode 100644 tools/python/xen/util.py
-
-diff --git a/tools/python/scripts/convert-legacy-stream b/tools/python/scripts/convert-legacy-stream
-index 5f80f1365417..6b68ef5923f6 100755
---- a/tools/python/scripts/convert-legacy-stream
-+++ b/tools/python/scripts/convert-legacy-stream
-@@ -5,6 +5,8 @@
- Convert a legacy migration stream to a v2 stream.
- """
- 
-+from __future__ import print_function
-+
- import sys
- import os, os.path
- import syslog
-@@ -12,6 +14,7 @@ import traceback
- 
- from struct import calcsize, unpack, pack
- 
-+from xen.util import open_file_or_fd as open_file_or_fd
- from xen.migration import legacy, public, libxc, libxl, xl
- 
- __version__ = 1
-@@ -39,16 +42,16 @@ def info(msg):
-             for line in msg.split("\n"):
-                 syslog.syslog(syslog.LOG_INFO, line)
-         else:
--            print msg
-+            print(msg)
- 
- def err(msg):
-     """Error message, routed to appropriate destination"""
-     if log_to_syslog:
-         for line in msg.split("\n"):
-             syslog.syslog(syslog.LOG_ERR, line)
--    print >> sys.stderr, msg
-+    print(msg, file = sys.stderr)
- 
--class StreamError(StandardError):
-+class StreamError(Exception):
-     """Error with the incoming migration stream"""
-     pass
- 
-@@ -70,7 +73,7 @@ class VM(object):
- 
-         # libxl
-         self.libxl = fmt == "libxl"
--        self.emu_xenstore = "" # NUL terminated key&val pairs from "toolstack" records
-+        self.emu_xenstore = b"" # NUL terminated key&val pairs from "toolstack" records
- 
- def write_libxc_ihdr():
-     stream_write(pack(libxc.IHDR_FORMAT,
-@@ -102,12 +105,12 @@ def write_libxl_hdr():
-                       ))
- 
- def write_record(rt, *argl):
--    alldata = ''.join(argl)
-+    alldata = b''.join(argl)
-     length = len(alldata)
- 
-     record = pack(libxc.RH_FORMAT, rt, length) + alldata
-     plen = (8 - (length & 7)) & 7
--    record += '\x00' * plen
-+    record += b'\x00' * plen
- 
-     stream_write(record)
- 
-@@ -164,10 +167,10 @@ def write_libxc_hvm_params(params):
-                  pack("Q" * len(params), *params))
- 
- def write_libxl_end():
--    write_record(libxl.REC_TYPE_end, "")
-+    write_record(libxl.REC_TYPE_end)
- 
- def write_libxl_libxc_context():
--    write_record(libxl.REC_TYPE_libxc_context, "")
-+    write_record(libxl.REC_TYPE_libxc_context)
- 
- def write_libxl_emulator_xenstore_data(data):
-     write_record(libxl.REC_TYPE_emulator_xenstore_data,
-@@ -225,7 +228,7 @@ def read_pv_extended_info(vm):
-         so_far += datasz
- 
-         # Eww, but this is how it is done :(
--        if blkid == "vcpu":
-+        if blkid == b"vcpu":
- 
-             vm.basic_len = datasz
- 
-@@ -242,10 +245,10 @@ def read_pv_extended_info(vm):
- 
-             write_libxc_pv_info(vm)
- 
--        elif blkid == "extv":
-+        elif blkid == b"extv":
-             vm.extd = True
- 
--        elif blkid == "xcnt":
-+        elif blkid == b"xcnt":
-             vm.xsave_len, = unpack("I", data[:4])
-             info("xcnt sz 0x%x" % (vm.xsave_len, ))
- 
-@@ -296,7 +299,7 @@ def read_pv_tail(vm):
-     info("Got shinfo")
- 
-     write_record(libxc.REC_TYPE_shared_info, shinfo)
--    write_record(libxc.REC_TYPE_end, "")
-+    write_record(libxc.REC_TYPE_end)
- 
- 
- def read_libxl_toolstack(vm, data):
-@@ -336,18 +339,18 @@ def read_libxl_toolstack(vm, data):
-         if twidth == 64:
-             name = name[:-4]
- 
--        if name[-1] != '\x00':
-+        if name[-1] != b'\x00':
-             raise StreamError("physmap name not NUL terminated")
- 
--        root = "physmap/%x" % (phys,)
--        kv = [root + "/start_addr", "%x" % (start, ),
--              root + "/size",       "%x" % (size, ),
--              root + "/name",       name[:-1]]
-+        root = b"physmap/%x" % (phys, )
-+        kv = [root + b"/start_addr", b"%x" % (start, ),
-+              root + b"/size",       b"%x" % (size, ),
-+              root + b"/name",       name[:-1]]
- 
-         for key, val in zip(kv[0::2], kv[1::2]):
--            info("    '%s' = '%s'" % (key, val))
-+            info("    '%s' = '%s'" % (key.decode(), val.decode()))
- 
--        vm.emu_xenstore += '\x00'.join(kv) + '\x00'
-+        vm.emu_xenstore += b'\x00'.join(kv) + b'\x00'
- 
- 
- def read_chunks(vm):
-@@ -524,7 +527,7 @@ def read_hvm_tail(vm):
-     blob = rdexact(blobsz)
- 
-     write_record(libxc.REC_TYPE_hvm_context, blob)
--    write_record(libxc.REC_TYPE_end, "")
-+    write_record(libxc.REC_TYPE_end)
- 
- 
- 
-@@ -534,7 +537,7 @@ def read_qemu(vm):
-     sig, = unpack("21s", rawsig)
-     info("Qemu signature: %s" % (sig, ))
- 
--    if sig == "DeviceModelRecord0002":
-+    if sig == b"DeviceModelRecord0002":
-         rawsz = rdexact(4)
-         sz, = unpack("I", rawsz)
-         qdata = rdexact(sz)
-@@ -617,36 +620,6 @@ def read_legacy_stream(vm):
-         return 2
-     return 0
- 
--def open_file_or_fd(val, mode):
--    """
--    If 'val' looks like a decimal integer, open it as an fd.  If not, try to
--    open it as a regular file.
--    """
--
--    fd = -1
--    try:
--        # Does it look like an integer?
--        try:
--            fd = int(val, 10)
--        except ValueError:
--            pass
--
--        # Try to open it...
--        if fd != -1:
--            return os.fdopen(fd, mode, 0)
--        else:
--            return open(val, mode, 0)
--
--    except StandardError, e:
--        if fd != -1:
--            err("Unable to open fd %d: %s: %s" %
--                (fd, e.__class__.__name__, e))
--        else:
--            err("Unable to open file '%s': %s: %s" %
--                (val, e.__class__.__name__, e))
--
--    raise SystemExit(1)
--
- 
- def main():
-     from optparse import OptionParser
-@@ -723,7 +696,7 @@ def main():
- if __name__ == "__main__":
-     try:
-         sys.exit(main())
--    except SystemExit, e:
-+    except SystemExit as e:
-         sys.exit(e.code)
-     except KeyboardInterrupt:
-         sys.exit(1)
-diff --git a/tools/python/scripts/verify-stream-v2 b/tools/python/scripts/verify-stream-v2
-index 3daf25791e59..8bac04d5666f 100755
---- a/tools/python/scripts/verify-stream-v2
-+++ b/tools/python/scripts/verify-stream-v2
-@@ -3,12 +3,15 @@
- 
- """ Verify a v2 format migration stream """
- 
-+from __future__ import print_function
-+
- import sys
- import struct
- import os, os.path
- import syslog
- import traceback
- 
-+from xen.util import open_file_or_fd as open_file_or_fd
- from xen.migration.verify import StreamError, RecordError
- from xen.migration.libxc import VerifyLibxc
- from xen.migration.libxl import VerifyLibxl
-@@ -25,7 +28,7 @@ def info(msg):
-             for line in msg.split("\n"):
-                 syslog.syslog(syslog.LOG_INFO, line)
-         else:
--            print msg
-+            print(msg)
- 
- def err(msg):
-     """Error message, routed to appropriate destination"""
-@@ -33,7 +36,7 @@ def err(msg):
-         if log_to_syslog:
-             for line in msg.split("\n"):
-                 syslog.syslog(syslog.LOG_ERR, line)
--        print >> sys.stderr, msg
-+        print(msg, file = sys.stderr)
- 
- def stream_read(_ = None):
-     """Read from input"""
-@@ -56,7 +59,7 @@ def skip_xl_header():
-     """Skip over an xl header in the stream"""
- 
-     hdr = rdexact(32)
--    if hdr != "Xen saved domain, xl format\n \0 \r":
-+    if hdr != b"Xen saved domain, xl format\n \0 \r":
-         raise StreamError("No xl header")
- 
-     _, mflags, _, optlen = unpack_exact("=IIII")
-@@ -86,7 +89,7 @@ def read_stream(fmt):
-         err(traceback.format_exc())
-         return 1
- 
--    except StandardError:
-+    except Exception:
-         err("Script Error:")
-         err(traceback.format_exc())
-         err("Please fix me")
-@@ -94,35 +97,6 @@ def read_stream(fmt):
- 
-     return 0
- 
--def open_file_or_fd(val, mode, buffering):
--    """
--    If 'val' looks like a decimal integer, open it as an fd.  If not, try to
--    open it as a regular file.
--    """
--
--    fd = -1
--    try:
--        # Does it look like an integer?
--        try:
--            fd = int(val, 10)
--        except ValueError:
--            pass
--
--        # Try to open it...
--        if fd != -1:
--            return os.fdopen(fd, mode, buffering)
--        else:
--            return open(val, mode, buffering)
--
--    except StandardError, e:
--        if fd != -1:
--            err("Unable to open fd %d: %s: %s" %
--                (fd, e.__class__.__name__, e))
--        else:
--            err("Unable to open file '%s': %s: %s" %
--                (val, e.__class__.__name__, e))
--
--    raise SystemExit(2)
- 
- def main():
-     """ main """
-@@ -168,7 +142,7 @@ def main():
- if __name__ == "__main__":
-     try:
-         sys.exit(main())
--    except SystemExit, e:
-+    except SystemExit as e:
-         sys.exit(e.code)
-     except KeyboardInterrupt:
-         sys.exit(2)
-diff --git a/tools/python/xen/__init__.py b/tools/python/xen/__init__.py
-index 8d1c8b69c3fc..e69de29bb2d1 100644
---- a/tools/python/xen/__init__.py
-+++ b/tools/python/xen/__init__.py
-@@ -1 +0,0 @@
-- 
-diff --git a/tools/python/xen/lowlevel/__init__.py b/tools/python/xen/lowlevel/__init__.py
-index 8d1c8b69c3fc..e69de29bb2d1 100644
---- a/tools/python/xen/lowlevel/__init__.py
-+++ b/tools/python/xen/lowlevel/__init__.py
-@@ -1 +0,0 @@
-- 
-diff --git a/tools/python/xen/migration/libxc.py b/tools/python/xen/migration/libxc.py
-index f24448a9eff7..0a329c209030 100644
---- a/tools/python/xen/migration/libxc.py
-+++ b/tools/python/xen/migration/libxc.py
-@@ -14,10 +14,6 @@
- 
- from xen.migration.verify import StreamError, RecordError, VerifyBase
- 
--# In Python3 long type have been merged into int, 1L syntax is no longer valid
--if sys.version_info > (3,):
--    long = int
--
- # Image Header
- IHDR_FORMAT = "!QIIHHI"
- 
-@@ -87,23 +83,23 @@
- 
- # page_data
- PAGE_DATA_FORMAT             = "II"
--PAGE_DATA_PFN_MASK           = (long(1) << 52) - 1
--PAGE_DATA_PFN_RESZ_MASK      = ((long(1) << 60) - 1) & ~((long(1) << 52) - 1)
-+PAGE_DATA_PFN_MASK           = (1 << 52) - 1
-+PAGE_DATA_PFN_RESZ_MASK      = ((1 << 60) - 1) & ~((1 << 52) - 1)
- 
- # flags from xen/public/domctl.h: XEN_DOMCTL_PFINFO_* shifted by 32 bits
- PAGE_DATA_TYPE_SHIFT         = 60
--PAGE_DATA_TYPE_LTABTYPE_MASK = (long(0x7) << PAGE_DATA_TYPE_SHIFT)
--PAGE_DATA_TYPE_LTAB_MASK     = (long(0xf) << PAGE_DATA_TYPE_SHIFT)
--PAGE_DATA_TYPE_LPINTAB       = (long(0x8) << PAGE_DATA_TYPE_SHIFT) # Pinned pagetable
--
--PAGE_DATA_TYPE_NOTAB         = (long(0x0) << PAGE_DATA_TYPE_SHIFT) # Regular page
--PAGE_DATA_TYPE_L1TAB         = (long(0x1) << PAGE_DATA_TYPE_SHIFT) # L1 pagetable
--PAGE_DATA_TYPE_L2TAB         = (long(0x2) << PAGE_DATA_TYPE_SHIFT) # L2 pagetable
--PAGE_DATA_TYPE_L3TAB         = (long(0x3) << PAGE_DATA_TYPE_SHIFT) # L3 pagetable
--PAGE_DATA_TYPE_L4TAB         = (long(0x4) << PAGE_DATA_TYPE_SHIFT) # L4 pagetable
--PAGE_DATA_TYPE_BROKEN        = (long(0xd) << PAGE_DATA_TYPE_SHIFT) # Broken
--PAGE_DATA_TYPE_XALLOC        = (long(0xe) << PAGE_DATA_TYPE_SHIFT) # Allocate-only
--PAGE_DATA_TYPE_XTAB          = (long(0xf) << PAGE_DATA_TYPE_SHIFT) # Invalid
-+PAGE_DATA_TYPE_LTABTYPE_MASK = (0x7 << PAGE_DATA_TYPE_SHIFT)
-+PAGE_DATA_TYPE_LTAB_MASK     = (0xf << PAGE_DATA_TYPE_SHIFT)
-+PAGE_DATA_TYPE_LPINTAB       = (0x8 << PAGE_DATA_TYPE_SHIFT) # Pinned pagetable
-+
-+PAGE_DATA_TYPE_NOTAB         = (0x0 << PAGE_DATA_TYPE_SHIFT) # Regular page
-+PAGE_DATA_TYPE_L1TAB         = (0x1 << PAGE_DATA_TYPE_SHIFT) # L1 pagetable
-+PAGE_DATA_TYPE_L2TAB         = (0x2 << PAGE_DATA_TYPE_SHIFT) # L2 pagetable
-+PAGE_DATA_TYPE_L3TAB         = (0x3 << PAGE_DATA_TYPE_SHIFT) # L3 pagetable
-+PAGE_DATA_TYPE_L4TAB         = (0x4 << PAGE_DATA_TYPE_SHIFT) # L4 pagetable
-+PAGE_DATA_TYPE_BROKEN        = (0xd << PAGE_DATA_TYPE_SHIFT) # Broken
-+PAGE_DATA_TYPE_XALLOC        = (0xe << PAGE_DATA_TYPE_SHIFT) # Allocate-only
-+PAGE_DATA_TYPE_XTAB          = (0xf << PAGE_DATA_TYPE_SHIFT) # Invalid
- 
- # x86_pv_info
- X86_PV_INFO_FORMAT        = "BBHI"
-@@ -223,7 +219,7 @@ def verify_record(self):
-             self.squashed_pagedata_records += 1
- 
-         padding = content[length:]
--        if padding != "\x00" * len(padding):
-+        if padding != b"\x00" * len(padding):
-             raise StreamError("Padding containing non0 bytes found")
- 
-         if rtype not in record_verifiers:
-diff --git a/tools/python/xen/migration/libxl.py b/tools/python/xen/migration/libxl.py
-index d5f54dc48932..79f4024e7280 100644
---- a/tools/python/xen/migration/libxl.py
-+++ b/tools/python/xen/migration/libxl.py
-@@ -128,7 +128,7 @@ def verify_record(self):
-         content = self.rdexact(contentsz)
- 
-         padding = content[length:]
--        if padding != "\x00" * len(padding):
-+        if padding != b"\x00" * len(padding):
-             raise StreamError("Padding containing non0 bytes found")
- 
-         if rtype not in record_verifiers:
-diff --git a/tools/python/xen/migration/verify.py b/tools/python/xen/migration/verify.py
-index 7a42dbfc5868..1e38f4a3c01e 100644
---- a/tools/python/xen/migration/verify.py
-+++ b/tools/python/xen/migration/verify.py
-@@ -7,11 +7,11 @@
- 
- from struct import calcsize, unpack
- 
--class StreamError(StandardError):
-+class StreamError(Exception):
-     """Error with the stream"""
-     pass
- 
--class RecordError(StandardError):
-+class RecordError(Exception):
-     """Error with a record in the stream"""
-     pass
- 
-diff --git a/tools/python/xen/util.py b/tools/python/xen/util.py
-new file mode 100644
-index 000000000000..a11358eefa13
---- /dev/null
-+++ b/tools/python/xen/util.py
-@@ -0,0 +1,23 @@
-+#!/usr/bin/env python
-+# -*- coding: utf-8 -*-
-+
-+import os
-+
-+def open_file_or_fd(val, *argl, **kwargs):
-+    """
-+    If 'val' looks like a decimal integer, open it as an fd.  If not, try to
-+    open it as a regular file.
-+    """
-+
-+    fd = -1
-+    try:
-+        # Does it look like an integer?
-+        fd = int(val, 10)
-+    except ValueError:
-+        pass
-+
-+    # Try to open it...
-+    if fd != -1:
-+        return os.fdopen(fd, *argl, **kwargs)
-+    else:
-+        return open(val, *argl, **kwargs)
diff --git a/main/xen/qemu-xen_paths.patch b/main/xen/qemu-xen_paths.patch
index e558d1f37f3..4b7af627258 100644
--- a/main/xen/qemu-xen_paths.patch
+++ b/main/xen/qemu-xen_paths.patch
@@ -1,11 +1,10 @@
---- ./tools/Makefile.orig
-+++ ./tools/Makefile
-@@ -219,6 +219,8 @@
- 		-L$(XEN_ROOT)/tools/xenstore \
- 		$(QEMU_UPSTREAM_RPATH)" \
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -244,6 +244,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-fi
+ 		$(EXTRA_CFLAGS_QEMU_XEN)" \
+ 		--extra-ldflags="$(QEMU_UPSTREAM_RPATH)" \
  		--bindir=$(LIBEXEC_BIN) \
-+		--libexecdir=$(LIBEXEC_BIN) \
 +		--sysconfdir=/etc/xen \
  		--datadir=$(SHAREDIR)/qemu-xen \
  		--localstatedir=$(localstatedir) \
- 		--disable-kvm \
+ 		--docdir=$(LIBEXEC)/share/doc \
diff --git a/main/xen/stdint_local.h b/main/xen/stdint_local.h
deleted file mode 100644
index 0eb485aaa17..00000000000
--- a/main/xen/stdint_local.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 32 bit int types */
-#ifndef STDINT_LOCAL_H
-#define STDINT_LOCAL_H
-typedef	__INT8_TYPE__		int8_t;
-typedef __INT16_TYPE__		int16_t;
-typedef __INT32_TYPE__		int32_t;
-typedef __INT64_TYPE__		int64_t;
-typedef __INTPTR_TYPE__		intptr_t;
-
-/* Unsigned.  */
-typedef	__UINT8_TYPE__		uint8_t;
-typedef __UINT16_TYPE__		uint16_t;
-typedef __UINT32_TYPE__		uint32_t;
-typedef __UINT64_TYPE__		uint64_t;
-typedef __UINTPTR_TYPE__	uintptr_t;
-
-#define INTPTR_MAX	0x7fffffffffffffffL
-#define UINTPTR_MAX	0xffffffffffffffffUL
-#endif
diff --git a/main/xen/stubdom-hack.patch b/main/xen/stubdom-hack.patch
new file mode 100644
index 00000000000..ef53529cfec
--- /dev/null
+++ b/main/xen/stubdom-hack.patch
@@ -0,0 +1,11 @@
+--- xen-4.15.0.orig/stubdom/Makefile
++++ xen-4.15.0/stubdom/Makefile
+@@ -188,7 +188,7 @@
+ 	rm $@ -rf || :
+ 	mv gmp-$(GMP_VERSION) $@
+ 	#patch -d $@ -p0 < gmp.patch
+-	cd $@; CPPFLAGS="-isystem $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include $(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" CC=$(CC) $(GMPEXT) ./configure --disable-shared --enable-static --disable-fft --without-readline --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf --libdir=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib --build=`gcc -dumpmachine` --host=$(GNU_TARGET_ARCH)-xen-elf
++	cd $@; CPPFLAGS="-isystem $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/include $(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" CC=$(CC) $(GMPEXT) ./configure --disable-shared --enable-static --disable-fft --without-readline --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf --libdir=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib --host=$(GNU_TARGET_ARCH)-xen-elf
+ 	sed -i 's/#define HAVE_OBSTACK_VPRINTF 1/\/\/#define HAVE_OBSTACK_VPRINTF 1/' $@/config.h
+ 	touch $@
+ 
diff --git a/main/xen/xen-fd-is-file.c b/main/xen/xen-fd-is-file.c
deleted file mode 100644
index a1518e4df0e..00000000000
--- a/main/xen/xen-fd-is-file.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include <sys/stat.h>
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <err.h>
-
-/*
-
-this is to be used as:
-
-    while true; do
-        eval "exec $_lockfd<>$_lockfile"
-        flock -x $_lockfd || return $?
-        if xen-fd-is-file $_lockfd $_lockfile; then break; fi
-        eval "exec $_lockfd<&-"
-    done
-
-instead of:
-
-    local rightfile
-    while true; do
-        eval "exec $_lockfd<>$_lockfile"
-        flock -x $_lockfd || return $?
-        # We can't just stat /dev/stdin or /proc/self/fd/$_lockfd or
-        # use bash's test -ef because those all go through what is
-        # actually a synthetic symlink in /proc and we aren't
-        # guaranteed that our stat(2) won't lose the race with an
-        # rm(1) between reading the synthetic link and traversing the
-        # file system to find the inum.  Perl is very fast so use that.
-        rightfile=$( perl -e '
-            open STDIN, "<&'$_lockfd'" or die $!;
-            my $fd_inum = (stat STDIN)[1]; die $! unless defined $fd_inum;
-            my $file_inum = (stat $ARGV[0])[1];
-            print "y\n" if $fd_inum eq $file_inum;
-                             ' "$_lockfile" )
-        if [ x$rightfile = xy ]; then break; fi
-        # Some versions of bash appear to be buggy if the same
-        # $_lockfile is opened repeatedly. Close the current fd here.
-        eval "exec $_lockfd<&-"
-    done
-*/
-
-int main(int argc, char *argv[])
-{
-	int lockfd;
-	const char *filename;
-	struct stat fdst, filest;
-
-	if (argc <= 2)
-		errx(1, "usage: %s FDNUM FILENAME\n", argv[0]);
-
-	lockfd = atoi(argv[1]);
-	filename = argv[2];
-
-	if (fstat(lockfd, &fdst) < 0)
-		err(2, "fstat(%i)", lockfd);
-
-	if (stat(filename, &filest) < 0)
-		err(3, "stat(%s)", filename);
-
-	return (fdst.st_ino != filest.st_ino);
-}
diff --git a/main/xen/xen-hotplug-lockfd.patch b/main/xen/xen-hotplug-lockfd.patch
deleted file mode 100644
index 2f91889948e..00000000000
--- a/main/xen/xen-hotplug-lockfd.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-We remove the perl snippet to verify the lockfile with lockfd to
-avoid perl dependency
-
-use a tiny C app to do the same job.
-
---- ./tools/hotplug/Linux/locking.sh.orig
-+++ ./tools/hotplug/Linux/locking.sh
-@@ -51,14 +51,8 @@
-         # actually a synthetic symlink in /proc and we aren't
-         # guaranteed that our stat(2) won't lose the race with an
-         # rm(1) between reading the synthetic link and traversing the
--        # file system to find the inum.  Perl is very fast so use that.
--        rightfile=$( perl -e '
--            open STDIN, "<&'$_lockfd'" or die $!;
--            my $fd_inum = (stat STDIN)[1]; die $! unless defined $fd_inum;
--            my $file_inum = (stat $ARGV[0])[1];
--            print "y\n" if $fd_inum eq $file_inum;
--                             ' "$_lockfile" )
--        if [ x$rightfile = xy ]; then break; fi
-+        # file system to find the inum.  We use tiny C file for that
-+        if /usr/lib/xen/bin/xen-fd-is-file $_lockfd $_lockfile; then break; fi
- 	# Some versions of bash appear to be buggy if the same
- 	# $_lockfile is opened repeatedly. Close the current fd here.
-         eval "exec $_lockfd<&-"
diff --git a/main/xen/xenconsoled.initd b/main/xen/xenconsoled.initd
index 7871c85559d..c93c8c34b8b 100644
--- a/main/xen/xenconsoled.initd
+++ b/main/xen/xenconsoled.initd
@@ -10,8 +10,8 @@ depend() {
 start() {
 	ebegin "Starting xenconsoled daemon"
 	start-stop-daemon --start --exec /usr/sbin/xenconsoled \
-		--pidfile /var/run/xenconsoled.pid \
-		-- --pid-file=/var/run/xenconsoled.pid \
+		--pidfile /run/xenconsoled.pid \
+		-- --pid-file=/run/xenconsoled.pid \
 		${XENCONSOLED_OPTS}
 	eend $?
 }
@@ -19,7 +19,7 @@ start() {
 stop() {
 	ebegin "Stoping xenconsoled daemon"
 	start-stop-daemon --stop --exec /usr/sbin/xenconsoled \
-		--pidfile /var/run/xenconsoled.pid
+		--pidfile /run/xenconsoled.pid
 	eend $?
 }
 
diff --git a/main/xen/xendomains.initd b/main/xen/xendomains.initd
index 59f556a1c17..8c77bf7bed0 100644
--- a/main/xen/xendomains.initd
+++ b/main/xen/xendomains.initd
@@ -122,7 +122,7 @@ set_dom_cmd() {
 
 start() {
 	set_dom_cmd
-	checkpath --directory --mode 755 /var/run/xen
+	checkpath --directory --mode 755 /run/xen
 
 	einfo "Starting Xen domains from ${AUTODIR:=/etc/xen/auto}"
 
diff --git a/main/xen/xendriverdomain.initd b/main/xen/xendriverdomain.initd
index a4956a57bf4..a7ec65fadba 100644
--- a/main/xen/xendriverdomain.initd
+++ b/main/xen/xendriverdomain.initd
@@ -29,7 +29,7 @@ start()
                 exit 0
         fi
 
-        [ -n "${PIDFILE}" ] || PIDFILE=/var/run/xldevd.pid
+        [ -n "${PIDFILE}" ] || PIDFILE=/run/xldevd.pid
 
         ebegin "Starting xendriverdomain"
 
@@ -41,7 +41,7 @@ start()
 
 stop() 
 {
-        [ -n "${PIDFILE}" ] || PIDFILE=/var/run/xldevd.pid
+        [ -n "${PIDFILE}" ] || PIDFILE=/run/xldevd.pid
 
         ebegin "Stopping xendriverdomain"
 
diff --git a/main/xen/xenqemu-xattr-size-max.patch b/main/xen/xenqemu-xattr-size-max.patch
deleted file mode 100644
index b0c02cbdada..00000000000
--- a/main/xen/xenqemu-xattr-size-max.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xen-4.9.0/tools/qemu-xen/hw/9pfs/9p.c.orig
-+++ xen-4.9.0/tools/qemu-xen/hw/9pfs/9p.c
-@@ -25,6 +25,10 @@
- #include "trace.h"
- #include "migration/migration.h"
- 
-+#ifdef __linux__
-+#include <linux/limits.h> /* for XATTR_SIZE_MAX */
-+#endif
-+
- int open_fd_hw;
- int total_open_fd;
- static int open_fd_rc;
diff --git a/main/xen/xenqemu.initd b/main/xen/xenqemu.initd
index 5872ecf2ac2..98e8064cfb0 100644
--- a/main/xen/xenqemu.initd
+++ b/main/xen/xenqemu.initd
@@ -10,11 +10,11 @@ start() {
 	# XXX: qemu f**** the console when launched with
 	# -nographic and -monitor, use nohup to prevent that.
 	start-stop-daemon --start --exec nohup \
-		--pidfile=/var/run/xenqemu.pid -b -- \
+		--pidfile=/run/xenqemu.pid -b -- \
 		/usr/lib/xen/bin/qemu-system-i386 \
 		-xen-domid 0 -xen-attach -name dom0 -nographic \
 		-M xenpv -monitor /dev/null \
-		-pidfile /var/run/xenqemu.pid \
+		-pidfile /run/xenqemu.pid \
 		${XENQEMU_OPTS}
 	eend $?
 }
@@ -22,7 +22,7 @@ start() {
 stop() {
 	ebegin "Stopping QEMU as disk backend for dom0"
 	start-stop-daemon --stop --exec /usr/lib/xen/bin/qemu-system-i386 \
-		--pidfile /var/run/xenqemu.pid
+		--pidfile /run/xenqemu.pid
 	eend $?
 }
 
diff --git a/main/xen/xenstored.initd b/main/xen/xenstored.initd
index 22fa136b294..1a84e612953 100644
--- a/main/xen/xenstored.initd
+++ b/main/xen/xenstored.initd
@@ -8,9 +8,14 @@ depend() {
 	after localmount
 }
 
+check_xenstored_up() {
+	test -f /run/xenstored.pid
+	return $?
+}
+
 wait_xenstored_up() {
 	local time=0 timeout=30
-	while ! xenstore-read -s / >/dev/null 2>&1; do
+	while ! check_xenstored_up; do
 		time=$(($time+1))
 		if [ $time -gt $timeout ]; then
 			return 1
@@ -21,8 +26,8 @@ wait_xenstored_up() {
 }
 
 start() {
-	checkpath --directory --mode 755 /var/run/xen
-	if xenstore-read -s / >/dev/null 2>&1; then
+	checkpath --directory --mode 755 /run/xen
+	if check_xenstored_up; then
 		ewarn "Xenstore can only be started once"
 		return 0
 	fi
@@ -52,16 +57,15 @@ start() {
 		wait_xenstored_up
 	else
 		start-stop-daemon --start --exec /usr/sbin/xenstored \
-			--pidfile /var/run/xenstored.pid \
-			-- --pid-file=/var/run/xenstored.pid \
+			--pidfile /run/xenstored.pid \
+			-- --pid-file=/run/xenstored.pid \
 			$XENSTORED_OPTS $_traceopt
 		wait_xenstored_up
 	fi
 	eend $? || return 1
 
 	ebegin "Setting domain0 name and domid record"
-	/usr/bin/xenstore-write "/local/domain/0/name" "Domain-0" \
-		&& /usr/bin/xenstore-write "/local/domain/0/domid" 0
+	/usr/lib/xen/bin/xen-init-dom0
 	eend $?
 }
 
diff --git a/main/xf86-input-evdev/APKBUILD b/main/xf86-input-evdev/APKBUILD
deleted file mode 100644
index 9460f609ef6..00000000000
--- a/main/xf86-input-evdev/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-input-evdev
-pkgver=2.10.6
-pkgrel=0
-pkgdesc="X.org evdev input driver"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc $pkgname-dev"
-depends=""
-makedepends="libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev
-	eudev-dev mtdev-dev libevdev-dev"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-builddir="$srcdir"/$pkgname-$pkgver
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="560b0a6491d50a46913a5890a35c0367e59f550670993493bd9712d712a9747ddaa6fe5086daabf2fcafa24b0159383787eb273da4a2a60c089bfc0a77ad2ad1  xf86-input-evdev-2.10.6.tar.bz2"
diff --git a/main/xf86-input-keyboard/APKBUILD b/main/xf86-input-keyboard/APKBUILD
deleted file mode 100644
index 2869394380a..00000000000
--- a/main/xf86-input-keyboard/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-input-keyboard
-pkgver=1.9.0
-pkgrel=1
-pkgdesc="X.org keyboard input driver"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-builddir="$srcdir/$pkgname-$pkgver"
-
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="d1a52d10039096d0d5e09750b6a8c2388345748331615af93e5be499646c3bc5fbbfc897fcebdeada5efaafff94f26a2ab84d6e35f01a875b8b9956a42015df9  xf86-input-keyboard-1.9.0.tar.bz2"
diff --git a/main/xf86-input-libinput/APKBUILD b/main/xf86-input-libinput/APKBUILD
deleted file mode 100644
index edc3ee92622..00000000000
--- a/main/xf86-input-libinput/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-input-libinput
-pkgver=0.29.0
-pkgrel=0
-pkgdesc="X.Org input driver based on libinput"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-depends_dev="libinput-dev xorg-server-dev"
-makedepends="$depends_dev eudev-dev xorgproto"
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://www.x.org/releases/individual/driver/xf86-input-libinput-$pkgver.tar.bz2"
-
-builddir="$srcdir/$pkgname-$pkgver"
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="f19ef2e9e0c1336d8e0b17853e1fe0c66ecf50e7b10b10b6c5cbafc99323694597821e15e8e358419ef3c68d1009967fd2ec3760800c85adbb71ac3ecc99954b  xf86-input-libinput-0.29.0.tar.bz2"
diff --git a/main/xf86-input-mouse/APKBUILD b/main/xf86-input-mouse/APKBUILD
deleted file mode 100644
index 7d80a61fb26..00000000000
--- a/main/xf86-input-mouse/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-input-mouse
-pkgver=1.9.3
-pkgrel=1
-pkgdesc="X.org mouse input driver"
-url="https://www.x.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc $pkgname-dev"
-depends=
-makedepends="libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-builddir="$srcdir/$pkgname-$pkgver"
-
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="d99f5b4b1ef1aa4cbf1a92549e412f54f121bc804e4d6643248ad7ea18081b38b958bd289dc8476ebc0f6ef5f7424c2f2a8abcfaa30cae5378829549af6b148f  xf86-input-mouse-1.9.3.tar.bz2"
diff --git a/main/xf86-input-synaptics/APKBUILD b/main/xf86-input-synaptics/APKBUILD
deleted file mode 100644
index d0b6dac8071..00000000000
--- a/main/xf86-input-synaptics/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-input-synaptics
-pkgver=1.9.1
-pkgrel=1
-pkgdesc="X.org synaptics input driver"
-url="https://www.x.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc $pkgname-dev"
-depends=
-makedepends="libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev
-	mtdev-dev libxtst-dev libevdev-dev"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-builddir="$srcdir/$pkgname-$pkgver"
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="978eddd456aa7361047bc3d72e5127b24b13de29b0dddb6a0acc9f9da93931baa2b22fb5d1e6be164f629a11e5d97d753b835426435396b45b1af5eb8d546c3f  xf86-input-synaptics-1.9.1.tar.bz2"
diff --git a/main/xf86-input-vmmouse/APKBUILD b/main/xf86-input-vmmouse/APKBUILD
deleted file mode 100644
index c90e8cc1f94..00000000000
--- a/main/xf86-input-vmmouse/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-input-vmmouse
-pkgver=13.1.0
-pkgrel=4
-pkgdesc="X.org VMware mouse input driver"
-url="https://xorg.freedesktop.org/"
-arch="x86 x86_64"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev eudev-dev"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-}
-
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-sha512sums="38e09c5d7da971eb25ed79fc2daac3b8e1f5e6ec1096424696652c975ea653ed4a49d7779e7735d81a512c12c0a30829d5443ca78a275f3181ebd1740dd2dfd4  xf86-input-vmmouse-13.1.0.tar.bz2"
diff --git a/main/xf86-video-amdgpu/APKBUILD b/main/xf86-video-amdgpu/APKBUILD
deleted file mode 100644
index 8d80d81fdbc..00000000000
--- a/main/xf86-video-amdgpu/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Linus Swälas <linus.swalas@borderless.se>
-pkgname=xf86-video-amdgpu
-pkgver=19.1.0
-pkgrel=0
-pkgdesc="AMD Rx/HDxxxx video driver"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-options="!check"
-depends="mesa-dri-ati"
-makedepends="xorg-server-dev libxi-dev libdrm-dev mesa-dev eudev-dev pixman-dev
-	util-macros xorgproto libpciaccess-dev"
-source="https://www.x.org/releases/individual/driver/xf86-video-amdgpu-$pkgver.tar.bz2"
-
-build() {
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	make check
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="ccdaa2378492da1a2f3d18fedacd1318c4708da534a8a959276a82730d5420619d83ad1ec8d7835c55655fe56123cd9bffb44e6223c5a97033c01f598af4a173  xf86-video-amdgpu-19.1.0.tar.bz2"
diff --git a/main/xf86-video-apm/APKBUILD b/main/xf86-video-apm/APKBUILD
deleted file mode 100644
index aa5cab9ca96..00000000000
--- a/main/xf86-video-apm/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-apm
-pkgver=1.3.0
-pkgrel=0
-pkgdesc="Alliance ProMotion video driver"
-url="https://xorg.freedesktop.org/"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="1b10a2d1f886c228629487946fda1ff1766fe0c00657ba8cc1b4cf3bcd7cf66716a0875c90e6f7b7178cf3b48a78a4301bfad1714ee37c63aa7ae9c498ab4f8b  xf86-video-apm-1.3.0.tar.bz2"
diff --git a/main/xf86-video-ark/APKBUILD b/main/xf86-video-ark/APKBUILD
deleted file mode 100644
index 19d5cd932dc..00000000000
--- a/main/xf86-video-ark/APKBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-ark
-pkgver=0.7.5
-pkgrel=10
-pkgdesc="X.Org driver for ark cards"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
-	mibstore.patch"
-
-builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-}
-
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-sha512sums="67c2b4e2109bf9d84a007c9679d35e7c0a4e4ddcdb7be9fa5070ce7e2f666e018d8421ddd4890cf3abb4eb37e060a10666c62a9efbb5369eb7cd8647ee18a644  xf86-video-ark-0.7.5.tar.bz2
-f7ef3d7003e75ae6d27f4ec1100e6cb42546f3dd5871a2d92ad779909ebd1243976679f14e1a8443ba17bb3cd36fa755cdbda4be3627a49af0033513309ad6bb  mibstore.patch"
diff --git a/main/xf86-video-ark/mibstore.patch b/main/xf86-video-ark/mibstore.patch
deleted file mode 100644
index 2bc41a73af9..00000000000
--- a/main/xf86-video-ark/mibstore.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./src/ark_driver.c.orig	2013-03-07 10:16:06.584081552 +0000
-+++ ./src/ark_driver.c	2013-03-07 10:16:23.270892075 +0000
-@@ -39,7 +39,6 @@
- #include "compiler.h"
- #include "mipointer.h"
- #include "micmap.h"
--#include "mibstore.h"
- #include "fb.h"
- #include "ark.h"
- 
-@@ -538,7 +537,6 @@
- 
- 	fbPictureInit (pScreen, 0, 0);
- 
--	miInitializeBackingStore(pScreen);
- 	xf86SetBackingStore(pScreen);
- 
- 	if (!pARK->NoAccel) {
diff --git a/main/xf86-video-ast/APKBUILD b/main/xf86-video-ast/APKBUILD
deleted file mode 100644
index 2fb379ff34e..00000000000
--- a/main/xf86-video-ast/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-ast
-pkgver=1.1.5
-pkgrel=4
-pkgdesc="X.Org driver for ASpeedTech cards"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
-	"
-
-builddir="$srcdir"/$pkgname-$pkgver
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-sha512sums="067c2ce3e74c83fe1531213308753cb80482d177c93009c99dc49e95bfa6ff058d81cc716d6c343b9ca1e0eb7aedf3b84beb12ad08b8cd4d9f43e11f9e192e8e  xf86-video-ast-1.1.5.tar.bz2"
diff --git a/main/xf86-video-ati/APKBUILD b/main/xf86-video-ati/APKBUILD
deleted file mode 100644
index 807f349c4b4..00000000000
--- a/main/xf86-video-ati/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-ati
-pkgver=19.1.0
-pkgrel=0
-pkgdesc="ATI video driver"
-url="https://xorg.freedesktop.org/wiki/"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends="mesa-dri-ati"
-makedepends="
-	libdrm-dev
-	libxi-dev
-	mesa-dev
-	eudev-dev
-	pixman-dev
-	xorg-server-dev
-	xorgproto
-	"
-options="!check" # No testsuite
-source="https://www.x.org/releases/individual/driver/xf86-video-ati-$pkgver.tar.bz2"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--enable-glamor \
-		LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6  xf86-video-ati-19.1.0.tar.bz2"
diff --git a/main/xf86-video-chips/APKBUILD b/main/xf86-video-chips/APKBUILD
deleted file mode 100644
index f1c1692eb5f..00000000000
--- a/main/xf86-video-chips/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-chips
-pkgver=1.4.0
-pkgrel=0
-pkgdesc="Chips and Technologies video driver"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-builddir="$srcdir"/$pkgname-$pkgver
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="813f1dfda9e4397610418a8ea6b16aef1dd43a0ffb5118e297eb374759f8b9a5e6f03a168956022ea7e9f9f7424e3d86d87bd1d1bdec455fd2a132722853b585  xf86-video-chips-1.4.0.tar.bz2"
diff --git a/main/xf86-video-dummy/APKBUILD b/main/xf86-video-dummy/APKBUILD
deleted file mode 100644
index d3ed9ce377f..00000000000
--- a/main/xf86-video-dummy/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-dummy
-pkgver=0.3.8
-pkgrel=3
-pkgdesc="X.Org driver for dummy cards"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-builddir="$srcdir"/$pkgname-$pkgver
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-sha512sums="f534113fd9987e44d2e0d0c53bd1b71be4ba69ec239ecec4aba8fcdcc10597722c54cbc01da38e0975ac7660e4e4028330e4cdd369e755c25ec059d2dfabad80  xf86-video-dummy-0.3.8.tar.bz2"
diff --git a/main/xf86-video-fbdev/APKBUILD b/main/xf86-video-fbdev/APKBUILD
deleted file mode 100644
index f907471ba6b..00000000000
--- a/main/xf86-video-fbdev/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-fbdev
-pkgver=0.5.0
-pkgrel=2
-pkgdesc="Video driver for framebuffer device"
-url="https://www.x.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-builddir="$srcdir"/$pkgname-$pkgver
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="c1217b943bbe3301b3c2a8649ed1004c3c67b02607bd56bbc14f6dfa05e7f0184332c81a6a19595514745501ed88526aee932e555779b7c3a8233646b0979448  xf86-video-fbdev-0.5.0.tar.bz2"
diff --git a/main/xf86-video-glint/APKBUILD b/main/xf86-video-glint/APKBUILD
deleted file mode 100644
index 31c579d0018..00000000000
--- a/main/xf86-video-glint/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-glint
-pkgver=1.2.9
-pkgrel=3
-pkgdesc="GLINT/Permedia video driver"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libxi-dev util-macros libdrm-dev mesa-dev
-	xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-builddir="$srcdir"/$pkgname-$pkgver
-
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-sha512sums="29b573abc2c77992562ab72ea99dfac5fa4baee99404747c53494680fe750b9c096833cd6c8013aa85f7fb5db5bdbee2a9b26dff633a6a4fe2dc8cd9f0adff12  xf86-video-glint-1.2.9.tar.bz2"
diff --git a/main/xf86-video-i128/APKBUILD b/main/xf86-video-i128/APKBUILD
deleted file mode 100644
index fd7c963a7ec..00000000000
--- a/main/xf86-video-i128/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-i128
-pkgver=1.4.0
-pkgrel=0
-pkgdesc="Number 9 I128 video driver"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-builddir="$srcdir"/$pkgname-$pkgver
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="d58baee3f20b3ad2ece6853da0ff20a6d54b984c6e3289bad2715cc003b277a0b44d20ded25cfc116400468df552390bdb5d80fbd3fb60861488ee5d027664b2  xf86-video-i128-1.4.0.tar.bz2"
diff --git a/main/xf86-video-i740/APKBUILD b/main/xf86-video-i740/APKBUILD
deleted file mode 100644
index ce9c3fb3517..00000000000
--- a/main/xf86-video-i740/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-i740
-pkgver=1.4.0
-pkgrel=0
-pkgdesc="Intel i740 video driver"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
-	"
-
-builddir="$srcdir"/$pkgname-$pkgver
-
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="d34bcd1084de3173b65b9da4afc88435b153979ed4748cfa715d39f28fb238a21bbca7190a9091cdd9c67f55f98e4ae57980ef4dd7ca3dcfda373712f6bd0568  xf86-video-i740-1.4.0.tar.bz2"
diff --git a/main/xf86-video-intel/APKBUILD b/main/xf86-video-intel/APKBUILD
deleted file mode 100644
index 56da115db42..00000000000
--- a/main/xf86-video-intel/APKBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-intel
-pkgver=2.99.917_git20170325
-pkgrel=4
-pkgdesc="X.Org driver for Intel cards"
-url="https://xorg.freedesktop.org"
-arch="x86 x86_64"
-license="MIT"
-subpackages="$pkgname-doc"
-depends="mesa-dri-intel"
-makedepends="xorg-server-dev libxi-dev libdrm-dev mesa-dev libxvmc-dev
-	xcb-util-dev eudev-dev util-macros autoconf automake libtool xorgproto
-	libxv-dev"
-_ver=${pkgver%_git*}
-source="https://www.x.org/releases/individual/driver/$pkgname-$_ver.tar.bz2
-	git.patch
-	fix-build-on-i686.patch
-	"
-
-builddir="$srcdir"/$pkgname-$_ver
-prepare() {
-	cd "$builddir"
-	default_prepare
-	autoreconf -vif
-}
-
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--enable-xvmc \
-		--disable-selective-werror \
-		--with-default-dri=3
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-
-	# http://bugs.alpinelinux.org/issues/3312
-	chmod o-x "$pkgdir"/usr/libexec/xf86-video-intel-backlight-helper
-}
-sha512sums="cbf4d46ad1ad5e5587c0f1f620ff534ef0645270517b60056b9f03e83d8216e2f456de46352a06c37c0c46963cc4ed20b71b815b20ec1bf680ff046e535f580f  xf86-video-intel-2.99.917.tar.bz2
-0fe4e455dcbc4ae6622dca483ef3ddc765c43009fdb0fef82bdaa835a737796a6caf8afa9c6630919f43c977a6f736770c3779f04d8c823da4fc9cee17d16f19  git.patch
-289930c10ba0278d6dde544311ca4381bdcc046e15b2abf3d17b7eb1a7ab8f54274b40f95fe6143aee5d02cc07aea7560dd1d4e3b0e9deca9f8334a56b287e1b  fix-build-on-i686.patch"
diff --git a/main/xf86-video-intel/fix-build-on-i686.patch b/main/xf86-video-intel/fix-build-on-i686.patch
deleted file mode 100644
index 0851fbe4b1f..00000000000
--- a/main/xf86-video-intel/fix-build-on-i686.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From a414d4e24461da1cb4cef8ee910bc57bab360ceb Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 6 Mar 2018 12:07:46 -0500
-Subject: [PATCH] Fix build on i686
-
-Presumably this only matters for i686 because amd64 implies sse2, but:
-
-BUILDSTDERR: In file included from gen4_vertex.c:34:
-BUILDSTDERR: gen4_vertex.c: In function 'emit_vertex':
-BUILDSTDERR: sna_render_inline.h:40:26: error: inlining failed in call to always_inline 'vertex_emit_2s': target specific option mismatch
-BUILDSTDERR:  static force_inline void vertex_emit_2s(struct sna *sna, int16_t x, int16_t y)
-BUILDSTDERR:                           ^~~~~~~~~~~~~~
-BUILDSTDERR: gen4_vertex.c:308:25: note: called from here
-BUILDSTDERR:  #define OUT_VERTEX(x,y) vertex_emit_2s(sna, x,y) /* XXX assert(!too_large(x, y)); */
-BUILDSTDERR:                          ^~~~~~~~~~~~~~~~~~~~~~~~
-BUILDSTDERR: gen4_vertex.c:360:2: note: in expansion of macro 'OUT_VERTEX'
-BUILDSTDERR:   OUT_VERTEX(dstX, dstY);
-BUILDSTDERR:   ^~~~~~~~~~
-
-The bug here appears to be that emit_vertex() is declared 'sse2' but
-vertex_emit_2s is merely always_inline. gcc8 decides that since you said
-always_inline you need to have explicitly cloned it for every
-permutation of targets. Merely saying inline seems to do the job of
-cloning vertex_emit_2s as much as necessary.
-
-So to reiterate: if you say always-inline, it won't, but if you just say
-maybe inline, it will. Thanks gcc, that's helpful.
-
-- ajax
----
- src/sna/compiler.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sna/compiler.h b/src/sna/compiler.h
-index 3c176a16..bc447c7a 100644
---- a/src/sna/compiler.h
-+++ b/src/sna/compiler.h
-@@ -32,7 +32,7 @@
- #define likely(expr) (__builtin_expect (!!(expr), 1))
- #define unlikely(expr) (__builtin_expect (!!(expr), 0))
- #define noinline __attribute__((noinline))
--#define force_inline inline __attribute__((always_inline))
-+#define force_inline inline
- #define fastcall __attribute__((regparm(3)))
- #define must_check __attribute__((warn_unused_result))
- #define constant __attribute__((const))
--- 
-2.16.2
-
diff --git a/main/xf86-video-intel/git.patch b/main/xf86-video-intel/git.patch
deleted file mode 100644
index 20084425a4f..00000000000
--- a/main/xf86-video-intel/git.patch
+++ /dev/null
@@ -1,43164 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 418fdc92..de5fbe12 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,14 +18,16 @@
- #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
-+#Having problems passing through user flags as libtool complains
-+#ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
-+ACLOCAL_AMFLAGS = -I m4
- 
- SUBDIRS = man libobj xvmc src tools
- 
- MAINTAINERCLEANFILES = ChangeLog INSTALL
- 
- if HAVE_X11
--SUBDIRS += test
-+SUBDIRS += test benchmarks
- endif
- 
- .PHONY: ChangeLog INSTALL
-diff --git a/NEWS b/NEWS
-index 604b9cce..0e200332 100644
---- a/NEWS
-+++ b/NEWS
-@@ -21,7 +21,7 @@ should make one more snapshot before an imminent release.
-    Before kernel 3.19, O_NONBLOCK support is broken and so we must avoid
-    reading if we are not expecting an event.
- 
-- * Backwards compatibilty fix for fake triple buffering with PRIME and
-+ * Backwards compatibility fix for fake triple buffering with PRIME and
-    Xorg-1.15
-    https://bugs.freedesktop.org/show_bug.cgi?id=85144#c12
- 
-@@ -51,7 +51,7 @@ should make one more snapshot before an imminent release.
- Snapshot 2.99.916 (2014-09-08)
- ==============================
- Quick update for MST in UXA - we need to hook up the RandR outputs for
--dynamicaly added connectors.
-+dynamically added connectors.
- 
- 
- Snapshot 2.99.915 (2014-09-08)
-@@ -503,7 +503,7 @@ release.
-    backlight property is queried whilst the connector is disabled
-    https://bugs.freedesktop.org/show_bug.cgi?id=70406
- 
-- * Pad GETCONNECTOR ioctl for compatability between 32/64-bit userspace
-+ * Pad GETCONNECTOR ioctl for compatibility between 32/64-bit userspace
-    and kernel
- 
-  * Handle long glyph runs correctly
-@@ -523,7 +523,7 @@ snapshot beforehand to push out the bug fixes from the last week.
- 
-  * Fix video output using sprites when changing the image size
- 
-- * Apply more restrictive tile constaints for 915g class devices
-+ * Apply more restrictive tile constraints for 915g class devices
-    https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1232546
- 
-  * Ensure all overlapping rectangles are drawn for XRenderFillRectangles
-@@ -1132,7 +1132,7 @@ operation.
-  * Explicitly prevent ring-switching for synchronized rendering to
-    scanouts (for vsync).
- 
-- * Clip dirty region to slave pixmaps (otherwise UDL is nigh unusuable)
-+ * Clip dirty region to slave pixmaps (otherwise UDL is nigh unusable)
-    https://bugs.freedesktop.org/show_bug.cgi?id=59539
- 
- 
-@@ -1226,7 +1226,7 @@ Release 2.20.15 (2012-12-03)
- ============================
- And lo, enabling more of the common acceleration paths for gen4 revealed
- another lurking bug - something is wrong with how we prepare Y-tiling
--surfaces for rendering. For the time being, we can surreptiously disable
-+surfaces for rendering. For the time being, we can surreptitiously disable
- them for gen4 and avoid hitting GPU hangs.
- 
-  * Avoid clobbering the render state after failing to convert the
-@@ -1515,7 +1515,7 @@ Release 2.20.5 (2012-08-26)
- Another silly bug found, another small bugfix release. The goal was for
- the driver to bind to all Intel devices supported by the kernel.
- Unfortunately we were too successful and started claiming Pouslbo,
--Medfield and Cedarview devices which are still encumbered by propietary
-+Medfield and Cedarview devices which are still encumbered by proprietary
- IP and not supported by this driver.
- 
- Bugs fixed since 2.20.4:
-diff --git a/README b/README
-index cf4d88d8..348983b4 100644
---- a/README
-+++ b/README
-@@ -15,9 +15,9 @@ Intel graphics chipsets including:
- 	G/Q33,G/Q35,G41,G/Q43,G/GM/Q45
- 	PineView-M (Atom N400 series)
- 	PineView-D (Atom D400/D500 series)
--	Intel(R) HD Graphics: 2000-6000,
--	Intel(R) Iris(TM) Graphics: 5100/6100, and
--	Intel(R) Iris(TM) Pro Graphics: 5200/6200/P6300.
-+	Intel(R) HD Graphics,
-+	Intel(R) Iris(TM) Graphics,
-+	Intel(R) Iris(TM) Pro Graphics.
- 
- Where to get more information about the driver
- ----------------------------------------------
-diff --git a/benchmarks/.gitignore b/benchmarks/.gitignore
-new file mode 100644
-index 00000000..301c0129
---- /dev/null
-+++ b/benchmarks/.gitignore
-@@ -0,0 +1,2 @@
-+dri2-swap
-+dri3-swap
-diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
-new file mode 100644
-index 00000000..4976e8a3
---- /dev/null
-+++ b/benchmarks/Makefile.am
-@@ -0,0 +1,14 @@
-+AM_CFLAGS = @CWARNFLAGS@ $(X11_CFLAGS) $(DRM_CFLAGS)
-+LDADD = $(X11_LIBS) $(DRM_LIBS) $(CLOCK_GETTIME_LIBS)
-+
-+check_PROGRAMS =
-+
-+if DRI2
-+check_PROGRAMS += dri2-swap
-+endif
-+
-+if DRI3
-+check_PROGRAMS += dri3-swap
-+AM_CFLAGS += $(X11_DRI3_CFLAGS)
-+LDADD += $(X11_DRI3_LIBS)
-+endif
-diff --git a/benchmarks/dri2-swap.c b/benchmarks/dri2-swap.c
-new file mode 100644
-index 00000000..3d9d30aa
---- /dev/null
-+++ b/benchmarks/dri2-swap.c
-@@ -0,0 +1,588 @@
-+/*
-+ * Copyright (c) 2015 Intel Corporation
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ *
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <X11/Xlib.h>
-+#include <X11/Xatom.h>
-+#include <X11/Xlib-xcb.h>
-+#include <X11/Xutil.h>
-+#include <X11/Xlibint.h>
-+#include <X11/extensions/dpms.h>
-+#include <X11/extensions/randr.h>
-+#include <X11/extensions/Xcomposite.h>
-+#include <X11/extensions/Xdamage.h>
-+#include <X11/extensions/Xrandr.h>
-+#include <xcb/xcb.h>
-+#include <xcb/dri2.h>
-+#include <xf86drm.h>
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <assert.h>
-+#include <errno.h>
-+#include <setjmp.h>
-+#include <signal.h>
-+
-+#include <X11/Xlibint.h>
-+#include <X11/extensions/Xext.h>
-+#include <X11/extensions/extutil.h>
-+#include <X11/extensions/dri2proto.h>
-+#include <X11/extensions/dri2tokens.h>
-+#include <X11/extensions/Xfixes.h>
-+
-+static char dri2ExtensionName[] = DRI2_NAME;
-+static XExtensionInfo *dri2Info;
-+static XEXT_GENERATE_CLOSE_DISPLAY (DRI2CloseDisplay, dri2Info)
-+
-+static Bool
-+DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire);
-+static Status
-+DRI2EventToWire(Display *dpy, XEvent *event, xEvent *wire);
-+static int
-+DRI2Error(Display *display, xError *err, XExtCodes *codes, int *ret_code);
-+
-+static /* const */ XExtensionHooks dri2ExtensionHooks = {
-+  NULL,                   /* create_gc */
-+  NULL,                   /* copy_gc */
-+  NULL,                   /* flush_gc */
-+  NULL,                   /* free_gc */
-+  NULL,                   /* create_font */
-+  NULL,                   /* free_font */
-+  DRI2CloseDisplay,       /* close_display */
-+  DRI2WireToEvent,        /* wire_to_event */
-+  DRI2EventToWire,        /* event_to_wire */
-+  DRI2Error,              /* error */
-+  NULL,                   /* error_string */
-+};
-+
-+static XEXT_GENERATE_FIND_DISPLAY (DRI2FindDisplay,
-+                                   dri2Info,
-+                                   dri2ExtensionName,
-+                                   &dri2ExtensionHooks,
-+                                   0, NULL)
-+
-+static Bool
-+DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire)
-+{
-+   XExtDisplayInfo *info = DRI2FindDisplay(dpy);
-+
-+   XextCheckExtension(dpy, info, dri2ExtensionName, False);
-+
-+   switch ((wire->u.u.type & 0x7f) - info->codes->first_event) {
-+#ifdef X_DRI2SwapBuffers
-+   case DRI2_BufferSwapComplete:
-+      return False;
-+#endif
-+#ifdef DRI2_InvalidateBuffers
-+   case DRI2_InvalidateBuffers:
-+      return False;
-+#endif
-+   default:
-+      /* client doesn't support server event */
-+      break;
-+   }
-+
-+   return False;
-+}
-+
-+/* We don't actually support this.  It doesn't make sense for clients to
-+ * send each other DRI2 events.
-+ */
-+static Status
-+DRI2EventToWire(Display *dpy, XEvent *event, xEvent *wire)
-+{
-+   XExtDisplayInfo *info = DRI2FindDisplay(dpy);
-+
-+   XextCheckExtension(dpy, info, dri2ExtensionName, False);
-+
-+   switch (event->type) {
-+   default:
-+      /* client doesn't support server event */
-+      break;
-+   }
-+
-+   return Success;
-+}
-+
-+static int
-+DRI2Error(Display *display, xError *err, XExtCodes *codes, int *ret_code)
-+{
-+	if (err->majorCode == codes->major_opcode &&
-+	    err->errorCode == BadDrawable &&
-+	    err->minorCode == X_DRI2CopyRegion)
-+		return True;
-+
-+	/* If the X drawable was destroyed before the GLX drawable, the
-+	 * DRI2 drawble will be gone by the time we call
-+	 * DRI2DestroyDrawable.  So just ignore BadDrawable here. */
-+	if (err->majorCode == codes->major_opcode &&
-+	    err->errorCode == BadDrawable &&
-+	    err->minorCode == X_DRI2DestroyDrawable)
-+		return True;
-+
-+	/* If the server is non-local DRI2Connect will raise BadRequest.
-+	 * Swallow this so that DRI2Connect can signal this in its return code */
-+	if (err->majorCode == codes->major_opcode &&
-+	    err->minorCode == X_DRI2Connect &&
-+	    err->errorCode == BadRequest) {
-+		*ret_code = False;
-+		return True;
-+	}
-+
-+	return False;
-+}
-+
-+static Bool
-+DRI2QueryExtension(Display * dpy, int *eventBase, int *errorBase)
-+{
-+	XExtDisplayInfo *info = DRI2FindDisplay(dpy);
-+
-+	if (XextHasExtension(info)) {
-+		*eventBase = info->codes->first_event;
-+		*errorBase = info->codes->first_error;
-+		return True;
-+	}
-+
-+	return False;
-+}
-+
-+static Bool
-+DRI2Connect(Display * dpy, XID window, char **driverName, char **deviceName)
-+{
-+	XExtDisplayInfo *info = DRI2FindDisplay(dpy);
-+	xDRI2ConnectReply rep;
-+	xDRI2ConnectReq *req;
-+
-+	XextCheckExtension(dpy, info, dri2ExtensionName, False);
-+
-+	LockDisplay(dpy);
-+	GetReq(DRI2Connect, req);
-+	req->reqType = info->codes->major_opcode;
-+	req->dri2ReqType = X_DRI2Connect;
-+	req->window = window;
-+	req->driverType = DRI2DriverDRI;
-+	if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
-+		UnlockDisplay(dpy);
-+		SyncHandle();
-+		return False;
-+	}
-+
-+	if (rep.driverNameLength == 0 && rep.deviceNameLength == 0) {
-+		UnlockDisplay(dpy);
-+		SyncHandle();
-+		return False;
-+	}
-+
-+	*driverName = Xmalloc(rep.driverNameLength + 1);
-+	if (*driverName == NULL) {
-+		_XEatData(dpy,
-+			  ((rep.driverNameLength + 3) & ~3) +
-+			  ((rep.deviceNameLength + 3) & ~3));
-+		UnlockDisplay(dpy);
-+		SyncHandle();
-+		return False;
-+	}
-+	_XReadPad(dpy, *driverName, rep.driverNameLength);
-+	(*driverName)[rep.driverNameLength] = '\0';
-+
-+	*deviceName = Xmalloc(rep.deviceNameLength + 1);
-+	if (*deviceName == NULL) {
-+		Xfree(*driverName);
-+		_XEatData(dpy, ((rep.deviceNameLength + 3) & ~3));
-+		UnlockDisplay(dpy);
-+		SyncHandle();
-+		return False;
-+	}
-+	_XReadPad(dpy, *deviceName, rep.deviceNameLength);
-+	(*deviceName)[rep.deviceNameLength] = '\0';
-+
-+	UnlockDisplay(dpy);
-+	SyncHandle();
-+
-+	return True;
-+}
-+
-+static Bool
-+DRI2Authenticate(Display * dpy, XID window, unsigned int magic)
-+{
-+	XExtDisplayInfo *info = DRI2FindDisplay(dpy);
-+	xDRI2AuthenticateReq *req;
-+	xDRI2AuthenticateReply rep;
-+
-+	XextCheckExtension(dpy, info, dri2ExtensionName, False);
-+
-+	LockDisplay(dpy);
-+	GetReq(DRI2Authenticate, req);
-+	req->reqType = info->codes->major_opcode;
-+	req->dri2ReqType = X_DRI2Authenticate;
-+	req->window = window;
-+	req->magic = magic;
-+
-+	if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
-+		UnlockDisplay(dpy);
-+		SyncHandle();
-+		return False;
-+	}
-+
-+	UnlockDisplay(dpy);
-+	SyncHandle();
-+
-+	return rep.authenticated;
-+}
-+
-+static void
-+DRI2CreateDrawable(Display * dpy, XID drawable)
-+{
-+	XExtDisplayInfo *info = DRI2FindDisplay(dpy);
-+	xDRI2CreateDrawableReq *req;
-+
-+	XextSimpleCheckExtension(dpy, info, dri2ExtensionName);
-+
-+	LockDisplay(dpy);
-+	GetReq(DRI2CreateDrawable, req);
-+	req->reqType = info->codes->major_opcode;
-+	req->dri2ReqType = X_DRI2CreateDrawable;
-+	req->drawable = drawable;
-+	UnlockDisplay(dpy);
-+	SyncHandle();
-+}
-+
-+static void DRI2SwapInterval(Display *dpy, XID drawable, int interval)
-+{
-+    XExtDisplayInfo *info = DRI2FindDisplay(dpy);
-+    xDRI2SwapIntervalReq *req;
-+
-+    XextSimpleCheckExtension (dpy, info, dri2ExtensionName);
-+
-+    LockDisplay(dpy);
-+    GetReq(DRI2SwapInterval, req);
-+    req->reqType = info->codes->major_opcode;
-+    req->dri2ReqType = X_DRI2SwapInterval;
-+    req->drawable = drawable;
-+    req->interval = interval;
-+    UnlockDisplay(dpy);
-+    SyncHandle();
-+}
-+
-+static int _x_error_occurred;
-+
-+static int
-+_check_error_handler(Display     *display,
-+		     XErrorEvent *event)
-+{
-+	fprintf(stderr,
-+		"X11 error from display %s, serial=%ld, error=%d, req=%d.%d\n",
-+	       DisplayString(display),
-+	       event->serial,
-+	       event->error_code,
-+	       event->request_code,
-+	       event->minor_code);
-+	_x_error_occurred++;
-+	return False; /* ignored */
-+}
-+
-+static double elapsed(const struct timespec *start,
-+		      const struct timespec *end)
-+{
-+	return 1e6*(end->tv_sec - start->tv_sec) + (end->tv_nsec - start->tv_nsec)/1000;
-+}
-+
-+static void run(Display *dpy, Window win)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	struct timespec start, end;
-+	int n, completed = 0;
-+
-+	clock_gettime(CLOCK_MONOTONIC, &start);
-+	do {
-+		for (n = 0; n < 1000; n++) {
-+			unsigned int attachments[] = { DRI2BufferBackLeft };
-+			unsigned int seq[2];
-+
-+			seq[0] = xcb_dri2_swap_buffers_unchecked(c, win,
-+								 0, 0, 0, 0, 0, 0).sequence;
-+
-+
-+			seq[1] = xcb_dri2_get_buffers_unchecked(c, win,
-+								1, 1, attachments).sequence;
-+
-+			xcb_flush(c);
-+			xcb_discard_reply(c, seq[0]);
-+			xcb_discard_reply(c, seq[1]);
-+			completed++;
-+		}
-+		clock_gettime(CLOCK_MONOTONIC, &end);
-+	} while (end.tv_sec < start.tv_sec + 10);
-+
-+	printf("%f\n", completed / (elapsed(&start, &end) / 1000000));
-+}
-+
-+static inline XRRScreenResources *_XRRGetScreenResourcesCurrent(Display *dpy, Window window)
-+{
-+	XRRScreenResources *res;
-+
-+	res = XRRGetScreenResourcesCurrent(dpy, window);
-+	if (res == NULL)
-+		res = XRRGetScreenResources(dpy, window);
-+
-+	return res;
-+}
-+
-+static XRRModeInfo *lookup_mode(XRRScreenResources *res, int id)
-+{
-+	int i;
-+
-+	for (i = 0; i < res->nmode; i++) {
-+		if (res->modes[i].id == id)
-+			return &res->modes[i];
-+	}
-+
-+	return NULL;
-+}
-+
-+static int dri2_open(Display *dpy)
-+{
-+	drm_auth_t auth;
-+	char *driver, *device;
-+	int fd;
-+
-+	if (!DRI2QueryExtension(dpy, &fd, &fd))
-+		return -1;
-+
-+	if (!DRI2Connect(dpy, DefaultRootWindow(dpy), &driver, &device))
-+		return -1;
-+
-+	fd = open(device, O_RDWR);
-+	if (fd < 0)
-+		return -1;
-+
-+	if (drmIoctl(fd, DRM_IOCTL_GET_MAGIC, &auth))
-+		return -1;
-+
-+	if (!DRI2Authenticate(dpy, DefaultRootWindow(dpy), auth.magic))
-+		return -1;
-+
-+	return fd;
-+}
-+
-+static void fullscreen(Display *dpy, Window win)
-+{
-+	Atom atom = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
-+	XChangeProperty(dpy, win,
-+			XInternAtom(dpy, "_NET_WM_STATE", False),
-+			XA_ATOM, 32, PropModeReplace,
-+			(unsigned char *)&atom, 1);
-+}
-+
-+static int has_composite(Display *dpy)
-+{
-+	int event, error;
-+	int major, minor;
-+
-+	if (!XDamageQueryExtension (dpy, &event, &error))
-+		return 0;
-+
-+	if (!XCompositeQueryExtension(dpy, &event, &error))
-+		return 0;
-+
-+	XCompositeQueryVersion(dpy, &major, &minor);
-+
-+	return major > 0 || minor >= 4;
-+}
-+
-+int main(int argc, char **argv)
-+{
-+	Display *dpy;
-+	Window root, win;
-+	XRRScreenResources *res;
-+	XRRCrtcInfo **original_crtc;
-+	XSetWindowAttributes attr;
-+	enum window { ROOT, FULLSCREEN, WINDOW } w = FULLSCREEN;
-+	enum visible {REDIRECTED, NORMAL } v = NORMAL;
-+	enum display { OFF, ON } d = OFF;
-+	int width, height;
-+	int i, fd;
-+	int c;
-+
-+	while ((c = getopt(argc, argv, "d:v:w:")) != -1) {
-+		switch (c) {
-+		case 'd':
-+			if (strcmp(optarg, "off") == 0)
-+				d = OFF;
-+			else if (strcmp(optarg, "on") == 0)
-+				d = ON;
-+			else
-+				abort();
-+			break;
-+
-+		case 'v':
-+			if (strcmp(optarg, "redirected") == 0)
-+				v = REDIRECTED;
-+			else if (strcmp(optarg, "normal") == 0)
-+				v = NORMAL;
-+			else
-+				abort();
-+			break;
-+
-+		case 'w':
-+			if (strcmp(optarg, "fullscreen") == 0)
-+				w = FULLSCREEN;
-+			else if (strcmp(optarg, "window") == 0)
-+				w = WINDOW;
-+			else if (strcmp(optarg, "root") == 0)
-+				w = ROOT;
-+			else
-+				abort();
-+			break;
-+		}
-+	}
-+
-+	attr.override_redirect = 1;
-+
-+	dpy = XOpenDisplay(NULL);
-+	if (dpy == NULL)
-+		return 77;
-+
-+	width = DisplayWidth(dpy, DefaultScreen(dpy));
-+	height = DisplayHeight(dpy, DefaultScreen(dpy));
-+
-+	fd = dri2_open(dpy);
-+	if (fd < 0)
-+		return 77;
-+
-+	if (DPMSQueryExtension(dpy, &i, &i))
-+		DPMSDisable(dpy);
-+
-+	root = DefaultRootWindow(dpy);
-+
-+	signal(SIGALRM, SIG_IGN);
-+	XSetErrorHandler(_check_error_handler);
-+
-+	res = NULL;
-+	if (XRRQueryVersion(dpy, &i, &i))
-+		res = _XRRGetScreenResourcesCurrent(dpy, root);
-+	if (res == NULL)
-+		return 77;
-+
-+	if (v == REDIRECTED && !has_composite(dpy))
-+		return 77;
-+
-+	original_crtc = malloc(sizeof(XRRCrtcInfo *)*res->ncrtc);
-+	for (i = 0; i < res->ncrtc; i++)
-+		original_crtc[i] = XRRGetCrtcInfo(dpy, res, res->crtcs[i]);
-+
-+	for (i = 0; i < res->ncrtc; i++)
-+		XRRSetCrtcConfig(dpy, res, res->crtcs[i], CurrentTime,
-+				 0, 0, None, RR_Rotate_0, NULL, 0);
-+
-+	DRI2CreateDrawable(dpy, root);
-+	DRI2SwapInterval(dpy, root, 0);
-+
-+	if (d != OFF) {
-+		for (i = 0; i < res->noutput; i++) {
-+			XRROutputInfo *output;
-+			XRRModeInfo *mode;
-+
-+			output = XRRGetOutputInfo(dpy, res, res->outputs[i]);
-+			if (output == NULL)
-+				continue;
-+
-+			mode = NULL;
-+			if (res->nmode)
-+				mode = lookup_mode(res, output->modes[0]);
-+			if (mode == NULL)
-+				continue;
-+
-+			XRRSetCrtcConfig(dpy, res, output->crtcs[0], CurrentTime,
-+					 0, 0, output->modes[0], RR_Rotate_0, &res->outputs[i], 1);
-+			width = mode->width;
-+			height = mode->height;
-+			break;
-+		}
-+		if (i == res->noutput) {
-+			_x_error_occurred = 77;
-+			goto restore;
-+		}
-+	}
-+
-+	if (w == ROOT) {
-+		run(dpy, root);
-+	} else if (w == FULLSCREEN) {
-+		win = XCreateWindow(dpy, root,
-+				    0, 0, width, height, 0,
-+				    DefaultDepth(dpy, DefaultScreen(dpy)),
-+				    InputOutput,
-+				    DefaultVisual(dpy, DefaultScreen(dpy)),
-+				    CWOverrideRedirect, &attr);
-+		DRI2CreateDrawable(dpy, win);
-+		DRI2SwapInterval(dpy, win, 0);
-+		if (v == REDIRECTED) {
-+			XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+			XDamageCreate(dpy, win, XDamageReportRawRectangles);
-+		} else
-+			fullscreen(dpy, win);
-+		XMapWindow(dpy, win);
-+		run(dpy, win);
-+	} else if (w == WINDOW) {
-+		win = XCreateWindow(dpy, root,
-+				    0, 0, width/2, height/2, 0,
-+				    DefaultDepth(dpy, DefaultScreen(dpy)),
-+				    InputOutput,
-+				    DefaultVisual(dpy, DefaultScreen(dpy)),
-+				    CWOverrideRedirect, &attr);
-+		DRI2CreateDrawable(dpy, win);
-+		DRI2SwapInterval(dpy, win, 0);
-+		if (v == REDIRECTED) {
-+			XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+			XDamageCreate(dpy, win, XDamageReportRawRectangles);
-+		}
-+		XMapWindow(dpy, win);
-+		run(dpy, win);
-+	}
-+
-+restore:
-+	for (i = 0; i < res->ncrtc; i++)
-+		XRRSetCrtcConfig(dpy, res, res->crtcs[i], CurrentTime,
-+				 0, 0, None, RR_Rotate_0, NULL, 0);
-+
-+	for (i = 0; i < res->ncrtc; i++)
-+		XRRSetCrtcConfig(dpy, res, res->crtcs[i], CurrentTime,
-+				 original_crtc[i]->x,
-+				 original_crtc[i]->y,
-+				 original_crtc[i]->mode,
-+				 original_crtc[i]->rotation,
-+				 original_crtc[i]->outputs,
-+				 original_crtc[i]->noutput);
-+
-+	if (DPMSQueryExtension(dpy, &i, &i))
-+		DPMSEnable(dpy);
-+
-+	XSync(dpy, True);
-+	return _x_error_occurred;
-+}
-diff --git a/benchmarks/dri3-swap.c b/benchmarks/dri3-swap.c
-new file mode 100644
-index 00000000..4dd423b3
---- /dev/null
-+++ b/benchmarks/dri3-swap.c
-@@ -0,0 +1,595 @@
-+/*
-+ * Copyright (c) 2015 Intel Corporation
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ *
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <X11/Xlib.h>
-+#include <X11/Xatom.h>
-+#include <X11/Xlib-xcb.h>
-+#include <X11/xshmfence.h>
-+#include <X11/Xutil.h>
-+#include <X11/Xlibint.h>
-+#include <X11/extensions/Xcomposite.h>
-+#include <X11/extensions/Xdamage.h>
-+#include <X11/extensions/dpms.h>
-+#include <X11/extensions/randr.h>
-+#include <X11/extensions/Xrandr.h>
-+#include <xcb/xcb.h>
-+#include <xcb/present.h>
-+#include <xcb/dri3.h>
-+#include <xcb/xfixes.h>
-+#include <xf86drm.h>
-+#include <i915_drm.h>
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <assert.h>
-+#include <errno.h>
-+#include <setjmp.h>
-+#include <signal.h>
-+
-+struct dri3_fence {
-+	XID xid;
-+	void *addr;
-+};
-+
-+static int _x_error_occurred;
-+static uint32_t stamp;
-+
-+struct list {
-+    struct list *next, *prev;
-+};
-+
-+static void
-+list_init(struct list *list)
-+{
-+    list->next = list->prev = list;
-+}
-+
-+static inline void
-+__list_add(struct list *entry,
-+	    struct list *prev,
-+	    struct list *next)
-+{
-+    next->prev = entry;
-+    entry->next = next;
-+    entry->prev = prev;
-+    prev->next = entry;
-+}
-+
-+static inline void
-+list_add(struct list *entry, struct list *head)
-+{
-+    __list_add(entry, head, head->next);
-+}
-+
-+static inline void
-+__list_del(struct list *prev, struct list *next)
-+{
-+	next->prev = prev;
-+	prev->next = next;
-+}
-+
-+static inline void
-+_list_del(struct list *entry)
-+{
-+    __list_del(entry->prev, entry->next);
-+}
-+
-+static inline void
-+list_move(struct list *list, struct list *head)
-+{
-+	if (list->prev != head) {
-+		_list_del(list);
-+		list_add(list, head);
-+	}
-+}
-+
-+#define __container_of(ptr, sample, member)				\
-+    (void *)((char *)(ptr) - ((char *)&(sample)->member - (char *)(sample)))
-+
-+#define list_for_each_entry(pos, head, member)				\
-+    for (pos = __container_of((head)->next, pos, member);		\
-+	 &pos->member != (head);					\
-+	 pos = __container_of(pos->member.next, pos, member))
-+
-+static int
-+_check_error_handler(Display     *display,
-+		     XErrorEvent *event)
-+{
-+	printf("X11 error from display %s, serial=%ld, error=%d, req=%d.%d\n",
-+	       DisplayString(display),
-+	       event->serial,
-+	       event->error_code,
-+	       event->request_code,
-+	       event->minor_code);
-+	_x_error_occurred++;
-+	return False; /* ignored */
-+}
-+
-+static int dri3_create_fence(Display *dpy,
-+			     Pixmap pixmap,
-+			     struct dri3_fence *fence)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	struct dri3_fence f;
-+	int fd;
-+
-+	fd = xshmfence_alloc_shm();
-+	if (fd < 0)
-+		return -1;
-+
-+	f.addr = xshmfence_map_shm(fd);
-+	if (f.addr == NULL) {
-+		close(fd);
-+		return -1;
-+	}
-+
-+	f.xid = xcb_generate_id(c);
-+	xcb_dri3_fence_from_fd(c, pixmap, f.xid, 0, fd);
-+
-+	*fence = f;
-+	return 0;
-+}
-+
-+static double elapsed(const struct timespec *start,
-+		      const struct timespec *end)
-+{
-+	return 1e6*(end->tv_sec - start->tv_sec) + (end->tv_nsec - start->tv_nsec)/1000;
-+}
-+
-+struct buffer {
-+	struct list link;
-+	Pixmap pixmap;
-+	struct dri3_fence fence;
-+	int fd;
-+	int busy;
-+};
-+
-+static void run(Display *dpy, Window win)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	struct timespec start, end;
-+#define N_BACK 8
-+	struct buffer buffer[N_BACK];
-+	struct list mru;
-+	Window root;
-+	unsigned int width, height;
-+	unsigned border, depth;
-+	unsigned present_flags = XCB_PRESENT_OPTION_ASYNC;
-+	xcb_xfixes_region_t update = 0;
-+	int completed = 0;
-+	int queued = 0;
-+	uint32_t eid;
-+	void *Q;
-+	int i, n;
-+
-+	list_init(&mru);
-+
-+	XGetGeometry(dpy, win,
-+		     &root, &i, &n, &width, &height, &border, &depth);
-+
-+	_x_error_occurred = 0;
-+
-+	for (n = 0; n < N_BACK; n++) {
-+		xcb_dri3_buffer_from_pixmap_reply_t *reply;
-+		int *fds;
-+
-+		buffer[n].pixmap =
-+			XCreatePixmap(dpy, win, width, height, depth);
-+		buffer[n].fence.xid = 0;
-+		buffer[n].fd = -1;
-+
-+		if (dri3_create_fence(dpy, win, &buffer[n].fence))
-+			return;
-+
-+		reply = xcb_dri3_buffer_from_pixmap_reply (c,
-+							   xcb_dri3_buffer_from_pixmap(c, buffer[n].pixmap),
-+							   NULL);
-+		if (reply == NULL)
-+			return;
-+
-+		fds = xcb_dri3_buffer_from_pixmap_reply_fds (c, reply);
-+		buffer[n].fd = fds[0];
-+		free(reply);
-+
-+		/* start idle */
-+		xshmfence_trigger(buffer[n].fence.addr);
-+		buffer[n].busy = 0;
-+		list_add(&buffer[n].link, &mru);
-+	}
-+
-+	eid = xcb_generate_id(c);
-+	xcb_present_select_input(c, eid, win,
-+                                 XCB_PRESENT_EVENT_MASK_IDLE_NOTIFY |
-+                                 XCB_PRESENT_EVENT_MASK_COMPLETE_NOTIFY);
-+	Q = xcb_register_for_special_xge(c, &xcb_present_id, eid, &stamp);
-+
-+	clock_gettime(CLOCK_MONOTONIC, &start);
-+	do {
-+		for (n = 0; n < 1000; n++) {
-+			struct buffer *tmp, *b = NULL;
-+			list_for_each_entry(tmp, &mru, link) {
-+				if (!tmp->busy) {
-+					b = tmp;
-+					break;
-+				}
-+			}
-+			while (b == NULL) {
-+				xcb_present_generic_event_t *ev;
-+
-+				ev = (xcb_present_generic_event_t *)
-+					xcb_wait_for_special_event(c, Q);
-+				if (ev == NULL)
-+					abort();
-+
-+				do {
-+					switch (ev->evtype) {
-+					case XCB_PRESENT_COMPLETE_NOTIFY:
-+						completed++;
-+						queued--;
-+						break;
-+
-+					case XCB_PRESENT_EVENT_IDLE_NOTIFY:
-+						{
-+							xcb_present_idle_notify_event_t *ie = (xcb_present_idle_notify_event_t *)ev;
-+							assert(ie->serial < N_BACK);
-+							buffer[ie->serial].busy = 0;
-+							if (b == NULL)
-+								b = &buffer[ie->serial];
-+							break;
-+						}
-+					}
-+					free(ev);
-+				} while ((ev = (xcb_present_generic_event_t *)xcb_poll_for_special_event(c, Q)));
-+			}
-+
-+			b->busy = 1;
-+			if (b->fence.xid) {
-+				xshmfence_await(b->fence.addr);
-+				xshmfence_reset(b->fence.addr);
-+			}
-+			xcb_present_pixmap(c, win, b->pixmap, b - buffer,
-+					   0, /* valid */
-+					   update, /* update */
-+					   0, /* x_off */
-+					   0, /* y_off */
-+					   None,
-+					   None, /* wait fence */
-+					   b->fence.xid,
-+					   present_flags,
-+					   0, /* target msc */
-+					   0, /* divisor */
-+					   0, /* remainder */
-+					   0, NULL);
-+			list_move(&b->link, &mru);
-+			queued++;
-+			xcb_flush(c);
-+		}
-+		clock_gettime(CLOCK_MONOTONIC, &end);
-+	} while (end.tv_sec < start.tv_sec + 10);
-+
-+	while (queued) {
-+		xcb_present_generic_event_t *ev;
-+
-+		ev = (xcb_present_generic_event_t *)
-+			xcb_wait_for_special_event(c, Q);
-+		if (ev == NULL)
-+			abort();
-+
-+		do {
-+			switch (ev->evtype) {
-+			case XCB_PRESENT_COMPLETE_NOTIFY:
-+				completed++;
-+				queued--;
-+				break;
-+
-+			case XCB_PRESENT_EVENT_IDLE_NOTIFY:
-+				break;
-+			}
-+			free(ev);
-+		} while ((ev = (xcb_present_generic_event_t *)xcb_poll_for_special_event(c, Q)));
-+	}
-+	clock_gettime(CLOCK_MONOTONIC, &end);
-+
-+	printf("%f\n", completed / (elapsed(&start, &end) / 1000000));
-+}
-+
-+static int has_present(Display *dpy)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	xcb_generic_error_t *error = NULL;
-+	void *reply;
-+
-+	reply = xcb_present_query_version_reply(c,
-+						xcb_present_query_version(c,
-+									  XCB_PRESENT_MAJOR_VERSION,
-+									  XCB_PRESENT_MINOR_VERSION),
-+						&error);
-+
-+	free(reply);
-+	free(error);
-+	if (reply == NULL) {
-+		fprintf(stderr, "Present not supported on %s\n", DisplayString(dpy));
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+static int has_composite(Display *dpy)
-+{
-+	int event, error;
-+	int major, minor;
-+
-+	if (!XDamageQueryExtension (dpy, &event, &error))
-+		return 0;
-+
-+	if (!XCompositeQueryExtension(dpy, &event, &error))
-+		return 0;
-+
-+	XCompositeQueryVersion(dpy, &major, &minor);
-+
-+	return major > 0 || minor >= 4;
-+}
-+
-+static inline XRRScreenResources *_XRRGetScreenResourcesCurrent(Display *dpy, Window window)
-+{
-+	XRRScreenResources *res;
-+
-+	res = XRRGetScreenResourcesCurrent(dpy, window);
-+	if (res == NULL)
-+		res = XRRGetScreenResources(dpy, window);
-+
-+	return res;
-+}
-+
-+static XRRModeInfo *lookup_mode(XRRScreenResources *res, int id)
-+{
-+	int i;
-+
-+	for (i = 0; i < res->nmode; i++) {
-+		if (res->modes[i].id == id)
-+			return &res->modes[i];
-+	}
-+
-+	return NULL;
-+}
-+
-+static void fullscreen(Display *dpy, Window win)
-+{
-+	Atom atom = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
-+	XChangeProperty(dpy, win,
-+			XInternAtom(dpy, "_NET_WM_STATE", False),
-+			XA_ATOM, 32, PropModeReplace,
-+			(unsigned char *)&atom, 1);
-+}
-+
-+static int dri3_query_version(Display *dpy, int *major, int *minor)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	xcb_dri3_query_version_reply_t *reply;
-+	xcb_generic_error_t *error;
-+
-+	*major = *minor = -1;
-+
-+	reply = xcb_dri3_query_version_reply(c,
-+					     xcb_dri3_query_version(c,
-+								    XCB_DRI3_MAJOR_VERSION,
-+								    XCB_DRI3_MINOR_VERSION),
-+					     &error);
-+	free(error);
-+	if (reply == NULL)
-+		return -1;
-+
-+	*major = reply->major_version;
-+	*minor = reply->minor_version;
-+	free(reply);
-+
-+	return 0;
-+}
-+
-+static int has_dri3(Display *dpy)
-+{
-+	const xcb_query_extension_reply_t *ext;
-+	int major, minor;
-+
-+	ext = xcb_get_extension_data(XGetXCBConnection(dpy), &xcb_dri3_id);
-+	if (ext == NULL || !ext->present)
-+		return 0;
-+
-+	if (dri3_query_version(dpy, &major, &minor) < 0)
-+		return 0;
-+
-+	return major >= 0;
-+}
-+
-+int main(int argc, char **argv)
-+{
-+	Display *dpy;
-+	Window root, win;
-+	XRRScreenResources *res;
-+	XRRCrtcInfo **original_crtc;
-+	XSetWindowAttributes attr;
-+	enum window { ROOT, FULLSCREEN, WINDOW } w = FULLSCREEN;
-+	enum visible {REDIRECTED, NORMAL } v = NORMAL;
-+	enum display { OFF, ON } d = OFF;
-+	int width, height;
-+	int i;
-+
-+	while ((i = getopt(argc, argv, "d:v:w:")) != -1) {
-+		switch (i) {
-+		case 'd':
-+			if (strcmp(optarg, "off") == 0)
-+				d = OFF;
-+			else if (strcmp(optarg, "on") == 0)
-+				d = ON;
-+			else
-+				abort();
-+			break;
-+
-+		case 'v':
-+			if (strcmp(optarg, "redirected") == 0)
-+				v = REDIRECTED;
-+			else if (strcmp(optarg, "normal") == 0)
-+				v = NORMAL;
-+			else
-+				abort();
-+			break;
-+
-+		case 'w':
-+			if (strcmp(optarg, "fullscreen") == 0)
-+				w = FULLSCREEN;
-+			else if (strcmp(optarg, "window") == 0)
-+				w = WINDOW;
-+			else if (strcmp(optarg, "root") == 0)
-+				w = ROOT;
-+			else
-+				abort();
-+			break;
-+		}
-+	}
-+
-+	attr.override_redirect = 1;
-+
-+	dpy = XOpenDisplay(NULL);
-+	if (dpy == NULL)
-+		return 77;
-+
-+	width = DisplayWidth(dpy, DefaultScreen(dpy));
-+	height = DisplayHeight(dpy, DefaultScreen(dpy));
-+
-+	if (!has_present(dpy))
-+		return 77;
-+
-+	if (!has_dri3(dpy))
-+		return 77;
-+
-+	if (DPMSQueryExtension(dpy, &i, &i))
-+		DPMSDisable(dpy);
-+
-+	root = DefaultRootWindow(dpy);
-+
-+	signal(SIGALRM, SIG_IGN);
-+	XSetErrorHandler(_check_error_handler);
-+
-+	res = NULL;
-+	if (XRRQueryVersion(dpy, &i, &i))
-+		res = _XRRGetScreenResourcesCurrent(dpy, root);
-+	if (res == NULL)
-+		return 77;
-+
-+	if (v == REDIRECTED && !has_composite(dpy))
-+		return 77;
-+
-+	original_crtc = malloc(sizeof(XRRCrtcInfo *)*res->ncrtc);
-+	for (i = 0; i < res->ncrtc; i++)
-+		original_crtc[i] = XRRGetCrtcInfo(dpy, res, res->crtcs[i]);
-+
-+	for (i = 0; i < res->ncrtc; i++)
-+		XRRSetCrtcConfig(dpy, res, res->crtcs[i], CurrentTime,
-+				 0, 0, None, RR_Rotate_0, NULL, 0);
-+
-+	if (d != OFF) {
-+		for (i = 0; i < res->noutput; i++) {
-+			XRROutputInfo *output;
-+			XRRModeInfo *mode;
-+
-+			output = XRRGetOutputInfo(dpy, res, res->outputs[i]);
-+			if (output == NULL)
-+				continue;
-+
-+			mode = NULL;
-+			if (res->nmode)
-+				mode = lookup_mode(res, output->modes[0]);
-+			if (mode == NULL)
-+				continue;
-+
-+			XRRSetCrtcConfig(dpy, res, output->crtcs[0], CurrentTime,
-+					 0, 0, output->modes[0], RR_Rotate_0, &res->outputs[i], 1);
-+			width = mode->width;
-+			height = mode->height;
-+			break;
-+		}
-+		if (i == res->noutput) {
-+			_x_error_occurred = 77;
-+			goto restore;
-+		}
-+	}
-+
-+	if (w == ROOT) {
-+		run(dpy, root);
-+	} else if (w == FULLSCREEN) {
-+		win = XCreateWindow(dpy, root,
-+				    0, 0, width, height, 0,
-+				    DefaultDepth(dpy, DefaultScreen(dpy)),
-+				    InputOutput,
-+				    DefaultVisual(dpy, DefaultScreen(dpy)),
-+				    CWOverrideRedirect, &attr);
-+		if (v == REDIRECTED) {
-+			XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+			XDamageCreate(dpy, win, XDamageReportRawRectangles);
-+		} else
-+			fullscreen(dpy, win);
-+		XMapWindow(dpy, win);
-+		run(dpy, win);
-+	} else if (w == WINDOW) {
-+		win = XCreateWindow(dpy, root,
-+				    0, 0, width/2, height/2, 0,
-+				    DefaultDepth(dpy, DefaultScreen(dpy)),
-+				    InputOutput,
-+				    DefaultVisual(dpy, DefaultScreen(dpy)),
-+				    CWOverrideRedirect, &attr);
-+		if (v == REDIRECTED) {
-+			XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+			XDamageCreate(dpy, win, XDamageReportRawRectangles);
-+		}
-+		XMapWindow(dpy, win);
-+		run(dpy, win);
-+	}
-+
-+restore:
-+	for (i = 0; i < res->ncrtc; i++)
-+		XRRSetCrtcConfig(dpy, res, res->crtcs[i], CurrentTime,
-+				 0, 0, None, RR_Rotate_0, NULL, 0);
-+
-+	for (i = 0; i < res->ncrtc; i++)
-+		XRRSetCrtcConfig(dpy, res, res->crtcs[i], CurrentTime,
-+				 original_crtc[i]->x,
-+				 original_crtc[i]->y,
-+				 original_crtc[i]->mode,
-+				 original_crtc[i]->rotation,
-+				 original_crtc[i]->outputs,
-+				 original_crtc[i]->noutput);
-+
-+	if (DPMSQueryExtension(dpy, &i, &i))
-+		DPMSEnable(dpy);
-+
-+	XSync(dpy, True);
-+	return _x_error_occurred;
-+}
-diff --git a/configure.ac b/configure.ac
-index 61bea435..d13917ec 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -195,18 +195,24 @@ AC_ARG_ENABLE(udev,
-               [UDEV="$enableval"],
-               [UDEV=auto])
- 
-+udev_msg=" disabled"
- if test "x$UDEV" != "xno"; then
- 	PKG_CHECK_MODULES(UDEV, [libudev], [udev="yes"], [udev="no"])
-+	AC_CHECK_HEADERS([sys/stat.h], [], [udev="no"])
- 	if test "x$UDEV" = "xyes" -a "x$udev" != "xyes"; then
- 		AC_MSG_ERROR([udev support requested but not found (libudev)])
- 	fi
- 	if test "x$udev" = "xyes"; then
- 		AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection])
-+		udev_msg=" yes"
-+	else
-+		udev_msg=" no"
- 	fi
- fi
- 
--PKG_CHECK_MODULES(X11, [x11 xrender xrandr xext xfixes cairo cairo-xlib-xrender pixman-1 libpng], [x11="yes"], [x11="no"])
-+PKG_CHECK_MODULES(X11, [x11 x11-xcb xcb-dri2 xcomposite xdamage xrender xrandr xext xfixes cairo cairo-xlib-xrender pixman-1 libpng], [x11="yes"], [x11="no"])
- AM_CONDITIONAL(HAVE_X11, test "x$x11" = "xyes")
-+echo X11_CLFAGS="$X11_CLFAGS" X11_LIBS="$X11_LIBS"
- 
- cpuid="yes"
- AC_TRY_LINK([
-@@ -270,10 +276,13 @@ if test "x$shm" = "xyes"; then
- 	AC_DEFINE([HAVE_MIT_SHM], 1, [Define to 1 if MIT-SHM is available])
- fi
- 
--PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])
-+PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-xfixes xcb-present x11-xcb xshmfence x11 xcomposite xdamage xrender xrandr xxf86vm xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])
- AM_CONDITIONAL(X11_DRI3, test "x$x11_dri3" = "xyes" -a "x$shm" = "xyes")
- AM_CONDITIONAL(X11_SHM, test "x$shm" = "xyes")
- 
-+PKG_CHECK_MODULES(X11_VM, [xxf86vm], [x11_vm="yes"], [x11_vm="no"])
-+AM_CONDITIONAL(X11_VM, test "x$x11_vm" = "xyes")
-+
- AC_ARG_ENABLE(tools,
-               AS_HELP_STRING([--disable-tools],
- 			     [Enable building and installing the miscellaneous tools [default=auto]]),
-@@ -285,7 +294,7 @@ if test "x$shm" != "xyes"; then
- 	tools="no"
- fi
- if test "x$tools" != "xno"; then
--	ivo_requires="xrandr xdamage xfixes xcursor xtst xrender xext x11 pixman-1"
-+	ivo_requires="xrandr xdamage xfixes xcursor xtst xrender xscrnsaver xext x11 pixman-1"
- 	extra_cflags=""
- 
- 	ignore="xinerama"
-@@ -307,6 +316,8 @@ if test "x$tools" != "xno"; then
- 		tools="no"
- 	fi
- 
-+	PKG_CHECK_MODULES(TOOL_CURSOR, [xfixes x11 libpng], [cursor="yes"], [ivo="no"])
-+
- 	IVO_CFLAGS="$IVO_CFLAGS $extra_cflags"
- fi
- if test "x$tools" != "xno"; then
-@@ -315,6 +326,7 @@ fi
- AC_MSG_CHECKING([whether to build additional tools])
- AC_MSG_RESULT([$tools])
- AM_CONDITIONAL(BUILD_TOOLS, test "x$tools" != "xno")
-+AM_CONDITIONAL(BUILD_TOOL_CURSOR, test "x$cursor" = "xyes")
- 
- # Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
-@@ -339,10 +351,20 @@ AC_ARG_ENABLE(dri2,
- 	      [DRI2=$enableval],
- 	      [DRI2=yes])
- AC_ARG_ENABLE(dri3,
--	      AS_HELP_STRING([--enable-dri3],
--			     [Enable DRI3 support [[default=no]]]),
-+	      AS_HELP_STRING([--disable-dri3],
-+			     [Disable DRI3 support [[default=yes]]]),
- 	      [DRI3=$enableval],
--	      [DRI3=no])
-+	      [DRI3=yes])
-+AC_ARG_WITH(default-dri,
-+	    AS_HELP_STRING([--with-default-dri],
-+			   [Select the default maximum DRI level [default 2]]),
-+	      [DRI_DEFAULT=$withval],
-+	      [DRI_DEFAULT=2])
-+if test "x$DRI_DEFAULT" = "x0"; then
-+	AC_DEFINE(DEFAULT_DRI_LEVEL, 0,[Default DRI level])
-+else
-+	AC_DEFINE(DEFAULT_DRI_LEVEL, ~0, [Default DRI level])
-+fi
- 
- AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc],
-                                   [Disable XvMC support [[default=yes]]]),
-@@ -375,14 +397,12 @@ AC_ARG_ENABLE(ums-only,
- required_xorg_server_version=1.6
- required_pixman_version=0.16
- 
--if pkg-config --exists 'pixman-1 >= 0.27.1'; then
--	AC_DEFINE([HAS_PIXMAN_GLYPHS], 1, [Enable pixman glyph cache])
--fi
--
--if pkg-config --exists 'pixman-1 >= 0.24.0'; then
--	AC_DEFINE([HAS_PIXMAN_TRIANGLES], 1, [Enable pixman triangle rasterisation])
--fi
--
-+PKG_CHECK_EXISTS([pixman-1 >= 0.24.0],
-+		 AC_DEFINE([HAS_PIXMAN_TRIANGLES], 1, [Enable pixman triangle rasterisation])
-+		 [])
-+PKG_CHECK_EXISTS([pixman-1 >= 0.27.1],
-+		 [AC_DEFINE([HAS_PIXMAN_GLYPHS], 1, [Enable pixman glyph cache])],
-+		 [])
- # Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
-@@ -398,24 +418,25 @@ AC_ARG_ENABLE(sna,
- 	      [SNA="$enableval"],
- 	      [SNA=auto])
- 
-+AC_CHECK_HEADERS([dev/wscons/wsconsio.h])
-+AC_FUNC_ALLOCA
-+AC_HEADER_MAJOR
-+
- if test "x$SNA" != "xno"; then
- 	AC_DEFINE(USE_SNA, 1, [Enable SNA support])
- 	AC_CHECK_HEADERS([sys/sysinfo.h], AC_CHECK_MEMBERS([struct sysinfo.totalram], [], [], [[#include <sys/sysinfo.h>]]))
- fi
- 
- uxa_requires_libdrm=2.4.52
-+uxa_requires_pixman=0.24.0
-+
- AC_ARG_ENABLE(uxa,
- 	      AS_HELP_STRING([--enable-uxa],
- 			     [Enable Unified Acceleration Architecture (UXA) [default=auto]]),
- 	      [UXA="$enableval"],
- 	      [UXA=auto])
- if test "x$UXA" = "xauto"; then
--	if ! pkg-config --exists "libdrm_intel >= $uxa_requires_libdrm"; then
--		UXA=no
--	fi
--	if ! pkg-config --exists 'pixman-1 >= 0.24.0'; then
--		UXA=no
--	fi
-+	PKG_CHECK_EXISTS([libdrm_intel >= $uxa_requires_libdrm pixman-1 >= $uxa_requires_pixman], [], [UXA=no])
- fi
- if test "x$UXA" != "xno"; then
- 	AC_DEFINE(USE_UXA, 1, [Enable UXA support])
-@@ -424,8 +445,10 @@ if test "x$UXA" != "xno"; then
- 	UXA=yes
- fi
- 
--PKG_CHECK_MODULES(XORG, [xorg-server >= $required_xorg_server_version xproto fontsproto pixman-1 >= $required_pixman_version $REQUIRED_MODULES])
-+PKG_CHECK_MODULES(XORG, [xorg-server >= $required_xorg_server_version xproto fontsproto damageproto pixman-1 >= $required_pixman_version $REQUIRED_MODULES])
- ABI_VERSION=`$PKG_CONFIG --variable=abi_videodrv xorg-server`
-+XSERVER_VERSION=`$PKG_CONFIG --modversion xorg-server`
-+PIXMAN_VERSION=`$PKG_CONFIG --modversion pixman-1`
- 
- if test "x$ONLY_UMS" = "xyes"; then
- 	UMS="yes"
-@@ -519,7 +542,12 @@ AC_MSG_RESULT([$have_dri1])
- AM_CONDITIONAL(DRI1, test "x$have_dri1" != "xno")
- if test "x$have_dri1" != "xno"; then
-         AC_DEFINE(HAVE_DRI1,1,[Enable DRI1 driver support])
--	dri_msg="$dri_msg DRI1"
-+	str="DRI1"
-+	if test "x$DRI_DEFAULT" = "x1"; then
-+		AC_DEFINE(DEFAULT_DRI_LEVEL,1,[Default DRI level])
-+		str="*$str"
-+	fi
-+	dri_msg="$dri_msg $str"
- else
-         DRI1_CFLAGS=""
-         DRI1_LIBS=""
-@@ -576,7 +604,12 @@ AM_CONDITIONAL(DRI2, test "x$have_dri2" != "xno")
- AC_MSG_RESULT([$have_dri2])
- if test "x$have_dri2" != "xno"; then
-         AC_DEFINE(HAVE_DRI2,1,[Enable DRI2 driver support])
--	dri_msg="$dri_msg DRI2"
-+	str="DRI2"
-+	if test "x$DRI_DEFAULT" = "x2"; then
-+		AC_DEFINE(DEFAULT_DRI_LEVEL,2,[Default DRI level])
-+		str="*$str"
-+	fi
-+	dri_msg="$dri_msg $str"
- else
- 	if test "x$DRI" = "xyes" -a "x$DRI2" != "xno" -a "x$KMS" = "xyes"; then
- 		AC_MSG_ERROR([DRI2 requested but prerequisites not found])
-@@ -591,13 +624,21 @@ AM_CONDITIONAL(DRI3, test "x$have_dri3" != "xno")
- AC_MSG_RESULT([$have_dri3])
- if test "x$have_dri3" != "xno"; then
-         AC_DEFINE(HAVE_DRI3,1,[Enable DRI3 driver support])
--	dri_msg="$dri_msg DRI3"
-+	str="DRI3"
-+	if test "x$DRI_DEFAULT" = "x3"; then
-+		AC_DEFINE(DEFAULT_DRI_LEVEL,3,[Default DRI level])
-+		str="*$str"
-+	fi
-+	dri_msg="$dri_msg $str"
- else
- 	if test "x$DRI" = "xyes" -a "x$DRI3" != "xno" -a "x$KMS" = "xyes"; then
- 		AC_MSG_ERROR([DRI3 requested but prerequisites not found])
- 	fi
- fi
- 
-+AC_MSG_CHECKING([default DRI support])
-+AC_MSG_RESULT([$DEFAULT_DRI_DEFAULT])
-+
- AC_CHECK_HEADERS([X11/extensions/dpmsconst.h])
- 
- PRESENT="no"
-@@ -711,27 +752,6 @@ if test "x$TEARFREE" = "xyes"; then
- 	xp_msg="$xp_msg TearFree"
- fi
- 
--AC_ARG_ENABLE(rendernode,
--	      AS_HELP_STRING([--enable-rendernode],
--			     [Enable use of render nodes (experimental) [default=no]]),
--	      [RENDERNODE="$enableval"],
--	      [RENDERNODE="no"])
--AM_CONDITIONAL(USE_RENDERNODE, test "x$RENDERNODE" = "xyes")
--if test "x$RENDERNODE" = "xyes"; then
--	AC_DEFINE(USE_RENDERNODE,1,[Assume "rendernode" support])
--	xp_msg="$xp_msg rendernode"
--fi
--
--AC_ARG_ENABLE(wc-mmap,
--	      AS_HELP_STRING([--enable-wc-mmap],
--			     [Enable use of WriteCombining mmaps [default=no]]),
--	      [WC_MMAP="$enableval"],
--	      [WC_MMAP="no"])
--if test "x$WC_MMAP" = "xyes"; then
--	AC_DEFINE(USE_WC_MMAP,1,[Enable use of WriteCombining mmaps])
--	xp_msg="$xp_msg mmap(wc)"
--fi
--
- AC_ARG_ENABLE(create2,
- 	      AS_HELP_STRING([--enable-create2],
- 			     [Enable use of create2 ioctl (experimental) [default=no]]),
-@@ -848,6 +868,7 @@ AC_CONFIG_FILES([
-                 xvmc/shader/mc/Makefile
-                 xvmc/shader/vld/Makefile
- 		test/Makefile
-+		benchmarks/Makefile
- 		tools/Makefile
- 		tools/org.x.xf86-video-intel.backlight-helper.policy
- ])
-@@ -855,7 +876,7 @@ AC_OUTPUT
- 
- echo ""
- echo ""
--test -e `pwd $0`/README && cat `pwd $0`/README
-+cat $srcdir/README
- 
- accel_msg=""
- if test "x$SNA" != "xno"; then
-@@ -895,13 +916,15 @@ fi
- 
- echo ""
- echo "AC_PACKAGE_STRING will be compiled with:"
--echo "  Xorg Video ABI version: $ABI_VERSION"
-+echo "  Xorg Video ABI version: $ABI_VERSION (xorg-server-$XSERVER_VERSION)"
-+echo "  pixman version: pixman-1-$PIXMAN_VERSION"
- echo "  Acceleration backends:$accel_msg"
- echo "  Additional debugging support?$debug_msg"
- echo "  Support for Kernel Mode Setting? $KMS"
- echo "  Support for legacy User Mode Setting (for i810)? $UMS"
- echo "  Support for Direct Rendering Infrastructure:$dri_msg"
- echo "  Support for Xv motion compensation (XvMC and libXvMC):$xvmc_msg"
-+echo "  Support for display hotplug notifications (udev):$udev_msg"
- echo "  Build additional tools and utilities?$tools_msg"
- if test -n "$xp_msg"; then
- echo "  Experimental support:$xp_msg"
-diff --git a/libobj/alloca.c b/libobj/alloca.c
-new file mode 100644
-index 00000000..883e1e9f
---- /dev/null
-+++ b/libobj/alloca.c
-@@ -0,0 +1,4 @@
-+void *alloca(size_t sz)
-+{
-+	return NULL;
-+}
-diff --git a/man/intel.man b/man/intel.man
-index 17515206..be398fbe 100644
---- a/man/intel.man
-+++ b/man/intel.man
-@@ -27,9 +27,9 @@ supports the i810, i810-DC100, i810e, i815, i830M, 845G, 852GM, 855GM,
- 865G, 915G, 915GM, 945G, 945GM, 965G, 965Q, 946GZ, 965GM, 945GME,
- G33, Q33, Q35, G35, GM45, G45, Q45, G43, G41 chipsets, Pineview-M in
- Atom N400 series, Pineview-D in Atom D400/D500 series,
--Intel(R) HD Graphics: 2000-6000,
--Intel(R) Iris(TM) Graphics: 5100/6100, and
--Intel(R) Iris(TM) Pro Graphics: 5200/6200/P6300.
-+Intel(R) HD Graphics,
-+Intel(R) Iris(TM) Graphics,
-+Intel(R) Iris(TM) Pro Graphics.
- 
- .SH CONFIGURATION DETAILS
- Please refer to __xconfigfile__(__filemansuffix__) for general configuration
-@@ -112,8 +112,8 @@ The default is 8192 if AGP allocable memory is < 128 MB, 16384 if < 192 MB,
- 24576 if higher. DRI require at least a value of 16384. Higher values may give
- better 3D performance, at expense of available system memory.
- .TP
--.BI "Option \*qNoAccel\*q \*q" boolean \*q
--Disable or enable acceleration.
-+.BI "Option \*qAccel\*q \*q" boolean \*q
-+Enable or disable acceleration.
- .IP
- Default: acceleration is enabled.
- 
-@@ -122,8 +122,8 @@ The following driver
- .B Options
- are supported for the 830M and later chipsets:
- .TP
--.BI "Option \*qNoAccel\*q \*q" boolean \*q
--Disable or enable acceleration.
-+.BI "Option \*qAccel\*q \*q" boolean \*q
-+Enable or disable acceleration.
- .IP
- Default: acceleration is enabled.
- .TP
-@@ -201,6 +201,16 @@ that choice by specifying the entry under /sys/class/backlight to use.
- .IP
- Default: Automatic selection.
- .TP
-+.BI "Option \*qCustomEDID\*q \*q" string \*q
-+Override the probed EDID on particular outputs. Sometimes the manufacturer
-+supplied EDID is corrupt or lacking a few usable modes and supplying a
-+corrected EDID may be easier than specifying every modeline. This option
-+allows to pass the path to load an EDID from per output. The format is a
-+comma separated string of output:path pairs, e.g.
-+DP1:/path/to/dp1.edid,DP2:/path/to/dp2.edid
-+.IP
-+Default: No override, use manufacturer supplied EDIDs.
-+.TP
- .BI "Option \*qFallbackDebug\*q \*q" boolean \*q
- Enable printing of debugging information on acceleration fallbacks to the
- server log.
-@@ -225,6 +235,15 @@ i.e. perform synchronous rendering.
- .IP
- Default: Disabled
- .TP
-+.BI "Option \*qHWRotation\*q \*q" boolean \*q
-+Override the use of native hardware rotation and force the use of software,
-+but GPU accelerated where possible, rotation. On some platforms the hardware
-+can scanout directly into a rotated output bypassing the intermediate rendering
-+and extra allocations required for software implemented rotation (i.e. native
-+rotation uses less resources, is quicker and uses less power). This allows you
-+to disable the native rotation in case of errors.
-+.IP
-+Default: Enabled (use hardware rotation)
- .TP
- .BI "Option \*qVSync\*q \*q" boolean \*q
- This option controls the use of commands to synchronise rendering with the
-@@ -324,13 +343,29 @@ Default: 0
- .BI "Option \*qZaphodHeads\*q \*q" string \*q
- .IP
- Specify the randr output(s) to use with zaphod mode for a particular driver
--instance.  If you this option you must use it with all instances of the
--driver
-+instance.  If you set this option you must use it with all instances of the
-+driver. By default, each head is assigned only one CRTC (which limits
-+using multiple outputs with that head to cloned mode). CRTC can be manually
-+assigned to individual heads by preceding the output names with a comma
-+delimited list of pipe numbers followed by a colon. Note that different pipes
-+may be limited in their functionality and some outputs may only work with
-+different pipes.
- .br
- For example:
-+
-+.RS
- .B
- Option \*qZaphodHeads\*q \*qLVDS1,VGA1\*q
--will assign xrandr outputs LVDS1 and VGA0 to this instance of the driver.
-+
-+will assign xrandr outputs LVDS1 and VGA1 to this instance of the driver.
-+.RE
-+
-+.RS
-+.B
-+Option \*qZaphodHeads\*q \*q0,2:HDMI1,DP2\*q
-+
-+will assign xrandr outputs HDMI1 and DP2 and CRTCs 0 and 2 to this instance of the driver.
-+.RE
- 
- .SH OUTPUT CONFIGURATION
- On 830M and better chipsets, the driver supports runtime configuration of
-@@ -431,11 +466,11 @@ First DVI SDVO output
- Second DVI SDVO output
- 
- .SS "TMDS-1", "TMDS-2", "HDMI-1", "HDMI-2"
--DVI/HDMI outputs. Avaliable common properties include:
-+DVI/HDMI outputs. Available common properties include:
- .TP
- \fBBROADCAST_RGB\fP - method used to set RGB color range
- Adjusting this property allows you to set RGB color range on each
--channel in order to match HDTV requirment(default 0 for full
-+channel in order to match HDTV requirement(default 0 for full
- range). Setting 1 means RGB color range is 16-235, 0 means RGB color
- range is 0-255 on each channel.  (Full range is 0-255, not 16-235)
- 
-diff --git a/src/backlight.c b/src/backlight.c
-index 9f239867..fcbb279f 100644
---- a/src/backlight.c
-+++ b/src/backlight.c
-@@ -34,6 +34,12 @@
- #include <sys/stat.h>
- #include <sys/ioctl.h>
- 
-+#if MAJOR_IN_MKDEV
-+#include <sys/mkdev.h>
-+#elif MAJOR_IN_SYSMACROS
-+#include <sys/sysmacros.h>
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -42,6 +48,7 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <dirent.h>
-+#include <errno.h>
- 
- #include <xorg-server.h>
- #include <xf86.h>
-@@ -84,7 +91,7 @@ void backlight_init(struct backlight *b)
- 	b->has_power = 0;
- }
- 
--#ifdef __OpenBSD__
-+#ifdef HAVE_DEV_WSCONS_WSCONSIO_H
- 
- #include <dev/wscons/wsconsio.h>
- #include <xf86Priv.h>
-@@ -122,6 +129,11 @@ int backlight_get(struct backlight *b)
- 	return param.curval;
- }
- 
-+char *backlight_find_for_device(struct pci_device *pci)
-+{
-+	return NULL;
-+}
-+
- int backlight_open(struct backlight *b, char *iface)
- {
- 	struct wsdisplay_param param;
-@@ -146,12 +158,9 @@ int backlight_open(struct backlight *b, char *iface)
- 	return param.curval;
- }
- 
--enum backlight_type backlight_exists(const char *iface)
-+int backlight_exists(const char *iface)
- {
--	if (iface != NULL)
--		return BL_NONE;
--
--	return BL_PLATFORM;
-+	return iface == NULL;
- }
- 
- int backlight_on(struct backlight *b)
-@@ -163,6 +172,7 @@ int backlight_off(struct backlight *b)
- {
- 	return 0;
- }
-+
- #else
- 
- static int
-@@ -213,6 +223,24 @@ __backlight_read(const char *iface, const char *file)
- }
- 
- static int
-+writen(int fd, const char *value, int len)
-+{
-+	int ret;
-+
-+	do {
-+		ret = write(fd, value, len);
-+		if (ret < 0) {
-+			if (errno == EAGAIN || errno == EINTR)
-+				continue;
-+
-+			return ret;
-+		}
-+	} while (value += ret, len -= ret);
-+
-+	return 0;
-+}
-+
-+static int
- __backlight_write(const char *iface, const char *file, const char *value)
- {
- 	int fd, ret;
-@@ -221,7 +249,7 @@ __backlight_write(const char *iface, const char *file, const char *value)
- 	if (fd < 0)
- 		return -1;
- 
--	ret = write(fd, value, strlen(value)+1);
-+	ret = writen(fd, value, strlen(value)+1);
- 	close(fd);
- 
- 	return ret;
-@@ -244,10 +272,10 @@ static const char *known_interfaces[] = {
- 	"intel_backlight",
- };
- 
--static enum backlight_type __backlight_type(const char *iface)
-+static int __backlight_type(const char *iface)
- {
- 	char buf[1024];
--	int fd, v;
-+	int fd, v, i;
- 
- 	v = -1;
- 	fd = __backlight_open(iface, "type", O_RDONLY);
-@@ -261,39 +289,41 @@ static enum backlight_type __backlight_type(const char *iface)
- 		buf[v] = '\0';
- 
- 		if (strcmp(buf, "raw") == 0)
--			v = BL_RAW;
-+			v = BL_RAW << 8;
- 		else if (strcmp(buf, "platform") == 0)
--			v = BL_PLATFORM;
-+			v = BL_PLATFORM << 8;
- 		else if (strcmp(buf, "firmware") == 0)
--			v = BL_FIRMWARE;
-+			v = BL_FIRMWARE << 8;
- 		else
--			v = BL_NAMED;
-+			v = BL_NAMED << 8;
- 	} else
--		v = BL_NAMED;
-+		v = BL_NAMED << 8;
- 
--	if (v == BL_NAMED) {
--		int i;
--		for (i = 0; i < ARRAY_SIZE(known_interfaces); i++) {
--			if (strcmp(iface, known_interfaces[i]) == 0)
--				break;
--		}
--		v += i;
-+	for (i = 0; i < ARRAY_SIZE(known_interfaces); i++) {
-+		if (strcmp(iface, known_interfaces[i]) == 0)
-+			break;
- 	}
-+	v += i;
- 
- 	return v;
- }
- 
--enum backlight_type backlight_exists(const char *iface)
-+static int __backlight_exists(const char *iface)
- {
- 	if (__backlight_read(iface, "brightness") < 0)
--		return BL_NONE;
-+		return -1;
- 
- 	if (__backlight_read(iface, "max_brightness") <= 0)
--		return BL_NONE;
-+		return -1;
- 
- 	return __backlight_type(iface);
- }
- 
-+int backlight_exists(const char *iface)
-+{
-+	return __backlight_exists(iface) != -1;
-+}
-+
- static int __backlight_init(struct backlight *b, char *iface, int fd)
- {
- 	b->fd = fd_move_cloexec(fd_set_nonblock(fd));
-@@ -399,7 +429,50 @@ __backlight_find(void)
- 			continue;
- 
- 		/* Fallback to priority list of known iface for old kernels */
--		v = backlight_exists(de->d_name);
-+		v = __backlight_exists(de->d_name);
-+		if (v < 0)
-+			continue;
-+
-+		if (v < best_type) {
-+			char *copy = strdup(de->d_name);
-+			if (copy) {
-+				free(best_iface);
-+				best_iface = copy;
-+				best_type = v;
-+			}
-+		}
-+	}
-+	closedir(dir);
-+
-+	return best_iface;
-+}
-+
-+char *backlight_find_for_device(struct pci_device *pci)
-+{
-+	char path[200];
-+	unsigned best_type = INT_MAX;
-+	char *best_iface = NULL;
-+	DIR *dir;
-+	struct dirent *de;
-+
-+	snprintf(path, sizeof(path),
-+		 "/sys/bus/pci/devices/%04x:%02x:%02x.%d/backlight",
-+		 pci->domain, pci->bus, pci->dev, pci->func);
-+
-+	dir = opendir(path);
-+	if (dir == NULL)
-+		return NULL;
-+
-+	while ((de = readdir(dir))) {
-+		int v;
-+
-+		if (*de->d_name == '.')
-+			continue;
-+
-+		v = __backlight_exists(de->d_name);
-+		if (v < 0)
-+			continue;
-+
- 		if (v < best_type) {
- 			char *copy = strdup(de->d_name);
- 			if (copy) {
-@@ -416,14 +489,17 @@ __backlight_find(void)
- 
- int backlight_open(struct backlight *b, char *iface)
- {
--	int level;
-+	int level, type;
- 
- 	if (iface == NULL)
- 		iface = __backlight_find();
- 	if (iface == NULL)
- 		goto err;
- 
--	b->type = __backlight_type(iface);
-+	type = __backlight_type(iface);
-+	if (type < 0)
-+		goto err;
-+	b->type = type >> 8;
- 
- 	b->max = __backlight_read(iface, "max_brightness");
- 	if (b->max <= 0)
-@@ -447,7 +523,7 @@ err:
- int backlight_set(struct backlight *b, int level)
- {
- 	char val[BACKLIGHT_VALUE_LEN];
--	int len, ret = 0;
-+	int len;
- 
- 	if (b->iface == NULL)
- 		return 0;
-@@ -456,10 +532,7 @@ int backlight_set(struct backlight *b, int level)
- 		level = b->max;
- 
- 	len = snprintf(val, BACKLIGHT_VALUE_LEN, "%d\n", level);
--	if (write(b->fd, val, len) != len)
--		ret = -1;
--
--	return ret;
-+	return writen(b->fd, val, len);
- }
- 
- int backlight_get(struct backlight *b)
-@@ -517,43 +590,6 @@ void backlight_disable(struct backlight *b)
- void backlight_close(struct backlight *b)
- {
- 	backlight_disable(b);
--	if (b->pid)
-+	if (b->pid > 0)
- 		waitpid(b->pid, NULL, 0);
- }
--
--char *backlight_find_for_device(struct pci_device *pci)
--{
--	char path[200];
--	unsigned best_type = INT_MAX;
--	char *best_iface = NULL;
--	DIR *dir;
--	struct dirent *de;
--
--	snprintf(path, sizeof(path),
--		 "/sys/bus/pci/devices/%04x:%02x:%02x.%d/backlight",
--		 pci->domain, pci->bus, pci->dev, pci->func);
--
--	dir = opendir(path);
--	if (dir == NULL)
--		return NULL;
--
--	while ((de = readdir(dir))) {
--		int v;
--
--		if (*de->d_name == '.')
--			continue;
--
--		v = backlight_exists(de->d_name);
--		if (v < best_type) {
--			char *copy = strdup(de->d_name);
--			if (copy) {
--				free(best_iface);
--				best_iface = copy;
--				best_type = v;
--			}
--		}
--	}
--	closedir(dir);
--
--	return best_iface;
--}
-diff --git a/src/backlight.h b/src/backlight.h
-index bb0e28bc..ba17755b 100644
---- a/src/backlight.h
-+++ b/src/backlight.h
-@@ -43,7 +43,7 @@ struct backlight {
- 	int pid, fd;
- };
- 
--enum backlight_type backlight_exists(const char *iface);
-+int backlight_exists(const char *iface);
- 
- void backlight_init(struct backlight *backlight);
- int backlight_open(struct backlight *backlight, char *iface);
-diff --git a/src/compat-api.h b/src/compat-api.h
-index d09e1fb3..05797a08 100644
---- a/src/compat-api.h
-+++ b/src/compat-api.h
-@@ -30,6 +30,7 @@
- 
- #include <xorg-server.h>
- #include <xorgVersion.h>
-+#include <xf86Module.h>
- 
- #include <picturestr.h>
- #ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
-@@ -39,7 +40,17 @@
- 
- #ifndef XF86_HAS_SCRN_CONV
- #define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
-+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,1,0,0,0)
- #define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
-+#else
-+#define xf86ScrnToScreen(s) ((s)->pScreen)
-+#endif
-+#else
-+#define xf86ScrnToScreen(s) ((s)->pScreen)
-+#endif
-+
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 22
-+#define HAVE_NOTIFY_FD 1
- #endif
- 
- #ifndef XF86_SCRN_INTERFACE
-@@ -131,6 +142,17 @@ region_rects(const RegionRec *r)
- 	return r->data ? (const BoxRec *)(r->data + 1) :  &r->extents;
- }
- 
-+inline static void
-+region_get_boxes(const RegionRec *r, const BoxRec **s, const BoxRec **e)
-+{
-+	int n;
-+	if (r->data)
-+		*s = region_boxptr(r), n = r->data->numRects;
-+	else
-+		*s = &r->extents, n = 1;
-+	*e = *s + n;
-+}
-+
- #ifndef INCLUDE_LEGACY_REGION_DEFINES
- #define RegionCreate(r, s) REGION_CREATE(NULL, r, s)
- #define RegionBreak(r) REGION_BREAK(NULL, r)
-@@ -223,4 +245,19 @@ static inline void FreePixmap(PixmapPtr pixmap)
- 			  dstx, dsty)
- #endif
- 
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,12,99,901,0)
-+#define isGPU(S) (S)->is_gpu
-+#else
-+#define isGPU(S) 0
-+#endif
-+
-+#if HAS_DIRTYTRACKING_ROTATION
-+#define PixmapSyncDirtyHelper(d, dd) PixmapSyncDirtyHelper(d)
-+#endif
-+
-+#if !HAVE_NOTIFY_FD
-+#define SetNotifyFd(fd, cb, mode, data) AddGeneralSocket(fd);
-+#define RemoveNotifyFd(fd) RemoveGeneralSocket(fd)
-+#endif
-+
- #endif
-diff --git a/src/i915_pciids.h b/src/i915_pciids.h
-index 180ad0e6..466c7159 100644
---- a/src/i915_pciids.h
-+++ b/src/i915_pciids.h
-@@ -134,7 +134,7 @@
- #define INTEL_IVB_Q_IDS(info) \
- 	INTEL_QUANTA_VGA_DEVICE(info) /* Quanta transcode */
- 
--#define INTEL_HSW_D_IDS(info) \
-+#define INTEL_HSW_IDS(info) \
- 	INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
- 	INTEL_VGA_DEVICE(0x0412, info), /* GT2 desktop */ \
- 	INTEL_VGA_DEVICE(0x0422, info), /* GT3 desktop */ \
-@@ -179,9 +179,7 @@
- 	INTEL_VGA_DEVICE(0x0D2B, info), /* CRW GT3 reserved */ \
- 	INTEL_VGA_DEVICE(0x0D0E, info), /* CRW GT1 reserved */ \
- 	INTEL_VGA_DEVICE(0x0D1E, info), /* CRW GT2 reserved */ \
--	INTEL_VGA_DEVICE(0x0D2E, info)  /* CRW GT3 reserved */ \
--
--#define INTEL_HSW_M_IDS(info) \
-+	INTEL_VGA_DEVICE(0x0D2E, info),  /* CRW GT3 reserved */ \
- 	INTEL_VGA_DEVICE(0x0406, info), /* GT1 mobile */ \
- 	INTEL_VGA_DEVICE(0x0416, info), /* GT2 mobile */ \
- 	INTEL_VGA_DEVICE(0x0426, info), /* GT2 mobile */ \
-@@ -198,60 +196,48 @@
- 	INTEL_VGA_DEVICE(0x0D16, info), /* CRW GT2 mobile */ \
- 	INTEL_VGA_DEVICE(0x0D26, info)  /* CRW GT3 mobile */
- 
--#define INTEL_VLV_M_IDS(info) \
-+#define INTEL_VLV_IDS(info) \
- 	INTEL_VGA_DEVICE(0x0f30, info), \
- 	INTEL_VGA_DEVICE(0x0f31, info), \
- 	INTEL_VGA_DEVICE(0x0f32, info), \
- 	INTEL_VGA_DEVICE(0x0f33, info), \
--	INTEL_VGA_DEVICE(0x0157, info)
--
--#define INTEL_VLV_D_IDS(info) \
-+	INTEL_VGA_DEVICE(0x0157, info), \
- 	INTEL_VGA_DEVICE(0x0155, info)
- 
--#define _INTEL_BDW_M(gt, id, info) \
--	INTEL_VGA_DEVICE((((gt) - 1) << 4) | (id), info)
--#define _INTEL_BDW_D(gt, id, info) \
--	INTEL_VGA_DEVICE((((gt) - 1) << 4) | (id), info)
--
--#define _INTEL_BDW_M_IDS(gt, info) \
--	_INTEL_BDW_M(gt, 0x1602, info), /* ULT */ \
--	_INTEL_BDW_M(gt, 0x1606, info), /* ULT */ \
--	_INTEL_BDW_M(gt, 0x160B, info), /* Iris */ \
--	_INTEL_BDW_M(gt, 0x160E, info) /* ULX */
--
--#define _INTEL_BDW_D_IDS(gt, info) \
--	_INTEL_BDW_D(gt, 0x160A, info), /* Server */ \
--	_INTEL_BDW_D(gt, 0x160D, info) /* Workstation */
--
--#define INTEL_BDW_GT12M_IDS(info) \
--	_INTEL_BDW_M_IDS(1, info), \
--	_INTEL_BDW_M_IDS(2, info)
--
--#define INTEL_BDW_GT12D_IDS(info) \
--	_INTEL_BDW_D_IDS(1, info), \
--	_INTEL_BDW_D_IDS(2, info)
--
--#define INTEL_BDW_GT3M_IDS(info) \
--	_INTEL_BDW_M_IDS(3, info)
--
--#define INTEL_BDW_GT3D_IDS(info) \
--	_INTEL_BDW_D_IDS(3, info)
--
--#define INTEL_BDW_RSVDM_IDS(info) \
--	_INTEL_BDW_M_IDS(4, info)
--
--#define INTEL_BDW_RSVDD_IDS(info) \
--	_INTEL_BDW_D_IDS(4, info)
--
--#define INTEL_BDW_M_IDS(info) \
--	INTEL_BDW_GT12M_IDS(info), \
--	INTEL_BDW_GT3M_IDS(info), \
--	INTEL_BDW_RSVDM_IDS(info)
--
--#define INTEL_BDW_D_IDS(info) \
--	INTEL_BDW_GT12D_IDS(info), \
--	INTEL_BDW_GT3D_IDS(info), \
--	INTEL_BDW_RSVDD_IDS(info)
-+#define INTEL_BDW_GT12_IDS(info)  \
-+	INTEL_VGA_DEVICE(0x1602, info), /* GT1 ULT */ \
-+	INTEL_VGA_DEVICE(0x1606, info), /* GT1 ULT */ \
-+	INTEL_VGA_DEVICE(0x160B, info), /* GT1 Iris */ \
-+	INTEL_VGA_DEVICE(0x160E, info), /* GT1 ULX */ \
-+	INTEL_VGA_DEVICE(0x1612, info), /* GT2 Halo */ \
-+	INTEL_VGA_DEVICE(0x1616, info), /* GT2 ULT */ \
-+	INTEL_VGA_DEVICE(0x161B, info), /* GT2 ULT */ \
-+	INTEL_VGA_DEVICE(0x161E, info),  /* GT2 ULX */ \
-+	INTEL_VGA_DEVICE(0x160A, info), /* GT1 Server */ \
-+	INTEL_VGA_DEVICE(0x160D, info), /* GT1 Workstation */ \
-+	INTEL_VGA_DEVICE(0x161A, info), /* GT2 Server */ \
-+	INTEL_VGA_DEVICE(0x161D, info)  /* GT2 Workstation */
-+
-+#define INTEL_BDW_GT3_IDS(info) \
-+	INTEL_VGA_DEVICE(0x1622, info), /* ULT */ \
-+	INTEL_VGA_DEVICE(0x1626, info), /* ULT */ \
-+	INTEL_VGA_DEVICE(0x162B, info), /* Iris */ \
-+	INTEL_VGA_DEVICE(0x162E, info),  /* ULX */\
-+	INTEL_VGA_DEVICE(0x162A, info), /* Server */ \
-+	INTEL_VGA_DEVICE(0x162D, info)  /* Workstation */
-+
-+#define INTEL_BDW_RSVD_IDS(info) \
-+	INTEL_VGA_DEVICE(0x1632, info), /* ULT */ \
-+	INTEL_VGA_DEVICE(0x1636, info), /* ULT */ \
-+	INTEL_VGA_DEVICE(0x163B, info), /* Iris */ \
-+	INTEL_VGA_DEVICE(0x163E, info), /* ULX */ \
-+	INTEL_VGA_DEVICE(0x163A, info), /* Server */ \
-+	INTEL_VGA_DEVICE(0x163D, info)  /* Workstation */
-+
-+#define INTEL_BDW_IDS(info) \
-+	INTEL_BDW_GT12_IDS(info), \
-+	INTEL_BDW_GT3_IDS(info), \
-+	INTEL_BDW_RSVD_IDS(info)
- 
- #define INTEL_CHV_IDS(info) \
- 	INTEL_VGA_DEVICE(0x22b0, info), \
-@@ -259,21 +245,85 @@
- 	INTEL_VGA_DEVICE(0x22b2, info), \
- 	INTEL_VGA_DEVICE(0x22b3, info)
- 
--#define INTEL_SKL_IDS(info) \
--	INTEL_VGA_DEVICE(0x1916, info), /* ULT GT2 */ \
-+#define INTEL_SKL_GT1_IDS(info)	\
- 	INTEL_VGA_DEVICE(0x1906, info), /* ULT GT1 */ \
--	INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \
--	INTEL_VGA_DEVICE(0x1921, info), /* ULT GT2F */ \
- 	INTEL_VGA_DEVICE(0x190E, info), /* ULX GT1 */ \
-+	INTEL_VGA_DEVICE(0x1902, info), /* DT  GT1 */ \
-+	INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \
-+	INTEL_VGA_DEVICE(0x190A, info) /* SRV GT1 */
-+
-+#define INTEL_SKL_GT2_IDS(info)	\
-+	INTEL_VGA_DEVICE(0x1916, info), /* ULT GT2 */ \
-+	INTEL_VGA_DEVICE(0x1921, info), /* ULT GT2F */ \
- 	INTEL_VGA_DEVICE(0x191E, info), /* ULX GT2 */ \
- 	INTEL_VGA_DEVICE(0x1912, info), /* DT  GT2 */ \
--	INTEL_VGA_DEVICE(0x1902, info), /* DT  GT1 */ \
- 	INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \
--	INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \
--	INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \
- 	INTEL_VGA_DEVICE(0x191A, info), /* SRV GT2 */ \
--	INTEL_VGA_DEVICE(0x192A, info), /* SRV GT3 */ \
--	INTEL_VGA_DEVICE(0x190A, info), /* SRV GT1 */ \
- 	INTEL_VGA_DEVICE(0x191D, info)  /* WKS GT2 */
- 
-+#define INTEL_SKL_GT3_IDS(info) \
-+	INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \
-+	INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \
-+	INTEL_VGA_DEVICE(0x1927, info), /* ULT GT3 */ \
-+	INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \
-+	INTEL_VGA_DEVICE(0x192D, info)  /* SRV GT3 */
-+
-+#define INTEL_SKL_GT4_IDS(info) \
-+	INTEL_VGA_DEVICE(0x1932, info), /* DT GT4 */ \
-+	INTEL_VGA_DEVICE(0x193B, info), /* Halo GT4 */ \
-+	INTEL_VGA_DEVICE(0x193D, info), /* WKS GT4 */ \
-+	INTEL_VGA_DEVICE(0x192A, info), /* SRV GT4 */ \
-+	INTEL_VGA_DEVICE(0x193A, info)  /* SRV GT4e */
-+
-+#define INTEL_SKL_IDS(info)	 \
-+	INTEL_SKL_GT1_IDS(info), \
-+	INTEL_SKL_GT2_IDS(info), \
-+	INTEL_SKL_GT3_IDS(info), \
-+	INTEL_SKL_GT4_IDS(info)
-+
-+#define INTEL_BXT_IDS(info) \
-+	INTEL_VGA_DEVICE(0x0A84, info), \
-+	INTEL_VGA_DEVICE(0x1A84, info), \
-+	INTEL_VGA_DEVICE(0x1A85, info), \
-+	INTEL_VGA_DEVICE(0x5A84, info), /* APL HD Graphics 505 */ \
-+	INTEL_VGA_DEVICE(0x5A85, info)  /* APL HD Graphics 500 */
-+
-+#define INTEL_GLK_IDS(info) \
-+	INTEL_VGA_DEVICE(0x3184, info), \
-+	INTEL_VGA_DEVICE(0x3185, info)
-+
-+#define INTEL_KBL_GT1_IDS(info)	\
-+	INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \
-+	INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \
-+	INTEL_VGA_DEVICE(0x5917, info), /* DT  GT1.5 */ \
-+	INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \
-+	INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \
-+	INTEL_VGA_DEVICE(0x5902, info), /* DT  GT1 */ \
-+	INTEL_VGA_DEVICE(0x5908, info), /* Halo GT1 */ \
-+	INTEL_VGA_DEVICE(0x590B, info), /* Halo GT1 */ \
-+	INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */
-+
-+#define INTEL_KBL_GT2_IDS(info)	\
-+	INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
-+	INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \
-+	INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \
-+	INTEL_VGA_DEVICE(0x5912, info), /* DT  GT2 */ \
-+	INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \
-+	INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \
-+	INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */
-+
-+#define INTEL_KBL_GT3_IDS(info) \
-+	INTEL_VGA_DEVICE(0x5923, info), /* ULT GT3 */ \
-+	INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \
-+	INTEL_VGA_DEVICE(0x5927, info) /* ULT GT3 */
-+
-+#define INTEL_KBL_GT4_IDS(info) \
-+	INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */
-+
-+#define INTEL_KBL_IDS(info) \
-+	INTEL_KBL_GT1_IDS(info), \
-+	INTEL_KBL_GT2_IDS(info), \
-+	INTEL_KBL_GT3_IDS(info), \
-+	INTEL_KBL_GT4_IDS(info)
-+
- #endif /* _I915_PCIIDS_H */
-diff --git a/src/intel_device.c b/src/intel_device.c
-index 140e1536..c4910cd8 100644
---- a/src/intel_device.c
-+++ b/src/intel_device.c
-@@ -38,6 +38,12 @@
- #include <dirent.h>
- #include <errno.h>
- 
-+#if MAJOR_IN_MKDEV
-+#include <sys/mkdev.h>
-+#elif MAJOR_IN_SYSMACROS
-+#include <sys/sysmacros.h>
-+#endif
-+
- #include <pciaccess.h>
- 
- #include <xorg-server.h>
-@@ -197,9 +203,15 @@ static inline struct intel_device *intel_device(ScrnInfoPtr scrn)
- 	return xf86GetEntityPrivate(scrn->entityList[0], intel_device_key)->ptr;
- }
- 
-+static const char *kernel_module_names[] ={
-+	"i915",
-+	NULL,
-+};
-+
- static int is_i915_device(int fd)
- {
- 	drm_version_t version;
-+	const char **kn;
- 	char name[5] = "";
- 
- 	memset(&version, 0, sizeof(version));
-@@ -209,7 +221,22 @@ static int is_i915_device(int fd)
- 	if (drmIoctl(fd, DRM_IOCTL_VERSION, &version))
- 		return 0;
- 
--	return strcmp("i915", name) == 0;
-+	for (kn = kernel_module_names; *kn; kn++)
-+		if (strcmp(*kn, name) == 0)
-+			return 1;
-+
-+	return 0;
-+}
-+
-+static int load_i915_kernel_module(void)
-+{
-+	const char **kn;
-+
-+	for (kn = kernel_module_names; *kn; kn++)
-+		if (xf86LoadKernelModule(*kn))
-+			return 0;
-+
-+	return -1;
- }
- 
- static int is_i915_gem(int fd)
-@@ -336,7 +363,7 @@ static int __intel_open_device__pci(const struct pci_device *pci)
- 
- 		sprintf(path + base, "driver");
- 		if (stat(path, &st)) {
--			if (xf86LoadKernelModule("i915"))
-+			if (load_i915_kernel_module())
- 				return -1;
- 			(void)xf86LoadKernelModule("fbcon");
- 		}
-@@ -399,7 +426,7 @@ static int __intel_open_device__legacy(const struct pci_device *pci)
- 
- 	ret = drmCheckModesettingSupported(id);
- 	if (ret) {
--		if (xf86LoadKernelModule("i915"))
-+		if (load_i915_kernel_module() == 0)
- 			ret = drmCheckModesettingSupported(id);
- 		if (ret)
- 			return -1;
-@@ -461,9 +488,9 @@ static int is_render_node(int fd, struct stat *st)
- 
- static char *find_render_node(int fd)
- {
--#if defined(USE_RENDERNODE)
- 	struct stat master, render;
- 	char buf[128];
-+	int i;
- 
- 	/* Are we a render-node ourselves? */
- 	if (is_render_node(fd, &master))
-@@ -472,9 +499,17 @@ static char *find_render_node(int fd)
- 	sprintf(buf, "/dev/dri/renderD%d", (int)((master.st_rdev | 0x80) & 0xbf));
- 	if (stat(buf, &render) == 0 &&
- 	    master.st_mode == render.st_mode &&
--	    render.st_rdev == ((master.st_rdev | 0x80) & 0xbf))
-+	    render.st_rdev == (master.st_rdev | 0x80))
- 		return strdup(buf);
--#endif
-+
-+	/* Misaligned card <-> renderD, do a full search */
-+	for (i = 0; i < 16; i++) {
-+		sprintf(buf, "/dev/dri/renderD%d", i + 128);
-+		if (stat(buf, &render) == 0 &&
-+		    master.st_mode == render.st_mode &&
-+		    render.st_rdev == (master.st_rdev | 0x80))
-+			return strdup(buf);
-+	}
- 
- 	return NULL;
- }
-@@ -608,6 +643,27 @@ err_path:
- 	return -1;
- }
- 
-+void intel_close_device(int entity_num)
-+{
-+	struct intel_device *dev;
-+
-+	if (intel_device_key == -1)
-+		return;
-+
-+	dev = xf86GetEntityPrivate(entity_num, intel_device_key)->ptr;
-+	xf86GetEntityPrivate(entity_num, intel_device_key)->ptr = NULL;
-+	if (!dev)
-+		return;
-+
-+	if (dev->master_count == 0) /* Don't close server-fds */
-+		close(dev->fd);
-+
-+	if (dev->render_node != dev->master_node)
-+		free(dev->render_node);
-+	free(dev->master_node);
-+	free(dev);
-+}
-+
- int __intel_peek_fd(ScrnInfoPtr scrn)
- {
- 	struct intel_device *dev;
-@@ -672,6 +728,12 @@ struct intel_device *intel_get_device(ScrnInfoPtr scrn, int *fd)
- 	return dev;
- }
- 
-+const char *intel_get_master_name(struct intel_device *dev)
-+{
-+	assert(dev && dev->master_node);
-+	return dev->master_node;
-+}
-+
- const char *intel_get_client_name(struct intel_device *dev)
- {
- 	assert(dev && dev->render_node);
-diff --git a/src/intel_driver.h b/src/intel_driver.h
-index 28ed1a0e..bece88a0 100644
---- a/src/intel_driver.h
-+++ b/src/intel_driver.h
-@@ -124,9 +124,11 @@ int intel_entity_get_devid(int index);
- int intel_open_device(int entity_num,
- 		      const struct pci_device *pci,
- 		      struct xf86_platform_device *dev);
-+void intel_close_device(int entity_num);
- int __intel_peek_fd(ScrnInfoPtr scrn);
- struct intel_device *intel_get_device(ScrnInfoPtr scrn, int *fd);
- int intel_has_render_node(struct intel_device *dev);
-+const char *intel_get_master_name(struct intel_device *dev);
- const char *intel_get_client_name(struct intel_device *dev);
- int intel_get_client_fd(struct intel_device *dev);
- int intel_get_device_id(struct intel_device *dev);
-diff --git a/src/intel_list.h b/src/intel_list.h
-index 51af825d..c8a3187a 100644
---- a/src/intel_list.h
-+++ b/src/intel_list.h
-@@ -306,8 +306,7 @@ list_is_empty(const struct list *head)
-     list_entry((ptr)->prev, type, member)
- 
- #define __container_of(ptr, sample, member)				\
--    (void *)((char *)(ptr)						\
--	     - ((char *)&(sample)->member - (char *)(sample)))
-+    (void *)((char *)(ptr) - ((char *)&(sample)->member - (char *)(sample)))
- /**
-  * Loop through the list given by head and set pos to struct in the list.
-  *
-@@ -392,17 +391,50 @@ static inline void list_move_tail(struct list *list, struct list *head)
- #define list_last_entry(ptr, type, member) \
-     list_entry((ptr)->prev, type, member)
- 
--#define list_for_each_entry_reverse(pos, head, member)				\
-+#define list_for_each_entry_reverse(pos, head, member)			\
-     for (pos = __container_of((head)->prev, pos, member);		\
- 	 &pos->member != (head);					\
- 	 pos = __container_of(pos->member.prev, pos, member))
- 
- #endif
- 
-+#define list_for_each_entry_safe_from(pos, tmp, head, member)		\
-+    for (tmp = __container_of(pos->member.next, pos, member);		\
-+	 &pos->member != (head);					\
-+	 pos = tmp, tmp = __container_of(tmp->member.next, tmp, member))
-+
- #undef container_of
- #define container_of(ptr, type, member) \
- 	((type *)((char *)(ptr) - (char *) &((type *)0)->member))
- 
-+static inline void __list_splice(const struct list *list,
-+				 struct list *prev,
-+				 struct list *next)
-+{
-+	struct list *first = list->next;
-+	struct list *last = list->prev;
-+
-+	first->prev = prev;
-+	prev->next = first;
-+
-+	last->next = next;
-+	next->prev = last;
-+}
-+
-+static inline void list_splice(const struct list *list,
-+			       struct list *head)
-+{
-+	if (!list_is_empty(list))
-+		__list_splice(list, head, head->next);
-+}
-+
-+static inline void list_splice_tail(const struct list *list,
-+				    struct list *head)
-+{
-+	if (!list_is_empty(list))
-+		__list_splice(list, head->prev, head);
-+}
-+
- static inline int list_is_singular(const struct list *list)
- {
- 	return list->next == list->prev;
-diff --git a/src/intel_module.c b/src/intel_module.c
-index 102d52aa..2e97b5ea 100644
---- a/src/intel_module.c
-+++ b/src/intel_module.c
-@@ -126,6 +126,17 @@ static const struct intel_device_info intel_skylake_info = {
- 	.gen = 0110,
- };
- 
-+static const struct intel_device_info intel_broxton_info = {
-+	.gen = 0111,
-+};
-+
-+static const struct intel_device_info intel_kabylake_info = {
-+	.gen = 0112,
-+};
-+
-+static const struct intel_device_info intel_geminilake_info = {
-+	.gen = 0113,
-+};
- 
- static const SymTabRec intel_chipsets[] = {
- 	{PCI_CHIP_I810,				"i810"},
-@@ -234,30 +245,63 @@ static const SymTabRec intel_chipsets[] = {
- 	{0x0157, "HD Graphics"},
- 
- 	/* Broadwell Marketing names */
--	{0x1602, "HD graphics"},
--	{0x1606, "HD graphics"},
--	{0x160B, "HD graphics"},
--	{0x160A, "HD graphics"},
--	{0x160D, "HD graphics"},
--	{0x160E, "HD graphics"},
--	{0x1612, "HD graphics 5600"},
--	{0x1616, "HD graphics 5500"},
--	{0x161B, "HD graphics"},
--	{0x161A, "HD graphics"},
--	{0x161D, "HD graphics"},
--	{0x161E, "HD graphics 5300"},
--	{0x1622, "Iris Pro graphics 6200"},
--	{0x1626, "HD graphics 6000"},
--	{0x162B, "Iris graphics 6100"},
--	{0x162A, "Iris Pro graphics P6300"},
--	{0x162D, "HD graphics"},
--	{0x162E, "HD graphics"},
--	{0x1632, "HD graphics"},
--	{0x1636, "HD graphics"},
--	{0x163B, "HD graphics"},
--	{0x163A, "HD graphics"},
--	{0x163D, "HD graphics"},
--	{0x163E, "HD graphics"},
-+	{0x1602, "HD Graphics"},
-+	{0x1606, "HD Graphics"},
-+	{0x160B, "HD Graphics"},
-+	{0x160A, "HD Graphics"},
-+	{0x160D, "HD Graphics"},
-+	{0x160E, "HD Graphics"},
-+	{0x1612, "HD Graphics 5600"},
-+	{0x1616, "HD Graphics 5500"},
-+	{0x161B, "HD Graphics"},
-+	{0x161A, "HD Graphics"},
-+	{0x161D, "HD Graphics"},
-+	{0x161E, "HD Graphics 5300"},
-+	{0x1622, "Iris Pro Graphics 6200"},
-+	{0x1626, "HD Graphics 6000"},
-+	{0x162B, "Iris Graphics 6100"},
-+	{0x162A, "Iris Pro Graphics P6300"},
-+	{0x162D, "HD Graphics"},
-+	{0x162E, "HD Graphics"},
-+	{0x1632, "HD Graphics"},
-+	{0x1636, "HD Graphics"},
-+	{0x163B, "HD Graphics"},
-+	{0x163A, "HD Graphics"},
-+	{0x163D, "HD Graphics"},
-+	{0x163E, "HD Graphics"},
-+
-+	/* Cherryview (Cherrytrail/Braswell) */
-+	{0x22b0, "HD Graphics"},
-+	{0x22b1, "HD Graphics"},
-+	{0x22b2, "HD Graphics"},
-+	{0x22b3, "HD Graphics"},
-+
-+	/* Skylake */
-+	{0x1902, "HD Graphics 510"},
-+	{0x1906, "HD Graphics 510"},
-+	{0x190B, "HD Graphics 510"},
-+	{0x1912, "HD Graphics 530"},
-+	{0x1916, "HD Graphics 520"},
-+	{0x191B, "HD Graphics 530"},
-+	{0x191D, "HD Graphics P530"},
-+	{0x191E, "HD Graphics 515"},
-+	{0x1921, "HD Graphics 520"},
-+	{0x1926, "Iris Graphics 540"},
-+	{0x1927, "Iris Graphics 550"},
-+	{0x192B, "Iris Graphics 555"},
-+	{0x192D, "Iris Graphics P555"},
-+	{0x1932, "Iris Pro Graphics 580"},
-+	{0x193A, "Iris Pro Graphics P580"},
-+	{0x193B, "Iris Pro Graphics 580"},
-+	{0x193D, "Iris Pro Graphics P580"},
-+
-+	/* Broxton (Apollolake) */
-+	{0x5A84, "HD Graphics 505"},
-+	{0x5A85, "HD Graphics 500"},
-+
-+	/* Kabylake */
-+	{0x5916, "HD Graphics 620"},
-+	{0x591E, "HD Graphics 615"},
- 
- 	/* When adding new identifiers, also update:
- 	 * 1. intel_identify()
-@@ -305,18 +349,14 @@ static const struct pci_id_match intel_device_match[] = {
- 	INTEL_IVB_D_IDS(&intel_ivybridge_info),
- 	INTEL_IVB_M_IDS(&intel_ivybridge_info),
- 
--	INTEL_HSW_D_IDS(&intel_haswell_info),
--	INTEL_HSW_M_IDS(&intel_haswell_info),
--
--	INTEL_VLV_D_IDS(&intel_valleyview_info),
--	INTEL_VLV_M_IDS(&intel_valleyview_info),
--
--	INTEL_BDW_D_IDS(&intel_broadwell_info),
--	INTEL_BDW_M_IDS(&intel_broadwell_info),
--
-+	INTEL_HSW_IDS(&intel_haswell_info),
-+	INTEL_VLV_IDS(&intel_valleyview_info),
-+	INTEL_BDW_IDS(&intel_broadwell_info),
- 	INTEL_CHV_IDS(&intel_cherryview_info),
--
- 	INTEL_SKL_IDS(&intel_skylake_info),
-+	INTEL_BXT_IDS(&intel_broxton_info),
-+	INTEL_KBL_IDS(&intel_kabylake_info),
-+	INTEL_GLK_IDS(&intel_geminilake_info),
- 
- 	INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
- #endif
-@@ -448,9 +488,9 @@ static void intel_identify(int flags)
- 	if (unique != stack)
- 		free(unique);
- 
--	xf86Msg(X_INFO, INTEL_NAME ": Driver for Intel(R) HD Graphics: 2000-6000\n");
--	xf86Msg(X_INFO, INTEL_NAME ": Driver for Intel(R) Iris(TM) Graphics: 5100, 6100\n");
--	xf86Msg(X_INFO, INTEL_NAME ": Driver for Intel(R) Iris(TM) Pro Graphics: 5200, 6200, P6300\n");
-+	xf86Msg(X_INFO, INTEL_NAME ": Driver for Intel(R) HD Graphics\n");
-+	xf86Msg(X_INFO, INTEL_NAME ": Driver for Intel(R) Iris(TM) Graphics\n");
-+	xf86Msg(X_INFO, INTEL_NAME ": Driver for Intel(R) Iris(TM) Pro Graphics\n");
- }
- 
- static Bool intel_driver_func(ScrnInfoPtr pScrn,
-@@ -508,6 +548,9 @@ static enum accel_method { NOACCEL, SNA, UXA } get_accel_method(void)
- 	if (hosted())
- 		return SNA;
- 
-+	if (xf86configptr == NULL) /* X -configure */
-+		return SNA;
-+
- 	dev = _xf86findDriver("intel", xf86configptr->conf_device_lst);
- 	if (dev && dev->dev_option_lst) {
- 		const char *s;
-@@ -582,10 +625,17 @@ intel_scrn_create(DriverPtr		driver,
- 	case NOACCEL:
- #endif
- 	case UXA:
--		  return intel_init_scrn(scrn);
-+		return intel_init_scrn(scrn);
- #endif
- 
--	default: break;
-+	default:
-+#if USE_SNA
-+		return sna_init_scrn(scrn, entity_num);
-+#elif USE_UXA
-+		return intel_init_scrn(scrn);
-+#else
-+		break;
-+#endif
- 	}
- #endif
- 
-@@ -604,6 +654,8 @@ static Bool intel_pci_probe(DriverPtr		driver,
- 			    struct pci_device	*pci,
- 			    intptr_t		match_data)
- {
-+	Bool ret;
-+
- 	if (intel_open_device(entity_num, pci, NULL) == -1) {
- #if UMS
- 		switch (pci->device_id) {
-@@ -621,7 +673,11 @@ static Bool intel_pci_probe(DriverPtr		driver,
- #endif
- 	}
- 
--	return intel_scrn_create(driver, entity_num, match_data, 0);
-+	ret = intel_scrn_create(driver, entity_num, match_data, 0);
-+	if (!ret)
-+		intel_close_device(entity_num);
-+
-+	return ret;
- }
- 
- #ifdef XSERVER_PLATFORM_BUS
-@@ -644,9 +700,16 @@ intel_platform_probe(DriverPtr driver,
- 
- 	/* if we get any flags we don't understand fail to probe for now */
- 	if (flags)
--		return FALSE;
-+		goto err;
-+
-+	if (!intel_scrn_create(driver, entity_num, match_data, scrn_flags))
-+		goto err;
- 
--	return intel_scrn_create(driver, entity_num, match_data, scrn_flags);
-+	return TRUE;
-+
-+err:
-+	intel_close_device(entity_num);
-+	return FALSE;
- }
- #endif
- 
-diff --git a/src/intel_options.c b/src/intel_options.c
-index ff8541a4..7f253ac1 100644
---- a/src/intel_options.c
-+++ b/src/intel_options.c
-@@ -2,18 +2,24 @@
- #include "config.h"
- #endif
- 
-+#include <xorg-server.h>
-+#include <xorgVersion.h>
-+#include <xf86Parser.h>
-+
- #include "intel_options.h"
- 
- const OptionInfoRec intel_options[] = {
--	{OPTION_ACCEL_DISABLE,	"NoAccel",	OPTV_BOOLEAN,	{0},	0},
-+	{OPTION_ACCEL_ENABLE,	"Accel",	OPTV_BOOLEAN,	{0},	0},
- 	{OPTION_ACCEL_METHOD,	"AccelMethod",	OPTV_STRING,	{0},	0},
- 	{OPTION_BACKLIGHT,	"Backlight",	OPTV_STRING,	{0},	0},
-+	{OPTION_EDID,		"CustomEDID",	OPTV_STRING,	{0},	0},
- 	{OPTION_DRI,		"DRI",		OPTV_STRING,	{0},	0},
- 	{OPTION_PRESENT,	"Present",	OPTV_BOOLEAN,	{0},	1},
- 	{OPTION_COLOR_KEY,	"ColorKey",	OPTV_INTEGER,	{0},	0},
- 	{OPTION_VIDEO_KEY,	"VideoKey",	OPTV_INTEGER,	{0},	0},
- 	{OPTION_TILING_2D,	"Tiling",	OPTV_BOOLEAN,	{0},	1},
- 	{OPTION_TILING_FB,	"LinearFramebuffer",	OPTV_BOOLEAN,	{0},	0},
-+	{OPTION_ROTATION,	"HWRotation",	OPTV_BOOLEAN,	{0},	1},
- 	{OPTION_VSYNC,		"VSync",	OPTV_BOOLEAN,	{0},	1},
- 	{OPTION_PAGEFLIP,	"PageFlip",	OPTV_BOOLEAN,	{0},	1},
- 	{OPTION_SWAPBUFFERS_WAIT, "SwapbuffersWait", OPTV_BOOLEAN,	{0},	1},
-@@ -21,7 +27,6 @@ const OptionInfoRec intel_options[] = {
- 	{OPTION_PREFER_OVERLAY, "XvPreferOverlay", OPTV_BOOLEAN, {0}, 0},
- 	{OPTION_HOTPLUG,	"HotPlug",	OPTV_BOOLEAN,	{0},	1},
- 	{OPTION_REPROBE,	"ReprobeOutputs", OPTV_BOOLEAN,	{0},	0},
--	{OPTION_DELETE_DP12,	"DeleteUnusedDP12Displays", OPTV_BOOLEAN,	{0},	0},
- #ifdef INTEL_XVMC
- 	{OPTION_XVMC,		"XvMC",		OPTV_BOOLEAN,	{0},	1},
- #endif
-@@ -54,3 +59,85 @@ OptionInfoPtr intel_options_get(ScrnInfoPtr scrn)
- 
- 	return options;
- }
-+
-+Bool intel_option_cast_to_bool(OptionInfoPtr options, int id, Bool val)
-+{
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,99,901,0)
-+	xf86getBoolValue(&val, xf86GetOptValString(options, id));
-+#endif
-+	return val;
-+}
-+
-+static int
-+namecmp(const char *s1, const char *s2)
-+{
-+	char c1, c2;
-+
-+	if (!s1 || *s1 == 0) {
-+		if (!s2 || *s2 == 0)
-+			return 0;
-+		else
-+			return 1;
-+	}
-+
-+	while (*s1 == '_' || *s1 == ' ' || *s1 == '\t')
-+		s1++;
-+
-+	while (*s2 == '_' || *s2 == ' ' || *s2 == '\t')
-+		s2++;
-+
-+	c1 = isupper(*s1) ? tolower(*s1) : *s1;
-+	c2 = isupper(*s2) ? tolower(*s2) : *s2;
-+	while (c1 == c2) {
-+		if (c1 == '\0')
-+			return 0;
-+
-+		s1++;
-+		while (*s1 == '_' || *s1 == ' ' || *s1 == '\t')
-+			s1++;
-+
-+		s2++;
-+		while (*s2 == '_' || *s2 == ' ' || *s2 == '\t')
-+			s2++;
-+
-+		c1 = isupper(*s1) ? tolower(*s1) : *s1;
-+		c2 = isupper(*s2) ? tolower(*s2) : *s2;
-+	}
-+
-+	return c1 - c2;
-+}
-+
-+unsigned intel_option_cast_to_unsigned(OptionInfoPtr options, int id, unsigned val)
-+{
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,99,901,0)
-+	const char *str = xf86GetOptValString(options, id);
-+#else
-+	const char *str = NULL;
-+#endif
-+	unsigned v;
-+
-+	if (str == NULL || *str == '\0')
-+		return val;
-+
-+	if (namecmp(str, "on") == 0)
-+		return val;
-+	if (namecmp(str, "true") == 0)
-+		return val;
-+	if (namecmp(str, "yes") == 0)
-+		return val;
-+
-+	if (namecmp(str, "0") == 0)
-+		return 0;
-+	if (namecmp(str, "off") == 0)
-+		return 0;
-+	if (namecmp(str, "false") == 0)
-+		return 0;
-+	if (namecmp(str, "no") == 0)
-+		return 0;
-+
-+	v = atoi(str);
-+	if (v)
-+		return v;
-+
-+	return val;
-+}
-diff --git a/src/intel_options.h b/src/intel_options.h
-index 7e2cbd9b..43635f1f 100644
---- a/src/intel_options.h
-+++ b/src/intel_options.h
-@@ -12,15 +12,17 @@
-  */
- 
- enum intel_options {
--	OPTION_ACCEL_DISABLE,
-+	OPTION_ACCEL_ENABLE,
- 	OPTION_ACCEL_METHOD,
- 	OPTION_BACKLIGHT,
-+	OPTION_EDID,
- 	OPTION_DRI,
- 	OPTION_PRESENT,
- 	OPTION_VIDEO_KEY,
- 	OPTION_COLOR_KEY,
- 	OPTION_TILING_2D,
- 	OPTION_TILING_FB,
-+	OPTION_ROTATION,
- 	OPTION_VSYNC,
- 	OPTION_PAGEFLIP,
- 	OPTION_SWAPBUFFERS_WAIT,
-@@ -28,7 +30,6 @@ enum intel_options {
- 	OPTION_PREFER_OVERLAY,
- 	OPTION_HOTPLUG,
- 	OPTION_REPROBE,
--	OPTION_DELETE_DP12,
- #if defined(XvMCExtension) && defined(ENABLE_XVMC)
- 	OPTION_XVMC,
- #define INTEL_XVMC 1
-@@ -51,5 +52,7 @@ enum intel_options {
- 
- extern const OptionInfoRec intel_options[];
- OptionInfoPtr intel_options_get(ScrnInfoPtr scrn);
-+unsigned intel_option_cast_to_unsigned(OptionInfoPtr, int id, unsigned val);
-+Bool intel_option_cast_to_bool(OptionInfoPtr, int id, Bool val);
- 
- #endif /* INTEL_OPTIONS_H */
-diff --git a/src/legacy/i810/i810_common.h b/src/legacy/i810/i810_common.h
-index 4cc10e8b..8355708c 100644
---- a/src/legacy/i810/i810_common.h
-+++ b/src/legacy/i810/i810_common.h
-@@ -52,7 +52,7 @@
- 
- #define ALIGN(i,m) (((i) + (m) - 1) & ~((m) - 1))
- 
--/* Using usleep() makes things noticably slow. */
-+/* Using usleep() makes things noticeably slow. */
- #if 0
- #define DELAY(x) usleep(x)
- #else
-@@ -185,7 +185,7 @@ enum {
-  *    - zbuffer linear offset and pitch -- also invarient
-  *    - drawing origin in back and depth buffers.
-  *
-- * Keep the depth/back buffer state here to acommodate private buffers
-+ * Keep the depth/back buffer state here to accommodate private buffers
-  * in the future.
-  */
- #define I810_DESTREG_DI0  0		/* CMD_OP_DESTBUFFER_INFO (2 dwords) */
-diff --git a/src/legacy/i810/i810_hwmc.c b/src/legacy/i810/i810_hwmc.c
-index 7cb9c1ab..58661b0a 100644
---- a/src/legacy/i810/i810_hwmc.c
-+++ b/src/legacy/i810/i810_hwmc.c
-@@ -171,7 +171,7 @@ static XF86MCAdaptorPtr ppAdapt[1] =
-  *
-  *  I810InitMC
-  *
-- *  Initialize the hardware motion compenstation extention for this 
-+ *  Initialize the hardware motion compensation extension for this
-  *  hardware. The initialization routines want the address of the pointers
-  *  to the structures, not the address of the structures. This means we
-  *  allocate (or create static?) the pointer memory and pass that 
-diff --git a/src/legacy/i810/i810_memory.c b/src/legacy/i810/i810_memory.c
-index c3de2777..6f274836 100644
---- a/src/legacy/i810/i810_memory.c
-+++ b/src/legacy/i810/i810_memory.c
-@@ -76,7 +76,7 @@ I810AllocateGARTMemory(ScrnInfoPtr pScrn)
-    unsigned long size = pScrn->videoRam * 1024UL;
-    I810Ptr pI810 = I810PTR(pScrn);
-    int key;
--   long tom = 0;
-+   unsigned long tom = 0;
-    unsigned long physical;
- 
-    if (!xf86AgpGARTSupported() || !xf86AcquireGART(pScrn->scrnIndex)) {
-@@ -132,8 +132,8 @@ I810AllocateGARTMemory(ScrnInfoPtr pScrn)
-     * Keep it 512K aligned for the sake of tiled regions.
-     */
- 
--   tom += 0x7ffff;
--   tom &= ~0x7ffff;
-+   tom += 0x7ffffUL;
-+   tom &= ~0x7ffffUL;
- 
-    if ((key = xf86AllocateGARTMemory(pScrn->scrnIndex, size, 1, NULL)) != -1) {
-       pI810->DcacheOffset = tom;
-diff --git a/src/legacy/i810/i810_reg.h b/src/legacy/i810/i810_reg.h
-index 54faeb3d..fa091c5b 100644
---- a/src/legacy/i810/i810_reg.h
-+++ b/src/legacy/i810/i810_reg.h
-@@ -245,7 +245,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  * not sure they refer to local (graphics) memory.
-  *
-  * These details are for the local memory control registers,
-- * (pp301-310).  The test machines are not equiped with local memory,
-+ * (pp301-310).  The test machines are not equipped with local memory,
-  * so nothing is tested.  Only a single row seems to be supported.
-  */
- #define DRAM_ROW_TYPE      0x3000
-diff --git a/src/legacy/i810/i810_video.c b/src/legacy/i810/i810_video.c
-index be49b91d..af683c81 100644
---- a/src/legacy/i810/i810_video.c
-+++ b/src/legacy/i810/i810_video.c
-@@ -77,7 +77,11 @@ static int I810PutImage( ScrnInfoPtr,
- static int I810QueryImageAttributes(ScrnInfoPtr, 
- 	int, unsigned short *, unsigned short *,  int *, int *);
- 
-+#if !HAVE_NOTIFY_FD
- static void I810BlockHandler(BLOCKHANDLER_ARGS_DECL);
-+#else
-+static void I810BlockHandler(void *data, void *_timeout);
-+#endif
- 
- #define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
- 
-@@ -418,8 +422,14 @@ I810SetupImageVideo(ScreenPtr screen)
- 
-     pI810->adaptor = adapt;
- 
-+#if !HAVE_NOTIFY_FD
-     pI810->BlockHandler = screen->BlockHandler;
-     screen->BlockHandler = I810BlockHandler;
-+#else
-+    RegisterBlockAndWakeupHandlers(I810BlockHandler,
-+				   (ServerWakeupHandlerProcPtr)NoopDDA,
-+				   pScrn);
-+#endif
- 
-     xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");
-     xvContrast   = MAKE_ATOM("XV_CONTRAST");
-@@ -1135,6 +1145,7 @@ I810QueryImageAttributes(
-     return size;
- }
- 
-+#if !HAVE_NOTIFY_FD
- static void
- I810BlockHandler (BLOCKHANDLER_ARGS_DECL)
- {
-@@ -1172,6 +1183,38 @@ I810BlockHandler (BLOCKHANDLER_ARGS_DECL)
-         }
-     }
- }
-+#else
-+static void
-+I810BlockHandler(void *data, void *_timeout)
-+{
-+    ScrnInfoPtr pScrn = data;
-+    I810Ptr      pI810 = I810PTR(pScrn);
-+    I810PortPrivPtr pPriv = GET_PORT_PRIVATE(pScrn);
-+    I810OverlayRegPtr overlay = (I810OverlayRegPtr) (pI810->FbBase + pI810->OverlayStart);
-+
-+    if(pPriv->videoStatus & TIMER_MASK) {
-+	UpdateCurrentTime();
-+	if(pPriv->videoStatus & OFF_TIMER) {
-+	    if(pPriv->offTime < currentTime.milliseconds) {
-+		/* Turn off the overlay */
-+		overlay->OV0CMD &= 0xFFFFFFFE;
-+		OVERLAY_UPDATE(pI810->OverlayPhysical);
-+
-+		pPriv->videoStatus = FREE_TIMER;
-+		pPriv->freeTime = currentTime.milliseconds + FREE_DELAY;
-+	    }
-+	} else {  /* FREE_TIMER */
-+	    if(pPriv->freeTime < currentTime.milliseconds) {
-+		if(pPriv->linear) {
-+		   xf86FreeOffscreenLinear(pPriv->linear);
-+		   pPriv->linear = NULL;
-+		}
-+		pPriv->videoStatus = 0;
-+	    }
-+        }
-+    }
-+}
-+#endif
- 
- 
- /***************************************************************************
-@@ -1373,7 +1416,6 @@ I810DisplaySurface(
-       UpdateCurrentTime();
-       pI810Priv->videoStatus = FREE_TIMER;
-       pI810Priv->freeTime = currentTime.milliseconds + FREE_DELAY;
--      pScrn->pScreen->BlockHandler = I810BlockHandler;
-     }
- 
-     return Success;
-diff --git a/src/legacy/i810/xvmc/I810XvMC.c b/src/legacy/i810/xvmc/I810XvMC.c
-index e6b63d30..a538e999 100644
---- a/src/legacy/i810/xvmc/I810XvMC.c
-+++ b/src/legacy/i810/xvmc/I810XvMC.c
-@@ -61,7 +61,7 @@ static int event_base;
- // Arguments: pI810XvMC private data structure from the current context.
- // Notes: We faked the drmMapBufs for the i810's security so now we have
- //   to insert an allocated page into the correct spot in the faked
--//   list to keep up appearences.
-+//   list to keep up appearances.
- //   Concept for this function was taken from Mesa sources.
- // Returns: drmBufPtr containing the information about the allocated page.
- ***************************************************************************/
-@@ -188,7 +188,7 @@ _X_EXPORT Status XvMCCreateContext(Display *display, XvPortID port,
- 
-   /* Check for drm */
-   if(! drmAvailable()) {
--    printf("Direct Rendering is not avilable on this system!\n");
-+    printf("Direct Rendering is not available on this system!\n");
-     return BadAlloc;
-   }
- 
-@@ -3279,7 +3279,7 @@ _X_EXPORT Status XvMCSyncSurface(Display *display,XvMCSurface *surface) {
- //   display - Connection to X server
- //   surface - Surface to flush
- // Info:
--//   This command is a noop for i810 becuase we always dispatch buffers in
-+//   This command is a noop for i810 because we always dispatch buffers in
- //   render. There is little gain to be had with 4k buffers.
- // Returns: Status
- ***************************************************************************/
-diff --git a/src/render_program/exa_wm.g4i b/src/render_program/exa_wm.g4i
-index 5d3d45b1..587b581c 100644
---- a/src/render_program/exa_wm.g4i
-+++ b/src/render_program/exa_wm.g4i
-@@ -57,7 +57,7 @@ define(`mask_dw_dy', `g6.4<0,1,0>F')
- define(`mask_wo',    `g6.12<0,1,0>F')
- 
- /*
-- * Local variables. Pairs must be aligned on even reg boundry
-+ * Local variables. Pairs must be aligned on even reg boundary
-  */
- 
- /* this holds the X dest coordinates */
-diff --git a/src/render_program/exa_wm_yuv_rgb.g8a b/src/render_program/exa_wm_yuv_rgb.g8a
-index 7def0930..34973ba8 100644
---- a/src/render_program/exa_wm_yuv_rgb.g8a
-+++ b/src/render_program/exa_wm_yuv_rgb.g8a
-@@ -76,7 +76,7 @@ add (16)    Cbn<1>F		Cb<8,8,1>F	-0.501961F  { compr align1 };
-     /* 
-      * R = Y + Cr * 1.596
-      */
--mov (8)    acc0<1>F		Yn<8,8,1>F		    { compr align1 };
-+mov (8)    acc0<1>F		Yn_01<8,8,1>F		    { compr align1 };
- mac.sat(8) src_sample_r_01<1>F	Crn_01<8,8,1>F	1.596F	    { compr align1 };
-      
- mov (8)    acc0<1>F		Yn_23<8,8,1>F		    { compr align1 };
-@@ -84,7 +84,7 @@ mac.sat(8) src_sample_r_23<1>F	Crn_23<8,8,1>F	1.596F	    { compr align1 };
-     /*
-      * G = Crn * -0.813 + Cbn * -0.392 + Y
-      */
--mov (8)    acc0<1>F		Yn_23<8,8,1>F		    { compr align1 };
-+mov (8)    acc0<1>F		Yn_01<8,8,1>F		    { compr align1 };
- mac (8)    acc0<1>F		Crn_01<8,8,1>F    	-0.813F	    { compr align1 };
- mac.sat(8) src_sample_g_01<1>F	Cbn_01<8,8,1>F    	-0.392F	    { compr align1 };
- 
-diff --git a/src/render_program/exa_wm_yuv_rgb.g8b b/src/render_program/exa_wm_yuv_rgb.g8b
-index 44949538..2cd6fc44 100644
---- a/src/render_program/exa_wm_yuv_rgb.g8b
-+++ b/src/render_program/exa_wm_yuv_rgb.g8b
-@@ -6,7 +6,7 @@
-    { 0x80600048, 0x21c03ae8, 0x3e8d02c0, 0x3fcc49ba },
-    { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 },
-    { 0x80600048, 0x21e03ae8, 0x3e8d02e0, 0x3fcc49ba },
--   { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 },
-+   { 0x00600001, 0x24003ae0, 0x008d0300, 0x00000000 },
-    { 0x00600048, 0x24003ae0, 0x3e8d02c0, 0xbf5020c5 },
-    { 0x80600048, 0x22003ae8, 0x3e8d0340, 0xbec8b439 },
-    { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 },
-diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am
-index e09a8d49..adf13963 100644
---- a/src/sna/Makefile.am
-+++ b/src/sna/Makefile.am
-@@ -107,6 +107,8 @@ libsna_la_SOURCES = \
- 	gen8_render.h \
- 	gen8_vertex.c \
- 	gen8_vertex.h \
-+	gen9_render.c \
-+	gen9_render.h \
- 	xassert.h \
- 	$(NULL)
- 
-diff --git a/src/sna/blt.c b/src/sna/blt.c
-index b5bfee69..cb90437a 100644
---- a/src/sna/blt.c
-+++ b/src/sna/blt.c
-@@ -30,112 +30,608 @@
- #endif
- 
- #include "sna.h"
-+#include <pixman.h>
- 
--#if __x86_64__
--#define USE_SSE2 1
--#endif
--
--#if USE_SSE2
-+#if defined(sse2)
-+#pragma GCC push_options
-+#pragma GCC target("sse2,inline-all-stringops,fpmath=sse")
-+#pragma GCC optimize("Ofast")
- #include <xmmintrin.h>
- 
- #if __x86_64__
- #define have_sse2() 1
- #else
--enum {
--	MMX = 0x1,
--	MMX_EXTENSIONS = 0x2,
--	SSE = 0x6,
--	SSE2 = 0x8,
--	CMOV = 0x10
--};
--
--#ifdef __GNUC__
--static unsigned int
--detect_cpu_features(void)
--{
--	unsigned int features;
--	unsigned int result = 0;
--
--	char vendor[13];
--	vendor[0] = 0;
--	vendor[12] = 0;
--
--	asm (
--	     "pushf\n"
--	     "pop %%eax\n"
--	     "mov %%eax, %%ecx\n"
--	     "xor $0x00200000, %%eax\n"
--	     "push %%eax\n"
--	     "popf\n"
--	     "pushf\n"
--	     "pop %%eax\n"
--	     "mov $0x0, %%edx\n"
--	     "xor %%ecx, %%eax\n"
--	     "jz 1f\n"
--
--	     "mov $0x00000000, %%eax\n"
--	     "push %%ebx\n"
--	     "cpuid\n"
--	     "mov %%ebx, %%eax\n"
--	     "pop %%ebx\n"
--	     "mov %%eax, %1\n"
--	     "mov %%edx, %2\n"
--	     "mov %%ecx, %3\n"
--	     "mov $0x00000001, %%eax\n"
--	     "push %%ebx\n"
--	     "cpuid\n"
--	     "pop %%ebx\n"
--	     "1:\n"
--	     "mov %%edx, %0\n"
--	     : "=r" (result), "=m" (vendor[0]), "=m" (vendor[4]), "=m" (vendor[8])
--	     :: "%eax", "%ecx", "%edx");
--
--	features = 0;
--	if (result) {
--		/* result now contains the standard feature bits */
--		if (result & (1 << 15))
--			features |= CMOV;
--		if (result & (1 << 23))
--			features |= MMX;
--		if (result & (1 << 25))
--			features |= SSE;
--		if (result & (1 << 26))
--			features |= SSE2;
--	}
--	return features;
--}
--#else
--static unsigned int detect_cpu_features(void) { return 0; }
--#endif
--
- static bool have_sse2(void)
- {
- 	static int sse2_present = -1;
- 
- 	if (sse2_present == -1)
--		sse2_present = detect_cpu_features() & SSE2;
-+		sse2_present = sna_cpu_detect() & SSE2;
- 
- 	return sse2_present;
- }
- #endif
- 
--static inline __m128i
-+static force_inline __m128i
- xmm_create_mask_32(uint32_t mask)
- {
- 	return _mm_set_epi32(mask, mask, mask, mask);
- }
- 
--static inline __m128i
-+static force_inline __m128i
-+xmm_load_128(const __m128i *src)
-+{
-+	return _mm_load_si128(src);
-+}
-+
-+static force_inline __m128i
- xmm_load_128u(const __m128i *src)
- {
- 	return _mm_loadu_si128(src);
- }
- 
--static inline void
-+static force_inline void
- xmm_save_128(__m128i *dst, __m128i data)
- {
- 	_mm_store_si128(dst, data);
- }
-+
-+static force_inline void
-+xmm_save_128u(__m128i *dst, __m128i data)
-+{
-+	_mm_storeu_si128(dst, data);
-+}
-+
-+static force_inline void
-+to_sse128xN(uint8_t *dst, const uint8_t *src, int bytes)
-+{
-+	int i;
-+
-+	for (i = 0; i < bytes / 128; i++) {
-+		__m128i xmm0, xmm1, xmm2, xmm3;
-+		__m128i xmm4, xmm5, xmm6, xmm7;
-+
-+		xmm0 = xmm_load_128u((const __m128i*)src + 0);
-+		xmm1 = xmm_load_128u((const __m128i*)src + 1);
-+		xmm2 = xmm_load_128u((const __m128i*)src + 2);
-+		xmm3 = xmm_load_128u((const __m128i*)src + 3);
-+		xmm4 = xmm_load_128u((const __m128i*)src + 4);
-+		xmm5 = xmm_load_128u((const __m128i*)src + 5);
-+		xmm6 = xmm_load_128u((const __m128i*)src + 6);
-+		xmm7 = xmm_load_128u((const __m128i*)src + 7);
-+
-+		xmm_save_128((__m128i*)dst + 0, xmm0);
-+		xmm_save_128((__m128i*)dst + 1, xmm1);
-+		xmm_save_128((__m128i*)dst + 2, xmm2);
-+		xmm_save_128((__m128i*)dst + 3, xmm3);
-+		xmm_save_128((__m128i*)dst + 4, xmm4);
-+		xmm_save_128((__m128i*)dst + 5, xmm5);
-+		xmm_save_128((__m128i*)dst + 6, xmm6);
-+		xmm_save_128((__m128i*)dst + 7, xmm7);
-+
-+		dst += 128;
-+		src += 128;
-+	}
-+}
-+
-+static force_inline void
-+to_sse64(uint8_t *dst, const uint8_t *src)
-+{
-+	__m128i xmm1, xmm2, xmm3, xmm4;
-+
-+	xmm1 = xmm_load_128u((const __m128i*)src + 0);
-+	xmm2 = xmm_load_128u((const __m128i*)src + 1);
-+	xmm3 = xmm_load_128u((const __m128i*)src + 2);
-+	xmm4 = xmm_load_128u((const __m128i*)src + 3);
-+
-+	xmm_save_128((__m128i*)dst + 0, xmm1);
-+	xmm_save_128((__m128i*)dst + 1, xmm2);
-+	xmm_save_128((__m128i*)dst + 2, xmm3);
-+	xmm_save_128((__m128i*)dst + 3, xmm4);
-+}
-+
-+static force_inline void
-+to_sse32(uint8_t *dst, const uint8_t *src)
-+{
-+	__m128i xmm1, xmm2;
-+
-+	xmm1 = xmm_load_128u((const __m128i*)src + 0);
-+	xmm2 = xmm_load_128u((const __m128i*)src + 1);
-+
-+	xmm_save_128((__m128i*)dst + 0, xmm1);
-+	xmm_save_128((__m128i*)dst + 1, xmm2);
-+}
-+
-+static force_inline void
-+to_sse16(uint8_t *dst, const uint8_t *src)
-+{
-+	xmm_save_128((__m128i*)dst, xmm_load_128u((const __m128i*)src));
-+}
-+
-+static void to_memcpy(uint8_t *dst, const uint8_t *src, unsigned len)
-+{
-+	assert(len);
-+	if ((uintptr_t)dst & 15) {
-+		if (len <= 16 - ((uintptr_t)dst & 15)) {
-+			memcpy(dst, src, len);
-+			return;
-+		}
-+
-+		if ((uintptr_t)dst & 1) {
-+			assert(len >= 1);
-+			*dst++ = *src++;
-+			len--;
-+		}
-+		if ((uintptr_t)dst & 2) {
-+			assert(((uintptr_t)dst & 1) == 0);
-+			assert(len >= 2);
-+			*(uint16_t *)dst = *(const uint16_t *)src;
-+			dst += 2;
-+			src += 2;
-+			len -= 2;
-+		}
-+		if ((uintptr_t)dst & 4) {
-+			assert(((uintptr_t)dst & 3) == 0);
-+			assert(len >= 4);
-+			*(uint32_t *)dst = *(const uint32_t *)src;
-+			dst += 4;
-+			src += 4;
-+			len -= 4;
-+		}
-+		if ((uintptr_t)dst & 8) {
-+			assert(((uintptr_t)dst & 7) == 0);
-+			assert(len >= 8);
-+			*(uint64_t *)dst = *(const uint64_t *)src;
-+			dst += 8;
-+			src += 8;
-+			len -= 8;
-+		}
-+	}
-+
-+	assert(((uintptr_t)dst & 15) == 0);
-+	while (len >= 64) {
-+		to_sse64(dst, src);
-+		dst += 64;
-+		src += 64;
-+		len -= 64;
-+	}
-+	if (len == 0)
-+		return;
-+
-+	if (len & 32) {
-+		to_sse32(dst, src);
-+		dst += 32;
-+		src += 32;
-+	}
-+	if (len & 16) {
-+		to_sse16(dst, src);
-+		dst += 16;
-+		src += 16;
-+	}
-+	if (len & 8) {
-+		*(uint64_t *)dst = *(uint64_t *)src;
-+		dst += 8;
-+		src += 8;
-+	}
-+	if (len & 4) {
-+		*(uint32_t *)dst = *(uint32_t *)src;
-+		dst += 4;
-+		src += 4;
-+	}
-+	memcpy(dst, src, len & 3);
-+}
-+
-+static void
-+memcpy_to_tiled_x__swizzle_0__sse2(const void *src, void *dst, int bpp,
-+				   int32_t src_stride, int32_t dst_stride,
-+				   int16_t src_x, int16_t src_y,
-+				   int16_t dst_x, int16_t dst_y,
-+				   uint16_t width, uint16_t height)
-+{
-+	const unsigned tile_width = 512;
-+	const unsigned tile_height = 8;
-+	const unsigned tile_size = 4096;
-+
-+	const unsigned cpp = bpp / 8;
-+	const unsigned tile_pixels = tile_width / cpp;
-+	const unsigned tile_shift = ffs(tile_pixels) - 1;
-+	const unsigned tile_mask = tile_pixels - 1;
-+
-+	unsigned offset_x, length_x;
-+
-+	DBG(("%s(bpp=%d): src=(%d, %d), dst=(%d, %d), size=%dx%d, pitch=%d/%d\n",
-+	     __FUNCTION__, bpp, src_x, src_y, dst_x, dst_y, width, height, src_stride, dst_stride));
-+	assert(src != dst);
-+
-+	if (src_x | src_y)
-+		src = (const uint8_t *)src + src_y * src_stride + src_x * cpp;
-+	width *= cpp;
-+	assert(src_stride >= width);
-+
-+	if (dst_x & tile_mask) {
-+		offset_x = (dst_x & tile_mask) * cpp;
-+		length_x = min(tile_width - offset_x, width);
-+	} else
-+		length_x = 0;
-+	dst = (uint8_t *)dst + (dst_x >> tile_shift) * tile_size;
-+
-+	while (height--) {
-+		unsigned w = width;
-+		const uint8_t *src_row = src;
-+		uint8_t *tile_row = dst;
-+
-+		src = (const uint8_t *)src + src_stride;
-+
-+		tile_row += dst_y / tile_height * dst_stride * tile_height;
-+		tile_row += (dst_y & (tile_height-1)) * tile_width;
-+		dst_y++;
-+
-+		if (length_x) {
-+			to_memcpy(tile_row + offset_x, src_row, length_x);
-+
-+			tile_row += tile_size;
-+			src_row = (const uint8_t *)src_row + length_x;
-+			w -= length_x;
-+		}
-+		while (w >= tile_width) {
-+			assert(((uintptr_t)tile_row & (tile_width - 1)) == 0);
-+			to_sse128xN(assume_aligned(tile_row, tile_width),
-+				    src_row, tile_width);
-+			tile_row += tile_size;
-+			src_row = (const uint8_t *)src_row + tile_width;
-+			w -= tile_width;
-+		}
-+		if (w) {
-+			assert(((uintptr_t)tile_row & (tile_width - 1)) == 0);
-+			to_memcpy(assume_aligned(tile_row, tile_width),
-+				  src_row, w);
-+		}
-+	}
-+}
-+
-+static force_inline void
-+from_sse128xNu(uint8_t *dst, const uint8_t *src, int bytes)
-+{
-+	int i;
-+
-+	assert(((uintptr_t)src & 15) == 0);
-+
-+	for (i = 0; i < bytes / 128; i++) {
-+		__m128i xmm0, xmm1, xmm2, xmm3;
-+		__m128i xmm4, xmm5, xmm6, xmm7;
-+
-+		xmm0 = xmm_load_128((const __m128i*)src + 0);
-+		xmm1 = xmm_load_128((const __m128i*)src + 1);
-+		xmm2 = xmm_load_128((const __m128i*)src + 2);
-+		xmm3 = xmm_load_128((const __m128i*)src + 3);
-+		xmm4 = xmm_load_128((const __m128i*)src + 4);
-+		xmm5 = xmm_load_128((const __m128i*)src + 5);
-+		xmm6 = xmm_load_128((const __m128i*)src + 6);
-+		xmm7 = xmm_load_128((const __m128i*)src + 7);
-+
-+		xmm_save_128u((__m128i*)dst + 0, xmm0);
-+		xmm_save_128u((__m128i*)dst + 1, xmm1);
-+		xmm_save_128u((__m128i*)dst + 2, xmm2);
-+		xmm_save_128u((__m128i*)dst + 3, xmm3);
-+		xmm_save_128u((__m128i*)dst + 4, xmm4);
-+		xmm_save_128u((__m128i*)dst + 5, xmm5);
-+		xmm_save_128u((__m128i*)dst + 6, xmm6);
-+		xmm_save_128u((__m128i*)dst + 7, xmm7);
-+
-+		dst += 128;
-+		src += 128;
-+	}
-+}
-+
-+static force_inline void
-+from_sse128xNa(uint8_t *dst, const uint8_t *src, int bytes)
-+{
-+	int i;
-+
-+	assert(((uintptr_t)dst & 15) == 0);
-+	assert(((uintptr_t)src & 15) == 0);
-+
-+	for (i = 0; i < bytes / 128; i++) {
-+		__m128i xmm0, xmm1, xmm2, xmm3;
-+		__m128i xmm4, xmm5, xmm6, xmm7;
-+
-+		xmm0 = xmm_load_128((const __m128i*)src + 0);
-+		xmm1 = xmm_load_128((const __m128i*)src + 1);
-+		xmm2 = xmm_load_128((const __m128i*)src + 2);
-+		xmm3 = xmm_load_128((const __m128i*)src + 3);
-+		xmm4 = xmm_load_128((const __m128i*)src + 4);
-+		xmm5 = xmm_load_128((const __m128i*)src + 5);
-+		xmm6 = xmm_load_128((const __m128i*)src + 6);
-+		xmm7 = xmm_load_128((const __m128i*)src + 7);
-+
-+		xmm_save_128((__m128i*)dst + 0, xmm0);
-+		xmm_save_128((__m128i*)dst + 1, xmm1);
-+		xmm_save_128((__m128i*)dst + 2, xmm2);
-+		xmm_save_128((__m128i*)dst + 3, xmm3);
-+		xmm_save_128((__m128i*)dst + 4, xmm4);
-+		xmm_save_128((__m128i*)dst + 5, xmm5);
-+		xmm_save_128((__m128i*)dst + 6, xmm6);
-+		xmm_save_128((__m128i*)dst + 7, xmm7);
-+
-+		dst += 128;
-+		src += 128;
-+	}
-+}
-+
-+static force_inline void
-+from_sse64u(uint8_t *dst, const uint8_t *src)
-+{
-+	__m128i xmm1, xmm2, xmm3, xmm4;
-+
-+	assert(((uintptr_t)src & 15) == 0);
-+
-+	xmm1 = xmm_load_128((const __m128i*)src + 0);
-+	xmm2 = xmm_load_128((const __m128i*)src + 1);
-+	xmm3 = xmm_load_128((const __m128i*)src + 2);
-+	xmm4 = xmm_load_128((const __m128i*)src + 3);
-+
-+	xmm_save_128u((__m128i*)dst + 0, xmm1);
-+	xmm_save_128u((__m128i*)dst + 1, xmm2);
-+	xmm_save_128u((__m128i*)dst + 2, xmm3);
-+	xmm_save_128u((__m128i*)dst + 3, xmm4);
-+}
-+
-+static force_inline void
-+from_sse64a(uint8_t *dst, const uint8_t *src)
-+{
-+	__m128i xmm1, xmm2, xmm3, xmm4;
-+
-+	assert(((uintptr_t)dst & 15) == 0);
-+	assert(((uintptr_t)src & 15) == 0);
-+
-+	xmm1 = xmm_load_128((const __m128i*)src + 0);
-+	xmm2 = xmm_load_128((const __m128i*)src + 1);
-+	xmm3 = xmm_load_128((const __m128i*)src + 2);
-+	xmm4 = xmm_load_128((const __m128i*)src + 3);
-+
-+	xmm_save_128((__m128i*)dst + 0, xmm1);
-+	xmm_save_128((__m128i*)dst + 1, xmm2);
-+	xmm_save_128((__m128i*)dst + 2, xmm3);
-+	xmm_save_128((__m128i*)dst + 3, xmm4);
-+}
-+
-+static force_inline void
-+from_sse32u(uint8_t *dst, const uint8_t *src)
-+{
-+	__m128i xmm1, xmm2;
-+
-+	xmm1 = xmm_load_128((const __m128i*)src + 0);
-+	xmm2 = xmm_load_128((const __m128i*)src + 1);
-+
-+	xmm_save_128u((__m128i*)dst + 0, xmm1);
-+	xmm_save_128u((__m128i*)dst + 1, xmm2);
-+}
-+
-+static force_inline void
-+from_sse32a(uint8_t *dst, const uint8_t *src)
-+{
-+	__m128i xmm1, xmm2;
-+
-+	assert(((uintptr_t)dst & 15) == 0);
-+	assert(((uintptr_t)src & 15) == 0);
-+
-+	xmm1 = xmm_load_128((const __m128i*)src + 0);
-+	xmm2 = xmm_load_128((const __m128i*)src + 1);
-+
-+	xmm_save_128((__m128i*)dst + 0, xmm1);
-+	xmm_save_128((__m128i*)dst + 1, xmm2);
-+}
-+
-+static force_inline void
-+from_sse16u(uint8_t *dst, const uint8_t *src)
-+{
-+	assert(((uintptr_t)src & 15) == 0);
-+
-+	xmm_save_128u((__m128i*)dst, xmm_load_128((const __m128i*)src));
-+}
-+
-+static force_inline void
-+from_sse16a(uint8_t *dst, const uint8_t *src)
-+{
-+	assert(((uintptr_t)dst & 15) == 0);
-+	assert(((uintptr_t)src & 15) == 0);
-+
-+	xmm_save_128((__m128i*)dst, xmm_load_128((const __m128i*)src));
-+}
-+
-+static void
-+memcpy_from_tiled_x__swizzle_0__sse2(const void *src, void *dst, int bpp,
-+				     int32_t src_stride, int32_t dst_stride,
-+				     int16_t src_x, int16_t src_y,
-+				     int16_t dst_x, int16_t dst_y,
-+				     uint16_t width, uint16_t height)
-+{
-+	const unsigned tile_width = 512;
-+	const unsigned tile_height = 8;
-+	const unsigned tile_size = 4096;
-+
-+	const unsigned cpp = bpp / 8;
-+	const unsigned tile_pixels = tile_width / cpp;
-+	const unsigned tile_shift = ffs(tile_pixels) - 1;
-+	const unsigned tile_mask = tile_pixels - 1;
-+
-+	unsigned length_x, offset_x;
-+
-+	DBG(("%s(bpp=%d): src=(%d, %d), dst=(%d, %d), size=%dx%d, pitch=%d/%d\n",
-+	     __FUNCTION__, bpp, src_x, src_y, dst_x, dst_y, width, height, src_stride, dst_stride));
-+	assert(src != dst);
-+
-+	if (dst_x | dst_y)
-+		dst = (uint8_t *)dst + dst_y * dst_stride + dst_x * cpp;
-+	width *= cpp;
-+	assert(dst_stride >= width);
-+	if (src_x & tile_mask) {
-+		offset_x = (src_x & tile_mask) * cpp;
-+		length_x = min(tile_width - offset_x, width);
-+		dst_stride -= width;
-+		dst_stride += (width - length_x) & 15;
-+	} else {
-+		offset_x = 0;
-+		dst_stride -= width & ~15;
-+	}
-+	assert(dst_stride >= 0);
-+	src = (const uint8_t *)src + (src_x >> tile_shift) * tile_size;
-+
-+	while (height--) {
-+		unsigned w = width;
-+		const uint8_t *tile_row = src;
-+
-+		tile_row += src_y / tile_height * src_stride * tile_height;
-+		tile_row += (src_y & (tile_height-1)) * tile_width;
-+		src_y++;
-+
-+		if (offset_x) {
-+			memcpy(dst, tile_row + offset_x, length_x);
-+			tile_row += tile_size;
-+			dst = (uint8_t *)dst + length_x;
-+			w -= length_x;
-+		}
-+
-+		if ((uintptr_t)dst & 15) {
-+			while (w >= tile_width) {
-+				from_sse128xNu(dst,
-+					       assume_aligned(tile_row, tile_width),
-+					       tile_width);
-+				tile_row += tile_size;
-+				dst = (uint8_t *)dst + tile_width;
-+				w -= tile_width;
-+			}
-+			while (w >= 64) {
-+				from_sse64u(dst, tile_row);
-+				tile_row += 64;
-+				dst = (uint8_t *)dst + 64;
-+				w -= 64;
-+			}
-+			if (w & 32) {
-+				from_sse32u(dst, tile_row);
-+				tile_row += 32;
-+				dst = (uint8_t *)dst + 32;
-+			}
-+			if (w & 16) {
-+				from_sse16u(dst, tile_row);
-+				tile_row += 16;
-+				dst = (uint8_t *)dst + 16;
-+			}
-+			memcpy(dst, assume_aligned(tile_row, 16), w & 15);
-+		} else {
-+			while (w >= tile_width) {
-+				from_sse128xNa(assume_aligned(dst, 16),
-+					       assume_aligned(tile_row, tile_width),
-+					       tile_width);
-+				tile_row += tile_size;
-+				dst = (uint8_t *)dst + tile_width;
-+				w -= tile_width;
-+			}
-+			while (w >= 64) {
-+				from_sse64a(dst, tile_row);
-+				tile_row += 64;
-+				dst = (uint8_t *)dst + 64;
-+				w -= 64;
-+			}
-+			if (w & 32) {
-+				from_sse32a(dst, tile_row);
-+				tile_row += 32;
-+				dst = (uint8_t *)dst + 32;
-+			}
-+			if (w & 16) {
-+				from_sse16a(dst, tile_row);
-+				tile_row += 16;
-+				dst = (uint8_t *)dst + 16;
-+			}
-+			memcpy(assume_aligned(dst, 16),
-+			       assume_aligned(tile_row, 16),
-+			       w & 15);
-+		}
-+		dst = (uint8_t *)dst + dst_stride;
-+	}
-+}
-+
-+static void
-+memcpy_between_tiled_x__swizzle_0__sse2(const void *src, void *dst, int bpp,
-+					int32_t src_stride, int32_t dst_stride,
-+					int16_t src_x, int16_t src_y,
-+					int16_t dst_x, int16_t dst_y,
-+					uint16_t width, uint16_t height)
-+{
-+	const unsigned tile_width = 512;
-+	const unsigned tile_height = 8;
-+	const unsigned tile_size = 4096;
-+
-+	const unsigned cpp = bpp / 8;
-+	const unsigned tile_pixels = tile_width / cpp;
-+	const unsigned tile_shift = ffs(tile_pixels) - 1;
-+	const unsigned tile_mask = tile_pixels - 1;
-+
-+	unsigned ox, lx;
-+
-+	DBG(("%s(bpp=%d): src=(%d, %d), dst=(%d, %d), size=%dx%d, pitch=%d/%d\n",
-+	     __FUNCTION__, bpp, src_x, src_y, dst_x, dst_y, width, height, src_stride, dst_stride));
-+	assert(src != dst);
-+
-+	width *= cpp;
-+	dst_stride *= tile_height;
-+	src_stride *= tile_height;
-+
-+	assert((dst_x & tile_mask) == (src_x & tile_mask));
-+	if (dst_x & tile_mask) {
-+		ox = (dst_x & tile_mask) * cpp;
-+		lx = min(tile_width - ox, width);
-+		assert(lx != 0);
-+	} else
-+		lx = 0;
-+
-+	if (dst_x)
-+		dst = (uint8_t *)dst + (dst_x >> tile_shift) * tile_size;
-+	if (src_x)
-+		src = (const uint8_t *)src + (src_x >> tile_shift) * tile_size;
-+
-+	while (height--) {
-+		const uint8_t *src_row;
-+		uint8_t *dst_row;
-+		unsigned w = width;
-+
-+		dst_row = dst;
-+		dst_row += dst_y / tile_height * dst_stride;
-+		dst_row += (dst_y & (tile_height-1)) * tile_width;
-+		dst_y++;
-+
-+		src_row = src;
-+		src_row += src_y / tile_height * src_stride;
-+		src_row += (src_y & (tile_height-1)) * tile_width;
-+		src_y++;
-+
-+		if (lx) {
-+			to_memcpy(dst_row + ox, src_row + ox, lx);
-+			dst_row += tile_size;
-+			src_row += tile_size;
-+			w -= lx;
-+		}
-+		while (w >= tile_width) {
-+			assert(((uintptr_t)dst_row & (tile_width - 1)) == 0);
-+			assert(((uintptr_t)src_row & (tile_width - 1)) == 0);
-+			to_sse128xN(assume_aligned(dst_row, tile_width),
-+				    assume_aligned(src_row, tile_width),
-+				    tile_width);
-+			dst_row += tile_size;
-+			src_row += tile_size;
-+			w -= tile_width;
-+		}
-+		if (w) {
-+			assert(((uintptr_t)dst_row & (tile_width - 1)) == 0);
-+			assert(((uintptr_t)src_row & (tile_width - 1)) == 0);
-+			to_memcpy(assume_aligned(dst_row, tile_width),
-+				  assume_aligned(src_row, tile_width),
-+				  w);
-+		}
-+	}
-+}
-+
-+#pragma GCC push_options
- #endif
- 
- fast void
-@@ -257,7 +753,8 @@ memcpy_to_tiled_x__swizzle_0(const void *src, void *dst, int bpp,
- 			if (dst_x & tile_mask) {
- 				const unsigned x = (dst_x & tile_mask) * cpp;
- 				const unsigned len = min(tile_width - x, w);
--				memcpy(tile_row + x, src, len);
-+				memcpy(assume_misaligned(tile_row + x, tile_width, x),
-+				       src, len);
- 
- 				tile_row += tile_size;
- 				src = (const uint8_t *)src + len;
-@@ -265,13 +762,13 @@ memcpy_to_tiled_x__swizzle_0(const void *src, void *dst, int bpp,
- 			}
- 		}
- 		while (w >= tile_width) {
--			memcpy(tile_row, src, tile_width);
--
-+			memcpy(assume_aligned(tile_row, tile_width),
-+			       src, tile_width);
- 			tile_row += tile_size;
- 			src = (const uint8_t *)src + tile_width;
- 			w -= tile_width;
- 		}
--		memcpy(tile_row, src, w);
-+		memcpy(assume_aligned(tile_row, tile_width), src, w);
- 		src = (const uint8_t *)src + src_stride + w;
- 		dst_y++;
- 	}
-@@ -313,7 +810,7 @@ memcpy_from_tiled_x__swizzle_0(const void *src, void *dst, int bpp,
- 			if (src_x & tile_mask) {
- 				const unsigned x = (src_x & tile_mask) * cpp;
- 				const unsigned len = min(tile_width - x, w);
--				memcpy(dst, tile_row + x, len);
-+				memcpy(dst, assume_misaligned(tile_row + x, tile_width, x), len);
- 
- 				tile_row += tile_size;
- 				dst = (uint8_t *)dst + len;
-@@ -321,440 +818,371 @@ memcpy_from_tiled_x__swizzle_0(const void *src, void *dst, int bpp,
- 			}
- 		}
- 		while (w >= tile_width) {
--			memcpy(dst, tile_row, tile_width);
-+			memcpy(dst,
-+			       assume_aligned(tile_row, tile_width),
-+			       tile_width);
- 
- 			tile_row += tile_size;
- 			dst = (uint8_t *)dst + tile_width;
- 			w -= tile_width;
- 		}
--		memcpy(dst, tile_row, w);
-+		memcpy(dst, assume_aligned(tile_row, tile_width), w);
- 		dst = (uint8_t *)dst + dst_stride + w;
- 		src_y++;
- 	}
- }
- 
--fast_memcpy static void
--memcpy_to_tiled_x__swizzle_9(const void *src, void *dst, int bpp,
--			     int32_t src_stride, int32_t dst_stride,
--			     int16_t src_x, int16_t src_y,
--			     int16_t dst_x, int16_t dst_y,
--			     uint16_t width, uint16_t height)
-+static fast_memcpy void
-+memcpy_between_tiled_x__swizzle_0(const void *src, void *dst, int bpp,
-+				  int32_t src_stride, int32_t dst_stride,
-+				  int16_t src_x, int16_t src_y,
-+				  int16_t dst_x, int16_t dst_y,
-+				  uint16_t width, uint16_t height)
- {
- 	const unsigned tile_width = 512;
- 	const unsigned tile_height = 8;
- 	const unsigned tile_size = 4096;
- 
- 	const unsigned cpp = bpp / 8;
--	const unsigned stride_tiles = dst_stride / tile_width;
--	const unsigned swizzle_pixels = 64 / cpp;
--	const unsigned tile_pixels = ffs(tile_width / cpp) - 1;
--	const unsigned tile_mask = (1 << tile_pixels) - 1;
--
--	unsigned x, y;
-+	const unsigned tile_pixels = tile_width / cpp;
-+	const unsigned tile_shift = ffs(tile_pixels) - 1;
-+	const unsigned tile_mask = tile_pixels - 1;
- 
- 	DBG(("%s(bpp=%d): src=(%d, %d), dst=(%d, %d), size=%dx%d, pitch=%d/%d\n",
- 	     __FUNCTION__, bpp, src_x, src_y, dst_x, dst_y, width, height, src_stride, dst_stride));
-+	assert(src != dst);
-+	assert((dst_x & tile_mask) == (src_x & tile_mask));
- 
--	src = (const uint8_t *)src + src_y * src_stride + src_x * cpp;
--
--	for (y = 0; y < height; ++y) {
--		const uint32_t dy = y + dst_y;
--		const uint32_t tile_row =
--			(dy / tile_height * stride_tiles * tile_size +
--			 (dy & (tile_height-1)) * tile_width);
--		const uint8_t *src_row = (const uint8_t *)src + src_stride * y;
--		uint32_t dx = dst_x, offset;
--
--		x = width * cpp;
--		if (dx & (swizzle_pixels - 1)) {
--			const uint32_t swizzle_bound_pixels = ALIGN(dx + 1, swizzle_pixels);
--			const uint32_t length = min(dst_x + width, swizzle_bound_pixels) - dx;
--			offset = tile_row +
--				(dx >> tile_pixels) * tile_size +
--				(dx & tile_mask) * cpp;
--			offset ^= (offset >> 3) & 64;
--
--			memcpy((char *)dst + offset, src_row, length * cpp);
--
--			src_row += length * cpp;
--			x -= length * cpp;
--			dx += length;
--		}
--		while (x >= 64) {
--			offset = tile_row +
--				(dx >> tile_pixels) * tile_size +
--				(dx & tile_mask) * cpp;
--			offset ^= (offset >> 3) & 64;
--
--			memcpy((char *)dst + offset, src_row, 64);
--
--			src_row += 64;
--			x -= 64;
--			dx += swizzle_pixels;
--		}
--		if (x) {
--			offset = tile_row +
--				(dx >> tile_pixels) * tile_size +
--				(dx & tile_mask) * cpp;
--			offset ^= (offset >> 3) & 64;
--			memcpy((char *)dst + offset, src_row, x);
--		}
--	}
--}
-+	while (height--) {
-+		unsigned w = width * cpp;
-+		uint8_t *dst_row = dst;
-+		const uint8_t *src_row = src;
- 
--fast_memcpy static void
--memcpy_from_tiled_x__swizzle_9(const void *src, void *dst, int bpp,
--			       int32_t src_stride, int32_t dst_stride,
--			       int16_t src_x, int16_t src_y,
--			       int16_t dst_x, int16_t dst_y,
--			       uint16_t width, uint16_t height)
--{
--	const unsigned tile_width = 512;
--	const unsigned tile_height = 8;
--	const unsigned tile_size = 4096;
-+		dst_row += dst_y / tile_height * dst_stride * tile_height;
-+		dst_row += (dst_y & (tile_height-1)) * tile_width;
-+		if (dst_x)
-+			dst_row += (dst_x >> tile_shift) * tile_size;
-+		dst_y++;
- 
--	const unsigned cpp = bpp / 8;
--	const unsigned stride_tiles = src_stride / tile_width;
--	const unsigned swizzle_pixels = 64 / cpp;
--	const unsigned tile_pixels = ffs(tile_width / cpp) - 1;
--	const unsigned tile_mask = (1 << tile_pixels) - 1;
-+		src_row += src_y / tile_height * src_stride * tile_height;
-+		src_row += (src_y & (tile_height-1)) * tile_width;
-+		if (src_x)
-+			src_row += (src_x >> tile_shift) * tile_size;
-+		src_y++;
- 
--	unsigned x, y;
-+		if (dst_x & tile_mask) {
-+			const unsigned x = (dst_x & tile_mask) * cpp;
-+			const unsigned len = min(tile_width - x, w);
- 
--	DBG(("%s(bpp=%d): src=(%d, %d), dst=(%d, %d), size=%dx%d, pitch=%d/%d\n",
--	     __FUNCTION__, bpp, src_x, src_y, dst_x, dst_y, width, height, src_stride, dst_stride));
-+			memcpy(assume_misaligned(dst_row + x, tile_width, x),
-+			       assume_misaligned(src_row + x, tile_width, x),
-+			       len);
- 
--	dst = (uint8_t *)dst + dst_y * dst_stride + dst_x * cpp;
--
--	for (y = 0; y < height; ++y) {
--		const uint32_t sy = y + src_y;
--		const uint32_t tile_row =
--			(sy / tile_height * stride_tiles * tile_size +
--			 (sy & (tile_height-1)) * tile_width);
--		uint8_t *dst_row = (uint8_t *)dst + dst_stride * y;
--		uint32_t sx = src_x, offset;
--
--		x = width * cpp;
--		if (sx & (swizzle_pixels - 1)) {
--			const uint32_t swizzle_bound_pixels = ALIGN(sx + 1, swizzle_pixels);
--			const uint32_t length = min(src_x + width, swizzle_bound_pixels) - sx;
--			offset = tile_row +
--				(sx >> tile_pixels) * tile_size +
--				(sx & tile_mask) * cpp;
--			offset ^= (offset >> 3) & 64;
--
--			memcpy(dst_row, (const char *)src + offset, length * cpp);
--
--			dst_row += length * cpp;
--			x -= length * cpp;
--			sx += length;
-+			dst_row += tile_size;
-+			src_row += tile_size;
-+			w -= len;
- 		}
--		while (x >= 64) {
--			offset = tile_row +
--				(sx >> tile_pixels) * tile_size +
--				(sx & tile_mask) * cpp;
--			offset ^= (offset >> 3) & 64;
- 
--			memcpy(dst_row, (const char *)src + offset, 64);
--
--			dst_row += 64;
--			x -= 64;
--			sx += swizzle_pixels;
--		}
--		if (x) {
--			offset = tile_row +
--				(sx >> tile_pixels) * tile_size +
--				(sx & tile_mask) * cpp;
--			offset ^= (offset >> 3) & 64;
--			memcpy(dst_row, (const char *)src + offset, x);
-+		while (w >= tile_width) {
-+			memcpy(assume_aligned(dst_row, tile_width),
-+			       assume_aligned(src_row, tile_width),
-+			       tile_width);
-+			dst_row += tile_size;
-+			src_row += tile_size;
-+			w -= tile_width;
- 		}
-+		memcpy(assume_aligned(dst_row, tile_width),
-+		       assume_aligned(src_row, tile_width),
-+		       w);
- 	}
- }
- 
--fast_memcpy static void
--memcpy_to_tiled_x__swizzle_9_10(const void *src, void *dst, int bpp,
--				int32_t src_stride, int32_t dst_stride,
--				int16_t src_x, int16_t src_y,
--				int16_t dst_x, int16_t dst_y,
--				uint16_t width, uint16_t height)
--{
--	const unsigned tile_width = 512;
--	const unsigned tile_height = 8;
--	const unsigned tile_size = 4096;
--
--	const unsigned cpp = bpp / 8;
--	const unsigned stride_tiles = dst_stride / tile_width;
--	const unsigned swizzle_pixels = 64 / cpp;
--	const unsigned tile_pixels = ffs(tile_width / cpp) - 1;
--	const unsigned tile_mask = (1 << tile_pixels) - 1;
-+#define memcpy_to_tiled_x(swizzle) \
-+fast_memcpy static void \
-+memcpy_to_tiled_x__##swizzle (const void *src, void *dst, int bpp, \
-+			      int32_t src_stride, int32_t dst_stride, \
-+			      int16_t src_x, int16_t src_y, \
-+			      int16_t dst_x, int16_t dst_y, \
-+			      uint16_t width, uint16_t height) \
-+{ \
-+	const unsigned tile_width = 512; \
-+	const unsigned tile_height = 8; \
-+	const unsigned tile_size = 4096; \
-+	const unsigned cpp = bpp / 8; \
-+	const unsigned stride_tiles = dst_stride / tile_width; \
-+	const unsigned swizzle_pixels = 64 / cpp; \
-+	const unsigned tile_pixels = ffs(tile_width / cpp) - 1; \
-+	const unsigned tile_mask = (1 << tile_pixels) - 1; \
-+	unsigned x, y; \
-+	DBG(("%s(bpp=%d): src=(%d, %d), dst=(%d, %d), size=%dx%d, pitch=%d/%d\n", \
-+	     __FUNCTION__, bpp, src_x, src_y, dst_x, dst_y, width, height, src_stride, dst_stride)); \
-+	src = (const uint8_t *)src + src_y * src_stride + src_x * cpp; \
-+	for (y = 0; y < height; ++y) { \
-+		const uint32_t dy = y + dst_y; \
-+		const uint32_t tile_row = \
-+			(dy / tile_height * stride_tiles * tile_size + \
-+			 (dy & (tile_height-1)) * tile_width); \
-+		const uint8_t *src_row = (const uint8_t *)src + src_stride * y; \
-+		uint32_t dx = dst_x; \
-+		x = width * cpp; \
-+		if (dx & (swizzle_pixels - 1)) { \
-+			const uint32_t swizzle_bound_pixels = ALIGN(dx + 1, swizzle_pixels); \
-+			const uint32_t length = min(dst_x + width, swizzle_bound_pixels) - dx; \
-+			uint32_t offset = \
-+				tile_row + \
-+				(dx >> tile_pixels) * tile_size + \
-+				(dx & tile_mask) * cpp; \
-+			memcpy((char *)dst + swizzle(offset), src_row, length * cpp); \
-+			src_row += length * cpp; \
-+			x -= length * cpp; \
-+			dx += length; \
-+		} \
-+		while (x >= 64) { \
-+			uint32_t offset = \
-+				tile_row + \
-+				(dx >> tile_pixels) * tile_size + \
-+				(dx & tile_mask) * cpp; \
-+			memcpy(assume_aligned((char *)dst+swizzle(offset),64), \
-+			       src_row, 64); \
-+			src_row += 64; \
-+			x -= 64; \
-+			dx += swizzle_pixels; \
-+		} \
-+		if (x) { \
-+			uint32_t offset = \
-+				tile_row + \
-+				(dx >> tile_pixels) * tile_size + \
-+				(dx & tile_mask) * cpp; \
-+			memcpy(assume_aligned((char *)dst + swizzle(offset), 64), src_row, x); \
-+		} \
-+	} \
-+}
- 
--	unsigned x, y;
-+#define memcpy_from_tiled_x(swizzle) \
-+fast_memcpy static void \
-+memcpy_from_tiled_x__##swizzle (const void *src, void *dst, int bpp, \
-+				int32_t src_stride, int32_t dst_stride, \
-+				int16_t src_x, int16_t src_y, \
-+				int16_t dst_x, int16_t dst_y, \
-+				uint16_t width, uint16_t height) \
-+{ \
-+	const unsigned tile_width = 512; \
-+	const unsigned tile_height = 8; \
-+	const unsigned tile_size = 4096; \
-+	const unsigned cpp = bpp / 8; \
-+	const unsigned stride_tiles = src_stride / tile_width; \
-+	const unsigned swizzle_pixels = 64 / cpp; \
-+	const unsigned tile_pixels = ffs(tile_width / cpp) - 1; \
-+	const unsigned tile_mask = (1 << tile_pixels) - 1; \
-+	unsigned x, y; \
-+	DBG(("%s(bpp=%d): src=(%d, %d), dst=(%d, %d), size=%dx%d, pitch=%d/%d\n", \
-+	     __FUNCTION__, bpp, src_x, src_y, dst_x, dst_y, width, height, src_stride, dst_stride)); \
-+	dst = (uint8_t *)dst + dst_y * dst_stride + dst_x * cpp; \
-+	for (y = 0; y < height; ++y) { \
-+		const uint32_t sy = y + src_y; \
-+		const uint32_t tile_row = \
-+			(sy / tile_height * stride_tiles * tile_size + \
-+			 (sy & (tile_height-1)) * tile_width); \
-+		uint8_t *dst_row = (uint8_t *)dst + dst_stride * y; \
-+		uint32_t sx = src_x; \
-+		x = width * cpp; \
-+		if (sx & (swizzle_pixels - 1)) { \
-+			const uint32_t swizzle_bound_pixels = ALIGN(sx + 1, swizzle_pixels); \
-+			const uint32_t length = min(src_x + width, swizzle_bound_pixels) - sx; \
-+			uint32_t offset = \
-+				tile_row + \
-+				(sx >> tile_pixels) * tile_size + \
-+				(sx & tile_mask) * cpp; \
-+			memcpy(dst_row, (const char *)src + swizzle(offset), length * cpp); \
-+			dst_row += length * cpp; \
-+			x -= length * cpp; \
-+			sx += length; \
-+		} \
-+		while (x >= 64) { \
-+			uint32_t offset = \
-+				tile_row + \
-+				(sx >> tile_pixels) * tile_size + \
-+				(sx & tile_mask) * cpp; \
-+			memcpy(dst_row, assume_aligned((const char *)src + swizzle(offset), 64), 64); \
-+			dst_row += 64; \
-+			x -= 64; \
-+			sx += swizzle_pixels; \
-+		} \
-+		if (x) { \
-+			uint32_t offset = \
-+				tile_row + \
-+				(sx >> tile_pixels) * tile_size + \
-+				(sx & tile_mask) * cpp; \
-+			memcpy(dst_row, assume_aligned((const char *)src + swizzle(offset), 64), x); \
-+		} \
-+	} \
-+}
- 
--	DBG(("%s(bpp=%d): src=(%d, %d), dst=(%d, %d), size=%dx%d, pitch=%d/%d\n",
--	     __FUNCTION__, bpp, src_x, src_y, dst_x, dst_y, width, height, src_stride, dst_stride));
-+#define swizzle_9(X) ((X) ^ (((X) >> 3) & 64))
-+memcpy_to_tiled_x(swizzle_9)
-+memcpy_from_tiled_x(swizzle_9)
-+#undef swizzle_9
- 
--	src = (const uint8_t *)src + src_y * src_stride + src_x * cpp;
--
--	for (y = 0; y < height; ++y) {
--		const uint32_t dy = y + dst_y;
--		const uint32_t tile_row =
--			(dy / tile_height * stride_tiles * tile_size +
--			 (dy & (tile_height-1)) * tile_width);
--		const uint8_t *src_row = (const uint8_t *)src + src_stride * y;
--		uint32_t dx = dst_x, offset;
--
--		x = width * cpp;
--		if (dx & (swizzle_pixels - 1)) {
--			const uint32_t swizzle_bound_pixels = ALIGN(dx + 1, swizzle_pixels);
--			const uint32_t length = min(dst_x + width, swizzle_bound_pixels) - dx;
--			offset = tile_row +
--				(dx >> tile_pixels) * tile_size +
--				(dx & tile_mask) * cpp;
--			offset ^= ((offset ^ (offset >> 1)) >> 3) & 64;
--
--			memcpy((char *)dst + offset, src_row, length * cpp);
--
--			src_row += length * cpp;
--			x -= length * cpp;
--			dx += length;
--		}
--		while (x >= 64) {
--			offset = tile_row +
--				(dx >> tile_pixels) * tile_size +
--				(dx & tile_mask) * cpp;
--			offset ^= ((offset ^ (offset >> 1)) >> 3) & 64;
-+#define swizzle_9_10(X) ((X) ^ ((((X) ^ ((X) >> 1)) >> 3) & 64))
-+memcpy_to_tiled_x(swizzle_9_10)
-+memcpy_from_tiled_x(swizzle_9_10)
-+#undef swizzle_9_10
- 
--			memcpy((char *)dst + offset, src_row, 64);
-+#define swizzle_9_11(X) ((X) ^ ((((X) ^ ((X) >> 2)) >> 3) & 64))
-+memcpy_to_tiled_x(swizzle_9_11)
-+memcpy_from_tiled_x(swizzle_9_11)
-+#undef swizzle_9_11
- 
--			src_row += 64;
--			x -= 64;
--			dx += swizzle_pixels;
--		}
--		if (x) {
--			offset = tile_row +
--				(dx >> tile_pixels) * tile_size +
--				(dx & tile_mask) * cpp;
--			offset ^= ((offset ^ (offset >> 1)) >> 3) & 64;
--			memcpy((char *)dst + offset, src_row, x);
--		}
--	}
--}
-+#define swizzle_9_10_11(X) ((X) ^ ((((X) ^ ((X) >> 1) ^ ((X) >> 2)) >> 3) & 64))
-+memcpy_to_tiled_x(swizzle_9_10_11)
-+memcpy_from_tiled_x(swizzle_9_10_11)
-+#undef swizzle_9_10_11
- 
--fast_memcpy static void
--memcpy_from_tiled_x__swizzle_9_10(const void *src, void *dst, int bpp,
--				  int32_t src_stride, int32_t dst_stride,
--				  int16_t src_x, int16_t src_y,
--				  int16_t dst_x, int16_t dst_y,
--				  uint16_t width, uint16_t height)
-+static fast_memcpy void
-+memcpy_to_tiled_x__gen2(const void *src, void *dst, int bpp,
-+			int32_t src_stride, int32_t dst_stride,
-+			int16_t src_x, int16_t src_y,
-+			int16_t dst_x, int16_t dst_y,
-+			uint16_t width, uint16_t height)
- {
--	const unsigned tile_width = 512;
--	const unsigned tile_height = 8;
--	const unsigned tile_size = 4096;
-+	const unsigned tile_width = 128;
-+	const unsigned tile_height = 16;
-+	const unsigned tile_size = 2048;
- 
- 	const unsigned cpp = bpp / 8;
--	const unsigned stride_tiles = src_stride / tile_width;
--	const unsigned swizzle_pixels = 64 / cpp;
--	const unsigned tile_pixels = ffs(tile_width / cpp) - 1;
--	const unsigned tile_mask = (1 << tile_pixels) - 1;
--
--	unsigned x, y;
-+	const unsigned tile_pixels = tile_width / cpp;
-+	const unsigned tile_shift = ffs(tile_pixels) - 1;
-+	const unsigned tile_mask = tile_pixels - 1;
- 
- 	DBG(("%s(bpp=%d): src=(%d, %d), dst=(%d, %d), size=%dx%d, pitch=%d/%d\n",
- 	     __FUNCTION__, bpp, src_x, src_y, dst_x, dst_y, width, height, src_stride, dst_stride));
-+	assert(src != dst);
- 
--	dst = (uint8_t *)dst + dst_y * dst_stride + dst_x * cpp;
--
--	for (y = 0; y < height; ++y) {
--		const uint32_t sy = y + src_y;
--		const uint32_t tile_row =
--			(sy / tile_height * stride_tiles * tile_size +
--			 (sy & (tile_height-1)) * tile_width);
--		uint8_t *dst_row = (uint8_t *)dst + dst_stride * y;
--		uint32_t sx = src_x, offset;
--
--		x = width * cpp;
--		if (sx & (swizzle_pixels - 1)) {
--			const uint32_t swizzle_bound_pixels = ALIGN(sx + 1, swizzle_pixels);
--			const uint32_t length = min(src_x + width, swizzle_bound_pixels) - sx;
--			offset = tile_row +
--				(sx >> tile_pixels) * tile_size +
--				(sx & tile_mask) * cpp;
--			offset ^= ((offset ^ (offset >> 1)) >> 3) & 64;
--
--			memcpy(dst_row, (const char *)src + offset, length * cpp);
--
--			dst_row += length * cpp;
--			x -= length * cpp;
--			sx += length;
--		}
--		while (x >= 64) {
--			offset = tile_row +
--				(sx >> tile_pixels) * tile_size +
--				(sx & tile_mask) * cpp;
--			offset ^= ((offset ^ (offset >> 1)) >> 3) & 64;
--
--			memcpy(dst_row, (const char *)src + offset, 64);
--
--			dst_row += 64;
--			x -= 64;
--			sx += swizzle_pixels;
--		}
--		if (x) {
--			offset = tile_row +
--				(sx >> tile_pixels) * tile_size +
--				(sx & tile_mask) * cpp;
--			offset ^= ((offset ^ (offset >> 1)) >> 3) & 64;
--			memcpy(dst_row, (const char *)src + offset, x);
--		}
--	}
--}
--
--fast_memcpy static void
--memcpy_to_tiled_x__swizzle_9_11(const void *src, void *dst, int bpp,
--				int32_t src_stride, int32_t dst_stride,
--				int16_t src_x, int16_t src_y,
--				int16_t dst_x, int16_t dst_y,
--				uint16_t width, uint16_t height)
--{
--	const unsigned tile_width = 512;
--	const unsigned tile_height = 8;
--	const unsigned tile_size = 4096;
--
--	const unsigned cpp = bpp / 8;
--	const unsigned stride_tiles = dst_stride / tile_width;
--	const unsigned swizzle_pixels = 64 / cpp;
--	const unsigned tile_pixels = ffs(tile_width / cpp) - 1;
--	const unsigned tile_mask = (1 << tile_pixels) - 1;
-+	if (src_x | src_y)
-+		src = (const uint8_t *)src + src_y * src_stride + src_x * cpp;
-+	assert(src_stride >= width * cpp);
-+	src_stride -= width * cpp;
- 
--	unsigned x, y;
-+	while (height--) {
-+		unsigned w = width * cpp;
-+		uint8_t *tile_row = dst;
- 
--	DBG(("%s(bpp=%d): src=(%d, %d), dst=(%d, %d), size=%dx%d, pitch=%d/%d\n",
--	     __FUNCTION__, bpp, src_x, src_y, dst_x, dst_y, width, height, src_stride, dst_stride));
-+		tile_row += dst_y / tile_height * dst_stride * tile_height;
-+		tile_row += (dst_y & (tile_height-1)) * tile_width;
-+		if (dst_x) {
-+			tile_row += (dst_x >> tile_shift) * tile_size;
-+			if (dst_x & tile_mask) {
-+				const unsigned x = (dst_x & tile_mask) * cpp;
-+				const unsigned len = min(tile_width - x, w);
-+				memcpy(assume_misaligned(tile_row + x, tile_width, x), src, len);
- 
--	src = (const uint8_t *)src + src_y * src_stride + src_x * cpp;
--
--	for (y = 0; y < height; ++y) {
--		const uint32_t dy = y + dst_y;
--		const uint32_t tile_row =
--			(dy / tile_height * stride_tiles * tile_size +
--			 (dy & (tile_height-1)) * tile_width);
--		const uint8_t *src_row = (const uint8_t *)src + src_stride * y;
--		uint32_t dx = dst_x, offset;
--
--		x = width * cpp;
--		if (dx & (swizzle_pixels - 1)) {
--			const uint32_t swizzle_bound_pixels = ALIGN(dx + 1, swizzle_pixels);
--			const uint32_t length = min(dst_x + width, swizzle_bound_pixels) - dx;
--			offset = tile_row +
--				(dx >> tile_pixels) * tile_size +
--				(dx & tile_mask) * cpp;
--			offset ^= ((offset ^ (offset >> 2)) >> 3) & 64;
--			memcpy((char *)dst + offset, src_row, length * cpp);
--
--			src_row += length * cpp;
--			x -= length * cpp;
--			dx += length;
-+				tile_row += tile_size;
-+				src = (const uint8_t *)src + len;
-+				w -= len;
-+			}
- 		}
--		while (x >= 64) {
--			offset = tile_row +
--				(dx >> tile_pixels) * tile_size +
--				(dx & tile_mask) * cpp;
--			offset ^= ((offset ^ (offset >> 2)) >> 3) & 64;
--
--			memcpy((char *)dst + offset, src_row, 64);
-+		while (w >= tile_width) {
-+			memcpy(assume_aligned(tile_row, tile_width),
-+			       src, tile_width);
- 
--			src_row += 64;
--			x -= 64;
--			dx += swizzle_pixels;
--		}
--		if (x) {
--			offset = tile_row +
--				(dx >> tile_pixels) * tile_size +
--				(dx & tile_mask) * cpp;
--			offset ^= ((offset ^ (offset >> 2)) >> 3) & 64;
--			memcpy((char *)dst + offset, src_row, x);
-+			tile_row += tile_size;
-+			src = (const uint8_t *)src + tile_width;
-+			w -= tile_width;
- 		}
-+		memcpy(assume_aligned(tile_row, tile_width), src, w);
-+		src = (const uint8_t *)src + src_stride + w;
-+		dst_y++;
- 	}
- }
- 
--fast_memcpy static void
--memcpy_from_tiled_x__swizzle_9_11(const void *src, void *dst, int bpp,
--				  int32_t src_stride, int32_t dst_stride,
--				  int16_t src_x, int16_t src_y,
--				  int16_t dst_x, int16_t dst_y,
--				  uint16_t width, uint16_t height)
-+static fast_memcpy void
-+memcpy_from_tiled_x__gen2(const void *src, void *dst, int bpp,
-+			  int32_t src_stride, int32_t dst_stride,
-+			  int16_t src_x, int16_t src_y,
-+			  int16_t dst_x, int16_t dst_y,
-+			  uint16_t width, uint16_t height)
- {
--	const unsigned tile_width = 512;
--	const unsigned tile_height = 8;
--	const unsigned tile_size = 4096;
-+	const unsigned tile_width = 128;
-+	const unsigned tile_height = 16;
-+	const unsigned tile_size = 2048;
- 
- 	const unsigned cpp = bpp / 8;
--	const unsigned stride_tiles = src_stride / tile_width;
--	const unsigned swizzle_pixels = 64 / cpp;
--	const unsigned tile_pixels = ffs(tile_width / cpp) - 1;
--	const unsigned tile_mask = (1 << tile_pixels) - 1;
--
--	unsigned x, y;
-+	const unsigned tile_pixels = tile_width / cpp;
-+	const unsigned tile_shift = ffs(tile_pixels) - 1;
-+	const unsigned tile_mask = tile_pixels - 1;
- 
- 	DBG(("%s(bpp=%d): src=(%d, %d), dst=(%d, %d), size=%dx%d, pitch=%d/%d\n",
- 	     __FUNCTION__, bpp, src_x, src_y, dst_x, dst_y, width, height, src_stride, dst_stride));
-+	assert(src != dst);
- 
--	dst = (uint8_t *)dst + dst_y * dst_stride + dst_x * cpp;
--
--	for (y = 0; y < height; ++y) {
--		const uint32_t sy = y + src_y;
--		const uint32_t tile_row =
--			(sy / tile_height * stride_tiles * tile_size +
--			 (sy & (tile_height-1)) * tile_width);
--		uint8_t *dst_row = (uint8_t *)dst + dst_stride * y;
--		uint32_t sx = src_x, offset;
--
--		x = width * cpp;
--		if (sx & (swizzle_pixels - 1)) {
--			const uint32_t swizzle_bound_pixels = ALIGN(sx + 1, swizzle_pixels);
--			const uint32_t length = min(src_x + width, swizzle_bound_pixels) - sx;
--			offset = tile_row +
--				(sx >> tile_pixels) * tile_size +
--				(sx & tile_mask) * cpp;
--			offset ^= ((offset ^ (offset >> 2)) >> 3) & 64;
--			memcpy(dst_row, (const char *)src + offset, length * cpp);
--
--			dst_row += length * cpp;
--			x -= length * cpp;
--			sx += length;
--		}
--		while (x >= 64) {
--			offset = tile_row +
--				(sx >> tile_pixels) * tile_size +
--				(sx & tile_mask) * cpp;
--			offset ^= ((offset ^ (offset >> 2)) >> 3) & 64;
-+	if (dst_x | dst_y)
-+		dst = (uint8_t *)dst + dst_y * dst_stride + dst_x * cpp;
-+	assert(dst_stride >= width * cpp);
-+	dst_stride -= width * cpp;
-+
-+	while (height--) {
-+		unsigned w = width * cpp;
-+		const uint8_t *tile_row = src;
- 
--			memcpy(dst_row, (const char *)src + offset, 64);
-+		tile_row += src_y / tile_height * src_stride * tile_height;
-+		tile_row += (src_y & (tile_height-1)) * tile_width;
-+		if (src_x) {
-+			tile_row += (src_x >> tile_shift) * tile_size;
-+			if (src_x & tile_mask) {
-+				const unsigned x = (src_x & tile_mask) * cpp;
-+				const unsigned len = min(tile_width - x, w);
-+				memcpy(dst, assume_misaligned(tile_row + x, tile_width, x), len);
- 
--			dst_row += 64;
--			x -= 64;
--			sx += swizzle_pixels;
-+				tile_row += tile_size;
-+				dst = (uint8_t *)dst + len;
-+				w -= len;
-+			}
- 		}
--		if (x) {
--			offset = tile_row +
--				(sx >> tile_pixels) * tile_size +
--				(sx & tile_mask) * cpp;
--			offset ^= ((offset ^ (offset >> 2)) >> 3) & 64;
--			memcpy(dst_row, (const char *)src + offset, x);
-+		while (w >= tile_width) {
-+			memcpy(dst,
-+			       assume_aligned(tile_row, tile_width),
-+			       tile_width);
-+
-+			tile_row += tile_size;
-+			dst = (uint8_t *)dst + tile_width;
-+			w -= tile_width;
- 		}
-+		memcpy(dst, assume_aligned(tile_row, tile_width), w);
-+		dst = (uint8_t *)dst + dst_stride + w;
-+		src_y++;
- 	}
- }
- 
--void choose_memcpy_tiled_x(struct kgem *kgem, int swizzling)
-+void choose_memcpy_tiled_x(struct kgem *kgem, int swizzling, unsigned cpu)
- {
-+	if (kgem->gen < 030) {
-+		if (swizzling == I915_BIT_6_SWIZZLE_NONE) {
-+			DBG(("%s: gen2, no swizzling\n", __FUNCTION__));
-+			kgem->memcpy_to_tiled_x = memcpy_to_tiled_x__gen2;
-+			kgem->memcpy_from_tiled_x = memcpy_from_tiled_x__gen2;
-+		} else
-+			DBG(("%s: no detiling with swizzle functions for gen2\n", __FUNCTION__));
-+		return;
-+	}
-+
- 	switch (swizzling) {
- 	default:
- 		DBG(("%s: unknown swizzling, %d\n", __FUNCTION__, swizzling));
- 		break;
- 	case I915_BIT_6_SWIZZLE_NONE:
- 		DBG(("%s: no swizzling\n", __FUNCTION__));
--		kgem->memcpy_to_tiled_x = memcpy_to_tiled_x__swizzle_0;
--		kgem->memcpy_from_tiled_x = memcpy_from_tiled_x__swizzle_0;
-+#if defined(sse2)
-+		if (cpu & SSE2) {
-+			kgem->memcpy_to_tiled_x = memcpy_to_tiled_x__swizzle_0__sse2;
-+			kgem->memcpy_from_tiled_x = memcpy_from_tiled_x__swizzle_0__sse2;
-+			kgem->memcpy_between_tiled_x = memcpy_between_tiled_x__swizzle_0__sse2;
-+		} else
-+#endif
-+	       	{
-+			kgem->memcpy_to_tiled_x = memcpy_to_tiled_x__swizzle_0;
-+			kgem->memcpy_from_tiled_x = memcpy_from_tiled_x__swizzle_0;
-+			kgem->memcpy_between_tiled_x = memcpy_between_tiled_x__swizzle_0;
-+		}
- 		break;
- 	case I915_BIT_6_SWIZZLE_9:
- 		DBG(("%s: 6^9 swizzling\n", __FUNCTION__));
-@@ -771,6 +1199,11 @@ void choose_memcpy_tiled_x(struct kgem *kgem, int swizzling)
- 		kgem->memcpy_to_tiled_x = memcpy_to_tiled_x__swizzle_9_11;
- 		kgem->memcpy_from_tiled_x = memcpy_from_tiled_x__swizzle_9_11;
- 		break;
-+	case I915_BIT_6_SWIZZLE_9_10_11:
-+		DBG(("%s: 6^9^10^11 swizzling\n", __FUNCTION__));
-+		kgem->memcpy_to_tiled_x = memcpy_to_tiled_x__swizzle_9_10_11;
-+		kgem->memcpy_from_tiled_x = memcpy_from_tiled_x__swizzle_9_10_11;
-+		break;
- 	}
- }
- 
-@@ -995,7 +1428,7 @@ memcpy_xor(const void *src, void *dst, int bpp,
- 				height = 1;
- 			}
- 
--#if USE_SSE2
-+#if defined(sse2) && __x86_64__
- 			if (have_sse2()) {
- 				do {
- 					uint32_t *d = (uint32_t *)dst_bytes;
-@@ -1118,3 +1551,241 @@ memcpy_xor(const void *src, void *dst, int bpp,
- 		}
- 	}
- }
-+
-+#define BILINEAR_INTERPOLATION_BITS 4
-+static inline int
-+bilinear_weight(pixman_fixed_t x)
-+{
-+	return (x >> (16 - BILINEAR_INTERPOLATION_BITS)) &
-+		((1 << BILINEAR_INTERPOLATION_BITS) - 1);
-+}
-+
-+#if BILINEAR_INTERPOLATION_BITS <= 4
-+/* Inspired by Filter_32_opaque from Skia */
-+static inline uint32_t
-+bilinear_interpolation(uint32_t tl, uint32_t tr,
-+		       uint32_t bl, uint32_t br,
-+		       int distx, int disty)
-+{
-+	int distxy, distxiy, distixy, distixiy;
-+	uint32_t lo, hi;
-+
-+	distx <<= (4 - BILINEAR_INTERPOLATION_BITS);
-+	disty <<= (4 - BILINEAR_INTERPOLATION_BITS);
-+
-+	distxy = distx * disty;
-+	distxiy = (distx << 4) - distxy;	/* distx * (16 - disty) */
-+	distixy = (disty << 4) - distxy;	/* disty * (16 - distx) */
-+	distixiy =
-+		16 * 16 - (disty << 4) -
-+		(distx << 4) + distxy; /* (16 - distx) * (16 - disty) */
-+
-+	lo = (tl & 0xff00ff) * distixiy;
-+	hi = ((tl >> 8) & 0xff00ff) * distixiy;
-+
-+	lo += (tr & 0xff00ff) * distxiy;
-+	hi += ((tr >> 8) & 0xff00ff) * distxiy;
-+
-+	lo += (bl & 0xff00ff) * distixy;
-+	hi += ((bl >> 8) & 0xff00ff) * distixy;
-+
-+	lo += (br & 0xff00ff) * distxy;
-+	hi += ((br >> 8) & 0xff00ff) * distxy;
-+
-+	return ((lo >> 8) & 0xff00ff) | (hi & ~0xff00ff);
-+}
-+#elif SIZEOF_LONG > 4
-+static inline uint32_t
-+bilinear_interpolation(uint32_t tl, uint32_t tr,
-+		       uint32_t bl, uint32_t br,
-+		       int distx, int disty)
-+{
-+	uint64_t distxy, distxiy, distixy, distixiy;
-+	uint64_t tl64, tr64, bl64, br64;
-+	uint64_t f, r;
-+
-+	distx <<= (8 - BILINEAR_INTERPOLATION_BITS);
-+	disty <<= (8 - BILINEAR_INTERPOLATION_BITS);
-+
-+	distxy = distx * disty;
-+	distxiy = distx * (256 - disty);
-+	distixy = (256 - distx) * disty;
-+	distixiy = (256 - distx) * (256 - disty);
-+
-+	/* Alpha and Blue */
-+	tl64 = tl & 0xff0000ff;
-+	tr64 = tr & 0xff0000ff;
-+	bl64 = bl & 0xff0000ff;
-+	br64 = br & 0xff0000ff;
-+
-+	f = tl64 * distixiy + tr64 * distxiy + bl64 * distixy + br64 * distxy;
-+	r = f & 0x0000ff0000ff0000ull;
-+
-+	/* Red and Green */
-+	tl64 = tl;
-+	tl64 = ((tl64 << 16) & 0x000000ff00000000ull) | (tl64 & 0x0000ff00ull);
-+
-+	tr64 = tr;
-+	tr64 = ((tr64 << 16) & 0x000000ff00000000ull) | (tr64 & 0x0000ff00ull);
-+
-+	bl64 = bl;
-+	bl64 = ((bl64 << 16) & 0x000000ff00000000ull) | (bl64 & 0x0000ff00ull);
-+
-+	br64 = br;
-+	br64 = ((br64 << 16) & 0x000000ff00000000ull) | (br64 & 0x0000ff00ull);
-+
-+	f = tl64 * distixiy + tr64 * distxiy + bl64 * distixy + br64 * distxy;
-+	r |= ((f >> 16) & 0x000000ff00000000ull) | (f & 0xff000000ull);
-+
-+	return (uint32_t)(r >> 16);
-+}
-+#else
-+static inline uint32_t
-+bilinear_interpolation(uint32_t tl, uint32_t tr,
-+		       uint32_t bl, uint32_t br,
-+		       int distx, int disty)
-+{
-+	int distxy, distxiy, distixy, distixiy;
-+	uint32_t f, r;
-+
-+	distx <<= (8 - BILINEAR_INTERPOLATION_BITS);
-+	disty <<= (8 - BILINEAR_INTERPOLATION_BITS);
-+
-+	distxy = distx * disty;
-+	distxiy = (distx << 8) - distxy;	/* distx * (256 - disty) */
-+	distixy = (disty << 8) - distxy;	/* disty * (256 - distx) */
-+	distixiy =
-+		256 * 256 - (disty << 8) -
-+		(distx << 8) + distxy;		/* (256 - distx) * (256 - disty) */
-+
-+	/* Blue */
-+	r = ((tl & 0x000000ff) * distixiy + (tr & 0x000000ff) * distxiy +
-+	     (bl & 0x000000ff) * distixy  + (br & 0x000000ff) * distxy);
-+
-+	/* Green */
-+	f = ((tl & 0x0000ff00) * distixiy + (tr & 0x0000ff00) * distxiy +
-+	     (bl & 0x0000ff00) * distixy  + (br & 0x0000ff00) * distxy);
-+	r |= f & 0xff000000;
-+
-+	tl >>= 16;
-+	tr >>= 16;
-+	bl >>= 16;
-+	br >>= 16;
-+	r >>= 16;
-+
-+	/* Red */
-+	f = ((tl & 0x000000ff) * distixiy + (tr & 0x000000ff) * distxiy +
-+	     (bl & 0x000000ff) * distixy  + (br & 0x000000ff) * distxy);
-+	r |= f & 0x00ff0000;
-+
-+	/* Alpha */
-+	f = ((tl & 0x0000ff00) * distixiy + (tr & 0x0000ff00) * distxiy +
-+	     (bl & 0x0000ff00) * distixy  + (br & 0x0000ff00) * distxy);
-+	r |= f & 0xff000000;
-+
-+	return r;
-+}
-+#endif
-+
-+static inline uint32_t convert_pixel(const uint8_t *p, int x)
-+{
-+	return ((uint32_t *)p)[x];
-+}
-+
-+fast void
-+affine_blt(const void *src, void *dst, int bpp,
-+	   int16_t src_x, int16_t src_y,
-+	   int16_t src_width, int16_t src_height,
-+	   int32_t src_stride,
-+	   int16_t dst_x, int16_t dst_y,
-+	   uint16_t dst_width, uint16_t dst_height,
-+	   int32_t dst_stride,
-+	   const struct pixman_f_transform *t)
-+{
-+	static const uint8_t zero[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-+	const pixman_fixed_t ux = pixman_double_to_fixed(t->m[0][0]);
-+	const pixman_fixed_t uy = pixman_double_to_fixed(t->m[1][0]);
-+	int i, j;
-+
-+	assert(bpp == 32);
-+
-+	for (j = 0; j < dst_height; j++) {
-+		pixman_fixed_t x, y;
-+		struct pixman_f_vector v;
-+		uint32_t *b;
-+
-+		/* reference point is the center of the pixel */
-+		v.v[0] = dst_x + 0.5;
-+		v.v[1] = dst_y + j + 0.5;
-+		v.v[2] = 1.0;
-+
-+		pixman_f_transform_point_3d(t, &v);
-+
-+		x = pixman_double_to_fixed(v.v[0]);
-+		x += pixman_int_to_fixed(src_x - dst_x);
-+		y = pixman_double_to_fixed(v.v[1]);
-+		y +=  pixman_int_to_fixed(src_y - dst_y);
-+
-+		b = (uint32_t*)((uint8_t *)dst + (dst_y + j) * dst_stride + dst_x * bpp / 8);
-+		for (i = 0; i < dst_width; i++) {
-+			const uint8_t *row1;
-+			const uint8_t *row2;
-+			int x1, y1, x2, y2;
-+			uint32_t tl, tr, bl, br;
-+			int32_t fx, fy;
-+
-+			x1 = x - pixman_fixed_1/2;
-+			y1 = y - pixman_fixed_1/2;
-+
-+			fx = bilinear_weight(x1);
-+			fy = bilinear_weight(y1);
-+
-+			x1 = pixman_fixed_to_int(x1);
-+			x2 = x1 + 1;
-+			y1 = pixman_fixed_to_int(y1);
-+			y2 = y1 + 1;
-+
-+			if (x1 >= src_width  || x2 < 0 ||
-+			    y1 >= src_height || y2 < 0) {
-+				b[i] = 0;
-+				goto next;
-+			}
-+
-+			if (y2 == 0) {
-+				row1 = zero;
-+			} else {
-+				row1 = (uint8_t *)src + src_stride * y1;
-+				row1 += bpp / 8 * x1;
-+			}
-+
-+			if (y1 == src_height - 1) {
-+				row2 = zero;
-+			} else {
-+				row2 = (uint8_t *)src + src_stride * y2;
-+				row2 += bpp / 8 * x1;
-+			}
-+
-+			if (x2 == 0) {
-+				tl = 0;
-+				bl = 0;
-+			} else {
-+				tl = convert_pixel(row1, 0);
-+				bl = convert_pixel(row2, 0);
-+			}
-+
-+			if (x1 == src_width - 1) {
-+				tr = 0;
-+				br = 0;
-+			} else {
-+				tr = convert_pixel(row1, 1);
-+				br = convert_pixel(row2, 1);
-+			}
-+
-+			b[i] = bilinear_interpolation(tl, tr, bl, br, fx, fy);
-+
-+next:
-+			x += ux;
-+			y += uy;
-+		}
-+	}
-+}
-diff --git a/src/sna/brw/brw_eu_emit.c b/src/sna/brw/brw_eu_emit.c
-index 00c984d9..154f939a 100644
---- a/src/sna/brw/brw_eu_emit.c
-+++ b/src/sna/brw/brw_eu_emit.c
-@@ -178,7 +178,7 @@ validate_reg(struct brw_instruction *insn, struct brw_reg reg)
- 	}
- 
- 	if (reg.file == BRW_ARCHITECTURE_REGISTER_FILE &&
--	    reg.file == BRW_ARF_NULL)
-+	    reg.nr == BRW_ARF_NULL)
- 		return;
- 
- 	assert(reg.hstride >= 0 && reg.hstride < ARRAY_SIZE(hstride_for_reg));
-@@ -700,7 +700,7 @@ push_if_stack(struct brw_compile *p, struct brw_instruction *inst)
-  *
-  * When the matching 'else' instruction is reached (presumably by
-  * countdown of the instruction count patched in by our ELSE/ENDIF
-- * functions), the relevent flags are inverted.
-+ * functions), the relevant flags are inverted.
-  *
-  * When the matching 'endif' instruction is reached, the flags are
-  * popped off.  If the stack is now empty, normal execution resumes.
-diff --git a/src/sna/compiler.h b/src/sna/compiler.h
-index ff412179..0f3775ec 100644
---- a/src/sna/compiler.h
-+++ b/src/sna/compiler.h
-@@ -39,6 +39,7 @@
- #define pure __attribute__((pure))
- #define tightly_packed __attribute__((__packed__))
- #define flatten __attribute__((flatten))
-+#define nonnull __attribute__((nonnull))
- #define page_aligned __attribute__((aligned(4096)))
- #else
- #define likely(expr) (expr)
-@@ -51,18 +52,15 @@
- #define pure
- #define tighly_packed
- #define flatten
-+#define nonnull
- #define page_aligned
- #endif
- 
- #define HAS_GCC(major, minor) defined(__GNUC__) && (__GNUC__ > (major) || __GNUC__ == (major) && __GNUC_MINOR__ >= (minor))
- 
- #if HAS_GCC(4, 5)
--#define sse2 __attribute__((target("sse2,fpmath=sse")))
--#define sse4_2 __attribute__((target("sse4.2,sse2,fpmath=sse")))
--#endif
--
--#if HAS_GCC(4, 7)
--#define avx2 __attribute__((target("avx2,sse4.2,sse2,fpmath=sse")))
-+#define sse2 fast __attribute__((target("sse2,fpmath=sse")))
-+#define sse4_2 fast __attribute__((target("sse4.2,sse2,fpmath=sse")))
- #endif
- 
- #if HAS_GCC(4, 6) && defined(__OPTIMIZE__)
-@@ -71,10 +69,17 @@
- #define fast
- #endif
- 
--#if HAS_GCC(4, 6) && defined(__OPTIMIZE__)
--#define fast_memcpy __attribute__((optimize("Ofast"))) __attribute__((target("inline-all-stringops")))
--#elif HAS_GCC(4, 5) && defined(__OPTIMIZE__)
--#define fast_memcpy __attribute__((target("inline-all-stringops")))
-+#if HAS_GCC(4, 7)
-+#define avx2 fast __attribute__((target("avx2,avx,sse4.2,sse2,fpmath=sse")))
-+#define assume_aligned(ptr, align) __builtin_assume_aligned((ptr), (align))
-+#define assume_misaligned(ptr, align, offset) __builtin_assume_aligned((ptr), (align), (offset))
-+#else
-+#define assume_aligned(ptr, align) (ptr)
-+#define assume_misaligned(ptr, align, offset) (ptr)
-+#endif
-+
-+#if HAS_GCC(4, 5) && defined(__OPTIMIZE__)
-+#define fast_memcpy fast __attribute__((target("inline-all-stringops")))
- #else
- #define fast_memcpy
- #endif
-diff --git a/src/sna/fb/fb.h b/src/sna/fb/fb.h
-index 8bf9008a..90431747 100644
---- a/src/sna/fb/fb.h
-+++ b/src/sna/fb/fb.h
-@@ -24,10 +24,6 @@
- #ifndef FB_H
- #define FB_H
- 
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
- #include <xorg-server.h>
- #include <servermd.h>
- #include <gcstruct.h>
-diff --git a/src/sna/fb/fbimage.c b/src/sna/fb/fbimage.c
-index 5af23890..cc81c85b 100644
---- a/src/sna/fb/fbimage.c
-+++ b/src/sna/fb/fbimage.c
-@@ -229,13 +229,19 @@ fbGetImage(DrawablePtr drawable,
- 		FbBits pm;
- 
- 		pm = fbReplicatePixel(planeMask, srcBpp);
-+
- 		dstStride = PixmapBytePad(w, drawable->depth);
--		if (pm != FB_ALLONES)
--			memset(d, 0, dstStride * h);
- 		dstStride /= sizeof(FbStip);
-+
- 		fbBltStip((FbStip *)(src + (y + srcYoff) * srcStride), srcStride,
- 			  (x + srcXoff) * srcBpp,
--			  dst, dstStride, 0, w * srcBpp, h, GXcopy, pm, srcBpp);
-+			  dst, dstStride, 0, w * srcBpp, h, GXcopy, FB_ALLONES, srcBpp);
-+
-+		if (pm != FB_ALLONES) {
-+			int i = dstStride * h;
-+			while (i--)
-+				*dst++ &= pm;
-+		}
- 	} else {
- 		dstStride = BitmapBytePad(w) / sizeof(FbStip);
- 		fbBltPlane(src + (y + srcYoff) * srcStride,
-diff --git a/src/sna/fb/fbpict.h b/src/sna/fb/fbpict.h
-index 932032f9..20877777 100644
---- a/src/sna/fb/fbpict.h
-+++ b/src/sna/fb/fbpict.h
-@@ -24,10 +24,6 @@
- #ifndef FBPICT_H
- #define FBPICT_H
- 
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
- #include <xorg-server.h>
- #include <picturestr.h>
- 
-diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
-index 1104f462..49ad16a3 100644
---- a/src/sna/gen2_render.c
-+++ b/src/sna/gen2_render.c
-@@ -35,6 +35,7 @@
- #include "sna_reg.h"
- #include "sna_render.h"
- #include "sna_render_inline.h"
-+#include "sna_video.h"
- 
- #include "gen2_render.h"
- 
-@@ -48,6 +49,7 @@
- 
- #define MAX_3D_SIZE 2048
- #define MAX_3D_PITCH 8192
-+#define MAX_INLINE (1 << 18)
- 
- #define BATCH(v) batch_emit(sna, v)
- #define BATCH_F(v) batch_emit_float(sna, v)
-@@ -596,39 +598,43 @@ gen2_get_batch(struct sna *sna, const struct sna_composite_op *op)
- 		gen2_emit_invariant(sna);
- }
- 
--static void gen2_emit_target(struct sna *sna, const struct sna_composite_op *op)
-+static void gen2_emit_target(struct sna *sna,
-+			     struct kgem_bo *bo,
-+			     int width,
-+			     int height,
-+			     int format)
- {
--	assert(!too_large(op->dst.width, op->dst.height));
--	assert(op->dst.bo->pitch >= 8 && op->dst.bo->pitch <= MAX_3D_PITCH);
-+	assert(!too_large(width, height));
-+	assert(bo->pitch >= 8 && bo->pitch <= MAX_3D_PITCH);
- 	assert(sna->render.vertex_offset == 0);
- 
--	assert(op->dst.bo->unique_id);
--	if (sna->render_state.gen2.target == op->dst.bo->unique_id) {
--		kgem_bo_mark_dirty(op->dst.bo);
-+	assert(bo->unique_id);
-+	if (sna->render_state.gen2.target == bo->unique_id) {
-+		kgem_bo_mark_dirty(bo);
- 		return;
- 	}
- 
- 	BATCH(_3DSTATE_BUF_INFO_CMD);
- 	BATCH(BUF_3D_ID_COLOR_BACK |
--	      gen2_buf_tiling(op->dst.bo->tiling) |
--	      BUF_3D_PITCH(op->dst.bo->pitch));
-+	      gen2_buf_tiling(bo->tiling) |
-+	      BUF_3D_PITCH(bo->pitch));
- 	BATCH(kgem_add_reloc(&sna->kgem, sna->kgem.nbatch,
--			     op->dst.bo,
-+			     bo,
- 			     I915_GEM_DOMAIN_RENDER << 16 |
- 			     I915_GEM_DOMAIN_RENDER,
- 			     0));
- 
- 	BATCH(_3DSTATE_DST_BUF_VARS_CMD);
--	BATCH(gen2_get_dst_format(op->dst.format));
-+	BATCH(gen2_get_dst_format(format));
- 
- 	BATCH(_3DSTATE_DRAW_RECT_CMD);
- 	BATCH(0);
- 	BATCH(0);	/* ymin, xmin */
--	BATCH(DRAW_YMAX(op->dst.height - 1) |
--	      DRAW_XMAX(op->dst.width - 1));
-+	BATCH(DRAW_YMAX(height - 1) |
-+	      DRAW_XMAX(width - 1));
- 	BATCH(0);	/* yorig, xorig */
- 
--	sna->render_state.gen2.target = op->dst.bo->unique_id;
-+	sna->render_state.gen2.target = bo->unique_id;
- }
- 
- static void gen2_disable_logic_op(struct sna *sna)
-@@ -701,7 +707,11 @@ static void gen2_emit_composite_state(struct sna *sna,
- 		kgem_clear_dirty(&sna->kgem);
- 	}
- 
--	gen2_emit_target(sna, op);
-+	gen2_emit_target(sna,
-+			 op->dst.bo,
-+			 op->dst.width,
-+			 op->dst.height,
-+			 op->dst.format);
- 
- 	unwind = sna->kgem.nbatch;
- 	BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 |
-@@ -1190,7 +1200,13 @@ inline static int gen2_get_rectangles(struct sna *sna,
- 			sna->render.vertex_offset = sna->kgem.nbatch;
- 			BATCH(PRIM3D_INLINE | PRIM3D_RECTLIST);
- 		}
--	}
-+
-+		need = 0;
-+	} else
-+		need = sna->kgem.nbatch - sna->render.vertex_offset;
-+
-+	if (rem > MAX_INLINE - need)
-+		rem = MAX_INLINE -need;
- 
- 	if (want > 1 && want * size > rem)
- 		want = rem / size;
-@@ -1572,12 +1588,12 @@ gen2_composite_picture(struct sna *sna,
- 		if (channel->repeat &&
- 		    (x >= 0 &&
- 		     y >= 0 &&
--		     x + w < pixmap->drawable.width &&
--		     y + h < pixmap->drawable.height)) {
-+		     x + w <= pixmap->drawable.width &&
-+		     y + h <= pixmap->drawable.height)) {
- 			struct sna_pixmap *priv = sna_pixmap(pixmap);
- 			if (priv && priv->clear) {
- 				DBG(("%s: converting large pixmap source into solid [%08x]\n", __FUNCTION__, priv->clear_color));
--				return gen2_composite_solid_init(sna, channel, priv->clear_color);
-+				return gen2_composite_solid_init(sna, channel, solid_color(picture->format, priv->clear_color));
- 			}
- 		}
- 	} else
-@@ -1619,7 +1635,9 @@ gen2_composite_set_target(struct sna *sna,
- 	} else
- 		sna_render_picture_extents(dst, &box);
- 
--	hint = PREFER_GPU | FORCE_GPU | RENDER_GPU;
-+	hint = PREFER_GPU | RENDER_GPU;
-+	if (!need_tiling(sna, op->dst.width, op->dst.height))
-+		hint |= FORCE_GPU;
- 	if (!partial) {
- 		hint |= IGNORE_DAMAGE;
- 		if (w == op->dst.width && h == op->dst.height)
-@@ -2423,7 +2441,11 @@ static void gen2_emit_composite_spans_state(struct sna *sna,
- 	uint32_t unwind;
- 
- 	gen2_get_batch(sna, &op->base);
--	gen2_emit_target(sna, &op->base);
-+	gen2_emit_target(sna,
-+			 op->base.dst.bo,
-+			 op->base.dst.width,
-+			 op->base.dst.height,
-+			 op->base.dst.format);
- 
- 	unwind = sna->kgem.nbatch;
- 	BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 |
-@@ -2706,7 +2728,11 @@ static void gen2_emit_fill_composite_state(struct sna *sna,
- 	uint32_t ls1;
- 
- 	gen2_get_batch(sna, op);
--	gen2_emit_target(sna, op);
-+	gen2_emit_target(sna,
-+			 op->dst.bo,
-+			 op->dst.width,
-+			 op->dst.height,
-+			 op->dst.format);
- 
- 	ls1 = sna->kgem.nbatch;
- 	BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 |
-@@ -2868,7 +2894,11 @@ static void gen2_emit_fill_state(struct sna *sna,
- 	uint32_t ls1;
- 
- 	gen2_get_batch(sna, op);
--	gen2_emit_target(sna, op);
-+	gen2_emit_target(sna,
-+			 op->dst.bo,
-+			 op->dst.width,
-+			 op->dst.height,
-+			 op->dst.format);
- 
- 	ls1 = sna->kgem.nbatch;
- 	BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 |
-@@ -3102,6 +3132,276 @@ gen2_render_fill_one(struct sna *sna, PixmapPtr dst, struct kgem_bo *bo,
- }
- 
- static void
-+gen2_emit_video_state(struct sna *sna,
-+		      struct sna_video *video,
-+		      struct sna_video_frame *frame,
-+		      PixmapPtr pixmap,
-+		      struct kgem_bo *dst_bo,
-+		      int width, int height,
-+		      bool bilinear)
-+{
-+	uint32_t ms1, v, unwind;
-+
-+	gen2_emit_target(sna, dst_bo, width, height,
-+			 sna_format_for_depth(pixmap->drawable.depth));
-+
-+	unwind = sna->kgem.nbatch;
-+	BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 |
-+	      I1_LOAD_S(2) | I1_LOAD_S(3) | I1_LOAD_S(8) | 2);
-+	BATCH(1 << 12);
-+	BATCH(S3_CULLMODE_NONE | S3_VERTEXHAS_XY);
-+	BATCH(S8_ENABLE_COLOR_BUFFER_WRITE);
-+	if (memcmp(sna->kgem.batch + sna->render_state.gen2.ls1 + 1,
-+		   sna->kgem.batch + unwind + 1,
-+		   3 * sizeof(uint32_t)) == 0)
-+		sna->kgem.nbatch = unwind;
-+	else
-+		sna->render_state.gen2.ls1 = unwind;
-+
-+	gen2_disable_logic_op(sna);
-+
-+	unwind = sna->kgem.nbatch;
-+	BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_2 |
-+	      LOAD_TEXTURE_BLEND_STAGE(0) | 1);
-+	BATCH(TB0C_LAST_STAGE | TB0C_RESULT_SCALE_1X | TB0C_OUTPUT_WRITE_CURRENT |
-+	      TB0C_OP_ARG1 | TB0C_ARG1_SEL_TEXEL0);
-+	BATCH(TB0A_RESULT_SCALE_1X | TB0A_OUTPUT_WRITE_CURRENT |
-+	      TB0A_OP_ARG1 | TB0A_ARG1_SEL_ONE);
-+	if (memcmp(sna->kgem.batch + sna->render_state.gen2.ls2 + 1,
-+		   sna->kgem.batch + unwind + 1,
-+		   2 * sizeof(uint32_t)) == 0)
-+		sna->kgem.nbatch = unwind;
-+	else
-+		sna->render_state.gen2.ls2 = unwind;
-+
-+	BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_2 | LOAD_TEXTURE_MAP(0) | 4);
-+	BATCH(kgem_add_reloc(&sna->kgem, sna->kgem.nbatch,
-+			     frame->bo,
-+			     I915_GEM_DOMAIN_SAMPLER << 16,
-+			     0));
-+	ms1 = MAPSURF_422 | TM0S1_COLORSPACE_CONVERSION;
-+	switch (frame->id) {
-+	case FOURCC_YUY2:
-+		ms1 |= MT_422_YCRCB_NORMAL;
-+		break;
-+	case FOURCC_UYVY:
-+		ms1 |= MT_422_YCRCB_SWAPY;
-+		break;
-+	}
-+	BATCH(((frame->height - 1) << TM0S1_HEIGHT_SHIFT) |
-+	      ((frame->width - 1)  << TM0S1_WIDTH_SHIFT) |
-+	      ms1 |
-+	      gen2_sampler_tiling_bits(frame->bo->tiling));
-+	BATCH((frame->pitch[0] / 4 - 1) << TM0S2_PITCH_SHIFT | TM0S2_MAP_2D);
-+	if (bilinear)
-+		BATCH(FILTER_LINEAR << TM0S3_MAG_FILTER_SHIFT |
-+		      FILTER_LINEAR << TM0S3_MIN_FILTER_SHIFT |
-+		      MIPFILTER_NONE << TM0S3_MIP_FILTER_SHIFT);
-+	else
-+		BATCH(FILTER_NEAREST << TM0S3_MAG_FILTER_SHIFT |
-+		      FILTER_NEAREST << TM0S3_MIN_FILTER_SHIFT |
-+		      MIPFILTER_NONE << TM0S3_MIP_FILTER_SHIFT);
-+	BATCH(0);	/* default color */
-+
-+	BATCH(_3DSTATE_MAP_COORD_SET_CMD | TEXCOORD_SET(0) |
-+	      ENABLE_TEXCOORD_PARAMS | TEXCOORDS_ARE_NORMAL | TEXCOORDTYPE_CARTESIAN |
-+	      ENABLE_ADDR_V_CNTL | TEXCOORD_ADDR_V_MODE(TEXCOORDMODE_CLAMP) |
-+	      ENABLE_ADDR_U_CNTL | TEXCOORD_ADDR_U_MODE(TEXCOORDMODE_CLAMP));
-+
-+	v = _3DSTATE_VERTEX_FORMAT_2_CMD | TEXCOORDFMT_2D;
-+	if (sna->render_state.gen2.vft != v) {
-+		BATCH(v);
-+		sna->render_state.gen2.vft = v;
-+	}
-+}
-+
-+static void
-+gen2_video_get_batch(struct sna *sna, struct kgem_bo *bo)
-+{
-+	kgem_set_mode(&sna->kgem, KGEM_RENDER, bo);
-+
-+	if (!kgem_check_batch(&sna->kgem, 120) ||
-+	    !kgem_check_reloc(&sna->kgem, 4) ||
-+	    !kgem_check_exec(&sna->kgem, 2)) {
-+		_kgem_submit(&sna->kgem);
-+		_kgem_set_mode(&sna->kgem, KGEM_RENDER);
-+	}
-+
-+	if (sna->render_state.gen2.need_invariant)
-+		gen2_emit_invariant(sna);
-+}
-+
-+static int
-+gen2_get_inline_rectangles(struct sna *sna, int want, int floats_per_vertex)
-+{
-+	int size = floats_per_vertex * 3;
-+	int rem = batch_space(sna) - 1;
-+
-+	if (rem > MAX_INLINE)
-+		rem = MAX_INLINE;
-+
-+	if (size * want > rem)
-+		want = rem / size;
-+
-+	return want;
-+}
-+
-+static bool
-+gen2_render_video(struct sna *sna,
-+		  struct sna_video *video,
-+		  struct sna_video_frame *frame,
-+		  RegionPtr dstRegion,
-+		  PixmapPtr pixmap)
-+{
-+	struct sna_pixmap *priv = sna_pixmap(pixmap);
-+	const BoxRec *pbox = region_rects(dstRegion);
-+	int nbox = region_num_rects(dstRegion);
-+	int dst_width = dstRegion->extents.x2 - dstRegion->extents.x1;
-+	int dst_height = dstRegion->extents.y2 - dstRegion->extents.y1;
-+	int src_width = frame->src.x2 - frame->src.x1;
-+	int src_height = frame->src.y2 - frame->src.y1;
-+	float src_offset_x, src_offset_y;
-+	float src_scale_x, src_scale_y;
-+	int pix_xoff, pix_yoff;
-+	struct kgem_bo *dst_bo;
-+	bool bilinear;
-+	int copy = 0;
-+
-+	DBG(("%s: src:%dx%d (frame:%dx%d) -> dst:%dx%d\n", __FUNCTION__,
-+	     src_width, src_height, frame->width, frame->height, dst_width, dst_height));
-+
-+	assert(priv->gpu_bo);
-+	dst_bo = priv->gpu_bo;
-+
-+	bilinear = src_width != dst_width || src_height != dst_height;
-+
-+	src_scale_x = (float)src_width / dst_width / frame->width;
-+	src_offset_x = (float)frame->src.x1 / frame->width - dstRegion->extents.x1 * src_scale_x;
-+
-+	src_scale_y = (float)src_height / dst_height / frame->height;
-+	src_offset_y = (float)frame->src.y1 / frame->height - dstRegion->extents.y1 * src_scale_y;
-+	DBG(("%s: src offset (%f, %f), scale (%f, %f)\n",
-+	     __FUNCTION__, src_offset_x, src_offset_y, src_scale_x, src_scale_y));
-+
-+	if (too_large(pixmap->drawable.width, pixmap->drawable.height) ||
-+	    dst_bo->pitch > MAX_3D_PITCH) {
-+		int bpp = pixmap->drawable.bitsPerPixel;
-+
-+		if (too_large(dst_width, dst_height))
-+			return false;
-+
-+		dst_bo = kgem_create_2d(&sna->kgem,
-+					dst_width, dst_height, bpp,
-+					kgem_choose_tiling(&sna->kgem,
-+							   I915_TILING_X,
-+							   dst_width, dst_height, bpp),
-+					0);
-+		if (!dst_bo)
-+			return false;
-+
-+		pix_xoff = -dstRegion->extents.x1;
-+		pix_yoff = -dstRegion->extents.y1;
-+		copy = 1;
-+	} else {
-+		/* Set up the offset for translating from the given region
-+		 * (in screen coordinates) to the backing pixmap.
-+		 */
-+#ifdef COMPOSITE
-+		pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
-+		pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
-+#else
-+		pix_xoff = 0;
-+		pix_yoff = 0;
-+#endif
-+
-+		dst_width  = pixmap->drawable.width;
-+		dst_height = pixmap->drawable.height;
-+	}
-+
-+	gen2_video_get_batch(sna, dst_bo);
-+	gen2_emit_video_state(sna, video, frame, pixmap,
-+			      dst_bo, dst_width, dst_height, bilinear);
-+	do {
-+		int nbox_this_time = gen2_get_inline_rectangles(sna, nbox, 4);
-+		if (nbox_this_time == 0) {
-+			gen2_video_get_batch(sna, dst_bo);
-+			gen2_emit_video_state(sna, video, frame, pixmap,
-+					      dst_bo, dst_width, dst_height, bilinear);
-+			nbox_this_time = gen2_get_inline_rectangles(sna, nbox, 4);
-+			assert(nbox_this_time);
-+		}
-+		nbox -= nbox_this_time;
-+
-+		BATCH(PRIM3D_INLINE | PRIM3D_RECTLIST |
-+		      ((12 * nbox_this_time) - 1));
-+		do {
-+			int box_x1 = pbox->x1;
-+			int box_y1 = pbox->y1;
-+			int box_x2 = pbox->x2;
-+			int box_y2 = pbox->y2;
-+
-+			pbox++;
-+
-+			DBG(("%s: dst (%d, %d), (%d, %d) + (%d, %d); src (%f, %f), (%f, %f)\n",
-+			     __FUNCTION__, box_x1, box_y1, box_x2, box_y2, pix_xoff, pix_yoff,
-+			     box_x1 * src_scale_x + src_offset_x,
-+			     box_y1 * src_scale_y + src_offset_y,
-+			     box_x2 * src_scale_x + src_offset_x,
-+			     box_y2 * src_scale_y + src_offset_y));
-+
-+			/* bottom right */
-+			BATCH_F(box_x2 + pix_xoff);
-+			BATCH_F(box_y2 + pix_yoff);
-+			BATCH_F(box_x2 * src_scale_x + src_offset_x);
-+			BATCH_F(box_y2 * src_scale_y + src_offset_y);
-+
-+			/* bottom left */
-+			BATCH_F(box_x1 + pix_xoff);
-+			BATCH_F(box_y2 + pix_yoff);
-+			BATCH_F(box_x1 * src_scale_x + src_offset_x);
-+			BATCH_F(box_y2 * src_scale_y + src_offset_y);
-+
-+			/* top left */
-+			BATCH_F(box_x1 + pix_xoff);
-+			BATCH_F(box_y1 + pix_yoff);
-+			BATCH_F(box_x1 * src_scale_x + src_offset_x);
-+			BATCH_F(box_y1 * src_scale_y + src_offset_y);
-+		} while (--nbox_this_time);
-+	} while (nbox);
-+
-+	if (copy) {
-+#ifdef COMPOSITE
-+		pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
-+		pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
-+#else
-+		pix_xoff = 0;
-+		pix_yoff = 0;
-+#endif
-+		sna_blt_copy_boxes(sna, GXcopy,
-+				   dst_bo, -dstRegion->extents.x1, -dstRegion->extents.y1,
-+				   priv->gpu_bo, pix_xoff, pix_yoff,
-+				   pixmap->drawable.bitsPerPixel,
-+				   region_rects(dstRegion),
-+				   region_num_rects(dstRegion));
-+
-+		kgem_bo_destroy(&sna->kgem, dst_bo);
-+	}
-+
-+	if (!DAMAGE_IS_ALL(priv->gpu_damage)) {
-+		if ((pix_xoff | pix_yoff) == 0) {
-+			sna_damage_add(&priv->gpu_damage, dstRegion);
-+		} else {
-+			sna_damage_add_boxes(&priv->gpu_damage,
-+					     region_rects(dstRegion),
-+					     region_num_rects(dstRegion),
-+					     pix_xoff, pix_yoff);
-+		}
-+	}
-+
-+	return true;
-+}
-+
-+static void
- gen2_render_copy_setup_source(struct sna_composite_channel *channel,
- 			      const DrawableRec *draw,
- 			      struct kgem_bo *bo)
-@@ -3176,7 +3476,11 @@ static void gen2_emit_copy_state(struct sna *sna, const struct sna_composite_op
- 			      PIPELINE_FLUSH_TEXTURE_CACHE);
- 		kgem_clear_dirty(&sna->kgem);
- 	}
--	gen2_emit_target(sna, op);
-+	gen2_emit_target(sna,
-+			 op->dst.bo,
-+			 op->dst.width,
-+			 op->dst.height,
-+			 op->dst.format);
- 
- 	ls1 = sna->kgem.nbatch;
- 	BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_1 |
-@@ -3511,7 +3815,7 @@ const char *gen2_render_init(struct sna *sna, const char *backend)
- 	render->copy = gen2_render_copy;
- 	render->copy_boxes = gen2_render_copy_boxes;
- 
--	/* XXX YUV color space conversion for video? */
-+	render->video = gen2_render_video;
- 
- 	render->reset = gen2_render_reset;
- 	render->flush = gen2_render_flush;
-diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
-index 78289f00..4459a562 100644
---- a/src/sna/gen3_render.c
-+++ b/src/sna/gen3_render.c
-@@ -448,14 +448,14 @@ gen3_emit_composite_boxes_constant(const struct sna_composite_op *op,
- 				   float *v)
- {
- 	do {
--		v[0] = box->x2;
--		v[1] = box->y2;
-+		v[0] = box->x2 + op->dst.x;
-+		v[1] = box->y2 + op->dst.y;
- 
--		v[2] = box->x1;
--		v[3] = box->y2;
-+		v[2] = box->x1 + op->dst.x;
-+		v[3] = box->y2 + op->dst.y;
- 
--		v[4] = box->x1;
--		v[5] = box->y1;
-+		v[4] = box->x1 + op->dst.x;
-+		v[5] = box->y1 + op->dst.y;
- 
- 		box++;
- 		v += 6;
-@@ -494,18 +494,18 @@ gen3_emit_composite_boxes_identity_gradient(const struct sna_composite_op *op,
- 					    float *v)
- {
- 	do {
--		v[0] = box->x2;
--		v[1] = box->y2;
-+		v[0] = box->x2 + op->dst.x;
-+		v[1] = box->y2 + op->dst.y;
- 		v[2] = box->x2 + op->src.offset[0];
- 		v[3] = box->y2 + op->src.offset[1];
- 
--		v[4] = box->x1;
--		v[5] = box->y2;
-+		v[4] = box->x1 + op->dst.x;
-+		v[5] = box->y2 + op->dst.y;
- 		v[6] = box->x1 + op->src.offset[0];
- 		v[7] = box->y2 + op->src.offset[1];
- 
--		v[8] = box->x1;
--		v[9] = box->y1;
-+		v[8] = box->x1 + op->dst.x;
-+		v[9] = box->y1 + op->dst.y;
- 		v[10] = box->x1 + op->src.offset[0];
- 		v[11] = box->y1 + op->src.offset[1];
- 
-@@ -531,6 +531,7 @@ gen3_emit_composite_primitive_affine_gradient(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 12;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = dst_x + r->width;
- 	v[1] = dst_y + r->height;
-@@ -559,22 +560,22 @@ gen3_emit_composite_boxes_affine_gradient(const struct sna_composite_op *op,
- 	const PictTransform *transform = op->src.transform;
- 
- 	do {
--		v[0] = box->x2;
--		v[1] = box->y2;
-+		v[0] = box->x2 + op->dst.x;
-+		v[1] = box->y2 + op->dst.y;
- 		_sna_get_transformed_scaled(box->x2 + op->src.offset[0],
- 					    box->y2 + op->src.offset[1],
- 					    transform, op->src.scale,
- 					    &v[2], &v[3]);
- 
--		v[4] = box->x1;
--		v[5] = box->y2;
-+		v[4] = box->x1 + op->dst.x;
-+		v[5] = box->y2 + op->dst.y;
- 		_sna_get_transformed_scaled(box->x1 + op->src.offset[0],
- 					    box->y2 + op->src.offset[1],
- 					    transform, op->src.scale,
- 					    &v[6], &v[7]);
- 
--		v[8] = box->x1;
--		v[9] = box->y1;
-+		v[8] = box->x1 + op->dst.x;
-+		v[9] = box->y1 + op->dst.y;
- 		_sna_get_transformed_scaled(box->x1 + op->src.offset[0],
- 					    box->y1 + op->src.offset[1],
- 					    transform, op->src.scale,
-@@ -596,6 +597,7 @@ gen3_emit_composite_primitive_identity_source(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 12;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[8] = v[4] = r->dst.x + op->dst.x;
- 	v[0] = v[4] + w;
-@@ -643,6 +645,7 @@ gen3_emit_composite_primitive_identity_source_no_offset(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 12;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[8] = v[4] = r->dst.x;
- 	v[9] = r->dst.y;
-@@ -693,6 +696,7 @@ gen3_emit_composite_primitive_affine_source(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 12;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = dst_x + r->width;
- 	v[5] = v[1] = dst_y + r->height;
-@@ -720,10 +724,10 @@ gen3_emit_composite_boxes_affine_source(const struct sna_composite_op *op,
- 	const PictTransform *transform = op->src.transform;
- 
- 	do {
--		v[0] = box->x2;
--		v[5] = v[1] = box->y2;
--		v[8] = v[4] = box->x1;
--		v[9] = box->y1;
-+		v[0] = box->x2 + op->dst.x;
-+		v[5] = v[1] = box->y2 + op->dst.y;
-+		v[8] = v[4] = box->x1 + op->dst.x;
-+		v[9] = box->y1 + op->dst.y;
- 
- 		_sna_get_transformed_scaled(box->x2 + op->src.offset[0],
- 					    box->y2 + op->src.offset[1],
-@@ -756,6 +760,7 @@ gen3_emit_composite_primitive_constant_identity_mask(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 12;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[8] = v[4] = r->dst.x + op->dst.x;
- 	v[0] = v[4] + w;
-@@ -781,6 +786,7 @@ gen3_emit_composite_primitive_constant_identity_mask_no_offset(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 12;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[8] = v[4] = r->dst.x;
- 	v[9] = r->dst.y;
-@@ -817,6 +823,7 @@ gen3_emit_composite_primitive_identity_source_mask(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 18;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = dst_x + w;
- 	v[1] = dst_y + h;
-@@ -862,6 +869,7 @@ gen3_emit_composite_primitive_affine_source_mask(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 18;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = dst_x + w;
- 	v[1] = dst_y + h;
-@@ -978,6 +986,7 @@ gen3_emit_composite_primitive_constant__sse2(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 6;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[4] = v[2] = r->dst.x + op->dst.x;
- 	v[5] = r->dst.y + op->dst.y;
-@@ -993,10 +1002,10 @@ gen3_emit_composite_boxes_constant__sse2(const struct sna_composite_op *op,
- 					 float *v)
- {
- 	do {
--		v[0] = box->x2;
--		v[3] = v[1] = box->y2;
--		v[4] = v[2] = box->x1;
--		v[5] = box->y1;
-+		v[0] = box->x2 + op->dst.x;
-+		v[3] = v[1] = box->y2 + op->dst.y;
-+		v[4] = v[2] = box->x1 + op->dst.x;
-+		v[5] = box->y1 + op->dst.y;
- 
- 		box++;
- 		v += 6;
-@@ -1013,6 +1022,7 @@ gen3_emit_composite_primitive_identity_gradient__sse2(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 12;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	x = r->dst.x + op->dst.x;
- 	y = r->dst.y + op->dst.y;
-@@ -1035,10 +1045,10 @@ gen3_emit_composite_boxes_identity_gradient__sse2(const struct sna_composite_op
- 						  float *v)
- {
- 	do {
--		v[0] = box->x2;
--		v[5] = v[1] = box->y2;
--		v[8] = v[4] = box->x1;
--		v[9] = box->y1;
-+		v[0] = box->x2 + op->dst.x;
-+		v[5] = v[1] = box->y2 + op->dst.y;
-+		v[8] = v[4] = box->x1 + op->dst.x;
-+		v[9] = box->y1 + op->dst.y;
- 
- 		v[2] = box->x2 + op->src.offset[0];
- 		v[7] = v[3] = box->y2 + op->src.offset[1];
-@@ -1067,6 +1077,7 @@ gen3_emit_composite_primitive_affine_gradient__sse2(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 12;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = dst_x + r->width;
- 	v[1] = dst_y + r->height;
-@@ -1095,22 +1106,22 @@ gen3_emit_composite_boxes_affine_gradient__sse2(const struct sna_composite_op *o
- 	const PictTransform *transform = op->src.transform;
- 
- 	do {
--		v[0] = box->x2;
--		v[1] = box->y2;
-+		v[0] = box->x2 + op->dst.x;
-+		v[1] = box->y2 + op->dst.y;
- 		_sna_get_transformed_scaled(box->x2 + op->src.offset[0],
- 					    box->y2 + op->src.offset[1],
- 					    transform, op->src.scale,
- 					    &v[2], &v[3]);
- 
--		v[4] = box->x1;
--		v[5] = box->y2;
-+		v[4] = box->x1 + op->dst.x;
-+		v[5] = box->y2 + op->dst.y;
- 		_sna_get_transformed_scaled(box->x1 + op->src.offset[0],
- 					    box->y2 + op->src.offset[1],
- 					    transform, op->src.scale,
- 					    &v[6], &v[7]);
- 
--		v[8] = box->x1;
--		v[9] = box->y1;
-+		v[8] = box->x1 + op->dst.x;
-+		v[9] = box->y1 + op->dst.y;
- 		_sna_get_transformed_scaled(box->x1 + op->src.offset[0],
- 					    box->y1 + op->src.offset[1],
- 					    transform, op->src.scale,
-@@ -1132,6 +1143,7 @@ gen3_emit_composite_primitive_identity_source__sse2(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 12;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[8] = v[4] = r->dst.x + op->dst.x;
- 	v[0] = v[4] + w;
-@@ -1179,6 +1191,7 @@ gen3_emit_composite_primitive_identity_source_no_offset__sse2(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 12;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[8] = v[4] = r->dst.x;
- 	v[9] = r->dst.y;
-@@ -1227,8 +1240,12 @@ gen3_emit_composite_primitive_affine_source__sse2(struct sna *sna,
- 	int src_y = r->src.y + (int)op->src.offset[1];
- 	float *v;
- 
-+	DBG(("%s: src=(%d, %d), dst=(%d, %d), size=%dx%d\n",
-+	     __FUNCTION__, src_x, src_y, dst_x, dst_y, r->width, r->height));
-+
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 12;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = dst_x + r->width;
- 	v[5] = v[1] = dst_y + r->height;
-@@ -1256,10 +1273,13 @@ gen3_emit_composite_boxes_affine_source__sse2(const struct sna_composite_op *op,
- 	const PictTransform *transform = op->src.transform;
- 
- 	do {
--		v[0] = box->x2;
--		v[5] = v[1] = box->y2;
--		v[8] = v[4] = box->x1;
--		v[9] = box->y1;
-+		DBG(("%s: box=(%d, %d), (%d, %d), src.offset=(%d, %d)\n",
-+		     __FUNCTION__, box->x1, box->y1, box->x2, box->y2, op->src.offset[0], op->src.offset[1]));
-+
-+		v[0] = box->x2 + op->dst.x;
-+		v[5] = v[1] = box->y2 + op->dst.y;
-+		v[8] = v[4] = box->x1 + op->dst.x;
-+		v[9] = box->y1 + op->dst.y;
- 
- 		_sna_get_transformed_scaled(box->x2 + op->src.offset[0],
- 					    box->y2 + op->src.offset[1],
-@@ -1292,6 +1312,7 @@ gen3_emit_composite_primitive_constant_identity_mask__sse2(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 12;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[8] = v[4] = r->dst.x + op->dst.x;
- 	v[0] = v[4] + w;
-@@ -1317,6 +1338,7 @@ gen3_emit_composite_primitive_constant_identity_mask_no_offset__sse2(struct sna
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 12;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[8] = v[4] = r->dst.x;
- 	v[9] = r->dst.y;
-@@ -1353,6 +1375,7 @@ gen3_emit_composite_primitive_identity_source_mask__sse2(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 18;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = dst_x + w;
- 	v[1] = dst_y + h;
-@@ -1398,6 +1421,7 @@ gen3_emit_composite_primitive_affine_source_mask__sse2(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 18;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = dst_x + w;
- 	v[1] = dst_y + h;
-@@ -2233,6 +2257,7 @@ static void gen3_vertex_flush(struct sna *sna)
- static int gen3_vertex_finish(struct sna *sna)
- {
- 	struct kgem_bo *bo;
-+	unsigned hint, size;
- 
- 	DBG(("%s: used=%d/%d, vbo active? %d\n",
- 	     __FUNCTION__, sna->render.vertex_used, sna->render.vertex_size,
-@@ -2243,6 +2268,7 @@ static int gen3_vertex_finish(struct sna *sna)
- 
- 	sna_vertex_wait__locked(&sna->render);
- 
-+	hint = CREATE_GTT_MAP;
- 	bo = sna->render.vbo;
- 	if (bo) {
- 		DBG(("%s: reloc = %d\n", __FUNCTION__,
-@@ -2251,7 +2277,7 @@ static int gen3_vertex_finish(struct sna *sna)
- 		if (sna->render.vertex_reloc[0]) {
- 			sna->kgem.batch[sna->render.vertex_reloc[0]] =
- 				kgem_add_reloc(&sna->kgem, sna->render.vertex_reloc[0],
--					       bo, I915_GEM_DOMAIN_VERTEX << 16, 0);
-+					       bo, I915_GEM_DOMAIN_VERTEX << 16 | KGEM_RELOC_FENCED, 0);
- 
- 			sna->render.vertex_reloc[0] = 0;
- 		}
-@@ -2260,17 +2286,29 @@ static int gen3_vertex_finish(struct sna *sna)
- 		sna->render.vbo = NULL;
- 
- 		kgem_bo_destroy(&sna->kgem, bo);
-+		hint |= CREATE_CACHED | CREATE_NO_THROTTLE;
- 	}
- 
-+	size = 256*1024;
- 	sna->render.vertices = NULL;
--	sna->render.vbo = kgem_create_linear(&sna->kgem,
--					     256*1024, CREATE_GTT_MAP);
--	if (sna->render.vbo)
-+	sna->render.vbo = kgem_create_linear(&sna->kgem, size, hint);
-+	while (sna->render.vbo == NULL && size > sizeof(sna->render.vertex_data)) {
-+		size /= 2;
-+		sna->render.vbo = kgem_create_linear(&sna->kgem, size, hint);
-+	}
-+	if (sna->render.vbo == NULL)
-+		sna->render.vbo = kgem_create_linear(&sna->kgem,
-+						     256*1024, CREATE_GTT_MAP);
-+	if (sna->render.vbo &&
-+	    kgem_check_bo(&sna->kgem, sna->render.vbo, NULL))
- 		sna->render.vertices = kgem_bo_map(&sna->kgem, sna->render.vbo);
- 	if (sna->render.vertices == NULL) {
--		if (sna->render.vbo)
-+		if (sna->render.vbo) {
- 			kgem_bo_destroy(&sna->kgem, sna->render.vbo);
--		sna->render.vbo = NULL;
-+			sna->render.vbo = NULL;
-+		}
-+		sna->render.vertices = sna->render.vertex_data;
-+		sna->render.vertex_size = ARRAY_SIZE(sna->render.vertex_data);
- 		return 0;
- 	}
- 	assert(sna->render.vbo->snoop == false);
-@@ -2280,8 +2318,14 @@ static int gen3_vertex_finish(struct sna *sna)
- 		       sna->render.vertex_data,
- 		       sizeof(float)*sna->render.vertex_used);
- 	}
--	sna->render.vertex_size = 64 * 1024 - 1;
--	return sna->render.vertex_size - sna->render.vertex_used;
-+
-+	size = __kgem_bo_size(sna->render.vbo)/4;
-+	if (size >= UINT16_MAX)
-+		size = UINT16_MAX - 1;
-+	assert(size > sna->render.vertex_used);
-+
-+	sna->render.vertex_size = size;
-+	return size - sna->render.vertex_used;
- }
- 
- static void gen3_vertex_close(struct sna *sna)
-@@ -2345,7 +2389,7 @@ static void gen3_vertex_close(struct sna *sna)
- 	DBG(("%s: reloc = %d\n", __FUNCTION__, sna->render.vertex_reloc[0]));
- 	sna->kgem.batch[sna->render.vertex_reloc[0]] =
- 		kgem_add_reloc(&sna->kgem, sna->render.vertex_reloc[0],
--			       bo, I915_GEM_DOMAIN_VERTEX << 16, delta);
-+			       bo, I915_GEM_DOMAIN_VERTEX << 16 | KGEM_RELOC_FENCED, delta);
- 	sna->render.vertex_reloc[0] = 0;
- 
- 	if (sna->render.vbo == NULL) {
-@@ -2580,6 +2624,7 @@ gen3_render_composite_boxes(struct sna *sna,
- 
- 		v = sna->render.vertices + sna->render.vertex_used;
- 		sna->render.vertex_used += nbox_this_time * op->floats_per_rect;
-+		assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 		op->emit_boxes(op, box, nbox_this_time, v);
- 		box += nbox_this_time;
-@@ -2604,6 +2649,7 @@ gen3_render_composite_boxes__thread(struct sna *sna,
- 
- 		v = sna->render.vertices + sna->render.vertex_used;
- 		sna->render.vertex_used += nbox_this_time * op->floats_per_rect;
-+		assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 		sna_vertex_acquire__locked(&sna->render);
- 		sna_vertex_unlock(&sna->render);
-@@ -3065,7 +3111,7 @@ gen3_composite_picture(struct sna *sna,
- 
- 	if (sna_picture_is_clear(picture, x, y, w, h, &color)) {
- 		DBG(("%s: clear drawable [%08x]\n", __FUNCTION__, color));
--		return gen3_init_solid(channel, color_convert(color, picture->format, PICT_a8r8g8b8));
-+		return gen3_init_solid(channel, solid_color(picture->format, color));
- 	}
- 
- 	if (!gen3_check_repeat(picture))
-@@ -3097,12 +3143,12 @@ gen3_composite_picture(struct sna *sna,
- 		if (channel->repeat ||
- 		    (x >= 0 &&
- 		     y >= 0 &&
--		     x + w < pixmap->drawable.width &&
--		     y + h < pixmap->drawable.height)) {
-+		     x + w <= pixmap->drawable.width &&
-+		     y + h <= pixmap->drawable.height)) {
- 			struct sna_pixmap *priv = sna_pixmap(pixmap);
- 			if (priv && priv->clear) {
- 				DBG(("%s: converting large pixmap source into solid [%08x]\n", __FUNCTION__, priv->clear_color));
--				return gen3_init_solid(channel, priv->clear_color);
-+				return gen3_init_solid(channel, solid_color(picture->format, priv->clear_color));
- 			}
- 		}
- 	} else {
-@@ -3182,7 +3228,9 @@ gen3_composite_set_target(struct sna *sna,
- 	} else
- 		sna_render_picture_extents(dst, &box);
- 
--	hint = PREFER_GPU | FORCE_GPU | RENDER_GPU;
-+	hint = PREFER_GPU | RENDER_GPU;
-+	if (!need_tiling(sna, op->dst.width, op->dst.height))
-+		hint |= FORCE_GPU;
- 	if (!partial) {
- 		hint |= IGNORE_DAMAGE;
- 		if (w == op->dst.width && h == op->dst.height)
-@@ -3645,8 +3693,11 @@ gen3_render_composite(struct sna *sna,
- 			}
- 		}
- 	}
--	DBG(("%s: final src/mask type=%d/%d, affine=%d/%d\n", __FUNCTION__,
-+	DBG(("%s: final src/mask type=%d/%d [constant? %d/%d], transform? %d/%d, affine=%d/%d\n", __FUNCTION__,
- 	     tmp->src.u.gen3.type, tmp->mask.u.gen3.type,
-+	     is_constant_ps(tmp->src.u.gen3.type),
-+	     is_constant_ps(tmp->mask.u.gen3.type),
-+	     !!tmp->src.transform, !!tmp->mask.transform,
- 	     tmp->src.is_affine, tmp->mask.is_affine));
- 
- 	tmp->prim_emit = gen3_emit_composite_primitive;
-@@ -3862,6 +3913,7 @@ gen3_emit_composite_spans_primitive_zero(struct sna *sna,
- {
- 	float *v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 6;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = op->base.dst.x + box->x2;
- 	v[1] = op->base.dst.y + box->y2;
-@@ -3901,6 +3953,7 @@ gen3_emit_composite_spans_primitive_zero_no_offset(struct sna *sna,
- {
- 	float *v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 6;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = box->x2;
- 	v[3] = v[1] = box->y2;
-@@ -3932,6 +3985,7 @@ gen3_emit_composite_spans_primitive_constant(struct sna *sna,
- {
- 	float *v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 9;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = op->base.dst.x + box->x2;
- 	v[6] = v[3] = op->base.dst.x + box->x1;
-@@ -3966,6 +4020,7 @@ gen3_emit_composite_spans_primitive_constant_no_offset(struct sna *sna,
- {
- 	float *v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 9;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = box->x2;
- 	v[6] = v[3] = box->x1;
-@@ -3999,6 +4054,7 @@ gen3_emit_composite_spans_primitive_identity_source(struct sna *sna,
- {
- 	float *v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 15;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = op->base.dst.x + box->x2;
- 	v[1] = op->base.dst.y + box->y2;
-@@ -4060,6 +4116,7 @@ gen3_emit_composite_spans_primitive_affine_source(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 15;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0]  = op->base.dst.x + box->x2;
- 	v[6]  = v[1] = op->base.dst.y + box->y2;
-@@ -4125,6 +4182,7 @@ gen3_emit_composite_spans_primitive_identity_gradient(struct sna *sna,
- {
- 	float *v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 15;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = op->base.dst.x + box->x2;
- 	v[1] = op->base.dst.y + box->y2;
-@@ -4184,6 +4242,7 @@ gen3_emit_composite_spans_primitive_constant__sse2(struct sna *sna,
- {
- 	float *v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 9;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = op->base.dst.x + box->x2;
- 	v[6] = v[3] = op->base.dst.x + box->x1;
-@@ -4229,6 +4288,7 @@ gen3_render_composite_spans_constant_box__sse2(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 9;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = box->x2;
- 	v[6] = v[3] = box->x1;
-@@ -4259,6 +4319,7 @@ gen3_render_composite_spans_constant_thread__sse2__boxes(struct sna *sna,
- 
- 		v = sna->render.vertices + sna->render.vertex_used;
- 		sna->render.vertex_used += nbox_this_time * 9;
-+		assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 		sna_vertex_acquire__locked(&sna->render);
- 		sna_vertex_unlock(&sna->render);
-@@ -4287,6 +4348,7 @@ gen3_emit_composite_spans_primitive_constant__sse2__no_offset(struct sna *sna,
- {
- 	float *v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 9;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = box->x2;
- 	v[6] = v[3] = box->x1;
-@@ -4320,6 +4382,7 @@ gen3_emit_composite_spans_primitive_identity_source__sse2(struct sna *sna,
- {
- 	float *v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 15;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = op->base.dst.x + box->x2;
- 	v[1] = op->base.dst.y + box->y2;
-@@ -4380,6 +4443,7 @@ gen3_emit_composite_spans_primitive_affine_source__sse2(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 15;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0]  = op->base.dst.x + box->x2;
- 	v[6]  = v[1] = op->base.dst.y + box->y2;
-@@ -4445,6 +4509,7 @@ gen3_emit_composite_spans_primitive_identity_gradient__sse2(struct sna *sna,
- {
- 	float *v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 15;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = op->base.dst.x + box->x2;
- 	v[1] = op->base.dst.y + box->y2;
-@@ -4504,6 +4569,7 @@ gen3_emit_composite_spans_primitive_affine_gradient__sse2(struct sna *sna,
- 	PictTransform *transform = op->base.src.transform;
- 	float *v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 15;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = op->base.dst.x + box->x2;
- 	v[1] = op->base.dst.y + box->y2;
-@@ -4577,6 +4643,7 @@ gen3_emit_composite_spans_primitive_affine_gradient(struct sna *sna,
- 	PictTransform *transform = op->base.src.transform;
- 	float *v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 15;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = op->base.dst.x + box->x2;
- 	v[1] = op->base.dst.y + box->y2;
-@@ -4676,6 +4743,7 @@ gen3_render_composite_spans_constant_box(struct sna *sna,
- 
- 	v = sna->render.vertices + sna->render.vertex_used;
- 	sna->render.vertex_used += 9;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 	v[0] = box->x2;
- 	v[6] = v[3] = box->x1;
-@@ -4706,6 +4774,7 @@ gen3_render_composite_spans_constant_thread_boxes(struct sna *sna,
- 
- 		v = sna->render.vertices + sna->render.vertex_used;
- 		sna->render.vertex_used += nbox_this_time * 9;
-+		assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 		sna_vertex_acquire__locked(&sna->render);
- 		sna_vertex_unlock(&sna->render);
-@@ -4795,6 +4864,7 @@ gen3_render_composite_spans_boxes__thread(struct sna *sna,
- 
- 		v = sna->render.vertices + sna->render.vertex_used;
- 		sna->render.vertex_used += nbox_this_time * op->base.floats_per_rect;
-+		assert(sna->render.vertex_used <= sna->render.vertex_size);
- 
- 		sna_vertex_acquire__locked(&sna->render);
- 		sna_vertex_unlock(&sna->render);
-@@ -5436,17 +5506,7 @@ gen3_render_video(struct sna *sna,
- 		pix_yoff = -dstRegion->extents.y1;
- 		copy = 1;
- 	} else {
--		/* Set up the offset for translating from the given region
--		 * (in screen coordinates) to the backing pixmap.
--		 */
--#ifdef COMPOSITE
--		pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
--		pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
--#else
--		pix_xoff = 0;
--		pix_yoff = 0;
--#endif
--
-+		pix_xoff = pix_yoff = 0;
- 		dst_width  = pixmap->drawable.width;
- 		dst_height = pixmap->drawable.height;
- 	}
-@@ -5502,16 +5562,9 @@ gen3_render_video(struct sna *sna,
- 	} while (nbox);
- 
- 	if (copy) {
--#ifdef COMPOSITE
--		pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
--		pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
--#else
--		pix_xoff = 0;
--		pix_yoff = 0;
--#endif
- 		sna_blt_copy_boxes(sna, GXcopy,
- 				   dst_bo, -dstRegion->extents.x1, -dstRegion->extents.y1,
--				   priv->gpu_bo, pix_xoff, pix_yoff,
-+				   priv->gpu_bo, 0, 0,
- 				   pixmap->drawable.bitsPerPixel,
- 				   region_rects(dstRegion),
- 				   region_num_rects(dstRegion));
-@@ -5519,21 +5572,8 @@ gen3_render_video(struct sna *sna,
- 		kgem_bo_destroy(&sna->kgem, dst_bo);
- 	}
- 
--	if (!DAMAGE_IS_ALL(priv->gpu_damage)) {
--		if ((pix_xoff | pix_yoff) == 0) {
--			sna_damage_add(&priv->gpu_damage, dstRegion);
--			sna_damage_subtract(&priv->cpu_damage, dstRegion);
--		} else {
--			sna_damage_add_boxes(&priv->gpu_damage,
--					     region_rects(dstRegion),
--					     region_num_rects(dstRegion),
--					     pix_xoff, pix_yoff);
--			sna_damage_subtract_boxes(&priv->cpu_damage,
--						  region_rects(dstRegion),
--						  region_num_rects(dstRegion),
--						  pix_xoff, pix_yoff);
--		}
--	}
-+	if (!DAMAGE_IS_ALL(priv->gpu_damage))
-+		sna_damage_add(&priv->gpu_damage, dstRegion);
- 
- 	return true;
- }
-diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
-index 6c2d3808..72a98aee 100644
---- a/src/sna/gen4_render.c
-+++ b/src/sna/gen4_render.c
-@@ -1405,8 +1405,8 @@ gen4_render_video(struct sna *sna,
- 	int src_height = frame->src.y2 - frame->src.y1;
- 	float src_offset_x, src_offset_y;
- 	float src_scale_x, src_scale_y;
--	int nbox, pix_xoff, pix_yoff;
- 	const BoxRec *box;
-+	int nbox;
- 
- 	DBG(("%s: %dx%d -> %dx%d\n", __FUNCTION__,
- 	     src_width, src_height, dst_width, dst_height));
-@@ -1445,17 +1445,6 @@ gen4_render_video(struct sna *sna,
- 	gen4_align_vertex(sna, &tmp);
- 	gen4_video_bind_surfaces(sna, &tmp);
- 
--	/* Set up the offset for translating from the given region (in screen
--	 * coordinates) to the backing pixmap.
--	 */
--#ifdef COMPOSITE
--	pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
--	pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
--#else
--	pix_xoff = 0;
--	pix_yoff = 0;
--#endif
--
- 	src_scale_x = (float)src_width / dst_width / frame->width;
- 	src_offset_x = (float)frame->src.x1 / frame->width - dstRegion->extents.x1 * src_scale_x;
- 
-@@ -1473,34 +1462,26 @@ gen4_render_video(struct sna *sna,
- 		nbox -= n;
- 
- 		do {
--			BoxRec r;
--
--			r.x1 = box->x1 + pix_xoff;
--			r.x2 = box->x2 + pix_xoff;
--			r.y1 = box->y1 + pix_yoff;
--			r.y2 = box->y2 + pix_yoff;
--
--			OUT_VERTEX(r.x2, r.y2);
-+			OUT_VERTEX(box->x2, box->y2);
- 			OUT_VERTEX_F(box->x2 * src_scale_x + src_offset_x);
- 			OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- 
--			OUT_VERTEX(r.x1, r.y2);
-+			OUT_VERTEX(box->x1, box->y2);
- 			OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
- 			OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- 
--			OUT_VERTEX(r.x1, r.y1);
-+			OUT_VERTEX(box->x1, box->y1);
- 			OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
- 			OUT_VERTEX_F(box->y1 * src_scale_y + src_offset_y);
- 
--			if (!DAMAGE_IS_ALL(priv->gpu_damage)) {
--				sna_damage_add_box(&priv->gpu_damage, &r);
--				sna_damage_subtract_box(&priv->cpu_damage, &r);
--			}
- 			box++;
- 		} while (--n);
- 	} while (nbox);
- 	gen4_vertex_flush(sna);
- 
-+	if (!DAMAGE_IS_ALL(priv->gpu_damage))
-+		sna_damage_add(&priv->gpu_damage, dstRegion);
-+
- 	return true;
- }
- 
-@@ -1585,12 +1566,14 @@ gen4_composite_picture(struct sna *sna,
- 		if (channel->repeat &&
- 		    (x >= 0 &&
- 		     y >= 0 &&
--		     x + w < pixmap->drawable.width &&
--		     y + h < pixmap->drawable.height)) {
-+		     x + w <= pixmap->drawable.width &&
-+		     y + h <= pixmap->drawable.height)) {
- 			struct sna_pixmap *priv = sna_pixmap(pixmap);
- 			if (priv && priv->clear) {
- 				DBG(("%s: converting large pixmap source into solid [%08x]\n", __FUNCTION__, priv->clear_color));
--				return gen4_channel_init_solid(sna, channel, priv->clear_color);
-+				return gen4_channel_init_solid(sna, channel,
-+							       solid_color(picture->format,
-+									   priv->clear_color));
- 			}
- 		}
- 	} else
-@@ -1664,7 +1647,9 @@ gen4_composite_set_target(struct sna *sna,
- 	} else
- 		sna_render_picture_extents(dst, &box);
- 
--	hint = PREFER_GPU | FORCE_GPU | RENDER_GPU;
-+	hint = PREFER_GPU | RENDER_GPU;
-+	if (!need_tiling(sna, op->dst.width, op->dst.height))
-+		hint |= FORCE_GPU;
- 	if (!partial) {
- 		hint |= IGNORE_DAMAGE;
- 		if (w == op->dst.width && h == op->dst.height)
-@@ -2738,6 +2723,20 @@ gen4_render_fill_boxes(struct sna *sna,
- 	tmp.dst.format = format;
- 	tmp.dst.bo = dst_bo;
- 
-+	sna_render_composite_redirect_init(&tmp);
-+	if (too_large(dst->width, dst->height)) {
-+		BoxRec extents;
-+
-+		boxes_extents(box, n, &extents);
-+		if (!sna_render_composite_redirect(sna, &tmp,
-+						   extents.x1, extents.y1,
-+						   extents.x2 - extents.x1,
-+						   extents.y2 - extents.y1,
-+						   n > 1))
-+			return sna_tiling_fill_boxes(sna, op, format, color,
-+						     dst, dst_bo, box, n);
-+	}
-+
- 	gen4_channel_init_solid(sna, &tmp.src, pixel);
- 
- 	tmp.is_affine = true;
-@@ -2748,8 +2747,10 @@ gen4_render_fill_boxes(struct sna *sna,
- 
- 	if (!kgem_check_bo(&sna->kgem, dst_bo, NULL)) {
- 		kgem_submit(&sna->kgem);
--		if (!kgem_check_bo(&sna->kgem, dst_bo, NULL))
-+		if (!kgem_check_bo(&sna->kgem, dst_bo, NULL)) {
-+			kgem_bo_destroy(&sna->kgem, tmp.src.bo);
- 			return false;
-+		}
- 	}
- 
- 	gen4_align_vertex(sna, &tmp);
-@@ -2765,6 +2766,7 @@ gen4_render_fill_boxes(struct sna *sna,
- 
- 	gen4_vertex_flush(sna);
- 	kgem_bo_destroy(&sna->kgem, tmp.src.bo);
-+	sna_render_composite_redirect_done(sna, &tmp);
- 	return true;
- }
- 
-diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
-index 37cf1ff9..fb3e79bf 100644
---- a/src/sna/gen5_render.c
-+++ b/src/sna/gen5_render.c
-@@ -1355,8 +1355,8 @@ gen5_render_video(struct sna *sna,
- 	int src_height = frame->src.y2 - frame->src.y1;
- 	float src_offset_x, src_offset_y;
- 	float src_scale_x, src_scale_y;
--	int nbox, pix_xoff, pix_yoff;
- 	const BoxRec *box;
-+	int nbox;
- 
- 	DBG(("%s: %dx%d -> %dx%d\n", __FUNCTION__,
- 	     src_width, src_height, dst_width, dst_height));
-@@ -1395,17 +1395,6 @@ gen5_render_video(struct sna *sna,
- 	gen5_align_vertex(sna, &tmp);
- 	gen5_video_bind_surfaces(sna, &tmp);
- 
--	/* Set up the offset for translating from the given region (in screen
--	 * coordinates) to the backing pixmap.
--	 */
--#ifdef COMPOSITE
--	pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
--	pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
--#else
--	pix_xoff = 0;
--	pix_yoff = 0;
--#endif
--
- 	src_scale_x = (float)src_width / dst_width / frame->width;
- 	src_offset_x = (float)frame->src.x1 / frame->width - dstRegion->extents.x1 * src_scale_x;
- 
-@@ -1415,35 +1404,27 @@ gen5_render_video(struct sna *sna,
- 	box = region_rects(dstRegion);
- 	nbox = region_num_rects(dstRegion);
- 	while (nbox--) {
--		BoxRec r;
--
--		r.x1 = box->x1 + pix_xoff;
--		r.x2 = box->x2 + pix_xoff;
--		r.y1 = box->y1 + pix_yoff;
--		r.y2 = box->y2 + pix_yoff;
--
- 		gen5_get_rectangles(sna, &tmp, 1, gen5_video_bind_surfaces);
- 
--		OUT_VERTEX(r.x2, r.y2);
-+		OUT_VERTEX(box->x2, box->y2);
- 		OUT_VERTEX_F(box->x2 * src_scale_x + src_offset_x);
- 		OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- 
--		OUT_VERTEX(r.x1, r.y2);
-+		OUT_VERTEX(box->x1, box->y2);
- 		OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
- 		OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- 
--		OUT_VERTEX(r.x1, r.y1);
-+		OUT_VERTEX(box->x1, box->y1);
- 		OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
- 		OUT_VERTEX_F(box->y1 * src_scale_y + src_offset_y);
- 
--		if (!DAMAGE_IS_ALL(priv->gpu_damage)) {
--			sna_damage_add_box(&priv->gpu_damage, &r);
--			sna_damage_subtract_box(&priv->cpu_damage, &r);
--		}
- 		box++;
- 	}
--
- 	gen4_vertex_flush(sna);
-+
-+	if (!DAMAGE_IS_ALL(priv->gpu_damage))
-+		sna_damage_add(&priv->gpu_damage, dstRegion);
-+
- 	return true;
- }
- 
-@@ -1524,12 +1505,12 @@ gen5_composite_picture(struct sna *sna,
- 		if (channel->repeat ||
- 		    (x >= 0 &&
- 		     y >= 0 &&
--		     x + w < pixmap->drawable.width &&
--		     y + h < pixmap->drawable.height)) {
-+		     x + w <= pixmap->drawable.width &&
-+		     y + h <= pixmap->drawable.height)) {
- 			struct sna_pixmap *priv = sna_pixmap(pixmap);
- 			if (priv && priv->clear) {
- 				DBG(("%s: converting large pixmap source into solid [%08x]\n", __FUNCTION__, priv->clear_color));
--				return gen4_channel_init_solid(sna, channel, priv->clear_color);
-+				return gen4_channel_init_solid(sna, channel, solid_color(picture->format, priv->clear_color));
- 			}
- 		}
- 	} else
-@@ -1618,7 +1599,9 @@ gen5_composite_set_target(struct sna *sna,
- 	} else
- 		sna_render_picture_extents(dst, &box);
- 
--	hint = PREFER_GPU | FORCE_GPU | RENDER_GPU;
-+	hint = PREFER_GPU | RENDER_GPU;
-+	if (!need_tiling(sna, op->dst.width, op->dst.height))
-+		hint |= FORCE_GPU;
- 	if (!partial) {
- 		hint |= IGNORE_DAMAGE;
- 		if (w == op->dst.width && h == op->dst.height)
-@@ -2734,6 +2717,19 @@ gen5_render_fill_boxes(struct sna *sna,
- 	tmp.dst.format = format;
- 	tmp.dst.bo = dst_bo;
- 
-+	if (too_large(dst->width, dst->height)) {
-+		BoxRec extents;
-+
-+		boxes_extents(box, n, &extents);
-+		if (!sna_render_composite_redirect(sna, &tmp,
-+						   extents.x1, extents.y1,
-+						   extents.x2 - extents.x1,
-+						   extents.y2 - extents.y1,
-+						   n > 1))
-+			return sna_tiling_fill_boxes(sna, op, format, color,
-+						     dst, dst_bo, box, n);
-+	}
-+
- 	tmp.src.bo = sna_render_get_solid(sna, pixel);
- 	tmp.src.filter = SAMPLER_FILTER_NEAREST;
- 	tmp.src.repeat = SAMPLER_EXTEND_REPEAT;
-@@ -2780,6 +2776,7 @@ gen5_render_fill_boxes(struct sna *sna,
- 
- 	gen4_vertex_flush(sna);
- 	kgem_bo_destroy(&sna->kgem, tmp.src.bo);
-+	sna_render_composite_redirect_done(sna, &tmp);
- 	return true;
- }
- 
-diff --git a/src/sna/gen6_common.h b/src/sna/gen6_common.h
-index 6668620b..b53ec0c9 100644
---- a/src/sna/gen6_common.h
-+++ b/src/sna/gen6_common.h
-@@ -30,8 +30,8 @@
- 
- #include "sna.h"
- 
--#define NO_RING_SWITCH 0
--#define PREFER_RENDER 0
-+#define NO_RING_SWITCH(sna) (!(sna)->kgem.has_semaphores)
-+#define PREFER_RENDER 0 /* -1 -> BLT, 1 -> RENDER */
- 
- static inline bool is_uncached(struct sna *sna,
- 			       struct kgem_bo *bo)
-@@ -46,40 +46,28 @@ inline static bool can_switch_to_blt(struct sna *sna,
- 	if (sna->kgem.ring != KGEM_RENDER)
- 		return true;
- 
--	if (NO_RING_SWITCH)
--		return false;
--
--	if (!sna->kgem.has_semaphores)
--		return false;
--
--	if (flags & COPY_LAST)
--		return true;
--
- 	if (bo && RQ_IS_BLT(bo->rq))
- 		return true;
- 
--	if (sna->render_state.gt < 2)
--		return true;
-+	if (bo && bo->tiling == I915_TILING_Y)
-+		return false;
- 
--	return kgem_ring_is_idle(&sna->kgem, KGEM_BLT);
--}
-+	if (bo && !kgem_bo_can_blt(&sna->kgem, bo))
-+		return false;
- 
--inline static bool can_switch_to_render(struct sna *sna,
--					struct kgem_bo *bo)
--{
--	if (sna->kgem.ring == KGEM_RENDER)
-+	if (sna->render_state.gt < 2)
- 		return true;
- 
--	if (NO_RING_SWITCH)
-+	if (bo && RQ_IS_RENDER(bo->rq))
- 		return false;
- 
--	if (!sna->kgem.has_semaphores)
-+	if (NO_RING_SWITCH(sna))
- 		return false;
- 
--	if (bo && !RQ_IS_BLT(bo->rq) && !is_uncached(sna, bo))
-+	if (flags & COPY_LAST)
- 		return true;
- 
--	return !kgem_ring_is_idle(&sna->kgem, KGEM_RENDER);
-+	return kgem_ring_is_idle(&sna->kgem, KGEM_BLT);
- }
- 
- static inline bool untiled_tlb_miss(struct kgem_bo *bo)
-@@ -90,57 +78,95 @@ static inline bool untiled_tlb_miss(struct kgem_bo *bo)
- 	return bo->tiling == I915_TILING_NONE && bo->pitch >= 4096;
- }
- 
--static int prefer_blt_bo(struct sna *sna, struct kgem_bo *bo)
-+static int prefer_blt_bo(struct sna *sna,
-+			 struct kgem_bo *src,
-+			 struct kgem_bo *dst)
- {
-+	assert(dst != NULL);
-+
- 	if (PREFER_RENDER)
- 		return PREFER_RENDER < 0;
- 
--	if (bo->rq)
--		return RQ_IS_BLT(bo->rq);
-+	if (dst->rq)
-+		return RQ_IS_BLT(dst->rq);
- 
- 	if (sna->flags & SNA_POWERSAVE)
- 		return true;
- 
--	return bo->tiling == I915_TILING_NONE || is_uncached(sna, bo);
--}
-+	if (src) {
-+		if (sna->render_state.gt > 1)
-+			return false;
- 
--inline static bool force_blt_ring(struct sna *sna)
--{
--	if (sna->flags & SNA_POWERSAVE)
-+		if (src->rq)
-+			return RQ_IS_BLT(src->rq);
-+
-+		if (src->tiling == I915_TILING_Y)
-+			return false;
-+        } else {
-+                if (sna->render_state.gt > 2)
-+                        return false;
-+        }
-+
-+	if (sna->render_state.gt < 2)
- 		return true;
- 
-+	return dst->tiling == I915_TILING_NONE || is_uncached(sna, dst);
-+}
-+
-+inline static bool force_blt_ring(struct sna *sna, struct kgem_bo *bo)
-+{
- 	if (sna->kgem.mode == KGEM_RENDER)
- 		return false;
- 
-+	if (NO_RING_SWITCH(sna))
-+		return sna->kgem.ring == KGEM_BLT;
-+
-+	if (bo->tiling == I915_TILING_Y)
-+		return false;
-+
-+	if (sna->flags & SNA_POWERSAVE)
-+		return true;
-+
- 	if (sna->render_state.gt < 2)
- 		return true;
- 
- 	return false;
- }
- 
--inline static bool prefer_blt_ring(struct sna *sna,
--				   struct kgem_bo *bo,
--				   unsigned flags)
-+nonnull inline static bool
-+prefer_blt_ring(struct sna *sna, struct kgem_bo *bo, unsigned flags)
- {
- 	if (PREFER_RENDER)
- 		return PREFER_RENDER < 0;
- 
--	assert(!force_blt_ring(sna));
--	assert(!kgem_bo_is_render(bo));
-+	assert(!force_blt_ring(sna, bo));
-+	assert(!kgem_bo_is_render(bo) || NO_RING_SWITCH(sna));
-+
-+	if (kgem_bo_is_blt(bo))
-+		return true;
- 
- 	return can_switch_to_blt(sna, bo, flags);
- }
- 
--inline static bool prefer_render_ring(struct sna *sna,
--				      struct kgem_bo *bo)
-+nonnull inline static bool
-+prefer_render_ring(struct sna *sna, struct kgem_bo *bo)
- {
-+	if (sna->kgem.ring == KGEM_RENDER)
-+		return true;
-+
-+	if (sna->kgem.ring != KGEM_NONE && NO_RING_SWITCH(sna))
-+                return false;
-+
-+	if (kgem_bo_is_render(bo))
-+		return true;
-+
- 	if (sna->flags & SNA_POWERSAVE)
- 		return false;
- 
--	if (sna->render_state.gt < 2)
--		return false;
-+	if (!prefer_blt_bo(sna, NULL, bo))
-+		return true;
- 
--	return can_switch_to_render(sna, bo);
-+	return !kgem_ring_is_idle(&sna->kgem, KGEM_RENDER);
- }
- 
- inline static bool
-@@ -153,25 +179,20 @@ prefer_blt_composite(struct sna *sna, struct sna_composite_op *tmp)
- 	    untiled_tlb_miss(tmp->src.bo))
- 		return true;
- 
--	if (force_blt_ring(sna))
-+	if (force_blt_ring(sna, tmp->dst.bo))
- 		return true;
- 
--	if (kgem_bo_is_render(tmp->dst.bo) ||
--	    kgem_bo_is_render(tmp->src.bo))
--		return false;
--
- 	if (prefer_render_ring(sna, tmp->dst.bo))
- 		return false;
- 
- 	if (!prefer_blt_ring(sna, tmp->dst.bo, 0))
- 		return false;
- 
--	return prefer_blt_bo(sna, tmp->dst.bo) || prefer_blt_bo(sna, tmp->src.bo);
-+	return prefer_blt_bo(sna, tmp->src.bo, tmp->dst.bo);
- }
- 
--static inline bool prefer_blt_fill(struct sna *sna,
--				   struct kgem_bo *bo,
--				   unsigned flags)
-+nonnull static inline bool
-+prefer_blt_fill(struct sna *sna, struct kgem_bo *bo, unsigned flags)
- {
- 	if (PREFER_RENDER)
- 		return PREFER_RENDER < 0;
-@@ -179,24 +200,21 @@ static inline bool prefer_blt_fill(struct sna *sna,
- 	if (untiled_tlb_miss(bo))
- 		return true;
- 
--	if (force_blt_ring(sna))
-+	if (force_blt_ring(sna, bo))
- 		return true;
- 
- 	if ((flags & (FILL_POINTS | FILL_SPANS)) == 0) {
--		if (kgem_bo_is_render(bo))
--			return false;
--
- 		if (prefer_render_ring(sna, bo))
- 			return false;
- 
- 		if (!prefer_blt_ring(sna, bo, 0))
- 			return false;
- 	} else {
--	    if (can_switch_to_blt(sna, bo, 0))
-+	    if (can_switch_to_blt(sna, bo, COPY_LAST))
- 		    return true;
- 	}
- 
--	return prefer_blt_bo(sna, bo);
-+	return prefer_blt_bo(sna, NULL, bo);
- }
- 
- void gen6_render_context_switch(struct kgem *kgem, int new_mode);
-diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
-index 25044685..6b69f216 100644
---- a/src/sna/gen6_render.c
-+++ b/src/sna/gen6_render.c
-@@ -1633,9 +1633,9 @@ gen6_render_video(struct sna *sna,
- 	int src_height = frame->src.y2 - frame->src.y1;
- 	float src_offset_x, src_offset_y;
- 	float src_scale_x, src_scale_y;
--	int nbox, pix_xoff, pix_yoff;
- 	unsigned filter;
- 	const BoxRec *box;
-+	int nbox;
- 
- 	DBG(("%s: src=(%d, %d), dst=(%d, %d), %dx[(%d, %d), (%d, %d)...]\n",
- 	     __FUNCTION__,
-@@ -1686,17 +1686,6 @@ gen6_render_video(struct sna *sna,
- 	gen6_align_vertex(sna, &tmp);
- 	gen6_emit_video_state(sna, &tmp);
- 
--	/* Set up the offset for translating from the given region (in screen
--	 * coordinates) to the backing pixmap.
--	 */
--#ifdef COMPOSITE
--	pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
--	pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
--#else
--	pix_xoff = 0;
--	pix_yoff = 0;
--#endif
--
- 	src_scale_x = (float)src_width / dst_width / frame->width;
- 	src_offset_x = (float)frame->src.x1 / frame->width - dstRegion->extents.x1 * src_scale_x;
- 
-@@ -1706,35 +1695,27 @@ gen6_render_video(struct sna *sna,
- 	box = region_rects(dstRegion);
- 	nbox = region_num_rects(dstRegion);
- 	while (nbox--) {
--		BoxRec r;
--
--		r.x1 = box->x1 + pix_xoff;
--		r.x2 = box->x2 + pix_xoff;
--		r.y1 = box->y1 + pix_yoff;
--		r.y2 = box->y2 + pix_yoff;
--
- 		gen6_get_rectangles(sna, &tmp, 1, gen6_emit_video_state);
- 
--		OUT_VERTEX(r.x2, r.y2);
-+		OUT_VERTEX(box->x2, box->y2);
- 		OUT_VERTEX_F(box->x2 * src_scale_x + src_offset_x);
- 		OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- 
--		OUT_VERTEX(r.x1, r.y2);
-+		OUT_VERTEX(box->x1, box->y2);
- 		OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
- 		OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- 
--		OUT_VERTEX(r.x1, r.y1);
-+		OUT_VERTEX(box->x1, box->y1);
- 		OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
- 		OUT_VERTEX_F(box->y1 * src_scale_y + src_offset_y);
- 
--		if (!DAMAGE_IS_ALL(priv->gpu_damage)) {
--			sna_damage_add_box(&priv->gpu_damage, &r);
--			sna_damage_subtract_box(&priv->cpu_damage, &r);
--		}
- 		box++;
- 	}
--
- 	gen4_vertex_flush(sna);
-+
-+	if (!DAMAGE_IS_ALL(priv->gpu_damage))
-+		sna_damage_add(&priv->gpu_damage, dstRegion);
-+
- 	return true;
- }
- 
-@@ -1815,12 +1796,12 @@ gen6_composite_picture(struct sna *sna,
- 		if (channel->repeat &&
- 		    (x >= 0 &&
- 		     y >= 0 &&
--		     x + w < pixmap->drawable.width &&
--		     y + h < pixmap->drawable.height)) {
-+		     x + w <= pixmap->drawable.width &&
-+		     y + h <= pixmap->drawable.height)) {
- 			struct sna_pixmap *priv = sna_pixmap(pixmap);
- 			if (priv && priv->clear) {
- 				DBG(("%s: converting large pixmap source into solid [%08x]\n", __FUNCTION__, priv->clear_color));
--				return gen4_channel_init_solid(sna, channel, priv->clear_color);
-+				return gen4_channel_init_solid(sna, channel, solid_color(picture->format, priv->clear_color));
- 			}
- 		}
- 	} else
-@@ -1927,7 +1908,9 @@ gen6_composite_set_target(struct sna *sna,
- 	} else
- 		sna_render_picture_extents(dst, &box);
- 
--	hint = PREFER_GPU | FORCE_GPU | RENDER_GPU;
-+	hint = PREFER_GPU | RENDER_GPU;
-+	if (!need_tiling(sna, op->dst.width, op->dst.height))
-+		hint |= FORCE_GPU;
- 	if (!partial) {
- 		hint |= IGNORE_DAMAGE;
- 		if (w == op->dst.width && h == op->dst.height)
-@@ -1965,46 +1948,77 @@ gen6_composite_set_target(struct sna *sna,
- 
- static bool
- try_blt(struct sna *sna,
--	PicturePtr dst, PicturePtr src,
--	int width, int height)
-+	uint8_t op,
-+	PicturePtr src,
-+	PicturePtr mask,
-+	PicturePtr dst,
-+	int16_t src_x, int16_t src_y,
-+	int16_t msk_x, int16_t msk_y,
-+	int16_t dst_x, int16_t dst_y,
-+	int16_t width, int16_t height,
-+	unsigned flags,
-+	struct sna_composite_op *tmp)
- {
- 	struct kgem_bo *bo;
- 
- 	if (sna->kgem.mode == KGEM_BLT) {
- 		DBG(("%s: already performing BLT\n", __FUNCTION__));
--		return true;
-+		goto execute;
- 	}
- 
- 	if (too_large(width, height)) {
- 		DBG(("%s: operation too large for 3D pipe (%d, %d)\n",
- 		     __FUNCTION__, width, height));
--		return true;
-+		goto execute;
- 	}
- 
- 	bo = __sna_drawable_peek_bo(dst->pDrawable);
- 	if (bo == NULL)
--		return true;
--	if (bo->rq)
--		return RQ_IS_BLT(bo->rq);
-+		goto execute;
-+
-+	if (untiled_tlb_miss(bo))
-+		goto execute;
-+
-+	if (bo->rq) {
-+		if (RQ_IS_BLT(bo->rq))
-+			goto execute;
-+
-+		return false;
-+	}
-+
-+	if (bo->tiling == I915_TILING_Y)
-+		goto upload;
-+
-+	if (src->pDrawable == dst->pDrawable &&
-+	    can_switch_to_blt(sna, bo, 0))
-+		goto execute;
- 
- 	if (sna_picture_is_solid(src, NULL) && can_switch_to_blt(sna, bo, 0))
--		return true;
-+		goto execute;
- 
- 	if (src->pDrawable) {
--		bo = __sna_drawable_peek_bo(src->pDrawable);
--		if (bo == NULL)
--			return true;
-+		struct kgem_bo *s = __sna_drawable_peek_bo(src->pDrawable);
-+		if (s == NULL)
-+			goto execute;
- 
--		if (prefer_blt_bo(sna, bo))
--			return true;
-+		if (prefer_blt_bo(sna, s, bo))
-+			goto execute;
- 	}
- 
- 	if (sna->kgem.ring == KGEM_BLT) {
- 		DBG(("%s: already performing BLT\n", __FUNCTION__));
--		return true;
-+		goto execute;
- 	}
- 
--	return false;
-+upload:
-+	flags |= COMPOSITE_UPLOAD;
-+execute:
-+	return sna_blt_composite(sna, op,
-+				 src, dst,
-+				 src_x, src_y,
-+				 dst_x, dst_y,
-+				 width, height,
-+				 flags, tmp);
- }
- 
- static bool
-@@ -2234,13 +2248,13 @@ gen6_render_composite(struct sna *sna,
- 	     width, height, sna->kgem.ring));
- 
- 	if (mask == NULL &&
--	    try_blt(sna, dst, src, width, height) &&
--	    sna_blt_composite(sna, op,
--			      src, dst,
--			      src_x, src_y,
--			      dst_x, dst_y,
--			      width, height,
--			      flags, tmp))
-+	    try_blt(sna, op,
-+		    src, mask, dst,
-+		    src_x, src_y,
-+		    msk_x, msk_y,
-+		    dst_x, dst_y,
-+		    width, height,
-+		    flags, tmp))
- 		return true;
- 
- 	if (gen6_composite_fallback(sna, src, mask, dst))
-@@ -2676,27 +2690,35 @@ static inline bool prefer_blt_copy(struct sna *sna,
- 	if (sna->kgem.ring == KGEM_BLT)
- 		return true;
- 
--	if (src_bo == dst_bo && can_switch_to_blt(sna, dst_bo, flags))
-+	if (flags & COPY_DRI && !sna->kgem.has_semaphores)
-+		return false;
-+
-+	if ((flags & COPY_SMALL || src_bo == dst_bo) &&
-+	    can_switch_to_blt(sna, dst_bo, flags))
- 		return true;
- 
- 	if (untiled_tlb_miss(src_bo) ||
- 	    untiled_tlb_miss(dst_bo))
- 		return true;
- 
--	if (force_blt_ring(sna))
-+	if (force_blt_ring(sna, dst_bo))
- 		return true;
- 
- 	if (kgem_bo_is_render(dst_bo) ||
- 	    kgem_bo_is_render(src_bo))
- 		return false;
- 
-+	if (flags & COPY_LAST &&
-+            can_switch_to_blt(sna, dst_bo, flags))
-+		return true;
-+
- 	if (prefer_render_ring(sna, dst_bo))
- 		return false;
- 
- 	if (!prefer_blt_ring(sna, dst_bo, flags))
- 		return false;
- 
--	return prefer_blt_bo(sna, src_bo) || prefer_blt_bo(sna, dst_bo);
-+	return prefer_blt_bo(sna, src_bo, dst_bo);
- }
- 
- static bool
-@@ -2758,8 +2780,7 @@ fallback_blt:
- 		assert(src->depth == dst->depth);
- 		assert(src->width == dst->width);
- 		assert(src->height == dst->height);
--		return sna_render_copy_boxes__overlap(sna, alu,
--						      src, src_bo,
-+		return sna_render_copy_boxes__overlap(sna, alu, dst, dst_bo,
- 						      src_dx, src_dy,
- 						      dst_dx, dst_dy,
- 						      box, n, &extents);
-diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
-index 2ecfd641..aabb8693 100644
---- a/src/sna/gen7_render.c
-+++ b/src/sna/gen7_render.c
-@@ -60,8 +60,6 @@
- #define NO_FILL_ONE 0
- #define NO_FILL_CLEAR 0
- 
--#define NO_RING_SWITCH 0
--
- #define USE_8_PIXEL_DISPATCH 1
- #define USE_16_PIXEL_DISPATCH 1
- #define USE_32_PIXEL_DISPATCH 0
-@@ -149,7 +147,7 @@ static const struct gt_info hsw_gt1_info = {
- 	.max_vs_threads = 70,
- 	.max_gs_threads = 70,
- 	.max_wm_threads =
--		(102 - 1) << HSW_PS_MAX_THREADS_SHIFT |
-+		(70 - 1) << HSW_PS_MAX_THREADS_SHIFT |
- 		1 << HSW_PS_SAMPLE_MASK_SHIFT,
- 	.urb = { 128, 640, 256, 8 },
- 	.gt = 1,
-@@ -209,6 +207,12 @@ static const uint32_t ps_kernel_planar[][4] = {
- #include "exa_wm_write.g7b"
- };
- 
-+static const uint32_t ps_kernel_rgb[][4] = {
-+#include "exa_wm_src_affine.g7b"
-+#include "exa_wm_src_sample_argb.g7b"
-+#include "exa_wm_write.g7b"
-+};
-+
- #define KERNEL(kernel_enum, kernel, num_surfaces) \
-     [GEN7_WM_KERNEL_##kernel_enum] = {#kernel_enum, kernel, sizeof(kernel), num_surfaces}
- #define NOKERNEL(kernel_enum, func, num_surfaces) \
-@@ -218,7 +222,7 @@ static const struct wm_kernel_info {
- 	const void *data;
- 	unsigned int size;
- 	int num_surfaces;
--} wm_kernels[] = {
-+} wm_kernels[GEN7_WM_KERNEL_COUNT] = {
- 	NOKERNEL(NOMASK, brw_wm_kernel__affine, 2),
- 	NOKERNEL(NOMASK_P, brw_wm_kernel__projective, 2),
- 
-@@ -236,6 +240,7 @@ static const struct wm_kernel_info {
- 
- 	KERNEL(VIDEO_PLANAR, ps_kernel_planar, 7),
- 	KERNEL(VIDEO_PACKED, ps_kernel_packed, 2),
-+	KERNEL(VIDEO_RGB, ps_kernel_rgb, 2),
- };
- #undef KERNEL
- 
-@@ -810,7 +815,7 @@ gen7_emit_cc(struct sna *sna, uint32_t blend_offset)
- 
- 	DBG(("%s: blend = %x\n", __FUNCTION__, blend_offset));
- 
--	/* XXX can have upto 8 blend states preload, selectable via
-+	/* XXX can have up to 8 blend states preload, selectable via
- 	 * Render Target Index. What other side-effects of Render Target Index?
- 	 */
- 
-@@ -1792,7 +1797,9 @@ static void gen7_emit_video_state(struct sna *sna,
- 			frame->pitch[0];
- 		n_src = 6;
- 	} else {
--		if (frame->id == FOURCC_UYVY)
-+		if (frame->id == FOURCC_RGB888)
-+			src_surf_format = GEN7_SURFACEFORMAT_B8G8R8X8_UNORM;
-+		else if (frame->id == FOURCC_UYVY)
- 			src_surf_format = GEN7_SURFACEFORMAT_YCRCB_SWAPY;
- 		else
- 			src_surf_format = GEN7_SURFACEFORMAT_YCRCB_NORMAL;
-@@ -1826,6 +1833,23 @@ static void gen7_emit_video_state(struct sna *sna,
- 	gen7_emit_state(sna, op, offset | dirty);
- }
- 
-+static unsigned select_video_kernel(const struct sna_video_frame *frame)
-+{
-+	switch (frame->id) {
-+	case FOURCC_YV12:
-+	case FOURCC_I420:
-+	case FOURCC_XVMC:
-+		return GEN7_WM_KERNEL_VIDEO_PLANAR;
-+
-+	case FOURCC_RGB888:
-+	case FOURCC_RGB565:
-+		return GEN7_WM_KERNEL_VIDEO_RGB;
-+
-+	default:
-+		return GEN7_WM_KERNEL_VIDEO_PACKED;
-+	}
-+}
-+
- static bool
- gen7_render_video(struct sna *sna,
- 		  struct sna_video *video,
-@@ -1841,9 +1865,9 @@ gen7_render_video(struct sna *sna,
- 	int src_height = frame->src.y2 - frame->src.y1;
- 	float src_offset_x, src_offset_y;
- 	float src_scale_x, src_scale_y;
--	int nbox, pix_xoff, pix_yoff;
- 	unsigned filter;
- 	const BoxRec *box;
-+	int nbox;
- 
- 	DBG(("%s: src=(%d, %d), dst=(%d, %d), %dx[(%d, %d), (%d, %d)...]\n",
- 	     __FUNCTION__,
-@@ -1878,9 +1902,7 @@ gen7_render_video(struct sna *sna,
- 		GEN7_SET_FLAGS(SAMPLER_OFFSET(filter, SAMPLER_EXTEND_PAD,
- 					      SAMPLER_FILTER_NEAREST, SAMPLER_EXTEND_NONE),
- 			       NO_BLEND,
--			       is_planar_fourcc(frame->id) ?
--			       GEN7_WM_KERNEL_VIDEO_PLANAR :
--			       GEN7_WM_KERNEL_VIDEO_PACKED,
-+			       select_video_kernel(frame),
- 			       2);
- 	tmp.priv = frame;
- 
-@@ -1896,17 +1918,6 @@ gen7_render_video(struct sna *sna,
- 	gen7_align_vertex(sna, &tmp);
- 	gen7_emit_video_state(sna, &tmp);
- 
--	/* Set up the offset for translating from the given region (in screen
--	 * coordinates) to the backing pixmap.
--	 */
--#ifdef COMPOSITE
--	pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
--	pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
--#else
--	pix_xoff = 0;
--	pix_yoff = 0;
--#endif
--
- 	DBG(("%s: src=(%d, %d)x(%d, %d); frame=(%dx%d), dst=(%dx%d)\n",
- 	     __FUNCTION__,
- 	     frame->src.x1, frame->src.y1,
-@@ -1928,45 +1939,36 @@ gen7_render_video(struct sna *sna,
- 	box = region_rects(dstRegion);
- 	nbox = region_num_rects(dstRegion);
- 	while (nbox--) {
--		BoxRec r;
--
--		DBG(("%s: dst=(%d, %d), (%d, %d) + (%d, %d); src=(%f, %f), (%f, %f)\n",
-+		DBG(("%s: dst=(%d, %d), (%d, %d); src=(%f, %f), (%f, %f)\n",
- 		     __FUNCTION__,
- 		     box->x1, box->y1,
- 		     box->x2, box->y2,
--		     pix_xoff, pix_yoff,
- 		     box->x1 * src_scale_x + src_offset_x,
- 		     box->y1 * src_scale_y + src_offset_y,
- 		     box->x2 * src_scale_x + src_offset_x,
- 		     box->y2 * src_scale_y + src_offset_y));
- 
--		r.x1 = box->x1 + pix_xoff;
--		r.x2 = box->x2 + pix_xoff;
--		r.y1 = box->y1 + pix_yoff;
--		r.y2 = box->y2 + pix_yoff;
--
- 		gen7_get_rectangles(sna, &tmp, 1, gen7_emit_video_state);
- 
--		OUT_VERTEX(r.x2, r.y2);
-+		OUT_VERTEX(box->x2, box->y2);
- 		OUT_VERTEX_F(box->x2 * src_scale_x + src_offset_x);
- 		OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- 
--		OUT_VERTEX(r.x1, r.y2);
-+		OUT_VERTEX(box->x1, box->y2);
- 		OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
- 		OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- 
--		OUT_VERTEX(r.x1, r.y1);
-+		OUT_VERTEX(box->x1, box->y1);
- 		OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
- 		OUT_VERTEX_F(box->y1 * src_scale_y + src_offset_y);
- 
--		if (!DAMAGE_IS_ALL(priv->gpu_damage)) {
--			sna_damage_add_box(&priv->gpu_damage, &r);
--			sna_damage_subtract_box(&priv->cpu_damage, &r);
--		}
- 		box++;
- 	}
--
- 	gen4_vertex_flush(sna);
-+
-+	if (!DAMAGE_IS_ALL(priv->gpu_damage))
-+		sna_damage_add(&priv->gpu_damage, dstRegion);
-+
- 	return true;
- }
- 
-@@ -2048,12 +2050,13 @@ gen7_composite_picture(struct sna *sna,
- 		if (channel->repeat ||
- 		    (x >= 0 &&
- 		     y >= 0 &&
--		     x + w < pixmap->drawable.width &&
--		     y + h < pixmap->drawable.height)) {
-+		     x + w <= pixmap->drawable.width &&
-+		     y + h <= pixmap->drawable.height)) {
- 			struct sna_pixmap *priv = sna_pixmap(pixmap);
- 			if (priv && priv->clear) {
- 				DBG(("%s: converting large pixmap source into solid [%08x]\n", __FUNCTION__, priv->clear_color));
--				return gen4_channel_init_solid(sna, channel, priv->clear_color);
-+				return gen4_channel_init_solid(sna, channel,
-+							       solid_color(picture->format, priv->clear_color));
- 			}
- 		}
- 	} else
-@@ -2147,7 +2150,9 @@ gen7_composite_set_target(struct sna *sna,
- 	} else
- 		sna_render_picture_extents(dst, &box);
- 
--	hint = PREFER_GPU | FORCE_GPU | RENDER_GPU;
-+	hint = PREFER_GPU | RENDER_GPU;
-+	if (!need_tiling(sna, op->dst.width, op->dst.height))
-+		hint |= FORCE_GPU;
- 	if (!partial) {
- 		hint |= IGNORE_DAMAGE;
- 		if (w == op->dst.width && h == op->dst.height)
-@@ -2185,46 +2190,78 @@ gen7_composite_set_target(struct sna *sna,
- 
- static bool
- try_blt(struct sna *sna,
--	PicturePtr dst, PicturePtr src,
--	int width, int height)
-+	uint8_t op,
-+	PicturePtr src,
-+	PicturePtr mask,
-+	PicturePtr dst,
-+	int16_t src_x, int16_t src_y,
-+	int16_t msk_x, int16_t msk_y,
-+	int16_t dst_x, int16_t dst_y,
-+	int16_t width, int16_t height,
-+	unsigned flags,
-+	struct sna_composite_op *tmp)
- {
- 	struct kgem_bo *bo;
- 
- 	if (sna->kgem.mode == KGEM_BLT) {
- 		DBG(("%s: already performing BLT\n", __FUNCTION__));
--		return true;
-+		goto execute;
- 	}
- 
- 	if (too_large(width, height)) {
- 		DBG(("%s: operation too large for 3D pipe (%d, %d)\n",
- 		     __FUNCTION__, width, height));
--		return true;
-+		goto execute;
- 	}
- 
- 	bo = __sna_drawable_peek_bo(dst->pDrawable);
- 	if (bo == NULL)
--		return true;
--	if (bo->rq)
--		return RQ_IS_BLT(bo->rq);
-+		goto execute;
-+
-+	if (untiled_tlb_miss(bo))
-+		goto execute;
-+
-+	if (bo->rq) {
-+		if (RQ_IS_BLT(bo->rq))
-+			goto execute;
-+
-+		return false;
-+	}
-+
-+	if (bo->tiling == I915_TILING_Y)
-+		goto upload;
-+
-+	if (src->pDrawable == dst->pDrawable &&
-+	    (sna->render_state.gt < 3 || width*height < 1024) &&
-+	    can_switch_to_blt(sna, bo, 0))
-+		goto execute;
- 
- 	if (sna_picture_is_solid(src, NULL) && can_switch_to_blt(sna, bo, 0))
--		return true;
-+		goto execute;
- 
- 	if (src->pDrawable) {
--		bo = __sna_drawable_peek_bo(src->pDrawable);
--		if (bo == NULL)
--			return true;
-+		struct kgem_bo *s = __sna_drawable_peek_bo(src->pDrawable);
-+		if (s == NULL)
-+			goto upload;
- 
--		if (prefer_blt_bo(sna, bo))
--			return true;
-+		if (prefer_blt_bo(sna, s, bo))
-+			goto execute;
- 	}
- 
- 	if (sna->kgem.ring == KGEM_BLT) {
- 		DBG(("%s: already performing BLT\n", __FUNCTION__));
--		return true;
-+		goto execute;
- 	}
- 
--	return false;
-+upload:
-+	flags |= COMPOSITE_UPLOAD;
-+execute:
-+	return sna_blt_composite(sna, op,
-+				 src, dst,
-+				 src_x, src_y,
-+				 dst_x, dst_y,
-+				 width, height,
-+				 flags, tmp);
- }
- 
- static bool
-@@ -2454,13 +2491,13 @@ gen7_render_composite(struct sna *sna,
- 	     width, height, sna->kgem.mode, sna->kgem.ring));
- 
- 	if (mask == NULL &&
--	    try_blt(sna, dst, src, width, height) &&
--	    sna_blt_composite(sna, op,
--			      src, dst,
--			      src_x, src_y,
--			      dst_x, dst_y,
--			      width, height,
--			      flags, tmp))
-+	    try_blt(sna, op,
-+		    src, mask, dst,
-+		    src_x, src_y,
-+		    msk_x, msk_y,
-+		    dst_x, dst_y,
-+		    width, height,
-+		    flags, tmp))
- 		return true;
- 
- 	if (gen7_composite_fallback(sna, src, mask, dst))
-@@ -2878,27 +2915,37 @@ prefer_blt_copy(struct sna *sna,
- 
- 	assert((flags & COPY_SYNC) == 0);
- 
--	if (src_bo == dst_bo && can_switch_to_blt(sna, dst_bo, flags))
--		return true;
--
- 	if (untiled_tlb_miss(src_bo) ||
- 	    untiled_tlb_miss(dst_bo))
- 		return true;
- 
--	if (force_blt_ring(sna))
-+	if (flags & COPY_DRI && !sna->kgem.has_semaphores)
-+		return false;
-+
-+	if (force_blt_ring(sna, dst_bo))
-+		return true;
-+
-+	if ((flags & COPY_SMALL ||
-+	     (sna->render_state.gt < 3 && src_bo == dst_bo)) &&
-+            can_switch_to_blt(sna, dst_bo, flags))
- 		return true;
- 
- 	if (kgem_bo_is_render(dst_bo) ||
- 	    kgem_bo_is_render(src_bo))
- 		return false;
- 
-+	if (flags & COPY_LAST &&
-+	    sna->render_state.gt < 3 &&
-+            can_switch_to_blt(sna, dst_bo, flags))
-+		return true;
-+
- 	if (prefer_render_ring(sna, dst_bo))
- 		return false;
- 
- 	if (!prefer_blt_ring(sna, dst_bo, flags))
- 		return false;
- 
--	return prefer_blt_bo(sna, src_bo) || prefer_blt_bo(sna, dst_bo);
-+	return prefer_blt_bo(sna, src_bo, dst_bo);
- }
- 
- static bool
-@@ -2946,7 +2993,7 @@ fallback_blt:
- 		     &extents)) {
- 		bool big = too_large(extents.x2-extents.x1, extents.y2-extents.y1);
- 
--		if ((big || can_switch_to_blt(sna, dst_bo, flags)) &&
-+		if ((big || !prefer_render_ring(sna, dst_bo)) &&
- 		    sna_blt_copy_boxes(sna, alu,
- 				       src_bo, src_dx, src_dy,
- 				       dst_bo, dst_dx, dst_dy,
-@@ -2961,8 +3008,7 @@ fallback_blt:
- 		assert(src->depth == dst->depth);
- 		assert(src->width == dst->width);
- 		assert(src->height == dst->height);
--		return sna_render_copy_boxes__overlap(sna, alu,
--						      src, src_bo,
-+		return sna_render_copy_boxes__overlap(sna, alu, dst, dst_bo,
- 						      src_dx, src_dy,
- 						      dst_dx, dst_dy,
- 						      box, n, &extents);
-diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c
-index 6eb11452..445983b1 100644
---- a/src/sna/gen8_render.c
-+++ b/src/sna/gen8_render.c
-@@ -106,6 +106,12 @@ static const uint32_t ps_kernel_planar[][4] = {
- #include "exa_wm_yuv_rgb.g8b"
- #include "exa_wm_write.g8b"
- };
-+
-+static const uint32_t ps_kernel_rgb[][4] = {
-+#include "exa_wm_src_affine.g8b"
-+#include "exa_wm_src_sample_argb.g8b"
-+#include "exa_wm_write.g8b"
-+};
- #endif
- 
- #define SURFACE_DW (64 / sizeof(uint32_t));
-@@ -119,7 +125,7 @@ static const struct wm_kernel_info {
- 	const void *data;
- 	unsigned int size;
- 	int num_surfaces;
--} wm_kernels[] = {
-+} wm_kernels[GEN8_WM_KERNEL_COUNT] = {
- 	NOKERNEL(NOMASK, gen8_wm_kernel__affine, 2),
- 	NOKERNEL(NOMASK_P, gen8_wm_kernel__projective, 2),
- 
-@@ -138,6 +144,7 @@ static const struct wm_kernel_info {
- #if !NO_VIDEO
- 	KERNEL(VIDEO_PLANAR, ps_kernel_planar, 7),
- 	KERNEL(VIDEO_PACKED, ps_kernel_packed, 2),
-+	KERNEL(VIDEO_RGB, ps_kernel_rgb, 2),
- #endif
- };
- #undef KERNEL
-@@ -205,6 +212,33 @@ static const struct blendinfo {
- #define OUT_VERTEX(x,y) vertex_emit_2s(sna, x,y)
- #define OUT_VERTEX_F(v) vertex_emit(sna, v)
- 
-+struct gt_info {
-+	const char *name;
-+	struct {
-+		int max_vs_entries;
-+	} urb;
-+};
-+
-+static const struct gt_info bdw_gt_info = {
-+	.name = "Broadwell (gen8)",
-+	.urb = { .max_vs_entries = 960 },
-+};
-+
-+static bool is_bdw(struct sna *sna)
-+{
-+	return sna->kgem.gen == 0100;
-+}
-+
-+static const struct gt_info chv_gt_info = {
-+	.name = "Cherryview (gen8)",
-+	.urb = { .max_vs_entries = 640 },
-+};
-+
-+static bool is_chv(struct sna *sna)
-+{
-+	return sna->kgem.gen == 0101;
-+}
-+
- static inline bool too_large(int width, int height)
- {
- 	return width > GEN8_MAX_SIZE || height > GEN8_MAX_SIZE;
-@@ -462,7 +496,7 @@ gen8_emit_urb(struct sna *sna)
- {
- 	/* num of VS entries must be divisible by 8 if size < 9 */
- 	OUT_BATCH(GEN8_3DSTATE_URB_VS | (2 - 2));
--	OUT_BATCH(960 << URB_ENTRY_NUMBER_SHIFT |
-+	OUT_BATCH(sna->render_state.gen8.info->urb.max_vs_entries << URB_ENTRY_NUMBER_SHIFT |
- 		  (2 - 1) << URB_ENTRY_SIZE_SHIFT |
- 		  4 << URB_STARTING_ADDRESS_SHIFT);
- 
-@@ -873,7 +907,7 @@ gen8_emit_cc(struct sna *sna, uint32_t blend)
- 	assert(blend / GEN8_BLENDFACTOR_COUNT > 0);
- 	assert(blend % GEN8_BLENDFACTOR_COUNT > 0);
- 
--	/* XXX can have upto 8 blend states preload, selectable via
-+	/* XXX can have up to 8 blend states preload, selectable via
- 	 * Render Target Index. What other side-effects of Render Target Index?
- 	 */
- 
-@@ -1167,6 +1201,7 @@ gen8_emit_pipe_stall(struct sna *sna)
- {
- 	OUT_BATCH(GEN8_PIPE_CONTROL | (6 - 2));
- 	OUT_BATCH(PIPE_CONTROL_CS_STALL |
-+		  PIPE_CONTROL_FLUSH |
- 		  PIPE_CONTROL_STALL_AT_SCOREBOARD);
- 	OUT_BATCH64(0);
- 	OUT_BATCH64(0);
-@@ -1876,12 +1911,12 @@ gen8_composite_picture(struct sna *sna,
- 		if (channel->repeat ||
- 		    (x >= 0 &&
- 		     y >= 0 &&
--		     x + w < pixmap->drawable.width &&
--		     y + h < pixmap->drawable.height)) {
-+		     x + w <= pixmap->drawable.width &&
-+		     y + h <= pixmap->drawable.height)) {
- 			struct sna_pixmap *priv = sna_pixmap(pixmap);
- 			if (priv && priv->clear) {
- 				DBG(("%s: converting large pixmap source into solid [%08x]\n", __FUNCTION__, priv->clear_color));
--				return gen4_channel_init_solid(sna, channel, priv->clear_color);
-+				return gen4_channel_init_solid(sna, channel, solid_color(picture->format, priv->clear_color));
- 			}
- 		}
- 	} else
-@@ -1961,7 +1996,9 @@ gen8_composite_set_target(struct sna *sna,
- 	} else
- 		sna_render_picture_extents(dst, &box);
- 
--	hint = PREFER_GPU | FORCE_GPU | RENDER_GPU;
-+	hint = PREFER_GPU | RENDER_GPU;
-+	if (!need_tiling(sna, op->dst.width, op->dst.height))
-+		hint |= FORCE_GPU;
- 	if (!partial) {
- 		hint |= IGNORE_DAMAGE;
- 		if (w == op->dst.width && h == op->dst.height)
-@@ -2002,46 +2039,78 @@ gen8_composite_set_target(struct sna *sna,
- 
- static bool
- try_blt(struct sna *sna,
--	PicturePtr dst, PicturePtr src,
--	int width, int height)
-+	uint8_t op,
-+	PicturePtr src,
-+	PicturePtr mask,
-+	PicturePtr dst,
-+	int16_t src_x, int16_t src_y,
-+	int16_t msk_x, int16_t msk_y,
-+	int16_t dst_x, int16_t dst_y,
-+	int16_t width, int16_t height,
-+	unsigned flags,
-+	struct sna_composite_op *tmp)
- {
- 	struct kgem_bo *bo;
- 
- 	if (sna->kgem.mode == KGEM_BLT) {
- 		DBG(("%s: already performing BLT\n", __FUNCTION__));
--		return true;
-+		goto execute;
- 	}
- 
- 	if (too_large(width, height)) {
- 		DBG(("%s: operation too large for 3D pipe (%d, %d)\n",
- 		     __FUNCTION__, width, height));
--		return true;
-+		goto execute;
- 	}
- 
- 	bo = __sna_drawable_peek_bo(dst->pDrawable);
- 	if (bo == NULL)
--		return true;
--	if (bo->rq)
--		return RQ_IS_BLT(bo->rq);
-+		goto execute;
-+
-+	if (untiled_tlb_miss(bo))
-+		goto execute;
-+
-+	if (bo->rq) {
-+		if (RQ_IS_BLT(bo->rq))
-+			goto execute;
-+
-+		return false;
-+	}
-+
-+	if (bo->tiling == I915_TILING_Y)
-+		goto upload;
- 
- 	if (sna_picture_is_solid(src, NULL) && can_switch_to_blt(sna, bo, 0))
--		return true;
-+		goto execute;
-+
-+	if (src->pDrawable == dst->pDrawable &&
-+	    (sna->render_state.gt < 3 || width*height < 1024) &&
-+	    can_switch_to_blt(sna, bo, 0))
-+		goto execute;
- 
- 	if (src->pDrawable) {
--		bo = __sna_drawable_peek_bo(src->pDrawable);
--		if (bo == NULL)
--			return true;
-+		struct kgem_bo *s = __sna_drawable_peek_bo(src->pDrawable);
-+		if (s == NULL)
-+			goto upload;
- 
--		if (prefer_blt_bo(sna, bo))
--			return RQ_IS_BLT(bo->rq);
-+		if (prefer_blt_bo(sna, s, bo))
-+			goto execute;
- 	}
- 
- 	if (sna->kgem.ring == KGEM_BLT) {
- 		DBG(("%s: already performing BLT\n", __FUNCTION__));
--		return true;
-+		goto execute;
- 	}
- 
--	return false;
-+upload:
-+	flags |= COMPOSITE_UPLOAD;
-+execute:
-+	return sna_blt_composite(sna, op,
-+				 src, dst,
-+				 src_x, src_y,
-+				 dst_x, dst_y,
-+				 width, height,
-+				 flags, tmp);
- }
- 
- static bool
-@@ -2271,13 +2340,13 @@ gen8_render_composite(struct sna *sna,
- 	     width, height, sna->kgem.mode, sna->kgem.ring));
- 
- 	if (mask == NULL &&
--	    try_blt(sna, dst, src, width, height) &&
--	    sna_blt_composite(sna, op,
--			      src, dst,
--			      src_x, src_y,
--			      dst_x, dst_y,
--			      width, height,
--			      flags, tmp))
-+	    try_blt(sna, op,
-+		    src, mask, dst,
-+		    src_x, src_y,
-+		    msk_x, msk_y,
-+		    dst_x, dst_y,
-+		    width, height,
-+		    flags, tmp))
- 		return true;
- 
- 	if (gen8_composite_fallback(sna, src, mask, dst))
-@@ -2700,27 +2769,37 @@ prefer_blt_copy(struct sna *sna,
- 
- 	assert((flags & COPY_SYNC) == 0);
- 
--	if (src_bo == dst_bo && can_switch_to_blt(sna, dst_bo, flags))
--		return true;
--
- 	if (untiled_tlb_miss(src_bo) ||
- 	    untiled_tlb_miss(dst_bo))
- 		return true;
- 
--	if (force_blt_ring(sna))
-+	if (flags & COPY_DRI && !sna->kgem.has_semaphores)
-+		return false;
-+
-+	if (force_blt_ring(sna, dst_bo))
-+		return true;
-+
-+	if ((flags & COPY_SMALL ||
-+	     (sna->render_state.gt < 3 && src_bo == dst_bo)) &&
-+	    can_switch_to_blt(sna, dst_bo, flags))
- 		return true;
- 
- 	if (kgem_bo_is_render(dst_bo) ||
- 	    kgem_bo_is_render(src_bo))
- 		return false;
- 
-+	if (flags & COPY_LAST &&
-+	    sna->render_state.gt < 3 &&
-+            can_switch_to_blt(sna, dst_bo, flags))
-+		return true;
-+
- 	if (prefer_render_ring(sna, dst_bo))
- 		return false;
- 
- 	if (!prefer_blt_ring(sna, dst_bo, flags))
- 		return false;
- 
--	return prefer_blt_bo(sna, src_bo) || prefer_blt_bo(sna, dst_bo);
-+	return prefer_blt_bo(sna, src_bo, dst_bo);
- }
- 
- static bool
-@@ -2770,7 +2849,7 @@ fallback_blt:
- 		     &extents)) {
- 		bool big = too_large(extents.x2-extents.x1, extents.y2-extents.y1);
- 
--		if ((big || can_switch_to_blt(sna, dst_bo, flags)) &&
-+		if ((big || !prefer_render_ring(sna, dst_bo)) &&
- 		    sna_blt_copy_boxes(sna, alu,
- 				       src_bo, src_dx, src_dy,
- 				       dst_bo, dst_dx, dst_dy,
-@@ -2785,8 +2864,7 @@ fallback_blt:
- 		assert(src->depth == dst->depth);
- 		assert(src->width == dst->width);
- 		assert(src->height == dst->height);
--		return sna_render_copy_boxes__overlap(sna, alu,
--						      src, src_bo,
-+		return sna_render_copy_boxes__overlap(sna, alu, dst, dst_bo,
- 						      src_dx, src_dy,
- 						      dst_dx, dst_dy,
- 						      box, n, &extents);
-@@ -3665,7 +3743,9 @@ static void gen8_emit_video_state(struct sna *sna,
- 			frame->pitch[0];
- 		n_src = 6;
- 	} else {
--		if (frame->id == FOURCC_UYVY)
-+		if (frame->id == FOURCC_RGB888)
-+			src_surf_format = SURFACEFORMAT_B8G8R8X8_UNORM;
-+		else if (frame->id == FOURCC_UYVY)
- 			src_surf_format = SURFACEFORMAT_YCRCB_SWAPY;
- 		else
- 			src_surf_format = SURFACEFORMAT_YCRCB_NORMAL;
-@@ -3697,6 +3777,23 @@ static void gen8_emit_video_state(struct sna *sna,
- 	gen8_emit_state(sna, op, offset);
- }
- 
-+static unsigned select_video_kernel(const struct sna_video_frame *frame)
-+{
-+	switch (frame->id) {
-+	case FOURCC_YV12:
-+	case FOURCC_I420:
-+	case FOURCC_XVMC:
-+		return GEN8_WM_KERNEL_VIDEO_PLANAR;
-+
-+	case FOURCC_RGB888:
-+	case FOURCC_RGB565:
-+		return GEN8_WM_KERNEL_VIDEO_RGB;
-+
-+	default:
-+		return GEN8_WM_KERNEL_VIDEO_PACKED;
-+	}
-+}
-+
- static bool
- gen8_render_video(struct sna *sna,
- 		  struct sna_video *video,
-@@ -3712,9 +3809,9 @@ gen8_render_video(struct sna *sna,
- 	int src_height = frame->src.y2 - frame->src.y1;
- 	float src_offset_x, src_offset_y;
- 	float src_scale_x, src_scale_y;
--	int nbox, pix_xoff, pix_yoff;
- 	unsigned filter;
- 	const BoxRec *box;
-+	int nbox;
- 
- 	DBG(("%s: src=(%d, %d), dst=(%d, %d), %dx[(%d, %d), (%d, %d)...]\n",
- 	     __FUNCTION__,
-@@ -3743,6 +3840,11 @@ gen8_render_video(struct sna *sna,
- 	tmp.floats_per_vertex = 3;
- 	tmp.floats_per_rect = 9;
- 
-+	DBG(("%s: scaling?=%d, planar?=%d [%x]\n",
-+	     __FUNCTION__,
-+	     src_width != dst_width || src_height != dst_height,
-+	     is_planar_fourcc(frame->id), frame->id));
-+
- 	if (src_width == dst_width && src_height == dst_height)
- 		filter = SAMPLER_FILTER_NEAREST;
- 	else
-@@ -3752,9 +3854,7 @@ gen8_render_video(struct sna *sna,
- 		GEN8_SET_FLAGS(SAMPLER_OFFSET(filter, SAMPLER_EXTEND_PAD,
- 					      SAMPLER_FILTER_NEAREST, SAMPLER_EXTEND_NONE),
- 			       NO_BLEND,
--			       is_planar_fourcc(frame->id) ?
--			       GEN8_WM_KERNEL_VIDEO_PLANAR :
--			       GEN8_WM_KERNEL_VIDEO_PACKED,
-+			       select_video_kernel(frame),
- 			       2);
- 	tmp.priv = frame;
- 
-@@ -3770,17 +3870,6 @@ gen8_render_video(struct sna *sna,
- 	gen8_align_vertex(sna, &tmp);
- 	gen8_emit_video_state(sna, &tmp);
- 
--	/* Set up the offset for translating from the given region (in screen
--	 * coordinates) to the backing pixmap.
--	 */
--#ifdef COMPOSITE
--	pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
--	pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
--#else
--	pix_xoff = 0;
--	pix_yoff = 0;
--#endif
--
- 	DBG(("%s: src=(%d, %d)x(%d, %d); frame=(%dx%d), dst=(%dx%d)\n",
- 	     __FUNCTION__,
- 	     frame->src.x1, frame->src.y1,
-@@ -3802,45 +3891,36 @@ gen8_render_video(struct sna *sna,
- 	box = region_rects(dstRegion);
- 	nbox = region_num_rects(dstRegion);
- 	while (nbox--) {
--		BoxRec r;
--
- 		DBG(("%s: dst=(%d, %d), (%d, %d) + (%d, %d); src=(%f, %f), (%f, %f)\n",
- 		     __FUNCTION__,
- 		     box->x1, box->y1,
- 		     box->x2, box->y2,
--		     pix_xoff, pix_yoff,
- 		     box->x1 * src_scale_x + src_offset_x,
- 		     box->y1 * src_scale_y + src_offset_y,
- 		     box->x2 * src_scale_x + src_offset_x,
- 		     box->y2 * src_scale_y + src_offset_y));
- 
--		r.x1 = box->x1 + pix_xoff;
--		r.x2 = box->x2 + pix_xoff;
--		r.y1 = box->y1 + pix_yoff;
--		r.y2 = box->y2 + pix_yoff;
--
- 		gen8_get_rectangles(sna, &tmp, 1, gen8_emit_video_state);
- 
--		OUT_VERTEX(r.x2, r.y2);
-+		OUT_VERTEX(box->x2, box->y2);
- 		OUT_VERTEX_F(box->x2 * src_scale_x + src_offset_x);
- 		OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- 
--		OUT_VERTEX(r.x1, r.y2);
-+		OUT_VERTEX(box->x1, box->y2);
- 		OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
- 		OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- 
--		OUT_VERTEX(r.x1, r.y1);
-+		OUT_VERTEX(box->x1, box->y1);
- 		OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
- 		OUT_VERTEX_F(box->y1 * src_scale_y + src_offset_y);
- 
--		if (!DAMAGE_IS_ALL(priv->gpu_damage)) {
--			sna_damage_add_box(&priv->gpu_damage, &r);
--			sna_damage_subtract_box(&priv->cpu_damage, &r);
--		}
- 		box++;
- 	}
--
- 	gen8_vertex_flush(sna);
-+
-+	if (!DAMAGE_IS_ALL(priv->gpu_damage))
-+		sna_damage_add(&priv->gpu_damage, dstRegion);
-+
- 	return true;
- }
- #endif
-@@ -3896,6 +3976,13 @@ static bool gen8_render_setup(struct sna *sna)
- 		state->gt = ((devid >> 4) & 0xf) + 1;
- 	DBG(("%s: gt=%d\n", __FUNCTION__, state->gt));
- 
-+	if (is_bdw(sna))
-+		state->info = &bdw_gt_info;
-+	else if (is_chv(sna))
-+		state->info = &chv_gt_info;
-+	else
-+		return false;
-+
- 	sna_static_stream_init(&general);
- 
- 	/* Zero pad the start. If you see an offset of 0x0 in the batchbuffer
-@@ -4007,5 +4094,5 @@ const char *gen8_render_init(struct sna *sna, const char *backend)
- 
- 	sna->render.max_3d_size = GEN8_MAX_SIZE;
- 	sna->render.max_3d_pitch = 1 << 18;
--	return "Broadwell";
-+	return sna->render_state.gen8.info->name;
- }
-diff --git a/src/sna/gen8_render.h b/src/sna/gen8_render.h
-index eb4928e7..e6a8dc55 100644
---- a/src/sna/gen8_render.h
-+++ b/src/sna/gen8_render.h
-@@ -335,6 +335,7 @@
- #define PIPE_CONTROL_IS_FLUSH      (1 << 11)
- #define PIPE_CONTROL_TC_FLUSH      (1 << 10)
- #define PIPE_CONTROL_NOTIFY_ENABLE (1 << 8)
-+#define PIPE_CONTROL_FLUSH         (1 << 7)
- #define PIPE_CONTROL_GLOBAL_GTT    (1 << 2)
- #define PIPE_CONTROL_LOCAL_PGTT    (0 << 2)
- #define PIPE_CONTROL_STALL_AT_SCOREBOARD   (1 << 1)
-diff --git a/src/sna/gen9_render.c b/src/sna/gen9_render.c
-new file mode 100644
-index 00000000..e5f12c72
---- /dev/null
-+++ b/src/sna/gen9_render.c
-@@ -0,0 +1,4156 @@
-+/*
-+ * Copyright © 2012,2013 Intel Corporation
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ *
-+ * Authors:
-+ *    Chris Wilson <chris@chris-wilson.co.uk>
-+ *
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include "sna.h"
-+#include "sna_reg.h"
-+#include "sna_render.h"
-+#include "sna_render_inline.h"
-+#include "sna_video.h"
-+
-+#include "gen9_render.h"
-+#include "gen8_eu.h"
-+#include "gen4_common.h"
-+#include "gen4_source.h"
-+#include "gen4_vertex.h"
-+#include "gen6_common.h"
-+#include "gen8_vertex.h"
-+
-+#define SIM 1
-+
-+#define ALWAYS_INVALIDATE 0
-+#define ALWAYS_FLUSH 0
-+#define ALWAYS_STALL 0
-+
-+#define NO_COMPOSITE 0
-+#define NO_COMPOSITE_SPANS 0
-+#define NO_COPY 0
-+#define NO_COPY_BOXES 0
-+#define NO_FILL 0
-+#define NO_FILL_BOXES 0
-+#define NO_FILL_ONE 0
-+#define NO_FILL_CLEAR 0
-+#define NO_VIDEO 0
-+
-+#define USE_8_PIXEL_DISPATCH 1
-+#define USE_16_PIXEL_DISPATCH 1
-+#define USE_32_PIXEL_DISPATCH 0
-+
-+#if !USE_8_PIXEL_DISPATCH && !USE_16_PIXEL_DISPATCH && !USE_32_PIXEL_DISPATCH
-+#error "Must select at least 8, 16 or 32 pixel dispatch"
-+#endif
-+
-+#define GEN9_MAX_SIZE 16384
-+#define GEN9_GT_BIAS 1 /* Each GT is bigger than previous gen */
-+
-+/* XXX Todo
-+ *
-+ * STR (software tiled rendering) mode. No, really.
-+ * 64x32 pixel blocks align with the rendering cache. Worth considering.
-+ */
-+
-+#define is_aligned(x, y) (((x) & ((y) - 1)) == 0)
-+
-+/* Pipeline stages:
-+ *  1. Command Streamer (CS)
-+ *  2. Vertex Fetch (VF)
-+ *  3. Vertex Shader (VS)
-+ *  4. Hull Shader (HS)
-+ *  5. Tesselation Engine (TE)
-+ *  6. Domain Shader (DS)
-+ *  7. Geometry Shader (GS)
-+ *  8. Stream Output Logic (SOL)
-+ *  9. Clipper (CLIP)
-+ * 10. Strip/Fan (SF)
-+ * 11. Windower/Masker (WM)
-+ * 12. Color Calculator (CC)
-+ */
-+
-+#if !NO_VIDEO
-+static const uint32_t ps_kernel_packed[][4] = {
-+#include "exa_wm_src_affine.g8b"
-+#include "exa_wm_src_sample_argb.g8b"
-+#include "exa_wm_yuv_rgb.g8b"
-+#include "exa_wm_write.g8b"
-+};
-+
-+static const uint32_t ps_kernel_planar[][4] = {
-+#include "exa_wm_src_affine.g8b"
-+#include "exa_wm_src_sample_planar.g8b"
-+#include "exa_wm_yuv_rgb.g8b"
-+#include "exa_wm_write.g8b"
-+};
-+
-+static const uint32_t ps_kernel_rgb[][4] = {
-+#include "exa_wm_src_affine.g8b"
-+#include "exa_wm_src_sample_argb.g8b"
-+#include "exa_wm_write.g8b"
-+};
-+#endif
-+
-+#define SURFACE_DW (64 / sizeof(uint32_t));
-+
-+#define KERNEL(kernel_enum, kernel, num_surfaces) \
-+    [GEN9_WM_KERNEL_##kernel_enum] = {#kernel_enum, kernel, sizeof(kernel), num_surfaces}
-+#define NOKERNEL(kernel_enum, func, num_surfaces) \
-+    [GEN9_WM_KERNEL_##kernel_enum] = {#kernel_enum, (void *)func, 0, num_surfaces}
-+static const struct wm_kernel_info {
-+	const char *name;
-+	const void *data;
-+	unsigned int size;
-+	int num_surfaces;
-+} wm_kernels[] = {
-+	NOKERNEL(NOMASK, gen8_wm_kernel__affine, 2),
-+	NOKERNEL(NOMASK_P, gen8_wm_kernel__projective, 2),
-+
-+	NOKERNEL(MASK, gen8_wm_kernel__affine_mask, 3),
-+	NOKERNEL(MASK_P, gen8_wm_kernel__projective_mask, 3),
-+
-+	NOKERNEL(MASKCA, gen8_wm_kernel__affine_mask_ca, 3),
-+	NOKERNEL(MASKCA_P, gen8_wm_kernel__projective_mask_ca, 3),
-+
-+	NOKERNEL(MASKSA, gen8_wm_kernel__affine_mask_sa, 3),
-+	NOKERNEL(MASKSA_P, gen8_wm_kernel__projective_mask_sa, 3),
-+
-+	NOKERNEL(OPACITY, gen8_wm_kernel__affine_opacity, 2),
-+	NOKERNEL(OPACITY_P, gen8_wm_kernel__projective_opacity, 2),
-+
-+#if !NO_VIDEO
-+	KERNEL(VIDEO_PLANAR, ps_kernel_planar, 7),
-+	KERNEL(VIDEO_PACKED, ps_kernel_packed, 2),
-+	KERNEL(VIDEO_RGB, ps_kernel_rgb, 2),
-+#endif
-+};
-+#undef KERNEL
-+
-+static const struct blendinfo {
-+	uint8_t src_alpha;
-+	uint8_t src_blend;
-+	uint8_t dst_blend;
-+} gen9_blend_op[] = {
-+	/* Clear */	{0, BLENDFACTOR_ZERO, BLENDFACTOR_ZERO},
-+	/* Src */	{0, BLENDFACTOR_ONE, BLENDFACTOR_ZERO},
-+	/* Dst */	{0, BLENDFACTOR_ZERO, BLENDFACTOR_ONE},
-+	/* Over */	{1, BLENDFACTOR_ONE, BLENDFACTOR_INV_SRC_ALPHA},
-+	/* OverReverse */ {0, BLENDFACTOR_INV_DST_ALPHA, BLENDFACTOR_ONE},
-+	/* In */	{0, BLENDFACTOR_DST_ALPHA, BLENDFACTOR_ZERO},
-+	/* InReverse */	{1, BLENDFACTOR_ZERO, BLENDFACTOR_SRC_ALPHA},
-+	/* Out */	{0, BLENDFACTOR_INV_DST_ALPHA, BLENDFACTOR_ZERO},
-+	/* OutReverse */ {1, BLENDFACTOR_ZERO, BLENDFACTOR_INV_SRC_ALPHA},
-+	/* Atop */	{1, BLENDFACTOR_DST_ALPHA, BLENDFACTOR_INV_SRC_ALPHA},
-+	/* AtopReverse */ {1, BLENDFACTOR_INV_DST_ALPHA, BLENDFACTOR_SRC_ALPHA},
-+	/* Xor */	{1, BLENDFACTOR_INV_DST_ALPHA, BLENDFACTOR_INV_SRC_ALPHA},
-+	/* Add */	{0, BLENDFACTOR_ONE, BLENDFACTOR_ONE},
-+};
-+
-+/**
-+ * Highest-valued BLENDFACTOR used in gen9_blend_op.
-+ *
-+ * This leaves out GEN9_BLENDFACTOR_INV_DST_COLOR,
-+ * GEN9_BLENDFACTOR_INV_CONST_{COLOR,ALPHA},
-+ * GEN9_BLENDFACTOR_INV_SRC1_{COLOR,ALPHA}
-+ */
-+#define GEN9_BLENDFACTOR_COUNT (BLENDFACTOR_INV_DST_ALPHA + 1)
-+
-+#define GEN9_BLEND_STATE_PADDED_SIZE	ALIGN(sizeof(struct gen9_blend_state), 64)
-+
-+#define BLEND_OFFSET(s, d) \
-+	((d != BLENDFACTOR_ZERO) << 15 | ((s) * GEN9_BLENDFACTOR_COUNT + (d)) << 4)
-+
-+#define NO_BLEND BLEND_OFFSET(BLENDFACTOR_ONE, BLENDFACTOR_ZERO)
-+#define CLEAR BLEND_OFFSET(BLENDFACTOR_ZERO, BLENDFACTOR_ZERO)
-+
-+#define SAMPLER_OFFSET(sf, se, mf, me) \
-+	(((((sf) * EXTEND_COUNT + (se)) * FILTER_COUNT + (mf)) * EXTEND_COUNT + (me)) + 2)
-+
-+#define VERTEX_2s2s 0
-+
-+#define COPY_SAMPLER 0
-+#define COPY_VERTEX VERTEX_2s2s
-+#define COPY_FLAGS(a) GEN9_SET_FLAGS(COPY_SAMPLER, (a) == GXcopy ? NO_BLEND : CLEAR, GEN9_WM_KERNEL_NOMASK, COPY_VERTEX)
-+
-+#define FILL_SAMPLER 1
-+#define FILL_VERTEX VERTEX_2s2s
-+#define FILL_FLAGS(op, format) GEN9_SET_FLAGS(FILL_SAMPLER, gen9_get_blend((op), false, (format)), GEN9_WM_KERNEL_NOMASK, FILL_VERTEX)
-+#define FILL_FLAGS_NOBLEND GEN9_SET_FLAGS(FILL_SAMPLER, NO_BLEND, GEN9_WM_KERNEL_NOMASK, FILL_VERTEX)
-+
-+#define GEN9_SAMPLER(f) (((f) >> 20) & 0xfff)
-+#define GEN9_BLEND(f) (((f) >> 4) & 0x7ff)
-+#define GEN9_READS_DST(f) (((f) >> 15) & 1)
-+#define GEN9_KERNEL(f) (((f) >> 16) & 0xf)
-+#define GEN9_VERTEX(f) (((f) >> 0) & 0xf)
-+#define GEN9_SET_FLAGS(S, B, K, V)  ((S) << 20 | (K) << 16 | (B) | (V))
-+
-+#define OUT_BATCH(v) batch_emit(sna, v)
-+#define OUT_BATCH64(v) batch_emit64(sna, v)
-+#define OUT_VERTEX(x,y) vertex_emit_2s(sna, x,y)
-+#define OUT_VERTEX_F(v) vertex_emit(sna, v)
-+
-+struct gt_info {
-+	const char *name;
-+	struct {
-+		int max_vs_entries;
-+	} urb;
-+};
-+
-+static const struct gt_info min_gt_info = {
-+	.name = "Skylake (gen9)",
-+	.urb = { .max_vs_entries = 240 },
-+};
-+
-+static const struct gt_info skl_gt_info = {
-+	.name = "Skylake (gen9)",
-+	.urb = { .max_vs_entries = 960 },
-+};
-+
-+static const struct gt_info bxt_gt_info = {
-+	.name = "Broxton (gen9)",
-+	.urb = { .max_vs_entries = 320 },
-+};
-+
-+static const struct gt_info kbl_gt_info = {
-+	.name = "Kabylake (gen9)",
-+	.urb = { .max_vs_entries = 960 },
-+};
-+
-+static const struct gt_info glk_gt_info = {
-+	.name = "Geminilake (gen9)",
-+	.urb = { .max_vs_entries = 320 },
-+};
-+
-+static bool is_skl(struct sna *sna)
-+{
-+	return sna->kgem.gen == 0110;
-+}
-+
-+static bool is_bxt(struct sna *sna)
-+{
-+	return sna->kgem.gen == 0111;
-+}
-+
-+static bool is_kbl(struct sna *sna)
-+{
-+	return sna->kgem.gen == 0112;
-+}
-+
-+static bool is_glk(struct sna *sna)
-+{
-+	return sna->kgem.gen == 0113;
-+}
-+
-+
-+static inline bool too_large(int width, int height)
-+{
-+	return width > GEN9_MAX_SIZE || height > GEN9_MAX_SIZE;
-+}
-+
-+static inline bool unaligned(struct kgem_bo *bo, int bpp)
-+{
-+	/* XXX What exactly do we need to meet H_ALIGN and V_ALIGN? */
-+#if 0
-+	int x, y;
-+
-+	if (bo->proxy == NULL)
-+		return false;
-+
-+	/* Assume that all tiled proxies are constructed correctly. */
-+	if (bo->tiling)
-+		return false;
-+
-+	DBG(("%s: checking alignment of a linear proxy, offset=%d, pitch=%d, bpp=%d: => (%d, %d)\n",
-+	     __FUNCTION__, bo->delta, bo->pitch, bpp,
-+	     8 * (bo->delta % bo->pitch) / bpp, bo->delta / bo->pitch));
-+
-+	/* This may be a random userptr map, check that it meets the
-+	 * render alignment of SURFACE_VALIGN_4 | SURFACE_HALIGN_4.
-+	 */
-+	y = bo->delta / bo->pitch;
-+	if (y & 3)
-+		return true;
-+
-+	x = 8 * (bo->delta - y * bo->pitch);
-+	if (x & (4*bpp - 1))
-+	    return true;
-+
-+	return false;
-+#else
-+	return false;
-+#endif
-+}
-+
-+static uint32_t gen9_get_blend(int op,
-+			       bool has_component_alpha,
-+			       uint32_t dst_format)
-+{
-+	uint32_t src, dst;
-+
-+	COMPILE_TIME_ASSERT(BLENDFACTOR_INV_DST_ALPHA*GEN9_BLENDFACTOR_COUNT + BLENDFACTOR_INV_DST_ALPHA <= 0x7ff);
-+
-+	src = gen9_blend_op[op].src_blend;
-+	dst = gen9_blend_op[op].dst_blend;
-+
-+	/* If there's no dst alpha channel, adjust the blend op so that
-+	 * we'll treat it always as 1.
-+	 */
-+	if (PICT_FORMAT_A(dst_format) == 0) {
-+		if (src == BLENDFACTOR_DST_ALPHA)
-+			src = BLENDFACTOR_ONE;
-+		else if (src == BLENDFACTOR_INV_DST_ALPHA)
-+			src = BLENDFACTOR_ZERO;
-+	}
-+
-+	/* If the source alpha is being used, then we should only be in a
-+	 * case where the source blend factor is 0, and the source blend
-+	 * value is the mask channels multiplied by the source picture's alpha.
-+	 */
-+	if (has_component_alpha && gen9_blend_op[op].src_alpha) {
-+		if (dst == BLENDFACTOR_SRC_ALPHA)
-+			dst = BLENDFACTOR_SRC_COLOR;
-+		else if (dst == BLENDFACTOR_INV_SRC_ALPHA)
-+			dst = BLENDFACTOR_INV_SRC_COLOR;
-+	}
-+
-+	DBG(("blend op=%d, dst=%x [A=%d] => src=%d, dst=%d => offset=%x\n",
-+	     op, dst_format, PICT_FORMAT_A(dst_format),
-+	     src, dst, (int)(BLEND_OFFSET(src, dst)>>4)));
-+	assert(BLEND_OFFSET(src, dst) >> 4 <= 0xfff);
-+	return BLEND_OFFSET(src, dst);
-+}
-+
-+static uint32_t gen9_get_card_format(PictFormat format)
-+{
-+	switch (format) {
-+	default:
-+		return -1;
-+	case PICT_a8r8g8b8:
-+		return SURFACEFORMAT_B8G8R8A8_UNORM;
-+	case PICT_x8r8g8b8:
-+		return SURFACEFORMAT_B8G8R8X8_UNORM;
-+	case PICT_a8b8g8r8:
-+		return SURFACEFORMAT_R8G8B8A8_UNORM;
-+	case PICT_x8b8g8r8:
-+		return SURFACEFORMAT_R8G8B8X8_UNORM;
-+#ifdef PICT_a2r10g10b10
-+	case PICT_a2r10g10b10:
-+		return SURFACEFORMAT_B10G10R10A2_UNORM;
-+	case PICT_x2r10g10b10:
-+		return SURFACEFORMAT_B10G10R10X2_UNORM;
-+#endif
-+	case PICT_r8g8b8:
-+		return SURFACEFORMAT_R8G8B8_UNORM;
-+	case PICT_r5g6b5:
-+		return SURFACEFORMAT_B5G6R5_UNORM;
-+	case PICT_a1r5g5b5:
-+		return SURFACEFORMAT_B5G5R5A1_UNORM;
-+	case PICT_a8:
-+		return SURFACEFORMAT_A8_UNORM;
-+	case PICT_a4r4g4b4:
-+		return SURFACEFORMAT_B4G4R4A4_UNORM;
-+	}
-+}
-+
-+static uint32_t gen9_get_dest_format(PictFormat format)
-+{
-+	switch (format) {
-+	default:
-+		return -1;
-+	case PICT_a8r8g8b8:
-+	case PICT_x8r8g8b8:
-+		return SURFACEFORMAT_B8G8R8A8_UNORM;
-+	case PICT_a8b8g8r8:
-+	case PICT_x8b8g8r8:
-+		return SURFACEFORMAT_R8G8B8A8_UNORM;
-+#ifdef PICT_a2r10g10b10
-+	case PICT_a2r10g10b10:
-+	case PICT_x2r10g10b10:
-+		return SURFACEFORMAT_B10G10R10A2_UNORM;
-+#endif
-+	case PICT_r5g6b5:
-+		return SURFACEFORMAT_B5G6R5_UNORM;
-+	case PICT_x1r5g5b5:
-+	case PICT_a1r5g5b5:
-+		return SURFACEFORMAT_B5G5R5A1_UNORM;
-+	case PICT_a8:
-+		return SURFACEFORMAT_A8_UNORM;
-+	case PICT_a4r4g4b4:
-+	case PICT_x4r4g4b4:
-+		return SURFACEFORMAT_B4G4R4A4_UNORM;
-+	}
-+}
-+
-+static bool gen9_check_dst_format(PictFormat format)
-+{
-+	if (gen9_get_dest_format(format) != -1)
-+		return true;
-+
-+	DBG(("%s: unhandled format: %x\n", __FUNCTION__, (int)format));
-+	return false;
-+}
-+
-+static bool gen9_check_format(uint32_t format)
-+{
-+	if (gen9_get_card_format(format) != -1)
-+		return true;
-+
-+	DBG(("%s: unhandled format: %x\n", __FUNCTION__, (int)format));
-+	return false;
-+}
-+
-+static uint32_t gen9_filter(uint32_t filter)
-+{
-+	switch (filter) {
-+	default:
-+		assert(0);
-+	case PictFilterNearest:
-+		return SAMPLER_FILTER_NEAREST;
-+	case PictFilterBilinear:
-+		return SAMPLER_FILTER_BILINEAR;
-+	}
-+}
-+
-+static uint32_t gen9_check_filter(PicturePtr picture)
-+{
-+	switch (picture->filter) {
-+	case PictFilterNearest:
-+	case PictFilterBilinear:
-+		return true;
-+	default:
-+		return false;
-+	}
-+}
-+
-+static uint32_t gen9_repeat(uint32_t repeat)
-+{
-+	switch (repeat) {
-+	default:
-+		assert(0);
-+	case RepeatNone:
-+		return SAMPLER_EXTEND_NONE;
-+	case RepeatNormal:
-+		return SAMPLER_EXTEND_REPEAT;
-+	case RepeatPad:
-+		return SAMPLER_EXTEND_PAD;
-+	case RepeatReflect:
-+		return SAMPLER_EXTEND_REFLECT;
-+	}
-+}
-+
-+static bool gen9_check_repeat(PicturePtr picture)
-+{
-+	if (!picture->repeat)
-+		return true;
-+
-+	switch (picture->repeatType) {
-+	case RepeatNone:
-+	case RepeatNormal:
-+	case RepeatPad:
-+	case RepeatReflect:
-+		return true;
-+	default:
-+		return false;
-+	}
-+}
-+
-+static int
-+gen9_choose_composite_kernel(int op, bool has_mask, bool is_ca, bool is_affine)
-+{
-+	int base;
-+
-+	if (has_mask) {
-+		if (is_ca) {
-+			if (gen9_blend_op[op].src_alpha)
-+				base = GEN9_WM_KERNEL_MASKSA;
-+			else
-+				base = GEN9_WM_KERNEL_MASKCA;
-+		} else
-+			base = GEN9_WM_KERNEL_MASK;
-+	} else
-+		base = GEN9_WM_KERNEL_NOMASK;
-+
-+	return base + !is_affine;
-+}
-+
-+static void
-+gen9_emit_push_constants(struct sna *sna)
-+{
-+#if SIM
-+	OUT_BATCH(GEN9_3DSTATE_PUSH_CONSTANT_ALLOC_VS | (2 - 2));
-+	OUT_BATCH(0);
-+
-+	OUT_BATCH(GEN9_3DSTATE_PUSH_CONSTANT_ALLOC_HS | (2 - 2));
-+	OUT_BATCH(0);
-+
-+	OUT_BATCH(GEN9_3DSTATE_PUSH_CONSTANT_ALLOC_DS | (2 - 2));
-+	OUT_BATCH(0);
-+
-+	OUT_BATCH(GEN9_3DSTATE_PUSH_CONSTANT_ALLOC_GS | (2 - 2));
-+	OUT_BATCH(0);
-+
-+	OUT_BATCH(GEN9_3DSTATE_PUSH_CONSTANT_ALLOC_PS | (2 - 2));
-+	OUT_BATCH(0);
-+#endif
-+}
-+
-+static void
-+gen9_emit_urb(struct sna *sna)
-+{
-+	/* num of VS entries must be divisible by 8 if size < 9 */
-+	OUT_BATCH(GEN9_3DSTATE_URB_VS | (2 - 2));
-+	OUT_BATCH(sna->render_state.gen9.info->urb.max_vs_entries << URB_ENTRY_NUMBER_SHIFT |
-+		  (2 - 1) << URB_ENTRY_SIZE_SHIFT |
-+		  4 << URB_STARTING_ADDRESS_SHIFT);
-+
-+	OUT_BATCH(GEN9_3DSTATE_URB_HS | (2 - 2));
-+	OUT_BATCH(0 << URB_ENTRY_SIZE_SHIFT |
-+		  4 << URB_STARTING_ADDRESS_SHIFT);
-+
-+	OUT_BATCH(GEN9_3DSTATE_URB_DS | (2 - 2));
-+	OUT_BATCH(0 << URB_ENTRY_SIZE_SHIFT |
-+		  4 << URB_STARTING_ADDRESS_SHIFT);
-+
-+	OUT_BATCH(GEN9_3DSTATE_URB_GS | (2 - 2));
-+	OUT_BATCH(0 << URB_ENTRY_SIZE_SHIFT |
-+		  4 << URB_STARTING_ADDRESS_SHIFT);
-+}
-+
-+static void
-+gen9_emit_state_base_address(struct sna *sna)
-+{
-+	uint32_t num_pages;
-+
-+	assert(sna->kgem.surface - sna->kgem.nbatch <= 16384);
-+
-+	/* WaBindlessSurfaceStateModifyEnable:skl,bxt */
-+	OUT_BATCH(GEN9_STATE_BASE_ADDRESS | (19 - 1 - 2));
-+	OUT_BATCH64(0); /* general */
-+	OUT_BATCH(0); /* stateless dataport */
-+	OUT_BATCH64(kgem_add_reloc64(&sna->kgem, /* surface */
-+				     sna->kgem.nbatch,
-+				     NULL,
-+				     I915_GEM_DOMAIN_INSTRUCTION << 16,
-+				     BASE_ADDRESS_MODIFY));
-+	OUT_BATCH64(kgem_add_reloc64(&sna->kgem, /* dynamic */
-+				     sna->kgem.nbatch,
-+				     sna->render_state.gen9.general_bo,
-+				     I915_GEM_DOMAIN_INSTRUCTION << 16,
-+				     BASE_ADDRESS_MODIFY));
-+	OUT_BATCH64(0); /* indirect */
-+	OUT_BATCH64(kgem_add_reloc64(&sna->kgem, /* instruction */
-+				     sna->kgem.nbatch,
-+				     sna->render_state.gen9.general_bo,
-+				     I915_GEM_DOMAIN_INSTRUCTION << 16,
-+				     BASE_ADDRESS_MODIFY));
-+	/* upper bounds */
-+	num_pages = sna->render_state.gen9.general_bo->size.pages.count;
-+	OUT_BATCH(0); /* general */
-+	OUT_BATCH(num_pages << 12 | 1); /* dynamic */
-+	OUT_BATCH(0); /* indirect */
-+	OUT_BATCH(num_pages << 12 | 1); /* instruction */
-+
-+	/* Bindless */
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+}
-+
-+static void
-+gen9_emit_vs_invariant(struct sna *sna)
-+{
-+	OUT_BATCH(GEN9_3DSTATE_VS | (9 - 2));
-+	OUT_BATCH64(0); /* no VS kernel */
-+	OUT_BATCH(0);
-+	OUT_BATCH64(0); /* scratch */
-+	OUT_BATCH(0);
-+	OUT_BATCH(1 << 1); /* pass-through */
-+	OUT_BATCH(1 << 16 | 1 << 21); /* urb write to SBE */
-+
-+#if SIM
-+	OUT_BATCH(GEN9_3DSTATE_CONSTANT_VS | (11 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+
-+	OUT_BATCH(GEN9_3DSTATE_BINDING_TABLE_POINTERS_VS | (2 - 2));
-+	OUT_BATCH(0);
-+
-+	OUT_BATCH(GEN9_3DSTATE_SAMPLER_STATE_POINTERS_VS | (2 - 2));
-+	OUT_BATCH(0);
-+#endif
-+}
-+
-+static void
-+gen9_emit_hs_invariant(struct sna *sna)
-+{
-+	OUT_BATCH(GEN9_3DSTATE_HS | (9 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH64(0); /* no HS kernel */
-+	OUT_BATCH64(0); /* scratch */
-+	OUT_BATCH(0);
-+	OUT_BATCH(0); /* pass-through */
-+
-+#if SIM
-+	OUT_BATCH(GEN9_3DSTATE_CONSTANT_HS | (11 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+
-+#if 1
-+	OUT_BATCH(GEN9_3DSTATE_BINDING_TABLE_POINTERS_HS | (2 - 2));
-+	OUT_BATCH(0);
-+
-+	OUT_BATCH(GEN9_3DSTATE_SAMPLER_STATE_POINTERS_HS | (2 - 2));
-+	OUT_BATCH(0);
-+#endif
-+#endif
-+}
-+
-+static void
-+gen9_emit_te_invariant(struct sna *sna)
-+{
-+	OUT_BATCH(GEN9_3DSTATE_TE | (4 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+}
-+
-+static void
-+gen9_emit_ds_invariant(struct sna *sna)
-+{
-+	OUT_BATCH(GEN9_3DSTATE_DS | (11 - 2));
-+	OUT_BATCH64(0); /* no kernel */
-+	OUT_BATCH(0);
-+	OUT_BATCH64(0); /* scratch */
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+
-+#if SIM
-+	OUT_BATCH(GEN9_3DSTATE_CONSTANT_DS | (11 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+
-+#if 1
-+	OUT_BATCH(GEN9_3DSTATE_BINDING_TABLE_POINTERS_DS | (2 - 2));
-+	OUT_BATCH(0);
-+
-+	OUT_BATCH(GEN9_3DSTATE_SAMPLER_STATE_POINTERS_DS | (2 - 2));
-+	OUT_BATCH(0);
-+#endif
-+#endif
-+}
-+
-+static void
-+gen9_emit_gs_invariant(struct sna *sna)
-+{
-+	OUT_BATCH(GEN9_3DSTATE_GS | (10 - 2));
-+	OUT_BATCH64(0); /* no GS kernel */
-+	OUT_BATCH(0);
-+	OUT_BATCH64(0); /* scratch */
-+	OUT_BATCH(0);
-+	OUT_BATCH(0); /* pass-through */
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+
-+#if SIM
-+	OUT_BATCH(GEN9_3DSTATE_CONSTANT_GS | (11 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+
-+#if 1
-+	OUT_BATCH(GEN9_3DSTATE_BINDING_TABLE_POINTERS_GS | (2 - 2));
-+	OUT_BATCH(0);
-+
-+	OUT_BATCH(GEN9_3DSTATE_SAMPLER_STATE_POINTERS_GS | (2 - 2));
-+	OUT_BATCH(0);
-+#endif
-+#endif
-+}
-+
-+static void
-+gen9_emit_sol_invariant(struct sna *sna)
-+{
-+	OUT_BATCH(GEN9_3DSTATE_STREAMOUT | (5 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+}
-+
-+static void
-+gen9_emit_sf_invariant(struct sna *sna)
-+{
-+	OUT_BATCH(GEN9_3DSTATE_SF | (4 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+}
-+
-+static void
-+gen9_emit_clip_invariant(struct sna *sna)
-+{
-+	OUT_BATCH(GEN9_3DSTATE_CLIP | (4 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH(0); /* pass-through */
-+	OUT_BATCH(0);
-+
-+	OUT_BATCH(GEN9_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP | (2 - 2));
-+	OUT_BATCH(0);
-+
-+	OUT_BATCH(GEN9_3DSTATE_VIEWPORT_STATE_POINTERS_CC | (2 - 2));
-+	OUT_BATCH(0);
-+}
-+
-+static void
-+gen9_emit_null_depth_buffer(struct sna *sna)
-+{
-+	OUT_BATCH(GEN9_3DSTATE_DEPTH_BUFFER | (8 - 2));
-+#if 1
-+	OUT_BATCH(SURFACE_NULL << DEPTH_BUFFER_TYPE_SHIFT |
-+		  DEPTHFORMAT_D32_FLOAT << DEPTH_BUFFER_FORMAT_SHIFT);
-+#else
-+	OUT_BATCH(SURFACE_2D << DEPTH_BUFFER_TYPE_SHIFT |
-+		  DEPTHFORMAT_D16_UNORM << DEPTH_BUFFER_FORMAT_SHIFT);
-+#endif
-+	OUT_BATCH64(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+
-+#if SIM
-+	OUT_BATCH(GEN9_3DSTATE_HIER_DEPTH_BUFFER | (5 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH64(0);
-+	OUT_BATCH(0);
-+#endif
-+
-+#if SIM
-+	OUT_BATCH(GEN9_3DSTATE_STENCIL_BUFFER | (5 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH64(0);
-+	OUT_BATCH(0);
-+#endif
-+
-+#if SIM
-+	OUT_BATCH(GEN9_3DSTATE_WM_DEPTH_STENCIL | (4 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+#endif
-+
-+#if SIM
-+	OUT_BATCH(GEN9_3DSTATE_CLEAR_PARAMS | (3 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+#endif
-+}
-+
-+static void
-+gen9_emit_wm_invariant(struct sna *sna)
-+{
-+	gen9_emit_null_depth_buffer(sna);
-+
-+#if SIM
-+	OUT_BATCH(GEN9_3DSTATE_SCISSOR_STATE_POINTERS | (2 - 2));
-+	OUT_BATCH(0);
-+#endif
-+
-+	OUT_BATCH(GEN9_3DSTATE_WM | (2 - 2));
-+	//OUT_BATCH(WM_NONPERSPECTIVE_PIXEL_BARYCENTRIC); /* XXX */
-+	OUT_BATCH(WM_PERSPECTIVE_PIXEL_BARYCENTRIC);
-+
-+#if SIM
-+	OUT_BATCH(GEN9_3DSTATE_WM_CHROMAKEY | (2 - 2));
-+	OUT_BATCH(0);
-+#endif
-+
-+#if 0
-+	OUT_BATCH(GEN9_3DSTATE_WM_HZ_OP | (5 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+#endif
-+
-+	OUT_BATCH(GEN9_3DSTATE_PS_EXTRA | (2 - 2));
-+	OUT_BATCH(PSX_PIXEL_SHADER_VALID |
-+		  PSX_ATTRIBUTE_ENABLE);
-+
-+	OUT_BATCH(GEN9_3DSTATE_RASTER | (5 - 2));
-+	OUT_BATCH(RASTER_FRONT_WINDING_CCW |
-+		  RASTER_CULL_NONE);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+
-+	OUT_BATCH(GEN9_3DSTATE_SBE_SWIZ | (11 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+
-+#if SIM
-+	OUT_BATCH(GEN9_3DSTATE_CONSTANT_PS | (11 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+#endif
-+}
-+
-+static void
-+gen9_emit_cc_invariant(struct sna *sna)
-+{
-+}
-+
-+static void
-+gen9_emit_vf_invariant(struct sna *sna)
-+{
-+	int n;
-+
-+#if 1
-+	OUT_BATCH(GEN9_3DSTATE_VF | (2 - 2));
-+	OUT_BATCH(0);
-+#endif
-+
-+	OUT_BATCH(GEN9_3DSTATE_VF_SGVS | (2 - 2));
-+	OUT_BATCH(0);
-+
-+	OUT_BATCH(GEN9_3DSTATE_VF_TOPOLOGY | (2 - 2));
-+	OUT_BATCH(RECTLIST);
-+
-+	OUT_BATCH(GEN9_3DSTATE_VF_STATISTICS | 0);
-+
-+	for (n = 1; n <= 3; n++) {
-+		OUT_BATCH(GEN9_3DSTATE_VF_INSTANCING | (3 - 2));
-+		OUT_BATCH(n);
-+		OUT_BATCH(0);
-+	}
-+}
-+
-+static void
-+gen9_emit_invariant(struct sna *sna)
-+{
-+	OUT_BATCH(GEN9_PIPELINE_SELECT |
-+		  PIPELINE_SELECTION_MASK |
-+		  PIPELINE_SELECT_3D);
-+
-+#if SIM
-+	OUT_BATCH(GEN9_STATE_SIP | (3 - 2));
-+	OUT_BATCH64(0);
-+#endif
-+
-+	OUT_BATCH(GEN9_3DSTATE_MULTISAMPLE | (2 - 2));
-+	OUT_BATCH(MULTISAMPLE_PIXEL_LOCATION_CENTER |
-+		  MULTISAMPLE_NUMSAMPLES_1); /* 1 sample/pixel */
-+
-+	OUT_BATCH(GEN9_3DSTATE_SAMPLE_MASK | (2 - 2));
-+	OUT_BATCH(1);
-+
-+#if SIM
-+	OUT_BATCH(GEN9_3DSTATE_SAMPLE_PATTERN | (5 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+	//OUT_BATCH(8<<20 | 8<<16);
-+	OUT_BATCH(0);
-+#endif
-+
-+	gen9_emit_push_constants(sna);
-+	gen9_emit_urb(sna);
-+
-+	gen9_emit_state_base_address(sna);
-+
-+	gen9_emit_vf_invariant(sna);
-+	gen9_emit_vs_invariant(sna);
-+	gen9_emit_hs_invariant(sna);
-+	gen9_emit_te_invariant(sna);
-+	gen9_emit_ds_invariant(sna);
-+	gen9_emit_gs_invariant(sna);
-+	gen9_emit_sol_invariant(sna);
-+	gen9_emit_clip_invariant(sna);
-+	gen9_emit_sf_invariant(sna);
-+	gen9_emit_wm_invariant(sna);
-+	gen9_emit_cc_invariant(sna);
-+
-+	sna->render_state.gen9.needs_invariant = false;
-+}
-+
-+static void
-+gen9_emit_cc(struct sna *sna, uint32_t blend)
-+{
-+	struct gen9_render_state *render = &sna->render_state.gen9;
-+
-+	if (render->blend == blend)
-+		return;
-+
-+	DBG(("%s: blend=%x (current=%x), src=%d, dst=%d\n",
-+	     __FUNCTION__, blend, render->blend,
-+	     blend / GEN9_BLENDFACTOR_COUNT,
-+	     blend % GEN9_BLENDFACTOR_COUNT));
-+
-+	assert(blend < GEN9_BLENDFACTOR_COUNT * GEN9_BLENDFACTOR_COUNT);
-+	assert(blend / GEN9_BLENDFACTOR_COUNT > 0);
-+	assert(blend % GEN9_BLENDFACTOR_COUNT > 0);
-+
-+	/* XXX can have up to 8 blend states preload, selectable via
-+	 * Render Target Index. What other side-effects of Render Target Index?
-+	 */
-+
-+	OUT_BATCH(GEN9_3DSTATE_PS_BLEND | (2 - 2));
-+	if (blend != GEN9_BLEND(NO_BLEND)) {
-+		uint32_t src = blend / GEN9_BLENDFACTOR_COUNT;
-+		uint32_t dst = blend % GEN9_BLENDFACTOR_COUNT;
-+		OUT_BATCH(PS_BLEND_HAS_WRITEABLE_RT |
-+			  PS_BLEND_COLOR_BLEND_ENABLE |
-+			  src << PS_BLEND_SRC_ALPHA_SHIFT |
-+			  dst << PS_BLEND_DST_ALPHA_SHIFT |
-+			  src << PS_BLEND_SRC_SHIFT |
-+			  dst << PS_BLEND_DST_SHIFT);
-+	} else
-+		OUT_BATCH(PS_BLEND_HAS_WRITEABLE_RT);
-+
-+	assert(is_aligned(render->cc_blend + blend * GEN9_BLEND_STATE_PADDED_SIZE, 64));
-+	OUT_BATCH(GEN9_3DSTATE_BLEND_STATE_POINTERS | (2 - 2));
-+	OUT_BATCH((render->cc_blend + blend * GEN9_BLEND_STATE_PADDED_SIZE) | 1);
-+
-+	/* Force a CC_STATE pointer change to improve blend performance */
-+	OUT_BATCH(GEN9_3DSTATE_CC_STATE_POINTERS | (2 - 2));
-+	OUT_BATCH(0);
-+
-+	render->blend = blend;
-+}
-+
-+static void
-+gen9_emit_sampler(struct sna *sna, uint32_t state)
-+{
-+	if (sna->render_state.gen9.samplers == state)
-+		return;
-+
-+	sna->render_state.gen9.samplers = state;
-+
-+	DBG(("%s: sampler = %x\n", __FUNCTION__, state));
-+
-+	assert(2 * sizeof(struct gen9_sampler_state) == 32);
-+	OUT_BATCH(GEN9_3DSTATE_SAMPLER_STATE_POINTERS_PS | (2 - 2));
-+	OUT_BATCH(sna->render_state.gen9.wm_state + state * 2 * sizeof(struct gen9_sampler_state));
-+}
-+
-+static void
-+gen9_emit_sf(struct sna *sna, bool has_mask)
-+{
-+	int num_sf_outputs = has_mask ? 2 : 1;
-+
-+	if (sna->render_state.gen9.num_sf_outputs == num_sf_outputs)
-+		return;
-+
-+	DBG(("%s: num_sf_outputs=%d\n", __FUNCTION__, num_sf_outputs));
-+
-+	sna->render_state.gen9.num_sf_outputs = num_sf_outputs;
-+
-+	OUT_BATCH(GEN9_3DSTATE_SBE | (6 - 2));
-+	OUT_BATCH(num_sf_outputs << SBE_NUM_OUTPUTS_SHIFT |
-+		  SBE_FORCE_VERTEX_URB_READ_LENGTH | /* forced is faster */
-+		  SBE_FORCE_VERTEX_URB_READ_OFFSET |
-+		  1 << SBE_URB_ENTRY_READ_LENGTH_SHIFT |
-+		  1 << SBE_URB_ENTRY_READ_OFFSET_SHIFT);
-+	OUT_BATCH(0);
-+	OUT_BATCH(0);
-+        OUT_BATCH(SBE_ACTIVE_COMPONENT_XYZW << 0 |
-+		  SBE_ACTIVE_COMPONENT_XYZW << 1);
-+        OUT_BATCH(0);
-+}
-+
-+static void
-+gen9_emit_wm(struct sna *sna, int kernel)
-+{
-+	const uint32_t *kernels;
-+
-+	assert(kernel < ARRAY_SIZE(wm_kernels));
-+	if (sna->render_state.gen9.kernel == kernel)
-+		return;
-+
-+	sna->render_state.gen9.kernel = kernel;
-+	kernels = sna->render_state.gen9.wm_kernel[kernel];
-+
-+	DBG(("%s: switching to %s, num_surfaces=%d (8-wide? %d, 16-wide? %d, 32-wide? %d)\n",
-+	     __FUNCTION__,
-+	     wm_kernels[kernel].name,
-+	     wm_kernels[kernel].num_surfaces,
-+	     kernels[0], kernels[1], kernels[2]));
-+	assert(is_aligned(kernels[0], 64));
-+	assert(is_aligned(kernels[1], 64));
-+	assert(is_aligned(kernels[2], 64));
-+
-+	OUT_BATCH(GEN9_3DSTATE_PS | (12 - 2));
-+	OUT_BATCH64(kernels[0] ?: kernels[1] ?: kernels[2]);
-+	OUT_BATCH(1 << PS_SAMPLER_COUNT_SHIFT |
-+		  PS_VECTOR_MASK_ENABLE |
-+		  wm_kernels[kernel].num_surfaces << PS_BINDING_TABLE_ENTRY_COUNT_SHIFT);
-+	OUT_BATCH64(0); /* scratch address */
-+	OUT_BATCH(PS_MAX_THREADS |
-+		  (kernels[0] ? PS_8_DISPATCH_ENABLE : 0) |
-+		  (kernels[1] ? PS_16_DISPATCH_ENABLE : 0) |
-+		  (kernels[2] ? PS_32_DISPATCH_ENABLE : 0));
-+	OUT_BATCH((kernels[0] ? 4 : kernels[1] ? 6 : 8) << PS_DISPATCH_START_GRF_SHIFT_0 |
-+		  8 << PS_DISPATCH_START_GRF_SHIFT_1 |
-+		  6 << PS_DISPATCH_START_GRF_SHIFT_2);
-+	OUT_BATCH64(kernels[2]);
-+	OUT_BATCH64(kernels[1]);
-+}
-+
-+static bool
-+gen9_emit_binding_table(struct sna *sna, uint16_t offset)
-+{
-+	if (sna->render_state.gen9.surface_table == offset)
-+		return false;
-+
-+	/* Binding table pointers */
-+	assert(is_aligned(4*offset, 32));
-+	OUT_BATCH(GEN9_3DSTATE_BINDING_TABLE_POINTERS_PS | (2 - 2));
-+	OUT_BATCH(offset*4);
-+
-+	sna->render_state.gen9.surface_table = offset;
-+	return true;
-+}
-+
-+static bool
-+gen9_emit_drawing_rectangle(struct sna *sna,
-+			    const struct sna_composite_op *op)
-+{
-+	uint32_t limit = (op->dst.height - 1) << 16 | (op->dst.width - 1);
-+	uint32_t offset = (uint16_t)op->dst.y << 16 | (uint16_t)op->dst.x;
-+
-+	assert(!too_large(abs(op->dst.x), abs(op->dst.y)));
-+	assert(!too_large(op->dst.width, op->dst.height));
-+
-+	if (sna->render_state.gen9.drawrect_limit == limit &&
-+	    sna->render_state.gen9.drawrect_offset == offset)
-+		return true;
-+
-+	sna->render_state.gen9.drawrect_offset = offset;
-+	sna->render_state.gen9.drawrect_limit = limit;
-+
-+	OUT_BATCH(GEN9_3DSTATE_DRAWING_RECTANGLE | (4 - 2));
-+	OUT_BATCH(0);
-+	OUT_BATCH(limit);
-+	OUT_BATCH(offset);
-+	return false;
-+}
-+
-+static void
-+gen9_emit_vertex_elements(struct sna *sna,
-+			  const struct sna_composite_op *op)
-+{
-+	/*
-+	 * vertex data in vertex buffer
-+	 *    position: (x, y)
-+	 *    texture coordinate 0: (u0, v0) if (is_affine is true) else (u0, v0, w0)
-+	 *    texture coordinate 1 if (has_mask is true): same as above
-+	 */
-+	struct gen9_render_state *render = &sna->render_state.gen9;
-+	uint32_t src_format, dw;
-+	int id = GEN9_VERTEX(op->u.gen9.flags);
-+	bool has_mask;
-+
-+	DBG(("%s: setup id=%d\n", __FUNCTION__, id));
-+
-+	if (render->ve_id == id)
-+		return;
-+	render->ve_id = id;
-+
-+	if (render->ve_dirty) {
-+		/* dummy primitive to flush vertex before change? */
-+		OUT_BATCH(GEN9_3DPRIMITIVE | (7 - 2));
-+		OUT_BATCH(0); /* ignored, see VF_TOPOLOGY */
-+		OUT_BATCH(0);
-+		OUT_BATCH(0);
-+		OUT_BATCH(1);	/* single instance */
-+		OUT_BATCH(0);	/* start instance location */
-+		OUT_BATCH(0);	/* index buffer offset, ignored */
-+	}
-+
-+	/* The VUE layout
-+	 *    dword 0-3: pad (0.0, 0.0, 0.0. 0.0)
-+	 *    dword 4-7: position (x, y, 1.0, 1.0),
-+	 *    dword 8-11: texture coordinate 0 (u0, v0, w0, 1.0)
-+	 *    dword 12-15: texture coordinate 1 (u1, v1, w1, 1.0)
-+	 *
-+	 * dword 4-15 are fetched from vertex buffer
-+	 */
-+	has_mask = (id >> 2) != 0;
-+	OUT_BATCH(GEN9_3DSTATE_VERTEX_ELEMENTS |
-+		((2 * (3 + has_mask)) + 1 - 2));
-+
-+	OUT_BATCH(id << VE_INDEX_SHIFT | VE_VALID |
-+		  SURFACEFORMAT_R32G32B32A32_FLOAT << VE_FORMAT_SHIFT |
-+		  0 << VE_OFFSET_SHIFT);
-+	OUT_BATCH(COMPONENT_STORE_0 << VE_COMPONENT_0_SHIFT |
-+		  COMPONENT_STORE_0 << VE_COMPONENT_1_SHIFT |
-+		  COMPONENT_STORE_0 << VE_COMPONENT_2_SHIFT |
-+		  COMPONENT_STORE_0 << VE_COMPONENT_3_SHIFT);
-+
-+	/* x,y */
-+	OUT_BATCH(id << VE_INDEX_SHIFT | VE_VALID |
-+		  SURFACEFORMAT_R16G16_SSCALED << VE_FORMAT_SHIFT |
-+		  0 << VE_OFFSET_SHIFT);
-+	OUT_BATCH(COMPONENT_STORE_SRC << VE_COMPONENT_0_SHIFT |
-+		  COMPONENT_STORE_SRC << VE_COMPONENT_1_SHIFT |
-+		  COMPONENT_STORE_0 << VE_COMPONENT_2_SHIFT |
-+		  COMPONENT_STORE_1_FLT << VE_COMPONENT_3_SHIFT);
-+
-+	/* u0, v0, w0 */
-+	DBG(("%s: first channel %d floats, offset=4\n", __FUNCTION__, id & 3));
-+	dw = COMPONENT_STORE_1_FLT << VE_COMPONENT_3_SHIFT;
-+	switch (id & 3) {
-+	default:
-+		assert(0);
-+	case 0:
-+		src_format = SURFACEFORMAT_R16G16_SSCALED;
-+		dw |= COMPONENT_STORE_SRC << VE_COMPONENT_0_SHIFT;
-+		dw |= COMPONENT_STORE_SRC << VE_COMPONENT_1_SHIFT;
-+		dw |= COMPONENT_STORE_0 << VE_COMPONENT_2_SHIFT;
-+		break;
-+	case 1:
-+		src_format = SURFACEFORMAT_R32_FLOAT;
-+		dw |= COMPONENT_STORE_SRC << VE_COMPONENT_0_SHIFT;
-+		dw |= COMPONENT_STORE_0 << VE_COMPONENT_1_SHIFT;
-+		dw |= COMPONENT_STORE_0 << VE_COMPONENT_2_SHIFT;
-+		break;
-+	case 2:
-+		src_format = SURFACEFORMAT_R32G32_FLOAT;
-+		dw |= COMPONENT_STORE_SRC << VE_COMPONENT_0_SHIFT;
-+		dw |= COMPONENT_STORE_SRC << VE_COMPONENT_1_SHIFT;
-+		dw |= COMPONENT_STORE_0 << VE_COMPONENT_2_SHIFT;
-+		break;
-+	case 3:
-+		src_format = SURFACEFORMAT_R32G32B32_FLOAT;
-+		dw |= COMPONENT_STORE_SRC << VE_COMPONENT_0_SHIFT;
-+		dw |= COMPONENT_STORE_SRC << VE_COMPONENT_1_SHIFT;
-+		dw |= COMPONENT_STORE_SRC << VE_COMPONENT_2_SHIFT;
-+		break;
-+	}
-+	OUT_BATCH(id << VE_INDEX_SHIFT | VE_VALID |
-+		  src_format << VE_FORMAT_SHIFT |
-+		  4 << VE_OFFSET_SHIFT);
-+	OUT_BATCH(dw);
-+
-+	/* u1, v1, w1 */
-+	if (has_mask) {
-+		unsigned offset = 4 + ((id & 3) ?: 1) * sizeof(float);
-+		DBG(("%s: second channel %d floats, offset=%d\n", __FUNCTION__, (id >> 2) & 3, offset));
-+		dw = COMPONENT_STORE_1_FLT << VE_COMPONENT_3_SHIFT;
-+		switch (id >> 2) {
-+		case 1:
-+			src_format = SURFACEFORMAT_R32_FLOAT;
-+			dw |= COMPONENT_STORE_SRC << VE_COMPONENT_0_SHIFT;
-+			dw |= COMPONENT_STORE_0 << VE_COMPONENT_1_SHIFT;
-+			dw |= COMPONENT_STORE_0 << VE_COMPONENT_2_SHIFT;
-+			break;
-+		default:
-+			assert(0);
-+		case 2:
-+			src_format = SURFACEFORMAT_R32G32_FLOAT;
-+			dw |= COMPONENT_STORE_SRC << VE_COMPONENT_0_SHIFT;
-+			dw |= COMPONENT_STORE_SRC << VE_COMPONENT_1_SHIFT;
-+			dw |= COMPONENT_STORE_0 << VE_COMPONENT_2_SHIFT;
-+			break;
-+		case 3:
-+			src_format = SURFACEFORMAT_R32G32B32_FLOAT;
-+			dw |= COMPONENT_STORE_SRC << VE_COMPONENT_0_SHIFT;
-+			dw |= COMPONENT_STORE_SRC << VE_COMPONENT_1_SHIFT;
-+			dw |= COMPONENT_STORE_SRC << VE_COMPONENT_2_SHIFT;
-+			break;
-+		}
-+		OUT_BATCH(id << VE_INDEX_SHIFT | VE_VALID |
-+			  src_format << VE_FORMAT_SHIFT |
-+			  offset << VE_OFFSET_SHIFT);
-+		OUT_BATCH(dw);
-+	}
-+
-+	render->ve_dirty = true;
-+}
-+
-+inline static void
-+gen9_emit_pipe_invalidate(struct sna *sna)
-+{
-+	OUT_BATCH(GEN9_PIPE_CONTROL | (6 - 2));
-+	OUT_BATCH(PIPE_CONTROL_WC_FLUSH |
-+		  PIPE_CONTROL_TC_FLUSH |
-+		  PIPE_CONTROL_CS_STALL);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+}
-+
-+inline static void
-+gen9_emit_pipe_flush(struct sna *sna, bool need_stall)
-+{
-+	unsigned stall;
-+
-+	stall = 0;
-+	if (need_stall)
-+		stall = (PIPE_CONTROL_CS_STALL |
-+			 PIPE_CONTROL_STALL_AT_SCOREBOARD);
-+
-+	OUT_BATCH(GEN9_PIPE_CONTROL | (6 - 2));
-+	OUT_BATCH(PIPE_CONTROL_WC_FLUSH | stall);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+}
-+
-+inline static void
-+gen9_emit_pipe_stall(struct sna *sna)
-+{
-+	OUT_BATCH(GEN9_PIPE_CONTROL | (6 - 2));
-+	OUT_BATCH(PIPE_CONTROL_CS_STALL |
-+		  PIPE_CONTROL_FLUSH |
-+		  PIPE_CONTROL_STALL_AT_SCOREBOARD);
-+	OUT_BATCH64(0);
-+	OUT_BATCH64(0);
-+}
-+
-+static void
-+gen9_emit_state(struct sna *sna,
-+		const struct sna_composite_op *op,
-+		uint16_t wm_binding_table)
-+{
-+	bool need_invalidate;
-+	bool need_flush;
-+	bool need_stall;
-+
-+	assert(op->dst.bo->exec);
-+
-+	need_flush = wm_binding_table & 1 ||
-+		(sna->render_state.gen9.emit_flush && GEN9_READS_DST(op->u.gen9.flags));
-+	if (ALWAYS_FLUSH)
-+		need_flush = true;
-+
-+	wm_binding_table &= ~1;
-+
-+	need_stall = sna->render_state.gen9.surface_table != wm_binding_table;
-+
-+	need_invalidate = kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo);
-+	if (ALWAYS_INVALIDATE)
-+		need_invalidate = true;
-+
-+	need_stall &= gen9_emit_drawing_rectangle(sna, op);
-+	if (ALWAYS_STALL)
-+		need_stall = true;
-+
-+	if (need_invalidate) {
-+		gen9_emit_pipe_invalidate(sna);
-+		kgem_clear_dirty(&sna->kgem);
-+		assert(op->dst.bo->exec);
-+		kgem_bo_mark_dirty(op->dst.bo);
-+
-+		need_flush = false;
-+		need_stall = false;
-+	}
-+	if (need_flush) {
-+		gen9_emit_pipe_flush(sna, need_stall);
-+		need_stall = false;
-+	}
-+	if (need_stall)
-+		gen9_emit_pipe_stall(sna);
-+
-+	gen9_emit_cc(sna, GEN9_BLEND(op->u.gen9.flags));
-+	gen9_emit_sampler(sna, GEN9_SAMPLER(op->u.gen9.flags));
-+	gen9_emit_sf(sna, GEN9_VERTEX(op->u.gen9.flags) >> 2);
-+	gen9_emit_wm(sna, GEN9_KERNEL(op->u.gen9.flags));
-+	gen9_emit_vertex_elements(sna, op);
-+	gen9_emit_binding_table(sna, wm_binding_table);
-+
-+	sna->render_state.gen9.emit_flush = GEN9_READS_DST(op->u.gen9.flags);
-+}
-+
-+static bool gen9_magic_ca_pass(struct sna *sna,
-+			       const struct sna_composite_op *op)
-+{
-+	struct gen9_render_state *state = &sna->render_state.gen9;
-+
-+	if (!op->need_magic_ca_pass)
-+		return false;
-+
-+	DBG(("%s: CA fixup (%d -> %d)\n", __FUNCTION__,
-+	     sna->render.vertex_start, sna->render.vertex_index));
-+
-+	gen9_emit_pipe_stall(sna);
-+
-+	gen9_emit_cc(sna,
-+		     GEN9_BLEND(gen9_get_blend(PictOpAdd, true,
-+					       op->dst.format)));
-+	gen9_emit_wm(sna,
-+		     gen9_choose_composite_kernel(PictOpAdd,
-+						  true, true,
-+						  op->is_affine));
-+
-+	OUT_BATCH(GEN9_3DPRIMITIVE | (7 - 2));
-+	OUT_BATCH(0); /* ignored, see VF_TOPOLOGY */
-+	OUT_BATCH(sna->render.vertex_index - sna->render.vertex_start);
-+	OUT_BATCH(sna->render.vertex_start);
-+	OUT_BATCH(1);	/* single instance */
-+	OUT_BATCH(0);	/* start instance location */
-+	OUT_BATCH(0);	/* index buffer offset, ignored */
-+
-+	state->last_primitive = sna->kgem.nbatch;
-+	state->ve_dirty = false;
-+	return true;
-+}
-+
-+static void null_create(struct sna_static_stream *stream)
-+{
-+	/* A bunch of zeros useful for legacy border color and depth-stencil */
-+	sna_static_stream_map(stream, 64, 64);
-+}
-+
-+static void
-+sampler_state_init(struct gen9_sampler_state *sampler_state,
-+		   sampler_filter_t filter,
-+		   sampler_extend_t extend)
-+{
-+	COMPILE_TIME_ASSERT(sizeof(*sampler_state) == 4*sizeof(uint32_t));
-+
-+	sampler_state->ss0.lod_preclamp = 2;	/* GL mode */
-+	sampler_state->ss0.default_color_mode = 1;
-+
-+	switch (filter) {
-+	default:
-+	case SAMPLER_FILTER_NEAREST:
-+		sampler_state->ss0.min_filter = MAPFILTER_NEAREST;
-+		sampler_state->ss0.mag_filter = MAPFILTER_NEAREST;
-+		break;
-+	case SAMPLER_FILTER_BILINEAR:
-+		sampler_state->ss0.min_filter = MAPFILTER_LINEAR;
-+		sampler_state->ss0.mag_filter = MAPFILTER_LINEAR;
-+		break;
-+	}
-+
-+	/* XXX bicubic filter using MAPFILTER_FLEXIBLE */
-+
-+	switch (extend) {
-+	default:
-+	case SAMPLER_EXTEND_NONE:
-+		sampler_state->ss3.r_wrap_mode = TEXCOORDMODE_CLAMP_BORDER;
-+		sampler_state->ss3.s_wrap_mode = TEXCOORDMODE_CLAMP_BORDER;
-+		sampler_state->ss3.t_wrap_mode = TEXCOORDMODE_CLAMP_BORDER;
-+		break;
-+	case SAMPLER_EXTEND_REPEAT:
-+		sampler_state->ss3.r_wrap_mode = TEXCOORDMODE_WRAP;
-+		sampler_state->ss3.s_wrap_mode = TEXCOORDMODE_WRAP;
-+		sampler_state->ss3.t_wrap_mode = TEXCOORDMODE_WRAP;
-+		break;
-+	case SAMPLER_EXTEND_PAD:
-+		sampler_state->ss3.r_wrap_mode = TEXCOORDMODE_CLAMP;
-+		sampler_state->ss3.s_wrap_mode = TEXCOORDMODE_CLAMP;
-+		sampler_state->ss3.t_wrap_mode = TEXCOORDMODE_CLAMP;
-+		break;
-+	case SAMPLER_EXTEND_REFLECT:
-+		sampler_state->ss3.r_wrap_mode = TEXCOORDMODE_MIRROR;
-+		sampler_state->ss3.s_wrap_mode = TEXCOORDMODE_MIRROR;
-+		sampler_state->ss3.t_wrap_mode = TEXCOORDMODE_MIRROR;
-+		break;
-+	}
-+}
-+
-+static void
-+sampler_copy_init(struct gen9_sampler_state *ss)
-+{
-+	sampler_state_init(ss, SAMPLER_FILTER_NEAREST, SAMPLER_EXTEND_NONE);
-+	ss->ss3.non_normalized_coord = 1;
-+
-+	sampler_state_init(ss+1, SAMPLER_FILTER_NEAREST, SAMPLER_EXTEND_NONE);
-+}
-+
-+static void
-+sampler_fill_init(struct gen9_sampler_state *ss)
-+{
-+	sampler_state_init(ss, SAMPLER_FILTER_NEAREST, SAMPLER_EXTEND_REPEAT);
-+	ss->ss3.non_normalized_coord = 1;
-+
-+	sampler_state_init(ss+1, SAMPLER_FILTER_NEAREST, SAMPLER_EXTEND_NONE);
-+}
-+
-+static uint32_t
-+gen9_tiling_bits(uint32_t tiling)
-+{
-+	switch (tiling) {
-+	default: assert(0);
-+	case I915_TILING_NONE: return 0;
-+	case I915_TILING_X: return SURFACE_TILED;
-+	case I915_TILING_Y: return SURFACE_TILED | SURFACE_TILED_Y;
-+	}
-+}
-+
-+#define MOCS_PTE (1 << 1)
-+#define MOCS_WB (2 << 1)
-+
-+/**
-+ * Sets up the common fields for a surface state buffer for the given
-+ * picture in the given surface state buffer.
-+ */
-+static uint32_t
-+gen9_bind_bo(struct sna *sna,
-+	     struct kgem_bo *bo,
-+	     uint32_t width,
-+	     uint32_t height,
-+	     uint32_t format,
-+	     bool is_dst)
-+{
-+	uint32_t *ss;
-+	uint32_t domains;
-+	int offset;
-+	uint32_t is_scanout = is_dst && bo->scanout;
-+
-+	/* After the first bind, we manage the cache domains within the batch */
-+	offset = kgem_bo_get_binding(bo, format | is_dst << 30 | is_scanout << 31);
-+	if (offset) {
-+		if (is_dst)
-+			kgem_bo_mark_dirty(bo);
-+		assert(offset >= sna->kgem.surface);
-+		return offset * sizeof(uint32_t);
-+	}
-+
-+	offset = sna->kgem.surface -= SURFACE_DW;
-+	ss = sna->kgem.batch + offset;
-+	ss[0] = (SURFACE_2D << SURFACE_TYPE_SHIFT |
-+		 gen9_tiling_bits(bo->tiling) |
-+		 format << SURFACE_FORMAT_SHIFT |
-+		 SURFACE_VALIGN_4 | SURFACE_HALIGN_4);
-+	if (is_dst) {
-+		ss[0] |= SURFACE_RC_READ_WRITE;
-+		domains = I915_GEM_DOMAIN_RENDER << 16 |I915_GEM_DOMAIN_RENDER;
-+	} else
-+		domains = I915_GEM_DOMAIN_SAMPLER << 16;
-+	ss[1] = (is_scanout || (is_dst && is_uncached(sna, bo))) ? MOCS_PTE << 24 : MOCS_WB << 24;
-+	ss[2] = ((width - 1)  << SURFACE_WIDTH_SHIFT |
-+		 (height - 1) << SURFACE_HEIGHT_SHIFT);
-+	ss[3] = (bo->pitch - 1) << SURFACE_PITCH_SHIFT;
-+	ss[4] = 0;
-+	ss[5] = 0;
-+	ss[6] = 0;
-+	ss[7] = SURFACE_SWIZZLE(RED, GREEN, BLUE, ALPHA);
-+	*(uint64_t *)(ss+8) = kgem_add_reloc64(&sna->kgem, offset + 8, bo, domains, 0);
-+	ss[10] = 0;
-+	ss[11] = 0;
-+	ss[12] = 0;
-+	ss[13] = 0;
-+	ss[14] = 0;
-+	ss[15] = 0;
-+
-+	kgem_bo_set_binding(bo, format | is_dst << 30 | is_scanout << 31, offset);
-+
-+	DBG(("[%x] bind bo(handle=%d, addr=%lx), format=%d, width=%d, height=%d, pitch=%d, tiling=%d -> %s\n",
-+	     offset, bo->handle, *(uint64_t *)(ss+8),
-+	     format, width, height, bo->pitch, bo->tiling,
-+	     domains & 0xffff ? "render" : "sampler"));
-+
-+	return offset * sizeof(uint32_t);
-+}
-+
-+static void gen9_emit_vertex_buffer(struct sna *sna,
-+				    const struct sna_composite_op *op)
-+{
-+	int id = GEN9_VERTEX(op->u.gen9.flags);
-+
-+	OUT_BATCH(GEN9_3DSTATE_VERTEX_BUFFERS | (5 - 2));
-+	OUT_BATCH(id << VB_INDEX_SHIFT | VB_MODIFY_ENABLE |
-+		  4*op->floats_per_vertex);
-+	sna->render.vertex_reloc[sna->render.nvertex_reloc++] = sna->kgem.nbatch;
-+	OUT_BATCH64(0);
-+	OUT_BATCH(~0); /* buffer size: disabled */
-+
-+	sna->render.vb_id |= 1 << id;
-+}
-+
-+static void gen9_emit_primitive(struct sna *sna)
-+{
-+	if (sna->kgem.nbatch == sna->render_state.gen9.last_primitive) {
-+		sna->render.vertex_offset = sna->kgem.nbatch - 5;
-+		return;
-+	}
-+
-+	OUT_BATCH(GEN9_3DPRIMITIVE | (7 - 2));
-+	OUT_BATCH(0); /* ignored, see VF_TOPOLOGY */
-+	sna->render.vertex_offset = sna->kgem.nbatch;
-+	OUT_BATCH(0);	/* vertex count, to be filled in later */
-+	OUT_BATCH(sna->render.vertex_index);
-+	OUT_BATCH(1);	/* single instance */
-+	OUT_BATCH(0);	/* start instance location */
-+	OUT_BATCH(0);	/* index buffer offset, ignored */
-+	sna->render.vertex_start = sna->render.vertex_index;
-+
-+	sna->render_state.gen9.last_primitive = sna->kgem.nbatch;
-+	sna->render_state.gen9.ve_dirty = false;
-+}
-+
-+static bool gen9_rectangle_begin(struct sna *sna,
-+				 const struct sna_composite_op *op)
-+{
-+	int id = 1 << GEN9_VERTEX(op->u.gen9.flags);
-+	int ndwords;
-+
-+	if (sna_vertex_wait__locked(&sna->render) && sna->render.vertex_offset)
-+		return true;
-+
-+	ndwords = op->need_magic_ca_pass ? 60 : 6;
-+	if ((sna->render.vb_id & id) == 0)
-+		ndwords += 5;
-+	if (!kgem_check_batch(&sna->kgem, ndwords))
-+		return false;
-+
-+	if ((sna->render.vb_id & id) == 0)
-+		gen9_emit_vertex_buffer(sna, op);
-+
-+	gen9_emit_primitive(sna);
-+	return true;
-+}
-+
-+static int gen9_get_rectangles__flush(struct sna *sna,
-+				      const struct sna_composite_op *op)
-+{
-+	/* Preventing discarding new vbo after lock contention */
-+	if (sna_vertex_wait__locked(&sna->render)) {
-+		int rem = vertex_space(sna);
-+		if (rem > op->floats_per_rect)
-+			return rem;
-+	}
-+
-+	if (!kgem_check_batch(&sna->kgem, op->need_magic_ca_pass ? 65 : 6))
-+		return 0;
-+	if (!kgem_check_reloc_and_exec(&sna->kgem, 2))
-+		return 0;
-+
-+	if (sna->render.vertex_offset) {
-+		gen8_vertex_flush(sna);
-+		if (gen9_magic_ca_pass(sna, op)) {
-+			gen9_emit_pipe_invalidate(sna);
-+			gen9_emit_cc(sna, GEN9_BLEND(op->u.gen9.flags));
-+			gen9_emit_wm(sna, GEN9_KERNEL(op->u.gen9.flags));
-+		}
-+	}
-+
-+	return gen8_vertex_finish(sna);
-+}
-+
-+inline static int gen9_get_rectangles(struct sna *sna,
-+				      const struct sna_composite_op *op,
-+				      int want,
-+				      void (*emit_state)(struct sna *sna, const struct sna_composite_op *op))
-+{
-+	int rem;
-+
-+	assert(want);
-+
-+start:
-+	rem = vertex_space(sna);
-+	if (unlikely(rem < op->floats_per_rect)) {
-+		DBG(("flushing vbo for %s: %d < %d\n",
-+		     __FUNCTION__, rem, op->floats_per_rect));
-+		rem = gen9_get_rectangles__flush(sna, op);
-+		if (unlikely(rem == 0))
-+			goto flush;
-+	}
-+
-+	if (unlikely(sna->render.vertex_offset == 0)) {
-+		if (!gen9_rectangle_begin(sna, op))
-+			goto flush;
-+		else
-+			goto start;
-+	}
-+
-+	assert(rem <= vertex_space(sna));
-+	assert(op->floats_per_rect <= rem);
-+	if (want > 1 && want * op->floats_per_rect > rem)
-+		want = rem / op->floats_per_rect;
-+
-+	assert(want > 0);
-+	sna->render.vertex_index += 3*want;
-+	return want;
-+
-+flush:
-+	if (sna->render.vertex_offset) {
-+		gen8_vertex_flush(sna);
-+		gen9_magic_ca_pass(sna, op);
-+	}
-+	sna_vertex_wait__locked(&sna->render);
-+	_kgem_submit(&sna->kgem);
-+	emit_state(sna, op);
-+	goto start;
-+}
-+
-+inline static uint32_t *gen9_composite_get_binding_table(struct sna *sna,
-+							 uint16_t *offset)
-+{
-+	uint32_t *table;
-+
-+	assert(sna->kgem.surface <= 16384);
-+	sna->kgem.surface -= SURFACE_DW;
-+	/* Clear all surplus entries to zero in case of prefetch */
-+	table = memset(sna->kgem.batch + sna->kgem.surface, 0, 64);
-+
-+	DBG(("%s(%x)\n", __FUNCTION__, 4*sna->kgem.surface));
-+
-+	*offset = sna->kgem.surface;
-+	return table;
-+}
-+
-+static void
-+gen9_get_batch(struct sna *sna, const struct sna_composite_op *op)
-+{
-+	kgem_set_mode(&sna->kgem, KGEM_RENDER, op->dst.bo);
-+
-+	if (!kgem_check_batch_with_surfaces(&sna->kgem, 150, 2*(1+3))) {
-+		DBG(("%s: flushing batch: %d < %d+%d\n",
-+		     __FUNCTION__, sna->kgem.surface - sna->kgem.nbatch,
-+		     150, 4*8*2));
-+		_kgem_submit(&sna->kgem);
-+		_kgem_set_mode(&sna->kgem, KGEM_RENDER);
-+	}
-+
-+	assert(sna->kgem.mode == KGEM_RENDER);
-+	assert(sna->kgem.ring == KGEM_RENDER);
-+
-+	if (sna->render_state.gen9.needs_invariant)
-+		gen9_emit_invariant(sna);
-+}
-+
-+static void gen9_emit_composite_state(struct sna *sna,
-+				      const struct sna_composite_op *op)
-+{
-+	uint32_t *binding_table;
-+	uint16_t offset, dirty;
-+
-+	gen9_get_batch(sna, op);
-+
-+	binding_table = gen9_composite_get_binding_table(sna, &offset);
-+
-+	dirty = kgem_bo_is_dirty(op->dst.bo);
-+
-+	binding_table[0] =
-+		gen9_bind_bo(sna,
-+			    op->dst.bo, op->dst.width, op->dst.height,
-+			    gen9_get_dest_format(op->dst.format),
-+			    true);
-+	binding_table[1] =
-+		gen9_bind_bo(sna,
-+			     op->src.bo, op->src.width, op->src.height,
-+			     op->src.card_format,
-+			     false);
-+	if (op->mask.bo) {
-+		binding_table[2] =
-+			gen9_bind_bo(sna,
-+				     op->mask.bo,
-+				     op->mask.width,
-+				     op->mask.height,
-+				     op->mask.card_format,
-+				     false);
-+	}
-+
-+	if (sna->kgem.surface == offset &&
-+	    *(uint64_t *)(sna->kgem.batch + sna->render_state.gen9.surface_table) == *(uint64_t*)binding_table &&
-+	    (op->mask.bo == NULL ||
-+	     sna->kgem.batch[sna->render_state.gen9.surface_table+2] == binding_table[2])) {
-+		sna->kgem.surface += SURFACE_DW;
-+		offset = sna->render_state.gen9.surface_table;
-+	}
-+
-+	if (sna->kgem.batch[sna->render_state.gen9.surface_table] == binding_table[0])
-+		dirty = 0;
-+
-+	gen9_emit_state(sna, op, offset | dirty);
-+}
-+
-+static void
-+gen9_align_vertex(struct sna *sna, const struct sna_composite_op *op)
-+{
-+	if (op->floats_per_vertex != sna->render_state.gen9.floats_per_vertex) {
-+		DBG(("aligning vertex: was %d, now %d floats per vertex\n",
-+		     sna->render_state.gen9.floats_per_vertex, op->floats_per_vertex));
-+		gen8_vertex_align(sna, op);
-+		sna->render_state.gen9.floats_per_vertex = op->floats_per_vertex;
-+	}
-+}
-+
-+fastcall static void
-+gen9_render_composite_blt(struct sna *sna,
-+			  const struct sna_composite_op *op,
-+			  const struct sna_composite_rectangles *r)
-+{
-+	gen9_get_rectangles(sna, op, 1, gen9_emit_composite_state);
-+	op->prim_emit(sna, op, r);
-+}
-+
-+fastcall static void
-+gen9_render_composite_box(struct sna *sna,
-+			  const struct sna_composite_op *op,
-+			  const BoxRec *box)
-+{
-+	struct sna_composite_rectangles r;
-+
-+	gen9_get_rectangles(sna, op, 1, gen9_emit_composite_state);
-+
-+	DBG(("  %s: (%d, %d), (%d, %d)\n",
-+	     __FUNCTION__,
-+	     box->x1, box->y1, box->x2, box->y2));
-+
-+	r.dst.x = box->x1;
-+	r.dst.y = box->y1;
-+	r.width  = box->x2 - box->x1;
-+	r.height = box->y2 - box->y1;
-+	r.src = r.mask = r.dst;
-+
-+	op->prim_emit(sna, op, &r);
-+}
-+
-+static void
-+gen9_render_composite_boxes__blt(struct sna *sna,
-+				 const struct sna_composite_op *op,
-+				 const BoxRec *box, int nbox)
-+{
-+	DBG(("composite_boxes(%d)\n", nbox));
-+
-+	do {
-+		int nbox_this_time;
-+
-+		nbox_this_time = gen9_get_rectangles(sna, op, nbox,
-+						     gen9_emit_composite_state);
-+		nbox -= nbox_this_time;
-+
-+		do {
-+			struct sna_composite_rectangles r;
-+
-+			DBG(("  %s: (%d, %d), (%d, %d)\n",
-+			     __FUNCTION__,
-+			     box->x1, box->y1, box->x2, box->y2));
-+
-+			r.dst.x = box->x1;
-+			r.dst.y = box->y1;
-+			r.width  = box->x2 - box->x1;
-+			r.height = box->y2 - box->y1;
-+			r.src = r.mask = r.dst;
-+
-+			op->prim_emit(sna, op, &r);
-+			box++;
-+		} while (--nbox_this_time);
-+	} while (nbox);
-+}
-+
-+static void
-+gen9_render_composite_boxes(struct sna *sna,
-+			    const struct sna_composite_op *op,
-+			    const BoxRec *box, int nbox)
-+{
-+	DBG(("%s: nbox=%d\n", __FUNCTION__, nbox));
-+
-+	do {
-+		int nbox_this_time;
-+		float *v;
-+
-+		nbox_this_time = gen9_get_rectangles(sna, op, nbox,
-+						     gen9_emit_composite_state);
-+		assert(nbox_this_time);
-+		nbox -= nbox_this_time;
-+
-+		v = sna->render.vertices + sna->render.vertex_used;
-+		sna->render.vertex_used += nbox_this_time * op->floats_per_rect;
-+
-+		op->emit_boxes(op, box, nbox_this_time, v);
-+		box += nbox_this_time;
-+	} while (nbox);
-+}
-+
-+static void
-+gen9_render_composite_boxes__thread(struct sna *sna,
-+				    const struct sna_composite_op *op,
-+				    const BoxRec *box, int nbox)
-+{
-+	DBG(("%s: nbox=%d\n", __FUNCTION__, nbox));
-+
-+	sna_vertex_lock(&sna->render);
-+	do {
-+		int nbox_this_time;
-+		float *v;
-+
-+		nbox_this_time = gen9_get_rectangles(sna, op, nbox,
-+						     gen9_emit_composite_state);
-+		assert(nbox_this_time);
-+		nbox -= nbox_this_time;
-+
-+		v = sna->render.vertices + sna->render.vertex_used;
-+		sna->render.vertex_used += nbox_this_time * op->floats_per_rect;
-+
-+		sna_vertex_acquire__locked(&sna->render);
-+		sna_vertex_unlock(&sna->render);
-+
-+		op->emit_boxes(op, box, nbox_this_time, v);
-+		box += nbox_this_time;
-+
-+		sna_vertex_lock(&sna->render);
-+		sna_vertex_release__locked(&sna->render);
-+	} while (nbox);
-+	sna_vertex_unlock(&sna->render);
-+}
-+
-+static uint32_t
-+gen9_create_blend_state(struct sna_static_stream *stream)
-+{
-+	char *base, *ptr;
-+	int src, dst;
-+
-+	COMPILE_TIME_ASSERT(((GEN9_BLENDFACTOR_COUNT * GEN9_BLENDFACTOR_COUNT << 4) & (1 << 15)) == 0);
-+
-+	base = sna_static_stream_map(stream,
-+				     GEN9_BLENDFACTOR_COUNT * GEN9_BLENDFACTOR_COUNT * GEN9_BLEND_STATE_PADDED_SIZE,
-+				     64);
-+
-+	ptr = base;
-+	for (src = 0; src < GEN9_BLENDFACTOR_COUNT; src++) {
-+		for (dst = 0; dst < GEN9_BLENDFACTOR_COUNT; dst++) {
-+			struct gen9_blend_state *blend =
-+				(struct gen9_blend_state *)ptr;
-+
-+			assert(((ptr - base) & 63) == 0);
-+			COMPILE_TIME_ASSERT(sizeof(blend->common) == 4);
-+			COMPILE_TIME_ASSERT(sizeof(blend->rt) == 8);
-+			COMPILE_TIME_ASSERT((char *)&blend->rt - (char *)blend == 4);
-+
-+			blend->rt.post_blend_clamp = 1;
-+			blend->rt.pre_blend_clamp = 1;
-+
-+			blend->rt.color_blend =
-+				!(dst == BLENDFACTOR_ZERO && src == BLENDFACTOR_ONE);
-+			blend->rt.dest_blend_factor = dst;
-+			blend->rt.source_blend_factor = src;
-+			blend->rt.color_blend_function = BLENDFUNCTION_ADD;
-+
-+			blend->rt.dest_alpha_blend_factor = dst;
-+			blend->rt.source_alpha_blend_factor = src;
-+			blend->rt.alpha_blend_function = BLENDFUNCTION_ADD;
-+
-+			ptr += GEN9_BLEND_STATE_PADDED_SIZE;
-+		}
-+	}
-+
-+	return sna_static_stream_offsetof(stream, base);
-+}
-+
-+static int
-+gen9_composite_picture(struct sna *sna,
-+		       PicturePtr picture,
-+		       struct sna_composite_channel *channel,
-+		       int x, int y,
-+		       int w, int h,
-+		       int dst_x, int dst_y,
-+		       bool precise)
-+{
-+	PixmapPtr pixmap;
-+	uint32_t color;
-+	int16_t dx, dy;
-+
-+	DBG(("%s: (%d, %d)x(%d, %d), dst=(%d, %d)\n",
-+	     __FUNCTION__, x, y, w, h, dst_x, dst_y));
-+
-+	channel->is_solid = false;
-+	channel->card_format = -1;
-+
-+	if (sna_picture_is_solid(picture, &color))
-+		return gen4_channel_init_solid(sna, channel, color);
-+
-+	if (picture->pDrawable == NULL) {
-+		int ret;
-+
-+		if (picture->pSourcePict->type == SourcePictTypeLinear)
-+			return gen4_channel_init_linear(sna, picture, channel,
-+							x, y,
-+							w, h,
-+							dst_x, dst_y);
-+
-+		DBG(("%s -- fixup, gradient\n", __FUNCTION__));
-+		ret = -1;
-+		if (!precise)
-+			ret = sna_render_picture_approximate_gradient(sna, picture, channel,
-+								      x, y, w, h, dst_x, dst_y);
-+		if (ret == -1)
-+			ret = sna_render_picture_fixup(sna, picture, channel,
-+						       x, y, w, h, dst_x, dst_y);
-+		return ret;
-+	}
-+
-+	if (picture->alphaMap) {
-+		DBG(("%s -- fallback, alphamap\n", __FUNCTION__));
-+		return sna_render_picture_fixup(sna, picture, channel,
-+						x, y, w, h, dst_x, dst_y);
-+	}
-+
-+	if (!gen9_check_repeat(picture))
-+		return sna_render_picture_fixup(sna, picture, channel,
-+						x, y, w, h, dst_x, dst_y);
-+
-+	if (!gen9_check_filter(picture))
-+		return sna_render_picture_fixup(sna, picture, channel,
-+						x, y, w, h, dst_x, dst_y);
-+
-+	channel->repeat = picture->repeat ? picture->repeatType : RepeatNone;
-+	channel->filter = picture->filter;
-+
-+	pixmap = get_drawable_pixmap(picture->pDrawable);
-+	get_drawable_deltas(picture->pDrawable, pixmap, &dx, &dy);
-+
-+	x += dx + picture->pDrawable->x;
-+	y += dy + picture->pDrawable->y;
-+
-+	channel->is_affine = sna_transform_is_affine(picture->transform);
-+	if (sna_transform_is_imprecise_integer_translation(picture->transform, picture->filter, precise, &dx, &dy)) {
-+		DBG(("%s: integer translation (%d, %d), removing\n",
-+		     __FUNCTION__, dx, dy));
-+		x += dx;
-+		y += dy;
-+		channel->transform = NULL;
-+		channel->filter = PictFilterNearest;
-+
-+		if (channel->repeat ||
-+		    (x >= 0 &&
-+		     y >= 0 &&
-+		     x + w <= pixmap->drawable.width &&
-+		     y + h <= pixmap->drawable.height)) {
-+			struct sna_pixmap *priv = sna_pixmap(pixmap);
-+			if (priv && priv->clear) {
-+				DBG(("%s: converting large pixmap source into solid [%08x]\n", __FUNCTION__, priv->clear_color));
-+				return gen4_channel_init_solid(sna, channel, solid_color(picture->format, priv->clear_color));
-+			}
-+		}
-+	} else
-+		channel->transform = picture->transform;
-+
-+	channel->pict_format = picture->format;
-+	channel->card_format = gen9_get_card_format(picture->format);
-+	if (channel->card_format == (unsigned)-1)
-+		return sna_render_picture_convert(sna, picture, channel, pixmap,
-+						  x, y, w, h, dst_x, dst_y,
-+						  false);
-+
-+	if (too_large(pixmap->drawable.width, pixmap->drawable.height)) {
-+		DBG(("%s: extracting from pixmap %dx%d\n", __FUNCTION__,
-+		     pixmap->drawable.width, pixmap->drawable.height));
-+		return sna_render_picture_extract(sna, picture, channel,
-+						  x, y, w, h, dst_x, dst_y);
-+	}
-+
-+	return sna_render_pixmap_bo(sna, channel, pixmap,
-+				    x, y, w, h, dst_x, dst_y);
-+}
-+
-+inline static bool gen9_composite_channel_convert(struct sna_composite_channel *channel)
-+{
-+	if (unaligned(channel->bo, PICT_FORMAT_BPP(channel->pict_format)))
-+		return false;
-+
-+	channel->repeat = gen9_repeat(channel->repeat);
-+	channel->filter = gen9_filter(channel->filter);
-+	if (channel->card_format == (unsigned)-1)
-+		channel->card_format = gen9_get_card_format(channel->pict_format);
-+	assert(channel->card_format != (unsigned)-1);
-+
-+	return true;
-+}
-+
-+static void gen9_render_composite_done(struct sna *sna,
-+				       const struct sna_composite_op *op)
-+{
-+	if (sna->render.vertex_offset) {
-+		gen8_vertex_flush(sna);
-+		gen9_magic_ca_pass(sna, op);
-+	}
-+
-+	if (op->mask.bo)
-+		kgem_bo_destroy(&sna->kgem, op->mask.bo);
-+	if (op->src.bo)
-+		kgem_bo_destroy(&sna->kgem, op->src.bo);
-+
-+	sna_render_composite_redirect_done(sna, op);
-+}
-+
-+inline static bool
-+gen9_composite_set_target(struct sna *sna,
-+			  struct sna_composite_op *op,
-+			  PicturePtr dst,
-+			  int x, int y, int w, int h,
-+			  bool partial)
-+{
-+	BoxRec box;
-+	unsigned int hint;
-+
-+	DBG(("%s: (%d, %d)x(%d, %d), partial?=%d\n", __FUNCTION__, x, y, w, h, partial));
-+
-+	op->dst.pixmap = get_drawable_pixmap(dst->pDrawable);
-+	op->dst.format = dst->format;
-+	op->dst.width  = op->dst.pixmap->drawable.width;
-+	op->dst.height = op->dst.pixmap->drawable.height;
-+
-+	if (w | h) {
-+		assert(w && h);
-+		box.x1 = x;
-+		box.y1 = y;
-+		box.x2 = x + w;
-+		box.y2 = y + h;
-+	} else
-+		sna_render_picture_extents(dst, &box);
-+
-+	hint = PREFER_GPU | RENDER_GPU;
-+	if (!need_tiling(sna, op->dst.width, op->dst.height))
-+		hint |= FORCE_GPU;
-+	if (!partial) {
-+		hint |= IGNORE_DAMAGE;
-+		if (w == op->dst.width && h == op->dst.height)
-+			hint |= REPLACES;
-+	}
-+
-+	op->dst.bo = sna_drawable_use_bo(dst->pDrawable, hint, &box, &op->damage);
-+	if (op->dst.bo == NULL)
-+		return false;
-+
-+	assert(!op->damage || !DAMAGE_IS_ALL(*op->damage));
-+
-+	if (unaligned(op->dst.bo, dst->pDrawable->bitsPerPixel))
-+		return false;
-+
-+	if (hint & REPLACES) {
-+		struct sna_pixmap *priv = sna_pixmap(op->dst.pixmap);
-+		kgem_bo_pair_undo(&sna->kgem, priv->gpu_bo, priv->cpu_bo);
-+	}
-+
-+	get_drawable_deltas(dst->pDrawable, op->dst.pixmap,
-+			    &op->dst.x, &op->dst.y);
-+
-+	DBG(("%s: pixmap=%ld, format=%08x, size=%dx%d, pitch=%d, delta=(%d,%d),damage=%p\n",
-+	     __FUNCTION__,
-+	     op->dst.pixmap->drawable.serialNumber, (int)op->dst.format,
-+	     op->dst.width, op->dst.height,
-+	     op->dst.bo->pitch,
-+	     op->dst.x, op->dst.y,
-+	     op->damage ? *op->damage : (void *)-1));
-+
-+	assert(op->dst.bo->proxy == NULL);
-+
-+	if (too_large(op->dst.width, op->dst.height) &&
-+	    !sna_render_composite_redirect(sna, op, x, y, w, h, partial))
-+		return false;
-+
-+	return true;
-+}
-+
-+static bool
-+try_blt(struct sna *sna,
-+	uint8_t op,
-+	PicturePtr src,
-+	PicturePtr mask,
-+	PicturePtr dst,
-+	int16_t src_x, int16_t src_y,
-+	int16_t msk_x, int16_t msk_y,
-+	int16_t dst_x, int16_t dst_y,
-+	int16_t width, int16_t height,
-+	unsigned flags,
-+	struct sna_composite_op *tmp)
-+{
-+	struct kgem_bo *bo;
-+
-+	if (sna->kgem.mode == KGEM_BLT) {
-+		DBG(("%s: already performing BLT\n", __FUNCTION__));
-+		goto execute;
-+	}
-+
-+	if (too_large(width, height)) {
-+		DBG(("%s: operation too large for 3D pipe (%d, %d)\n",
-+		     __FUNCTION__, width, height));
-+		goto execute;
-+	}
-+
-+	bo = __sna_drawable_peek_bo(dst->pDrawable);
-+	if (bo == NULL)
-+		goto execute;
-+
-+	if (untiled_tlb_miss(bo))
-+		goto execute;
-+
-+	if (bo->rq) {
-+		if (RQ_IS_BLT(bo->rq))
-+			goto execute;
-+
-+		return false;
-+	}
-+
-+	if (bo->tiling == I915_TILING_Y)
-+		goto upload;
-+
-+	if (sna_picture_is_solid(src, NULL) && can_switch_to_blt(sna, bo, 0))
-+		goto execute;
-+
-+	if (src->pDrawable == dst->pDrawable &&
-+	    (sna->render_state.gt < 3 || width*height < 1024) &&
-+	    can_switch_to_blt(sna, bo, 0))
-+		goto execute;
-+
-+	if (src->pDrawable) {
-+		struct kgem_bo *s = __sna_drawable_peek_bo(src->pDrawable);
-+		if (s == NULL)
-+			goto upload;
-+
-+		if (prefer_blt_bo(sna, s, bo))
-+			goto execute;
-+	}
-+
-+	if (sna->kgem.ring == KGEM_BLT) {
-+		DBG(("%s: already performing BLT\n", __FUNCTION__));
-+		goto execute;
-+	}
-+
-+upload:
-+	flags |= COMPOSITE_UPLOAD;
-+execute:
-+	return sna_blt_composite(sna, op,
-+				 src, dst,
-+				 src_x, src_y,
-+				 dst_x, dst_y,
-+				 width, height,
-+				 flags, tmp);
-+}
-+
-+static bool
-+check_gradient(PicturePtr picture, bool precise)
-+{
-+	if (picture->pDrawable)
-+		return false;
-+
-+	switch (picture->pSourcePict->type) {
-+	case SourcePictTypeSolidFill:
-+	case SourcePictTypeLinear:
-+		return false;
-+	default:
-+		return precise;
-+	}
-+}
-+
-+static bool
-+has_alphamap(PicturePtr p)
-+{
-+	return p->alphaMap != NULL;
-+}
-+
-+static bool
-+need_upload(PicturePtr p)
-+{
-+	return p->pDrawable && unattached(p->pDrawable) && untransformed(p);
-+}
-+
-+static bool
-+source_is_busy(PixmapPtr pixmap)
-+{
-+	struct sna_pixmap *priv = sna_pixmap(pixmap);
-+	if (priv == NULL || priv->clear)
-+		return false;
-+
-+	if (priv->gpu_bo && kgem_bo_is_busy(priv->gpu_bo))
-+		return true;
-+
-+	if (priv->cpu_bo && kgem_bo_is_busy(priv->cpu_bo))
-+		return true;
-+
-+	return priv->gpu_damage && !priv->cpu_damage;
-+}
-+
-+static bool
-+source_fallback(PicturePtr p, PixmapPtr pixmap, bool precise)
-+{
-+	if (sna_picture_is_solid(p, NULL))
-+		return false;
-+
-+	if (p->pSourcePict)
-+		return check_gradient(p, precise);
-+
-+	if (!gen9_check_repeat(p) || !gen9_check_format(p->format))
-+		return true;
-+
-+	if (pixmap && source_is_busy(pixmap))
-+		return false;
-+
-+	return has_alphamap(p) || !gen9_check_filter(p) || need_upload(p);
-+}
-+
-+static bool
-+gen9_composite_fallback(struct sna *sna,
-+			PicturePtr src,
-+			PicturePtr mask,
-+			PicturePtr dst)
-+{
-+	PixmapPtr src_pixmap;
-+	PixmapPtr mask_pixmap;
-+	PixmapPtr dst_pixmap;
-+	bool src_fallback, mask_fallback;
-+
-+	if (!gen9_check_dst_format(dst->format)) {
-+		DBG(("%s: unknown destination format: %d\n",
-+		     __FUNCTION__, dst->format));
-+		return true;
-+	}
-+
-+	dst_pixmap = get_drawable_pixmap(dst->pDrawable);
-+
-+	src_pixmap = src->pDrawable ? get_drawable_pixmap(src->pDrawable) : NULL;
-+	src_fallback = source_fallback(src, src_pixmap,
-+				       dst->polyMode == PolyModePrecise);
-+
-+	if (mask) {
-+		mask_pixmap = mask->pDrawable ? get_drawable_pixmap(mask->pDrawable) : NULL;
-+		mask_fallback = source_fallback(mask, mask_pixmap,
-+						dst->polyMode == PolyModePrecise);
-+	} else {
-+		mask_pixmap = NULL;
-+		mask_fallback = false;
-+	}
-+
-+	/* If we are using the destination as a source and need to
-+	 * readback in order to upload the source, do it all
-+	 * on the cpu.
-+	 */
-+	if (src_pixmap == dst_pixmap && src_fallback) {
-+		DBG(("%s: src is dst and will fallback\n",__FUNCTION__));
-+		return true;
-+	}
-+	if (mask_pixmap == dst_pixmap && mask_fallback) {
-+		DBG(("%s: mask is dst and will fallback\n",__FUNCTION__));
-+		return true;
-+	}
-+
-+	/* If anything is on the GPU, push everything out to the GPU */
-+	if (dst_use_gpu(dst_pixmap)) {
-+		DBG(("%s: dst is already on the GPU, try to use GPU\n",
-+		     __FUNCTION__));
-+		return false;
-+	}
-+
-+	if (src_pixmap && !src_fallback) {
-+		DBG(("%s: src is already on the GPU, try to use GPU\n",
-+		     __FUNCTION__));
-+		return false;
-+	}
-+	if (mask_pixmap && !mask_fallback) {
-+		DBG(("%s: mask is already on the GPU, try to use GPU\n",
-+		     __FUNCTION__));
-+		return false;
-+	}
-+
-+	/* However if the dst is not on the GPU and we need to
-+	 * render one of the sources using the CPU, we may
-+	 * as well do the entire operation in place onthe CPU.
-+	 */
-+	if (src_fallback) {
-+		DBG(("%s: dst is on the CPU and src will fallback\n",
-+		     __FUNCTION__));
-+		return true;
-+	}
-+
-+	if (mask && mask_fallback) {
-+		DBG(("%s: dst is on the CPU and mask will fallback\n",
-+		     __FUNCTION__));
-+		return true;
-+	}
-+
-+	if (too_large(dst_pixmap->drawable.width,
-+		      dst_pixmap->drawable.height) &&
-+	    dst_is_cpu(dst_pixmap)) {
-+		DBG(("%s: dst is on the CPU and too large\n", __FUNCTION__));
-+		return true;
-+	}
-+
-+	DBG(("%s: dst is not on the GPU and the operation should not fallback\n",
-+	     __FUNCTION__));
-+	return dst_use_cpu(dst_pixmap);
-+}
-+
-+static int
-+reuse_source(struct sna *sna,
-+	     PicturePtr src, struct sna_composite_channel *sc, int src_x, int src_y,
-+	     PicturePtr mask, struct sna_composite_channel *mc, int msk_x, int msk_y)
-+{
-+	uint32_t color;
-+
-+	if (src_x != msk_x || src_y != msk_y)
-+		return false;
-+
-+	if (src == mask) {
-+		DBG(("%s: mask is source\n", __FUNCTION__));
-+		*mc = *sc;
-+		mc->bo = kgem_bo_reference(mc->bo);
-+		return true;
-+	}
-+
-+	if (sna_picture_is_solid(mask, &color))
-+		return gen4_channel_init_solid(sna, mc, color);
-+
-+	if (sc->is_solid)
-+		return false;
-+
-+	if (src->pDrawable == NULL || mask->pDrawable != src->pDrawable)
-+		return false;
-+
-+	DBG(("%s: mask reuses source drawable\n", __FUNCTION__));
-+
-+	if (!sna_transform_equal(src->transform, mask->transform))
-+		return false;
-+
-+	if (!sna_picture_alphamap_equal(src, mask))
-+		return false;
-+
-+	if (!gen9_check_repeat(mask))
-+		return false;
-+
-+	if (!gen9_check_filter(mask))
-+		return false;
-+
-+	if (!gen9_check_format(mask->format))
-+		return false;
-+
-+	DBG(("%s: reusing source channel for mask with a twist\n",
-+	     __FUNCTION__));
-+
-+	*mc = *sc;
-+	mc->repeat = gen9_repeat(mask->repeat ? mask->repeatType : RepeatNone);
-+	mc->filter = gen9_filter(mask->filter);
-+	mc->pict_format = mask->format;
-+	mc->card_format = gen9_get_card_format(mask->format);
-+	mc->bo = kgem_bo_reference(mc->bo);
-+	return true;
-+}
-+
-+static bool
-+gen9_render_composite(struct sna *sna,
-+		      uint8_t op,
-+		      PicturePtr src,
-+		      PicturePtr mask,
-+		      PicturePtr dst,
-+		      int16_t src_x, int16_t src_y,
-+		      int16_t msk_x, int16_t msk_y,
-+		      int16_t dst_x, int16_t dst_y,
-+		      int16_t width, int16_t height,
-+		      unsigned flags,
-+		      struct sna_composite_op *tmp)
-+{
-+	if (op >= ARRAY_SIZE(gen9_blend_op))
-+		return false;
-+
-+	DBG(("%s: %dx%d, current mode=%d/%d\n", __FUNCTION__,
-+	     width, height, sna->kgem.mode, sna->kgem.ring));
-+
-+	if (mask == NULL &&
-+	    try_blt(sna, op,
-+		    src, mask, dst,
-+		    src_x, src_y,
-+		    msk_x, msk_y,
-+		    dst_x, dst_y,
-+		    width, height,
-+		    flags, tmp))
-+		return true;
-+
-+	if (gen9_composite_fallback(sna, src, mask, dst))
-+		goto fallback;
-+
-+	if (need_tiling(sna, width, height))
-+		return sna_tiling_composite(op, src, mask, dst,
-+					    src_x, src_y,
-+					    msk_x, msk_y,
-+					    dst_x, dst_y,
-+					    width, height,
-+					    tmp);
-+
-+	if (op == PictOpClear && src == sna->clear)
-+		op = PictOpSrc;
-+	tmp->op = op;
-+	if (!gen9_composite_set_target(sna, tmp, dst,
-+				       dst_x, dst_y, width, height,
-+				       flags & COMPOSITE_PARTIAL || op > PictOpSrc))
-+		goto fallback;
-+
-+	switch (gen9_composite_picture(sna, src, &tmp->src,
-+				       src_x, src_y,
-+				       width, height,
-+				       dst_x, dst_y,
-+				       dst->polyMode == PolyModePrecise)) {
-+	case -1:
-+		goto cleanup_dst;
-+	case 0:
-+		if (!gen4_channel_init_solid(sna, &tmp->src, 0))
-+			goto cleanup_dst;
-+		/* fall through to fixup */
-+	case 1:
-+		/* Did we just switch rings to prepare the source? */
-+		if (mask == NULL &&
-+		    (prefer_blt_composite(sna, tmp) ||
-+		     unaligned(tmp->src.bo, PICT_FORMAT_BPP(tmp->src.pict_format))) &&
-+		    sna_blt_composite__convert(sna,
-+					       dst_x, dst_y, width, height,
-+					       tmp))
-+			return true;
-+
-+		if (!gen9_composite_channel_convert(&tmp->src))
-+			goto cleanup_src;
-+
-+		break;
-+	}
-+
-+	tmp->is_affine = tmp->src.is_affine;
-+	tmp->has_component_alpha = false;
-+	tmp->need_magic_ca_pass = false;
-+
-+	tmp->mask.bo = NULL;
-+	tmp->mask.filter = SAMPLER_FILTER_NEAREST;
-+	tmp->mask.repeat = SAMPLER_EXTEND_NONE;
-+
-+	if (mask) {
-+		if (mask->componentAlpha && PICT_FORMAT_RGB(mask->format)) {
-+			tmp->has_component_alpha = true;
-+
-+			/* Check if it's component alpha that relies on a source alpha and on
-+			 * the source value.  We can only get one of those into the single
-+			 * source value that we get to blend with.
-+			 */
-+			if (gen9_blend_op[op].src_alpha &&
-+			    (gen9_blend_op[op].src_blend != BLENDFACTOR_ZERO)) {
-+				if (op != PictOpOver)
-+					goto cleanup_src;
-+
-+				tmp->need_magic_ca_pass = true;
-+				tmp->op = PictOpOutReverse;
-+			}
-+		}
-+
-+		if (!reuse_source(sna,
-+				  src, &tmp->src, src_x, src_y,
-+				  mask, &tmp->mask, msk_x, msk_y)) {
-+			switch (gen9_composite_picture(sna, mask, &tmp->mask,
-+						       msk_x, msk_y,
-+						       width, height,
-+						       dst_x, dst_y,
-+						       dst->polyMode == PolyModePrecise)) {
-+			case -1:
-+				goto cleanup_src;
-+			case 0:
-+				if (!gen4_channel_init_solid(sna, &tmp->mask, 0))
-+					goto cleanup_src;
-+				/* fall through to fixup */
-+			case 1:
-+				if (!gen9_composite_channel_convert(&tmp->mask))
-+					goto cleanup_mask;
-+				break;
-+			}
-+		}
-+
-+		tmp->is_affine &= tmp->mask.is_affine;
-+	}
-+
-+	tmp->u.gen9.flags =
-+		GEN9_SET_FLAGS(SAMPLER_OFFSET(tmp->src.filter,
-+					      tmp->src.repeat,
-+					      tmp->mask.filter,
-+					      tmp->mask.repeat),
-+			       gen9_get_blend(tmp->op,
-+					      tmp->has_component_alpha,
-+					      tmp->dst.format),
-+			       gen9_choose_composite_kernel(tmp->op,
-+							    tmp->mask.bo != NULL,
-+							    tmp->has_component_alpha,
-+							    tmp->is_affine),
-+			       gen4_choose_composite_emitter(sna, tmp));
-+
-+	tmp->blt   = gen9_render_composite_blt;
-+	tmp->box   = gen9_render_composite_box;
-+	tmp->boxes = gen9_render_composite_boxes__blt;
-+	if (tmp->emit_boxes){
-+		tmp->boxes = gen9_render_composite_boxes;
-+		tmp->thread_boxes = gen9_render_composite_boxes__thread;
-+	}
-+	tmp->done  = gen9_render_composite_done;
-+
-+	kgem_set_mode(&sna->kgem, KGEM_RENDER, tmp->dst.bo);
-+	if (!kgem_check_bo(&sna->kgem,
-+			   tmp->dst.bo, tmp->src.bo, tmp->mask.bo,
-+			   NULL)) {
-+		kgem_submit(&sna->kgem);
-+		if (!kgem_check_bo(&sna->kgem,
-+				   tmp->dst.bo, tmp->src.bo, tmp->mask.bo,
-+				   NULL))
-+			goto cleanup_mask;
-+		_kgem_set_mode(&sna->kgem, KGEM_RENDER);
-+	}
-+
-+	gen9_align_vertex(sna, tmp);
-+	gen9_emit_composite_state(sna, tmp);
-+	return true;
-+
-+cleanup_mask:
-+	if (tmp->mask.bo) {
-+		kgem_bo_destroy(&sna->kgem, tmp->mask.bo);
-+		tmp->mask.bo = NULL;
-+	}
-+cleanup_src:
-+	if (tmp->src.bo) {
-+		kgem_bo_destroy(&sna->kgem, tmp->src.bo);
-+		tmp->src.bo = NULL;
-+	}
-+cleanup_dst:
-+	if (tmp->redirect.real_bo) {
-+		kgem_bo_destroy(&sna->kgem, tmp->dst.bo);
-+		tmp->redirect.real_bo = NULL;
-+	}
-+fallback:
-+	return (mask == NULL &&
-+		sna_blt_composite(sna, op,
-+				  src, dst,
-+				  src_x, src_y,
-+				  dst_x, dst_y,
-+				  width, height,
-+				  flags | COMPOSITE_FALLBACK, tmp));
-+}
-+
-+#if !NO_COMPOSITE_SPANS
-+fastcall static void
-+gen9_render_composite_spans_box(struct sna *sna,
-+				const struct sna_composite_spans_op *op,
-+				const BoxRec *box, float opacity)
-+{
-+	DBG(("%s: src=+(%d, %d), opacity=%f, dst=+(%d, %d), box=(%d, %d) x (%d, %d)\n",
-+	     __FUNCTION__,
-+	     op->base.src.offset[0], op->base.src.offset[1],
-+	     opacity,
-+	     op->base.dst.x, op->base.dst.y,
-+	     box->x1, box->y1,
-+	     box->x2 - box->x1,
-+	     box->y2 - box->y1));
-+
-+	gen9_get_rectangles(sna, &op->base, 1, gen9_emit_composite_state);
-+	op->prim_emit(sna, op, box, opacity);
-+}
-+
-+static void
-+gen9_render_composite_spans_boxes(struct sna *sna,
-+				  const struct sna_composite_spans_op *op,
-+				  const BoxRec *box, int nbox,
-+				  float opacity)
-+{
-+	DBG(("%s: nbox=%d, src=+(%d, %d), opacity=%f, dst=+(%d, %d)\n",
-+	     __FUNCTION__, nbox,
-+	     op->base.src.offset[0], op->base.src.offset[1],
-+	     opacity,
-+	     op->base.dst.x, op->base.dst.y));
-+
-+	do {
-+		int nbox_this_time;
-+
-+		nbox_this_time = gen9_get_rectangles(sna, &op->base, nbox,
-+						     gen9_emit_composite_state);
-+		nbox -= nbox_this_time;
-+
-+		do {
-+			DBG(("  %s: (%d, %d) x (%d, %d)\n", __FUNCTION__,
-+			     box->x1, box->y1,
-+			     box->x2 - box->x1,
-+			     box->y2 - box->y1));
-+
-+			op->prim_emit(sna, op, box++, opacity);
-+		} while (--nbox_this_time);
-+	} while (nbox);
-+}
-+
-+fastcall static void
-+gen9_render_composite_spans_boxes__thread(struct sna *sna,
-+					  const struct sna_composite_spans_op *op,
-+					  const struct sna_opacity_box *box,
-+					  int nbox)
-+{
-+	DBG(("%s: nbox=%d, src=+(%d, %d), dst=+(%d, %d)\n",
-+	     __FUNCTION__, nbox,
-+	     op->base.src.offset[0], op->base.src.offset[1],
-+	     op->base.dst.x, op->base.dst.y));
-+
-+	sna_vertex_lock(&sna->render);
-+	do {
-+		int nbox_this_time;
-+		float *v;
-+
-+		nbox_this_time = gen9_get_rectangles(sna, &op->base, nbox,
-+						     gen9_emit_composite_state);
-+		assert(nbox_this_time);
-+		nbox -= nbox_this_time;
-+
-+		v = sna->render.vertices + sna->render.vertex_used;
-+		sna->render.vertex_used += nbox_this_time * op->base.floats_per_rect;
-+
-+		sna_vertex_acquire__locked(&sna->render);
-+		sna_vertex_unlock(&sna->render);
-+
-+		op->emit_boxes(op, box, nbox_this_time, v);
-+		box += nbox_this_time;
-+
-+		sna_vertex_lock(&sna->render);
-+		sna_vertex_release__locked(&sna->render);
-+	} while (nbox);
-+	sna_vertex_unlock(&sna->render);
-+}
-+
-+fastcall static void
-+gen9_render_composite_spans_done(struct sna *sna,
-+				 const struct sna_composite_spans_op *op)
-+{
-+	if (sna->render.vertex_offset)
-+		gen8_vertex_flush(sna);
-+
-+	DBG(("%s()\n", __FUNCTION__));
-+
-+	if (op->base.src.bo)
-+		kgem_bo_destroy(&sna->kgem, op->base.src.bo);
-+
-+	sna_render_composite_redirect_done(sna, &op->base);
-+}
-+
-+static bool
-+gen9_check_composite_spans(struct sna *sna,
-+			   uint8_t op, PicturePtr src, PicturePtr dst,
-+			   int16_t width, int16_t height, unsigned flags)
-+{
-+	if (op >= ARRAY_SIZE(gen9_blend_op))
-+		return false;
-+
-+	if (gen9_composite_fallback(sna, src, NULL, dst))
-+		return false;
-+
-+	if (need_tiling(sna, width, height) &&
-+	    !is_gpu(sna, dst->pDrawable, PREFER_GPU_SPANS)) {
-+		DBG(("%s: fallback, tiled operation not on GPU\n",
-+		     __FUNCTION__));
-+		return false;
-+	}
-+
-+	return true;
-+}
-+
-+static bool
-+gen9_render_composite_spans(struct sna *sna,
-+			    uint8_t op,
-+			    PicturePtr src,
-+			    PicturePtr dst,
-+			    int16_t src_x,  int16_t src_y,
-+			    int16_t dst_x,  int16_t dst_y,
-+			    int16_t width,  int16_t height,
-+			    unsigned flags,
-+			    struct sna_composite_spans_op *tmp)
-+{
-+	DBG(("%s: %dx%d with flags=%x, current mode=%d\n", __FUNCTION__,
-+	     width, height, flags, sna->kgem.ring));
-+
-+	assert(gen9_check_composite_spans(sna, op, src, dst, width, height, flags));
-+
-+	if (need_tiling(sna, width, height)) {
-+		DBG(("%s: tiling, operation (%dx%d) too wide for pipeline\n",
-+		     __FUNCTION__, width, height));
-+		return sna_tiling_composite_spans(op, src, dst,
-+						  src_x, src_y, dst_x, dst_y,
-+						  width, height, flags, tmp);
-+	}
-+
-+	tmp->base.op = op;
-+	if (!gen9_composite_set_target(sna, &tmp->base, dst,
-+				       dst_x, dst_y, width, height, true))
-+		return false;
-+
-+	switch (gen9_composite_picture(sna, src, &tmp->base.src,
-+				       src_x, src_y,
-+				       width, height,
-+				       dst_x, dst_y,
-+				       dst->polyMode == PolyModePrecise)) {
-+	case -1:
-+		goto cleanup_dst;
-+	case 0:
-+		if (!gen4_channel_init_solid(sna, &tmp->base.src, 0))
-+			goto cleanup_dst;
-+		/* fall through to fixup */
-+	case 1:
-+		if (!gen9_composite_channel_convert(&tmp->base.src))
-+			goto cleanup_src;
-+		break;
-+	}
-+	tmp->base.mask.bo = NULL;
-+
-+	tmp->base.is_affine = tmp->base.src.is_affine;
-+	tmp->base.need_magic_ca_pass = false;
-+
-+	tmp->base.u.gen9.flags =
-+		GEN9_SET_FLAGS(SAMPLER_OFFSET(tmp->base.src.filter,
-+					      tmp->base.src.repeat,
-+					      SAMPLER_FILTER_NEAREST,
-+					      SAMPLER_EXTEND_PAD),
-+			       gen9_get_blend(tmp->base.op, false, tmp->base.dst.format),
-+			       GEN9_WM_KERNEL_OPACITY | !tmp->base.is_affine,
-+			       gen4_choose_spans_emitter(sna, tmp));
-+
-+	tmp->box   = gen9_render_composite_spans_box;
-+	tmp->boxes = gen9_render_composite_spans_boxes;
-+	if (tmp->emit_boxes)
-+		tmp->thread_boxes = gen9_render_composite_spans_boxes__thread;
-+	tmp->done  = gen9_render_composite_spans_done;
-+
-+	kgem_set_mode(&sna->kgem, KGEM_RENDER, tmp->base.dst.bo);
-+	if (!kgem_check_bo(&sna->kgem,
-+			   tmp->base.dst.bo, tmp->base.src.bo,
-+			   NULL)) {
-+		kgem_submit(&sna->kgem);
-+		if (!kgem_check_bo(&sna->kgem,
-+				   tmp->base.dst.bo, tmp->base.src.bo,
-+				   NULL))
-+			goto cleanup_src;
-+		_kgem_set_mode(&sna->kgem, KGEM_RENDER);
-+	}
-+
-+	gen9_align_vertex(sna, &tmp->base);
-+	gen9_emit_composite_state(sna, &tmp->base);
-+	return true;
-+
-+cleanup_src:
-+	if (tmp->base.src.bo)
-+		kgem_bo_destroy(&sna->kgem, tmp->base.src.bo);
-+cleanup_dst:
-+	if (tmp->base.redirect.real_bo)
-+		kgem_bo_destroy(&sna->kgem, tmp->base.dst.bo);
-+	return false;
-+}
-+#endif
-+
-+static void
-+gen9_emit_copy_state(struct sna *sna,
-+		     const struct sna_composite_op *op)
-+{
-+	uint32_t *binding_table;
-+	uint16_t offset, dirty;
-+
-+	gen9_get_batch(sna, op);
-+
-+	binding_table = gen9_composite_get_binding_table(sna, &offset);
-+
-+	dirty = kgem_bo_is_dirty(op->dst.bo);
-+
-+	binding_table[0] =
-+		gen9_bind_bo(sna,
-+			     op->dst.bo, op->dst.width, op->dst.height,
-+			     gen9_get_dest_format(op->dst.format),
-+			     true);
-+	binding_table[1] =
-+		gen9_bind_bo(sna,
-+			     op->src.bo, op->src.width, op->src.height,
-+			     op->src.card_format,
-+			     false);
-+
-+	if (sna->kgem.surface == offset &&
-+	    *(uint64_t *)(sna->kgem.batch + sna->render_state.gen9.surface_table) == *(uint64_t*)binding_table) {
-+		sna->kgem.surface += SURFACE_DW;
-+		offset = sna->render_state.gen9.surface_table;
-+	}
-+
-+	if (sna->kgem.batch[sna->render_state.gen9.surface_table] == binding_table[0])
-+		dirty = 0;
-+
-+	assert(!GEN9_READS_DST(op->u.gen9.flags));
-+	gen9_emit_state(sna, op, offset | dirty);
-+}
-+
-+static inline bool
-+prefer_blt_copy(struct sna *sna,
-+		struct kgem_bo *src_bo,
-+		struct kgem_bo *dst_bo,
-+		unsigned flags)
-+{
-+	if (sna->kgem.mode == KGEM_BLT)
-+		return true;
-+
-+	assert((flags & COPY_SYNC) == 0);
-+
-+	if (untiled_tlb_miss(src_bo) ||
-+	    untiled_tlb_miss(dst_bo))
-+		return true;
-+
-+	if (flags & COPY_DRI && !sna->kgem.has_semaphores)
-+		return false;
-+
-+	if (force_blt_ring(sna, dst_bo))
-+		return true;
-+
-+	if ((flags & COPY_SMALL ||
-+	     (sna->render_state.gt < 3 && src_bo == dst_bo)) &&
-+	    can_switch_to_blt(sna, dst_bo, flags))
-+		return true;
-+
-+	if (kgem_bo_is_render(dst_bo) ||
-+	    kgem_bo_is_render(src_bo))
-+		return false;
-+
-+	if (flags & COPY_LAST &&
-+	    sna->render_state.gt < 3 &&
-+            can_switch_to_blt(sna, dst_bo, flags))
-+		return true;
-+
-+	if (prefer_render_ring(sna, dst_bo))
-+		return false;
-+
-+	if (!prefer_blt_ring(sna, dst_bo, flags))
-+		return false;
-+
-+	return prefer_blt_bo(sna, src_bo, dst_bo);
-+}
-+
-+static bool
-+gen9_render_copy_boxes(struct sna *sna, uint8_t alu,
-+		       const DrawableRec *src, struct kgem_bo *src_bo, int16_t src_dx, int16_t src_dy,
-+		       const DrawableRec *dst, struct kgem_bo *dst_bo, int16_t dst_dx, int16_t dst_dy,
-+		       const BoxRec *box, int n, unsigned flags)
-+{
-+	struct sna_composite_op tmp;
-+	BoxRec extents;
-+
-+	DBG(("%s (%d, %d)->(%d, %d) x %d, alu=%x, flags=%x, self-copy=%d, overlaps? %d\n",
-+	     __FUNCTION__, src_dx, src_dy, dst_dx, dst_dy, n, alu, flags,
-+	     src_bo == dst_bo,
-+	     overlaps(sna,
-+		      src_bo, src_dx, src_dy,
-+		      dst_bo, dst_dx, dst_dy,
-+		      box, n, flags, &extents)));
-+
-+	if (prefer_blt_copy(sna, src_bo, dst_bo, flags) &&
-+	    sna_blt_compare_depth(src, dst) &&
-+	    sna_blt_copy_boxes(sna, alu,
-+			       src_bo, src_dx, src_dy,
-+			       dst_bo, dst_dx, dst_dy,
-+			       dst->bitsPerPixel,
-+			       box, n))
-+		return true;
-+
-+	if (!(alu == GXcopy || alu == GXclear) ||
-+	    unaligned(src_bo, src->bitsPerPixel) ||
-+	    unaligned(dst_bo, dst->bitsPerPixel)) {
-+fallback_blt:
-+		DBG(("%s: fallback blt\n", __FUNCTION__));
-+		if (!sna_blt_compare_depth(src, dst))
-+			return false;
-+
-+		return sna_blt_copy_boxes_fallback(sna, alu,
-+						   src, src_bo, src_dx, src_dy,
-+						   dst, dst_bo, dst_dx, dst_dy,
-+						   box, n);
-+	}
-+
-+	if (overlaps(sna,
-+		     src_bo, src_dx, src_dy,
-+		     dst_bo, dst_dx, dst_dy,
-+		     box, n, flags,
-+		     &extents)) {
-+		bool big = too_large(extents.x2-extents.x1, extents.y2-extents.y1);
-+
-+		if ((big || !prefer_render_ring(sna, dst_bo)) &&
-+		    sna_blt_copy_boxes(sna, alu,
-+				       src_bo, src_dx, src_dy,
-+				       dst_bo, dst_dx, dst_dy,
-+				       dst->bitsPerPixel,
-+				       box, n))
-+			return true;
-+
-+		if (big)
-+			goto fallback_blt;
-+
-+		assert(src_bo == dst_bo);
-+		assert(src->depth == dst->depth);
-+		assert(src->width == dst->width);
-+		assert(src->height == dst->height);
-+		return sna_render_copy_boxes__overlap(sna, alu, dst, dst_bo,
-+						      src_dx, src_dy,
-+						      dst_dx, dst_dy,
-+						      box, n, &extents);
-+	}
-+
-+	if (dst->depth == src->depth) {
-+		tmp.dst.format = sna_render_format_for_depth(dst->depth);
-+		tmp.src.pict_format = tmp.dst.format;
-+	} else {
-+		tmp.dst.format = sna_format_for_depth(dst->depth);
-+		tmp.src.pict_format = sna_format_for_depth(src->depth);
-+	}
-+	if (!gen9_check_format(tmp.src.pict_format))
-+		goto fallback_blt;
-+
-+	tmp.dst.pixmap = (PixmapPtr)dst;
-+	tmp.dst.width  = dst->width;
-+	tmp.dst.height = dst->height;
-+	tmp.dst.bo = dst_bo;
-+	tmp.dst.x = tmp.dst.y = 0;
-+	tmp.damage = NULL;
-+
-+	sna_render_composite_redirect_init(&tmp);
-+	if (too_large(tmp.dst.width, tmp.dst.height)) {
-+		int i;
-+
-+		extents = box[0];
-+		for (i = 1; i < n; i++) {
-+			if (box[i].x1 < extents.x1)
-+				extents.x1 = box[i].x1;
-+			if (box[i].y1 < extents.y1)
-+				extents.y1 = box[i].y1;
-+
-+			if (box[i].x2 > extents.x2)
-+				extents.x2 = box[i].x2;
-+			if (box[i].y2 > extents.y2)
-+				extents.y2 = box[i].y2;
-+		}
-+
-+		if (!sna_render_composite_redirect(sna, &tmp,
-+						   extents.x1 + dst_dx,
-+						   extents.y1 + dst_dy,
-+						   extents.x2 - extents.x1,
-+						   extents.y2 - extents.y1,
-+						   n > 1))
-+			goto fallback_tiled;
-+	}
-+
-+	tmp.src.card_format = gen9_get_card_format(tmp.src.pict_format);
-+	if (too_large(src->width, src->height)) {
-+		int i;
-+
-+		extents = box[0];
-+		for (i = 1; i < n; i++) {
-+			if (box[i].x1 < extents.x1)
-+				extents.x1 = box[i].x1;
-+			if (box[i].y1 < extents.y1)
-+				extents.y1 = box[i].y1;
-+
-+			if (box[i].x2 > extents.x2)
-+				extents.x2 = box[i].x2;
-+			if (box[i].y2 > extents.y2)
-+				extents.y2 = box[i].y2;
-+		}
-+
-+		if (!sna_render_pixmap_partial(sna, src, src_bo, &tmp.src,
-+					       extents.x1 + src_dx,
-+					       extents.y1 + src_dy,
-+					       extents.x2 - extents.x1,
-+					       extents.y2 - extents.y1))
-+			goto fallback_tiled_dst;
-+	} else {
-+		tmp.src.bo = src_bo;
-+		tmp.src.width  = src->width;
-+		tmp.src.height = src->height;
-+		tmp.src.offset[0] = tmp.src.offset[1] = 0;
-+	}
-+
-+	tmp.mask.bo = NULL;
-+
-+	tmp.floats_per_vertex = 2;
-+	tmp.floats_per_rect = 6;
-+	tmp.need_magic_ca_pass = 0;
-+
-+	tmp.u.gen9.flags = COPY_FLAGS(alu);
-+
-+	kgem_set_mode(&sna->kgem, KGEM_RENDER, tmp.dst.bo);
-+	if (!kgem_check_bo(&sna->kgem, tmp.dst.bo, tmp.src.bo, NULL)) {
-+		kgem_submit(&sna->kgem);
-+		if (!kgem_check_bo(&sna->kgem, tmp.dst.bo, tmp.src.bo, NULL)) {
-+			if (tmp.src.bo != src_bo)
-+				kgem_bo_destroy(&sna->kgem, tmp.src.bo);
-+			if (tmp.redirect.real_bo)
-+				kgem_bo_destroy(&sna->kgem, tmp.dst.bo);
-+			goto fallback_blt;
-+		}
-+		_kgem_set_mode(&sna->kgem, KGEM_RENDER);
-+	}
-+
-+	src_dx += tmp.src.offset[0];
-+	src_dy += tmp.src.offset[1];
-+
-+	dst_dx += tmp.dst.x;
-+	dst_dy += tmp.dst.y;
-+
-+	tmp.dst.x = tmp.dst.y = 0;
-+
-+	gen9_align_vertex(sna, &tmp);
-+	gen9_emit_copy_state(sna, &tmp);
-+
-+	do {
-+		int16_t *v;
-+		int n_this_time;
-+
-+		n_this_time = gen9_get_rectangles(sna, &tmp, n,
-+						  gen9_emit_copy_state);
-+		n -= n_this_time;
-+
-+		v = (int16_t *)(sna->render.vertices + sna->render.vertex_used);
-+		sna->render.vertex_used += 6 * n_this_time;
-+		assert(sna->render.vertex_used <= sna->render.vertex_size);
-+		do {
-+
-+			DBG(("	(%d, %d) -> (%d, %d) + (%d, %d)\n",
-+			     box->x1 + src_dx, box->y1 + src_dy,
-+			     box->x1 + dst_dx, box->y1 + dst_dy,
-+			     box->x2 - box->x1, box->y2 - box->y1));
-+			v[0] = box->x2 + dst_dx;
-+			v[2] = box->x2 + src_dx;
-+			v[1]  = v[5] = box->y2 + dst_dy;
-+			v[3]  = v[7] = box->y2 + src_dy;
-+			v[8]  = v[4] = box->x1 + dst_dx;
-+			v[10] = v[6] = box->x1 + src_dx;
-+			v[9]  = box->y1 + dst_dy;
-+			v[11] = box->y1 + src_dy;
-+			v += 12; box++;
-+		} while (--n_this_time);
-+	} while (n);
-+
-+	gen8_vertex_flush(sna);
-+	sna_render_composite_redirect_done(sna, &tmp);
-+	if (tmp.src.bo != src_bo)
-+		kgem_bo_destroy(&sna->kgem, tmp.src.bo);
-+	return true;
-+
-+fallback_tiled_dst:
-+	if (tmp.redirect.real_bo)
-+		kgem_bo_destroy(&sna->kgem, tmp.dst.bo);
-+fallback_tiled:
-+	DBG(("%s: fallback tiled\n", __FUNCTION__));
-+	if (sna_blt_compare_depth(src, dst) &&
-+	    sna_blt_copy_boxes(sna, alu,
-+			       src_bo, src_dx, src_dy,
-+			       dst_bo, dst_dx, dst_dy,
-+			       dst->bitsPerPixel,
-+			       box, n))
-+		return true;
-+
-+	return sna_tiling_copy_boxes(sna, alu,
-+				     src, src_bo, src_dx, src_dy,
-+				     dst, dst_bo, dst_dx, dst_dy,
-+				     box, n);
-+}
-+
-+static void
-+gen9_render_copy_blt(struct sna *sna,
-+		     const struct sna_copy_op *op,
-+		     int16_t sx, int16_t sy,
-+		     int16_t w,  int16_t h,
-+		     int16_t dx, int16_t dy)
-+{
-+	int16_t *v;
-+
-+	gen9_get_rectangles(sna, &op->base, 1, gen9_emit_copy_state);
-+
-+	v = (int16_t *)&sna->render.vertices[sna->render.vertex_used];
-+	sna->render.vertex_used += 6;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
-+
-+	v[0]  = dx+w; v[1]  = dy+h;
-+	v[2]  = sx+w; v[3]  = sy+h;
-+	v[4]  = dx;   v[5]  = dy+h;
-+	v[6]  = sx;   v[7]  = sy+h;
-+	v[8]  = dx;   v[9]  = dy;
-+	v[10] = sx;   v[11] = sy;
-+}
-+
-+static void
-+gen9_render_copy_done(struct sna *sna, const struct sna_copy_op *op)
-+{
-+	if (sna->render.vertex_offset)
-+		gen8_vertex_flush(sna);
-+}
-+
-+static bool
-+gen9_render_copy(struct sna *sna, uint8_t alu,
-+		 PixmapPtr src, struct kgem_bo *src_bo,
-+		 PixmapPtr dst, struct kgem_bo *dst_bo,
-+		 struct sna_copy_op *op)
-+{
-+	DBG(("%s (alu=%d, src=(%dx%d), dst=(%dx%d))\n",
-+	     __FUNCTION__, alu,
-+	     src->drawable.width, src->drawable.height,
-+	     dst->drawable.width, dst->drawable.height));
-+
-+	if (prefer_blt_copy(sna, src_bo, dst_bo, 0) &&
-+	    sna_blt_compare_depth(&src->drawable, &dst->drawable) &&
-+	    sna_blt_copy(sna, alu,
-+			 src_bo, dst_bo,
-+			 dst->drawable.bitsPerPixel,
-+			 op))
-+		return true;
-+
-+	if (!(alu == GXcopy || alu == GXclear) || src_bo == dst_bo ||
-+	    too_large(src->drawable.width, src->drawable.height) ||
-+	    too_large(dst->drawable.width, dst->drawable.height) ||
-+	    unaligned(src_bo, src->drawable.bitsPerPixel) ||
-+	    unaligned(dst_bo, dst->drawable.bitsPerPixel)) {
-+fallback:
-+		if (!sna_blt_compare_depth(&src->drawable, &dst->drawable))
-+			return false;
-+
-+		return sna_blt_copy(sna, alu, src_bo, dst_bo,
-+				    dst->drawable.bitsPerPixel,
-+				    op);
-+	}
-+
-+	if (dst->drawable.depth == src->drawable.depth) {
-+		op->base.dst.format = sna_render_format_for_depth(dst->drawable.depth);
-+		op->base.src.pict_format = op->base.dst.format;
-+	} else {
-+		op->base.dst.format = sna_format_for_depth(dst->drawable.depth);
-+		op->base.src.pict_format = sna_format_for_depth(src->drawable.depth);
-+	}
-+	if (!gen9_check_format(op->base.src.pict_format))
-+		goto fallback;
-+
-+	op->base.dst.pixmap = dst;
-+	op->base.dst.width  = dst->drawable.width;
-+	op->base.dst.height = dst->drawable.height;
-+	op->base.dst.bo = dst_bo;
-+
-+	op->base.src.bo = src_bo;
-+	op->base.src.card_format =
-+		gen9_get_card_format(op->base.src.pict_format);
-+	op->base.src.width  = src->drawable.width;
-+	op->base.src.height = src->drawable.height;
-+
-+	op->base.mask.bo = NULL;
-+
-+	op->base.floats_per_vertex = 2;
-+	op->base.floats_per_rect = 6;
-+
-+	op->base.u.gen9.flags = COPY_FLAGS(alu);
-+
-+	kgem_set_mode(&sna->kgem, KGEM_RENDER, dst_bo);
-+	if (!kgem_check_bo(&sna->kgem, dst_bo, src_bo, NULL)) {
-+		kgem_submit(&sna->kgem);
-+		if (!kgem_check_bo(&sna->kgem, dst_bo, src_bo, NULL))
-+			goto fallback;
-+		_kgem_set_mode(&sna->kgem, KGEM_RENDER);
-+	}
-+
-+	gen9_align_vertex(sna, &op->base);
-+	gen9_emit_copy_state(sna, &op->base);
-+
-+	op->blt  = gen9_render_copy_blt;
-+	op->done = gen9_render_copy_done;
-+	return true;
-+}
-+
-+static void
-+gen9_emit_fill_state(struct sna *sna, const struct sna_composite_op *op)
-+{
-+	uint32_t *binding_table;
-+	uint16_t offset, dirty;
-+
-+	/* XXX Render Target Fast Clear
-+	 * Set RTFC Enable in PS and render a rectangle.
-+	 * Limited to a clearing the full MSC surface only with a
-+	 * specific kernel.
-+	 */
-+
-+	gen9_get_batch(sna, op);
-+
-+	binding_table = gen9_composite_get_binding_table(sna, &offset);
-+
-+	dirty = kgem_bo_is_dirty(op->dst.bo);
-+
-+	binding_table[0] =
-+		gen9_bind_bo(sna,
-+			     op->dst.bo, op->dst.width, op->dst.height,
-+			     gen9_get_dest_format(op->dst.format),
-+			     true);
-+	binding_table[1] =
-+		gen9_bind_bo(sna,
-+			     op->src.bo, 1, 1,
-+			     SURFACEFORMAT_B8G8R8A8_UNORM,
-+			     false);
-+
-+	if (sna->kgem.surface == offset &&
-+	    *(uint64_t *)(sna->kgem.batch + sna->render_state.gen9.surface_table) == *(uint64_t*)binding_table) {
-+		sna->kgem.surface += SURFACE_DW;
-+		offset = sna->render_state.gen9.surface_table;
-+	}
-+
-+	if (sna->kgem.batch[sna->render_state.gen9.surface_table] == binding_table[0])
-+		dirty = 0;
-+
-+	gen9_emit_state(sna, op, offset | dirty);
-+}
-+
-+static bool
-+gen9_render_fill_boxes(struct sna *sna,
-+		       CARD8 op,
-+		       PictFormat format,
-+		       const xRenderColor *color,
-+		       const DrawableRec *dst, struct kgem_bo *dst_bo,
-+		       const BoxRec *box, int n)
-+{
-+	struct sna_composite_op tmp;
-+	uint32_t pixel;
-+
-+	DBG(("%s (op=%d, color=(%04x, %04x, %04x, %04x) [%08x])\n",
-+	     __FUNCTION__, op,
-+	     color->red, color->green, color->blue, color->alpha, (int)format));
-+
-+	if (op >= ARRAY_SIZE(gen9_blend_op)) {
-+		DBG(("%s: fallback due to unhandled blend op: %d\n",
-+		     __FUNCTION__, op));
-+		return false;
-+	}
-+
-+	if (prefer_blt_fill(sna, dst_bo, FILL_BOXES) ||
-+	    !gen9_check_dst_format(format) ||
-+	    unaligned(dst_bo, PICT_FORMAT_BPP(format))) {
-+		uint8_t alu = GXinvalid;
-+
-+		if (op <= PictOpSrc) {
-+			pixel = 0;
-+			if (op == PictOpClear)
-+				alu = GXclear;
-+			else if (sna_get_pixel_from_rgba(&pixel,
-+							 color->red,
-+							 color->green,
-+							 color->blue,
-+							 color->alpha,
-+							 format))
-+				alu = GXcopy;
-+		}
-+
-+		if (alu != GXinvalid &&
-+		    sna_blt_fill_boxes(sna, alu,
-+				       dst_bo, dst->bitsPerPixel,
-+				       pixel, box, n))
-+			return true;
-+
-+		if (!gen9_check_dst_format(format))
-+			return false;
-+	}
-+
-+	if (op == PictOpClear) {
-+		pixel = 0;
-+		op = PictOpSrc;
-+	} else if (!sna_get_pixel_from_rgba(&pixel,
-+					    color->red,
-+					    color->green,
-+					    color->blue,
-+					    color->alpha,
-+					    PICT_a8r8g8b8))
-+		return false;
-+
-+	DBG(("%s(%08x x %d [(%d, %d), (%d, %d) ...])\n",
-+	     __FUNCTION__, pixel, n,
-+	     box[0].x1, box[0].y1, box[0].x2, box[0].y2));
-+
-+	tmp.dst.pixmap = (PixmapPtr)dst;
-+	tmp.dst.width  = dst->width;
-+	tmp.dst.height = dst->height;
-+	tmp.dst.format = format;
-+	tmp.dst.bo = dst_bo;
-+	tmp.dst.x = tmp.dst.y = 0;
-+	tmp.damage = NULL;
-+
-+	sna_render_composite_redirect_init(&tmp);
-+	if (too_large(dst->width, dst->height)) {
-+		BoxRec extents;
-+
-+		boxes_extents(box, n, &extents);
-+		if (!sna_render_composite_redirect(sna, &tmp,
-+						   extents.x1, extents.y1,
-+						   extents.x2 - extents.x1,
-+						   extents.y2 - extents.y1,
-+						   n > 1))
-+			return sna_tiling_fill_boxes(sna, op, format, color,
-+						     dst, dst_bo, box, n);
-+	}
-+
-+	tmp.src.bo = sna_render_get_solid(sna, pixel);
-+	tmp.mask.bo = NULL;
-+
-+	tmp.floats_per_vertex = 2;
-+	tmp.floats_per_rect = 6;
-+	tmp.need_magic_ca_pass = false;
-+
-+	tmp.u.gen9.flags = FILL_FLAGS(op, format);
-+
-+	kgem_set_mode(&sna->kgem, KGEM_RENDER, dst_bo);
-+	if (!kgem_check_bo(&sna->kgem, dst_bo, NULL)) {
-+		kgem_submit(&sna->kgem);
-+		if (!kgem_check_bo(&sna->kgem, dst_bo, NULL)) {
-+			kgem_bo_destroy(&sna->kgem, tmp.src.bo);
-+			tmp.src.bo = NULL;
-+
-+			if (tmp.redirect.real_bo) {
-+				kgem_bo_destroy(&sna->kgem, tmp.dst.bo);
-+				tmp.redirect.real_bo = NULL;
-+			}
-+
-+			return false;
-+		}
-+		_kgem_set_mode(&sna->kgem, KGEM_RENDER);
-+	}
-+
-+	gen9_align_vertex(sna, &tmp);
-+	gen9_emit_fill_state(sna, &tmp);
-+
-+	do {
-+		int n_this_time;
-+		int16_t *v;
-+
-+		n_this_time = gen9_get_rectangles(sna, &tmp, n,
-+						  gen9_emit_fill_state);
-+		n -= n_this_time;
-+
-+		v = (int16_t *)(sna->render.vertices + sna->render.vertex_used);
-+		sna->render.vertex_used += 6 * n_this_time;
-+		assert(sna->render.vertex_used <= sna->render.vertex_size);
-+		do {
-+			DBG(("	(%d, %d), (%d, %d)\n",
-+			     box->x1, box->y1, box->x2, box->y2));
-+
-+			v[0] = box->x2;
-+			v[5] = v[1] = box->y2;
-+			v[8] = v[4] = box->x1;
-+			v[9] = box->y1;
-+			v[2] = v[3]  = v[7]  = 1;
-+			v[6] = v[10] = v[11] = 0;
-+			v += 12; box++;
-+		} while (--n_this_time);
-+	} while (n);
-+
-+	gen8_vertex_flush(sna);
-+	kgem_bo_destroy(&sna->kgem, tmp.src.bo);
-+	sna_render_composite_redirect_done(sna, &tmp);
-+	return true;
-+}
-+
-+static void
-+gen9_render_fill_op_blt(struct sna *sna,
-+			const struct sna_fill_op *op,
-+			int16_t x, int16_t y, int16_t w, int16_t h)
-+{
-+	int16_t *v;
-+
-+	DBG(("%s: (%d, %d)x(%d, %d)\n", __FUNCTION__, x, y, w, h));
-+
-+	gen9_get_rectangles(sna, &op->base, 1, gen9_emit_fill_state);
-+
-+	v = (int16_t *)&sna->render.vertices[sna->render.vertex_used];
-+	sna->render.vertex_used += 6;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
-+
-+	v[0] = x+w;
-+	v[4] = v[8] = x;
-+	v[1] = v[5] = y+h;
-+	v[9] = y;
-+
-+	v[2] = v[3]  = v[7]  = 1;
-+	v[6] = v[10] = v[11] = 0;
-+}
-+
-+fastcall static void
-+gen9_render_fill_op_box(struct sna *sna,
-+			const struct sna_fill_op *op,
-+			const BoxRec *box)
-+{
-+	int16_t *v;
-+
-+	DBG(("%s: (%d, %d),(%d, %d)\n", __FUNCTION__,
-+	     box->x1, box->y1, box->x2, box->y2));
-+
-+	gen9_get_rectangles(sna, &op->base, 1, gen9_emit_fill_state);
-+
-+	v = (int16_t *)&sna->render.vertices[sna->render.vertex_used];
-+	sna->render.vertex_used += 6;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
-+
-+	v[0] = box->x2;
-+	v[8] = v[4] = box->x1;
-+	v[5] = v[1] = box->y2;
-+	v[9] = box->y1;
-+
-+	v[7] = v[2]  = v[3]  = 1;
-+	v[6] = v[10] = v[11] = 0;
-+}
-+
-+fastcall static void
-+gen9_render_fill_op_boxes(struct sna *sna,
-+			  const struct sna_fill_op *op,
-+			  const BoxRec *box,
-+			  int nbox)
-+{
-+	DBG(("%s: (%d, %d),(%d, %d)... x %d\n", __FUNCTION__,
-+	     box->x1, box->y1, box->x2, box->y2, nbox));
-+
-+	do {
-+		int nbox_this_time;
-+		int16_t *v;
-+
-+		nbox_this_time = gen9_get_rectangles(sna, &op->base, nbox,
-+						     gen9_emit_fill_state);
-+		nbox -= nbox_this_time;
-+
-+		v = (int16_t *)&sna->render.vertices[sna->render.vertex_used];
-+		sna->render.vertex_used += 6 * nbox_this_time;
-+		assert(sna->render.vertex_used <= sna->render.vertex_size);
-+
-+		do {
-+			v[0] = box->x2;
-+			v[8] = v[4] = box->x1;
-+			v[5] = v[1] = box->y2;
-+			v[9] = box->y1;
-+			v[7] = v[2]  = v[3]  = 1;
-+			v[6] = v[10] = v[11] = 0;
-+			box++; v += 12;
-+		} while (--nbox_this_time);
-+	} while (nbox);
-+}
-+
-+static void
-+gen9_render_fill_op_done(struct sna *sna, const struct sna_fill_op *op)
-+{
-+	if (sna->render.vertex_offset)
-+		gen8_vertex_flush(sna);
-+	kgem_bo_destroy(&sna->kgem, op->base.src.bo);
-+}
-+
-+static bool
-+gen9_render_fill(struct sna *sna, uint8_t alu,
-+		 PixmapPtr dst, struct kgem_bo *dst_bo,
-+		 uint32_t color, unsigned flags,
-+		 struct sna_fill_op *op)
-+{
-+	DBG(("%s: (alu=%d, color=%x)\n", __FUNCTION__, alu, color));
-+
-+	if (prefer_blt_fill(sna, dst_bo, flags) &&
-+	    sna_blt_fill(sna, alu,
-+			 dst_bo, dst->drawable.bitsPerPixel,
-+			 color,
-+			 op))
-+		return true;
-+
-+	if (!(alu == GXcopy || alu == GXclear) ||
-+	    too_large(dst->drawable.width, dst->drawable.height) ||
-+	    unaligned(dst_bo, dst->drawable.bitsPerPixel))
-+		return sna_blt_fill(sna, alu,
-+				    dst_bo, dst->drawable.bitsPerPixel,
-+				    color,
-+				    op);
-+
-+	if (alu == GXclear)
-+		color = 0;
-+
-+	op->base.dst.pixmap = dst;
-+	op->base.dst.width  = dst->drawable.width;
-+	op->base.dst.height = dst->drawable.height;
-+	op->base.dst.format = sna_format_for_depth(dst->drawable.depth);
-+	op->base.dst.bo = dst_bo;
-+	op->base.dst.x = op->base.dst.y = 0;
-+
-+	op->base.src.bo =
-+		sna_render_get_solid(sna,
-+				     sna_rgba_for_color(color,
-+							dst->drawable.depth));
-+	op->base.mask.bo = NULL;
-+
-+	op->base.need_magic_ca_pass = false;
-+	op->base.floats_per_vertex = 2;
-+	op->base.floats_per_rect = 6;
-+
-+	op->base.u.gen9.flags = FILL_FLAGS_NOBLEND;
-+
-+	kgem_set_mode(&sna->kgem, KGEM_RENDER, dst_bo);
-+	if (!kgem_check_bo(&sna->kgem, dst_bo, NULL)) {
-+		kgem_submit(&sna->kgem);
-+		if (!kgem_check_bo(&sna->kgem, dst_bo, NULL)) {
-+			kgem_bo_destroy(&sna->kgem, op->base.src.bo);
-+			return false;
-+		}
-+
-+		_kgem_set_mode(&sna->kgem, KGEM_RENDER);
-+	}
-+
-+	gen9_align_vertex(sna, &op->base);
-+	gen9_emit_fill_state(sna, &op->base);
-+
-+	op->blt   = gen9_render_fill_op_blt;
-+	op->box   = gen9_render_fill_op_box;
-+	op->boxes = gen9_render_fill_op_boxes;
-+	op->points = NULL;
-+	op->done  = gen9_render_fill_op_done;
-+	return true;
-+}
-+
-+static bool
-+gen9_render_fill_one_try_blt(struct sna *sna, PixmapPtr dst, struct kgem_bo *bo,
-+			     uint32_t color,
-+			     int16_t x1, int16_t y1, int16_t x2, int16_t y2,
-+			     uint8_t alu)
-+{
-+	BoxRec box;
-+
-+	box.x1 = x1;
-+	box.y1 = y1;
-+	box.x2 = x2;
-+	box.y2 = y2;
-+
-+	return sna_blt_fill_boxes(sna, alu,
-+				  bo, dst->drawable.bitsPerPixel,
-+				  color, &box, 1);
-+}
-+
-+static bool
-+gen9_render_fill_one(struct sna *sna, PixmapPtr dst, struct kgem_bo *bo,
-+		     uint32_t color,
-+		     int16_t x1, int16_t y1,
-+		     int16_t x2, int16_t y2,
-+		     uint8_t alu)
-+{
-+	struct sna_composite_op tmp;
-+	int16_t *v;
-+
-+	/* Prefer to use the BLT if already engaged */
-+	if (prefer_blt_fill(sna, bo, FILL_BOXES) &&
-+	    gen9_render_fill_one_try_blt(sna, dst, bo, color,
-+					 x1, y1, x2, y2, alu))
-+		return true;
-+
-+	/* Must use the BLT if we can't RENDER... */
-+	if (!(alu == GXcopy || alu == GXclear) ||
-+	    too_large(dst->drawable.width, dst->drawable.height) ||
-+	    unaligned(bo, dst->drawable.bitsPerPixel))
-+		return gen9_render_fill_one_try_blt(sna, dst, bo, color,
-+						    x1, y1, x2, y2, alu);
-+
-+	if (alu == GXclear)
-+		color = 0;
-+
-+	tmp.dst.pixmap = dst;
-+	tmp.dst.width  = dst->drawable.width;
-+	tmp.dst.height = dst->drawable.height;
-+	tmp.dst.format = sna_format_for_depth(dst->drawable.depth);
-+	tmp.dst.bo = bo;
-+	tmp.dst.x = tmp.dst.y = 0;
-+
-+	tmp.src.bo =
-+		sna_render_get_solid(sna,
-+				     sna_rgba_for_color(color,
-+							dst->drawable.depth));
-+	tmp.mask.bo = NULL;
-+
-+	tmp.floats_per_vertex = 2;
-+	tmp.floats_per_rect = 6;
-+	tmp.need_magic_ca_pass = false;
-+
-+	tmp.u.gen9.flags = FILL_FLAGS_NOBLEND;
-+
-+	kgem_set_mode(&sna->kgem, KGEM_RENDER, bo);
-+	if (!kgem_check_bo(&sna->kgem, bo, NULL)) {
-+		kgem_submit(&sna->kgem);
-+		if (kgem_check_bo(&sna->kgem, bo, NULL)) {
-+			kgem_bo_destroy(&sna->kgem, tmp.src.bo);
-+			return false;
-+		}
-+		_kgem_set_mode(&sna->kgem, KGEM_RENDER);
-+	}
-+
-+	gen9_align_vertex(sna, &tmp);
-+	gen9_emit_fill_state(sna, &tmp);
-+
-+	gen9_get_rectangles(sna, &tmp, 1, gen9_emit_fill_state);
-+
-+	DBG(("	(%d, %d), (%d, %d)\n", x1, y1, x2, y2));
-+
-+	v = (int16_t *)&sna->render.vertices[sna->render.vertex_used];
-+	sna->render.vertex_used += 6;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
-+
-+	v[0] = x2;
-+	v[8] = v[4] = x1;
-+	v[5] = v[1] = y2;
-+	v[9] = y1;
-+	v[7] = v[2]  = v[3]  = 1;
-+	v[6] = v[10] = v[11] = 0;
-+
-+	gen8_vertex_flush(sna);
-+	kgem_bo_destroy(&sna->kgem, tmp.src.bo);
-+
-+	return true;
-+}
-+
-+static bool
-+gen9_render_clear_try_blt(struct sna *sna, PixmapPtr dst, struct kgem_bo *bo)
-+{
-+	BoxRec box;
-+
-+	box.x1 = 0;
-+	box.y1 = 0;
-+	box.x2 = dst->drawable.width;
-+	box.y2 = dst->drawable.height;
-+
-+	return sna_blt_fill_boxes(sna, GXclear,
-+				  bo, dst->drawable.bitsPerPixel,
-+				  0, &box, 1);
-+}
-+
-+static bool
-+gen9_render_clear(struct sna *sna, PixmapPtr dst, struct kgem_bo *bo)
-+{
-+	struct sna_composite_op tmp;
-+	int16_t *v;
-+
-+	DBG(("%s: %dx%d\n",
-+	     __FUNCTION__,
-+	     dst->drawable.width,
-+	     dst->drawable.height));
-+
-+	/* Prefer to use the BLT if already engaged */
-+	if (sna->kgem.mode == KGEM_BLT &&
-+	    gen9_render_clear_try_blt(sna, dst, bo))
-+		return true;
-+
-+	/* Must use the BLT if we can't RENDER... */
-+	if (too_large(dst->drawable.width, dst->drawable.height) ||
-+	    unaligned(bo, dst->drawable.bitsPerPixel))
-+		return gen9_render_clear_try_blt(sna, dst, bo);
-+
-+	tmp.dst.pixmap = dst;
-+	tmp.dst.width  = dst->drawable.width;
-+	tmp.dst.height = dst->drawable.height;
-+	tmp.dst.format = sna_format_for_depth(dst->drawable.depth);
-+	tmp.dst.bo = bo;
-+	tmp.dst.x = tmp.dst.y = 0;
-+
-+	tmp.src.bo = sna_render_get_solid(sna, 0);
-+	tmp.mask.bo = NULL;
-+
-+	tmp.floats_per_vertex = 2;
-+	tmp.floats_per_rect = 6;
-+	tmp.need_magic_ca_pass = false;
-+
-+	tmp.u.gen9.flags = FILL_FLAGS_NOBLEND;
-+
-+	kgem_set_mode(&sna->kgem, KGEM_RENDER, bo);
-+	if (!kgem_check_bo(&sna->kgem, bo, NULL)) {
-+		kgem_submit(&sna->kgem);
-+		if (!kgem_check_bo(&sna->kgem, bo, NULL)) {
-+			kgem_bo_destroy(&sna->kgem, tmp.src.bo);
-+			return false;
-+		}
-+		_kgem_set_mode(&sna->kgem, KGEM_RENDER);
-+	}
-+
-+	gen9_align_vertex(sna, &tmp);
-+	gen9_emit_fill_state(sna, &tmp);
-+
-+	gen9_get_rectangles(sna, &tmp, 1, gen9_emit_fill_state);
-+
-+	v = (int16_t *)&sna->render.vertices[sna->render.vertex_used];
-+	sna->render.vertex_used += 6;
-+	assert(sna->render.vertex_used <= sna->render.vertex_size);
-+
-+	v[0] = dst->drawable.width;
-+	v[5] = v[1] = dst->drawable.height;
-+	v[8] = v[4] = 0;
-+	v[9] = 0;
-+
-+	v[7] = v[2]  = v[3]  = 1;
-+	v[6] = v[10] = v[11] = 0;
-+
-+	gen8_vertex_flush(sna);
-+	kgem_bo_destroy(&sna->kgem, tmp.src.bo);
-+
-+	return true;
-+}
-+
-+#if !NO_VIDEO
-+static uint32_t gen9_bind_video_source(struct sna *sna,
-+				       struct kgem_bo *bo,
-+				       uint32_t delta,
-+				       int width,
-+				       int height,
-+				       int pitch,
-+				       uint32_t format)
-+{
-+	uint32_t *ss;
-+	int offset;
-+
-+	offset = sna->kgem.surface -= SURFACE_DW;
-+	ss = sna->kgem.batch + offset;
-+	ss[0] = (SURFACE_2D << SURFACE_TYPE_SHIFT |
-+		 gen9_tiling_bits(bo->tiling) |
-+		 format << SURFACE_FORMAT_SHIFT |
-+		 SURFACE_VALIGN_4 | SURFACE_HALIGN_4);
-+	ss[1] = 0;
-+	ss[2] = ((width - 1)  << SURFACE_WIDTH_SHIFT |
-+		 (height - 1) << SURFACE_HEIGHT_SHIFT);
-+	ss[3] = (pitch - 1) << SURFACE_PITCH_SHIFT;
-+	ss[4] = 0;
-+	ss[5] = 0;
-+	ss[6] = 0;
-+	ss[7] = SURFACE_SWIZZLE(RED, GREEN, BLUE, ALPHA);
-+	*(uint64_t *)(ss+8) =
-+		kgem_add_reloc64(&sna->kgem, offset + 8, bo,
-+				 I915_GEM_DOMAIN_SAMPLER << 16,
-+				 delta);
-+	ss[10] = 0;
-+	ss[11] = 0;
-+	ss[12] = 0;
-+	ss[13] = 0;
-+	ss[14] = 0;
-+	ss[15] = 0;
-+
-+	DBG(("[%x] bind bo(handle=%d, addr=%d), format=%d, width=%d, height=%d, pitch=%d, tiling=%d -> sampler\n",
-+	     offset, bo->handle, ss[1],
-+	     format, width, height, bo->pitch, bo->tiling));
-+
-+	return offset * sizeof(uint32_t);
-+}
-+
-+static void gen9_emit_video_state(struct sna *sna,
-+				  const struct sna_composite_op *op)
-+{
-+	struct sna_video_frame *frame = op->priv;
-+	uint32_t src_surf_format;
-+	uint32_t src_surf_base[6];
-+	int src_width[6];
-+	int src_height[6];
-+	int src_pitch[6];
-+	uint32_t *binding_table;
-+	uint16_t offset;
-+	int n_src, n;
-+
-+	/* XXX VeBox, bicubic */
-+
-+	gen9_get_batch(sna, op);
-+
-+	src_surf_base[0] = 0;
-+	src_surf_base[1] = 0;
-+	src_surf_base[2] = frame->VBufOffset;
-+	src_surf_base[3] = frame->VBufOffset;
-+	src_surf_base[4] = frame->UBufOffset;
-+	src_surf_base[5] = frame->UBufOffset;
-+
-+	if (is_planar_fourcc(frame->id)) {
-+		src_surf_format = SURFACEFORMAT_R8_UNORM;
-+		src_width[1]  = src_width[0]  = frame->width;
-+		src_height[1] = src_height[0] = frame->height;
-+		src_pitch[1]  = src_pitch[0]  = frame->pitch[1];
-+		src_width[4]  = src_width[5]  = src_width[2]  = src_width[3] =
-+			frame->width / 2;
-+		src_height[4] = src_height[5] = src_height[2] = src_height[3] =
-+			frame->height / 2;
-+		src_pitch[4]  = src_pitch[5]  = src_pitch[2]  = src_pitch[3] =
-+			frame->pitch[0];
-+		n_src = 6;
-+	} else {
-+		if (frame->id == FOURCC_RGB888)
-+			src_surf_format = SURFACEFORMAT_B8G8R8X8_UNORM;
-+		else if (frame->id == FOURCC_UYVY)
-+			src_surf_format = SURFACEFORMAT_YCRCB_SWAPY;
-+		else
-+			src_surf_format = SURFACEFORMAT_YCRCB_NORMAL;
-+
-+		src_width[0]  = frame->width;
-+		src_height[0] = frame->height;
-+		src_pitch[0]  = frame->pitch[0];
-+		n_src = 1;
-+	}
-+
-+	binding_table = gen9_composite_get_binding_table(sna, &offset);
-+
-+	binding_table[0] =
-+		gen9_bind_bo(sna,
-+			     op->dst.bo, op->dst.width, op->dst.height,
-+			     gen9_get_dest_format(op->dst.format),
-+			     true);
-+	for (n = 0; n < n_src; n++) {
-+		binding_table[1+n] =
-+			gen9_bind_video_source(sna,
-+					       frame->bo,
-+					       src_surf_base[n],
-+					       src_width[n],
-+					       src_height[n],
-+					       src_pitch[n],
-+					       src_surf_format);
-+	}
-+
-+	gen9_emit_state(sna, op, offset);
-+}
-+
-+static unsigned select_video_kernel(const struct sna_video_frame *frame)
-+{
-+	switch (frame->id) {
-+	case FOURCC_YV12:
-+	case FOURCC_I420:
-+	case FOURCC_XVMC:
-+		return GEN9_WM_KERNEL_VIDEO_PLANAR;
-+
-+	case FOURCC_RGB888:
-+	case FOURCC_RGB565:
-+		return GEN9_WM_KERNEL_VIDEO_RGB;
-+
-+	default:
-+		return GEN9_WM_KERNEL_VIDEO_PACKED;
-+	}
-+}
-+
-+static bool
-+gen9_render_video(struct sna *sna,
-+		  struct sna_video *video,
-+		  struct sna_video_frame *frame,
-+		  RegionPtr dstRegion,
-+		  PixmapPtr pixmap)
-+{
-+	struct sna_composite_op tmp;
-+	struct sna_pixmap *priv = sna_pixmap(pixmap);
-+	int dst_width = dstRegion->extents.x2 - dstRegion->extents.x1;
-+	int dst_height = dstRegion->extents.y2 - dstRegion->extents.y1;
-+	int src_width = frame->src.x2 - frame->src.x1;
-+	int src_height = frame->src.y2 - frame->src.y1;
-+	float src_offset_x, src_offset_y;
-+	float src_scale_x, src_scale_y;
-+	unsigned filter;
-+	const BoxRec *box;
-+	int nbox;
-+
-+	DBG(("%s: src=(%d, %d), dst=(%d, %d), %dx[(%d, %d), (%d, %d)...]\n",
-+	     __FUNCTION__,
-+	     src_width, src_height, dst_width, dst_height,
-+	     region_num_rects(dstRegion),
-+	     REGION_EXTENTS(NULL, dstRegion)->x1,
-+	     REGION_EXTENTS(NULL, dstRegion)->y1,
-+	     REGION_EXTENTS(NULL, dstRegion)->x2,
-+	     REGION_EXTENTS(NULL, dstRegion)->y2));
-+
-+	assert(priv->gpu_bo);
-+	assert(!too_large(pixmap->drawable.width, pixmap->drawable.height));
-+	assert(!unaligned(priv->gpu_bo, pixmap->drawable.bitsPerPixel));
-+
-+	memset(&tmp, 0, sizeof(tmp));
-+
-+	tmp.dst.pixmap = pixmap;
-+	tmp.dst.width  = pixmap->drawable.width;
-+	tmp.dst.height = pixmap->drawable.height;
-+	tmp.dst.format = sna_render_format_for_depth(pixmap->drawable.depth);
-+	tmp.dst.bo = priv->gpu_bo;
-+
-+	tmp.src.bo = frame->bo;
-+	tmp.mask.bo = NULL;
-+
-+	tmp.floats_per_vertex = 3;
-+	tmp.floats_per_rect = 9;
-+
-+	DBG(("%s: scaling?=%d, planar?=%d [%x]\n",
-+	     __FUNCTION__,
-+	     src_width != dst_width || src_height != dst_height,
-+	     is_planar_fourcc(frame->id), frame->id));
-+
-+	if (src_width == dst_width && src_height == dst_height)
-+		filter = SAMPLER_FILTER_NEAREST;
-+	else
-+		filter = SAMPLER_FILTER_BILINEAR;
-+
-+	tmp.u.gen9.flags =
-+		GEN9_SET_FLAGS(SAMPLER_OFFSET(filter, SAMPLER_EXTEND_PAD,
-+					      SAMPLER_FILTER_NEAREST, SAMPLER_EXTEND_NONE),
-+			       NO_BLEND,
-+			       select_video_kernel(frame),
-+			       2);
-+	tmp.priv = frame;
-+
-+	kgem_set_mode(&sna->kgem, KGEM_RENDER, tmp.dst.bo);
-+	if (!kgem_check_bo(&sna->kgem, tmp.dst.bo, frame->bo, NULL)) {
-+		kgem_submit(&sna->kgem);
-+		if (!kgem_check_bo(&sna->kgem, tmp.dst.bo, frame->bo, NULL))
-+			return false;
-+
-+		_kgem_set_mode(&sna->kgem, KGEM_RENDER);
-+	}
-+
-+	gen9_align_vertex(sna, &tmp);
-+	gen9_emit_video_state(sna, &tmp);
-+
-+	DBG(("%s: src=(%d, %d)x(%d, %d); frame=(%dx%d), dst=(%dx%d)\n",
-+	     __FUNCTION__,
-+	     frame->src.x1, frame->src.y1,
-+	     src_width, src_height,
-+	     dst_width, dst_height,
-+	     frame->width, frame->height));
-+
-+	src_scale_x = (float)src_width / dst_width / frame->width;
-+	src_offset_x = (float)frame->src.x1 / frame->width - dstRegion->extents.x1 * src_scale_x;
-+
-+	src_scale_y = (float)src_height / dst_height / frame->height;
-+	src_offset_y = (float)frame->src.y1 / frame->height - dstRegion->extents.y1 * src_scale_y;
-+
-+	DBG(("%s: scale=(%f, %f), offset=(%f, %f)\n",
-+	     __FUNCTION__,
-+	     src_scale_x, src_scale_y,
-+	     src_offset_x, src_offset_y));
-+
-+	box = region_rects(dstRegion);
-+	nbox = region_num_rects(dstRegion);
-+	while (nbox--) {
-+		DBG(("%s: dst=(%d, %d), (%d, %d) + (%d, %d); src=(%f, %f), (%f, %f)\n",
-+		     __FUNCTION__,
-+		     box->x1, box->y1,
-+		     box->x2, box->y2,
-+		     box->x1 * src_scale_x + src_offset_x,
-+		     box->y1 * src_scale_y + src_offset_y,
-+		     box->x2 * src_scale_x + src_offset_x,
-+		     box->y2 * src_scale_y + src_offset_y));
-+
-+		gen9_get_rectangles(sna, &tmp, 1, gen9_emit_video_state);
-+
-+		OUT_VERTEX(box->x2, box->y2);
-+		OUT_VERTEX_F(box->x2 * src_scale_x + src_offset_x);
-+		OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
-+
-+		OUT_VERTEX(box->x1, box->y2);
-+		OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
-+		OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
-+
-+		OUT_VERTEX(box->x1, box->y1);
-+		OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
-+		OUT_VERTEX_F(box->y1 * src_scale_y + src_offset_y);
-+
-+		box++;
-+	}
-+	gen8_vertex_flush(sna);
-+
-+	if (!DAMAGE_IS_ALL(priv->gpu_damage))
-+		sna_damage_add(&priv->gpu_damage, dstRegion);
-+
-+	return true;
-+}
-+#endif
-+
-+static void gen9_render_flush(struct sna *sna)
-+{
-+	gen8_vertex_close(sna);
-+
-+	assert(sna->render.vb_id == 0);
-+	assert(sna->render.vertex_offset == 0);
-+}
-+
-+static void gen9_render_reset(struct sna *sna)
-+{
-+	sna->render_state.gen9.emit_flush = false;
-+	sna->render_state.gen9.needs_invariant = true;
-+	sna->render_state.gen9.ve_id = 3 << 2;
-+	sna->render_state.gen9.ve_dirty = false;
-+	sna->render_state.gen9.last_primitive = -1;
-+
-+	sna->render_state.gen9.num_sf_outputs = 0;
-+	sna->render_state.gen9.samplers = -1;
-+	sna->render_state.gen9.blend = -1;
-+	sna->render_state.gen9.kernel = -1;
-+	sna->render_state.gen9.drawrect_offset = -1;
-+	sna->render_state.gen9.drawrect_limit = -1;
-+	sna->render_state.gen9.surface_table = 0;
-+
-+	if (sna->render.vbo && !kgem_bo_can_map(&sna->kgem, sna->render.vbo)) {
-+		DBG(("%s: discarding unmappable vbo\n", __FUNCTION__));
-+		discard_vbo(sna);
-+	}
-+
-+	sna->render.vertex_offset = 0;
-+	sna->render.nvertex_reloc = 0;
-+	sna->render.vb_id = 0;
-+}
-+
-+static void gen9_render_fini(struct sna *sna)
-+{
-+	kgem_bo_destroy(&sna->kgem, sna->render_state.gen9.general_bo);
-+}
-+
-+static bool gen9_render_setup(struct sna *sna)
-+{
-+	struct gen9_render_state *state = &sna->render_state.gen9;
-+	struct sna_static_stream general;
-+	struct gen9_sampler_state *ss;
-+	int i, j, k, l, m;
-+	uint32_t devid;
-+
-+	devid = intel_get_device_id(sna->dev);
-+	if (devid & 0xf)
-+		state->gt = GEN9_GT_BIAS + ((devid >> 4) & 0xf) + 1;
-+	DBG(("%s: gt=%d\n", __FUNCTION__, state->gt));
-+
-+	state->info = &min_gt_info;
-+	if (is_skl(sna))
-+		state->info = &skl_gt_info;
-+	if (is_bxt(sna))
-+		state->info = &bxt_gt_info;
-+	if (is_kbl(sna))
-+		state->info = &kbl_gt_info;
-+	if (is_glk(sna))
-+		state->info = &glk_gt_info;
-+
-+	sna_static_stream_init(&general);
-+
-+	/* Zero pad the start. If you see an offset of 0x0 in the batchbuffer
-+	 * dumps, you know it points to zero.
-+	 */
-+	null_create(&general);
-+
-+	for (m = 0; m < ARRAY_SIZE(wm_kernels); m++) {
-+		if (wm_kernels[m].size) {
-+			state->wm_kernel[m][1] =
-+				sna_static_stream_add(&general,
-+						      wm_kernels[m].data,
-+						      wm_kernels[m].size,
-+						      64);
-+		} else {
-+			if (USE_8_PIXEL_DISPATCH) {
-+				state->wm_kernel[m][0] =
-+					sna_static_stream_compile_wm(sna, &general,
-+								     wm_kernels[m].data, 8);
-+			}
-+
-+			if (USE_16_PIXEL_DISPATCH) {
-+				state->wm_kernel[m][1] =
-+					sna_static_stream_compile_wm(sna, &general,
-+								     wm_kernels[m].data, 16);
-+			}
-+
-+			if (USE_32_PIXEL_DISPATCH) {
-+				state->wm_kernel[m][2] =
-+					sna_static_stream_compile_wm(sna, &general,
-+								     wm_kernels[m].data, 32);
-+			}
-+		}
-+		assert(state->wm_kernel[m][0]|state->wm_kernel[m][1]|state->wm_kernel[m][2]);
-+	}
-+
-+	COMPILE_TIME_ASSERT(SAMPLER_OFFSET(FILTER_COUNT, EXTEND_COUNT, FILTER_COUNT, EXTEND_COUNT) <= 0x7ff);
-+	ss = sna_static_stream_map(&general,
-+				   2 * sizeof(*ss) *
-+				   (2 +
-+				    FILTER_COUNT * EXTEND_COUNT *
-+				    FILTER_COUNT * EXTEND_COUNT),
-+				   32);
-+	state->wm_state = sna_static_stream_offsetof(&general, ss);
-+	sampler_copy_init(ss); ss += 2;
-+	sampler_fill_init(ss); ss += 2;
-+	for (i = 0; i < FILTER_COUNT; i++) {
-+		for (j = 0; j < EXTEND_COUNT; j++) {
-+			for (k = 0; k < FILTER_COUNT; k++) {
-+				for (l = 0; l < EXTEND_COUNT; l++) {
-+					sampler_state_init(ss++, i, j);
-+					sampler_state_init(ss++, k, l);
-+				}
-+			}
-+		}
-+	}
-+
-+	state->cc_blend = gen9_create_blend_state(&general);
-+
-+	state->general_bo = sna_static_stream_fini(sna, &general);
-+	return state->general_bo != NULL;
-+}
-+
-+const char *gen9_render_init(struct sna *sna, const char *backend)
-+{
-+	if (!gen9_render_setup(sna))
-+		return backend;
-+
-+	sna->kgem.context_switch = gen6_render_context_switch;
-+	sna->kgem.retire = gen6_render_retire;
-+	sna->kgem.expire = gen4_render_expire;
-+
-+#if !NO_COMPOSITE
-+	sna->render.composite = gen9_render_composite;
-+	sna->render.prefer_gpu |= PREFER_GPU_RENDER;
-+#endif
-+#if !NO_COMPOSITE_SPANS
-+	sna->render.check_composite_spans = gen9_check_composite_spans;
-+	sna->render.composite_spans = gen9_render_composite_spans;
-+	sna->render.prefer_gpu |= PREFER_GPU_SPANS;
-+#endif
-+#if !NO_VIDEO
-+	sna->render.video = gen9_render_video;
-+#endif
-+
-+#if !NO_COPY_BOXES
-+	sna->render.copy_boxes = gen9_render_copy_boxes;
-+#endif
-+#if !NO_COPY
-+	sna->render.copy = gen9_render_copy;
-+#endif
-+
-+#if !NO_FILL_BOXES
-+	sna->render.fill_boxes = gen9_render_fill_boxes;
-+#endif
-+#if !NO_FILL
-+	sna->render.fill = gen9_render_fill;
-+#endif
-+#if !NO_FILL_ONE
-+	sna->render.fill_one = gen9_render_fill_one;
-+#endif
-+#if !NO_FILL_CLEAR
-+	sna->render.clear = gen9_render_clear;
-+#endif
-+
-+	sna->render.flush = gen9_render_flush;
-+	sna->render.reset = gen9_render_reset;
-+	sna->render.fini = gen9_render_fini;
-+
-+	sna->render.max_3d_size = GEN9_MAX_SIZE;
-+	sna->render.max_3d_pitch = 1 << 18;
-+	return sna->render_state.gen9.info->name;
-+}
-diff --git a/src/sna/gen9_render.h b/src/sna/gen9_render.h
-new file mode 100644
-index 00000000..e3cb3f93
---- /dev/null
-+++ b/src/sna/gen9_render.h
-@@ -0,0 +1,1130 @@
-+#ifndef GEN9_RENDER_H
-+#define GEN9_RENDER_H
-+
-+#define INTEL_MASK(high, low) (((1 << ((high) - (low) + 1)) - 1) << (low))
-+
-+#define GEN9_3D(pipeline,op,sub) \
-+	((3 << 29) | ((pipeline) << 27) | ((op) << 24) | ((sub) << 16))
-+
-+#define GEN9_STATE_BASE_ADDRESS			GEN9_3D(0, 1, 1)
-+# define BASE_ADDRESS_MODIFY			(1 << 0)
-+
-+#define GEN9_STATE_SIP				GEN9_3D(0, 1, 2)
-+
-+#define GEN9_3DSTATE_VF_STATISTICS		GEN9_3D(1, 0, 0xb)
-+#define GEN9_PIPELINE_SELECT			GEN9_3D(1, 1, 4)
-+# define PIPELINE_SELECT_3D		0
-+# define PIPELINE_SELECT_MEDIA		1
-+#define PIPELINE_SELECTION_MASK            (3 << 8)
-+
-+#define GEN9_MEDIA_STATE_POINTERS		GEN9_3D(2, 0, 0)
-+#define GEN9_MEDIA_OBJECT			GEN9_3D(2, 1, 0)
-+
-+#define GEN9_3DSTATE_CLEAR_PARAMS               GEN9_3D(3, 0, 0x04)
-+#define GEN9_3DSTATE_DEPTH_BUFFER               GEN9_3D(3, 0, 0x05)
-+# define DEPTH_BUFFER_TYPE_SHIFT	29
-+# define DEPTH_BUFFER_FORMAT_SHIFT	18
-+
-+#define GEN9_3DSTATE_STENCIL_BUFFER		GEN9_3D(3, 0, 0x06)
-+#define GEN9_3DSTATE_HIER_DEPTH_BUFFER		GEN9_3D(3, 0, 0x07)
-+#define GEN9_3DSTATE_VERTEX_BUFFERS		GEN9_3D(3, 0, 0x08)
-+# define VB_INDEX_SHIFT			26
-+# define VB_MODIFY_ENABLE		(1 << 14)
-+#define GEN9_3DSTATE_VERTEX_ELEMENTS		GEN9_3D(3, 0, 0x09)
-+# define VE_INDEX_SHIFT		26
-+# define VE_VALID					(1 << 25)
-+# define VE_FORMAT_SHIFT				16
-+# define VE_OFFSET_SHIFT				0
-+# define VE_COMPONENT_0_SHIFT			28
-+# define VE_COMPONENT_1_SHIFT			24
-+# define VE_COMPONENT_2_SHIFT			20
-+# define VE_COMPONENT_3_SHIFT			16
-+#define GEN9_3DSTATE_INDEX_BUFFER		GEN9_3D(3, 0, 0x0a)
-+#define GEN9_3DSTATE_VF				GEN9_3D(3, 0, 0x0c)
-+
-+#define GEN9_3DSTATE_MULTISAMPLE		GEN9_3D(3, 0, 0x0d)
-+/* DW1 */
-+# define MULTISAMPLE_PIXEL_LOCATION_CENTER		(0 << 4)
-+# define MULTISAMPLE_PIXEL_LOCATION_UPPER_LEFT	(1 << 4)
-+# define MULTISAMPLE_NUMSAMPLES_1			(0 << 1)
-+# define MULTISAMPLE_NUMSAMPLES_4			(2 << 1)
-+# define MULTISAMPLE_NUMSAMPLES_8			(3 << 1)
-+
-+#define GEN9_3DSTATE_CC_STATE_POINTERS		GEN9_3D(3, 0, 0x0e)
-+#define GEN9_3DSTATE_SCISSOR_STATE_POINTERS	GEN9_3D(3, 0, 0x0f)
-+
-+#define GEN9_3DSTATE_VS				GEN9_3D(3, 0, 0x10)
-+#define GEN9_3DSTATE_GS				GEN9_3D(3, 0, 0x11)
-+#define GEN9_3DSTATE_CLIP			GEN9_3D(3, 0, 0x12)
-+#define GEN9_3DSTATE_SF				GEN9_3D(3, 0, 0x13)
-+# define SF_TRI_PROVOKE_SHIFT		29
-+# define SF_LINE_PROVOKE_SHIFT		27
-+# define SF_FAN_PROVOKE_SHIFT		25
-+
-+#define GEN9_3DSTATE_WM				GEN9_3D(3, 0, 0x14)
-+/* DW1 */
-+# define WM_STATISTICS_ENABLE                              (1 << 31)
-+# define WM_DEPTH_CLEAR                                    (1 << 30)
-+# define WM_DEPTH_RESOLVE                                  (1 << 28)
-+# define WM_HIERARCHICAL_DEPTH_RESOLVE                     (1 << 27)
-+# define WM_KILL_ENABLE                                    (1 << 25)
-+# define WM_POSITION_ZW_PIXEL                              (0 << 17)
-+# define WM_POSITION_ZW_CENTROID                           (2 << 17)
-+# define WM_POSITION_ZW_SAMPLE                             (3 << 17)
-+# define WM_NONPERSPECTIVE_SAMPLE_BARYCENTRIC              (1 << 16)
-+# define WM_NONPERSPECTIVE_CENTROID_BARYCENTRIC            (1 << 15)
-+# define WM_NONPERSPECTIVE_PIXEL_BARYCENTRIC               (1 << 14)
-+# define WM_PERSPECTIVE_SAMPLE_BARYCENTRIC                 (1 << 13)
-+# define WM_PERSPECTIVE_CENTROID_BARYCENTRIC               (1 << 12)
-+# define WM_PERSPECTIVE_PIXEL_BARYCENTRIC                  (1 << 11)
-+# define WM_LINE_END_CAP_AA_WIDTH_0_5                      (0 << 8)
-+# define WM_LINE_END_CAP_AA_WIDTH_1_0                      (1 << 8)
-+# define WM_LINE_END_CAP_AA_WIDTH_2_0                      (2 << 8)
-+# define WM_LINE_END_CAP_AA_WIDTH_4_0                      (3 << 8)
-+# define WM_LINE_AA_WIDTH_0_5                              (0 << 6)
-+# define WM_LINE_AA_WIDTH_1_0                              (1 << 6)
-+# define WM_LINE_AA_WIDTH_2_0                              (2 << 6)
-+# define WM_LINE_AA_WIDTH_4_0                              (3 << 6)
-+# define WM_POLYGON_STIPPLE_ENABLE                         (1 << 4)
-+# define WM_LINE_STIPPLE_ENABLE                            (1 << 3)
-+# define WM_POINT_RASTRULE_UPPER_RIGHT                     (1 << 2)
-+# define WM_MSRAST_OFF_PIXEL                               (0 << 0)
-+# define WM_MSRAST_OFF_PATTERN                             (1 << 0)
-+# define WM_MSRAST_ON_PIXEL                                (2 << 0)
-+# define WM_MSRAST_ON_PATTERN                              (3 << 0)
-+
-+#define GEN9_3DSTATE_CONSTANT_VS		GEN9_3D(3, 0, 0x15)
-+#define GEN9_3DSTATE_CONSTANT_GS		GEN9_3D(3, 0, 0x16)
-+#define GEN9_3DSTATE_CONSTANT_PS		GEN9_3D(3, 0, 0x17)
-+
-+#define GEN9_3DSTATE_SAMPLE_MASK		GEN9_3D(3, 0, 0x18)
-+
-+#define GEN9_3DSTATE_CONSTANT_HS                GEN9_3D(3, 0, 0x19)
-+#define GEN9_3DSTATE_CONSTANT_DS                GEN9_3D(3, 0, 0x1a)
-+
-+#define GEN9_3DSTATE_HS                         GEN9_3D(3, 0, 0x1b)
-+#define GEN9_3DSTATE_TE                         GEN9_3D(3, 0, 0x1c)
-+#define GEN9_3DSTATE_DS                         GEN9_3D(3, 0, 0x1d)
-+#define GEN9_3DSTATE_STREAMOUT                  GEN9_3D(3, 0, 0x1e)
-+
-+#define GEN9_3DSTATE_SBE                        GEN9_3D(3, 0, 0x1f)
-+/* DW1 */
-+# define SBE_FORCE_VERTEX_URB_READ_LENGTH  (1<<29)
-+# define SBE_FORCE_VERTEX_URB_READ_OFFSET  (1<<28)
-+# define SBE_NUM_OUTPUTS_SHIFT             22
-+# define SBE_SWIZZLE_ENABLE                (1 << 21)
-+# define SBE_POINT_SPRITE_LOWERLEFT        (1 << 20)
-+# define SBE_URB_ENTRY_READ_LENGTH_SHIFT   11
-+# define SBE_URB_ENTRY_READ_OFFSET_SHIFT   5
-+#define SBE_ACTIVE_COMPONENT_NONE          0
-+#define SBE_ACTIVE_COMPONENT_XY            1 
-+#define SBE_ACTIVE_COMPONENT_XYZ           2
-+#define SBE_ACTIVE_COMPONENT_XYZW          3
-+
-+
-+#define GEN9_3DSTATE_PS                                 GEN9_3D(3, 0, 0x20)
-+/* DW1:DW2 kernel pointer */
-+/* DW3 */
-+# define PS_SPF_MODE                               (1 << 31)
-+# define PS_VECTOR_MASK_ENABLE                     (1 << 30)
-+# define PS_SAMPLER_COUNT_SHIFT                    27
-+# define PS_BINDING_TABLE_ENTRY_COUNT_SHIFT        18
-+# define PS_FLOATING_POINT_MODE_IEEE_754           (0 << 16)
-+# define PS_FLOATING_POINT_MODE_ALT                (1 << 16)
-+/* DW4:DW5: scratch space */
-+/* DW6 */
-+# define PS_MAX_THREADS_SHIFT                      23
-+# define PS_MAX_THREADS                            (63 << PS_MAX_THREADS_SHIFT)
-+# define PS_PUSH_CONSTANT_ENABLE                   (1 << 11)
-+# define PS_RENDER_TARGET_CLEAR			   (1 << 8)
-+# define PS_RENDER_TARGET_RESOLVE		   (1 << 6)
-+# define PS_POSOFFSET_NONE                         (0 << 3)
-+# define PS_POSOFFSET_CENTROID                     (2 << 3)
-+# define PS_POSOFFSET_SAMPLE                       (3 << 3)
-+# define PS_32_DISPATCH_ENABLE                     (1 << 2)
-+# define PS_16_DISPATCH_ENABLE                     (1 << 1)
-+# define PS_8_DISPATCH_ENABLE                      (1 << 0)
-+/* DW7 */
-+# define PS_DISPATCH_START_GRF_SHIFT_0             16
-+# define PS_DISPATCH_START_GRF_SHIFT_1             8
-+# define PS_DISPATCH_START_GRF_SHIFT_2             0
-+/* DW8:D9: kernel 1 pointer */
-+/* DW10:D11: kernel 2 pointer */
-+
-+#define GEN9_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP      GEN9_3D(3, 0, 0x21)
-+#define GEN9_3DSTATE_VIEWPORT_STATE_POINTERS_CC         GEN9_3D(3, 0, 0x23)
-+
-+#define GEN9_3DSTATE_BLEND_STATE_POINTERS               GEN9_3D(3, 0, 0x24)
-+
-+#define GEN9_3DSTATE_BINDING_TABLE_POINTERS_VS          GEN9_3D(3, 0, 0x26)
-+#define GEN9_3DSTATE_BINDING_TABLE_POINTERS_HS          GEN9_3D(3, 0, 0x27)
-+#define GEN9_3DSTATE_BINDING_TABLE_POINTERS_DS          GEN9_3D(3, 0, 0x28)
-+#define GEN9_3DSTATE_BINDING_TABLE_POINTERS_GS          GEN9_3D(3, 0, 0x29)
-+#define GEN9_3DSTATE_BINDING_TABLE_POINTERS_PS          GEN9_3D(3, 0, 0x2a)
-+
-+#define GEN9_3DSTATE_SAMPLER_STATE_POINTERS_VS          GEN9_3D(3, 0, 0x2b)
-+#define GEN9_3DSTATE_SAMPLER_STATE_POINTERS_HS          GEN9_3D(3, 0, 0x2c)
-+#define GEN9_3DSTATE_SAMPLER_STATE_POINTERS_DS          GEN9_3D(3, 0, 0x2d)
-+#define GEN9_3DSTATE_SAMPLER_STATE_POINTERS_GS          GEN9_3D(3, 0, 0x2e)
-+#define GEN9_3DSTATE_SAMPLER_STATE_POINTERS_PS          GEN9_3D(3, 0, 0x2f)
-+
-+#define GEN9_3DSTATE_URB_VS                             GEN9_3D(3, 0, 0x30)
-+#define GEN9_3DSTATE_URB_HS                             GEN9_3D(3, 0, 0x31)
-+#define GEN9_3DSTATE_URB_DS                             GEN9_3D(3, 0, 0x32)
-+#define GEN9_3DSTATE_URB_GS                             GEN9_3D(3, 0, 0x33)
-+/* DW1 */
-+# define URB_ENTRY_NUMBER_SHIFT            0
-+# define URB_ENTRY_SIZE_SHIFT              16
-+# define URB_STARTING_ADDRESS_SHIFT        25
-+
-+#define GEN9_3DSTATE_GATHER_CONSTANT_VS             GEN9_3D(3, 0, 0x34)
-+#define GEN9_3DSTATE_GATHER_CONSTANT_GS             GEN9_3D(3, 0, 0x35)
-+#define GEN9_3DSTATE_GATHER_CONSTANT_HS             GEN9_3D(3, 0, 0x36)
-+#define GEN9_3DSTATE_GATHER_CONSTANT_DS             GEN9_3D(3, 0, 0x37)
-+#define GEN9_3DSTATE_GATHER_CONSTANT_PS             GEN9_3D(3, 0, 0x38)
-+
-+#define GEN9_3DSTATE_DX9_CONSTANTF_VS             GEN9_3D(3, 0, 0x39)
-+#define GEN9_3DSTATE_DX9_CONSTANTF_PS             GEN9_3D(3, 0, 0x3a)
-+#define GEN9_3DSTATE_DX9_CONSTANTI_VS             GEN9_3D(3, 0, 0x3b)
-+#define GEN9_3DSTATE_DX9_CONSTANTI_PS             GEN9_3D(3, 0, 0x3c)
-+#define GEN9_3DSTATE_DX9_CONSTANTB_VS             GEN9_3D(3, 0, 0x3d)
-+#define GEN9_3DSTATE_DX9_CONSTANTB_PS             GEN9_3D(3, 0, 0x3e)
-+#define GEN9_3DSTATE_DX9_LOCAL_VALID_VS           GEN9_3D(3, 0, 0x3f)
-+#define GEN9_3DSTATE_DX9_LOCAL_VALID_PS           GEN9_3D(3, 0, 0x40)
-+#define GEN9_3DSTATE_DX9_GENERATE_ACTIVE_VS       GEN9_3D(3, 0, 0x41)
-+#define GEN9_3DSTATE_DX9_GENERATE_ACTIVE_PS       GEN9_3D(3, 0, 0x42)
-+
-+#define GEN9_3DSTATE_BINDING_TABLE_EDIT_VS       GEN9_3D(3, 0, 0x43)
-+#define GEN9_3DSTATE_BINDING_TABLE_EDIT_GS       GEN9_3D(3, 0, 0x44)
-+#define GEN9_3DSTATE_BINDING_TABLE_EDIT_HS       GEN9_3D(3, 0, 0x45)
-+#define GEN9_3DSTATE_BINDING_TABLE_EDIT_DS       GEN9_3D(3, 0, 0x46)
-+#define GEN9_3DSTATE_BINDING_TABLE_EDIT_PS       GEN9_3D(3, 0, 0x47)
-+
-+#define GEN9_3DSTATE_VF_INSTANCING		GEN9_3D(3, 0, 0x49)
-+#define GEN9_3DSTATE_VF_SGVS			GEN9_3D(3, 0, 0x4a)
-+# define SGVS_ENABLE_INSTANCE_ID			(1 << 31)
-+# define SGVS_INSTANCE_ID_COMPONENT_SHIFT		29
-+# define SGVS_INSTANCE_ID_ELEMENT_OFFSET_SHIFT	16
-+# define SGVS_ENABLE_VERTEX_ID			(1 << 15)
-+# define SGVS_VERTEX_ID_COMPONENT_SHIFT            13
-+# define SGVS_VERTEX_ID_ELEMENT_OFFSET_SHIFT	0
-+#define GEN9_3DSTATE_VF_TOPOLOGY		GEN9_3D(3, 0, 0x4b)
-+# define POINTLIST         0x01
-+# define LINELIST          0x02
-+# define LINESTRIP         0x03
-+# define TRILIST           0x04
-+# define TRISTRIP          0x05
-+# define TRIFAN            0x06
-+# define QUADLIST          0x07
-+# define QUADSTRIP         0x08
-+# define LINELIST_ADJ      0x09
-+# define LINESTRIP_ADJ     0x0A
-+# define TRILIST_ADJ       0x0B
-+# define TRISTRIP_ADJ      0x0C
-+# define TRISTRIP_REVERSE  0x0D
-+# define POLYGON           0x0E
-+# define RECTLIST          0x0F
-+# define LINELOOP          0x10
-+# define POINTLIST_BF      0x11
-+# define LINESTRIP_CONT    0x12
-+# define LINESTRIP_BF      0x13
-+# define LINESTRIP_CONT_BF 0x14
-+# define TRIFAN_NOSTIPPLE  0x15
-+
-+#define GEN9_3DSTATE_WM_CHROMAKEY		GEN9_3D(3, 0, 0x4c)
-+
-+#define GEN9_3DSTATE_PS_BLEND				GEN9_3D(3, 0, 0x4d)
-+# define PS_BLEND_ALPHA_TO_COVERAGE_ENABLE		(1 << 31)
-+# define PS_BLEND_HAS_WRITEABLE_RT			(1 << 30)
-+# define PS_BLEND_COLOR_BLEND_ENABLE			(1 << 29)
-+# define PS_BLEND_SRC_ALPHA_SHIFT			24
-+# define PS_BLEND_DST_ALPHA_SHIFT			19
-+# define PS_BLEND_SRC_SHIFT				14
-+# define PS_BLEND_DST_SHIFT				9
-+# define PS_BLEND_ALPHA_TEST_ENABLE			(1 << 8)
-+# define PS_BLEND_INDEPENDENT_ALPHA_BLEND_ENABLE	(1 << 7)
-+
-+#define GEN9_3DSTATE_WM_DEPTH_STENCIL		GEN9_3D(3, 0, 0x4e)
-+/* DW1 */
-+# define WM_DS_STENCIL_TEST_MASK_MASK		INTEL_MASK(31, 24)
-+# define WM_DS_STENCIL_TEST_MASK_SHIFT		24
-+# define WM_DS_STENCIL_WRITE_MASK_MASK		INTEL_MASK(23, 16)
-+# define WM_DS_STENCIL_WRITE_MASK_SHIFT		16
-+# define WM_DS_BF_STENCIL_TEST_MASK_MASK		INTEL_MASK(15, 8)
-+# define WM_DS_BF_STENCIL_TEST_MASK_SHIFT		8
-+# define WM_DS_BF_STENCIL_WRITE_MASK_MASK		INTEL_MASK(7, 0)
-+# define WM_DS_DEPTH_FUNC_SHIFT			5
-+# define WM_DS_DOUBLE_SIDED_STENCIL_ENABLE		(1 << 4)
-+# define WM_DS_STENCIL_TEST_ENABLE			(1 << 3)
-+# define WM_DS_STENCIL_BUFFER_WRITE_ENABLE		(1 << 2)
-+# define WM_DS_DEPTH_TEST_ENABLE			(1 << 1)
-+# define WM_DS_DEPTH_BUFFER_WRITE_ENABLE		(1 << 0)
-+/* DW2 */
-+# define WM_DS_STENCIL_TEST_MASK_MASK		INTEL_MASK(31, 24)
-+# define WM_DS_STENCIL_TEST_MASK_SHIFT		24
-+# define WM_DS_STENCIL_WRITE_MASK_MASK		INTEL_MASK(23, 16)
-+# define WM_DS_STENCIL_WRITE_MASK_SHIFT		16
-+# define WM_DS_BF_STENCIL_TEST_MASK_MASK		INTEL_MASK(15, 8)
-+# define WM_DS_BF_STENCIL_TEST_MASK_SHIFT		8
-+# define WM_DS_BF_STENCIL_WRITE_MASK_MASK		INTEL_MASK(7, 0)
-+# define WM_DS_BF_STENCIL_WRITE_MASK_SHIFT		0
-+
-+#define GEN9_3DSTATE_PS_EXTRA		GEN9_3D(3, 0, 0x4f)
-+# define PSX_PIXEL_SHADER_VALID                    (1 << 31)
-+# define PSX_PIXEL_SHADER_NO_RT_WRITE              (1 << 30)
-+# define PSX_OMASK_TO_RENDER_TARGET                (1 << 29)
-+# define PSX_KILL_ENABLE                           (1 << 28)
-+# define PSX_PSCDEPTH_OFF                          (0 << 26)
-+# define PSX_PSCDEPTH_ON                           (1 << 26)
-+# define PSX_PSCDEPTH_ON_GE                        (2 << 26)
-+# define PSX_PSCDEPTH_ON_LE                        (3 << 26)
-+# define PSX_FORCE_COMPUTED_DEPTH                  (1 << 25)
-+# define PSX_USES_SOURCE_DEPTH                     (1 << 24)
-+# define PSX_USES_SOURCE_W                         (1 << 23)
-+# define PSX_ATTRIBUTE_ENABLE                      (1 << 8)
-+# define PSX_SHADER_DISABLES_ALPHA_TO_COVERAGE     (1 << 7)
-+# define PSX_SHADER_IS_PER_SAMPLE                  (1 << 6)
-+# define PSX_SHADER_HAS_UAV                        (1 << 2)
-+# define PSX_SHADER_USES_INPUT_COVERAGE_MASK       (1 << 1)
-+
-+#define GEN9_3DSTATE_RASTER		GEN9_3D(3, 0, 0x50)
-+/* DW1 */
-+# define RASTER_FRONT_WINDING_CCW                  (1 << 21)
-+# define RASTER_CULL_BOTH                          (0 << 16)
-+# define RASTER_CULL_NONE                          (1 << 16)
-+# define RASTER_CULL_FRONT                         (2 << 16)
-+# define RASTER_CULL_BACK                          (3 << 16)
-+# define RASTER_SMOOTH_POINT_ENABLE                (1 << 13)
-+# define RASTER_LINE_AA_ENABLE                     (1 << 2)
-+# define RASTER_VIEWPORT_Z_CLIP_TEST_ENABLE        (1 << 0)
-+
-+#define GEN9_3DSTATE_SBE_SWIZ		GEN9_3D(3, 0, 0x51)
-+#define GEN9_3DSTATE_WM_HZ_OP		GEN9_3D(3, 0, 0x52)
-+
-+#define GEN9_3DSTATE_COMPONENT_PACKING          GEN6_3D(3, 0, 0x55)
-+
-+
-+
-+#define GEN9_3DSTATE_DRAWING_RECTANGLE		GEN9_3D(3, 1, 0x00)
-+#define GEN9_3DSTATE_SAMPLER_PALETTE_LOAD	GEN9_3D(3, 1, 0x02)
-+#define GEN9_3DSTATE_CHROMA_KEY			GEN9_3D(3, 1, 0x04)
-+
-+#define GEN9_3DSTATE_POLY_STIPPLE_OFFSET	GEN9_3D(3, 1, 0x06)
-+#define GEN9_3DSTATE_POLY_STIPPLE_PATTERN	GEN9_3D(3, 1, 0x07)
-+#define GEN9_3DSTATE_LINE_STIPPLE		GEN9_3D(3, 1, 0x08)
-+#define GEN9_3DSTATE_AA_LINE_PARAMS		GEN9_3D(3, 1, 0x0a)
-+#define GEN9_3DSTATE_SAMPLER_PALETTE_LOAD1	GEN9_3D(3, 1, 0x0c)
-+#define GEN9_3DSTATE_MONOFILTER_SIZE		GEN9_3D(3, 1, 0x11)
-+#define GEN9_3DSTATE_PUSH_CONSTANT_ALLOC_VS	GEN9_3D(3, 1, 0x12)
-+#define GEN9_3DSTATE_PUSH_CONSTANT_ALLOC_HS	GEN9_3D(3, 1, 0x13)
-+#define GEN9_3DSTATE_PUSH_CONSTANT_ALLOC_DS	GEN9_3D(3, 1, 0x14)
-+#define GEN9_3DSTATE_PUSH_CONSTANT_ALLOC_GS	GEN9_3D(3, 1, 0x15)
-+#define GEN9_3DSTATE_PUSH_CONSTANT_ALLOC_PS	GEN9_3D(3, 1, 0x16)
-+/* DW1 */
-+# define PUSH_CONSTANT_BUFFER_OFFSET_SHIFT 16
-+# define PUSH_CONSTANT_BUFFER_SIZE_SHIFT 0
-+
-+#define GEN9_3DSTATE_SO_DECL_LIST		GEN9_3D(3, 1, 0x17)
-+#define GEN9_3DSTATE_SO_BUFFER			GEN9_3D(3, 1, 0x18)
-+#define GEN9_3DSTATE_BINDING_TABLE_POOL_ALLOC	GEN9_3D(3, 1, 0x19)
-+#define GEN9_3DSTATE_GATHER_BUFFER_POOL_ALLOC	GEN9_3D(3, 1, 0x1a)
-+#define GEN9_3DSTATE_DX9_CONSTANT_BUFFER_POOL_ALLOC	GEN9_3D(3, 1, 0x1b)
-+#define GEN9_3DSTATE_SAMPLE_PATTERN		GEN9_3D(3, 1, 0x1c)
-+
-+
-+/* for GEN9_PIPE_CONTROL */
-+#define GEN9_PIPE_CONTROL		GEN9_3D(3, 2, 0)
-+#define PIPE_CONTROL_CS_STALL      (1 << 20)
-+#define PIPE_CONTROL_NOWRITE       (0 << 14)
-+#define PIPE_CONTROL_WRITE_QWORD   (1 << 14)
-+#define PIPE_CONTROL_WRITE_DEPTH   (2 << 14)
-+#define PIPE_CONTROL_WRITE_TIME    (3 << 14)
-+#define PIPE_CONTROL_DEPTH_STALL   (1 << 13)
-+#define PIPE_CONTROL_WC_FLUSH      (1 << 12)
-+#define PIPE_CONTROL_IS_FLUSH      (1 << 11)
-+#define PIPE_CONTROL_TC_FLUSH      (1 << 10)
-+#define PIPE_CONTROL_NOTIFY_ENABLE (1 << 8)
-+#define PIPE_CONTROL_FLUSH         (1 << 7)
-+#define PIPE_CONTROL_GLOBAL_GTT    (1 << 2)
-+#define PIPE_CONTROL_LOCAL_PGTT    (0 << 2)
-+#define PIPE_CONTROL_STALL_AT_SCOREBOARD   (1 << 1)
-+#define PIPE_CONTROL_DEPTH_CACHE_FLUSH	(1 << 0)
-+
-+
-+#define GEN9_3DPRIMITIVE			GEN9_3D(3, 3, 0)
-+
-+/* 3DPRIMITIVE bits */
-+#define VERTEX_SEQUENTIAL (0 << 15)
-+#define VERTEX_RANDOM	  (1 << 15)
-+
-+#define ANISORATIO_2     0
-+#define ANISORATIO_4     1
-+#define ANISORATIO_6     2
-+#define ANISORATIO_8     3
-+#define ANISORATIO_10    4
-+#define ANISORATIO_12    5
-+#define ANISORATIO_14    6
-+#define ANISORATIO_16    7
-+
-+#define BLENDFACTOR_ONE                 0x1
-+#define BLENDFACTOR_SRC_COLOR           0x2
-+#define BLENDFACTOR_SRC_ALPHA           0x3
-+#define BLENDFACTOR_DST_ALPHA           0x4
-+#define BLENDFACTOR_DST_COLOR           0x5
-+#define BLENDFACTOR_SRC_ALPHA_SATURATE  0x6
-+#define BLENDFACTOR_CONST_COLOR         0x7
-+#define BLENDFACTOR_CONST_ALPHA         0x8
-+#define BLENDFACTOR_SRC1_COLOR          0x9
-+#define BLENDFACTOR_SRC1_ALPHA          0x0A
-+#define BLENDFACTOR_ZERO                0x11
-+#define BLENDFACTOR_INV_SRC_COLOR       0x12
-+#define BLENDFACTOR_INV_SRC_ALPHA       0x13
-+#define BLENDFACTOR_INV_DST_ALPHA       0x14
-+#define BLENDFACTOR_INV_DST_COLOR       0x15
-+#define BLENDFACTOR_INV_CONST_COLOR     0x17
-+#define BLENDFACTOR_INV_CONST_ALPHA     0x18
-+#define BLENDFACTOR_INV_SRC1_COLOR      0x19
-+#define BLENDFACTOR_INV_SRC1_ALPHA      0x1A
-+
-+#define BLENDFUNCTION_ADD               0
-+#define BLENDFUNCTION_SUBTRACT          1
-+#define BLENDFUNCTION_REVERSE_SUBTRACT  2
-+#define GEN9_BLENDFUNCTION_MIN               3
-+#define BLENDFUNCTION_MAX               4
-+
-+#define ALPHATEST_FORMAT_UNORM8         0
-+#define ALPHATEST_FORMAT_FLOAT32        1
-+
-+#define CHROMAKEY_KILL_ON_ANY_MATCH  0
-+#define CHROMAKEY_REPLACE_BLACK      1
-+
-+#define CLIP_API_OGL     0
-+#define CLIP_API_DX      1
-+
-+#define CLIPMODE_NORMAL              0
-+#define CLIPMODE_CLIP_ALL            1
-+#define CLIPMODE_CLIP_NON_REJECTED   2
-+#define CLIPMODE_REJECT_ALL          3
-+#define CLIPMODE_ACCEPT_ALL          4
-+
-+#define CLIP_NDCSPACE     0
-+#define CLIP_SCREENSPACE  1
-+
-+#define COMPAREFUNCTION_ALWAYS       0
-+#define COMPAREFUNCTION_NEVER        1
-+#define COMPAREFUNCTION_LESS         2
-+#define COMPAREFUNCTION_EQUAL        3
-+#define COMPAREFUNCTION_LEQUAL       4
-+#define COMPAREFUNCTION_GREATER      5
-+#define COMPAREFUNCTION_NOTEQUAL     6
-+#define COMPAREFUNCTION_GEQUAL       7
-+
-+#define COVERAGE_PIXELS_HALF     0
-+#define COVERAGE_PIXELS_1        1
-+#define COVERAGE_PIXELS_2        2
-+#define COVERAGE_PIXELS_4        3
-+
-+#define DEPTHFORMAT_D32_FLOAT_S8X24_UINT     0
-+#define DEPTHFORMAT_D32_FLOAT                1
-+#define DEPTHFORMAT_D24_UNORM_S8_UINT        2
-+#define DEPTHFORMAT_D16_UNORM                5
-+
-+#define FLOATING_POINT_IEEE_754        0
-+#define FLOATING_POINT_NON_IEEE_754    1
-+
-+#define INDEX_BYTE     0
-+#define INDEX_WORD     1
-+#define INDEX_DWORD    2
-+
-+#define LOGICOPFUNCTION_CLEAR            0
-+#define LOGICOPFUNCTION_NOR              1
-+#define LOGICOPFUNCTION_AND_INVERTED     2
-+#define LOGICOPFUNCTION_COPY_INVERTED    3
-+#define LOGICOPFUNCTION_AND_REVERSE      4
-+#define LOGICOPFUNCTION_INVERT           5
-+#define LOGICOPFUNCTION_XOR              6
-+#define LOGICOPFUNCTION_NAND             7
-+#define LOGICOPFUNCTION_AND              8
-+#define LOGICOPFUNCTION_EQUIV            9
-+#define LOGICOPFUNCTION_NOOP             10
-+#define LOGICOPFUNCTION_OR_INVERTED      11
-+#define LOGICOPFUNCTION_COPY             12
-+#define LOGICOPFUNCTION_OR_REVERSE       13
-+#define LOGICOPFUNCTION_OR               14
-+#define LOGICOPFUNCTION_SET              15
-+
-+#define MAPFILTER_NEAREST	0x0
-+#define MAPFILTER_LINEAR	0x1
-+#define MAPFILTER_ANISOTROPIC	0x2
-+#define MAPFILTER_FLEXIBLE 	0x3
-+#define MAPFILTER_MONO 		0x6
-+
-+#define MIPFILTER_NONE        0
-+#define MIPFILTER_NEAREST     1
-+#define MIPFILTER_LINEAR      3
-+
-+#define POLYGON_FRONT_FACING     0
-+#define POLYGON_BACK_FACING      1
-+
-+#define PREFILTER_ALWAYS     0x0
-+#define PREFILTER_NEVER      0x1
-+#define PREFILTER_LESS       0x2
-+#define PREFILTER_EQUAL      0x3
-+#define PREFILTER_LEQUAL     0x4
-+#define PREFILTER_GREATER    0x5
-+#define PREFILTER_NOTEQUAL   0x6
-+#define PREFILTER_GEQUAL     0x7
-+
-+#define RASTRULE_UPPER_LEFT  0
-+#define RASTRULE_UPPER_RIGHT 1
-+
-+#define STENCILOP_KEEP               0
-+#define STENCILOP_ZERO               1
-+#define STENCILOP_REPLACE            2
-+#define STENCILOP_INCRSAT            3
-+#define STENCILOP_DECRSAT            4
-+#define STENCILOP_INCR               5
-+#define STENCILOP_DECR               6
-+#define STENCILOP_INVERT             7
-+
-+#define SURFACE_MIPMAPLAYOUT_BELOW   0
-+#define SURFACE_MIPMAPLAYOUT_RIGHT   1
-+
-+#define SURFACEFORMAT_R32G32B32A32_FLOAT             0x000
-+#define SURFACEFORMAT_R32G32B32A32_SINT              0x001
-+#define SURFACEFORMAT_R32G32B32A32_UINT              0x002
-+#define SURFACEFORMAT_R32G32B32A32_UNORM             0x003
-+#define SURFACEFORMAT_R32G32B32A32_SNORM             0x004
-+#define SURFACEFORMAT_R64G64_FLOAT                   0x005
-+#define SURFACEFORMAT_R32G32B32X32_FLOAT             0x006
-+#define SURFACEFORMAT_R32G32B32A32_SSCALED           0x007
-+#define SURFACEFORMAT_R32G32B32A32_USCALED           0x008
-+#define SURFACEFORMAT_R32G32B32_FLOAT                0x040
-+#define SURFACEFORMAT_R32G32B32_SINT                 0x041
-+#define SURFACEFORMAT_R32G32B32_UINT                 0x042
-+#define SURFACEFORMAT_R32G32B32_UNORM                0x043
-+#define SURFACEFORMAT_R32G32B32_SNORM                0x044
-+#define SURFACEFORMAT_R32G32B32_SSCALED              0x045
-+#define SURFACEFORMAT_R32G32B32_USCALED              0x046
-+#define SURFACEFORMAT_R16G16B16A16_UNORM             0x080
-+#define SURFACEFORMAT_R16G16B16A16_SNORM             0x081
-+#define SURFACEFORMAT_R16G16B16A16_SINT              0x082
-+#define SURFACEFORMAT_R16G16B16A16_UINT              0x083
-+#define SURFACEFORMAT_R16G16B16A16_FLOAT             0x084
-+#define SURFACEFORMAT_R32G32_FLOAT                   0x085
-+#define SURFACEFORMAT_R32G32_SINT                    0x086
-+#define SURFACEFORMAT_R32G32_UINT                    0x087
-+#define SURFACEFORMAT_R32_FLOAT_X8X24_TYPELESS       0x088
-+#define SURFACEFORMAT_X32_TYPELESS_G8X24_UINT        0x089
-+#define SURFACEFORMAT_L32A32_FLOAT                   0x08A
-+#define SURFACEFORMAT_R32G32_UNORM                   0x08B
-+#define SURFACEFORMAT_R32G32_SNORM                   0x08C
-+#define SURFACEFORMAT_R64_FLOAT                      0x08D
-+#define SURFACEFORMAT_R16G16B16X16_UNORM             0x08E
-+#define SURFACEFORMAT_R16G16B16X16_FLOAT             0x08F
-+#define SURFACEFORMAT_A32X32_FLOAT                   0x090
-+#define SURFACEFORMAT_L32X32_FLOAT                   0x091
-+#define SURFACEFORMAT_I32X32_FLOAT                   0x092
-+#define SURFACEFORMAT_R16G16B16A16_SSCALED           0x093
-+#define SURFACEFORMAT_R16G16B16A16_USCALED           0x094
-+#define SURFACEFORMAT_R32G32_SSCALED                 0x095
-+#define SURFACEFORMAT_R32G32_USCALED                 0x096
-+#define SURFACEFORMAT_B8G8R8A8_UNORM                 0x0C0
-+#define SURFACEFORMAT_B8G8R8A8_UNORM_SRGB            0x0C1
-+#define SURFACEFORMAT_R10G10B10A2_UNORM              0x0C2
-+#define SURFACEFORMAT_R10G10B10A2_UNORM_SRGB         0x0C3
-+#define SURFACEFORMAT_R10G10B10A2_UINT               0x0C4
-+#define SURFACEFORMAT_R10G10B10_SNORM_A2_UNORM       0x0C5
-+#define SURFACEFORMAT_R8G8B8A8_UNORM                 0x0C7
-+#define SURFACEFORMAT_R8G8B8A8_UNORM_SRGB            0x0C8
-+#define SURFACEFORMAT_R8G8B8A8_SNORM                 0x0C9
-+#define SURFACEFORMAT_R8G8B8A8_SINT                  0x0CA
-+#define SURFACEFORMAT_R8G8B8A8_UINT                  0x0CB
-+#define SURFACEFORMAT_R16G16_UNORM                   0x0CC
-+#define SURFACEFORMAT_R16G16_SNORM                   0x0CD
-+#define SURFACEFORMAT_R16G16_SINT                    0x0CE
-+#define SURFACEFORMAT_R16G16_UINT                    0x0CF
-+#define SURFACEFORMAT_R16G16_FLOAT                   0x0D0
-+#define SURFACEFORMAT_B10G10R10A2_UNORM              0x0D1
-+#define SURFACEFORMAT_B10G10R10A2_UNORM_SRGB         0x0D2
-+#define SURFACEFORMAT_R11G11B10_FLOAT                0x0D3
-+#define SURFACEFORMAT_R32_SINT                       0x0D6
-+#define SURFACEFORMAT_R32_UINT                       0x0D7
-+#define SURFACEFORMAT_R32_FLOAT                      0x0D8
-+#define SURFACEFORMAT_R24_UNORM_X8_TYPELESS          0x0D9
-+#define SURFACEFORMAT_X24_TYPELESS_G8_UINT           0x0DA
-+#define SURFACEFORMAT_L16A16_UNORM                   0x0DF
-+#define SURFACEFORMAT_I24X8_UNORM                    0x0E0
-+#define SURFACEFORMAT_L24X8_UNORM                    0x0E1
-+#define SURFACEFORMAT_A24X8_UNORM                    0x0E2
-+#define SURFACEFORMAT_I32_FLOAT                      0x0E3
-+#define SURFACEFORMAT_L32_FLOAT                      0x0E4
-+#define SURFACEFORMAT_A32_FLOAT                      0x0E5
-+#define SURFACEFORMAT_B8G8R8X8_UNORM                 0x0E9
-+#define SURFACEFORMAT_B8G8R8X8_UNORM_SRGB            0x0EA
-+#define SURFACEFORMAT_R8G8B8X8_UNORM                 0x0EB
-+#define SURFACEFORMAT_R8G8B8X8_UNORM_SRGB            0x0EC
-+#define SURFACEFORMAT_R9G9B9E5_SHAREDEXP             0x0ED
-+#define SURFACEFORMAT_B10G10R10X2_UNORM              0x0EE
-+#define SURFACEFORMAT_L16A16_FLOAT                   0x0F0
-+#define SURFACEFORMAT_R32_UNORM                      0x0F1
-+#define SURFACEFORMAT_R32_SNORM                      0x0F2
-+#define SURFACEFORMAT_R10G10B10X2_USCALED            0x0F3
-+#define SURFACEFORMAT_R8G8B8A8_SSCALED               0x0F4
-+#define SURFACEFORMAT_R8G8B8A8_USCALED               0x0F5
-+#define SURFACEFORMAT_R16G16_SSCALED                 0x0F6
-+#define SURFACEFORMAT_R16G16_USCALED                 0x0F7
-+#define SURFACEFORMAT_R32_SSCALED                    0x0F8
-+#define SURFACEFORMAT_R32_USCALED                    0x0F9
-+#define SURFACEFORMAT_B5G6R5_UNORM                   0x100
-+#define SURFACEFORMAT_B5G6R5_UNORM_SRGB              0x101
-+#define SURFACEFORMAT_B5G5R5A1_UNORM                 0x102
-+#define SURFACEFORMAT_B5G5R5A1_UNORM_SRGB            0x103
-+#define SURFACEFORMAT_B4G4R4A4_UNORM                 0x104
-+#define SURFACEFORMAT_B4G4R4A4_UNORM_SRGB            0x105
-+#define SURFACEFORMAT_R8G8_UNORM                     0x106
-+#define SURFACEFORMAT_R8G8_SNORM                     0x107
-+#define SURFACEFORMAT_R8G8_SINT                      0x108
-+#define SURFACEFORMAT_R8G8_UINT                      0x109
-+#define SURFACEFORMAT_R16_UNORM                      0x10A
-+#define SURFACEFORMAT_R16_SNORM                      0x10B
-+#define SURFACEFORMAT_R16_SINT                       0x10C
-+#define SURFACEFORMAT_R16_UINT                       0x10D
-+#define SURFACEFORMAT_R16_FLOAT                      0x10E
-+#define SURFACEFORMAT_I16_UNORM                      0x111
-+#define SURFACEFORMAT_L16_UNORM                      0x112
-+#define SURFACEFORMAT_A16_UNORM                      0x113
-+#define SURFACEFORMAT_L8A8_UNORM                     0x114
-+#define SURFACEFORMAT_I16_FLOAT                      0x115
-+#define SURFACEFORMAT_L16_FLOAT                      0x116
-+#define SURFACEFORMAT_A16_FLOAT                      0x117
-+#define SURFACEFORMAT_R5G5_SNORM_B6_UNORM            0x119
-+#define SURFACEFORMAT_B5G5R5X1_UNORM                 0x11A
-+#define SURFACEFORMAT_B5G5R5X1_UNORM_SRGB            0x11B
-+#define SURFACEFORMAT_R8G8_SSCALED                   0x11C
-+#define SURFACEFORMAT_R8G8_USCALED                   0x11D
-+#define SURFACEFORMAT_R16_SSCALED                    0x11E
-+#define SURFACEFORMAT_R16_USCALED                    0x11F
-+#define SURFACEFORMAT_R8_UNORM                       0x140
-+#define SURFACEFORMAT_R8_SNORM                       0x141
-+#define SURFACEFORMAT_R8_SINT                        0x142
-+#define SURFACEFORMAT_R8_UINT                        0x143
-+#define SURFACEFORMAT_A8_UNORM                       0x144
-+#define SURFACEFORMAT_I8_UNORM                       0x145
-+#define SURFACEFORMAT_L8_UNORM                       0x146
-+#define SURFACEFORMAT_P4A4_UNORM                     0x147
-+#define SURFACEFORMAT_A4P4_UNORM                     0x148
-+#define SURFACEFORMAT_R8_SSCALED                     0x149
-+#define SURFACEFORMAT_R8_USCALED                     0x14A
-+#define SURFACEFORMAT_R1_UINT                        0x181
-+#define SURFACEFORMAT_YCRCB_NORMAL                   0x182
-+#define SURFACEFORMAT_YCRCB_SWAPUVY                  0x183
-+#define SURFACEFORMAT_BC1_UNORM                      0x186
-+#define SURFACEFORMAT_BC2_UNORM                      0x187
-+#define SURFACEFORMAT_BC3_UNORM                      0x188
-+#define SURFACEFORMAT_BC4_UNORM                      0x189
-+#define SURFACEFORMAT_BC5_UNORM                      0x18A
-+#define SURFACEFORMAT_BC1_UNORM_SRGB                 0x18B
-+#define SURFACEFORMAT_BC2_UNORM_SRGB                 0x18C
-+#define SURFACEFORMAT_BC3_UNORM_SRGB                 0x18D
-+#define SURFACEFORMAT_MONO8                          0x18E
-+#define SURFACEFORMAT_YCRCB_SWAPUV                   0x18F
-+#define SURFACEFORMAT_YCRCB_SWAPY                    0x190
-+#define SURFACEFORMAT_DXT1_RGB                       0x191
-+#define SURFACEFORMAT_FXT1                           0x192
-+#define SURFACEFORMAT_R8G8B8_UNORM                   0x193
-+#define SURFACEFORMAT_R8G8B8_SNORM                   0x194
-+#define SURFACEFORMAT_R8G8B8_SSCALED                 0x195
-+#define SURFACEFORMAT_R8G8B8_USCALED                 0x196
-+#define SURFACEFORMAT_R64G64B64A64_FLOAT             0x197
-+#define SURFACEFORMAT_R64G64B64_FLOAT                0x198
-+#define SURFACEFORMAT_BC4_SNORM                      0x199
-+#define SURFACEFORMAT_BC5_SNORM                      0x19A
-+#define SURFACEFORMAT_R16G16B16_UNORM                0x19C
-+#define SURFACEFORMAT_R16G16B16_SNORM                0x19D
-+#define SURFACEFORMAT_R16G16B16_SSCALED              0x19E
-+#define SURFACEFORMAT_R16G16B16_USCALED              0x19F
-+
-+#define SURFACE_1D      0
-+#define SURFACE_2D      1
-+#define SURFACE_3D      2
-+#define SURFACE_CUBE    3
-+#define SURFACE_BUFFER  4
-+#define SURFACE_NULL    7
-+
-+#define TEXCOORDMODE_WRAP            0
-+#define TEXCOORDMODE_MIRROR          1
-+#define TEXCOORDMODE_CLAMP           2
-+#define TEXCOORDMODE_CUBE            3
-+#define TEXCOORDMODE_CLAMP_BORDER    4
-+#define TEXCOORDMODE_MIRROR_ONCE     5
-+
-+#define THREAD_PRIORITY_NORMAL   0
-+#define THREAD_PRIORITY_HIGH     1
-+
-+#define VERTEX_SUBPIXEL_PRECISION_8BITS  0
-+#define VERTEX_SUBPIXEL_PRECISION_4BITS  1
-+
-+#define COMPONENT_NOSTORE      0
-+#define COMPONENT_STORE_SRC    1
-+#define COMPONENT_STORE_0      2
-+#define COMPONENT_STORE_1_FLT  3
-+#define COMPONENT_STORE_1_INT  4
-+#define COMPONENT_STORE_VID    5
-+#define COMPONENT_STORE_IID    6
-+#define COMPONENT_STORE_PID    7
-+
-+/* Execution Unit (EU) defines
-+ */
-+
-+#define GEN9_ALIGN_1   0
-+#define GEN9_ALIGN_16  1
-+
-+#define GEN9_ADDRESS_DIRECT                        0
-+#define GEN9_ADDRESS_REGISTER_INDIRECT_REGISTER    1
-+
-+#define GEN9_CHANNEL_X     0
-+#define GEN9_CHANNEL_Y     1
-+#define GEN9_CHANNEL_Z     2
-+#define GEN9_CHANNEL_W     3
-+
-+#define GEN9_COMPRESSION_NONE          0
-+#define GEN9_COMPRESSION_2NDHALF       1
-+#define GEN9_COMPRESSION_COMPRESSED    2
-+
-+#define GEN9_CONDITIONAL_NONE  0
-+#define GEN9_CONDITIONAL_Z     1
-+#define GEN9_CONDITIONAL_NZ    2
-+#define GEN9_CONDITIONAL_EQ    1	/* Z */
-+#define GEN9_CONDITIONAL_NEQ   2	/* NZ */
-+#define GEN9_CONDITIONAL_G     3
-+#define GEN9_CONDITIONAL_GE    4
-+#define GEN9_CONDITIONAL_L     5
-+#define GEN9_CONDITIONAL_LE    6
-+#define GEN9_CONDITIONAL_C     7
-+#define GEN9_CONDITIONAL_O     8
-+
-+#define GEN9_DEBUG_NONE        0
-+#define GEN9_DEBUG_BREAKPOINT  1
-+
-+#define GEN9_DEPENDENCY_NORMAL         0
-+#define GEN9_DEPENDENCY_NOTCLEARED     1
-+#define GEN9_DEPENDENCY_NOTCHECKED     2
-+#define GEN9_DEPENDENCY_DISABLE        3
-+
-+#define GEN9_EXECUTE_1     0
-+#define GEN9_EXECUTE_2     1
-+#define GEN9_EXECUTE_4     2
-+#define GEN9_EXECUTE_8     3
-+#define GEN9_EXECUTE_16    4
-+#define GEN9_EXECUTE_32    5
-+
-+#define GEN9_HORIZONTAL_STRIDE_0   0
-+#define GEN9_HORIZONTAL_STRIDE_1   1
-+#define GEN9_HORIZONTAL_STRIDE_2   2
-+#define GEN9_HORIZONTAL_STRIDE_4   3
-+
-+#define GEN9_INSTRUCTION_NORMAL    0
-+#define GEN9_INSTRUCTION_SATURATE  1
-+
-+#define GEN9_OPCODE_MOV        1
-+#define GEN9_OPCODE_SEL        2
-+#define GEN9_OPCODE_NOT        4
-+#define GEN9_OPCODE_AND        5
-+#define GEN9_OPCODE_OR         6
-+#define GEN9_OPCODE_XOR        7
-+#define GEN9_OPCODE_SHR        8
-+#define GEN9_OPCODE_SHL        9
-+#define GEN9_OPCODE_RSR        10
-+#define GEN9_OPCODE_RSL        11
-+#define GEN9_OPCODE_ASR        12
-+#define GEN9_OPCODE_CMP        16
-+#define GEN9_OPCODE_JMPI       32
-+#define GEN9_OPCODE_IF         34
-+#define GEN9_OPCODE_IFF        35
-+#define GEN9_OPCODE_ELSE       36
-+#define GEN9_OPCODE_ENDIF      37
-+#define GEN9_OPCODE_DO         38
-+#define GEN9_OPCODE_WHILE      39
-+#define GEN9_OPCODE_BREAK      40
-+#define GEN9_OPCODE_CONTINUE   41
-+#define GEN9_OPCODE_HALT       42
-+#define GEN9_OPCODE_MSAVE      44
-+#define GEN9_OPCODE_MRESTORE   45
-+#define GEN9_OPCODE_PUSH       46
-+#define GEN9_OPCODE_POP        47
-+#define GEN9_OPCODE_WAIT       48
-+#define GEN9_OPCODE_SEND       49
-+#define GEN9_OPCODE_ADD        64
-+#define GEN9_OPCODE_MUL        65
-+#define GEN9_OPCODE_AVG        66
-+#define GEN9_OPCODE_FRC        67
-+#define GEN9_OPCODE_RNDU       68
-+#define GEN9_OPCODE_RNDD       69
-+#define GEN9_OPCODE_RNDE       70
-+#define GEN9_OPCODE_RNDZ       71
-+#define GEN9_OPCODE_MAC        72
-+#define GEN9_OPCODE_MACH       73
-+#define GEN9_OPCODE_LZD        74
-+#define GEN9_OPCODE_SAD2       80
-+#define GEN9_OPCODE_SADA2      81
-+#define GEN9_OPCODE_DP4        84
-+#define GEN9_OPCODE_DPH        85
-+#define GEN9_OPCODE_DP3        86
-+#define GEN9_OPCODE_DP2        87
-+#define GEN9_OPCODE_DPA2       88
-+#define GEN9_OPCODE_LINE       89
-+#define GEN9_OPCODE_NOP        126
-+
-+#define GEN9_PREDICATE_NONE             0
-+#define GEN9_PREDICATE_NORMAL           1
-+#define GEN9_PREDICATE_ALIGN1_ANYV             2
-+#define GEN9_PREDICATE_ALIGN1_ALLV             3
-+#define GEN9_PREDICATE_ALIGN1_ANY2H            4
-+#define GEN9_PREDICATE_ALIGN1_ALL2H            5
-+#define GEN9_PREDICATE_ALIGN1_ANY4H            6
-+#define GEN9_PREDICATE_ALIGN1_ALL4H            7
-+#define GEN9_PREDICATE_ALIGN1_ANY8H            8
-+#define GEN9_PREDICATE_ALIGN1_ALL8H            9
-+#define GEN9_PREDICATE_ALIGN1_ANY16H           10
-+#define GEN9_PREDICATE_ALIGN1_ALL16H           11
-+#define GEN9_PREDICATE_ALIGN16_REPLICATE_X     2
-+#define GEN9_PREDICATE_ALIGN16_REPLICATE_Y     3
-+#define GEN9_PREDICATE_ALIGN16_REPLICATE_Z     4
-+#define GEN9_PREDICATE_ALIGN16_REPLICATE_W     5
-+#define GEN9_PREDICATE_ALIGN16_ANY4H           6
-+#define GEN9_PREDICATE_ALIGN16_ALL4H           7
-+
-+#define GEN9_ARCHITECTURE_REGISTER_FILE    0
-+#define GEN9_GENERAL_REGISTER_FILE         1
-+#define GEN9_MESSAGE_REGISTER_FILE         2
-+#define GEN9_IMMEDIATE_VALUE               3
-+
-+#define GEN9_REGISTER_TYPE_UD  0
-+#define GEN9_REGISTER_TYPE_D   1
-+#define GEN9_REGISTER_TYPE_UW  2
-+#define GEN9_REGISTER_TYPE_W   3
-+#define GEN9_REGISTER_TYPE_UB  4
-+#define GEN9_REGISTER_TYPE_B   5
-+#define GEN9_REGISTER_TYPE_VF  5	/* packed float vector, immediates only? */
-+#define GEN9_REGISTER_TYPE_HF  6
-+#define GEN9_REGISTER_TYPE_V   6	/* packed int vector, immediates only, uword dest only */
-+#define GEN9_REGISTER_TYPE_F   7
-+
-+#define GEN9_ARF_NULL                  0x00
-+#define GEN9_ARF_ADDRESS               0x10
-+#define GEN9_ARF_ACCUMULATOR           0x20
-+#define GEN9_ARF_FLAG                  0x30
-+#define GEN9_ARF_MASK                  0x40
-+#define GEN9_ARF_MASK_STACK            0x50
-+#define GEN9_ARF_MASK_STACK_DEPTH      0x60
-+#define GEN9_ARF_STATE                 0x70
-+#define GEN9_ARF_CONTROL               0x80
-+#define GEN9_ARF_NOTIFICATION_COUNT    0x90
-+#define GEN9_ARF_IP                    0xA0
-+
-+#define GEN9_AMASK   0
-+#define GEN9_IMASK   1
-+#define GEN9_LMASK   2
-+#define GEN9_CMASK   3
-+
-+#define GEN9_THREAD_NORMAL     0
-+#define GEN9_THREAD_ATOMIC     1
-+#define GEN9_THREAD_SWITCH     2
-+
-+#define GEN9_VERTICAL_STRIDE_0                 0
-+#define GEN9_VERTICAL_STRIDE_1                 1
-+#define GEN9_VERTICAL_STRIDE_2                 2
-+#define GEN9_VERTICAL_STRIDE_4                 3
-+#define GEN9_VERTICAL_STRIDE_8                 4
-+#define GEN9_VERTICAL_STRIDE_16                5
-+#define GEN9_VERTICAL_STRIDE_32                6
-+#define GEN9_VERTICAL_STRIDE_64                7
-+#define GEN9_VERTICAL_STRIDE_128               8
-+#define GEN9_VERTICAL_STRIDE_256               9
-+#define GEN9_VERTICAL_STRIDE_ONE_DIMENSIONAL   0xF
-+
-+#define GEN9_WIDTH_1       0
-+#define GEN9_WIDTH_2       1
-+#define GEN9_WIDTH_4       2
-+#define GEN9_WIDTH_8       3
-+#define GEN9_WIDTH_16      4
-+
-+#define GEN9_STATELESS_BUFFER_BOUNDARY_1K      0
-+#define GEN9_STATELESS_BUFFER_BOUNDARY_2K      1
-+#define GEN9_STATELESS_BUFFER_BOUNDARY_4K      2
-+#define GEN9_STATELESS_BUFFER_BOUNDARY_8K      3
-+#define GEN9_STATELESS_BUFFER_BOUNDARY_16K     4
-+#define GEN9_STATELESS_BUFFER_BOUNDARY_32K     5
-+#define GEN9_STATELESS_BUFFER_BOUNDARY_64K     6
-+#define GEN9_STATELESS_BUFFER_BOUNDARY_128K    7
-+#define GEN9_STATELESS_BUFFER_BOUNDARY_256K    8
-+#define GEN9_STATELESS_BUFFER_BOUNDARY_512K    9
-+#define GEN9_STATELESS_BUFFER_BOUNDARY_1M      10
-+#define GEN9_STATELESS_BUFFER_BOUNDARY_2M      11
-+
-+#define GEN9_POLYGON_FACING_FRONT      0
-+#define GEN9_POLYGON_FACING_BACK       1
-+
-+#define GEN9_MESSAGE_TARGET_NULL               0
-+#define GEN9_MESSAGE_TARGET_MATH               1
-+#define GEN9_MESSAGE_TARGET_SAMPLER            2
-+#define GEN9_MESSAGE_TARGET_GATEWAY            3
-+#define GEN9_MESSAGE_TARGET_DATAPORT_READ      4
-+#define GEN9_MESSAGE_TARGET_DATAPORT_WRITE     5
-+#define GEN9_MESSAGE_TARGET_URB                6
-+#define GEN9_MESSAGE_TARGET_THREAD_SPAWNER     7
-+
-+#define GEN9_SAMPLER_RETURN_FORMAT_FLOAT32     0
-+#define GEN9_SAMPLER_RETURN_FORMAT_UINT32      2
-+#define GEN9_SAMPLER_RETURN_FORMAT_SINT32      3
-+
-+#define GEN9_SAMPLER_MESSAGE_SIMD8_SAMPLE              0
-+#define GEN9_SAMPLER_MESSAGE_SIMD16_SAMPLE             0
-+#define GEN9_SAMPLER_MESSAGE_SIMD16_SAMPLE_BIAS        0
-+#define GEN9_SAMPLER_MESSAGE_SIMD8_KILLPIX             1
-+#define GEN9_SAMPLER_MESSAGE_SIMD4X2_SAMPLE_LOD        1
-+#define GEN9_SAMPLER_MESSAGE_SIMD16_SAMPLE_LOD         1
-+#define GEN9_SAMPLER_MESSAGE_SIMD4X2_SAMPLE_GRADIENTS  2
-+#define GEN9_SAMPLER_MESSAGE_SIMD8_SAMPLE_GRADIENTS    2
-+#define GEN9_SAMPLER_MESSAGE_SIMD4X2_SAMPLE_COMPARE    0
-+#define GEN9_SAMPLER_MESSAGE_SIMD16_SAMPLE_COMPARE     2
-+#define GEN9_SAMPLER_MESSAGE_SIMD4X2_RESINFO           2
-+#define GEN9_SAMPLER_MESSAGE_SIMD8_RESINFO             2
-+#define GEN9_SAMPLER_MESSAGE_SIMD16_RESINFO            2
-+#define GEN9_SAMPLER_MESSAGE_SIMD4X2_LD                3
-+#define GEN9_SAMPLER_MESSAGE_SIMD8_LD                  3
-+#define GEN9_SAMPLER_MESSAGE_SIMD16_LD                 3
-+
-+#define GEN9_DATAPORT_OWORD_BLOCK_1_OWORDLOW   0
-+#define GEN9_DATAPORT_OWORD_BLOCK_1_OWORDHIGH  1
-+#define GEN9_DATAPORT_OWORD_BLOCK_2_OWORDS     2
-+#define GEN9_DATAPORT_OWORD_BLOCK_4_OWORDS     3
-+#define GEN9_DATAPORT_OWORD_BLOCK_8_OWORDS     4
-+
-+#define GEN9_DATAPORT_OWORD_DUAL_BLOCK_1OWORD     0
-+#define GEN9_DATAPORT_OWORD_DUAL_BLOCK_4OWORDS    2
-+
-+#define GEN9_DATAPORT_DWORD_SCATTERED_BLOCK_8DWORDS   2
-+#define GEN9_DATAPORT_DWORD_SCATTERED_BLOCK_16DWORDS  3
-+
-+#define GEN9_DATAPORT_READ_MESSAGE_OWORD_BLOCK_READ          0
-+#define GEN9_DATAPORT_READ_MESSAGE_OWORD_DUAL_BLOCK_READ     1
-+#define GEN9_DATAPORT_READ_MESSAGE_DWORD_BLOCK_READ          2
-+#define GEN9_DATAPORT_READ_MESSAGE_DWORD_SCATTERED_READ      3
-+
-+#define GEN9_DATAPORT_READ_TARGET_DATA_CACHE      0
-+#define GEN9_DATAPORT_READ_TARGET_RENDER_CACHE    1
-+#define GEN9_DATAPORT_READ_TARGET_SAMPLER_CACHE   2
-+
-+#define GEN9_DATAPORT_RENDER_TARGET_WRITE_SIMD16_SINGLE_SOURCE                0
-+#define GEN9_DATAPORT_RENDER_TARGET_WRITE_SIMD16_SINGLE_SOURCE_REPLICATED     1
-+#define GEN9_DATAPORT_RENDER_TARGET_WRITE_SIMD8_DUAL_SOURCE_SUBSPAN01         2
-+#define GEN9_DATAPORT_RENDER_TARGET_WRITE_SIMD8_DUAL_SOURCE_SUBSPAN23         3
-+#define GEN9_DATAPORT_RENDER_TARGET_WRITE_SIMD8_SINGLE_SOURCE_SUBSPAN01       4
-+
-+#define GEN9_DATAPORT_WRITE_MESSAGE_OWORD_BLOCK_WRITE                0
-+#define GEN9_DATAPORT_WRITE_MESSAGE_OWORD_DUAL_BLOCK_WRITE           1
-+#define GEN9_DATAPORT_WRITE_MESSAGE_DWORD_BLOCK_WRITE                2
-+#define GEN9_DATAPORT_WRITE_MESSAGE_DWORD_SCATTERED_WRITE            3
-+#define GEN9_DATAPORT_WRITE_MESSAGE_RENDER_TARGET_WRITE              4
-+#define GEN9_DATAPORT_WRITE_MESSAGE_STREAMED_VERTEX_BUFFER_WRITE     5
-+#define GEN9_DATAPORT_WRITE_MESSAGE_FLUSH_RENDER_CACHE               7
-+
-+#define GEN9_MATH_FUNCTION_INV                              1
-+#define GEN9_MATH_FUNCTION_LOG                              2
-+#define GEN9_MATH_FUNCTION_EXP                              3
-+#define GEN9_MATH_FUNCTION_SQRT                             4
-+#define GEN9_MATH_FUNCTION_RSQ                              5
-+#define GEN9_MATH_FUNCTION_SIN                              6 /* was 7 */
-+#define GEN9_MATH_FUNCTION_COS                              7 /* was 8 */
-+#define GEN9_MATH_FUNCTION_SINCOS                           8 /* was 6 */
-+#define GEN9_MATH_FUNCTION_TAN                              9
-+#define GEN9_MATH_FUNCTION_POW                              10
-+#define GEN9_MATH_FUNCTION_INT_DIV_QUOTIENT_AND_REMAINDER   11
-+#define GEN9_MATH_FUNCTION_INT_DIV_QUOTIENT                 12
-+#define GEN9_MATH_FUNCTION_INT_DIV_REMAINDER                13
-+
-+#define GEN9_MATH_INTEGER_UNSIGNED     0
-+#define GEN9_MATH_INTEGER_SIGNED       1
-+
-+#define GEN9_MATH_PRECISION_FULL        0
-+#define GEN9_MATH_PRECISION_PARTIAL     1
-+
-+#define GEN9_MATH_SATURATE_NONE         0
-+#define GEN9_MATH_SATURATE_SATURATE     1
-+
-+#define GEN9_MATH_DATA_VECTOR  0
-+#define GEN9_MATH_DATA_SCALAR  1
-+
-+#define GEN9_URB_OPCODE_WRITE  0
-+
-+#define GEN9_URB_SWIZZLE_NONE          0
-+#define GEN9_URB_SWIZZLE_INTERLEAVE    1
-+#define GEN9_URB_SWIZZLE_TRANSPOSE     2
-+
-+#define GEN9_SCRATCH_SPACE_SIZE_1K     0
-+#define GEN9_SCRATCH_SPACE_SIZE_2K     1
-+#define GEN9_SCRATCH_SPACE_SIZE_4K     2
-+#define GEN9_SCRATCH_SPACE_SIZE_8K     3
-+#define GEN9_SCRATCH_SPACE_SIZE_16K    4
-+#define GEN9_SCRATCH_SPACE_SIZE_32K    5
-+#define GEN9_SCRATCH_SPACE_SIZE_64K    6
-+#define GEN9_SCRATCH_SPACE_SIZE_128K   7
-+#define GEN9_SCRATCH_SPACE_SIZE_256K   8
-+#define GEN9_SCRATCH_SPACE_SIZE_512K   9
-+#define GEN9_SCRATCH_SPACE_SIZE_1M     10
-+#define GEN9_SCRATCH_SPACE_SIZE_2M     11
-+
-+struct gen9_blend_state {
-+	struct {
-+		/* 00 */ uint32_t pad:19;
-+		/* 19 */ uint32_t y_dither_offset:2;
-+		/* 21 */ uint32_t x_dither_offset:2;
-+		/* 23 */ uint32_t color_dither_enable:1;
-+		/* 24 */ uint32_t alpha_test_function:3;
-+		/* 27 */ uint32_t alpha_test:1;
-+		/* 28 */ uint32_t alpha_to_coverage_dither:1;
-+		/* 29 */ uint32_t alpha_to_one:1;
-+		/* 30 */ uint32_t ia_blend:1;
-+		/* 31 */ uint32_t alpha_to_coverage:1;
-+	} common;
-+
-+	struct {
-+		/* 00 */ uint32_t write_disable_blue:1;
-+		/* 01 */ uint32_t write_disable_green:1;
-+		/* 02 */ uint32_t write_disable_red:1;
-+		/* 03 */ uint32_t write_disable_alpha:1;
-+		/* 04 */ uint32_t pad0:1;
-+		/* 05 */ uint32_t alpha_blend_function:3;
-+		/* 08 */ uint32_t dest_alpha_blend_factor:5;
-+		/* 13 */ uint32_t source_alpha_blend_factor:5;
-+		/* 18 */ uint32_t color_blend_function:3;
-+		/* 21 */ uint32_t dest_blend_factor:5;
-+		/* 26 */ uint32_t source_blend_factor:5;
-+		/* 31 */ uint32_t color_blend:1;
-+		/* 32 */ uint32_t post_blend_clamp:1;
-+		/* 33 */ uint32_t pre_blend_clamp:1;
-+		/* 34 */ uint32_t color_clamp_range:2;
-+		/* 36 */ uint32_t pre_blend_source_only_clamp:1;
-+		/* 37 */ uint32_t pad1:22;
-+		/* 59 */ uint32_t logic_op_function:4;
-+		/* 63 */ uint32_t logic_op:1;
-+	} rt;
-+};
-+
-+struct gen9_color_calc_state {
-+	struct {
-+		/* 00 */ uint32_t alpha_test_format:1;
-+		/* 01 */ uint32_t pad0:14;
-+		/* 15 */ uint32_t round_disable:1;
-+		/* 16 */ uint32_t bf_stencil_ref:8;
-+		/* 24 */ uint32_t stencil_ref:8;
-+	} cc0;
-+
-+	union {
-+		float alpha_ref_f;
-+		struct {
-+			uint32_t ui:8;
-+			uint32_t pad0:24;
-+		} alpha_ref_fi;
-+	} cc1;
-+
-+	float constant_r;
-+	float constant_g;
-+	float constant_b;
-+	float constant_a;
-+};
-+
-+struct gen9_sampler_state {
-+	struct {
-+		/* 00 */ unsigned int aniso_algorithm:1;
-+		/* 01 */ unsigned int lod_bias:13;
-+		/* 14 */ unsigned int min_filter:3;
-+		/* 17 */ unsigned int mag_filter:3;
-+		/* 20 */ unsigned int mip_filter:2;
-+		/* 22 */ unsigned int base_level:5;
-+		/* 27 */ unsigned int lod_preclamp:2;
-+		/* 29 */ unsigned int default_color_mode:1;
-+		/* 30 */ unsigned int flexible_filter_clamp:1;
-+		/* 31 */ unsigned int disable:1;
-+	} ss0;
-+
-+	struct {
-+		/* 00 */ unsigned int cube_control_mode:1;
-+		/* 01 */ unsigned int shadow_function:3;
-+		/* 04 */ unsigned int chroma_key_mode:1;
-+		/* 05 */ unsigned int chroma_key_index:2;
-+		/* 07 */ unsigned int chroma_key_enable:1;
-+		/* 08 */ unsigned int max_lod:12;
-+		/* 20 */ unsigned int min_lod:12;
-+	} ss1;
-+
-+	struct {
-+		unsigned int pad:6;
-+		unsigned int default_color_pointer:26;
-+	} ss2;
-+
-+	struct {
-+		/* 00 */ unsigned int r_wrap_mode:3;
-+		/* 03 */ unsigned int t_wrap_mode:3;
-+		/* 06 */ unsigned int s_wrap_mode:3;
-+		/* 09 */ unsigned int pad:1;
-+		/* 10 */ unsigned int non_normalized_coord:1;
-+		/* 11 */ unsigned int trilinear_quality:2;
-+		/* 13 */ unsigned int address_round:6;
-+		/* 19 */ unsigned int max_aniso:3;
-+		/* 22 */ unsigned int pad0:2;
-+		/* 24 */ unsigned int non_separable_filter:8;
-+	} ss3;
-+};
-+
-+/* Surface state DW0 */
-+#define SURFACE_RC_READ_WRITE	(1 << 8)
-+#define SURFACE_TILED		(1 << 13)
-+#define SURFACE_TILED_Y		(1 << 12)
-+#define SURFACE_FORMAT_SHIFT	18
-+#define SURFACE_VALIGN_1	(0 << 16) /* reserved! */
-+#define SURFACE_VALIGN_4	(1 << 16)
-+#define SURFACE_VALIGN_8	(2 << 16)
-+#define SURFACE_VALIGN_16	(3 << 16)
-+#define SURFACE_HALIGN_1	(0 << 14) /* reserved! */
-+#define SURFACE_HALIGN_4	(1 << 14)
-+#define SURFACE_HALIGN_8	(2 << 14)
-+#define SURFACE_HALIGN_16	(3 << 14)
-+#define SURFACE_TYPE_SHIFT		29
-+
-+/* Surface state DW2 */
-+#define SURFACE_HEIGHT_SHIFT        16
-+#define SURFACE_WIDTH_SHIFT         0
-+
-+/* Surface state DW3 */
-+#define SURFACE_DEPTH_SHIFT         21
-+#define SURFACE_PITCH_SHIFT         0
-+
-+#define SWIZZLE_ZERO		0
-+#define SWIZZLE_ONE		1
-+#define SWIZZLE_RED		4
-+#define SWIZZLE_GREEN		5
-+#define SWIZZLE_BLUE		6
-+#define SWIZZLE_ALPHA		7
-+#define __SURFACE_SWIZZLE(r,g,b,a) \
-+	((a) << 16 | (b) << 19 | (g) << 22 | (r) << 25)
-+#define SURFACE_SWIZZLE(r,g,b,a) \
-+	__SURFACE_SWIZZLE(SWIZZLE_##r, SWIZZLE_##g, SWIZZLE_##b, SWIZZLE_##a)
-+
-+typedef enum {
-+	SAMPLER_FILTER_NEAREST = 0,
-+	SAMPLER_FILTER_BILINEAR,
-+	FILTER_COUNT
-+} sampler_filter_t;
-+
-+typedef enum {
-+	SAMPLER_EXTEND_NONE = 0,
-+	SAMPLER_EXTEND_REPEAT,
-+	SAMPLER_EXTEND_PAD,
-+	SAMPLER_EXTEND_REFLECT,
-+	EXTEND_COUNT
-+} sampler_extend_t;
-+
-+#endif
-diff --git a/src/sna/kgem.c b/src/sna/kgem.c
-index 78ed5407..f0d171ac 100644
---- a/src/sna/kgem.c
-+++ b/src/sna/kgem.c
-@@ -84,6 +84,10 @@ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags);
- #define DBG_NO_HANDLE_LUT 0
- #define DBG_NO_WT 0
- #define DBG_NO_WC_MMAP 0
-+#define DBG_NO_BLT_Y 0
-+#define DBG_NO_SCANOUT_Y 0
-+#define DBG_NO_DIRTYFB 0
-+#define DBG_NO_DETILING 0
- #define DBG_DUMP 0
- #define DBG_NO_MALLOC_CACHE 0
- 
-@@ -96,11 +100,6 @@ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags);
- #define SHOW_BATCH_BEFORE 0
- #define SHOW_BATCH_AFTER 0
- 
--#if !USE_WC_MMAP
--#undef DBG_NO_WC_MMAP
--#define DBG_NO_WC_MMAP 1
--#endif
--
- #if 0
- #define ASSERT_IDLE(kgem__, handle__) assert(!__kgem_busy(kgem__, handle__))
- #define ASSERT_MAYBE_IDLE(kgem__, handle__, expect__) assert(!(expect__) || !__kgem_busy(kgem__, handle__))
-@@ -187,6 +186,15 @@ struct local_i915_gem_caching {
- #define LOCAL_IOCTL_I915_GEM_SET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_SET_CACHING, struct local_i915_gem_caching)
- #define LOCAL_IOCTL_I915_GEM_GET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_GET_CACHING, struct local_i915_gem_caching)
- 
-+struct local_i915_gem_mmap {
-+	uint32_t handle;
-+	uint32_t pad;
-+	uint64_t offset;
-+	uint64_t size;
-+	uint64_t addr_ptr;
-+};
-+#define LOCAL_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct local_i915_gem_mmap)
-+
- struct local_i915_gem_mmap2 {
- 	uint32_t handle;
- 	uint32_t pad;
-@@ -216,6 +224,12 @@ static struct kgem_bo *__kgem_freed_bo;
- static struct kgem_request *__kgem_freed_request;
- static struct drm_i915_gem_exec_object2 _kgem_dummy_exec;
- 
-+static inline struct sna *__to_sna(struct kgem *kgem)
-+{
-+	/* minor layering violations */
-+	return container_of(kgem, struct sna, kgem);
-+}
-+
- static inline int bytes(struct kgem_bo *bo)
- {
- 	return __kgem_bo_size(bo);
-@@ -224,25 +238,31 @@ static inline int bytes(struct kgem_bo *bo)
- #define bucket(B) (B)->size.pages.bucket
- #define num_pages(B) (B)->size.pages.count
- 
--static int do_ioctl(int fd, unsigned long req, void *arg)
-+static int __do_ioctl(int fd, unsigned long req, void *arg)
- {
--	int err;
--
--restart:
--	if (ioctl(fd, req, arg) == 0)
--		return 0;
-+	do {
-+		int err;
- 
--	err = errno;
-+		switch ((err = errno)) {
-+		case EAGAIN:
-+			sched_yield();
-+		case EINTR:
-+			break;
-+		default:
-+			return -err;
-+		}
- 
--	if (err == EINTR)
--		goto restart;
-+		if (likely(ioctl(fd, req, arg) == 0))
-+			return 0;
-+	} while (1);
-+}
- 
--	if (err == EAGAIN) {
--		sched_yield();
--		goto restart;
--	}
-+inline static int do_ioctl(int fd, unsigned long req, void *arg)
-+{
-+	if (likely(ioctl(fd, req, arg) == 0))
-+		return 0;
- 
--	return -err;
-+	return __do_ioctl(fd, req, arg);
- }
- 
- #ifdef DEBUG_MEMORY
-@@ -266,6 +286,9 @@ static void assert_tiling(struct kgem *kgem, struct kgem_bo *bo)
- 
- 	assert(bo);
- 
-+	if (!kgem->can_fence && kgem->gen >= 040 && bo->tiling)
-+		return; /* lies */
-+
- 	VG_CLEAR(tiling);
- 	tiling.handle = bo->handle;
- 	tiling.tiling_mode = bo->tiling;
-@@ -273,7 +296,7 @@ static void assert_tiling(struct kgem *kgem, struct kgem_bo *bo)
- 	assert(tiling.tiling_mode == bo->tiling);
- }
- 
--static void assert_cacheing(struct kgem *kgem, struct kgem_bo *bo)
-+static void assert_caching(struct kgem *kgem, struct kgem_bo *bo)
- {
- 	struct local_i915_gem_caching arg;
- 	int expect = kgem->has_llc ? SNOOPED : UNCACHED;
-@@ -294,24 +317,117 @@ static void assert_bo_retired(struct kgem_bo *bo)
- 	assert(bo->refcnt);
- 	assert(bo->rq == NULL);
- 	assert(bo->exec == NULL);
-+	assert(!bo->needs_flush);
- 	assert(list_is_empty(&bo->request));
- }
- #else
- #define assert_tiling(kgem, bo)
--#define assert_cacheing(kgem, bo)
-+#define assert_caching(kgem, bo)
- #define assert_bo_retired(bo)
- #endif
- 
-+static int __find_debugfs(struct kgem *kgem)
-+{
-+	int i;
-+
-+	for (i = 0; i < DRM_MAX_MINOR; i++) {
-+		char path[80];
-+
-+		sprintf(path, "/sys/kernel/debug/dri/%d/i915_wedged", i);
-+		if (access(path, R_OK) == 0)
-+			return i;
-+
-+		sprintf(path, "/debug/dri/%d/i915_wedged", i);
-+		if (access(path, R_OK) == 0)
-+			return i;
-+	}
-+
-+	return -1;
-+}
-+
-+static int kgem_get_minor(struct kgem *kgem)
-+{
-+	struct stat st;
-+
-+	if (fstat(kgem->fd, &st))
-+		return __find_debugfs(kgem);
-+
-+	if (!S_ISCHR(st.st_mode))
-+		return __find_debugfs(kgem);
-+
-+	return st.st_rdev & 0x63;
-+}
-+
-+static bool find_hang_state(struct kgem *kgem, char *path, int maxlen)
-+{
-+	int minor = kgem_get_minor(kgem);
-+
-+	/* Search for our hang state in a few canonical locations.
-+	 * In the unlikely event of having multiple devices, we
-+	 * will need to check which minor actually corresponds to ours.
-+	 */
-+
-+	snprintf(path, maxlen, "/sys/class/drm/card%d/error", minor);
-+	if (access(path, R_OK) == 0)
-+		return true;
-+
-+	snprintf(path, maxlen, "/sys/kernel/debug/dri/%d/i915_error_state", minor);
-+	if (access(path, R_OK) == 0)
-+		return true;
-+
-+	snprintf(path, maxlen, "/debug/dri/%d/i915_error_state", minor);
-+	if (access(path, R_OK) == 0)
-+		return true;
-+
-+	path[0] = '\0';
-+	return false;
-+}
-+
-+static bool has_error_state(struct kgem *kgem, char *path)
-+{
-+   bool ret = false;
-+   char no;
-+   int fd;
-+
-+   fd = open(path, O_RDONLY);
-+   if (fd >= 0) {
-+      ret = read(fd, &no, 1) == 1 && no != 'N';
-+      close(fd);
-+   }
-+
-+   return ret;
-+}
-+
-+static int kgem_get_screen_index(struct kgem *kgem)
-+{
-+	return __to_sna(kgem)->scrn->scrnIndex;
-+}
-+
- static void
- __kgem_set_wedged(struct kgem *kgem)
- {
-+	static int once;
-+	char path[256];
-+
-+	if (kgem->wedged)
-+		return;
-+
-+	if (!once &&
-+	    find_hang_state(kgem, path, sizeof(path)) &&
-+            has_error_state(kgem, path)) {
-+		xf86DrvMsg(kgem_get_screen_index(kgem), X_ERROR,
-+			   "When reporting this, please include %s and the full dmesg.\n",
-+			   path);
-+		once = 1;
-+	}
-+
- 	kgem->wedged = true;
--	sna_render_mark_wedged(container_of(kgem, struct sna, kgem));
-+	sna_render_mark_wedged(__to_sna(kgem));
- }
- 
- static void kgem_sna_reset(struct kgem *kgem)
- {
--	struct sna *sna = container_of(kgem, struct sna, kgem);
-+	struct sna *sna = __to_sna(kgem);
- 
- 	sna->render.reset(sna);
- 	sna->blt_state.fill_bo = 0;
-@@ -319,7 +435,7 @@ static void kgem_sna_reset(struct kgem *kgem)
- 
- static void kgem_sna_flush(struct kgem *kgem)
- {
--	struct sna *sna = container_of(kgem, struct sna, kgem);
-+	struct sna *sna = __to_sna(kgem);
- 
- 	sna->render.flush(sna);
- 
-@@ -327,22 +443,53 @@ static void kgem_sna_flush(struct kgem *kgem)
- 		sna_render_flush_solid(sna);
- }
- 
--static bool gem_set_tiling(int fd, uint32_t handle, int tiling, int stride)
-+static bool kgem_bo_rmfb(struct kgem *kgem, struct kgem_bo *bo)
-+{
-+	if (bo->scanout && bo->delta) {
-+		DBG(("%s: releasing fb=%d for handle=%d\n",
-+		     __FUNCTION__, bo->delta, bo->handle));
-+		/* XXX will leak if we are not DRM_MASTER. *shrug* */
-+		do_ioctl(kgem->fd, DRM_IOCTL_MODE_RMFB, &bo->delta);
-+		bo->delta = 0;
-+		return true;
-+	} else
-+		return false;
-+}
-+
-+static bool kgem_set_tiling(struct kgem *kgem, struct kgem_bo *bo,
-+			    int tiling, int stride)
- {
- 	struct drm_i915_gem_set_tiling set_tiling;
- 	int err;
- 
-+	if (tiling == bo->tiling) {
-+		if (tiling == I915_TILING_NONE) {
-+			bo->pitch = stride;
-+			return true;
-+		}
-+		if (stride == bo->pitch)
-+			return true;
-+	}
-+
- 	if (DBG_NO_TILING)
- 		return false;
- 
- 	VG_CLEAR(set_tiling);
- restart:
--	set_tiling.handle = handle;
-+	set_tiling.handle = bo->handle;
- 	set_tiling.tiling_mode = tiling;
--	set_tiling.stride = stride;
-+	set_tiling.stride = tiling ? stride : 0;
- 
--	if (ioctl(fd, DRM_IOCTL_I915_GEM_SET_TILING, &set_tiling) == 0)
--		return true;
-+	if (ioctl(kgem->fd, DRM_IOCTL_I915_GEM_SET_TILING, &set_tiling) == 0) {
-+		bo->tiling = set_tiling.tiling_mode;
-+		bo->pitch = set_tiling.tiling_mode ? set_tiling.stride : stride;
-+		DBG(("%s: handle=%d, tiling=%d [%d], pitch=%d [%d]: %d\n",
-+		     __FUNCTION__, bo->handle,
-+		     bo->tiling, tiling,
-+		     bo->pitch, stride,
-+		     set_tiling.tiling_mode == tiling));
-+		return set_tiling.tiling_mode == tiling;
-+	}
- 
- 	err = errno;
- 	if (err == EINTR)
-@@ -353,6 +500,11 @@ restart:
- 		goto restart;
- 	}
- 
-+	if (err == EBUSY && kgem_bo_rmfb(kgem, bo))
-+		goto restart;
-+
-+	ERR(("%s: failed to set-tiling(tiling=%d, pitch=%d) for handle=%d: %d\n",
-+	     __FUNCTION__, tiling, stride, bo->handle, err));
- 	return false;
- }
- 
-@@ -437,10 +589,15 @@ static void *__kgem_bo_map__gtt(struct kgem *kgem, struct kgem_bo *bo)
- 	DBG(("%s(handle=%d, size=%d)\n", __FUNCTION__,
- 	     bo->handle, bytes(bo)));
- 
-+	if (bo->tiling && !kgem->can_fence)
-+		return NULL;
-+
- 	VG_CLEAR(gtt);
- retry_gtt:
- 	gtt.handle = bo->handle;
- 	if ((err = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP_GTT, &gtt))) {
-+		DBG(("%s: failed %d, throttling/cleaning caches\n",
-+		     __FUNCTION__, err));
- 		assert(err != EINVAL);
- 
- 		(void)__kgem_throttle_retire(kgem, 0);
-@@ -460,6 +617,8 @@ retry_mmap:
- 		   kgem->fd, gtt.offset);
- 	if (ptr == MAP_FAILED) {
- 		err = errno;
-+		DBG(("%s: failed %d, throttling/cleaning caches\n",
-+		     __FUNCTION__, err));
- 		assert(err != EINVAL);
- 
- 		if (__kgem_throttle_retire(kgem, 0))
-@@ -498,6 +657,8 @@ retry_wc:
- 	wc.size = bytes(bo);
- 	wc.flags = I915_MMAP_WC;
- 	if ((err = do_ioctl(kgem->fd, LOCAL_IOCTL_I915_GEM_MMAP_v2, &wc))) {
-+		DBG(("%s: failed %d, throttling/cleaning caches\n",
-+		     __FUNCTION__, err));
- 		assert(err != EINVAL);
- 
- 		if (__kgem_throttle_retire(kgem, 0))
-@@ -519,16 +680,19 @@ retry_wc:
- 
- static void *__kgem_bo_map__cpu(struct kgem *kgem, struct kgem_bo *bo)
- {
--	struct drm_i915_gem_mmap mmap_arg;
-+	struct local_i915_gem_mmap arg;
- 	int err;
- 
-+	VG_CLEAR(arg);
-+	arg.offset = 0;
-+
- retry:
--	VG_CLEAR(mmap_arg);
--	mmap_arg.handle = bo->handle;
--	mmap_arg.offset = 0;
--	mmap_arg.size = bytes(bo);
--	if ((err = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg))) {
--		assert(err != EINVAL);
-+	arg.handle = bo->handle;
-+	arg.size = bytes(bo);
-+	if ((err = do_ioctl(kgem->fd, LOCAL_IOCTL_I915_GEM_MMAP, &arg))) {
-+		DBG(("%s: failed %d, throttling/cleaning caches\n",
-+		     __FUNCTION__, err));
-+		assert(err != -EINVAL || bo->prime);
- 
- 		if (__kgem_throttle_retire(kgem, 0))
- 			goto retry;
-@@ -536,15 +700,16 @@ retry:
- 		if (kgem_cleanup_cache(kgem))
- 			goto retry;
- 
--		ERR(("%s: failed to mmap handle=%d, %d bytes, into CPU domain: %d\n",
--		     __FUNCTION__, bo->handle, bytes(bo), -err));
-+		ERR(("%s: failed to mmap handle=%d (prime? %d), %d bytes, into CPU domain: %d\n",
-+		     __FUNCTION__, bo->handle, bo->prime, bytes(bo), -err));
-+		bo->purged = 1;
- 		return NULL;
- 	}
- 
--	VG(VALGRIND_MAKE_MEM_DEFINED(mmap_arg.addr_ptr, bytes(bo)));
-+	VG(VALGRIND_MAKE_MEM_DEFINED(arg.addr_ptr, bytes(bo)));
- 
- 	DBG(("%s: caching CPU vma for %d\n", __FUNCTION__, bo->handle));
--	return bo->map__cpu = (void *)(uintptr_t)mmap_arg.addr_ptr;
-+	return bo->map__cpu = (void *)(uintptr_t)arg.addr_ptr;
- }
- 
- static int gem_write(int fd, uint32_t handle,
-@@ -634,16 +799,10 @@ static void kgem_bo_retire(struct kgem *kgem, struct kgem_bo *bo)
- 	assert(bo->exec == NULL);
- 	assert(list_is_empty(&bo->vma));
- 
--	if (bo->rq) {
--		__kgem_bo_clear_busy(bo);
--		kgem_retire(kgem);
--		assert_bo_retired(bo);
--	} else {
--		assert(bo->exec == NULL);
--		assert(list_is_empty(&bo->request));
--		assert(!bo->needs_flush);
--		ASSERT_IDLE(kgem, bo->handle);
--	}
-+	if (bo->rq)
-+		__kgem_retire_requests_upto(kgem, bo);
-+	ASSERT_IDLE(kgem, bo->handle);
-+	assert_bo_retired(bo);
- }
- 
- static void kgem_bo_maybe_retire(struct kgem *kgem, struct kgem_bo *bo)
-@@ -655,10 +814,8 @@ static void kgem_bo_maybe_retire(struct kgem *kgem, struct kgem_bo *bo)
- 	assert(list_is_empty(&bo->vma));
- 
- 	if (bo->rq) {
--		if (!__kgem_busy(kgem, bo->handle)) {
--			__kgem_bo_clear_busy(bo);
--			kgem_retire(kgem);
--		}
-+		if (!__kgem_busy(kgem, bo->handle))
-+			__kgem_retire_requests_upto(kgem, bo);
- 	} else {
- 		assert(!bo->needs_flush);
- 		ASSERT_IDLE(kgem, bo->handle);
-@@ -694,6 +851,8 @@ retry:
- 	}
- 
- 	if ((err = gem_write(kgem->fd, bo->handle, 0, length, data))) {
-+		DBG(("%s: failed %d, throttling/cleaning caches\n",
-+		     __FUNCTION__, err));
- 		assert(err != EINVAL);
- 
- 		(void)__kgem_throttle_retire(kgem, 0);
-@@ -728,27 +887,21 @@ static uint32_t gem_create(int fd, int num_pages)
- 	return create.handle;
- }
- 
--static bool
-+static void
- kgem_bo_set_purgeable(struct kgem *kgem, struct kgem_bo *bo)
- {
--#if DBG_NO_MADV
--	return true;
--#else
-+#if !DBG_NO_MADV
- 	struct drm_i915_gem_madvise madv;
- 
- 	assert(bo->exec == NULL);
--	assert(!bo->purged);
- 
- 	VG_CLEAR(madv);
- 	madv.handle = bo->handle;
- 	madv.madv = I915_MADV_DONTNEED;
- 	if (do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_MADVISE, &madv) == 0) {
--		bo->purged = 1;
--		kgem->need_purge |= !madv.retained && bo->domain == DOMAIN_GPU;
--		return madv.retained;
-+		bo->purged = true;
-+		kgem->need_purge |= !madv.retained && bo->domain != DOMAIN_CPU;
- 	}
--
--	return true;
- #endif
- }
- 
-@@ -788,7 +941,7 @@ kgem_bo_clear_purgeable(struct kgem *kgem, struct kgem_bo *bo)
- 	madv.madv = I915_MADV_WILLNEED;
- 	if (do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_MADVISE, &madv) == 0) {
- 		bo->purged = !madv.retained;
--		kgem->need_purge |= !madv.retained && bo->domain == DOMAIN_GPU;
-+		kgem->need_purge |= !madv.retained && bo->domain != DOMAIN_CPU;
- 		return madv.retained;
- 	}
- 
-@@ -869,13 +1022,17 @@ static struct kgem_request *__kgem_request_alloc(struct kgem *kgem)
- {
- 	struct kgem_request *rq;
- 
--	rq = __kgem_freed_request;
--	if (rq) {
--		__kgem_freed_request = *(struct kgem_request **)rq;
-+	if (unlikely(kgem->wedged)) {
-+		rq = &kgem->static_request;
- 	} else {
--		rq = malloc(sizeof(*rq));
--		if (rq == NULL)
--			rq = &kgem->static_request;
-+		rq = __kgem_freed_request;
-+		if (rq) {
-+			__kgem_freed_request = *(struct kgem_request **)rq;
-+		} else {
-+			rq = malloc(sizeof(*rq));
-+			if (rq == NULL)
-+				rq = &kgem->static_request;
-+		}
- 	}
- 
- 	list_init(&rq->buffers);
-@@ -925,11 +1082,11 @@ total_ram_size(void)
- #ifdef HAVE_STRUCT_SYSINFO_TOTALRAM
- 	struct sysinfo info;
- 	if (sysinfo(&info) == 0)
--		return info.totalram * info.mem_unit;
-+		return (size_t)info.totalram * info.mem_unit;
- #endif
- 
- #ifdef _SC_PHYS_PAGES
--	 return sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGE_SIZE);
-+	 return (size_t)sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGE_SIZE);
- #endif
- 
- 	return 0;
-@@ -1150,6 +1307,10 @@ static bool test_has_wc_mmap(struct kgem *kgem)
- 	if (DBG_NO_WC_MMAP)
- 		return false;
- 
-+	/* XXX See https://bugs.freedesktop.org/show_bug.cgi?id=90841 */
-+	if (kgem->gen < 033)
-+		return false;
-+
- 	if (gem_param(kgem, LOCAL_I915_PARAM_MMAP_VERSION) < 1)
- 		return false;
- 
-@@ -1187,7 +1348,7 @@ static bool test_has_caching(struct kgem *kgem)
- 
- static bool test_has_userptr(struct kgem *kgem)
- {
--	uint32_t handle;
-+	struct local_i915_gem_userptr arg;
- 	void *ptr;
- 
- 	if (DBG_NO_USERPTR)
-@@ -1200,11 +1361,23 @@ static bool test_has_userptr(struct kgem *kgem)
- 	if (posix_memalign(&ptr, PAGE_SIZE, PAGE_SIZE))
- 		return false;
- 
--	handle = gem_userptr(kgem->fd, ptr, PAGE_SIZE, false);
--	gem_close(kgem->fd, handle);
--	free(ptr);
-+	VG_CLEAR(arg);
-+	arg.user_ptr = (uintptr_t)ptr;
-+	arg.user_size = PAGE_SIZE;
-+	arg.flags = I915_USERPTR_UNSYNCHRONIZED;
- 
--	return handle != 0;
-+	if (DBG_NO_UNSYNCHRONIZED_USERPTR ||
-+	    do_ioctl(kgem->fd, LOCAL_IOCTL_I915_GEM_USERPTR, &arg)) {
-+		arg.flags &= ~I915_USERPTR_UNSYNCHRONIZED;
-+		if (do_ioctl(kgem->fd, LOCAL_IOCTL_I915_GEM_USERPTR, &arg))
-+			arg.handle = 0;
-+		/* Leak the userptr bo to keep the mmu_notifier alive */
-+	} else {
-+		gem_close(kgem->fd, arg.handle);
-+		free(ptr);
-+	}
-+
-+	return arg.handle != 0;
- }
- 
- static bool test_has_create2(struct kgem *kgem)
-@@ -1227,67 +1400,187 @@ static bool test_has_create2(struct kgem *kgem)
- #endif
- }
- 
--static bool test_has_secure_batches(struct kgem *kgem)
-+static bool test_can_blt_y(struct kgem *kgem)
- {
--	if (DBG_NO_SECURE_BATCHES)
-+	struct drm_i915_gem_exec_object2 object;
-+	uint32_t batch[] = {
-+#define MI_LOAD_REGISTER_IMM (0x22<<23 | (3-2))
-+#define BCS_SWCTRL 0x22200
-+#define BCS_SRC_Y (1 << 0)
-+#define BCS_DST_Y (1 << 1)
-+		MI_LOAD_REGISTER_IMM,
-+		BCS_SWCTRL,
-+		(BCS_SRC_Y | BCS_DST_Y) << 16 | (BCS_SRC_Y | BCS_DST_Y),
-+
-+		MI_LOAD_REGISTER_IMM,
-+		BCS_SWCTRL,
-+		(BCS_SRC_Y | BCS_DST_Y) << 16,
-+
-+		MI_BATCH_BUFFER_END,
-+		0,
-+	};
-+	int ret;
-+
-+	if (DBG_NO_BLT_Y)
- 		return false;
- 
--	return gem_param(kgem, LOCAL_I915_PARAM_HAS_SECURE_BATCHES) > 0;
-+	if (kgem->gen < 060)
-+		return false;
-+
-+	memset(&object, 0, sizeof(object));
-+	object.handle = gem_create(kgem->fd, 1);
-+
-+	ret = gem_write(kgem->fd, object.handle, 0, sizeof(batch), batch);
-+	if (ret == 0) {
-+		struct drm_i915_gem_execbuffer2 execbuf;
-+
-+		memset(&execbuf, 0, sizeof(execbuf));
-+		execbuf.buffers_ptr = (uintptr_t)&object;
-+		execbuf.buffer_count = 1;
-+		execbuf.flags = KGEM_BLT;
-+
-+		ret = do_ioctl(kgem->fd,
-+			       DRM_IOCTL_I915_GEM_EXECBUFFER2,
-+			       &execbuf);
-+	}
-+	gem_close(kgem->fd, object.handle);
-+
-+	return ret == 0;
- }
- 
--static bool test_has_pinned_batches(struct kgem *kgem)
-+static bool gem_set_tiling(int fd, uint32_t handle, int tiling, int stride)
- {
--	if (DBG_NO_PINNED_BATCHES)
-+	struct drm_i915_gem_set_tiling set_tiling;
-+
-+	if (DBG_NO_TILING)
- 		return false;
- 
--	return gem_param(kgem, LOCAL_I915_PARAM_HAS_PINNED_BATCHES) > 0;
-+	VG_CLEAR(set_tiling);
-+	set_tiling.handle = handle;
-+	set_tiling.tiling_mode = tiling;
-+	set_tiling.stride = stride;
-+
-+	if (ioctl(fd, DRM_IOCTL_I915_GEM_SET_TILING, &set_tiling) == 0)
-+		return set_tiling.tiling_mode == tiling;
-+
-+	return false;
- }
- 
--static int kgem_get_screen_index(struct kgem *kgem)
-+static bool test_can_scanout_y(struct kgem *kgem)
- {
--	struct sna *sna = container_of(kgem, struct sna, kgem);
--	return sna->scrn->scrnIndex;
-+	struct drm_mode_fb_cmd arg;
-+	bool ret = false;
-+
-+	if (DBG_NO_SCANOUT_Y)
-+		return false;
-+
-+	VG_CLEAR(arg);
-+	arg.width = 32;
-+	arg.height = 32;
-+	arg.pitch = 4*32;
-+	arg.bpp = 32;
-+	arg.depth = 24;
-+	arg.handle = gem_create(kgem->fd, 1);
-+
-+	if (gem_set_tiling(kgem->fd, arg.handle, I915_TILING_Y, arg.pitch))
-+		ret = do_ioctl(kgem->fd, DRM_IOCTL_MODE_ADDFB, &arg) == 0;
-+	if (!ret) {
-+		struct local_mode_fb_cmd2 {
-+			uint32_t fb_id;
-+			uint32_t width, height;
-+			uint32_t pixel_format;
-+			uint32_t flags;
-+
-+			uint32_t handles[4];
-+			uint32_t pitches[4];
-+			uint32_t offsets[4];
-+			uint64_t modifiers[4];
-+		} f;
-+#define LOCAL_IOCTL_MODE_ADDFB2 DRM_IOWR(0xb8, struct local_mode_fb_cmd2)
-+		memset(&f, 0, sizeof(f));
-+		f.width = arg.width;
-+		f.height = arg.height;
-+		f.handles[0] = arg.handle;
-+		f.pitches[0] = arg.pitch;
-+		f.modifiers[0] = (uint64_t)1 << 56 | 2; /* MOD_Y_TILED */
-+		f.pixel_format = 'X' | 'R' << 8 | '2' << 16 | '4' << 24; /* XRGB8888 */
-+		f.flags = 1 << 1; /* + modifier */
-+		if (drmIoctl(kgem->fd, LOCAL_IOCTL_MODE_ADDFB2, &f) == 0) {
-+			ret = true;
-+			arg.fb_id = f.fb_id;
-+		}
-+	}
-+	do_ioctl(kgem->fd, DRM_IOCTL_MODE_RMFB, &arg.fb_id);
-+	gem_close(kgem->fd, arg.handle);
-+
-+	return ret;
- }
- 
--static int __find_debugfs(struct kgem *kgem)
-+static bool test_has_dirtyfb(struct kgem *kgem)
- {
--	int i;
-+	struct drm_mode_fb_cmd create;
-+	bool ret = false;
- 
--	for (i = 0; i < DRM_MAX_MINOR; i++) {
--		char path[80];
-+	if (DBG_NO_DIRTYFB)
-+		return false;
- 
--		sprintf(path, "/sys/kernel/debug/dri/%d/i915_wedged", i);
--		if (access(path, R_OK) == 0)
--			return i;
-+	VG_CLEAR(create);
-+	create.width = 32;
-+	create.height = 32;
-+	create.pitch = 4*32;
-+	create.bpp = 32;
-+	create.depth = 32;
-+	create.handle = gem_create(kgem->fd, 1);
-+	if (create.handle == 0)
-+		return false;
- 
--		sprintf(path, "/debug/dri/%d/i915_wedged", i);
--		if (access(path, R_OK) == 0)
--			return i;
-+	if (drmIoctl(kgem->fd, DRM_IOCTL_MODE_ADDFB, &create) == 0) {
-+		struct drm_mode_fb_dirty_cmd dirty;
-+
-+		memset(&dirty, 0, sizeof(dirty));
-+		dirty.fb_id = create.fb_id;
-+		ret = drmIoctl(kgem->fd,
-+			       DRM_IOCTL_MODE_DIRTYFB,
-+			       &dirty) == 0;
-+
-+		/* XXX There may be multiple levels of DIRTYFB, depending on
-+		 * whether the kernel thinks tracking dirty regions is
-+		 * beneficial vs flagging the whole fb as dirty.
-+		 */
-+
-+		drmIoctl(kgem->fd,
-+			 DRM_IOCTL_MODE_RMFB,
-+			 &create.fb_id);
- 	}
-+	gem_close(kgem->fd, create.handle);
- 
--	return -1;
-+	return ret;
- }
- 
--static int kgem_get_minor(struct kgem *kgem)
-+static bool test_has_secure_batches(struct kgem *kgem)
- {
--	struct stat st;
-+	if (DBG_NO_SECURE_BATCHES)
-+		return false;
- 
--	if (fstat(kgem->fd, &st))
--		return __find_debugfs(kgem);
-+	return gem_param(kgem, LOCAL_I915_PARAM_HAS_SECURE_BATCHES) > 0;
-+}
- 
--	if (!S_ISCHR(st.st_mode))
--		return __find_debugfs(kgem);
-+static bool test_has_pinned_batches(struct kgem *kgem)
-+{
-+	if (DBG_NO_PINNED_BATCHES)
-+		return false;
- 
--	return st.st_rdev & 0x63;
-+	return gem_param(kgem, LOCAL_I915_PARAM_HAS_PINNED_BATCHES) > 0;
- }
- 
- static bool kgem_init_pinned_batches(struct kgem *kgem)
- {
- 	int count[2] = { 16, 4 };
- 	int size[2] = { 1, 4 };
-+	int ret = 0;
- 	int n, i;
- 
--	if (kgem->wedged)
-+	if (unlikely(kgem->wedged))
- 		return true;
- 
- 	for (n = 0; n < ARRAY_SIZE(count); n++) {
-@@ -1311,7 +1604,8 @@ static bool kgem_init_pinned_batches(struct kgem *kgem)
- 			}
- 
- 			pin.alignment = 0;
--			if (do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_PIN, &pin)) {
-+			ret = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_PIN, &pin);
-+			if (ret) {
- 				gem_close(kgem->fd, pin.handle);
- 				free(bo);
- 				goto err;
-@@ -1333,6 +1627,16 @@ err:
- 		}
- 	}
- 
-+	/* If we fail to pin some memory for 830gm/845g, we need to disable
-+	 * acceleration as otherwise the machine will eventually fail. However,
-+	 * the kernel started arbitrarily rejecting PIN, so hope for the best
-+	 * if the ioctl no longer works.
-+	 */
-+	if (ret != -ENODEV && kgem->gen == 020)
-+		return false;
-+
-+	kgem->has_pinned_batches = false;
-+
- 	/* For simplicity populate the lists with a single unpinned bo */
- 	for (n = 0; n < ARRAY_SIZE(count); n++) {
- 		struct kgem_bo *bo;
-@@ -1340,18 +1644,18 @@ err:
- 
- 		handle = gem_create(kgem->fd, size[n]);
- 		if (handle == 0)
--			break;
-+			return false;
- 
- 		bo = __kgem_bo_alloc(handle, size[n]);
- 		if (bo == NULL) {
- 			gem_close(kgem->fd, handle);
--			break;
-+			return false;
- 		}
- 
- 		debug_alloc__bo(kgem, bo);
- 		list_add(&bo->list, &kgem->pinned_batches[n]);
- 	}
--	return false;
-+	return true;
- }
- 
- static void kgem_init_swizzling(struct kgem *kgem)
-@@ -1364,7 +1668,7 @@ static void kgem_init_swizzling(struct kgem *kgem)
- 	} tiling;
- #define LOCAL_IOCTL_I915_GEM_GET_TILING DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_TILING, struct local_i915_gem_get_tiling_v2)
- 
--	VG_CLEAR(tiling);
-+	memset(&tiling, 0, sizeof(tiling));
- 	tiling.handle = gem_create(kgem->fd, 1);
- 	if (!tiling.handle)
- 		return;
-@@ -1375,12 +1679,23 @@ static void kgem_init_swizzling(struct kgem *kgem)
- 	if (do_ioctl(kgem->fd, LOCAL_IOCTL_I915_GEM_GET_TILING, &tiling))
- 		goto out;
- 
--	if (kgem->gen < 50 && tiling.phys_swizzle_mode != tiling.swizzle_mode)
-+	DBG(("%s: swizzle_mode=%d, phys_swizzle_mode=%d\n",
-+	     __FUNCTION__, tiling.swizzle_mode, tiling.phys_swizzle_mode));
-+
-+	kgem->can_fence =
-+		!DBG_NO_TILING &&
-+		tiling.swizzle_mode != I915_BIT_6_SWIZZLE_UNKNOWN;
-+
-+	if (kgem->gen < 050 && tiling.phys_swizzle_mode != tiling.swizzle_mode)
- 		goto out;
- 
--	choose_memcpy_tiled_x(kgem, tiling.swizzle_mode);
-+	if (!DBG_NO_DETILING)
-+		choose_memcpy_tiled_x(kgem,
-+				      tiling.swizzle_mode,
-+				      __to_sna(kgem)->cpu_features);
- out:
- 	gem_close(kgem->fd, tiling.handle);
-+	DBG(("%s: can fence?=%d\n", __FUNCTION__, kgem->can_fence));
- }
- 
- static void kgem_fixup_relocs(struct kgem *kgem, struct kgem_bo *bo, int shrink)
-@@ -1399,6 +1714,7 @@ static void kgem_fixup_relocs(struct kgem *kgem, struct kgem_bo *bo, int shrink)
- 	     bo->handle, (long long)bo->presumed_offset));
- 	for (n = 0; n < kgem->nreloc__self; n++) {
- 		int i = kgem->reloc__self[n];
-+		uint64_t addr;
- 
- 		assert(kgem->reloc[i].target_handle == ~0U);
- 		kgem->reloc[i].target_handle = bo->target_handle;
-@@ -1412,13 +1728,17 @@ static void kgem_fixup_relocs(struct kgem *kgem, struct kgem_bo *bo, int shrink)
- 
- 			kgem->reloc[i].delta -= shrink;
- 		}
--		kgem->batch[kgem->reloc[i].offset/sizeof(uint32_t)] =
--			kgem->reloc[i].delta + bo->presumed_offset;
-+		addr = (int)kgem->reloc[i].delta + bo->presumed_offset;
-+		kgem->batch[kgem->reloc[i].offset/sizeof(uint32_t)] = addr;
-+		if (kgem->gen >= 0100)
-+			kgem->batch[kgem->reloc[i].offset/sizeof(uint32_t) + 1] = addr >> 32;
- 	}
- 
- 	if (n == 256) {
- 		for (n = kgem->reloc__self[255]; n < kgem->nreloc; n++) {
- 			if (kgem->reloc[n].target_handle == ~0U) {
-+				uint64_t addr;
-+
- 				kgem->reloc[n].target_handle = bo->target_handle;
- 				kgem->reloc[n].presumed_offset = bo->presumed_offset;
- 
-@@ -1429,8 +1749,11 @@ static void kgem_fixup_relocs(struct kgem *kgem, struct kgem_bo *bo, int shrink)
- 					     kgem->reloc[n].delta - shrink));
- 					kgem->reloc[n].delta -= shrink;
- 				}
--				kgem->batch[kgem->reloc[n].offset/sizeof(uint32_t)] =
--					kgem->reloc[n].delta + bo->presumed_offset;
-+
-+				addr = (int)kgem->reloc[n].delta + bo->presumed_offset;
-+				kgem->batch[kgem->reloc[n].offset/sizeof(uint32_t)] = addr;
-+				if (kgem->gen >= 0100)
-+					kgem->batch[kgem->reloc[n].offset/sizeof(uint32_t) + 1] = addr >> 32;
- 			}
- 		}
- 	}
-@@ -1444,6 +1767,44 @@ static void kgem_fixup_relocs(struct kgem *kgem, struct kgem_bo *bo, int shrink)
- 	}
- }
- 
-+static int kgem_bo_wait(struct kgem *kgem, struct kgem_bo *bo)
-+{
-+	struct local_i915_gem_wait {
-+		uint32_t handle;
-+		uint32_t flags;
-+		int64_t timeout;
-+	} wait;
-+#define LOCAL_I915_GEM_WAIT       0x2c
-+#define LOCAL_IOCTL_I915_GEM_WAIT         DRM_IOWR(DRM_COMMAND_BASE + LOCAL_I915_GEM_WAIT, struct local_i915_gem_wait)
-+	int ret;
-+
-+	DBG(("%s: waiting for handle=%d\n", __FUNCTION__, bo->handle));
-+	if (bo->rq == NULL)
-+		return 0;
-+
-+	VG_CLEAR(wait);
-+	wait.handle = bo->handle;
-+	wait.flags = 0;
-+	wait.timeout = -1;
-+	ret = do_ioctl(kgem->fd, LOCAL_IOCTL_I915_GEM_WAIT, &wait);
-+	if (ret) {
-+		struct drm_i915_gem_set_domain set_domain;
-+
-+		VG_CLEAR(set_domain);
-+		set_domain.handle = bo->handle;
-+		set_domain.read_domains = I915_GEM_DOMAIN_GTT;
-+		set_domain.write_domain = I915_GEM_DOMAIN_GTT;
-+		ret = do_ioctl(kgem->fd,
-+			       DRM_IOCTL_I915_GEM_SET_DOMAIN,
-+			       &set_domain);
-+	}
-+
-+	if (ret == 0)
-+		__kgem_retire_requests_upto(kgem, bo);
-+
-+	return ret;
-+}
-+
- static struct kgem_bo *kgem_new_batch(struct kgem *kgem)
- {
- 	struct kgem_bo *last;
-@@ -1464,20 +1825,41 @@ static struct kgem_bo *kgem_new_batch(struct kgem *kgem)
- 	if (!kgem->has_llc)
- 		flags |= CREATE_UNCACHED;
- 
-+restart:
- 	kgem->batch_bo = kgem_create_linear(kgem,
- 					    sizeof(uint32_t)*kgem->batch_size,
- 					    flags);
- 	if (kgem->batch_bo)
- 		kgem->batch = kgem_bo_map__cpu(kgem, kgem->batch_bo);
- 	if (kgem->batch == NULL) {
--		DBG(("%s: unable to map batch bo, mallocing(size=%d)\n",
--		     __FUNCTION__,
--		     sizeof(uint32_t)*kgem->batch_size));
-+		int ring = kgem->ring == KGEM_BLT;
-+		assert(ring < ARRAY_SIZE(kgem->requests));
-+
- 		if (kgem->batch_bo) {
- 			kgem_bo_destroy(kgem, kgem->batch_bo);
- 			kgem->batch_bo = NULL;
- 		}
- 
-+		if (!list_is_empty(&kgem->requests[ring])) {
-+			struct kgem_request *rq;
-+
-+			rq = list_first_entry(&kgem->requests[ring],
-+					      struct kgem_request, list);
-+			assert(rq->ring == ring);
-+			assert(rq->bo);
-+			assert(RQ(rq->bo->rq) == rq);
-+			if (kgem_bo_wait(kgem, rq->bo) == 0)
-+				goto restart;
-+		}
-+
-+		if (flags & CREATE_NO_THROTTLE) {
-+			flags &= ~CREATE_NO_THROTTLE;
-+			if (kgem_cleanup_cache(kgem))
-+				goto restart;
-+		}
-+
-+		DBG(("%s: unable to map batch bo, mallocing(size=%d)\n",
-+		     __FUNCTION__, sizeof(uint32_t)*kgem->batch_size));
- 		if (posix_memalign((void **)&kgem->batch, PAGE_SIZE,
- 				   ALIGN(sizeof(uint32_t) * kgem->batch_size, PAGE_SIZE))) {
- 			ERR(("%s: batch allocation failed, disabling acceleration\n", __FUNCTION__));
-@@ -1495,18 +1877,79 @@ static struct kgem_bo *kgem_new_batch(struct kgem *kgem)
- 	return last;
- }
- 
--void kgem_init(struct kgem *kgem, int fd, struct pci_device *dev, unsigned gen)
-+static void
-+no_retire(struct kgem *kgem)
-+{
-+	(void)kgem;
-+}
-+
-+static void
-+no_expire(struct kgem *kgem)
-+{
-+	(void)kgem;
-+}
-+
-+static void
-+no_context_switch(struct kgem *kgem, int new_mode)
-+{
-+	(void)kgem;
-+	(void)new_mode;
-+}
-+
-+static uint64_t get_gtt_size(int fd)
- {
- 	struct drm_i915_gem_get_aperture aperture;
-+	struct local_i915_gem_context_param {
-+		uint32_t context;
-+		uint32_t size;
-+		uint64_t param;
-+#define LOCAL_CONTEXT_PARAM_BAN_PERIOD	0x1
-+#define LOCAL_CONTEXT_PARAM_NO_ZEROMAP	0x2
-+#define LOCAL_CONTEXT_PARAM_GTT_SIZE	0x3
-+		uint64_t value;
-+	} p;
-+#define LOCAL_I915_GEM_CONTEXT_GETPARAM       0x34
-+#define LOCAL_IOCTL_I915_GEM_CONTEXT_GETPARAM DRM_IOWR (DRM_COMMAND_BASE + LOCAL_I915_GEM_CONTEXT_GETPARAM, struct local_i915_gem_context_param)
-+
-+	memset(&aperture, 0, sizeof(aperture));
-+
-+	memset(&p, 0, sizeof(p));
-+	p.param = LOCAL_CONTEXT_PARAM_GTT_SIZE;
-+	if (drmIoctl(fd, LOCAL_IOCTL_I915_GEM_CONTEXT_GETPARAM, &p) == 0)
-+		aperture.aper_size = p.value;
-+	if (aperture.aper_size == 0)
-+		(void)drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
-+	if (aperture.aper_size == 0)
-+		aperture.aper_size = 64*1024*1024;
-+
-+	DBG(("%s: aperture size %lld, available now %lld\n",
-+	     __FUNCTION__,
-+	     (long long)aperture.aper_size,
-+	     (long long)aperture.aper_available_size));
-+
-+	/* clamp aperture to uint32_t for simplicity */
-+	if (aperture.aper_size > 0xc0000000)
-+		aperture.aper_size = 0xc0000000;
-+
-+	return aperture.aper_size;
-+}
-+
-+void kgem_init(struct kgem *kgem, int fd, struct pci_device *dev, unsigned gen)
-+{
- 	size_t totalram;
- 	unsigned half_gpu_max;
- 	unsigned int i, j;
-+	uint64_t gtt_size;
- 
- 	DBG(("%s: fd=%d, gen=%d\n", __FUNCTION__, fd, gen));
- 
- 	kgem->fd = fd;
- 	kgem->gen = gen;
- 
-+	kgem->retire = no_retire;
-+	kgem->expire = no_expire;
-+	kgem->context_switch = no_context_switch;
-+
- 	list_init(&kgem->requests[0]);
- 	list_init(&kgem->requests[1]);
- 	list_init(&kgem->batch_buffers);
-@@ -1586,10 +2029,21 @@ void kgem_init(struct kgem *kgem, int fd, struct pci_device *dev, unsigned gen)
- 	DBG(("%s: can blt to cpu? %d\n", __FUNCTION__,
- 	     kgem->can_blt_cpu));
- 
-+	kgem->can_blt_y = test_can_blt_y(kgem);
-+	DBG(("%s: can blit to Y-tiled surfaces? %d\n", __FUNCTION__,
-+	     kgem->can_blt_y));
-+
- 	kgem->can_render_y = gen != 021 && (gen >> 3) != 4;
- 	DBG(("%s: can render to Y-tiled surfaces? %d\n", __FUNCTION__,
- 	     kgem->can_render_y));
- 
-+	kgem->can_scanout_y = test_can_scanout_y(kgem);
-+	DBG(("%s: can scanout Y-tiled surfaces? %d\n", __FUNCTION__,
-+	     kgem->can_scanout_y));
-+
-+	kgem->has_dirtyfb = test_has_dirtyfb(kgem);
-+	DBG(("%s: has dirty fb? %d\n", __FUNCTION__, kgem->has_dirtyfb));
-+
- 	kgem->has_secure_batches = test_has_secure_batches(kgem);
- 	DBG(("%s: can use privileged batchbuffers? %d\n", __FUNCTION__,
- 	     kgem->has_secure_batches));
-@@ -1620,7 +2074,7 @@ void kgem_init(struct kgem *kgem, int fd, struct pci_device *dev, unsigned gen)
- 	if (!kgem->has_relaxed_delta && kgem->batch_size > 4*1024)
- 		kgem->batch_size = 4*1024;
- 
--	if (!kgem_init_pinned_batches(kgem) && gen == 020) {
-+	if (!kgem_init_pinned_batches(kgem)) {
- 		xf86DrvMsg(kgem_get_screen_index(kgem), X_WARNING,
- 			   "Unable to reserve memory for GPU, disabling acceleration.\n");
- 		__kgem_set_wedged(kgem);
-@@ -1640,35 +2094,24 @@ void kgem_init(struct kgem *kgem, int fd, struct pci_device *dev, unsigned gen)
- 	     !DBG_NO_CPU && (kgem->has_llc | kgem->has_userptr | kgem->has_caching),
- 	     kgem->has_llc, kgem->has_caching, kgem->has_userptr));
- 
--	VG_CLEAR(aperture);
--	aperture.aper_size = 0;
--	(void)do_ioctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
--	if (aperture.aper_size == 0)
--		aperture.aper_size = 64*1024*1024;
--
--	DBG(("%s: aperture size %lld, available now %lld\n",
--	     __FUNCTION__,
--	     (long long)aperture.aper_size,
--	     (long long)aperture.aper_available_size));
--
--	kgem->aperture_total = aperture.aper_size;
--	kgem->aperture_high = aperture.aper_size * 3/4;
--	kgem->aperture_low = aperture.aper_size * 1/3;
-+	gtt_size = get_gtt_size(fd);
-+	kgem->aperture_total = gtt_size;
-+	kgem->aperture_high = gtt_size * 3/4;
-+	kgem->aperture_low = gtt_size * 1/3;
- 	if (gen < 033) {
- 		/* Severe alignment penalties */
- 		kgem->aperture_high /= 2;
- 		kgem->aperture_low /= 2;
- 	}
--	DBG(("%s: aperture low=%d [%d], high=%d [%d]\n", __FUNCTION__,
-+	DBG(("%s: aperture low=%u [%u], high=%u [%u]\n", __FUNCTION__,
- 	     kgem->aperture_low, kgem->aperture_low / (1024*1024),
- 	     kgem->aperture_high, kgem->aperture_high / (1024*1024)));
- 
- 	kgem->aperture_mappable = 256 * 1024 * 1024;
- 	if (dev != NULL)
- 		kgem->aperture_mappable = agp_aperture_size(dev, gen);
--	if (kgem->aperture_mappable == 0 ||
--	    kgem->aperture_mappable > aperture.aper_size)
--		kgem->aperture_mappable = aperture.aper_size;
-+	if (kgem->aperture_mappable == 0 || kgem->aperture_mappable > gtt_size)
-+		kgem->aperture_mappable = gtt_size;
- 	DBG(("%s: aperture mappable=%d [%d MiB]\n", __FUNCTION__,
- 	     kgem->aperture_mappable, kgem->aperture_mappable / (1024*1024)));
- 
-@@ -1697,7 +2140,7 @@ void kgem_init(struct kgem *kgem, int fd, struct pci_device *dev, unsigned gen)
- 		     __FUNCTION__));
- 		totalram = kgem->aperture_total;
- 	}
--	DBG(("%s: total ram=%ld\n", __FUNCTION__, (long)totalram));
-+	DBG(("%s: total ram=%lld\n", __FUNCTION__, (long long)totalram));
- 	if (kgem->max_object_size > totalram / 2)
- 		kgem->max_object_size = totalram / 2;
- 	if (kgem->max_gpu_size > totalram / 4)
-@@ -1749,11 +2192,11 @@ void kgem_init(struct kgem *kgem, int fd, struct pci_device *dev, unsigned gen)
- 	if (DBG_NO_CPU)
- 		kgem->max_cpu_size = 0;
- 
--	DBG(("%s: maximum object size=%d\n",
-+	DBG(("%s: maximum object size=%u\n",
- 	     __FUNCTION__, kgem->max_object_size));
--	DBG(("%s: large object thresold=%d\n",
-+	DBG(("%s: large object thresold=%u\n",
- 	     __FUNCTION__, kgem->large_object_size));
--	DBG(("%s: max object sizes (gpu=%d, cpu=%d, tile upload=%d, copy=%d)\n",
-+	DBG(("%s: max object sizes (gpu=%u, cpu=%u, tile upload=%u, copy=%u)\n",
- 	     __FUNCTION__,
- 	     kgem->max_gpu_size, kgem->max_cpu_size,
- 	     kgem->max_upload_tile_size, kgem->max_copy_tile_size));
-@@ -2043,8 +2486,34 @@ static void kgem_add_bo(struct kgem *kgem, struct kgem_bo *bo)
- 	kgem->flush |= bo->flush;
- }
- 
-+static void kgem_clear_swctrl(struct kgem *kgem)
-+{
-+	uint32_t *b;
-+
-+	if (kgem->bcs_state == 0)
-+		return;
-+
-+	DBG(("%s: clearin SWCTRL LRI from %x\n",
-+	     __FUNCTION__, kgem->bcs_state));
-+
-+	b = kgem->batch + kgem->nbatch;
-+	kgem->nbatch += 7;
-+
-+	*b++ = MI_FLUSH_DW;
-+	*b++ = 0;
-+	*b++ = 0;
-+	*b++ = 0;
-+
-+	*b++ = MI_LOAD_REGISTER_IMM;
-+	*b++ = BCS_SWCTRL;
-+	*b++ = (BCS_SRC_Y | BCS_DST_Y) << 16;
-+
-+	kgem->bcs_state = 0;
-+}
-+
- static uint32_t kgem_end_batch(struct kgem *kgem)
- {
-+	kgem_clear_swctrl(kgem);
- 	kgem->batch[kgem->nbatch++] = MI_BATCH_BUFFER_END;
- 	if (kgem->nbatch & 1)
- 		kgem->batch[kgem->nbatch++] = MI_NOOP;
-@@ -2064,17 +2533,6 @@ static void kgem_bo_binding_free(struct kgem *kgem, struct kgem_bo *bo)
- 	}
- }
- 
--static void kgem_bo_rmfb(struct kgem *kgem, struct kgem_bo *bo)
--{
--	if (bo->scanout && bo->delta) {
--		DBG(("%s: releasing fb=%d for handle=%d\n",
--		     __FUNCTION__, bo->delta, bo->handle));
--		/* XXX will leak if we are not DRM_MASTER. *shrug* */
--		do_ioctl(kgem->fd, DRM_IOCTL_MODE_RMFB, &bo->delta);
--		bo->delta = 0;
--	}
--}
--
- static void kgem_bo_free(struct kgem *kgem, struct kgem_bo *bo)
- {
- 	DBG(("%s: handle=%d, size=%d\n", __FUNCTION__, bo->handle, bytes(bo)));
-@@ -2150,13 +2608,16 @@ inline static void kgem_bo_move_to_inactive(struct kgem *kgem,
- 	assert(!bo->snoop);
- 	assert(!bo->flush);
- 	assert(!bo->needs_flush);
-+	assert(!bo->delta);
- 	assert(list_is_empty(&bo->vma));
- 	assert_tiling(kgem, bo);
--	assert_cacheing(kgem, bo);
-+	assert_caching(kgem, bo);
- 	ASSERT_IDLE(kgem, bo->handle);
- 
- 	if (bucket(bo) >= NUM_CACHE_BUCKETS) {
- 		if (bo->map__gtt) {
-+			DBG(("%s: relinquishing large GTT mapping for handle=%d\n",
-+			     __FUNCTION__, bo->handle));
- 			munmap(bo->map__gtt, bytes(bo));
- 			bo->map__gtt = NULL;
- 		}
-@@ -2167,6 +2628,8 @@ inline static void kgem_bo_move_to_inactive(struct kgem *kgem,
- 		assert(list_is_empty(&bo->vma));
- 		list_move(&bo->list, &kgem->inactive[bucket(bo)]);
- 		if (bo->map__gtt && !kgem_bo_can_map(kgem, bo)) {
-+			DBG(("%s: relinquishing old GTT mapping for handle=%d\n",
-+			     __FUNCTION__, bo->handle));
- 			munmap(bo->map__gtt, bytes(bo));
- 			bo->map__gtt = NULL;
- 		}
-@@ -2191,6 +2654,10 @@ static struct kgem_bo *kgem_bo_replace_io(struct kgem_bo *bo)
- 		return bo;
- 
- 	assert(!bo->snoop);
-+	assert(!bo->purged);
-+	assert(!bo->scanout);
-+	assert(!bo->delta);
-+
- 	if (__kgem_freed_bo) {
- 		base = __kgem_freed_bo;
- 		__kgem_freed_bo = *(struct kgem_bo **)base;
-@@ -2221,6 +2688,7 @@ inline static void kgem_bo_remove_from_inactive(struct kgem *kgem,
- 	list_del(&bo->list);
- 	assert(bo->rq == NULL);
- 	assert(bo->exec == NULL);
-+	assert(!bo->purged);
- 	if (!list_is_empty(&bo->vma)) {
- 		assert(bo->map__gtt || bo->map__wc || bo->map__cpu);
- 		list_del(&bo->vma);
-@@ -2305,7 +2773,6 @@ static void kgem_bo_move_to_scanout(struct kgem *kgem, struct kgem_bo *bo)
- 		list_move(&bo->list, &kgem->scanout);
- 
- 	kgem->need_expire = true;
--
- }
- 
- static void kgem_bo_move_to_snoop(struct kgem *kgem, struct kgem_bo *bo)
-@@ -2316,6 +2783,8 @@ static void kgem_bo_move_to_snoop(struct kgem *kgem, struct kgem_bo *bo)
- 	assert(!bo->needs_flush);
- 	assert(bo->refcnt == 0);
- 	assert(bo->exec == NULL);
-+	assert(!bo->purged);
-+	assert(!bo->delta);
- 
- 	if (DBG_NO_SNOOP_CACHE) {
- 		kgem_bo_free(kgem, bo);
-@@ -2351,8 +2820,7 @@ static bool kgem_bo_move_to_cache(struct kgem *kgem, struct kgem_bo *bo)
- 		kgem_bo_move_to_snoop(kgem, bo);
- 	} else if (bo->scanout) {
- 		kgem_bo_move_to_scanout(kgem, bo);
--	} else if ((bo = kgem_bo_replace_io(bo))->reusable &&
--		   kgem_bo_set_purgeable(kgem, bo)) {
-+	} else if ((bo = kgem_bo_replace_io(bo))->reusable) {
- 		kgem_bo_move_to_inactive(kgem, bo);
- 		retired = true;
- 	} else
-@@ -2429,7 +2897,7 @@ void kgem_bo_undo(struct kgem *kgem, struct kgem_bo *bo)
- 	DBG(("%s: only handle in batch, discarding last operations for handle=%d\n",
- 	     __FUNCTION__, bo->handle));
- 
--	assert(bo->exec == &kgem->exec[0]);
-+	assert(bo->exec == &_kgem_dummy_exec || bo->exec == &kgem->exec[0]);
- 	assert(kgem->exec[0].handle == bo->handle);
- 	assert(RQ(bo->rq) == kgem->next_request);
- 
-@@ -2457,16 +2925,23 @@ void kgem_bo_pair_undo(struct kgem *kgem, struct kgem_bo *a, struct kgem_bo *b)
- 
- 	if (a == NULL || b == NULL)
- 		return;
-+	assert(a != b);
- 	if (a->exec == NULL || b->exec == NULL)
- 		return;
- 
--	DBG(("%s: only handles in batch, discarding last operations for handle=%d and handle=%d\n",
--	     __FUNCTION__, a->handle, b->handle));
-+	DBG(("%s: only handles in batch, discarding last operations for handle=%d (index=%d) and handle=%d (index=%d)\n",
-+	     __FUNCTION__,
-+	     a->handle, a->proxy ? -1 : a->exec - kgem->exec,
-+	     b->handle, b->proxy ? -1 : b->exec - kgem->exec));
- 
--	assert(a->exec == &kgem->exec[0] || a->exec == &kgem->exec[1]);
-+	assert(a->exec == &_kgem_dummy_exec ||
-+	       a->exec == &kgem->exec[0] ||
-+	       a->exec == &kgem->exec[1]);
- 	assert(a->handle == kgem->exec[0].handle || a->handle == kgem->exec[1].handle);
- 	assert(RQ(a->rq) == kgem->next_request);
--	assert(b->exec == &kgem->exec[0] || b->exec == &kgem->exec[1]);
-+	assert(b->exec == &_kgem_dummy_exec ||
-+	       b->exec == &kgem->exec[0] ||
-+	       b->exec == &kgem->exec[1]);
- 	assert(b->handle == kgem->exec[0].handle || b->handle == kgem->exec[1].handle);
- 	assert(RQ(b->rq) == kgem->next_request);
- 
-@@ -2487,6 +2962,7 @@ static void __kgem_bo_destroy(struct kgem *kgem, struct kgem_bo *bo)
- 	DBG(("%s: handle=%d, size=%d\n", __FUNCTION__, bo->handle, bytes(bo)));
- 
- 	assert(list_is_empty(&bo->list));
-+	assert(list_is_empty(&bo->vma));
- 	assert(bo->refcnt == 0);
- 	assert(bo->proxy == NULL);
- 	assert(bo->active_scanout == 0);
-@@ -2532,7 +3008,7 @@ static void __kgem_bo_destroy(struct kgem *kgem, struct kgem_bo *bo)
- 	assert(bo->snoop == false);
- 	assert(bo->io == false);
- 	assert(bo->scanout == false);
--	assert_cacheing(kgem, bo);
-+	assert_caching(kgem, bo);
- 
- 	kgem_bo_undo(kgem, bo);
- 	assert(bo->refcnt == 0);
-@@ -2556,9 +3032,6 @@ static void __kgem_bo_destroy(struct kgem *kgem, struct kgem_bo *bo)
- 	assert(list_is_empty(&bo->request));
- 
- 	if (bo->map__cpu == NULL || bucket(bo) >= NUM_CACHE_BUCKETS) {
--		if (!kgem_bo_set_purgeable(kgem, bo))
--			goto destroy;
--
- 		if (!kgem->has_llc && bo->domain == DOMAIN_CPU)
- 			goto destroy;
- 
-@@ -2647,7 +3120,7 @@ static bool kgem_retire__flushing(struct kgem *kgem)
- 		int count = 0;
- 		list_for_each_entry(bo, &kgem->flushing, request)
- 			count++;
--		DBG(("%s: %d bo on flushing list\n", __FUNCTION__, count));
-+		DBG(("%s: %d bo on flushing list, retired? %d\n", __FUNCTION__, count, retired));
- 	}
- #endif
- 
-@@ -2656,6 +3129,34 @@ static bool kgem_retire__flushing(struct kgem *kgem)
- 	return retired;
- }
- 
-+static bool __kgem_bo_flush(struct kgem *kgem, struct kgem_bo *bo)
-+{
-+	struct drm_i915_gem_busy busy;
-+
-+	if (!bo->needs_flush)
-+		return false;
-+
-+	bo->needs_flush = false;
-+
-+	VG_CLEAR(busy);
-+	busy.handle = bo->handle;
-+	busy.busy = !kgem->wedged;
-+	(void)do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_BUSY, &busy);
-+	DBG(("%s: handle=%d, busy=%d, wedged=%d\n",
-+	     __FUNCTION__, bo->handle, busy.busy, kgem->wedged));
-+
-+	if (busy.busy == 0)
-+		return false;
-+
-+	DBG(("%s: moving %d to flushing\n",
-+	     __FUNCTION__, bo->handle));
-+	list_add(&bo->request, &kgem->flushing);
-+	bo->rq = MAKE_REQUEST(kgem, !!(busy.busy & ~0x1ffff));
-+	bo->needs_flush = busy.busy & 0xffff;
-+	kgem->need_retire = true;
-+	return true;
-+}
-+
- static bool __kgem_retire_rq(struct kgem *kgem, struct kgem_request *rq)
- {
- 	bool retired = false;
-@@ -2663,6 +3164,8 @@ static bool __kgem_retire_rq(struct kgem *kgem, struct kgem_request *rq)
- 	DBG(("%s: request %d complete\n",
- 	     __FUNCTION__, rq->bo->handle));
- 	assert(RQ(rq->bo->rq) == rq);
-+	assert(rq != (struct kgem_request *)kgem);
-+	assert(rq != &kgem->static_request);
- 
- 	if (rq == kgem->fence[rq->ring])
- 		kgem->fence[rq->ring] = NULL;
-@@ -2680,19 +3183,14 @@ static bool __kgem_retire_rq(struct kgem *kgem, struct kgem_request *rq)
- 
- 		list_del(&bo->request);
- 
--		if (bo->needs_flush)
--			bo->needs_flush = __kgem_busy(kgem, bo->handle);
--		if (bo->needs_flush) {
--			DBG(("%s: moving %d to flushing\n",
-+		if (unlikely(__kgem_bo_flush(kgem, bo))) {
-+			assert(bo != rq->bo);
-+			DBG(("%s: movied %d to flushing\n",
- 			     __FUNCTION__, bo->handle));
--			list_add(&bo->request, &kgem->flushing);
--			bo->rq = MAKE_REQUEST(kgem, RQ_RING(bo->rq));
--			kgem->need_retire = true;
- 			continue;
- 		}
- 
- 		bo->domain = DOMAIN_NONE;
--		bo->gtt_dirty = false;
- 		bo->rq = NULL;
- 		if (bo->refcnt)
- 			continue;
-@@ -2706,14 +3204,8 @@ static bool __kgem_retire_rq(struct kgem *kgem, struct kgem_request *rq)
- 	assert(rq->bo->refcnt > 0);
- 
- 	if (--rq->bo->refcnt == 0) {
--		if (kgem_bo_set_purgeable(kgem, rq->bo)) {
--			kgem_bo_move_to_inactive(kgem, rq->bo);
--			retired = true;
--		} else {
--			DBG(("%s: closing %d\n",
--			     __FUNCTION__, rq->bo->handle));
--			kgem_bo_free(kgem, rq->bo);
--		}
-+		kgem_bo_move_to_inactive(kgem, rq->bo);
-+		retired = true;
- 	}
- 
- 	__kgem_request_free(rq);
-@@ -2724,13 +3216,18 @@ static bool kgem_retire__requests_ring(struct kgem *kgem, int ring)
- {
- 	bool retired = false;
- 
-+	assert(ring < ARRAY_SIZE(kgem->requests));
- 	while (!list_is_empty(&kgem->requests[ring])) {
- 		struct kgem_request *rq;
- 
-+		DBG(("%s: retiring ring %d\n", __FUNCTION__, ring));
-+
- 		rq = list_first_entry(&kgem->requests[ring],
- 				      struct kgem_request,
- 				      list);
- 		assert(rq->ring == ring);
-+		assert(rq->bo);
-+		assert(RQ(rq->bo->rq) == rq);
- 		if (__kgem_busy(kgem, rq->bo->handle))
- 			break;
- 
-@@ -2751,8 +3248,8 @@ static bool kgem_retire__requests_ring(struct kgem *kgem, int ring)
- 					      struct kgem_request,
- 					      list)->bo;
- 
--		DBG(("%s: ring=%d, %d outstanding requests, oldest=%d\n",
--		     __FUNCTION__, ring, count, bo ? bo->handle : 0));
-+		DBG(("%s: ring=%d, %d outstanding requests, oldest=%d, retired? %d\n",
-+		     __FUNCTION__, ring, count, bo ? bo->handle : 0, retired));
- 	}
- #endif
- 
-@@ -2824,6 +3321,8 @@ bool __kgem_ring_is_idle(struct kgem *kgem, int ring)
- 	rq = list_last_entry(&kgem->requests[ring],
- 			     struct kgem_request, list);
- 	assert(rq->ring == ring);
-+	assert(rq->bo);
-+	assert(RQ(rq->bo->rq) == rq);
- 	if (__kgem_busy(kgem, rq->bo->handle)) {
- 		DBG(("%s: last requests handle=%d still busy\n",
- 		     __FUNCTION__, rq->bo->handle));
-@@ -2845,23 +3344,30 @@ bool __kgem_ring_is_idle(struct kgem *kgem, int ring)
- 	return true;
- }
- 
--void __kgem_retire_requests_upto(struct kgem *kgem, struct kgem_bo *bo)
-+bool __kgem_retire_requests_upto(struct kgem *kgem, struct kgem_bo *bo)
- {
--	struct kgem_request *rq = bo->rq, *tmp;
--	struct list *requests = &kgem->requests[RQ_RING(rq) == I915_EXEC_BLT];
-+	struct kgem_request * const rq = RQ(bo->rq), *tmp;
-+	struct list *requests = &kgem->requests[rq->ring];
-+
-+	DBG(("%s(handle=%d, ring=%d)\n", __FUNCTION__, bo->handle, rq->ring));
- 
--	rq = RQ(rq);
- 	assert(rq != &kgem->static_request);
- 	if (rq == (struct kgem_request *)kgem) {
- 		__kgem_bo_clear_busy(bo);
--		return;
-+		return false;
- 	}
- 
-+	assert(rq->ring < ARRAY_SIZE(kgem->requests));
- 	do {
- 		tmp = list_first_entry(requests, struct kgem_request, list);
- 		assert(tmp->ring == rq->ring);
- 		__kgem_retire_rq(kgem, tmp);
- 	} while (tmp != rq);
-+
-+	assert(bo->needs_flush || bo->rq == NULL);
-+	assert(bo->needs_flush || list_is_empty(&bo->request));
-+	assert(bo->needs_flush || bo->domain == DOMAIN_NONE);
-+	return bo->rq;
- }
- 
- #if 0
-@@ -2932,6 +3438,7 @@ static void kgem_commit(struct kgem *kgem)
- 		bo->binding.offset = 0;
- 		bo->domain = DOMAIN_GPU;
- 		bo->gpu_dirty = false;
-+		bo->gtt_dirty = false;
- 
- 		if (bo->proxy) {
- 			/* proxies are not used for domain tracking */
-@@ -2955,6 +3462,23 @@ static void kgem_commit(struct kgem *kgem)
- 			kgem_throttle(kgem);
- 		}
- 
-+		while (!list_is_empty(&rq->buffers)) {
-+			bo = list_first_entry(&rq->buffers,
-+					      struct kgem_bo,
-+					      request);
-+
-+			assert(RQ(bo->rq) == rq);
-+			assert(bo->exec == NULL);
-+			assert(bo->domain == DOMAIN_GPU);
-+
-+			list_del(&bo->request);
-+			bo->domain = DOMAIN_NONE;
-+			bo->rq = NULL;
-+
-+			if (bo->refcnt == 0)
-+				_kgem_bo_destroy(kgem, bo);
-+		}
-+
- 		kgem_retire(kgem);
- 		assert(list_is_empty(&rq->buffers));
- 
-@@ -2964,7 +3488,9 @@ static void kgem_commit(struct kgem *kgem)
- 		gem_close(kgem->fd, rq->bo->handle);
- 		kgem_cleanup_cache(kgem);
- 	} else {
-+		assert(rq != (struct kgem_request *)kgem);
- 		assert(rq->ring < ARRAY_SIZE(kgem->requests));
-+		assert(rq->bo);
- 		list_add_tail(&rq->list, &kgem->requests[rq->ring]);
- 		kgem->need_throttle = kgem->need_retire = 1;
- 
-@@ -2988,8 +3514,10 @@ static void kgem_close_inactive(struct kgem *kgem)
- {
- 	unsigned int i;
- 
--	for (i = 0; i < ARRAY_SIZE(kgem->inactive); i++)
-+	for (i = 0; i < ARRAY_SIZE(kgem->inactive); i++) {
- 		kgem_close_list(kgem, &kgem->inactive[i]);
-+		assert(list_is_empty(&kgem->inactive[i]));
-+	}
- }
- 
- static void kgem_finish_buffers(struct kgem *kgem)
-@@ -3079,10 +3607,13 @@ static void kgem_finish_buffers(struct kgem *kgem)
- 						kgem->has_handle_lut ? bo->base.target_handle : shrink->handle;
- 					for (n = 0; n < kgem->nreloc; n++) {
- 						if (kgem->reloc[n].target_handle == bo->base.target_handle) {
-+							uint64_t addr = (int)kgem->reloc[n].delta + shrink->presumed_offset;
-+							kgem->batch[kgem->reloc[n].offset/sizeof(kgem->batch[0])] = addr;
-+							if (kgem->gen >= 0100)
-+								kgem->batch[kgem->reloc[n].offset/sizeof(kgem->batch[0]) + 1] = addr >> 32;
-+
- 							kgem->reloc[n].target_handle = shrink->target_handle;
- 							kgem->reloc[n].presumed_offset = shrink->presumed_offset;
--							kgem->batch[kgem->reloc[n].offset/sizeof(kgem->batch[0])] =
--								kgem->reloc[n].delta + shrink->presumed_offset;
- 						}
- 					}
- 
-@@ -3124,10 +3655,13 @@ static void kgem_finish_buffers(struct kgem *kgem)
- 						kgem->has_handle_lut ? bo->base.target_handle : shrink->handle;
- 					for (n = 0; n < kgem->nreloc; n++) {
- 						if (kgem->reloc[n].target_handle == bo->base.target_handle) {
-+							uint64_t addr = (int)kgem->reloc[n].delta + shrink->presumed_offset;
-+							kgem->batch[kgem->reloc[n].offset/sizeof(kgem->batch[0])] = addr;
-+							if (kgem->gen >= 0100)
-+								kgem->batch[kgem->reloc[n].offset/sizeof(kgem->batch[0]) + 1] = addr >> 32;
-+
- 							kgem->reloc[n].target_handle = shrink->target_handle;
- 							kgem->reloc[n].presumed_offset = shrink->presumed_offset;
--							kgem->batch[kgem->reloc[n].offset/sizeof(kgem->batch[0])] =
--								kgem->reloc[n].delta + shrink->presumed_offset;
- 						}
- 					}
- 
-@@ -3195,6 +3729,9 @@ static void kgem_cleanup(struct kgem *kgem)
- 					kgem_bo_free(kgem, bo);
- 			}
- 
-+			if (--rq->bo->refcnt == 0)
-+				kgem_bo_free(kgem, rq->bo);
-+
- 			__kgem_request_free(rq);
- 		}
- 	}
-@@ -3210,7 +3747,9 @@ kgem_batch_write(struct kgem *kgem,
- 	char *ptr;
- 	int ret;
- 
--	ASSERT_IDLE(kgem, bo->handle);
-+	assert(bo->exec == NULL);
-+	assert(bo->rq == NULL);
-+	assert(!__kgem_busy(kgem, bo->handle));
- 
- #if DBG_NO_EXEC
- 	{
-@@ -3371,55 +3910,54 @@ static int compact_batch_surface(struct kgem *kgem, int *shrink)
- 	return size * sizeof(uint32_t);
- }
- 
-+static struct kgem_bo *first_available(struct kgem *kgem, struct list *list)
-+{
-+	struct kgem_bo *bo;
-+
-+	list_for_each_entry(bo, list, list) {
-+		assert(bo->refcnt > 0);
-+
-+		if (bo->rq) {
-+			assert(RQ(bo->rq)->bo == bo);
-+			if (__kgem_busy(kgem, bo->handle))
-+				break;
-+
-+			__kgem_retire_rq(kgem, RQ(bo->rq));
-+			assert(bo->rq == NULL);
-+		}
-+
-+		if (bo->refcnt > 1)
-+			continue;
-+
-+		list_move_tail(&bo->list, list);
-+		return kgem_bo_reference(bo);
-+	}
-+
-+	return NULL;
-+}
-+
- static struct kgem_bo *
- kgem_create_batch(struct kgem *kgem)
- {
--#if !DBG_NO_SHRINK_BATCHES
--	struct drm_i915_gem_set_domain set_domain;
- 	struct kgem_bo *bo;
--	int shrink = 0;
--	int size;
-+	int size, shrink = 0;
- 
-+#if !DBG_NO_SHRINK_BATCHES
- 	if (kgem->surface != kgem->batch_size)
- 		size = compact_batch_surface(kgem, &shrink);
- 	else
- 		size = kgem->nbatch * sizeof(uint32_t);
- 
- 	if (size <= 4096) {
--		bo = list_first_entry(&kgem->pinned_batches[0],
--				      struct kgem_bo,
--				      list);
--		if (!bo->rq) {
--out_4096:
--			assert(bo->refcnt > 0);
--			list_move_tail(&bo->list, &kgem->pinned_batches[0]);
--			bo = kgem_bo_reference(bo);
-+		bo = first_available(kgem, &kgem->pinned_batches[0]);
-+		if (bo)
- 			goto write;
--		}
--
--		if (!__kgem_busy(kgem, bo->handle)) {
--			assert(RQ(bo->rq)->bo == bo);
--			__kgem_retire_rq(kgem, RQ(bo->rq));
--			goto out_4096;
--		}
- 	}
- 
--	if (size <= 16384) {
--		bo = list_first_entry(&kgem->pinned_batches[1],
--				      struct kgem_bo,
--				      list);
--		if (!bo->rq) {
--out_16384:
--			assert(bo->refcnt > 0);
--			list_move_tail(&bo->list, &kgem->pinned_batches[1]);
--			bo = kgem_bo_reference(bo);
--			goto write;
--		}
--
--		if (!__kgem_busy(kgem, bo->handle)) {
--			__kgem_retire_rq(kgem, RQ(bo->rq));
--			goto out_16384;
--		}
-+	if (size <= 16384) {
-+		bo = first_available(kgem, &kgem->pinned_batches[1]);
-+		if (bo)
-+			goto write;
- 	}
- 
- 	if (kgem->gen == 020) {
-@@ -3443,16 +3981,8 @@ out_16384:
- 			list_move_tail(&bo->list, &kgem->pinned_batches[size > 4096]);
- 
- 			DBG(("%s: syncing due to busy batches\n", __FUNCTION__));
--
--			VG_CLEAR(set_domain);
--			set_domain.handle = bo->handle;
--			set_domain.read_domains = I915_GEM_DOMAIN_GTT;
--			set_domain.write_domain = I915_GEM_DOMAIN_GTT;
--			if (do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain)) {
--				DBG(("%s: sync: GPU hang detected\n", __FUNCTION__));
--				kgem_throttle(kgem);
-+			if (kgem_bo_wait(kgem, bo))
- 				return NULL;
--			}
- 
- 			kgem_retire(kgem);
- 			assert(bo->rq == NULL);
-@@ -3460,9 +3990,14 @@ out_16384:
- 			goto write;
- 		}
- 	}
-+#else
-+	if (kgem->surface != kgem->batch_size)
-+		size = kgem->batch_size * sizeof(uint32_t);
-+	else
-+		size = kgem->nbatch * sizeof(uint32_t);
-+#endif
- 
--	bo = NULL;
--	if (!kgem->has_llc) {
-+	if (!kgem->batch_bo || !kgem->has_llc) {
- 		bo = kgem_create_linear(kgem, size, CREATE_NO_THROTTLE);
- 		if (bo) {
- write:
-@@ -3471,14 +4006,11 @@ write:
- 				kgem_bo_destroy(kgem, bo);
- 				return NULL;
- 			}
-+			return bo;
- 		}
- 	}
--	if (bo == NULL)
--		bo = kgem_new_batch(kgem);
--	return bo;
--#else
-+
- 	return kgem_new_batch(kgem);
--#endif
- }
- 
- #if !NDEBUG
-@@ -3530,7 +4062,7 @@ static void dump_fence_regs(struct kgem *kgem)
- 
- static int do_execbuf(struct kgem *kgem, struct drm_i915_gem_execbuffer2 *execbuf)
- {
--	int ret, err;
-+	int ret;
- 
- retry:
- 	ret = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, execbuf);
-@@ -3547,26 +4079,25 @@ retry:
- 
- 	/* last gasp */
- 	ret = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, execbuf);
--	if (ret == 0)
--		return 0;
-+	if (ret != -ENOSPC)
-+		return ret;
-+
-+	/* One final trick up our sleeve for when we run out of space.
-+	 * We turn everything off to free up our pinned framebuffers,
-+	 * sprites and cursors, and try just one more time.
-+	 */
- 
- 	xf86DrvMsg(kgem_get_screen_index(kgem), X_WARNING,
- 		   "Failed to submit rendering commands, trying again with outputs disabled.\n");
- 
--	/* One last trick up our sleeve for when we run out of space.
--	 * We turn everything off to free up our pinned framebuffers,
--	 * sprites and cursors, and try one last time.
--	 */
--	err = errno;
--	if (sna_mode_disable(container_of(kgem, struct sna, kgem))) {
-+	if (sna_mode_disable(__to_sna(kgem))) {
- 		kgem_cleanup_cache(kgem);
- 		ret = do_ioctl(kgem->fd,
- 			       DRM_IOCTL_I915_GEM_EXECBUFFER2,
- 			       execbuf);
- 		DBG(("%s: last_gasp ret=%d\n", __FUNCTION__, ret));
--		sna_mode_enable(container_of(kgem, struct sna, kgem));
-+		sna_mode_enable(__to_sna(kgem));
- 	}
--	errno = err;
- 
- 	return ret;
- }
-@@ -3575,6 +4106,7 @@ void _kgem_submit(struct kgem *kgem)
- {
- 	struct kgem_request *rq;
- 	uint32_t batch_end;
-+	int i, ret;
- 
- 	assert(!DBG_NO_HW);
- 	assert(!kgem->wedged);
-@@ -3609,7 +4141,6 @@ void _kgem_submit(struct kgem *kgem)
- 	rq->bo = kgem_create_batch(kgem);
- 	if (rq->bo) {
- 		struct drm_i915_gem_execbuffer2 execbuf;
--		int i, ret;
- 
- 		assert(!rq->bo->needs_flush);
- 
-@@ -3619,7 +4150,8 @@ void _kgem_submit(struct kgem *kgem)
- 		kgem->exec[i].relocs_ptr = (uintptr_t)kgem->reloc;
- 		kgem->exec[i].alignment = 0;
- 		kgem->exec[i].offset = rq->bo->presumed_offset;
--		kgem->exec[i].flags = 0;
-+		/* Make sure the kernel releases any fence, ignored if gen4+ */
-+		kgem->exec[i].flags = EXEC_OBJECT_NEEDS_FENCE;
- 		kgem->exec[i].rsvd1 = 0;
- 		kgem->exec[i].rsvd2 = 0;
- 
-@@ -3631,7 +4163,8 @@ void _kgem_submit(struct kgem *kgem)
- 		memset(&execbuf, 0, sizeof(execbuf));
- 		execbuf.buffers_ptr = (uintptr_t)kgem->exec;
- 		execbuf.buffer_count = kgem->nexec;
--		execbuf.batch_len = batch_end*sizeof(uint32_t);
-+		if (kgem->gen < 030)
-+			execbuf.batch_len = batch_end*sizeof(uint32_t);
- 		execbuf.flags = kgem->ring | kgem->batch_flags;
- 
- 		if (DBG_DUMP) {
-@@ -3645,91 +4178,98 @@ void _kgem_submit(struct kgem *kgem)
- 		}
- 
- 		ret = do_execbuf(kgem, &execbuf);
--		if (DEBUG_SYNC && ret == 0) {
--			struct drm_i915_gem_set_domain set_domain;
--
--			VG_CLEAR(set_domain);
--			set_domain.handle = rq->bo->handle;
--			set_domain.read_domains = I915_GEM_DOMAIN_GTT;
--			set_domain.write_domain = I915_GEM_DOMAIN_GTT;
-+	} else
-+		ret = -ENOMEM;
- 
--			ret = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain);
-+	if (ret < 0) {
-+		kgem_throttle(kgem);
-+		if (!kgem->wedged) {
-+			xf86DrvMsg(kgem_get_screen_index(kgem), X_ERROR,
-+				   "Failed to submit rendering commands (%s), disabling acceleration.\n",
-+				   strerror(-ret));
-+			__kgem_set_wedged(kgem);
- 		}
--		if (ret < 0) {
--			kgem_throttle(kgem);
--			if (!kgem->wedged) {
--				xf86DrvMsg(kgem_get_screen_index(kgem), X_ERROR,
--					   "Failed to submit rendering commands, disabling acceleration.\n");
--				__kgem_set_wedged(kgem);
--			}
- 
- #if !NDEBUG
--			ErrorF("batch[%d/%d]: %d %d %d, nreloc=%d, nexec=%d, nfence=%d, aperture=%d, fenced=%d, high=%d,%d: errno=%d\n",
--			       kgem->mode, kgem->ring, batch_end, kgem->nbatch, kgem->surface,
--			       kgem->nreloc, kgem->nexec, kgem->nfence, kgem->aperture, kgem->aperture_fenced, kgem->aperture_high, kgem->aperture_total, -ret);
-+		ErrorF("batch[%d/%d]: %d %d %d, nreloc=%d, nexec=%d, nfence=%d, aperture=%d, fenced=%d, high=%d,%d: errno=%d\n",
-+		       kgem->mode, kgem->ring, batch_end, kgem->nbatch, kgem->surface,
-+		       kgem->nreloc, kgem->nexec, kgem->nfence, kgem->aperture, kgem->aperture_fenced, kgem->aperture_high, kgem->aperture_total, -ret);
- 
--			for (i = 0; i < kgem->nexec; i++) {
--				struct kgem_bo *bo, *found = NULL;
-+		for (i = 0; i < kgem->nexec; i++) {
-+			struct kgem_bo *bo, *found = NULL;
- 
--				list_for_each_entry(bo, &kgem->next_request->buffers, request) {
--					if (bo->handle == kgem->exec[i].handle) {
--						found = bo;
--						break;
--					}
-+			list_for_each_entry(bo, &kgem->next_request->buffers, request) {
-+				if (bo->handle == kgem->exec[i].handle) {
-+					found = bo;
-+					break;
- 				}
--				ErrorF("exec[%d] = handle:%d, presumed offset: %x, size: %d, tiling %d, fenced %d, snooped %d, deleted %d\n",
--				       i,
--				       kgem->exec[i].handle,
--				       (int)kgem->exec[i].offset,
--				       found ? kgem_bo_size(found) : -1,
--				       found ? found->tiling : -1,
--				       (int)(kgem->exec[i].flags & EXEC_OBJECT_NEEDS_FENCE),
--				       found ? found->snoop : -1,
--				       found ? found->purged : -1);
- 			}
--			for (i = 0; i < kgem->nreloc; i++) {
--				ErrorF("reloc[%d] = pos:%d, target:%d, delta:%d, read:%x, write:%x, offset:%x\n",
--				       i,
--				       (int)kgem->reloc[i].offset,
--				       kgem->reloc[i].target_handle,
--				       kgem->reloc[i].delta,
--				       kgem->reloc[i].read_domains,
--				       kgem->reloc[i].write_domain,
--				       (int)kgem->reloc[i].presumed_offset);
-+			ErrorF("exec[%d] = handle:%d, presumed offset: %x, size: %d, tiling %d, fenced %d, snooped %d, deleted %d\n",
-+			       i,
-+			       kgem->exec[i].handle,
-+			       (int)kgem->exec[i].offset,
-+			       found ? kgem_bo_size(found) : -1,
-+			       found ? found->tiling : -1,
-+			       (int)(kgem->exec[i].flags & EXEC_OBJECT_NEEDS_FENCE),
-+			       found ? found->snoop : -1,
-+			       found ? found->purged : -1);
-+		}
-+		for (i = 0; i < kgem->nreloc; i++) {
-+			ErrorF("reloc[%d] = pos:%d, target:%d, delta:%d, read:%x, write:%x, offset:%x\n",
-+			       i,
-+			       (int)kgem->reloc[i].offset,
-+			       kgem->reloc[i].target_handle,
-+			       kgem->reloc[i].delta,
-+			       kgem->reloc[i].read_domains,
-+			       kgem->reloc[i].write_domain,
-+			       (int)kgem->reloc[i].presumed_offset);
-+		}
-+
-+		{
-+			struct drm_i915_gem_get_aperture aperture;
-+			if (do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture) == 0)
-+				ErrorF("Aperture size %lld, available %lld\n",
-+				       (long long)aperture.aper_size,
-+				       (long long)aperture.aper_available_size);
-+		}
-+
-+		if (ret == -ENOSPC)
-+			dump_gtt_info(kgem);
-+		if (ret == -EDEADLK)
-+			dump_fence_regs(kgem);
-+
-+		if (DEBUG_SYNC) {
-+			int fd = open("/tmp/batchbuffer", O_WRONLY | O_CREAT | O_APPEND, 0666);
-+			if (fd != -1) {
-+				int ignored = write(fd, kgem->batch, batch_end*sizeof(uint32_t));
-+				assert(ignored == batch_end*sizeof(uint32_t));
-+				close(fd);
- 			}
- 
--			{
--				struct drm_i915_gem_get_aperture aperture;
--				if (do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture) == 0)
--					ErrorF("Aperture size %lld, available %lld\n",
--					       (long long)aperture.aper_size,
--					       (long long)aperture.aper_available_size);
--			}
-+			FatalError("SNA: failed to submit batchbuffer, errno=%d\n", -ret);
-+		}
-+#endif
-+	} else {
-+		if (DEBUG_SYNC) {
-+			struct drm_i915_gem_set_domain set_domain;
- 
--			if (ret == -ENOSPC)
--				dump_gtt_info(kgem);
--			if (ret == -EDEADLK)
--				dump_fence_regs(kgem);
--
--			if (DEBUG_SYNC) {
--				int fd = open("/tmp/batchbuffer", O_WRONLY | O_CREAT | O_APPEND, 0666);
--				if (fd != -1) {
--					int ignored = write(fd, kgem->batch, batch_end*sizeof(uint32_t));
--					assert(ignored == batch_end*sizeof(uint32_t));
--					close(fd);
--				}
-+			VG_CLEAR(set_domain);
-+			set_domain.handle = rq->bo->handle;
-+			set_domain.read_domains = I915_GEM_DOMAIN_GTT;
-+			set_domain.write_domain = I915_GEM_DOMAIN_GTT;
- 
--				FatalError("SNA: failed to submit batchbuffer, errno=%d\n", -ret);
--			}
--#endif
-+			ret = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain);
- 		}
--	}
-+
- #if SHOW_BATCH_AFTER
--	if (gem_read(kgem->fd, rq->bo->handle, kgem->batch, 0, batch_end*sizeof(uint32_t)) == 0)
--		__kgem_batch_debug(kgem, batch_end);
-+		if (gem_read(kgem->fd, rq->bo->handle, kgem->batch, 0, batch_end*sizeof(uint32_t)) == 0)
-+			__kgem_batch_debug(kgem, batch_end);
- #endif
--	kgem_commit(kgem);
--	if (kgem->wedged)
-+
-+		kgem_commit(kgem);
-+	}
-+
-+	if (unlikely(kgem->wedged))
- 		kgem_cleanup(kgem);
- 
- 	kgem_reset(kgem);
-@@ -3737,49 +4277,14 @@ void _kgem_submit(struct kgem *kgem)
- 	assert(kgem->next_request != NULL);
- }
- 
--static bool find_hang_state(struct kgem *kgem, char *path, int maxlen)
--{
--	int minor = kgem_get_minor(kgem);
--
--	/* Search for our hang state in a few canonical locations.
--	 * In the unlikely event of having multiple devices, we
--	 * will need to check which minor actually corresponds to ours.
--	 */
--
--	snprintf(path, maxlen, "/sys/class/drm/card%d/error", minor);
--	if (access(path, R_OK) == 0)
--		return true;
--
--	snprintf(path, maxlen, "/sys/kernel/debug/dri/%d/i915_error_state", minor);
--	if (access(path, R_OK) == 0)
--		return true;
--
--	snprintf(path, maxlen, "/debug/dri/%d/i915_error_state", minor);
--	if (access(path, R_OK) == 0)
--		return true;
--
--	path[0] = '\0';
--	return false;
--}
--
- void kgem_throttle(struct kgem *kgem)
- {
--	if (kgem->wedged)
-+	if (unlikely(kgem->wedged))
- 		return;
- 
- 	if (__kgem_throttle(kgem, true)) {
--		static int once;
--		char path[128];
--
- 		xf86DrvMsg(kgem_get_screen_index(kgem), X_ERROR,
- 			   "Detected a hung GPU, disabling acceleration.\n");
--		if (!once && find_hang_state(kgem, path, sizeof(path))) {
--			xf86DrvMsg(kgem_get_screen_index(kgem), X_ERROR,
--				   "When reporting this, please include %s and the full dmesg.\n",
--				   path);
--			once = 1;
--		}
--
- 		__kgem_set_wedged(kgem);
- 		kgem->need_throttle = false;
- 	}
-@@ -3860,7 +4365,8 @@ bool kgem_expire_cache(struct kgem *kgem)
- 	bool idle;
- 	unsigned int i;
- 
--	time(&now);
-+	if (!time(&now))
-+		return false;
- 
- 	while (__kgem_freed_bo) {
- 		bo = __kgem_freed_bo;
-@@ -3875,7 +4381,7 @@ bool kgem_expire_cache(struct kgem *kgem)
- 	}
- 
- 	kgem_clean_large_cache(kgem);
--	if (container_of(kgem, struct sna, kgem)->scrn->vtSema)
-+	if (__to_sna(kgem)->scrn->vtSema)
- 		kgem_clean_scanout_cache(kgem);
- 
- 	expire = 0;
-@@ -3885,6 +4391,7 @@ bool kgem_expire_cache(struct kgem *kgem)
- 			break;
- 		}
- 
-+		assert(now);
- 		bo->delta = now;
- 	}
- 	if (expire) {
-@@ -3909,7 +4416,7 @@ bool kgem_expire_cache(struct kgem *kgem)
- #endif
- 
- 	kgem_retire(kgem);
--	if (kgem->wedged)
-+	if (unlikely(kgem->wedged))
- 		kgem_cleanup(kgem);
- 
- 	kgem->expire(kgem);
-@@ -3930,6 +4437,8 @@ bool kgem_expire_cache(struct kgem *kgem)
- 				break;
- 			}
- 
-+			assert(now);
-+			kgem_bo_set_purgeable(kgem, bo);
- 			bo->delta = now;
- 		}
- 	}
-@@ -3960,16 +4469,11 @@ bool kgem_expire_cache(struct kgem *kgem)
- 				count++;
- 				size += bytes(bo);
- 				kgem_bo_free(kgem, bo);
--				DBG(("%s: expiring %d\n",
-+				DBG(("%s: expiring handle=%d\n",
- 				     __FUNCTION__, bo->handle));
- 			}
- 		}
--		if (!list_is_empty(&preserve)) {
--			preserve.prev->next = kgem->inactive[i].next;
--			kgem->inactive[i].next->prev = preserve.prev;
--			kgem->inactive[i].next = preserve.next;
--			preserve.next->prev = &kgem->inactive[i];
--		}
-+		list_splice_tail(&preserve, &kgem->inactive[i]);
- 	}
- 
- #ifdef DEBUG_MEMORY
-@@ -3998,31 +4502,30 @@ bool kgem_cleanup_cache(struct kgem *kgem)
- 	unsigned int i;
- 	int n;
- 
-+	DBG(("%s\n", __FUNCTION__));
-+
- 	/* sync to the most recent request */
- 	for (n = 0; n < ARRAY_SIZE(kgem->requests); n++) {
- 		if (!list_is_empty(&kgem->requests[n])) {
- 			struct kgem_request *rq;
--			struct drm_i915_gem_set_domain set_domain;
- 
--			rq = list_first_entry(&kgem->requests[n],
--					      struct kgem_request,
--					      list);
-+			rq = list_last_entry(&kgem->requests[n],
-+					     struct kgem_request,
-+					     list);
- 
- 			DBG(("%s: sync on cleanup\n", __FUNCTION__));
--
--			VG_CLEAR(set_domain);
--			set_domain.handle = rq->bo->handle;
--			set_domain.read_domains = I915_GEM_DOMAIN_GTT;
--			set_domain.write_domain = I915_GEM_DOMAIN_GTT;
--			(void)do_ioctl(kgem->fd,
--				       DRM_IOCTL_I915_GEM_SET_DOMAIN,
--				       &set_domain);
-+			assert(rq->ring == n);
-+			assert(rq->bo);
-+			assert(RQ(rq->bo->rq) == rq);
-+			kgem_bo_wait(kgem, rq->bo);
- 		}
-+		assert(list_is_empty(&kgem->requests[n]));
- 	}
- 
- 	kgem_retire(kgem);
- 	kgem_cleanup(kgem);
- 
-+	DBG(("%s: need_expire?=%d\n", __FUNCTION__, kgem->need_expire));
- 	if (!kgem->need_expire)
- 		return false;
- 
-@@ -4049,6 +4552,8 @@ bool kgem_cleanup_cache(struct kgem *kgem)
- 
- 	kgem->need_purge = false;
- 	kgem->need_expire = false;
-+
-+	DBG(("%s: complete\n", __FUNCTION__));
- 	return true;
- }
- 
-@@ -4079,16 +4584,15 @@ retry_large:
- 				goto discard;
- 
- 			if (bo->tiling != I915_TILING_NONE) {
--				if (use_active)
-+				if (use_active && kgem->gen < 040)
- 					goto discard;
- 
--				if (!gem_set_tiling(kgem->fd, bo->handle,
-+				if (!kgem_set_tiling(kgem, bo,
- 						    I915_TILING_NONE, 0))
- 					goto discard;
--
--				bo->tiling = I915_TILING_NONE;
--				bo->pitch = 0;
- 			}
-+			assert(bo->tiling == I915_TILING_NONE);
-+			bo->pitch = 0;
- 
- 			if (bo->purged && !kgem_bo_clear_purgeable(kgem, bo))
- 				goto discard;
-@@ -4169,17 +4673,17 @@ discard:
- 				break;
- 			}
- 
--			if (I915_TILING_NONE != bo->tiling &&
--			    !gem_set_tiling(kgem->fd, bo->handle,
--					    I915_TILING_NONE, 0))
--				continue;
-+			if (!kgem_set_tiling(kgem, bo, I915_TILING_NONE, 0)) {
-+				kgem_bo_free(kgem, bo);
-+				break;
-+			}
- 
- 			kgem_bo_remove_from_inactive(kgem, bo);
- 			assert(list_is_empty(&bo->vma));
- 			assert(list_is_empty(&bo->list));
- 
--			bo->tiling = I915_TILING_NONE;
--			bo->pitch = 0;
-+			assert(bo->tiling == I915_TILING_NONE);
-+			assert(bo->pitch == 0);
- 			bo->delta = 0;
- 			DBG(("  %s: found handle=%d (num_pages=%d) in linear vma cache\n",
- 			     __FUNCTION__, bo->handle, num_pages(bo)));
-@@ -4225,13 +4729,13 @@ discard:
- 			if (first)
- 				continue;
- 
--			if (!gem_set_tiling(kgem->fd, bo->handle,
--					    I915_TILING_NONE, 0))
--				continue;
--
--			bo->tiling = I915_TILING_NONE;
--			bo->pitch = 0;
-+			if (!kgem_set_tiling(kgem, bo, I915_TILING_NONE, 0)) {
-+				kgem_bo_free(kgem, bo);
-+				break;
-+			}
- 		}
-+		assert(bo->tiling == I915_TILING_NONE);
-+		bo->pitch = 0;
- 
- 		if (bo->map__gtt || bo->map__wc || bo->map__cpu) {
- 			if (flags & (CREATE_CPU_MAP | CREATE_GTT_MAP)) {
-@@ -4269,7 +4773,7 @@ discard:
- 			kgem_bo_remove_from_inactive(kgem, bo);
- 
- 		assert(bo->tiling == I915_TILING_NONE);
--		bo->pitch = 0;
-+		assert(bo->pitch == 0);
- 		bo->delta = 0;
- 		DBG(("  %s: found handle=%d (num_pages=%d) in linear %s cache\n",
- 		     __FUNCTION__, bo->handle, num_pages(bo),
-@@ -4340,9 +4844,9 @@ struct kgem_bo *kgem_create_for_name(struct kgem *kgem, uint32_t name)
- 
- 	bo->unique_id = kgem_get_unique_id(kgem);
- 	bo->tiling = tiling.tiling_mode;
--	bo->reusable = false;
- 	bo->prime = true;
--	bo->purged = true; /* no coherency guarantees */
-+	bo->reusable = false;
-+	kgem_bo_unclean(kgem, bo);
- 
- 	debug_alloc__bo(kgem, bo);
- 	return bo;
-@@ -4448,6 +4952,8 @@ int kgem_bo_export_to_prime(struct kgem *kgem, struct kgem_bo *bo)
- #if defined(DRM_IOCTL_PRIME_HANDLE_TO_FD) && defined(O_CLOEXEC)
- 	struct drm_prime_handle args;
- 
-+	assert(kgem_bo_is_fenced(kgem, bo));
-+
- 	VG_CLEAR(args);
- 	args.handle = bo->handle;
- 	args.flags = O_CLOEXEC;
-@@ -4479,6 +4985,8 @@ struct kgem_bo *kgem_create_linear(struct kgem *kgem, int size, unsigned flags)
- 	if ((flags & CREATE_UNCACHED) == 0) {
- 		bo = search_linear_cache(kgem, size, CREATE_INACTIVE | flags);
- 		if (bo) {
-+			assert(!bo->purged);
-+			assert(!bo->delta);
- 			assert(bo->domain != DOMAIN_GPU);
- 			ASSERT_IDLE(kgem, bo->handle);
- 			bo->refcnt = 1;
-@@ -4760,8 +5268,7 @@ static void __kgem_bo_make_scanout(struct kgem *kgem,
- 				   struct kgem_bo *bo,
- 				   int width, int height)
- {
--	ScrnInfoPtr scrn =
--		container_of(kgem, struct sna, kgem)->scrn;
-+	ScrnInfoPtr scrn = __to_sna(kgem)->scrn;
- 	struct drm_mode_fb_cmd arg;
- 
- 	assert(bo->proxy == NULL);
-@@ -4809,6 +5316,48 @@ static void __kgem_bo_make_scanout(struct kgem *kgem,
- 	}
- }
- 
-+static bool tiling_changed(struct kgem_bo *bo, int tiling, int pitch)
-+{
-+	if (tiling != bo->tiling)
-+		return true;
-+
-+	return tiling != I915_TILING_NONE && pitch != bo->pitch;
-+}
-+
-+static void set_gpu_tiling(struct kgem *kgem,
-+			   struct kgem_bo *bo,
-+			   int tiling, int pitch)
-+{
-+	DBG(("%s: handle=%d, tiling=%d, pitch=%d\n",
-+	     __FUNCTION__, bo->handle, tiling, pitch));
-+
-+	if (tiling_changed(bo, tiling, pitch) && bo->map__gtt) {
-+		if (!list_is_empty(&bo->vma)) {
-+			list_del(&bo->vma);
-+			kgem->vma[0].count--;
-+		}
-+		munmap(bo->map__gtt, bytes(bo));
-+		bo->map__gtt = NULL;
-+	}
-+
-+	bo->tiling = tiling;
-+	bo->pitch = pitch;
-+}
-+
-+bool kgem_bo_is_fenced(struct kgem *kgem, struct kgem_bo *bo)
-+{
-+	struct drm_i915_gem_get_tiling tiling;
-+
-+	assert(kgem);
-+	assert(bo);
-+
-+	VG_CLEAR(tiling);
-+	tiling.handle = bo->handle;
-+	tiling.tiling_mode = bo->tiling;
-+	(void)do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_GET_TILING, &tiling);
-+	return tiling.tiling_mode == bo->tiling; /* assume pitch is fine! */
-+}
-+
- struct kgem_bo *kgem_create_2d(struct kgem *kgem,
- 			       int width,
- 			       int height,
-@@ -4892,8 +5441,8 @@ struct kgem_bo *kgem_create_2d(struct kgem *kgem,
- 			return last;
- 		}
- 
--		if (container_of(kgem, struct sna, kgem)->scrn->vtSema) {
--			ScrnInfoPtr scrn = container_of(kgem, struct sna, kgem)->scrn;
-+		if (__to_sna(kgem)->scrn->vtSema) {
-+			ScrnInfoPtr scrn = __to_sna(kgem)->scrn;
- 
- 			list_for_each_entry_reverse(bo, &kgem->scanout, list) {
- 				struct drm_mode_fb_cmd arg;
-@@ -4915,11 +5464,8 @@ struct kgem_bo *kgem_create_2d(struct kgem *kgem,
- 						bo->delta = 0;
- 					}
- 
--					if (gem_set_tiling(kgem->fd, bo->handle,
--							   tiling, pitch)) {
--						bo->tiling = tiling;
--						bo->pitch = pitch;
--					} else {
-+					if (!kgem_set_tiling(kgem, bo,
-+							     tiling, pitch)) {
- 						kgem_bo_free(kgem, bo);
- 						break;
- 					}
-@@ -4950,6 +5496,9 @@ struct kgem_bo *kgem_create_2d(struct kgem *kgem,
- 			}
- 		}
- 
-+		if (flags & CREATE_CACHED)
-+			return NULL;
-+
- 		bo = __kgem_bo_create_as_display(kgem, size, tiling, pitch);
- 		if (bo)
- 			return bo;
-@@ -4987,14 +5536,9 @@ struct kgem_bo *kgem_create_2d(struct kgem *kgem,
- 				if (num_pages(bo) < size)
- 					continue;
- 
--				if (bo->pitch != pitch || bo->tiling != tiling) {
--					if (!gem_set_tiling(kgem->fd, bo->handle,
--							    tiling, pitch))
--						continue;
--
--					bo->pitch = pitch;
--					bo->tiling = tiling;
--				}
-+				if (!kgem_set_tiling(kgem, bo, tiling, pitch) &&
-+				    !exact)
-+					set_gpu_tiling(kgem, bo, tiling, pitch);
- 			}
- 
- 			kgem_bo_remove_from_active(kgem, bo);
-@@ -5020,14 +5564,11 @@ large_inactive:
- 			if (size > num_pages(bo))
- 				continue;
- 
--			if (bo->tiling != tiling ||
--			    (tiling != I915_TILING_NONE && bo->pitch != pitch)) {
--				if (!gem_set_tiling(kgem->fd, bo->handle,
--						    tiling, pitch))
-+			if (!kgem_set_tiling(kgem, bo, tiling, pitch)) {
-+				if (kgem->gen >= 040 && !exact)
-+					set_gpu_tiling(kgem, bo, tiling, pitch);
-+				else
- 					continue;
--
--				bo->tiling = tiling;
--				bo->pitch = pitch;
- 			}
- 
- 			if (bo->purged && !kgem_bo_clear_purgeable(kgem, bo)) {
-@@ -5039,7 +5580,6 @@ large_inactive:
- 
- 			assert(bo->domain != DOMAIN_GPU);
- 			bo->unique_id = kgem_get_unique_id(kgem);
--			bo->pitch = pitch;
- 			bo->delta = 0;
- 			DBG(("  1:from large inactive: pitch=%d, tiling=%d, handle=%d, id=%d\n",
- 			     bo->pitch, bo->tiling, bo->handle, bo->unique_id));
-@@ -5088,14 +5628,13 @@ large_inactive:
- 				if (bo->tiling != tiling ||
- 				    (tiling != I915_TILING_NONE && bo->pitch != pitch)) {
- 					if (bo->map__gtt ||
--					    !gem_set_tiling(kgem->fd, bo->handle,
--							    tiling, pitch)) {
-+					    !kgem_set_tiling(kgem, bo,
-+							     tiling, pitch)) {
- 						DBG(("inactive GTT vma with wrong tiling: %d < %d\n",
- 						     bo->tiling, tiling));
--						continue;
-+						kgem_bo_free(kgem, bo);
-+						break;
- 					}
--					bo->tiling = tiling;
--					bo->pitch = pitch;
- 				}
- 
- 				if (bo->purged && !kgem_bo_clear_purgeable(kgem, bo)) {
-@@ -5103,8 +5642,11 @@ large_inactive:
- 					break;
- 				}
- 
-+				if (tiling == I915_TILING_NONE)
-+					bo->pitch = pitch;
-+
- 				assert(bo->tiling == tiling);
--				bo->pitch = pitch;
-+				assert(bo->pitch >= pitch);
- 				bo->delta = 0;
- 				bo->unique_id = kgem_get_unique_id(kgem);
- 
-@@ -5170,15 +5712,12 @@ search_active:
- 				if (num_pages(bo) < size)
- 					continue;
- 
--				if (bo->pitch != pitch) {
--					if (!gem_set_tiling(kgem->fd,
--							    bo->handle,
--							    tiling, pitch))
--						continue;
--
--					bo->pitch = pitch;
--				}
-+				if (!kgem_set_tiling(kgem, bo, tiling, pitch) &&
-+				    !exact)
-+					set_gpu_tiling(kgem, bo, tiling, pitch);
- 			}
-+			assert(bo->tiling == tiling);
-+			assert(bo->pitch >= pitch);
- 
- 			kgem_bo_remove_from_active(kgem, bo);
- 
-@@ -5233,19 +5772,21 @@ search_active:
- 				if (num_pages(bo) < size)
- 					continue;
- 
--				if (bo->tiling != tiling ||
--				    (tiling != I915_TILING_NONE && bo->pitch != pitch)) {
--					if (!gem_set_tiling(kgem->fd,
--							    bo->handle,
--							    tiling, pitch))
--						continue;
-+				if (!kgem_set_tiling(kgem, bo, tiling, pitch)) {
-+					if (kgem->gen >= 040 && !exact) {
-+						set_gpu_tiling(kgem, bo,
-+							       tiling, pitch);
-+					} else {
-+						kgem_bo_free(kgem, bo);
-+						break;
-+					}
- 				}
-+				assert(bo->tiling == tiling);
-+				assert(bo->pitch >= pitch);
- 
- 				kgem_bo_remove_from_active(kgem, bo);
- 
- 				bo->unique_id = kgem_get_unique_id(kgem);
--				bo->pitch = pitch;
--				bo->tiling = tiling;
- 				bo->delta = 0;
- 				DBG(("  1:from active: pitch=%d, tiling=%d, handle=%d, id=%d\n",
- 				     bo->pitch, bo->tiling, bo->handle, bo->unique_id));
-@@ -5323,11 +5864,13 @@ search_inactive:
- 			continue;
- 		}
- 
--		if (bo->tiling != tiling ||
--		    (tiling != I915_TILING_NONE && bo->pitch != pitch)) {
--			if (!gem_set_tiling(kgem->fd, bo->handle,
--					    tiling, pitch))
--				continue;
-+		if (!kgem_set_tiling(kgem, bo, tiling, pitch)) {
-+			if (kgem->gen >= 040 && !exact) {
-+				set_gpu_tiling(kgem, bo, tiling, pitch);
-+			} else {
-+				kgem_bo_free(kgem, bo);
-+				break;
-+			}
- 		}
- 
- 		if (bo->purged && !kgem_bo_clear_purgeable(kgem, bo)) {
-@@ -5338,9 +5881,8 @@ search_inactive:
- 		kgem_bo_remove_from_inactive(kgem, bo);
- 		assert(list_is_empty(&bo->list));
- 		assert(list_is_empty(&bo->vma));
--
--		bo->pitch = pitch;
--		bo->tiling = tiling;
-+		assert(bo->tiling == tiling);
-+		assert(bo->pitch >= pitch);
- 
- 		bo->delta = 0;
- 		bo->unique_id = kgem_get_unique_id(kgem);
-@@ -5388,14 +5930,17 @@ search_inactive:
- 			kgem_bo_remove_from_active(kgem, bo);
- 			__kgem_bo_clear_busy(bo);
- 
--			if (tiling != I915_TILING_NONE && bo->pitch != pitch) {
--				if (!gem_set_tiling(kgem->fd, bo->handle, tiling, pitch)) {
-+			if (!kgem_set_tiling(kgem, bo, tiling, pitch)) {
-+				if (kgem->gen >= 040 && !exact) {
-+					set_gpu_tiling(kgem, bo, tiling, pitch);
-+				} else {
- 					kgem_bo_free(kgem, bo);
- 					goto no_retire;
- 				}
- 			}
-+			assert(bo->tiling == tiling);
-+			assert(bo->pitch >= pitch);
- 
--			bo->pitch = pitch;
- 			bo->unique_id = kgem_get_unique_id(kgem);
- 			bo->delta = 0;
- 			DBG(("  2:from active: pitch=%d, tiling=%d, handle=%d, id=%d\n",
-@@ -5440,18 +5985,21 @@ create:
- 	}
- 
- 	bo->unique_id = kgem_get_unique_id(kgem);
--	if (tiling == I915_TILING_NONE ||
--	    gem_set_tiling(kgem->fd, handle, tiling, pitch)) {
--		bo->tiling = tiling;
--		bo->pitch = pitch;
-+	if (kgem_set_tiling(kgem, bo, tiling, pitch)) {
- 		if (flags & CREATE_SCANOUT)
- 			__kgem_bo_make_scanout(kgem, bo, width, height);
- 	} else {
--		if (flags & CREATE_EXACT) {
--			DBG(("%s: failed to set exact tiling (gem_set_tiling)\n", __FUNCTION__));
--			gem_close(kgem->fd, handle);
--			free(bo);
--			return NULL;
-+		if (kgem->gen >= 040) {
-+			assert(!kgem->can_fence);
-+			bo->tiling = tiling;
-+			bo->pitch = pitch;
-+		} else {
-+			if (flags & CREATE_EXACT) {
-+				DBG(("%s: failed to set exact tiling (gem_set_tiling)\n", __FUNCTION__));
-+				gem_close(kgem->fd, handle);
-+				free(bo);
-+				return NULL;
-+			}
- 		}
- 	}
- 
-@@ -5608,7 +6156,7 @@ static void __kgem_flush(struct kgem *kgem, struct kgem_bo *bo)
- 
- void kgem_scanout_flush(struct kgem *kgem, struct kgem_bo *bo)
- {
--	if (!bo->needs_flush)
-+	if (!bo->needs_flush && !bo->gtt_dirty)
- 		return;
- 
- 	kgem_bo_submit(kgem, bo);
-@@ -5621,18 +6169,24 @@ void kgem_scanout_flush(struct kgem *kgem, struct kgem_bo *bo)
- 	if (bo->rq)
- 		__kgem_flush(kgem, bo);
- 
-+	if (bo->scanout && kgem->needs_dirtyfb) {
-+		struct drm_mode_fb_dirty_cmd cmd;
-+		memset(&cmd, 0, sizeof(cmd));
-+		cmd.fb_id = bo->delta;
-+		(void)drmIoctl(kgem->fd, DRM_IOCTL_MODE_DIRTYFB, &cmd);
-+	}
-+
- 	/* Whatever actually happens, we can regard the GTT write domain
- 	 * as being flushed.
- 	 */
--	bo->gtt_dirty = false;
--	bo->needs_flush = false;
--	bo->domain = DOMAIN_NONE;
-+	__kgem_bo_clear_dirty(bo);
- }
- 
- inline static bool nearly_idle(struct kgem *kgem)
- {
- 	int ring = kgem->ring == KGEM_BLT;
- 
-+	assert(ring < ARRAY_SIZE(kgem->requests));
- 	if (list_is_singular(&kgem->requests[ring]))
- 		return true;
- 
-@@ -5720,7 +6274,7 @@ static inline bool kgem_flush(struct kgem *kgem, bool flush)
- 	if (kgem->nreloc == 0)
- 		return true;
- 
--	if (container_of(kgem, struct sna, kgem)->flags & SNA_POWERSAVE)
-+	if (__to_sna(kgem)->flags & SNA_POWERSAVE)
- 		return true;
- 
- 	if (kgem->flush == flush && kgem->aperture < kgem->aperture_low)
-@@ -5982,6 +6536,55 @@ bool kgem_check_many_bo_fenced(struct kgem *kgem, ...)
- 	return kgem_flush(kgem, flush);
- }
- 
-+void __kgem_bcs_set_tiling(struct kgem *kgem,
-+			   struct kgem_bo *src,
-+			   struct kgem_bo *dst)
-+{
-+	uint32_t state, *b;
-+
-+	DBG(("%s: src handle=%d:tiling=%d, dst handle=%d:tiling=%d\n",
-+	     __FUNCTION__,
-+	     src ? src->handle : 0, src ? src->tiling : 0,
-+	     dst ? dst->handle : 0, dst ? dst->tiling : 0));
-+	assert(kgem->mode == KGEM_BLT);
-+	assert(dst == NULL || kgem_bo_can_blt(kgem, dst));
-+	assert(src == NULL || kgem_bo_can_blt(kgem, src));
-+
-+	state = 0;
-+	if (dst && dst->tiling == I915_TILING_Y)
-+		state |= BCS_DST_Y;
-+	if (src && src->tiling == I915_TILING_Y)
-+		state |= BCS_SRC_Y;
-+
-+	if (kgem->bcs_state == state)
-+		return;
-+
-+	DBG(("%s: updating SWCTRL %x -> %x\n", __FUNCTION__,
-+	     kgem->bcs_state, state));
-+
-+	/* Over-estimate space in case we need to re-emit the cmd packet */
-+	if (!kgem_check_batch(kgem, 24)) {
-+		_kgem_submit(kgem);
-+		_kgem_set_mode(kgem, KGEM_BLT);
-+		if (state == 0)
-+			return;
-+	}
-+
-+	b = kgem->batch + kgem->nbatch;
-+	if (kgem->nbatch) {
-+		*b++ = MI_FLUSH_DW;
-+		*b++ = 0;
-+		*b++ = 0;
-+		*b++ = 0;
-+	}
-+	*b++ = MI_LOAD_REGISTER_IMM;
-+	*b++ = BCS_SWCTRL;
-+	*b++ = (BCS_SRC_Y | BCS_DST_Y) << 16 | state;
-+	kgem->nbatch = b - kgem->batch;
-+
-+	kgem->bcs_state = state;
-+}
-+
- uint32_t kgem_add_reloc(struct kgem *kgem,
- 			uint32_t pos,
- 			struct kgem_bo *bo,
-@@ -6195,12 +6798,6 @@ static void kgem_trim_vma_cache(struct kgem *kgem, int type, int bucket)
- 
- 		list_del(&bo->vma);
- 		kgem->vma[type].count--;
--
--		if (!bo->purged && !kgem_bo_set_purgeable(kgem, bo)) {
--			DBG(("%s: freeing unpurgeable old mapping\n",
--			     __FUNCTION__));
--			kgem_bo_free(kgem, bo);
--		}
- 	}
- }
- 
-@@ -6216,8 +6813,8 @@ static void *__kgem_bo_map__gtt_or_wc(struct kgem *kgem, struct kgem_bo *bo)
- 	kgem_trim_vma_cache(kgem, MAP_GTT, bucket(bo));
- 
- 	if (bo->tiling || !kgem->has_wc_mmap) {
--		assert(num_pages(bo) <= kgem->aperture_mappable / 2);
- 		assert(kgem->gen != 021 || bo->tiling != I915_TILING_Y);
-+		warn_unless(num_pages(bo) <= kgem->aperture_mappable / 2);
- 
- 		ptr = bo->map__gtt;
- 		if (ptr == NULL)
-@@ -6291,6 +6888,7 @@ void *kgem_bo_map(struct kgem *kgem, struct kgem_bo *bo)
- 			DBG(("%s: sync: GPU hang detected\n", __FUNCTION__));
- 			kgem_throttle(kgem);
- 		}
-+		bo->needs_flush = false;
- 		kgem_bo_retire(kgem, bo);
- 		bo->domain = DOMAIN_GTT;
- 		bo->gtt_dirty = true;
-@@ -6319,14 +6917,16 @@ void *kgem_bo_map__wc(struct kgem *kgem, struct kgem_bo *bo)
- 	     bo->handle, (long)bo->presumed_offset, bo->tiling, bo->map__gtt, bo->map__cpu, bo->domain));
- 
- 	assert(bo->proxy == NULL);
--	assert(bo->exec == NULL);
- 	assert(list_is_empty(&bo->list));
- 	assert_tiling(kgem, bo);
- 	assert(!bo->purged || bo->reusable);
- 
- 	if (bo->map__wc)
- 		return bo->map__wc;
-+	if (!kgem->has_wc_mmap)
-+		return NULL;
- 
-+	kgem_trim_vma_cache(kgem, MAP_GTT, bucket(bo));
- 	return __kgem_bo_map__wc(kgem, bo);
- }
- 
-@@ -6373,6 +6973,8 @@ uint32_t kgem_bo_flink(struct kgem *kgem, struct kgem_bo *bo)
- {
- 	struct drm_gem_flink flink;
- 
-+	assert(kgem_bo_is_fenced(kgem, bo));
-+
- 	VG_CLEAR(flink);
- 	flink.handle = bo->handle;
- 	if (do_ioctl(kgem->fd, DRM_IOCTL_GEM_FLINK, &flink))
-@@ -6387,7 +6989,6 @@ uint32_t kgem_bo_flink(struct kgem *kgem, struct kgem_bo *bo)
- 	 * party, we track the lifetime accurately.
- 	 */
- 	bo->reusable = false;
--
- 	kgem_bo_unclean(kgem, bo);
- 
- 	return flink.name;
-@@ -6411,16 +7012,34 @@ struct kgem_bo *kgem_create_map(struct kgem *kgem,
- 	first_page = (uintptr_t)ptr;
- 	last_page = first_page + size + PAGE_SIZE - 1;
- 
--	first_page &= ~(PAGE_SIZE-1);
--	last_page &= ~(PAGE_SIZE-1);
-+	first_page &= ~(uintptr_t)(PAGE_SIZE-1);
-+	last_page &= ~(uintptr_t)(PAGE_SIZE-1);
- 	assert(last_page > first_page);
- 
- 	handle = gem_userptr(kgem->fd,
- 			     (void *)first_page, last_page-first_page,
- 			     read_only);
- 	if (handle == 0) {
--		DBG(("%s: import failed, errno=%d\n", __FUNCTION__, errno));
--		return NULL;
-+		if (read_only && kgem->has_wc_mmap) {
-+			struct drm_i915_gem_set_domain set_domain;
-+
-+			handle = gem_userptr(kgem->fd,
-+					     (void *)first_page, last_page-first_page,
-+					     false);
-+
-+			VG_CLEAR(set_domain);
-+			set_domain.handle = handle;
-+			set_domain.read_domains = I915_GEM_DOMAIN_GTT;
-+			set_domain.write_domain = 0;
-+			if (do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain)) {
-+				gem_close(kgem->fd, handle);
-+				handle = 0;
-+			}
-+		}
-+		if (handle == 0) {
-+			DBG(("%s: import failed, errno=%d\n", __FUNCTION__, errno));
-+			return NULL;
-+		}
- 	}
- 
- 	bo = __kgem_bo_alloc(handle, (last_page - first_page) / PAGE_SIZE);
-@@ -6483,8 +7102,10 @@ void kgem_bo_sync__cpu(struct kgem *kgem, struct kgem_bo *bo)
- 			DBG(("%s: sync: GPU hang detected\n", __FUNCTION__));
- 			kgem_throttle(kgem);
- 		}
-+		bo->needs_flush = false;
- 		kgem_bo_retire(kgem, bo);
- 		bo->domain = DOMAIN_CPU;
-+		bo->gtt_dirty = true;
- 	}
- }
- 
-@@ -6505,6 +7126,9 @@ void kgem_bo_sync__cpu_full(struct kgem *kgem, struct kgem_bo *bo, bool write)
- 	assert(bo->refcnt);
- 	assert(!bo->purged);
- 
-+	if (bo->rq == NULL && (kgem->has_llc || bo->snoop) && !write)
-+		return;
-+
- 	if (bo->domain != DOMAIN_CPU || FORCE_MMAP_SYNC & (1 << DOMAIN_CPU)) {
- 		struct drm_i915_gem_set_domain set_domain;
- 
-@@ -6522,9 +7146,11 @@ void kgem_bo_sync__cpu_full(struct kgem *kgem, struct kgem_bo *bo, bool write)
- 			DBG(("%s: sync: GPU hang detected\n", __FUNCTION__));
- 			kgem_throttle(kgem);
- 		}
-+		bo->needs_flush = false;
- 		if (write) {
- 			kgem_bo_retire(kgem, bo);
- 			bo->domain = DOMAIN_CPU;
-+			bo->gtt_dirty = true;
- 		} else {
- 			if (bo->exec == NULL)
- 				kgem_bo_maybe_retire(kgem, bo);
-@@ -6539,6 +7165,7 @@ void kgem_bo_sync__gtt(struct kgem *kgem, struct kgem_bo *bo)
- 	assert(bo->refcnt);
- 	assert(bo->proxy == NULL);
- 	assert_tiling(kgem, bo);
-+	assert(!bo->snoop);
- 
- 	kgem_bo_submit(kgem, bo);
- 
-@@ -6559,6 +7186,7 @@ void kgem_bo_sync__gtt(struct kgem *kgem, struct kgem_bo *bo)
- 			DBG(("%s: sync: GPU hang detected\n", __FUNCTION__));
- 			kgem_throttle(kgem);
- 		}
-+		bo->needs_flush = false;
- 		kgem_bo_retire(kgem, bo);
- 		bo->domain = DOMAIN_GTT;
- 		bo->gtt_dirty = true;
-@@ -7485,6 +8113,7 @@ kgem_replace_bo(struct kgem *kgem,
- 		}
- 		_kgem_set_mode(kgem, KGEM_BLT);
- 	}
-+	kgem_bcs_set_tiling(kgem, src, dst);
- 
- 	br00 = XY_SRC_COPY_BLT_CMD;
- 	br13 = pitch;
-@@ -7553,6 +8182,9 @@ bool kgem_bo_convert_to_gpu(struct kgem *kgem,
- 	     __FUNCTION__, bo->handle, flags, __kgem_bo_is_busy(kgem, bo)));
- 	assert(bo->tiling == I915_TILING_NONE);
- 
-+	if (flags & (__MOVE_PRIME | __MOVE_SCANOUT))
-+		return false;
-+
- 	if (kgem->has_llc)
- 		return true;
- 
-diff --git a/src/sna/kgem.h b/src/sna/kgem.h
-index 2267bacf..08b4eb20 100644
---- a/src/sna/kgem.h
-+++ b/src/sna/kgem.h
-@@ -42,6 +42,7 @@ struct kgem_bo {
- #define RQ(rq) ((struct kgem_request *)((uintptr_t)(rq) & ~3))
- #define RQ_RING(rq) ((uintptr_t)(rq) & 3)
- #define RQ_IS_BLT(rq) (RQ_RING(rq) == KGEM_BLT)
-+#define RQ_IS_RENDER(rq) (RQ_RING(rq) == KGEM_RENDER)
- #define MAKE_REQUEST(rq, ring) ((struct kgem_request *)((uintptr_t)(rq) | (ring)))
- 
- 	struct drm_i915_gem_exec_object2 *exec;
-@@ -103,7 +104,7 @@ struct kgem_request {
- 	struct list list;
- 	struct kgem_bo *bo;
- 	struct list buffers;
--	int ring;
-+	unsigned ring;
- };
- 
- enum {
-@@ -112,6 +113,12 @@ enum {
- 	NUM_MAP_TYPES,
- };
- 
-+typedef void (*memcpy_box_func)(const void *src, void *dst, int bpp,
-+				int32_t src_stride, int32_t dst_stride,
-+				int16_t src_x, int16_t src_y,
-+				int16_t dst_x, int16_t dst_y,
-+				uint16_t width, uint16_t height);
-+
- struct kgem {
- 	unsigned wedged;
- 	int fd;
-@@ -157,6 +164,8 @@ struct kgem {
- 		int16_t count;
- 	} vma[NUM_MAP_TYPES];
- 
-+	uint32_t bcs_state;
-+
- 	uint32_t batch_flags;
- 	uint32_t batch_flags_base;
- #define I915_EXEC_SECURE (1<<9)
-@@ -186,9 +195,15 @@ struct kgem {
- 	uint32_t has_no_reloc :1;
- 	uint32_t has_handle_lut :1;
- 	uint32_t has_wc_mmap :1;
-+	uint32_t has_dirtyfb :1;
- 
-+	uint32_t can_fence :1;
- 	uint32_t can_blt_cpu :1;
-+	uint32_t can_blt_y :1;
- 	uint32_t can_render_y :1;
-+	uint32_t can_scanout_y :1;
-+
-+	uint32_t needs_dirtyfb :1;
- 
- 	uint16_t fence_max;
- 	uint16_t half_cpu_cache_pages;
-@@ -203,16 +218,9 @@ struct kgem {
- 	void (*retire)(struct kgem *kgem);
- 	void (*expire)(struct kgem *kgem);
- 
--	void (*memcpy_to_tiled_x)(const void *src, void *dst, int bpp,
--				  int32_t src_stride, int32_t dst_stride,
--				  int16_t src_x, int16_t src_y,
--				  int16_t dst_x, int16_t dst_y,
--				  uint16_t width, uint16_t height);
--	void (*memcpy_from_tiled_x)(const void *src, void *dst, int bpp,
--				    int32_t src_stride, int32_t dst_stride,
--				    int16_t src_x, int16_t src_y,
--				    int16_t dst_x, int16_t dst_y,
--				    uint16_t width, uint16_t height);
-+	memcpy_box_func memcpy_to_tiled_x;
-+	memcpy_box_func memcpy_from_tiled_x;
-+	memcpy_box_func memcpy_between_tiled_x;
- 
- 	struct kgem_bo *batch_bo;
- 
-@@ -230,7 +238,7 @@ struct kgem {
- 
- #define KGEM_MAX_DEFERRED_VBO 16
- 
--#define KGEM_BATCH_RESERVED 1
-+#define KGEM_BATCH_RESERVED 8 /* LRI(SWCTRL) + END */
- #define KGEM_RELOC_RESERVED (KGEM_MAX_DEFERRED_VBO)
- #define KGEM_EXEC_RESERVED (1+KGEM_MAX_DEFERRED_VBO)
- 
-@@ -317,6 +325,7 @@ bool kgem_bo_convert_to_gpu(struct kgem *kgem,
- 			    struct kgem_bo *bo,
- 			    unsigned flags);
- 
-+bool kgem_bo_is_fenced(struct kgem *kgem, struct kgem_bo *bo);
- uint32_t kgem_bo_get_binding(struct kgem_bo *bo, uint32_t format);
- void kgem_bo_set_binding(struct kgem_bo *bo, uint32_t format, uint16_t offset);
- 
-@@ -342,6 +351,11 @@ static inline bool kgem_ring_is_idle(struct kgem *kgem, int ring)
- {
- 	ring = ring == KGEM_BLT;
- 
-+	if (kgem->needs_semaphore &&
-+	    !list_is_empty(&kgem->requests[!ring]) &&
-+	    !__kgem_ring_is_idle(kgem, !ring))
-+		return false;
-+
- 	if (list_is_empty(&kgem->requests[ring]))
- 		return true;
- 
-@@ -390,6 +404,7 @@ void _kgem_bo_destroy(struct kgem *kgem, struct kgem_bo *bo);
- static inline void kgem_bo_destroy(struct kgem *kgem, struct kgem_bo *bo)
- {
- 	assert(bo->refcnt);
-+	assert(bo->refcnt > bo->active_scanout);
- 	if (--bo->refcnt == 0)
- 		_kgem_bo_destroy(kgem, bo);
- }
-@@ -400,13 +415,13 @@ static inline void kgem_set_mode(struct kgem *kgem,
- 				 enum kgem_mode mode,
- 				 struct kgem_bo *bo)
- {
--	assert(!kgem->wedged);
-+	warn_unless(!kgem->wedged);
- 
- #if DEBUG_FLUSH_BATCH
- 	kgem_submit(kgem);
- #endif
- 
--	if (kgem->nreloc && bo->exec == NULL && kgem_ring_is_idle(kgem, kgem->ring)) {
-+	if (kgem->nreloc && bo->rq == NULL && kgem_ring_is_idle(kgem, kgem->ring)) {
- 		DBG(("%s: flushing before new bo\n", __FUNCTION__));
- 		_kgem_submit(kgem);
- 	}
-@@ -422,7 +437,7 @@ static inline void _kgem_set_mode(struct kgem *kgem, enum kgem_mode mode)
- {
- 	assert(kgem->mode == KGEM_NONE);
- 	assert(kgem->nbatch == 0);
--	assert(!kgem->wedged);
-+	warn_unless(!kgem->wedged);
- 	kgem->context_switch(kgem, mode);
- 	kgem->mode = mode;
- }
-@@ -566,7 +581,7 @@ static inline bool kgem_bo_can_blt(struct kgem *kgem,
- {
- 	assert(bo->refcnt);
- 
--	if (bo->tiling == I915_TILING_Y) {
-+	if (bo->tiling == I915_TILING_Y && !kgem->can_blt_y) {
- 		DBG(("%s: can not blt to handle=%d, tiling=Y\n",
- 		     __FUNCTION__, bo->handle));
- 		return false;
-@@ -581,6 +596,22 @@ static inline bool kgem_bo_can_blt(struct kgem *kgem,
- 	return kgem_bo_blt_pitch_is_ok(kgem, bo);
- }
- 
-+void __kgem_bcs_set_tiling(struct kgem *kgem,
-+			   struct kgem_bo *src,
-+			   struct kgem_bo *dst);
-+
-+inline static void kgem_bcs_set_tiling(struct kgem *kgem,
-+				       struct kgem_bo *src,
-+				       struct kgem_bo *dst)
-+{
-+	assert(kgem->mode == KGEM_BLT);
-+
-+	if (!kgem->can_blt_y)
-+		return;
-+
-+	__kgem_bcs_set_tiling(kgem, src, dst);
-+}
-+
- static inline bool kgem_bo_is_snoop(struct kgem_bo *bo)
- {
- 	assert(bo->refcnt);
-@@ -607,17 +638,24 @@ static inline void kgem_bo_mark_busy(struct kgem *kgem, struct kgem_bo *bo, int
- 	}
- }
- 
--inline static void __kgem_bo_clear_busy(struct kgem_bo *bo)
-+static inline void __kgem_bo_clear_dirty(struct kgem_bo *bo)
- {
- 	DBG(("%s: handle=%d\n", __FUNCTION__, bo->handle));
--	bo->rq = NULL;
--	list_del(&bo->request);
- 
- 	bo->domain = DOMAIN_NONE;
- 	bo->needs_flush = false;
- 	bo->gtt_dirty = false;
- }
- 
-+inline static void __kgem_bo_clear_busy(struct kgem_bo *bo)
-+{
-+	DBG(("%s: handle=%d\n", __FUNCTION__, bo->handle));
-+	bo->rq = NULL;
-+	list_del(&bo->request);
-+
-+	__kgem_bo_clear_dirty(bo);
-+}
-+
- static inline bool kgem_bo_is_busy(struct kgem_bo *bo)
- {
- 	DBG(("%s: handle=%d, domain: %d exec? %d, rq? %d\n", __FUNCTION__,
-@@ -626,7 +664,7 @@ static inline bool kgem_bo_is_busy(struct kgem_bo *bo)
- 	return bo->rq;
- }
- 
--void __kgem_retire_requests_upto(struct kgem *kgem, struct kgem_bo *bo);
-+bool __kgem_retire_requests_upto(struct kgem *kgem, struct kgem_bo *bo);
- static inline bool __kgem_bo_is_busy(struct kgem *kgem, struct kgem_bo *bo)
- {
- 	DBG(("%s: handle=%d, domain: %d exec? %d, rq? %d\n", __FUNCTION__,
-@@ -636,14 +674,13 @@ static inline bool __kgem_bo_is_busy(struct kgem *kgem, struct kgem_bo *bo)
- 	if (bo->exec)
- 		return true;
- 
--	if (bo->rq && !__kgem_busy(kgem, bo->handle)) {
--		__kgem_retire_requests_upto(kgem, bo);
--		assert(list_is_empty(&bo->request));
--		assert(bo->rq == NULL);
--		assert(bo->domain == DOMAIN_NONE);
--	}
-+	if (bo->rq == NULL)
-+		return false;
-+
-+	if (__kgem_busy(kgem, bo->handle))
-+		return true;
- 
--	return kgem_bo_is_busy(bo);
-+	return __kgem_retire_requests_upto(kgem, bo);
- }
- 
- static inline bool kgem_bo_is_render(struct kgem_bo *bo)
-@@ -651,7 +688,15 @@ static inline bool kgem_bo_is_render(struct kgem_bo *bo)
- 	DBG(("%s: handle=%d, rq? %d [%d]\n", __FUNCTION__,
- 	     bo->handle, bo->rq != NULL, (int)RQ_RING(bo->rq)));
- 	assert(bo->refcnt);
--	return bo->rq && RQ_RING(bo->rq) == I915_EXEC_RENDER;
-+	return bo->rq && RQ_RING(bo->rq) != KGEM_BLT;
-+}
-+
-+static inline bool kgem_bo_is_blt(struct kgem_bo *bo)
-+{
-+	DBG(("%s: handle=%d, rq? %d\n", __FUNCTION__,
-+	     bo->handle, bo->rq != NULL, (int)RQ_RING(bo->rq)));
-+	assert(bo->refcnt);
-+	return RQ_RING(bo->rq) == KGEM_BLT;
- }
- 
- static inline void kgem_bo_mark_unreusable(struct kgem_bo *bo)
-@@ -852,6 +897,6 @@ memcpy_from_tiled_x(struct kgem *kgem,
- 					 width, height);
- }
- 
--void choose_memcpy_tiled_x(struct kgem *kgem, int swizzling);
-+void choose_memcpy_tiled_x(struct kgem *kgem, int swizzling, unsigned cpu);
- 
- #endif /* KGEM_H */
-diff --git a/src/sna/kgem_debug_gen4.c b/src/sna/kgem_debug_gen4.c
-index 9b80dc88..8e6e47b6 100644
---- a/src/sna/kgem_debug_gen4.c
-+++ b/src/sna/kgem_debug_gen4.c
-@@ -598,7 +598,7 @@ int kgem_gen4_decode_3d(struct kgem *kgem, uint32_t offset)
- 		assert(len == 7);
- 		kgem_debug_print(data, offset, 0,
- 			  "3DSTATE_DEPTH_BUFFER\n");
--		kgem_debug_print(data, offset, 1, "%s, %s, pitch = %d bytes, %stiled, HiZ %d, Seperate Stencil %d\n",
-+		kgem_debug_print(data, offset, 1, "%s, %s, pitch = %d bytes, %stiled, HiZ %d, Separate Stencil %d\n",
- 			  get_965_surfacetype(data[1] >> 29),
- 			  get_965_depthformat((data[1] >> 18) & 0x7),
- 			  (data[1] & 0x0001ffff) + 1,
-diff --git a/src/sna/kgem_debug_gen5.c b/src/sna/kgem_debug_gen5.c
-index 8b55dd91..f1b1275f 100644
---- a/src/sna/kgem_debug_gen5.c
-+++ b/src/sna/kgem_debug_gen5.c
-@@ -573,7 +573,7 @@ int kgem_gen5_decode_3d(struct kgem *kgem, uint32_t offset)
- 		assert(len == 7);
- 		kgem_debug_print(data, offset, 0,
- 			  "3DSTATE_DEPTH_BUFFER\n");
--		kgem_debug_print(data, offset, 1, "%s, %s, pitch = %d bytes, %stiled, HiZ %d, Seperate Stencil %d\n",
-+		kgem_debug_print(data, offset, 1, "%s, %s, pitch = %d bytes, %stiled, HiZ %d, Separate Stencil %d\n",
- 			  get_965_surfacetype(data[1] >> 29),
- 			  get_965_depthformat((data[1] >> 18) & 0x7),
- 			  (data[1] & 0x0001ffff) + 1,
-diff --git a/src/sna/kgem_debug_gen6.c b/src/sna/kgem_debug_gen6.c
-index 7ef55d38..579c5d54 100644
---- a/src/sna/kgem_debug_gen6.c
-+++ b/src/sna/kgem_debug_gen6.c
-@@ -985,7 +985,7 @@ int kgem_gen6_decode_3d(struct kgem *kgem, uint32_t offset)
- 		assert(len == 7);
- 		kgem_debug_print(data, offset, 0,
- 			  "3DSTATE_DEPTH_BUFFER\n");
--		kgem_debug_print(data, offset, 1, "%s, %s, pitch = %d bytes, %stiled, HiZ %d, Seperate Stencil %d\n",
-+		kgem_debug_print(data, offset, 1, "%s, %s, pitch = %d bytes, %stiled, HiZ %d, Separate Stencil %d\n",
- 			  get_965_surfacetype(data[1] >> 29),
- 			  get_965_depthformat((data[1] >> 18) & 0x7),
- 			  (data[1] & 0x0001ffff) + 1,
-diff --git a/src/sna/sna.h b/src/sna/sna.h
-index 18425e30..7861110a 100644
---- a/src/sna/sna.h
-+++ b/src/sna/sna.h
-@@ -154,6 +154,8 @@ struct sna_pixmap {
- #define MAPPED_GTT 1
- #define MAPPED_CPU 2
- 	uint8_t flush :2;
-+#define FLUSH_READ 1
-+#define FLUSH_WRITE 2
- 	uint8_t shm :1;
- 	uint8_t clear :1;
- 	uint8_t header :1;
-@@ -179,18 +181,31 @@ static inline WindowPtr get_root_window(ScreenPtr screen)
- #endif
- }
- 
-+#if !NDEBUG
-+static PixmapPtr check_pixmap(PixmapPtr pixmap)
-+{
-+	if (pixmap != NULL) {
-+		assert(pixmap->refcnt >= 1);
-+		assert(pixmap->devKind != 0xdeadbeef);
-+	}
-+	return pixmap;
-+}
-+#else
-+#define check_pixmap(p) p
-+#endif
-+
- static inline PixmapPtr get_window_pixmap(WindowPtr window)
- {
- 	assert(window);
- 	assert(window->drawable.type != DRAWABLE_PIXMAP);
--	return fbGetWindowPixmap(window);
-+	return check_pixmap(fbGetWindowPixmap(window));
- }
- 
- static inline PixmapPtr get_drawable_pixmap(DrawablePtr drawable)
- {
- 	assert(drawable);
- 	if (drawable->type == DRAWABLE_PIXMAP)
--		return (PixmapPtr)drawable;
-+		return check_pixmap((PixmapPtr)drawable);
- 	else
- 		return get_window_pixmap((WindowPtr)drawable);
- }
-@@ -244,11 +259,12 @@ struct sna {
- #define SNA_NO_VSYNC		0x40
- #define SNA_TRIPLE_BUFFER	0x80
- #define SNA_TEAR_FREE		0x100
--#define SNA_FORCE_SHADOW	0x200
--#define SNA_FLUSH_GTT		0x400
-+#define SNA_WANT_TEAR_FREE	0x200
-+#define SNA_FORCE_SHADOW	0x400
-+#define SNA_FLUSH_GTT		0x800
- #define SNA_PERFORMANCE		0x1000
- #define SNA_POWERSAVE		0x2000
--#define SNA_REMOVE_OUTPUTS	0x4000
-+#define SNA_NO_DPMS		0x4000
- #define SNA_HAS_FLIP		0x10000
- #define SNA_HAS_ASYNC_FLIP	0x20000
- #define SNA_LINEAR_FB		0x40000
-@@ -265,7 +281,13 @@ struct sna {
- #define AVX 0x80
- #define AVX2 0x100
- 
--	unsigned watch_flush;
-+	bool ignore_copy_area : 1;
-+
-+	unsigned watch_shm_flush;
-+	unsigned watch_dri_flush;
-+	unsigned damage_event;
-+	bool needs_shm_flush;
-+	bool needs_dri_flush;
- 
- 	struct timeval timer_tv;
- 	uint32_t timer_expire[NUM_TIMERS];
-@@ -284,9 +306,17 @@ struct sna {
- 		struct kgem_bo *shadow;
- 		unsigned front_active;
- 		unsigned shadow_active;
-+		unsigned rr_active;
- 		unsigned flip_active;
-+		unsigned hidden;
-+		bool shadow_enabled;
-+		bool shadow_wait;
- 		bool dirty;
- 
-+		struct drm_event_vblank *shadow_events;
-+		int shadow_nevent;
-+		int shadow_size;
-+
- 		int max_crtc_width, max_crtc_height;
- 		RegionRec shadow_region;
- 		RegionRec shadow_cancel;
-@@ -318,7 +348,8 @@ struct sna {
- 		uint32_t fg, bg;
- 		int size;
- 
--		int active;
-+		bool disable;
-+		bool active;
- 		int last_x;
- 		int last_y;
- 
-@@ -331,8 +362,9 @@ struct sna {
- 	} cursor;
- 
- 	struct sna_dri2 {
--		bool available;
--		bool open;
-+		bool available : 1;
-+		bool enable : 1;
-+		bool open : 1;
- 
- #if HAVE_DRI2
- 		void *flip_pending;
-@@ -341,8 +373,11 @@ struct sna {
- 	} dri2;
- 
- 	struct sna_dri3 {
--		bool available;
--		bool open;
-+		bool available :1;
-+		bool override : 1;
-+		bool enable : 1;
-+		bool open :1;
-+
- #if HAVE_DRI3
- 		SyncScreenCreateFenceFunc create_fence;
- 		struct list pixmaps;
-@@ -353,6 +388,9 @@ struct sna {
- 		bool available;
- 		bool open;
- #if HAVE_PRESENT
-+		struct list vblank_queue;
-+		uint64_t unflip;
-+		void *freed_info;
- #endif
- 	} present;
- 
-@@ -364,8 +402,10 @@ struct sna {
- 	EntityInfoPtr pEnt;
- 	const struct intel_device_info *info;
- 
-+#if !HAVE_NOTIFY_FD
- 	ScreenBlockHandlerProcPtr BlockHandler;
- 	ScreenWakeupHandlerProcPtr WakeupHandler;
-+#endif
- 	CloseScreenProcPtr CloseScreen;
- 
- 	PicturePtr clear;
-@@ -383,6 +423,7 @@ struct sna {
- 		struct gen6_render_state gen6;
- 		struct gen7_render_state gen7;
- 		struct gen8_render_state gen8;
-+		struct gen9_render_state gen9;
- 	} render_state;
- 
- 	/* Broken-out options. */
-@@ -420,7 +461,7 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna);
- bool sna_mode_fake_init(struct sna *sna, int num_fake);
- bool sna_mode_wants_tear_free(struct sna *sna);
- void sna_mode_adjust_frame(struct sna *sna, int x, int y);
--extern void sna_mode_discover(struct sna *sna);
-+extern void sna_mode_discover(struct sna *sna, bool tell);
- extern void sna_mode_check(struct sna *sna);
- extern bool sna_mode_disable(struct sna *sna);
- extern void sna_mode_enable(struct sna *sna);
-@@ -434,6 +475,7 @@ extern void sna_shadow_unset_crtc(struct sna *sna, xf86CrtcPtr crtc);
- extern bool sna_pixmap_discard_shadow_damage(struct sna_pixmap *priv,
- 					     const RegionRec *region);
- extern void sna_mode_set_primary(struct sna *sna);
-+extern bool sna_mode_find_hotplug_connector(struct sna *sna, unsigned id);
- extern void sna_mode_close(struct sna *sna);
- extern void sna_mode_fini(struct sna *sna);
- 
-@@ -444,6 +486,7 @@ extern bool sna_cursors_init(ScreenPtr screen, struct sna *sna);
- typedef void (*sna_flip_handler_t)(struct drm_event_vblank *e,
- 				   void *data);
- 
-+extern bool sna_needs_page_flip(struct sna *sna, struct kgem_bo *bo);
- extern int sna_page_flip(struct sna *sna,
- 			 struct kgem_bo *bo,
- 			 sna_flip_handler_t handler,
-@@ -461,6 +504,11 @@ to_sna_from_screen(ScreenPtr screen)
- 	return to_sna(xf86ScreenToScrn(screen));
- }
- 
-+pure static inline ScreenPtr to_screen_from_sna(struct sna *sna)
-+{
-+	return xf86ScrnToScreen(sna->scrn);
-+}
-+
- pure static inline struct sna *
- to_sna_from_pixmap(PixmapPtr pixmap)
- {
-@@ -498,12 +546,11 @@ to_sna_from_kgem(struct kgem *kgem)
- extern xf86CrtcPtr sna_covering_crtc(struct sna *sna,
- 				     const BoxRec *box,
- 				     xf86CrtcPtr desired);
-+extern xf86CrtcPtr sna_primary_crtc(struct sna *sna);
- 
- extern bool sna_wait_for_scanline(struct sna *sna, PixmapPtr pixmap,
- 				  xf86CrtcPtr crtc, const BoxRec *clip);
- 
--xf86CrtcPtr sna_mode_first_crtc(struct sna *sna);
--
- const struct ust_msc {
- 	uint64_t msc;
- 	int tv_sec;
-@@ -536,6 +583,11 @@ static inline uint64_t ust64(int tv_sec, int tv_usec)
- 	return (uint64_t)tv_sec * 1000000 + tv_usec;
- }
- 
-+static inline uint64_t swap_ust(const struct ust_msc *swap)
-+{
-+	return ust64(swap->tv_sec, swap->tv_usec);
-+}
-+
- #if HAVE_DRI2
- bool sna_dri2_open(struct sna *sna, ScreenPtr pScreen);
- void sna_dri2_page_flip_handler(struct sna *sna, struct drm_event_vblank *event);
-@@ -567,20 +619,59 @@ bool sna_present_open(struct sna *sna, ScreenPtr pScreen);
- void sna_present_update(struct sna *sna);
- void sna_present_close(struct sna *sna, ScreenPtr pScreen);
- void sna_present_vblank_handler(struct drm_event_vblank *event);
-+void sna_present_cancel_flip(struct sna *sna);
- #else
- static inline bool sna_present_open(struct sna *sna, ScreenPtr pScreen) { return false; }
- static inline void sna_present_update(struct sna *sna) { }
- static inline void sna_present_close(struct sna *sna, ScreenPtr pScreen) { }
- static inline void sna_present_vblank_handler(struct drm_event_vblank *event) { }
-+static inline void sna_present_cancel_flip(struct sna *sna) { }
- #endif
- 
--extern bool sna_crtc_set_sprite_rotation(xf86CrtcPtr crtc, uint32_t rotation);
--extern int sna_crtc_to_pipe(xf86CrtcPtr crtc);
--extern uint32_t sna_crtc_to_sprite(xf86CrtcPtr crtc);
--extern uint32_t sna_crtc_id(xf86CrtcPtr crtc);
--extern bool sna_crtc_is_on(xf86CrtcPtr crtc);
-+extern unsigned sna_crtc_count_sprites(xf86CrtcPtr crtc);
-+extern bool sna_crtc_set_sprite_rotation(xf86CrtcPtr crtc, unsigned idx, uint32_t rotation);
-+extern uint32_t sna_crtc_to_sprite(xf86CrtcPtr crtc, unsigned idx);
- extern bool sna_crtc_is_transformed(xf86CrtcPtr crtc);
- 
-+#define CRTC_VBLANK 0x3
-+#define CRTC_ON 0x80000000
-+
-+uint32_t sna_crtc_id(xf86CrtcPtr crtc);
-+
-+static inline unsigned long *sna_crtc_flags(xf86CrtcPtr crtc)
-+{
-+	unsigned long *flags = crtc->driver_private;
-+	assert(flags);
-+	return flags;
-+}
-+
-+static inline unsigned sna_crtc_pipe(xf86CrtcPtr crtc)
-+{
-+	return *sna_crtc_flags(crtc) >> 8 & 0xff;
-+}
-+
-+static inline bool sna_crtc_is_on(xf86CrtcPtr crtc)
-+{
-+	return *sna_crtc_flags(crtc) & CRTC_ON;
-+}
-+
-+static inline void sna_crtc_set_vblank(xf86CrtcPtr crtc)
-+{
-+	assert((*sna_crtc_flags(crtc) & CRTC_VBLANK) < 3);
-+	++*sna_crtc_flags(crtc);
-+}
-+
-+static inline void sna_crtc_clear_vblank(xf86CrtcPtr crtc)
-+{
-+	assert(*sna_crtc_flags(crtc) & CRTC_VBLANK);
-+	--*sna_crtc_flags(crtc);
-+}
-+
-+static inline bool sna_crtc_has_vblank(xf86CrtcPtr crtc)
-+{
-+	return *sna_crtc_flags(crtc) & CRTC_VBLANK;
-+}
-+
- CARD32 sna_format_for_depth(int depth);
- CARD32 sna_render_format_for_depth(int depth);
- 
-@@ -998,15 +1089,14 @@ static inline uint32_t pixmap_size(PixmapPtr pixmap)
- 
- bool sna_accel_init(ScreenPtr sreen, struct sna *sna);
- void sna_accel_create(struct sna *sna);
--void sna_accel_block_handler(struct sna *sna, struct timeval **tv);
--void sna_accel_wakeup_handler(struct sna *sna);
--void sna_accel_watch_flush(struct sna *sna, int enable);
-+void sna_accel_block(struct sna *sna, struct timeval **tv);
- void sna_accel_flush(struct sna *sna);
- void sna_accel_enter(struct sna *sna);
- void sna_accel_leave(struct sna *sna);
- void sna_accel_close(struct sna *sna);
- void sna_accel_free(struct sna *sna);
- 
-+void sna_watch_flush(struct sna *sna, int enable);
- void sna_copy_fbcon(struct sna *sna);
- 
- bool sna_composite_create(struct sna *sna);
-@@ -1127,6 +1217,16 @@ memcpy_blt(const void *src, void *dst, int bpp,
- 	   uint16_t width, uint16_t height);
- 
- void
-+affine_blt(const void *src, void *dst, int bpp,
-+	   int16_t src_x, int16_t src_y,
-+	   int16_t src_width, int16_t src_height,
-+	   int32_t src_stride,
-+	   int16_t dst_x, int16_t dst_y,
-+	   uint16_t dst_width, uint16_t dst_height,
-+	   int32_t dst_stride,
-+	   const struct pixman_f_transform *t);
-+
-+void
- memmove_box(const void *src, void *dst,
- 	    int bpp, int32_t stride,
- 	    const BoxRec *box,
-@@ -1182,6 +1282,31 @@ box_intersect(BoxPtr a, const BoxRec *b)
- 	return true;
- }
- 
-+const BoxRec *
-+__find_clip_box_for_y(const BoxRec *begin, const BoxRec *end, int16_t y);
-+inline static const BoxRec *
-+find_clip_box_for_y(const BoxRec *begin, const BoxRec *end, int16_t y)
-+{
-+	/* Special case for incremental trapezoid clipping */
-+	if (begin == end)
-+		return end;
-+
-+	/* Quick test if scanline is within range of clip boxes */
-+	if (begin->y2 > y) {
-+		assert(end == begin + 1 ||
-+		       __find_clip_box_for_y(begin, end, y) == begin);
-+		return begin;
-+	}
-+	if (y >= end[-1].y2) {
-+		assert(end == begin + 1 ||
-+		       __find_clip_box_for_y(begin, end, y) == end);
-+		return end;
-+	}
-+
-+	/* Otherwise bisect to find the first box crossing y */
-+	return __find_clip_box_for_y(begin, end, y);
-+}
-+
- unsigned sna_cpu_detect(void);
- char *sna_cpu_features_to_string(unsigned features, char *line);
- 
-@@ -1237,4 +1362,17 @@ static inline void sigtrap_put(void)
- extern int getline(char **line, size_t *len, FILE *file);
- #endif
- 
-+static inline void add_shm_flush(struct sna *sna, struct sna_pixmap *priv)
-+{
-+	if (!priv->shm)
-+		return;
-+
-+	DBG(("%s: marking handle=%d for SHM flush\n",
-+	     __FUNCTION__, priv->cpu_bo->handle));
-+
-+	assert(!priv->flush);
-+	sna_add_flush_pixmap(sna, priv, priv->cpu_bo);
-+	sna->needs_shm_flush = true;
-+}
-+
- #endif /* _SNA_H */
-diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
-index baf5f609..25a075cf 100644
---- a/src/sna/sna_accel.c
-+++ b/src/sna/sna_accel.c
-@@ -50,8 +50,11 @@
- #endif
- #include <shmint.h>
- 
-+#include <X11/extensions/damageproto.h>
-+
- #include <sys/time.h>
- #include <sys/mman.h>
-+#include <sys/ioctl.h>
- #include <unistd.h>
- 
- #ifdef HAVE_VALGRIND
-@@ -66,7 +69,8 @@
- #define FORCE_FLUSH 0
- #define FORCE_FULL_SYNC 0 /* https://bugs.freedesktop.org/show_bug.cgi?id=61628 */
- 
--#define DEFAULT_TILING I915_TILING_X
-+#define DEFAULT_PIXMAP_TILING I915_TILING_X
-+#define DEFAULT_SCANOUT_TILING I915_TILING_X
- 
- #define USE_INPLACE 1
- #define USE_SPANS 0 /* -1 force CPU, 1 force GPU */
-@@ -115,6 +119,11 @@
- #define RECTILINEAR	0x4
- #define OVERWRITES	0x8
- 
-+#if XFONT2_CLIENT_FUNCS_VERSION >= 1
-+#define AllocateFontPrivateIndex() xfont2_allocate_font_private_index()
-+#define FontSetPrivate(font, idx, data) xfont2_font_set_private(font, idx, data)
-+#endif
-+
- #if 0
- static void __sna_fallback_flush(DrawablePtr d)
- {
-@@ -213,6 +222,7 @@ static GCOps sna_gc_ops__tmp;
- static const GCFuncs sna_gc_funcs;
- static const GCFuncs sna_gc_funcs__cpu;
- 
-+static void sna_shm_watch_flush(struct sna *sna, int enable);
- static void
- sna_poly_fill_rect__gpu(DrawablePtr draw, GCPtr gc, int n, xRectangle *rect);
- 
-@@ -527,10 +537,10 @@ sna_pixmap_alloc_cpu(struct sna *sna,
- 		DBG(("%s: allocating CPU buffer (%dx%d)\n", __FUNCTION__,
- 		     pixmap->drawable.width, pixmap->drawable.height));
- 
--		hint = 0;
--		if ((flags & MOVE_ASYNC_HINT) == 0 &&
--		    ((flags & MOVE_READ) == 0 || (priv->gpu_damage && !priv->clear && !sna->kgem.has_llc)))
--			hint = CREATE_CPU_MAP | CREATE_INACTIVE | CREATE_NO_THROTTLE;
-+		hint = CREATE_CPU_MAP | CREATE_INACTIVE | CREATE_NO_THROTTLE;
-+		if ((flags & MOVE_ASYNC_HINT) ||
-+		    (priv->gpu_damage && !priv->clear && kgem_bo_is_busy(priv->gpu_bo) && sna->kgem.can_blt_cpu))
-+			hint = 0;
- 
- 		priv->cpu_bo = kgem_create_cpu_2d(&sna->kgem,
- 						  pixmap->drawable.width,
-@@ -580,7 +590,7 @@ static void __sna_pixmap_free_cpu(struct sna *sna, struct sna_pixmap *priv)
- 		if (priv->cpu_bo->flush) {
- 			assert(!priv->cpu_bo->reusable);
- 			kgem_bo_sync__cpu(&sna->kgem, priv->cpu_bo);
--			sna_accel_watch_flush(sna, -1);
-+			sna_shm_watch_flush(sna, -1);
- 		}
- 		kgem_bo_destroy(&sna->kgem, priv->cpu_bo);
- 	} else if (!IS_STATIC_PTR(priv->ptr))
-@@ -612,9 +622,9 @@ static bool sna_pixmap_free_cpu(struct sna *sna, struct sna_pixmap *priv, bool a
- 
- static inline uint32_t default_tiling(struct sna *sna, PixmapPtr pixmap)
- {
--#if DEFAULT_TILING == I915_TILING_NONE
-+#if DEFAULT_PIXMAP_TILING == I915_TILING_NONE
- 	return I915_TILING_NONE;
--#elif DEFAULT_TILING == I915_TILING_X
-+#elif DEFAULT_PIXMAP_TILING == I915_TILING_X
- 	return I915_TILING_X;
- #else
- 	/* Try to avoid hitting the Y-tiling GTT mapping bug on 855GM */
-@@ -630,15 +640,6 @@ static inline uint32_t default_tiling(struct sna *sna, PixmapPtr pixmap)
- 	     pixmap->drawable.height > sna->render.max_3d_size))
- 		return I915_TILING_X;
- 
--	if (sna_damage_is_all(&sna_pixmap(pixmap)->cpu_damage,
--			      pixmap->drawable.width,
--			      pixmap->drawable.height)) {
--		DBG(("%s: entire source is damaged, using Y-tiling\n",
--		     __FUNCTION__));
--		sna_damage_destroy(&sna_pixmap(priv)->gpu_damage);
--		return I915_TILING_Y;
--	}
--
- 	return I915_TILING_Y;
- #endif
- }
-@@ -666,6 +667,7 @@ struct kgem_bo *sna_pixmap_change_tiling(PixmapPtr pixmap, uint32_t tiling)
- 	     __FUNCTION__, priv->gpu_bo->tiling, tiling,
- 	     pixmap->drawable.width, pixmap->drawable.height));
- 	assert(priv->gpu_damage == NULL || priv->gpu_bo);
-+	assert(priv->gpu_bo->tiling != tiling);
- 
- 	if (priv->pinned) {
- 		DBG(("%s: can't convert pinned bo\n", __FUNCTION__));
-@@ -690,6 +692,12 @@ struct kgem_bo *sna_pixmap_change_tiling(PixmapPtr pixmap, uint32_t tiling)
- 		return NULL;
- 	}
- 
-+	if (bo->tiling == priv->gpu_bo->tiling) {
-+		DBG(("%s: tiling request failed\n", __FUNCTION__));
-+		kgem_bo_destroy(&sna->kgem, bo);
-+		return NULL;
-+	}
-+
- 	box.x1 = box.y1 = 0;
- 	box.x2 = pixmap->drawable.width;
- 	box.y2 = pixmap->drawable.height;
-@@ -824,8 +832,8 @@ create_pixmap(struct sna *sna, ScreenPtr screen,
- 		datasize += adjust;
- 	}
- 
--	DBG(("%s: allocating pixmap %dx%d, depth=%d, size=%ld\n",
--	     __FUNCTION__, width, height, depth, (long)datasize));
-+	DBG(("%s: allocating pixmap %dx%d, depth=%d/%d, size=%ld\n",
-+	     __FUNCTION__, width, height, depth, bpp, (long)datasize));
- 	pixmap = AllocatePixmap(screen, datasize);
- 	if (!pixmap)
- 		return NullPixmap;
-@@ -878,7 +886,11 @@ __pop_freed_pixmap(struct sna *sna)
- 	pixmap = sna->freed_pixmap;
- 	sna->freed_pixmap = pixmap->devPrivate.ptr;
- 
-+	DBG(("%s: reusing freed pixmap=%ld header\n",
-+	     __FUNCTION__, pixmap->drawable.serialNumber));
-+
- 	assert(pixmap->refcnt == 0);
-+	assert(pixmap->devKind = 0xdeadbeef);
- 	assert(sna_pixmap(pixmap));
- 	assert(sna_pixmap(pixmap)->header);
- 
-@@ -990,7 +1002,7 @@ fallback:
- 	}
- 	priv->cpu_bo->pitch = pitch;
- 	kgem_bo_mark_unreusable(priv->cpu_bo);
--	sna_accel_watch_flush(sna, 1);
-+	sna_shm_watch_flush(sna, 1);
- #ifdef DEBUG_MEMORY
- 	sna->debug_memory.cpu_bo_allocs++;
- 	sna->debug_memory.cpu_bo_bytes += kgem_bo_size(priv->cpu_bo);
-@@ -1081,6 +1093,18 @@ sna_pixmap_create_scratch(ScreenPtr screen,
- 	return pixmap;
- }
- 
-+static unsigned small_copy(const RegionRec *region)
-+{
-+	if ((region->extents.x2 - region->extents.x1)*(region->extents.y2 - region->extents.y1) < 1024) {
-+		DBG(("%s: region:%dx%d\n", __FUNCTION__,
-+		     (region->extents.x2 - region->extents.x1),
-+		     (region->extents.y2 - region->extents.y1)));
-+		return COPY_SMALL;
-+	}
-+
-+	return 0;
-+}
-+
- #ifdef CREATE_PIXMAP_USAGE_SHARED
- static Bool
- sna_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave, void **fd_handle)
-@@ -1124,7 +1148,7 @@ sna_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave, void **fd_handle)
- 				    pixmap->drawable.height,
- 				    pixmap->drawable.bitsPerPixel,
- 				    I915_TILING_NONE,
--				    CREATE_GTT_MAP | CREATE_PRIME | CREATE_EXACT);
-+				    CREATE_GTT_MAP | CREATE_SCANOUT | CREATE_PRIME | CREATE_EXACT);
- 		if (bo == NULL) {
- 			DBG(("%s: allocation failed\n", __FUNCTION__));
- 			return FALSE;
-@@ -1243,7 +1267,7 @@ sna_create_pixmap_shared(struct sna *sna, ScreenPtr screen,
- 					      width, height,
- 					      pixmap->drawable.bitsPerPixel,
- 					      I915_TILING_NONE,
--					      CREATE_GTT_MAP | CREATE_PRIME | CREATE_EXACT);
-+					      CREATE_GTT_MAP | CREATE_SCANOUT | CREATE_PRIME | CREATE_EXACT);
- 		if (priv->gpu_bo == NULL) {
- 			free(priv);
- 			FreePixmap(pixmap);
-@@ -1311,7 +1335,7 @@ static PixmapPtr sna_create_pixmap(ScreenPtr screen,
- 
- 	if (unlikely((sna->render.prefer_gpu & PREFER_GPU_RENDER) == 0))
- 		flags &= ~KGEM_CAN_CREATE_GPU;
--	if (wedged(sna))
-+	if (wedged(sna) && usage != SNA_CREATE_FB)
- 		flags &= ~KGEM_CAN_CREATE_GTT;
- 
- 	DBG(("%s: usage=%d, flags=%x\n", __FUNCTION__, usage, flags));
-@@ -1417,10 +1441,13 @@ static void __sna_free_pixmap(struct sna *sna,
- 	__sna_pixmap_free_cpu(sna, priv);
- 
- 	if (priv->flush)
--		sna_accel_watch_flush(sna, -1);
-+		sna_watch_flush(sna, -1);
- 
-+#if !NDEBUG
-+	pixmap->devKind = 0xdeadbeef;
-+#endif
- 	if (priv->header) {
--		assert(pixmap->drawable.pScreen == sna->scrn->pScreen);
-+		assert(pixmap->drawable.pScreen == to_screen_from_sna(sna));
- 		assert(!priv->shm);
- 		pixmap->devPrivate.ptr = sna->freed_pixmap;
- 		sna->freed_pixmap = pixmap;
-@@ -1485,7 +1512,7 @@ static Bool sna_destroy_pixmap(PixmapPtr pixmap)
- 	if (priv->shm && kgem_bo_is_busy(priv->cpu_bo)) {
- 		DBG(("%s: deferring release of active SHM pixmap=%ld\n",
- 		     __FUNCTION__, pixmap->drawable.serialNumber));
--		sna_add_flush_pixmap(sna, priv, priv->cpu_bo);
-+		add_shm_flush(sna, priv);
- 		kgem_bo_submit(&sna->kgem, priv->cpu_bo); /* XXX ShmDetach */
- 	} else
- 		__sna_free_pixmap(sna, pixmap, priv);
-@@ -1529,7 +1556,7 @@ static inline bool has_coherent_ptr(struct sna *sna, struct sna_pixmap *priv, un
- 		if (!priv->cpu_bo)
- 			return true;
- 
--		assert(!priv->cpu_bo->needs_flush);
-+		assert(!priv->cpu_bo->needs_flush || (flags & MOVE_WRITE) == 0);
- 		assert(priv->pixmap->devKind == priv->cpu_bo->pitch);
- 		return priv->pixmap->devPrivate.ptr == MAP(priv->cpu_bo->map__cpu);
- 	}
-@@ -1557,6 +1584,11 @@ static inline bool has_coherent_ptr(struct sna *sna, struct sna_pixmap *priv, un
- 		return true;
- 	}
- 
-+	if (priv->pixmap->devPrivate.ptr == MAP(priv->gpu_bo->map__wc)) {
-+		assert(priv->mapped == MAPPED_GTT);
-+		return true;
-+	}
-+
- 	return false;
- }
- 
-@@ -1577,6 +1609,16 @@ static inline bool pixmap_inplace(struct sna *sna,
- 		return false;
- 
- 	if (priv->gpu_bo && kgem_bo_is_busy(priv->gpu_bo)) {
-+		if (priv->clear) {
-+			DBG(("%s: no, clear GPU bo is busy\n", __FUNCTION__));
-+			return false;
-+		}
-+
-+		if (flags & MOVE_ASYNC_HINT) {
-+			DBG(("%s: no, async hint and GPU bo is busy\n", __FUNCTION__));
-+			return false;
-+		}
-+
- 		if ((flags & (MOVE_WRITE | MOVE_READ)) == (MOVE_WRITE | MOVE_READ)) {
- 			DBG(("%s: no, GPU bo is busy\n", __FUNCTION__));
- 			return false;
-@@ -1624,7 +1666,7 @@ static bool sna_pixmap_alloc_gpu(struct sna *sna,
- 	if (pixmap->usage_hint == SNA_CREATE_FB && (sna->flags & SNA_LINEAR_FB) == 0) {
- 		flags |= CREATE_SCANOUT;
- 		tiling = kgem_choose_tiling(&sna->kgem,
--					    -I915_TILING_X,
-+					    -DEFAULT_SCANOUT_TILING,
- 					    pixmap->drawable.width,
- 					    pixmap->drawable.height,
- 					    pixmap->drawable.bitsPerPixel);
-@@ -1861,7 +1903,9 @@ sna_pixmap_undo_cow(struct sna *sna, struct sna_pixmap *priv, unsigned flags)
- 	assert(priv->gpu_bo == cow->bo);
- 	assert(cow->refcnt);
- 
--	if (flags && (flags & MOVE_WRITE) == 0 && IS_COW_OWNER(priv->cow))
-+	if (flags && /* flags == 0 => force decouple */
-+	    (flags & MOVE_WRITE) == 0 &&
-+	    (((flags & __MOVE_FORCE) == 0) || IS_COW_OWNER(priv->cow)))
- 		return true;
- 
- 	if (!IS_COW_OWNER(priv->cow))
-@@ -1933,7 +1977,7 @@ sna_pixmap_undo_cow(struct sna *sna, struct sna_pixmap *priv, unsigned flags)
- 			box.y2 = pixmap->drawable.height;
- 
- 			if (flags & __MOVE_PRIME) {
--				create = CREATE_GTT_MAP | CREATE_PRIME | CREATE_EXACT;
-+				create = CREATE_GTT_MAP | CREATE_SCANOUT | CREATE_PRIME | CREATE_EXACT;
- 				tiling = I915_TILING_NONE;
- 			} else {
- 				create = 0;
-@@ -2021,6 +2065,10 @@ sna_pixmap_make_cow(struct sna *sna,
- 		     cow->bo->handle));
- 
- 		src_priv->cow = MAKE_COW_OWNER(cow);
-+		if (src_priv->flush & FLUSH_WRITE) {
-+			assert(!src_priv->shm);
-+			sna_add_flush_pixmap(sna, src_priv, src_priv->gpu_bo);
-+		}
- 	}
- 
- 	if (cow == COW(dst_priv->cow)) {
-@@ -2267,6 +2315,7 @@ skip_inplace_map:
- 	    (flags & MOVE_WRITE ? (void *)priv->gpu_bo : (void *)priv->gpu_damage) && priv->cpu_damage == NULL &&
- 	    priv->gpu_bo->tiling == I915_TILING_NONE &&
- 	    (flags & MOVE_READ || kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo, flags & MOVE_WRITE)) &&
-+	    (!priv->clear || !kgem_bo_is_busy(priv->gpu_bo)) &&
- 	    ((flags & (MOVE_WRITE | MOVE_ASYNC_HINT)) == 0 ||
- 	     (!priv->cow && !priv->move_to_gpu && !__kgem_bo_is_busy(&sna->kgem, priv->gpu_bo)))) {
- 		void *ptr;
-@@ -2330,7 +2379,9 @@ skip_inplace_map:
- 			     pixmap->devKind, pixmap->devKind * pixmap->drawable.height));
- 
- 			if (priv->cpu_bo) {
-+				kgem_bo_undo(&sna->kgem, priv->cpu_bo);
- 				if ((flags & MOVE_ASYNC_HINT || priv->cpu_bo->exec) &&
-+				    sna->kgem.can_blt_cpu &&
- 				    sna->render.fill_one(sna,
- 							  pixmap, priv->cpu_bo, priv->clear_color,
- 							  0, 0,
-@@ -2344,21 +2395,26 @@ skip_inplace_map:
- 				assert(pixmap->devPrivate.ptr == MAP(priv->cpu_bo->map__cpu));
- 			}
- 
--			assert(pixmap->devKind);
--			if (priv->clear_color == 0 ||
--			    pixmap->drawable.bitsPerPixel == 8 ||
--			    priv->clear_color == (1 << pixmap->drawable.depth) - 1) {
--				memset(pixmap->devPrivate.ptr, priv->clear_color,
--				       (size_t)pixmap->devKind * pixmap->drawable.height);
--			} else {
--				pixman_fill(pixmap->devPrivate.ptr,
--					    pixmap->devKind/sizeof(uint32_t),
--					    pixmap->drawable.bitsPerPixel,
--					    0, 0,
--					    pixmap->drawable.width,
--					    pixmap->drawable.height,
--					    priv->clear_color);
--			}
-+			if (sigtrap_get() == 0) {
-+				assert(pixmap->devKind);
-+				sigtrap_assert_active();
-+				if (priv->clear_color == 0 ||
-+				    pixmap->drawable.bitsPerPixel == 8 ||
-+				    priv->clear_color == (1 << pixmap->drawable.depth) - 1) {
-+					memset(pixmap->devPrivate.ptr, priv->clear_color,
-+					       (size_t)pixmap->devKind * pixmap->drawable.height);
-+				} else {
-+					pixman_fill(pixmap->devPrivate.ptr,
-+						    pixmap->devKind/sizeof(uint32_t),
-+						    pixmap->drawable.bitsPerPixel,
-+						    0, 0,
-+						    pixmap->drawable.width,
-+						    pixmap->drawable.height,
-+						    priv->clear_color);
-+				}
-+				sigtrap_put();
-+			} else
-+				return false;
- 
- clear_done:
- 			sna_damage_all(&priv->cpu_damage, pixmap);
-@@ -2414,6 +2470,10 @@ done:
- 			DBG(("%s: discarding idle GPU bo\n", __FUNCTION__));
- 			sna_pixmap_free_gpu(sna, priv);
- 		}
-+		if (priv->flush) {
-+			assert(!priv->shm);
-+			sna_add_flush_pixmap(sna, priv, priv->gpu_bo);
-+		}
- 		priv->source_count = SOURCE_BIAS;
- 	}
- 
-@@ -2531,6 +2591,9 @@ static bool cpu_clear_boxes(struct sna *sna,
- {
- 	struct sna_fill_op fill;
- 
-+	if (!sna->kgem.can_blt_cpu)
-+		return false;
-+
- 	if (!sna_fill_init_blt(&fill, sna,
- 			       pixmap, priv->cpu_bo,
- 			       GXcopy, priv->clear_color,
-@@ -2659,6 +2722,10 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
- 					}
- 				}
- 				sna_damage_add_to_pixmap(&priv->cpu_damage, region, pixmap);
-+				if (priv->flush) {
-+					assert(!priv->shm);
-+					sna_add_flush_pixmap(sna, priv, priv->gpu_bo);
-+				}
- 
- 				if (dx | dy)
- 					RegionTranslate(region, -dx, -dy);
-@@ -2904,17 +2971,22 @@ move_to_cpu:
- 			assert(pixmap->devPrivate.ptr == MAP(priv->cpu_bo->map__cpu));
- 		}
- 
--		assert(pixmap->devKind);
--		do {
--			pixman_fill(pixmap->devPrivate.ptr,
--				    pixmap->devKind/sizeof(uint32_t),
--				    pixmap->drawable.bitsPerPixel,
--				    box->x1, box->y1,
--				    box->x2 - box->x1,
--				    box->y2 - box->y1,
--				    priv->clear_color);
--			box++;
--		} while (--n);
-+		if (sigtrap_get() == 0) {
-+			assert(pixmap->devKind);
-+			sigtrap_assert_active();
-+			do {
-+				pixman_fill(pixmap->devPrivate.ptr,
-+					    pixmap->devKind/sizeof(uint32_t),
-+					    pixmap->drawable.bitsPerPixel,
-+					    box->x1, box->y1,
-+					    box->x2 - box->x1,
-+					    box->y2 - box->y1,
-+					    priv->clear_color);
-+				box++;
-+			} while (--n);
-+			sigtrap_put();
-+		} else
-+			return false;
- 
- clear_done:
- 		if (flags & MOVE_WRITE ||
-@@ -3209,13 +3281,14 @@ __sna_pixmap_for_gpu(struct sna *sna, PixmapPtr pixmap, unsigned flags)
- {
- 	struct sna_pixmap *priv;
- 
-+	assert(flags & (MOVE_READ | MOVE_WRITE | __MOVE_FORCE));
- 	if ((flags & __MOVE_FORCE) == 0 && wedged(sna))
- 		return NULL;
- 
- 	priv = sna_pixmap(pixmap);
- 	if (priv == NULL) {
- 		DBG(("%s: not attached\n", __FUNCTION__));
--		if ((flags & __MOVE_DRI) == 0)
-+		if ((flags & (__MOVE_DRI | __MOVE_SCANOUT)) == 0)
- 			return NULL;
- 
- 		if (pixmap->usage_hint == -1) {
-@@ -3238,6 +3311,44 @@ __sna_pixmap_for_gpu(struct sna *sna, PixmapPtr pixmap, unsigned flags)
- 	return priv;
- }
- 
-+inline static void sna_pixmap_unclean(struct sna *sna,
-+				      struct sna_pixmap *priv,
-+				      unsigned flags)
-+{
-+	struct drm_i915_gem_busy busy;
-+
-+	assert(DAMAGE_IS_ALL(priv->gpu_damage));
-+	assert(priv->gpu_bo);
-+	assert(priv->gpu_bo->proxy == NULL);
-+	assert_pixmap_map(priv->pixmap, priv);
-+
-+	sna_damage_destroy(&priv->cpu_damage);
-+	list_del(&priv->flush_list);
-+
-+	if (flags & (__MOVE_DRI | __MOVE_SCANOUT))
-+		return;
-+
-+	if (!priv->flush || priv->gpu_bo->exec)
-+		return;
-+
-+	busy.handle = priv->gpu_bo->handle;
-+	busy.busy = 0;
-+	ioctl(sna->kgem.fd, DRM_IOCTL_I915_GEM_BUSY, &busy);
-+
-+	DBG(("%s(pixmap=%ld): cleaning foreign bo handle=%u, busy=%x [ring=%d]\n",
-+	     __FUNCTION__,
-+	     priv->pixmap->drawable.serialNumber,
-+	     busy.handle, busy.busy, !!(busy.busy & (0xfffe << 16))));
-+
-+	if (busy.busy) {
-+		unsigned mode = KGEM_RENDER;
-+		if (busy.busy & (0xfffe << 16))
-+			mode = KGEM_BLT;
-+		kgem_bo_mark_busy(&sna->kgem, priv->gpu_bo, mode);
-+	} else
-+		__kgem_bo_clear_busy(priv->gpu_bo);
-+}
-+
- struct sna_pixmap *
- sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, const BoxRec *box, unsigned int flags)
- {
-@@ -3287,12 +3398,14 @@ sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, const BoxRec *box, unsigned int fl
- 	if (priv->cow) {
- 		unsigned cow = flags & (MOVE_READ | MOVE_WRITE | __MOVE_FORCE);
- 
-+		assert(cow);
-+
- 		if ((flags & MOVE_READ) == 0) {
- 			if (priv->gpu_damage) {
- 				r.extents = *box;
- 				r.data = NULL;
- 				if (!region_subsumes_damage(&r, priv->gpu_damage))
--					cow |= MOVE_READ;
-+					cow |= MOVE_READ | __MOVE_FORCE;
- 			}
- 		} else {
- 			if (priv->cpu_damage) {
-@@ -3303,22 +3416,18 @@ sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, const BoxRec *box, unsigned int fl
- 			}
- 		}
- 
--		if (cow) {
--			if (!sna_pixmap_undo_cow(sna, priv, cow))
--				return NULL;
-+		if (!sna_pixmap_undo_cow(sna, priv, cow))
-+			return NULL;
- 
--			if (priv->gpu_bo == NULL)
--				sna_damage_destroy(&priv->gpu_damage);
--		}
-+		if (priv->gpu_bo == NULL)
-+			sna_damage_destroy(&priv->gpu_damage);
- 	}
- 
- 	if (sna_damage_is_all(&priv->gpu_damage,
- 			      pixmap->drawable.width,
- 			      pixmap->drawable.height)) {
--		assert(priv->gpu_bo);
--		assert(priv->gpu_bo->proxy == NULL);
--		sna_damage_destroy(&priv->cpu_damage);
--		list_del(&priv->flush_list);
-+		DBG(("%s: already all-damaged\n", __FUNCTION__));
-+		sna_pixmap_unclean(sna, priv, flags);
- 		goto done;
- 	}
- 
-@@ -3360,10 +3469,7 @@ sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, const BoxRec *box, unsigned int fl
- 		return priv;
- 	}
- 
--	if (priv->shm) {
--		assert(!priv->flush);
--		sna_add_flush_pixmap(sna, priv, priv->cpu_bo);
--	}
-+	add_shm_flush(sna, priv);
- 
- 	assert(priv->cpu_damage);
- 	region_set(&r, box);
-@@ -3527,7 +3633,8 @@ sna_drawable_use_bo(DrawablePtr drawable, unsigned flags, const BoxRec *box,
- 	}
- 
- 	if (priv->cow) {
--		unsigned cow = MOVE_WRITE | MOVE_READ;
-+		unsigned cow = MOVE_WRITE | MOVE_READ | __MOVE_FORCE;
-+		assert(cow);
- 
- 		if (flags & IGNORE_DAMAGE) {
- 			if (priv->gpu_damage) {
-@@ -3717,8 +3824,11 @@ create_gpu_bo:
- 				else
- 					move = MOVE_WRITE | MOVE_READ | MOVE_ASYNC_HINT;
- 
--				if (sna_pixmap_move_to_gpu(pixmap, move))
-+				if (sna_pixmap_move_to_gpu(pixmap, move)) {
-+					sna_damage_all(&priv->gpu_damage,
-+						       pixmap);
- 					goto use_gpu_bo;
-+				}
- 			}
- 
- 			if (DAMAGE_IS_ALL(priv->gpu_damage) ||
-@@ -3934,26 +4044,28 @@ prefer_gpu_bo:
- 			goto move_to_gpu;
- 		}
- 
--		if ((priv->cpu_damage == NULL || flags & IGNORE_DAMAGE)) {
--			if (priv->gpu_bo && priv->gpu_bo->tiling) {
--				DBG(("%s: prefer to use GPU bo for rendering large pixmaps\n", __FUNCTION__));
--				goto prefer_gpu_bo;
-+		if (!priv->shm) {
-+			if ((priv->cpu_damage == NULL || flags & IGNORE_DAMAGE)) {
-+				if (priv->gpu_bo && priv->gpu_bo->tiling) {
-+					DBG(("%s: prefer to use GPU bo for rendering large pixmaps\n", __FUNCTION__));
-+					goto prefer_gpu_bo;
-+				}
-+
-+				if (priv->cpu_bo->pitch >= 4096) {
-+					DBG(("%s: prefer to use GPU bo for rendering wide pixmaps\n", __FUNCTION__));
-+					goto prefer_gpu_bo;
-+				}
- 			}
- 
--			if (priv->cpu_bo->pitch >= 4096) {
--				DBG(("%s: prefer to use GPU bo for rendering wide pixmaps\n", __FUNCTION__));
-+			if ((flags & IGNORE_DAMAGE) == 0 && priv->cpu_bo->snoop) {
-+				DBG(("%s: prefer to use GPU bo for reading from snooped target bo\n", __FUNCTION__));
- 				goto prefer_gpu_bo;
- 			}
--		}
--
--		if ((flags & IGNORE_DAMAGE) == 0 && priv->cpu_bo->snoop) {
--			DBG(("%s: prefer to use GPU bo for reading from snooped target bo\n", __FUNCTION__));
--			goto prefer_gpu_bo;
--		}
- 
--		if (!sna->kgem.can_blt_cpu) {
--			DBG(("%s: can't render to CPU bo, try to use GPU bo\n", __FUNCTION__));
--			goto prefer_gpu_bo;
-+			if (!sna->kgem.can_blt_cpu) {
-+				DBG(("%s: can't render to CPU bo, try to use GPU bo\n", __FUNCTION__));
-+				goto prefer_gpu_bo;
-+			}
- 		}
- 	}
- 
-@@ -3967,9 +4079,7 @@ prefer_gpu_bo:
- 	}
- 
- 	if (priv->shm) {
--		assert(!priv->flush);
--		sna_add_flush_pixmap(sna, priv, priv->cpu_bo);
--
-+		add_shm_flush(sna, priv);
- 		/* As we may have flushed and retired,, recheck for busy bo */
- 		if ((flags & FORCE_GPU) == 0 && !kgem_bo_is_busy(priv->cpu_bo))
- 			return NULL;
-@@ -4019,7 +4129,7 @@ sna_pixmap_create_upload(ScreenPtr screen,
- 	assert(width);
- 	assert(height);
- 
--	if (depth == 1)
-+	if (depth < 8)
- 		return create_pixmap(sna, screen, width, height, depth,
- 				     CREATE_PIXMAP_USAGE_SCRATCH);
- 
-@@ -4121,27 +4231,21 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
- 
- 	if (priv->cow) {
- 		unsigned cow = flags & (MOVE_READ | MOVE_WRITE | __MOVE_FORCE);
-+		assert(cow);
- 		if (flags & MOVE_READ && priv->cpu_damage)
- 			cow |= MOVE_WRITE;
--		if (cow) {
--			if (!sna_pixmap_undo_cow(sna, priv, cow))
--				return NULL;
-+		if (!sna_pixmap_undo_cow(sna, priv, cow))
-+			return NULL;
- 
--			if (priv->gpu_bo == NULL)
--				sna_damage_destroy(&priv->gpu_damage);
--		}
-+		if (priv->gpu_bo == NULL)
-+			sna_damage_destroy(&priv->gpu_damage);
- 	}
- 
- 	if (sna_damage_is_all(&priv->gpu_damage,
- 			      pixmap->drawable.width,
- 			      pixmap->drawable.height)) {
- 		DBG(("%s: already all-damaged\n", __FUNCTION__));
--		assert(DAMAGE_IS_ALL(priv->gpu_damage));
--		assert(priv->gpu_bo);
--		assert(priv->gpu_bo->proxy == NULL);
--		assert_pixmap_map(pixmap, priv);
--		sna_damage_destroy(&priv->cpu_damage);
--		list_del(&priv->flush_list);
-+		sna_pixmap_unclean(sna, priv, flags);
- 		goto active;
- 	}
- 
-@@ -4206,7 +4310,7 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
- 				if (flags & MOVE_INPLACE_HINT || (priv->cpu_damage && priv->cpu_bo == NULL))
- 					create = CREATE_GTT_MAP | CREATE_INACTIVE;
- 				if (flags & __MOVE_PRIME)
--					create |= CREATE_GTT_MAP | CREATE_PRIME | CREATE_EXACT;
-+					create |= CREATE_GTT_MAP | CREATE_SCANOUT | CREATE_PRIME | CREATE_EXACT;
- 
- 				sna_pixmap_alloc_gpu(sna, pixmap, priv, create);
- 			}
-@@ -4282,10 +4386,7 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
- 		goto done;
- 	}
- 
--	if (priv->shm) {
--		assert(!priv->flush);
--		sna_add_flush_pixmap(sna, priv, priv->cpu_bo);
--	}
-+	add_shm_flush(sna, priv);
- 
- 	n = sna_damage_get_boxes(priv->cpu_damage, &box);
- 	assert(n);
-@@ -4534,7 +4635,7 @@ static inline bool box32_trim_and_translate(Box32Rec *box, DrawablePtr d, GCPtr
- 	return box32_clip(box, gc);
- }
- 
--static inline void box_add_pt(BoxPtr box, int16_t x, int16_t y)
-+static inline void box_add_xy(BoxPtr box, int16_t x, int16_t y)
- {
- 	if (box->x1 > x)
- 		box->x1 = x;
-@@ -4547,6 +4648,11 @@ static inline void box_add_pt(BoxPtr box, int16_t x, int16_t y)
- 		box->y2 = y;
- }
- 
-+static inline void box_add_pt(BoxPtr box, const DDXPointRec *pt)
-+{
-+	box_add_xy(box, pt->x, pt->y);
-+}
-+
- static inline bool box32_to_box16(const Box32Rec *b32, BoxRec *b16)
- {
- 	b16->x1 = b32->x1;
-@@ -4864,6 +4970,7 @@ try_upload__inplace(PixmapPtr pixmap, RegionRec *region,
- 	pixmap->devPrivate.ptr = dst;
- 	pixmap->devKind = priv->gpu_bo->pitch;
- 	priv->mapped = dst == MAP(priv->gpu_bo->map__cpu) ? MAPPED_CPU : MAPPED_GTT;
-+	priv->cpu &= priv->mapped == MAPPED_CPU;
- 	assert(has_coherent_ptr(sna, priv, MOVE_WRITE));
- 
- 	box = region_rects(region);
-@@ -4923,8 +5030,7 @@ done:
- 			sna_damage_all(&priv->gpu_damage, pixmap);
- 		}
- 
--		if (priv->shm)
--			sna_add_flush_pixmap(sna, priv, priv->cpu_bo);
-+		add_shm_flush(sna, priv);
- 	}
- 
- 	assert(!priv->clear);
-@@ -5172,6 +5278,16 @@ static inline uint8_t blt_depth(int depth)
- 	}
- }
- 
-+inline static void blt_done(struct sna *sna)
-+{
-+	sna->blt_state.fill_bo = 0;
-+	if (sna->kgem.nbatch && __kgem_ring_empty(&sna->kgem)) {
-+		DBG(("%s: flushing BLT operation on empty ring\n",
-+		     __FUNCTION__));
-+		_kgem_submit(&sna->kgem);
-+	}
-+}
-+
- static bool
- sna_put_xybitmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
- 		     int x, int y, int w, int  h, char *bits)
-@@ -5217,6 +5333,7 @@ sna_put_xybitmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
- 
- 	kgem_set_mode(&sna->kgem, KGEM_BLT, bo);
- 	assert(kgem_bo_can_blt(&sna->kgem, bo));
-+	kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 	/* Region is pre-clipped and translated into pixmap space */
- 	box = region_rects(region);
-@@ -5238,6 +5355,7 @@ sna_put_xybitmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
- 				return false;
- 			_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 		}
-+		kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 		upload = kgem_create_buffer(&sna->kgem,
- 					    bstride*bh,
-@@ -5331,7 +5449,7 @@ sna_put_xybitmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
- 		box++;
- 	} while (--n);
- 
--	sna->blt_state.fill_bo = 0;
-+	blt_done(sna);
- 	return true;
- }
- 
-@@ -5381,6 +5499,7 @@ sna_put_xypixmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
- 
- 	kgem_set_mode(&sna->kgem, KGEM_BLT, bo);
- 	assert(kgem_bo_can_blt(&sna->kgem, bo));
-+	kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 	skip = h * BitmapBytePad(w + left);
- 	for (i = 1 << (gc->depth-1); i; i >>= 1, bits += skip) {
-@@ -5408,6 +5527,7 @@ sna_put_xypixmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
- 					return false;
- 				_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 			}
-+			kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 			upload = kgem_create_buffer(&sna->kgem,
- 						    bstride*bh,
-@@ -5509,7 +5629,7 @@ sna_put_xypixmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
- 		} while (--n);
- 	}
- 
--	sna->blt_state.fill_bo = 0;
-+	blt_done(sna);
- 	return true;
- }
- 
-@@ -5837,7 +5957,7 @@ sna_self_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc,
- 		if (!sna->render.copy_boxes(sna, alu,
- 					    &pixmap->drawable, priv->gpu_bo, sx, sy,
- 					    &pixmap->drawable, priv->gpu_bo, tx, ty,
--					    box, n, 0)) {
-+					    box, n, small_copy(region))) {
- 			DBG(("%s: fallback - accelerated copy boxes failed\n",
- 			     __FUNCTION__));
- 			goto fallback;
-@@ -6098,6 +6218,9 @@ sna_copy_boxes__inplace(struct sna *sna, RegionPtr region, int alu,
- 
- 	kgem_bo_sync__cpu_full(&sna->kgem, src_priv->gpu_bo, FORCE_FULL_SYNC);
- 
-+	if (sigtrap_get())
-+		return false;
-+
- 	box = region_rects(region);
- 	n = region_num_rects(region);
- 	if (src_priv->gpu_bo->tiling) {
-@@ -6137,6 +6260,8 @@ sna_copy_boxes__inplace(struct sna *sna, RegionPtr region, int alu,
- 		}
- 	}
- 
-+	sigtrap_put();
-+
- 	return true;
- 
- upload_inplace:
-@@ -6234,6 +6359,9 @@ upload_inplace:
- 
- 	assert(has_coherent_ptr(sna, src_priv, MOVE_READ));
- 
-+	if (sigtrap_get())
-+		return false;
-+
- 	box = region_rects(region);
- 	n = region_num_rects(region);
- 	if (dst_priv->gpu_bo->tiling) {
-@@ -6265,15 +6393,19 @@ upload_inplace:
- 		} while (--n);
- 
- 		if (!dst_priv->shm) {
--			assert(ptr == MAP(dst_priv->gpu_bo->map__cpu));
- 			dst_pixmap->devPrivate.ptr = ptr;
- 			dst_pixmap->devKind = dst_priv->gpu_bo->pitch;
--			dst_priv->mapped = MAPPED_CPU;
-+			if (ptr == MAP(dst_priv->gpu_bo->map__cpu)) {
-+				dst_priv->mapped = MAPPED_CPU;
-+				dst_priv->cpu = true;
-+			} else
-+				dst_priv->mapped = MAPPED_GTT;
- 			assert_pixmap_map(dst_pixmap, dst_priv);
--			dst_priv->cpu = true;
- 		}
- 	}
- 
-+	sigtrap_put();
-+
- 	return true;
- }
- 
-@@ -6326,6 +6458,16 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc,
- 
- 	assert(region_num_rects(region));
- 
-+	if (src_priv &&
-+	    src_priv->gpu_bo == NULL &&
-+	    src_priv->cpu_bo == NULL &&
-+	    src_priv->ptr == NULL) {
-+		/* Rare but still happens, nothing to copy */
-+		DBG(("%s: src pixmap=%ld is empty\n",
-+		     __FUNCTION__, src_pixmap->drawable.serialNumber));
-+		return;
-+	}
-+
- 	if (src_pixmap == dst_pixmap)
- 		return sna_self_copy_boxes(src, dst, gc,
- 					   region, dx, dy,
-@@ -6491,15 +6633,14 @@ discard_cow:
- 					sna_damage_all(&dst_priv->gpu_damage, dst_pixmap);
- 					sna_damage_destroy(&dst_priv->cpu_damage);
- 					list_del(&dst_priv->flush_list);
--					if (dst_priv->shm)
--						sna_add_flush_pixmap(sna, dst_priv, dst_priv->cpu_bo);
-+					add_shm_flush(sna, dst_priv);
- 					return;
- 				}
- 			}
- 			if (!sna->render.copy_boxes(sna, alu,
- 						    &src_pixmap->drawable, src_priv->gpu_bo, src_dx, src_dy,
- 						    &dst_pixmap->drawable, bo, 0, 0,
--						    box, n, 0)) {
-+						    box, n, small_copy(region))) {
- 				DBG(("%s: fallback - accelerated copy boxes failed\n",
- 				     __FUNCTION__));
- 				goto fallback;
-@@ -6536,7 +6677,7 @@ discard_cow:
- 			if (!sna->render.copy_boxes(sna, alu,
- 						    &src_pixmap->drawable, src_priv->gpu_bo, src_dx, src_dy,
- 						    &dst_pixmap->drawable, bo, 0, 0,
--						    box, n, 0)) {
-+						    box, n, small_copy(region))) {
- 				DBG(("%s: fallback - accelerated copy boxes failed\n",
- 				     __FUNCTION__));
- 				goto fallback;
-@@ -6571,15 +6712,12 @@ discard_cow:
- 			if (replaces && UNDO)
- 				kgem_bo_pair_undo(&sna->kgem, dst_priv->gpu_bo, dst_priv->cpu_bo);
- 
--			if (src_priv->shm) {
--				assert(!src_priv->flush);
--				sna_add_flush_pixmap(sna, src_priv, src_priv->cpu_bo);
--			}
-+			add_shm_flush(sna, src_priv);
- 
- 			if (!sna->render.copy_boxes(sna, alu,
- 						    &src_pixmap->drawable, src_priv->cpu_bo, src_dx, src_dy,
- 						    &dst_pixmap->drawable, bo, 0, 0,
--						    box, n, src_priv->shm ? COPY_LAST : 0)) {
-+						    box, n, small_copy(region) | (src_priv->shm ? COPY_LAST : 0))) {
- 				DBG(("%s: fallback - accelerated copy boxes failed\n",
- 				     __FUNCTION__));
- 				goto fallback;
-@@ -6631,8 +6769,7 @@ discard_cow:
- 				ok = sna->render.copy_boxes(sna, alu,
- 							    &src_pixmap->drawable, src_bo, src_dx, src_dy,
- 							    &dst_pixmap->drawable, bo, 0, 0,
--							    box, n, COPY_LAST);
--
-+							    box, n, small_copy(region) |  COPY_LAST);
- 				kgem_bo_sync__cpu(&sna->kgem, src_bo);
- 				assert(src_bo->rq == NULL);
- 				kgem_bo_destroy(&sna->kgem, src_bo);
-@@ -6780,18 +6917,22 @@ fallback:
- 				return;
- 		}
- 
--		assert(dst_pixmap->devPrivate.ptr);
--		assert(dst_pixmap->devKind);
--		do {
--			pixman_fill(dst_pixmap->devPrivate.ptr,
--				    dst_pixmap->devKind/sizeof(uint32_t),
--				    dst_pixmap->drawable.bitsPerPixel,
--				    box->x1, box->y1,
--				    box->x2 - box->x1,
--				    box->y2 - box->y1,
--				    src_priv->clear_color);
--			box++;
--		} while (--n);
-+		if (sigtrap_get() == 0) {
-+			assert(dst_pixmap->devPrivate.ptr);
-+			assert(dst_pixmap->devKind);
-+			sigtrap_assert_active();
-+			do {
-+				pixman_fill(dst_pixmap->devPrivate.ptr,
-+					    dst_pixmap->devKind/sizeof(uint32_t),
-+					    dst_pixmap->drawable.bitsPerPixel,
-+					    box->x1, box->y1,
-+					    box->x2 - box->x1,
-+					    box->y2 - box->y1,
-+					    src_priv->clear_color);
-+				box++;
-+			} while (--n);
-+			sigtrap_put();
-+		}
- 	} else if (!sna_copy_boxes__inplace(sna, region, alu,
- 					    src_pixmap, src_priv,
- 					    src_dx, src_dy,
-@@ -6848,36 +6989,39 @@ fallback:
- 				((char *)src_pixmap->devPrivate.ptr +
- 				 src_dy * src_stride + src_dx * bpp / 8);
- 
--			do {
--				DBG(("%s: memcpy_blt(box=(%d, %d), (%d, %d), src=(%d, %d), pitches=(%d, %d))\n",
--				     __FUNCTION__,
--				     box->x1, box->y1,
--				     box->x2 - box->x1,
--				     box->y2 - box->y1,
--				     src_dx, src_dy,
--				     src_stride, dst_stride));
--
--				assert(box->x1 >= 0);
--				assert(box->y1 >= 0);
--				assert(box->x2 <= dst_pixmap->drawable.width);
--				assert(box->y2 <= dst_pixmap->drawable.height);
--
--				assert(box->x1 + src_dx >= 0);
--				assert(box->y1 + src_dy >= 0);
--				assert(box->x2 + src_dx <= src_pixmap->drawable.width);
--				assert(box->y2 + src_dy <= src_pixmap->drawable.height);
--				assert(has_coherent_ptr(sna, src_priv, MOVE_READ));
--				assert(has_coherent_ptr(sna, dst_priv, MOVE_WRITE));
--				assert(src_stride);
--				assert(dst_stride);
--				memcpy_blt(src_bits, dst_bits, bpp,
--					   src_stride, dst_stride,
--					   box->x1, box->y1,
--					   box->x1, box->y1,
--					   box->x2 - box->x1,
--					   box->y2 - box->y1);
--				box++;
--			} while (--n);
-+			if (sigtrap_get() == 0) {
-+				do {
-+					DBG(("%s: memcpy_blt(box=(%d, %d), (%d, %d), src=(%d, %d), pitches=(%d, %d))\n",
-+					     __FUNCTION__,
-+					     box->x1, box->y1,
-+					     box->x2 - box->x1,
-+					     box->y2 - box->y1,
-+					     src_dx, src_dy,
-+					     src_stride, dst_stride));
-+
-+					assert(box->x1 >= 0);
-+					assert(box->y1 >= 0);
-+					assert(box->x2 <= dst_pixmap->drawable.width);
-+					assert(box->y2 <= dst_pixmap->drawable.height);
-+
-+					assert(box->x1 + src_dx >= 0);
-+					assert(box->y1 + src_dy >= 0);
-+					assert(box->x2 + src_dx <= src_pixmap->drawable.width);
-+					assert(box->y2 + src_dy <= src_pixmap->drawable.height);
-+					assert(has_coherent_ptr(sna, src_priv, MOVE_READ));
-+					assert(has_coherent_ptr(sna, dst_priv, MOVE_WRITE));
-+					assert(src_stride);
-+					assert(dst_stride);
-+					memcpy_blt(src_bits, dst_bits, bpp,
-+						   src_stride, dst_stride,
-+						   box->x1, box->y1,
-+						   box->x1, box->y1,
-+						   box->x2 - box->x1,
-+						   box->y2 - box->y1);
-+					box++;
-+				} while (--n);
-+				sigtrap_put();
-+			}
- 		} else {
- 			DBG(("%s: fallback -- miCopyRegion\n", __FUNCTION__));
- 
-@@ -6931,7 +7075,8 @@ sna_do_copy(DrawablePtr src, DrawablePtr dst, GCPtr gc,
- 
- 	/* Short cut for unmapped windows */
- 	if (dst->type == DRAWABLE_WINDOW && !((WindowPtr)dst)->realized) {
--		DBG(("%s: unmapped\n", __FUNCTION__));
-+		DBG(("%s: unmapped/unrealized dst (pixmap=%ld)\n",
-+		     __FUNCTION__, get_window_pixmap((WindowPtr)dst)));
- 		return NULL;
- 	}
- 
-@@ -7115,19 +7260,28 @@ sna_copy_area(DrawablePtr src, DrawablePtr dst, GCPtr gc,
- 	if (gc->planemask == 0)
- 		return NULL;
- 
--	DBG(("%s: src=(%d, %d)x(%d, %d)+(%d, %d) -> dst=(%d, %d)+(%d, %d); alu=%d, pm=%lx, depth=%d\n",
-+	if (sna->ignore_copy_area)
-+		return NULL;
-+
-+	DBG(("%s: src=pixmap=%ld:(%d, %d)x(%d, %d)+(%d, %d) -> dst=pixmap=%ld:(%d, %d)+(%d, %d); alu=%d, pm=%lx, depth=%d\n",
- 	     __FUNCTION__,
-+	     get_drawable_pixmap(src)->drawable.serialNumber,
- 	     src_x, src_y, width, height, src->x, src->y,
-+	     get_drawable_pixmap(dst)->drawable.serialNumber,
- 	     dst_x, dst_y, dst->x, dst->y,
- 	     gc->alu, gc->planemask, gc->depth));
- 
- 	if (FORCE_FALLBACK || !ACCEL_COPY_AREA || wedged(sna) ||
--	    !PM_IS_SOLID(dst, gc->planemask) || gc->depth < 8)
-+	    !PM_IS_SOLID(dst, gc->planemask) || gc->depth < 8) {
-+		DBG(("%s: fallback copy\n", __FUNCTION__));
- 		copy = sna_fallback_copy_boxes;
--	else if (src == dst)
-+	} else if (src == dst) {
-+		DBG(("%s: self copy\n", __FUNCTION__));
- 		copy = sna_self_copy_boxes;
--	else
-+	} else {
-+		DBG(("%s: normal copy\n", __FUNCTION__));
- 		copy = sna_copy_boxes;
-+	}
- 
- 	return sna_do_copy(src, dst, gc,
- 			   src_x, src_y,
-@@ -7136,30 +7290,21 @@ sna_copy_area(DrawablePtr src, DrawablePtr dst, GCPtr gc,
- 			   copy, 0, NULL);
- }
- 
--static const BoxRec *
--find_clip_box_for_y(const BoxRec *begin, const BoxRec *end, int16_t y)
-+const BoxRec *
-+__find_clip_box_for_y(const BoxRec *begin, const BoxRec *end, int16_t y)
- {
--    const BoxRec *mid;
--
--    if (end == begin)
--	return end;
--
--    if (end - begin == 1) {
-+	assert(end - begin > 1);
-+	do {
-+		const BoxRec *mid = begin + (end - begin) / 2;
-+		if (mid->y2 > y)
-+			end = mid;
-+		else
-+			begin = mid;
-+	} while (end > begin + 1);
- 	if (begin->y2 > y)
--	    return begin;
-+		return begin;
- 	else
--	    return end;
--    }
--
--    mid = begin + (end - begin) / 2;
--    if (mid->y2 > y)
--	/* If no box is found in [begin, mid], the function
--	 * will return @mid, which is then known to be the
--	 * correct answer.
--	 */
--	return find_clip_box_for_y(begin, mid, y);
--    else
--	return find_clip_box_for_y(mid, end, y);
-+		return end;
- }
- 
- struct sna_fill_spans {
-@@ -8223,6 +8368,8 @@ sna_copy_bitmap_blt(DrawablePtr _bitmap, DrawablePtr drawable, GCPtr gc,
- 	}
- 	br13 |= blt_depth(drawable->depth) << 24;
- 	br13 |= copy_ROP[gc->alu] << 16;
-+	DBG(("%s: target-depth=%d, alu=%d, bg=%08x, fg=%08x\n",
-+	     __FUNCTION__, drawable->depth, gc->alu, gc->bgPixel, gc->fgPixel));
- 
- 	kgem_set_mode(&sna->kgem, KGEM_BLT, arg->bo);
- 	assert(kgem_bo_can_blt(&sna->kgem, arg->bo));
-@@ -8255,6 +8402,7 @@ sna_copy_bitmap_blt(DrawablePtr _bitmap, DrawablePtr drawable, GCPtr gc,
- 					return; /* XXX fallback? */
- 				_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 			}
-+			kgem_bcs_set_tiling(&sna->kgem, NULL, arg->bo);
- 
- 			assert(sna->kgem.mode == KGEM_BLT);
- 			if (sna->kgem.gen >= 0100) {
-@@ -8270,8 +8418,8 @@ sna_copy_bitmap_blt(DrawablePtr _bitmap, DrawablePtr drawable, GCPtr gc,
- 							 I915_GEM_DOMAIN_RENDER |
- 							 KGEM_RELOC_FENCED,
- 							 0);
--				b[5] = gc->bgPixel;
--				b[6] = gc->fgPixel;
-+				b[6] = gc->bgPixel;
-+				b[7] = gc->fgPixel;
- 
- 				dst = (uint8_t *)&b[8];
- 				sna->kgem.nbatch += 8 + src_stride;
-@@ -8322,6 +8470,7 @@ sna_copy_bitmap_blt(DrawablePtr _bitmap, DrawablePtr drawable, GCPtr gc,
- 					return; /* XXX fallback? */
- 				_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 			}
-+			kgem_bcs_set_tiling(&sna->kgem, NULL, arg->bo);
- 
- 			upload = kgem_create_buffer(&sna->kgem,
- 						    bstride*bh,
-@@ -8408,7 +8557,7 @@ sna_copy_bitmap_blt(DrawablePtr _bitmap, DrawablePtr drawable, GCPtr gc,
- 		sna_damage_add_to_pixmap(arg->damage, region, pixmap);
- 	}
- 	assert_pixmap_damage(pixmap);
--	sna->blt_state.fill_bo = 0;
-+	blt_done(sna);
- }
- 
- static void
-@@ -8472,6 +8621,7 @@ sna_copy_plane_blt(DrawablePtr source, DrawablePtr drawable, GCPtr gc,
- 				return; /* XXX fallback? */
- 			_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 		}
-+		kgem_bcs_set_tiling(&sna->kgem, NULL, arg->bo);
- 
- 		upload = kgem_create_buffer(&sna->kgem,
- 					    bstride*bh,
-@@ -8588,6 +8738,8 @@ sna_copy_plane_blt(DrawablePtr source, DrawablePtr drawable, GCPtr gc,
- 				}
- 			}
- 
-+			kgem_bcs_set_tiling(&sna->kgem, upload, arg->bo);
-+
- 			assert(sna->kgem.mode == KGEM_BLT);
- 			b = sna->kgem.batch + sna->kgem.nbatch;
- 			if (sna->kgem.gen >= 0100) {
-@@ -8641,7 +8793,7 @@ sna_copy_plane_blt(DrawablePtr source, DrawablePtr drawable, GCPtr gc,
- 		sna_damage_add_to_pixmap(arg->damage, region, dst_pixmap);
- 	}
- 	assert_pixmap_damage(dst_pixmap);
--	sna->blt_state.fill_bo = 0;
-+	blt_done(sna);
- }
- 
- static RegionPtr
-@@ -8895,36 +9047,11 @@ sna_poly_point_extents(DrawablePtr drawable, GCPtr gc,
- 			last.x += pt->x;
- 			last.y += pt->y;
- 			pt++;
--			box_add_pt(&box, last.x, last.y);
-+			box_add_xy(&box, last.x, last.y);
- 		}
- 	} else {
--		--n; ++pt;
--		while (n >= 8) {
--			box_add_pt(&box, pt[0].x, pt[0].y);
--			box_add_pt(&box, pt[1].x, pt[1].y);
--			box_add_pt(&box, pt[2].x, pt[2].y);
--			box_add_pt(&box, pt[3].x, pt[3].y);
--			box_add_pt(&box, pt[4].x, pt[4].y);
--			box_add_pt(&box, pt[5].x, pt[5].y);
--			box_add_pt(&box, pt[6].x, pt[6].y);
--			box_add_pt(&box, pt[7].x, pt[7].y);
--			pt += 8;
--			n -= 8;
--		}
--		if (n & 4) {
--			box_add_pt(&box, pt[0].x, pt[0].y);
--			box_add_pt(&box, pt[1].x, pt[1].y);
--			box_add_pt(&box, pt[2].x, pt[2].y);
--			box_add_pt(&box, pt[3].x, pt[3].y);
--			pt += 4;
--		}
--		if (n & 2) {
--			box_add_pt(&box, pt[0].x, pt[0].y);
--			box_add_pt(&box, pt[1].x, pt[1].y);
--			pt += 2;
--		}
--		if (n & 1)
--			box_add_pt(&box, pt[0].x, pt[0].y);
-+		while (--n)
-+			box_add_pt(&box, ++pt);
- 	}
- 	box.x2++;
- 	box.y2++;
-@@ -9636,7 +9763,7 @@ sna_poly_line_extents(DrawablePtr drawable, GCPtr gc,
- 			y += pt->y;
- 			if (blt)
- 				blt &= pt->x == 0 || pt->y == 0;
--			box_add_pt(&box, x, y);
-+			box_add_xy(&box, x, y);
- 		}
- 	} else {
- 		int x = box.x1;
-@@ -9648,7 +9775,7 @@ sna_poly_line_extents(DrawablePtr drawable, GCPtr gc,
- 				x = pt->x;
- 				y = pt->y;
- 			}
--			box_add_pt(&box, pt->x, pt->y);
-+			box_add_pt(&box, pt);
- 		}
- 	}
- 	box.x2++;
-@@ -10037,7 +10164,7 @@ out:
- 	RegionUninit(&data.region);
- }
- 
--static inline void box_from_seg(BoxPtr b, const xSegment *seg, GCPtr gc)
-+static inline bool box_from_seg(BoxPtr b, const xSegment *seg, GCPtr gc)
- {
- 	if (seg->x1 == seg->x2) {
- 		if (seg->y1 > seg->y2) {
-@@ -10051,6 +10178,9 @@ static inline void box_from_seg(BoxPtr b, const xSegment *seg, GCPtr gc)
- 			if (gc->capStyle != CapNotLast)
- 				b->y2++;
- 		}
-+		if (b->y1 >= b->y2)
-+			return false;
-+
- 		b->x1 = seg->x1;
- 		b->x2 = seg->x1 + 1;
- 	} else {
-@@ -10065,6 +10195,9 @@ static inline void box_from_seg(BoxPtr b, const xSegment *seg, GCPtr gc)
- 			if (gc->capStyle != CapNotLast)
- 				b->x2++;
- 		}
-+		if (b->x1 >= b->x2)
-+			return false;
-+
- 		b->y1 = seg->y1;
- 		b->y2 = seg->y1 + 1;
- 	}
-@@ -10073,6 +10206,7 @@ static inline void box_from_seg(BoxPtr b, const xSegment *seg, GCPtr gc)
- 	     __FUNCTION__,
- 	     seg->x1, seg->y1, seg->x2, seg->y2,
- 	     b->x1, b->y1, b->x2, b->y2));
-+	return true;
- }
- 
- static bool
-@@ -10107,12 +10241,13 @@ sna_poly_segment_blt(DrawablePtr drawable,
- 					nbox = ARRAY_SIZE(boxes);
- 				n -= nbox;
- 				do {
--					box_from_seg(b, seg++, gc);
--					if (b->y2 > b->y1 && b->x2 > b->x1) {
-+					if (box_from_seg(b, seg++, gc)) {
-+						assert(!box_empty(b));
- 						b->x1 += dx;
- 						b->x2 += dx;
- 						b->y1 += dy;
- 						b->y2 += dy;
-+						assert(!box_empty(b));
- 						b++;
- 					}
- 				} while (--nbox);
-@@ -10131,7 +10266,10 @@ sna_poly_segment_blt(DrawablePtr drawable,
- 					nbox = ARRAY_SIZE(boxes);
- 				n -= nbox;
- 				do {
--					box_from_seg(b++, seg++, gc);
-+					if (box_from_seg(b, seg++, gc)) {
-+						assert(!box_empty(b));
-+						b++;
-+					}
- 				} while (--nbox);
- 
- 				if (b != boxes) {
-@@ -10156,7 +10294,10 @@ sna_poly_segment_blt(DrawablePtr drawable,
- 			do {
- 				BoxRec box;
- 
--				box_from_seg(&box, seg++, gc);
-+				if (!box_from_seg(&box, seg++, gc))
-+					continue;
-+
-+				assert(!box_empty(&box));
- 				box.x1 += drawable->x;
- 				box.x2 += drawable->x;
- 				box.y1 += drawable->y;
-@@ -10174,6 +10315,7 @@ sna_poly_segment_blt(DrawablePtr drawable,
- 						b->x2 += dx;
- 						b->y1 += dy;
- 						b->y2 += dy;
-+						assert(!box_empty(b));
- 						if (++b == last_box) {
- 							fill.boxes(sna, &fill, boxes, last_box-boxes);
- 							if (damage)
-@@ -10185,7 +10327,10 @@ sna_poly_segment_blt(DrawablePtr drawable,
- 			} while (--n);
- 		} else {
- 			do {
--				box_from_seg(b, seg++, gc);
-+				if (!box_from_seg(b, seg++, gc))
-+					continue;
-+
-+				assert(!box_empty(b));
- 				b->x1 += drawable->x;
- 				b->x2 += drawable->x;
- 				b->y1 += drawable->y;
-@@ -10195,6 +10340,7 @@ sna_poly_segment_blt(DrawablePtr drawable,
- 					b->x2 += dx;
- 					b->y1 += dy;
- 					b->y2 += dy;
-+					assert(!box_empty(b));
- 					if (++b == last_box) {
- 						fill.boxes(sna, &fill, boxes, last_box-boxes);
- 						if (damage)
-@@ -10319,8 +10465,11 @@ sna_poly_zero_segment_blt(DrawablePtr drawable,
- 				}
- 				b->x2++;
- 				b->y2++;
--				if (oc1 | oc2)
--					box_intersect(b, extents);
-+
-+				if ((oc1 | oc2) && !box_intersect(b, extents))
-+					continue;
-+
-+				assert(!box_empty(b));
- 				if (++b == last_box) {
- 					ret = &&rectangle_continue;
- 					goto *jump;
-@@ -10383,6 +10532,7 @@ rectangle_continue:
- 						     __FUNCTION__, x1, y1,
- 						     b->x1, b->y1, b->x2, b->y2));
- 
-+						assert(!box_empty(b));
- 						if (++b == last_box) {
- 							ret = &&X_continue;
- 							goto *jump;
-@@ -10407,6 +10557,7 @@ X_continue:
- 						b->x2 = x1 + 1;
- 					b->y2 = b->y1 + 1;
- 
-+					assert(!box_empty(b));
- 					if (++b == last_box) {
- 						ret = &&X2_continue;
- 						goto *jump;
-@@ -10468,6 +10619,7 @@ X2_continue:
- 							b->y2 = y1 + 1;
- 						b->x2 = x1 + 1;
- 
-+						assert(!box_empty(b));
- 						if (++b == last_box) {
- 							ret = &&Y_continue;
- 							goto *jump;
-@@ -10491,6 +10643,7 @@ Y_continue:
- 						b->y2 = y1 + 1;
- 					b->x2 = x1 + 1;
- 
-+					assert(!box_empty(b));
- 					if (++b == last_box) {
- 						ret = &&Y2_continue;
- 						goto *jump;
-@@ -11785,14 +11938,29 @@ sna_poly_fill_rect_blt(DrawablePtr drawable,
- 				if (nbox > ARRAY_SIZE(boxes))
- 					nbox = ARRAY_SIZE(boxes);
- 				n -= nbox;
--				do {
-+				while (nbox >= 2) {
-+					b[0].x1 = rect[0].x + dx;
-+					b[0].y1 = rect[0].y + dy;
-+					b[0].x2 = b[0].x1 + rect[0].width;
-+					b[0].y2 = b[0].y1 + rect[0].height;
-+
-+					b[1].x1 = rect[1].x + dx;
-+					b[1].y1 = rect[1].y + dy;
-+					b[1].x2 = b[1].x1 + rect[1].width;
-+					b[1].y2 = b[1].y1 + rect[1].height;
-+
-+					b += 2;
-+					rect += 2;
-+					nbox -= 2;
-+				}
-+				if (nbox) {
- 					b->x1 = rect->x + dx;
- 					b->y1 = rect->y + dy;
- 					b->x2 = b->x1 + rect->width;
- 					b->y2 = b->y1 + rect->height;
- 					b++;
- 					rect++;
--				} while (--nbox);
-+				}
- 				fill.boxes(sna, &fill, boxes, b-boxes);
- 				b = boxes;
- 			} while (n);
-@@ -11802,14 +11970,29 @@ sna_poly_fill_rect_blt(DrawablePtr drawable,
- 				if (nbox > ARRAY_SIZE(boxes))
- 					nbox = ARRAY_SIZE(boxes);
- 				n -= nbox;
--				do {
-+				while (nbox >= 2) {
-+					b[0].x1 = rect[0].x;
-+					b[0].y1 = rect[0].y;
-+					b[0].x2 = b[0].x1 + rect[0].width;
-+					b[0].y2 = b[0].y1 + rect[0].height;
-+
-+					b[1].x1 = rect[1].x;
-+					b[1].y1 = rect[1].y;
-+					b[1].x2 = b[1].x1 + rect[1].width;
-+					b[1].y2 = b[1].y1 + rect[1].height;
-+
-+					b += 2;
-+					rect += 2;
-+					nbox -= 2;
-+				}
-+				if (nbox) {
- 					b->x1 = rect->x;
- 					b->y1 = rect->y;
- 					b->x2 = b->x1 + rect->width;
- 					b->y2 = b->y1 + rect->height;
- 					b++;
- 					rect++;
--				} while (--nbox);
-+				}
- 				fill.boxes(sna, &fill, boxes, b-boxes);
- 				b = boxes;
- 			} while (n);
-@@ -12192,6 +12375,7 @@ sna_poly_fill_rect_tiled_8x8_blt(DrawablePtr drawable,
- 			return false;
- 		_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 	}
-+	kgem_bcs_set_tiling(&sna->kgem, tile_bo, bo);
- 
- 	get_drawable_deltas(drawable, pixmap, &dx, &dy);
- 	assert(extents->x1 + dx >= 0);
-@@ -12335,6 +12519,7 @@ sna_poly_fill_rect_tiled_8x8_blt(DrawablePtr drawable,
- 
- 			_kgem_submit(&sna->kgem);
- 			_kgem_set_mode(&sna->kgem, KGEM_BLT);
-+			kgem_bcs_set_tiling(&sna->kgem, tile_bo, bo);
- 		} while (1);
- 	} else {
- 		RegionRec clip;
-@@ -12403,6 +12588,7 @@ sna_poly_fill_rect_tiled_8x8_blt(DrawablePtr drawable,
- 					if (!kgem_check_batch(&sna->kgem, 3)) {
- 						_kgem_submit(&sna->kgem);
- 						_kgem_set_mode(&sna->kgem, KGEM_BLT);
-+						kgem_bcs_set_tiling(&sna->kgem, tile_bo, bo);
- 
- 						unwind_batch = sna->kgem.nbatch;
- 						unwind_reloc = sna->kgem.nreloc;
-@@ -12499,6 +12685,7 @@ sna_poly_fill_rect_tiled_8x8_blt(DrawablePtr drawable,
- 							DBG(("%s: emitting split batch\n", __FUNCTION__));
- 							_kgem_submit(&sna->kgem);
- 							_kgem_set_mode(&sna->kgem, KGEM_BLT);
-+							kgem_bcs_set_tiling(&sna->kgem, tile_bo, bo);
- 
- 							unwind_batch = sna->kgem.nbatch;
- 							unwind_reloc = sna->kgem.nreloc;
-@@ -12572,7 +12759,7 @@ sna_poly_fill_rect_tiled_8x8_blt(DrawablePtr drawable,
- 	}
- done:
- 	assert_pixmap_damage(pixmap);
--	sna->blt_state.fill_bo = 0;
-+	blt_done(sna);
- 	return true;
- }
- 
-@@ -13128,6 +13315,7 @@ sna_poly_fill_rect_stippled_8x8_blt(DrawablePtr drawable,
- 			return false;
- 		_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 	}
-+	kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 	if (!clipped) {
- 		dx += drawable->x;
-@@ -13240,6 +13428,7 @@ sna_poly_fill_rect_stippled_8x8_blt(DrawablePtr drawable,
- 
- 			_kgem_submit(&sna->kgem);
- 			_kgem_set_mode(&sna->kgem, KGEM_BLT);
-+			kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 		} while (1);
- 	} else {
- 		RegionRec clip;
-@@ -13297,6 +13486,7 @@ sna_poly_fill_rect_stippled_8x8_blt(DrawablePtr drawable,
- 					if (!kgem_check_batch(&sna->kgem, 3)) {
- 						_kgem_submit(&sna->kgem);
- 						_kgem_set_mode(&sna->kgem, KGEM_BLT);
-+						kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 						assert(sna->kgem.mode == KGEM_BLT);
- 						b = sna->kgem.batch + sna->kgem.nbatch;
-@@ -13369,6 +13559,7 @@ sna_poly_fill_rect_stippled_8x8_blt(DrawablePtr drawable,
- 						if (!kgem_check_batch(&sna->kgem, 3)) {
- 							_kgem_submit(&sna->kgem);
- 							_kgem_set_mode(&sna->kgem, KGEM_BLT);
-+							kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 							assert(sna->kgem.mode == KGEM_BLT);
- 							b = sna->kgem.batch + sna->kgem.nbatch;
-@@ -13419,7 +13610,7 @@ sna_poly_fill_rect_stippled_8x8_blt(DrawablePtr drawable,
- 	}
- 
- 	assert_pixmap_damage(pixmap);
--	sna->blt_state.fill_bo = 0;
-+	blt_done(sna);
- 	return true;
- }
- 
-@@ -13499,6 +13690,7 @@ sna_poly_fill_rect_stippled_1_blt(DrawablePtr drawable,
- 	get_drawable_deltas(drawable, pixmap, &dx, &dy);
- 	kgem_set_mode(&sna->kgem, KGEM_BLT, bo);
- 	assert(kgem_bo_can_blt(&sna->kgem, bo));
-+	kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 	br00 = 3 << 20;
- 	br13 = bo->pitch;
-@@ -13543,6 +13735,7 @@ sna_poly_fill_rect_stippled_1_blt(DrawablePtr drawable,
- 						return false;
- 					_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 				}
-+				kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 				assert(sna->kgem.mode == KGEM_BLT);
- 				b = sna->kgem.batch + sna->kgem.nbatch;
-@@ -13606,6 +13799,7 @@ sna_poly_fill_rect_stippled_1_blt(DrawablePtr drawable,
- 						return false;
- 					_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 				}
-+				kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 				upload = kgem_create_buffer(&sna->kgem,
- 							    bstride*bh,
-@@ -13736,6 +13930,7 @@ sna_poly_fill_rect_stippled_1_blt(DrawablePtr drawable,
- 							return false;
- 						_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 					}
-+					kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 					assert(sna->kgem.mode == KGEM_BLT);
- 					b = sna->kgem.batch + sna->kgem.nbatch;
-@@ -13797,6 +13992,7 @@ sna_poly_fill_rect_stippled_1_blt(DrawablePtr drawable,
- 							return false;
- 						_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 					}
-+					kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 					upload = kgem_create_buffer(&sna->kgem,
- 								    bstride*bh,
-@@ -13927,6 +14123,7 @@ sna_poly_fill_rect_stippled_1_blt(DrawablePtr drawable,
- 								return false;
- 							_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 						}
-+						kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 						assert(sna->kgem.mode == KGEM_BLT);
- 						b = sna->kgem.batch + sna->kgem.nbatch;
-@@ -13987,6 +14184,7 @@ sna_poly_fill_rect_stippled_1_blt(DrawablePtr drawable,
- 								return false;
- 							_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 						}
-+						kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 						upload = kgem_create_buffer(&sna->kgem,
- 									    bstride*bh,
-@@ -14064,7 +14262,7 @@ sna_poly_fill_rect_stippled_1_blt(DrawablePtr drawable,
- 		}
- 	}
- 
--	sna->blt_state.fill_bo = 0;
-+	blt_done(sna);
- 	return true;
- }
- 
-@@ -14126,6 +14324,7 @@ sna_poly_fill_rect_stippled_n_box__imm(struct sna *sna,
- 					return; /* XXX fallback? */
- 				_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 			}
-+			kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 			assert(sna->kgem.mode == KGEM_BLT);
- 			b = sna->kgem.batch + sna->kgem.nbatch;
-@@ -14251,6 +14450,7 @@ sna_poly_fill_rect_stippled_n_box(struct sna *sna,
- 					return; /* XXX fallback? */
- 				_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 			}
-+			kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 			assert(sna->kgem.mode == KGEM_BLT);
- 			b = sna->kgem.batch + sna->kgem.nbatch;
-@@ -14414,6 +14614,7 @@ sna_poly_fill_rect_stippled_n_blt__imm(DrawablePtr drawable,
- 	get_drawable_deltas(drawable, pixmap, &dx, &dy);
- 	kgem_set_mode(&sna->kgem, KGEM_BLT, bo);
- 	assert(kgem_bo_can_blt(&sna->kgem, bo));
-+	kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 	br00 = XY_MONO_SRC_COPY_IMM | 3 << 20;
- 	br13 = bo->pitch;
-@@ -14526,7 +14727,7 @@ sna_poly_fill_rect_stippled_n_blt__imm(DrawablePtr drawable,
- 	}
- 
- 	assert_pixmap_damage(pixmap);
--	sna->blt_state.fill_bo = 0;
-+	blt_done(sna);
- 	return true;
- }
- 
-@@ -14559,6 +14760,7 @@ sna_poly_fill_rect_stippled_n_blt(DrawablePtr drawable,
- 	get_drawable_deltas(drawable, pixmap, &dx, &dy);
- 	kgem_set_mode(&sna->kgem, KGEM_BLT, bo);
- 	assert(kgem_bo_can_blt(&sna->kgem, bo));
-+	kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 	br00 = XY_MONO_SRC_COPY | 3 << 20;
- 	br13 = bo->pitch;
-@@ -14673,7 +14875,7 @@ sna_poly_fill_rect_stippled_n_blt(DrawablePtr drawable,
- 	assert_pixmap_damage(pixmap);
- 	if (tile)
- 		kgem_bo_destroy(&sna->kgem, tile);
--	sna->blt_state.fill_bo = 0;
-+	blt_done(sna);
- 	return true;
- }
- 
-@@ -15281,6 +15483,7 @@ sna_glyph_blt(DrawablePtr drawable, GCPtr gc,
- 		}
- 		_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 	}
-+	kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 	DBG(("%s: glyph clip box (%d, %d), (%d, %d)\n",
- 	     __FUNCTION__,
-@@ -15368,6 +15571,7 @@ sna_glyph_blt(DrawablePtr drawable, GCPtr gc,
- 			if (!kgem_check_batch(&sna->kgem, 3+len)) {
- 				_kgem_submit(&sna->kgem);
- 				_kgem_set_mode(&sna->kgem, KGEM_BLT);
-+				kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 				DBG(("%s: new batch, glyph clip box (%d, %d), (%d, %d)\n",
- 				     __FUNCTION__,
-@@ -15479,7 +15683,7 @@ skip:
- 	}
- 
- 	assert_pixmap_damage(pixmap);
--	sna->blt_state.fill_bo = 0;
-+	blt_done(sna);
- 	return true;
- }
- 
-@@ -16002,6 +16206,7 @@ sna_reversed_glyph_blt(DrawablePtr drawable, GCPtr gc,
- 		}
- 		_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 	}
-+	kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 	unwind_batch = sna->kgem.nbatch;
- 	unwind_reloc = sna->kgem.nreloc;
-@@ -16111,6 +16316,7 @@ sna_reversed_glyph_blt(DrawablePtr drawable, GCPtr gc,
- 			if (!kgem_check_batch(&sna->kgem, 3+len)) {
- 				_kgem_submit(&sna->kgem);
- 				_kgem_set_mode(&sna->kgem, KGEM_BLT);
-+				kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 				unwind_batch = sna->kgem.nbatch;
- 				unwind_reloc = sna->kgem.nreloc;
-@@ -16229,7 +16435,7 @@ skip:
- 	}
- 
- 	assert_pixmap_damage(pixmap);
--	sna->blt_state.fill_bo = 0;
-+	blt_done(sna);
- 	return true;
- }
- 
-@@ -16450,6 +16656,7 @@ sna_push_pixels_solid_blt(GCPtr gc,
- 
- 	kgem_set_mode(&sna->kgem, KGEM_BLT, bo);
- 	assert(kgem_bo_can_blt(&sna->kgem, bo));
-+	kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 	/* Region is pre-clipped and translated into pixmap space */
- 	box = region_rects(region);
-@@ -16471,6 +16678,7 @@ sna_push_pixels_solid_blt(GCPtr gc,
- 				return false;
- 			_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 		}
-+		kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 		upload = kgem_create_buffer(&sna->kgem,
- 					    bstride*bh,
-@@ -16564,7 +16772,7 @@ sna_push_pixels_solid_blt(GCPtr gc,
- 		box++;
- 	} while (--n);
- 
--	sna->blt_state.fill_bo = 0;
-+	blt_done(sna);
- 	return true;
- }
- 
-@@ -16754,7 +16962,9 @@ static int sna_create_gc(GCPtr gc)
- 
- 	gc->freeCompClip = 0;
- 	gc->pCompositeClip = 0;
-+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,19,99,1,0)
- 	gc->pRotatedPixmap = 0;
-+#endif
- 
- 	fb_gc(gc)->bpp = bits_per_pixel(gc->depth);
- 
-@@ -16789,7 +16999,8 @@ sna_get_image__inplace(PixmapPtr pixmap,
- 		break;
- 	}
- 
--	if (!kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo, FORCE_FULL_SYNC))
-+	if ((flags & MOVE_INPLACE_HINT) == 0 &&
-+	    !kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo, FORCE_FULL_SYNC))
- 		return false;
- 
- 	if (idle && __kgem_bo_is_busy(&sna->kgem, priv->gpu_bo))
-@@ -16801,11 +17012,19 @@ sna_get_image__inplace(PixmapPtr pixmap,
- 	assert(sna_damage_contains_box(&priv->gpu_damage, &region->extents) == PIXMAN_REGION_IN);
- 	assert(sna_damage_contains_box(&priv->cpu_damage, &region->extents) == PIXMAN_REGION_OUT);
- 
--	src = kgem_bo_map__cpu(&sna->kgem, priv->gpu_bo);
--	if (src == NULL)
--		return false;
-+	if (kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo, FORCE_FULL_SYNC)) {
-+		src = kgem_bo_map__cpu(&sna->kgem, priv->gpu_bo);
-+		if (src == NULL)
-+			return false;
- 
--	kgem_bo_sync__cpu_full(&sna->kgem, priv->gpu_bo, FORCE_FULL_SYNC);
-+		kgem_bo_sync__cpu_full(&sna->kgem, priv->gpu_bo, FORCE_FULL_SYNC);
-+	} else {
-+		src = kgem_bo_map__wc(&sna->kgem, priv->gpu_bo);
-+		if (src == NULL)
-+			return false;
-+
-+		kgem_bo_sync__gtt(&sna->kgem, priv->gpu_bo);
-+	}
- 
- 	if (sigtrap_get())
- 		return false;
-@@ -16833,12 +17052,11 @@ sna_get_image__inplace(PixmapPtr pixmap,
- 			   region->extents.x2 - region->extents.x1,
- 			   region->extents.y2 - region->extents.y1);
- 		if (!priv->shm) {
--			assert(src == MAP(priv->gpu_bo->map__cpu));
- 			pixmap->devPrivate.ptr = src;
- 			pixmap->devKind = priv->gpu_bo->pitch;
--			priv->mapped = MAPPED_CPU;
-+			priv->mapped = src == MAP(priv->gpu_bo->map__cpu) ? MAPPED_CPU : MAPPED_GTT;
- 			assert_pixmap_map(pixmap, priv);
--			priv->cpu = true;
-+			priv->cpu &= priv->mapped == MAPPED_CPU;
- 		}
- 	}
- 
-@@ -16930,7 +17148,7 @@ sna_get_image__fast(PixmapPtr pixmap,
- 	if (priv == NULL || priv->gpu_damage == NULL)
- 		return false;
- 
--	if (priv->clear) {
-+	if (priv->clear && sigtrap_get() == 0) {
- 		int w = region->extents.x2 - region->extents.x1;
- 		int h = region->extents.y2 - region->extents.y1;
- 		int pitch = PixmapBytePad(w, pixmap->drawable.depth);
-@@ -16939,6 +17157,7 @@ sna_get_image__fast(PixmapPtr pixmap,
- 		     __FUNCTION__, priv->clear_color));
- 		assert(DAMAGE_IS_ALL(priv->gpu_damage));
- 		assert(priv->cpu_damage == NULL);
-+		sigtrap_assert_active();
- 
- 		if (priv->clear_color == 0 ||
- 		    pixmap->drawable.bitsPerPixel == 8 ||
-@@ -16955,6 +17174,7 @@ sna_get_image__fast(PixmapPtr pixmap,
- 				    priv->clear_color);
- 		}
- 
-+		sigtrap_put();
- 		return true;
- 	}
- 
-@@ -17001,8 +17221,7 @@ sna_get_image(DrawablePtr drawable,
- 	if (ACCEL_GET_IMAGE &&
- 	    !FORCE_FALLBACK &&
- 	    format == ZPixmap &&
--	    drawable->bitsPerPixel >= 8 &&
--	    PM_IS_SOLID(drawable, mask)) {
-+	    drawable->bitsPerPixel >= 8) {
- 		PixmapPtr pixmap = get_drawable_pixmap(drawable);
- 		int16_t dx, dy;
- 
-@@ -17014,7 +17233,7 @@ sna_get_image(DrawablePtr drawable,
- 		region.data = NULL;
- 
- 		if (sna_get_image__fast(pixmap, &region, dst, flags))
--			return;
-+			goto apply_planemask;
- 
- 		if (!sna_drawable_move_region_to_cpu(&pixmap->drawable,
- 						     &region, flags))
-@@ -17032,6 +17251,16 @@ sna_get_image(DrawablePtr drawable,
- 				   region.extents.x1, region.extents.y1, 0, 0, w, h);
- 			sigtrap_put();
- 		}
-+
-+apply_planemask:
-+		if (!PM_IS_SOLID(drawable, mask)) {
-+			FbStip pm = fbReplicatePixel(mask, drawable->bitsPerPixel);
-+			FbStip *d = (FbStip *)dst;
-+			int i, n = PixmapBytePad(w, drawable->depth) / sizeof(FbStip) * h;
-+
-+			for (i = 0; i < n; i++)
-+				d[i] &= pm;
-+		}
- 	} else {
- 		region.extents.x1 = x + drawable->x;
- 		region.extents.y1 = y + drawable->y;
-@@ -17162,17 +17391,19 @@ void sna_accel_flush(struct sna *sna)
- 				__sna_free_pixmap(sna, priv->pixmap, priv);
- 			}
- 		} else {
-+			unsigned hints;
- 			DBG(("%s: flushing DRI pixmap=%ld\n", __FUNCTION__,
- 			     priv->pixmap->drawable.serialNumber));
- 			assert(priv->flush);
--			if (sna_pixmap_move_to_gpu(priv->pixmap,
--						   MOVE_READ | __MOVE_FORCE)) {
--				if (priv->flush & IS_CLIPPED) {
-+			hints = MOVE_READ | __MOVE_FORCE;
-+			if (priv->flush & FLUSH_WRITE)
-+				hints |= MOVE_WRITE;
-+			if (sna_pixmap_move_to_gpu(priv->pixmap, hints)) {
-+				if (priv->flush & FLUSH_WRITE) {
- 					kgem_bo_unclean(&sna->kgem, priv->gpu_bo);
- 					sna_damage_all(&priv->gpu_damage, priv->pixmap);
- 					assert(priv->cpu_damage == NULL);
--					priv->clear = false;
--					priv->cpu = false;
-+					assert(priv->clear == false);
- 				}
- 			}
- 		}
-@@ -17184,10 +17415,46 @@ void sna_accel_flush(struct sna *sna)
- }
- 
- static void
--sna_accel_flush_callback(CallbackListPtr *list,
--			 pointer user_data, pointer call_data)
-+sna_shm_flush_callback(CallbackListPtr *list,
-+		       pointer user_data, pointer call_data)
- {
--	sna_accel_flush(user_data);
-+	struct sna *sna = user_data;
-+
-+	if (!sna->needs_shm_flush)
-+		return;
-+
-+	sna_accel_flush(sna);
-+	sna->needs_shm_flush = false;
-+}
-+
-+static void
-+sna_flush_callback(CallbackListPtr *list, pointer user_data, pointer call_data)
-+{
-+	struct sna *sna = user_data;
-+
-+	if (!sna->needs_dri_flush)
-+		return;
-+
-+	sna_accel_flush(sna);
-+	sna->needs_dri_flush = false;
-+}
-+
-+static void
-+sna_event_callback(CallbackListPtr *list, pointer user_data, pointer call_data)
-+{
-+	EventInfoRec *eventinfo = call_data;
-+	struct sna *sna = user_data;
-+	int i;
-+
-+	if (sna->needs_dri_flush)
-+		return;
-+
-+	for (i = 0; i < eventinfo->count; i++) {
-+		if (eventinfo->events[i].u.u.type == sna->damage_event) {
-+			sna->needs_dri_flush = true;
-+			return;
-+		}
-+	}
- }
- 
- static struct sna_pixmap *sna_accel_scanout(struct sna *sna)
-@@ -17199,6 +17466,7 @@ static struct sna_pixmap *sna_accel_scanout(struct sna *sna)
- 
- 	assert(sna->vblank_interval);
- 	assert(sna->front);
-+	assert(!sna->mode.hidden);
- 
- 	priv = sna_pixmap(sna->front);
- 	if (priv->gpu_bo == NULL)
-@@ -17217,7 +17485,7 @@ static void sna_accel_disarm_timer(struct sna *sna, int id)
- static bool has_offload_slaves(struct sna *sna)
- {
- #if HAS_PIXMAP_SHARING
--	ScreenPtr screen = sna->scrn->pScreen;
-+	ScreenPtr screen = to_screen_from_sna(sna);
- 	PixmapDirtyUpdatePtr dirty;
- 
- 	xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) {
-@@ -17231,11 +17499,14 @@ static bool has_offload_slaves(struct sna *sna)
- 
- static bool has_shadow(struct sna *sna)
- {
--	DamagePtr damage = sna->mode.shadow_damage;
-+	DamagePtr damage;
- 
--	if (damage == NULL)
-+	if (!sna->mode.shadow_enabled)
- 		return false;
- 
-+	damage = sna->mode.shadow_damage;
-+	assert(damage);
-+
- 	DBG(("%s: has pending damage? %d, outstanding flips: %d\n",
- 	     __FUNCTION__,
- 	     RegionNotEmpty(DamageRegion(damage)),
-@@ -17365,9 +17636,8 @@ static bool sna_accel_do_expire(struct sna *sna)
- static void sna_accel_post_damage(struct sna *sna)
- {
- #if HAS_PIXMAP_SHARING
--	ScreenPtr screen = sna->scrn->pScreen;
-+	ScreenPtr screen = to_screen_from_sna(sna);
- 	PixmapDirtyUpdatePtr dirty;
--	bool flush = false;
- 
- 	xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) {
- 		RegionRec region, *damage;
-@@ -17376,8 +17646,6 @@ static void sna_accel_post_damage(struct sna *sna)
- 		int16_t dx, dy;
- 		int n;
- 
--		assert(dirty->src == sna->front);
--
- 		damage = DamageRegion(dirty->damage);
- 		if (RegionNil(damage))
- 			continue;
-@@ -17477,7 +17745,14 @@ fallback:
- 						    box, n, COPY_LAST))
- 				goto fallback;
- 
--			flush = true;
-+			/* Before signalling the slave via ProcessPending,
-+			 * ensure not only the batch is submitted as the
-+			 * slave may be using the Damage callback to perform
-+			 * its copy, but also that the memory must be coherent
-+			 * - we need to treat it as uncached for the PCI slave
-+			 * will bypass LLC.
-+			 */
-+			kgem_bo_sync__gtt(&sna->kgem, __sna_pixmap_get_bo(dst));
- 		}
- 
- 		DamageRegionProcessPending(&dirty->slave_dst->drawable);
-@@ -17485,8 +17760,6 @@ skip:
- 		RegionUninit(&region);
- 		DamageEmpty(dirty->damage);
- 	}
--	if (flush)
--		kgem_submit(&sna->kgem);
- #endif
- }
- 
-@@ -17689,6 +17962,7 @@ sna_set_screen_pixmap(PixmapPtr pixmap)
- static Bool
- sna_create_window(WindowPtr win)
- {
-+	DBG(("%s: window=%ld\n", __FUNCTION__, win->drawable.id));
- 	sna_set_window_pixmap(win, win->drawable.pScreen->devPrivate);
- 	return TRUE;
- }
-@@ -17714,6 +17988,7 @@ sna_unmap_window(WindowPtr win)
- static Bool
- sna_destroy_window(WindowPtr win)
- {
-+	DBG(("%s: window=%ld\n", __FUNCTION__, win->drawable.id));
- 	sna_video_destroy_window(win);
- 	sna_dri2_destroy_window(win);
- 	return TRUE;
-@@ -17790,20 +18065,34 @@ static bool sna_option_accel_none(struct sna *sna)
- 	if (wedged(sna))
- 		return true;
- 
--	if (xf86ReturnOptValBool(sna->Options, OPTION_ACCEL_DISABLE, FALSE))
-+	if (!xf86ReturnOptValBool(sna->Options, OPTION_ACCEL_ENABLE, TRUE))
- 		return true;
- 
-+	if (sna->kgem.gen >= 0120)
-+		return true;
-+
-+	if (!intel_option_cast_to_bool(sna->Options,
-+				       OPTION_ACCEL_METHOD,
-+				       !IS_DEFAULT_ACCEL_METHOD(NOACCEL)))
-+		return false;
-+
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,99,901,0)
- 	s = xf86GetOptValString(sna->Options, OPTION_ACCEL_METHOD);
- 	if (s == NULL)
- 		return IS_DEFAULT_ACCEL_METHOD(NOACCEL);
- 
- 	return strcasecmp(s, "none") == 0;
-+#else
-+	return IS_DEFAULT_ACCEL_METHOD(NOACCEL);
-+#endif
- }
- 
- static bool sna_option_accel_blt(struct sna *sna)
- {
- 	const char *s;
- 
-+	assert(sna->kgem.gen < 0120);
-+
- 	s = xf86GetOptValString(sna->Options, OPTION_ACCEL_METHOD);
- 	if (s == NULL)
- 		return false;
-@@ -17811,6 +18100,13 @@ static bool sna_option_accel_blt(struct sna *sna)
- 	return strcasecmp(s, "blt") == 0;
- }
- 
-+#if HAVE_NOTIFY_FD
-+static void sna_accel_notify(int fd, int ready, void *data)
-+{
-+	sna_mode_wakeup(data);
-+}
-+#endif
-+
- bool sna_accel_init(ScreenPtr screen, struct sna *sna)
- {
- 	const char *backend;
-@@ -17822,7 +18118,7 @@ bool sna_accel_init(ScreenPtr screen, struct sna *sna)
- 	list_init(&sna->flush_pixmaps);
- 	list_init(&sna->active_pixmaps);
- 
--	AddGeneralSocket(sna->kgem.fd);
-+	SetNotifyFd(sna->kgem.fd, sna_accel_notify, X_NOTIFY_READ, sna);
- 
- #ifdef DEBUG_MEMORY
- 	sna->timer_expire[DEBUG_MEMORY_TIMER] = GetTimeInMillis()+ 10 * 1000;
-@@ -17892,21 +18188,23 @@ bool sna_accel_init(ScreenPtr screen, struct sna *sna)
- 		backend = "disabled";
- 		sna->kgem.wedged = true;
- 		sna_render_mark_wedged(sna);
--	} else if (sna_option_accel_blt(sna) || sna->info->gen >= 0110)
-+	} else if (sna_option_accel_blt(sna))
- 		(void)backend;
--	else if (sna->info->gen >= 0100)
-+	else if (sna->kgem.gen >= 0110)
-+		backend = gen9_render_init(sna, backend);
-+	else if (sna->kgem.gen >= 0100)
- 		backend = gen8_render_init(sna, backend);
--	else if (sna->info->gen >= 070)
-+	else if (sna->kgem.gen >= 070)
- 		backend = gen7_render_init(sna, backend);
--	else if (sna->info->gen >= 060)
-+	else if (sna->kgem.gen >= 060)
- 		backend = gen6_render_init(sna, backend);
--	else if (sna->info->gen >= 050)
-+	else if (sna->kgem.gen >= 050)
- 		backend = gen5_render_init(sna, backend);
--	else if (sna->info->gen >= 040)
-+	else if (sna->kgem.gen >= 040)
- 		backend = gen4_render_init(sna, backend);
--	else if (sna->info->gen >= 030)
-+	else if (sna->kgem.gen >= 030)
- 		backend = gen3_render_init(sna, backend);
--	else if (sna->info->gen >= 020)
-+	else if (sna->kgem.gen >= 020)
- 		backend = gen2_render_init(sna, backend);
- 
- 	DBG(("%s(backend=%s, prefer_gpu=%x)\n",
-@@ -17924,8 +18222,14 @@ bool sna_accel_init(ScreenPtr screen, struct sna *sna)
- 
- void sna_accel_create(struct sna *sna)
- {
-+	ExtensionEntry *damage;
-+
- 	DBG(("%s\n", __FUNCTION__));
- 
-+	damage = CheckExtension("DAMAGE");
-+	if (damage)
-+		sna->damage_event = damage->eventBase + XDamageNotify;
-+
- 	if (!sna_glyphs_create(sna))
- 		goto fail;
- 
-@@ -17943,27 +18247,59 @@ fail:
- 	no_render_init(sna);
- }
- 
--void sna_accel_watch_flush(struct sna *sna, int enable)
-+static void sna_shm_watch_flush(struct sna *sna, int enable)
- {
- 	DBG(("%s: enable=%d\n", __FUNCTION__, enable));
- 	assert(enable);
- 
--	if (sna->watch_flush == 0) {
-+	if (sna->watch_shm_flush == 0) {
-+		DBG(("%s: installing shm watchers\n", __FUNCTION__));
-+		assert(enable > 0);
-+
-+		if (!AddCallback(&FlushCallback, sna_shm_flush_callback, sna))
-+			return;
-+
-+		sna->watch_shm_flush++;
-+	}
-+
-+	sna->watch_shm_flush += enable;
-+}
-+
-+void sna_watch_flush(struct sna *sna, int enable)
-+{
-+	DBG(("%s: enable=%d\n", __FUNCTION__, enable));
-+	assert(enable);
-+
-+	if (sna->watch_dri_flush == 0) {
-+		int err = 0;
-+
- 		DBG(("%s: installing watchers\n", __FUNCTION__));
- 		assert(enable > 0);
--		if (!AddCallback(&FlushCallback, sna_accel_flush_callback, sna)) {
-+
-+		if (!sna->damage_event)
-+			return;
-+
-+		if (!AddCallback(&EventCallback, sna_event_callback, sna))
-+			err = 1;
-+
-+		if (!AddCallback(&FlushCallback, sna_flush_callback, sna))
-+			err = 1;
-+
-+		if (err) {
- 			xf86DrvMsg(sna->scrn->scrnIndex, X_Error,
- 				   "Failed to attach ourselves to the flush callbacks, expect missing synchronisation with DRI clients (e.g a compositor)\n");
- 		}
--		sna->watch_flush++;
-+
-+		sna->watch_dri_flush++;
- 	}
- 
--	sna->watch_flush += enable;
-+	sna->watch_dri_flush += enable;
- }
- 
- void sna_accel_leave(struct sna *sna)
- {
- 	DBG(("%s\n", __FUNCTION__));
-+	sna_scanout_flush(sna);
- 
- 	/* as root we always have permission to render */
- 	if (geteuid() == 0)
-@@ -17997,13 +18333,15 @@ void sna_accel_close(struct sna *sna)
- 
- 	sna_pixmap_expire(sna);
- 
--	DeleteCallback(&FlushCallback, sna_accel_flush_callback, sna);
--	RemoveGeneralSocket(sna->kgem.fd);
-+	DeleteCallback(&FlushCallback, sna_shm_flush_callback, sna);
-+	DeleteCallback(&FlushCallback, sna_flush_callback, sna);
-+	DeleteCallback(&EventCallback, sna_event_callback, sna);
-+	RemoveNotifyFd(sna->kgem.fd);
- 
- 	kgem_cleanup_cache(&sna->kgem);
- }
- 
--void sna_accel_block_handler(struct sna *sna, struct timeval **tv)
-+void sna_accel_block(struct sna *sna, struct timeval **tv)
- {
- 	sigtrap_assert_inactive();
- 
-@@ -18044,10 +18382,17 @@ restart:
- 	if (sna_accel_do_debug_memory(sna))
- 		sna_accel_debug_memory(sna);
- 
--	if (sna->watch_flush == 1) {
--		DBG(("%s: removing watchers\n", __FUNCTION__));
--		DeleteCallback(&FlushCallback, sna_accel_flush_callback, sna);
--		sna->watch_flush = 0;
-+	if (sna->watch_shm_flush == 1) {
-+		DBG(("%s: removing shm watchers\n", __FUNCTION__));
-+		DeleteCallback(&FlushCallback, sna_shm_flush_callback, sna);
-+		sna->watch_shm_flush = 0;
-+	}
-+
-+	if (sna->watch_dri_flush == 1) {
-+		DBG(("%s: removing dri watchers\n", __FUNCTION__));
-+		DeleteCallback(&FlushCallback, sna_flush_callback, sna);
-+		DeleteCallback(&EventCallback, sna_event_callback, sna);
-+		sna->watch_dri_flush = 0;
- 	}
- 
- 	if (sna->timer_active & 1) {
-@@ -18083,22 +18428,6 @@ set_tv:
- 	}
- }
- 
--void sna_accel_wakeup_handler(struct sna *sna)
--{
--	DBG(("%s: nbatch=%d, need_retire=%d, need_purge=%d\n", __FUNCTION__,
--	     sna->kgem.nbatch, sna->kgem.need_retire, sna->kgem.need_purge));
--
--	if (!sna->kgem.nbatch)
--		return;
--
--	if (kgem_is_idle(&sna->kgem)) {
--		DBG(("%s: GPU idle, flushing\n", __FUNCTION__));
--		_kgem_submit(&sna->kgem);
--	}
--
--	sigtrap_assert_inactive();
--}
--
- void sna_accel_free(struct sna *sna)
- {
- 	DBG(("%s\n", __FUNCTION__));
-diff --git a/src/sna/sna_acpi.c b/src/sna/sna_acpi.c
-index dcc0287b..643d04af 100644
---- a/src/sna/sna_acpi.c
-+++ b/src/sna/sna_acpi.c
-@@ -92,7 +92,7 @@ void _sna_acpi_wakeup(struct sna *sna)
- 		DBG(("%s: error [%d], detaching from acpid\n", __FUNCTION__, n));
- 
- 		/* XXX reattach later? */
--		RemoveGeneralSocket(sna->acpi.fd);
-+		RemoveNotifyFd(sna->acpi.fd);
- 		sna_acpi_fini(sna);
- 		return;
- 	}
-@@ -136,6 +136,13 @@ void _sna_acpi_wakeup(struct sna *sna)
- 	} while (n);
- }
- 
-+#if HAVE_NOTIFY_FD
-+static void sna_acpi_notify(int fd, int read, void *data)
-+{
-+	_sna_acpi_wakeup(data);
-+}
-+#endif
-+
- static int read_power_state(const char *path)
- {
- 	DIR *dir;
-@@ -200,7 +207,7 @@ void sna_acpi_init(struct sna *sna)
- 
- 	DBG(("%s: attaching to acpid\n", __FUNCTION__));
- 
--	AddGeneralSocket(sna->acpi.fd);
-+	SetNotifyFd(sna->acpi.fd, sna_acpi_notify, X_NOTIFY_READ, sna);
- 	sna->acpi.remain = sizeof(sna->acpi.event) - 1;
- 	sna->acpi.offset = 0;
- 
-diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
-index de8f6ec3..ddd2586d 100644
---- a/src/sna/sna_blt.c
-+++ b/src/sna/sna_blt.c
-@@ -86,6 +86,11 @@ static const uint8_t fill_ROP[] = {
- 	ROP_1
- };
- 
-+static void sig_done(struct sna *sna, const struct sna_composite_op *op)
-+{
-+	sigtrap_put();
-+}
-+
- static void nop_done(struct sna *sna, const struct sna_composite_op *op)
- {
- 	assert(sna->kgem.nbatch <= KGEM_BATCH_SIZE(&sna->kgem));
-@@ -129,7 +134,6 @@ static bool sna_blt_fill_init(struct sna *sna,
- 	struct kgem *kgem = &sna->kgem;
- 
- 	assert(kgem_bo_can_blt (kgem, bo));
--	assert(bo->tiling != I915_TILING_Y);
- 	blt->bo[0] = bo;
- 
- 	blt->br13 = bo->pitch;
-@@ -183,6 +187,7 @@ static bool sna_blt_fill_init(struct sna *sna,
- 				return false;
- 			_kgem_set_mode(kgem, KGEM_BLT);
- 		}
-+		kgem_bcs_set_tiling(kgem, NULL, bo);
- 
- 		assert(sna->kgem.mode == KGEM_BLT);
- 		b = kgem->batch + kgem->nbatch;
-@@ -237,17 +242,13 @@ static bool sna_blt_fill_init(struct sna *sna,
- 	return true;
- }
- 
--noinline static void sna_blt_fill_begin(struct sna *sna,
--					const struct sna_blt_state *blt)
-+noinline static void __sna_blt_fill_begin(struct sna *sna,
-+					  const struct sna_blt_state *blt)
- {
- 	struct kgem *kgem = &sna->kgem;
- 	uint32_t *b;
- 
--	if (kgem->nreloc) {
--		_kgem_submit(kgem);
--		_kgem_set_mode(kgem, KGEM_BLT);
--		assert(kgem->nbatch == 0);
--	}
-+	kgem_bcs_set_tiling(&sna->kgem, NULL, blt->bo[0]);
- 
- 	assert(kgem->mode == KGEM_BLT);
- 	b = kgem->batch + kgem->nbatch;
-@@ -293,6 +294,21 @@ noinline static void sna_blt_fill_begin(struct sna *sna,
- 	}
- }
- 
-+inline static void sna_blt_fill_begin(struct sna *sna,
-+				      const struct sna_blt_state *blt)
-+{
-+	struct kgem *kgem = &sna->kgem;
-+
-+	if (kgem->nreloc) {
-+		_kgem_submit(kgem);
-+		_kgem_set_mode(kgem, KGEM_BLT);
-+		kgem_bcs_set_tiling(kgem, NULL, blt->bo[0]);
-+		assert(kgem->nbatch == 0);
-+	}
-+
-+	__sna_blt_fill_begin(sna, blt);
-+}
-+
- inline static void sna_blt_fill_one(struct sna *sna,
- 				    const struct sna_blt_state *blt,
- 				    int16_t x, int16_t y,
-@@ -330,8 +346,8 @@ static bool sna_blt_copy_init(struct sna *sna,
- {
- 	struct kgem *kgem = &sna->kgem;
- 
--	assert(kgem_bo_can_blt (kgem, src));
--	assert(kgem_bo_can_blt (kgem, dst));
-+	assert(kgem_bo_can_blt(kgem, src));
-+	assert(kgem_bo_can_blt(kgem, dst));
- 
- 	blt->bo[0] = src;
- 	blt->bo[1] = dst;
-@@ -370,6 +386,7 @@ static bool sna_blt_copy_init(struct sna *sna,
- 			return false;
- 		_kgem_set_mode(kgem, KGEM_BLT);
- 	}
-+	kgem_bcs_set_tiling(&sna->kgem, src, dst);
- 
- 	sna->blt_state.fill_bo = 0;
- 	return true;
-@@ -424,6 +441,7 @@ static bool sna_blt_alpha_fixup_init(struct sna *sna,
- 			return false;
- 		_kgem_set_mode(kgem, KGEM_BLT);
- 	}
-+	kgem_bcs_set_tiling(&sna->kgem, src, dst);
- 
- 	sna->blt_state.fill_bo = 0;
- 	return true;
-@@ -454,6 +472,7 @@ static void sna_blt_alpha_fixup_one(struct sna *sna,
- 	    !kgem_check_reloc(kgem, 2)) {
- 		_kgem_submit(kgem);
- 		_kgem_set_mode(kgem, KGEM_BLT);
-+		kgem_bcs_set_tiling(&sna->kgem, blt->bo[0], blt->bo[1]);
- 	}
- 
- 	assert(sna->kgem.mode == KGEM_BLT);
-@@ -582,6 +601,7 @@ static void sna_blt_copy_one(struct sna *sna,
- 	    !kgem_check_reloc(kgem, 2)) {
- 		_kgem_submit(kgem);
- 		_kgem_set_mode(kgem, KGEM_BLT);
-+		kgem_bcs_set_tiling(&sna->kgem, blt->bo[0], blt->bo[1]);
- 	}
- 
- 	assert(sna->kgem.mode == KGEM_BLT);
-@@ -912,8 +932,27 @@ sna_composite_mask_is_opaque(PicturePtr mask)
- 		return is_solid(mask) && is_white(mask);
- 	else if (!PICT_FORMAT_A(mask->format))
- 		return true;
--	else
--		return is_solid(mask) && is_opaque_solid(mask);
-+	else if (mask->pSourcePict) {
-+		PictSolidFill *fill = (PictSolidFill *) mask->pSourcePict;
-+		return (fill->color >> 24) == 0xff;
-+	} else {
-+		struct sna_pixmap *priv;
-+		assert(mask->pDrawable);
-+
-+		if (mask->pDrawable->width  == 1 &&
-+		    mask->pDrawable->height == 1 &&
-+		    mask->repeat)
-+			return pixel_is_opaque(get_pixel(mask), mask->format);
-+
-+		if (mask->transform)
-+			return false;
-+
-+		priv = sna_pixmap_from_drawable(mask->pDrawable);
-+		if (priv == NULL || !priv->clear)
-+			return false;
-+
-+		return pixel_is_opaque(priv->clear_color, mask->format);
-+	}
- }
- 
- fastcall
-@@ -971,6 +1010,7 @@ static void blt_composite_fill__cpu(struct sna *sna,
- 
- 	assert(op->dst.pixmap->devPrivate.ptr);
- 	assert(op->dst.pixmap->devKind);
-+	sigtrap_assert_active();
- 	pixman_fill(op->dst.pixmap->devPrivate.ptr,
- 		    op->dst.pixmap->devKind / sizeof(uint32_t),
- 		    op->dst.pixmap->drawable.bitsPerPixel,
-@@ -990,6 +1030,7 @@ blt_composite_fill_box_no_offset__cpu(struct sna *sna,
- 
- 	assert(op->dst.pixmap->devPrivate.ptr);
- 	assert(op->dst.pixmap->devKind);
-+	sigtrap_assert_active();
- 	pixman_fill(op->dst.pixmap->devPrivate.ptr,
- 		    op->dst.pixmap->devKind / sizeof(uint32_t),
- 		    op->dst.pixmap->drawable.bitsPerPixel,
-@@ -1010,6 +1051,7 @@ blt_composite_fill_boxes_no_offset__cpu(struct sna *sna,
- 
- 		assert(op->dst.pixmap->devPrivate.ptr);
- 		assert(op->dst.pixmap->devKind);
-+		sigtrap_assert_active();
- 		pixman_fill(op->dst.pixmap->devPrivate.ptr,
- 			    op->dst.pixmap->devKind / sizeof(uint32_t),
- 			    op->dst.pixmap->drawable.bitsPerPixel,
-@@ -1031,6 +1073,7 @@ blt_composite_fill_box__cpu(struct sna *sna,
- 
- 	assert(op->dst.pixmap->devPrivate.ptr);
- 	assert(op->dst.pixmap->devKind);
-+	sigtrap_assert_active();
- 	pixman_fill(op->dst.pixmap->devPrivate.ptr,
- 		    op->dst.pixmap->devKind / sizeof(uint32_t),
- 		    op->dst.pixmap->drawable.bitsPerPixel,
-@@ -1052,6 +1095,7 @@ blt_composite_fill_boxes__cpu(struct sna *sna,
- 
- 		assert(op->dst.pixmap->devPrivate.ptr);
- 		assert(op->dst.pixmap->devKind);
-+		sigtrap_assert_active();
- 		pixman_fill(op->dst.pixmap->devPrivate.ptr,
- 			    op->dst.pixmap->devKind / sizeof(uint32_t),
- 			    op->dst.pixmap->drawable.bitsPerPixel,
-@@ -1159,12 +1203,15 @@ static inline void _sna_blt_maybe_clear(const struct sna_composite_op *op, const
- 	    box->y2 - box->y1 >= op->dst.height) {
- 		struct sna_pixmap *priv = sna_pixmap(op->dst.pixmap);
- 		if (op->dst.bo == priv->gpu_bo) {
-+			sna_damage_all(&priv->gpu_damage, op->dst.pixmap);
-+			sna_damage_destroy(&priv->cpu_damage);
- 			priv->clear = true;
- 			priv->clear_color = op->u.blt.pixel;
- 			DBG(("%s: pixmap=%ld marking clear [%08x]\n",
- 			     __FUNCTION__,
- 			     op->dst.pixmap->drawable.serialNumber,
- 			     op->u.blt.pixel));
-+			((struct sna_composite_op *)op)->damage = NULL;
- 		}
- 	}
- }
-@@ -1404,6 +1451,7 @@ begin_blt(struct sna *sna,
- 			return false;
- 
- 		_kgem_set_mode(&sna->kgem, KGEM_BLT);
-+		kgem_bcs_set_tiling(&sna->kgem, NULL, op->dst.bo);
- 	}
- 
- 	return true;
-@@ -1429,6 +1477,7 @@ prepare_blt_clear(struct sna *sna,
- 	DBG(("%s\n", __FUNCTION__));
- 
- 	if (op->dst.bo == NULL) {
-+		op->u.blt.pixel = 0;
- 		op->blt   = blt_composite_fill__cpu;
- 		if (op->dst.x|op->dst.y) {
- 			op->box   = blt_composite_fill_box__cpu;
-@@ -1439,9 +1488,8 @@ prepare_blt_clear(struct sna *sna,
- 			op->boxes = blt_composite_fill_boxes_no_offset__cpu;
- 			op->thread_boxes = blt_composite_fill_boxes_no_offset__cpu;
- 		}
--		op->done  = nop_done;
--		op->u.blt.pixel = 0;
--		return true;
-+		op->done = sig_done;
-+		return sigtrap_get() == 0;
- 	}
- 
- 	op->blt = blt_composite_fill;
-@@ -1484,8 +1532,8 @@ prepare_blt_fill(struct sna *sna,
- 			op->boxes = blt_composite_fill_boxes_no_offset__cpu;
- 			op->thread_boxes = blt_composite_fill_boxes_no_offset__cpu;
- 		}
--		op->done = nop_done;
--		return true;
-+		op->done = sig_done;
-+		return sigtrap_get() == 0;
- 	}
- 
- 	op->blt = blt_composite_fill;
-@@ -1668,6 +1716,7 @@ static void blt_composite_copy_boxes__thread(struct sna *sna,
- 
- 			_kgem_submit(kgem);
- 			_kgem_set_mode(kgem, KGEM_BLT);
-+			kgem_bcs_set_tiling(&sna->kgem, src_bo, dst_bo);
- 		} while (1);
- 	} else {
- 		do {
-@@ -1724,6 +1773,7 @@ static void blt_composite_copy_boxes__thread(struct sna *sna,
- 
- 			_kgem_submit(kgem);
- 			_kgem_set_mode(kgem, KGEM_BLT);
-+			kgem_bcs_set_tiling(&sna->kgem, src_bo, dst_bo);
- 		} while (1);
- 	}
- 	sna_vertex_unlock(&sna->render);
-@@ -1806,6 +1856,7 @@ static void blt_composite_copy_boxes__thread64(struct sna *sna,
- 
- 			_kgem_submit(kgem);
- 			_kgem_set_mode(kgem, KGEM_BLT);
-+			kgem_bcs_set_tiling(&sna->kgem, src_bo, dst_bo);
- 		} while (1);
- 	} else {
- 		do {
-@@ -1864,6 +1915,7 @@ static void blt_composite_copy_boxes__thread64(struct sna *sna,
- 
- 			_kgem_submit(kgem);
- 			_kgem_set_mode(kgem, KGEM_BLT);
-+			kgem_bcs_set_tiling(&sna->kgem, src_bo, dst_bo);
- 		} while (1);
- 	}
- 	sna_vertex_unlock(&sna->render);
-@@ -1973,6 +2025,7 @@ prepare_blt_copy(struct sna *sna,
- 		}
- 		_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 	}
-+	kgem_bcs_set_tiling(&sna->kgem, bo, op->dst.bo);
- 
- 	DBG(("%s\n", __FUNCTION__));
- 
-@@ -2396,6 +2449,9 @@ prepare_blt_put(struct sna *sna,
- 			op->box   = blt_put_composite_box;
- 			op->boxes = blt_put_composite_boxes;
- 		}
-+
-+		op->done = nop_done;
-+		return true;
- 	} else {
- 		if (alpha_fixup) {
- 			op->u.blt.pixel = alpha_fixup;
-@@ -2407,10 +2463,10 @@ prepare_blt_put(struct sna *sna,
- 			op->box   = blt_put_composite_box__cpu;
- 			op->boxes = blt_put_composite_boxes__cpu;
- 		}
--	}
--	op->done = nop_done;
- 
--	return true;
-+		op->done = sig_done;
-+		return sigtrap_get() == 0;
-+	}
- }
- 
- static bool
-@@ -2544,6 +2600,7 @@ sna_blt_composite(struct sna *sna,
- clear:
- 		if (was_clear && sna_pixmap(tmp->dst.pixmap)->clear_color == 0) {
- 			sna_pixmap(tmp->dst.pixmap)->clear = true;
-+nop:
- 			return prepare_blt_nop(sna, tmp);
- 		}
- 
-@@ -2559,6 +2616,7 @@ clear:
- 		}
- 		tmp->dst.bo = sna_drawable_use_bo(dst->pDrawable, hint,
- 						  &dst_box, &tmp->damage);
-+		assert(!tmp->damage || !DAMAGE_IS_ALL(*tmp->damage));
- 		if (tmp->dst.bo) {
- 			if (!kgem_bo_can_blt(&sna->kgem, tmp->dst.bo)) {
- 				DBG(("%s: can not blit to dst, tiling? %d, pitch? %d\n",
-@@ -2567,6 +2625,8 @@ clear:
- 			}
- 			if (hint & REPLACES)
- 				kgem_bo_undo(&sna->kgem, tmp->dst.bo);
-+			if (flags & COMPOSITE_UPLOAD)
-+				return false;
- 		} else {
- 			RegionRec region;
- 
-@@ -2590,32 +2650,40 @@ clear:
- 		}
- 		if (op == PictOpOver && is_opaque_solid(src))
- 			op = PictOpSrc;
--		if (op == PictOpAdd && is_white(src))
-+		if (op == PictOpAdd &&
-+		    PICT_FORMAT_RGB(src->format) == PICT_FORMAT_RGB(dst->format) &&
-+		    is_white(src))
- 			op = PictOpSrc;
- 		if (was_clear && (op == PictOpAdd || op == PictOpOver)) {
- 			if (sna_pixmap(tmp->dst.pixmap)->clear_color == 0)
- 				op = PictOpSrc;
- 			if (op == PictOpOver) {
-+				unsigned dst_color = solid_color(dst->format, sna_pixmap(tmp->dst.pixmap)->clear_color);
- 				color = over(get_solid_color(src, PICT_a8r8g8b8),
--					     color_convert(sna_pixmap(tmp->dst.pixmap)->clear_color,
--							   dst->format, PICT_a8r8g8b8));
-+					     dst_color);
- 				op = PictOpSrc;
- 				DBG(("%s: precomputing solid OVER (%08x, %08x) -> %08x\n",
- 				     __FUNCTION__, get_solid_color(src, PICT_a8r8g8b8),
--				     color_convert(sna_pixmap(tmp->dst.pixmap)->clear_color,
--						   dst->format, PICT_a8r8g8b8),
-+				     solid_color(dst->format, sna_pixmap(tmp->dst.pixmap)->clear_color),
- 				     color));
-+				if (color == dst_color)
-+					goto nop;
-+				else
-+					goto fill;
- 			}
- 			if (op == PictOpAdd) {
-+				unsigned dst_color = solid_color(dst->format, sna_pixmap(tmp->dst.pixmap)->clear_color);
- 				color = add(get_solid_color(src, PICT_a8r8g8b8),
--					    color_convert(sna_pixmap(tmp->dst.pixmap)->clear_color,
--							  dst->format, PICT_a8r8g8b8));
-+					    dst_color);
- 				op = PictOpSrc;
- 				DBG(("%s: precomputing solid ADD (%08x, %08x) -> %08x\n",
- 				     __FUNCTION__, get_solid_color(src, PICT_a8r8g8b8),
--				     color_convert(sna_pixmap(tmp->dst.pixmap)->clear_color,
--						   dst->format, PICT_a8r8g8b8),
-+				     solid_color(dst->format, sna_pixmap(tmp->dst.pixmap)->clear_color),
- 				     color));
-+				if (color == dst_color)
-+					goto nop;
-+				else
-+					goto fill;
- 			}
- 		}
- 		if (op == PictOpOutReverse && is_opaque_solid(src))
-@@ -2649,6 +2717,7 @@ fill:
- 		}
- 		tmp->dst.bo = sna_drawable_use_bo(dst->pDrawable, hint,
- 						  &dst_box, &tmp->damage);
-+		assert(!tmp->damage || !DAMAGE_IS_ALL(*tmp->damage));
- 		if (tmp->dst.bo) {
- 			if (!kgem_bo_can_blt(&sna->kgem, tmp->dst.bo)) {
- 				DBG(("%s: can not blit to dst, tiling? %d, pitch? %d\n",
-@@ -2657,6 +2726,8 @@ fill:
- 			}
- 			if (hint & REPLACES)
- 				kgem_bo_undo(&sna->kgem, tmp->dst.bo);
-+			if (flags & COMPOSITE_UPLOAD)
-+				return false;
- 		} else {
- 			RegionRec region;
- 
-@@ -2720,8 +2791,8 @@ fill:
- 	if (is_clear(src_pixmap)) {
- 		if (src->repeat ||
- 		    (x >= 0 && y >= 0 &&
--		     x + width  < src_pixmap->drawable.width &&
--		     y + height < src_pixmap->drawable.height)) {
-+		     x + width  <= src_pixmap->drawable.width &&
-+		     y + height <= src_pixmap->drawable.height)) {
- 			color = color_convert(sna_pixmap(src_pixmap)->clear_color,
- 					      src->format, tmp->dst.format);
- 			goto fill;
-@@ -2795,7 +2866,7 @@ fill:
- 		if (src_pixmap->drawable.width  <= sna->render.max_3d_size &&
- 		    src_pixmap->drawable.height <= sna->render.max_3d_size &&
- 		    bo->pitch <= sna->render.max_3d_pitch &&
--		    (flags & COMPOSITE_FALLBACK) == 0)
-+		    (flags & (COMPOSITE_UPLOAD | COMPOSITE_FALLBACK)) == 0)
- 		{
- 			return false;
- 		}
-@@ -2817,6 +2888,7 @@ fill:
- 	}
- 	tmp->dst.bo = sna_drawable_use_bo(dst->pDrawable, hint,
- 					  &dst_box, &tmp->damage);
-+	assert(!tmp->damage || !DAMAGE_IS_ALL(*tmp->damage));
- 
- 	if (tmp->dst.bo && hint & REPLACES) {
- 		struct sna_pixmap *priv = sna_pixmap(tmp->dst.pixmap);
-@@ -2846,7 +2918,7 @@ fallback:
- 			DBG(("%s: fallback -- unaccelerated upload\n",
- 			     __FUNCTION__));
- 			goto fallback;
--		} else {
-+		} else if ((flags & COMPOSITE_UPLOAD) == 0) {
- 			ret = prepare_blt_copy(sna, tmp, bo, alpha_fixup);
- 			if (!ret)
- 				goto fallback;
-@@ -3023,6 +3095,7 @@ sna_blt_composite__convert(struct sna *sna,
- 		}
- 		_kgem_set_mode(&sna->kgem, KGEM_BLT);
- 	}
-+	kgem_bcs_set_tiling(&sna->kgem, tmp->src.bo, tmp->dst.bo);
- 
- 	if (alpha_fixup) {
- 		tmp->blt   = blt_composite_copy_with_alpha;
-@@ -3062,7 +3135,7 @@ static void sna_blt_fill_op_blt(struct sna *sna,
- 	if (sna->blt_state.fill_bo != op->base.u.blt.bo[0]->unique_id) {
- 		const struct sna_blt_state *blt = &op->base.u.blt;
- 
--		sna_blt_fill_begin(sna, blt);
-+		__sna_blt_fill_begin(sna, blt);
- 
- 		sna->blt_state.fill_bo = blt->bo[0]->unique_id;
- 		sna->blt_state.fill_pixel = blt->pixel;
-@@ -3079,7 +3152,7 @@ fastcall static void sna_blt_fill_op_box(struct sna *sna,
- 	if (sna->blt_state.fill_bo != op->base.u.blt.bo[0]->unique_id) {
- 		const struct sna_blt_state *blt = &op->base.u.blt;
- 
--		sna_blt_fill_begin(sna, blt);
-+		__sna_blt_fill_begin(sna, blt);
- 
- 		sna->blt_state.fill_bo = blt->bo[0]->unique_id;
- 		sna->blt_state.fill_pixel = blt->pixel;
-@@ -3097,7 +3170,7 @@ fastcall static void sna_blt_fill_op_boxes(struct sna *sna,
- 	if (sna->blt_state.fill_bo != op->base.u.blt.bo[0]->unique_id) {
- 		const struct sna_blt_state *blt = &op->base.u.blt;
- 
--		sna_blt_fill_begin(sna, blt);
-+		__sna_blt_fill_begin(sna, blt);
- 
- 		sna->blt_state.fill_bo = blt->bo[0]->unique_id;
- 		sna->blt_state.fill_pixel = blt->pixel;
-@@ -3132,7 +3205,7 @@ fastcall static void sna_blt_fill_op_points(struct sna *sna,
- 	DBG(("%s: %08x x %d\n", __FUNCTION__, blt->pixel, n));
- 
- 	if (sna->blt_state.fill_bo != op->base.u.blt.bo[0]->unique_id) {
--		sna_blt_fill_begin(sna, blt);
-+		__sna_blt_fill_begin(sna, blt);
- 
- 		sna->blt_state.fill_bo = blt->bo[0]->unique_id;
- 		sna->blt_state.fill_pixel = blt->pixel;
-@@ -3162,65 +3235,15 @@ fastcall static void sna_blt_fill_op_points(struct sna *sna,
- 		assert(kgem->nbatch < kgem->surface);
- 
- 		if ((dx|dy) == 0) {
--			while (n_this_time >= 8) {
--				*((uint64_t *)b + 0) = pt_add(cmd, p+0, 0, 0);
--				*((uint64_t *)b + 1) = pt_add(cmd, p+1, 0, 0);
--				*((uint64_t *)b + 2) = pt_add(cmd, p+2, 0, 0);
--				*((uint64_t *)b + 3) = pt_add(cmd, p+3, 0, 0);
--				*((uint64_t *)b + 4) = pt_add(cmd, p+4, 0, 0);
--				*((uint64_t *)b + 5) = pt_add(cmd, p+5, 0, 0);
--				*((uint64_t *)b + 6) = pt_add(cmd, p+6, 0, 0);
--				*((uint64_t *)b + 7) = pt_add(cmd, p+7, 0, 0);
--				b += 16;
--				n_this_time -= 8;
--				p += 8;
--			}
--			if (n_this_time & 4) {
--				*((uint64_t *)b + 0) = pt_add(cmd, p+0, 0, 0);
--				*((uint64_t *)b + 1) = pt_add(cmd, p+1, 0, 0);
--				*((uint64_t *)b + 2) = pt_add(cmd, p+2, 0, 0);
--				*((uint64_t *)b + 3) = pt_add(cmd, p+3, 0, 0);
--				b += 8;
--				p += 4;
--			}
--			if (n_this_time & 2) {
--				*((uint64_t *)b + 0) = pt_add(cmd, p+0, 0, 0);
--				*((uint64_t *)b + 1) = pt_add(cmd, p+1, 0, 0);
--				b += 4;
--				p += 2;
--			}
--			if (n_this_time & 1)
--				*((uint64_t *)b + 0) = pt_add(cmd, p++, 0, 0);
-+			do {
-+				*(uint64_t *)b = pt_add(cmd, p++, 0, 0);
-+				b += 2;
-+			} while (--n_this_time);
- 		} else {
--			while (n_this_time >= 8) {
--				*((uint64_t *)b + 0) = pt_add(cmd, p+0, dx, dy);
--				*((uint64_t *)b + 1) = pt_add(cmd, p+1, dx, dy);
--				*((uint64_t *)b + 2) = pt_add(cmd, p+2, dx, dy);
--				*((uint64_t *)b + 3) = pt_add(cmd, p+3, dx, dy);
--				*((uint64_t *)b + 4) = pt_add(cmd, p+4, dx, dy);
--				*((uint64_t *)b + 5) = pt_add(cmd, p+5, dx, dy);
--				*((uint64_t *)b + 6) = pt_add(cmd, p+6, dx, dy);
--				*((uint64_t *)b + 7) = pt_add(cmd, p+7, dx, dy);
--				b += 16;
--				n_this_time -= 8;
--				p += 8;
--			}
--			if (n_this_time & 4) {
--				*((uint64_t *)b + 0) = pt_add(cmd, p+0, dx, dy);
--				*((uint64_t *)b + 1) = pt_add(cmd, p+1, dx, dy);
--				*((uint64_t *)b + 2) = pt_add(cmd, p+2, dx, dy);
--				*((uint64_t *)b + 3) = pt_add(cmd, p+3, dx, dy);
--				b += 8;
--				p += 8;
--			}
--			if (n_this_time & 2) {
--				*((uint64_t *)b + 0) = pt_add(cmd, p+0, dx, dy);
--				*((uint64_t *)b + 1) = pt_add(cmd, p+1, dx, dy);
--				b += 4;
--				p += 2;
--			}
--			if (n_this_time & 1)
--				*((uint64_t *)b + 0) = pt_add(cmd, p++, dx, dy);
-+			do {
-+				*(uint64_t *)b = pt_add(cmd, p++, dx, dy);
-+				b += 2;
-+			} while (--n_this_time);
- 		}
- 
- 		if (!n)
-@@ -3414,6 +3437,7 @@ static bool sna_blt_fill_box(struct sna *sna, uint8_t alu,
- 
- 		_kgem_set_mode(kgem, KGEM_BLT);
- 	}
-+	kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 	assert(kgem_check_batch(kgem, 6));
- 	assert(kgem_check_reloc(kgem, 1));
-@@ -3520,6 +3544,8 @@ bool sna_blt_fill_boxes(struct sna *sna, uint8_t alu,
- 			_kgem_set_mode(kgem, KGEM_BLT);
- 		}
- 
-+		kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
-+
- 		assert(sna->kgem.mode == KGEM_BLT);
- 		b = kgem->batch + kgem->nbatch;
- 		if (kgem->gen >= 0100) {
-@@ -3608,6 +3634,7 @@ bool sna_blt_fill_boxes(struct sna *sna, uint8_t alu,
- 
- 			_kgem_submit(kgem);
- 			_kgem_set_mode(kgem, KGEM_BLT);
-+			kgem_bcs_set_tiling(&sna->kgem, NULL, bo);
- 
- 			assert(sna->kgem.mode == KGEM_BLT);
- 			b = kgem->batch + kgem->nbatch;
-@@ -3754,6 +3781,7 @@ bool sna_blt_copy_boxes(struct sna *sna, uint8_t alu,
- 		}
- 		_kgem_set_mode(kgem, KGEM_BLT);
- 	}
-+	kgem_bcs_set_tiling(&sna->kgem, src_bo, dst_bo);
- 
- 	if ((dst_dx | dst_dy) == 0) {
- 		if (kgem->gen >= 0100) {
-@@ -3814,6 +3842,7 @@ bool sna_blt_copy_boxes(struct sna *sna, uint8_t alu,
- 
- 				_kgem_submit(kgem);
- 				_kgem_set_mode(kgem, KGEM_BLT);
-+				kgem_bcs_set_tiling(&sna->kgem, src_bo, dst_bo);
- 			} while (1);
- 		} else {
- 			uint64_t hdr = (uint64_t)br13 << 32 | cmd | 6;
-@@ -3871,6 +3900,7 @@ bool sna_blt_copy_boxes(struct sna *sna, uint8_t alu,
- 
- 				_kgem_submit(kgem);
- 				_kgem_set_mode(kgem, KGEM_BLT);
-+				kgem_bcs_set_tiling(&sna->kgem, src_bo, dst_bo);
- 			} while (1);
- 		}
- 	} else {
-@@ -3932,6 +3962,7 @@ bool sna_blt_copy_boxes(struct sna *sna, uint8_t alu,
- 
- 				_kgem_submit(kgem);
- 				_kgem_set_mode(kgem, KGEM_BLT);
-+				kgem_bcs_set_tiling(&sna->kgem, src_bo, dst_bo);
- 			} while (1);
- 		} else {
- 			cmd |= 6;
-@@ -3989,6 +4020,7 @@ bool sna_blt_copy_boxes(struct sna *sna, uint8_t alu,
- 
- 				_kgem_submit(kgem);
- 				_kgem_set_mode(kgem, KGEM_BLT);
-+				kgem_bcs_set_tiling(&sna->kgem, src_bo, dst_bo);
- 			} while (1);
- 		}
- 	}
-@@ -4095,6 +4127,7 @@ bool sna_blt_copy_boxes__with_alpha(struct sna *sna, uint8_t alu,
- 		    !kgem_check_reloc(kgem, 2)) {
- 			_kgem_submit(kgem);
- 			_kgem_set_mode(kgem, KGEM_BLT);
-+			kgem_bcs_set_tiling(&sna->kgem, src_bo, dst_bo);
- 		}
- 
- 		assert(sna->kgem.mode == KGEM_BLT);
-@@ -4190,6 +4223,7 @@ bool sna_blt_copy_boxes_fallback(struct sna *sna, uint8_t alu,
- 		DBG(("%s: dst == src\n", __FUNCTION__));
- 
- 		if (src_bo->tiling == I915_TILING_Y &&
-+		    !sna->kgem.can_blt_y &&
- 		    kgem_bo_blt_pitch_is_ok(&sna->kgem, src_bo)) {
- 			struct kgem_bo *bo;
- 
-@@ -4237,6 +4271,7 @@ bool sna_blt_copy_boxes_fallback(struct sna *sna, uint8_t alu,
- 		}
- 	} else {
- 		if (src_bo->tiling == I915_TILING_Y &&
-+		    !sna->kgem.can_blt_y &&
- 		    kgem_bo_blt_pitch_is_ok(&sna->kgem, src_bo)) {
- 			DBG(("%s: src is y-tiled\n", __FUNCTION__));
- 			if (src->type != DRAWABLE_PIXMAP)
-@@ -4251,6 +4286,7 @@ bool sna_blt_copy_boxes_fallback(struct sna *sna, uint8_t alu,
- 		}
- 
- 		if (dst_bo->tiling == I915_TILING_Y &&
-+		    !sna->kgem.can_blt_y &&
- 		    kgem_bo_blt_pitch_is_ok(&sna->kgem, dst_bo)) {
- 			DBG(("%s: dst is y-tiled\n", __FUNCTION__));
- 			if (dst->type != DRAWABLE_PIXMAP)
-diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c
-index f01f020e..1da8c291 100644
---- a/src/sna/sna_composite.c
-+++ b/src/sna/sna_composite.c
-@@ -452,6 +452,8 @@ static void apply_damage(struct sna_composite_op *op, RegionPtr region)
- 		op->damage = NULL;
- 	} else
- 		sna_damage_add(op->damage, region);
-+
-+	assert(!op->damage || !DAMAGE_IS_ALL(*op->damage));
- }
- 
- static inline bool use_cpu(PixmapPtr pixmap, struct sna_pixmap *priv,
-@@ -653,8 +655,9 @@ sna_composite(CARD8 op,
- 	RegionRec region;
- 	int dx, dy;
- 
--	DBG(("%s(%d src=%ld+(%d, %d), mask=%ld+(%d, %d), dst=%ld+(%d, %d)+(%d, %d), size=(%d, %d)\n",
--	     __FUNCTION__, op,
-+	DBG(("%s(pixmap=%ld, op=%d, src=%ld+(%d, %d), mask=%ld+(%d, %d), dst=%ld+(%d, %d)+(%d, %d), size=(%d, %d)\n",
-+	     __FUNCTION__,
-+	     pixmap->drawable.serialNumber, op,
- 	     get_picture_id(src), src_x, src_y,
- 	     get_picture_id(mask), mask_x, mask_y,
- 	     get_picture_id(dst), dst_x, dst_y,
-@@ -673,13 +676,6 @@ sna_composite(CARD8 op,
- 			src = sna->clear;
- 	}
- 
--	if (mask && sna_composite_mask_is_opaque(mask)) {
--		DBG(("%s: removing opaque %smask\n",
--		     __FUNCTION__,
--		     mask->componentAlpha && PICT_FORMAT_RGB(mask->format) ? "CA " : ""));
--		mask = NULL;
--	}
--
- 	if (!sna_compute_composite_region(&region,
- 					  src, mask, dst,
- 					  src_x,  src_y,
-@@ -688,6 +684,13 @@ sna_composite(CARD8 op,
- 					  width,  height))
- 		return;
- 
-+	if (mask && sna_composite_mask_is_opaque(mask)) {
-+		DBG(("%s: removing opaque %smask\n",
-+		     __FUNCTION__,
-+		     mask->componentAlpha && PICT_FORMAT_RGB(mask->format) ? "CA " : ""));
-+		mask = NULL;
-+	}
-+
- 	if (NO_COMPOSITE)
- 		goto fallback;
- 
-@@ -756,6 +759,7 @@ sna_composite(CARD8 op,
- 		DBG(("%s: fallback due unhandled composite op\n", __FUNCTION__));
- 		goto fallback;
- 	}
-+	assert(!tmp.damage || !DAMAGE_IS_ALL(*tmp.damage));
- 
- 	if (region.data == NULL)
- 		tmp.box(sna, &tmp, &region.extents);
-@@ -797,8 +801,10 @@ sna_composite_rectangles(CARD8		 op,
- 	int i, num_boxes;
- 	unsigned hint;
- 
--	DBG(("%s(op=%d, %08x x %d [(%d, %d)x(%d, %d) ...])\n",
--	     __FUNCTION__, op,
-+	DBG(("%s(pixmap=%ld, op=%d, %08x x %d [(%d, %d)x(%d, %d) ...])\n",
-+	     __FUNCTION__,
-+	     get_drawable_pixmap(dst->pDrawable)->drawable.serialNumber,
-+	     op,
- 	     (color->alpha >> 8 << 24) |
- 	     (color->red   >> 8 << 16) |
- 	     (color->green >> 8 << 8) |
-@@ -814,38 +820,40 @@ sna_composite_rectangles(CARD8		 op,
- 		return;
- 	}
- 
--	if ((color->red|color->green|color->blue|color->alpha) <= 0x00ff) {
--		switch (op) {
--		case PictOpOver:
--		case PictOpOutReverse:
--		case PictOpAdd:
--			return;
--		case  PictOpInReverse:
--		case  PictOpSrc:
--			op = PictOpClear;
--			break;
--		case  PictOpAtopReverse:
--			op = PictOpOut;
--			break;
--		case  PictOpXor:
--			op = PictOpOverReverse;
--			break;
--		}
--	}
- 	if (color->alpha <= 0x00ff) {
--		switch (op) {
--		case PictOpOver:
--		case PictOpOutReverse:
--			return;
--		case  PictOpInReverse:
--			op = PictOpClear;
--			break;
--		case  PictOpAtopReverse:
--			op = PictOpOut;
--			break;
--		case  PictOpXor:
--			op = PictOpOverReverse;
--			break;
-+		if (PICT_FORMAT_TYPE(dst->format) == PICT_TYPE_A ||
-+		    (color->red|color->green|color->blue) <= 0x00ff) {
-+			switch (op) {
-+			case PictOpOver:
-+			case PictOpOutReverse:
-+			case PictOpAdd:
-+				return;
-+			case  PictOpInReverse:
-+			case  PictOpSrc:
-+				op = PictOpClear;
-+				break;
-+			case  PictOpAtopReverse:
-+				op = PictOpOut;
-+				break;
-+			case  PictOpXor:
-+				op = PictOpOverReverse;
-+				break;
-+			}
-+		} else {
-+			switch (op) {
-+			case PictOpOver:
-+			case PictOpOutReverse:
-+				return;
-+			case  PictOpInReverse:
-+				op = PictOpClear;
-+				break;
-+			case  PictOpAtopReverse:
-+				op = PictOpOut;
-+				break;
-+			case  PictOpXor:
-+				op = PictOpOverReverse;
-+				break;
-+			}
- 		}
- 	} else if (color->alpha >= 0xff00) {
- 		switch (op) {
-@@ -863,11 +871,16 @@ sna_composite_rectangles(CARD8		 op,
- 		case  PictOpXor:
- 			op = PictOpOut;
- 			break;
-+		case PictOpAdd:
-+			if (PICT_FORMAT_TYPE(dst->format) == PICT_TYPE_A ||
-+			    (color->red&color->green&color->blue) >= 0xff00)
-+				op = PictOpSrc;
-+			break;
- 		}
- 	}
- 
- 	/* Avoid reducing overlapping translucent rectangles */
--	if (op == PictOpOver &&
-+	if ((op == PictOpOver || op == PictOpAdd) &&
- 	    num_rects == 1 &&
- 	    sna_drawable_is_clear(dst->pDrawable))
- 		op = PictOpSrc;
-@@ -979,6 +992,9 @@ sna_composite_rectangles(CARD8		 op,
- 			bool ok;
- 
- 			if (op == PictOpClear) {
-+				if (priv->clear_color == 0)
-+					goto done;
-+
- 				ok = sna_get_pixel_from_rgba(&pixel,
- 							     0, 0, 0, 0,
- 							     dst->format);
-@@ -990,8 +1006,11 @@ sna_composite_rectangles(CARD8		 op,
- 							     color->alpha,
- 							     dst->format);
- 			}
--			if (ok && priv->clear_color == pixel)
-+			if (ok && priv->clear_color == pixel) {
-+				DBG(("%s: matches current clear, skipping\n",
-+				     __FUNCTION__));
- 				goto done;
-+			}
- 		}
- 
- 		if (region.data == NULL) {
-diff --git a/src/sna/sna_damage.h b/src/sna/sna_damage.h
-index 272e83bc..d5c727ee 100644
---- a/src/sna/sna_damage.h
-+++ b/src/sna/sna_damage.h
-@@ -267,7 +267,7 @@ int _sna_damage_get_boxes(struct sna_damage *damage, const BoxRec **boxes);
- static inline int
- sna_damage_get_boxes(struct sna_damage *damage, const BoxRec **boxes)
- {
--	assert(damage);
-+	assert(DAMAGE_PTR(damage));
- 
- 	if (DAMAGE_IS_ALL(damage)) {
- 		*boxes = &DAMAGE_PTR(damage)->extents;
-@@ -322,7 +322,8 @@ static inline void sna_damage_destroy(struct sna_damage **damage)
- 	if (*damage == NULL)
- 		return;
- 
--	__sna_damage_destroy(DAMAGE_PTR(*damage));
-+	if (DAMAGE_PTR(*damage))
-+		__sna_damage_destroy(DAMAGE_PTR(*damage));
- 	*damage = NULL;
- }
- 
-diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
-index 4b218b70..9b77550e 100644
---- a/src/sna/sna_display.c
-+++ b/src/sna/sna_display.c
-@@ -39,6 +39,25 @@
- #include <errno.h>
- #include <poll.h>
- #include <ctype.h>
-+#include <dirent.h>
-+
-+#if HAVE_ALLOCA_H
-+#include <alloca.h>
-+#elif defined __GNUC__
-+#define alloca __builtin_alloca
-+#elif defined _AIX
-+#define alloca __alloca
-+#elif defined _MSC_VER
-+#include <malloc.h>
-+#define alloca _alloca
-+#else
-+void *alloca(size_t);
-+#endif
-+
-+#define _PARSE_EDID_
-+/* Jump through a few hoops in order to fixup EDIDs */
-+#undef VERSION
-+#undef REVISION
- 
- #include "sna.h"
- #include "sna_reg.h"
-@@ -72,6 +91,10 @@
- #include <memcheck.h>
- #endif
- 
-+#define FAIL_CURSOR_IOCTL 0
-+
-+#define COLDPLUG_DELAY_MS 2000
-+
- /* Minor discrepancy between 32-bit/64-bit ABI in old kernels */
- union compat_mode_get_connector{
- 	struct drm_mode_get_connector conn;
-@@ -88,6 +111,8 @@ union compat_mode_get_connector{
- #define DEFAULT_DPI 96
- #endif
- 
-+#define OUTPUT_STATUS_CACHE_MS 15000
-+
- #define DRM_MODE_PAGE_FLIP_ASYNC 0x02
- 
- #define DRM_CLIENT_CAP_UNIVERSAL_PLANES 2
-@@ -106,33 +131,87 @@ struct local_mode_obj_get_properties {
- };
- #define LOCAL_MODE_OBJECT_PLANE 0xeeeeeeee
- 
--#if 0
-+struct local_mode_set_plane {
-+	uint32_t plane_id;
-+	uint32_t crtc_id;
-+	uint32_t fb_id; /* fb object contains surface format type */
-+	uint32_t flags;
-+
-+	/* Signed dest location allows it to be partially off screen */
-+	int32_t crtc_x, crtc_y;
-+	uint32_t crtc_w, crtc_h;
-+
-+	/* Source values are 16.16 fixed point */
-+	uint32_t src_x, src_y;
-+	uint32_t src_h, src_w;
-+};
-+#define LOCAL_IOCTL_MODE_SETPLANE DRM_IOWR(0xB7, struct local_mode_set_plane)
-+
-+struct local_mode_get_plane {
-+	uint32_t plane_id;
-+
-+	uint32_t crtc_id;
-+	uint32_t fb_id;
-+
-+	uint32_t possible_crtcs;
-+	uint32_t gamma_size;
-+
-+	uint32_t count_format_types;
-+	uint64_t format_type_ptr;
-+};
-+#define LOCAL_IOCTL_MODE_GETPLANE DRM_IOWR(0xb6, struct local_mode_get_plane)
-+
-+struct local_mode_get_plane_res {
-+	uint64_t plane_id_ptr;
-+	uint64_t count_planes;
-+};
-+#define LOCAL_IOCTL_MODE_GETPLANERESOURCES DRM_IOWR(0xb5, struct local_mode_get_plane_res)
-+
-+#if 1
- #define __DBG DBG
- #else
- #define __DBG(x)
- #endif
- 
-+#define DBG_NATIVE_ROTATION ~0 /* minimum RR_Rotate_0 */
-+
- extern XF86ConfigPtr xf86configptr;
- 
-+struct sna_cursor {
-+	struct sna_cursor *next;
-+	uint32_t *image;
-+	bool transformed;
-+	Rotation rotation;
-+	int ref;
-+	int size;
-+	int last_width;
-+	int last_height;
-+	unsigned handle;
-+	unsigned serial;
-+	unsigned alloc;
-+};
-+
- struct sna_crtc {
-+	unsigned long flags;
-+	uint32_t id;
- 	xf86CrtcPtr base;
- 	struct drm_mode_modeinfo kmode;
--	int dpms_mode;
- 	PixmapPtr slave_pixmap;
- 	DamagePtr slave_damage;
--	struct kgem_bo *bo, *shadow_bo, *client_bo;
-+	struct kgem_bo *bo, *shadow_bo, *client_bo, *cache_bo;
- 	struct sna_cursor *cursor;
- 	unsigned int last_cursor_size;
- 	uint32_t offset;
- 	bool shadow;
- 	bool fallback_shadow;
- 	bool transform;
-+	bool cursor_transform;
-+	bool hwcursor;
- 	bool flip_pending;
--	uint8_t id;
--	uint8_t pipe;
- 
--	RegionRec client_damage; /* XXX overlap with shadow damage? */
-+	struct pict_f_transform cursor_to_fb, fb_to_cursor;
- 
-+	RegionRec crtc_damage;
- 	uint16_t shadow_bo_width, shadow_bo_height;
- 
- 	uint32_t rotation;
-@@ -143,7 +222,9 @@ struct sna_crtc {
- 			uint32_t supported;
- 			uint32_t current;
- 		} rotation;
--	} primary, sprite;
-+		struct list link;
-+	} primary;
-+	struct list sprites;
- 
- 	uint32_t mode_serial, flip_serial;
- 
-@@ -173,21 +254,33 @@ struct sna_output {
- 
- 	unsigned int is_panel : 1;
- 	unsigned int add_default_modes : 1;
-+	int connector_type;
-+	int connector_type_id;
-+
-+	uint32_t link_status_idx;
- 
- 	uint32_t edid_idx;
- 	uint32_t edid_blob_id;
- 	uint32_t edid_len;
- 	void *edid_raw;
-+	xf86MonPtr fake_edid_mon;
-+	void *fake_edid_raw;
- 
- 	bool has_panel_limits;
- 	int panel_hdisplay;
- 	int panel_vdisplay;
- 
- 	uint32_t dpms_id;
--	int dpms_mode;
-+	uint8_t dpms_mode;
- 	struct backlight backlight;
- 	int backlight_active_level;
- 
-+	uint32_t last_detect;
-+	uint32_t status;
-+	unsigned int hotplug_count;
-+	bool update_properties;
-+	bool reprobe;
-+
- 	int num_modes;
- 	struct drm_mode_modeinfo *modes;
- 
-@@ -218,13 +311,91 @@ enum { /* XXX copied from hw/xfree86/modes/xf86Crtc.c */
- 	OPTION_DEFAULT_MODES,
- };
- 
-+static void __sna_output_dpms(xf86OutputPtr output, int dpms, int fixup);
- static void sna_crtc_disable_cursor(struct sna *sna, struct sna_crtc *crtc);
-+static bool sna_crtc_flip(struct sna *sna, struct sna_crtc *crtc,
-+			  struct kgem_bo *bo, int x, int y);
- 
- static bool is_zaphod(ScrnInfoPtr scrn)
- {
- 	return xf86IsEntityShared(scrn->entityList[0]);
- }
- 
-+static bool
-+sna_zaphod_match(struct sna *sna, const char *output)
-+{
-+	const char *s, *colon;
-+	char t[20];
-+	unsigned int i = 0;
-+
-+	s = xf86GetOptValString(sna->Options, OPTION_ZAPHOD);
-+	if (s == NULL)
-+		return false;
-+
-+	colon = strchr(s, ':');
-+	if (colon) /* Skip over the ZaphodPipes */
-+		s = colon + 1;
-+
-+	do {
-+		/* match any outputs in a comma list, stopping at whitespace */
-+		switch (*s) {
-+		case '\0':
-+			t[i] = '\0';
-+			return strcmp(t, output) == 0;
-+
-+		case ',':
-+			t[i] ='\0';
-+			if (strcmp(t, output) == 0)
-+				return TRUE;
-+			i = 0;
-+			break;
-+
-+		case ' ':
-+		case '\t':
-+		case '\n':
-+		case '\r':
-+			break;
-+
-+		default:
-+			t[i++] = *s;
-+			break;
-+		}
-+
-+		s++;
-+	} while (i < sizeof(t));
-+
-+	return false;
-+}
-+
-+static unsigned
-+get_zaphod_crtcs(struct sna *sna)
-+{
-+	const char *str, *colon;
-+	unsigned crtcs = 0;
-+
-+	str = xf86GetOptValString(sna->Options, OPTION_ZAPHOD);
-+	if (str == NULL || (colon = strchr(str, ':')) == NULL) {
-+		DBG(("%s: no zaphod pipes, using screen number: %x\n",
-+		     __FUNCTION__,
-+		     sna->scrn->confScreen->device->screen));
-+		return 1 << sna->scrn->confScreen->device->screen;
-+	}
-+
-+	DBG(("%s: ZaphodHeads='%s'\n", __FUNCTION__, str));
-+	while (str < colon) {
-+		char *end;
-+		unsigned crtc = strtoul(str, &end, 0);
-+		if (end == str)
-+			break;
-+		DBG(("%s: adding CRTC %d to zaphod pipes\n",
-+		     __FUNCTION__, crtc));
-+		crtcs |= 1 << crtc;
-+		str = end + 1;
-+	}
-+	DBG(("%s: ZaphodPipes=%x\n", __FUNCTION__, crtcs));
-+	return crtcs;
-+}
-+
- inline static unsigned count_to_mask(int x)
- {
- 	return (1 << x) - 1;
-@@ -247,6 +418,21 @@ static inline struct sna_crtc *to_sna_crtc(xf86CrtcPtr crtc)
- 	return crtc->driver_private;
- }
- 
-+static inline unsigned __sna_crtc_pipe(struct sna_crtc *crtc)
-+{
-+	return crtc->flags >> 8 & 0xff;
-+}
-+
-+static inline unsigned __sna_crtc_id(struct sna_crtc *crtc)
-+{
-+	return crtc->id;
-+}
-+
-+uint32_t sna_crtc_id(xf86CrtcPtr crtc)
-+{
-+	return __sna_crtc_id(to_sna_crtc(crtc));
-+}
-+
- static inline bool event_pending(int fd)
- {
- 	struct pollfd pfd;
-@@ -268,29 +454,37 @@ static inline uint32_t fb_id(struct kgem_bo *bo)
- 	return bo->delta;
- }
- 
--uint32_t sna_crtc_id(xf86CrtcPtr crtc)
-+unsigned sna_crtc_count_sprites(xf86CrtcPtr crtc)
- {
--	if (to_sna_crtc(crtc) == NULL)
--		return 0;
--	return to_sna_crtc(crtc)->id;
--}
-+	struct plane *sprite;
-+	unsigned count;
- 
--int sna_crtc_to_pipe(xf86CrtcPtr crtc)
--{
--	assert(to_sna_crtc(crtc));
--	return to_sna_crtc(crtc)->pipe;
-+	count = 0;
-+	list_for_each_entry(sprite, &to_sna_crtc(crtc)->sprites, link)
-+		count++;
-+
-+	return count;
- }
- 
--uint32_t sna_crtc_to_sprite(xf86CrtcPtr crtc)
-+static struct plane *lookup_sprite(struct sna_crtc *crtc, unsigned idx)
- {
--	assert(to_sna_crtc(crtc));
--	return to_sna_crtc(crtc)->sprite.id;
-+	struct plane *sprite;
-+
-+	list_for_each_entry(sprite, &crtc->sprites, link)
-+		if (idx-- == 0)
-+			return sprite;
-+
-+	return NULL;
- }
- 
--bool sna_crtc_is_on(xf86CrtcPtr crtc)
-+uint32_t sna_crtc_to_sprite(xf86CrtcPtr crtc, unsigned idx)
- {
-+	struct plane *sprite;
-+
- 	assert(to_sna_crtc(crtc));
--	return to_sna_crtc(crtc)->bo != NULL;
-+
-+	sprite = lookup_sprite(to_sna_crtc(crtc), idx);
-+	return sprite ? sprite->id : 0;
- }
- 
- bool sna_crtc_is_transformed(xf86CrtcPtr crtc)
-@@ -299,34 +493,48 @@ bool sna_crtc_is_transformed(xf86CrtcPtr crtc)
- 	return to_sna_crtc(crtc)->transform;
- }
- 
--static inline uint64_t msc64(struct sna_crtc *sna_crtc, uint32_t seq)
-+static inline bool msc64(struct sna_crtc *sna_crtc, uint32_t seq, uint64_t *msc)
- {
-+	bool record = true;
- 	if (seq < sna_crtc->last_seq) {
- 		if (sna_crtc->last_seq - seq > 0x40000000) {
- 			sna_crtc->wrap_seq++;
- 			DBG(("%s: pipe=%d wrapped; was %u, now %u, wraps=%u\n",
--			     __FUNCTION__, sna_crtc->pipe,
-+			     __FUNCTION__, __sna_crtc_pipe(sna_crtc),
- 			     sna_crtc->last_seq, seq, sna_crtc->wrap_seq));
--		} else  {
--			ERR(("%s: pipe=%d msc went backwards; was %u, now %u\n",
--			     __FUNCTION__, sna_crtc->pipe, sna_crtc->last_seq, seq));
--			seq = sna_crtc->last_seq;
-+		} else {
-+			DBG(("%s: pipe=%d msc went backwards; was %u, now %u; ignoring for last_swap\n",
-+			     __FUNCTION__, __sna_crtc_pipe(sna_crtc), sna_crtc->last_seq, seq));
-+
-+			record = false;
- 		}
- 	}
--	sna_crtc->last_seq = seq;
--	return (uint64_t)sna_crtc->wrap_seq << 32 | seq;
-+	*msc = (uint64_t)sna_crtc->wrap_seq << 32 | seq;
-+	return record;
- }
- 
- uint64_t sna_crtc_record_swap(xf86CrtcPtr crtc,
- 			      int tv_sec, int tv_usec, unsigned seq)
- {
- 	struct sna_crtc *sna_crtc = to_sna_crtc(crtc);
-+	uint64_t msc;
-+
- 	assert(sna_crtc);
--	DBG(("%s: recording last swap on pipe=%d, frame %d, time %d.%06d\n",
--	     __FUNCTION__, sna_crtc->pipe, seq, tv_sec, tv_usec));
--	sna_crtc->swap.tv_sec = tv_sec;
--	sna_crtc->swap.tv_usec = tv_usec;
--	return sna_crtc->swap.msc = msc64(sna_crtc, seq);
-+
-+	if (msc64(sna_crtc, seq, &msc)) {
-+		DBG(("%s: recording last swap on pipe=%d, frame %d [msc=%08lld], time %d.%06d\n",
-+		     __FUNCTION__, __sna_crtc_pipe(sna_crtc), seq, (long long)msc,
-+		     tv_sec, tv_usec));
-+		sna_crtc->swap.tv_sec = tv_sec;
-+		sna_crtc->swap.tv_usec = tv_usec;
-+		sna_crtc->swap.msc = msc;
-+	} else {
-+		DBG(("%s: swap event on pipe=%d, frame %d [msc=%08lld], time %d.%06d\n",
-+		     __FUNCTION__, __sna_crtc_pipe(sna_crtc), seq, (long long)msc,
-+		     tv_sec, tv_usec));
-+	}
-+
-+	return msc;
- }
- 
- const struct ust_msc *sna_crtc_last_swap(xf86CrtcPtr crtc)
-@@ -342,15 +550,6 @@ const struct ust_msc *sna_crtc_last_swap(xf86CrtcPtr crtc)
- 	}
- }
- 
--xf86CrtcPtr sna_mode_first_crtc(struct sna *sna)
--{
--	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
--	if (sna->mode.num_real_crtc)
--		return config->crtc[0];
--	else
--		return NULL;
--}
--
- #ifndef NDEBUG
- static void gem_close(int fd, uint32_t handle);
- static void assert_scanout(struct kgem *kgem, struct kgem_bo *bo,
-@@ -372,12 +571,24 @@ static void assert_scanout(struct kgem *kgem, struct kgem_bo *bo,
- #define assert_scanout(k, b, w, h)
- #endif
- 
-+static void assert_crtc_fb(struct sna *sna, struct sna_crtc *crtc)
-+{
-+#ifndef NDEBUG
-+	struct drm_mode_crtc mode = { .crtc_id = __sna_crtc_id(crtc) };
-+	drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETCRTC, &mode);
-+	assert(mode.fb_id == fb_id(crtc->bo));
-+#endif
-+}
-+
- static unsigned get_fb(struct sna *sna, struct kgem_bo *bo,
- 		       int width, int height)
- {
- 	ScrnInfoPtr scrn = sna->scrn;
- 	struct drm_mode_fb_cmd arg;
- 
-+	if (!kgem_bo_is_fenced(&sna->kgem, bo))
-+		return 0;
-+
- 	assert(bo->refcnt);
- 	assert(bo->proxy == NULL);
- 	assert(!bo->snoop);
-@@ -393,8 +604,9 @@ static unsigned get_fb(struct sna *sna, struct kgem_bo *bo,
- 	DBG(("%s: create fb %dx%d@%d/%d\n",
- 	     __FUNCTION__, width, height, scrn->depth, scrn->bitsPerPixel));
- 
--	assert(bo->tiling != I915_TILING_Y);
-+	assert(bo->tiling != I915_TILING_Y || sna->kgem.can_scanout_y);
- 	assert((bo->pitch & 63) == 0);
-+	assert(scrn->vtSema); /* must be master */
- 
- 	VG_CLEAR(arg);
- 	arg.width = width;
-@@ -404,21 +616,83 @@ static unsigned get_fb(struct sna *sna, struct kgem_bo *bo,
- 	arg.depth = scrn->depth;
- 	arg.handle = bo->handle;
- 
--	assert(sna->scrn->vtSema); /* must be master */
- 	if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_ADDFB, &arg)) {
--		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
--			   "%s: failed to add fb: %dx%d depth=%d, bpp=%d, pitch=%d: %d\n",
--			   __FUNCTION__, width, height,
--			   scrn->depth, scrn->bitsPerPixel, bo->pitch, errno);
--		return 0;
-+		/* Try again with the fancy version */
-+		struct local_mode_fb_cmd2 {
-+			uint32_t fb_id;
-+			uint32_t width, height;
-+			uint32_t pixel_format;
-+			uint32_t flags;
-+
-+			uint32_t handles[4];
-+			uint32_t pitches[4]; /* pitch for each plane */
-+			uint32_t offsets[4]; /* offset of each plane */
-+			uint64_t modifiers[4];
-+		} f;
-+#define LOCAL_IOCTL_MODE_ADDFB2 DRM_IOWR(0xb8, struct local_mode_fb_cmd2)
-+		memset(&f, 0, sizeof(f));
-+		f.width = width;
-+		f.height = height;
-+		/* XXX interlaced */
-+		f.flags = 1 << 1; /* +modifiers */
-+		f.handles[0] = bo->handle;
-+		f.pitches[0] = bo->pitch;
-+
-+		switch (bo->tiling) {
-+		case I915_TILING_NONE:
-+			break;
-+		case I915_TILING_X:
-+			/* I915_FORMAT_MOD_X_TILED */
-+			f.modifiers[0] = (uint64_t)1 << 56 | 1;
-+			break;
-+		case I915_TILING_Y:
-+			/* I915_FORMAT_MOD_X_TILED */
-+			f.modifiers[0] = (uint64_t)1 << 56 | 2;
-+			break;
-+		}
-+
-+#define fourcc(a,b,c,d) ((a) | (b) << 8 | (c) << 16 | (d) << 24)
-+		switch (scrn->depth) {
-+		default:
-+			ERR(("%s: unhandled screen format, depth=%d\n",
-+			     __FUNCTION__, scrn->depth));
-+			goto fail;
-+		case 8:
-+			f.pixel_format = fourcc('C', '8', ' ', ' ');
-+			break;
-+		case 15:
-+			f.pixel_format = fourcc('X', 'R', '1', '5');
-+			break;
-+		case 16:
-+			f.pixel_format = fourcc('R', 'G', '1', '6');
-+			break;
-+		case 24:
-+			f.pixel_format = fourcc('X', 'R', '2', '4');
-+			break;
-+		case 30:
-+			f.pixel_format = fourcc('X', 'R', '3', '0');
-+			break;
-+		}
-+#undef fourcc
-+
-+		if (drmIoctl(sna->kgem.fd, LOCAL_IOCTL_MODE_ADDFB2, &f)) {
-+fail:
-+			xf86DrvMsg(scrn->scrnIndex, X_ERROR,
-+				   "%s: failed to add fb: %dx%d depth=%d, bpp=%d, pitch=%d: %d\n",
-+				   __FUNCTION__, width, height,
-+				   scrn->depth, scrn->bitsPerPixel, bo->pitch, errno);
-+			return 0;
-+		}
-+
-+		arg.fb_id = f.fb_id;
- 	}
- 	assert(arg.fb_id != 0);
--
-+	bo->delta = arg.fb_id;
- 	DBG(("%s: attached fb=%d to handle=%d\n",
--	     __FUNCTION__, arg.fb_id, arg.handle));
-+	     __FUNCTION__, bo->delta, arg.handle));
- 
- 	bo->scanout = true;
--	return bo->delta = arg.fb_id;
-+	return bo->delta;
- }
- 
- static uint32_t gem_create(int fd, int size)
-@@ -438,6 +712,7 @@ static uint32_t gem_create(int fd, int size)
- static void *gem_mmap(int fd, int handle, int size)
- {
- 	struct drm_i915_gem_mmap_gtt mmap_arg;
-+	struct drm_i915_gem_set_domain set_domain;
- 	void *ptr;
- 
- 	VG_CLEAR(mmap_arg);
-@@ -449,6 +724,15 @@ static void *gem_mmap(int fd, int handle, int size)
- 	if (ptr == MAP_FAILED)
- 		return NULL;
- 
-+	VG_CLEAR(set_domain);
-+	set_domain.handle = handle;
-+	set_domain.read_domains = I915_GEM_DOMAIN_GTT;
-+	set_domain.write_domain = I915_GEM_DOMAIN_GTT;
-+	if (drmIoctl(fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain)) {
-+		munmap(ptr, size);
-+		return NULL;
-+	}
-+
- 	return ptr;
- }
- 
-@@ -497,8 +781,6 @@ sna_backlight_uevent(int fd, void *closure)
- 		if (sna_output->dpms_mode != DPMSModeOn)
- 			continue;
- 
--		assert(output->randr_output);
--
- 		val = backlight_get(&sna_output->backlight);
- 		if (val < 0)
- 			continue;
-@@ -523,6 +805,7 @@ sna_backlight_uevent(int fd, void *closure)
- 					       TRUE, FALSE);
- 		}
- 	}
-+	DBG(("%s: complete\n", __FUNCTION__));
- }
- 
- static void sna_backlight_pre_init(struct sna *sna)
-@@ -570,6 +853,7 @@ static void sna_backlight_drain_uevents(struct sna *sna)
- 	if (sna->mode.backlight_monitor == NULL)
- 		return;
- 
-+	DBG(("%s()\n", __FUNCTION__));
- 	sna_backlight_uevent(udev_monitor_get_fd(sna->mode.backlight_monitor),
- 			     sna);
- }
-@@ -632,9 +916,22 @@ sna_output_backlight_set(struct sna_output *sna_output, int level)
- 	return ret;
- }
- 
-+static bool
-+has_native_backlight(struct sna_output *sna_output)
-+{
-+	return sna_output->backlight.type == BL_RAW;
-+}
-+
- static void
- sna_output_backlight_off(struct sna_output *sna_output)
- {
-+	/* Trust the kernel to turn the native backlight off. However, we
-+	 * do explicitly turn the backlight back on (when we wake the output)
-+	 * just in case a third party turns it off!
-+	 */
-+	if (has_native_backlight(sna_output))
-+		return;
-+
- 	DBG(("%s(%s)\n", __FUNCTION__, sna_output->base->name));
- 	backlight_off(&sna_output->backlight);
- 	sna_output_backlight_set(sna_output, 0);
-@@ -674,7 +971,7 @@ has_user_backlight_override(xf86OutputPtr output)
- 	if (*str == '\0')
- 		return (char *)str;
- 
--	if (backlight_exists(str) == BL_NONE) {
-+	if (!backlight_exists(str)) {
- 		xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
- 			   "Unrecognised backlight control interface '%s'\n",
- 			   str);
-@@ -684,6 +981,93 @@ has_user_backlight_override(xf86OutputPtr output)
- 	return strdup(str);
- }
- 
-+static int get_device_minor(int fd)
-+{
-+	struct stat st;
-+
-+	if (fstat(fd, &st) || !S_ISCHR(st.st_mode))
-+		return -1;
-+
-+	return st.st_rdev & 0x63;
-+}
-+
-+static const char * const sysfs_connector_types[] = {
-+	/* DRM_MODE_CONNECTOR_Unknown */	"Unknown",
-+	/* DRM_MODE_CONNECTOR_VGA */		"VGA",
-+	/* DRM_MODE_CONNECTOR_DVII */		"DVI-I",
-+	/* DRM_MODE_CONNECTOR_DVID */		"DVI-D",
-+	/* DRM_MODE_CONNECTOR_DVIA */		"DVI-A",
-+	/* DRM_MODE_CONNECTOR_Composite */	"Composite",
-+	/* DRM_MODE_CONNECTOR_SVIDEO */		"SVIDEO",
-+	/* DRM_MODE_CONNECTOR_LVDS */		"LVDS",
-+	/* DRM_MODE_CONNECTOR_Component */	"Component",
-+	/* DRM_MODE_CONNECTOR_9PinDIN */	"DIN",
-+	/* DRM_MODE_CONNECTOR_DisplayPort */	"DP",
-+	/* DRM_MODE_CONNECTOR_HDMIA */		"HDMI-A",
-+	/* DRM_MODE_CONNECTOR_HDMIB */		"HDMI-B",
-+	/* DRM_MODE_CONNECTOR_TV */		"TV",
-+	/* DRM_MODE_CONNECTOR_eDP */		"eDP",
-+	/* DRM_MODE_CONNECTOR_VIRTUAL */	"Virtual",
-+	/* DRM_MODE_CONNECTOR_DSI */		"DSI",
-+	/* DRM_MODE_CONNECTOR_DPI */		"DPI"
-+};
-+
-+static char *has_connector_backlight(xf86OutputPtr output)
-+{
-+	struct sna_output *sna_output = output->driver_private;
-+	struct sna *sna = to_sna(output->scrn);
-+	char path[1024];
-+	DIR *dir;
-+	struct dirent *de;
-+	int minor, len;
-+	char *str = NULL;
-+
-+	if (sna_output->connector_type >= ARRAY_SIZE(sysfs_connector_types))
-+		return NULL;
-+
-+	minor = get_device_minor(sna->kgem.fd);
-+	if (minor < 0)
-+		return NULL;
-+
-+	len = snprintf(path, sizeof(path),
-+		       "/sys/class/drm/card%d-%s-%d",
-+		       minor,
-+		       sysfs_connector_types[sna_output->connector_type],
-+		       sna_output->connector_type_id);
-+	DBG(("%s: lookup %s\n", __FUNCTION__, path));
-+
-+	dir = opendir(path);
-+	if (dir == NULL)
-+		return NULL;
-+
-+	while ((de = readdir(dir))) {
-+		struct stat st;
-+
-+		if (*de->d_name == '.')
-+			continue;
-+
-+		snprintf(path + len, sizeof(path) - len,
-+			 "/%s", de->d_name);
-+
-+		if (stat(path, &st))
-+			continue;
-+
-+		if (!S_ISDIR(st.st_mode))
-+			continue;
-+
-+		DBG(("%s: testing %s as backlight\n",
-+		     __FUNCTION__, de->d_name));
-+
-+		if (backlight_exists(de->d_name)) {
-+			str = strdup(de->d_name); /* leak! */
-+			break;
-+		}
-+	}
-+
-+	closedir(dir);
-+	return str;
-+}
-+
- static void
- sna_output_backlight_init(xf86OutputPtr output)
- {
-@@ -696,11 +1080,20 @@ sna_output_backlight_init(xf86OutputPtr output)
- 	return;
- #endif
- 
--	from = X_CONFIG;
--	best_iface = has_user_backlight_override(output);
-+	if (sna_output->is_panel) {
-+		from = X_CONFIG;
-+		best_iface = has_user_backlight_override(output);
-+		if (best_iface)
-+			goto done;
-+	}
-+
-+	best_iface = has_connector_backlight(output);
- 	if (best_iface)
- 		goto done;
- 
-+	if (!sna_output->is_panel)
-+		return;
-+
- 	/* XXX detect right backlight for multi-GPU/panels */
- 	from = X_PROBED;
- 	pci = xf86GetPciInfoForEntity(to_sna(output->scrn)->pEnt->index);
-@@ -728,6 +1121,38 @@ done:
- 		   sna_output->backlight.iface, best_iface, output->name);
- }
- 
-+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(22, 0)
-+static inline int sigio_block(void)
-+{
-+	return 0;
-+}
-+static inline void sigio_unblock(int was_blocked)
-+{
-+	(void)was_blocked;
-+}
-+#elif XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,12,99,901,0)
-+static inline int sigio_block(void)
-+{
-+	OsBlockSIGIO();
-+	return 0;
-+}
-+static inline void sigio_unblock(int was_blocked)
-+{
-+	OsReleaseSIGIO();
-+	(void)was_blocked;
-+}
-+#else
-+#include <xf86_OSproc.h>
-+static inline int sigio_block(void)
-+{
-+	return xf86BlockSIGIO();
-+}
-+static inline void sigio_unblock(int was_blocked)
-+{
-+	xf86UnblockSIGIO(was_blocked);
-+}
-+#endif
-+
- static char *canonical_kmode_name(const struct drm_mode_modeinfo *kmode)
- {
- 	char tmp[32], *buf;
-@@ -781,6 +1206,7 @@ mode_from_kmode(ScrnInfoPtr scrn,
- 	mode->VTotal = kmode->vtotal;
- 	mode->VScan = kmode->vscan;
- 
-+	mode->VRefresh = kmode->vrefresh;
- 	mode->Flags = kmode->flags;
- 	mode->name = get_kmode_name(kmode);
- 
-@@ -814,6 +1240,7 @@ mode_to_kmode(struct drm_mode_modeinfo *kmode, DisplayModePtr mode)
- 	kmode->vtotal = mode->VTotal;
- 	kmode->vscan = mode->VScan;
- 
-+	kmode->vrefresh = mode->VRefresh;
- 	kmode->flags = mode->Flags;
- 	if (mode->name)
- 		strncpy(kmode->name, mode->name, DRM_DISPLAY_MODE_LEN);
-@@ -824,11 +1251,12 @@ static void
- sna_crtc_force_outputs_on(xf86CrtcPtr crtc)
- {
- 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
-+	/* All attached outputs are valid, so update our timestamps */
-+	unsigned now = GetTimeInMillis();
- 	int i;
- 
- 	assert(to_sna_crtc(crtc));
--	DBG(("%s(pipe=%d), currently? %d\n", __FUNCTION__,
--	     to_sna_crtc(crtc)->pipe, to_sna_crtc(crtc)->dpms_mode));
-+	DBG(("%s(pipe=%d)\n", __FUNCTION__, sna_crtc_pipe(crtc)));
- 
- 	/* DPMS handling by the kernel is inconsistent, so after setting a
- 	 * mode on an output presume that we intend for it to be on, or that
-@@ -843,10 +1271,11 @@ sna_crtc_force_outputs_on(xf86CrtcPtr crtc)
- 		if (output->crtc != crtc)
- 			continue;
- 
--		output->funcs->dpms(output, DPMSModeOn);
-+		__sna_output_dpms(output, DPMSModeOn, false);
-+		if (to_sna_output(output)->last_detect)
-+			to_sna_output(output)->last_detect = now;
- 	}
- 
--	to_sna_crtc(crtc)->dpms_mode = DPMSModeOn;
- #if XF86_CRTC_VERSION >= 3
- 	crtc->active = TRUE;
- #endif
-@@ -859,8 +1288,7 @@ sna_crtc_force_outputs_off(xf86CrtcPtr crtc)
- 	int i;
- 
- 	assert(to_sna_crtc(crtc));
--	DBG(("%s(pipe=%d), currently? %d\n", __FUNCTION__,
--	     to_sna_crtc(crtc)->pipe, to_sna_crtc(crtc)->dpms_mode));
-+	DBG(("%s(pipe=%d)\n", __FUNCTION__, sna_crtc_pipe(crtc)));
- 
- 	/* DPMS handling by the kernel is inconsistent, so after setting a
- 	 * mode on an output presume that we intend for it to be on, or that
-@@ -875,35 +1303,47 @@ sna_crtc_force_outputs_off(xf86CrtcPtr crtc)
- 		if (output->crtc != crtc)
- 			continue;
- 
--		output->funcs->dpms(output, DPMSModeOff);
-+		__sna_output_dpms(output, DPMSModeOff, false);
- 	}
--
--	to_sna_crtc(crtc)->dpms_mode = DPMSModeOff;
- }
- 
- static unsigned
--rotation_reduce(struct plane *p, unsigned rotation)
-+rotation_reflect(unsigned rotation)
- {
--	unsigned unsupported_rotations = rotation & ~p->rotation.supported;
-+	unsigned other_bits;
- 
--	if (unsupported_rotations == 0)
--		return rotation;
-+	/* paranoia for future extensions */
-+	other_bits = rotation & ~RR_Rotate_All;
- 
--#define RR_Reflect_XY (RR_Reflect_X | RR_Reflect_Y)
-+	/* flip the reflection to compensate for reflecting the rotation */
-+	other_bits ^= RR_Reflect_X | RR_Reflect_Y;
- 
--	if ((unsupported_rotations & RR_Reflect_XY) == RR_Reflect_XY &&
--	    p->rotation.supported& RR_Rotate_180) {
--		rotation &= ~RR_Reflect_XY;
--		rotation ^= RR_Rotate_180;
--	}
-+	/* Reflect the screen by rotating the rotation bit,
-+	 * which has to have at least RR_Rotate_0 set. This allows
-+	 * us to reflect any of the rotation bits, not just 0.
-+	 */
-+	rotation &= RR_Rotate_All;
-+	assert(rotation);
-+	rotation <<= 2; /* RR_Rotate_0 -> RR_Rotate_180 etc */
-+	rotation |= rotation >> 4; /* RR_Rotate_270' to RR_Rotate_90 */
-+	rotation &= RR_Rotate_All;
-+	assert(rotation);
- 
--	if ((unsupported_rotations & RR_Rotate_180) &&
--	    (p->rotation.supported& RR_Reflect_XY) == RR_Reflect_XY) {
--		rotation ^= RR_Reflect_XY;
--		rotation &= ~RR_Rotate_180;
-+	return rotation | other_bits;
-+}
-+
-+static unsigned
-+rotation_reduce(struct plane *p, unsigned rotation)
-+{
-+	/* If unsupported try exchanging rotation for a reflection */
-+	if (rotation & ~p->rotation.supported) {
-+		unsigned new_rotation = rotation_reflect(rotation);
-+		if ((new_rotation & p->rotation.supported) == new_rotation)
-+			rotation = new_rotation;
- 	}
- 
--#undef RR_Reflect_XY
-+	/* Only one rotation bit should be set */
-+	assert(is_power_of_two(rotation & RR_Rotate_All));
- 
- 	return rotation;
- }
-@@ -923,7 +1363,7 @@ rotation_set(struct sna *sna, struct plane *p, uint32_t desired)
- 	if (desired == p->rotation.current)
- 		return true;
- 
--	if ((desired & p->rotation.supported) == 0) {
-+	if ((desired & p->rotation.supported) != desired) {
- 		errno = EINVAL;
- 		return false;
- 	}
-@@ -956,20 +1396,105 @@ rotation_reset(struct plane *p)
- 	p->rotation.current = 0;
- }
- 
--bool sna_crtc_set_sprite_rotation(xf86CrtcPtr crtc, uint32_t rotation)
-+bool sna_crtc_set_sprite_rotation(xf86CrtcPtr crtc,
-+				  unsigned idx,
-+				  uint32_t rotation)
- {
-+	struct plane *sprite;
- 	assert(to_sna_crtc(crtc));
-+
-+	sprite = lookup_sprite(to_sna_crtc(crtc), idx);
-+	if (!sprite)
-+		return false;
-+
- 	DBG(("%s: CRTC:%d [pipe=%d], sprite=%u set-rotation=%x\n",
- 	     __FUNCTION__,
--	     to_sna_crtc(crtc)->id, to_sna_crtc(crtc)->pipe, to_sna_crtc(crtc)->sprite.id,
--	     rotation));
-+	     sna_crtc_id(crtc), sna_crtc_pipe(crtc),
-+	     sprite->id, rotation));
- 
--	return rotation_set(to_sna(crtc->scrn),
--			    &to_sna_crtc(crtc)->sprite,
--			    rotation_reduce(&to_sna_crtc(crtc)->sprite, rotation));
-+	return rotation_set(to_sna(crtc->scrn), sprite,
-+			    rotation_reduce(sprite, rotation));
- }
- 
--static bool
-+#if HAS_DEBUG_FULL
-+#if !HAS_DEBUG_FULL
-+#define LogF ErrorF
-+#endif
-+struct kmsg {
-+	int fd;
-+	int saved_loglevel;
-+};
-+
-+static int kmsg_get_debug(void)
-+{
-+	FILE *file;
-+	int v = -1;
-+
-+	file = fopen("/sys/module/drm/parameters/debug", "r");
-+	if (file) {
-+		fscanf(file, "%d", &v);
-+		fclose(file);
-+	}
-+
-+	return v;
-+}
-+
-+static void kmsg_set_debug(int v)
-+{
-+	FILE *file;
-+
-+	file = fopen("/sys/module/drm/parameters/debug", "w");
-+	if (file) {
-+		fprintf(file, "%d\n", v);
-+		fclose(file);
-+	}
-+}
-+
-+static void kmsg_open(struct kmsg *k)
-+{
-+	k->saved_loglevel = kmsg_get_debug();
-+	if (k->saved_loglevel != -1)
-+		kmsg_set_debug(0xff);
-+
-+	k->fd = open("/dev/kmsg", O_RDONLY | O_NONBLOCK);
-+	if (k->fd != -1)
-+		lseek(k->fd, 0, SEEK_END);
-+}
-+
-+static void kmsg_close(struct kmsg *k, int dump)
-+{
-+	FILE *file;
-+
-+	file = NULL;
-+	if (k->fd != -1 && dump)
-+		file = fdopen(k->fd, "r");
-+	if (file) {
-+		size_t len = 0;
-+		char *line = NULL;
-+
-+		while (getline(&line, &len, file) != -1) {
-+			char *start = strchr(line, ';');
-+			if (start)
-+				LogF("KMSG: %s", start + 1);
-+		}
-+
-+		free(line);
-+		fclose(file);
-+	}
-+
-+	if (k->fd != -1)
-+		close(k->fd);
-+
-+	if (k->saved_loglevel != -1)
-+		kmsg_set_debug(k->saved_loglevel);
-+}
-+#else
-+struct kmsg { int unused; };
-+static void kmsg_open(struct kmsg *k) {}
-+static void kmsg_close(struct kmsg *k, int dump) {}
-+#endif
-+
-+static int
- sna_crtc_apply(xf86CrtcPtr crtc)
- {
- 	struct sna *sna = to_sna(crtc->scrn);
-@@ -978,26 +1503,39 @@ sna_crtc_apply(xf86CrtcPtr crtc)
- 	struct drm_mode_crtc arg;
- 	uint32_t output_ids[32];
- 	int output_count = 0;
--	int i;
-+	int sigio, i;
-+	struct kmsg kmsg;
-+	int ret = EINVAL;
- 
--	DBG(("%s CRTC:%d [pipe=%d], handle=%d\n", __FUNCTION__, sna_crtc->id, sna_crtc->pipe, sna_crtc->bo->handle));
-+	DBG(("%s CRTC:%d [pipe=%d], handle=%d\n", __FUNCTION__,
-+	     __sna_crtc_id(sna_crtc), __sna_crtc_pipe(sna_crtc),
-+	     sna_crtc->bo->handle));
- 	if (!sna_crtc->kmode.clock) {
- 		ERR(("%s(CRTC:%d [pipe=%d]): attempted to set an invalid mode\n",
--		     __FUNCTION__, sna_crtc->id, sna_crtc->pipe));
--		return false;
-+		     __FUNCTION__, __sna_crtc_id(sna_crtc), __sna_crtc_pipe(sna_crtc)));
-+		return EINVAL;
- 	}
- 
-+	kmsg_open(&kmsg);
-+	sigio = sigio_block();
-+
- 	assert(sna->mode.num_real_output < ARRAY_SIZE(output_ids));
- 	sna_crtc_disable_cursor(sna, sna_crtc);
- 
- 	if (!rotation_set(sna, &sna_crtc->primary, sna_crtc->rotation)) {
-+		memset(&arg, 0, sizeof(arg));
-+		arg.crtc_id = __sna_crtc_id(sna_crtc);
-+		(void)drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_SETCRTC, &arg);
-+	}
-+
-+	if (!rotation_set(sna, &sna_crtc->primary, sna_crtc->rotation)) {
- 		ERR(("%s: set-primary-rotation failed (rotation-id=%d, rotation=%d) on CRTC:%d [pipe=%d], errno=%d\n",
--		     __FUNCTION__, sna_crtc->primary.rotation.prop, sna_crtc->rotation, sna_crtc->id, sna_crtc->pipe, errno));
-+		     __FUNCTION__, sna_crtc->primary.rotation.prop, sna_crtc->rotation, __sna_crtc_id(sna_crtc), __sna_crtc_pipe(sna_crtc), errno));
- 		sna_crtc->primary.rotation.supported &= ~sna_crtc->rotation;
--		return false;
-+		goto unblock;
- 	}
- 	DBG(("%s: CRTC:%d [pipe=%d] primary rotation set to %x\n",
--	     __FUNCTION__, sna_crtc->id, sna_crtc->pipe, sna_crtc->rotation));
-+	     __FUNCTION__, __sna_crtc_id(sna_crtc), __sna_crtc_pipe(sna_crtc), sna_crtc->rotation));
- 
- 	for (i = 0; i < sna->mode.num_real_output; i++) {
- 		xf86OutputPtr output = config->output[i];
-@@ -1008,7 +1546,7 @@ sna_crtc_apply(xf86CrtcPtr crtc)
- 		 * and we lose track of the user settings.
- 		 */
- 		if (output->crtc == NULL)
--			output->funcs->dpms(output, DPMSModeOff);
-+			__sna_output_dpms(output, DPMSModeOff, false);
- 
- 		if (output->crtc != crtc)
- 			continue;
-@@ -1022,29 +1560,27 @@ sna_crtc_apply(xf86CrtcPtr crtc)
- 
- 		DBG(("%s: attaching output '%s' %d [%d] to crtc:%d (pipe %d) (possible crtc:%x, possible clones:%x)\n",
- 		     __FUNCTION__, output->name, i, to_connector_id(output),
--		     sna_crtc->id, sna_crtc->pipe,
-+		     __sna_crtc_id(sna_crtc), __sna_crtc_pipe(sna_crtc),
- 		     (uint32_t)output->possible_crtcs,
- 		     (uint32_t)output->possible_clones));
- 
--		assert(output->possible_crtcs & (1 << sna_crtc->pipe) ||
-+		assert(output->possible_crtcs & (1 << __sna_crtc_pipe(sna_crtc)) ||
- 		       is_zaphod(crtc->scrn));
- 
- 		output_ids[output_count] = to_connector_id(output);
- 		if (++output_count == ARRAY_SIZE(output_ids)) {
- 			DBG(("%s: too many outputs (%d) for me!\n",
- 			     __FUNCTION__, output_count));
--			errno = EINVAL;
--			return false;
-+			goto unblock;
- 		}
- 	}
- 	if (output_count == 0) {
- 		DBG(("%s: no outputs\n", __FUNCTION__));
--		errno = EINVAL;
--		return false;
-+		goto unblock;
- 	}
- 
- 	VG_CLEAR(arg);
--	arg.crtc_id = sna_crtc->id;
-+	arg.crtc_id = __sna_crtc_id(sna_crtc);
- 	arg.fb_id = fb_id(sna_crtc->bo);
- 	if (sna_crtc->transform || sna_crtc->slave_pixmap) {
- 		arg.x = 0;
-@@ -1061,7 +1597,7 @@ sna_crtc_apply(xf86CrtcPtr crtc)
- 	arg.mode_valid = 1;
- 
- 	DBG(("%s: applying crtc [%d, pipe=%d] mode=%dx%d+%d+%d@%d, fb=%d%s%s update to %d outputs [%d...]\n",
--	     __FUNCTION__, sna_crtc->id, sna_crtc->pipe,
-+	     __FUNCTION__, __sna_crtc_id(sna_crtc), __sna_crtc_pipe(sna_crtc),
- 	     arg.mode.hdisplay,
- 	     arg.mode.vdisplay,
- 	     arg.x, arg.y,
-@@ -1071,12 +1607,19 @@ sna_crtc_apply(xf86CrtcPtr crtc)
- 	     sna_crtc->transform ? " [transformed]" : "",
- 	     output_count, output_count ? output_ids[0] : 0));
- 
--	if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_SETCRTC, &arg))
--		return false;
-+	ret = 0;
-+	if (unlikely(drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_SETCRTC, &arg))) {
-+		ret = errno;
-+		goto unblock;
-+	}
- 
- 	sna_crtc->mode_serial++;
- 	sna_crtc_force_outputs_on(crtc);
--	return true;
-+
-+unblock:
-+	sigio_unblock(sigio);
-+	kmsg_close(&kmsg, ret);
-+	return ret;
- }
- 
- static bool overlap(const BoxRec *a, const BoxRec *b)
-@@ -1094,26 +1637,73 @@ static bool overlap(const BoxRec *a, const BoxRec *b)
- 	return true;
- }
- 
-+static void defer_event(struct sna *sna, struct drm_event *base)
-+{
-+	if (sna->mode.shadow_nevent == sna->mode.shadow_size) {
-+		int size = sna->mode.shadow_size * 2;
-+		void *ptr;
-+
-+		ptr = realloc(sna->mode.shadow_events,
-+			      sizeof(struct drm_event_vblank)*size);
-+		if (!ptr)
-+			return;
-+
-+		sna->mode.shadow_events = ptr;
-+		sna->mode.shadow_size = size;
-+	}
-+
-+	memcpy(&sna->mode.shadow_events[sna->mode.shadow_nevent++],
-+	       base, sizeof(struct drm_event_vblank));
-+	DBG(("%s: deferring event count=%d\n",
-+	     __func__, sna->mode.shadow_nevent));
-+}
-+
-+static void flush_events(struct sna *sna)
-+{
-+	int n;
-+
-+	if (!sna->mode.shadow_nevent)
-+		return;
-+
-+	DBG(("%s: flushing %d events=%d\n", __func__, sna->mode.shadow_nevent));
-+
-+	for (n = 0; n < sna->mode.shadow_nevent; n++) {
-+		struct drm_event_vblank *vb = &sna->mode.shadow_events[n];
-+
-+		if ((uintptr_t)(vb->user_data) & 2)
-+			sna_present_vblank_handler(vb);
-+		else
-+			sna_dri2_vblank_handler(vb);
-+	}
-+
-+	sna->mode.shadow_nevent = 0;
-+}
-+
-+
- static bool wait_for_shadow(struct sna *sna,
- 			    struct sna_pixmap *priv,
- 			    unsigned flags)
- {
- 	PixmapPtr pixmap = priv->pixmap;
--	DamagePtr damage;
- 	struct kgem_bo *bo, *tmp;
- 	int flip_active;
- 	bool ret = true;
- 
--	DBG(("%s: flags=%x, flips=%d, handle=%d, shadow=%d\n",
--	     __FUNCTION__, flags, sna->mode.flip_active,
-+	DBG(("%s: enabled? %d waiting? %d, flags=%x, flips=%d, pixmap=%ld [front?=%d], handle=%d, shadow=%d\n",
-+	     __FUNCTION__, sna->mode.shadow_enabled, sna->mode.shadow_wait,
-+	     flags, sna->mode.flip_active,
-+	     pixmap->drawable.serialNumber, pixmap == sna->front,
- 	     priv->gpu_bo->handle, sna->mode.shadow->handle));
- 
- 	assert(priv->move_to_gpu_data == sna);
- 	assert(sna->mode.shadow != priv->gpu_bo);
- 
--	if (flags == 0 || pixmap != sna->front || !sna->mode.shadow_damage)
-+	if (flags == 0 || pixmap != sna->front || !sna->mode.shadow_enabled)
- 		goto done;
- 
-+	assert(sna->mode.shadow_damage);
-+	assert(!sna->mode.shadow_wait);
-+
- 	if ((flags & MOVE_WRITE) == 0) {
- 		if ((flags & __MOVE_SCANOUT) == 0) {
- 			struct sna_crtc *crtc;
-@@ -1154,9 +1744,7 @@ static bool wait_for_shadow(struct sna *sna,
- 	}
- 
- 	assert(sna->mode.shadow_active);
--
--	damage = sna->mode.shadow_damage;
--	sna->mode.shadow_damage = NULL;
-+	sna->mode.shadow_wait = true;
- 
- 	flip_active = sna->mode.flip_active;
- 	if (flip_active) {
-@@ -1208,6 +1796,8 @@ static bool wait_for_shadow(struct sna *sna,
- 			bo = sna->mode.shadow;
- 		}
- 	}
-+	assert(sna->mode.shadow_wait);
-+	sna->mode.shadow_wait = false;
- 
- 	if (bo->refcnt > 1) {
- 		bo = kgem_create_2d(&sna->kgem,
-@@ -1230,8 +1820,6 @@ static bool wait_for_shadow(struct sna *sna,
- 			bo = sna->mode.shadow;
- 	}
- 
--	sna->mode.shadow_damage = damage;
--
- 	RegionSubtract(&sna->mode.shadow_region,
- 		       &sna->mode.shadow_region,
- 		       &sna->mode.shadow_cancel);
-@@ -1269,6 +1857,7 @@ static bool wait_for_shadow(struct sna *sna,
- 			RegionSubtract(&sna->mode.shadow_region, &sna->mode.shadow_region, &region);
- 		}
- 
-+		crtc->client_bo->active_scanout--;
- 		kgem_bo_destroy(&sna->kgem, crtc->client_bo);
- 		crtc->client_bo = NULL;
- 		list_del(&crtc->shadow_link);
-@@ -1281,12 +1870,13 @@ static bool wait_for_shadow(struct sna *sna,
- 		     sna->mode.shadow_region.extents.y1,
- 		     sna->mode.shadow_region.extents.x2,
- 		     sna->mode.shadow_region.extents.y2));
--		ret = sna->render.copy_boxes(sna, GXcopy,
--					     &pixmap->drawable, priv->gpu_bo, 0, 0,
--					     &pixmap->drawable, bo, 0, 0,
--					     region_rects(&sna->mode.shadow_region),
--					     region_num_rects(&sna->mode.shadow_region),
--					     0);
-+		if (!sna->render.copy_boxes(sna, GXcopy,
-+					    &pixmap->drawable, priv->gpu_bo, 0, 0,
-+					    &pixmap->drawable, bo, 0, 0,
-+					    region_rects(&sna->mode.shadow_region),
-+					    region_num_rects(&sna->mode.shadow_region),
-+					    0))
-+			ERR(("%s: copy failed\n", __FUNCTION__));
- 	}
- 
- 	if (priv->cow)
-@@ -1295,11 +1885,13 @@ static bool wait_for_shadow(struct sna *sna,
- 	sna_pixmap_unmap(pixmap, priv);
- 
- 	DBG(("%s: setting front pixmap to handle=%d\n", __FUNCTION__, bo->handle));
-+	sna->mode.shadow->active_scanout--;
- 	tmp = priv->gpu_bo;
- 	priv->gpu_bo = bo;
- 	if (bo != sna->mode.shadow)
- 		kgem_bo_destroy(&sna->kgem, sna->mode.shadow);
- 	sna->mode.shadow = tmp;
-+	sna->mode.shadow->active_scanout++;
- 
- 	sna_dri2_pixmap_update_bo(sna, pixmap, bo);
- 
-@@ -1311,6 +1903,9 @@ done:
- 	priv->move_to_gpu_data = NULL;
- 	priv->move_to_gpu = NULL;
- 
-+	assert(!sna->mode.shadow_wait);
-+	flush_events(sna);
-+
- 	return ret;
- }
- 
-@@ -1358,22 +1953,43 @@ bool sna_pixmap_discard_shadow_damage(struct sna_pixmap *priv,
- 	return RegionNil(&sna->mode.shadow_region);
- }
- 
-+static void sna_mode_damage(DamagePtr damage, RegionPtr region, void *closure)
-+{
-+	struct sna *sna = closure;
-+
-+	if (sna->mode.rr_active)
-+		return;
-+
-+	/* Throw away the rectangles if the region grows too big */
-+	region = DamageRegion(damage);
-+	if (region->data) {
-+		RegionRec dup;
-+
-+		dup = *region;
-+		RegionUninit(&dup);
-+
-+		region->data = NULL;
-+	}
-+}
-+
- static bool sna_mode_enable_shadow(struct sna *sna)
- {
--	ScreenPtr screen = sna->scrn->pScreen;
-+	ScreenPtr screen = to_screen_from_sna(sna);
- 
- 	DBG(("%s\n", __FUNCTION__));
- 	assert(sna->mode.shadow == NULL);
- 	assert(sna->mode.shadow_damage == NULL);
- 	assert(sna->mode.shadow_active == 0);
-+	assert(!sna->mode.shadow_enabled);
- 
--	sna->mode.shadow_damage = DamageCreate(NULL, NULL,
--					       DamageReportNone, TRUE,
--					       screen, screen);
-+	sna->mode.shadow_damage = DamageCreate(sna_mode_damage, NULL,
-+					       DamageReportRawRegion,
-+					       TRUE, screen, sna);
- 	if (!sna->mode.shadow_damage)
- 		return false;
- 
- 	DamageRegister(&sna->front->drawable, sna->mode.shadow_damage);
-+	sna->mode.shadow_enabled = true;
- 	return true;
- }
- 
-@@ -1381,8 +1997,10 @@ static void sna_mode_disable_shadow(struct sna *sna)
- {
- 	struct sna_pixmap *priv;
- 
--	if (!sna->mode.shadow_damage)
-+	if (!sna->mode.shadow_damage) {
-+		assert(!sna->mode.shadow_enabled);
- 		return;
-+	}
- 
- 	DBG(("%s\n", __FUNCTION__));
- 
-@@ -1393,8 +2011,10 @@ static void sna_mode_disable_shadow(struct sna *sna)
- 	DamageUnregister(&sna->front->drawable, sna->mode.shadow_damage);
- 	DamageDestroy(sna->mode.shadow_damage);
- 	sna->mode.shadow_damage = NULL;
-+	sna->mode.shadow_enabled = false;
- 
- 	if (sna->mode.shadow) {
-+		sna->mode.shadow->active_scanout--;
- 		kgem_bo_destroy(&sna->kgem, sna->mode.shadow);
- 		sna->mode.shadow = NULL;
- 	}
-@@ -1413,7 +2033,7 @@ static void sna_crtc_slave_damage(DamagePtr damage, RegionPtr region, void *clos
- 	     __FUNCTION__,
- 	     region->extents.x1, region->extents.y1, region->extents.x2, region->extents.y2,
- 	     region_num_rects(region),
--	     crtc->pipe, crtc->base->x, crtc->base->y));
-+	     __sna_crtc_pipe(crtc), crtc->base->x, crtc->base->y));
- 
- 	assert(crtc->slave_damage == damage);
- 	assert(sna->mode.shadow_damage);
-@@ -1431,7 +2051,7 @@ static bool sna_crtc_enable_shadow(struct sna *sna, struct sna_crtc *crtc)
- 		return true;
- 	}
- 
--	DBG(("%s: enabling for crtc %d\n", __FUNCTION__, crtc->id));
-+	DBG(("%s: enabling for crtc %d\n", __FUNCTION__, __sna_crtc_id(crtc)));
- 
- 	if (!sna->mode.shadow_active) {
- 		if (!sna_mode_enable_shadow(sna))
-@@ -1443,9 +2063,12 @@ static bool sna_crtc_enable_shadow(struct sna *sna, struct sna_crtc *crtc)
- 	if (crtc->slave_pixmap) {
- 		assert(crtc->slave_damage == NULL);
- 
-+		DBG(("%s: enabling PRIME slave tracking on CRTC %d [pipe=%d], pixmap=%ld\n",
-+		     __FUNCTION__, __sna_crtc_id(crtc), __sna_crtc_pipe(crtc), crtc->slave_pixmap->drawable.serialNumber));
- 		crtc->slave_damage = DamageCreate(sna_crtc_slave_damage, NULL,
- 						  DamageReportRawRegion, TRUE,
--						  sna->scrn->pScreen, crtc);
-+						  to_screen_from_sna(sna),
-+						  crtc);
- 		if (crtc->slave_damage == NULL) {
- 			if (!--sna->mode.shadow_active)
- 				sna_mode_disable_shadow(sna);
-@@ -1465,6 +2088,9 @@ static void sna_crtc_disable_override(struct sna *sna, struct sna_crtc *crtc)
- 	if (crtc->client_bo == NULL)
- 		return;
- 
-+	assert(crtc->client_bo->refcnt >= crtc->client_bo->active_scanout);
-+	crtc->client_bo->active_scanout--;
-+
- 	if (!crtc->transform) {
- 		DrawableRec tmp;
- 
-@@ -1489,7 +2115,7 @@ static void sna_crtc_disable_shadow(struct sna *sna, struct sna_crtc *crtc)
- 	if (!crtc->shadow)
- 		return;
- 
--	DBG(("%s: disabling for crtc %d\n", __FUNCTION__, crtc->id));
-+	DBG(("%s: disabling for crtc %d\n", __FUNCTION__, __sna_crtc_id(crtc)));
- 	assert(sna->mode.shadow_active > 0);
- 
- 	if (crtc->slave_damage) {
-@@ -1517,14 +2143,24 @@ __sna_crtc_disable(struct sna *sna, struct sna_crtc *sna_crtc)
- 	sna_crtc_disable_shadow(sna, sna_crtc);
- 
- 	if (sna_crtc->bo) {
-+		DBG(("%s: releasing handle=%d from scanout, active=%d\n",
-+		     __FUNCTION__,sna_crtc->bo->handle, sna_crtc->bo->active_scanout-1));
-+		assert(sna_crtc->flags & CRTC_ON);
- 		assert(sna_crtc->bo->active_scanout);
- 		assert(sna_crtc->bo->refcnt >= sna_crtc->bo->active_scanout);
- 		sna_crtc->bo->active_scanout--;
- 		kgem_bo_destroy(&sna->kgem, sna_crtc->bo);
- 		sna_crtc->bo = NULL;
-+		sna_crtc->flags &= ~CRTC_ON;
- 
--		assert(sna->mode.front_active);
--		sna->mode.front_active--;
-+		if (sna->mode.hidden) {
-+			sna->mode.hidden--;
-+			assert(sna->mode.hidden);
-+			assert(sna->mode.front_active == 0);
-+		} else {
-+			assert(sna->mode.front_active);
-+			sna->mode.front_active--;
-+		}
- 		sna->mode.dirty = true;
- 	}
- 
-@@ -1532,13 +2168,19 @@ __sna_crtc_disable(struct sna *sna, struct sna_crtc *sna_crtc)
- 		kgem_bo_destroy(&sna->kgem, sna_crtc->shadow_bo);
- 		sna_crtc->shadow_bo = NULL;
- 	}
--	sna_crtc->transform = false;
-+	if (sna_crtc->transform) {
-+		assert(sna->mode.rr_active);
-+		sna->mode.rr_active--;
-+		sna_crtc->transform = false;
-+	}
- 
-+	sna_crtc->cursor_transform = false;
-+	sna_crtc->hwcursor = true;
- 	assert(!sna_crtc->shadow);
- }
- 
- static void
--sna_crtc_disable(xf86CrtcPtr crtc)
-+sna_crtc_disable(xf86CrtcPtr crtc, bool force)
- {
- 	struct sna *sna = to_sna(crtc->scrn);
- 	struct sna_crtc *sna_crtc = to_sna_crtc(crtc);
-@@ -1547,14 +2189,16 @@ sna_crtc_disable(xf86CrtcPtr crtc)
- 	if (sna_crtc == NULL)
- 		return;
- 
--	DBG(("%s: disabling crtc [%d, pipe=%d]\n", __FUNCTION__,
--	     sna_crtc->id, sna_crtc->pipe));
-+	if (!force && sna_crtc->bo == NULL)
-+		return;
-+
-+	DBG(("%s: disabling crtc [%d, pipe=%d], force?=%d\n", __FUNCTION__,
-+	     __sna_crtc_id(sna_crtc), __sna_crtc_pipe(sna_crtc), force));
- 
- 	sna_crtc_force_outputs_off(crtc);
--	assert(sna_crtc->dpms_mode == DPMSModeOff);
- 
- 	memset(&arg, 0, sizeof(arg));
--	arg.crtc_id = sna_crtc->id;
-+	arg.crtc_id = __sna_crtc_id(sna_crtc);
- 	(void)drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_SETCRTC, &arg);
- 
- 	__sna_crtc_disable(sna, sna_crtc);
-@@ -1574,19 +2218,19 @@ static void update_flush_interval(struct sna *sna)
- 
- 		if (!crtc->enabled) {
- 			DBG(("%s: CRTC:%d (pipe %d) disabled\n",
--			     __FUNCTION__,i, to_sna_crtc(crtc)->pipe));
-+			     __FUNCTION__,i, sna_crtc_pipe(crtc)));
- 			assert(to_sna_crtc(crtc)->bo == NULL);
- 			continue;
- 		}
- 
--		if (to_sna_crtc(crtc)->dpms_mode != DPMSModeOn) {
-+		if (to_sna_crtc(crtc)->bo == NULL) {
- 			DBG(("%s: CRTC:%d (pipe %d) turned off\n",
--			     __FUNCTION__,i, to_sna_crtc(crtc)->pipe));
-+			     __FUNCTION__,i, sna_crtc_pipe(crtc)));
- 			continue;
- 		}
- 
- 		DBG(("%s: CRTC:%d (pipe %d) vrefresh=%f\n",
--		     __FUNCTION__, i, to_sna_crtc(crtc)->pipe,
-+		     __FUNCTION__, i, sna_crtc_pipe(crtc),
- 		     xf86ModeVRefresh(&crtc->mode)));
- 		max_vrefresh = max(max_vrefresh, xf86ModeVRefresh(&crtc->mode));
- 	}
-@@ -1642,7 +2286,7 @@ void sna_copy_fbcon(struct sna *sna)
- 	int dx, dy;
- 	int i;
- 
--	if (wedged(sna))
-+	if (wedged(sna) || isGPU(sna->scrn))
- 		return;
- 
- 	DBG(("%s\n", __FUNCTION__));
-@@ -1662,7 +2306,7 @@ void sna_copy_fbcon(struct sna *sna)
- 		assert(crtc != NULL);
- 
- 		VG_CLEAR(mode);
--		mode.crtc_id = crtc->id;
-+		mode.crtc_id = __sna_crtc_id(crtc);
- 		if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETCRTC, &mode))
- 			continue;
- 		if (!mode.fb_id)
-@@ -1726,7 +2370,7 @@ void sna_copy_fbcon(struct sna *sna)
- 	kgem_bo_destroy(&sna->kgem, bo);
- 
- #if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(10, 0)
--	sna->scrn->pScreen->canDoBGNoneRoot = ok;
-+	to_screen_from_sna(sna)->canDoBGNoneRoot = ok;
- #endif
- }
- 
-@@ -1736,7 +2380,6 @@ static bool use_shadow(struct sna *sna, xf86CrtcPtr crtc)
- 	PictTransform crtc_to_fb;
- 	struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc;
- 	unsigned pitch_limit;
--	struct sna_pixmap *priv;
- 	BoxRec b;
- 
- 	assert(sna->scrn->virtualX && sna->scrn->virtualY);
-@@ -1765,27 +2408,31 @@ static bool use_shadow(struct sna *sna, xf86CrtcPtr crtc)
- 		return true;
- 	}
- 
--	priv = sna_pixmap_force_to_gpu(sna->front, MOVE_READ | __MOVE_SCANOUT);
--	if (priv == NULL)
--		return true; /* maybe we can create a bo for the scanout? */
--
--	if (sna->kgem.gen == 071)
--		pitch_limit = priv->gpu_bo->tiling ? 16 * 1024 : 32 * 1024;
--	else if ((sna->kgem.gen >> 3) > 4)
--		pitch_limit = 32 * 1024;
--	else if ((sna->kgem.gen >> 3) == 4)
--		pitch_limit = priv->gpu_bo->tiling ? 16 * 1024 : 32 * 1024;
--	else if ((sna->kgem.gen >> 3) == 3)
--		pitch_limit = priv->gpu_bo->tiling ? 8 * 1024 : 16 * 1024;
--	else
--		pitch_limit = 8 * 1024;
--	DBG(("%s: gpu bo handle=%d tiling=%d pitch=%d, limit=%d\n", __FUNCTION__, priv->gpu_bo->handle, priv->gpu_bo->tiling, priv->gpu_bo->pitch, pitch_limit));
--	if (priv->gpu_bo->pitch > pitch_limit)
--		return true;
-+	if (!isGPU(sna->scrn)) {
-+		struct sna_pixmap *priv;
- 
--	if (priv->gpu_bo->tiling && sna->flags & SNA_LINEAR_FB) {
--		DBG(("%s: gpu bo is tiled, need linear, forcing shadow\n", __FUNCTION__));
--		return true;
-+		priv = sna_pixmap_force_to_gpu(sna->front, MOVE_READ | __MOVE_SCANOUT);
-+		if (priv == NULL)
-+			return true; /* maybe we can create a bo for the scanout? */
-+
-+		if (sna->kgem.gen == 071)
-+			pitch_limit = priv->gpu_bo->tiling ? 16 * 1024 : 32 * 1024;
-+		else if ((sna->kgem.gen >> 3) > 4)
-+			pitch_limit = 32 * 1024;
-+		else if ((sna->kgem.gen >> 3) == 4)
-+			pitch_limit = priv->gpu_bo->tiling ? 16 * 1024 : 32 * 1024;
-+		else if ((sna->kgem.gen >> 3) == 3)
-+			pitch_limit = priv->gpu_bo->tiling ? 8 * 1024 : 16 * 1024;
-+		else
-+			pitch_limit = 8 * 1024;
-+		DBG(("%s: gpu bo handle=%d tiling=%d pitch=%d, limit=%d\n", __FUNCTION__, priv->gpu_bo->handle, priv->gpu_bo->tiling, priv->gpu_bo->pitch, pitch_limit));
-+		if (priv->gpu_bo->pitch > pitch_limit)
-+			return true;
-+
-+		if (priv->gpu_bo->tiling && sna->flags & SNA_LINEAR_FB) {
-+			DBG(("%s: gpu bo is tiled, need linear, forcing shadow\n", __FUNCTION__));
-+			return true;
-+		}
- 	}
- 
- 	transform = NULL;
-@@ -1800,9 +2447,9 @@ static bool use_shadow(struct sna *sna, xf86CrtcPtr crtc)
- 		bool needs_transform = true;
- 		unsigned rotation = rotation_reduce(&to_sna_crtc(crtc)->primary, crtc->rotation);
- 		DBG(("%s: natively supported rotation? rotation=%x & supported=%x == %d\n",
--		     __FUNCTION__, crtc->rotation, to_sna_crtc(crtc)->primary.rotation.supported,
--		     !!(crtc->rotation & to_sna_crtc(crtc)->primary.rotation.supported)));
--		if (to_sna_crtc(crtc)->primary.rotation.supported & rotation)
-+		     __FUNCTION__, rotation, to_sna_crtc(crtc)->primary.rotation.supported,
-+		     rotation == (rotation & to_sna_crtc(crtc)->primary.rotation.supported)));
-+		if ((to_sna_crtc(crtc)->primary.rotation.supported & rotation) == rotation)
- 			needs_transform = RRTransformCompute(crtc->x, crtc->y,
- 							     crtc->mode.HDisplay, crtc->mode.VDisplay,
- 							     RR_Rotate_0, transform,
-@@ -1839,6 +2486,7 @@ static void set_shadow(struct sna *sna, RegionPtr region)
- 
- 	assert(priv->gpu_bo);
- 	assert(sna->mode.shadow);
-+	assert(sna->mode.shadow->active_scanout);
- 
- 	DBG(("%s: waiting for region %dx[(%d, %d), (%d, %d)], front handle=%d, shadow handle=%d\n",
- 	     __FUNCTION__,
-@@ -1912,6 +2560,28 @@ get_scanout_bo(struct sna *sna, PixmapPtr pixmap)
- 	return priv->gpu_bo;
- }
- 
-+static void shadow_clear(struct sna *sna,
-+			 PixmapPtr front, struct kgem_bo *bo,
-+			 xf86CrtcPtr crtc)
-+{
-+	bool ok = false;
-+	if (!wedged(sna))
-+		ok = sna->render.fill_one(sna, front, bo, 0,
-+					  0, 0, crtc->mode.HDisplay, crtc->mode.VDisplay,
-+					  GXclear);
-+	if (!ok) {
-+		void *ptr = kgem_bo_map__gtt(&sna->kgem, bo);
-+		if (ptr)
-+			memset(ptr, 0, bo->pitch * crtc->mode.HDisplay);
-+	}
-+	sna->mode.shadow_dirty = true;
-+}
-+
-+static bool rr_active(xf86CrtcPtr crtc)
-+{
-+	return crtc->transformPresent || crtc->rotation != RR_Rotate_0;
-+}
-+
- static struct kgem_bo *sna_crtc_attach(xf86CrtcPtr crtc)
- {
- 	struct sna_crtc *sna_crtc = to_sna_crtc(crtc);
-@@ -1919,10 +2589,15 @@ static struct kgem_bo *sna_crtc_attach(xf86CrtcPtr crtc)
- 	struct sna *sna = to_sna(scrn);
- 	struct kgem_bo *bo;
- 
--	sna_crtc->transform = false;
-+	if (sna_crtc->transform) {
-+		assert(sna->mode.rr_active);
-+		sna_crtc->transform = false;
-+		sna->mode.rr_active--;
-+	}
- 	sna_crtc->rotation = RR_Rotate_0;
- 
- 	if (use_shadow(sna, crtc)) {
-+		PixmapPtr front;
- 		unsigned long tiled_limit;
- 		int tiling;
- 
-@@ -1949,6 +2624,10 @@ force_shadow:
- 		}
- 
- 		tiling = I915_TILING_X;
-+		if (crtc->rotation & (RR_Rotate_90 | RR_Rotate_270) &&
-+		    sna->kgem.can_scanout_y)
-+			tiling = I915_TILING_Y;
-+
- 		if (sna->kgem.gen == 071)
- 			tiled_limit = 16 * 1024 * 8;
- 		else if ((sna->kgem.gen >> 3) > 4)
-@@ -1977,8 +2656,8 @@ force_shadow:
- 			return NULL;
- 		}
- 
--		if (__sna_pixmap_get_bo(sna->front) && !crtc->transformPresent) {
--			DrawableRec tmp;
-+		front = sna_crtc->slave_pixmap ?: sna->front;
-+		if (__sna_pixmap_get_bo(front) && !rr_active(crtc)) {
- 			BoxRec b;
- 
- 			b.x1 = crtc->x;
-@@ -1986,28 +2665,48 @@ force_shadow:
- 			b.x2 = crtc->x + crtc->mode.HDisplay;
- 			b.y2 = crtc->y + crtc->mode.VDisplay;
- 
--			DBG(("%s: copying onto shadow CRTC: (%d, %d)x(%d, %d), handle=%d\n",
--			     __FUNCTION__,
--			     b.x1, b.y1,
--			     b.x2, b.y2,
--			     bo->handle));
--
--			tmp.width = crtc->mode.HDisplay;
--			tmp.height = crtc->mode.VDisplay;
--			tmp.depth = sna->front->drawable.depth;
--			tmp.bitsPerPixel = sna->front->drawable.bitsPerPixel;
--
--			(void)sna->render.copy_boxes(sna, GXcopy,
--						     &sna->front->drawable, __sna_pixmap_get_bo(sna->front), 0, 0,
--						     &tmp, bo, -b.x1, -b.y1,
--						     &b, 1, 0);
--		}
-+			if (b.x1 < 0)
-+				b.x1 = 0;
-+			if (b.y1 < 0)
-+				b.y1 = 0;
-+			if (b.x2 > scrn->virtualX)
-+				b.x2 = scrn->virtualX;
-+			if (b.y2 > scrn->virtualY)
-+				b.y2 = scrn->virtualY;
-+			if (b.x2 - b.x1 < crtc->mode.HDisplay ||
-+			    b.y2 - b.y1 < crtc->mode.VDisplay)
-+				shadow_clear(sna, front, bo, crtc);
-+
-+			if (b.y2 > b.y1 && b.x2 > b.x1) {
-+				DrawableRec tmp;
-+
-+				DBG(("%s: copying onto shadow CRTC: (%d, %d)x(%d, %d) [fb=%dx%d], handle=%d\n",
-+				     __FUNCTION__,
-+				     b.x1, b.y1,
-+				     b.x2-b.x1, b.y2-b.y1,
-+				     scrn->virtualX, scrn->virtualY,
-+				     bo->handle));
-+
-+				tmp.width = crtc->mode.HDisplay;
-+				tmp.height = crtc->mode.VDisplay;
-+				tmp.depth = front->drawable.depth;
-+				tmp.bitsPerPixel = front->drawable.bitsPerPixel;
-+
-+				if (!sna->render.copy_boxes(sna, GXcopy,
-+							     &front->drawable, __sna_pixmap_get_bo(front), 0, 0,
-+							     &tmp, bo, -crtc->x, -crtc->y,
-+							     &b, 1, COPY_LAST))
-+					shadow_clear(sna, front, bo, crtc);
-+			}
-+		} else
-+			shadow_clear(sna, front, bo, crtc);
- 
- 		sna_crtc->shadow_bo_width = crtc->mode.HDisplay;
- 		sna_crtc->shadow_bo_height = crtc->mode.VDisplay;
- 		sna_crtc->shadow_bo = bo;
- out_shadow:
- 		sna_crtc->transform = true;
-+		sna->mode.rr_active++;
- 		return kgem_bo_reference(bo);
- 	} else {
- 		if (sna_crtc->shadow_bo) {
-@@ -2048,26 +2747,26 @@ out_shadow:
- 		}
- 
- 		if (sna->flags & SNA_TEAR_FREE) {
-+			RegionRec region;
-+
- 			assert(sna_crtc->slave_pixmap == NULL);
- 
- 			DBG(("%s: enabling TearFree shadow\n", __FUNCTION__));
-+			region.extents.x1 = 0;
-+			region.extents.y1 = 0;
-+			region.extents.x2 = sna->scrn->virtualX;
-+			region.extents.y2 = sna->scrn->virtualY;
-+			region.data = NULL;
-+
- 			if (!sna_crtc_enable_shadow(sna, sna_crtc)) {
- 				DBG(("%s: failed to enable crtc shadow\n", __FUNCTION__));
- 				return NULL;
- 			}
- 
--			if (sna->mode.shadow == NULL && !wedged(sna)) {
--				RegionRec region;
-+			if (sna->mode.shadow == NULL) {
- 				struct kgem_bo *shadow;
- 
- 				DBG(("%s: creating TearFree shadow bo\n", __FUNCTION__));
--
--				region.extents.x1 = 0;
--				region.extents.y1 = 0;
--				region.extents.x2 = sna->scrn->virtualX;
--				region.extents.y2 = sna->scrn->virtualY;
--				region.data = NULL;
--
- 				shadow = kgem_create_2d(&sna->kgem,
- 							region.extents.x2,
- 							region.extents.y2,
-@@ -2093,9 +2792,12 @@ out_shadow:
- 					goto force_shadow;
- 				}
- 
-+				assert(__sna_pixmap_get_bo(sna->front) == NULL ||
-+				       __sna_pixmap_get_bo(sna->front)->pitch == shadow->pitch);
- 				sna->mode.shadow = shadow;
--				set_shadow(sna, &region);
-+				sna->mode.shadow->active_scanout++;
- 			}
-+			set_shadow(sna, &region);
- 
- 			sna_crtc_disable_override(sna, sna_crtc);
- 		} else
-@@ -2107,6 +2809,37 @@ out_shadow:
- 	}
- }
- 
-+#define SCALING_EPSILON (1./256)
-+
-+static bool
-+is_affine(const struct pixman_f_transform *t)
-+{
-+	return (fabs(t->m[2][0]) < SCALING_EPSILON &&
-+		fabs(t->m[2][1]) < SCALING_EPSILON);
-+}
-+
-+static double determinant(const struct pixman_f_transform *t)
-+{
-+	return t->m[0][0]*t->m[1][1] - t->m[1][0]*t->m[0][1];
-+}
-+
-+static bool
-+affine_is_pixel_exact(const struct pixman_f_transform *t)
-+{
-+	double det = t->m[2][2] * determinant(t);
-+	if (fabs (det * det - 1.0) < SCALING_EPSILON) {
-+		if (fabs(t->m[0][1]) < SCALING_EPSILON &&
-+		    fabs(t->m[1][0]) < SCALING_EPSILON)
-+			return true;
-+
-+		if (fabs(t->m[0][0]) < SCALING_EPSILON &&
-+		    fabs(t->m[1][1]) < SCALING_EPSILON)
-+			return true;
-+	}
-+
-+	return false;
-+}
-+
- static void sna_crtc_randr(xf86CrtcPtr crtc)
- {
- 	struct sna_crtc *sna_crtc = to_sna_crtc(crtc);
-@@ -2152,6 +2885,25 @@ static void sna_crtc_randr(xf86CrtcPtr crtc)
- 	} else
- 		crtc->transform_in_use = sna_crtc->rotation != RR_Rotate_0;
- 
-+	/* Recompute the cursor after a potential change in transform */
-+	if (sna_crtc->cursor) {
-+		assert(sna_crtc->cursor->ref > 0);
-+		sna_crtc->cursor->ref--;
-+		sna_crtc->cursor = NULL;
-+	}
-+
-+	if (needs_transform) {
-+		sna_crtc->hwcursor = is_affine(&f_fb_to_crtc);
-+		sna_crtc->cursor_transform =
-+			sna_crtc->hwcursor &&
-+			!affine_is_pixel_exact(&f_fb_to_crtc);
-+	} else {
-+		sna_crtc->hwcursor = true;
-+		sna_crtc->cursor_transform = false;
-+	}
-+	DBG(("%s: hwcursor?=%d, cursor_transform?=%d\n",
-+	     __FUNCTION__, sna_crtc->hwcursor, sna_crtc->cursor_transform));
-+
- 	crtc->crtc_to_framebuffer = crtc_to_fb;
- 	crtc->f_crtc_to_framebuffer = f_crtc_to_fb;
- 	crtc->f_framebuffer_to_crtc = f_fb_to_crtc;
-@@ -2184,7 +2936,7 @@ static void sna_crtc_randr(xf86CrtcPtr crtc)
- static void
- sna_crtc_damage(xf86CrtcPtr crtc)
- {
--	ScreenPtr screen = crtc->scrn->pScreen;
-+	ScreenPtr screen = xf86ScrnToScreen(crtc->scrn);
- 	struct sna *sna = to_sna(crtc->scrn);
- 	RegionRec region, *damage;
- 
-@@ -2200,15 +2952,21 @@ sna_crtc_damage(xf86CrtcPtr crtc)
- 	if (region.extents.y2 > screen->height)
- 		region.extents.y2 = screen->height;
- 
-+	if (region.extents.x2 <= region.extents.x1 ||
-+	    region.extents.y2 <= region.extents.y1) {
-+		DBG(("%s: crtc not damaged, all-clipped\n", __FUNCTION__));
-+		return;
-+	}
-+
- 	DBG(("%s: marking crtc %d as completely damaged (%d, %d), (%d, %d)\n",
--	     __FUNCTION__, to_sna_crtc(crtc)->id,
-+	     __FUNCTION__, sna_crtc_id(crtc),
- 	     region.extents.x1, region.extents.y1,
- 	     region.extents.x2, region.extents.y2));
--	to_sna_crtc(crtc)->client_damage = region;
- 
- 	assert(sna->mode.shadow_damage && sna->mode.shadow_active);
- 	damage = DamageRegion(sna->mode.shadow_damage);
- 	RegionUnion(damage, damage, &region);
-+	to_sna_crtc(crtc)->crtc_damage = region;
- 
- 	DBG(("%s: damage now %dx[(%d, %d), (%d, %d)]\n",
- 	     __FUNCTION__,
-@@ -2260,6 +3018,21 @@ static const char *reflection_to_str(Rotation rotation)
- 	}
- }
- 
-+static void reprobe_connectors(xf86CrtcPtr crtc)
-+{
-+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
-+	struct sna *sna = to_sna(crtc->scrn);
-+	int i;
-+
-+	for (i = 0; i < sna->mode.num_real_output; i++) {
-+		xf86OutputPtr output = config->output[i];
-+		if (output->crtc == crtc)
-+			to_sna_output(output)->reprobe = true;
-+	}
-+
-+	sna_mode_discover(sna, true);
-+}
-+
- static Bool
- __sna_crtc_set_mode(xf86CrtcPtr crtc)
- {
-@@ -2268,11 +3041,19 @@ __sna_crtc_set_mode(xf86CrtcPtr crtc)
- 	struct kgem_bo *saved_bo, *bo;
- 	uint32_t saved_offset;
- 	bool saved_transform;
-+	bool saved_hwcursor;
-+	bool saved_cursor_transform;
-+	int ret;
- 
--	DBG(("%s\n", __FUNCTION__));
-+	DBG(("%s: CRTC=%d, pipe=%d, hidden?=%d\n", __FUNCTION__,
-+	     __sna_crtc_id(sna_crtc), __sna_crtc_pipe(sna_crtc), sna->mode.hidden));
-+	if (sna->mode.hidden)
-+		return TRUE;
- 
- 	saved_bo = sna_crtc->bo;
- 	saved_transform = sna_crtc->transform;
-+	saved_cursor_transform = sna_crtc->cursor_transform;
-+	saved_hwcursor = sna_crtc->hwcursor;
- 	saved_offset = sna_crtc->offset;
- 
- 	sna_crtc->fallback_shadow = false;
-@@ -2285,26 +3066,31 @@ retry: /* Attach per-crtc pixmap or direct */
- 	}
- 
- 	/* Prevent recursion when enabling outputs during execbuffer */
--	if (bo->exec && RQ(bo->rq)->bo == NULL)
-+	if (bo->exec && RQ(bo->rq)->bo == NULL) {
- 		_kgem_submit(&sna->kgem);
-+		__kgem_bo_clear_dirty(bo);
-+	}
- 
- 	sna_crtc->bo = bo;
--	if (!sna_crtc_apply(crtc)) {
--		int err = errno;
--
-+	ret = sna_crtc_apply(crtc);
-+	if (ret) {
- 		kgem_bo_destroy(&sna->kgem, bo);
- 
--		if (!sna_crtc->shadow) {
-+		if (!sna_crtc->fallback_shadow) {
- 			sna_crtc->fallback_shadow = true;
- 			goto retry;
- 		}
- 
- 		xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
--			   "failed to set mode: %s [%d]\n", strerror(err), err);
-+			   "failed to set mode: %s [%d]\n", strerror(ret), ret);
- 		goto error;
- 	}
- 
-+	sna_crtc->flags |= CRTC_ON;
- 	bo->active_scanout++;
-+	DBG(("%s: marking handle=%d as active=%d (removing %d from scanout, active=%d)\n",
-+	     __FUNCTION__, bo->handle, bo->active_scanout,
-+	     saved_bo ? saved_bo->handle : 0, saved_bo ? saved_bo->active_scanout - 1: -1));
- 	if (saved_bo) {
- 		assert(saved_bo->active_scanout);
- 		assert(saved_bo->refcnt >= saved_bo->active_scanout);
-@@ -2315,17 +3101,34 @@ retry: /* Attach per-crtc pixmap or direct */
- 	sna_crtc_randr(crtc);
- 	if (sna_crtc->transform)
- 		sna_crtc_damage(crtc);
-+	if (sna_crtc->cursor &&  /* Reload cursor if RandR maybe changed */
-+	    (!sna_crtc->hwcursor ||
-+	     saved_cursor_transform || sna_crtc->cursor_transform ||
-+	     sna_crtc->cursor->rotation != crtc->rotation))
-+		sna_crtc_disable_cursor(sna, sna_crtc);
-+
-+	assert(!sna->mode.hidden);
- 	sna->mode.front_active += saved_bo == NULL;
- 	sna->mode.dirty = true;
--	DBG(("%s: front_active=%d\n", __FUNCTION__, sna->mode.front_active));
-+	DBG(("%s: handle=%d, scanout_active=%d, front_active=%d\n",
-+	     __FUNCTION__, bo->handle, bo->active_scanout, sna->mode.front_active));
- 
- 	return TRUE;
- 
- error:
- 	sna_crtc->offset = saved_offset;
-+	if (sna_crtc->transform) {
-+		assert(sna->mode.rr_active);
-+		sna->mode.rr_active--;
-+	}
-+	if (saved_transform)
-+		sna->mode.rr_active++;
- 	sna_crtc->transform = saved_transform;
-+	sna_crtc->cursor_transform = saved_cursor_transform;
-+	sna_crtc->hwcursor = saved_hwcursor;
- 	sna_crtc->bo = saved_bo;
--	sna_mode_discover(sna);
-+
-+	reprobe_connectors(crtc);
- 	return FALSE;
- }
- 
-@@ -2346,14 +3149,14 @@ sna_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
- 	xf86DrvMsg(crtc->scrn->scrnIndex, X_INFO,
- 		   "switch to mode %dx%d@%.1f on %s using pipe %d, position (%d, %d), rotation %s, reflection %s\n",
- 		   mode->HDisplay, mode->VDisplay, xf86ModeVRefresh(mode),
--		   outputs_for_crtc(crtc, outputs, sizeof(outputs)), sna_crtc->pipe,
-+		   outputs_for_crtc(crtc, outputs, sizeof(outputs)), __sna_crtc_pipe(sna_crtc),
- 		   x, y, rotation_to_str(rotation), reflection_to_str(rotation));
- 
- 	assert(mode->HDisplay <= sna->mode.max_crtc_width &&
- 	       mode->VDisplay <= sna->mode.max_crtc_height);
- 
- #if HAS_GAMMA
--	drmModeCrtcSetGamma(sna->kgem.fd, sna_crtc->id,
-+	drmModeCrtcSetGamma(sna->kgem.fd, __sna_crtc_id(sna_crtc),
- 			    crtc->gamma_size,
- 			    crtc->gamma_red,
- 			    crtc->gamma_green,
-@@ -2372,17 +3175,10 @@ sna_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
- static void
- sna_crtc_dpms(xf86CrtcPtr crtc, int mode)
- {
--	struct sna_crtc *priv = to_sna_crtc(crtc);
--
- 	DBG(("%s(pipe %d, dpms mode -> %d):= active=%d\n",
--	     __FUNCTION__, priv->pipe, mode, mode == DPMSModeOn));
--	if (priv->dpms_mode == mode)
--		return;
--
--	assert(priv);
--	priv->dpms_mode = mode;
-+	     __FUNCTION__, sna_crtc_pipe(crtc), mode, mode == DPMSModeOn));
- 
--	if (mode == DPMSModeOn && crtc->enabled && priv->bo == NULL) {
-+	if (mode == DPMSModeOn && crtc->enabled) {
- 		if (__sna_crtc_set_mode(crtc))
- 			update_flush_interval(to_sna(crtc->scrn));
- 		else
-@@ -2390,7 +3186,7 @@ sna_crtc_dpms(xf86CrtcPtr crtc, int mode)
- 	}
- 
- 	if (mode != DPMSModeOn)
--		sna_crtc_disable(crtc);
-+		sna_crtc_disable(crtc, false);
- }
- 
- void sna_mode_adjust_frame(struct sna *sna, int x, int y)
-@@ -2426,7 +3222,7 @@ sna_crtc_gamma_set(xf86CrtcPtr crtc,
- {
- 	assert(to_sna_crtc(crtc));
- 	drmModeCrtcSetGamma(to_sna(crtc->scrn)->kgem.fd,
--			    to_sna_crtc(crtc)->id,
-+			    sna_crtc_id(crtc),
- 			    size, red, green, blue);
- }
- 
-@@ -2434,10 +3230,14 @@ static void
- sna_crtc_destroy(xf86CrtcPtr crtc)
- {
- 	struct sna_crtc *sna_crtc = to_sna_crtc(crtc);
-+	struct plane *sprite, *sn;
- 
- 	if (sna_crtc == NULL)
- 		return;
- 
-+	list_for_each_entry_safe(sprite, sn, &sna_crtc->sprites, link)
-+		free(sprite);
-+
- 	free(sna_crtc);
- 	crtc->driver_private = NULL;
- }
-@@ -2455,7 +3255,7 @@ sna_crtc_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr pixmap)
- 		return TRUE;
- 
- 	DBG(("%s: CRTC:%d, pipe=%d setting scanout pixmap=%ld\n",
--	     __FUNCTION__, sna_crtc->id,  sna_crtc->pipe,
-+	     __FUNCTION__, __sna_crtc_id(sna_crtc),  __sna_crtc_pipe(sna_crtc),
- 	     pixmap ? pixmap->drawable.serialNumber : 0));
- 
- 	/* Disable first so that we can unregister the damage tracking */
-@@ -2576,6 +3376,10 @@ static int plane_details(struct sna *sna, struct plane *p)
- 		}
- 	}
- 
-+	p->rotation.supported &= DBG_NATIVE_ROTATION;
-+	if (!xf86ReturnOptValBool(sna->Options, OPTION_ROTATION, TRUE))
-+		p->rotation.supported = RR_Rotate_0;
-+
- 	if (props != (uint32_t *)stack_props)
- 		free(props);
- 
-@@ -2583,20 +3387,26 @@ static int plane_details(struct sna *sna, struct plane *p)
- 	return type;
- }
- 
-+static void add_sprite_plane(struct sna_crtc *crtc,
-+			     struct plane *details)
-+{
-+	struct plane *sprite = malloc(sizeof(*sprite));
-+	if (!sprite)
-+		return;
-+
-+	memcpy(sprite, details, sizeof(*sprite));
-+	list_add(&sprite->link, &crtc->sprites);
-+}
-+
- static void
- sna_crtc_find_planes(struct sna *sna, struct sna_crtc *crtc)
- {
- #define LOCAL_IOCTL_SET_CAP	DRM_IOWR(0x0d, struct local_set_cap)
--#define LOCAL_IOCTL_MODE_GETPLANERESOURCES DRM_IOWR(0xb5, struct local_mode_get_plane_res)
--#define LOCAL_IOCTL_MODE_GETPLANE DRM_IOWR(0xb6, struct local_mode_get_plane)
- 	struct local_set_cap {
- 		uint64_t name;
- 		uint64_t value;
- 	} cap;
--	struct local_mode_get_plane_res {
--		uint64_t plane_id_ptr;
--		uint64_t count_planes;
--	} r;
-+	struct local_mode_get_plane_res r;
- 	uint32_t stack_planes[32];
- 	uint32_t *planes = stack_planes;
- 	int i;
-@@ -2629,18 +3439,7 @@ sna_crtc_find_planes(struct sna *sna, struct sna_crtc *crtc)
- 	VG(VALGRIND_MAKE_MEM_DEFINED(planes, sizeof(uint32_t)*r.count_planes));
- 
- 	for (i = 0; i < r.count_planes; i++) {
--		struct local_mode_get_plane {
--			uint32_t plane_id;
--
--			uint32_t crtc_id;
--			uint32_t fb_id;
--
--			uint32_t possible_crtcs;
--			uint32_t gamma_size;
--
--			uint32_t count_format_types;
--			uint64_t format_type_ptr;
--		} p;
-+		struct local_mode_get_plane p;
- 		struct plane details;
- 
- 		VG_CLEAR(p);
-@@ -2649,11 +3448,11 @@ sna_crtc_find_planes(struct sna *sna, struct sna_crtc *crtc)
- 		if (drmIoctl(sna->kgem.fd, LOCAL_IOCTL_MODE_GETPLANE, &p))
- 			continue;
- 
--		if ((p.possible_crtcs & (1 << crtc->pipe)) == 0)
-+		if ((p.possible_crtcs & (1 << __sna_crtc_pipe(crtc))) == 0)
- 			continue;
- 
- 		DBG(("%s: plane %d is attached to our pipe=%d\n",
--		     __FUNCTION__, planes[i], crtc->pipe));
-+		     __FUNCTION__, planes[i], __sna_crtc_pipe(crtc)));
- 
- 		details.id = p.plane_id;
- 		details.rotation.prop = 0;
-@@ -2672,8 +3471,7 @@ sna_crtc_find_planes(struct sna *sna, struct sna_crtc *crtc)
- 			break;
- 
- 		case DRM_PLANE_TYPE_OVERLAY:
--			if (crtc->sprite.id == 0)
--				crtc->sprite = details;
-+			add_sprite_plane(crtc, &details);
- 			break;
- 		}
- 	}
-@@ -2688,7 +3486,6 @@ sna_crtc_init__rotation(struct sna *sna, struct sna_crtc *crtc)
- 	crtc->rotation = RR_Rotate_0;
- 	crtc->primary.rotation.supported = RR_Rotate_0;
- 	crtc->primary.rotation.current = RR_Rotate_0;
--	crtc->sprite.rotation = crtc->primary.rotation;
- }
- 
- static void
-@@ -2698,55 +3495,55 @@ sna_crtc_init__cursor(struct sna *sna, struct sna_crtc *crtc)
- 
- 	VG_CLEAR(arg);
- 	arg.flags = DRM_MODE_CURSOR_BO;
--	arg.crtc_id = crtc->id;
-+	arg.crtc_id = __sna_crtc_id(crtc);
- 	arg.width = arg.height = 0;
- 	arg.handle = 0;
- 
- 	(void)drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_CURSOR, &arg);
-+	crtc->hwcursor = true;
- }
- 
- static bool
--sna_crtc_add(ScrnInfoPtr scrn, int id)
-+sna_crtc_add(ScrnInfoPtr scrn, unsigned id)
- {
- 	struct sna *sna = to_sna(scrn);
- 	xf86CrtcPtr crtc;
- 	struct sna_crtc *sna_crtc;
- 	struct drm_i915_get_pipe_from_crtc_id get_pipe;
- 
--	DBG(("%s(%d)\n", __FUNCTION__, id));
-+	DBG(("%s(%d): is-zaphod? %d\n", __FUNCTION__, id, is_zaphod(scrn)));
- 
- 	sna_crtc = calloc(sizeof(struct sna_crtc), 1);
- 	if (sna_crtc == NULL)
- 		return false;
- 
- 	sna_crtc->id = id;
--	sna_crtc->dpms_mode = -1;
- 
- 	VG_CLEAR(get_pipe);
- 	get_pipe.pipe = 0;
--	get_pipe.crtc_id = sna_crtc->id;
-+	get_pipe.crtc_id = id;
- 	if (drmIoctl(sna->kgem.fd,
- 		     DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID,
- 		     &get_pipe)) {
- 		free(sna_crtc);
- 		return false;
- 	}
--	sna_crtc->pipe = get_pipe.pipe;
-+	assert((unsigned)get_pipe.pipe < 256);
-+	sna_crtc->flags |= get_pipe.pipe << 8;
- 
- 	if (is_zaphod(scrn) &&
--	    scrn->confScreen->device->screen != sna_crtc->pipe) {
-+	    (get_zaphod_crtcs(sna) & (1 << get_pipe.pipe)) == 0) {
- 		free(sna_crtc);
- 		return true;
- 	}
- 
-+	list_init(&sna_crtc->sprites);
- 	sna_crtc_init__rotation(sna, sna_crtc);
--
- 	sna_crtc_find_planes(sna, sna_crtc);
- 
--	DBG(("%s: CRTC:%d [pipe=%d], primary id=%x: supported-rotations=%x, current-rotation=%x, sprite id=%x: supported-rotations=%x, current-rotation=%x\n",
--	     __FUNCTION__, sna_crtc->id, sna_crtc->pipe,
--	     sna_crtc->primary.id, sna_crtc->primary.rotation.supported, sna_crtc->primary.rotation.current,
--	     sna_crtc->sprite.id, sna_crtc->sprite.rotation.supported, sna_crtc->sprite.rotation.current));
-+	DBG(("%s: CRTC:%d [pipe=%d], primary id=%x: supported-rotations=%x, current-rotation=%x\n",
-+	     __FUNCTION__, id, get_pipe.pipe,
-+	     sna_crtc->primary.id, sna_crtc->primary.rotation.supported, sna_crtc->primary.rotation.current));
- 
- 	list_init(&sna_crtc->shadow_link);
- 
-@@ -2761,7 +3558,7 @@ sna_crtc_add(ScrnInfoPtr scrn, int id)
- 	crtc->driver_private = sna_crtc;
- 	sna_crtc->base = crtc;
- 	DBG(("%s: attached crtc[%d] pipe=%d\n",
--	     __FUNCTION__, id, sna_crtc->pipe));
-+	     __FUNCTION__, id, __sna_crtc_pipe(sna_crtc)));
- 
- 	return true;
- }
-@@ -2798,20 +3595,56 @@ find_property(struct sna *sna, struct sna_output *output, const char *name)
- 	return -1;
- }
- 
-+static void update_properties(struct sna *sna, struct sna_output *output)
-+{
-+	union compat_mode_get_connector compat_conn;
-+	struct drm_mode_modeinfo dummy;
-+
-+	VG_CLEAR(compat_conn);
-+
-+	compat_conn.conn.connector_id = output->id;
-+	compat_conn.conn.count_props = output->num_props;
-+	compat_conn.conn.props_ptr = (uintptr_t)output->prop_ids;
-+	compat_conn.conn.prop_values_ptr = (uintptr_t)output->prop_values;
-+	compat_conn.conn.count_modes = 1; /* skip detect */
-+	compat_conn.conn.modes_ptr = (uintptr_t)&dummy;
-+	compat_conn.conn.count_encoders = 0;
-+
-+	(void)drmIoctl(sna->kgem.fd,
-+		       DRM_IOCTL_MODE_GETCONNECTOR,
-+		       &compat_conn.conn);
-+
-+	assert(compat_conn.conn.count_props == output->num_props);
-+	output->update_properties = false;
-+}
-+
- static xf86OutputStatus
- sna_output_detect(xf86OutputPtr output)
- {
- 	struct sna *sna = to_sna(output->scrn);
- 	struct sna_output *sna_output = output->driver_private;
- 	union compat_mode_get_connector compat_conn;
-+	uint32_t now;
- 
- 	DBG(("%s(%s:%d)\n", __FUNCTION__, output->name, sna_output->id));
-+	sna_output->update_properties = false;
- 
- 	if (!sna_output->id) {
- 		DBG(("%s(%s) hiding due to lost connection\n", __FUNCTION__, output->name));
- 		return XF86OutputStatusDisconnected;
- 	}
- 
-+	/* Cache detections for 15s or hotplug event  */
-+	now = GetTimeInMillis();
-+	if (sna_output->last_detect != 0 &&
-+	    (int32_t)(now - sna_output->last_detect) <= OUTPUT_STATUS_CACHE_MS) {
-+		DBG(("%s(%s) reporting cached status (since %dms): %d\n",
-+		     __FUNCTION__, output->name, now - sna_output->last_detect,
-+		     sna_output->status));
-+		sna_output->update_properties = true;
-+		return sna_output->status;
-+	}
-+
- 	VG_CLEAR(compat_conn);
- 	compat_conn.conn.connector_id = sna_output->id;
- 	sna_output->num_modes = compat_conn.conn.count_modes = 0; /* reprobe */
-@@ -2854,15 +3687,23 @@ sna_output_detect(xf86OutputPtr output)
- 	DBG(("%s(%s): found %d modes, connection status=%d\n",
- 	     __FUNCTION__, output->name, sna_output->num_modes, compat_conn.conn.connection));
- 
-+	sna_output->reprobe = false;
-+	sna_output->last_detect = now;
- 	switch (compat_conn.conn.connection) {
- 	case DRM_MODE_CONNECTED:
--		return XF86OutputStatusConnected;
-+		sna_output->status = XF86OutputStatusConnected;
-+		output->mm_width = compat_conn.conn.mm_width;
-+		output->mm_height = compat_conn.conn.mm_height;
-+		break;
- 	case DRM_MODE_DISCONNECTED:
--		return XF86OutputStatusDisconnected;
-+		sna_output->status = XF86OutputStatusDisconnected;
-+		break;
- 	default:
- 	case DRM_MODE_UNKNOWNCONNECTION:
--		return XF86OutputStatusUnknown;
-+		sna_output->status = XF86OutputStatusUnknown;
-+		break;
- 	}
-+	return sna_output->status;
- }
- 
- static Bool
-@@ -2895,6 +3736,27 @@ sna_output_mode_valid(xf86OutputPtr output, DisplayModePtr mode)
- 	return MODE_OK;
- }
- 
-+static void sna_output_set_parsed_edid(xf86OutputPtr output, xf86MonPtr mon)
-+{
-+	unsigned conn_mm_width, conn_mm_height;
-+
-+	/* We set the output size based on values from the kernel */
-+	conn_mm_width = output->mm_width;
-+	conn_mm_height = output->mm_height;
-+
-+	xf86OutputSetEDID(output, mon);
-+
-+	if (output->mm_width != conn_mm_width || output->mm_height != conn_mm_height) {
-+		DBG(("%s)%s): kernel and Xorg disagree over physical size: kernel=%dx%dmm, Xorg=%dx%dmm\n",
-+		     __FUNCTION__, output->name,
-+		     conn_mm_width, conn_mm_height,
-+		     output->mm_width, output->mm_height));
-+	}
-+
-+	output->mm_width = conn_mm_width;
-+	output->mm_height = conn_mm_height;
-+}
-+
- static void
- sna_output_attach_edid(xf86OutputPtr output)
- {
-@@ -2907,6 +3769,13 @@ sna_output_attach_edid(xf86OutputPtr output)
- 	if (sna_output->edid_idx == -1)
- 		return;
- 
-+	/* Always refresh the blob as the kernel may randomly update the
-+	 * id even if the contents of the blob doesn't change, and a
-+	 * request for the stale id will return nothing.
-+	 */
-+	if (sna_output->update_properties)
-+		update_properties(sna, sna_output);
-+
- 	raw = sna_output->edid_raw;
- 	blob.length = sna_output->edid_len;
- 
-@@ -2917,8 +3786,12 @@ sna_output_attach_edid(xf86OutputPtr output)
- 		old = NULL;
- 
- 	blob.blob_id = sna_output->prop_values[sna_output->edid_idx];
--	DBG(("%s: attaching EDID id=%d, current=%d\n",
--	     __FUNCTION__, blob.blob_id, sna_output->edid_blob_id));
-+	if (!blob.blob_id)
-+		goto done;
-+
-+	DBG(("%s(%s): attaching EDID id=%d, current=%d\n",
-+	     __FUNCTION__, output->name,
-+	     blob.blob_id, sna_output->edid_blob_id));
- 	if (blob.blob_id == sna_output->edid_blob_id && 0) { /* sigh */
- 		if (output->MonInfo) {
- 			/* XXX the property keeps on disappearing... */
-@@ -2936,26 +3809,45 @@ sna_output_attach_edid(xf86OutputPtr output)
- 	}
- 
- 	blob.data = (uintptr_t)raw;
--	if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob))
--		goto done;
-+	do {
-+		while (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob)) {
-+			update_properties(sna, sna_output);
-+			if (blob.blob_id == sna_output->prop_values[sna_output->edid_idx]) {
-+				DBG(("%s(%s): failed to read blob, reusing previous\n",
-+				     __FUNCTION__, output->name));
-+				goto done;
-+			}
-+			blob.blob_id = sna_output->prop_values[sna_output->edid_idx];
-+		}
- 
--	DBG(("%s: retrieving blob id=%d, length=%d\n",
--	     __FUNCTION__, blob.blob_id, blob.length));
-+		DBG(("%s(%s): retrieving blob id=%d, length=%d\n",
-+		     __FUNCTION__, output->name, blob.blob_id, blob.length));
- 
--	if (blob.length > sna_output->edid_len) {
--		raw = realloc(raw, blob.length);
--		if (raw == NULL)
-+		if (blob.length < 128)
- 			goto done;
- 
--		VG(memset(raw, 0, blob.length));
--		blob.data = (uintptr_t)raw;
--		if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob))
--			goto done;
-+		if (blob.length > sna_output->edid_len) {
-+			raw = realloc(raw, blob.length);
-+			if (raw == NULL)
-+				goto done;
-+
-+			VG(memset(raw, 0, blob.length));
-+			blob.data = (uintptr_t)raw;
-+		}
-+	} while (blob.length != sna_output->edid_len &&
-+		 drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob));
-+
-+	if (blob.length & 127) {
-+		/* Truncated EDID! Make sure no one reads too far */
-+		*SECTION(NO_EDID, (uint8_t*)raw) = blob.length/128 - 1;
-+		blob.length &= -128;
- 	}
- 
- 	if (old &&
- 	    blob.length == sna_output->edid_len &&
- 	    memcmp(old, raw, blob.length) == 0) {
-+		DBG(("%s(%s): EDID + MonInfo is unchanged\n",
-+		     __FUNCTION__, output->name));
- 		assert(sna_output->edid_raw == raw);
- 		sna_output->edid_blob_id = blob.blob_id;
- 		RRChangeOutputProperty(output->randr_output,
-@@ -2974,31 +3866,186 @@ skip_read:
- 			mon->flags |= MONITOR_EDID_COMPLETE_RAWDATA;
- 	}
- 
--done:
--	xf86OutputSetEDID(output, mon);
--	if (raw) {
--		sna_output->edid_raw = raw;
--		sna_output->edid_len = blob.length;
--		sna_output->edid_blob_id = blob.blob_id;
-+done:
-+	sna_output_set_parsed_edid(output, mon);
-+	if (raw) {
-+		sna_output->edid_raw = raw;
-+		sna_output->edid_len = blob.length;
-+		sna_output->edid_blob_id = blob.blob_id;
-+	}
-+}
-+
-+static void
-+sna_output_attach_tile(xf86OutputPtr output)
-+{
-+#if XF86_OUTPUT_VERSION >= 3
-+	struct sna *sna = to_sna(output->scrn);
-+	struct sna_output *sna_output = output->driver_private;
-+	struct drm_mode_get_blob blob;
-+	struct xf86CrtcTileInfo tile_info, *set = NULL;
-+	char *tile;
-+	int id;
-+
-+	id = find_property(sna, sna_output, "TILE");
-+	DBG(("%s: found? TILE=%d\n", __FUNCTION__, id));
-+	if (id == -1)
-+		goto out;
-+
-+	if (sna_output->update_properties)
-+		update_properties(sna, sna_output);
-+
-+	VG_CLEAR(blob);
-+	blob.blob_id = sna_output->prop_values[id];
-+	blob.length = 0;
-+	if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob))
-+		goto out;
-+
-+	do {
-+		id = blob.length;
-+		tile = alloca(id + 1);
-+		blob.data = (uintptr_t)tile;
-+		VG(memset(tile, 0, id));
-+		DBG(("%s: reading %d bytes for TILE blob\n", __FUNCTION__, id));
-+		if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob))
-+			goto out;
-+	} while (id != blob.length);
-+
-+	tile[blob.length] = '\0'; /* paranoia */
-+	DBG(("%s: TILE='%s'\n", __FUNCTION__, tile));
-+	if (xf86OutputParseKMSTile(tile, blob.length, &tile_info))
-+		set = &tile_info;
-+out:
-+	xf86OutputSetTile(output, set);
-+#endif
-+}
-+
-+static bool duplicate_mode(DisplayModePtr modes, DisplayModePtr m)
-+{
-+	if (m == NULL)
-+		return false;
-+
-+	while (modes) {
-+		if (xf86ModesEqual(modes, m))
-+			return true;
-+
-+		modes = modes->next;
-+	}
-+
-+	return false;
-+}
-+
-+static struct pixel_count {
-+	int16_t width, height;
-+} common_16_9[] = {
-+	{ 640, 360 },
-+	{ 720, 405 },
-+	{ 864, 486 },
-+	{ 960, 540 },
-+	{ 1024, 576 },
-+	{ 1280, 720 },
-+	{ 1366, 768 },
-+	{ 1600, 900 },
-+	{ 1920, 1080 },
-+	{ 2048, 1152 },
-+	{ 2560, 1440 },
-+	{ 2880, 1620 },
-+	{ 3200, 1800 },
-+	{ 3840, 2160 },
-+	{ 4096, 2304 },
-+	{ 5120, 2880 },
-+	{ 7680, 4320 },
-+	{ 15360, 8640 },
-+}, common_16_10[] = {
-+	{ 1280, 800 },
-+	{ 1400, 900 },
-+	{ 1680, 1050 },
-+	{ 1920, 1200 },
-+	{ 2560, 1600 },
-+};
-+
-+static DisplayModePtr
-+default_modes(DisplayModePtr preferred)
-+{
-+	DisplayModePtr modes;
-+	int n;
-+
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,6,99,900,0)
-+	modes = xf86GetDefaultModes();
-+#else
-+	modes = xf86GetDefaultModes(0, 0);
-+#endif
-+
-+	/* XXX O(n^2) mode list generation :( */
-+
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,4,99,901,0)
-+	if (preferred) {
-+		DisplayModePtr m;
-+
-+		/* Add a half-resolution mode useful for large panels */
-+		m = xf86GTFMode(preferred->HDisplay/2,
-+				preferred->VDisplay/2,
-+				xf86ModeVRefresh(preferred),
-+				FALSE, FALSE);
-+		if (!duplicate_mode(modes, m))
-+			modes = xf86ModesAdd(modes, m);
-+		else
-+			free(m);
-+
-+		if (preferred->VDisplay * 16 > preferred->HDisplay*9 - preferred->HDisplay/32 &&
-+		    preferred->VDisplay * 16 < preferred->HDisplay*9 + preferred->HDisplay/32) {
-+			DBG(("Adding 16:9 modes -- %d < %d > %d\n",
-+			     preferred->HDisplay*9 - preferred->HDisplay/32,
-+			     preferred->VDisplay * 16,
-+			     preferred->HDisplay*9 + preferred->HDisplay/32));
-+			for (n = 0; n < ARRAY_SIZE(common_16_9); n++) {
-+				if (preferred->HDisplay <= common_16_9[n].width ||
-+				    preferred->VDisplay <= common_16_9[n].height)
-+					break;
-+
-+				m = xf86GTFMode(common_16_9[n].width,
-+						common_16_9[n].height,
-+						xf86ModeVRefresh(preferred),
-+						FALSE, FALSE);
-+				if (!duplicate_mode(modes, m))
-+					modes = xf86ModesAdd(modes, m);
-+				else
-+					free(m);
-+			}
-+		}
-+
-+		if (preferred->VDisplay * 16 > preferred->HDisplay*10 - preferred->HDisplay/32 &&
-+		    preferred->VDisplay * 16 < preferred->HDisplay*10 + preferred->HDisplay/32) {
-+			DBG(("Adding 16:10 modes -- %d < %d > %d\n",
-+			     preferred->HDisplay*10 - preferred->HDisplay/32,
-+			     preferred->VDisplay * 16,
-+			     preferred->HDisplay*10 + preferred->HDisplay/32));
-+			for (n = 0; n < ARRAY_SIZE(common_16_10); n++) {
-+				if (preferred->HDisplay <= common_16_10[n].width ||
-+				    preferred->VDisplay <= common_16_10[n].height)
-+					break;
-+
-+				m = xf86GTFMode(common_16_10[n].width,
-+						common_16_10[n].height,
-+						xf86ModeVRefresh(preferred),
-+						FALSE, FALSE);
-+				if (!duplicate_mode(modes, m))
-+					modes = xf86ModesAdd(modes, m);
-+				else
-+					free(m);
-+			}
-+		}
- 	}
--}
--
--static DisplayModePtr
--default_modes(void)
--{
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,6,99,900,0)
--	return xf86GetDefaultModes();
--#else
--	return xf86GetDefaultModes(0, 0);
- #endif
-+
-+	return modes;
- }
- 
- static DisplayModePtr
--sna_output_panel_edid(xf86OutputPtr output, DisplayModePtr modes)
-+sna_output_add_default_modes(xf86OutputPtr output, DisplayModePtr modes)
- {
- 	xf86MonPtr mon = output->MonInfo;
- 	DisplayModePtr i, m, preferred = NULL;
--	int max_x = 0, max_y = 0;
-+	int max_x = 0, max_y = 0, max_clock = 0;
- 	float max_vrefresh = 0.0;
- 
- 	if (mon && GTF_SUPPORTED(mon->features.msc))
-@@ -3009,16 +4056,17 @@ sna_output_panel_edid(xf86OutputPtr output, DisplayModePtr modes)
- 			preferred = m;
- 		max_x = max(max_x, m->HDisplay);
- 		max_y = max(max_y, m->VDisplay);
-+		max_clock = max(max_clock, m->Clock);
- 		max_vrefresh = max(max_vrefresh, xf86ModeVRefresh(m));
- 	}
--
--	max_vrefresh = max(max_vrefresh, 60.0);
- 	max_vrefresh *= (1 + SYNC_TOLERANCE);
- 
--	m = default_modes();
-+	m = default_modes(preferred);
- 	xf86ValidateModesSize(output->scrn, m, max_x, max_y, 0);
- 
- 	for (i = m; i; i = i->next) {
-+		if (i->Clock > max_clock)
-+			i->status = MODE_CLOCK_HIGH;
- 		if (xf86ModeVRefresh(i) > max_vrefresh)
- 			i->status = MODE_VSYNC;
- 		if (preferred &&
-@@ -3034,28 +4082,47 @@ sna_output_panel_edid(xf86OutputPtr output, DisplayModePtr modes)
- }
- 
- static DisplayModePtr
-+sna_output_override_edid(xf86OutputPtr output)
-+{
-+	struct sna_output *sna_output = output->driver_private;
-+
-+	if (sna_output->fake_edid_mon == NULL)
-+		return NULL;
-+
-+	xf86OutputSetEDID(output, sna_output->fake_edid_mon);
-+	return xf86DDCGetModes(output->scrn->scrnIndex,
-+			       sna_output->fake_edid_mon);
-+}
-+
-+static DisplayModePtr
- sna_output_get_modes(xf86OutputPtr output)
- {
- 	struct sna_output *sna_output = output->driver_private;
--	DisplayModePtr Modes = NULL, current = NULL;
-+	DisplayModePtr Modes, current;
- 	int i;
- 
- 	DBG(("%s(%s:%d)\n", __FUNCTION__, output->name, sna_output->id));
- 	assert(sna_output->id);
- 
-+	Modes = sna_output_override_edid(output);
-+	if (Modes)
-+		return Modes;
-+
- 	sna_output_attach_edid(output);
-+	sna_output_attach_tile(output);
- 
--	if (output->crtc) {
-+	current = NULL;
-+	if (output->crtc && !sna_output->hotplug_count) {
- 		struct drm_mode_crtc mode;
- 
- 		VG_CLEAR(mode);
- 		assert(to_sna_crtc(output->crtc));
--		mode.crtc_id = to_sna_crtc(output->crtc)->id;
-+		mode.crtc_id = sna_crtc_id(output->crtc);
- 
- 		if (drmIoctl(to_sna(output->scrn)->kgem.fd, DRM_IOCTL_MODE_GETCRTC, &mode) == 0) {
- 			DBG(("%s: CRTC:%d, pipe=%d: has mode?=%d\n", __FUNCTION__,
--			     to_sna_crtc(output->crtc)->id,
--			     to_sna_crtc(output->crtc)->pipe,
-+			     sna_crtc_id(output->crtc),
-+			     sna_crtc_pipe(output->crtc),
- 			     mode.mode_valid && mode.mode.clock));
- 
- 			if (mode.mode_valid && mode.mode.clock) {
-@@ -3117,7 +4184,7 @@ sna_output_get_modes(xf86OutputPtr output)
- 	}
- 
- 	if (sna_output->add_default_modes)
--		Modes = sna_output_panel_edid(output, Modes);
-+		Modes = sna_output_add_default_modes(output, Modes);
- 
- 	return Modes;
- }
-@@ -3132,6 +4199,8 @@ sna_output_destroy(xf86OutputPtr output)
- 		return;
- 
- 	free(sna_output->edid_raw);
-+	free(sna_output->fake_edid_raw);
-+
- 	for (i = 0; i < sna_output->num_props; i++) {
- 		if (sna_output->props[i].kprop == NULL)
- 			continue;
-@@ -3155,7 +4224,7 @@ sna_output_destroy(xf86OutputPtr output)
- }
- 
- static void
--sna_output_dpms(xf86OutputPtr output, int dpms)
-+__sna_output_dpms(xf86OutputPtr output, int dpms, int fixup)
- {
- 	struct sna *sna = to_sna(output->scrn);
- 	struct sna_output *sna_output = output->driver_private;
-@@ -3182,8 +4251,9 @@ sna_output_dpms(xf86OutputPtr output, int dpms)
- 	if (sna_output->backlight.iface && dpms != DPMSModeOn) {
- 		if (old_dpms == DPMSModeOn) {
- 			sna_output->backlight_active_level = sna_output_backlight_get(output);
--			DBG(("%s: saving current backlight %d\n",
--			     __FUNCTION__, sna_output->backlight_active_level));
-+			DBG(("%s(%s:%d): saving current backlight %d\n",
-+			     __FUNCTION__, output->name, sna_output->id,
-+			     sna_output->backlight_active_level));
- 		}
- 		sna_output->dpms_mode = dpms;
- 		sna_output_backlight_off(sna_output);
-@@ -3193,18 +4263,31 @@ sna_output_dpms(xf86OutputPtr output, int dpms)
- 	    drmModeConnectorSetProperty(sna->kgem.fd,
- 					sna_output->id,
- 					sna_output->dpms_id,
--					dpms))
--		dpms = old_dpms;
-+					dpms)) {
-+		DBG(("%s(%s:%d): failed to set DPMS to %d (fixup? %d)\n",
-+		     __FUNCTION__, output->name, sna_output->id, dpms, fixup));
-+		if (fixup && dpms != DPMSModeOn) {
-+			sna_crtc_disable(output->crtc, false);
-+			return;
-+		}
-+	}
- 
- 	if (sna_output->backlight.iface && dpms == DPMSModeOn) {
--		DBG(("%s: restoring previous backlight %d\n",
--		     __FUNCTION__, sna_output->backlight_active_level));
-+		DBG(("%s(%d:%d: restoring previous backlight %d\n",
-+		     __FUNCTION__, output->name, sna_output->id,
-+		     sna_output->backlight_active_level));
- 		sna_output_backlight_on(sna_output);
- 	}
- 
- 	sna_output->dpms_mode = dpms;
- }
- 
-+static void
-+sna_output_dpms(xf86OutputPtr output, int dpms)
-+{
-+	__sna_output_dpms(output, dpms, true);
-+}
-+
- static bool
- sna_property_ignore(drmModePropertyPtr prop)
- {
-@@ -3239,14 +4322,14 @@ sna_output_create_ranged_atom(xf86OutputPtr output, Atom *atom,
- 	err = RRConfigureOutputProperty(output->randr_output, *atom, FALSE,
- 					TRUE, immutable, 2, atom_range);
- 	if (err != 0)
--		xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
-+		xf86DrvMsg(output->scrn->scrnIndex, X_WARNING,
- 			   "RRConfigureOutputProperty error, %d\n", err);
- 
- 	err = RRChangeOutputProperty(output->randr_output, *atom, XA_INTEGER,
- 				     32, PropModeReplace, 1, &value,
- 				     FALSE, FALSE);
- 	if (err != 0)
--		xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
-+		xf86DrvMsg(output->scrn->scrnIndex, X_WARNING,
- 			   "RRChangeOutputProperty error, %d\n", err);
- }
- 
-@@ -3303,7 +4386,7 @@ sna_output_create_resources(xf86OutputPtr output)
- 							p->kprop->flags & DRM_MODE_PROP_IMMUTABLE ? TRUE : FALSE,
- 							p->num_atoms - 1, (INT32 *)&p->atoms[1]);
- 			if (err != 0) {
--				xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
-+				xf86DrvMsg(output->scrn->scrnIndex, X_WARNING,
- 					   "RRConfigureOutputProperty error, %d\n", err);
- 			}
- 
-@@ -3315,7 +4398,7 @@ sna_output_create_resources(xf86OutputPtr output)
- 						     XA_ATOM, 32, PropModeReplace, 1, &p->atoms[j+1],
- 						     FALSE, FALSE);
- 			if (err != 0) {
--				xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
-+				xf86DrvMsg(output->scrn->scrnIndex, X_WARNING,
- 					   "RRChangeOutputProperty error, %d\n", err);
- 			}
- 		}
-@@ -3385,18 +4468,19 @@ sna_output_set_property(xf86OutputPtr output, Atom property,
- 			if (value->type != XA_INTEGER || value->format != 32 ||
- 			    value->size != 1)
- 				return FALSE;
--			val = *(uint32_t *)value->data;
- 
-+			val = *(uint32_t *)value->data;
- 			drmModeConnectorSetProperty(sna->kgem.fd, sna_output->id,
- 						    p->kprop->prop_id, (uint64_t)val);
- 			return TRUE;
- 		} else if (p->kprop->flags & DRM_MODE_PROP_ENUM) {
--			Atom	atom;
--			const char	*name;
--			int		j;
-+			Atom atom;
-+			const char *name;
-+			int j;
- 
- 			if (value->type != XA_ATOM || value->format != 32 || value->size != 1)
- 				return FALSE;
-+
- 			memcpy(&atom, value->data, 4);
- 			name = NameForAtom(atom);
- 			if (name == NULL)
-@@ -3425,7 +4509,7 @@ static Bool
- sna_output_get_property(xf86OutputPtr output, Atom property)
- {
- 	struct sna_output *sna_output = output->driver_private;
--	int err;
-+	int err, i, j;
- 
- 	if (property == backlight_atom || property == backlight_deprecated_atom) {
- 		INT32 val;
-@@ -3449,7 +4533,7 @@ sna_output_get_property(xf86OutputPtr output, Atom property)
- 					     XA_INTEGER, 32, PropModeReplace, 1, &val,
- 					     FALSE, FALSE);
- 		if (err != 0) {
--			xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
-+			xf86DrvMsg(output->scrn->scrnIndex, X_WARNING,
- 				   "RRChangeOutputProperty error, %d\n", err);
- 			return FALSE;
- 		}
-@@ -3457,6 +4541,40 @@ sna_output_get_property(xf86OutputPtr output, Atom property)
- 		return TRUE;
- 	}
- 
-+	for (i = 0; i < sna_output->num_props; i++) {
-+		struct sna_property *p = &sna_output->props[i];
-+
-+		if (p->atoms == NULL || p->atoms[0] != property)
-+			continue;
-+
-+		if (sna_output->update_properties && output->scrn->vtSema)
-+			update_properties(to_sna(output->scrn), sna_output);
-+
-+		err = 0;
-+		if (p->kprop->flags & DRM_MODE_PROP_RANGE) {
-+			err = RRChangeOutputProperty(output->randr_output,
-+						     property, XA_INTEGER, 32,
-+						     PropModeReplace, 1,
-+						     &sna_output->prop_values[i],
-+						     FALSE, FALSE);
-+		} else if (p->kprop->flags & DRM_MODE_PROP_ENUM) {
-+			for (j = 0; j < p->kprop->count_enums; j++) {
-+				if (p->kprop->enums[j].value == sna_output->prop_values[i])
-+					break;
-+			}
-+			err = RRChangeOutputProperty(output->randr_output,
-+						     property, XA_ATOM, 32,
-+						     PropModeReplace, 1,
-+						     &p->atoms[j+1],
-+						     FALSE, FALSE);
-+		}
-+
-+		if (err != 0)
-+			xf86DrvMsg(output->scrn->scrnIndex, X_WARNING,
-+				   "RRChangeOutputProperty error, %d\n", err);
-+		return TRUE;
-+	}
-+
- 	return FALSE;
- }
- 
-@@ -3500,47 +4618,11 @@ static const char * const output_names[] = {
- 	/* DRM_MODE_CONNECTOR_TV */		"TV",
- 	/* DRM_MODE_CONNECTOR_eDP */		"eDP",
- 	/* DRM_MODE_CONNECTOR_VIRTUAL */	"Virtual",
--	/* DRM_MODE_CONNECTOR_DSI */		"DSI"
-+	/* DRM_MODE_CONNECTOR_DSI */		"DSI",
-+	/* DRM_MODE_CONNECTOR_DPI */		"DPI"
- };
- 
- static bool
--sna_zaphod_match(const char *s, const char *output)
--{
--	char t[20];
--	unsigned int i = 0;
--
--	do {
--		/* match any outputs in a comma list, stopping at whitespace */
--		switch (*s) {
--		case '\0':
--			t[i] = '\0';
--			return strcmp(t, output) == 0;
--
--		case ',':
--			t[i] ='\0';
--			if (strcmp(t, output) == 0)
--				return TRUE;
--			i = 0;
--			break;
--
--		case ' ':
--		case '\t':
--		case '\n':
--		case '\r':
--			break;
--
--		default:
--			t[i++] = *s;
--			break;
--		}
--
--		s++;
--	} while (i < sizeof(t));
--
--	return false;
--}
--
--static bool
- output_ignored(ScrnInfoPtr scrn, const char *name)
- {
- 	char monitor_name[64];
-@@ -3572,14 +4654,21 @@ gather_encoders(struct sna *sna, uint32_t id, int count,
- 	struct drm_mode_get_encoder enc;
- 	uint32_t *ids = NULL;
- 
-+	DBG(("%s(%d): expected count=%d\n", __FUNCTION__, id, count));
-+
- 	VG_CLEAR(compat_conn);
-+	VG_CLEAR(enc);
- 	memset(out, 0, sizeof(*out));
- 
- 	do {
--		free(ids);
--		ids = malloc(sizeof(*ids) * count);
--		if (ids == 0)
-+		uint32_t *nids;
-+
-+		nids = realloc(ids, sizeof(*ids) * count);
-+		if (nids == NULL) {
-+			free(ids);
- 			return false;
-+		}
-+		ids = nids;
- 
- 		compat_conn.conn.connector_id = id;
- 		compat_conn.conn.count_props = 0;
-@@ -3593,12 +4682,14 @@ gather_encoders(struct sna *sna, uint32_t id, int count,
- 			compat_conn.conn.count_encoders = count = 0;
- 		}
- 
-+		VG(VALGRIND_MAKE_MEM_DEFINED(ids, sizeof(uint32_t)*compat_conn.conn.count_encoders));
- 		if (count == compat_conn.conn.count_encoders)
- 			break;
- 
- 		count = compat_conn.conn.count_encoders;
- 	} while (1);
- 
-+	DBG(("%s(%d): gathering %d encoders\n", __FUNCTION__, id, count));
- 	for (count = 0; count < compat_conn.conn.count_encoders; count++) {
- 		enc.encoder_id = ids[count];
- 		if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETENCODER, &enc)) {
-@@ -3606,6 +4697,8 @@ gather_encoders(struct sna *sna, uint32_t id, int count,
- 			count = 0;
- 			break;
- 		}
-+		DBG(("%s(%d): encoder=%d, possible_crtcs=%x, possible_clones=%x\n",
-+		     __FUNCTION__, id, enc.encoder_id, enc.possible_crtcs, enc.possible_clones));
- 		out->possible_crtcs |= enc.possible_crtcs;
- 		out->possible_clones |= enc.possible_clones;
- 
-@@ -3731,6 +4824,116 @@ static int name_from_path(struct sna *sna,
- 	return 0;
- }
- 
-+static char *fake_edid_name(xf86OutputPtr output)
-+{
-+	struct sna *sna = to_sna(output->scrn);
-+	const char *str, *colon;
-+
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,99,901,0)
-+	str = xf86GetOptValString(sna->Options, OPTION_EDID);
-+#else
-+	str = NULL;
-+#endif
-+	if (str == NULL)
-+		return NULL;
-+
-+	do {
-+		colon = strchr(str, ':');
-+		if (colon == NULL)
-+			return NULL;
-+
-+		if (strncmp(str, output->name, colon-str) == 0 &&
-+		    output->name[colon-str] == '\0') {
-+			char *path;
-+			int len;
-+
-+			str = colon + 1;
-+			colon = strchr(str, ',');
-+			if (colon)
-+				len = colon - str;
-+			else
-+				len = strlen(str);
-+
-+			path = malloc(len + 1);
-+			if (path == NULL)
-+				return NULL;
-+
-+			memcpy(path, str, len);
-+			path[len] = '\0';
-+			return path;
-+		}
-+
-+		str = strchr(colon + 1, ',');
-+		if (str == NULL)
-+			return NULL;
-+
-+		str++;
-+	} while (1);
-+}
-+
-+static void
-+sna_output_load_fake_edid(xf86OutputPtr output)
-+{
-+	struct sna_output *sna_output = output->driver_private;
-+	const char *filename;
-+	FILE *file;
-+	void *raw;
-+	int size;
-+	xf86MonPtr mon;
-+
-+	filename = fake_edid_name(output);
-+	if (filename == NULL)
-+		return;
-+
-+	file = fopen(filename, "rb");
-+	if (file == NULL)
-+		goto err;
-+
-+	fseek(file, 0, SEEK_END);
-+	size = ftell(file);
-+	if (size % 128) {
-+		fclose(file);
-+		goto err;
-+	}
-+
-+	raw = malloc(size);
-+	if (raw == NULL) {
-+		fclose(file);
-+		free(raw);
-+		goto err;
-+	}
-+
-+	fseek(file, 0, SEEK_SET);
-+	if (fread(raw, size, 1, file) != 1) {
-+		fclose(file);
-+		free(raw);
-+		goto err;
-+	}
-+	fclose(file);
-+
-+	mon = xf86InterpretEDID(output->scrn->scrnIndex, raw);
-+	if (mon == NULL) {
-+		free(raw);
-+		goto err;
-+	}
-+
-+	if (mon && size > 128)
-+		mon->flags |= MONITOR_EDID_COMPLETE_RAWDATA;
-+
-+	sna_output->fake_edid_mon = mon;
-+	sna_output->fake_edid_raw = raw;
-+
-+	xf86DrvMsg(output->scrn->scrnIndex, X_CONFIG,
-+		   "Loading EDID from \"%s\" for output %s\n",
-+		   filename, output->name);
-+	return;
-+
-+err:
-+	xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
-+		   "Could not read EDID file \"%s\" for output %s\n",
-+		   filename, output->name);
-+}
-+
- static int
- sna_output_add(struct sna *sna, unsigned id, unsigned serial)
- {
-@@ -3765,6 +4968,7 @@ sna_output_add(struct sna *sna, unsigned id, unsigned serial)
- 		return -1;
- 	}
- 	assert(compat_conn.conn.connector_id == id);
-+	DBG(("%s(%d): has %d associated encoders\n", __FUNCTION__, id, compat_conn.conn.count_encoders));
- 
- 	if (compat_conn.conn.connector_type < ARRAY_SIZE(output_names))
- 		output_name = output_names[compat_conn.conn.connector_type];
-@@ -3813,34 +5017,43 @@ sna_output_add(struct sna *sna, unsigned id, unsigned serial)
- 	}
- 
- 	if (is_zaphod(scrn)) {
--		const char *str;
-+		unsigned zaphod_crtcs;
- 
--		str = xf86GetOptValString(sna->Options, OPTION_ZAPHOD);
--		if (str && !sna_zaphod_match(str, name)) {
--			DBG(("%s: zaphod mismatch, want %s, have %s\n", __FUNCTION__, str, name));
-+		if (!sna_zaphod_match(sna, name)) {
-+			DBG(("%s: zaphod mismatch, want %s, have %s\n",
-+			     __FUNCTION__,
-+			     xf86GetOptValString(sna->Options, OPTION_ZAPHOD) ?: "???",
-+			     name));
- 			return 0;
- 		}
- 
--		if ((possible_crtcs & (1 << scrn->confScreen->device->screen)) == 0) {
--			if (str) {
--				xf86DrvMsg(scrn->scrnIndex, X_ERROR,
--					   "%s is an invalid output for screen (pipe) %d\n",
--					   name, scrn->confScreen->device->screen);
--				return -1;
--			} else
--				return 0;
-+		zaphod_crtcs = get_zaphod_crtcs(sna);
-+		possible_crtcs &= zaphod_crtcs;
-+		if (possible_crtcs == 0) {
-+			xf86DrvMsg(scrn->scrnIndex, X_ERROR,
-+				   "%s is an invalid output for screen %d\n",
-+				   name, scrn->confScreen->device->screen);
-+			return -1;
- 		}
- 
--		possible_crtcs = 1;
-+		possible_crtcs >>= ffs(zaphod_crtcs) - 1;
- 	}
- 
- 	sna_output = calloc(sizeof(struct sna_output), 1);
- 	if (!sna_output)
- 		return -1;
- 
-+	sna_output->connector_type = compat_conn.conn.connector_type;
-+	sna_output->connector_type_id = compat_conn.conn.connector_type_id;
- 	sna_output->num_props = compat_conn.conn.count_props;
- 	sna_output->prop_ids = malloc(sizeof(uint32_t)*compat_conn.conn.count_props);
- 	sna_output->prop_values = malloc(sizeof(uint64_t)*compat_conn.conn.count_props);
-+	if (sna_output->prop_ids == NULL || sna_output->prop_values == NULL) {
-+		free(sna_output->prop_ids);
-+		free(sna_output->prop_values);
-+		free(sna_output);
-+		return -1;
-+	}
- 
- 	compat_conn.conn.count_encoders = 0;
- 
-@@ -3865,16 +5078,16 @@ sna_output_add(struct sna *sna, unsigned id, unsigned serial)
- 	/* Construct name from topology, and recheck if output is acceptable */
- 	path = name_from_path(sna, sna_output, name);
- 	if (path) {
--		const char *str;
--
- 		if (output_ignored(scrn, name)) {
- 			len = 0;
- 			goto skip;
- 		}
- 
--		str = xf86GetOptValString(sna->Options, OPTION_ZAPHOD);
--		if (str && !sna_zaphod_match(str, name)) {
--			DBG(("%s: zaphod mismatch, want %s, have %s\n", __FUNCTION__, str, name));
-+		if (is_zaphod(scrn) && !sna_zaphod_match(sna, name)) {
-+			DBG(("%s: zaphod mismatch, want %s, have %s\n",
-+			     __FUNCTION__,
-+			     xf86GetOptValString(sna->Options, OPTION_ZAPHOD) ?: "???",
-+			     name));
- 			len = 0;
- 			goto skip;
- 		}
-@@ -3889,7 +5102,6 @@ sna_output_add(struct sna *sna, unsigned id, unsigned serial)
- 			if (strcmp(output->name, name) == 0) {
- 				assert(output->scrn == scrn);
- 				assert(output->funcs == &sna_output_funcs);
--				assert(to_sna_output(output)->id == 0);
- 				sna_output_destroy(output);
- 				goto reset;
- 			}
-@@ -3935,6 +5147,8 @@ reset:
- 	sna_output->id = compat_conn.conn.connector_id;
- 	sna_output->is_panel = is_panel(compat_conn.conn.connector_type);
- 	sna_output->edid_idx = find_property(sna, sna_output, "EDID");
-+	sna_output->link_status_idx =
-+		find_property(sna, sna_output, "link-status");
- 	if (find_property(sna, sna_output, "scaling mode") != -1)
- 		sna_output->add_default_modes =
- 			xf86ReturnOptValBool(output->options, OPTION_DEFAULT_MODES, TRUE);
-@@ -3945,10 +5159,8 @@ reset:
- 		sna_output->dpms_mode = sna_output->prop_values[i];
- 		DBG(("%s: found 'DPMS' (idx=%d, id=%d), initial value=%d\n",
- 		     __FUNCTION__, i, sna_output->dpms_id, sna_output->dpms_mode));
--	} else {
--		sna_output->dpms_id = -1;
-+	} else
- 		sna_output->dpms_mode = DPMSModeOff;
--	}
- 
- 	sna_output->possible_encoders = possible_encoders;
- 	sna_output->attached_encoders = attached_encoders;
-@@ -3963,12 +5175,13 @@ reset:
- 	sna_output->base = output;
- 
- 	backlight_init(&sna_output->backlight);
--	if (sna_output->is_panel)
--		sna_output_backlight_init(output);
-+	sna_output_backlight_init(output);
- 
- 	output->possible_crtcs = possible_crtcs & count_to_mask(sna->mode.num_real_crtc);
- 	output->interlaceAllowed = TRUE;
- 
-+	sna_output_load_fake_edid(output);
-+
- 	if (serial) {
- 		if (output->randr_output == NULL) {
- 			output->randr_output = RROutputCreate(xf86ScrnToScreen(scrn), name, len, output);
-@@ -3976,6 +5189,7 @@ reset:
- 				goto cleanup;
- 		}
- 
-+		RROutputChanged(output->randr_output, TRUE);
- 		sna_output_create_resources(output);
- 		RRPostPendingProperties(output->randr_output);
- 
-@@ -4009,38 +5223,6 @@ skip:
- 	return len;
- }
- 
--static void sna_output_del(xf86OutputPtr output)
--{
--	ScrnInfoPtr scrn = output->scrn;
--	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
--	int i;
--
--	DBG(("%s(%s)\n", __FUNCTION__, output->name));
--	assert(to_sna_output(output));
--
--	RROutputDestroy(output->randr_output);
--	sna_output_destroy(output);
--
--	while (output->probed_modes)
--		xf86DeleteMode(&output->probed_modes, output->probed_modes);
--
--	free(output);
--
--	for (i = 0; i < config->num_output; i++)
--		if (config->output[i] == output)
--			break;
--	assert(i < to_sna(scrn)->mode.num_real_output);
--	DBG(("%s: removing output #%d of %d\n",
--	     __FUNCTION__, i, to_sna(scrn)->mode.num_real_output));
--
--	for (; i < config->num_output; i++) {
--		config->output[i] = config->output[i+1];
--		config->output[i]->possible_clones >>= 1;
--	}
--	config->num_output--;
--	to_sna(scrn)->mode.num_real_output--;
--}
--
- static int output_rank(const void *A, const void *B)
- {
- 	const xf86OutputPtr *a = A;
-@@ -4058,6 +5240,7 @@ static void sort_config_outputs(struct sna *sna)
- {
- 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
- 	qsort(config->output, sna->mode.num_real_output, sizeof(*config->output), output_rank);
-+	config->compat_output = 0; /* make sure it is a sane value */
- 	sna_mode_compute_possible_outputs(sna);
- }
- 
-@@ -4080,11 +5263,15 @@ static bool disable_unused_crtc(struct sna *sna)
- 	bool update = false;
- 	int o, c;
- 
-+	DBG(("%s\n", __FUNCTION__));
-+
- 	for (c = 0; c < sna->mode.num_real_crtc; c++) {
- 		xf86CrtcPtr crtc = config->crtc[c];
- 
--		if (!crtc->enabled)
-+		if (!crtc->enabled) {
-+			sna_crtc_disable(crtc, false);
- 			continue;
-+		}
- 
- 		for (o = 0; o < sna->mode.num_real_output; o++) {
- 			xf86OutputPtr output = config->output[o];
-@@ -4094,7 +5281,7 @@ static bool disable_unused_crtc(struct sna *sna)
- 
- 		if (o == sna->mode.num_real_output) {
- 			DBG(("%s: CRTC:%d was enabled with no outputs\n",
--			     __FUNCTION__, to_sna_crtc(crtc)->id));
-+			     __FUNCTION__, sna_crtc_id(crtc)));
- 			crtc->enabled = false;
- 			update = true;
- 		}
-@@ -4108,17 +5295,145 @@ static bool disable_unused_crtc(struct sna *sna)
- 	return update;
- }
- 
--void sna_mode_discover(struct sna *sna)
-+bool sna_mode_find_hotplug_connector(struct sna *sna, unsigned id)
-+{
-+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
-+	int i;
-+
-+	for (i = 0; i < sna->mode.num_real_output; i++) {
-+		struct sna_output *output = to_sna_output(config->output[i]);
-+		if (output->id == id) {
-+			output->reprobe = true;
-+			return true;
-+		}
-+	}
-+
-+	return false;
-+}
-+
-+static bool
-+output_retrain_link(struct sna *sna, struct sna_output *output)
-+{
-+	struct sna_crtc *crtc = to_sna_crtc(output->base->crtc);
-+	int crtc_x = crtc->offset & 0xffff;
-+	int crtc_y = crtc->offset >> 16;
-+
-+	return sna_crtc_flip(sna, crtc, crtc->bo, crtc_x, crtc_y);
-+}
-+
-+static bool
-+output_check_link(struct sna *sna, struct sna_output *output)
-+{
-+	uint64_t link_status;
-+
-+	if (!output->base->crtc)
-+		return true;
-+
-+	if (output->link_status_idx == -1)
-+		return true;
-+
-+#define LINK_STATUS_GOOD 0
-+	link_status = output->prop_values[output->link_status_idx];
-+	DBG(("%s: link_status=%d\n", __FUNCTION__, link_status));
-+	if (link_status == LINK_STATUS_GOOD)
-+		return true;
-+
-+	/* Perform a modeset as required for "link-status" = BAD */
-+	if (!output_retrain_link(sna, output))
-+		return false;
-+
-+	/* Query the "link-status" again to confirm the modeset */
-+	update_properties(sna, output);
-+
-+	link_status = output->prop_values[output->link_status_idx];
-+	DBG(("%s: link_status=%d after modeset\n", __FUNCTION__, link_status));
-+	return link_status == LINK_STATUS_GOOD;
-+}
-+
-+static bool
-+output_check_status(struct sna *sna, struct sna_output *output)
-+{
-+	union compat_mode_get_connector compat_conn;
-+	struct drm_mode_modeinfo dummy;
-+	struct drm_mode_get_blob blob;
-+	xf86OutputStatus status;
-+	char *edid;
-+
-+	VG_CLEAR(compat_conn);
-+
-+	compat_conn.conn.connection = -1;
-+	compat_conn.conn.connector_id = output->id;
-+	compat_conn.conn.count_modes = 1; /* skip detect */
-+	compat_conn.conn.modes_ptr = (uintptr_t)&dummy;
-+	compat_conn.conn.count_encoders = 0;
-+	compat_conn.conn.props_ptr = (uintptr_t)output->prop_ids;
-+	compat_conn.conn.prop_values_ptr = (uintptr_t)output->prop_values;
-+	compat_conn.conn.count_props = output->num_props;
-+
-+	if (drmIoctl(sna->kgem.fd,
-+		     DRM_IOCTL_MODE_GETCONNECTOR,
-+		     &compat_conn.conn) == 0)
-+		output->update_properties = false;
-+
-+	if (!output_check_link(sna, output))
-+		return false;
-+
-+	if (output->reprobe)
-+		return false;
-+
-+	switch (compat_conn.conn.connection) {
-+	case DRM_MODE_CONNECTED:
-+		status = XF86OutputStatusConnected;
-+		break;
-+	case DRM_MODE_DISCONNECTED:
-+		status = XF86OutputStatusDisconnected;
-+		break;
-+	default:
-+	case DRM_MODE_UNKNOWNCONNECTION:
-+		status = XF86OutputStatusUnknown;
-+		break;
-+	}
-+	if (output->status != status)
-+		return false;
-+
-+	if (status != XF86OutputStatusConnected)
-+		return true;
-+
-+	if (output->num_modes != compat_conn.conn.count_modes)
-+		return false;
-+
-+	if (output->edid_len == 0)
-+		return false;
-+
-+	edid = alloca(output->edid_len);
-+
-+	VG_CLEAR(blob);
-+	blob.blob_id = output->prop_values[output->edid_idx];
-+	blob.length = output->edid_len;
-+	blob.data = (uintptr_t)edid;
-+	if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob))
-+		return false;
-+
-+	if (blob.length != output->edid_len)
-+		return false;
-+
-+	return memcmp(edid, output->edid_raw, output->edid_len) == 0;
-+}
-+
-+void sna_mode_discover(struct sna *sna, bool tell)
- {
- 	ScreenPtr screen = xf86ScrnToScreen(sna->scrn);
- 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
-+	bool force = sna->flags & SNA_REPROBE;
- 	struct drm_mode_card_res res;
--	uint32_t connectors[32];
-+	uint32_t connectors[32], now;
- 	unsigned changed = 0;
- 	unsigned serial;
- 	int i, j;
- 
- 	DBG(("%s()\n", __FUNCTION__));
-+	sna->flags &= ~SNA_REPROBE;
-+
- 	VG_CLEAR(connectors);
- 
- 	memset(&res, 0, sizeof(res));
-@@ -4128,10 +5443,11 @@ void sna_mode_discover(struct sna *sna)
- 	if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETRESOURCES, &res))
- 		return;
- 
--	DBG(("%s: now %d (was %d) connectors\n", __FUNCTION__,
--	     res.count_connectors, sna->mode.num_real_output));
-+	DBG(("%s: now %d (was %d) connectors, %d encoders, %d crtc\n", __FUNCTION__,
-+	     res.count_connectors, sna->mode.num_real_output,
-+	     res.count_encoders, res.count_crtcs));
- 	if (res.count_connectors > 32)
--		return;
-+		res.count_connectors = 32;
- 
- 	assert(sna->mode.num_real_crtc == res.count_crtcs || is_zaphod(sna->scrn));
- 	assert(sna->mode.max_crtc_width  == res.max_width);
-@@ -4142,6 +5458,11 @@ void sna_mode_discover(struct sna *sna)
- 	if (serial == 0)
- 		serial = ++sna->mode.serial;
- 
-+	if (force) {
-+		changed = 4;
-+		now = 0;
-+	} else
-+		now = GetTimeInMillis();
- 	for (i = 0; i < res.count_connectors; i++) {
- 		DBG(("%s: connector[%d] = %d\n", __FUNCTION__, i, connectors[i]));
- 		for (j = 0; j < sna->mode.num_real_output; j++) {
-@@ -4161,32 +5482,42 @@ void sna_mode_discover(struct sna *sna)
- 
- 	for (i = 0; i < sna->mode.num_real_output; i++) {
- 		xf86OutputPtr output = config->output[i];
-+		struct sna_output *sna_output = to_sna_output(output);
- 
--		if (to_sna_output(output)->id == 0)
-+		if (sna_output->id == 0)
- 			continue;
- 
--		if (to_sna_output(output)->serial == serial)
-+		if (sna_output->serial == serial) {
-+			if (output_check_status(sna, sna_output)) {
-+				DBG(("%s: output %s (id=%d), retained state\n",
-+				     __FUNCTION__, output->name, sna_output->id));
-+				sna_output->last_detect = now;
-+			} else {
-+				DBG(("%s: output %s (id=%d), changed state, reprobing\n",
-+				     __FUNCTION__, output->name, sna_output->id));
-+				sna_output->hotplug_count++;
-+				sna_output->last_detect = 0;
-+				changed |= 4;
-+			}
- 			continue;
-+		}
- 
- 		DBG(("%s: removing output %s (id=%d), serial=%u [now %u]\n",
--		     __FUNCTION__, output->name, to_sna_output(output)->id,
--		    to_sna_output(output)->serial, serial));
-+		     __FUNCTION__, output->name, sna_output->id,
-+		    sna_output->serial, serial));
- 
- 		xf86DrvMsg(sna->scrn->scrnIndex, X_INFO,
--			   "%s output %s\n",
--			   sna->flags & SNA_REMOVE_OUTPUTS ? "Removed" : "Disabled",
-+			   "Disabled output %s\n",
- 			   output->name);
--		if (sna->flags & SNA_REMOVE_OUTPUTS) {
--			sna_output_del(output);
--			i--;
--		} else {
--			to_sna_output(output)->id = 0;
--			output->crtc = NULL;
--		}
-+		sna_output->id = 0;
-+		sna_output->last_detect = 0;
-+		output->crtc = NULL;
-+		RROutputChanged(output->randr_output, TRUE);
- 		changed |= 2;
- 	}
- 
--	if (changed) {
-+	/* Have the list of available outputs been updated? */
-+	if (changed & 3) {
- 		DBG(("%s: outputs changed, broadcasting\n", __FUNCTION__));
- 
- 		sna_mode_set_primary(sna);
-@@ -4200,6 +5531,51 @@ void sna_mode_discover(struct sna *sna)
- 
- 		xf86RandR12TellChanged(screen);
- 	}
-+
-+	/* If anything has changed, refresh the RandR information.
-+	 * Note this could recurse once from udevless RRGetInfo() probes,
-+	 * but only once.
-+	 */
-+	if (changed && tell)
-+		RRGetInfo(screen, TRUE);
-+}
-+
-+/* Since we only probe the current mode on startup, we may not have the full
-+ * list of modes available until the user explicitly requests them. Fake a
-+ * hotplug event after a second after starting to fill in any missing modes.
-+ */
-+static CARD32 sna_mode_coldplug(OsTimerPtr timer, CARD32 now, void *data)
-+{
-+	struct sna *sna = data;
-+	ScreenPtr screen = xf86ScrnToScreen(sna->scrn);
-+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
-+	bool reprobe = false;
-+	int i;
-+
-+	DBG(("%s()\n", __FUNCTION__));
-+
-+	for (i = 0; i < sna->mode.num_real_output; i++) {
-+		xf86OutputPtr output = config->output[i];
-+		struct sna_output *sna_output = to_sna_output(output);
-+
-+		if (sna_output->id == 0)
-+			continue;
-+		if (sna_output->last_detect)
-+			continue;
-+		if (output->status == XF86OutputStatusDisconnected)
-+			continue;
-+
-+		DBG(("%s: output %s connected, needs reprobe\n",
-+		     __FUNCTION__, output->name));
-+		reprobe = true;
-+	}
-+
-+	if (reprobe) {
-+		RRGetInfo(screen, TRUE);
-+		RRTellChanged(screen);
-+	}
-+	free(timer);
-+	return 0;
- }
- 
- static void copy_front(struct sna *sna, PixmapPtr old, PixmapPtr new)
-@@ -4208,7 +5584,7 @@ static void copy_front(struct sna *sna, PixmapPtr old, PixmapPtr new)
- 
- 	DBG(("%s\n", __FUNCTION__));
- 
--	if (wedged(sna))
-+	if (wedged(sna) || isGPU(sna->scrn))
- 		return;
- 
- 	old_priv = sna_pixmap_force_to_gpu(old, MOVE_READ);
-@@ -4220,12 +5596,19 @@ static void copy_front(struct sna *sna, PixmapPtr old, PixmapPtr new)
- 		return;
- 
- 	if (old_priv->clear) {
--		(void)sna->render.fill_one(sna, new, new_priv->gpu_bo,
--					   old_priv->clear_color,
--					   0, 0,
--					   new->drawable.width,
--					   new->drawable.height,
--					   GXcopy);
-+		bool ok = false;
-+		if (!wedged(sna))
-+			ok = sna->render.fill_one(sna, new, new_priv->gpu_bo,
-+						  old_priv->clear_color,
-+						  0, 0,
-+						  new->drawable.width,
-+						  new->drawable.height,
-+						  GXcopy);
-+		if (!ok) {
-+			void *ptr = kgem_bo_map__gtt(&sna->kgem, new_priv->gpu_bo);
-+			if (ptr)
-+				memset(ptr, 0, new_priv->gpu_bo->pitch*new->drawable.height);
-+		}
- 		new_priv->clear = true;
- 		new_priv->clear_color = old_priv->clear_color;
- 	} else {
-@@ -4281,11 +5664,18 @@ static void copy_front(struct sna *sna, PixmapPtr old, PixmapPtr new)
- 			     __FUNCTION__, box.x2, box.y2, sx, sy, dx, dy));
- 
- 			if (box.x2 != new->drawable.width || box.y2 != new->drawable.height) {
--				(void)sna->render.fill_one(sna, new, new_priv->gpu_bo, 0,
--							   0, 0,
--							   new->drawable.width,
--							   new->drawable.height,
--							   GXclear);
-+				bool ok = false;
-+				if (!wedged(sna))
-+					ok = sna->render.fill_one(sna, new, new_priv->gpu_bo, 0,
-+								  0, 0,
-+								  new->drawable.width,
-+								  new->drawable.height,
-+								  GXclear);
-+				if (!ok) {
-+					void *ptr = kgem_bo_map__gtt(&sna->kgem, new_priv->gpu_bo);
-+					if (ptr)
-+						memset(ptr, 0, new_priv->gpu_bo->pitch*new->drawable.height);
-+				}
- 			}
- 			(void)sna->render.copy_boxes(sna, GXcopy,
- 						     &old->drawable, old_priv->gpu_bo, sx, sy,
-@@ -4302,7 +5692,7 @@ sna_mode_resize(ScrnInfoPtr scrn, int width, int height)
- {
- 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
- 	struct sna *sna = to_sna(scrn);
--	ScreenPtr screen = scrn->pScreen;
-+	ScreenPtr screen = xf86ScrnToScreen(scrn);
- 	PixmapPtr new_front;
- 	int i;
- 
-@@ -4337,9 +5727,20 @@ sna_mode_resize(ScrnInfoPtr scrn, int width, int height)
- 	for (i = 0; i < sna->mode.num_real_crtc; i++)
- 		sna_crtc_disable_shadow(sna, to_sna_crtc(config->crtc[i]));
- 	assert(sna->mode.shadow_active == 0);
-+	assert(!sna->mode.shadow_enabled);
- 	assert(sna->mode.shadow_damage == NULL);
- 	assert(sna->mode.shadow == NULL);
- 
-+	/* Flush pending shadow updates */
-+	if (sna->mode.flip_active) {
-+		DBG(("%s: waiting for %d outstanding TearFree flips\n",
-+		     __FUNCTION__, sna->mode.flip_active));
-+		while (sna->mode.flip_active && sna_mode_wait_for_event(sna))
-+			sna_mode_wakeup(sna);
-+	}
-+
-+	/* Cancel a pending [un]flip (as the pixmaps no longer match) */
-+	sna_present_cancel_flip(sna);
- 	copy_front(sna, sna->front, new_front);
- 
- 	screen->SetScreenPixmap(new_front);
-@@ -4351,14 +5752,6 @@ sna_mode_resize(ScrnInfoPtr scrn, int width, int height)
- 	scrn->virtualY = height;
- 	scrn->displayWidth = width;
- 
--	/* Flush pending shadow updates */
--	if (sna->mode.flip_active) {
--		DBG(("%s: waiting for %d outstanding TearFree flips\n",
--		     __FUNCTION__, sna->mode.flip_active));
--		while (sna->mode.flip_active && sna_mode_wait_for_event(sna))
--			sna_mode_wakeup(sna);
--	}
--
- 	/* Only update the CRTCs if we are in control */
- 	if (!scrn->vtSema)
- 		return TRUE;
-@@ -4371,7 +5764,7 @@ sna_mode_resize(ScrnInfoPtr scrn, int width, int height)
- 			continue;
- 
- 		if (!__sna_crtc_set_mode(crtc))
--			sna_crtc_disable(crtc);
-+			sna_crtc_disable(crtc, false);
- 	}
- 
- 	sna_mode_wakeup(sna);
-@@ -4381,19 +5774,6 @@ sna_mode_resize(ScrnInfoPtr scrn, int width, int height)
- }
- 
- /* cursor handling */
--struct sna_cursor {
--	struct sna_cursor *next;
--	uint32_t *image;
--	Rotation rotation;
--	int ref;
--	int size;
--	int last_width;
--	int last_height;
--	unsigned handle;
--	unsigned serial;
--	unsigned alloc;
--};
--
- static void
- rotate_coord(Rotation rotation, int size,
- 	     int x_dst, int y_dst,
-@@ -4429,36 +5809,6 @@ rotate_coord(Rotation rotation, int size,
- 	*y_src = y_dst;
- }
- 
--static void
--rotate_coord_back(Rotation rotation, int size, int *x, int *y)
--{
--	int t;
--
--	if (rotation & RR_Reflect_X)
--		*x = size - *x - 1;
--	if (rotation & RR_Reflect_Y)
--		*y = size - *y - 1;
--
--	switch (rotation & 0xf) {
--	case RR_Rotate_0:
--		break;
--	case RR_Rotate_90:
--		t = *x;
--		*x = *y;
--		*y = size - t - 1;
--		break;
--	case RR_Rotate_180:
--		*x = size - *x - 1;
--		*y = size - *y - 1;
--		break;
--	case RR_Rotate_270:
--		t = *x;
--		*x = size - *y - 1;
--		*y = t;
--		break;
--	}
--}
--
- static struct sna_cursor *__sna_create_cursor(struct sna *sna, int size)
- {
- 	struct sna_cursor *c;
-@@ -4519,6 +5869,17 @@ static uint32_t *get_cursor_argb(CursorPtr c)
- #endif
- }
- 
-+static int __cursor_size(int width, int height)
-+{
-+	int i, size;
-+
-+	i = MAX(width, height);
-+	for (size = 64; size < i; size <<= 1)
-+		;
-+
-+	return size;
-+}
-+
- static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
- {
- 	struct sna_cursor *cursor;
-@@ -4526,6 +5887,7 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
- 	const uint32_t *argb;
- 	uint32_t *image;
- 	int width, height, pitch, size, x, y;
-+	bool transformed;
- 	Rotation rotation;
- 
- 	assert(sna->cursor.ref);
-@@ -4537,8 +5899,8 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
- 	       cursor ? cursor->serial : 0,
- 	       sna->cursor.serial));
- 	if (cursor && cursor->serial == sna->cursor.serial) {
--		assert(cursor->size == sna->cursor.size);
--		assert(cursor->rotation == crtc->transform_in_use ? crtc->rotation : RR_Rotate_0);
-+		assert(cursor->size == sna->cursor.size || cursor->transformed);
-+		assert(cursor->rotation == (!to_sna_crtc(crtc)->cursor_transform && crtc->transform_in_use) ? crtc->rotation : RR_Rotate_0);
- 		assert(cursor->ref);
- 		return cursor;
- 	}
-@@ -4550,22 +5912,81 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
- 	       sna->cursor.serial,
- 	       get_cursor_argb(sna->cursor.ref) != NULL));
- 
--	rotation = crtc->transform_in_use ? crtc->rotation : RR_Rotate_0;
-+	transformed = to_sna_crtc(crtc)->cursor_transform;
-+	rotation = (!transformed && crtc->transform_in_use) ? crtc->rotation : RR_Rotate_0;
-+
-+	if (transformed) {
-+		struct pixman_box16 box;
-+
-+		box.x1 = box.y1 = 0;
-+		box.x2 = sna->cursor.ref->bits->width;
-+		box.y2 = sna->cursor.ref->bits->height;
- 
--	if (sna->cursor.use_gtt) { /* Don't allow phys cursor sharing */
-+		pixman_f_transform_bounds(&crtc->f_crtc_to_framebuffer, &box);
-+		size = __cursor_size(box.x2 - box.x1, box.y2 - box.y1);
-+		__DBG(("%s: transformed cursor %dx%d -> %dx%d\n",
-+		       __FUNCTION__ ,
-+		       sna->cursor.ref->bits->width,
-+		       sna->cursor.ref->bits->height,
-+		       box.x2 - box.x1, box.y2 - box.y1));
-+	} else
-+		size = sna->cursor.size;
-+
-+	if (crtc->transform_in_use) {
-+		RRTransformPtr T = NULL;
-+		struct pixman_vector v;
-+
-+		if (crtc->transformPresent) {
-+			T = &crtc->transform;
-+
-+			/* Cancel any translation from this affine
-+			 * transformation. We just want to rotate and scale
-+			 * the cursor image.
-+			 */
-+			v.vector[0] = 0;
-+			v.vector[1] = 0;
-+			v.vector[2] = pixman_fixed_1;
-+			pixman_transform_point(&crtc->transform.transform, &v);
-+		}
-+
-+		RRTransformCompute(0, 0, size, size, crtc->rotation, T, NULL,
-+				   &to_sna_crtc(crtc)->cursor_to_fb,
-+				   &to_sna_crtc(crtc)->fb_to_cursor);
-+		if (T)
-+			pixman_f_transform_translate(
-+					&to_sna_crtc(crtc)->cursor_to_fb,
-+					&to_sna_crtc(crtc)->fb_to_cursor,
-+					-pixman_fixed_to_double(v.vector[0]),
-+					-pixman_fixed_to_double(v.vector[1]));
-+
-+		__DBG(("%s: cursor_to_fb [%f %f %f, %f %f %f, %f %f %f]\n",
-+		       __FUNCTION__,
-+		       to_sna_crtc(crtc)->cursor_to_fb.m[0][0],
-+		       to_sna_crtc(crtc)->cursor_to_fb.m[0][1],
-+		       to_sna_crtc(crtc)->cursor_to_fb.m[0][2],
-+		       to_sna_crtc(crtc)->cursor_to_fb.m[1][0],
-+		       to_sna_crtc(crtc)->cursor_to_fb.m[1][1],
-+		       to_sna_crtc(crtc)->cursor_to_fb.m[1][2],
-+		       to_sna_crtc(crtc)->cursor_to_fb.m[2][0],
-+		       to_sna_crtc(crtc)->cursor_to_fb.m[2][1],
-+		       to_sna_crtc(crtc)->cursor_to_fb.m[2][2]));
-+	}
-+
-+	/* Don't allow phys cursor sharing */
-+	if (sna->cursor.use_gtt && !transformed) {
- 		for (cursor = sna->cursor.cursors; cursor; cursor = cursor->next) {
--			if (cursor->serial == sna->cursor.serial && cursor->rotation == rotation) {
-+			if (cursor->serial == sna->cursor.serial &&
-+			    cursor->rotation == rotation &&
-+			    !cursor->transformed) {
- 				__DBG(("%s: reusing handle=%d, serial=%d, rotation=%d, size=%d\n",
- 				       __FUNCTION__, cursor->handle, cursor->serial, cursor->rotation, cursor->size));
- 				assert(cursor->size == sna->cursor.size);
- 				return cursor;
- 			}
- 		}
--
--		cursor = to_sna_crtc(crtc)->cursor;
- 	}
- 
--	size = sna->cursor.size;
-+	cursor = to_sna_crtc(crtc)->cursor;
- 	if (cursor && cursor->alloc < 4*size*size)
- 		cursor = NULL;
- 
-@@ -4577,7 +5998,7 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
- 		}
- 	}
- 
--	width = sna->cursor.ref->bits->width;
-+	width  = sna->cursor.ref->bits->width;
- 	height = sna->cursor.ref->bits->height;
- 	source = sna->cursor.ref->bits->source;
- 	mask = sna->cursor.ref->bits->mask;
-@@ -4585,7 +6006,7 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
- 	pitch = BitmapBytePad(width);
- 
- 	image = cursor->image;
--	if (image == NULL) {
-+	if (image == NULL || transformed) {
- 		image = sna->cursor.scratch;
- 		cursor->last_width = cursor->last_height = size;
- 	}
-@@ -4616,6 +6037,21 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
- 				mask += pitch;
- 				source += pitch;
- 			}
-+			if (transformed) {
-+				__DBG(("%s: Applying affine BLT to bitmap\n", __FUNCTION__));
-+				affine_blt(image, cursor->image, 32,
-+					   0, 0, width, height, size * 4,
-+					   0, 0, size, size, size * 4,
-+					   &to_sna_crtc(crtc)->cursor_to_fb);
-+				image = cursor->image;
-+			}
-+		} else if (transformed) {
-+			__DBG(("%s: Applying affine BLT to ARGB\n", __FUNCTION__));
-+			affine_blt(argb, cursor->image, 32,
-+				   0, 0, width, height, width * 4,
-+				   0, 0, size, size, size * 4,
-+				   &to_sna_crtc(crtc)->cursor_to_fb);
-+			image = cursor->image;
- 		} else
- 			memcpy_blt(argb, image, 32,
- 				   width * 4, size * 4,
-@@ -4662,9 +6098,16 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
- 
- 	cursor->size = size;
- 	cursor->rotation = rotation;
-+	cursor->transformed = transformed;
- 	cursor->serial = sna->cursor.serial;
--	cursor->last_width = width;
--	cursor->last_height = height;
-+	if (transformed) {
-+		/* mark the transformed rectangle as dirty, not input */
-+		cursor->last_width = size;
-+		cursor->last_height = size;
-+	} else {
-+		cursor->last_width = width;
-+		cursor->last_height = height;
-+	}
- 	return cursor;
- }
- 
-@@ -4674,40 +6117,55 @@ sna_realize_cursor(xf86CursorInfoPtr info, CursorPtr cursor)
- 	return NULL;
- }
- 
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,12,99,901,0)
--static inline int sigio_block(void)
--{
--	OsBlockSIGIO();
--	return 0;
--}
--static inline void sigio_unblock(int was_blocked)
-+static void enable_fb_access(ScrnInfoPtr scrn, int state)
- {
--	OsReleaseSIGIO();
--	(void)was_blocked;
--}
-+	scrn->EnableDisableFBAccess(
-+#ifdef XF86_HAS_SCRN_CONV
-+				    scrn,
- #else
--#include <xf86_OSproc.h>
--static inline int sigio_block(void)
-+				    scrn->scrnIndex,
-+#endif
-+				    state);
-+}
-+
-+
-+static void __restore_swcursor(ScrnInfoPtr scrn)
- {
--	return xf86BlockSIGIO();
-+	DBG(("%s: attempting to restore SW cursor\n", __FUNCTION__));
-+	enable_fb_access(scrn, FALSE);
-+	enable_fb_access(scrn, TRUE);
-+
-+	RemoveBlockAndWakeupHandlers((void *)__restore_swcursor,
-+				     (void *)NoopDDA,
-+				     scrn);
- }
--static inline void sigio_unblock(int was_blocked)
-+
-+static void restore_swcursor(struct sna *sna)
- {
--	xf86UnblockSIGIO(was_blocked);
-+	sna->cursor.info->HideCursor(sna->scrn);
-+
-+	/* XXX Force the cursor to be restored (avoiding recursion) */
-+	FreeCursor(sna->cursor.ref, None);
-+	sna->cursor.ref = NULL;
-+
-+	RegisterBlockAndWakeupHandlers((void *)__restore_swcursor,
-+				       (void *)NoopDDA,
-+				       sna->scrn);
- }
--#endif
- 
- static void
- sna_show_cursors(ScrnInfoPtr scrn)
- {
- 	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
- 	struct sna *sna = to_sna(scrn);
-+	struct kmsg kmsg;
- 	int sigio, c;
- 
- 	DBG(("%s: cursor?=%d\n", __FUNCTION__, sna->cursor.ref != NULL));
- 	if (sna->cursor.ref == NULL)
- 		return;
- 
-+	kmsg_open(&kmsg);
- 	sigio = sigio_block();
- 	for (c = 0; c < sna->mode.num_real_crtc; c++) {
- 		xf86CrtcPtr crtc = xf86_config->crtc[c];
-@@ -4721,7 +6179,7 @@ sna_show_cursors(ScrnInfoPtr scrn)
- 
- 		if (!crtc->cursor_in_range) {
- 			DBG(("%s: skipping cursor outside CRTC (pipe=%d)\n",
--			     __FUNCTION__, sna_crtc->pipe));
-+			     __FUNCTION__, sna_crtc_pipe(crtc)));
- 			continue;
- 		}
- 
-@@ -4729,20 +6187,21 @@ sna_show_cursors(ScrnInfoPtr scrn)
- 		if (cursor == NULL ||
- 		    (sna_crtc->cursor == cursor && sna_crtc->last_cursor_size == cursor->size)) {
- 			DBG(("%s: skipping cursor already show on CRTC (pipe=%d)\n",
--			     __FUNCTION__, sna_crtc->pipe));
-+			     __FUNCTION__, sna_crtc_pipe(crtc)));
- 			continue;
- 		}
- 
- 		DBG(("%s: CRTC pipe=%d, handle->%d\n", __FUNCTION__,
--		     sna_crtc->pipe, cursor->handle));
-+		     sna_crtc_pipe(crtc), cursor->handle));
- 
- 		VG_CLEAR(arg);
- 		arg.flags = DRM_MODE_CURSOR_BO;
--		arg.crtc_id = sna_crtc->id;
-+		arg.crtc_id = __sna_crtc_id(sna_crtc);
- 		arg.width = arg.height = cursor->size;
- 		arg.handle = cursor->handle;
- 
--		if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_CURSOR, &arg) == 0) {
-+		if (!FAIL_CURSOR_IOCTL &&
-+		    drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_CURSOR, &arg) == 0) {
- 			if (sna_crtc->cursor) {
- 				assert(sna_crtc->cursor->ref > 0);
- 				sna_crtc->cursor->ref--;
-@@ -4750,10 +6209,18 @@ sna_show_cursors(ScrnInfoPtr scrn)
- 			cursor->ref++;
- 			sna_crtc->cursor = cursor;
- 			sna_crtc->last_cursor_size = cursor->size;
-+		} else {
-+			ERR(("%s: failed to show cursor on CRTC:%d [pipe=%d], disabling hwcursor: errno=%d\n",
-+			     __FUNCTION__, sna_crtc_id(crtc), sna_crtc_pipe(crtc), errno));
-+			sna->cursor.disable = true;
- 		}
- 	}
- 	sigio_unblock(sigio);
- 	sna->cursor.active = true;
-+	kmsg_close(&kmsg, sna->cursor.disable);
-+
-+	if (unlikely(sna->cursor.disable))
-+		restore_swcursor(sna);
- }
- 
- static void
-@@ -4789,24 +6256,45 @@ static void
- sna_crtc_disable_cursor(struct sna *sna, struct sna_crtc *crtc)
- {
- 	struct drm_mode_cursor arg;
-+	int sigio;
- 
- 	if (!crtc->cursor)
- 		return;
- 
--	DBG(("%s: CRTC:%d, handle=%d\n", __FUNCTION__, crtc->id, crtc->cursor->handle));
--	assert(crtc->cursor->ref);
-+	sigio = sigio_block();
-+	if (crtc->cursor) {
-+		DBG(("%s: CRTC:%d, handle=%d\n", __FUNCTION__, __sna_crtc_id(crtc), crtc->cursor->handle));
-+		assert(crtc->cursor->ref > 0);
-+		crtc->cursor->ref--;
-+		crtc->cursor = NULL;
-+		crtc->last_cursor_size = 0;
- 
--	VG_CLEAR(arg);
--	arg.flags = DRM_MODE_CURSOR_BO;
--	arg.crtc_id = crtc->id;
--	arg.width = arg.height = 0;
--	arg.handle = 0;
-+		VG_CLEAR(arg);
-+		arg.flags = DRM_MODE_CURSOR_BO;
-+		arg.crtc_id = __sna_crtc_id(crtc);
-+		arg.width = arg.height = 0;
-+		arg.handle = 0;
- 
--	(void)drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_CURSOR, &arg);
--	assert(crtc->cursor->ref > 0);
--	crtc->cursor->ref--;
--	crtc->cursor = NULL;
--	crtc->last_cursor_size = 0;
-+		(void)drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_CURSOR, &arg);
-+	}
-+	sigio_unblock(sigio);
-+}
-+
-+static void
-+sna_disable_cursors(ScrnInfoPtr scrn)
-+{
-+	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-+	struct sna *sna = to_sna(scrn);
-+	int sigio, c;
-+
-+	DBG(("%s\n", __FUNCTION__));
-+
-+	sigio = sigio_block();
-+	for (c = 0; c < sna->mode.num_real_crtc; c++) {
-+		assert(to_sna_crtc(xf86_config->crtc[c]));
-+		sna_crtc_disable_cursor(sna, to_sna_crtc(xf86_config->crtc[c]));
-+	}
-+	sigio_unblock(sigio);
- }
- 
- static void
-@@ -4852,6 +6340,7 @@ sna_set_cursor_position(ScrnInfoPtr scrn, int x, int y)
- {
- 	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
- 	struct sna *sna = to_sna(scrn);
-+	struct kmsg kmsg;
- 	int sigio, c;
- 
- 	__DBG(("%s(%d, %d), cursor? %d\n", __FUNCTION__,
-@@ -4859,6 +6348,7 @@ sna_set_cursor_position(ScrnInfoPtr scrn, int x, int y)
- 	if (sna->cursor.ref == NULL)
- 		return;
- 
-+	kmsg_open(&kmsg);
- 	sigio = sigio_block();
- 	sna->cursor.last_x = x;
- 	sna->cursor.last_y = y;
-@@ -4876,27 +6366,37 @@ sna_set_cursor_position(ScrnInfoPtr scrn, int x, int y)
- 
- 		VG_CLEAR(arg);
- 		arg.flags = 0;
--		arg.crtc_id = sna_crtc->id;
-+		arg.crtc_id = __sna_crtc_id(sna_crtc);
- 		arg.handle = 0;
- 
- 		if (sna_crtc->bo == NULL)
- 			goto disable;
- 
-+		cursor = __sna_get_cursor(sna, crtc);
-+		if (cursor == NULL)
-+			cursor = sna_crtc->cursor;
-+		if (cursor == NULL) {
-+			__DBG(("%s: failed to grab cursor, disabling\n", __FUNCTION__));
-+			goto disable;
-+		}
-+
- 		if (crtc->transform_in_use) {
- 			int xhot = sna->cursor.ref->bits->xhot;
- 			int yhot = sna->cursor.ref->bits->yhot;
--			struct pict_f_vector v;
-+			struct pict_f_vector v, hot;
- 
--			v.v[0] = (x + xhot) + 0.5;
--			v.v[1] = (y + yhot) + 0.5;
--			v.v[2] = 1;
-+			v.v[0] = x + xhot + .5;
-+			v.v[1] = y + yhot + .5;
-+			v.v[2] = 1.;
- 			pixman_f_transform_point(&crtc->f_framebuffer_to_crtc, &v);
- 
--			rotate_coord_back(crtc->rotation, sna->cursor.size, &xhot, &yhot);
-+			hot.v[0] = xhot;
-+			hot.v[1] = yhot;
-+			hot.v[2] = 1.;
-+			pixman_f_transform_point(&sna_crtc->fb_to_cursor, &hot);
- 
--			/* cursor will have 0.5 added to it already so floor is sufficent */
--			arg.x = floor(v.v[0]) - xhot;
--			arg.y = floor(v.v[1]) - yhot;
-+			arg.x = floor(v.v[0] - hot.v[0]);
-+			arg.y = floor(v.v[1] - hot.v[1]);
- 		} else {
- 			arg.x = x - crtc->x;
- 			arg.y = y - crtc->y;
-@@ -4904,15 +6404,6 @@ sna_set_cursor_position(ScrnInfoPtr scrn, int x, int y)
- 
- 		if (arg.x < crtc->mode.HDisplay && arg.x > -sna->cursor.size &&
- 		    arg.y < crtc->mode.VDisplay && arg.y > -sna->cursor.size) {
--			cursor = __sna_get_cursor(sna, crtc);
--			if (cursor == NULL)
--				cursor = sna_crtc->cursor;
--			if (cursor == NULL) {
--				__DBG(("%s: failed to grab cursor, disabling\n",
--				       __FUNCTION__));
--				goto disable;
--			}
--
- 			if (sna_crtc->cursor != cursor || sna_crtc->last_cursor_size != cursor->size) {
- 				arg.flags |= DRM_MODE_CURSOR_BO;
- 				arg.handle = cursor->handle;
-@@ -4932,10 +6423,13 @@ disable:
- 		}
- 
- 		__DBG(("%s: CRTC:%d (%d, %d), handle=%d, flags=%x (old cursor handle=%d), move? %d, update handle? %d\n",
--		       __FUNCTION__, sna_crtc->id, arg.x, arg.y, arg.handle, arg.flags, sna_crtc->cursor ? sna_crtc->cursor->handle : 0,
-+		       __FUNCTION__, __sna_crtc_id(sna_crtc), arg.x, arg.y, arg.handle, arg.flags, sna_crtc->cursor ? sna_crtc->cursor->handle : 0,
- 		       arg.flags & DRM_MODE_CURSOR_MOVE, arg.flags & DRM_MODE_CURSOR_BO));
- 
--		if (arg.flags &&
-+		if (arg.flags == 0)
-+			continue;
-+
-+		if (!FAIL_CURSOR_IOCTL &&
- 		    drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_CURSOR, &arg) == 0) {
- 			if (arg.flags & DRM_MODE_CURSOR_BO) {
- 				if (sna_crtc->cursor) {
-@@ -4949,9 +6443,21 @@ disable:
- 				} else
- 					sna_crtc->last_cursor_size = 0;
- 			}
-+		} else {
-+			ERR(("%s: failed to update cursor on CRTC:%d [pipe=%d], disabling hwcursor: errno=%d\n",
-+			     __FUNCTION__, sna_crtc_id(crtc), sna_crtc_pipe(crtc), errno));
-+			/* XXX How to force switch back to SW cursor?
-+			 * Right now we just want until the next cursor image
-+			 * change, which is fairly frequent.
-+			 */
-+			sna->cursor.disable = true;
- 		}
- 	}
- 	sigio_unblock(sigio);
-+	kmsg_close(&kmsg, sna->cursor.disable);
-+
-+	if (unlikely(sna->cursor.disable))
-+		restore_swcursor(sna);
- }
- 
- #if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,2)
-@@ -4978,17 +6484,6 @@ sna_load_cursor_image(ScrnInfoPtr scrn, unsigned char *src)
- {
- }
- 
--static int __cursor_size(CursorPtr cursor)
--{
--	int i, size;
--
--	i = MAX(cursor->bits->width, cursor->bits->height);
--	for (size = 64; size < i; size <<= 1)
--		;
--
--	return size;
--}
--
- static bool
- sna_cursor_preallocate(struct sna *sna)
- {
-@@ -5006,6 +6501,50 @@ sna_cursor_preallocate(struct sna *sna)
- 	return true;
- }
- 
-+static bool
-+transformable_cursor(struct sna *sna, CursorPtr cursor)
-+{
-+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
-+	int i;
-+
-+	for (i = 0; i < sna->mode.num_real_crtc; i++) {
-+		xf86CrtcPtr crtc = config->crtc[i];
-+		struct pixman_box16 box;
-+		int size;
-+
-+		if (!to_sna_crtc(crtc)->hwcursor) {
-+			DBG(("%s: hwcursor disabled on CRTC:%d [pipe=%d]\n",
-+			     __FUNCTION__, sna_crtc_id(crtc), sna_crtc_pipe(crtc)));
-+			return false;
-+		}
-+
-+		if (!sna->cursor.use_gtt || !sna->cursor.scratch) {
-+			DBG(("%s: unable to use GTT curosor access [%d] or no scratch [%d]\n",
-+			     __FUNCTION__, sna->cursor.use_gtt, sna->cursor.scratch));
-+			return false;
-+		}
-+
-+		box.x1 = box.y1 = 0;
-+		box.x2 = cursor->bits->width;
-+		box.y2 = cursor->bits->height;
-+
-+		if (!pixman_f_transform_bounds(&crtc->f_crtc_to_framebuffer,
-+					       &box)) {
-+			DBG(("%s: unable to transform bounds\n", __FUNCTION__));
-+			return false;
-+		}
-+
-+		size = __cursor_size(box.x2 - box.x1, box.y2 - box.y1);
-+		if (size > sna->cursor.max_size) {
-+			DBG(("%s: transformed cursor size=%d too large, max=%d\n",
-+			     __FUNCTION__, size, sna->cursor.max_size));
-+			return false;
-+		}
-+	}
-+
-+	return true;
-+}
-+
- static Bool
- sna_use_hw_cursor(ScreenPtr screen, CursorPtr cursor)
- {
-@@ -5014,6 +6553,9 @@ sna_use_hw_cursor(ScreenPtr screen, CursorPtr cursor)
- 	DBG(("%s (%dx%d)?\n", __FUNCTION__,
- 	     cursor->bits->width, cursor->bits->height));
- 
-+	if (sna->cursor.disable)
-+		return FALSE;
-+
- 	/* cursors are invariant */
- 	if (cursor == sna->cursor.ref)
- 		return TRUE;
-@@ -5023,12 +6565,24 @@ sna_use_hw_cursor(ScreenPtr screen, CursorPtr cursor)
- 		sna->cursor.ref = NULL;
- 	}
- 
--	sna->cursor.size = __cursor_size(cursor);
--	if (sna->cursor.size > sna->cursor.max_size)
-+	sna->cursor.size =
-+		__cursor_size(cursor->bits->width, cursor->bits->height);
-+	if (sna->cursor.size > sna->cursor.max_size) {
-+		DBG(("%s: cursor size=%d too large, max %d: using sw cursor\n",
-+		     __FUNCTION__, sna->cursor.size, sna->cursor.max_size));
- 		return FALSE;
-+	}
-+
-+	if (sna->mode.rr_active && !transformable_cursor(sna, cursor)) {
-+		DBG(("%s: RandR active [%d] and non-transformable cursor: using sw cursor\n",
-+		     __FUNCTION__, sna->mode.rr_active));
-+		return FALSE;
-+	}
- 
--	if (!sna_cursor_preallocate(sna))
-+	if (!sna_cursor_preallocate(sna)) {
-+		DBG(("%s: cursor preallocation failed: using sw cursor\n", __FUNCTION__));
- 		return FALSE;
-+	}
- 
- 	sna->cursor.ref = cursor;
- 	cursor->refcnt++;
-@@ -5056,8 +6610,12 @@ sna_cursor_pre_init(struct sna *sna)
- 		return;
- 
- #define LOCAL_IOCTL_GET_CAP	DRM_IOWR(0x0c, struct local_get_cap)
--#define DRM_CAP_CURSOR_WIDTH	8
--#define DRM_CAP_CURSOR_HEIGHT	9
-+#ifndef DRM_CAP_CURSOR_WIDTH
-+#define DRM_CAP_CURSOR_WIDTH	0x8
-+#endif
-+#ifndef DRM_CAP_CURSOR_HEIGHT
-+#define DRM_CAP_CURSOR_HEIGHT	0x9
-+#endif
- 
- #define I915_PARAM_HAS_COHERENT_PHYS_GTT 29
- 
-@@ -5087,11 +6645,9 @@ sna_cursor_pre_init(struct sna *sna)
- 	DBG(("%s: cursor updates use_gtt?=%d\n",
- 	     __FUNCTION__, sna->cursor.use_gtt));
- 
--	if (!sna->cursor.use_gtt) {
--		sna->cursor.scratch = malloc(sna->cursor.max_size * sna->cursor.max_size * 4);
--		if (!sna->cursor.scratch)
--			sna->cursor.max_size = 0;
--	}
-+	sna->cursor.scratch = malloc(sna->cursor.max_size * sna->cursor.max_size * 4);
-+	if (!sna->cursor.scratch && !sna->cursor.use_gtt)
-+		sna->cursor.max_size = 0;
- 
- 	sna->cursor.num_stash = -sna->mode.num_real_crtc;
- 
-@@ -5193,7 +6749,7 @@ sna_crtc_flip(struct sna *sna, struct sna_crtc *crtc, struct kgem_bo *bo, int x,
- 	int output_count = 0;
- 	int i;
- 
--	DBG(("%s CRTC:%d [pipe=%d], handle=%d\n", __FUNCTION__, crtc->id, crtc->pipe, bo->handle));
-+	DBG(("%s CRTC:%d [pipe=%d], handle=%d\n", __FUNCTION__, __sna_crtc_id(crtc), __sna_crtc_pipe(crtc), bo->handle));
- 
- 	assert(sna->mode.num_real_output < ARRAY_SIZE(output_ids));
- 	assert(crtc->bo);
-@@ -5207,11 +6763,11 @@ sna_crtc_flip(struct sna *sna, struct sna_crtc *crtc, struct kgem_bo *bo, int x,
- 
- 		DBG(("%s: attaching output '%s' %d [%d] to crtc:%d (pipe %d) (possible crtc:%x, possible clones:%x)\n",
- 		     __FUNCTION__, output->name, i, to_connector_id(output),
--		     crtc->id, crtc->pipe,
-+		     __sna_crtc_id(crtc), __sna_crtc_pipe(crtc),
- 		     (uint32_t)output->possible_crtcs,
- 		     (uint32_t)output->possible_clones));
- 
--		assert(output->possible_crtcs & (1 << crtc->pipe) ||
-+		assert(output->possible_crtcs & (1 << __sna_crtc_pipe(crtc)) ||
- 		       is_zaphod(sna->scrn));
- 
- 		output_ids[output_count] = to_connector_id(output);
-@@ -5221,7 +6777,7 @@ sna_crtc_flip(struct sna *sna, struct sna_crtc *crtc, struct kgem_bo *bo, int x,
- 	assert(output_count);
- 
- 	VG_CLEAR(arg);
--	arg.crtc_id = crtc->id;
-+	arg.crtc_id = __sna_crtc_id(crtc);
- 	arg.fb_id = fb_id(bo);
- 	assert(arg.fb_id);
- 	arg.x = x;
-@@ -5231,20 +6787,74 @@ sna_crtc_flip(struct sna *sna, struct sna_crtc *crtc, struct kgem_bo *bo, int x,
- 	arg.mode = crtc->kmode;
- 	arg.mode_valid = 1;
- 
--	DBG(("%s: applying crtc [%d, pipe=%d] mode=%dx%d+%d+%d@%d, fb=%d across %d outputs [%d...]\n",
--	     __FUNCTION__, crtc->id, crtc->pipe,
--	     arg.mode.hdisplay,
--	     arg.mode.vdisplay,
--	     arg.x, arg.y,
--	     arg.mode.clock,
--	     arg.fb_id,
--	     output_count, output_count ? output_ids[0] : 0));
-+	DBG(("%s: applying crtc [%d, pipe=%d] mode=%dx%d+%d+%d@%d, fb=%d across %d outputs [%d...]\n",
-+	     __FUNCTION__, __sna_crtc_id(crtc), __sna_crtc_pipe(crtc),
-+	     arg.mode.hdisplay,
-+	     arg.mode.vdisplay,
-+	     arg.x, arg.y,
-+	     arg.mode.clock,
-+	     arg.fb_id,
-+	     output_count, output_count ? output_ids[0] : 0));
-+
-+	if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_SETCRTC, &arg))
-+		return false;
-+
-+	crtc->offset = y << 16 | x;
-+	__kgem_bo_clear_dirty(bo);
-+	return true;
-+}
-+
-+static void sna_mode_restore(struct sna *sna)
-+{
-+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
-+	int error = 0;
-+	int i;
-+
-+	assert(!sna->mode.hidden);
-+
-+	for (i = 0; i < sna->mode.num_real_crtc; i++) {
-+		xf86CrtcPtr crtc = config->crtc[i];
-+
-+		assert(to_sna_crtc(crtc) != NULL);
-+		if (to_sna_crtc(crtc)->bo == NULL)
-+			continue;
-+
-+		assert(crtc->enabled);
-+		if (!__sna_crtc_set_mode(crtc)) {
-+			sna_crtc_disable(crtc, false);
-+			error++;
-+		}
-+	}
-+	sna_mode_wakeup(sna);
-+	while (sna->mode.flip_active && sna_mode_wakeup(sna))
-+		;
-+	update_flush_interval(sna);
-+	sna_cursors_reload(sna);
-+	sna->mode.dirty = false;
-+
-+	if (error)
-+		xf86DrvMsg(sna->scrn->scrnIndex, X_ERROR,
-+			   "Failed to restore display configuration\n");
-+}
-+
-+bool sna_needs_page_flip(struct sna *sna, struct kgem_bo *bo)
-+{
-+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
-+	int i;
-+
-+	for (i = 0; i < sna->mode.num_real_crtc; i++) {
-+		struct sna_crtc *crtc = config->crtc[i]->driver_private;
-+
-+		if (crtc->bo == NULL)
-+			continue;
- 
--	if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_SETCRTC, &arg))
--		return false;
-+		if (crtc->bo == bo)
-+			continue;
- 
--	crtc->offset = y << 16 | x;
--	return true;
-+		return true;
-+	}
-+
-+	return false;
- }
- 
- int
-@@ -5256,6 +6866,7 @@ sna_page_flip(struct sna *sna,
- 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
- 	const int width = sna->scrn->virtualX;
- 	const int height = sna->scrn->virtualY;
-+	int sigio;
- 	int count = 0;
- 	int i;
- 
-@@ -5263,23 +6874,26 @@ sna_page_flip(struct sna *sna,
- 	assert(bo->refcnt);
- 
- 	assert((sna->flags & SNA_IS_HOSTED) == 0);
--	assert((sna->flags & SNA_TEAR_FREE) == 0);
- 	assert(sna->mode.flip_active == 0);
- 	assert(sna->mode.front_active);
-+	assert(!sna->mode.hidden);
- 	assert(sna->scrn->vtSema);
- 
- 	if ((sna->flags & (data ? SNA_HAS_FLIP : SNA_HAS_ASYNC_FLIP)) == 0)
- 		return 0;
- 
- 	kgem_bo_submit(&sna->kgem, bo);
-+	__kgem_bo_clear_dirty(bo);
- 
-+	sigio = sigio_block();
- 	for (i = 0; i < sna->mode.num_real_crtc; i++) {
- 		struct sna_crtc *crtc = config->crtc[i]->driver_private;
- 		struct drm_mode_crtc_page_flip arg;
- 		uint32_t crtc_offset;
-+		int fixup;
- 
- 		DBG(("%s: crtc %d id=%d, pipe=%d active? %d\n",
--		     __FUNCTION__, i, crtc->id, crtc->pipe, crtc->bo != NULL));
-+		     __FUNCTION__, i, __sna_crtc_id(crtc), __sna_crtc_pipe(crtc), crtc->bo != NULL));
- 		if (crtc->bo == NULL)
- 			continue;
- 		assert(!crtc->transform);
-@@ -5288,13 +6902,18 @@ sna_page_flip(struct sna *sna,
- 		assert(crtc->bo->refcnt >= crtc->bo->active_scanout);
- 		assert(crtc->flip_bo == NULL);
- 
--		arg.crtc_id = crtc->id;
-+		assert_crtc_fb(sna, crtc);
-+		if (data == NULL && crtc->bo == bo)
-+			goto next_crtc;
-+
-+		arg.crtc_id = __sna_crtc_id(crtc);
- 		arg.fb_id = get_fb(sna, bo, width, height);
- 		if (arg.fb_id == 0) {
- 			assert(count == 0);
--			return 0;
-+			break;
- 		}
- 
-+		fixup = 0;
- 		crtc_offset = crtc->base->y << 16 | crtc->base->x;
- 
- 		if (bo->pitch != crtc->bo->pitch || crtc_offset != crtc->offset) {
-@@ -5303,7 +6922,12 @@ sna_page_flip(struct sna *sna,
- 			     bo->pitch, crtc->bo->pitch,
- 			     crtc_offset, crtc->offset));
- fixup_flip:
-+			fixup = 1;
- 			if (crtc->bo != bo && sna_crtc_flip(sna, crtc, bo, crtc->base->x, crtc->base->y)) {
-+update_scanout:
-+				DBG(("%s: removing handle=%d [active_scanout=%d] from scanout, installing handle=%d [active_scanout=%d]\n",
-+				     __FUNCTION__, crtc->bo->handle, crtc->bo->active_scanout,
-+				     bo->handle, bo->active_scanout));
- 				assert(crtc->bo->active_scanout);
- 				assert(crtc->bo->refcnt >= crtc->bo->active_scanout);
- 				crtc->bo->active_scanout--;
-@@ -5321,15 +6945,8 @@ fixup_flip:
- 					goto next_crtc;
- 
- 				/* queue a flip in order to send the event */
--			} else {
--				if (count && !xf86SetDesiredModes(sna->scrn)) {
--					xf86DrvMsg(sna->scrn->scrnIndex, X_ERROR,
--						   "failed to restore display configuration\n");
--					for (; i < sna->mode.num_real_crtc; i++)
--						sna_crtc_disable(config->crtc[i]);
--				}
--				return 0;
--			}
-+			} else
-+				goto error;
- 		}
- 
- 		/* Only the reference crtc will finally deliver its page flip
-@@ -5346,7 +6963,7 @@ fixup_flip:
- 
- retry_flip:
- 		DBG(("%s: crtc %d id=%d, pipe=%d  --> fb %d\n",
--		     __FUNCTION__, i, crtc->id, crtc->pipe, arg.fb_id));
-+		     __FUNCTION__, i, __sna_crtc_id(crtc), __sna_crtc_pipe(crtc), arg.fb_id));
- 		if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_PAGE_FLIP, &arg)) {
- 			ERR(("%s: pageflip failed with err=%d\n", __FUNCTION__, errno));
- 
-@@ -5354,7 +6971,7 @@ retry_flip:
- 				struct drm_mode_crtc mode;
- 
- 				memset(&mode, 0, sizeof(mode));
--				mode.crtc_id = crtc->id;
-+				mode.crtc_id = __sna_crtc_id(crtc);
- 				drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETCRTC, &mode);
- 
- 				DBG(("%s: crtc=%d, valid?=%d, fb attached?=%d, expected=%d\n",
-@@ -5366,7 +6983,7 @@ retry_flip:
- 					goto fixup_flip;
- 
- 				if (count == 0)
--					return 0;
-+					break;
- 
- 				DBG(("%s: throttling on busy flip / waiting for kernel to catch up\n", __FUNCTION__));
- 				drmIoctl(sna->kgem.fd, DRM_IOCTL_I915_GEM_THROTTLE, 0);
-@@ -5375,15 +6992,25 @@ retry_flip:
- 				goto retry_flip;
- 			}
- 
-+			if (!fixup)
-+				goto fixup_flip;
-+
-+error:
- 			xf86DrvMsg(sna->scrn->scrnIndex, X_ERROR,
--				   "page flipping failed, on CRTC:%d (pipe=%d), disabling %s page flips\n",
--				   crtc->id, crtc->pipe, data ? "synchronous": "asynchronous");
-+					"page flipping failed, on CRTC:%d (pipe=%d), disabling %s page flips\n",
-+					__sna_crtc_id(crtc), __sna_crtc_pipe(crtc), data ? "synchronous": "asynchronous");
-+
-+			if (count || crtc->bo == bo)
-+				sna_mode_restore(sna);
-+
- 			sna->flags &= ~(data ? SNA_HAS_FLIP : SNA_HAS_ASYNC_FLIP);
--			goto fixup_flip;
-+			count = 0;
-+			break;
- 		}
- 
- 		if (data) {
- 			assert(crtc->flip_bo == NULL);
-+			assert(handler);
- 			crtc->flip_handler = handler;
- 			crtc->flip_data = data;
- 			crtc->flip_bo = kgem_bo_reference(bo);
-@@ -5391,11 +7018,15 @@ retry_flip:
- 			crtc->flip_serial = crtc->mode_serial;
- 			crtc->flip_pending = true;
- 			sna->mode.flip_active++;
--		}
- 
-+			DBG(("%s: recording flip on CRTC:%d handle=%d, active_scanout=%d, serial=%d\n",
-+			     __FUNCTION__, __sna_crtc_id(crtc), crtc->flip_bo->handle, crtc->flip_bo->active_scanout, crtc->flip_serial));
-+		} else
-+			goto update_scanout;
- next_crtc:
- 		count++;
- 	}
-+	sigio_unblock(sigio);
- 
- 	DBG(("%s: page flipped %d crtcs\n", __FUNCTION__, count));
- 	return count;
-@@ -5471,7 +7102,7 @@ static void crtc_init_gamma(xf86CrtcPtr crtc)
- 
- 		assert(sna_crtc);
- 
--		lut.crtc_id = sna_crtc->id;
-+		lut.crtc_id = __sna_crtc_id(sna_crtc);
- 		lut.gamma_size = 256;
- 		lut.red = (uintptr_t)(gamma);
- 		lut.green = (uintptr_t)(gamma + 256);
-@@ -5485,7 +7116,7 @@ static void crtc_init_gamma(xf86CrtcPtr crtc)
- 		}
- 
- 		DBG(("%s: CRTC:%d, pipe=%d: gamma set?=%d\n",
--		     __FUNCTION__, sna_crtc->id, sna_crtc->pipe,
-+		     __FUNCTION__, __sna_crtc_id(sna_crtc), __sna_crtc_pipe(sna_crtc),
- 		     gamma_set));
- 		if (!gamma_set) {
- 			int i;
-@@ -5502,6 +7133,7 @@ static void crtc_init_gamma(xf86CrtcPtr crtc)
- 			crtc->gamma_red = gamma;
- 			crtc->gamma_green = gamma + 256;
- 			crtc->gamma_blue = gamma + 2*256;
-+			crtc->gamma_size = 256;
- 		}
- 	}
- }
-@@ -5528,6 +7160,7 @@ static bool sna_probe_initial_configuration(struct sna *sna)
- {
- 	ScrnInfoPtr scrn = sna->scrn;
- 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
-+	int crtc_active, crtc_enabled;
- 	int width, height;
- 	int i, j;
- 
-@@ -5565,6 +7198,7 @@ static bool sna_probe_initial_configuration(struct sna *sna)
- 	}
- 
- 	/* Copy the existing modes on each CRTCs */
-+	crtc_active = crtc_enabled = 0;
- 	for (i = 0; i < sna->mode.num_real_crtc; i++) {
- 		xf86CrtcPtr crtc = config->crtc[i];
- 		struct sna_crtc *sna_crtc = to_sna_crtc(crtc);
-@@ -5577,12 +7211,12 @@ static bool sna_probe_initial_configuration(struct sna *sna)
- 
- 		/* Retrieve the current mode */
- 		VG_CLEAR(mode);
--		mode.crtc_id = sna_crtc->id;
-+		mode.crtc_id = __sna_crtc_id(sna_crtc);
- 		if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETCRTC, &mode))
- 			continue;
- 
- 		DBG(("%s: CRTC:%d, pipe=%d: has mode?=%d\n", __FUNCTION__,
--		     sna_crtc->id, sna_crtc->pipe,
-+		     __sna_crtc_id(sna_crtc), __sna_crtc_pipe(sna_crtc),
- 		     mode.mode_valid && mode.mode.clock));
- 
- 		if (!mode.mode_valid || mode.mode.clock == 0)
-@@ -5593,6 +7227,7 @@ static bool sna_probe_initial_configuration(struct sna *sna)
- 		crtc->desiredX = mode.x;
- 		crtc->desiredY = mode.y;
- 		crtc->desiredTransformPresent = FALSE;
-+		crtc_active++;
- 	}
- 
- 	/* Reconstruct outputs pointing to active CRTC */
-@@ -5604,6 +7239,7 @@ static bool sna_probe_initial_configuration(struct sna *sna)
- 
- 		crtc_id = (uintptr_t)output->crtc;
- 		output->crtc = NULL;
-+		output->status = XF86OutputStatusUnknown;
- 		if (sna->flags & SNA_IS_SLAVED)
- 			continue;
- 
-@@ -5623,7 +7259,7 @@ static bool sna_probe_initial_configuration(struct sna *sna)
- 			xf86CrtcPtr crtc = config->crtc[j];
- 
- 			assert(to_sna_crtc(crtc));
--			if (to_sna_crtc(crtc)->id != crtc_id)
-+			if (sna_crtc_id(crtc) != crtc_id)
- 				continue;
- 
- 			if (crtc->desiredMode.status == MODE_OK) {
-@@ -5641,18 +7277,30 @@ static bool sna_probe_initial_configuration(struct sna *sna)
- 					   "Output %s using initial mode %s on pipe %d\n",
- 					   output->name,
- 					   crtc->desiredMode.name,
--					   to_sna_crtc(crtc)->pipe);
-+					   sna_crtc_pipe(crtc));
- 
- 				output->crtc = crtc;
-+				output->status = XF86OutputStatusConnected;
- 				crtc->enabled = TRUE;
-+				crtc_enabled++;
-+
-+				output_set_gamma(output, crtc);
-+
-+				if (output->conf_monitor) {
-+					output->mm_width = output->conf_monitor->mon_width;
-+					output->mm_height = output->conf_monitor->mon_height;
-+				}
-+
-+#if 0
-+				sna_output_attach_edid(output);
-+				sna_output_attach_tile(output);
-+#endif
- 
- 				if (output->mm_width == 0 || output->mm_height == 0) {
- 					output->mm_height = (crtc->desiredMode.VDisplay * 254) / (10*DEFAULT_DPI);
- 					output->mm_width = (crtc->desiredMode.HDisplay * 254) / (10*DEFAULT_DPI);
- 				}
- 
--				output_set_gamma(output, crtc);
--
- 				M = calloc(1, sizeof(DisplayModeRec));
- 				if (M) {
- 					*M = crtc->desiredMode;
-@@ -5673,6 +7321,12 @@ static bool sna_probe_initial_configuration(struct sna *sna)
- 		}
- 	}
- 
-+	if (crtc_active != crtc_enabled) {
-+		DBG(("%s: only enabled %d out of %d active CRTC, forcing a reconfigure\n",
-+		     __FUNCTION__, crtc_enabled, crtc_active));
-+		return false;
-+	}
-+
- 	width = height = 0;
- 	for (i = 0; i < sna->mode.num_real_crtc; i++) {
- 		xf86CrtcPtr crtc = config->crtc[i];
-@@ -5707,8 +7361,8 @@ static bool sna_probe_initial_configuration(struct sna *sna)
- 			if (sna_output->num_modes == 0)
- 				continue;
- 
--			width = sna_output->modes[0].hdisplay;
--			height= sna_output->modes[0].vdisplay;
-+			width  = sna_output->modes[0].hdisplay;
-+			height = sna_output->modes[0].vdisplay;
- 
- 			DBG(("%s: panel '%s' is %dx%d\n",
- 			     __FUNCTION__, output->name, width, height));
-@@ -5788,7 +7442,7 @@ probe_capabilities(struct sna *sna)
- 	sna->flags &= ~(SNA_HAS_FLIP | SNA_HAS_ASYNC_FLIP);
- 	if (has_flip(sna))
- 		sna->flags |= SNA_HAS_FLIP;
--	if (has_flip__async(sna))
-+	if (has_flip__async(sna) && (sna->flags & SNA_TEAR_FREE) == 0)
- 		sna->flags |= SNA_HAS_ASYNC_FLIP;
- 	DBG(("%s: page flips? %s, async? %s\n", __FUNCTION__,
- 	     sna->flags & SNA_HAS_FLIP ? "enabled" : "disabled",
-@@ -5813,12 +7467,25 @@ sna_crtc_config_notify(ScreenPtr screen)
- 		return;
- 	}
- 
-+	/* Flush any events completed by the modeset */
-+	sna_mode_wakeup(sna);
-+
- 	update_flush_interval(sna);
-+	sna->cursor.disable = false; /* Reset HW cursor until the next fail */
- 	sna_cursors_reload(sna);
- 
- 	probe_capabilities(sna);
- 	sna_present_update(sna);
- 
-+	/* Allow TearFree to come back on when everything is off */
-+	if (!sna->mode.front_active && sna->flags & SNA_WANT_TEAR_FREE) {
-+		if ((sna->flags & SNA_TEAR_FREE) == 0)
-+			DBG(("%s: enable TearFree next modeset\n",
-+			     __FUNCTION__));
-+
-+		sna->flags |= SNA_TEAR_FREE;
-+	}
-+
- 	sna->mode.dirty = false;
- }
- 
-@@ -5840,6 +7507,7 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna)
- 	}
- 
- 	probe_capabilities(sna);
-+	sna->mode.hidden = 1;
- 
- 	if (!xf86GetOptValInteger(sna->Options, OPTION_VIRTUAL, &num_fake))
- 		num_fake = 1;
-@@ -5855,6 +7523,9 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna)
- 	if (res) {
- 		xf86CrtcConfigPtr xf86_config;
- 
-+		DBG(("%s: found %d CRTC, %d encoders, %d connectors\n",
-+		     __FUNCTION__, res->count_crtcs, res->count_encoders, res->count_connectors));
-+
- 		assert(res->count_crtcs);
- 		assert(res->count_connectors);
- 
-@@ -5862,6 +7533,7 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna)
- 
- 		xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
- 		xf86_config->xf86_crtc_notify = sna_crtc_config_notify;
-+		xf86_config->compat_output = 0;
- 
- 		for (i = 0; i < res->count_crtcs; i++)
- 			if (!sna_crtc_add(scrn, res->crtcs[i]))
-@@ -5900,6 +7572,11 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna)
- 	if (!sna_mode_fake_init(sna, num_fake))
- 		return false;
- 
-+	sna->mode.shadow_size = 256;
-+	sna->mode.shadow_events = malloc(sna->mode.shadow_size * sizeof(struct drm_event_vblank));
-+	if (!sna->mode.shadow_events)
-+		return false;
-+
- 	if (!sna_probe_initial_configuration(sna)) {
- 		xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
- 
-@@ -5912,6 +7589,7 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna)
- 		}
- 	}
- 	sort_config_outputs(sna);
-+	TimerSet(NULL, 0, COLDPLUG_DELAY_MS, sna_mode_coldplug, sna);
- 
- 	sna_setup_provider(scrn);
- 	return scrn->modes != NULL;
-@@ -5921,18 +7599,58 @@ bool
- sna_mode_wants_tear_free(struct sna *sna)
- {
- 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
-+	bool found = false;
-+	FILE *file;
- 	int i;
- 
-+	file = fopen("/sys/module/i915/parameters/enable_fbc", "r");
-+	if (file) {
-+		int fbc_enabled = 0;
-+		int value;
-+
-+		if (fscanf(file, "%d", &value) == 1)
-+			fbc_enabled = value > 0;
-+		fclose(file);
-+
-+		DBG(("%s: module parameter 'enable_fbc' enabled? %d\n",
-+		     __FUNCTION__, fbc_enabled));
-+
-+		if (fbc_enabled)
-+			return true;
-+	}
-+
- 	for (i = 0; i < sna->mode.num_real_output; i++) {
- 		struct sna_output *output = to_sna_output(config->output[i]);
- 		int id = find_property(sna, output, "Panel Self-Refresh");
--		if (id !=-1 && output->prop_values[id] != -1) {
-+		if (id == -1)
-+			continue;
-+
-+		found = true;
-+		if (output->prop_values[id] != -1) {
- 			DBG(("%s: Panel Self-Refresh detected on %s\n",
- 			     __FUNCTION__, config->output[i]->name));
- 			return true;
- 		}
- 	}
- 
-+	if (!found) {
-+		file = fopen("/sys/module/i915/parameters/enable_psr", "r");
-+		if (file) {
-+			int psr_enabled = 0;
-+			int value;
-+
-+			if (fscanf(file, "%d", &value) == 1)
-+				psr_enabled = value > 0;
-+			fclose(file);
-+
-+			DBG(("%s: module parameter 'enable_psr' enabled? %d\n",
-+			     __FUNCTION__, psr_enabled));
-+
-+			if (psr_enabled)
-+				return true;
-+		}
-+	}
-+
- 	return false;
- }
- 
-@@ -5955,7 +7673,7 @@ sna_mode_set_primary(struct sna *sna)
- 
- 		DBG(("%s: setting PrimaryOutput %s\n", __FUNCTION__, output->name));
- 		rr->primaryOutput = output->randr_output;
--		RROutputChanged(rr->primaryOutput, 0);
-+		RROutputChanged(rr->primaryOutput, FALSE);
- 		rr->layoutChanged = TRUE;
- 		break;
- 	}
-@@ -5974,12 +7692,9 @@ sna_mode_disable(struct sna *sna)
- 	if (!sna->scrn->vtSema)
- 		return false;
- 
--	/* XXX we will cause previously hidden cursors to be reshown, but
--	 * this should be a rare fixup case for severe fragmentation.
--	 */
--	sna_hide_cursors(sna->scrn);
-+	sna_disable_cursors(sna->scrn);
- 	for (i = 0; i < sna->mode.num_real_crtc; i++)
--		sna_crtc_disable(config->crtc[i]);
-+		sna_crtc_disable(config->crtc[i], false);
- 	assert(sna->mode.front_active == 0);
- 
- 	sna_mode_wakeup(sna);
-@@ -6001,6 +7716,11 @@ sna_mode_enable(struct sna *sna)
- 	if (!sna->scrn->vtSema)
- 		return;
- 
-+	if (sna->mode.hidden) {
-+		DBG(("%s: hidden outputs\n", __FUNCTION__));
-+		return;
-+	}
-+
- 	for (i = 0; i < sna->mode.num_real_crtc; i++) {
- 		xf86CrtcPtr crtc = config->crtc[i];
- 
-@@ -6016,13 +7736,30 @@ sna_mode_enable(struct sna *sna)
- 	}
- 
- 	update_flush_interval(sna);
--	sna_show_cursors(sna->scrn);
-+	sna_cursors_reload(sna);
- 	sna->mode.dirty = false;
- }
- 
-+static void sna_randr_close(struct sna *sna)
-+{
-+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
-+	int n;
-+
-+	/* The RR structs are freed early during CloseScreen as they
-+	 * are tracked as Resources. However, we may be tempted to
-+	 * access them during shutdown so decouple them now.
-+	 */
-+	  for (n = 0; n < config->num_output; n++)
-+		  config->output[n]->randr_output = NULL;
-+
-+	  for (n = 0; n < config->num_crtc; n++)
-+		  config->crtc[n]->randr_crtc = NULL;
-+}
-+
- void
- sna_mode_close(struct sna *sna)
- {
-+	sna_randr_close(sna);
- 	sna_mode_wakeup(sna);
- 
- 	if (sna->flags & SNA_IS_HOSTED)
-@@ -6077,15 +7814,22 @@ xf86CrtcPtr
- sna_covering_crtc(struct sna *sna, const BoxRec *box, xf86CrtcPtr desired)
- {
- 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
--	xf86CrtcPtr best_crtc;
--	int best_coverage, c;
-+	xf86CrtcPtr best_crtc = NULL;
-+	int best_coverage = -1, c;
- 
- 	if (sna->flags & SNA_IS_HOSTED)
- 		return NULL;
- 
- 	/* If we do not own the VT, we do not own the CRTC either */
--	if (!sna->scrn->vtSema)
-+	if (!sna->scrn->vtSema) {
-+		DBG(("%s: none, VT switched\n", __FUNCTION__));
-+		return NULL;
-+	}
-+
-+	if (sna->mode.hidden) {
-+		DBG(("%s: none, hidden outputs\n", __FUNCTION__));
- 		return NULL;
-+	}
- 
- 	DBG(("%s for box=(%d, %d), (%d, %d)\n",
- 	     __FUNCTION__, box->x1, box->y1, box->x2, box->y2));
-@@ -6107,10 +7851,10 @@ sna_covering_crtc(struct sna *sna, const BoxRec *box, xf86CrtcPtr desired)
- 			     cover_box.x2, cover_box.y2));
- 			return desired;
- 		}
-+		best_crtc = desired;
-+		best_coverage = 0;
- 	}
- 
--	best_crtc = NULL;
--	best_coverage = 0;
- 	for (c = 0; c < sna->mode.num_real_crtc; c++) {
- 		xf86CrtcPtr crtc = config->crtc[c];
- 		BoxRec cover_box;
-@@ -6156,6 +7900,38 @@ sna_covering_crtc(struct sna *sna, const BoxRec *box, xf86CrtcPtr desired)
- 	return best_crtc;
- }
- 
-+static xf86CrtcPtr first_active_crtc(struct sna *sna)
-+{
-+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
-+	int n;
-+
-+	for (n = 0; n < sna->mode.num_real_crtc; n++) {
-+		xf86CrtcPtr crtc = config->crtc[n];
-+		if (to_sna_crtc(crtc)->bo)
-+			return crtc;
-+	}
-+
-+	/* No active, use the first as a placeholder */
-+	if (sna->mode.num_real_crtc)
-+		return config->crtc[0];
-+
-+	return NULL;
-+}
-+
-+xf86CrtcPtr sna_primary_crtc(struct sna *sna)
-+{
-+	rrScrPrivPtr rr = rrGetScrPriv(xf86ScrnToScreen(sna->scrn));
-+	if (rr && rr->primaryOutput) {
-+		xf86OutputPtr output = rr->primaryOutput->devPrivate;
-+		if (output->crtc &&
-+		    output->scrn == sna->scrn &&
-+		    to_sna_crtc(output->crtc))
-+			return output->crtc;
-+	}
-+
-+	return first_active_crtc(sna);
-+}
-+
- #define MI_LOAD_REGISTER_IMM			(0x22<<23)
- 
- static bool sna_emit_wait_for_scanline_hsw(struct sna *sna,
-@@ -6433,7 +8209,7 @@ sna_wait_for_scanline(struct sna *sna,
- 		y2 /= 2;
- 	}
- 
--	pipe = sna_crtc_to_pipe(crtc);
-+	pipe = sna_crtc_pipe(crtc);
- 	DBG(("%s: pipe=%d, y1=%d, y2=%d, full_height?=%d\n",
- 	     __FUNCTION__, pipe, y1, y2, full_height));
- 
-@@ -6457,19 +8233,101 @@ sna_wait_for_scanline(struct sna *sna,
- 	return ret;
- }
- 
-+static bool sna_mode_shutdown_crtc(xf86CrtcPtr crtc)
-+{
-+	struct sna *sna = to_sna(crtc->scrn);
-+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
-+	bool disabled = false;
-+	int o;
-+
-+	xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
-+		   "%s: invalid state found on pipe %d, disabling CRTC:%d\n",
-+		   __FUNCTION__,
-+		   __sna_crtc_pipe(to_sna_crtc(crtc)),
-+		   __sna_crtc_id(to_sna_crtc(crtc)));
-+	sna_crtc_disable(crtc, true);
-+#if XF86_CRTC_VERSION >= 3
-+	crtc->active = FALSE;
-+#endif
-+	if (crtc->enabled) {
-+		crtc->enabled = FALSE;
-+		disabled = true;
-+	}
-+
-+	for (o = 0; o < sna->mode.num_real_output; o++) {
-+		xf86OutputPtr output = config->output[o];
-+
-+		if (output->crtc != crtc)
-+			continue;
-+
-+		output->funcs->dpms(output, DPMSModeOff);
-+		output->crtc = NULL;
-+	}
-+
-+	return disabled;
-+}
-+
-+static bool
-+sna_mode_disable_secondary_planes(struct sna *sna)
-+{
-+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
-+	bool disabled = false;
-+	int c;
-+
-+	/* Disable all secondary planes on our CRTCs, just in case
-+	 * other userspace left garbage in them.
-+	 */
-+	for (c = 0; c < sna->mode.num_real_crtc; c++) {
-+		xf86CrtcPtr crtc = config->crtc[c];
-+		struct sna_crtc *sna_crtc = to_sna_crtc(crtc);
-+		struct plane *plane;
-+
-+		list_for_each_entry(plane, &sna_crtc->sprites, link) {
-+			struct local_mode_get_plane p;
-+			struct local_mode_set_plane s;
-+
-+			VG_CLEAR(p);
-+			p.plane_id = plane->id;
-+			p.count_format_types = 0;
-+			if (drmIoctl(sna->kgem.fd,
-+				     LOCAL_IOCTL_MODE_GETPLANE,
-+				     &p))
-+				continue;
-+
-+			if (p.fb_id == 0 || p.crtc_id == 0)
-+				continue;
-+
-+			memset(&s, 0, sizeof(s));
-+			s.plane_id = p.plane_id;
-+			s.crtc_id = p.crtc_id;
-+			if (drmIoctl(sna->kgem.fd,
-+				     LOCAL_IOCTL_MODE_SETPLANE,
-+				     &s))
-+				disabled |= sna_mode_shutdown_crtc(crtc);
-+		}
-+	}
-+
-+	return disabled;
-+}
-+
- void sna_mode_check(struct sna *sna)
- {
- 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
--	int i;
-+	bool disabled;
-+	int c, o;
- 
- 	if (sna->flags & SNA_IS_HOSTED)
- 		return;
- 
--	DBG(("%s\n", __FUNCTION__));
-+	DBG(("%s: hidden?=%d\n", __FUNCTION__, sna->mode.hidden));
-+	if (sna->mode.hidden)
-+		return;
-+
-+	disabled = sna_mode_disable_secondary_planes(sna);
- 
- 	/* Validate CRTC attachments and force consistency upon the kernel */
--	for (i = 0; i < sna->mode.num_real_crtc; i++) {
--		xf86CrtcPtr crtc = config->crtc[i];
-+	for (c = 0; c < sna->mode.num_real_crtc; c++) {
-+		xf86CrtcPtr crtc = config->crtc[c];
- 		struct sna_crtc *sna_crtc = to_sna_crtc(crtc);
- 		struct drm_mode_crtc mode;
- 		uint32_t expected[2];
-@@ -6483,7 +8341,7 @@ void sna_mode_check(struct sna *sna)
- 		expected[1] = sna_crtc->flip_bo ? fb_id(sna_crtc->flip_bo) : -1;
- 
- 		VG_CLEAR(mode);
--		mode.crtc_id = sna_crtc->id;
-+		mode.crtc_id = __sna_crtc_id(sna_crtc);
- 		if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETCRTC, &mode))
- 			continue;
- 
-@@ -6492,16 +8350,12 @@ void sna_mode_check(struct sna *sna)
- 		     mode.crtc_id, mode.mode_valid,
- 		     mode.fb_id, expected[0], expected[1]));
- 
--		if (mode.fb_id != expected[0] && mode.fb_id != expected[1]) {
--			xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
--				   "%s: invalid state found on pipe %d, disabling CRTC:%d\n",
--				   __FUNCTION__, sna_crtc->pipe, sna_crtc->id);
--			sna_crtc_disable(crtc);
--		}
-+		if (mode.fb_id != expected[0] && mode.fb_id != expected[1])
-+			disabled |= sna_mode_shutdown_crtc(crtc);
- 	}
- 
--	for (i = 0; i < config->num_output; i++) {
--		xf86OutputPtr output = config->output[i];
-+	for (o = 0; o < config->num_output; o++) {
-+		xf86OutputPtr output = config->output[o];
- 		struct sna_output *sna_output;
- 
- 		if (output->crtc)
-@@ -6515,26 +8369,16 @@ void sna_mode_check(struct sna *sna)
- 	}
- 
- 	update_flush_interval(sna);
-+
-+	if (disabled)
-+		xf86RandR12TellChanged(xf86ScrnToScreen(sna->scrn));
- }
- 
- static bool
- sna_crtc_hide_planes(struct sna *sna, struct sna_crtc *crtc)
- {
--#define LOCAL_IOCTL_MODE_SETPLANE DRM_IOWR(0xB7, struct local_mode_set_plane)
--	struct local_mode_set_plane {
--		uint32_t plane_id;
--		uint32_t crtc_id;
--		uint32_t fb_id; /* fb object contains surface format type */
--		uint32_t flags;
--
--		/* Signed dest location allows it to be partially off screen */
--		int32_t crtc_x, crtc_y;
--		uint32_t crtc_w, crtc_h;
--
--		/* Source values are 16.16 fixed point */
--		uint32_t src_x, src_y;
--		uint32_t src_h, src_w;
--	} s;
-+	struct local_mode_set_plane s;
-+	struct plane *plane;
- 
- 	if (crtc->primary.id == 0)
- 		return false;
-@@ -6544,8 +8388,10 @@ sna_crtc_hide_planes(struct sna *sna, struct sna_crtc *crtc)
- 	if (drmIoctl(sna->kgem.fd, LOCAL_IOCTL_MODE_SETPLANE, &s))
- 		return false;
- 
--	s.plane_id = crtc->sprite.id;
--	(void)drmIoctl(sna->kgem.fd, LOCAL_IOCTL_MODE_SETPLANE, &s);
-+	list_for_each_entry(plane, &crtc->sprites, link) {
-+		s.plane_id = plane->id;
-+		(void)drmIoctl(sna->kgem.fd, LOCAL_IOCTL_MODE_SETPLANE, &s);
-+	}
- 
- 	__sna_crtc_disable(sna, crtc);
- 	return true;
-@@ -6561,21 +8407,22 @@ void sna_mode_reset(struct sna *sna)
- 
- 	DBG(("%s\n", __FUNCTION__));
- 
--	sna_hide_cursors(sna->scrn);
-+	sna_disable_cursors(sna->scrn);
- 	for (i = 0; i < sna->mode.num_real_crtc; i++)
- 		if (!sna_crtc_hide_planes(sna, to_sna_crtc(config->crtc[i])))
--			sna_crtc_disable(config->crtc[i]);
-+			sna_crtc_disable(config->crtc[i], true);
- 	assert(sna->mode.front_active == 0);
- 
- 	for (i = 0; i < sna->mode.num_real_crtc; i++) {
- 		struct sna_crtc *sna_crtc = to_sna_crtc(config->crtc[i]);
-+		struct plane *plane;
- 
- 		assert(sna_crtc != NULL);
--		sna_crtc->dpms_mode = -1;
- 
- 		/* Force the rotation property to be reset on next use */
- 		rotation_reset(&sna_crtc->primary);
--		rotation_reset(&sna_crtc->sprite);
-+		list_for_each_entry(plane, &sna_crtc->sprites, link)
-+			rotation_reset(plane);
- 	}
- 
- 	/* VT switching, likely to be fbcon so make the backlight usable */
-@@ -6641,9 +8488,10 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo
- {
- 	int16_t sx, sy;
- 	struct sna *sna = to_sna(crtc->scrn);
--	ScreenPtr screen = sna->scrn->pScreen;
-+	ScreenPtr screen = xf86ScrnToScreen(crtc->scrn);
- 	DrawablePtr draw = crtc_source(crtc, &sx, &sy);
- 	PictFormatPtr format;
-+	PictTransform T;
- 	PicturePtr src, dst;
- 	PixmapPtr pixmap;
- 	int depth, error;
-@@ -6664,6 +8512,14 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo
- 	     __FUNCTION__, format->format, depth, draw->bitsPerPixel,
- 	     bo->pitch, crtc->mode.HDisplay, crtc->mode.VDisplay));
- 
-+	if (sx | sy)
-+		RegionTranslate(region, sx, sy);
-+	error = !sna_drawable_move_region_to_cpu(draw, region, MOVE_READ);
-+	if (sx | sy)
-+		RegionTranslate(region, -sx, -sy);
-+	if (error)
-+		return;
-+
- 	ptr = kgem_bo_map__gtt(&sna->kgem, bo);
- 	if (ptr == NULL)
- 		return;
-@@ -6683,9 +8539,37 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo
- 	if (!src)
- 		goto free_pixmap;
- 
--	error = SetPictureTransform(src, &crtc->crtc_to_framebuffer);
--	if (error)
--		goto free_src;
-+	pixman_transform_init_translate(&T, sx << 16, sy << 16);
-+	pixman_transform_multiply(&T, &T, &crtc->crtc_to_framebuffer);
-+	if (!sna_transform_is_integer_translation(&T, &sx, &sy)) {
-+#define f2d(x) (((double)(x))/65536.)
-+		DBG(("%s: transform=[[%f %f %f], [%f %f %f], [%f %f %f]] (raw [[%x %x %x], [%x %x %x], [%x %x %x]])\n",
-+		     __FUNCTION__,
-+		     f2d(T.matrix[0][0]),
-+		     f2d(T.matrix[0][1]),
-+		     f2d(T.matrix[0][2]),
-+		     f2d(T.matrix[1][0]),
-+		     f2d(T.matrix[1][1]),
-+		     f2d(T.matrix[1][2]),
-+		     f2d(T.matrix[2][0]),
-+		     f2d(T.matrix[2][1]),
-+		     f2d(T.matrix[2][2]),
-+		     T.matrix[0][0],
-+		     T.matrix[0][1],
-+		     T.matrix[0][2],
-+		     T.matrix[1][0],
-+		     T.matrix[1][1],
-+		     T.matrix[1][2],
-+		     T.matrix[2][0],
-+		     T.matrix[2][1],
-+		     T.matrix[2][2]));
-+#undef f2d
-+
-+		error = SetPictureTransform(src, &T);
-+		if (error)
-+			goto free_src;
-+		sx = sy = 0;
-+	}
- 
- 	if (crtc->filter && crtc->transform_in_use)
- 		SetPicturePictFilter(src, crtc->filter,
-@@ -6733,10 +8617,11 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo
- {
- 	int16_t sx, sy;
- 	struct sna *sna = to_sna(crtc->scrn);
--	ScreenPtr screen = crtc->scrn->pScreen;
-+	ScreenPtr screen = xf86ScrnToScreen(crtc->scrn);
- 	DrawablePtr draw = crtc_source(crtc, &sx, &sy);
- 	struct sna_composite_op tmp;
- 	PictFormatPtr format;
-+	PictTransform T;
- 	PicturePtr src, dst;
- 	PixmapPtr pixmap;
- 	const BoxRec *b;
-@@ -6777,9 +8662,14 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo
- 	if (!src)
- 		goto free_pixmap;
- 
--	error = SetPictureTransform(src, &crtc->crtc_to_framebuffer);
--	if (error)
--		goto free_src;
-+	pixman_transform_init_translate(&T, sx << 16, sy << 16);
-+	pixman_transform_multiply(&T, &T, &crtc->crtc_to_framebuffer);
-+	if (!sna_transform_is_integer_translation(&T, &sx, &sy)) {
-+		error = SetPictureTransform(src, &T);
-+		if (error)
-+			goto free_src;
-+		sx = sy = 0;
-+	}
- 
- 	if (crtc->filter && crtc->transform_in_use)
- 		SetPicturePictFilter(src, crtc->filter,
-@@ -6793,36 +8683,38 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo
- 	ValidatePicture(src);
- 	ValidatePicture(dst);
- 
--	if (!sna->render.composite(sna,
--				   PictOpSrc, src, NULL, dst,
--				   sx, sy,
--				   0, 0,
--				   0, 0,
--				   crtc->mode.HDisplay, crtc->mode.VDisplay,
--				   COMPOSITE_PARTIAL, memset(&tmp, 0, sizeof(tmp)))) {
--		DBG(("%s: unsupported operation!\n", __FUNCTION__));
--		sna_crtc_redisplay__fallback(crtc, region, bo);
--		goto free_dst;
--	}
--
-+	/* Composite each box individually as if we are dealing with a rotation
-+	 * on a large display, we may have to perform intermediate copies. We
-+	 * can then minimise the overdraw by looking at individual boxes rather
-+	 * than the bbox.
-+	 */
- 	n = region_num_rects(region);
- 	b = region_rects(region);
- 	do {
--		BoxRec box;
--
--		box = *b++;
-+		BoxRec box = *b;
- 		transformed_box(&box, crtc);
- 
- 		DBG(("%s: (%d, %d)x(%d, %d) -> (%d, %d), (%d, %d)\n",
- 		     __FUNCTION__,
--		     b[-1].x1, b[-1].y1, b[-1].x2-b[-1].x1, b[-1].y2-b[-1].y1,
-+		     b->x1, b->y1, b->x2-b->x1, b->y2-b->y1,
- 		     box.x1, box.y1, box.x2, box.y2));
- 
--		tmp.box(sna, &tmp, &box);
--	} while (--n);
--	tmp.done(sna, &tmp);
-+		if (!sna->render.composite(sna,
-+					   PictOpSrc, src, NULL, dst,
-+					   sx + box.x1, sy + box.y1,
-+					   0, 0,
-+					   box.x1, box.y1,
-+					   box.x2 - box.x1, box.y2 - box.y1,
-+					   0, memset(&tmp, 0, sizeof(tmp)))) {
-+			DBG(("%s: unsupported operation!\n", __FUNCTION__));
-+			sna_crtc_redisplay__fallback(crtc, region, bo);
-+			break;
-+		} else {
-+			tmp.box(sna, &tmp, &box);
-+			tmp.done(sna, &tmp);
-+		}
-+	} while (b++, --n);
- 
--free_dst:
- 	FreePicture(dst, None);
- free_src:
- 	FreePicture(src, None);
-@@ -6839,7 +8731,7 @@ sna_crtc_redisplay(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo *bo)
- 	struct sna_pixmap *priv = sna_pixmap((PixmapPtr)draw);
- 
- 	DBG(("%s: crtc %d [pipe=%d], damage (%d, %d), (%d, %d) x %d\n",
--	     __FUNCTION__, to_sna_crtc(crtc)->id, to_sna_crtc(crtc)->pipe,
-+	     __FUNCTION__, sna_crtc_id(crtc), sna_crtc_pipe(crtc),
- 	     region->extents.x1, region->extents.y1,
- 	     region->extents.x2, region->extents.y2,
- 	     region_num_rects(region)));
-@@ -6898,7 +8790,10 @@ sna_crtc_redisplay(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo *bo)
- static void shadow_flip_handler(struct drm_event_vblank *e,
- 				void *data)
- {
--	sna_mode_redisplay(data);
-+	struct sna *sna = data;
-+
-+	if (!sna->mode.shadow_wait)
-+		sna_mode_redisplay(sna);
- }
- 
- void sna_shadow_set_crtc(struct sna *sna,
-@@ -6908,18 +8803,23 @@ void sna_shadow_set_crtc(struct sna *sna,
- 	struct sna_crtc *sna_crtc = to_sna_crtc(crtc);
- 	struct sna_pixmap *priv;
- 
-+	assert(sna_crtc);
- 	DBG(("%s: setting shadow override for CRTC:%d to handle=%d\n",
--	     __FUNCTION__, sna_crtc->id, bo->handle));
-+	     __FUNCTION__, __sna_crtc_id(sna_crtc), bo->handle));
- 
- 	assert(sna->flags & SNA_TEAR_FREE);
--	assert(sna_crtc);
- 	assert(!sna_crtc->transform);
- 
- 	if (sna_crtc->client_bo != bo) {
--		if (sna_crtc->client_bo)
-+		if (sna_crtc->client_bo) {
-+			assert(sna_crtc->client_bo->refcnt >= sna_crtc->client_bo->active_scanout);
-+			sna_crtc->client_bo->active_scanout--;
- 			kgem_bo_destroy(&sna->kgem, sna_crtc->client_bo);
-+		}
- 
- 		sna_crtc->client_bo = kgem_bo_reference(bo);
-+		sna_crtc->client_bo->active_scanout++;
-+		assert(sna_crtc->client_bo->refcnt >= sna_crtc->client_bo->active_scanout);
- 		sna_crtc_damage(crtc);
- 	}
- 
-@@ -6969,11 +8869,13 @@ void sna_shadow_unset_crtc(struct sna *sna,
- 	struct sna_crtc *sna_crtc = to_sna_crtc(crtc);
- 
- 	DBG(("%s: clearin shadow override for CRTC:%d\n",
--	     __FUNCTION__, sna_crtc->id));
-+	     __FUNCTION__, __sna_crtc_id(sna_crtc)));
- 
- 	if (sna_crtc->client_bo == NULL)
- 		return;
- 
-+	assert(sna_crtc->client_bo->refcnt >= sna_crtc->client_bo->active_scanout);
-+	sna_crtc->client_bo->active_scanout--;
- 	kgem_bo_destroy(&sna->kgem, sna_crtc->client_bo);
- 	sna_crtc->client_bo = NULL;
- 	list_del(&sna_crtc->shadow_link);
-@@ -6982,15 +8884,57 @@ void sna_shadow_unset_crtc(struct sna *sna,
- 	sna_crtc_damage(crtc);
- }
- 
-+static bool move_crtc_to_gpu(struct sna *sna)
-+{
-+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
-+	int i;
-+
-+	for (i = 0; i < sna->mode.num_real_crtc; i++) {
-+		struct sna_crtc *crtc = to_sna_crtc(config->crtc[i]);
-+		unsigned hint;
-+
-+		assert(crtc);
-+
-+		if (crtc->bo == NULL)
-+			continue;
-+
-+		if (crtc->slave_pixmap)
-+			continue;
-+
-+		if (crtc->client_bo)
-+			continue;
-+
-+		if (crtc->shadow_bo)
-+			continue;
-+
-+		hint = MOVE_READ | MOVE_ASYNC_HINT | __MOVE_SCANOUT;
-+		if (sna->flags & SNA_TEAR_FREE)
-+			hint |= __MOVE_FORCE;
-+
-+		DBG(("%s: CRTC %d [pipe=%d] requires frontbuffer\n",
-+		     __FUNCTION__, __sna_crtc_id(crtc), __sna_crtc_pipe(crtc)));
-+		return sna_pixmap_move_to_gpu(sna->front, hint);
-+	}
-+
-+	return true;
-+}
-+
- void sna_mode_redisplay(struct sna *sna)
- {
- 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
- 	RegionPtr region;
- 	int i;
- 
--	if (!sna->mode.shadow_damage)
-+	if (sna->mode.hidden) {
-+		DBG(("%s: hidden outputs, skipping\n", __FUNCTION__));
-+		return;
-+	}
-+
-+	if (!sna->mode.shadow_enabled)
- 		return;
- 
-+	assert(sna->mode.shadow_damage);
-+
- 	DBG(("%s: posting shadow damage? %d (flips pending? %d, mode reconfiguration pending? %d)\n",
- 	     __FUNCTION__,
- 	     !RegionNil(DamageRegion(sna->mode.shadow_damage)),
-@@ -7012,21 +8956,23 @@ void sna_mode_redisplay(struct sna *sna)
- 	     region->extents.x2, region->extents.y2));
- 
- 	if (sna->mode.flip_active) {
--		DamagePtr damage;
--
--		damage = sna->mode.shadow_damage;
--		sna->mode.shadow_damage = NULL;
-+		DBG(("%s: checking for %d outstanding flip completions\n",
-+		     __FUNCTION__, sna->mode.flip_active));
- 
-+		sna->mode.dirty = true;
- 		while (sna->mode.flip_active && sna_mode_wakeup(sna))
- 			;
-+		sna->mode.dirty = false;
- 
--		sna->mode.shadow_damage = damage;
-+		DBG(("%s: now %d outstanding flip completions (enabled? %d)\n",
-+		     __FUNCTION__,
-+		     sna->mode.flip_active,
-+		     sna->mode.shadow_enabled));
-+		if (sna->mode.flip_active || !sna->mode.shadow_enabled)
-+			return;
- 	}
- 
--	if (sna->mode.flip_active)
--		return;
--
--	if (wedged(sna) || !sna_pixmap_move_to_gpu(sna->front, MOVE_READ | MOVE_ASYNC_HINT | __MOVE_SCANOUT)) {
-+	if (!move_crtc_to_gpu(sna)) {
- 		DBG(("%s: forcing scanout update using the CPU\n", __FUNCTION__));
- 		if (!sna_pixmap_move_to_cpu(sna->front, MOVE_READ))
- 			return;
-@@ -7047,90 +8993,14 @@ void sna_mode_redisplay(struct sna *sna)
- 			damage.data = NULL;
- 			RegionIntersect(&damage, &damage, region);
- 			if (!box_empty(&damage.extents)) {
--				struct kgem_bo *bo = NULL;
--
- 				DBG(("%s: fallback intersects pipe=%d [(%d, %d), (%d, %d)]\n",
--				     __FUNCTION__, sna_crtc->pipe,
-+				     __FUNCTION__, __sna_crtc_pipe(sna_crtc),
- 				     damage.extents.x1, damage.extents.y1,
- 				     damage.extents.x2, damage.extents.y2));
- 
--				if (sna->flags & SNA_TEAR_FREE) {
--					RegionRec new_damage;
--
--					RegionNull(&new_damage);
--					RegionCopy(&new_damage, &damage);
--
--					bo = sna_crtc->client_bo;
--					if (bo == NULL) {
--						damage.extents = crtc->bounds;
--						damage.data = NULL;
--						bo = kgem_create_2d(&sna->kgem,
--								crtc->mode.HDisplay,
--								crtc->mode.VDisplay,
--								crtc->scrn->bitsPerPixel,
--								sna_crtc->bo->tiling,
--								CREATE_SCANOUT);
--					} else
--						RegionUnion(&damage, &damage, &sna_crtc->client_damage);
--
--					DBG(("%s: TearFree fallback, shadow handle=%d, crtc handle=%d\n", __FUNCTION__, bo->handle, sna_crtc->bo->handle));
--
--					sna_crtc->client_damage = new_damage;
--				}
--
--				if (bo == NULL)
--					bo = sna_crtc->bo;
--				sna_crtc_redisplay__fallback(crtc, &damage, bo);
--
--				if (bo != sna_crtc->bo) {
--					struct drm_mode_crtc_page_flip arg;
--
--					arg.crtc_id = sna_crtc->id;
--					arg.fb_id = get_fb(sna, bo,
--							   crtc->mode.HDisplay,
--							   crtc->mode.VDisplay);
--
--					arg.user_data = (uintptr_t)sna_crtc;
--					arg.flags = DRM_MODE_PAGE_FLIP_EVENT;
--					arg.reserved = 0;
--
--					if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_PAGE_FLIP, &arg)) {
--						if (sna_crtc_flip(sna, sna_crtc, bo, 0, 0)) {
--							assert(sna_crtc->bo->active_scanout);
--							assert(sna_crtc->bo->refcnt >= sna_crtc->bo->active_scanout);
--							sna_crtc->bo->active_scanout--;
--							kgem_bo_destroy(&sna->kgem, sna_crtc->bo);
--
--							sna_crtc->bo = bo;
--							sna_crtc->bo->active_scanout++;
--							sna_crtc->client_bo = NULL;
--						} else {
--							DBG(("%s: flip [fb=%d] on crtc %d [%d, pipe=%d] failed - %d\n",
--							     __FUNCTION__, arg.fb_id, i, sna_crtc->id, sna_crtc->pipe, errno));
--							xf86DrvMsg(sna->scrn->scrnIndex, X_ERROR,
--								   "Page flipping failed, disabling TearFree\n");
--							sna->flags &= ~SNA_TEAR_FREE;
--
--							damage.extents = crtc->bounds;
--							damage.data = NULL;
--							sna_crtc_redisplay__fallback(crtc, &damage, sna_crtc->bo);
--
--							kgem_bo_destroy(&sna->kgem, bo);
--							sna_crtc->client_bo = NULL;
--						}
--					} else {
--						sna->mode.flip_active++;
--
--						assert(sna_crtc->flip_bo == NULL);
--						sna_crtc->flip_handler = shadow_flip_handler;
--						sna_crtc->flip_data = sna;
--						sna_crtc->flip_bo = bo;
--						sna_crtc->flip_bo->active_scanout++;
--						sna_crtc->flip_serial = sna_crtc->mode_serial;
--
--						sna_crtc->client_bo = kgem_bo_reference(sna_crtc->bo);
--					}
--				}
-+				sna_crtc_redisplay__fallback(crtc,
-+							     &damage,
-+							     sna_crtc->bo);
- 			}
- 			RegionUninit(&damage);
- 
-@@ -7171,6 +9041,7 @@ void sna_mode_redisplay(struct sna *sna)
- 		xf86CrtcPtr crtc = config->crtc[i];
- 		struct sna_crtc *sna_crtc = to_sna_crtc(crtc);
- 		RegionRec damage;
-+		int sigio;
- 
- 		assert(sna_crtc != NULL);
- 		DBG(("%s: crtc[%d] transformed? %d\n",
-@@ -7192,30 +9063,38 @@ void sna_mode_redisplay(struct sna *sna)
- 		     region_num_rects(&damage),
- 		     damage.extents.x1, damage.extents.y1,
- 		     damage.extents.x2, damage.extents.y2));
-+		sigio = sigio_block();
- 		if (!box_empty(&damage.extents)) {
- 			if (sna->flags & SNA_TEAR_FREE) {
-+				RegionRec new_damage;
- 				struct drm_mode_crtc_page_flip arg;
- 				struct kgem_bo *bo;
- 
--				RegionUninit(&damage);
--				damage.extents = crtc->bounds;
--				damage.data = NULL;
-+				RegionNull(&new_damage);
-+				RegionCopy(&new_damage, &damage);
- 
--				bo = sna_crtc->client_bo;
--				if (bo == NULL)
-+				bo = sna_crtc->cache_bo;
-+				if (bo == NULL) {
-+					damage.extents = crtc->bounds;
-+					damage.data = NULL;
- 					bo = kgem_create_2d(&sna->kgem,
- 							    crtc->mode.HDisplay,
- 							    crtc->mode.VDisplay,
- 							    crtc->scrn->bitsPerPixel,
- 							    sna_crtc->bo->tiling,
- 							    CREATE_SCANOUT);
--				if (bo == NULL)
--					goto disable1;
-+					if (bo == NULL)
-+						continue;
-+				} else
-+					RegionUnion(&damage, &damage, &sna_crtc->crtc_damage);
-+				sna_crtc->crtc_damage = new_damage;
- 
- 				sna_crtc_redisplay(crtc, &damage, bo);
- 				kgem_bo_submit(&sna->kgem, bo);
-+				__kgem_bo_clear_dirty(bo);
- 
--				arg.crtc_id = sna_crtc->id;
-+				assert_crtc_fb(sna, sna_crtc);
-+				arg.crtc_id = __sna_crtc_id(sna_crtc);
- 				arg.fb_id = get_fb(sna, bo,
- 						   crtc->mode.HDisplay,
- 						   crtc->mode.VDisplay);
-@@ -7228,6 +9107,9 @@ void sna_mode_redisplay(struct sna *sna)
- 
- 				if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_PAGE_FLIP, &arg)) {
- 					if (sna_crtc_flip(sna, sna_crtc, bo, 0, 0)) {
-+						DBG(("%s: removing handle=%d [active_scanout=%d] from scanout, installing handle=%d [active_scanout=%d]\n",
-+						     __FUNCTION__, sna_crtc->bo->handle, sna_crtc->bo->active_scanout - 1,
-+						     bo->handle, bo->active_scanout));
- 						assert(sna_crtc->bo->active_scanout);
- 						assert(sna_crtc->bo->refcnt >= sna_crtc->bo->active_scanout);
- 						sna_crtc->bo->active_scanout--;
-@@ -7235,13 +9117,12 @@ void sna_mode_redisplay(struct sna *sna)
- 
- 						sna_crtc->bo = kgem_bo_reference(bo);
- 						sna_crtc->bo->active_scanout++;
--						sna_crtc->client_bo = kgem_bo_reference(bo);
- 					} else {
- 						BoxRec box;
- 						DrawableRec tmp;
- 
- 						DBG(("%s: flip [fb=%d] on crtc %d [%d, pipe=%d] failed - %d\n",
--						     __FUNCTION__, arg.fb_id, i, sna_crtc->id, sna_crtc->pipe, errno));
-+						     __FUNCTION__, arg.fb_id, i, __sna_crtc_id(sna_crtc), __sna_crtc_pipe(sna_crtc), errno));
- 						xf86DrvMsg(sna->scrn->scrnIndex, X_ERROR,
- 							   "Page flipping failed, disabling TearFree\n");
- 						sna->flags &= ~SNA_TEAR_FREE;
-@@ -7260,13 +9141,13 @@ disable1:
- 									    &box, 1, COPY_LAST)) {
- 							xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
- 								   "%s: page flipping failed, disabling CRTC:%d (pipe=%d)\n",
--								   __FUNCTION__, sna_crtc->id, sna_crtc->pipe);
--							sna_crtc_disable(crtc);
-+								   __FUNCTION__, __sna_crtc_id(sna_crtc), __sna_crtc_pipe(sna_crtc));
-+							sna_crtc_disable(crtc, false);
- 						}
--
--						kgem_bo_destroy(&sna->kgem, bo);
--						sna_crtc->client_bo = NULL;
- 					}
-+
-+					kgem_bo_destroy(&sna->kgem, bo);
-+					sna_crtc->cache_bo = NULL;
- 					continue;
- 				}
- 				sna->mode.flip_active++;
-@@ -7279,13 +9160,20 @@ disable1:
- 				sna_crtc->flip_serial = sna_crtc->mode_serial;
- 				sna_crtc->flip_pending = true;
- 
--				sna_crtc->client_bo = kgem_bo_reference(sna_crtc->bo);
-+				if (sna_crtc->bo != sna->mode.shadow) {
-+					assert_scanout(&sna->kgem, sna_crtc->bo,
-+						       crtc->mode.HDisplay, crtc->mode.VDisplay);
-+					sna_crtc->cache_bo = kgem_bo_reference(sna_crtc->bo);
-+				}
-+				DBG(("%s: recording flip on CRTC:%d handle=%d, active_scanout=%d, serial=%d\n",
-+				     __FUNCTION__, __sna_crtc_id(sna_crtc), sna_crtc->flip_bo->handle, sna_crtc->flip_bo->active_scanout, sna_crtc->flip_serial));
- 			} else {
- 				sna_crtc_redisplay(crtc, &damage, sna_crtc->bo);
- 				kgem_scanout_flush(&sna->kgem, sna_crtc->bo);
- 			}
- 		}
- 		RegionUninit(&damage);
-+		sigio_unblock(sigio);
- 
- 		if (sna_crtc->slave_damage)
- 			DamageEmpty(sna_crtc->slave_damage);
-@@ -7296,6 +9184,7 @@ disable1:
- 		struct kgem_bo *old = sna->mode.shadow;
- 		struct drm_mode_crtc_page_flip arg;
- 		uint32_t fb = 0;
-+		int sigio;
- 
- 		DBG(("%s: flipping TearFree outputs, current scanout handle=%d [active?=%d], new handle=%d [active=%d]\n",
- 		     __FUNCTION__, old->handle, old->active_scanout, new->handle, new->active_scanout));
-@@ -7307,7 +9196,9 @@ disable1:
- 		arg.reserved = 0;
- 
- 		kgem_bo_submit(&sna->kgem, new);
-+		__kgem_bo_clear_dirty(new);
- 
-+		sigio = sigio_block();
- 		for (i = 0; i < sna->mode.num_real_crtc; i++) {
- 			struct sna_crtc *crtc = config->crtc[i]->driver_private;
- 			struct kgem_bo *flip_bo;
-@@ -7315,20 +9206,20 @@ disable1:
- 
- 			assert(crtc != NULL);
- 			DBG(("%s: crtc %d [%d, pipe=%d] active? %d, transformed? %d\n",
--			     __FUNCTION__, i, crtc->id, crtc->pipe, crtc->bo ? crtc->bo->handle : 0, crtc->transform));
-+			     __FUNCTION__, i, __sna_crtc_id(crtc), __sna_crtc_pipe(crtc), crtc->bo ? crtc->bo->handle : 0, crtc->transform));
- 			if (crtc->bo == NULL || crtc->transform)
- 				continue;
- 
- 			assert(config->crtc[i]->enabled);
--			assert(crtc->dpms_mode <= DPMSModeOn);
- 			assert(crtc->flip_bo == NULL);
-+			assert_crtc_fb(sna, crtc);
- 
--			arg.crtc_id = crtc->id;
-+			arg.crtc_id = __sna_crtc_id(crtc);
- 			arg.user_data = (uintptr_t)crtc;
- 
- 			if (crtc->client_bo) {
- 				DBG(("%s: apply shadow override bo for CRTC:%d on pipe=%d, handle=%d\n",
--				     __FUNCTION__, crtc->id, crtc->pipe, crtc->client_bo->handle));
-+				     __FUNCTION__, __sna_crtc_id(crtc), __sna_crtc_pipe(crtc), crtc->client_bo->handle));
- 				arg.fb_id = get_fb(sna, crtc->client_bo,
- 						   crtc->base->mode.HDisplay,
- 						   crtc->base->mode.VDisplay);
-@@ -7356,6 +9247,7 @@ fixup_shadow:
- 						}
- 					}
- 
-+					sigio_unblock(sigio);
- 					return;
- 				}
- 
-@@ -7365,8 +9257,12 @@ fixup_shadow:
- 				y = crtc->base->y;
- 			}
- 
--			if (crtc->bo == flip_bo)
-+			if (crtc->bo == flip_bo) {
-+				assert(crtc->bo->refcnt >= crtc->bo->active_scanout);
-+				DBG(("%s: flip handle=%d is already on the CRTC\n",
-+				     __FUNCTION__, flip_bo->handle));
- 				continue;
-+			}
- 
- 			if (flip_bo->pitch != crtc->bo->pitch || (y << 16 | x)  != crtc->offset) {
- 				DBG(("%s: changing pitch (new %d =?= old %d) or offset (new %x =?= old %x)\n",
-@@ -7375,6 +9271,9 @@ fixup_shadow:
- 				     y << 16 | x, crtc->offset));
- fixup_flip:
- 				if (sna_crtc_flip(sna, crtc, flip_bo, x, y)) {
-+					DBG(("%s: removing handle=%d [active_scanout=%d] from scanout, installing handle=%d [active_scanout=%d]\n",
-+					     __FUNCTION__, crtc->bo->handle, crtc->bo->active_scanout-1,
-+					     flip_bo->handle, flip_bo->active_scanout));
- 					assert(flip_bo != crtc->bo);
- 					assert(crtc->bo->active_scanout);
- 					assert(crtc->bo->refcnt >= crtc->bo->active_scanout);
-@@ -7389,9 +9288,11 @@ fixup_flip:
- 					crtc->bo = kgem_bo_reference(flip_bo);
- 					crtc->bo->active_scanout++;
- 				} else {
--					xf86DrvMsg(sna->scrn->scrnIndex, X_ERROR,
--						   "Failed to prepare CRTC for page flipping, disabling TearFree\n");
--					sna->flags &= ~SNA_TEAR_FREE;
-+					if (sna->flags & SNA_TEAR_FREE) {
-+						xf86DrvMsg(sna->scrn->scrnIndex, X_ERROR,
-+								"Failed to prepare CRTC for page flipping, disabling TearFree\n");
-+						sna->flags &= ~SNA_TEAR_FREE;
-+					}
- 
- 					if (sna->mode.flip_active == 0) {
- 						DBG(("%s: abandoning flip attempt\n", __FUNCTION__));
-@@ -7400,15 +9301,15 @@ fixup_flip:
- 
- 					xf86DrvMsg(sna->scrn->scrnIndex, X_ERROR,
- 						   "%s: page flipping failed, disabling CRTC:%d (pipe=%d)\n",
--						   __FUNCTION__, crtc->id, crtc->pipe);
--					sna_crtc_disable(crtc->base);
-+						   __FUNCTION__, __sna_crtc_id(crtc), __sna_crtc_pipe(crtc));
-+					sna_crtc_disable(crtc->base, false);
- 				}
- 				continue;
- 			}
- 
- 			if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_PAGE_FLIP, &arg)) {
- 				ERR(("%s: flip [fb=%d] on crtc %d [%d, pipe=%d] failed - %d\n",
--				     __FUNCTION__, arg.fb_id, i, crtc->id, crtc->pipe, errno));
-+				     __FUNCTION__, arg.fb_id, i, __sna_crtc_id(crtc), __sna_crtc_pipe(crtc), errno));
- 				goto fixup_flip;
- 			}
- 			sna->mode.flip_active++;
-@@ -7421,6 +9322,9 @@ fixup_flip:
- 			crtc->flip_serial = crtc->mode_serial;
- 			crtc->flip_pending = true;
- 
-+			DBG(("%s: recording flip on CRTC:%d handle=%d, active_scanout=%d, serial=%d\n",
-+			     __FUNCTION__, __sna_crtc_id(crtc), crtc->flip_bo->handle, crtc->flip_bo->active_scanout, crtc->flip_serial));
-+
- 			{
- 				struct drm_i915_gem_busy busy = { flip_bo->handle };
- 				if (drmIoctl(sna->kgem.fd, DRM_IOCTL_I915_GEM_BUSY, &busy) == 0) {
-@@ -7435,6 +9339,7 @@ fixup_flip:
- 				}
- 			}
- 		}
-+		sigio_unblock(sigio);
- 
- 		DBG(("%s: flipped %d outputs, shadow active? %d\n",
- 		     __FUNCTION__,
-@@ -7486,7 +9391,9 @@ again:
- 		struct drm_event *e = (struct drm_event *)&buffer[i];
- 		switch (e->type) {
- 		case DRM_EVENT_VBLANK:
--			if (((uintptr_t)((struct drm_event_vblank *)e)->user_data) & 2)
-+			if (sna->mode.shadow_wait)
-+				defer_event(sna, e);
-+			else if (((uintptr_t)((struct drm_event_vblank *)e)->user_data) & 2)
- 				sna_present_vblank_handler((struct drm_event_vblank *)e);
- 			else
- 				sna_dri2_vblank_handler((struct drm_event_vblank *)e);
-@@ -7495,13 +9402,19 @@ again:
- 			{
- 				struct drm_event_vblank *vbl = (struct drm_event_vblank *)e;
- 				struct sna_crtc *crtc = (void *)(uintptr_t)vbl->user_data;
-+				uint64_t msc;
- 
- 				/* Beware Zaphod! */
- 				sna = to_sna(crtc->base->scrn);
- 
--				crtc->swap.tv_sec = vbl->tv_sec;
--				crtc->swap.tv_usec = vbl->tv_usec;
--				crtc->swap.msc = msc64(crtc, vbl->sequence);
-+				if (msc64(crtc, vbl->sequence, &msc)) {
-+					DBG(("%s: recording last swap on pipe=%d, frame %d [%08llx], time %d.%06d\n",
-+					     __FUNCTION__, __sna_crtc_pipe(crtc), vbl->sequence, (long long)msc, vbl->tv_sec, vbl->tv_usec));
-+					crtc->swap.tv_sec = vbl->tv_sec;
-+					crtc->swap.tv_usec = vbl->tv_usec;
-+					crtc->swap.msc = msc;
-+				}
-+				assert(crtc->flip_pending);
- 				crtc->flip_pending = false;
- 
- 				assert(crtc->flip_bo);
-@@ -7509,10 +9422,12 @@ again:
- 				assert(crtc->flip_bo->refcnt >= crtc->flip_bo->active_scanout);
- 
- 				if (crtc->flip_serial == crtc->mode_serial) {
--					DBG(("%s: removing handle=%d from scanout, installing handle=%d\n",
--					     __FUNCTION__, crtc->bo->handle, crtc->flip_bo->handle));
-+					DBG(("%s: removing handle=%d [active_scanout=%d] from scanout, installing handle=%d [active_scanout=%d]\n",
-+					     __FUNCTION__, crtc->bo->handle, crtc->bo->active_scanout - 1,
-+					     crtc->flip_bo->handle, crtc->flip_bo->active_scanout));
- 					assert(crtc->bo->active_scanout);
- 					assert(crtc->bo->refcnt >= crtc->bo->active_scanout);
-+
- 					crtc->bo->active_scanout--;
- 					kgem_bo_destroy(&sna->kgem, crtc->bo);
- 
-@@ -7523,6 +9438,8 @@ again:
- 
- 					crtc->bo = crtc->flip_bo;
- 					crtc->flip_bo = NULL;
-+
-+					assert_crtc_fb(sna, crtc);
- 				} else {
- 					crtc->flip_bo->active_scanout--;
- 					kgem_bo_destroy(&sna->kgem, crtc->flip_bo);
-@@ -7531,8 +9448,10 @@ again:
- 
- 				DBG(("%s: flip complete, pending? %d\n", __FUNCTION__, sna->mode.flip_active));
- 				assert(sna->mode.flip_active);
--				if (--sna->mode.flip_active == 0)
-+				if (--sna->mode.flip_active == 0) {
-+					assert(crtc->flip_handler);
- 					crtc->flip_handler(vbl, crtc->flip_data);
-+				}
- 			}
- 			break;
- 		default:
-diff --git a/src/sna/sna_display_fake.c b/src/sna/sna_display_fake.c
-index 4d74c38d..fa26bda1 100644
---- a/src/sna/sna_display_fake.c
-+++ b/src/sna/sna_display_fake.c
-@@ -96,12 +96,6 @@ sna_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
- }
- 
- static void
--sna_crtc_gamma_set(xf86CrtcPtr crtc,
--		       CARD16 *red, CARD16 *green, CARD16 *blue, int size)
--{
--}
--
--static void
- sna_crtc_destroy(xf86CrtcPtr crtc)
- {
- }
-@@ -109,7 +103,6 @@ sna_crtc_destroy(xf86CrtcPtr crtc)
- static const xf86CrtcFuncsRec sna_crtc_funcs = {
- 	.dpms = sna_crtc_dpms,
- 	.set_mode_major = sna_crtc_set_mode_major,
--	.gamma_set = sna_crtc_gamma_set,
- 	.destroy = sna_crtc_destroy,
- };
- 
-@@ -192,7 +185,7 @@ static const xf86OutputFuncsRec sna_output_funcs = {
- static Bool
- sna_mode_resize(ScrnInfoPtr scrn, int width, int height)
- {
--	ScreenPtr screen = scrn->pScreen;
-+	ScreenPtr screen = xf86ScrnToScreen(scrn);
- 	PixmapPtr new_front;
- 
- 	DBG(("%s (%d, %d) -> (%d, %d)\n", __FUNCTION__,
-@@ -262,6 +255,7 @@ static bool add_fake_output(struct sna *sna, bool late)
- 	output->mm_height = 0;
- 	output->interlaceAllowed = FALSE;
- 	output->subpixel_order = SubPixelNone;
-+	output->status = XF86OutputStatusDisconnected;
- 
- 	output->possible_crtcs = ~((1 << sna->mode.num_real_crtc) - 1);
- 	output->possible_clones = ~((1 << sna->mode.num_real_output) - 1);
-@@ -297,6 +291,8 @@ static bool add_fake_output(struct sna *sna, bool late)
- 
- 		RRCrtcSetRotations(crtc->randr_crtc,
- 				   RR_Rotate_All | RR_Reflect_All);
-+		if (!RRCrtcGammaSetSize(crtc->randr_crtc, 256))
-+			goto err;
- 	}
- 
- 	sna->mode.num_fake++;
-@@ -312,13 +308,16 @@ err:
- 			continue;
- 
- 		xf86OutputDestroy(output);
-+		i--;
- 	}
- 
- 	for (i = 0; i < xf86_config->num_crtc; i++) {
- 		crtc = xf86_config->crtc[i];
- 		if (crtc->driver_private)
- 			continue;
-+
- 		xf86CrtcDestroy(crtc);
-+		i--;
- 	}
- 	sna->mode.num_fake = -1;
- 	return false;
-diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
-index e5c4d53e..d89525cc 100644
---- a/src/sna/sna_dri2.c
-+++ b/src/sna/sna_dri2.c
-@@ -82,12 +82,23 @@ get_private(void *buffer)
- 	return (struct sna_dri2_private *)((DRI2Buffer2Ptr)buffer+1);
- }
- 
-+pure static inline DRI2BufferPtr sna_pixmap_get_buffer(PixmapPtr pixmap)
-+{
-+	assert(pixmap->refcnt);
-+	return ((void **)__get_private(pixmap, sna_pixmap_key))[2];
-+}
-+
-+static inline void sna_pixmap_set_buffer(PixmapPtr pixmap, void *ptr)
-+{
-+	assert(pixmap->refcnt);
-+	((void **)__get_private(pixmap, sna_pixmap_key))[2] = ptr;
-+}
-+
- #if DRI2INFOREC_VERSION >= 4
- enum event_type {
- 	WAITMSC = 0,
- 	SWAP,
--	SWAP_WAIT,
--	SWAP_THROTTLE,
-+	SWAP_COMPLETE,
- 	FLIP,
- 	FLIP_THROTTLE,
- 	FLIP_COMPLETE,
-@@ -98,6 +109,7 @@ struct dri_bo {
- 	struct list link;
- 	struct kgem_bo *bo;
- 	uint32_t name;
-+	unsigned flags;
- };
- 
- struct sna_dri2_event {
-@@ -108,6 +120,8 @@ struct sna_dri2_event {
- 	xf86CrtcPtr crtc;
- 	int pipe;
- 	bool queued;
-+	bool sync;
-+	bool chained;
- 
- 	/* for swaps & flips only */
- 	DRI2SwapEventPtr event_complete;
-@@ -116,35 +130,146 @@ struct sna_dri2_event {
- 	DRI2BufferPtr back;
- 	struct kgem_bo *bo;
- 
-+	struct copy {
-+		struct kgem_bo *bo;
-+		unsigned flags;
-+		uint32_t name;
-+		uint32_t size;
-+	} pending;
-+
- 	struct sna_dri2_event *chain;
- 
--	struct list cache;
- 	struct list link;
- 
--	int mode;
-+	int flip_continue;
-+	int keepalive;
-+	int signal;
- };
- 
-+#if DRI2INFOREC_VERSION < 10
-+#undef USE_ASYNC_SWAP
-+#endif
-+
-+#if USE_ASYNC_SWAP
-+#define KEEPALIVE 8 /* wait ~100ms before discarding swap caches */
-+#define APPLY_DAMAGE 0
-+#else
-+#define USE_ASYNC_SWAP 0
-+#define KEEPALIVE 1
-+#define APPLY_DAMAGE 1
-+#endif
-+
- static void sna_dri2_flip_event(struct sna_dri2_event *flip);
-+inline static DRI2BufferPtr dri2_window_get_front(WindowPtr win);
-+
-+static struct kgem_bo *
-+__sna_dri2_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region,
-+		      DRI2BufferPtr src, DRI2BufferPtr dst,
-+		      unsigned flags);
-+
-+inline static void
-+__sna_dri2_copy_event(struct sna_dri2_event *info, unsigned flags)
-+{
-+	DBG(("%s: flags = %x\n", __FUNCTION__, flags));
-+	assert(info->front != info->back);
-+	info->bo = __sna_dri2_copy_region(info->sna, info->draw, NULL,
-+					  info->back, info->front,
-+					  flags);
-+	info->front->flags = info->back->flags;
-+}
-+
-+static int front_pitch(DrawablePtr draw)
-+{
-+	DRI2BufferPtr buffer;
-+
-+	buffer = NULL;
-+	if (draw->type != DRAWABLE_PIXMAP)
-+		buffer = dri2_window_get_front((WindowPtr)draw);
-+	if (buffer == NULL)
-+		buffer = sna_pixmap_get_buffer(get_drawable_pixmap(draw));
-+
-+	return buffer ? buffer->pitch : 0;
-+}
-+
-+struct dri2_window {
-+	DRI2BufferPtr front;
-+	struct sna_dri2_event *chain;
-+	xf86CrtcPtr crtc;
-+	int64_t msc_delta;
-+	struct list cache;
-+	uint32_t cache_size;
-+	int scanout;
-+};
-+
-+static struct dri2_window *dri2_window(WindowPtr win)
-+{
-+	assert(win->drawable.type != DRAWABLE_PIXMAP);
-+	return ((void **)__get_private(win, sna_window_key))[1];
-+}
-+
-+static bool use_scanout(struct sna *sna,
-+			DrawablePtr draw,
-+			struct dri2_window *priv)
-+{
-+	if (priv->front)
-+		return true;
-+
-+	if (priv->scanout < 0)
-+		priv->scanout =
-+			(sna->flags & (SNA_LINEAR_FB | SNA_NO_WAIT | SNA_NO_FLIP)) == 0 &&
-+			draw->width  == sna->front->drawable.width &&
-+			draw->height == sna->front->drawable.height &&
-+			draw->bitsPerPixel == sna->front->drawable.bitsPerPixel;
-+
-+	return priv->scanout;
-+}
- 
- static void
- sna_dri2_get_back(struct sna *sna,
- 		  DrawablePtr draw,
--		  DRI2BufferPtr back,
--		  struct sna_dri2_event *info)
-+		  DRI2BufferPtr back)
- {
-+	struct dri2_window *priv = dri2_window((WindowPtr)draw);
-+	uint32_t size;
- 	struct kgem_bo *bo;
-+	struct dri_bo *c;
- 	uint32_t name;
-+	int flags;
- 	bool reuse;
- 
--	DBG(("%s: draw size=%dx%d, buffer size=%dx%d\n",
-+	DBG(("%s: draw size=%dx%d, back buffer handle=%d size=%dx%d, is-scanout? %d, active?=%d, pitch=%d, front pitch=%d\n",
- 	     __FUNCTION__, draw->width, draw->height,
--	     get_private(back)->size & 0xffff, get_private(back)->size >> 16));
--	reuse = (draw->height << 16 | draw->width) == get_private(back)->size;
-+	     get_private(back)->bo->handle,
-+	     get_private(back)->size & 0xffff, get_private(back)->size >> 16,
-+	     get_private(back)->bo->scanout,
-+	     get_private(back)->bo->active_scanout,
-+	     back->pitch, front_pitch(draw)));
-+	assert(priv);
-+
-+	size = draw->height << 16 | draw->width;
-+	if (size != priv->cache_size) {
-+		while (!list_is_empty(&priv->cache)) {
-+			c = list_first_entry(&priv->cache, struct dri_bo, link);
-+			list_del(&c->link);
-+
-+			DBG(("%s: releasing cached handle=%d\n", __FUNCTION__, c->bo ? c->bo->handle : 0));
-+			assert(c->bo);
-+			kgem_bo_destroy(&sna->kgem, c->bo);
-+
-+			free(c);
-+		}
-+		priv->cache_size = size;
-+	}
-+
-+	reuse = size == get_private(back)->size;
-+	if (reuse)
-+		reuse = get_private(back)->bo->scanout == use_scanout(sna, draw, priv);
-+	DBG(("%s: reuse backbuffer? %d\n", __FUNCTION__, reuse));
- 	if (reuse) {
- 		bo = get_private(back)->bo;
- 		assert(bo->refcnt);
--		DBG(("%s: back buffer handle=%d, scanout?=%d, refcnt=%d\n",
--					__FUNCTION__, bo->handle, bo->active_scanout, get_private(back)->refcnt));
-+		DBG(("%s: back buffer handle=%d, active?=%d, refcnt=%d\n",
-+		     __FUNCTION__, bo->handle, bo->active_scanout, get_private(back)->refcnt));
- 		if (bo->active_scanout == 0) {
- 			DBG(("%s: reuse unattached back\n", __FUNCTION__));
- 			get_private(back)->stale = false;
-@@ -153,24 +278,37 @@ sna_dri2_get_back(struct sna *sna,
- 	}
- 
- 	bo = NULL;
--	if (info) {
--		struct dri_bo *c;
--		list_for_each_entry(c, &info->cache, link) {
--			if (c->bo && c->bo->scanout == 0) {
--				bo = c->bo;
--				name = c->name;
--				DBG(("%s: reuse cache handle=%d\n", __FUNCTION__, bo->handle));
--				list_move_tail(&c->link, &info->cache);
--				c->bo = NULL;
-+	list_for_each_entry(c, &priv->cache, link) {
-+		DBG(("%s: cache: handle=%d, active=%d\n",
-+		     __FUNCTION__, c->bo ? c->bo->handle : 0, c->bo ? c->bo->active_scanout : -1));
-+		assert(c->bo);
-+		if (c->bo->active_scanout == 0) {
-+			_list_del(&c->link);
-+			if (c->bo == NULL) {
-+				free(c);
-+				goto out;
- 			}
-+			bo = c->bo;
-+			name = c->name;
-+			flags = c->flags;
-+			DBG(("%s: reuse cache handle=%d, name=%d, flags=%d\n", __FUNCTION__, bo->handle, name, flags));
-+			c->bo = NULL;
-+			break;
- 		}
- 	}
- 	if (bo == NULL) {
- 		DBG(("%s: allocating new backbuffer\n", __FUNCTION__));
-+		flags = CREATE_EXACT;
-+
-+		if (use_scanout(sna, draw, priv)) {
-+			DBG(("%s: requesting scanout compatible back\n", __FUNCTION__));
-+			flags |= CREATE_SCANOUT;
-+		}
-+
- 		bo = kgem_create_2d(&sna->kgem,
- 				    draw->width, draw->height, draw->bitsPerPixel,
- 				    get_private(back)->bo->tiling,
--				    get_private(back)->bo->scanout ? CREATE_SCANOUT : 0);
-+				    flags);
- 		if (bo == NULL)
- 			return;
- 
-@@ -179,30 +317,42 @@ sna_dri2_get_back(struct sna *sna,
- 			kgem_bo_destroy(&sna->kgem, bo);
- 			return;
- 		}
-+
-+		flags = 0;
-+		if (USE_ASYNC_SWAP && back->flags) {
-+			BoxRec box;
-+
-+			box.x1 = 0;
-+			box.y1 = 0;
-+			box.x2 = draw->width;
-+			box.y2 = draw->height;
-+
-+			DBG(("%s: filling new buffer with old back\n", __FUNCTION__));
-+			if (sna->render.copy_boxes(sna, GXcopy,
-+						   draw, get_private(back)->bo, 0, 0,
-+						   draw, bo, 0, 0,
-+						   &box, 1, COPY_LAST | COPY_DRI))
-+				flags = back->flags;
-+		}
- 	}
- 	assert(bo->active_scanout == 0);
- 
--	if (info && reuse) {
--		bool found = false;
--		struct dri_bo *c;
--
--		list_for_each_entry_reverse(c, &info->cache, link) {
--			if (c->bo == NULL) {
--				found = true;
--				_list_del(&c->link);
--				break;
--			}
--		}
--		if (!found)
-+	if (reuse && get_private(back)->bo->refcnt == 1 + get_private(back)->bo->active_scanout) {
-+		if (&c->link == &priv->cache)
- 			c = malloc(sizeof(*c));
- 		if (c != NULL) {
- 			c->bo = ref(get_private(back)->bo);
- 			c->name = back->name;
--			list_add(&c->link, &info->cache);
--			DBG(("%s: cacheing handle=%d (name=%d)\n", __FUNCTION__, c->bo->handle, c->name));
-+			c->flags = back->flags;
-+			list_add(&c->link, &priv->cache);
-+			DBG(("%s: caching handle=%d (name=%d, flags=%d, active_scanout=%d)\n", __FUNCTION__, c->bo->handle, c->name, c->flags, c->bo->active_scanout));
- 		}
-+	} else {
-+		if (&c->link != &priv->cache)
-+			free(c);
- 	}
- 
-+	assert(bo->active_scanout == 0);
- 	assert(bo != get_private(back)->bo);
- 	kgem_bo_destroy(&sna->kgem, get_private(back)->bo);
- 
-@@ -210,21 +360,13 @@ sna_dri2_get_back(struct sna *sna,
- 	get_private(back)->size = draw->height << 16 | draw->width;
- 	back->pitch = bo->pitch;
- 	back->name = name;
-+	back->flags = flags;
- 
--	get_private(back)->stale = false;
--}
--
--struct dri2_window {
--	DRI2BufferPtr front;
--	struct sna_dri2_event *chain;
--	xf86CrtcPtr crtc;
--	int64_t msc_delta;
--};
-+	assert(back->pitch);
-+	assert(back->name);
- 
--static struct dri2_window *dri2_window(WindowPtr win)
--{
--	assert(win->drawable.type != DRAWABLE_PIXMAP);
--	return ((void **)__get_private(win, sna_window_key))[1];
-+out:
-+	get_private(back)->stale = false;
- }
- 
- static struct sna_dri2_event *
-@@ -232,21 +374,25 @@ dri2_chain(DrawablePtr d)
- {
- 	struct dri2_window *priv = dri2_window((WindowPtr)d);
- 	assert(priv != NULL);
-+	assert(priv->chain == NULL || priv->chain->chained);
- 	return priv->chain;
- }
- inline static DRI2BufferPtr dri2_window_get_front(WindowPtr win)
- {
- 	struct dri2_window *priv = dri2_window(win);
-+	assert(priv->front == NULL || get_private(priv->front)->bo->active_scanout);
- 	return priv ? priv->front : NULL;
- }
- #else
- inline static void *dri2_window_get_front(WindowPtr win) { return NULL; }
-+#define APPLY_DAMAGE 1
- #endif
- 
- #if DRI2INFOREC_VERSION < 6
- 
- #define xorg_can_triple_buffer() 0
- #define swap_limit(d, l) false
-+#define mark_stale(b)
- 
- #else
- 
-@@ -273,6 +419,8 @@ mark_stale(DRI2BufferPtr back)
- 	 * stale frame. (This is mostly useful for tracking down
- 	 * driver bugs!)
- 	 */
-+	DBG(("%s(handle=%d) => %d\n", __FUNCTION__,
-+	     get_private(back)->bo->handle, xorg_can_triple_buffer()));
- 	get_private(back)->stale = xorg_can_triple_buffer();
- }
- 
-@@ -286,21 +434,29 @@ sna_dri2_swap_limit_validate(DrawablePtr draw, int swap_limit)
- static void
- sna_dri2_reuse_buffer(DrawablePtr draw, DRI2BufferPtr buffer)
- {
-+	struct sna *sna = to_sna_from_drawable(draw);
-+
- 	DBG(("%s: reusing buffer pixmap=%ld, attachment=%d, handle=%d, name=%d\n",
- 	     __FUNCTION__, get_drawable_pixmap(draw)->drawable.serialNumber,
- 	     buffer->attachment, get_private(buffer)->bo->handle, buffer->name));
- 	assert(get_private(buffer)->refcnt);
--	assert(get_private(buffer)->bo->refcnt > get_private(buffer)->bo->active_scanout);
-+	assert(get_private(buffer)->bo->refcnt >= get_private(buffer)->bo->active_scanout);
-+	assert(kgem_bo_flink(&sna->kgem, get_private(buffer)->bo) == buffer->name);
- 
- 	if (buffer->attachment == DRI2BufferBackLeft &&
- 	    draw->type != DRAWABLE_PIXMAP) {
--		DBG(("%s: replacing back buffer\n", __FUNCTION__));
--		sna_dri2_get_back(to_sna_from_drawable(draw), draw, buffer, dri2_chain(draw));
-+		DBG(("%s: replacing back buffer on window %ld\n", __FUNCTION__, draw->id));
-+		sna_dri2_get_back(sna, draw, buffer);
- 
--		assert(kgem_bo_flink(&to_sna_from_drawable(draw)->kgem, get_private(buffer)->bo) == buffer->name);
- 		assert(get_private(buffer)->bo->refcnt);
- 		assert(get_private(buffer)->bo->active_scanout == 0);
-+		assert(kgem_bo_flink(&sna->kgem, get_private(buffer)->bo) == buffer->name);
-+		DBG(("%s: reusing back buffer handle=%d, name=%d, pitch=%d, age=%d\n",
-+		     __FUNCTION__, get_private(buffer)->bo->handle,
-+		     buffer->name, buffer->pitch, buffer->flags));
- 	}
-+
-+	kgem_bo_submit(&sna->kgem, get_private(buffer)->bo);
- }
- 
- static bool swap_limit(DrawablePtr draw, int limit)
-@@ -314,11 +470,6 @@ static bool swap_limit(DrawablePtr draw, int limit)
- }
- #endif
- 
--#if DRI2INFOREC_VERSION < 10
--#undef USE_ASYNC_SWAP
--#define USE_ASYNC_SWAP 0
--#endif
--
- #define COLOR_PREFER_TILING_Y 0
- 
- /* Prefer to enable TILING_Y if this buffer will never be a
-@@ -328,6 +479,9 @@ static uint32_t color_tiling(struct sna *sna, DrawablePtr draw)
- {
- 	uint32_t tiling;
- 
-+	if (!sna->kgem.can_fence)
-+		return I915_TILING_NONE;
-+
- 	if (COLOR_PREFER_TILING_Y &&
- 	    (draw->width  != sna->front->drawable.width ||
- 	     draw->height != sna->front->drawable.height))
-@@ -355,7 +509,6 @@ static struct kgem_bo *sna_pixmap_set_dri(struct sna *sna,
- 					  PixmapPtr pixmap)
- {
- 	struct sna_pixmap *priv;
--	int tiling;
- 
- 	DBG(("%s: attaching DRI client to pixmap=%ld\n",
- 	     __FUNCTION__, pixmap->drawable.serialNumber));
-@@ -373,31 +526,29 @@ static struct kgem_bo *sna_pixmap_set_dri(struct sna *sna,
- 		return NULL;
- 	}
- 
--	assert(priv->flush == false);
-+	assert(priv->flush == false || priv->pinned & PIN_DRI3);
-+	assert(priv->gpu_bo->flush == false || priv->pinned & PIN_DRI3);
- 	assert(priv->cpu_damage == NULL);
- 	assert(priv->gpu_bo);
- 	assert(priv->gpu_bo->proxy == NULL);
--	assert(priv->gpu_bo->flush == false);
--
--	tiling = color_tiling(sna, &pixmap->drawable);
--	if (tiling < 0)
--		tiling = -tiling;
--	if (priv->gpu_bo->tiling != tiling)
--		sna_pixmap_change_tiling(pixmap, tiling);
- 
--	return priv->gpu_bo;
--}
-+	if (!kgem_bo_is_fenced(&sna->kgem, priv->gpu_bo)) {
-+		if (priv->gpu_bo->tiling &&
-+		    !sna_pixmap_change_tiling(pixmap, I915_TILING_NONE)) {
-+			DBG(("%s: failed to discard tiling (%d) for DRI2 protocol\n", __FUNCTION__, priv->gpu_bo->tiling));
-+			return NULL;
-+		}
-+	} else {
-+		int tiling = color_tiling(sna, &pixmap->drawable);
-+		if (tiling < 0)
-+			tiling = -tiling;
-+		if (priv->gpu_bo->tiling < tiling && !priv->gpu_bo->scanout)
-+			sna_pixmap_change_tiling(pixmap, tiling);
-+	}
- 
--pure static inline void *sna_pixmap_get_buffer(PixmapPtr pixmap)
--{
--	assert(pixmap->refcnt);
--	return ((void **)__get_private(pixmap, sna_pixmap_key))[2];
--}
-+	priv->gpu_bo->active_scanout++;
- 
--static inline void sna_pixmap_set_buffer(PixmapPtr pixmap, void *ptr)
--{
--	assert(pixmap->refcnt);
--	((void **)__get_private(pixmap, sna_pixmap_key))[2] = ptr;
-+	return priv->gpu_bo;
- }
- 
- void
-@@ -422,13 +573,18 @@ sna_dri2_pixmap_update_bo(struct sna *sna, PixmapPtr pixmap, struct kgem_bo *bo)
- 	if (private->bo == bo)
- 		return;
- 
-+	assert(private->bo->active_scanout > 0);
-+	private->bo->active_scanout--;
-+
- 	DBG(("%s: dropping flush hint from handle=%d\n", __FUNCTION__, private->bo->handle));
- 	private->bo->flush = false;
- 	kgem_bo_destroy(&sna->kgem, private->bo);
- 
-+
- 	buffer->name = kgem_bo_flink(&sna->kgem, bo);
- 	buffer->pitch = bo->pitch;
- 	private->bo = ref(bo);
-+	bo->active_scanout++;
- 
- 	DBG(("%s: adding flush hint to handle=%d\n", __FUNCTION__, bo->handle));
- 	bo->flush = true;
-@@ -449,9 +605,9 @@ sna_dri2_create_buffer(DrawablePtr draw,
- 	struct sna_dri2_private *private;
- 	PixmapPtr pixmap;
- 	struct kgem_bo *bo;
--	unsigned flags = 0;
-+	unsigned bpp = format ?: draw->bitsPerPixel;
-+	unsigned flags = CREATE_EXACT;
- 	uint32_t size;
--	int bpp;
- 
- 	DBG(("%s pixmap=%ld, (attachment=%d, format=%d, drawable=%dx%d), window?=%d\n",
- 	     __FUNCTION__,
-@@ -468,11 +624,11 @@ sna_dri2_create_buffer(DrawablePtr draw,
- 		if (draw->type != DRAWABLE_PIXMAP)
- 			buffer = dri2_window_get_front((WindowPtr)draw);
- 		if (buffer == NULL)
--			buffer = sna_pixmap_get_buffer(pixmap);
-+			buffer = (DRI2Buffer2Ptr)sna_pixmap_get_buffer(pixmap);
- 		if (buffer) {
- 			private = get_private(buffer);
- 
--			DBG(("%s: reusing front buffer attachment, win=%lu %dx%d, pixmap=%ld [%ld] %dx%d, handle=%d, name=%d\n",
-+			DBG(("%s: reusing front buffer attachment, win=%lu %dx%d, pixmap=%ld [%ld] %dx%d, handle=%d, name=%d, active_scanout=%d\n",
- 			     __FUNCTION__,
- 			     draw->type != DRAWABLE_PIXMAP ? (long)draw->id : (long)0,
- 			     draw->width, draw->height,
-@@ -480,12 +636,22 @@ sna_dri2_create_buffer(DrawablePtr draw,
- 			     private->pixmap->drawable.serialNumber,
- 			     pixmap->drawable.width,
- 			     pixmap->drawable.height,
--			     private->bo->handle, buffer->name));
-+			     private->bo->handle, buffer->name,
-+			     private->bo->active_scanout));
- 
-+			assert(buffer->attachment == DRI2BufferFrontLeft);
- 			assert(private->pixmap == pixmap);
- 			assert(sna_pixmap(pixmap)->flush);
- 			assert(sna_pixmap(pixmap)->pinned & PIN_DRI2);
- 			assert(kgem_bo_flink(&sna->kgem, private->bo) == buffer->name);
-+			assert(private->bo->pitch == buffer->pitch);
-+			assert(private->bo->active_scanout);
-+
-+			sna_pixmap_move_to_gpu(pixmap,
-+					       MOVE_READ |
-+					       __MOVE_FORCE |
-+					       __MOVE_DRI);
-+			kgem_bo_submit(&sna->kgem, private->bo);
- 
- 			private->refcnt++;
- 			return buffer;
-@@ -498,7 +664,6 @@ sna_dri2_create_buffer(DrawablePtr draw,
- 		assert(sna_pixmap(pixmap) != NULL);
- 
- 		bo = ref(bo);
--		bpp = pixmap->drawable.bitsPerPixel;
- 		if (pixmap == sna->front && !(sna->flags & SNA_LINEAR_FB))
- 			flags |= CREATE_SCANOUT;
- 		DBG(("%s: attaching to front buffer %dx%d [%p:%d], scanout? %d\n",
-@@ -506,6 +671,7 @@ sna_dri2_create_buffer(DrawablePtr draw,
- 		     pixmap->drawable.width, pixmap->drawable.height,
- 		     pixmap, pixmap->refcnt, flags & CREATE_SCANOUT));
- 		size = (uint32_t)pixmap->drawable.height << 16 | pixmap->drawable.width;
-+		bpp = pixmap->drawable.bitsPerPixel;
- 		break;
- 
- 	case DRI2BufferBackLeft:
-@@ -514,6 +680,7 @@ sna_dri2_create_buffer(DrawablePtr draw,
- 				flags |= CREATE_SCANOUT;
- 			if (draw->width  == sna->front->drawable.width &&
- 			    draw->height == sna->front->drawable.height &&
-+			    draw->bitsPerPixel == bpp &&
- 			    (sna->flags & (SNA_LINEAR_FB | SNA_NO_WAIT | SNA_NO_FLIP)) == 0)
- 				flags |= CREATE_SCANOUT;
- 		}
-@@ -521,7 +688,6 @@ sna_dri2_create_buffer(DrawablePtr draw,
- 	case DRI2BufferFrontRight:
- 	case DRI2BufferFakeFrontLeft:
- 	case DRI2BufferFakeFrontRight:
--		bpp = draw->bitsPerPixel;
- 		DBG(("%s: creating back buffer %dx%d, suitable for scanout? %d\n",
- 		     __FUNCTION__,
- 		     draw->width, draw->height,
-@@ -530,7 +696,7 @@ sna_dri2_create_buffer(DrawablePtr draw,
- 		bo = kgem_create_2d(&sna->kgem,
- 				    draw->width,
- 				    draw->height,
--				    draw->bitsPerPixel,
-+				    bpp,
- 				    color_tiling(sna, draw),
- 				    flags);
- 		break;
-@@ -558,7 +724,6 @@ sna_dri2_create_buffer(DrawablePtr draw,
- 		 * not understand W tiling and the GTT is incapable of
- 		 * W fencing.
- 		 */
--		bpp = format ? format : draw->bitsPerPixel;
- 		bpp *= 2;
- 		bo = kgem_create_2d(&sna->kgem,
- 				    ALIGN(draw->width, 64),
-@@ -570,7 +735,6 @@ sna_dri2_create_buffer(DrawablePtr draw,
- 	case DRI2BufferDepthStencil:
- 	case DRI2BufferHiz:
- 	case DRI2BufferAccum:
--		bpp = format ? format : draw->bitsPerPixel,
- 		bo = kgem_create_2d(&sna->kgem,
- 				    draw->width, draw->height, bpp,
- 				    other_tiling(sna, draw),
-@@ -614,7 +778,7 @@ sna_dri2_create_buffer(DrawablePtr draw,
- 		pixmap->refcnt++;
- 
- 		priv = sna_pixmap(pixmap);
--		assert(priv->flush == false);
-+		assert(priv->flush == false || priv->pinned & PIN_DRI3);
- 		assert((priv->pinned & PIN_DRI2) == 0);
- 
- 		/* Don't allow this named buffer to be replaced */
-@@ -630,17 +794,17 @@ sna_dri2_create_buffer(DrawablePtr draw,
- 		if (priv->gpu_bo->exec)
- 			sna->kgem.flush = 1;
- 
--		priv->flush |= 1;
-+		priv->flush |= FLUSH_READ;
- 		if (draw->type == DRAWABLE_PIXMAP) {
- 			/* DRI2 renders directly into GLXPixmaps, treat as hostile */
- 			kgem_bo_unclean(&sna->kgem, priv->gpu_bo);
- 			sna_damage_all(&priv->gpu_damage, pixmap);
- 			priv->clear = false;
- 			priv->cpu = false;
--			priv->flush |= 2;
-+			priv->flush |= FLUSH_WRITE;
- 		}
- 
--		sna_accel_watch_flush(sna, 1);
-+		sna_watch_flush(sna, 1);
- 	}
- 
- 	return buffer;
-@@ -651,16 +815,80 @@ err:
- 	return NULL;
- }
- 
--static void _sna_dri2_destroy_buffer(struct sna *sna, DRI2Buffer2Ptr buffer)
-+static void
-+sna_dri2_cache_bo(struct sna *sna,
-+		  DrawablePtr draw,
-+		  struct kgem_bo *bo,
-+		  uint32_t name,
-+		  uint32_t size,
-+		  uint32_t flags)
-+{
-+	struct dri_bo *c;
-+
-+	DBG(("%s(handle=%d, name=%d)\n", __FUNCTION__, bo->handle, name));
-+
-+	if (draw == NULL) {
-+		DBG(("%s: no draw, releasing handle=%d\n",
-+		     __FUNCTION__, bo->handle));
-+		goto err;
-+	}
-+
-+	if (draw->type == DRAWABLE_PIXMAP) {
-+		DBG(("%s: not a window, releasing handle=%d\n",
-+		     __FUNCTION__, bo->handle));
-+		goto err;
-+	}
-+
-+	if (bo->refcnt > 1 + bo->active_scanout) {
-+		DBG(("%s: multiple references [%d], releasing handle\n",
-+		     __FUNCTION__, bo->refcnt, bo->handle));
-+		goto err;
-+	}
-+
-+	if ((draw->height << 16 | draw->width) != size) {
-+		DBG(("%s: wrong size [%dx%d], releasing handle\n",
-+		     __FUNCTION__,
-+		     size & 0xffff, size >> 16,
-+		     bo->handle));
-+		goto err;
-+	}
-+
-+	if (bo->scanout && front_pitch(draw) != bo->pitch) {
-+		DBG(("%s: scanout with pitch change [%d != %d], releasing handle\n",
-+		     __FUNCTION__, bo->pitch, front_pitch(draw), bo->handle));
-+		goto err;
-+	}
-+
-+	c = malloc(sizeof(*c));
-+	if (!c)
-+		goto err;
-+
-+	DBG(("%s: caching handle=%d (name=%d, flags=%d, active_scanout=%d)\n", __FUNCTION__, bo->handle, name, flags, bo->active_scanout));
-+
-+	c->bo = bo;
-+	c->name = name;
-+	c->flags = flags;
-+	list_add(&c->link, &dri2_window((WindowPtr)draw)->cache);
-+	return;
-+
-+err:
-+	kgem_bo_destroy(&sna->kgem, bo);
-+}
-+
-+static void _sna_dri2_destroy_buffer(struct sna *sna,
-+				     DrawablePtr draw,
-+				     DRI2Buffer2Ptr buffer)
- {
- 	struct sna_dri2_private *private = get_private(buffer);
- 
- 	if (buffer == NULL)
- 		return;
- 
--	DBG(("%s: %p [handle=%d] -- refcnt=%d, pixmap=%ld\n",
-+	DBG(("%s: %p [handle=%d] -- refcnt=%d, draw=%ld, pixmap=%ld, proxy?=%d\n",
- 	     __FUNCTION__, buffer, private->bo->handle, private->refcnt,
--	     private->pixmap ? private->pixmap->drawable.serialNumber : 0));
-+	     draw ? draw->id : 0,
-+	     private->pixmap ? private->pixmap->drawable.serialNumber : 0,
-+	     private->proxy != NULL));
- 	assert(private->refcnt > 0);
- 	if (--private->refcnt)
- 		return;
-@@ -669,7 +897,10 @@ static void _sna_dri2_destroy_buffer(struct sna *sna, DRI2Buffer2Ptr buffer)
- 
- 	if (private->proxy) {
- 		DBG(("%s: destroying proxy\n", __FUNCTION__));
--		_sna_dri2_destroy_buffer(sna, private->proxy);
-+		assert(private->bo->active_scanout > 0);
-+		private->bo->active_scanout--;
-+
-+		_sna_dri2_destroy_buffer(sna, draw, private->proxy);
- 		private->pixmap = NULL;
- 	}
- 
-@@ -683,6 +914,11 @@ static void _sna_dri2_destroy_buffer(struct sna *sna, DRI2Buffer2Ptr buffer)
- 		assert(priv->pinned & PIN_DRI2);
- 		assert(priv->flush);
- 
-+		DBG(("%s: removing active_scanout=%d from pixmap handle=%d\n",
-+		     __FUNCTION__, priv->gpu_bo->active_scanout, priv->gpu_bo->handle));
-+		assert(priv->gpu_bo->active_scanout > 0);
-+		priv->gpu_bo->active_scanout--;
-+
- 		/* Undo the DRI markings on this pixmap */
- 		DBG(("%s: releasing last DRI pixmap=%ld, scanout?=%d\n",
- 		     __FUNCTION__,
-@@ -692,28 +928,34 @@ static void _sna_dri2_destroy_buffer(struct sna *sna, DRI2Buffer2Ptr buffer)
- 		list_del(&priv->flush_list);
- 
- 		DBG(("%s: dropping flush hint from handle=%d\n", __FUNCTION__, private->bo->handle));
--		priv->gpu_bo->flush = false;
- 		priv->pinned &= ~PIN_DRI2;
- 
--		priv->flush = false;
--		sna_accel_watch_flush(sna, -1);
-+		if ((priv->pinned & PIN_DRI3) == 0) {
-+			priv->gpu_bo->flush = false;
-+			priv->flush = false;
-+		}
-+		sna_watch_flush(sna, -1);
- 
- 		sna_pixmap_set_buffer(pixmap, NULL);
- 		pixmap->drawable.pScreen->DestroyPixmap(pixmap);
- 	}
--	assert(private->bo->flush == false);
- 
--	kgem_bo_destroy(&sna->kgem, private->bo);
-+	sna_dri2_cache_bo(sna, draw,
-+			  private->bo,
-+			  buffer->name,
-+			  private->size,
-+			  buffer->flags);
- 	free(buffer);
- }
- 
- static void sna_dri2_destroy_buffer(DrawablePtr draw, DRI2Buffer2Ptr buffer)
- {
--	_sna_dri2_destroy_buffer(to_sna_from_drawable(draw), buffer);
-+	_sna_dri2_destroy_buffer(to_sna_from_drawable(draw), draw, buffer);
- }
- 
- static DRI2BufferPtr sna_dri2_reference_buffer(DRI2BufferPtr buffer)
- {
-+	assert(get_private(buffer)->refcnt > 0);
- 	get_private(buffer)->refcnt++;
- 	return buffer;
- }
-@@ -746,10 +988,9 @@ static void set_bo(PixmapPtr pixmap, struct kgem_bo *bo)
- {
- 	struct sna *sna = to_sna_from_pixmap(pixmap);
- 	struct sna_pixmap *priv = sna_pixmap(pixmap);
--	RegionRec region;
- 
--	DBG(("%s: pixmap=%ld, handle=%d\n",
--	     __FUNCTION__, pixmap->drawable.serialNumber, bo->handle));
-+	DBG(("%s: pixmap=%ld, handle=%d (old handle=%d)\n",
-+	     __FUNCTION__, pixmap->drawable.serialNumber, bo->handle, priv->gpu_bo->handle));
- 
- 	assert(pixmap->drawable.width * pixmap->drawable.bitsPerPixel <= 8*bo->pitch);
- 	assert(pixmap->drawable.height * bo->pitch <= kgem_bo_size(bo));
-@@ -758,21 +999,34 @@ static void set_bo(PixmapPtr pixmap, struct kgem_bo *bo)
- 	assert((priv->pinned & (PIN_PRIME | PIN_DRI3)) == 0);
- 	assert(priv->flush);
- 
--	/* Post damage on the new front buffer so that listeners, such
--	 * as DisplayLink know take a copy and shove it over the USB,
--	 * also for software cursors and the like.
--	 */
--	region.extents.x1 = region.extents.y1 = 0;
--	region.extents.x2 = pixmap->drawable.width;
--	region.extents.y2 = pixmap->drawable.height;
--	region.data = NULL;
--	DamageRegionAppend(&pixmap->drawable, &region);
-+	if (APPLY_DAMAGE) {
-+		RegionRec region;
-+
-+		/* Post damage on the new front buffer so that listeners, such
-+		 * as DisplayLink know take a copy and shove it over the USB,
-+		 * also for software cursors and the like.
-+		 */
-+		region.extents.x1 = region.extents.y1 = 0;
-+		region.extents.x2 = pixmap->drawable.width;
-+		region.extents.y2 = pixmap->drawable.height;
-+		region.data = NULL;
-+
-+		/*
-+		 * Eeek, beware the sw cursor copying to the old bo
-+		 * causing recursion and mayhem.
-+		 */
-+		DBG(("%s: marking whole pixmap as damaged\n", __FUNCTION__));
-+		sna->ignore_copy_area = sna->flags & SNA_TEAR_FREE;
-+		DamageRegionAppend(&pixmap->drawable, &region);
-+	}
- 
- 	damage(pixmap, priv, NULL);
- 
- 	assert(bo->refcnt);
--	if (priv->move_to_gpu)
-+	if (priv->move_to_gpu) {
-+		DBG(("%s: applying final/discard move-to-gpu\n", __FUNCTION__));
- 		priv->move_to_gpu(sna, priv, 0);
-+	}
- 	if (priv->gpu_bo != bo) {
- 		DBG(("%s: dropping flush hint from handle=%d\n", __FUNCTION__, priv->gpu_bo->handle));
- 		priv->gpu_bo->flush = false;
-@@ -792,8 +1046,27 @@ static void set_bo(PixmapPtr pixmap, struct kgem_bo *bo)
- 		bo->domain = DOMAIN_NONE;
- 	assert(bo->flush);
- 
--	DamageRegionProcessPending(&pixmap->drawable);
-+	if (APPLY_DAMAGE) {
-+		sna->ignore_copy_area = false;
-+		DamageRegionProcessPending(&pixmap->drawable);
-+	}
-+}
-+
-+#if defined(__GNUC__)
-+#define popcount(x) __builtin_popcount(x)
-+#else
-+static int popcount(unsigned int x)
-+{
-+	int count = 0;
-+
-+	while (x) {
-+		count += x&1;
-+		x >>= 1;
-+	}
-+
-+	return count;
- }
-+#endif
- 
- static void sna_dri2_select_mode(struct sna *sna, struct kgem_bo *dst, struct kgem_bo *src, bool sync)
- {
-@@ -823,6 +1096,12 @@ static void sna_dri2_select_mode(struct sna *sna, struct kgem_bo *dst, struct kg
- 		return;
- 	}
- 
-+	if (sna->render_state.gt < 2 && sna->kgem.has_semaphores) {
-+		DBG(("%s: small GT [%d], not forcing selection\n",
-+		     __FUNCTION__, sna->render_state.gt));
-+		return;
-+	}
-+
- 	VG_CLEAR(busy);
- 	busy.handle = src->handle;
- 	if (drmIoctl(sna->kgem.fd, DRM_IOCTL_I915_GEM_BUSY, &busy))
-@@ -860,9 +1139,11 @@ static void sna_dri2_select_mode(struct sna *sna, struct kgem_bo *dst, struct kg
- 	 * the cost of the query.
- 	 */
- 	mode = KGEM_RENDER;
--	if (busy.busy & (0xfffe << 16))
-+	if ((busy.busy & 0xffff) == I915_EXEC_BLT)
- 		mode = KGEM_BLT;
--	kgem_bo_mark_busy(&sna->kgem, busy.handle == src->handle ? src : dst, mode);
-+	kgem_bo_mark_busy(&sna->kgem,
-+			  busy.handle == src->handle ? src : dst,
-+			  mode);
- 	_kgem_set_mode(&sna->kgem, mode);
- }
- 
-@@ -871,10 +1152,13 @@ static bool is_front(int attachment)
- 	return attachment == DRI2BufferFrontLeft;
- }
- 
-+#define DRI2_SYNC 0x1
-+#define DRI2_DAMAGE 0x2
-+#define DRI2_BO 0x4
- static struct kgem_bo *
- __sna_dri2_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region,
- 		      DRI2BufferPtr src, DRI2BufferPtr dst,
--		      bool sync)
-+		      unsigned flags)
- {
- 	PixmapPtr pixmap = get_drawable_pixmap(draw);
- 	DrawableRec scratch, *src_draw = &pixmap->drawable, *dst_draw = &pixmap->drawable;
-@@ -886,7 +1170,7 @@ __sna_dri2_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region,
- 	struct kgem_bo *dst_bo;
- 	const BoxRec *boxes;
- 	int16_t dx, dy, sx, sy;
--	unsigned flags;
-+	unsigned hint;
- 	int n;
- 
- 	/* To hide a stale DRI2Buffer, one may choose to substitute
-@@ -962,8 +1246,9 @@ __sna_dri2_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region,
- 			}
- 		}
- 	} else
--		sync = false;
-+		flags &= ~DRI2_SYNC;
- 
-+	scratch.pScreen = draw->pScreen;
- 	scratch.x = scratch.y = 0;
- 	scratch.width = scratch.height = 0;
- 	scratch.depth = draw->depth;
-@@ -971,6 +1256,7 @@ __sna_dri2_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region,
- 
- 	src_bo = src_priv->bo;
- 	assert(src_bo->refcnt);
-+	kgem_bo_unclean(&sna->kgem, src_bo);
- 	if (is_front(src->attachment)) {
- 		struct sna_pixmap *priv;
- 
-@@ -987,11 +1273,12 @@ __sna_dri2_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region,
- 		scratch.height = src_priv->size >> 16;
- 		src_draw = &scratch;
- 
--		DBG(("%s: source size %dx%d, region size %dx%d\n",
-+		DBG(("%s: source size %dx%d, region size %dx%d, src offset %dx%d\n",
- 		     __FUNCTION__,
- 		     scratch.width, scratch.height,
- 		     clip.extents.x2 - clip.extents.x1,
--		     clip.extents.y2 - clip.extents.y1));
-+		     clip.extents.y2 - clip.extents.y1,
-+		     -sx, -sy));
- 
- 		source.extents.x1 = -sx;
- 		source.extents.y1 = -sy;
-@@ -1002,6 +1289,10 @@ __sna_dri2_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region,
- 		assert(region == NULL || region == &clip);
- 		pixman_region_intersect(&clip, &clip, &source);
- 
-+		if (!pixman_region_not_empty(&clip)) {
-+			DBG(("%s: region doesn't overlap pixmap\n", __FUNCTION__));
-+			return NULL;
-+		}
- 	}
- 
- 	dst_bo = dst_priv->bo;
-@@ -1013,12 +1304,12 @@ __sna_dri2_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region,
- 		/* Preserve the CRTC shadow overrides */
- 		sna_shadow_steal_crtcs(sna, &shadow);
- 
--		flags = MOVE_WRITE | __MOVE_FORCE;
-+		hint = MOVE_WRITE | __MOVE_FORCE;
- 		if (clip.data)
--			flags |= MOVE_READ;
-+			hint |= MOVE_READ;
- 
- 		assert(region == NULL || region == &clip);
--		priv = sna_pixmap_move_area_to_gpu(pixmap, &clip.extents, flags);
-+		priv = sna_pixmap_move_area_to_gpu(pixmap, &clip.extents, hint);
- 		if (priv) {
- 			damage(pixmap, priv, region);
- 			dst_bo = priv->gpu_bo;
-@@ -1050,20 +1341,20 @@ __sna_dri2_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region,
- 		assert(region == NULL || region == &clip);
- 		pixman_region_intersect(&clip, &clip, &target);
- 
--		sync = false;
-+		flags &= ~DRI2_SYNC;
- 	}
- 
- 	if (!wedged(sna)) {
- 		xf86CrtcPtr crtc;
- 
- 		crtc = NULL;
--		if (sync && sna_pixmap_is_scanout(sna, pixmap))
-+		if (flags & DRI2_SYNC && sna_pixmap_is_scanout(sna, pixmap))
- 			crtc = sna_covering_crtc(sna, &clip.extents, NULL);
- 		sna_dri2_select_mode(sna, dst_bo, src_bo, crtc != NULL);
- 
--		sync = (crtc != NULL&&
--			sna_wait_for_scanline(sna, pixmap, crtc,
--					      &clip.extents));
-+		if (crtc == NULL ||
-+		    !sna_wait_for_scanline(sna, pixmap, crtc, &clip.extents))
-+			flags &= ~DRI2_SYNC;
- 	}
- 
- 	if (region) {
-@@ -1075,8 +1366,11 @@ __sna_dri2_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region,
- 		boxes = &clip.extents;
- 		n = 1;
- 	}
--	DamageRegionAppend(&pixmap->drawable, region);
--
-+	if (APPLY_DAMAGE || flags & DRI2_DAMAGE) {
-+		DBG(("%s: marking region as damaged\n", __FUNCTION__));
-+		sna->ignore_copy_area = sna->flags & SNA_TEAR_FREE;
-+		DamageRegionAppend(&pixmap->drawable, region);
-+	}
- 
- 	DBG(("%s: copying [(%d, %d), (%d, %d)]x%d src=(%d, %d), dst=(%d, %d)\n",
- 	     __FUNCTION__,
-@@ -1084,29 +1378,36 @@ __sna_dri2_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region,
- 	     boxes[0].x2, boxes[0].y2,
- 	     n, sx, sy, dx, dy));
- 
--	flags = COPY_LAST;
--	if (sync)
--		flags |= COPY_SYNC;
-+	hint = COPY_LAST | COPY_DRI;
-+	if (flags & DRI2_SYNC)
-+		hint |= COPY_SYNC;
- 	if (!sna->render.copy_boxes(sna, GXcopy,
- 				    src_draw, src_bo, sx, sy,
- 				    dst_draw, dst_bo, dx, dy,
--				    boxes, n, flags))
-+				    boxes, n, hint))
- 		memcpy_copy_boxes(sna, GXcopy,
- 				  src_draw, src_bo, sx, sy,
- 				  dst_draw, dst_bo, dx, dy,
--				  boxes, n, flags);
--
--	DBG(("%s: flushing? %d\n", __FUNCTION__, sync));
--	if (sync) { /* STAT! */
--		struct kgem_request *rq = sna->kgem.next_request;
--		kgem_submit(&sna->kgem);
--		if (rq->bo) {
--			bo = ref(rq->bo);
--			DBG(("%s: recording sync fence handle=%d\n", __FUNCTION__, bo->handle));
-+				  boxes, n, hint);
-+
-+	sna->needs_dri_flush = true;
-+	if (flags & (DRI2_SYNC | DRI2_BO)) { /* STAT! */
-+		struct kgem_request *rq = RQ(dst_bo->rq);
-+		if (rq && rq != (void *)&sna->kgem) {
-+			if (rq->bo == NULL)
-+				kgem_submit(&sna->kgem);
-+			if (rq->bo) { /* Becareful in case the gpu is wedged */
-+				bo = ref(rq->bo);
-+				DBG(("%s: recording sync fence handle=%d\n",
-+				     __FUNCTION__, bo->handle));
-+			}
- 		}
- 	}
- 
--	DamageRegionProcessPending(&pixmap->drawable);
-+	if (APPLY_DAMAGE || flags & DRI2_DAMAGE) {
-+		sna->ignore_copy_area = false;
-+		DamageRegionProcessPending(&pixmap->drawable);
-+	}
- 
- 	if (clip.data)
- 		pixman_region_fini(&clip);
-@@ -1142,6 +1443,8 @@ sna_dri2_copy_region(DrawablePtr draw,
- 	assert(get_private(src)->refcnt);
- 	assert(get_private(dst)->refcnt);
- 
-+	assert(get_private(src)->bo != get_private(dst)->bo);
-+
- 	assert(get_private(src)->bo->refcnt);
- 	assert(get_private(dst)->bo->refcnt);
- 
-@@ -1151,7 +1454,7 @@ sna_dri2_copy_region(DrawablePtr draw,
- 	     region->extents.x2, region->extents.y2,
- 	     region_num_rects(region)));
- 
--	__sna_dri2_copy_region(sna, draw, region, src, dst, false);
-+	__sna_dri2_copy_region(sna, draw, region, src, dst, DRI2_DAMAGE);
- }
- 
- inline static uint32_t pipe_select(int pipe)
-@@ -1161,6 +1464,7 @@ inline static uint32_t pipe_select(int pipe)
- 	 * we can safely ignore the capability check - if we have more
- 	 * than two pipes, we can assume that they are fully supported.
- 	 */
-+	assert(pipe < _DRM_VBLANK_HIGH_CRTC_MASK);
- 	if (pipe > 1)
- 		return pipe << DRM_VBLANK_HIGH_CRTC_SHIFT;
- 	else if (pipe > 0)
-@@ -1169,15 +1473,53 @@ inline static uint32_t pipe_select(int pipe)
- 		return 0;
- }
- 
--static inline int sna_wait_vblank(struct sna *sna, union drm_wait_vblank *vbl, int pipe)
-+static inline bool sna_next_vblank(struct sna_dri2_event *info)
- {
--	DBG(("%s(pipe=%d, waiting until seq=%u%s)\n",
--	     __FUNCTION__, pipe, vbl->request.sequence,
--	     vbl->request.type & DRM_VBLANK_RELATIVE ? " [relative]" : ""));
--	assert(pipe != -1);
-+	union drm_wait_vblank vbl;
- 
--	vbl->request.type |= pipe_select(pipe);
--	return drmIoctl(sna->kgem.fd, DRM_IOCTL_WAIT_VBLANK, vbl);
-+	DBG(("%s(pipe=%d, waiting until next vblank)\n",
-+	     __FUNCTION__, info->pipe));
-+	assert(info->pipe != -1);
-+
-+	VG_CLEAR(vbl);
-+	vbl.request.type =
-+		DRM_VBLANK_RELATIVE |
-+		DRM_VBLANK_EVENT |
-+		pipe_select(info->pipe);
-+	vbl.request.sequence = 1;
-+	vbl.request.signal = (uintptr_t)info;
-+
-+	assert(!info->queued);
-+	if (drmIoctl(info->sna->kgem.fd, DRM_IOCTL_WAIT_VBLANK, &vbl))
-+		return false;
-+
-+	info->queued = true;
-+	return true;
-+}
-+
-+static inline bool sna_wait_vblank(struct sna_dri2_event *info,
-+				   unsigned seq)
-+{
-+	union drm_wait_vblank vbl;
-+
-+	DBG(("%s(pipe=%d, waiting until vblank %u)\n",
-+	     __FUNCTION__, info->pipe, seq));
-+	assert(info->pipe != -1);
-+
-+	VG_CLEAR(vbl);
-+	vbl.request.type =
-+		DRM_VBLANK_ABSOLUTE |
-+		DRM_VBLANK_EVENT |
-+		pipe_select(info->pipe);
-+	vbl.request.sequence = seq;
-+	vbl.request.signal = (uintptr_t)info;
-+
-+	assert(!info->queued);
-+	if (drmIoctl(info->sna->kgem.fd, DRM_IOCTL_WAIT_VBLANK, &vbl))
-+		return false;
-+
-+	info->queued = true;
-+	return true;
- }
- 
- #if DRI2INFOREC_VERSION >= 4
-@@ -1195,6 +1537,7 @@ draw_current_msc(DrawablePtr draw, xf86CrtcPtr crtc, uint64_t msc)
- {
- 	struct dri2_window *priv;
- 
-+	assert(draw);
- 	if (draw->type != DRAWABLE_WINDOW)
- 		return msc;
- 
-@@ -1206,6 +1549,9 @@ draw_current_msc(DrawablePtr draw, xf86CrtcPtr crtc, uint64_t msc)
- 			priv->crtc = crtc;
- 			priv->msc_delta = 0;
- 			priv->chain = NULL;
-+			priv->scanout = -1;
-+			priv->cache_size = 0;
-+			list_init(&priv->cache);
- 			dri2_window_attach((WindowPtr)draw, priv);
- 		}
- 	} else {
-@@ -1214,8 +1560,8 @@ draw_current_msc(DrawablePtr draw, xf86CrtcPtr crtc, uint64_t msc)
- 			const struct ust_msc *this = sna_crtc_last_swap(crtc);
- 			DBG(("%s: Window transferring from pipe=%d [msc=%llu] to pipe=%d [msc=%llu], delta now %lld\n",
- 			     __FUNCTION__,
--			     sna_crtc_to_pipe(priv->crtc), (long long)last->msc,
--			     sna_crtc_to_pipe(crtc), (long long)this->msc,
-+			     sna_crtc_pipe(priv->crtc), (long long)last->msc,
-+			     sna_crtc_pipe(crtc), (long long)this->msc,
- 			     (long long)(priv->msc_delta + this->msc - last->msc)));
- 			priv->msc_delta += this->msc - last->msc;
- 			priv->crtc = crtc;
-@@ -1248,57 +1594,119 @@ sna_dri2_get_crtc(DrawablePtr draw)
- 				 NULL);
- }
- 
--static void
--sna_dri2_remove_event(WindowPtr win, struct sna_dri2_event *info)
-+static void frame_swap_complete(struct sna_dri2_event *frame, int type)
- {
--	struct dri2_window *priv;
--	struct sna_dri2_event *chain;
--
--	assert(win->drawable.type == DRAWABLE_WINDOW);
--	DBG(("%s: remove[%p] from window %ld, active? %d\n",
--	     __FUNCTION__, info, (long)win->drawable.id, info->draw != NULL));
-+	const struct ust_msc *swap;
- 
--	priv = dri2_window(win);
--	assert(priv);
--	assert(priv->chain != NULL);
-+	assert(frame->signal);
-+	frame->signal = false;
- 
--	if (priv->chain == info) {
--		priv->chain = info->chain;
-+	if (frame->client == NULL) {
-+		DBG(("%s: client already gone\n", __FUNCTION__));
- 		return;
- 	}
- 
--	chain = priv->chain;
--	while (chain->chain != info)
--		chain = chain->chain;
--	assert(chain != info);
--	assert(info->chain != chain);
--	chain->chain = info->chain;
-+	assert(frame->draw);
-+
-+	swap = sna_crtc_last_swap(frame->crtc);
-+	DBG(("%s(type=%d): draw=%ld, pipe=%d, frame=%lld [msc=%lld], tv=%d.%06d\n",
-+	     __FUNCTION__, type, (long)frame->draw->id, frame->pipe,
-+	     (long long)swap->msc,
-+	     (long long)draw_current_msc(frame->draw, frame->crtc, swap->msc),
-+	     swap->tv_sec, swap->tv_usec));
-+
-+	DRI2SwapComplete(frame->client, frame->draw,
-+			 draw_current_msc(frame->draw, frame->crtc, swap->msc),
-+			 swap->tv_sec, swap->tv_usec,
-+			 type, frame->event_complete, frame->event_data);
- }
- 
--static void
--sna_dri2_event_free(struct sna_dri2_event *info)
-+static void fake_swap_complete(struct sna *sna, ClientPtr client,
-+			       DrawablePtr draw, xf86CrtcPtr crtc,
-+			       int type, DRI2SwapEventPtr func, void *data)
- {
--	DrawablePtr draw = info->draw;
-+	const struct ust_msc *swap;
- 
--	DBG(("%s(draw?=%d)\n", __FUNCTION__, draw != NULL));
--	if (draw && draw->type == DRAWABLE_WINDOW)
--		sna_dri2_remove_event((WindowPtr)draw, info);
-+	assert(draw);
- 
--	_sna_dri2_destroy_buffer(info->sna, info->front);
--	_sna_dri2_destroy_buffer(info->sna, info->back);
-+	if (crtc == NULL)
-+		crtc = sna_primary_crtc(sna);
- 
--	while (!list_is_empty(&info->cache)) {
--		struct dri_bo *c;
-+	swap = sna_crtc_last_swap(crtc);
-+	DBG(("%s(type=%d): draw=%ld, pipe=%d, frame=%lld [msc %lld], tv=%d.%06d\n",
-+	     __FUNCTION__, type, (long)draw->id, crtc ? sna_crtc_pipe(crtc) : -1,
-+	     (long long)swap->msc,
-+	     (long long)draw_current_msc(draw, crtc, swap->msc),
-+	     swap->tv_sec, swap->tv_usec));
- 
--		c = list_first_entry(&info->cache, struct dri_bo, link);
--		list_del(&c->link);
-+	DRI2SwapComplete(client, draw,
-+			 draw_current_msc(draw, crtc, swap->msc),
-+			 swap->tv_sec, swap->tv_usec,
-+			 type, func, data);
-+}
- 
--		DBG(("%s: releasing cached handle=%d\n", __FUNCTION__, c->bo ? c->bo->handle : 0));
--		if (c->bo)
--			kgem_bo_destroy(&info->sna->kgem, c->bo);
-+static void
-+sna_dri2_remove_event(struct sna_dri2_event *info)
-+{
-+	WindowPtr win = (WindowPtr)info->draw;
-+	struct dri2_window *priv;
- 
--		free(c);
-+	assert(win->drawable.type == DRAWABLE_WINDOW);
-+	DBG(("%s: remove[%p] from window %ld, active? %d\n",
-+	     __FUNCTION__, info, (long)win->drawable.id, info->draw != NULL));
-+	assert(!info->signal);
-+
-+	priv = dri2_window(win);
-+	assert(priv);
-+	assert(priv->chain != NULL);
-+	assert(info->chained);
-+	info->chained = false;
-+
-+	if (priv->chain != info) {
-+		struct sna_dri2_event *chain = priv->chain;
-+		while (chain->chain != info) {
-+			assert(chain->chained);
-+			chain = chain->chain;
-+		}
-+		assert(chain != info);
-+		assert(info->chain != chain);
-+		chain->chain = info->chain;
-+		return;
-+	}
-+
-+	priv->chain = info->chain;
-+	if (priv->chain == NULL) {
-+		struct dri_bo *c, *tmp;
-+
-+		c = list_entry(priv->cache.next->next, struct dri_bo, link);
-+		list_for_each_entry_safe_from(c, tmp, &priv->cache, link) {
-+			list_del(&c->link);
-+
-+			DBG(("%s: releasing cached handle=%d\n", __FUNCTION__, c->bo ? c->bo->handle : 0));
-+			assert(c->bo);
-+			kgem_bo_destroy(&info->sna->kgem, c->bo);
-+			free(c);
-+		}
- 	}
-+}
-+
-+static void
-+sna_dri2_event_free(struct sna_dri2_event *info)
-+{
-+	DBG(("%s(draw?=%d)\n", __FUNCTION__, info->draw != NULL));
-+	assert(!info->queued);
-+	assert(!info->signal);
-+	assert(info->pending.bo == NULL);
-+
-+	if (info->sna->dri2.flip_pending == info)
-+		info->sna->dri2.flip_pending = NULL;
-+	assert(info->sna->dri2.flip_pending != info);
-+	if (info->chained)
-+		sna_dri2_remove_event(info);
-+
-+	assert((info->front == NULL && info->back == NULL) || info->front != info->back);
-+	_sna_dri2_destroy_buffer(info->sna, info->draw, info->front);
-+	_sna_dri2_destroy_buffer(info->sna, info->draw, info->back);
- 
- 	if (info->bo) {
- 		DBG(("%s: releasing batch handle=%d\n", __FUNCTION__, info->bo->handle));
-@@ -1331,15 +1739,26 @@ sna_dri2_client_gone(CallbackListPtr *list, void *closure, void *data)
- 
- 		event = list_first_entry(&priv->events, struct sna_dri2_event, link);
- 		assert(event->client == client);
-+		list_del(&event->link);
-+		event->signal = false;
- 
--		if (event->queued) {
--			if (event->draw)
--				sna_dri2_remove_event((WindowPtr)event->draw,
--						      event);
--			event->client = NULL;
--			event->draw = NULL;
--			list_del(&event->link);
--		} else
-+		if (event->pending.bo) {
-+			assert(event->pending.bo->active_scanout > 0);
-+			event->pending.bo->active_scanout--;
-+
-+			kgem_bo_destroy(&sna->kgem, event->pending.bo);
-+			event->pending.bo = NULL;
-+		}
-+
-+		if (event->chained)
-+			sna_dri2_remove_event(event);
-+
-+		event->client = NULL;
-+		event->draw = NULL;
-+		event->keepalive = 1;
-+		assert(!event->signal);
-+
-+		if (!event->queued)
- 			sna_dri2_event_free(event);
- 	}
- 
-@@ -1365,11 +1784,15 @@ static bool add_event_to_client(struct sna_dri2_event *info, struct sna *sna, Cl
- }
- 
- static struct sna_dri2_event *
--sna_dri2_add_event(struct sna *sna, DrawablePtr draw, ClientPtr client)
-+sna_dri2_add_event(struct sna *sna,
-+		   DrawablePtr draw,
-+		   ClientPtr client,
-+		   xf86CrtcPtr crtc)
- {
- 	struct dri2_window *priv;
- 	struct sna_dri2_event *info, *chain;
- 
-+	assert(draw != NULL);
- 	assert(draw->type == DRAWABLE_WINDOW);
- 	DBG(("%s: adding event to window %ld)\n",
- 	     __FUNCTION__, (long)draw->id));
-@@ -1382,11 +1805,11 @@ sna_dri2_add_event(struct sna *sna, DrawablePtr draw, ClientPtr client)
- 	if (info == NULL)
- 		return NULL;
- 
--	list_init(&info->cache);
- 	info->sna = sna;
- 	info->draw = draw;
--	info->crtc = priv->crtc;
--	info->pipe = sna_crtc_to_pipe(priv->crtc);
-+	info->crtc = crtc;
-+	info->pipe = sna_crtc_pipe(crtc);
-+	info->keepalive = 1;
- 
- 	if (!add_event_to_client(info, sna, client)) {
- 		free(info);
-@@ -1394,6 +1817,7 @@ sna_dri2_add_event(struct sna *sna, DrawablePtr draw, ClientPtr client)
- 	}
- 
- 	assert(priv->chain != info);
-+	info->chained = true;
- 
- 	if (priv->chain == NULL) {
- 		priv->chain = info;
-@@ -1409,6 +1833,66 @@ sna_dri2_add_event(struct sna *sna, DrawablePtr draw, ClientPtr client)
- 	return info;
- }
- 
-+static void decouple_window(WindowPtr win,
-+			    struct dri2_window *priv,
-+			    struct sna *sna,
-+			    bool signal)
-+{
-+	if (priv->front) {
-+		DBG(("%s: decouple private front\n", __FUNCTION__));
-+		assert(priv->crtc);
-+		sna_shadow_unset_crtc(sna, priv->crtc);
-+
-+		_sna_dri2_destroy_buffer(sna, NULL, priv->front);
-+		priv->front = NULL;
-+	}
-+
-+	if (priv->chain) {
-+		struct sna_dri2_event *info, *chain;
-+
-+		DBG(("%s: freeing chain\n", __FUNCTION__));
-+
-+		chain = priv->chain;
-+		while ((info = chain)) {
-+			DBG(("%s: freeing event, pending signal? %d, pending swap? handle=%d\n",
-+			     __FUNCTION__, info->signal,
-+			     info->pending.bo ? info->pending.bo->handle : 0));
-+			assert(info->draw == &win->drawable);
-+
-+			if (info->pending.bo) {
-+				if (signal) {
-+					bool was_signalling = info->signal;
-+					info->signal = true;
-+					frame_swap_complete(info, DRI2_EXCHANGE_COMPLETE);
-+					info->signal = was_signalling;
-+				}
-+				assert(info->pending.bo->active_scanout > 0);
-+				info->pending.bo->active_scanout--;
-+
-+				kgem_bo_destroy(&sna->kgem, info->pending.bo);
-+				info->pending.bo = NULL;
-+			}
-+
-+			if (info->signal && signal)
-+				frame_swap_complete(info, DRI2_EXCHANGE_COMPLETE);
-+			info->signal = false;
-+			info->draw = NULL;
-+			info->keepalive = 1;
-+			assert(!info->signal);
-+			list_del(&info->link);
-+
-+			chain = info->chain;
-+			info->chain = NULL;
-+			info->chained = false;
-+
-+			if (!info->queued)
-+				sna_dri2_event_free(info);
-+		}
-+
-+		priv->chain = NULL;
-+	}
-+}
-+
- void sna_dri2_decouple_window(WindowPtr win)
- {
- 	struct dri2_window *priv;
-@@ -1418,50 +1902,34 @@ void sna_dri2_decouple_window(WindowPtr win)
- 		return;
- 
- 	DBG(("%s: window=%ld\n", __FUNCTION__, win->drawable.id));
-+	decouple_window(win, priv, to_sna_from_drawable(&win->drawable), true);
- 
--	if (priv->front) {
--		struct sna *sna = to_sna_from_drawable(&win->drawable);
--		assert(priv->crtc);
--		sna_shadow_unset_crtc(sna, priv->crtc);
--		_sna_dri2_destroy_buffer(sna, priv->front);
--		priv->front = NULL;
--	}
-+	priv->scanout = -1;
- }
- 
- void sna_dri2_destroy_window(WindowPtr win)
- {
- 	struct dri2_window *priv;
-+	struct sna *sna;
- 
- 	priv = dri2_window(win);
- 	if (priv == NULL)
- 		return;
- 
- 	DBG(("%s: window=%ld\n", __FUNCTION__, win->drawable.id));
-+	sna = to_sna_from_drawable(&win->drawable);
-+	decouple_window(win, priv, sna, false);
- 
--	if (priv->front) {
--		struct sna *sna = to_sna_from_drawable(&win->drawable);
--		assert(priv->crtc);
--		sna_shadow_unset_crtc(sna, priv->crtc);
--		_sna_dri2_destroy_buffer(sna, priv->front);
--	}
--
--	if (priv->chain) {
--		struct sna_dri2_event *info, *chain;
--
--		DBG(("%s: freeing chain\n", __FUNCTION__));
--
--		chain = priv->chain;
--		while ((info = chain)) {
--			info->draw = NULL;
--			info->client = NULL;
--			list_del(&info->link);
-+	while (!list_is_empty(&priv->cache)) {
-+		struct dri_bo *c;
- 
--			chain = info->chain;
--			info->chain = NULL;
-+		c = list_first_entry(&priv->cache, struct dri_bo, link);
-+		list_del(&c->link);
- 
--			if (!info->queued)
--				sna_dri2_event_free(info);
--		}
-+		DBG(("%s: releasing cached handle=%d\n", __FUNCTION__, c->bo ? c->bo->handle : 0));
-+		assert(c->bo);
-+		kgem_bo_destroy(&sna->kgem, c->bo);
-+		free(c);
- 	}
- 
- 	free(priv);
-@@ -1479,19 +1947,30 @@ sna_dri2_flip(struct sna_dri2_event *info)
- {
- 	struct kgem_bo *bo = get_private(info->back)->bo;
- 	struct kgem_bo *tmp_bo;
--	uint32_t tmp_name;
-+	uint32_t tmp_name, tmp_flags;
- 	int tmp_pitch;
- 
- 	DBG(("%s(type=%d)\n", __FUNCTION__, info->type));
- 
- 	assert(sna_pixmap_get_buffer(info->sna->front) == info->front);
- 	assert(get_drawable_pixmap(info->draw)->drawable.height * bo->pitch <= kgem_bo_size(bo));
-+	assert(get_private(info->front)->size == get_private(info->back)->size);
- 	assert(bo->refcnt);
- 
-+	if (info->sna->mode.flip_active) {
-+		DBG(("%s: %d flips still active, aborting\n",
-+		     __FUNCTION__, info->sna->mode.flip_active));
-+		return false;
-+	}
-+
-+	assert(!info->queued);
- 	if (!sna_page_flip(info->sna, bo, sna_dri2_flip_handler,
- 			   info->type == FLIP_ASYNC ? NULL : info))
- 		return false;
- 
-+	DBG(("%s: queued flip=%p\n", __FUNCTION__, info->type == FLIP_ASYNC ? NULL : info));
-+	assert(info->signal || info->type != FLIP_THROTTLE);
-+
- 	assert(info->sna->dri2.flip_pending == NULL ||
- 	       info->sna->dri2.flip_pending == info);
- 	if (info->type != FLIP_ASYNC)
-@@ -1505,13 +1984,21 @@ sna_dri2_flip(struct sna_dri2_event *info)
- 	tmp_bo = get_private(info->front)->bo;
- 	tmp_name = info->front->name;
- 	tmp_pitch = info->front->pitch;
-+	tmp_flags = info->front->flags;
-+
-+	assert(tmp_bo->active_scanout > 0);
-+	tmp_bo->active_scanout--;
- 
- 	set_bo(info->sna->front, bo);
- 
-+	info->front->flags = info->back->flags;
- 	info->front->name = info->back->name;
- 	info->front->pitch = info->back->pitch;
- 	get_private(info->front)->bo = bo;
-+	bo->active_scanout++;
-+	assert(bo->active_scanout <= bo->refcnt);
- 
-+	info->back->flags = tmp_flags;
- 	info->back->name = tmp_name;
- 	info->back->pitch = tmp_pitch;
- 	get_private(info->back)->bo = tmp_bo;
-@@ -1521,6 +2008,7 @@ sna_dri2_flip(struct sna_dri2_event *info)
- 	assert(get_private(info->back)->bo->refcnt);
- 	assert(get_private(info->front)->bo != get_private(info->back)->bo);
- 
-+	info->keepalive = KEEPALIVE;
- 	info->queued = true;
- 	return true;
- }
-@@ -1549,15 +2037,16 @@ can_flip(struct sna * sna,
- 	}
- 
- 	assert(sna->scrn->vtSema);
-+	assert(!sna->mode.hidden);
- 
- 	if ((sna->flags & (SNA_HAS_FLIP | SNA_HAS_ASYNC_FLIP)) == 0) {
- 		DBG(("%s: no, pageflips disabled\n", __FUNCTION__));
- 		return false;
- 	}
- 
--	if (front->format != back->format) {
-+	if (front->cpp != back->cpp) {
- 		DBG(("%s: no, format mismatch, front = %d, back = %d\n",
--		     __FUNCTION__, front->format, back->format));
-+		     __FUNCTION__, front->cpp, back->cpp));
- 		return false;
- 	}
- 
-@@ -1567,7 +2056,7 @@ can_flip(struct sna * sna,
- 	}
- 
- 	if (!sna_crtc_is_on(crtc)) {
--		DBG(("%s: ref-pipe=%d is disabled\n", __FUNCTION__, sna_crtc_to_pipe(crtc)));
-+		DBG(("%s: ref-pipe=%d is disabled\n", __FUNCTION__, sna_crtc_pipe(crtc)));
- 		return false;
- 	}
- 
-@@ -1581,7 +2070,7 @@ can_flip(struct sna * sna,
- 	if (sna_pixmap_get_buffer(pixmap) != front) {
- 		DBG(("%s: no, DRI2 drawable is no longer attached (old name=%d, new name=%d) to pixmap=%ld\n",
- 		     __FUNCTION__, front->name,
--		     sna_pixmap_get_buffer(pixmap) ? ((DRI2BufferPtr)sna_pixmap_get_buffer(pixmap))->name : 0,
-+		     sna_pixmap_get_buffer(pixmap) ? sna_pixmap_get_buffer(pixmap)->name : 0,
- 		     pixmap->drawable.serialNumber));
- 		return false;
- 	}
-@@ -1661,7 +2150,6 @@ can_flip(struct sna * sna,
- 	}
- 
- 	DBG(("%s: yes, pixmap=%ld\n", __FUNCTION__, pixmap->drawable.serialNumber));
--	assert(dri2_window(win)->front == NULL);
- 	return true;
- }
- 
-@@ -1680,9 +2168,9 @@ can_xchg(struct sna *sna,
- 	if (draw->type == DRAWABLE_PIXMAP)
- 		return false;
- 
--	if (front->format != back->format) {
-+	if (front->cpp != back->cpp) {
- 		DBG(("%s: no, format mismatch, front = %d, back = %d\n",
--		     __FUNCTION__, front->format, back->format));
-+		     __FUNCTION__, front->cpp, back->cpp));
- 		return false;
- 	}
- 
-@@ -1714,6 +2202,8 @@ can_xchg(struct sna *sna,
- 		return false;
- 	}
- 
-+	DBG(("%s: back size=%x, front size=%x\n",
-+	     __FUNCTION__, get_private(back)->size, get_private(front)->size));
- 	if (get_private(back)->size != get_private(front)->size) {
- 		DBG(("%s: no, back buffer %dx%d does not match front buffer %dx%d\n",
- 		     __FUNCTION__,
-@@ -1766,9 +2256,9 @@ overlaps_other_crtc(struct sna *sna, xf86CrtcPtr desired)
- static bool
- can_xchg_crtc(struct sna *sna,
- 	      DrawablePtr draw,
-+	      xf86CrtcPtr crtc,
- 	      DRI2BufferPtr front,
--	      DRI2BufferPtr back,
--	      xf86CrtcPtr crtc)
-+	      DRI2BufferPtr back)
- {
- 	WindowPtr win = (WindowPtr)draw;
- 	PixmapPtr pixmap;
-@@ -1785,9 +2275,9 @@ can_xchg_crtc(struct sna *sna,
- 	if (draw->type == DRAWABLE_PIXMAP)
- 		return false;
- 
--	if (front->format != back->format) {
-+	if (front->cpp != back->cpp) {
- 		DBG(("%s: no, format mismatch, front = %d, back = %d\n",
--		     __FUNCTION__, front->format, back->format));
-+		     __FUNCTION__, front->cpp, back->cpp));
- 		return false;
- 	}
- 
-@@ -1866,20 +2356,21 @@ sna_dri2_xchg(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr back)
- 
- 	back_bo = get_private(back)->bo;
- 	front_bo = get_private(front)->bo;
--	assert(front_bo != back_bo);
- 
--	DBG(("%s: win=%ld, exchange front=%d/%d and back=%d/%d, pixmap=%ld %dx%d\n",
-+	DBG(("%s: win=%ld, exchange front=%d/%d,ref=%d and back=%d/%d,ref=%d, pixmap=%ld %dx%d\n",
- 	     __FUNCTION__, win->drawable.id,
--	     front_bo->handle, front->name,
--	     back_bo->handle, back->name,
-+	     front_bo->handle, front->name, get_private(front)->refcnt,
-+	     back_bo->handle, back->name, get_private(back)->refcnt,
- 	     pixmap->drawable.serialNumber,
- 	     pixmap->drawable.width,
- 	     pixmap->drawable.height));
- 
--	DBG(("%s: back_bo pitch=%d, size=%d, ref=%d, active_scanout?=%d\n",
--	     __FUNCTION__, back_bo->pitch, kgem_bo_size(back_bo), back_bo->refcnt, back_bo->active_scanout));
--	DBG(("%s: front_bo pitch=%d, size=%d, ref=%d, active_scanout?=%d\n",
--	     __FUNCTION__, front_bo->pitch, kgem_bo_size(front_bo), front_bo->refcnt, front_bo->active_scanout));
-+	DBG(("%s: back_bo handle=%d, pitch=%d, size=%d, ref=%d, active_scanout?=%d\n",
-+	     __FUNCTION__, back_bo->handle, back_bo->pitch, kgem_bo_size(back_bo), back_bo->refcnt, back_bo->active_scanout));
-+	DBG(("%s: front_bo handle=%d, pitch=%d, size=%d, ref=%d, active_scanout?=%d\n",
-+	     __FUNCTION__, front_bo->handle, front_bo->pitch, kgem_bo_size(front_bo), front_bo->refcnt, front_bo->active_scanout));
-+
-+	assert(front_bo != back_bo);
- 	assert(front_bo->refcnt);
- 	assert(back_bo->refcnt);
- 
-@@ -1894,6 +2385,11 @@ sna_dri2_xchg(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr back)
- 	get_private(back)->bo = front_bo;
- 	mark_stale(back);
- 
-+	assert(front_bo->active_scanout > 0);
-+	front_bo->active_scanout--;
-+	back_bo->active_scanout++;
-+	assert(back_bo->active_scanout <= back_bo->refcnt);
-+
- 	tmp = front->name;
- 	front->name = back->name;
- 	back->name = tmp;
-@@ -1902,17 +2398,23 @@ sna_dri2_xchg(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr back)
- 	front->pitch = back->pitch;
- 	back->pitch = tmp;
- 
-+	tmp = front->flags;
-+	front->flags = back->flags;
-+	back->flags = tmp;
-+
- 	assert(front_bo->refcnt);
- 	assert(back_bo->refcnt);
- 
-+	assert(front_bo->pitch == get_private(front)->bo->pitch);
-+	assert(back_bo->pitch == get_private(back)->bo->pitch);
-+
- 	assert(get_private(front)->bo == sna_pixmap(pixmap)->gpu_bo);
- }
- 
- static void sna_dri2_xchg_crtc(struct sna *sna, DrawablePtr draw, xf86CrtcPtr crtc, DRI2BufferPtr front, DRI2BufferPtr back)
- {
- 	WindowPtr win = (WindowPtr)draw;
--	DRI2Buffer2Ptr tmp;
--	struct kgem_bo *bo;
-+	struct dri2_window *priv = dri2_window(win);
- 
- 	DBG(("%s: exchange front=%d/%d and back=%d/%d, win id=%lu, pixmap=%ld %dx%d\n",
- 	     __FUNCTION__,
-@@ -1922,162 +2424,130 @@ static void sna_dri2_xchg_crtc(struct sna *sna, DrawablePtr draw, xf86CrtcPtr cr
- 	     get_window_pixmap(win)->drawable.serialNumber,
- 	     get_window_pixmap(win)->drawable.width,
- 	     get_window_pixmap(win)->drawable.height));
-+	assert(can_xchg_crtc(sna, draw, crtc, front, back));
- 
--	DamageRegionAppend(&win->drawable, &win->clipList);
-+	if (APPLY_DAMAGE) {
-+		DBG(("%s: marking drawable as damaged\n", __FUNCTION__));
-+		sna->ignore_copy_area = sna->flags & SNA_TEAR_FREE;
-+		DamageRegionAppend(&win->drawable, &win->clipList);
-+	}
- 	sna_shadow_set_crtc(sna, crtc, get_private(back)->bo);
--	DamageRegionProcessPending(&win->drawable);
-+	if (APPLY_DAMAGE) {
-+		sna->ignore_copy_area = false;
-+		DamageRegionProcessPending(&win->drawable);
-+	}
- 
--	assert(dri2_window(win)->front == NULL);
-+	if (priv->front == NULL) {
-+		DRI2Buffer2Ptr tmp;
- 
--	tmp = calloc(1, sizeof(*tmp) + sizeof(struct sna_dri2_private));
--	if (tmp == NULL) {
--		back->attachment = -1;
--		if (get_private(back)->proxy == NULL) {
--			get_private(back)->pixmap = get_window_pixmap(win);
--			get_private(back)->proxy = sna_dri2_reference_buffer(sna_pixmap_get_buffer(get_private(back)->pixmap));
-+		tmp = calloc(1, sizeof(*tmp) + sizeof(struct sna_dri2_private));
-+		if (tmp == NULL) {
-+			sna_shadow_unset_crtc(sna, crtc);
-+			return;
- 		}
--		dri2_window(win)->front = sna_dri2_reference_buffer(back);
--		return;
--	}
- 
--	*tmp = *back;
--	tmp->attachment = DRI2BufferFrontLeft;
--	tmp->driverPrivate = tmp + 1;
--	get_private(tmp)->refcnt = 1;
--	get_private(tmp)->bo = get_private(back)->bo;
--	get_private(tmp)->size = get_private(back)->size;
--	get_private(tmp)->pixmap = get_window_pixmap(win);
--	get_private(tmp)->proxy = sna_dri2_reference_buffer(sna_pixmap_get_buffer(get_private(tmp)->pixmap));
--	dri2_window(win)->front = tmp;
--
--	DBG(("%s: allocating new backbuffer\n", __FUNCTION__));
--	back->name = 0;
--	bo = kgem_create_2d(&sna->kgem,
--			    draw->width, draw->height, draw->bitsPerPixel,
--			    get_private(back)->bo->tiling,
--			    CREATE_SCANOUT);
--	if (bo != NULL) {
--		get_private(back)->bo = bo;
--		back->pitch = bo->pitch;
--		back->name = kgem_bo_flink(&sna->kgem, bo);
--	}
--	if (back->name == 0) {
--		if (bo != NULL)
--			kgem_bo_destroy(&sna->kgem, bo);
--		get_private(back)->bo = NULL;
--		back->attachment = -1;
-+		tmp->attachment = DRI2BufferFrontLeft;
-+		tmp->driverPrivate = tmp + 1;
-+		tmp->cpp = back->cpp;
-+		tmp->format = back->format;
-+
-+		get_private(tmp)->refcnt = 1;
-+		get_private(tmp)->bo = kgem_create_2d(&sna->kgem,
-+						      draw->width, draw->height, draw->bitsPerPixel,
-+						      get_private(back)->bo->tiling,
-+						      CREATE_SCANOUT | CREATE_EXACT);
-+		if (get_private(tmp)->bo != NULL) {
-+			tmp->pitch = get_private(tmp)->bo->pitch;
-+			tmp->name = kgem_bo_flink(&sna->kgem, get_private(tmp)->bo);
-+		}
-+		if (tmp->name == 0) {
-+			if (get_private(tmp)->bo != NULL)
-+				kgem_bo_destroy(&sna->kgem, get_private(tmp)->bo);
-+			sna_shadow_unset_crtc(sna, crtc);
-+			return;
-+		}
-+		get_private(tmp)->size = get_private(back)->size;
-+		get_private(tmp)->pixmap = get_private(front)->pixmap;
-+		get_private(tmp)->proxy = sna_dri2_reference_buffer(front);
-+		get_private(tmp)->bo->active_scanout++;
-+
-+		priv->front = front = tmp;
- 	}
--}
-+	assert(front == priv->front);
- 
--static void frame_swap_complete(struct sna_dri2_event *frame, int type)
--{
--	const struct ust_msc *swap;
-+	{
-+		struct kgem_bo *front_bo = get_private(front)->bo;
-+		struct kgem_bo *back_bo = get_private(back)->bo;
-+		unsigned tmp;
- 
--	if (frame->draw == NULL)
--		return;
-+		assert(front_bo->refcnt);
-+		assert(back_bo->refcnt);
- 
--	assert(frame->client);
-+		get_private(back)->bo = front_bo;
-+		get_private(front)->bo = back_bo;
-+		mark_stale(back);
- 
--	swap = sna_crtc_last_swap(frame->crtc);
--	DBG(("%s(type=%d): draw=%ld, pipe=%d, frame=%lld [msc=%lld], tv=%d.%06d\n",
--	     __FUNCTION__, type, (long)frame->draw, frame->pipe,
--	     (long long)swap->msc,
--	     (long long)draw_current_msc(frame->draw, frame->crtc, swap->msc),
--	     swap->tv_sec, swap->tv_usec));
-+		assert(front_bo->active_scanout > 0);
-+		front_bo->active_scanout--;
-+		back_bo->active_scanout++;
-+		assert(back_bo->active_scanout <= back_bo->refcnt);
- 
--	DRI2SwapComplete(frame->client, frame->draw,
--			 draw_current_msc(frame->draw, frame->crtc, swap->msc),
--			 swap->tv_sec, swap->tv_usec,
--			 type, frame->event_complete, frame->event_data);
--}
-+		tmp = front->name;
-+		front->name = back->name;
-+		back->name = tmp;
- 
--static void fake_swap_complete(struct sna *sna, ClientPtr client,
--			       DrawablePtr draw, xf86CrtcPtr crtc,
--			       int type, DRI2SwapEventPtr func, void *data)
--{
--	const struct ust_msc *swap;
--
--	swap = sna_crtc_last_swap(crtc);
--	DBG(("%s(type=%d): draw=%ld, pipe=%d, frame=%lld [msc %lld], tv=%d.%06d\n",
--	     __FUNCTION__, type, (long)draw->id, crtc ? sna_crtc_to_pipe(crtc) : -1,
--	     (long long)swap->msc,
--	     (long long)draw_current_msc(draw, crtc, swap->msc),
--	     swap->tv_sec, swap->tv_usec));
-+		tmp = front->pitch;
-+		front->pitch = back->pitch;
-+		back->pitch = tmp;
- 
--	DRI2SwapComplete(client, draw,
--			 draw_current_msc(draw, crtc, swap->msc),
--			 swap->tv_sec, swap->tv_usec,
--			 type, func, data);
-+		tmp = front->flags;
-+		front->flags = back->flags;
-+		back->flags = tmp;
-+	}
- }
- 
- static void chain_swap(struct sna_dri2_event *chain)
- {
--	union drm_wait_vblank vbl;
-+	DBG(("%s: draw=%ld, queued?=%d, type=%d\n",
-+	     __FUNCTION__, (long)chain->draw->id, chain->queued, chain->type));
-+
-+	if (chain->queued) /* too early! */
-+		return;
- 
- 	if (chain->draw == NULL) {
- 		sna_dri2_event_free(chain);
- 		return;
- 	}
- 
--	if (chain->queued) /* too early! */
--		return;
--
- 	assert(chain == dri2_chain(chain->draw));
--	DBG(("%s: chaining draw=%ld, type=%d\n",
--	     __FUNCTION__, (long)chain->draw->id, chain->type));
--	chain->queued = true;
-+	assert(chain->signal);
- 
- 	switch (chain->type) {
--	case SWAP_THROTTLE:
-+	case SWAP_COMPLETE:
- 		DBG(("%s: emitting chained vsync'ed blit\n", __FUNCTION__));
--		if (chain->sna->mode.shadow &&
--		    !chain->sna->mode.shadow_damage) {
--			/* recursed from wait_for_shadow(), simply requeue */
--			DBG(("%s -- recursed from wait_for_shadow(), requeuing\n", __FUNCTION__));
--			VG_CLEAR(vbl);
--			vbl.request.type =
--				DRM_VBLANK_RELATIVE |
--				DRM_VBLANK_EVENT;
--			vbl.request.sequence = 1;
--			vbl.request.signal = (uintptr_t)chain;
--
--			if (!sna_wait_vblank(chain->sna, &vbl, chain->pipe))
--				return;
--
--			DBG(("%s -- requeue failed, errno=%d\n", __FUNCTION__, errno));
--		}
--
- 		if (can_xchg(chain->sna, chain->draw, chain->front, chain->back)) {
- 			sna_dri2_xchg(chain->draw, chain->front, chain->back);
--		} else if (can_xchg_crtc(chain->sna, chain->draw, chain->front, chain->back, chain->crtc)) {
--			sna_dri2_xchg_crtc(chain->sna, chain->draw, chain->crtc, chain->front, chain->back);
-+		} else if (can_xchg_crtc(chain->sna, chain->draw, chain->crtc,
-+					 chain->front, chain->back)) {
-+			sna_dri2_xchg_crtc(chain->sna, chain->draw, chain->crtc,
-+					   chain->front, chain->back);
- 		} else {
--			assert(chain->queued);
--			chain->bo = __sna_dri2_copy_region(chain->sna, chain->draw, NULL,
--							   chain->back, chain->front,
--							   true);
-+			__sna_dri2_copy_event(chain, chain->sync | DRI2_BO);
- 		}
-+		assert(get_private(chain->back)->bo != get_private(chain->front)->bo);
- 	case SWAP:
- 		break;
- 	default:
- 		return;
- 	}
- 
--	VG_CLEAR(vbl);
--	vbl.request.type =
--		DRM_VBLANK_RELATIVE |
--		DRM_VBLANK_EVENT;
--	vbl.request.sequence = 1;
--	vbl.request.signal = (uintptr_t)chain;
--	if (sna_wait_vblank(chain->sna, &vbl, chain->pipe)) {
-+	if ((chain->type == SWAP_COMPLETE &&
-+	     !swap_limit(chain->draw, 2 + !chain->sync) &&
-+	     !chain->sync) ||
-+	    !sna_next_vblank(chain)) {
- 		DBG(("%s: vblank wait failed, unblocking client\n", __FUNCTION__));
- 		frame_swap_complete(chain, DRI2_BLIT_COMPLETE);
- 		sna_dri2_event_free(chain);
--	} else {
--		if (chain->type == SWAP_THROTTLE && !swap_limit(chain->draw, 2)) {
--			DBG(("%s: fake triple buffering, unblocking client\n", __FUNCTION__));
--			frame_swap_complete(chain, DRI2_BLIT_COMPLETE);
--		}
- 	}
- }
- 
-@@ -2086,40 +2556,27 @@ static inline bool rq_is_busy(struct kgem *kgem, struct kgem_bo *bo)
- 	if (bo == NULL)
- 		return false;
- 
--	DBG(("%s: handle=%d, domain: %d exec? %d, rq? %d\n", __FUNCTION__,
--	     bo->handle, bo->domain, bo->exec != NULL, bo->rq != NULL));
--	assert(bo->refcnt);
--
--	if (bo->exec)
--		return true;
--
--	if (bo->rq == NULL)
--		return false;
--
--	return __kgem_busy(kgem, bo->handle);
-+	return __kgem_bo_is_busy(kgem, bo);
- }
- 
--static bool sna_dri2_blit_complete(struct sna *sna,
--				   struct sna_dri2_event *info)
-+static bool sna_dri2_blit_complete(struct sna_dri2_event *info)
- {
--	if (rq_is_busy(&sna->kgem, info->bo)) {
--		union drm_wait_vblank vbl;
-+	if (!info->bo)
-+		return true;
- 
-+	if (__kgem_bo_is_busy(&info->sna->kgem, info->bo)) {
- 		DBG(("%s: vsync'ed blit is still busy, postponing\n",
- 		     __FUNCTION__));
--
--		VG_CLEAR(vbl);
--		vbl.request.type =
--			DRM_VBLANK_RELATIVE |
--			DRM_VBLANK_EVENT;
--		vbl.request.sequence = 1;
--		vbl.request.signal = (uintptr_t)info;
--		assert(info->queued);
--		if (!sna_wait_vblank(sna, &vbl, info->pipe))
-+		if (sna_next_vblank(info))
- 			return false;
-+
-+		kgem_bo_sync__gtt(&info->sna->kgem, info->bo);
- 	}
- 
- 	DBG(("%s: blit finished\n", __FUNCTION__));
-+	kgem_bo_destroy(&info->sna->kgem, info->bo);
-+	info->bo = NULL;
-+
- 	return true;
- }
- 
-@@ -2128,11 +2585,12 @@ void sna_dri2_vblank_handler(struct drm_event_vblank *event)
- 	struct sna_dri2_event *info = (void *)(uintptr_t)event->user_data;
- 	struct sna *sna = info->sna;
- 	DrawablePtr draw;
--	union drm_wait_vblank vbl;
- 	uint64_t msc;
- 
--	DBG(("%s(type=%d, sequence=%d)\n", __FUNCTION__, info->type, event->sequence));
-+	DBG(("%s(type=%d, sequence=%d, draw=%ld)\n", __FUNCTION__, info->type, event->sequence, info->draw ? info->draw->serialNumber : 0));
- 	assert(info->queued);
-+	info->queued = false;
-+
- 	msc = sna_crtc_record_event(info->crtc, event);
- 
- 	draw = info->draw;
-@@ -2141,68 +2599,120 @@ void sna_dri2_vblank_handler(struct drm_event_vblank *event)
- 		goto done;
- 	}
- 
-+	assert((info->front == NULL && info->back == NULL) || info->front != info->back);
- 	switch (info->type) {
- 	case FLIP:
- 		/* If we can still flip... */
-+		assert(info->signal);
- 		if (can_flip(sna, draw, info->front, info->back, info->crtc) &&
- 		    sna_dri2_flip(info))
- 			return;
- 
- 		/* else fall through to blit */
- 	case SWAP:
--		assert(info->queued);
--		if (sna->mode.shadow && !sna->mode.shadow_damage) {
--			/* recursed from wait_for_shadow(), simply requeue */
--			DBG(("%s -- recursed from wait_for_shadow(), requeuing\n", __FUNCTION__));
--
--		} else if (can_xchg(info->sna, draw, info->front, info->back)) {
-+		assert(info->signal);
-+		if (can_xchg(info->sna, draw, info->front, info->back)) {
- 			sna_dri2_xchg(draw, info->front, info->back);
--			info->type = SWAP_WAIT;
--		} else if (can_xchg_crtc(sna, draw, info->front, info->back, info->crtc)) {
--			sna_dri2_xchg_crtc(sna, draw, info->crtc, info->front, info->back);
--			info->type = SWAP_WAIT;
-+			info->type = SWAP_COMPLETE;
-+		} else if (can_xchg_crtc(sna, draw, info->crtc,
-+					 info->front, info->back)) {
-+			sna_dri2_xchg_crtc(sna, draw, info->crtc,
-+					   info->front, info->back);
-+			info->type = SWAP_COMPLETE;
- 		}  else {
--			assert(info->queued);
--			info->bo = __sna_dri2_copy_region(sna, draw, NULL,
--							  info->back, info->front, true);
--			info->type = SWAP_WAIT;
-+			__sna_dri2_copy_event(info, DRI2_BO | DRI2_SYNC);
-+			info->type = SWAP_COMPLETE;
- 		}
- 
--		VG_CLEAR(vbl);
--		vbl.request.type =
--			DRM_VBLANK_RELATIVE |
--			DRM_VBLANK_EVENT;
--		vbl.request.sequence = 1;
--		vbl.request.signal = (uintptr_t)info;
--
--		assert(info->queued);
--		if (!sna_wait_vblank(sna, &vbl, info->pipe))
-+		if (sna_next_vblank(info))
- 			return;
- 
- 		DBG(("%s -- requeue failed, errno=%d\n", __FUNCTION__, errno));
-+		assert(info->pending.bo == NULL);
-+		assert(info->keepalive == 1);
- 		/* fall through to SwapComplete */
--	case SWAP_WAIT:
--		if (!sna_dri2_blit_complete(sna, info))
--			return;
--
--		DBG(("%s: swap complete, unblocking client (frame=%d, tv=%d.%06d)\n", __FUNCTION__,
--		     event->sequence, event->tv_sec, event->tv_usec));
--		frame_swap_complete(info, DRI2_BLIT_COMPLETE);
--		break;
--
--	case SWAP_THROTTLE:
-+	case SWAP_COMPLETE:
- 		DBG(("%s: %d complete, frame=%d tv=%d.%06d\n",
- 		     __FUNCTION__, info->type,
- 		     event->sequence, event->tv_sec, event->tv_usec));
- 
--		if (xorg_can_triple_buffer()) {
--			if (!sna_dri2_blit_complete(sna, info))
-+		if (info->signal) {
-+			if (!sna_dri2_blit_complete(info))
- 				return;
- 
- 			DBG(("%s: triple buffer swap complete, unblocking client (frame=%d, tv=%d.%06d)\n", __FUNCTION__,
- 			     event->sequence, event->tv_sec, event->tv_usec));
- 			frame_swap_complete(info, DRI2_BLIT_COMPLETE);
- 		}
-+
-+		if (info->pending.bo) {
-+			struct copy current_back;
-+
-+			DBG(("%s: swapping back handle=%d [name=%d, active=%d] for pending handle=%d [name=%d, active=%d], front handle=%d [name=%d, active=%d]\n",
-+			     __FUNCTION__,
-+			     get_private(info->back)->bo->handle, info->back->name, get_private(info->back)->bo->active_scanout,
-+			     info->pending.bo->handle, info->pending.name, info->pending.bo->active_scanout,
-+			     get_private(info->front)->bo->handle, info->front->name, get_private(info->front)->bo->active_scanout));
-+
-+			assert(info->pending.bo->active_scanout > 0);
-+			info->pending.bo->active_scanout--;
-+
-+			current_back.bo = get_private(info->back)->bo;
-+			current_back.size = get_private(info->back)->size;
-+			current_back.name = info->back->name;
-+			current_back.flags = info->back->flags;
-+
-+			get_private(info->back)->bo = info->pending.bo;
-+			get_private(info->back)->size = info->pending.size;
-+			info->back->name = info->pending.name;
-+			info->back->pitch = info->pending.bo->pitch;
-+			info->back->flags = info->pending.flags;
-+			info->pending.bo = NULL;
-+
-+			assert(get_private(info->back)->bo != get_private(info->front)->bo);
-+
-+			if (can_xchg(info->sna, info->draw, info->front, info->back))
-+				sna_dri2_xchg(info->draw, info->front, info->back);
-+			else if (can_xchg_crtc(info->sna, info->draw, info->crtc,
-+						 info->front, info->back))
-+				sna_dri2_xchg_crtc(info->sna, info->draw, info->crtc,
-+						   info->front, info->back);
-+			else
-+				__sna_dri2_copy_event(info, info->sync | DRI2_BO);
-+
-+			sna_dri2_cache_bo(info->sna, info->draw,
-+					  get_private(info->back)->bo,
-+					  info->back->name,
-+					  get_private(info->back)->size,
-+					  info->back->flags);
-+
-+			get_private(info->back)->bo = current_back.bo;
-+			get_private(info->back)->size = current_back.size;
-+			info->back->name = current_back.name;
-+			info->back->pitch = current_back.bo->pitch;
-+			info->back->flags = current_back.flags;
-+
-+			DBG(("%s: restored current back handle=%d [name=%d, active=%d], active=%d], front handle=%d [name=%d, active=%d]\n",
-+			     __FUNCTION__,
-+			     get_private(info->back)->bo->handle, info->back->name, get_private(info->back)->bo->active_scanout,
-+			     get_private(info->front)->bo->handle, info->front->name, get_private(info->front)->bo->active_scanout));
-+
-+			assert(info->draw);
-+			assert(!info->signal);
-+			info->keepalive++;
-+			info->signal = true;
-+		}
-+
-+		if (--info->keepalive) {
-+			if (sna_next_vblank(info))
-+				return;
-+
-+			if (info->signal) {
-+				DBG(("%s: triple buffer swap complete, unblocking client (frame=%d, tv=%d.%06d)\n", __FUNCTION__,
-+				     event->sequence, event->tv_sec, event->tv_usec));
-+				frame_swap_complete(info, DRI2_BLIT_COMPLETE);
-+			}
-+		}
- 		break;
- 
- 	case WAITMSC:
-@@ -2218,11 +2728,11 @@ void sna_dri2_vblank_handler(struct drm_event_vblank *event)
- 	}
- 
- 	if (info->chain) {
-+		DBG(("%s: continuing chain\n", __FUNCTION__));
- 		assert(info->chain != info);
- 		assert(info->draw == draw);
--		sna_dri2_remove_event((WindowPtr)draw, info);
-+		sna_dri2_remove_event(info);
- 		chain_swap(info->chain);
--		info->draw = NULL;
- 	}
- 
- done:
-@@ -2230,101 +2740,148 @@ done:
- 	DBG(("%s complete\n", __FUNCTION__));
- }
- 
--static bool
-+static void
- sna_dri2_immediate_blit(struct sna *sna,
- 			struct sna_dri2_event *info,
--			bool sync, bool event)
-+			bool sync)
- {
--	DrawablePtr draw = info->draw;
--	bool ret = false;
-+	struct sna_dri2_event *chain = dri2_chain(info->draw);
- 
- 	if (sna->flags & SNA_NO_WAIT)
- 		sync = false;
- 
--	DBG(("%s: emitting immediate blit, throttling client, synced? %d, chained? %d, send-event? %d\n",
--	     __FUNCTION__, sync, dri2_chain(draw) != info,
--	     event));
-+	DBG(("%s: emitting immediate blit, throttling client, synced? %d, chained? %d, pipe %d\n",
-+	     __FUNCTION__, sync, chain != info, info->pipe));
-+	assert(chain);
- 
--	info->type = SWAP_THROTTLE;
--	if (!sync || dri2_chain(draw) == info) {
--		DBG(("%s: no pending blit, starting chain\n",
--		     __FUNCTION__));
-+	info->type = SWAP_COMPLETE;
-+	info->sync = sync;
-+	info->keepalive = KEEPALIVE;
- 
--		info->queued = true;
--		info->bo = __sna_dri2_copy_region(sna, draw, NULL,
--						  info->back,
--						  info->front,
--						  sync);
--		if (event) {
--			if (sync) {
--				union drm_wait_vblank vbl;
--
--				VG_CLEAR(vbl);
--				vbl.request.type =
--					DRM_VBLANK_RELATIVE |
--					DRM_VBLANK_EVENT;
--				vbl.request.sequence = 1;
--				vbl.request.signal = (uintptr_t)info;
--				ret = !sna_wait_vblank(sna, &vbl, info->pipe);
--				if (ret)
--					event = !swap_limit(draw, 2);
--			}
--			if (event) {
--				DBG(("%s: fake triple buffering, unblocking client\n", __FUNCTION__));
--				frame_swap_complete(info, DRI2_BLIT_COMPLETE);
--			}
-+	if (chain == info) {
-+		DBG(("%s: no pending blit, starting chain\n", __FUNCTION__));
-+
-+		assert(info->front != info->back);
-+		if (can_xchg(info->sna, info->draw, info->front, info->back)) {
-+			sna_dri2_xchg(info->draw, info->front, info->back);
-+		} else if (can_xchg_crtc(info->sna, info->draw, info->crtc,
-+					 info->front, info->back)) {
-+			sna_dri2_xchg_crtc(info->sna, info->draw, info->crtc,
-+					   info->front, info->back);
-+		} else
-+			__sna_dri2_copy_event(info, sync | DRI2_BO);
-+
-+		assert(info->signal);
-+
-+		if ((!swap_limit(info->draw, 2 + !sync) && !sync) ||
-+		    !sna_next_vblank(info)) {
-+			DBG(("%s: fake triple buffering, unblocking client\n", __FUNCTION__));
-+			frame_swap_complete(info, DRI2_BLIT_COMPLETE);
-+			sna_dri2_event_free(info);
-+		}
-+		return;
-+	}
-+
-+	DBG(("%s: current event front=%d [name=%d, active?=%d], back=%d [name=%d, active?=%d]\n", __FUNCTION__,
-+	     get_private(chain->front)->bo->handle, chain->front->name, get_private(chain->front)->bo->active_scanout,
-+	     get_private(chain->back)->bo->handle, chain->back->name, get_private(chain->back)->bo->active_scanout));
-+
-+	if (chain->type == SWAP_COMPLETE && chain->front == info->front) {
-+		assert(chain->draw == info->draw);
-+		assert(chain->client == info->client);
-+		assert(chain->event_complete == info->event_complete);
-+		assert(chain->event_data == info->event_data);
-+		assert(chain->queued);
-+
-+		if ((!sync || !chain->sync) && chain->pending.bo) {
-+			bool signal = chain->signal;
-+
-+			DBG(("%s: swap elision, unblocking client\n", __FUNCTION__));
-+			assert(chain->draw);
-+			chain->signal = true;
-+			frame_swap_complete(chain, DRI2_EXCHANGE_COMPLETE);
-+			chain->signal = signal;
-+
-+			assert(chain->pending.bo->active_scanout > 0);
-+			chain->pending.bo->active_scanout--;
-+
-+			sna_dri2_cache_bo(chain->sna, chain->draw,
-+					  chain->pending.bo,
-+					  chain->pending.name,
-+					  chain->pending.size,
-+					  chain->pending.flags);
-+			chain->pending.bo = NULL;
-+		}
-+
-+		if (chain->pending.bo == NULL && swap_limit(info->draw, 2 + !sync)) {
-+			DBG(("%s: setting handle=%d as pending blit (current event front=%d, back=%d)\n", __FUNCTION__,
-+			     get_private(info->back)->bo->handle,
-+			     get_private(chain->front)->bo->handle,
-+			     get_private(chain->back)->bo->handle));
-+			chain->pending.bo = ref(get_private(info->back)->bo);
-+			chain->pending.size = get_private(info->back)->size;
-+			chain->pending.name = info->back->name;
-+			chain->pending.flags = info->back->flags;
-+			chain->sync = sync;
-+			info->signal = false; /* transfer signal to pending */
-+
-+			/* Prevent us from handing it back on next GetBuffers */
-+			chain->pending.bo->active_scanout++;
-+
-+			sna_dri2_event_free(info);
-+			return;
- 		}
--	} else {
--		DBG(("%s: pending blit, chained\n", __FUNCTION__));
--		ret = true;
- 	}
- 
--	DBG(("%s: continue? %d\n", __FUNCTION__, ret));
--	return ret;
-+	DBG(("%s: pending blit, chained\n", __FUNCTION__));
- }
- 
- static bool
- sna_dri2_flip_continue(struct sna_dri2_event *info)
- {
--	DBG(("%s(mode=%d)\n", __FUNCTION__, info->mode));
-+	struct kgem_bo *bo = get_private(info->front)->bo;
- 
--	if (info->mode > 0){
--		struct kgem_bo *bo = get_private(info->front)->bo;
-+	DBG(("%s(mode=%d)\n", __FUNCTION__, info->flip_continue));
-+	assert(info->flip_continue > 0);
-+	info->type = info->flip_continue;
-+	info->flip_continue = 0;
- 
--		info->type = info->mode;
-+	assert(!info->signal);
-+	info->signal = info->type == FLIP_THROTTLE && info->draw;
- 
--		if (bo != sna_pixmap(info->sna->front)->gpu_bo)
--			return false;
-+	if (info->sna->mode.front_active == 0)
-+		return false;
- 
--		if (!sna_page_flip(info->sna, bo, sna_dri2_flip_handler, info))
--			return false;
-+	if (bo != sna_pixmap(info->sna->front)->gpu_bo)
-+		return false;
- 
--		assert(info->sna->dri2.flip_pending == NULL ||
--		       info->sna->dri2.flip_pending == info);
--		info->sna->dri2.flip_pending = info;
--		assert(info->queued);
--	} else {
--		info->type = -info->mode;
-+	assert(!info->queued);
-+	if (!sna_page_flip(info->sna, bo, sna_dri2_flip_handler, info))
-+		return false;
- 
--		if (!info->draw)
--			return false;
-+	DBG(("%s: queued flip=%p\n", __FUNCTION__, info));
-+	assert(info->sna->dri2.flip_pending == NULL ||
-+	       info->sna->dri2.flip_pending == info);
-+	info->sna->dri2.flip_pending = info;
-+	info->queued = true;
- 
--		if (!can_flip(info->sna, info->draw, info->front, info->back, info->crtc))
--			return false;
-+	return true;
-+}
- 
--		assert(sna_pixmap_get_buffer(get_drawable_pixmap(info->draw)) == info->front);
--		if (!sna_dri2_flip(info))
--			return false;
-+static bool
-+sna_dri2_flip_keepalive(struct sna_dri2_event *info)
-+{
-+	DBG(("%s(keepalive?=%d)\n", __FUNCTION__, info->keepalive-1));
-+	assert(info->keepalive > 0);
-+	if (!--info->keepalive)
-+		return false;
- 
--		if (!xorg_can_triple_buffer()) {
--			sna_dri2_get_back(info->sna, info->draw, info->back, info);
--			DBG(("%s: fake triple buffering, unblocking client\n", __FUNCTION__));
--			frame_swap_complete(info, DRI2_FLIP_COMPLETE);
--		}
--	}
-+	if (info->draw == NULL)
-+		return false;
- 
--	info->mode = 0;
--	return true;
-+	DBG(("%s: marking next flip as complete\n", __FUNCTION__));
-+	info->flip_continue = FLIP_COMPLETE;
-+	return sna_dri2_flip_continue(info);
- }
- 
- static void chain_flip(struct sna *sna)
-@@ -2332,8 +2889,8 @@ static void chain_flip(struct sna *sna)
- 	struct sna_dri2_event *chain = sna->dri2.flip_pending;
- 
- 	assert(chain->type == FLIP);
--	DBG(("%s: chaining type=%d, cancelled?=%d\n",
--	     __FUNCTION__, chain->type, chain->draw == NULL));
-+	DBG(("%s: chaining type=%d, cancelled?=%d window=%ld\n",
-+	     __FUNCTION__, chain->type, chain->draw == NULL, chain->draw ? chain->draw->id : 0));
- 
- 	sna->dri2.flip_pending = NULL;
- 	if (chain->draw == NULL) {
-@@ -2343,31 +2900,18 @@ static void chain_flip(struct sna *sna)
- 
- 	assert(chain == dri2_chain(chain->draw));
- 	assert(!chain->queued);
--	chain->queued = true;
- 
- 	if (can_flip(sna, chain->draw, chain->front, chain->back, chain->crtc) &&
- 	    sna_dri2_flip(chain)) {
- 		DBG(("%s: performing chained flip\n", __FUNCTION__));
- 	} else {
- 		DBG(("%s: emitting chained vsync'ed blit\n", __FUNCTION__));
--		chain->bo = __sna_dri2_copy_region(sna, chain->draw, NULL,
--						  chain->back, chain->front,
--						  true);
-+		__sna_dri2_copy_event(chain, DRI2_SYNC);
- 
- 		if (xorg_can_triple_buffer()) {
--			union drm_wait_vblank vbl;
--
--			VG_CLEAR(vbl);
--
--			chain->type = SWAP_WAIT;
--			vbl.request.type =
--				DRM_VBLANK_RELATIVE |
--				DRM_VBLANK_EVENT;
--			vbl.request.sequence = 1;
--			vbl.request.signal = (uintptr_t)chain;
--
--			assert(chain->queued);
--			if (!sna_wait_vblank(sna, &vbl, chain->pipe))
-+			chain->type = SWAP_COMPLETE;
-+			assert(chain->signal);
-+			if (sna_next_vblank(chain))
- 				return;
- 		}
- 
-@@ -2381,8 +2925,10 @@ static void sna_dri2_flip_event(struct sna_dri2_event *flip)
- {
- 	struct sna *sna = flip->sna;
- 
--	DBG(("%s(pipe=%d, event=%d)\n", __FUNCTION__, flip->pipe, flip->type));
--	assert(flip->queued);
-+	DBG(("%s flip=%p (pipe=%d, event=%d, queued?=%d)\n", __FUNCTION__, flip, flip->pipe, flip->type, flip->queued));
-+	if (!flip->queued) /* pageflip died whilst being queued */
-+		return;
-+	flip->queued = false;
- 
- 	if (sna->dri2.flip_pending == flip)
- 		sna->dri2.flip_pending = NULL;
-@@ -2390,8 +2936,10 @@ static void sna_dri2_flip_event(struct sna_dri2_event *flip)
- 	/* We assume our flips arrive in order, so we don't check the frame */
- 	switch (flip->type) {
- 	case FLIP:
--		DBG(("%s: swap complete, unblocking client\n", __FUNCTION__));
--		frame_swap_complete(flip, DRI2_FLIP_COMPLETE);
-+		if (flip->signal) {
-+			DBG(("%s: swap complete, unblocking client\n", __FUNCTION__));
-+			frame_swap_complete(flip, DRI2_FLIP_COMPLETE);
-+		}
- 		sna_dri2_event_free(flip);
- 
- 		if (sna->dri2.flip_pending)
-@@ -2399,27 +2947,35 @@ static void sna_dri2_flip_event(struct sna_dri2_event *flip)
- 		break;
- 
- 	case FLIP_THROTTLE:
--		DBG(("%s: triple buffer swap complete, unblocking client\n", __FUNCTION__));
--		frame_swap_complete(flip, DRI2_FLIP_COMPLETE);
-+		if (flip->signal) {
-+			DBG(("%s: triple buffer swap complete, unblocking client\n", __FUNCTION__));
-+			frame_swap_complete(flip, DRI2_FLIP_COMPLETE);
-+		}
- 	case FLIP_COMPLETE:
-+		assert(!flip->signal);
- 		if (sna->dri2.flip_pending) {
-+			DBG(("%s: pending flip\n", __FUNCTION__));
- 			sna_dri2_event_free(flip);
- 			chain_flip(sna);
--		} else if (!flip->mode) {
-+		} else if (!flip->flip_continue) {
- 			DBG(("%s: flip chain complete\n", __FUNCTION__));
-+			if (!sna_dri2_flip_keepalive(flip)) {
-+				if (flip->chain) {
-+					sna_dri2_remove_event(flip);
-+					chain_swap(flip->chain);
-+				}
- 
--			if (flip->chain) {
--				sna_dri2_remove_event((WindowPtr)flip->draw,
--						      flip);
--				chain_swap(flip->chain);
--				flip->draw = NULL;
-+				sna_dri2_event_free(flip);
- 			}
--
--			sna_dri2_event_free(flip);
- 		} else if (!sna_dri2_flip_continue(flip)) {
- 			DBG(("%s: no longer able to flip\n", __FUNCTION__));
--			if (flip->draw == NULL || !sna_dri2_immediate_blit(sna, flip, false, flip->mode < 0))
--				sna_dri2_event_free(flip);
-+			if (flip->draw != NULL)
-+				__sna_dri2_copy_event(flip, 0);
-+			if (flip->signal) {
-+				DBG(("%s: fake triple buffering, unblocking client\n", __FUNCTION__));
-+				frame_swap_complete(flip, DRI2_BLIT_COMPLETE);
-+			}
-+			sna_dri2_event_free(flip);
- 		}
- 		break;
- 
-@@ -2433,17 +2989,27 @@ static void sna_dri2_flip_event(struct sna_dri2_event *flip)
- 	}
- }
- 
-+static int
-+sna_query_vblank(struct sna *sna, xf86CrtcPtr crtc, union drm_wait_vblank *vbl)
-+{
-+	VG_CLEAR(*vbl);
-+	vbl->request.type =
-+		_DRM_VBLANK_RELATIVE | pipe_select(sna_crtc_pipe(crtc));
-+	vbl->request.sequence = 0;
-+
-+	return drmIoctl(sna->kgem.fd, DRM_IOCTL_WAIT_VBLANK, vbl);
-+}
-+
- static uint64_t
- get_current_msc(struct sna *sna, DrawablePtr draw, xf86CrtcPtr crtc)
- {
- 	union drm_wait_vblank vbl;
--	uint64_t ret = -1;
-+	uint64_t ret;
- 
--	VG_CLEAR(vbl);
--	vbl.request.type = _DRM_VBLANK_RELATIVE;
--	vbl.request.sequence = 0;
--	if (sna_wait_vblank(sna, &vbl, sna_crtc_to_pipe(crtc)) == 0)
-+	if (sna_query_vblank(sna, crtc, &vbl) == 0)
- 		ret = sna_crtc_record_vblank(crtc, &vbl);
-+	else
-+		ret = sna_crtc_last_swap(crtc)->msc;
- 
- 	return draw_current_msc(draw, crtc, ret);
- }
-@@ -2494,12 +3060,18 @@ static int use_triple_buffer(struct sna *sna, ClientPtr client, bool async)
- }
- 
- static bool immediate_swap(struct sna *sna,
--			   uint64_t target_msc,
--			   uint64_t divisor,
- 			   DrawablePtr draw,
- 			   xf86CrtcPtr crtc,
-+			   uint64_t *target_msc,
-+			   uint64_t divisor,
-+			   uint64_t remainder,
- 			   uint64_t *current_msc)
- {
-+	/*
-+	 * If divisor is zero, or current_msc is smaller than target_msc
-+	 * we just need to make sure target_msc passes before initiating
-+	 * the swap.
-+	 */
- 	if (divisor == 0) {
- 		*current_msc = -1;
- 
-@@ -2508,72 +3080,97 @@ static bool immediate_swap(struct sna *sna,
- 			return true;
- 		}
- 
--		if (target_msc)
-+		if (*target_msc)
- 			*current_msc = get_current_msc(sna, draw, crtc);
- 
- 		DBG(("%s: current_msc=%ld, target_msc=%ld -- %s\n",
--		     __FUNCTION__, (long)*current_msc, (long)target_msc,
--		     (*current_msc >= target_msc - 1) ? "yes" : "no"));
--		return *current_msc >= target_msc - 1;
-+		     __FUNCTION__, (long)*current_msc, (long)*target_msc,
-+		     (*current_msc >= *target_msc - 1) ? "yes" : "no"));
-+		return *current_msc >= *target_msc - 1;
- 	}
- 
- 	DBG(("%s: explicit waits requests, divisor=%ld\n",
- 	     __FUNCTION__, (long)divisor));
- 	*current_msc = get_current_msc(sna, draw, crtc);
--	return false;
-+	if (*current_msc >= *target_msc) {
-+		DBG(("%s: missed target, queueing event for next: current=%lld, target=%lld, divisor=%lld, remainder=%lld\n",
-+		     __FUNCTION__,
-+		     (long long)*current_msc,
-+		     (long long)*target_msc,
-+		     (long long)divisor,
-+		     (long long)remainder));
-+
-+		*target_msc = *current_msc + remainder - *current_msc % divisor;
-+		if (*target_msc <= *current_msc)
-+			*target_msc += divisor;
-+	}
-+
-+	DBG(("%s: target_msc=%lld, current_msc=%lld, immediate?=%d\n",
-+	     __FUNCTION__, (long long)*target_msc, (long long)*current_msc,
-+	     *current_msc >= *target_msc - 1));
-+	return *current_msc >= *target_msc - 1;
- }
- 
- static bool
- sna_dri2_schedule_flip(ClientPtr client, DrawablePtr draw, xf86CrtcPtr crtc,
- 		       DRI2BufferPtr front, DRI2BufferPtr back,
--		       CARD64 *target_msc, CARD64 divisor, CARD64 remainder,
-+		       bool immediate, CARD64 *target_msc, CARD64 current_msc,
- 		       DRI2SwapEventPtr func, void *data)
- {
- 	struct sna *sna = to_sna_from_drawable(draw);
- 	struct sna_dri2_event *info;
--	uint64_t current_msc;
--
--	if (immediate_swap(sna, *target_msc, divisor, draw, crtc, &current_msc)) {
--		int type;
- 
-+	if (immediate) {
-+		bool signal = false;
- 		info = sna->dri2.flip_pending;
- 		DBG(("%s: performing immediate swap on pipe %d, pending? %d, mode: %d, continuation? %d\n",
--		     __FUNCTION__, sna_crtc_to_pipe(crtc),
--		     info != NULL, info ? info->mode : 0,
-+		     __FUNCTION__, sna_crtc_pipe(crtc),
-+		     info != NULL, info ? info->flip_continue : 0,
- 		     info && info->draw == draw));
- 
- 		if (info && info->draw == draw) {
- 			assert(info->type != FLIP);
--			assert(info->front == front);
-+			assert(info->queued);
-+			assert(info->front != info->back);
-+			if (info->front != front) {
-+				assert(info->front != NULL);
-+				_sna_dri2_destroy_buffer(sna, draw, info->front);
-+				info->front = sna_dri2_reference_buffer(front);
-+			}
- 			if (info->back != back) {
--				_sna_dri2_destroy_buffer(sna, info->back);
-+				assert(info->back != NULL);
-+				_sna_dri2_destroy_buffer(sna, draw, info->back);
- 				info->back = sna_dri2_reference_buffer(back);
- 			}
--			if (info->mode || current_msc >= *target_msc) {
--				DBG(("%s: executing xchg of pending flip\n",
--				     __FUNCTION__));
--				sna_dri2_xchg(draw, front, back);
--				info->mode = type = FLIP_COMPLETE;
--				goto new_back;
--			} else {
-+			assert(info->front != info->back);
-+			DBG(("%s: executing xchg of pending flip: flip_continue=%d, keepalive=%d, chain?=%d\n", __FUNCTION__, info->flip_continue, info->keepalive, current_msc < *target_msc));
-+			sna_dri2_xchg(draw, front, back);
-+			info->keepalive = KEEPALIVE;
-+			if (xorg_can_triple_buffer() &&
-+			    current_msc < *target_msc) {
- 				DBG(("%s: chaining flip\n", __FUNCTION__));
--				type = FLIP_THROTTLE;
--				if (xorg_can_triple_buffer())
--					info->mode = -type;
--				else
--					info->mode = -FLIP_COMPLETE;
-+				info->flip_continue = FLIP_THROTTLE;
- 				goto out;
-+			} else {
-+				info->flip_continue = FLIP_COMPLETE;
-+				signal = info->signal;
-+				assert(info->draw);
-+				info->signal = true;
-+				goto new_back;
- 			}
- 		}
- 
--		info = sna_dri2_add_event(sna, draw, client);
-+		info = sna_dri2_add_event(sna, draw, client, crtc);
- 		if (info == NULL)
- 			return false;
- 
- 		assert(info->crtc == crtc);
- 		info->event_complete = func;
- 		info->event_data = data;
-+		assert(info->draw);
-+		info->signal = true;
- 
-+		assert(front != back);
- 		info->front = sna_dri2_reference_buffer(front);
- 		info->back = sna_dri2_reference_buffer(back);
- 
-@@ -2584,26 +3181,33 @@ sna_dri2_schedule_flip(ClientPtr client, DrawablePtr draw, xf86CrtcPtr crtc,
- 			 */
- 			DBG(("%s: queueing flip after pending completion\n",
- 			     __FUNCTION__));
--			info->type = type = FLIP;
-+			info->type = FLIP;
- 			sna->dri2.flip_pending = info;
--			assert(info->queued);
- 			current_msc++;
-+		} else if (sna->mode.flip_active) {
-+			DBG(("%s: %d outstanding flips from old client, queueing\n",
-+			     __FUNCTION__, sna->mode.flip_active));
-+			goto queue;
- 		} else {
--			info->type = type = use_triple_buffer(sna, client, *target_msc == 0);
-+			info->type = use_triple_buffer(sna, client, *target_msc == 0);
- 			if (!sna_dri2_flip(info)) {
- 				DBG(("%s: flip failed, falling back\n", __FUNCTION__));
-+				info->signal = false;
- 				sna_dri2_event_free(info);
- 				return false;
- 			}
-+			assert(get_private(info->front)->bo->active_scanout);
- 		}
- 
--		swap_limit(draw, 1 + (type == FLIP_THROTTLE));
--		if (type >= FLIP_COMPLETE) {
-+		swap_limit(draw, 1 + (info->type == FLIP_THROTTLE));
-+		if (info->type >= FLIP_COMPLETE) {
- new_back:
- 			if (!xorg_can_triple_buffer())
--				sna_dri2_get_back(sna, draw, back, info);
-+				sna_dri2_get_back(sna, draw, back);
- 			DBG(("%s: fake triple buffering, unblocking client\n", __FUNCTION__));
- 			frame_swap_complete(info, DRI2_EXCHANGE_COMPLETE);
-+			assert(info->draw);
-+			info->signal = signal;
- 			if (info->type == FLIP_ASYNC)
- 				sna_dri2_event_free(info);
- 		}
-@@ -2613,57 +3217,34 @@ out:
- 		return true;
- 	}
- 
--	info = sna_dri2_add_event(sna, draw, client);
-+queue:
-+	if (KEEPALIVE > 1 && sna->dri2.flip_pending) {
-+		info = sna->dri2.flip_pending;
-+		info->keepalive = 1;
-+	}
-+
-+	info = sna_dri2_add_event(sna, draw, client, crtc);
- 	if (info == NULL)
- 		return false;
- 
- 	assert(info->crtc == crtc);
- 	info->event_complete = func;
- 	info->event_data = data;
-+	assert(info->draw);
-+	info->signal = true;
- 	info->type = FLIP;
- 
-+	assert(front != back);
- 	info->front = sna_dri2_reference_buffer(front);
- 	info->back = sna_dri2_reference_buffer(back);
- 
--	/*
--	 * If divisor is zero, or current_msc is smaller than target_msc
--	 * we just need to make sure target_msc passes before initiating
--	 * the swap.
--	 */
--	if (divisor && current_msc >= *target_msc) {
--		DBG(("%s: missed target, queueing event for next: current=%lld, target=%lld, divisor=%lld, remainder=%lld\n",
--		     __FUNCTION__,
--		     (long long)current_msc,
--		     (long long)*target_msc,
--		     (long long)divisor,
--		     (long long)remainder));
--
--		*target_msc = current_msc + remainder - current_msc % divisor;
--		if (*target_msc <= current_msc)
--			*target_msc += divisor;
--	}
--
--	if (*target_msc <= current_msc + 1) {
--		if (!sna_dri2_flip(info)) {
--			sna_dri2_event_free(info);
--			return false;
--		}
-+	if (*target_msc <= current_msc + 1 && sna_dri2_flip(info)) {
- 		*target_msc = current_msc + 1;
- 	} else {
--		union drm_wait_vblank vbl;
--
--		VG_CLEAR(vbl);
--
--		vbl.request.type =
--			DRM_VBLANK_ABSOLUTE |
--			DRM_VBLANK_EVENT;
--
- 		/* Account for 1 frame extra pageflip delay */
--		vbl.reply.sequence = draw_target_seq(draw, *target_msc - 1);
--		vbl.request.signal = (uintptr_t)info;
--
--		info->queued = true;
--		if (sna_wait_vblank(sna, &vbl, info->pipe)) {
-+		if (!sna_wait_vblank(info,
-+				     draw_target_seq(draw, *target_msc - 1))) {
-+			info->signal = false;
- 			sna_dri2_event_free(info);
- 			return false;
- 		}
-@@ -2674,128 +3255,6 @@ out:
- 	return true;
- }
- 
--static bool
--sna_dri2_schedule_xchg(ClientPtr client, DrawablePtr draw, xf86CrtcPtr crtc,
--		       DRI2BufferPtr front, DRI2BufferPtr back,
--		       CARD64 *target_msc, CARD64 divisor, CARD64 remainder,
--		       DRI2SwapEventPtr func, void *data)
--{
--	struct sna *sna = to_sna_from_drawable(draw);
--	uint64_t current_msc;
--	bool sync, event;
--
--	if (!immediate_swap(sna, *target_msc, divisor, draw, crtc, &current_msc))
--		return false;
--
--	sync = current_msc < *target_msc;
--	event = dri2_chain(draw) == NULL;
--	if (!sync || event) {
--		DBG(("%s: performing immediate xchg on pipe %d\n",
--		     __FUNCTION__, sna_crtc_to_pipe(crtc)));
--		sna_dri2_xchg(draw, front, back);
--	}
--	if (sync) {
--		struct sna_dri2_event *info;
--
--		info = sna_dri2_add_event(sna, draw, client);
--		if (!info)
--			goto complete;
--
--		info->event_complete = func;
--		info->event_data = data;
--
--		info->front = sna_dri2_reference_buffer(front);
--		info->back = sna_dri2_reference_buffer(back);
--		info->type = SWAP_THROTTLE;
--
--		if (event) {
--			union drm_wait_vblank vbl;
--
--			VG_CLEAR(vbl);
--			vbl.request.type =
--				DRM_VBLANK_RELATIVE |
--				DRM_VBLANK_EVENT;
--			vbl.request.sequence = 1;
--			vbl.request.signal = (uintptr_t)info;
--
--			info->queued = true;
--			if (sna_wait_vblank(sna, &vbl, info->pipe)) {
--				sna_dri2_event_free(info);
--				goto complete;
--			}
--
--			swap_limit(draw, 2);
--		}
--	} else {
--complete:
--		fake_swap_complete(sna, client, draw, crtc, DRI2_EXCHANGE_COMPLETE, func, data);
--	}
--
--	*target_msc = current_msc + 1;
--	return true;
--}
--
--static bool
--sna_dri2_schedule_xchg_crtc(ClientPtr client, DrawablePtr draw, xf86CrtcPtr crtc,
--			    DRI2BufferPtr front, DRI2BufferPtr back,
--			    CARD64 *target_msc, CARD64 divisor, CARD64 remainder,
--			    DRI2SwapEventPtr func, void *data)
--{
--	struct sna *sna = to_sna_from_drawable(draw);
--	uint64_t current_msc;
--	bool sync, event;
--
--	if (!immediate_swap(sna, *target_msc, divisor, draw, crtc, &current_msc))
--		return false;
--
--	sync = current_msc < *target_msc;
--	event = dri2_chain(draw) == NULL;
--	if (!sync || event) {
--		DBG(("%s: performing immediate xchg only on pipe %d\n",
--		     __FUNCTION__, sna_crtc_to_pipe(crtc)));
--		sna_dri2_xchg_crtc(sna, draw, crtc, front, back);
--	}
--	if (sync) {
--		struct sna_dri2_event *info;
--
--		info = sna_dri2_add_event(sna, draw, client);
--		if (!info)
--			goto complete;
--
--		info->event_complete = func;
--		info->event_data = data;
--
--		info->front = sna_dri2_reference_buffer(front);
--		info->back = sna_dri2_reference_buffer(back);
--		info->type = SWAP_THROTTLE;
--
--		if (event) {
--			union drm_wait_vblank vbl;
--
--			VG_CLEAR(vbl);
--			vbl.request.type =
--				DRM_VBLANK_RELATIVE |
--				DRM_VBLANK_EVENT;
--			vbl.request.sequence = 1;
--			vbl.request.signal = (uintptr_t)info;
--
--			info->queued = true;
--			if (sna_wait_vblank(sna, &vbl, info->pipe)) {
--				sna_dri2_event_free(info);
--				goto complete;
--			}
--
--			swap_limit(draw, 2);
--		}
--	} else {
--complete:
--		fake_swap_complete(sna, client, draw, crtc, DRI2_EXCHANGE_COMPLETE, func, data);
--	}
--
--	*target_msc = current_msc + 1;
--	return true;
--}
--
- static bool has_pending_events(struct sna *sna)
- {
- 	struct pollfd pfd;
-@@ -2830,11 +3289,11 @@ sna_dri2_schedule_swap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front,
- 		       CARD64 remainder, DRI2SwapEventPtr func, void *data)
- {
- 	struct sna *sna = to_sna_from_drawable(draw);
--	union drm_wait_vblank vbl;
- 	xf86CrtcPtr crtc = NULL;
- 	struct sna_dri2_event *info = NULL;
- 	int type = DRI2_EXCHANGE_COMPLETE;
- 	CARD64 current_msc;
-+	bool immediate;
- 
- 	DBG(("%s: draw=%lu %dx%d, pixmap=%ld %dx%d, back=%u (refs=%d/%d, flush=%d) , front=%u (refs=%d/%d, flush=%d)\n",
- 	     __FUNCTION__,
-@@ -2860,6 +3319,7 @@ sna_dri2_schedule_swap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front,
- 	assert(get_private(front)->refcnt);
- 	assert(get_private(back)->refcnt);
- 
-+	assert(get_private(back)->bo != get_private(front)->bo);
- 	assert(get_private(front)->bo->refcnt);
- 	assert(get_private(back)->bo->refcnt);
- 
-@@ -2876,17 +3336,17 @@ sna_dri2_schedule_swap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front,
- 		goto skip;
- 	}
- 
--	assert(sna_pixmap_from_drawable(draw)->flush);
--
- 	if (draw->type != DRAWABLE_PIXMAP) {
- 		WindowPtr win = (WindowPtr)draw;
- 		struct dri2_window *priv = dri2_window(win);
-+
- 		if (priv->front) {
--			assert(front == priv->front);
--			assert(get_private(priv->front)->refcnt > 1);
--			get_private(priv->front)->refcnt--;
--			priv->front = NULL;
-+			front = priv->front;
-+			assert(front->attachment == DRI2BufferFrontLeft);
-+			assert(get_private(front)->refcnt);
-+			assert(get_private(front)->pixmap == get_drawable_pixmap(draw));
- 		}
-+
- 		if (win->clipList.extents.x2 <= win->clipList.extents.x1 ||
- 		    win->clipList.extents.y2 <= win->clipList.extents.y1) {
- 			DBG(("%s: window clipped (%d, %d), (%d, %d)\n",
-@@ -2899,6 +3359,10 @@ sna_dri2_schedule_swap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front,
- 		}
- 	}
- 
-+	DBG(("%s: using front handle=%d, active_scanout?=%d, flush?=%d\n", __FUNCTION__, get_private(front)->bo->handle, get_private(front)->bo->active_scanout, sna_pixmap_from_drawable(draw)->flush));
-+	assert(get_private(front)->bo->active_scanout);
-+	assert(sna_pixmap_from_drawable(draw)->flush);
-+
- 	/* Drawable not displayed... just complete the swap */
- 	if ((sna->flags & SNA_NO_WAIT) == 0)
- 		crtc = sna_dri2_get_crtc(draw);
-@@ -2914,109 +3378,112 @@ sna_dri2_schedule_swap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front,
- 		sna_mode_wakeup(sna);
- 	}
- 
--	if (can_xchg(sna, draw, front, back) &&
--	    sna_dri2_schedule_xchg(client, draw, crtc, front, back,
-+	immediate = immediate_swap(sna, draw, crtc,
- 				   target_msc, divisor, remainder,
--				   func, data))
--		return TRUE;
--
--	if (can_xchg_crtc(sna, draw, front, back, crtc) &&
--	    sna_dri2_schedule_xchg_crtc(client, draw, crtc, front, back,
--					target_msc, divisor, remainder,
--					func, data))
--		return TRUE;
-+				   &current_msc);
- 
- 	if (can_flip(sna, draw, front, back, crtc) &&
- 	    sna_dri2_schedule_flip(client, draw, crtc, front, back,
--				  target_msc, divisor, remainder,
-+				  immediate, target_msc, current_msc,
- 				  func, data))
- 		return TRUE;
- 
--	VG_CLEAR(vbl);
--
--	info = sna_dri2_add_event(sna, draw, client);
-+	info = sna_dri2_add_event(sna, draw, client, crtc);
- 	if (!info)
- 		goto blit;
- 
- 	assert(info->crtc == crtc);
- 	info->event_complete = func;
- 	info->event_data = data;
-+	assert(info->draw);
-+	info->signal = true;
- 
-+	assert(front != back);
- 	info->front = sna_dri2_reference_buffer(front);
- 	info->back = sna_dri2_reference_buffer(back);
- 
--	if (immediate_swap(sna, *target_msc, divisor, draw, crtc, &current_msc)) {
-+	if (immediate) {
- 		bool sync = current_msc < *target_msc;
--		if (!sna_dri2_immediate_blit(sna, info, sync, true))
--			sna_dri2_event_free(info);
-+		sna_dri2_immediate_blit(sna, info, sync);
- 		*target_msc = current_msc + sync;
-+		DBG(("%s: reported target_msc=%llu\n",
-+		     __FUNCTION__, *target_msc));
- 		return TRUE;
- 	}
- 
--	vbl.request.type =
--		DRM_VBLANK_ABSOLUTE |
--		DRM_VBLANK_EVENT;
--	vbl.request.signal = (uintptr_t)info;
--
--	/*
--	 * If divisor is zero, or current_msc is smaller than target_msc
--	 * we just need to make sure target_msc passes before initiating
--	 * the swap.
--	 */
- 	info->type = SWAP;
--	info->queued = true;
--	if (divisor && current_msc >= *target_msc) {
--		DBG(("%s: missed target, queueing event for next: current=%lld, target=%lld, divisor=%lld, remainder=%lld\n",
--		     __FUNCTION__,
--		     (long long)current_msc,
--		     (long long)*target_msc,
--		     (long long)divisor,
--		     (long long)remainder));
--
--		*target_msc = current_msc + remainder - current_msc % divisor;
--		if (*target_msc <= current_msc)
--			*target_msc += divisor;
--	}
--	vbl.request.sequence = draw_target_seq(draw, *target_msc - 1);
- 	if (*target_msc <= current_msc + 1) {
- 		DBG(("%s: performing blit before queueing\n", __FUNCTION__));
--		assert(info->queued);
--		info->bo = __sna_dri2_copy_region(sna, draw, NULL,
--						  back, front,
--						  true);
--		info->type = SWAP_WAIT;
--
--		vbl.request.type =
--			DRM_VBLANK_RELATIVE |
--			DRM_VBLANK_EVENT;
--		vbl.request.sequence = 1;
-+		__sna_dri2_copy_event(info, DRI2_SYNC);
-+		info->type = SWAP_COMPLETE;
-+		if (!sna_next_vblank(info))
-+			goto fake;
-+
-+		DBG(("%s: reported target_msc=%llu\n",
-+		     __FUNCTION__, *target_msc));
- 		*target_msc = current_msc + 1;
--	}
-+		swap_limit(draw, 2);
-+	} else {
-+		if (!sna_wait_vblank(info,
-+				     draw_target_seq(draw, *target_msc - 1)))
-+			goto blit;
- 
--	assert(info->queued);
--	if (sna_wait_vblank(sna, &vbl, info->pipe))
--		goto blit;
-+		DBG(("%s: reported target_msc=%llu (in)\n",
-+		     __FUNCTION__, *target_msc));
-+		swap_limit(draw, 1);
-+	}
- 
--	DBG(("%s: reported target_msc=%llu\n", __FUNCTION__, *target_msc));
--	swap_limit(draw, 1 + (info->type == SWAP_WAIT));
- 	return TRUE;
- 
- blit:
- 	DBG(("%s -- blit\n", __FUNCTION__));
--	if (info)
--		sna_dri2_event_free(info);
- 	if (can_xchg(sna, draw, front, back)) {
- 		sna_dri2_xchg(draw, front, back);
- 	} else {
--		__sna_dri2_copy_region(sna, draw, NULL, back, front, false);
-+		__sna_dri2_copy_region(sna, draw, NULL, back, front, 0);
-+		front->flags = back->flags;
- 		type = DRI2_BLIT_COMPLETE;
- 	}
-+	if (draw->type == DRAWABLE_PIXMAP)
-+		goto fake;
- skip:
- 	DBG(("%s: unable to show frame, unblocking client\n", __FUNCTION__));
--	if (crtc == NULL)
--		crtc = sna_mode_first_crtc(sna);
--	fake_swap_complete(sna, client, draw, crtc, type, func, data);
--	*target_msc = 0; /* offscreen, so zero out target vblank count */
-+	if (crtc == NULL && (sna->flags & SNA_NO_WAIT) == 0)
-+		crtc = sna_primary_crtc(sna);
-+	if (crtc && sna_crtc_is_on(crtc)) {
-+		if (info == NULL)
-+			info = sna_dri2_add_event(sna, draw, client, crtc);
-+		if (info != dri2_chain(draw))
-+			goto fake;
-+
-+		assert(info->crtc == crtc);
-+
-+		info->type = SWAP_COMPLETE;
-+		info->event_complete = func;
-+		info->event_data = data;
-+		assert(info->draw);
-+		info->signal = true;
-+
-+		if (info->front == NULL)
-+			info->front = sna_dri2_reference_buffer(front);
-+		if (info->back == NULL)
-+			info->back = sna_dri2_reference_buffer(back);
-+
-+		if (!sna_next_vblank(info))
-+			goto fake;
-+
-+		swap_limit(draw, 1);
-+	} else {
-+fake:
-+		/* XXX Use a Timer to throttle the client? */
-+		fake_swap_complete(sna, client, draw, crtc, type, func, data);
-+		if (info) {
-+			assert(info->draw);
-+			info->signal = false;
-+			sna_dri2_event_free(info);
-+		}
-+	}
-+	DBG(("%s: reported target_msc=%llu (in)\n", __FUNCTION__, *target_msc));
- 	return TRUE;
- }
- 
-@@ -3030,27 +3497,25 @@ sna_dri2_get_msc(DrawablePtr draw, CARD64 *ust, CARD64 *msc)
- 	struct sna *sna = to_sna_from_drawable(draw);
- 	xf86CrtcPtr crtc = sna_dri2_get_crtc(draw);
- 	const struct ust_msc *swap;
-+	union drm_wait_vblank vbl;
- 
- 	DBG(("%s(draw=%ld, pipe=%d)\n", __FUNCTION__, draw->id,
--	     crtc ? sna_crtc_to_pipe(crtc) : -1));
-+	     crtc ? sna_crtc_pipe(crtc) : -1));
- 
--	if (crtc != NULL) {
--		union drm_wait_vblank vbl;
-+	/* Drawable not displayed, make up a *monotonic* value */
-+	if (crtc == NULL)
-+		crtc = sna_primary_crtc(sna);
-+	if (crtc == NULL)
-+		return FALSE;
- 
--		VG_CLEAR(vbl);
--		vbl.request.type = _DRM_VBLANK_RELATIVE;
--		vbl.request.sequence = 0;
--		if (sna_wait_vblank(sna, &vbl, sna_crtc_to_pipe(crtc)) == 0)
--			sna_crtc_record_vblank(crtc, &vbl);
--	} else
--		/* Drawable not displayed, make up a *monotonic* value */
--		crtc = sna_mode_first_crtc(sna);
-+	if (sna_query_vblank(sna, crtc, &vbl) == 0)
-+		sna_crtc_record_vblank(crtc, &vbl);
- 
- 	swap = sna_crtc_last_swap(crtc);
- 	*msc = draw_current_msc(draw, crtc, swap->msc);
- 	*ust = ust64(swap->tv_sec, swap->tv_usec);
--	DBG(("%s: msc=%llu, ust=%llu\n", __FUNCTION__,
--	     (long long)*msc, (long long)*ust));
-+	DBG(("%s: msc=%llu [raw=%llu], ust=%llu\n", __FUNCTION__,
-+	     (long long)*msc, swap->msc, (long long)*ust));
- 	return TRUE;
- }
- 
-@@ -3068,32 +3533,22 @@ sna_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw, CARD64 target_msc
- 	struct sna_dri2_event *info = NULL;
- 	xf86CrtcPtr crtc;
- 	CARD64 current_msc;
--	union drm_wait_vblank vbl;
- 	const struct ust_msc *swap;
--	int pipe;
- 
- 	crtc = sna_dri2_get_crtc(draw);
- 	DBG(("%s(pipe=%d, target_msc=%llu, divisor=%llu, rem=%llu)\n",
--	     __FUNCTION__, crtc ? sna_crtc_to_pipe(crtc) : -1,
-+	     __FUNCTION__, crtc ? sna_crtc_pipe(crtc) : -1,
- 	     (long long)target_msc,
- 	     (long long)divisor,
- 	     (long long)remainder));
- 
- 	/* Drawable not visible, return immediately */
- 	if (crtc == NULL)
--		goto out_complete;
--
--	pipe = sna_crtc_to_pipe(crtc);
--
--	VG_CLEAR(vbl);
--
--	/* Get current count */
--	vbl.request.type = _DRM_VBLANK_RELATIVE;
--	vbl.request.sequence = 0;
--	if (sna_wait_vblank(sna, &vbl, pipe))
--		goto out_complete;
-+		crtc = sna_primary_crtc(sna);
-+	if (crtc == NULL)
-+		return FALSE;
- 
--	current_msc = draw_current_msc(draw, crtc, sna_crtc_record_vblank(crtc, &vbl));
-+	current_msc = get_current_msc(sna, draw, crtc);
- 
- 	/* If target_msc already reached or passed, set it to
- 	 * current_msc to ensure we return a reasonable value back
-@@ -3104,15 +3559,13 @@ sna_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw, CARD64 target_msc
- 	if (divisor == 0 && current_msc >= target_msc)
- 		goto out_complete;
- 
--	info = sna_dri2_add_event(sna, draw, client);
-+	info = sna_dri2_add_event(sna, draw, client, crtc);
- 	if (!info)
- 		goto out_complete;
- 
- 	assert(info->crtc == crtc);
- 	info->type = WAITMSC;
- 
--	vbl.request.signal = (uintptr_t)info;
--	vbl.request.type = DRM_VBLANK_ABSOLUTE | DRM_VBLANK_EVENT;
- 	/*
- 	 * If divisor is zero, or current_msc is smaller than target_msc,
- 	 * we just need to make sure target_msc passes before waking up the
-@@ -3129,10 +3582,8 @@ sna_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw, CARD64 target_msc
- 		if (target_msc <= current_msc)
- 			target_msc += divisor;
- 	}
--	vbl.request.sequence = draw_target_seq(draw, target_msc);
- 
--	info->queued = true;
--	if (sna_wait_vblank(sna, &vbl, pipe))
-+	if (!sna_wait_vblank(info, draw_target_seq(draw, target_msc)))
- 		goto out_free_info;
- 
- 	DRI2BlockClient(client, draw);
-@@ -3141,8 +3592,6 @@ sna_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw, CARD64 target_msc
- out_free_info:
- 	sna_dri2_event_free(info);
- out_complete:
--	if (crtc == NULL)
--		crtc = sna_mode_first_crtc(sna);
- 	swap = sna_crtc_last_swap(crtc);
- 	DRI2WaitMSCComplete(client, draw,
- 			    draw_current_msc(draw, crtc, swap->msc),
-@@ -3231,9 +3680,18 @@ static bool is_level(const char **str)
- 	return false;
- }
- 
-+static const char *options_get_dri(struct sna *sna)
-+{
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,99,901,0)
-+	return xf86GetOptValString(sna->Options, OPTION_DRI);
-+#else
-+	return NULL;
-+#endif
-+}
-+
- static const char *dri_driver_name(struct sna *sna)
- {
--	const char *s = xf86GetOptValString(sna->Options, OPTION_DRI);
-+	const char *s = options_get_dri(sna);
- 
- 	if (is_level(&s)) {
- 		if (sna->kgem.gen < 030)
-@@ -3259,7 +3717,7 @@ bool sna_dri2_open(struct sna *sna, ScreenPtr screen)
- 
- 	if (wedged(sna)) {
- 		xf86DrvMsg(sna->scrn->scrnIndex, X_WARNING,
--			   "loading DRI2 whilst the GPU is wedged.\n");
-+			   "loading DRI2 whilst acceleration is disabled.\n");
- 	}
- 
- 	if (xf86LoaderCheckSymbol("DRI2Version"))
-@@ -3274,7 +3732,7 @@ bool sna_dri2_open(struct sna *sna, ScreenPtr screen)
- 	memset(&info, '\0', sizeof(info));
- 	info.fd = sna->kgem.fd;
- 	info.driverName = dri_driver_name(sna);
--	info.deviceName = intel_get_client_name(sna->dev);
-+	info.deviceName = intel_get_master_name(sna->dev);
- 
- 	DBG(("%s: loading dri driver '%s' [gen=%d] for device '%s'\n",
- 	     __FUNCTION__, info.driverName, sna->kgem.gen, info.deviceName));
-@@ -3299,11 +3757,12 @@ bool sna_dri2_open(struct sna *sna, ScreenPtr screen)
- 	info.numDrivers = 2;
- 	info.driverNames = driverNames;
- 	driverNames[0] = info.driverName;
--	driverNames[1] = info.driverName;
-+	driverNames[1] = "va_gl";
- #endif
- 
- #if DRI2INFOREC_VERSION >= 6
- 	if (xorg_can_triple_buffer()) {
-+		DBG(("%s: enabling Xorg triple buffering\n", __FUNCTION__));
- 		info.version = 6;
- 		info.SwapLimitValidate = sna_dri2_swap_limit_validate;
- 		info.ReuseBufferNotify = sna_dri2_reuse_buffer;
-@@ -3311,8 +3770,10 @@ bool sna_dri2_open(struct sna *sna, ScreenPtr screen)
- #endif
- 
- #if USE_ASYNC_SWAP
-+	DBG(("%s: enabled async swap and buffer age\n", __FUNCTION__));
- 	info.version = 10;
- 	info.scheduleSwap0 = 1;
-+	info.bufferAge = 1;
- #endif
- 
- 	return DRI2ScreenInit(screen, &info);
-diff --git a/src/sna/sna_dri3.c b/src/sna/sna_dri3.c
-index f586e242..ce4970ae 100644
---- a/src/sna/sna_dri3.c
-+++ b/src/sna/sna_dri3.c
-@@ -55,11 +55,14 @@ static inline void mark_dri3_pixmap(struct sna *sna, struct sna_pixmap *priv, st
- 	if (bo->exec)
- 		sna->kgem.flush = 1;
- 	if (bo == priv->gpu_bo)
--		priv->flush |= 3;
-+		priv->flush |= FLUSH_READ | FLUSH_WRITE;
- 	else
- 		priv->shm = true;
- 
--	sna_accel_watch_flush(sna, 1);
-+	sna_watch_flush(sna, 1);
-+
-+	kgem_bo_submit(&sna->kgem, bo);
-+	kgem_bo_unclean(&sna->kgem, bo);
- }
- 
- static void sna_sync_flush(struct sna *sna, struct sna_pixmap *priv)
-@@ -270,6 +273,8 @@ static PixmapPtr sna_dri3_pixmap_from_fd(ScreenPtr screen,
- 		priv->ptr = MAKE_STATIC_PTR(pixmap->devPrivate.ptr);
- 	} else {
- 		assert(priv->gpu_bo == bo);
-+		priv->create = kgem_can_create_2d(&sna->kgem,
-+						  width, height, depth);
- 		priv->pinned |= PIN_DRI3;
- 	}
- 	list_add(&priv->cow_list, &sna->dri3.pixmaps);
-@@ -325,6 +330,15 @@ static int sna_dri3_fd_from_pixmap(ScreenPtr screen,
- 		return -1;
- 	}
- 
-+	if (bo->tiling && !sna->kgem.can_fence) {
-+		if (!sna_pixmap_change_tiling(pixmap, I915_TILING_NONE)) {
-+			DBG(("%s: unable to discard GPU tiling (%d) for DRI3 protocol\n",
-+			     __FUNCTION__, bo->tiling));
-+			return -1;
-+		}
-+		bo = priv->gpu_bo;
-+	}
-+
- 	fd = kgem_bo_export_to_prime(&sna->kgem, bo);
- 	if (fd == -1) {
- 		DBG(("%s: exporting handle=%d to fd failed\n", __FUNCTION__, bo->handle));
-diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
-index 8a3599c7..1b4015de 100644
---- a/src/sna/sna_driver.c
-+++ b/src/sna/sna_driver.c
-@@ -57,6 +57,13 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
- #include <mi.h>
- #include <micmap.h>
- 
-+#if defined(HAVE_X11_EXTENSIONS_DPMSCONST_H)
-+#include <X11/extensions/dpmsconst.h>
-+#else
-+#define DPMSModeOn 0
-+#define DPMSModeOff 3
-+#endif
-+
- #include <sys/ioctl.h>
- #include <sys/fcntl.h>
- #include <sys/poll.h>
-@@ -69,6 +76,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
- #if HAVE_DOT_GIT
- #include "git_version.h"
-+#else
-+#define git_version "not compiled from git"
- #endif
- 
- #ifdef TEARFREE
-@@ -185,12 +194,12 @@ sna_set_fallback_mode(ScrnInfoPtr scrn)
- 
- 	xf86DisableUnusedFunctions(scrn);
- #ifdef RANDR_12_INTERFACE
--	if (get_root_window(scrn->pScreen))
--		xf86RandR12TellChanged(scrn->pScreen);
-+	if (get_root_window(xf86ScrnToScreen(scrn)))
-+		xf86RandR12TellChanged(xf86ScrnToScreen(scrn));
- #endif
- }
- 
--static Bool sna_set_desired_mode(struct sna *sna)
-+static void sna_set_desired_mode(struct sna *sna)
- {
- 	ScrnInfoPtr scrn = sna->scrn;
- 
-@@ -203,7 +212,6 @@ static Bool sna_set_desired_mode(struct sna *sna)
- 	}
- 
- 	sna_mode_check(sna);
--	return TRUE;
- }
- 
- /**
-@@ -222,7 +230,7 @@ static Bool sna_create_screen_resources(ScreenPtr screen)
- 	     screen->width, screen->height, screen->rootDepth));
- 
- 	assert(sna->scrn == xf86ScreenToScrn(screen));
--	assert(sna->scrn->pScreen == screen);
-+	assert(to_screen_from_sna(sna) == screen);
- 
- 	/* free the data used during miInitScreen */
- 	free(screen->devPrivate);
-@@ -273,33 +281,89 @@ static Bool sna_create_screen_resources(ScreenPtr screen)
- 		if (serverGeneration == 1 && (sna->flags & SNA_IS_HOSTED) == 0)
- 			sna_copy_fbcon(sna);
- 
--		(void)sna_set_desired_mode(sna);
-+		sna_set_desired_mode(sna);
- 	}
- 
- 	return TRUE;
- }
- 
--static Bool sna_save_screen(ScreenPtr screen, int mode)
-+static void sna_dpms_set(ScrnInfoPtr scrn, int mode, int flags)
- {
--	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
-+	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
-+	struct sna *sna = to_sna(scrn);
-+	bool changed = false;
-+	int i;
- 
--	DBG(("%s(mode=%d)\n", __FUNCTION__, mode));
-+	DBG(("%s(mode=%d, flags=%d), vtSema=%d => off?=%d\n",
-+	     __FUNCTION__, mode, flags, scrn->vtSema, mode!=DPMSModeOn));
- 	if (!scrn->vtSema)
--		return FALSE;
-+		return;
- 
--	xf86SaveScreen(screen, mode);
--	sna_crtc_config_notify(screen);
--	return TRUE;
-+	/* Opencoded version of xf86DPMSSet().
-+	 *
-+	 * The principle difference is to skip calling crtc->dpms() when
-+	 * turning off the display. This (on recent enough kernels at
-+	 * least) should be equivalent in power consumption, but require
-+	 * less work (hence quicker and less likely to fail) when switching
-+	 * back on.
-+	 */
-+	if (mode != DPMSModeOn) {
-+		if (sna->mode.hidden == 0 && !(sna->flags & SNA_NO_DPMS)) {
-+			DBG(("%s: hiding %d outputs\n",
-+			     __FUNCTION__, config->num_output));
-+			for (i = 0; i < config->num_output; i++) {
-+				xf86OutputPtr output = config->output[i];
-+				if (output->crtc != NULL)
-+					output->funcs->dpms(output, mode);
-+			}
-+			sna->mode.hidden = sna->mode.front_active + 1;
-+			sna->mode.front_active = 0;
-+			changed = true;
-+		}
-+	} else {
-+		/* Re-enable CRTC that have been forced off via other means */
-+		if (sna->mode.hidden != 0) {
-+			DBG(("%s: unhiding %d crtc, %d outputs\n",
-+			     __FUNCTION__, config->num_crtc, config->num_output));
-+			sna->mode.front_active = sna->mode.hidden - 1;
-+			sna->mode.hidden = 0;
-+			for (i = 0; i < config->num_crtc; i++) {
-+				xf86CrtcPtr crtc = config->crtc[i];
-+				if (crtc->enabled)
-+					crtc->funcs->dpms(crtc, mode);
-+			}
-+
-+			for (i = 0; i < config->num_output; i++) {
-+				xf86OutputPtr output = config->output[i];
-+				if (output->crtc != NULL)
-+					output->funcs->dpms(output, mode);
-+			}
-+			changed = true;
-+		}
-+	}
-+
-+	DBG(("%s: hiding outputs? %d, front active? %d, changed? %d\n",
-+	     __FUNCTION__, sna->mode.hidden, sna->mode.front_active, changed));
-+
-+	if (changed)
-+		sna_crtc_config_notify(xf86ScrnToScreen(scrn));
- }
- 
--static void sna_dpms_set(ScrnInfoPtr scrn, int mode, int flags)
-+static Bool sna_save_screen(ScreenPtr screen, int mode)
- {
--	DBG(("%s(mode=%d, flags=%d)\n", __FUNCTION__, mode));
--	if (!scrn->vtSema)
--		return;
-+	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
-+
-+	DBG(("%s(mode=%d [unblank=%d])\n",
-+	     __FUNCTION__, mode, xf86IsUnblank(mode)));
- 
--	xf86DPMSSet(scrn, mode, flags);
--	sna_crtc_config_notify(xf86ScrnToScreen(scrn));
-+	/* We have to unroll xf86SaveScreen() here as it is called
-+	 * by DPMSSet() nullifying our special handling crtc->dpms()
-+	 * in sna_dpms_set().
-+	 */
-+	sna_dpms_set(scrn,
-+		     xf86IsUnblank(mode) ? DPMSModeOn : DPMSModeOff,
-+		     0);
-+	return TRUE;
- }
- 
- static void sna_selftest(void)
-@@ -330,107 +394,6 @@ static void sna_setup_capabilities(ScrnInfoPtr scrn, int fd)
- #endif
- }
- 
--static int
--namecmp(const char *s1, const char *s2)
--{
--	char c1, c2;
--
--	if (!s1 || *s1 == 0) {
--		if (!s2 || *s2 == 0)
--			return 0;
--		else
--			return 1;
--	}
--
--	while (*s1 == '_' || *s1 == ' ' || *s1 == '\t')
--		s1++;
--
--	while (*s2 == '_' || *s2 == ' ' || *s2 == '\t')
--		s2++;
--
--	c1 = isupper(*s1) ? tolower(*s1) : *s1;
--	c2 = isupper(*s2) ? tolower(*s2) : *s2;
--	while (c1 == c2) {
--		if (c1 == '\0')
--			return 0;
--
--		s1++;
--		while (*s1 == '_' || *s1 == ' ' || *s1 == '\t')
--			s1++;
--
--		s2++;
--		while (*s2 == '_' || *s2 == ' ' || *s2 == '\t')
--			s2++;
--
--		c1 = isupper(*s1) ? tolower(*s1) : *s1;
--		c2 = isupper(*s2) ? tolower(*s2) : *s2;
--	}
--
--	return c1 - c2;
--}
--
--static Bool sna_option_cast_to_bool(struct sna *sna, int id, Bool val)
--{
--	const char *str = xf86GetOptValString(sna->Options, id);
--
--	if (str == NULL)
--		return val;
--
--	if (*str == '\0')
--		return TRUE;
--
--	if (namecmp(str, "1") == 0)
--		return TRUE;
--	if (namecmp(str, "on") == 0)
--		return TRUE;
--	if (namecmp(str, "true") == 0)
--		return TRUE;
--	if (namecmp(str, "yes") == 0)
--		return TRUE;
--
--	if (namecmp(str, "0") == 0)
--		return FALSE;
--	if (namecmp(str, "off") == 0)
--		return FALSE;
--	if (namecmp(str, "false") == 0)
--		return FALSE;
--	if (namecmp(str, "no") == 0)
--		return FALSE;
--
--	return val;
--}
--
--static unsigned sna_option_cast_to_unsigned(struct sna *sna, int id, unsigned val)
--{
--	const char *str = xf86GetOptValString(sna->Options, id);
--	unsigned v;
--
--	if (str == NULL || *str == '\0')
--		return val;
--
--	if (namecmp(str, "on") == 0)
--		return val;
--	if (namecmp(str, "true") == 0)
--		return val;
--	if (namecmp(str, "yes") == 0)
--		return val;
--
--	if (namecmp(str, "0") == 0)
--		return 0;
--	if (namecmp(str, "off") == 0)
--		return 0;
--	if (namecmp(str, "false") == 0)
--		return 0;
--	if (namecmp(str, "no") == 0)
--		return 0;
--
--	v = atoi(str);
--	if (v)
--		return v;
--
--	return val;
--}
--
- static Bool fb_supports_depth(int fd, int depth)
- {
- 	struct drm_i915_gem_create create;
-@@ -470,16 +433,24 @@ static void setup_dri(struct sna *sna)
- 	unsigned level;
- 
- 	sna->dri2.available = false;
-+	sna->dri2.enable = false;
- 	sna->dri3.available = false;
-+	sna->dri3.enable = false;
-+	sna->dri3.override = false;
- 
--	level = sna_option_cast_to_unsigned(sna, OPTION_DRI, ~0);
-+	level = intel_option_cast_to_unsigned(sna->Options, OPTION_DRI, DEFAULT_DRI_LEVEL);
- #if HAVE_DRI3
--	if (level >= 3)
--		sna->dri3.available = !!xf86LoadSubModule(sna->scrn, "dri3");
-+	sna->dri3.available = !!xf86LoadSubModule(sna->scrn, "dri3");
-+	sna->dri3.override =
-+		!sna->dri3.available ||
-+		xf86IsOptionSet(sna->Options, OPTION_DRI);
-+	if (level >= 3 && sna->kgem.gen >= 040)
-+		sna->dri3.enable = sna->dri3.available;
- #endif
- #if HAVE_DRI2
-+	sna->dri2.available = !!xf86LoadSubModule(sna->scrn, "dri2");
- 	if (level >= 2)
--		sna->dri2.available = !!xf86LoadSubModule(sna->scrn, "dri2");
-+		sna->dri2.enable = sna->dri2.available;
- #endif
- }
- 
-@@ -498,13 +469,13 @@ static bool enable_tear_free(struct sna *sna)
- 	return ENABLE_TEAR_FREE;
- }
- 
--static void setup_tear_free(struct sna *sna)
-+static bool setup_tear_free(struct sna *sna)
- {
- 	MessageType from;
- 	Bool enable;
- 
- 	if (sna->flags & SNA_LINEAR_FB)
--		return;
-+		return false;
- 
- 	if ((sna->flags & SNA_HAS_FLIP) == 0) {
- 		from = X_PROBED;
-@@ -518,11 +489,12 @@ static void setup_tear_free(struct sna *sna)
- 		from = X_CONFIG;
- 
- 	if (enable)
--		sna->flags |= SNA_TEAR_FREE;
-+		sna->flags |= SNA_WANT_TEAR_FREE | SNA_TEAR_FREE;
- 
- done:
- 	xf86DrvMsg(sna->scrn->scrnIndex, from, "TearFree %sabled\n",
- 		   sna->flags & SNA_TEAR_FREE ? "en" : "dis");
-+	return sna->flags & SNA_TEAR_FREE;
- }
- 
- /**
-@@ -612,8 +584,10 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int probe)
- 	}
- 
- 	intel_detect_chipset(scrn, sna->dev);
--	xf86DrvMsg(scrn->scrnIndex, X_PROBED, "CPU: %s\n",
--		   sna_cpu_features_to_string(sna->cpu_features, buf));
-+	xf86DrvMsg(scrn->scrnIndex, X_PROBED,
-+		   "CPU: %s; using a maximum of %d threads\n",
-+		   sna_cpu_features_to_string(sna->cpu_features, buf),
-+		   sna_use_threads(64*1024, 64*1024, 1));
- 
- 	if (!xf86SetDepthBpp(scrn, 24, 0, 0,
- 			     Support32bppFb |
-@@ -651,18 +625,11 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int probe)
- 	kgem_init(&sna->kgem, fd,
- 		  xf86GetPciInfoForEntity(pEnt->index),
- 		  sna->info->gen);
--	if (xf86ReturnOptValBool(sna->Options, OPTION_ACCEL_DISABLE, FALSE) ||
--	    !sna_option_cast_to_bool(sna, OPTION_ACCEL_METHOD, TRUE)) {
--		xf86DrvMsg(sna->scrn->scrnIndex, X_CONFIG,
--			   "Disabling hardware acceleration.\n");
--		sna->kgem.wedged = true;
--	}
- 
- 	if (xf86ReturnOptValBool(sna->Options, OPTION_TILING_FB, FALSE))
- 		sna->flags |= SNA_LINEAR_FB;
--
--	if (xf86ReturnOptValBool(sna->Options, OPTION_DELETE_DP12, FALSE))
--		sna->flags |= SNA_REMOVE_OUTPUTS;
-+	if (!sna->kgem.can_fence)
-+		sna->flags |= SNA_LINEAR_FB;
- 
- 	if (!xf86ReturnOptValBool(sna->Options, OPTION_SWAPBUFFERS_WAIT, TRUE))
- 		sna->flags |= SNA_NO_WAIT;
-@@ -695,7 +662,8 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int probe)
- 	}
- 	scrn->currentMode = scrn->modes;
- 
--	setup_tear_free(sna);
-+	if (!setup_tear_free(sna) && sna_mode_wants_tear_free(sna))
-+		sna->kgem.needs_dirtyfb = sna->kgem.has_dirtyfb;
- 
- 	xf86SetGamma(scrn, zeros);
- 	xf86SetDpi(scrn, 0, 0);
-@@ -721,11 +689,13 @@ cleanup:
- 	return FALSE;
- }
- 
-+#if !HAVE_NOTIFY_FD
- static bool has_shadow(struct sna *sna)
- {
--	if (!sna->mode.shadow_damage)
-+	if (!sna->mode.shadow_enabled)
- 		return false;
- 
-+	assert(sna->mode.shadow_damage);
- 	if (RegionNil(DamageRegion(sna->mode.shadow_damage)))
- 		return false;
- 
-@@ -748,7 +718,7 @@ sna_block_handler(BLOCKHANDLER_ARGS_DECL)
- 	sna->BlockHandler(BLOCKHANDLER_ARGS);
- 
- 	if (*tv == NULL || ((*tv)->tv_usec | (*tv)->tv_sec) || has_shadow(sna))
--		sna_accel_block_handler(sna, tv);
-+		sna_accel_block(sna, tv);
- }
- 
- static void
-@@ -770,52 +740,102 @@ sna_wakeup_handler(WAKEUPHANDLER_ARGS_DECL)
- 
- 	sna->WakeupHandler(WAKEUPHANDLER_ARGS);
- 
--	sna_accel_wakeup_handler(sna);
--
- 	if (FD_ISSET(sna->kgem.fd, (fd_set*)read_mask)) {
- 		sna_mode_wakeup(sna);
- 		/* Clear the flag so that subsequent ZaphodHeads don't block  */
- 		FD_CLR(sna->kgem.fd, (fd_set*)read_mask);
- 	}
- }
-+#else
-+static void
-+sna_block_handler(void *data, void *_timeout)
-+{
-+	struct sna *sna = data;
-+	int *timeout = _timeout;
-+	struct timeval tv, *tvp;
-+
-+	DBG(("%s (timeout=%d)\n", __FUNCTION__, *timeout));
-+	if (*timeout == 0)
-+		return;
-+
-+	if (*timeout < 0) {
-+		tvp = NULL;
-+	} else {
-+		tv.tv_sec = *timeout / 1000;
-+		tv.tv_usec = (*timeout % 1000) * 1000;
-+		tvp = &tv;
-+	}
-+
-+	sna_accel_block(sna, &tvp);
-+	if (tvp)
-+		*timeout = tvp->tv_sec * 1000 + tvp->tv_usec / 1000;
-+}
-+#endif
- 
- #if HAVE_UDEV
-+#include <sys/stat.h>
-+
- static void
- sna_handle_uevents(int fd, void *closure)
- {
- 	struct sna *sna = closure;
--	struct udev_device *dev;
--	const char *str;
- 	struct stat s;
--	dev_t udev_devnum;
-+	struct pollfd pfd;
-+	bool hotplug = false;
- 
- 	DBG(("%s\n", __FUNCTION__));
- 
--	dev = udev_monitor_receive_device(sna->uevent_monitor);
--	if (!dev)
--		return;
-+	pfd.fd = udev_monitor_get_fd(sna->uevent_monitor);
-+	pfd.events = POLLIN;
-+
-+	if (fstat(sna->kgem.fd, &s))
-+		memset(&s, 0, sizeof(s));
-+
-+	while (poll(&pfd, 1, 0) > 0) {
-+		struct udev_device *dev;
-+		dev_t devnum;
-+
-+		dev = udev_monitor_receive_device(sna->uevent_monitor);
-+		if (dev == NULL)
-+			break;
-+
-+		devnum = udev_device_get_devnum(dev);
-+		if (memcmp(&s.st_rdev, &devnum, sizeof(dev_t)) == 0) {
-+			const char *str;
-+
-+			str = udev_device_get_property_value(dev, "HOTPLUG");
-+			if (str && atoi(str) == 1) {
-+				str = udev_device_get_property_value(dev, "CONNECTOR");
-+				if (str) {
-+					hotplug |= sna_mode_find_hotplug_connector(sna, atoi(str));
-+				} else {
-+					sna->flags |= SNA_REPROBE;
-+					hotplug = true;
-+				}
-+			}
-+		}
- 
--	udev_devnum = udev_device_get_devnum(dev);
--	if (fstat(sna->kgem.fd, &s) || memcmp(&s.st_rdev, &udev_devnum, sizeof (dev_t))) {
- 		udev_device_unref(dev);
--		return;
- 	}
- 
--	str = udev_device_get_property_value(dev, "HOTPLUG");
--	if (str && atoi(str) == 1) {
--		ScrnInfoPtr scrn = sna->scrn;
--
--		DBG(("%s: hotplug event (vtSema?=%d)\n", __FUNCTION__, scrn->vtSema));
-+	if (hotplug) {
-+		DBG(("%s: hotplug event (vtSema?=%d)\n",
-+		     __FUNCTION__, sna->scrn->vtSema));
- 
--		if (scrn->vtSema) {
--			sna_mode_discover(sna);
--			sna_mode_check(sna);
--			RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
--		} else
-+		if (sna->scrn->vtSema)
-+			sna_mode_discover(sna, true);
-+		else
- 			sna->flags |= SNA_REPROBE;
- 	}
-+}
- 
--	udev_device_unref(dev);
-+static bool has_randr(void)
-+{
-+#if HAS_DIXREGISTERPRIVATEKEY
-+	return dixPrivateKeyRegistered(rrPrivKey);
-+#else
-+	return *rrPrivKey;
-+#endif
- }
- 
- static void
-@@ -833,7 +853,7 @@ sna_uevent_init(struct sna *sna)
- 	/* RandR will be disabled if Xinerama is active, and so generating
- 	 * RR hotplug events is then verboten.
- 	 */
--	if (!dixPrivateKeyRegistered(rrPrivKey))
-+	if (!has_randr())
- 		goto out;
- 
- 	u = NULL;
-@@ -861,7 +881,8 @@ sna_uevent_init(struct sna *sna)
- 
- 	sna->uevent_monitor = mon;
- out:
--	xf86DrvMsg(sna->scrn->scrnIndex, from, "display hotplug detection %s\n",
-+	xf86DrvMsg(sna->scrn->scrnIndex, from,
-+		   "Display hotplug detection %s\n",
- 		   sna->uevent_monitor ? "enabled" : "disabled");
- 	return;
- 
-@@ -874,17 +895,10 @@ err_dev:
- 
- static bool sna_uevent_poll(struct sna *sna)
- {
--	struct pollfd pfd;
--
- 	if (sna->uevent_monitor == NULL)
- 		return false;
- 
--	pfd.fd = udev_monitor_get_fd(sna->uevent_monitor);
--	pfd.events = POLLIN;
--
--	while (poll(&pfd, 1, 0) > 0)
--		sna_handle_uevents(pfd.fd, sna);
--
-+	sna_handle_uevents(udev_monitor_get_fd(sna->uevent_monitor), sna);
- 	return true;
- }
- 
-@@ -918,8 +932,10 @@ sna_randr_getinfo(ScreenPtr screen, Rotation *rotations)
- {
- 	struct sna *sna = to_sna_from_screen(screen);
- 
-+	DBG(("%s()\n", __FUNCTION__));
-+
- 	if (!sna_uevent_poll(sna))
--		sna_mode_discover(sna);
-+		sna_mode_discover(sna, false);
- 
- 	return sna->mode.rrGetInfo(screen, rotations);
- }
-@@ -931,8 +947,8 @@ static void sna_leave_vt(VT_FUNC_ARGS_DECL)
- 
- 	DBG(("%s\n", __FUNCTION__));
- 
--	sna_accel_leave(sna);
- 	sna_mode_reset(sna);
-+	sna_accel_leave(sna);
- 
- 	if (intel_put_master(sna->dev))
- 		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-@@ -948,6 +964,12 @@ static Bool sna_early_close_screen(CLOSE_SCREEN_ARGS_DECL)
- 
- 	/* XXX Note that we will leak kernel resources if !vtSema */
- 
-+#if HAVE_NOTIFY_FD
-+	RemoveBlockAndWakeupHandlers(sna_block_handler,
-+				     (ServerWakeupHandlerProcPtr)NoopDDA,
-+				     sna);
-+#endif
-+
- 	sna_uevent_fini(sna);
- 	sna_mode_close(sna);
- 
-@@ -1047,12 +1069,13 @@ static void sna_dri_init(struct sna *sna, ScreenPtr screen)
- {
- 	char str[128] = "";
- 
--	if (sna->dri2.available)
-+	if (sna->dri2.enable)
- 		sna->dri2.open = sna_dri2_open(sna, screen);
- 	if (sna->dri2.open)
- 		strcat(str, "DRI2 ");
- 
--	if (sna->dri3.available)
-+	/* Load DRI3 in case DRI2 doesn't work, e.g. vgaarb */
-+	if (sna->dri3.enable || (!sna->dri2.open && !sna->dri3.override))
- 		sna->dri3.open = sna_dri3_open(sna, screen);
- 	if (sna->dri3.open)
- 		strcat(str, "DRI3 ");
-@@ -1098,7 +1121,8 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL)
- 	DBG(("%s\n", __FUNCTION__));
- 
- 	assert(sna->scrn == scrn);
--	assert(scrn->pScreen == NULL); /* set afterwards */
-+	assert(to_screen_from_sna(sna) == NULL || /* set afterwards */
-+	       to_screen_from_sna(sna) == screen);
- 
- 	assert(sna->freed_pixmap == NULL);
- 
-@@ -1166,11 +1190,17 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL)
- 	 * later memory should be bound when allocating, e.g rotate_mem */
- 	scrn->vtSema = TRUE;
- 
-+#if !HAVE_NOTIFY_FD
- 	sna->BlockHandler = screen->BlockHandler;
- 	screen->BlockHandler = sna_block_handler;
- 
- 	sna->WakeupHandler = screen->WakeupHandler;
- 	screen->WakeupHandler = sna_wakeup_handler;
-+#else
-+	RegisterBlockAndWakeupHandlers(sna_block_handler,
-+				       (ServerWakeupHandlerProcPtr)NoopDDA,
-+				       sna);
-+#endif
- 
- 	screen->SaveScreen = sna_save_screen;
- 	screen->CreateScreenResources = sna_create_screen_resources;
-@@ -1190,6 +1220,8 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL)
- 				 CMAP_PALETTED_TRUECOLOR))
- 		return FALSE;
- 
-+	if (!xf86CheckBoolOption(scrn->options, "dpms", TRUE))
-+		sna->flags |= SNA_NO_DPMS;
- 	xf86DPMSInit(screen, sna_dpms_set, 0);
- 
- 	sna_uevent_init(sna);
-@@ -1244,20 +1276,15 @@ static Bool sna_enter_vt(VT_FUNC_ARGS_DECL)
- 	if (intel_get_master(sna->dev))
- 		return FALSE;
- 
-+	sna_accel_enter(sna);
-+
- 	if (sna->flags & SNA_REPROBE) {
--		DBG(("%s: reporting deferred hotplug event\n",
--		     __FUNCTION__));
--		sna_mode_discover(sna);
--		RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
--		sna->flags &= ~SNA_REPROBE;
-+		DBG(("%s: reporting deferred hotplug event\n", __FUNCTION__));
-+		sna_mode_discover(sna, true);
- 	}
- 
--	if (!sna_set_desired_mode(sna)) {
--		intel_put_master(sna->dev);
--		return FALSE;
--	}
-+	sna_set_desired_mode(sna);
- 
--	sna_accel_enter(sna);
- 	return TRUE;
- }
- 
-@@ -1379,6 +1406,9 @@ static void describe_sna(ScrnInfoPtr scrn)
- 	xf86DrvMsg(scrn->scrnIndex, X_INFO,
- 		   "SNA compiled: %s\n", BUILDER_DESCRIPTION);
- #endif
-+#if HAS_DEBUG_FULL
-+	ErrorF("SNA compiled with full debug logging; expect to run slowly\n");
-+#endif
- #if !NDEBUG
- 	xf86DrvMsg(scrn->scrnIndex, X_INFO,
- 		   "SNA compiled with assertions enabled\n");
-@@ -1400,6 +1430,7 @@ static void describe_sna(ScrnInfoPtr scrn)
- 		   "SNA compiled for use with valgrind\n");
- 	VALGRIND_PRINTF("SNA compiled for use with valgrind\n");
- #endif
-+	DBG(("xf86-video-intel version: %s\n", git_version));
- 	DBG(("pixman version: %s\n", pixman_version_string()));
- }
- 
-diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
-index a5dfb06b..6ee40336 100644
---- a/src/sna/sna_glyphs.c
-+++ b/src/sna/sna_glyphs.c
-@@ -74,7 +74,7 @@
- #define NO_GLYPHS_VIA_MASK 0
- #define FORCE_SMALL_MASK 0 /* -1 = never, 1 = always */
- #define NO_GLYPHS_SLOW 0
--#define NO_DISCARD_MASK 0
-+#define DISCARD_MASK 0 /* -1 = never, 1 = always */
- 
- #define CACHE_PICTURE_SIZE 1024
- #define GLYPH_MIN_SIZE 8
-@@ -185,7 +185,7 @@ void sna_glyphs_close(struct sna *sna)
-  */
- bool sna_glyphs_create(struct sna *sna)
- {
--	ScreenPtr screen = sna->scrn->pScreen;
-+	ScreenPtr screen = to_screen_from_sna(sna);
- 	pixman_color_t white = { 0xffff, 0xffff, 0xffff, 0xffff };
- 	unsigned int formats[] = {
- 		PIXMAN_a8,
-@@ -1094,6 +1094,9 @@ sna_glyph_get_image(GlyphPtr g, ScreenPtr s)
- 
- static inline bool use_small_mask(struct sna *sna, int16_t width, int16_t height, int depth)
- {
-+	if (depth < 8)
-+		return true;
-+
- 	if (FORCE_SMALL_MASK)
- 		return FORCE_SMALL_MASK > 0;
- 
-@@ -1156,12 +1159,6 @@ glyphs_via_mask(struct sna *sna,
- 	src_x += box.x1 - list->xOff;
- 	src_y += box.y1 - list->yOff;
- 
--	if (format->depth < 8) {
--		format = PictureMatchFormat(screen, 8, PICT_a8);
--		if (!format)
--			return false;
--	}
--
- 	component_alpha = NeedsComponent(format->format);
- 	if (use_small_mask(sna, width, height, format->depth)) {
- 		pixman_image_t *mask_image;
-@@ -1179,7 +1176,7 @@ use_small_mask:
- 			return false;
- 
- 		mask_image =
--			pixman_image_create_bits(format->depth << 24 | format->format,
-+			pixman_image_create_bits(pixmap->drawable.bitsPerPixel << 24 | format->format,
- 						 width, height,
- 						 pixmap->devPrivate.ptr,
- 						 pixmap->devKind);
-@@ -1386,10 +1383,11 @@ next_image:
- 					DBG(("%s: atlas format=%08x, mask format=%08x\n",
- 					     __FUNCTION__,
- 					     (int)p->atlas->format,
--					     (int)(format->depth << 24 | format->format)));
-+					     (int)mask->format));
- 
- 					memset(&tmp, 0, sizeof(tmp));
--					if (p->atlas->format == (format->depth << 24 | format->format)) {
-+					if (p->atlas->format == mask->format ||
-+					    alphaless(p->atlas->format) == mask->format) {
- 						ok = sna->render.composite(sna, PictOpAdd,
- 									   p->atlas, NULL, mask,
- 									   0, 0, 0, 0, 0, 0,
-@@ -1561,6 +1559,9 @@ skip_glyph:
- 		}
- 	}
- 
-+	assert(format);
-+	DBG(("%s: format=%08d, depth=%d\n",
-+	     __FUNCTION__, format->format, format->depth));
- out:
- 	if (list_extents != stack_extents)
- 		free(list_extents);
-@@ -1573,24 +1574,34 @@ static bool can_discard_mask(uint8_t op, PicturePtr src, PictFormatPtr mask,
- 	PictFormatPtr g;
- 	uint32_t color;
- 
--	if (NO_DISCARD_MASK)
--		return false;
-+	if (DISCARD_MASK)
-+		return DISCARD_MASK > 0;
- 
- 	DBG(("%s: nlist=%d, mask=%08x, depth %d, op=%d (bounded? %d)\n",
- 	     __FUNCTION__, nlist,
- 	     mask ? (unsigned)mask->format : 0, mask ? mask->depth : 0,
- 	     op, op_is_bounded(op)));
- 
--	if (nlist == 1 && list->len == 1)
--		return true;
-+	if (nlist == 1 && list->len == 1) {
-+		if (mask == list->format)
-+			return true;
-+
-+		g = list->format;
-+		goto skip;
-+	}
- 
--	if (!op_is_bounded(op))
-+	if (!op_is_bounded(op)) {
-+		DBG(("%s: unbounded op, not discarding\n", __FUNCTION__));
- 		return false;
-+	}
- 
- 	/* No glyphs overlap and we are not performing a mask conversion. */
- 	g = glyphs_format(nlist, list, glyphs);
--	if (mask == g)
-+	if (mask == g) {
-+		DBG(("%s: mask matches glyphs format, no conversion, so discard mask\n",
-+		     __FUNCTION__));
- 		return true;
-+	}
- 
- 	DBG(("%s: preferred mask format %08x, depth %d\n",
- 	     __FUNCTION__, g ? (unsigned)g->format : 0,  g ? g->depth : 0));
-@@ -1605,18 +1616,41 @@ static bool can_discard_mask(uint8_t op, PicturePtr src, PictFormatPtr mask,
- 
- 			list++;
- 		}
-+
-+		if (!sna_picture_is_solid(src, &color))
-+			return false;
-+
-+		return color >> 24 == 0xff;
- 	} else {
--		if (PICT_FORMAT_A(mask->format) >= PICT_FORMAT_A(g->format))
-+skip:
-+		if (mask->format == g->format)
- 			return true;
- 
--		if (g->depth != 1)
--			return false;
--	}
-+		if (mask->format == alphaless(g->format))
-+			return true;
-+
-+		if (PICT_FORMAT_TYPE(g->format) == PICT_TYPE_A &&
-+		    PICT_FORMAT_TYPE(mask->format) != PICT_TYPE_A)
-+			return true;
- 
--	if (!sna_picture_is_solid(src, &color))
- 		return false;
-+	}
-+}
- 
--	return color >> 24 == 0xff;
-+static uint32_t pixman_format(PictFormatPtr short_format)
-+{
-+	uint32_t bpp;
-+
-+	bpp = short_format->depth;
-+	if (bpp <= 1)
-+		bpp = 1;
-+	else if (bpp <= 8)
-+		bpp = 8;
-+	else if (bpp <= 16)
-+		bpp = 16;
-+	else
-+		bpp = 32;
-+	return bpp << 24 | short_format->format;
- }
- 
- static void
-@@ -1756,7 +1790,7 @@ next:
- 		if (sigtrap_get() == 0) {
- 			if (mask_format) {
- 				pixman_composite_glyphs(op, src_image, dst_image,
--							mask_format->format | (mask_format->depth << 24),
-+							pixman_format(mask_format),
- 							src_x + src_dx + region.extents.x1 - dst_x,
- 							src_y + src_dy + region.extents.y1 - dst_y,
- 							region.extents.x1, region.extents.y1,
-@@ -1815,10 +1849,10 @@ out:
- 			     x, y,
- 			     mask_format->depth,
- 			     (long)mask_format->format,
--			     (long)(mask_format->depth << 24 | mask_format->format),
-+			     (long)pixman_format(mask_format),
- 			     NeedsComponent(mask_format->format)));
- 			mask_image =
--				pixman_image_create_bits(mask_format->depth << 24 | mask_format->format,
-+				pixman_image_create_bits(pixman_format(mask_format),
- 							 region.extents.x2 - region.extents.x1,
- 							 region.extents.y2 - region.extents.y1,
- 							 NULL, 0);
-@@ -2086,12 +2120,6 @@ glyphs_via_image(struct sna *sna,
- 	src_x += box.x1 - list->xOff;
- 	src_y += box.y1 - list->yOff;
- 
--	if (format->depth < 8) {
--		format = PictureMatchFormat(screen, 8, PICT_a8);
--		if (!format)
--			return false;
--	}
--
- 	DBG(("%s: small mask [format=%lx, depth=%d, size=%d], rendering glyphs to upload buffer\n",
- 	     __FUNCTION__, (unsigned long)format->format,
- 	     format->depth, (uint32_t)width*height*format->depth));
-@@ -2104,7 +2132,7 @@ glyphs_via_image(struct sna *sna,
- 		return false;
- 
- 	mask_image =
--		pixman_image_create_bits(format->depth << 24 | format->format,
-+		pixman_image_create_bits(pixmap->drawable.bitsPerPixel << 24 | format->format,
- 					 width, height,
- 					 pixmap->devPrivate.ptr,
- 					 pixmap->devKind);
-diff --git a/src/sna/sna_io.c b/src/sna/sna_io.c
-index d6aa1294..d32bd583 100644
---- a/src/sna/sna_io.c
-+++ b/src/sna/sna_io.c
-@@ -105,8 +105,10 @@ read_boxes_inplace__cpu(struct kgem *kgem,
- 	if (!download_inplace__cpu(kgem, dst, bo, box, n))
- 		return false;
- 
-+	if (bo->tiling == I915_TILING_Y)
-+		return false;
-+
- 	assert(kgem_bo_can_map__cpu(kgem, bo, false));
--	assert(bo->tiling != I915_TILING_Y);
- 
- 	src = kgem_bo_map__cpu(kgem, bo);
- 	if (src == NULL)
-@@ -281,6 +283,9 @@ fallback:
- 		if (box[n].y2 > extents.y2)
- 			extents.y2 = box[n].y2;
- 	}
-+	if (!can_blt && sna->render.max_3d_size == 0)
-+		goto fallback;
-+
- 	if (kgem_bo_can_map(kgem, src_bo)) {
- 		/* Is it worth detiling? */
- 		if ((extents.y2 - extents.y1 - 1) * src_bo->pitch < 4096)
-@@ -477,6 +482,7 @@ fallback:
- 			goto fallback;
- 		_kgem_set_mode(kgem, KGEM_BLT);
- 	}
-+	kgem_bcs_set_tiling(&sna->kgem, src_bo, NULL);
- 
- 	tmp_nbox = nbox;
- 	tmp_box = box;
-@@ -539,6 +545,7 @@ fallback:
- 				break;
- 
- 			_kgem_set_mode(kgem, KGEM_BLT);
-+			kgem_bcs_set_tiling(&sna->kgem, src_bo, NULL);
- 			tmp_box += nbox_this_time;
- 		} while (1);
- 	} else {
-@@ -597,6 +604,7 @@ fallback:
- 				break;
- 
- 			_kgem_set_mode(kgem, KGEM_BLT);
-+			kgem_bcs_set_tiling(&sna->kgem, src_bo, NULL);
- 			tmp_box += nbox_this_time;
- 		} while (1);
- 	}
-@@ -666,8 +674,10 @@ write_boxes_inplace__tiled(struct kgem *kgem,
- {
- 	uint8_t *dst;
- 
-+	if (bo->tiling == I915_TILING_Y)
-+		return false;
-+
- 	assert(kgem->has_wc_mmap || kgem_bo_can_map__cpu(kgem, bo, true));
--	assert(bo->tiling != I915_TILING_Y);
- 
- 	if (kgem_bo_can_map__cpu(kgem, bo, true)) {
- 		dst = kgem_bo_map__cpu(kgem, bo);
-@@ -778,6 +788,15 @@ static bool __upload_inplace(struct kgem *kgem,
- 	if (FORCE_INPLACE)
- 		return FORCE_INPLACE > 0;
- 
-+	if (bo->exec)
-+		return false;
-+
-+	if (bo->flush)
-+		return true;
-+
-+	if (kgem_bo_can_map__cpu(kgem, bo, true))
-+		return true;
-+
- 	/* If we are writing through the GTT, check first if we might be
- 	 * able to almagamate a series of small writes into a single
- 	 * operation.
-@@ -849,6 +868,8 @@ bool sna_write_boxes(struct sna *sna, PixmapPtr dst,
- 		if (box[n].y2 > extents.y2)
- 			extents.y2 = box[n].y2;
- 	}
-+	if (!can_blt && sna->render.max_3d_size == 0)
-+		goto fallback;
- 
- 	/* Try to avoid switching rings... */
- 	if (!can_blt || kgem->ring == KGEM_RENDER ||
-@@ -1038,6 +1059,7 @@ tile:
- 			goto fallback;
- 		_kgem_set_mode(kgem, KGEM_BLT);
- 	}
-+	kgem_bcs_set_tiling(&sna->kgem, NULL, dst_bo);
- 
- 	if (kgem->gen >= 0100) {
- 		cmd |= 8;
-@@ -1129,6 +1151,7 @@ tile:
- 			if (nbox) {
- 				_kgem_submit(kgem);
- 				_kgem_set_mode(kgem, KGEM_BLT);
-+				kgem_bcs_set_tiling(&sna->kgem, NULL, dst_bo);
- 			}
- 
- 			kgem_bo_destroy(kgem, src_bo);
-@@ -1224,6 +1247,7 @@ tile:
- 			if (nbox) {
- 				_kgem_submit(kgem);
- 				_kgem_set_mode(kgem, KGEM_BLT);
-+				kgem_bcs_set_tiling(&sna->kgem, NULL, dst_bo);
- 			}
- 
- 			kgem_bo_destroy(kgem, src_bo);
-@@ -1541,6 +1565,7 @@ tile:
- 			goto fallback;
- 		_kgem_set_mode(kgem, KGEM_BLT);
- 	}
-+	kgem_bcs_set_tiling(&sna->kgem, NULL, dst_bo);
- 
- 	if (sna->kgem.gen >= 0100) {
- 		cmd |= 8;
-@@ -1636,6 +1661,7 @@ tile:
- 			if (nbox) {
- 				_kgem_submit(kgem);
- 				_kgem_set_mode(kgem, KGEM_BLT);
-+				kgem_bcs_set_tiling(&sna->kgem, NULL, dst_bo);
- 			}
- 
- 			kgem_bo_destroy(kgem, src_bo);
-@@ -1732,6 +1758,7 @@ tile:
- 			if (nbox) {
- 				_kgem_submit(kgem);
- 				_kgem_set_mode(kgem, KGEM_BLT);
-+				kgem_bcs_set_tiling(&sna->kgem, NULL, dst_bo);
- 			}
- 
- 			kgem_bo_destroy(kgem, src_bo);
-diff --git a/src/sna/sna_present.c b/src/sna/sna_present.c
-index 6dd6fe88..2796d972 100644
---- a/src/sna/sna_present.c
-+++ b/src/sna/sna_present.c
-@@ -27,6 +27,7 @@
- #include <sys/types.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <sys/poll.h>
- #include <errno.h>
- #include <xf86drm.h>
- 
-@@ -38,21 +39,73 @@
- static present_screen_info_rec present_info;
- 
- struct sna_present_event {
--	uint64_t event_id;
- 	xf86CrtcPtr crtc;
-+	struct sna *sna;
-+	struct list link;
-+	uint64_t *event_id;
-+	uint64_t target_msc;
-+	int n_event_id;
-+	bool queued;
- };
- 
-+static void sna_present_unflip(ScreenPtr screen, uint64_t event_id);
-+static bool sna_present_queue(struct sna_present_event *info,
-+			      uint64_t last_msc);
-+
- static inline struct sna_present_event *
- to_present_event(uintptr_t  data)
- {
- 	return (struct sna_present_event *)(data & ~3);
- }
- 
-+static struct sna_present_event *info_alloc(struct sna *sna)
-+{
-+	struct sna_present_event *info;
-+
-+	info = sna->present.freed_info;
-+	if (info) {
-+		sna->present.freed_info = NULL;
-+		return info;
-+	}
-+
-+	return malloc(sizeof(struct sna_present_event) + sizeof(uint64_t));
-+}
-+
-+static void info_free(struct sna_present_event *info)
-+{
-+	struct sna *sna = info->sna;
-+
-+	if (sna->present.freed_info)
-+		free(sna->present.freed_info);
-+
-+	sna->present.freed_info = info;
-+}
-+
-+static inline bool msc_before(uint64_t msc, uint64_t target)
-+{
-+	return (int64_t)(msc - target) < 0;
-+}
-+
- #define MARK_PRESENT(x) ((void *)((uintptr_t)(x) | 2))
- 
--static int pipe_from_crtc(RRCrtcPtr crtc)
-+static inline xf86CrtcPtr unmask_crtc(xf86CrtcPtr crtc)
-+{
-+	return (xf86CrtcPtr)((uintptr_t)crtc & ~1);
-+}
-+
-+static inline xf86CrtcPtr mark_crtc(xf86CrtcPtr crtc)
-+{
-+	return (xf86CrtcPtr)((uintptr_t)crtc | 1);
-+}
-+
-+static inline bool has_vblank(xf86CrtcPtr crtc)
-+{
-+	return (uintptr_t)crtc & 1;
-+}
-+
-+static inline int pipe_from_crtc(RRCrtcPtr crtc)
- {
--	return crtc ? sna_crtc_to_pipe(crtc->devPrivate) : -1;
-+	return crtc ? sna_crtc_pipe(crtc->devPrivate) : -1;
- }
- 
- static uint32_t pipe_select(int pipe)
-@@ -74,6 +127,215 @@ static inline int sna_wait_vblank(struct sna *sna, union drm_wait_vblank *vbl, i
- 	return drmIoctl(sna->kgem.fd, DRM_IOCTL_WAIT_VBLANK, vbl);
- }
- 
-+static uint64_t gettime_ust64(void)
-+{
-+	struct timespec tv;
-+
-+	if (clock_gettime(CLOCK_MONOTONIC, &tv))
-+		return GetTimeInMicros();
-+
-+	return ust64(tv.tv_sec, tv.tv_nsec / 1000);
-+}
-+
-+static void vblank_complete(struct sna_present_event *info,
-+			    uint64_t ust, uint64_t msc)
-+{
-+	int n;
-+
-+	if (msc_before(msc, info->target_msc)) {
-+		DBG(("%s: event=%d too early, now %lld, expected %lld\n",
-+		     __FUNCTION__,
-+		     info->event_id[0],
-+		     (long long)msc, (long long)info->target_msc));
-+		if (sna_present_queue(info, msc))
-+			return;
-+	}
-+
-+	DBG(("%s: %d events complete\n", __FUNCTION__, info->n_event_id));
-+	for (n = 0; n < info->n_event_id; n++) {
-+		DBG(("%s: pipe=%d tv=%d.%06d msc=%lld (target=%lld), event=%lld complete%s\n", __FUNCTION__,
-+		     sna_crtc_pipe(info->crtc),
-+		     (int)(ust / 1000000), (int)(ust % 1000000),
-+		     (long long)msc, (long long)info->target_msc,
-+		     (long long)info->event_id[n],
-+		     info->target_msc && msc == (uint32_t)info->target_msc ? "" : ": MISS"));
-+		present_event_notify(info->event_id[n], ust, msc);
-+	}
-+	if (info->n_event_id > 1)
-+		free(info->event_id);
-+	list_del(&info->link);
-+	info_free(info);
-+}
-+
-+static uint32_t msc_to_delay(xf86CrtcPtr crtc, uint64_t target)
-+{
-+	const DisplayModeRec *mode = &crtc->desiredMode;
-+	const struct ust_msc *swap = sna_crtc_last_swap(crtc);
-+	int64_t delay, subframe;
-+
-+	assert(mode->Clock);
-+
-+	delay = target - swap->msc;
-+	assert(delay >= 0);
-+	if (delay > 1) { /* try to use the hw vblank for the last frame */
-+		delay--;
-+		subframe = 0;
-+	} else {
-+		subframe = gettime_ust64() - swap_ust(swap);
-+		subframe += 500;
-+		subframe /= 1000;
-+	}
-+	delay *= mode->VTotal * mode->HTotal / mode->Clock;
-+	if (subframe < delay)
-+		delay -= subframe;
-+	else
-+		delay = 0;
-+
-+	DBG(("%s: sleep %d frames, %llu ms\n", __FUNCTION__,
-+	     (int)(target - swap->msc), (long long)delay));
-+	assert(delay >= 0);
-+	return MIN(delay, INT32_MAX);
-+}
-+
-+static CARD32 sna_fake_vblank_handler(OsTimerPtr timer, CARD32 now, void *data)
-+{
-+	struct sna_present_event *info = data;
-+	union drm_wait_vblank vbl;
-+	uint64_t msc, ust;
-+
-+	DBG(("%s(event=%lldx%d, now=%d)\n", __FUNCTION__, (long long)info->event_id[0], info->n_event_id, now));
-+
-+	VG_CLEAR(vbl);
-+	vbl.request.type = DRM_VBLANK_RELATIVE;
-+	vbl.request.sequence = 0;
-+	if (sna_wait_vblank(info->sna, &vbl, sna_crtc_pipe(info->crtc)) == 0) {
-+		ust = ust64(vbl.reply.tval_sec, vbl.reply.tval_usec);
-+		msc = sna_crtc_record_vblank(info->crtc, &vbl);
-+		DBG(("%s: event=%lld, target msc=%lld, now %lld\n",
-+		     __FUNCTION__, (long long)info->event_id[0], (long long)info->target_msc, (long long)msc));
-+		if (msc_before(msc, info->target_msc)) {
-+			int delta = info->target_msc - msc;
-+			uint32_t delay;
-+
-+			DBG(("%s: too early, requeuing delta=%d\n", __FUNCTION__, delta));
-+			assert(info->target_msc - msc < 1ull<<31);
-+			if (delta <= 2) {
-+				vbl.request.type = DRM_VBLANK_ABSOLUTE | DRM_VBLANK_EVENT;
-+				vbl.request.sequence = info->target_msc;
-+				vbl.request.signal = (uintptr_t)MARK_PRESENT(info);
-+				if (sna_wait_vblank(info->sna, &vbl, sna_crtc_pipe(info->crtc)) == 0) {
-+					DBG(("%s: scheduled new vblank event for %lld\n", __FUNCTION__, (long long)info->target_msc));
-+					info->queued = true;
-+					if (delta == 1) {
-+						sna_crtc_set_vblank(info->crtc);
-+						info->crtc = mark_crtc(info->crtc);
-+					}
-+					free(timer);
-+					return 0;
-+				}
-+			}
-+
-+			delay = msc_to_delay(info->crtc, info->target_msc);
-+			if (delay) {
-+				DBG(("%s: requeueing timer for %dms delay\n", __FUNCTION__, delay));
-+				return delay;
-+			}
-+
-+			/* As a last resort use a blocking wait.
-+			 * Less than a millisecond for (hopefully) a rare case.
-+			 */
-+			DBG(("%s: blocking wait!\n", __FUNCTION__));
-+			vbl.request.type = DRM_VBLANK_ABSOLUTE;
-+			vbl.request.sequence = info->target_msc;
-+			if (sna_wait_vblank(info->sna, &vbl, sna_crtc_pipe(info->crtc)) == 0) {
-+				ust = ust64(vbl.reply.tval_sec, vbl.reply.tval_usec);
-+				msc = sna_crtc_record_vblank(info->crtc, &vbl);
-+			} else {
-+				DBG(("%s: blocking wait failed, fudging\n",
-+				     __FUNCTION__));
-+				goto fixup;
-+			}
-+		}
-+	} else {
-+fixup:
-+		ust = gettime_ust64();
-+		msc = info->target_msc;
-+		DBG(("%s: event=%lld, CRTC OFF, target msc=%lld, was %lld (off)\n",
-+		     __FUNCTION__, (long long)info->event_id[0], (long long)info->target_msc, (long long)sna_crtc_last_swap(info->crtc)->msc));
-+	}
-+
-+	vblank_complete(info, ust, msc);
-+	free(timer);
-+	return 0;
-+}
-+
-+static bool sna_fake_vblank(struct sna_present_event *info)
-+{
-+	const struct ust_msc *swap = sna_crtc_last_swap(info->crtc);
-+	uint32_t delay;
-+
-+	if (msc_before(swap->msc, info->target_msc))
-+		delay = msc_to_delay(info->crtc, info->target_msc);
-+	else
-+		delay = 0;
-+
-+	DBG(("%s(event=%lldx%d, target_msc=%lld, msc=%lld, delay=%ums)\n",
-+	     __FUNCTION__, (long long)info->event_id[0], info->n_event_id,
-+	     (long long)info->target_msc, (long long)swap->msc, delay));
-+	if (delay == 0) {
-+		uint64_t ust, msc;
-+
-+		if (msc_before(swap->msc, info->target_msc)) {
-+			/* Fixup and pretend it completed immediately */
-+			msc = info->target_msc;
-+			ust = gettime_ust64();
-+		} else {
-+			msc = swap->msc;
-+			ust = swap_ust(swap);
-+		}
-+
-+		vblank_complete(info, ust, msc);
-+		return true;
-+	}
-+
-+	return TimerSet(NULL, 0, delay, sna_fake_vblank_handler, info);
-+}
-+
-+static bool sna_present_queue(struct sna_present_event *info,
-+			      uint64_t last_msc)
-+{
-+	union drm_wait_vblank vbl;
-+	int delta = info->target_msc - last_msc;
-+
-+	DBG(("%s: target msc=%llu, seq=%u (last_msc=%llu), delta=%d\n",
-+	     __FUNCTION__,
-+	     (long long)info->target_msc,
-+	     (unsigned)info->target_msc,
-+	     (long long)last_msc,
-+	     delta));
-+	assert(info->target_msc - last_msc < 1ull<<31);
-+	assert(delta >= 0);
-+
-+	VG_CLEAR(vbl);
-+	vbl.request.type = DRM_VBLANK_ABSOLUTE | DRM_VBLANK_EVENT;
-+	vbl.request.sequence = info->target_msc;
-+	vbl.request.signal = (uintptr_t)MARK_PRESENT(info);
-+	if (delta > 2 ||
-+	    sna_wait_vblank(info->sna, &vbl, sna_crtc_pipe(info->crtc))) {
-+		DBG(("%s: vblank enqueue failed, faking delta=%d\n", __FUNCTION__, delta));
-+		if (!sna_fake_vblank(info))
-+			return false;
-+	} else {
-+		info->queued = true;
-+		if (delta == 1) {
-+			sna_crtc_set_vblank(info->crtc);
-+			info->crtc = mark_crtc(info->crtc);
-+		}
-+	}
-+
-+	return true;
-+}
-+
- static RRCrtcPtr
- sna_present_get_crtc(WindowPtr window)
- {
-@@ -81,7 +343,10 @@ sna_present_get_crtc(WindowPtr window)
- 	BoxRec box;
- 	xf86CrtcPtr crtc;
- 
--	DBG(("%s\n", __FUNCTION__));
-+	DBG(("%s: window=%ld (pixmap=%ld), box=(%d, %d)x(%d, %d)\n",
-+	     __FUNCTION__, window->drawable.id, get_window_pixmap(window)->drawable.serialNumber,
-+	     window->drawable.x, window->drawable.y,
-+	     window->drawable.width, window->drawable.height));
- 
- 	box.x1 = window->drawable.x;
- 	box.y1 = window->drawable.y;
-@@ -99,26 +364,59 @@ static int
- sna_present_get_ust_msc(RRCrtcPtr crtc, CARD64 *ust, CARD64 *msc)
- {
- 	struct sna *sna = to_sna_from_screen(crtc->pScreen);
--	int pipe = pipe_from_crtc(crtc);
- 	union drm_wait_vblank vbl;
- 
--	DBG(("%s(pipe=%d)\n", __FUNCTION__, pipe));
-+	DBG(("%s(pipe=%d)\n", __FUNCTION__, sna_crtc_pipe(crtc->devPrivate)));
-+	if (sna_crtc_has_vblank(crtc->devPrivate)) {
-+		DBG(("%s: vblank active, reusing last swap msc/ust\n",
-+		     __FUNCTION__));
-+		goto last;
-+	}
- 
- 	VG_CLEAR(vbl);
- 	vbl.request.type = DRM_VBLANK_RELATIVE;
- 	vbl.request.sequence = 0;
--	if (sna_wait_vblank(sna, &vbl, pipe) == 0) {
-+	if (sna_wait_vblank(sna, &vbl, sna_crtc_pipe(crtc->devPrivate)) == 0) {
-+		struct sna_present_event *info;
-+
- 		*ust = ust64(vbl.reply.tval_sec, vbl.reply.tval_usec);
- 		*msc = sna_crtc_record_vblank(crtc->devPrivate, &vbl);
-+
-+		info = info_alloc(sna);
-+		if (info) {
-+			info->crtc = crtc->devPrivate;
-+			info->sna = sna;
-+			info->target_msc = *msc + 1;
-+			info->event_id = (uint64_t *)(info + 1);
-+			info->n_event_id = 0;
-+
-+			vbl.request.type =
-+				DRM_VBLANK_ABSOLUTE | DRM_VBLANK_EVENT;
-+			vbl.request.sequence = info->target_msc;
-+			vbl.request.signal = (uintptr_t)MARK_PRESENT(info);
-+
-+			if (sna_wait_vblank(info->sna, &vbl,
-+					    sna_crtc_pipe(info->crtc)) == 0) {
-+				list_add(&info->link,
-+					 &sna->present.vblank_queue);
-+				info->queued = true;
-+				sna_crtc_set_vblank(info->crtc);
-+				info->crtc = mark_crtc(info->crtc);
-+			} else
-+				info_free(info);
-+		}
- 	} else {
--		const struct ust_msc *swap = sna_crtc_last_swap(crtc->devPrivate);
--		*ust = ust64(swap->tv_sec, swap->tv_usec);
-+		const struct ust_msc *swap;
-+last:
-+		swap = sna_crtc_last_swap(crtc->devPrivate);
-+		*ust = swap_ust(swap);
- 		*msc = swap->msc;
- 	}
- 
--	DBG(("%s: pipe=%d, tv=%d.%06d msc=%lld\n", __FUNCTION__, pipe,
-+	DBG(("%s: pipe=%d, tv=%d.%06d seq=%d msc=%lld\n", __FUNCTION__,
-+	     sna_crtc_pipe(crtc->devPrivate),
- 	     (int)(*ust / 1000000), (int)(*ust % 1000000),
--	     (long long)*msc));
-+	     vbl.reply.sequence, (long long)*msc));
- 
- 	return Success;
- }
-@@ -127,43 +425,106 @@ void
- sna_present_vblank_handler(struct drm_event_vblank *event)
- {
- 	struct sna_present_event *info = to_present_event(event->user_data);
-+	uint64_t msc;
- 
--	DBG(("%s: pipe=%d tv=%d.%06d msc=%d, event %lld complete\n", __FUNCTION__,
--	     sna_crtc_to_pipe(info->crtc),
--	     event->tv_sec, event->tv_usec, event->sequence,
--	     (long long)info->event_id));
--	present_event_notify(info->event_id,
--			     ust64(event->tv_sec, event->tv_usec),
--			     sna_crtc_record_event(info->crtc, event));
--	free(info);
-+	if (!info->queued) {
-+		DBG(("%s: arrived unexpectedly early (not queued)\n", __FUNCTION__));
-+		assert(!has_vblank(info->crtc));
-+		return;
-+	}
-+
-+	if (has_vblank(info->crtc)) {
-+		DBG(("%s: clearing immediate flag\n", __FUNCTION__));
-+		info->crtc = unmask_crtc(info->crtc);
-+		sna_crtc_clear_vblank(info->crtc);
-+	}
-+
-+	msc = sna_crtc_record_event(info->crtc, event);
-+
-+	if (info->sna->mode.shadow_wait) {
-+		DBG(("%s: recursed from TearFree\n", __FUNCTION__));
-+		if (TimerSet(NULL, 0, 1, sna_fake_vblank_handler, info))
-+			return;
-+	}
-+
-+	vblank_complete(info, ust64(event->tv_sec, event->tv_usec), msc);
- }
- 
- static int
- sna_present_queue_vblank(RRCrtcPtr crtc, uint64_t event_id, uint64_t msc)
- {
- 	struct sna *sna = to_sna_from_screen(crtc->pScreen);
--	struct sna_present_event *event;
--	union drm_wait_vblank vbl;
--
--	DBG(("%s(pipe=%d, event=%lld, msc=%lld)\n",
--	     __FUNCTION__, pipe_from_crtc(crtc),
--	     (long long)event_id, (long long)msc));
-+	struct sna_present_event *info, *tmp;
-+	const struct ust_msc *swap;
- 
--	event = malloc(sizeof(struct sna_present_event));
--	if (event == NULL)
-+	if (!sna_crtc_is_on(crtc->devPrivate))
- 		return BadAlloc;
- 
--	event->event_id = event_id;
--	event->crtc = crtc->devPrivate;
-+	swap = sna_crtc_last_swap(crtc->devPrivate);
-+	DBG(("%s(pipe=%d, event=%lld, msc=%lld, last swap=%lld)\n",
-+	     __FUNCTION__, sna_crtc_pipe(crtc->devPrivate),
-+	     (long long)event_id, (long long)msc, (long long)swap->msc));
- 
--	VG_CLEAR(vbl);
--	vbl.request.type = DRM_VBLANK_ABSOLUTE | DRM_VBLANK_EVENT;
--	vbl.request.sequence = msc;
--	vbl.request.signal = (uintptr_t)MARK_PRESENT(event);
--	if (sna_wait_vblank(sna, &vbl, sna_crtc_to_pipe(event->crtc))) {
--		DBG(("%s: vblank enqueue failed\n", __FUNCTION__));
--		free(event);
--		return BadMatch;
-+	if (warn_unless((int64_t)(msc - swap->msc) >= 0)) {
-+		DBG(("%s: pipe=%d tv=%d.%06d msc=%lld (target=%lld), event=%lld complete\n", __FUNCTION__,
-+		     sna_crtc_pipe(crtc->devPrivate),
-+		     swap->tv_sec, swap->tv_usec,
-+		     (long long)swap->msc, (long long)msc,
-+		     (long long)event_id));
-+		present_event_notify(event_id, swap_ust(swap), swap->msc);
-+		return Success;
-+	}
-+	if (warn_unless(msc - swap->msc < 1ull<<31))
-+		return BadValue;
-+
-+	list_for_each_entry(tmp, &sna->present.vblank_queue, link) {
-+		if (tmp->target_msc == msc &&
-+		    unmask_crtc(tmp->crtc) == crtc->devPrivate) {
-+			uint64_t *events = tmp->event_id;
-+
-+			if (tmp->n_event_id &&
-+			    is_power_of_two(tmp->n_event_id)) {
-+				events = malloc(2*sizeof(uint64_t)*tmp->n_event_id);
-+				if (events == NULL)
-+					return BadAlloc;
-+
-+				memcpy(events,
-+				       tmp->event_id,
-+				       tmp->n_event_id*sizeof(uint64_t));
-+				if (tmp->n_event_id != 1)
-+					free(tmp->event_id);
-+				tmp->event_id = events;
-+			}
-+
-+			DBG(("%s: appending event=%lld to vblank %lld x %d\n",
-+			     __FUNCTION__, (long long)event_id, (long long)msc, tmp->n_event_id+1));
-+			events[tmp->n_event_id++] = event_id;
-+			return Success;
-+		}
-+		if ((int64_t)(tmp->target_msc - msc) > 0) {
-+			DBG(("%s: previous target_msc=%lld invalid for coalescing\n",
-+			     __FUNCTION__, (long long)tmp->target_msc));
-+			break;
-+		}
-+	}
-+
-+	info = info_alloc(sna);
-+	if (info == NULL)
-+		return BadAlloc;
-+
-+	info->crtc = crtc->devPrivate;
-+	info->sna = sna;
-+	info->target_msc = msc;
-+	info->event_id = (uint64_t *)(info + 1);
-+	info->event_id[0] = event_id;
-+	info->n_event_id = 1;
-+	list_add_tail(&info->link, &tmp->link);
-+	info->queued = false;
-+
-+	if (!sna_present_queue(info, swap->msc)) {
-+		list_del(&info->link);
-+		info_free(info);
-+		return BadAlloc;
- 	}
- 
- 	return Success;
-@@ -180,14 +541,6 @@ sna_present_abort_vblank(RRCrtcPtr crtc, uint64_t event_id, uint64_t msc)
- static void
- sna_present_flush(WindowPtr window)
- {
--	PixmapPtr pixmap = get_window_pixmap(window);
--	struct sna_pixmap *priv;
--
--	DBG(("%s(pixmap=%ld)\n", __FUNCTION__, pixmap->drawable.serialNumber));
--
--	priv = sna_pixmap_move_to_gpu(pixmap, MOVE_READ | MOVE_ASYNC_HINT | __MOVE_FORCE);
--	if (priv && priv->gpu_bo)
--		kgem_scanout_flush(&to_sna_from_pixmap(pixmap)->kgem, priv->gpu_bo);
- }
- 
- static bool
-@@ -201,8 +554,13 @@ check_flip__crtc(struct sna *sna,
- 
- 	assert(sna->scrn->vtSema);
- 
--	if (sna->mode.shadow_active) {
--		DBG(("%s: shadow buffer active\n", __FUNCTION__));
-+	if (!sna->mode.front_active) {
-+		DBG(("%s: DPMS off, no flips\n", __FUNCTION__));
-+		return FALSE;
-+	}
-+
-+	if (sna->mode.rr_active) {
-+		DBG(("%s: RandR transformation active\n", __FUNCTION__));
- 		return false;
- 	}
- 
-@@ -224,6 +582,11 @@ sna_present_check_flip(RRCrtcPtr crtc,
- 	     pixmap->drawable.serialNumber,
- 	     sync_flip));
- 
-+	if (!sna->scrn->vtSema) {
-+		DBG(("%s: VT switched away, no flips\n", __FUNCTION__));
-+		return FALSE;
-+	}
-+
- 	if (sna->flags & SNA_NO_FLIP) {
- 		DBG(("%s: flips not suported\n", __FUNCTION__));
- 		return FALSE;
-@@ -231,7 +594,7 @@ sna_present_check_flip(RRCrtcPtr crtc,
- 
- 	if (sync_flip) {
- 		if ((sna->flags & SNA_HAS_FLIP) == 0) {
--			DBG(("%s: async flips not suported\n", __FUNCTION__));
-+			DBG(("%s: sync flips not suported\n", __FUNCTION__));
- 			return FALSE;
- 		}
- 	} else {
-@@ -257,24 +620,39 @@ sna_present_check_flip(RRCrtcPtr crtc,
- 		return FALSE;
- 	}
- 
--	return TRUE;
--}
--
--static uint64_t gettime_ust64(void)
--{
--	struct timespec tv;
-+	if (flip->pinned) {
-+		assert(flip->gpu_bo);
-+		if (sna->flags & SNA_LINEAR_FB) {
-+			if (flip->gpu_bo->tiling != I915_TILING_NONE) {
-+				DBG(("%s: pined bo, tilng=%d needs NONE\n",
-+				     __FUNCTION__, flip->gpu_bo->tiling));
-+				return FALSE;
-+			}
-+		} else {
-+			if (!sna->kgem.can_scanout_y &&
-+			    flip->gpu_bo->tiling == I915_TILING_Y) {
-+				DBG(("%s: pined bo, tilng=%d and can't scanout Y\n",
-+				     __FUNCTION__, flip->gpu_bo->tiling));
-+				return FALSE;
-+			}
-+		}
- 
--	if (clock_gettime(CLOCK_MONOTONIC, &tv))
--		return 0;
-+		if (flip->gpu_bo->pitch & 63) {
-+			DBG(("%s: pined bo, bad pitch=%d\n",
-+			     __FUNCTION__, flip->gpu_bo->pitch));
-+			return FALSE;
-+		}
-+	}
- 
--	return ust64(tv.tv_sec, tv.tv_nsec / 1000);
-+	return TRUE;
- }
- 
- static Bool
--page_flip__async(RRCrtcPtr crtc,
--		 uint64_t event_id,
--		 uint64_t target_msc,
--		 struct kgem_bo *bo)
-+flip__async(struct sna *sna,
-+	    RRCrtcPtr crtc,
-+	    uint64_t event_id,
-+	    uint64_t target_msc,
-+	    struct kgem_bo *bo)
- {
- 	DBG(("%s(pipe=%d, event=%lld, handle=%d)\n",
- 	     __FUNCTION__,
-@@ -282,17 +660,17 @@ page_flip__async(RRCrtcPtr crtc,
- 	     (long long)event_id,
- 	     bo->handle));
- 
--	if (!sna_page_flip(to_sna_from_screen(crtc->pScreen), bo, NULL, NULL)) {
-+	if (!sna_page_flip(sna, bo, NULL, NULL)) {
- 		DBG(("%s: async pageflip failed\n", __FUNCTION__));
- 		present_info.capabilities &= ~PresentCapabilityAsync;
- 		return FALSE;
- 	}
- 
--	DBG(("%s: pipe=%d tv=%d.%06d msc=%d, event %lld complete\n", __FUNCTION__,
-+	DBG(("%s: pipe=%d tv=%ld.%06d msc=%lld (target=%lld), event=%lld complete\n", __FUNCTION__,
- 	     pipe_from_crtc(crtc),
--	     gettime_ust64() / 1000000, gettime_ust64() % 1000000,
--	     sna_crtc_last_swap(crtc->devPrivate)->msc,
--	     (long long)event_id));
-+	     (long)(gettime_ust64() / 1000000), (int)(gettime_ust64() % 1000000),
-+	     crtc ? (long long)sna_crtc_last_swap(crtc->devPrivate)->msc : 0LL,
-+	     (long long)target_msc, (long long)event_id));
- 	present_event_notify(event_id, gettime_ust64(), target_msc);
- 	return TRUE;
- }
-@@ -303,7 +681,12 @@ present_flip_handler(struct drm_event_vblank *event, void *data)
- 	struct sna_present_event *info = data;
- 	struct ust_msc swap;
- 
--	DBG(("%s(sequence=%d)\n", __FUNCTION__, event->sequence));
-+	DBG(("%s(sequence=%d): event=%lld\n", __FUNCTION__, event->sequence, (long long)info->event_id[0]));
-+	assert(info->n_event_id == 1);
-+	if (!info->queued) {
-+		DBG(("%s: arrived unexpectedly early (not queued)\n", __FUNCTION__));
-+		return;
-+	}
- 
- 	if (info->crtc == NULL) {
- 		swap.tv_sec = event->tv_sec;
-@@ -312,22 +695,33 @@ present_flip_handler(struct drm_event_vblank *event, void *data)
- 	} else
- 		swap = *sna_crtc_last_swap(info->crtc);
- 
--	DBG(("%s: pipe=%d, tv=%d.%06d msc %lld, event %lld complete\n", __FUNCTION__,
--	     info->crtc ? sna_crtc_to_pipe(info->crtc) : -1,
-+	DBG(("%s: pipe=%d, tv=%d.%06d msc=%lld (target %lld), event=%lld complete%s\n", __FUNCTION__,
-+	     info->crtc ? sna_crtc_pipe(info->crtc) : -1,
- 	     swap.tv_sec, swap.tv_usec, (long long)swap.msc,
--	     (long long)info->event_id));
--	present_event_notify(info->event_id, ust64(swap.tv_sec, swap.tv_usec), swap.msc);
--	free(info);
-+	     (long long)info->target_msc,
-+	     (long long)info->event_id[0],
-+	     info->target_msc && info->target_msc == swap.msc ? "" : ": MISS"));
-+	present_event_notify(info->event_id[0], swap_ust(&swap), swap.msc);
-+	if (info->crtc)
-+		sna_crtc_clear_vblank(info->crtc);
-+
-+	if (info->sna->present.unflip) {
-+		DBG(("%s: executing queued unflip (event=%lld)\n", __FUNCTION__, (long long)info->sna->present.unflip));
-+		sna_present_unflip(xf86ScrnToScreen(info->sna->scrn),
-+				   info->sna->present.unflip);
-+		info->sna->present.unflip = 0;
-+	}
-+	info_free(info);
- }
- 
- static Bool
--page_flip(ScreenPtr screen,
--	  RRCrtcPtr crtc,
--	  uint64_t event_id,
--	  struct kgem_bo *bo)
-+flip(struct sna *sna,
-+     RRCrtcPtr crtc,
-+     uint64_t event_id,
-+     uint64_t target_msc,
-+     struct kgem_bo *bo)
- {
--	struct sna *sna = to_sna_from_screen(screen);
--	struct sna_present_event *event;
-+	struct sna_present_event *info;
- 
- 	DBG(("%s(pipe=%d, event=%lld, handle=%d)\n",
- 	     __FUNCTION__,
-@@ -335,18 +729,27 @@ page_flip(ScreenPtr screen,
- 	     (long long)event_id,
- 	     bo->handle));
- 
--	event = malloc(sizeof(struct sna_present_event));
--	if (event == NULL)
-+	info = info_alloc(sna);
-+	if (info == NULL)
- 		return FALSE;
- 
--	event->event_id = event_id;
--	event->crtc = crtc ? crtc->devPrivate : NULL;
--	if (!sna_page_flip(sna, bo, present_flip_handler, event)) {
-+	info->crtc = crtc ? crtc->devPrivate : NULL;
-+	info->sna = sna;
-+	info->event_id = (uint64_t *)(info + 1);
-+	info->event_id[0] = event_id;
-+	info->n_event_id = 1;
-+	info->target_msc = target_msc;
-+	info->queued = false;
-+
-+	if (!sna_page_flip(sna, bo, present_flip_handler, info)) {
- 		DBG(("%s: pageflip failed\n", __FUNCTION__));
--		free(event);
-+		info_free(info);
- 		return FALSE;
- 	}
- 
-+	info->queued = true;
-+	if (info->crtc)
-+		sna_crtc_set_vblank(info->crtc);
- 	return TRUE;
- }
- 
-@@ -358,12 +761,48 @@ get_flip_bo(PixmapPtr pixmap)
- 
- 	DBG(("%s(pixmap=%ld)\n", __FUNCTION__, pixmap->drawable.serialNumber));
- 
--	priv = sna_pixmap_move_to_gpu(pixmap, MOVE_READ | __MOVE_FORCE);
-+	priv = sna_pixmap_move_to_gpu(pixmap, MOVE_READ | __MOVE_SCANOUT | __MOVE_FORCE);
- 	if (priv == NULL) {
- 		DBG(("%s: cannot force pixmap to the GPU\n", __FUNCTION__));
- 		return NULL;
- 	}
- 
-+	if (priv->gpu_bo->scanout)
-+		return priv->gpu_bo;
-+
-+	if (sna->kgem.has_llc && !wedged(sna) && !priv->pinned) {
-+		struct kgem_bo *bo;
-+		uint32_t tiling;
-+
-+		tiling = I915_TILING_NONE;
-+		if ((sna->flags & SNA_LINEAR_FB) == 0)
-+			tiling = I915_TILING_X;
-+
-+		bo = kgem_create_2d(&sna->kgem,
-+				    pixmap->drawable.width,
-+				    pixmap->drawable.height,
-+				    pixmap->drawable.bitsPerPixel,
-+				    tiling, CREATE_SCANOUT | CREATE_CACHED);
-+		if (bo) {
-+			BoxRec box;
-+
-+			box.x1 = box.y1 = 0;
-+			box.x2 = pixmap->drawable.width;
-+			box.y2 = pixmap->drawable.height;
-+
-+			if (sna->render.copy_boxes(sna, GXcopy,
-+						   &pixmap->drawable, priv->gpu_bo, 0, 0,
-+						   &pixmap->drawable, bo, 0, 0,
-+						   &box, 1, 0)) {
-+				sna_pixmap_unmap(pixmap, priv);
-+				kgem_bo_destroy(&sna->kgem, priv->gpu_bo);
-+
-+				priv->gpu_bo = bo;
-+			} else
-+				kgem_bo_destroy(&sna->kgem, bo);
-+		}
-+	}
-+
- 	if (sna->flags & SNA_LINEAR_FB &&
- 	    priv->gpu_bo->tiling &&
- 	    !sna_pixmap_change_tiling(pixmap, I915_TILING_NONE)) {
-@@ -372,12 +811,17 @@ get_flip_bo(PixmapPtr pixmap)
- 	}
- 
- 	if (priv->gpu_bo->tiling == I915_TILING_Y &&
-+	    !sna->kgem.can_scanout_y &&
- 	    !sna_pixmap_change_tiling(pixmap, I915_TILING_X)) {
- 		DBG(("%s: invalid Y-tiling, cannot convert\n", __FUNCTION__));
- 		return NULL;
- 	}
- 
--	priv->pinned |= PIN_SCANOUT;
-+	if (priv->gpu_bo->pitch & 63) {
-+		DBG(("%s: invalid pitch, no conversion\n", __FUNCTION__));
-+		return NULL;
-+	}
-+
- 	return priv->gpu_bo;
- }
- 
-@@ -388,6 +832,7 @@ sna_present_flip(RRCrtcPtr crtc,
- 		 PixmapPtr pixmap,
- 		 Bool sync_flip)
- {
-+	struct sna *sna = to_sna_from_pixmap(pixmap);
- 	struct kgem_bo *bo;
- 
- 	DBG(("%s(pipe=%d, event=%lld, msc=%lld, pixmap=%ld, sync?=%d)\n",
-@@ -397,11 +842,32 @@ sna_present_flip(RRCrtcPtr crtc,
- 	     (long long)target_msc,
- 	     pixmap->drawable.serialNumber, sync_flip));
- 
--	if (!check_flip__crtc(to_sna_from_pixmap(pixmap), crtc)) {
-+	if (!check_flip__crtc(sna, crtc)) {
- 		DBG(("%s: flip invalid for CRTC\n", __FUNCTION__));
- 		return FALSE;
- 	}
- 
-+	assert(sna->present.unflip == 0);
-+
-+	if (sna->flags & SNA_TEAR_FREE) {
-+		DBG(("%s: disabling TearFree (was %s) in favour of Present flips\n",
-+		     __FUNCTION__, sna->mode.shadow_enabled ? "enabled" : "disabled"));
-+		sna->mode.shadow_enabled = false;
-+	}
-+	assert(!sna->mode.shadow_enabled);
-+
-+	if (sna->mode.flip_active) {
-+		struct pollfd pfd;
-+
-+		DBG(("%s: flips still pending, stalling\n", __FUNCTION__));
-+		pfd.fd = sna->kgem.fd;
-+		pfd.events = POLLIN;
-+		while (poll(&pfd, 1, 0) == 1)
-+			sna_mode_wakeup(sna);
-+		if (sna->mode.flip_active)
-+			return FALSE;
-+	}
-+
- 	bo = get_flip_bo(pixmap);
- 	if (bo == NULL) {
- 		DBG(("%s: flip invalid bo\n", __FUNCTION__));
-@@ -409,9 +875,9 @@ sna_present_flip(RRCrtcPtr crtc,
- 	}
- 
- 	if (sync_flip)
--		return page_flip(crtc->pScreen, crtc, event_id, bo);
-+		return flip(sna, crtc, event_id, target_msc, bo);
- 	else
--		return page_flip__async(crtc, event_id, target_msc, bo);
-+		return flip__async(sna, crtc, event_id, target_msc, bo);
- }
- 
- static void
-@@ -421,29 +887,70 @@ sna_present_unflip(ScreenPtr screen, uint64_t event_id)
- 	struct kgem_bo *bo;
- 
- 	DBG(("%s(event=%lld)\n", __FUNCTION__, (long long)event_id));
--	if (sna->mode.front_active == 0 || sna->mode.shadow_active) {
-+	if (sna->mode.front_active == 0 || sna->mode.rr_active) {
- 		const struct ust_msc *swap;
- 
- 		DBG(("%s: no CRTC active, perform no-op flip\n", __FUNCTION__));
- 
- notify:
--		swap = sna_crtc_last_swap(sna_mode_first_crtc(sna));
--		DBG(("%s: pipe=%d, tv=%d.%06d msc %lld, event %lld complete\n", __FUNCTION__,
-+		swap = sna_crtc_last_swap(sna_primary_crtc(sna));
-+		DBG(("%s: pipe=%d, tv=%d.%06d msc=%lld, event=%lld complete\n", __FUNCTION__,
- 		     -1,
- 		     swap->tv_sec, swap->tv_usec, (long long)swap->msc,
- 		     (long long)event_id));
--		present_event_notify(event_id,
--				     ust64(swap->tv_sec, swap->tv_usec),
--				     swap->msc);
-+		present_event_notify(event_id, swap_ust(swap), swap->msc);
-+		return;
-+	}
-+
-+	assert(!sna->mode.shadow_enabled);
-+	if (sna->mode.flip_active) {
-+		DBG(("%s: %d outstanding flips, queueing unflip\n", __FUNCTION__, sna->mode.flip_active));
-+		assert(sna->present.unflip == 0);
-+		sna->present.unflip = event_id;
- 		return;
- 	}
- 
-+	if (sna->flags & SNA_TEAR_FREE) {
-+		DBG(("%s: %s TearFree after Present flips\n",
-+		     __FUNCTION__, sna->mode.shadow_damage != NULL ? "enabling" : "disabling"));
-+		sna->mode.shadow_enabled = sna->mode.shadow_damage != NULL;
-+	}
-+
- 	bo = get_flip_bo(screen->GetScreenPixmap(screen));
--	if (bo == NULL || !page_flip(screen, NULL, event_id, bo)) {
-+	if (bo == NULL) {
-+reset_mode:
- 		DBG(("%s: failed, trying to restore original mode\n", __FUNCTION__));
- 		xf86SetDesiredModes(sna->scrn);
- 		goto notify;
- 	}
-+
-+	/* Are we unflipping after a failure that left our ScreenP in place? */
-+	if (!sna_needs_page_flip(sna, bo))
-+		goto notify;
-+
-+	assert(sna_pixmap(screen->GetScreenPixmap(screen))->pinned & PIN_SCANOUT);
-+
-+	if (sna->flags & SNA_HAS_ASYNC_FLIP) {
-+		DBG(("%s: trying async flip restore\n", __FUNCTION__));
-+		if (flip__async(sna, NULL, event_id, 0, bo))
-+			return;
-+	}
-+
-+	if (!flip(sna, NULL, event_id, 0, bo))
-+		goto reset_mode;
-+}
-+
-+void sna_present_cancel_flip(struct sna *sna)
-+{
-+	if (sna->present.unflip) {
-+		const struct ust_msc *swap;
-+
-+		swap = sna_crtc_last_swap(sna_primary_crtc(sna));
-+		present_event_notify(sna->present.unflip,
-+				     swap_ust(swap), swap->msc);
-+
-+		sna->present.unflip = 0;
-+	}
- }
- 
- static present_screen_info_rec present_info = {
-@@ -463,10 +970,13 @@ static present_screen_info_rec present_info = {
- 
- bool sna_present_open(struct sna *sna, ScreenPtr screen)
- {
-+	DBG(("%s(num_crtc=%d)\n", __FUNCTION__, sna->mode.num_real_crtc));
-+
- 	if (sna->mode.num_real_crtc == 0)
- 		return false;
- 
- 	sna_present_update(sna);
-+	list_init(&sna->present.vblank_queue);
- 
- 	return present_screen_init(screen, &present_info);
- }
-diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
-index 3fbb9ecb..3e935d57 100644
---- a/src/sna/sna_render.c
-+++ b/src/sna/sna_render.c
-@@ -54,7 +54,7 @@ sna_format_for_depth(int depth)
- {
- 	switch (depth) {
- 	case 1: return PICT_a1;
--	case 4: return PICT_a4;
-+	case 4: return PICT_x4a4;
- 	case 8: return PICT_a8;
- 	case 15: return PICT_x1r5g5b5;
- 	case 16: return PICT_r5g6b5;
-@@ -272,18 +272,6 @@ no_render_context_switch(struct kgem *kgem,
- }
- 
- static void
--no_render_retire(struct kgem *kgem)
--{
--	(void)kgem;
--}
--
--static void
--no_render_expire(struct kgem *kgem)
--{
--	(void)kgem;
--}
--
--static void
- no_render_fini(struct sna *sna)
- {
- 	(void)sna;
-@@ -316,8 +304,6 @@ const char *no_render_init(struct sna *sna)
- 	render->fini = no_render_fini;
- 
- 	sna->kgem.context_switch = no_render_context_switch;
--	sna->kgem.retire = no_render_retire;
--	sna->kgem.expire = no_render_expire;
- 	if (sna->kgem.has_blt)
- 		sna->kgem.ring = KGEM_BLT;
- 
-@@ -407,10 +393,7 @@ use_cpu_bo(struct sna *sna, PixmapPtr pixmap, const BoxRec *box, bool blt)
- 		}
- 	}
- 
--	if (priv->shm) {
--		assert(!priv->flush);
--		sna_add_flush_pixmap(sna, priv, priv->cpu_bo);
--	}
-+	add_shm_flush(sna, priv);
- 
- 	DBG(("%s for box=(%d, %d), (%d, %d)\n",
- 	     __FUNCTION__, box->x1, box->y1, box->x2, box->y2));
-@@ -567,6 +550,7 @@ static struct kgem_bo *upload(struct sna *sna,
- 			assert(priv->gpu_damage == NULL);
- 			assert(priv->gpu_bo == NULL);
- 			assert(bo->proxy != NULL);
-+			sna_damage_all(&priv->cpu_damage, pixmap);
- 			kgem_proxy_bo_attach(bo, &priv->gpu_bo);
- 		}
- 	}
-@@ -627,10 +611,7 @@ sna_render_pixmap_bo(struct sna *sna,
- 		    !priv->cpu_bo->snoop && priv->cpu_bo->pitch < 4096) {
- 			DBG(("%s: CPU all damaged\n", __FUNCTION__));
- 			channel->bo = priv->cpu_bo;
--			if (priv->shm) {
--				assert(!priv->flush);
--				sna_add_flush_pixmap(sna, priv, priv->cpu_bo);
--			}
-+			add_shm_flush(sna, priv);
- 			goto done;
- 		}
- 	}
-@@ -1275,6 +1256,7 @@ sna_render_picture_extract(struct sna *sna,
- 			assert(priv->gpu_damage == NULL);
- 			assert(priv->gpu_bo == NULL);
- 			assert(bo->proxy != NULL);
-+			sna_damage_all(&priv->cpu_damage, pixmap);
- 			kgem_proxy_bo_attach(bo, &priv->gpu_bo);
- 		}
- 	}
-@@ -1338,6 +1320,8 @@ sna_render_picture_convolve(struct sna *sna,
- 	 */
- 	DBG(("%s: origin=(%d,%d) kernel=%dx%d, size=%dx%d\n",
- 	     __FUNCTION__, x_off, y_off, cw, ch, w, h));
-+	if (cw*ch > 32) /* too much loss of precision from quantization! */
-+		return -1;
- 
- 	assert(picture->pDrawable);
- 	assert(picture->filter == PictFilterConvolution);
-@@ -1388,9 +1372,9 @@ sna_render_picture_convolve(struct sna *sna,
- 			alpha = CreateSolidPicture(0, &color, &error);
- 			if (alpha) {
- 				sna_composite(PictOpAdd, picture, alpha, tmp,
--					      x, y,
-+					      x-(x_off+i), y-(y_off+j),
-+					      0, 0,
- 					      0, 0,
--					      x_off+i, y_off+j,
- 					      w, h);
- 				FreePicture(alpha, 0);
- 			}
-@@ -2183,11 +2167,11 @@ copy_overlap(struct sna *sna, uint8_t alu,
- 	ret = (sna->render.copy_boxes(sna, GXcopy,
- 				      draw, bo, src_dx, src_dy,
- 				      &tmp->drawable, tmp_bo, -extents->x1, -extents->y1,
--				      box, n , 0) &&
-+				      box, n, 0) &&
- 	       sna->render.copy_boxes(sna, alu,
- 				      &tmp->drawable, tmp_bo, -extents->x1, -extents->y1,
- 				      draw, bo, dst_dx, dst_dy,
--				      box, n , 0));
-+				      box, n, 0));
- 
- 	screen->DestroyPixmap(tmp);
- 	return ret;
-@@ -2308,16 +2292,22 @@ static bool can_copy_cpu(struct sna *sna,
- 			 struct kgem_bo *src,
- 			 struct kgem_bo *dst)
- {
--	if (src->tiling != dst->tiling)
--		return false;
-+	DBG(("%s: tiling=%d:%d, pitch=%d:%d, can_map=%d:%d[%d]\n",
-+	     __FUNCTION__,
-+	     src->tiling, dst->tiling,
-+	     src->pitch, dst->pitch,
-+	     kgem_bo_can_map__cpu(&sna->kgem, src, false),
-+	     kgem_bo_can_map__cpu(&sna->kgem, dst, true),
-+	     sna->kgem.has_wc_mmap));
- 
--	if (src->pitch != dst->pitch)
-+	if (src->tiling != dst->tiling)
- 		return false;
- 
- 	if (!kgem_bo_can_map__cpu(&sna->kgem, src, false))
- 		return false;
- 
--	if (!kgem_bo_can_map__cpu(&sna->kgem, dst, true))
-+	if (!kgem_bo_can_map__cpu(&sna->kgem, dst, true) &&
-+	    !sna->kgem.has_wc_mmap)
- 		return false;
- 
- 	DBG(("%s -- yes, src handle=%d, dst handle=%d\n", __FUNCTION__, src->handle, dst->handle));
-@@ -2330,31 +2320,62 @@ memcpy_copy_boxes(struct sna *sna, uint8_t op,
- 		  const DrawableRec *dst_draw, struct kgem_bo *dst_bo, int16_t dx, int16_t dy,
- 		  const BoxRec *box, int n, unsigned flags)
- {
-+	memcpy_box_func detile = NULL;
- 	void *dst, *src;
--	bool clipped;
- 
- 	if (op != GXcopy)
- 		return false;
- 
--	clipped = (n > 1 ||
--		   box->x1 + dx > 0 ||
--		   box->y1 + dy > 0 ||
--		   box->x2 + dx < dst_draw->width ||
--		   box->y2 + dy < dst_draw->height);
-+	if (src_draw->depth != dst_draw->depth)
-+		return false;
- 
- 	dst = src = NULL;
--	if (!clipped && can_copy_cpu(sna, src_bo, dst_bo)) {
--		dst = kgem_bo_map__cpu(&sna->kgem, dst_bo);
-+	if (can_copy_cpu(sna, src_bo, dst_bo)) {
-+		if (src_bo->pitch != dst_bo->pitch ||
-+		    dx != sx || dy != sy || n > 1 ||
-+		    box->x1 + dx > 0 ||
-+		    box->y1 + dy > 0 ||
-+		    box->x2 + dx < dst_draw->width ||
-+		    box->y2 + dy < dst_draw->height) {
-+			if (dx != sx) /* not implemented in memcpy yet */
-+				goto use_gtt;
-+
-+			switch (dst_bo->tiling) {
-+			default:
-+			case I915_TILING_Y:
-+				goto use_gtt;
-+
-+			case I915_TILING_X:
-+				detile = sna->kgem.memcpy_between_tiled_x;
-+				if (detile == NULL)
-+					goto use_gtt;
-+				break;
-+
-+			case I915_TILING_NONE:
-+				break;
-+			}
-+		}
-+
-+		if (kgem_bo_can_map__cpu(&sna->kgem, dst_bo, true))
-+			dst = kgem_bo_map__cpu(&sna->kgem, dst_bo);
-+		else
-+			dst = kgem_bo_map__wc(&sna->kgem, dst_bo);
- 		src = kgem_bo_map__cpu(&sna->kgem, src_bo);
- 	}
- 
- 	if (dst == NULL || src == NULL) {
-+use_gtt:
- 		dst = kgem_bo_map__gtt(&sna->kgem, dst_bo);
- 		src = kgem_bo_map__gtt(&sna->kgem, src_bo);
- 		if (dst == NULL || src == NULL)
- 			return false;
-+
-+		detile = NULL;
- 	} else {
--		kgem_bo_sync__cpu_full(&sna->kgem, dst_bo, true);
-+		if (dst == dst_bo->map__wc)
-+			kgem_bo_sync__gtt(&sna->kgem, dst_bo);
-+		else
-+			kgem_bo_sync__cpu_full(&sna->kgem, dst_bo, true);
- 		kgem_bo_sync__cpu_full(&sna->kgem, src_bo, false);
- 	}
- 
-@@ -2362,7 +2383,16 @@ memcpy_copy_boxes(struct sna *sna, uint8_t op,
- 	     __FUNCTION__, sx, sy, dx, dy, n));
- 
- 	if (sigtrap_get() == 0) {
--		do {
-+		if (detile) {
-+			do {
-+				detile(src, dst, dst_draw->bitsPerPixel,
-+				       src_bo->pitch, dst_bo->pitch,
-+				       box->x1 + sx, box->y1 + sy,
-+				       box->x1 + dx, box->y1 + dy,
-+				       box->x2 - box->x1, box->y2 - box->y1);
-+				box++;
-+			} while (--n);
-+		} else do {
- 			memcpy_blt(src, dst, dst_draw->bitsPerPixel,
- 				   src_bo->pitch, dst_bo->pitch,
- 				   box->x1 + sx, box->y1 + sy,
-@@ -2380,4 +2410,5 @@ void
- sna_render_mark_wedged(struct sna *sna)
- {
- 	sna->render.copy_boxes = memcpy_copy_boxes;
-+	sna->render.prefer_gpu = 0;
- }
-diff --git a/src/sna/sna_render.h b/src/sna/sna_render.h
-index 6e1fa480..4ba345a7 100644
---- a/src/sna/sna_render.h
-+++ b/src/sna/sna_render.h
-@@ -148,6 +148,10 @@ struct sna_composite_op {
- 		struct {
- 			uint32_t flags;
- 		} gen8;
-+
-+		struct {
-+			uint32_t flags;
-+		} gen9;
- 	} u;
- 
- 	void *priv;
-@@ -238,8 +242,9 @@ struct sna_render {
- 			  int16_t w, int16_t h,
- 			  unsigned flags,
- 			  struct sna_composite_op *tmp);
--#define COMPOSITE_PARTIAL 0x1
--#define COMPOSITE_FALLBACK 0x80000000
-+#define COMPOSITE_PARTIAL	0x1
-+#define COMPOSITE_UPLOAD	0x40000000
-+#define COMPOSITE_FALLBACK	0x80000000
- 
- 	bool (*check_composite_spans)(struct sna *sna, uint8_t op,
- 				      PicturePtr dst, PicturePtr src,
-@@ -286,6 +291,8 @@ struct sna_render {
- #define COPY_LAST 0x1
- #define COPY_SYNC 0x2
- #define COPY_NO_OVERLAP 0x4
-+#define COPY_SMALL 0x8
-+#define COPY_DRI 0x10
- 
- 	bool (*copy)(struct sna *sna, uint8_t alu,
- 		     PixmapPtr src, struct kgem_bo *src_bo,
-@@ -481,6 +488,7 @@ enum {
- 
- 	GEN7_WM_KERNEL_VIDEO_PLANAR,
- 	GEN7_WM_KERNEL_VIDEO_PACKED,
-+	GEN7_WM_KERNEL_VIDEO_RGB,
- 	GEN7_WM_KERNEL_COUNT
- };
- 
-@@ -533,12 +541,13 @@ enum {
- 
- 	GEN8_WM_KERNEL_VIDEO_PLANAR,
- 	GEN8_WM_KERNEL_VIDEO_PACKED,
-+	GEN8_WM_KERNEL_VIDEO_RGB,
- 	GEN8_WM_KERNEL_COUNT
- };
- 
- struct gen8_render_state {
- 	unsigned gt;
--
-+	const struct gt_info *info;
- 	struct kgem_bo *general_bo;
- 
- 	uint32_t vs_state;
-@@ -565,6 +574,58 @@ struct gen8_render_state {
- 	bool emit_flush;
- };
- 
-+enum {
-+	GEN9_WM_KERNEL_NOMASK = 0,
-+	GEN9_WM_KERNEL_NOMASK_P,
-+
-+	GEN9_WM_KERNEL_MASK,
-+	GEN9_WM_KERNEL_MASK_P,
-+
-+	GEN9_WM_KERNEL_MASKCA,
-+	GEN9_WM_KERNEL_MASKCA_P,
-+
-+	GEN9_WM_KERNEL_MASKSA,
-+	GEN9_WM_KERNEL_MASKSA_P,
-+
-+	GEN9_WM_KERNEL_OPACITY,
-+	GEN9_WM_KERNEL_OPACITY_P,
-+
-+	GEN9_WM_KERNEL_VIDEO_PLANAR,
-+	GEN9_WM_KERNEL_VIDEO_PACKED,
-+	GEN9_WM_KERNEL_VIDEO_RGB,
-+	GEN9_WM_KERNEL_COUNT
-+};
-+
-+struct gen9_render_state {
-+	unsigned gt;
-+	const struct gt_info *info;
-+	struct kgem_bo *general_bo;
-+
-+	uint32_t vs_state;
-+	uint32_t sf_state;
-+	uint32_t sf_mask_state;
-+	uint32_t wm_state;
-+	uint32_t wm_kernel[GEN9_WM_KERNEL_COUNT][3];
-+
-+	uint32_t cc_blend;
-+
-+	uint32_t drawrect_offset;
-+	uint32_t drawrect_limit;
-+	uint32_t blend;
-+	uint32_t samplers;
-+	uint32_t kernel;
-+
-+	uint16_t num_sf_outputs;
-+	uint16_t ve_id;
-+	uint16_t last_primitive;
-+	int16_t floats_per_vertex;
-+	uint16_t surface_table;
-+
-+	bool needs_invariant;
-+	bool emit_flush;
-+	bool ve_dirty;
-+};
-+
- struct sna_static_stream {
- 	uint32_t size, used;
- 	uint8_t *data;
-@@ -620,6 +681,7 @@ const char *gen5_render_init(struct sna *sna, const char *backend);
- const char *gen6_render_init(struct sna *sna, const char *backend);
- const char *gen7_render_init(struct sna *sna, const char *backend);
- const char *gen8_render_init(struct sna *sna, const char *backend);
-+const char *gen9_render_init(struct sna *sna, const char *backend);
- 
- void sna_render_mark_wedged(struct sna *sna);
- 
-diff --git a/src/sna/sna_render_inline.h b/src/sna/sna_render_inline.h
-index 10fbbfe2..e162e37f 100644
---- a/src/sna/sna_render_inline.h
-+++ b/src/sna/sna_render_inline.h
-@@ -304,6 +304,12 @@ color_convert(uint32_t pixel,
- 	return pixel;
- }
- 
-+inline static uint32_t
-+solid_color(uint32_t format, uint32_t pixel)
-+{
-+	return color_convert(pixel, format, PICT_a8r8g8b8);
-+}
-+
- inline static bool dst_use_gpu(PixmapPtr pixmap)
- {
- 	struct sna_pixmap *priv = sna_pixmap(pixmap);
-diff --git a/src/sna/sna_tiling.c b/src/sna/sna_tiling.c
-index 308efc0a..8e2627f7 100644
---- a/src/sna/sna_tiling.c
-+++ b/src/sna/sna_tiling.c
-@@ -369,8 +369,7 @@ sna_tiling_composite_spans_boxes(struct sna *sna,
- 				 const BoxRec *box, int nbox, float opacity)
- {
- 	while (nbox--)
--		sna_tiling_composite_spans_box(sna, op->base.priv, box++, opacity);
--	(void)sna;
-+		sna_tiling_composite_spans_box(sna, op, box++, opacity);
- }
- 
- fastcall static void
-@@ -581,6 +580,7 @@ sna_tiling_composite_spans(uint32_t op,
- 	tile->rects = tile->rects_embedded;
- 	tile->rect_count = 0;
- 	tile->rect_size = ARRAY_SIZE(tile->rects_embedded);
-+	COMPILE_TIME_ASSERT(sizeof(tile->rects_embedded[0]) >= sizeof(struct sna_tile_span));
- 
- 	tmp->box   = sna_tiling_composite_spans_box;
- 	tmp->boxes = sna_tiling_composite_spans_boxes;
-diff --git a/src/sna/sna_trapezoids_boxes.c b/src/sna/sna_trapezoids_boxes.c
-index 9900e3f0..bbf83759 100644
---- a/src/sna/sna_trapezoids_boxes.c
-+++ b/src/sna/sna_trapezoids_boxes.c
-@@ -198,7 +198,7 @@ composite_aligned_boxes(struct sna *sna,
- 	if (op == PictOpClear && sna->clear)
- 		src = sna->clear;
- 
--	DBG(("%s: clipped extents (%d, %d), (%d, %d);  now offset by (%d, %d), orgin (%d, %d)\n",
-+	DBG(("%s: clipped extents (%d, %d), (%d, %d);  now offset by (%d, %d), origin (%d, %d)\n",
- 	     __FUNCTION__,
- 	     clip.extents.x1, clip.extents.y1,
- 	     clip.extents.x2, clip.extents.y2,
-@@ -592,6 +592,8 @@ lerp32_opacity(PixmapPtr scratch,
- 	uint32_t *ptr;
- 	int stride, i;
- 
-+	sigtrap_assert_active();
-+
- 	ptr = (uint32_t*)((uint8_t *)scratch->devPrivate.ptr + scratch->devKind * y);
- 	ptr += x;
- 	stride = scratch->devKind / 4;
-diff --git a/src/sna/sna_trapezoids_imprecise.c b/src/sna/sna_trapezoids_imprecise.c
-index 37def2f9..8bc7c8a8 100644
---- a/src/sna/sna_trapezoids_imprecise.c
-+++ b/src/sna/sna_trapezoids_imprecise.c
-@@ -962,6 +962,16 @@ tor_add_trapezoid(struct tor *tor,
- 		  const xTrapezoid *t,
- 		  int dx, int dy)
- {
-+	if (!xTrapezoidValid(t)) {
-+		__DBG(("%s: skipping invalid trapezoid: top=%d, bottom=%d, left=(%d, %d), (%d, %d), right=(%d, %d), (%d, %d)\n",
-+		       __FUNCTION__,
-+		       t->top, t->bottom,
-+		       t->left.p1.x, t->left.p1.y,
-+		       t->left.p2.x, t->left.p2.y,
-+		       t->right.p1.x, t->right.p1.y,
-+		       t->right.p2.x, t->right.p2.y));
-+		return;
-+	}
- 	polygon_add_edge(tor->polygon, t, &t->left, 1, dx, dy);
- 	polygon_add_edge(tor->polygon, t, &t->right, -1, dx, dy);
- }
-@@ -1687,31 +1697,27 @@ struct span_thread {
- #define SPAN_THREAD_MAX_BOXES (8192/sizeof(struct sna_opacity_box))
- struct span_thread_boxes {
- 	const struct sna_composite_spans_op *op;
-+	const BoxRec *clip_start, *clip_end;
- 	int num_boxes;
- 	struct sna_opacity_box boxes[SPAN_THREAD_MAX_BOXES];
- };
- 
--static void span_thread_add_boxes(struct sna *sna, void *data,
--				  const BoxRec *box, int count, float alpha)
-+static void span_thread_add_box(struct sna *sna, void *data,
-+				const BoxRec *box, float alpha)
- {
- 	struct span_thread_boxes *b = data;
- 
--	__DBG(("%s: adding %d boxes with alpha=%f\n",
--	       __FUNCTION__, count, alpha));
-+	__DBG(("%s: adding box with alpha=%f\n", __FUNCTION__, alpha));
- 
--	assert(count > 0 && count <= SPAN_THREAD_MAX_BOXES);
--	if (unlikely(b->num_boxes + count > SPAN_THREAD_MAX_BOXES)) {
--		DBG(("%s: flushing %d boxes, adding %d\n", __FUNCTION__, b->num_boxes, count));
--		assert(b->num_boxes <= SPAN_THREAD_MAX_BOXES);
-+	if (unlikely(b->num_boxes == SPAN_THREAD_MAX_BOXES)) {
-+		DBG(("%s: flushing %d boxes\n", __FUNCTION__, b->num_boxes));
- 		b->op->thread_boxes(sna, b->op, b->boxes, b->num_boxes);
- 		b->num_boxes = 0;
- 	}
- 
--	do {
--		b->boxes[b->num_boxes].box = *box++;
--		b->boxes[b->num_boxes].alpha = alpha;
--		b->num_boxes++;
--	} while (--count);
-+	b->boxes[b->num_boxes].box = *box++;
-+	b->boxes[b->num_boxes].alpha = alpha;
-+	b->num_boxes++;
- 	assert(b->num_boxes <= SPAN_THREAD_MAX_BOXES);
- }
- 
-@@ -1722,8 +1728,22 @@ span_thread_box(struct sna *sna,
- 		const BoxRec *box,
- 		int coverage)
- {
-+	struct span_thread_boxes *b = (struct span_thread_boxes *)op;
-+
- 	__DBG(("%s: %d -> %d @ %d\n", __FUNCTION__, box->x1, box->x2, coverage));
--	span_thread_add_boxes(sna, op, box, 1, AREA_TO_ALPHA(coverage));
-+	if (b->num_boxes) {
-+		struct sna_opacity_box *bb = &b->boxes[b->num_boxes-1];
-+		if (bb->box.x1 == box->x1 &&
-+		    bb->box.x2 == box->x2 &&
-+		    bb->box.y2 == box->y1 &&
-+		    bb->alpha == AREA_TO_ALPHA(coverage)) {
-+			bb->box.y2 = box->y2;
-+			__DBG(("%s: contracted double row: %d -> %d\n", __func__, bb->box.y1, bb->box.y2));
-+			return;
-+		}
-+	}
-+
-+	span_thread_add_box(sna, op, box, AREA_TO_ALPHA(coverage));
- }
- 
- static void
-@@ -1733,20 +1753,28 @@ span_thread_clipped_box(struct sna *sna,
- 			const BoxRec *box,
- 			int coverage)
- {
--	pixman_region16_t region;
-+	struct span_thread_boxes *b = (struct span_thread_boxes *)op;
-+	const BoxRec *c;
- 
- 	__DBG(("%s: %d -> %d @ %f\n", __FUNCTION__, box->x1, box->x2,
- 	       AREA_TO_ALPHA(coverage)));
- 
--	pixman_region_init_rects(&region, box, 1);
--	RegionIntersect(&region, &region, clip);
--	if (region_num_rects(&region)) {
--		span_thread_add_boxes(sna, op,
--				      region_rects(&region),
--				      region_num_rects(&region),
--				      AREA_TO_ALPHA(coverage));
-+	b->clip_start =
-+		find_clip_box_for_y(b->clip_start, b->clip_end, box->y1);
-+
-+	c = b->clip_start;
-+	while (c != b->clip_end) {
-+		BoxRec clipped;
-+
-+		if (box->y2 <= c->y1)
-+			break;
-+
-+		clipped = *box;
-+		if (!box_intersect(&clipped, c++))
-+			continue;
-+
-+		span_thread_add_box(sna, op, &clipped, AREA_TO_ALPHA(coverage));
- 	}
--	pixman_region_fini(&region);
- }
- 
- static span_func_t
-@@ -1777,6 +1805,16 @@ thread_choose_span(struct sna_composite_spans_op *tmp,
- 	return span;
- }
- 
-+inline static void
-+span_thread_boxes_init(struct span_thread_boxes *boxes,
-+		       const struct sna_composite_spans_op *op,
-+		       const RegionRec *clip)
-+{
-+	boxes->op = op;
-+	region_get_boxes(clip, &boxes->clip_start, &boxes->clip_end);
-+	boxes->num_boxes = 0;
-+}
-+
- static void
- span_thread(void *arg)
- {
-@@ -1789,8 +1827,7 @@ span_thread(void *arg)
- 	if (!tor_init(&tor, &thread->extents, 2*thread->ntrap))
- 		return;
- 
--	boxes.op = thread->op;
--	boxes.num_boxes = 0;
-+	span_thread_boxes_init(&boxes, thread->op, thread->clip);
- 
- 	y1 = thread->extents.y1 - thread->draw_y;
- 	y2 = thread->extents.y2 - thread->draw_y;
-@@ -2190,6 +2227,52 @@ static void _tor_blt_src(struct inplace *in, const BoxRec *box, uint8_t v)
- 	} while (--h);
- }
- 
-+struct clipped_span {
-+	span_func_t span;
-+	const BoxRec *clip_start, *clip_end;
-+};
-+
-+static void
-+tor_blt_clipped(struct sna *sna,
-+		struct sna_composite_spans_op *op,
-+		pixman_region16_t *clip,
-+		const BoxRec *box,
-+		int coverage)
-+{
-+	struct clipped_span *cs = (struct clipped_span *)clip;
-+	const BoxRec *c;
-+
-+	cs->clip_start =
-+		find_clip_box_for_y(cs->clip_start, cs->clip_end, box->y1);
-+
-+	c = cs->clip_start;
-+	while (c != cs->clip_end) {
-+		BoxRec clipped;
-+
-+		if (box->y2 <= c->y1)
-+			break;
-+
-+		clipped = *box;
-+		if (!box_intersect(&clipped, c++))
-+			continue;
-+
-+		cs->span(sna, op, NULL, &clipped, coverage);
-+	}
-+}
-+
-+inline static span_func_t
-+clipped_span(struct clipped_span *cs,
-+	     span_func_t span,
-+	     const RegionRec *clip)
-+{
-+	if (clip->data) {
-+		cs->span = span;
-+		region_get_boxes(clip, &cs->clip_start, &cs->clip_end);
-+		span = tor_blt_clipped;
-+	}
-+	return span;
-+}
-+
- static void
- tor_blt_src(struct sna *sna,
- 	    struct sna_composite_spans_op *op,
-@@ -2203,25 +2286,6 @@ tor_blt_src(struct sna *sna,
- }
- 
- static void
--tor_blt_src_clipped(struct sna *sna,
--		    struct sna_composite_spans_op *op,
--		    pixman_region16_t *clip,
--		    const BoxRec *box,
--		    int coverage)
--{
--	pixman_region16_t region;
--	int n;
--
--	pixman_region_init_rects(&region, box, 1);
--	RegionIntersect(&region, &region, clip);
--	n = region_num_rects(&region);
--	box = region_rects(&region);
--	while (n--)
--		tor_blt_src(sna, op, NULL, box++, coverage);
--	pixman_region_fini(&region);
--}
--
--static void
- tor_blt_in(struct sna *sna,
- 	   struct sna_composite_spans_op *op,
- 	   pixman_region16_t *clip,
-@@ -2253,25 +2317,6 @@ tor_blt_in(struct sna *sna,
- }
- 
- static void
--tor_blt_in_clipped(struct sna *sna,
--		   struct sna_composite_spans_op *op,
--		   pixman_region16_t *clip,
--		   const BoxRec *box,
--		   int coverage)
--{
--	pixman_region16_t region;
--	int n;
--
--	pixman_region_init_rects(&region, box, 1);
--	RegionIntersect(&region, &region, clip);
--	n = region_num_rects(&region);
--	box = region_rects(&region);
--	while (n--)
--		tor_blt_in(sna, op, NULL, box++, coverage);
--	pixman_region_fini(&region);
--}
--
--static void
- tor_blt_add(struct sna *sna,
- 	    struct sna_composite_spans_op *op,
- 	    pixman_region16_t *clip,
-@@ -2310,25 +2355,6 @@ tor_blt_add(struct sna *sna,
- }
- 
- static void
--tor_blt_add_clipped(struct sna *sna,
--		    struct sna_composite_spans_op *op,
--		    pixman_region16_t *clip,
--		    const BoxRec *box,
--		    int coverage)
--{
--	pixman_region16_t region;
--	int n;
--
--	pixman_region_init_rects(&region, box, 1);
--	RegionIntersect(&region, &region, clip);
--	n = region_num_rects(&region);
--	box = region_rects(&region);
--	while (n--)
--		tor_blt_add(sna, op, NULL, box++, coverage);
--	pixman_region_fini(&region);
--}
--
--static void
- tor_blt_lerp32(struct sna *sna,
- 	       struct sna_composite_spans_op *op,
- 	       pixman_region16_t *clip,
-@@ -2343,6 +2369,7 @@ tor_blt_lerp32(struct sna *sna,
- 	if (coverage == 0)
- 		return;
- 
-+	sigtrap_assert_active();
- 	ptr += box->y1 * stride + box->x1;
- 
- 	h = box->y2 - box->y1;
-@@ -2383,25 +2410,6 @@ tor_blt_lerp32(struct sna *sna,
- 	}
- }
- 
--static void
--tor_blt_lerp32_clipped(struct sna *sna,
--		       struct sna_composite_spans_op *op,
--		       pixman_region16_t *clip,
--		       const BoxRec *box,
--		       int coverage)
--{
--	pixman_region16_t region;
--	int n;
--
--	pixman_region_init_rects(&region, box, 1);
--	RegionIntersect(&region, &region, clip);
--	n = region_num_rects(&region);
--	box = region_rects(&region);
--	while (n--)
--		tor_blt_lerp32(sna, op, NULL, box++, coverage);
--	pixman_region_fini(&region);
--}
--
- struct pixman_inplace {
- 	pixman_image_t *image, *source, *mask;
- 	uint32_t color;
-@@ -2431,24 +2439,6 @@ pixmask_span_solid(struct sna *sna,
- 			       pi->dx + box->x1, pi->dy + box->y1,
- 			       box->x2 - box->x1, box->y2 - box->y1);
- }
--static void
--pixmask_span_solid__clipped(struct sna *sna,
--			    struct sna_composite_spans_op *op,
--			    pixman_region16_t *clip,
--			    const BoxRec *box,
--			    int coverage)
--{
--	pixman_region16_t region;
--	int n;
--
--	pixman_region_init_rects(&region, box, 1);
--	RegionIntersect(&region, &region, clip);
--	n = region_num_rects(&region);
--	box = region_rects(&region);
--	while (n--)
--		pixmask_span_solid(sna, op, NULL, box++, coverage);
--	pixman_region_fini(&region);
--}
- 
- static void
- pixmask_span(struct sna *sna,
-@@ -2471,24 +2461,6 @@ pixmask_span(struct sna *sna,
- 			       pi->dx + box->x1, pi->dy + box->y1,
- 			       box->x2 - box->x1, box->y2 - box->y1);
- }
--static void
--pixmask_span__clipped(struct sna *sna,
--		      struct sna_composite_spans_op *op,
--		      pixman_region16_t *clip,
--		      const BoxRec *box,
--		      int coverage)
--{
--	pixman_region16_t region;
--	int n;
--
--	pixman_region_init_rects(&region, box, 1);
--	RegionIntersect(&region, &region, clip);
--	n = region_num_rects(&region);
--	box = region_rects(&region);
--	while (n--)
--		pixmask_span(sna, op, NULL, box++, coverage);
--	pixman_region_fini(&region);
--}
- 
- struct inplace_x8r8g8b8_thread {
- 	xTrapezoid *traps;
-@@ -2507,6 +2479,7 @@ static void inplace_x8r8g8b8_thread(void *arg)
- 	struct inplace_x8r8g8b8_thread *thread = arg;
- 	struct tor tor;
- 	span_func_t span;
-+	struct clipped_span clipped;
- 	RegionPtr clip;
- 	int y1, y2, n;
- 
-@@ -2537,12 +2510,11 @@ static void inplace_x8r8g8b8_thread(void *arg)
- 		inplace.stride = pixmap->devKind;
- 		inplace.color = thread->color;
- 
--		if (clip->data)
--			span = tor_blt_lerp32_clipped;
--		else
--			span = tor_blt_lerp32;
-+		span = clipped_span(&clipped, tor_blt_lerp32, clip);
- 
--		tor_render(NULL, &tor, (void*)&inplace, clip, span, false);
-+		tor_render(NULL, &tor,
-+			   (void*)&inplace, (void*)&clipped,
-+			   span, false);
- 	} else if (thread->is_solid) {
- 		struct pixman_inplace pi;
- 
-@@ -2555,12 +2527,11 @@ static void inplace_x8r8g8b8_thread(void *arg)
- 						     1, 1, pi.bits, 0);
- 		pixman_image_set_repeat(pi.source, PIXMAN_REPEAT_NORMAL);
- 
--		if (clip->data)
--			span = pixmask_span_solid__clipped;
--		else
--			span = pixmask_span_solid;
-+		span = clipped_span(&clipped, pixmask_span_solid, clip);
- 
--		tor_render(NULL, &tor, (void*)&pi, clip, span, false);
-+		tor_render(NULL, &tor,
-+			   (void*)&pi, (void *)&clipped,
-+			   span, false);
- 
- 		pixman_image_unref(pi.source);
- 		pixman_image_unref(pi.image);
-@@ -2579,12 +2550,11 @@ static void inplace_x8r8g8b8_thread(void *arg)
- 		pi.bits = pixman_image_get_data(pi.mask);
- 		pi.op = thread->op;
- 
--		if (clip->data)
--			span = pixmask_span__clipped;
--		else
--			span = pixmask_span;
-+		span = clipped_span(&clipped, pixmask_span, clip);
- 
--		tor_render(NULL, &tor, (void*)&pi, clip, span, false);
-+		tor_render(NULL, &tor,
-+			   (void*)&pi, (void *)&clipped,
-+			   span, false);
- 
- 		pixman_image_unref(pi.mask);
- 		pixman_image_unref(pi.source);
-@@ -2698,6 +2668,7 @@ trapezoid_span_inplace__x8r8g8b8(CARD8 op,
- 	if (num_threads == 1) {
- 		struct tor tor;
- 		span_func_t span;
-+		struct clipped_span clipped;
- 
- 		if (!tor_init(&tor, &region.extents, 2*ntrap))
- 			return true;
-@@ -2723,17 +2694,15 @@ trapezoid_span_inplace__x8r8g8b8(CARD8 op,
- 			inplace.stride = pixmap->devKind;
- 			inplace.color = color;
- 
--			if (dst->pCompositeClip->data)
--				span = tor_blt_lerp32_clipped;
--			else
--				span = tor_blt_lerp32;
-+			span = clipped_span(&clipped, tor_blt_lerp32, dst->pCompositeClip);
- 
- 			DBG(("%s: render inplace op=%d, color=%08x\n",
- 			     __FUNCTION__, op, color));
- 
- 			if (sigtrap_get() == 0) {
--				tor_render(NULL, &tor, (void*)&inplace,
--					   dst->pCompositeClip, span, false);
-+				tor_render(NULL, &tor,
-+					   (void*)&inplace, (void*)&clipped,
-+					   span, false);
- 				sigtrap_put();
- 			}
- 		} else if (is_solid) {
-@@ -2748,15 +2717,12 @@ trapezoid_span_inplace__x8r8g8b8(CARD8 op,
- 							     1, 1, pi.bits, 0);
- 			pixman_image_set_repeat(pi.source, PIXMAN_REPEAT_NORMAL);
- 
--			if (dst->pCompositeClip->data)
--				span = pixmask_span_solid__clipped;
--			else
--				span = pixmask_span_solid;
-+			span = clipped_span(&clipped, pixmask_span_solid, dst->pCompositeClip);
- 
- 			if (sigtrap_get() == 0) {
--				tor_render(NULL, &tor, (void*)&pi,
--					   dst->pCompositeClip, span,
--					   false);
-+				tor_render(NULL, &tor,
-+					   (void*)&pi, (void*)&clipped,
-+					   span, false);
- 				sigtrap_put();
- 			}
- 
-@@ -2777,15 +2743,12 @@ trapezoid_span_inplace__x8r8g8b8(CARD8 op,
- 			pi.bits = pixman_image_get_data(pi.mask);
- 			pi.op = op;
- 
--			if (dst->pCompositeClip->data)
--				span = pixmask_span__clipped;
--			else
--				span = pixmask_span;
-+			span = clipped_span(&clipped, pixmask_span, dst->pCompositeClip);
- 
- 			if (sigtrap_get() == 0) {
--				tor_render(NULL, &tor, (void*)&pi,
--					   dst->pCompositeClip, span,
--					   false);
-+				tor_render(NULL, &tor,
-+					   (void*)&pi, (void*)&clipped,
-+					   span, false);
- 				sigtrap_put();
- 			}
- 
-@@ -2847,9 +2810,9 @@ trapezoid_span_inplace__x8r8g8b8(CARD8 op,
- 
- struct inplace_thread {
- 	xTrapezoid *traps;
--	RegionPtr clip;
- 	span_func_t span;
- 	struct inplace inplace;
-+	struct clipped_span clipped;
- 	BoxRec extents;
- 	int dx, dy;
- 	int draw_x, draw_y;
-@@ -2874,8 +2837,9 @@ static void inplace_thread(void *arg)
- 		tor_add_trapezoid(&tor, &thread->traps[n], thread->dx, thread->dy);
- 	}
- 
--	tor_render(NULL, &tor, (void*)&thread->inplace,
--		   thread->clip, thread->span, thread->unbounded);
-+	tor_render(NULL, &tor,
-+		   (void*)&thread->inplace, (void*)&thread->clipped,
-+		   thread->span, thread->unbounded);
- 
- 	tor_fini(&tor);
- }
-@@ -2889,6 +2853,7 @@ imprecise_trapezoid_span_inplace(struct sna *sna,
- 				 bool fallback)
- {
- 	struct inplace inplace;
-+	struct clipped_span clipped;
- 	span_func_t span;
- 	PixmapPtr pixmap;
- 	struct sna_pixmap *priv;
-@@ -3005,21 +2970,12 @@ imprecise_trapezoid_span_inplace(struct sna *sna,
- 	     region.extents.x2, region.extents.y2));
- 
- 	if (op == PictOpSrc) {
--		if (dst->pCompositeClip->data)
--			span = tor_blt_src_clipped;
--		else
--			span = tor_blt_src;
-+		span = tor_blt_src;
- 	} else if (op == PictOpIn) {
--		if (dst->pCompositeClip->data)
--			span = tor_blt_in_clipped;
--		else
--			span = tor_blt_in;
-+		span = tor_blt_in;
- 	} else {
- 		assert(op == PictOpAdd);
--		if (dst->pCompositeClip->data)
--			span = tor_blt_add_clipped;
--		else
--			span = tor_blt_add;
-+		span = tor_blt_add;
- 	}
- 
- 	DBG(("%s: move-to-cpu\n", __FUNCTION__));
-@@ -3037,6 +2993,8 @@ imprecise_trapezoid_span_inplace(struct sna *sna,
- 	inplace.stride = pixmap->devKind;
- 	inplace.opacity = color >> 24;
- 
-+	span = clipped_span(&clipped, span, dst->pCompositeClip);
-+
- 	num_threads = 1;
- 	if ((flags & COMPOSITE_SPANS_RECTILINEAR) == 0)
- 		num_threads = sna_use_threads(region.extents.x2 - region.extents.x1,
-@@ -3057,8 +3015,9 @@ imprecise_trapezoid_span_inplace(struct sna *sna,
- 		}
- 
- 		if (sigtrap_get() == 0) {
--			tor_render(NULL, &tor, (void*)&inplace,
--				   dst->pCompositeClip, span, unbounded);
-+			tor_render(NULL, &tor,
-+				   (void*)&inplace, (void *)&clipped,
-+				   span, unbounded);
- 			sigtrap_put();
- 		}
- 
-@@ -3075,8 +3034,8 @@ imprecise_trapezoid_span_inplace(struct sna *sna,
- 		threads[0].traps = traps;
- 		threads[0].ntrap = ntrap;
- 		threads[0].inplace = inplace;
-+		threads[0].clipped = clipped;
- 		threads[0].extents = region.extents;
--		threads[0].clip = dst->pCompositeClip;
- 		threads[0].span = span;
- 		threads[0].unbounded = unbounded;
- 		threads[0].dx = dx;
-@@ -3707,8 +3666,7 @@ tristrip_thread(void *arg)
- 	if (!tor_init(&tor, &thread->extents, 2*thread->count))
- 		return;
- 
--	boxes.op = thread->op;
--	boxes.num_boxes = 0;
-+	span_thread_boxes_init(&boxes, thread->op, thread->clip);
- 
- 	cw = 0; ccw = 1;
- 	polygon_add_line(tor.polygon,
-@@ -3874,7 +3832,7 @@ imprecise_tristrip_span_converter(struct sna *sna,
- 				break;
- 		} while (1);
- 		polygon_add_line(tor.polygon,
--				 &points[cw], &points[2+ccw],
-+				 &points[cw], &points[ccw],
- 				 dx, dy);
- 		assert(tor.polygon->num_edges <= 2*count);
- 
-diff --git a/src/sna/sna_trapezoids_mono.c b/src/sna/sna_trapezoids_mono.c
-index 808703a9..07a7867d 100644
---- a/src/sna/sna_trapezoids_mono.c
-+++ b/src/sna/sna_trapezoids_mono.c
-@@ -72,13 +72,14 @@ struct mono {
- 	struct sna *sna;
- 	struct sna_composite_op op;
- 	pixman_region16_t clip;
-+	const BoxRec *clip_start, *clip_end;
- 
- 	fastcall void (*span)(struct mono *, int, int, BoxPtr);
- 
- 	struct mono_polygon polygon;
- };
- 
--#define I(x) pixman_fixed_to_int ((x) + pixman_fixed_1_minus_e/2)
-+#define I(x) pixman_fixed_to_int((x) + pixman_fixed_1_minus_e/2)
- 
- static struct quorem
- floored_muldivrem(int32_t x, int32_t a, int32_t b)
-@@ -249,22 +250,22 @@ mono_add_line(struct mono *mono,
- 
- 		e->dxdy = floored_muldivrem(dx, pixman_fixed_1, dy);
- 
--		e->x = floored_muldivrem((ytop - dst_y) * pixman_fixed_1 + pixman_fixed_1_minus_e/2 - p1->y,
-+		e->x = floored_muldivrem((ytop - dst_y) * pixman_fixed_1 + pixman_fixed_1/2 - p1->y,
- 					 dx, dy);
- 		e->x.quo += p1->x;
- 		e->x.rem -= dy;
- 
- 		e->dy = dy;
--
--		__DBG(("%s: initial x=%d [%d.%d/%d] + dxdy=%d.%d/%d\n",
--		       __FUNCTION__,
--		       I(e->x.quo), e->x.quo, e->x.rem, e->dy,
--		       e->dxdy.quo, e->dxdy.rem, e->dy));
- 	}
- 	e->x.quo += dst_x*pixman_fixed_1;
-+	__DBG(("%s: initial x=%d [%d.%d/%d] + dxdy=%d.%d/%d\n",
-+	       __FUNCTION__,
-+	       I(e->x.quo), e->x.quo, e->x.rem, e->dy,
-+	       e->dxdy.quo, e->dxdy.rem, e->dy));
- 
- 	{
- 		struct mono_edge **ptail = &polygon->y_buckets[ytop - mono->clip.extents.y1];
-+		assert(ytop - mono->clip.extents.y1 < mono->clip.extents.y2 - mono->clip.extents.y1);
- 		if (*ptail)
- 			(*ptail)->prev = e;
- 		e->next = *ptail;
-@@ -368,6 +369,10 @@ static struct mono_edge *mono_filter(struct mono_edge *edges)
- 		    e->x.rem == n->x.rem &&
- 		    e->dxdy.quo == n->dxdy.quo &&
- 		    e->dxdy.rem == n->dxdy.rem) {
-+			assert(e->dy == n->dy);
-+			__DBG(("%s: discarding cancellation pair (%d.%d) + (%d.%d)\n",
-+			       __FUNCTION__, e->x.quo, e->x.rem, e->dxdy.quo, e->dxdy.rem));
-+
- 			if (e->prev)
- 				e->prev->next = n->next;
- 			else
-@@ -378,8 +383,11 @@ static struct mono_edge *mono_filter(struct mono_edge *edges)
- 				break;
- 
- 			e = n->next;
--		} else
-+		} else {
-+			__DBG(("%s: adding edge (%d.%d) + (%d.%d)/%d, height=%d\n",
-+			       __FUNCTION__, n->x.quo, n->x.rem, n->dxdy.quo, n->dxdy.rem, n->dy, n->height_left));
- 			e = n;
-+		}
- 	}
- 
- 	return edges;
-@@ -474,6 +482,34 @@ mono_span__fast(struct mono *c, int x1, int x2, BoxPtr box)
- 	c->op.box(c->sna, &c->op, box);
- }
- 
-+fastcall static void
-+mono_span__clipped(struct mono *c, int x1, int x2, BoxPtr box)
-+{
-+	const BoxRec *b;
-+
-+	__DBG(("%s [%d, %d]\n", __FUNCTION__, x1, x2));
-+
-+	c->clip_start =
-+		find_clip_box_for_y(c->clip_start, c->clip_end, box->y1);
-+
-+	b = c->clip_start;
-+	while (b != c->clip_end) {
-+		BoxRec clipped;
-+
-+		if (box->y2 <= b->y1)
-+			break;
-+
-+		clipped.x1 = x1;
-+		clipped.x2 = x2;
-+		clipped.y1 = box->y1;
-+		clipped.y2 = box->y2;
-+		if (!box_intersect(&clipped, b++))
-+			continue;
-+
-+		c->op.box(c->sna, &c->op, &clipped);
-+	}
-+}
-+
- struct mono_span_thread_boxes {
- 	const struct sna_composite_op *op;
- #define MONO_SPAN_MAX_BOXES (8192/sizeof(BoxRec))
-@@ -482,40 +518,45 @@ struct mono_span_thread_boxes {
- };
- 
- inline static void
--thread_mono_span_add_boxes(struct mono *c, const BoxRec *box, int count)
-+thread_mono_span_add_box(struct mono *c, const BoxRec *box)
- {
- 	struct mono_span_thread_boxes *b = c->op.priv;
- 
--	assert(count > 0 && count <= MONO_SPAN_MAX_BOXES);
--	if (unlikely(b->num_boxes + count > MONO_SPAN_MAX_BOXES)) {
-+	if (unlikely(b->num_boxes == MONO_SPAN_MAX_BOXES)) {
- 		b->op->thread_boxes(c->sna, b->op, b->boxes, b->num_boxes);
- 		b->num_boxes = 0;
- 	}
- 
--	memcpy(b->boxes + b->num_boxes, box, count*sizeof(BoxRec));
--	b->num_boxes += count;
-+	b->boxes[b->num_boxes++] = *box;
- 	assert(b->num_boxes <= MONO_SPAN_MAX_BOXES);
- }
- 
- fastcall static void
- thread_mono_span_clipped(struct mono *c, int x1, int x2, BoxPtr box)
- {
--	pixman_region16_t region;
-+	const BoxRec *b;
- 
- 	__DBG(("%s [%d, %d]\n", __FUNCTION__, x1, x2));
- 
--	box->x1 = x1;
--	box->x2 = x2;
-+	c->clip_start =
-+		find_clip_box_for_y(c->clip_start, c->clip_end, box->y1);
- 
--	assert(c->clip.data);
-+	b = c->clip_start;
-+	while (b != c->clip_end) {
-+		BoxRec clipped;
-+
-+		if (box->y2 <= b->y1)
-+			break;
-+
-+		clipped.x1 = x1;
-+		clipped.x2 = x2;
-+		clipped.y1 = box->y1;
-+		clipped.y2 = box->y2;
-+		if (!box_intersect(&clipped, b++))
-+			continue;
- 
--	pixman_region_init_rects(&region, box, 1);
--	RegionIntersect(&region, &region, &c->clip);
--	if (region_num_rects(&region))
--		thread_mono_span_add_boxes(c,
--					   region_rects(&region),
--					   region_num_rects(&region));
--	pixman_region_fini(&region);
-+		thread_mono_span_add_box(c, &clipped);
-+	}
- }
- 
- fastcall static void
-@@ -525,7 +566,7 @@ thread_mono_span(struct mono *c, int x1, int x2, BoxPtr box)
- 
- 	box->x1 = x1;
- 	box->x2 = x2;
--	thread_mono_span_add_boxes(c, box, 1);
-+	thread_mono_span_add_box(c, box);
- }
- 
- inline static void
-@@ -537,6 +578,8 @@ mono_row(struct mono *c, int16_t y, int16_t h)
- 	int winding = 0;
- 	BoxRec box;
- 
-+	__DBG(("%s: y=%d, h=%d\n", __FUNCTION__, y, h));
-+
- 	DBG_MONO_EDGES(edge);
- 	VALIDATE_MONO_EDGES(&c->head);
- 
-@@ -547,6 +590,8 @@ mono_row(struct mono *c, int16_t y, int16_t h)
- 		struct mono_edge *next = edge->next;
- 		int16_t xend = I(edge->x.quo);
- 
-+		__DBG(("%s: adding edge dir=%d [winding=%d], x=%d [%d]\n",
-+		       __FUNCTION__, edge->dir, winding + edge->dir, xend, edge->x.quo));
- 		if (--edge->height_left) {
- 			if (edge->dy) {
- 				edge->x.quo += edge->dxdy.quo;
-@@ -555,6 +600,8 @@ mono_row(struct mono *c, int16_t y, int16_t h)
- 					++edge->x.quo;
- 					edge->x.rem -= edge->dy;
- 				}
-+				__DBG(("%s: stepped edge (%d.%d) + (%d.%d)/%d, height=%d, prev_x=%d\n",
-+				       __FUNCTION__, edge->x.quo, edge->x.rem, edge->dxdy.quo, edge->dxdy.rem, edge->dy, edge->height_left, edge->x.quo));
- 			}
- 
- 			if (edge->x.quo < prev_x) {
-@@ -578,17 +625,22 @@ mono_row(struct mono *c, int16_t y, int16_t h)
- 		winding += edge->dir;
- 		if (winding == 0) {
- 			assert(I(next->x.quo) >= xend);
--			if (I(next->x.quo) > xend + 1) {
-+			if (I(next->x.quo) > xend) {
-+				__DBG(("%s: end span: %d\n", __FUNCTION__, xend));
- 				if (xstart < c->clip.extents.x1)
- 					xstart = c->clip.extents.x1;
- 				if (xend > c->clip.extents.x2)
- 					xend = c->clip.extents.x2;
--				if (xend > xstart)
-+				if (xend > xstart) {
-+					__DBG(("%s: emit span [%d, %d]\n", __FUNCTION__, xstart, xend));
- 					c->span(c, xstart, xend, &box);
-+				}
- 				xstart = INT16_MIN;
- 			}
--		} else if (xstart == INT16_MIN)
-+		} else if (xstart == INT16_MIN) {
-+			__DBG(("%s: starting new span: %d\n", __FUNCTION__, xend));
- 			xstart = xend;
-+		}
- 
- 		edge = next;
- 	}
-@@ -650,9 +702,14 @@ mono_render(struct mono *mono)
- 	for (i = 0; i < h; i = j) {
- 		j = i + 1;
- 
-+		__DBG(("%s: row=%d, new edges? %d\n", __FUNCTION__,
-+		       i, polygon->y_buckets[i] != NULL));
-+
- 		if (polygon->y_buckets[i])
- 			mono_merge_edges(mono, polygon->y_buckets[i]);
- 
-+		__DBG(("%s: row=%d, vertical? %d\n", __FUNCTION__,
-+		       i, mono->is_vertical));
- 		if (mono->is_vertical) {
- 			struct mono_edge *e = mono->head.next;
- 			int min_height = h - i;
-@@ -667,6 +724,7 @@ mono_render(struct mono *mono)
- 				j++;
- 			if (j != i + 1)
- 				mono_step_edges(mono, j - (i + 1));
-+			__DBG(("%s: %d vertical rows\n", __FUNCTION__, j-i));
- 		}
- 
- 		mono_row(mono, i, j-i);
-@@ -717,6 +775,7 @@ mono_span_thread(void *arg)
- 		if (RegionNil(&mono.clip))
- 			return;
- 	}
-+	region_get_boxes(&mono.clip, &mono.clip_start, &mono.clip_end);
- 
- 	boxes.op = thread->op;
- 	boxes.num_boxes = 0;
-@@ -891,9 +950,12 @@ mono_trapezoids_span_converter(struct sna *sna,
- 
- 	if (mono.clip.data == NULL && mono.op.damage == NULL)
- 		mono.span = mono_span__fast;
-+	else if (mono.clip.data != NULL && mono.op.damage == NULL)
-+		mono.span = mono_span__clipped;
- 	else
- 		mono.span = mono_span;
- 
-+	region_get_boxes(&mono.clip, &mono.clip_start, &mono.clip_end);
- 	mono_render(&mono);
- 	mono.op.done(mono.sna, &mono.op);
- 	mono_fini(&mono);
-@@ -939,6 +1001,7 @@ mono_trapezoids_span_converter(struct sna *sna,
- 					       mono.clip.extents.x2 - mono.clip.extents.x1,
- 					       mono.clip.extents.y2 - mono.clip.extents.y1,
- 					       COMPOSITE_PARTIAL, memset(&mono.op, 0, sizeof(mono.op)))) {
-+			region_get_boxes(&mono.clip, &mono.clip_start, &mono.clip_end);
- 			mono_render(&mono);
- 			mono.op.done(mono.sna, &mono.op);
- 		}
-@@ -974,6 +1037,7 @@ mono_inplace_fill_box(struct sna *sna,
- 	     box->x2 - box->x1,
- 	     box->y2 - box->y1,
- 	     fill->color));
-+	sigtrap_assert_active();
- 	pixman_fill(fill->data, fill->stride, fill->bpp,
- 		    box->x1, box->y1,
- 		    box->x2 - box->x1,
-@@ -995,6 +1059,7 @@ mono_inplace_fill_boxes(struct sna *sna,
- 		     box->x2 - box->x1,
- 		     box->y2 - box->y1,
- 		     fill->color));
-+		sigtrap_assert_active();
- 		pixman_fill(fill->data, fill->stride, fill->bpp,
- 			    box->x1, box->y1,
- 			    box->x2 - box->x1,
-@@ -1382,10 +1447,13 @@ mono_triangles_span_converter(struct sna *sna,
- 		mono_render(&mono);
- 		mono.op.done(mono.sna, &mono.op);
- 	}
-+	mono_fini(&mono);
- 
- 	if (!was_clear && !operator_is_bounded(op)) {
- 		xPointFixed p1, p2;
- 
-+		DBG(("%s: performing unbounded clear\n", __FUNCTION__));
-+
- 		if (!mono_init(&mono, 2+3*count))
- 			return false;
- 
-@@ -1431,7 +1499,6 @@ mono_triangles_span_converter(struct sna *sna,
- 		mono_fini(&mono);
- 	}
- 
--	mono_fini(&mono);
- 	REGION_UNINIT(NULL, &mono.clip);
- 	return true;
- }
-diff --git a/src/sna/sna_trapezoids_precise.c b/src/sna/sna_trapezoids_precise.c
-index 9187ab48..242b4acb 100644
---- a/src/sna/sna_trapezoids_precise.c
-+++ b/src/sna/sna_trapezoids_precise.c
-@@ -1023,6 +1023,16 @@ tor_init(struct tor *converter, const BoxRec *box, int num_edges)
- static void
- tor_add_trapezoid(struct tor *tor, const xTrapezoid *t, int dx, int dy)
- {
-+	if (!xTrapezoidValid(t)) {
-+		__DBG(("%s: skipping invalid trapezoid: top=%d, bottom=%d, left=(%d, %d), (%d, %d), right=(%d, %d), (%d, %d)\n",
-+		       __FUNCTION__,
-+		       t->top, t->bottom,
-+		       t->left.p1.x, t->left.p1.y,
-+		       t->left.p2.x, t->left.p2.y,
-+		       t->right.p1.x, t->right.p1.y,
-+		       t->right.p2.x, t->right.p2.y));
-+		return;
-+	}
- 	polygon_add_edge(tor->polygon, t, &t->left, 1, dx, dy);
- 	polygon_add_edge(tor->polygon, t, &t->right, -1, dx, dy);
- }
-@@ -1635,31 +1645,27 @@ struct span_thread {
- #define SPAN_THREAD_MAX_BOXES (8192/sizeof(struct sna_opacity_box))
- struct span_thread_boxes {
- 	const struct sna_composite_spans_op *op;
-+	const BoxRec *clip_start, *clip_end;
- 	int num_boxes;
- 	struct sna_opacity_box boxes[SPAN_THREAD_MAX_BOXES];
- };
- 
--static void span_thread_add_boxes(struct sna *sna, void *data,
--				  const BoxRec *box, int count, float alpha)
-+static void span_thread_add_box(struct sna *sna, void *data,
-+				const BoxRec *box, float alpha)
- {
- 	struct span_thread_boxes *b = data;
- 
--	__DBG(("%s: adding %d boxes with alpha=%f\n",
--	       __FUNCTION__, count, alpha));
-+	__DBG(("%s: adding box with alpha=%f\n", __FUNCTION__, alpha));
- 
--	assert(count > 0 && count <= SPAN_THREAD_MAX_BOXES);
--	if (unlikely(b->num_boxes + count > SPAN_THREAD_MAX_BOXES)) {
--		DBG(("%s: flushing %d boxes, adding %d\n", __FUNCTION__, b->num_boxes, count));
--		assert(b->num_boxes <= SPAN_THREAD_MAX_BOXES);
-+	if (unlikely(b->num_boxes == SPAN_THREAD_MAX_BOXES)) {
-+		DBG(("%s: flushing %d boxes\n", __FUNCTION__, b->num_boxes));
- 		b->op->thread_boxes(sna, b->op, b->boxes, b->num_boxes);
- 		b->num_boxes = 0;
- 	}
- 
--	do {
--		b->boxes[b->num_boxes].box = *box++;
--		b->boxes[b->num_boxes].alpha = alpha;
--		b->num_boxes++;
--	} while (--count);
-+	b->boxes[b->num_boxes].box = *box++;
-+	b->boxes[b->num_boxes].alpha = alpha;
-+	b->num_boxes++;
- 	assert(b->num_boxes <= SPAN_THREAD_MAX_BOXES);
- }
- 
-@@ -1670,8 +1676,22 @@ span_thread_box(struct sna *sna,
- 		const BoxRec *box,
- 		int coverage)
- {
-+	struct span_thread_boxes *b = (struct span_thread_boxes *)op;
-+
- 	__DBG(("%s: %d -> %d @ %d\n", __FUNCTION__, box->x1, box->x2, coverage));
--	span_thread_add_boxes(sna, op, box, 1, AREA_TO_FLOAT(coverage));
-+	if (b->num_boxes) {
-+		struct sna_opacity_box *bb = &b->boxes[b->num_boxes-1];
-+		if (bb->box.x1 == box->x1 &&
-+		    bb->box.x2 == box->x2 &&
-+		    bb->box.y2 == box->y1 &&
-+		    bb->alpha == AREA_TO_FLOAT(coverage)) {
-+			bb->box.y2 = box->y2;
-+			__DBG(("%s: contracted double row: %d -> %d\n", __func__, bb->box.y1, bb->box.y2));
-+			return;
-+		}
-+	}
-+
-+	span_thread_add_box(sna, op, box, AREA_TO_FLOAT(coverage));
- }
- 
- static void
-@@ -1681,20 +1701,28 @@ span_thread_clipped_box(struct sna *sna,
- 			const BoxRec *box,
- 			int coverage)
- {
--	pixman_region16_t region;
-+	struct span_thread_boxes *b = (struct span_thread_boxes *)op;
-+	const BoxRec *c;
- 
- 	__DBG(("%s: %d -> %d @ %f\n", __FUNCTION__, box->x1, box->x2,
- 	       AREA_TO_FLOAT(coverage)));
- 
--	pixman_region_init_rects(&region, box, 1);
--	RegionIntersect(&region, &region, clip);
--	if (region_num_rects(&region)) {
--		span_thread_add_boxes(sna, op,
--				      region_rects(&region),
--				      region_num_rects(&region),
--				      AREA_TO_FLOAT(coverage));
-+	b->clip_start =
-+		find_clip_box_for_y(b->clip_start, b->clip_end, box->y1);
-+
-+	c = b->clip_start;
-+	while (c != b->clip_end) {
-+		BoxRec clipped;
-+
-+		if (box->y2 <= c->y1)
-+			break;
-+
-+		clipped = *box;
-+		if (!box_intersect(&clipped, c++))
-+			continue;
-+
-+		span_thread_add_box(sna, op, &clipped, AREA_TO_FLOAT(coverage));
- 	}
--	pixman_region_fini(&region);
- }
- 
- static span_func_t
-@@ -1712,7 +1740,7 @@ thread_choose_span(struct sna_composite_spans_op *tmp,
- 
- 	assert(!is_mono(dst, maskFormat));
- 	assert(tmp->thread_boxes);
--	DBG(("%s: clipped? %d\n", __FUNCTION__, clip->data != NULL));
-+	DBG(("%s: clipped? %d x %d\n", __FUNCTION__, clip->data != NULL, region_num_rects(clip)));
- 	if (clip->data)
- 		span = span_thread_clipped_box;
- 	else
-@@ -1721,6 +1749,17 @@ thread_choose_span(struct sna_composite_spans_op *tmp,
- 	return span;
- }
- 
-+inline static void
-+span_thread_boxes_init(struct span_thread_boxes *boxes,
-+		       const struct sna_composite_spans_op *op,
-+		       const RegionRec *clip)
-+{
-+	boxes->op = op;
-+	boxes->clip_start = region_rects(clip);
-+	boxes->clip_end = boxes->clip_start + region_num_rects(clip);
-+	boxes->num_boxes = 0;
-+}
-+
- static void
- span_thread(void *arg)
- {
-@@ -1733,8 +1772,7 @@ span_thread(void *arg)
- 	if (!tor_init(&tor, &thread->extents, 2*thread->ntrap))
- 		return;
- 
--	boxes.op = thread->op;
--	boxes.num_boxes = 0;
-+	span_thread_boxes_init(&boxes, thread->op, thread->clip);
- 
- 	y1 = thread->extents.y1 - thread->draw_y;
- 	y2 = thread->extents.y2 - thread->draw_y;
-@@ -2183,6 +2221,52 @@ static force_inline uint8_t coverage_opacity(int coverage, uint8_t opacity)
- 	return opacity == 255 ? coverage : mul_8_8(coverage, opacity);
- }
- 
-+struct clipped_span {
-+	span_func_t span;
-+	const BoxRec *clip_start, *clip_end;
-+};
-+
-+static void
-+tor_blt_clipped(struct sna *sna,
-+		struct sna_composite_spans_op *op,
-+		pixman_region16_t *clip,
-+		const BoxRec *box,
-+		int coverage)
-+{
-+	struct clipped_span *cs = (struct clipped_span *)clip;
-+	const BoxRec *c;
-+
-+	cs->clip_start =
-+		find_clip_box_for_y(cs->clip_start, cs->clip_end, box->y1);
-+
-+	c = cs->clip_start;
-+	while (c != cs->clip_end) {
-+		BoxRec clipped;
-+
-+		if (box->y2 <= c->y1)
-+			break;
-+
-+		clipped = *box;
-+		if (!box_intersect(&clipped, c++))
-+			continue;
-+
-+		cs->span(sna, op, NULL, &clipped, coverage);
-+	}
-+}
-+
-+inline static span_func_t
-+clipped_span(struct clipped_span *cs,
-+	     span_func_t span,
-+	     const RegionRec *clip)
-+{
-+	if (clip->data) {
-+		cs->span = span;
-+		region_get_boxes(clip, &cs->clip_start, &cs->clip_end);
-+		span = tor_blt_clipped;
-+	}
-+	return span;
-+}
-+
- static void _tor_blt_src(struct inplace *in, const BoxRec *box, uint8_t v)
- {
- 	uint8_t *ptr = in->ptr;
-@@ -2218,25 +2302,6 @@ tor_blt_src(struct sna *sna,
- }
- 
- static void
--tor_blt_src_clipped(struct sna *sna,
--		    struct sna_composite_spans_op *op,
--		    pixman_region16_t *clip,
--		    const BoxRec *box,
--		    int coverage)
--{
--	pixman_region16_t region;
--	int n;
--
--	pixman_region_init_rects(&region, box, 1);
--	RegionIntersect(&region, &region, clip);
--	n = region_num_rects(&region);
--	box = region_rects(&region);
--	while (n--)
--		tor_blt_src(sna, op, NULL, box++, coverage);
--	pixman_region_fini(&region);
--}
--
--static void
- tor_blt_in(struct sna *sna,
- 	   struct sna_composite_spans_op *op,
- 	   pixman_region16_t *clip,
-@@ -2268,25 +2333,6 @@ tor_blt_in(struct sna *sna,
- }
- 
- static void
--tor_blt_in_clipped(struct sna *sna,
--		   struct sna_composite_spans_op *op,
--		   pixman_region16_t *clip,
--		   const BoxRec *box,
--		   int coverage)
--{
--	pixman_region16_t region;
--	int n;
--
--	pixman_region_init_rects(&region, box, 1);
--	RegionIntersect(&region, &region, clip);
--	n = region_num_rects(&region);
--	box = region_rects(&region);
--	while (n--)
--		tor_blt_in(sna, op, NULL, box++, coverage);
--	pixman_region_fini(&region);
--}
--
--static void
- tor_blt_add(struct sna *sna,
- 	    struct sna_composite_spans_op *op,
- 	    pixman_region16_t *clip,
-@@ -2325,25 +2371,6 @@ tor_blt_add(struct sna *sna,
- }
- 
- static void
--tor_blt_add_clipped(struct sna *sna,
--		    struct sna_composite_spans_op *op,
--		    pixman_region16_t *clip,
--		    const BoxRec *box,
--		    int coverage)
--{
--	pixman_region16_t region;
--	int n;
--
--	pixman_region_init_rects(&region, box, 1);
--	RegionIntersect(&region, &region, clip);
--	n = region_num_rects(&region);
--	box = region_rects(&region);
--	while (n--)
--		tor_blt_add(sna, op, NULL, box++, coverage);
--	pixman_region_fini(&region);
--}
--
--static void
- tor_blt_lerp32(struct sna *sna,
- 	       struct sna_composite_spans_op *op,
- 	       pixman_region16_t *clip,
-@@ -2358,6 +2385,7 @@ tor_blt_lerp32(struct sna *sna,
- 	if (coverage == 0)
- 		return;
- 
-+	sigtrap_assert_active();
- 	ptr += box->y1 * stride + box->x1;
- 
- 	h = box->y2 - box->y1;
-@@ -2396,25 +2424,6 @@ tor_blt_lerp32(struct sna *sna,
- 	}
- }
- 
--static void
--tor_blt_lerp32_clipped(struct sna *sna,
--		       struct sna_composite_spans_op *op,
--		       pixman_region16_t *clip,
--		       const BoxRec *box,
--		       int coverage)
--{
--	pixman_region16_t region;
--	int n;
--
--	pixman_region_init_rects(&region, box, 1);
--	RegionIntersect(&region, &region, clip);
--	n = region_num_rects(&region);
--	box = region_rects(&region);
--	while (n--)
--		tor_blt_lerp32(sna, op, NULL, box++, coverage);
--	pixman_region_fini(&region);
--}
--
- struct pixman_inplace {
- 	pixman_image_t *image, *source, *mask;
- 	uint32_t color;
-@@ -2442,24 +2451,6 @@ pixmask_span_solid(struct sna *sna,
- 			       pi->dx + box->x1, pi->dy + box->y1,
- 			       box->x2 - box->x1, box->y2 - box->y1);
- }
--static void
--pixmask_span_solid__clipped(struct sna *sna,
--			    struct sna_composite_spans_op *op,
--			    pixman_region16_t *clip,
--			    const BoxRec *box,
--			    int coverage)
--{
--	pixman_region16_t region;
--	int n;
--
--	pixman_region_init_rects(&region, box, 1);
--	RegionIntersect(&region, &region, clip);
--	n = region_num_rects(&region);
--	box = region_rects(&region);
--	while (n--)
--		pixmask_span_solid(sna, op, NULL, box++, coverage);
--	pixman_region_fini(&region);
--}
- 
- static void
- pixmask_span(struct sna *sna,
-@@ -2480,24 +2471,6 @@ pixmask_span(struct sna *sna,
- 			       pi->dx + box->x1, pi->dy + box->y1,
- 			       box->x2 - box->x1, box->y2 - box->y1);
- }
--static void
--pixmask_span__clipped(struct sna *sna,
--		      struct sna_composite_spans_op *op,
--		      pixman_region16_t *clip,
--		      const BoxRec *box,
--		      int coverage)
--{
--	pixman_region16_t region;
--	int n;
--
--	pixman_region_init_rects(&region, box, 1);
--	RegionIntersect(&region, &region, clip);
--	n = region_num_rects(&region);
--	box = region_rects(&region);
--	while (n--)
--		pixmask_span(sna, op, NULL, box++, coverage);
--	pixman_region_fini(&region);
--}
- 
- struct inplace_x8r8g8b8_thread {
- 	xTrapezoid *traps;
-@@ -2516,6 +2489,7 @@ static void inplace_x8r8g8b8_thread(void *arg)
- 	struct inplace_x8r8g8b8_thread *thread = arg;
- 	struct tor tor;
- 	span_func_t span;
-+	struct clipped_span clipped;
- 	RegionPtr clip;
- 	int y1, y2, n;
- 
-@@ -2546,12 +2520,11 @@ static void inplace_x8r8g8b8_thread(void *arg)
- 		inplace.stride = pixmap->devKind;
- 		inplace.color = thread->color;
- 
--		if (clip->data)
--			span = tor_blt_lerp32_clipped;
--		else
--			span = tor_blt_lerp32;
-+		span = clipped_span(&clipped, tor_blt_lerp32, clip);
- 
--		tor_render(NULL, &tor, (void*)&inplace, clip, span, false);
-+		tor_render(NULL, &tor,
-+			   (void*)&inplace, (void *)&clipped,
-+			   span, false);
- 	} else if (thread->is_solid) {
- 		struct pixman_inplace pi;
- 
-@@ -2564,10 +2537,7 @@ static void inplace_x8r8g8b8_thread(void *arg)
- 						     1, 1, pi.bits, 0);
- 		pixman_image_set_repeat(pi.source, PIXMAN_REPEAT_NORMAL);
- 
--		if (clip->data)
--			span = pixmask_span_solid__clipped;
--		else
--			span = pixmask_span_solid;
-+		span = clipped_span(&clipped, pixmask_span_solid, clip);
- 
- 		tor_render(NULL, &tor, (void*)&pi, clip, span, false);
- 
-@@ -2588,12 +2558,11 @@ static void inplace_x8r8g8b8_thread(void *arg)
- 		pi.bits = pixman_image_get_data(pi.mask);
- 		pi.op = thread->op;
- 
--		if (clip->data)
--			span = pixmask_span__clipped;
--		else
--			span = pixmask_span;
-+		span = clipped_span(&clipped, pixmask_span, clip);
- 
--		tor_render(NULL, &tor, (void*)&pi, clip, span, false);
-+		tor_render(NULL, &tor,
-+			   (void*)&pi, (void *)&clipped,
-+			   span, false);
- 
- 		pixman_image_unref(pi.mask);
- 		pixman_image_unref(pi.source);
-@@ -2712,6 +2681,7 @@ trapezoid_span_inplace__x8r8g8b8(CARD8 op,
- 	if (num_threads == 1) {
- 		struct tor tor;
- 		span_func_t span;
-+		struct clipped_span clipped;
- 
- 		if (!tor_init(&tor, &region.extents, 2*ntrap))
- 			return true;
-@@ -2737,17 +2707,14 @@ trapezoid_span_inplace__x8r8g8b8(CARD8 op,
- 			inplace.stride = pixmap->devKind;
- 			inplace.color = color;
- 
--			if (dst->pCompositeClip->data)
--				span = tor_blt_lerp32_clipped;
--			else
--				span = tor_blt_lerp32;
--
-+			span = clipped_span(&clipped, tor_blt_lerp32, dst->pCompositeClip);
- 			DBG(("%s: render inplace op=%d, color=%08x\n",
- 			     __FUNCTION__, op, color));
- 
- 			if (sigtrap_get() == 0) {
--				tor_render(NULL, &tor, (void*)&inplace,
--					   dst->pCompositeClip, span, false);
-+				tor_render(NULL, &tor,
-+					   (void*)&inplace, (void*)&clipped,
-+					   span, false);
- 				sigtrap_put();
- 			}
- 		} else if (is_solid) {
-@@ -2762,15 +2729,11 @@ trapezoid_span_inplace__x8r8g8b8(CARD8 op,
- 							     1, 1, pi.bits, 0);
- 			pixman_image_set_repeat(pi.source, PIXMAN_REPEAT_NORMAL);
- 
--			if (dst->pCompositeClip->data)
--				span = pixmask_span_solid__clipped;
--			else
--				span = pixmask_span_solid;
--
-+			span = clipped_span(&clipped, pixmask_span_solid, dst->pCompositeClip);
- 			if (sigtrap_get() == 0) {
--				tor_render(NULL, &tor, (void*)&pi,
--					   dst->pCompositeClip, span,
--					   false);
-+				tor_render(NULL, &tor,
-+					   (void*)&pi, (void*)&clipped,
-+					    span, false);
- 				sigtrap_put();
- 			}
- 
-@@ -2791,15 +2754,11 @@ trapezoid_span_inplace__x8r8g8b8(CARD8 op,
- 			pi.bits = pixman_image_get_data(pi.mask);
- 			pi.op = op;
- 
--			if (dst->pCompositeClip->data)
--				span = pixmask_span__clipped;
--			else
--				span = pixmask_span;
--
-+			span = clipped_span(&clipped, pixmask_span, dst->pCompositeClip);
- 			if (sigtrap_get() == 0) {
--				tor_render(NULL, &tor, (void*)&pi,
--					   dst->pCompositeClip, span,
--					   false);
-+				tor_render(NULL, &tor,
-+					   (void*)&pi, (void *)&clipped,
-+					   span, false);
- 				sigtrap_put();
- 			}
- 
-@@ -2861,9 +2820,9 @@ trapezoid_span_inplace__x8r8g8b8(CARD8 op,
- 
- struct inplace_thread {
- 	xTrapezoid *traps;
--	RegionPtr clip;
- 	span_func_t span;
- 	struct inplace inplace;
-+	struct clipped_span clipped;
- 	BoxRec extents;
- 	int dx, dy;
- 	int draw_x, draw_y;
-@@ -2888,8 +2847,9 @@ static void inplace_thread(void *arg)
- 		tor_add_trapezoid(&tor, &thread->traps[n], thread->dx, thread->dy);
- 	}
- 
--	tor_render(NULL, &tor, (void*)&thread->inplace,
--		   thread->clip, thread->span, thread->unbounded);
-+	tor_render(NULL, &tor, 
-+		   (void*)&thread->inplace, (void*)&thread->clipped,
-+		   thread->span, thread->unbounded);
- 
- 	tor_fini(&tor);
- }
-@@ -2903,6 +2863,7 @@ precise_trapezoid_span_inplace(struct sna *sna,
- 			       bool fallback)
- {
- 	struct inplace inplace;
-+	struct clipped_span clipped;
- 	span_func_t span;
- 	PixmapPtr pixmap;
- 	struct sna_pixmap *priv;
-@@ -3020,21 +2981,12 @@ precise_trapezoid_span_inplace(struct sna *sna,
- 	     dst->pCompositeClip->data != NULL));
- 
- 	if (op == PictOpSrc) {
--		if (dst->pCompositeClip->data)
--			span = tor_blt_src_clipped;
--		else
--			span = tor_blt_src;
-+		span = tor_blt_src;
- 	} else if (op == PictOpIn) {
--		if (dst->pCompositeClip->data)
--			span = tor_blt_in_clipped;
--		else
--			span = tor_blt_in;
-+		span = tor_blt_in;
- 	} else {
- 		assert(op == PictOpAdd);
--		if (dst->pCompositeClip->data)
--			span = tor_blt_add_clipped;
--		else
--			span = tor_blt_add;
-+		span = tor_blt_add;
- 	}
- 
- 	DBG(("%s: move-to-cpu(dst)\n", __FUNCTION__));
-@@ -3052,6 +3004,8 @@ precise_trapezoid_span_inplace(struct sna *sna,
- 	inplace.stride = pixmap->devKind;
- 	inplace.opacity = color >> 24;
- 
-+	span = clipped_span(&clipped, span, dst->pCompositeClip);
-+
- 	num_threads = 1;
- 	if (!NO_GPU_THREADS &&
- 	    (flags & COMPOSITE_SPANS_RECTILINEAR) == 0)
-@@ -3074,8 +3028,9 @@ precise_trapezoid_span_inplace(struct sna *sna,
- 		}
- 
- 		if (sigtrap_get() == 0) {
--			tor_render(NULL, &tor, (void*)&inplace,
--				   dst->pCompositeClip, span, unbounded);
-+			tor_render(NULL, &tor,
-+				   (void*)&inplace, (void *)&clipped,
-+				   span, unbounded);
- 			sigtrap_put();
- 		}
- 
-@@ -3093,7 +3048,7 @@ precise_trapezoid_span_inplace(struct sna *sna,
- 		threads[0].ntrap = ntrap;
- 		threads[0].inplace = inplace;
- 		threads[0].extents = region.extents;
--		threads[0].clip = dst->pCompositeClip;
-+		threads[0].clipped = clipped;
- 		threads[0].span = span;
- 		threads[0].unbounded = unbounded;
- 		threads[0].dx = dx;
-@@ -3316,8 +3271,7 @@ tristrip_thread(void *arg)
- 	if (!tor_init(&tor, &thread->extents, 2*thread->count))
- 		return;
- 
--	boxes.op = thread->op;
--	boxes.num_boxes = 0;
-+	span_thread_boxes_init(&boxes, thread->op, thread->clip);
- 
- 	cw = 0; ccw = 1;
- 	polygon_add_line(tor.polygon,
-diff --git a/src/sna/sna_video.c b/src/sna/sna_video.c
-index ed0e7b31..e2b11c31 100644
---- a/src/sna/sna_video.c
-+++ b/src/sna/sna_video.c
-@@ -591,6 +591,72 @@ use_gtt: /* copy data, must use GTT so that we keep the overlay uncached */
- 	return true;
- }
- 
-+void sna_video_fill_colorkey(struct sna_video *video,
-+			     const RegionRec *clip)
-+{
-+	struct sna *sna = video->sna;
-+	PixmapPtr front = sna->front;
-+	struct kgem_bo *bo = __sna_pixmap_get_bo(front);
-+	uint8_t *dst, *tmp;
-+	int w, width;
-+
-+	if (video->AlwaysOnTop || RegionEqual(&video->clip, (RegionPtr)clip))
-+		return;
-+
-+	assert(bo);
-+	if (!wedged(sna) &&
-+	    sna_blt_fill_boxes(sna, GXcopy, bo,
-+			       front->drawable.bitsPerPixel,
-+			       video->color_key,
-+			       region_rects(clip),
-+			       region_num_rects(clip))) {
-+		RegionCopy(&video->clip, (RegionPtr)clip);
-+		return;
-+	}
-+
-+	dst = kgem_bo_map__gtt(&sna->kgem, bo);
-+	if (dst == NULL)
-+		return;
-+
-+	w = front->drawable.bitsPerPixel/8;
-+	width = (clip->extents.x2 - clip->extents.x1) * w;
-+	tmp = malloc(width);
-+	if (tmp == NULL)
-+		return;
-+
-+	memcpy(tmp, &video->color_key, w);
-+	while (2 * w < width) {
-+		memcpy(tmp + w, tmp, w);
-+		w *= 2;
-+	}
-+	if (w < width)
-+		memcpy(tmp + w, tmp, width - w);
-+
-+	if (sigtrap_get() == 0) {
-+		const BoxRec *box = region_rects(clip);
-+		int n = region_num_rects(clip);
-+
-+		w = front->drawable.bitsPerPixel/8;
-+		do {
-+			int y = box->y1;
-+			uint8_t *row = dst + y*bo->pitch + w*box->x1;
-+
-+			width = (box->x2 - box->x1) * w;
-+			while (y < box->y2) {
-+				memcpy(row, tmp, width);
-+				row += bo->pitch;
-+				y++;
-+			}
-+			box++;
-+		} while (--n);
-+		sigtrap_put();
-+
-+		RegionCopy(&video->clip, (RegionPtr)clip);
-+	}
-+
-+	free(tmp);
-+}
-+
- XvAdaptorPtr sna_xv_adaptor_alloc(struct sna *sna)
- {
- 	XvAdaptorPtr new_adaptors;
-diff --git a/src/sna/sna_video.h b/src/sna/sna_video.h
-index f21605fc..39cb725f 100644
---- a/src/sna/sna_video.h
-+++ b/src/sna/sna_video.h
-@@ -72,6 +72,8 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- struct sna_video {
- 	struct sna *sna;
- 
-+	int idx; /* XXX expose struct plane instead? */
-+
- 	int brightness;
- 	int contrast;
- 	int saturation;
-@@ -193,6 +195,9 @@ bool
- sna_video_copy_data(struct sna_video *video,
- 		    struct sna_video_frame *frame,
- 		    const uint8_t *buf);
-+void
-+sna_video_fill_colorkey(struct sna_video *video,
-+			const RegionRec *clip);
- 
- void sna_video_buffer_fini(struct sna_video *video);
- 
-@@ -210,4 +215,26 @@ sna_window_set_port(WindowPtr window, XvPortPtr port)
- 	((void **)__get_private(window, sna_window_key))[2] = port;
- }
- 
-+static inline int offset_and_clip(int x, int dx)
-+{
-+	x += dx;
-+	if (x <= 0)
-+		return 0;
-+	if (x >= MAXSHORT)
-+		return MAXSHORT;
-+	return x;
-+}
-+
-+static inline void init_video_region(RegionRec *region,
-+				     DrawablePtr draw,
-+				     int drw_x, int drw_y,
-+				     int drw_w, int drw_h)
-+{
-+	region->extents.x1 = offset_and_clip(draw->x, drw_x);
-+	region->extents.y1 = offset_and_clip(draw->y, drw_y);
-+	region->extents.x2 = offset_and_clip(draw->x, drw_x + drw_w);
-+	region->extents.y2 = offset_and_clip(draw->y, drw_y + drw_h);
-+	region->data = NULL;
-+}
-+
- #endif /* SNA_VIDEO_H */
-diff --git a/src/sna/sna_video_overlay.c b/src/sna/sna_video_overlay.c
-index ac81f1a0..9bc5ce40 100644
---- a/src/sna/sna_video_overlay.c
-+++ b/src/sna/sna_video_overlay.c
-@@ -130,7 +130,7 @@ static int sna_video_overlay_stop(ddStopVideo_ARGS)
- 
- 	DBG(("%s()\n", __FUNCTION__));
- 
--	REGION_EMPTY(scrn->pScreen, &video->clip);
-+	REGION_EMPTY(to_screen_from_sna(sna), &video->clip);
- 
- 	request.flags = 0;
- 	(void)drmIoctl(sna->kgem.fd,
-@@ -474,15 +474,13 @@ sna_video_overlay_put_image(ddPutImage_ARGS)
- 	if (src_h >= (drw_h * 8))
- 		drw_h = src_h / 7;
- 
--	clip.extents.x1 = draw->x + drw_x;
--	clip.extents.y1 = draw->y + drw_y;
--	clip.extents.x2 = clip.extents.x1 + drw_w;
--	clip.extents.y2 = clip.extents.y1 + drw_h;
--	clip.data = NULL;
-+	init_video_region(&clip, draw, drw_x, drw_y, drw_w, drw_h);
- 
- 	DBG(("%s: always_on_top=%d\n", __FUNCTION__, video->AlwaysOnTop));
--	if (!video->AlwaysOnTop)
-+	if (!video->AlwaysOnTop) {
-+		ValidateGC(draw, gc);
- 		RegionIntersect(&clip, &clip, gc->pCompositeClip);
-+	}
- 	if (box_empty(&clip.extents))
- 		goto invisible;
- 
-@@ -551,15 +549,7 @@ sna_video_overlay_put_image(ddPutImage_ARGS)
- 	ret = Success;
- 	if (sna_video_overlay_show
- 	    (sna, video, &frame, crtc, &dstBox, src_w, src_h, drw_w, drw_h)) {
--		//xf86XVFillKeyHelperDrawable(draw, video->color_key, &clip);
--		if (!video->AlwaysOnTop && !RegionEqual(&video->clip, &clip) &&
--		    sna_blt_fill_boxes(sna, GXcopy,
--				       __sna_pixmap_get_bo(sna->front),
--				       sna->front->drawable.bitsPerPixel,
--				       video->color_key,
--				       region_rects(&clip),
--				       region_num_rects(&clip)))
--			RegionCopy(&video->clip, &clip);
-+		sna_video_fill_colorkey(video, &clip);
- 		sna_window_set_port((WindowPtr)draw, port);
- 	} else {
- 		DBG(("%s: failed to show video frame\n", __FUNCTION__));
-diff --git a/src/sna/sna_video_sprite.c b/src/sna/sna_video_sprite.c
-index 92230f97..69bfdfd2 100644
---- a/src/sna/sna_video_sprite.c
-+++ b/src/sna/sna_video_sprite.c
-@@ -47,6 +47,8 @@
- #define DRM_FORMAT_YUYV         fourcc_code('Y', 'U', 'Y', 'V') /* [31:0] Cr0:Y1:Cb0:Y0 8:8:8:8 little endian */
- #define DRM_FORMAT_UYVY         fourcc_code('U', 'Y', 'V', 'Y') /* [31:0] Y1:Cr0:Y0:Cb0 8:8:8:8 little endian */
- 
-+#define has_hw_scaling(sna) ((sna)->kgem.gen < 071)
-+
- #define LOCAL_IOCTL_MODE_SETPLANE	DRM_IOWR(0xB7, struct local_mode_set_plane)
- struct local_mode_set_plane {
- 	uint32_t plane_id;
-@@ -81,19 +83,17 @@ static int sna_video_sprite_stop(ddStopVideo_ARGS)
- 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(video->sna->scrn);
- 	int i;
- 
--	for (i = 0; i < config->num_crtc; i++) {
-+	for (i = 0; i < video->sna->mode.num_real_crtc; i++) {
- 		xf86CrtcPtr crtc = config->crtc[i];
- 		int pipe;
- 
--		if (sna_crtc_id(crtc) == 0)
--			break;
--
--		pipe = sna_crtc_to_pipe(crtc);
-+		pipe = sna_crtc_pipe(crtc);
-+		assert(pipe < ARRAY_SIZE(video->bo));
- 		if (video->bo[pipe] == NULL)
- 			continue;
- 
- 		memset(&s, 0, sizeof(s));
--		s.plane_id = sna_crtc_to_sprite(crtc);
-+		s.plane_id = sna_crtc_to_sprite(crtc, video->idx);
- 		if (drmIoctl(video->sna->kgem.fd, LOCAL_IOCTL_MODE_SETPLANE, &s))
- 			xf86DrvMsg(video->sna->scrn->scrnIndex, X_ERROR,
- 				   "failed to disable plane\n");
-@@ -153,7 +153,7 @@ static int sna_video_sprite_best_size(ddQueryBestSize_ARGS)
- 	struct sna_video *video = port->devPriv.ptr;
- 	struct sna *sna = video->sna;
- 
--	if (sna->kgem.gen >= 075) {
-+	if (!has_hw_scaling(sna) && !sna->render.video) {
- 		*p_w = vid_w;
- 		*p_h = vid_h;
- 	} else {
-@@ -221,12 +221,12 @@ sna_video_sprite_show(struct sna *sna,
- 		      BoxPtr dstBox)
- {
- 	struct local_mode_set_plane s;
--	int pipe = sna_crtc_to_pipe(crtc);
-+	int pipe = sna_crtc_pipe(crtc);
- 
- 	/* XXX handle video spanning multiple CRTC */
- 
- 	VG_CLEAR(s);
--	s.plane_id = sna_crtc_to_sprite(crtc);
-+	s.plane_id = sna_crtc_to_sprite(crtc, video->idx);
- 
- #define DRM_I915_SET_SPRITE_COLORKEY 0x2b
- #define LOCAL_IOCTL_I915_SET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct local_intel_sprite_colorkey)
-@@ -263,9 +263,6 @@ sna_video_sprite_show(struct sna *sna,
- 		video->color_key_changed &= ~(1 << pipe);
- 	}
- 
--	if (video->bo[pipe] == frame->bo)
--		return true;
--
- 	update_dst_box_to_crtc_coords(sna, crtc, dstBox);
- 	if (frame->rotation & (RR_Rotate_90 | RR_Rotate_270)) {
- 		int tmp = frame->width;
-@@ -283,15 +280,30 @@ sna_video_sprite_show(struct sna *sna,
- 			uint32_t handles[4];
- 			uint32_t pitches[4]; /* pitch for each plane */
- 			uint32_t offsets[4]; /* offset of each plane */
-+			uint64_t modifiers[4];
- 		} f;
- 		bool purged = true;
- 
- 		memset(&f, 0, sizeof(f));
- 		f.width = frame->width;
- 		f.height = frame->height;
-+		f.flags = 1 << 1; /* +modifiers */
- 		f.handles[0] = frame->bo->handle;
- 		f.pitches[0] = frame->pitch[0];
- 
-+		switch (frame->bo->tiling) {
-+		case I915_TILING_NONE:
-+			break;
-+		case I915_TILING_X:
-+			/* I915_FORMAT_MOD_X_TILED */
-+			f.modifiers[0] = (uint64_t)1 << 56 | 1;
-+			break;
-+		case I915_TILING_Y:
-+			/* I915_FORMAT_MOD_X_TILED */
-+			f.modifiers[0] = (uint64_t)1 << 56 | 2;
-+			break;
-+		}
-+
- 		switch (frame->id) {
- 		case FOURCC_RGB565:
- 			f.pixel_format = DRM_FORMAT_RGB565;
-@@ -360,7 +372,7 @@ sna_video_sprite_show(struct sna *sna,
- 		return false;
- 	}
- 
--	frame->bo->domain = DOMAIN_NONE;
-+	__kgem_bo_clear_dirty(frame->bo);
- 
- 	if (video->bo[pipe])
- 		kgem_bo_destroy(&sna->kgem, video->bo[pipe]);
-@@ -374,17 +386,17 @@ static int sna_video_sprite_put_image(ddPutImage_ARGS)
- 	struct sna *sna = video->sna;
- 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
- 	RegionRec clip;
-+	BoxRec draw_extents;
- 	int ret, i;
- 
--	clip.extents.x1 = draw->x + drw_x;
--	clip.extents.y1 = draw->y + drw_y;
--	clip.extents.x2 = clip.extents.x1 + drw_w;
--	clip.extents.y2 = clip.extents.y1 + drw_h;
--	clip.data = NULL;
-+	init_video_region(&clip, draw, drw_x, drw_y, drw_w, drw_h);
-+	draw_extents = clip.extents;
- 
- 	DBG(("%s: always_on_top=%d\n", __FUNCTION__, video->AlwaysOnTop));
--	if (!video->AlwaysOnTop)
-+	if (!video->AlwaysOnTop) {
-+		ValidateGC(draw, gc);
- 		RegionIntersect(&clip, &clip, gc->pCompositeClip);
-+	}
- 
- 	DBG(("%s: src=(%d, %d),(%d, %d), dst=(%d, %d),(%d, %d), id=%d, sizep=%dx%d, sync?=%d\n",
- 	     __FUNCTION__,
-@@ -402,19 +414,17 @@ static int sna_video_sprite_put_image(ddPutImage_ARGS)
- 		goto err;
- 	}
- 
--	for (i = 0; i < config->num_crtc; i++) {
-+	for (i = 0; i < video->sna->mode.num_real_crtc; i++) {
- 		xf86CrtcPtr crtc = config->crtc[i];
- 		struct sna_video_frame frame;
-+		BoxRec dst = draw_extents;
- 		int pipe;
- 		INT32 x1, x2, y1, y2;
--		BoxRec dst;
- 		RegionRec reg;
- 		Rotation rotation;
-+		bool cache_bo;
- 
--		if (sna_crtc_id(crtc) == 0)
--			break;
--
--		pipe = sna_crtc_to_pipe(crtc);
-+		pipe = sna_crtc_pipe(crtc);
- 
- 		sna_video_frame_init(video, format->id, width, height, &frame);
- 
-@@ -423,10 +433,11 @@ static int sna_video_sprite_put_image(ddPutImage_ARGS)
- 		RegionIntersect(&reg, &reg, &clip);
- 		if (RegionNil(&reg)) {
- off:
-+			assert(pipe < ARRAY_SIZE(video->bo));
- 			if (video->bo[pipe]) {
- 				struct local_mode_set_plane s;
- 				memset(&s, 0, sizeof(s));
--				s.plane_id = sna_crtc_to_sprite(crtc);
-+				s.plane_id = sna_crtc_to_sprite(crtc, video->idx);
- 				if (drmIoctl(video->sna->kgem.fd, LOCAL_IOCTL_MODE_SETPLANE, &s))
- 					xf86DrvMsg(video->sna->scrn->scrnIndex, X_ERROR,
- 						   "failed to disable plane\n");
-@@ -440,8 +451,6 @@ off:
- 		y1 = src_y;
- 		y2 = src_y + src_h;
- 
--		dst = clip.extents;
--
- 		ret = xf86XVClipVideoHelper(&dst, &x1, &x2, &y1, &y2,
- 					    &reg, frame.width, frame.height);
- 		RegionUninit(&reg);
-@@ -465,8 +474,8 @@ off:
- 
- 		/* if sprite can't handle rotation natively, store it for the copy func */
- 		rotation = RR_Rotate_0;
--		if (!sna_crtc_set_sprite_rotation(crtc, crtc->rotation)) {
--			sna_crtc_set_sprite_rotation(crtc, RR_Rotate_0);
-+		if (!sna_crtc_set_sprite_rotation(crtc, video->idx, crtc->rotation)) {
-+			sna_crtc_set_sprite_rotation(crtc, video->idx, RR_Rotate_0);
- 			rotation = crtc->rotation;
- 		}
- 		sna_video_frame_set_rotation(video, &frame, rotation);
-@@ -496,6 +505,8 @@ off:
- 			frame.image.y1 = 0;
- 			frame.image.x2 = frame.width;
- 			frame.image.y2 = frame.height;
-+
-+			cache_bo = false;
- 		} else {
- 			frame.bo = sna_video_buffer(video, &frame);
- 			if (frame.bo == NULL) {
-@@ -509,6 +520,60 @@ off:
- 				ret = BadAlloc;
- 				goto err;
- 			}
-+
-+			cache_bo = true;
-+		}
-+
-+		if (!has_hw_scaling(sna) && sna->render.video &&
-+		    !((frame.src.x2 - frame.src.x1) == (dst.x2 - dst.x1) &&
-+		      (frame.src.y2 - frame.src.y1) == (dst.y2 - dst.y1))) {
-+			ScreenPtr screen = to_screen_from_sna(sna);
-+			PixmapPtr scaled;
-+			RegionRec r;
-+
-+			r.extents.x1 = r.extents.y1 = 0;
-+			r.extents.x2 = dst.x2 - dst.x1;
-+			r.extents.y2 = dst.y2 - dst.y1;
-+			r.data = NULL;
-+
-+			DBG(("%s: scaling from (%d, %d) to (%d, %d)\n",
-+			     __FUNCTION__,
-+			     frame.src.x2 - frame.src.x1,
-+			     frame.src.y2 - frame.src.y1,
-+			     r.extents.x2, r.extents.y2));
-+
-+			scaled = screen->CreatePixmap(screen,
-+						      r.extents.x2,
-+						      r.extents.y2,
-+						      24,
-+						      CREATE_PIXMAP_USAGE_SCRATCH);
-+			if (scaled == NULL) {
-+				ret = BadAlloc;
-+				goto err;
-+			}
-+
-+			if (!sna->render.video(sna, video, &frame, &r, scaled)) {
-+				screen->DestroyPixmap(scaled);
-+				ret = BadAlloc;
-+				goto err;
-+			}
-+
-+			if (cache_bo)
-+				sna_video_buffer_fini(video);
-+			else
-+				kgem_bo_destroy(&sna->kgem, frame.bo);
-+
-+			frame.bo = kgem_bo_reference(__sna_pixmap_get_bo(scaled));
-+			kgem_bo_submit(&sna->kgem, frame.bo);
-+
-+			frame.id = FOURCC_RGB888;
-+			frame.src = frame.image = r.extents;
-+			frame.width = frame.image.x2;
-+			frame.height = frame.image.y2;
-+			frame.pitch[0] = frame.bo->pitch;
-+
-+			screen->DestroyPixmap(scaled);
-+			cache_bo = false;
- 		}
- 
- 		ret = Success;
-@@ -517,24 +582,16 @@ off:
- 			ret = BadAlloc;
- 		}
- 
--		frame.bo->domain = DOMAIN_NONE;
--		if (xvmc_passthrough(format->id))
--			kgem_bo_destroy(&sna->kgem, frame.bo);
--		else
-+		if (cache_bo)
- 			sna_video_buffer_fini(video);
-+		else
-+			kgem_bo_destroy(&sna->kgem, frame.bo);
- 
- 		if (ret != Success)
- 			goto err;
- 	}
- 
--	if (!video->AlwaysOnTop && !RegionEqual(&video->clip, &clip) &&
--	    sna_blt_fill_boxes(sna, GXcopy,
--			       __sna_pixmap_get_bo(sna->front),
--			       sna->front->drawable.bitsPerPixel,
--			       video->color_key,
--			       region_rects(&clip),
--			       region_num_rects(&clip)))
--		RegionCopy(&video->clip, &clip);
-+	sna_video_fill_colorkey(video, &clip);
- 	sna_window_set_port((WindowPtr)draw, port);
- 
- 	return Success;
-@@ -606,25 +663,28 @@ static int sna_video_sprite_color_key(struct sna *sna)
- 	return color_key & ((1 << scrn->depth) - 1);
- }
- 
--static bool sna_video_has_sprites(struct sna *sna)
-+static int sna_video_has_sprites(struct sna *sna)
- {
- 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
-+	unsigned min;
- 	int i;
- 
- 	DBG(("%s: num_crtc=%d\n", __FUNCTION__, sna->mode.num_real_crtc));
- 
- 	if (sna->mode.num_real_crtc == 0)
--		return false;
-+		return 0;
- 
-+	min = -1;
- 	for (i = 0; i < sna->mode.num_real_crtc; i++) {
--		if (!sna_crtc_to_sprite(config->crtc[i])) {
--			DBG(("%s: no sprite found on pipe %d\n", __FUNCTION__, sna_crtc_to_pipe(config->crtc[i])));
--			return false;
--		}
-+		unsigned count =  sna_crtc_count_sprites(config->crtc[i]);
-+		DBG(("%s: %d sprites found on pipe %d\n", __FUNCTION__,
-+		     count, sna_crtc_pipe(config->crtc[i])));
-+		if (count < min)
-+			min = count;
- 	}
- 
--	DBG(("%s: yes\n", __FUNCTION__));
--	return true;
-+	DBG(("%s: min=%d\n", __FUNCTION__, min));
-+	return min;
- }
- 
- void sna_video_sprite_setup(struct sna *sna, ScreenPtr screen)
-@@ -632,16 +692,18 @@ void sna_video_sprite_setup(struct sna *sna, ScreenPtr screen)
- 	XvAdaptorPtr adaptor;
- 	struct sna_video *video;
- 	XvPortPtr port;
-+	int count, i;
- 
--	if (!sna_video_has_sprites(sna))
-+	count = sna_video_has_sprites(sna);
-+	if (!count)
- 		return;
- 
- 	adaptor = sna_xv_adaptor_alloc(sna);
- 	if (!adaptor)
- 		return;
- 
--	video = calloc(1, sizeof(*video));
--	port = calloc(1, sizeof(*port));
-+	video = calloc(count, sizeof(*video));
-+	port = calloc(count, sizeof(*port));
- 	if (video == NULL || port == NULL) {
- 		free(video);
- 		free(port);
-@@ -686,36 +748,43 @@ void sna_video_sprite_setup(struct sna *sna, ScreenPtr screen)
- 	adaptor->ddPutImage = sna_video_sprite_put_image;
- 	adaptor->ddQueryImageAttributes = sna_video_sprite_query;
- 
--	adaptor->nPorts = 1;
-+	adaptor->nPorts = count;
- 	adaptor->pPorts = port;
- 
--	adaptor->base_id = port->id = FakeClientID(0);
--	AddResource(port->id, XvGetRTPort(), port);
--	port->pAdaptor = adaptor;
--	port->pNotify =  NULL;
--	port->pDraw =  NULL;
--	port->client =  NULL;
--	port->grab.client =  NULL;
--	port->time = currentTime;
--	port->devPriv.ptr = video;
--
--	video->sna = sna;
--	video->alignment = 64;
--	video->color_key = sna_video_sprite_color_key(sna);
--	video->color_key_changed = ~0;
--	video->has_color_key = true;
--	video->brightness = -19;	/* (255/219) * -16 */
--	video->contrast = 75;	/* 255/219 * 64 */
--	video->saturation = 146;	/* 128/112 * 128 */
--	video->desired_crtc = NULL;
--	video->gamma5 = 0xc0c0c0;
--	video->gamma4 = 0x808080;
--	video->gamma3 = 0x404040;
--	video->gamma2 = 0x202020;
--	video->gamma1 = 0x101010;
--	video->gamma0 = 0x080808;
--	RegionNull(&video->clip);
--	video->SyncToVblank = 1;
-+	for (i = 0; i < count; i++) {
-+		port->id = FakeClientID(0);
-+		AddResource(port->id, XvGetRTPort(), port);
-+		port->pAdaptor = adaptor;
-+		port->pNotify =  NULL;
-+		port->pDraw =  NULL;
-+		port->client =  NULL;
-+		port->grab.client =  NULL;
-+		port->time = currentTime;
-+		port->devPriv.ptr = video;
-+
-+		video->sna = sna;
-+		video->idx = i;
-+		video->alignment = 64;
-+		video->color_key = sna_video_sprite_color_key(sna);
-+		video->color_key_changed = ~0;
-+		video->has_color_key = true;
-+		video->brightness = -19;	/* (255/219) * -16 */
-+		video->contrast = 75;	/* 255/219 * 64 */
-+		video->saturation = 146;	/* 128/112 * 128 */
-+		video->desired_crtc = NULL;
-+		video->gamma5 = 0xc0c0c0;
-+		video->gamma4 = 0x808080;
-+		video->gamma3 = 0x404040;
-+		video->gamma2 = 0x202020;
-+		video->gamma1 = 0x101010;
-+		video->gamma0 = 0x080808;
-+		RegionNull(&video->clip);
-+		video->SyncToVblank = 1;
-+
-+		port++;
-+		video++;
-+	}
-+	adaptor->base_id = adaptor->pPorts[0].id;
- 
- 	xvColorKey = MAKE_ATOM("XV_COLORKEY");
- 	xvAlwaysOnTop = MAKE_ATOM("XV_ALWAYS_ON_TOP");
-diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c
-index 95011939..3cce5cf1 100644
---- a/src/sna/sna_video_textured.c
-+++ b/src/sna/sna_video_textured.c
-@@ -48,7 +48,12 @@ static const XvAttributeRec Attributes[] = {
- 	//{XvSettable | XvGettable, 0, 255, (char *)"XV_CONTRAST"},
- };
- 
--static const XvImageRec Images[] = {
-+static const XvImageRec gen2_Images[] = {
-+	XVIMAGE_YUY2,
-+	XVIMAGE_UYVY,
-+};
-+
-+static const XvImageRec gen3_Images[] = {
- 	XVIMAGE_YUY2,
- 	XVIMAGE_YV12,
- 	XVIMAGE_I420,
-@@ -149,15 +154,16 @@ sna_video_textured_put_image(ddPutImage_ARGS)
- 	BoxRec dstBox;
- 	RegionRec clip;
- 	xf86CrtcPtr crtc;
-+	int16_t dx, dy;
- 	bool flush = false;
- 	bool ret;
- 
--	clip.extents.x1 = draw->x + drw_x;
--	clip.extents.y1 = draw->y + drw_y;
--	clip.extents.x2 = clip.extents.x1 + drw_w;
--	clip.extents.y2 = clip.extents.y1 + drw_h;
--	clip.data = NULL;
-+	if (wedged(sna))
-+		return BadAlloc;
- 
-+	init_video_region(&clip, draw, drw_x, drw_y, drw_w, drw_h);
-+
-+	ValidateGC(draw, gc);
- 	RegionIntersect(&clip, &clip, gc->pCompositeClip);
- 	if (!RegionNotEmpty(&clip))
- 		return Success;
-@@ -181,6 +187,9 @@ sna_video_textured_put_image(ddPutImage_ARGS)
- 				   &clip))
- 		return Success;
- 
-+	if (get_drawable_deltas(draw, pixmap, &dx, &dy))
-+		RegionTranslate(&clip, dx, dy);
-+
- 	flags = MOVE_WRITE | __MOVE_FORCE;
- 	if (clip.data)
- 		flags |= MOVE_READ;
-@@ -234,7 +243,7 @@ sna_video_textured_put_image(ddPutImage_ARGS)
- 		DBG(("%s: failed to render video\n", __FUNCTION__));
- 		ret = BadAlloc;
- 	} else
--		DamageDamageRegion(draw, &clip);
-+		DamageDamageRegion(&pixmap->drawable, &clip);
- 
- 	kgem_bo_destroy(&sna->kgem, frame.bo);
- 
-@@ -316,7 +325,7 @@ void sna_video_textured_setup(struct sna *sna, ScreenPtr screen)
- 
- 	if (!sna->render.video) {
- 		xf86DrvMsg(sna->scrn->scrnIndex, X_INFO,
--			   "Textured video not supported on this hardware\n");
-+			   "Textured video not supported on this hardware or backend\n");
- 		return;
- 	}
- 
-@@ -362,8 +371,13 @@ void sna_video_textured_setup(struct sna *sna, ScreenPtr screen)
- 						 ARRAY_SIZE(Formats));
- 	adaptor->nAttributes = ARRAY_SIZE(Attributes);
- 	adaptor->pAttributes = (XvAttributeRec *)Attributes;
--	adaptor->nImages = ARRAY_SIZE(Images);
--	adaptor->pImages = (XvImageRec *)Images;
-+	if (sna->kgem.gen < 030) {
-+		adaptor->nImages = ARRAY_SIZE(gen2_Images);
-+		adaptor->pImages = (XvImageRec *)gen2_Images;
-+	} else {
-+		adaptor->nImages = ARRAY_SIZE(gen3_Images);
-+		adaptor->pImages = (XvImageRec *)gen3_Images;
-+	}
- #if XORG_XV_VERSION < 2
- 	adaptor->ddAllocatePort = sna_xv_alloc_port;
- 	adaptor->ddFreePort = sna_xv_free_port;
-diff --git a/src/sna/xassert.h b/src/sna/xassert.h
-index 1bcfd080..e648e4bc 100644
---- a/src/sna/xassert.h
-+++ b/src/sna/xassert.h
-@@ -43,6 +43,28 @@
- 	xorg_backtrace(); \
- 	FatalError("%s:%d assertion '%s' failed\n", __func__, __LINE__, #E); \
- } while (0)
-+
-+#define warn_unless(E) \
-+({ \
-+	bool fail = !(E); \
-+	if (unlikely(fail)) { \
-+		static int __warn_once__; \
-+		if (!__warn_once__) { \
-+			xorg_backtrace(); \
-+			ErrorF("%s:%d assertion '%s' failed\n", __func__, __LINE__, #E); \
-+			__warn_once__ = 1; \
-+		} \
-+	} \
-+	unlikely(fail); \
-+})
-+
-+#define dbg(EXPR) EXPR
-+
-+#else
-+
-+#define warn_unless(E) ({ bool fail = !(E); unlikely(fail); })
-+#define dbg(EXPR)
-+
- #endif
- 
- #endif /* __XASSERT_H__ */
-diff --git a/src/uxa/i830_reg.h b/src/uxa/i830_reg.h
-index d8306bcd..ba39d82c 100644
---- a/src/uxa/i830_reg.h
-+++ b/src/uxa/i830_reg.h
-@@ -65,6 +65,12 @@
- #define MI_LOAD_SCAN_LINES_DISPLAY_PIPEA	(0)
- #define MI_LOAD_SCAN_LINES_DISPLAY_PIPEB	(0x1<<20)
- 
-+#define MI_LOAD_REGISTER_IMM		(0x22<<23 | (3-2))
-+
-+#define BCS_SWCTRL                      0x22200
-+# define BCS_SWCTRL_SRC_Y               (1 << 0)
-+# define BCS_SWCTRL_DST_Y               (1 << 1)
-+
- /* BLT commands */
- #define COLOR_BLT_CMD		((2<<29)|(0x40<<22)|(0x3))
- #define COLOR_BLT_WRITE_ALPHA	(1<<21)
-diff --git a/src/uxa/i965_video.c b/src/uxa/i965_video.c
-index 68e6fd38..438ab909 100644
---- a/src/uxa/i965_video.c
-+++ b/src/uxa/i965_video.c
-@@ -37,7 +37,6 @@
- #include "fourcc.h"
- 
- #include "intel.h"
--#include "intel_xvmc.h"
- #include "intel_uxa.h"
- #include "i830_reg.h"
- #include "i965_reg.h"
-diff --git a/src/uxa/intel.h b/src/uxa/intel.h
-index 1b7e5339..a5e77af4 100644
---- a/src/uxa/intel.h
-+++ b/src/uxa/intel.h
-@@ -121,7 +121,6 @@ typedef struct intel_screen_private {
- 
- 	void *modes;
- 	drm_intel_bo *front_buffer, *back_buffer;
--	unsigned int back_name;
- 	long front_pitch, front_tiling;
- 
- 	dri_bufmgr *bufmgr;
-@@ -169,6 +168,7 @@ typedef struct intel_screen_private {
- 	const struct intel_device_info *info;
- 
- 	unsigned int BR[20];
-+	unsigned int BR_tiling[2];
- 
- 	CloseScreenProcPtr CloseScreen;
- 
-@@ -196,7 +196,9 @@ typedef struct intel_screen_private {
- 
- 	int colorKey;
- 	XF86VideoAdaptorPtr adaptor;
-+#if !HAVE_NOTIFY_FD
- 	ScreenBlockHandlerProcPtr BlockHandler;
-+#endif
- 	Bool overlayOn;
- 
- 	struct {
-@@ -285,8 +287,6 @@ typedef struct intel_screen_private {
- 	Bool has_kernel_flush;
- 	Bool needs_flush;
- 
--	struct _DRI2FrameEvent *pending_flip[MAX_PIPES];
--
- 	/* Broken-out options. */
- 	OptionInfoPtr Options;
- 
-@@ -368,6 +368,7 @@ typedef void (*intel_drm_abort_proc)(ScrnInfoPtr scrn,
- 
- extern uint32_t intel_drm_queue_alloc(ScrnInfoPtr scrn, xf86CrtcPtr crtc, void *data, intel_drm_handler_proc handler, intel_drm_abort_proc abort);
- extern void intel_drm_abort(ScrnInfoPtr scrn, Bool (*match)(void *data, void *match_data), void *match_data);
-+extern void intel_drm_abort_seq(ScrnInfoPtr scrn, uint32_t seq);
- 
- extern int intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
- extern int intel_crtc_id(xf86CrtcPtr crtc);
-@@ -408,7 +409,6 @@ typedef struct _DRI2FrameEvent {
- 	ClientPtr client;
- 	enum DRI2FrameEventType type;
- 	int frame;
--	int pipe;
- 
- 	struct list drawable_resource, client_resource;
- 
-@@ -418,7 +418,12 @@ typedef struct _DRI2FrameEvent {
- 	DRI2BufferPtr front;
- 	DRI2BufferPtr back;
- 
--	struct _DRI2FrameEvent *chain;
-+	/* current scanout for triple buffer */
-+	int old_width;
-+	int old_height;
-+	int old_pitch;
-+	int old_tiling;
-+	dri_bo *old_buffer;
- } DRI2FrameEventRec, *DRI2FrameEventPtr;
- 
- extern Bool intel_do_pageflip(intel_screen_private *intel,
-@@ -456,10 +461,6 @@ extern xf86CrtcPtr intel_covering_crtc(ScrnInfoPtr scrn, BoxPtr box,
- 
- Bool I830DRI2ScreenInit(ScreenPtr pScreen);
- void I830DRI2CloseScreen(ScreenPtr pScreen);
--void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec,
--			       unsigned int tv_usec, DRI2FrameEventPtr flip_info);
--void I830DRI2FlipEventHandler(unsigned int frame, unsigned int tv_sec,
--			      unsigned int tv_usec, DRI2FrameEventPtr flip_info);
- 
- /* intel_dri3.c */
- Bool intel_dri3_screen_init(ScreenPtr screen);
-diff --git a/src/uxa/intel_batchbuffer.c b/src/uxa/intel_batchbuffer.c
-index a29e4434..114c6026 100644
---- a/src/uxa/intel_batchbuffer.c
-+++ b/src/uxa/intel_batchbuffer.c
-@@ -245,6 +245,17 @@ void intel_batch_submit(ScrnInfoPtr scrn)
- 	if (intel->batch_used == 0)
- 		return;
- 
-+	if (intel->current_batch == I915_EXEC_BLT &&
-+	    INTEL_INFO(intel)->gen >= 060) {
-+		OUT_BATCH(MI_FLUSH_DW);
-+		OUT_BATCH(0);
-+		OUT_BATCH(0);
-+		OUT_BATCH(0);
-+		OUT_BATCH(MI_LOAD_REGISTER_IMM);
-+		OUT_BATCH(BCS_SWCTRL);
-+		OUT_BATCH((BCS_SWCTRL_DST_Y | BCS_SWCTRL_SRC_Y) << 16);
-+	}
-+
- 	/* Mark the end of the batchbuffer. */
- 	OUT_BATCH(MI_BATCH_BUFFER_END);
- 	/* Emit a padding dword if we aren't going to be quad-word aligned. */
-diff --git a/src/uxa/intel_batchbuffer.h b/src/uxa/intel_batchbuffer.h
-index e5fb8d08..e71ffd19 100644
---- a/src/uxa/intel_batchbuffer.h
-+++ b/src/uxa/intel_batchbuffer.h
-@@ -30,7 +30,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- #ifndef _INTEL_BATCHBUFFER_H
- #define _INTEL_BATCHBUFFER_H
- 
--#define BATCH_RESERVED		16
-+#define BATCH_RESERVED		64
- 
- 
- void intel_batch_init(ScrnInfoPtr scrn);
-@@ -202,6 +202,23 @@ do {									\
- 
- #define BEGIN_BATCH(n)	__BEGIN_BATCH(n,RENDER_BATCH)
- #define BEGIN_BATCH_BLT(n)	__BEGIN_BATCH(n,BLT_BATCH)
-+#define BEGIN_BATCH_BLT_TILED(n) \
-+do { \
-+	if (INTEL_INFO(intel)->gen < 060) { \
-+		__BEGIN_BATCH(n, BLT_BATCH); \
-+	} else { \
-+		__BEGIN_BATCH(n+7, BLT_BATCH); \
-+		OUT_BATCH(MI_FLUSH_DW); \
-+		OUT_BATCH(0); \
-+		OUT_BATCH(0); \
-+		OUT_BATCH(0); \
-+		OUT_BATCH(MI_LOAD_REGISTER_IMM); \
-+		OUT_BATCH(BCS_SWCTRL); \
-+		OUT_BATCH((BCS_SWCTRL_DST_Y | BCS_SWCTRL_SRC_Y) << 16 | \
-+			  ((intel->BR_tiling[0] == I915_TILING_Y) ? BCS_SWCTRL_DST_Y : 0) | \
-+			  ((intel->BR_tiling[1] == I915_TILING_Y) ? BCS_SWCTRL_SRC_Y : 0)); \
-+	} \
-+} while (0)
- 
- #define ADVANCE_BATCH() do {						\
- 	if (intel->batch_emitting == 0)					\
-diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c
-index 7b4d4e0c..809cda1d 100644
---- a/src/uxa/intel_display.c
-+++ b/src/uxa/intel_display.c
-@@ -89,11 +89,11 @@ struct intel_mode {
- 	struct list outputs;
- 	struct list crtcs;
- 
--	void *pageflip_data;
--	intel_pageflip_handler_proc pageflip_handler;
--	intel_pageflip_abort_proc pageflip_abort;
--
--	Bool delete_dp_12_displays;
-+	struct {
-+		intel_pageflip_handler_proc handler;
-+		intel_pageflip_abort_proc abort;
-+		void *data;
-+	} pageflip;
- };
- 
- struct intel_pageflip {
-@@ -114,7 +114,6 @@ struct intel_crtc {
- 	struct list link;
- 	PixmapPtr scanout_pixmap;
- 	uint32_t scanout_fb_id;
--	int32_t vblank_offset;
- 	uint32_t msc_prev;
- 	uint64_t msc_high;
- };
-@@ -193,7 +192,7 @@ intel_output_backlight_init(xf86OutputPtr output)
- 
- 	str = xf86GetOptValString(intel->Options, OPTION_BACKLIGHT);
- 	if (str != NULL) {
--		if (backlight_exists(str) != BL_NONE) {
-+		if (backlight_exists(str)) {
- 			intel_output->backlight_active_level =
- 				backlight_open(&intel_output->backlight,
- 					       strdup(str));
-@@ -689,9 +688,11 @@ intel_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
- 	}
- 
- 	bo = intel_get_pixmap_bo(ppix);
--	if (intel->front_buffer) {
--		ErrorF("have front buffer\n");
--	}
-+	if (!bo)
-+		return FALSE;
-+
-+	if (intel->front_buffer)
-+		return FALSE;
- 
- 	drm_intel_bo_disable_reuse(bo);
- 
-@@ -867,6 +868,48 @@ intel_output_attach_edid(xf86OutputPtr output)
- 	xf86OutputSetEDID(output, mon);
- }
- 
-+static void
-+intel_output_attach_tile(xf86OutputPtr output)
-+{
-+#if XF86_OUTPUT_VERSION >= 3
-+	struct intel_output *intel_output = output->driver_private;
-+	drmModeConnectorPtr koutput = intel_output->mode_output;
-+	struct intel_mode *mode = intel_output->mode;
-+	drmModePropertyBlobPtr blob = NULL;
-+	struct xf86CrtcTileInfo tile_info, *set = NULL;
-+	int i;
-+
-+	for (i = 0; koutput && i < koutput->count_props; i++) {
-+		drmModePropertyPtr props;
-+
-+		props = drmModeGetProperty(mode->fd, koutput->props[i]);
-+		if (!props)
-+			continue;
-+
-+		if (!(props->flags & DRM_MODE_PROP_BLOB)) {
-+			drmModeFreeProperty(props);
-+			continue;
-+		}
-+
-+		if (!strcmp(props->name, "TILE")) {
-+			blob = drmModeGetPropertyBlob(mode->fd,
-+						      koutput->prop_values[i]);
-+		}
-+		drmModeFreeProperty(props);
-+	}
-+
-+	if (blob) {
-+		if (xf86OutputParseKMSTile(blob->data,
-+					   blob->length,
-+					   &tile_info))
-+			set = &tile_info;
-+		drmModeFreePropertyBlob(blob);
-+	}
-+
-+	xf86OutputSetTile(output, set);
-+#endif
-+}
-+
- static DisplayModePtr
- intel_output_panel_edid(xf86OutputPtr output, DisplayModePtr modes)
- {
-@@ -922,6 +965,7 @@ intel_output_get_modes(xf86OutputPtr output)
- 	int i;
- 
- 	intel_output_attach_edid(output);
-+	intel_output_attach_tile(output);
- 
- 	if (!koutput)
- 		return Modes;
-@@ -1492,6 +1536,7 @@ intel_output_init(ScrnInfoPtr scrn, struct intel_mode *mode, drmModeResPtr mode_
- 			intel_output = output->driver_private;
- 			intel_output->output_id = mode_res->connectors[num];
- 			intel_output->mode_output = koutput;
-+			RROutputChanged(output->randr_output, TRUE);
- 			return;
- 		}
- 	}
-@@ -1650,9 +1695,6 @@ intel_pageflip_abort(ScrnInfoPtr scrn, xf86CrtcPtr crtc, void *data);
- static void
- intel_pageflip_complete(struct intel_mode *mode);
- 
--static void
--intel_drm_abort_seq (ScrnInfoPtr scrn, uint32_t seq);
--
- Bool
- intel_do_pageflip(intel_screen_private *intel,
- 		  dri_bo *new_front,
-@@ -1671,23 +1713,30 @@ intel_do_pageflip(intel_screen_private *intel,
- 	uint32_t new_fb_id;
- 	uint32_t flags;
- 	uint32_t seq;
-+	int err = 0;
- 	int i;
- 
- 	/*
-+	 * We only have a single length queue in the kernel, so any
-+	 * attempts to schedule a second flip before processing the first
-+	 * is a bug. Punt it back to the caller.
-+	 */
-+	if (mode->flip_count)
-+		return FALSE;
-+
-+	/*
- 	 * Create a new handle for the back buffer
- 	 */
- 	if (drmModeAddFB(mode->fd, scrn->virtualX, scrn->virtualY,
- 			 scrn->depth, scrn->bitsPerPixel, pitch,
--			 new_front->handle, &new_fb_id))
-+			 new_front->handle, &new_fb_id)) {
-+		err = errno;
- 		goto error_out;
-+	}
- 
- 	drm_intel_bo_disable_reuse(new_front);
-         intel_flush(intel);
- 
--	mode->pageflip_data = pageflip_data;
--	mode->pageflip_handler = pageflip_handler;
--	mode->pageflip_abort = pageflip_abort;
--
- 	/*
- 	 * Queue flips on all enabled CRTCs
- 	 * Note that if/when we get per-CRTC buffers, we'll have to update this.
-@@ -1699,6 +1748,7 @@ intel_do_pageflip(intel_screen_private *intel,
- 	 */
- 	mode->fe_msc = 0;
- 	mode->fe_usec = 0;
-+	memset(&mode->pageflip, 0, sizeof(mode->pageflip));
- 
- 	flags = DRM_MODE_PAGE_FLIP_EVENT;
- 	if (async)
-@@ -1711,8 +1761,7 @@ intel_do_pageflip(intel_screen_private *intel,
- 
- 		flip = calloc(1, sizeof(struct intel_pageflip));
- 		if (flip == NULL) {
--			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
--				   "flip queue: carrier alloc failed.\n");
-+			err = errno;
- 			goto error_undo;
- 		}
- 
-@@ -1724,33 +1773,30 @@ intel_do_pageflip(intel_screen_private *intel,
- 
- 		seq = intel_drm_queue_alloc(scrn, config->crtc[i], flip, intel_pageflip_handler, intel_pageflip_abort);
- 		if (!seq) {
-+			err = errno;
- 			free(flip);
- 			goto error_undo;
- 		}
- 
--again:
-+		mode->flip_count++;
-+
- 		if (drmModePageFlip(mode->fd,
- 				    crtc_id(crtc),
- 				    new_fb_id,
- 				    flags, (void *)(uintptr_t)seq)) {
--			if (intel_mode_read_drm_events(intel)) {
--				xf86DrvMsg(scrn->scrnIndex, X_WARNING,
--					   "flip queue retry\n");
--				goto again;
--			}
--			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
--				   "flip queue failed: %s\n", strerror(errno));
--			if (seq)
--				intel_drm_abort_seq(scrn, seq);
--			free(flip);
-+			err = errno;
-+			intel_drm_abort_seq(scrn, seq);
- 			goto error_undo;
- 		}
--		mode->flip_count++;
- 	}
- 
- 	mode->old_fb_id = mode->fb_id;
- 	mode->fb_id = new_fb_id;
- 
-+	mode->pageflip.data = pageflip_data;
-+	mode->pageflip.handler = pageflip_handler;
-+	mode->pageflip.abort = pageflip_abort;
-+
- 	if (!mode->flip_count)
- 		intel_pageflip_complete(mode);
- 
-@@ -1765,7 +1811,7 @@ error_undo:
- 
- error_out:
- 	xf86DrvMsg(scrn->scrnIndex, X_WARNING, "Page flip failed: %s\n",
--		   strerror(errno));
-+		   strerror(err));
- 
- 	mode->flip_count = 0;
- 	return FALSE;
-@@ -1839,7 +1885,7 @@ intel_drm_abort(ScrnInfoPtr scrn, Bool (*match)(void *data, void *match_data), v
- /*
-  * Abort by drm queue sequence number
-  */
--static void
-+void
- intel_drm_abort_seq(ScrnInfoPtr scrn, uint32_t seq)
- {
- 	struct intel_drm_queue *q;
-@@ -1911,7 +1957,6 @@ intel_sequence_to_crtc_msc(xf86CrtcPtr crtc, uint32_t sequence)
- {
- 	struct intel_crtc *intel_crtc = crtc->driver_private;
- 
--        sequence += intel_crtc->vblank_offset;
-         if ((int32_t) (sequence - intel_crtc->msc_prev) < -0x40000000)
-                 intel_crtc->msc_high += 0x100000000L;
-         intel_crtc->msc_prev = sequence;
-@@ -1935,37 +1980,10 @@ intel_get_crtc_msc_ust(ScrnInfoPtr scrn, xf86CrtcPtr crtc, uint64_t *msc, uint64
-         return 0;
- }
- 
--/*
-- * Convert a 64-bit adjusted MSC value into a 32-bit kernel sequence number,
-- * removing the high 32 bits and subtracting out the vblank_offset term.
-- *
-- * This also updates the vblank_offset when it notices that the value should
-- * change.
-- */
--
--#define MAX_VBLANK_OFFSET       1000
--
- uint32_t
- intel_crtc_msc_to_sequence(ScrnInfoPtr scrn, xf86CrtcPtr crtc, uint64_t expect)
- {
--	struct intel_crtc *intel_crtc = crtc->driver_private;
--        uint64_t msc, ust;
--
--	if (intel_get_crtc_msc_ust(scrn, crtc, &msc, &ust) == 0) {
--		int64_t diff = expect - msc;
--
--		/* We're way off here, assume that the kernel has lost its mind
--		 * and smack the vblank back to something sensible
--		 */
--		if (diff < -MAX_VBLANK_OFFSET || diff > MAX_VBLANK_OFFSET) {
--			intel_crtc->vblank_offset += (int32_t) diff;
--			if (intel_crtc->vblank_offset > -MAX_VBLANK_OFFSET &&
--			    intel_crtc->vblank_offset < MAX_VBLANK_OFFSET)
--				intel_crtc->vblank_offset = 0;
--		}
--	}
--
--        return (uint32_t) (expect - intel_crtc->vblank_offset);
-+        return (uint32_t)expect;
- }
- 
- /*
-@@ -1998,14 +2016,13 @@ intel_drm_handler(int fd, uint32_t frame, uint32_t sec, uint32_t usec, void *use
- static void
- intel_pageflip_complete(struct intel_mode *mode)
- {
--	/* Release framebuffer */
--	drmModeRmFB(mode->fd, mode->old_fb_id);
--
--	if (!mode->pageflip_handler)
-+	if (!mode->pageflip.handler)
- 		return;
- 
--	mode->pageflip_handler(mode->fe_msc, mode->fe_usec,
--			       mode->pageflip_data);
-+	/* Release framebuffer */
-+	drmModeRmFB(mode->fd, mode->old_fb_id);
-+	mode->pageflip.handler(mode->fe_msc, mode->fe_usec,
-+			       mode->pageflip.data);
- }
- 
- /*
-@@ -2045,6 +2062,7 @@ intel_pageflip_handler(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
- 
- 	if (!mode)
- 		return;
-+
- 	intel_pageflip_complete(mode);
- }
- 
-@@ -2060,18 +2078,18 @@ intel_pageflip_abort(ScrnInfoPtr scrn, xf86CrtcPtr crtc, void *data)
- 	if (!mode)
- 		return;
- 
--	/* Release framebuffer */
--	drmModeRmFB(mode->fd, mode->old_fb_id);
--
--	if (!mode->pageflip_abort)
-+	if (!mode->pageflip.abort)
- 		return;
- 
--	mode->pageflip_abort(mode->pageflip_data);
-+	/* Release framebuffer */
-+	drmModeRmFB(mode->fd, mode->old_fb_id);
-+	mode->pageflip.abort(mode->pageflip.data);
- }
- 
- /*
-  * Check for pending DRM events and process them.
-  */
-+#if !HAVE_NOTIFY_FD
- static void
- drm_wakeup_handler(pointer data, int err, pointer p)
- {
-@@ -2086,6 +2104,14 @@ drm_wakeup_handler(pointer data, int err, pointer p)
- 	if (FD_ISSET(mode->fd, read_mask))
- 		drmHandleEvent(mode->fd, &mode->event_context);
- }
-+#else
-+static void
-+drm_notify_fd(int fd, int ready, void *data)
-+{
-+	struct intel_mode *mode = data;
-+	drmHandleEvent(mode->fd, &mode->event_context);
-+}
-+#endif
- 
- /*
-  * If there are any available, read drm_events
-@@ -2231,10 +2257,6 @@ Bool intel_mode_pre_init(ScrnInfoPtr scrn, int fd, int cpp)
- 		intel->use_pageflipping = TRUE;
- 	}
- 
--	if (xf86ReturnOptValBool(intel->Options, OPTION_DELETE_DP12, FALSE)) {
--		mode->delete_dp_12_displays = TRUE;
--	}
--
- 	intel->modes = mode;
- 	drmModeFreeResources(mode_res);
- 	return TRUE;
-@@ -2250,9 +2272,11 @@ intel_mode_init(struct intel_screen_private *intel)
- 	 * registration within ScreenInit and not PreInit.
- 	 */
- 	mode->flip_count = 0;
--	AddGeneralSocket(mode->fd);
-+	SetNotifyFd(mode->fd, drm_notify_fd, X_NOTIFY_READ, mode);
-+#if !HAVE_NOTIFY_FD
- 	RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA,
- 				       drm_wakeup_handler, mode);
-+#endif
- }
- 
- void
-@@ -2276,9 +2300,11 @@ intel_mode_close(intel_screen_private *intel)
- 
-         intel_drm_abort_scrn(intel->scrn);
- 
-+#if !HAVE_NOTIFY_FD
- 	RemoveBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA,
- 				     drm_wakeup_handler, mode);
--	RemoveGeneralSocket(mode->fd);
-+#endif
-+	RemoveNotifyFd(mode->fd);
- }
- 
- void
-@@ -2498,12 +2524,11 @@ intel_mode_hotplug(struct intel_screen_private *intel)
- 	int i, j;
- 	Bool found;
- 	Bool changed = FALSE;
--	struct intel_mode *mode = intel->modes;
-+
- 	mode_res = drmModeGetResources(intel->drmSubFD);
- 	if (!mode_res)
- 		goto out;
- 
--restart_destroy:
- 	for (i = 0; i < config->num_output; i++) {
- 		xf86OutputPtr output = config->output[i];
- 		struct intel_output *intel_output;
-@@ -2522,13 +2547,9 @@ restart_destroy:
- 		drmModeFreeConnector(intel_output->mode_output);
- 		intel_output->mode_output = NULL;
- 		intel_output->output_id = -1;
-+		RROutputChanged(output->randr_output, TRUE);
- 
- 		changed = TRUE;
--		if (mode->delete_dp_12_displays) {
--			RROutputDestroy(output->randr_output);
--			xf86OutputDestroy(output);
--			goto restart_destroy;
--		}
- 	}
- 
- 	/* find new output ids we don't have outputs for */
-@@ -2552,10 +2573,8 @@ restart_destroy:
- 		intel_output_init(scrn, intel->modes, mode_res, i, 1);
- 	}
- 
--	if (changed) {
--		RRSetChanged(xf86ScrnToScreen(scrn));
-+	if (changed)
- 		RRTellChanged(xf86ScrnToScreen(scrn));
--	}
- 
- 	drmModeFreeResources(mode_res);
- out:
-diff --git a/src/uxa/intel_dri.c b/src/uxa/intel_dri.c
-index f61c6210..524826d2 100644
---- a/src/uxa/intel_dri.c
-+++ b/src/uxa/intel_dri.c
-@@ -81,6 +81,47 @@ static DevPrivateKeyRec i830_client_key;
- static int i830_client_key;
- #endif
- 
-+static void I830DRI2FlipEventHandler(unsigned int frame,
-+				     unsigned int tv_sec,
-+				     unsigned int tv_usec,
-+				     DRI2FrameEventPtr flip_info);
-+
-+static void I830DRI2FrameEventHandler(unsigned int frame,
-+				      unsigned int tv_sec,
-+				      unsigned int tv_usec,
-+				      DRI2FrameEventPtr swap_info);
-+
-+static void
-+i830_dri2_del_frame_event(DRI2FrameEventPtr info);
-+
-+static uint32_t pipe_select(int pipe)
-+{
-+	if (pipe > 1)
-+		return pipe << DRM_VBLANK_HIGH_CRTC_SHIFT;
-+	else if (pipe > 0)
-+		return DRM_VBLANK_SECONDARY;
-+	else
-+		return 0;
-+}
-+
-+static void
-+intel_dri2_vblank_handler(ScrnInfoPtr scrn,
-+                          xf86CrtcPtr crtc,
-+                          uint64_t msc,
-+                          uint64_t usec,
-+                          void *data)
-+{
-+        I830DRI2FrameEventHandler((uint32_t) msc, usec / 1000000, usec % 1000000, data);
-+}
-+
-+static void
-+intel_dri2_vblank_abort(ScrnInfoPtr scrn,
-+                        xf86CrtcPtr crtc,
-+                        void *data)
-+{
-+        i830_dri2_del_frame_event(data);
-+}
-+
- static uint32_t pixmap_flink(PixmapPtr pixmap)
- {
- 	struct intel_uxa_pixmap *priv = intel_uxa_get_pixmap_private(pixmap);
-@@ -135,9 +176,6 @@ I830DRI2CreateBuffers(DrawablePtr drawable, unsigned int *attachments,
- 		pixmap = NULL;
- 		if (attachments[i] == DRI2BufferFrontLeft) {
- 			pixmap = get_front_buffer(drawable);
--
--			if (pixmap == NULL)
--				drawable = &(get_drawable_pixmap(drawable)->drawable);
- 		} else if (attachments[i] == DRI2BufferStencil && pDepthPixmap) {
- 			pixmap = pDepthPixmap;
- 			pixmap->refcnt++;
-@@ -246,11 +284,8 @@ I830DRI2CreateBuffer(DrawablePtr drawable, unsigned int attachment,
- 	}
- 
- 	pixmap = NULL;
--	if (attachment == DRI2BufferFrontLeft) {
-+	if (attachment == DRI2BufferFrontLeft)
- 		pixmap = get_front_buffer(drawable);
--		if (pixmap == NULL)
--			drawable = &(get_drawable_pixmap(drawable)->drawable);
--	}
- 
- 	if (pixmap == NULL) {
- 		unsigned int hint = INTEL_CREATE_PIXMAP_DRI2;
-@@ -673,6 +708,20 @@ i830_dri2_del_frame_event(DRI2FrameEventPtr info)
- 	if (info->back)
- 		I830DRI2DestroyBuffer(NULL, info->back);
- 
-+	if (info->old_buffer) {
-+		/* Check that the old buffer still matches the front buffer
-+		 * in case a mode change occurred before we woke up.
-+		 */
-+		if (info->intel->back_buffer == NULL &&
-+		    info->old_width  == info->intel->scrn->virtualX &&
-+		    info->old_height == info->intel->scrn->virtualY &&
-+		    info->old_pitch  == info->intel->front_pitch &&
-+		    info->old_tiling == info->intel->front_tiling)
-+			info->intel->back_buffer = info->old_buffer;
-+		else
-+			dri_bo_unreference(info->old_buffer);
-+	}
-+
- 	free(info);
- }
- 
-@@ -708,16 +757,14 @@ static void
- I830DRI2ExchangeBuffers(struct intel_screen_private *intel, DRI2BufferPtr front, DRI2BufferPtr back)
- {
- 	I830DRI2BufferPrivatePtr front_priv, back_priv;
--	int tmp;
- 	struct intel_uxa_pixmap *new_front;
- 
- 	front_priv = front->driverPrivate;
- 	back_priv = back->driverPrivate;
- 
- 	/* Swap BO names so DRI works */
--	tmp = front->name;
- 	front->name = back->name;
--	back->name = tmp;
-+	back->name = pixmap_flink(front_priv->pixmap);
- 
- 	/* Swap pixmap bos */
- 	new_front = intel_exchange_pixmap_buffers(intel,
-@@ -753,87 +800,30 @@ I830DRI2FlipAbort(void *pageflip_data)
-         i830_dri2_del_frame_event(info);
- }
- 
--/*
-- * Our internal swap routine takes care of actually exchanging, blitting, or
-- * flipping buffers as necessary.
-- */
- static Bool
--I830DRI2ScheduleFlip(struct intel_screen_private *intel,
--		     DrawablePtr draw,
--		     DRI2FrameEventPtr info)
-+allocate_back_buffer(struct intel_screen_private *intel)
- {
--	I830DRI2BufferPrivatePtr priv = info->back->driverPrivate;
--	drm_intel_bo *new_back, *old_back;
--	int tmp_name;
--
--	if (!intel->use_triple_buffer) {
--		info->type = DRI2_SWAP;
--		if (!intel_do_pageflip(intel,
--				       get_pixmap_bo(priv),
--				       info->pipe, FALSE, info,
--                                       I830DRI2FlipComplete,
--                                       I830DRI2FlipAbort))
--			return FALSE;
--
--		I830DRI2ExchangeBuffers(intel, info->front, info->back);
--		return TRUE;
--	}
-+	drm_intel_bo *bo;
-+	int pitch;
-+	uint32_t tiling;
- 
--	if (intel->pending_flip[info->pipe]) {
--		assert(intel->pending_flip[info->pipe]->chain == NULL);
--		intel->pending_flip[info->pipe]->chain = info;
-+	if (intel->back_buffer)
- 		return TRUE;
--	}
- 
--	if (intel->back_buffer == NULL) {
--		new_back = drm_intel_bo_alloc(intel->bufmgr, "front buffer",
--					      intel->front_buffer->size, 0);
--		if (new_back == NULL)
--			return FALSE;
--
--		if (intel->front_tiling != I915_TILING_NONE) {
--			uint32_t tiling = intel->front_tiling;
--			drm_intel_bo_set_tiling(new_back, &tiling, intel->front_pitch);
--			if (tiling != intel->front_tiling) {
--				drm_intel_bo_unreference(new_back);
--				return FALSE;
--			}
--		}
--
--		drm_intel_bo_disable_reuse(new_back);
--		dri_bo_flink(new_back, &intel->back_name);
--	} else {
--		new_back = intel->back_buffer;
--		intel->back_buffer = NULL;
--	}
-+	bo = intel_allocate_framebuffer(intel->scrn,
-+					intel->scrn->virtualX,
-+					intel->scrn->virtualY,
-+					intel->cpp,
-+					&pitch, &tiling);
-+	if (bo == NULL)
-+		return FALSE;
- 
--	old_back = get_pixmap_bo(priv);
--	if (!intel_do_pageflip(intel, old_back, info->pipe, FALSE, info, I830DRI2FlipComplete, I830DRI2FlipAbort)) {
--		intel->back_buffer = new_back;
-+	if (pitch != intel->front_pitch || tiling != intel->front_tiling) {
-+		drm_intel_bo_unreference(bo);
- 		return FALSE;
- 	}
--	info->type = DRI2_SWAP_CHAIN;
--	intel->pending_flip[info->pipe] = info;
--
--	priv = info->front->driverPrivate;
--
--	/* Exchange the current front-buffer with the fresh bo */
--
--	intel->back_buffer = intel->front_buffer;
--	drm_intel_bo_reference(intel->back_buffer);
--	intel_set_pixmap_bo(priv->pixmap, new_back);
--	drm_intel_bo_unreference(new_back);
--
--	tmp_name = info->front->name;
--	info->front->name = intel->back_name;
--	intel->back_name = tmp_name;
- 
--	/* Then flip DRI2 pointers and update the screen pixmap */
--	I830DRI2ExchangeBuffers(intel, info->front, info->back);
--	DRI2SwapComplete(info->client, draw, 0, 0, 0,
--			 DRI2_EXCHANGE_COMPLETE,
--			 info->event_complete,
--			 info->event_data);
-+	intel->back_buffer = bo;
- 	return TRUE;
- }
- 
-@@ -889,8 +879,88 @@ can_exchange(DrawablePtr drawable, DRI2BufferPtr front, DRI2BufferPtr back)
- 	return TRUE;
- }
- 
--void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec,
--			       unsigned int tv_usec, DRI2FrameEventPtr swap_info)
-+static Bool
-+queue_flip(struct intel_screen_private *intel,
-+	   DrawablePtr draw,
-+	   DRI2FrameEventPtr info)
-+{
-+	xf86CrtcPtr crtc = I830DRI2DrawableCrtc(draw);
-+	I830DRI2BufferPrivatePtr priv = info->back->driverPrivate;
-+	drm_intel_bo *old_back = get_pixmap_bo(priv);
-+
-+	if (crtc == NULL)
-+		return FALSE;
-+
-+	if (!can_exchange(draw, info->front, info->back))
-+		return FALSE;
-+
-+	if (!intel_do_pageflip(intel, old_back,
-+			       intel_crtc_to_pipe(crtc),
-+			       FALSE, info,
-+			       I830DRI2FlipComplete, I830DRI2FlipAbort))
-+		return FALSE;
-+
-+#if DRI2INFOREC_VERSION >= 6
-+	if (intel->use_triple_buffer && allocate_back_buffer(intel)) {
-+		info->old_width  = intel->scrn->virtualX;
-+		info->old_height = intel->scrn->virtualY;
-+		info->old_pitch  = intel->front_pitch;
-+		info->old_tiling = intel->front_tiling;
-+		info->old_buffer = intel->front_buffer;
-+		dri_bo_reference(info->old_buffer);
-+
-+		priv = info->front->driverPrivate;
-+		intel_set_pixmap_bo(priv->pixmap, intel->back_buffer);
-+
-+		dri_bo_unreference(intel->back_buffer);
-+		intel->back_buffer = NULL;
-+
-+		DRI2SwapLimit(draw, 2);
-+	} else
-+		DRI2SwapLimit(draw, 1);
-+#endif
-+
-+	/* Then flip DRI2 pointers and update the screen pixmap */
-+	I830DRI2ExchangeBuffers(intel, info->front, info->back);
-+	return TRUE;
-+}
-+
-+static Bool
-+queue_swap(struct intel_screen_private *intel,
-+	   DrawablePtr draw,
-+	   DRI2FrameEventPtr info)
-+{
-+	xf86CrtcPtr crtc = I830DRI2DrawableCrtc(draw);
-+	drmVBlank vbl;
-+
-+	if (crtc == NULL)
-+		return FALSE;
-+
-+	vbl.request.type =
-+		DRM_VBLANK_RELATIVE |
-+		DRM_VBLANK_EVENT |
-+		pipe_select(intel_crtc_to_pipe(crtc));
-+	vbl.request.sequence = 1;
-+	vbl.request.signal =
-+		intel_drm_queue_alloc(intel->scrn, crtc, info,
-+				      intel_dri2_vblank_handler,
-+				      intel_dri2_vblank_abort);
-+	if (vbl.request.signal == 0)
-+		return FALSE;
-+
-+	info->type = DRI2_SWAP;
-+	if (drmWaitVBlank(intel->drmSubFD, &vbl)) {
-+		intel_drm_abort_seq(intel->scrn, vbl.request.signal);
-+		return FALSE;
-+	}
-+
-+	return TRUE;
-+}
-+
-+static void I830DRI2FrameEventHandler(unsigned int frame,
-+				      unsigned int tv_sec,
-+				      unsigned int tv_usec,
-+				      DRI2FrameEventPtr swap_info)
- {
- 	intel_screen_private *intel = swap_info->intel;
- 	DrawablePtr drawable;
-@@ -906,24 +976,22 @@ void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec,
- 		return;
- 	}
- 
--
- 	switch (swap_info->type) {
- 	case DRI2_FLIP:
- 		/* If we can still flip... */
--		if (can_exchange(drawable, swap_info->front, swap_info->back) &&
--		    I830DRI2ScheduleFlip(intel, drawable, swap_info))
--			return;
--
--		/* else fall through to exchange/blit */
--	case DRI2_SWAP: {
--		I830DRI2FallbackBlitSwap(drawable,
--					 swap_info->front, swap_info->back);
--		DRI2SwapComplete(swap_info->client, drawable, frame, tv_sec, tv_usec,
--				 DRI2_BLIT_COMPLETE,
--				 swap_info->client ? swap_info->event_complete : NULL,
--				 swap_info->event_data);
--		break;
--	}
-+		if (!queue_flip(intel, drawable, swap_info) &&
-+		    !queue_swap(intel, drawable, swap_info)) {
-+		case DRI2_SWAP:
-+			I830DRI2FallbackBlitSwap(drawable,
-+						 swap_info->front, swap_info->back);
-+			DRI2SwapComplete(swap_info->client, drawable, frame, tv_sec, tv_usec,
-+					 DRI2_BLIT_COMPLETE,
-+					 swap_info->client ? swap_info->event_complete : NULL,
-+					 swap_info->event_data);
-+			break;
-+		}
-+		return;
-+
- 	case DRI2_WAITMSC:
- 		if (swap_info->client)
- 			DRI2WaitMSCComplete(swap_info->client, drawable,
-@@ -939,12 +1007,13 @@ void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec,
- 	i830_dri2_del_frame_event(swap_info);
- }
- 
--void I830DRI2FlipEventHandler(unsigned int frame, unsigned int tv_sec,
--			      unsigned int tv_usec, DRI2FrameEventPtr flip_info)
-+static void I830DRI2FlipEventHandler(unsigned int frame,
-+				     unsigned int tv_sec,
-+				     unsigned int tv_usec,
-+				     DRI2FrameEventPtr flip_info)
- {
- 	struct intel_screen_private *intel = flip_info->intel;
- 	DrawablePtr drawable;
--	DRI2FrameEventPtr chain;
- 
- 	drawable = NULL;
- 	if (flip_info->drawable_id)
-@@ -954,6 +1023,7 @@ void I830DRI2FlipEventHandler(unsigned int frame, unsigned int tv_sec,
- 
- 	/* We assume our flips arrive in order, so we don't check the frame */
- 	switch (flip_info->type) {
-+	case DRI2_FLIP:
- 	case DRI2_SWAP:
- 		if (!drawable)
- 			break;
-@@ -984,35 +1054,6 @@ void I830DRI2FlipEventHandler(unsigned int frame, unsigned int tv_sec,
- 				 flip_info->event_data);
- 		break;
- 
--	case DRI2_SWAP_CHAIN:
--		assert(intel->pending_flip[flip_info->pipe] == flip_info);
--		intel->pending_flip[flip_info->pipe] = NULL;
--
--		chain = flip_info->chain;
--		if (chain) {
--			DrawablePtr chain_drawable = NULL;
--			if (chain->drawable_id)
--				 dixLookupDrawable(&chain_drawable,
--						   chain->drawable_id,
--						   serverClient,
--						   M_ANY, DixWriteAccess);
--			if (chain_drawable == NULL) {
--				i830_dri2_del_frame_event(chain);
--			} else if (!can_exchange(chain_drawable, chain->front, chain->back) ||
--				   !I830DRI2ScheduleFlip(intel, chain_drawable, chain)) {
--				I830DRI2FallbackBlitSwap(chain_drawable,
--							 chain->front,
--							 chain->back);
--
--				DRI2SwapComplete(chain->client, chain_drawable, frame, tv_sec, tv_usec,
--						 DRI2_BLIT_COMPLETE,
--						 chain->client ? chain->event_complete : NULL,
--						 chain->event_data);
--				i830_dri2_del_frame_event(chain);
--			}
--		}
--		break;
--
- 	default:
- 		xf86DrvMsg(intel->scrn->scrnIndex, X_WARNING,
- 			   "%s: unknown vblank event received\n", __func__);
-@@ -1023,38 +1064,6 @@ void I830DRI2FlipEventHandler(unsigned int frame, unsigned int tv_sec,
- 	i830_dri2_del_frame_event(flip_info);
- }
- 
--static uint32_t pipe_select(int pipe)
--{
--	if (pipe > 1)
--		return pipe << DRM_VBLANK_HIGH_CRTC_SHIFT;
--	else if (pipe > 0)
--		return DRM_VBLANK_SECONDARY;
--	else
--		return 0;
--}
--
--static void
--intel_dri2_vblank_handler(ScrnInfoPtr scrn,
--                          xf86CrtcPtr crtc,
--                          uint64_t msc,
--                          uint64_t usec,
--                          void *data)
--{
--        DRI2FrameEventPtr swap_info = data;
--
--        I830DRI2FrameEventHandler((uint32_t) msc, usec / 1000000, usec % 1000000, swap_info);
--}
--
--static void
--intel_dri2_vblank_abort(ScrnInfoPtr scrn,
--                        xf86CrtcPtr crtc,
--                        void *data)
--{
--        DRI2FrameEventPtr swap_info = data;
--
--        i830_dri2_del_frame_event(swap_info);
--}
--
- /*
-  * ScheduleSwap is responsible for requesting a DRM vblank event for the
-  * appropriate frame.
-@@ -1089,7 +1098,6 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front,
-         int pipe = crtc ? intel_crtc_to_pipe(crtc) : -1;
-         int flip = 0;
- 	DRI2FrameEventPtr swap_info = NULL;
--	enum DRI2FrameEventType swap_type = DRI2_SWAP;
- 	uint64_t current_msc, current_ust;
-         uint64_t request_msc;
-         uint32_t seq;
-@@ -1109,7 +1117,7 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front,
- 	swap_info->event_data = data;
- 	swap_info->front = front;
- 	swap_info->back = back;
--	swap_info->pipe = pipe;
-+	swap_info->type = DRI2_SWAP;
- 
- 	if (!i830_dri2_add_frame_event(swap_info)) {
- 	    free(swap_info);
-@@ -1124,20 +1132,27 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front,
- 	if (ret)
- 	    goto blit_fallback;
- 
--	/* Flips need to be submitted one frame before */
-+	/*
-+	 * If we can, schedule the flip directly from here rather
-+	 * than waiting for an event from the kernel for the current
-+	 * (or a past) MSC.
-+	 */
-+	if (divisor == 0 &&
-+	    current_msc >= *target_msc &&
-+	    queue_flip(intel, draw, swap_info))
-+		return TRUE;
-+
- 	if (can_exchange(draw, front, back)) {
--	    swap_type = DRI2_FLIP;
--	    flip = 1;
-+		swap_info->type = DRI2_FLIP;
-+		/* Flips need to be submitted one frame before */
-+		if (*target_msc > 0)
-+			--*target_msc;
-+		flip = 1;
- 	}
- 
--	swap_info->type = swap_type;
--
--	/* Correct target_msc by 'flip' if swap_type == DRI2_FLIP.
--	 * Do it early, so handling of different timing constraints
--	 * for divisor, remainder and msc vs. target_msc works.
--	 */
--	if (*target_msc > 0)
--		*target_msc -= flip;
-+#if DRI2INFOREC_VERSION >= 6
-+	DRI2SwapLimit(draw, 1);
-+#endif
- 
- 	/*
- 	 * If divisor is zero, or current_msc is smaller than target_msc
-@@ -1145,15 +1160,6 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front,
- 	 * the swap.
- 	 */
- 	if (divisor == 0 || current_msc < *target_msc) {
--		/*
--		 * If we can, schedule the flip directly from here rather
--		 * than waiting for an event from the kernel for the current
--		 * (or a past) MSC.
--		 */
--		if (flip && divisor == 0 && current_msc >= *target_msc &&
--		    I830DRI2ScheduleFlip(intel, draw, swap_info))
--			return TRUE;
--
- 		vbl.request.type =
- 			DRM_VBLANK_ABSOLUTE | DRM_VBLANK_EVENT | pipe_select(pipe);
- 
-@@ -1168,7 +1174,7 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front,
- 		 * current_msc to ensure we return a reasonable value back
- 		 * to the caller. This makes swap_interval logic more robust.
- 		 */
--		if (current_msc >= *target_msc)
-+		if (current_msc > *target_msc)
- 			*target_msc = current_msc;
- 
-                 seq = intel_drm_queue_alloc(scrn, crtc, swap_info, intel_dri2_vblank_handler, intel_dri2_vblank_abort);
-@@ -1183,6 +1189,8 @@ I830DRI2ScheduleSwap(ClientPtr client, DrawablePtr draw, DRI2BufferPtr front,
- 			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
- 				   "divisor 0 get vblank counter failed: %s\n",
- 				   strerror(errno));
-+			intel_drm_abort_seq(intel->scrn, seq);
-+			swap_info = NULL;
- 			goto blit_fallback;
- 		}
- 
-@@ -1332,7 +1340,6 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr draw, CARD64 target_msc,
- 
- 	if (!i830_dri2_add_frame_event(wait_info)) {
- 	    free(wait_info);
--	    wait_info = NULL;
- 	    goto out_complete;
- 	}
- 
-@@ -1374,7 +1381,8 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr draw, CARD64 target_msc,
- 					   strerror(errno));
- 				limit--;
- 			}
--			goto out_free;
-+			intel_drm_abort_seq(intel->scrn, seq);
-+			goto out_complete;
- 		}
- 
- 		wait_info->frame = intel_sequence_to_crtc_msc(crtc, vbl.reply.sequence);
-@@ -1417,7 +1425,8 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr draw, CARD64 target_msc,
- 				   strerror(errno));
- 			limit--;
- 		}
--		goto out_free;
-+		intel_drm_abort_seq(intel->scrn, seq);
-+		goto out_complete;
- 	}
- 
- 	wait_info->frame = intel_sequence_to_crtc_msc(crtc, vbl.reply.sequence);
-@@ -1440,13 +1449,92 @@ static int has_i830_dri(void)
- 	return access(DRI_DRIVER_PATH "/i830_dri.so", R_OK) == 0;
- }
- 
--static const char *dri_driver_name(intel_screen_private *intel)
-+static int
-+namecmp(const char *s1, const char *s2)
-+{
-+	char c1, c2;
-+
-+	if (!s1 || *s1 == 0) {
-+		if (!s2 || *s2 == 0)
-+			return 0;
-+		else
-+			return 1;
-+	}
-+
-+	while (*s1 == '_' || *s1 == ' ' || *s1 == '\t')
-+		s1++;
-+
-+	while (*s2 == '_' || *s2 == ' ' || *s2 == '\t')
-+		s2++;
-+
-+	c1 = isupper(*s1) ? tolower(*s1) : *s1;
-+	c2 = isupper(*s2) ? tolower(*s2) : *s2;
-+	while (c1 == c2) {
-+		if (c1 == '\0')
-+			return 0;
-+
-+		s1++;
-+		while (*s1 == '_' || *s1 == ' ' || *s1 == '\t')
-+			s1++;
-+
-+		s2++;
-+		while (*s2 == '_' || *s2 == ' ' || *s2 == '\t')
-+			s2++;
-+
-+		c1 = isupper(*s1) ? tolower(*s1) : *s1;
-+		c2 = isupper(*s2) ? tolower(*s2) : *s2;
-+	}
-+
-+	return c1 - c2;
-+}
-+
-+static Bool is_level(const char **str)
-+{
-+	const char *s = *str;
-+	char *end;
-+	unsigned val;
-+
-+	if (s == NULL || *s == '\0')
-+		return TRUE;
-+
-+	if (namecmp(s, "on") == 0)
-+		return TRUE;
-+	if (namecmp(s, "true") == 0)
-+		return TRUE;
-+	if (namecmp(s, "yes") == 0)
-+		return TRUE;
-+
-+	if (namecmp(s, "0") == 0)
-+		return TRUE;
-+	if (namecmp(s, "off") == 0)
-+		return TRUE;
-+	if (namecmp(s, "false") == 0)
-+		return TRUE;
-+	if (namecmp(s, "no") == 0)
-+		return TRUE;
-+
-+	val = strtoul(s, &end, 0);
-+	if (val && *end == '\0')
-+		return TRUE;
-+	if (val && *end == ':')
-+		*str = end + 1;
-+	return FALSE;
-+}
-+
-+static const char *options_get_dri(intel_screen_private *intel)
- {
- #if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,99,901,0)
--	const char *s = xf86GetOptValString(intel->Options, OPTION_DRI);
--	Bool dummy;
-+	return xf86GetOptValString(intel->Options, OPTION_DRI);
-+#else
-+	return NULL;
-+#endif
-+}
- 
--	if (s == NULL || xf86getBoolValue(&dummy, s)) {
-+static const char *dri_driver_name(intel_screen_private *intel)
-+{
-+	const char *s = options_get_dri(intel);
-+
-+	if (is_level(&s)) {
- 		if (INTEL_INFO(intel)->gen < 030)
- 			return has_i830_dri() ? "i830" : "i915";
- 		else if (INTEL_INFO(intel)->gen < 040)
-@@ -1456,14 +1544,6 @@ static const char *dri_driver_name(intel_screen_private *intel)
- 	}
- 
- 	return s;
--#else
--	if (INTEL_INFO(intel)->gen < 030)
--		return has_i830_dri() ? "i830" : "i915";
--	else if (INTEL_INFO(intel)->gen < 040)
--		return "i915";
--	else
--		return "i965";
--#endif
- }
- 
- Bool I830DRI2ScreenInit(ScreenPtr screen)
-@@ -1544,7 +1624,7 @@ Bool I830DRI2ScreenInit(ScreenPtr screen)
- 	info.numDrivers = 2;
- 	info.driverNames = driverNames;
- 	driverNames[0] = info.driverName;
--	driverNames[1] = info.driverName;
-+	driverNames[1] = "va_gl";
- #endif
- 
- 	return DRI2ScreenInit(screen, &info);
-diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
-index 2793da5d..3703c412 100644
---- a/src/uxa/intel_driver.c
-+++ b/src/uxa/intel_driver.c
-@@ -237,24 +237,17 @@ static Bool I830GetEarlyOptions(ScrnInfoPtr scrn)
- 	return TRUE;
- }
- 
--static Bool intel_option_cast_string_to_bool(intel_screen_private *intel,
--					     int id, Bool val)
--{
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,99,901,0)
--	xf86getBoolValue(&val, xf86GetOptValString(intel->Options, id));
--	return val;
--#else
--	return val;
--#endif
--}
--
- static void intel_check_dri_option(ScrnInfoPtr scrn)
- {
- 	intel_screen_private *intel = intel_get_screen_private(scrn);
-+	unsigned level;
- 
- 	intel->dri2 = intel->dri3 = DRI_NONE;
--	if (!intel_option_cast_string_to_bool(intel, OPTION_DRI, TRUE))
--		intel->dri2 = intel->dri3 = DRI_DISABLED;
-+	level = intel_option_cast_to_unsigned(intel->Options, OPTION_DRI, DEFAULT_DRI_LEVEL);
-+	if (level < 3 || INTEL_INFO(intel)->gen < 040)
-+		intel->dri3 = DRI_DISABLED;
-+	if (level < 2)
-+		intel->dri2 = DRI_DISABLED;
- 
- 	if (scrn->depth != 16 && scrn->depth != 24 && scrn->depth != 30) {
- 		xf86DrvMsg(scrn->scrnIndex, X_CONFIG,
-@@ -371,8 +364,8 @@ static Bool can_accelerate_blt(struct intel_screen_private *intel)
- 	if (INTEL_INFO(intel)->gen == -1)
- 		return FALSE;
- 
--	if (xf86ReturnOptValBool(intel->Options, OPTION_ACCEL_DISABLE, FALSE) ||
--	    !intel_option_cast_string_to_bool(intel, OPTION_ACCEL_METHOD, TRUE)) {
-+	if (!xf86ReturnOptValBool(intel->Options, OPTION_ACCEL_ENABLE, TRUE) ||
-+	    !intel_option_cast_to_bool(intel->Options, OPTION_ACCEL_METHOD, TRUE)) {
- 		xf86DrvMsg(intel->scrn->scrnIndex, X_CONFIG,
- 			   "Disabling hardware acceleration.\n");
- 		return FALSE;
-@@ -659,8 +652,9 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
- }
- 
- static void
--intel_dirty_update(ScreenPtr screen)
-+intel_dirty_update(intel_screen_private *intel)
- {
-+	ScreenPtr screen = xf86ScrnToScreen(intel->scrn);
- 	RegionPtr region;
- 	PixmapDirtyUpdatePtr ent;
- 
-@@ -677,6 +671,7 @@ intel_dirty_update(ScreenPtr screen)
- }
- #endif
- 
-+#if !HAVE_NOTIFY_FD
- static void
- I830BlockHandler(BLOCKHANDLER_ARGS_DECL)
- {
-@@ -694,9 +689,22 @@ I830BlockHandler(BLOCKHANDLER_ARGS_DECL)
- 	intel_uxa_block_handler(intel);
- 	intel_video_block_handler(intel);
- #ifdef INTEL_PIXMAP_SHARING
--	intel_dirty_update(screen);
-+	intel_dirty_update(intel);
- #endif
- }
-+#else
-+static void
-+I830BlockHandler(void *data, void *timeout)
-+{
-+	intel_screen_private *intel = data;
-+
-+	intel_uxa_block_handler(intel);
-+	intel_video_block_handler(intel);
-+#ifdef INTEL_PIXMAP_SHARING
-+	intel_dirty_update(intel);
-+#endif
-+}
-+#endif
- 
- static Bool
- intel_init_initial_framebuffer(ScrnInfoPtr scrn)
-@@ -735,6 +743,8 @@ intel_flush_callback(CallbackListPtr *list,
- }
- 
- #if HAVE_UDEV
-+#include <sys/stat.h>
-+
- static void
- I830HandleUEvents(int fd, void *closure)
- {
-@@ -771,6 +781,15 @@ I830HandleUEvents(int fd, void *closure)
- 	udev_device_unref(dev);
- }
- 
-+static int has_randr(void)
-+{
-+#if HAS_DIXREGISTERPRIVATEKEY
-+	return dixPrivateKeyRegistered(rrPrivKey);
-+#else
-+	return *rrPrivKey;
-+#endif
-+}
-+
- static void
- I830UeventInit(ScrnInfoPtr scrn)
- {
-@@ -780,6 +799,10 @@ I830UeventInit(ScrnInfoPtr scrn)
- 	Bool hotplug;
- 	MessageType from = X_CONFIG;
- 
-+	/* Without RR, nothing we can do here */
-+	if (!has_randr())
-+		return;
-+
- 	if (!xf86GetOptValBool(intel->Options, OPTION_HOTPLUG, &hotplug)) {
- 		from = X_DEFAULT;
- 		hotplug = TRUE;
-@@ -939,8 +962,14 @@ I830ScreenInit(SCREEN_INIT_ARGS_DECL)
- 			   "Hardware cursor initialization failed\n");
- 	}
- 
-+#if !HAVE_NOTIFY_FD
- 	intel->BlockHandler = screen->BlockHandler;
- 	screen->BlockHandler = I830BlockHandler;
-+#else
-+	RegisterBlockAndWakeupHandlers(I830BlockHandler,
-+				       (ServerWakeupHandlerProcPtr)NoopDDA,
-+				       intel);
-+#endif
- 
- #ifdef INTEL_PIXMAP_SHARING
- 	screen->StartPixmapTracking = PixmapStartDirtyTracking;
-@@ -1164,8 +1193,6 @@ static Bool I830CloseScreen(CLOSE_SCREEN_ARGS_DECL)
- 
- 	intel_sync_close(screen);
- 
--	xf86GARTCloseScreen(scrn->scrnIndex);
--
- 	scrn->vtSema = FALSE;
- 	return TRUE;
- }
-diff --git a/src/uxa/intel_hwmc.c b/src/uxa/intel_hwmc.c
-index 829cb8e0..78540600 100644
---- a/src/uxa/intel_hwmc.c
-+++ b/src/uxa/intel_hwmc.c
-@@ -193,7 +193,7 @@ Bool intel_xvmc_adaptor_init(ScreenPtr pScreen)
- 	intel_screen_private *intel = intel_get_screen_private(scrn);
- 	struct pci_device *pci;
- 	static XF86MCAdaptorRec *pAdapt;
--	char *name;
-+	const char *name;
- 	char buf[64];
- 
- 	if (!intel->XvMCEnabled)
-diff --git a/src/uxa/intel_memory.c b/src/uxa/intel_memory.c
-index 0c6cf30c..b2d7a367 100644
---- a/src/uxa/intel_memory.c
-+++ b/src/uxa/intel_memory.c
-@@ -42,7 +42,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  * This is the video memory allocator.  Our memory allocation is different from
-  * other graphics chips, where you have a fixed amount of graphics memory
-  * available that you want to put to the best use.  Instead, we have almost no
-- * memory pre-allocated, and we have to choose an appropriate amount of sytem
-+ * memory pre-allocated, and we have to choose an appropriate amount of system
-  * memory to use.
-  *
-  * The allocations we might do:
-diff --git a/src/uxa/intel_present.c b/src/uxa/intel_present.c
-index d20043f3..ac028edd 100644
---- a/src/uxa/intel_present.c
-+++ b/src/uxa/intel_present.c
-@@ -244,6 +244,7 @@ intel_present_check_flip(RRCrtcPtr              crtc,
- 	ScrnInfoPtr             scrn = xf86ScreenToScrn(screen);
- 	intel_screen_private    *intel = intel_get_screen_private(scrn);
-         dri_bo                  *bo;
-+	uint32_t		tiling, swizzle;
- 
- 	if (!scrn->vtSema)
- 		return FALSE;
-@@ -266,6 +267,12 @@ intel_present_check_flip(RRCrtcPtr              crtc,
-         if (!bo)
-                 return FALSE;
- 
-+	if (drm_intel_bo_get_tiling(bo, &tiling, &swizzle))
-+		return FALSE;
-+
-+	if (tiling == I915_TILING_Y)
-+		return FALSE;
-+
- 	return TRUE;
- }
- 
-@@ -343,29 +350,33 @@ intel_present_unflip(ScreenPtr screen, uint64_t event_id)
- {
- 	ScrnInfoPtr                             scrn = xf86ScreenToScrn(screen);
- 	intel_screen_private                    *intel = intel_get_screen_private(scrn);
--	struct intel_present_vblank_event       *event;
- 	PixmapPtr                               pixmap = screen->GetScreenPixmap(screen);
-+	struct intel_present_vblank_event       *event = NULL;
- 	dri_bo                                  *bo;
--	Bool                                    ret;
- 
- 	if (!intel_present_check_flip(NULL, screen->root, pixmap, true))
--		return;
-+		goto fail;
- 
- 	bo = intel_get_pixmap_bo(pixmap);
- 	if (!bo)
--		return;
-+		goto fail;
- 
- 	event = calloc(1, sizeof(struct intel_present_vblank_event));
- 	if (!event)
--		return;
-+		goto fail;
- 
- 	event->event_id = event_id;
- 
--	ret = intel_do_pageflip(intel, bo, -1, FALSE, event, intel_present_flip_event, intel_present_flip_abort);
--	if (!ret) {
--		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
--			   "present unflip failed\n");
--	}
-+	if (!intel_do_pageflip(intel, bo, -1, FALSE, event,
-+			       intel_present_flip_event,
-+			       intel_present_flip_abort))
-+		goto fail;
-+
-+	return;
-+fail:
-+	xf86SetDesiredModes(scrn);
-+	present_event_notify(event_id, 0, 0);
-+	free(event);
- }
- 
- static present_screen_info_rec intel_present_screen_info = {
-diff --git a/src/uxa/intel_uxa.c b/src/uxa/intel_uxa.c
-index 590ff5d1..ec32a723 100644
---- a/src/uxa/intel_uxa.c
-+++ b/src/uxa/intel_uxa.c
-@@ -176,6 +176,24 @@ intel_uxa_check_solid(DrawablePtr drawable, int alu, Pixel planemask)
- 	return TRUE;
- }
- 
-+static Bool
-+intel_uxa_check_bo_tiling(intel_screen_private *intel,
-+			  PixmapPtr pixmap,
-+			  unsigned *tiling_out)
-+{
-+	struct intel_uxa_pixmap *priv;
-+
-+	priv = intel_uxa_get_pixmap_private(pixmap);
-+	if (!priv)
-+		return FALSE;
-+
-+	if (priv->tiling == I915_TILING_Y && INTEL_INFO(intel)->gen < 060)
-+		return FALSE;
-+
-+	*tiling_out = priv->tiling;
-+	return TRUE;
-+}
-+
- /**
-  * Sets up hardware state for a series of solid fills.
-  */
-@@ -189,6 +207,9 @@ intel_uxa_prepare_solid(PixmapPtr pixmap, int alu, Pixel planemask, Pixel fg)
- 		intel_uxa_get_pixmap_bo(pixmap),
- 	};
- 
-+	if (!intel_uxa_check_bo_tiling(intel, pixmap, &intel->BR_tiling[0]))
-+		return FALSE;
-+
- 	if (!intel_uxa_check_pitch_2d(pixmap))
- 		return FALSE;
- 
-@@ -236,7 +257,7 @@ static void intel_uxa_solid(PixmapPtr pixmap, int x1, int y1, int x2, int y2)
- 
- 	{
- 		int len = INTEL_INFO(intel)->gen >= 0100 ? 7 : 6;
--		BEGIN_BATCH_BLT(len);
-+		BEGIN_BATCH_BLT_TILED(len);
- 
- 		cmd = XY_COLOR_BLT_CMD | (len - 2);
- 
-@@ -310,6 +331,10 @@ intel_uxa_prepare_copy(PixmapPtr source, PixmapPtr dest, int xdir,
- 		intel_uxa_get_pixmap_bo(dest),
- 	};
- 
-+	if (!intel_uxa_check_bo_tiling(intel, dest, &intel->BR_tiling[0]) ||
-+	    !intel_uxa_check_bo_tiling(intel, source, &intel->BR_tiling[1]))
-+		return FALSE;
-+
- 	if (!intel_uxa_get_aperture_space(scrn, bo_table, ARRAY_SIZE(bo_table)))
- 		return FALSE;
- 
-@@ -375,7 +400,7 @@ intel_uxa_copy(PixmapPtr dest, int src_x1, int src_y1, int dst_x1,
- 
- 	{
- 		int len = INTEL_INFO(intel)->gen >= 0100 ? 10 : 8;
--		BEGIN_BATCH_BLT(len);
-+		BEGIN_BATCH_BLT_TILED(len);
- 
- 		cmd = XY_SRC_COPY_BLT_CMD | (len - 2);
- 
-@@ -1068,7 +1093,7 @@ Bool intel_uxa_create_screen_resources(ScreenPtr screen)
- 	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- 	PixmapPtr pixmap;
- 	intel_screen_private *intel = intel_get_screen_private(scrn);
--	dri_bo *bo = intel->front_buffer;
-+	dri_bo *bo = intel->front_buffer, *old_bo;
- 	int old_width, old_height, old_pitch;
- 
- 	if (!uxa_resources_init(screen))
-@@ -1081,6 +1106,7 @@ Bool intel_uxa_create_screen_resources(ScreenPtr screen)
- 	old_width = pixmap->drawable.width;
- 	old_height = pixmap->drawable.height;
- 	old_pitch = pixmap->devKind;
-+	old_bo = intel_uxa_get_pixmap_bo(pixmap);
- 
- 	if (!screen->ModifyPixmapHeader(pixmap,
- 					scrn->virtualX,
-@@ -1102,6 +1128,9 @@ Bool intel_uxa_create_screen_resources(ScreenPtr screen)
- err:
- 	screen->ModifyPixmapHeader(pixmap,
- 				   old_width, old_height, -1, -1, old_pitch, NULL);
-+	if (old_bo)
-+		intel_uxa_set_pixmap_bo(pixmap, old_bo);
-+
- 	return FALSE;
- }
- 
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 66ed8ebb..12b5d5d8 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -5,6 +5,7 @@ stress_TESTS = \
- 	basic-rectangle \
- 	basic-string \
- 	basic-copyarea \
-+	basic-copyplane \
- 	basic-copyarea-size \
- 	basic-putimage \
- 	basic-lines \
-@@ -12,8 +13,10 @@ stress_TESTS = \
- 	DrawSegments \
- 	cursor-test \
- 	render-fill \
-+	render-glyphs \
- 	render-trapezoid \
- 	render-trapezoid-image \
-+	render-triangle \
- 	render-fill-copy \
- 	render-composite-solid \
- 	render-composite-solid-mask \
-@@ -25,9 +28,16 @@ stress_TESTS = \
- 	shm-test \
- 	$(NULL)
- 
-+if X11_VM
-+stress_TESTS += \
-+	xvidmode \
-+	$(NULL)
-+endif
-+
- if DRI2
- stress_TESTS += \
- 	dri2-race \
-+	dri2-speed \
- 	dri2-swap \
- 	dri2-test \
- 	$(NULL)
-@@ -36,8 +46,11 @@ endif
- if X11_DRI3
- stress_TESTS += \
- 	dri3-test \
-+	present-race \
-+	present-speed \
- 	present-test \
- 	$(NULL)
-+present_speed_CFLAGS = ${AM_CFLAGS} -pthread
- endif
- check_PROGRAMS = $(stress_TESTS)
- 
-diff --git a/test/basic-copyplane.c b/test/basic-copyplane.c
-new file mode 100644
-index 00000000..f049b82b
---- /dev/null
-+++ b/test/basic-copyplane.c
-@@ -0,0 +1,99 @@
-+#include <stdint.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#include <X11/Xutil.h> /* for XDestroyImage */
-+#include <pixman.h> /* for pixman blt functions */
-+
-+#include "test.h"
-+
-+static uint8_t clock_bits[] = {0x3C, 0x5E, 0xEF, 0xF7, 0x87, 0xFF, 0x7E, 0x3C};
-+
-+/* https://bugs.freedesktop.org/show_bug.cgi?id=91499 */
-+static void draw_clock(struct test_display *t, Drawable d,
-+		       uint8_t alu, int x, int y, uint32_t fg, uint32_t bg)
-+{
-+	Pixmap pixmap;
-+	XGCValues val;
-+	GC gc;
-+
-+	val.graphics_exposures = 0;
-+	val.function = alu;
-+	val.foreground = fg;
-+	val.background = fg;
-+
-+	gc = XCreateGC(t->dpy, d,
-+		       GCGraphicsExposures | GCForeground | GCBackground | GCFunction,
-+		       &val);
-+	pixmap = XCreateBitmapFromData(t->dpy, d, (char *)clock_bits, 8, 8);
-+
-+	XCopyPlane(t->dpy, pixmap, d, gc, 0, 0, 8, 8, x, y, 1);
-+
-+	XFreePixmap(t->dpy, pixmap);
-+	XFreeGC(t->dpy, gc);
-+}
-+
-+static void clear(struct test_display *dpy, struct test_target *tt)
-+{
-+	XRenderColor render_color = {0};
-+	XRenderFillRectangle(dpy->dpy, PictOpClear, tt->picture, &render_color,
-+			     0, 0, tt->width, tt->height);
-+}
-+
-+static void clock_tests(struct test *t, int reps, int sets, enum target target)
-+{
-+	struct test_target out, ref;
-+	int r, s;
-+
-+	printf("Testing clock (%s): ", test_target_name(target));
-+	fflush(stdout);
-+
-+	test_target_create_render(&t->out, target, &out);
-+	clear(&t->out, &out);
-+
-+	test_target_create_render(&t->ref, target, &ref);
-+	clear(&t->ref, &ref);
-+
-+	for (s = 0; s < sets; s++) {
-+		for (r = 0; r < reps; r++) {
-+			int x = rand() % (out.width - 8);
-+			int y = rand() % (out.height - 8);
-+			uint8_t alu = rand() % (GXset + 1);
-+			uint32_t bg = rand();
-+			uint32_t fg = rand();
-+
-+			draw_clock(&t->out, out.draw, alu, x, y, fg, bg);
-+			draw_clock(&t->ref, ref.draw, alu, x, y, fg, bg);
-+		}
-+
-+		test_compare(t,
-+			     out.draw, out.format,
-+			     ref.draw, ref.format,
-+			     0, 0, out.width, out.height,
-+			     "");
-+	}
-+
-+	printf("passed [%d iterations x %d]\n", reps, sets);
-+
-+	test_target_destroy_render(&t->out, &out);
-+	test_target_destroy_render(&t->ref, &ref);
-+}
-+
-+int main(int argc, char **argv)
-+{
-+	struct test test;
-+	int i;
-+
-+	test_init(&test, argc, argv);
-+
-+	for (i = 0; i <= DEFAULT_ITERATIONS; i++) {
-+		int reps = REPS(i), sets = SETS(i);
-+		enum target t;
-+
-+		for (t = TARGET_FIRST; t <= TARGET_LAST; t++) {
-+			clock_tests(&test, reps, sets, t);
-+		}
-+	}
-+
-+	return 0;
-+}
-diff --git a/test/dri2-race.c b/test/dri2-race.c
-index 8862c84c..ece624f6 100644
---- a/test/dri2-race.c
-+++ b/test/dri2-race.c
-@@ -5,6 +5,11 @@
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/extensions/Xfixes.h>
-+#include <X11/extensions/Xcomposite.h>
-+#include <X11/Xlib-xcb.h>
-+#include <xcb/xcb.h>
-+#include <xcb/xcbext.h>
-+#include <xcb/dri2.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <string.h>
-@@ -12,11 +17,49 @@
- 
- #include <xf86drm.h>
- #include <drm.h>
-+#include <setjmp.h>
- 
- #include "dri2.h"
- 
- #define COUNT 60
- 
-+#define N_DIVISORS 3
-+static const int divisors[N_DIVISORS] = { 0, 1, 16 };
-+
-+static jmp_buf error_handler[4];
-+static int have_error_handler;
-+
-+#define error_get() \
-+	setjmp(error_handler[have_error_handler++])
-+
-+#define error_put() \
-+	have_error_handler--
-+
-+static int (*saved_io_error)(Display *dpy);
-+
-+static int io_error(Display *dpy)
-+{
-+	if (have_error_handler)
-+		longjmp(error_handler[--have_error_handler], 0);
-+
-+	return saved_io_error(dpy);
-+}
-+
-+static int x_error(Display *dpy, XErrorEvent *e)
-+{
-+	return Success;
-+}
-+
-+static uint32_t upper_32_bits(uint64_t val)
-+{
-+	return val >> 32;
-+}
-+
-+static uint32_t lower_32_bits(uint64_t val)
-+{
-+	return val & 0xffffffff;
-+}
-+
- static int dri2_open(Display *dpy)
- {
- 	drm_auth_t auth;
-@@ -41,45 +84,701 @@ static int dri2_open(Display *dpy)
- 	return fd;
- }
- 
--static void run(Display *dpy, int width, int height,
--		unsigned int *attachments, int nattachments,
--		const char *name)
-+static void swap_buffers(Display *dpy, Window win, int divisor,
-+			 unsigned int *attachments, int nattachments)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	unsigned int seq[2];
-+
-+	seq[0] = xcb_dri2_swap_buffers_unchecked(c, win,
-+						 0, 0, 0, divisor, 0, 0).sequence;
-+
-+
-+	seq[1] = xcb_dri2_get_buffers_unchecked(c, win,
-+						nattachments, nattachments,
-+						attachments).sequence;
-+
-+	xcb_flush(c);
-+	xcb_discard_reply(c, seq[0]);
-+	xcb_discard_reply(c, seq[1]);
-+}
-+
-+#define COMPOSITE 1
-+
-+static int has_composite(Display *dpy)
-+{
-+	Display *dummy = NULL;
-+	int event, error;
-+	int major = -1, minor = -1;
-+
-+	if (dpy == NULL)
-+		dummy = dpy = XOpenDisplay(NULL);
-+
-+	if (XCompositeQueryExtension(dpy, &event, &error))
-+		XCompositeQueryVersion(dpy, &major, &minor);
-+
-+	if (dummy)
-+		XCloseDisplay(dummy);
-+
-+	return major > 0 || minor >= 4;
-+}
-+
-+static void race_window(Display *dpy, int width, int height,
-+			unsigned int *attachments, int nattachments,
-+			unsigned flags, const char *name)
- {
- 	Window win;
- 	XSetWindowAttributes attr;
--	int count, loop;
-+	int count, loop, n;
- 	DRI2Buffer *buffers;
- 
-+	if (flags & COMPOSITE && !has_composite(dpy))
-+		return;
-+
-+	printf("%s(%s)\n", __func__, name);
-+
- 	/* Be nasty and install a fullscreen window on top so that we
- 	 * can guarantee we do not get clipped by children.
- 	 */
- 	attr.override_redirect = 1;
--	loop = 100;
--	do {
-+	for (n = 0; n < N_DIVISORS; n++) {
-+		loop = 256 >> ffs(divisors[n]);
-+		printf("DRI2SwapBuffers(divisor=%d), loop=%d", divisors[n], loop);
-+		fflush(stdout);
-+		do {
-+			win = XCreateWindow(dpy, DefaultRootWindow(dpy),
-+					0, 0, width, height, 0,
-+					DefaultDepth(dpy, DefaultScreen(dpy)),
-+					InputOutput,
-+					DefaultVisual(dpy, DefaultScreen(dpy)),
-+					CWOverrideRedirect, &attr);
-+			if (flags & COMPOSITE)
-+				XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+			XMapWindow(dpy, win);
-+
-+			DRI2CreateDrawable(dpy, win);
-+
-+			buffers = DRI2GetBuffers(dpy, win, &width, &height,
-+					attachments, nattachments, &count);
-+			if (count != nattachments)
-+				return;
-+
-+			free(buffers);
-+			for (count = 0; count < loop; count++)
-+				DRI2SwapBuffers(dpy, win, 0, divisors[n], count & (divisors[n]-1));
-+			XDestroyWindow(dpy, win);
-+			printf("."); fflush(stdout);
-+		} while (--loop);
-+		printf("*\n");
-+	}
-+
-+	for (n = 0; n < N_DIVISORS; n++) {
-+		loop = 256 >> ffs(divisors[n]);
-+		printf("xcb_dri2_swap_buffers(divisor=%d), loops=%d", divisors[n], loop);
-+		fflush(stdout);
-+		do {
-+			win = XCreateWindow(dpy, DefaultRootWindow(dpy),
-+					0, 0, width, height, 0,
-+					DefaultDepth(dpy, DefaultScreen(dpy)),
-+					InputOutput,
-+					DefaultVisual(dpy, DefaultScreen(dpy)),
-+					CWOverrideRedirect, &attr);
-+			if (flags & COMPOSITE)
-+				XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+			XMapWindow(dpy, win);
-+
-+			DRI2CreateDrawable(dpy, win);
-+
-+			buffers = DRI2GetBuffers(dpy, win, &width, &height,
-+					attachments, nattachments, &count);
-+			if (count != nattachments)
-+				return;
-+
-+			free(buffers);
-+			for (count = 0; count < loop; count++)
-+				swap_buffers(dpy, win, divisors[n], attachments, nattachments);
-+			XDestroyWindow(dpy, win);
-+			printf("."); fflush(stdout);
-+		} while (--loop);
-+		printf("*\n");
-+	}
-+
-+	for (n = 0; n < N_DIVISORS; n++) {
-+		loop = 256 >> ffs(divisors[n]);
-+		printf("DRI2WaitMsc(divisor=%d), loop=%d", divisors[n], loop);
-+		fflush(stdout);
-+		do {
-+			uint64_t ignore, msc;
-+			xcb_connection_t *c = XGetXCBConnection(dpy);
-+
-+			win = XCreateWindow(dpy, DefaultRootWindow(dpy),
-+					0, 0, width, height, 0,
-+					DefaultDepth(dpy, DefaultScreen(dpy)),
-+					InputOutput,
-+					DefaultVisual(dpy, DefaultScreen(dpy)),
-+					CWOverrideRedirect, &attr);
-+			if (flags & COMPOSITE)
-+				XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+			XMapWindow(dpy, win);
-+
-+			DRI2CreateDrawable(dpy, win);
-+			DRI2GetMSC(dpy, win, &ignore, &msc, &ignore);
-+			msc++;
-+			for (count = 0; count < loop; count++) {
-+				xcb_discard_reply(c,
-+						xcb_dri2_wait_msc(c, win,
-+							upper_32_bits(msc),
-+							lower_32_bits(msc),
-+							0, 0, 0, 0).sequence);
-+				msc += divisors[n];
-+			}
-+			XFlush(dpy);
-+			XDestroyWindow(dpy, win);
-+			printf("."); fflush(stdout);
-+		} while (--loop);
-+		printf("*\n");
-+	}
-+
-+	XSync(dpy, 1);
-+	sleep(2);
-+	XSync(dpy, 1);
-+}
-+
-+static int rand_size(int max)
-+{
-+	return 1 + (rand() % (max - 1));
-+}
-+
-+static void race_resize(Display *dpy, int width, int height,
-+			unsigned int *attachments, int nattachments,
-+			unsigned flags, const char *name)
-+{
-+	Window win;
-+	XSetWindowAttributes attr;
-+	int count, loop, n;
-+	DRI2Buffer *buffers;
-+
-+	if (flags & COMPOSITE && !has_composite(dpy))
-+		return;
-+
-+	printf("%s(%s)\n", __func__, name);
-+
-+	attr.override_redirect = 1;
-+	for (n = 0; n < N_DIVISORS; n++) {
-+		win = XCreateWindow(dpy, DefaultRootWindow(dpy),
-+				    0, 0, width, height, 0,
-+				    DefaultDepth(dpy, DefaultScreen(dpy)),
-+				    InputOutput,
-+				    DefaultVisual(dpy, DefaultScreen(dpy)),
-+				    CWOverrideRedirect, &attr);
-+		if (flags & COMPOSITE)
-+			XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+		XMapWindow(dpy, win);
-+
-+		DRI2CreateDrawable(dpy, win);
-+
-+		loop = 256 >> ffs(divisors[n]);
-+		printf("DRI2SwapBuffers(divisor=%d), loop=%d", divisors[n], loop);
-+		fflush(stdout);
-+		do {
-+			int w, h;
-+
-+			buffers = DRI2GetBuffers(dpy, win, &w, &h,
-+					attachments, nattachments, &count);
-+			if (count != nattachments)
-+				return;
-+
-+			free(buffers);
-+			for (count = 0; count < loop; count++)
-+				DRI2SwapBuffers(dpy, win, 0, divisors[n], count & (divisors[n]-1));
-+			XResizeWindow(dpy, win, rand_size(width), rand_size(height));
-+			printf("."); fflush(stdout);
-+		} while (--loop);
-+		XDestroyWindow(dpy, win);
-+		XSync(dpy, True);
-+		printf("*\n");
-+	}
-+
-+	for (n = 0; n < N_DIVISORS; n++) {
- 		win = XCreateWindow(dpy, DefaultRootWindow(dpy),
- 				    0, 0, width, height, 0,
- 				    DefaultDepth(dpy, DefaultScreen(dpy)),
- 				    InputOutput,
- 				    DefaultVisual(dpy, DefaultScreen(dpy)),
- 				    CWOverrideRedirect, &attr);
-+		if (flags & COMPOSITE)
-+			XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
- 		XMapWindow(dpy, win);
- 
- 		DRI2CreateDrawable(dpy, win);
- 
--		buffers = DRI2GetBuffers(dpy, win, &width, &height,
--					 attachments, nattachments, &count);
--		if (count != nattachments)
--			return;
-+		loop = 256 >> ffs(divisors[n]);
-+		printf("xcb_dri2_swap_buffers(divisor=%d), loops=%d", divisors[n], loop);
-+		fflush(stdout);
-+		do {
-+			int w, h;
-+
-+			buffers = DRI2GetBuffers(dpy, win, &w, &h,
-+					attachments, nattachments, &count);
-+			if (count != nattachments)
-+				return;
- 
--		free(buffers);
--		for (count = 0; count < loop; count++)
--			DRI2SwapBuffers(dpy, win, 0, 0, 0);
-+			free(buffers);
-+			for (count = 0; count < loop; count++)
-+				swap_buffers(dpy, win, divisors[n], attachments, nattachments);
-+			XResizeWindow(dpy, win, rand_size(width), rand_size(height));
-+			printf("."); fflush(stdout);
-+		} while (--loop);
- 		XDestroyWindow(dpy, win);
--	} while (--loop);
-+		XSync(dpy, True);
-+		printf("*\n");
-+	}
-+
-+	for (n = 0; n < N_DIVISORS; n++) {
-+		win = XCreateWindow(dpy, DefaultRootWindow(dpy),
-+				    0, 0, width, height, 0,
-+				    DefaultDepth(dpy, DefaultScreen(dpy)),
-+				    InputOutput,
-+				    DefaultVisual(dpy, DefaultScreen(dpy)),
-+				    CWOverrideRedirect, &attr);
-+		if (flags & COMPOSITE)
-+			XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+		XMapWindow(dpy, win);
-+
-+		DRI2CreateDrawable(dpy, win);
-+
-+		loop = 256 >> ffs(divisors[n]);
-+		printf("DRI2WaitMsc(divisor=%d), loop=%d", divisors[n], loop);
-+		fflush(stdout);
-+		do {
-+			uint64_t ignore, msc;
-+			xcb_connection_t *c = XGetXCBConnection(dpy);
-+
-+			DRI2GetMSC(dpy, win, &ignore, &msc, &ignore);
-+			msc++;
-+			for (count = 0; count < loop; count++) {
-+				xcb_discard_reply(c,
-+						xcb_dri2_wait_msc(c, win,
-+							upper_32_bits(msc),
-+							lower_32_bits(msc),
-+							0, 0, 0, 0).sequence);
-+				msc += divisors[n];
-+			}
-+			XFlush(dpy);
-+			XResizeWindow(dpy, win, rand_size(width), rand_size(height));
-+			printf("."); fflush(stdout);
-+		} while (--loop);
-+		XDestroyWindow(dpy, win);
-+		XSync(dpy, True);
-+		printf("*\n");
-+	}
-+
-+	XSync(dpy, 1);
-+	sleep(2);
-+	XSync(dpy, 1);
-+}
-+
-+static void race_manager(Display *dpy, int width, int height,
-+			 unsigned int *attachments, int nattachments,
-+			 unsigned flags, const char *name)
-+{
-+	Display *mgr = XOpenDisplay(NULL);
-+	Window win;
-+	XSetWindowAttributes attr;
-+	int count, loop, n;
-+	DRI2Buffer *buffers;
-+
-+	if (flags & COMPOSITE && !has_composite(dpy))
-+		return;
-+
-+	printf("%s(%s)\n", __func__, name);
-+
-+	/* Be nasty and install a fullscreen window on top so that we
-+	 * can guarantee we do not get clipped by children.
-+	 */
-+	attr.override_redirect = 1;
-+	for (n = 0; n < N_DIVISORS; n++) {
-+		printf("DRI2SwapBuffers(divisor=%d)", divisors[n]);
-+		fflush(stdout);
-+		loop = 256 >> ffs(divisors[n]);
-+		do {
-+			win = XCreateWindow(dpy, DefaultRootWindow(dpy),
-+					0, 0, width, height, 0,
-+					DefaultDepth(dpy, DefaultScreen(dpy)),
-+					InputOutput,
-+					DefaultVisual(dpy, DefaultScreen(dpy)),
-+					CWOverrideRedirect, &attr);
-+			if (flags & COMPOSITE)
-+				XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+			XMapWindow(dpy, win);
-+
-+			DRI2CreateDrawable(dpy, win);
-+
-+			buffers = DRI2GetBuffers(dpy, win, &width, &height,
-+					attachments, nattachments, &count);
-+			if (count != nattachments)
-+				return;
-+
-+			free(buffers);
-+			for (count = 0; count < loop; count++)
-+				DRI2SwapBuffers(dpy, win, 0, divisors[n], count & (divisors[n]-1));
-+			XFlush(dpy);
-+			XDestroyWindow(mgr, win);
-+			XFlush(mgr);
-+			printf("."); fflush(stdout);
-+		} while (--loop);
-+		printf("*\n");
-+	}
-+
-+	for (n = 0; n < N_DIVISORS; n++) {
-+		printf("xcb_dri2_swap_buffers(divisor=%d)", divisors[n]);
-+		fflush(stdout);
-+		loop = 256 >> ffs(divisors[n]);
-+		do {
-+			win = XCreateWindow(dpy, DefaultRootWindow(dpy),
-+					0, 0, width, height, 0,
-+					DefaultDepth(dpy, DefaultScreen(dpy)),
-+					InputOutput,
-+					DefaultVisual(dpy, DefaultScreen(dpy)),
-+					CWOverrideRedirect, &attr);
-+			if (flags & COMPOSITE)
-+				XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+			XMapWindow(dpy, win);
-+
-+			DRI2CreateDrawable(dpy, win);
-+
-+			buffers = DRI2GetBuffers(dpy, win, &width, &height,
-+					attachments, nattachments, &count);
-+			if (count != nattachments)
-+				return;
-+
-+			free(buffers);
-+			for (count = 0; count < loop; count++)
-+				swap_buffers(dpy, win, divisors[n], attachments, nattachments);
-+			XFlush(dpy);
-+			XDestroyWindow(mgr, win);
-+			XFlush(mgr);
-+			printf("."); fflush(stdout);
-+		} while (--loop);
-+		printf("*\n");
-+	}
-+
-+	for (n = 0; n < N_DIVISORS; n++) {
-+		printf("DRI2WaitMsc(divisor=%d)", divisors[n]);
-+		fflush(stdout);
-+		loop = 256 >> ffs(divisors[n]);
-+		do {
-+			uint64_t ignore, msc;
-+			xcb_connection_t *c = XGetXCBConnection(dpy);
-+
-+			win = XCreateWindow(dpy, DefaultRootWindow(dpy),
-+					0, 0, width, height, 0,
-+					DefaultDepth(dpy, DefaultScreen(dpy)),
-+					InputOutput,
-+					DefaultVisual(dpy, DefaultScreen(dpy)),
-+					CWOverrideRedirect, &attr);
-+			if (flags & COMPOSITE)
-+				XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+			XMapWindow(dpy, win);
-+
-+			DRI2CreateDrawable(dpy, win);
-+			DRI2GetMSC(dpy, win, &ignore, &msc, &ignore);
-+			msc++;
-+			for (count = 0; count < loop; count++) {
-+				xcb_discard_reply(c,
-+						xcb_dri2_wait_msc(c, win,
-+							upper_32_bits(msc),
-+							lower_32_bits(msc),
-+							0, 0, 0, 0).sequence);
-+				msc += divisors[n];
-+			}
-+			XFlush(dpy);
-+			XDestroyWindow(mgr, win);
-+			XFlush(mgr);
-+			printf("."); fflush(stdout);
-+		} while (--loop);
-+		printf("*\n");
-+	}
- 
- 	XSync(dpy, 1);
-+	XSync(mgr, 1);
- 	sleep(2);
- 	XSync(dpy, 1);
-+	XSync(mgr, 1);
-+
-+	XCloseDisplay(mgr);
-+}
-+
-+static void race_close(int width, int height,
-+		       unsigned int *attachments, int nattachments,
-+		       unsigned flags, const char *name)
-+{
-+	XSetWindowAttributes attr;
-+	int count, loop, n;
-+
-+	if (flags & COMPOSITE && !has_composite(NULL))
-+		return;
-+
-+	printf("%s(%s)\n", __func__, name);
-+
-+	/* Be nasty and install a fullscreen window on top so that we
-+	 * can guarantee we do not get clipped by children.
-+	 */
-+	attr.override_redirect = 1;
-+	for (n = 0; n < N_DIVISORS; n++) {
-+		printf("DRI2SwapBuffers(divisor=%d)", divisors[n]);
-+		fflush(stdout);
-+		loop = 256 >> ffs(divisors[n]);
-+		do {
-+			Display *dpy = XOpenDisplay(NULL);
-+			Window win = XCreateWindow(dpy, DefaultRootWindow(dpy),
-+					0, 0, width, height, 0,
-+					DefaultDepth(dpy, DefaultScreen(dpy)),
-+					InputOutput,
-+					DefaultVisual(dpy, DefaultScreen(dpy)),
-+					CWOverrideRedirect, &attr);
-+			if (flags & COMPOSITE)
-+				XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+			XMapWindow(dpy, win);
-+
-+			DRI2CreateDrawable(dpy, win);
-+			free(DRI2GetBuffers(dpy, win, &width, &height,
-+						attachments, nattachments, &count));
-+			if (count != nattachments)
-+				return;
-+
-+			for (count = 0; count < loop; count++)
-+				DRI2SwapBuffers(dpy, win, 0, divisors[n], count & (divisors[n]-1));
-+			XCloseDisplay(dpy);
-+			printf("."); fflush(stdout);
-+		} while (--loop);
-+		printf("*\n");
-+	}
-+
-+	for (n = 0; n < N_DIVISORS; n++) {
-+		printf("xcb_dri2_swap_buffers(divisor=%d)", divisors[n]);
-+		fflush(stdout);
-+		loop = 256 >> ffs(divisors[n]);
-+		do {
-+			Display *dpy = XOpenDisplay(NULL);
-+			Window win = XCreateWindow(dpy, DefaultRootWindow(dpy),
-+					0, 0, width, height, 0,
-+					DefaultDepth(dpy, DefaultScreen(dpy)),
-+					InputOutput,
-+					DefaultVisual(dpy, DefaultScreen(dpy)),
-+					CWOverrideRedirect, &attr);
-+			if (flags & COMPOSITE)
-+				XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+			XMapWindow(dpy, win);
-+
-+			DRI2CreateDrawable(dpy, win);
-+			free(DRI2GetBuffers(dpy, win, &width, &height,
-+						attachments, nattachments, &count));
-+			if (count != nattachments)
-+				return;
-+
-+			for (count = 0; count < loop; count++)
-+				swap_buffers(dpy, win, divisors[n], attachments, nattachments);
-+			XCloseDisplay(dpy);
-+			printf("."); fflush(stdout);
-+		} while (--loop);
-+		printf("*\n");
-+	}
-+
-+	for (n = 0; n < N_DIVISORS; n++) {
-+		printf("DRI2WaitMsc(divisor=%d)", divisors[n]);
-+		fflush(stdout);
-+		loop = 256 >> ffs(divisors[n]);
-+		do {
-+			uint64_t ignore, msc;
-+			Display *dpy = XOpenDisplay(NULL);
-+			xcb_connection_t *c = XGetXCBConnection(dpy);
-+			Window win = XCreateWindow(dpy, DefaultRootWindow(dpy),
-+					0, 0, width, height, 0,
-+					DefaultDepth(dpy, DefaultScreen(dpy)),
-+					InputOutput,
-+					DefaultVisual(dpy, DefaultScreen(dpy)),
-+					CWOverrideRedirect, &attr);
-+			if (flags & COMPOSITE)
-+				XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+			XMapWindow(dpy, win);
-+
-+			DRI2CreateDrawable(dpy, win);
-+			DRI2GetMSC(dpy, win, &ignore, &msc, &ignore);
-+			msc++;
-+			for (count = 0; count < loop; count++) {
-+				xcb_discard_reply(c,
-+						xcb_dri2_wait_msc(c, win,
-+							upper_32_bits(msc),
-+							lower_32_bits(msc),
-+							0, 0, 0, 0).sequence);
-+				msc += divisors[n];
-+			}
-+			XFlush(dpy);
-+			XCloseDisplay(dpy);
-+			printf("."); fflush(stdout);
-+		} while (--loop);
-+		printf("*\n");
-+	}
-+}
-+
-+static void race_client(int width, int height,
-+			unsigned int *attachments, int nattachments,
-+			unsigned flags, const char *name)
-+{
-+	Display *mgr = XOpenDisplay(NULL);
-+	XSetWindowAttributes attr;
-+	int count, loop, n;
-+
-+	if (flags & COMPOSITE && !has_composite(NULL))
-+		return;
-+
-+	printf("%s(%s)\n", __func__, name);
-+
-+	/* Be nasty and install a fullscreen window on top so that we
-+	 * can guarantee we do not get clipped by children.
-+	 */
-+	attr.override_redirect = 1;
-+	for (n = 0; n < N_DIVISORS; n++) {
-+		printf("DRI2SwapBuffers(divisor=%d)", divisors[n]);
-+		fflush(stdout);
-+		loop = 256 >> ffs(divisors[n]);
-+		do {
-+			Display *dpy = XOpenDisplay(NULL);
-+			Window win;
-+
-+			if (error_get()) {
-+				XCloseDisplay(dpy);
-+				printf("+"); fflush(stdout);
-+				continue;
-+			}
-+
-+			win = XCreateWindow(dpy, DefaultRootWindow(dpy),
-+					    0, 0, width, height, 0,
-+					    DefaultDepth(dpy, DefaultScreen(dpy)),
-+					    InputOutput,
-+					    DefaultVisual(dpy, DefaultScreen(dpy)),
-+					    CWOverrideRedirect, &attr);
-+			if (flags & COMPOSITE)
-+				XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+			XMapWindow(dpy, win);
-+
-+			DRI2CreateDrawable(dpy, win);
-+			free(DRI2GetBuffers(dpy, win, &width, &height,
-+					    attachments, nattachments, &count));
-+			if (count == nattachments) {
-+				for (count = 0; count < loop; count++)
-+					DRI2SwapBuffers(dpy, win, 0, divisors[n], count & (divisors[n]-1));
-+			}
-+
-+			XFlush(dpy);
-+			XKillClient(mgr, win);
-+			XFlush(mgr);
-+
-+			XCloseDisplay(dpy);
-+			printf("."); fflush(stdout);
-+
-+			error_put();
-+		} while (--loop);
-+		printf("*\n");
-+	}
-+
-+	for (n = 0; n < N_DIVISORS; n++) {
-+		printf("xcb_dri2_swap_buffers(divisor=%d)", divisors[n]);
-+		fflush(stdout);
-+		loop = 256 >> ffs(divisors[n]);
-+		do {
-+			Display *dpy = XOpenDisplay(NULL);
-+			Window win;
-+
-+			if (error_get()) {
-+				XCloseDisplay(dpy);
-+				printf("+"); fflush(stdout);
-+				continue;
-+			}
-+
-+			win = XCreateWindow(dpy, DefaultRootWindow(dpy),
-+					    0, 0, width, height, 0,
-+					    DefaultDepth(dpy, DefaultScreen(dpy)),
-+					    InputOutput,
-+					    DefaultVisual(dpy, DefaultScreen(dpy)),
-+					    CWOverrideRedirect, &attr);
-+			if (flags & COMPOSITE)
-+				XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+			XMapWindow(dpy, win);
-+
-+			DRI2CreateDrawable(dpy, win);
-+			free(DRI2GetBuffers(dpy, win, &width, &height,
-+					    attachments, nattachments, &count));
-+			if (count == nattachments) {
-+				for (count = 0; count < loop; count++)
-+					swap_buffers(dpy, win, divisors[n], attachments, nattachments);
-+			}
-+
-+			XFlush(dpy);
-+			XKillClient(mgr, win);
-+			XFlush(mgr);
-+
-+			XCloseDisplay(dpy);
-+			printf("."); fflush(stdout);
-+
-+			error_put();
-+		} while (--loop);
-+		printf("*\n");
-+	}
-+
-+	for (n = 0; n < N_DIVISORS; n++) {
-+		printf("DRI2WaitMsc(divisor=%d)", divisors[n]);
-+		fflush(stdout);
-+		loop = 256 >> ffs(divisors[n]);
-+		do {
-+			Display *dpy = XOpenDisplay(NULL);
-+			uint64_t ignore, msc;
-+			xcb_connection_t *c;
-+			Window win;
-+
-+			if (error_get()) {
-+				XCloseDisplay(dpy);
-+				printf("+"); fflush(stdout);
-+				continue;
-+			}
-+
-+			win = XCreateWindow(dpy, DefaultRootWindow(dpy),
-+					    0, 0, width, height, 0,
-+					    DefaultDepth(dpy, DefaultScreen(dpy)),
-+					    InputOutput,
-+					    DefaultVisual(dpy, DefaultScreen(dpy)),
-+					    CWOverrideRedirect, &attr);
-+			if (flags & COMPOSITE)
-+				XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+			XMapWindow(dpy, win);
-+
-+			DRI2CreateDrawable(dpy, win);
-+			DRI2GetMSC(dpy, win, &ignore, &msc, &ignore);
-+			c = XGetXCBConnection(dpy);
-+			msc++;
-+			for (count = 0; count < loop; count++) {
-+				xcb_discard_reply(c,
-+						  xcb_dri2_wait_msc(c, win,
-+								    upper_32_bits(msc),
-+								    lower_32_bits(msc),
-+								    0, 0, 0, 0).sequence);
-+				msc += divisors[n];
-+			}
-+
-+			XFlush(dpy);
-+			XKillClient(mgr, win);
-+			XFlush(mgr);
-+
-+			XCloseDisplay(dpy);
-+			printf("."); fflush(stdout);
-+
-+			error_put();
-+		} while (--loop);
-+		printf("*\n");
-+	}
-+
-+	XCloseDisplay(mgr);
- }
- 
- int main(void)
-@@ -91,7 +790,10 @@ int main(void)
- 		DRI2BufferFrontLeft,
- 	};
- 
--	dpy = XOpenDisplay (NULL);
-+	saved_io_error = XSetIOErrorHandler(io_error);
-+	XSetErrorHandler(x_error);
-+
-+	dpy = XOpenDisplay(NULL);
- 	if (dpy == NULL)
- 		return 77;
- 
-@@ -101,13 +803,52 @@ int main(void)
- 
- 	width = WidthOfScreen(DefaultScreenOfDisplay(dpy));
- 	height = HeightOfScreen(DefaultScreenOfDisplay(dpy));
--	run(dpy, width, height, attachments, 1, "fullscreen");
--	run(dpy, width, height, attachments, 2, "fullscreen (with front)");
-+	race_window(dpy, width, height, attachments, 1, 0, "fullscreen");
-+	race_window(dpy, width, height, attachments, 1, COMPOSITE, "composite fullscreen");
-+	race_window(dpy, width, height, attachments, 2, 0, "fullscreen (with front)");
-+	race_window(dpy, width, height, attachments, 2, COMPOSITE, "composite fullscreen (with front)");
-+
-+	race_resize(dpy, width, height, attachments, 1, 0, "");
-+	race_resize(dpy, width, height, attachments, 1, COMPOSITE, "composite");
-+	race_resize(dpy, width, height, attachments, 2, 0, "with front");
-+	race_resize(dpy, width, height, attachments, 2, COMPOSITE, "composite with front");
-+
-+	race_manager(dpy, width, height, attachments, 1, 0, "fullscreen");
-+	race_manager(dpy, width, height, attachments, 1, COMPOSITE, "composite fullscreen");
-+	race_manager(dpy, width, height, attachments, 2, 0, "fullscreen (with front)");
-+	race_manager(dpy, width, height, attachments, 2, COMPOSITE, "composite fullscreen (with front)");
-+
-+	race_close(width, height, attachments, 1, 0, "fullscreen");
-+	race_close(width, height, attachments, 1, COMPOSITE, "composite fullscreen");
-+	race_close(width, height, attachments, 2, 0, "fullscreen (with front)");
-+	race_close(width, height, attachments, 2, COMPOSITE, "composite fullscreen (with front)");
-+
-+	race_client(width, height, attachments, 1, 0, "fullscreen");
-+	race_client(width, height, attachments, 1, COMPOSITE, "composite fullscreen");
-+	race_client(width, height, attachments, 2, 0, "fullscreen (with front)");
-+	race_client(width, height, attachments, 2, COMPOSITE, "composite fullscreen (with front)");
- 
- 	width /= 2;
- 	height /= 2;
--	run(dpy, width, height, attachments, 1, "windowed");
--	run(dpy, width, height, attachments, 2, "windowed (with front)");
-+	race_window(dpy, width, height, attachments, 1, 0, "windowed");
-+	race_window(dpy, width, height, attachments, 1, COMPOSITE, "composite windowed");
-+	race_window(dpy, width, height, attachments, 2, 0, "windowed (with front)");
-+	race_window(dpy, width, height, attachments, 2, COMPOSITE, "composite windowed (with front)");
-+
-+	race_manager(dpy, width, height, attachments, 1, 0, "windowed");
-+	race_manager(dpy, width, height, attachments, 1, COMPOSITE, "composite windowed");
-+	race_manager(dpy, width, height, attachments, 2, 0, "windowed (with front)");
-+	race_manager(dpy, width, height, attachments, 2, COMPOSITE, "composite windowed (with front)");
-+
-+	race_close(width, height, attachments, 1, 0, "windowed");
-+	race_close(width, height, attachments, 1, COMPOSITE, "composite windowed");
-+	race_close(width, height, attachments, 2, 0, "windowed (with front)");
-+	race_close(width, height, attachments, 2, COMPOSITE, "composite windowed (with front)");
-+
-+	race_client(width, height, attachments, 1, 0, "windowed");
-+	race_client(width, height, attachments, 1, COMPOSITE, "composite windowed");
-+	race_client(width, height, attachments, 2, 0, "windowed (with front)");
-+	race_client(width, height, attachments, 2, COMPOSITE, "composite windowed (with front)");
- 
- 	return 0;
- }
-diff --git a/test/dri2-speed.c b/test/dri2-speed.c
-new file mode 100644
-index 00000000..87b9d0b6
---- /dev/null
-+++ b/test/dri2-speed.c
-@@ -0,0 +1,342 @@
-+/*
-+ * Copyright (c) 2015 Intel Corporation
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ *
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <X11/Xlib.h>
-+#include <X11/Xatom.h>
-+#include <X11/Xlib-xcb.h>
-+#include <X11/Xutil.h>
-+#include <X11/Xlibint.h>
-+#include <X11/extensions/dpms.h>
-+#include <X11/extensions/randr.h>
-+#include <X11/extensions/Xcomposite.h>
-+#include <X11/extensions/Xdamage.h>
-+#include <X11/extensions/Xrandr.h>
-+#include <xcb/xcb.h>
-+#include <xcb/dri2.h>
-+#include <xf86drm.h>
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <assert.h>
-+#include <errno.h>
-+#include <setjmp.h>
-+#include <signal.h>
-+
-+#include "dri2.h"
-+
-+static int _x_error_occurred;
-+
-+static int
-+_check_error_handler(Display     *display,
-+		     XErrorEvent *event)
-+{
-+	printf("X11 error from display %s, serial=%ld, error=%d, req=%d.%d\n",
-+	       DisplayString(display),
-+	       event->serial,
-+	       event->error_code,
-+	       event->request_code,
-+	       event->minor_code);
-+	_x_error_occurred++;
-+	return False; /* ignored */
-+}
-+
-+static double elapsed(const struct timespec *start,
-+		      const struct timespec *end)
-+{
-+	return 1e6*(end->tv_sec - start->tv_sec) + (end->tv_nsec - start->tv_nsec)/1000;
-+}
-+
-+static void run(Display *dpy, Window win, const char *name)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	struct timespec start, end;
-+	int n, completed = 0;
-+
-+	_x_error_occurred = 0;
-+
-+	clock_gettime(CLOCK_MONOTONIC, &start);
-+	do {
-+		for (n = 0; n < 1000; n++) {
-+			unsigned int attachments[] = { DRI2BufferBackLeft };
-+			unsigned int seq[2];
-+
-+			seq[0] = xcb_dri2_swap_buffers_unchecked(c, win,
-+								 0, 0, 0, 0, 0, 0).sequence;
-+
-+
-+			seq[1] = xcb_dri2_get_buffers_unchecked(c, win,
-+								1, 1, attachments).sequence;
-+
-+			xcb_flush(c);
-+			xcb_discard_reply(c, seq[0]);
-+			xcb_discard_reply(c, seq[1]);
-+			completed++;
-+		}
-+		clock_gettime(CLOCK_MONOTONIC, &end);
-+	} while (end.tv_sec < start.tv_sec + 10);
-+
-+	XSync(dpy, True);
-+	if (_x_error_occurred)
-+		abort();
-+
-+	printf("%s: Completed %d swaps in %.1fs, %.3fus each (%.1f FPS)\n",
-+	       name, completed, elapsed(&start, &end) / 1000000,
-+	       elapsed(&start, &end) / completed,
-+	       completed / (elapsed(&start, &end) / 1000000));
-+}
-+
-+static inline XRRScreenResources *_XRRGetScreenResourcesCurrent(Display *dpy, Window window)
-+{
-+	XRRScreenResources *res;
-+
-+	res = XRRGetScreenResourcesCurrent(dpy, window);
-+	if (res == NULL)
-+		res = XRRGetScreenResources(dpy, window);
-+
-+	return res;
-+}
-+
-+static XRRModeInfo *lookup_mode(XRRScreenResources *res, int id)
-+{
-+	int i;
-+
-+	for (i = 0; i < res->nmode; i++) {
-+		if (res->modes[i].id == id)
-+			return &res->modes[i];
-+	}
-+
-+	return NULL;
-+}
-+
-+static int dri2_open(Display *dpy)
-+{
-+	drm_auth_t auth;
-+	char *driver, *device;
-+	int fd;
-+
-+	if (!DRI2Connect(dpy, DefaultRootWindow(dpy), &driver, &device))
-+		return -1;
-+
-+	printf ("Connecting to %s driver on %s\n", driver, device);
-+
-+	fd = open(device, O_RDWR);
-+	if (fd < 0)
-+		return -1;
-+
-+	if (drmIoctl(fd, DRM_IOCTL_GET_MAGIC, &auth))
-+		return -1;
-+
-+	if (!DRI2Authenticate(dpy, DefaultRootWindow(dpy), auth.magic))
-+		return -1;
-+
-+	return fd;
-+}
-+
-+static void fullscreen(Display *dpy, Window win)
-+{
-+	Atom atom = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
-+	XChangeProperty(dpy, win,
-+			XInternAtom(dpy, "_NET_WM_STATE", False),
-+			XA_ATOM, 32, PropModeReplace,
-+			(unsigned char *)&atom, 1);
-+}
-+
-+static int has_composite(Display *dpy)
-+{
-+	int event, error;
-+	int major, minor;
-+
-+	if (!XDamageQueryExtension (dpy, &event, &error))
-+		return 0;
-+
-+	if (!XCompositeQueryExtension(dpy, &event, &error))
-+		return 0;
-+
-+	XCompositeQueryVersion(dpy, &major, &minor);
-+
-+	return major > 0 || minor >= 4;
-+}
-+
-+int main(void)
-+{
-+	Display *dpy;
-+	Window root, win;
-+	XRRScreenResources *res;
-+	XRRCrtcInfo **original_crtc;
-+	XSetWindowAttributes attr;
-+	int i, j, fd;
-+
-+	attr.override_redirect = 1;
-+
-+	dpy = XOpenDisplay(NULL);
-+	if (dpy == NULL)
-+		return 77;
-+
-+	fd = dri2_open(dpy);
-+	if (fd < 0)
-+		return 77;
-+
-+	if (DPMSQueryExtension(dpy, &i, &i))
-+		DPMSDisable(dpy);
-+
-+	root = DefaultRootWindow(dpy);
-+
-+	signal(SIGALRM, SIG_IGN);
-+	XSetErrorHandler(_check_error_handler);
-+
-+	res = NULL;
-+	if (XRRQueryVersion(dpy, &i, &i))
-+		res = _XRRGetScreenResourcesCurrent(dpy, root);
-+	if (res == NULL)
-+		return 77;
-+
-+	original_crtc = malloc(sizeof(XRRCrtcInfo *)*res->ncrtc);
-+	for (i = 0; i < res->ncrtc; i++)
-+		original_crtc[i] = XRRGetCrtcInfo(dpy, res, res->crtcs[i]);
-+
-+	printf("noutput=%d, ncrtc=%d\n", res->noutput, res->ncrtc);
-+	for (i = 0; i < res->ncrtc; i++)
-+		XRRSetCrtcConfig(dpy, res, res->crtcs[i], CurrentTime,
-+				 0, 0, None, RR_Rotate_0, NULL, 0);
-+
-+	DRI2CreateDrawable(dpy, root);
-+	DRI2SwapInterval(dpy, root, 0);
-+	run(dpy, root, "off");
-+	XSync(dpy, True);
-+
-+	for (i = 0; i < res->noutput; i++) {
-+		XRROutputInfo *output;
-+		XRRModeInfo *mode;
-+
-+		output = XRRGetOutputInfo(dpy, res, res->outputs[i]);
-+		if (output == NULL)
-+			continue;
-+
-+		mode = NULL;
-+		if (res->nmode)
-+			mode = lookup_mode(res, output->modes[0]);
-+
-+		for (j = 0; mode && j < 2*output->ncrtc; j++) {
-+			int c = j;
-+			if (c >= output->ncrtc)
-+				c = 2*output->ncrtc - j - 1;
-+
-+			printf("[%d, %d] -- OUTPUT:%ld, CRTC:%ld: %dx%d\n",
-+			       i, c, (long)res->outputs[i], (long)output->crtcs[c],
-+			       mode->width, mode->height);
-+			XRRSetCrtcConfig(dpy, res, output->crtcs[c], CurrentTime,
-+					 0, 0, output->modes[0], RR_Rotate_0, &res->outputs[i], 1);
-+
-+			run(dpy, root, "root");
-+			XSync(dpy, True);
-+
-+			win = XCreateWindow(dpy, root,
-+					    0, 0, mode->width, mode->height, 0,
-+					    DefaultDepth(dpy, DefaultScreen(dpy)),
-+					    InputOutput,
-+					    DefaultVisual(dpy, DefaultScreen(dpy)),
-+					    CWOverrideRedirect, &attr);
-+			DRI2CreateDrawable(dpy, win);
-+			DRI2SwapInterval(dpy, win, 0);
-+			fullscreen(dpy, win);
-+			XMapWindow(dpy, win);
-+			run(dpy, win, "fullscreen");
-+			XDestroyWindow(dpy, win);
-+			XSync(dpy, True);
-+
-+			win = XCreateWindow(dpy, root,
-+					    0, 0, mode->width, mode->height, 0,
-+					    DefaultDepth(dpy, DefaultScreen(dpy)),
-+					    InputOutput,
-+					    DefaultVisual(dpy, DefaultScreen(dpy)),
-+					    CWOverrideRedirect, &attr);
-+			DRI2CreateDrawable(dpy, win);
-+			DRI2SwapInterval(dpy, win, 0);
-+			XMapWindow(dpy, win);
-+			run(dpy, win, "windowed");
-+			XDestroyWindow(dpy, win);
-+			XSync(dpy, True);
-+
-+			if (has_composite(dpy)) {
-+				Damage damage;
-+
-+				_x_error_occurred = 0;
-+				win = XCreateWindow(dpy, root,
-+						    0, 0, mode->width, mode->height, 0,
-+						    DefaultDepth(dpy, DefaultScreen(dpy)),
-+						    InputOutput,
-+						    DefaultVisual(dpy, DefaultScreen(dpy)),
-+						    CWOverrideRedirect, &attr);
-+				XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+				damage = XDamageCreate(dpy, win, XDamageReportRawRectangles);
-+				DRI2CreateDrawable(dpy, win);
-+				DRI2SwapInterval(dpy, win, 0);
-+				XMapWindow(dpy, win);
-+				XSync(dpy, True);
-+				if (!_x_error_occurred)
-+					run(dpy, win, "composited");
-+				XDamageDestroy(dpy, damage);
-+				XDestroyWindow(dpy, win);
-+				XSync(dpy, True);
-+			}
-+
-+			win = XCreateWindow(dpy, root,
-+					    0, 0, mode->width/2, mode->height/2, 0,
-+					    DefaultDepth(dpy, DefaultScreen(dpy)),
-+					    InputOutput,
-+					    DefaultVisual(dpy, DefaultScreen(dpy)),
-+					    CWOverrideRedirect, &attr);
-+			DRI2CreateDrawable(dpy, win);
-+			DRI2SwapInterval(dpy, win, 0);
-+			XMapWindow(dpy, win);
-+			run(dpy, win, "half");
-+			XDestroyWindow(dpy, win);
-+			XSync(dpy, True);
-+
-+			XRRSetCrtcConfig(dpy, res, output->crtcs[c], CurrentTime,
-+					 0, 0, None, RR_Rotate_0, NULL, 0);
-+		}
-+
-+		XRRFreeOutputInfo(output);
-+	}
-+
-+	for (i = 0; i < res->ncrtc; i++)
-+		XRRSetCrtcConfig(dpy, res, res->crtcs[i], CurrentTime,
-+				 original_crtc[i]->x,
-+				 original_crtc[i]->y,
-+				 original_crtc[i]->mode,
-+				 original_crtc[i]->rotation,
-+				 original_crtc[i]->outputs,
-+				 original_crtc[i]->noutput);
-+
-+	if (DPMSQueryExtension(dpy, &i, &i))
-+		DPMSEnable(dpy);
-+	return 0;
-+}
-diff --git a/test/dri2-test.c b/test/dri2-test.c
-index dd4179f3..bdf01f38 100644
---- a/test/dri2-test.c
-+++ b/test/dri2-test.c
-@@ -6,6 +6,10 @@
- #include <X11/Xutil.h>
- #include <X11/extensions/Xfixes.h>
- #include <X11/extensions/Xrandr.h>
-+#include <X11/Xlib-xcb.h>
-+#include <xcb/xcb.h>
-+#include <xcb/xcbext.h>
-+#include <xcb/dri2.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <string.h>
-@@ -18,6 +22,8 @@
- 
- #define COUNT 60
- 
-+static int prime[] = { 0, 1, 2, 3, 5, 7, 11, 13, 17, 19, 23, 27, 29, 31, 37, 41, 43, 47, 51, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131 };
-+
- static inline XRRScreenResources *_XRRGetScreenResourcesCurrent(Display *dpy, Window window)
- {
- 	XRRScreenResources *res;
-@@ -101,16 +107,41 @@ static uint64_t check_msc(Display *dpy, Window win, uint64_t last_msc)
- 	return current_msc;
- }
- 
-+static void wait_next_vblank(Display *dpy, Window win)
-+{
-+	uint64_t msc, ust, sbc;
-+	DRI2WaitMSC(dpy, win, 0, 1, 0, &ust, &msc, &sbc);
-+}
-+
-+static void swap_buffers(xcb_connection_t *c, Window win,
-+		unsigned int *attachments, int nattachments)
-+{
-+	unsigned int seq[2];
-+
-+	seq[0] = xcb_dri2_swap_buffers_unchecked(c, win,
-+						 0, 0, 0, 0, 0, 0).sequence;
-+
-+
-+	seq[1] = xcb_dri2_get_buffers_unchecked(c, win,
-+						nattachments, nattachments,
-+						attachments).sequence;
-+
-+	xcb_flush(c);
-+	xcb_discard_reply(c, seq[0]);
-+	xcb_discard_reply(c, seq[1]);
-+}
-+
- static void run(Display *dpy, int width, int height,
- 		unsigned int *attachments, int nattachments,
- 		const char *name)
- {
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
- 	Window win;
- 	XSetWindowAttributes attr;
--	int count;
- 	DRI2Buffer *buffers;
- 	struct timespec start, end;
--	uint64_t msc;
-+	uint64_t start_msc, end_msc;
-+	int modulus, remainder, count;
- 
- 	/* Be nasty and install a fullscreen window on top so that we
- 	 * can guarantee we do not get clipped by children.
-@@ -125,42 +156,99 @@ static void run(Display *dpy, int width, int height,
- 	XMapWindow(dpy, win);
- 
- 	DRI2CreateDrawable(dpy, win);
--	msc = check_msc(dpy, win, 0);
-+	DRI2SwapInterval(dpy, win, 1);
-+	start_msc = check_msc(dpy, win, 0);
- 
- 	buffers = DRI2GetBuffers(dpy, win, &width, &height,
- 				 attachments, nattachments, &count);
- 	if (count != nattachments)
- 		return;
- 
--	msc = check_msc(dpy, win, msc);
-+	swap_buffers(c, win, attachments, nattachments);
-+	start_msc = check_msc(dpy, win, start_msc);
- 	clock_gettime(CLOCK_MONOTONIC, &start);
- 	for (count = 0; count < COUNT; count++)
--		DRI2SwapBuffers(dpy, win, 0, 0, 0);
--	msc = check_msc(dpy, win, msc);
-+		swap_buffers(c, win, attachments, nattachments);
-+	end_msc = check_msc(dpy, win, start_msc);
- 	clock_gettime(CLOCK_MONOTONIC, &end);
--	printf("%d %s (%dx%d) swaps in %fs.\n",
--	       count, name, width, height, elapsed(&start, &end));
-+	printf("%d [%ld] %s (%dx%d) swaps in %fs.\n",
-+	       count, (long)(end_msc - start_msc),
-+	       name, width, height, elapsed(&start, &end));
- 
--	msc = check_msc(dpy, win, msc);
-+	swap_buffers(c, win, attachments, nattachments);
-+	start_msc = check_msc(dpy, win, end_msc);
- 	clock_gettime(CLOCK_MONOTONIC, &start);
- 	for (count = 0; count < COUNT; count++)
- 		dri2_copy_swap(dpy, win, width, height, nattachments == 2);
--	msc = check_msc(dpy, win, msc);
-+	end_msc = check_msc(dpy, win, start_msc);
- 	clock_gettime(CLOCK_MONOTONIC, &end);
- 
--	printf("%d %s (%dx%d) blits in %fs.\n",
--	       count, name, width, height, elapsed(&start, &end));
-+	printf("%d [%ld] %s (%dx%d) blits in %fs.\n",
-+	       count, (long)(end_msc - start_msc),
-+	       name, width, height, elapsed(&start, &end));
- 
- 	DRI2SwapInterval(dpy, win, 0);
-+	wait_next_vblank(dpy, win);
-+
-+	swap_buffers(c, win, attachments, nattachments);
-+	start_msc = check_msc(dpy, win, end_msc);
-+	clock_gettime(CLOCK_MONOTONIC, &start);
-+	for (count = 0; count < COUNT; count++)
-+		swap_buffers(c, win, attachments, nattachments);
-+	end_msc = check_msc(dpy, win, start_msc);
-+	clock_gettime(CLOCK_MONOTONIC, &end);
-+	printf("%d [%ld] %s (%dx%d) vblank=0 swaps in %fs.\n",
-+	       count, (long)(end_msc - start_msc),
-+	       name, width, height, elapsed(&start, &end));
- 
--	msc = check_msc(dpy, win, msc);
-+	start_msc = check_msc(dpy, win, end_msc);
- 	clock_gettime(CLOCK_MONOTONIC, &start);
- 	for (count = 0; count < COUNT; count++)
--		DRI2SwapBuffers(dpy, win, 0, 0, 0);
--	msc = check_msc(dpy, win, msc);
-+		wait_next_vblank(dpy, win);
-+	end_msc = check_msc(dpy, win, start_msc);
- 	clock_gettime(CLOCK_MONOTONIC, &end);
--	printf("%d %s (%dx%d) vblank=0 swaps in %fs.\n",
--	       count, name, width, height, elapsed(&start, &end));
-+	printf("%d [%ld] %s waits in %fs.\n",
-+	       count, (long)(end_msc - start_msc),
-+	       name, elapsed(&start, &end));
-+
-+	printf("Testing past & future waits\n");
-+	for (modulus = 1; modulus <= 128; modulus <<= 1) {
-+		for (count = 0;  prime[count] < modulus; count++) {
-+			uint64_t msc, ust, sbc;
-+			uint64_t target;
-+
-+			remainder = prime[count];
-+
-+			DRI2WaitMSC(dpy, win, 0, 1, 0, &ust, &msc, &sbc);
-+
-+			target = msc + modulus + 1;
-+			target &= -modulus;
-+			target += remainder;
-+
-+			DRI2WaitMSC(dpy, win, target, modulus, remainder,
-+				    &ust, &msc, &sbc);
-+			if (msc != target) {
-+				printf("Missed future MSC (%d, %d): expected=%lld, found=%lld\n",
-+				       modulus, remainder,
-+				       (long long)target, (long long)msc);
-+			}
-+
-+			target = msc;
-+			target &= -modulus;
-+			target += remainder;
-+			if (target <= msc)
-+				target += modulus;
-+
-+			DRI2WaitMSC(dpy, win, msc, modulus, remainder,
-+				    &ust, &msc, &sbc);
-+
-+			if (msc != target) {
-+				printf("Missed past MSC (%d, %d): expected=%lld, found=%lld\n",
-+				       modulus, remainder,
-+				       (long long)target, (long long)msc);
-+			}
-+		}
-+	}
- 
- 	XDestroyWindow(dpy, win);
- 	free(buffers);
-diff --git a/test/dri3-test.c b/test/dri3-test.c
-index c66da313..78e105a8 100644
---- a/test/dri3-test.c
-+++ b/test/dri3-test.c
-@@ -93,14 +93,9 @@ static const struct pci_id_match ids[] = {
- 	INTEL_IVB_D_IDS(070),
- 	INTEL_IVB_M_IDS(070),
- 
--	INTEL_HSW_D_IDS(075),
--	INTEL_HSW_M_IDS(075),
--
--	INTEL_VLV_D_IDS(071),
--	INTEL_VLV_M_IDS(071),
--
--	INTEL_BDW_D_IDS(0100),
--	INTEL_BDW_M_IDS(0100),
-+	INTEL_HSW_IDS(075),
-+	INTEL_VLV_IDS(071),
-+	INTEL_BDW_IDS(0100),
- };
- 
- static int i915_gen(int device)
-@@ -1020,6 +1015,67 @@ fail:
- 	return 1;
- }
- 
-+static int gem_set_tiling(int fd, uint32_t handle, int tiling, int stride)
-+{
-+	struct drm_i915_gem_set_tiling set_tiling;
-+
-+	set_tiling.handle = handle;
-+	set_tiling.tiling_mode = tiling;
-+	set_tiling.stride = stride;
-+
-+	return drmIoctl(fd, DRM_IOCTL_I915_GEM_SET_TILING, &set_tiling) == 0;
-+}
-+
-+static int test_tiling(Display *dpy, int device)
-+{
-+	Window root = RootWindow(dpy, DefaultScreen(dpy));
-+	const int tiling[] = { I915_TILING_NONE, I915_TILING_X, I915_TILING_Y };
-+	int line = -1;
-+	int t;
-+
-+	_x_error_occurred = 0;
-+
-+	for (t = 0; t < sizeof(tiling)/sizeof(tiling[0]); t++) {
-+		uint32_t src;
-+		int src_fd;
-+		Pixmap src_pix;
-+
-+		src = gem_create(device, 4*4096);
-+		if (!src) {
-+			line = __LINE__;
-+			goto fail;
-+		}
-+
-+		gem_set_tiling(device, src, tiling[t], 512);
-+
-+		src_fd = gem_export(device, src);
-+		if (src_fd < 0) {
-+			line = __LINE__;
-+			goto fail;
-+		}
-+
-+		src_pix = dri3_create_pixmap(dpy, root,
-+					     128, 32, 32,
-+					     src_fd, 32, 512, 4*4096);
-+		XSync(dpy, True);
-+		if (_x_error_occurred) {
-+			line = __LINE__;
-+			goto fail;
-+		}
-+		XFreePixmap(dpy, src_pix);
-+		_x_error_occurred = 0;
-+
-+		close(src_fd);
-+		gem_close(device, src);
-+	}
-+
-+	return 0;
-+
-+fail:
-+	printf("%s failed with tiling %d, line %d\n", __func__, tiling[t], line);
-+	return 1;
-+}
-+
- static int
- _check_error_handler(Display     *display,
- 		     XErrorEvent *event)
-@@ -1060,6 +1116,7 @@ int main(void)
- 
- 	error += test_bad_size(dpy, device);
- 	error += test_bad_pitch(dpy, device);
-+	error += test_tiling(dpy, device);
- 
- 	error += test_shm(dpy, device, 400, 300);
- 	error += test_shm(dpy, device, 300, 400);
-diff --git a/test/dri3.c b/test/dri3.c
-index 45f3285c..e5644629 100644
---- a/test/dri3.c
-+++ b/test/dri3.c
-@@ -29,6 +29,7 @@
- #include <xcb/dri3.h>
- #include <xcb/sync.h>
- #include <unistd.h>
-+#include <stdlib.h>
- 
- #include "dri3.h"
- 
-@@ -109,12 +110,45 @@ void dri3_fence_free(Display *dpy, struct dri3_fence *fence)
- 	xcb_sync_destroy_fence(c, fence->xid);
- }
- 
-+static void dri3_query_version(xcb_connection_t *c, int *major, int *minor)
-+{
-+	xcb_dri3_query_version_reply_t *reply;
-+
-+	reply = xcb_dri3_query_version_reply(c,
-+					     xcb_dri3_query_version(c,
-+								    XCB_DRI3_MAJOR_VERSION,
-+								    XCB_DRI3_MINOR_VERSION),
-+					     NULL);
-+	if (reply != NULL) {
-+		*major = reply->major_version;
-+		*minor = reply->minor_version;
-+		free(reply);
-+	}
-+}
-+
-+static int dri3_exists(xcb_connection_t *c)
-+{
-+	const xcb_query_extension_reply_t *ext;
-+	int major, minor;
-+
-+	major = minor = -1;
-+
-+	ext = xcb_get_extension_data(c, &xcb_dri3_id);
-+	if (ext != NULL && ext->present)
-+		dri3_query_version(c, &major, &minor);
-+
-+	return major >= 0;
-+}
-+
- int dri3_open__full(Display *dpy, Window root, unsigned provider)
- {
- 	xcb_connection_t *c = XGetXCBConnection(dpy);
- 	xcb_dri3_open_cookie_t cookie;
- 	xcb_dri3_open_reply_t *reply;
- 
-+	if (!dri3_exists(c))
-+		return -1;
-+
- 	cookie = xcb_dri3_open(c, root, provider);
- 	reply = xcb_dri3_open_reply(c, cookie, NULL);
- 
-diff --git a/test/present-race.c b/test/present-race.c
-new file mode 100644
-index 00000000..b2b6aa2b
---- /dev/null
-+++ b/test/present-race.c
-@@ -0,0 +1,484 @@
-+/*
-+ * Copyright (c) 2014 Intel Corporation
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ *
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <X11/Xlib.h>
-+#include <X11/Xlib-xcb.h>
-+#include <X11/xshmfence.h>
-+#include <X11/Xutil.h>
-+#include <X11/Xlibint.h>
-+#include <X11/extensions/dpms.h>
-+#include <X11/extensions/randr.h>
-+#include <X11/extensions/Xcomposite.h>
-+#include <X11/extensions/Xrandr.h>
-+#include <X11/extensions/Xrender.h>
-+#include <X11/extensions/XShm.h>
-+#if HAVE_X11_EXTENSIONS_SHMPROTO_H
-+#include <X11/extensions/shmproto.h>
-+#elif HAVE_X11_EXTENSIONS_SHMSTR_H
-+#include <X11/extensions/shmstr.h>
-+#else
-+#error Failed to find the right header for X11 MIT-SHM protocol definitions
-+#endif
-+#include <xcb/xcb.h>
-+#include <xcb/present.h>
-+#include <xcb/xfixes.h>
-+#include <xcb/dri3.h>
-+#include <xf86drm.h>
-+#include <i915_drm.h>
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <assert.h>
-+#include <errno.h>
-+#include <setjmp.h>
-+#include <signal.h>
-+
-+#include <sys/mman.h>
-+#include <sys/ipc.h>
-+#include <sys/shm.h>
-+#include <pciaccess.h>
-+
-+#include "dri3.h"
-+
-+static int _x_error_occurred;
-+static uint32_t stamp;
-+
-+static int
-+_check_error_handler(Display     *display,
-+		     XErrorEvent *event)
-+{
-+	printf("X11 error from display %s, serial=%ld, error=%d, req=%d.%d\n",
-+	       DisplayString(display),
-+	       event->serial,
-+	       event->error_code,
-+	       event->request_code,
-+	       event->minor_code);
-+	_x_error_occurred++;
-+	return False; /* ignored */
-+}
-+
-+static int has_composite(Display *dpy)
-+{
-+	int event, error;
-+	int major, minor;
-+
-+	if (!XCompositeQueryExtension(dpy, &event, &error))
-+		return 0;
-+
-+	XCompositeQueryVersion(dpy, &major, &minor);
-+
-+	return major > 0 || minor >= 4;
-+}
-+
-+static void *setup_msc(Display *dpy, Window win)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	xcb_void_cookie_t cookie;
-+	uint32_t id = xcb_generate_id(c);
-+	xcb_generic_error_t *error;
-+	void *q;
-+
-+	cookie = xcb_present_select_input_checked(c, id, win, XCB_PRESENT_EVENT_MASK_COMPLETE_NOTIFY);
-+	q = xcb_register_for_special_xge(c, &xcb_present_id, id, &stamp);
-+
-+	error = xcb_request_check(c, cookie);
-+	assert(error == NULL);
-+
-+	return q;
-+}
-+
-+static void teardown_msc(Display *dpy, void *q)
-+{
-+	xcb_unregister_for_special_event(XGetXCBConnection(dpy), q);
-+}
-+
-+static uint64_t wait_vblank(Display *dpy, Window win)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	static uint32_t serial = 1;
-+	uint64_t msc = 0;
-+	int complete = 0;
-+	void *q;
-+
-+	if (win == 0)
-+		win = DefaultRootWindow(dpy);
-+
-+	q = setup_msc(dpy, win);
-+
-+	xcb_present_notify_msc(c, win, serial ^ 0xdeadbeef, 0, 1, 0);
-+	xcb_flush(c);
-+
-+	do {
-+		xcb_present_complete_notify_event_t *ce;
-+		xcb_generic_event_t *ev;
-+
-+		ev = xcb_wait_for_special_event(c, q);
-+		if (ev == NULL)
-+			break;
-+
-+		ce = (xcb_present_complete_notify_event_t *)ev;
-+		if (ce->kind == XCB_PRESENT_COMPLETE_KIND_NOTIFY_MSC &&
-+		    ce->serial == (serial ^ 0xdeadbeef)) {
-+			msc = ce->msc;
-+			complete = 1;
-+		}
-+		free(ev);
-+	} while (!complete);
-+
-+	if (++serial == 0)
-+		serial = 1;
-+
-+	teardown_msc(dpy, q);
-+
-+	return msc;
-+}
-+
-+static int test_basic(Display *dpy, int dummy)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	XSetWindowAttributes attr;
-+	Visual *visual = DefaultVisual(dpy, DefaultScreen(dpy));
-+	Pixmap pixmap;
-+	struct dri3_fence fence;
-+	Window root, win;
-+	unsigned int width, height;
-+	unsigned border, depth;
-+	int x, y, ret = 1;
-+	const char *phase;
-+	uint64_t msc;
-+
-+	root = DefaultRootWindow(dpy);
-+	XGetGeometry(dpy, root,
-+		     &win, &x, &y,
-+		     &width, &height, &border, &depth);
-+
-+	_x_error_occurred = 0;
-+	attr.override_redirect = 1;
-+	switch (dummy) {
-+	case 0:
-+		win = root;
-+		phase = "root";
-+		break;
-+	case 1:
-+		win = XCreateWindow(dpy, root,
-+				    0, 0, width, height, 0, depth,
-+				    InputOutput, visual,
-+				    CWOverrideRedirect, &attr);
-+		phase = "fullscreen";
-+		break;
-+	case 2:
-+		width /= 2;
-+		height /= 2;
-+		win = XCreateWindow(dpy, root,
-+				    0, 0, width, height, 0, depth,
-+				    InputOutput, visual,
-+				    CWOverrideRedirect, &attr);
-+		phase = "window";
-+		break;
-+	case 3:
-+		if (!has_composite(dpy))
-+			return 0;
-+
-+		win = XCreateWindow(dpy, root,
-+				    0, 0, width, height, 0,
-+				    DefaultDepth(dpy, DefaultScreen(dpy)),
-+				    InputOutput,
-+				    DefaultVisual(dpy, DefaultScreen(dpy)),
-+				    CWOverrideRedirect, &attr);
-+		XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+		phase = "composite";
-+		break;
-+
-+	default:
-+		phase = "broken";
-+		win = root;
-+		abort();
-+		break;
-+	}
-+
-+	XMapWindow(dpy, win);
-+	XSync(dpy, True);
-+	if (_x_error_occurred)
-+		return 1;
-+
-+	if (dri3_create_fence(dpy, win, &fence))
-+		return 0;
-+
-+	printf("%s: Testing basic flip: %dx%d\n", phase, width, height);
-+	fflush(stdout);
-+	_x_error_occurred = 0;
-+
-+	xshmfence_reset(fence.addr);
-+	msc = wait_vblank(dpy, win);
-+
-+	pixmap = XCreatePixmap(dpy, win, width, height, depth);
-+	xcb_present_pixmap(c, win, pixmap, 0,
-+			   0, /* valid */
-+			   0, /* update */
-+			   0, /* x_off */
-+			   0, /* y_off */
-+			   None,
-+			   None, /* wait fence */
-+			   fence.xid,
-+			   XCB_PRESENT_OPTION_NONE,
-+			   (msc + 64) & -64, /* target msc */
-+			   64, /* divisor */
-+			   32, /* remainder */
-+			   0, NULL);
-+	XFreePixmap(dpy, pixmap);
-+
-+	pixmap = XCreatePixmap(dpy, win, width, height, depth);
-+	xcb_present_pixmap(c, win, pixmap, 0,
-+			   0, /* valid */
-+			   0, /* update */
-+			   0, /* x_off */
-+			   0, /* y_off */
-+			   None,
-+			   None, /* wait fence */
-+			   None, /* sync fence */
-+			   XCB_PRESENT_OPTION_NONE,
-+			   (msc + 64) & -64, /* target msc */
-+			   64, /* divisor */
-+			   48, /* remainder */
-+			   0, NULL);
-+	XFreePixmap(dpy, pixmap);
-+	XDestroyWindow(dpy, win);
-+	XFlush(dpy);
-+
-+	ret = !!xshmfence_await(fence.addr);
-+	dri3_fence_free(dpy, &fence);
-+
-+	XSync(dpy, True);
-+	ret += !!_x_error_occurred;
-+
-+	return ret;
-+}
-+
-+static int test_race(Display *dpy, int dummy)
-+{
-+	Display *mgr = XOpenDisplay(NULL);
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	XSetWindowAttributes attr;
-+	Visual *visual = DefaultVisual(dpy, DefaultScreen(dpy));
-+	Pixmap pixmap;
-+	struct dri3_fence fence;
-+	Window root, win;
-+	unsigned int width, height;
-+	unsigned border, depth;
-+	int x, y, ret = 1;
-+	const char *phase;
-+	uint64_t msc;
-+
-+	root = DefaultRootWindow(dpy);
-+	XGetGeometry(dpy, root,
-+		     &win, &x, &y,
-+		     &width, &height, &border, &depth);
-+
-+	_x_error_occurred = 0;
-+	attr.override_redirect = 1;
-+	switch (dummy) {
-+	case 0:
-+		win = root;
-+		phase = "root";
-+		break;
-+	case 1:
-+		win = XCreateWindow(dpy, root,
-+				    0, 0, width, height, 0, depth,
-+				    InputOutput, visual,
-+				    CWOverrideRedirect, &attr);
-+		phase = "fullscreen";
-+		break;
-+	case 2:
-+		width /= 2;
-+		height /= 2;
-+		win = XCreateWindow(dpy, root,
-+				    0, 0, width, height, 0, depth,
-+				    InputOutput, visual,
-+				    CWOverrideRedirect, &attr);
-+		phase = "window";
-+		break;
-+	case 3:
-+		if (!has_composite(dpy))
-+			return 0;
-+
-+		win = XCreateWindow(dpy, root,
-+				    0, 0, width, height, 0,
-+				    DefaultDepth(dpy, DefaultScreen(dpy)),
-+				    InputOutput,
-+				    DefaultVisual(dpy, DefaultScreen(dpy)),
-+				    CWOverrideRedirect, &attr);
-+		XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+		phase = "composite";
-+		break;
-+
-+	default:
-+		phase = "broken";
-+		win = root;
-+		abort();
-+		break;
-+	}
-+
-+	XMapWindow(dpy, win);
-+	XSync(dpy, True);
-+	if (_x_error_occurred)
-+		return 1;
-+
-+	if (dri3_create_fence(dpy, win, &fence))
-+		return 0;
-+
-+	printf("%s: Testing race with manager: %dx%d\n", phase, width, height);
-+	fflush(stdout);
-+	_x_error_occurred = 0;
-+
-+	xshmfence_reset(fence.addr);
-+	msc = wait_vblank(dpy, win);
-+
-+	pixmap = XCreatePixmap(dpy, win, width, height, depth);
-+	xcb_present_pixmap(c, win, pixmap, 0,
-+			   0, /* valid */
-+			   0, /* update */
-+			   0, /* x_off */
-+			   0, /* y_off */
-+			   None,
-+			   None, /* wait fence */
-+			   fence.xid,
-+			   XCB_PRESENT_OPTION_NONE,
-+			   (msc + 64) & -64, /* target msc */
-+			   64, /* divisor */
-+			   32, /* remainder */
-+			   0, NULL);
-+	XFreePixmap(dpy, pixmap);
-+
-+	XFlush(dpy);
-+	XDestroyWindow(mgr, win);
-+	XFlush(mgr);
-+
-+	pixmap = XCreatePixmap(dpy, win, width, height, depth);
-+	xcb_present_pixmap(c, win, pixmap, 0,
-+			   0, /* valid */
-+			   0, /* update */
-+			   0, /* x_off */
-+			   0, /* y_off */
-+			   None,
-+			   None, /* wait fence */
-+			   None, /* sync fence */
-+			   XCB_PRESENT_OPTION_NONE,
-+			   (msc + 64) & -64, /* target msc */
-+			   64, /* divisor */
-+			   48, /* remainder */
-+			   0, NULL);
-+	XFreePixmap(dpy, pixmap);
-+	XFlush(dpy);
-+
-+	ret = !!xshmfence_await(fence.addr);
-+	dri3_fence_free(dpy, &fence);
-+
-+	XSync(dpy, True);
-+	ret += !!_x_error_occurred;
-+
-+	XCloseDisplay(mgr);
-+
-+	return ret;
-+}
-+
-+static int has_present(Display *dpy)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	xcb_generic_error_t *error = NULL;
-+	void *reply;
-+
-+	reply = xcb_xfixes_query_version_reply(c,
-+					       xcb_xfixes_query_version(c,
-+									XCB_XFIXES_MAJOR_VERSION,
-+									XCB_XFIXES_MINOR_VERSION),
-+					       &error);
-+	free(reply);
-+	free(error);
-+	if (reply == NULL) {
-+		fprintf(stderr, "XFixes not supported on %s\n", DisplayString(dpy));
-+		return 0;
-+	}
-+
-+	reply = xcb_dri3_query_version_reply(c,
-+					     xcb_dri3_query_version(c,
-+								    XCB_DRI3_MAJOR_VERSION,
-+								    XCB_DRI3_MINOR_VERSION),
-+					     &error);
-+	free(reply);
-+	free(error);
-+	if (reply == NULL) {
-+		fprintf(stderr, "DRI3 not supported on %s\n", DisplayString(dpy));
-+		return 0;
-+	}
-+
-+	reply = xcb_present_query_version_reply(c,
-+						xcb_present_query_version(c,
-+									  XCB_PRESENT_MAJOR_VERSION,
-+									  XCB_PRESENT_MINOR_VERSION),
-+						&error);
-+
-+	free(reply);
-+	free(error);
-+	if (reply == NULL) {
-+		fprintf(stderr, "Present not supported on %s\n", DisplayString(dpy));
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+int main(void)
-+{
-+	Display *dpy;
-+	int dummy;
-+	int error = 0;
-+
-+	dpy = XOpenDisplay(NULL);
-+	if (dpy == NULL)
-+		return 77;
-+
-+	if (!has_present(dpy))
-+		return 77;
-+
-+	if (DPMSQueryExtension(dpy, &dummy, &dummy))
-+		DPMSDisable(dpy);
-+
-+	signal(SIGALRM, SIG_IGN);
-+	XSetErrorHandler(_check_error_handler);
-+
-+	for (dummy = 0; dummy <= 3; dummy++) {
-+		error += test_basic(dpy, dummy);
-+		error += test_race(dpy, dummy);
-+	}
-+
-+	if (DPMSQueryExtension(dpy, &dummy, &dummy))
-+		DPMSEnable(dpy);
-+	return !!error;
-+}
-diff --git a/test/present-speed.c b/test/present-speed.c
-new file mode 100644
-index 00000000..eccde931
---- /dev/null
-+++ b/test/present-speed.c
-@@ -0,0 +1,1015 @@
-+/*
-+ * Copyright (c) 2015 Intel Corporation
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ *
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <X11/Xlib.h>
-+#include <X11/Xatom.h>
-+#include <X11/Xlib-xcb.h>
-+#include <X11/xshmfence.h>
-+#include <X11/Xutil.h>
-+#include <X11/Xlibint.h>
-+#include <X11/extensions/Xcomposite.h>
-+#include <X11/extensions/Xdamage.h>
-+#include <X11/extensions/dpms.h>
-+#include <X11/extensions/randr.h>
-+#include <X11/extensions/Xrandr.h>
-+#include <xcb/xcb.h>
-+#include <xcb/present.h>
-+#include <xcb/dri3.h>
-+#include <xcb/xfixes.h>
-+#include <xf86drm.h>
-+#include <i915_drm.h>
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <assert.h>
-+#include <errno.h>
-+#include <setjmp.h>
-+#include <signal.h>
-+#include <sys/wait.h>
-+
-+#include "dri3.h"
-+
-+static int _x_error_occurred;
-+static uint32_t stamp;
-+
-+struct list {
-+    struct list *next, *prev;
-+};
-+
-+static void
-+list_init(struct list *list)
-+{
-+    list->next = list->prev = list;
-+}
-+
-+static inline void
-+__list_add(struct list *entry,
-+	    struct list *prev,
-+	    struct list *next)
-+{
-+    next->prev = entry;
-+    entry->next = next;
-+    entry->prev = prev;
-+    prev->next = entry;
-+}
-+
-+static inline void
-+list_add(struct list *entry, struct list *head)
-+{
-+    __list_add(entry, head, head->next);
-+}
-+
-+static inline void
-+__list_del(struct list *prev, struct list *next)
-+{
-+	next->prev = prev;
-+	prev->next = next;
-+}
-+
-+static inline void
-+_list_del(struct list *entry)
-+{
-+    __list_del(entry->prev, entry->next);
-+}
-+
-+static inline void
-+list_move(struct list *list, struct list *head)
-+{
-+	if (list->prev != head) {
-+		_list_del(list);
-+		list_add(list, head);
-+	}
-+}
-+
-+#define __container_of(ptr, sample, member)				\
-+    (void *)((char *)(ptr) - ((char *)&(sample)->member - (char *)(sample)))
-+
-+#define list_for_each_entry(pos, head, member)				\
-+    for (pos = __container_of((head)->next, pos, member);		\
-+	 &pos->member != (head);					\
-+	 pos = __container_of(pos->member.next, pos, member))
-+
-+static int
-+_check_error_handler(Display     *display,
-+		     XErrorEvent *event)
-+{
-+	if (_x_error_occurred < 0)
-+		return True;
-+
-+	printf("X11 error from display %s, serial=%ld, error=%d, req=%d.%d\n",
-+	       DisplayString(display),
-+	       event->serial,
-+	       event->error_code,
-+	       event->request_code,
-+	       event->minor_code);
-+	_x_error_occurred++;
-+	return False; /* ignored */
-+}
-+
-+static double elapsed(const struct timespec *start,
-+		      const struct timespec *end)
-+{
-+	return 1e6*(end->tv_sec - start->tv_sec) + (end->tv_nsec - start->tv_nsec)/1000;
-+}
-+
-+struct buffer {
-+	struct list link;
-+	Pixmap pixmap;
-+	struct dri3_fence fence;
-+	int fd;
-+	int busy;
-+	int id;
-+};
-+
-+#define DRI3 1
-+#define NOCOPY 2
-+#define ASYNC 4
-+static void run(Display *dpy, Window win, const char *name, unsigned options)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	struct timespec start, end;
-+#define N_BACK 8
-+	char test_name[128];
-+	struct buffer buffer[N_BACK];
-+	struct list mru;
-+	Window root;
-+	unsigned int width, height;
-+	unsigned border, depth;
-+	unsigned present_flags = 0;
-+	xcb_xfixes_region_t update = 0;
-+	int completed = 0;
-+	int queued = 0;
-+	uint32_t eid = 0;
-+	void *Q = NULL;
-+	int i, n;
-+
-+	list_init(&mru);
-+
-+	XGetGeometry(dpy, win,
-+		     &root, &i, &n, &width, &height, &border, &depth);
-+
-+	_x_error_occurred = 0;
-+
-+	for (n = 0; n < N_BACK; n++) {
-+		buffer[n].pixmap = xcb_generate_id(c);
-+		xcb_create_pixmap(c, depth, buffer[n].pixmap, win,
-+				  width, height);
-+		buffer[n].fence.xid = 0;
-+		buffer[n].fd = -1;
-+		buffer[n].id = n;
-+		if (options & DRI3) {
-+			xcb_dri3_buffer_from_pixmap_reply_t *reply;
-+			int *fds;
-+
-+			if (dri3_create_fence(dpy, win, &buffer[n].fence))
-+				return;
-+
-+			reply = xcb_dri3_buffer_from_pixmap_reply (c,
-+								   xcb_dri3_buffer_from_pixmap(c, buffer[n].pixmap),
-+								   NULL);
-+			if (reply == NULL)
-+				return;
-+
-+			fds = xcb_dri3_buffer_from_pixmap_reply_fds (c, reply);
-+			buffer[n].fd = fds[0];
-+			free(reply);
-+
-+			/* start idle */
-+			xshmfence_trigger(buffer[n].fence.addr);
-+		}
-+		buffer[n].busy = 0;
-+		list_add(&buffer[n].link, &mru);
-+	}
-+	if (options & ASYNC)
-+		present_flags |= XCB_PRESENT_OPTION_ASYNC;
-+	if (options & NOCOPY) {
-+		update = xcb_generate_id(c);
-+		xcb_xfixes_create_region(c, update, 0, NULL);
-+		present_flags |= XCB_PRESENT_OPTION_COPY;
-+	}
-+
-+	if (!(options & DRI3)) {
-+		eid = xcb_generate_id(c);
-+		xcb_present_select_input(c, eid, win,
-+					 (options & NOCOPY ? 0 : XCB_PRESENT_EVENT_MASK_IDLE_NOTIFY) |
-+					 XCB_PRESENT_EVENT_MASK_COMPLETE_NOTIFY);
-+		Q = xcb_register_for_special_xge(c, &xcb_present_id, eid, &stamp);
-+	}
-+
-+	clock_gettime(CLOCK_MONOTONIC, &start);
-+	do {
-+		for (n = 0; n < 1000; n++) {
-+			struct buffer *tmp, *b = NULL;
-+retry:
-+			list_for_each_entry(tmp, &mru, link) {
-+				if (tmp->fence.xid)
-+					tmp->busy = !xshmfence_query(tmp->fence.addr);
-+				if (!tmp->busy) {
-+					b = tmp;
-+					break;
-+				}
-+			}
-+			if (options & DRI3) {
-+				if (b == NULL)
-+					goto retry;
-+
-+				xshmfence_reset(b->fence.addr);
-+				queued--;
-+				completed++;
-+			} else while (b == NULL) {
-+				xcb_present_generic_event_t *ev;
-+
-+				ev = (xcb_present_generic_event_t *)
-+					xcb_wait_for_special_event(c, Q);
-+				if (ev == NULL)
-+					abort();
-+
-+				do {
-+					switch (ev->evtype) {
-+					case XCB_PRESENT_COMPLETE_NOTIFY:
-+						completed++;
-+						queued--;
-+						break;
-+
-+					case XCB_PRESENT_EVENT_IDLE_NOTIFY:
-+						{
-+							xcb_present_idle_notify_event_t *ie = (xcb_present_idle_notify_event_t *)ev;
-+							assert(ie->serial < N_BACK);
-+							buffer[ie->serial].busy = 0;
-+							if (b == NULL)
-+								b = &buffer[ie->serial];
-+							break;
-+						}
-+					}
-+					free(ev);
-+				} while ((ev = (xcb_present_generic_event_t *)xcb_poll_for_special_event(c, Q)));
-+			}
-+
-+			b->busy = (options & NOCOPY) == 0;
-+			xcb_present_pixmap(c, win, b->pixmap, b->id,
-+					   0, /* valid */
-+					   update, /* update */
-+					   0, /* x_off */
-+					   0, /* y_off */
-+					   None,
-+					   None, /* wait fence */
-+					   b->fence.xid,
-+					   present_flags,
-+					   0, /* target msc */
-+					   0, /* divisor */
-+					   0, /* remainder */
-+					   0, NULL);
-+			list_move(&b->link, &mru);
-+			queued++;
-+			xcb_flush(c);
-+		}
-+		clock_gettime(CLOCK_MONOTONIC, &end);
-+	} while (end.tv_sec < start.tv_sec + 10);
-+
-+	if (options & DRI3) {
-+		struct buffer *b;
-+		XID pixmap;
-+
-+		pixmap = xcb_generate_id(c);
-+		xcb_create_pixmap(c, depth, pixmap, win, width, height);
-+		xcb_present_pixmap(c, win, pixmap, 0xdeadbeef,
-+				   0, /* valid */
-+				   None, /* update */
-+				   0, /* x_off */
-+				   0, /* y_off */
-+				   None,
-+				   None, /* wait fence */
-+				   None,
-+				   0,
-+				   0, /* target msc */
-+				   0, /* divisor */
-+				   0, /* remainder */
-+				   0, NULL);
-+		xcb_flush(c);
-+
-+		list_for_each_entry(b, &mru, link)
-+			xshmfence_await(b->fence.addr);
-+
-+		xcb_free_pixmap(c, pixmap);
-+		completed += queued;
-+	} else while (queued) {
-+		xcb_present_generic_event_t *ev;
-+
-+		ev = (xcb_present_generic_event_t *)
-+			xcb_wait_for_special_event(c, Q);
-+		if (ev == NULL)
-+			abort();
-+
-+		do {
-+			switch (ev->evtype) {
-+			case XCB_PRESENT_COMPLETE_NOTIFY:
-+				completed++;
-+				queued--;
-+				break;
-+
-+			case XCB_PRESENT_EVENT_IDLE_NOTIFY:
-+				break;
-+			}
-+			free(ev);
-+		} while ((ev = (xcb_present_generic_event_t *)xcb_poll_for_special_event(c, Q)));
-+	}
-+	clock_gettime(CLOCK_MONOTONIC, &end);
-+
-+	if (update)
-+		xcb_xfixes_destroy_region(c, update);
-+	for (n = 0; n < N_BACK; n++) {
-+		if (buffer[n].fence.xid)
-+			dri3_fence_free(dpy, &buffer[n].fence);
-+		if (buffer[n].fd != -1)
-+			close(buffer[n].fd);
-+		xcb_free_pixmap(c, buffer[n].pixmap);
-+	}
-+
-+	if (Q) {
-+		xcb_discard_reply(c, xcb_present_select_input_checked(c, eid, win, 0).sequence);
-+		XSync(dpy, True);
-+		xcb_unregister_for_special_event(c, Q);
-+	}
-+
-+	test_name[0] = '\0';
-+	if (options) {
-+		snprintf(test_name, sizeof(test_name), "(%s%s%s )",
-+			 options & NOCOPY ? " no-copy" : "",
-+			 options & DRI3 ? " dri3" : "",
-+			 options & ASYNC ? " async" : "");
-+	}
-+	printf("%s%s: Completed %d presents in %.1fs, %.3fus each (%.1f FPS)\n",
-+	       name, test_name,
-+	       completed, elapsed(&start, &end) / 1000000,
-+	       elapsed(&start, &end) / completed,
-+	       completed / (elapsed(&start, &end) / 1000000));
-+}
-+
-+struct perpixel {
-+	Window win;
-+	struct buffer buffer[N_BACK];
-+	struct list mru;
-+	uint32_t eid;
-+	void *Q;
-+	int queued;
-+};
-+
-+static void perpixel(Display *dpy,
-+		     int max_width, int max_height, unsigned options)
-+{
-+	//const int sz = max_width * max_height;
-+	const int sz = 1048;
-+	struct perpixel *pp;
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	struct timespec start, end;
-+	char test_name[128];
-+	unsigned present_flags = 0;
-+	xcb_xfixes_region_t update = 0;
-+	int completed = 0;
-+	int i, n;
-+
-+	pp = calloc(sz, sizeof(*pp));
-+	if (!pp)
-+		return;
-+
-+	for (i = 0; i < sz; i++) {
-+		XSetWindowAttributes attr = { .override_redirect = 1 };
-+		int depth = DefaultDepth(dpy, DefaultScreen(dpy));
-+		pp[i].win = XCreateWindow(dpy, DefaultRootWindow(dpy),
-+					  i % max_width, i / max_width, 1, 1, 0, depth,
-+					  InputOutput,
-+					  DefaultVisual(dpy, DefaultScreen(dpy)),
-+					  CWOverrideRedirect, &attr);
-+		XMapWindow(dpy, pp[i].win);
-+		list_init(&pp[i].mru);
-+		for (n = 0; n < N_BACK; n++) {
-+			pp[i].buffer[n].pixmap = xcb_generate_id(c);
-+			xcb_create_pixmap(c, depth, pp[i].buffer[n].pixmap,
-+					  pp[i].win, 1, 1);
-+			pp[i].buffer[n].fence.xid = 0;
-+			pp[i].buffer[n].fd = -1;
-+			pp[i].buffer[n].id = n;
-+			if (options & DRI3) {
-+				xcb_dri3_buffer_from_pixmap_reply_t *reply;
-+				int *fds;
-+
-+				if (dri3_create_fence(dpy, pp[i].win, &pp[i].buffer[n].fence))
-+					return;
-+
-+				reply = xcb_dri3_buffer_from_pixmap_reply(c,
-+									  xcb_dri3_buffer_from_pixmap(c, pp[i].buffer[n].pixmap),
-+									  NULL);
-+				if (reply == NULL)
-+					return;
-+
-+				fds = xcb_dri3_buffer_from_pixmap_reply_fds(c, reply);
-+				pp[i].buffer[n].fd = fds[0];
-+				free(reply);
-+
-+				/* start idle */
-+				xshmfence_trigger(pp[i].buffer[n].fence.addr);
-+			}
-+			pp[i].buffer[n].busy = 0;
-+			list_add(&pp[i].buffer[n].link, &pp[i].mru);
-+		}
-+
-+		if (!(options & DRI3)) {
-+			pp[i].eid = xcb_generate_id(c);
-+			xcb_present_select_input(c, pp[i].eid, pp[i].win,
-+						 (options & NOCOPY ? 0 : XCB_PRESENT_EVENT_MASK_IDLE_NOTIFY) |
-+						 XCB_PRESENT_EVENT_MASK_COMPLETE_NOTIFY);
-+			pp[i].Q = xcb_register_for_special_xge(c, &xcb_present_id, pp[i].eid, &stamp);
-+		}
-+		pp[i].queued = 0;
-+	}
-+
-+	XSync(dpy, True);
-+	_x_error_occurred = 0;
-+
-+	if (options & ASYNC)
-+		present_flags |= XCB_PRESENT_OPTION_ASYNC;
-+	if (options & NOCOPY) {
-+		update = xcb_generate_id(c);
-+		xcb_xfixes_create_region(c, update, 0, NULL);
-+		present_flags |= XCB_PRESENT_OPTION_COPY;
-+	}
-+
-+	clock_gettime(CLOCK_MONOTONIC, &start);
-+	do {
-+		for (i = 0; i < sz; i++) {
-+			struct buffer *tmp, *b = NULL;
-+retry:
-+			list_for_each_entry(tmp, &pp[i].mru, link) {
-+				if (tmp->fence.xid)
-+					tmp->busy = !xshmfence_query(tmp->fence.addr);
-+				if (!tmp->busy) {
-+					b = tmp;
-+					break;
-+				}
-+			}
-+			if (options & DRI3) {
-+				if (b == NULL)
-+					goto retry;
-+
-+				xshmfence_reset(b->fence.addr);
-+				pp[i].queued--;
-+				completed++;
-+			} else while (b == NULL) {
-+				xcb_present_generic_event_t *ev;
-+
-+				ev = (xcb_present_generic_event_t *)
-+					xcb_wait_for_special_event(c, pp[i].Q);
-+				if (ev == NULL)
-+					abort();
-+
-+				do {
-+					switch (ev->evtype) {
-+					case XCB_PRESENT_COMPLETE_NOTIFY:
-+						completed++;
-+						pp[i].queued--;
-+						break;
-+
-+					case XCB_PRESENT_EVENT_IDLE_NOTIFY:
-+						{
-+							xcb_present_idle_notify_event_t *ie = (xcb_present_idle_notify_event_t *)ev;
-+							assert(ie->serial < N_BACK);
-+							pp[i].buffer[ie->serial].busy = 0;
-+							if (b == NULL)
-+								b = &pp[i].buffer[ie->serial];
-+							break;
-+						}
-+					}
-+					free(ev);
-+				} while ((ev = (xcb_present_generic_event_t *)xcb_poll_for_special_event(c, pp[i].Q)));
-+			}
-+
-+			b->busy = (options & NOCOPY) == 0;
-+			xcb_present_pixmap(c, pp[i].win, b->pixmap, b->id,
-+					   0, /* valid */
-+					   update, /* update */
-+					   0, /* x_off */
-+					   0, /* y_off */
-+					   None,
-+					   None, /* wait fence */
-+					   b->fence.xid,
-+					   present_flags,
-+					   0, /* target msc */
-+					   0, /* divisor */
-+					   0, /* remainder */
-+					   0, NULL);
-+			list_move(&b->link, &pp[i].mru);
-+			pp[i].queued++;
-+		}
-+		xcb_flush(c);
-+		clock_gettime(CLOCK_MONOTONIC, &end);
-+	} while (end.tv_sec < start.tv_sec + 10);
-+
-+	for (i = 0; i < sz; i++) {
-+		if (options & DRI3) {
-+			int depth = DefaultDepth(dpy, DefaultScreen(dpy));
-+			struct buffer *b;
-+			XID pixmap;
-+
-+			pixmap = xcb_generate_id(c);
-+			xcb_create_pixmap(c, depth, pixmap, pp[i].win, 1, 1);
-+			xcb_present_pixmap(c, pp[i].win, pixmap, 0xdeadbeef,
-+					   0, /* valid */
-+					   None, /* update */
-+					   0, /* x_off */
-+					   0, /* y_off */
-+					   None,
-+					   None, /* wait fence */
-+					   None,
-+					   0,
-+					   0, /* target msc */
-+					   0, /* divisor */
-+					   0, /* remainder */
-+					   0, NULL);
-+			xcb_flush(c);
-+
-+			list_for_each_entry(b, &pp[i].mru, link)
-+				xshmfence_await(b->fence.addr);
-+
-+			xcb_free_pixmap(c, pixmap);
-+			completed += pp[i].queued;
-+		} else while (pp[i].queued) {
-+			xcb_present_generic_event_t *ev;
-+
-+			ev = (xcb_present_generic_event_t *)
-+				xcb_wait_for_special_event(c, pp[i].Q);
-+			if (ev == NULL)
-+				abort();
-+
-+			do {
-+				switch (ev->evtype) {
-+				case XCB_PRESENT_COMPLETE_NOTIFY:
-+					completed++;
-+					pp[i].queued--;
-+					break;
-+
-+				case XCB_PRESENT_EVENT_IDLE_NOTIFY:
-+					break;
-+				}
-+				free(ev);
-+			} while ((ev = (xcb_present_generic_event_t *)xcb_poll_for_special_event(c, pp[i].Q)));
-+		}
-+	}
-+	clock_gettime(CLOCK_MONOTONIC, &end);
-+
-+	if (update)
-+		xcb_xfixes_destroy_region(c, update);
-+
-+	for (i = 0; i < sz; i++) {
-+		for (n = 0; n < N_BACK; n++) {
-+			if (pp[i].buffer[n].fence.xid)
-+				dri3_fence_free(dpy, &pp[i].buffer[n].fence);
-+			if (pp[i].buffer[n].fd != -1)
-+				close(pp[i].buffer[n].fd);
-+			xcb_free_pixmap(c, pp[i].buffer[n].pixmap);
-+		}
-+
-+		if (pp[i].Q) {
-+			xcb_discard_reply(c, xcb_present_select_input_checked(c, pp[i].eid, pp[i].win, 0).sequence);
-+			XSync(dpy, True);
-+			xcb_unregister_for_special_event(c, pp[i].Q);
-+		}
-+
-+		XDestroyWindow(dpy, pp[i].win);
-+	}
-+	free(pp);
-+
-+	test_name[0] = '\0';
-+	if (options) {
-+		snprintf(test_name, sizeof(test_name), "(%s%s%s )",
-+			 options & NOCOPY ? " no-copy" : "",
-+			 options & DRI3 ? " dri3" : "",
-+			 options & ASYNC ? " async" : "");
-+	}
-+	printf("%s%s: Completed %d presents in %.1fs, %.3fus each (%.1f FPS)\n",
-+	       __func__, test_name,
-+	       completed, elapsed(&start, &end) / 1000000,
-+	       elapsed(&start, &end) / completed,
-+	       completed / (elapsed(&start, &end) / 1000000));
-+}
-+
-+static int isqrt(int x)
-+{
-+	int i;
-+
-+	for (i = 2; i*i < x; i++)
-+		;
-+	return i;
-+}
-+
-+struct sibling {
-+	pthread_t thread;
-+	Display *dpy;
-+	int x, y;
-+	int width, height;
-+	unsigned options;
-+};
-+
-+static void *sibling(void *arg)
-+{
-+	struct sibling *s = arg;
-+	XSetWindowAttributes attr = { .override_redirect = 1 };
-+	Window win = XCreateWindow(s->dpy, DefaultRootWindow(s->dpy),
-+				   s->x, s->y, s->width, s->height, 0,
-+				   DefaultDepth(s->dpy, DefaultScreen(s->dpy)),
-+				   InputOutput,
-+				   DefaultVisual(s->dpy, DefaultScreen(s->dpy)),
-+				   CWOverrideRedirect, &attr);
-+	XMapWindow(s->dpy, win);
-+	run(s->dpy, win, "sibling", s->options);
-+	return NULL;
-+}
-+
-+static void siblings(Display *dpy,
-+		     int max_width, int max_height, int ncpus, unsigned options)
-+{
-+	int sq_ncpus = isqrt(ncpus);
-+	int width = max_width / sq_ncpus;
-+	int height = max_height/ sq_ncpus;
-+	struct sibling s[ncpus];
-+	int child;
-+
-+	if (ncpus <= 1)
-+		return;
-+
-+	for (child = 0; child < ncpus; child++) {
-+		s[child].dpy = dpy;
-+		s[child].x = (child % sq_ncpus) * width;
-+		s[child].y = (child / sq_ncpus) * height;
-+		s[child].width = width;
-+		s[child].height = height;
-+		s[child].options = options;
-+		pthread_create(&s[child].thread, NULL, sibling, &s[child]);
-+	}
-+
-+	for (child = 0; child < ncpus; child++)
-+		pthread_join(s[child].thread, NULL);
-+}
-+
-+static void cousins(int max_width, int max_height, int ncpus, unsigned options)
-+{
-+	int sq_ncpus = isqrt(ncpus);
-+	int width = max_width / sq_ncpus;
-+	int height = max_height/ sq_ncpus;
-+	int child;
-+
-+	if (ncpus <= 1)
-+		return;
-+
-+	for (child = 0; child < ncpus; child++) {
-+		for (; fork() == 0; exit(0)) {
-+			int x = (child % sq_ncpus) * width;
-+			int y = (child / sq_ncpus) * height;
-+			XSetWindowAttributes attr = { .override_redirect = 1 };
-+			Display *dpy = XOpenDisplay(NULL);
-+			Window win = XCreateWindow(dpy, DefaultRootWindow(dpy),
-+						   x, y, width, height, 0,
-+						   DefaultDepth(dpy, DefaultScreen(dpy)),
-+						   InputOutput,
-+						   DefaultVisual(dpy, DefaultScreen(dpy)),
-+						   CWOverrideRedirect, &attr);
-+			XMapWindow(dpy, win);
-+			run(dpy, win, "cousin", options);
-+		}
-+	}
-+
-+	while (child) {
-+		int status = -1;
-+		pid_t pid = wait(&status);
-+		if (pid == -1)
-+			continue;
-+		child--;
-+	}
-+}
-+
-+static int has_present(Display *dpy)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	xcb_generic_error_t *error = NULL;
-+	void *reply;
-+
-+	reply = xcb_present_query_version_reply(c,
-+						xcb_present_query_version(c,
-+									  XCB_PRESENT_MAJOR_VERSION,
-+									  XCB_PRESENT_MINOR_VERSION),
-+						&error);
-+
-+	free(reply);
-+	free(error);
-+	if (reply == NULL) {
-+		fprintf(stderr, "Present not supported on %s\n", DisplayString(dpy));
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+static int has_composite(Display *dpy)
-+{
-+	int event, error;
-+	int major, minor;
-+
-+	if (!XDamageQueryExtension (dpy, &event, &error))
-+		return 0;
-+
-+	if (!XCompositeQueryExtension(dpy, &event, &error))
-+		return 0;
-+
-+	XCompositeQueryVersion(dpy, &major, &minor);
-+
-+	return major > 0 || minor >= 4;
-+}
-+
-+static int dri3_query_version(Display *dpy, int *major, int *minor)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	xcb_dri3_query_version_reply_t *reply;
-+	xcb_generic_error_t *error;
-+
-+	*major = *minor = -1;
-+
-+	reply = xcb_dri3_query_version_reply(c,
-+					     xcb_dri3_query_version(c,
-+								    XCB_DRI3_MAJOR_VERSION,
-+								    XCB_DRI3_MINOR_VERSION),
-+					     &error);
-+	free(error);
-+	if (reply == NULL)
-+		return -1;
-+
-+	*major = reply->major_version;
-+	*minor = reply->minor_version;
-+	free(reply);
-+
-+	return 0;
-+}
-+
-+static int has_dri3(Display *dpy)
-+{
-+	const xcb_query_extension_reply_t *ext;
-+	int major, minor;
-+
-+	ext = xcb_get_extension_data(XGetXCBConnection(dpy), &xcb_dri3_id);
-+	if (ext == NULL || !ext->present)
-+		return 0;
-+
-+	if (dri3_query_version(dpy, &major, &minor) < 0)
-+		return 0;
-+
-+	return major >= 0;
-+}
-+
-+static int has_xfixes(Display *dpy)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	const xcb_query_extension_reply_t *ext;
-+	void *reply;
-+
-+	ext = xcb_get_extension_data(c, &xcb_xfixes_id);
-+	if (ext == NULL || !ext->present)
-+		return 0;
-+
-+	reply = xcb_xfixes_query_version_reply(c,
-+					       xcb_xfixes_query_version(c,
-+									XCB_XFIXES_MAJOR_VERSION,
-+									XCB_XFIXES_MINOR_VERSION),
-+					       NULL);
-+	free(reply);
-+
-+	return reply != NULL;
-+}
-+
-+static inline XRRScreenResources *_XRRGetScreenResourcesCurrent(Display *dpy, Window window)
-+{
-+	XRRScreenResources *res;
-+
-+	res = XRRGetScreenResourcesCurrent(dpy, window);
-+	if (res == NULL)
-+		res = XRRGetScreenResources(dpy, window);
-+
-+	return res;
-+}
-+
-+static XRRModeInfo *lookup_mode(XRRScreenResources *res, int id)
-+{
-+	int i;
-+
-+	for (i = 0; i < res->nmode; i++) {
-+		if (res->modes[i].id == id)
-+			return &res->modes[i];
-+	}
-+
-+	return NULL;
-+}
-+
-+static void fullscreen(Display *dpy, Window win)
-+{
-+	Atom atom = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
-+	XChangeProperty(dpy, win,
-+			XInternAtom(dpy, "_NET_WM_STATE", False),
-+			XA_ATOM, 32, PropModeReplace,
-+			(unsigned char *)&atom, 1);
-+}
-+
-+static void loop(Display *dpy, XRRScreenResources *res, unsigned options)
-+{
-+	Window root = DefaultRootWindow(dpy);
-+	Window win;
-+	XSetWindowAttributes attr;
-+	int i, j;
-+
-+	attr.override_redirect = 1;
-+
-+	run(dpy, root, "off", options);
-+	XSync(dpy, True);
-+
-+	for (i = 0; i < res->noutput; i++) {
-+		XRROutputInfo *output;
-+		XRRModeInfo *mode;
-+
-+		output = XRRGetOutputInfo(dpy, res, res->outputs[i]);
-+		if (output == NULL)
-+			continue;
-+
-+		mode = NULL;
-+		if (res->nmode)
-+			mode = lookup_mode(res, output->modes[0]);
-+
-+		for (j = 0; mode && j < 2*output->ncrtc; j++) {
-+			int c = j;
-+			if (c >= output->ncrtc)
-+				c = 2*output->ncrtc - j - 1;
-+
-+			printf("[%d, %d] -- OUTPUT:%ld, CRTC:%ld: %dx%d\n",
-+			       i, c, (long)res->outputs[i], (long)output->crtcs[c],
-+			       mode->width, mode->height);
-+			XRRSetCrtcConfig(dpy, res, output->crtcs[c], CurrentTime,
-+					 0, 0, output->modes[0], RR_Rotate_0, &res->outputs[i], 1);
-+
-+			run(dpy, root, "root", options);
-+			XSync(dpy, True);
-+
-+			win = XCreateWindow(dpy, root,
-+					    0, 0, mode->width, mode->height, 0,
-+					    DefaultDepth(dpy, DefaultScreen(dpy)),
-+					    InputOutput,
-+					    DefaultVisual(dpy, DefaultScreen(dpy)),
-+					    CWOverrideRedirect, &attr);
-+			fullscreen(dpy, win);
-+			XMapWindow(dpy, win);
-+			run(dpy, win, "fullscreen", options);
-+			XDestroyWindow(dpy, win);
-+			XSync(dpy, True);
-+
-+			win = XCreateWindow(dpy, root,
-+					    0, 0, mode->width, mode->height, 0,
-+					    DefaultDepth(dpy, DefaultScreen(dpy)),
-+					    InputOutput,
-+					    DefaultVisual(dpy, DefaultScreen(dpy)),
-+					    CWOverrideRedirect, &attr);
-+			XMapWindow(dpy, win);
-+			run(dpy, win, "windowed", options);
-+			XDestroyWindow(dpy, win);
-+			XSync(dpy, True);
-+
-+			if (has_composite(dpy)) {
-+				Damage damage;
-+
-+				_x_error_occurred = 0;
-+				win = XCreateWindow(dpy, root,
-+						    0, 0, mode->width, mode->height, 0,
-+						    DefaultDepth(dpy, DefaultScreen(dpy)),
-+						    InputOutput,
-+						    DefaultVisual(dpy, DefaultScreen(dpy)),
-+						    CWOverrideRedirect, &attr);
-+				XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+				damage = XDamageCreate(dpy, win, XDamageReportNonEmpty);
-+				XMapWindow(dpy, win);
-+				XSync(dpy, True);
-+				if (!_x_error_occurred)
-+					run(dpy, win, "composited", options);
-+				XDamageDestroy(dpy, damage);
-+				XDestroyWindow(dpy, win);
-+				XSync(dpy, True);
-+			}
-+
-+			win = XCreateWindow(dpy, root,
-+					    0, 0, mode->width/2, mode->height/2, 0,
-+					    DefaultDepth(dpy, DefaultScreen(dpy)),
-+					    InputOutput,
-+					    DefaultVisual(dpy, DefaultScreen(dpy)),
-+					    CWOverrideRedirect, &attr);
-+			XMapWindow(dpy, win);
-+			run(dpy, win, "half", options);
-+			XDestroyWindow(dpy, win);
-+			XSync(dpy, True);
-+
-+			perpixel(dpy, mode->width, mode->height, options);
-+
-+			siblings(dpy, mode->width, mode->height,
-+				 sysconf(_SC_NPROCESSORS_ONLN),
-+				 options);
-+
-+			cousins(mode->width, mode->height,
-+				sysconf(_SC_NPROCESSORS_ONLN),
-+				options);
-+
-+			XRRSetCrtcConfig(dpy, res, output->crtcs[c], CurrentTime,
-+					 0, 0, None, RR_Rotate_0, NULL, 0);
-+		}
-+
-+		XRRFreeOutputInfo(output);
-+	}
-+
-+}
-+
-+int main(void)
-+{
-+	Display *dpy;
-+	XRRScreenResources *res;
-+	XRRCrtcInfo **original_crtc;
-+	int i;
-+
-+	XInitThreads();
-+
-+	dpy = XOpenDisplay(NULL);
-+	if (dpy == NULL)
-+		return 77;
-+
-+	if (!has_present(dpy))
-+		return 77;
-+
-+	if (DPMSQueryExtension(dpy, &i, &i))
-+		DPMSDisable(dpy);
-+
-+	signal(SIGALRM, SIG_IGN);
-+	XSetErrorHandler(_check_error_handler);
-+
-+	res = NULL;
-+	if (XRRQueryVersion(dpy, &i, &i))
-+		res = _XRRGetScreenResourcesCurrent(dpy, DefaultRootWindow(dpy));
-+	if (res == NULL)
-+		return 77;
-+
-+	original_crtc = malloc(sizeof(XRRCrtcInfo *)*res->ncrtc);
-+	for (i = 0; i < res->ncrtc; i++)
-+		original_crtc[i] = XRRGetCrtcInfo(dpy, res, res->crtcs[i]);
-+
-+	printf("noutput=%d, ncrtc=%d\n", res->noutput, res->ncrtc);
-+	for (i = 0; i < res->ncrtc; i++)
-+		XRRSetCrtcConfig(dpy, res, res->crtcs[i], CurrentTime,
-+				 0, 0, None, RR_Rotate_0, NULL, 0);
-+
-+	loop(dpy, res, 0);
-+	loop(dpy, res, ASYNC);
-+	if (has_xfixes(dpy))
-+		loop(dpy, res, NOCOPY);
-+	if (has_dri3(dpy)) {
-+		loop(dpy, res, DRI3);
-+		loop(dpy, res, DRI3 | ASYNC);
-+	}
-+
-+	for (i = 0; i < res->ncrtc; i++)
-+		XRRSetCrtcConfig(dpy, res, res->crtcs[i], CurrentTime,
-+				 original_crtc[i]->x,
-+				 original_crtc[i]->y,
-+				 original_crtc[i]->mode,
-+				 original_crtc[i]->rotation,
-+				 original_crtc[i]->outputs,
-+				 original_crtc[i]->noutput);
-+
-+	if (DPMSQueryExtension(dpy, &i, &i))
-+		DPMSEnable(dpy);
-+	return 0;
-+}
-diff --git a/test/present-test.c b/test/present-test.c
-index 6b562eb0..5a12a24f 100644
---- a/test/present-test.c
-+++ b/test/present-test.c
-@@ -31,7 +31,9 @@
- #include <X11/xshmfence.h>
- #include <X11/Xutil.h>
- #include <X11/Xlibint.h>
-+#include <X11/extensions/dpms.h>
- #include <X11/extensions/randr.h>
-+#include <X11/extensions/Xcomposite.h>
- #include <X11/extensions/Xrandr.h>
- #include <X11/extensions/Xrender.h>
- #include <X11/extensions/XShm.h>
-@@ -44,6 +46,8 @@
- #endif
- #include <xcb/xcb.h>
- #include <xcb/present.h>
-+#include <xcb/xfixes.h>
-+#include <xcb/dri3.h>
- #include <xf86drm.h>
- #include <i915_drm.h>
- 
-@@ -134,12 +138,14 @@ static void *setup_msc(Display *dpy,  Window win)
- 	return q;
- }
- 
--static uint64_t check_msc(Display *dpy, Window win, void *q, uint64_t last_msc)
-+static uint64_t check_msc(Display *dpy, Window win, void *q, uint64_t last_msc, uint64_t *ust)
- {
- 	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	static uint32_t serial = 1;
- 	uint64_t msc = 0;
-+	int complete = 0;
- 
--	xcb_present_notify_msc(c, win, 0, 0, 0, 0);
-+	xcb_present_notify_msc(c, win, serial ^ 0xcc00ffee, 0, 0, 0);
- 	xcb_flush(c);
- 
- 	do {
-@@ -151,82 +157,1268 @@ static uint64_t check_msc(Display *dpy, Window win, void *q, uint64_t last_msc)
- 			break;
- 
- 		ce = (xcb_present_complete_notify_event_t *)ev;
--		if (ce->kind != XCB_PRESENT_COMPLETE_KIND_PIXMAP)
-+		if (ce->kind == XCB_PRESENT_COMPLETE_KIND_NOTIFY_MSC &&
-+		    ce->serial == (serial ^ 0xcc00ffee)) {
-+			msc = ce->msc;
-+			if (ust)
-+				*ust = ce->ust;
-+			complete = 1;
-+		}
-+		free(ev);
-+	} while (!complete);
-+
-+	if ((int64_t)(msc - last_msc) < 0) {
-+		printf("Invalid MSC: was %llu, now %llu\n",
-+		       (long long)last_msc, (long long)msc);
-+	}
-+
-+	if (++serial == 0)
-+		serial = 1;
-+
-+	return msc;
-+}
-+
-+static uint64_t wait_vblank(Display *dpy, Window win, void *q)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	static uint32_t serial = 1;
-+	uint64_t msc = 0;
-+	int complete = 0;
-+
-+	xcb_present_notify_msc(c, win, serial ^ 0xdeadbeef, 0, 1, 0);
-+	xcb_flush(c);
-+
-+	do {
-+		xcb_present_complete_notify_event_t *ce;
-+		xcb_generic_event_t *ev;
-+
-+		ev = xcb_wait_for_special_event(c, q);
-+		if (ev == NULL)
-+			break;
-+
-+		ce = (xcb_present_complete_notify_event_t *)ev;
-+		if (ce->kind == XCB_PRESENT_COMPLETE_KIND_NOTIFY_MSC &&
-+		    ce->serial == (serial ^ 0xdeadbeef)) {
- 			msc = ce->msc;
-+			complete = 1;
-+		}
-+		free(ev);
-+	} while (!complete);
-+
-+	if (++serial == 0)
-+		serial = 1;
-+
-+	return msc;
-+}
-+
-+static uint64_t msc_interval(Display *dpy, Window win, void *q)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	uint64_t msc, ust;
-+	int complete = 0;
-+
-+	msc = check_msc(dpy, win, q, 0, NULL);
-+
-+	xcb_present_notify_msc(c, win, 0xc0ffee00, msc, 0, 0);
-+	xcb_present_notify_msc(c, win, 0xc0ffee01, msc + 10, 0, 0);
-+	xcb_flush(c);
-+
-+	ust = msc = 0;
-+	do {
-+		xcb_present_complete_notify_event_t *ce;
-+		xcb_generic_event_t *ev;
-+
-+		ev = xcb_wait_for_special_event(c, q);
-+		if (ev == NULL)
-+			break;
-+
-+		ce = (xcb_present_complete_notify_event_t *)ev;
-+		if (ce->kind == XCB_PRESENT_COMPLETE_KIND_NOTIFY_MSC &&
-+		    ce->serial == 0xc0ffee00) {
-+			msc -= ce->msc;
-+			ust -= ce->ust;
-+			complete++;
-+		}
-+		if (ce->kind == XCB_PRESENT_COMPLETE_KIND_NOTIFY_MSC &&
-+		    ce->serial == 0xc0ffee01) {
-+			msc += ce->msc;
-+			ust += ce->ust;
-+			complete++;
-+		}
-+		free(ev);
-+	} while (complete != 2);
-+
-+	printf("10 frame interval: msc=%lld, ust=%lld\n",
-+	       (long long)msc, (long long)ust);
-+	XSync(dpy, True);
-+	if (msc == 0)
-+		return 0;
-+
-+	return (ust + msc/2) / msc;
-+}
-+
-+static void teardown_msc(Display *dpy, void *q)
-+{
-+	xcb_unregister_for_special_event(XGetXCBConnection(dpy), q);
-+}
-+
-+static int test_whole(Display *dpy, Window win, const char *phase)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	Pixmap pixmap;
-+	struct dri3_fence fence;
-+	Window root;
-+	unsigned int width, height;
-+	unsigned border, depth;
-+	int x, y, ret = 1;
-+
-+	XGetGeometry(dpy, win,
-+		     &root, &x, &y, &width, &height, &border, &depth);
-+
-+	if (dri3_create_fence(dpy, win, &fence))
-+		return 0;
-+
-+	printf("%s: Testing simple flip: %dx%d\n", phase, width, height);
-+	_x_error_occurred = 0;
-+
-+	xshmfence_reset(fence.addr);
-+
-+	pixmap = XCreatePixmap(dpy, win, width, height, depth);
-+	xcb_present_pixmap(c, win, pixmap, 0,
-+			   0, /* valid */
-+			   0, /* update */
-+			   0, /* x_off */
-+			   0, /* y_off */
-+			   None,
-+			   None, /* wait fence */
-+			   fence.xid,
-+			   XCB_PRESENT_OPTION_NONE,
-+			   0, /* target msc */
-+			   0, /* divisor */
-+			   0, /* remainder */
-+			   0, NULL);
-+	XFreePixmap(dpy, pixmap);
-+
-+	pixmap = XCreatePixmap(dpy, win, width, height, depth);
-+	xcb_present_pixmap(c, win, pixmap, 0,
-+			   0, /* valid */
-+			   0, /* update */
-+			   0, /* x_off */
-+			   0, /* y_off */
-+			   None,
-+			   None, /* wait fence */
-+			   None, /* sync fence */
-+			   XCB_PRESENT_OPTION_NONE,
-+			   0, /* target msc */
-+			   0, /* divisor */
-+			   0, /* remainder */
-+			   0, NULL);
-+	XFreePixmap(dpy, pixmap);
-+	XFlush(dpy);
-+
-+	ret = !!xshmfence_await(fence.addr);
-+	dri3_fence_free(dpy, &fence);
-+
-+	XSync(dpy, True);
-+	ret += !!_x_error_occurred;
-+
-+	return ret;
-+}
-+
-+static uint64_t flush_flips(Display *dpy, Window win, Pixmap pixmap, void *Q, uint64_t *ust)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	uint64_t msc;
-+	int complete;
-+
-+	msc = check_msc(dpy, win, Q, 0, NULL);
-+	xcb_present_pixmap(c, win, pixmap,
-+			   0xdeadbeef, /* serial */
-+			   0, /* valid */
-+			   0, /* update */
-+			   0, /* x_off */
-+			   0, /* y_off */
-+			   None,
-+			   None, /* wait fence */
-+			   None,
-+			   XCB_PRESENT_OPTION_NONE,
-+			   msc + 60, /* target msc */
-+			   0, /* divisor */
-+			   0, /* remainder */
-+			   0, NULL);
-+	xcb_flush(c);
-+	complete = 0;
-+	do {
-+		xcb_present_complete_notify_event_t *ce;
-+		xcb_generic_event_t *ev;
-+
-+		ev = xcb_wait_for_special_event(c, Q);
-+		if (ev == NULL)
-+			break;
-+
-+		ce = (xcb_present_complete_notify_event_t *)ev;
-+		complete = (ce->kind == XCB_PRESENT_COMPLETE_KIND_PIXMAP &&
-+			    ce->serial == 0xdeadbeef);
-+		free(ev);
-+	} while (!complete);
-+	XSync(dpy, True);
-+
-+	return check_msc(dpy, win, Q, msc, ust);
-+}
-+
-+static int test_double(Display *dpy, Window win, const char *phase, void *Q)
-+{
-+#define COUNT (15*60)
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	Pixmap pixmap;
-+	Window root;
-+	unsigned int width, height;
-+	unsigned border, depth;
-+	int x, y, n, ret;
-+	struct {
-+		uint64_t msc, ust;
-+	} frame[COUNT+1];
-+	int offset = 0;
-+
-+	XGetGeometry(dpy, win,
-+		     &root, &x, &y, &width, &height, &border, &depth);
-+
-+	printf("%s: Testing flip double buffering: %dx%d\n", phase, width, height);
-+	_x_error_occurred = 0;
-+
-+	pixmap = XCreatePixmap(dpy, win, width, height, depth);
-+	flush_flips(dpy, win, pixmap, Q, NULL);
-+	for (n = 0; n <= COUNT; n++) {
-+		int complete;
-+
-+		xcb_present_pixmap(c, win, pixmap, n,
-+				   0, /* valid */
-+				   0, /* update */
-+				   0, /* x_off */
-+				   0, /* y_off */
-+				   None,
-+				   None, /* wait fence */
-+				   None,
-+				   XCB_PRESENT_OPTION_NONE,
-+				   0, /* target msc */
-+				   0, /* divisor */
-+				   0, /* remainder */
-+				   0, NULL);
-+		xcb_flush(c);
-+
-+		complete = 0;
-+		do {
-+			xcb_present_complete_notify_event_t *ce;
-+			xcb_generic_event_t *ev;
-+
-+			ev = xcb_wait_for_special_event(c, Q);
-+			if (ev == NULL)
-+				break;
-+
-+			ce = (xcb_present_complete_notify_event_t *)ev;
-+			if (ce->kind == XCB_PRESENT_COMPLETE_KIND_PIXMAP &&
-+			    ce->serial == n) {
-+				frame[n].msc = ce->msc;
-+				frame[n].ust = ce->ust;
-+				complete = 1;
-+			}
-+			free(ev);
-+		} while (!complete);
-+	}
-+	XFreePixmap(dpy, pixmap);
-+
-+	XSync(dpy, True);
-+	ret = !!_x_error_occurred;
-+
-+	if (frame[COUNT].msc - frame[0].msc != COUNT) {
-+		printf("Expected %d frames interval, %d elapsed instead\n",
-+		       COUNT, (int)(frame[COUNT].msc - frame[0].msc));
-+		for (n = 0; n <= COUNT; n++) {
-+			if (frame[n].msc - frame[0].msc != n + offset) {
-+				printf("frame[%d]: msc=%03lld, ust=%lld\n", n,
-+				       (long long)(frame[n].msc - frame[0].msc),
-+				       (long long)(frame[n].ust - frame[0].ust));
-+				offset = frame[n].msc - frame[0].msc - n;
-+				ret++;
-+			}
-+		}
-+	}
-+
-+	return ret;
-+}
-+
-+static int test_future(Display *dpy, Window win, const char *phase, void *Q)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	Pixmap pixmap;
-+	struct dri3_fence fence;
-+	Window root;
-+	unsigned int width, height;
-+	unsigned border, depth;
-+	int x, y, ret = 0, n;
-+	uint64_t msc, ust;
-+	int complete, count;
-+	int early = 0, late = 0;
-+	int earliest = 0, latest = 0;
-+	uint64_t interval;
-+
-+	XGetGeometry(dpy, win,
-+		     &root, &x, &y, &width, &height, &border, &depth);
-+
-+	if (dri3_create_fence(dpy, win, &fence))
-+		return 0;
-+
-+	printf("%s: Testing flips into the future: %dx%d\n", phase, width, height);
-+	_x_error_occurred = 0;
-+
-+	interval = msc_interval(dpy, win, Q);
-+	if (interval == 0) {
-+		printf("Zero delay between frames\n");
-+		return 1;
-+	}
-+
-+	pixmap = XCreatePixmap(dpy, win, width, height, depth);
-+	msc = flush_flips(dpy, win, pixmap, Q, &ust);
-+	for (n = 1; n <= 10; n++)
-+		xcb_present_pixmap(c, win, pixmap,
-+				   n, /* serial */
-+				   0, /* valid */
-+				   0, /* update */
-+				   0, /* x_off */
-+				   0, /* y_off */
-+				   None,
-+				   None, /* wait fence */
-+				   None,
-+				   XCB_PRESENT_OPTION_NONE,
-+				   msc + 60 + n*15*60, /* target msc */
-+				   0, /* divisor */
-+				   0, /* remainder */
-+				   0, NULL);
-+	xcb_present_pixmap(c, win, pixmap,
-+			   0xdeadbeef, /* serial */
-+			   0, /* valid */
-+			   0, /* update */
-+			   0, /* x_off */
-+			   0, /* y_off */
-+			   None,
-+			   None, /* wait fence */
-+			   None,
-+			   XCB_PRESENT_OPTION_NONE,
-+			   msc + 60 + n*15*60, /* target msc */
-+			   0, /* divisor */
-+			   0, /* remainder */
-+			   0, NULL);
-+	xcb_flush(c);
-+
-+	complete = 0;
-+	count = 0;
-+	do {
-+		xcb_present_complete_notify_event_t *ce;
-+		xcb_generic_event_t *ev;
-+
-+		ev = xcb_wait_for_special_event(c, Q);
-+		if (ev == NULL)
-+			break;
-+
-+		ce = (xcb_present_complete_notify_event_t *)ev;
-+		assert(ce->kind == XCB_PRESENT_COMPLETE_KIND_PIXMAP);
-+
-+		if (ce->serial == 0xdeadbeef) {
-+			int64_t time;
-+
-+			time = ce->ust - (ust + (60 + 15*60*n) * interval);
-+			if (time < -(int64_t)interval) {
-+				fprintf(stderr,
-+					"\tflips completed too early by %lldms\n",
-+					(long long)(-time / 1000));
-+			} else if (time > (int64_t)interval) {
-+				fprintf(stderr,
-+					"\tflips completed too late by %lldms\n",
-+					(long long)(time / 1000));
-+			}
-+			complete = 1;
-+		} else {
-+			int diff = (int64_t)(ce->msc - (15*60*ce->serial + msc + 60));
-+			if (diff < 0) {
-+				if (-diff > earliest) {
-+					fprintf(stderr, "\tframe %d displayed early by %d frames\n", ce->serial, -diff);
-+					earliest = -diff;
-+				}
-+				early++;
-+				ret++;
-+			} else if (diff > 0) {
-+				if (diff > latest) {
-+					fprintf(stderr, "\tframe %d displayed late by %d frames\n", ce->serial, diff);
-+					latest = diff;
-+				}
-+				late++;
-+				ret++;
-+			}
-+			count++;
-+		}
-+		free(ev);
-+	} while (!complete);
-+
-+	if (early)
-+		printf("\t%d frames shown too early (worst %d)!\n", early, earliest);
-+	if (late)
-+		printf("\t%d frames shown too late (worst %d)!\n", late, latest);
-+
-+	if (count != 10) {
-+		fprintf(stderr, "Sentinel frame received too early! %d frames outstanding\n", 10 - count);
-+		ret++;
-+
-+		do {
-+			xcb_present_complete_notify_event_t *ce;
-+			xcb_generic_event_t *ev;
-+
-+			ev = xcb_wait_for_special_event(c, Q);
-+			if (ev == NULL)
-+				break;
-+
-+			ce = (xcb_present_complete_notify_event_t *)ev;
-+			assert(ce->kind == XCB_PRESENT_COMPLETE_KIND_PIXMAP);
-+			free(ev);
-+		} while (++count != 10);
-+	}
-+
-+	ret += !!_x_error_occurred;
-+
-+	return ret;
-+}
-+
-+static int test_exhaustion(Display *dpy, Window win, const char *phase, void *Q)
-+{
-+#define N_VBLANKS 256 /* kernel event queue length: 128 vblanks */
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	Pixmap pixmap;
-+	struct dri3_fence fence[2];
-+	Window root;
-+	xcb_xfixes_region_t region;
-+	unsigned int width, height;
-+	unsigned border, depth;
-+	int x, y, ret = 0, n;
-+	uint64_t target, final;
-+
-+	XGetGeometry(dpy, win,
-+		     &root, &x, &y, &width, &height, &border, &depth);
-+
-+	if (dri3_create_fence(dpy, win, &fence[0]) ||
-+	    dri3_create_fence(dpy, win, &fence[1]))
-+		return 0;
-+
-+	printf("%s: Testing flips with long vblank queues: %dx%d\n", phase, width, height);
-+	_x_error_occurred = 0;
-+
-+	region = xcb_generate_id(c);
-+	xcb_xfixes_create_region(c, region, 0, NULL);
-+
-+	pixmap = XCreatePixmap(dpy, win, width, height, depth);
-+	xshmfence_reset(fence[0].addr);
-+	xshmfence_reset(fence[1].addr);
-+	target = check_msc(dpy, win, Q, 0, NULL);
-+	for (n = N_VBLANKS; n--; )
-+		xcb_present_pixmap(c, win, pixmap, 0,
-+				   0, /* valid */
-+				   region, /* update */
-+				   0, /* x_off */
-+				   0, /* y_off */
-+				   None,
-+				   None, /* wait fence */
-+				   None,
-+				   XCB_PRESENT_OPTION_NONE,
-+				   target + N_VBLANKS, /* target msc */
-+				   1, /* divisor */
-+				   0, /* remainder */
-+				   0, NULL);
-+	xcb_present_pixmap(c, win, pixmap, 0,
-+			   region, /* valid */
-+			   region, /* update */
-+			   0, /* x_off */
-+			   0, /* y_off */
-+			   None,
-+			   None, /* wait fence */
-+			   fence[0].xid,
-+			   XCB_PRESENT_OPTION_NONE,
-+			   target, /* target msc */
-+			   0, /* divisor */
-+			   0, /* remainder */
-+			   0, NULL);
-+	for (n = 1; n < N_VBLANKS; n++)
-+		xcb_present_pixmap(c, win, pixmap, 0,
-+				   region, /* valid */
-+				   region, /* update */
-+				   0, /* x_off */
-+				   0, /* y_off */
-+				   None,
-+				   None, /* wait fence */
-+				   None,
-+				   XCB_PRESENT_OPTION_NONE,
-+				   target + n, /* target msc */
-+				   0, /* divisor */
-+				   0, /* remainder */
-+				   0, NULL);
-+	xcb_present_pixmap(c, win, pixmap, 0,
-+			   region, /* valid */
-+			   region, /* update */
-+			   0, /* x_off */
-+			   0, /* y_off */
-+			   None,
-+			   None, /* wait fence */
-+			   fence[1].xid,
-+			   XCB_PRESENT_OPTION_NONE,
-+			   target + N_VBLANKS, /* target msc */
-+			   0, /* divisor */
-+			   0, /* remainder */
-+			   0, NULL);
-+	xcb_flush(c);
-+
-+	ret += !!xshmfence_await(fence[0].addr);
-+	final = check_msc(dpy, win, Q, 0, NULL);
-+	if (final < target) {
-+		printf("\tFirst flip too early, MSC was %llu, expected %llu\n",
-+		       (long long)final, (long long)target);
-+		ret++;
-+	} else if (final > target + 1) {
-+		printf("\tFirst flip too late, MSC was %llu, expected %llu\n",
-+		       (long long)final, (long long)target);
-+		ret++;
-+	}
-+
-+	ret += !!xshmfence_await(fence[1].addr);
-+	final = check_msc(dpy, win, Q, 0, NULL);
-+	if (final < target + N_VBLANKS) {
-+		printf("\tLast flip too early, MSC was %llu, expected %llu\n",
-+		       (long long)final, (long long)(target + N_VBLANKS));
-+		ret++;
-+	} else if (final > target + N_VBLANKS + 1) {
-+		printf("\tLast flip too late, MSC was %llu, expected %llu\n",
-+		       (long long)final, (long long)(target + N_VBLANKS));
-+		ret++;
-+	}
-+
-+	flush_flips(dpy, win, pixmap, Q, NULL);
-+
-+	XFreePixmap(dpy, pixmap);
-+	xcb_xfixes_destroy_region(c, region);
-+	dri3_fence_free(dpy, &fence[1]);
-+	dri3_fence_free(dpy, &fence[0]);
-+
-+	XSync(dpy, True);
-+	ret += !!_x_error_occurred;
-+
-+	return ret;
-+#undef N_VBLANKS
-+}
-+
-+static int test_accuracy(Display *dpy, Window win, const char *phase, void *Q)
-+{
-+#define N_VBLANKS (60 * 120) /* ~2 minutes */
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	Pixmap pixmap;
-+	Window root;
-+	unsigned int width, height;
-+	unsigned border, depth;
-+	int x, y, ret = 0, n;
-+	uint64_t target;
-+	int early = 0, late = 0;
-+	int earliest = 0, latest = 0;
-+	int complete, count;
-+
-+	XGetGeometry(dpy, win,
-+		     &root, &x, &y, &width, &height, &border, &depth);
-+
-+	printf("%s: Testing flip accuracy: %dx%d\n", phase, width, height);
-+	_x_error_occurred = 0;
-+
-+	pixmap = XCreatePixmap(dpy, win, width, height, depth);
-+	target = flush_flips(dpy, win, pixmap, Q, NULL);
-+	for (n = 0; n <= N_VBLANKS; n++)
-+		xcb_present_pixmap(c, win, pixmap,
-+				   n, /* serial */
-+				   0, /* valid */
-+				   0, /* update */
-+				   0, /* x_off */
-+				   0, /* y_off */
-+				   None,
-+				   None, /* wait fence */
-+				   None,
-+				   XCB_PRESENT_OPTION_NONE,
-+				   target + 60 + n, /* target msc */
-+				   0, /* divisor */
-+				   0, /* remainder */
-+				   0, NULL);
-+	xcb_present_pixmap(c, win, pixmap,
-+			   0xdeadbeef, /* serial */
-+			   0, /* valid */
-+			   0, /* update */
-+			   0, /* x_off */
-+			   0, /* y_off */
-+			   None,
-+			   None, /* wait fence */
-+			   None,
-+			   XCB_PRESENT_OPTION_NONE,
-+			   target + 60 + n, /* target msc */
-+			   0, /* divisor */
-+			   0, /* remainder */
-+			   0, NULL);
-+	xcb_flush(c);
-+
-+	complete = 0;
-+	count = 0;
-+	do {
-+		xcb_present_complete_notify_event_t *ce;
-+		xcb_generic_event_t *ev;
-+
-+		ev = xcb_wait_for_special_event(c, Q);
-+		if (ev == NULL)
-+			break;
-+
-+		ce = (xcb_present_complete_notify_event_t *)ev;
-+		assert(ce->kind == XCB_PRESENT_COMPLETE_KIND_PIXMAP);
-+
-+		if (ce->serial != 0xdeadbeef) {
-+			int diff = (int64_t)(ce->msc - (target + ce->serial + 60));
-+			if (diff < 0) {
-+				if (-diff > earliest) {
-+					fprintf(stderr, "\tframe %d displayed early by %d frames\n", ce->serial, -diff);
-+					earliest = -diff;
-+				}
-+				early++;
-+				ret++;
-+			} else if (diff > 0) {
-+				if (diff > latest) {
-+					fprintf(stderr, "\tframe %d displayed late by %d frames\n", ce->serial, diff);
-+					latest = diff;
-+				}
-+				late++;
-+				ret++;
-+			}
-+			count++;
-+		} else
-+			complete = 1;
- 		free(ev);
--	} while (msc == 0);
-+	} while (!complete);
-+
-+	if (early)
-+		printf("\t%d frames shown too early (worst %d)!\n", early, earliest);
-+	if (late)
-+		printf("\t%d frames shown too late (worst %d)!\n", late, latest);
-+
-+	if (count != N_VBLANKS+1) {
-+		fprintf(stderr, "Sentinel frame received too early! %d frames outstanding\n", N_VBLANKS+1 - count);
-+		ret++;
-+		do {
-+			xcb_present_complete_notify_event_t *ce;
-+			xcb_generic_event_t *ev;
-+
-+			ev = xcb_wait_for_special_event(c, Q);
-+			if (ev == NULL)
-+				break;
-+
-+			ce = (xcb_present_complete_notify_event_t *)ev;
-+			assert(ce->kind == XCB_PRESENT_COMPLETE_KIND_PIXMAP);
-+			free(ev);
-+		} while (++count != N_VBLANKS+1);
-+	}
-+
-+	XFreePixmap(dpy, pixmap);
-+
-+	XSync(dpy, True);
-+	ret += !!_x_error_occurred;
-+
-+	return ret;
-+#undef N_VBLANKS
-+}
-+
-+static int test_modulus(Display *dpy, Window win, const char *phase, void *Q)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	Pixmap pixmap;
-+	Window root;
-+	unsigned int width, height;
-+	unsigned border, depth;
-+	xcb_xfixes_region_t region;
-+	int x, y, ret = 0;
-+	uint64_t target;
-+	int early = 0, late = 0;
-+	int earliest = 0, latest = 0;
-+	int complete, expect, count;
-+
-+	XGetGeometry(dpy, win,
-+		     &root, &x, &y, &width, &height, &border, &depth);
-+
-+	printf("%s: Testing flip modulus: %dx%d\n", phase, width, height);
-+	_x_error_occurred = 0;
-+
-+	region = xcb_generate_id(c);
-+	xcb_xfixes_create_region(c, region, 0, NULL);
-+
-+	pixmap = XCreatePixmap(dpy, win, width, height, depth);
-+	target = flush_flips(dpy, win, pixmap, Q, NULL);
-+	expect = 0;
-+	for (x = 1; x <= 7; x++) {
-+		for (y = 0; y < x; y++) {
-+			xcb_present_pixmap(c, win, pixmap,
-+					   y << 16 | x, /* serial */
-+					   region, /* valid */
-+					   region, /* update */
-+					   0, /* x_off */
-+					   0, /* y_off */
-+					   None,
-+					   None, /* wait fence */
-+					   None,
-+					   XCB_PRESENT_OPTION_NONE,
-+					   0, /* target msc */
-+					   x, /* divisor */
-+					   y, /* remainder */
-+					   0, NULL);
-+			expect++;
-+		}
-+	}
-+	xcb_present_pixmap(c, win, pixmap,
-+			   0xdeadbeef, /* serial */
-+			   0, /* valid */
-+			   0, /* update */
-+			   0, /* x_off */
-+			   0, /* y_off */
-+			   None,
-+			   None, /* wait fence */
-+			   None,
-+			   XCB_PRESENT_OPTION_NONE,
-+			   target + 2*x, /* target msc */
-+			   0, /* divisor */
-+			   0, /* remainder */
-+			   0, NULL);
-+	xcb_flush(c);
-+
-+	complete = 0;
-+	count = 0;
-+	do {
-+		xcb_present_complete_notify_event_t *ce;
-+		xcb_generic_event_t *ev;
-+
-+		ev = xcb_wait_for_special_event(c, Q);
-+		if (ev == NULL)
-+			break;
-+
-+		ce = (xcb_present_complete_notify_event_t *)ev;
-+		if (ce->kind != XCB_PRESENT_COMPLETE_KIND_PIXMAP)
-+			break;
-+
-+		assert(ce->serial);
-+		if (ce->serial != 0xdeadbeef) {
-+			uint64_t msc;
-+			int diff;
-+
-+			x = ce->serial & 0xffff;
-+			y = ce->serial >> 16;
-+
-+			msc = target;
-+			msc -= target % x;
-+			msc += y;
-+			if (msc <= target)
-+				msc += x;
-+
-+			diff = (int64_t)(ce->msc - msc);
-+			if (diff < 0) {
-+				if (-diff > earliest) {
-+					fprintf(stderr, "\tframe (%d, %d) displayed early by %d frames\n", y, x, -diff);
-+					earliest = -diff;
-+				}
-+				early++;
-+				ret++;
-+			} else if (diff > 0) {
-+				if (diff > latest) {
-+					fprintf(stderr, "\tframe (%d, %d) displayed late by %d frames\n", y, x, diff);
-+					latest = diff;
-+				}
-+				late++;
-+				ret++;
-+			}
-+			count++;
-+		} else
-+			complete = 1;
-+		free(ev);
-+	} while (!complete);
-+
-+	if (early)
-+		printf("\t%d frames shown too early (worst %d)!\n", early, earliest);
-+	if (late)
-+		printf("\t%d frames shown too late (worst %d)!\n", late, latest);
-+
-+	if (count != expect) {
-+		fprintf(stderr, "Sentinel frame received too early! %d frames outstanding\n", expect - count);
-+		ret++;
-+		do {
-+			xcb_present_complete_notify_event_t *ce;
-+			xcb_generic_event_t *ev;
-+
-+			ev = xcb_wait_for_special_event(c, Q);
-+			if (ev == NULL)
-+				break;
-+
-+			ce = (xcb_present_complete_notify_event_t *)ev;
-+			assert(ce->kind == XCB_PRESENT_COMPLETE_KIND_NOTIFY_MSC);
-+			free(ev);
-+		} while (++count != expect);
-+	}
-+
-+	XFreePixmap(dpy, pixmap);
-+	xcb_xfixes_destroy_region(c, region);
-+
-+	XSync(dpy, True);
-+	ret += !!_x_error_occurred;
-+
-+	return ret;
-+}
-+
-+static int test_future_msc(Display *dpy, void *Q)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	Window root = DefaultRootWindow(dpy);
-+	int ret = 0, n;
-+	uint64_t msc, ust;
-+	int complete, count;
-+	int early = 0, late = 0;
-+	int earliest = 0, latest = 0;
-+	uint64_t interval;
-+
-+	printf("Testing notifies into the future\n");
-+	_x_error_occurred = 0;
-+
-+	interval = msc_interval(dpy, root, Q);
-+	if (interval == 0) {
-+		printf("Zero delay between frames\n");
-+		return 1;
-+	}
-+	msc = check_msc(dpy, root, Q, 0, &ust);
-+	printf("Initial msc=%llx, interval between frames %lldus\n",
-+	       (long long)msc, (long long)interval);
-+
-+	for (n = 1; n <= 10; n++)
-+		xcb_present_notify_msc(c, root, n, msc + 60 + n*15*60, 0, 0);
-+	xcb_present_notify_msc(c, root, 0xdeadbeef, msc + 60 + n*15*60, 0, 0);
-+	xcb_flush(c);
-+
-+	complete = 0;
-+	count = 0;
-+	do {
-+		xcb_present_complete_notify_event_t *ce;
-+		xcb_generic_event_t *ev;
-+
-+		ev = xcb_wait_for_special_event(c, Q);
-+		if (ev == NULL)
-+			break;
-+
-+		ce = (xcb_present_complete_notify_event_t *)ev;
-+		assert(ce->kind == XCB_PRESENT_COMPLETE_KIND_NOTIFY_MSC);
-+
-+		if (ce->serial == 0xdeadbeef) {
-+			int64_t time, tolerance;
-+
-+			tolerance = 60 + 15*60*n/10;
-+			if (tolerance < interval)
-+				tolerance = interval;
-+
-+			time = ce->ust - (ust + (60 + 15*60*n) * interval);
-+			if (time < -(int64_t)tolerance) {
-+				fprintf(stderr,
-+					"\tnotifies completed too early by %lldms, tolerance %lldus\n",
-+					(long long)(-time / 1000), (long long)tolerance);
-+			} else if (time > (int64_t)tolerance) {
-+				fprintf(stderr,
-+					"\tnotifies completed too late by %lldms, tolerance %lldus\n",
-+					(long long)(time / 1000), (long long)tolerance);
-+			}
-+			complete = 1;
-+		} else {
-+			int diff = (int64_t)(ce->msc - (15*60*ce->serial + msc + 60));
-+
-+			if (ce->serial != count + 1) {
-+				fprintf(stderr, "vblank received out of order! expected %d, received %d\n",
-+					count + 1, (int)ce->serial);
-+				ret++;
-+			}
-+			count++;
-+
-+			if (diff < 0) {
-+				if (-diff > earliest) {
-+					fprintf(stderr, "\tnotify %d early by %d msc\n", ce->serial, -diff);
-+					earliest = -diff;
-+				}
-+				early++;
-+				ret++;
-+			} else if (diff > 0) {
-+				if (diff > latest) {
-+					fprintf(stderr, "\tnotify %d late by %d msc\n", ce->serial, diff);
-+					latest = diff;
-+				}
-+				late++;
-+				ret++;
-+			}
-+		}
-+		free(ev);
-+	} while (!complete);
-+
-+	if (early)
-+		printf("\t%d notifies too early (worst %d)!\n", early, earliest);
-+	if (late)
-+		printf("\t%d notifies too late (worst %d)!\n", late, latest);
-+
-+	if (count != 10) {
-+		fprintf(stderr, "Sentinel vblank received too early! %d waits outstanding\n", 10 - count);
-+		ret++;
-+		do {
-+			xcb_present_complete_notify_event_t *ce;
-+			xcb_generic_event_t *ev;
-+
-+			ev = xcb_wait_for_special_event(c, Q);
-+			if (ev == NULL)
-+				break;
-+
-+			ce = (xcb_present_complete_notify_event_t *)ev;
-+			assert(ce->kind == XCB_PRESENT_COMPLETE_KIND_NOTIFY_MSC);
-+			free(ev);
-+		} while (++count != 10);
-+	}
-+
-+	XSync(dpy, True);
-+	ret += !!_x_error_occurred;
-+
-+	return ret;
-+}
-+
-+static int test_wrap_msc(Display *dpy)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	Window root, win;
-+	int x, y;
-+	unsigned int width, height;
-+	unsigned border, depth;
-+	XSetWindowAttributes attr;
-+	int ret = 0, n;
-+	uint64_t msc, ust;
-+	int complete;
-+	uint64_t interval;
-+	void *Q;
-+
-+	XGetGeometry(dpy, DefaultRootWindow(dpy),
-+		     &root, &x, &y, &width, &height, &border, &depth);
-+
-+	attr.override_redirect = 1;
-+	win = XCreateWindow(dpy, root,
-+			    0, 0, width, height, 0, depth,
-+			    InputOutput, DefaultVisual(dpy, DefaultScreen(dpy)),
-+			    CWOverrideRedirect, &attr);
-+	XMapWindow(dpy, win);
-+	XSync(dpy, True);
-+	if (_x_error_occurred)
-+		return 1;
- 
--	if (msc < last_msc) {
--		printf("Invalid MSC: was %llu, now %llu\n",
--		       (long long)last_msc, (long long)msc);
-+	printf("Testing wraparound notifies\n");
-+	_x_error_occurred = 0;
-+
-+	Q = setup_msc(dpy, win);
-+	interval = msc_interval(dpy, win, Q);
-+	if (interval == 0) {
-+		printf("Zero delay between frames\n");
-+		return 1;
- 	}
-+	msc = check_msc(dpy, win, Q, 0, &ust);
-+	printf("Initial msc=%llx, interval between frames %lldus\n",
-+	       (long long)msc, (long long)interval);
-+
-+	for (n = 1; n <= 10; n++)
-+		xcb_present_notify_msc(c, win, n,
-+				       msc + ((long long)n<<32) + n,
-+				       0, 0);
-+	for (n = 1; n <= 10; n++)
-+		xcb_present_notify_msc(c, win, -n,
-+				       0, (long long)n << 32, 0);
-+	xcb_present_notify_msc(c, win, 0xdeadbeef, msc + 60*10, 0, 0);
-+	xcb_flush(c);
- 
--	return msc;
-+	complete = 0;
-+	do {
-+		xcb_present_complete_notify_event_t *ce;
-+		xcb_generic_event_t *ev;
-+
-+		ev = xcb_wait_for_special_event(c, Q);
-+		if (ev == NULL)
-+			break;
-+
-+		ce = (xcb_present_complete_notify_event_t *)ev;
-+		assert(ce->kind == XCB_PRESENT_COMPLETE_KIND_NOTIFY_MSC);
-+
-+		if (ce->serial == 0xdeadbeef) {
-+			complete = 1;
-+		} else {
-+			fprintf(stderr,
-+				"\tnotify %d recieved at +%llu\n",
-+				ce->serial, ce->msc - msc);
-+			ret++;
-+		}
-+		free(ev);
-+	} while (!complete);
-+
-+	teardown_msc(dpy, Q);
-+	XDestroyWindow(dpy, win);
-+	XSync(dpy, True);
-+
-+	return ret;
- }
- 
--static void teardown_msc(Display *dpy, void *q)
-+static int test_exhaustion_msc(Display *dpy, void *Q)
- {
--	xcb_unregister_for_special_event(XGetXCBConnection(dpy), q);
-+#define N_VBLANKS 256 /* kernel event queue length: 128 vblanks */
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	Window root = DefaultRootWindow(dpy);
-+	int ret = 0, n, complete;
-+	int earliest = 0, early = 0;
-+	int latest = 0, late = 0;
-+	uint64_t msc;
-+
-+	printf("Testing notifies with long queues\n");
-+	_x_error_occurred = 0;
-+
-+	msc = check_msc(dpy, root, Q, 0, NULL);
-+	for (n = N_VBLANKS; n--; )
-+		xcb_present_notify_msc(c, root, N_VBLANKS, msc + N_VBLANKS, 0, 0);
-+	for (n = 1; n <= N_VBLANKS ; n++)
-+		xcb_present_notify_msc(c, root, n, msc + n, 0, 0);
-+	xcb_flush(c);
-+
-+	complete = 2*N_VBLANKS;
-+	do {
-+		xcb_present_complete_notify_event_t *ce;
-+		xcb_generic_event_t *ev;
-+		int diff;
-+
-+		ev = xcb_wait_for_special_event(c, Q);
-+		if (ev == NULL)
-+			break;
-+
-+		ce = (xcb_present_complete_notify_event_t *)ev;
-+		assert(ce->kind == XCB_PRESENT_COMPLETE_KIND_NOTIFY_MSC);
-+
-+		diff = (int64_t)(ce->msc - msc - ce->serial);
-+		if (diff < 0) {
-+			if (-diff > earliest) {
-+				fprintf(stderr, "\tnotify %d early by %d msc\n",(int)ce->serial, -diff);
-+				earliest = -diff;
-+			}
-+			early++;
-+			ret++;
-+		} else if (diff > 0) {
-+			if (diff > latest) {
-+				fprintf(stderr, "\tnotify %d late by %d msc\n", (int)ce->serial, diff);
-+				latest = diff;
-+			}
-+			late++;
-+			ret++;
-+		}
-+		free(ev);
-+	} while (--complete);
-+
-+	if (early)
-+		printf("\t%d notifies too early (worst %d)!\n", early, earliest);
-+	if (late)
-+		printf("\t%d notifies too late (worst %d)!\n", late, latest);
-+
-+	XSync(dpy, True);
-+	ret += !!_x_error_occurred;
-+
-+	return ret;
-+#undef N_VBLANKS
- }
--static int test_whole(Display *dpy)
-+
-+static int test_accuracy_msc(Display *dpy, void *Q)
- {
--	Pixmap pixmap;
--	struct dri3_fence fence;
--	Window root;
--	unsigned int width, height;
--	unsigned border, depth;
--	int x, y, ret = 1;
-+#define N_VBLANKS (60 * 120) /* ~2 minutes */
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	Window root = DefaultRootWindow(dpy);
-+	int ret = 0, n;
-+	uint64_t msc;
-+	int early = 0, late = 0;
-+	int earliest = 0, latest = 0;
-+	int complete, count;
- 
--	XGetGeometry(dpy, DefaultRootWindow(dpy),
--		     &root, &x, &y, &width, &height, &border, &depth);
-+	printf("Testing notify accuracy\n");
-+	_x_error_occurred = 0;
- 
--	if (dri3_create_fence(dpy, root, &fence))
--		return 0;
-+	msc = check_msc(dpy, root, Q, 0, NULL);
-+	for (n = 0; n <= N_VBLANKS; n++)
-+		xcb_present_notify_msc(c, root, n, msc + 60 + n, 0, 0);
-+	xcb_present_notify_msc(c, root, 0xdeadbeef, msc + 60 + n, 0, 0);
-+	xcb_flush(c);
-+
-+	complete = 0;
-+	count = 0;
-+	do {
-+		xcb_present_complete_notify_event_t *ce;
-+		xcb_generic_event_t *ev;
-+
-+		ev = xcb_wait_for_special_event(c, Q);
-+		if (ev == NULL)
-+			break;
-+
-+		ce = (xcb_present_complete_notify_event_t *)ev;
-+		assert(ce->kind == XCB_PRESENT_COMPLETE_KIND_NOTIFY_MSC);
-+
-+		if (ce->serial != 0xdeadbeef) {
-+			int diff = (int64_t)(ce->msc - (msc + ce->serial + 60));
-+			if (diff < 0) {
-+				if (-diff > earliest) {
-+					fprintf(stderr, "\tnotify %d early by %d msc\n", ce->serial, -diff);
-+					earliest = -diff;
-+				}
-+				early++;
-+				ret++;
-+			} else if (diff > 0) {
-+				if (diff > latest) {
-+					fprintf(stderr, "\tnotify %d late by %d msc\n", ce->serial, diff);
-+					latest = diff;
-+				}
-+				late++;
-+				ret++;
-+			}
-+			count++;
-+		} else
-+			complete = 1;
-+		free(ev);
-+	} while (!complete);
-+
-+	if (early)
-+		printf("\t%d notifies too early (worst %d)!\n", early, earliest);
-+	if (late)
-+		printf("\t%d notifies too late (worst %d)!\n", late, latest);
-+
-+	if (count != N_VBLANKS+1) {
-+		fprintf(stderr, "Sentinel vblank received too early! %d waits outstanding\n", N_VBLANKS+1 - count);
-+		ret++;
-+		do {
-+			xcb_present_complete_notify_event_t *ce;
-+			xcb_generic_event_t *ev;
-+
-+			ev = xcb_wait_for_special_event(c, Q);
-+			if (ev == NULL)
-+				break;
-+
-+			ce = (xcb_present_complete_notify_event_t *)ev;
-+			assert(ce->kind == XCB_PRESENT_COMPLETE_KIND_NOTIFY_MSC);
-+			free(ev);
-+		} while (++count != N_VBLANKS+1);
-+	}
-+
-+	XSync(dpy, True);
-+	ret += !!_x_error_occurred;
-+
-+	return ret;
-+#undef N_VBLANKS
-+}
- 
--	printf("Testing whole screen flip: %dx%d\n", width, height);
-+static int test_modulus_msc(Display *dpy, void *Q)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	Window root = DefaultRootWindow(dpy);
-+	xcb_present_complete_notify_event_t *ce;
-+	xcb_generic_event_t *ev;
-+	int x, y, ret = 0;
-+	uint64_t target;
-+	int early = 0, late = 0;
-+	int earliest = 0, latest = 0;
-+	int complete, count, expect;
-+
-+	printf("Testing notify modulus\n");
- 	_x_error_occurred = 0;
- 
--	xshmfence_reset(fence.addr);
-+	target = wait_vblank(dpy, root, Q);
- 
--	pixmap = XCreatePixmap(dpy, root, width, height, depth);
--	xcb_present_pixmap(XGetXCBConnection(dpy),
--			   root, pixmap,
--			   0, /* sbc */
--			   0, /* valid */
--			   0, /* update */
--			   0, /* x_off */
--			   0, /* y_off */
--			   None,
--			   None, /* wait fence */
--			   fence.xid,
--			   XCB_PRESENT_OPTION_NONE,
--			   0, /* target msc */
--			   0, /* divisor */
--			   0, /* remainder */
--			   0, NULL);
--	XFreePixmap(dpy, pixmap);
-+	expect = 0;
-+	xcb_present_notify_msc(c, root, 0, 0, 0, 0);
-+	for (x = 1; x <= 19; x++) {
-+		for (y = 0; y < x; y++) {
-+			xcb_present_notify_msc(c, root, y << 16 | x, 0, x, y);
-+			expect++;
-+		}
-+	}
-+	xcb_present_notify_msc(c, root, 0xdeadbeef, target + 2*x, 0, 0);
-+	xcb_flush(c);
- 
--	pixmap = XCreatePixmap(dpy, root, width, height, depth);
--	xcb_present_pixmap(XGetXCBConnection(dpy),
--			   root, pixmap,
--			   0, /* sbc */
--			   0, /* valid */
--			   0, /* update */
--			   0, /* x_off */
--			   0, /* y_off */
--			   None,
--			   None, /* wait fence */
--			   None, /* sync fence */
--			   XCB_PRESENT_OPTION_NONE,
--			   0, /* target msc */
--			   0, /* divisor */
--			   0, /* remainder */
--			   0, NULL);
--	XFreePixmap(dpy, pixmap);
--	XFlush(dpy);
-+	ev = xcb_wait_for_special_event(c, Q);
-+	if (ev) {
-+		ce = (xcb_present_complete_notify_event_t *)ev;
-+		assert(ce->kind == XCB_PRESENT_COMPLETE_KIND_NOTIFY_MSC);
-+		assert(ce->serial == 0);
-+		assert(target == ce->msc);
-+		target = ce->msc;
-+	}
- 
--	ret = !!xshmfence_await(fence.addr);
--	dri3_fence_free(dpy, &fence);
-+	complete = 0;
-+	count = 0;
-+	do {
-+		ev = xcb_wait_for_special_event(c, Q);
-+		if (ev == NULL)
-+			break;
-+
-+		ce = (xcb_present_complete_notify_event_t *)ev;
-+		assert(ce->kind == XCB_PRESENT_COMPLETE_KIND_NOTIFY_MSC);
-+
-+		assert(ce->serial);
-+		if (ce->serial != 0xdeadbeef) {
-+			uint64_t msc;
-+			int diff;
-+
-+			x = ce->serial & 0xffff;
-+			y = ce->serial >> 16;
-+
-+			msc = target;
-+			msc -= target % x;
-+			msc += y;
-+			if (msc <= target)
-+				msc += x;
-+
-+			diff = (int64_t)(ce->msc - msc);
-+			if (diff < 0) {
-+				if (-diff > earliest) {
-+					fprintf(stderr, "\tnotify (%d, %d) early by %d msc (target %lld, reported %lld)\n", y, x, -diff, (long long)msc, (long long)ce->msc);
-+					earliest = -diff;
-+				}
-+				early++;
-+				ret++;
-+			} else if (diff > 0) {
-+				if (diff > latest) {
-+					fprintf(stderr, "\tnotify (%d, %d) late by %d msc (target %lld, reported %lld)\n", y, x, diff, (long long)msc, (long long)ce->msc);
-+					latest = diff;
-+				}
-+				late++;
-+				ret++;
-+			}
-+			count++;
-+		} else
-+			complete = 1;
-+		free(ev);
-+	} while (!complete);
-+
-+	if (early)
-+		printf("\t%d notifies too early (worst %d)!\n", early, earliest);
-+	if (late)
-+		printf("\t%d notifies too late (worst %d)!\n", late, latest);
-+
-+	if (count != expect) {
-+		fprintf(stderr, "Sentinel vblank received too early! %d waits outstanding\n", expect - count);
-+		ret++;
-+		do {
-+			ev = xcb_wait_for_special_event(c, Q);
-+			if (ev == NULL)
-+				break;
-+
-+			ce = (xcb_present_complete_notify_event_t *)ev;
-+			assert(ce->kind == XCB_PRESENT_COMPLETE_KIND_NOTIFY_MSC);
-+			free(ev);
-+		} while (++count != expect);
-+	}
- 
- 	XSync(dpy, True);
- 	ret += !!_x_error_occurred;
-@@ -279,8 +1471,6 @@ static int for_each_crtc(Display *dpy,
- 	for (i = 0; i < res->ncrtc; i++)
- 		original_crtc[i] = XRRGetCrtcInfo(dpy, res, res->crtcs[i]);
- 
--	printf("noutput=%d, ncrtc=%d\n", res->noutput, res->ncrtc);
--
- 	for (i = 0; i < res->noutput; i++) {
- 		XRROutputInfo *output;
- 		XRRModeInfo *mode;
-@@ -322,7 +1512,7 @@ static int for_each_crtc(Display *dpy,
- 	free(original_crtc);
- 	XRRFreeScreenResources(res);
- 
--	return j;
-+	return err;
- }
- 
- struct test_crtc {
-@@ -335,6 +1525,7 @@ struct test_crtc {
- 	uint64_t msc;
- };
- #define SYNC 0x1
-+#define FUTURE 0x2
- 
- static int __test_crtc(Display *dpy, RRCrtc crtc,
- 		       int width, int height,
-@@ -344,7 +1535,7 @@ static int __test_crtc(Display *dpy, RRCrtc crtc,
- 	Pixmap pixmap;
- 	int err = 0;
- 
--	test->msc = check_msc(dpy, test->win, test->queue, test->msc);
-+	test->msc = check_msc(dpy, test->win, test->queue, test->msc, NULL);
- 
- 	if (test->flags & SYNC)
- 		xshmfence_reset(test->fence.addr);
-@@ -361,16 +1552,14 @@ static int __test_crtc(Display *dpy, RRCrtc crtc,
- 			   None, /* wait fence */
- 			   test->flags & SYNC ? test->fence.xid : None,
- 			   XCB_PRESENT_OPTION_NONE,
--			   0, /* target msc */
-+			   test->msc, /* target msc */
- 			   1, /* divisor */
- 			   0, /* remainder */
- 			   0, NULL);
--	XFreePixmap(dpy, pixmap);
--
- 	if (test->flags & SYNC) {
--		pixmap = XCreatePixmap(dpy, test->win, width, height, test->depth);
-+		Pixmap tmp = XCreatePixmap(dpy, test->win, width, height, test->depth);
- 		xcb_present_pixmap(XGetXCBConnection(dpy),
--				   test->win, pixmap,
-+				   test->win, tmp,
- 				   1, /* sbc */
- 				   0, /* valid */
- 				   0, /* update */
-@@ -380,16 +1569,17 @@ static int __test_crtc(Display *dpy, RRCrtc crtc,
- 				   None, /* wait fence */
- 				   None, /* sync fence */
- 				   XCB_PRESENT_OPTION_NONE,
--				   1, /* target msc */
-+				   test->msc + (test->flags & FUTURE ? 5 * 16 : 1), /* target msc */
- 				   1, /* divisor */
- 				   0, /* remainder */
- 				   0, NULL);
--		XFreePixmap(dpy, pixmap);
-+		XFreePixmap(dpy, tmp);
- 		XFlush(dpy);
- 		err += !!xshmfence_await(test->fence.addr);
- 	}
-+	XFreePixmap(dpy, pixmap);
- 
--	test->msc = check_msc(dpy, test->win, test->queue, test->msc);
-+	test->msc = check_msc(dpy, test->win, test->queue, test->msc, NULL);
- 	return err;
- }
- 
-@@ -410,15 +1600,23 @@ static int test_crtc(Display *dpy, void *queue, uint64_t last_msc)
- 
- 	printf("Testing each crtc, without waiting for each flip\n");
- 	test.flags = 0;
-+	test.msc = check_msc(dpy, test.win, test.queue, test.msc, NULL);
- 	err += for_each_crtc(dpy, __test_crtc, &test);
-+	test.msc = check_msc(dpy, test.win, test.queue, test.msc, NULL);
- 
- 	printf("Testing each crtc, waiting for flips to complete\n");
- 	test.flags = SYNC;
-+	test.msc = check_msc(dpy, test.win, test.queue, test.msc, NULL);
- 	err += for_each_crtc(dpy, __test_crtc, &test);
-+	test.msc = check_msc(dpy, test.win, test.queue, test.msc, NULL);
- 
--	test.msc = check_msc(dpy, test.win, test.queue, test.msc);
--	dri3_fence_free(dpy, &test.fence);
-+	printf("Testing each crtc, with future flips\n");
-+	test.flags = FUTURE | SYNC;
-+	test.msc = check_msc(dpy, test.win, test.queue, test.msc, NULL);
-+	err += for_each_crtc(dpy, __test_crtc, &test);
-+	test.msc = check_msc(dpy, test.win, test.queue, test.msc, NULL);
- 
-+	dri3_fence_free(dpy, &test.fence);
- 	XSync(dpy, True);
- 	err += !!_x_error_occurred;
- 
-@@ -536,6 +1734,31 @@ static int gem_set_caching(int fd, uint32_t handle, int caching)
- 	return drmIoctl(fd, LOCAL_IOCTL_I915_GEM_SET_CACHING, &arg) == 0;
- }
- 
-+static int gem_set_tiling(int fd, uint32_t handle, int tiling, int stride)
-+{
-+	struct drm_i915_gem_set_tiling set_tiling;
-+	int err;
-+
-+restart:
-+	set_tiling.handle = handle;
-+	set_tiling.tiling_mode = tiling;
-+	set_tiling.stride = stride;
-+
-+	if (drmIoctl(fd, DRM_IOCTL_I915_GEM_SET_TILING, &set_tiling) == 0)
-+		return 1;
-+
-+	err = errno;
-+	if (err == EINTR)
-+		goto restart;
-+
-+	if (err == EAGAIN) {
-+		sched_yield();
-+		goto restart;
-+	}
-+
-+	return 0;
-+}
-+
- static int gem_export(int fd, uint32_t handle)
- {
- 	struct drm_prime_handle args;
-@@ -557,6 +1780,126 @@ static void gem_close(int fd, uint32_t handle)
- 	(void)drmIoctl(fd, DRM_IOCTL_GEM_CLOSE, &close);
- }
- 
-+static int test_dri3_tiling(Display *dpy)
-+{
-+	Window win = DefaultRootWindow(dpy);
-+	const int tiling[] = { I915_TILING_NONE, I915_TILING_X, I915_TILING_Y };
-+	Window root;
-+	unsigned int width, height;
-+	unsigned border, depth, bpp;
-+	unsigned stride, size;
-+	void *Q;
-+	int x, y;
-+	int device;
-+	int line = -1;
-+	int t;
-+
-+	device = dri3_open(dpy);
-+	if (device < 0)
-+		return 0;
-+
-+	if (!is_intel(device))
-+		return 0;
-+
-+	printf("Opened Intel DRI3 device\n");
-+
-+	XGetGeometry(dpy, win, &root, &x, &y,
-+		     &width, &height, &border, &depth);
-+
-+	switch (depth) {
-+	case 8: bpp = 8; break;
-+	case 15: case 16: bpp = 16; break;
-+	case 24: case 32: bpp = 32; break;
-+	default: return 0;
-+	}
-+
-+	stride = ALIGN(width * bpp/8, 512);
-+	size = PAGE_ALIGN(stride * ALIGN(height, 32));
-+	printf("Creating DRI3 %dx%d (source stride=%d, size=%d) for GTT\n",
-+	       width, height, stride, size);
-+
-+	_x_error_occurred = 0;
-+	Q = setup_msc(dpy, root);
-+
-+	for (t = 0; t < sizeof(tiling)/sizeof(tiling[0]); t++) {
-+		uint64_t msc;
-+		uint32_t src;
-+		int src_fd;
-+		Pixmap src_pix;
-+
-+		src = gem_create(device, size);
-+		if (!src) {
-+			line = __LINE__;
-+			goto fail;
-+		}
-+
-+		gem_set_tiling(device, src, tiling[t], stride);
-+
-+		src_fd = gem_export(device, src);
-+		if (src_fd < 0) {
-+			line = __LINE__;
-+			goto fail;
-+		}
-+
-+		src_pix = dri3_create_pixmap(dpy, root,
-+					     width, height, depth,
-+					     src_fd, bpp, stride, size);
-+
-+		msc = wait_vblank(dpy, root, Q);
-+
-+		xcb_present_pixmap(XGetXCBConnection(dpy),
-+				   win, src_pix,
-+				   0, /* sbc */
-+				   0, /* valid */
-+				   0, /* update */
-+				   0, /* x_off */
-+				   0, /* y_off */
-+				   None,
-+				   None, /* wait fence */
-+				   None,
-+				   XCB_PRESENT_OPTION_NONE,
-+				   msc + 2, /* target msc */
-+				   1, /* divisor */
-+				   0, /* remainder */
-+				   0, NULL);
-+
-+		xcb_present_pixmap(XGetXCBConnection(dpy),
-+				   win, src_pix,
-+				   0, /* sbc */
-+				   0, /* valid */
-+				   0, /* update */
-+				   0, /* x_off */
-+				   0, /* y_off */
-+				   None,
-+				   None, /* wait fence */
-+				   None,
-+				   XCB_PRESENT_OPTION_NONE,
-+				   msc + 3, /* target msc */
-+				   1, /* divisor */
-+				   0, /* remainder */
-+				   0, NULL);
-+
-+		XSync(dpy, True);
-+		if (_x_error_occurred) {
-+			line = __LINE__;
-+			goto fail;
-+		}
-+		XFreePixmap(dpy, src_pix);
-+		_x_error_occurred = 0;
-+
-+		close(src_fd);
-+		gem_close(device, src);
-+	}
-+
-+	teardown_msc(dpy, Q);
-+	return 0;
-+
-+fail:
-+	printf("%s failed with tiling %d, line %d\n", __func__, tiling[t], line);
-+	teardown_msc(dpy, Q);
-+	return 1;
-+}
-+
- static int test_dri3(Display *dpy)
- {
- 	Window win = DefaultRootWindow(dpy);
-@@ -670,8 +2013,32 @@ fail:
- static int has_present(Display *dpy)
- {
- 	xcb_connection_t *c = XGetXCBConnection(dpy);
--	xcb_present_query_version_reply_t *reply;
- 	xcb_generic_error_t *error = NULL;
-+	void *reply;
-+
-+	reply = xcb_xfixes_query_version_reply(c,
-+					       xcb_xfixes_query_version(c,
-+									XCB_XFIXES_MAJOR_VERSION,
-+									XCB_XFIXES_MINOR_VERSION),
-+					       &error);
-+	free(reply);
-+	free(error);
-+	if (reply == NULL) {
-+		fprintf(stderr, "XFixes not supported on %s\n", DisplayString(dpy));
-+		return 0;
-+	}
-+
-+	reply = xcb_dri3_query_version_reply(c,
-+					     xcb_dri3_query_version(c,
-+								    XCB_DRI3_MAJOR_VERSION,
-+								    XCB_DRI3_MINOR_VERSION),
-+					     &error);
-+	free(reply);
-+	free(error);
-+	if (reply == NULL) {
-+		fprintf(stderr, "DRI3 not supported on %s\n", DisplayString(dpy));
-+		return 0;
-+	}
- 
- 	reply = xcb_present_query_version_reply(c,
- 						xcb_present_query_version(c,
-@@ -681,14 +2048,32 @@ static int has_present(Display *dpy)
- 
- 	free(reply);
- 	free(error);
-+	if (reply == NULL) {
-+		fprintf(stderr, "Present not supported on %s\n", DisplayString(dpy));
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+static int has_composite(Display *dpy)
-+{
-+	int event, error;
-+	int major, minor;
-+
-+	if (!XCompositeQueryExtension(dpy, &event, &error))
-+		return 0;
-+
-+	XCompositeQueryVersion(dpy, &major, &minor);
- 
--	return reply != NULL;
-+	return major > 0 || minor >= 4;
- }
- 
- int main(void)
- {
- 	Display *dpy;
- 	Window root;
-+	int dummy;
- 	int error = 0;
- 	uint64_t last_msc;
- 	void *queue;
-@@ -700,27 +2085,135 @@ int main(void)
- 	if (!has_present(dpy))
- 		return 77;
- 
-+	if (DPMSQueryExtension(dpy, &dummy, &dummy))
-+		DPMSDisable(dpy);
-+
- 	root = DefaultRootWindow(dpy);
- 
- 	signal(SIGALRM, SIG_IGN);
- 	XSetErrorHandler(_check_error_handler);
- 
- 	queue = setup_msc(dpy, root);
--	last_msc = check_msc(dpy, root, queue, 0);
-+	last_msc = check_msc(dpy, root, queue, 0, NULL);
-+
-+	error += test_future_msc(dpy, queue);
-+	last_msc = check_msc(dpy, root, queue, last_msc, NULL);
-+
-+	error += test_wrap_msc(dpy);
-+	last_msc = check_msc(dpy, root, queue, last_msc, NULL);
-+
-+	error += test_accuracy_msc(dpy, queue);
-+	last_msc = check_msc(dpy, root, queue, last_msc, NULL);
-+
-+	error += test_modulus_msc(dpy, queue);
-+	last_msc = check_msc(dpy, root, queue, last_msc, NULL);
-+
-+	error += test_exhaustion_msc(dpy, queue);
-+	last_msc = check_msc(dpy, root, queue, last_msc, NULL);
-+
-+	for (dummy = 0; dummy <= 3; dummy++) {
-+		Window win;
-+		uint64_t msc = 0;
-+		XSetWindowAttributes attr;
-+		Visual *visual = DefaultVisual(dpy, DefaultScreen(dpy));
-+		unsigned int width, height;
-+		unsigned border, depth;
-+		const char *phase;
-+		int x, y;
-+		void *Q;
-+
-+		attr.override_redirect = 1;
-+
-+		XGetGeometry(dpy, root, &win, &x, &y,
-+			     &width, &height, &border, &depth);
-+
-+		_x_error_occurred = 0;
-+		switch (dummy) {
-+		case 0:
-+			win = root;
-+			phase = "root";
-+			break;
-+		case 1:
-+			win = XCreateWindow(dpy, root,
-+					    0, 0, width, height, 0, depth,
-+					    InputOutput, visual,
-+					    CWOverrideRedirect, &attr);
-+			phase = "fullscreen";
-+			break;
-+		case 2:
-+			win = XCreateWindow(dpy, root,
-+					    0, 0, width/2, height/2, 0, depth,
-+					    InputOutput, visual,
-+					    CWOverrideRedirect, &attr);
-+			phase = "window";
-+			break;
-+		case 3:
-+			if (!has_composite(dpy))
-+				continue;
-+
-+			win = XCreateWindow(dpy, root,
-+					    0, 0, width, height, 0,
-+					    DefaultDepth(dpy, DefaultScreen(dpy)),
-+					    InputOutput,
-+					    DefaultVisual(dpy, DefaultScreen(dpy)),
-+					    CWOverrideRedirect, &attr);
-+			XCompositeRedirectWindow(dpy, win, CompositeRedirectManual);
-+			phase = "composite";
-+			break;
-+
-+		default:
-+			phase = "broken";
-+			win = root;
-+			abort();
-+			break;
-+		}
-+
-+		XMapWindow(dpy, win);
-+		XSync(dpy, True);
-+		if (_x_error_occurred)
-+			continue;
-+
-+		Q = setup_msc(dpy, win);
-+		msc = check_msc(dpy, win, Q, msc, NULL);
- 
--	error += test_whole(dpy);
--	last_msc = check_msc(dpy, root, queue, last_msc);
-+		error += test_whole(dpy, win, phase);
-+		msc = check_msc(dpy, win, Q, msc, NULL);
-+
-+		error += test_double(dpy, win, phase, Q);
-+		msc = check_msc(dpy, win, Q, msc, NULL);
-+
-+		error += test_future(dpy, win, phase, Q);
-+		msc = check_msc(dpy, win, Q, msc, NULL);
-+
-+		error += test_accuracy(dpy, win, phase, Q);
-+		msc = check_msc(dpy, win, Q, msc, NULL);
-+
-+		error += test_modulus(dpy, win, phase, Q);
-+		msc = check_msc(dpy, win, Q, msc, NULL);
-+
-+		error += test_exhaustion(dpy, win, phase, Q);
-+		msc = check_msc(dpy, win, Q, msc, NULL);
-+
-+		teardown_msc(dpy, Q);
-+		if (win != root)
-+			XDestroyWindow(dpy, win);
-+	}
- 
- 	error += test_crtc(dpy, queue, last_msc);
--	last_msc = check_msc(dpy, root, queue, last_msc);
-+	last_msc = check_msc(dpy, root, queue, last_msc, NULL);
- 
- 	error += test_shm(dpy);
--	last_msc = check_msc(dpy, root, queue, last_msc);
-+	last_msc = check_msc(dpy, root, queue, last_msc, NULL);
- 
- 	error += test_dri3(dpy);
--	last_msc = check_msc(dpy, root, queue, last_msc);
-+	last_msc = check_msc(dpy, root, queue, last_msc, NULL);
-+
-+	error += test_dri3_tiling(dpy);
-+	last_msc = check_msc(dpy, root, queue, last_msc, NULL);
- 
- 	teardown_msc(dpy, queue);
- 
-+	if (DPMSQueryExtension(dpy, &dummy, &dummy))
-+		DPMSEnable(dpy);
- 	return !!error;
- }
-diff --git a/test/render-glyphs.c b/test/render-glyphs.c
-new file mode 100644
-index 00000000..8822e36a
---- /dev/null
-+++ b/test/render-glyphs.c
-@@ -0,0 +1,441 @@
-+#include <stdint.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <stdbool.h>
-+#include <stdarg.h>
-+#include <string.h>
-+
-+#include <X11/Xutil.h> /* for XDestroyImage */
-+#include <pixman.h> /* for pixman blt functions */
-+
-+#include "test.h"
-+
-+static const XRenderColor colors[] = {
-+	/* red, green, blue, alpha */
-+	{ 0 },
-+	{ 0, 0, 0, 0xffff },
-+	{ 0xffff, 0, 0, 0xffff },
-+	{ 0, 0xffff, 0, 0xffff },
-+	{ 0, 0, 0xffff, 0xffff },
-+	{ 0xffff, 0xffff, 0xffff, 0xffff },
-+};
-+
-+static struct clip {
-+	void *func;
-+} clips[] = {
-+	{ NULL },
-+};
-+
-+static int _x_error_occurred;
-+
-+static int
-+_check_error_handler(Display     *display,
-+		     XErrorEvent *event)
-+{
-+	_x_error_occurred = 1;
-+	return False; /* ignored */
-+}
-+
-+static void clear(struct test_display *dpy,
-+		  struct test_target *tt,
-+		  const XRenderColor *c)
-+{
-+	XRenderFillRectangle(dpy->dpy, PictOpClear, tt->picture, c,
-+			     0, 0, tt->width, tt->height);
-+}
-+
-+static bool check_op(struct test_display *dpy, int op, struct test_target *tt)
-+{
-+	XRenderColor render_color = {0};
-+
-+	XSync(dpy->dpy, True);
-+	_x_error_occurred = 0;
-+
-+	XRenderFillRectangle(dpy->dpy, op,
-+			     tt->picture, &render_color,
-+			     0, 0, 0, 0);
-+
-+	XSync(dpy->dpy, True);
-+	return _x_error_occurred == 0;
-+}
-+
-+struct glyph_iter {
-+	enum {
-+		GLYPHS, OP, DST, SRC, MASK, CLIP,
-+	} stage;
-+
-+	int glyph_format;
-+	int op;
-+	int dst_color;
-+	int src_color;
-+	int mask_format;
-+	int clip;
-+
-+	struct {
-+		struct test_display *dpy;
-+		struct test_target tt;
-+		GlyphSet glyphset;
-+		Picture src;
-+		XRenderPictFormat *mask_format;
-+	} ref, out;
-+};
-+
-+static void glyph_iter_init(struct glyph_iter *gi,
-+			    struct test *t, enum target target)
-+{
-+	memset(gi, 0, sizeof(*gi));
-+
-+	gi->out.dpy = &t->out;
-+	test_target_create_render(&t->out, target, &gi->out.tt);
-+
-+	gi->ref.dpy = &t->ref;
-+	test_target_create_render(&t->ref, target, &gi->ref.tt);
-+
-+	gi->stage = GLYPHS;
-+	gi->glyph_format = -1;
-+	gi->op = -1;
-+	gi->dst_color = -1;
-+	gi->src_color = -1;
-+	gi->mask_format = -1;
-+	gi->clip = -1;
-+}
-+
-+static void render_clear(char *image, int image_size, int bpp)
-+{
-+	memset(image, 0, image_size);
-+}
-+
-+static void render_black(char *image, int image_size, int bpp)
-+{
-+	if (bpp == 4) {
-+		uint32_t *p = (uint32_t *)image;
-+		image_size /= 4;
-+		while (image_size--)
-+			*p++ = 0x000000ff;
-+	} else
-+		memset(image, 0x55, image_size);
-+}
-+
-+static void render_green(char *image, int image_size, int bpp)
-+{
-+	if (bpp == 4) {
-+		uint32_t *p = (uint32_t *)image;
-+		image_size /= 4;
-+		while (image_size--)
-+			*p++ = 0xffff0000;
-+	} else
-+		memset(image, 0xaa, image_size);
-+}
-+
-+static void render_white(char *image, int image_size, int bpp)
-+{
-+	memset(image, 0xff, image_size);
-+}
-+
-+static GlyphSet create_glyphs(Display *dpy, int format_id)
-+{
-+#define N_GLYPHS 4
-+	XRenderPictFormat *format;
-+	XGlyphInfo glyph = { 8, 8, 0, 0, 8, 0 };
-+	char image[4*8*8];
-+	GlyphSet glyphset;
-+	Glyph gid;
-+	int image_size;
-+	int bpp;
-+	int n;
-+
-+	format = XRenderFindStandardFormat(dpy, format_id);
-+	if (format == NULL)
-+		return 0;
-+
-+	switch (format_id) {
-+	case PictStandardARGB32:
-+	case PictStandardRGB24:
-+		image_size = 4 * 8 * 8;
-+		bpp = 4;
-+		break;
-+	case PictStandardA8:
-+	case PictStandardA4:
-+		image_size = 8 * 8;
-+		bpp = 1;
-+		break;
-+	case PictStandardA1:
-+		image_size = 8;
-+		bpp = 0;
-+		break;
-+	default:
-+		return 0;
-+	}
-+
-+	glyphset = XRenderCreateGlyphSet(dpy, format);
-+	for (n = 0; n < N_GLYPHS; n++) {
-+		gid = n;
-+
-+		switch (n) {
-+		case 0: render_clear(image, image_size, bpp); break;
-+		case 1: render_black(image, image_size, bpp); break;
-+		case 2: render_green(image, image_size, bpp); break;
-+		case 3: render_white(image, image_size, bpp); break;
-+		}
-+
-+		XRenderAddGlyphs(dpy, glyphset,
-+				 &gid, &glyph, 1, image, image_size);
-+	}
-+
-+	return glyphset;
-+}
-+
-+static const char *glyph_name(int n)
-+{
-+	switch (n) {
-+	case 0: return "clear";
-+	case 1: return "black";
-+	case 2: return "green";
-+	case 3: return "white";
-+	default: return "unknown";
-+	}
-+}
-+
-+static bool glyph_iter_next(struct glyph_iter *gi)
-+{
-+restart:
-+	if (gi->stage == GLYPHS) {
-+		if (++gi->glyph_format == PictStandardNUM)
-+			return false;
-+
-+		if (gi->out.glyphset)
-+			XRenderFreeGlyphSet(gi->out.dpy->dpy,
-+					    gi->out.glyphset);
-+		gi->out.glyphset = create_glyphs(gi->out.dpy->dpy,
-+					       gi->glyph_format);
-+
-+		if (gi->ref.glyphset)
-+			XRenderFreeGlyphSet(gi->ref.dpy->dpy,
-+					    gi->ref.glyphset);
-+		gi->ref.glyphset = create_glyphs(gi->ref.dpy->dpy,
-+					       gi->glyph_format);
-+
-+		gi->stage++;
-+	}
-+
-+	if (gi->stage == OP) {
-+		do {
-+			if (++gi->op == 255)
-+				goto reset_op;
-+		} while (!check_op(gi->out.dpy, gi->op, &gi->out.tt) ||
-+			 !check_op(gi->ref.dpy, gi->op, &gi->ref.tt));
-+
-+		gi->stage++;
-+	}
-+
-+	if (gi->stage == DST) {
-+		if (++gi->dst_color == ARRAY_SIZE(colors))
-+			goto reset_dst;
-+
-+		gi->stage++;
-+	}
-+
-+	if (gi->stage == SRC) {
-+		if (++gi->src_color == ARRAY_SIZE(colors))
-+			goto reset_src;
-+
-+		if (gi->ref.src)
-+			XRenderFreePicture(gi->ref.dpy->dpy, gi->ref.src);
-+		gi->ref.src = XRenderCreateSolidFill(gi->ref.dpy->dpy,
-+						     &colors[gi->src_color]);
-+
-+		if (gi->out.src)
-+			XRenderFreePicture(gi->out.dpy->dpy, gi->out.src);
-+		gi->out.src = XRenderCreateSolidFill(gi->out.dpy->dpy,
-+						     &colors[gi->src_color]);
-+
-+		gi->stage++;
-+	}
-+
-+	if (gi->stage == MASK) {
-+		if (++gi->mask_format > PictStandardNUM)
-+			goto reset_mask;
-+
-+		if (gi->mask_format == PictStandardRGB24)
-+			gi->mask_format++;
-+
-+		if (gi->mask_format < PictStandardNUM) {
-+			gi->out.mask_format = XRenderFindStandardFormat(gi->out.dpy->dpy,
-+									gi->mask_format);
-+			gi->ref.mask_format = XRenderFindStandardFormat(gi->ref.dpy->dpy,
-+									gi->mask_format);
-+		} else {
-+			gi->out.mask_format = NULL;
-+			gi->ref.mask_format = NULL;
-+		}
-+
-+		gi->stage++;
-+	}
-+
-+	if (gi->stage == CLIP) {
-+		if (++gi->clip == ARRAY_SIZE(clips))
-+			goto reset_clip;
-+
-+		gi->stage++;
-+	}
-+
-+	gi->stage--;
-+	return true;
-+
-+reset_op:
-+	gi->op = -1;
-+reset_dst:
-+	gi->dst_color = -1;
-+reset_src:
-+	gi->src_color = -1;
-+reset_mask:
-+	gi->mask_format = -1;
-+reset_clip:
-+	gi->clip = -1;
-+	gi->stage--;
-+	goto restart;
-+}
-+
-+static void glyph_iter_fini(struct glyph_iter *gi)
-+{
-+	if (gi->out.glyphset)
-+		XRenderFreeGlyphSet (gi->out.dpy->dpy, gi->out.glyphset);
-+	if (gi->ref.glyphset)
-+		XRenderFreeGlyphSet (gi->ref.dpy->dpy, gi->ref.glyphset);
-+
-+	test_target_destroy_render(gi->out.dpy, &gi->out.tt);
-+	test_target_destroy_render(gi->ref.dpy, &gi->ref.tt);
-+}
-+
-+static const char *stdformat_to_str(int id)
-+{
-+	switch (id) {
-+	case PictStandardARGB32: return "ARGB32";
-+	case PictStandardRGB24: return "RGB24";
-+	case PictStandardA8: return "A8";
-+	case PictStandardA4: return "A4";
-+	case PictStandardA1: return "A1";
-+	default: return "none";
-+	}
-+}
-+
-+static char *glyph_iter_to_string(struct glyph_iter *gi,
-+				  const char *format,
-+				  ...)
-+{
-+	static char buf[100];
-+	va_list ap;
-+	int len;
-+
-+	len = sprintf(buf, "glyphs=%s, op=%d, dst=%08x, src=%08x, mask=%s",
-+		      stdformat_to_str(gi->glyph_format), gi->op,
-+		      xrender_color(&colors[gi->dst_color]),
-+		      xrender_color(&colors[gi->src_color]),
-+		      stdformat_to_str(gi->mask_format));
-+
-+	if (format) {
-+		buf[len++] = ' ';
-+		va_start(ap, format);
-+		vsprintf(buf+len, format, ap);
-+		va_end(ap);
-+	}
-+
-+	return buf;
-+}
-+
-+static void single(struct test *t, enum target target)
-+{
-+	struct glyph_iter gi;
-+	int n;
-+
-+	printf("Testing single glyph (%s): ", test_target_name(target));
-+	fflush(stdout);
-+
-+	glyph_iter_init(&gi, t, target);
-+	while (glyph_iter_next(&gi)) {
-+		XGlyphElt8 elt;
-+		char id[N_GLYPHS];
-+
-+		for (n = 0; n < N_GLYPHS; n++) {
-+			id[n] = n;
-+
-+			elt.chars = &id[n];
-+			elt.nchars = 1;
-+			elt.xOff = 0;
-+			elt.yOff = 0;
-+
-+			clear(gi.out.dpy, &gi.out.tt, &colors[gi.dst_color]);
-+			elt.glyphset = gi.out.glyphset;
-+			XRenderCompositeText8 (gi.out.dpy->dpy, gi.op,
-+					       gi.out.src,
-+					       gi.out.tt.picture,
-+					       gi.out.mask_format,
-+					       0, 0,
-+					       0, 8,
-+					       &elt, 1);
-+
-+			clear(gi.ref.dpy, &gi.ref.tt, &colors[gi.dst_color]);
-+			elt.glyphset = gi.ref.glyphset;
-+			XRenderCompositeText8 (gi.ref.dpy->dpy, gi.op,
-+					       gi.ref.src,
-+					       gi.ref.tt.picture,
-+					       gi.ref.mask_format,
-+					       0, 0,
-+					       0, 8,
-+					       &elt, 1);
-+			test_compare(t,
-+				     gi.out.tt.draw, gi.out.tt.format,
-+				     gi.ref.tt.draw, gi.ref.tt.format,
-+				     0, 0, gi.out.tt.width, gi.out.tt.height,
-+				     glyph_iter_to_string(&gi,
-+							  "glyph=%s",
-+							  glyph_name(n)));
-+		}
-+
-+		elt.chars = &id[0];
-+		elt.nchars = n;
-+		clear(gi.out.dpy, &gi.out.tt, &colors[gi.dst_color]);
-+		elt.glyphset = gi.out.glyphset;
-+		XRenderCompositeText8 (gi.out.dpy->dpy, gi.op,
-+				       gi.out.src,
-+				       gi.out.tt.picture,
-+				       gi.out.mask_format,
-+				       0, 0,
-+				       0, 8,
-+				       &elt, 1);
-+
-+		clear(gi.ref.dpy, &gi.ref.tt, &colors[gi.dst_color]);
-+		elt.glyphset = gi.ref.glyphset;
-+		XRenderCompositeText8 (gi.ref.dpy->dpy, gi.op,
-+				       gi.ref.src,
-+				       gi.ref.tt.picture,
-+				       gi.ref.mask_format,
-+				       0, 0,
-+				       0, 8,
-+				       &elt, 1);
-+		test_compare(t,
-+			     gi.out.tt.draw, gi.out.tt.format,
-+			     gi.ref.tt.draw, gi.ref.tt.format,
-+			     0, 0, gi.out.tt.width, gi.out.tt.height,
-+			     glyph_iter_to_string(&gi, "all"));
-+	}
-+	glyph_iter_fini(&gi);
-+}
-+
-+int main(int argc, char **argv)
-+{
-+	struct test test;
-+	int t;
-+
-+	test_init(&test, argc, argv);
-+	XSetErrorHandler(_check_error_handler);
-+
-+	for (t = TARGET_FIRST; t <= TARGET_LAST; t++) {
-+		single(&test, t);
-+		//overlapping(&test, t);
-+		//gap(&test, t);
-+		//mixed(&test, t);
-+	}
-+
-+	return 0;
-+}
-diff --git a/test/render-trapezoid.c b/test/render-trapezoid.c
-index cd990143..f15a78e3 100644
---- a/test/render-trapezoid.c
-+++ b/test/render-trapezoid.c
-@@ -403,16 +403,141 @@ static void trap_tests(struct test *t,
- 	free(traps);
- }
- 
-+enum edge {
-+	EDGE_SHARP = PolyEdgeSharp,
-+	EDGE_SMOOTH,
-+};
-+
-+static const char *edge_name(enum edge edge)
-+{
-+	switch (edge) {
-+	default:
-+	case EDGE_SHARP: return "sharp";
-+	case EDGE_SMOOTH: return "smooth";
-+	}
-+}
-+
-+static void set_edge(Display *dpy, Picture p, enum edge edge)
-+{
-+	XRenderPictureAttributes a;
-+
-+	a.poly_edge = edge;
-+	XRenderChangePicture(dpy, p, CPPolyEdge, &a);
-+}
-+
-+static void edge_test(struct test *t,
-+		      enum mask mask,
-+		      enum edge edge,
-+		      enum target target)
-+{
-+	struct test_target out, ref;
-+	XRenderColor white = { 0xffff, 0xffff, 0xffff, 0xffff };
-+	Picture src_ref, src_out;
-+	XTrapezoid trap;
-+	int left_or_right, p;
-+
-+	test_target_create_render(&t->out, target, &out);
-+	set_edge(t->out.dpy, out.picture, edge);
-+	src_out = XRenderCreateSolidFill(t->out.dpy, &white);
-+
-+	test_target_create_render(&t->ref, target, &ref);
-+	set_edge(t->ref.dpy, ref.picture, edge);
-+	src_ref = XRenderCreateSolidFill(t->ref.dpy, &white);
-+
-+	printf("Testing edges (with mask %s and %s edges) (%s): ",
-+	       mask_name(mask),
-+	       edge_name(edge),
-+	       test_target_name(target));
-+	fflush(stdout);
-+
-+	for (left_or_right = 0; left_or_right <= 1; left_or_right++) {
-+		for (p = -64; p <= out.width + 64; p++) {
-+			char buf[80];
-+
-+			if (left_or_right) {
-+				trap.left.p1.x = 0;
-+				trap.left.p1.y = 0;
-+				trap.left.p2.x = 0;
-+				trap.left.p2.y = out.height << 16;
-+
-+				trap.right.p1.x = p << 16;
-+				trap.right.p1.y = 0;
-+				trap.right.p2.x = out.width << 16;
-+				trap.right.p2.y = out.height << 16;
-+			} else {
-+				trap.right.p1.x = out.width << 16;
-+				trap.right.p1.y = 0;
-+				trap.right.p2.x = out.width << 16;
-+				trap.right.p2.y = out.height << 16;
-+
-+				trap.left.p1.x = 0;
-+				trap.left.p1.y = 0;
-+				trap.left.p2.x = p << 16;
-+				trap.left.p2.y = out.height << 16;
-+			}
-+
-+			trap.top = 0;
-+			trap.bottom = out.height << 16;
-+
-+			sprintf(buf,
-+				"trap=((%d, %d), (%d, %d)), ((%d, %d), (%d, %d))\n",
-+				trap.left.p1.x >> 16, trap.left.p1.y >> 16,
-+				trap.left.p2.x >> 16, trap.left.p2.y >> 16,
-+				trap.right.p1.x >> 16, trap.right.p1.y >> 16,
-+				trap.right.p2.x >> 16, trap.right.p2.y >> 16);
-+
-+			clear(&t->out, &out);
-+			XRenderCompositeTrapezoids(t->out.dpy,
-+						   PictOpSrc,
-+						   src_out,
-+						   out.picture,
-+						   mask_format(t->out.dpy, mask),
-+						   0, 0,
-+						   &trap, 1);
-+
-+			clear(&t->ref, &ref);
-+			XRenderCompositeTrapezoids(t->ref.dpy,
-+						   PictOpSrc,
-+						   src_ref,
-+						   ref.picture,
-+						   mask_format(t->ref.dpy, mask),
-+						   0, 0,
-+						   &trap, 1);
-+
-+			test_compare(t,
-+				     out.draw, out.format,
-+				     ref.draw, ref.format,
-+				     0, 0, out.width, out.height,
-+				     buf);
-+		}
-+	}
-+
-+	XRenderFreePicture(t->out.dpy, src_out);
-+	test_target_destroy_render(&t->out, &out);
-+
-+	XRenderFreePicture(t->ref.dpy, src_ref);
-+	test_target_destroy_render(&t->ref, &ref);
-+
-+	printf("pass\n");
-+}
-+
- int main(int argc, char **argv)
- {
- 	struct test test;
- 	int i, dx, dy;
- 	enum target target;
- 	enum mask mask;
-+	enum edge edge;
- 	enum trapezoid trapezoid;
- 
- 	test_init(&test, argc, argv);
- 
-+	for (target = TARGET_FIRST; target <= TARGET_LAST; target++) {
-+		for (mask = MASK_NONE; mask <= MASK_A8; mask++)
-+			for (edge = EDGE_SHARP; edge <= EDGE_SMOOTH; edge++)
-+				edge_test(&test, mask, edge, target);
-+	}
-+
- 	for (i = 0; i <= DEFAULT_ITERATIONS; i++) {
- 		int reps = REPS(i), sets = SETS(i);
- 
-diff --git a/test/render-triangle.c b/test/render-triangle.c
-new file mode 100644
-index 00000000..165834ce
---- /dev/null
-+++ b/test/render-triangle.c
-@@ -0,0 +1,180 @@
-+#include <stdint.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#include "test.h"
-+
-+enum edge {
-+	EDGE_SHARP = PolyEdgeSharp,
-+	EDGE_SMOOTH,
-+};
-+
-+static void set_edge(Display *dpy, Picture p, enum edge edge)
-+{
-+	XRenderPictureAttributes a;
-+
-+	a.poly_edge = edge;
-+	XRenderChangePicture(dpy, p, CPPolyEdge, &a);
-+}
-+
-+static XRenderPictFormat *mask_format(Display *dpy, enum mask mask)
-+{
-+	switch (mask) {
-+	default:
-+	case MASK_NONE: return NULL;
-+	case MASK_A1: return XRenderFindStandardFormat(dpy, PictStandardA1);
-+	case MASK_A8: return XRenderFindStandardFormat(dpy, PictStandardA8);
-+	}
-+}
-+
-+static const char *mask_name(enum mask mask)
-+{
-+	switch (mask) {
-+	default:
-+	case MASK_NONE: return "none";
-+	case MASK_A1: return "a1";
-+	case MASK_A8: return "a8";
-+	}
-+}
-+
-+static const char *edge_name(enum edge edge)
-+{
-+	switch (edge) {
-+	default:
-+	case EDGE_SHARP: return "sharp";
-+	case EDGE_SMOOTH: return "smooth";
-+	}
-+}
-+
-+static void clear(struct test_display *dpy, struct test_target *tt)
-+{
-+	XRenderColor render_color = {0};
-+	XRenderFillRectangle(dpy->dpy, PictOpClear, tt->picture, &render_color,
-+			     0, 0, tt->width, tt->height);
-+}
-+
-+static void step_to_point(int step, int width, int height, XPointFixed *p)
-+{
-+	do {
-+		p->x = (step - 64) << 16;
-+		p->y = -64 << 16;
-+
-+		step -= width - 128;
-+		if (step <= 0)
-+			return;
-+
-+		p->x = (width + 64) << 16;
-+		p->y = (step - 64) << 16;
-+		step -= height - 128;
-+
-+		if (step <= 0)
-+			return;
-+
-+		p->x = (width + 64 - step) << 16;
-+		p->y = (height + 64) << 16;
-+		step -= width - 128;
-+
-+		if (step <= 0)
-+			return;
-+
-+		p->x = -64 << 16;
-+		p->y = (height + 64 - step) << 16;
-+		step -= height - 128;
-+	} while (step > 0);
-+}
-+
-+static void edge_test(struct test *t,
-+		      enum mask mask,
-+		      enum edge edge,
-+		      enum target target)
-+{
-+	struct test_target out, ref;
-+	XRenderColor white = { 0xffff, 0xffff, 0xffff, 0xffff };
-+	Picture src_ref, src_out;
-+	XTriangle tri;
-+	unsigned step, max;
-+
-+	test_target_create_render(&t->out, target, &out);
-+	set_edge(t->out.dpy, out.picture, edge);
-+	src_out = XRenderCreateSolidFill(t->out.dpy, &white);
-+
-+	test_target_create_render(&t->ref, target, &ref);
-+	set_edge(t->ref.dpy, ref.picture, edge);
-+	src_ref = XRenderCreateSolidFill(t->ref.dpy, &white);
-+
-+	printf("Testing edges (with mask %s and %s edges) (%s): ",
-+	       mask_name(mask),
-+	       edge_name(edge),
-+	       test_target_name(target));
-+	fflush(stdout);
-+
-+	max = 2*(out.width + 128 + out.height+128);
-+	step = 0;
-+	for (step = 0; step <= max; step++) {
-+		char buf[80];
-+
-+		step_to_point(step, out.width, out.height, &tri.p1);
-+		step_to_point(step + out.width + 128,
-+			      out.width, out.height,
-+			      &tri.p2);
-+		step_to_point(step + out.height + 128 + 2*(out.width + 128),
-+			      out.width, out.height,
-+			      &tri.p3);
-+
-+		sprintf(buf,
-+			"tri=((%d, %d), (%d, %d), (%d, %d))\n",
-+			tri.p1.x >> 16, tri.p1.y >> 16,
-+			tri.p2.x >> 16, tri.p2.y >> 16,
-+			tri.p3.x >> 16, tri.p3.y >> 16);
-+
-+		clear(&t->out, &out);
-+		XRenderCompositeTriangles(t->out.dpy,
-+					  PictOpSrc,
-+					  src_out,
-+					  out.picture,
-+					  mask_format(t->out.dpy, mask),
-+					  0, 0,
-+					  &tri, 1);
-+
-+		clear(&t->ref, &ref);
-+		XRenderCompositeTriangles(t->ref.dpy,
-+					  PictOpSrc,
-+					  src_ref,
-+					  ref.picture,
-+					  mask_format(t->ref.dpy, mask),
-+					  0, 0,
-+					  &tri, 1);
-+
-+		test_compare(t,
-+			     out.draw, out.format,
-+			     ref.draw, ref.format,
-+			     0, 0, out.width, out.height,
-+			     buf);
-+	}
-+
-+	XRenderFreePicture(t->out.dpy, src_out);
-+	test_target_destroy_render(&t->out, &out);
-+
-+	XRenderFreePicture(t->ref.dpy, src_ref);
-+	test_target_destroy_render(&t->ref, &ref);
-+
-+	printf("pass\n");
-+}
-+
-+int main(int argc, char **argv)
-+{
-+	struct test test;
-+	enum target target;
-+	enum mask mask;
-+	enum edge edge;
-+
-+	test_init(&test, argc, argv);
-+
-+	for (target = TARGET_FIRST; target <= TARGET_LAST; target++) {
-+		for (mask = MASK_NONE; mask <= MASK_A8; mask++)
-+			for (edge = EDGE_SHARP; edge <= EDGE_SMOOTH; edge++)
-+				edge_test(&test, mask, edge, target);
-+	}
-+
-+	return 0;
-+}
-diff --git a/test/test.h b/test/test.h
-index a3ef979d..9eec1cf9 100644
---- a/test/test.h
-+++ b/test/test.h
-@@ -107,6 +107,15 @@ static inline uint32_t color(uint8_t red, uint8_t green, uint8_t blue, uint8_t a
- 	return alpha << 24 | ra >> 8 << 16 | ga >> 8 << 8 | ba >> 8;
- }
- 
-+static inline uint32_t xrender_color(const XRenderColor *c)
-+{
-+	uint32_t ra = c->red * c->alpha;
-+	uint32_t ga = c->green * c->alpha;
-+	uint32_t ba = c->blue * c->alpha;
-+
-+	return c->alpha >> 8 << 24 | ra >> 24 << 16 | ga >> 24 << 8 | ba >> 24;
-+}
-+
- void test_timer_start(struct test_display *t, struct timespec *tv);
- double test_timer_stop(struct test_display *t, struct timespec *tv);
- 
-diff --git a/test/test_image.c b/test/test_image.c
-index d15a8af8..1c076990 100644
---- a/test/test_image.c
-+++ b/test/test_image.c
-@@ -197,13 +197,10 @@ void test_compare(struct test *t,
- 		  const char *info)
- {
- 	XImage out_image, ref_image;
--	Pixmap tmp;
--	char *out, *ref;
-+	uint32_t *out, *ref;
- 	char buf[600];
- 	uint32_t mask;
- 	int i, j;
--	XGCValues gcv;
--	GC gc;
- 
- 	if (w * h * 4 > t->out.max_shm_size)
- 		return test_compare_fallback(t,
-@@ -214,37 +211,24 @@ void test_compare(struct test *t,
- 	test_init_image(&out_image, &t->out.shm, out_format, w, h);
- 	test_init_image(&ref_image, &t->ref.shm, ref_format, w, h);
- 
--	gcv.graphics_exposures = 0;
--
- 	die_unless(out_image.depth == ref_image.depth);
- 	die_unless(out_image.bits_per_pixel == ref_image.bits_per_pixel);
- 	die_unless(out_image.bits_per_pixel == 32);
- 
--	mask = depth_mask(out_image.depth);
-+	XShmGetImage(t->out.dpy, out_draw, &out_image, x, y, AllPlanes);
-+	out = (uint32_t *)out_image.data;
- 
--	tmp = XCreatePixmap(t->out.dpy, out_draw, w, h, out_image.depth);
--	gc = XCreateGC(t->out.dpy, tmp, GCGraphicsExposures, &gcv);
--	XCopyArea(t->out.dpy, out_draw, tmp, gc, x, y, w, h, 0, 0);
--	XShmGetImage(t->out.dpy, tmp, &out_image, 0, 0, AllPlanes);
--	XFreeGC(t->out.dpy, gc);
--	XFreePixmap(t->out.dpy, tmp);
--	out = out_image.data;
--
--	tmp = XCreatePixmap(t->ref.dpy, ref_draw, w, h, ref_image.depth);
--	gc = XCreateGC(t->ref.dpy, tmp, GCGraphicsExposures, &gcv);
--	XCopyArea(t->ref.dpy, ref_draw, tmp, gc, x, y, w, h, 0, 0);
--	XShmGetImage(t->ref.dpy, tmp, &ref_image, 0, 0, AllPlanes);
--	XFreeGC(t->ref.dpy, gc);
--	XFreePixmap(t->ref.dpy, tmp);
--	ref = ref_image.data;
-+	XShmGetImage(t->ref.dpy, ref_draw, &ref_image, x, y, AllPlanes);
-+	ref = (uint32_t *)ref_image.data;
- 
- 	/* Start with an exact comparison. However, one quicky desires
- 	 * a fuzzy comparator to hide hardware inaccuracies...
- 	 */
-+	mask = depth_mask(out_image.depth);
- 	for (j = 0; j < h; j++) {
- 		for (i = 0; i < w; i++) {
--			uint32_t a = ((uint32_t *)out)[i] & mask;
--			uint32_t b = ((uint32_t *)ref)[i] & mask;
-+			uint32_t a = out[i] & mask;
-+			uint32_t b = ref[i] & mask;
- 			if (a != b && pixel_difference(a, b) > MAX_DELTA) {
- 				show_pixels(buf,
- 					    &out_image, &ref_image,
-@@ -255,8 +239,8 @@ void test_compare(struct test *t,
- 				    x,i, y,j, a, b, pixel_difference(a, b), buf, info);
- 			}
- 		}
--		out += out_image.bytes_per_line;
--		ref += ref_image.bytes_per_line;
-+		out = (uint32_t *)((char *)out + out_image.bytes_per_line);
-+		ref = (uint32_t *)((char *)ref + ref_image.bytes_per_line);
- 	}
- }
- 
-diff --git a/test/xvidmode.c b/test/xvidmode.c
-new file mode 100644
-index 00000000..5cde8286
---- /dev/null
-+++ b/test/xvidmode.c
-@@ -0,0 +1,54 @@
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <X11/Xlib.h>
-+#include <X11/extensions/xf86vmode.h>
-+
-+int main(void)
-+{
-+	Display *dpy;
-+	XF86VidModeModeLine current;
-+	XF86VidModeModeInfo **modes;
-+	int num_modes, i;
-+	int saved_mode = -1;
-+	int dotclock;
-+
-+	dpy = XOpenDisplay(NULL);
-+	if (dpy == NULL)
-+		dpy = XOpenDisplay(":0");
-+
-+	XF86VidModeGetModeLine(dpy, DefaultScreen(dpy), &dotclock, &current);
-+	XF86VidModeGetAllModeLines(dpy, XDefaultScreen(dpy),
-+				   &num_modes, &modes);
-+	for (i = 0; i < num_modes; i++) {
-+		int this;
-+
-+		this = (current.hdisplay == modes[i]->hdisplay &&
-+			current.vdisplay == modes[i]->vdisplay &&
-+			dotclock == modes[i]->dotclock);
-+		if (this && saved_mode == -1)
-+			saved_mode = i;
-+
-+		printf("[%d] %dx%d%s\n",
-+		       i,
-+		       modes[i]->hdisplay,
-+		       modes[i]->vdisplay,
-+		       this ? "*" : "");
-+	}
-+
-+	for (i = 0; i < num_modes; i++) {
-+		printf("Switching to mode %dx%d\n",
-+		       modes[i]->hdisplay,
-+		       modes[i]->vdisplay);
-+		XF86VidModeSwitchToMode(dpy, XDefaultScreen(dpy), modes[i]);
-+		XSync(dpy, True);
-+	}
-+
-+	if (saved_mode != -1) {
-+		XF86VidModeSwitchToMode(dpy, XDefaultScreen(dpy),
-+					modes[saved_mode]);
-+		XFlush(dpy);
-+	}
-+
-+	return 0;
-+}
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index b5de2c96..92df266b 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -26,13 +26,30 @@ AM_CFLAGS = \
- drivermandir = $(DRIVER_MAN_DIR)
- policydir = $(datarootdir)/polkit-1/actions
- 
-+bin_PROGRAMS =
-+noinst_PROGRAMS =
-+libexec_PROGRAMS =
-+
- if BUILD_TOOLS
--bin_PROGRAMS = intel-virtual-output
-+bin_PROGRAMS += intel-virtual-output
- driverman_DATA = intel-virtual-output.$(DRIVER_MAN_SUFFIX)
- endif
- 
-+if BUILD_TOOL_CURSOR
-+noinst_PROGRAMS += cursor
-+cursor_CFLAGS = $(TOOL_CURSOR_CFLAGS)
-+cursor_LDADD = $(TOOL_CURSOR_LIBS)
-+endif
-+
-+if X11_DRI3
-+noinst_PROGRAMS += dri3info
-+dri3info_SOURCES = dri3info.c
-+dri3info_CFLAGS = $(X11_DRI3_CFLAGS) $(DRI_CFLAGS)
-+dri3info_LDADD = $(X11_DRI3_LIBS) $(DRI_LIBS)
-+endif
-+
- if BUILD_BACKLIGHT_HELPER
--libexec_PROGRAMS = xf86-video-intel-backlight-helper
-+libexec_PROGRAMS += xf86-video-intel-backlight-helper
- nodist_policy_DATA = org.x.xf86-video-intel.backlight-helper.policy
- 
- backlight_helper = $(libexecdir)/xf86-video-intel-backlight-helper
-diff --git a/tools/backlight_helper.c b/tools/backlight_helper.c
-index 8b2667dc..aadb8fac 100644
---- a/tools/backlight_helper.c
-+++ b/tools/backlight_helper.c
-@@ -1,3 +1,7 @@
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <string.h>
- #include <stdarg.h>
-@@ -9,6 +13,12 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-+#if MAJOR_IN_MKDEV
-+#include <sys/mkdev.h>
-+#elif MAJOR_IN_SYSMACROS
-+#include <sys/sysmacros.h>
-+#endif
-+
- #define DBG 0
- 
- #if defined(__GNUC__) && (__GNUC__ > 3)
-diff --git a/tools/cursor.c b/tools/cursor.c
-new file mode 100644
-index 00000000..6a2438ad
---- /dev/null
-+++ b/tools/cursor.c
-@@ -0,0 +1,127 @@
-+/*
-+ * Copyright © 2015 Intel Corporation
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-+ * IN THE SOFTWARE.
-+ *
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <X11/Xlib.h>
-+#include <X11/extensions/Xfixes.h>
-+
-+#include <stdint.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <png.h>
-+
-+int main(int argc, char **argv)
-+{
-+	Display *dpy;
-+	XFixesCursorImage *cur;
-+	unsigned long *src; /* XXX deep sigh */
-+	unsigned x, y;
-+	png_struct *png;
-+	png_info *info;
-+	png_byte **rows;
-+	FILE *file;
-+
-+	dpy = XOpenDisplay(NULL);
-+	if (dpy == NULL)
-+		return 1;
-+
-+	if (!XFixesQueryExtension(dpy, (int *)&x, (int *)&y))
-+		return 1;
-+
-+	cur = XFixesGetCursorImage(dpy);
-+	if (cur == NULL)
-+		return 1;
-+
-+	printf("Cursor on display '%s': %dx%d, (hotspot %dx%d)\n",
-+	       DisplayString(dpy),
-+	       cur->width, cur->height,
-+	       cur->xhot, cur->yhot);
-+
-+	if (1) {
-+		int x, y;
-+
-+		src = cur->pixels;
-+		for (y = 0; y < cur->height; y++) {
-+			for (x = 0; x < cur->width; x++) {
-+				if (x == cur->xhot && y == cur->yhot)
-+					printf("+");
-+				else
-+					printf("%c", *src ? *src >> 24 >= 127 ? 'x' : '.' : ' ');
-+				src++;
-+			}
-+			printf("\n");
-+		}
-+	}
-+
-+	file = fopen("cursor.png", "wb");
-+	if (file == NULL)
-+		return 2;
-+
-+	png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-+	info = png_create_info_struct(png);
-+	png_init_io(png, file);
-+	png_set_IHDR(png, info,
-+		     cur->width, cur->height, 8,
-+		     PNG_COLOR_TYPE_RGB_ALPHA,
-+		     PNG_INTERLACE_NONE,
-+		     PNG_COMPRESSION_TYPE_DEFAULT,
-+		     PNG_FILTER_TYPE_DEFAULT);
-+	png_write_info(png, info);
-+
-+	src = cur->pixels;
-+	rows = malloc(cur->height*sizeof(png_byte*));
-+	if (rows == NULL)
-+		return 3;
-+
-+	for (y = 0; y < cur->height; y++) {
-+		rows[y] = malloc(cur->width * 4);
-+		for (x = 0; x < cur->width; x++) {
-+			uint32_t p = *src++;
-+			uint8_t r = p >> 0;
-+			uint8_t g = p >> 8;
-+			uint8_t b = p >> 16;
-+			uint8_t a = p >> 24;
-+
-+			if (a > 0x00 && a < 0xff) {
-+				r = (r * 0xff + a /2) / a;
-+				g = (g * 0xff + a /2) / a;
-+				b = (b * 0xff + a /2) / a;
-+			}
-+
-+			rows[y][4*x + 0] = b;
-+			rows[y][4*x + 1] = g;
-+			rows[y][4*x + 2] = r;
-+			rows[y][4*x + 3] = a;
-+		}
-+	}
-+
-+	png_write_image(png, rows);
-+	png_write_end(png, NULL);
-+	fclose(file);
-+
-+	return 0;
-+}
-diff --git a/tools/dri3info.c b/tools/dri3info.c
-new file mode 100644
-index 00000000..0c33fc5a
---- /dev/null
-+++ b/tools/dri3info.c
-@@ -0,0 +1,329 @@
-+/*
-+ * Copyright (c) 2015 Intel Corporation
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ *
-+ * To compile standalone: gcc -o dri3info dri3info.c `pkg-config --cflags --libs xcb-dri3 x11-xcb xrandr xxf86vm libdrm`
-+ */
-+
-+#include <X11/Xlib.h>
-+#include <X11/Xlib-xcb.h>
-+#include <xcb/xcb.h>
-+#include <xcb/dri3.h>
-+#include <unistd.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <stdint.h>
-+#include <string.h>
-+#include <sys/stat.h>
-+#include <drm.h>
-+#include <xf86drm.h>
-+
-+#include <X11/extensions/Xrandr.h>
-+#include <X11/extensions/xf86vmode.h>
-+
-+static int dri3_query_version(Display *dpy, int *major, int *minor)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	xcb_dri3_query_version_reply_t *reply;
-+	xcb_generic_error_t *error;
-+
-+	*major = *minor = -1;
-+
-+	reply = xcb_dri3_query_version_reply(c,
-+					     xcb_dri3_query_version(c,
-+								    XCB_DRI3_MAJOR_VERSION,
-+								    XCB_DRI3_MINOR_VERSION),
-+					     &error);
-+	free(error);
-+	if (reply == NULL)
-+		return -1;
-+
-+	*major = reply->major_version;
-+	*minor = reply->minor_version;
-+	free(reply);
-+
-+	return 0;
-+}
-+
-+static int dri3_exists(Display *dpy)
-+{
-+	const xcb_query_extension_reply_t *ext;
-+	int major, minor;
-+
-+	ext = xcb_get_extension_data(XGetXCBConnection(dpy), &xcb_dri3_id);
-+	if (ext == NULL || !ext->present)
-+		return 0;
-+
-+	if (dri3_query_version(dpy, &major, &minor) < 0)
-+		return 0;
-+
-+	return major >= 0;
-+}
-+
-+static int dri3_open(Display *dpy)
-+{
-+	xcb_connection_t *c = XGetXCBConnection(dpy);
-+	xcb_dri3_open_cookie_t cookie;
-+	xcb_dri3_open_reply_t *reply;
-+
-+	if (!dri3_exists(dpy))
-+		return -1;
-+
-+	cookie = xcb_dri3_open(c, RootWindow(dpy, DefaultScreen(dpy)), None);
-+	reply = xcb_dri3_open_reply(c, cookie, NULL);
-+
-+	if (!reply)
-+		return -1;
-+
-+	if (reply->nfd != 1)
-+		return -1;
-+
-+	return xcb_dri3_open_reply_fds(c, reply)[0];
-+}
-+
-+static void get_device_path(int fd, char *buf, int len)
-+{
-+	struct stat remote, local;
-+	int i;
-+
-+	if (fstat(fd, &remote))
-+		goto out;
-+
-+	for (i = 0; i < 16; i++) {
-+		snprintf(buf, len, "/dev/dri/card%d", i);
-+		if (stat(buf, &local))
-+			continue;
-+
-+		if (local.st_mode == remote.st_mode &&
-+		    local.st_rdev == remote.st_rdev)
-+			return;
-+
-+		snprintf(buf, len, "/dev/dri/renderD%d", i + 128);
-+		if (stat(buf, &local))
-+			continue;
-+
-+		if (local.st_mode == remote.st_mode &&
-+		    local.st_rdev == remote.st_rdev)
-+			return;
-+	}
-+
-+out:
-+	strncpy(buf, "unknown path", len);
-+}
-+
-+static void get_driver_name(int fd, char *name, int len)
-+{
-+	drm_version_t version;
-+
-+	memset(name, 0, len);
-+	memset(&version, 0, sizeof(version));
-+	version.name_len = len;
-+	version.name = name;
-+
-+	(void)drmIoctl(fd, DRM_IOCTL_VERSION, &version);
-+}
-+
-+static int compute_refresh_rate_from_mode(long n, long d, unsigned flags,
-+					   int32_t *numerator,
-+					   int32_t *denominator)
-+{
-+	int i;
-+
-+	/* The mode flags are only defined privately to the Xserver (in xf86str.h)
-+	 * but they at least bit compatible between VidMode, RandR and DRM.
-+	 */
-+# define V_INTERLACE 0x010
-+# define V_DBLSCAN   0x020
-+
-+	if (flags & V_INTERLACE)
-+		n *= 2;
-+	else if (flags & V_DBLSCAN)
-+		d *= 2;
-+
-+	/* The OML_sync_control spec requires that if the refresh rate is a
-+	 * whole number, that the returned numerator be equal to the refresh
-+	 * rate and the denominator be 1.
-+	 */
-+
-+	if (n % d == 0) {
-+		n /= d;
-+		d = 1;
-+	}
-+	else {
-+		static const unsigned f[] = { 13, 11, 7, 5, 3, 2, 0 };
-+
-+		/* This is a poor man's way to reduce a fraction.  It's far from
-+		 * perfect, but it will work well enough for this situation.
-+		 */
-+
-+		for (i = 0; f[i] != 0; i++) {
-+			while (n % f[i] == 0 && d % f[i] == 0) {
-+				d /= f[i];
-+				n /= f[i];
-+			}
-+		}
-+	}
-+
-+	*numerator = n;
-+	*denominator = d;
-+	return 1;
-+}
-+
-+static int RRGetMscRate(Display *dpy, int32_t *numerator, int32_t *denominator)
-+{
-+	int ret = 0;
-+	Window root = RootWindow(dpy, DefaultScreen(dpy));
-+	XRRScreenResources *res;
-+	int rr_event, rr_error;
-+	RROutput primary;
-+	RRMode mode = 0;
-+	int n;
-+
-+	if (!XRRQueryExtension(dpy, &rr_event, &rr_error))
-+		return ret;
-+
-+	res = XRRGetScreenResourcesCurrent(dpy, root);
-+	if (res == NULL)
-+		return ret;
-+
-+	/* Use the primary output if specified, otherwise
-+	 * use the mode on the first enabled crtc.
-+	 */
-+	primary = XRRGetOutputPrimary(dpy, root);
-+	if (primary) {
-+		XRROutputInfo *output;
-+
-+		output = XRRGetOutputInfo(dpy, res, primary);
-+		if (output != NULL) {
-+			if (output->crtc) {
-+				XRRCrtcInfo *crtc;
-+
-+				crtc = XRRGetCrtcInfo(dpy, res, output->crtc);
-+				if (crtc) {
-+					mode = crtc->mode;
-+					XRRFreeCrtcInfo(crtc);
-+				}
-+			}
-+			XRRFreeOutputInfo(output);
-+		}
-+	}
-+
-+	for (n = 0; mode == 0 && n < res->ncrtc; n++) {
-+		XRRCrtcInfo *crtc;
-+
-+		crtc = XRRGetCrtcInfo(dpy, res, res->crtcs[n]);
-+		if (crtc) {
-+			mode = crtc->mode;
-+			XRRFreeCrtcInfo(crtc);
-+		}
-+	}
-+
-+	for (n = 0; n < res->nmode; n++) {
-+		if (res->modes[n].id == mode) {
-+			ret = compute_refresh_rate_from_mode(res->modes[n].dotClock,
-+							     res->modes[n].hTotal*res->modes[n].vTotal,
-+							     res->modes[n].modeFlags,
-+							     numerator, denominator);
-+			break;
-+		}
-+	}
-+
-+	XRRFreeScreenResources(res);
-+	return ret;
-+}
-+
-+static int VMGetMscRate(Display *dpy, int32_t *numerator, int32_t *denominator)
-+{
-+	XF86VidModeModeLine mode_line;
-+	int dot_clock;
-+	int i;
-+
-+	if (XF86VidModeQueryVersion(dpy, &i, &i) &&
-+	    XF86VidModeGetModeLine(dpy, DefaultScreen(dpy), &dot_clock, &mode_line))
-+		return compute_refresh_rate_from_mode(dot_clock * 1000,
-+						      mode_line.vtotal * mode_line.htotal,
-+						      mode_line.flags,
-+						      numerator, denominator);
-+
-+	return 0;
-+}
-+
-+static int get_refresh_rate(Display *dpy,
-+			     int32_t *numerator,
-+			     int32_t *denominator)
-+{
-+	if (RRGetMscRate(dpy, numerator, denominator))
-+		return 1;
-+
-+	if (VMGetMscRate(dpy, numerator, denominator))
-+		return 1;
-+
-+	return 0;
-+}
-+
-+static void info(const char *dpyname)
-+{
-+	Display *dpy;
-+	int device;
-+	int32_t numerator, denominator;
-+
-+	dpy = XOpenDisplay(dpyname);
-+	if (dpy == NULL) {
-+		printf("Unable to connect to display '%s'\n",
-+		       dpyname ?: getenv("DISPLAY") ?: "unset");
-+		return;
-+	}
-+
-+	printf("Display '%s'\n", DisplayString(dpy));
-+	device = dri3_open(dpy);
-+	if (device < 0) {
-+		printf("\tUnable to connect to DRI3\n");
-+	} else {
-+		char device_path[1024];
-+		char driver_name[1024];
-+
-+		get_device_path(device, device_path, sizeof(device_path));
-+		get_driver_name(device, driver_name, sizeof(driver_name));
-+
-+		printf("Connected to DRI3, using fd %d which matches %s, driver %s\n",
-+		       device, device_path, driver_name);
-+		close(device);
-+	}
-+
-+	if (get_refresh_rate(dpy, &numerator, &denominator))
-+		printf("\tPrimary refresh rate: %d/%d (%.1fHz)\n",
-+		       numerator, denominator, numerator/(float)denominator);
-+
-+	XCloseDisplay(dpy);
-+}
-+
-+int main(int argc, char **argv)
-+{
-+	int i;
-+
-+	if (argc > 1) {
-+		for (i = 1; i < argc; i++)
-+			info(argv[i]);
-+	} else
-+		info(NULL);
-+
-+	return 0;
-+}
-diff --git a/tools/virtual.c b/tools/virtual.c
-index 8e2b4a22..fc8db2b9 100644
---- a/tools/virtual.c
-+++ b/tools/virtual.c
-@@ -31,6 +31,7 @@
- 
- #include <X11/Xlibint.h>
- #include <X11/extensions/record.h>
-+#include <X11/extensions/scrnsaver.h>
- #include <X11/extensions/XShm.h>
- #if HAVE_X11_EXTENSIONS_SHMPROTO_H
- #include <X11/extensions/shmproto.h>
-@@ -79,13 +80,15 @@ static int verbose;
- #define DRAW 0x8
- #define DAMAGE 0x10
- #define CURSOR 0x20
--#define POLL 0x40
-+#define SCREEN 0x40
-+#define POLL 0x80
- 
- struct display {
- 	Display *dpy;
- 	struct clone *clone;
- 	struct context *ctx;
- 
-+	int saver_event, saver_error, saver_active;
- 	int damage_event, damage_error;
- 	int xfixes_event, xfixes_error;
- 	int rr_event, rr_error, rr_active;
-@@ -98,6 +101,7 @@ struct display {
- 	int width;
- 	int height;
- 	int depth;
-+	int active;
- 
- 	XRenderPictFormat *root_format;
- 	XRenderPictFormat *rgb16_format;
-@@ -111,7 +115,7 @@ struct display {
- 	Cursor invisible_cursor;
- 	Cursor visible_cursor;
- 
--	XcursorImage cursor_image;
-+	XcursorImage cursor_image; /* first only */
- 	int cursor_serial;
- 	int cursor_x;
- 	int cursor_y;
-@@ -123,6 +127,13 @@ struct display {
- 	int send;
- 	int skip_clone;
- 	int skip_frame;
-+
-+	struct {
-+		int timeout;
-+		int interval;
-+		int prefer_blank;
-+		int allow_exp;
-+	} saver;
- };
- 
- struct output {
-@@ -145,6 +156,7 @@ struct output {
- 	XRenderPictFormat *use_render;
- 
- 	int x, y;
-+	int width, height;
- 	XRRModeInfo mode;
- 	Rotation rotation;
- };
-@@ -218,6 +230,13 @@ static inline XRRScreenResources *_XRRGetScreenResourcesCurrent(Display *dpy, Wi
- static int _x_error_occurred;
- 
- static int
-+_io_error_handler(Display *display)
-+{
-+	fprintf(stderr, "XIO error on display %s\n", DisplayString(display));
-+	abort();
-+}
-+
-+static int
- _check_error_handler(Display     *display,
- 		     XErrorEvent *event)
- {
-@@ -243,6 +262,10 @@ can_use_shm(Display *dpy,
- 	XExtCodes *codes;
- 	int major, minor, has_shm, has_pixmap;
- 
-+	*shm_event = 0;
-+	*shm_opcode = 0;
-+	*shm_pixmap = 0;
-+
- 	if (!XShmQueryExtension(dpy))
- 		return 0;
- 
-@@ -320,6 +343,7 @@ can_use_shm(Display *dpy,
- #include <X11/Xlib-xcb.h>
- #include <X11/xshmfence.h>
- #include <xcb/xcb.h>
-+#include <xcb/xcbext.h>
- #include <xcb/dri3.h>
- #include <xcb/sync.h>
- static Pixmap dri3_create_pixmap(Display *dpy,
-@@ -357,6 +381,7 @@ static int dri3_query_version(Display *dpy, int *major, int *minor)
- {
- 	xcb_connection_t *c = XGetXCBConnection(dpy);
- 	xcb_dri3_query_version_reply_t *reply;
-+	xcb_generic_error_t *error;
- 
- 	*major = *minor = -1;
- 
-@@ -364,7 +389,8 @@ static int dri3_query_version(Display *dpy, int *major, int *minor)
- 					     xcb_dri3_query_version(c,
- 								    XCB_DRI3_MAJOR_VERSION,
- 								    XCB_DRI3_MINOR_VERSION),
--					     NULL);
-+					     &error);
-+	free(error);
- 	if (reply == NULL)
- 		return -1;
- 
-@@ -377,8 +403,13 @@ static int dri3_query_version(Display *dpy, int *major, int *minor)
- 
- static int dri3_exists(Display *dpy)
- {
-+	const xcb_query_extension_reply_t *ext;
- 	int major, minor;
- 
-+	ext = xcb_get_extension_data(XGetXCBConnection(dpy), &xcb_dri3_id);
-+	if (ext == NULL || !ext->present)
-+		return 0;
-+
- 	if (dri3_query_version(dpy, &major, &minor) < 0)
- 		return 0;
- 
-@@ -809,6 +840,10 @@ static int clone_update_modes__fixed(struct clone *clone)
- 	RRMode id;
- 	int i, j, ret = ENOENT;
- 
-+	DBG(X11, ("%s-%s cloning modes fixed %dx%d\n",
-+	     DisplayString(clone->dst.dpy), clone->dst.name,
-+	     clone->dst.width, clone->dst.height));
-+
- 	assert(clone->src.rr_output);
- 
- 	res = _XRRGetScreenResourcesCurrent(clone->src.dpy, clone->src.window);
-@@ -837,8 +872,8 @@ static int clone_update_modes__fixed(struct clone *clone)
- 
- 	/* Create matching mode for the real output on the virtual */
- 	memset(&mode, 0, sizeof(mode));
--	mode.width = clone->width;
--	mode.height = clone->height;
-+	mode.width = clone->dst.width;
-+	mode.height = clone->dst.height;
- 	mode.nameLength = sprintf(mode_name, "FAKE-%dx%d", mode.width, mode.height);
- 	mode.name = mode_name;
- 
-@@ -942,6 +977,35 @@ out:
- 	return rr_output;
- }
- 
-+static int check_virtual(struct display *display)
-+{
-+	XRRScreenResources *res;
-+	int found = -ENOENT;
-+	int i;
-+
-+	res = _XRRGetScreenResourcesCurrent(display->dpy, display->root);
-+	if (res == NULL)
-+		return -ENOMEM;
-+
-+	for (i = 0; found == -ENOENT && i < res->noutput; i++) {
-+		XRROutputInfo *output;
-+
-+		output = XRRGetOutputInfo(display->dpy, res, res->outputs[i]);
-+		if (output == NULL)
-+			continue;
-+
-+		if (strcmp(output->name, "VIRTUAL1") == 0)
-+			found = 0;
-+
-+		XRRFreeOutputInfo(output);
-+	}
-+	XRRFreeScreenResources(res);
-+
-+	DBG(XRR, ("%s(%s): has VIRTUAL1? %d\n",
-+		  __func__, DisplayString(display->dpy), found));
-+	return found;
-+}
-+
- static int stride_for_depth(int width, int depth)
- {
- 	if (depth == 24)
-@@ -1082,20 +1146,20 @@ static int clone_init_xfer(struct clone *clone)
- 		width = 0;
- 		height = 0;
- 	} else if (clone->dri3.xid) {
--		width = clone->dst.display->width;
--		height = clone->dst.display->height;
-+		width = clone->dst.width;
-+		height = clone->dst.height;
- 	} else {
- 		width = mode_width(&clone->src.mode, clone->src.rotation);
- 		height = mode_height(&clone->src.mode, clone->src.rotation);
- 	}
- 
-+	DBG(DRAW, ("%s-%s create xfer, %dx%d (currently %dx%d)\n",
-+	     DisplayString(clone->dst.dpy), clone->dst.name,
-+	     width, height, clone->width, clone->height));
-+
- 	if (width == clone->width && height == clone->height)
- 		return 0;
- 
--	DBG(DRAW, ("%s-%s create xfer, %dx%d\n",
--	     DisplayString(clone->dst.dpy), clone->dst.name,
--	     width, height));
--
- 	if (clone->shm.shmaddr) {
- 		if (clone->src.use_shm)
- 			XShmDetach(clone->src.dpy, &clone->src.shm);
-@@ -1225,6 +1289,56 @@ static void clone_update(struct clone *clone)
- 	clone->rr_update = 0;
- }
- 
-+static void screensaver_save(struct display *display)
-+{
-+	display->saver_active =
-+		XScreenSaverQueryExtension(display->dpy,
-+					   &display->saver_event,
-+					   &display->saver_error);
-+	DBG(SCREEN,
-+	    ("%s screen saver active? %d [event=%d, error=%d]\n",
-+	     DisplayString(display->dpy),
-+	     display->saver_active,
-+	     display->saver_event,
-+	     display->saver_error));
-+
-+	XGetScreenSaver(display->dpy,
-+			&display->saver.timeout,
-+			&display->saver.interval,
-+			&display->saver.prefer_blank,
-+			&display->saver.allow_exp);
-+
-+	DBG(SCREEN,
-+	    ("%s saving screen saver defaults: timeout=%d interval=%d prefer_blank=%d allow_exp=%d\n",
-+	     DisplayString(display->dpy),
-+	     display->saver.timeout,
-+	     display->saver.interval,
-+	     display->saver.prefer_blank,
-+	     display->saver.allow_exp));
-+}
-+
-+static void screensaver_disable(struct display *display)
-+{
-+	DBG(SCREEN,
-+	    ("%s disabling screen saver\n", DisplayString(display->dpy)));
-+
-+	XSetScreenSaver(display->dpy, 0, 0, DefaultBlanking, DefaultExposures);
-+	display_mark_flush(display);
-+}
-+
-+static void screensaver_restore(struct display *display)
-+{
-+	DBG(SCREEN,
-+	    ("%s restoring screen saver\n", DisplayString(display->dpy)));
-+
-+	XSetScreenSaver(display->dpy,
-+			display->saver.timeout,
-+			display->saver.interval,
-+			display->saver.prefer_blank,
-+			display->saver.allow_exp);
-+	display_mark_flush(display);
-+}
-+
- static int context_update(struct context *ctx)
- {
- 	Display *dpy = ctx->display->dpy;
-@@ -1325,8 +1439,19 @@ static int context_update(struct context *ctx)
- 		struct clone *clone;
- 		int x1, x2, y1, y2;
- 
--		if (display->rr_active == 0)
-+		if (display->rr_active == 0) {
-+			for (clone = display->clone; clone; clone = clone->next) {
-+				struct output *output = &clone->src;
-+				if (output->mode.id) {
-+					clone->dst.mode.id = -1;
-+					clone->dst.rr_crtc = -1;
-+				} else {
-+					clone->dst.mode.id = 0;
-+					clone->dst.rr_crtc = 0;
-+				}
-+			}
- 			continue;
-+		}
- 
- 		x1 = y1 = INT_MAX;
- 		x2 = y2 = INT_MIN;
-@@ -1570,6 +1695,13 @@ ungrab:
- 		XUngrabServer(display->dpy);
- 	}
- 
-+	for (n = 1; n < ctx->ndisplay; n++) {
-+		struct display *display = &ctx->display[n];
-+
-+		display->active = 0;
-+		screensaver_restore(display);
-+	}
-+
- 	ctx->active = NULL;
- 	for (n = 0; n < ctx->nclone; n++) {
- 		struct clone *clone = &ctx->clones[n];
-@@ -1580,7 +1712,10 @@ ungrab:
- 			continue;
- 
- 		DBG(XRR, ("%s-%s: added to active list\n",
--		     DisplayString(clone->dst.display->dpy), clone->dst.name));
-+			  DisplayString(clone->dst.display->dpy), clone->dst.name));
-+
-+		if (clone->dst.display->active++ == 0)
-+			screensaver_disable(clone->dst.display);
- 
- 		clone->active = ctx->active;
- 		ctx->active = clone;
-@@ -1599,14 +1734,17 @@ static Cursor display_load_invisible_cursor(struct display *display)
- 
- static Cursor display_get_visible_cursor(struct display *display)
- {
--	if (display->cursor_serial != display->cursor_image.size) {
--		DBG(CURSOR, ("%s updating cursor\n", DisplayString(display->dpy)));
-+	struct display *first = display->ctx->display;
-+
-+	if (display->cursor_serial != first->cursor_serial) {
-+		DBG(CURSOR, ("%s updating cursor %dx%d, serial %d\n",
-+		    DisplayString(display->dpy), first->cursor_image.width, first->cursor_image.height, first->cursor_serial));
- 
- 		if (display->visible_cursor)
- 			XFreeCursor(display->dpy, display->visible_cursor);
- 
--		display->visible_cursor = XcursorImageLoadCursor(display->dpy, &display->cursor_image);
--		display->cursor_serial = display->cursor_image.size;
-+		display->visible_cursor = XcursorImageLoadCursor(display->dpy, &first->cursor_image);
-+		display->cursor_serial = first->cursor_serial;
- 	}
- 
- 	return display->visible_cursor;
-@@ -1629,7 +1767,7 @@ static void display_load_visible_cursor(struct display *display, XFixesCursorIma
- 	display->cursor_image.height = cur->height;
- 	display->cursor_image.xhot = cur->xhot;
- 	display->cursor_image.yhot = cur->yhot;
--	display->cursor_image.size++;
-+	display->cursor_serial++;
- 
- 	n = cur->width*cur->height;
- 	src = cur->pixels;
-@@ -1637,11 +1775,24 @@ static void display_load_visible_cursor(struct display *display, XFixesCursorIma
- 	while (n--)
- 		*dst++ = *src++;
- 
--	DBG(CURSOR, ("%s marking cursor changed\n", DisplayString(display->dpy)));
--	display->cursor_moved++;
--	if (display->cursor != display->invisible_cursor) {
--		display->cursor_visible++;
--		context_enable_timer(display->ctx);
-+	if (verbose & CURSOR) {
-+		int x, y;
-+
-+		printf("%s cursor image %dx%d, serial %d:\n",
-+		       DisplayString(display->dpy),
-+		       cur->width, cur->height,
-+		       display->cursor_serial);
-+		dst = display->cursor_image.pixels;
-+		for (y = 0; y < cur->height; y++) {
-+			for (x = 0; x < cur->width; x++) {
-+				if (x == cur->xhot && y == cur->yhot)
-+					printf("+");
-+				else
-+					printf("%c", *dst ? *dst >> 24 >= 127 ? 'x' : '.' : ' ');
-+				dst++;
-+			}
-+			printf("\n");
-+		}
- 	}
- }
- 
-@@ -1685,6 +1836,8 @@ static void display_flush_cursor(struct display *display)
- 	if (cursor == None)
- 		cursor = display->invisible_cursor;
- 	if (cursor != display->cursor) {
-+		DBG(CURSOR, ("%s setting cursor shape %lx\n",
-+		    DisplayString(display->dpy), (long)cursor));
- 		XDefineCursor(display->dpy, display->root, cursor);
- 		display->cursor = cursor;
- 	}
-@@ -1762,6 +1915,8 @@ static void get_src(struct clone *c, const XRectangle *clip)
- 	c->image.obdata = (char *)&c->src.shm;
- 
- 	if (c->src.use_render) {
-+		DBG(DRAW, ("%s-%s get_src via XRender\n",
-+			   DisplayString(c->dst.dpy), c->dst.name));
- 		XRenderComposite(c->src.dpy, PictOpSrc,
- 				 c->src.win_picture, 0, c->src.pix_picture,
- 				 clip->x, clip->y,
-@@ -1782,16 +1937,22 @@ static void get_src(struct clone *c, const XRectangle *clip)
- 				     &c->image, 0, 0);
- 		}
- 	} else if (c->src.pixmap) {
-+		DBG(DRAW, ("%s-%s get_src XCopyArea (SHM/DRI3)\n",
-+			   DisplayString(c->dst.dpy), c->dst.name));
- 		XCopyArea(c->src.dpy, c->src.window, c->src.pixmap, c->src.gc,
- 			  clip->x, clip->y,
- 			  clip->width, clip->height,
- 			  0, 0);
- 		XSync(c->src.dpy, False);
- 	} else if (c->src.use_shm) {
-+		DBG(DRAW, ("%s-%s get_src XShmGetImage\n",
-+			   DisplayString(c->dst.dpy), c->dst.name));
- 		ximage_prepare(&c->image, clip->width, clip->height);
- 		XShmGetImage(c->src.dpy, c->src.window, &c->image,
- 			     clip->x, clip->y, AllPlanes);
- 	} else {
-+		DBG(DRAW, ("%s-%s get_src XGetSubImage (slow)\n",
-+			   DisplayString(c->dst.dpy), c->dst.name));
- 		ximage_prepare(&c->image, c->width, c->height);
- 		XGetSubImage(c->src.dpy, c->src.window,
- 			     clip->x, clip->y, clip->width, clip->height,
-@@ -1838,7 +1999,7 @@ static void put_dst(struct clone *c, const XRectangle *clip)
- 				 clip->width, clip->height);
- 		c->dst.display->send |= c->dst.use_shm;
- 	} else if (c->dst.pixmap) {
--		DBG(DRAW, ("%s-%s using SHM pixmap\n",
-+		DBG(DRAW, ("%s-%s using SHM or DRI3 pixmap\n",
- 		     DisplayString(c->dst.dpy), c->dst.name));
- 		c->dst.serial = NextRequest(c->dst.dpy);
- 		XCopyArea(c->dst.dpy, c->dst.pixmap, c->dst.window, c->dst.gc,
-@@ -1870,6 +2031,9 @@ static int clone_paint(struct clone *c)
- {
- 	XRectangle clip;
- 
-+	if (c->width == 0 || c->height == 0)
-+		return 0;
-+
- 	DBG(DRAW, ("%s-%s paint clone, damaged (%d, %d), (%d, %d) [(%d, %d), (%d,  %d)]\n",
- 	     DisplayString(c->dst.dpy), c->dst.name,
- 	     c->damaged.x1, c->damaged.y1,
-@@ -1944,6 +2108,10 @@ static int clone_paint(struct clone *c)
- 		clip.height = c->damaged.y2 - c->damaged.y1;
- 		get_src(c, &clip);
- 
-+		DBG(DRAW, ("%s-%s target offset %dx%d\n",
-+			   DisplayString(c->dst.dpy), c->dst.name,
-+			   c->dst.x - c->src.x, c->dst.y - c->src.y));
-+
- 		clip.x += c->dst.x - c->src.x;
- 		clip.y += c->dst.y - c->src.y;
- 		put_dst(c, &clip);
-@@ -1969,8 +2137,9 @@ static void clone_damage(struct clone *c, const XRectangle *rec)
- 	if ((v = (int)rec->y + rec->height) > c->damaged.y2)
- 		c->damaged.y2 = v;
- 
--	DBG(DAMAGE, ("%s-%s damaged: (%d, %d), (%d, %d)\n",
-+	DBG(DAMAGE, ("%s-%s damaged: +(%d,%d)x(%d, %d) -> (%d, %d), (%d, %d)\n",
- 	     DisplayString(c->dst.display->dpy), c->dst.name,
-+	     rec->x, rec->y, rec->width, rec->height,
- 	     c->damaged.x1, c->damaged.y1,
- 	     c->damaged.x2, c->damaged.y2));
- }
-@@ -2252,6 +2421,8 @@ static int clone_init_depth(struct clone *clone)
- 	if (ret)
- 		return ret;
- 
-+	clone->depth = depth;
-+
- 	DBG(X11, ("%s-%s using depth %d, requires xrender for src? %d, for dst? %d\n",
- 	     DisplayString(clone->dst.dpy), clone->dst.name,
- 	     clone->depth,
-@@ -2312,6 +2483,8 @@ static int add_display(struct context *ctx, Display *dpy)
- 	display->depth = DefaultDepth(dpy, DefaultScreen(dpy));
- 	display->visual = DefaultVisual(dpy, DefaultScreen(dpy));
- 
-+	XSelectInput(dpy, display->root, ExposureMask);
-+
- 	display->has_shm = can_use_shm(dpy, display->root,
- 				       &display->shm_event,
- 				       &display->shm_opcode,
-@@ -2323,6 +2496,8 @@ static int add_display(struct context *ctx, Display *dpy)
- 	     display->shm_opcode,
- 	     display->has_shm_pixmap));
- 
-+	screensaver_save(display);
-+
- 	display->rr_active = XRRQueryExtension(dpy, &display->rr_event, &display->rr_error);
- 	DBG(X11, ("%s: randr_active?=%d, event=%d, error=%d\n",
- 	     DisplayString(dpy),
-@@ -2592,6 +2767,11 @@ static int last_display_add_clones__randr(struct context *ctx)
- 			return ret;
- 		}
- 
-+		clone->dst.x = 0;
-+		clone->dst.y = 0;
-+		clone->dst.width = display->width;
-+		clone->dst.height = display->height;
-+
- 		ret = clone_update_modes__randr(clone);
- 		if (ret) {
- 			fprintf(stderr, "Failed to clone output \"%s\" from display \"%s\"\n",
-@@ -2668,8 +2848,8 @@ static int last_display_add_clones__xinerama(struct context *ctx)
- 		}
- 
- 		/* Replace the modes on the local VIRTUAL output with the remote Screen */
--		clone->width = xi[n].width;
--		clone->height = xi[n].height;
-+		clone->dst.width = xi[n].width;
-+		clone->dst.height = xi[n].height;
- 		clone->dst.x = xi[n].x_org;
- 		clone->dst.y = xi[n].y_org;
- 		clone->dst.rr_crtc = -1;
-@@ -2698,64 +2878,67 @@ static int last_display_add_clones__display(struct context *ctx)
- 	Display *dpy = display->dpy;
- 	struct clone *clone;
- 	Screen *scr;
-+	int count, s;
- 	char buf[80];
- 	int ret;
- 	RROutput id;
- 
-+	count = ScreenCount(dpy);
-+	DBG(X11, ("%s(%s) - %d screens\n", __func__, DisplayString(dpy), count));
-+	for (s = 0; s < count; s++) {
-+		clone = add_clone(ctx);
-+		if (clone == NULL)
-+			return -ENOMEM;
- 
--	DBG(X11, ("%s(%s)\n", __func__, DisplayString(dpy)));
--	clone = add_clone(ctx);
--	if (clone == NULL)
--		return -ENOMEM;
-+		clone->depth = 24;
-+		clone->next = display->clone;
-+		display->clone = clone;
- 
--	clone->depth = 24;
--	clone->next = display->clone;
--	display->clone = clone;
-+		id = claim_virtual(ctx->display, buf, ctx->nclone);
-+		if (id == 0) {
-+			fprintf(stderr, "Failed to find available VirtualHead \"%s\" for on display \"%s\"\n",
-+				buf, DisplayString(dpy));
-+		}
-+		ret = clone_output_init(clone, &clone->src, ctx->display, buf, id);
-+		if (ret) {
-+			fprintf(stderr, "Failed to add display \"%s\"\n",
-+				DisplayString(ctx->display->dpy));
-+			return ret;
-+		}
- 
--	id = claim_virtual(ctx->display, buf, ctx->nclone);
--	if (id == 0) {
--		fprintf(stderr, "Failed to find available VirtualHead \"%s\" for on display \"%s\"\n",
--			buf, DisplayString(dpy));
--	}
--	ret = clone_output_init(clone, &clone->src, ctx->display, buf, id);
--	if (ret) {
--		fprintf(stderr, "Failed to add display \"%s\"\n",
--			DisplayString(ctx->display->dpy));
--		return ret;
--	}
-+		sprintf(buf, "SCREEN%d", s);
-+		ret = clone_output_init(clone, &clone->dst, display, buf, 0);
-+		if (ret) {
-+			fprintf(stderr, "Failed to add display \"%s\"\n",
-+				DisplayString(dpy));
-+			return ret;
-+		}
- 
--	sprintf(buf, "WHOLE");
--	ret = clone_output_init(clone, &clone->dst, display, buf, 0);
--	if (ret) {
--		fprintf(stderr, "Failed to add display \"%s\"\n",
--			DisplayString(dpy));
--		return ret;
--	}
-+		ret = clone_init_depth(clone);
-+		if (ret) {
-+			fprintf(stderr, "Failed to negotiate image format for display \"%s\"\n",
-+				DisplayString(dpy));
-+			return ret;
-+		}
- 
--	ret = clone_init_depth(clone);
--	if (ret) {
--		fprintf(stderr, "Failed to negotiate image format for display \"%s\"\n",
--			DisplayString(dpy));
--		return ret;
--	}
-+		/* Replace the modes on the local VIRTUAL output with the remote Screen */
-+		scr = ScreenOfDisplay(dpy, s);
-+		clone->dst.width = scr->width;
-+		clone->dst.height = scr->height;
-+		clone->dst.x = 0;
-+		clone->dst.y = 0;
-+		clone->dst.rr_crtc = -1;
-+		ret = clone_update_modes__fixed(clone);
-+		if (ret) {
-+			fprintf(stderr, "Failed to clone display \"%s\"\n",
-+				DisplayString(dpy));
-+			return ret;
-+		}
- 
--	/* Replace the modes on the local VIRTUAL output with the remote Screen */
--	scr = ScreenOfDisplay(dpy, DefaultScreen(dpy));
--	clone->width = scr->width;
--	clone->height = scr->height;
--	clone->dst.x = 0;
--	clone->dst.y = 0;
--	clone->dst.rr_crtc = -1;
--	ret = clone_update_modes__fixed(clone);
--	if (ret) {
--		fprintf(stderr, "Failed to clone display \"%s\"\n",
--			DisplayString(dpy));
--		return ret;
-+		clone->active = ctx->active;
-+		ctx->active = clone;
- 	}
- 
--	clone->active = ctx->active;
--	ctx->active = clone;
--
- 	return 0;
- }
- 
-@@ -3168,6 +3351,33 @@ static void context_cleanup(struct context *ctx)
- 	XCloseDisplay(dpy);
- }
- 
-+static void update_cursor_image(struct context *ctx)
-+{
-+	XFixesCursorImage *cur;
-+	int i;
-+
-+	DBG(CURSOR, ("%s cursor changed\n",
-+		     DisplayString(ctx->display->dpy)));
-+
-+	cur = XFixesGetCursorImage(ctx->display->dpy);
-+	if (cur == NULL)
-+		return;
-+
-+	display_load_visible_cursor(&ctx->display[0], cur);
-+	for (i = 1; i < ctx->ndisplay; i++) {
-+		struct display *display = &ctx->display[i];
-+
-+		DBG(CURSOR, ("%s marking cursor changed\n", DisplayString(display->dpy)));
-+		display->cursor_moved++;
-+		if (display->cursor != display->invisible_cursor) {
-+			display->cursor_visible++;
-+			context_enable_timer(display->ctx);
-+		}
-+	}
-+
-+	XFree(cur);
-+}
-+
- static int done;
- 
- static void signal_handler(int sig)
-@@ -3182,6 +3392,7 @@ int main(int argc, char **argv)
- 	uint64_t count;
- 	int daemonize = 1, bumblebee = 0, siblings = 0, singleton = 1;
- 	int i, ret, open, fail;
-+	int idle;
- 
- 	signal(SIGPIPE, SIG_IGN);
- 
-@@ -3228,6 +3439,7 @@ int main(int argc, char **argv)
- 		return -ret;
- 
- 	XSetErrorHandler(_check_error_handler);
-+	XSetIOErrorHandler(_io_error_handler);
- 
- 	ret = add_fd(&ctx, display_open(&ctx, src_name));
- 	if (ret) {
-@@ -3237,6 +3449,13 @@ int main(int argc, char **argv)
- 		goto out;
- 	}
- 
-+	ret = check_virtual(ctx.display);
-+	if (ret) {
-+		fprintf(stderr, "No VIRTUAL outputs on \"%s\".\n",
-+			DisplayString(ctx.display->dpy));
-+		goto out;
-+	}
-+
- 	if (singleton) {
- 		XSelectInput(ctx.display->dpy, ctx.display->root, PropertyChangeMask);
- 		if (first_display_has_singleton(&ctx)) {
-@@ -3291,6 +3510,11 @@ int main(int argc, char **argv)
- 	if (ret)
- 		goto out;
- 
-+	if (ctx.display->saver_active)
-+		XScreenSaverSelectInput(ctx.display->dpy,
-+					ctx.display->root,
-+					ScreenSaverNotifyMask);
-+
- 	if ((ctx.display->rr_event | ctx.display->rr_error) == 0) {
- 		fprintf(stderr, "RandR extension not supported by %s\n", DisplayString(ctx.display->dpy));
- 		ret = EINVAL;
-@@ -3348,25 +3572,60 @@ int main(int argc, char **argv)
- 	signal(SIGTERM, signal_handler);
- 
- 	ctx.command_continuation = 0;
-+	update_cursor_image(&ctx);
-+
-+	idle = 0;
- 	while (!done) {
- 		XEvent e;
- 		int reconfigure = 0;
- 		int rr_update = 0;
- 
--		DBG(POLL, ("polling - enable timer? %d, nfd=%d, ndisplay=%d\n", ctx.timer_active, ctx.nfd, ctx.ndisplay));
--		ret = poll(ctx.pfd + !ctx.timer_active, ctx.nfd - !ctx.timer_active, -1);
--		if (ret <= 0)
--			break;
-+		if (idle) {
-+			DBG(POLL, ("polling - enable timer? %d, nfd=%d, ndisplay=%d\n", ctx.timer_active, ctx.nfd, ctx.ndisplay));
-+			ret = poll(ctx.pfd + !ctx.timer_active, ctx.nfd - !ctx.timer_active, -1);
-+			if (ret <= 0)
-+				break;
-+
-+			DBG(POLL, ("poll reports %d fd awake\n", ret));
-+		}
-+		idle = 1;
- 
- 		/* pfd[0] is the timer, pfd[1] is the local display, pfd[2] is the mouse, pfd[3+] are the remotes */
- 
--		DBG(POLL, ("poll reports %d fd awake\n", ret));
- 		if (ctx.pfd[1].revents || XPending(ctx.display[0].dpy)) {
- 			DBG(POLL,("%s woken up\n", DisplayString(ctx.display[0].dpy)));
-+			ctx.pfd[1].revents = 0;
-+			idle = 0;
-+
- 			do {
- 				XNextEvent(ctx.display->dpy, &e);
- 
--				if (e.type == ctx.display->damage_event + XDamageNotify ) {
-+				DBG(POLL, ("%s received event %d\n", DisplayString(ctx.display[0].dpy), e.type));
-+
-+				if (e.type == ctx.display->saver_event + ScreenSaverNotify) {
-+					const XScreenSaverNotifyEvent *se = (const XScreenSaverNotifyEvent *)&e;
-+					DBG(SCREEN,
-+					    ("%s screen saver: state=%d, kind=%d, forced=%d\n",
-+					     DisplayString(ctx.display->dpy),
-+					     se->state, se->kind, se->forced));
-+					for (i = 1; i < ctx.ndisplay; i++) {
-+						struct display *display = &ctx.display[i];
-+
-+						if (!display->active)
-+							continue;
-+
-+						DBG(SCREEN,
-+						    ("%s %s screen saver\n",
-+						     DisplayString(display->dpy),
-+						     se->state == ScreenSaverOn ? "activating" : "resetting\n"));
-+
-+						if (se->state == ScreenSaverOn)
-+							XActivateScreenSaver(display->dpy);
-+						else
-+							XResetScreenSaver(display->dpy);
-+						XFlush(display->dpy);
-+					}
-+				} else if (e.type == ctx.display->damage_event + XDamageNotify) {
- 					const XDamageNotifyEvent *de = (const XDamageNotifyEvent *)&e;
- 					struct clone *clone;
- 
-@@ -3380,19 +3639,7 @@ int main(int argc, char **argv)
- 					if (ctx.active)
- 						context_enable_timer(&ctx);
- 				} else if (e.type == ctx.display->xfixes_event + XFixesCursorNotify) {
--					XFixesCursorImage *cur;
--
--					DBG(CURSOR, ("%s cursor changed\n",
--					     DisplayString(ctx.display->dpy)));
--
--					cur = XFixesGetCursorImage(ctx.display->dpy);
--					if (cur == NULL)
--						continue;
--
--					for (i = 1; i < ctx.ndisplay; i++)
--						display_load_visible_cursor(&ctx.display[i], cur);
--
--					XFree(cur);
-+					update_cursor_image(&ctx);
- 				} else if (e.type == ctx.display->rr_event + RRScreenChangeNotify) {
- 					DBG(XRR, ("%s screen changed (reconfigure pending? %d)\n",
- 					     DisplayString(ctx.display->dpy), reconfigure));
-@@ -3426,13 +3673,41 @@ int main(int argc, char **argv)
- 			if (ctx.pfd[i+2].revents == 0 && !XPending(ctx.display[i].dpy))
- 				continue;
- 
-+			ctx.pfd[i+2].revents = 0;
-+			idle = 0;
-+
- 			DBG(POLL, ("%s woken up\n", DisplayString(ctx.display[i].dpy)));
- 			do {
- 				XNextEvent(ctx.display[i].dpy, &e);
- 
- 				DBG(POLL, ("%s received event %d\n", DisplayString(ctx.display[i].dpy), e.type));
--				if (ctx.display[i].rr_active && e.type == ctx.display[i].rr_event + RRNotify) {
--					XRRNotifyEvent *re = (XRRNotifyEvent *)&e;
-+				if (e.type == Expose) {
-+					const XExposeEvent *xe = (XExposeEvent *)&e;
-+					struct clone *clone;
-+					int damaged = 0;
-+
-+					DBG(DAMAGE, ("%s exposed: (%d, %d)x(%d, %d)\n",
-+					     DisplayString(ctx.display[i].dpy),
-+					     xe->x, xe->y, xe->width, xe->height));
-+
-+					for (clone = ctx.active; clone; clone = clone->active) {
-+						XRectangle r;
-+
-+						if (clone->dst.display != &ctx.display[i])
-+							continue;
-+
-+						r.x = clone->src.x + xe->x;
-+						r.y = clone->src.y + xe->y;
-+						r.width  = xe->width;
-+						r.height = xe->height;
-+						clone_damage(clone, &r);
-+						damaged++;
-+					}
-+
-+					if (damaged)
-+						context_enable_timer(&ctx);
-+				} else if (ctx.display[i].rr_active && e.type == ctx.display[i].rr_event + RRNotify) {
-+					const XRRNotifyEvent *re = (XRRNotifyEvent *)&e;
- 
- 					DBG(XRR, ("%s received RRNotify, type %d\n", DisplayString(ctx.display[i].dpy), re->subtype));
- 					if (re->subtype == RRNotify_OutputChange) {
-@@ -3480,6 +3755,7 @@ int main(int argc, char **argv)
- 
- 			DBG(TIMER, ("%s timer still active? %d\n", DisplayString(ctx.display->dpy), ret != 0));
- 			ctx.timer_active = ret != 0;
-+			idle = 0;
- 		}
- 	}
- 
diff --git a/main/xf86-video-modesetting/APKBUILD b/main/xf86-video-modesetting/APKBUILD
deleted file mode 100644
index 87dc2a6e630..00000000000
--- a/main/xf86-video-modesetting/APKBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-modesetting
-pkgver=0.9.0
-pkgrel=6
-pkgdesc="dummy package for compat - can safelu be removed"
-url="https://cgit.freedesktop.org/xorg/driver/xf86-video-modesetting/"
-arch="all"
-license="MIT"
-depends="xorg-server"
-depends_dev=""
-makedepends=""
-install=""
-subpackages=""
-source=""
-
-# this is a dummy package that is only provided for simplifying upgrades
-# upsers should uninstlal this package and use the driver shipped with
-# xorg server
-
-prepare() {
-	return 0
-}
-
-build() {
-	return 0
-}
-
-package() {
-	mkdir -p "$pkgdir"
-}
-
diff --git a/main/xf86-video-nouveau/APKBUILD b/main/xf86-video-nouveau/APKBUILD
deleted file mode 100644
index daea3f36406..00000000000
--- a/main/xf86-video-nouveau/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-nouveau
-pkgver=1.0.16
-pkgrel=0
-pkgdesc="Open-source X.org drivers for nVidia video cards"
-url="https://nouveau.freedesktop.org/"
-arch="all"
-license="MIT"
-depends="mesa-dri-nouveau"
-depends_dev=
-makedepends="libdrm-dev xorg-server-dev util-macros eudev-dev xorgproto"
-install=""
-subpackages="$pkgname-doc"
-source="https://www.x.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-builddir="$srcdir"/$pkgname-$pkgver
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="41b7839c37372660968ab7da2bc3d9feef3cab4e994d05d4ba6e59071f0d1b1f8d7dcdbcb15a42a375a556d28dc067f9ffe45d73c1d121ad307d199107ade3e0  xf86-video-nouveau-1.0.16.tar.bz2"
diff --git a/main/xf86-video-nv/APKBUILD b/main/xf86-video-nv/APKBUILD
deleted file mode 100644
index 12921a25e00..00000000000
--- a/main/xf86-video-nv/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-nv
-pkgver=2.1.21
-pkgrel=3
-pkgdesc="Nvidia video driver"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-builddir="$srcdir"/$pkgname-$pkgver
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-sha512sums="97cec43100b00609d43cf45937bafea387fd656cb5e321fcbed426973320097ba6601e4e548026618b3cf0c480f58956874a201791dc0cc39297b5fd54979ca7  xf86-video-nv-2.1.21.tar.bz2"
diff --git a/main/xf86-video-openchrome/APKBUILD b/main/xf86-video-openchrome/APKBUILD
deleted file mode 100644
index 89ea08a2df7..00000000000
--- a/main/xf86-video-openchrome/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-openchrome
-pkgver=0.6.0
-pkgrel=4
-pkgdesc="X.Org driver for VIA/S3G cards"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-makedepends="xorg-server-dev libxi-dev libxvmc-dev mesa-dev util-macros
-	xorgproto libxv-dev"
-source="https://www.x.org/releases/individual/driver/xf86-video-openchrome-$pkgver.tar.bz2
-	openchrome.xinf
-	"
-
-prepare() {
-	update_config_sub
-	default_prepare
-}
-
-build() {
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	make check
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-	install -Dm644 "$srcdir"/openchrome.xinf \
-		"$pkgdir"/usr/share/hwdata/videoaliases/openchrome.xinf
-}
-
-sha512sums="f074e70d54c87a9d6e1b52c2c2d72d7c551dcb59a5f34c0a5f9495db1a6e45db4300d51fabf7eedfbe91f964f9422931c752a49b322715c6aa9ddb0db9dd6004  xf86-video-openchrome-0.6.0.tar.bz2
-b900999fc678f0efdcb526d2f0e0f141ed8ca9403bd2b9895c96be2f5efc424feb50f1828c54cdaf0d7d9b9e723e834068ce36841fac97a2e5209873e8e711c3  openchrome.xinf"
diff --git a/main/xf86-video-openchrome/openchrome.xinf b/main/xf86-video-openchrome/openchrome.xinf
deleted file mode 100644
index 7b15c911a9d..00000000000
--- a/main/xf86-video-openchrome/openchrome.xinf
+++ /dev/null
@@ -1,39 +0,0 @@
-# NOTE: Comments in openchrome 0.2.1 driver source indicate this device does not
-# exist in the wild, so it has been disabled for now.
-#alias pcivideo:v00001106d00003022sv*sd*bc*sc*i* openchrome
-
-# 1106:3108 - K8M800 (PCI_CHIP_VT3204)
-alias pcivideo:v00001106d00003108sv*sd*bc*sc*i* openchrome
-
-# 1106:3118 - PM800/PM880/CN400 (PCI_CHIP_VT3259)
-alias pcivideo:v00001106d00003118sv*sd*bc*sc*i* openchrome
-
-# 1106:3122 - CLE266 (PCI_CHIP_CLE3122)
-alias pcivideo:v00001106d00003122sv*sd*bc*sc*i* openchrome
-
-# 1106:7205 - KM400/KN400 (PCI_CHIP_VT3205)
-alias pcivideo:v00001106d00007205sv*sd*bc*sc*i* openchrome
-
-# 1106:3344 - VM800 (PCI_CHIP_VT3314)
-alias pcivideo:v00001106d00003344sv*sd*bc*sc*i* openchrome
-
-# 1106:3157 - CX700 (PCI_CHIP_VT3324)
-alias pcivideo:v00001106d00003157sv*sd*bc*sc*i* openchrome
-
-# 1106:3343 - P4M890 (PCI_CHIP_VT3327)
-alias pcivideo:v00001106d00003343sv*sd*bc*sc*i* openchrome
-
-# 1106:3230 - K8M890 (PCI_CHIP_VT3336)
-alias pcivideo:v00001106d00003230sv*sd*bc*sc*i* openchrome
-
-# 1106:3371 - P4M900 (PCI_CHIP_VT3364)
-alias pcivideo:v00001106d00003371sv*sd*bc*sc*i* openchrome
-
-# 1106:1122 - VX800 (PCI_CHIP_VT3353)
-alias pcivideo:v00001106d00001122sv*sd*bc*sc*i* openchrome
-
-# 1106:5122 - VX855 (PCI_CHIP_VT3409)
-alias pcivideo:v00001106d00005122sv*sd*bc*sc*i* openchrome
-
-# 1106:7122 - VX855 (PCI_CHIP_VT3410)
-alias pcivideo:v00001106d00007122sv*sd*bc*sc*i* openchrome
diff --git a/main/xf86-video-qxl/APKBUILD b/main/xf86-video-qxl/APKBUILD
deleted file mode 100644
index 1924b85f6d2..00000000000
--- a/main/xf86-video-qxl/APKBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-qxl
-pkgver=0.1.5
-pkgrel=6
-pkgdesc="Xorg X11 qxl video driver"
-options="!check" # No testsuite
-url="https://www.x.org"
-arch="x86 x86_64"
-license="MIT"
-makedepends="xorg-server-dev spice-dev xorg-server xorgproto libpciaccess-dev"
-source="https://www.x.org/releases/individual/driver/xf86-video-qxl-$pkgver.tar.bz2
-	convert-xspice-python3.patch
-	"
-
-subpackages="$pkgname-doc xspice"
-
-build() {
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--enable-xspice=yes
-	make
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-}
-
-xspice() {
-	pkgdesc="X server that can be accessed by a Spice client"
-	depends="python3"
-	mkdir -p "$subpkgdir"/usr/lib/xorg/modules/drivers \
-		"$subpkgdir"/etc/X11
-	mv "$pkgdir"/usr/lib/xorg/modules/drivers/spiceqxl_drv.so \
-		"$subpkgdir"/usr/lib/xorg/modules/drivers/
-	mv "$pkgdir"/usr/bin/ "$subpkgdir"/usr/
-	install -m 644 "$builddir"/examples/spiceqxl.xorg.conf.example \
-		"$subpkgdir"/etc/X11/spiceqxl.xorg.conf
-}
-
-sha512sums="7510b2d037b3e978df6063b29e2406f3d1270695a239f29fdaec9b1dc65a30ab10cb959f15eb336f78e93aa708d41c64c5ea43803958feffc64542229605b782  xf86-video-qxl-0.1.5.tar.bz2
-ac2ba5a7878f97b77aba2912d617a43916ee0b94a6759119caee5c26a5ea15f0494a41a32feb3030e9187171a241dfd2c1b092eefdf7d83bde0aa1553312bf4e  convert-xspice-python3.patch"
diff --git a/main/xf86-video-qxl/convert-xspice-python3.patch b/main/xf86-video-qxl/convert-xspice-python3.patch
deleted file mode 100644
index 145d3e3029a..00000000000
--- a/main/xf86-video-qxl/convert-xspice-python3.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Christophe Fergeau <cfergeau@redhat.com>
-Date: Wed, 8 Feb 2017 15:23:56 +0100
-Subject: [PATCH] Xspice: Use print("") instead of print ""
-
-This allows Xspice to run when using python3 instead of python2
----
- scripts/Xspice | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/scripts/Xspice b/scripts/Xspice
-index ada99d1..30d10fa 100755
---- a/scripts/Xspice
-+++ b/scripts/Xspice
-@@ -34,7 +34,7 @@ def which(x):
-         candidate = os.path.join(p, x)
-         if os.path.exists(candidate):
-             return candidate
--    print 'Warning: failed to find executable %s' % x
-+    print('Warning: failed to find executable %s' % x)
-     return None
- 
- if 'XSPICE_ENABLE_GDB' in os.environ:
-@@ -128,10 +128,10 @@ args, xorg_args = parser.parse_known_args(sys.argv[1:])
- def agents_new_enough(args):
-     for f in [args.vdagent_exec, args.vdagentd_exec]:
-         if not f:
--            print 'please specify path to vdagent/vdagentd executables'
-+            print('please specify path to vdagent/vdagentd executables')
-             return False
-         if not os.path.exists(f):
--            print 'error: file not found ', f
-+            print('error: file not found ', f)
-             return False
- 
-     for f in [args.vdagent_exec, args.vdagentd_exec]:
-@@ -169,11 +169,11 @@ def tls_files(args):
- # and it isn't supplied spice will still abort, and Xorg with it.
- for key, filename in tls_files(args).items():
-     if not os.path.exists(filename):
--        print "missing %s - %s does not exist" % (key, filename)
-+        print("missing %s - %s does not exist" % (key, filename))
-         sys.exit(1)
- 
- def error(msg, exit_code=1):
--    print "Xspice: %s" % msg
-+    print("Xspice: %s" % msg)
-     sys.exit(exit_code)
- 
- if not args.xorg:
-@@ -319,7 +319,7 @@ for arg in xorg_args:
-     if arg.startswith(":"):
-         display = arg
- if not display:
--    print "Error: missing display on line (i.e. :3)"
-+    print("Error: missing display on line (i.e. :3)")
-     raise SystemExit
- os.environ ['DISPLAY'] = display
- 
-@@ -343,7 +343,7 @@ time.sleep(2)
- 
- retpid,rc = os.waitpid(xorg.pid, os.WNOHANG)
- if retpid != 0:
--    print "Error: X server is not running"
-+    print("Error: X server is not running")
- else:
-     if args.vdagent_enabled and args.vdagent_launch:
-         # XXX use systemd --user for this?
-@@ -361,4 +361,4 @@ else:
-         xorg.wait()
-     except KeyboardInterrupt:
-         # Catch Ctrl-C as that is the common way of ending this script
--        print "Keyboard Interrupt"
-+        print("Keyboard Interrupt")
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Christophe Fergeau <cfergeau@redhat.com>
-Date: Wed, 8 Feb 2017 17:07:39 +0100
-Subject: [PATCH] Xspice: Remove extra space before assignment
-
----
- scripts/Xspice | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/scripts/Xspice b/scripts/Xspice
-index 30d10fa..41fd80c 100755
---- a/scripts/Xspice
-+++ b/scripts/Xspice
-@@ -211,7 +211,7 @@ signal.signal(signal.SIGTERM, cleanup)
- atexit.register(cleanup)
- 
- if args.auto:
--    temp_dir  = tempfile.mkdtemp(prefix="Xspice-")
-+    temp_dir = tempfile.mkdtemp(prefix="Xspice-")
-     cleanup_dirs.append(temp_dir)
- 
-     args.config = temp_dir + "/xorg.conf"
-@@ -275,7 +275,7 @@ if args.vdagent_enabled:
-             os.unlink(f)
- 
-     if not temp_dir:
--        temp_dir  = tempfile.mkdtemp(prefix="Xspice-")
-+        temp_dir = tempfile.mkdtemp(prefix="Xspice-")
-         cleanup_dirs.append(temp_dir)
- 
-     # Auto generate temporary files for vdagent
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Christophe Fergeau <cfergeau@redhat.com>
-Date: Wed, 8 Feb 2017 17:07:56 +0100
-Subject: [PATCH] Xspice: Fix Python3 str() vs bytes() confusion
-
-With python3, without universal_newlines=True, Popen().stdout.read()
-will return a byte array, while find(str) expects to operate on a
-string.
-I've checked that this still works with python2 as well.
----
- scripts/Xspice | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/Xspice b/scripts/Xspice
-index 41fd80c..927dcb1 100755
---- a/scripts/Xspice
-+++ b/scripts/Xspice
-@@ -135,7 +135,7 @@ def agents_new_enough(args):
-             return False
- 
-     for f in [args.vdagent_exec, args.vdagentd_exec]:
--        if Popen(args=[f, '-h'], stdout=PIPE).stdout.read().find('-S') == -1:
-+        if Popen(args=[f, '-h'], stdout=PIPE, universal_newlines=True).stdout.read().find('-S') == -1:
-             return False
-     return True
- 
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Christophe Fergeau <cfergeau@redhat.com>
-Date: Thu, 17 May 2018 15:31:05 +0200
-Subject: [PATCH] Xspice: Adjust shebang to explicitly mention python3
-
----
- scripts/Xspice | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/Xspice b/scripts/Xspice
-index 927dcb1..78d0794 100755
---- a/scripts/Xspice
-+++ b/scripts/Xspice
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- 
- """
- Xspice
-
-
diff --git a/main/xf86-video-r128/APKBUILD b/main/xf86-video-r128/APKBUILD
deleted file mode 100644
index e7af3dc9c95..00000000000
--- a/main/xf86-video-r128/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-r128
-pkgver=6.12.0
-pkgrel=0
-pkgdesc="ATI Rage128 video driver"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libxi-dev libdrm-dev mesa-dev expat-dev util-macros
-	autoconf automake libtool xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-builddir="$srcdir/$pkgname-$pkgver"
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--enable-dri
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="0e667e2cfa8a87a00846361d86528c93754c403c812b66798953fa4c857b2143b2c4c44885da467e7f910d8cb910b69492cdcb6f25e2197bae6617364d152e38  xf86-video-r128-6.12.0.tar.bz2"
diff --git a/main/xf86-video-rendition/APKBUILD b/main/xf86-video-rendition/APKBUILD
deleted file mode 100644
index 9900912b150..00000000000
--- a/main/xf86-video-rendition/APKBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-rendition
-pkgver=4.2.7
-pkgrel=0
-pkgdesc="Rendition video driver"
-url="https://xorg.freedesktop.org/"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-options="!strip"
-makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-builddir=$srcdir/$pkgname-$pkgver
-
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-
-	# Stripping manually
-	strip $pkgdir/usr/lib/xorg/modules/drivers/rendition_drv.so
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="5a23a599488946499e9bb3dfaf553cd68b6a1555a9c46b4038f355038a28747715bb940c52170f909917386911c8ae2607c669ba28f24a6c10ad375dab4535aa  xf86-video-rendition-4.2.7.tar.bz2"
diff --git a/main/xf86-video-s3/APKBUILD b/main/xf86-video-s3/APKBUILD
deleted file mode 100644
index 26d8cf53b7e..00000000000
--- a/main/xf86-video-s3/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-s3
-pkgver=0.7.0
-pkgrel=0
-pkgdesc="X.Org driver for s3 cards"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-builddir="$srcdir"/$pkgname-$pkgver
-
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="6158e3f7dba8b4770758fa43c686a316c11f70966f80e015ae0087d90a036062237adeb7ad0f6aa21cc46b9d08ad38c964940ff503b58b502e87cf11be60cdd4  xf86-video-s3-0.7.0.tar.bz2"
diff --git a/main/xf86-video-s3virge/APKBUILD b/main/xf86-video-s3virge/APKBUILD
deleted file mode 100644
index aaf6faf45aa..00000000000
--- a/main/xf86-video-s3virge/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-s3virge
-pkgver=1.11.0
-pkgrel=0
-pkgdesc="S3 ViRGE video driver"
-url="https://xorg.freedesktop.org/"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
-	check-max-value.patch
-	"
-builddir="$srcdir"/$pkgname-$pkgver
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="43ec2b4d910a5f659dd19fd623ef615f3ba7dcb282f61b95438cb279c6e0de75419b381adb70c92a084e375a04435cbb20fa0fe30ac23b2c8f4ed26d762d418e  xf86-video-s3virge-1.11.0.tar.bz2
-af7fdc0f850103fb9e8631c1b26b1eb6117eac83b76a9d575b33affeb55985ffe9f61c1c7dcb4c7b00656edfc5df4c2d4c75e56f2dd4c2112dedf654564ff259  check-max-value.patch"
diff --git a/main/xf86-video-s3virge/check-max-value.patch b/main/xf86-video-s3virge/check-max-value.patch
deleted file mode 100644
index 0573a05c9cb..00000000000
--- a/main/xf86-video-s3virge/check-max-value.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/s3v_driver.c
-+++ b/src/s3v_driver.c
-@@ -1212,8 +1212,6 @@
-     /* todo -  The virge limit is 2048 vertical & horizontal */
-     /* pixels, not clock register settings. */
- 			 	/* true for all ViRGE? */
--  pScrn->maxHValue = 2048;
--  pScrn->maxVValue = 2048;
- 
-     				/* Lower depths default to config file */
-   pScrn->virtualX = pScrn->display->virtualX;
-@@ -2566,6 +2564,12 @@
-     if ((pScrn->bitsPerPixel + 7)/8 * mode->HDisplay > 4095)
- 	return MODE_VIRTUAL_X;
- 
-+    if (mode->HTotal > 2048)
-+        return MODE_BAD_HVALUE;
-+
-+    if (mode->VTotal > 2048)
-+        return MODE_BAD_VVALUE;
-+        
-     return MODE_OK;
- }
- 
diff --git a/main/xf86-video-savage/0001-Add-check-for-max-HV-Value-to-ValidMode-hook.patch b/main/xf86-video-savage/0001-Add-check-for-max-HV-Value-to-ValidMode-hook.patch
deleted file mode 100644
index de93d6dc760..00000000000
--- a/main/xf86-video-savage/0001-Add-check-for-max-HV-Value-to-ValidMode-hook.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0ece556daa8a88771b669d8104396abd9166d2d0 Mon Sep 17 00:00:00 2001
-From: Stefan Dirsch <sndirsch@suse.de>
-Date: Mon, 25 Jun 2018 15:55:06 +0200
-Subject: [PATCH] Add check for max[HV]Value to ValidMode hook
-
-xorg-server 1.20 removed this check, so implement this in the driver
-itself.
-
-Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
-Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
----
- src/savage_driver.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/savage_driver.c b/src/savage_driver.c
-index 58a294d..3cda923 100644
---- a/src/savage_driver.c
-+++ b/src/savage_driver.c
-@@ -2034,8 +2034,6 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
-     xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected current MCLK value of %1.3f MHz\n",
- 	       mclk / 1000.0);
- 
--    pScrn->maxHValue = 2048 << 3;	/* 11 bits of h_total 8-pixel units */
--    pScrn->maxVValue = 2048;		/* 11 bits of v_total */
-     pScrn->virtualX = pScrn->display->virtualX;
-     pScrn->virtualY = pScrn->display->virtualY;
- 
-@@ -3637,6 +3635,14 @@ static ModeStatus SavageValidMode(SCRN_ARG_TYPE arg, DisplayModePtr pMode,
-        (pMode->VDisplay > psav->PanelY)))
- 	    return MODE_PANEL;
- 
-+    /* 11 bits of h_total 8-pixel units */
-+    if (pMode->HTotal > (2048 << 3))
-+	return MODE_BAD_HVALUE;
-+
-+    /* 11 bits of v_total */
-+    if (pMode->VTotal > 2048)
-+	return MODE_BAD_VVALUE;
-+
-     if (psav->UseBIOS) {
- 	refresh = SavageGetRefresh(pMode);
-         return (SavageMatchBiosMode(pScrn,pMode->HDisplay,
--- 
-2.18.0
-
diff --git a/main/xf86-video-savage/APKBUILD b/main/xf86-video-savage/APKBUILD
deleted file mode 100644
index 8389ff667d3..00000000000
--- a/main/xf86-video-savage/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-savage
-pkgver=2.3.9
-pkgrel=3
-pkgdesc="S3 Savage video driver"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libxi-dev util-macros libdrm-dev mesa-dev
-	xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
-	0001-Add-check-for-max-HV-Value-to-ValidMode-hook.patch
-	"
-builddir="$srcdir/$pkgname-$pkgver"
-
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-sha512sums="35fe52651fe5799bbbc6e7b3608a655102547e8f8f2189288d3f5b477f819bfc56a9a8eef39813ca455e56076e4f7c36304480c3ccddbac6c794672828cf705a  xf86-video-savage-2.3.9.tar.bz2
-485112d65bf36be55eca607daf3f05f637b29826d3fb915f92158c3564f3033f40a6078be8626bd9ea7cef1cb6900fed054496d0f803a048fada905fb179235a  0001-Add-check-for-max-HV-Value-to-ValidMode-hook.patch"
diff --git a/main/xf86-video-siliconmotion/APKBUILD b/main/xf86-video-siliconmotion/APKBUILD
deleted file mode 100644
index f3504429a08..00000000000
--- a/main/xf86-video-siliconmotion/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-siliconmotion
-pkgver=1.7.9
-pkgrel=3
-pkgdesc="Silicon Motion video driver"
-url="https://xorg.freedesktop.org"
-arch="x86_64 x86"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
-	"
-
-builddir="$srcdir"/$pkgname-$pkgver
-
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-sha512sums="13085945ca496f83521c28b25c394077e010031dbdc2374347a932a52650ada02f525269a81d0b0bb20b48e371d5435a7a73cb7555a07dc5a784e77152608c63  xf86-video-siliconmotion-1.7.9.tar.bz2"
diff --git a/main/xf86-video-sis/APKBUILD b/main/xf86-video-sis/APKBUILD
deleted file mode 100644
index 5378a17ef01..00000000000
--- a/main/xf86-video-sis/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-sis
-pkgver=0.12.0
-pkgrel=0
-pkgdesc="X.org SiS video driver"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-makedepends="xorg-server-dev util-macros mesa-dev libxi-dev xorgproto"
-source="https://www.x.org/releases/individual/driver/xf86-video-sis-$pkgver.tar.bz2"
-
-build() {
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	make check
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-sha512sums="5aa101e5217f15667f2c94f7a76f4afcf47717b61f5d206ce65efe35dc3f674ca294f98ca8586971c6467f31decdd94d8255ebfc7dc220fac0179afc61995952  xf86-video-sis-0.12.0.tar.bz2"
diff --git a/main/xf86-video-sunleo/APKBUILD b/main/xf86-video-sunleo/APKBUILD
deleted file mode 100644
index dbf12191cca..00000000000
--- a/main/xf86-video-sunleo/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-sunleo
-pkgver=1.2.2
-pkgrel=3
-pkgdesc="Leo video driver"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
-	"
-
-builddir="$srcdir"/$pkgname-$pkgver
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-sha512sums="467559e608b59dcf2a50cbaddc218ad0778e88515906fed9d6346db09187f3f7645482113882bcf81428d4af3d3f2cccec7f24663c12c23a411f8a87551ef23f  xf86-video-sunleo-1.2.2.tar.bz2"
diff --git a/main/xf86-video-tdfx/APKBUILD b/main/xf86-video-tdfx/APKBUILD
deleted file mode 100644
index 0dc9655761f..00000000000
--- a/main/xf86-video-tdfx/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-tdfx
-pkgver=1.5.0
-pkgrel=0
-pkgdesc="3Dfx video driver"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libxi-dev util-macros libdrm-dev mesa-dev
-	xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
-	"
-
-builddir="$srcdir"/$pkgname-$pkgver
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="eca3359c7db56183a1cfcce7295e41ccc349005ee1cbcf75209f1e4e8e04e887ba511712ef35efc11c940713c8327b0b8ab8b6c86facf02062b3e84c0b1af5ff  xf86-video-tdfx-1.5.0.tar.bz2"
diff --git a/main/xf86-video-vesa/APKBUILD b/main/xf86-video-vesa/APKBUILD
deleted file mode 100644
index f200f5cd419..00000000000
--- a/main/xf86-video-vesa/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-vesa
-pkgver=2.4.0
-pkgrel=0
-pkgdesc="X.org generic VESA video driver"
-url="https://xorg.freedesktop.org/wiki/"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
-
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-sha512sums="4af5c0a7fd64eba503980198cf510688dff2f33482ceac446455d97255dcc828613387ac57828eb6dce080cb15a8644a2b2e278bf356705fdeaea873ab07c2de  xf86-video-vesa-2.4.0.tar.bz2"
diff --git a/main/xf86-video-vmware/APKBUILD b/main/xf86-video-vmware/APKBUILD
deleted file mode 100644
index 10a9fd219ed..00000000000
--- a/main/xf86-video-vmware/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-vmware
-pkgver=13.3.0
-pkgrel=0
-pkgdesc="X.org VMWare video driver"
-url="https://xorg.freedesktop.org"
-arch="x86 x86_64"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libdrm-dev	libxi-dev eudev-dev util-macros
-	xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
-	"
-
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca  xf86-video-vmware-13.3.0.tar.bz2"
diff --git a/main/xf86-video-xgixp/APKBUILD b/main/xf86-video-xgixp/APKBUILD
deleted file mode 100644
index 341b73d2634..00000000000
--- a/main/xf86-video-xgixp/APKBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-xgixp
-pkgver=1.8.1
-pkgrel=11
-pkgdesc="X.org XGIXP video driver"
-url="https://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="xorg-server-dev libdrm-dev mesa-dev util-macros xorgproto"
-source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
-	git-fixes.patch"
-
-builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$builddir"
-	update_config_sub
-	default_prepare
-}
-
-build() {
-	cd "$builddir"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-sha512sums="ab45909e4b48cc9dfa3daf5d2cb50dff6ad7d841fe1dc75ea699a7c555d70a6f565d97b7c68f4c58da16ad022b973892e229f8d0f4059c8712cf513c1ec10f84  xf86-video-xgixp-1.8.1.tar.bz2
-c3a5f629655dba04af14db2006fdc82eb4ba406082eb830903e79bc4ac8f269ed096b11a0b91d0a789bff3bdda0ac4789ad76e4a8f568ef24a01d9cbc5c34745  git-fixes.patch"
diff --git a/main/xf86-video-xgixp/git-fixes.patch b/main/xf86-video-xgixp/git-fixes.patch
deleted file mode 100644
index ba54f01a61e..00000000000
--- a/main/xf86-video-xgixp/git-fixes.patch
+++ /dev/null
@@ -1,362 +0,0 @@
-From a84753dd495bcfd724406cae470e17d0c561d0c3 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 12:55:05 +0000
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/xgi_driver.c b/src/xgi_driver.c
-index 580a03a..8ce071b 100644
---- a/src/xgi_driver.c
-+++ b/src/xgi_driver.c
-@@ -53,8 +53,6 @@
- 
- /* initialise a SW cursor */
- #include "mipointer.h"
--/* implementing backing store */
--#include "mibstore.h"
- 
- /* colormap initialization */
- #include "micmap.h"
-@@ -2041,10 +2039,6 @@ pScrn->pScreen = pScreen;
-         xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "FB Manager init failed \n");
-     }
- 
--    /* If backing store is to be supported (as is usually the case), initialise it. */
--    miInitializeBackingStore(pScreen);
--    XGIDebug(DBG_FUNCTION, "[DBG] Jong 06142006-After miInitializeBackingStore()\n");
--
-     xf86SetBackingStore(pScreen);
-     XGIDebug(DBG_FUNCTION, "[DBG] Jong 06142006-After xf86SetBackingStore()\n");
- 
---
-cgit v0.9.0.2-2-gbebe
-From e881cbb7cc4aa2d3a4477fd3e0681dc35075457a Mon Sep 17 00:00:00 2001
-From: Egbert Eich <eich@freedesktop.org>
-Date: Fri, 19 Jul 2013 12:10:57 +0200
-Subject: Remove symbol lists as they are not used any more
-
-Remove symbol lists once used by the old Metrolink module
-loader to ensure that all symbols used by the driver are
-present.
-This module loader has been dropped ages ago, the function
-calls into this module loader to perform this verification
-has been dropped from this driver howver the symbol lists
-have survived - not referenced from anywhere any more.
-
-Reviewed-by:  <wharms@bfs.de>
-Signed-off-by: Egbert Eich <eich@freedesktop.org>
-
-diff --git a/src/xgi_driver.c b/src/xgi_driver.c
-index 8ce071b..c98fcf7 100644
---- a/src/xgi_driver.c
-+++ b/src/xgi_driver.c
-@@ -149,149 +149,6 @@ static void xg47_setup_fb_wrap(ReadMemoryProcPtr *read_ptr,
-     WriteMemoryProcPtr *write_ptr, DrawablePtr pDraw);
- static void xg47_finish_fb_wrap(DrawablePtr pDraw);
- 
--
--static const char *vgahwSymbols[] = {
--    "vgaHWBlankScreen",
--    "vgaHWddc1SetSpeedWeak",
--    "vgaHWFreeHWRec",
--    "vgaHWGetHWRec",
--    "vgaHWGetIOBase",
--    "vgaHWGetIndex",
--    "vgaHWInit",
--    "vgaHWLock",
--    "vgaHWMapMem",
--    "vgaHWProtect",
--    "vgaHWRestore",
--    "vgaHWSave",
--    "vgaHWSaveScreen",
--    "vgaHWSetMmioFuncs",
--    "vgaHWUnlock",
--    NULL
--};
--
--static const char *ddcSymbols[] = {
--    "xf86DoEDID_DDC1",
--    "xf86DoEDID_DDC2",
--    "xf86PrintEDID",
--    "xf86SetDDCproperties",
--    NULL
--};
--
--static const char *i2cSymbols[] = {
--    "xf86CreateI2CBusRec",
--    "xf86I2CBusInit",
--    NULL
--};
--
--static const char *fbSymbols[] = {
--#if X_BYTE_ORDER == X_BIG_ENDIAN
--    "wfbPictureInit",
--    "wfbScreenInit",
--#else
--    "fbPictureInit",
--    "fbScreenInit",
--#endif
--    NULL
--};
--
--static const char *xaaSymbols[] = {
--    "XAACreateInfoRec",
--    "XAAestroyInfoRec",
--    "XAAFillSolidRects",
--    "XAAGetCopyROP",
--    "XAAGetPatternROP", 
--    "XAAInit",
--    "XAAScreenIndex",
--    "XAAStippleScanlineFuncLSBFirst",
--    "XAAOverlayFBfuncs",
--    "XAACachePlanarMonoStipple",
--    "XAAHelpPatternROP",
--    NULL
--};
--
--static const char *ramdacSymbols[] = {
--    "xf86CreateCursorInfoRec",
--    "xf86DestroyCursorInfoRec",
--    "xf86InitCursor",
--    NULL
--};
--
--static const char *drmSymbols[] = {
--    "drmGetInterruptFromBusID",
--    "drmCtlInstHandler",
--    "drmCtlUninstHandler",
--    "drmCommandNone",
--    "drmCommandRead",
--    "drmCommandWrite",
--    "drmCommandWriteRead",
--    "drmFreeVersion",
--    "drmGetLibVersion",
--    "drmGetVersion",
--    "drmMap",
--    "drmUnmap",
--    NULL
--};
--
--static const char *driSymbols[] = {
--    "DRICloseScreen",
--    "DRICreateInfoRec",
--    "DRIDestroyInfoRec",
--    "DRIFinishScreenInit",
--    "DRIGetContext",
--    "DRIGetDeviceInfo",
--    "DRIGetSAREAPrivate",
--    "DRILock",
--    "DRIQueryVersion",
--    "DRIScreenInit",
--    "DRIUnlock",
--    "DRICreatePCIBusID",
--    NULL
--};
--
--static const char *vbeSymbols[] = {
--    "VBEInit",
--    "VBEDPMSSet",
--    "vbeDoEDID",
--    "vbeFree",
--    NULL
--};
--
--static const char *int10Symbols[] = {
--    "xf86ExecX86int10",
--    "xf86FreeInt10",
--    "xf86InitInt10",
--    NULL
--};
--
--static const char *shadowSymbols[] = {
--    "shadowInit",
--    NULL
--};
--
--static const char *fbdevHWSymbols[] = {
--    "fbdevHWInit",
--    "fbdevHWUseBuildinMode",
--    "fbdevHWGetLineLength",
--    "fbdevHWGetVidmem",
--    "fbdevHWDPMSSet",
--    /* colormap */
--    "fbdevHWLoadPaletteWeak",
--    /* ScrnInfo hooks */
--    "fbdevHWAdjustFrameWeak",
--    "fbdevHWEnterVT",
--    "fbdevHWLeaveVT",
--    "fbdevHWModeInit",
--    "fbdevHWRestore",
--    "fbdevHWSave",
--    "fbdevHWSwitchModeWeak",
--    "fbdevHWValidModeWeak",
--    "fbdevHWMapMMIO",
--    "fbdevHWMapVidmem",
--    "fbdevHWUnmapMMIO",
--    "fbdevHWUnmapVidmem",
--    NULL
--};
--
- #ifdef XSERVER_LIBPCIACCESS
- #define XGI_DEVICE_MATCH(d, i) \
-     { 0x18ca, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
--- 
-cgit v0.10.2
-
-From e5789dfd027424996711f366e036a933d1b98c3f Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 29 Jul 2014 09:37:18 -0400
-Subject: shadow: shadowInit -> shadowAdd/Remove
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-diff --git a/src/xgi.h b/src/xgi.h
-index 8cbe77d..e122f1c 100644
---- a/src/xgi.h
-+++ b/src/xgi.h
-@@ -534,6 +534,7 @@ typedef struct {
-     RefreshAreaFuncPtr  RefreshArea;
-     CloseScreenProcPtr  CloseScreen;
-     ScreenBlockHandlerProcPtr   BlockHandler;
-+    CreateScreenResourcesProcPtr CreateScreenResources;
-     xf86PointerMovedProc        *PointerMoved;
- 
-     struct xgi_regs           savedReg;
-diff --git a/src/xgi_driver.c b/src/xgi_driver.c
-index c98fcf7..637e360 100644
---- a/src/xgi_driver.c
-+++ b/src/xgi_driver.c
-@@ -1702,6 +1702,25 @@ Bool XGIFBManagerInit(ScreenPtr pScreen)
-     return ret;
- }
- 
-+static Bool
-+XGICreateScreenResources(ScreenPtr pScreen)
-+{
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-+    XGIPtr pXGI = XGIPTR(pScrn);
-+    Bool ret;
-+
-+    pScreen->CreateScreenResources = pXGI->CreateScreenResources;
-+    ret = pScreen->CreateScreenResources(pScreen);
-+    pXGI->CreateScreenResources = pScreen->CreateScreenResources;
-+    pScreen->CreateScreenResources = XGICreateScreenResources;
-+
-+    if (ret)
-+	ret = shadowAdd(pScreen, pScreen->GetScreenPixmap(pScreen),
-+			XGIShadowUpdate, NULL, 0, 0);
-+
-+    return ret;
-+}
-+
- /* Called at the start of each server generation. */
- Bool XGIScreenInit(SCREEN_INIT_ARGS_DECL)
- {
-@@ -2011,7 +2030,10 @@ pScrn->pScreen = pScreen;
-         {
-             pXGI->RefreshArea = XGIRefreshArea;
-         }
--        shadowInit(pScreen, XGIShadowUpdate, 0);
-+        if (!shadowSetup(pScreen))
-+	    return FALSE;
-+	pXGI->CreateScreenResources = pScreen->CreateScreenResources;
-+	pScreen->CreateScreenResources = XGICreateScreenResources;
-     }
-     XGIDebug(DBG_FUNCTION, "[DBG] Jong 06142006-After pXGI->isShadowFB\n");
- 
-@@ -2272,8 +2294,10 @@ static Bool XGICloseScreen(CLOSE_SCREEN_ARGS_DECL)
- 
-     if (pXGI->pShadow)
-     {
-+	shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen));
-         free(pXGI->pShadow);
-         pXGI->pShadow = NULL;
-+	pScreen->CreateScreenResources = pXGI->CreateScreenResources;
-     }
- 
-     if (pXGI->pDgaModes)
--- 
-cgit v0.10.2
-
-From cb0ebfa54639619c11ea8277ab7573a5db7484f9 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 29 Jul 2014 09:37:44 -0400
-Subject: Stop using deprecated xf86PciInfo.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-diff --git a/src/xgi_driver.c b/src/xgi_driver.c
-index 637e360..b440e85 100644
---- a/src/xgi_driver.c
-+++ b/src/xgi_driver.c
-@@ -43,9 +43,6 @@
- #include <xf86RandR12.h>
- #include "vbe.h"
- 
--/* PCI vendor/device definitions */
--#include "xf86PciInfo.h"
--
- /* fbdevhw & vgahw */
- #include "fbdevhw.h"
- #include "vgaHW.h"
--- 
-cgit v0.10.2
-
-From e36331f3f2641900efe8363fe3dc15877a72c027 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 8 Oct 2014 10:34:45 +0200
-Subject: Update for new damage API
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-diff --git a/src/xgi_shadow.c b/src/xgi_shadow.c
-index 80f3645..c146ce4 100644
---- a/src/xgi_shadow.c
-+++ b/src/xgi_shadow.c
-@@ -86,7 +86,7 @@ void XGIRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
- 
- void XGIShadowUpdate (ScreenPtr pScreen, shadowBufPtr pBuf)
- {
--    RegionPtr       pRegion = &pBuf->damage;
-+    RegionPtr       pRegion = DamageRegion(pBuf->pDamage);
-     ScrnInfoPtr     pScrn;
-     pScrn = xf86ScreenToScrn(pScreen);
- 
--- 
-cgit v0.10.2
-
-From 81c1cc40820a3e24efc0565b68f44eb6748a2db9 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 19 Jul 2016 10:03:56 -0400
-Subject: Adapt Block/WakeupHandler signature for ABI 23
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-diff --git a/src/compat-api.h b/src/compat-api.h
-index 98ba435..44daea4 100644
---- a/src/compat-api.h
-+++ b/src/compat-api.h
-@@ -78,11 +78,19 @@
- 
- #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
- 
-+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
-+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
-+#define BLOCKHANDLER_ARGS arg, pTimeout
-+
-+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
-+#define WAKEUPHANDLER_ARGS arg, result
-+#else
- #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
- #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
- 
- #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask
- #define WAKEUPHANDLER_ARGS arg, result, read_mask
-+#endif
- 
- #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
- #define CLOSE_SCREEN_ARGS pScreen
--- 
-cgit v0.10.2
-
diff --git a/main/xfsprogs/APKBUILD b/main/xfsprogs/APKBUILD
index 1b7b5ab7250..4cf41113d78 100644
--- a/main/xfsprogs/APKBUILD
+++ b/main/xfsprogs/APKBUILD
@@ -1,24 +1,30 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfsprogs
-pkgver=5.5.0
+pkgver=6.6.0
 pkgrel=0
 pkgdesc="XFS filesystem utilities"
-url="http://xfs.org/index.php/Main_Page"
+url="https://xfs.org/index.php/Main_Page"
 arch="all"
 license="LGPL-2.1-or-later"
-makedepends="linux-headers attr-dev util-linux-dev bash gzip python3"
+makedepends="
+	attr-dev
+	bash
+	inih-dev
+	linux-headers
+	python3
+	userspace-rcu-dev
+	util-linux-dev
+	"
 options="!check"  # no test suite
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-extra"
-source="https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-$pkgver.tar.gz
-	fix-mmap.patch
-	musl-MAP_SYNC-fix.patch
+source="https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-$pkgver.tar.xz
+	lfs64.patch
 	"
 
-
 build() {
 	export DEBUG=-DNDEBUG
-	export OPTIMIZER="$CFLAGS"
+	export OPTIMIZER="$CFLAGS -flto=auto"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +32,12 @@ build() {
 		--sbindir=/sbin \
 		--libexecdir=/usr/lib \
 		--enable-gettext=no
-	make SHELL=/bin/bash
+	make
 }
 
 package() {
 	make -j1 DIST_ROOT="$pkgdir" install install-dev
-	find "$pkgdir" -name *.la -delete
+	rm -v "$pkgdir"/lib/libhandle.la
 	mv "$pkgdir"/sbin "$pkgdir"/usr
 	mkdir -p "$pkgdir"/sbin
 	for i in mkfs.xfs fsck.xfs xfs_repair; do
@@ -43,11 +49,13 @@ package() {
 extra() {
 	depends="$pkgname python3" # python3 for xfs_scrub_all
 	pkgdesc="XFS filesystem extra utilities"
-	mkdir -p "$subpkgdir"
+
+	# shellcheck disable=2115
 	rm -rf "$pkgdir"/lib "$pkgdir"/usr/lib
-	mv "$pkgdir"/usr "$subpkgdir"/
+	amove usr/
 }
 
-sha512sums="577bac18420cb31748df29411ae204ac261554b64ecb2b49bafb56c9ad40b6944dc93ace1b5f0a483ff3044ef0a3f8bb629f40450c7f241bb8608d6e251cb570  xfsprogs-5.5.0.tar.gz
-080161b211e20277e44f714961b36064536bb5cce72a6f93fef4996e296a3953d33c1a066ef371ccd5551622357105f9be9086ef917386f5d43f6a211b0bd7c9  fix-mmap.patch
-bc7971207a296d8112f8993f6a266533135aae59a4438bb511f472931c37b8ce3033c597d67abbd3664f4405317aeb049e747c1811c9495c1a24d98935f799cc  musl-MAP_SYNC-fix.patch"
+sha512sums="
+89b4436a958075ac77cc2b5b5f0618164d47f7d6fbc2271a7927c886fba7bf67284e1825c1ecc259969235222b4d084a40c354edb6d83c21029d737108aa38da  xfsprogs-6.6.0.tar.xz
+efa59b3cdfb5f3c9d2fc4cbadf199be31de9a07fa283e67b8645547db64705a75e8135d73f94e31f85c44f51b86a8842ed90cd3bfa5ebee315eb9a6d8eb0e073  lfs64.patch
+"
diff --git a/main/xfsprogs/fix-mmap.patch b/main/xfsprogs/fix-mmap.patch
deleted file mode 100644
index d0740f695b3..00000000000
--- a/main/xfsprogs/fix-mmap.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/io/mmap.c b/io/mmap.c
-index f9383e5..12f3fff 100644
---- a/io/mmap.c
-+++ b/io/mmap.c
-@@ -4,10 +4,10 @@
-  * All Rights Reserved.
-  */
- 
--#include "command.h"
--#include "input.h"
- #include <sys/mman.h>
- #include <signal.h>
-+#include "command.h"
-+#include "input.h"
- #include "init.h"
- #include "io.h"
- 
-@@ -20,6 +20,14 @@ static cmdinfo_t mwrite_cmd;
- static cmdinfo_t mremap_cmd;
- #endif /* HAVE_MREMAP */
- 
-+#ifndef HAVE_MAP_SYNC
-+#define MAP_SYNC 0
-+#define MAP_SHARED_VALIDATE 0
-+#else
-+#include <asm-generic/mman.h>
-+#include <asm-generic/mman-common.h>
-+#endif /* HAVE_MAP_SYNC */
-+
- mmap_region_t	*maptable;
- int		mapcount;
- mmap_region_t	*mapping;
diff --git a/main/xfsprogs/lfs64.patch b/main/xfsprogs/lfs64.patch
new file mode 100644
index 00000000000..05406ea063d
--- /dev/null
+++ b/main/xfsprogs/lfs64.patch
@@ -0,0 +1,683 @@
+needed since https://github.com/bminor/musl/commit/25e6fee27f4a293728dd15b659170e7b9c7db9bc
+--
+diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
+index 79f6594..854fd7f 100644
+--- a/copy/xfs_copy.c
++++ b/copy/xfs_copy.c
+@@ -881,7 +881,7 @@
+ 			}
+ 		} else  {
+ 			char	*lb = memalign(wbuf_align, XFS_MAX_SECTORSIZE);
+-			off64_t	off;
++			off_t	off;
+ 			ssize_t	len;
+ 
+ 			/* ensure device files are sufficiently large */
+diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
+index ba02506..12fffbd 100644
+--- a/fsr/xfs_fsr.c
++++ b/fsr/xfs_fsr.c
+@@ -1148,7 +1148,7 @@ packfile(char *fname, char *tname, int fd,
+ 	struct dioattr	dio;
+ 	static xfs_swapext_t   sx;
+ 	struct xfs_flock64  space;
+-	off64_t 	cnt, pos;
++	off_t 	cnt, pos;
+ 	void 		*fbuf = NULL;
+ 	int 		ct, wc, wc_b4;
+ 	char		ffname[SMBUFSZ];
+diff --git a/io/bmap.c b/io/bmap.c
+index 722a389..6182e1c 100644
+--- a/io/bmap.c
++++ b/io/bmap.c
+@@ -257,7 +257,7 @@ bmap_f(
+ #define	FLG_BSW		0000010	/* Not on begin of stripe width */
+ #define	FLG_ESW		0000001	/* Not on end   of stripe width */
+ 		int	agno;
+-		off64_t agoff, bbperag;
++		off_t agoff, bbperag;
+ 		int	foff_w, boff_w, aoff_w, tot_w, agno_w;
+ 		char	rbuf[32], bbuf[32], abuf[32];
+ 		int	sunit, swidth;
+@@ -267,8 +267,8 @@ bmap_f(
+ 		if (is_rt)
+ 			sunit = swidth = bbperag = 0;
+ 		else {
+-			bbperag = (off64_t)fsgeo.agblocks *
+-				  (off64_t)fsgeo.blocksize / BBSIZE;
++			bbperag = (off_t)fsgeo.agblocks *
++				  (off_t)fsgeo.blocksize / BBSIZE;
+ 			sunit = (fsgeo.sunit * fsgeo.blocksize) / BBSIZE;
+ 			swidth = (fsgeo.swidth * fsgeo.blocksize) / BBSIZE;
+ 		}
+diff --git a/io/copy_file_range.c b/io/copy_file_range.c
+index d154fa7..20ddde0 100644
+--- a/io/copy_file_range.c
++++ b/io/copy_file_range.c
+@@ -54,7 +54,7 @@ copy_file_range_cmd(int fd, long long *src_off, long long *dst_off, size_t len)
+ 	return 0;
+ }
+ 
+-static off64_t
++static off_t
+ copy_src_filesize(int fd)
+ {
+ 	struct stat st;
+@@ -154,7 +154,7 @@ copy_range_f(int argc, char **argv)
+ 	}
+ 
+ 	if (!len_specified) {
+-		off64_t	sz;
++		off_t	sz;
+ 
+ 		sz = copy_src_filesize(fd);
+ 		if (sz < 0 || (unsigned long long)sz > SIZE_MAX) {
+diff --git a/io/cowextsize.c b/io/cowextsize.c
+index f6b134d..00e40c6 100644
+--- a/io/cowextsize.c
++++ b/io/cowextsize.c
+@@ -50,10 +50,10 @@ static int
+ set_cowextsize(const char *path, int fd, long extsz)
+ {
+ 	struct fsxattr	fsx;
+-	struct stat64	stat;
++	struct stat	stat;
+ 
+-	if (fstat64(fd, &stat) < 0) {
+-		perror("fstat64");
++	if (fstat(fd, &stat) < 0) {
++		perror("fstat");
+ 		exitcode = 1;
+ 		return 0;
+ 	}
+diff --git a/io/fadvise.c b/io/fadvise.c
+index 60cc0f0..0966c41 100644
+--- a/io/fadvise.c
++++ b/io/fadvise.c
+@@ -39,7 +39,7 @@ fadvise_f(
+ 	int		argc,
+ 	char		**argv)
+ {
+-	off64_t		offset = 0, length = 0;
++	off_t		offset = 0, length = 0;
+ 	int		c, range = 0, advise = POSIX_FADV_NORMAL;
+ 
+ 	while ((c = getopt(argc, argv, "dnrsw")) != EOF) {
+diff --git a/io/fiemap.c b/io/fiemap.c
+index f0c74df..b41f71b 100644
+--- a/io/fiemap.c
++++ b/io/fiemap.c
+@@ -234,9 +234,9 @@ fiemap_f(
+ 	int		tot_w = 5;	/* 5 since its just one number */
+ 	int		flg_w = 5;
+ 	__u64		last_logical = 0;	/* last extent offset handled */
+-	off64_t		start_offset = 0;	/* mapping start */
+-	off64_t		length = -1LL;		/* mapping length */
+-	off64_t		range_end = -1LL;	/* mapping end*/
++	off_t		start_offset = 0;	/* mapping start */
++	off_t		length = -1LL;		/* mapping length */
++	off_t		range_end = -1LL;	/* mapping end*/
+ 	size_t		fsblocksize, fssectsize;
+ 	struct stat	st;
+ 
+diff --git a/io/fsmap.c b/io/fsmap.c
+index 7db5184..bf11963 100644
+--- a/io/fsmap.c
++++ b/io/fsmap.c
+@@ -170,7 +170,7 @@ dump_map_verbose(
+ 	unsigned long long	i;
+ 	struct fsmap		*p;
+ 	int			agno;
+-	off64_t			agoff, bperag;
++	off_t			agoff, bperag;
+ 	int			foff_w, boff_w, aoff_w, tot_w, agno_w, own_w;
+ 	int			nr_w, dev_w;
+ 	char			rbuf[40], bbuf[40], abuf[40], obuf[40];
+@@ -183,8 +183,8 @@ dump_map_verbose(
+ 	dev_w = 3;
+ 	nr_w = 4;
+ 	tot_w = MINTOT_WIDTH;
+-	bperag = (off64_t)fsgeo->agblocks *
+-		  (off64_t)fsgeo->blocksize;
++	bperag = (off_t)fsgeo->agblocks *
++		  (off_t)fsgeo->blocksize;
+ 	sunit = (fsgeo->sunit * fsgeo->blocksize);
+ 	swidth = (fsgeo->swidth * fsgeo->blocksize);
+ 
+diff --git a/io/io.h b/io/io.h
+index fe474fa..68e5e48 100644
+--- a/io/io.h
++++ b/io/io.h
+@@ -53,7 +53,7 @@ extern int stat_f(int argc, char **argv);
+ typedef struct mmap_region {
+ 	void		*addr;		/* address of start of mapping */
+ 	size_t		length;		/* length of mapping */
+-	off64_t		offset;		/* start offset into backing file */
++	off_t		offset;		/* start offset into backing file */
+ 	int		prot;		/* protection mode of the mapping */
+ 	int		flags;		/* MAP_* flags passed to mmap() */
+ 	char		*name;		/* name of backing file */
+@@ -63,13 +63,13 @@ extern mmap_region_t	*maptable;	/* mmap'd region array */
+ extern int		mapcount;	/* #entries in the mapping table */
+ extern mmap_region_t	*mapping;	/* active mapping table entry */
+ extern int maplist_f(void);
+-extern void *check_mapping_range(mmap_region_t *, off64_t, size_t, int);
++extern void *check_mapping_range(mmap_region_t *, off_t, size_t, int);
+ 
+ /*
+  * Various xfs_io helper routines/globals
+  */
+ 
+-extern off64_t		filesize(void);
++extern off_t		filesize(void);
+ extern int		openfile(char *, struct xfs_fsop_geom *, int, mode_t,
+ 				 struct fs_path *);
+ extern int		addfile(char *, int , struct xfs_fsop_geom *, int,
+@@ -84,9 +84,9 @@ extern size_t		io_buffersize;
+ extern int		vectors;
+ extern struct iovec	*iov;
+ extern int		alloc_buffer(size_t, int, unsigned int);
+-extern int		read_buffer(int, off64_t, long long, long long *,
++extern int		read_buffer(int, off_t, long long, long long *,
+ 					int, int);
+-extern void		dump_buffer(off64_t, ssize_t);
++extern void		dump_buffer(off_t, ssize_t);
+ 
+ extern void		attr_init(void);
+ extern void		bmap_init(void);
+diff --git a/io/madvise.c b/io/madvise.c
+index bde3153..6e9c5b1 100644
+--- a/io/madvise.c
++++ b/io/madvise.c
+@@ -39,7 +39,7 @@ madvise_f(
+ 	int		argc,
+ 	char		**argv)
+ {
+-	off64_t		offset, llength;
++	off_t		offset, llength;
+ 	size_t		length;
+ 	void		*start;
+ 	int		advise = MADV_NORMAL, c;
+diff --git a/io/mincore.c b/io/mincore.c
+index 67f1d6c..24147ac 100644
+--- a/io/mincore.c
++++ b/io/mincore.c
+@@ -17,7 +17,7 @@ mincore_f(
+ 	int		argc,
+ 	char		**argv)
+ {
+-	off64_t		offset, llength;
++	off_t		offset, llength;
+ 	size_t		length;
+ 	size_t		blocksize, sectsize;
+ 	void		*start;
+diff --git a/io/mmap.c b/io/mmap.c
+index 425957d..10fd7b4 100644
+--- a/io/mmap.c
++++ b/io/mmap.c
+@@ -63,11 +63,11 @@ print_mapping(
+ void *
+ check_mapping_range(
+ 	mmap_region_t	*map,
+-	off64_t		offset,
++	off_t		offset,
+ 	size_t		length,
+ 	int		pagealign)
+ {
+-	off64_t		relative;
++	off_t		relative;
+ 
+ 	if (offset < mapping->offset) {
+ 		printf(_("offset (%lld) is before start of mapping (%lld)\n"),
+@@ -155,7 +155,7 @@ mmap_f(
+ 	int		argc,
+ 	char		**argv)
+ {
+-	off64_t		offset;
++	off_t		offset;
+ 	ssize_t		length = 0, length2 = 0;
+ 	void		*address = NULL;
+ 	char		*filename;
+@@ -308,7 +308,7 @@ msync_f(
+ 	int		argc,
+ 	char		**argv)
+ {
+-	off64_t		offset;
++	off_t		offset;
+ 	ssize_t		length;
+ 	void		*start;
+ 	int		c, flags = 0;
+@@ -401,7 +401,7 @@ mread_f(
+ 	int		argc,
+ 	char		**argv)
+ {
+-	off64_t		offset, tmp, dumpoffset, printoffset;
++	off_t		offset, tmp, dumpoffset, printoffset;
+ 	ssize_t		length;
+ 	size_t		dumplen, cnt = 0;
+ 	char		*bp;
+@@ -566,7 +566,7 @@ mwrite_f(
+ 	int		argc,
+ 	char		**argv)
+ {
+-	off64_t		offset, tmp;
++	off_t		offset, tmp;
+ 	ssize_t		length;
+ 	void		*start;
+ 	char		*sp;
+diff --git a/io/pread.c b/io/pread.c
+index 0f1d8b9..79990c6 100644
+--- a/io/pread.c
++++ b/io/pread.c
+@@ -116,7 +116,7 @@ alloc_buffer(
+ static void
+ __dump_buffer(
+ 	void		*buf,
+-	off64_t		offset,
++	off_t		offset,
+ 	ssize_t		len)
+ {
+ 	int		i, j;
+@@ -141,7 +141,7 @@ __dump_buffer(
+ 
+ void
+ dump_buffer(
+-	off64_t		offset,
++	off_t		offset,
+ 	ssize_t		len)
+ {
+ 	int		i, l;
+@@ -164,7 +164,7 @@ dump_buffer(
+ static ssize_t
+ do_preadv(
+ 	int		fd,
+-	off64_t		offset,
++	off_t		offset,
+ 	long long	count)
+ {
+ 	int		vecs = 0;
+@@ -199,7 +199,7 @@ do_preadv(
+ static ssize_t
+ do_pread(
+ 	int		fd,
+-	off64_t		offset,
++	off_t		offset,
+ 	long long	count,
+ 	size_t		buffer_size)
+ {
+@@ -212,13 +212,13 @@ do_pread(
+ static int
+ read_random(
+ 	int		fd,
+-	off64_t		offset,
++	off_t		offset,
+ 	long long	count,
+ 	long long	*total,
+ 	unsigned int	seed,
+ 	int		eof)
+ {
+-	off64_t		end, off, range;
++	off_t		end, off, range;
+ 	ssize_t		bytes;
+ 	int		ops = 0;
+ 
+@@ -259,12 +259,12 @@ read_random(
+ static int
+ read_backward(
+ 	int		fd,
+-	off64_t		*offset,
++	off_t		*offset,
+ 	long long	*count,
+ 	long long	*total,
+ 	int		eof)
+ {
+-	off64_t		end, off = *offset;
++	off_t		end, off = *offset;
+ 	ssize_t		bytes = 0, bytes_requested;
+ 	long long	cnt = *count;
+ 	int		ops = 0;
+@@ -319,7 +319,7 @@ read_backward(
+ static int
+ read_forward(
+ 	int		fd,
+-	off64_t		offset,
++	off_t		offset,
+ 	long long	count,
+ 	long long	*total,
+ 	int		verbose,
+@@ -353,7 +353,7 @@ read_forward(
+ int
+ read_buffer(
+ 	int		fd,
+-	off64_t		offset,
++	off_t		offset,
+ 	long long	count,
+ 	long long	*total,
+ 	int		verbose,
+@@ -368,7 +368,7 @@ pread_f(
+ 	char		**argv)
+ {
+ 	size_t		bsize;
+-	off64_t		offset;
++	off_t		offset;
+ 	unsigned int	zeed = 0;
+ 	long long	count, total, tmp;
+ 	size_t		fsblocksize, fssectsize;
+diff --git a/io/pwrite.c b/io/pwrite.c
+index 467bfa9..8d134c5 100644
+--- a/io/pwrite.c
++++ b/io/pwrite.c
+@@ -54,7 +54,7 @@ pwrite_help(void)
+ static ssize_t
+ do_pwritev(
+ 	int		fd,
+-	off64_t		offset,
++	off_t		offset,
+ 	long long	count,
+ 	int		pwritev2_flags)
+ {
+@@ -97,7 +97,7 @@ do_pwritev(
+ static ssize_t
+ do_pwrite(
+ 	int		fd,
+-	off64_t		offset,
++	off_t		offset,
+ 	long long	count,
+ 	size_t		buffer_size,
+ 	int		pwritev2_flags)
+@@ -110,13 +110,13 @@ do_pwrite(
+ 
+ static int
+ write_random(
+-	off64_t		offset,
++	off_t		offset,
+ 	long long	count,
+ 	unsigned int	seed,
+ 	long long	*total,
+ 	int 		pwritev2_flags)
+ {
+-	off64_t		off, range;
++	off_t		off, range;
+ 	ssize_t		bytes;
+ 	int		ops = 0;
+ 
+@@ -155,12 +155,12 @@ write_random(
+ 
+ static int
+ write_backward(
+-	off64_t		offset,
++	off_t		offset,
+ 	long long	*count,
+ 	long long	*total,
+ 	int		pwritev2_flags)
+ {
+-	off64_t		end, off = offset;
++	off_t		end, off = offset;
+ 	ssize_t		bytes = 0, bytes_requested;
+ 	long long	cnt = *count;
+ 	int		ops = 0;
+@@ -214,11 +214,11 @@ write_backward(
+ 
+ static int
+ write_buffer(
+-	off64_t		offset,
++	off_t		offset,
+ 	long long	count,
+ 	size_t		bs,
+ 	int		fd,
+-	off64_t		skip,
++	off_t		skip,
+ 	long long	*total,
+ 	int		pwritev2_flags)
+ {
+@@ -253,7 +253,7 @@ write_buffer(
+ 
+ static int
+ write_once(
+-	off64_t		offset,
++	off_t		offset,
+ 	long long	count,
+ 	long long	*total,
+ 	int		pwritev2_flags)
+@@ -275,7 +275,7 @@ pwrite_f(
+ 	char		**argv)
+ {
+ 	size_t		bsize;
+-	off64_t		offset, skip = 0;
++	off_t		offset, skip = 0;
+ 	long long	count, total, tmp;
+ 	unsigned int	zeed = 0, seed = 0xcdcdcdcd;
+ 	size_t		fsblocksize, fssectsize;
+diff --git a/io/reflink.c b/io/reflink.c
+index 8e4f389..b6a3c05 100644
+--- a/io/reflink.c
++++ b/io/reflink.c
+@@ -98,7 +98,7 @@ dedupe_f(
+ 	int		argc,
+ 	char		**argv)
+ {
+-	off64_t		soffset, doffset;
++	off_t		soffset, doffset;
+ 	long long	count, total;
+ 	char		*infile;
+ 	int		condensed, quiet_flag;
+@@ -226,7 +226,7 @@ reflink_f(
+ 	int		argc,
+ 	char		**argv)
+ {
+-	off64_t		soffset, doffset;
++	off_t		soffset, doffset;
+ 	long long	count = 0, total;
+ 	char		*infile = NULL;
+ 	int		condensed, quiet_flag;
+diff --git a/io/seek.c b/io/seek.c
+index 6734ecb..ffe7439 100644
+--- a/io/seek.c
++++ b/io/seek.c
+@@ -63,8 +63,8 @@ static void
+ seek_output(
+ 	int	startflag,
+ 	char	*type,
+-	off64_t	start,
+-	off64_t	offset)
++	off_t	start,
++	off_t	offset)
+ {
+ 	if (offset == -1) {
+ 		if (errno == ENXIO) {
+@@ -92,7 +92,7 @@ seek_f(
+ 	int	argc,
+ 	char	**argv)
+ {
+-	off64_t		offset, start;
++	off_t		offset, start;
+ 	size_t		fsblocksize, fssectsize;
+ 	int		c;
+ 	int		current;	/* specify data or hole */
+diff --git a/io/sendfile.c b/io/sendfile.c
+index a003bb5..2ce569c 100644
+--- a/io/sendfile.c
++++ b/io/sendfile.c
+@@ -34,12 +34,12 @@ sendfile_help(void)
+ 
+ static int
+ send_buffer(
+-	off64_t		offset,
++	off_t		offset,
+ 	size_t		count,
+ 	int		fd,
+ 	long long	*total)
+ {
+-	off64_t		off = offset;
++	off_t		off = offset;
+ 	ssize_t		bytes, bytes_remaining = count;
+ 	int		ops = 0;
+ 
+@@ -66,7 +66,7 @@ sendfile_f(
+ 	int		argc,
+ 	char		**argv)
+ {
+-	off64_t		offset = 0;
++	off_t		offset = 0;
+ 	long long	count, total;
+ 	size_t		blocksize, sectsize;
+ 	struct timeval	t1, t2;
+diff --git a/io/stat.c b/io/stat.c
+index b57f9ee..e8f68dc 100644
+--- a/io/stat.c
++++ b/io/stat.c
+@@ -21,7 +21,7 @@ static cmdinfo_t stat_cmd;
+ static cmdinfo_t statfs_cmd;
+ static cmdinfo_t statx_cmd;
+ 
+-off64_t
++off_t
+ filesize(void)
+ {
+ 	struct stat	st;
+diff --git a/io/sync_file_range.c b/io/sync_file_range.c
+index 94285c2..2375a06 100644
+--- a/io/sync_file_range.c
++++ b/io/sync_file_range.c
+@@ -30,7 +30,7 @@ sync_range_f(
+ 	int		argc,
+ 	char		**argv)
+ {
+-	off64_t		offset = 0, length = 0;
++	off_t		offset = 0, length = 0;
+ 	int		c, sync_mode = 0;
+ 	size_t		blocksize, sectsize;
+ 
+diff --git a/io/truncate.c b/io/truncate.c
+index 1d04919..a74b613 100644
+--- a/io/truncate.c
++++ b/io/truncate.c
+@@ -16,7 +16,7 @@ truncate_f(
+ 	int		argc,
+ 	char		**argv)
+ {
+-	off64_t		offset;
++	off_t		offset;
+ 	size_t		blocksize, sectsize;
+ 
+ 	init_cvtnum(&blocksize, &sectsize);
+diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
+index d5aad3e..0faa05b 100644
+--- a/libxfs/rdwr.c
++++ b/libxfs/rdwr.c
+@@ -576,7 +576,7 @@ libxfs_balloc(
+ 
+ 
+ static int
+-__read_buf(int fd, void *buf, int len, off64_t offset, int flags)
++__read_buf(int fd, void *buf, int len, off_t offset, int flags)
+ {
+ 	int	sts;
+ 
+@@ -639,7 +639,7 @@ libxfs_readbufr_map(struct xfs_buftarg *btp, struct xfs_buf *bp, int flags)
+ 	fd = libxfs_device_to_fd(btp->bt_bdev);
+ 	buf = bp->b_addr;
+ 	for (i = 0; i < bp->b_nmaps; i++) {
+-		off64_t	offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn);
++		off_t	offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn);
+ 		int len = BBTOB(bp->b_maps[i].bm_len);
+ 
+ 		error = __read_buf(fd, buf, len, offset, flags);
+@@ -798,7 +798,7 @@ err:
+ }
+ 
+ static int
+-__write_buf(int fd, void *buf, int len, off64_t offset, int flags)
++__write_buf(int fd, void *buf, int len, off_t offset, int flags)
+ {
+ 	int	sts;
+ 
+@@ -864,7 +864,7 @@ libxfs_bwrite(
+ 		void	*buf = bp->b_addr;
+ 
+ 		for (i = 0; i < bp->b_nmaps; i++) {
+-			off64_t	offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn);
++			off_t	offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn);
+ 			int len = BBTOB(bp->b_maps[i].bm_len);
+ 
+ 			bp->b_error = __write_buf(fd, buf, len, offset,
+diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c
+index 7c1a66c..bb54e38 100644
+--- a/mdrestore/xfs_mdrestore.c
++++ b/mdrestore/xfs_mdrestore.c
+@@ -160,7 +160,7 @@
+ 	} else {
+ 		/* ensure device is sufficiently large enough */
+ 		char		lb[XFS_MAX_SECTORSIZE] = { 0 };
+-		off64_t		off;
++		off_t		off;
+ 
+ 		off = nr_blocks * blocksize - sizeof(lb);
+ 		if (pwrite(dev_fd, lb, sizeof(lb), off) < 0)
+diff --git a/repair/prefetch.c b/repair/prefetch.c
+index 017750e..35b5013 100644
+--- a/repair/prefetch.c
++++ b/repair/prefetch.c
+@@ -475,7 +475,7 @@ pf_batch_read(
+ {
+ 	struct xfs_buf		*bplist[MAX_BUFS];
+ 	unsigned int		num;
+-	off64_t			first_off, last_off, next_off;
++	off_t			first_off, last_off, next_off;
+ 	int			len, size;
+ 	int			i;
+ 	int			inode_bufs;
+diff --git a/scrub/spacemap.c b/scrub/spacemap.c
+index 03440d3..00bee17 100644
+--- a/scrub/spacemap.c
++++ b/scrub/spacemap.c
+@@ -97,11 +97,11 @@ scan_ag_rmaps(
+ 	struct scrub_ctx	*ctx = (struct scrub_ctx *)wq->wq_ctx;
+ 	struct scan_blocks	*sbx = arg;
+ 	struct fsmap		keys[2];
+-	off64_t			bperag;
++	off_t			bperag;
+ 	int			ret;
+ 
+-	bperag = (off64_t)ctx->mnt.fsgeom.agblocks *
+-		 (off64_t)ctx->mnt.fsgeom.blocksize;
++	bperag = (off_t)ctx->mnt.fsgeom.agblocks *
++		 (off_t)ctx->mnt.fsgeom.blocksize;
+ 
+ 	memset(keys, 0, sizeof(struct fsmap) * 2);
+ 	keys->fmr_device = ctx->fsinfo.fs_datadev;
+diff --git a/spaceman/freesp.c b/spaceman/freesp.c
+index 70dcdb5..f5177cb 100644
+--- a/spaceman/freesp.c
++++ b/spaceman/freesp.c
+@@ -62,7 +62,7 @@ static void
+ addtohist(
+ 	xfs_agnumber_t	agno,
+ 	xfs_agblock_t	agbno,
+-	off64_t		len)
++	off_t		len)
+ {
+ 	long		i;
+ 
+@@ -152,7 +152,7 @@ scan_ag(
+ 	struct fsmap		*l, *h;
+ 	struct fsmap		*p;
+ 	struct xfs_fd		*xfd = &file->xfd;
+-	off64_t			aglen;
++	off_t			aglen;
+ 	xfs_agblock_t		agbno;
+ 	unsigned long long	freeblks = 0;
+ 	unsigned long long	freeexts = 0;
+diff --git a/spaceman/trim.c b/spaceman/trim.c
+index e9ed47e..727dd81 100644
+--- a/spaceman/trim.c
++++ b/spaceman/trim.c
+@@ -26,7 +26,7 @@ trim_f(
+ 	struct xfs_fd		*xfd = &file->xfd;
+ 	struct xfs_fsop_geom	*fsgeom = &xfd->fsgeom;
+ 	xfs_agnumber_t		agno = 0;
+-	off64_t			offset = 0;
++	off_t			offset = 0;
+ 	ssize_t			length = 0;
+ 	ssize_t			minlen = 0;
+ 	int			aflag = 0;
diff --git a/main/xfsprogs/musl-MAP_SYNC-fix.patch b/main/xfsprogs/musl-MAP_SYNC-fix.patch
deleted file mode 100644
index 09e41ca26f9..00000000000
--- a/main/xfsprogs/musl-MAP_SYNC-fix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -14507,8 +14507,7 @@
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
--#include <asm-generic/mman.h>
--#include <asm-generic/mman-common.h>
-+#include <asm/mman.h>
- 
- int
- main ()
---- a/include/linux.h
-+++ b/include/linux.h
-@@ -327,12 +327,4 @@
- #define HAVE_GETFSMAP
- #endif /* HAVE_GETFSMAP */
- 
--#ifndef HAVE_MAP_SYNC
--#define MAP_SYNC 0
--#define MAP_SHARED_VALIDATE 0
--#else
--#include <asm-generic/mman.h>
--#include <asm-generic/mman-common.h>
--#endif /* HAVE_MAP_SYNC */
--
- #endif	/* __XFS_LINUX_H__ */
---- a/io/mmap.c
-+++ b/io/mmap.c
-@@ -23,6 +23,11 @@
- #include "init.h"
- #include "io.h"
- 
-+#ifndef HAVE_MAP_SYNC
-+#define MAP_SYNC 0
-+#define MAP_SHARED_VALIDATE 0
-+#endif
-+
- static cmdinfo_t mmap_cmd;
- static cmdinfo_t mread_cmd;
- static cmdinfo_t msync_cmd;
---- a/m4/package_libcdev.m4
-+++ b/m4/package_libcdev.m4
-@@ -335,8 +335,7 @@
- AC_DEFUN([AC_HAVE_MAP_SYNC],
-   [ AC_MSG_CHECKING([for MAP_SYNC])
-     AC_TRY_COMPILE([
--#include <asm-generic/mman.h>
--#include <asm-generic/mman-common.h>
-+#include <asm/mman.h>
-     ], [
-         int flags = MAP_SYNC | MAP_SHARED_VALIDATE;
-     ], have_map_sync=yes
diff --git a/main/xinit/06_move_serverauthfile_into_tmp.patch b/main/xinit/06_move_serverauthfile_into_tmp.patch
deleted file mode 100644
index 99e8a6754df..00000000000
--- a/main/xinit/06_move_serverauthfile_into_tmp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Move startx auth files in /tmp so they are removed on reboot.
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
-The trap patch didn't seem to work on reboot.
----
- startx.cpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: xinit/startx.cpp
-===================================================================
---- xinit.orig/startx.cpp
-+++ xinit/startx.cpp
-@@ -273,7 +273,7 @@
-     dummy=0
- 
-     XCOMM create a file with auth information for the server. ':0' is a dummy.
--    xserverauthfile=$HOME/.serverauth.$$
-+    xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX`
-     trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
-     xauth -q -f "$xserverauthfile" << EOF
- add :$dummy . $mcookie
diff --git a/main/xinit/APKBUILD b/main/xinit/APKBUILD
deleted file mode 100644
index 629a8830f21..00000000000
--- a/main/xinit/APKBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xinit
-pkgver=1.4.1
-pkgrel=0
-pkgdesc="X.Org initialisation program"
-url="http://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-options="!check"  # No test suite.
-subpackages="$pkgname-doc"
-depends="xauth mcookie xmodmap xrdb"
-makedepends="libx11-dev util-macros"
-source="https://www.x.org/releases/individual/app/xinit-$pkgver.tar.bz2
-	06_move_serverauthfile_into_tmp.patch
-	xinitrc
-	xsession.skel
-	Xsession
-	xserverrc"
-
-builddir="$srcdir"/$pkgname-$pkgver
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--with-xinitdir=/etc/X11/xinit
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	chmod +x "$pkgdir"/usr/bin/startx
-	install -m755 -d "$pkgdir"/etc/skel
-	install -m755 -D "$srcdir"/xinitrc "$pkgdir"/etc/X11/xinit/xinitrc
-	install -m755 -D "$srcdir"/Xsession "$pkgdir"/etc/X11/xinit/Xsession
-	install -m755 "$srcdir"/xsession.skel "$pkgdir"/etc/skel/.xsession
-	install -m755 "$srcdir"/xserverrc "$pkgdir"/etc/X11/xinit/xserverrc
-	mkdir -p "$pkgdir"/etc/X11/xinit/xinitrc.d
-}
-
-sha512sums="6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340  xinit-1.4.1.tar.bz2
-2296c10a5d74bff42d9642a4787dc3f2b77492fc81174af48dc88cd3c8fa49c7f70147b790d8c82c2df6c910d9d412965999e7a342ca28697a97b5d522669edd  06_move_serverauthfile_into_tmp.patch
-761db2ff2b501724ba8a7fde9df3d93851797a261871af205773159949bd74b4c1ac7c1afe0b816dce03825a5d7165caa474141cfb2ea82408abfe4719775ce0  xinitrc
-448bc6c7987a4735b6584e307cd5c53092b1a338043293f5f110d11818dd1b80508401a3b6f09525c82a16a88f293b37011d8ca112460b0f95d26897e3e0619e  xsession.skel
-b311032a751bb21d6c49ffe1dfc67beb577b5d5bec4a4c12612c4c0f9b9d6d2a07f7435c7d2fe9ab4c318546ee0cb9d4ff3f7ef908e756a818da529e913e667d  Xsession
-f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b  xserverrc"
diff --git a/main/xinit/Xsession b/main/xinit/Xsession
deleted file mode 100644
index 6b9403fd420..00000000000
--- a/main/xinit/Xsession
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-#
-# X session wrapper
-
-echo "Running X session wrapper"
-
-# Load profile
-for file in /etc/profile "$HOME/.profile" /etc/xprofile "$HOME/.xprofile"; do
-	if [ -f "$file" ]; then
-		echo "Loading profile from $file";
-		. "$file"
-	fi
-done
-
-# Load resources
-for file in /etc/X11/Xresources "$HOME/.Xresources"; do
-	if [ -f "$file" ]; then
-		echo "Loading resource: $file"
-		xrdb -nocpp -merge "$file"
-	fi
-done
-
-# Load keymaps
-use_xkbmap=false
-for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
-	if [ -f "$file" ]; then
-		echo "Loading keymap: $file"
-		setxkbmap `cat "$file"` && use_xkbmap=true
-	fi
-done
-
-# Load xmodmap if not using XKB
-if ! $use_xkbmap; then
-	for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
-		if [ -f "$file" ]; then
-		   echo "Loading modmap: $file"
-		   xmodmap "$file"
-		fi
-	done
-fi
-
-# Run all system xinitrc shell scripts.
-xinitdir="/etc/X11/xinit/xinitrc.d"
-if [ -d "$xinitdir" ]; then
-	for script in $xinitdir/*; do
-		echo "Loading xinit script $script"
-		if [ -x "$script" -a ! -d "$script" ]; then
-			. "$script"
-		fi
-	done
-fi
-
-echo "X session wrapper complete, running session $@"
-
-exec $@
diff --git a/main/xinit/xinitrc b/main/xinit/xinitrc
deleted file mode 100644
index 0c4f8944d91..00000000000
--- a/main/xinit/xinitrc
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-xinitdir=/etc/X11
-sysresources=$xinitdir/Xresources
-sysmodmap=$xinitdir/Xmodmap
-
-# merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
-if [ -f $userresources ]; then
-    xrdb -merge $userresources
-fi
-
-if [ -f $usermodmap ]; then
-    xmodmap $usermodmap
-fi
-
-# First try ~/.xinitrc
-if [ -f "$HOME/.xinitrc" ]; then
-	XINITRC="$HOME/.xinitrc"
-	if [ -x $XINITRC ]; then
-		# if the x bit is set on .xinitrc
-		# it means the xinitrc is not a
-		# shell script but something else
-		exec $XINITRC "$@"
-	else
-		exec /bin/sh "$HOME/.xinitrc" "$@"
-	fi
-fi
-
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
-	for f in /etc/X11/xinit/xinitrc.d/?* ; do
-		[ -x "$f" ] && . "$f"
-	done
-	unset f
-fi
-
-for p in startxfce4 startfluxbox xfce4-terminal \
-		mrxvt urxvt st xterm; do
-	command -v "$p" >/dev/null && exec "$p"
-done
diff --git a/main/xinit/xserverrc b/main/xinit/xserverrc
deleted file mode 100644
index b4de2528749..00000000000
--- a/main/xinit/xserverrc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/X -nolisten tcp "$@"
diff --git a/main/xinit/xsession.skel b/main/xinit/xsession.skel
deleted file mode 100644
index 819c248cd50..00000000000
--- a/main/xinit/xsession.skel
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-#
-# ~/.xsession
-#
-# Executed by xdm/gdm/kdm at login
-#
-
-/bin/sh -l ~/.xinitrc
-
diff --git a/main/xinput/APKBUILD b/main/xinput/APKBUILD
deleted file mode 100644
index 7f73caeffb7..00000000000
--- a/main/xinput/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr>
-# Maintainer: Johannes Matheis <jomat+alpinebuild@jmt.gr>
-pkgname=xinput
-pkgver=1.6.3
-pkgrel=0
-pkgdesc="Utility to configure and test XInput devices"
-url="http://xorg.freedesktop.org/"
-arch="all"
-options="!check"  # No test suite.
-license="MIT"
-makedepends="util-macros libx11-dev libxext-dev libxi-dev libxrandr-dev
-	libxinerama-dev"
-subpackages="$pkgname-doc"
-source="https://www.x.org/archive/individual/app/xinput-$pkgver.tar.gz"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="f2d61288b87505add5909aace7d51d99f5c7b1a8fad5475316da371f74d5b616ae261660c81851bec595c5d716fead3e40d8fc0cc7d2234c2b04db2b24e25da8  xinput-1.6.3.tar.gz"
diff --git a/main/xkbcomp/APKBUILD b/main/xkbcomp/APKBUILD
index 7248658c65e..41f68bc6052 100644
--- a/main/xkbcomp/APKBUILD
+++ b/main/xkbcomp/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xkbcomp
-pkgver=1.4.3
+pkgver=1.4.7
 pkgrel=0
 pkgdesc="XKBD keymap compiler"
 url="https://xorg.freedesktop.org"
@@ -9,8 +9,7 @@ arch="all"
 license="MIT"
 makedepends="libx11-dev libxkbfile-dev util-macros"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://www.x.org/releases/individual/app/xkbcomp-$pkgver.tar.bz2"
-
+source="https://www.x.org/releases/individual/app/xkbcomp-$pkgver.tar.xz"
 
 build() {
 	./configure \
@@ -31,4 +30,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="827713c0413aecdcad2b61edb7b8c7c7a002e18505b9041f570e2f680907193cb5ff8a5b424695e21110b2d06c145cbf0e397e52347421ee946f06e2a51f135d  xkbcomp-1.4.3.tar.bz2"
+sha512sums="
+6f468dce9d2499ab1022f4288d46f66af149dac0a161fb5b9dc0c262bc70c2c3d254db2c6fb5df1e2793c822e2d55c6da5fd037ce523a555b7c3de23e35c49ef  xkbcomp-1.4.7.tar.xz
+"
diff --git a/main/xkeyboard-config/APKBUILD b/main/xkeyboard-config/APKBUILD
index 45373e631ab..740de0bf2c5 100644
--- a/main/xkeyboard-config/APKBUILD
+++ b/main/xkeyboard-config/APKBUILD
@@ -1,37 +1,32 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xkeyboard-config
-pkgver=2.29
+pkgver=2.41
 pkgrel=0
 pkgdesc="X keyboard configuration files"
-url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+url="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
 arch="noarch"
 license="MIT"
-subpackages="$pkgname-doc"
-makedepends="xkbcomp intltool libx11-dev libxslt python3"
-source="https://www.x.org/archive/individual/data/xkeyboard-config/xkeyboard-config-$pkgver.tar.bz2
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
+depends_dev="$pkgname"
+makedepends="gettext meson perl libxslt"
+checkdepends="gawk"
+source="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/archive/xkeyboard-config-$pkgver/xkeyboard-config-xkeyboard-config-$pkgver.tar.gz
 	"
+builddir="$srcdir"/xkeyboard-config-xkeyboard-config-$pkgver
 
 build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--with-xsltproc \
-		--with-xkb-base=/usr/share/X11/xkb \
-		--with-xkb-rules-symlink=xorg \
-		--enable-compat-rules=yes
-	make
+	abuild-meson . output
+	meson compile -C output
 }
 
 check() {
-	make check
+	meson test --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
-	rm -f "$pkgdir"/usr/share/X11/xkb/compiled
-	install -m755 -d "$pkgdir"/var/lib/xkb
-	mkdir -p "$pkgdir"/usr/lib
-	mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
-sha512sums="202255af097f3063d76341d1b4a7672662dc645f9bcd7afa87bc966a41db4c20fc6b8f4fbe2fcaec99b6bc458eac10129141a866a165857c46282f6705b78670  xkeyboard-config-2.29.tar.bz2"
+
+sha512sums="
+bae6ce7441154b8582cb431256899d748f8f45e24a28898e767e212d1233ea55d52de608ff760f37bb9930e47f1d0d840d085fd4129927e4a1ad3ab446f5b908  xkeyboard-config-xkeyboard-config-2.41.tar.gz
+"
diff --git a/main/xl2tpd/APKBUILD b/main/xl2tpd/APKBUILD
index 1c07cba970c..abcdf1df501 100644
--- a/main/xl2tpd/APKBUILD
+++ b/main/xl2tpd/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Danilo Godec <danilo.godec@agenda.si>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xl2tpd
-pkgver=1.3.15
-pkgrel=0
+pkgver=1.3.18
+pkgrel=1
 pkgdesc="Layer 2 Tunnelling Protocol Daemon (RFC 2661)"
 url="https://github.com/xelerance/xl2tpd/releases/tag/v1.3.14"
 arch="all"
@@ -15,14 +15,13 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$p
 	xl2tpd.initd
 	options.xl2tpd
 	"
+options="!check"
 
 build() {
-	cd "$builddir"
 	make PREFIX=/usr
 }
 
 package() {
-	cd "$builddir"
 	make PREFIX=/usr DESTDIR="$pkgdir" install
 	install -Dm644 examples/xl2tpd.conf "$pkgdir"/etc/xl2tpd/xl2tpd.conf
 	install -Dm755 "$srcdir"/xl2tpd.initd "$pkgdir"/etc/init.d/xl2tpd
@@ -31,7 +30,9 @@ package() {
 	install -dm755 "$pkgdir"/var/run/xl2tpd
 }
 
-sha512sums="f65c7f2f1c03728d825b8857baa0c2297e9d5dbd97a2375484a32851326db5951deb9bf3598cbec860f0787d1bb577b4f0a47372e3244fd92c8bad7ce684889b  xl2tpd-1.3.15.tar.gz
+sha512sums="
+d1114777de5f3895429409fd5474da91fe9e9c218615eb989c9294de3e4e36dea7d8ea880a9b1b1ca18760e5709c8b8156c80d81401db479eaf215c026c3d861  xl2tpd-1.3.18.tar.gz
 1d0924d71b96b6bbaccbdcb11468047d02126d01650b7379923489a39976559e10f0167848608586de689fbbf5ba7d8c584f5443f9b4731501f7bf54b1142b44  xl2tpd.confd
 35155e758fe0404d7850600c9c0bcdd17e74cd2b95dea3d21761fbb3032757dccde42a9e34d68822c96f3c0fca475223e2f842e9067a99293f3668d99e858084  xl2tpd.initd
-04b1c4bf07ef5e74efa49d627bb085ee76d2543f6e69312aab4d183297210831f2d9da66dd8ad7ec75d69ada1f30e4faf4c4b275d2fe9f75e4b496cf55426198  options.xl2tpd"
+04b1c4bf07ef5e74efa49d627bb085ee76d2543f6e69312aab4d183297210831f2d9da66dd8ad7ec75d69ada1f30e4faf4c4b275d2fe9f75e4b496cf55426198  options.xl2tpd
+"
diff --git a/main/xmlindent/APKBUILD b/main/xmlindent/APKBUILD
index 5c7d505cfe5..7c55d0867dd 100644
--- a/main/xmlindent/APKBUILD
+++ b/main/xmlindent/APKBUILD
@@ -2,36 +2,24 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=xmlindent
 pkgver=0.2.17
-pkgrel=0
+pkgrel=3
 pkgdesc="An XML indenting utility"
-url="http://xmlindent.sourceforge.net/"
+url="https://xmlindent.sourceforge.net/"
 arch="all"
-license="GPL"
-depends=""
+license="GPL-3.0-or-later"
 makedepends="flex-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://sourceforge.net/projects/xmlindent/files/xmlindent/$pkgver/xmlindent-$pkgver.tar.gz"
-
-_builddir="$srcdir"/xmlindent-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+options="!check"
 
 build() {
-	cd "$_builddir"
-	make || return 1
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make PREFIX="$pkgdir"/usr install || return 1
+	make PREFIX="$pkgdir"/usr install
 }
 
-sha512sums="ab4b46dbd68f29e7adba6283485eb9d1c614ece640c18e1eabbe7f0e1e6f27f14d00d694e4e1981aaf66e0ddcf208c6cb2c80dda1cbeb0ceb1a40987a419f716  xmlindent-0.2.17.tar.gz"
+sha512sums="
+ab4b46dbd68f29e7adba6283485eb9d1c614ece640c18e1eabbe7f0e1e6f27f14d00d694e4e1981aaf66e0ddcf208c6cb2c80dda1cbeb0ceb1a40987a419f716  xmlindent-0.2.17.tar.gz
+"
diff --git a/main/xmlrpc-c/APKBUILD b/main/xmlrpc-c/APKBUILD
index 80ca8dc1e45..1091fbb7016 100644
--- a/main/xmlrpc-c/APKBUILD
+++ b/main/xmlrpc-c/APKBUILD
@@ -1,22 +1,34 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xmlrpc-c
-pkgver=1.51.05
-pkgrel=0
+pkgver=1.51.08
+pkgrel=4
 pkgdesc="This library provides a modular implementation of XML-RPC for C and C++"
-url="http://xmlrpc-c.sourceforge.net/"
+url="https://xmlrpc-c.sourceforge.net/"
 arch="all"
 license="BSD-3-Clause AND MIT"
 depends_dev="libxml2-dev"
-makedepends="libtool curl-dev libxml2-dev zlib-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-client
-	$pkgname-client++:clientxx xmlrpc-c++:cxx $pkgname-abyss"
-source="$pkgname-$pkgver.tar::https://sourceforge.net/projects/xmlrpc-c/files/Xmlrpc-c%20Super%20Stable/$pkgver/xmlrpc-c-$pkgver.tgz/download"
+makedepends="libtool curl-dev libxml2-dev zlib-dev openssl-dev>3"
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-client
+	$pkgname-client++:clientxx
+	xmlrpc-c++:cxx
+	$pkgname-abyss
+	$pkgname-tools
+	"
+source="https://downloads.sourceforge.net/project/xmlrpc-c/Xmlrpc-c%20Super%20Stable/$pkgver/xmlrpc-$pkgver.tgz
+	format-security.patch
+	"
+builddir="$srcdir/xmlrpc-$pkgver"
+options="!check"
 
-builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	default_prepare
+	update_config_sub
+}
 
 build() {
-	cd "$builddir"
-	update_config_sub
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,43 +39,50 @@ build() {
 		--disable-libwww-client \
 		--disable-wininet-client
 	make -j1 AR=ar RANLIB=ranlib
+	make -j1 AR=ar RANLIB=ranlib -C tools
 }
 
 package() {
-	cd "$builddir"
 	make AR=ar RANLIB=ranlib DESTDIR="$pkgdir" install
+	make AR=ar RANLIB=ranlib DESTDIR="$pkgdir" install -C tools
 	install -m 644 -D doc/COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
+tools() {
+	pkgdesc="tools for xmlrpc-c"
+	amove usr/bin
+}
+
 client() {
 	pkgdesc="C client libraries for xmlrpc-c"
 	replaces="$pkgname"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libxmlrpc_client.so.* "$subpkgdir"/usr/lib/
+
+	amove usr/lib/libxmlrpc_client.so.*
 }
 
 clientxx() {
 	replaces="libxml-c++"
 	pkgdesc="C++ client libraries for xmlrpc-c"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libxmlrpc_client++.so.* "$subpkgdir"/usr/lib/
+
+	amove usr/lib/libxmlrpc_client++.so.*
 }
 
 cxx() {
 	pkgdesc="This library provides a modular implementation of XML-RPC for C++"
 	replaces="$pkgname"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*++* \
-		"$pkgdir"/usr/lib/libxmlrpc_packetsocket.so.* \
-		"$pkgdir"/usr/lib/libxmlrpc_cpp.so.* \
-		"$subpkgdir"/usr/lib/
+
+	amove usr/lib/*++* \
+		usr/lib/libxmlrpc_packetsocket.so.* \
+		usr/lib/libxmlrpc_cpp.so.*
 }
 
 abyss() {
 	pkgdesc="Abyss server libraries for C++"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*abyss* \
-		"$subpkgdir"/usr/lib/
+
+	amove usr/lib/*abyss*
 }
 
-sha512sums="f1dc31f824448a31e476c9de65b8250e282ae1d4a2e683ac02c69707afa9e9ae3c7fee9446992eeb91e9861bad54fca43d3f40acdbf61f1fae9e6b5c590be881  xmlrpc-c-1.51.05.tar"
+sha512sums="
+df0d8e3730b529fb10fb2cf9511dc55143ad3c7b4cce5522b61ed0d212080f3ebf4b6aa8a28911ddbe90029fce6bea7df28ee51f36196900a855beff5bd3a1cd  xmlrpc-1.51.08.tgz
+a47333110b84c530dc362104d5a9d99ae192a9db4c68fe536b98bfef0c076ff119162e4b6fec65ec98d9d5ccbcab32d5169db4d82a6e0fa080c89e9ff8f0cfef  format-security.patch
+"
diff --git a/main/xmlrpc-c/format-security.patch b/main/xmlrpc-c/format-security.patch
new file mode 100644
index 00000000000..b069475900c
--- /dev/null
+++ b/main/xmlrpc-c/format-security.patch
@@ -0,0 +1,13 @@
+diff --git a/src/xmlrpc_server_abyss.c b/src/xmlrpc_server_abyss.c
+index f22aee7..17f2426 100644
+--- a/src/xmlrpc_server_abyss.c
++++ b/src/xmlrpc_server_abyss.c
+@@ -780,7 +780,7 @@ createServer(xmlrpc_env *                      const envP,
+         ServerInit2(abyssServerP, &error);
+ 
+         if (error) {
+-            xmlrpc_faultf(envP, error);
++            xmlrpc_faultf(envP, "%s", error);
+             xmlrpc_strfree(error);
+         }
+     }
diff --git a/main/xmlsec/APKBUILD b/main/xmlsec/APKBUILD
deleted file mode 100644
index 8ff14d43476..00000000000
--- a/main/xmlsec/APKBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# Contributor: Sander Maijers <S.N.Maijers+Alpine@gmail.com>
-# Maintainer: Sander Maijers <S.N.Maijers+Alpine@gmail.com>
-pkgname='xmlsec'
-pkgver=1.2.29
-pkgrel=0
-pkgdesc="Provides a C based implementation for XML Signature Syntax and Processing and XML Encryption Syntax and Processing."
-url="https://github.com/lsh123/xmlsec/"
-arch="all"
-license="MIT"
-makedepends="libxml2-dev libxslt-dev openssl-dev nss-dev
-	autoconf automake libtool"
-checkdepends="nss-tools"
-options="libtool"
-subpackages="$pkgname-nss $pkgname-dev $pkgname-doc"
-source="https://github.com/lsh123/xmlsec/archive/xmlsec-${pkgver//./_}.tar.gz"
-builddir="$srcdir/$pkgname-$pkgname-${pkgver//./_}"
-
-prepare() {
-	cd "$builddir"
-	default_prepare
-	./autogen.sh
-}
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build="$CBUILD" \
-		--host="$CHOST" \
-		--prefix='/usr' \
-		--disable-static \
-		--enable-pkgconfig \
-		--with-openssl=/usr \
-		--without-gnutls \
-		--without-gcrypt \
-		--with-default-crypto='openssl'
-	make
-}
-
-check() {
-	cd "$builddir"
-	make -k check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-
-	install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
-	install -m644 'COPYING' "$pkgdir/usr/share/licenses/$pkgname/"
-}
-
-nss() {
-	local lib=${subpkgname#$pkgname-}
-	pkgdesc="xmlsec $lib plugin"
-	install_if="$pkgname=$pkgver-r$pkgrel $lib"
-	mkdir -p "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/libxmlsec1-$lib.so* "$subpkgdir"/usr/lib/
-}
-
-sha512sums="b53eeac801cbcf4b18aa7f4fcec5fea5cae26e9cbef923d6e807ee98b988840943f00781ec6194b300403bd7f656c76ba96efce29c8b49920c9f0d67ba14ea57  xmlsec-1_2_29.tar.gz"
diff --git a/main/xmlto/APKBUILD b/main/xmlto/APKBUILD
index 9033383bc89..a02b30f6694 100644
--- a/main/xmlto/APKBUILD
+++ b/main/xmlto/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xmlto
 pkgver=0.0.28
-pkgrel=2
+pkgrel=4
 pkgdesc="Convert xml to many other formats"
 url="https://pagure.io/xmlto/"
 arch="all"
@@ -12,7 +12,6 @@ subpackages="$pkgname-doc"
 source="https://releases.pagure.org/xmlto/xmlto-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,12 +21,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
diff --git a/main/xmodmap/APKBUILD b/main/xmodmap/APKBUILD
deleted file mode 100644
index 9d1fd5663df..00000000000
--- a/main/xmodmap/APKBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xmodmap
-pkgver=1.0.10
-pkgrel=0
-pkgdesc="Utility for modifying keymaps and pointer button mappings in X"
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="MIT"
-options="!check"  # No test suite.
-depends=""
-makedepends="libx11-dev util-macros"
-subpackages="$pkgname-doc"
-source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-
-build () {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="324c7dcef843186088f16b3bc47485eb3c9b4331e56ce43b692deb4bb3d4f4f27512480e91a379cceac8383df920dc5e37cd825246b50b6343291cec48134c04  xmodmap-1.0.10.tar.bz2"
diff --git a/main/xorg-cf-files/APKBUILD b/main/xorg-cf-files/APKBUILD
deleted file mode 100644
index 7f437033fcb..00000000000
--- a/main/xorg-cf-files/APKBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr>
-# Maintainer: Johannes Matheis <jomat+alpinebuild@jmt.gr>
-pkgname=xorg-cf-files
-pkgver=1.0.6
-pkgrel=0
-pkgdesc="Data files for the imake utility"
-url="http://xorg.freedesktop.org/"
-arch="noarch"
-license="custom"
-depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-doc"
-source="${url}releases/individual/util/${pkgname}-${pkgver}.tar.bz2"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-   local i
-   cd "$_builddir"
-   for i in $source; do
-       case $i in
-       *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-       esac
-   done
-}
-
-build() {
-   cd "$_builddir"
-   ./configure \
-       --build=$CBUILD \
-       --host=$CHOST \
-       --prefix=/usr \
-       --sysconfdir=/etc \
-       --mandir=/usr/share/man \
-       --infodir=/usr/share/info \
-       --localstatedir=/var \
-       || return 1
-   make || return 1
-}
-
-package() {
-   cd "$_builddir"
-   make DESTDIR="$pkgdir" install || return 1
-   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
-
-sha512sums="1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa  xorg-cf-files-1.0.6.tar.bz2"
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD
deleted file mode 100644
index 5f76cc70f4f..00000000000
--- a/main/xorg-server/APKBUILD
+++ /dev/null
@@ -1,169 +0,0 @@
-# Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xorg-server
-pkgver=1.20.8
-pkgrel=0
-pkgdesc="X.Org X servers"
-url="https://www.x.org/wiki"
-arch="all"
-license="MIT"
-options="suid"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc xvfb $pkgname-xephyr
-	$pkgname-xnest $pkgname-xwayland"
-# the modesetting driver is now shipped with xorg server
-replaces="xf86-video-modesetting"
-depends="
-	font-misc-misc
-	font-cursor-misc
-	xkeyboard-config
-	xkbcomp
-	xinit
-	"
-depends_dev="
-	libepoxy-dev
-	libxfont2-dev
-	mesa-dev
-	"
-makedepends="
-	$depends_dev
-	meson
-	xorgproto
-	xtrans
-	libxshmfence-dev
-	pixman-dev
-	xkbcomp-dev
-	libxkbfile-dev
-	nettle-dev
-	wayland-dev
-	wayland-protocols
-	libdrm-dev
-	libxext-dev
-	libx11-dev
-	libxau-dev
-	eudev-dev
-	libxcb-dev
-	xcb-util-dev
-	xcb-util-image-dev
-	xcb-util-keysyms-dev
-	xcb-util-renderutil-dev
-	xcb-util-wm-dev
-	libpciaccess-dev
-	libxdmcp-dev
-	"
-source="https://www.x.org/releases/individual/xserver/xorg-server-$pkgver.tar.bz2
-	xwayland-glx.patch
-	"
-
-# secfixes:
-#   1.20.3-r0:
-#     - CVE-2018-14665
-#   1.19.5-r0:
-#     - CVE-2017-12176
-#     - CVE-2017-12177
-#     - CVE-2017-12178
-#     - CVE-2017-12179
-#     - CVE-2017-12180
-#     - CVE-2017-12181
-#     - CVE-2017-12182
-#     - CVE-2017-12183
-#     - CVE-2017-12184
-#     - CVE-2017-12185
-#     - CVE-2017-12186
-#     - CVE-2017-12187
-#     - CVE-2017-13721
-#     - CVE-2017-13723
-
-prepare() {
-	default_prepare
-	sed -i -e 's/termio.h/termios.h/' hw/xfree86/os-support/xf86_OSlib.h
-}
-
-build() {
-	# xorg modules does not work with the -z now and it seems like we
-	# cannot pass over the linker flag to .so files. so we tweak the
-	# gcc specs.
-	export CFLAGS="$CFLAGS -D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t"
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-	_fontroot="/usr/share/fonts"
-
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc/X11 \
-		--localstatedir=/var \
-		--buildtype=plain \
-		-Dxorg=true \
-		-Dxephyr=true \
-		-Dxwayland=true \
-		-Dglamor=true \
-		-Dxwayland_eglstream=false \
-		-Dxnest=true \
-		-Ddmx=false \
-		-Dxvfb=true \
-		-Dxwin=false \
-		-Ddefault_font_path=$_fontroot/misc,$_fontroot/100dpi:unscaled,$_fontroot/75dpi:unscaled,$_fontroot/TTF,$_fontroot/Type1 \
-		-Dglx=true \
-		-Dxdmcp=true \
-		-Dxdm-auth-1=true \
-		-Dxcsecurity=true \
-		-Dsecure-rpc=false \
-		-Dipv6=true \
-		-Dxkb_dir=/usr/share/X11/xkb \
-		-Dxkb_output_dir=/var/lib/xkb \
-		-Dos_vendor="${DISTRO_NAME:-Alpine Linux}" \
-		-Dlisten_tcp=false \
-		-Dlisten_unix=true \
-		-Dlisten_local=true \
-		-Dsuid_wrapper=true \
-		-Dpciaccess=true \
-		-Dudev=true \
-		-Dhal=false \
-		-Dsystemd_logind=false \
-		-Ddpms=true \
-		-Ddri1=true \
-		-Ddri2=true \
-		-Ddri3=true \
-		. output
-	ninja -C output
-}
-
-check() {
-	ninja -C output test
-}
-
-package() {
-	DESTDIR="$pkgdir" ninja -C output install
-
-	chmod u+s "$pkgdir"/usr/bin/Xorg
-	ln -s /usr/bin/Xorg "$pkgdir"/usr/bin/X
-
-	# Don't conflict with xf86-input-evdev
-	rm -f "$pkgdir"/usr/share/X11/xorg.conf.d/10-evdev.conf
-
-	install -m755 -d "$pkgdir"/var/lib/xkb
-}
-
-xvfb() {
-	pkgdesc="Virtual Framebuffer 'fake' X server"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/Xvfb "$subpkgdir"/usr/bin/
-}
-
-xephyr() {
-	pkgdesc="kdrive based X Server which targets a window on a host X Server as its framebuffer"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/
-}
-
-xnest() {
-	pkgdesc="A nested Xorg server"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/Xnest "$subpkgdir"/usr/bin/
-}
-
-xwayland() {
-	pkgdesc="run X clients under wayland"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/
-}
-sha512sums="ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805  xorg-server-1.20.8.tar.bz2
-004c9a7d920af8825a311d32433bf64190d45583d57bb20b3c5ef39d8011ced7bf17b73296e56078ca791e6cd923594dacfe3fbf7af7c98934627e34559c85d8  xwayland-glx.patch"
diff --git a/main/xorg-server/xwayland-glx.patch b/main/xorg-server/xwayland-glx.patch
deleted file mode 100644
index c6a750af70f..00000000000
--- a/main/xorg-server/xwayland-glx.patch
+++ /dev/null
@@ -1,419 +0,0 @@
-diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
-index 36bf213..c8746e5 100644
---- a/hw/xwayland/meson.build
-+++ b/hw/xwayland/meson.build
-@@ -54,6 +54,9 @@ xwayland_glamor = []
- eglstream_srcs = []
- if build_glamor
-     srcs += 'xwayland-glamor.c'
-+    if build_glx
-+        srcs += 'xwayland-glx.c'
-+    endif
-     if gbm_dep.found()
-         srcs += 'xwayland-glamor-gbm.c'
-     endif
-@@ -80,10 +83,15 @@ if build_glamor
-     xwayland_glamor += glamor
- endif
- 
-+wayland_inc = [ inc, ]
-+if build_glx
-+    wayland_inc += glx_inc
-+endif
-+
- executable(
-     'Xwayland',
-     srcs,
--    include_directories: inc,
-+    include_directories: wayland_inc,
-     dependencies: [
-         common_dep,
-         xwayland_dep,
-diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
-index 48e330a..dcfc7f1 100644
---- a/hw/xwayland/xwayland-glamor.c
-+++ b/hw/xwayland/xwayland-glamor.c
-@@ -31,6 +31,9 @@
- 
- #include <glamor.h>
- #include <glamor_context.h>
-+#ifdef GLXEXT
-+#include "glx_extinit.h"
-+#endif
- 
- static void
- glamor_egl_make_current(struct glamor_context *glamor_ctx)
-@@ -262,5 +265,9 @@ xwl_glamor_init(struct xwl_screen *xwl_screen)
-         ErrorF("Failed to initialize glamor Xv extension\n");
- #endif
- 
-+#ifdef GLXEXT
-+    GlxPushProvider(&glamor_provider);
-+#endif
-+
-     return TRUE;
- }
-diff --git a/hw/xwayland/xwayland-glx.c b/hw/xwayland/xwayland-glx.c
-new file mode 100644
-index 0000000..71c9aad
---- /dev/null
-+++ b/hw/xwayland/xwayland-glx.c
-@@ -0,0 +1,344 @@
-+/*
-+ * Copyright © 2019 Red Hat, Inc.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ *
-+ * Authors:
-+ *	Adam Jackson <ajax@redhat.com>
-+ */
-+
-+/*
-+ * Sets up GLX capabilities based on the EGL capabilities of the glamor
-+ * renderer for the screen. Without this you will get whatever swrast
-+ * can do, which often does not include things like multisample visuals.
-+ */
-+
-+#include <xwayland-config.h>
-+#include "xwayland.h"
-+#define MESA_EGL_NO_X11_HEADERS
-+// #include <EGL/egl.h>
-+#include <epoxy/egl.h>
-+#include "glxserver.h"
-+#include "glxutil.h"
-+#include "compint.h"
-+#include <X11/extensions/composite.h>
-+#include "glamor_context.h"
-+#include "glamor.h"
-+
-+/* Can't get these from <GL/glx.h> since it pulls in client headers */
-+#define GLX_RGBA_BIT		0x00000001
-+#define GLX_WINDOW_BIT		0x00000001
-+#define GLX_PIXMAP_BIT		0x00000002
-+#define GLX_PBUFFER_BIT		0x00000004
-+#define GLX_NONE                0x8000
-+#define GLX_SLOW_CONFIG         0x8001
-+#define GLX_TRUE_COLOR		0x8002
-+#define GLX_DIRECT_COLOR	0x8003
-+#define GLX_NON_CONFORMANT_CONFIG 0x800D
-+#define GLX_DONT_CARE           0xFFFFFFFF
-+#define GLX_RGBA_FLOAT_BIT_ARB  0x00000004
-+#define GLX_SWAP_UNDEFINED_OML  0x8063
-+
-+struct egl_config {
-+    __GLXconfig base;
-+    EGLConfig config;
-+};
-+
-+struct egl_screen {
-+    __GLXscreen base;
-+    EGLDisplay display;
-+    EGLConfig *configs;
-+};
-+
-+static void
-+egl_screen_destroy(__GLXscreen *_screen)
-+{
-+    struct egl_screen *screen = (struct egl_screen *)_screen;
-+
-+    /* XXX do we leak the fbconfig list? */
-+
-+    free(screen->configs);
-+    __glXScreenDestroy(_screen);
-+    free(_screen);
-+}
-+
-+static void
-+egl_drawable_destroy(__GLXdrawable *draw)
-+{
-+    free(draw);
-+}
-+
-+static GLboolean
-+egl_drawable_swap_buffers(ClientPtr client, __GLXdrawable *draw)
-+{
-+    return GL_FALSE;
-+}
-+
-+static void
-+egl_drawable_copy_sub_buffer(__GLXdrawable *draw, int x, int y, int w, int h)
-+{
-+}
-+
-+static void
-+egl_drawable_wait_x(__GLXdrawable *draw)
-+{
-+    glamor_block_handler(draw->pDraw->pScreen);
-+}
-+
-+static void
-+egl_drawable_wait_gl(__GLXdrawable *draw)
-+{
-+}
-+
-+static __GLXdrawable *
-+egl_create_glx_drawable(ClientPtr client, __GLXscreen *screen,
-+                        DrawablePtr draw, XID drawid, int type,
-+                        XID glxdrawid, __GLXconfig *modes)
-+{
-+    __GLXdrawable *ret;
-+
-+    ret = calloc(1, sizeof *ret);
-+    if (!ret)
-+        return NULL;
-+
-+    if (!__glXDrawableInit(ret, screen, draw, type, glxdrawid, modes)) {
-+        free(ret);
-+        return NULL;
-+    }
-+
-+    ret->destroy = egl_drawable_destroy;
-+    ret->swapBuffers = egl_drawable_swap_buffers;
-+    ret->copySubBuffer = egl_drawable_copy_sub_buffer;
-+    ret->waitX = egl_drawable_wait_x;
-+    ret->waitGL = egl_drawable_wait_gl;
-+
-+    return ret;
-+}
-+
-+/*
-+ * TODO:
-+ *
-+ * - figure out sRGB
-+ * - bindToTextureTargets is suspicious
-+ * - better channel mask setup
-+ * - drawable type masks is suspicious
-+ */
-+static struct egl_config *
-+translate_eglconfig(struct egl_screen *screen, EGLConfig hc,
-+                    struct egl_config *chain, Bool direct_color,
-+                    Bool double_buffer)
-+{
-+    EGLint value;
-+    struct egl_config *c = calloc(1, sizeof *c);
-+
-+    if (!c)
-+        return chain;
-+
-+    /* constants.  changing these requires (at least) new EGL extensions */
-+    c->base.stereoMode = GL_FALSE;
-+    c->base.numAuxBuffers = 0;
-+    c->base.level = 0;
-+    c->base.transparentAlpha = 0;
-+    c->base.transparentIndex = 0;
-+    c->base.transparentPixel = GLX_NONE;
-+    c->base.visualSelectGroup = 0;
-+    c->base.indexBits = 0;
-+    c->base.optimalPbufferWidth = 0;
-+    c->base.optimalPbufferHeight = 0;
-+    c->base.bindToMipmapTexture = 0;
-+    c->base.bindToTextureTargets = GLX_DONT_CARE;
-+    c->base.sRGBCapable = 0;
-+    c->base.swapMethod = GLX_SWAP_UNDEFINED_OML;
-+
-+    /* this is... suspect */
-+    c->base.drawableType = GLX_WINDOW_BIT | GLX_PIXMAP_BIT | GLX_PBUFFER_BIT;
-+
-+    /* hmm */
-+    c->base.bindToTextureRgb = GL_TRUE;
-+    c->base.bindToTextureRgba = GL_TRUE;
-+
-+    /*
-+     * glx conformance failure: there's no such thing as accumulation
-+     * buffers in EGL.  they should be emulable with shaders and fbos,
-+     * but i'm pretty sure nobody's using this feature since it's
-+     * entirely software.  note that glx conformance merely requires
-+     * that an accum buffer _exist_, not a minimum bitness.
-+     */
-+    c->base.accumRedBits = 0;
-+    c->base.accumGreenBits = 0;
-+    c->base.accumBlueBits = 0;
-+    c->base.accumAlphaBits = 0;
-+
-+    /* parametric state */
-+    if (direct_color)
-+        c->base.visualType = GLX_DIRECT_COLOR;
-+    else
-+        c->base.visualType = GLX_TRUE_COLOR;
-+
-+    if (double_buffer)
-+        c->base.doubleBufferMode = GL_TRUE;
-+    else
-+        c->base.doubleBufferMode = GL_FALSE;
-+
-+    /* direct-mapped state */
-+#define GET(attr, slot) \
-+    eglGetConfigAttrib(screen->display, hc, attr, &c->base.slot)
-+    GET(EGL_RED_SIZE, redBits);
-+    GET(EGL_GREEN_SIZE, greenBits);
-+    GET(EGL_BLUE_SIZE, blueBits);
-+    GET(EGL_ALPHA_SIZE, alphaBits);
-+    GET(EGL_BUFFER_SIZE, rgbBits);
-+    GET(EGL_DEPTH_SIZE, depthBits);
-+    GET(EGL_STENCIL_SIZE, stencilBits);
-+    GET(EGL_TRANSPARENT_RED_VALUE, transparentRed);
-+    GET(EGL_TRANSPARENT_GREEN_VALUE, transparentGreen);
-+    GET(EGL_TRANSPARENT_BLUE_VALUE, transparentBlue);
-+    GET(EGL_SAMPLE_BUFFERS, sampleBuffers);
-+    GET(EGL_SAMPLES, samples);
-+    if (c->base.renderType & GLX_PBUFFER_BIT) {
-+        GET(EGL_MAX_PBUFFER_WIDTH, maxPbufferWidth);
-+        GET(EGL_MAX_PBUFFER_HEIGHT, maxPbufferHeight);
-+        GET(EGL_MAX_PBUFFER_PIXELS, maxPbufferPixels);
-+    }
-+#undef GET
-+
-+    /* derived state: config caveats */
-+    eglGetConfigAttrib(screen->display, hc, EGL_CONFIG_CAVEAT, &value);
-+    if (value == EGL_NONE)
-+        c->base.visualRating = GLX_NONE;
-+    else if (value == EGL_SLOW_CONFIG)
-+        c->base.visualRating = GLX_SLOW_CONFIG;
-+    else if (value == EGL_NON_CONFORMANT_CONFIG)
-+        c->base.visualRating = GLX_NON_CONFORMANT_CONFIG;
-+    /* else panic */
-+
-+    /* derived state: float configs */
-+    c->base.renderType = GLX_RGBA_BIT;
-+    if (eglGetConfigAttrib(screen->display, hc, EGL_COLOR_COMPONENT_TYPE_EXT,
-+                           &value) == EGL_TRUE) {
-+        if (value == EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT) {
-+            c->base.renderType = GLX_RGBA_FLOAT_BIT_ARB;
-+        }
-+        /* else panic */
-+    }
-+
-+    /* map to the backend's config */
-+    c->config = hc;
-+
-+    /*
-+     * XXX do something less ugly
-+     */
-+    if (c->base.renderType == GLX_RGBA_BIT) {
-+        if (c->base.rgbBits == 24 || c->base.rgbBits == 32) {
-+            c->base.redMask = 0xff0000;
-+            c->base.greenMask = 0x00ff00;
-+            c->base.blueMask = 0x0000ff;
-+            if (c->base.alphaBits)
-+                /* assume all remaining bits are alpha */
-+                c->base.alphaMask = 0xff000000;
-+        }
-+    }
-+
-+    c->base.next = chain ? &chain->base : NULL;
-+    return c;
-+}
-+
-+static __GLXconfig *
-+egl_mirror_configs(ScreenPtr pScreen, struct egl_screen *screen)
-+{
-+    int i, j, k, nconfigs;
-+    struct egl_config *c = NULL;
-+    EGLConfig *host_configs = NULL;
-+    Bool offon[] = { FALSE, TRUE };
-+
-+    eglGetConfigs(screen->display, NULL, 0, &nconfigs);
-+    if (!(host_configs = calloc(nconfigs, sizeof *host_configs)))
-+        return NULL;
-+
-+    eglGetConfigs(screen->display, host_configs, nconfigs, &nconfigs);
-+
-+    /* We walk the EGL configs backwards to make building the
-+     * ->next chain easier.
-+     */
-+    for (i = nconfigs - 1; i > 0; i--)
-+        for (j = 0; j < 2; j++) /* direct_color */
-+            for (k = 0; k < 2; k++) /* direct_color */
-+                c = translate_eglconfig(screen, host_configs[i], c,
-+                                        /* direct_color */ offon[j],
-+                                        /* double_buffer */ offon[k]
-+                                        );
-+
-+    screen->configs = host_configs;
-+    return c ? &c->base : NULL;
-+}
-+
-+static __GLXscreen *
-+egl_screen_probe(ScreenPtr pScreen)
-+{
-+    struct egl_screen *screen;
-+    struct xwl_screen *xwl_screen = xwl_screen_get(pScreen);
-+    __GLXscreen *base;
-+
-+    if (enableIndirectGLX)
-+        return NULL; /* not implemented */
-+
-+    if (!(screen = calloc(1, sizeof *screen)))
-+        return NULL;
-+
-+    base = &screen->base;
-+    base->destroy = egl_screen_destroy;
-+    base->createDrawable = egl_create_glx_drawable;
-+    /* base.swapInterval = NULL; */
-+
-+    screen->display = xwl_screen->glamor_ctx->display;
-+
-+    __glXInitExtensionEnableBits(screen->base.glx_enable_bits);
-+    __glXEnableExtension(base->glx_enable_bits, "GLX_ARB_context_flush_control");
-+    __glXEnableExtension(base->glx_enable_bits, "GLX_ARB_create_context");
-+    __glXEnableExtension(base->glx_enable_bits, "GLX_ARB_create_context_no_error");
-+    __glXEnableExtension(base->glx_enable_bits, "GLX_ARB_create_context_profile");
-+    __glXEnableExtension(base->glx_enable_bits, "GLX_ARB_create_context_robustness");
-+    __glXEnableExtension(base->glx_enable_bits, "GLX_ARB_fbconfig_float");
-+    __glXEnableExtension(base->glx_enable_bits, "GLX_EXT_create_context_es2_profile");
-+    __glXEnableExtension(base->glx_enable_bits, "GLX_EXT_create_context_es_profile");
-+    __glXEnableExtension(base->glx_enable_bits, "GLX_EXT_fbconfig_packed_float");
-+    __glXEnableExtension(base->glx_enable_bits, "GLX_EXT_framebuffer_sRGB");
-+    __glXEnableExtension(base->glx_enable_bits, "GLX_EXT_no_config_context");
-+    __glXEnableExtension(base->glx_enable_bits, "GLX_EXT_texture_from_pixmap");
-+    __glXEnableExtension(base->glx_enable_bits, "GLX_MESA_copy_sub_buffer");
-+    // __glXEnableExtension(base->glx_enable_bits, "GLX_SGI_swap_control");
-+
-+    base->fbconfigs = egl_mirror_configs(pScreen, screen);
-+    if (!base->fbconfigs) {
-+        free(screen);
-+        return NULL;
-+    }
-+
-+    __glXScreenInit(base, pScreen);
-+    __glXsetGetProcAddress(eglGetProcAddress);
-+
-+    return base;
-+}
-+
-+__GLXprovider glamor_provider = {
-+    egl_screen_probe,
-+    "glamor",
-+    NULL
-+};
-diff --git a/hw/xwayland/xwayland.h b/hw/xwayland/xwayland.h
-index 0854df4..a4804fe 100644
---- a/hw/xwayland/xwayland.h
-+++ b/hw/xwayland/xwayland.h
-@@ -488,4 +488,9 @@ static inline void xwl_glamor_init_eglstream(struct xwl_screen *xwl_screen)
- }
- #endif
- 
-+#ifdef GLXEXT
-+#include "glx_extinit.h"
-+extern __GLXprovider glamor_provider;
-+#endif
-+
- #endif
diff --git a/main/xorgproto/APKBUILD b/main/xorgproto/APKBUILD
index 017814f2d19..774a52188d3 100644
--- a/main/xorgproto/APKBUILD
+++ b/main/xorgproto/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: prspkt <prspkt@protonmail.com>
 # Maintainer: prspkt <prspkt@protonmail.com>
 pkgname=xorgproto
-pkgver=2019.2
-pkgrel=2
+pkgver=2024.1
+pkgrel=0
 pkgdesc="Combined X.Org X11 protocol headers"
 url="https://www.x.org"
 arch="noarch"
@@ -42,25 +42,19 @@ provides="bigreqsproto=$pkgver-r$pkgrel
 	xineramaproto=$pkgver-r$pkgrel
 	xproto=$pkgver-r$pkgrel
 	"
-source="https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$pkgver.tar.bz2"
+source="https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$pkgver.tar.gz"
+options="!check" # no tests
 
 build() {
-	cd "$builddir"
-	meson \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--buildtype=plain \
+	abuild-meson \
 		--datadir=/usr/lib \
 		-Dlegacy=true \
 		. output
-	ninja -C output
+	meson compile -C output
 }
 
 package() {
-	cd "$builddir"
-	DESTDIR="$pkgdir" ninja -C output install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 
 	# cleanup
 	rm -f "$pkgdir"/usr/include/X11/extensions/apple*
@@ -71,4 +65,6 @@ package() {
 	rm -f "$pkgdir"/usr/include/X11/extensions/XKBgeom.h # libx11-dev >= 1.6.9-r0
 }
 
-sha512sums="cbfdf6bb3d58d4d4e7788c9ed779402352715e9899f65594fbc527b3178f1dc5e03cebc8ba5a863b3c196a1a0f2026c2d0438207ca19f81f3c8b7da0c0667904  xorgproto-2019.2.tar.bz2"
+sha512sums="
+c2d67a98c5ba9b2f4d0b844c96dab342c497710753a8878b75dbf12ecd64b105c9ee3c5fd11eb91e45960420cf8dd7d02547072a32d5c53e58e009394fe33666  xorgproto-2024.1.tar.gz
+"
diff --git a/main/xrandr/APKBUILD b/main/xrandr/APKBUILD
deleted file mode 100644
index 7dd6238ec39..00000000000
--- a/main/xrandr/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xrandr
-pkgver=1.5.1
-pkgrel=0
-pkgdesc="Command line interface to RandR extension"
-url="https://www.x.org/wiki/"
-arch="all"
-license="MIT"
-subpackages="$pkgname-doc"
-depends=
-makedepends="libxrandr-dev util-macros"
-source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.xz"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--mandir=/usr/share/man
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	rm "$pkgdir"/usr/bin/xkeystone
-}
-
-sha512sums="3d0d37e974b9dffb996276ee7fd676327fd0956e5f5f572dd142a651a35d3cdfa2f6dd415cf27bf87f306981957aba4cc014c12baebefcabaa5d66b78a114922  xrandr-1.5.1.tar.xz"
diff --git a/main/xrdb/APKBUILD b/main/xrdb/APKBUILD
deleted file mode 100644
index b52ea6e97d5..00000000000
--- a/main/xrdb/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xrdb
-pkgver=1.2.0
-pkgrel=0
-pkgdesc="X server resource database utility"
-url="http://xorg.freedesktop.org"
-arch="all"
-license="MIT"
-options="!check"  # No test suite.
-depends="mcpp"
-depends_dev=""
-makedepends="libxmu-dev libx11-dev util-macros"
-install=""
-subpackages="$pkgname-doc"
-source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-
-build () {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--with-cpp=/usr/bin/mcpp
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="14e1cdfb2152fb28f1f4641b177ab236648d7e967a95b952bf4cfce8d3e1ef085e85385354e3381aaf644462e8888a1847f755ab4016ecb4cb4a715b001dd2ef  xrdb-1.2.0.tar.bz2"
diff --git a/main/xtables-addons-lts/APKBUILD b/main/xtables-addons-lts/APKBUILD
index eb7c0c7f150..d96d7ae04e0 100644
--- a/main/xtables-addons-lts/APKBUILD
+++ b/main/xtables-addons-lts/APKBUILD
@@ -1,39 +1,36 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
+pkgname=xtables-addons-lts
+_flavor=${pkgname##*-}
+_name=${pkgname%-*}
 # when changing _ver we *must* bump _rel
-_name=xtables-addons
-_ver=3.8
-_rel=0
-
-_flavor=${FLAVOR:-lts}
+_ver=3.26
+_rel=2
+# when changing _kver make sure _krel=0 & _rel=0
 _kpkg=linux-$_flavor
-_kver=5.4.28
+_kver=6.6.28
 _krel=0
 
 _kpkgver="$_kver-r$_krel"
 _kabi="$_kver-$_krel-$_flavor"
 
-pkgname=$_name-$_flavor
 pkgver=$_kver
-pkgrel=$(( $_krel + $_rel ))
+pkgrel=$(( _krel + _rel ))
 
 pkgdesc="Iptables extensions kernel modules"
-url="http://xtables-addons.sourceforge.net/"
-arch="all !armhf !mips64"
-license="GPL-2.0"
+url="https://inai.de/projects/xtables-addons/"
+arch="all !armhf !mips64 !riscv64"
+license="GPL-2.0-or-later"
 depends="$_kpkg=$_kpkgver"
 makedepends="$_kpkg-dev=$_kpkgver iptables-dev linux-headers"
 install_if="$_kpkg=$_kpkgver $_name"
-source="https://downloads.sourceforge.net/$_name/$_name-$_ver.tar.xz"
-# temporary disable the provides til hardened is fully removed
-#provides="${_name}-grsec=${pkgver}-r${pkgrel}"
-#replaces="$_name-hardened"
+source="https://inai.de/files/xtables-addons/xtables-addons-$_ver.tar.xz"
 builddir="$srcdir/$_name-$_ver"
 options="!check"
 
 prepare() {
 	default_prepare
-	local _kapkbuild=../../main/linux-$_flavor/APKBUILD
+	local _kapkbuild="$startdir"/../../main/linux-$_flavor/APKBUILD
 	if [ -f $_kapkbuild ]; then
 		(	. $_kapkbuild
 			pkgname=$_name-$_flavor
@@ -45,7 +42,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	unset LDFLAGS
 	./configure \
 		--build=$CBUILD \
@@ -62,4 +58,6 @@ package() {
 	make DESTDIR="$pkgdir" modules_install
 }
 
-sha512sums="2e0594ee0e654a19e6bae4f7acb7efd142957418ed44ce92ecd7474bb2f0bfd8dad684be937e8f6ed28395f9d7a6dbea61e7c3259d7b89c05ab10bcad3c04264  xtables-addons-3.8.tar.xz"
+sha512sums="
+858126c5887a3a1d2c122e51fcfdb41a5ddb3fff45308a8dda46de06c0df9f4f8059466bc182cff5b2baa3efcef9240378a890ca8237aec4dfccb74523a56851  xtables-addons-3.26.tar.xz
+"
diff --git a/main/xtables-addons-rpi/APKBUILD b/main/xtables-addons-rpi/APKBUILD
new file mode 100644
index 00000000000..86645772c2c
--- /dev/null
+++ b/main/xtables-addons-rpi/APKBUILD
@@ -0,0 +1,63 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+
+pkgname=xtables-addons-rpi
+_flavor=${pkgname##*-}
+_name=${pkgname%-*}
+# when changing _ver we *must* bump _rel
+_ver=3.26
+_rel=1
+# when changing _kver make sure _krel=0 & _rel=0
+_kpkg=linux-$_flavor
+_kver=6.6.21
+_krel=0
+
+_kpkgver="$_kver-r$_krel"
+_kabi="$_kver-$_krel-$_flavor"
+
+pkgver=$_kver
+pkgrel=$(( _krel + _rel ))
+
+pkgdesc="Iptables extensions kernel modules"
+url="https://inai.de/projects/xtables-addons/"
+arch="aarch64"
+license="GPL-2.0-or-later"
+depends="$_kpkg=$_kpkgver"
+makedepends="$_kpkg-dev=$_kpkgver iptables-dev linux-headers"
+install_if="$_kpkg=$_kpkgver $_name"
+source="https://inai.de/files/xtables-addons/xtables-addons-$_ver.tar.xz"
+builddir="$srcdir/$_name-$_ver"
+options="!check"
+
+prepare() {
+	default_prepare
+	local _kapkbuild="$startdir"/../../main/linux-$_flavor/APKBUILD
+	if [ -f $_kapkbuild ]; then
+		(	. $_kapkbuild
+			pkgname=$_name-$_flavor
+			[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
+			[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
+			return 0
+		)
+	fi
+}
+
+build() {
+	unset LDFLAGS
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--with-kbuild=/usr/src/linux-headers-$_kabi
+
+	cd extensions
+	make modules
+}
+
+package() {
+	cd "$builddir/extensions"
+	make DESTDIR="$pkgdir" modules_install
+}
+
+sha512sums="
+858126c5887a3a1d2c122e51fcfdb41a5ddb3fff45308a8dda46de06c0df9f4f8059466bc182cff5b2baa3efcef9240378a890ca8237aec4dfccb74523a56851  xtables-addons-3.26.tar.xz
+"
diff --git a/main/xtables-addons/APKBUILD b/main/xtables-addons/APKBUILD
index 7f51d93b653..f98d5c4209c 100644
--- a/main/xtables-addons/APKBUILD
+++ b/main/xtables-addons/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xtables-addons
-pkgver=3.9
+pkgver=3.26
 pkgrel=0
 pkgdesc="Netfilter userspace extensions for iptables"
-url="http://xtables-addons.sourceforge.net/"
+url="https://inai.de/projects/xtables-addons/"
 arch="all"
 license="GPL-2.0-only"
 makedepends="iptables-dev bash coreutils"
 subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/xtables-addons/$pkgver/xtables-addons-$pkgver.tar.xz"
+source="https://inai.de/files/xtables-addons/xtables-addons-$pkgver.tar.xz"
 options="!check" # Package has no test suite
 
 build() {
@@ -25,4 +25,6 @@ package() {
 	make builddir= DESTDIR="$pkgdir" install
 }
 
-sha512sums="ec7d2ec97c433eb94b893aedfd346393986ef140d7ff95cd8be070cfa397efd87df7d73d36359b81c80618eb8575282a1ea8624c3bf182ddd60d8975f58579b5  xtables-addons-3.9.tar.xz"
+sha512sums="
+858126c5887a3a1d2c122e51fcfdb41a5ddb3fff45308a8dda46de06c0df9f4f8059466bc182cff5b2baa3efcef9240378a890ca8237aec4dfccb74523a56851  xtables-addons-3.26.tar.xz
+"
diff --git a/main/xtrans/APKBUILD b/main/xtrans/APKBUILD
index 647db5c416a..d699f4047a5 100644
--- a/main/xtrans/APKBUILD
+++ b/main/xtrans/APKBUILD
@@ -1,16 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xtrans
-pkgver=1.4.0
-pkgrel=1
+pkgver=1.5.0
+pkgrel=0
 pkgdesc="X transport library"
-url="http://xorg.freedesktop.org/"
+url="https://xorg.freedesktop.org/"
 arch="noarch"
 license="MIT"
 makedepends="util-macros xmlto"
-source="https://www.x.org/releases/individual/lib/$pkgname-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/lib/xtrans-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -19,16 +18,16 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	mkdir -p "$pkgdir"/usr/lib
 	mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib
 }
 
-sha512sums="4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214  xtrans-1.4.0.tar.bz2"
+sha512sums="
+e8091f11d4ad2b14e01de3eac56bdf2267ea26687ce66e3056374d0d02e049480c0b27c482f8828a0efd086f1e4c485108ca4dce3f83d66c1896effa3b38b228  xtrans-1.5.0.tar.xz
+"
diff --git a/main/xvfb-run/APKBUILD b/main/xvfb-run/APKBUILD
deleted file mode 100644
index 975918cbd4a..00000000000
--- a/main/xvfb-run/APKBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Contributor: TBK <alpine@jjtc.eu>
-# Maintainer: TBK <alpine@jjtc.eu>
-pkgname=xvfb-run
-pkgver=1.20.7.3 # Last digit is Debian's pkgrel
-_pkgver=${pkgver%.*}-${pkgver##*.}
-pkgrel=0
-pkgdesc="A wrapper for the Xvfb command which simplifies the task of running commands."
-url="https://salsa.debian.org/xorg-team/xserver/xorg-server/tree/debian-unstable/debian/local"
-arch="noarch"
-license="GPL-2.0-or-later"
-options="!check" # No test suite
-depends="xvfb coreutils"
-subpackages="$pkgname-doc"
-source="https://salsa.debian.org/xorg-team/xserver/xorg-server/raw/xorg-server-2_$_pkgver/debian/local/xvfb-run
-	https://salsa.debian.org/xorg-team/xserver/xorg-server/raw/xorg-server-2_$_pkgver/debian/local/xvfb-run.1
-	"
-builddir="$srcdir/"
-
-package() {
-	install -Dm755 xvfb-run "$pkgdir"/usr/bin/xvfb-run
-	install -D xvfb-run.1 "$pkgdir"/usr/share/man/man1/xvfb-run.1
-}
-
-sha512sums="d6a5f916c9f36d8f7259867a32c358a943a5e2f4d8cfde7866904fb0cb3b3042adf24b409e582dd36c601ba4e1d7c4af1d958a71bfebf029f615e67e055c443f  xvfb-run
-78b2bdf8f6e0e7dfb8974c0387d07cc00bdb6241ff3929ad07bd1c0bb54cf613fb308583d0237aa5e7af36b5643ecb7784731a6ef396f4feef4cfbb90d2e2cc2  xvfb-run.1"
diff --git a/main/xxhash/APKBUILD b/main/xxhash/APKBUILD
new file mode 100644
index 00000000000..53e3bb39ce8
--- /dev/null
+++ b/main/xxhash/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
+# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xxhash
+pkgver=0.8.2
+pkgrel=2
+pkgdesc="Extremely fast non-cryptographic hash algorithm"
+url="https://cyan4973.github.io/xxHash/"
+arch="all"
+license="BSD-2-Clause"
+subpackages="$pkgname-dev $pkgname-doc lib$pkgname:libs"
+source="$pkgname-$pkgver.tar.gz::https://github.com/Cyan4973/xxHash/archive/v$pkgver.tar.gz"
+builddir="$srcdir/xxHash-$pkgver"
+
+build() {
+	export CFLAGS="$CFLAGS -DXXH_FORCE_MEMORY_ACCESS=1 -flto=auto -O2"
+
+	case "$CARCH" in
+	x86*)
+		# only implemented for x86/x86_64
+		local dispatch="1"
+		;;
+	*)
+		local dispatch="0"
+		;;
+	esac
+	make DISPATCH="$dispatch"
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" PREFIX=/usr install
+	rm -rf "$pkgdir"/usr/lib/libxxhash.a
+}
+
+sha512sums="
+3e3eef21432fe88bc4dd9940ccad0308fdea3537b06fa5ac0e74c1bde53413dff29c8b3fc617a8a42b9ce88fcf213311d338a31b1ce73b3729342c9e68f06c78  xxhash-0.8.2.tar.gz
+"
diff --git a/main/xz/APKBUILD b/main/xz/APKBUILD
index a8022f590e5..aae47c39f3a 100644
--- a/main/xz/APKBUILD
+++ b/main/xz/APKBUILD
@@ -1,16 +1,31 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xz
-pkgver=5.2.5
-pkgrel=0
+pkgver=5.6.1
+pkgrel=3
 pkgdesc="Library and CLI tools for XZ and LZMA compressed files"
-url="https://tukaani.org/xz"
+url="https://xz.tukaani.org/xz-utils/"
 arch="all"
-license="GPL-2.0-or-later AND Public-Domain AND LGPL-2.1-or-later"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-source="https://tukaani.org/xz/xz-$pkgver.tar.xz"
+license="GPL-2.0-or-later AND 0BSD AND Public-Domain AND LGPL-2.1-or-later"
+makedepends="autoconf automake libtool gettext-tiny"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs"
+source="https://github.com/tukaani-project/xz/archive/refs/tags/v$pkgver/xz-$pkgver.tar.gz"
+
+# secfixes:
+#   5.2.5-r1:
+#     - CVE-2022-1271
+#   5.6.1-r2:
+#     - CVE-2024-3094
+
+prepare() {
+	default_prepare
+	autoreconf -fi
+}
 
 build() {
+	# compression utility
+	CFLAGS="$CFLAGS -O3" \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -31,11 +46,16 @@ build() {
 }
 
 check() {
-	LD_LIBRARY_PATH="$(pwd)/src/liblzma/.libs" make check
+	LD_LIBRARY_PATH="$(pwd)/src/liblzma/.libs" make check || {
+		cat tests/test-suite.log
+		return 1
+	}
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="59266068a51cb616eb31b67cd8f07ffeb2288d1391c61665ae2ec6814465afac80fec69248f6a2f2db45b44475af001296a99af6a32287226a9c41419173ccbb  xz-5.2.5.tar.xz"
+sha512sums="
+6391794eee783302a3f276299fc92df3e81a05dee0eab61cbb8505858da6d535ae2ac5d067f6825d6963b1e4c3d9616039f495f11f99ecec692ccd79ec17ba8d  xz-5.6.1.tar.gz
+"
diff --git a/main/yajl/APKBUILD b/main/yajl/APKBUILD
index 1a13e604d89..18d80d3dc77 100644
--- a/main/yajl/APKBUILD
+++ b/main/yajl/APKBUILD
@@ -1,62 +1,42 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=yajl
 pkgver=2.1.0
-pkgrel=1
+pkgrel=8
 pkgdesc="Yet Another JSON Library (YAJL)"
-url="http://lloyd.github.com/yajl/"
+url="https://lloyd.github.io/yajl/"
 arch="all"
 license="MIT"
-makedepends="cmake"
-subpackages="$pkgname-dev $pkgname-tools"
-source="https://dev.alpinelinux.org/archive/yajl/yajl-$pkgver.tar.gz"
-
-# How to create archive from git:
-#
-#  abuild snapshot
-#
-
-_gitrepo=yajl.git
-_giturl="git://github.com/lloyd/$_gitrepo"
-_gittag=$pkgver
-
-snapshot() {
-	local _tarball=$pkgname-$pkgver.tar.gz
-	msg "Creating $_tarball.."
-	mkdir -p "$srcdir"
-	cd "${SRCDEST:-$srcdir}"
-	if ! [ -d "$_gitrepo" ]; then
-		git clone --bare  $_giturl
-	else
-		git --git-dir=$_gitrepo fetch
-	fi
-
-	git --git-dir=$_gitrepo archive --prefix=$pkgname-$pkgver/ \
-		-o "$SRCDEST"/$_tarball $_gittag
-
-	msg "Uploading $_tarball"
-	scp "$SRCDEST"/$_tarball dev.alpinelinux.org:/archive/$pkgname/
-}
+makedepends="cmake samurai"
+subpackages="$pkgname-static $pkgname-dev $pkgname-tools"
+source="$pkgname-$pkgver-2.tar.gz::https://github.com/lloyd/yajl/archive/refs/tags/$pkgver.tar.gz"
 
 build() {
-	cmake -B build . \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DCMAKE_INSTALL_PREFIX=/usr
-	make -C build
+	cmake --build build
 }
 
 package() {
-	make install -C build DESTDIR="$pkgdir"
+	DESTDIR="$pkgdir" cmake --install build
 
 	mkdir -p "$pkgdir"/usr/lib
 	mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libyajl_s.a "$pkgdir"/usr/lib/libyajl.a
+}
+
+check() {
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 tools() {
 	pkgdesc="JSON tools based on Yajl"
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
-}
 
+	amove usr/bin
+}
 
-sha512sums="857101d8b99be22bde3c21ec1921ffcbbcd14735ff420728855e064631e6c4c4ceaec40b0e5c8b6d8cba1b36fe1ace0738f8e917e2f992107559b17ddf73de50  yajl-2.1.0.tar.gz"
+sha512sums="
+9e786d080803df80ec03a9c2f447501e6e8e433a6baf636824bc1d50ecf4f5f80d7dfb1d47958aeb0a30fe459bd0ef033d41bc6a79e1dc6e6b5eade930b19b02  yajl-2.1.0-2.tar.gz
+"
diff --git a/main/yaml/APKBUILD b/main/yaml/APKBUILD
index 0f2eac33e3b..a6a9e5d5383 100644
--- a/main/yaml/APKBUILD
+++ b/main/yaml/APKBUILD
@@ -1,17 +1,21 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=yaml
-pkgver=0.2.2
-pkgrel=1
+pkgver=0.2.5
+pkgrel=2
 pkgdesc="YAML 1.1 parser and emitter written in C"
 url="https://pyyaml.org/wiki/LibYAML"
 arch="all"
 license="MIT"
-subpackages="$pkgname-dev"
+subpackages="$pkgname-static $pkgname-dev"
 source="http://pyyaml.org/download/libyaml/yaml-$pkgver.tar.gz"
 
+prepare() {
+ 	default_prepare
+	update_config_sub
+}
+
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,13 +28,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="13d2197135946204323dbfccafa0ac7b3d05437e920545a56f46811fd7319c01419a58083090ce85fccd4d6901a620ceb9f1190078cc0830bc0ce769bb024f51  yaml-0.2.2.tar.gz"
+sha512sums="
+dadd7d8e0d88b5ebab005e5d521d56d541580198aa497370966b98c904586e642a1cd4f3881094eb57624f218d50db77417bbfd0ffdce50340f011e35e8c4c02  yaml-0.2.5.tar.gz
+"
diff --git a/main/yash/APKBUILD b/main/yash/APKBUILD
new file mode 100644
index 00000000000..0f91646d967
--- /dev/null
+++ b/main/yash/APKBUILD
@@ -0,0 +1,107 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
+pkgname=yash
+pkgver=2.56.1
+pkgrel=0
+pkgdesc="Yet another shell"
+url="https://yash.osdn.jp"
+arch="all"
+license="GPL-2.0-or-later"
+makedepends="ncurses-dev"
+install="
+	$pkgname.post-install
+	$pkgname.pre-deinstall
+	$pkgname.post-upgrade
+	"
+subpackages="$pkgname-doc $pkgname-binsh"
+source="https://github.com/magicant/yash/releases/download/$pkgver/yash-$pkgver.tar.xz
+	default-yashrc.patch
+	sample-yashrc.patch
+	global-yashrc
+	"
+
+_compdir="usr/share/yash/completion"
+
+# Move some bigger completion files to separate subpackages.
+_comps="git:git:git[gkx]:git-*
+	openssh-client:ssh:ssh-*
+	subversion:svn
+	valgrind:valgrind
+	"
+for _i in $_comps; do
+	subpackages="$subpackages ${_i%%:*}-yash-completion:_completion:noarch"
+done
+subpackages="$subpackages $pkgname-completion::noarch"
+
+prepare() {
+	default_prepare
+
+	# XXX: Disable hanging tests.
+	sed -i -e 's/\bkill[24]-p.tst\b//g' \
+		-e 's/\bsignal[12]-y.tst\b//g' \
+		tests/Makefile.in
+
+	# Remove completions for programs that are not available on Alpine
+	# (just to decrease size of the package).
+	cd share/completion
+	rm carthage dnf pgawk useradd
+}
+
+build() {
+	sh ./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--disable-nls
+	make
+}
+
+check() {
+	# FIXME: Fix broken tests.
+	make tests LANG=en_US.UTF-8 || true
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+	rm -Rf "$pkgdir"/usr/share/man/ja
+
+	install -D -m644 "$srcdir"/global-yashrc "$pkgdir"/etc/yashrc
+}
+
+_completion() {
+	local name="${subpkgname%-yash-completion}"
+	pkgdesc="Yash completions for $name"
+	depends="$pkgname-completion"
+	install_if="$pkgname-completion=$pkgver-r$pkgrel $name"
+
+	local files=$(printf '%s\n' $_comps \
+		| sed -En "s|^$name:(.*)|\1|p" \
+		| tr : ' ')
+	[ "$files" ] || die "$name not found in \$_comps"
+
+	local f; for f in $files; do
+		amove usr/share/yash/completion/$f
+	done
+}
+
+completion() {
+	pkgdesc="$pkgdesc (command-line completion)"
+	depends=""
+
+	amove usr/share/yash/completion
+}
+
+binsh() {
+	pkgdesc="yash as /bin/sh"
+	provides="/bin/sh"
+	provider_priority=50  # lower (other provider is busybox-binsh)
+
+	mkdir -p "$subpkgdir"/bin
+	ln -s /usr/bin/yash "$subpkgdir"/bin/sh
+}
+
+sha512sums="
+28e8bde5fc12e5178136b82ecdc0c52c37c98301245089b0d55c43266880e299237a5522e572883e5c51b7d9a0e9bf94fe265a9ebdbf346c28ff837b0f60cc00  yash-2.56.1.tar.xz
+8fe512d219204ddbbd59d683732c930970db08a23997c88e91035b60fd5141ea813c4d3ab2d7f19fcf6147fca59b085600a904de0c595dd92f24ab63e19ae91d  default-yashrc.patch
+ac24612a82a353d65e2e1a6b99727363be62eb7801eae3109c4661d694d82ddd5c9fc1233443e69d8b26abab725eeaac2c4110e26b1b366983b13cbf7699ebf5  sample-yashrc.patch
+778b6a4fa415692293cc9a91074be373572106dc90aeb7490b37643a737f223861f05a7245e4889d8ffea975570f56fd746877726630b9486c481d3159a23e30  global-yashrc
+"
diff --git a/main/yash/default-yashrc.patch b/main/yash/default-yashrc.patch
new file mode 100644
index 00000000000..0d690b2e9cf
--- /dev/null
+++ b/main/yash/default-yashrc.patch
@@ -0,0 +1,25 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Tue, 09 May 2023 02:12:02 +0200
+Subject: [PATCH] Improve default .yashrc
+
+Make it easier to follow.
+
+--- a/share/initialization/default
++++ b/share/initialization/default
+@@ -12,10 +12,12 @@
+ You are seeing this message because a user-specific initialization script is
+ not found at ~/.yashrc. The current session has been loaded with common
+ settings that should be useful for many users. To suppress this message, copy
+-a sample initialization script from ${yashdatadir}/initialization/sample
+-to ~/.yashrc and make any customization in it if you want. For bare default
+-settings, put an empty file at ~/.yashrc. Without ~/.yashrc, you will see this
+-message again next time you start yash.
++a sample init script to ~/.yashrc and make any customization if you want:
++
++  cp ${yashdatadir}/initialization/sample ~/.yashrc
++
++For bare default settings, put an empty file at ~/.yashrc. Without ~/.yashrc,
++you will see this message again next time you start yash.
+ 
+ For more instructions, see the manual at: https://magicant.github.io/yash/doc/
+ 
diff --git a/main/yash/global-yashrc b/main/yash/global-yashrc
new file mode 100644
index 00000000000..8b502b81aa4
--- /dev/null
+++ b/main/yash/global-yashrc
@@ -0,0 +1,8 @@
+# Global initialization script for yash
+# Note that it's not loaded implicitly, it must be sourced in ~/.yashrc.
+
+# Ctrl + Left Arrow
+bindkey -e '\^[[1;5D' backward-emacsword
+
+# Ctrl + Rigt Arrow
+bindkey -e '\^[[1;5C' forward-emacsword
diff --git a/main/yash/sample-yashrc.patch b/main/yash/sample-yashrc.patch
new file mode 100644
index 00000000000..2313d745a27
--- /dev/null
+++ b/main/yash/sample-yashrc.patch
@@ -0,0 +1,27 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Tue, 09 May 2023 02:12:02 +0200
+Subject: [PATCH] Improve sample .yashrc
+
+Make yash behave similarly to other shells.
+
+--- a/share/initialization/sample
++++ b/share/initialization/sample
+@@ -2,10 +2,18 @@
+ # This is a sample initialization script for yash. Copy this file to ~/.yashrc
+ # and add your favorite customization to it.
+ 
++# Load global initialization script, if exists.
++if [ -f /etc/yashrc ]; then
++  . /etc/yashrc
++fi
+ 
+ # Firstly, load the common customization script.
+ # If you don't like settings applied in this script, remove this line.
+ . --autoload --no-alias initialization/common
++
++if [ -f ~/.profile ]; then
++  . ~/.profile
++fi
+ 
+ # These are additional aliases that are not defined in the common script.
+ # Uncomment to enable them.
diff --git a/main/yash/yash.post-install b/main/yash/yash.post-install
new file mode 100644
index 00000000000..6e4c5424c48
--- /dev/null
+++ b/main/yash/yash.post-install
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+add-shell '/usr/bin/yash'
+
+cat >&2 <<EOF
+*
+* If you want command completion in yash, install yash-completion.
+*
+EOF
+
+exit 0
diff --git a/main/yash/yash.post-upgrade b/main/yash/yash.post-upgrade
new file mode 100644
index 00000000000..459a74ac1ed
--- /dev/null
+++ b/main/yash/yash.post-upgrade
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+ver_old=$2
+
+if [ "$(apk version -t "$ver_old" '2.53-r1')" = '<' ]; then
+	cat >&2 <<-EOF
+	*
+	* yash no longer depends on yash-completion. To keep using command completion,
+	* run: apk add yash-completion
+	*
+	EOF
+fi
+
+exit 0
diff --git a/main/yash/yash.pre-deinstall b/main/yash/yash.pre-deinstall
new file mode 100644
index 00000000000..7205565ee1b
--- /dev/null
+++ b/main/yash/yash.pre-deinstall
@@ -0,0 +1,3 @@
+#!/bin/sh
+remove-shell '/usr/bin/yash'
+exit 0
diff --git a/main/yasm/74184586228af6c362f970c84fce58da3fcbdec8.patch b/main/yasm/74184586228af6c362f970c84fce58da3fcbdec8.patch
deleted file mode 100644
index 3ec24e6f681..00000000000
--- a/main/yasm/74184586228af6c362f970c84fce58da3fcbdec8.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 74184586228af6c362f970c84fce58da3fcbdec8
-Author: Matt Oliver <protogonoi@gmail.com>
-Date:   Tue Apr 4 00:34:47 2017 +1000
-
-    fix memory errors when using gas processor with coff object output.
-
-diff --git a/modules/objfmts/coff/coff-objfmt.c b/modules/objfmts/coff/coff-objfmt.c
-index 6fcb0e3c..8f753bfe 100644
---- a/modules/objfmts/coff/coff-objfmt.c
-+++ b/modules/objfmts/coff/coff-objfmt.c
-@@ -290,6 +290,7 @@ coff_common_create(yasm_object *object)
-     objfmt_coff->done_prolog = 0;
-     objfmt_coff->unwind = NULL;
-     objfmt_coff->ssym_imagebase = NULL;
-+    objfmt_coff->def_sym = NULL;
- 
-     return objfmt_coff;
- }
diff --git a/main/yasm/APKBUILD b/main/yasm/APKBUILD
deleted file mode 100644
index 0178d7cd218..00000000000
--- a/main/yasm/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=yasm
-pkgver=1.3.0
-pkgrel=2
-pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)"
-url="http://www.tortall.net/projects/yasm/"
-arch="all"
-license="BSD-2-Clause"
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://www.tortall.net/projects/yasm/releases/yasm-$pkgver.tar.gz
-	74184586228af6c362f970c84fce58da3fcbdec8.patch"
-
-prepare() {
-	default_prepare
-	update_config_sub
-}
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
-	make
-}
-
-check() {
-	make -j1 check
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-sha512sums="572d3b45568b10f58e48f1188c2d6bcbdd16429c8afaccc8c6d37859b45635e106885d679e41d0bee78c23822108c7ae75aa7475eed5ba58057e0a6fe1b68645  yasm-1.3.0.tar.gz
-e0220f7d29a83fc107dfb134dad29c3246fdaa2bcba4a1182fb93e9fd810c53cc97062771c26ee4a34d5e8dea1feb3094647bdc68b4d45734a062eb8d4afa3d1  74184586228af6c362f970c84fce58da3fcbdec8.patch"
diff --git a/main/yx/APKBUILD b/main/yx/APKBUILD
new file mode 100644
index 00000000000..1e56c84fe6b
--- /dev/null
+++ b/main/yx/APKBUILD
@@ -0,0 +1,30 @@
+# Contributor: Jake Buchholz Göktürk <tomalok@gmail.com>
+# Maintainer: Jake Buchholz Göktürk <tomalok@gmail.com>
+pkgname=yx
+pkgver=1.0.2
+pkgrel=0
+pkgdesc="A small shell tool that allows extraction of targeted data from YAML"
+url="https://gitlab.com/tomalok/yx"
+arch="all"
+license="MIT"
+makedepends="yaml-dev"
+source="
+	yx-$pkgver.tar.gz::https://gitlab.com/tomalok/yx/-/archive/$pkgver/yx-$pkgver.tar.gz
+"
+subpackages="$pkgname-doc::noarch"
+
+build() {
+	make
+}
+
+check() {
+	make test
+}
+
+package() {
+	make install PREFIX="$pkgdir/usr"
+}
+
+sha512sums="
+bc5f990f4a926bfa70a446d4d8d404c6d51dd36a28d0dc893c32b26543b1364470d5f7f37ee69a246716c021e3b33137393aafffca99e5da62aff2ee43af6eeb  yx-1.0.2.tar.gz
+"
diff --git a/main/zd1211-firmware/APKBUILD b/main/zd1211-firmware/APKBUILD
index 919e22e79ae..6912ffb2226 100644
--- a/main/zd1211-firmware/APKBUILD
+++ b/main/zd1211-firmware/APKBUILD
@@ -2,28 +2,21 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=zd1211-firmware
 pkgver=1.5
-pkgrel=0
+pkgrel=2
 pkgdesc="Firmware for ZyDAS ZD1211 USB-WLAN devices supported by the zd1211rw driver"
 url="https://sourceforge.net/projects/zd1211/"
 arch="noarch"
-license="GPL-2.0"
-depends=""
-depends_dev=""
-makedepends=""
-install=""
-subpackages=""
+license="GPL-2.0-only"
 source="https://downloads.sourceforge.net/project/zd1211/zd1211-firmware/$pkgver/zd1211-firmware-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/zd1211-firmware
-build() {
-	return 0
-}
+builddir="$srcdir/zd1211-firmware"
+options="!check"
 
 package() {
-	cd "$_builddir"
-	mkdir -p "$pkgdir"/lib/firmware/zd1211
-	cp zd1211_ub zd1211_ur zd1211_uphr zd1211b_ub zd1211b_ur zd1211b_uphr \
-		"$pkgdir"/lib/firmware/zd1211/
+	install -Dm644 zd1211_ub zd1211_ur zd1211_uphr \
+		zd1211b_ub zd1211b_ur zd1211b_uphr \
+		-t "$pkgdir"/lib/firmware/zd1211
 }
 
-sha512sums="6a8d39318a8c136b2a780ebeb485a94bbb05fa12ad7104b707314e0108e49939b4dcd0035b19f07dac0ec7bdd12668ea281b48724e512b45ac5df9dedf035897  zd1211-firmware-1.5.tar.bz2"
+sha512sums="
+6a8d39318a8c136b2a780ebeb485a94bbb05fa12ad7104b707314e0108e49939b4dcd0035b19f07dac0ec7bdd12668ea281b48724e512b45ac5df9dedf035897  zd1211-firmware-1.5.tar.bz2
+"
diff --git a/main/zeromq/APKBUILD b/main/zeromq/APKBUILD
index 0d802783be9..933b54d7195 100644
--- a/main/zeromq/APKBUILD
+++ b/main/zeromq/APKBUILD
@@ -1,48 +1,68 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=zeromq
-pkgver=4.3.2
-pkgrel=0
+pkgver=4.3.5
+pkgrel=2
 pkgdesc="The ZeroMQ messaging library and tools"
-url="http://www.zeromq.org/"
+url="https://zeromq.org/"
 arch="all"
-license="LGPL-3.0-or-later with exceptions"
-makedepends="util-linux-dev libsodium-dev
-	perl asciidoc xmlto autoconf automake
-	"
-subpackages="libzmq-static $pkgname-dev $pkgname-doc libzmq:libs"
-source="https://github.com/zeromq/libzmq/releases/download/v$pkgver/zeromq-$pkgver.tar.gz
-	test-driver.patch
+license="MPL-2.0"
+makedepends="
+	asciidoc
+	cmake
+	libsodium-dev
+	perl
+	samurai
+	util-linux-dev
+	xmlto
 	"
+subpackages="libzmq-static $pkgname-dev libzmq:libs"
+source="https://github.com/zeromq/libzmq/releases/download/v$pkgver/zeromq-$pkgver.tar.gz"
 
 # secfixes:
+#   4.3.3-r0:
+#     - CVE-2020-15166
 #   4.3.2-r0:
-#   - CVE-2019-13132
+#     - CVE-2019-13132
 #   4.3.1-r0:
-#   - CVE-2019-6250
+#     - CVE-2019-6250
 
 build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--with-libsodium
-	make
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_TESTS="$(want_check && echo ON || echo OFF)" \
+		-DBUILD_STATIC=OFF \
+		-DWITH_LIBSODIUM=ON \
+		-DENABLE_CURVE=ON \
+		-DWITH_DOC=OFF
+	cmake --build build
+
+	cmake -B build-static -G Ninja \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_TESTS=OFF \
+		-DBUILD_STATIC=ON \
+		-DBUILD_SHARED=OFF \
+		-DWITH_LIBSODIUM=ON \
+		-DWITH_LIBSODIUM_STATIC=ON \
+		-DENABLE_CURVE=ON \
+		-DWITH_DOC=OFF
+	cmake --build build-static
 }
 
 check() {
-	cd "$builddir"
-	make check
+	ulimit -n 2048 # Fix test failure on the builders
+	ctest --test-dir build --output-on-failure -E test_security_curve --timeout 300 -j1
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
+	install -Dm644 build-static/lib/*.a -t "$pkgdir"/usr/lib
+	# just the readme
+	rm -r "$pkgdir"/usr/share/zmq
 }
 
-sha512sums="b6251641e884181db9e6b0b705cced7ea4038d404bdae812ff47bdd0eed12510b6af6846b85cb96898e253ccbac71eca7fe588673300ddb9c3109c973250c8e4  zeromq-4.3.2.tar.gz
-64e4ae2c89469359480743beeb4f1e08976a4c52dbfd2dd33020463df78e927993319e456299682901001e0832ebed85291eea0decc1d27a58de78a6c891e660  test-driver.patch"
+sha512sums="
+a71d48aa977ad8941c1609947d8db2679fc7a951e4cd0c3a1127ae026d883c11bd4203cf315de87f95f5031aec459a731aec34e5ce5b667b8d0559b157952541  zeromq-4.3.5.tar.gz
+"
diff --git a/main/zeromq/test-driver.patch b/main/zeromq/test-driver.patch
deleted file mode 100644
index f8b7fe3898a..00000000000
--- a/main/zeromq/test-driver.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/config/test-driver
-+++ b/config/test-driver
-@@ -104,7 +104,7 @@
- trap "st=143; $do_exit" 15
- 
- # Test script is run here.
--"$@" >$log_file 2>&1
-+: "$@" >$log_file 2>&1
- estatus=$?
- if test $enable_hard_errors = no && test $estatus -eq 99; then
-   estatus=1
diff --git a/main/zfs-lts/APKBUILD b/main/zfs-lts/APKBUILD
index 8f25b1ba8cc..b0694e68083 100644
--- a/main/zfs-lts/APKBUILD
+++ b/main/zfs-lts/APKBUILD
@@ -1,41 +1,61 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
 # when changing _ver we *must* bump _rel
 _name=zfs
-_ver=0.8.3
+_ver=2.2.3
 _rel=0
-
+# when changing _kver make sure _krel=0 & _rel=0
 _flavor=${FLAVOR:-lts}
 _kpkg=linux-$_flavor
-_kver=5.4.28
+_kver=6.6.28
 _krel=0
 
 _kpkgver="$_kver-r$_krel"
+
+# for custom kernels set $FLAVOR
+case $CARCH in
+	x86|x86_64|aarch64) _extra_flavors="virt";;
+esac
+
+_kpkg=linux-$_flavor
 _kabi="$_kver-$_krel-$_flavor"
 
 pkgname=$_name-$_flavor
 pkgver=$_kver
-pkgrel=$(( $_krel + $_rel ))
+pkgrel=$(( _krel + _rel ))
 
-pkgdesc="ZFS for Linux"
-url="http://zfsonlinux.org"
-arch="x86 x86_64 aarch64 ppc64le"
+pkgdesc="ZFS Linux kernel modules"
+url="https://openzfs.org"
+arch="all !armhf !riscv64" # limited by linux-lts
 license="CDDL-1.0"
-provides="spl-vanilla" # Mitigate upgrade conflicts
+provides="spl-vanilla=$pkgver-r$pkgrel" # Mitigate upgrade conflicts
 depends="$_kpkg=$_kpkgver"
 depends_dev="glib-dev e2fsprogs-dev util-linux-dev libtirpc-dev
 	$_kpkg-dev=$_kpkgver"
-makedepends="$depends_dev automake autoconf libtool linux-headers"
+
+makedepends="$depends_dev linux-headers"
 install_if="zfs $_kpkg=$_kpkgver"
 subpackages="$pkgname-dev"
-source="https://github.com/zfsonlinux/zfs/releases/download/zfs-$_ver/zfs-$_ver.tar.gz"
+source="https://github.com/openzfs/zfs/releases/download/zfs-$_ver/zfs-$_ver.tar.gz
+	aarch64-disable-neon.patch
+	"
 builddir="$srcdir/$_name-$_ver"
+options="!check"
+
+# secfixes:
+#   2.2.1-r1:
+#     - CVE-2023-49298
+
+for f in $_extra_flavors; do
+	makedepends="$makedepends linux-$f-dev=$_kpkgver"
+	subpackages="$subpackages zfs-$f:_extra"
+done
 
 prepare() {
 	default_prepare
 	# verify the kernel version
-	local _kapkbuild=../../main/linux-$_flavor-/APKBUILD
+	local _kapkbuild="$startdir"/../../main/linux-$_flavor-/APKBUILD
 	if [ -f $_kapkbuild ]; then
 		(	. $_kapkbuild
 			pkgname=$_name-$_flavor
@@ -44,26 +64,45 @@ prepare() {
 			return 0
 		)
 	fi
-	autoreconf -vif
 }
 
 build() {
-	cd "$builddir"
-	./configure --prefix=/usr \
-		--with-tirpc \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--with-config=kernel \
-		--with-linux=/usr/src/linux-headers-${_kabi}
-
-	make
+	local flavor= kabi=
+	for flavor in $_flavor $_extra_flavors; do
+		kabi="$_kver-$_krel-$flavor"
+		mkdir -p "$kabi"
+		(cd $kabi
+		../configure --prefix=/usr \
+			--with-tirpc \
+			--sysconfdir=/etc \
+			--mandir=/usr/share/man \
+			--infodir=/usr/share/info \
+			--localstatedir=/var \
+			--with-config=kernel \
+			--with-linux=/usr/src/linux-headers-$kabi
+
+		make
+		)
+	done
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	local flavor= kabi=
+	for flavor in $_flavor $_extra_flavors; do
+		kabi="$_kver-$_krel-$flavor"
+		(cd $kabi && make DESTDIR="$pkgdir" install)
+	done
+}
+
+_extra() {
+	local flavor=${subpkgname##*-}
+	depends="linux-$flavor=$_kpkgver"
+	install_if="zfs linux-$flavor=$_kpkgver"
+	pkgdesc="ZFS Linux kernel modules for $flavor"
+
+	kabi="$_kver-$_krel-$flavor"
+	mkdir -p "$subpkgdir"/lib/modules
+	mv "$pkgdir"/lib/modules/$kabi "$subpkgdir"/lib/modules
 }
 
 dev() {
@@ -72,4 +111,7 @@ dev() {
 	default_dev
 }
 
-sha512sums="aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010  zfs-0.8.3.tar.gz"
+sha512sums="
+e6c3df531a33f4bd198429e61b7630f1e965a03fd60d1b847bdf0d55c6d2af3abc38b5e8a63aa9ef9f969cc7eca36cb24a7641f6fb8c41ef2fa024d76cd28f3d  zfs-2.2.3.tar.gz
+18966558e213b7516d3359884ced72618956db401cac32306662fa6304d3e31a28b030adcc8678704a30e6bbdee28120b2c6125e8285afacbb11a1645b39695a  aarch64-disable-neon.patch
+"
diff --git a/main/zfs-lts/aarch64-disable-neon.patch b/main/zfs-lts/aarch64-disable-neon.patch
new file mode 100644
index 00000000000..59838b80086
--- /dev/null
+++ b/main/zfs-lts/aarch64-disable-neon.patch
@@ -0,0 +1,158 @@
+ERROR: modpost: GPL-incompatible module zfs.ko uses GPL-only symbol 'kernel_neon_begin'
+ERROR: modpost: GPL-incompatible module zfs.ko uses GPL-only symbol 'kernel_neon_end'
+
+There is no way around this so just disable all zfs kernel SIMD on aarch64
+for the time being.
+
+diff --git a/include/os/linux/kernel/linux/simd.h b/include/os/linux/kernel/linux/simd.h
+index f4376b2..02f8110 100644
+--- a/include/os/linux/kernel/linux/simd.h
++++ b/include/os/linux/kernel/linux/simd.h
+@@ -31,9 +31,6 @@
+ #elif defined(__arm__)
+ #include <linux/simd_arm.h>
+ 
+-#elif defined(__aarch64__)
+-#include <linux/simd_aarch64.h>
+-
+ #elif defined(__powerpc__)
+ #include <linux/simd_powerpc.h>
+ 
+diff --git a/module/Kbuild.in b/module/Kbuild.in
+index 4395938..dc991b6 100644
+--- a/module/Kbuild.in
++++ b/module/Kbuild.in
+@@ -170,7 +170,6 @@ zfs-$(CONFIG_X86)    += $(addprefix icp/,$(ICP_OBJS_X86))
+ zfs-$(CONFIG_UML_X86)+= $(addprefix icp/,$(ICP_OBJS_X86))
+ zfs-$(CONFIG_X86_64) += $(addprefix icp/,$(ICP_OBJS_X86_64))
+ zfs-$(CONFIG_ARM)    += $(addprefix icp/,$(ICP_OBJS_ARM))
+-zfs-$(CONFIG_ARM64)  += $(addprefix icp/,$(ICP_OBJS_ARM64))
+ zfs-$(CONFIG_PPC)    += $(addprefix icp/,$(ICP_OBJS_PPC_PPC64))
+ zfs-$(CONFIG_PPC64)  += $(addprefix icp/,$(ICP_OBJS_PPC_PPC64))
+ 
+@@ -258,7 +257,6 @@ ZCOMMON_OBJS_ARM64 := \
+ zfs-objs            += $(addprefix zcommon/,$(ZCOMMON_OBJS))
+ zfs-$(CONFIG_X86)   += $(addprefix zcommon/,$(ZCOMMON_OBJS_X86))
+ zfs-$(CONFIG_UML_X86)+= $(addprefix zcommon/,$(ZCOMMON_OBJS_X86))
+-zfs-$(CONFIG_ARM64) += $(addprefix zcommon/,$(ZCOMMON_OBJS_ARM64))
+ 
+ 
+ # Zstd uses -O3 by default, so we should follow
+@@ -485,7 +483,6 @@ ZFS_OBJS_PPC_PPC64 := \
+ zfs-objs            += $(addprefix zfs/,$(ZFS_OBJS)) $(addprefix os/linux/zfs/,$(ZFS_OBJS_OS))
+ zfs-$(CONFIG_X86)   += $(addprefix zfs/,$(ZFS_OBJS_X86))
+ zfs-$(CONFIG_UML_X86)+= $(addprefix zfs/,$(ZFS_OBJS_X86))
+-zfs-$(CONFIG_ARM64) += $(addprefix zfs/,$(ZFS_OBJS_ARM64))
+ zfs-$(CONFIG_PPC)   += $(addprefix zfs/,$(ZFS_OBJS_PPC_PPC64))
+ zfs-$(CONFIG_PPC64) += $(addprefix zfs/,$(ZFS_OBJS_PPC_PPC64))
+ 
+diff --git a/module/icp/algs/blake3/blake3_impl.c b/module/icp/algs/blake3/blake3_impl.c
+index f3f48c2..df02487 100644
+--- a/module/icp/algs/blake3/blake3_impl.c
++++ b/module/icp/algs/blake3/blake3_impl.c
+@@ -30,7 +30,7 @@
+ 
+ #include "blake3_impl.h"
+ 
+-#if defined(__aarch64__) || \
++#if 0 || \
+ 	(defined(__x86_64) && defined(HAVE_SSE2)) || \
+ 	(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
+ 
+@@ -96,7 +96,7 @@ const blake3_ops_t blake3_sse2_impl = {
+ };
+ #endif
+ 
+-#if defined(__aarch64__) || \
++#if 0 || \
+ 	(defined(__x86_64) && defined(HAVE_SSE2)) || \
+ 	(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
+ 
+@@ -257,12 +257,12 @@ extern const blake3_ops_t blake3_generic_impl;
+ 
+ static const blake3_ops_t *const blake3_impls[] = {
+ 	&blake3_generic_impl,
+-#if defined(__aarch64__) || \
++#if 0 || \
+ 	(defined(__x86_64) && defined(HAVE_SSE2)) || \
+ 	(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
+ 	&blake3_sse2_impl,
+ #endif
+-#if defined(__aarch64__) || \
++#if 0 || \
+ 	(defined(__x86_64) && defined(HAVE_SSE4_1)) || \
+ 	(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
+ 	&blake3_sse41_impl,
+diff --git a/module/icp/algs/sha2/sha256_impl.c b/module/icp/algs/sha2/sha256_impl.c
+index 01ce5cb..69f8233 100644
+--- a/module/icp/algs/sha2/sha256_impl.c
++++ b/module/icp/algs/sha2/sha256_impl.c
+@@ -118,7 +118,7 @@ const sha256_ops_t sha256_shani_impl = {
+ };
+ #endif
+ 
+-#elif defined(__aarch64__) || (defined(__arm__) && __ARM_ARCH > 6)
++#elif (defined(__aarch64__) && 0) || (defined(__arm__) && __ARM_ARCH > 6)
+ static boolean_t sha256_have_neon(void)
+ {
+ 	return (kfpu_allowed() && zfs_neon_available());
+@@ -192,7 +192,7 @@ static const sha256_ops_t *const sha256_impls[] = {
+ #if defined(__x86_64) && defined(HAVE_SSE4_1)
+ 	&sha256_shani_impl,
+ #endif
+-#if defined(__aarch64__) || (defined(__arm__) && __ARM_ARCH > 6)
++#if 0 || (defined(__arm__) && __ARM_ARCH > 6)
+ 	&sha256_armv7_impl,
+ 	&sha256_neon_impl,
+ 	&sha256_armv8_impl,
+diff --git a/module/icp/algs/sha2/sha512_impl.c b/module/icp/algs/sha2/sha512_impl.c
+index 27b35a6..23f5ea5 100644
+--- a/module/icp/algs/sha2/sha512_impl.c
++++ b/module/icp/algs/sha2/sha512_impl.c
+@@ -88,7 +88,7 @@ const sha512_ops_t sha512_avx2_impl = {
+ };
+ #endif
+ 
+-#elif defined(__aarch64__)
++#elif defined(__aarch64__) && 0
+ extern void zfs_sha512_block_armv7(uint64_t s[8], const void *, size_t);
+ const sha512_ops_t sha512_armv7_impl = {
+ 	.is_supported = sha2_is_supported,
+@@ -164,7 +164,7 @@ static const sha512_ops_t *const sha512_impls[] = {
+ #if defined(__x86_64) && defined(HAVE_AVX2)
+ 	&sha512_avx2_impl,
+ #endif
+-#if defined(__aarch64__)
++#if 0
+ 	&sha512_armv7_impl,
+ 	&sha512_armv8_impl,
+ #endif
+diff --git a/module/zcommon/zfs_fletcher.c b/module/zcommon/zfs_fletcher.c
+index 619ddef..39dbd65 100644
+--- a/module/zcommon/zfs_fletcher.c
++++ b/module/zcommon/zfs_fletcher.c
+@@ -188,9 +188,6 @@ static const fletcher_4_ops_t *fletcher_4_impls[] = {
+ #if defined(__x86_64) && defined(HAVE_AVX512BW)
+ 	&fletcher_4_avx512bw_ops,
+ #endif
+-#if defined(__aarch64__) && !defined(__FreeBSD__)
+-	&fletcher_4_aarch64_neon_ops,
+-#endif
+ };
+ 
+ /* Hold all supported implementations */
+diff --git a/module/zfs/vdev_raidz_math.c b/module/zfs/vdev_raidz_math.c
+index e12b961..62c0063 100644
+--- a/module/zfs/vdev_raidz_math.c
++++ b/module/zfs/vdev_raidz_math.c
+@@ -61,10 +61,6 @@ static const raidz_impl_ops_t *const raidz_all_maths[] = {
+ #if defined(__x86_64) && defined(HAVE_AVX512BW)	/* only x86_64 for now */
+ 	&vdev_raidz_avx512bw_impl,
+ #endif
+-#if defined(__aarch64__) && !defined(__FreeBSD__)
+-	&vdev_raidz_aarch64_neon_impl,
+-	&vdev_raidz_aarch64_neonx2_impl,
+-#endif
+ #if defined(__powerpc__) && defined(__altivec__)
+ 	&vdev_raidz_powerpc_altivec_impl,
+ #endif
diff --git a/main/zfs-rpi/APKBUILD b/main/zfs-rpi/APKBUILD
new file mode 100644
index 00000000000..61f86b20ffc
--- /dev/null
+++ b/main/zfs-rpi/APKBUILD
@@ -0,0 +1,118 @@
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+
+# when changing _ver we *must* bump _rel
+_name=zfs
+_ver=2.2.3
+_rel=3
+# when changing _kver/_krel make sure _rel=0
+_flavor=${FLAVOR:-rpi}
+_kpkg=linux-$_flavor
+_kver=6.6.21
+_krel=0
+
+_kpkgver="$_kver-r$_krel"
+
+# for custom kernels set $FLAVOR
+case $CARCH in
+	armhf|armv7) _extra_flavors="";;
+	aarch64) _extra_flavors="";;
+esac
+
+_kpkg=linux-$_flavor
+_kabi="$_kver-$_krel-$_flavor"
+
+pkgname=$_name-$_flavor
+pkgver=$_kver
+pkgrel=$(( _krel + _rel ))
+
+pkgdesc="ZFS Linux kernel modules"
+url="https://openzfs.org"
+# armhf: NEON SIMD not available in BCM2835 (rpi1 & rpiZ)
+arch="aarch64 armv7"
+license="CDDL-1.0"
+depends="$_kpkg=$_kpkgver"
+depends_dev="glib-dev e2fsprogs-dev util-linux-dev libtirpc-dev
+	$_kpkg-dev=$_kpkgver"
+
+makedepends="$depends_dev linux-headers xz"
+install_if="zfs $_kpkg=$_kpkgver"
+subpackages="$pkgname-dev"
+source="https://github.com/openzfs/zfs/releases/download/zfs-$_ver/zfs-$_ver.tar.gz
+	aarch64-disable-neon.patch
+	"
+builddir="$srcdir/$_name-$_ver"
+options="!check"
+
+# secfixes:
+#   2.2.1-r1:
+#     - CVE-2023-49298
+
+for f in $_extra_flavors; do
+	makedepends="$makedepends linux-$f-dev=$_kpkgver"
+	subpackages="$subpackages zfs-$f:_extra"
+done
+
+prepare() {
+	default_prepare
+	# verify the kernel version
+	local _kapkbuild="$startdir"/../../main/linux-$_flavor-/APKBUILD
+	if [ -f $_kapkbuild ]; then
+		(	. $_kapkbuild
+			pkgname=$_name-$_flavor
+			[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
+			[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
+			return 0
+		)
+	fi
+}
+
+build() {
+	local flavor= kabi=
+	for flavor in $_flavor $_extra_flavors; do
+		kabi="$_kver-$_krel-$flavor"
+		mkdir -p "$kabi"
+		(cd $kabi
+		../configure --prefix=/usr \
+			--with-tirpc \
+			--sysconfdir=/etc \
+			--mandir=/usr/share/man \
+			--infodir=/usr/share/info \
+			--localstatedir=/var \
+			--with-config=kernel \
+			--with-linux=/usr/src/linux-headers-$kabi
+
+		make
+		)
+	done
+}
+
+package() {
+	local flavor= kabi=
+	for flavor in $_flavor $_extra_flavors; do
+		kabi="$_kver-$_krel-$flavor"
+		(cd $kabi && make DESTDIR="$pkgdir" install)
+	done
+}
+
+_extra() {
+	local flavor=${subpkgname##*-}
+	depends="linux-$flavor=$_kpkgver"
+	install_if="zfs linux-$flavor=$_kpkgver"
+	pkgdesc="ZFS Linux kernel modules for $flavor"
+
+	kabi="$_kver-$_krel-$flavor"
+	mkdir -p "$subpkgdir"/lib/modules
+	mv "$pkgdir"/lib/modules/$kabi "$subpkgdir"/lib/modules
+}
+
+dev() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/src "$subpkgdir"/usr
+	default_dev
+}
+
+sha512sums="
+e6c3df531a33f4bd198429e61b7630f1e965a03fd60d1b847bdf0d55c6d2af3abc38b5e8a63aa9ef9f969cc7eca36cb24a7641f6fb8c41ef2fa024d76cd28f3d  zfs-2.2.3.tar.gz
+18966558e213b7516d3359884ced72618956db401cac32306662fa6304d3e31a28b030adcc8678704a30e6bbdee28120b2c6125e8285afacbb11a1645b39695a  aarch64-disable-neon.patch
+"
diff --git a/main/zfs-rpi/aarch64-disable-neon.patch b/main/zfs-rpi/aarch64-disable-neon.patch
new file mode 100644
index 00000000000..59838b80086
--- /dev/null
+++ b/main/zfs-rpi/aarch64-disable-neon.patch
@@ -0,0 +1,158 @@
+ERROR: modpost: GPL-incompatible module zfs.ko uses GPL-only symbol 'kernel_neon_begin'
+ERROR: modpost: GPL-incompatible module zfs.ko uses GPL-only symbol 'kernel_neon_end'
+
+There is no way around this so just disable all zfs kernel SIMD on aarch64
+for the time being.
+
+diff --git a/include/os/linux/kernel/linux/simd.h b/include/os/linux/kernel/linux/simd.h
+index f4376b2..02f8110 100644
+--- a/include/os/linux/kernel/linux/simd.h
++++ b/include/os/linux/kernel/linux/simd.h
+@@ -31,9 +31,6 @@
+ #elif defined(__arm__)
+ #include <linux/simd_arm.h>
+ 
+-#elif defined(__aarch64__)
+-#include <linux/simd_aarch64.h>
+-
+ #elif defined(__powerpc__)
+ #include <linux/simd_powerpc.h>
+ 
+diff --git a/module/Kbuild.in b/module/Kbuild.in
+index 4395938..dc991b6 100644
+--- a/module/Kbuild.in
++++ b/module/Kbuild.in
+@@ -170,7 +170,6 @@ zfs-$(CONFIG_X86)    += $(addprefix icp/,$(ICP_OBJS_X86))
+ zfs-$(CONFIG_UML_X86)+= $(addprefix icp/,$(ICP_OBJS_X86))
+ zfs-$(CONFIG_X86_64) += $(addprefix icp/,$(ICP_OBJS_X86_64))
+ zfs-$(CONFIG_ARM)    += $(addprefix icp/,$(ICP_OBJS_ARM))
+-zfs-$(CONFIG_ARM64)  += $(addprefix icp/,$(ICP_OBJS_ARM64))
+ zfs-$(CONFIG_PPC)    += $(addprefix icp/,$(ICP_OBJS_PPC_PPC64))
+ zfs-$(CONFIG_PPC64)  += $(addprefix icp/,$(ICP_OBJS_PPC_PPC64))
+ 
+@@ -258,7 +257,6 @@ ZCOMMON_OBJS_ARM64 := \
+ zfs-objs            += $(addprefix zcommon/,$(ZCOMMON_OBJS))
+ zfs-$(CONFIG_X86)   += $(addprefix zcommon/,$(ZCOMMON_OBJS_X86))
+ zfs-$(CONFIG_UML_X86)+= $(addprefix zcommon/,$(ZCOMMON_OBJS_X86))
+-zfs-$(CONFIG_ARM64) += $(addprefix zcommon/,$(ZCOMMON_OBJS_ARM64))
+ 
+ 
+ # Zstd uses -O3 by default, so we should follow
+@@ -485,7 +483,6 @@ ZFS_OBJS_PPC_PPC64 := \
+ zfs-objs            += $(addprefix zfs/,$(ZFS_OBJS)) $(addprefix os/linux/zfs/,$(ZFS_OBJS_OS))
+ zfs-$(CONFIG_X86)   += $(addprefix zfs/,$(ZFS_OBJS_X86))
+ zfs-$(CONFIG_UML_X86)+= $(addprefix zfs/,$(ZFS_OBJS_X86))
+-zfs-$(CONFIG_ARM64) += $(addprefix zfs/,$(ZFS_OBJS_ARM64))
+ zfs-$(CONFIG_PPC)   += $(addprefix zfs/,$(ZFS_OBJS_PPC_PPC64))
+ zfs-$(CONFIG_PPC64) += $(addprefix zfs/,$(ZFS_OBJS_PPC_PPC64))
+ 
+diff --git a/module/icp/algs/blake3/blake3_impl.c b/module/icp/algs/blake3/blake3_impl.c
+index f3f48c2..df02487 100644
+--- a/module/icp/algs/blake3/blake3_impl.c
++++ b/module/icp/algs/blake3/blake3_impl.c
+@@ -30,7 +30,7 @@
+ 
+ #include "blake3_impl.h"
+ 
+-#if defined(__aarch64__) || \
++#if 0 || \
+ 	(defined(__x86_64) && defined(HAVE_SSE2)) || \
+ 	(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
+ 
+@@ -96,7 +96,7 @@ const blake3_ops_t blake3_sse2_impl = {
+ };
+ #endif
+ 
+-#if defined(__aarch64__) || \
++#if 0 || \
+ 	(defined(__x86_64) && defined(HAVE_SSE2)) || \
+ 	(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
+ 
+@@ -257,12 +257,12 @@ extern const blake3_ops_t blake3_generic_impl;
+ 
+ static const blake3_ops_t *const blake3_impls[] = {
+ 	&blake3_generic_impl,
+-#if defined(__aarch64__) || \
++#if 0 || \
+ 	(defined(__x86_64) && defined(HAVE_SSE2)) || \
+ 	(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
+ 	&blake3_sse2_impl,
+ #endif
+-#if defined(__aarch64__) || \
++#if 0 || \
+ 	(defined(__x86_64) && defined(HAVE_SSE4_1)) || \
+ 	(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
+ 	&blake3_sse41_impl,
+diff --git a/module/icp/algs/sha2/sha256_impl.c b/module/icp/algs/sha2/sha256_impl.c
+index 01ce5cb..69f8233 100644
+--- a/module/icp/algs/sha2/sha256_impl.c
++++ b/module/icp/algs/sha2/sha256_impl.c
+@@ -118,7 +118,7 @@ const sha256_ops_t sha256_shani_impl = {
+ };
+ #endif
+ 
+-#elif defined(__aarch64__) || (defined(__arm__) && __ARM_ARCH > 6)
++#elif (defined(__aarch64__) && 0) || (defined(__arm__) && __ARM_ARCH > 6)
+ static boolean_t sha256_have_neon(void)
+ {
+ 	return (kfpu_allowed() && zfs_neon_available());
+@@ -192,7 +192,7 @@ static const sha256_ops_t *const sha256_impls[] = {
+ #if defined(__x86_64) && defined(HAVE_SSE4_1)
+ 	&sha256_shani_impl,
+ #endif
+-#if defined(__aarch64__) || (defined(__arm__) && __ARM_ARCH > 6)
++#if 0 || (defined(__arm__) && __ARM_ARCH > 6)
+ 	&sha256_armv7_impl,
+ 	&sha256_neon_impl,
+ 	&sha256_armv8_impl,
+diff --git a/module/icp/algs/sha2/sha512_impl.c b/module/icp/algs/sha2/sha512_impl.c
+index 27b35a6..23f5ea5 100644
+--- a/module/icp/algs/sha2/sha512_impl.c
++++ b/module/icp/algs/sha2/sha512_impl.c
+@@ -88,7 +88,7 @@ const sha512_ops_t sha512_avx2_impl = {
+ };
+ #endif
+ 
+-#elif defined(__aarch64__)
++#elif defined(__aarch64__) && 0
+ extern void zfs_sha512_block_armv7(uint64_t s[8], const void *, size_t);
+ const sha512_ops_t sha512_armv7_impl = {
+ 	.is_supported = sha2_is_supported,
+@@ -164,7 +164,7 @@ static const sha512_ops_t *const sha512_impls[] = {
+ #if defined(__x86_64) && defined(HAVE_AVX2)
+ 	&sha512_avx2_impl,
+ #endif
+-#if defined(__aarch64__)
++#if 0
+ 	&sha512_armv7_impl,
+ 	&sha512_armv8_impl,
+ #endif
+diff --git a/module/zcommon/zfs_fletcher.c b/module/zcommon/zfs_fletcher.c
+index 619ddef..39dbd65 100644
+--- a/module/zcommon/zfs_fletcher.c
++++ b/module/zcommon/zfs_fletcher.c
+@@ -188,9 +188,6 @@ static const fletcher_4_ops_t *fletcher_4_impls[] = {
+ #if defined(__x86_64) && defined(HAVE_AVX512BW)
+ 	&fletcher_4_avx512bw_ops,
+ #endif
+-#if defined(__aarch64__) && !defined(__FreeBSD__)
+-	&fletcher_4_aarch64_neon_ops,
+-#endif
+ };
+ 
+ /* Hold all supported implementations */
+diff --git a/module/zfs/vdev_raidz_math.c b/module/zfs/vdev_raidz_math.c
+index e12b961..62c0063 100644
+--- a/module/zfs/vdev_raidz_math.c
++++ b/module/zfs/vdev_raidz_math.c
+@@ -61,10 +61,6 @@ static const raidz_impl_ops_t *const raidz_all_maths[] = {
+ #if defined(__x86_64) && defined(HAVE_AVX512BW)	/* only x86_64 for now */
+ 	&vdev_raidz_avx512bw_impl,
+ #endif
+-#if defined(__aarch64__) && !defined(__FreeBSD__)
+-	&vdev_raidz_aarch64_neon_impl,
+-	&vdev_raidz_aarch64_neonx2_impl,
+-#endif
+ #if defined(__powerpc__) && defined(__altivec__)
+ 	&vdev_raidz_powerpc_altivec_impl,
+ #endif
diff --git a/main/zfs/APKBUILD b/main/zfs/APKBUILD
index b9ff634424c..a77b75f35a7 100644
--- a/main/zfs/APKBUILD
+++ b/main/zfs/APKBUILD
@@ -1,30 +1,54 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=zfs
-pkgver=0.8.3
+pkgver=2.2.3
 pkgrel=1
-pkgdesc="ZFS for Linux"
-url="http://zfsonlinux.org"
-arch="all !armhf !armv7"
+pkgdesc="Advanced filesystem and volume manager"
+url="https://openzfs.org"
+arch="all"
 license="CDDL-1.0"
-provides="spl" # Mitigate upgrade conflicts
-depends_dev="attr-dev e2fsprogs-dev glib-dev libtirpc-dev openssl-dev util-linux-dev"
-makedepends="$depends_dev automake autoconf libtool linux-headers python3-dev py3-cffi py3-setuptools"
+provides="spl=$pkgver-r$pkgrel" # Mitigate upgrade conflicts
+depends_dev="
+	attr-dev
+	e2fsprogs-dev
+	glib-dev
+	libtirpc-dev
+	openssl-dev>3
+	"
+makedepends="
+	$depends_dev
+	linux-headers
+	py3-cffi
+	py3-distlib
+	py3-setuptools
+	python3-dev
+	util-linux-dev
+	"
 options="!check" # need to be run on live system w/ ZFS loaded.
-subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc $pkgname-libs $pkgname-dracut::noarch
-	$pkgname-udev $pkgname-scripts $pkgname-utils-py:utils_py:noarch py3-pyzfs:pyzfs:noarch"
-source="https://github.com/zfsonlinux/zfs/releases/download/zfs-$pkgver/zfs-$pkgver.tar.gz"
+subpackages="
+	$pkgname-bash-completion
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-dracut::noarch
+	$pkgname-libs
+	$pkgname-openrc
+	$pkgname-scripts
+	$pkgname-udev
+	$pkgname-utils-py:utils_py:noarch
+	py3-pyzfs-pyc
+	py3-pyzfs:pyzfs:noarch
+	"
+source="https://github.com/openzfs/zfs/releases/download/zfs-$pkgver/zfs-$pkgver.tar.gz
+	alpine-bash-completion-dir.patch
+	"
 
-prepare() {
-	default_prepare
-	autoreconf -vif
-
-	# Upstream forgot to remove tainted files from the tarball...
-	rm etc/init.d/zfs etc/init.d/zfs-functions
-}
+# secfixes:
+#   2.2.1-r1:
+#     - CVE-2023-49298
 
 build() {
-	cd "$builddir"
+	export CFLAGS="$CFLAGS -fno-tree-vectorize"
+	export CXXFLAGS="$CXXFLAGS -fno-tree-vectorize"
 	export LIBS="$LIBS -lintl"
 	./configure --prefix=/usr \
 		--with-tirpc \
@@ -42,45 +66,49 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	rm -rf "$pkgdir"/usr/share/initramfs-tools
-	mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/
+
+	# Fix permissions of zfs OpenRC service configuration (#13840)
+	chmod 644 "$pkgdir"/etc/conf.d/zfs
 }
 
 dracut() {
 	pkgdesc="$pkgdesc (dracut)"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/dracut "$subpkgdir"/usr/lib
+	install_if="$pkgname=$pkgver-r$pkgrel dracut-modules"
+
+	amove usr/lib/dracut
 }
 
 udev() {
 	pkgdesc="$pkgdesc (udev)"
-	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/udev "$subpkgdir"/lib
+
+	amove lib/udev
 }
 
 scripts() {
 	pkgdesc="$pkgdesc (scripts)"
-	mkdir -p "$subpkgdir"/usr/share
-	mv "$pkgdir"/usr/share/zfs "$subpkgdir"/usr/share
+
+	amove usr/share/zfs
 }
 
 utils_py() {
 	pkgdesc="$pkgdesc (python utils)"
 	depends="python3"
-	mkdir -p "$subpkgdir"/usr/bin
-	local file
-	for file in arc_summary arcstat dbufstat; do
-		mv "$pkgdir"/usr/bin/$file "$subpkgdir"/usr/bin
-	done
+
+	amove usr/bin/arc_summary
+	amove usr/bin/arcstat
+	amove usr/bin/dbufstat
 }
 
 pyzfs() {
 	pkgdesc="$pkgdesc (Python lib to interact with ZFS)"
 	depends="python3 $pkgname"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib
+
+	amove usr/lib/python3*
 }
 
-sha512sums="aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010  zfs-0.8.3.tar.gz"
+sha512sums="
+e6c3df531a33f4bd198429e61b7630f1e965a03fd60d1b847bdf0d55c6d2af3abc38b5e8a63aa9ef9f969cc7eca36cb24a7641f6fb8c41ef2fa024d76cd28f3d  zfs-2.2.3.tar.gz
+93f7aa5ccaa2d75093930914b291c0b030db5cca813e8cce179e24fc4a76cdeb236e63a9e51b4074dbeb896af1783766e02e4d4aa6134c2a1f1a1fd8fd15ba97  alpine-bash-completion-dir.patch
+"
diff --git a/main/zfs/alpine-bash-completion-dir.patch b/main/zfs/alpine-bash-completion-dir.patch
new file mode 100644
index 00000000000..f740f8f951c
--- /dev/null
+++ b/main/zfs/alpine-bash-completion-dir.patch
@@ -0,0 +1,10 @@
+--- a/configure
++++ b/configure
+@@ -136424,6 +136424,7 @@ printf "%s\n" "no" >&6; }
+ 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking default bash completion directory" >&5
+ printf %s "checking default bash completion directory... " >&6; }
+ 	case "$VENDOR" in
++		alpine)     bashcompletiondir=/usr/share/bash-completion/completions   ;;
+ 		ubuntu)     bashcompletiondir=/usr/share/bash-completion/completions   ;;
+ 		debian)     bashcompletiondir=/usr/share/bash-completion/completions   ;;
+ 		freebsd)    bashcompletiondir=$sysconfdir/bash_completion.d;;
diff --git a/main/zip/APKBUILD b/main/zip/APKBUILD
index 6d4b9fd2c84..ff3c0d1d993 100644
--- a/main/zip/APKBUILD
+++ b/main/zip/APKBUILD
@@ -1,37 +1,39 @@
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=zip
 pkgver=3.0
 _pkgver=${pkgver%.*}${pkgver##*.}
-pkgrel=8
+pkgrel=12
 pkgdesc="Creates PKZIP-compatible .zip files"
 url="http://www.info-zip.org/pub/infozip/Zip.html"
 arch="all"
 options="!check"  # No test suite.
 license="Info-ZIP"
 depends="unzip" #unzip is needed for `zip -T`
-makedepends=""
 subpackages="$pkgname-doc"
-source="https://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz
+source="https://downloads.sourceforge.net/infozip/zip$_pkgver.tar.gz
 	10-zip-3.0-build.patch
 	20-zip-3.0-exec-stack.patch
 	30-zip-3.0-pic.patch
-	40-fix-zipnote.patch"
+	40-fix-zipnote.patch
+	format-security.patch
+	"
 
-builddir="$srcdir"/${pkgname}${_pkgver}
+builddir="$srcdir"/${pkgname}$_pkgver
 
 build() {
-	cd "$builddir"
-	make -f unix/Makefile LOCAL_ZIP="${CFLAGS} ${CPPFLAGS}" prefix=/usr generic
+	make -f unix/Makefile LOCAL_ZIP="$CFLAGS $CPPFLAGS" prefix=/usr generic
 }
 
 package() {
-	cd "$builddir"
-	make -f unix/Makefile prefix=${pkgdir}/usr MANDIR=${pkgdir}/usr/share/man/man1 install
+	make -f unix/Makefile prefix=$pkgdir/usr MANDIR=$pkgdir/usr/share/man/man1 install
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-sha512sums="c1c3d62bf1426476c0f9919b568013d6d7b03514912035f09ee283226d94c978791ad2af5310021e96c4c2bf320bfc9d0b8f4045c48e4667e034d98197e1a9b3  zip30.tar.gz
+sha512sums="
+c1c3d62bf1426476c0f9919b568013d6d7b03514912035f09ee283226d94c978791ad2af5310021e96c4c2bf320bfc9d0b8f4045c48e4667e034d98197e1a9b3  zip30.tar.gz
 e71f7c6f6dd6f8f576018581b155f324eaf6810a2f7c5c402843bdfc3ce6772f09be166b33ff34dcb703774694b18584c8de1763f29895c1d563661679f43d71  10-zip-3.0-build.patch
 2a6824066543684e02731bd36930e0ffa6ab48162c61d5e7af08e8ea0795401271ef28bdd0f6ace865d91fdb1a05b643813cdd458a9fdf554f1ca298ea7f50e3  20-zip-3.0-exec-stack.patch
 fcb2d728d79160128064af90eb17a9c03e980d9619c4d930c4dbf79cb13842c7bb694036dcbf5cd9b412efc6fc0b86bb94a88b3f110b6b63bf6bda2b97fe0568  30-zip-3.0-pic.patch
-f22649d1cbe94ffcacf622493400489393d6fac80067211e6ba12b85d7b062f76b041f318068731b267167e715b7749589bfe9205670a61c6e56e1ffdfaea29b  40-fix-zipnote.patch"
+f22649d1cbe94ffcacf622493400489393d6fac80067211e6ba12b85d7b062f76b041f318068731b267167e715b7749589bfe9205670a61c6e56e1ffdfaea29b  40-fix-zipnote.patch
+1d2147e97e9e19ac403ec6fb3466059dba96edeee2ac2a809b75c652d50d01d9ce717c1d9812359c8d13330369e60f6421afdb9e54e3e19d6bcf0ddf2405b15e  format-security.patch
+"
diff --git a/main/zip/format-security.patch b/main/zip/format-security.patch
new file mode 100644
index 00000000000..94816432a06
--- /dev/null
+++ b/main/zip/format-security.patch
@@ -0,0 +1,24 @@
+diff --git a/zip.c b/zip.c
+index 439821f..862da02 100644
+--- a/zip.c
++++ b/zip.c
+@@ -1028,8 +1028,7 @@ local void help_extended()
+ 
+   for (i = 0; i < sizeof(text)/sizeof(char *); i++)
+   {
+-    printf(text[i]);
+-    putchar('\n');
++    puts(text[i]);
+   }
+ #ifdef DOS
+   check_for_windows("Zip");
+@@ -1225,8 +1224,7 @@ local void version_info()
+             CR_MAJORVER, CR_MINORVER, CR_BETA_VER, CR_VERSION_DATE);
+   for (i = 0; i < sizeof(cryptnote)/sizeof(char *); i++)
+   {
+-    printf(cryptnote[i]);
+-    putchar('\n');
++    puts(cryptnote[i]);
+   }
+   ++i;  /* crypt support means there IS at least one compilation option */
+ #endif /* CRYPT */
diff --git a/main/zlib/APKBUILD b/main/zlib/APKBUILD
index e9f33ee6475..4190d2deb37 100644
--- a/main/zlib/APKBUILD
+++ b/main/zlib/APKBUILD
@@ -1,13 +1,23 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=zlib
-pkgver=1.2.11
-pkgrel=3
+pkgver=1.3.1
+pkgrel=1
 pkgdesc="A compression/decompression Library"
 arch="all"
 license="Zlib"
 url="https://zlib.net/"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="https://zlib.net/zlib-$pkgver.tar.gz"
+source="https://zlib.net/fossils/zlib-$pkgver.tar.gz
+	"
+
+# secfixes:
+#   1.2.12-r2:
+#     - CVE-2022-37434
+#   1.2.11-r4:
+#     - CVE-2018-25032
+#   0:
+#     - CVE-2023-45853
+#     - CVE-2023-6992
 
 build() {
 	# we trade size for a little more speed.
@@ -29,4 +39,6 @@ package() {
 		DESTDIR="$pkgdir"
 }
 
-sha512sums="73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae  zlib-1.2.11.tar.gz"
+sha512sums="
+580677aad97093829090d4b605ac81c50327e74a6c2de0b85dd2e8525553f3ddde17556ea46f8f007f89e435493c9a20bc997d1ef1c1c2c23274528e3c46b94f  zlib-1.3.1.tar.gz
+"
diff --git a/main/zmap/APKBUILD b/main/zmap/APKBUILD
index c34ced5175f..d9945859cec 100644
--- a/main/zmap/APKBUILD
+++ b/main/zmap/APKBUILD
@@ -1,50 +1,49 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=zmap
-pkgver=2.1.1
-pkgrel=5
-pkgdesc="A high performance internet scanner"
+pkgver=3.0.0
+pkgrel=0
+pkgdesc="High performance internet scanner"
 url="https://www.zmap.io/"
 arch="all"
 license="Apache-2.0"
-makedepends="linux-headers cmake flex byacc hiredis-dev json-c-dev gengetopt
-	libpcap-dev gmp-dev"
-checkdepends="bash"
+makedepends="
+	byacc
+	cmake
+	flex
+	gengetopt
+	gmp-dev
+	json-c-dev
+	libpcap-dev
+	libunistring-dev
+	linux-headers
+	samurai
+	"
 subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
-	byacc.patch"
-builddir="$srcdir"/$pkgname-$pkgver
+source="$pkgname-$pkgver.tar.gz::https://github.com/zmap/zmap/archive/refs/tags/v$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
-	cmake \
+	CFLAGS="$CFLAGS -flto=auto" \
+	cmake -B . -G Ninja \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_SHARED_LIBS=True \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_CXX_COMPILER="${CXX:-g++}" \
-		-DCMAKE_C_COMPILER="${CC:-gcc}" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_CXX_FLAGS="$CFLAGS" \
-		-DWITH_JSON=ON \
-		-DWITH_REDIS=ON
-	make
+		-DCMAKE_BUILD_TYPE=MinSizeRel
+	cmake --build .
 }
 
 check() {
-	cd "$builddir"/test
+	cd test
 	./test_big_group.sh
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install .
 
-	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
-	install -m644 AUTHORS CHANGELOG.md INSTALL.md README.md \
-		"$pkgdir"/usr/share/doc/$pkgname/
+	install -Dm644 AUTHORS CHANGELOG.md INSTALL.md README.md \
+		-t "$pkgdir"/usr/share/doc/$pkgname/
 	cp -a examples "$pkgdir"/usr/share/doc/$pkgname/
 }
 
-sha512sums="9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857  zmap-2.1.1.tar.gz
-08cc497d99e388af2c0dd0d8a2337fa901451dd0b256bd4cfcc91a12ff1da503773214d0768077aae56e70cc5c49724be88064dd25eeaa3947f2a993af4215b8  byacc.patch"
+sha512sums="
+3ea4d0e4052c2e4ab303f1ac8c35339bd3e282993b7bbd6b75d2a039df934e57f4d93883b5034c5d25e3f8b2e81f3a036cf1bf1fb2ad6620afa6f7fd3366b0f1  zmap-3.0.0.tar.gz
+"
diff --git a/main/zmap/byacc.patch b/main/zmap/byacc.patch
deleted file mode 100644
index 7fa594cba98..00000000000
--- a/main/zmap/byacc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr zmap-2.1.1.orig/src/CMakeLists.txt zmap-2.1.1/src/CMakeLists.txt
---- zmap-2.1.1.orig/src/CMakeLists.txt	2015-10-10 06:59:56.963317056 +0200
-+++ zmap-2.1.1/src/CMakeLists.txt	2015-10-10 07:01:05.206393054 +0200
-@@ -122,7 +122,7 @@ add_custom_command(OUTPUT lexer.c
- )
- 
- add_custom_command(OUTPUT parser.c
--    COMMAND byacc -d -o "${CMAKE_CURRENT_BINARY_DIR}/parser.c" "${CMAKE_CURRENT_SOURCE_DIR}/parser.y"
-+    COMMAND yacc -d -o "${CMAKE_CURRENT_BINARY_DIR}/parser.c" "${CMAKE_CURRENT_SOURCE_DIR}/parser.y"
-     DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/parser.y"
- )
- 
diff --git a/main/zonenotify/APKBUILD b/main/zonenotify/APKBUILD
index 1947c119411..ff37adf0aeb 100644
--- a/main/zonenotify/APKBUILD
+++ b/main/zonenotify/APKBUILD
@@ -1,22 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=zonenotify
 pkgver=0.1
-pkgrel=3
+pkgrel=6
 pkgdesc="Utility to send NS_NOTIFY packets to slave DNS servers"
 arch="all"
 url="https://github.com/morettoni/zonenotify"
-license="BSD"
-depends=""
-source="http://www.morettoni.net/bsd/$pkgname-$pkgver.tar.gz"
+license="BSD-2-Clause"
+source="http://www.morettoni.net/bsd/zonenotify-$pkgver.tar.gz"
+builddir="$srcdir"/$pkgname
+options="!check"
 
-_builddir="$srcdir"/$pkgname
 build() {
-	cd "$_builddir"
-	make || return 1
+	make
 }
 
 package() {
-	cd "$_builddir"
 	install -D zonenotify "$pkgdir"/usr/bin/zonenotify
 }
 
diff --git a/main/zsh/APKBUILD b/main/zsh/APKBUILD
index 258db227943..a51ab1fbe7f 100644
--- a/main/zsh/APKBUILD
+++ b/main/zsh/APKBUILD
@@ -3,6 +3,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 #
 # secfixes:
+#   5.8.1-r0:
+#     - CVE-2021-45444
 #   5.8-r0:
 #     - CVE-2019-20044
 #   5.4.2-r1:
@@ -10,18 +12,40 @@
 #     - CVE-2018-1071
 #
 pkgname=zsh
-pkgver=5.8
-pkgrel=0
+pkgver=5.9
+pkgrel=3
 pkgdesc="Very advanced and programmable command interpreter (shell)"
 url="https://www.zsh.org/"
 arch="all"
-license="custom"
-makedepends="ncurses-dev diffutils"
-install="zsh.post-install zsh.post-upgrade zsh.pre-deinstall"
-source="https://download.sourceforge.net/project/zsh/zsh/$pkgver/zsh-$pkgver.tar.xz
-	zprofile"
-subpackages="$pkgname-doc $pkgname-calendar::noarch $pkgname-vcs::noarch $pkgname-zftp"
-builddir="$srcdir/$pkgname-$pkgver"
+# GPL-2.0-only: license of Completion/Linux/Command/_qdbus
+license="MIT-Modern-Variant AND GPL-2.0-only"
+makedepends="
+	autoconf
+	diffutils
+	libcap-dev
+	pcre-dev
+	ncurses-dev
+	"
+install="
+	$pkgname.post-install
+	$pkgname.post-upgrade
+	$pkgname.pre-deinstall
+	"
+subpackages="
+	$pkgname-doc
+	$pkgname-calendar::noarch
+	$pkgname-pcre
+	$pkgname-vcs::noarch
+	$pkgname-zftp
+	"
+source="https://sourceforge.net/projects/zsh/files/zsh/$pkgver/zsh-$pkgver.tar.xz
+	skip-test-failing-on-musl.patch
+	zsh-newuser-install-alpine.patch
+	implicit.patch
+	zprofile
+	zshenv
+	zshrc
+	"
 
 _libdir="usr/lib/zsh/$pkgver"
 _sharedir="usr/share/zsh/$pkgver"
@@ -41,7 +65,8 @@ _comps="android-tools::Unix/_adb
 	rsync::Unix/_rsync
 	subversion::Unix/_subversion
 	tmux::Unix/_tmux
-	zfs::Unix/_zfs*:Unix/_zpool"
+	zfs::Unix/_zfs*
+	"
 for _i in $_comps; do
 	subpackages="$subpackages ${_i%%:*}-zsh-completion:_completion:noarch"
 done
@@ -81,14 +106,14 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--bindir=/bin \
 		--enable-etcdir=/etc/zsh \
+		--enable-pcre \
+		--enable-cap \
 		--enable-multibyte \
 		--enable-function-subdirs \
 		--enable-zsh-secure-free \
@@ -100,44 +125,64 @@ build() {
 }
 
 check() {
-	cd "$builddir"
+	# See: https://www.zsh.org/mla/workers/2021/msg00805.html
+	unset LC_ALL
+	unset LC_COLLATE
+	unset LC_NUMERIC
+	unset LC_MESSAGES
+	unset LANG
 
 	make test
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
-	install -Dm644 "$srcdir"/zprofile "$pkgdir"/etc/zsh/zprofile
+
 	install -Dm644 LICENCE "$pkgdir"/usr/share/licenses/$pkgname/LICENCE
+
+	install -d "$pkgdir"/usr/share/zsh/plugins
+	install -d "$pkgdir"/etc/zsh/zshrc.d
+
+	cd "$srcdir"
+	install -Dm644 -t "$pkgdir"/etc/zsh/ \
+		zprofile \
+		zshenv \
+		zshrc
 }
 
 doc() {
 	default_doc
-	_submv $_sharedir/help
+	amove $_sharedir/help
 }
 
 calendar() {
 	pkgdesc="Calendar Function System for ZSH"
-	depends="$pkgname"
+	depends="$pkgname=$pkgver-r$pkgrel"
 
-	_submv $_sharedir/functions/Calendar
+	amove $_sharedir/functions/Calendar
+}
+
+pcre() {
+	pkgdesc="PCRE module for ZSH"
+	depends="$pkgname=$pkgver-r$pkgrel"
+	install_if="$pkgname=$pkgver-r$pkgrel pcre"
+
+	amove $_libdir/zsh/pcre.so
 }
 
 vcs() {
 	pkgdesc="Version Control Information module for ZSH (vcs_info)"
-	depends="$pkgname"
+	depends="$pkgname=$pkgver-r$pkgrel"
 
-	_submv $_sharedir/functions/VCS_Info
+	amove $_sharedir/functions/VCS_Info
 }
 
 zftp() {
 	pkgdesc="Zftp Function System for ZSH"
-	depends="$pkgname"
+	depends="$pkgname=$pkgver-r$pkgrel"
 
-	_submv $_libdir/zsh/zftp.so
-	_submv $_sharedir/functions/Zftp
+	amove $_libdir/zsh/zftp.so
+	amove $_sharedir/functions/Zftp
 }
 
 _completion() {
@@ -155,15 +200,16 @@ _completion() {
 	test -n "$files" || { echo "$name not found in \$_comps" >&2; return 1; }
 
 	local f; for f in $files; do
-		_submv $_sharedir/functions/Completion/$f
+		amove $_sharedir/functions/Completion/$f
 	done
 }
 
-_submv() {
-	local path="$1"
-	mkdir -p "$subpkgdir"/${path%/*}
-	mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/
-}
-
-sha512sums="96198ecef498b7d7945fecebbe6bf14065fa8c5d81a7662164579eba8206b79575812d292adea1864bc7487ac0818ba900e25f9ab3802449340de80417c2c533  zsh-5.8.tar.xz
-59182b99447872ded8adf0d890e9359ee47fce0b7acb2808f4308f945885fbf6d977a0917bbb5c0f21454caf3ba06ab092127732da4f84292d6ab0989a0110fe  zprofile"
+sha512sums="
+d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e  zsh-5.9.tar.xz
+4fb6bf20f27ff4b36c5519dc0f7ac43b0cbf299ab0525c0f49920ed848166367207a58160eaa8d573e7ed0373540bde7a5363386e41a36945deba016a255a61d  skip-test-failing-on-musl.patch
+3be36a30af2c33c5d4d0412acd30fbb52fbaad49c692f12ab1a9c57d87cee62ad0b4737127585e2dc5824b98428ff097977f610a4d1fa3d83c9370b7cf2956f7  zsh-newuser-install-alpine.patch
+0fd193a92c24dfd3b97f6294469cad8c799c91c27bb1f298bb64dcd10982543e80ab9e63517915ff648096e85105044c9d2d4368977266f7e3f6b34e69277768  implicit.patch
+66a6bdf8d915c818a2c31c35c90c2a19f91d15e2d8547d050e980ef63080f27033ef1f59da5befb30dbf46050ce907690a680e48db11711d40930420f7ec1c2b  zprofile
+e1c40649c940b91fb6dbcf9e7878e3c96d3729c8eee7b97cfe007d14d19add500863cef588ea4818ab83921fef9f9b4384c2003b26e9d753a8d59e9aca837d43  zshenv
+a7f4f5267cf0a9d1e0c480e89ede0811435803e4822b522dfc0326a9015a44af5e3163160b5595dc055acfca28f56811521c728e020389c7a5e4e0e4b3811d38  zshrc
+"
diff --git a/main/zsh/implicit.patch b/main/zsh/implicit.patch
new file mode 100644
index 00000000000..a840401becc
--- /dev/null
+++ b/main/zsh/implicit.patch
@@ -0,0 +1,550 @@
+https://bugs.gentoo.org/869539
+https://www.zsh.org/mla/workers/2022/msg00964.html
+--- a/configure.ac
++++ b/configure.ac
+@@ -583,11 +583,11 @@ if test x$zsh_cv_c_have_union_init = xye
+ fi
+ 
+ dnl  Checking if compiler correctly cast signed to unsigned.
+ AC_CACHE_CHECK(if signed to unsigned casting is broken,
+ zsh_cv_c_broken_signed_to_unsigned_casting,
+-[AC_RUN_IFELSE([AC_LANG_SOURCE([[main(){return((int)(unsigned char)((char) -1) == 255);}]])],[zsh_cv_c_broken_signed_to_unsigned_casting=yes],[zsh_cv_c_broken_signed_to_unsigned_casting=no],[zsh_cv_c_broken_signed_to_unsigned_casting=no])])
++[AC_RUN_IFELSE([AC_LANG_SOURCE([[int main(){return((int)(unsigned char)((char) -1) == 255);}]])],[zsh_cv_c_broken_signed_to_unsigned_casting=yes],[zsh_cv_c_broken_signed_to_unsigned_casting=no],[zsh_cv_c_broken_signed_to_unsigned_casting=no])])
+ AH_TEMPLATE([BROKEN_SIGNED_TO_UNSIGNED_CASTING],
+ [Define to 1 if compiler incorrectly cast signed to unsigned.])
+ if test x$zsh_cv_c_broken_signed_to_unsigned_casting = xyes; then
+   AC_DEFINE(BROKEN_SIGNED_TO_UNSIGNED_CASTING)
+ fi
+@@ -1044,21 +1044,21 @@ if test x$zsh_cv_long_is_64_bit = xyes;
+ else
+   AC_CACHE_CHECK(if off_t is 64 bit, zsh_cv_off_t_is_64_bit,
+   [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <sys/types.h>
+ 
+-main() { return sizeof(off_t) < 8; }
++int main() { return sizeof(off_t) < 8; }
+ ]])],[zsh_cv_off_t_is_64_bit=yes],[zsh_cv_off_t_is_64_bit=no],[zsh_cv_off_t_is_64_bit=no])])
+   if test x$zsh_cv_off_t_is_64_bit = xyes; then
+     AC_DEFINE(OFF_T_IS_64_BIT)
+   fi
+ 
+   AC_CACHE_CHECK(if ino_t is 64 bit, zsh_cv_ino_t_is_64_bit,
+   [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <sys/types.h>
+ 
+-main() { return sizeof(ino_t) < 8; }
++int main() { return sizeof(ino_t) < 8; }
+ ]])],[zsh_cv_ino_t_is_64_bit=yes],[zsh_cv_ino_t_is_64_bit=no],[zsh_cv_ino_t_is_64_bit=no])])
+   if test x$zsh_cv_ino_t_is_64_bit = xyes; then
+     AC_DEFINE(INO_T_IS_64_BIT)
+   fi
+ 
+@@ -1394,22 +1394,22 @@ zsh_cv_func_tgetent_accepts_null,
+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <fcntl.h>
+ #include <stdlib.h>
+ int tgetent(char *, char *);
+ char *tgetstr(char *, char **);
+-main()
++int main()
+ {
+     char buf[4096];
+     int r1 = tgetent(buf, "vt100");
+     int r2 = tgetent((char*)0,"vt100");
+     if (r1 >= 0 && r1 == r2) {
+         char tbuf[1024], *u;
+         u = tbuf;
+     	tgetstr("cl", &u);
+ 	creat("conftest.tgetent", 0640);
+     }
+-    exit((r1 != r2) || r2 == -1);
++    return((r1 != r2) || r2 == -1);
+ }
+ ]])],[if test -f conftest.tgetent; then
+     zsh_cv_func_tgetent_accepts_null=yes
+   else
+     zsh_cv_func_tgetent_accepts_null=no
+@@ -1422,22 +1422,22 @@ zsh_cv_func_tgetent_zero_success,
+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <fcntl.h>
+ #include <stdlib.h>
+ int tgetent(char *, char*);
+ char *tgetstr(char *, char **);
+-main()
++int main()
+ {
+     char buf[4096];
+     int r1 = tgetent(buf, "!@#$%^&*");
+     int r2 = tgetent(buf, "vt100");
+     if (r1 < 0 && r2 == 0) {
+         char tbuf[1024], *u;
+         u = tbuf;
+     	tgetstr("cl", &u);
+ 	creat("conftest.tgetent0", 0640);
+     }
+-    exit(r1 == r2);
++    return(r1 == r2);
+ }
+ ]])],[if test -f conftest.tgetent0; then
+     zsh_cv_func_tgetent_zero_success=yes
+   else
+     zsh_cv_func_tgetent_zero_success=no
+@@ -1860,27 +1860,27 @@ zsh_cv_rlim_t_is_longer,
+ #ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
+ #endif
+ #include <sys/resource.h>
+ #include <stdlib.h>
+-main(){struct rlimit r;exit(sizeof(r.rlim_cur) <= sizeof(long));}]])],[zsh_cv_rlim_t_is_longer=yes],[zsh_cv_rlim_t_is_longer=no],[zsh_cv_rlim_t_is_longer=yes])])
++int main(){struct rlimit r;return(sizeof(r.rlim_cur) <= sizeof(long));}]])],[zsh_cv_rlim_t_is_longer=yes],[zsh_cv_rlim_t_is_longer=no],[zsh_cv_rlim_t_is_longer=yes])])
+ if test x$zsh_cv_rlim_t_is_longer = xyes; then
+   AC_CACHE_CHECK(if rlim_t is a quad,
+   zsh_cv_rlim_t_is_quad_t,
+   [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
+ #endif
+ #include <stdio.h>
+ #include <sys/resource.h>
+ #include <stdlib.h>
+-main() { 
++int main() { 
+   struct rlimit r;
+   char buf[20];
+   r.rlim_cur = 0;
+   sprintf(buf, "%qd", r.rlim_cur);
+-  exit(strcmp(buf, "0"));
++  return(strcmp(buf, "0"));
+ }]])],[zsh_cv_rlim_t_is_quad_t=yes],[zsh_cv_rlim_t_is_quad_t=no],[zsh_cv_rlim_t_is_quad_t=no])])
+   if test x$zsh_cv_rlim_t_is_quad_t = xyes; then
+     AC_DEFINE(RLIM_T_IS_QUAD_T)
+     DEFAULT_RLIM_T=quad_t
+   else
+@@ -1894,11 +1894,11 @@ else
+ #ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
+ #endif
+ #include <sys/resource.h>
+ #include <stdlib.h>
+-  main(){struct rlimit r;r.rlim_cur=-1;exit(r.rlim_cur<0);}]])],[zsh_cv_type_rlim_t_is_unsigned=yes],[zsh_cv_type_rlim_t_is_unsigned=no],[zsh_cv_type_rlim_t_is_unsigned=no])])
++  int main(){struct rlimit r;r.rlim_cur=-1;return(r.rlim_cur<0);}]])],[zsh_cv_type_rlim_t_is_unsigned=yes],[zsh_cv_type_rlim_t_is_unsigned=no],[zsh_cv_type_rlim_t_is_unsigned=no])])
+   if test x$zsh_cv_type_rlim_t_is_unsigned = xyes; then
+     AC_DEFINE(RLIM_T_IS_UNSIGNED)
+     DEFAULT_RLIM_T="unsigned $DEFAULT_RLIM_T"
+   fi
+ fi
+@@ -2175,11 +2175,11 @@ zsh_cv_sys_fifo,
+ #include <fcntl.h>
+ #include <signal.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <sys/stat.h>
+-main()
++int main()
+ {
+     char c;
+     int fd;
+     int pid, ret;
+     unlink("/tmp/fifo$$");
+@@ -2189,19 +2189,19 @@ main()
+     if(mknod("/tmp/fifo$$", 0010600, 0) < 0)
+ #endif
+ 	exit(1);
+     pid = fork();
+     if(pid < 0)
+-	exit(1);
++	return(1);
+     if(pid) {
+ 	fd = open("/tmp/fifo$$", O_RDONLY);
+-	exit(fd < 0 || read(fd, &c, 1) != 1 || c != 'x');
++	return(fd < 0 || read(fd, &c, 1) != 1 || c != 'x');
+     }
+     fd = open("/tmp/fifo$$", O_WRONLY);
+     ret = (fd < 0 || write(fd, "x", 1) < 1);
+     unlink("/tmp/fifo$$");
+-    exit(ret);
++    return(ret);
+ }
+ ]])],[zsh_cv_sys_fifo=yes],[zsh_cv_sys_fifo=no],[zsh_cv_sys_fifo=yes])
+ ])
+ AH_TEMPLATE([HAVE_FIFOS],
+ [Define to 1 if system has working FIFOs.])
+@@ -2276,24 +2276,24 @@ AC_CACHE_CHECK(if link() works,
+ zsh_cv_sys_link,
+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
+-main()
++int main()
+ {
+     int ret;
+     char *tmpfile, *newfile;
+     tmpfile="/tmp/zsh.linktest$$";
+     newfile="/tmp/zsh.linktest2$$";
+     unlink(tmpfile);
+     unlink(newfile);
+     if(creat(tmpfile, 0644) < 0)
+-	exit(1);
++	return(1);
+     ret = link(tmpfile, newfile);
+     unlink(tmpfile);
+     unlink(newfile);
+-    exit(ret<0);
++    return(ret<0);
+ }
+ ]])],[zsh_cv_sys_link=yes],[zsh_cv_sys_link=no],[zsh_cv_sys_link=yes])])
+ AH_TEMPLATE([HAVE_LINK],
+ [Define to 1 if system has working link().])
+ if test x$zsh_cv_sys_link = xyes; then
+@@ -2309,15 +2309,15 @@ zsh_cv_sys_killesrch,
+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <unistd.h>
+ #include <signal.h>
+ #include <errno.h>
+ #include <stdlib.h>
+-main()
++int main()
+ {
+     int pid = (getpid() + 10000) & 0xffffff;
+     while (pid && (kill(pid, 0) == 0 || errno != ESRCH)) pid >>= 1;
+-    exit(errno!=ESRCH);
++    return(errno!=ESRCH);
+ }
+ ]])],[zsh_cv_sys_killesrch=yes],[zsh_cv_sys_killesrch=no],[zsh_cv_sys_killesrch=yes])])
+ AH_TEMPLATE([BROKEN_KILL_ESRCH],
+ [Define to 1 if kill(pid, 0) doesn't return ESRCH, ie BeOS R4.51.])
+ if test x$zsh_cv_sys_killesrch = xno; then
+@@ -2339,11 +2339,11 @@ if test x$signals_style = xPOSIX_SIGNALS
+ #include <stdlib.h>
+ int child=0;
+ void handler(sig)
+     int sig;
+ {if(sig==SIGCHLD) child=1;}
+-main() {
++int main() {
+     struct sigaction act;
+     sigset_t set;
+     int pid, ret;
+     act.sa_handler = &handler;
+     sigfillset(&act.sa_mask);
+@@ -2354,11 +2354,11 @@ main() {
+     pid=fork();
+     if(pid==0) return 0;
+     if(pid>0) {
+     sigemptyset(&set);
+         ret=sigsuspend(&set);
+-        exit(child==0);
++        return(child==0);
+     }
+ }
+ ]])],[zsh_cv_sys_sigsuspend=yes],[zsh_cv_sys_sigsuspend=no],[zsh_cv_sys_sigsuspend=yes])])
+     if test x$zsh_cv_sys_sigsuspend = xno; then
+       AC_DEFINE(BROKEN_POSIX_SIGSUSPEND)
+@@ -2387,18 +2387,18 @@ case "x$zsh_working_tcsetpgrp" in
+     [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
+-main() {
++int main() {
+     int fd;
+     int ret;
+     fd=open("/dev/tty", O_RDWR);
+     if (fd < 0) exit(2);
+     ret=tcsetpgrp(fd, tcgetpgrp(fd));
+     if (ret < 0) exit(1);
+-    exit(0);
++    return(0);
+ }
+ ]])],[zsh_cv_sys_tcsetpgrp=yes],[
+ case $? in
+     1) zsh_cv_sys_tcsetpgrp=no;;
+     2) zsh_cv_sys_tcsetpgrp=notty;;
+@@ -2434,19 +2434,19 @@ if test x$ac_cv_func_getpwnam = xyes; th
+ #include <pwd.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+-main() {
++int main() {
+     struct passwd *pw1, *pw2;
+     char buf[1024], name[1024];
+     sprintf(buf, "%d:%d", getpid(), rand());
+     pw1=getpwnam(buf);
+     if (pw1) strcpy(name, pw1->pw_name);
+     sprintf(buf, "%d:%d", rand(), getpid());
+     pw2=getpwnam(buf);
+-    exit(pw1!=0 && pw2!=0 && !strcmp(name, pw2->pw_name));
++    return(pw1!=0 && pw2!=0 && !strcmp(name, pw2->pw_name));
+ }
+ ]])],[zsh_cv_sys_getpwnam_faked=no],[zsh_cv_sys_getpwnam_faked=yes],[zsh_cv_sys_getpwnam_faked=no])])
+     if test x$zsh_cv_sys_getpwnam_faked = xyes; then
+       AC_DEFINE(GETPWNAM_FAKED)
+     fi
+@@ -2763,22 +2763,20 @@ elif test "x$dynamic" = xyes; then
+    zsh_cv_sys_elf,
+    [AC_RUN_IFELSE([AC_LANG_SOURCE([[/* Test for whether ELF binaries are produced */
+ #include <fcntl.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+-main(argc, argv)
+-int argc;
+-char *argv[];
++int main(int argc, char *argv[])
+ {
+ 	char b[4];
+ 	int i = open(argv[0],O_RDONLY);
+ 	if(i == -1) 
+ 		exit(1); /* fail */
+ 	if(read(i,b,4)==4 && b[0]==127 && b[1]=='E' && b[2]=='L' && b[3]=='F')
+-		exit(0); /* succeed (yes, it's ELF) */
++		return(0); /* succeed (yes, it's ELF) */
+ 	else
+-		exit(1); /* fail */
++		return(1); /* fail */
+ }]])],[zsh_cv_sys_elf=yes],[zsh_cv_sys_elf=no],[zsh_cv_sys_elf=yes])])
+ 
+   # We use [0-9]* in case statements, so need to change quoting
+   changequote(, )
+ 
+@@ -2908,11 +2908,11 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
+ EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}"],[zsh_cvs_rdynamic_available=no])
+ LDFLAGS="$old_LDFLAGS")
+   AC_CACHE_CHECK(if your dlsym() needs a leading underscore,
+    zsh_cv_func_dlsym_needs_underscore,
+    [echo failed >conftestval && cat >conftest.c <<EOM
+-fred () { }
++void fred () { }
+ EOM
+     AC_TRY_COMMAND($CC -c $CFLAGS $CPPFLAGS $DLCFLAGS conftest.c 1>&AS_MESSAGE_LOG_FD) &&
+     AC_TRY_COMMAND($DLLD $LDFLAGS $DLLDFLAGS -o conftest.$DL_EXT conftest.o 1>&AS_MESSAGE_LOG_FD) &&
+     AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdio.h>
+@@ -2943,34 +2941,34 @@ char *zsh_gl_sym_addr ;
+ #define RTLD_LAZY 1
+ #endif
+ 
+ extern int fred() ;
+ 
+-main()
++int main()
+ {
+     void * handle ;
+     void * symbol ;
+     FILE *f=fopen("conftestval", "w");
+     if (!f) exit(1);
+     handle = dlopen("./conftest.$DL_EXT", RTLD_LAZY) ;
+     if (handle == NULL) {
+         fprintf (f, "dlopen failed") ;
+-            exit(1);
++            return(1);
+     }
+     symbol = dlsym(handle, "fred") ;
+     if (symbol == NULL) {
+                 /* try putting a leading underscore */
+         symbol = dlsym(handle, "_fred") ;
+         if (symbol == NULL) {
+             fprintf (f, "dlsym failed") ;
+-                exit(1);
++                return(1);
+                 }
+         fprintf (f, "yes") ;
+     }
+     else
+         fprintf (f, "no") ;
+-    exit(0);
++    return(0);
+ }]])],[zsh_cv_func_dlsym_needs_underscore=`cat conftestval`],[zsh_cv_func_dlsym_needs_underscore=failed
+     dynamic=no],[zsh_cv_func_dlsym_needs_underscore=no])])
+   if test "x$zsh_cv_func_dlsym_needs_underscore" = xyes; then
+     AC_DEFINE(DLSYM_NEEDS_UNDERSCORE)
+   elif test "x$zsh_cv_func_dlsym_needs_underscore" != xno; then
+--- a/aczsh.m4.old
++++ b/aczsh.m4
+@@ -42,10 +42,11 @@ AC_DEFUN(zsh_64_BIT_TYPE,
+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+ 
++int
+ main()
+ {
+   $1 foo = 0; 
+   int bar = (int) foo;
+   return sizeof($1) != 8;
+@@ -144,33 +145,34 @@ char *zsh_gl_sym_addr ;
+ #endif
+ #ifndef RTLD_GLOBAL
+ #define RTLD_GLOBAL 0
+ #endif
+ 
++int
+ main()
+ {
+     void *handle1, *handle2;
+     void *(*zsh_getaddr1)(), *(*zsh_getaddr2)();
+     void *sym1, *sym2;
+     handle1 = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
+-    if(!handle1) exit(1);
++    if(!handle1) return(1);
+     handle2 = dlopen("./conftest2.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
+-    if(!handle2) exit(1);
++    if(!handle2) return(1);
+     zsh_getaddr1 = (void *(*)()) dlsym(handle1, "${us}zsh_getaddr1");
+     zsh_getaddr2 = (void *(*)()) dlsym(handle2, "${us}zsh_getaddr2");
+     sym1 = zsh_getaddr1();
+     sym2 = zsh_getaddr2();
+-    if(!sym1 || !sym2) exit(1);
+-    if(sym1 != sym2) exit(1);
++    if(!sym1 || !sym2) return(1);
++    if(sym1 != sym2) return(1);
+     dlclose(handle1);
+     handle1 = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
+-    if(!handle1) exit(1);
++    if(!handle1) return(1);
+     zsh_getaddr1 = (void *(*)()) dlsym(handle1, "${us}zsh_getaddr1");
+     sym1 = zsh_getaddr1();
+-    if(!sym1) exit(1);
+-    if(sym1 != sym2) exit(1);
+-    exit(0);
++    if(!sym1) return(1);
++    if(sym1 != sym2) return(1);
++    return(0);
+ }
+ ]])],[zsh_cv_shared_$1=yes],
+ [zsh_cv_shared_$1=no],
+ [zsh_cv_shared_$1=no]
+ )
+@@ -226,23 +228,23 @@ char *zsh_gl_sym_addr ;
+ #endif
+ #ifndef RTLD_GLOBAL
+ #define RTLD_GLOBAL 0
+ #endif
+ 
+-
++int
+ main()
+ {
+     void *handle1, *handle2;
+     int (*fred1)(), (*fred2)();
+     handle1 = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
+-    if(!handle1) exit(1);
++    if(!handle1) return(1);
+     handle2 = dlopen("./conftest2.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
+-    if(!handle2) exit(1);
++    if(!handle2) return(1);
+     fred1 = (int (*)()) dlsym(handle1, "${us}fred");
+     fred2 = (int (*)()) dlsym(handle2, "${us}fred");
+-    if(!fred1 || !fred2) exit(1);
+-    exit((*fred1)() != 42 || (*fred2)() != 69);
++    if(!fred1 || !fred2) return(1);
++    return((*fred1)() != 42 || (*fred2)() != 69);
+ }
+ ]])],[zsh_cv_sys_dynamic_clash_ok=yes],
+ [zsh_cv_sys_dynamic_clash_ok=no],
+ [zsh_cv_sys_dynamic_clash_ok=no]
+ )
+@@ -302,21 +304,22 @@ char *zsh_gl_sym_addr ;
+ #endif
+ #ifndef RTLD_GLOBAL
+ #define RTLD_GLOBAL 0
+ #endif
+ 
++int
+ main()
+ {
+     void *handle;
+     int (*barneysym)();
+     handle = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
+-    if(!handle) exit(1);
++    if(!handle) return(1);
+     handle = dlopen("./conftest2.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
+-    if(!handle) exit(1);
++    if(!handle) return(1);
+     barneysym = (int (*)()) dlsym(handle, "${us}barney");
+-    if(!barneysym) exit(1);
+-    exit((*barneysym)() != 69);
++    if(!barneysym) return(1);
++    return((*barneysym)() != 69);
+ }
+ ]])],[zsh_cv_sys_dynamic_rtld_global=yes],
+ [zsh_cv_sys_dynamic_rtld_global=no],
+ [zsh_cv_sys_dynamic_rtld_global=no]
+ )
+@@ -372,19 +375,20 @@ char *zsh_gl_sym_addr ;
+ #endif
+ #ifndef RTLD_GLOBAL
+ #define RTLD_GLOBAL 0
+ #endif
+ 
++int
+ main()
+ {
+     void *handle;
+     int (*barneysym)();
+     handle = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
+-    if(!handle) exit(1);
++    if(!handle) return(1);
+     barneysym = (int (*)()) dlsym(handle, "${us}barney");
+-    if(!barneysym) exit(1);
+-    exit((*barneysym)() != 69);
++    if(!barneysym) return(1);
++    return((*barneysym)() != 69);
+ }
+ 
+ int fred () { return 42; }
+ ]])],[zsh_cv_sys_dynamic_execsyms=yes],
+ [zsh_cv_sys_dynamic_execsyms=no],
+@@ -446,19 +450,20 @@ char *zsh_gl_sym_addr ;
+ #endif
+ #ifndef RTLD_GLOBAL
+ #define RTLD_GLOBAL 0
+ #endif
+ 
++int
+ main()
+ {
+     void *handle;
+     int (*barneysym)();
+     handle = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
+-    if(!handle) exit(1);
++    if(!handle) return(1);
+     barneysym = (int (*)()) dlsym(handle, "${us}barney");
+-    if(!barneysym) exit(1);
+-    exit((*barneysym)() != 69);
++    if(!barneysym) return(1);
++    return((*barneysym)() != 69);
+ }
+ 
+ int fred () { return 42; }
+ ]])],[zsh_cv_sys_dynamic_strip_exe=yes],
+ [zsh_cv_sys_dynamic_strip_exe=no],
+@@ -514,19 +519,20 @@ char *zsh_gl_sym_addr ;
+ #endif
+ #ifndef RTLD_GLOBAL
+ #define RTLD_GLOBAL 0
+ #endif
+ 
++int
+ main()
+ {
+     void *handle;
+     int (*fredsym)();
+     handle = dlopen("./conftest1.$DL_EXT", RTLD_LAZY | RTLD_GLOBAL);
+-    if(!handle) exit(1);
++    if(!handle) return(1);
+     fredsym = (int (*)()) dlsym(handle, "${us}fred");
+-    if(!fredsym) exit(1);
+-    exit((*fredsym)() != 42);
++    if(!fredsym) return(1);
++    return((*fredsym)() != 42);
+ }
+ ]])],[zsh_cv_sys_dynamic_strip_lib=yes],
+ [zsh_cv_sys_dynamic_strip_lib=no],
+ [zsh_cv_sys_dynamic_strip_lib=no]
+ )
+
diff --git a/main/zsh/skip-test-failing-on-musl.patch b/main/zsh/skip-test-failing-on-musl.patch
new file mode 100644
index 00000000000..ba04ce214b0
--- /dev/null
+++ b/main/zsh/skip-test-failing-on-musl.patch
@@ -0,0 +1,25 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sun, 03 Jul 2022 01:52:19 +0200
+Subject: Skip test case in E02xtrace failing on musl
+
+--- a/Test/E02xtrace.ztst
++++ b/Test/E02xtrace.ztst
+@@ -150,7 +150,6 @@
+   test_cases=(
+       f            # baseline
+       foo-bar      # Dash
+-      ヌ           # Meta (the UTF-8 representation of this character has an 0x83 byte)
+       \$\'ba\\0z\' # Nul, escaped as though by ${(qqqq)}
+   )
+   for 1 in "$test_cases[@]"; do
+@@ -172,10 +171,6 @@
+ >	# traced
+ >	echo inner
+ >}
+->$'\M-c\M-\C-C\M-\C-L' () {
+->	# traced
+->	echo inner
+->}
+ >$'ba\C-@z' () {
+ >	# traced
+ >	echo inner
diff --git a/main/zsh/zprofile b/main/zsh/zprofile
index 03d316f1add..9e3fd974917 100644
--- a/main/zsh/zprofile
+++ b/main/zsh/zprofile
@@ -1,22 +1,10 @@
+# System-wide .zprofile file for zsh(1) - sourced only for login shells.
 #
-# /etc/zprofile and ~/.zprofile are run for login shells
-#
-
-PATH="$PATH:$HOME/bin"
-export PATH
-
-_src_etc_profile()
-{
-    #  Make /etc/profile happier, and have possible ~/.zshenv options like
-    # NOMATCH ignored.
-    #
-    emulate -L ksh
+# Global Order: zshenv, zprofile, zshrc, zlogin
 
-    # source profile
-    if [ -f /etc/profile ]; then
-	    source /etc/profile
-    fi
-}
-_src_etc_profile
+# Source /etc/profile to the current shell.
+if [ -f /etc/profile ]; then
+	emulate sh -c 'source /etc/profile'
+fi
 
-unset -f _src_etc_profile
+# vim: set ft=zsh ts=4:
diff --git a/main/zsh/zsh-newuser-install-alpine.patch b/main/zsh/zsh-newuser-install-alpine.patch
new file mode 100644
index 00000000000..0436b5ecc4f
--- /dev/null
+++ b/main/zsh/zsh-newuser-install-alpine.patch
@@ -0,0 +1,17 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Sun, 13 Mar 2022 22:44:00 +0100
+Subject: [PATCH] Recommend alpine-zsh-config in zsh-newuser-install
+
+--- a/Functions/Newuser/zsh-newuser-install
++++ b/Functions/Newuser/zsh-newuser-install
+@@ -959,6 +959,10 @@
+      the file by hand, if so desired).
+ "
+   fi
++  print -r "Or you can install Alpine's system-wide Z Shell configuration, which provides
++sensible defaults for a great user experience right out of the box.
++To do this, press (q) and run this command as root: apk add alpine-zsh-config.
++"
+ 
+   read -k key$longprompt
+   print
diff --git a/main/zsh/zshenv b/main/zsh/zshenv
new file mode 100644
index 00000000000..f249e33bbbb
--- /dev/null
+++ b/main/zsh/zshenv
@@ -0,0 +1,13 @@
+# System-wide .zshenv file for zsh(1), sourced on all invocations of the shell.
+#
+# Global order: zshenv, zprofile, zshrc, zlogin
+
+# If $ZDOTDIR is not set and none of .zshenv, .zprofile, .zshrc, .zlogin exist
+# in $HOME, read ZSH startup files from $XDG_CONFIG_HOME/zsh/ instead of $HOME.
+# The point is to promote XDG-based location, but don't break existing setups.
+if [[ -z "${ZDOTDIR-}" ]] && _x=("$HOME"/.z{shenv,profile,shrc,login}(N)) && (( ! $#_x )); then
+	ZDOTDIR=${XDG_CONFIG_HOME:-$HOME/.config}/zsh
+fi
+unset _x
+
+# vim: set ft=zsh ts=4:
diff --git a/main/zsh/zshrc b/main/zsh/zshrc
new file mode 100644
index 00000000000..02d9d83d362
--- /dev/null
+++ b/main/zsh/zshrc
@@ -0,0 +1,63 @@
+# System-wide .zshrc file for zsh(1), sourced only for interactive shells.
+#
+# Global order: zshenv, zprofile, zshrc, zlogin
+
+# If ZSH startup files exist both in $HOME and XDG-based config directory,
+# print a warning (but only if running as a login shell). Note that XDG-based
+# config directory is used only when no ZSH startup files are found in $HOME
+# (see /etc/zsh/zshenv).
+if [[ -z "${ZDOTDIR-}" && -o login ]]; then
+	_xdgdir=${XDG_CONFIG_HOME:-$HOME/.config}/zsh
+	if _xdgrcs=("$_xdgdir"/.z{shenv,profile,shrc,login}(N)) && (( $#_xdgrcs )); then
+		_homercs=("$HOME"/.z{shenv,profile,shrc,login}(N:t))
+		print "Warning: Found Zsh startup files both in ~/ and ${_xdgdir/$HOME/\~}/, the latter will\n" \
+		       "        be ignored (tip: move $_homercs to ${_xdgdir/$HOME/\~}/)." >&2
+	fi
+	unset _xdgdir _xdgrcs _homercs
+fi
+
+# TIP: If you don't want any plugins to be automatically loaded here, add
+# `zsh_plugin_dirs=()` to your $ZDOTDIR/.zshenv.
+if (( ! ${+zsh_plugin_dirs} )); then
+	zsh_plugin_dirs=("${XDG_DATA_HOME:-$HOME/.local/share}/zsh/plugins")
+fi
+
+# TIP: If you want to automatically use all ZSH plugins installed from Alpine
+# packages, add `ZSH_LOAD_SYSTEM_PLUGINS=yes` to your $ZDOTDIR/.zshenv.
+if [[ "${ZSH_LOAD_SYSTEM_PLUGINS-}" = [1ty]* ]]; then
+	zsh_plugin_dirs+=('/usr/share/zsh/plugins')
+fi
+
+# Find plugins (per Oh-My-Zsh convention) under $zsh_plugin_dirs (array of
+# paths) and add them to $fpath.
+_plugins=()
+for _dir ($zsh_plugin_dirs); do
+	for _name ("$_dir"/*(N:t)); do  # equivalent of 'basename $i'
+		if [[ -f "$_dir/$_name/$_name.plugin.zsh" ]]; then
+			_plugins+=("$_dir/$_name/$_name.plugin.zsh")
+			fpath=("$_dir/$_name" $fpath)
+		fi
+	done
+done
+
+# Source each <name>.zsh script in /etc/zsh/zshrc.d/ which <name> is not
+# included in $zshrcd_blacklist.
+#
+# TIP: If you want to prevent some scripts in /etc/zsh/zshrc.d from being
+# loaded, say a.zsh and b.zsh, add `zshrcd_blacklist=(a b)` to your
+# $ZDOTDIR/.zshenv ($XDG_CONFIG_HOME/zsh/.zshenv).
+zshrcd_blacklist+=()
+_scripts=(/etc/zsh/zshrc.d/*.zsh(N:t:r))  # equivalent of 'basename $i .zsh'
+for _name (${_scripts:|zshrcd_blacklist}); do  # :| is a set difference A \ B
+	source "/etc/zsh/zshrc.d/$_name.zsh"
+done
+
+# Source all plugins found in $zsh_plugin_dirs.
+for _plugin ($_plugins); do
+	source "$_plugin"
+done
+
+unset _dir _name _plugin _plugins _scripts
+unset zsh_plugin_dirs zshrcd_blacklist ZSH_LOAD_SYSTEM_PLUGINS
+
+# vim: set ft=zsh ts=4:
diff --git a/main/zstd/APKBUILD b/main/zstd/APKBUILD
index e18ea51ae12..e0ce02bb392 100644
--- a/main/zstd/APKBUILD
+++ b/main/zstd/APKBUILD
@@ -1,50 +1,89 @@
+# Contributor: Leo <thinkabit.ukim@gmail.com>
 # Contributor: stef <l0ls0fo2i@ctrlc.hu>
-# Maintainer: André Klitzing <aklitzing@gmail.com>
+# Contributor: André Klitzing <aklitzing@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=zstd
-pkgver=1.4.4
-pkgrel=1
+pkgver=1.5.6
+pkgrel=0
 pkgdesc="Zstandard - Fast real-time compression algorithm"
-url="https://www.zstd.net"
+url="https://www.zstd.net/"
 arch="all"
-license="BSD-3-Clause GPL-2.0-or-later"
+license="BSD-3-Clause OR GPL-2.0-or-later"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+makedepends="grep meson"
 checkdepends="file"
-makedepends="grep"
-subpackages="$pkgname-static $pkgname-libs $pkgname-dev $pkgname-doc"
-source="zstd-$pkgver.tar.gz::https://github.com/facebook/zstd/archive/v$pkgver.tar.gz
+subpackages="
+	$pkgname-libs
+	$pkgname-static
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-frugal
 	"
+source="zstd-$pkgver.tar.gz::https://github.com/facebook/zstd/archive/v$pkgver.tar.gz"
+# we run the tests in build() for pgo, so it's tested from there.
+# options="!check"
 
 # secfixes:
+#   1.4.9-r0:
+#     - CVE-2021-24032
+#   1.4.1-r0:
+#     - CVE-2021-24031
 #   1.3.8-r0:
 #     - CVE-2019-11922
 
 build() {
-	cd "$builddir"
-	unset CPPFLAGS
-	local _moreflags="-O2"
-	case "$CARCH" in
-		# avoid memory copy hack that violates C standard
-		armhf) _moreflags="$_moreflags -DMEM_FORCE_MEMORY_ACCESS=0" ;;
-	esac
-	make HAVE_PTHREAD=1 HAVE_ZLIB=0 HAVE_LZMA=0 HAVE_LZ4=0 MOREFLAGS="$_moreflags"
+	export CFLAGS="${CFLAGS/-Os/-O3} -flto=auto -ffat-lto-objects"
+	export CXXFLAGS="${CXXFLAGS/-Os/-O3} -flto=auto -ffat-lto-objects"
+	export CPPFLAGS="${CPPFLAGS/-Os/-O3} -flto=auto -ffat-lto-objects"
+	if [ -z "$BOOTSTRAP" ]; then
+		local pgo=true
+	fi
+	# 2-stage pgo+lto build (non-bootstrap), standard meson usage.
+	# note that with clang,
+	#  llvm-profdata merge --output=output/somefilename(?) output/*.profraw
+	# is needed.
+	# believe it or not, this is +30% faster on x86_64 than the default makefile build (same params)..
+	# maybe needs more testing
+	# shellcheck disable=2046
+	abuild-meson \
+		--default-library=both \
+		-Db_ndebug=true \
+		$(test $pgo = true && echo -Db_pgo=generate) \
+		-Dbin_contrib=true \
+		-Dbin_programs=true \
+		-Dbin_tests="$(want_check && echo true || echo false)" \
+		-Dbacktrace=disabled \
+		-Dmulti_thread=enabled \
+		-Dlz4=disabled \
+		-Dlzma=disabled \
+		-Dzlib=disabled \
+		build/meson output
+
+	meson compile -C output
+
+	if [ $pgo = true ]; then
+		meson test -t 4 --no-rebuild --print-errorlogs -C output
+		meson configure -Dbin_tests=false -Db_pgo=use output
+		meson compile -C output
+	fi
 }
 
 check() {
-	cd "$builddir"
-	case "$CARCH" in
-		arm*) make check ;;
-		*) make test ;;
-	esac
+	# ran in build above, via pgo
+	return 0
+	#meson test -t 4 --no-rebuild --print-errorlogs -C output
 }
 
 package() {
-	cd "$builddir"
-	make PREFIX="/usr" DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
-static() {
-	pkgdesc="zstd static library"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
+frugal() {
+	pkgdesc="$pkgdesc (frugal cli)"
+
+	amove usr/bin/zstd-frugal
 }
 
-sha512sums="8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf  zstd-1.4.4.tar.gz"
+sha512sums="
+ca12dffd86618ca008e1ecc79056c1129cb4e61668bf13a3cd5b2fa5c93bc9c92c80f64c1870c68b9c20009d9b3a834eac70db72242d5106125a1c53cccf8de8  zstd-1.5.6.tar.gz
+"